diff --git a/screenshot/screenshot.png b/screenshot/screenshot.png index a18a4a0..920498b 100644 Binary files a/screenshot/screenshot.png and b/screenshot/screenshot.png differ diff --git a/source/ublexec.cc b/source/ublexec.cc index fe28f09..39e5f01 100644 --- a/source/ublexec.cc +++ b/source/ublexec.cc @@ -46,7 +46,6 @@ MainWindow::MainWindow(Glib::RefPtr const& builder) { } void MainWindow::get_builder() { - builder->get_widget("imgHeadBackground", imgHeadBackground); builder->get_widget("overHead", overHead); builder->get_widget("btnFilemaneg", btnFilemaneg); @@ -143,6 +142,10 @@ void MainWindow::add_CSS() { Glib::RefPtr context_lbl_head = lblInfoHead->get_style_context(); Glib::RefPtr boxAbout_css = boxAbout->get_style_context(); imgHeadBackground->set(path_img_head_background); + for (auto &view: array_icon) { + Glib::RefPtr view_css = view->get_style_context(); + view_css->add_class("view_app"); + } context_lbl_head->add_class("textHead"); if (socket_ext_id_I == 0){ boxAbout_css->add_class("bkim_no_plug"); @@ -191,7 +194,6 @@ void MainWindow::localization() { lblSystem->set_text(gettext("System")); btnListApp->set_tooltip_text(gettext("Application Overview")); btnFilemaneg->set_tooltip_text(gettext("File Overview")); - btnStartMenuExit->set_label(gettext("Cancel")); btnMessageErrorOk->set_label(gettext("Close")); } @@ -298,6 +300,9 @@ void MainWindow::delete_cmd(const int &x, const int &y) { chbTerminal->set_active(false); chbAnotherUser->set_active(false); cbxExecuteEpriority->set_active(false); + name_app = ""; + path_file = ""; + user_cmd = ""; txtCmd->set_text(""); } } @@ -307,10 +312,8 @@ bool MainWindow::focus_in_txt_cmd(GdkEventFocus* event) { if (user_cmd.length() != 0) { } else if (name_app.length() != 0) { - name_app = ""; } else if (path_file.length() != 0) { - path_file = ""; } else{ user_cmd = txtCmd->get_text(); @@ -325,7 +328,6 @@ void MainWindow::synopsis_show() { string response_user = getlogin(); cmd = "su -l " + response_user + " -c \" DISPLAY=$DISPLAY " + cmd + " \""; } - cout << cmd << endl; index_error = system(cmd.c_str()); } @@ -398,10 +400,11 @@ void MainWindow::tempate_icon_select(Gtk::IconView *icon, Glib::RefPtrset_text(name_app); - this->denamic_cmd(); break; } } + this->denamic_cmd(); + } } @@ -426,6 +429,7 @@ void MainWindow::settings() { this->get_builder(); this->event(); this->localization(); + this->set_icon_array(); this->add_CSS(); spinPriority->set_range(0, 19); spinPriority->set_increments(1.0, -1.0); @@ -705,7 +709,7 @@ void MainWindow::denamic_cmd() { path_file = ""; name_app = ""; user_cmd = ""; - txtCmd->set_text(user_cmd); + txtCmd->set_text(user_cmd); messageError->set_title(gettext("Attention")); messageError->show(); } @@ -723,7 +727,6 @@ void MainWindow::denamic_cmd() { else if (name_app.length() != 0) { txtCmd->set_text(this->start_cmd(user_cmd)); } - } } diff --git a/ublexec.css b/ublexec.css index 733b950..1e33f1c 100644 --- a/ublexec.css +++ b/ublexec.css @@ -1,9 +1,19 @@ .textHead{ - text-shadow: 1px 1px #ffffff; + text-shadow: 2px 2px @theme_bg_color; + color: @theme_text_color; } .bannerbackground { background-color: #404040; } +.view_app { + background-color: @theme_bg_color; +} +.view_app.view.cell:selected { + background-color:@theme_selected_bg_color; + color:@theme_selected_text_color; + transition: 10ms ease-out; + border-radius: 3px; +} #GnomeIcon{ border-style:solid; border-bottom-width: 1px; diff --git a/ublexec.glade b/ublexec.glade index 98a67a5..58c1d97 100644 --- a/ublexec.glade +++ b/ublexec.glade @@ -104,13 +104,12 @@ Run applications as another user with the specified priority - - + - True + False True 1 @@ -284,9 +283,6 @@ with the specified priority 4 - False @@ -362,9 +358,6 @@ with the specified priority 4 - False @@ -439,9 +432,6 @@ with the specified priority 4 - False @@ -516,9 +506,6 @@ with the specified priority 4 - False @@ -593,9 +580,6 @@ with the specified priority 4 - False @@ -670,9 +654,6 @@ with the specified priority 4 - False @@ -747,9 +728,6 @@ with the specified priority 4 - False @@ -824,9 +802,6 @@ with the specified priority 4 - False @@ -901,9 +876,6 @@ with the specified priority 4 - False @@ -968,7 +940,7 @@ with the specified priority start - Exit + gtk-cancel True True True @@ -978,6 +950,7 @@ with the specified priority 5 6 6 + True True @@ -987,7 +960,7 @@ with the specified priority - ОК + gtk-ok -1 -1 True @@ -999,6 +972,7 @@ with the specified priority 5 6 6 + True True @@ -1088,6 +1062,7 @@ with the specified priority 81 True False + start -1 @@ -1095,7 +1070,7 @@ with the specified priority - True + False True 0 @@ -1265,7 +1240,7 @@ with the specified priority True - 110 + 44 True False 15 @@ -1431,6 +1406,8 @@ with the specified priority True False 6 + 6 + 6 True rbSu @@ -1446,10 +1423,10 @@ with the specified priority True True False - 6 - 6 - 6 - 6 + 3 + 31 + 3 + 31 True rbPkexec @@ -1871,6 +1848,7 @@ with the specified priority True False + center Ublexec @@ -1939,7 +1917,6 @@ with the specified priority True False center - start 20 20 20 @@ -1959,13 +1936,11 @@ with the specified priority True False - center - start 10 25 10 25 - 34 + 20 20 Select an executable file or program True