Изменен дизайн окна "Внимание"

pull/30/head
Igor Belitskiy 3 years ago
parent 274b45e035
commit 1845812531

@ -70,8 +70,6 @@ void MainWindow::get_builder() {
builder->get_widget("messageError", messageError); builder->get_widget("messageError", messageError);
builder->get_widget("lblMessageError", lblMessageError); builder->get_widget("lblMessageError", lblMessageError);
builder->get_widget("btnMessageErrorOk", btnMessageErrorOk); builder->get_widget("btnMessageErrorOk", btnMessageErrorOk);
builder->get_widget("btnMessageErrorOk", btnMessageErrorOk);
builder->get_widget("btnMessageErrorOk", btnMessageErrorOk);
builder->get_widget("dialogStartMenu", dialogStartMenu); builder->get_widget("dialogStartMenu", dialogStartMenu);
builder->get_widget("btnStartMenuOK", btnStartMenuOK); builder->get_widget("btnStartMenuOK", btnStartMenuOK);
builder->get_widget("btnStartMenuExit", btnStartMenuExit); builder->get_widget("btnStartMenuExit", btnStartMenuExit);
@ -180,7 +178,7 @@ void MainWindow::localization() {
lblInfoExec->set_text(gettext("Change startup priority")); lblInfoExec->set_text(gettext("Change startup priority"));
lblInfoPriority->set_text(gettext("Priority:")); lblInfoPriority->set_text(gettext("Priority:"));
lblMessageError->set_text(gettext("Select an executable file or program")); lblMessageError->set_text(gettext("Select an executable file or program"));
messageError->set_title(gettext("Warning!")); messageError->set_title(gettext("Attention"));
lblGraphics->set_text(gettext("Graphics")); lblGraphics->set_text(gettext("Graphics"));
lblTools->set_text(gettext("Tools")); lblTools->set_text(gettext("Tools"));
lblInternet->set_text(gettext("Internet")); lblInternet->set_text(gettext("Internet"));
@ -194,6 +192,7 @@ void MainWindow::localization() {
btnListApp->set_tooltip_text(gettext("Application Overview")); btnListApp->set_tooltip_text(gettext("Application Overview"));
btnFilemaneg->set_tooltip_text(gettext("File Overview")); btnFilemaneg->set_tooltip_text(gettext("File Overview"));
btnStartMenuExit->set_label(gettext("Cancel")); btnStartMenuExit->set_label(gettext("Cancel"));
btnMessageErrorOk->set_label(gettext("Close"));
} }
void MainWindow::event() { void MainWindow::event() {
@ -638,7 +637,7 @@ string MainWindow::start_cmd(string user_cmd) {
str_nice_cmd = "nice -n " + to_string(spinPriority->get_value_as_int()) + " "; str_nice_cmd = "nice -n " + to_string(spinPriority->get_value_as_int()) + " ";
} }
if (user_cmd.length() == 0 && name_app.length() == 0 && path_file.length() == 0) { if (user_cmd.length() == 0 && name_app.length() == 0 && path_file.length() == 0) {
messageError->set_title(gettext("Warning!")); messageError->set_title(gettext("Attention"));
messageError->show(); messageError->show();
return ""; return "";
} }
@ -707,7 +706,7 @@ void MainWindow::denamic_cmd() {
name_app = ""; name_app = "";
user_cmd = ""; user_cmd = "";
txtCmd->set_text(user_cmd); txtCmd->set_text(user_cmd);
messageError->set_title(gettext("Warning!")); messageError->set_title(gettext("Attention"));
messageError->show(); messageError->show();
} }
else{ else{

@ -147,7 +147,7 @@ public:
Gtk::Label *lblTimeEpriorityLow; Gtk::Label *lblTimeEpriorityLow;
Gtk::Label *lblTime4EpriorityHigh; Gtk::Label *lblTime4EpriorityHigh;
Gtk::Label *lblUserName; Gtk::Label *lblUserName;
Gtk::MessageDialog *messageError; Gtk::Window *messageError;
Gtk::Button *btnMessageErrorOk; Gtk::Button *btnMessageErrorOk;
Gtk::Label *lblMessageError; Gtk::Label *lblMessageError;
Gtk::Button *btnStartMenuOK; Gtk::Button *btnStartMenuOK;

@ -1921,67 +1921,107 @@ with the specified priority</property>
</object> </object>
</child> </child>
</object> </object>
<object class="GtkMessageDialog" id="messageError"> <object class="GtkWindow" id="messageError">
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="title" translatable="yes">Warning!</property> <property name="valign">start</property>
<property name="icon-name">com.ublinux.ublexec</property> <property name="resizable">False</property>
<property name="type-hint">dialog</property> <child>
<child internal-child="vbox">
<object class="GtkBox"> <object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="spacing">2</property> <child>
<child internal-child="action_area"> <object class="GtkBox">
<object class="GtkButtonBox"> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="homogeneous">True</property>
<property name="layout-style">end</property>
<child> <child>
<placeholder/> <object class="GtkImage">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">center</property>
<property name="valign">start</property>
<property name="margin-left">20</property>
<property name="margin-right">20</property>
<property name="margin-start">20</property>
<property name="margin-end">20</property>
<property name="margin-top">20</property>
<property name="margin-bottom">20</property>
<property name="icon-name">dialog-warning-symbolic</property>
<property name="icon_size">6</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child> </child>
<child> <child>
<object class="GtkButton" id="btnMessageErrorOk"> <object class="GtkLabel" id="lblMessageError">
<property name="label" translatable="yes">OK</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">False</property>
<property name="receives-default">True</property> <property name="halign">center</property>
<property name="margin-left">5</property> <property name="valign">start</property>
<property name="margin-right">5</property> <property name="margin-left">10</property>
<property name="margin-start">5</property> <property name="margin-right">25</property>
<property name="margin-end">5</property> <property name="margin-start">10</property>
<property name="margin-top">6</property> <property name="margin-end">25</property>
<property name="margin-bottom">6</property> <property name="margin-top">34</property>
<property name="margin-bottom">20</property>
<property name="label">Select an executable file or program</property>
<property name="wrap">True</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">2</property>
</packing> </packing>
</child> </child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">True</property>
<property name="fill">False</property> <property name="fill">True</property>
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkLabel" id="lblMessageError"> <object class="GtkButton" id="btnMessageErrorOk">
<property name="label" translatable="yes">Close</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">True</property>
<property name="margin-left">10</property> <property name="receives-default">True</property>
<property name="margin-right">10</property> <property name="margin-left">5</property>
<property name="margin-bottom">15</property> <property name="margin-right">5</property>
<property name="label" translatable="yes">Select an executable file or program</property> <property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="margin-top">5</property>
<property name="margin-bottom">5</property>
</object> </object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">2</property> <property name="position">2</property>
</packing> </packing>
</child> </child>
</object> </object>
</child> </child>
<child type="titlebar">
<object class="GtkHeaderBar">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="title" translatable="yes">Warning!</property>
<property name="show-close-button">True</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="pixel-size">32</property>
<property name="icon-name">com.ublinux.ublexec</property>
<property name="icon_size">5</property>
</object>
</child>
</object>
</child>
</object> </object>
<object class="GtkFileChooserDialog" id="wndChooseFileWallpaper"> <object class="GtkFileChooserDialog" id="wndChooseFileWallpaper">
<property name="can-focus">False</property> <property name="can-focus">False</property>

@ -187,7 +187,7 @@ msgid "User Name:"
msgstr "" msgstr ""
#: source/ublexec.cc:180 source/ublexec.cc:631 source/ublexec.cc:700 #: source/ublexec.cc:180 source/ublexec.cc:631 source/ublexec.cc:700
msgid "Warning!" msgid "Attention"
msgstr "" msgstr ""
#: source/ublexec.cc:157 source/ublexec.cc:154 #: source/ublexec.cc:157 source/ublexec.cc:154
@ -217,8 +217,12 @@ msgstr ""
#: source/main.cc:60 #: source/main.cc:60
msgid "ublexec version: " msgid "ublexec version: "
msgstr "https://wiki.ublinux.ru" msgstr ""
#: source/main.cc:970 #: source/main.cc:970
msgid "ublexec version: " msgid "ublexec version: "
msgstr "https://wiki.ublinux.ru" msgstr ""
#: source/main.cc:197
msgid "Close"
msgstr ""

@ -189,8 +189,8 @@ msgid "User Name:"
msgstr "Имя пользователя:" msgstr "Имя пользователя:"
#: source/ublexec.cc:180 source/ublexec.cc:631 source/ublexec.cc:700 #: source/ublexec.cc:180 source/ublexec.cc:631 source/ublexec.cc:700
msgid "Warning!" msgid "Attention"
msgstr "Внимание!" msgstr "Внимание"
#: source/ublexec.cc:157 source/ublexec.cc:154 #: source/ublexec.cc:157 source/ublexec.cc:154
msgid "https://wiki.ublinux.com" msgid "https://wiki.ublinux.com"
@ -239,3 +239,7 @@ msgstr ""
" -V, --version\t Показать версию пакета\n" " -V, --version\t Показать версию пакета\n"
" -x APP_NAME Запуск программы\n" " -x APP_NAME Запуск программы\n"
" -e FILE_NAME Запуск файла\n" " -e FILE_NAME Запуск файла\n"
#: source/main.cc:197
msgid "Close"
msgstr "Закрыть"

Loading…
Cancel
Save