diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index 4cdf835..171cffc 100755 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -128,13 +128,13 @@ int MainWindow::check_root(){ } void MainWindow::lacalization(){ - btnSynopsis->set_label(_("Synopsis")); - btnAbout->set_label(_("About the program")); - lblDonwlodLocal->set_label(_("Download local")); - lblDonwlolGlob->set_label(_("Download global")); - lblSaveGlob->set_label(_("Save to Global configuration")); - lblSaveLocal->set_label(_("Save to local configuration")); - lblSaveLocalGlob->set_label(_("Save to global and local configuration")); + //btnSynopsis->set_label(_("Synopsis")); + //btnAbout->set_label(_("About the program")); + //btnDonwlodLocal->set_label(_("Download local")); + //btnDonwlolGlob->set_label(_("Download global")); + //btnSaveGlob->set_label(_("Save to Global configuration")); + //btnSaveLocal->set_label(_("Save to local configuration")); + //btnSaveLocalGlob->set_label(_("Save to global and local configuration")); aboutWindows->set_comments(_("Setting the date and time")); lblSave->set_label(_("Save")); lblDownload->set_label(_("Download")); @@ -145,6 +145,7 @@ void MainWindow::lacalization(){ cbDhcp->append(_("DHCP")); cbDhcp->append(_("Manual")); cbDhcp->append(_("Disabled")); + lblDateTimeSetting->set_text(_("Current date and time")); lblHead->set_text(_("Settings the date and time")); lblTime->set_text(_("Time")); @@ -265,13 +266,7 @@ void MainWindow::get_builder(){ builder->get_widget("btnSaveLocalGlob", btnSaveLocalGlob); builder->get_widget("btnSaveLocal", btnSaveLocal); builder->get_widget("btnSaveGlob", btnSaveGlob); - builder->get_widget("lblSynopsis", lblSynopsis); - builder->get_widget("lblAbout", lblAbout); - builder->get_widget("lblDonwlodLocal", lblDonwlodLocal); - builder->get_widget("lblDonwlolGlob", lblDonwlolGlob); - builder->get_widget("lblSaveLocalGlob", lblSaveLocalGlob); - builder->get_widget("lblSaveLocal", lblSaveLocal); - builder->get_widget("lblSaveGlob", lblSaveGlob); + this->add_CSS(); } void MainWindow::gui_exit(){ diff --git a/source/ubl-settings-datetime.h b/source/ubl-settings-datetime.h index ee4ed48..5ca24be 100755 --- a/source/ubl-settings-datetime.h +++ b/source/ubl-settings-datetime.h @@ -93,20 +93,13 @@ class MainWindow : public Gtk::ApplicationWindow { Gtk::Image *imgInfo; std::map > time_reg_map; std::map > time_reg_map_local; - Gtk::Button *btnSaveLocalGlob; - Gtk::Button *btnSaveLocal; - Gtk::Button *btnSaveGlob; - Gtk::Button *btnDonwlolGlob; - Gtk::Button *btnDonwlodLocal; - Gtk::Button *btnAbout; - Gtk::Button *btnSynopsis; - Gtk::Label *lblSaveLocalGlob; - Gtk::Label *lblSaveLocal; - Gtk::Label *lblSaveGlob; - Gtk::Label *lblDonwlolGlob; - Gtk::Label *lblDonwlodLocal; - Gtk::Label *lblAbout; - Gtk::Label *lblSynopsis; + Gtk::ModelButton *btnSaveLocalGlob; + Gtk::ModelButton *btnSaveLocal; + Gtk::ModelButton *btnSaveGlob; + Gtk::ModelButton *btnDonwlolGlob; + Gtk::ModelButton *btnDonwlodLocal; + Gtk::ModelButton *btnAbout; + Gtk::ModelButton *btnSynopsis; unsigned int year=0; unsigned int month=0; unsigned int day=0; diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade index 93061eb..ba1b1d8 100755 --- a/ubl-settings-datetime.glade +++ b/ubl-settings-datetime.glade @@ -21,7 +21,7 @@ Подробнее в <a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.html">GNU General Public License, версии 2 или позднее</a>. UBGroup UBGroup - ublinux-ubconfig + ubl-settings-datetime True gpl-2-0 @@ -238,44 +238,29 @@ False vertical - + True True True - True - - - True - False - start - Synopsis - - + Synopsis False True - 0 + 2 - + True True True - - - True - False - start - About the program - - + About the program False True - 1 + 3 @@ -310,44 +295,29 @@ False vertical - + True True True - - - True - False - start - Download local - - + Download local False True - 0 + 2 - + True True True - start - - - True - False - start - Download global - - + Download global False True - 1 + 3 @@ -382,63 +352,42 @@ False vertical - + True True True - - - True - False - start - Save to global and local configuration - - + Save to global and local configuration False True - 0 + 3 - + True True True - - - True - False - start - Save to local configuration - - + Save to local configuration False True - 1 + 4 - + True True True - - - True - False - start - Save to Global configuration - - + Save to Global configuration False True - 2 + 5 @@ -1193,6 +1142,7 @@ Format: DD.MM.YYYY True False + ubl-settings-datetime True @@ -1204,6 +1154,7 @@ Format: DD.MM.YYYY 5 6 6 + 32 ubl-settings-datetime