diff --git a/#ublexec.glade# b/#ublexec.glade# deleted file mode 100644 index 15fcf33..0000000 --- a/#ublexec.glade# +++ /dev/null @@ -1,1505 +0,0 @@ - - - - - - False - О Программе - False - True - center - ubl-settings-datetime - dialog - True - ublexec - 1.2 - Copyright © 2023 - UBSoft Software LLC - Setting the date and time - https://ublinux.ru/ - Project Home Page - Это приложение распространяется без каких-либо гарантий. -Подробнее в <a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.html">GNU General Public License, версии 2 или позднее</a>. - UBGroup - UBGroup - ublexec - True - gpl-2-0 - - - False - vertical - 2 - - - False - end - - - - - - False - False - 0 - - - - - - - - - - -20 - 19 - 1 - 10 - - - 500 - 400 - False - - - True - False - vertical - - - True - False - Selecting Programs - - - False - True - 0 - - - - - True - True - in - - - False - 5 - 5 - 5 - 5 - 5 - natural - - - True - False - 1 - 1 - 5 - 0 - etched-out - - - True - False - 12 - - - True - False - vertical - - - True - False - start - Graphics - - - False - True - 0 - - - - - True - True - 1 - queue - 1 - 1 - 1 - - - - True - True - 1 - - - - - True - False - start - Tools - - - False - True - 2 - - - - - True - True - 1 - queue - 1 - 1 - 1 - - - - True - True - 3 - - - - - True - False - start - Internet - - - False - True - 4 - - - - - True - True - 1 - queue - 1 - 1 - 1 - - - - True - True - 5 - - - - - True - False - start - Multimedia - - - False - True - 6 - - - - - True - True - 1 - queue - 1 - 1 - 1 - - - - True - True - 7 - - - - - True - False - start - Settings - - - False - True - 8 - - - - - True - True - 1 - queue - 1 - 1 - 1 - - - - True - True - 9 - - - - - True - False - start - Education - - - False - True - 10 - - - - - True - True - 1 - queue - 1 - 1 - 1 - - - - True - True - 11 - - - - - True - False - start - Office - - - False - True - 12 - - - - - True - True - 1 - queue - 1 - 1 - 1 - - - - True - True - 13 - - - - - True - False - start - Other - - - False - True - 14 - - - - - True - True - 1 - queue - 1 - 1 - 1 - - - - True - True - 15 - - - - - True - False - start - Development - - - False - True - 16 - - - - - True - True - 1 - queue - 1 - 1 - 1 - - - - True - True - 17 - - - - - True - False - start - System - - - False - True - 18 - - - - - True - True - 1 - queue - 1 - 1 - 1 - - - - True - True - 19 - - - - - - - - - - True - False - - - - - - - - - - - - True - True - 1 - - - - - True - False - end - start - - - ОК - -1 - -1 - True - True - True - - - True - True - 0 - - - - - Выход - True - True - True - - - True - True - 1 - - - - - False - True - 2 - - - - - - - True - False - 5 - 5 - 5 - 5 - 6 - 6 - gtk-media-play - - - False - Внимание! - dialog - - - False - vertical - 2 - - - False - True - end - - - - - - ОК - True - True - True - - - True - True - 1 - - - - - False - False - 0 - - - - - True - False - 10 - 10 - 15 - Select an executable file or program - - - True - True - 2 - - - - - - - False - - - True - False - 0 - none - - - True - False - 5 - 5 - 5 - 5 - - - True - False - vertical - - - True - True - True - Synopsis - - - False - True - 2 - - - - - True - True - True - About the program - - - False - True - 3 - - - - - - - - - - - - - - False - - - True - False - vertical - - - True - False - - - True - False - 5 - 5 - 5 - 5 - 6 - 6 - 69 - ublexec - - - False - True - 0 - - - - - True - False - start - 5 - 5 - 5 - 5 - 6 - 6 - Running applications as a user with a -specified priority - - - - - - - - True - True - 1 - - - - - False - True - 0 - - - - - True - False - vertical - - - True - False - vertical - - - True - False - vertical - - - True - False - 5 - 5 - 5 - 5 - 6 - 6 - 0.019999999552965164 - in - - - True - False - 5 - 5 - vertical - - - True - False - - - 145 - True - False - 5 - 5 - 5 - 5 - 6 - 6 - Team - True - 0 - - - False - True - 0 - - - - - 330 - True - True - 5 - 5 - 5 - 5 - 6 - 6 - - - True - True - 1 - - - - - True - True - True - end - 5 - 5 - 5 - 5 - 6 - 6 - - - True - False - center - center - 5 - 5 - 5 - 5 - 6 - 6 - gtk-directory - - - - - False - True - 2 - - - - - True - True - True - end - 5 - 5 - 5 - 5 - 6 - 6 - - - True - False - center - center - 5 - 5 - 5 - 5 - 6 - 6 - edit-select-all - - - - - False - True - 3 - - - - - False - True - 0 - - - - - True - False - 6 - 6 - - - 131 - True - False - 15 - 5 - 15 - 5 - - - False - True - 0 - - - - - True - True - False - start - center - 5 - 5 - 5 - 5 - 6 - True - - - True - False - Run in the terminal emulator - - - - - False - True - 1 - - - - - False - True - 1 - - - - - - - True - False - Command Line - - - - - True - True - 0 - - - - - True - True - 1 - - - - - True - False - 5 - vertical - - - True - False - 5 - 5 - 5 - 5 - 0.019999999552965164 - in - - - True - False - 5 - 5 - vertical - - - True - False - - - True - True - False - start - center - 5 - 5 - 5 - 5 - 6 - 6 - True - - - True - False - Run as another user - - - - - False - True - 0 - - - - - pkexec - True - True - False - True - rbSu - - - False - True - 1 - - - - - su - True - True - False - True - rbPkexec - - - False - True - 2 - - - - - sudo - True - True - False - True - rbSu - - - False - True - 3 - - - - - 95 - True - False - end - 15 - 5 - 15 - 5 - - - False - True - 4 - - - - - False - True - 0 - - - - - True - False - - - 145 - True - False - 5 - 5 - 5 - 5 - 6 - 6 - User Name - True - 0 - - - False - True - 0 - - - - - 330 - True - False - 5 - 5 - 5 - 5 - 6 - 6 - - - False - True - 1 - - - - - False - True - 1 - - - - - - - True - False - User - - - - - True - True - 0 - - - - - True - True - 2 - - - - - True - False - 5 - vertical - - - True - False - 5 - 5 - 5 - 5 - 0.019999999552965164 - in - - - True - False - 5 - 5 - vertical - - - True - True - False - start - center - 5 - 5 - 5 - 5 - 6 - 6 - True - - - True - False - Change startup priority - - - - - False - True - 0 - - - - - True - False - - - 5 - True - False - 5 - 5 - 5 - 5 - 6 - 6 - Priority - True - 0 - - - False - True - 0 - - - - - True - True - 5 - 5 - 5 - 5 - 6 - 6 - adjustment1 - 20 - 0 - 0 - - - True - True - 1 - - - - - True - True - 5 - 5 - 5 - 5 - 6 - 6 - True - - - False - True - 2 - - - - - False - True - 1 - - - - - True - False - - - 65 - True - False - 15 - 5 - 15 - 5 - 0 - - - False - True - 0 - - - - - 145 - True - False - 5 - 5 - 5 - 5 - 6 - 6 - 19 (Low) - True - 0 - - - False - True - 1 - - - - - True - False - end - center - 5 - 5 - 5 - 5 - 6 - 6 - -20 (High) - True - 0 - - - True - True - 3 - - - - - 95 - True - False - end - 15 - 5 - 15 - 5 - - - False - True - 4 - - - - - False - True - 2 - - - - - - - True - False - Priority - - - - - True - True - 0 - - - - - True - True - 3 - - - - - Run - True - True - True - 5 - 5 - 5 - 5 - 6 - 6 - image1 - True - - - False - True - 4 - - - - - True - True - 0 - - - - - True - True - 2 - - - - - - - True - False - True - - - True - False - Ublexec - - - - - True - False - 32 - ublexec - - - - - True - False - - - True - True - False - True - True - none - popInfo - - - - - - False - True - 0 - - - - - end - 1 - - - - - - - False - Пожалуйста выберите Файл - True - center - 500 - 400 - True - dialog - True - True - - - False - vertical - 2 - - - False - end - - - gtk-cancel - True - True - True - True - - - True - True - 0 - - - - - gtk-ok - True - True - True - True - - - True - True - 1 - - - - - False - False - 0 - - - - - - - - - diff --git a/.gitignore b/.gitignore index 3716db2..e4c2d7b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ ublexec.glade~ +#ublexec.glade# test.cpp .vscode -ublexec \ No newline at end of file +ublexec +nohup.out \ No newline at end of file diff --git a/nohup.out b/nohup.out deleted file mode 100644 index e69de29..0000000 diff --git a/screenshot/screenshot.png b/screenshot/screenshot.png index 1b575f2..f2c3476 100644 Binary files a/screenshot/screenshot.png and b/screenshot/screenshot.png differ diff --git a/source/main.cc b/source/main.cc index 37d7cdb..dea0329 100755 --- a/source/main.cc +++ b/source/main.cc @@ -1,21 +1,6 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "ublexec.h" - - - int main(int argc, char** argv) { @@ -30,6 +15,7 @@ int main(int argc, char** argv) } auto app = Gtk::Application::create(argc, argv, "org.gtkmm.example.plug"); auto builder = Gtk::Builder::create_from_file(path_glade); + setlocale(LC_ALL, ""); bindtextdomain("ublexec", "/usr/share/locale/"); bind_textdomain_codeset("ublexec", "UTF-8"); textdomain("ublexec"); diff --git a/source/ublexec.cc b/source/ublexec.cc index 41f48f3..7fbf303 100644 --- a/source/ublexec.cc +++ b/source/ublexec.cc @@ -1,25 +1,3 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "ublexec.h" using namespace std; @@ -158,35 +136,37 @@ void MainWindow::add_CSS(){ } void MainWindow::localization(){ - aboutWindows->set_comments(gettext("ublexec")); - aboutWindows->set_website_label(gettext("Project Home Page")); - lblHeaderName->set_text(gettext("ublexec")); - this->set_title(gettext("ublexec")); - btnStart->set_label(gettext("Run")); - wndChooseFileWallpaper->set_title(gettext("Please select File")); - dialogStartMenu->set_title(gettext("Selecting Programs")); - lblInfoHead->set_text(gettext("Running applications as a user with a\nspecified priority")); - lblinfoCmd->set_text(gettext("Command Line")); - lblInfoTime->set_text(gettext("Team")); - labInfoExecutTerm->set_text(gettext("Run in the terminal emulator")); - lblInfoUser->set_text(gettext("User")); - lblInfoUserOther->set_text(gettext("Run as another user")); - lblInfoUserName->set_text(gettext("User Name")); - lblInfoNooPriority->set_text(gettext("Priority")); - lblInfoExec->set_text(gettext("Change startup priority")); - lblInfoPriority->set_text(gettext("Priority")); - lblMessageError->set_text(gettext("Select an executable file or program")); - lblInfoEnterProg->set_text(gettext("Selecting Programs")); - lblGraphics->set_text(gettext("Graphics")); - lblTools->set_text(gettext("Tools")); - lblInternet->set_text(gettext("Internet")); - lblMultimedia->set_text(gettext("Multimedia")); - lblSettings->set_text(gettext("Settings")); - lblEducation->set_text(gettext("Education")); - lblOffice->set_text(gettext("Office")); - lblOther->set_text(gettext("Other")); - lblDevelopment->set_text(gettext("Development")); - lblSystem->set_text(gettext("System")); + btnSynopsis->set_label(_("Synopsis")); + btnAbout->set_label(_("About the program")); + aboutWindows->set_comments(_("ublexec")); + aboutWindows->set_website_label(_("Project Home Page")); + lblHeaderName->set_text(_("ublexec")); + this->set_title(_("ublexec")); + btnStart->set_label(_("Run")); + wndChooseFileWallpaper->set_title(_("Please select File")); + dialogStartMenu->set_title(_("Selecting Programs")); + lblInfoHead->set_text(_("Running applications as a user with a\nspecified priority")); + lblinfoCmd->set_text(_("Command Line")); + lblInfoTime->set_text(_("Team")); + labInfoExecutTerm->set_text(_("Run in the terminal emulator")); + lblInfoUser->set_text(_("User")); + lblInfoUserOther->set_text(_("Run as another user")); + lblInfoUserName->set_text(_("User Name")); + lblInfoNooPriority->set_text(_("Priority")); + lblInfoExec->set_text(_("Change startup priority")); + lblInfoPriority->set_text(_("Priority")); + lblMessageError->set_text(_("Select an executable file or program")); + lblInfoEnterProg->set_text(_("Selecting Programs")); + lblGraphics->set_text(_("Graphics")); + lblTools->set_text(_("Tools")); + lblInternet->set_text(_("Internet")); + lblMultimedia->set_text(_("Multimedia")); + lblSettings->set_text(_("Settings")); + lblEducation->set_text(_("Education")); + lblOffice->set_text(_("Office")); + lblOther->set_text(_("Other")); + lblDevelopment->set_text(_("Development")); + lblSystem->set_text(_("System")); } void MainWindow::event(){ @@ -341,7 +321,7 @@ void MainWindow::settings(){ //builder->get_widget("plugBox",plugBox); //builder->get_widget("window",window); //builder->get_widget("btnSave",btnSave); - //ubl_get_standard_ui(standartHead,plugBox,btnSave,window,"ublexec.svg",gettext("Running applications as a user with a\nspecified priority"),gettext("ublexec"),0,0); + //ubl_get_standard_ui(standartHead,plugBox,btnSave,window,"ublexec.svg",_("Running applications as a user with a\nspecified priority"),_("ublexec"),0,0); } void MainWindow::close_entry_app(){ diff --git a/source/ublexec.h b/source/ublexec.h index 9d6f608..16e2a3d 100644 --- a/source/ublexec.h +++ b/source/ublexec.h @@ -1,15 +1,19 @@ - -#include +#include +#include +#include +#include #include +#include +#include #include +#include #include -#include +#include +#include #include -#include -#include -#include -#include -#include +#include +#include +#include using namespace std; diff --git a/ublexec.glade b/ublexec.glade index 8898c27..15fcf33 100644 --- a/ublexec.glade +++ b/ublexec.glade @@ -2,12 +2,6 @@ - - False - - - - False О Программе diff --git a/ublexec_ru.po b/ublexec_ru.po index f3fb935..7eb916b 100644 --- a/ublexec_ru.po +++ b/ublexec_ru.po @@ -6,6 +6,12 @@ msgid "" msgstr "" +msgid "About the program" +msgstr "О программе" + +msgid "Synopsis" +msgstr "Справка" + msgid "Project Home Page" msgstr "Домашняя страница проекта"