Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

changed time formatting on Master Panel;

Browse source 
changed text formatting syntax everywhere to be more uniform
This commit is contained in:
fgerlits 2005-06-02 13:57:55 +00:00
parent 6665b9f379
commit 1acb6485a7
5 changed files with 24 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
livesupport/modules/widgets/src/ZebraTreeView.cxx
View file

@ -22,7 +22,7 @@
Author : $Author: fgerlits $ Author : $Author: fgerlits $
Version : $Revision: 1.14 $ Version : $Revision: 1.15 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/widgets/src/ZebraTreeView.cxx,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/widgets/src/ZebraTreeView.cxx,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -256,7 +256,7 @@ ZebraTreeView :: lineNumberCellDataFunction(
cell->property_cell_background_gdk() = Colors::getColor(colorName); cell->property_cell_background_gdk() = Colors::getColor(colorName);
Glib::ustring numberString; Glib::ustring numberString;
numberString.append("<span size=\"larger\" weight=\"ultrabold\">"); numberString.append("<span font_desc='Bitstream Vera Bold 16'>");
std::stringstream numberStr; std::stringstream numberStr;
numberStr << (rowNumber + offset); numberStr << (rowNumber + offset);
numberString.append(numberStr.str()); numberString.append(numberStr.str());

12
livesupport/products/gLiveSupport/src/LiveModeWindow.cxx
View file

@ -22,7 +22,7 @@
Author : $Author: fgerlits $ Author : $Author: fgerlits $
Version : $Revision: 1.14 $ Version : $Revision: 1.15 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/LiveModeWindow.cxx,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/LiveModeWindow.cxx,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -193,7 +193,7 @@ LiveModeWindow :: addItem(Ptr<Playable>::Ref playable) throw ()
Ptr<Glib::ustring>::Ref infoString(new Glib::ustring); Ptr<Glib::ustring>::Ref infoString(new Glib::ustring);
infoString->append("<span size=\"larger\" weight=\"bold\">"); infoString->append("<span font_desc='Bitstream Vera Bold 16'>");
infoString->append(Glib::Markup::escape_text(*playable->getTitle())); infoString->append(Glib::Markup::escape_text(*playable->getTitle()));
infoString->append("</span>"); infoString->append("</span>");
@ -202,7 +202,7 @@ LiveModeWindow :: addItem(Ptr<Playable>::Ref playable) throw ()
Ptr<Glib::ustring>::Ref Ptr<Glib::ustring>::Ref
creator = playable->getMetadata("dc:creator"); creator = playable->getMetadata("dc:creator");
if (creator) { if (creator) {
infoString->append("\n<span weight=\"bold\">"); infoString->append("\n<span font_desc='Bitstream Vera Bold 12'>");
infoString->append(Glib::Markup::escape_text(*creator)); infoString->append(Glib::Markup::escape_text(*creator));
infoString->append("</span>"); infoString->append("</span>");
} }
@ -210,13 +210,15 @@ LiveModeWindow :: addItem(Ptr<Playable>::Ref playable) throw ()
Ptr<Glib::ustring>::Ref Ptr<Glib::ustring>::Ref
album = playable->getMetadata("dc:source"); album = playable->getMetadata("dc:source");
if (album) { if (album) {
infoString->append("\n<span weight=\"bold\">"); infoString->append("\n<span font_desc='Bitstream Vera Bold 12'>");
infoString->append(Glib::Markup::escape_text(*album)); infoString->append(Glib::Markup::escape_text(*album));
infoString->append("</span>"); infoString->append("</span>");
} }
infoString->append("\nduration: "); infoString->append("\n<span font_desc='Bitstream Vera 12'>"
"duration: ");
infoString->append(to_simple_string(*playable->getPlaylength())); infoString->append(to_simple_string(*playable->getPlaylength()));
infoString->append("</span>");
row[modelColumns.infoColumn] = *infoString; row[modelColumns.infoColumn] = *infoString;
} }

13
livesupport/products/gLiveSupport/src/MasterPanelWindow.cxx
View file

@ -22,7 +22,7 @@
Author : $Author: fgerlits $ Author : $Author: fgerlits $
Version : $Revision: 1.32 $ Version : $Revision: 1.33 $
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 $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -75,7 +75,16 @@ MasterPanelWindow :: MasterPanelWindow (Ptr<GLiveSupport>::Ref gLiveSupport,
layout = Gtk::manage(new Gtk::Table()); layout = Gtk::manage(new Gtk::Table());
// set up the time label // set up the time label
timeWidget = Gtk::manage(new Gtk::Label("time")); timeWidget = Gtk::manage(new Gtk::Label());
Pango::Attribute fontDescriptionAttribute =
Pango::Attribute::create_attr_font_desc(
Pango::FontDescription(
"Bitstream Vera Bold 24"));
fontDescriptionAttribute.set_start_index(0);
fontDescriptionAttribute.set_end_index(10);
Pango::AttrList timeWidgetAttributes;
timeWidgetAttributes.insert(fontDescriptionAttribute);
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(153, 104);

6
livesupport/products/gLiveSupport/src/NowPlaying.cxx
View file

@ -22,7 +22,7 @@
Author : $Author: fgerlits $ Author : $Author: fgerlits $
Version : $Revision: 1.2 $ Version : $Revision: 1.3 $
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 $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -107,7 +107,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 size=\"larger\" weight=\"bold\">"); infoString->append("<span font_desc='Bitstream Vera Bold 20'>");
infoString->append(Glib::Markup::escape_text(*playable->getTitle())); infoString->append(Glib::Markup::escape_text(*playable->getTitle()));
infoString->append("</span> "); infoString->append("</span> ");
@ -116,7 +116,7 @@ NowPlaying :: setPlayable(Ptr<Playable>::Ref playable) throw ()
Ptr<Glib::ustring>::Ref Ptr<Glib::ustring>::Ref
creator = playable->getMetadata("dc:creator"); creator = playable->getMetadata("dc:creator");
if (creator) { if (creator) {
infoString->append("<span size=\"larger\" weight=\"bold\">"); infoString->append("<span font_desc='Bitstream Vera Bold 20'>");
infoString->append(Glib::Markup::escape_text(*creator)); infoString->append(Glib::Markup::escape_text(*creator));
infoString->append("</span>"); infoString->append("</span>");
} }

2
livesupport/tools/pear/etc/pear.conf.template
View file

@ -1,2 +1,2 @@
#PEAR_Config 0.9 #PEAR_Config 0.9
a:9:{s:15:"preferred_state";s:6:"stable";s:7:"bin_dir";s:66:"/home/tomash/public_html/work/mdlf/livesupport-ALL/usr/lib/php/bin";s:7:"php_dir";s:66:"/home/tomash/public_html/work/mdlf/livesupport-ALL/usr/lib/php/php";s:7:"doc_dir";s:71:"/home/tomash/public_html/work/mdlf/livesupport-ALL/usr/lib/php/php/docs";s:8:"data_dir";s:71:"/home/tomash/public_html/work/mdlf/livesupport-ALL/usr/lib/php/php/data";s:8:"test_dir";s:72:"/home/tomash/public_html/work/mdlf/livesupport-ALL/usr/lib/php/php/tests";s:9:"cache_dir";s:72:"/home/tomash/public_html/work/mdlf/livesupport-ALL/usr/lib/php/php/cache";s:9:"cache_ttl";i:300;s:7:"php_bin";s:0:"";} a:9:{s:15:"preferred_state";s:6:"stable";s:7:"bin_dir";s:42:"/home/fgerlits/livesupport/usr/lib/php/bin";s:7:"php_dir";s:42:"/home/fgerlits/livesupport/usr/lib/php/php";s:7:"doc_dir";s:47:"/home/fgerlits/livesupport/usr/lib/php/php/docs";s:8:"data_dir";s:47:"/home/fgerlits/livesupport/usr/lib/php/php/data";s:8:"test_dir";s:48:"/home/fgerlits/livesupport/usr/lib/php/php/tests";s:9:"cache_dir";s:48:"/home/fgerlits/livesupport/usr/lib/php/php/cache";s:9:"cache_ttl";i:300;s:7:"php_bin";s:0:"";}