summaryrefslogtreecommitdiff
path: root/src/trg-menu-bar.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/trg-menu-bar.c')
-rw-r--r--src/trg-menu-bar.c52
1 files changed, 48 insertions, 4 deletions
diff --git a/src/trg-menu-bar.c b/src/trg-menu-bar.c
index 4fcd06c..faf3548 100644
--- a/src/trg-menu-bar.c
+++ b/src/trg-menu-bar.c
@@ -17,12 +17,14 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#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-prefs.h"
#include "trg-torrent-graph.h"
@@ -51,6 +53,9 @@ enum {
PROP_LOCAL_PREFS_BUTTON,
PROP_ABOUT_BUTTON,
PROP_VIEW_STATS_BUTTON,
+#ifdef HAVE_RSS
+ PROP_VIEW_RSS_BUTTON,
+#endif
PROP_VIEW_STATES_BUTTON,
PROP_VIEW_NOTEBOOK_BUTTON,
PROP_QUIT,
@@ -60,6 +65,7 @@ enum {
PROP_ACCEL_GROUP,
PROP_DIR_FILTERS,
PROP_TRACKER_FILTERS,
+ PROP_DIRECTORIES_FIRST,
#if TRG_WITH_GRAPH
PROP_VIEW_SHOW_GRAPH,
#endif
@@ -98,10 +104,14 @@ struct _TrgMenuBarPrivate {
GtkWidget *mb_view_states;
GtkWidget *mb_view_notebook;
GtkWidget *mb_view_stats;
+#ifdef HAVE_RSS
+ GtkWidget *mb_view_rss;
+#endif
GtkWidget *mb_about;
GtkWidget *mb_quit;
GtkWidget *mb_directory_filters;
GtkWidget *mb_tracker_filters;
+ GtkWidget *mb_directory_first;
#if TRG_WITH_GRAPH
GtkWidget *mb_view_graph;
#endif
@@ -142,6 +152,9 @@ void trg_menu_bar_connected_change(TrgMenuBar * mb, gboolean connected)
gtk_widget_set_sensitive(priv->mb_disconnect, connected);
gtk_widget_set_sensitive(priv->mb_remote_prefs, connected);
gtk_widget_set_sensitive(priv->mb_view_stats, connected);
+#ifdef HAVE_RSS
+ gtk_widget_set_sensitive(priv->mb_view_rss, connected);
+#endif
gtk_widget_set_sensitive(priv->mb_resume_all, connected);
gtk_widget_set_sensitive(priv->mb_pause_all, connected);
}
@@ -275,6 +288,11 @@ trg_menu_bar_get_property(GObject * object, guint property_id,
case PROP_VIEW_STATS_BUTTON:
g_value_set_object(value, priv->mb_view_stats);
break;
+#ifdef HAVE_RSS
+ case PROP_VIEW_RSS_BUTTON:
+ g_value_set_object(value, priv->mb_view_rss);
+ break;
+#endif
case PROP_QUIT:
g_value_set_object(value, priv->mb_quit);
break;
@@ -284,6 +302,9 @@ trg_menu_bar_get_property(GObject * object, guint property_id,
case PROP_TRACKER_FILTERS:
g_value_set_object(value, priv->mb_tracker_filters);
break;
+ case PROP_DIRECTORIES_FIRST:
+ g_value_set_object(value, priv->mb_directory_first);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
break;
@@ -522,6 +543,14 @@ static GtkWidget *trg_menu_bar_view_menu_new(TrgMenuBar * mb)
gtk_menu_shell_append(GTK_MENU_SHELL(viewMenu),
priv->mb_tracker_filters);
+ priv->mb_directory_first =
+ trg_menu_bar_view_item_new(priv->prefs,
+ TRG_PREFS_KEY_DIRECTORIES_FIRST,
+ _("Directories first"),
+ priv->mb_view_states);
+ gtk_menu_shell_append(GTK_MENU_SHELL(viewMenu),
+ priv->mb_directory_first);
+
priv->mb_view_notebook =
trg_menu_bar_view_item_new(priv->prefs,
TRG_PREFS_KEY_SHOW_NOTEBOOK,
@@ -544,6 +573,14 @@ static GtkWidget *trg_menu_bar_view_menu_new(TrgMenuBar * mb)
gtk_widget_set_sensitive(priv->mb_view_stats, FALSE);
gtk_menu_shell_append(GTK_MENU_SHELL(viewMenu), priv->mb_view_stats);
+#ifdef HAVE_RSS
+ priv->mb_view_rss =
+ gtk_menu_item_new_with_mnemonic(_("_RSS"));
+ //trg_menu_bar_accel_add(mb, priv->mb_view_rss, GDK_F7, 0);
+ gtk_widget_set_sensitive(priv->mb_view_rss, FALSE);
+ gtk_menu_shell_append(GTK_MENU_SHELL(viewMenu), priv->mb_view_rss);
+#endif
+
return view;
}
@@ -580,7 +617,7 @@ trg_menu_bar_file_connect_item_new(TrgMainWindow * win,
{
GtkWidget *item = gtk_check_menu_item_new_with_label(text);
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), checked);
+ gtk_check_menu_item_set_active( GTK_CHECK_MENU_ITEM(item), checked);
g_object_set_data(G_OBJECT(item), "profile", profile);
gtk_check_menu_item_set_draw_as_radio(GTK_CHECK_MENU_ITEM(item), TRUE);
@@ -709,7 +746,7 @@ static GtkWidget *trg_menu_bar_torrent_menu_new(TrgMenuBar * menu)
priv->mb_delete =
trg_menu_bar_item_new(GTK_MENU_SHELL(torrentMenu),
- _("Remove and Delete"), GTK_STOCK_CLEAR,
+ _("Remove and delete data"), GTK_STOCK_DELETE,
FALSE);
trg_menu_bar_accel_add(menu, priv->mb_delete, GDK_Delete,
GDK_SHIFT_MASK);
@@ -872,6 +909,11 @@ static void trg_menu_bar_class_init(TrgMenuBarClass * klass)
trg_menu_bar_install_widget_prop(object_class, PROP_VIEW_STATS_BUTTON,
"view-stats-button",
"View stats button");
+#ifdef HAVE_RSS
+ trg_menu_bar_install_widget_prop(object_class, PROP_VIEW_RSS_BUTTON,
+ "view-rss-button",
+ "View rss button");
+#endif
trg_menu_bar_install_widget_prop(object_class, PROP_VIEW_STATES_BUTTON,
"view-states-button",
"View states Button");
@@ -892,6 +934,8 @@ 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");
+ trg_menu_bar_install_widget_prop(object_class, PROP_DIRECTORIES_FIRST,
+ TRG_PREFS_KEY_DIRECTORIES_FIRST, "Directories first");
#if TRG_WITH_GRAPH
trg_menu_bar_install_widget_prop(object_class, PROP_VIEW_SHOW_GRAPH,
"show-graph", "Show Graph");