Applications
/
ubl-settings-manager
9
0
Fork 1
Code Issues 17 Pull Requests Packages Projects Releases Wiki Activity

revert 8bfdf69a9f

Browse Source 
revert Implemented system info resizing on small resolutions
pull/2/head
Ivan Dmitrievich Yartsev 3 years ago
parent 49121f1806
commit e4de627272
3 changed files with 20 additions and 178 deletions
Show Stats Download Patch File Download Diff File

83
ubl-settings-manager.c
Unescape View File

@ -151,18 +151,13 @@ void on_ReadHelpButton_activated(GtkWidget *button, GtkBuilder *builder){
}; };
int on_settings_accept(GtkWidget *button, dictionary **widgetsDs){ int on_settings_accept(GtkWidget *button, dictionary **widgetsDs){
if (main_config.WindowTheme==0) dictionary *widgetsD=*widgetsDs;
main_config.curThemeName="Main";
else if (main_config.WindowTheme==1)
main_config.curThemeName="Gnome";
dictionary *widgetsD=yon_dictionary_find(widgetsDs,main_config.curThemeName);
printf("Saving config...\n"); printf("Saving config...\n");
actionWidgets *widgets=(actionWidgets*)widgetsD->data; actionWidgets *widgets=(actionWidgets*)widgetsD->data;
int theme=gtk_combo_box_get_active(GTK_COMBO_BOX(widgets->settingsThemeChooser)); int theme=gtk_combo_box_get_active(GTK_COMBO_BOX(widgets->settingsThemeChooser));
gtk_window_get_position(GTK_WINDOW(widgets->window),&main_config.windowPosX,&main_config.windowPosY);
gtk_window_get_size(GTK_WINDOW(widgets->window),&main_config.windowWidth,&main_config.windowHeight);
if (theme==0) if (theme==0)
main_config.curThemeName="Main"; main_config.curThemeName="Main";
else if (theme==1) else if (theme==1)
@ -175,13 +170,13 @@ int on_settings_accept(GtkWidget *button, dictionary **widgetsDs){
gtk_window_move(GTK_WINDOW(loaderWindow),main_config.windowPosX,main_config.windowPosY); gtk_window_move(GTK_WINDOW(loaderWindow),main_config.windowPosX,main_config.windowPosY);
gtk_widget_show(loaderWindow); gtk_widget_show(loaderWindow);
gtk_window_present(GTK_WINDOW(widgets->SettingsWindow));
// gtk_widget_hide(widgets->window); // gtk_widget_hide(widgets->window);
yon_switch_theme(widgetsDs,yon_dictionary_find(&widgetsD,main_config.curThemeName)); yon_switch_theme(widgetsDs,yon_dictionary_find(&widgetsD,main_config.curThemeName));
if (widgets!=(actionWidgets*)widgetsD->data) widgets=(actionWidgets*)widgetsD->data; if (widgets!=(actionWidgets*)widgetsD->data) widgets=(actionWidgets*)widgetsD->data;
// gtk_widget_show(widgets->window); // gtk_widget_show(widgets->window);
gtk_widget_hide(loaderWindow); gtk_widget_hide(loaderWindow);
// main_config.WindowTheme=theme; // main_config.WindowTheme=theme;
gtk_window_present(GTK_WINDOW(widgets->SettingsWindow));
} }
GKeyFile *gfile=g_key_file_new(); GKeyFile *gfile=g_key_file_new();
int sz; int sz;
@ -217,7 +212,6 @@ int on_settings_accept(GtkWidget *button, dictionary **widgetsDs){
void on_paned_move(GtkPaned* self, GtkScrollType* scroll_type, actionWidgets *widgets){ /* TODO */ void on_paned_move(GtkPaned* self, GtkScrollType* scroll_type, actionWidgets *widgets){ /* TODO */
int position=gtk_paned_get_position(GTK_PANED(widgets->GnomePaned)); int position=gtk_paned_get_position(GTK_PANED(widgets->GnomePaned));
main_config.iconSegmentSize=position;
if (position <115) position=115; if (position <115) position=115;
double pos=((double)position-(1/(double)position*4)*500)/1.8; double pos=((double)position-(1/(double)position*4)*500)/1.8;
if (pos<110) pos=110; if (pos<110) pos=110;
@ -553,51 +547,10 @@ void on_section_delete(GtkWidget *button, actionWidgets *widgets){
} }
void on_resized (GtkWidget *window, GdkEventConfigure *event, dictionary *widgetsD){ void on_resized (GtkWidget *window, GdkEventConfigure *event, dictionary *widgetsD){
actionWidgets *widgets=(actionWidgets*)widgetsD->data; actionWidgets *widgets=(actionWidgets*)widgetsD->data;
int x,y;
gtk_window_get_size(GTK_WINDOW(window),&main_config.windowWidth,&main_config.windowHeight);
if (main_config.windowWidth<1024){
if (stld==0){
stld=1;
char *details=gtk_label_get_label(GTK_LABEL(widgets->GnomeInfoDetailsLabel));
//gtk_window_set_resizable(GTK_WINDOW(window),0);
// yon_switch_theme(&widgetsD,yon_dictionary_find(&widgetsD,"Main"));
details[12]='0';
details[13]='9';
printf("SSSSS\n");
gtk_label_set_markup(GTK_LABEL(widgets->GnomeInfoDetailsLabel),details);
GtkWidget *logo = gtk_builder_get_object(widgets->builder,"GnomeInfoLogo");
gtk_image_set_from_pixbuf(GTK_IMAGE(logo),gdk_pixbuf_new_from_file_at_scale(LogoPath,256,256,1,NULL));
// gtk_window_resize(GTK_WINDOW(widgets->window),main_config.windowWidth,main_config.windowHeight);
// gtk_widget_hide(widgets->window);
}
}else {
if (stld==1){
stld=0;
char *details=gtk_label_get_label(GTK_LABEL(widgets->GnomeInfoDetailsLabel));
details[12]='1';
details[13]='2';
printf("SSSSS\n");
gtk_label_set_markup(GTK_LABEL(widgets->GnomeInfoDetailsLabel),details);
GtkWidget *logo = gtk_builder_get_object(widgets->builder,"GnomeInfoLogo");
gtk_image_set_from_pixbuf(GTK_IMAGE(logo),gdk_pixbuf_new_from_file_at_scale(LogoPath,512,512,1,NULL));
}
}
}
void on_resized_done (GtkWidget *window, GdkEvent *event, dictionary *widgetsD){ gtk_window_get_size()
actionWidgets *widgets=(actionWidgets*)widgetsD->data; gtk_window_get_size(GTK_WINDOW(widgets->window),&main_config.windowWidth,&main_config.windowHeight);
if (event->type==GDK_CONFIGURE){
int x,y;
gtk_window_get_size(GTK_WINDOW(window),&x,&y);
if (x<1024&&y<720){
gtk_window_set_resizable(GTK_WINDOW(window),1);
printf("AAAAA\n");
// gtk_widget_hide(widgets->window);
}
}
} }
void launch_app_with_arguments(char *name, char *args){ void launch_app_with_arguments(char *name, char *args){
char *path=malloc(strlen(name)+strlen(args)+4); char *path=malloc(strlen(name)+strlen(args)+4);
memset(path,0,strlen(name)+strlen(args)+4); memset(path,0,strlen(name)+strlen(args)+4);
@ -1171,13 +1124,16 @@ dictionary *yon_dictionary_find(dictionary **dict, char *key){
void yon_switch_theme(dictionary **dict, dictionary *newone){ void yon_switch_theme(dictionary **dict, dictionary *newone){
dictionary *dct=*dict; dictionary *dct=*dict;
actionWidgets *widgets=(actionWidgets*)dct->data; actionWidgets *widgets=(actionWidgets*)dct->data;
gtk_widget_hide(widgets->window); gtk_widget_hide(widgets->window);
gtk_window_get_position(GTK_WINDOW(widgets->window),&main_config.windowPosX,&main_config.windowPosY);
gtk_window_get_size(GTK_WINDOW(widgets->window),&main_config.windowWidth,&main_config.windowHeight);
*dict=newone; *dict=newone;
dct=*dict; dct=*dict;
widgets=(actionWidgets*)dct->data; widgets=(actionWidgets*)dct->data;
gtk_window_resize(GTK_WINDOW(widgets->window),main_config.windowWidth,main_config.windowHeight); gtk_window_resize(GTK_WINDOW(widgets->window),main_config.windowWidth,main_config.windowHeight);
gtk_window_move(GTK_WINDOW(widgets->window),main_config.windowPosX,main_config.windowPosY); gtk_window_move(GTK_WINDOW(widgets->window),main_config.windowPosX,main_config.windowPosY);
gtk_window_maximize(GTK_WINDOW(widgets->window));
gtk_widget_show(widgets->window);
if (strcmp(dct->key,"Gnome")==0){ if (strcmp(dct->key,"Gnome")==0){
int x,y; int x,y;
GdkRectangle workarea; GdkRectangle workarea;
@ -1187,18 +1143,14 @@ void yon_switch_theme(dictionary **dict, dictionary *newone){
dictionary *founddict=yon_dictionary_find(dict,"Main"); dictionary *founddict=yon_dictionary_find(dict,"Main");
dct=yon_dictionary_find(dict,"Gnome"); dct=yon_dictionary_find(dict,"Gnome");
yon_switch_theme(&dct,founddict); yon_switch_theme(&dct,founddict);
gtk_window_resize(GTK_WINDOW(widgets->window),main_config.windowWidth,main_config.windowHeight);
gtk_window_move(GTK_WINDOW(widgets->window),main_config.windowPosX,main_config.windowPosY);
main_config.WindowTheme=0; main_config.WindowTheme=0;
main_config.curThemeName="Main"; main_config.curThemeName="Main";
gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->settingsThemeChooser),0); gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->settingsThemeChooser),0);
} else{ } else{
main_config.WindowTheme=1; main_config.WindowTheme=1;
main_config.curThemeName="Gnome"; main_config.curThemeName="Gnome";
gtk_widget_show(widgets->window);
} }
} else { } else {
gtk_widget_show(widgets->window);
main_config.WindowTheme=0; main_config.WindowTheme=0;
main_config.curThemeName="Main"; main_config.curThemeName="Main";
} }
@ -1376,6 +1328,7 @@ dictionary *yon_theme_new(dictionary **widgetss, GtkBuilder *builder, char *them
gtk_style_context_add_class(gtk_widget_get_style_context(curWidgets->icvpack),"iconview"); gtk_style_context_add_class(gtk_widget_get_style_context(curWidgets->icvpack),"iconview");
gtk_window_maximize(GTK_WINDOW(curWidgets->window));
if (curWidgets->GnomeInfoLabel!=NULL&&curWidgets->GnomeInfoDetailsLabel!=NULL){ if (curWidgets->GnomeInfoLabel!=NULL&&curWidgets->GnomeInfoDetailsLabel!=NULL){
FILE *fp; FILE *fp;
char path[1035]; char path[1035];
@ -1407,7 +1360,7 @@ dictionary *yon_theme_new(dictionary **widgetss, GtkBuilder *builder, char *them
line=yon_char_get_augumented(pth,line); line=yon_char_get_augumented(pth,line);
} else { } else {
line=path; line=path;
pth="<span size=\"12pt\">\n"; pth="<span size=\"14pt\">\n";
line=yon_char_get_augumented(pth,line); line=yon_char_get_augumented(pth,line);
} }
prevline=yon_char_get_augumented(prevline,line); prevline=yon_char_get_augumented(prevline,line);
@ -1424,20 +1377,15 @@ dictionary *yon_theme_new(dictionary **widgetss, GtkBuilder *builder, char *them
gtk_button_set_label(GTK_BUTTON(curWidgets->ButtonBackToMain),_("Back to settings")); gtk_button_set_label(GTK_BUTTON(curWidgets->ButtonBackToMain),_("Back to settings"));
gtk_window_set_title(GTK_WINDOW(curWidgets->window),"UBLinux Settings Manager"); gtk_window_set_title(GTK_WINDOW(curWidgets->window),"UBLinux Settings Manager");
g_signal_connect(G_OBJECT(curWidgets->window), "destroy", G_CALLBACK(gtk_main_quit), NULL); g_signal_connect(G_OBJECT(curWidgets->window), "destroy", G_CALLBACK(gtk_main_quit), NULL);
if (curWidgets->GnomePaned!=NULL){
g_signal_connect(G_OBJECT(curWidgets->GnomePaned), "notify::position", G_CALLBACK(on_paned_move), curWidgets);
}
if (strcmp(theme_id,"Gnome")==0){
g_signal_connect(G_OBJECT(curWidgets->window), "configure-event", G_CALLBACK(on_resized), widgets); g_signal_connect(G_OBJECT(curWidgets->window), "configure-event", G_CALLBACK(on_resized), widgets);
// g_signal_connect(G_OBJECT(curWidgets->window), "event-after", G_CALLBACK(on_resized_done), widgets);
}
if (curWidgets->ButtonBackToMain!=NULL) if (curWidgets->ButtonBackToMain!=NULL)
g_signal_connect(G_OBJECT(curWidgets->ButtonBackToMain), "clicked", G_CALLBACK(on_backToSettingsButton_clicked), curWidgets); g_signal_connect(G_OBJECT(curWidgets->ButtonBackToMain), "clicked", G_CALLBACK(on_backToSettingsButton_clicked), curWidgets);
curWidgets->LabelTitle=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"LabelTitle")); curWidgets->LabelTitle=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"LabelTitle"));
gtk_window_set_title(GTK_WINDOW(curWidgets->window),"UBLinux Settings Manager GNOME"); gtk_window_set_title(GTK_WINDOW(curWidgets->window),"UBLinux Settings Manager GNOME");
if (curWidgets->GnomePaned!=NULL){
g_signal_connect(G_OBJECT(curWidgets->GnomePaned), "notify::position", G_CALLBACK(on_paned_move), curWidgets);
}
// Standard for all themes // Standard for all themes
curWidgets->settingsThemeChooser=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"settingsThemeChooser")); curWidgets->settingsThemeChooser=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"settingsThemeChooser"));
@ -1576,7 +1524,6 @@ int main(int argc, char *argv[]){
gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(widg->settingsThemeChooser),NULL,_("Standard theme")); gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(widg->settingsThemeChooser),NULL,_("Standard theme"));
gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(widg->settingsThemeChooser),NULL,_("GNOME theme")); gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(widg->settingsThemeChooser),NULL,_("GNOME theme"));
widg=(actionWidgets*)widgets->data; widg=(actionWidgets*)widgets->data;
gtk_window_maximize(GTK_WINDOW(widg->window));
gtk_widget_show_all(widg->window); gtk_widget_show_all(widg->window);
GtkCssProvider *css=gtk_css_provider_new(); GtkCssProvider *css=gtk_css_provider_new();

1
ubl-settings-manager.h
Unescape View File

@ -14,7 +14,6 @@
#define PictureFormatExtra ".svg" #define PictureFormatExtra ".svg"
#define LocalePath "locale/" #define LocalePath "locale/"
#define LocaleName "base" #define LocaleName "base"
#define LogoPath "images/ublinux-dark-glow-sc.svg"
typedef struct apps{ typedef struct apps{

114
ui/ubl-settings-manager.glade
Unescape View File

@ -249,110 +249,6 @@
</object> </object>
</child> </child>
</object> </object>
<object class="GtkWindow">
<property name="can-focus">False</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-start">30</property>
<property name="margin-end">30</property>
<property name="stock">gtk-dialog-warning</property>
<property name="icon_size">6</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="label" translatable="yes">You are not allowed to change theme on such low resolution!</property>
<property name="wrap">True</property>
<property name="xalign">0.019999999552965164</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton">
<property name="label" translatable="yes">Understood</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
</child>
<child type="titlebar">
<object class="GtkHeaderBar">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="title" translatable="yes">UBLinux Settings Manager</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="stock">gtk-dialog-warning</property>
<property name="icon_size">5</property>
</object>
</child>
</object>
</child>
</object>
<object class="GtkPopover">
<property name="can-focus">False</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<placeholder/>
</child>
<child>
<object class="GtkLabel" id="MainInfoDetailsLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">label</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
<object class="GtkAdjustment" id="adjustment1"> <object class="GtkAdjustment" id="adjustment1">
<property name="lower">1</property> <property name="lower">1</property>
<property name="upper">5</property> <property name="upper">5</property>
@ -1034,7 +930,7 @@
<object class="GtkPaned" id="GnomePaned"> <object class="GtkPaned" id="GnomePaned">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="position">52</property> <property name="position">152</property>
<property name="position-set">True</property> <property name="position-set">True</property>
<property name="wide-handle">True</property> <property name="wide-handle">True</property>
<child> <child>
@ -1067,7 +963,7 @@
</child> </child>
</object> </object>
<packing> <packing>
<property name="resize">False</property> <property name="resize">True</property>
<property name="shrink">True</property> <property name="shrink">True</property>
</packing> </packing>
</child> </child>
@ -1085,6 +981,7 @@
<object class="GtkFrame"> <object class="GtkFrame">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="margin-left">3</property>
<property name="margin-right">3</property> <property name="margin-right">3</property>
<property name="margin-start">3</property> <property name="margin-start">3</property>
<property name="margin-end">3</property> <property name="margin-end">3</property>
@ -1104,7 +1001,7 @@
<property name="halign">center</property> <property name="halign">center</property>
<property name="valign">center</property> <property name="valign">center</property>
<child> <child>
<object class="GtkImage" id="GnomeInfoLogo"> <object class="GtkImage">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="halign">end</property> <property name="halign">end</property>
@ -1208,7 +1105,7 @@
</child> </child>
</object> </object>
<packing> <packing>
<property name="resize">True</property> <property name="resize">False</property>
<property name="shrink">True</property> <property name="shrink">True</property>
</packing> </packing>
</child> </child>
@ -1216,7 +1113,6 @@
<packing> <packing>
<property name="expand">True</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="pack-type">end</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>

Write Preview
Loading…
Cancel
Save