minor tweaks
This commit is contained in:
parent
077d6179ed
commit
429272e59d
2 changed files with 10 additions and 10 deletions
|
@ -22,7 +22,7 @@
|
||||||
|
|
||||||
|
|
||||||
Author : $Author: fgerlits $
|
Author : $Author: fgerlits $
|
||||||
Version : $Revision: 1.34 $
|
Version : $Revision: 1.35 $
|
||||||
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/MasterPanelWindow.cxx,v $
|
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/MasterPanelWindow.cxx,v $
|
||||||
|
|
||||||
------------------------------------------------------------------------------*/
|
------------------------------------------------------------------------------*/
|
||||||
|
@ -69,7 +69,7 @@ MasterPanelWindow :: MasterPanelWindow (Ptr<GLiveSupport>::Ref gLiveSupport,
|
||||||
|
|
||||||
// TODO: remove hard-coded station logo path reference
|
// TODO: remove hard-coded station logo path reference
|
||||||
radioLogoWidget = Gtk::manage(new Gtk::Image("var/stationLogo.png"));
|
radioLogoWidget = Gtk::manage(new Gtk::Image("var/stationLogo.png"));
|
||||||
radioLogoWidget->set_size_request(158, 104);
|
radioLogoWidget->set_size_request(120, 104);
|
||||||
|
|
||||||
// set up the layout, which is a button box
|
// set up the layout, which is a button box
|
||||||
layout = Gtk::manage(new Gtk::Table());
|
layout = Gtk::manage(new Gtk::Table());
|
||||||
|
@ -79,7 +79,7 @@ MasterPanelWindow :: MasterPanelWindow (Ptr<GLiveSupport>::Ref gLiveSupport,
|
||||||
Pango::Attribute fontDescriptionAttribute =
|
Pango::Attribute fontDescriptionAttribute =
|
||||||
Pango::Attribute::create_attr_font_desc(
|
Pango::Attribute::create_attr_font_desc(
|
||||||
Pango::FontDescription(
|
Pango::FontDescription(
|
||||||
"Bitstream Vera Sans Bold 24"));
|
"Bitstream Vera Sans Bold 20"));
|
||||||
fontDescriptionAttribute.set_start_index(0);
|
fontDescriptionAttribute.set_start_index(0);
|
||||||
fontDescriptionAttribute.set_end_index(10);
|
fontDescriptionAttribute.set_end_index(10);
|
||||||
Pango::AttrList timeWidgetAttributes;
|
Pango::AttrList timeWidgetAttributes;
|
||||||
|
@ -87,7 +87,7 @@ MasterPanelWindow :: MasterPanelWindow (Ptr<GLiveSupport>::Ref gLiveSupport,
|
||||||
timeWidget->set_attributes(timeWidgetAttributes);
|
timeWidget->set_attributes(timeWidgetAttributes);
|
||||||
timeBin = Gtk::manage(widgetFactory->createBlueBin());
|
timeBin = Gtk::manage(widgetFactory->createBlueBin());
|
||||||
timeBin->add(*timeWidget);
|
timeBin->add(*timeWidget);
|
||||||
timeBin->set_size_request(153, 104);
|
timeBin->set_size_request(120, 104);
|
||||||
|
|
||||||
// set up the now playing widget
|
// set up the now playing widget
|
||||||
nowPlayingWidget = Gtk::manage(new NowPlaying(gLiveSupport, bundle));
|
nowPlayingWidget = Gtk::manage(new NowPlaying(gLiveSupport, bundle));
|
||||||
|
@ -99,12 +99,12 @@ MasterPanelWindow :: MasterPanelWindow (Ptr<GLiveSupport>::Ref gLiveSupport,
|
||||||
vuMeterWidget = Gtk::manage(new Gtk::Label("VU meter"));
|
vuMeterWidget = Gtk::manage(new Gtk::Label("VU meter"));
|
||||||
vuMeterBin = Gtk::manage(widgetFactory->createBlueBin());
|
vuMeterBin = Gtk::manage(widgetFactory->createBlueBin());
|
||||||
vuMeterBin->add(*vuMeterWidget);
|
vuMeterBin->add(*vuMeterWidget);
|
||||||
vuMeterBin->set_size_request(400, 40);
|
vuMeterBin->set_size_request(200, 40);
|
||||||
// set up the next playing widget
|
// set up the next playing widget
|
||||||
nextPlayingWidget = Gtk::manage(new Gtk::Label("next playing"));
|
nextPlayingWidget = Gtk::manage(new Gtk::Label("next playing"));
|
||||||
nextPlayingBin = Gtk::manage(widgetFactory->createBlueBin());
|
nextPlayingBin = Gtk::manage(widgetFactory->createBlueBin());
|
||||||
nextPlayingBin->add(*nextPlayingWidget);
|
nextPlayingBin->add(*nextPlayingWidget);
|
||||||
nextPlayingBin->set_size_request(400, 59);
|
nextPlayingBin->set_size_request(200, 59);
|
||||||
|
|
||||||
// create the bottom bar
|
// create the bottom bar
|
||||||
bottomBar = Gtk::manage(new Gtk::Table());
|
bottomBar = Gtk::manage(new Gtk::Table());
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
|
|
||||||
|
|
||||||
Author : $Author: fgerlits $
|
Author : $Author: fgerlits $
|
||||||
Version : $Revision: 1.4 $
|
Version : $Revision: 1.5 $
|
||||||
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/NowPlaying.cxx,v $
|
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/NowPlaying.cxx,v $
|
||||||
|
|
||||||
------------------------------------------------------------------------------*/
|
------------------------------------------------------------------------------*/
|
||||||
|
@ -108,7 +108,7 @@ NowPlaying :: setPlayable(Ptr<Playable>::Ref playable) throw ()
|
||||||
Ptr<Glib::ustring>::Ref infoString(new Glib::ustring);
|
Ptr<Glib::ustring>::Ref infoString(new Glib::ustring);
|
||||||
|
|
||||||
infoString->append("<span font_desc='Bitstream Vera Sans"
|
infoString->append("<span font_desc='Bitstream Vera Sans"
|
||||||
" Bold 20'>");
|
" Bold 16'>");
|
||||||
infoString->append(Glib::Markup::escape_text(*playable->getTitle()));
|
infoString->append(Glib::Markup::escape_text(*playable->getTitle()));
|
||||||
infoString->append("</span> ");
|
infoString->append("</span> ");
|
||||||
|
|
||||||
|
@ -118,7 +118,7 @@ NowPlaying :: setPlayable(Ptr<Playable>::Ref playable) throw ()
|
||||||
creator = playable->getMetadata("dc:creator");
|
creator = playable->getMetadata("dc:creator");
|
||||||
if (creator) {
|
if (creator) {
|
||||||
infoString->append("<span font_desc='Bitstream Vera Sans"
|
infoString->append("<span font_desc='Bitstream Vera Sans"
|
||||||
" Bold 20'>");
|
" Bold 16'>");
|
||||||
infoString->append(Glib::Markup::escape_text(*creator));
|
infoString->append(Glib::Markup::escape_text(*creator));
|
||||||
infoString->append("</span>");
|
infoString->append("</span>");
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue