From a666f9ee1d3e3859712111d84d0cd5275179d696 Mon Sep 17 00:00:00 2001 From: Alan Fitton Date: Sat, 25 Aug 2012 17:24:02 +0100 Subject: make view style configurable --- src/trg-menu-bar.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'src/trg-menu-bar.c') diff --git a/src/trg-menu-bar.c b/src/trg-menu-bar.c index fd5756c..338389d 100644 --- a/src/trg-menu-bar.c +++ b/src/trg-menu-bar.c @@ -24,6 +24,7 @@ #include #endif +#include "trg-prefs.h" #include "trg-torrent-graph.h" #include "trg-main-window.h" #include "trg-menu-bar.h" @@ -67,6 +68,7 @@ enum { }; #define G_DATAKEY_CONF_KEY "conf-key" +#define G_DATAKEY_PREF_VALUE "pref-index" G_DEFINE_TYPE(TrgMenuBar, trg_menu_bar, GTK_TYPE_MENU_BAR) #define TRG_MENU_BAR_GET_PRIVATE(o) \ @@ -336,8 +338,7 @@ static void view_menu_radio_item_toggled_cb(GtkCheckMenuItem * w, gpointer data) (gchar *) g_object_get_data(G_OBJECT(w), G_DATAKEY_CONF_KEY); if (gtk_check_menu_item_get_active(w)) { - gint index = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(w), "pref-index")); - g_message("active index = %d", index); + gint index = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(w), G_DATAKEY_PREF_VALUE)); trg_prefs_set_int(p, key, index, TRG_PREFS_GLOBAL); } } @@ -345,7 +346,7 @@ static void view_menu_radio_item_toggled_cb(GtkCheckMenuItem * w, gpointer data) static void view_menu_item_toggled_cb(GtkCheckMenuItem * w, gpointer data) { TrgPrefs *p = TRG_PREFS(data); - gchar *key = + const gchar *key = (gchar *) g_object_get_data(G_OBJECT(w), G_DATAKEY_CONF_KEY); trg_prefs_set_bool(p, key, gtk_check_menu_item_get_active(w), TRG_PREFS_GLOBAL); @@ -363,7 +364,7 @@ static void trg_menu_bar_view_item_update(TrgPrefs * p, const gchar * updatedKey, gpointer data) { - gchar *key = + const gchar *key = (gchar *) g_object_get_data(G_OBJECT(data), G_DATAKEY_CONF_KEY); if (!g_strcmp0(updatedKey, key)) gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(data), @@ -377,7 +378,7 @@ trg_menu_bar_view_radio_item_update(TrgPrefs * p, const gchar * updatedKey, { const gchar *key = (gchar *) g_object_get_data(G_OBJECT(data), G_DATAKEY_CONF_KEY); - gint myIndex = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(data), "pref-index")); + gint myIndex = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(data), G_DATAKEY_PREF_VALUE)); if (!g_strcmp0(updatedKey, key)) { gboolean shouldBeActive = trg_prefs_get_int(p, key, TRG_PREFS_GLOBAL) == myIndex; @@ -395,7 +396,7 @@ static GtkWidget *trg_menu_bar_view_radio_item_new(TrgPrefs * prefs, GtkWidget *w = gtk_radio_menu_item_new_with_label(group, label); g_object_set_data_full(G_OBJECT(w), G_DATAKEY_CONF_KEY, g_strdup(key), g_free); - g_object_set_data(G_OBJECT(w), "pref-index", GINT_TO_POINTER(index)); + g_object_set_data(G_OBJECT(w), G_DATAKEY_PREF_VALUE, GINT_TO_POINTER(index)); gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(w), trg_prefs_get_int(prefs, key, @@ -448,16 +449,14 @@ static GtkWidget *trg_menu_bar_view_menu_new(TrgMenuBar * mb) gtk_menu_item_set_submenu(GTK_MENU_ITEM(view), viewMenu); - priv->mb_view_classic = trg_menu_bar_view_radio_item_new(priv->prefs, NULL, "style", 0, _("Classic")); - gtk_menu_shell_append(GTK_MENU_SHELL(viewMenu), priv->mb_view_classic); - group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (priv->mb_view_classic)); - priv->mb_view_transmission = trg_menu_bar_view_radio_item_new(priv->prefs, group, "style", 1, _("Transmission")); + priv->mb_view_transmission = trg_menu_bar_view_radio_item_new(priv->prefs, NULL, TRG_PREFS_KEY_STYLE, TRG_STYLE_TR, _("Transmission Style")); gtk_menu_shell_append(GTK_MENU_SHELL(viewMenu), priv->mb_view_transmission); group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (priv->mb_view_transmission)); - priv->mb_view_transmission_compact = trg_menu_bar_view_radio_item_new(priv->prefs, group, "style", 2, _("Transmission Compact")); + priv->mb_view_transmission_compact = trg_menu_bar_view_radio_item_new(priv->prefs, group, TRG_PREFS_KEY_STYLE, TRG_STYLE_TR_COMPACT, _("Transmission Compact Style")); gtk_menu_shell_append(GTK_MENU_SHELL(viewMenu), priv->mb_view_transmission_compact); - - priv->mb_view_classic = + group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (priv->mb_view_transmission_compact)); + priv->mb_view_classic = trg_menu_bar_view_radio_item_new(priv->prefs, group, TRG_PREFS_KEY_STYLE, TRG_STYLE_CLASSIC, _("Classic Style")); + gtk_menu_shell_append(GTK_MENU_SHELL(viewMenu), priv->mb_view_classic); priv->mb_view_states = trg_menu_bar_view_item_new(priv->prefs, -- cgit v1.2.3