#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
+#ifdef HAVE_SVG
+#include <math.h>
+#endif
#include <glib.h>
#include <glib/gi18n.h>
GtkWidget *btn_remove;
GdkPixbuf *pixbufs[PREVIEW_ICONS];
+
+#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
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)
{
+#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;
- if (0 == g_stat(filename, &s) && 0 != S_ISREG(s.st_mode)) {
- di->bytes += s.st_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;
- }
+#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;
}
}
}
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 = 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);
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;
GtkWidget *hbuttonbox1;
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);
gtk_container_add (GTK_CONTAINER (hbuttonbox1), btn_remove);
gtkut_widget_set_can_default (btn_remove, TRUE);
+#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);
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);
{
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);
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
}
projects / claws.git / blobdiff