aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--data/ui/epiphany-bookmark-editor-ui.xml4
-rw-r--r--data/ui/epiphany-history-window-ui.xml4
-rw-r--r--data/ui/epiphany-ui.xml4
4 files changed, 15 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 2b0b93ff9..eddd18656 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-04-11 Crispin Flowerday <gnome@flowerday.cx>
+
+ * data/ui/epiphany-bookmark-editor-ui.xml:
+ * data/ui/epiphany-history-window-ui.xml:
+ * data/ui/epiphany-ui.xml:
+
+ Reorder the menu items everywhere to have new tab above
+ new window. Fixes bug #303417
+
2006-04-10 Paul Drain <pd@cipherfunk.org>
* data/art/Makefile.am:
diff --git a/data/ui/epiphany-bookmark-editor-ui.xml b/data/ui/epiphany-bookmark-editor-ui.xml
index b62b5b9c9..83436a898 100644
--- a/data/ui/epiphany-bookmark-editor-ui.xml
+++ b/data/ui/epiphany-bookmark-editor-ui.xml
@@ -4,8 +4,8 @@
<menu name="FileMenu" action="File">
<menuitem action="NewTopic"/>
<separator/>
- <menuitem action="OpenInWindow"/>
<menuitem action="OpenInTab"/>
+ <menuitem action="OpenInWindow"/>
<separator/>
<menuitem action="Rename"/>
<menuitem action="Delete"/>
@@ -39,8 +39,8 @@
</menubar>
<popup name="EphyBookmarkEditorPopup" action="PopupAction">
- <menuitem action="OpenInWindow"/>
<menuitem action="OpenInTab"/>
+ <menuitem action="OpenInWindow"/>
<separator/>
<menuitem action="Copy"/>
<separator/>
diff --git a/data/ui/epiphany-history-window-ui.xml b/data/ui/epiphany-history-window-ui.xml
index 2fb22e835..e76158880 100644
--- a/data/ui/epiphany-history-window-ui.xml
+++ b/data/ui/epiphany-history-window-ui.xml
@@ -2,8 +2,8 @@
<menubar>
<menu name="FileMenu" action="File">
- <menuitem name="FileOpenInWindow" action="OpenInWindow"/>
<menuitem name="FileOpenInTab" action="OpenInTab"/>
+ <menuitem name="FileOpenInWindow" action="OpenInWindow"/>
<separator name="FileSep1"/>
<menuitem name="FileBookmarkLink" action="BookmarkLink"/>
<menuitem name="FileDelete" action="Delete"/>
@@ -34,8 +34,8 @@
</menubar>
<popup name="EphyHistoryWindowPopup" action="PopupAction">
- <menuitem name="OpenInWindowHST" action="OpenInWindow"/>
<menuitem name="OpenInTabHST" action="OpenInTab"/>
+ <menuitem name="OpenInWindowHST" action="OpenInWindow"/>
<separator name="HistoryPopupSep1"/>
<menuitem name="CopyHST" action="Copy"/>
<separator name="HistoryPopupSep2"/>
diff --git a/data/ui/epiphany-ui.xml b/data/ui/epiphany-ui.xml
index 0f38209ac..97283fbf7 100644
--- a/data/ui/epiphany-ui.xml
+++ b/data/ui/epiphany-ui.xml
@@ -1,8 +1,8 @@
<ui>
<menubar>
<menu name="FileMenu" action="File">
- <menuitem name="FileNewWindowMenu" action="FileNewWindow"/>
<menuitem name="FileNewTabMenu" action="FileNewTab"/>
+ <menuitem name="FileNewWindowMenu" action="FileNewWindow"/>
<menuitem name="FileOpenMenu" action="FileOpen"/>
<separator name="FileSep1"/>
<menuitem name="FileSaveAsMenu" action="FileSaveAs"/>
@@ -136,8 +136,8 @@
<popup name="EphyLinkPopup" action="PopupAction">
<menuitem name="OpenLinkLP" action="OpenLink"/>
- <menuitem name="OpenLinkInNewWindowLP" action="OpenLinkInNewWindow"/>
<menuitem name="OpenLinkInNewTabLP" action="OpenLinkInNewTab"/>
+ <menuitem name="OpenLinkInNewWindowLP" action="OpenLinkInNewWindow"/>
<separator name="LPSep1"/>
<menuitem name="EditCopyLP" action="EditCopy"/>
<separator name="LPSep2"/>