diff options
| -rw-r--r-- | src/trg-main-window.c | 37 | ||||
| -rw-r--r-- | src/trg-menu-bar.c | 8 | ||||
| -rw-r--r-- | src/trg-menu-bar.h | 1 | ||||
| -rw-r--r-- | src/trg-preferences-dialog.c | 4 |
4 files changed, 42 insertions, 8 deletions
diff --git a/src/trg-main-window.c b/src/trg-main-window.c index 2aa4be0..b6b5542 100644 --- a/src/trg-main-window.c +++ b/src/trg-main-window.c @@ -207,6 +207,7 @@ struct _TrgMainWindowPrivate { gint width, height; gboolean min_on_start; + gboolean queuesEnabled; }; enum { @@ -681,10 +682,14 @@ static void view_notebook_toggled_cb(GtkCheckMenuItem * w, gpointer data) { } static void trg_main_window_toggle_graph_cb(GtkCheckMenuItem * w, gpointer win) { - if (gtk_check_menu_item_get_active(w)) - trg_main_window_add_graph(TRG_MAIN_WINDOW(win), TRUE); - else - trg_main_window_remove_graph(TRG_MAIN_WINDOW(win)); + TrgMainWindowPrivate *priv = TRG_MAIN_WINDOW_GET_PRIVATE(win); + if (gtk_check_menu_item_get_active(w)) { + if (priv->graphNotebookIndex < 0) + trg_main_window_add_graph(TRG_MAIN_WINDOW(win), TRUE); + } else { + if (priv->graphNotebookIndex >= 0) + trg_main_window_remove_graph(TRG_MAIN_WINDOW(win)); + } } void trg_main_window_notebook_set_visible(TrgMainWindow *win, gboolean visible) @@ -1627,7 +1632,25 @@ static gboolean trg_main_window_config_event(GtkWidget *widget, static void trg_client_session_updated_cb(TrgClient *tc, JsonObject *session, gpointer data) { - trg_status_bar_session_update(TRG_STATUS_BAR(data), session); + TrgMainWindowPrivate *priv = TRG_MAIN_WINDOW_GET_PRIVATE(data); + gboolean queuesEnabled; + + trg_status_bar_session_update(priv->statusBar, session); + + if (json_object_has_member(session, SGET_DOWNLOAD_QUEUE_ENABLED)) { + queuesEnabled = + json_object_get_boolean_member(session, SGET_DOWNLOAD_QUEUE_ENABLED) + || json_object_get_boolean_member(session, SGET_SEED_QUEUE_ENABLED); + } else { + queuesEnabled = FALSE; + } + + if (priv->queuesEnabled != queuesEnabled) + { + trg_menu_bar_set_supports_queues(priv->menuBar, queuesEnabled); + } + + priv->queuesEnabled = queuesEnabled; } static GObject *trg_main_window_constructor(GType type, @@ -1648,6 +1671,8 @@ static GObject *trg_main_window_constructor(GType type, construct_params)); priv = TRG_MAIN_WINDOW_GET_PRIVATE(self); + priv->queuesEnabled = TRUE; + prefs = trg_client_get_prefs(priv->client); theme = gtk_icon_theme_get_default(); @@ -1774,7 +1799,7 @@ static GObject *trg_main_window_constructor(GType type, priv->statusBar = trg_status_bar_new(); g_signal_connect(priv->client, "session-updated", - G_CALLBACK(trg_client_session_updated_cb), priv->statusBar); + G_CALLBACK(trg_client_session_updated_cb), self); gtk_box_pack_start(GTK_BOX(outerVbox), GTK_WIDGET(priv->statusBar), FALSE, FALSE, 2); diff --git a/src/trg-menu-bar.c b/src/trg-menu-bar.c index f8f3f1d..42d350c 100644 --- a/src/trg-menu-bar.c +++ b/src/trg-menu-bar.c @@ -89,6 +89,14 @@ struct _TrgMenuBarPrivate { TrgPrefs *prefs; }; +void trg_menu_bar_set_supports_queues(TrgMenuBar *mb, gboolean supportsQueues) +{ + TrgMenuBarPrivate *priv = TRG_MENU_BAR_GET_PRIVATE(mb); + + gtk_widget_set_visible(priv->mb_down_queue, supportsQueues); + gtk_widget_set_visible(priv->mb_up_queue, supportsQueues); +} + void trg_menu_bar_connected_change(TrgMenuBar * mb, gboolean connected) { TrgMenuBarPrivate *priv = TRG_MENU_BAR_GET_PRIVATE(mb); diff --git a/src/trg-menu-bar.h b/src/trg-menu-bar.h index 1f9fe29..6c1daac 100644 --- a/src/trg-menu-bar.h +++ b/src/trg-menu-bar.h @@ -56,5 +56,6 @@ G_END_DECLS void trg_menu_bar_torrent_actions_sensitive(TrgMenuBar * mb, gboolean sensitive); void trg_menu_bar_connected_change(TrgMenuBar * mb, gboolean connected); +void trg_menu_bar_set_supports_queues(TrgMenuBar *mb, gboolean supportsQueues); #endif /* TRG_MENU_BAR_H_ */ diff --git a/src/trg-preferences-dialog.c b/src/trg-preferences-dialog.c index 84cfb7c..612e0e8 100644 --- a/src/trg-preferences-dialog.c +++ b/src/trg-preferences-dialog.c @@ -644,8 +644,8 @@ static GObject *trg_preferences_dialog_constructor(GType type, gtk_window_set_transient_for(GTK_WINDOW(object), GTK_WINDOW(priv->win)); gtk_window_set_destroy_with_parent(GTK_WINDOW(object), TRUE); - gtk_dialog_add_button(GTK_DIALOG(object), GTK_STOCK_APPLY, - GTK_RESPONSE_APPLY); + gtk_dialog_add_button(GTK_DIALOG(object), GTK_STOCK_CLOSE, + GTK_RESPONSE_CLOSE); gtk_dialog_set_default_response(GTK_DIALOG(object), GTK_RESPONSE_CLOSE); |