Fixed fullscreen being activated when app wasn't closed at fullscreen; fixed crash while trying to load Manager with 3 or more categories

pull/9/head
parent b9a073e4d7
commit 6f4598984b

@ -948,7 +948,8 @@ int check_categories(apps app, char *catstocheck){
if (!found) return 0;
n_found++;
while (cat){
char *fcat=strstr(app.Categories,";");
left_cats=cat+1;
char *fcat=app.Categories;//strstr(app.Categories,";");
cat=strstr(cat+1,";");
if (!cat) break;
find_it=yon_cut(left_cats,(strlen(left_cats)-strlen(cat)),0);
@ -957,7 +958,7 @@ int check_categories(apps app, char *catstocheck){
if (!found) break;
n_found++;
left_cats=cat+1;
if (strlen(left_cats)==0 ||strcmp(left_cats,'\0')==0) break;
if (strlen(left_cats)==0 ||strcmp(left_cats,"")==0) break;
}
if (to_find==n_found) return 1; else return 0;
}
@ -998,6 +999,7 @@ int setup_config(){
main_config.GnomelabelSize=g_key_file_get_integer(configfile,"window","GnomeLabelSize",NULL);
main_config.labelDensity=g_key_file_get_integer(configfile,"window","LabelDensity",NULL);
main_config.lastUser=g_key_file_get_string(configfile,"window","User",NULL);
main_config.fullscreen=g_key_file_get_boolean(configfile,"window","fullscreen",NULL);
if (main_config.MainlabelSize==0) main_config.MainlabelSize=12;
if (main_config.labelDensity==0) main_config.labelDensity=0;
main_config.MainlabelSize=main_config.MainlabelSize*1000;
@ -1076,6 +1078,7 @@ void save_config(actionWidgets *widgets){
sprintf(fromint,"%d",main_config.windowHeight);
g_key_file_set_string(gfile,"window","WindowHeight",fromint);
}
g_key_file_set_boolean(gfile,"window","fullscreen",main_config.fullscreen);
sprintf(fromint,"%d",main_config.WindowTheme);
g_key_file_set_string(gfile,"window","WindowTheme",fromint);
sprintf(fromint,"%d",sz);
@ -1187,6 +1190,7 @@ IVGraphicals *yon_create_single_section_IV(char *name,char *cats){
gtk_icon_view_set_item_padding(GTK_ICON_VIEW(iv),3);
//gtk_widget_set_name(iv,"workingbg");
gtk_icon_view_set_item_orientation(GTK_ICON_VIEW(iv),GTK_ORIENTATION_HORIZONTAL);
gtk_icon_view_set_row_spacing(GTK_ICON_VIEW(iv),2);
}
gtk_icon_view_set_text_column(GTK_ICON_VIEW(iv),0);
GtkWidget *sep=gtk_separator_new(GTK_ORIENTATION_HORIZONTAL);
@ -1783,7 +1787,8 @@ 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,_("GNOME theme"));
widg=(actionWidgets*)widgets->data;
gtk_window_maximize(GTK_WINDOW(widg->window));
if (main_config.fullscreen==1)
gtk_window_maximize(GTK_WINDOW(widg->window));
gtk_widget_show(widg->window);
hide_if_unfound(widgets);
if (main_config.WindowTheme==1)

@ -4,6 +4,7 @@ background-color: #404040;
#GnomeIcon{
border-radius: 0px;
border-style:solid;
border-bottom-width: 1px;
border-image: linear-gradient(90deg, alpha(@theme_text_color,0.4) 55%, alpha(@theme_bg_color, 0) 100%);

@ -905,7 +905,8 @@
<object class="GtkImage" id="image2">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="stock">gtk-undelete</property>
<property name="pixel-size">16</property>
<property name="icon-name">software-remove-symbolic</property>
</object>
<object class="GtkImage" id="image3">
<property name="visible">True</property>
@ -956,6 +957,7 @@
<object class="GtkImage" id="image4">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="pixel-size">16</property>
<property name="icon-name">object-select-symbolic</property>
</object>
<object class="GtkWindow" id="SectionSettingsWindow">
@ -1469,10 +1471,8 @@
<property name="can-focus">True</property>
<property name="focus-on-click">False</property>
<property name="receives-default">False</property>
<property name="double-buffered">False</property>
<property name="halign">center</property>
<property name="valign">center</property>
<property name="margin-right">10</property>
<property name="margin-end">10</property>
<property name="image">image5</property>
</object>
@ -1587,7 +1587,7 @@
<property name="item-orientation">horizontal</property>
<property name="model">liststoreTemplate</property>
<property name="item-width">135</property>
<property name="row-spacing">2</property>
<property name="row-spacing">0</property>
<property name="column-spacing">2</property>
<property name="item-padding">5</property>
<property name="activate-on-single-click">True</property>
@ -2026,7 +2026,7 @@
<property name="can-focus">False</property>
<property name="valign">start</property>
<property name="margin-start">10</property>
<property name="margin-end">10</property>
<property name="margin-end">15</property>
<property name="margin-top">20</property>
<property name="margin-bottom">20</property>
<property name="label" translatable="yes">Looks like you don't have ubl-settings-info installed on your PC</property>

Loading…
Cancel
Save