pull/71/head
parent 0b209ba7b1
commit 95770dbc95

@ -731,7 +731,7 @@ void on_system_info_clicked(GtkWidget *self, main_window *widgets){
gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),SERVICE_STATE_TITLE_LABEL(name)); gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),SERVICE_STATE_TITLE_LABEL(name));
gtk_window_set_title(GTK_WINDOW(window->Window),SERVICE_STATE_TITLE_LABEL(name)); gtk_window_set_title(GTK_WINDOW(window->Window),SERVICE_STATE_TITLE_LABEL(name));
window->target = service_info_command(name); window->target = service_info_command(name);
yon_terminal_integrated_start(window->SystemTerminal,window->target); yon_terminal_integrated_start_shell(window->SystemTerminal,window->target,NULL,NULL);
gtk_widget_show(window->Window); gtk_widget_show(window->Window);
} }
} }
@ -750,7 +750,7 @@ void on_system_log_clicked(GtkWidget *self, main_window *widgets){
gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),SERVICE_LOG_TITLE_LABEL(name)); gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),SERVICE_LOG_TITLE_LABEL(name));
gtk_window_set_title(GTK_WINDOW(window->Window),SERVICE_LOG_TITLE_LABEL(name)); gtk_window_set_title(GTK_WINDOW(window->Window),SERVICE_LOG_TITLE_LABEL(name));
window->target = get_log_command(name); window->target = get_log_command(name);
yon_terminal_integrated_start(window->SystemTerminal,window->target); yon_terminal_integrated_start_shell(window->SystemTerminal,window->target,NULL,NULL);
gtk_widget_show(window->Window); gtk_widget_show(window->Window);
} }
} }
@ -761,7 +761,7 @@ void *on_terminal_relaunch(log_window *window){
gtk_widget_set_sensitive(window->SystemTerminal,0); gtk_widget_set_sensitive(window->SystemTerminal,0);
sleep(1); sleep(1);
gtk_widget_set_sensitive(window->SystemTerminal,1); gtk_widget_set_sensitive(window->SystemTerminal,1);
yon_terminal_integrated_start(window->SystemTerminal,window->target); yon_terminal_integrated_start_shell(window->SystemTerminal,window->target,NULL,NULL);
return NULL; return NULL;
} }
@ -775,7 +775,7 @@ void on_save_clicked(GtkWidget *self, log_window *window){
void on_update_clicked(GtkWidget *self, log_window *window){ void on_update_clicked(GtkWidget *self, log_window *window){
if (self){}; if (self){};
yon_terminal_integrated_start(window->SystemTerminal,window->target); yon_terminal_integrated_start_shell(window->SystemTerminal,window->target,NULL,NULL);
} }
void on_system_edit_clicked(GtkWidget *self, main_window *widgets){ void on_system_edit_clicked(GtkWidget *self, main_window *widgets){
@ -791,7 +791,7 @@ void on_system_edit_clicked(GtkWidget *self, main_window *widgets){
gtk_window_set_title(GTK_WINDOW(window->Window),SERVICE_UNIT_EDIT_TITLE_LABEL); gtk_window_set_title(GTK_WINDOW(window->Window),SERVICE_UNIT_EDIT_TITLE_LABEL);
gtk_widget_show(window->SaveButton); gtk_widget_show(window->SaveButton);
window->target=show_source_command(name); window->target=show_source_command(name);
yon_terminal_integrated_start(window->SystemTerminal,window->target); yon_terminal_integrated_start_shell(window->SystemTerminal,window->target,NULL,NULL);
GdkRGBA rgba; GdkRGBA rgba;
rgba.blue=1; rgba.blue=1;
rgba.green=1; rgba.green=1;
@ -817,7 +817,7 @@ void on_system_status_clicked(GtkWidget *self, main_window *widgets){
gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),PROPERTIES_LABEL); gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),PROPERTIES_LABEL);
gtk_window_set_title(GTK_WINDOW(window->Window),PROPERTIES_LABEL); gtk_window_set_title(GTK_WINDOW(window->Window),PROPERTIES_LABEL);
window->target = properties_command(name); window->target = properties_command(name);
yon_terminal_integrated_start(window->SystemTerminal,window->target); yon_terminal_integrated_start_shell(window->SystemTerminal,window->target,NULL,NULL);
gtk_widget_show(window->Window); gtk_widget_show(window->Window);
} }
@ -862,7 +862,7 @@ void on_user_info_clicked(GtkWidget *self, main_window *widgets){
gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),SERVICE_STATE_TITLE_LABEL(name)); gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),SERVICE_STATE_TITLE_LABEL(name));
gtk_window_set_title(GTK_WINDOW(window->Window),SERVICE_STATE_TITLE_LABEL(name)); gtk_window_set_title(GTK_WINDOW(window->Window),SERVICE_STATE_TITLE_LABEL(name));
window->target = user_service_info_command(name); window->target = user_service_info_command(name);
yon_terminal_integrated_start(window->SystemTerminal,window->target); yon_terminal_integrated_start_shell(window->SystemTerminal,window->target,NULL,NULL);
gtk_widget_show(window->Window); gtk_widget_show(window->Window);
} }
} }
@ -881,7 +881,7 @@ void on_user_log_clicked(GtkWidget *self, main_window *widgets){
gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),SERVICE_LOG_TITLE_LABEL(name)); gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),SERVICE_LOG_TITLE_LABEL(name));
gtk_window_set_title(GTK_WINDOW(window->Window),SERVICE_LOG_TITLE_LABEL(name)); gtk_window_set_title(GTK_WINDOW(window->Window),SERVICE_LOG_TITLE_LABEL(name));
window->target = user_get_log_command(name); window->target = user_get_log_command(name);
yon_terminal_integrated_start(window->SystemTerminal,window->target); yon_terminal_integrated_start_shell(window->SystemTerminal,window->target,NULL,NULL);
gtk_widget_show(window->Window); gtk_widget_show(window->Window);
} }
} }
@ -901,7 +901,7 @@ void on_user_edit_clicked(GtkWidget *self, main_window *widgets){
gtk_window_set_title(GTK_WINDOW(window->Window),SERVICE_UNIT_EDIT_TITLE_LABEL); gtk_window_set_title(GTK_WINDOW(window->Window),SERVICE_UNIT_EDIT_TITLE_LABEL);
gtk_widget_show(window->SaveButton); gtk_widget_show(window->SaveButton);
window->target=user_show_source_command(name); window->target=user_show_source_command(name);
yon_terminal_integrated_start(window->SystemTerminal,window->target); yon_terminal_integrated_start_shell(window->SystemTerminal,window->target,NULL,NULL);
GdkRGBA rgba; GdkRGBA rgba;
rgba.blue=1; rgba.blue=1;
rgba.green=1; rgba.green=1;
@ -927,7 +927,7 @@ void on_user_status_clicked(GtkWidget *self, main_window *widgets){
gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),PROPERTIES_LABEL); gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),PROPERTIES_LABEL);
gtk_window_set_title(GTK_WINDOW(window->Window),PROPERTIES_LABEL); gtk_window_set_title(GTK_WINDOW(window->Window),PROPERTIES_LABEL);
window->target = user_properties_command(name); window->target = user_properties_command(name);
yon_terminal_integrated_start(window->SystemTerminal,window->target); yon_terminal_integrated_start_shell(window->SystemTerminal,window->target,NULL,NULL);
gtk_widget_show(window->Window); gtk_widget_show(window->Window);
} }
@ -987,7 +987,7 @@ void on_system_services_status(GtkWidget *self, main_window *widgets){
gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),SYSTEM_STATUS_LABEL); gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),SYSTEM_STATUS_LABEL);
gtk_window_set_title(GTK_WINDOW(window->Window),SYSTEM_STATUS_LABEL); gtk_window_set_title(GTK_WINDOW(window->Window),SYSTEM_STATUS_LABEL);
window->target = system_services_status_command; window->target = system_services_status_command;
yon_terminal_integrated_start(window->SystemTerminal,window->target); yon_terminal_integrated_start_shell(window->SystemTerminal,window->target,NULL,NULL);
gtk_widget_show(window->Window); gtk_widget_show(window->Window);
} }
@ -1001,7 +1001,7 @@ void on_user_services_status(GtkWidget *self, main_window *widgets){
gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),USER_STATUS_LABEL); gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),USER_STATUS_LABEL);
gtk_window_set_title(GTK_WINDOW(window->Window),USER_STATUS_LABEL); gtk_window_set_title(GTK_WINDOW(window->Window),USER_STATUS_LABEL);
window->target = user_services_status_command; window->target = user_services_status_command;
yon_terminal_integrated_start(window->SystemTerminal,window->target); yon_terminal_integrated_start_shell(window->SystemTerminal,window->target,NULL,NULL);
gtk_widget_show(window->Window); gtk_widget_show(window->Window);
} }
@ -1015,7 +1015,7 @@ void on_units_status(GtkWidget *self, main_window *widgets){
gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),INSTALLED_UNIT_LABEL); gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),INSTALLED_UNIT_LABEL);
gtk_window_set_title(GTK_WINDOW(window->Window),INSTALLED_UNIT_LABEL); gtk_window_set_title(GTK_WINDOW(window->Window),INSTALLED_UNIT_LABEL);
window->target = !gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))?installed_units_states_command:user_installed_units_states_command; window->target = !gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))?installed_units_states_command:user_installed_units_states_command;
yon_terminal_integrated_start(window->SystemTerminal,window->target); yon_terminal_integrated_start_shell(window->SystemTerminal,window->target,NULL,NULL);
gtk_widget_show(window->Window); gtk_widget_show(window->Window);
} }
@ -1029,7 +1029,7 @@ void on_units_list_status(GtkWidget *self, main_window *widgets){
gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),UNITS_LIST_LABEL); gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),UNITS_LIST_LABEL);
gtk_window_set_title(GTK_WINDOW(window->Window),UNITS_LIST_LABEL); gtk_window_set_title(GTK_WINDOW(window->Window),UNITS_LIST_LABEL);
window->target = !gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))?list_of_units_states_command:user_list_of_units_states_command; window->target = !gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))?list_of_units_states_command:user_list_of_units_states_command;
yon_terminal_integrated_start(window->SystemTerminal,window->target); yon_terminal_integrated_start_shell(window->SystemTerminal,window->target,NULL,NULL);
gtk_widget_show(window->Window); gtk_widget_show(window->Window);
} }
@ -1043,7 +1043,7 @@ void on_sockets_list_status(GtkWidget *self, main_window *widgets){
gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),SOCKETS_LIST_LABEL); gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),SOCKETS_LIST_LABEL);
gtk_window_set_title(GTK_WINDOW(window->Window),SOCKETS_LIST_LABEL); gtk_window_set_title(GTK_WINDOW(window->Window),SOCKETS_LIST_LABEL);
window->target = !gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))?list_of_sockets_states_command:user_list_of_sockets_states_command; window->target = !gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))?list_of_sockets_states_command:user_list_of_sockets_states_command;
yon_terminal_integrated_start(window->SystemTerminal,window->target); yon_terminal_integrated_start_shell(window->SystemTerminal,window->target,NULL,NULL);
gtk_widget_show(window->Window); gtk_widget_show(window->Window);
} }
@ -1057,7 +1057,7 @@ void on_timers_list_status(GtkWidget *self, main_window *widgets){
gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),TIMERS_LIST_LABEL); gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),TIMERS_LIST_LABEL);
gtk_window_set_title(GTK_WINDOW(window->Window),TIMERS_LIST_LABEL); gtk_window_set_title(GTK_WINDOW(window->Window),TIMERS_LIST_LABEL);
window->target = !gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))?list_of_timers_states_command:user_list_of_timers_states_command; window->target = !gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))?list_of_timers_states_command:user_list_of_timers_states_command;
yon_terminal_integrated_start(window->SystemTerminal,window->target); yon_terminal_integrated_start_shell(window->SystemTerminal,window->target,NULL,NULL);
gtk_widget_show(window->Window); gtk_widget_show(window->Window);
} }

@ -664,7 +664,7 @@
<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>
<property name="tooltip-text" translatable="yes">Reexec systemd</property> <property name="tooltip-text" translatable="yes">Update</property>
<property name="image">image8</property> <property name="image">image8</property>
<style> <style>
<class name="thin"/> <class name="thin"/>
@ -709,7 +709,7 @@
<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>
<property name="tooltip-text" translatable="yes">Update</property> <property name="tooltip-text" translatable="yes">Reexec systemd</property>
<property name="image">image6</property> <property name="image">image6</property>
<style> <style>
<class name="thin"/> <class name="thin"/>
@ -738,7 +738,8 @@
<property name="sensitive">False</property> <property name="sensitive">False</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>
<property name="tooltip-text" translatable="yes">Reexec systemd</property> <property name="tooltip-text" translatable="yes">Reload
</property>
<property name="image">image20</property> <property name="image">image20</property>
<style> <style>
<class name="thin"/> <class name="thin"/>
@ -1269,7 +1270,7 @@
<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>
<property name="tooltip-text" translatable="yes">Reexec systemd</property> <property name="tooltip-text" translatable="yes">Update</property>
<property name="image">image14</property> <property name="image">image14</property>
<style> <style>
<class name="thin"/> <class name="thin"/>
@ -1314,7 +1315,7 @@
<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>
<property name="tooltip-text" translatable="yes">Update</property> <property name="tooltip-text" translatable="yes">Reexec systemd</property>
<property name="image">image2</property> <property name="image">image2</property>
<style> <style>
<class name="thin"/> <class name="thin"/>
@ -1343,7 +1344,8 @@
<property name="sensitive">False</property> <property name="sensitive">False</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>
<property name="tooltip-text" translatable="yes">Reexec systemd</property> <property name="tooltip-text" translatable="yes">Reload
</property>
<property name="image">image21</property> <property name="image">image21</property>
<style> <style>
<class name="thin"/> <class name="thin"/>

Loading…
Cancel
Save