A data/evince.schemas.in:

2005-02-07  Christian Persch  <chpe@cvs.gnome.org>

	* Makefile.am:
	* configure.ac:
	* data/.cvsignore:
	* data/Makefile.am:
	* data/evince-ui.xml:
	A data/evince.schemas.in:
	* po/POTFILES.in:
	* shell/ev-stock-icons.c: (ev_stock_icons_init):
	* shell/ev-stock-icons.h:
	* shell/ev-window.c: (update_chrome_visibility),
	(update_chrome_flag), (ev_window_cmd_edit_find),
	(ev_window_update_fullscreen_popup), (ev_window_fullscreen),
	(ev_window_unfullscreen), (ev_window_focus_in_event),
	(ev_window_focus_out_event), (ev_window_cmd_leave_fullscreen),
	(ev_window_view_toolbar_cb), (ev_window_view_statusbar_cb),
	(ev_window_view_sidebar_cb), (find_bar_close_cb),
	(ev_window_dispose), (ev_window_class_init),
	(set_action_properties), (set_chrome_actions), (load_chrome),
	(ev_window_init):

	Implement fullscreen mode changes from bug #164776.
	Also implement persistent chrome toggles.

4 files changed, 61 insertions, 1 deletions

diff --git a/data/.cvsignore b/data/.cvsignore
index 80e5ad6..781a35c 100644
--- a/data/.cvsignore
+++ b/data/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
 Makefile.in
 evince.desktop
+evince.schemas
diff --git a/data/Makefile.am b/data/Makefile.am
index 2ff2f59..60f14f9 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,4 +1,5 @@
 @INTLTOOL_DESKTOP_RULE@
+@INTLTOOL_SCHEMAS_RULE@
 
 NULL =
 
@@ -23,12 +24,27 @@ DESKTOP_FILES= $(DESKTOP_IN_FILES:.desktop.in=.desktop)
 desktopdir = $(datadir)/applications
 desktop_DATA = $(DESKTOP_FILES)
 
+schema_in_files = evince.schemas.in
+schemadir = $(GCONF_SCHEMA_FILE_DIR)
+schema_DATA = $(schema_in_files:.schemas.in=.schemas)
+
+install-data-local:
+if GCONF_SCHEMAS_INSTALL
+	if test -z "$(DESTDIR)" ; then \
+	for p in $(schema_DATA) ; do \
+	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/data/$$p >&1 > /dev/null; \
+	done \
+	fi
+endif
+
 EXTRA_DIST =				\
 	$(stock_DATA)			\
 	$(glade_DATA)			\
 	$(ui_DATA)			\
 	$(DESKTOP_IN_FILES)		\
+	$(schema_in_files)		\
 	$(NULL)
 
 DISTCLEANFILES = \
-	$(DESKTOP_FILES)
+	$(DESKTOP_FILES)	\
+	$(schema_DATA)
diff --git a/data/evince-ui.xml b/data/evince-ui.xml
index b1467c0..88d18a2 100644
--- a/data/evince-ui.xml
+++ b/data/evince-ui.xml
@@ -62,4 +62,10 @@
     <toolitem action="ContinuousPage"/>
 -->
   </toolbar>
+
+  <toolbar name="LeaveFullscreenToolbar">
+    <toolitem action="LeaveFullscreen"/>
+  </toolbar>
+
+  <accelerator name="LeaveFullscreenAccel" action="LeaveFullscreen"/>
 </ui>
diff --git a/data/evince.schemas.in b/data/evince.schemas.in
new file mode 100644
index 0000000..e02f543
--- /dev/null
+++ b/data/evince.schemas.in
@@ -0,0 +1,37 @@
+<gconfschemafile>
+  <schemalist>
+    <schema>
+      <key>/schemas/apps/evince/show_toolbar</key>
+      <applyto>/apps/evince/show_toolbar/applyto>
+      <owner>evince</owner>
+      <type>bool</type>
+      <default>true</default>
+      <locale name="C">
+        <short>Show toolbar by default</short>
+        <long>Show toolbar by default.</long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/apps/evince/show_sidebar</key>
+      <applyto>/apps/evince/show_sidebar/applyto>
+      <owner>evince</owner>
+      <type>bool</type>
+      <default>true</default>
+      <locale name="C">
+        <short>Show sidebar by default</short>
+        <long>Show sidebar by default.</long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/apps/evince/show_statusbar</key>
+      <applyto>/apps/evince/show_statusbar/applyto>
+      <owner>evince</owner>
+      <type>bool</type>
+      <default>true</default>
+      <locale name="C">
+        <short>Show statusbar by default</short>
+        <long>Show statusbar by default.</long>
+      </locale>
+    </schema>
+  </schemalist>
+</gconfschemafile>