diff --git a/source/ubl-settings-manager.c b/source/ubl-settings-manager.c index 5fc448a..7fb72cc 100644 --- a/source/ubl-settings-manager.c +++ b/source/ubl-settings-manager.c @@ -45,6 +45,8 @@ void on_plug_added(GtkSocket* self, actionWidgets *builder){ gtk_widget_set_vexpand(GTK_WIDGET(builder->socketplace),1); gtk_widget_set_vexpand(GTK_WIDGET(self),1); gtk_widget_show(builder->socketplace); + if main_c + gtk_widget_hide(applist->appSettings); // if (main_config.WindowTheme==0) // else @@ -87,7 +89,6 @@ void on_Item_activated(GtkIconView* self, GtkTreePath* path, actionWidgets *appl if (tempapp[0].Type==1){ if (tempapp->Pluggable==1) if (tempapp->DualPluggable==1){ - gtk_widget_hide(applist->appSettings); char *dualarg=malloc(strlen("--socket-id= --socket-ext-id= --socket-trd-id=")+30); sprintf(dualarg,"--socket-id=%d --socket-ext-id=%d --socket-trd-id=%d",gtk_socket_get_id(GTK_SOCKET(applist->socket)),gtk_socket_get_id(GTK_SOCKET(applist->socketbutton)),gtk_socket_get_id(GTK_SOCKET(applist->ThirdSocket))); launch_app_with_arguments(tempapp[0].Exec,dualarg); @@ -281,11 +282,11 @@ int on_settings_accept(GtkWidget *button, dictionary **widgetsDs){ void on_paned_move(GtkPaned* self, GtkScrollType* scroll_type, actionWidgets *widgets){ int position=gtk_paned_get_position(GTK_PANED(widgets->GnomePaned)); - if (position<250) {position=250; gtk_paned_set_position(GTK_PANED(widgets->GnomePaned),250);} + if (position<200) {position=200; gtk_paned_set_position(GTK_PANED(widgets->GnomePaned),200);} main_config.iconSegmentSize=position; - if (position <115) {position=115;} + if (position <70) {position=70;} double pos=((double)position); - if (pos<110) pos=110; + if (pos<70) pos=70; for (dictionary *dict=widgets->ICSys;dict!=NULL;dict=dict->next){ IVGraphicals *IV=(IVGraphicals*)dict->data; gtk_icon_view_set_item_width(GTK_ICON_VIEW(IV->IV),pos); @@ -1276,7 +1277,7 @@ void yon_icv_resize_item(dictionary *icdict, GtkWidget *paned){ IVGraphicals *icv=(IVGraphicals*)dict->data; int width=gtk_paned_get_position(GTK_PANED(paned)); int pos=(int)((double)width); - if (pos < 115) pos=115; + if (pos < 100) pos=100; gtk_icon_view_set_item_width(GTK_ICON_VIEW(icv->IV),pos); } diff --git a/ubl-settings-manager.glade b/ubl-settings-manager.glade index f66a1f7..9724b45 100644 --- a/ubl-settings-manager.glade +++ b/ubl-settings-manager.glade @@ -138,11 +138,11 @@ - + False - 800 - 600 - ubconfig-gui + 450 + 250 + dialog-question True @@ -152,21 +152,40 @@ True False + + + True + False + start + 20 + 20 + dialog-question-symbolic + 6 + + + False + True + 0 + + True False - True vertical - + True False - center - 3 + start + 10 + 5 + Would you like to read documentation in the Web? + + + @@ -175,190 +194,59 @@ 0 - - - - False - True - 0 - - - - - True - True - 52 - True - True - + True - True - external - in - - - True - False - immediate - - - True - False - vertical - - - - - - - - + False + start + start + 15 + 10 + You will be redirected to documentation website where documentation is translated and supported by community. + True + - False - True + True + True + 1 - + + Always redirect to online documentation True - False - vertical - - - True - False - vertical - - - True - False - 3 - 3 - 3 - 3 - 3 - 0 - in - - - True - False - 12 - - - True - False - center - center - - - - False - True - 0 - - - - - True - False - - - desklabel - True - False - center - right - 1 - - - False - True - 0 - - - - - False - True - 1 - - - - - - - - - - - - - True - True - 0 - - - - - True - True - 0 - - - - - True - False - vertical - - - False - vertical - - - - - - False - True - 0 - - - - - False - True - 1 - - + True + False + end + 5 + 10 + True + - True - True + False + True + 2 + True True - end 1 + True @@ -366,226 +254,8 @@ 0 - - - - - True - False - True - - True - False - 32 - ubconfig-gui - 5 - - - - - Back to settings - True - False - False - False - center - center - 10 - 10 - image5 - - - 1 - - - - - True - False - - - True - True - False - True - center - center - GnomeMenu - none - - - - - - - False - True - 0 - - - - - end - 2 - - - - - True - False - center - center - - - - - - end - 3 - - - - - True - False - center - center - vertical - - - - - - 4 - - - - - - - - False - 450 - 250 - dialog-question - - - True - False - vertical - - - True - False - - - True - False - start - 20 - 20 - dialog-question-symbolic - 6 - - - False - True - 0 - - - - - True - False - vertical - - - True - False - start - 10 - 5 - Would you like to read documentation in the Web? - - - - - - - False - True - 0 - - - - - True - False - start - start - 15 - 10 - You will be redirected to documentation website where documentation is translated and supported by community. - True - - - - True - True - 1 - - - - - Always redirect to online documentation - True - True - False - end - 5 - 10 - True - - - - False - True - 2 - - - - - - True - True - 1 - - - - - - True - True - 0 - - - - + True False 5 @@ -960,7 +630,7 @@ True False 32 - ubconfig-gui + ubl-settings-manager 5 @@ -1132,7 +802,7 @@ True False 32 - ubconfig-gui + ubl-settings-manager 5 @@ -1164,301 +834,588 @@ - + + + + 2 + + + + + True + False + vertical + + + True + True + False + True + center + center + MainMenu + none + False + + + + + + False + True + 0 + + + + + end + 3 + + + + + True + False + center + center + + + + + + + end + 4 + + + + + + + + True + False + gtk-undelete + + + True + False + ubconfig-gui + 6 + + + True + False + + + True + False + Element 1 + + + + + True + False + Element 2 + + + True + False + + + True + False + Element 3 + + + + + + + + + Element 4 + True + False + image3 + False + + + + + True + False + object-select-symbolic + + + False + 800 + 600 + + + True + False + vertical + + + True + True + 5 + 5 + 5 + 5 + in + + + True + False + + + True + False + vertical + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + vertical + + + + + + False + True + 0 + + + + + True + False + 5 + 5 + 5 + 5 + 0.019999999552965164 + in + + + True + False + 3 + 3 + 5 + 5 + + + True + False + + + True + True + True + center + 3 + image2 + + + False + True + 0 + + + + + True + True + True + False + Section name + name + + + True + True + 1 + + + + + True + False + + + True + False + center + + + True + True + True + 5 + image4 + + + False + True + end + 2 + + + + + True + False + 2 + + + True + True + 5 + 5 + 5 + 10 + False + Identifier + + + True + True + 0 + + + + + True + True + 2 + + + + + True + True + 1 + + + + + True + True + 2 + + + + + + + + + + + + False + True + 1 + + + + + + - 2 + True + True + 0 True False - vertical - + + Close True True - False True - center - center - MainMenu - none - False - - - + 5 + 5 False True + end 0 - - - end - 3 - - - - - True - False - center - center - + + Save and apply + True + True + True + 17 + 5 + + + False + True + end + 1 + - - end - 4 + False + True + 1 - - - - - - True - False - gtk-undelete - - - True - False - ubconfig-gui - 6 - - - True - False - - - True - False - Element 1 - - + + True False - Element 2 - - + UBLinux Settings + + True False - - - True - False - Element 3 - - + 32 + ubl-settings-manager + 5 - - - Element 4 - True - False - image3 - False - - - + True False - object-select-symbolic + go-first-symbolic - + False 800 600 + ubconfig-gui True False vertical - + True - True - 5 - 5 - 5 - 5 - in + False - + True False + True + vertical - + True False - vertical + center + 3 + + + + False + True + 0 + + + + + + False + True + 0 + + + + + True + True + 52 + True + True + + + True + True + external + in - + True False - 5 - 5 - 5 5 - 5 - 5 - vertical + immediate + natural - + + True + False + vertical + + + + + - - False - True - 0 - + + + False + True + + + + + True + False + vertical - + True False - 5 - 5 - 5 - 5 - 0.019999999552965164 - in + vertical - + True False - 3 - 3 - 5 - 5 + 3 + 3 + 3 + 3 + 3 + 0 + in - + True False - - - True - True - True - center - 3 - image2 - - - False - True - 0 - - - - - True - True - True - False - Section name - name - - - True - True - 1 - - + 12 True False + center + center - + + + False + True + 0 + + + + True False - center - - - True - True - True - 5 - image4 - - - False - True - end - 2 - - - + + desklabel True False - 2 - - - True - True - 5 - 5 - 5 - 10 - False - Identifier - - - True - True - 0 - - + center + right + 1 - True + False True - 2 + 0 - True + False True 1 - - True - True - 2 - + + + + + + True + True + 0 + - - + + + True + True + 0 + + + + + True + False + vertical + + + False + vertical + + + + + + False + True + 0 + @@ -1468,8 +1425,18 @@ + + True + True + + + True + True + end + 1 + @@ -1478,73 +1445,108 @@ 0 + + + + + True + False + True + + + True + False + 32 + ubl-settings-manager + 5 + + + + + Back to settings + True + False + False + False + center + center + 10 + 10 + image5 + + + 1 + + True False - - Close + True True + False True - 5 - 5 + center + center + GnomeMenu + none + + + + False True - end 0 + + + end + 2 + + + + + True + False + center + center - - Save and apply - True - True - True - 17 - 5 - - - False - True - end - 1 - + - False - True - 1 + end + 3 - - - - - True - False - UBLinux Settings - + True False - 32 - ubconfig-gui - 5 + center + center + vertical + + + + + 4 + + - - True - False - go-first-symbolic - @@ -1579,10 +1581,10 @@ True True 4 + natural horizontal liststoreTemplate 135 - 10 0 0 0 @@ -1874,7 +1876,7 @@ True False 32 - ubconfig-gui + ubl-settings-manager 5