Applications
/
ubl-settings-services
10
0
Fork 1
Code Issues 5 Pull Requests Packages Projects Releases Wiki Activity

Added switch to session button

Browse Source
pull/91/head
Ivan Dmitrievich Yartsev 8 months ago
parent a88c853dac
commit 99360ddc94
3 changed files with 67 additions and 17 deletions
Show Stats Download Patch File Download Diff File

32
source/ubl-settings-services.c
Unescape View File

@ -553,14 +553,16 @@ void on_sessions_selection_changed(GtkWidget *, main_window *widgets){
gtk_widget_set_sensitive(widgets->SessionStopButton,1);
gtk_widget_set_sensitive(widgets->SessionBlockButton,1);
gtk_widget_set_sensitive(widgets->SessionStartButton,1);
gtk_widget_set_sensitive(widgets->SessionSwitchButton,1);
} else {
gtk_widget_set_sensitive(widgets->SessionStopButton,0);
gtk_widget_set_sensitive(widgets->SessionBlockButton,0);
gtk_widget_set_sensitive(widgets->SessionStartButton,0);
gtk_widget_set_sensitive(widgets->SessionSwitchButton,0);
}
}
void yon_sessions_update(main_window *widgets){
gboolean yon_sessions_update(main_window *widgets){
gtk_tree_view_set_model(GTK_TREE_VIEW(widgets->SessionMainTree),NULL);
gtk_list_store_clear(widgets->SessionsList);
int sessions_size;
@ -574,10 +576,11 @@ void yon_sessions_update(main_window *widgets){
else parsed[1]=INACTIVE_LABEL;
if (parsed&&size>4){
gtk_list_store_append(widgets->SessionsList,&iter);
gtk_list_store_set(widgets->SessionsList,&iter,0,atoi(parsed[0]),1,parsed[1],2,atoi(parsed[2]),3,parsed[3],4,parsed[4],-1);
gtk_list_store_set(widgets->SessionsList,&iter,0,atoi(parsed[0]),1,parsed[1],2,atoi(parsed[2]),3,parsed[3],4,yon_char_unite(parsed[4]," | ",parsed[5],NULL),5,parsed[4],6,parsed[5],-1);
}
}
gtk_tree_view_set_model(GTK_TREE_VIEW(widgets->SessionMainTree),GTK_TREE_MODEL(widgets->SessionsList));
return G_SOURCE_REMOVE;
}
void on_session_activate(GtkWidget *self, main_window *widgets){
@ -619,6 +622,25 @@ void on_session_end(GtkWidget *self, main_window *widgets){
}
}
void on_session_unlock(GtkWidget *self, main_window *widgets){
GtkTreeModel *model = GTK_TREE_MODEL(widgets->SessionsList);
GtkTreeIter iter;
if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->SessionMainTree)),&model,&iter)){
int id;
gtk_tree_model_get(model,&iter,0,&id,-1);
dialog_confirmation_data *data = malloc(sizeof(dialog_confirmation_data));
char *convert = yon_char_from_int(id);
data->action_text = SESSION_ACTIVATE_TOOLTIP_LABEL(convert);
data->data = NULL;
data->function = NULL;
if (yon_confirmation_dialog_call(self,data) == GTK_RESPONSE_ACCEPT){
yon_launch(session_activate_session(convert));
free(convert);
yon_sessions_update(widgets);
}
}
}
void on_session_block(GtkWidget *self, main_window *widgets){
GtkTreeModel *model = GTK_TREE_MODEL(widgets->SessionsList);
GtkTreeIter iter;
@ -1349,7 +1371,7 @@ void* yon_interface_update(main_window *widgets){
g_idle_add((GSourceFunc)yon_system_config_set,data);
}
}
yon_sessions_update(widgets);
g_idle_add((GSourceFunc)yon_sessions_update,widgets);
for (size_t i=0;i<json_object_array_length(jsobject);i++){
struct json_object *item_obj = json_object_array_get_idx(jsobject, i);
@ -1756,6 +1778,7 @@ void yon_main_window_complete(main_window *widgets){
widgets->SessionRestartButton=yon_gtk_builder_get_widget(builder,"SessionRestartButton");
widgets->SessionMainTree=yon_gtk_builder_get_widget(builder,"SessionMainTree");
widgets->SessionSwitchButton=yon_gtk_builder_get_widget(builder,"SessionSwitchButton");
widgets->SessionStartButton=yon_gtk_builder_get_widget(builder,"SessionStartButton");
widgets->SessionStopButton=yon_gtk_builder_get_widget(builder,"SessionStopButton");
widgets->SessionBlockButton=yon_gtk_builder_get_widget(builder,"SessionBlockButton");
@ -1817,7 +1840,8 @@ void yon_main_window_complete(main_window *widgets){
g_signal_connect(G_OBJECT(widgets->ConfigUpdateButton),"clicked",G_CALLBACK(on_interface_update),widgets);
g_signal_connect(G_OBJECT(widgets->SessionRestartButton),"clicked",G_CALLBACK(on_interface_update),widgets);
g_signal_connect(G_OBJECT(widgets->SessionStartButton),"clicked",G_CALLBACK(on_session_activate),widgets);
g_signal_connect(G_OBJECT(widgets->SessionSwitchButton),"clicked",G_CALLBACK(on_session_activate),widgets);
g_signal_connect(G_OBJECT(widgets->SessionStartButton),"clicked",G_CALLBACK(on_session_unlock),widgets);
g_signal_connect(G_OBJECT(widgets->SessionStopButton),"clicked",G_CALLBACK(on_session_end),widgets);
g_signal_connect(G_OBJECT(widgets->SessionBlockButton),"clicked",G_CALLBACK(on_session_block),widgets);
g_signal_connect(G_OBJECT(widgets->SessionMainTree),"cursor-changed",G_CALLBACK(on_sessions_selection_changed),widgets);

5
source/ubl-settings-services.h
Unescape View File

@ -227,6 +227,7 @@ typedef struct {
GtkWidget *SessionRestartButton;
GtkWidget *SessionMainTree;
GtkWidget *SessionSwitchButton;
GtkWidget *SessionStartButton;
GtkWidget *SessionStopButton;
GtkWidget *SessionBlockButton;
@ -388,7 +389,9 @@ void on_service_restart_confirmed(GtkWidget *self,char *service_name);
void on_system_system_restart_clicked(GtkWidget *self, main_window *widgets);
void yon_sessions_update(main_window *widgets);
gboolean yon_sessions_update(main_window *widgets);
void on_session_unlock(GtkWidget *self, main_window *widgets);
void on_session_activate();

47
ubl-settings-services.glade
Unescape View File

@ -369,12 +369,12 @@
<object class="GtkImage" id="image10">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="icon-name">com.ublinux.ubl-settings-services.stop-symbolic</property>
<property name="icon-name">com.ublinux.libublsettingsui-gtk3.move-away-symbolic</property>
</object>
<object class="GtkImage" id="image11">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="icon-name">com.ublinux.ubl-settings-services.play-symbolic</property>
<property name="icon-name">com.ublinux.libublsettingsui-gtk3.changes-allow-symbolic</property>
</object>
<object class="GtkImage" id="image12">
<property name="visible">True</property>
@ -441,6 +441,11 @@
<property name="can-focus">False</property>
<property name="icon-name">com.ublinux.libublsettingsui-gtk3.sync-symbolic</property>
</object>
<object class="GtkImage" id="image24">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="icon-name">com.ublinux.libublsettingsui-gtk3.move-in-symbolic</property>
</object>
<object class="GtkImage" id="image3">
<property name="visible">True</property>
<property name="can-focus">False</property>
@ -474,7 +479,7 @@
<object class="GtkImage" id="image9">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="icon-name">com.ublinux.ubl-settings-services.lock-symbolic</property>
<property name="icon-name">com.ublinux.libublsettingsui-gtk3.changes-prevent-symbolic</property>
</object>
<object class="GtkListStore" id="liststore1"/>
<object class="GtkListStore" id="liststore3"/>
@ -1970,13 +1975,13 @@
</packing>
</child>
<child>
<object class="GtkButton" id="SessionStartButton">
<object class="GtkButton" id="SessionSwitchButton">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes">Activate session</property>
<property name="image">image11</property>
<property name="tooltip-text" translatable="yes">Terminate session</property>
<property name="image">image24</property>
<style>
<class name="thin"/>
</style>
@ -1988,13 +1993,13 @@
</packing>
</child>
<child>
<object class="GtkButton" id="SessionStopButton">
<object class="GtkButton" id="SessionBlockButton">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes">Terminate session</property>
<property name="image">image10</property>
<property name="tooltip-text" translatable="yes">Lock session</property>
<property name="image">image9</property>
<style>
<class name="thin"/>
</style>
@ -2006,13 +2011,13 @@
</packing>
</child>
<child>
<object class="GtkButton" id="SessionBlockButton">
<object class="GtkButton" id="SessionStartButton">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes">Lock session</property>
<property name="image">image9</property>
<property name="tooltip-text" translatable="yes">Activate session</property>
<property name="image">image11</property>
<style>
<class name="thin"/>
</style>
@ -2023,6 +2028,24 @@
<property name="position">4</property>
</packing>
</child>
<child>
<object class="GtkButton" id="SessionStopButton">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes">Terminate session</property>
<property name="image">image10</property>
<style>
<class name="thin"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">5</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>

Write Preview
Loading…
Cancel
Save