diff options
| author |  Alan Fitton <ajf@eth0.org.uk> | 2012-01-18 23:30:02 +0000 |
|---|---|---|
| committer | Alan Fitton <ajf@eth0.org.uk> | 2012-01-18 23:30:02 +0000 |
| commit | c427fa73c4f7853de992eda9de1c818c2ee525aa (patch) | |
| tree | c1203a6a808f242038cb063eba4843cf97f2c40f /src/trg-menu-bar.c | |
| parent | 2512c508cb6b8edeefed308a3dce61054d58bb06 (diff) | |
full and default gtk3 support, almost. the graph is disabled as the drawing api has changed quite a bit. yet another implementation to pass arguments, which made a cleanup of main.c necessary.
Diffstat (limited to 'src/trg-menu-bar.c')
| -rw-r--r-- | src/trg-menu-bar.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/trg-menu-bar.c b/src/trg-menu-bar.c index b5e049f..23ec34a 100644 --- a/src/trg-menu-bar.c +++ b/src/trg-menu-bar.c @@ -20,7 +20,11 @@ #include <glib/gi18n.h> #include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> +#if GTK_CHECK_VERSION( 3, 0, 0 ) +#include <gdk/gdkkeysyms-compat.h> +#endif +#include "trg-torrent-graph.h" #include "trg-main-window.h" #include "trg-menu-bar.h" @@ -52,7 +56,9 @@ enum { PROP_ACCEL_GROUP, PROP_DIR_FILTERS, PROP_TRACKER_FILTERS, +#if TRG_WITH_GRAPH PROP_VIEW_SHOW_GRAPH, +#endif PROP_MOVE_DOWN_QUEUE, PROP_MOVE_UP_QUEUE, PROP_MOVE_BOTTOM_QUEUE, @@ -91,7 +97,9 @@ struct _TrgMenuBarPrivate { GtkWidget *mb_quit; GtkWidget *mb_directory_filters; GtkWidget *mb_tracker_filters; +#if TRG_WITH_GRAPH GtkWidget *mb_view_graph; +#endif GtkWidget *mb_down_queue; GtkWidget *mb_up_queue; GtkWidget *mb_bottom_queue; @@ -241,9 +249,11 @@ trg_menu_bar_get_property(GObject * object, guint property_id, case PROP_ABOUT_BUTTON: g_value_set_object(value, priv->mb_about); break; +#if TRG_WITH_GRAPH case PROP_VIEW_SHOW_GRAPH: g_value_set_object(value, priv->mb_view_graph); break; +#endif case PROP_VIEW_STATES_BUTTON: g_value_set_object(value, priv->mb_view_states); break; @@ -412,11 +422,13 @@ static GtkWidget *trg_menu_bar_view_menu_new(TrgMenuBar * mb) gtk_menu_shell_append(GTK_MENU_SHELL(viewMenu), priv->mb_view_notebook); +#if TRG_WITH_GRAPH priv->mb_view_graph = trg_menu_bar_view_item_new(priv->prefs, TRG_PREFS_KEY_SHOW_GRAPH, _("Graph"), priv->mb_view_notebook); trg_menu_bar_accel_add(mb, priv->mb_view_graph, GDK_F6, 0); gtk_menu_shell_append(GTK_MENU_SHELL(viewMenu), priv->mb_view_graph); +#endif priv->mb_view_stats = gtk_menu_item_new_with_mnemonic(_("_Statistics")); @@ -774,8 +786,10 @@ static void trg_menu_bar_class_init(TrgMenuBarClass * klass) "dir-filters", "Dir Filters"); trg_menu_bar_install_widget_prop(object_class, PROP_TRACKER_FILTERS, "tracker-filters", "Tracker Filters"); +#if TRG_WITH_GRAPH trg_menu_bar_install_widget_prop(object_class, PROP_VIEW_SHOW_GRAPH, "show-graph", "Show Graph"); +#endif trg_menu_bar_install_widget_prop(object_class, PROP_MOVE_DOWN_QUEUE, "down-queue", "Down Queue"); trg_menu_bar_install_widget_prop(object_class, PROP_MOVE_UP_QUEUE, |