diff --git a/configure.ac.in b/configure.ac.in index dcbb6ce..e7b9c33 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -73,16 +73,8 @@ XDT_CHECK_PACKAGE([CAIRO], [cairo], [1.5.0]) dnl *********************************** dnl *** Check for optional packages *** dnl *********************************** -XDT_CHECK_OPTIONAL_PACKAGE([GTK2], - [gtk+-2.0], [2.24.0], [gtk2], - [GTK+ 2 support], [no]) -AM_CONDITIONAL([USE_GTK2], [test "x$GTK2_FOUND" = "xyes"]) -if test "x$GTK2_FOUND" = "xyes"; then - XDT_CHECK_OPTIONAL_PACKAGE([WNCK], [libwnck-1.0], [2.0], [wnck], [building with libwnck for window icons/names], [yes]) - XDT_CHECK_OPTIONAL_PACKAGE([GKSU], [libgksu2], [2.0], [gksu], [building with libgksu to run as root], [yes]) -else - XDT_CHECK_OPTIONAL_PACKAGE([WNCK], [libwnck-3.0], [3.2], [wnck3], [building with libwnck3 for window icons/names], [yes]) -fi +XDT_CHECK_OPTIONAL_PACKAGE([WNCK], [libwnck-3.0], [3.2], [wnck3], [building with libwnck3 for window icons/names], [yes]) + AM_CONDITIONAL([HAVE_WNCK], [test x"$WNCK_FOUND" = x"yes"]) AM_CONDITIONAL([HAVE_GKSU], [test x"$GKSU_FOUND" = x"yes"]) dnl *********************************** @@ -167,11 +159,7 @@ echo echo "* Gksu: ${GKSU_VERSION:-no}" echo "* Wnck: ${WNCK_VERSION:-no}" echo "* Cairo: ${CAIRO_VERSION}" -if test "x$GTK2_FOUND" = "xyes" ; then -echo "* GTK+: ${GTK2_VERSION}" -else echo "* GTK+: ${GTK3_VERSION}" -fi echo "* Target OS: $target_os ($ac_os_implementation)" echo "* Debug: $enable_debug" echo diff --git a/po/POTFILES.in b/po/POTFILES.in index 58169e7..49a5f23 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -7,10 +7,8 @@ src/process-statusbar.c src/process-tree-view.c src/process-window.c [type: gettext/glade]src/process-window.ui -[type: gettext/glade]src/process-window-gtk3.ui src/settings.c src/settings-dialog.c [type: gettext/glade]src/settings-dialog.ui -[type: gettext/glade]src/settings-dialog-gtk3.ui src/settings-tool-button.c src/task-manager.c diff --git a/src/Makefile.am b/src/Makefile.am index acb68bd..09b3828 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -11,6 +11,8 @@ xfce4_taskmanager_CFLAGS = \ $(GKSU_CFLAGS) \ $(LIBX11_CFLAGS) \ $(LIBXMU_CFLAGS) \ + $(GTK3_CFLAGS) \ + $(WNCK_CFLAGS) \ $(NULL) xfce4_taskmanager_LDADD = \ @@ -18,11 +20,13 @@ xfce4_taskmanager_LDADD = \ $(GKSU_LIBS) \ $(LIBX11_LIBS) \ $(LIBXMU_LIBS) \ + $(GTK3_LIBS) \ + $(WNCK_LIBS) \ $(NULL) xfce4_taskmanager_SOURCES = \ main.c \ - process-window_ui.h process-window-gtk3_ui.h \ + process-window_ui.h \ process-window.c process-window.h \ process-monitor.c process-monitor.h \ process-tree-model.c process-tree-model.h \ @@ -30,20 +34,12 @@ xfce4_taskmanager_SOURCES = \ process-statusbar.c process-statusbar.h \ exec-tool-button.c exec-tool-button.h \ settings-tool-button.c settings-tool-button.h \ - settings-dialog_ui.h settings-dialog-gtk3_ui.h \ + settings-dialog_ui.h \ settings-dialog.c settings-dialog.h \ settings.c settings.h \ task-manager.c task-manager.h \ $(NULL) -if USE_GTK2 -xfce4_taskmanager_LDADD += $(GTK2_LIBS) $(WNCK_LIBS) -xfce4_taskmanager_CFLAGS += $(GTK2_CFLAGS) $(WNCK_CFLAGS) -else -xfce4_taskmanager_LDADD += $(GTK3_LIBS) $(WNCK_LIBS) -xfce4_taskmanager_CFLAGS += $(GTK3_CFLAGS) $(WNCK_CFLAGS) -endif - if HAVE_WNCK xfce4_taskmanager_SOURCES += app-manager.c app-manager.h endif @@ -65,15 +61,11 @@ xfce4_taskmanager_SOURCES += task-manager-skel.c endif if MAINTAINER_MODE -BUILT_SOURCES = process-window_ui.h settings-dialog_ui.h process-window-gtk3_ui.h settings-dialog-gtk3_ui.h +BUILT_SOURCES = process-window_ui.h settings-dialog_ui.h process-window_ui.h: process-window.ui $(AM_V_GEN) xdt-csource --static --strip-comments --strip-content --name=process_window_ui $< >$@ settings-dialog_ui.h: settings-dialog.ui $(AM_V_GEN) xdt-csource --static --strip-comments --strip-content --name=settings_dialog_ui $< >$@ -process-window-gtk3_ui.h: process-window-gtk3.ui - $(AM_V_GEN) xdt-csource --static --strip-comments --strip-content --name=process_window_ui $< >$@ -settings-dialog-gtk3_ui.h: settings-dialog-gtk3.ui - $(AM_V_GEN) xdt-csource --static --strip-comments --strip-content --name=settings_dialog_ui $< >$@ endif -EXTRA_DIST = process-window.ui settings-dialog.ui process-window-gtk3.ui settings-dialog-gtk3.ui +EXTRA_DIST = process-window.ui settings-dialog.ui diff --git a/src/exec-tool-button.c b/src/exec-tool-button.c index 178a8c0..df86889 100644 --- a/src/exec-tool-button.c +++ b/src/exec-tool-button.c @@ -79,7 +79,6 @@ static void execute_command (const gchar *command) { GError *error = NULL; -#if GTK_CHECK_VERSION(3, 0, 0) GdkScreen *screen; GdkDisplay *display; GdkAppLaunchContext *launch_context; @@ -95,9 +94,7 @@ execute_command (const gchar *command) g_object_unref (launch_context); } g_object_unref (app_info); -#else - gdk_spawn_command_line_on_screen (gdk_screen_get_default (), command, &error); -#endif + if (error != NULL) { GtkWidget *dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, diff --git a/src/main.c b/src/main.c index e0e8232..ab8a90a 100644 --- a/src/main.c +++ b/src/main.c @@ -126,7 +126,6 @@ init_timeout (void) if (gtk_status_icon_get_visible (status_icon)) { -#if GTK_CHECK_VERSION (2,16,0) g_snprintf (tooltip, sizeof(tooltip), _("Processes: %u\n" "CPU: %.0f%%\n" @@ -134,15 +133,6 @@ init_timeout (void) "Swap: %s"), num_processes, cpu, memory_info, swap_info); gtk_status_icon_set_tooltip_markup (GTK_STATUS_ICON (status_icon), tooltip); -#else - g_snprintf (tooltip, sizeof(tooltip), - _("Processes: %u\n" - "CPU: %.0f%%\n" - "Memory: %s\n" - "Swap: %s"), - num_processes, cpu, memory_info, swap_info); - gtk_status_icon_set_tooltip (GTK_STATUS_ICON (status_icon), tooltip); -#endif } xtm_task_manager_update_model (task_manager); diff --git a/src/process-monitor.c b/src/process-monitor.c index 32bf747..bcd30e0 100644 --- a/src/process-monitor.c +++ b/src/process-monitor.c @@ -41,12 +41,8 @@ G_DEFINE_TYPE (XtmProcessMonitor, xtm_process_monitor, GTK_TYPE_DRAWING_AREA) static void xtm_process_monitor_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec); static void xtm_process_monitor_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec); -#if GTK_CHECK_VERSION(3, 0, 0) static gboolean xtm_process_monitor_draw (GtkWidget *widget, cairo_t *cr); -#else -static gboolean xtm_process_monitor_expose (GtkWidget *widget, GdkEventExpose *event); -#endif -static void xtm_process_monitor_paint (XtmProcessMonitor *monitor, cairo_t *cr); +static void xtm_process_monitor_paint (XtmProcessMonitor *monitor, cairo_t *cr); @@ -58,11 +54,8 @@ xtm_process_monitor_class_init (XtmProcessMonitorClass *klass) xtm_process_monitor_parent_class = g_type_class_peek_parent (klass); class->get_property = xtm_process_monitor_get_property; class->set_property = xtm_process_monitor_set_property; -#if GTK_CHECK_VERSION(3, 0, 0) widget_class->draw = xtm_process_monitor_draw; -#else - widget_class->expose_event = xtm_process_monitor_expose; -#endif + g_object_class_install_property (class, PROP_STEP_SIZE, g_param_spec_float ("step-size", "StepSize", "Step size", 0.1f, G_MAXFLOAT, 1, G_PARAM_CONSTRUCT|G_PARAM_READWRITE)); g_object_class_install_property (class, PROP_TYPE, @@ -115,7 +108,6 @@ xtm_process_monitor_set_property (GObject *object, guint property_id, const GVal } } -#if GTK_CHECK_VERSION(3, 0, 0) static gboolean xtm_process_monitor_draw (GtkWidget *widget, cairo_t *cr) { @@ -129,24 +121,6 @@ xtm_process_monitor_draw (GtkWidget *widget, cairo_t *cr) xtm_process_monitor_paint (monitor, cr); return FALSE; } -#else -static gboolean -xtm_process_monitor_expose (GtkWidget *widget, GdkEventExpose *event __unused) -{ - XtmProcessMonitor *monitor = XTM_PROCESS_MONITOR (widget); - guint minimum_history_length; - cairo_t *cr; - - minimum_history_length = (guint)(widget->allocation.width / monitor->step_size); - if (monitor->history->len < minimum_history_length) - g_array_set_size (monitor->history, minimum_history_length + 1); - - cr = gdk_cairo_create (gtk_widget_get_window(GTK_WIDGET(monitor))); - xtm_process_monitor_paint (monitor, cr); - cairo_destroy (cr); - return FALSE; -} -#endif static cairo_surface_t * xtm_process_monitor_graph_surface_create (XtmProcessMonitor *monitor, gint width, gint height) @@ -218,13 +192,9 @@ xtm_process_monitor_paint (XtmProcessMonitor *monitor, cairo_t *cr) gint width, height; static const double dashed[] = {1.5}; gint i; -#if GTK_CHECK_VERSION(3, 0, 0) width = gtk_widget_get_allocated_width(GTK_WIDGET(monitor)); height = gtk_widget_get_allocated_height(GTK_WIDGET(monitor)); -#else - width = GTK_WIDGET (monitor)->allocation.width; - height = GTK_WIDGET (monitor)->allocation.height; -#endif + /* Don't draw anything if the graph is too small */ if (height < 3) return; diff --git a/src/process-statusbar.c b/src/process-statusbar.c index e1f069e..74e8544 100644 --- a/src/process-statusbar.c +++ b/src/process-statusbar.c @@ -81,15 +81,9 @@ xtm_process_statusbar_init (XtmProcessStatusbar *statusbar) GtkWidget *hbox, *hbox_cpu, *hbox_mem; statusbar->settings = xtm_settings_get_default (); -#if GTK_CHECK_VERSION(3, 0, 0) hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 16); hbox_cpu = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 16); hbox_mem = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 16); -#else - hbox = gtk_hbox_new (FALSE, 16); - hbox_cpu = gtk_hbox_new (FALSE, 16); - hbox_mem = gtk_hbox_new (FALSE, 16); -#endif statusbar->label_cpu = gtk_label_new (NULL); gtk_box_pack_start (GTK_BOX (hbox_cpu), statusbar->label_cpu, TRUE, FALSE, 0); @@ -133,11 +127,7 @@ xtm_process_statusbar_set_property (GObject *object, guint property_id, const GV XtmProcessStatusbar *statusbar = XTM_PROCESS_STATUSBAR (object); gchar *text; gchar *float_value; -#if GTK_CHECK_VERSION(3, 0, 0) GdkRGBA color; -#else - GdkColor color; -#endif switch (property_id) { @@ -146,13 +136,8 @@ xtm_process_statusbar_set_property (GObject *object, guint property_id, const GV float_value = rounded_float_value (statusbar->cpu, statusbar->settings); text = g_strdup_printf (_("CPU: %s%%"), float_value); gtk_label_set_text (GTK_LABEL (statusbar->label_cpu), text); -#if GTK_CHECK_VERSION(3, 0, 0) gdk_rgba_parse (&color, "#ff6e00"); gtk_widget_override_color (statusbar->label_cpu, GTK_STATE_NORMAL, &color); -#else - gdk_color_parse ("#ff6e00", &color); - gtk_widget_modify_fg (statusbar->label_cpu, GTK_STATE_NORMAL, &color); -#endif g_free (float_value); g_free (text); break; @@ -161,13 +146,8 @@ xtm_process_statusbar_set_property (GObject *object, guint property_id, const GV g_strlcpy(statusbar->memory, g_value_get_string (value), sizeof(statusbar->memory)); text = g_strdup_printf (_("Memory: %s"), statusbar->memory); gtk_label_set_text (GTK_LABEL (statusbar->label_memory), text); -#if GTK_CHECK_VERSION(3, 0, 0) gdk_rgba_parse (&color, "#ab1852"); gtk_widget_override_color (statusbar->label_memory, GTK_STATE_NORMAL, &color); -#else - gdk_color_parse ("#ab1852", &color); - gtk_widget_modify_fg (statusbar->label_memory, GTK_STATE_NORMAL, &color); -#endif g_free (text); break; diff --git a/src/process-window-gtk3.ui b/src/process-window-gtk3.ui deleted file mode 100644 index 42d0e77..0000000 --- a/src/process-window-gtk3.ui +++ /dev/null @@ -1,282 +0,0 @@ - - - - - - False - Task Manager - 490 - 465 - org.xfce.taskmanager - - - - - - True - False - vertical - - - True - False - False - 1 - - - True - False - True - gtk-about - - - False - True - - - - - False - True - False - 2 - - - True - False - 1 - 0.5 - - - True - True - • - gtk-find - gtk-clear - False - - - - - - - True - False - - - - - False - True - 0 - - - - - False - vertical - - - True - False - - - True - False - 6 - 3 - Warning, you are using the root account, you may harm your system. - - - - - False - False - 0 - - - - - True - False - - - False - True - 1 - - - - - False - False - 1 - - - - - True - True - vertical - 100 - True - - - True - False - vertical - - - True - False - - - True - False - True - False - 2 - 0 - none - - - - - - - - - True - True - 0 - - - - - True - False - True - False - 2 - 0 - none - - - - - - - - - True - True - 1 - - - - - True - True - 0 - - - - - - - - False - False - - - - - True - False - vertical - 6 - - - True - True - - - - - - True - True - 0 - - - - - True - False - end - 6 - 6 - 18 - - - True - False - <span foreground='#000000' background='#aed581'> </span> Starting task - True - - - False - True - 0 - - - - - True - False - <span foreground='#000000' background='#fff176'> </span> Changing task - True - - - False - True - 1 - - - - - True - False - <span foreground='#000000' background='#e57373'> </span> Terminating task - True - - - False - True - 2 - - - - - False - True - 1 - - - - - True - True - - - - - True - True - 2 - - - - - - diff --git a/src/process-window.c b/src/process-window.c index 504fcbe..a7aa2df 100644 --- a/src/process-window.c +++ b/src/process-window.c @@ -31,11 +31,7 @@ #include "settings.h" #include "task-manager.h" #include "process-window.h" -#if GTK_CHECK_VERSION(3, 0, 0) -#include "process-window-gtk3_ui.h" -#else #include "process-window_ui.h" -#endif #include "process-monitor.h" #include "process-tree-view.h" #include "process-statusbar.h" @@ -309,7 +305,6 @@ xtm_process_window_init (XtmProcessWindow *window) if (geteuid () == 0) { -#if GTK_CHECK_VERSION(3, 0, 0) GtkCssProvider *css_provider; css_provider = gtk_css_provider_new (); gtk_css_provider_load_from_data (css_provider, @@ -318,11 +313,6 @@ xtm_process_window_init (XtmProcessWindow *window) gtk_style_context_add_provider_for_screen (gdk_screen_get_default (), GTK_STYLE_PROVIDER (css_provider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); g_object_unref (css_provider); -#else - gtk_rc_parse_string ("style\"root-warning-style\"{bg[NORMAL]=\"#e53935\"\nfg[NORMAL]=\"#ffffff\"}\n" - "widget\"GtkWindow.*.root-warning\"style\"root-warning-style\"\n" - "widget\"GtkWindow.*.root-warning.GtkLabel\"style\"root-warning-style\""); -#endif gtk_widget_set_name (GTK_WIDGET (gtk_builder_get_object (window->builder, "root-warning-ebox")), "root-warning"); gtk_widget_show_all (GTK_WIDGET (gtk_builder_get_object (window->builder, "root-warning-box"))); } @@ -466,7 +456,6 @@ monitor_update_step_size (XtmProcessWindow *window) g_object_set (window->mem_monitor, "step-size", refresh_rate / 1000.0, NULL); } -#if !GTK_CHECK_VERSION(2,18,0) static void url_hook_about_dialog (GtkAboutDialog *dialog, const gchar *uri, gpointer user_data) { @@ -479,7 +468,6 @@ url_hook_about_dialog (GtkAboutDialog *dialog, const gchar *uri, gpointer user_d } g_free (command); } -#endif static void show_about_dialog (XtmProcessWindow *window) @@ -515,17 +503,11 @@ show_about_dialog (XtmProcessWindow *window) "the Free Software Foundation; either version 2 of the License, or\n" "(at your option) any later version.\n"; -#if !GTK_CHECK_VERSION(2,18,0) - gtk_about_dialog_set_url_hook (url_hook_about_dialog, NULL, NULL); -#endif gtk_show_about_dialog (GTK_WINDOW (window->window), "program-name", _("Task Manager"), "version", PACKAGE_VERSION, "copyright", "Copyright \302\251 2005-2019 The Xfce development team", "logo-icon-name", "org.xfce.taskmanager", -#if !GTK_CHECK_VERSION(3, 0, 0) - "icon-name", GTK_STOCK_ABOUT, -#endif "comments", _("Easy to use task manager"), "license", license, "authors", authors, diff --git a/src/process-window.ui b/src/process-window.ui index 4441260..42d0e77 100644 --- a/src/process-window.ui +++ b/src/process-window.ui @@ -1,7 +1,7 @@ + - - + False Task Manager @@ -9,9 +9,13 @@ 465 org.xfce.taskmanager - + + + + True False + vertical True @@ -22,7 +26,6 @@ True False - False True gtk-about @@ -33,10 +36,10 @@ + False True False 2 - False True @@ -48,12 +51,8 @@ True True • - True gtk-find gtk-clear - True - True - True False @@ -62,6 +61,7 @@ True + False @@ -72,8 +72,9 @@ - + False + vertical True @@ -95,7 +96,7 @@ - + True False @@ -113,28 +114,36 @@ - + True True + vertical 100 True - + True False + vertical - + True False - + True False + True + False 2 - False + 0 + none + + + True @@ -143,14 +152,20 @@ - + True False + True + False 2 - False + 0 + none + + + True @@ -162,7 +177,7 @@ True True - -1 + 0 @@ -175,16 +190,15 @@ - + True False + vertical 6 True True - automatic - automatic @@ -195,6 +209,60 @@ 0 + + + True + False + end + 6 + 6 + 18 + + + True + False + <span foreground='#000000' background='#aed581'> </span> Starting task + True + + + False + True + 0 + + + + + True + False + <span foreground='#000000' background='#fff176'> </span> Changing task + True + + + False + True + 1 + + + + + True + False + <span foreground='#000000' background='#e57373'> </span> Terminating task + True + + + False + True + 2 + + + + + False + True + 1 + + True diff --git a/src/settings-dialog-gtk3.ui b/src/settings-dialog-gtk3.ui deleted file mode 100644 index 3e7f327..0000000 --- a/src/settings-dialog-gtk3.ui +++ /dev/null @@ -1,438 +0,0 @@ - - - - - - False - 5 - Settings for Task Manager - False - True - True - gtk-preferences - normal - - - True - False - vertical - 2 - - - True - False - end - - - gtk-close - True - True - True - True - - - False - False - 0 - - - - - False - False - end - 0 - - - - - True - True - False - - - True - False - 6 - - - True - False - vertical - 6 - - - True - False - 0 - none - - - True - False - 6 - 12 - - - True - False - vertical - 6 - - - Show application icons - True - True - False - 0.5 - True - - - False - True - 0 - - - - - Show full command lines - True - True - False - 0.5 - True - - - False - False - 1 - - - - - Show values with more precision - True - True - False - 0.5 - True - - - False - False - 2 - - - - - Show processes as tree - True - True - False - 0.5 - True - - - False - False - 4 - - - - - True - False - 6 - - - True - False - Toolbar style: - - - False - False - 0 - - - - - - - - False - False - 6 - - - - - - - - - True - False - <b>Interface style</b> - True - - - - - False - False - 0 - - - - - True - False - 0 - none - - - True - False - 6 - 12 - - - True - False - vertical - 6 - - - Prompt for terminating tasks - True - True - False - 0.5 - True - - - False - False - 0 - - - - - Hide into the notification area - True - True - False - 0.5 - True - - - False - False - 1 - - - - - - - - - True - False - <b>Miscellaneous</b> - True - - - - - False - False - 1 - - - - - False - True - 0 - - - - - False - vertical - - - False - True - 6 - 1 - - - - - False - vertical - 6 - - - True - False - False - 0 - none - - - True - False - 6 - 12 - - - True - False - vertical - 6 - - - True - False - 6 - - - True - False - Refresh rate: - - - False - False - 0 - - - - - True - False - - - False - False - 1 - - - - - False - False - 0 - - - - - True - False - 0 - Columns: - - - False - False - 1 - - - - - True - False - 12 - - - True - True - never - never - in - - - True - True - - - - - - - - - - False - True - 2 - - - - - - - - - True - False - <b>Information</b> - True - - - - - False - True - 0 - - - - - False - True - 2 - - - - - - - True - False - Settings - - - False - - - - - - - - - - - - - - - - - False - True - 1 - - - - - - button-close - - - diff --git a/src/settings-dialog.c b/src/settings-dialog.c index 549c843..5eebc15 100644 --- a/src/settings-dialog.c +++ b/src/settings-dialog.c @@ -17,11 +17,7 @@ #include "settings.h" #include "settings-dialog.h" -#if GTK_CHECK_VERSION(3, 0, 0) -#include "settings-dialog-gtk3_ui.h" -#else #include "settings-dialog_ui.h" -#endif @@ -121,21 +117,13 @@ xtm_settings_dialog_init (XtmSettingsDialog *dialog) XtmToolbarStyle toolbar_style; box = GTK_WIDGET (gtk_builder_get_object (builder, "hbox-toolbar-style")); -#if GTK_CHECK_VERSION(2, 24, 1) combobox = gtk_combo_box_text_new (); -#else - combobox = gtk_combo_box_new_text (); -#endif gtk_box_pack_start (GTK_BOX (box), combobox, FALSE, FALSE, 0); gtk_widget_show (combobox); klass = g_type_class_ref (XTM_TYPE_TOOLBAR_STYLE); for (n = 0; n < klass->n_values; ++n) -#if GTK_CHECK_VERSION(2, 24, 1) gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combobox), _(klass->values[n].value_nick)); -#else - gtk_combo_box_append_text (GTK_COMBO_BOX (combobox), _(klass->values[n].value_nick)); -#endif g_type_class_unref (klass); g_object_get (dialog->settings, "toolbar-style", &toolbar_style, NULL); @@ -172,9 +160,6 @@ xtm_settings_dialog_show (GtkWidget *widget) g_return_if_fail (GTK_IS_WIDGET (XTM_SETTINGS_DIALOG (widget)->window)); gtk_widget_show (XTM_SETTINGS_DIALOG (widget)->window); gtk_window_present (GTK_WINDOW (XTM_SETTINGS_DIALOG (widget)->window)); -#if !GTK_CHECK_VERSION(3, 0, 0) - GTK_WIDGET_SET_FLAGS (widget, GTK_VISIBLE); -#endif } static void @@ -187,9 +172,6 @@ xtm_settings_dialog_hide (GtkWidget *widget) gtk_window_get_position (GTK_WINDOW (XTM_SETTINGS_DIALOG (widget)->window), &winx, &winy); gtk_widget_hide (XTM_SETTINGS_DIALOG (widget)->window); gtk_window_move (GTK_WINDOW (XTM_SETTINGS_DIALOG (widget)->window), winx, winy); -#if !GTK_CHECK_VERSION(3, 0, 0) - GTK_WIDGET_UNSET_FLAGS (widget, (guint)GTK_VISIBLE); -#endif } void diff --git a/src/settings-dialog.ui b/src/settings-dialog.ui index c11a85c..3e7f327 100644 --- a/src/settings-dialog.ui +++ b/src/settings-dialog.ui @@ -1,8 +1,9 @@ - + + - - + + False 5 Settings for Task Manager False @@ -10,39 +11,71 @@ True gtk-preferences normal - False - + True + False vertical 2 + + + True + False + end + + + gtk-close + True + True + True + True + + + False + False + 0 + + + + + False + False + end + 0 + + True True False - + True + False 6 - + True + False vertical 6 True + False 0 none True + False 6 12 - + True + False vertical 6 @@ -51,9 +84,12 @@ True True False + 0.5 True + False + True 0 @@ -63,6 +99,7 @@ True True False + 0.5 True @@ -77,6 +114,7 @@ True True False + 0.5 True @@ -91,6 +129,7 @@ True True False + 0.5 True @@ -100,12 +139,14 @@ - + True + False 6 True + False Toolbar style: @@ -131,6 +172,7 @@ True + False <b>Interface style</b> True @@ -145,16 +187,19 @@ True + False 0 none True + False 6 12 - + True + False vertical 6 @@ -163,6 +208,7 @@ True True False + 0.5 True @@ -177,6 +223,7 @@ True True False + 0.5 True @@ -192,6 +239,7 @@ True + False <b>Miscellaneous</b> True @@ -205,46 +253,56 @@ + False + True 0 - + + False vertical False + True 6 1 - + + False vertical 6 True False + False 0 none True + False 6 12 - + True + False vertical 6 - + True + False 6 True + False Refresh rate: @@ -256,6 +314,7 @@ True + False False @@ -273,6 +332,7 @@ True + False 0 Columns: @@ -285,6 +345,7 @@ True + False 12 @@ -297,12 +358,17 @@ True True + + + + False + True 2 @@ -313,17 +379,22 @@ True + False <b>Information</b> True + False + True 0 + False + True 2 @@ -332,6 +403,7 @@ True + False Settings @@ -351,33 +423,10 @@ - - 1 - - - - - True - end - - - gtk-close - True - True - True - True - - - False - False - 0 - - - False - end - 0 + True + 1