Merge pull request 'Wiki link change' (#91) from YanTheKaller/ubl-settings-manager:master into master

Reviewed-on: #91

locale/ubl-settings-manager.pot

@@ -27,8 +27,7 @@ msgstr ""
 
 #: source/ubl-strings.h:4
 msgid ""
-"https://wiki.ublinux.ru/software/programs_and_utilities/all/ubl-settings-"
+"https://wiki.ublinux.com/en/software/programs_and_utilities/all/ubl-settings-manager"
-"manager"
 msgstr ""
 
 #: source/ubl-strings.h:6

locale/ubl-settings-manager_ru.po

@@ -27,11 +27,9 @@ msgstr "О приложении Диспетчер настроек"
 
 #: source/ubl-strings.h:4
 msgid ""
-"https://wiki.ublinux.ru/software/programs_and_utilities/all/ubl-settings-"
+"https://wiki.ublinux.com/en/software/programs_and_utilities/all/ubl-settings-manager"
-"manager"
 msgstr ""
-"https://wiki.ublinux.ru/software/programs_and_utilities/all/ubl-settings-"
+"https://wiki.ublinux.com/ru/software/programs_and_utilities/all/ubl-settings-manager"
-"manager"
 
 #: source/ubl-strings.h:6
 msgid "Settings manager for UBLinux"

source/ubl-settings-manager-settings.c

@@ -58,7 +58,7 @@ settings_window *yon_settings_window_new(){
 
     int size;
     config_str themes = (config_str)g_hash_table_get_keys_as_array(main_config.themes,(guint*)&size);
-    qsort(themes,size,sizeof(char*),yon_char_parsed_compare);
+    qsort(themes,size,sizeof(char*),(__compar_fn_t)yon_char_parsed_compare);
     for (int i=0;i<size;i++){
         gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(window->ThemeCombo),themes[i],themes[i]);
     }

source/ubl-settings-manager-theme-main.c

@@ -88,8 +88,7 @@ void yon_main_section_setup_apps(main_section *cur_section, const char *target){
         Image = gtk_image_new_from_pixbuf(gtk_icon_info_load_icon(info,NULL));
 
     }
-
+    char *name = cur_app->Name;
-    char *name = yon_char_wrap_to_length_str(cur_app->Name,20);
 
     GtkWidget *Row = gtk_flow_box_child_new();
     GtkWidget *Box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL,5);
@@ -97,23 +96,26 @@ void yon_main_section_setup_apps(main_section *cur_section, const char *target){
     GtkWidget *Icon = Image;
 
     gtk_box_pack_start(GTK_BOX(Box),Icon,0,0,0);
-    gtk_box_pack_start(GTK_BOX(Box),Label,0,0,0);
+    gtk_box_pack_start(GTK_BOX(Box),Label,1,1,0);
     gtk_container_add(GTK_CONTAINER(Row),Box);
     gtk_flow_box_insert(GTK_FLOW_BOX(cur_section->AppsList),Row,-1);
 
     gtk_widget_set_size_request(Row,50,50);
 
-    gtk_widget_set_halign(Box,GTK_ALIGN_START);
+    gtk_widget_set_halign(Box,GTK_ALIGN_FILL);
     gtk_widget_set_valign(Box,GTK_ALIGN_CENTER);
 
-    gtk_label_set_line_wrap_mode(GTK_LABEL(Label),PANGO_WRAP_WORD);
+    gtk_label_set_line_wrap_mode(GTK_LABEL(Label),PANGO_WRAP_WORD_CHAR);
     gtk_label_set_line_wrap(GTK_LABEL(Label),1);
-    gtk_label_set_xalign(GTK_LABEL(Label),0);
+    gtk_label_set_max_width_chars(GTK_LABEL(Label),15);
+    gtk_label_set_xalign(GTK_LABEL(Label), GTK_ALIGN_FILL);
 
     g_object_set_data(G_OBJECT(Row),"main_section",cur_section);
     g_object_set_data(G_OBJECT(Row),"apps",cur_app);
     g_object_set_data(G_OBJECT(Row),"Label",Label);
 
+    gtk_style_context_add_class(gtk_widget_get_style_context(Row),"bggrey");
+
     gtk_widget_show_all(Row);
 }
 

source/ubl-settings-manager.c

@@ -38,14 +38,6 @@ void yon_config_update(){
     main_config.themes = g_hash_table_new(g_str_hash,g_str_equal);
     yon_theme_init();
 }
-    
-int yon_char_parsed_compare(const void *a, const void *b){
-    const config_str str_a = (const config_str)a;
-    const config_str str_b = (const config_str)b;
-
-    return strcmp(*str_a,*str_b);
-}
-
 void on_back_clicked(GtkWidget *, GtkWidget *socket){
     gtk_widget_destroy(socket);
 }

source/ubl-settings-manager.h

@@ -228,7 +228,6 @@ char *yon_get_save_socket();
 char *yon_get_load_socket();
 GtkSocket *yon_sockets_init(GtkBox *socketBox);
 void on_plug_disconnected(GtkSocket *self, main_window *widgets);
-int yon_char_parsed_compare(const void *a, const void *b);
 
 void yon_interface_update(main_window *widgets);
 

source/ubl-strings.h

@@ -1,7 +1,7 @@
 #define TITLE_LABEL _("Settings manager for the system")
 #define TITLE_INFO_LABEL _("About Settings manager for the system")
 
-#define WIKI_LINK _("https://wiki.ublinux.ru/software/programs_and_utilities/all/ubl-settings-manager")
+#define WIKI_LINK _("https://wiki.ublinux.com/en/software/programs_and_utilities/all/ubl-settings-manager")
 
 #define ABOUT_PROJECT_COMMENTS_LABEL _("Settings manager for the system")
 #define BACK_TO_SETTINGS_LABEL _("Back to settings")

ubl-settings-manager-theme-main-section.glade

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.38.2 -->
+<!-- Generated with glade 3.40.0 -->
 <interface domain="ubl-settings-manager">
   <requires lib="gtk+" version="3.24"/>
   <!-- interface-css-provider-path ubl-settings-manager.css -->
@@ -15,6 +15,7 @@
     <property name="visible">True</property>
     <property name="can-focus">False</property>
     <property name="orientation">vertical</property>
+    <property name="spacing">5</property>
     <child>
       <object class="GtkLabel" id="MainLabel">
         <property name="visible">True</property>