closer to gtk3 support, I think just the graph needs doing now.

1 files changed, 66 insertions, 44 deletions

diff --git a/src/trg-remote-prefs-dialog.c b/src/trg-remote-prefs-dialog.c
index 47124cb..c706b72 100644
--- a/src/trg-remote-prefs-dialog.c
+++ b/src/trg-remote-prefs-dialog.c
@@ -141,54 +141,66 @@ static GtkWidget *trg_rprefs_limitsPage(TrgRemotePrefsDialog * win,
 
     hig_workarea_add_section_title(t, &row, _("Bandwidth"));
 
-    tb = trg_json_widget_check_new(
-            &priv->widgets, json, SGET_SPEED_LIMIT_DOWN_ENABLED, _("Limit download speed (KB/s)"), NULL);
-    w = trg_json_widget_spin_new_int(&priv->widgets, json, SGET_SPEED_LIMIT_DOWN, tb, 0, INT_MAX, 1);
+    tb = trg_json_widget_check_new(&priv->widgets, json,
+            SGET_SPEED_LIMIT_DOWN_ENABLED, _("Limit download speed (KB/s)"),
+            NULL);
+    w = trg_json_widget_spin_new_int(&priv->widgets, json,
+            SGET_SPEED_LIMIT_DOWN, tb, 0, INT_MAX, 1);
     hig_workarea_add_row_w(t, &row, tb, w, NULL);
 
-    tb = trg_json_widget_check_new(&priv->widgets, json, SGET_SPEED_LIMIT_UP_ENABLED, _("Limit upload speed (KB/s)"), NULL);
-    w = trg_json_widget_spin_new_int(&priv->widgets, json, SGET_SPEED_LIMIT_UP, tb, 0, INT_MAX, 1);
+    tb = trg_json_widget_check_new(&priv->widgets, json,
+            SGET_SPEED_LIMIT_UP_ENABLED, _("Limit upload speed (KB/s)"), NULL);
+    w = trg_json_widget_spin_new_int(&priv->widgets, json, SGET_SPEED_LIMIT_UP,
+            tb, 0, INT_MAX, 1);
     hig_workarea_add_row_w(t, &row, tb, w, NULL);
 
     hig_workarea_add_section_title(t, &row, _("Seeding"));
 
-    tb = trg_json_widget_check_new(
-            &priv->widgets, json, SGET_SEED_RATIO_LIMITED, _("Seed ratio limit"), NULL);
-    w = trg_json_widget_spin_new_double(&priv->widgets, json, SGET_SEED_RATIO_LIMIT, tb, 0, INT_MAX, 0.1);
+    tb = trg_json_widget_check_new(&priv->widgets, json,
+            SGET_SEED_RATIO_LIMITED, _("Seed ratio limit"), NULL);
+    w = trg_json_widget_spin_new_double(&priv->widgets, json,
+            SGET_SEED_RATIO_LIMIT, tb, 0, INT_MAX, 0.1);
     hig_workarea_add_row_w(t, &row, tb, w, NULL);
 
     if (json_object_has_member(json, SGET_DOWNLOAD_QUEUE_ENABLED)) {
         hig_workarea_add_section_title(t, &row, _("Queues"));
 
-        tb = trg_json_widget_check_new(
-                &priv->widgets, json, SGET_DOWNLOAD_QUEUE_ENABLED, _("Download queue size"), NULL);
-        w = trg_json_widget_spin_new_int(&priv->widgets, json, SGET_DOWNLOAD_QUEUE_SIZE, tb, 0, INT_MAX, 1);
+        tb = trg_json_widget_check_new(&priv->widgets, json,
+                SGET_DOWNLOAD_QUEUE_ENABLED, _("Download queue size"), NULL);
+        w = trg_json_widget_spin_new_int(&priv->widgets, json,
+                SGET_DOWNLOAD_QUEUE_SIZE, tb, 0, INT_MAX, 1);
         hig_workarea_add_row_w(t, &row, tb, w, NULL);
 
-        tb = trg_json_widget_check_new(
-                &priv->widgets, json, SGET_SEED_QUEUE_ENABLED, _("Seed queue size"), NULL);
-        w = trg_json_widget_spin_new_int(&priv->widgets, json, SGET_SEED_QUEUE_SIZE, tb, 0, INT_MAX, 1);
+        tb = trg_json_widget_check_new(&priv->widgets, json,
+                SGET_SEED_QUEUE_ENABLED, _("Seed queue size"), NULL);
+        w = trg_json_widget_spin_new_int(&priv->widgets, json,
+                SGET_SEED_QUEUE_SIZE, tb, 0, INT_MAX, 1);
         hig_workarea_add_row_w(t, &row, tb, w, NULL);
 
-        tb = trg_json_widget_check_new(
-                &priv->widgets, json, SGET_QUEUE_STALLED_ENABLED, _("Ignore stalled (minutes)"), NULL);
-        w = trg_json_widget_spin_new_int(&priv->widgets, json, SGET_QUEUE_STALLED_MINUTES, tb, 0, INT_MAX, 1);
+        tb
+                = trg_json_widget_check_new(&priv->widgets, json,
+                        SGET_QUEUE_STALLED_ENABLED,
+                        _("Ignore stalled (minutes)"), NULL);
+        w = trg_json_widget_spin_new_int(&priv->widgets, json,
+                SGET_QUEUE_STALLED_MINUTES, tb, 0, INT_MAX, 1);
         hig_workarea_add_row_w(t, &row, tb, w, NULL);
     }
 
     hig_workarea_add_section_title(t, &row, _("Peers"));
 
-    w = trg_json_widget_spin_new_int(&priv->widgets, json, SGET_PEER_LIMIT_GLOBAL, NULL, 0, INT_MAX, 5);
+    w = trg_json_widget_spin_new_int(&priv->widgets, json,
+            SGET_PEER_LIMIT_GLOBAL, NULL, 0, INT_MAX, 5);
     hig_workarea_add_row(t, &row, _("Global peer limit"), w, w);
 
-    w = trg_json_widget_spin_new_int(&priv->widgets, json, SGET_PEER_LIMIT_PER_TORRENT, NULL, 0, INT_MAX, 5);
+    w = trg_json_widget_spin_new_int(&priv->widgets, json,
+            SGET_PEER_LIMIT_PER_TORRENT, NULL, 0, INT_MAX, 5);
     hig_workarea_add_row(t, &row, _("Per torrent peer limit"), w, w);
 
     return t;
 }
 
 static gboolean on_port_tested(gpointer data) {
-	trg_response *response = (trg_response*)data;
+    trg_response *response = (trg_response*) data;
     if (TRG_IS_REMOTE_PREFS_DIALOG(response->cb_data)) {
         TrgRemotePrefsDialogPrivate *priv =
                 TRG_REMOTE_PREFS_DIALOG_GET_PRIVATE(response->cb_data);
@@ -231,7 +243,7 @@ static void port_test_cb(GtkButton * b, gpointer data) {
 }
 
 static gboolean on_blocklist_updated(gpointer data) {
-	trg_response *response = (trg_response*)data;
+    trg_response *response = (trg_response*) data;
     if (TRG_IS_REMOTE_PREFS_DIALOG(response->cb_data)) {
         TrgRemotePrefsDialogPrivate *priv =
                 TRG_REMOTE_PREFS_DIALOG_GET_PRIVATE(response->cb_data);
@@ -280,10 +292,8 @@ static GtkWidget *trg_rprefs_connPage(TrgRemotePrefsDialog * win,
 
     t = hig_workarea_create();
 
-    w = priv->encryption_combo = gtk_combo_box_new_text();
-    gtk_combo_box_append_text(GTK_COMBO_BOX(w), _("Required"));
-    gtk_combo_box_append_text(GTK_COMBO_BOX(w), _("Preferred"));
-    gtk_combo_box_append_text(GTK_COMBO_BOX(w), _("Tolerated"));
+    w = priv->encryption_combo = gtr_combo_box_new_enum(_("Required"), 0,
+            _("Preferred"), 1, _("Tolerated"), 2);
     stringValue = session_get_encryption(s);
     if (g_strcmp0(stringValue, "required") == 0) {
         gtk_combo_box_set_active(GTK_COMBO_BOX(w), 0);
@@ -294,7 +304,8 @@ static GtkWidget *trg_rprefs_connPage(TrgRemotePrefsDialog * win,
     }
     hig_workarea_add_row(t, &row, _("Encryption"), w, NULL);
 
-    w = trg_json_widget_spin_new_int(&priv->widgets, s, SGET_PEER_PORT, NULL, 0, 65535, 1);
+    w = trg_json_widget_spin_new_int(&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"));
@@ -302,24 +313,31 @@ static GtkWidget *trg_rprefs_connPage(TrgRemotePrefsDialog * win,
     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 = trg_json_widget_check_new(&priv->widgets, s, SGET_PEER_PORT_RANDOM_ON_START, _("Random peer port on start"), NULL);
+    w = trg_json_widget_check_new(&priv->widgets, s,
+            SGET_PEER_PORT_RANDOM_ON_START, _("Random peer port on start"),
+            NULL);
     hig_workarea_add_wide_control(t, &row, w);
 
-    w = trg_json_widget_check_new(&priv->widgets, s, SGET_PORT_FORWARDING_ENABLED, _("Peer port forwarding"), NULL);
+    w = trg_json_widget_check_new(&priv->widgets, s,
+            SGET_PORT_FORWARDING_ENABLED, _("Peer port forwarding"), NULL);
     hig_workarea_add_wide_control(t, &row, w);
 
-    w = trg_json_widget_check_new(&priv->widgets, s, SGET_PEX_ENABLED, _("Peer exchange (PEX)"), NULL);
+    w = trg_json_widget_check_new(&priv->widgets, s, SGET_PEX_ENABLED,
+            _("Peer exchange (PEX)"), NULL);
     hig_workarea_add_wide_control(t, &row, w);
 
-    w = trg_json_widget_check_new(&priv->widgets, s, SGET_DHT_ENABLED, _("Distributed Hash Table (DHT)"), NULL);
+    w = trg_json_widget_check_new(&priv->widgets, s, SGET_DHT_ENABLED,
+            _("Distributed Hash Table (DHT)"), NULL);
     hig_workarea_add_wide_control(t, &row, w);
 
-    w = trg_json_widget_check_new(&priv->widgets, s, SGET_LPD_ENABLED, _("Local peer discovery"), NULL);
+    w = trg_json_widget_check_new(&priv->widgets, s, SGET_LPD_ENABLED,
+            _("Local peer discovery"), NULL);
     hig_workarea_add_wide_control(t, &row, w);
 
     stringValue = g_strdup_printf(_("Blocklist (%ld entries)"),
             session_get_blocklist_size(s));
-    tb = priv->blocklist_check = trg_json_widget_check_new(&priv->widgets, s, SGET_BLOCKLIST_ENABLED, stringValue, NULL);
+    tb = priv->blocklist_check = trg_json_widget_check_new(&priv->widgets, s,
+            SGET_BLOCKLIST_ENABLED, stringValue, NULL);
     g_free((gchar *) stringValue);
 
     w = priv->blocklist_update_button = gtk_button_new_with_label(_("Update"));
@@ -330,7 +348,8 @@ static GtkWidget *trg_rprefs_connPage(TrgRemotePrefsDialog * win,
     //GtkWidget *trg_json_widget_entry_new(GList **wl, JsonObject *obj, gchar *key, GtkWidget *toggleDep);
     stringValue = session_get_blocklist_url(s);
     if (stringValue) {
-        w = trg_json_widget_entry_new(&priv->widgets, s, SGET_BLOCKLIST_URL, NULL);
+        w = trg_json_widget_entry_new(&priv->widgets, s, SGET_BLOCKLIST_URL,
+                NULL);
         hig_workarea_add_row(t, &row, _("Blocklist URL:"), w, NULL);
     }
 
@@ -351,25 +370,30 @@ static GtkWidget *trg_rprefs_generalPage(TrgRemotePrefsDialog * win,
     w = trg_json_widget_entry_new(&priv->widgets, s, SGET_DOWNLOAD_DIR, NULL);
     hig_workarea_add_row(t, &row, _("Download directory"), w, NULL);
 
-    tb = trg_json_widget_check_new(&priv->widgets, s, SGET_INCOMPLETE_DIR_ENABLED, _("Incomplete download dir"), NULL);
+    tb = trg_json_widget_check_new(&priv->widgets, s,
+            SGET_INCOMPLETE_DIR_ENABLED, _("Incomplete download dir"), NULL);
     w = trg_json_widget_entry_new(&priv->widgets, s, SGET_INCOMPLETE_DIR, tb);
     hig_workarea_add_row_w(t, &row, tb, w, NULL);
 
-    tb = trg_json_widget_check_new(&priv->widgets, s, SGET_SCRIPT_TORRENT_DONE_ENABLED, _("Torrent done script"), NULL);
-    w = trg_json_widget_entry_new(&priv->widgets, s, SGET_SCRIPT_TORRENT_DONE_FILENAME, tb);
+    tb = trg_json_widget_check_new(&priv->widgets, s,
+            SGET_SCRIPT_TORRENT_DONE_ENABLED, _("Torrent done script"), NULL);
+    w = trg_json_widget_entry_new(&priv->widgets, s,
+            SGET_SCRIPT_TORRENT_DONE_FILENAME, tb);
     hig_workarea_add_row_w(t, &row, tb, w, NULL);
 
     cache_size_mb = session_get_cache_size_mb(s);
     if (cache_size_mb >= 0) {
-        w = trg_json_widget_spin_new_int(&priv->widgets, s, SGET_CACHE_SIZE_MB, NULL, 0,
-                INT_MAX, 1);
+        w = trg_json_widget_spin_new_int(&priv->widgets, s, SGET_CACHE_SIZE_MB,
+                NULL, 0, INT_MAX, 1);
         hig_workarea_add_row(t, &row, _("Cache size (MB)"), w, w);
     }
 
-    w = trg_json_widget_check_new(&priv->widgets, s, SGET_RENAME_PARTIAL_FILES, _("Rename partial files"), NULL);
+    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);
 
-    w = trg_json_widget_check_new(&priv->widgets, s, SGET_TRASH_ORIGINAL_TORRENT_FILES, _
+    w = trg_json_widget_check_new(&priv->widgets, s,
+            SGET_TRASH_ORIGINAL_TORRENT_FILES, _
             ("Trash original torrent files"), NULL);
     hig_workarea_add_wide_control(t, &row, w);
 
@@ -405,8 +429,7 @@ static GObject *trg_remote_prefs_dialog_constructor(GType type,
 
     gtk_container_set_border_width(GTK_CONTAINER(object), GUI_PAD);
 
-    gtk_dialog_set_default_response(GTK_DIALOG(object),
-                                    GTK_RESPONSE_OK);
+    gtk_dialog_set_default_response(GTK_DIALOG(object), GTK_RESPONSE_OK);
 
     g_signal_connect(G_OBJECT(object),
             "response",
@@ -428,8 +451,7 @@ static GObject *trg_remote_prefs_dialog_constructor(GType type,
 
     gtk_container_set_border_width(GTK_CONTAINER(notebook), GUI_PAD);
 
-    gtk_box_pack_start(GTK_BOX(contentvbox), notebook, TRUE, TRUE,
-            0);
+    gtk_box_pack_start(GTK_BOX(contentvbox), notebook, TRUE, TRUE, 0);
 
     return object;
 }