diff options
| author | Carlos Garcia Campos <carlosgc@gnome.org> | 2007-04-20 13:16:51 (GMT) |
|---|---|---|
| committer | Carlos Garcia Campos <carlosgc@src.gnome.org> | 2007-04-20 13:16:51 (GMT) |
| commit | 6e960097c863c872433bc7d2da1253b18b9bf70e (patch) | |
| tree | 703ecff533c764116e1ecb50df566dc3041c8fa9 /data | |
| parent | 8497f6813f18d359a857ec1ac841059dcc24e833 (diff) | |
Make fullscreen toolbar always visible. Do not use egg toolbars for
2007-04-20 Carlos Garcia Campos <carlosgc@gnome.org>
* data/Makefile.am:
* data/evince-ui.xml:
* shell/ev-stock-icons.[ch]:
* shell/ev-application.[ch]: (ev_application_shutdown),
(ev_application_init), (ev_application_get_toolbars_model):
* shell/ev-window.c: (update_chrome_visibility),
(fullscreen_toolbar_setup_item_properties),
(ev_window_run_fullscreen), (ev_window_stop_fullscreen),
(ev_window_run_presentation), (ev_window_stop_presentation),
(ev_window_run_preview), (ev_window_screen_changed),
(ev_window_cmd_leave_fullscreen), (ev_window_cmd_start_presentation),
(ev_window_dispose), (ev_window_init):
Make fullscreen toolbar always visible. Do not use egg toolbars for
fullscreen and preview modes since such toolbars are not editables.
Fixes bugs #300278, #338910 and #316188.
svn path=/trunk/; revision=2412
Diffstat (limited to 'data')
| -rw-r--r-- | data/Makefile.am | 1 | ||||
| -rw-r--r-- | data/evince-preview-toolbar.xml | 25 | ||||
| -rw-r--r-- | data/evince-ui.xml | 23 |
3 files changed, 23 insertions, 26 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 669742c..df65d94 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -18,7 +18,6 @@ uidir = $(pkgdatadir) ui_DATA = \ evince-ui.xml \ evince-toolbar.xml \ - evince-preview-toolbar.xml \ hand-open.png \ $(NULL) diff --git a/data/evince-preview-toolbar.xml b/data/evince-preview-toolbar.xml deleted file mode 100644 index 23fed0e..0000000 --- a/data/evince-preview-toolbar.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0"?> -<toolbars version="1.0"> -<available> - <toolitem name="GoPreviousPage"/> - <toolitem name="GoNextPage"/> - <toolitem name="PageSelector"/> - <toolitem name="ViewZoomIn"/> - <toolitem name="ViewZoomOut"/> - <toolitem name="ViewBestFit"/> - <toolitem name="ViewPageWidth"/> -</available> - -<toolbar name="PreviewTooBar" editable="false"> - <toolitem name="GoPreviousPage"/> - <toolitem name="GoNextPage"/> - <separator/> - <toolitem name="PageSelector"/> - <separator/> - <toolitem name="ViewPageWidth"/> - <toolitem name="ViewBestFit"/> - <toolitem name="ViewZoomIn"/> - <toolitem name="ViewZoomOut"/> -</toolbar> - -</toolbars> diff --git a/data/evince-ui.xml b/data/evince-ui.xml index fba8ac2..685d47d 100644 --- a/data/evince-ui.xml +++ b/data/evince-ui.xml @@ -110,4 +110,27 @@ <accelerator name="CtrlKpPlusAccel" action="CtrlKpPlus"/> <accelerator name="CtrlKpMinusAccel" action="CtrlKpMinus"/> + <toolbar name="FullscreenToolbar"> + <toolitem name="GoPreviousPage" action="GoPreviousPage"/> + <toolitem name="GoNextPage" action="GoNextPage"/> + <separator/> + <toolitem name="PageSelector" action="PageSelector"/> + <separator/> + <toolitem name="ViewZoom" action="ViewZoom"/> + <separator expand="true"/> + <toolitem name="StartPresentation" action="StartPresentation"/> + <toolitem name="LeaveFullscreen" action="LeaveFullscreen"/> + </toolbar> + + <toolbar name="PreviewToolbar"> + <toolitem name="GoPreviousPage" action="GoPreviousPage"/> + <toolitem name="GoNextPage" action="GoNextPage"/> + <separator/> + <toolitem name="PageSelector" action="PageSelector"/> + <separator/> + <toolitem name="ViewPageWidth" action="ViewPageWidth"/> + <toolitem name="ViewBestFit" action="ViewBestFit"/> + <toolitem name="ViewZoomIn" action="ViewZoomIn"/> + <toolitem name="ViewZoomOut" action="ViewZoomOut"/> + </toolbar> </ui> |