diff options
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | data/Makefile.am | 2 | ||||
| -rw-r--r-- | data/ui/Makefile.am | 5 | ||||
| -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 | 222 | ||||
| -rw-r--r-- | data/ui/yelp-search-ui.xml | 9 | ||||
| -rw-r--r-- | data/ui/yelp-ui.xml | 81 | ||||
| -rw-r--r-- | src/yelp-window.c | 35 |
10 files changed, 23 insertions, 697 deletions
diff --git a/configure.in b/configure.in index 51c6f687..74659d31 100644 --- a/configure.in +++ b/configure.in @@ -276,7 +276,6 @@ data/icons/Makefile data/icons/hicolor/Makefile data/icons/hicolor/16x16/Makefile data/icons/hicolor/16x16/status/Makefile -data/ui/Makefile po/Makefile.in tests/Makefile yelp.desktop.in diff --git a/data/Makefile.am b/data/Makefile.am index c6667d1d..6537659e 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = icons ui +SUBDIRS = icons @INTLTOOL_XML_RULE@ @INTLTOOL_SCHEMAS_RULE@ diff --git a/data/ui/Makefile.am b/data/ui/Makefile.am deleted file mode 100644 index aebda110..00000000 --- a/data/ui/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -uidir = $(datadir)/yelp/ui - -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 deleted file mode 100644 index 862c87f1..00000000 --- a/data/ui/yelp-bookmarks-add.ui +++ /dev/null @@ -1,105 +0,0 @@ -<?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 deleted file mode 100644 index 9710fb8b..00000000 --- a/data/ui/yelp-bookmarks.ui +++ /dev/null @@ -1,160 +0,0 @@ -<?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 deleted file mode 100644 index 69e2157f..00000000 --- a/data/ui/yelp-open-location.ui +++ /dev/null @@ -1,100 +0,0 @@ -<?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 deleted file mode 100644 index e8111266..00000000 --- a/data/ui/yelp-preferences.ui +++ /dev/null @@ -1,222 +0,0 @@ -<?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">Fonts</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </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">Accessibility</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </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-search-ui.xml b/data/ui/yelp-search-ui.xml deleted file mode 100644 index c2c2cd5b..00000000 --- a/data/ui/yelp-search-ui.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<ui> - <toolbar name="tools"> - <placeholder> - <separator/> - <toolitem action="Search"/> - </placeholder> - </toolbar> -</ui> diff --git a/data/ui/yelp-ui.xml b/data/ui/yelp-ui.xml deleted file mode 100644 index afaeb19a..00000000 --- a/data/ui/yelp-ui.xml +++ /dev/null @@ -1,81 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<ui> - <menubar> - <menu action="PageMenu"> - <menuitem action="NewWindow"/> - <menuitem action="CloseWindow"/> - </menu> - <menu action="ViewMenu"> - <menuitem action="LargerText"/> - <menuitem action="SmallerText"/> - <separator/> - <menuitem action="ShowTextCursor"/> - </menu> - <menu action="GoMenu"> - <menuitem action="GoBack"/> - <menuitem action="GoForward"/> - </menu> - </menubar> - <accelerator action="OpenLocation"/> -<!-- - <menubar> - <menu action="FileMenu"> - <menuitem action="NewWindow"/> - <separator/> - <menuitem action="AboutDocument"/> - <separator/> - <menuitem action="PrintPage"/> - <menuitem action="PrintDocument"/> - <separator/> - </menu> - <menu action="EditMenu"> - <menuitem action="Copy"/> - <menuitem action="SelectAll"/> - <separator/> - <menuitem action="Find"/> - <menuitem action="FindNext"/> - <menuitem action="FindPrev"/> - <separator/> - <menuitem action="Preferences"/> - </menu> - <menu action="GoMenu"> - <menuitem action="GoBack"/> - <menuitem action="GoForward"/> - <menuitem action="GoHome"/> - <separator/> - <menuitem action="GoPrevious"/> - <menuitem action="GoNext"/> - <menuitem action="GoContents"/> - </menu> - <menu action="BookmarksMenu"> - <menuitem action="AddBookmark"/> - <menuitem action="EditBookmarks"/> - <separator/> - <placeholder name="BookmarksTOC"/> - <separator/> - <placeholder name="BookmarksDOC"/> - </menu> - <menu action="HelpMenu"> - <menuitem action="Contents"/> - <menuitem action="About"/> - </menu> - </menubar> - <toolbar name="tools"> - <toolitem action="GoForward" name="GoFor"/> - <separator/> - <toolitem action="GoHome"/> - <placeholder/> - </toolbar> - <popup name="main_popup"> - <menuitem action="OpenLink"/> - <menuitem action="OpenLinkNewWindow"/> - <separator/> - <menuitem action="CopyLocation"/> - </popup> - <popup name="mail_popup"> - <menuitem name="CpMail" action="CopyMail"/> - </popup> - <accelerator action="Reload"/> - <accelerator action="TextCursor"/> ---> -</ui> diff --git a/src/yelp-window.c b/src/yelp-window.c index 3f7fe0b6..ef2dd1ed 100644 --- a/src/yelp-window.c +++ b/src/yelp-window.c @@ -116,6 +116,27 @@ enum { COL_TERMS }; +static const gchar *YELP_UI = + "<ui>" + "<menubar>" + "<menu action='PageMenu'>" + "<menuitem action='NewWindow'/>" + "<menuitem action='CloseWindow'/>" + "</menu>" + "<menu action='ViewMenu'>" + "<menuitem action='LargerText'/>" + "<menuitem action='SmallerText'/>" + "<separator/>" + "<menuitem action='ShowTextCursor'/>" + "</menu>" + "<menu action='GoMenu'>" + "<menuitem action='GoBack'/>" + "<menuitem action='GoForward'/>" + "</menu>" + "</menubar>" + "<accelerator action='OpenLocation'/>" + "</ui>"; + typedef struct _YelpBackEntry YelpBackEntry; struct _YelpBackEntry { YelpUri *uri; @@ -322,19 +343,7 @@ window_construct (YelpWindow *window) 1); gtk_window_add_accel_group (GTK_WINDOW (window), gtk_ui_manager_get_accel_group (priv->ui_manager)); - if (!gtk_ui_manager_add_ui_from_file (priv->ui_manager, - DATADIR "/yelp/ui/yelp-ui.xml", - &error)) { - GtkWidget *dialog = gtk_message_dialog_new (NULL, 0, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_OK, - "%s", _("Cannot create window")); - gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog), "%s", - error->message); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); - g_error_free (error); - } + gtk_ui_manager_add_ui_from_string (priv->ui_manager, YELP_UI, -1, NULL); gtk_box_pack_start (GTK_BOX (vbox), gtk_ui_manager_get_widget (priv->ui_manager, "/ui/menubar"), FALSE, FALSE, 0); |