[g-a-devel]gnopernicus & gui design ...
- From: Michael Meeks <michael ximian com>
- To: Draghi Puterity <mp baum de>
- Cc: accessibility mailing list <gnome-accessibility-devel gnome org>
- Subject: [g-a-devel]gnopernicus & gui design ...
- Date: 22 Jan 2003 22:29:20 +0000
Hi guys,
It's demo time again :-) overall very pleased that with fairly minimial
effort and out of the box builds I'm getting nicely working
functionality again it seems.
Gnopernicus too is looking nice functionally; however the GUI appears
to be illegibly crunched up on my screen. I did an investigation of
this, and discovered the ultimate cause is the use of GtkFixed. While I
can see GtkFixed is very tempting for windows programmers - please
_never_ use it in Gtk+ programming. It's really not designed to be used,
particularly for what you're using it for. Instead you need to spend
some time re-working it for the containment system.
Otherwise - when your partially sighted person scales their fonts -
they suddenly won't be able to see anything ;-) rather a mis-feature.
The attached patch re-works the magnifier settings - I just hope there
arn't many more of these problems lurking; it also does:
* remove fixed widget width/heights - these are a similarly
aweful idea associated with GtkFixed, it should ~never be
necessary to assign a widget's width/height.
* Uses GtkDialog - it's better to use the standard dialog
widget than a custom version.
* bins several instances of:
if (path) g_free (path): redundant.
g_free has a NULL check builtin, so it should just be g_free
* fixes some 'level' accounting bugs in some cases
(delete_events etc.).
Beyond that the 'level' concept I see there concerns me greatly, what
is this for ? it looks like what you want is modality - which I believe
gives you extra WM support beyond transience. What is going on there,
and is this used elsewhere ?
Anyhow, overall very nice - patch attached,
Regards,
Michael.
--
mmeeks gnu org <><, Pseudo Engineer, itinerant idiot
? autom4te.cache
? draghi
? intltool-extract
? intltool-extract.in
? intltool-merge
? intltool-merge.in
? intltool-update
? intltool-update.in
? po
? brlmon/braille_fonts/fonts.dir
? docs/html/.cvsignore
? docs/sgml/SRL_init_term.sgml
? docs/sgml/object_index.sgml
? docs/sgml/tree_index.sgml
? gnopi/core.31869
? gnopi/festival_server.log
? gnopi/festival_server.log.Fri_Jun_21_16:16:15_BST_2002
? gnopi/festival_server.log.Thu_Aug__8_13:55:50_BST_2002
? gnopi/festival_server.scm
? gnopi/festival_sleep_pid
? gnopi/festival_wrapper_pid
? gnopi/gnopernicus.desktop
? gnopi/gnopi_files/Find/Makefile
? gnopi/gnopi_files/Find/Makefile.in
? gnopi/gnopi_files/Language/Makefile
? gnopi/gnopi_files/Language/Makefile.in
? gnopi/gnopi_files/Magnifier_Settings/magnifier_settings.glade2p
? help/Makefile
? help/Makefile.in
? help/braille_monitor/Makefile
? help/braille_monitor/Makefile.in
? help/braille_monitor/C/Makefile
? help/braille_monitor/C/Makefile.in
? help/braille_monitor/C/brlmonitor-C.omf.out
? help/braille_monitor/C/omf_timestamp
? help/gnopernicus/Makefile
? help/gnopernicus/Makefile.in
? help/gnopernicus/C/Makefile
? help/gnopernicus/C/Makefile.in
? help/gnopernicus/C/gnopernicus-C.omf.out
? help/gnopernicus/C/omf_timestamp
? magnifier/libmag/Magnifier-common.c
? magnifier/libmag/Magnifier-skels.c
? magnifier/libmag/Magnifier-stubs.c
? magnifier/libmag/Magnifier.h
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gnopernicus/ChangeLog,v
retrieving revision 1.124
diff -u -p -u -r1.124 ChangeLog
--- ChangeLog 21 Jan 2003 16:45:21 -0000 1.124
+++ ChangeLog 22 Jan 2003 22:27:51 -0000
@@ -1,3 +1,19 @@
+2003-01-22 Michael Meeks <michael ximian com>
+
+ * gnopi/magui.c (magui_magnification_options_ok_clicked),
+ (magui_magnification_options_cancel_clicked): fold into
+ (magui_magnification_options_response): to here.
+ (magui_magnifier_settings_cancel_clicked),
+ (magui_magnifier_settings_ok_clicked): fold into
+ (magui_magnification_settings_response): here.
+ (magui_load_magnification_options_interface),
+ (magui_load_magnifier_settings_interface): use absolute
+ level values, not buggy arithmetic.
+ (magui_delete_emit_response_cancel): don't do silly
+ things on delete_event.
+ (magui_set_handlers_magnification_options),
+ (magui_set_handlers_magnifier_settings): upd.
+
2003-01-21 Draghi Puterity <mp baum de>
* speech/libsrs/spgs.c:
Index: gnopi/magui.c
===================================================================
RCS file: /cvs/gnome/gnopernicus/gnopi/magui.c,v
retrieving revision 1.29
diff -u -p -u -r1.29 magui.c
--- gnopi/magui.c 17 Jan 2003 08:30:35 -0000 1.29
+++ gnopi/magui.c 22 Jan 2003 22:27:51 -0000
@@ -113,7 +113,7 @@ magui_load_interface (const gchar *glade
if (g_file_test ( path , G_FILE_TEST_EXISTS|G_FILE_TEST_IS_REGULAR))
{
xml = glade_xml_new (path , window, NULL);
- if (path) g_free (path);
+ g_free (path);
if (!xml)
{
sru_warning (_("We could not load the interface!"));
@@ -122,12 +122,12 @@ magui_load_interface (const gchar *glade
}
else
{
- if (path) g_free (path);
+ g_free (path);
path = g_strdup_printf("%sgnopi_files/Magnifier_Settings/%s", GNOPI_GLADEDIR, glade_file);
if (g_file_test (path, G_FILE_TEST_EXISTS|G_FILE_TEST_IS_REGULAR))
{
xml = glade_xml_new (path , window, NULL);
- if (path) g_free (path);
+ g_free (path);
if (!xml)
{
sru_warning (_("We could not load the interface!"));
@@ -136,7 +136,7 @@ magui_load_interface (const gchar *glade
}
else
{
- if (path) g_free (path);
+ g_free (path);
if (g_file_test (glade_file ,G_FILE_TEST_EXISTS|G_FILE_TEST_IS_REGULAR))
{
xml = glade_xml_new (glade_file, window, NULL);
@@ -241,37 +241,29 @@ magui_save_magnifier_setting_value (Magn
}
void
-magui_magnifier_settings_ok_clicked(GtkButton *button,
- gpointer user_data)
+magui_magnification_settings_response (GtkDialog *dialog,
+ gint response_id,
+ gpointer user_data)
{
- if (level == LEVEL_MAGNIFIER)
- {
- level = LEVEL_MAGNIFIER - 1;
+ if (level != LEVEL_MAGNIFIER)
+ return;
+
+ level = LEVEL_MAGNIFIER - 1;
+ gtk_widget_hide (w_magnifier_settings);
+
+ if (response_id == GTK_RESPONSE_OK)
magui_save_magnifier_setting_value (magnifier_setting);
- gtk_widget_hide (w_magnifier_settings);
- if (mag_setting_clone_set)
- {
- magconf_setting_free (mag_setting_clone_set);
- mag_setting_clone_set = NULL;
- }
- }
-}
-void
-magui_magnifier_settings_cancel_clicked (GtkButton *button,
- gpointer user_data)
-{
- if (level == LEVEL_MAGNIFIER)
+ else
{
- level = LEVEL_MAGNIFIER - 1;
- gtk_widget_hide (w_magnifier_settings);
if (mag_setting_clone_set)
- {
magconf_save_zoomer_in_schema (DEFAULT_MAGNIFIER_SCHEMA,
mag_setting_clone_set);
- magconf_setting_free (mag_setting_clone_set);
- mag_setting_clone_set = NULL;
- }
+ }
+ if (mag_setting_clone_set)
+ {
+ magconf_setting_free (mag_setting_clone_set);
+ mag_setting_clone_set = NULL;
}
}
@@ -601,6 +593,16 @@ magui_row_activated_cb (GtkTreeView
}
}
+static gint
+magui_delete_emit_response_cancel (GtkDialog *dialog,
+ GdkEventAny *event,
+ gpointer data)
+{
+ gtk_dialog_response (GTK_DIALOG (dialog),
+ GTK_RESPONSE_CANCEL);
+ return TRUE; /* Do not destroy */
+}
+
void
magui_set_handlers_magnifier_settings(GladeXML *xml)
{
@@ -636,10 +638,12 @@ magui_set_handlers_magnifier_settings(Gl
glade_xml_signal_connect (xml, "on_w_magnifier_settings_remove",
GTK_SIGNAL_FUNC (magui_magnifier_settings_remove));
- glade_xml_signal_connect (xml, "on_bt_magnification_ok_clicked",
- GTK_SIGNAL_FUNC (magui_magnifier_settings_ok_clicked));
- glade_xml_signal_connect (xml, "on_bt_magnification_cancel_clicked",
- GTK_SIGNAL_FUNC (magui_magnifier_settings_cancel_clicked));
+
+ g_signal_connect (w_magnifier_settings, "response",
+ G_CALLBACK (magui_magnification_settings_response), NULL);
+ g_signal_connect (w_magnifier_settings, "delete_event",
+ G_CALLBACK (magui_delete_emit_response_cancel), NULL);
+
glade_xml_signal_connect (xml, "on_bt_options_clicked",
GTK_SIGNAL_FUNC (magui_options_clicked));
@@ -702,7 +706,7 @@ magui_set_handlers_magnifier_settings(Gl
gboolean
magui_load_magnifier_settings_interface (GtkWidget *parent_window)
{
- level++;
+ level = LEVEL_MAGNIFIER;
if (!w_magnifier_settings)
{
GladeXML *xml;
@@ -719,11 +723,10 @@ magui_load_magnifier_settings_interface
}
else
- level--;
+ level = LEVEL_MAGNIFIER - 1;
}
else
gtk_widget_show (w_magnifier_settings);
-
if (magnifier_setting) magconf_setting_free (magnifier_setting);
@@ -1002,27 +1005,23 @@ magui_magnification_options_save_changed
}
void
-magui_magnification_options_ok_clicked (GtkButton *button,
- gpointer user_data)
-{
- if (level == LEVEL_MAGNIFIER_OPTIONS_CURSORS)
- {
- level = LEVEL_MAGNIFIER_OPTIONS_CURSORS - 1;
- if (mag_setting_clone_opt)
- {
- magconf_setting_free (mag_setting_clone_opt);
- mag_setting_clone_opt = NULL;
- }
+magui_magnification_options_response (GtkDialog *dialog,
+ gint response_id,
+ gpointer user_data)
+{
+ if (level != LEVEL_MAGNIFIER_OPTIONS_CURSORS)
+ return;
+
+ if (response_id == GTK_RESPONSE_OK)
+ {
+ if (mag_setting_clone_opt)
+ {
+ magconf_setting_free (mag_setting_clone_opt);
+ mag_setting_clone_opt = NULL;
+ }
magui_magnification_options_save_changed ();
- gtk_widget_hide (w_magnification_options);
}
-}
-
-void
-magui_magnification_options_cancel_clicked (GtkButton *button,
- gpointer user_data)
-{
- if (level == LEVEL_MAGNIFIER_OPTIONS_CURSORS)
+ else
{
level = LEVEL_MAGNIFIER_OPTIONS_CURSORS - 1;
if (mag_setting_clone_opt)
@@ -1032,8 +1031,8 @@ magui_magnification_options_cancel_click
magconf_setting_free (mag_setting_clone_opt);
mag_setting_clone_opt = NULL;
}
- gtk_widget_hide (w_magnification_options);
}
+ gtk_widget_hide (w_magnification_options);
}
void
@@ -1451,10 +1450,11 @@ magui_set_handlers_magnification_options
GTK_SIGNAL_FUNC (magui_target_changed));
- glade_xml_signal_connect (xml, "on_bt_mag_option_ok_clicked",
- GTK_SIGNAL_FUNC (magui_magnification_options_ok_clicked));
- glade_xml_signal_connect (xml, "on_bt_mag_option_cancel_clicked",
- GTK_SIGNAL_FUNC (magui_magnification_options_cancel_clicked));
+ g_signal_connect (w_magnification_options, "response",
+ G_CALLBACK (magui_magnification_options_response), NULL);
+ g_signal_connect (w_magnification_options, "delete_event",
+ G_CALLBACK (magui_delete_emit_response_cancel), NULL);
+
glade_xml_signal_connect (xml, "on_w_mag_option_remove",
GTK_SIGNAL_FUNC (magui_magnification_options_remove));
glade_xml_signal_connect(xml,"on_color_border_color_set",
@@ -1496,7 +1496,8 @@ gboolean
magui_load_magnification_options_interface ()
{
gchar *zoomer_title;
- level++;
+
+ level = LEVEL_MAGNIFIER_OPTIONS_CURSORS;
if (!w_magnification_options)
{
GladeXML *xml;
@@ -1512,7 +1513,7 @@ magui_load_magnification_options_interfa
TRUE);
}
else
- level--;
+ level = LEVEL_MAGNIFIER;
}
else
gtk_widget_show (w_magnification_options);
@@ -1525,7 +1526,7 @@ magui_load_magnification_options_interfa
gtk_window_set_title (GTK_WINDOW (w_magnification_options), zoomer_title);
g_free (zoomer_title);
- if (selected_zoomer) g_free (selected_zoomer);
+ g_free (selected_zoomer);
selected_zoomer = NULL;
return TRUE;
Index: gnopi/gnopi_files/Magnifier_Settings/magnifier_settings.glade2
===================================================================
RCS file: /cvs/gnome/gnopernicus/gnopi/gnopi_files/Magnifier_Settings/magnifier_settings.glade2,v
retrieving revision 1.13
diff -u -p -u -r1.13 magnifier_settings.glade2
--- gnopi/gnopi_files/Magnifier_Settings/magnifier_settings.glade2 17 Jan 2003 08:30:46 -0000 1.13
+++ gnopi/gnopi_files/Magnifier_Settings/magnifier_settings.glade2 22 Jan 2003 22:27:51 -0000
@@ -4,57 +4,267 @@
<glade-interface>
<requires lib="gnome"/>
-<widget class="GtkWindow" id="w_magnifier_settings">
- <property name="width_request">380</property>
- <property name="height_request">286</property>
+<widget class="GtkDialog" id="w_magnifier_settings">
<property name="visible">True</property>
<property name="title" translatable="yes">Magnifier settings</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
<property name="modal">False</property>
<property name="resizable">False</property>
- <property name="destroy_with_parent">True</property>
- <signal name="remove" handler="on_w_magnifier_settings_remove" last_modification_time="Thu, 07 Nov 2002 09:02:12 GMT"/>
+ <property name="destroy_with_parent">False</property>
+ <property name="has_separator">True</property>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Magnifier settings</atkproperty>
+ </accessibility>
- <child>
- <widget class="GtkFixed" id="fixed2">
+ <child internal-child="vbox">
+ <widget class="GtkVBox" id="dialog-vbox1">
<property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <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="cancelbutton1">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-cancel</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="response_id">-6</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="okbutton1">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-ok</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="response_id">-5</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">GTK_PACK_END</property>
+ </packing>
+ </child>
<child>
- <widget class="GtkFrame" id="frame32">
- <property name="width_request">180</property>
- <property name="height_request">230</property>
+ <widget class="GtkHBox" id="hbox54">
<property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.5</property>
- <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
<child>
- <widget class="GtkVBox" id="vbox42">
+ <widget class="GtkVBox" id="vbox43">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow1">
- <property name="border_width">4</property>
- <property name="height_request">130</property>
+ <widget class="GtkFrame" id="frame33">
+ <property name="border_width">2</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
- <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+ <property name="label_xalign">0</property>
+ <property name="label_yalign">0.5</property>
+ <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
<child>
- <widget class="GtkTreeView" id="tv_zoomer_list">
+ <widget class="GtkVBox" id="vbox44">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="headers_visible">False</property>
- <property name="rules_hint">True</property>
- <property name="reorderable">False</property>
- <property name="enable_search">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkCheckButton" id="ck_cursor_on_off">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes"> Cursor on / off</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_ck_cursor_on_off_toggled" last_modification_time="Wed, 25 Sep 2002 15:12:57 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkCheckButton" id="ck_cursor_magnification">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes"> Cursor magnification:</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_ck_cursor_magnification_toggled" last_modification_time="Tue, 22 Oct 2002 04:34:10 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkHBox" id="hbox55">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkLabel" id="lb_cursor_size">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Cursor size:</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.01</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">1</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkSpinButton" id="sp_cursor_size">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="climb_rate">1</property>
+ <property name="digits">0</property>
+ <property name="numeric">False</property>
+ <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+ <property name="snap_to_ticks">False</property>
+ <property name="wrap">False</property>
+ <property name="adjustment">1 1 256 1 10 10</property>
+ <signal name="value_changed" handler="on_sp_cursor_size_value_changed" last_modification_time="Sun, 10 Nov 2002 14:18:02 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkHBox" id="hbox56">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkImage" id="im_cursor_color">
+ <property name="visible">True</property>
+ <property name="stock">gtk-select-color</property>
+ <property name="icon_size">4</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="lb_cursor_color">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Cursor color:</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>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GnomeColorPicker" id="cp_cursor_color">
+ <property name="border_width">7</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="dither">True</property>
+ <property name="use_alpha">True</property>
+ <property name="title" translatable="yes">Pick a color</property>
+ <signal name="color_set" handler="on_cp_cursor_color_color_set" last_modification_time="Sun, 10 Nov 2002 13:56:46 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label57">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Cursor setting</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>
</widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
</child>
</widget>
<packing>
@@ -65,42 +275,93 @@
</child>
<child>
- <widget class="GtkHButtonBox" id="hbuttonbox1">
+ <widget class="GtkFrame" id="frame34">
+ <property name="border_width">2</property>
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
- <property name="spacing">0</property>
+ <property name="label_xalign">0</property>
+ <property name="label_yalign">0.5</property>
+ <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
<child>
- <widget class="GtkButton" id="bt_zoomer_add">
- <property name="border_width">1</property>
- <property name="width_request">40</property>
+ <widget class="GtkVBox" id="vbox45">
<property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <signal name="clicked" handler="on_bt_zoomer_add_clicked" last_modification_time="Wed, 13 Nov 2002 11:15:11 GMT"/>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
<child>
- <widget class="GtkAlignment" id="alignment6">
+ <widget class="GtkCheckButton" id="ck_crosswire">
+ <property name="border_width">2</property>
<property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Crosswire on / off</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_ck_crosswire_toggled" last_modification_time="Wed, 25 Sep 2002 15:12:57 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkCheckButton" id="ck_crosswire_clip">
+ <property name="border_width">2</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Crosswire clip on / off</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_ck_crosswire_clip_toggled" last_modification_time="Sun, 10 Nov 2002 13:54:54 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkHBox" id="hbox57">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
<child>
- <widget class="GtkHBox" id="hbox51">
+ <widget class="GtkFixed" id="fixed7">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">2</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkHBox" id="hbox58">
+ <property name="visible">True</property>
+ <property name="homogeneous">True</property>
+ <property name="spacing">0</property>
<child>
- <widget class="GtkImage" id="image16">
+ <widget class="GtkLabel" id="lb_crosswire_size">
<property name="visible">True</property>
- <property name="stock">gtk-add</property>
- <property name="icon_size">4</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
+ <property name="label" translatable="yes">Crosswire size:</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.7</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
@@ -112,284 +373,211 @@
</child>
<child>
- <widget class="GtkLabel" id="label53">
+ <widget class="GtkSpinButton" id="sp_crosswire_size">
+ <property name="width_request">0</property>
+ <property name="height_request">0</property>
<property name="visible">True</property>
- <property name="label" translatable="yes">Add/Modify</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="can_focus">True</property>
+ <property name="climb_rate">1</property>
+ <property name="digits">0</property>
+ <property name="numeric">False</property>
+ <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+ <property name="snap_to_ticks">False</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="adjustment">1 1 256 1 10 10</property>
+ <signal name="value_changed" handler="on_sp_crosswire_size_value_changed" last_modification_time="Sun, 10 Nov 2002 14:17:19 GMT"/>
</widget>
<packing>
<property name="padding">0</property>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">False</property>
</packing>
</child>
</widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
</child>
</widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
</child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkButton" id="bt_zoomer_remove">
- <property name="border_width">1</property>
- <property name="width_request">40</property>
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <signal name="clicked" handler="on_bt_zoomer_remove_clicked" last_modification_time="Wed, 13 Nov 2002 11:15:18 GMT"/>
<child>
- <widget class="GtkAlignment" id="alignment7">
+ <widget class="GtkHBox" id="hbox59">
+ <property name="height_request">36</property>
<property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
<child>
- <widget class="GtkHBox" id="hbox52">
+ <widget class="GtkImage" id="im_crosswire_color">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">2</property>
+ <property name="stock">gtk-select-color</property>
+ <property name="icon_size">4</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
- <child>
- <widget class="GtkImage" id="image17">
- <property name="visible">True</property>
- <property name="stock">gtk-remove</property>
- <property name="icon_size">4</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
+ <child>
+ <widget class="GtkLabel" id="lb_crosswire_color">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Crosswire color:</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.71</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
- <child>
- <widget class="GtkLabel" id="label54">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Remove</property>
- <property name="use_underline">True</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>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
+ <child>
+ <widget class="GnomeColorPicker" id="cp_crosswire_color">
+ <property name="border_width">7</property>
+ <property name="width_request">60</property>
+ <property name="height_request">35</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="dither">True</property>
+ <property name="use_alpha">True</property>
+ <property name="title" translatable="yes">Pick a color</property>
+ <signal name="color_set" handler="on_cp_crosswire_color_color_set" last_modification_time="Sun, 10 Nov 2002 13:55:35 GMT"/>
</widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">False</property>
+ </packing>
</child>
</widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
</child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- <child>
- <widget class="GtkEntry" id="et_zoomer_new">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">False</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
- <property name="activates_default">False</property>
- <signal name="changed" handler="on_et_zoomer_new_changed" last_modification_time="Wed, 13 Nov 2002 11:15:24 GMT"/>
- </widget>
- <packing>
- <property name="padding">3</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkLabel" id="lb_zoomer_list">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Zoomer list</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>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="x">194</property>
- <property name="y">10</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkFrame" id="frame25">
- <property name="border_width">2</property>
- <property name="width_request">185</property>
- <property name="height_request">100</property>
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.5</property>
- <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
- <child>
- <widget class="GtkVBox" id="vbox35">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkCheckButton" id="ck_cursor_on_off">
- <property name="width_request">160</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes"> Cursor on / off</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_ck_cursor_on_off_toggled" last_modification_time="Wed, 25 Sep 2002 15:12:57 GMT"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkCheckButton" id="ck_cursor_magnification">
- <property name="width_request">128</property>
- <property name="height_request">24</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes"> Cursor magnification:</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_ck_cursor_magnification_toggled" last_modification_time="Tue, 22 Oct 2002 04:34:10 GMT"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">False</property>
- </packing>
- </child>
+ <child>
+ <widget class="GtkHBox" id="hbox60">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
- <child>
- <widget class="GtkHBox" id="hbox43">
- <property name="visible">True</property>
- <property name="homogeneous">True</property>
- <property name="spacing">0</property>
+ <child>
+ <widget class="GtkCheckButton" id="ck_crosswire_color_invert">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Crosswire color inverted</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_ck_crosswire_color_invert_toggled" last_modification_time="Wed, 13 Nov 2002 10:10:57 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
<child>
- <widget class="GtkLabel" id="lb_cursor_size">
+ <widget class="GtkLabel" id="label60">
<property name="visible">True</property>
- <property name="label" translatable="yes">Cursor size:</property>
+ <property name="label" translatable="yes">Crosswire</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.01</property>
+ <property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
<packing>
- <property name="padding">6</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkSpinButton" id="sp_cursor_size">
- <property name="width_request">0</property>
- <property name="height_request">0</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="climb_rate">1</property>
- <property name="digits">0</property>
- <property name="numeric">False</property>
- <property name="update_policy">GTK_UPDATE_ALWAYS</property>
- <property name="snap_to_ticks">False</property>
- <property name="wrap">False</property>
- <property name="adjustment">1 1 256 1 10 10</property>
- <signal name="value_changed" handler="on_sp_cursor_size_value_changed" last_modification_time="Sun, 10 Nov 2002 14:18:02 GMT"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">False</property>
+ <property name="type">label_item</property>
</packing>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
</packing>
</child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkFrame" id="frame35">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="label_yalign">0.5</property>
+ <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
<child>
- <widget class="GtkHBox" id="hbox35">
- <property name="height_request">36</property>
+ <widget class="GtkVBox" id="vbox46">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
- <widget class="GtkImage" id="im_cursor_color">
+ <widget class="GtkScrolledWindow" id="scrolledwindow2">
+ <property name="border_width">4</property>
<property name="visible">True</property>
- <property name="stock">gtk-select-color</property>
- <property name="icon_size">4</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="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
+ <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+ <child>
+ <widget class="GtkTreeView" id="tv_zoomer_list">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="headers_visible">False</property>
+ <property name="rules_hint">True</property>
+ <property name="reorderable">False</property>
+ <property name="enable_search">True</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
@@ -399,198 +587,612 @@
</child>
<child>
- <widget class="GtkLabel" id="lb_cursor_color">
+ <widget class="GtkHButtonBox" id="hbuttonbox2">
<property name="visible">True</property>
- <property name="label" translatable="yes">Cursor color:</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="layout_style">GTK_BUTTONBOX_SPREAD</property>
+ <property name="spacing">0</property>
</widget>
<packing>
<property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">False</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkHBox" id="hbox63">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkButton" id="bt_zoomer_add">
+ <property name="border_width">1</property>
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <signal name="clicked" handler="on_bt_zoomer_add_clicked" last_modification_time="Wed, 13 Nov 2002 11:15:11 GMT"/>
+
+ <child>
+ <widget class="GtkAlignment" id="alignment8">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+
+ <child>
+ <widget class="GtkHBox" id="hbox61">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">2</property>
+
+ <child>
+ <widget class="GtkImage" id="image20">
+ <property name="visible">True</property>
+ <property name="stock">gtk-add</property>
+ <property name="icon_size">4</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label61">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Add/Modify</property>
+ <property name="use_underline">True</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>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="bt_zoomer_remove">
+ <property name="border_width">1</property>
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <signal name="clicked" handler="on_bt_zoomer_remove_clicked" last_modification_time="Wed, 13 Nov 2002 11:15:18 GMT"/>
+
+ <child>
+ <widget class="GtkAlignment" id="alignment9">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+
+ <child>
+ <widget class="GtkHBox" id="hbox62">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">2</property>
+
+ <child>
+ <widget class="GtkImage" id="image21">
+ <property name="visible">True</property>
+ <property name="stock">gtk-remove</property>
+ <property name="icon_size">4</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label62">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Remove</property>
+ <property name="use_underline">True</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>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">3</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
</packing>
</child>
<child>
- <widget class="GnomeColorPicker" id="cp_cursor_color">
- <property name="border_width">7</property>
- <property name="width_request">60</property>
- <property name="height_request">25</property>
+ <widget class="GtkEntry" id="et_zoomer_new">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="dither">True</property>
- <property name="use_alpha">True</property>
- <property name="title" translatable="yes">Pick a color</property>
- <signal name="color_set" handler="on_cp_cursor_color_color_set" last_modification_time="Sun, 10 Nov 2002 13:56:46 GMT"/>
+ <property name="editable">False</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char" translatable="yes">*</property>
+ <property name="activates_default">False</property>
+ <signal name="changed" handler="on_et_zoomer_new_changed" last_modification_time="Wed, 13 Nov 2002 11:15:24 GMT"/>
</widget>
<packing>
<property name="padding">0</property>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
</widget>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label63">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Zoomer list</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>
+ </widget>
<packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">False</property>
+ <property name="type">label_item</property>
</packing>
</child>
</widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+</widget>
+
+<widget class="GtkDialog" id="w_mag_option">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Zoomer options</property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="modal">False</property>
+ <property name="resizable">False</property>
+ <property name="destroy_with_parent">False</property>
+ <property name="has_separator">True</property>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Zoomer options</atkproperty>
+ </accessibility>
+
+ <child internal-child="vbox">
+ <widget class="GtkVBox" id="dialog-vbox3">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child internal-child="action_area">
+ <widget class="GtkHButtonBox" id="dialog-action_area3">
+ <property name="visible">True</property>
+ <property name="layout_style">GTK_BUTTONBOX_END</property>
+
+ <child>
+ <widget class="GtkButton" id="cancelbutton3">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-cancel</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="response_id">-6</property>
+ </widget>
</child>
<child>
- <widget class="GtkLabel" id="lb_cursor_frame">
+ <widget class="GtkButton" id="okbutton3">
<property name="visible">True</property>
- <property name="label" translatable="yes">Cursor setting</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="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-ok</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="response_id">-5</property>
</widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
</child>
</widget>
<packing>
- <property name="x">8</property>
- <property name="y">8</property>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">GTK_PACK_END</property>
</packing>
</child>
<child>
- <widget class="GtkFrame" id="frame21">
- <property name="border_width">2</property>
- <property name="width_request">185</property>
- <property name="height_request">138</property>
+ <widget class="GtkTable" id="table1">
<property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.5</property>
- <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+ <property name="n_rows">3</property>
+ <property name="n_columns">2</property>
+ <property name="homogeneous">False</property>
+ <property name="row_spacing">0</property>
+ <property name="column_spacing">0</property>
<child>
- <widget class="GtkVBox" id="vbox_crosswire">
+ <widget class="GtkVBox" id="vbox47">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
- <widget class="GtkCheckButton" id="ck_crosswire">
- <property name="border_width">2</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Crosswire on / off</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_ck_crosswire_toggled" last_modification_time="Wed, 25 Sep 2002 15:12:57 GMT"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkCheckButton" id="ck_crosswire_clip">
+ <widget class="GtkFrame" id="frame14">
<property name="border_width">2</property>
+ <property name="width_request">160</property>
+ <property name="height_request">95</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Crosswire clip on / off</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_ck_crosswire_clip_toggled" last_modification_time="Sun, 10 Nov 2002 13:54:54 GMT"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHBox" id="hbox33">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkFixed" id="fixed6">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
+ <property name="label_xalign">0</property>
+ <property name="label_yalign">0.5</property>
+ <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
<child>
- <widget class="GtkHBox" id="hbox45">
+ <widget class="GtkAlignment" id="alignment4">
<property name="visible">True</property>
- <property name="homogeneous">True</property>
- <property name="spacing">0</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">1</property>
+ <property name="yscale">1</property>
<child>
- <widget class="GtkLabel" id="lb_crosswire_size">
+ <widget class="GtkVBox" id="vbox37">
<property name="visible">True</property>
- <property name="label" translatable="yes">Crosswire size:</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkHBox" id="hbox48">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkCheckButton" id="ck_lock_factor">
+ <property name="border_width">7</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">_Lock zoom factor</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_ck_lock_factor_toggled" last_modification_time="Tue, 24 Sep 2002 13:19:41 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkImage" id="image9">
+ <property name="visible">True</property>
+ <property name="stock">gtk-zoom-fit</property>
+ <property name="icon_size">4</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkHBox" id="hbox37">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkLabel" id="lb_zoomfactorx">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Zoom factor X:</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>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkSpinButton" id="sp_zoomfactor_x">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="climb_rate">1</property>
+ <property name="digits">0</property>
+ <property name="numeric">False</property>
+ <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+ <property name="snap_to_ticks">False</property>
+ <property name="wrap">False</property>
+ <property name="adjustment">1 1 16 1 10 10</property>
+ <signal name="changed" handler="on_sp_zoomfactor_x_changed" last_modification_time="Mon, 23 Sep 2002 17:06:14 GMT"/>
+ <signal name="value_changed" handler="on_sp_zoomfactor_x_value_changed" last_modification_time="Wed, 25 Sep 2002 10:06:04 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">5</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkHBox" id="hbox38">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkLabel" id="lb_zoomfactory">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Zoom factor Y:</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>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkSpinButton" id="sp_zoomfactor_y">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="climb_rate">1</property>
+ <property name="digits">0</property>
+ <property name="numeric">False</property>
+ <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+ <property name="snap_to_ticks">False</property>
+ <property name="wrap">False</property>
+ <property name="adjustment">1 1 16 1 10 10</property>
+ <signal name="changed" handler="on_sp_zoomfactor_y_changed" last_modification_time="Mon, 23 Sep 2002 17:06:18 GMT"/>
+ <signal name="value_changed" handler="on_sp_zoomfactor_y_value_changed" last_modification_time="Wed, 25 Sep 2002 10:07:43 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">5</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="lb_zoomfactor">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Zoomfactor</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>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkHBox" id="hbox64">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkFrame" id="frame31">
+ <property name="width_request">0</property>
+ <property name="height_request">39</property>
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="label_yalign">0.5</property>
+ <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+
+ <child>
+ <widget class="GtkCheckButton" id="ck_panning">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">_Panning</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_ck_panning_toggled" last_modification_time="Mon, 11 Nov 2002 16:47:11 GMT"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="lb_panning">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Panning</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.7</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
<packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="type">label_item</property>
</packing>
</child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkFrame" id="frame23">
+ <property name="width_request">75</property>
+ <property name="height_request">39</property>
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="label_yalign">0.5</property>
+ <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
<child>
- <widget class="GtkSpinButton" id="sp_crosswire_size">
- <property name="width_request">0</property>
- <property name="height_request">0</property>
+ <widget class="GtkCheckButton" id="ck_invert">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="climb_rate">1</property>
- <property name="digits">0</property>
- <property name="numeric">False</property>
- <property name="update_policy">GTK_UPDATE_ALWAYS</property>
- <property name="snap_to_ticks">False</property>
+ <property name="label" translatable="yes">_Invert</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_ck_invert_toggled" last_modification_time="Tue, 24 Sep 2002 14:50:39 GMT"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="lb_invert">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Invert</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="adjustment">1 1 256 1 10 10</property>
- <signal name="value_changed" handler="on_sp_crosswire_size_value_changed" last_modification_time="Sun, 10 Nov 2002 14:17:19 GMT"/>
+ <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>
</widget>
<packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">False</property>
+ <property name="type">label_item</property>
</packing>
</child>
</widget>
@@ -609,66 +1211,93 @@
</child>
<child>
- <widget class="GtkHBox" id="hbox34">
- <property name="height_request">36</property>
+ <widget class="GtkFrame" id="frame24">
+ <property name="border_width">2</property>
+ <property name="width_request">163</property>
+ <property name="height_request">40</property>
<property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
+ <property name="label_xalign">0</property>
+ <property name="label_yalign">0.5</property>
+ <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
<child>
- <widget class="GtkImage" id="im_crosswire_color">
+ <widget class="GtkVBox" id="vbox34">
<property name="visible">True</property>
- <property name="stock">gtk-select-color</property>
- <property name="icon_size">4</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="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkCombo" id="cb_smoothing">
+ <property name="visible">True</property>
+ <property name="value_in_list">False</property>
+ <property name="allow_empty">True</property>
+ <property name="case_sensitive">False</property>
+ <property name="enable_arrow_keys">True</property>
+ <property name="enable_arrows_always">False</property>
+
+ <child internal-child="entry">
+ <widget class="GtkEntry" id="et_smoothing">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char" translatable="yes">*</property>
+ <property name="activates_default">False</property>
+ <signal name="changed" handler="on_et_smoothing_changed" last_modification_time="Sun, 10 Nov 2002 13:57:43 GMT"/>
+ </widget>
+ </child>
+
+ <child internal-child="list">
+ <widget class="GtkList" id="combo-list2">
+ <property name="visible">True</property>
+ <property name="selection_mode">GTK_SELECTION_BROWSE</property>
+
+ <child>
+ <widget class="GtkListItem" id="listitem14">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">none</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkListItem" id="listitem15">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">bilinear</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
</widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
</child>
<child>
- <widget class="GtkLabel" id="lb_crosswire_color">
+ <widget class="GtkLabel" id="lb_smoothing">
<property name="visible">True</property>
- <property name="label" translatable="yes">Crosswire color:</property>
+ <property name="label" translatable="yes">Smoothing</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.71</property>
+ <property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
<packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GnomeColorPicker" id="cp_crosswire_color">
- <property name="border_width">7</property>
- <property name="width_request">60</property>
- <property name="height_request">35</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="dither">True</property>
- <property name="use_alpha">True</property>
- <property name="title" translatable="yes">Pick a color</property>
- <signal name="color_set" handler="on_cp_crosswire_color_color_set" last_modification_time="Sun, 10 Nov 2002 13:55:35 GMT"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">False</property>
+ <property name="type">label_item</property>
</packing>
</child>
</widget>
@@ -680,163 +1309,97 @@
</child>
<child>
- <widget class="GtkHBox" id="hbox49">
+ <widget class="GtkFrame" id="frame26">
+ <property name="border_width">2</property>
+ <property name="width_request">163</property>
+ <property name="height_request">40</property>
<property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
+ <property name="label_xalign">0</property>
+ <property name="label_yalign">0.5</property>
+ <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
<child>
- <widget class="GtkCheckButton" id="ck_crosswire_color_invert">
+ <widget class="GtkVBox" id="vbox36">
<property name="visible">True</property>
- <property name="label" translatable="yes">Crosswire color inverted</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_ck_crosswire_color_invert_toggled" last_modification_time="Wed, 13 Nov 2002 10:10:57 GMT"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- </child>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
- <child>
- <widget class="GtkLabel" id="lb_crosswire_frame">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Crosswire</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>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="x">8</property>
- <property name="y">104</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHBox" id="hbox18">
- <property name="width_request">200</property>
- <property name="height_request">42</property>
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkButton" id="bt_magnification_cancel">
- <property name="border_width">5</property>
- <property name="width_request">79</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_focus">True</property>
- <property name="label">gtk-cancel</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <signal name="clicked" handler="on_bt_magnification_cancel_clicked"/>
- <accelerator key="C" modifiers="GDK_MOD1_MASK" signal="clicked"/>
- <accelerator key="Escape" modifiers="0" signal="clicked"/>
- </widget>
- <packing>
- <property name="padding">5</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
+ <child>
+ <widget class="GtkCombo" id="cb_mouse_tracking">
+ <property name="visible">True</property>
+ <property name="value_in_list">False</property>
+ <property name="allow_empty">True</property>
+ <property name="case_sensitive">False</property>
+ <property name="enable_arrow_keys">True</property>
+ <property name="enable_arrows_always">False</property>
- <child>
- <widget class="GtkButton" id="bt_magnification_ok">
- <property name="border_width">5</property>
- <property name="width_request">79</property>
- <property name="height_request">32</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-ok</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <signal name="clicked" handler="on_bt_magnification_ok_clicked"/>
- <accelerator key="O" modifiers="GDK_MOD1_MASK" signal="clicked"/>
- </widget>
- <packing>
- <property name="padding">5</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="x">200</property>
- <property name="y">240</property>
- </packing>
- </child>
- </widget>
- </child>
-</widget>
+ <child internal-child="entry">
+ <widget class="GtkEntry" id="et_mouse_tracking">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char" translatable="yes">*</property>
+ <property name="activates_default">False</property>
+ <signal name="changed" handler="on_et_mouse_tracking_changed" last_modification_time="Sun, 10 Nov 2002 13:58:00 GMT"/>
+ </widget>
+ </child>
-<widget class="GtkWindow" id="w_mag_option">
- <property name="width_request">345</property>
- <property name="height_request">290</property>
- <property name="visible">True</property>
- <property name="title" translatable="yes">Zoomer options</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
- <property name="resizable">False</property>
- <property name="destroy_with_parent">True</property>
- <signal name="remove" handler="on_w_mag_option_remove" last_modification_time="Fri, 08 Nov 2002 10:33:42 GMT"/>
+ <child internal-child="list">
+ <widget class="GtkList" id="combo-list1">
+ <property name="visible">True</property>
+ <property name="selection_mode">GTK_SELECTION_BROWSE</property>
- <child>
- <widget class="GtkFixed" id="fixed4">
- <property name="visible">True</property>
+ <child>
+ <widget class="GtkListItem" id="listitem60">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">push</property>
+ </widget>
+ </child>
- <child>
- <widget class="GtkFrame" id="frame30">
- <property name="width_request">150</property>
- <property name="height_request">70</property>
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.5</property>
- <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+ <child>
+ <widget class="GtkListItem" id="listitem61">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">centered</property>
+ </widget>
+ </child>
- <child>
- <widget class="GtkVBox" id="vbox41">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
+ <child>
+ <widget class="GtkListItem" id="listitem62">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">proportional</property>
+ </widget>
+ </child>
- <child>
- <widget class="GtkHBox" id="hbox46">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
+ <child>
+ <widget class="GtkListItem" id="listitem63">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">none</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
<child>
- <widget class="GtkLabel" id="lb_source">
- <property name="width_request">50</property>
+ <widget class="GtkLabel" id="lb_mouse_tracking">
<property name="visible">True</property>
- <property name="label" translatable="yes">Source</property>
+ <property name="label" translatable="yes">Mouse tracking</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -846,38 +1409,9 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
- <accessibility>
- <atkrelation target="et_source" type="label-for"/>
- </accessibility>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkEntry" id="et_source">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
- <property name="activates_default">False</property>
- <accessibility>
- <atkrelation target="lb_source" type="labelled-by"/>
- <atkrelation target="lb_display_screen" type="labelled-by"/>
- </accessibility>
- <signal name="activate" handler="on_et_source_activate" last_modification_time="Wed, 11 Dec 2002 09:27:14 GMT"/>
</widget>
<packing>
- <property name="padding">6</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="type">label_item</property>
</packing>
</child>
</widget>
@@ -887,18 +1421,167 @@
<property name="fill">True</property>
</packing>
</child>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">fill</property>
+ <property name="y_options">fill</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkVBox" id="vbox48">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
<child>
- <widget class="GtkHBox" id="hbox47">
+ <widget class="GtkFrame" id="frame19">
+ <property name="width_request">150</property>
+ <property name="height_request">79</property>
<property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
+ <property name="label_xalign">0</property>
+ <property name="label_yalign">0.5</property>
+ <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+
+ <child>
+ <widget class="GtkVBox" id="vbox33">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkHBox" id="hbox31">
+ <property name="border_width">2</property>
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkLabel" id="lb_border_size">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Border size:</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>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkSpinButton" id="sp_border_size">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="climb_rate">1</property>
+ <property name="digits">0</property>
+ <property name="numeric">True</property>
+ <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+ <property name="snap_to_ticks">False</property>
+ <property name="wrap">False</property>
+ <property name="adjustment">0 0 100 1 10 10</property>
+ <signal name="value_changed" handler="on_sp_border_size_value_changed" last_modification_time="Sun, 10 Nov 2002 17:08:35 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkHBox" id="hbox32">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkImage" id="image12">
+ <property name="visible">True</property>
+ <property name="stock">gtk-select-color</property>
+ <property name="icon_size">4</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="lb_border_color">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Border color:</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>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GnomeColorPicker" id="cp_border_color">
+ <property name="border_width">6</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="dither">True</property>
+ <property name="use_alpha">False</property>
+ <property name="title" translatable="yes">Pick a color</property>
+ <signal name="color_set" handler="on_color_border_color_set" last_modification_time="Mon, 23 Sep 2002 15:27:04 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
<child>
- <widget class="GtkLabel" id="lb_target">
- <property name="width_request">50</property>
+ <widget class="GtkLabel" id="lb_border_setting">
<property name="visible">True</property>
- <property name="label" translatable="yes">Target:</property>
+ <property name="label" translatable="yes">Border settings</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -908,37 +1591,9 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
- <accessibility>
- <atkrelation target="et_target" type="label-for"/>
- </accessibility>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkEntry" id="et_target">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
- <property name="activates_default">False</property>
- <accessibility>
- <atkrelation target="lb_target" type="labelled-by"/>
- </accessibility>
- <signal name="activate" handler="on_et_target_activate" last_modification_time="Wed, 11 Dec 2002 09:28:29 GMT"/>
</widget>
<packing>
- <property name="padding">6</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="type">label_item</property>
</packing>
</child>
</widget>
@@ -948,914 +1603,122 @@
<property name="fill">True</property>
</packing>
</child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkLabel" id="lb_display_screen">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Display screen</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>
- <accessibility>
- <atkrelation target="lb_target" type="label-for"/>
- <atkrelation target="lb_source" type="label-for"/>
- <atkrelation target="et_target" type="label-for"/>
- <atkrelation target="et_source" type="label-for"/>
- </accessibility>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="x">8</property>
- <property name="y">88</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkFrame" id="frame24">
- <property name="border_width">2</property>
- <property name="width_request">163</property>
- <property name="height_request">40</property>
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.5</property>
- <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
- <child>
- <widget class="GtkVBox" id="vbox34">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
<child>
- <widget class="GtkCombo" id="cb_smoothing">
+ <widget class="GtkFrame" id="frame30">
+ <property name="width_request">150</property>
+ <property name="height_request">70</property>
<property name="visible">True</property>
- <property name="value_in_list">False</property>
- <property name="allow_empty">True</property>
- <property name="case_sensitive">False</property>
- <property name="enable_arrow_keys">True</property>
- <property name="enable_arrows_always">False</property>
-
- <child internal-child="entry">
- <widget class="GtkEntry" id="et_smoothing">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
- <property name="activates_default">False</property>
- <signal name="changed" handler="on_et_smoothing_changed" last_modification_time="Sun, 10 Nov 2002 13:57:43 GMT"/>
- </widget>
- </child>
+ <property name="label_xalign">0</property>
+ <property name="label_yalign">0.5</property>
+ <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
- <child internal-child="list">
- <widget class="GtkList" id="combo-list2">
+ <child>
+ <widget class="GtkVBox" id="vbox41">
<property name="visible">True</property>
- <property name="selection_mode">GTK_SELECTION_BROWSE</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
<child>
- <widget class="GtkListItem" id="listitem14">
+ <widget class="GtkHBox" id="hbox46">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">none</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkLabel" id="lb_source">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Source</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>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkEntry" id="et_source">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char" translatable="yes">*</property>
+ <property name="activates_default">False</property>
+ <signal name="activate" handler="on_et_source_activate" last_modification_time="Wed, 11 Dec 2002 09:27:14 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">6</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
</widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
</child>
<child>
- <widget class="GtkListItem" id="listitem15">
+ <widget class="GtkHBox" id="hbox47">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">bilinear</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkLabel" id="lb_smoothing">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Smoothing</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>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="x">176</property>
- <property name="y">152</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkFrame" id="frame26">
- <property name="border_width">2</property>
- <property name="width_request">163</property>
- <property name="height_request">40</property>
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.5</property>
- <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
- <child>
- <widget class="GtkVBox" id="vbox36">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkCombo" id="cb_mouse_tracking">
- <property name="visible">True</property>
- <property name="value_in_list">False</property>
- <property name="allow_empty">True</property>
- <property name="case_sensitive">False</property>
- <property name="enable_arrow_keys">True</property>
- <property name="enable_arrows_always">False</property>
-
- <child internal-child="entry">
- <widget class="GtkEntry" id="et_mouse_tracking">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
- <property name="activates_default">False</property>
- <signal name="changed" handler="on_et_mouse_tracking_changed" last_modification_time="Sun, 10 Nov 2002 13:58:00 GMT"/>
- </widget>
- </child>
-
- <child internal-child="list">
- <widget class="GtkList" id="combo-list1">
- <property name="visible">True</property>
- <property name="selection_mode">GTK_SELECTION_BROWSE</property>
-
- <child>
- <widget class="GtkListItem" id="listitem60">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">push</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkListItem" id="listitem61">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">centered</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkListItem" id="listitem62">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">proportional</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkListItem" id="listitem63">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">none</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkLabel" id="lb_mouse_tracking">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Mouse tracking</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>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="x">176</property>
- <property name="y">200</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkFrame" id="frame13">
- <property name="width_request">150</property>
- <property name="height_request">105</property>
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.5</property>
- <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
- <child>
- <widget class="GtkVBox" id="vbox24">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
- <child>
- <widget class="GtkVBox" id="vbox38">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkHBox" id="hbox39">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkLabel" id="lb_zp_left">
- <property name="width_request">58</property>
- <property name="height_request">0</property>
- <property name="visible">True</property>
- <property name="label" translatable="yes">ZP left:</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>
- <accessibility>
- <atkrelation target="sp_zp_left" type="label-for"/>
- </accessibility>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkSpinButton" id="sp_zp_left">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="climb_rate">1</property>
- <property name="digits">0</property>
- <property name="numeric">False</property>
- <property name="update_policy">GTK_UPDATE_ALWAYS</property>
- <property name="snap_to_ticks">False</property>
- <property name="wrap">False</property>
- <property name="adjustment">1 0 1024 1 10 10</property>
- <accessibility>
- <atkrelation target="lb_zp_left" type="labelled-by"/>
- <atkrelation target="lb_zoomer_placement" type="labelled-by"/>
- </accessibility>
- <signal name="value_changed" handler="on_sp_zp_left_value_changed" last_modification_time="Sun, 10 Nov 2002 17:08:40 GMT"/>
- </widget>
- <packing>
- <property name="padding">4</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHBox" id="hbox40">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkLabel" id="lb_zp_top">
- <property name="width_request">58</property>
- <property name="height_request">0</property>
- <property name="visible">True</property>
- <property name="label" translatable="yes">ZP top:</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>
- <accessibility>
- <atkrelation target="sp_zp_top" type="label-for"/>
- </accessibility>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkSpinButton" id="sp_zp_top">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="climb_rate">1</property>
- <property name="digits">0</property>
- <property name="numeric">False</property>
- <property name="update_policy">GTK_UPDATE_ALWAYS</property>
- <property name="snap_to_ticks">False</property>
- <property name="wrap">False</property>
- <property name="adjustment">1 0 1024 1 10 10</property>
- <accessibility>
- <atkrelation target="lb_zp_top" type="labelled-by"/>
- <atkrelation target="lb_zoomer_placement" type="labelled-by"/>
- </accessibility>
- <signal name="value_changed" handler="on_sp_zp_top_value_changed" last_modification_time="Sun, 10 Nov 2002 17:08:44 GMT"/>
- </widget>
- <packing>
- <property name="padding">4</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHBox" id="hbox41">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkLabel" id="lb_zp_width">
- <property name="width_request">58</property>
- <property name="height_request">0</property>
- <property name="visible">True</property>
- <property name="label" translatable="yes">ZP width:</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>
- <accessibility>
- <atkrelation target="sp_zp_width" type="label-for"/>
- </accessibility>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkSpinButton" id="sp_zp_width">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="climb_rate">1</property>
- <property name="digits">0</property>
- <property name="numeric">False</property>
- <property name="update_policy">GTK_UPDATE_ALWAYS</property>
- <property name="snap_to_ticks">False</property>
- <property name="wrap">False</property>
- <property name="adjustment">1 0 1024 1 10 10</property>
- <accessibility>
- <atkrelation target="lb_zp_width" type="labelled-by"/>
- <atkrelation target="lb_zoomer_placement" type="labelled-by"/>
- </accessibility>
- <signal name="value_changed" handler="on_sp_zp_width_value_changed" last_modification_time="Sun, 10 Nov 2002 17:08:48 GMT"/>
- </widget>
- <packing>
- <property name="padding">4</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHBox" id="hbox42">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkLabel" id="lb_zp_height">
- <property name="width_request">58</property>
- <property name="height_request">0</property>
- <property name="visible">True</property>
- <property name="label" translatable="yes">ZP height:</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>
- <accessibility>
- <atkrelation target="sp_zp_height" type="label-for"/>
- </accessibility>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkSpinButton" id="sp_zp_height">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="climb_rate">1</property>
- <property name="digits">0</property>
- <property name="numeric">False</property>
- <property name="update_policy">GTK_UPDATE_ALWAYS</property>
- <property name="snap_to_ticks">False</property>
- <property name="wrap">False</property>
- <property name="adjustment">1 0 1024 1 10 10</property>
- <accessibility>
- <atkrelation target="lb_zp_height" type="labelled-by"/>
- <atkrelation target="lb_zoomer_placement" type="labelled-by"/>
- </accessibility>
- <signal name="value_changed" handler="on_sp_zp_height_value_changed" last_modification_time="Sun, 10 Nov 2002 17:08:54 GMT"/>
- </widget>
- <packing>
- <property name="padding">4</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkLabel" id="lb_zoomer_placement">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Zoomer placement</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>
- <accessibility>
- <atkrelation target="sp_zp_width" type="label-for"/>
- <atkrelation target="sp_zp_top" type="label-for"/>
- <atkrelation target="sp_zp_left" type="label-for"/>
- <atkrelation target="sp_zp_height" type="label-for"/>
- <atkrelation target="lb_zp_width" type="label-for"/>
- <atkrelation target="lb_zp_top" type="label-for"/>
- <atkrelation target="lb_zp_left" type="label-for"/>
- <atkrelation target="lb_zp_height" type="label-for"/>
- </accessibility>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="x">8</property>
- <property name="y">160</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkFrame" id="frame23">
- <property name="width_request">75</property>
- <property name="height_request">39</property>
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.5</property>
- <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
- <child>
- <widget class="GtkCheckButton" id="ck_invert">
- <property name="width_request">80</property>
- <property name="height_request">25</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">_Invert</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_ck_invert_toggled" last_modification_time="Tue, 24 Sep 2002 14:50:39 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkLabel" id="lb_invert">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Invert</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>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="x">256</property>
- <property name="y">112</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkFrame" id="frame31">
- <property name="width_request">0</property>
- <property name="height_request">39</property>
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.5</property>
- <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
- <child>
- <widget class="GtkCheckButton" id="ck_panning">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">_Panning</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_ck_panning_toggled" last_modification_time="Mon, 11 Nov 2002 16:47:11 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkLabel" id="lb_panning">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Panning</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>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="x">176</property>
- <property name="y">112</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkFrame" id="frame19">
- <property name="width_request">150</property>
- <property name="height_request">79</property>
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.5</property>
- <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
- <child>
- <widget class="GtkVBox" id="vbox33">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkHBox" id="hbox31">
- <property name="border_width">2</property>
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkLabel" id="lb_border_size">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Border size:</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>
- <accessibility>
- <atkrelation target="sp_border_size" type="label-for"/>
- </accessibility>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkSpinButton" id="sp_border_size">
- <property name="width_request">20</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="climb_rate">1</property>
- <property name="digits">0</property>
- <property name="numeric">True</property>
- <property name="update_policy">GTK_UPDATE_ALWAYS</property>
- <property name="snap_to_ticks">False</property>
- <property name="wrap">False</property>
- <property name="adjustment">0 0 100 1 10 10</property>
- <accessibility>
- <atkrelation target="lb_border_size" type="labelled-by"/>
- <atkrelation target="lb_border_setting" type="labelled-by"/>
- </accessibility>
- <signal name="value_changed" handler="on_sp_border_size_value_changed" last_modification_time="Sun, 10 Nov 2002 17:08:35 GMT"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHBox" id="hbox32">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkImage" id="image12">
- <property name="visible">True</property>
- <property name="stock">gtk-select-color</property>
- <property name="icon_size">4</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="lb_border_color">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Border color:</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>
- <accessibility>
- <atkrelation target="cp_border_color" type="label-for"/>
- </accessibility>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GnomeColorPicker" id="cp_border_color">
- <property name="border_width">6</property>
- <property name="width_request">40</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="dither">True</property>
- <property name="use_alpha">False</property>
- <property name="title" translatable="yes">Pick a color</property>
- <accessibility>
- <atkrelation target="lb_border_setting" type="labelled-by"/>
- <atkrelation target="lb_border_color" type="labelled-by"/>
- </accessibility>
- <signal name="color_set" handler="on_color_border_color_set" last_modification_time="Mon, 23 Sep 2002 15:27:04 GMT"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkLabel" id="lb_border_setting">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Border settings</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>
- <accessibility>
- <atkrelation target="sp_border_size" type="label-for"/>
- <atkrelation target="lb_border_setting" type="label-for"/>
- <atkrelation target="lb_border_color" type="label-for"/>
- <atkrelation target="cp_border_color" type="label-for"/>
- </accessibility>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="x">8</property>
- <property name="y">7</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkFrame" id="frame14">
- <property name="border_width">2</property>
- <property name="width_request">160</property>
- <property name="height_request">95</property>
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.5</property>
- <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
- <child>
- <widget class="GtkAlignment" id="alignment4">
- <property name="width_request">170</property>
- <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>
-
- <child>
- <widget class="GtkVBox" id="vbox37">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkHBox" id="hbox48">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkCheckButton" id="ck_lock_factor">
- <property name="border_width">7</property>
- <property name="width_request">0</property>
- <property name="height_request">0</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">_Lock zoom factor</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_ck_lock_factor_toggled" last_modification_time="Tue, 24 Sep 2002 13:19:41 GMT"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
+ <child>
+ <widget class="GtkLabel" id="lb_target">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Target:</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>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
- <child>
- <widget class="GtkImage" id="image9">
- <property name="visible">True</property>
- <property name="stock">gtk-zoom-fit</property>
- <property name="icon_size">4</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
+ <child>
+ <widget class="GtkEntry" id="et_target">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char" translatable="yes">*</property>
+ <property name="activates_default">False</property>
+ <signal name="activate" handler="on_et_target_activate" last_modification_time="Wed, 11 Dec 2002 09:28:29 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">6</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
@@ -1864,91 +1727,270 @@
</packing>
</child>
</widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox37">
+ <widget class="GtkLabel" id="lb_display_screen">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkLabel" id="lb_zoomfactorx">
- <property name="width_request">0</property>
- <property name="height_request">0</property>
- <property name="visible">True</property>
- <property name="label" translatable="yes">Zoom factor X:</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>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkSpinButton" id="sp_zoomfactor_x">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="climb_rate">1</property>
- <property name="digits">0</property>
- <property name="numeric">False</property>
- <property name="update_policy">GTK_UPDATE_ALWAYS</property>
- <property name="snap_to_ticks">False</property>
- <property name="wrap">False</property>
- <property name="adjustment">1 1 16 1 10 10</property>
- <signal name="changed" handler="on_sp_zoomfactor_x_changed" last_modification_time="Mon, 23 Sep 2002 17:06:14 GMT"/>
- <signal name="value_changed" handler="on_sp_zoomfactor_x_value_changed" last_modification_time="Wed, 25 Sep 2002 10:06:04 GMT"/>
- </widget>
- <packing>
- <property name="padding">5</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
+ <property name="label" translatable="yes">Display screen</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>
</widget>
<packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="type">label_item</property>
</packing>
</child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkFrame" id="frame13">
+ <property name="width_request">150</property>
+ <property name="height_request">105</property>
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="label_yalign">0.5</property>
+ <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
<child>
- <widget class="GtkHBox" id="hbox38">
+ <widget class="GtkVBox" id="vbox24">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
- <widget class="GtkLabel" id="lb_zoomfactory">
- <property name="width_request">0</property>
- <property name="height_request">0</property>
+ <widget class="GtkVBox" id="vbox38">
<property name="visible">True</property>
- <property name="label" translatable="yes">Zoom factor Y:</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="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkHBox" id="hbox39">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkLabel" id="lb_zp_left">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">ZP left:</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>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkSpinButton" id="sp_zp_left">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="climb_rate">10</property>
+ <property name="digits">0</property>
+ <property name="numeric">False</property>
+ <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+ <property name="snap_to_ticks">False</property>
+ <property name="wrap">False</property>
+ <property name="adjustment">1 0 1024 1 10 10</property>
+ <signal name="value_changed" handler="on_sp_zp_left_value_changed" last_modification_time="Sun, 10 Nov 2002 17:08:40 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">4</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkHBox" id="hbox40">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkLabel" id="lb_zp_top">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">ZP top:</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>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkSpinButton" id="sp_zp_top">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="climb_rate">10</property>
+ <property name="digits">0</property>
+ <property name="numeric">False</property>
+ <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+ <property name="snap_to_ticks">False</property>
+ <property name="wrap">False</property>
+ <property name="adjustment">1 0 1024 1 10 10</property>
+ <signal name="value_changed" handler="on_sp_zp_top_value_changed" last_modification_time="Sun, 10 Nov 2002 17:08:44 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">4</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkHBox" id="hbox41">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkLabel" id="lb_zp_width">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">ZP width:</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>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkSpinButton" id="sp_zp_width">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="climb_rate">10</property>
+ <property name="digits">0</property>
+ <property name="numeric">False</property>
+ <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+ <property name="snap_to_ticks">False</property>
+ <property name="wrap">False</property>
+ <property name="adjustment">1 0 1024 1 10 10</property>
+ <signal name="value_changed" handler="on_sp_zp_width_value_changed" last_modification_time="Sun, 10 Nov 2002 17:08:48 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">4</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkHBox" id="hbox42">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkLabel" id="lb_zp_height">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">ZP height:</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>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkSpinButton" id="sp_zp_height">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="climb_rate">10</property>
+ <property name="digits">0</property>
+ <property name="numeric">False</property>
+ <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+ <property name="snap_to_ticks">False</property>
+ <property name="wrap">False</property>
+ <property name="adjustment">1 0 1024 1 10 10</property>
+ <signal name="value_changed" handler="on_sp_zp_height_value_changed" last_modification_time="Sun, 10 Nov 2002 17:08:54 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">4</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
@@ -1956,99 +1998,49 @@
<property name="fill">True</property>
</packing>
</child>
+ </widget>
+ </child>
- <child>
- <widget class="GtkSpinButton" id="sp_zoomfactor_y">
- <property name="width_request">0</property>
- <property name="height_request">0</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="climb_rate">1</property>
- <property name="digits">0</property>
- <property name="numeric">False</property>
- <property name="update_policy">GTK_UPDATE_ALWAYS</property>
- <property name="snap_to_ticks">False</property>
- <property name="wrap">False</property>
- <property name="adjustment">1 1 16 1 10 10</property>
- <signal name="changed" handler="on_sp_zoomfactor_y_changed" last_modification_time="Mon, 23 Sep 2002 17:06:18 GMT"/>
- <signal name="value_changed" handler="on_sp_zoomfactor_y_value_changed" last_modification_time="Wed, 25 Sep 2002 10:07:43 GMT"/>
- </widget>
- <packing>
- <property name="padding">5</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
+ <child>
+ <widget class="GtkLabel" id="lb_zoomer_placement">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Zoomer placement</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>
</widget>
<packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="type">label_item</property>
</packing>
</child>
</widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
</child>
</widget>
- </child>
-
- <child>
- <widget class="GtkLabel" id="lb_zoomfactor">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Zoomfactor</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>
- </widget>
<packing>
- <property name="type">label_item</property>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">fill</property>
+ <property name="y_options">fill</property>
</packing>
</child>
</widget>
<packing>
- <property name="x">176</property>
- <property name="y">6</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="bt_mag_option_ok">
- <property name="width_request">72</property>
- <property name="height_request">32</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-ok</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <signal name="clicked" handler="on_bt_mag_option_ok_clicked" last_modification_time="Mon, 23 Sep 2002 17:30:54 GMT"/>
- </widget>
- <packing>
- <property name="x">264</property>
- <property name="y">248</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="bt_mag_option_cancel">
- <property name="width_request">80</property>
- <property name="height_request">32</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_focus">True</property>
- <property name="label">gtk-cancel</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <signal name="clicked" handler="on_bt_mag_option_cancel_clicked"/>
- <accelerator key="Escape" modifiers="0" signal="clicked"/>
- </widget>
- <packing>
- <property name="x">176</property>
- <property name="y">248</property>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
</packing>
</child>
</widget>
Index: srlow/libsrlow/SRLow.c
===================================================================
RCS file: /cvs/gnome/gnopernicus/srlow/libsrlow/SRLow.c,v
retrieving revision 1.32
diff -u -p -u -r1.32 SRLow.c
--- srlow/libsrlow/SRLow.c 5 Dec 2002 11:46:12 -0000 1.32
+++ srlow/libsrlow/SRLow.c 22 Jan 2003 22:27:51 -0000
@@ -949,6 +949,9 @@ report_event (const AccessibleEvent *eve
ev->type = g_strdup (event->type);
ev->detail1 = event->detail1;
ev->detail2 = event->detail2;
+
+ if (ev->type && !strcmp (ev->type, "focus:"))
+ g_warning ("Focus event on %p\n", ev->acc);
if (!queue)
queue = g_queue_new ();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
