From c03eb44de434963b167247473e2e1fdaef84fd8b Mon Sep 17 00:00:00 2001
From: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
Date: Wed, 13 Jan 2021 16:02:06 +0100
Subject: [PATCH] settings: Migrate all settings (apart from refresh rate)

---
 src/settings-dialog.c  | 18 +++++++++++++++++-
 src/settings-dialog.ui | 20 +++++++++++++++++---
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/src/settings-dialog.c b/src/settings-dialog.c
index 01aff67..488ea0e 100644
--- a/src/settings-dialog.c
+++ b/src/settings-dialog.c
@@ -125,12 +125,28 @@ xtm_settings_dialog_new (GtkBuilder *builder, GtkWidget *parent_window)
 	gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (builder, "button-show-application-icons")));
 #endif
 
+	// Interface
+	builder_bind_toggle_button (builder, "button-show-all-processes", settings, "show-all-processes");
 	builder_bind_toggle_button (builder, "button-show-application-icons", settings, "show-application-icons");
 	builder_bind_toggle_button (builder, "button-full-command-line", settings, "full-command-line");
 	builder_bind_toggle_button (builder, "button-more-precision", settings, "more-precision");
+	builder_bind_toggle_button (builder, "button-process-tree", settings, "process-tree");
+	builder_bind_toggle_button (builder, "button-show-legend", settings, "show-legend");
+	// Miscellaneous
 	builder_bind_toggle_button (builder, "button-prompt-terminate-task", settings, "prompt-terminate-task");
 	builder_bind_toggle_button (builder, "button-show-status-icon", settings, "show-status-icon");
-	builder_bind_toggle_button (builder, "button-process-tree", settings, "process-tree");
+
+
+	// Columns
+	builder_bind_toggle_button (builder, "pid", settings, "column-pid");
+	builder_bind_toggle_button (builder, "ppid", settings, "column-ppid");
+	builder_bind_toggle_button (builder, "state", settings, "column-state");
+	builder_bind_toggle_button (builder, "vbytes", settings, "column-vsz");
+	builder_bind_toggle_button (builder, "pbytes", settings, "column-rss");
+	builder_bind_toggle_button (builder, "uid", settings, "column-uid");
+	builder_bind_toggle_button (builder, "cpu", settings, "column-cpu");
+	builder_bind_toggle_button (builder, "priority", settings, "column-priority");
+
 
 	button = GTK_WIDGET (gtk_builder_get_object (builder, "button-about"));
 	g_signal_connect (button, "clicked", G_CALLBACK (show_about_dialog), dialog);
diff --git a/src/settings-dialog.ui b/src/settings-dialog.ui
index 7a4f55e..95ad560 100644
--- a/src/settings-dialog.ui
+++ b/src/settings-dialog.ui
@@ -109,7 +109,7 @@
                         <property name="orientation">vertical</property>
                         <property name="spacing">6</property>
                         <child>
-                          <object class="GtkCheckButton" id="show-all">
+                          <object class="GtkCheckButton" id="button-show-all-processes">
                             <property name="label" translatable="yes">Show all processes</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -164,6 +164,20 @@
                             <property name="position">3</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="GtkCheckButton" id="button-show-legend">
+                            <property name="label" translatable="yes">Show legend</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">4</property>
+                          </packing>
+                        </child>
                         <child>
                           <object class="GtkCheckButton" id="button-more-precision">
                             <property name="label" translatable="yes">Show values with more precision</property>
@@ -175,7 +189,7 @@
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
-                            <property name="position">4</property>
+                            <property name="position">5</property>
                           </packing>
                         </child>
                         <child>
@@ -210,7 +224,7 @@
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
-                            <property name="position">5</property>
+                            <property name="position">6</property>
                           </packing>
                         </child>
                       </object>