/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2003-2009 Hiroyuki Yamamoto & the Claws Mail team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 2003-2015 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
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
*/
#ifdef HAVE_CONFIG_H
#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
+#ifdef HAVE_SVG
+#include <math.h>
+#endif
#include <glib.h>
#include <glib/gi18n.h>
#include "mainwindow.h"
#include "compose.h"
#include "alertpanel.h"
+#include "addr_compl.h"
#define IS_CURRENT_THEME(path) (strcmp(prefs_common.pixmap_theme_path, path) == 0)
#define IS_INTERNAL_THEME(path) (strcmp(DEFAULT_PIXMAP_THEME, path) == 0)
GtkWidget *author;
GtkWidget *url;
GtkWidget *status;
-
+
GtkWidget *icons[PREVIEW_ICONS];
-
- GtkWidget *btn_use;
+
GtkWidget *btn_remove;
GdkPixbuf *pixbufs[PREVIEW_ICONS];
- /* gchar *theme_path; */
+#ifdef HAVE_SVG
+ GtkWidget *checkbtn_enable_alpha;
+ GtkWidget *checkbtn_enable_scaling;
+ GtkWidget *checkbtn_scaling_auto;
+ GtkWidget *label_scaling_ppi;
+ GtkWidget *spinbtn_scaling_ppi;
+#endif
} ThemesPage;
typedef struct _ThemeInfo
gint bytes;
gint files;
gint pixms;
+ /* extensions info */
+ const char **supported;
+ gint *length;
} DirInfo;
typedef struct _CopyInfo {
-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_menu_item_activated_cb (GtkWidget *widget, gpointer data);
+#ifdef HAVE_SVG
+static gdouble prefs_themes_compute_ppi(GdkScreen *screen);
+static gdouble prefs_themes_get_adjusted_ppi(void);
+static void prefs_themes_checkbtn_enable_scaling_toggled_cb (GtkWidget *widget, gpointer data);
+static void prefs_themes_checkbtn_scaling_auto_toggled_cb (GtkWidget *widget, gpointer data);
+#endif
static void prefs_themes_update_buttons (const ThemesData *tdata);
static void prefs_themes_display_global_stats (const ThemesData *tdata);
static void prefs_themes_file_stats(const gchar *filename, gpointer data)
{
- struct stat s;
- DirInfo *di = (DirInfo *)data;
- gint len;
-
- 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) {
- const gchar *extension = filename+(len-4);
- if (!strcmp(extension, ".xpm"))
- di->pixms++;
- else if (!strcmp(extension, ".png"))
- di->pixms++;
+#ifdef G_OS_WIN32
+ GFile *f;
+ GFileInfo *fi;
+ GError *error = NULL;
+#else
+ GStatBuf s;
+#endif
+ goffset size;
+ DirInfo *di = (DirInfo *)data;
+ gint len;
+ gint i;
+
+#ifdef G_OS_WIN32
+ f = g_file_new_for_path(filename);
+ fi = g_file_query_info(f, "standard::size,standard::type",
+ G_FILE_QUERY_INFO_NONE, NULL, &error);
+ if (error != NULL) {
+ g_warning(error->message);
+ g_error_free(error);
+ g_object_unref(f);
+ return;
+ }
+ if (g_file_info_get_file_type(fi) != G_FILE_TYPE_REGULAR) {
+ g_object_unref(fi);
+ g_object_unref(f);
+ return;
+ }
+ size = g_file_info_get_size(fi);
+ g_object_unref(fi);
+ g_object_unref(f);
+#else
+ if ((i = g_stat(filename, &s)) != 0) {
+ debug_print("g_stat on '%s' failed: %d\n", filename, i);
+ return;
+ }
+ if (!S_ISREG(s.st_mode)) {
+ return;
+ }
+ size = s.st_size;
+#endif
+
+ di->bytes += size;
+ di->files++;
+ len = strlen(filename);
+ for (i = 0; (di->supported)[i] != NULL; ++i) {
+ gint curlen = (di->length)[i];
+ if (len <= curlen)
+ continue;
+ const gchar *extension = filename + (len - curlen);
+ if (!strcmp(extension, (di->supported)[i])) {
+ di->pixms++;
+ break;
}
}
}
{
gchar **status = (gchar **)data;
gchar *base;
-
+
if ((*status) != NULL)
return;
-
+
base = g_path_get_basename(filename);
if (TRUE == is_dir_exist(filename)) {
if (strcmp(base, ".") != 0 && strcmp(base, "..") != 0)
- g_warning("prefs_themes_file_remove(): subdir in theme dir skipped: '%s'.\n",
+ g_warning("prefs_themes_file_remove(): subdir in theme dir skipped: '%s'.",
base);
}
else if (0 != claws_unlink(filename)) {
{
CopyInfo *ci = (CopyInfo *)data;
gchar *base;
-
+
if (ci->status != NULL)
return;
-
+
base = g_path_get_basename(filename);
if (TRUE == is_dir_exist(filename)) {
if (strcmp(base, ".") != 0 && strcmp(base, "..") !=0 )
- g_warning("prefs_themes_file_install(): subdir in theme dir skipped: '%s'.\n",
+ g_warning("prefs_themes_file_install(): subdir in theme dir skipped: '%s'.",
base);
}
else {
gchar *fulldest;
-
+
fulldest = g_strconcat(ci->dest, G_DIR_SEPARATOR_S, base, NULL);
-
+
if (0 != copy_file(filename, fulldest, FALSE)) {
ci->status = g_strdup(filename);
}
static void prefs_themes_foreach_file(const gchar *dirname, const FileFunc func, gpointer data)
{
- struct dirent *d;
- DIR *dp;
+ const gchar *entry;
+ gchar *fullentry;
+ GDir *dp;
+ GError *error = NULL;
cm_return_if_fail(dirname != NULL);
cm_return_if_fail(func != NULL);
-
- if ((dp = opendir(dirname)) == NULL) {
- debug_print("directory %s not found\n", dirname);
+
+ if ((dp = g_dir_open(dirname, 0, &error)) == NULL) {
+ debug_print("couldn't open dir '%s': %s (%d)\n", dirname,
+ error->message, error->code);
+ g_error_free(error);
return;
}
- while ((d = readdir(dp)) != NULL) {
- gchar *entry;
- gchar *fullentry;
+ while ((entry = g_dir_read_name(dp)) != NULL) {
- entry = d->d_name;
fullentry = g_strconcat(dirname, G_DIR_SEPARATOR_S, entry, NULL);
(*func)(fullentry, data);
-
+
g_free(fullentry);
}
- closedir(dp);
+ g_dir_close(dp);
}
static gboolean prefs_themes_is_system_theme(const gchar *dirname)
len = strlen(system_theme_dir);
if (strlen(dirname) > len && 0 == strncmp(dirname, system_theme_dir, len))
is_sys = TRUE;
-
+
g_free(system_theme_dir);
return is_sys;
}
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) {
static void prefs_themes_get_themes_and_names(ThemesData *tdata)
{
GList *tpaths;
-
+
cm_return_if_fail(tdata != NULL);
-
- if (tdata->themes != NULL)
- stock_pixmap_themes_list_free(tdata->themes);
- if (tdata->names != NULL)
- prefs_themes_free_names(tdata);
-
+
+ stock_pixmap_themes_list_free(tdata->themes);
+ prefs_themes_free_names(tdata);
+
tdata->themes = stock_pixmap_themes_list_new();
-
+
tpaths = tdata->themes;
while (tpaths != NULL) {
ThemeName *name = g_new0(ThemeName, 1);
gchar *sname = g_path_get_basename((const gchar *)(tpaths->data));
-
+
if (IS_INTERNAL_THEME(sname))
name->name = g_strdup(_("Default internal theme"));
else
name->name = g_strdup(sname);
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;
path[2] = NULL;
debug_print("Creating preferences for themes...\n");
-
+
tdata = g_new0(ThemesData, 1);
prefs_themes_data = tdata;
prefs_themes_get_themes_and_names(tdata);
-
+
page = g_new0(ThemesPage, 1);
-
+
page->page.path = path;
page->page.create_widget = prefs_themes_create_widget;
page->page.destroy_widget = prefs_themes_destroy_widget;
tpaths = g_list_first(tdata->themes);
if (tdata->displayed == NULL)
tdata->displayed = (gchar *)(tpaths->data);
+#ifdef HAVE_SVG
+ if (prefs_common.pixmap_scaling_auto)
+ prefs_common.pixmap_scaling_ppi = prefs_themes_get_adjusted_ppi();
+#endif
}
static void prefs_themes_free_names(ThemesData *tdata)
{
GList *names;
-
+
+ cm_return_if_fail(tdata != NULL);
+
+ if (tdata->names == NULL)
+ return;
+
names = tdata->names;
while (names != NULL) {
ThemeName *tn = (ThemeName *)(names->data);
-
+
tn->item = NULL;
g_free(tn->name);
g_free(tn);
-
+
names = g_list_next(names);
}
- g_list_free(names);
+ g_list_free(tdata->names);
tdata->names = NULL;
}
ThemesData *tdata = prefs_themes_data;
debug_print("Finished preferences for themes.\n");
-
+
stock_pixmap_themes_list_free(tdata->themes);
prefs_themes_free_names(tdata);
g_free(tdata->page);
g_free(tdata);
}
-static void prefs_themes_btn_use_clicked_cb(GtkWidget *widget, gpointer data)
-{
- ThemesData *tdata = prefs_themes_data;
- gchar *theme_str;
-
- theme_str = tdata->displayed;
-
- g_free(prefs_common.pixmap_theme_path);
-
- prefs_common.pixmap_theme_path = g_strdup(theme_str);
-
- main_window_reflect_prefs_all_real(TRUE);
- compose_reflect_prefs_pixmap_theme();
-
- prefs_themes_update_buttons(tdata);
-}
-
static void prefs_themes_btn_remove_clicked_cb(GtkWidget *widget, gpointer data)
{
ThemesData *tdata = prefs_themes_data;
gchar *tmp = NULL;
theme_str = tdata->displayed;
-
+
tmp = g_path_get_basename(theme_str);
if (IS_SYSTEM_THEME(theme_str)) {
if (G_ALERTALTERNATE == val) {
gchar *status = NULL;
-
+
prefs_themes_foreach_file(theme_str, prefs_themes_file_remove, &status);
if (0 != rmdir(theme_str)) {
if (status != NULL) {
CopyInfo *cinfo;
AlertValue val = 0;
ThemesData *tdata = prefs_themes_data;
-
+
filename = filesel_select_file_open_folder(_("Select theme folder"), NULL);
if (filename == NULL)
return;
-
+
if (filename[strlen(filename) - 1] != G_DIR_SEPARATOR)
filename = g_strconcat(filename, G_DIR_SEPARATOR_S, NULL);
else
gchar *path;
GtkTreeModel *model;
GtkTreeIter iter;
-
+
cm_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);
+
+ 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);
}
+#ifdef HAVE_SVG
+#define MM_INCH 0.0393700787402
+static gdouble prefs_themes_compute_ppi(GdkScreen *screen)
+{
+ gdouble wp = gdk_screen_get_width(screen);
+ gdouble hp = gdk_screen_get_height(screen);
+ gdouble wi = gdk_screen_get_width_mm(screen);
+ gdouble hi = gdk_screen_get_height_mm(screen);
+ gdouble dp, di;
+
+ debug_print("screen is %f x %f pixels, %f x %f mm\n", wp, hp, wi, hi);
+
+ /* https://en.wikipedia.org/wiki/Pixel_density */
+ wi *= MM_INCH;
+ hi *= MM_INCH;
+ dp = sqrt(wp * wp + hp * hp);
+ di = sqrt(wi * wi + hi * hi);
+
+ return (di != 0.0)? dp / di: 0.0;
+}
+
+static gdouble prefs_themes_get_adjusted_ppi(void)
+{
+ gdouble ppi, cppi;
+ GdkScreen * screen = gdk_screen_get_default();
+
+ if (screen == NULL) { /* oops! */
+ g_warning("unable to get default GDK screen");
+ return MIN_PPI;
+ }
+
+ ppi = gdk_screen_get_resolution(screen);
+ cppi = prefs_themes_compute_ppi(screen);
+ debug_print("returned PPI: %f / computed PPI: %f\n", ppi, cppi);
+ /*
+ gdk_screen_get_resolution doesn't seem to work well when running
+ on a remote display and returns the value of the local display.
+ height/width functions do this better, so we can compute a PPI
+ from them and take the highest value.
+ */
+ return MAX(ppi, cppi);
+}
+
+static void prefs_themes_checkbtn_enable_scaling_toggled_cb (GtkWidget *widget, gpointer data)
+{
+ ThemesPage *page = (ThemesPage *) data;
+ gboolean enabled = gtk_toggle_button_get_active(
+ GTK_TOGGLE_BUTTON (widget));
+ gboolean automatic = gtk_toggle_button_get_active(
+ GTK_TOGGLE_BUTTON (page->checkbtn_scaling_auto));
+
+ gtk_widget_set_sensitive(page->checkbtn_scaling_auto, enabled);
+ gtk_widget_set_sensitive(page->spinbtn_scaling_ppi, enabled && !automatic);
+ gtk_widget_set_sensitive(page->label_scaling_ppi, enabled && !automatic);
+}
+
+static void prefs_themes_checkbtn_scaling_auto_toggled_cb(GtkWidget *widget, gpointer data)
+{
+ ThemesPage *page = (ThemesPage *) data;
+ gboolean automatic = gtk_toggle_button_get_active(
+ GTK_TOGGLE_BUTTON (widget));
+
+ gtk_widget_set_sensitive(page->spinbtn_scaling_ppi, !automatic);
+ gtk_widget_set_sensitive(page->label_scaling_ppi, !automatic);
+
+ if (automatic) /* update PPI value */
+ gtk_spin_button_set_value(
+ GTK_SPIN_BUTTON (page->spinbtn_scaling_ppi),
+ prefs_themes_get_adjusted_ppi());
+}
+#endif
+
static void prefs_themes_update_buttons(const ThemesData *tdata)
{
ThemesPage *theme = tdata->page;
can_use = !IS_CURRENT_THEME(tdata->displayed);
can_rem = can_use && !IS_INTERNAL_THEME(tdata->displayed);
-
- if (theme->btn_use != NULL)
- gtk_widget_set_sensitive(theme->btn_use, can_use);
+
if (theme->btn_remove != NULL)
gtk_widget_set_sensitive(theme->btn_remove, can_rem);
}
save_prefs_path = prefs_common.pixmap_theme_path;
prefs_common.pixmap_theme_path = tdata->displayed;
for (i = 0; i < PREVIEW_ICONS; ++i) {
- stock_pixbuf_gdk(theme->window, prefs_themes_icons[i],
- &(theme->pixbufs[i]));
+ stock_pixbuf_gdk(prefs_themes_icons[i], &(theme->pixbufs[i]));
gtk_image_set_from_pixbuf(GTK_IMAGE(theme->icons[i]),
theme->pixbufs[i]);
}
if (line[len - 1] == '\n') line[len - 1] = '\0'; \
} \
else { \
- strcpy(line, _("Unknown")); \
+ g_strlcpy(line, _("Unknown"),sizeof(line)); \
}
static void prefs_themes_get_theme_info(ThemesData *tdata)
cm_return_if_fail(path != NULL);
debug_print("Getting theme info for %s\n", path);
-
+
info = g_new0(ThemeInfo, 1);
-
+
if (IS_INTERNAL_THEME(path)) {
info->name = g_strdup(_("Default internal theme"));
info->author = g_strdup(_("The Claws Mail Team"));
g_free(info->author);
g_free(info->url);
g_free(info->status);
-
+
g_free(info);
}
{
gchar *stats;
DirInfo *dinfo;
+ gint i;
dinfo = g_new0(DirInfo, 1);
-
+ dinfo->supported = stock_pixmap_theme_extensions();
+ for (i = 0; (dinfo->supported)[i] != NULL; ++i);
+ dinfo->length = g_malloc(i * sizeof(gint));
+ for (i = 0; (dinfo->supported)[i] != NULL; ++i) {
+ (dinfo->length)[i] = strlen((dinfo->supported)[i]);
+ }
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((goffset)dinfo->bytes));
-
+ stats = g_strdup_printf(_("%d files (%d icons), size: %s"),
+ dinfo->files, dinfo->pixms,
+ to_human_readable((goffset)dinfo->bytes));
+ g_free(dinfo->length);
g_free(dinfo);
return stats;
}
GtkWidget *icon_7;
GtkWidget *frame_buttons;
GtkWidget *hbuttonbox1;
- GtkWidget *btn_use;
GtkWidget *btn_remove;
GtkCellRenderer *renderer;
+#ifdef HAVE_SVG
+ GtkWidget *frame_scaling;
+ GtkWidget *checkbtn_enable_alpha;
+ GtkWidget *checkbtn_enable_scaling;
+ GtkWidget *checkbtn_scaling_auto;
+ GtkWidget *label_scaling_ppi;
+ GtkWidget *spinbtn_scaling_ppi;
+ GtkAdjustment *spinbtn_scaling_ppi_adj;
+#endif
vbox1 = gtk_vbox_new (FALSE, VSPACING);
- gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox1), 5);
gtk_widget_show (vbox1);
vbox2 = gtkut_get_options_frame(vbox1, &frame1, _("Selector"));
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_container_set_border_width (GTK_CONTAINER (hbox3), 5);
menu_themes = gtk_combo_box_new();
gtk_widget_show (menu_themes);
gtk_box_pack_start (GTK_BOX (vbox2), label_global_status, FALSE, FALSE, 0);
gtk_label_set_justify (GTK_LABEL (label_global_status), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (label_global_status), 0, 0.5);
- gtk_misc_set_padding (GTK_MISC (label_global_status), 6, 0);
+ gtk_misc_set_padding (GTK_MISC (label_global_status), 1, 0);
PACK_FRAME(vbox1, frame_info, _("Information"));
table1 = gtk_table_new (4, 2, FALSE);
gtk_widget_show (table1);
gtk_container_add (GTK_CONTAINER (frame_info), table1);
+ gtk_container_set_border_width (GTK_CONTAINER (table1), 5);
- label1 = gtk_label_new (_("Name: "));
+ label1 = gtk_label_new (_("Name"));
gtk_widget_show (label1);
gtk_table_attach (GTK_TABLE (table1), label1, 0, 1, 0, 1,
(GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 8, 2);
+ (GtkAttachOptions) (0), 5, 4);
gtk_label_set_justify (GTK_LABEL (label1), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment (GTK_MISC (label1), 0, 0.5);
+ gtk_misc_set_alignment (GTK_MISC (label1), 1, 0.5);
- label2 = gtk_label_new (_("Author: "));
+ label2 = gtk_label_new (_("Author"));
gtk_widget_show (label2);
gtk_table_attach (GTK_TABLE (table1), label2, 0, 1, 1, 2,
(GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 8, 2);
+ (GtkAttachOptions) (0), 5, 4);
gtk_label_set_justify (GTK_LABEL (label2), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment (GTK_MISC (label2), 0, 0.5);
+ gtk_misc_set_alignment (GTK_MISC (label2), 1, 0.5);
- label3 = gtk_label_new (_("URL:"));
+ label3 = gtk_label_new (_("URL"));
gtk_widget_show (label3);
gtk_table_attach (GTK_TABLE (table1), label3, 0, 1, 2, 3,
(GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 8, 2);
- gtk_misc_set_alignment (GTK_MISC (label3), 0, 0.5);
+ (GtkAttachOptions) (0), 5, 4);
+ gtk_misc_set_alignment (GTK_MISC (label3), 1, 0.5);
label_name = gtk_label_new ("");
gtk_widget_show (label_name);
gtk_table_attach (GTK_TABLE (table1), label_name, 1, 2, 0, 1,
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
+ (GtkAttachOptions) (0), 5, 0);
gtk_misc_set_alignment (GTK_MISC (label_name), 0, 0.5);
label_author = gtk_label_new ("");
gtk_widget_show (label_author);
gtk_table_attach (GTK_TABLE (table1), label_author, 1, 2, 1, 2,
(GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
+ (GtkAttachOptions) (0), 5, 0);
gtk_misc_set_alignment (GTK_MISC (label_author), 0, 0.5);
label_url = gtk_label_new ("");
gtk_widget_show (label_url);
gtk_table_attach (GTK_TABLE (table1), label_url, 1, 2, 2, 3,
(GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
+ (GtkAttachOptions) (0), 5, 0);
gtk_misc_set_alignment (GTK_MISC (label_url), 0, 0.5);
- label4 = gtk_label_new (_("Status:"));
+ label4 = gtk_label_new (_("Status"));
gtk_widget_show (label4);
gtk_table_attach (GTK_TABLE (table1), label4, 0, 1, 3, 4,
(GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 8, 2);
- gtk_misc_set_alignment (GTK_MISC (label4), 0, 0.5);
+ (GtkAttachOptions) (0), 5, 4);
+ gtk_misc_set_alignment (GTK_MISC (label4), 1, 0.5);
label_status = gtk_label_new ("");
gtk_widget_show (label_status);
gtk_table_attach (GTK_TABLE (table1), label_status, 1, 2, 3, 4,
(GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
+ (GtkAttachOptions) (0), 5, 0);
gtk_misc_set_alignment (GTK_MISC (label_status), 0, 0.5);
PACK_FRAME(vbox1, frame_preview, _("Preview"));
hbox1 = gtk_hbox_new (FALSE, 0);
gtk_widget_show (hbox1);
gtk_container_add (GTK_CONTAINER (frame_preview), hbox1);
+ gtk_container_set_border_width (GTK_CONTAINER (hbox1), 5);
icon_1 = gtk_image_new();
gtk_widget_show (icon_1);
icon_6 = gtk_image_new();
gtk_widget_show (icon_6);
- gtk_box_pack_start (GTK_BOX (hbox1), icon_6, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox1), icon_6, TRUE, TRUE, 2);
gtk_misc_set_padding (GTK_MISC (icon_6), 0, 5);
icon_7 = gtk_image_new();
gtk_widget_show (icon_7);
- gtk_box_pack_start (GTK_BOX (hbox1), icon_7, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox1), icon_7, TRUE, TRUE, 2);
gtk_misc_set_padding (GTK_MISC (icon_7), 0, 5);
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_container_set_border_width (GTK_CONTAINER (hbuttonbox1), 8);
gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox1), GTK_BUTTONBOX_START);
gtk_box_set_spacing (GTK_BOX (hbuttonbox1), 5);
- btn_use = gtk_button_new_with_label (_("Use this"));
- gtk_widget_show (btn_use);
- gtk_container_add (GTK_CONTAINER (hbuttonbox1), btn_use);
- gtkut_widget_set_can_default (btn_use, TRUE);
-
btn_remove = gtk_button_new_with_label (_("Remove"));
gtk_widget_show (btn_remove);
gtk_container_add (GTK_CONTAINER (hbuttonbox1), btn_remove);
gtkut_widget_set_can_default (btn_remove, TRUE);
- g_signal_connect(G_OBJECT(btn_use), "clicked",
- G_CALLBACK(prefs_themes_btn_use_clicked_cb),
- NULL);
+#ifdef HAVE_SVG
+ PACK_FRAME(vbox1, frame_scaling, _("SVG rendering"));
+
+ vbox2 = gtk_vbox_new (FALSE, VSPACING);
+ gtk_widget_show (vbox2);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox2), 5);
+ gtk_container_add (GTK_CONTAINER (frame_scaling), vbox2);
+
+ PACK_CHECK_BUTTON(vbox2, checkbtn_enable_alpha, _("Enable alpha channel"));
+ PACK_CHECK_BUTTON(vbox2, checkbtn_enable_scaling, _("Force scaling"));
+ PACK_CHECK_BUTTON(vbox2, checkbtn_scaling_auto, _("Automatic"));
+
+ hbox3 = gtk_hbox_new (FALSE, 5);
+ gtk_widget_show (hbox3);
+
+ label_scaling_ppi = gtk_label_new (_("Pixels per inch (PPI)"));
+ gtk_widget_show (label_scaling_ppi);
+ gtk_box_pack_start (GTK_BOX (hbox3), label_scaling_ppi,
+ FALSE, FALSE, 5);
+
+ spinbtn_scaling_ppi_adj = GTK_ADJUSTMENT(
+ gtk_adjustment_new (MIN_PPI, MIN_PPI, MAX_PPI, 1, 10, 0));
+ spinbtn_scaling_ppi = gtk_spin_button_new(
+ spinbtn_scaling_ppi_adj, 1.0, 0);
+ gtk_widget_show (spinbtn_scaling_ppi);
+ gtk_box_pack_start (GTK_BOX (hbox3), spinbtn_scaling_ppi,
+ FALSE, FALSE, 5);
+
+ gtk_box_pack_start (GTK_BOX (vbox2), hbox3, FALSE, FALSE, 0);
+
+ /* initialize widget values */
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (checkbtn_enable_alpha),
+ prefs_common.enable_alpha_svg);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (checkbtn_enable_scaling),
+ prefs_common.enable_pixmap_scaling);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (checkbtn_scaling_auto),
+ prefs_common.pixmap_scaling_auto);
+ gtk_spin_button_set_value(GTK_SPIN_BUTTON (spinbtn_scaling_ppi),
+ prefs_common.pixmap_scaling_ppi);
+
+ /* sensitivity */
+ gtk_widget_set_sensitive(checkbtn_scaling_auto,
+ prefs_common.enable_pixmap_scaling);
+ gtk_widget_set_sensitive(spinbtn_scaling_ppi,
+ prefs_common.enable_pixmap_scaling
+ && !prefs_common.pixmap_scaling_auto);
+ gtk_widget_set_sensitive(label_scaling_ppi,
+ prefs_common.enable_pixmap_scaling
+ && !prefs_common.pixmap_scaling_auto);
+
+ /* signals */
+ g_signal_connect(G_OBJECT(checkbtn_enable_scaling), "toggled",
+ G_CALLBACK(prefs_themes_checkbtn_enable_scaling_toggled_cb),
+ prefs_themes);
+ g_signal_connect(G_OBJECT(checkbtn_scaling_auto), "toggled",
+ G_CALLBACK(prefs_themes_checkbtn_scaling_auto_toggled_cb),
+ prefs_themes);
+#endif
+
g_signal_connect(G_OBJECT(btn_remove), "clicked",
G_CALLBACK(prefs_themes_btn_remove_clicked_cb),
NULL);
NULL);
prefs_themes->window = GTK_WIDGET(window);
-
+
prefs_themes->name = label_name;
prefs_themes->author = label_author;
prefs_themes->url = label_url;
prefs_themes->icons[4] = icon_5;
prefs_themes->icons[5] = icon_6;
prefs_themes->icons[6] = icon_7;
-
- prefs_themes->btn_use = btn_use;
+
prefs_themes->btn_remove = btn_remove;
prefs_themes->btn_install = btn_install;
prefs_themes->btn_more = btn_more;
prefs_themes->op_menu = menu_themes;
+#ifdef HAVE_SVG
+ prefs_themes->checkbtn_enable_alpha = checkbtn_enable_alpha;
+ prefs_themes->checkbtn_enable_scaling = checkbtn_enable_scaling;
+ prefs_themes->checkbtn_scaling_auto = checkbtn_scaling_auto;
+ prefs_themes->label_scaling_ppi = label_scaling_ppi;
+ prefs_themes->spinbtn_scaling_ppi = spinbtn_scaling_ppi;
+#endif
+
prefs_themes->page.widget = vbox1;
prefs_themes_set_themes_menu(GTK_COMBO_BOX(menu_themes), tdata);
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);
}
static void prefs_themes_save(PrefsPage *page)
{
- /* ThemesPage *theme = (ThemesPage *)page; */
+ ThemesData *tdata = prefs_themes_data;
+ gchar *theme_str = tdata->displayed;
+#ifdef HAVE_SVG
+ ThemesPage *tpage = (ThemesPage *) page;
+ gboolean alpha = prefs_common.enable_alpha_svg;
+ gboolean scaling = prefs_common.enable_pixmap_scaling;
+ gboolean scaling_auto = prefs_common.pixmap_scaling_auto;
+ gint scaling_ppi = prefs_common.pixmap_scaling_ppi;
+
+ prefs_common.enable_alpha_svg = gtk_toggle_button_get_active(
+ GTK_TOGGLE_BUTTON (tpage->checkbtn_enable_alpha));
+ prefs_common.enable_pixmap_scaling = gtk_toggle_button_get_active(
+ GTK_TOGGLE_BUTTON (tpage->checkbtn_enable_scaling));
+ prefs_common.pixmap_scaling_auto = gtk_toggle_button_get_active(
+ GTK_TOGGLE_BUTTON (tpage->checkbtn_scaling_auto));
+ prefs_common.pixmap_scaling_ppi = gtk_spin_button_get_value_as_int (
+ GTK_SPIN_BUTTON (tpage->spinbtn_scaling_ppi));
+#endif
+
+ if (!IS_CURRENT_THEME(theme_str)) {
+ debug_print("Changing theme to %s\n", theme_str);
+ g_free(prefs_common.pixmap_theme_path);
+
+ prefs_common.pixmap_theme_path = g_strdup(theme_str);
+
+ main_window_reflect_prefs_all_real(TRUE);
+ compose_reflect_prefs_pixmap_theme();
+ addrcompl_reflect_prefs_pixmap_theme();
+
+ prefs_themes_update_buttons(tdata);
+ }
+#ifdef HAVE_SVG
+ else if (scaling != prefs_common.enable_pixmap_scaling
+ || alpha != prefs_common.enable_alpha_svg
+ || (scaling_auto != prefs_common.pixmap_scaling_auto
+ && scaling_ppi != prefs_common.pixmap_scaling_ppi)) {
+ /* same theme, different scaling options */
+ debug_print("Updating theme scaling\n");
+ stock_pixmap_invalidate_all_icons();
+ main_window_reflect_prefs_all_real(TRUE);
+ compose_reflect_prefs_pixmap_theme();
+ addrcompl_reflect_prefs_pixmap_theme();
+ }
+#endif
}