GtkWidget *btn_use;
GtkWidget *btn_remove;
- GdkPixmap *pixmaps[PREVIEW_ICONS];
- GdkBitmap *masks[PREVIEW_ICONS];
+ GdkPixbuf *pixbufs[PREVIEW_ICONS];
/* gchar *theme_path; */
} ThemesPage;
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);
+static void prefs_themes_set_themes_menu (GtkComboBox *combo, const ThemesData *tdata);
static gchar *prefs_themes_get_theme_stats (const gchar *dirname);
static gboolean prefs_themes_is_system_theme (const gchar *dirname);
DirInfo *di = (DirInfo *)data;
gint len;
- if (0 == stat(filename, &s) && 0 != S_ISREG(s.st_mode)) {
+ if (0 == g_stat(filename, &s) && 0 != S_ISREG(s.st_mode)) {
di->bytes += s.st_size;
di->files++;
len = strlen(filename);
if (len > 4) {
- if (filename[len - 1] == 'm' && filename[len - 2] == 'p' &&
- filename[len - 3] == 'x' && filename[len - 4] == '.')
+ const gchar *extension = filename+(len-4);
+ if (!strcmp(extension, ".xpm"))
+ di->pixms++;
+ else if (!strcmp(extension, ".png"))
di->pixms++;
}
}
g_warning("prefs_themes_file_remove(): subdir in theme dir skipped: '%s'.\n",
base);
}
- else if (0 != g_unlink(filename)) {
+ else if (0 != claws_unlink(filename)) {
(*status) = g_strdup(filename);
}
g_free(base);
g_return_if_fail(func != NULL);
if ((dp = opendir(dirname)) == NULL) {
- debug_print("directory %s not found", dirname);
+ debug_print("directory %s not found\n", dirname);
return;
}
static gboolean prefs_themes_is_system_theme(const gchar *dirname)
{
gint len;
-
+ gchar *system_theme_dir;
+ gboolean is_sys = FALSE;
+
g_return_val_if_fail(dirname != NULL, FALSE);
- len = strlen(PACKAGE_DATA_DIR);
- if (strlen(dirname) > len && 0 == strncmp(dirname, PACKAGE_DATA_DIR, len))
- return TRUE;
+ system_theme_dir = stock_pixmap_get_system_theme_dir_for_theme(NULL);
+ len = strlen(system_theme_dir);
+ if (strlen(dirname) > len && 0 == strncmp(dirname, system_theme_dir, len))
+ is_sys = TRUE;
- return FALSE;
+ g_free(system_theme_dir);
+
+ return is_sys;
}
-static void prefs_themes_set_themes_menu(GtkOptionMenu *opmenu, const ThemesData *tdata)
+static void prefs_themes_set_themes_menu(GtkComboBox *combo, const ThemesData *tdata)
{
+ GtkListStore *store;
+ GtkTreeIter iter;
GList *themes = tdata->names;
- 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);
+ g_return_if_fail(combo != NULL);
/* 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);
+ (GCompareFunc)prefs_themes_cmp_name);
themes = g_list_next(themes);
}
+ store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_POINTER);
+
/* 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",
- G_CALLBACK(prefs_themes_menu_item_activated_cb),
- tname->item->data);
- gtk_menu_append(GTK_MENU(menu), item);
+ gtk_list_store_append(store, &iter);
+ gtk_list_store_set(store, &iter,
+ 0, tname->name,
+ 1, tname->item->data, -1);
- if (tdata->displayed != NULL && tdata->displayed == tpath)
+ if (tdata->displayed != NULL && !strcmp2(tdata->displayed,tpath))
active = i;
++i;
g_list_free(sorted_list);
- gtk_menu_set_active(GTK_MENU(menu), active);
- gtk_option_menu_set_menu (opmenu, menu);
+ g_signal_connect(G_OBJECT(combo), "changed",
+ G_CALLBACK(prefs_themes_menu_item_activated_cb),
+ NULL);
+
+ gtk_combo_box_set_model(combo, GTK_TREE_MODEL(store));
+ gtk_combo_box_set_active(combo, active);
}
static int prefs_themes_cmp_name(gconstpointer a_p, gconstpointer b_p)
debug_print("Finished preferences for themes.\n");
stock_pixmap_themes_list_free(tdata->themes);
- prefs_themes_free_names(tdata);
+ prefs_themes_free_names(tdata);
g_free(tdata->page);
g_free(tdata);
}
theme_str = tdata->displayed;
- g_free(prefs_common.pixmap_theme_path);
+ g_free(prefs_common.pixmap_theme_path);
prefs_common.pixmap_theme_path = g_strdup(theme_str);
alertpanel_error(_("Removing theme directory failed."));
}
else {
- alertpanel_notice(_("Theme removed succesfully"));
+ alertpanel_notice(_("Theme removed successfully"));
/* update interface back to first theme */
prefs_themes_get_themes_and_names(tdata);
- prefs_themes_set_themes_menu(GTK_OPTION_MENU(tdata->page->op_menu), tdata);
+ prefs_themes_set_themes_menu(GTK_COMBO_BOX(tdata->page->op_menu), tdata);
prefs_themes_display_global_stats(tdata);
tdata->displayed = (gchar *)((g_list_first(tdata->themes))->data);
prefs_themes_get_theme_info(tdata);
GTK_STOCK_NO, GTK_STOCK_YES, NULL);
switch (val) {
case G_ALERTALTERNATE:
- cinfo->dest = g_strconcat(PACKAGE_DATA_DIR, G_DIR_SEPARATOR_S,
- PIXMAP_THEME_DIR, G_DIR_SEPARATOR_S,
- themename, NULL);
+ cinfo->dest = stock_pixmap_get_system_theme_dir_for_theme(
+ themename);
break;
case G_ALERTDEFAULT:
break;
}
g_free(alert_title);
if (cinfo->dest == NULL) {
- cinfo->dest = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, RC_DIR,
- G_DIR_SEPARATOR_S, PIXMAP_THEME_DIR, G_DIR_SEPARATOR_S,
+ cinfo->dest = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
+ PIXMAP_THEME_DIR, G_DIR_SEPARATOR_S,
themename, NULL);
}
if (TRUE == is_dir_exist(cinfo->dest)) {
- alertpanel_error(_("A theme with the same name is\nalready installed in this location"));
- goto end_inst;
+ AlertValue val = alertpanel_full(_("Theme exists"),
+ _("A theme with the same name is\nalready installed in this location.\n\n"
+ "Do you want to replace it?"),
+ GTK_STOCK_CANCEL, _("Overwrite"), NULL, FALSE,
+ NULL, ALERT_WARNING, G_ALERTDEFAULT);
+ if (val == G_ALERTALTERNATE) {
+ if (remove_dir_recursive(cinfo->dest) < 0) {
+ alertpanel_error(_("Couldn't delete the old theme in %s."), cinfo->dest);
+ goto end_inst;
+ }
+ } else {
+ goto end_inst;
+ }
}
if (0 != make_dir_hier(cinfo->dest)) {
- alertpanel_error(_("Couldn't create destination directory"));
+ alertpanel_error(_("Couldn't create destination directory %s."), cinfo->dest);
goto end_inst;
}
prefs_themes_foreach_file(source, prefs_themes_file_install, cinfo);
(gpointer)(cinfo->dest),
(GCompareFunc)strcmp2);
if (NULL != insted) {
- alertpanel_notice(_("Theme installed succesfully"));
+ alertpanel_notice(_("Theme installed successfully."));
tdata->displayed = (gchar *)(insted->data);
- prefs_themes_set_themes_menu(GTK_OPTION_MENU(tdata->page->op_menu), tdata);
+ prefs_themes_set_themes_menu(GTK_COMBO_BOX(tdata->page->op_menu), tdata);
prefs_themes_display_global_stats(tdata);
prefs_themes_get_theme_info(tdata);
}
static void prefs_themes_menu_item_activated_cb(GtkWidget *widget, gpointer data)
{
ThemesData *tdata = prefs_themes_data;
- gchar *path = (gchar *)data;
+ gchar *path;
+ GtkTreeModel *model;
+ GtkTreeIter iter;
- g_return_if_fail(path != NULL);
+ g_return_if_fail(gtk_combo_box_get_active_iter(GTK_COMBO_BOX(widget), &iter));
+ model = gtk_combo_box_get_model(GTK_COMBO_BOX(widget));
+ gtk_tree_model_get(model, &iter, 1, &path, -1);
+
tdata->displayed = path;
prefs_themes_get_theme_info(tdata);
}
save_prefs_path = prefs_common.pixmap_theme_path;
prefs_common.pixmap_theme_path = tdata->displayed;
for (i = 0; i < PREVIEW_ICONS; ++i) {
- stock_pixmap_gdk(theme->window, prefs_themes_icons[i],
- &(theme->pixmaps[i]), &(theme->masks[i]));
- gtk_image_set_from_pixmap(GTK_IMAGE(theme->icons[i]),
- theme->pixmaps[i], theme->masks[i]);
+ stock_pixbuf_gdk(theme->window, prefs_themes_icons[i],
+ &(theme->pixbufs[i]));
+ gtk_image_set_from_pixbuf(GTK_IMAGE(theme->icons[i]),
+ theme->pixbufs[i]);
}
prefs_common.pixmap_theme_path = save_prefs_path;
prefs_themes_foreach_file(dirname, prefs_themes_file_stats, dinfo);
stats = g_strdup_printf(_("%d files (%d icons), size: %s"),
- dinfo->files, dinfo->pixms, to_human_readable(dinfo->bytes));
+ dinfo->files, dinfo->pixms, to_human_readable((goffset)dinfo->bytes));
g_free(dinfo);
return stats;
GtkWidget *vbox2;
GtkWidget *hbox3;
GtkWidget *menu_themes;
- GtkWidget *menu_themes_menu;
- GtkWidget *glade_menuitem;
GtkWidget *btn_install;
GtkWidget *btn_more;
GtkWidget *label_global_status;
GtkWidget *hbuttonbox1;
GtkWidget *btn_use;
GtkWidget *btn_remove;
+ GtkCellRenderer *renderer;
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
gtk_box_pack_start (GTK_BOX (vbox2), hbox3, FALSE, FALSE, 0);
gtk_container_set_border_width (GTK_CONTAINER (hbox3), 5);
- menu_themes = gtk_option_menu_new ();
+ menu_themes = gtk_combo_box_new();
gtk_widget_show (menu_themes);
gtk_box_pack_start (GTK_BOX (hbox3), menu_themes, FALSE, FALSE, 0);
- menu_themes_menu = gtk_menu_new ();
- glade_menuitem = gtk_menu_item_new_with_label ("");
- gtk_widget_show (glade_menuitem);
- gtk_menu_append (GTK_MENU (menu_themes_menu), glade_menuitem);
- gtk_option_menu_set_menu (GTK_OPTION_MENU (menu_themes), menu_themes_menu);
btn_install = gtk_button_new_with_label (_("Install new..."));
gtk_widget_show (btn_install);
prefs_themes->op_menu = menu_themes;
prefs_themes->page.widget = vbox1;
-
- prefs_themes_set_themes_menu(GTK_OPTION_MENU(prefs_themes->op_menu), tdata);
+
+ prefs_themes_set_themes_menu(GTK_COMBO_BOX(menu_themes), tdata);
+ renderer = gtk_cell_renderer_text_new();
+ gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(menu_themes), renderer, TRUE);
+ gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(menu_themes), renderer,
+ "text", 0, NULL);
prefs_themes_get_theme_info(tdata);
prefs_themes_display_global_stats(tdata);
projects / claws.git / blobdiff