[Xfce4-commits] r27256 - in xfce4-settings/trunk: . dialogs/appearance-settings dialogs/keyboard-settings
Nick Schermer
nick at xfce.org
Fri Jul 11 21:05:56 CEST 2008
Author: nick
Date: 2008-07-11 19:05:55 +0000 (Fri, 11 Jul 2008)
New Revision: 27256
Modified:
xfce4-settings/trunk/ChangeLog
xfce4-settings/trunk/dialogs/appearance-settings/appearance-dialog.glade
xfce4-settings/trunk/dialogs/appearance-settings/main.c
xfce4-settings/trunk/dialogs/keyboard-settings/main.c
xfce4-settings/trunk/dialogs/keyboard-settings/shortcut-dialog.c
Log:
* dialogs/appearance-settings/main.c: Some code cleanups and
plug a stupid leak.
* dialogs/appearance-settings/appearance-dialog.glade: Redesign
the dialog a bit, a notebook inside a notebook is not practical.
* dialogs/keyboard-settings/main.c,
dialogs/keyboard-settings/shortcut-dialog.c: Fix includes to make
it compile.
Modified: xfce4-settings/trunk/ChangeLog
===================================================================
--- xfce4-settings/trunk/ChangeLog 2008-07-11 11:58:33 UTC (rev 27255)
+++ xfce4-settings/trunk/ChangeLog 2008-07-11 19:05:55 UTC (rev 27256)
@@ -1,3 +1,13 @@
+2008-07-11 Nick Schermer <nick at xfce.org>
+
+ * dialogs/appearance-settings/main.c: Some code cleanups and
+ plug a stupid leak.
+ * dialogs/appearance-settings/appearance-dialog.glade: Redesign
+ the dialog a bit, a notebook inside a notebook is not practical.
+ * dialogs/keyboard-settings/main.c,
+ dialogs/keyboard-settings/shortcut-dialog.c: Fix includes to make
+ it compile.
+
2008-07-11 Jannis Pohlmann <jannis at xfce.org>
* TODO: Add TODO file and fill it with the stuff that's still
Modified: xfce4-settings/trunk/dialogs/appearance-settings/appearance-dialog.glade
===================================================================
--- xfce4-settings/trunk/dialogs/appearance-settings/appearance-dialog.glade 2008-07-11 11:58:33 UTC (rev 27255)
+++ xfce4-settings/trunk/dialogs/appearance-settings/appearance-dialog.glade 2008-07-11 19:05:55 UTC (rev 27256)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Wed Jul 2 23:40:23 2008 -->
+<!--Generated with glade3 3.4.5 on Fri Jul 11 21:06:03 2008 -->
<glade-interface>
<requires lib="xfce4"/>
<widget class="XfceTitledDialog" id="appearance-settings-dialog">
@@ -13,540 +13,428 @@
<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">
+ <widget class="GtkNotebook" id="notebook1">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="border_width">6</property>
<child>
- <widget class="GtkNotebook" id="notebook1">
+ <widget class="GtkScrolledWindow" id="scrolledwindow2">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="border_width">6</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
<child>
- <widget class="GtkNotebook" id="notebook2">
+ <widget class="GtkTreeView" id="gtk_theme_treeview">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="border_width">12</property>
+ <property name="headers_visible">False</property>
+ <property name="headers_clickable">False</property>
+ <property name="show_expanders">False</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Style</property>
+ </widget>
+ <packing>
+ <property name="type">tab</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkScrolledWindow" id="scrolledwindow1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="border_width">6</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+ <child>
+ <widget class="GtkTreeView" id="icon_theme_treeview">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="headers_visible">False</property>
+ <property name="headers_clickable">False</property>
+ <property name="show_expanders">False</property>
+ </widget>
+ </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">Icons</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="vbox3">
+ <property name="visible">True</property>
+ <property name="border_width">6</property>
+ <property name="spacing">12</property>
+ <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="GtkVBox" id="vbox8">
+ <widget class="GtkAlignment" id="alignment3">
<property name="visible">True</property>
- <property name="border_width">6</property>
- <property name="spacing">6</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">18</property>
+ <property name="right_padding">6</property>
<child>
- <widget class="GtkLabel" id="label14">
+ <widget class="GtkFontButton" id="gtk_fontname_button">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes">Please select the UI-theme you want to use:</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow1">
- <property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <child>
- <widget class="GtkTreeView" id="gtk_theme_treeview">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="headers_visible">False</property>
- <property name="search_column">0</property>
- </widget>
- </child>
+ <property name="receives_default">True</property>
+ <property name="response_id">0</property>
+ <property name="title" translatable="yes">Select a default font</property>
</widget>
- <packing>
- <property name="position">1</property>
- </packing>
</child>
</widget>
</child>
<child>
- <widget class="GtkLabel" id="label12">
+ <widget class="GtkLabel" id="label7">
<property name="visible">True</property>
- <property name="label" translatable="yes">UI Theme</property>
+ <property name="label" translatable="yes"><b>Default Font</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="type">tab</property>
- <property name="tab_fill">False</property>
+ <property name="type">label_item</property>
</packing>
</child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
+ </child>
+ <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="GtkVBox" id="vbox9">
+ <widget class="GtkAlignment" id="alignment4">
<property name="visible">True</property>
- <property name="border_width">6</property>
- <property name="spacing">6</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">18</property>
+ <property name="right_padding">6</property>
<child>
- <widget class="GtkLabel" id="label13">
+ <widget class="GtkTable" id="table1">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes">Please select the icon-theme you want to use:</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow2">
- <property name="visible">True</property>
- <property name="can_focus">True</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>
+ <property name="n_rows">3</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">12</property>
+ <property name="row_spacing">6</property>
<child>
- <widget class="GtkTreeView" id="icon_theme_treeview">
+ <widget class="GtkCheckButton" id="xft_antialias_check_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="headers_visible">False</property>
- <property name="search_column">0</property>
+ <property name="label" translatable="yes">Enable _anti-aliasing</property>
+ <property name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <property name="inconsistent">True</property>
+ <property name="draw_indicator">True</property>
</widget>
+ <packing>
+ <property name="right_attach">2</property>
+ </packing>
</child>
+ <child>
+ <widget class="GtkLabel" id="label10">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Hinting:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">xft_hinting_style_combo_box</property>
+ </widget>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label11">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Sub-pixel order:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">xft_rgba_combo_box</property>
+ </widget>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkComboBox" id="xft_rgba_combo_box">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">If you have a TFT or LCD screen you can improve the quality of the fonts by choosing the correct sub-pixel order of your screen</property>
+ <property name="items" translatable="yes"></property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkComboBox" id="xft_hinting_style_combo_box">
+ <property name="visible">True</property>
+ <property name="items" translatable="yes"></property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ </packing>
+ </child>
</widget>
- <packing>
- <property name="position">1</property>
- </packing>
</child>
</widget>
- <packing>
- <property name="position">1</property>
- </packing>
</child>
<child>
- <widget class="GtkLabel" id="label15">
+ <widget class="GtkLabel" id="label8">
<property name="visible">True</property>
- <property name="label" translatable="yes">Icon Theme</property>
+ <property name="label" translatable="yes"><b>Rendering</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="type">tab</property>
- <property name="position">1</property>
- <property name="tab_fill">False</property>
+ <property name="type">label_item</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>
+ <property name="expand">False</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox2">
+ <widget class="GtkFrame" id="frame5">
<property name="visible">True</property>
- <property name="border_width">12</property>
- <property name="spacing">6</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
<child>
- <widget class="GtkFrame" id="frame1">
+ <widget class="GtkAlignment" id="alignment5">
<property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">18</property>
+ <property name="right_padding">6</property>
<child>
- <widget class="GtkAlignment" id="alignment1">
+ <widget class="GtkHBox" id="hbox1">
<property name="visible">True</property>
- <property name="bottom_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="spacing">12</property>
<child>
- <widget class="GtkVBox" id="vbox3">
+ <widget class="GtkCheckButton" id="xft_custom_dpi_check_button">
<property name="visible">True</property>
- <property name="border_width">6</property>
- <property name="spacing">6</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>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">gtk_fontname_button</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>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Custom _DPI setting:</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>
+ </packing>
</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="bottom_padding">6</property>
- <property name="left_padding">12</property>
<child>
- <widget class="GtkTable" id="table1">
+ <widget class="GtkSpinButton" id="xft_custom_dpi_spin_button">
<property name="visible">True</property>
- <property name="border_width">6</property>
- <property name="n_rows">3</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">12</property>
- <property name="row_spacing">6</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>
- <packing>
- <property name="right_attach">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkComboBox" id="xft_hinting_style_combo_box">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label16">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Hinting:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">xft_hinting_style_combo_box</property>
- </widget>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_SHRINK | GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkComboBox" id="xft_rgba_combo_box">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label17">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Subpixel order:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">xft_rgba_combo_box</property>
- </widget>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="adjustment">96 48 160 1 10 10</property>
+ <property name="snap_to_ticks">True</property>
+ <property name="numeric">True</property>
+ <property name="update_policy">GTK_UPDATE_IF_VALID</property>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
</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">
+ <widget class="GtkLabel" id="label9">
<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="border_width">6</property>
- <property name="spacing">12</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="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="GtkSpinButton" id="xft_custom_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>
+ <property name="label" translatable="yes"><b>DPI</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
+ <property name="type">label_item</property>
</packing>
</child>
</widget>
<packing>
- <property name="position">1</property>
+ <property name="expand">False</property>
+ <property name="position">2</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">Fonts</property>
+ </widget>
+ <packing>
+ <property name="type">tab</property>
+ <property name="position">2</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <property name="border_width">6</property>
+ <property name="spacing">12</property>
<child>
- <widget class="GtkLabel" id="label2">
+ <widget class="GtkFrame" id="frame2">
<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="border_width">12</property>
- <property name="spacing">6</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
<child>
- <widget class="GtkFrame" id="frame4">
+ <widget class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">18</property>
+ <property name="right_padding">6</property>
<child>
- <widget class="GtkAlignment" id="alignment4">
+ <widget class="GtkComboBox" id="gtk_toolbar_style_combo_box">
<property name="visible">True</property>
- <property name="bottom_padding">6</property>
- <property name="left_padding">12</property>
- <child>
- <widget class="GtkVBox" id="vbox6">
- <property name="visible">True</property>
- <property name="border_width">6</property>
- <property name="spacing">6</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>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">gtk_toolbar_style_combo_box</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>
+ <property name="items" translatable="yes"></property>
</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>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Toolbar Style</b></property>
+ <property name="use_markup">True</property>
+ </widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="type">label_item</property>
</packing>
</child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
+ </child>
+ <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="GtkFrame" id="frame5">
+ <widget class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">18</property>
+ <property name="right_padding">6</property>
<child>
- <widget class="GtkAlignment" id="alignment5">
+ <widget class="GtkVBox" id="vbox2">
<property name="visible">True</property>
- <property name="left_padding">12</property>
+ <property name="spacing">2</property>
<child>
- <widget class="GtkVBox" id="vbox7">
+ <widget class="GtkCheckButton" id="gtk_button_images_check_button">
<property name="visible">True</property>
- <property name="border_width">6</property>
- <property name="spacing">6</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>
+ <property name="can_focus">True</property>
+ <property name="tooltip" translatable="yes">Whether stock icons should be shown in buttons</property>
+ <property name="label" translatable="yes">Show images on _buttons</property>
+ <property name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
</widget>
</child>
+ <child>
+ <widget class="GtkCheckButton" id="gtk_menu_images_check_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip" translatable="yes">Whether images should be shown in menus</property>
+ <property name="label" translatable="yes">Show images in _menus</property>
+ <property name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkCheckButton" id="gtk_caneditaccels_check_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip" translatable="yes">Whether menu accelerators can be changed by pressing a key over the menu item</property>
+ <property name="label" translatable="yes">Enable e_ditable accelerators</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>
- <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>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Menus and Buttons</b></property>
+ <property name="use_markup">True</property>
+ </widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
+ <property name="type">label_item</property>
</packing>
</child>
</widget>
<packing>
- <property name="position">2</property>
+ <property name="expand">False</property>
+ <property name="position">1</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>
+ <property name="position">3</property>
</packing>
</child>
+ <child>
+ <widget class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Settings</property>
+ </widget>
+ <packing>
+ <property name="type">tab</property>
+ <property name="position">3</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="position">1</property>
Modified: xfce4-settings/trunk/dialogs/appearance-settings/main.c
===================================================================
--- xfce4-settings/trunk/dialogs/appearance-settings/main.c 2008-07-11 11:58:33 UTC (rev 27255)
+++ xfce4-settings/trunk/dialogs/appearance-settings/main.c 2008-07-11 19:05:55 UTC (rev 27256)
@@ -142,6 +142,9 @@
{
gint active;
+ /* Don't allow an inconsistent button anymore */
+ gtk_toggle_button_set_inconsistent (toggle, FALSE);
+
/* Get active */
active = gtk_toggle_button_get_active (toggle) ? 1 : 0;
@@ -174,29 +177,38 @@
}
static void
-cb_custom_dpi_check_button_toggled (GtkToggleButton *toggle, GtkWidget *custom_dpi_spin)
+cb_custom_dpi_spin_value_changed (GtkSpinButton *custom_dpi_spin,
+ GtkToggleButton *custom_dpi_toggle)
{
- if (gtk_toggle_button_get_active(toggle))
+ gint dpi;
+
+ if (gtk_toggle_button_get_active (custom_dpi_toggle))
{
- xfconf_channel_set_int (xsettings_channel, "/Xft/DPI", 96 * 1024);
- gtk_widget_set_sensitive (custom_dpi_spin, TRUE);
+ dpi = gtk_spin_button_get_value (custom_dpi_spin) * 1024;
+ xfconf_channel_set_int (xsettings_channel, "/Xft/DPI", dpi);
}
+}
+
+static void
+cb_custom_dpi_check_button_toggled (GtkToggleButton *custom_dpi_toggle,
+ GtkSpinButton *custom_dpi_spin)
+{
+ if (gtk_toggle_button_get_active (custom_dpi_toggle))
+ {
+ gtk_widget_set_sensitive (GTK_WIDGET (custom_dpi_spin), TRUE);
+ cb_custom_dpi_spin_value_changed (custom_dpi_spin, custom_dpi_toggle);
+ }
else
{
+ gtk_widget_set_sensitive (GTK_WIDGET (custom_dpi_spin), FALSE);
xfconf_channel_set_int (xsettings_channel, "/Xft/DPI", -1);
- gtk_widget_set_sensitive (custom_dpi_spin, FALSE);
}
}
static void
-cb_custom_dpi_spin_value_changed (GtkSpinButton *spin)
+appearance_settings_load_icon_themes (GtkListStore *list_store,
+ GtkTreeView *tree_view)
{
- xfconf_channel_set_int (xsettings_channel, "/Xft/DPI", (gint)(gtk_spin_button_get_value(spin)*1024));
-}
-
-static void
-check_icon_themes (GtkListStore *list_store, GtkTreeView *tree_view)
-{
GDir *dir;
GtkTreePath *tree_path;
GtkTreeIter iter;
@@ -298,7 +310,8 @@
}
static void
-check_ui_themes (GtkListStore *list_store, GtkTreeView *tree_view)
+appearance_settings_load_ui_themes (GtkListStore *list_store,
+ GtkTreeView *tree_view)
{
GDir *dir;
GtkTreePath *tree_path;
@@ -416,14 +429,14 @@
gint gtk_xft_hinting;
gint gtk_xft_antialias;
gint gtk_xft_dpi;
- gchar *gtk_xft_rgba;
- gchar *gtk_xft_hintstyle;
+ gchar *gtk_xft_rgba = NULL;
+ gchar *gtk_xft_hintstyle = NULL;
#endif
gboolean gtk_can_change_accels;
gboolean gtk_button_images;
- gchar *gtk_font_name;
- gchar *gtk_icon_theme_name;
- gchar *gtk_theme_name;
+ gchar *gtk_font_name = NULL;
+ gchar *gtk_icon_theme_name = NULL;
+ gchar *gtk_theme_name = NULL;
/* read the default gtk settings */
gtk_settings = gtk_settings_get_default ();
@@ -471,7 +484,7 @@
if (G_LIKELY (gtk_theme_name))
xfconf_channel_set_string (xsettings_channel, "/Net/ThemeName", gtk_theme_name);
-return;
+
/* cleanup */
g_free (gtk_font_name);
g_free (gtk_icon_theme_name);
@@ -516,7 +529,7 @@
renderer = gtk_cell_renderer_text_new ();
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (icon_theme_treeview), 0, "", renderer, "text", COLUMN_THEME_DISPLAY_NAME, NULL);
- check_icon_themes (list_store, GTK_TREE_VIEW (icon_theme_treeview));
+ appearance_settings_load_icon_themes (list_store, GTK_TREE_VIEW (icon_theme_treeview));
g_object_unref (G_OBJECT (list_store));
@@ -537,7 +550,7 @@
renderer = gtk_cell_renderer_text_new();
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (ui_theme_treeview), 0, "", renderer, "text", COLUMN_THEME_DISPLAY_NAME, NULL);
- check_ui_themes (list_store, GTK_TREE_VIEW (ui_theme_treeview));
+ appearance_settings_load_ui_themes (list_store, GTK_TREE_VIEW (ui_theme_treeview));
g_object_unref (G_OBJECT (list_store));
@@ -549,7 +562,7 @@
GtkWidget *rgba_combo_box = glade_xml_get_widget (gxml, "xft_rgba_combo_box");
list_store = gtk_list_store_new (N_RGBA_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING);
-
+
pixbuf = gdk_pixbuf_new_from_xpm_data (rgba_image_none_xpm);
gtk_list_store_insert_with_values (list_store, NULL, 0, COLUMN_RGBA_PIXBUF, pixbuf, COLUMN_RGBA_NAME, _("None"), -1);
g_object_unref (G_OBJECT (pixbuf));
@@ -563,14 +576,15 @@
g_object_unref (G_OBJECT (pixbuf));
pixbuf = gdk_pixbuf_new_from_xpm_data (rgba_image_vrgb_xpm);
- gtk_list_store_insert_with_values (list_store, NULL, 3, COLUMN_RGBA_PIXBUF, pixbuf, COLUMN_RGBA_NAME, _("VRGB"), -1);
+ gtk_list_store_insert_with_values (list_store, NULL, 3, COLUMN_RGBA_PIXBUF, pixbuf, COLUMN_RGBA_NAME, _("Vertical RGB"), -1);
g_object_unref (G_OBJECT (pixbuf));
pixbuf = gdk_pixbuf_new_from_xpm_data (rgba_image_vbgr_xpm);
- gtk_list_store_insert_with_values (list_store, NULL, 4, COLUMN_RGBA_PIXBUF, pixbuf, COLUMN_RGBA_NAME, _("VBGR"), -1);
+ gtk_list_store_insert_with_values (list_store, NULL, 4, COLUMN_RGBA_PIXBUF, pixbuf, COLUMN_RGBA_NAME, _("Vertical BGR"), -1);
g_object_unref (G_OBJECT (pixbuf));
renderer = gtk_cell_renderer_pixbuf_new ();
+ gtk_cell_layout_clear (GTK_CELL_LAYOUT (rgba_combo_box));
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (rgba_combo_box), renderer, FALSE);
gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (rgba_combo_box), renderer, "pixbuf", COLUMN_RGBA_PIXBUF);
@@ -581,7 +595,7 @@
gtk_combo_box_set_model (GTK_COMBO_BOX (rgba_combo_box), GTK_TREE_MODEL (list_store));
g_object_unref (G_OBJECT (list_store));
- string = xfconf_channel_get_string (xsettings_channel, "/Xft/RGBA", "none");
+ string = xfconf_channel_get_string (xsettings_channel, "/Xft/RGBA", xft_rgba_array[0]);
for (i = 0; i < G_N_ELEMENTS (xft_rgba_array); i++)
if (strcmp (string, xft_rgba_array[i]) == 0)
{
@@ -622,12 +636,13 @@
gtk_list_store_insert_with_values (list_store, NULL, 3, 0, N_("Both Horizontal"), -1);
renderer = gtk_cell_renderer_text_new ();
+ gtk_cell_layout_clear (GTK_CELL_LAYOUT (toolbar_style_combo));
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (toolbar_style_combo), renderer, TRUE);
gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (toolbar_style_combo), renderer, "text", 0);
gtk_combo_box_set_model (GTK_COMBO_BOX (toolbar_style_combo), GTK_TREE_MODEL (list_store));
g_object_unref (G_OBJECT (list_store));
- string = xfconf_channel_get_string (xsettings_channel, "/Gtk/ToolbarStyle", "both");
+ string = xfconf_channel_get_string (xsettings_channel, "/Gtk/ToolbarStyle", toolbar_styles_array[2]);
for (i = 0; i < G_N_ELEMENTS (toolbar_styles_array); i++)
if (strcmp (string, toolbar_styles_array[i]) == 0)
{
@@ -642,18 +657,19 @@
GtkWidget *hinting_style_combo = glade_xml_get_widget (gxml, "xft_hinting_style_combo_box");
list_store = gtk_list_store_new (1, G_TYPE_STRING);
- gtk_list_store_insert_with_values (list_store, NULL, 0, 0, N_("No Hinting"), -1);
- gtk_list_store_insert_with_values (list_store, NULL, 1, 0, N_("Slight Hinting"), -1);
- gtk_list_store_insert_with_values (list_store, NULL, 2, 0, N_("Medium Hinting"), -1);
- gtk_list_store_insert_with_values (list_store, NULL, 3, 0, N_("Full Hinting"), -1);
+ gtk_list_store_insert_with_values (list_store, NULL, 0, 0, N_("None"), -1);
+ gtk_list_store_insert_with_values (list_store, NULL, 1, 0, N_("Slight"), -1);
+ gtk_list_store_insert_with_values (list_store, NULL, 2, 0, N_("Medium"), -1);
+ gtk_list_store_insert_with_values (list_store, NULL, 3, 0, N_("Full"), -1);
renderer = gtk_cell_renderer_text_new ();
+ gtk_cell_layout_clear (GTK_CELL_LAYOUT (hinting_style_combo));
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (hinting_style_combo), renderer, TRUE);
gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (hinting_style_combo), renderer, "text", 0);
gtk_combo_box_set_model (GTK_COMBO_BOX (hinting_style_combo), GTK_TREE_MODEL (list_store));
g_object_unref (G_OBJECT (list_store));
- string = xfconf_channel_get_string (xsettings_channel, "/Xft/HintStyle", "hintnone");
+ string = xfconf_channel_get_string (xsettings_channel, "/Xft/HintStyle", xft_hint_styles_array[0]);
for (i = 0; i < G_N_ELEMENTS (xft_hint_styles_array); i++)
if (strcmp (string, xft_hint_styles_array[i]) == 0)
{
@@ -667,6 +683,7 @@
/* Hinting */
GtkWidget *antialias_check_button = glade_xml_get_widget (gxml, "xft_antialias_check_button");
gint antialias = xfconf_channel_get_int (xsettings_channel, "/Xft/Antialias", -1);
+ gtk_toggle_button_set_inconsistent (GTK_TOGGLE_BUTTON (antialias_check_button), antialias == -1);
switch (antialias)
{
@@ -694,6 +711,7 @@
{
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (custom_dpi_check), FALSE);
gtk_widget_set_sensitive (custom_dpi_spin, FALSE);
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (custom_dpi_spin), 96);
}
else
{
@@ -703,7 +721,7 @@
}
g_signal_connect (G_OBJECT (custom_dpi_check), "toggled", G_CALLBACK (cb_custom_dpi_check_button_toggled), custom_dpi_spin);
- g_signal_connect (G_OBJECT (custom_dpi_spin), "value-changed", G_CALLBACK (cb_custom_dpi_spin_value_changed), NULL);
+ g_signal_connect (G_OBJECT (custom_dpi_spin), "value-changed", G_CALLBACK (cb_custom_dpi_spin_value_changed), custom_dpi_check);
/* return dialog */
return glade_xml_get_widget (gxml, "appearance-settings-dialog");
Modified: xfce4-settings/trunk/dialogs/keyboard-settings/main.c
===================================================================
--- xfce4-settings/trunk/dialogs/keyboard-settings/main.c 2008-07-11 11:58:33 UTC (rev 27255)
+++ xfce4-settings/trunk/dialogs/keyboard-settings/main.c 2008-07-11 19:05:55 UTC (rev 27256)
@@ -25,7 +25,7 @@
#include <string.h>
#include <glib.h>
-
+#include <dbus/dbus-glib.h>
#include <gtk/gtk.h>
#include <glade/glade.h>
Modified: xfce4-settings/trunk/dialogs/keyboard-settings/shortcut-dialog.c
===================================================================
--- xfce4-settings/trunk/dialogs/keyboard-settings/shortcut-dialog.c 2008-07-11 11:58:33 UTC (rev 27255)
+++ xfce4-settings/trunk/dialogs/keyboard-settings/shortcut-dialog.c 2008-07-11 19:05:55 UTC (rev 27256)
@@ -25,6 +25,7 @@
#include <gtk/gtk.h>
#include <libxfce4util/libxfce4util.h>
+#include <libxfcegui4/libxfcegui4.h>
#include "shortcut-dialog.h"
More information about the Xfce4-commits
mailing list