Author: stephan
Date: 2008-05-11 08:40:34 +0000 (Sun, 11 May 2008)
New Revision: 26943
Added:
xfce-mcs-plugins/branches/xfce-plugins-stephan/dialogs/appearance-settings/appearance-dialog.glade
Removed:
xfce-mcs-plugins/branches/xfce-plugins-stephan/dialogs/appearance-settings/dialog.glade
Modified:
xfce-mcs-plugins/branches/xfce-plugins-stephan/configure.ac.in
xfce-mcs-plugins/branches/xfce-plugins-stephan/dialogs/appearance-settings/Makefile.am
xfce-mcs-plugins/branches/xfce-plugins-stephan/dialogs/appearance-settings/main.c
Log:
Connect trivial properties to xfconf
Modified: xfce-mcs-plugins/branches/xfce-plugins-stephan/configure.ac.in
===================================================================
--- xfce-mcs-plugins/branches/xfce-plugins-stephan/configure.ac.in
2008-05-10 23:32:07 UTC (rev 26942)
+++ xfce-mcs-plugins/branches/xfce-plugins-stephan/configure.ac.in
2008-05-11 08:40:34 UTC (rev 26943)
@@ -57,6 +57,7 @@
XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.34])
XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [0])
XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0])
+XDT_CHECK_OPTIONAL_PACKAGE([GLADE], [libglade-2.0], [2.0.0])
dnl check for debugging support
Modified:
xfce-mcs-plugins/branches/xfce-plugins-stephan/dialogs/appearance-settings/Makefile.am
===================================================================
---
xfce-mcs-plugins/branches/xfce-plugins-stephan/dialogs/appearance-settings/Makefile.am
2008-05-10 23:32:07 UTC (rev 26942)
+++
xfce-mcs-plugins/branches/xfce-plugins-stephan/dialogs/appearance-settings/Makefile.am
2008-05-11 08:40:34 UTC (rev 26943)
@@ -2,11 +2,12 @@
xfce4_appearance_settings_SOURCES = \
main.c \
- ui-dialog.c ui-dialog.h
+ appearance-dialog.glade.h
xfce4_appearance_settings_CFLAGS = \
$(GTK_CFLAGS) \
$(GLIB_CFLAGS) \
+ $(GLADE_CFLAGS) \
$(DBUS_GLIB_CFLAGS) \
$(LIBXFCEGUI4_CFLAGS) \
$(XFCONF_CFLAGS) \
@@ -17,9 +18,24 @@
xfce4_appearance_settings_LDADD = \
$(GTK_LIBS) \
$(GLIB_LIBS) \
+ $(GLADE_LIBS) \
$(DBUS_GLIB_LIBS) \
$(LIBXFCEGUI4_LIBS) \
$(XFCONF_LIBS)
INCLUDES = \
-I${top_srcdir}
+
+if MAINTAINER_MODE
+
+BUILT_SOURCES = \
+appearance-dialog.glade.h
+
+appearance-dialog.glade.h: appearance-dialog.glade
+ exo-csource --static --name=appearance_dialog_glade $< >$@
+
+endif
+
+EXTRA_DIST = \
+ appearance-dialog.glade
+
Copied:
xfce-mcs-plugins/branches/xfce-plugins-stephan/dialogs/appearance-settings/appearance-dialog.glade
(from rev 26942,
xfce-mcs-plugins/branches/xfce-plugins-stephan/dialogs/appearance-settings/dialog.glade)
===================================================================
---
xfce-mcs-plugins/branches/xfce-plugins-stephan/dialogs/appearance-settings/appearance-dialog.glade
(rev 0)
+++
xfce-mcs-plugins/branches/xfce-plugins-stephan/dialogs/appearance-settings/appearance-dialog.glade
2008-05-11 08:40:34 UTC (rev 26943)
@@ -0,0 +1,515 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<!--Generated with glade3 3.4.2 on Sun May 11 09:15:49 2008 -->
+<glade-interface>
+ <requires lib="xfce4"/>
+ <widget class="GtkDialog" id="appearance-settings-dialog">
+ <property name="border_width">5</property>
+ <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="has_separator">False</property>
+ <child internal-child="vbox">
+ <widget class="GtkVBox" id="dialog-vbox1">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <widget class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <child>
+ <widget class="XfceHeading"
id="xfce-appearance-settings-heading">
+ <property name="visible">True</property>
+ <property name="icon_name">preferences-desktop-theme</property>
+ <property name="subtitle" translatable="yes">Change the looks
of your XFCE desktop</property>
+ <property name="title" translatable="yes">Appearance
Settings</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkNotebook" id="notebook1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <child>
+ <widget class="GtkHBox" id="hbox4">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkScrolledWindow" id="scrolledwindow1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="border_width">4</property>
+ <property
name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+ <property
name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <child>
+ <widget class="GtkIconView" id="themes-icon-view">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkVButtonBox" id="vbuttonbox1">
+ <property name="visible">True</property>
+ <property name="border_width">4</property>
+ <property name="spacing">4</property>
+ <property
name="layout_style">GTK_BUTTONBOX_START</property>
+ <child>
+ <widget class="GtkButton" id="button2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="label"
translatable="yes">gtk-edit</property>
+ <property name="use_stock">True</property>
+ <property name="response_id">0</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">_Themes</property>
+ <property name="use_underline">True</property>
+ </widget>
+ <packing>
+ <property name="type">tab</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox2">
+ <property name="visible">True</property>
+ <property name="spacing">8</property>
+ <child>
+ <widget class="GtkFrame" id="frame1">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <child>
+ <widget class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <widget class="GtkVBox" id="vbox3">
+ <property name="visible">True</property>
+ <property name="spacing">8</property>
+ <child>
+ <widget class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label"
translatable="yes">Select the default user-interface font:</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkFontButton"
id="gtk_fontname_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">True</property>
+ <property name="response_id">0</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes"><b>Style</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkFrame" id="frame2">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <child>
+ <widget class="GtkAlignment" id="alignment2">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <widget class="GtkVBox" id="vbox4">
+ <property name="visible">True</property>
+ <property name="spacing">8</property>
+ <child>
+ <widget class="GtkCheckButton"
id="xft_antialias_check_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label"
translatable="yes">_Enable Antialias</property>
+ <property
name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <property
name="draw_indicator">True</property>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox1">
+ <property name="visible">True</property>
+ <property name="spacing">8</property>
+ <child>
+ <widget class="GtkCheckButton"
id="xft_hinting_check_button">
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property name="label"
translatable="yes">_Enable Hinting</property>
+ <property
name="use_underline">True</property>
+ <property
name="response_id">0</property>
+ <property
name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property
name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkComboBox"
id="xft_hinting_combo_box">
+ <property
name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox3">
+ <property name="visible">True</property>
+ <property name="spacing">8</property>
+ <child>
+ <widget class="GtkCheckButton"
id="xft_rgba_check_button">
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property name="label"
translatable="yes">RGBA Subpixel Hinting</property>
+ <property
name="response_id">0</property>
+ <property
name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property
name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkComboBox"
id="xft_rgba_combo_box">
+ <property
name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes"><b>Antialias Fonts</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkFrame" id="frame3">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <child>
+ <widget class="GtkAlignment" id="alignment3">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <widget class="GtkHBox" id="hbox2">
+ <property name="visible">True</property>
+ <property name="spacing">8</property>
+ <child>
+ <widget class="GtkCheckButton"
id="xft_custom_dpi_check_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label"
translatable="yes">Custom DPI Settings</property>
+ <property name="response_id">0</property>
+ <property
name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkSpinButton"
id="xft_dpi_spin_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">96 48 160 1 10
10</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label7">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes"><b>DPI</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Font</property>
+ <property name="use_underline">True</property>
+ </widget>
+ <packing>
+ <property name="type">tab</property>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox5">
+ <property name="visible">True</property>
+ <property name="spacing">8</property>
+ <child>
+ <widget class="GtkFrame" id="frame4">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <child>
+ <widget class="GtkAlignment" id="alignment4">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <widget class="GtkVBox" id="vbox6">
+ <property name="visible">True</property>
+ <property name="spacing">8</property>
+ <child>
+ <widget class="GtkLabel" id="label9">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label"
translatable="yes">Select the toolbar style:</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkComboBox"
id="gtk_toolbar_style_combo_box">
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label8">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes"><b>Toolbar</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkFrame" id="frame5">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <child>
+ <widget class="GtkAlignment" id="alignment5">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <widget class="GtkVBox" id="vbox7">
+ <property name="visible">True</property>
+ <property name="spacing">8</property>
+ <child>
+ <widget class="GtkCheckButton"
id="gtk_caneditaccels_check_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label"
translatable="yes">Enable e_ditable menuaccelerators</property>
+ <property
name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <property
name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkCheckButton"
id="gtk_menu_images_check_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label"
translatable="yes">Enable menu-_images</property>
+ <property
name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <property
name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkCheckButton"
id="gtk_button_images_check_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label"
translatable="yes">Enable _button-images</property>
+ <property
name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <property
name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label10">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes"><b>Menu and Buttons</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">_Behaviour</property>
+ <property name="use_underline">True</property>
+ </widget>
+ <packing>
+ <property name="type">tab</property>
+ <property name="position">2</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <widget class="GtkHButtonBox" id="dialog-action_area1">
+ <property name="visible">True</property>
+ <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <child>
+ <widget class="GtkButton" id="button1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="label" translatable="yes">gtk-close</property>
+ <property name="use_stock">True</property>
+ <property name="response_id">0</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">GTK_PACK_END</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+</glade-interface>
Deleted:
xfce-mcs-plugins/branches/xfce-plugins-stephan/dialogs/appearance-settings/dialog.glade
Modified:
xfce-mcs-plugins/branches/xfce-plugins-stephan/dialogs/appearance-settings/main.c
===================================================================
---
xfce-mcs-plugins/branches/xfce-plugins-stephan/dialogs/appearance-settings/main.c
2008-05-10 23:32:07 UTC (rev 26942)
+++
xfce-mcs-plugins/branches/xfce-plugins-stephan/dialogs/appearance-settings/main.c
2008-05-11 08:40:34 UTC (rev 26943)
@@ -27,12 +27,12 @@
#endif
#include <gtk/gtk.h>
+#include <glade/glade.h>
#include <libxfcegui4/libxfcegui4.h>
#include <xfconf/xfconf.h>
+#include "appearance-dialog.glade.h"
-#include "ui-dialog.h"
-
gboolean version = FALSE;
static GOptionEntry entries[] =
@@ -44,10 +44,47 @@
{ NULL }
};
+GtkWidget *
+appearance_settings_dialog_new_from_xml (GladeXML *gxml)
+{
+ XfconfChannel *xsettings_channel = xfconf_channel_new("xsettings");
+ GtkWidget *can_edit_accels = glade_xml_get_widget (gxml,
"gtk_caneditaccels_check_button");
+ GtkWidget *menu_images = glade_xml_get_widget (gxml,
"gtk_menu_images_check_button");
+ GtkWidget *button_images = glade_xml_get_widget (gxml,
"gtk_button_images_check_button");
+ GtkWidget *fontname_button = glade_xml_get_widget (gxml,
"gtk_fontname_button");
+
+ GtkWidget *antialias_check_button = glade_xml_get_widget (gxml,
"xft_antialias_check_button");
+
+
+ /* Bind easy properties */
+ xfconf_g_property_bind (xsettings_channel,
+ "/Gtk/CanChangeAccels",
+ G_TYPE_BOOLEAN,
+ (GObject *)can_edit_accels, "active");
+ xfconf_g_property_bind (xsettings_channel,
+ "/Gtk/MenuImages",
+ G_TYPE_BOOLEAN,
+ (GObject *)menu_images, "active");
+ xfconf_g_property_bind (xsettings_channel,
+ "/Gtk/ButtonImages",
+ G_TYPE_BOOLEAN,
+ (GObject *)button_images, "active");
+
+ xfconf_g_property_bind (xsettings_channel,
+ "/Gtk/FontName",
+ G_TYPE_STRING,
+ (GObject *)fontname_button, "font-name");
+
+ GtkWidget *dialog = glade_xml_get_widget (gxml,
"appearance-settings-dialog");
+ return dialog;
+}
+
int
main(int argc, char **argv)
{
+ GladeXML *gxml;
+ XfconfChannel *channel;
GError *cli_error = NULL;
#ifdef ENABLE_NLS
@@ -73,16 +110,15 @@
}
xfconf_init(NULL);
- GtkWidget *ui_dialog = g_object_new(UI_TYPE_DIALOG, NULL);
- gtk_widget_show_all(ui_dialog);
- ui_dialog_load_settings(UI_DIALOG(ui_dialog));
- gint result = gtk_dialog_run(GTK_DIALOG(ui_dialog));
- if (result == GTK_RESPONSE_APPLY)
- {
- gtk_widget_hide(ui_dialog);
- ui_dialog_save_settings(UI_DIALOG(ui_dialog));
- }
+ gxml = glade_xml_new_from_buffer (appearance_dialog_glade,
+ appearance_dialog_glade_length,
+ NULL, NULL);
+
+ GtkWidget *dialog = appearance_settings_dialog_new_from_xml (gxml);
+
+ gtk_dialog_run(dialog);
+
xfconf_shutdown();
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
