From b7f736540e52a07fda5396b691f0699a67513401 Mon Sep 17 00:00:00 2001 From: fgerlits Date: Thu, 9 Aug 2007 15:50:05 +0000 Subject: [PATCH] refactoring, stage 3: the Login Window and the Master Panel are now GuiWindows --- .../gLiveSupport/src/GLiveSupport.cxx | 6 +- .../products/gLiveSupport/src/LoginWindow.cxx | 37 ++++------ .../products/gLiveSupport/src/LoginWindow.h | 37 ++-------- .../gLiveSupport/src/MasterPanelWindow.cxx | 69 +++++++++---------- .../gLiveSupport/src/MasterPanelWindow.h | 57 +++------------ .../src/products/gLiveSupport/var/es.txt | 35 +++++----- .../src/products/gLiveSupport/var/hu.txt | 35 +++++----- .../src/products/gLiveSupport/var/nl.txt | 35 +++++----- .../src/products/gLiveSupport/var/pl.txt | 35 +++++----- .../src/products/gLiveSupport/var/root.txt | 33 ++++----- .../src/products/gLiveSupport/var/sr_CS.txt | 33 ++++----- .../gLiveSupport/var/sr_CS_CYRILLIC.txt | 33 ++++----- 12 files changed, 183 insertions(+), 262 deletions(-) diff --git a/campcaster/src/products/gLiveSupport/src/GLiveSupport.cxx b/campcaster/src/products/gLiveSupport/src/GLiveSupport.cxx index 2d9b4262f..cc3953506 100644 --- a/campcaster/src/products/gLiveSupport/src/GLiveSupport.cxx +++ b/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(), - getBundle(), - gladeDir)); + masterPanel.reset(new MasterPanelWindow()); masterPanel->getWindow()->set_icon_list(taskbarIcons->getIconList()); masterPanel->getWindow()->set_default_icon_list( @@ -654,7 +652,7 @@ GLiveSupport :: changeLanguage(Ptr::Ref locale) metadataTypeContainer->setBundle(getBundle("metadataTypes")); if (masterPanel.get()) { - masterPanel->changeLanguage(getBundle()); + masterPanel->changeLanguage(); } } diff --git a/campcaster/src/products/gLiveSupport/src/LoginWindow.cxx b/campcaster/src/products/gLiveSupport/src/LoginWindow.cxx index 0eee99772..0881095e4 100644 --- a/campcaster/src/products/gLiveSupport/src/LoginWindow.cxx +++ b/campcaster/src/products/gLiveSupport/src/LoginWindow.cxx @@ -33,9 +33,7 @@ #include "configure.h" #endif -#include -#include - +#include "GLiveSupport.h" #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::Ref gLiveSupport, - Ptr::Ref bundle, - const Glib::ustring & gladeDir) +LoginWindow :: LoginWindow (void) throw () - : LocalizedObject(bundle), - gLiveSupport(gLiveSupport), + : GuiWindow(bundleName, + 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::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(); } @@ -194,9 +185,9 @@ LoginWindow :: onOkButtonClicked (void) throw () * Event handler for the cancel button getting clicked. *----------------------------------------------------------------------------*/ void -LoginWindow :: onCancelButtonClicked (void) throw () +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; } diff --git a/campcaster/src/products/gLiveSupport/src/LoginWindow.h b/campcaster/src/products/gLiveSupport/src/LoginWindow.h index 3a2051040..25839b7e9 100644 --- a/campcaster/src/products/gLiveSupport/src/LoginWindow.h +++ b/campcaster/src/products/gLiveSupport/src/LoginWindow.h @@ -40,15 +40,10 @@ #include "configure.h" #endif -#include -#include -#include -#include - #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 glade; - - /** - * The GLiveSupport object, holding the state of the application. - */ - Ptr::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::Ref gLiveSupport, - Ptr::Ref bundle, - const Glib::ustring & gladeDir) - throw (); + LoginWindow(void) throw (); /** * Virtual destructor. diff --git a/campcaster/src/products/gLiveSupport/src/MasterPanelWindow.cxx b/campcaster/src/products/gLiveSupport/src/MasterPanelWindow.cxx index a6187ec51..54d99b302 100644 --- a/campcaster/src/products/gLiveSupport/src/MasterPanelWindow.cxx +++ b/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::Ref gLiveSupport, - Ptr::Ref bundle, - const Glib::ustring & gladeDir) +MasterPanelWindow :: MasterPanelWindow (void) throw () - : LocalizedObject(bundle), - gladeDir(gladeDir), - gLiveSupport(gLiveSupport), - userIsLoggedIn(false) + : GuiWindow(bundleName, + gladeFileName), + 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::Ref gLiveSupport, timeLabel->set_attributes(timeLabelAttributes); // register the signal handlers for the main window - glade->get_widget("mainWindow1", masterPanelWindow); - masterPanelWindow->signal_key_press_event().connect(sigc::mem_fun( + glade->get_widget("mainWindow1", mainWindow); + 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::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::Ref gLiveSupport, &MasterPanelWindow::onLoginButtonClicked)); // set the size and location of the window, according to the screen size - Glib::RefPtr screen = masterPanelWindow->get_screen(); - masterPanelWindow->set_default_size(screen->get_width(), -1); - masterPanelWindow->move(0, 0); + Glib::RefPtr screen = mainWindow->get_screen(); + mainWindow->set_default_size(screen->get_width(), -1); + 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::Ref bundle) +MasterPanelWindow :: changeLanguage(void) throw () { - setBundle(bundle); + Ptr::Ref newBundle = gLiveSupport->getBundle( + bundleName); + setBundle(newBundle); + nowPlayingWidget->changeLanguage(newBundle); - Glib::ustring title = *getResourceUstring( - "masterPanelWindow", - "windowTitle"); - title += applicationTitleSuffix; - masterPanelWindow->set_title(title); - - nowPlayingWidget->changeLanguage(bundle); + setTitle(getResourceUstring("windowTitle")); liveModeButton->set_label(*getResourceUstring( "liveModeButtonLabel")); @@ -745,11 +742,7 @@ MasterPanelWindow :: onLoginButtonClicked(void) throw () void MasterPanelWindow :: login(void) throw () { - Ptr::Ref loginBundle = getBundle("loginWindow"); - - Ptr::Ref loginWindow(new LoginWindow(gLiveSupport, - loginBundle, - gladeDir)); + Ptr::Ref loginWindow(new LoginWindow()); userIsLoggedIn = loginWindow->run(); if (userIsLoggedIn) { diff --git a/campcaster/src/products/gLiveSupport/src/MasterPanelWindow.h b/campcaster/src/products/gLiveSupport/src/MasterPanelWindow.h index a6977b4dd..e76fded9b 100644 --- a/campcaster/src/products/gLiveSupport/src/MasterPanelWindow.h +++ b/campcaster/src/products/gLiveSupport/src/MasterPanelWindow.h @@ -44,8 +44,8 @@ #include #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 glade; - - /** - * The gLiveSupport object, handling the logic of the application. - */ - Ptr::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::Ref gLiveSupport, - Ptr::Ref bundle, - const Glib::ustring & gladeDir) - throw (); + MasterPanelWindow(void) throw (); /** * Virtual destructor. @@ -431,28 +403,17 @@ class MasterPanelWindow : public LocalizedObject ~MasterPanelWindow(void) throw (); /** - * Give access to the Gtk::Window of the window. - * The caller does not get ownership of the widget, and he - * should not / does not need to dispose of it. - */ - Gtk::Window * - 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, + * Change the user interface language of the application. + * + * This is called by GLiveSupport, when its own locale changes. + * + * This method 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::Ref bundle) throw (); + changeLanguage(void) throw (); /** * Show the UI components that are visible when no one is logged in. diff --git a/campcaster/src/products/gLiveSupport/var/es.txt b/campcaster/src/products/gLiveSupport/var/es.txt index 73cf8e19c..a3e986632 100644 --- a/campcaster/src/products/gLiveSupport/var/es.txt +++ b/campcaster/src/products/gLiveSupport/var/es.txt @@ -1,25 +1,10 @@ es:table { - notLoggedInMsg:string { "No ha ingresado al sistema" } - loggedInMsg:string { "Ingresó: {0}" } - loginButtonLabel:string { "Accesar" } - logoutButtonLabel:string { "Salir" } - liveModeButtonLabel:string { "En vivo" } - uploadFileButtonLabel:string { "Cargar archivo" } - scratchpadButtonLabel:string { "Scratchpad" } - playlistButtonLabel:string { "Lista de repr." } - schedulerButtonLabel:string { "Programador" } - 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" } @@ -29,11 +14,27 @@ es:table "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" } + windowTitle:string { "Panel maestro" } + + notLoggedInMsg:string { "No ha ingresado al sistema" } + loggedInMsg:string { "Ingresó: {0}" } + loginButtonLabel:string { "Accesar" } + logoutButtonLabel:string { "Salir" } + liveModeButtonLabel:string { "En vivo" } + uploadFileButtonLabel:string { "Cargar archivo" } + scratchpadButtonLabel:string { "Scratchpad" } + playlistButtonLabel:string { "Lista de repr." } + schedulerButtonLabel:string { "Programador" } + searchButtonLabel:string { "Búsqueda" } + optionsButtonLabel:string { "Options" } + + elapsedTimeLabel:string { "elapsed" } + remainingTimeLabel:string { "remaining" } + + sureToExitMsg:string { "Are you sure you want to exit?" } } loginWindow:table diff --git a/campcaster/src/products/gLiveSupport/var/hu.txt b/campcaster/src/products/gLiveSupport/var/hu.txt index efca2d664..eb54d2a28 100644 --- a/campcaster/src/products/gLiveSupport/var/hu.txt +++ b/campcaster/src/products/gLiveSupport/var/hu.txt @@ -1,25 +1,10 @@ hu:table { - notLoggedInMsg:string { "Nincs bejelentkezve" } - loggedInMsg:string { "Bejelentkezve: {0}" } - loginButtonLabel:string { "Log in" } - logoutButtonLabel:string { "Log out" } - liveModeButtonLabel:string { "Élő adás" } - uploadFileButtonLabel:string { "Filefeltöltés" } - scratchpadButtonLabel:string { "Scratchpad" } - playlistButtonLabel:string { "Műsorkezelés" } - schedulerButtonLabel:string { "Időzítő" } - searchButtonLabel:string { "Keresés" } - optionsButtonLabel:string { "Beállítások" } - cancelButtonLabel:string { "Mégsem" } noButtonLabel:string { "Nem" } 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ő" } @@ -27,11 +12,27 @@ hu:table { "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" } + windowTitle:string { "Fő Panel" } + + notLoggedInMsg:string { "Nincs bejelentkezve" } + loggedInMsg:string { "Bejelentkezve: {0}" } + loginButtonLabel:string { "Log in" } + logoutButtonLabel:string { "Log out" } + liveModeButtonLabel:string { "Élő adás" } + uploadFileButtonLabel:string { "Filefeltöltés" } + scratchpadButtonLabel:string { "Scratchpad" } + playlistButtonLabel:string { "Műsorkezelés" } + schedulerButtonLabel:string { "Időzítő" } + searchButtonLabel:string { "Keresés" } + optionsButtonLabel:string { "Beállítások" } + + elapsedTimeLabel:string { "eltelt" } + remainingTimeLabel:string { "hátralevő" } + + sureToExitMsg:string { "Biztos, hogy ki szeretne lépni?" } } loginWindow:table diff --git a/campcaster/src/products/gLiveSupport/var/nl.txt b/campcaster/src/products/gLiveSupport/var/nl.txt index 2d854323c..0ce8ca88d 100644 --- a/campcaster/src/products/gLiveSupport/var/nl.txt +++ b/campcaster/src/products/gLiveSupport/var/nl.txt @@ -1,25 +1,10 @@ nl:table { - notLoggedInMsg:string { "Niet aangemeld" } - loggedInMsg:string { "Aangemeld: {0}" } - loginButtonLabel:string { "Aanmelden" } - logoutButtonLabel:string { "Afmelden" } - liveModeButtonLabel:string { "Live mode" } - uploadFileButtonLabel:string { "Bestand toevoegen" } - scratchpadButtonLabel:string { "Scratchpad" } - playlistButtonLabel:string { "Playlist" } - schedulerButtonLabel:string { "Scheduler" } - 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" } @@ -29,11 +14,27 @@ nl:table "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" } + windowTitle:string { "Master Panel" } + + notLoggedInMsg:string { "Niet aangemeld" } + loggedInMsg:string { "Aangemeld: {0}" } + loginButtonLabel:string { "Aanmelden" } + logoutButtonLabel:string { "Afmelden" } + liveModeButtonLabel:string { "Live mode" } + uploadFileButtonLabel:string { "Bestand toevoegen" } + scratchpadButtonLabel:string { "Scratchpad" } + playlistButtonLabel:string { "Playlist" } + schedulerButtonLabel:string { "Scheduler" } + searchButtonLabel:string { "Zoeken" } + optionsButtonLabel:string { "Options" } + + elapsedTimeLabel:string { "elapsed" } + remainingTimeLabel:string { "remaining" } + + sureToExitMsg:string { "Are you sure you want to exit?" } } loginWindow:table diff --git a/campcaster/src/products/gLiveSupport/var/pl.txt b/campcaster/src/products/gLiveSupport/var/pl.txt index ac18de9b6..35f10c067 100644 --- a/campcaster/src/products/gLiveSupport/var/pl.txt +++ b/campcaster/src/products/gLiveSupport/var/pl.txt @@ -1,25 +1,10 @@ pl:table { - notLoggedInMsg:string { "Nie zalogowany" } - loggedInMsg:string { "Zalogowany: {0}" } - loginButtonLabel:string { "Zaloguj" } - logoutButtonLabel:string { "Wyloguj" } - liveModeButtonLabel:string { "Na żywo" } - uploadFileButtonLabel:string { "Załaduj plik" } - scratchpadButtonLabel:string { "Przybornik" } - playlistButtonLabel:string { "Listę utworów" } - schedulerButtonLabel:string { "Programacja" } - 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" } @@ -28,11 +13,27 @@ pl:table "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" } + windowTitle:string { "Okno główne" } + + notLoggedInMsg:string { "Nie zalogowany" } + loggedInMsg:string { "Zalogowany: {0}" } + loginButtonLabel:string { "Zaloguj" } + logoutButtonLabel:string { "Wyloguj" } + liveModeButtonLabel:string { "Na żywo" } + uploadFileButtonLabel:string { "Załaduj plik" } + scratchpadButtonLabel:string { "Przybornik" } + playlistButtonLabel:string { "Listę utworów" } + schedulerButtonLabel:string { "Programacja" } + searchButtonLabel:string { "Szukaj" } + optionsButtonLabel:string { "Options" } + + elapsedTimeLabel:string { "minęło" } + remainingTimeLabel:string { "zostało" } + + sureToExitMsg:string { "Czy na pewno opuścić program ?" } } loginWindow:table diff --git a/campcaster/src/products/gLiveSupport/var/root.txt b/campcaster/src/products/gLiveSupport/var/root.txt index 205c5e6b2..8d5f64002 100644 --- a/campcaster/src/products/gLiveSupport/var/root.txt +++ b/campcaster/src/products/gLiveSupport/var/root.txt @@ -1,25 +1,10 @@ root:table { - notLoggedInMsg:string { "Not logged in" } - loggedInMsg:string { "User: {0}" } - loginButtonLabel:string { "Log in" } - logoutButtonLabel:string { "Log out" } - liveModeButtonLabel:string { "Live Mode" } - uploadFileButtonLabel:string { "Upload File" } - scratchpadButtonLabel:string { "Scratchpad" } - playlistButtonLabel:string { "Playlist" } - schedulerButtonLabel:string { "Scheduler" } - 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." } @@ -29,11 +14,27 @@ root:table "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" } + + notLoggedInMsg:string { "Not logged in" } + loggedInMsg:string { "User: {0}" } + loginButtonLabel:string { "Log in" } + logoutButtonLabel:string { "Log out" } + liveModeButtonLabel:string { "Live Mode" } + uploadFileButtonLabel:string { "Upload File" } + scratchpadButtonLabel:string { "Scratchpad" } + playlistButtonLabel:string { "Playlist" } + schedulerButtonLabel:string { "Scheduler" } + searchButtonLabel:string { "Search" } + optionsButtonLabel:string { "Options" } + + elapsedTimeLabel:string { "elapsed" } + remainingTimeLabel:string { "remaining" } + + sureToExitMsg:string { "Are you sure you want to exit?" } } loginWindow:table diff --git a/campcaster/src/products/gLiveSupport/var/sr_CS.txt b/campcaster/src/products/gLiveSupport/var/sr_CS.txt index 7863e76ff..8f7f26ef0 100644 --- a/campcaster/src/products/gLiveSupport/var/sr_CS.txt +++ b/campcaster/src/products/gLiveSupport/var/sr_CS.txt @@ -1,25 +1,10 @@ sr_CS:table { - notLoggedInMsg:string { "Niste prijavljeni" } - loggedInMsg:string { "Prijavljeni: {0}" } - loginButtonLabel:string { "Prijava" } - logoutButtonLabel:string { "Odjava" } - liveModeButtonLabel:string { "Uživo" } - uploadFileButtonLabel:string { "Aploud" } - scratchpadButtonLabel:string { "Priprema" } - playlistButtonLabel:string { "Plej lista" } - schedulerButtonLabel:string { "Raspored" } - 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" } @@ -27,11 +12,27 @@ sr_CS:table { "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" } + + notLoggedInMsg:string { "Niste prijavljeni" } + loggedInMsg:string { "Prijavljeni: {0}" } + loginButtonLabel:string { "Prijava" } + logoutButtonLabel:string { "Odjava" } + liveModeButtonLabel:string { "Uživo" } + uploadFileButtonLabel:string { "Aploud" } + scratchpadButtonLabel:string { "Priprema" } + playlistButtonLabel:string { "Plej lista" } + schedulerButtonLabel:string { "Raspored" } + searchButtonLabel:string { "Pretraga" } + optionsButtonLabel:string { "Opcije" } + + elapsedTimeLabel:string { "pozicija" } + remainingTimeLabel:string { "preostalo" } + + sureToExitMsg:string { "Sigurno želite da izađete?" } } loginWindow:table diff --git a/campcaster/src/products/gLiveSupport/var/sr_CS_CYRILLIC.txt b/campcaster/src/products/gLiveSupport/var/sr_CS_CYRILLIC.txt index b185c26cf..76504141e 100644 --- a/campcaster/src/products/gLiveSupport/var/sr_CS_CYRILLIC.txt +++ b/campcaster/src/products/gLiveSupport/var/sr_CS_CYRILLIC.txt @@ -1,25 +1,10 @@ sr_CS_CYRILLIC:table { - notLoggedInMsg:string { "Нисте пријављени" } - loggedInMsg:string { "Пријављени: {0}" } - loginButtonLabel:string { "Пријава" } - logoutButtonLabel:string { "Одјава" } - liveModeButtonLabel:string { "Уживо" } - uploadFileButtonLabel:string { "Аплоуд" } - scratchpadButtonLabel:string { "Припрема" } - playlistButtonLabel:string { "Плеј листа" } - schedulerButtonLabel:string { "Распоред" } - searchButtonLabel:string { "Претрага" } - optionsButtonLabel:string { "Опције" } - cancelButtonLabel:string { "Откажи" } noButtonLabel:string { "Не" } yesButtonLabel:string { "Да" } okButtonLabel:string { "ОК" } - elapsedTimeLabel:string { "позиција" } - remainingTimeLabel:string { "преостало" } - localeNotAvailableMsg:string { "Место {0} није доступно" } schedulerNotReachableMsg:string { "Сервер са распоредом није доступан" } storageNotReachableMsg:string { "Сервер није доступан" } @@ -27,11 +12,27 @@ sr_CS_CYRILLIC:table { "Сервер за аутентизацију није доступан.\n" "Да ли бисте желели да промените серверске поставке?" } audioErrorMsg { "Грешка у аудио плејеру: " } - sureToExitMsg:string { "Сигурно желите да изађете?" } masterPanelWindow:table { windowTitle:string { "Главни панел" } + + notLoggedInMsg:string { "Нисте пријављени" } + loggedInMsg:string { "Пријављени: {0}" } + loginButtonLabel:string { "Пријава" } + logoutButtonLabel:string { "Одјава" } + liveModeButtonLabel:string { "Уживо" } + uploadFileButtonLabel:string { "Аплоуд" } + scratchpadButtonLabel:string { "Припрема" } + playlistButtonLabel:string { "Плеј листа" } + schedulerButtonLabel:string { "Распоред" } + searchButtonLabel:string { "Претрага" } + optionsButtonLabel:string { "Опције" } + + elapsedTimeLabel:string { "позиција" } + remainingTimeLabel:string { "преостало" } + + sureToExitMsg:string { "Сигурно желите да изађете?" } } loginWindow:table