/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2003-2004 Hiroyuki Yamamoto & the Sylpheed-Claws team
+ * Copyright (C) 2003-2007 Hiroyuki Yamamoto & the Claws Mail 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
*/
#ifdef HAVE_CONFIG_H
#include <sys/stat.h>
#include <glib.h>
+#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#include "intl.h"
#include "utils.h"
#include "codeconv.h"
#include "prefs_common.h"
static ThemesData *prefs_themes_data;
StockPixmap prefs_themes_icons[PREVIEW_ICONS] = {
- STOCK_PIXMAP_MAIL,
+ STOCK_PIXMAP_DIR_CLOSE,
+ STOCK_PIXMAP_MAIL_SEND,
STOCK_PIXMAP_MAIL_RECEIVE,
- STOCK_PIXMAP_DOWN_ARROW,
- STOCK_PIXMAP_MAIL_SEND_QUEUE,
+ STOCK_PIXMAP_MAIL_ATTACH,
STOCK_PIXMAP_BOOK,
- STOCK_PIXMAP_MIME_TEXT_HTML,
- STOCK_PIXMAP_PRIVACY_PASSED
+ STOCK_PIXMAP_MIME_TEXT_PLAIN,
+ STOCK_PIXMAP_REPLIED
};
static void prefs_themes_btn_use_clicked_cb (GtkWidget *widget, gpointer data);
static void prefs_themes_btn_remove_clicked_cb (GtkWidget *widget, gpointer data);
static void prefs_themes_btn_install_clicked_cb (GtkWidget *widget, gpointer data);
-static void prefs_themes_btn_more_clicked_cb (GtkWidget *widget, gpointer data);
static void prefs_themes_menu_item_activated_cb (GtkWidget *widget, gpointer data);
static void prefs_themes_update_buttons (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);
+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);
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 != unlink(filename)) {
+ else if (0 != g_unlink(filename)) {
(*status) = g_strdup(filename);
}
g_free(base);
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;
(*func)(fullentry, data);
g_free(fullentry);
- }
+ }
+ closedir(dp);
}
static gboolean prefs_themes_is_system_theme(const gchar *dirname)
return FALSE;
}
-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 */
+ 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);
+ }
+
+ store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_POINTER);
- menu = gtk_menu_new ();
+ /* 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);
-
- if (tdata->displayed != NULL && tdata->displayed == tpath)
+
+ gtk_list_store_append(store, &iter);
+ gtk_list_store_set(store, &iter,
+ 0, tname->name,
+ 1, tname->item->data, -1);
+
+ if (tdata->displayed != NULL && !strcmp2(tdata->displayed,tpath))
active = i;
+ ++i;
themes = g_list_next(themes);
- ++i;
}
-
- gtk_menu_set_active(GTK_MENU(menu), active);
- gtk_option_menu_set_menu (opmenu, menu);
+
+ g_list_free(sorted_list);
+
+ 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)
+{
+ /* 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)
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);
}
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;
page->page.create_widget = prefs_themes_create_widget;
page->page.destroy_widget = prefs_themes_destroy_widget;
page->page.save_page = prefs_themes_save;
- page->page.weight = 15.0;
+ page->page.weight = 130.0;
prefs_gtk_register_page((PrefsPage *) page);
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)
{
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);
+ prefs_themes_free_names(tdata);
g_free(tdata->page);
g_free(tdata);
}
theme_str = tdata->displayed;
- if (prefs_common.pixmap_theme_path != NULL)
- g_free(prefs_common.pixmap_theme_path);
+ g_free(prefs_common.pixmap_theme_path);
prefs_common.pixmap_theme_path = g_strdup(theme_str);
tmp = g_path_get_basename(theme_str);
if (IS_SYSTEM_THEME(theme_str)) {
- if (getuid() != 0) {
+ if (!superuser_p()) {
alertpanel_error(_("Only root can remove system themes"));
return;
}
val = alertpanel(alert_title,
_("Are you sure you want to remove this theme?"),
- _("No"), _("Yes"), _("Cancel"));
+ GTK_STOCK_NO, GTK_STOCK_YES, NULL);
g_free(alert_title);
+
if (G_ALERTALTERNATE == val) {
gchar *status = NULL;
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);
}
}
- g_free(theme_str);
}
static void prefs_themes_btn_install_clicked_cb(GtkWidget *widget, gpointer data)
if (filename == NULL)
return;
+ if (filename[strlen(filename) - 1] != G_DIR_SEPARATOR)
+ filename = g_strconcat(filename, G_DIR_SEPARATOR_S, NULL);
+ else
+ filename = g_strdup(filename);
+
cinfo = g_new0(CopyInfo, 1);
source = g_path_get_dirname(filename);
themename = g_path_get_basename(source);
if (file_exist(themeinfo, FALSE) == FALSE) {
val = alertpanel(alert_title,
_("This folder doesn't seem to be a theme folder.\nInstall anyway?"),
- _("Yes"), _("No"), _("Cancel"));
- if (G_ALERTDEFAULT != val)
+ GTK_STOCK_NO, GTK_STOCK_YES, NULL);
+ if (G_ALERTALTERNATE != val)
goto end_inst;
}
- if (getuid() == 0) {
+ if (superuser_p ()) {
val = alertpanel(alert_title,
_("Do you want to install theme for all users?"),
- _("Yes"), _("No"), _("Cancel"));
+ 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;
}
g_free(alert_title);
if (cinfo->dest == NULL) {
- cinfo->dest = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, RC_DIR,
+ cinfo->dest = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, get_rc_dir(),
G_DIR_SEPARATOR_S, PIXMAP_THEME_DIR, G_DIR_SEPARATOR_S,
themename, NULL);
}
(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);
}
else
alertpanel_error(_("File %s failed\nwhile installing theme."), cinfo->status);
end_inst:
- if (cinfo->dest != NULL) g_free(cinfo->dest);
+ g_free(cinfo->dest);
+ g_free(filename);
g_free(source);
g_free(themeinfo);
g_free(cinfo);
g_free(themename);
}
-static void prefs_themes_btn_more_clicked_cb(GtkWidget *widget, gpointer data)
-{
- open_uri(CLAWS_THEMES_URI, prefs_common.uri_cmd);
-}
-
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);
}
\
if (!g_utf8_validate(text, -1, NULL)) \
tmpstr = conv_codeset_strdup(text, \
- conv_get_current_charset_str(), CS_UTF_8); \
+ conv_get_locale_charset_str(), CS_UTF_8); \
else \
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)
gstats = g_strdup_printf(_("%d themes available (%d user, %d system, 1 internal)"),
all, usr, sys);
gtk_label_set_text(GTK_LABEL(theme->global), gstats);
+ gtk_label_set_justify (GTK_LABEL (theme->global), GTK_JUSTIFY_LEFT);
+ gtkut_widget_set_small_font_size (theme->global);
g_free(gstats);
}
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 Claws Mail Team"));
info->url = g_strdup(HOMEPAGE_URI);
info->status = g_strdup_printf(_("Internal theme has %d icons"), N_STOCK_PIXMAPS);
}
else {
sinfo = g_strconcat(path, G_DIR_SEPARATOR_S, THEMEINFO_FILE, NULL);
- finfo = fopen(sinfo, "r");
+ finfo = g_fopen(sinfo, "r");
if (finfo == NULL) {
info->name = g_strdup(_("No info file available for this theme"));
info->author = g_strdup(_("Unknown"));
info->status = prefs_themes_get_theme_stats(path);
if (info->status == NULL) {
- info->status = g_strdup(_("Error: can't get theme status"));
+ info->status = g_strdup(_("Error: couldn't get theme status"));
}
}
{
ThemesPage *prefs_themes = (ThemesPage *)page;
ThemesData *tdata = prefs_themes_data;
- gchar *buf;
- gint i;
- /* from gtk/about.c */
- GtkStyle *style;
- GdkColormap *cmap;
- GdkColor uri_color[2] = {{0, 0, 0, 0xffff}, {0, 0xffff, 0, 0}};
- gboolean success[2];
- /* BEGIN GLADE EDITED CODE */
GtkWidget *vbox1;
GtkWidget *frame1;
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, 0);
+ vbox1 = gtk_vbox_new (FALSE, VSPACING);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
gtk_widget_show (vbox1);
- frame1 = gtk_frame_new (_("Selector"));
- gtk_widget_show (frame1);
- gtk_box_pack_start (GTK_BOX (vbox1), frame1, TRUE, TRUE, 0);
-
- vbox2 = gtk_vbox_new (FALSE, 0);
- gtk_widget_show (vbox2);
- gtk_container_add (GTK_CONTAINER (frame1), vbox2);
+ vbox2 = gtkut_get_options_frame(vbox1, &frame1, _("Selector"));
- hbox3 = gtk_hbox_new (FALSE, 0);
+ hbox3 = gtk_hbox_new (FALSE, 5);
gtk_widget_show (hbox3);
- gtk_box_pack_start (GTK_BOX (vbox2), hbox3, TRUE, TRUE, 0);
+ 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);
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 = gtkut_get_link_btn((GtkWidget *)window, THEMES_URI, _("Get more..."));
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);
- gtk_label_get(GTK_LABEL(GTK_BIN(btn_more)->child), &buf);
- buf = g_strdup(buf);
- for (i = 0; buf[i] != '\0'; buf[i++] = '_');
- gtk_label_set_pattern(GTK_LABEL(GTK_BIN(btn_more)->child), buf);
- g_free(buf);
- cmap = gdk_window_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) {
- gtk_widget_ensure_style(GTK_BIN(btn_more)->child);
- style = gtk_style_copy
- (gtk_widget_get_style(GTK_BIN(btn_more)->child));
- style->fg[GTK_STATE_NORMAL] = uri_color[0];
- style->fg[GTK_STATE_ACTIVE] = uri_color[1];
- style->fg[GTK_STATE_PRELIGHT] = uri_color[0];
- gtk_widget_set_style(GTK_BIN(btn_more)->child, style);
- } else
- g_warning("prefs_themes_create_widget(): color allocation failed.\n");
-
label_global_status = gtk_label_new ("");
gtk_widget_show (label_global_status);
gtk_misc_set_alignment (GTK_MISC (label_global_status), 0, 0.5);
gtk_misc_set_padding (GTK_MISC (label_global_status), 6, 0);
- frame_info = gtk_frame_new (_("Information"));
- gtk_widget_show (frame_info);
- gtk_box_pack_start (GTK_BOX (vbox1), frame_info, TRUE, TRUE, 0);
+ PACK_FRAME(vbox1, frame_info, _("Information"));
table1 = gtk_table_new (4, 2, FALSE);
gtk_widget_show (table1);
(GtkAttachOptions) (0), 0, 0);
gtk_misc_set_alignment (GTK_MISC (label_status), 0, 0.5);
- frame_preview = gtk_frame_new (_("Preview"));
- gtk_widget_show (frame_preview);
- gtk_box_pack_start (GTK_BOX (vbox1), frame_preview, TRUE, TRUE, 0);
+ PACK_FRAME(vbox1, frame_preview, _("Preview"));
hbox1 = gtk_hbox_new (FALSE, 0);
gtk_widget_show (hbox1);
gtk_box_pack_start (GTK_BOX (hbox1), icon_7, TRUE, TRUE, 0);
gtk_misc_set_padding (GTK_MISC (icon_7), 0, 5);
- frame_buttons = gtk_frame_new (_("Actions"));
- gtk_widget_show (frame_buttons);
- gtk_box_pack_start (GTK_BOX (vbox1), frame_buttons, TRUE, TRUE, 0);
+ PACK_FRAME(vbox1, frame_buttons, _("Actions"));
hbuttonbox1 = gtk_hbutton_box_new ();
gtk_widget_show (hbuttonbox1);
gtk_container_add (GTK_CONTAINER (frame_buttons), hbuttonbox1);
gtk_container_set_border_width (GTK_CONTAINER (hbuttonbox1), 5);
gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox1), GTK_BUTTONBOX_START);
- gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbuttonbox1), 5);
- gtk_button_box_set_child_ipadding (GTK_BUTTON_BOX (hbuttonbox1), 5, 0);
+ gtk_box_set_spacing (GTK_BOX (hbuttonbox1), 5);
btn_use = gtk_button_new_with_label (_("Use this"));
gtk_widget_show (btn_use);
g_signal_connect(G_OBJECT(btn_install), "clicked",
G_CALLBACK(prefs_themes_btn_install_clicked_cb),
NULL);
- g_signal_connect(G_OBJECT(btn_more), "clicked",
- G_CALLBACK(prefs_themes_btn_more_clicked_cb),
- NULL);
-
- gtk_widget_grab_default (btn_use);
- /* END GLADE EDITED CODE */
prefs_themes->window = GTK_WIDGET(window);
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