diff options
| author | Don Scorgie <dscorgie@git.gnome.org> | 2009-04-28 19:28:04 +0100 |
|---|---|---|
| committer | Don Scorgie <dscorgie@git.gnome.org> | 2009-04-28 19:28:04 +0100 |
| commit | 820e4e40d60a797ec305bce7f58f0beca3afda79 (patch) | |
| tree | 66fd9c7ae8e5293118b972ca4012f10e28d11799 | |
| parent | 96dd47d7281dcefc87319c676a6f410e62f367e7 (diff) | |
| download | yelp-820e4e40d60a797ec305bce7f58f0beca3afda79.tar.gz | |
Port from Glade to GtkBuilder
Port done by Thomas Andersen - bug #579894
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | data/ui/Makefile.am | 2 | ||||
| -rw-r--r-- | data/ui/yelp-bookmarks-add.ui | 105 | ||||
| -rw-r--r-- | data/ui/yelp-bookmarks.ui | 160 | ||||
| -rw-r--r-- | data/ui/yelp-open-location.ui | 100 | ||||
| -rw-r--r-- | data/ui/yelp-preferences.ui | 218 | ||||
| -rw-r--r-- | data/ui/yelp.glade | 1080 | ||||
| -rw-r--r-- | po/POTFILES.in | 5 | ||||
| -rw-r--r-- | src/yelp-bookmarks.c | 56 | ||||
| -rw-r--r-- | src/yelp-settings.c | 37 | ||||
| -rw-r--r-- | src/yelp-window.c | 23 |
12 files changed, 659 insertions, 1143 deletions
@@ -1,3 +1,18 @@ +2009-04-28 Don Scorgie <dscorgie@svn.gnome.org> + + * src/yelp-window.c: + * src/yelp-settings.c: + * src/yelp-bookmarks.c: + * po/POTFILES.in: + * data/ui/Makefile.am: + * configure.in: + * data/ui/yelp.glade (deleted): + * data/ui/yelp-bookmarks-add.ui (added): + * data/ui/yelp-bookmarks.ui (added): + * data/ui/yelp-open-location.ui (added): + * data/ui/yelp-preferences.ui (added): + Port from glade to GtkBuilder + 2009-04-27 Don Scorgie <dscorgie@svn.gnome.org> * src/yelp-window.c: diff --git a/configure.in b/configure.in index 19082498..4dc488aa 100644 --- a/configure.in +++ b/configure.in @@ -72,7 +72,6 @@ PKG_CHECK_MODULES(YELP, gnome-doc-utils >= 0.15.2 gtk+-unix-print-2.0 gtk+-2.0 >= 2.10.0 - libglade-2.0 >= 2.0.0 libgnome-2.0 >= 2.14.0 libgnomeui-2.0 >= 2.14.0 libxml-2.0 >= 2.6.5 diff --git a/data/ui/Makefile.am b/data/ui/Makefile.am index 4bb831b8..aebda110 100644 --- a/data/ui/Makefile.am +++ b/data/ui/Makefile.am @@ -1,5 +1,5 @@ uidir = $(datadir)/yelp/ui -ui_DATA = yelp.glade yelp-ui.xml yelp-search-ui.xml +ui_DATA = yelp-bookmarks.ui yelp-bookmarks-add.ui yelp-open-location.ui yelp-preferences.ui yelp-ui.xml yelp-search-ui.xml EXTRA_DIST = $(ui_DATA) diff --git a/data/ui/yelp-bookmarks-add.ui b/data/ui/yelp-bookmarks-add.ui new file mode 100644 index 00000000..862c87f1 --- /dev/null +++ b/data/ui/yelp-bookmarks-add.ui @@ -0,0 +1,105 @@ +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkDialog" id="add_bookmark_dialog"> + <property name="visible">True</property> + <property name="border_width">5</property> + <property name="title" translatable="yes">Add Bookmark</property> + <property name="resizable">False</property> + <property name="type_hint">dialog</property> + <property name="has_separator">False</property> + <child internal-child="vbox"> + <object class="GtkVBox" id="dialog-vbox9"> + <property name="visible">True</property> + <property name="spacing">2</property> + <child> + <object class="GtkAlignment" id="alignment14"> + <property name="visible">True</property> + <property name="yalign">0</property> + <child> + <object class="GtkHBox" id="hbox90"> + <property name="visible">True</property> + <property name="border_width">5</property> + <property name="spacing">12</property> + <child> + <object class="GtkLabel" id="label1230"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Title:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">bookmark_title_entry</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="bookmark_title_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <property name="width_chars">30</property> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child internal-child="action_area"> + <object class="GtkHButtonBox" id="dialog-action_area9"> + <property name="visible">True</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="cancelbutton1"> + <property name="label">gtk-cancel</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="okbutton1"> + <property name="label">gtk-add</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="has_default">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> + </object> + </child> + <action-widgets> + <action-widget response="-6">cancelbutton1</action-widget> + <action-widget response="-5">okbutton1</action-widget> + </action-widgets> + </object> +</interface> diff --git a/data/ui/yelp-bookmarks.ui b/data/ui/yelp-bookmarks.ui new file mode 100644 index 00000000..9710fb8b --- /dev/null +++ b/data/ui/yelp-bookmarks.ui @@ -0,0 +1,160 @@ +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkDialog" id="bookmarks_dialog"> + <property name="border_width">5</property> + <property name="title" translatable="yes">Bookmarks</property> + <property name="default_width">300</property> + <property name="default_height">300</property> + <property name="type_hint">dialog</property> + <property name="has_separator">False</property> + <child internal-child="vbox"> + <object class="GtkVBox" id="dialog-vbox8"> + <property name="visible">True</property> + <property name="spacing">2</property> + <child> + <object class="GtkTable" id="table1"> + <property name="visible">True</property> + <property name="border_width">5</property> + <property name="n_rows">2</property> + <property name="n_columns">2</property> + <property name="column_spacing">6</property> + <property name="row_spacing">6</property> + <child> + <object class="GtkLabel" id="label1231"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Bookmarks:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">bookmarks_view</property> + </object> + <packing> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkVButtonBox" id="vbuttonbox1"> + <property name="visible">True</property> + <property name="spacing">6</property> + <property name="layout_style">start</property> + <child> + <object class="GtkButton" id="open_button"> + <property name="label">gtk-open</property> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="rename_button"> + <property name="label" translatable="yes">Re_name</property> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="remove_button"> + <property name="label">gtk-remove</property> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="scrolledwindow1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkTreeView" id="bookmarks_view"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="headers_visible">False</property> + </object> + </child> + </object> + <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + </packing> + </child> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child internal-child="action_area"> + <object class="GtkHButtonBox" id="dialog-action_area8"> + <property name="visible">True</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="button1"> + <property name="label">gtk-close</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> + </object> + </child> + <action-widgets> + <action-widget response="-7">button1</action-widget> + </action-widgets> + </object> +</interface> diff --git a/data/ui/yelp-open-location.ui b/data/ui/yelp-open-location.ui new file mode 100644 index 00000000..69e2157f --- /dev/null +++ b/data/ui/yelp-open-location.ui @@ -0,0 +1,100 @@ +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkDialog" id="location_dialog"> + <property name="visible">True</property> + <property name="border_width">5</property> + <property name="title" translatable="yes">Open Location</property> + <property name="resizable">False</property> + <property name="destroy_with_parent">True</property> + <property name="type_hint">dialog</property> + <property name="has_separator">False</property> + <child internal-child="vbox"> + <object class="GtkVBox" id="dialog-vbox6"> + <property name="visible">True</property> + <property name="spacing">2</property> + <child> + <object class="GtkHBox" id="hbox89"> + <property name="visible">True</property> + <property name="border_width">5</property> + <property name="spacing">12</property> + <child> + <object class="GtkLabel" id="location_label"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Location:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">location_entry</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="location_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <property name="width_chars">30</property> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child internal-child="action_area"> + <object class="GtkHButtonBox" id="dialog-action_area6"> + <property name="visible">True</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="cancel_button"> + <property name="label">gtk-cancel</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="open_button"> + <property name="label">gtk-open</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="has_default">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> + </object> + </child> + <action-widgets> + <action-widget response="-6">cancel_button</action-widget> + <action-widget response="-5">open_button</action-widget> + </action-widgets> + </object> +</interface> diff --git a/data/ui/yelp-preferences.ui b/data/ui/yelp-preferences.ui new file mode 100644 index 00000000..c736900e --- /dev/null +++ b/data/ui/yelp-preferences.ui @@ -0,0 +1,218 @@ +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkDialog" id="prefs_dialog"> + <property name="visible">True</property> + <property name="border_width">5</property> + <property name="title" translatable="yes">Preferences</property> + <property name="destroy_with_parent">True</property> + <property name="type_hint">dialog</property> + <property name="has_separator">False</property> + <child internal-child="vbox"> + <object class="GtkVBox" id="dialog-vbox7"> + <property name="visible">True</property> + <property name="spacing">2</property> + <child> + <object class="GtkVBox" id="vbox133"> + <property name="visible">True</property> + <property name="border_width">5</property> + <property name="spacing">18</property> + <child> + <object class="GtkVBox" id="vbox1"> + <property name="visible">True</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="label1226"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes"><b>Fonts</b></property> + <property name="use_markup">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkAlignment" id="alignment11"> + <property name="visible">True</property> + <property name="left_padding">12</property> + <child> + <object class="GtkCheckButton" id="use_system_fonts"> + <property name="label" translatable="yes">_Use system fonts</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkAlignment" id="alignment12"> + <property name="visible">True</property> + <property name="left_padding">12</property> + <child> + <object class="GtkTable" id="font_table"> + <property name="visible">True</property> + <property name="n_rows">2</property> + <property name="n_columns">2</property> + <property name="column_spacing">12</property> + <property name="row_spacing">6</property> + <child> + <object class="GtkLabel" id="label1227"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Variable width:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">variable_font</property> + </object> + <packing> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label1228"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Fixed width:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">fixed_font</property> + </object> + <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkFontButton" id="variable_font"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkFontButton" id="fixed_font"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="y_options"></property> + </packing> + </child> + </object> + </child> + </object> + <packing> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="vbox134"> + <property name="visible">True</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="label1229"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes"><b>Accessibility</b></property> + <property name="use_markup">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkAlignment" id="alignment13"> + <property name="visible">True</property> + <property name="left_padding">12</property> + <child> + <object class="GtkCheckButton" id="use_caret"> + <property name="label" translatable="yes">_Browse with caret</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child internal-child="action_area"> + <object class="GtkHButtonBox" id="dialog-action_area7"> + <property name="visible">True</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="closebutton1"> + <property name="label">gtk-close</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> + </object> + </child> + <action-widgets> + <action-widget response="-7">closebutton1</action-widget> + </action-widgets> + </object> +</interface> diff --git a/data/ui/yelp.glade b/data/ui/yelp.glade deleted file mode 100644 index c2d61400..00000000 --- a/data/ui/yelp.glade +++ /dev/null @@ -1,1080 +0,0 @@ -<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> -<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> - -<glade-interface> -<requires lib="gnome"/> - -<widget class="GtkDialog" id="find_dialog"> - <property name="border_width">5</property> - <property name="height_request">150</property> - <property name="visible">True</property> - <property name="title" translatable="yes">Find</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="decorated">True</property> - <property name="skip_taskbar_hint">False</property> - <property name="skip_pager_hint">False</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> - <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> - <property name="has_separator">False</property> - - <child internal-child="vbox"> - <widget class="GtkVBox" id="dialog-vbox5"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">2</property> - - <child internal-child="action_area"> - <widget class="GtkHButtonBox" id="dialog-action_area5"> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> - - <child> - <widget class="GtkButton" id="close_button"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-close</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="response_id">-7</property> - </widget> - </child> - - <child> - <widget class="GtkButton" id="prev_button"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="response_id">1</property> - - <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> - <property name="top_padding">0</property> - <property name="bottom_padding">0</property> - <property name="left_padding">0</property> - <property name="right_padding">0</property> - - <child> - <widget class="GtkHBox" id="hbox86"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">2</property> - - <child> - <widget class="GtkImage" id="image6"> - <property name="visible">True</property> - <property name="stock">gtk-go-back</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="label1223"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Previous</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> - </child> - - <child> - <widget class="GtkButton" id="next_button"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="response_id">2</property> - - <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> - <property name="top_padding">0</property> - <property name="bottom_padding">0</property> - <property name="left_padding">0</property> - <property name="right_padding">0</property> - - <child> - <widget class="GtkHBox" id="hbox87"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">2</property> - - <child> - <widget class="GtkImage" id="image7"> - <property name="visible">True</property> - <property name="stock">gtk-go-forward</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="label1224"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Next</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> - </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="GtkAlignment" id="alignment10"> - <property name="border_width">5</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> - <property name="top_padding">0</property> - <property name="bottom_padding">0</property> - <property name="left_padding">0</property> - <property name="right_padding">0</property> - - <child> - <widget class="GtkVBox" id="vbox132"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkHBox" id="hbox88"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">12</property> - - <child> - <widget class="GtkLabel" id="label1225"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Find:</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> - <property name="mnemonic_widget">find_entry</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GnomeEntry" id="find_gnome_entry"> - <property name="visible">True</property> - <property name="history_id">FindEntry</property> - <property name="max_saved">10</property> - - <child internal-child="entry"> - <widget class="GtkEntry" id="find_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="has_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">*</property> - <property name="activates_default">False</property> - </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">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkCheckButton" id="case_check"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">C_ase sensitive</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkCheckButton" id="wrap_check"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">_Wrap around</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - </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="location_dialog"> - <property name="border_width">5</property> - <property name="visible">True</property> - <property name="title" translatable="yes">Open Location</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> - <property name="decorated">True</property> - <property name="skip_taskbar_hint">False</property> - <property name="skip_pager_hint">False</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> - <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> - <property name="has_separator">False</property> - - <child internal-child="vbox"> - <widget class="GtkVBox" id="dialog-vbox6"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">2</property> - - <child internal-child="action_area"> - <widget class="GtkHButtonBox" id="dialog-action_area6"> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> - - <child> - <widget class="GtkButton" id="cancel_button"> - <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="focus_on_click">True</property> - <property name="response_id">-6</property> - </widget> - </child> - - <child> - <widget class="GtkButton" id="open_button"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-open</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</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="GtkHBox" id="hbox89"> - <property name="border_width">5</property> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">12</property> - - <child> - <widget class="GtkLabel" id="location_label"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Location:</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> - <property name="mnemonic_widget">location_entry</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="location_entry"> - <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">*</property> - <property name="activates_default">True</property> - <property name="width_chars">30</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">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - </child> -</widget> - -<widget class="GtkDialog" id="prefs_dialog"> - <property name="border_width">5</property> - <property name="visible">True</property> - <property name="title" translatable="yes">Preferences</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">True</property> - <property name="destroy_with_parent">True</property> - <property name="decorated">True</property> - <property name="skip_taskbar_hint">False</property> - <property name="skip_pager_hint">False</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> - <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> - <property name="has_separator">False</property> - - <child internal-child="vbox"> - <widget class="GtkVBox" id="dialog-vbox7"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">2</property> - - <child internal-child="action_area"> - <widget class="GtkHButtonBox" id="dialog-action_area7"> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> - - <child> - <widget class="GtkButton" id="closebutton1"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-close</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="response_id">-7</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="GtkVBox" id="vbox133"> - <property name="border_width">5</property> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">18</property> - - <child> - <widget class="GtkVBox" id="vbox133"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkLabel" id="label1226"> - <property name="visible">True</property> - <property name="label" translatable="yes"><b>Fonts</b></property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkAlignment" id="alignment11"> - <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xscale">1</property> - <property name="yscale">1</property> - <property name="top_padding">0</property> - <property name="bottom_padding">0</property> - <property name="left_padding">12</property> - <property name="right_padding">0</property> - - <child> - <widget class="GtkCheckButton" id="use_system_fonts"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">_Use system fonts</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkAlignment" id="alignment12"> - <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xscale">1</property> - <property name="yscale">1</property> - <property name="top_padding">0</property> - <property name="bottom_padding">0</property> - <property name="left_padding">12</property> - <property name="right_padding">0</property> - - <child> - <widget class="GtkTable" id="font_table"> - <property name="visible">True</property> - <property name="n_rows">2</property> - <property name="n_columns">2</property> - <property name="homogeneous">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - - <child> - <widget class="GtkLabel" id="label1227"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Variable width:</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> - <property name="mnemonic_widget">variable_font</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label1228"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Fixed width:</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> - <property name="mnemonic_widget">fixed_font</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkFontButton" id="variable_font"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="show_style">True</property> - <property name="show_size">True</property> - <property name="use_font">False</property> - <property name="use_size">False</property> - <property name="focus_on_click">True</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkFontButton" id="fixed_font"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="show_style">True</property> - <property name="show_size">True</property> - <property name="use_font">False</property> - <property name="use_size">False</property> - <property name="focus_on_click">True</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="y_options"></property> - </packing> - </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">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkVBox" id="vbox134"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkLabel" id="label1229"> - <property name="visible">True</property> - <property name="label" translatable="yes"><b>Accessibility</b></property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkAlignment" id="alignment13"> - <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xscale">1</property> - <property name="yscale">1</property> - <property name="top_padding">0</property> - <property name="bottom_padding">0</property> - <property name="left_padding">12</property> - <property name="right_padding">0</property> - - <child> - <widget class="GtkCheckButton" id="use_caret"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">_Browse with caret</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </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">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> - </child> -</widget> - -<widget class="GtkDialog" id="bookmarks_dialog"> - <property name="border_width">5</property> - <property name="title" translatable="yes">Bookmarks</property> - <property name="type">GTK_WINDOW_TOPLEVEL</property> - <property name="window_position">GTK_WIN_POS_NONE</property> - <property name="modal">False</property> - <property name="default_width">300</property> - <property name="default_height">300</property> - <property name="resizable">True</property> - <property name="destroy_with_parent">False</property> - <property name="decorated">True</property> - <property name="skip_taskbar_hint">False</property> - <property name="skip_pager_hint">False</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> - <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> - <property name="has_separator">False</property> - - <child internal-child="vbox"> - <widget class="GtkVBox" id="dialog-vbox8"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">2</property> - - <child internal-child="action_area"> - <widget class="GtkHButtonBox" id="dialog-action_area8"> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> - - <child> - <widget class="GtkButton" id="button1"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-close</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="response_id">-7</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="GtkTable" id="table1"> - <property name="border_width">5</property> - <property name="visible">True</property> - <property name="n_rows">2</property> - <property name="n_columns">2</property> - <property name="homogeneous">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">6</property> - - <child> - <widget class="GtkLabel" id="label1231"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Bookmarks:</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> - <property name="mnemonic_widget">bookmarks_view</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkVButtonBox" id="vbuttonbox1"> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_START</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkButton" id="open_button"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-open</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - </widget> - </child> - - <child> - <widget class="GtkButton" id="rename_button"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Re_name</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - </widget> - </child> - - <child> - <widget class="GtkButton" id="remove_button"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-remove</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - </widget> - </child> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - <property name="y_options">fill</property> - </packing> - </child> - - <child> - <widget class="GtkScrolledWindow" id="scrolledwindow1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> - <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> - <property name="shadow_type">GTK_SHADOW_IN</property> - <property name="window_placement">GTK_CORNER_TOP_LEFT</property> - - <child> - <widget class="GtkTreeView" id="bookmarks_view"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="headers_visible">False</property> - <property name="rules_hint">False</property> - <property name="reorderable">False</property> - <property name="enable_search">True</property> - </widget> - </child> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - </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="add_bookmark_dialog"> - <property name="border_width">5</property> - <property name="visible">True</property> - <property name="title" translatable="yes">Add Bookmark</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="decorated">True</property> - <property name="skip_taskbar_hint">False</property> - <property name="skip_pager_hint">False</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> - <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> - <property name="has_separator">False</property> - - <child internal-child="vbox"> - <widget class="GtkVBox" id="dialog-vbox9"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">2</property> - - <child internal-child="action_area"> - <widget class="GtkHButtonBox" id="dialog-action_area9"> - <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="focus_on_click">True</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="has_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-add</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</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="GtkAlignment" id="alignment14"> - <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0</property> - <property name="xscale">1</property> - <property name="yscale">1</property> - <property name="top_padding">0</property> - <property name="bottom_padding">0</property> - <property name="left_padding">0</property> - <property name="right_padding">0</property> - - <child> - <widget class="GtkHBox" id="hbox90"> - <property name="border_width">5</property> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">12</property> - - <child> - <widget class="GtkLabel" id="label1230"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Title:</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> - <property name="mnemonic_widget">bookmark_title_entry</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="bookmark_title_entry"> - <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">*</property> - <property name="activates_default">True</property> - <property name="width_chars">30</property> - </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> - </widget> - </child> -</widget> - -</glade-interface> diff --git a/po/POTFILES.in b/po/POTFILES.in index 4e9b3924..e06d9f4b 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -4,7 +4,10 @@ data/info.xml.in data/man.xml.in data/toc.xml.in -data/ui/yelp.glade +data/ui/yelp-bookmarks.ui +data/ui/yelp-bookmark-add.ui +data/ui/yelp-open-location.ui +data/ui/yelp-preferences.ui data/yelp.schemas.in src/yelp-base.c src/yelp-bookmarks.c diff --git a/src/yelp-bookmarks.c b/src/yelp-bookmarks.c index b492faf8..0565257a 100644 --- a/src/yelp-bookmarks.c +++ b/src/yelp-bookmarks.c @@ -32,7 +32,6 @@ #include <string.h> #include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> -#include <glade/glade.h> #include <libxml/parser.h> #include <libxml/parserInternals.h> #include <libxml/xpath.h> @@ -283,7 +282,8 @@ bookmarks_dup_finder (GtkTreeModel *model, GtkTreePath *path, void yelp_bookmarks_add (const gchar *uri, YelpWindow *window) { - GladeXML *glade; + GtkBuilder *builder; + GError *error = NULL; GtkWidget *dialog; GtkEntry *entry; gchar *title; @@ -324,17 +324,17 @@ yelp_bookmarks_add (const gchar *uri, YelpWindow *window) return; } - glade = glade_xml_new (DATADIR "/yelp/ui/yelp.glade", - "add_bookmark_dialog", - NULL); - if (!glade) { - g_warning ("Could not find necessary glade file " - DATADIR "/yelp/ui/yelp.glade"); - return; + builder = gtk_builder_new (); + if (!gtk_builder_add_from_file (builder, + DATADIR "/yelp/ui/yelp-bookmarks-add.ui", + &error)) { + g_warning ("Could not load builder file: %s", error->message); + g_error_free(error); + return; } - dialog = glade_xml_get_widget (glade, "add_bookmark_dialog"); - entry = GTK_ENTRY (glade_xml_get_widget (glade, "bookmark_title_entry")); + dialog = GTK_WIDGET (gtk_builder_get_object (builder, "add_bookmark_dialog")); + entry = GTK_ENTRY (gtk_builder_get_object (builder, "bookmark_title_entry")); gtk_entry_set_text (entry, title); gtk_editable_select_region (GTK_EDITABLE (entry), 0, -1); @@ -345,7 +345,6 @@ yelp_bookmarks_add (const gchar *uri, YelpWindow *window) G_CALLBACK (bookmark_add_response_cb), dup_uri); - g_object_unref (glade); gtk_window_present (GTK_WINDOW (dialog)); } @@ -603,24 +602,25 @@ bookmarks_cell_edited_cb (GtkCellRendererText *cell, const gchar *path_string, void yelp_bookmarks_edit (void) { - GladeXML *glade; + GtkBuilder *builder; + GError *error = NULL; GtkTreeView *view; GtkTreeSelection *select; GtkCellRenderer *renderer; gint width, height; if (!bookmarks_dialog) { - glade = glade_xml_new (DATADIR "/yelp/ui/yelp.glade", - "bookmarks_dialog", - NULL); - if (!glade) { - g_warning ("Could not find necessary glade file " - DATADIR "/yelp/ui/yelp.glade"); - return; - } - - bookmarks_dialog = glade_xml_get_widget (glade, "bookmarks_dialog"); - view = GTK_TREE_VIEW (glade_xml_get_widget (glade, "bookmarks_view")); + builder = gtk_builder_new (); + if (!gtk_builder_add_from_file (builder, + DATADIR "/yelp/ui/yelp-bookmarks.ui", + &error)) { + g_warning ("Could not load builder file: %s", error->message); + g_error_free(error); + return; + } + + bookmarks_dialog = GTK_WIDGET (gtk_builder_get_object (builder, "bookmarks_dialog")); + view = GTK_TREE_VIEW (gtk_builder_get_object (builder, "bookmarks_view")); width = gnome_config_get_int (BK_CONFIG_WIDTH "=" BK_CONFIG_WIDTH_DEFAULT); height = gnome_config_get_int (BK_CONFIG_HEIGHT @@ -657,15 +657,15 @@ yelp_bookmarks_edit (void) g_signal_connect (G_OBJECT (renderer), "edited", G_CALLBACK (bookmarks_cell_edited_cb), NULL); - edit_open_button = glade_xml_get_widget (glade, "open_button"); + edit_open_button = GTK_WIDGET (gtk_builder_get_object (builder, "open_button")); g_signal_connect (G_OBJECT (edit_open_button), "clicked", G_CALLBACK (bookmarks_open_button_cb), view); - edit_rename_button = glade_xml_get_widget (glade, "rename_button"); + edit_rename_button = GTK_WIDGET (gtk_builder_get_object (builder, "rename_button")); g_signal_connect (G_OBJECT (edit_rename_button), "clicked", G_CALLBACK (bookmarks_rename_button_cb), view); - edit_remove_button = glade_xml_get_widget (glade, "remove_button"); + edit_remove_button = GTK_WIDGET (gtk_builder_get_object (builder, "remove_button")); g_signal_connect (G_OBJECT (edit_remove_button), "clicked", G_CALLBACK (bookmarks_remove_button_cb), view); @@ -678,8 +678,6 @@ yelp_bookmarks_edit (void) g_signal_connect (G_OBJECT (bookmarks_dialog), "configure-event", G_CALLBACK (bookmarks_configure_cb), NULL); - - g_object_unref (glade); } gtk_window_present (GTK_WINDOW (bookmarks_dialog)); diff --git a/src/yelp-settings.c b/src/yelp-settings.c index 04f0ce46..fd41b653 100644 --- a/src/yelp-settings.c +++ b/src/yelp-settings.c @@ -27,7 +27,6 @@ #include <glib/gi18n.h> #include <gdk-pixbuf/gdk-pixbuf.h> #include <gtk/gtk.h> -#include <glade/glade.h> #include <gconf/gconf-client.h> #include <string.h> @@ -204,26 +203,28 @@ yelp_settings_init (void) void yelp_settings_open_preferences (void) { + GtkBuilder *builder; + GError *error = NULL; gchar *font; gboolean use; if (!prefs_dialog) { - GladeXML *glade; - glade = glade_xml_new (DATADIR "/yelp/ui/yelp.glade", - "prefs_dialog", - NULL); - if (!glade) { - g_warning ("Could not find necessary glade file " - DATADIR "/yelp/ui/yelp.glade"); - return; - } - - prefs_dialog = glade_xml_get_widget (glade, "prefs_dialog"); - use_caret_widget = glade_xml_get_widget (glade, "use_caret"); - system_fonts_widget = glade_xml_get_widget (glade, "use_system_fonts"); - font_table_widget = glade_xml_get_widget (glade, "font_table"); - variable_font_widget = glade_xml_get_widget (glade, "variable_font"); - fixed_font_widget = glade_xml_get_widget (glade, "fixed_font"); + builder = gtk_builder_new (); + if (!gtk_builder_add_from_file (builder, + DATADIR "/yelp/ui/yelp-preferences.ui", + &error)) { + g_warning ("Could not load builder file: %s", error->message); + g_error_free(error); + return; + } + + + prefs_dialog = GTK_WIDGET (gtk_builder_get_object (builder, "prefs_dialog")); + use_caret_widget = GTK_WIDGET (gtk_builder_get_object (builder, "use_caret")); + system_fonts_widget = GTK_WIDGET (gtk_builder_get_object (builder, "use_system_fonts")); + font_table_widget = GTK_WIDGET (gtk_builder_get_object (builder, "font_table")); + variable_font_widget = GTK_WIDGET (gtk_builder_get_object (builder, "variable_font")); + fixed_font_widget = GTK_WIDGET (gtk_builder_get_object (builder, "fixed_font")); use = gconf_client_get_bool (gconf_client, KEY_YELP_SYSTEM_FONTS, NULL); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (system_fonts_widget), use); @@ -261,8 +262,6 @@ yelp_settings_open_preferences (void) g_signal_connect (G_OBJECT (prefs_dialog), "delete_event", G_CALLBACK (gtk_widget_hide_on_delete), NULL); - - g_object_unref (glade); } gtk_window_present (GTK_WINDOW (prefs_dialog)); diff --git a/src/yelp-window.c b/src/yelp-window.c index deb36fd9..8662217c 100644 --- a/src/yelp-window.c +++ b/src/yelp-window.c @@ -31,7 +31,6 @@ #include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> -#include <glade/glade.h> #include <string.h> #include <libgnome/gnome-config.h> #include <libgnome/gnome-url.h> @@ -2114,7 +2113,8 @@ static void window_open_location_cb (GtkAction *action, YelpWindow *window) { YelpWindowPriv *priv; - GladeXML *glade; + GtkBuilder *builder; + GError *error = NULL; GtkWidget *dialog; GtkWidget *entry; gchar *uri = NULL; @@ -2123,17 +2123,17 @@ window_open_location_cb (GtkAction *action, YelpWindow *window) priv = window->priv; - glade = glade_xml_new (DATADIR "/yelp/ui/yelp.glade", - "location_dialog", - NULL); - if (!glade) { - g_warning ("Could not find necessary glade file " - DATADIR "/yelp/ui/yelp.glade"); - return; + builder = gtk_builder_new (); + if (!gtk_builder_add_from_file (builder, + DATADIR "/yelp/ui/yelp-open-location.ui", + &error)) { + g_warning ("Could not load builder file: %s", error->message); + g_error_free(error); + return; } - dialog = glade_xml_get_widget (glade, "location_dialog"); - entry = glade_xml_get_widget (glade, "location_entry"); + dialog = GTK_WIDGET (gtk_builder_get_object (builder, "location_dialog")); + entry = GTK_WIDGET (gtk_builder_get_object (builder, "location_entry")); priv->location_dialog = dialog; priv->location_entry = entry; @@ -2151,7 +2151,6 @@ window_open_location_cb (GtkAction *action, YelpWindow *window) G_CALLBACK (location_response_cb), window); - g_object_unref (glade); gtk_window_present (GTK_WINDOW (dialog)); } |