*
* 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.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#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_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_file_remove(const gchar *filename, gpointer data)
{
gchar **status = (gchar **)data;
- gchar *name;
+ gchar *base;
if ((*status) != NULL)
return;
- name = g_basename(filename);
+ base = g_path_get_basename(filename);
if (TRUE == is_dir_exist(filename)) {
- if (!((name[0] == '.') || (name[0] == '.' && name[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);
}
static void prefs_themes_file_install(const gchar *filename, gpointer data)
{
CopyInfo *ci = (CopyInfo *)data;
- gchar *name;
+ gchar *base;
if (ci->status != NULL)
return;
- name = g_basename(filename);
+ base = g_path_get_basename(filename);
if (TRUE == is_dir_exist(filename)) {
- if (!((name[0] == '.') || (name[0] == '.' && name[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;
- fulldest = g_strconcat(ci->dest, G_DIR_SEPARATOR_S, name, NULL);
+ fulldest = g_strconcat(ci->dest, G_DIR_SEPARATOR_S, base, NULL);
if (0 != copy_file(filename, fulldest, FALSE)) {
ci->status = g_strdup(filename);
}
g_free(fulldest);
}
+ g_free(base);
}
static void prefs_themes_foreach_file(const gchar *dirname, const FileFunc func, gpointer data)
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);
-
+
+ /* 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);
+
+ themes = g_list_next(themes);
+ }
+
+ /* 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",
if (tdata->displayed != NULL && tdata->displayed == tpath)
active = i;
+ ++i;
themes = g_list_next(themes);
- ++i;
}
-
+
+ g_list_free(sorted_list);
+
gtk_menu_set_active(GTK_MENU(menu), active);
gtk_option_menu_set_menu (opmenu, menu);
}
+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)
{
GList *tpaths;
tpaths = tdata->themes;
while (tpaths != NULL) {
ThemeName *name = g_new0(ThemeName, 1);
- gchar *sname = g_basename((gchar *)(tpaths->data));
+ gchar *sname = g_path_get_basename((const gchar *)(tpaths->data));
if (IS_INTERNAL_THEME(sname))
name->name = g_strdup(_("Default internal theme"));
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);
+ }
}
void prefs_themes_init(void)
{
- ThemesData *tdata;
- ThemesPage *page;
- GList *tpaths;
+ ThemesData *tdata;
+ ThemesPage *page;
+ GList *tpaths;
+ static gchar *path[3];
+
+ path[0] = _("Display");
+ path[1] = _("Themes");
+ path[2] = NULL;
debug_print("Creating prefereces for themes...\n");
page = g_new0(ThemesPage, 1);
- page->page.path = _("Display/Themes");
+ page->page.path = path;
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)
gchar *theme_str;
gchar *alert_title = NULL;
AlertValue val = 0;
+ gchar *tmp = NULL;
theme_str = tdata->displayed;
+ tmp = g_path_get_basename(theme_str);
+
if (IS_SYSTEM_THEME(theme_str)) {
if (getuid() != 0) {
alertpanel_error(_("Only root can remove system themes"));
return;
}
- alert_title = g_strdup_printf(_("Remove system theme '%s'"),
- g_basename(theme_str));
+ alert_title = g_strdup_printf(_("Remove system theme '%s'"), tmp);
}
if (NULL == alert_title) {
- alert_title = g_strdup_printf(_("Remove theme '%s'"),
- g_basename(theme_str));
+ alert_title = g_strdup_printf(_("Remove theme '%s'"), tmp);
}
+
+ g_free(tmp);
+
val = alertpanel(alert_title,
_("Are you sure you want to remove this theme?"),
- _("No"), _("Yes"), _("Cancel"));
+ GTK_STOCK_YES, GTK_STOCK_NO, NULL);
g_free(alert_title);
- if (G_ALERTALTERNATE == val) {
+
+ if (G_ALERTDEFAULT == val) {
gchar *status = NULL;
prefs_themes_foreach_file(theme_str, prefs_themes_file_remove, &status);
static void prefs_themes_btn_install_clicked_cb(GtkWidget *widget, gpointer data)
{
gchar *filename, *source;
- gchar *themeinfo, *themename;
+ gchar *themeinfo, *themename;
gchar *alert_title = NULL;
CopyInfo *cinfo;
AlertValue val = 0;
ThemesData *tdata = prefs_themes_data;
- filename = filesel_select_file_open(_("Select theme folder"), NULL);
+ 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
+ filename = g_strdup(filename);
+
cinfo = g_new0(CopyInfo, 1);
- source = g_dirname(filename);
- themename = g_basename(source);
+ source = g_path_get_dirname(filename);
+ themename = g_path_get_basename(source);
debug_print("Installing '%s' theme from %s\n", themename, filename);
themeinfo = g_strconcat(source, G_DIR_SEPARATOR_S, THEMEINFO_FILE, NULL);
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"));
+ GTK_STOCK_YES, GTK_STOCK_NO, NULL);
if (G_ALERTDEFAULT != val)
goto end_inst;
}
if (getuid() == 0) {
val = alertpanel(alert_title,
_("Do you want to install theme for all users?"),
- _("Yes"), _("No"), _("Cancel"));
+ GTK_STOCK_YES, GTK_STOCK_NO, NULL);
switch (val) {
case G_ALERTDEFAULT:
cinfo->dest = g_strconcat(PACKAGE_DATA_DIR, G_DIR_SEPARATOR_S,
alertpanel_error(_("File %s failed\nwhile installing theme."), cinfo->status);
end_inst:
if (cinfo->dest != NULL) 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);
+ open_uri(THEMES_URI, prefs_common.uri_cmd);
}
static void prefs_themes_menu_item_activated_cb(GtkWidget *widget, gpointer data)
\
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 Sylpheed-Claws 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"));
ThemesPage *prefs_themes = (ThemesPage *)page;
ThemesData *tdata = prefs_themes_data;
gchar *buf;
+ const gchar *tmp;
gint i;
/* from gtk/about.c */
GtkStyle *style;
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;
vbox1 = gtk_vbox_new (FALSE, 0);
gtk_widget_show (vbox1);
- frame1 = gtk_frame_new (_("Selector"));
- gtk_widget_show (frame1);
- gtk_box_pack_start (GTK_BOX (vbox1), frame1, TRUE, TRUE, 0);
+ PACK_FRAME (vbox1, frame1, _("Selector"));
vbox2 = gtk_vbox_new (FALSE, 0);
gtk_widget_show (vbox2);
hbox3 = gtk_hbox_new (FALSE, 0);
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 ();
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);
+ 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);
- cmap = gdk_window_get_colormap((mainwindow_get_mainwindow())->window->window);
+ 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) {
gtk_widget_ensure_style(GTK_BIN(btn_more)->child);
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);
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->name = label_name;
projects / claws.git / blobdiff