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

Gnome information improved

Browse Source
pull/2/head
Ivan Dmitrievich Yartsev 3 years ago
parent 609da7ed75
commit f0e8c123c5
2 changed files with 77 additions and 24 deletions
Show Stats Download Patch File Download Diff File

69
ubl-settings-manager.c
Unescape View File

@ -556,7 +556,45 @@ void on_section_delete(GtkWidget *button, actionWidgets *widgets){
}
}
}
void on_resized (GtkWidget *window, GdkEventConfigure *event, dictionary *widgetsD){
actionWidgets *widgets=(actionWidgets*)widgetsD->data;
int x,y;
gtk_window_get_size(GTK_WINDOW(widgets->window),&x,&y);
printf("worked\n%d - %d\n",x,y);
if (main_config.WindowTheme!=0)
if (x<1024&&y<720){
actionWidgets *widgets=(actionWidgets*)widgetsD->data;
main_config.WindowTheme=0;
main_config.iconsize=24;
gtk_combo_box_set_active (widgets->settingsThemeChooser,0);
on_settings_accept(window,widgetsD);
// main_config.curThemeName="Main";
// GtkWidget *loaderWindow=GTK_WIDGET(gtk_builder_get_object(widgets->builder,"LoaderWindow"));
// gtk_window_resize(GTK_WINDOW(loaderWindow),main_config.windowWidth,main_config.windowHeight);
// gtk_window_move(GTK_WINDOW(loaderWindow),main_config.windowPosX,main_config.windowPosY);
// gtk_widget_show(loaderWindow);
// gtk_window_present(GTK_WINDOW(widgets->SettingsWindow));
// gtk_widget_hide(widgets->window);
// if (yon_dictionary_find(&widgetsD,main_config.curThemeName)==NULL){
// widgetsD->next=yon_theme_new(yon_dictionary_create_empty(),widgets->builder,main_config.curThemeName,widgets->applist,widgets->appssize);
// widgetsD->next->prev=widgetsD;
// yon_switch_theme(&widgetsD,yon_dictionary_find(&widgetsD,main_config.curThemeName));
// widgets=(actionWidgets*)widgetsD->data;
// widgets->ICSys=yon_create_icon_section_list(main_config.sections);
// for (dictionary *cur=widgets->ICSys->first; cur!=NULL;cur=cur->next){
// load_apps((IVGraphicals*)cur->data,widgets->applist,widgets->appssize);
// }
// yon_show_icon_views(widgets->ICSys,widgets);
// }
// yon_switch_theme(&widgetsD,yon_dictionary_find(&widgetsD,main_config.curThemeName));
// if (widgets!=(actionWidgets*)widgetsD->data) widgets=(actionWidgets*)widgetsD->data;
// gtk_widget_show(widgets->window);
// gtk_widget_hide(loaderWindow);
}
}
void launch_app_with_arguments(char *name, char *args){
char *path=malloc(strlen(name)+strlen(args)+4);
memset(path,0,strlen(name)+strlen(args)+4);
@ -920,6 +958,9 @@ int setup_config(){
main_config.sections->next=NULL;
}
if (main_config.windowWidth<1024&&main_config.windowHeight<720){
main_config.WindowTheme=0;
}
};
@ -1293,7 +1334,6 @@ dictionary *yon_theme_new(dictionary *widgets, GtkBuilder *builder, char *theme_
curWidgets->GnomeInfoLabel=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,yon_char_get_augumented(theme_id,"InfoLabel")));
curWidgets->GnomeInfoDetailsLabel=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,yon_char_get_augumented(theme_id,"InfoDetailsLabel")));
curWidgets->SettingsSections=NULL;
gtk_style_context_add_class(gtk_widget_get_style_context(curWidgets->icvpack),"iconview");
if (curWidgets->GnomeInfoLabel!=NULL&&curWidgets->GnomeInfoDetailsLabel!=NULL){
@ -1312,36 +1352,39 @@ dictionary *yon_theme_new(dictionary *widgets, GtkBuilder *builder, char *theme_
}
char *line=NULL;
line="";
char *prevline=NULL;
char *prevline="";
char *pth;
char *preph="";
line="";
while (fgets(path, sizeof(path),fp)!=NULL){
preph=pth;
prevline=line;
line=strstr(path,": ");
if (line!=NULL){
int size=strlen(path)-strlen(line);
pth=yon_cut(path,size,0);
// pth=_(pth);;;;
pth=yon_char_get_augumented(preph,pth);
pth=yon_char_get_augumented(pth,"\n");
pth=yon_char_get_augumented("<span color='#1a5fb4'>",pth);
pth=yon_char_get_augumented(pth,"</span>");
line=yon_char_get_augumented(pth,line);
} else {
line=path;
pth="\n";
pth="<span size=\"15pt\">\n";
line=yon_char_get_augumented(pth,line);
}
line=yon_char_get_augumented(prevline,line);
prevline=yon_char_get_augumented(prevline,line);
};
prevline=line;
prevline=yon_char_get_augumented(prevline,"</span>");;
gtk_label_set_text(GTK_LABEL(curWidgets->GnomeInfoDetailsLabel),prevline);
gtk_label_set_text(GTK_LABEL(curWidgets->GnomeInfoLabel),pth);
// gtk_label_set_text(GTK_LABEL(curWidgets->GnomeInfoLabel),pth);
gtk_label_set_markup (GTK_LABEL(curWidgets->GnomeInfoDetailsLabel),prevline);;
// gtk_label_set_markup (GTK_LABEL(curWidgets->GnomeInfoLabel), pth);;
}
if (curWidgets->ButtonBackToMain!=NULL)
gtk_button_set_label(GTK_BUTTON(curWidgets->ButtonBackToMain),_("Back to settings"));
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), "configure-event", G_CALLBACK(on_resized), widgets);
if (curWidgets->ButtonBackToMain!=NULL)
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"));

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

@ -235,6 +235,20 @@
<column type="gchararray"/>
</columns>
</object>
<object class="GtkScrolledWindow">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="shadow-type">in</property>
<child>
<object class="GtkViewport">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<placeholder/>
</child>
</object>
</child>
</object>
<object class="GtkAdjustment" id="adjustment1">
<property name="lower">1</property>
<property name="upper">5</property>
@ -967,6 +981,7 @@
<object class="GtkFrame">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-left">3</property>
<property name="margin-right">3</property>
<property name="margin-start">3</property>
<property name="margin-end">3</property>
@ -983,14 +998,14 @@
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">center</property>
<property name="valign">center</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">end</property>
<property name="margin-start">100</property>
<property name="margin-end">50</property>
<property name="pixbuf">../../../../../../../usr/share/icons/ubmanager-cockpit.svg</property>
<property name="pixbuf">../../../../../Загрузки/Telegram Desktop/ublinux-dark-glow.png</property>
</object>
<packing>
<property name="expand">False</property>
@ -1004,17 +1019,12 @@
<property name="can-focus">False</property>
<child>
<object class="GtkLabel" id="GnomeInfoLabel">
<property name="name">desklabel</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="valign">center</property>
<property name="label" translatable="yes">label:</property>
<property name="justify">right</property>
<property name="xalign">1</property>
<property name="yalign">0</property>
<attributes>
<attribute name="weight" value="ultrabold"/>
<attribute name="foreground" value="#1a1a5f5fb4b4"/>
</attributes>
</object>
<packing>
<property name="expand">False</property>
@ -1024,13 +1034,13 @@
</child>
<child>
<object class="GtkLabel" id="GnomeInfoDetailsLabel">
<property name="name">desclabel</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="valign">center</property>
<property name="label" translatable="yes">label</property>
<property name="yalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
<attribute name="weight" value="medium"/>
</attributes>
</object>
<packing>

Write Preview
Loading…
Cancel
Save