/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2003-2004 Hiroyuki Yamamoto & the Sylpheed-Claws team
+ * Copyright (C) 2003-2006 Hiroyuki Yamamoto & the Sylpheed-Claws team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
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);
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);
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;
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",
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;
path[1] = _("Themes");
path[2] = NULL;
- debug_print("Creating prefereces for themes...\n");
+ debug_print("Creating preferences for themes...\n");
tdata = g_new0(ThemesData, 1);
prefs_themes_data = tdata;
{
ThemesData *tdata = prefs_themes_data;
- debug_print("Finished prefereces for themes.\n");
+ debug_print("Finished preferences for themes.\n");
stock_pixmap_themes_list_free(tdata->themes);
prefs_themes_free_names(tdata);
val = alertpanel(alert_title,
_("Are you sure you want to remove this theme?"),
- GTK_STOCK_YES, GTK_STOCK_NO, NULL);
+ GTK_STOCK_NO, GTK_STOCK_YES, NULL);
g_free(alert_title);
- if (G_ALERTDEFAULT == val) {
+ if (G_ALERTALTERNATE == val) {
gchar *status = NULL;
prefs_themes_foreach_file(theme_str, prefs_themes_file_remove, &status);
if (file_exist(themeinfo, FALSE) == FALSE) {
val = alertpanel(alert_title,
_("This folder doesn't seem to be a theme folder.\nInstall anyway?"),
- GTK_STOCK_YES, GTK_STOCK_NO, NULL);
- if (G_ALERTDEFAULT != val)
+ GTK_STOCK_NO, GTK_STOCK_YES, NULL);
+ if (G_ALERTALTERNATE != val)
goto end_inst;
}
if (getuid() == 0) {
val = alertpanel(alert_title,
_("Do you want to install theme for all users?"),
- GTK_STOCK_YES, GTK_STOCK_NO, NULL);
+ GTK_STOCK_NO, GTK_STOCK_YES, NULL);
switch (val) {
- case G_ALERTDEFAULT:
+ case G_ALERTALTERNATE:
cinfo->dest = g_strconcat(PACKAGE_DATA_DIR, G_DIR_SEPARATOR_S,
PIXMAP_THEME_DIR, G_DIR_SEPARATOR_S,
themename, NULL);
break;
- case G_ALERTALTERNATE:
+ case G_ALERTDEFAULT:
break;
default:
goto end_inst;
{
ThemesPage *prefs_themes = (ThemesPage *)page;
ThemesData *tdata = prefs_themes_data;
- gchar *buf;
- const gchar *tmp;
- gint i;
/* from gtk/about.c */
GtkStyle *style;
GdkColormap *cmap;
GtkWidget *btn_use;
GtkWidget *btn_remove;
- vbox1 = gtk_vbox_new (FALSE, 0);
+ vbox1 = gtk_vbox_new (FALSE, VSPACING);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
gtk_widget_show (vbox1);
PACK_FRAME (vbox1, frame1, _("Selector"));
- vbox2 = gtk_vbox_new (FALSE, 0);
+ vbox2 = gtk_vbox_new (FALSE, VSPACING);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox2), VBOX_BORDER);
gtk_widget_show (vbox2);
gtk_container_add (GTK_CONTAINER (frame1), vbox2);
- hbox3 = gtk_hbox_new (FALSE, 0);
+ hbox3 = gtk_hbox_new (FALSE, 5);
gtk_widget_show (hbox3);
gtk_box_pack_start (GTK_BOX (vbox2), hbox3, FALSE, FALSE, 0);
gtk_container_set_border_width (GTK_CONTAINER (hbox3), 5);
gtk_box_pack_start (GTK_BOX (hbox3), btn_install, FALSE, FALSE, 0);
GTK_WIDGET_SET_FLAGS (btn_install, GTK_CAN_DEFAULT);
- btn_more = gtk_button_new_with_label (_("Get more..."));
+ btn_more = gtk_button_new_with_label (_("<u>Get more...</u>"));
gtk_widget_show (btn_more);
gtk_box_pack_start (GTK_BOX (hbox3), btn_more, FALSE, FALSE, 0);
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);
- 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);
+ gtk_label_set_use_markup(GTK_LABEL(GTK_BIN(btn_more)->child), TRUE);
+
cmap = gdk_drawable_get_colormap((mainwindow_get_mainwindow())->window->window);
gdk_colormap_alloc_colors(cmap, uri_color, 2, FALSE, TRUE, success);
if (success[0] == TRUE && success[1] == TRUE) {