develop #33

Merged
asmeron merged 8 commits from develop into master 3 years ago

Binary file not shown.

Before

Width:  |  Height:  |  Size: 64 KiB

After

Width:  |  Height:  |  Size: 62 KiB

@ -46,7 +46,6 @@ MainWindow::MainWindow(Glib::RefPtr<Gtk::Builder> const& builder) {
} }
void MainWindow::get_builder() { void MainWindow::get_builder() {
builder->get_widget("imgHeadBackground", imgHeadBackground); builder->get_widget("imgHeadBackground", imgHeadBackground);
builder->get_widget("overHead", overHead); builder->get_widget("overHead", overHead);
builder->get_widget("btnFilemaneg", btnFilemaneg); builder->get_widget("btnFilemaneg", btnFilemaneg);
@ -143,6 +142,10 @@ void MainWindow::add_CSS() {
Glib::RefPtr<Gtk::StyleContext> context_lbl_head = lblInfoHead->get_style_context(); Glib::RefPtr<Gtk::StyleContext> context_lbl_head = lblInfoHead->get_style_context();
Glib::RefPtr<Gtk::StyleContext> boxAbout_css = boxAbout->get_style_context(); Glib::RefPtr<Gtk::StyleContext> boxAbout_css = boxAbout->get_style_context();
imgHeadBackground->set(path_img_head_background); imgHeadBackground->set(path_img_head_background);
for (auto &view: array_icon) {
Glib::RefPtr<Gtk::StyleContext> view_css = view->get_style_context();
view_css->add_class("view_app");
}
context_lbl_head->add_class("textHead"); context_lbl_head->add_class("textHead");
if (socket_ext_id_I == 0){ if (socket_ext_id_I == 0){
boxAbout_css->add_class("bkim_no_plug"); boxAbout_css->add_class("bkim_no_plug");
@ -191,7 +194,6 @@ void MainWindow::localization() {
lblSystem->set_text(gettext("System")); lblSystem->set_text(gettext("System"));
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"));
btnMessageErrorOk->set_label(gettext("Close")); btnMessageErrorOk->set_label(gettext("Close"));
} }
@ -298,6 +300,9 @@ void MainWindow::delete_cmd(const int &x, const int &y) {
chbTerminal->set_active(false); chbTerminal->set_active(false);
chbAnotherUser->set_active(false); chbAnotherUser->set_active(false);
cbxExecuteEpriority->set_active(false); cbxExecuteEpriority->set_active(false);
name_app = "";
path_file = "";
user_cmd = "";
txtCmd->set_text(""); txtCmd->set_text("");
} }
} }
@ -307,10 +312,8 @@ bool MainWindow::focus_in_txt_cmd(GdkEventFocus* event) {
if (user_cmd.length() != 0) { if (user_cmd.length() != 0) {
} }
else if (name_app.length() != 0) { else if (name_app.length() != 0) {
name_app = "";
} }
else if (path_file.length() != 0) { else if (path_file.length() != 0) {
path_file = "";
} }
else{ else{
user_cmd = txtCmd->get_text(); user_cmd = txtCmd->get_text();
@ -325,7 +328,6 @@ void MainWindow::synopsis_show() {
string response_user = getlogin(); string response_user = getlogin();
cmd = "su -l " + response_user + " -c \" DISPLAY=$DISPLAY " + cmd + " \""; cmd = "su -l " + response_user + " -c \" DISPLAY=$DISPLAY " + cmd + " \"";
} }
cout << cmd << endl;
index_error = system(cmd.c_str()); index_error = system(cmd.c_str());
} }
@ -398,10 +400,11 @@ void MainWindow::tempate_icon_select(Gtk::IconView *icon, Glib::RefPtr<Gtk::List
str_remove(name_app, del_sim); str_remove(name_app, del_sim);
if (name_app.length() != len_name_app) { if (name_app.length() != len_name_app) {
txtCmd->set_text(name_app); txtCmd->set_text(name_app);
this->denamic_cmd();
break; break;
} }
} }
this->denamic_cmd();
} }
} }
@ -426,6 +429,7 @@ void MainWindow::settings() {
this->get_builder(); this->get_builder();
this->event(); this->event();
this->localization(); this->localization();
this->set_icon_array();
this->add_CSS(); this->add_CSS();
spinPriority->set_range(0, 19); spinPriority->set_range(0, 19);
spinPriority->set_increments(1.0, -1.0); spinPriority->set_increments(1.0, -1.0);
@ -723,7 +727,6 @@ void MainWindow::denamic_cmd() {
else if (name_app.length() != 0) { else if (name_app.length() != 0) {
txtCmd->set_text(this->start_cmd(user_cmd)); txtCmd->set_text(this->start_cmd(user_cmd));
} }
} }
} }

@ -1,9 +1,19 @@
.textHead{ .textHead{
text-shadow: 1px 1px #ffffff; text-shadow: 2px 2px @theme_bg_color;
color: @theme_text_color;
} }
.bannerbackground { .bannerbackground {
background-color: #404040; 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{ #GnomeIcon{
border-style:solid; border-style:solid;
border-bottom-width: 1px; border-bottom-width: 1px;

@ -104,13 +104,12 @@
<property name="label" translatable="yes">Run applications as another user <property name="label" translatable="yes">Run applications as another user
with the specified priority</property> with the specified priority</property>
<attributes> <attributes>
<attribute name="font-desc" value="URW Gothic Semi-Bold 10"/> <attribute name="weight" value="bold"/>
<attribute name="foreground" value="#000023233232"/>
<attribute name="size" value="15360"/> <attribute name="size" value="15360"/>
</attributes> </attributes>
</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">1</property> <property name="position">1</property>
</packing> </packing>
@ -284,9 +283,6 @@ with the specified priority</property>
<attribute name="yalign">4</attribute> <attribute name="yalign">4</attribute>
</attributes> </attributes>
</child> </child>
<style>
<class name="fgnb"/>
</style>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -362,9 +358,6 @@ with the specified priority</property>
<attribute name="yalign">4</attribute> <attribute name="yalign">4</attribute>
</attributes> </attributes>
</child> </child>
<style>
<class name="fgnb"/>
</style>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -439,9 +432,6 @@ with the specified priority</property>
<attribute name="yalign">4</attribute> <attribute name="yalign">4</attribute>
</attributes> </attributes>
</child> </child>
<style>
<class name="fgnb"/>
</style>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -516,9 +506,6 @@ with the specified priority</property>
<attribute name="yalign">4</attribute> <attribute name="yalign">4</attribute>
</attributes> </attributes>
</child> </child>
<style>
<class name="fgnb"/>
</style>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -593,9 +580,6 @@ with the specified priority</property>
<attribute name="yalign">4</attribute> <attribute name="yalign">4</attribute>
</attributes> </attributes>
</child> </child>
<style>
<class name="fgnb"/>
</style>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -670,9 +654,6 @@ with the specified priority</property>
<attribute name="yalign">4</attribute> <attribute name="yalign">4</attribute>
</attributes> </attributes>
</child> </child>
<style>
<class name="fgnb"/>
</style>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -747,9 +728,6 @@ with the specified priority</property>
<attribute name="yalign">4</attribute> <attribute name="yalign">4</attribute>
</attributes> </attributes>
</child> </child>
<style>
<class name="fgnb"/>
</style>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -824,9 +802,6 @@ with the specified priority</property>
<attribute name="yalign">4</attribute> <attribute name="yalign">4</attribute>
</attributes> </attributes>
</child> </child>
<style>
<class name="fgnb"/>
</style>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -901,9 +876,6 @@ with the specified priority</property>
<attribute name="yalign">4</attribute> <attribute name="yalign">4</attribute>
</attributes> </attributes>
</child> </child>
<style>
<class name="fgnb"/>
</style>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -968,7 +940,7 @@ with the specified priority</property>
<property name="layout-style">start</property> <property name="layout-style">start</property>
<child> <child>
<object class="GtkButton" id="btnStartMenuExit"> <object class="GtkButton" id="btnStartMenuExit">
<property name="label" translatable="yes">Exit</property> <property name="label">gtk-cancel</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="receives-default">True</property> <property name="receives-default">True</property>
@ -978,6 +950,7 @@ with the specified priority</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="margin-top">6</property> <property name="margin-top">6</property>
<property name="margin-bottom">6</property> <property name="margin-bottom">6</property>
<property name="use-stock">True</property>
</object> </object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">True</property>
@ -987,7 +960,7 @@ with the specified priority</property>
</child> </child>
<child> <child>
<object class="GtkButton" id="btnStartMenuOK"> <object class="GtkButton" id="btnStartMenuOK">
<property name="label" translatable="yes">ОК</property> <property name="label">gtk-ok</property>
<property name="width-request">-1</property> <property name="width-request">-1</property>
<property name="height-request">-1</property> <property name="height-request">-1</property>
<property name="visible">True</property> <property name="visible">True</property>
@ -999,6 +972,7 @@ with the specified priority</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="margin-top">6</property> <property name="margin-top">6</property>
<property name="margin-bottom">6</property> <property name="margin-bottom">6</property>
<property name="use-stock">True</property>
</object> </object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">True</property>
@ -1088,6 +1062,7 @@ with the specified priority</property>
<property name="height-request">81</property> <property name="height-request">81</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="halign">start</property>
</object> </object>
<packing> <packing>
<property name="index">-1</property> <property name="index">-1</property>
@ -1095,7 +1070,7 @@ with the 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>
@ -1265,7 +1240,7 @@ with the specified priority</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
<child> <child>
<object class="GtkLabel"> <object class="GtkLabel">
<property name="width-request">110</property> <property name="width-request">44</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">15</property> <property name="margin-left">15</property>
@ -1431,6 +1406,8 @@ with the specified priority</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">False</property> <property name="receives-default">False</property>
<property name="margin-left">6</property> <property name="margin-left">6</property>
<property name="margin-right">6</property>
<property name="margin-end">6</property>
<property name="draw-indicator">True</property> <property name="draw-indicator">True</property>
<property name="group">rbSu</property> <property name="group">rbSu</property>
</object> </object>
@ -1446,10 +1423,10 @@ with the specified priority</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="receives-default">False</property> <property name="receives-default">False</property>
<property name="margin-left">6</property> <property name="margin-left">3</property>
<property name="margin-right">6</property> <property name="margin-right">31</property>
<property name="margin-start">6</property> <property name="margin-start">3</property>
<property name="margin-end">6</property> <property name="margin-end">31</property>
<property name="draw-indicator">True</property> <property name="draw-indicator">True</property>
<property name="group">rbPkexec</property> <property name="group">rbPkexec</property>
</object> </object>
@ -1871,6 +1848,7 @@ with the specified priority</property>
<object class="GtkLabel" id="lblHeaderName"> <object class="GtkLabel" id="lblHeaderName">
<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">center</property>
<property name="label" translatable="yes">Ublexec</property> <property name="label" translatable="yes">Ublexec</property>
<attributes> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
@ -1939,7 +1917,6 @@ with the specified priority</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="halign">center</property> <property name="halign">center</property>
<property name="valign">start</property>
<property name="margin-left">20</property> <property name="margin-left">20</property>
<property name="margin-right">20</property> <property name="margin-right">20</property>
<property name="margin-start">20</property> <property name="margin-start">20</property>
@ -1959,13 +1936,11 @@ with the specified priority</property>
<object class="GtkLabel" id="lblMessageError"> <object class="GtkLabel" id="lblMessageError">
<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">center</property>
<property name="valign">start</property>
<property name="margin-left">10</property> <property name="margin-left">10</property>
<property name="margin-right">25</property> <property name="margin-right">25</property>
<property name="margin-start">10</property> <property name="margin-start">10</property>
<property name="margin-end">25</property> <property name="margin-end">25</property>
<property name="margin-top">34</property> <property name="margin-top">20</property>
<property name="margin-bottom">20</property> <property name="margin-bottom">20</property>
<property name="label">Select an executable file or program</property> <property name="label">Select an executable file or program</property>
<property name="wrap">True</property> <property name="wrap">True</property>

Loading…
Cancel
Save