udpated login window to new design

changed some of the widgets to be Gtk::manage'd

livesupport/products/gLiveSupport/src/GLiveSupport.cxx

@@ -22,7 +22,7 @@
  
  
     Author   : $Author: maroy $
-    Version  : $Revision: 1.18 $
+    Version  : $Revision: 1.19 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/GLiveSupport.cxx,v $
 
 ------------------------------------------------------------------------------*/
@@ -209,12 +209,10 @@ GLiveSupport :: configSupportedLanguages(const xmlpp::Element & element)
         xmlpp::Attribute  * localeAttr = elem->get_attribute(localeAttrName);
         xmlpp::Attribute  * nameAttr   = elem->get_attribute(nameAttrName);
 
-        std::string             locale = localeAttr->get_value().raw();
-        Ptr<Glib::ustring>::Ref uName(new Glib::ustring(nameAttr->get_value()));
-        Ptr<UnicodeString>::Ref name   = 
-                                LocalizedObject::ustringToUnicodeString(uName);
+        std::string     locale = localeAttr->get_value().raw();
+        Glib::ustring   name   = nameAttr->get_value();
 
-        supportedLanguages->insert(std::make_pair(locale, name));
+        supportedLanguages->insert(std::make_pair(name, locale));
 
         begin++;
     }

livesupport/products/gLiveSupport/src/GLiveSupport.h

@@ -22,7 +22,7 @@
  
  
     Author   : $Author: maroy $
-    Version  : $Revision: 1.18 $
+    Version  : $Revision: 1.19 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/GLiveSupport.h,v $
 
 ------------------------------------------------------------------------------*/
@@ -100,7 +100,7 @@ class MasterPanelWindow;
  *  respective documentation.
  *
  *  @author $Author: maroy $
- *  @version $Revision: 1.18 $
+ *  @version $Revision: 1.19 $
  *  @see LocalizedObject#getBundle(const xmlpp::Element &)
  *  @see AuthenticationClientFactory
  *  @see StorageClientFactory
@@ -112,12 +112,12 @@ class GLiveSupport : public LocalizedConfigurable,
     public:
         /**
          *  A type for the map of supported languages.
-         *  This is an STL map, containing const std::string as keys, which
-         *  are the locale names of supported langauges. The values are
-         *  Ptr<const UnicodeString>::Ref, the names of the languages.
+         *  This is an STL map, containing const Glib::ustring as keys, which
+         *  are the language name of supported langauges. The values are
+         *  const std::string, the names of the locales for the languages.
          */
-        typedef std::map<const std::string,
-                         Ptr<const UnicodeString>::Ref>     LanguageMap;
+        typedef std::map<const Glib::ustring,
+                         const std::string>                 LanguageMap;
 
         /**
          *  The type of the list for storing the DjBag contents.

livesupport/products/gLiveSupport/src/LoginWindow.cxx

@@ -22,7 +22,7 @@
  
  
     Author   : $Author: maroy $
-    Version  : $Revision: 1.6 $
+    Version  : $Revision: 1.7 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/LoginWindow.cxx,v $
 
 ------------------------------------------------------------------------------*/
@@ -36,6 +36,7 @@
 #include <iostream>
 #include <stdexcept>
 
+#include "LiveSupport/Widgets/WidgetFactory.h"
 #include "LoginWindow.h"
 
 
@@ -61,19 +62,30 @@ using namespace LiveSupport::GLiveSupport;
 LoginWindow :: LoginWindow (Ptr<GLiveSupport>::Ref      gLiveSupport,
                             Ptr<ResourceBundle>::Ref    bundle)
                                                                     throw ()
-                    : LocalizedObject(bundle)
+          : WhiteWindow("",
+                        0xffffff,
+                        WidgetFactory::getInstance()->getWhiteWindowCorners()),
+            LocalizedObject(bundle)
 {
     this->gLiveSupport = gLiveSupport;
 
+    Ptr<WidgetFactory>::Ref     widgetFactory = WidgetFactory::getInstance();
+
     try {
         set_title(*getResourceUstring("windowTitle"));
-        loginLabel.reset(new Gtk::Label(*getResourceUstring("loginLabel")));
-        passwordLabel.reset(new Gtk::Label(
-                                        *getResourceUstring("passwordLabel")));
-        loginEntry.reset(new Gtk::Entry());
-        passwordEntry.reset(new Gtk::Entry());
-        languageList.reset(new Gtk::Combo());
-        okButton.reset(new Gtk::Button(*getResourceUstring("okButtonLabel")));
+        loginLabel = Gtk::manage(
+                            new Gtk::Label(*getResourceUstring("loginLabel")));
+        passwordLabel = Gtk::manage(
+                        new Gtk::Label( *getResourceUstring("passwordLabel")));
+        loginEntryBin    = Gtk::manage(widgetFactory->createEntryBin());
+        loginEntry       = loginEntryBin->getEntry();
+        passwordEntryBin = Gtk::manage(widgetFactory->createEntryBin());
+        passwordEntry    = passwordEntryBin->getEntry();
+        languageList     = Gtk::manage(widgetFactory->createComboBoxText());
+        okButton = Gtk::manage(widgetFactory->createButton(
+                                        *getResourceUstring("okButtonLabel")));
+        cancelButton = Gtk::manage(widgetFactory->createButton(
+                                    *getResourceUstring("cancelButtonLabel")));
     } catch (std::invalid_argument &e) {
         std::cerr << e.what() << std::endl;
     }
@@ -97,57 +109,34 @@ LoginWindow :: LoginWindow (Ptr<GLiveSupport>::Ref      gLiveSupport,
     passwordLabel->set_selectable(false);
 
     // set up the login text entry area
-    loginEntry->set_name("loginEntry");
-    loginEntry->set_flags(Gtk::CAN_FOCUS|Gtk::HAS_FOCUS);
     loginEntry->set_visibility(true);
-    loginEntry->set_editable(true);
-    loginEntry->set_max_length(0);
-    loginEntry->set_text("");
-    loginEntry->set_has_frame(true);
     loginEntry->set_activates_default(true);
 
     // set up the password text entry area
-    passwordEntry->set_name("passwordEntry");
-    passwordEntry->set_flags(Gtk::CAN_FOCUS);
     passwordEntry->set_visibility(false);
-    passwordEntry->set_editable(true);
-    passwordEntry->set_max_length(0);
-    passwordEntry->set_text("");
-    passwordEntry->set_has_frame(true);
     passwordEntry->set_activates_default(true);
 
     // set up the drop down list for available languages
     languageList->set_name("languageList");
     languageList->set_flags(Gtk::CAN_FOCUS);
-    languageList->get_entry()->set_editable(false);
 
     // fill up the language list with the list of available languages
     Ptr<const GLiveSupport::LanguageMap>::Ref   languages;
     languages = gLiveSupport->getSupportedLanguages();
     GLiveSupport::LanguageMap::const_iterator  lang = languages->begin();
     GLiveSupport::LanguageMap::const_iterator  end  = languages->end();
-    Ptr<Glib::ustring>::Ref                    uLanguage;
-    std::string                                 locale;
 
     // insert the inital, 'default' language
-    locale = "";
-    uLanguage.reset(new Glib::ustring(""));
-    insertLanguageItem(locale, uLanguage);
+    languageList->set_active_text("");
     selectedLocale.reset(new std::string(""));
 
     while (lang != end) {
-        Ptr<const UnicodeString>::Ref   language = (*lang).second;
-
-        locale    = (*lang).first;
-        uLanguage = unicodeStringToUstring(language);
-        insertLanguageItem(locale, uLanguage);
+        const Glib::ustring   & language = (*lang).first;
+        languageList->append_text(language);
 
         lang++;
     }
 
-    languageList->get_list()->signal_select_child().connect(
-                       sigc::mem_fun(*this, &LoginWindow::onLanguageSelected));
-
     // set up the OK button
     okButton->set_name("okButton");
     okButton->set_flags(Gtk::CAN_FOCUS|Gtk::CAN_DEFAULT|Gtk::HAS_DEFAULT);
@@ -156,29 +145,44 @@ LoginWindow :: LoginWindow (Ptr<GLiveSupport>::Ref      gLiveSupport,
     okButton->signal_clicked().connect(sigc::mem_fun(*this,
                                             &LoginWindow::onOkButtonClicked));
 
+    // set up the Cancel button
+    cancelButton->set_name("cancelButton");
+    cancelButton->set_flags(Gtk::CAN_FOCUS);
+    cancelButton->set_relief(Gtk::RELIEF_NORMAL);
+    // Register the signal handler for the button getting clicked.
+    cancelButton->signal_clicked().connect(sigc::mem_fun(*this,
+                                         &LoginWindow::onCancelButtonClicked));
+
+    // set up the box for the buttons
+    buttonBox = Gtk::manage(new Gtk::HButtonBox());
+    buttonBox->set_layout(Gtk::BUTTONBOX_END);
+    buttonBox->set_spacing(5);
+    buttonBox->add(*cancelButton);
+    buttonBox->add(*okButton);
+    
     // set up the table, which provides the layout, and place the widgets
     // inside the table
-    table.reset(new Gtk::Table(2, 2, false));
+    table = Gtk::manage(new Gtk::Table(2, 2, false));
     table->set_name("table");
     table->set_row_spacings(0);
     table->set_col_spacings(0);
     table->attach(*loginLabel,
                   0, 1, 0, 1,
                   Gtk::FILL, Gtk::AttachOptions(), 0, 0);
-    table->attach(*passwordLabel,
+    table->attach(*loginEntryBin,
                   0, 1, 1, 2,
-                  Gtk::FILL, Gtk::AttachOptions(), 0, 0);
-    table->attach(*loginEntry,
-                  1, 2, 0, 1,
                   Gtk::EXPAND|Gtk::FILL, Gtk::AttachOptions(), 0, 0);
-    table->attach(*passwordEntry,
-                  1, 2, 1, 2,
+    table->attach(*passwordLabel,
+                  0, 1, 2, 3,
+                  Gtk::FILL, Gtk::AttachOptions(), 0, 0);
+    table->attach(*passwordEntryBin,
+                  0, 1, 3, 4,
                   Gtk::EXPAND|Gtk::FILL, Gtk::AttachOptions(), 0, 0);
     table->attach(*languageList,
-                  1, 2, 2, 3,
+                  0, 1, 4, 5,
                   Gtk::EXPAND|Gtk::FILL, Gtk::AttachOptions(), 0, 0);
-    table->attach(*okButton,
-                  1, 2, 3, 4,
+    table->attach(*buttonBox,
+                  0, 1, 5, 6,
                   Gtk::FILL, Gtk::AttachOptions(), 0, 0);
 
     // set up the window itself
@@ -211,36 +215,29 @@ LoginWindow :: onOkButtonClicked (void)                  throw ()
 {
     loginText.reset(new Glib::ustring(loginEntry->get_text()));
     passwordText.reset(new Glib::ustring(passwordEntry->get_text()));
+    
+    Ptr<const GLiveSupport::LanguageMap>::Ref   languages;
+    languages = gLiveSupport->getSupportedLanguages();
+
+    GLiveSupport::LanguageMap::const_iterator  end     = languages->end();
+    GLiveSupport::LanguageMap::const_iterator  langSel =
+                            languages->find(languageList->get_active_text());
+    if (langSel != end) {
+        selectedLocale.reset(new std::string((*langSel).second));
+    } else {
+        selectedLocale.reset(new std::string(""));
+    }
 
     hide();
 }
 
 
 /*------------------------------------------------------------------------------
- *  Event handler for a language selected
+ *  Event handler for the cancel button getting clicked.
  *----------------------------------------------------------------------------*/
 void
-LoginWindow :: onLanguageSelected (Gtk::Widget  & widget)       throw ()
+LoginWindow :: onCancelButtonClicked (void)                  throw ()
 {
-    Gtk::ComboDropDownItem  * item  = (Gtk::ComboDropDownItem*) &widget;
-    Gtk::Widget             * label = *(item->get_children().begin());
-    selectedLocale.reset(new std::string(label->get_name().raw()));
-}
-
-
-/*------------------------------------------------------------------------------
- *  Insert an item into the language list
- *----------------------------------------------------------------------------*/
-void
-LoginWindow :: insertLanguageItem(std::string             & itemName,
-                                  Ptr<Glib::ustring>::Ref   itemLabel)
-                                                                    throw ()
-{
-    Gtk::ComboDropDownItem* item = Gtk::manage(new Gtk::ComboDropDownItem);
-    Gtk::Label            * label = Gtk::manage(new Gtk::Label(*itemLabel));
-    label->set_name(itemName);
-    item->add(*label);
-    item->show_all();
-    languageList->get_list()->children().push_back(*item);
+    hide();
 }
 

livesupport/products/gLiveSupport/src/LoginWindow.h

@@ -22,7 +22,7 @@
  
  
     Author   : $Author: maroy $
-    Version  : $Revision: 1.4 $
+    Version  : $Revision: 1.5 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/LoginWindow.h,v $
 
 ------------------------------------------------------------------------------*/
@@ -46,6 +46,7 @@
 
 #include <gtkmm/window.h>
 #include <gtkmm/button.h>
+#include <gtkmm/buttonbox.h>
 #include <gtkmm/label.h>
 #include <gtkmm/entry.h>
 #include <gtkmm/table.h>
@@ -53,12 +54,16 @@
 
 #include "LiveSupport/Core/Ptr.h"
 #include "LiveSupport/Core/LocalizedObject.h"
+#include "LiveSupport/Widgets/WhiteWindow.h"
+#include "LiveSupport/Widgets/EntryBin.h"
+#include "LiveSupport/Widgets/ComboBoxText.h"
 #include "GLiveSupport.h"
 
 namespace LiveSupport {
 namespace GLiveSupport {
 
 using namespace LiveSupport::Core;
+using namespace LiveSupport::Widgets;
 
 /* ================================================================ constants */
 
@@ -72,9 +77,9 @@ using namespace LiveSupport::Core;
  *  A window, handling user login.
  *
  *  @author $Author: maroy $
- *  @version $Revision: 1.4 $
+ *  @version $Revision: 1.5 $
  */
-class LoginWindow : public Gtk::Window, public LocalizedObject
+class LoginWindow : public WhiteWindow, public LocalizedObject
 {
 
     protected:
@@ -86,37 +91,57 @@ class LoginWindow : public Gtk::Window, public LocalizedObject
         /**
          *  The table, which provides the layout for the window.
          */
-        Ptr<Gtk::Table>::Ref        table;
+        Gtk::Table                * table;
 
         /**
          *  The login label in the window.
          */
-        Ptr<Gtk::Label>::Ref        loginLabel;
+        Gtk::Label            * loginLabel;
 
         /**
          *  The password label in the window.
          */
-        Ptr<Gtk::Label>::Ref        passwordLabel;
+        Gtk::Label            * passwordLabel;
+
+        /**
+         *  The container for the login text entry area.
+         */
+        EntryBin              * loginEntryBin;
 
         /**
          *  The login text entry area.
          */
-        Ptr<Gtk::Entry>::Ref        loginEntry;
+        Gtk::Entry            * loginEntry;
+
+        /**
+         *  The container for the password text entry area.
+         */
+        EntryBin              * passwordEntryBin;
 
         /**
          *  The password text entry area.
          */
-        Ptr<Gtk::Entry>::Ref        passwordEntry;
+        Gtk::Entry            * passwordEntry;
 
         /**
          *  The drop-down list to select the desired language.
          */
-        Ptr<Gtk::Combo>::Ref        languageList;
+        ComboBoxText          * languageList;
+
+        /**
+         *  The horizontal box for the buttons.
+         */
+        Gtk::HButtonBox       * buttonBox;
 
         /**
          *  The OK button.
          */
-        Ptr<Gtk::Button>::Ref       okButton;
+        Button                * okButton;
+
+        /**
+         *  The Cancel button.
+         */
+        Button                * cancelButton;
 
         /**
          *  The login text, that was entered by the user.
@@ -140,23 +165,10 @@ class LoginWindow : public Gtk::Window, public LocalizedObject
         onOkButtonClicked(void)                             throw ();
 
         /**
-         *  Signal handler for a language being selected from the 
-         *  language drop-down menu.
-         *
-         *  @param widget the item that has just been selected.
+         *  Signal handler for the cancel button clicked.
          */
-        void
-        onLanguageSelected(Gtk::Widget    & widget)         throw ();
-
-        /**
-         *  Insert an item into languageList
-         *
-         *  @param itemName the name of the item.
-         *  @param itemLabel the label of the item.
-         */
-        void
-        insertLanguageItem(std::string              & itemName,
-                           Ptr<Glib::ustring>::Ref    itemLabel)    throw ();
+        virtual void
+        onCancelButtonClicked(void)                         throw ();
 
 
     public:

livesupport/products/gLiveSupport/src/MasterPanelUserInfoWidget.cxx

@@ -22,7 +22,7 @@
  
  
     Author   : $Author: maroy $
-    Version  : $Revision: 1.4 $
+    Version  : $Revision: 1.5 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/MasterPanelUserInfoWidget.cxx,v $
 
 ------------------------------------------------------------------------------*/
@@ -69,12 +69,13 @@ MasterPanelUserInfoWidget :: MasterPanelUserInfoWidget (
     this->gLiveSupport = gLiveSupport;
     loggedIn           = false;
 
-    logInOutButton = WidgetFactory::getInstance()->createButton("");
+    logInOutButton = Gtk::manage(
+                            WidgetFactory::getInstance()->createButton(""));
     logInOutSignalConnection =
                 logInOutButton->signal_clicked().connect(sigc::mem_fun(*this,
                             &MasterPanelUserInfoWidget::onLoginButtonClicked));
 
-    userInfoLabel.reset(new Gtk::Label());
+    userInfoLabel = Gtk::manage(new Gtk::Label());
 
     changeLanguage(bundle);
 
@@ -153,7 +154,9 @@ MasterPanelUserInfoWidget :: onLoginButtonClicked (void)            throw ()
     Ptr<const Glib::ustring>::Ref     password = loginWindow->getPassword();
 
     login    = loginWindow->getLogin();
-    loggedIn = gLiveSupport->login(login->raw(), password->raw());
+    if (login.get() && password.get()) {
+        loggedIn = gLiveSupport->login(login->raw(), password->raw());
+    }
 
     if (loggedIn) {
         updateStrings();

livesupport/products/gLiveSupport/src/MasterPanelUserInfoWidget.h

@@ -22,7 +22,7 @@
  
  
     Author   : $Author: maroy $
-    Version  : $Revision: 1.3 $
+    Version  : $Revision: 1.4 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/MasterPanelUserInfoWidget.h,v $
 
 ------------------------------------------------------------------------------*/
@@ -68,7 +68,7 @@ using namespace LiveSupport::Core;
  *  This widget handles login and login info display.
  *
  *  @author $Author: maroy $
- *  @version $Revision: 1.3 $
+ *  @version $Revision: 1.4 $
  */
 class MasterPanelUserInfoWidget : public Gtk::Table,
                                   public LocalizedObject
@@ -77,12 +77,12 @@ class MasterPanelUserInfoWidget : public Gtk::Table,
         /**
          *  The login / logout button.
          */
-        Ptr<Widgets::Button>::Ref   logInOutButton;
+        Widgets::Button           * logInOutButton;
 
         /**
          *  A label to display the currently logged in user.
          */
-        Ptr<Gtk::Label>::Ref        userInfoLabel;
+        Gtk::Label                * userInfoLabel;
 
         /**
          *  The gLiveSupport object, handling the logic of the application.

livesupport/products/gLiveSupport/src/MasterPanelWindow.cxx

@@ -22,7 +22,7 @@
  
  
     Author   : $Author: maroy $
-    Version  : $Revision: 1.10 $
+    Version  : $Revision: 1.11 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/MasterPanelWindow.cxx,v $
 
 ------------------------------------------------------------------------------*/
@@ -71,42 +71,43 @@ MasterPanelWindow :: MasterPanelWindow (Ptr<GLiveSupport>::Ref    gLiveSupport,
     Ptr<WidgetFactory>::Ref widgetFactory = WidgetFactory::getInstance();
 
     // TODO: remove hard-coded station logo path reference
-    radioLogoWidget.reset(new Gtk::Image("var/stationLogo.png"));
+    radioLogoWidget = Gtk::manage(new Gtk::Image("var/stationLogo.png"));
 
     // set up the layout, which is a button box
-    layout.reset(new Gtk::Table());
+    layout = Gtk::manage(new Gtk::Table());
 
     // set up the time label
-    timeWidget.reset(new Gtk::Label("time"));
-    timeBin = widgetFactory->createBlueBin();
+    timeWidget = Gtk::manage(new Gtk::Label("time"));
+    timeBin = Gtk::manage(widgetFactory->createBlueBin());
     timeBin->add(*timeWidget);
 
     // set up the now playing widget
-    nowPlayingWidget.reset(new Gtk::Label("now playing"));
-    nowPlayingBin = widgetFactory->createDarkBlueBin();
+    nowPlayingWidget = Gtk::manage(new Gtk::Label("now playing"));
+    nowPlayingBin = Gtk::manage(widgetFactory->createDarkBlueBin());
     nowPlayingBin->add(*nowPlayingWidget);
 
     // set up the VU meter widget
-    vuMeterWidget.reset(new Gtk::Label("VU meter"));
-    vuMeterBin = widgetFactory->createBlueBin();
+    vuMeterWidget = Gtk::manage(new Gtk::Label("VU meter"));
+    vuMeterBin = Gtk::manage(widgetFactory->createBlueBin());
     vuMeterBin->add(*vuMeterWidget);
 
     // set up the next playing widget
-    nextPlayingWidget.reset(new Gtk::Label("next playing"));
-    nextPlayingBin = widgetFactory->createBlueBin();
+    nextPlayingWidget = Gtk::manage(new Gtk::Label("next playing"));
+    nextPlayingBin = Gtk::manage(widgetFactory->createBlueBin());
     nextPlayingBin->add(*nextPlayingWidget);
 
     // create the bottom bar
-    bottomBar.reset(new Gtk::Table());
-    buttonBar.reset(new Gtk::Table());
-    buttonBarAlignment.reset(new Gtk::Alignment(Gtk::ALIGN_LEFT,
-                                                Gtk::ALIGN_CENTER,
-                                                0, 0));
+    bottomBar = Gtk::manage(new Gtk::Table());
+    buttonBar = Gtk::manage(new Gtk::Table());
+    buttonBarAlignment = Gtk::manage(new Gtk::Alignment(Gtk::ALIGN_LEFT,
+                                                        Gtk::ALIGN_CENTER,
+                                                        0, 0));
     buttonBarAlignment->add(*buttonBar);
-    userInfoWidget.reset(new MasterPanelUserInfoWidget(gLiveSupport, bundle));
-    userInfoAlignment.reset(new Gtk::Alignment(Gtk::ALIGN_RIGHT,
-                                               Gtk::ALIGN_CENTER,
-                                               0, 0));
+    userInfoWidget = Gtk::manage(new MasterPanelUserInfoWidget(gLiveSupport,
+                                                               bundle));
+    userInfoAlignment = Gtk::manage(new Gtk::Alignment(Gtk::ALIGN_RIGHT,
+                                                       Gtk::ALIGN_CENTER,
+                                                       0, 0));
     userInfoAlignment->add(*userInfoWidget);
     bottomBar->attach(*buttonBarAlignment, 0, 1, 0, 1);
     bottomBar->attach(*userInfoAlignment,  1, 2, 0, 1);

livesupport/products/gLiveSupport/src/MasterPanelWindow.h

@@ -22,7 +22,7 @@
  
  
     Author   : $Author: maroy $
-    Version  : $Revision: 1.8 $
+    Version  : $Revision: 1.9 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/MasterPanelWindow.h,v $
 
 ------------------------------------------------------------------------------*/
@@ -88,7 +88,7 @@ using namespace LiveSupport::Widgets;
  *  </code></pre>
  *
  *  @author $Author: maroy $
- *  @version $Revision: 1.8 $
+ *  @version $Revision: 1.9 $
  */
 class MasterPanelWindow : public Gtk::Window, public LocalizedObject
 {
@@ -96,7 +96,7 @@ class MasterPanelWindow : public Gtk::Window, public LocalizedObject
         /**
          *  The layout used in the window.
          */
-        Ptr<Gtk::Table>::Ref        layout;
+        Gtk::Table                * layout;
 
         /**
          *  The background color.
@@ -106,12 +106,12 @@ class MasterPanelWindow : public Gtk::Window, public LocalizedObject
         /**
          *  The container for the time widget
          */
-        Ptr<BlueBin>::Ref           timeBin;
+        BlueBin                   * timeBin;
 
         /**
          *  The time display
          */
-        Ptr<Gtk::Label>::Ref        timeWidget;
+        Gtk::Label                * timeWidget;
 
         /**
          *  The signal connection, that is notified by the GTK timer each
@@ -122,82 +122,82 @@ class MasterPanelWindow : public Gtk::Window, public LocalizedObject
         /**
          *  The container for the now playing widget
          */
-        Ptr<BlueBin>::Ref           nowPlayingBin;
+        BlueBin                   * nowPlayingBin;
 
         /**
          *  The 'now playing' display.
          */
-        Ptr<Gtk::Widget>::Ref       nowPlayingWidget;
+        Gtk::Widget               * nowPlayingWidget;
 
         /**
          *  The container for the VU meter widget
          */
-        Ptr<BlueBin>::Ref           vuMeterBin;
+        BlueBin                   * vuMeterBin;
 
         /**
          *  The VU meter display.
          */
-        Ptr<Gtk::Widget>::Ref       vuMeterWidget;
+        Gtk::Widget               * vuMeterWidget;
 
         /**
          *  The container for the next playing widget.
          */
-        Ptr<BlueBin>::Ref           nextPlayingBin;
+        BlueBin                   * nextPlayingBin;
 
         /**
          *  The 'next playing' display.
          */
-        Ptr<Gtk::Widget>::Ref       nextPlayingWidget;
+        Gtk::Widget               * nextPlayingWidget;
 
         /**
          *  The user info alignment helper.
          */
-        Ptr<Gtk::Alignment>::Ref    userInfoAlignment;
+        Gtk::Alignment            * userInfoAlignment;
 
         /**
          *  The user info widget.
          */
-        Ptr<MasterPanelUserInfoWidget>::Ref     userInfoWidget;
+        MasterPanelUserInfoWidget     * userInfoWidget;
 
         /**
          *  The radio logo.
          */
-        Ptr<Gtk::Image>::Ref        radioLogoWidget;
+        Gtk::Image                * radioLogoWidget;
 
         /**
          *  The bottom bar.
          */
-        Ptr<Gtk::Table>::Ref        bottomBar;
+        Gtk::Table                * bottomBar;
 
         /**
          *  The button bar alignment helper
          */
-        Ptr<Gtk::Alignment>::Ref    buttonBarAlignment;
+        Gtk::Alignment            * buttonBarAlignment;
 
         /**
          *  The button bar.
          */
-        Ptr<Gtk::Table>::Ref        buttonBar;
+        Gtk::Table                * buttonBar;
 
         /**
          *  The button to invoke the upload file window.
          */
-        Ptr<Button>::Ref            uploadFileButton;
+        Button                    * uploadFileButton;
 
         /**
          *  The button to invoke the DJ Bag window.
          */
-        Ptr<Button>::Ref            djBagButton;
+        Button                    * djBagButton;
 
         /**
          *  The button to invoke the Simple Playlist Management Window.
          */
-        Ptr<Button>::Ref            simplePlaylistMgmtButton;
+        Button                    * simplePlaylistMgmtButton;
 
         /**
          *  The button to invoke the Scheduler Window.
          */
-        Ptr<Button>::Ref            schedulerButton;
+        Button                    * schedulerButton;
 
         /**
          *  The gLiveSupport object, handling the logic of the application.

livesupport/products/gLiveSupport/var/hu.txt

@@ -12,11 +12,12 @@ hu:table
 
     loginWindow:table
     {
-        windowTitle:string     { "LiveSupport Belépés Ablak" }
+        windowTitle:string          { "Belépés" }
 
-        loginLabel:string      { "azonositó:" }
-        passwordLabel:string   { "jelszó:" }
-        okButtonLabel:string   { "belépés" }
+        loginLabel:string           { "Azonositó" }
+        passwordLabel:string        { "Jelszó" }
+        okButtonLabel:string        { "Belépés" }
+        cancelButtonLabel:string    { "Mégsem" }
     }
 
     audioClipListWindow:table

livesupport/products/gLiveSupport/var/root.txt

@@ -12,11 +12,12 @@ root:table
 
     loginWindow:table
     {
-        windowTitle:string     { "LiveSupport Login Window" }
+        windowTitle:string          { "LOGIN" }
 
-        loginLabel:string      { "login:" }
-        passwordLabel:string   { "password:" }
-        okButtonLabel:string   { "OK" }
+        loginLabel:string           { "Login" }
+        passwordLabel:string        { "Password" }
+        okButtonLabel:string        { "OK" }
+        cancelButtonLabel:string    { "Cancel" }
     }
 
     audioClipListWindow:table