diff --git a/source/ublexec.cc b/source/ublexec.cc index ead01c1..fe28f09 100644 --- a/source/ublexec.cc +++ b/source/ublexec.cc @@ -70,8 +70,6 @@ void MainWindow::get_builder() { builder->get_widget("messageError", messageError); builder->get_widget("lblMessageError", lblMessageError); builder->get_widget("btnMessageErrorOk", btnMessageErrorOk); - builder->get_widget("btnMessageErrorOk", btnMessageErrorOk); - builder->get_widget("btnMessageErrorOk", btnMessageErrorOk); builder->get_widget("dialogStartMenu", dialogStartMenu); builder->get_widget("btnStartMenuOK", btnStartMenuOK); builder->get_widget("btnStartMenuExit", btnStartMenuExit); @@ -180,7 +178,7 @@ void MainWindow::localization() { lblInfoExec->set_text(gettext("Change startup priority")); lblInfoPriority->set_text(gettext("Priority:")); 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")); lblTools->set_text(gettext("Tools")); lblInternet->set_text(gettext("Internet")); @@ -194,6 +192,7 @@ void MainWindow::localization() { btnListApp->set_tooltip_text(gettext("Application Overview")); btnFilemaneg->set_tooltip_text(gettext("File Overview")); btnStartMenuExit->set_label(gettext("Cancel")); + btnMessageErrorOk->set_label(gettext("Close")); } 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()) + " "; } 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(); return ""; } @@ -707,7 +706,7 @@ void MainWindow::denamic_cmd() { name_app = ""; user_cmd = ""; txtCmd->set_text(user_cmd); - messageError->set_title(gettext("Warning!")); + messageError->set_title(gettext("Attention")); messageError->show(); } else{ diff --git a/source/ublexec.h b/source/ublexec.h index a9af788..407423d 100644 --- a/source/ublexec.h +++ b/source/ublexec.h @@ -147,7 +147,7 @@ public: Gtk::Label *lblTimeEpriorityLow; Gtk::Label *lblTime4EpriorityHigh; Gtk::Label *lblUserName; - Gtk::MessageDialog *messageError; + Gtk::Window *messageError; Gtk::Button *btnMessageErrorOk; Gtk::Label *lblMessageError; Gtk::Button *btnStartMenuOK; diff --git a/ublexec.glade b/ublexec.glade index 61c744e..98a67a5 100644 --- a/ublexec.glade +++ b/ublexec.glade @@ -1921,67 +1921,107 @@ with the specified priority - + False - Warning! - com.ublinux.ublexec - dialog - + start + False + + True False vertical - 2 - - + + + True False - True - end - + + True + False + center + start + 20 + 20 + 20 + 20 + 20 + 20 + dialog-warning-symbolic + 6 + + + False + True + 1 + - - OK + True - True - True - 5 - 5 - 5 - 5 - 6 - 6 + False + center + start + 10 + 25 + 10 + 25 + 34 + 20 + Select an executable file or program + True + 0 True True - 1 + 2 - False - False + True + True 0 - + + Close True - False - 10 - 10 - 15 - Select an executable file or program + True + True + 5 + 5 + 5 + 5 + 5 + 5 - True + False True 2 + + + True + False + Warning! + True + + + True + False + 32 + com.ublinux.ublexec + 5 + + + + False diff --git a/ublexec.pot b/ublexec.pot index 213feb7..9b8de70 100644 --- a/ublexec.pot +++ b/ublexec.pot @@ -187,7 +187,7 @@ msgid "User Name:" msgstr "" #: source/ublexec.cc:180 source/ublexec.cc:631 source/ublexec.cc:700 -msgid "Warning!" +msgid "Attention" msgstr "" #: source/ublexec.cc:157 source/ublexec.cc:154 @@ -217,8 +217,12 @@ msgstr "" #: source/main.cc:60 msgid "ublexec version: " -msgstr "https://wiki.ublinux.ru" +msgstr "" #: source/main.cc:970 msgid "ublexec version: " -msgstr "https://wiki.ublinux.ru" +msgstr "" + +#: source/main.cc:197 +msgid "Close" +msgstr "" diff --git a/ublexec_ru.po b/ublexec_ru.po index ed5156c..d069d6b 100644 --- a/ublexec_ru.po +++ b/ublexec_ru.po @@ -189,8 +189,8 @@ msgid "User Name:" msgstr "Имя пользователя:" #: source/ublexec.cc:180 source/ublexec.cc:631 source/ublexec.cc:700 -msgid "Warning!" -msgstr "Внимание!" +msgid "Attention" +msgstr "Внимание" #: source/ublexec.cc:157 source/ublexec.cc:154 msgid "https://wiki.ublinux.com" @@ -239,3 +239,7 @@ msgstr "" " -V, --version\t Показать версию пакета\n" " -x APP_NAME Запуск программы\n" " -e FILE_NAME Запуск файла\n" + +#: source/main.cc:197 +msgid "Close" +msgstr "Закрыть"