Current tab render redone to fix crash

pull/70/head
parent c8fa025fd4
commit 104e9e3f26

@ -916,14 +916,6 @@ void on_region_resized(GtkWidget *,main_window *widgets){
yon_image_resize_from_container(GTK_IMAGE(widgets->KeyboardImage), widgets->keyboard_original); yon_image_resize_from_container(GTK_IMAGE(widgets->KeyboardImage), widgets->keyboard_original);
} }
void on_toggle_block(GtkToggleButton *self);
void on_toggle_block(GtkToggleButton *self){
int state = gtk_toggle_button_get_active(self);
g_signal_handlers_block_by_func(G_OBJECT(self),on_toggle_block,NULL);
gtk_toggle_button_set_active(self,!state);
g_signal_handlers_unblock_by_func(G_OBJECT(self),on_toggle_block,NULL);
}
void yon_switch_page_render(main_window *widgets, int page); void yon_switch_page_render(main_window *widgets, int page);
void yon_switch_page_render(main_window *widgets, int page){ void yon_switch_page_render(main_window *widgets, int page){
if (widgets&&page){}; if (widgets&&page){};
@ -931,13 +923,9 @@ void yon_switch_page_render(main_window *widgets, int page){
GList *list = gtk_container_get_children(parent); GList *list = gtk_container_get_children(parent);
for (guint i=0;i<g_list_length(list);i++){ for (guint i=0;i<g_list_length(list);i++){
if (i!=(guint)page){ if (i!=(guint)page){
g_signal_handlers_block_by_func(G_OBJECT(g_list_nth_data(list,i)),on_toggle_block,NULL);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(g_list_nth_data(list,i)),0); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(g_list_nth_data(list,i)),0);
g_signal_handlers_unblock_by_func(G_OBJECT(g_list_nth_data(list,i)),on_toggle_block,NULL);
} else { } else {
g_signal_handlers_block_by_func(G_OBJECT(g_list_nth_data(list,i)),on_toggle_block,NULL);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(g_list_nth_data(list,i)),1); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(g_list_nth_data(list,i)),1);
g_signal_handlers_unblock_by_func(G_OBJECT(g_list_nth_data(list,i)),on_toggle_block,NULL);
} }
} }
@ -1099,7 +1087,7 @@ void on_page_changed(GtkWidget *,GtkWidget *,int page, main_window *widgets){
break; break;
case YON_PAGE_INSTALLATION:{ case YON_PAGE_INSTALLATION:{
// yon_switch_page_render(widgets,3); yon_switch_page_render(widgets,3);
gtk_widget_set_sensitive(widgets->BackButton,0); gtk_widget_set_sensitive(widgets->BackButton,0);
if ((!main_config.configure_mode)) if ((!main_config.configure_mode))
gtk_widget_set_sensitive(widgets->CancelInstallButton,0); gtk_widget_set_sensitive(widgets->CancelInstallButton,0);
@ -2486,14 +2474,6 @@ main_window *yon_main_window_complete(){
g_signal_connect(G_OBJECT(widgets->AddButton),"clicked",G_CALLBACK(on_keyboard_clicked),widgets); g_signal_connect(G_OBJECT(widgets->AddButton),"clicked",G_CALLBACK(on_keyboard_clicked),widgets);
g_signal_connect(G_OBJECT(widgets->RemoveButton),"clicked",G_CALLBACK(on_keyboard_removed),widgets); g_signal_connect(G_OBJECT(widgets->RemoveButton),"clicked",G_CALLBACK(on_keyboard_removed),widgets);
g_signal_connect(G_OBJECT(widgets->UsersToggle),"toggled",G_CALLBACK(on_toggle_block),NULL);
g_signal_connect(G_OBJECT(widgets->LicenceToggle),"toggled",G_CALLBACK(on_toggle_block),NULL);
g_signal_connect(G_OBJECT(widgets->WelcomeToggle),"toggled",G_CALLBACK(on_toggle_block),NULL);
g_signal_connect(G_OBJECT(widgets->KeyboardToggle),"toggled",G_CALLBACK(on_toggle_block),NULL);
g_signal_connect(G_OBJECT(widgets->LocationToggle),"toggled",G_CALLBACK(on_toggle_block),NULL);
g_signal_connect(G_OBJECT(widgets->SectionsToggle),"toggled",G_CALLBACK(on_toggle_block),NULL);
g_signal_connect(G_OBJECT(widgets->InstallationToggle),"toggled",G_CALLBACK(on_toggle_block),NULL);
g_signal_connect(G_OBJECT(widgets->CompletionToggle),"toggled",G_CALLBACK(on_toggle_block),NULL);
g_signal_connect(G_OBJECT(widgets->InstallationNearSysDevicesTree),"cursor-changed",G_CALLBACK(on_near_installation_device_changed),widgets); g_signal_connect(G_OBJECT(widgets->InstallationNearSysDevicesTree),"cursor-changed",G_CALLBACK(on_near_installation_device_changed),widgets);
g_signal_connect(G_OBJECT(widgets->SamePlaceDeviceTree),"cursor-changed",G_CALLBACK(on_near_installation_device_changed),widgets); g_signal_connect(G_OBJECT(widgets->SamePlaceDeviceTree),"cursor-changed",G_CALLBACK(on_near_installation_device_changed),widgets);
g_signal_connect(G_OBJECT(widgets->UserdataDevicesTree),"cursor-changed",G_CALLBACK(on_near_installation_device_changed),widgets); g_signal_connect(G_OBJECT(widgets->UserdataDevicesTree),"cursor-changed",G_CALLBACK(on_near_installation_device_changed),widgets);

@ -155,49 +155,61 @@ treeview row:nth-child(even) { background-color: #ffffff; }
padding-bottom:7px; padding-bottom:7px;
} }
.toggletabs:checked { .toggletabs:disabled {
background:@theme_base_color; background-color: @background_color;
border:none;
border-radius:0px; border-radius:0px;
color:inherit; transition:0;
padding-top:7px; padding-top:7px;
padding-bottom:7px; padding-bottom:7px;
opacity:1;
} }
.toggletabs:checked>* { .toggletabs:checked:disabled {
background:@theme_base_color; background:@theme_base_color;
border-radius:0px; border-radius:0px;
color:inherit; color:@theme_text_color;
padding-top:7px;
padding-bottom:7px;
opacity:1;
} }
.toggletabs:checked:active { .toggletabs:checked:disabled>* {
background:@theme_base_color; background:@theme_base_color;
border-radius:0px; color:@theme_text_color;
color:inherit; opacity:1;
padding-top:7px;
padding-bottom:7px;
} }
.toggletabs:checked>*:active {
.toggletabs:checked:active:disabled {
background:@theme_base_color; background:@theme_base_color;
border-color:inherit;
border-style:solid;
border-radius:0px; border-radius:0px;
color:inherit; color:inherit;
padding-top:7px;
padding-bottom:7px;
opacity:1;
} }
.toggletabs:active {
background-color: @background_color; .toggletabs:disabled:active {
background-color: @theme_base_color;
border:none; border:none;
border-radius:0px; border-radius:0px;
transition:0; transition:0;
padding-top:7px; padding-top:7px;
padding-bottom:7px; padding-bottom:7px;
color:black;
opacity:1;
} }
.toggletabs:active {
.toggletabs:active>* { background-color: @theme_base_color;
background:@background_color; border:none;
border-radius:0px; border-radius:0px;
transition:0;
padding-top:7px;
padding-bottom:7px;
color:inherit; color:inherit;
opacity:1;
} }
.menubox { .menubox {

@ -326,6 +326,7 @@
<child> <child>
<object class="GtkToggleButton" id="WelcomeToggle"> <object class="GtkToggleButton" id="WelcomeToggle">
<property name="visible">True</property> <property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>
<property name="active">True</property> <property name="active">True</property>
@ -350,6 +351,7 @@
<child> <child>
<object class="GtkToggleButton" id="LicenceToggle"> <object class="GtkToggleButton" id="LicenceToggle">
<property name="visible">True</property> <property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>
<child> <child>
@ -374,6 +376,7 @@ agreement</property>
<child> <child>
<object class="GtkToggleButton" id="SectionsToggle"> <object class="GtkToggleButton" id="SectionsToggle">
<property name="visible">True</property> <property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>
<child> <child>
@ -397,6 +400,7 @@ agreement</property>
<child> <child>
<object class="GtkToggleButton" id="InstallationToggle"> <object class="GtkToggleButton" id="InstallationToggle">
<property name="visible">True</property> <property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>
<child> <child>
@ -420,6 +424,7 @@ agreement</property>
<child> <child>
<object class="GtkToggleButton" id="LocationToggle"> <object class="GtkToggleButton" id="LocationToggle">
<property name="visible">True</property> <property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>
<child> <child>
@ -443,6 +448,7 @@ agreement</property>
<child> <child>
<object class="GtkToggleButton" id="KeyboardToggle"> <object class="GtkToggleButton" id="KeyboardToggle">
<property name="visible">True</property> <property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>
<child> <child>
@ -466,6 +472,7 @@ agreement</property>
<child> <child>
<object class="GtkToggleButton" id="USersToggle"> <object class="GtkToggleButton" id="USersToggle">
<property name="visible">True</property> <property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>
<child> <child>
@ -489,6 +496,7 @@ agreement</property>
<child> <child>
<object class="GtkToggleButton" id="CompletionToggle"> <object class="GtkToggleButton" id="CompletionToggle">
<property name="visible">True</property> <property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>
<child> <child>

Loading…
Cancel
Save