diff --git a/campcaster/src/modules/widgets/etc/Makefile.in b/campcaster/src/modules/widgets/etc/Makefile.in index baafc2586..ed306d928 100644 --- a/campcaster/src/modules/widgets/etc/Makefile.in +++ b/campcaster/src/modules/widgets/etc/Makefile.in @@ -207,7 +207,6 @@ install: all ${USR_VAR_DIR}/LiveSupport/Widgets/icons \ ${USR_VAR_DIR}/LiveSupport/Widgets/imageButton \ ${USR_VAR_DIR}/LiveSupport/Widgets/tabButton \ - ${USR_VAR_DIR}/LiveSupport/Widgets/titleImages \ ${USR_VAR_DIR}/LiveSupport/Widgets/whiteWindow ${CP} ${VAR_DIR}/blueBin/*.png \ ${USR_VAR_DIR}/LiveSupport/Widgets/blueBin @@ -225,8 +224,6 @@ install: all ${USR_VAR_DIR}/LiveSupport/Widgets/imageButton ${CP} ${VAR_DIR}/tabButton/*.png \ ${USR_VAR_DIR}/LiveSupport/Widgets/tabButton - ${CP} ${VAR_DIR}/titleImages/*.png \ - ${USR_VAR_DIR}/LiveSupport/Widgets/titleImages ${CP} ${VAR_DIR}/whiteWindow/*.png \ ${USR_VAR_DIR}/LiveSupport/Widgets/whiteWindow diff --git a/campcaster/src/modules/widgets/include/LiveSupport/Widgets/WhiteWindow.h b/campcaster/src/modules/widgets/include/LiveSupport/Widgets/WhiteWindow.h index 773560258..25c9b8bc4 100644 --- a/campcaster/src/modules/widgets/include/LiveSupport/Widgets/WhiteWindow.h +++ b/campcaster/src/modules/widgets/include/LiveSupport/Widgets/WhiteWindow.h @@ -123,11 +123,6 @@ class WhiteWindow : public Gtk::Window, */ Gtk::Table * layout; - /** - * The event box for the title, enabling capturing mouse events. - */ - Gtk::HBox * titleBox; - /** * The left alignment contaner for the title. */ @@ -335,31 +330,17 @@ class WhiteWindow : public Gtk::Window, public: /** - * Constructor for windows with image titles. + * Constructor. * * @param title the title of the window. + * @param applicationTitle the name of the application. * @param backgroundColor the background color. * @param cornerImages the corner images. * @param properties some WindowProperties flags */ - WhiteWindow(WidgetConstants::ImageType title, - Colors::ColorName backgroundColor, + WhiteWindow(Colors::ColorName backgroundColor, Ptr::Ref cornerImages, - int properties = isResizable) - throw (); - - /** - * Constructor for windows with text titles. - * - * @param title the title of the window. - * @param backgroundColor the background color. - * @param cornerImages the corner images. - * @param properties some WindowProperties flags - */ - WhiteWindow(Glib::ustring title, - Colors::ColorName backgroundColor, - Ptr::Ref cornerImages, - int properties = isResizable) + int properties = 0) throw (); /** @@ -371,18 +352,17 @@ class WhiteWindow : public Gtk::Window, /** * Set the title of the window. * - * @param title the title of the window. + * This sets the title shown in the upper left corner of the window + * to "TITLE", and sets the window manager title shown in the task + * bar to "title - applicationTitle". + * + * @param title the title of the window. + * @param applicationTitle the name of the application. */ void - set_title(const Glib::ustring & title) throw (); - - /** - * Get the title of the window. - * - * @return the title of the window. - */ - Glib::ustring - get_title(void) const throw (); + setTitle(const Glib::ustring & title, + const Glib::ustring & applicationTitle) + throw (); /** * Set the default size of the window. @@ -398,8 +378,9 @@ class WhiteWindow : public Gtk::Window, * Properties the WhiteWindow can have. This is passed as the * properties parameter to the constructors. */ - typedef enum { isResizable = 1, - isModal = 2 } WindowProperties; + typedef enum { hasNoTitle = 1, + isNotResizable = 2, + isModal = 4 } WindowProperties; }; diff --git a/campcaster/src/modules/widgets/include/LiveSupport/Widgets/WidgetConstants.h b/campcaster/src/modules/widgets/include/LiveSupport/Widgets/WidgetConstants.h index f4cb79da9..57996abc7 100644 --- a/campcaster/src/modules/widgets/include/LiveSupport/Widgets/WidgetConstants.h +++ b/campcaster/src/modules/widgets/include/LiveSupport/Widgets/WidgetConstants.h @@ -88,11 +88,7 @@ class WidgetConstants * The list of available miscellaneous images. */ typedef enum { resizeImage, - scratchpadWindowTitleImage, - searchWindowTitleImage, - liveModeWindowTitleImage, - playlistsWindowTitleImage, - schedulerWindowTitleImage, + windowTitleLogoImage, audioClipIconImage, playlistIconImage } ImageType; }; diff --git a/campcaster/src/modules/widgets/src/DateTimeChooserWindow.cxx b/campcaster/src/modules/widgets/src/DateTimeChooserWindow.cxx index a60010464..6a6f3b48c 100644 --- a/campcaster/src/modules/widgets/src/DateTimeChooserWindow.cxx +++ b/campcaster/src/modules/widgets/src/DateTimeChooserWindow.cxx @@ -58,10 +58,9 @@ using namespace LiveSupport::Widgets; *----------------------------------------------------------------------------*/ DateTimeChooserWindow :: DateTimeChooserWindow(Ptr::Ref bundle) throw () - : WhiteWindow("", - Colors::White, + : WhiteWindow(Colors::White, WidgetFactory::getInstance()->getWhiteWindowCorners(), - WhiteWindow::isModal), + WhiteWindow::hasNoTitle || WhiteWindow::isModal), LocalizedObject(bundle) { Ptr::Ref wf = WidgetFactory::getInstance(); diff --git a/campcaster/src/modules/widgets/src/DialogWindow.cxx b/campcaster/src/modules/widgets/src/DialogWindow.cxx index 5a9b8ba28..1969a0bc5 100644 --- a/campcaster/src/modules/widgets/src/DialogWindow.cxx +++ b/campcaster/src/modules/widgets/src/DialogWindow.cxx @@ -62,10 +62,9 @@ DialogWindow :: DialogWindow (Ptr::Ref message, int buttonTypes, Ptr::Ref bundle) throw () - : WhiteWindow("", - Colors::White, + : WhiteWindow(Colors::White, WidgetFactory::getInstance()->getWhiteWindowCorners(), - WhiteWindow::isModal), + WhiteWindow::hasNoTitle || WhiteWindow::isModal), LocalizedObject(bundle) { Ptr::Ref widgetFactory = WidgetFactory::getInstance(); diff --git a/campcaster/src/modules/widgets/src/TestWindow.cxx b/campcaster/src/modules/widgets/src/TestWindow.cxx index abc2b5231..9ac1895a5 100644 --- a/campcaster/src/modules/widgets/src/TestWindow.cxx +++ b/campcaster/src/modules/widgets/src/TestWindow.cxx @@ -64,12 +64,13 @@ static const std::string bundleConfigFileName = "etc/resourceBundle.xml"; *----------------------------------------------------------------------------*/ TestWindow :: TestWindow (void) throw () - : WhiteWindow("test window", - Colors::White, + : WhiteWindow(Colors::White, WidgetFactory::getInstance()->getWhiteWindowCorners()) { Ptr::Ref widgetFactory = WidgetFactory::getInstance(); + setTitle("test widget", "Test App"); + // init the imageButtons hugeImageButton = Gtk::manage( widgetFactory->createButton(WidgetConstants::hugePlayButton)); diff --git a/campcaster/src/modules/widgets/src/WhiteWindow.cxx b/campcaster/src/modules/widgets/src/WhiteWindow.cxx index cdd944d64..632375299 100644 --- a/campcaster/src/modules/widgets/src/WhiteWindow.cxx +++ b/campcaster/src/modules/widgets/src/WhiteWindow.cxx @@ -48,6 +48,14 @@ using namespace LiveSupport::Widgets; /* ================================================ local constants & macros */ +namespace { + +/*------------------------------------------------------------------------------ + * The font used for the window title. + *----------------------------------------------------------------------------*/ +const Glib::ustring windowTitleFont = "Bitstream Vera Sans Mono Bold 9"; + +} /* =============================================== local function prototypes */ @@ -55,73 +63,45 @@ using namespace LiveSupport::Widgets; /* ============================================================= module code */ /*------------------------------------------------------------------------------ - * Constructor for windows with image titles. + * Constructor. *----------------------------------------------------------------------------*/ -WhiteWindow :: WhiteWindow(WidgetConstants::ImageType title, - Colors::ColorName backgroundColor, +WhiteWindow :: WhiteWindow(Colors::ColorName backgroundColor, Ptr::Ref cornerImages, int properties) throw () : Gtk::Window(Gtk::WINDOW_TOPLEVEL), isMaximized(false) { - // do the image title-specific stuff - titleLabel = 0; - Ptr::Ref wf = WidgetFactory::getInstance(); - Gtk::Image* titleImage = Gtk::manage(wf->createImage(title)); - titleBox = Gtk::manage(new Gtk::HBox()); - titleBox->add(*titleImage); - - constructWindow(backgroundColor, cornerImages, properties); -} + Ptr::Ref wf = WidgetFactory::getInstance(); - -/*------------------------------------------------------------------------------ - * Constructor for windows with text titles. - *----------------------------------------------------------------------------*/ -WhiteWindow :: WhiteWindow(Glib::ustring title, - Colors::ColorName backgroundColor, - Ptr::Ref cornerImages, - int properties) - throw () - : Gtk::Window(Gtk::WINDOW_TOPLEVEL), - isMaximized(false) -{ - // do the text title-specific stuff - titleLabel = Gtk::manage(new Gtk::Label); - titleLabel->modify_font(Pango::FontDescription( - "Bitstream Vera Sans 10")); - set_title(title); - titleBox = Gtk::manage(new Gtk::HBox()); - titleBox->add(*titleLabel); - - constructWindow(backgroundColor, cornerImages, properties); -} - - -/*------------------------------------------------------------------------------ - * The common part of both constructors. - *----------------------------------------------------------------------------*/ -void -WhiteWindow :: constructWindow(Colors::ColorName backgroundColor, - Ptr::Ref cornerImages, - int properties) - throw () -{ set_decorated(false); defaultWidth = -1; defaultHeight = -1; - set_resizable(properties & isResizable); + set_resizable(!(properties & isNotResizable)); set_modal(properties & isModal); - Ptr::Ref wf = WidgetFactory::getInstance(); - layout = Gtk::manage(new Gtk::Table()); // create the background color, as it is needed by the event box Gdk::Color bgColor = Colors::getColor(backgroundColor); // create the title + Gtk::Box * titleBox = Gtk::manage(new Gtk::VBox()); + titleLabel = 0; + + if (!(properties & hasNoTitle)) { + Gtk::Image * titleImage = Gtk::manage(wf->createImage( + WidgetConstants::windowTitleLogoImage)); + + titleLabel = Gtk::manage(new Gtk::Label()); + titleLabel->modify_font(Pango::FontDescription(windowTitleFont)); + titleLabel->modify_fg(Gtk::STATE_NORMAL, Colors::getColor( + Colors::Orange)); + + titleBox->pack_start(*titleImage, Gtk::PACK_SHRINK, 0); + titleBox->pack_start(*titleLabel, Gtk::PACK_SHRINK, 2); + } + titleBox->modify_bg(Gtk::STATE_NORMAL, bgColor); titleAlignment = Gtk::manage(new Gtk::Alignment(Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, @@ -141,7 +121,7 @@ WhiteWindow :: constructWindow(Colors::ColorName backgroundColor, closeButton->signal_clicked().connect(sigc::mem_fun(*this, &WhiteWindow::onCloseButtonClicked)); } - if (properties & isResizable) { + if (!(properties & isNotResizable)) { maximizeButton = Gtk::manage(wf->createButton( WidgetConstants::windowMaximizeButton)); cornerButtonBox->pack_end(*maximizeButton, Gtk::PACK_SHRINK, padding); @@ -168,7 +148,7 @@ WhiteWindow :: constructWindow(Colors::ColorName backgroundColor, layout->attach(*childContainer, 0, 2, 1, 2); // create the resize image - if (properties & isResizable) { + if (!(properties & isNotResizable)) { resizeImage = Gtk::manage(wf->createImage(WidgetConstants::resizeImage)); resizeEventBox = Gtk::manage(new Gtk::EventBox()); resizeEventBox->modify_bg(Gtk::STATE_NORMAL, bgColor); @@ -393,25 +373,17 @@ WhiteWindow :: onCloseButtonClicked (void) throw () * Set the title of the window. *----------------------------------------------------------------------------*/ void -WhiteWindow :: set_title(const Glib::ustring & title) throw () +WhiteWindow :: setTitle(const Glib::ustring & title, + const Glib::ustring & applicationTitle) + throw () { - Gtk::Window::set_title(title); + Gtk::Window::set_title(title + " - " + applicationTitle); if (titleLabel) { - titleLabel->set_label(title); + titleLabel->set_label(title.uppercase()); } } -/*------------------------------------------------------------------------------ - * Get the title of the window. - *----------------------------------------------------------------------------*/ -Glib::ustring -WhiteWindow :: get_title(void) const throw () -{ - return titleLabel ? titleLabel->get_label() : ""; -} - - /*------------------------------------------------------------------------------ * Set the default window size. *----------------------------------------------------------------------------*/ diff --git a/campcaster/src/modules/widgets/src/WidgetFactory.cxx b/campcaster/src/modules/widgets/src/WidgetFactory.cxx index ab766a12e..4df3a7766 100644 --- a/campcaster/src/modules/widgets/src/WidgetFactory.cxx +++ b/campcaster/src/modules/widgets/src/WidgetFactory.cxx @@ -253,28 +253,10 @@ static const std::string comboBoxRightName = "combo/right.png"; static const std::string resizeImageName = "whiteWindow/resize.png"; /** - * The name of the image for the title of the scratchpad window. + * The name of the image for the title logo of the GUI windows. */ -static const std::string scratchpadWindowTitleImageName - = "titleImages/scratchpadWindowTitle.png"; - -/** - * The name of the image for the title of the search window. - */ -static const std::string searchWindowTitleImageName - = "titleImages/searchWindowTitle.png"; - -/** - * The name of the image for the title of the live mode window. - */ -static const std::string liveModeWindowTitleImageName - = "titleImages/liveModeWindowTitle.png"; - -/** - * The name of the image for the title of the playlist editor window. - */ -static const std::string playlistsWindowTitleImageName - = "titleImages/playlistsWindowTitle.png"; +static const std::string windowTitleLogoImageName + = "whiteWindow/windowTitleLogo.png"; /** * The name of the image for the audio clip icon. @@ -286,12 +268,6 @@ static const std::string audioClipIconImageName = "icons/audioClipIcon.png"; */ static const std::string playlistIconImageName = "icons/playlistIcon.png"; -/** - * The name of the image for the title of the scheduler window. - */ -static const std::string schedulerWindowTitleImageName - = "titleImages/schedulerWindowTitle.png"; - /** * The name of the passive image for the minimize window button. */ @@ -389,16 +365,8 @@ WidgetFactory :: configure(const xmlpp::Element & element) // load the miscellaneous images imageTypePixbufs[WidgetConstants::resizeImage] = loadImage(resizeImageName); - imageTypePixbufs[WidgetConstants::scratchpadWindowTitleImage] - = loadImage(scratchpadWindowTitleImageName); - imageTypePixbufs[WidgetConstants::searchWindowTitleImage] - = loadImage(searchWindowTitleImageName); - imageTypePixbufs[WidgetConstants::liveModeWindowTitleImage] - = loadImage(liveModeWindowTitleImageName); - imageTypePixbufs[WidgetConstants::playlistsWindowTitleImage] - = loadImage(playlistsWindowTitleImageName); - imageTypePixbufs[WidgetConstants::schedulerWindowTitleImage] - = loadImage(schedulerWindowTitleImageName); + imageTypePixbufs[WidgetConstants::windowTitleLogoImage] + = loadImage(windowTitleLogoImageName); imageTypePixbufs[WidgetConstants::audioClipIconImage] = loadImage(audioClipIconImageName); imageTypePixbufs[WidgetConstants::playlistIconImage] diff --git a/campcaster/src/modules/widgets/var/titleImages/cueWindowTitle.png b/campcaster/src/modules/widgets/var/titleImages/cueWindowTitle.png deleted file mode 100644 index ecb093792..000000000 Binary files a/campcaster/src/modules/widgets/var/titleImages/cueWindowTitle.png and /dev/null differ diff --git a/campcaster/src/modules/widgets/var/titleImages/historyWindowTitle.png b/campcaster/src/modules/widgets/var/titleImages/historyWindowTitle.png deleted file mode 100644 index d3691a069..000000000 Binary files a/campcaster/src/modules/widgets/var/titleImages/historyWindowTitle.png and /dev/null differ diff --git a/campcaster/src/modules/widgets/var/titleImages/liveModeWindowTitle.png b/campcaster/src/modules/widgets/var/titleImages/liveModeWindowTitle.png deleted file mode 100644 index d121f0292..000000000 Binary files a/campcaster/src/modules/widgets/var/titleImages/liveModeWindowTitle.png and /dev/null differ diff --git a/campcaster/src/modules/widgets/var/titleImages/playlistsWindowTitle.png b/campcaster/src/modules/widgets/var/titleImages/playlistsWindowTitle.png deleted file mode 100644 index 21f36de7e..000000000 Binary files a/campcaster/src/modules/widgets/var/titleImages/playlistsWindowTitle.png and /dev/null differ diff --git a/campcaster/src/modules/widgets/var/titleImages/schedulerWindowTitle.png b/campcaster/src/modules/widgets/var/titleImages/schedulerWindowTitle.png deleted file mode 100644 index f5200d3d9..000000000 Binary files a/campcaster/src/modules/widgets/var/titleImages/schedulerWindowTitle.png and /dev/null differ diff --git a/campcaster/src/modules/widgets/var/titleImages/scratchpadWindowTitle.png b/campcaster/src/modules/widgets/var/titleImages/scratchpadWindowTitle.png deleted file mode 100644 index 095b95969..000000000 Binary files a/campcaster/src/modules/widgets/var/titleImages/scratchpadWindowTitle.png and /dev/null differ diff --git a/campcaster/src/modules/widgets/var/titleImages/searchWindowTitle.png b/campcaster/src/modules/widgets/var/titleImages/searchWindowTitle.png deleted file mode 100644 index e2fa1a3c7..000000000 Binary files a/campcaster/src/modules/widgets/var/titleImages/searchWindowTitle.png and /dev/null differ diff --git a/campcaster/src/modules/widgets/var/titleImages/xfaderWindowTitle.png b/campcaster/src/modules/widgets/var/titleImages/xfaderWindowTitle.png deleted file mode 100644 index 87895e271..000000000 Binary files a/campcaster/src/modules/widgets/var/titleImages/xfaderWindowTitle.png and /dev/null differ diff --git a/campcaster/src/modules/widgets/var/whiteWindow/windowTitleLogo.png b/campcaster/src/modules/widgets/var/whiteWindow/windowTitleLogo.png new file mode 100644 index 000000000..4aa64a212 Binary files /dev/null and b/campcaster/src/modules/widgets/var/whiteWindow/windowTitleLogo.png differ diff --git a/campcaster/src/products/gLiveSupport/src/ExportPlaylistWindow.cxx b/campcaster/src/products/gLiveSupport/src/ExportPlaylistWindow.cxx index b98498f1f..5bb05bcff 100644 --- a/campcaster/src/products/gLiveSupport/src/ExportPlaylistWindow.cxx +++ b/campcaster/src/products/gLiveSupport/src/ExportPlaylistWindow.cxx @@ -82,8 +82,7 @@ ExportPlaylistWindow :: ExportPlaylistWindow( Ptr::Ref playlist) throw () : GuiWindow(gLiveSupport, - bundle, - ""), + bundle), playlist(playlist) { Ptr::Ref wf = WidgetFactory::getInstance(); diff --git a/campcaster/src/products/gLiveSupport/src/GuiWindow.cxx b/campcaster/src/products/gLiveSupport/src/GuiWindow.cxx index 9cb854cb3..f72e92318 100644 --- a/campcaster/src/products/gLiveSupport/src/GuiWindow.cxx +++ b/campcaster/src/products/gLiveSupport/src/GuiWindow.cxx @@ -53,7 +53,7 @@ namespace { /** * The name of the application, shown on the task bar. */ -const Glib::ustring applicationTitleSuffix = " - Campcaster"; +const Glib::ustring applicationTitle = "Campcaster"; } @@ -67,68 +67,10 @@ const Glib::ustring applicationTitleSuffix = " - Campcaster"; *----------------------------------------------------------------------------*/ GuiWindow :: GuiWindow (Ptr::Ref gLiveSupport, Ptr::Ref bundle, - WidgetConstants::ImageType titleImage, - Button * windowOpenerButton) - throw () - : WhiteWindow(titleImage, - Colors::White, - WidgetFactory::getInstance()->getWhiteWindowCorners()), - LocalizedObject(bundle), - windowOpenerButton(windowOpenerButton), - gLiveSupport(gLiveSupport) -{ -} - - -/*------------------------------------------------------------------------------ - * Constructor. - *----------------------------------------------------------------------------*/ -GuiWindow :: GuiWindow (Ptr::Ref gLiveSupport, - Ptr::Ref bundle, - WidgetConstants::ImageType titleImage, Button * windowOpenerButton, int properties) throw () - : WhiteWindow(titleImage, - Colors::White, - WidgetFactory::getInstance()->getWhiteWindowCorners(), - properties), - LocalizedObject(bundle), - windowOpenerButton(windowOpenerButton), - gLiveSupport(gLiveSupport) -{ -} - - -/*------------------------------------------------------------------------------ - * Constructor. - *----------------------------------------------------------------------------*/ -GuiWindow :: GuiWindow (Ptr::Ref gLiveSupport, - Ptr::Ref bundle, - const Glib::ustring & titleString, - Button * windowOpenerButton) - throw () - : WhiteWindow(titleString, - Colors::White, - WidgetFactory::getInstance()->getWhiteWindowCorners()), - LocalizedObject(bundle), - windowOpenerButton(windowOpenerButton), - gLiveSupport(gLiveSupport) -{ -} - - -/*------------------------------------------------------------------------------ - * Constructor. - *----------------------------------------------------------------------------*/ -GuiWindow :: GuiWindow (Ptr::Ref gLiveSupport, - Ptr::Ref bundle, - const Glib::ustring & titleString, - Button * windowOpenerButton, - int properties) - throw () - : WhiteWindow(titleString, - Colors::White, + : WhiteWindow(Colors::White, WidgetFactory::getInstance()->getWhiteWindowCorners(), properties), LocalizedObject(bundle), @@ -176,7 +118,6 @@ GuiWindow :: on_hide (void) throw () void GuiWindow :: set_title (const Glib::ustring & title) throw () { - Glib::ustring completeTitle = title + applicationTitleSuffix; - WhiteWindow::set_title(completeTitle); + WhiteWindow::setTitle(title, applicationTitle); } diff --git a/campcaster/src/products/gLiveSupport/src/GuiWindow.h b/campcaster/src/products/gLiveSupport/src/GuiWindow.h index 43cef4d90..2d9273755 100644 --- a/campcaster/src/products/gLiveSupport/src/GuiWindow.h +++ b/campcaster/src/products/gLiveSupport/src/GuiWindow.h @@ -115,66 +115,15 @@ class GuiWindow : public WhiteWindow, * @param gLiveSupport the GLiveSupport application object. * @param bundle the resource bundle holding the localized * resources for this window. - * @param titleImage the LS logo for this window. * @param windowOpenerButton the button which was pressed to open * this window (optional). + * @param properties see WhiteWindow::WindowProperties + * (optional). */ GuiWindow(Ptr::Ref gLiveSupport, Ptr::Ref bundle, - WidgetConstants::ImageType titleImage, - Button * windowOpenerButton = 0) - throw (); - - /** - * Constructor. - * - * @param gLiveSupport the GLiveSupport application object. - * @param bundle the resource bundle holding the localized - * resources for this window. - * @param titleImage the LS logo for this window. - * @param windowOpenerButton the button which was pressed to open - * this window. - * @param properties see WhiteWindow::WindowProperties. - */ - GuiWindow(Ptr::Ref gLiveSupport, - Ptr::Ref bundle, - WidgetConstants::ImageType titleImage, - Button * windowOpenerButton, - int properties) - throw (); - - /** - * Constructor. - * - * @param gLiveSupport the GLiveSupport, application object. - * @param bundle the resource bundle holding the localized - * resources for this window. - * @param titleString the title of this window. - * @param windowOpenerButton the button which was pressed to open - * this window (optional). - */ - GuiWindow(Ptr::Ref gLiveSupport, - Ptr::Ref bundle, - const Glib::ustring & titleString, - Button * windowOpenerButton = 0) - throw (); - - /** - * Constructor. - * - * @param gLiveSupport the GLiveSupport, application object. - * @param bundle the resource bundle holding the localized - * resources for this window. - * @param titleString the title of this window. - * @param windowOpenerButton the button which was pressed to open - * this window. - * @param properties see WhiteWindow::WindowProperties. - */ - GuiWindow(Ptr::Ref gLiveSupport, - Ptr::Ref bundle, - const Glib::ustring & titleString, - Button * windowOpenerButton, - int properties) + Button * windowOpenerButton = 0, + int properties = 0) throw (); /** @@ -189,8 +138,8 @@ class GuiWindow : public WhiteWindow, * Set the title of the window. * * Overrides WhiteWindow::set_title() (inherited from Gtk::Window). - * Adds " - LiveSupport" to the title of the window shown on the - * task bar. + * Adds the application's title to the title of the window shown + * on the task bar. * * @param title the title of the window. */ diff --git a/campcaster/src/products/gLiveSupport/src/LiveModeWindow.cxx b/campcaster/src/products/gLiveSupport/src/LiveModeWindow.cxx index 4836435cc..0a08f5f97 100644 --- a/campcaster/src/products/gLiveSupport/src/LiveModeWindow.cxx +++ b/campcaster/src/products/gLiveSupport/src/LiveModeWindow.cxx @@ -78,7 +78,6 @@ LiveModeWindow :: LiveModeWindow (Ptr::Ref gLiveSupport, throw () : GuiWindow(gLiveSupport, bundle, - WidgetConstants::liveModeWindowTitleImage, windowOpenerButton) { try { diff --git a/campcaster/src/products/gLiveSupport/src/LoginWindow.cxx b/campcaster/src/products/gLiveSupport/src/LoginWindow.cxx index 7aaeeccd2..5fc0de2fc 100644 --- a/campcaster/src/products/gLiveSupport/src/LoginWindow.cxx +++ b/campcaster/src/products/gLiveSupport/src/LoginWindow.cxx @@ -66,9 +66,8 @@ LoginWindow :: LoginWindow (Ptr::Ref gLiveSupport, throw () : GuiWindow(gLiveSupport, bundle, - "", windowOpenerButton, - 0 /* not resizable */), + WhiteWindow::isNotResizable), loggedIn(false) { this->gLiveSupport = gLiveSupport; diff --git a/campcaster/src/products/gLiveSupport/src/OptionsWindow.cxx b/campcaster/src/products/gLiveSupport/src/OptionsWindow.cxx index c9f9010d8..b260f5f0d 100644 --- a/campcaster/src/products/gLiveSupport/src/OptionsWindow.cxx +++ b/campcaster/src/products/gLiveSupport/src/OptionsWindow.cxx @@ -74,8 +74,7 @@ OptionsWindow :: OptionsWindow (Ptr::Ref gLiveSupport, Button * windowOpenerButton) throw () : GuiWindow(gLiveSupport, - bundle, - "", + bundle, windowOpenerButton), backupView(0) { diff --git a/campcaster/src/products/gLiveSupport/src/RestoreBackupWindow.cxx b/campcaster/src/products/gLiveSupport/src/RestoreBackupWindow.cxx index 2cb208872..6e17c8b9c 100644 --- a/campcaster/src/products/gLiveSupport/src/RestoreBackupWindow.cxx +++ b/campcaster/src/products/gLiveSupport/src/RestoreBackupWindow.cxx @@ -63,8 +63,7 @@ RestoreBackupWindow :: RestoreBackupWindow ( Ptr::Ref fileName) throw () : GuiWindow(gLiveSupport, - bundle, - ""), + bundle), fileName(fileName), currentState(AsyncState::pendingState) { diff --git a/campcaster/src/products/gLiveSupport/src/SchedulePlaylistWindow.cxx b/campcaster/src/products/gLiveSupport/src/SchedulePlaylistWindow.cxx index 40ea5dbc2..a4bb61832 100644 --- a/campcaster/src/products/gLiveSupport/src/SchedulePlaylistWindow.cxx +++ b/campcaster/src/products/gLiveSupport/src/SchedulePlaylistWindow.cxx @@ -69,7 +69,6 @@ SchedulePlaylistWindow :: SchedulePlaylistWindow ( throw () : GuiWindow(gLiveSupport, bundle, - WidgetConstants::schedulerWindowTitleImage, windowOpenerButton), playlist(playlist) { diff --git a/campcaster/src/products/gLiveSupport/src/SchedulerWindow.cxx b/campcaster/src/products/gLiveSupport/src/SchedulerWindow.cxx index 6076d2efb..7bc2100e6 100644 --- a/campcaster/src/products/gLiveSupport/src/SchedulerWindow.cxx +++ b/campcaster/src/products/gLiveSupport/src/SchedulerWindow.cxx @@ -76,7 +76,6 @@ SchedulerWindow :: SchedulerWindow ( throw (XmlRpcException) : GuiWindow(gLiveSupport, bundle, - WidgetConstants::schedulerWindowTitleImage, windowOpenerButton) { Ptr::Ref wf = WidgetFactory::getInstance(); diff --git a/campcaster/src/products/gLiveSupport/src/ScratchpadWindow.cxx b/campcaster/src/products/gLiveSupport/src/ScratchpadWindow.cxx index 536aad9d6..bd2426ade 100644 --- a/campcaster/src/products/gLiveSupport/src/ScratchpadWindow.cxx +++ b/campcaster/src/products/gLiveSupport/src/ScratchpadWindow.cxx @@ -83,7 +83,6 @@ ScratchpadWindow :: ScratchpadWindow ( throw () : GuiWindow(gLiveSupport, bundle, - WidgetConstants::scratchpadWindowTitleImage, windowOpenerButton) { Ptr::Ref widgetFactory = WidgetFactory::getInstance(); diff --git a/campcaster/src/products/gLiveSupport/src/SearchWindow.cxx b/campcaster/src/products/gLiveSupport/src/SearchWindow.cxx index cf47bd192..ae1ca8eb8 100644 --- a/campcaster/src/products/gLiveSupport/src/SearchWindow.cxx +++ b/campcaster/src/products/gLiveSupport/src/SearchWindow.cxx @@ -85,7 +85,6 @@ SearchWindow :: SearchWindow (Ptr::Ref gLiveSupport, throw () : GuiWindow(gLiveSupport, bundle, - WidgetConstants::searchWindowTitleImage, windowOpenerButton) { Gtk::Box * searchWhereBox = constructSearchWhereBox(); diff --git a/campcaster/src/products/gLiveSupport/src/SimplePlaylistManagementWindow.cxx b/campcaster/src/products/gLiveSupport/src/SimplePlaylistManagementWindow.cxx index f6e11c6f0..f6fcaec1e 100644 --- a/campcaster/src/products/gLiveSupport/src/SimplePlaylistManagementWindow.cxx +++ b/campcaster/src/products/gLiveSupport/src/SimplePlaylistManagementWindow.cxx @@ -76,7 +76,6 @@ SimplePlaylistManagementWindow :: SimplePlaylistManagementWindow ( throw () : GuiWindow(gLiveSupport, bundle, - WidgetConstants::playlistsWindowTitleImage, windowOpenerButton), isPlaylistModified(false) { diff --git a/campcaster/src/products/gLiveSupport/src/UploadFileWindow.cxx b/campcaster/src/products/gLiveSupport/src/UploadFileWindow.cxx index e39fd4d20..8c391d023 100644 --- a/campcaster/src/products/gLiveSupport/src/UploadFileWindow.cxx +++ b/campcaster/src/products/gLiveSupport/src/UploadFileWindow.cxx @@ -73,7 +73,6 @@ UploadFileWindow :: UploadFileWindow ( throw () : GuiWindow(gLiveSupport, bundle, - "", windowOpenerButton), fileType(invalidType) { diff --git a/campcaster/src/products/gLiveSupport/var/root.txt b/campcaster/src/products/gLiveSupport/var/root.txt index a31d3a3fa..a56ffcf90 100644 --- a/campcaster/src/products/gLiveSupport/var/root.txt +++ b/campcaster/src/products/gLiveSupport/var/root.txt @@ -133,7 +133,7 @@ root:table simplePlaylistManagementWindow:table { - windowTitle:string { "Simple Playlist Management" } + windowTitle:string { "Edit Playlist" } startColumnLabel:string { "Start" } titleColumnLabel:string { "Title" } diff --git a/campcaster/src/products/gLiveSupport/var/widgets/titleImages/cueWindowTitle.png b/campcaster/src/products/gLiveSupport/var/widgets/titleImages/cueWindowTitle.png deleted file mode 100644 index ecb093792..000000000 Binary files a/campcaster/src/products/gLiveSupport/var/widgets/titleImages/cueWindowTitle.png and /dev/null differ diff --git a/campcaster/src/products/gLiveSupport/var/widgets/titleImages/historyWindowTitle.png b/campcaster/src/products/gLiveSupport/var/widgets/titleImages/historyWindowTitle.png deleted file mode 100644 index d3691a069..000000000 Binary files a/campcaster/src/products/gLiveSupport/var/widgets/titleImages/historyWindowTitle.png and /dev/null differ diff --git a/campcaster/src/products/gLiveSupport/var/widgets/titleImages/liveModeWindowTitle.png b/campcaster/src/products/gLiveSupport/var/widgets/titleImages/liveModeWindowTitle.png deleted file mode 100644 index d121f0292..000000000 Binary files a/campcaster/src/products/gLiveSupport/var/widgets/titleImages/liveModeWindowTitle.png and /dev/null differ diff --git a/campcaster/src/products/gLiveSupport/var/widgets/titleImages/playlistsWindowTitle.png b/campcaster/src/products/gLiveSupport/var/widgets/titleImages/playlistsWindowTitle.png deleted file mode 100644 index 21f36de7e..000000000 Binary files a/campcaster/src/products/gLiveSupport/var/widgets/titleImages/playlistsWindowTitle.png and /dev/null differ diff --git a/campcaster/src/products/gLiveSupport/var/widgets/titleImages/schedulerWindowTitle.png b/campcaster/src/products/gLiveSupport/var/widgets/titleImages/schedulerWindowTitle.png deleted file mode 100644 index f5200d3d9..000000000 Binary files a/campcaster/src/products/gLiveSupport/var/widgets/titleImages/schedulerWindowTitle.png and /dev/null differ diff --git a/campcaster/src/products/gLiveSupport/var/widgets/titleImages/scratchpadWindowTitle.png b/campcaster/src/products/gLiveSupport/var/widgets/titleImages/scratchpadWindowTitle.png deleted file mode 100644 index 095b95969..000000000 Binary files a/campcaster/src/products/gLiveSupport/var/widgets/titleImages/scratchpadWindowTitle.png and /dev/null differ diff --git a/campcaster/src/products/gLiveSupport/var/widgets/titleImages/searchWindowTitle.png b/campcaster/src/products/gLiveSupport/var/widgets/titleImages/searchWindowTitle.png deleted file mode 100644 index e2fa1a3c7..000000000 Binary files a/campcaster/src/products/gLiveSupport/var/widgets/titleImages/searchWindowTitle.png and /dev/null differ diff --git a/campcaster/src/products/gLiveSupport/var/widgets/titleImages/xfaderWindowTitle.png b/campcaster/src/products/gLiveSupport/var/widgets/titleImages/xfaderWindowTitle.png deleted file mode 100644 index 87895e271..000000000 Binary files a/campcaster/src/products/gLiveSupport/var/widgets/titleImages/xfaderWindowTitle.png and /dev/null differ diff --git a/campcaster/src/products/gLiveSupport/var/widgets/whiteWindow/windowTitleLogo.png b/campcaster/src/products/gLiveSupport/var/widgets/whiteWindow/windowTitleLogo.png new file mode 100644 index 000000000..4aa64a212 Binary files /dev/null and b/campcaster/src/products/gLiveSupport/var/widgets/whiteWindow/windowTitleLogo.png differ