Simplify settings dialog code
This commit is contained in:
Simon Steinbeiss
committed by
Simon Steinbeiß
Simon Steinbeiß
parent
f4e9726e20
commit
1addd38ce3
@@ -15,44 +15,16 @@
|
||||
#include <glib/gi18n.h>
|
||||
#include <gtk/gtk.h>
|
||||
|
||||
#include <libxfce4ui/libxfce4ui.h>
|
||||
|
||||
#include "settings.h"
|
||||
#include "settings-dialog.h"
|
||||
#include "settings-dialog_ui.h"
|
||||
|
||||
|
||||
|
||||
typedef struct _XtmSettingsDialogClass XtmSettingsDialogClass;
|
||||
struct _XtmSettingsDialogClass
|
||||
{
|
||||
GtkWidgetClass parent_class;
|
||||
};
|
||||
struct _XtmSettingsDialog
|
||||
{
|
||||
GtkWidget parent;
|
||||
/*<private>*/
|
||||
GtkWidget * window;
|
||||
XtmSettings * settings;
|
||||
};
|
||||
G_DEFINE_TYPE (XtmSettingsDialog, xtm_settings_dialog, GTK_TYPE_WIDGET)
|
||||
|
||||
static void xtm_settings_dialog_finalize (GObject *object);
|
||||
static void xtm_settings_dialog_show (GtkWidget *widget);
|
||||
static void xtm_settings_dialog_hide (GtkWidget *widget);
|
||||
static void show_about_dialog (GtkWidget *widget);
|
||||
static GtkWidget *xtm_settings_dialog_new (GtkBuilder *builder, GtkWidget *parent_window);
|
||||
|
||||
|
||||
static void
|
||||
xtm_settings_dialog_class_init (XtmSettingsDialogClass *klass)
|
||||
{
|
||||
GObjectClass *class;
|
||||
GtkWidgetClass *widget_class;
|
||||
xtm_settings_dialog_parent_class = g_type_class_peek_parent (klass);
|
||||
class = G_OBJECT_CLASS (klass);
|
||||
class->finalize = xtm_settings_dialog_finalize;
|
||||
widget_class = GTK_WIDGET_CLASS (klass);
|
||||
widget_class->show = xtm_settings_dialog_show;
|
||||
widget_class->hide = xtm_settings_dialog_hide;
|
||||
}
|
||||
|
||||
static void
|
||||
button_toggled (GtkToggleButton *button, XtmSettings *settings)
|
||||
@@ -76,14 +48,6 @@ builder_bind_toggle_button (GtkBuilder *builder, gchar *widget_name, XtmSettings
|
||||
g_signal_connect (button, "toggled", G_CALLBACK (button_toggled), settings);
|
||||
}
|
||||
|
||||
static void
|
||||
combobox_changed (GtkComboBox *combobox, XtmSettings *settings)
|
||||
{
|
||||
gint active = gtk_combo_box_get_active (combobox);
|
||||
gchar *setting_name = g_object_get_data (G_OBJECT (combobox), "setting-name");
|
||||
g_object_set (settings, setting_name, active, NULL);
|
||||
}
|
||||
|
||||
static void
|
||||
show_about_dialog (GtkWidget *widget)
|
||||
{
|
||||
@@ -132,79 +96,46 @@ show_about_dialog (GtkWidget *widget)
|
||||
NULL);
|
||||
}
|
||||
|
||||
static void
|
||||
xtm_settings_dialog_init (XtmSettingsDialog *dialog)
|
||||
static GtkWidget *
|
||||
xtm_settings_dialog_new (GtkBuilder *builder, GtkWidget *parent_window)
|
||||
{
|
||||
GtkBuilder *builder;
|
||||
GtkWidget *about;
|
||||
GtkWidget *dialog;
|
||||
GtkWidget *button;
|
||||
XtmSettings *settings;
|
||||
|
||||
g_object_ref_sink (dialog);
|
||||
|
||||
dialog->settings = xtm_settings_get_default ();
|
||||
|
||||
builder = gtk_builder_new ();
|
||||
gtk_builder_add_from_string (builder, settings_dialog_ui, settings_dialog_ui_length, NULL);
|
||||
|
||||
dialog->window = GTK_WIDGET (gtk_builder_get_object (builder, "settings-dialog"));
|
||||
settings = xtm_settings_get_default ();
|
||||
dialog = GTK_WIDGET (gtk_builder_get_object (builder, "settings-dialog"));
|
||||
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent_window));
|
||||
|
||||
#ifndef HAVE_WNCK
|
||||
gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (builder, "button-show-application-icons")));
|
||||
#endif
|
||||
|
||||
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-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-process-tree", dialog->settings, "process-tree");
|
||||
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-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");
|
||||
|
||||
about = GTK_WIDGET (gtk_builder_get_object (builder, "button-about"));
|
||||
g_signal_connect_swapped (about, "clicked", G_CALLBACK (show_about_dialog), dialog->window);
|
||||
button = GTK_WIDGET (gtk_builder_get_object (builder, "button-about"));
|
||||
g_signal_connect_swapped (button, "clicked", G_CALLBACK (show_about_dialog), dialog);
|
||||
|
||||
g_object_unref (builder);
|
||||
}
|
||||
|
||||
static void
|
||||
xtm_settings_dialog_finalize (GObject *object)
|
||||
{
|
||||
XtmSettingsDialog *dialog = XTM_SETTINGS_DIALOG (object);
|
||||
gtk_widget_destroy (dialog->window);
|
||||
g_object_unref (dialog->settings);
|
||||
}
|
||||
|
||||
|
||||
|
||||
GtkWidget *
|
||||
xtm_settings_dialog_new (GtkWindow *parent_window)
|
||||
{
|
||||
GtkWidget *dialog = g_object_new (XTM_TYPE_SETTINGS_DIALOG, NULL);
|
||||
gtk_window_set_transient_for (GTK_WINDOW (XTM_SETTINGS_DIALOG (dialog)->window), parent_window);
|
||||
return dialog;
|
||||
}
|
||||
|
||||
static void
|
||||
xtm_settings_dialog_show (GtkWidget *widget)
|
||||
{
|
||||
g_return_if_fail (GTK_IS_WIDGET (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));
|
||||
}
|
||||
|
||||
static void
|
||||
xtm_settings_dialog_hide (GtkWidget *widget)
|
||||
{
|
||||
gint winx, winy;
|
||||
g_return_if_fail (GTK_IS_WIDGET (widget));
|
||||
if (!GTK_IS_WIDGET (XTM_SETTINGS_DIALOG (widget)->window))
|
||||
return;
|
||||
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);
|
||||
}
|
||||
|
||||
void
|
||||
xtm_settings_dialog_run (XtmSettingsDialog *dialog)
|
||||
xtm_settings_dialog_run (GtkWidget *parent_window)
|
||||
{
|
||||
gtk_dialog_run (GTK_DIALOG (dialog->window));
|
||||
GtkBuilder *builder;
|
||||
GtkWidget *dialog;
|
||||
|
||||
builder = gtk_builder_new ();
|
||||
gtk_builder_add_from_string (builder, settings_dialog_ui, settings_dialog_ui_length, NULL);
|
||||
g_return_if_fail (GTK_IS_BUILDER (builder));
|
||||
|
||||
dialog = xtm_settings_dialog_new (builder, parent_window);
|
||||
|
||||
g_object_unref (builder);
|
||||
gtk_dialog_run (GTK_DIALOG (dialog));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user