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

1 files changed, 39 insertions, 11 deletions

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")));