Config tab fixes

pull/91/head
parent 5dd100b36f
commit a88c853dac

@ -1258,7 +1258,7 @@ void* yon_interface_update(main_window *widgets){
int config_size; int config_size;
config_str config_files = yon_config_load(get_config_files_command,&config_size); config_str config_files = yon_config_load(get_config_files_command,&config_size);
int timers_size; int timers_size;
config_str timers = yon_config_load(get_timers_command,&timers_size); config_str timers = yon_config_load(get_timers_command,&timers_size);
struct json_object *jsobject = json_tokener_parse(timers[0]); struct json_object *jsobject = json_tokener_parse(timers[0]);
int launched_size; int launched_size;
config_str launched = yon_config_load(load_launched_command,&launched_size); config_str launched = yon_config_load(load_launched_command,&launched_size);
@ -1750,6 +1750,7 @@ void yon_main_window_complete(main_window *widgets){
PROPERTIES_LABEL,properties_icon_path,on_user_status_clicked,widgets, PROPERTIES_LABEL,properties_icon_path,on_user_status_clicked,widgets,
NULL); NULL);
widgets->ConfigUpdateButton=yon_gtk_builder_get_widget(builder,"ConfigUpdateButton");
widgets->ConfigEditButton=yon_gtk_builder_get_widget(builder,"ConfigEditButton"); widgets->ConfigEditButton=yon_gtk_builder_get_widget(builder,"ConfigEditButton");
widgets->ConfigMainTree=yon_gtk_builder_get_widget(builder,"ConfigMainTree"); widgets->ConfigMainTree=yon_gtk_builder_get_widget(builder,"ConfigMainTree");
@ -1813,6 +1814,7 @@ void yon_main_window_complete(main_window *widgets){
g_signal_connect(G_OBJECT(widgets->UserUnloadedShowCheck),"toggled",G_CALLBACK(on_filter_changed),widgets); g_signal_connect(G_OBJECT(widgets->UserUnloadedShowCheck),"toggled",G_CALLBACK(on_filter_changed),widgets);
g_signal_connect(G_OBJECT(widgets->ConfigEditButton),"clicked",G_CALLBACK(on_config_edit_clicked),widgets); g_signal_connect(G_OBJECT(widgets->ConfigEditButton),"clicked",G_CALLBACK(on_config_edit_clicked),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->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->SessionStartButton),"clicked",G_CALLBACK(on_session_activate),widgets);

@ -222,6 +222,7 @@ typedef struct {
GtkWidget *UserDescriptionLabel; GtkWidget *UserDescriptionLabel;
GtkWidget *ConfigEditButton; GtkWidget *ConfigEditButton;
GtkWidget *ConfigUpdateButton;
GtkWidget *ConfigMainTree; GtkWidget *ConfigMainTree;
GtkWidget *SessionRestartButton; GtkWidget *SessionRestartButton;

@ -436,6 +436,11 @@
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="icon-name">com.ublinux.ubl-settings-services.sync-symbolic</property> <property name="icon-name">com.ublinux.ubl-settings-services.sync-symbolic</property>
</object> </object>
<object class="GtkImage" id="image23">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="icon-name">com.ublinux.libublsettingsui-gtk3.sync-symbolic</property>
</object>
<object class="GtkImage" id="image3"> <object class="GtkImage" id="image3">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
@ -1787,6 +1792,23 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="spacing">5</property>
<child>
<object class="GtkButton" id="ConfigUpdateButton">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="image">image23</property>
<style>
<class name="thin"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child> <child>
<object class="GtkButton" id="ConfigEditButton"> <object class="GtkButton" id="ConfigEditButton">
<property name="visible">True</property> <property name="visible">True</property>
@ -1801,7 +1823,7 @@
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">0</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
</object> </object>

@ -370,7 +370,7 @@ msgstr "Дополнительная информация"
#: source/ubl-strings.h:109 #: source/ubl-strings.h:109
msgid "Edit configuration file" msgid "Edit configuration file"
msgstr "Редактировать в конфигурации" msgstr "Редактировать конфигурационный файл"
#: source/ubl-strings.h:111 #: source/ubl-strings.h:111
msgid "Show inactive" msgid "Show inactive"

Loading…
Cancel
Save