2005-11-02 [wwp] 1.9.99cvs5

[claws.git] / src / prefs_themes.c

diff --git a/src/prefs_themes.c b/src/prefs_themes.c
index 0bd4d8bb401face757027e9566d32e19177f0399..24aeb92d6f6f59b8fa72cfa8e99443bb79c53b0e 100644 (file)
--- a/src/prefs_themes.c
+++ b/src/prefs_themes.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -139,6 +139,7 @@ static void prefs_themes_display_global_stats       (const ThemesData *tdata);
 static void prefs_themes_get_theme_info         (ThemesData *tdata);
 static void prefs_themes_display_theme_info     (ThemesData *tdata, const ThemeInfo *info);
 static void prefs_themes_get_themes_and_names  (ThemesData *tdata);
+static int prefs_themes_cmp_name(gconstpointer a, gconstpointer b);
 static void prefs_themes_free_names            (ThemesData *tdata);
 
 static void prefs_themes_set_themes_menu       (GtkOptionMenu *opmenu, const ThemesData *tdata);
@@ -185,8 +186,9 @@ static void prefs_themes_file_remove(const gchar *filename, gpointer data)
        
        base = g_path_get_basename(filename);
        if (TRUE == is_dir_exist(filename)) {
-               if (!((base[0] == '.') || (base[0] == '.' && base[1] == '.')))
-                       g_warning("prefs_themes_file_remove(): subdir in theme dir skipped.\n");
+               if (strcmp(base, ".") != 0 && strcmp(base, "..") != 0)
+                       g_warning("prefs_themes_file_remove(): subdir in theme dir skipped: '%s'.\n",
+                                               base);
        }
        else if (0 != g_unlink(filename)) {
                (*status) = g_strdup(filename);
@@ -204,8 +206,9 @@ static void prefs_themes_file_install(const gchar *filename, gpointer data)
        
        base = g_path_get_basename(filename);
        if (TRUE == is_dir_exist(filename)) {
-               if (!((base[0] == '.') || (base[0] == '.' && base[1] == '.')))
-                       g_warning("prefs_themes_file_install(): subdir in theme dir skipped.\n");
+               if (strcmp(base, ".") != 0 && strcmp(base, "..") !=0 )
+                       g_warning("prefs_themes_file_install(): subdir in theme dir skipped: '%s'.\n",
+                                               base);
        }
        else {
                gchar *fulldest;
@@ -265,16 +268,29 @@ static void prefs_themes_set_themes_menu(GtkOptionMenu *opmenu, const ThemesData
        GtkWidget *menu;
        GtkWidget *item;
        gint       i = 0, active = 0;
+       GList     *sorted_list = NULL;
 
        g_return_if_fail(opmenu != NULL);
-       
+
        gtk_option_menu_remove_menu(opmenu);
-       
+
+       /* sort theme data list by data name */
        menu = gtk_menu_new ();
+       while (themes != NULL) {
+               ThemeName *tname = (ThemeName *)(themes->data);
+
+               sorted_list = g_list_insert_sorted(sorted_list, (gpointer)(tname),
+                                                                               (GCompareFunc)prefs_themes_cmp_name);
+
+               themes = g_list_next(themes);
+       }
+
+       /* feed gtk_menu w/ sorted themes names */
+       themes = sorted_list;
        while (themes != NULL) {
                ThemeName *tname = (ThemeName *)(themes->data);
                gchar     *tpath = (gchar *)(tname->item->data);
-               
+
                item = gtk_menu_item_new_with_label(tname->name);
                gtk_widget_show(item);
                g_signal_connect(G_OBJECT(item), "activate",
@@ -284,15 +300,24 @@ static void prefs_themes_set_themes_menu(GtkOptionMenu *opmenu, const ThemesData
 
                if (tdata->displayed != NULL && tdata->displayed == tpath)
                        active = i;
+               ++i;
 
                themes = g_list_next(themes);
-               ++i;
        }
-       
+
+       g_list_free(sorted_list);
+
        gtk_menu_set_active(GTK_MENU(menu), active);
        gtk_option_menu_set_menu (opmenu, menu);
 }
 
+static int prefs_themes_cmp_name(gconstpointer a_p, gconstpointer b_p)
+{
+       /* compare two ThemeData structures by their name attribute */
+       return strcmp2((gchar *)(((ThemeName*)a_p)->name),
+                                       (gchar *)(((ThemeName*)b_p)->name));
+}
+
 static void prefs_themes_get_themes_and_names(ThemesData *tdata)
 {
        GList *tpaths;
@@ -318,6 +343,9 @@ static void prefs_themes_get_themes_and_names(ThemesData *tdata)
                name->item = tpaths;
                        
                tdata->names = g_list_append(tdata->names, name);
+               if (!strcmp2(tpaths->data, prefs_common.pixmap_theme_path)) {
+                       tdata->displayed = (gchar *)tpaths->data;
+               }
                tpaths = g_list_next(tpaths);
                g_free(sname);  
        }
@@ -353,7 +381,8 @@ void prefs_themes_init(void)
        tdata->page = page;
 
        tpaths = g_list_first(tdata->themes);
-       tdata->displayed = (gchar *)(tpaths->data);
+       if (tdata->displayed == NULL)
+               tdata->displayed = (gchar *)(tpaths->data);
 }
 
 static void prefs_themes_free_names(ThemesData *tdata)
@@ -552,7 +581,7 @@ end_inst:
 
 static void prefs_themes_btn_more_clicked_cb(GtkWidget *widget, gpointer data)
 {
-       open_uri(CLAWS_THEMES_URI, prefs_common.uri_cmd);
+       open_uri(THEMES_URI, prefs_common.uri_cmd);
 }
 
 static void prefs_themes_menu_item_activated_cb(GtkWidget *widget, gpointer data)
@@ -592,6 +621,7 @@ static void prefs_themes_update_buttons(const ThemesData *tdata)
                tmpstr = g_strdup(text);                                \
                                                                        \
        gtk_label_set_text(GTK_LABEL(label), tmpstr);                   \
+       gtk_label_set_selectable(GTK_LABEL(label), TRUE);               \
        g_free(tmpstr);                                                 \
 }
 static void prefs_themes_display_theme_info(ThemesData *tdata, const ThemeInfo *info)
@@ -680,7 +710,7 @@ static void prefs_themes_get_theme_info(ThemesData *tdata)
        
        if (IS_INTERNAL_THEME(path)) {
                info->name = g_strdup(_("Default internal theme"));
-               info->author = g_strdup(_("The Sylpheed Claws Team"));
+               info->author = g_strdup(_("The Sylpheed-Claws Team"));
                info->url = g_strdup(HOMEPAGE_URI);
                info->status = g_strdup_printf(_("Internal theme has %d icons"), N_STOCK_PIXMAPS);
        }
@@ -776,6 +806,7 @@ static void prefs_themes_create_widget(PrefsPage *page, GtkWindow *window, gpoin
        ThemesPage *prefs_themes = (ThemesPage *)page;
        ThemesData *tdata = prefs_themes_data;
        gchar *buf;
+       const gchar *tmp;
        gint   i;
        /* from gtk/about.c */
        GtkStyle *style;
@@ -851,8 +882,8 @@ static void prefs_themes_create_widget(PrefsPage *page, GtkWindow *window, gpoin
        GTK_WIDGET_SET_FLAGS (btn_more, GTK_CAN_DEFAULT);
        /* make it look like an uri */
        gtk_button_set_relief(GTK_BUTTON(btn_more), GTK_RELIEF_NONE);
-       gtk_label_get(GTK_LABEL(GTK_BIN(btn_more)->child), &buf);
-       buf = g_strdup(buf);
+       tmp = gtk_label_get_text(GTK_LABEL(GTK_BIN(btn_more)->child));
+       buf = g_strdup(tmp);
        for (i = 0; buf[i] != '\0'; buf[i++] = '_');
        gtk_label_set_pattern(GTK_LABEL(GTK_BIN(btn_more)->child), buf);
        g_free(buf);