Исправлен дизайн окна

pull/55/head
Igor Belitskiy 3 years ago
parent 20ef699b15
commit 39feafc2d0

@ -128,13 +128,13 @@ int MainWindow::check_root(){
} }
void MainWindow::lacalization(){ void MainWindow::lacalization(){
btnSynopsis->set_label(_("Synopsis")); //btnSynopsis->set_label(_("Synopsis"));
btnAbout->set_label(_("About the program")); //btnAbout->set_label(_("About the program"));
lblDonwlodLocal->set_label(_("Download local")); //btnDonwlodLocal->set_label(_("Download local"));
lblDonwlolGlob->set_label(_("Download global")); //btnDonwlolGlob->set_label(_("Download global"));
lblSaveGlob->set_label(_("Save to Global configuration")); //btnSaveGlob->set_label(_("Save to Global configuration"));
lblSaveLocal->set_label(_("Save to local configuration")); //btnSaveLocal->set_label(_("Save to local configuration"));
lblSaveLocalGlob->set_label(_("Save to global and local configuration")); //btnSaveLocalGlob->set_label(_("Save to global and local configuration"));
aboutWindows->set_comments(_("Setting the date and time")); aboutWindows->set_comments(_("Setting the date and time"));
lblSave->set_label(_("Save")); lblSave->set_label(_("Save"));
lblDownload->set_label(_("Download")); lblDownload->set_label(_("Download"));
@ -145,6 +145,7 @@ void MainWindow::lacalization(){
cbDhcp->append(_("DHCP")); cbDhcp->append(_("DHCP"));
cbDhcp->append(_("Manual")); cbDhcp->append(_("Manual"));
cbDhcp->append(_("Disabled")); cbDhcp->append(_("Disabled"));
lblDateTimeSetting->set_text(_("Current date and time")); lblDateTimeSetting->set_text(_("Current date and time"));
lblHead->set_text(_("Settings the date and time")); lblHead->set_text(_("Settings the date and time"));
lblTime->set_text(_("Time")); lblTime->set_text(_("Time"));
@ -265,13 +266,7 @@ void MainWindow::get_builder(){
builder->get_widget("btnSaveLocalGlob", btnSaveLocalGlob); builder->get_widget("btnSaveLocalGlob", btnSaveLocalGlob);
builder->get_widget("btnSaveLocal", btnSaveLocal); builder->get_widget("btnSaveLocal", btnSaveLocal);
builder->get_widget("btnSaveGlob", btnSaveGlob); 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(); this->add_CSS();
} }
void MainWindow::gui_exit(){ void MainWindow::gui_exit(){

@ -93,20 +93,13 @@ class MainWindow : public Gtk::ApplicationWindow {
Gtk::Image *imgInfo; Gtk::Image *imgInfo;
std::map <string, vector<string>> time_reg_map; std::map <string, vector<string>> time_reg_map;
std::map <string, vector<string>> time_reg_map_local; std::map <string, vector<string>> time_reg_map_local;
Gtk::Button *btnSaveLocalGlob; Gtk::ModelButton *btnSaveLocalGlob;
Gtk::Button *btnSaveLocal; Gtk::ModelButton *btnSaveLocal;
Gtk::Button *btnSaveGlob; Gtk::ModelButton *btnSaveGlob;
Gtk::Button *btnDonwlolGlob; Gtk::ModelButton *btnDonwlolGlob;
Gtk::Button *btnDonwlodLocal; Gtk::ModelButton *btnDonwlodLocal;
Gtk::Button *btnAbout; Gtk::ModelButton *btnAbout;
Gtk::Button *btnSynopsis; Gtk::ModelButton *btnSynopsis;
Gtk::Label *lblSaveLocalGlob;
Gtk::Label *lblSaveLocal;
Gtk::Label *lblSaveGlob;
Gtk::Label *lblDonwlolGlob;
Gtk::Label *lblDonwlodLocal;
Gtk::Label *lblAbout;
Gtk::Label *lblSynopsis;
unsigned int year=0; unsigned int year=0;
unsigned int month=0; unsigned int month=0;
unsigned int day=0; unsigned int day=0;

@ -21,7 +21,7 @@
Подробнее в &lt;a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"&gt;GNU General Public License, версии 2 или позднее&lt;/a&gt;.</property> Подробнее в &lt;a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"&gt;GNU General Public License, версии 2 или позднее&lt;/a&gt;.</property>
<property name="authors">UBGroup</property> <property name="authors">UBGroup</property>
<property name="artists">UBGroup</property> <property name="artists">UBGroup</property>
<property name="logo-icon-name">ublinux-ubconfig</property> <property name="logo-icon-name">ubl-settings-datetime</property>
<property name="wrap-license">True</property> <property name="wrap-license">True</property>
<property name="license-type">gpl-2-0</property> <property name="license-type">gpl-2-0</property>
<child internal-child="vbox"> <child internal-child="vbox">
@ -238,44 +238,29 @@
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>
<object class="GtkButton" id="btnSynopsis"> <object class="GtkModelButton" id="btnSynopsis">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>
<property name="hexpand">True</property> <property name="text" translatable="yes">Synopsis</property>
<child>
<object class="GtkLabel" id="lblSynopsis">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Synopsis</property>
</object>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">0</property> <property name="position">2</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkButton" id="btnAbout"> <object class="GtkModelButton" id="btnAbout">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>
<child> <property name="text" translatable="yes">About the program</property>
<object class="GtkLabel" id="lblAbout">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">About the program</property>
</object>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">3</property>
</packing> </packing>
</child> </child>
</object> </object>
@ -310,44 +295,29 @@
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>
<object class="GtkButton" id="btnDonwlodLocal"> <object class="GtkModelButton" id="btnDonwlodLocal">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>
<child> <property name="text" translatable="yes">Download local</property>
<object class="GtkLabel" id="lblDonwlodLocal">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Download local</property>
</object>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">0</property> <property name="position">2</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkButton" id="btnDonwlolGlob"> <object class="GtkModelButton" id="btnDonwlolGlob">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>
<property name="halign">start</property> <property name="text" translatable="yes">Download global</property>
<child>
<object class="GtkLabel" id="lblDonwlolGlob">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Download global</property>
</object>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">3</property>
</packing> </packing>
</child> </child>
</object> </object>
@ -382,63 +352,42 @@
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>
<object class="GtkButton" id="btnSaveLocalGlob"> <object class="GtkModelButton" id="btnSaveLocalGlob">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>
<child> <property name="text" translatable="yes">Save to global and local configuration</property>
<object class="GtkLabel" id="lblSaveLocalGlob">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Save to global and local configuration</property>
</object>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">0</property> <property name="position">3</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkButton" id="btnSaveLocal"> <object class="GtkModelButton" id="btnSaveLocal">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>
<child> <property name="text" translatable="yes">Save to local configuration</property>
<object class="GtkLabel" id="lblSaveLocal">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Save to local configuration</property>
</object>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">4</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkButton" id="btnSaveGlob"> <object class="GtkModelButton" id="btnSaveGlob">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>
<child> <property name="text" translatable="yes">Save to Global configuration</property>
<object class="GtkLabel" id="lblSaveGlob">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Save to Global configuration</property>
</object>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">2</property> <property name="position">5</property>
</packing> </packing>
</child> </child>
</object> </object>
@ -1193,6 +1142,7 @@ Format: DD.MM.YYYY</property>
<object class="GtkHeaderBar"> <object class="GtkHeaderBar">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="title" translatable="yes">ubl-settings-datetime</property>
<property name="show-close-button">True</property> <property name="show-close-button">True</property>
<child> <child>
<object class="GtkImage"> <object class="GtkImage">
@ -1204,6 +1154,7 @@ Format: DD.MM.YYYY</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="margin-top">6</property> <property name="margin-top">6</property>
<property name="margin-bottom">6</property> <property name="margin-bottom">6</property>
<property name="pixel-size">32</property>
<property name="icon-name">ubl-settings-datetime</property> <property name="icon-name">ubl-settings-datetime</property>
</object> </object>
</child> </child>

Loading…
Cancel
Save