Do not use .in for not to translate files.

2003-09-19  Marco Pesenti Gritti  <marco@gnome.org>

        * data/ui/Makefile.am:
        * data/ui/epiphany-bookmark-editor-ui.xml.in:
        * data/ui/epiphany-fs-toolbar.xml:
        * data/ui/epiphany-history-window-ui.xml.in:
        * data/ui/epiphany-toolbar.xml.in:
        * data/ui/epiphany-ui.xml.in:

        Do not use .in for not to translate files.

        * lib/egg/egg-editable-toolbar.c: (create_toolbar),
        (toolbars_clean), (egg_editable_toolbar_construct),
        (egg_editable_toolbar_set_model), (egg_editable_toolbar_set_merge):
        * lib/egg/egg-toolbars-model.c: (parse_toolbars):

        Handle change of properties correctly. Add a toolbar
        style property in the xml.

        * src/bookmarks/ephy-bookmark-properties.c:
        (ephy_bookmark_properties_init):
        * src/bookmarks/ephy-bookmarks-editor.c:
        (ephy_bookmarks_editor_init):
        * src/ephy-shell.c: (ephy_shell_init), (ephy_shell_finalize),
        (ephy_shell_get_toolbars_model):
        * src/ephy-shell.h:
        * src/ephy-window.c: (ephy_window_fullscreen),
        (ephy_window_unfullscreen):
        * src/toolbar.c: (bookmark_destroy_cb), (toolbar_ensure_action),
        (init_bookmarks_toolbar), (init_normal_mode),
        (init_fullscreen_mode), (window_state_event_cb),
        (toolbar_set_window), (toolbar_set_visibility):
        * src/toolbar.h:
        * src/window-commands.c: (toolbar_editor_response_cb),
        (window_cmd_edit_toolbar):

        Special, more compact, toolbar layout for fullscreen.

6 files changed, 320 insertions, 6 deletions

diff --git a/data/ui/Makefile.am b/data/ui/Makefile.am
index 76467e77c..a0123616d 100644
--- a/data/ui/Makefile.am
+++ b/data/ui/Makefile.am
@@ -1,12 +1,15 @@
 uixmldir = $(pkgdatadir)
-uixml_in_files = epiphany-ui.xml.in           \
-		 epiphany-bookmark-editor-ui.xml.in \
-                 nautilus-epiphany-view.xml.in \
-		 epiphany-toolbar.xml.in	\
-		 epiphany-history-window-ui.xml.in
-
+uixml_in_files = nautilus-epiphany-view.xml.in
 uixml_DATA = $(uixml_in_files:.xml.in=.xml)
 
+xmldir = $(pkgdatadir)
+xml_DATA = \
+	epiphany-fs-toolbar.xml		\
+	epiphany-bookmark-editor-ui.xml	\
+	epiphany-ui.xml			\
+	epiphany-toolbar.xml		\
+	epiphany-history-window-ui.xml
+
 @INTLTOOL_XML_RULE@
 
 EXTRA_DIST = $(uixml_in_files)
diff --git a/data/ui/epiphany-bookmark-editor-ui.xml b/data/ui/epiphany-bookmark-editor-ui.xml
new file mode 100644
index 000000000..449229660
--- /dev/null
+++ b/data/ui/epiphany-bookmark-editor-ui.xml
@@ -0,0 +1,56 @@
+<ui>
+<menubar>
+
+<menu name="FileMenu" action="File">
+ 	<menuitem name="FileNewTopic" action="NewTopic"/>
+	<separator name="FileSep1"/>
+        <menuitem name="FileOpenInWindow" action="OpenInWindow"/>
+	<menuitem name="FileOpenInTab" action="OpenInTab"/>
+	<separator name="FileSep2"/>
+	<menuitem name="FileRename" action="Rename"/>
+	<menuitem name="FileDelete" action="Delete"/>
+	<separator name="FileSep3"/>
+	<menuitem name="FileShowInBookmarksBar" action="ShowInBookmarksBar"/>
+	<menuitem name="FileProperties" action="Properties"/>
+	<separator name="FileSep4"/>
+	<menuitem name="FileImport" action="Import"/>
+	<separator name="FileSep5"/>
+	<menuitem name="FileClose" action="Close"/>
+</menu>
+
+<menu name="EditMenu" action="Edit">
+	<menuitem name="EditCut" action="Cut"/>
+	<menuitem name="EditCopy" action="Copy"/>
+	<menuitem name="EditPaste" action="Paste"/>
+	<menuitem name="EditSelectAll" action="SelectAll"/>
+</menu>
+
+<menu name="HelpMenu" action="Help">
+	<menuitem name="HelpContents" action="HelpContents"/>
+	<menuitem name="HelpAbout" action="HelpAbout"/>
+</menu>
+
+</menubar>
+
+<popup name="EphyBookmarkEditorPopup" action="PopupAction">
+	<menuitem name="OpenInWindowBMK" action="OpenInWindow"/>
+	<menuitem name="OpenInTabBMK" action="OpenInTab"/>
+	<separator name="BookmarksPopupSep1"/>
+	<menuitem name="CopyBMK" action="Copy"/>
+	<separator name="BookmarksPopupSep2"/>
+	<menuitem name="RenameBMK" action="Rename"/>
+	<menuitem name="DeleteBMK" action="Delete"/>
+	<separator name="BookmarksPopupSep3"/>
+	<menuitem name="ShowInBookmarksBarBMK" action="ShowInBookmarksBar"/>
+	<separator name="BookmarksPopupSep4"/>
+	<menuitem name="BMKProperties" action="Properties"/>
+</popup>
+
+<popup name="EphyBookmarkKeywordPopup" action="PopupAction">
+	<menuitem name="RenameTPC" action="Rename"/>
+	<menuitem name="DeleteTPC" action="Delete"/>
+	<separator name="TopicPopupSep3"/>
+	<menuitem name="ShowInBookmarksBarTPC" action="ShowInBookmarksBar"/>
+</popup>
+
+</ui>
diff --git a/data/ui/epiphany-fs-toolbar.xml b/data/ui/epiphany-fs-toolbar.xml
new file mode 100644
index 000000000..2eec09e81
--- /dev/null
+++ b/data/ui/epiphany-fs-toolbar.xml
@@ -0,0 +1,10 @@
+<editabletoolbar>
+<toolbar name="Toolbar" style="icons-only">
+	<toolitem name="NavigationBack"/>
+	<toolitem name="NavigationForward"/>
+	<toolitem name="ViewStop"/>
+	<toolitem name="ViewReload"/>
+	<toolitem name="Location"/>
+	<toolitem name="Spinner"/>
+</toolbar>
+</editabletoolbar>
diff --git a/data/ui/epiphany-history-window-ui.xml b/data/ui/epiphany-history-window-ui.xml
new file mode 100644
index 000000000..1d977b092
--- /dev/null
+++ b/data/ui/epiphany-history-window-ui.xml
@@ -0,0 +1,40 @@
+<ui>
+<menubar>
+
+<menu name="FileMenu" action="File">
+        <menuitem name="FileOpenInWindow" action="OpenInWindow"/>
+	<menuitem name="FileOpenInTab" action="OpenInTab"/>
+	<separator name="FileSep1"/>
+	<menuitem name="FileBookmarkLink" action="BookmarkLink"/>
+	<menuitem name="FileDelete" action="Delete"/>
+	<separator name="FileSep2"/>
+	<menuitem name="FileClose" action="Close"/>
+</menu>
+
+<menu name="EditMenu" action="Edit">
+	<menuitem name="EditCut" action="Cut"/>
+	<menuitem name="EditCopy" action="Copy"/>
+	<menuitem name="EditPaste" action="Paste"/>
+	<menuitem name="EditSelectAll" action="SelectAll"/>
+	<separator name="EditSep1"/>
+	<menuitem name="EditClear" action="Clear"/>
+</menu>
+
+<menu name="HelpMenu" action="Help">
+	<menuitem name="HelpContents" action="HelpContents"/>
+	<menuitem name="HelpAbout" action="HelpAbout"/>
+</menu>
+
+</menubar>
+
+<popup name="EphyHistoryWindowPopup" action="PopupAction">
+	<menuitem name="OpenInWindowHST" action="OpenInWindow"/>
+	<menuitem name="OpenInTabHST" action="OpenInTab"/>
+	<separator name="HistoryPopupSep1"/>
+	<menuitem name="CopyHST" action="Copy"/>
+	<separator name="HistoryPopupSep2"/>
+	<menuitem name="BookmarkLinkHST" action="BookmarkLink"/>
+	<menuitem name="DeleteHST" action="Delete"/>
+</popup>
+
+</ui>
diff --git a/data/ui/epiphany-toolbar.xml b/data/ui/epiphany-toolbar.xml
new file mode 100644
index 000000000..6accae2fb
--- /dev/null
+++ b/data/ui/epiphany-toolbar.xml
@@ -0,0 +1,46 @@
+<editabletoolbar>
+<available>
+	<toolitem name="NavigationBack"/>
+	<toolitem name="NavigationForward"/>
+	<toolitem name="NavigationUp"/>
+	<toolitem name="ViewStop"/>
+	<toolitem name="ViewReload"/>
+	<toolitem name="GoHome"/>
+	<toolitem name="GoHistory"/>
+	<toolitem name="GoBookmarks"/>
+	<toolitem name="FileNewTab"/>
+	<toolitem name="FileNewWindow"/>
+	<toolitem name="FileOpen"/>
+	<toolitem name="FileSaveAs"/>
+	<toolitem name="FilePrint"/>
+	<toolitem name="FileBookmarkPage"/>
+	<toolitem name="ViewFullscreen"/>
+	<toolitem name="EditFind"/>
+	<toolitem name="Favicon"/>
+	<toolitem name="Location"/>
+	<toolitem name="Spinner"/>
+	<toolitem name="ToolbarGo"/>
+	<toolitem name="Zoom"/>
+</available>
+<toolbar name="DefaultToolbar">
+	<toolitem name="NavigationBack"/>
+	<toolitem name="NavigationForward"/>
+	<toolitem name="ViewStop"/>
+	<toolitem name="ViewReload"/>
+	<separator/>
+	<toolitem name="GoHome"/>	
+	<toolitem name="GoHistory"/>
+	<toolitem name="GoBookmarks"/>
+	<separator/>
+	<toolitem name="EditFind"/>
+	<toolitem name="Spinner"/>
+</toolbar>
+<toolbar name="EntryToolbar">
+	<toolitem name="Favicon"/>
+	<toolitem name="Location"/>
+	<toolitem name="ToolbarGo"/>
+</toolbar>
+<toolbar name="BookmarksBar">
+</toolbar>
+</editabletoolbar>
+
diff --git a/data/ui/epiphany-ui.xml b/data/ui/epiphany-ui.xml
new file mode 100644
index 000000000..d4fbb636a
--- /dev/null
+++ b/data/ui/epiphany-ui.xml
@@ -0,0 +1,159 @@
+<ui>
+<menubar>
+<menu name="FileMenu" action="File">  
+        <menuitem name="FileNewWindowMenu" action="FileNewWindow"/>
+	<menuitem name="FileNewTabMenu" action="FileNewTab"/>
+	<menuitem name="FileOpenMenu" action="FileOpen"/>
+	<separator name="FileSep1"/>	
+        <menuitem name="FileSaveAsMenu" action="FileSaveAs"/>
+	<separator name="FileSep2"/>
+	<menuitem name="FilePrintMenu" action="FilePrint"/>
+	<menuitem name="FileSendToMenu" action="FileSendTo"/>
+	<separator name="FileSep3"/>
+	<menuitem name="FileCloseWindowMenu" action="FileCloseWindow"/>
+</menu>
+
+<menu name="EditMenu" action="Edit">
+        <menuitem name="EditCutMenu" action="EditCut"/>
+        <menuitem name="EditCopyMenu" action="EditCopy"/>
+        <menuitem name="EditPasteMenu" action="EditPaste"/>
+	<separator name="EditSep1"/> 
+        <menuitem name="EditSelectAllMenu" action="EditSelectAll"/>
+	<separator name="EditSep2"/>
+	<menuitem name="EditFindMenu" action="EditFind"/>
+	<menuitem name="EditFindNextMenu" action="EditFindNext"/> 
+	<menuitem name="EditFindPrevMenu" action="EditFindPrev"/>
+	<separator name="EditSep3"/>
+	<menuitem name="EditPersonalDataMenu" action="EditPersonalData"/>
+	<menuitem name="EditToolbarMenu" action="EditToolbar"/>
+	<menuitem name="EditPrefsMenu" action="EditPrefs"/> 
+</menu>
+
+<menu name="ViewMenu" action="View">
+	<menuitem name="ViewToolbarMenu" action="ViewToolbar"/>
+	<menuitem name="ViewBookmarksBarMenu" action="ViewBookmarksBar"/>
+	<menuitem name="ViewStatusbarMenu" action="ViewStatusbar"/>
+	<menuitem name="ViewFullscreenMenu" action="ViewFullscreen"/>
+	<separator name="ViewSep1"/>
+	<menuitem name="ViewZoomInMenu" action="ViewZoomIn"/>
+	<menuitem name="ViewZoomOutMenu" action="ViewZoomOut"/>
+	<menuitem name="ViewZoomNormalMenu" action="ViewZoomNormal"/>
+	<separator name="ViewSep2"/>
+	<placeholder name="ViewEncodingsPlaceholder"/>
+	<menuitem name="ViewPageSourceMenu" action="ViewPageSource"/>
+	<separator name="ViewSep3"/>
+	<menuitem name="ViewStopMenu" action="ViewStop"/> 
+	<menuitem name="ViewReloadMenu" action="ViewReload"/>
+</menu>
+
+<menu name="GoMenu" action="Go">
+	<menuitem name="GoBackMenu" action="GoBack"/>
+	<menuitem name="GoForwardMenu" action="GoForward"/>
+	<menuitem name="GoUpMenu" action="GoUp"/>
+	<separator name="GoSep1"/>
+	<menuitem name="GoHomeMenu" action="GoHome"/>	
+	<menuitem name="GoHistoryMenu" action="GoHistory"/>
+	<separator name="GoSep2"/>
+	<menuitem name="GoLocationMenu" action="GoLocation"/>
+	<separator name="GoSep3"/>
+</menu>
+
+<menu name="BookmarksMenu" action="Bookmarks">
+	<menuitem name="BookmarksAddBookmarkMenu" action="FileBookmarkPage"/>
+	<menuitem name="BookmarksEditMenu" action="GoBookmarks"/>
+	<separator name="BookmarksSep1"/>
+</menu>
+
+<menu name="TabsMenu" action="Tabs">
+	<menuitem name="TabsPreviousMenu" action="TabsPrevious"/>
+	<menuitem name="TabsNextMenu" action="TabsNext"/>
+	<separator name="TabsSep1"/>
+	<menuitem name="TabsMoveLeftMenu" action="TabsMoveLeft"/>
+	<menuitem name="TabsMoveRightMenu" action="TabsMoveRight"/>
+        <menuitem name="TabsDetachMenu" action="TabsDetach"/>
+	<placeholder name="TabsOpen">
+	<separator name="TabsSep2"/>
+	</placeholder>
+</menu>
+
+<menu name="HelpMenu" action="Help">
+	<menuitem name="HelpContentsMenu" action="HelpContents"/>
+	<menuitem name="HelpAboutMenu" action="HelpAbout"/>
+</menu>
+</menubar>
+
+<popup name="EphyInputPopup" action="PopupAction">
+	<menuitem name="EditCutIP" action="EditCut"/> 
+	<menuitem name="EditCopyIP" action="EditCopy"/>
+	<menuitem name="EditPasteIP" action="EditPaste"/>
+</popup>
+<popup name="EphyTextPopup" action="PopupAction">
+	<menuitem name="EditCopyTP" action="EditCopy"/>
+</popup>
+<popup name="EphyDocumentPopup" action="PopupAction">
+	<menuitem name="GoBackDP" action="GoBack"/>
+	<menuitem name="GoForwardDP" action="GoForward"/>
+	<menuitem name="GoReloadDP" action="ViewReload"/>
+	<separator name="DPSep1"/>
+	<menuitem name="EditCopyDP" action="EditCopy"/>
+	<separator name="DPSep2"/>
+	<menuitem name="SavePageAsDP" action="FileSaveAs"/>
+	<menuitem name="SaveBackgroundAsDP" action="SaveBackgroundAs"/>
+	<menuitem name="BookmarkPageDP" action="ContextBookmarkPage"/>
+</popup>
+
+<popup name="EphyFramedDocumentPopup" action="PopupAction">
+	<menuitem name="GoBackFDP" action="GoBack"/>
+	<menuitem name="GoForwardFDP" action="GoForward"/>
+	<menuitem name="GoReloadFDP" action="ViewReload"/>
+	<separator name="FDPSep1"/>
+	<menuitem name="EditCopyFDP" action="EditCopy"/>
+	<separator name="FDPSep2"/>
+	<menuitem name="SavePageAsFDP" action="FileSaveAs"/>
+	<menuitem name="SaveBackgroundAsFDP" action="SaveBackgroundAs"/>
+	<menuitem name="BookmarkPageFDP" action="ContextBookmarkPage"/>
+	<separator name="FDBSep3"/>
+	<menuitem name="OpenFrameFDP" action="OpenFrame"/>
+	<menuitem name="OpenFrameInNewWindowFDP" action="OpenFrameInNewWindow"/>
+	<menuitem name="OpenFrameInNewTabFDP" action="OpenFrameInNewTab"/>
+</popup>
+
+<popup name="EphyLinkPopup" action="PopupAction">
+	<menuitem name="OpenLinkLP" action="OpenLink"/>
+        <menuitem name="OpenLinkInNewWindowLP" action="OpenLinkInNewWindow"/>
+	<menuitem name="OpenLinkInNewTabLP" action="OpenLinkInNewTab"/>
+	<separator name="LPSep1"/>
+	<menuitem name="DownloadLinkLP" action="DownloadLink"/>
+	<menuitem name="BookmarkLinkLP" action="BookmarkLink"/>
+	<menuitem name="CopyLinkAddressLP" action="CopyLinkAddress"/>
+</popup>
+
+<popup name="EphyImagePopup" action="PopupAction">
+	<menuitem name="OpenImageIP" action="OpenImage"/>
+	<menuitem name="OpenImageInNewWindowIP" action="OpenImageInNewWindow"/>
+	<menuitem name="OpenImageInNewTabIP" action="OpenImageInNewTab"/>
+	<separator name="IPSep1"/>
+	<menuitem name="SaveImageAsIP" action="SaveImageAs"/>
+	<menuitem name="SetImageAsBackgroundIP" action="SetImageAsBackground"/>
+	<menuitem name="CopyImageLocationIP" action="CopyImageLocation"/>
+</popup>
+
+<popup name="EphyImageLinkPopup" action="PopupAction">
+	<menuitem name="OpenLinkILP" action="OpenLink"/>
+        <menuitem name="OpenLinkInNewWindowILP" action="OpenLinkInNewWindow"/>
+	<menuitem name="OpenLinkInNewTabILP" action="OpenLinkInNewTab"/>
+	<separator name="ILPSep1"/>
+	<menuitem name="DownloadLinkILP" action="DownloadLink"/>
+	<menuitem name="BookmarkLinkILP" action="BookmarkLink"/>
+	<menuitem name="CopyLinkAddressILP" action="CopyLinkAddress"/>
+	<separator name="ILPSep2"/>
+	<menuitem name="OpenImageILP" action="OpenImage"/>
+	<menuitem name="OpenImageInNewWindowILP" action="OpenImageInNewWindow"/>
+	<menuitem name="OpenImageInNewTabILP" action="OpenImageInNewTab"/>
+	<separator name="ILPSep3"/>
+	<menuitem name="SaveImageAsILP" action="SaveImageAs"/>
+	<menuitem name="SetImageAsBackgroundILP" action="SetImageAsBackground"/>
+	<menuitem name="CopyImageLocationILP" action="CopyImageLocation"/>
+</popup>
+
+</ui>