Исправлены команды запуска, исправлен дизайн

pull/3/head
Igor Belitskiy 3 years ago
parent f5206fb256
commit 4a90866145

@ -278,6 +278,7 @@ void MainWindow::unselect_icon(Gtk::IconView *icon_entry){
} }
void MainWindow::settings(){ void MainWindow::settings(){
system("nohup xhost + local: > /dev/null 2>&1 &");
this->pars_apps(); this->pars_apps();
this->get_builder(); this->get_builder();
this->event(); this->event();
@ -451,7 +452,12 @@ void MainWindow::start_cmd(){
} }
else if (rbSudo->get_active()){ else if (rbSudo->get_active()){
chbTerminal->set_active(true); chbTerminal->set_active(true);
if (getlogin()==cmbUser->get_active_text()){
str_variants_root="sudo ";
}
else{
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()) + " ";
} }
@ -508,6 +514,7 @@ void MainWindow::start_cmd(){
path_file_name = ""; path_file_name = "";
path_file = ""; path_file = "";
name_app = ""; name_app = "";
} }
void me_thread(string cmd){ void me_thread(string cmd){

@ -107,12 +107,32 @@
<object class="GtkExpander"> <object class="GtkExpander">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-left">7</property>
<property name="margin-right">7</property>
<property name="margin-start">7</property>
<property name="margin-end">7</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child> <child>
<object class="GtkIconView" id="iconGraphics"> <object class="GtkIconView" id="iconGraphics">
<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">1</property> <property name="margin">1</property>
<property name="item-orientation">horizontal</property> <property name="item-orientation">horizontal</property>
<property name="columns">1</property>
<property name="item-width">120</property> <property name="item-width">120</property>
<property name="item-padding">1</property> <property name="item-padding">1</property>
<child> <child>
@ -131,6 +151,13 @@
</attributes> </attributes>
</child> </child>
</object> </object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child> </child>
<child type="label"> <child type="label">
<object class="GtkLabel" id="lblGraphics"> <object class="GtkLabel" id="lblGraphics">
@ -150,6 +177,25 @@
<object class="GtkExpander"> <object class="GtkExpander">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-left">7</property>
<property name="margin-right">7</property>
<property name="margin-start">7</property>
<property name="margin-end">7</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child> <child>
<object class="GtkIconView" id="iconTools"> <object class="GtkIconView" id="iconTools">
<property name="visible">True</property> <property name="visible">True</property>
@ -157,6 +203,7 @@
<property name="margin">1</property> <property name="margin">1</property>
<property name="resize-mode">queue</property> <property name="resize-mode">queue</property>
<property name="item-orientation">horizontal</property> <property name="item-orientation">horizontal</property>
<property name="columns">1</property>
<property name="item-width">120</property> <property name="item-width">120</property>
<property name="item-padding">1</property> <property name="item-padding">1</property>
<child> <child>
@ -178,6 +225,13 @@
<class name="fgnb"/> <class name="fgnb"/>
</style> </style>
</object> </object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child> </child>
<child type="label"> <child type="label">
<object class="GtkLabel" id="lblTools"> <object class="GtkLabel" id="lblTools">
@ -197,6 +251,26 @@
<object class="GtkExpander"> <object class="GtkExpander">
<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-bottom">1</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-left">7</property>
<property name="margin-right">7</property>
<property name="margin-start">7</property>
<property name="margin-end">7</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child> <child>
<object class="GtkIconView" id="iconInternet"> <object class="GtkIconView" id="iconInternet">
<property name="visible">True</property> <property name="visible">True</property>
@ -204,6 +278,7 @@
<property name="margin">1</property> <property name="margin">1</property>
<property name="resize-mode">queue</property> <property name="resize-mode">queue</property>
<property name="item-orientation">horizontal</property> <property name="item-orientation">horizontal</property>
<property name="columns">1</property>
<property name="item-width">120</property> <property name="item-width">120</property>
<property name="item-padding">1</property> <property name="item-padding">1</property>
<child> <child>
@ -225,6 +300,13 @@
<class name="fgnb"/> <class name="fgnb"/>
</style> </style>
</object> </object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child> </child>
<child type="label"> <child type="label">
<object class="GtkLabel" id="lblInternet"> <object class="GtkLabel" id="lblInternet">
@ -244,6 +326,25 @@
<object class="GtkExpander"> <object class="GtkExpander">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-left">7</property>
<property name="margin-right">7</property>
<property name="margin-start">7</property>
<property name="margin-end">7</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child> <child>
<object class="GtkIconView" id="iconMultimedia"> <object class="GtkIconView" id="iconMultimedia">
<property name="visible">True</property> <property name="visible">True</property>
@ -251,6 +352,7 @@
<property name="margin">1</property> <property name="margin">1</property>
<property name="resize-mode">queue</property> <property name="resize-mode">queue</property>
<property name="item-orientation">horizontal</property> <property name="item-orientation">horizontal</property>
<property name="columns">1</property>
<property name="item-width">120</property> <property name="item-width">120</property>
<property name="item-padding">1</property> <property name="item-padding">1</property>
<child> <child>
@ -272,6 +374,13 @@
<class name="fgnb"/> <class name="fgnb"/>
</style> </style>
</object> </object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child> </child>
<child type="label"> <child type="label">
<object class="GtkLabel" id="lblMultimedia"> <object class="GtkLabel" id="lblMultimedia">
@ -291,6 +400,25 @@
<object class="GtkExpander"> <object class="GtkExpander">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-left">7</property>
<property name="margin-right">7</property>
<property name="margin-start">7</property>
<property name="margin-end">7</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child> <child>
<object class="GtkIconView" id="iconSettings"> <object class="GtkIconView" id="iconSettings">
<property name="visible">True</property> <property name="visible">True</property>
@ -298,6 +426,7 @@
<property name="margin">1</property> <property name="margin">1</property>
<property name="resize-mode">queue</property> <property name="resize-mode">queue</property>
<property name="item-orientation">horizontal</property> <property name="item-orientation">horizontal</property>
<property name="columns">1</property>
<property name="item-width">120</property> <property name="item-width">120</property>
<property name="item-padding">1</property> <property name="item-padding">1</property>
<child> <child>
@ -319,6 +448,13 @@
<class name="fgnb"/> <class name="fgnb"/>
</style> </style>
</object> </object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child> </child>
<child type="label"> <child type="label">
<object class="GtkLabel" id="lblSettings"> <object class="GtkLabel" id="lblSettings">
@ -338,13 +474,33 @@
<object class="GtkExpander"> <object class="GtkExpander">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-left">7</property>
<property name="margin-right">7</property>
<property name="margin-start">7</property>
<property name="margin-end">7</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child> <child>
<object class="GtkIconView" id="iconEducation"> <object class="GtkIconView" id="iconEducation">
<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">0</property> <property name="margin">6</property>
<property name="resize-mode">queue</property> <property name="resize-mode">queue</property>
<property name="item-orientation">horizontal</property> <property name="item-orientation">horizontal</property>
<property name="columns">1</property>
<property name="item-width">120</property> <property name="item-width">120</property>
<property name="item-padding">1</property> <property name="item-padding">1</property>
<child> <child>
@ -366,6 +522,13 @@
<class name="fgnb"/> <class name="fgnb"/>
</style> </style>
</object> </object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child> </child>
<child type="label"> <child type="label">
<object class="GtkLabel" id="lblEducation"> <object class="GtkLabel" id="lblEducation">
@ -385,6 +548,25 @@
<object class="GtkExpander"> <object class="GtkExpander">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-left">7</property>
<property name="margin-right">7</property>
<property name="margin-start">7</property>
<property name="margin-end">7</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child> <child>
<object class="GtkIconView" id="iconOffice"> <object class="GtkIconView" id="iconOffice">
<property name="visible">True</property> <property name="visible">True</property>
@ -392,6 +574,7 @@
<property name="margin">1</property> <property name="margin">1</property>
<property name="resize-mode">queue</property> <property name="resize-mode">queue</property>
<property name="item-orientation">horizontal</property> <property name="item-orientation">horizontal</property>
<property name="columns">1</property>
<property name="item-width">120</property> <property name="item-width">120</property>
<property name="item-padding">1</property> <property name="item-padding">1</property>
<child> <child>
@ -413,6 +596,13 @@
<class name="fgnb"/> <class name="fgnb"/>
</style> </style>
</object> </object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child> </child>
<child type="label"> <child type="label">
<object class="GtkLabel" id="lblOffice"> <object class="GtkLabel" id="lblOffice">
@ -432,6 +622,25 @@
<object class="GtkExpander"> <object class="GtkExpander">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-left">7</property>
<property name="margin-right">7</property>
<property name="margin-start">7</property>
<property name="margin-end">7</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child> <child>
<object class="GtkIconView" id="iconOther"> <object class="GtkIconView" id="iconOther">
<property name="visible">True</property> <property name="visible">True</property>
@ -439,6 +648,7 @@
<property name="margin">1</property> <property name="margin">1</property>
<property name="resize-mode">queue</property> <property name="resize-mode">queue</property>
<property name="item-orientation">horizontal</property> <property name="item-orientation">horizontal</property>
<property name="columns">1</property>
<property name="item-width">120</property> <property name="item-width">120</property>
<property name="item-padding">1</property> <property name="item-padding">1</property>
<child> <child>
@ -460,6 +670,13 @@
<class name="fgnb"/> <class name="fgnb"/>
</style> </style>
</object> </object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child> </child>
<child type="label"> <child type="label">
<object class="GtkLabel" id="lblOther"> <object class="GtkLabel" id="lblOther">
@ -479,6 +696,25 @@
<object class="GtkExpander"> <object class="GtkExpander">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-left">7</property>
<property name="margin-right">7</property>
<property name="margin-start">7</property>
<property name="margin-end">7</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child> <child>
<object class="GtkIconView" id="iconDevelopment"> <object class="GtkIconView" id="iconDevelopment">
<property name="visible">True</property> <property name="visible">True</property>
@ -486,6 +722,7 @@
<property name="margin">1</property> <property name="margin">1</property>
<property name="resize-mode">queue</property> <property name="resize-mode">queue</property>
<property name="item-orientation">horizontal</property> <property name="item-orientation">horizontal</property>
<property name="columns">1</property>
<property name="item-width">120</property> <property name="item-width">120</property>
<property name="item-padding">1</property> <property name="item-padding">1</property>
<child> <child>
@ -507,6 +744,13 @@
<class name="fgnb"/> <class name="fgnb"/>
</style> </style>
</object> </object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child> </child>
<child type="label"> <child type="label">
<object class="GtkLabel" id="lblDevelopment"> <object class="GtkLabel" id="lblDevelopment">
@ -526,6 +770,25 @@
<object class="GtkExpander"> <object class="GtkExpander">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-left">7</property>
<property name="margin-right">7</property>
<property name="margin-start">7</property>
<property name="margin-end">7</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child> <child>
<object class="GtkIconView" id="iconSystem"> <object class="GtkIconView" id="iconSystem">
<property name="visible">True</property> <property name="visible">True</property>
@ -533,6 +796,7 @@
<property name="margin">1</property> <property name="margin">1</property>
<property name="resize-mode">queue</property> <property name="resize-mode">queue</property>
<property name="item-orientation">horizontal</property> <property name="item-orientation">horizontal</property>
<property name="columns">1</property>
<property name="item-width">120</property> <property name="item-width">120</property>
<property name="item-padding">1</property> <property name="item-padding">1</property>
<child> <child>
@ -554,6 +818,13 @@
<class name="fgnb"/> <class name="fgnb"/>
</style> </style>
</object> </object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child> </child>
<child type="label"> <child type="label">
<object class="GtkLabel" id="lblSystem"> <object class="GtkLabel" id="lblSystem">

Loading…
Cancel
Save