diff --git a/src/process-monitor.c b/src/process-monitor.c index 3bea77d..94ec6a7 100644 --- a/src/process-monitor.c +++ b/src/process-monitor.c @@ -21,7 +21,6 @@ enum { PROP_STEP_SIZE = 1, - PROP_PAINT_BOX, }; typedef struct _XtmProcessMonitorClass XtmProcessMonitorClass; struct _XtmProcessMonitorClass @@ -34,7 +33,6 @@ struct _XtmProcessMonitor /**/ gfloat step_size; GArray * history; - gboolean paint_box; }; G_DEFINE_TYPE (XtmProcessMonitor, xtm_process_monitor, GTK_TYPE_DRAWING_AREA) @@ -60,8 +58,6 @@ xtm_process_monitor_class_init (XtmProcessMonitorClass *klass) #endif g_object_class_install_property (class, PROP_STEP_SIZE, g_param_spec_float ("step-size", "StepSize", "Step size", 0.1, G_MAXFLOAT, 1, G_PARAM_CONSTRUCT|G_PARAM_READWRITE)); - g_object_class_install_property (class, PROP_PAINT_BOX, - g_param_spec_boolean ("paint-box", "PaintBox", "Paint box around monitor", TRUE, G_PARAM_CONSTRUCT|G_PARAM_READWRITE)); } static void @@ -80,10 +76,6 @@ xtm_process_monitor_get_property (GObject *object, guint property_id, GValue *va g_value_set_float (value, monitor->step_size); break; - case PROP_PAINT_BOX: - g_value_set_boolean (value, monitor->paint_box); - break; - default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); break; @@ -100,10 +92,6 @@ xtm_process_monitor_set_property (GObject *object, guint property_id, const GVal monitor->step_size = g_value_get_float (value); break; - case PROP_PAINT_BOX: - monitor->paint_box = g_value_get_boolean (value); - break; - default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); break; @@ -269,13 +257,4 @@ xtm_process_monitor_clear (XtmProcessMonitor *monitor) g_array_set_size (monitor->history, 0); if (GDK_IS_WINDOW (gtk_widget_get_window (GTK_WIDGET(monitor)))) gdk_window_invalidate_rect (gtk_widget_get_window (GTK_WIDGET(monitor)), NULL, FALSE); -} - -void -xtm_process_monitor_set_paint_box (XtmProcessMonitor *monitor, gboolean paint_box) -{ - g_return_if_fail (XTM_IS_PROCESS_MONITOR (monitor)); - g_object_set (monitor, "paint-box", paint_box, NULL); - if (GDK_IS_WINDOW (gtk_widget_get_window (GTK_WIDGET(monitor)))) - gdk_window_invalidate_rect (gtk_widget_get_window (GTK_WIDGET(monitor)), NULL, FALSE); -} +} \ No newline at end of file diff --git a/src/process-window.c b/src/process-window.c index 1621b34..b463c23 100644 --- a/src/process-window.c +++ b/src/process-window.c @@ -66,7 +66,6 @@ static gboolean emit_delete_event_signal (XtmProcessWindow *window, GdkEvent * static gboolean xtm_process_window_key_pressed (XtmProcessWindow *window, GdkEventKey *event); static void toolbar_update_style (XtmProcessWindow *window); static void monitor_update_step_size (XtmProcessWindow *window); -static void monitor_update_paint_box (XtmProcessWindow *window); static void show_about_dialog (XtmProcessWindow *window); @@ -159,8 +158,6 @@ xtm_process_window_init (XtmProcessWindow *window) gtk_widget_show (window->mem_monitor); gtk_container_add (GTK_CONTAINER (toolitem), window->mem_monitor); - monitor_update_paint_box (window); - g_signal_connect_swapped (window->settings, "notify::monitor-paint-box", G_CALLBACK (monitor_update_paint_box), window); g_signal_connect_swapped (window->settings, "notify::refresh-rate", G_CALLBACK (monitor_update_step_size), window); } @@ -289,15 +286,6 @@ toolbar_update_style (XtmProcessWindow *window) } } -static void -monitor_update_paint_box (XtmProcessWindow *window) -{ - gboolean paint_box; - g_object_get (window->settings, "monitor-paint-box", &paint_box, NULL); - xtm_process_monitor_set_paint_box (XTM_PROCESS_MONITOR (window->cpu_monitor), paint_box); - xtm_process_monitor_set_paint_box (XTM_PROCESS_MONITOR (window->mem_monitor), paint_box); -} - static void monitor_update_step_size (XtmProcessWindow *window) { diff --git a/src/settings-dialog-gtk3.ui b/src/settings-dialog-gtk3.ui index 43c509c..f54cf5c 100644 --- a/src/settings-dialog-gtk3.ui +++ b/src/settings-dialog-gtk3.ui @@ -123,21 +123,6 @@ 2 - - - Draw borders around monitors - True - True - False - 0.49000000953674316 - True - - - False - False - 3 - - Show processes as tree diff --git a/src/settings-dialog.c b/src/settings-dialog.c index 203cbc6..2309533 100644 --- a/src/settings-dialog.c +++ b/src/settings-dialog.c @@ -109,7 +109,6 @@ xtm_settings_dialog_init (XtmSettingsDialog *dialog) builder_bind_toggle_button (builder, "button-show-application-icons", dialog->settings, "show-application-icons"); builder_bind_toggle_button (builder, "button-full-command-line", dialog->settings, "full-command-line"); builder_bind_toggle_button (builder, "button-more-precision", dialog->settings, "more-precision"); - builder_bind_toggle_button (builder, "button-monitor-paint-box", dialog->settings, "monitor-paint-box"); builder_bind_toggle_button (builder, "button-prompt-terminate-task", dialog->settings, "prompt-terminate-task"); builder_bind_toggle_button (builder, "button-show-status-icon", dialog->settings, "show-status-icon"); builder_bind_toggle_button (builder, "button-show-memory-in-xbytes", dialog->settings, "show-memory-in-xbytes"); diff --git a/src/settings-dialog.ui b/src/settings-dialog.ui index 781bc0f..23694ab 100644 --- a/src/settings-dialog.ui +++ b/src/settings-dialog.ui @@ -85,21 +85,6 @@ 2 - - - Draw borders around monitors - True - True - False - 0.49000000953674316 - True - - - False - False - 3 - - Show processes as tree