From a340148e0cc28637ef9b58b3d216f34df3ba773c Mon Sep 17 00:00:00 2001 From: fgerlits Date: Tue, 22 Mar 2005 12:17:34 +0000 Subject: [PATCH] made resizability (now there's a nice word) optional in WhiteWindow; also checked in resize image png that was missing --- .../include/LiveSupport/Widgets/WhiteWindow.h | 8 +++-- .../modules/widgets/src/WhiteWindow.cxx | 31 ++++++++++-------- .../products/gLiveSupport/src/LoginWindow.cxx | 5 +-- .../var/widgets/whiteWindow/resize.png | Bin 0 -> 3181 bytes 4 files changed, 26 insertions(+), 18 deletions(-) create mode 100644 livesupport/products/gLiveSupport/var/widgets/whiteWindow/resize.png diff --git a/livesupport/modules/widgets/include/LiveSupport/Widgets/WhiteWindow.h b/livesupport/modules/widgets/include/LiveSupport/Widgets/WhiteWindow.h index 5fe968d35..1e38bde10 100644 --- a/livesupport/modules/widgets/include/LiveSupport/Widgets/WhiteWindow.h +++ b/livesupport/modules/widgets/include/LiveSupport/Widgets/WhiteWindow.h @@ -22,7 +22,7 @@ Author : $Author: fgerlits $ - Version : $Revision: 1.6 $ + Version : $Revision: 1.7 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/widgets/include/LiveSupport/Widgets/WhiteWindow.h,v $ ------------------------------------------------------------------------------*/ @@ -70,7 +70,7 @@ using namespace LiveSupport::Core; * A container holding exactly one child, habing a light blue border to it. * * @author $Author: fgerlits $ - * @version $Revision: 1.6 $ + * @version $Revision: 1.7 $ */ class WhiteWindow : public Gtk::Window { @@ -271,10 +271,12 @@ class WhiteWindow : public Gtk::Window * @param title the title of the window. * @param backgroundColor the RGB value for the background color. * @param cornerImages the corner images. + * @param resizable true if the user can resize the window. */ WhiteWindow(Glib::ustring title, unsigned int backgroundColor, - Ptr::Ref cornerImages) + Ptr::Ref cornerImages, + bool resizable = true) throw (); /** diff --git a/livesupport/modules/widgets/src/WhiteWindow.cxx b/livesupport/modules/widgets/src/WhiteWindow.cxx index c60b2bf31..9f099bfcf 100644 --- a/livesupport/modules/widgets/src/WhiteWindow.cxx +++ b/livesupport/modules/widgets/src/WhiteWindow.cxx @@ -22,7 +22,7 @@ Author : $Author: fgerlits $ - Version : $Revision: 1.7 $ + Version : $Revision: 1.8 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/widgets/src/WhiteWindow.cxx,v $ ------------------------------------------------------------------------------*/ @@ -58,7 +58,8 @@ using namespace LiveSupport::Widgets; *----------------------------------------------------------------------------*/ WhiteWindow :: WhiteWindow(Glib::ustring title, unsigned int backgroundColor, - Ptr::Ref cornerImages) + Ptr::Ref cornerImages, + bool resizable) throw () : Gtk::Window(Gtk::WINDOW_TOPLEVEL) { @@ -105,15 +106,17 @@ WhiteWindow :: WhiteWindow(Glib::ustring title, layout->attach(*childContainer, 0, 2, 1, 2); // create the resize image - resizeImage = Gtk::manage(wf->createResizeImage()); - resizeEventBox = Gtk::manage(new Gtk::EventBox()); - resizeEventBox->modify_bg(Gtk::STATE_NORMAL, bgColor); - resizeEventBox->add(*resizeImage); - resizeAlignment = Gtk::manage(new Gtk::Alignment(Gtk::ALIGN_RIGHT, - Gtk::ALIGN_CENTER, - 0, 0)); - resizeAlignment->add(*resizeEventBox); - layout->attach(*resizeAlignment, 1, 2, 2, 3, Gtk::FILL, Gtk::SHRINK); + if (resizable) { + resizeImage = Gtk::manage(wf->createResizeImage()); + resizeEventBox = Gtk::manage(new Gtk::EventBox()); + resizeEventBox->modify_bg(Gtk::STATE_NORMAL, bgColor); + resizeEventBox->add(*resizeImage); + resizeAlignment = Gtk::manage(new Gtk::Alignment(Gtk::ALIGN_RIGHT, + Gtk::ALIGN_CENTER, + 0, 0)); + resizeAlignment->add(*resizeEventBox); + layout->attach(*resizeAlignment, 1, 2, 2, 3, Gtk::FILL, Gtk::SHRINK); + } // add the corners blueBin = Gtk::manage(new BlueBin(backgroundColor, cornerImages)); @@ -131,9 +134,11 @@ WhiteWindow :: WhiteWindow(Glib::ustring title, closeButton->signal_clicked().connect(sigc::mem_fun(*this, &WhiteWindow::onCloseButtonClicked)); - resizeEventBox->add_events(Gdk::BUTTON_PRESS_MASK); - resizeEventBox->signal_button_press_event().connect(sigc::mem_fun(*this, + if (resizable) { + resizeEventBox->add_events(Gdk::BUTTON_PRESS_MASK); + resizeEventBox->signal_button_press_event().connect(sigc::mem_fun(*this, &WhiteWindow::onResizeClicked)); + } } diff --git a/livesupport/products/gLiveSupport/src/LoginWindow.cxx b/livesupport/products/gLiveSupport/src/LoginWindow.cxx index fce88dc98..5604aac8e 100644 --- a/livesupport/products/gLiveSupport/src/LoginWindow.cxx +++ b/livesupport/products/gLiveSupport/src/LoginWindow.cxx @@ -22,7 +22,7 @@ Author : $Author: fgerlits $ - Version : $Revision: 1.9 $ + Version : $Revision: 1.10 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/LoginWindow.cxx,v $ ------------------------------------------------------------------------------*/ @@ -65,7 +65,8 @@ LoginWindow :: LoginWindow (Ptr::Ref gLiveSupport, throw () : WhiteWindow("", 0xffffff, - WidgetFactory::getInstance()->getWhiteWindowCorners()), + WidgetFactory::getInstance()->getWhiteWindowCorners(), + false), LocalizedObject(bundle) { this->gLiveSupport = gLiveSupport; diff --git a/livesupport/products/gLiveSupport/var/widgets/whiteWindow/resize.png b/livesupport/products/gLiveSupport/var/widgets/whiteWindow/resize.png new file mode 100644 index 0000000000000000000000000000000000000000..bd585bb878a8eb2e6fcf4d3850ab77bc273f516f GIT binary patch literal 3181 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 Tpyw&D00000NkvXXu0mjfq@5Un literal 0 HcmV?d00001