[gnome-mag] Use gtkbuilder instead of glade
- From: Jaap A. Haitsma <jhaitsma src gnome org>
- To: svn-commits-list gnome org
- Subject: [gnome-mag] Use gtkbuilder instead of glade
- Date: Mon, 13 Jul 2009 19:14:36 +0000 (UTC)
commit ab5229314b642d3ec45237ae84f9c5798352f180
Author: Jaap A. Haitsma <jaap haitsma org>
Date: Mon Jul 13 08:50:27 2009 +0200
Use gtkbuilder instead of glade
Fixes bug 580186
Patch by Pedro Fragoso <ember ubuntu com>
colorblind/data/Makefile.am | 2 +-
colorblind/data/colorblind-prefs.glade | 658 ------------------------------
colorblind/data/colorblind-prefs.ui | 624 ++++++++++++++++++++++++++++
colorblind/ui/ColorblindPreferencesUI.py | 35 +-
configure.in | 2 +-
po/POTFILES.in | 2 +-
6 files changed, 645 insertions(+), 678 deletions(-)
---
diff --git a/colorblind/data/Makefile.am b/colorblind/data/Makefile.am
index 0cd8971..da531f1 100644
--- a/colorblind/data/Makefile.am
+++ b/colorblind/data/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = art
uidir = $(datadir)/colorblind
ui_DATA = \
Colorblind_Applet.xml \
- colorblind-prefs.glade
+ colorblind-prefs.ui
# *****************************************************************************
# GConf Schemas
diff --git a/colorblind/data/colorblind-prefs.ui b/colorblind/data/colorblind-prefs.ui
new file mode 100644
index 0000000..00d073b
--- /dev/null
+++ b/colorblind/data/colorblind-prefs.ui
@@ -0,0 +1,624 @@
+<?xml version="1.0"?>
+<!--*- mode: xml -*-->
+<interface>
+ <object class="GtkWindow" id="window_preferences">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Colorblind Filters Preferences</property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_CENTER</property>
+ <property name="modal">True</property>
+ <property name="resizable">True</property>
+ <property name="destroy_with_parent">False</property>
+ <property name="decorated">True</property>
+ <property name="skip_taskbar_hint">False</property>
+ <property name="skip_pager_hint">False</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+ <property name="gravity">GDK_GRAVITY_CENTER</property>
+ <property name="focus_on_map">True</property>
+ <property name="urgency_hint">False</property>
+ <accessibility>
+
+ </accessibility>
+ <child>
+ <object class="GtkVBox" id="vbox1">
+ <property name="border_width">5</property>
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">5</property>
+ <child>
+ <object class="GtkVBox" id="vbox2">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">5</property>
+ <child>
+ <object class="GtkVBox" id="vbox3">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+ <child>
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Filters</b></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </object>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">1</property>
+ <property name="yscale">1</property>
+ <property name="top_padding">0</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">10</property>
+ <property name="right_padding">0</property>
+ <child>
+ <object class="GtkVBox" id="vbox4">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+ <child>
+ <object class="GtkRadioButton" id="radio_filter_red_saturate">
+ <property name="visible">True</property>
+ <property name="tooltip-text" translatable="yes">This filter completely saturates the red color when this is the predominant pixel color in the image.</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Selective Red Saturation</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ <signal handler="on_radio_filter_red_saturate_toggled" last_modification_time="Tue, 01 May 2007 14:40:37 GMT" name="toggled"/>
+ </object>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="radio_filter_green_saturate">
+ <property name="visible">True</property>
+ <property name="tooltip-text" translatable="yes">This filter completely saturates the green color when this is the predominant pixel color in the image.</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Selective Green Saturation</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">radio_filter_red_saturate</property>
+ <signal handler="on_radio_filter_green_saturate_toggled" last_modification_time="Tue, 01 May 2007 14:40:47 GMT" name="toggled"/>
+ </object>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="radio_filter_blue_saturate">
+ <property name="visible">True</property>
+ <property name="tooltip-text" translatable="yes">This filter completely saturates the blue color when this is the predominant pixel color in the image.</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Selective Blue Saturation</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">radio_filter_red_saturate</property>
+ <signal handler="on_radio_filter_green_saturate_toggled" last_modification_time="Tue, 01 May 2007 14:40:47 GMT" name="toggled"/>
+ </object>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment3">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">1</property>
+ <property name="yscale">1</property>
+ <property name="top_padding">0</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">10</property>
+ <property name="right_padding">0</property>
+ <child>
+ <object class="GtkVBox" id="vbox5">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+ <child>
+ <object class="GtkRadioButton" id="radio_filter_red_desaturate">
+ <property name="visible">True</property>
+ <property name="tooltip-text" translatable="yes">This filter completely desaturates the red color when this is the predominant pixel color in the image.</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Selective Red Desaturation</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">radio_filter_red_saturate</property>
+ <signal handler="on_radio_filter_red_desaturate_toggled" last_modification_time="Tue, 01 May 2007 14:41:01 GMT" name="toggled"/>
+ </object>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="radio_filter_green_desaturate">
+ <property name="visible">True</property>
+ <property name="tooltip-text" translatable="yes">This filter completely desaturates the green color when this is the predominant pixel color in the image.</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Selective Green Desaturation</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">radio_filter_red_saturate</property>
+ <signal handler="on_radio_filter_green_desaturate_toggled" last_modification_time="Tue, 01 May 2007 14:41:07 GMT" name="toggled"/>
+ </object>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="radio_filter_blue_desaturate">
+ <property name="visible">True</property>
+ <property name="tooltip-text" translatable="yes">This filter completely desaturates the blue color when this is the predominant pixel color in the image.</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Selective Blue Desaturation</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">radio_filter_red_saturate</property>
+ <signal handler="on_radio_filter_blue_desaturate_toggled" last_modification_time="Tue, 01 May 2007 14:41:11 GMT" name="toggled"/>
+ </object>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment5">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">1</property>
+ <property name="yscale">1</property>
+ <property name="top_padding">0</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">10</property>
+ <property name="right_padding">0</property>
+ <child>
+ <object class="GtkVBox" id="vbox7">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+ <child>
+ <object class="GtkRadioButton" id="radio_filter_positive_hue_shift">
+ <property name="visible">True</property>
+ <property name="tooltip-text" translatable="yes">Transforms the colors Red to Green, Green to Blue and Blue to Red, carrying a potentially ambiguous set of colors to a different band of the spectrum.</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Positive Hue Shift</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">True</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">radio_filter_red_saturate</property>
+ <signal handler="on_radio_filter_positive_hue_shift_toggled" last_modification_time="Tue, 01 May 2007 14:41:16 GMT" name="toggled"/>
+ </object>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="radio_filter_negative_hue_shift">
+ <property name="visible">True</property>
+ <property name="tooltip-text" translatable="yes">Transforms the colors Red to Blue, Green to Red and Blue to Green, carrying a potentially ambiguous set of colors to a different band of the spectrum.</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Negative Hue Shift</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">radio_filter_red_saturate</property>
+ <signal handler="on_radio_filter_negative_hue_shift_toggled" last_modification_time="Tue, 01 May 2007 14:41:21 GMT" name="toggled"/>
+ </object>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox8">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+ <child>
+ <object class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Default Filter</b></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </object>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment7">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">1</property>
+ <property name="yscale">1</property>
+ <property name="top_padding">0</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">10</property>
+ <property name="right_padding">0</property>
+ <child>
+ <object class="GtkHBox" id="hbox_default">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">5</property>
+ <child>
+ <object class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Filter:</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </object>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment8">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">1</property>
+ <property name="yscale">1</property>
+ <property name="top_padding">0</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">40</property>
+ <property name="right_padding">0</property>
+ <child>
+ <object class="GtkLabel" id="label7">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><i>This is the filter that will be used when enabling/disabling the filters.</i></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment9">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">1</property>
+ <property name="yscale">1</property>
+ <property name="top_padding">0</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">10</property>
+ <property name="right_padding">0</property>
+ <child>
+ <object class="GtkCheckButton" id="check_default_filter">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Configure the filter being used as default when the filters are disabled.</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ <signal handler="on_check_default_filter_toggled" last_modification_time="Tue, 01 May 2007 14:42:10 GMT" name="toggled"/>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox9">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+ <child>
+ <object class="GtkLabel" id="label8">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Shortcut</b></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </object>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment10">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">1</property>
+ <property name="yscale">1</property>
+ <property name="top_padding">0</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">10</property>
+ <property name="right_padding">0</property>
+ <child>
+ <object class="GtkTable" id="table_shortcut">
+ <property name="visible">True</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">2</property>
+ <property name="homogeneous">False</property>
+ <property name="row_spacing">0</property>
+ <property name="column_spacing">5</property>
+ <child>
+ <object class="GtkLabel" id="label9">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Enable/Disable Filters:</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label10">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Select Next Filter:</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHButtonBox" id="hbuttonbox1">
+ <property name="visible">True</property>
+ <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="spacing">0</property>
+ <child>
+ <object class="GtkButton" id="button_close">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-close</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="a11y-window_preferences1">
+ <property name="AtkObject::accessible_name" translatable="yes">Colorblind Filters Preferences</property>
+ </object>
+ </child>
+ </object>
+</interface>
diff --git a/colorblind/ui/ColorblindPreferencesUI.py b/colorblind/ui/ColorblindPreferencesUI.py
index 4235182..43f0da2 100644
--- a/colorblind/ui/ColorblindPreferencesUI.py
+++ b/colorblind/ui/ColorblindPreferencesUI.py
@@ -2,7 +2,7 @@ from gettext import gettext as _
from os.path import join, isdir
import os
import struct
-import gtk, gtk.gdk, gtk.glade, gobject, gconf
+import gtk, gtk.gdk, gobject, gconf
import colorblind, colorblind.Utils, colorblind.ColorblindApplet
MAXINT = 2 ** ((8 * struct.calcsize('i')) - 1) - 1
@@ -195,18 +195,19 @@ class ColorblindPreferencesUI:
CB_FILTER_NO_FILTER, CB_FILTER_SELECTIVE_SATURATE_RED, CB_FILTER_SELECTIVE_SATURATE_GREEN, CB_FILTER_SELECTIVE_SATURATE_BLUE, CB_FILTER_SELECTIVE_DESATURATE_RED, CB_FILTER_SELECTIVE_DESATURATE_GREEN, CB_FILTER_SELECTIVE_DESATURATE_BLUE, CB_FILTER_POSITIVE_HUE_SHIFT, CB_FILTER_NEGATIVE_HUE_SHIFT = range (9)
def __init__(self, applet):
- self.glade = gtk.glade.XML(join(colorblind.SHARED_DATA_DIR, "colorblind-prefs.glade"))
-
- self.dialog = self.glade.get_widget("window_preferences")
- self.radio1 = self.glade.get_widget("radio_filter_red_saturate")
- self.radio2 = self.glade.get_widget("radio_filter_green_saturate")
- self.radio3 = self.glade.get_widget("radio_filter_blue_saturate")
- self.radio4 = self.glade.get_widget("radio_filter_red_desaturate")
- self.radio5 = self.glade.get_widget("radio_filter_green_desaturate")
- self.radio6 = self.glade.get_widget("radio_filter_blue_desaturate")
- self.radio7 = self.glade.get_widget("radio_filter_positive_hue_shift")
- self.radio8 = self.glade.get_widget("radio_filter_negative_hue_shift")
- self.hbox_default = self.glade.get_widget("hbox_default")
+ self.ui = gtk.Builder()
+ self.ui.add_from_file(join(colorblind.SHARED_DATA_DIR, "colorblind-prefs.ui"))
+
+ self.dialog = self.ui.get_object("window_preferences")
+ self.radio1 = self.ui.get_object("radio_filter_red_saturate")
+ self.radio2 = self.ui.get_object("radio_filter_green_saturate")
+ self.radio3 = self.ui.get_object("radio_filter_blue_saturate")
+ self.radio4 = self.ui.get_object("radio_filter_red_desaturate")
+ self.radio5 = self.ui.get_object("radio_filter_green_desaturate")
+ self.radio6 = self.ui.get_object("radio_filter_blue_desaturate")
+ self.radio7 = self.ui.get_object("radio_filter_positive_hue_shift")
+ self.radio8 = self.ui.get_object("radio_filter_negative_hue_shift")
+ self.hbox_default = self.ui.get_object("hbox_default")
self.combofilters = gtk.combo_box_new_text ()
self.hbox_default.add (self.combofilters)
self.combofilters.append_text (_("Selective Red Saturation"))
@@ -217,19 +218,19 @@ class ColorblindPreferencesUI:
self.combofilters.append_text (_("Selective Blue Desaturation"))
self.combofilters.append_text (_("Positive Hue Shift"))
self.combofilters.append_text (_("Negative Hue Shift"))
- self.check_default_filter = self.glade.get_widget("check_default_filter")
- self.button_close = self.glade.get_widget("button_close")
+ self.check_default_filter = self.ui.get_object("check_default_filter")
+ self.button_close = self.ui.get_object("button_close")
# Retreive current values
self.keybinding_on_off = colorblind.GCONF_CLIENT.get_string(applet.prefs.GCONF_KEYBINDING_ONOFF)
self.keyboard_shortcut_entry_on_off = AccelEntry("<Shift><Control>c", self)
self.keyboard_shortcut_entry_on_off.connect('accel-edited', self.on_keyboard_shortcut_entry_changed, colorblind.GCONF_KEYBINDING_ONOFF)
- self.glade.get_widget("table_shortcut").attach(self.keyboard_shortcut_entry_on_off.get_widget(), 1, 2, 0, 1)
+ self.ui.get_object("table_shortcut").attach(self.keyboard_shortcut_entry_on_off.get_widget(), 1, 2, 0, 1)
self.keybinding_switch = colorblind.GCONF_CLIENT.get_string(applet.prefs.GCONF_KEYBINDING_SWITCH)
self.keyboard_shortcut_entry_switch = AccelEntry("<Shift><Control>n", self)
self.keyboard_shortcut_entry_switch.connect('accel-edited', self.on_keyboard_shortcut_entry_changed, colorblind.GCONF_KEYBINDING_SWITCH)
- self.glade.get_widget("table_shortcut").attach(self.keyboard_shortcut_entry_switch.get_widget(), 1, 2, 1, 2)
+ self.ui.get_object("table_shortcut").attach(self.keyboard_shortcut_entry_switch.get_widget(), 1, 2, 1, 2)
colorblind.GCONF_CLIENT.notify_add (colorblind.GCONF_COLORBLIND_FILTER, self.sync_ui)
self.colorblind_filter = colorblind.GCONF_CLIENT.get_int(colorblind.GCONF_COLORBLIND_FILTER)
diff --git a/configure.in b/configure.in
index e568b0e..fe5d54e 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
dnl required versions of other tools.
m4_define([req_ver_glib], [1.3.11])
-m4_define([req_ver_gtk], [2.1.0])
+m4_define([req_ver_gtk], [2.12.0])
m4_define([req_ver_libbonobo], [1.107.0])
m4_define([req_ver_libspi], [0.12.1])
m4_define([req_ver_orbit], [2.3.100])
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 57931ae..f46a33a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,7 +3,7 @@ colorblind/GNOME_Magnifier_ColorblindApplet.server.in.in
colorblind/Keybinder.py
colorblind/data/colorblind-applet.schemas.in
colorblind/data/Colorblind_Applet.xml
-colorblind/data/colorblind-prefs.glade
+[type: gettext/glade]colorblind/data/colorblind-prefs.ui
colorblind/ui/WindowUI.py
colorblind/ui/About.py
colorblind/ui/ColorblindPreferencesUI.py
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
