2006-02-12 [wwp] 2.0.0cvs44

[claws.git] / src / prefs_themes.c

diff --git a/src/prefs_themes.c b/src/prefs_themes.c
index 963bad4db992c81f40d8110502ddc3fe1338443b..dd1f99ac593a645f204f92b5bfef156980aa6b95 100644 (file)
--- a/src/prefs_themes.c
+++ b/src/prefs_themes.c
@@ -1,6 +1,6 @@
 /*
  * 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
@@ -362,7 +362,7 @@ void prefs_themes_init(void)
        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;
@@ -407,7 +407,7 @@ void prefs_themes_done(void)
 {
        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); 
@@ -460,10 +460,10 @@ static void prefs_themes_btn_remove_clicked_cb(GtkWidget *widget, gpointer data)
 
        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); 
@@ -515,21 +515,21 @@ static void prefs_themes_btn_install_clicked_cb(GtkWidget *widget, gpointer data
        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;
@@ -805,9 +805,6 @@ static void prefs_themes_create_widget(PrefsPage *page, GtkWindow *window, gpoin
 {
        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;
@@ -859,7 +856,7 @@ static void prefs_themes_create_widget(PrefsPage *page, GtkWindow *window, gpoin
        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);
@@ -878,17 +875,14 @@ static void prefs_themes_create_widget(PrefsPage *page, GtkWindow *window, gpoin
        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) {