Исправлен About

pull/13/head
Igor Belitskiy 3 years ago
parent a9933b7f99
commit 847b9f85a3

@ -139,6 +139,11 @@ void MainWindow::add_CSS() {
} }
void MainWindow::localization() { void MainWindow::localization() {
time_t now = time(0);
tm *ltm = localtime(&now);
unsigned int year= 1900+ ltm->tm_year;
string str_authors = string(_("Copyright © UBSoft LLC, 2022 - ")) + to_string(year);
aboutWindows->set_copyright(str_authors);
aboutWindows->set_website(_("https://wiki.ublinux.com")); aboutWindows->set_website(_("https://wiki.ublinux.com"));
btnSynopsis->set_label(_("Help")); btnSynopsis->set_label(_("Help"));
btnAbout->set_label(_("About the program")); btnAbout->set_label(_("About the program"));
@ -460,7 +465,7 @@ vector <size_t> MainWindow::find_all(string &text, string &word) {
void MainWindow::tempalte_row(string Name, string Exec, string path , Glib::RefPtr<Gtk::ListStore> &dtk_list) { void MainWindow::tempalte_row(string Name, string Exec, string path , Glib::RefPtr<Gtk::ListStore> &dtk_list) {
Gtk::TreeModel::Row row = *(dtk_list->append()); Gtk::TreeModel::Row row = *(dtk_list->append());
string s_remove[] = {".png", ".jpg", ".jpeg", ".svg"}; string s_remove[] = {".png", ".jpg", ".jpeg", ".svg", ".xpm"};
string str_search = "/"; string str_search = "/";
if (path.find(str_search) != string::npos){ if (path.find(str_search) != string::npos){
vector <size_t> list_index = this->find_all(path, str_search); vector <size_t> list_index = this->find_all(path, str_search);
@ -479,7 +484,6 @@ void MainWindow::tempalte_row(string Name, string Exec, string path , Glib::Ref
str_remove(path, del); str_remove(path, del);
} }
} }
row[m_Columns.m_col_filename] = path; row[m_Columns.m_col_filename] = path;
row[m_Columns.m_col_description] = Name; row[m_Columns.m_col_description] = Name;
row[m_Columns.icon_name] = path; row[m_Columns.icon_name] = path;
@ -575,7 +579,7 @@ string MainWindow::start_cmd(string user_cmd) {
str_variants_root = "sudo -u " + cmbUser->get_active_text() + " "; str_variants_root = "sudo -u " + cmbUser->get_active_text() + " ";
} }
if (cbxExecuteEpriority->get_active()) { if (cbxExecuteEpriority->get_active()) {
str_variants_root += " nice -n " + to_string(spinPriority->get_value_as_int()) + " "; str_variants_root += "nice -n " + to_string(spinPriority->get_value_as_int()) + " ";
} }
} }
} }
@ -586,7 +590,7 @@ string MainWindow::start_cmd(string user_cmd) {
system(user_cmd_X.c_str()); system(user_cmd_X.c_str());
} }
if ((cbxExecuteEpriority->get_active()) && (chbAnotherUser->get_active() == false)) { if ((cbxExecuteEpriority->get_active()) && (chbAnotherUser->get_active() == false)) {
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->show(); messageError->show();

@ -16,10 +16,10 @@
<property name="icon-name">ubl-settings-datetime</property> <property name="icon-name">ubl-settings-datetime</property>
<property name="type-hint">dialog</property> <property name="type-hint">dialog</property>
<property name="urgency-hint">True</property> <property name="urgency-hint">True</property>
<property name="program-name">ublexec</property> <property name="program-name">ubl-exec</property>
<property name="version">1.0</property> <property name="version">1.0</property>
<property name="copyright" translatable="yes">Copyright © 2023 - UBSoft Software LLC</property> <property name="copyright" translatable="yes">Copyright © UBSoft LLC, 2022 - </property>
<property name="comments" translatable="yes">Setting the date and time</property> <property name="comments" translatable="yes">ublexec</property>
<property name="website">https://ublinux.ru/</property> <property name="website">https://ublinux.ru/</property>
<property name="website-label" translatable="yes">Project Home Page</property> <property name="website-label" translatable="yes">Project Home Page</property>
<property name="license" translatable="yes">Это приложение распространяется без каких-либо гарантий. <property name="license" translatable="yes">Это приложение распространяется без каких-либо гарантий.
@ -1085,7 +1085,6 @@ specified priority</property>
<object class="GtkFrame" id="frame1"> <object class="GtkFrame" id="frame1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="halign">baseline</property>
<property name="margin-left">5</property> <property name="margin-left">5</property>
<property name="margin-right">5</property> <property name="margin-right">5</property>
<property name="margin-start">5</property> <property name="margin-start">5</property>
@ -1128,7 +1127,7 @@ specified priority</property>
</child> </child>
<child> <child>
<object class="GtkEntry" id="txtCmd"> <object class="GtkEntry" id="txtCmd">
<property name="width-request">330</property> <property name="width-request">320</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="margin-left">5</property> <property name="margin-left">5</property>
@ -1307,7 +1306,6 @@ specified priority</property>
<object class="GtkFrame" id="frame2"> <object class="GtkFrame" id="frame2">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="halign">baseline</property>
<property name="margin-left">5</property> <property name="margin-left">5</property>
<property name="margin-right">5</property> <property name="margin-right">5</property>
<property name="margin-start">5</property> <property name="margin-start">5</property>
@ -1449,7 +1447,7 @@ specified priority</property>
</child> </child>
<child> <child>
<object class="GtkComboBoxText" id="cmbUser"> <object class="GtkComboBoxText" id="cmbUser">
<property name="width-request">330</property> <property name="width-request">320</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="margin-left">5</property> <property name="margin-left">5</property>
@ -1465,6 +1463,19 @@ specified priority</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkLabel">
<property name="width-request">0</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-end">100</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -1506,11 +1517,11 @@ specified priority</property>
<object class="GtkFrame" id="frame3"> <object class="GtkFrame" id="frame3">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="halign">baseline</property>
<property name="margin-left">5</property> <property name="margin-left">5</property>
<property name="margin-right">5</property> <property name="margin-right">5</property>
<property name="margin-start">5</property> <property name="margin-start">5</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="hexpand">True</property>
<property name="label-xalign">0.019999999552965164</property> <property name="label-xalign">0.019999999552965164</property>
<property name="shadow-type">in</property> <property name="shadow-type">in</property>
<child> <child>
@ -1575,6 +1586,7 @@ specified priority</property>
</child> </child>
<child> <child>
<object class="GtkScale" id="scalePriority"> <object class="GtkScale" id="scalePriority">
<property name="width-request">-1</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="margin-left">5</property> <property name="margin-left">5</property>
@ -1719,7 +1731,7 @@ specified priority</property>
</child> </child>
</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">0</property> <property name="position">0</property>
</packing> </packing>
@ -1827,14 +1839,6 @@ specified priority</property>
</object> </object>
</child> </child>
</object> </object>
<object class="GtkSizeGroup">
<widgets>
<widget name="boxColor"/>
<widget name="frame1"/>
<widget name="frame2"/>
<widget name="frame3"/>
</widgets>
</object>
<object class="GtkMessageDialog" id="messageError"> <object class="GtkMessageDialog" id="messageError">
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="title" translatable="yes">Внимание!</property> <property name="title" translatable="yes">Внимание!</property>

@ -123,3 +123,9 @@ msgstr "Внимание!"
msgid "ublexec" msgid "ublexec"
msgstr "Выполнить" msgstr "Выполнить"
msgid "ubl-exec"
msgstr "ubl-exec"
msgid "Copyright © UBSoft LLC, 2022 - "
msgstr "Авторские права © ООО \"Юбисофт\", 2022 - "
Loading…
Cancel
Save