trying to make the local/remote preferences organised and looking better. moving, splitting, adding/renaming headers and tab names.

2 files changed, 71 insertions, 53 deletions

diff --git a/src/trg-preferences-dialog.c b/src/trg-preferences-dialog.c
index 50ceaaa..53a55ea 100644
--- a/src/trg-preferences-dialog.c
+++ b/src/trg-preferences-dialog.c
@@ -371,7 +371,7 @@ static void notebook_toggled_cb(GtkToggleButton * b, gpointer data)
                                          gtk_toggle_button_get_active(b));
 }
 
-static GtkWidget *trg_prefs_desktopPage(TrgPreferencesDialog * dlg)
+static GtkWidget *trg_prefs_generalPage(TrgPreferencesDialog * dlg)
 {
     TrgPreferencesDialogPrivate *priv =
         TRG_PREFERENCES_DIALOG_GET_PRIVATE(dlg);
@@ -381,7 +381,7 @@ static GtkWidget *trg_prefs_desktopPage(TrgPreferencesDialog * dlg)
 
     t = hig_workarea_create();
 
-    hig_workarea_add_section_title(t, &row, _("Features"));
+    hig_workarea_add_section_title(t, &row, _("View"));
 
     dep = w = trgp_check_new(dlg, _("State selector"),
                              TRG_PREFS_KEY_SHOW_STATE_SELECTOR,
@@ -419,16 +419,7 @@ static GtkWidget *trg_prefs_desktopPage(TrgPreferencesDialog * dlg)
     hig_workarea_add_wide_control(t, &row, w);
 #endif
 
-#ifdef HAVE_LIBNOTIFY
-    w = trgp_check_new(dlg, _("Torrent added notifications"),
-                       TRG_PREFS_KEY_ADD_NOTIFY, TRG_PREFS_GLOBAL, NULL);
-    hig_workarea_add_wide_control(t, &row, w);
-
-    w = trgp_check_new(dlg, _("Torrent complete notifications"),
-                       TRG_PREFS_KEY_COMPLETE_NOTIFY, TRG_PREFS_GLOBAL,
-                       NULL);
-    hig_workarea_add_wide_control(t, &row, w);
-#endif
+    hig_workarea_add_section_title(t, &row, _("System Tray"));
 
     tray = trgp_check_new(dlg, _("Show in system tray"),
                           TRG_PREFS_KEY_SYSTEM_TRAY, TRG_PREFS_GLOBAL,
@@ -449,15 +440,18 @@ static GtkWidget *trg_prefs_desktopPage(TrgPreferencesDialog * dlg)
     hig_workarea_add_wide_control(t, &row, w);
 #endif
 
-    return t;
-}
+#ifdef HAVE_LIBNOTIFY
+    hig_workarea_add_section_title(t, &row, _("Notifications"));
 
-static GtkWidget *trg_prefs_behaviorPage(TrgPreferencesDialog * dlg)
-{
-    GtkWidget *w, *t;
-    gint row = 0;
+    w = trgp_check_new(dlg, _("Torrent added notifications"),
+                       TRG_PREFS_KEY_ADD_NOTIFY, TRG_PREFS_GLOBAL, NULL);
+    hig_workarea_add_wide_control(t, &row, w);
 
-    t = hig_workarea_create();
+    w = trgp_check_new(dlg, _("Torrent complete notifications"),
+                       TRG_PREFS_KEY_COMPLETE_NOTIFY, TRG_PREFS_GLOBAL,
+                       NULL);
+    hig_workarea_add_wide_control(t, &row, w);
+#endif
 
     hig_workarea_add_section_title(t, &row, _("Torrents"));
 
@@ -475,6 +469,7 @@ static GtkWidget *trg_prefs_behaviorPage(TrgPreferencesDialog * dlg)
                        TRG_PREFS_GLOBAL, NULL);
     hig_workarea_add_wide_control(t, &row, w);
 
+
     return t;
 }
 
@@ -716,8 +711,6 @@ static GtkWidget *trg_prefs_serverPage(TrgPreferencesDialog * dlg)
 
     /* Profile */
 
-    hig_workarea_add_section_title(t, &row, _("Profile"));
-
     priv->profileNameEntry =
         trgp_entry_new(dlg, TRG_PREFS_KEY_PROFILE_NAME, TRG_PREFS_PROFILE);
 
@@ -725,7 +718,7 @@ static GtkWidget *trg_prefs_serverPage(TrgPreferencesDialog * dlg)
     profileLabel = gtk_label_new(_("Profile: "));
 
     profileButtonsHbox = gtk_hbox_new(FALSE, 0);
-    w = gtk_button_new_from_stock(GTK_STOCK_ADD);
+    w = gtk_button_new_from_stock(GTK_STOCK_NEW);
     g_signal_connect(w, "clicked", G_CALLBACK(add_profile_cb),
                      priv->profileComboBox);
     gtk_box_pack_start(GTK_BOX(profileButtonsHbox), w, FALSE, FALSE, 4);
@@ -756,7 +749,7 @@ static GtkWidget *trg_prefs_serverPage(TrgPreferencesDialog * dlg)
 
     row++;
 
-    hig_workarea_add_section_title(t, &row, _("Server"));
+    hig_workarea_add_section_title(t, &row, _("Connection"));
 
     w = trgp_entry_new(dlg, TRG_PREFS_KEY_HOSTNAME, TRG_PREFS_PROFILE);
     hig_workarea_add_row(t, &row, _("Host:"), w, NULL);
@@ -772,15 +765,6 @@ static GtkWidget *trg_prefs_serverPage(TrgPreferencesDialog * dlg)
     gtk_entry_set_visibility(GTK_ENTRY(w), FALSE);
     hig_workarea_add_row(t, &row, _("Password:"), w, NULL);
 
-    w = trgp_spin_new(dlg, TRG_PREFS_KEY_UPDATE_INTERVAL, 1, INT_MAX, 1,
-                      TRG_PREFS_PROFILE, NULL);
-    hig_workarea_add_row(t, &row, _("Update interval:"), w, NULL);
-
-    w = trgp_spin_new(dlg, TRG_PREFS_KEY_MINUPDATE_INTERVAL, 1, INT_MAX, 1,
-                      TRG_PREFS_PROFILE, NULL);
-    hig_workarea_add_row(t, &row, _("Minimised update interval:"), w,
-                         NULL);
-
     w = trgp_check_new(dlg, _("Automatically connect"),
                        TRG_PREFS_KEY_AUTO_CONNECT, TRG_PREFS_PROFILE,
                        NULL);
@@ -792,6 +776,8 @@ static GtkWidget *trg_prefs_serverPage(TrgPreferencesDialog * dlg)
     hig_workarea_add_wide_control(t, &row, w);
 #endif
 
+    hig_workarea_add_section_title(t, &row, _("Updates"));
+
     activeOnly = w = trgp_check_new(dlg, _("Update active torrents only"),
                                     TRG_PREFS_KEY_UPDATE_ACTIVE_ONLY,
                                     TRG_PREFS_PROFILE, NULL);
@@ -811,6 +797,15 @@ static GtkWidget *trg_prefs_serverPage(TrgPreferencesDialog * dlg)
 
     hig_workarea_add_row_w(t, &row, priv->fullUpdateCheck, w, NULL);
 
+    w = trgp_spin_new(dlg, TRG_PREFS_KEY_UPDATE_INTERVAL, 1, INT_MAX, 1,
+                      TRG_PREFS_PROFILE, NULL);
+    hig_workarea_add_row(t, &row, _("Update interval:"), w, NULL);
+
+    w = trgp_spin_new(dlg, TRG_PREFS_KEY_MINUPDATE_INTERVAL, 1, INT_MAX, 1,
+                      TRG_PREFS_PROFILE, NULL);
+    hig_workarea_add_row(t, &row, _("Minimised update interval:"), w,
+                         NULL);
+
     hig_workarea_add_section_divider(t, &row);
 
     frame = gtk_frame_new(NULL);
@@ -866,6 +861,11 @@ static GObject *trg_preferences_dialog_constructor(GType type,
                              gtk_label_new(_("Connection")));
 
     gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
+                             trg_prefs_generalPage(TRG_PREFERENCES_DIALOG
+                                                   (object)),
+                             gtk_label_new(_("General")));
+
+    gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
                              trg_prefs_openExecPage(TRG_PREFERENCES_DIALOG
                                                     (object)),
                              gtk_label_new(_("Actions")));
@@ -875,16 +875,6 @@ static GObject *trg_preferences_dialog_constructor(GType type,
                                                 (object)),
                              gtk_label_new(_("Directories")));
 
-    gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
-                             trg_prefs_desktopPage(TRG_PREFERENCES_DIALOG
-                                                   (object)),
-                             gtk_label_new(_("Desktop")));
-
-    gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
-                             trg_prefs_behaviorPage(TRG_PREFERENCES_DIALOG
-                                                    (object)),
-                             gtk_label_new(_("Behavior")));
-
     gtk_container_set_border_width(GTK_CONTAINER(notebook), GUI_PAD);
 
     gtk_box_pack_start(GTK_BOX(contentvbox), notebook, TRUE, TRUE, 0);
diff --git a/src/trg-remote-prefs-dialog.c b/src/trg-remote-prefs-dialog.c
index b3098f4..c698046 100644
--- a/src/trg-remote-prefs-dialog.c
+++ b/src/trg-remote-prefs-dialog.c
@@ -251,7 +251,7 @@ static GtkWidget *trg_rprefs_alt_speed_spin_new(GList **wl, JsonObject *obj,
     return w;
 }
 
-static GtkWidget *trg_rprefs_limitsPage(TrgRemotePrefsDialog * win,
+static GtkWidget *trg_rprefs_bandwidthPage(TrgRemotePrefsDialog * win,
         JsonObject * json) {
     TrgRemotePrefsDialogPrivate *priv = TRG_REMOTE_PREFS_DIALOG_GET_PRIVATE(win);
     GtkWidget *w, *tb, *t;
@@ -259,7 +259,7 @@ static GtkWidget *trg_rprefs_limitsPage(TrgRemotePrefsDialog * win,
 
     t = hig_workarea_create();
 
-    hig_workarea_add_section_title(t, &row, _("Bandwidth"));
+    hig_workarea_add_section_title(t, &row, _("Bandwidth limits"));
 
     tb = trg_json_widget_check_new(&priv->widgets, json,
             SGET_SPEED_LIMIT_DOWN_ENABLED, _("Down Limit (KB/s)"),
@@ -274,6 +274,8 @@ static GtkWidget *trg_rprefs_limitsPage(TrgRemotePrefsDialog * win,
             0, INT_MAX, 5);
     hig_workarea_add_row_w(t, &row, tb, w, NULL);
 
+    hig_workarea_add_section_title(t, &row, _("Alternate limits"));
+
     w = priv->alt_check = trg_json_widget_check_new(&priv->widgets, json,
             SGET_ALT_SPEED_ENABLED, _("Alternate speed limits active"),
             NULL);
@@ -292,6 +294,17 @@ static GtkWidget *trg_rprefs_limitsPage(TrgRemotePrefsDialog * win,
             priv->alt_check, tb);
     hig_workarea_add_row(t, &row, _("Alternate up limit (KB/s)"), w, w);
 
+    return t;
+}
+
+static GtkWidget *trg_rprefs_limitsPage(TrgRemotePrefsDialog * win,
+        JsonObject * json) {
+    TrgRemotePrefsDialogPrivate *priv = TRG_REMOTE_PREFS_DIALOG_GET_PRIVATE(win);
+    GtkWidget *w, *tb, *t;
+    gint row = 0;
+
+    t = hig_workarea_create();
+
     hig_workarea_add_section_title(t, &row, _("Seeding"));
 
     tb = trg_json_widget_check_new(&priv->widgets, json,
@@ -428,6 +441,17 @@ static GtkWidget *trg_rprefs_connPage(TrgRemotePrefsDialog * win,
 
     t = hig_workarea_create();
 
+    hig_workarea_add_section_title(t, &row, _("Connections"));
+
+    w = trg_json_widget_spin_new(&priv->widgets, s, SGET_PEER_PORT, NULL, 0,
+            65535, 1);
+    hig_workarea_add_row(t, &row, _("Peer port"), w, w);
+
+    w = priv->port_test_label = gtk_label_new(_("Port test"));
+    w = priv->port_test_button = gtk_button_new_with_label(_("Test"));
+    g_signal_connect(w, "clicked", G_CALLBACK(port_test_cb), win);
+    hig_workarea_add_row_w(t, &row, priv->port_test_label, w, NULL);
+
     w = priv->encryption_combo = gtr_combo_box_new_enum(_("Required"), 0,
             _("Preferred"), 1, _("Tolerated"), 2, NULL);
     stringValue = session_get_encryption(s);
@@ -438,16 +462,8 @@ static GtkWidget *trg_rprefs_connPage(TrgRemotePrefsDialog * win,
     } else {
         gtk_combo_box_set_active(GTK_COMBO_BOX(w), 1);
     }
-    hig_workarea_add_row(t, &row, _("Encryption"), w, NULL);
-
-    w = trg_json_widget_spin_new(&priv->widgets, s, SGET_PEER_PORT, NULL, 0,
-            65535, 1);
-    hig_workarea_add_row(t, &row, _("Peer port"), w, w);
 
-    w = priv->port_test_label = gtk_label_new(_("Port test"));
-    w = priv->port_test_button = gtk_button_new_with_label(_("Test"));
-    g_signal_connect(w, "clicked", G_CALLBACK(port_test_cb), win);
-    hig_workarea_add_row_w(t, &row, priv->port_test_label, w, NULL);
+    hig_workarea_add_row(t, &row, _("Encryption"), w, NULL);
 
     w = trg_json_widget_check_new(&priv->widgets, s,
             SGET_PEER_PORT_RANDOM_ON_START, _("Random peer port on start"),
@@ -458,6 +474,8 @@ static GtkWidget *trg_rprefs_connPage(TrgRemotePrefsDialog * win,
             SGET_PORT_FORWARDING_ENABLED, _("Peer port forwarding"), NULL);
     hig_workarea_add_wide_control(t, &row, w);
 
+    hig_workarea_add_section_title(t, &row, _("Protocol"));
+
     w = trg_json_widget_check_new(&priv->widgets, s, SGET_PEX_ENABLED,
             _("Peer exchange (PEX)"), NULL);
     hig_workarea_add_wide_control(t, &row, w);
@@ -470,6 +488,8 @@ static GtkWidget *trg_rprefs_connPage(TrgRemotePrefsDialog * win,
             _("Local peer discovery"), NULL);
     hig_workarea_add_wide_control(t, &row, w);
 
+    hig_workarea_add_section_title(t, &row, _("Blocklist"));
+
     stringValue = g_strdup_printf(_("Blocklist (%ld entries)"),
             session_get_blocklist_size(s));
     tb = priv->blocklist_check = trg_json_widget_check_new(&priv->widgets, s,
@@ -502,6 +522,8 @@ static GtkWidget *trg_rprefs_generalPage(TrgRemotePrefsDialog * win,
 
     t = hig_workarea_create();
 
+    hig_workarea_add_section_title(t, &row, _("Environment"));
+
     w = trg_json_widget_entry_new(&priv->widgets, s, SGET_DOWNLOAD_DIR, NULL);
     hig_workarea_add_row(t, &row, _("Download directory"), w, NULL);
 
@@ -523,6 +545,8 @@ static GtkWidget *trg_rprefs_generalPage(TrgRemotePrefsDialog * win,
         hig_workarea_add_row(t, &row, _("Cache size (MB)"), w, w);
     }
 
+    hig_workarea_add_section_title(t, &row, _("Behavior"));
+
     w = trg_json_widget_check_new(&priv->widgets, s, SGET_RENAME_PARTIAL_FILES,
             _("Rename partial files"), NULL);
     hig_workarea_add_wide_control(t, &row, w);
@@ -580,6 +604,10 @@ static GObject *trg_remote_prefs_dialog_constructor(GType type,
             (object), session), gtk_label_new(_("Connections")));
 
     gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
+            trg_rprefs_bandwidthPage(TRG_REMOTE_PREFS_DIALOG
+            (object), session), gtk_label_new(_("Bandwidth")));
+
+    gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
             trg_rprefs_limitsPage(TRG_REMOTE_PREFS_DIALOG
             (object), session), gtk_label_new(_("Limits")));