refactoring, stage 3: the Login Window and the Master Panel are now GuiWindows

campcaster/src/products/gLiveSupport/src/GLiveSupport.cxx

@@ -626,9 +626,7 @@ void
 LiveSupport :: GLiveSupport ::
 GLiveSupport :: show(void)                                          throw ()
 {
-    masterPanel.reset(new MasterPanelWindow(shared_from_this(),
+    masterPanel.reset(new MasterPanelWindow());
-                                            getBundle(),
-                                            gladeDir));
 
     masterPanel->getWindow()->set_icon_list(taskbarIcons->getIconList());
     masterPanel->getWindow()->set_default_icon_list(
@@ -654,7 +652,7 @@ GLiveSupport :: changeLanguage(Ptr<const std::string>::Ref  locale)
     metadataTypeContainer->setBundle(getBundle("metadataTypes"));
 
     if (masterPanel.get()) {
-        masterPanel->changeLanguage(getBundle());
+        masterPanel->changeLanguage();
     }
 }
 

campcaster/src/products/gLiveSupport/src/LoginWindow.cxx

@@ -33,9 +33,7 @@
 #include "configure.h"
 #endif
 
-#include <iostream>
+#include "GLiveSupport.h"
-#include <stdexcept>
-
 #include "LoginWindow.h"
 
 
@@ -51,6 +49,11 @@ using namespace LiveSupport::GLiveSupport;
 
 namespace {
 
+/*------------------------------------------------------------------------------
+ *  The name of the localization resource bundle.
+ *----------------------------------------------------------------------------*/
+const Glib::ustring     bundleName = "loginWindow";
+
 /*------------------------------------------------------------------------------
  *  The name of the glade file.
  *----------------------------------------------------------------------------*/
@@ -66,20 +69,13 @@ const Glib::ustring     gladeFileName = "LoginWindow.glade";
 /*------------------------------------------------------------------------------
  *  Constructor.
  *----------------------------------------------------------------------------*/
-LoginWindow :: LoginWindow (Ptr<GLiveSupport>::Ref      gLiveSupport,
+LoginWindow :: LoginWindow (void)
-                            Ptr<ResourceBundle>::Ref    bundle,
-                            const Glib::ustring &       gladeDir)
                                                                     throw ()
-          : LocalizedObject(bundle),
+          : GuiWindow(bundleName,
-            gLiveSupport(gLiveSupport),
+                      gladeFileName),
             loggedIn(false)
 {
-    glade = Gnome::Glade::Xml::create(gladeDir + gladeFileName);
-
     // localize everything
-    glade->get_widget("mainWindow1", loginWindow);
-    loginWindow->set_title(*getResourceUstring("windowTitle"));
-
     Gtk::Label *    userNameLabel;
     Gtk::Label *    passwordLabel;
     Gtk::Label *    languageLabel;
@@ -118,11 +114,6 @@ LoginWindow :: LoginWindow (Ptr<GLiveSupport>::Ref      gLiveSupport,
     // clear the status bar
     glade->get_widget("statusBar1", statusBar);
     statusBar->set_text("");
-    
-    // set the OK button as the default action, when the user presses Enter;
-    // this does not work when one of the entry fields have focus,
-    // so we need to connect the 'activate' signals explicitly above
-    loginWindow->set_default_response(Gtk::RESPONSE_OK);
 }
 
 
@@ -161,7 +152,7 @@ void
 LoginWindow :: onOkButtonClicked (void)                             throw ()
 {
     statusBar->set_text(*getResourceUstring("pleaseWaitMsg"));
-    loginWindow->set_sensitive(false);
+    mainWindow->set_sensitive(false);
     gLiveSupport->runMainLoop();    // redraw the window
     
     userNameText.reset(new Glib::ustring(userNameEntry->get_text()));
@@ -186,7 +177,7 @@ LoginWindow :: onOkButtonClicked (void)                             throw ()
         gLiveSupport->createScratchpadWindow();
     }
     
-    loginWindow->hide();
+    mainWindow->hide();
 }
 
 
@@ -196,7 +187,7 @@ LoginWindow :: onOkButtonClicked (void)                             throw ()
 void
 LoginWindow :: onCancelButtonClicked (void)                         throw ()
 {
-    loginWindow->hide();
+    mainWindow->hide();
 }
 
 
@@ -206,7 +197,7 @@ LoginWindow :: onCancelButtonClicked (void)                  throw ()
 bool
 LoginWindow :: run(void)                                            throw ()
 {
-    Gtk::Main::run(*loginWindow);
+    Gtk::Main::run(*mainWindow);
     return loggedIn;
 }
 

campcaster/src/products/gLiveSupport/src/LoginWindow.h

@@ -40,15 +40,10 @@
 #include "configure.h"
 #endif
 
-#include <string>
-#include <unicode/resbund.h>
-#include <gtkmm.h>
-#include <libglademm.h>
-
 #include "LiveSupport/Core/Ptr.h"
-#include "LiveSupport/Core/LocalizedObject.h"
 #include "LiveSupport/Widgets/ComboBoxText.h"
-#include "GLiveSupport.h"
+#include "GuiWindow.h"
+
 
 namespace LiveSupport {
 namespace GLiveSupport {
@@ -70,25 +65,10 @@ using namespace LiveSupport::Widgets;
  *  @author $Author$
  *  @version $Revision$
  */
-class LoginWindow : public LocalizedObject
+class LoginWindow : public GuiWindow
 {
     private:
 
-        /**
-         *  The Glade object, containing the visual design.
-         */
-        Glib::RefPtr<Gnome::Glade::Xml>     glade;
-
-        /**
-         *  The GLiveSupport object, holding the state of the application.
-         */
-        Ptr<GLiveSupport>::Ref  gLiveSupport;
-
-        /**
-         *  The window itself.
-         */
-        Gtk::Dialog *           loginWindow;
-
         /**
          *  The user name text entry area.
          */
@@ -168,17 +148,8 @@ class LoginWindow : public LocalizedObject
 
         /**
          *  Constructor.
-         *
-         *  @param  gLiveSupport    the gLiveSupport object, containing
-         *                          all the vital info.
-         *  @param  bundle          the resource bundle holding the localized
-         *                          resources for this window.
-         *  @param  gladeDir        the directory where the glade file is.
          */
-        LoginWindow(Ptr<GLiveSupport>::Ref      gLiveSupport,
+        LoginWindow(void)                                   throw ();
-                    Ptr<ResourceBundle>::Ref    bundle,
-                    const Glib::ustring &       gladeDir)
-                                                            throw ();
 
         /**
          *  Virtual destructor.

campcaster/src/products/gLiveSupport/src/MasterPanelWindow.cxx

@@ -55,26 +55,31 @@ using namespace LiveSupport::GLiveSupport;
 
 namespace {
 
-/**
+/*------------------------------------------------------------------------------
+ *  The name of the localization resource bundle.
+ *----------------------------------------------------------------------------*/
+const Glib::ustring     bundleName = "masterPanelWindow";
+
+/*------------------------------------------------------------------------------
  *  The name of the glade file.
- */
+ *----------------------------------------------------------------------------*/
 const Glib::ustring     gladeFileName   = "MasterPanelWindow.glade";
 
-/**
+/*------------------------------------------------------------------------------
  *  The name of the application, shown on the task bar.
- */
+ *----------------------------------------------------------------------------*/
 const Glib::ustring     applicationTitleSuffix = " - Campcaster";
 
-/**
+/*------------------------------------------------------------------------------
  *  Number of times per second that onUpdateTime() is called.
  *  It's a good idea to make this a divisor of 1000.
- */
+ *----------------------------------------------------------------------------*/
 const int               updateTimeConstant = 20;
 
-/**
+/*------------------------------------------------------------------------------
  *  The delay between two checks on the progress of an asynchronous method
  *  (in seconds).
- */
+ *----------------------------------------------------------------------------*/
 const int               asyncUpdateFrequency = 10;
 
 /**
@@ -92,17 +97,12 @@ const int               rdsUpdateFrequency = 10;
 /*------------------------------------------------------------------------------
  *  Constructor.
  *----------------------------------------------------------------------------*/
-MasterPanelWindow :: MasterPanelWindow (Ptr<GLiveSupport>::Ref    gLiveSupport,
+MasterPanelWindow :: MasterPanelWindow (void)
-                                        Ptr<ResourceBundle>::Ref  bundle,
-                                        const Glib::ustring &     gladeDir)
                                                                     throw ()
-                        : LocalizedObject(bundle),
+          : GuiWindow(bundleName,
-                          gladeDir(gladeDir),
+                      gladeFileName),
-                          gLiveSupport(gLiveSupport),
             userIsLoggedIn(false)                          
 {
-    glade = Gnome::Glade::Xml::create(gladeDir + gladeFileName);
-    
     // load the station logo image
     Gtk::Image *        stationLogoImage;
     glade->get_widget("stationLogoImage1", stationLogoImage);
@@ -121,11 +121,11 @@ MasterPanelWindow :: MasterPanelWindow (Ptr<GLiveSupport>::Ref    gLiveSupport,
     timeLabel->set_attributes(timeLabelAttributes);
 
     // register the signal handlers for the main window
-    glade->get_widget("mainWindow1", masterPanelWindow);
+    glade->get_widget("mainWindow1", mainWindow);
-    masterPanelWindow->signal_key_press_event().connect(sigc::mem_fun(
+    mainWindow->signal_key_press_event().connect(sigc::mem_fun(
                                         *this,
                                         &MasterPanelWindow::onKeyPressed));
-    masterPanelWindow->signal_delete_event().connect(sigc::mem_fun(
+    mainWindow->signal_delete_event().connect(sigc::mem_fun(
                                         *this,
                                         &MasterPanelWindow::onDeleteEvent));
 
@@ -133,7 +133,7 @@ MasterPanelWindow :: MasterPanelWindow (Ptr<GLiveSupport>::Ref    gLiveSupport,
     Gtk::Box *      nowPlayingBox;
     glade->get_widget("nowPlayingWidget1", nowPlayingBox);
     nowPlayingWidget.reset(new NowPlaying(gLiveSupport,
-                                          bundle,
+                                          getBundle(),
                                           glade));
 
     // get a reference for the window-opener buttons
@@ -178,9 +178,9 @@ MasterPanelWindow :: MasterPanelWindow (Ptr<GLiveSupport>::Ref    gLiveSupport,
                                 &MasterPanelWindow::onLoginButtonClicked));
 
     // set the size and location of the window, according to the screen size
-    Glib::RefPtr<Gdk::Screen>   screen = masterPanelWindow->get_screen();
+    Glib::RefPtr<Gdk::Screen>   screen = mainWindow->get_screen();
-    masterPanelWindow->set_default_size(screen->get_width(), -1);
+    mainWindow->set_default_size(screen->get_width(), -1);
-    masterPanelWindow->move(0, 0);
+    mainWindow->move(0, 0);
 
     // show what's there to see
     showAnonymousUI();
@@ -206,18 +206,15 @@ MasterPanelWindow :: ~MasterPanelWindow (void)                      throw ()
  *  Change the language of the panel
  *----------------------------------------------------------------------------*/
 void
-MasterPanelWindow :: changeLanguage(Ptr<ResourceBundle>::Ref    bundle)
+MasterPanelWindow :: changeLanguage(void)
                                                                     throw ()
 {
-    setBundle(bundle);
+    Ptr<ResourceBundle>::Ref    newBundle = gLiveSupport->getBundle(
+                                                                bundleName);
+    setBundle(newBundle);
+    nowPlayingWidget->changeLanguage(newBundle);
 
-    Glib::ustring               title = *getResourceUstring(
+    setTitle(getResourceUstring("windowTitle"));
-                                                "masterPanelWindow",
-                                                "windowTitle");
-    title += applicationTitleSuffix;
-    masterPanelWindow->set_title(title);
-
-    nowPlayingWidget->changeLanguage(bundle);
 
     liveModeButton->set_label(*getResourceUstring(
                                         "liveModeButtonLabel"));
@@ -745,11 +742,7 @@ MasterPanelWindow :: onLoginButtonClicked(void)                     throw ()
 void
 MasterPanelWindow :: login(void)                                    throw ()
 {
-    Ptr<ResourceBundle>::Ref    loginBundle = getBundle("loginWindow");
+    Ptr<LoginWindow>::Ref       loginWindow(new LoginWindow());
-
-    Ptr<LoginWindow>::Ref       loginWindow(new LoginWindow(gLiveSupport,
-                                                            loginBundle,
-                                                            gladeDir));
     userIsLoggedIn = loginWindow->run();
 
     if (userIsLoggedIn) {

campcaster/src/products/gLiveSupport/src/MasterPanelWindow.h

@@ -44,8 +44,8 @@
 #include <libglademm.h>
 
 #include "LiveSupport/Core/Ptr.h"
-#include "LiveSupport/Core/LocalizedObject.h"
 
+#include "GuiWindow.h"
 #include "GLiveSupport.h"
 #include "NowPlaying.h"
 #include "LiveModeWindow.h"
@@ -93,25 +93,10 @@ using namespace LiveSupport::Core;
  *  @author $Author$
  *  @version $Revision$
  */
-class MasterPanelWindow : public LocalizedObject
+class MasterPanelWindow : public GuiWindow
 {
     private:
 
-        /**
-         *  The directory where the Glade files are.
-         */
-        Glib::ustring                       gladeDir;
-
-        /**
-         *  The Glade object, containing the visual design.
-         */
-        Glib::RefPtr<Gnome::Glade::Xml>     glade;
-
-        /**
-         *  The gLiveSupport object, handling the logic of the application.
-         */
-        Ptr<GLiveSupport>::Ref              gLiveSupport;
-
         /**
          *  Whether a user is currently logged in.
          */
@@ -132,11 +117,6 @@ class MasterPanelWindow : public LocalizedObject
 
     protected:
 
-        /**
-         *  The main window.
-         */
-        Gtk::Window *                       masterPanelWindow;
-
         /**
          *  The time display
          */
@@ -413,16 +393,8 @@ class MasterPanelWindow : public LocalizedObject
 
         /**
          *  Constructor.
-         *
-         *  @param  gLiveSupport    the gLiveSupport object, handling the
-         *                          logic of the application.
-         *  @param  bundle      the resource bundle holding localized resources.
-         *  @param  gladeDir    the directory where the Glade files are.
          */
-        MasterPanelWindow(Ptr<GLiveSupport>::Ref     gLiveSupport,
+        MasterPanelWindow(void)                                 throw ();
-                          Ptr<ResourceBundle>::Ref   bundle,
-                          const Glib::ustring &      gladeDir)
-                                                                throw ();
 
         /**
          *  Virtual destructor.
@@ -431,28 +403,17 @@ class MasterPanelWindow : public LocalizedObject
         ~MasterPanelWindow(void)                                throw ();
 
         /**
-         *  Give access to the Gtk::Window of the window.
+         *  Change the user interface language of the application.
-         *  The caller does not get ownership of the widget, and he
+         *
-         *  should not / does not need to dispose of it.
+         *  This is called by GLiveSupport, when its own locale changes.
-         */
+         *
-        Gtk::Window *
+         *  This method assumes that only the MasterPanelWindow is visible,
-        getWindow(void)                                         throw ()
-        {
-            return masterPanelWindow;
-        }
-
-        /**
-         *  Change the user interface language of the application
-         *  by providing a new resource bundle.
-         *  This call assumes that only the MasterPanelWindow is visible,
          *  and will only change the language of the currently open
          *  MasterPanelWindow. No other open windows will be affected by
          *  this call, but subsequently opened windows are.
-         *
-         *  @param bundle the new resource bundle.
          */
         void
-        changeLanguage(Ptr<ResourceBundle>::Ref     bundle)     throw ();
+        changeLanguage(void)                                    throw ();
 
         /**
          *  Show the UI components that are visible when no one is logged in.

campcaster/src/products/gLiveSupport/var/es.txt

@@ -1,5 +1,24 @@
 es:table
 {
+    cancelButtonLabel:string        { "Cancel" }
+    noButtonLabel:string            { "No" }
+    yesButtonLabel:string           { "Yes" }
+    okButtonLabel:string            { "OK" }
+
+    localeNotAvailableMsg:string    { "Ubicación {0} no disponible" }
+    schedulerNotReachableMsg:string { "El servidor del programador no está disponible" }
+    storageNotReachableMsg:string   { "El servidor de almacenamiento no está disponible" }
+    authenticationNotReachableMsg:string
+                                    { "El servidor de autenticación no está "
+                                      "disponible.\n"
+                                      "Would you like to edit the server "
+                                      "settings?" }
+    audioErrorMsg                   { "Error del reproductor de audio: " }
+
+    masterPanelWindow:table
+    {
+        windowTitle:string          { "Panel maestro" }
+
         notLoggedInMsg:string           { "No ha ingresado al sistema" }
         loggedInMsg:string              { "Ingresó: {0}" }
         loginButtonLabel:string         { "Accesar" }
@@ -12,28 +31,10 @@ es:table
         searchButtonLabel:string        { "Búsqueda" }
         optionsButtonLabel:string       { "Options" }
 
-    cancelButtonLabel:string        { "Cancel" }
-    noButtonLabel:string            { "No" }
-    yesButtonLabel:string           { "Yes" }
-    okButtonLabel:string            { "OK" }
-
         elapsedTimeLabel:string     { "elapsed" }
         remainingTimeLabel:string   { "remaining" }
 
-    localeNotAvailableMsg:string    { "Ubicación {0} no disponible" }
-    schedulerNotReachableMsg:string { "El servidor del programador no está disponible" }
-    storageNotReachableMsg:string   { "El servidor de almacenamiento no está disponible" }
-    authenticationNotReachableMsg:string
-                                    { "El servidor de autenticación no está "
-                                      "disponible.\n"
-                                      "Would you like to edit the server "
-                                      "settings?" }
-    audioErrorMsg                   { "Error del reproductor de audio: " }
         sureToExitMsg:string        { "Are you sure you want to exit?" }
-
-    masterPanelWindow:table
-    {
-    windowTitle:string              { "Panel maestro" }
     }
 
     loginWindow:table

campcaster/src/products/gLiveSupport/var/hu.txt

@@ -1,5 +1,22 @@
 hu:table
 {
+    cancelButtonLabel:string        { "Mégsem" }
+    noButtonLabel:string            { "Nem" }
+    yesButtonLabel:string           { "Igen" }
+    okButtonLabel:string            { "OK" }
+
+    localeNotAvailableMsg:string        { "A {0} nyelv nem elérhető" }
+    schedulerNotReachableMsg:string     { "Az időzítő szerver nem elérhető" }
+    storageNotReachableMsg:string       { "A tároló szerver nem elérhető" }
+    authenticationNotReachableMsg:string 
+                                        { "A beléptető szerver nem elérhető.\n"
+                                          "Szerver beállítások szerkesztése?" }
+    audioErrorMsg                       { "Hiba történt a lejátszáskor: " }
+
+    masterPanelWindow:table
+    {
+        windowTitle:string          { "Fő Panel" }
+
         notLoggedInMsg:string           { "Nincs bejelentkezve" }
         loggedInMsg:string              { "Bejelentkezve: {0}" }
         loginButtonLabel:string         { "Log in" }
@@ -12,26 +29,10 @@ hu:table
         searchButtonLabel:string        { "Keresés" }
         optionsButtonLabel:string       { "Beállítások" }
 
-    cancelButtonLabel:string        { "Mégsem" }
+        elapsedTimeLabel:string     { "eltelt" }
-    noButtonLabel:string            { "Nem" }
+        remainingTimeLabel:string   { "hátralevő" }
-    yesButtonLabel:string           { "Igen" }
-    okButtonLabel:string            { "OK" }
 
-    elapsedTimeLabel:string         { "elapsed" }
-    remainingTimeLabel:string       { "remaining" }
-
-    localeNotAvailableMsg:string        { "A {0} nyelv nem elérhető" }
-    schedulerNotReachableMsg:string     { "Az időzítő szerver nem elérhető" }
-    storageNotReachableMsg:string       { "A tároló szerver nem elérhető" }
-    authenticationNotReachableMsg:string 
-                                        { "A beléptető szerver nem elérhető.\n"
-                                          "Szerver beállítások szerkesztése?" }
-    audioErrorMsg                       { "Hiba történt a lejátszáskor: " }
         sureToExitMsg:string        { "Biztos, hogy ki szeretne lépni?" }
-
-    masterPanelWindow:table
-    {
-    windowTitle:string              { "Fő Panel" }
     }
 
     loginWindow:table

campcaster/src/products/gLiveSupport/var/nl.txt

@@ -1,5 +1,24 @@
 nl:table
 {
+    cancelButtonLabel:string        { "Cancel" }
+    noButtonLabel:string            { "No" }
+    yesButtonLabel:string           { "Yes" }
+    okButtonLabel:string            { "OK" }
+
+    localeNotAvailableMsg:string    { "Locale {0} niet beschikbaar" }
+    schedulerNotReachableMsg:string { "Scheduler server niet beschikbaar" }
+    storageNotReachableMsg:string   { "Storage server niet beschikbaar" }
+    authenticationNotReachableMsg:string
+                                    { "Authentication server niet "
+                                      "beschikbaar.\n"
+                                      "Would you like to edit the server "
+                                      "settings?" }
+    audioErrorMsg                   { "Audio player fout: " }
+
+    masterPanelWindow:table
+    {
+        windowTitle:string          { "Master Panel" }
+
         notLoggedInMsg:string           { "Niet aangemeld" }
         loggedInMsg:string              { "Aangemeld: {0}" }
         loginButtonLabel:string         { "Aanmelden" }
@@ -12,28 +31,10 @@ nl:table
         searchButtonLabel:string        { "Zoeken" }
         optionsButtonLabel:string       { "Options" }
 
-    cancelButtonLabel:string        { "Cancel" }
-    noButtonLabel:string            { "No" }
-    yesButtonLabel:string           { "Yes" }
-    okButtonLabel:string            { "OK" }
-
         elapsedTimeLabel:string     { "elapsed" }
         remainingTimeLabel:string   { "remaining" }
 
-    localeNotAvailableMsg:string    { "Locale {0} niet beschikbaar" }
-    schedulerNotReachableMsg:string { "Scheduler server niet beschikbaar" }
-    storageNotReachableMsg:string   { "Storage server niet beschikbaar" }
-    authenticationNotReachableMsg:string
-                                    { "Authentication server niet "
-                                      "beschikbaar.\n"
-                                      "Would you like to edit the server "
-                                      "settings?" }
-    audioErrorMsg                   { "Audio player fout: " }
         sureToExitMsg:string        { "Are you sure you want to exit?" }
-
-    masterPanelWindow:table
-    {
-    windowTitle:string              { "Master Panel" }
     }
 
     loginWindow:table

campcaster/src/products/gLiveSupport/var/pl.txt

@@ -1,5 +1,23 @@
 pl:table
 {
+    cancelButtonLabel:string        { "Anuluj" }
+    noButtonLabel:string            { "Nie" }
+    yesButtonLabel:string           { "Tak" }
+    okButtonLabel:string            { "OK" }
+
+    localeNotAvailableMsg:string    { "Język {0} nie jest dostępny" }
+    schedulerNotReachableMsg:string { "Serwer programacji nie jest dostępny" }
+    storageNotReachableMsg:string   { "Serwer plików nie jest dostępny" }
+    authenticationNotReachableMsg:string
+                                    { "Serwer logowania nie jest dostępny.\n"
+                                      "Would you like to edit the server "
+                                      "settings?" }
+    audioErrorMsg                   { "Błąd odtwarzacz: " }
+
+    masterPanelWindow:table
+    {
+        windowTitle:string          { "Okno główne" }
+
         notLoggedInMsg:string           { "Nie zalogowany" }
         loggedInMsg:string              { "Zalogowany: {0}" }
         loginButtonLabel:string         { "Zaloguj" }
@@ -12,27 +30,10 @@ pl:table
         searchButtonLabel:string        { "Szukaj" }
         optionsButtonLabel:string       { "Options" }
 
-    cancelButtonLabel:string        { "Anuluj" }
-    noButtonLabel:string            { "Nie" }
-    yesButtonLabel:string           { "Tak" }
-    okButtonLabel:string            { "OK" }
-
         elapsedTimeLabel:string     { "minęło" }
         remainingTimeLabel:string   { "zostało" }
 
-    localeNotAvailableMsg:string    { "Język {0} nie jest dostępny" }
-    schedulerNotReachableMsg:string { "Serwer programacji nie jest dostępny" }
-    storageNotReachableMsg:string   { "Serwer plików nie jest dostępny" }
-    authenticationNotReachableMsg:string
-                                    { "Serwer logowania nie jest dostępny.\n"
-                                      "Would you like to edit the server "
-                                      "settings?" }
-    audioErrorMsg                   { "Błąd odtwarzacz: " }
         sureToExitMsg:string        { "Czy na pewno opuścić program ?" }
-
-    masterPanelWindow:table
-    {
-    windowTitle:string              { "Okno główne" }
     }
 
     loginWindow:table

campcaster/src/products/gLiveSupport/var/root.txt

@@ -1,5 +1,24 @@
 root:table
 {
+    cancelButtonLabel:string        { "Cancel" }
+    noButtonLabel:string            { "No" }
+    yesButtonLabel:string           { "Yes" }
+    okButtonLabel:string            { "OK" }
+
+    localeNotAvailableMsg:string    { "Locale {0} is not available." }
+    schedulerNotReachableMsg:string { "The scheduler server is not available." }
+    storageNotReachableMsg:string   { "The storage server is not available." }
+    authenticationNotReachableMsg:string
+                                    { "The authentication server is not "
+                                      "available.\n"
+                                      "Would you like to edit the server "
+                                      "settings?" }
+    audioErrorMsg                   { "Audio player error: " }
+
+    masterPanelWindow:table
+    {
+        windowTitle:string          { "Master Panel" }
+
         notLoggedInMsg:string           { "Not logged in" }
         loggedInMsg:string              { "User: {0}" }
         loginButtonLabel:string         { "Log in" }
@@ -12,28 +31,10 @@ root:table
         searchButtonLabel:string        { "Search" }
         optionsButtonLabel:string       { "Options" }
 
-    cancelButtonLabel:string        { "Cancel" }
-    noButtonLabel:string            { "No" }
-    yesButtonLabel:string           { "Yes" }
-    okButtonLabel:string            { "OK" }
-
         elapsedTimeLabel:string     { "elapsed" }
         remainingTimeLabel:string   { "remaining" }
 
-    localeNotAvailableMsg:string    { "Locale {0} is not available." }
-    schedulerNotReachableMsg:string { "The scheduler server is not available." }
-    storageNotReachableMsg:string   { "The storage server is not available." }
-    authenticationNotReachableMsg:string
-                                    { "The authentication server is not "
-                                      "available.\n"
-                                      "Would you like to edit the server "
-                                      "settings?" }
-    audioErrorMsg                   { "Audio player error: " }
         sureToExitMsg:string        { "Are you sure you want to exit?" }
-
-    masterPanelWindow:table
-    {
-        windowTitle:string          { "Master Panel" }
     }
 
     loginWindow:table

campcaster/src/products/gLiveSupport/var/sr_CS.txt

@@ -1,5 +1,22 @@
 sr_CS:table
 {
+    cancelButtonLabel:string        { "Otkaži" }
+    noButtonLabel:string            { "Ne" }
+    yesButtonLabel:string           { "Da" }
+    okButtonLabel:string            { "OK" }
+
+    localeNotAvailableMsg:string    { "Mesto {0} nije dostupno" }
+    schedulerNotReachableMsg:string { "Server sa rasporedom nije dostupan" }
+    storageNotReachableMsg:string   { "Server nije dostupan" }
+    authenticationNotReachableMsg:string
+                                    { "Server za autentizaciju nije dostupan.\n"
+                                      "Da li biste želeli da promenite serverske postavke?" }
+    audioErrorMsg                   { "Greška u audio plejeru: " }
+
+    masterPanelWindow:table
+    {
+        windowTitle:string          { "Glavni panel" }
+
         notLoggedInMsg:string           { "Niste prijavljeni" }
         loggedInMsg:string              { "Prijavljeni: {0}" }
         loginButtonLabel:string         { "Prijava" }
@@ -12,26 +29,10 @@ sr_CS:table
         searchButtonLabel:string        { "Pretraga" }
         optionsButtonLabel:string       { "Opcije" }
 
-    cancelButtonLabel:string        { "Otkaži" }
-    noButtonLabel:string            { "Ne" }
-    yesButtonLabel:string           { "Da" }
-    okButtonLabel:string            { "OK" }
-
         elapsedTimeLabel:string     { "pozicija" }
         remainingTimeLabel:string   { "preostalo" }
 
-    localeNotAvailableMsg:string    { "Mesto {0} nije dostupno" }
-    schedulerNotReachableMsg:string { "Server sa rasporedom nije dostupan" }
-    storageNotReachableMsg:string   { "Server nije dostupan" }
-    authenticationNotReachableMsg:string
-                                    { "Server za autentizaciju nije dostupan.\n"
-                                      "Da li biste želeli da promenite serverske postavke?" }
-    audioErrorMsg                   { "Greška u audio plejeru: " }
         sureToExitMsg:string        { "Sigurno želite da izađete?" }
-
-    masterPanelWindow:table
-    {
-        windowTitle:string          { "Glavni panel" }
     }
 
     loginWindow:table

campcaster/src/products/gLiveSupport/var/sr_CS_CYRILLIC.txt

@@ -1,5 +1,22 @@
 sr_CS_CYRILLIC:table
 {
+    cancelButtonLabel:string        { "Откажи" }
+    noButtonLabel:string            { "Не" }
+    yesButtonLabel:string           { "Да" }
+    okButtonLabel:string            { "ОК" }
+
+    localeNotAvailableMsg:string    { "Место {0} није доступно" }
+    schedulerNotReachableMsg:string { "Сервер са распоредом није доступан" }
+    storageNotReachableMsg:string   { "Сервер није доступан" }
+    authenticationNotReachableMsg:string
+                                    { "Сервер за аутентизацију није доступан.\n"
+                                      "Да ли бисте желели да промените серверске поставке?" }
+    audioErrorMsg                   { "Грешка у аудио плејеру: " }
+
+    masterPanelWindow:table
+    {
+        windowTitle:string          { "Главни панел" }
+
         notLoggedInMsg:string           { "Нисте пријављени" }
         loggedInMsg:string              { "Пријављени: {0}" }
         loginButtonLabel:string         { "Пријава" }
@@ -12,26 +29,10 @@ sr_CS_CYRILLIC:table
         searchButtonLabel:string        { "Претрага" }
         optionsButtonLabel:string       { "Опције" }
 
-    cancelButtonLabel:string        { "Откажи" }
-    noButtonLabel:string            { "Не" }
-    yesButtonLabel:string           { "Да" }
-    okButtonLabel:string            { "ОК" }
-
         elapsedTimeLabel:string     { "позиција" }
         remainingTimeLabel:string   { "преостало" }
 
-    localeNotAvailableMsg:string    { "Место {0} није доступно" }
-    schedulerNotReachableMsg:string { "Сервер са распоредом није доступан" }
-    storageNotReachableMsg:string   { "Сервер није доступан" }
-    authenticationNotReachableMsg:string
-                                    { "Сервер за аутентизацију није доступан.\n"
-                                      "Да ли бисте желели да промените серверске поставке?" }
-    audioErrorMsg                   { "Грешка у аудио плејеру: " }
         sureToExitMsg:string        { "Сигурно желите да изађете?" }
-
-    masterPanelWindow:table
-    {
-        windowTitle:string          { "Главни панел" }
     }
 
     loginWindow:table