diff options
| author | Eitan Isaacson <eitan@monotonous.org> | 2010-08-16 09:50:59 -0700 |
|---|---|---|
| committer | Eitan Isaacson <eitan@monotonous.org> | 2010-08-16 10:00:58 -0700 |
| commit | f55c465101446d1543be10e666f6de7a3647775f (patch) | |
| tree | 6b04011eac370de7242777df03304b06cd150c94 /data | |
| parent | 75ad6b94f583d55f30eac5cdab518dbec1c421ea (diff) | |
| download | caribou-f55c465101446d1543be10e666f6de7a3647775f.tar.gz | |
Allow user to change key font and size.
https://bugzilla.gnome.org/show_bug.cgi?id=622163
Diffstat (limited to 'data')
| -rw-r--r-- | data/caribou-prefs.ui | 67 | ||||
| -rw-r--r-- | data/caribou.schemas | 22 |
2 files changed, 44 insertions, 45 deletions
diff --git a/data/caribou-prefs.ui b/data/caribou-prefs.ui index 8ebb0d5..97fcec0 100644 --- a/data/caribou-prefs.ui +++ b/data/caribou-prefs.ui @@ -147,80 +147,57 @@ <property name="border_width">12</property> <property name="spacing">6</property> <child> - <object class="GtkVBox" id="vbox6"> + <object class="GtkTable" id="table2"> <property name="visible">True</property> - <property name="spacing">6</property> + <property name="n_rows">2</property> + <property name="n_columns">2</property> <child> <object class="GtkLabel" id="label_keysize"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Key _size:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">combobox_keysize</property> - <accessibility> - <relation type="label-for" target="combobox_keysize"/> - </accessibility> - </object> - <packing> - <property name="expand">False</property> - <property name="padding">6</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label_keyspacing"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Key s_pacing:</property> + <property name="label" translatable="yes">Key font:</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">combobox_keyspacing</property> <accessibility> - <relation type="label-for" target="combobox_keyspacing"/> + <relation type="label-for" target="key_font_button"/> </accessibility> </object> <packing> - <property name="expand">False</property> - <property name="padding">6</property> - <property name="position">1</property> + <property name="y_options">GTK_EXPAND</property> </packing> </child> - </object> - <packing> - <property name="expand">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkVBox" id="vbox7"> - <property name="visible">True</property> - <property name="spacing">6</property> <child> - <object class="GtkComboBox" id="combobox_keysize"> + <object class="GtkFontButton" id="key_font_button"> <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> <accessibility> <relation type="labelled-by" target="label_keysize"/> </accessibility> </object> <packing> - <property name="expand">False</property> - <property name="position">0</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="y_options">GTK_EXPAND</property> </packing> </child> <child> - <object class="GtkComboBox" id="combobox_keyspacing"> + <object class="GtkCheckButton" id="default_font_checkbox"> + <property name="label" translatable="yes">Use Defaults</property> <property name="visible">True</property> - <accessibility> - <relation type="labelled-by" target="label_keyspacing"/> - </accessibility> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="draw_indicator">True</property> </object> <packing> - <property name="expand">False</property> - <property name="position">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="y_options">GTK_EXPAND</property> </packing> </child> </object> <packing> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> </object> diff --git a/data/caribou.schemas b/data/caribou.schemas index e3f933e..70ab261 100644 --- a/data/caribou.schemas +++ b/data/caribou.schemas @@ -44,5 +44,27 @@ <long></long> </locale> </schema> + <schema> + <key>/schemas/apps/caribou/osk/key_font</key> + <applyto>/apps/caribou/osk/keyboard_font</applyto> + <owner>caribou</owner> + <type>string</type> + <default>Sans 12</default> + <locale name="C"> + <short>Custom font for keyboard/short> + <long></long> + </locale> + </schema> + <schema> + <key>/schemas/apps/caribou/osk/default_font</key> + <applyto>/apps/caribou/osk/default_font</applyto> + <owner>caribou</owner> + <type>bool</type> + <default>true</default> + <locale name="C"> + <short>Use the default system font for keyboard</short> + <long></long> + </locale> + </schema> </schemalist> </gconfschemafile> |