From e06e9b088a12dd098e11110f7d0d77ab8032e4eb Mon Sep 17 00:00:00 2001 From: raveit Date: Mon, 5 Nov 2012 17:14:51 +0100 Subject: Port to gsettings --- data/Makefile.am | 63 ++--- data/engrampa.convert | 49 ++++ data/engrampa.schemas | 426 ---------------------------------- data/org.mate.engrampa.gschema.xml.in | 217 +++++++++++++++++ 4 files changed, 302 insertions(+), 453 deletions(-) create mode 100644 data/engrampa.convert delete mode 100644 data/engrampa.schemas create mode 100644 data/org.mate.engrampa.gschema.xml.in (limited to 'data') diff --git a/data/Makefile.am b/data/Makefile.am index de0a70b..41375d6 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,29 +1,31 @@ -@INTLTOOL_DESKTOP_RULE@ - SUBDIRS = ui icons +desktopdir = $(datadir)/applications desktop_in_in_files = engrampa.desktop.in.in desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in) +desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) -desktopdir = $(datadir)/applications -desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) +@INTLTOOL_DESKTOP_RULE@ matchdir = $(datadir)/engrampa match_DATA = packages.match -schemadir = @MATECONF_SCHEMA_FILE_DIR@ -schema_DATA = engrampa.schemas +gsettingsschema_in_files = org.mate.engrampa.gschema.xml.in +gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml) +.PRECIOUS: $(gsettings_SCHEMAS) -gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor +@INTLTOOL_XML_NOMERGE_RULE@ -install-data-local: -if MATECONF_SCHEMAS_INSTALL - MATECONF_CONFIG_SOURCE=$(MATECONF_SCHEMA_CONFIG_SOURCE) $(MATECONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA) -endif +@GSETTINGS_RULES@ -install-data-hook: update-icon-cache -uninstall-hook: update-icon-cache -update-icon-cache: +convertdir = $(datadir)/MateConf/gsettings +convert_DATA = engrampa.convert + +gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor + +install-data-hook: update-cache +uninstall-hook: update-cache +update-cache: if test -z "$(DESTDIR)"; then \ echo "Updating Gtk icon cache."; \ $(gtk_update_icon_cache); \ @@ -32,18 +34,25 @@ update-icon-cache: echo "*** $(gtk_update_icon_cache)"; \ fi - -EXTRA_DIST = \ - $(desktop_in_in_files) \ - $(desktop_in_files) \ - $(desktop_DATA) \ - packages.match.in \ - packages.match \ - $(schema_DATA) - - -DISTCLEANFILES = \ - $(desktop_in_files) \ - $(desktop_DATA) +EXTRA_DIST = \ + engrampa.convert \ + packages.match.in \ + packages.match \ + $(desktop_in_in_files) \ + $(desktop_in_files) \ + $(desktop_DATA) \ + $(gsettingsschema_in_files) \ + $(NULL) + +DISTCLEANFILES = \ + $(desktop_in_files) \ + $(desktop_DATA) \ + $(NULL) + +CLEANFILES = \ + $(gsettings_SCHEMAS) \ + $(NULL) + +dist-hook: cd $(distdir); rm -f $(CLEANFILES) -include $(top_srcdir)/git.mk diff --git a/data/engrampa.convert b/data/engrampa.convert new file mode 100644 index 0000000..a3e0832 --- /dev/null +++ b/data/engrampa.convert @@ -0,0 +1,49 @@ +[org.mate.engrampa.listing] +sort-method = /org/mate/engrampa/listing/sort_method +sort-type = /org/mate/engrampa/listing/sort_type +list-mode = /org/mate/engrampa/listing/list_mode +show-type = /org/mate/engrampa/listing/show_type +show-size = /org/mate/engrampa/listing/show_size +show-time = /org/mate/engrampa/listing/show_time +show-path = /org/mate/engrampa/listing/show_path +use-mime-icons = /org/mate/engrampa/listing/use_mime_icons +name-column-width = /org/mate/engrampa/listing/name_column_width + +[org.mate.engrampa.ui] +history-len = /org/mate/engrampa/ui/history_len +window-width = /org/mate/engrampa/ui/window_width +window-height = /org/mate/engrampa/ui/window_height +sidebar-width = /org/mate/engrampa/ui/sidebar_width +view-toolbar = /org/mate/engrampa/ui/view_toolbar +view-statusbar = /org/mate/engrampa/ui/view_statusbar +view-folders = /org/mate/engrampa/ui/view_folders + +[org.mate.engrampa.general] +editors = /org/mate/engrampa/general/editors +compression-level = /org/mate/engrampa/general/compression_level +encrypt-header = /org/mate/engrampa/general/encrypt_header + +[org.mate.engrampa.dialogs.extract] +overwrite = /org/mate/engrampa/dialogs/extract/overwrite +skip-newer = /org/mate/engrampa/dialogs/extract/skip_newer +recreate-folders = /org/mate/engrampa/dialogs/extract/recreate_folders + +[org.mate.engrampa.dialogs.add] +current-folder = /org/mate/engrampa/dialogs/add/current_folder +filename = /org/mate/engrampa/dialogs/add/filename +include-files = /org/mate/engrampa/dialogs/add/include_files +exclude-files = /org/mate/engrampa/dialogs/add/exclude_files +exclude-folders = /org/mate/engrampa/dialogs/add/exclude_folders +update = /org/mate/engrampa/dialogs/add/update +recursive = /org/mate/engrampa/dialogs/add/recursive +no-symlinks = /org/mate/engrampa/dialogs/add/no_symlinks + +[org.mate.engrampa.dialogs.batchadd] +default-extension = /org/mate/engrampa/dialogs/batch-add/default_extension +other-options = /org/mate/engrampa/dialogs/batch-add/other_options +volume-size = /org/mate/engrampa/dialogs/batch-add/volume_size + +[org.gnome.engrampa.dialogs.lastoutput] +width = /org/mate/engrampa/dialogs/last_output/width +height = /org/mate/engrampa/dialogs/last_output/height + diff --git a/data/engrampa.schemas b/data/engrampa.schemas deleted file mode 100644 index 75cd881..0000000 --- a/data/engrampa.schemas +++ /dev/null @@ -1,426 +0,0 @@ - - - - - /schemas/apps/engrampa/listing/sort_method - /apps/engrampa/listing/sort_method - engrampa - string - name - - How to sort files - What criteria must be used to arrange files. Possible values: - name, size, type, time, path. - - - - - - /schemas/apps/engrampa/listing/sort_type - /apps/engrampa/listing/sort_type - engrampa - string - ascending - - Sort type - Whether to sort in ascending or descending direction. Possible - values: ascending, descending. - - - - - /schemas/apps/engrampa/listing/list_mode - /apps/engrampa/listing/list_mode - engrampa - string - as_folder - - List Mode - Whether to view all files in the archive (all_files), or - view the archive as a folder (as_folder). - - - - - /schemas/apps/engrampa/listing/show_type - /apps/engrampa/listing/show_type - engrampa - bool - true - - Display type - Display the Type column in the main window. - - - - - /schemas/apps/engrampa/listing/show_size - /apps/engrampa/listing/show_size - engrampa - bool - true - - Display size - Display the Size column in the main window. - - - - - /schemas/apps/engrampa/listing/show_time - /apps/engrampa/listing/show_time - engrampa - bool - true - - Display time - Display the Time column in the main window. - - - - - /schemas/apps/engrampa/listing/show_path - /apps/engrampa/listing/show_path - engrampa - bool - true - - Display path - Display the Path column in the main window. - - - - - /schemas/apps/engrampa/listing/use_mime_icons - /apps/engrampa/listing/use_mime_icons - engrampa - bool - true - - Use mime icons - if TRUE will display icons depending on the file type (slower), - otherwise will use always the same icon for all files (faster). - - - - - - /schemas/apps/engrampa/listing/name_column_width - /apps/engrampa/listing/name_column_width - engrampa - int - 250 - - Name column width - The default width ofthe name column the file list. - - - - - /schemas/apps/engrampa/ui/history_len - /apps/engrampa/ui/history_len - engrampa - int - 5 - - Max history length - Max number of items in the Open Recents menu. - - - - - /schemas/apps/engrampa/ui/window_width - /apps/engrampa/ui/window_width - engrampa - int - 600 - - - - - - - - - /schemas/apps/engrampa/ui/window_height - /apps/engrampa/ui/window_height - engrampa - int - 480 - - - - - - - - - /schemas/apps/engrampa/ui/sidebar_width - /apps/engrampa/ui/sidebar_width - engrampa - int - 200 - - - - - - - - - /schemas/apps/engrampa/ui/view_toolbar - /apps/engrampa/ui/view_toolbar - engrampa - bool - true - - View toolbar - Whether to display the toolbar. - - - - - /schemas/apps/engrampa/ui/view_statusbar - /apps/engrampa/ui/view_statusbar - engrampa - bool - true - - View statusbar - Whether to display the statusbar. - - - - - /schemas/apps/engrampa/ui/view_folders - /apps/engrampa/ui/view_folders - engrampa - bool - false - - View the folders pane - Whether to display the folders pane. - - - - - /schemas/apps/engrampa/general/editors - /apps/engrampa/general/editors - engrampa - list - string - [] - - Editors - List of applications entered in the Open file dialog and not - associated with the file type. - - - - - /schemas/apps/engrampa/general/compression_level - /apps/engrampa/general/compression_level - engrampa - string - normal - - Compression level - Compression level used when adding files to an archive. - Possible values : very_fast, fast, normal, maximum. - - - - - /schemas/apps/engrampa/general/encrypt_header - /apps/engrampa/general/encrypt_header - engrampa - bool - false - - Encrypt the archive header - Whether to encrypt the archive header. If the header is encrypted the password will be required to list the archive content as well. - - - - - /schemas/apps/engrampa/general/migrate_directories - /apps/engrampa/general/migrate_directories - gthumb - bool - true - - - - - - - - - /schemas/apps/engrampa/dialogs/extract/overwrite - /apps/engrampa/dialogs/extract/overwrite - engrampa - bool - true - - Overwrite existing files - - - - - - /schemas/apps/engrampa/dialogs/extract/skip_newer - /apps/engrampa/dialogs/extract/skip_newer - engrampa - bool - false - - Do not overwrite newer files - - - - - - /schemas/apps/engrampa/dialogs/extract/recreate_folders - /apps/engrampa/dialogs/extract/recreate_folders - engrampa - bool - true - - Recreate the folders stored in the archive - - - - - - /schemas/apps/engrampa/dialogs/add/current_folder - /apps/engrampa/dialogs/add/current_folder - engrampa - string - - - - - - - - - /schemas/apps/engrampa/dialogs/add/filename - /apps/engrampa/dialogs/add/filename - engrampa - string - - - - - - - - - /schemas/apps/engrampa/dialogs/add/include_files - /apps/engrampa/dialogs/add/include_files - engrampa - string - - - - - - - - - /schemas/apps/engrampa/dialogs/add/exclude_files - /apps/engrampa/dialogs/add/exclude_files - engrampa - string - - - - - - - - - /schemas/apps/engrampa/dialogs/add/exclude_folders - /apps/engrampa/dialogs/add/exclude_folders - engrampa - string - - - - - - - - - /schemas/apps/engrampa/dialogs/extract/update - /apps/engrampa/dialogs/extract/update - engrampa - bool - false - - - - - - - - /schemas/apps/engrampa/dialogs/extract/recursive - /apps/engrampa/dialogs/extract/recursive - engrampa - bool - true - - - - - - - - /schemas/apps/engrampa/dialogs/extract/no_symlinks - /apps/engrampa/dialogs/extract/no_symlinks - engrampa - bool - false - - - - - - - - /schemas/apps/engrampa/dialogs/batch-add/default_extension - /apps/engrampa/dialogs/batch-add/default_extension - engrampa - string - .tar.gz - - - - - - - - /schemas/apps/engrampa/dialogs/batch-add/other_options - /apps/engrampa/dialogs/batch-add/other_options - engrampa - bool - false - - - - - - - - /schemas/apps/engrampa/dialogs/batch-add/volume_size - /apps/engrampa/dialogs/batch-add/volume_size - engrampa - int - 0 - - Default volume size - The default size for volumes. - - - - - diff --git a/data/org.mate.engrampa.gschema.xml.in b/data/org.mate.engrampa.gschema.xml.in new file mode 100644 index 0000000..07d486e --- /dev/null +++ b/data/org.mate.engrampa.gschema.xml.in @@ -0,0 +1,217 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 'name' + How to sort files + What criteria must be used to arrange files. Possible values: name, size, type, time, path. + + + 'ascending' + Sort type + Whether to sort in ascending or descending direction. Possible values: ascending, descending. + + + 'as-folder' + List Mode + Whether to view all files in the archive (all_files), or view the archive as a folder (as_folder). + + + true + Display type + Display the Type column in the main window. + + + true + Display size + Display the Size column in the main window. + + + true + Display time + Display the Time column in the main window. + + + true + Display path + Display the Path column in the main window. + + + true + Use mime icons + if TRUE will display icons depending on the file type (slower), otherwise will use always the same icon for all files (faster). + + + 250 + Name column width + The default width ofthe name column the file list. + + + + + 5 + Max history length + Max number of items in the Open Recents menu. + + + 600 + + + 480 + + + 200 + + + true + View toolbar + Whether to display the toolbar. + + + true + View statusbar + Whether to display the statusbar. + + + false + View the folders pane + Whether to display the folders pane. + + + + + [] + Editors + List of applications entered in the Open file dialog and not associated with the file type. + + + 'normal' + Compression level + Compression level used when adding files to an archive. Possible values : very_fast, fast, normal, maximum. + + + false + Encrypt the archive header + Whether to encrypt the archive header. If the header is encrypted the password will be required to list the archive content as well. + + + true + + + + + + + + + + true + Overwrite existing files + + + false + Do not overwrite newer files + + + true + Recreate the folders stored in the archive + + + false + + + true + + + false + + + + + '' + + + '' + + + '' + + + '' + + + '' + + + + + '.tar.gz' + + + false + + + 0 + Default volume size + The default size for volumes. + + + + + -1 + + + -1 + + + -- cgit v1.2.1