aboutsummaryrefslogtreecommitdiffstats
path: root/data/ui
diff options
context:
space:
mode:
authorXan Lopez <xan@igalia.com>2011-12-13 23:45:10 +0800
committerXan Lopez <xan@igalia.com>2011-12-14 23:30:21 +0800
commitc1c74c929c1e773d1f79d1b3bd0cf10bb572f8f9 (patch)
tree407b07bc318b263f518747ece8e668b933f9ed04 /data/ui
parent1ce161d56a3db3c436e5fbf888472c1f864cebb8 (diff)
downloadgsoc2013-epiphany-c1c74c929c1e773d1f79d1b3bd0cf10bb572f8f9.tar
gsoc2013-epiphany-c1c74c929c1e773d1f79d1b3bd0cf10bb572f8f9.tar.gz
gsoc2013-epiphany-c1c74c929c1e773d1f79d1b3bd0cf10bb572f8f9.tar.bz2
gsoc2013-epiphany-c1c74c929c1e773d1f79d1b3bd0cf10bb572f8f9.tar.lz
gsoc2013-epiphany-c1c74c929c1e773d1f79d1b3bd0cf10bb572f8f9.tar.xz
gsoc2013-epiphany-c1c74c929c1e773d1f79d1b3bd0cf10bb572f8f9.tar.zst
gsoc2013-epiphany-c1c74c929c1e773d1f79d1b3bd0cf10bb572f8f9.zip
Remove custom EphyToolbar in favor of a vanilla GtkToolbar
This allows us to stop using EggEditableToolbar here, we just load a normal toolbar from GtkUIManager in EphyWindow. The special toolbar actions and methods have been moved to EphyWindow too, mostly in a mechanical fashion (probably some simplifications are possible). The code in the bookmarks UI that depended on EphyToolbar has been #if zeroed instead of porting it, since it will go away in the near future too. https://bugzilla.gnome.org/show_bug.cgi?id=664483
Diffstat (limited to 'data/ui')
-rw-r--r--data/ui/Makefile.am2
-rw-r--r--data/ui/epiphany-fs-toolbar.xml10
-rw-r--r--data/ui/epiphany-toolbar.xml36
-rw-r--r--data/ui/epiphany-ui.xml14
4 files changed, 8 insertions, 54 deletions
diff --git a/data/ui/Makefile.am b/data/ui/Makefile.am
index 7ffa3b1cb..4e148e1c6 100644
--- a/data/ui/Makefile.am
+++ b/data/ui/Makefile.am
@@ -1,10 +1,8 @@
xmldir = $(pkgdatadir)
xml_DATA = \
epiphany-bookmarksbar.xml \
- epiphany-fs-toolbar.xml \
epiphany-bookmark-editor-ui.xml \
epiphany-ui.xml \
- epiphany-toolbar.xml \
epiphany-history-window-ui.xml
cssdir = $(pkgdatadir)
diff --git a/data/ui/epiphany-fs-toolbar.xml b/data/ui/epiphany-fs-toolbar.xml
deleted file mode 100644
index db1648422..000000000
--- a/data/ui/epiphany-fs-toolbar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<toolbars version="1.0">
-<toolbar name="Toolbar" style="icons-only" editable="false">
- <toolitem name="NavigationBack"/>
- <toolitem name="NavigationForward"/>
- <toolitem name="ViewStop"/>
- <toolitem name="ViewReload"/>
- <toolitem name="Location"/>
-</toolbar>
-</toolbars>
diff --git a/data/ui/epiphany-toolbar.xml b/data/ui/epiphany-toolbar.xml
deleted file mode 100644
index 80d74ed4f..000000000
--- a/data/ui/epiphany-toolbar.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<toolbars version="1.0">
-<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="Location"/>
- <toolitem name="ToolbarGo"/>
- <toolitem name="Zoom"/>
- <toolitem name="ViewZoomIn"/>
- <toolitem name="ViewZoomOut"/>
- <toolitem name="ViewZoomNormal"/>
-</available>
-<toolbar name="DefaultToolbar">
- <toolitem name="NavigationBack"/>
- <toolitem name="NavigationForward"/>
- <toolitem name="ViewStop"/>
- <toolitem name="ViewReload"/>
- <toolitem name="Location"/>
- <toolitem name="ViewZoomOut"/>
- <toolitem name="ViewZoomIn"/>
-</toolbar>
-</toolbars>
diff --git a/data/ui/epiphany-ui.xml b/data/ui/epiphany-ui.xml
index d9eb56de7..ebce0c372 100644
--- a/data/ui/epiphany-ui.xml
+++ b/data/ui/epiphany-ui.xml
@@ -164,12 +164,6 @@
<popup name="ToolbarPopup">
<placeholder name="SpecificItemsGroup">
</placeholder>
- <separator/>
- <menuitem action="MoveToolItem"/>
- <menuitem action="RemoveToolItem"/>
- <separator/>
- <menuitem action="RemoveToolbar"/>
- <separator/>
<placeholder name="ViewToolbarsGroup">
</placeholder>
<separator/>
@@ -177,6 +171,14 @@
<menuitem name="ViewDownloadsBar" action="ViewDownloadsBar"/>
</popup>
+ <toolbar name="DefaultToolbar">
+ <toolitem action="NavigationBack"/>
+ <toolitem action="NavigationForward"/>
+ <toolitem action="ViewStop"/>
+ <toolitem action="ViewReload"/>
+ <toolitem action="Location"/>
+ </toolbar>
+
<accelerator name="AlwaysStopAccel" action="ViewAlwaysStop"/>
<accelerator name="BrowseWithCaretAccel" action="BrowseWithCaret"/>