diff --git a/data/Makefile.am b/data/Makefile.am
index 502a783..eab9b93 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -3,10 +3,16 @@ desktop_in_files = pluma.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
-schemasdir = $(MATECONF_SCHEMA_FILE_DIR)
-schemas_in_files = pluma.schemas.in
-schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
-@INTLTOOL_SCHEMAS_RULE@
+@INTLTOOL_XML_NOMERGE_RULE@
+gsettings_SCHEMAS = org.mate.pluma.gschema.xml
+@GSETTINGS_RULES@
+
+%.gschema.xml.in: %.gschema.xml.in.in Makefile
+ $(AM_V_GEN) $(SED) \
+ -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' \
+ -e 's^\@ACTIVE_PLUGINS\@^$(ACTIVE_PLUGINS)^g' \
+ -e 's^\@TOOLBAR_STYLE\@^$(TOOLBAR_STYLE)^g' \
+ < $< > $@
man_MANS = pluma.1
@@ -16,28 +22,17 @@ pkgconfig_DATA = pluma.pc
bugreportdir = $(libexecdir)/pluma
bugreport_SCRIPTS = pluma-bugreport.sh
-if MATECONF_SCHEMAS_INSTALL
-install-data-local:
- if test -z "$(DESTDIR)" ; then \
- for p in $(schemas_DATA) ; do \
- MATECONF_CONFIG_SOURCE=$(MATECONF_SCHEMA_CONFIG_SOURCE) $(MATECONFTOOL) --makefile-install-rule $(top_builddir)/data/$$p ; \
- done \
- fi
-else
-install-data-local:
-endif
-
EXTRA_DIST = \
$(desktop_in_files) \
- $(schemas_in_files) \
- pluma.schemas.in.in \
+ $(gsettings_SCHEMAS_in_in) \
$(man_MANS) \
pluma.pc.in \
pluma-bugreport.sh.in
CLEANFILES = \
$(desktop_DATA) \
- $(schemas_DATA) \
+ $(gsettings_SCHEMAS_in) \
+ $(gsettings_SCHEMAS) \
$(pkgconfig_DATA)
diff --git a/data/org.mate.pluma.gschema.xml.in.in b/data/org.mate.pluma.gschema.xml.in.in
new file mode 100644
index 0000000..1e34fba
--- /dev/null
+++ b/data/org.mate.pluma.gschema.xml.in.in
@@ -0,0 +1,200 @@
+
+
+
+
+ true
+ <_summary>Use Default Font
+ <_description>Whether to use the system's default fixed width font for editing text instead of a font specific to pluma. If this option is turned off, then the font named in the "Editor Font" option will be used instead of the system font.
+
+
+ 'Monospace 12'
+ <_summary>Editor Font
+ <_description>A custom font that will be used for the editing area. This will only take effect if the "Use Default Font" option is turned off.
+
+
+ 'tango'
+ <_summary>Style Scheme
+ <_description>The ID of a GtkSourceView Style Scheme used to color the text.
+
+
+ false
+ <_summary>Create Backup Copies
+ <_description>Whether pluma should create backup copies for the files it saves. You can set the backup file extension with the "Backup Copy Extension" option.
+
+
+ false
+ <_summary>Autosave
+ <_description>Whether pluma should automatically save modified files after a time interval. You can set the time interval with the "Autosave Interval" option.
+
+
+ 10
+ <_summary>Autosave Interval
+ <_description>Number of minutes after which pluma will automatically save modified files. This will only take effect if the "Autosave" option is turned on.
+
+
+ [ 'dav', 'davs', 'ftp', 'sftp', 'smb', 'ssh' ]
+ <_summary>Writable VFS schemes
+ <_description>List of VFS schemes pluma supports in write mode. The 'file' scheme is writable by default.
+
+
+ 2000
+ <_summary>Maximum Number of Undo Actions
+ <_description>Maximum number of actions that pluma will be able to undo or redo. Use "-1" for unlimited number of actions.
+
+
+ 'GTK_WRAP_WORD'
+ <_summary>Line Wrapping Mode
+ <_description>Specifies how to wrap long lines in the editing area. Use "GTK_WRAP_NONE" for no wrapping, "GTK_WRAP_WORD" for wrapping at word boundaries, and "GTK_WRAP_CHAR" for wrapping at individual character boundaries. Note that the values are case-sensitive, so make sure they appear exactly as mentioned here.
+
+
+ 4
+ <_summary>Tab Size
+ <_description>Specifies the number of spaces that should be displayed instead of Tab characters.
+
+
+ false
+ <_summary>Insert spaces
+ <_description>Whether pluma should insert spaces instead of tabs.
+
+
+ false
+ <_summary>Automatic indent
+ <_description>Whether pluma should enable automatic indentation.
+
+
+ false
+ <_summary>Display Line Numbers
+ <_description>Whether pluma should display line numbers in the editing area.
+
+
+ false
+ <_summary>Highlight Current Line
+ <_description>Whether pluma should highlight the current line.
+
+
+ false
+ <_summary>Highlight Matching Bracket
+ <_description>Whether pluma should highlight the bracket matching the selected one.
+
+
+ false
+ <_summary>Display Right Margin
+ <_description>Whether pluma should display the right margin in the editing area.
+
+
+ 80
+ <_summary>Right Margin Position
+ <_description>Specifies the position of the right margin.
+
+
+ 'after'
+ <_summary>Smart Home End
+ <_description>Specifies how the cursor moves when the HOME and END keys are pressed. Use "DISABLED" to always move at the start/end of the line, "AFTER" to move to the start/end of the line the first time the keys are pressed and to the start/end of the text ignoring whitespaces the second time the keys are pressed, "BEFORE" to move to the start/end of the text before moving to the start/end of the line and "ALWAYS" to always move to the start/end of the text instead of the start/end of the line.
+
+
+ true
+ <_summary>Restore Previous Cursor Position
+ <_description>Whether pluma should restore the previous cursor position when a file is loaded.
+
+
+ true
+ <_summary>Enable Search Highlighting
+ <_description>Whether pluma should highlight all the occurrences of the searched text.
+
+
+ true
+ <_summary>Enable Syntax Highlighting
+ <_description>Whether pluma should enable syntax highlighting.
+
+
+ true
+ <_summary>Toolbar is Visible
+ <_description>Whether the toolbar should be visible in editing windows.
+
+
+ '@TOOLBAR_STYLE@'
+ <_summary>Toolbar Buttons Style
+ <_description>Style for the toolbar buttons. Possible values are "PLUMA_TOOLBAR_SYSTEM" to use the system's default style, "PLUMA_TOOLBAR_ICONS" to display icons only, "PLUMA_TOOLBAR_ICONS_AND_TEXT" to display both icons and text, and "PLUMA_TOOLBAR_ICONS_BOTH_HORIZ" to display prioritized text beside icons. Note that the values are case-sensitive, so make sure they appear exactly as mentioned here.
+
+
+ true
+ <_summary>Status Bar is Visible
+ <_description>Whether the status bar at the bottom of editing windows should be visible.
+
+
+ false
+ <_summary>Side Pane is Visible
+ <_description>Whether the side pane at the left of editing windows should be visible.
+
+
+ false
+ <_summary>Bottom Panel is Visible
+ <_description>Whether the bottom panel at the bottom of editing windows should be visible.
+
+
+ 5
+ <_summary>Maximum Recent Files
+ <_description>Specifies the maximum number of recently opened files that will be displayed in the "Recent Files" submenu.
+
+
+ true
+ <_summary>Print Syntax Highlighting
+ <_description>Whether pluma should print syntax highlighting when printing documents.
+
+
+ true
+ <_summary>Print Header
+ <_description>Whether pluma should include a document header when printing documents.
+
+
+ 'GTK_WRAP_WORD'
+ <_summary>Printing Line Wrapping Mode
+ <_description>Specifies how to wrap long lines for printing. Use "GTK_WRAP_NONE" for no wrapping, "GTK_WRAP_WORD" for wrapping at word boundaries, and "GTK_WRAP_CHAR" for wrapping at individual character boundaries. Note that the values are case-sensitive, so make sure they appear exactly as mentioned here.
+
+
+ 0
+ <_summary>Print Line Numbers
+ <_description>If this value is 0, then no line numbers will be inserted when printing a document. Otherwise, pluma will print line numbers every such number of lines.
+
+
+ 'Monospace 9'
+ <_summary>Body Font for Printing
+ <_description>Specifies the font to use for a document's body when printing documents.
+
+
+ 'Sans 11'
+ <_summary>Header Font for Printing
+ <_description>Specifies the font to use for page headers when printing a document. This will only take effect if the "Print Header" option is turned on.
+
+
+ 'Sans 8'
+ <_summary>Line Number Font for Printing
+ <_description>Specifies the font to use for line numbers when printing. This will only take effect if the "Print Line Numbers" option is non-zero.
+
+
+ [ 'UTF-8', 'CURRENT', 'ISO-8859-15', 'UTF-16' ]
+ <_summary>Automatically Detected Encodings
+ <_description>Sorted list of encodings used by pluma for automatically detecting the encoding of a file. "CURRENT" represents the current locale encoding. Only recognized encodings are used.
+
+
+ [ 'ISO-8859-15' ]
+ <_summary>Encodings shown in menu
+ <_description>List of encodings shown in the Character Encoding menu in open/save file selector. Only recognized encodings are used.
+
+
+ []
+ <_summary>History for "search for" entries
+ <_description>List of entries in "search for" textbox.
+
+
+ []
+ <_summary>History for "replace with" entries
+ <_description>List of entries in "replace with" textbox.
+
+
+ [ 'docinfo', 'modelines', 'filebrowser', 'spell', 'time' ]
+ <_summary>Active plugins
+ <_description>List of active plugins. It contains the "Location" of the active plugins. See the .pluma-plugin file for obtaining the "Location" of a given plugin.
+
+
+
diff --git a/data/pluma-bugreport.sh.in b/data/pluma-bugreport.sh.in
index e62a35e..48ae5bc 100644
--- a/data/pluma-bugreport.sh.in
+++ b/data/pluma-bugreport.sh.in
@@ -17,18 +17,18 @@ echo_padded ()
done
}
-#if (which mateconftool-2 >/dev/null)
-#then
-# echo "MateConf configuration dump:"
-# mateconftool-2 --dump /apps/pluma | grep -Ev "/dev/null)
+then
+ echo "GSettings configuration dump:"
+ gsettings list-recursively org.mate.pluma
+ echo
+fi
-echo "Active plugins:"
-mateconftool-2 --get /apps/pluma/plugins/active-plugins \
- | sed -r -e 's/^\[(.*)\]$/\1/' -e 's/,/\n/g' \
- | sed -e 's/^.*$/ - \0/'
-echo
+#echo "Active plugins:"
+#mateconftool-2 --get /apps/pluma/plugins/active-plugins \
+# | sed -r -e 's/^\[(.*)\]$/\1/' -e 's/,/\n/g' \
+# | sed -e 's/^.*$/ - \0/'
+#echo
# Manually installed plugins (in $HOME)
if [ -d $HOME/.config/pluma/plugins ]
diff --git a/data/pluma.schemas.in.in b/data/pluma.schemas.in.in
deleted file mode 100644
index 6b0072a..0000000
--- a/data/pluma.schemas.in.in
+++ /dev/null
@@ -1,537 +0,0 @@
-
-
-
- /schemas/apps/pluma/preferences/editor/font/use_default_font
- /apps/pluma/preferences/editor/font/use_default_font
- pluma
- bool
- TRUE
-
- Use Default Font
- Whether to use the system's default fixed width font for editing
- text instead of a font specific to pluma. If this option is turned
- off, then the font named in the "Editor Font" option will be
- used instead of the system font.
-
-
-
-
- /schemas/apps/pluma/preferences/editor/font/editor_font
- /apps/pluma/preferences/editor/font/editor_font
- pluma
- string
-
- Monospace 12
- Editor Font
- A custom font that will be used for the editing area.
- This will only take effect if the "Use Default Font" option is
- turned off.
-
-
-
-
- /schemas/apps/pluma/preferences/editor/colors/scheme
- /apps/pluma/preferences/editor/colors/scheme
- pluma
- string
- tango
-
- Style Scheme
- The ID of a GtkSourceView Style Scheme used to
- color the text.
-
-
-
-
- /schemas/apps/pluma/preferences/editor/save/create_backup_copy
- /apps/pluma/preferences/editor/save/create_backup_copy
- pluma
- bool
- FALSE
-
- Create Backup Copies
- Whether pluma should create backup copies for the files
- it saves. You can set the backup file extension with the
- "Backup Copy Extension" option.
-
-
-
-
- /schemas/apps/pluma/preferences/editor/save/auto_save
- /apps/pluma/preferences/editor/save/auto_save
- pluma
- bool
- FALSE
-
- Autosave
- Whether pluma should automatically save modified files
- after a time interval. You can set the time interval with the
- "Autosave Interval" option.
-
-
-
-
- /schemas/apps/pluma/preferences/editor/save/auto_save_interval
- /apps/pluma/preferences/editor/save/auto_save_interval
- pluma
- int
- 10
-
- Autosave Interval
- Number of minutes after which pluma will automatically
- save modified files. This will only take effect if the "Autosave"
- option is turned on.
-
-
-
-
- /schemas/apps/pluma/preferences/editor/undo/undo_actions_limit
- /apps/pluma/preferences/editor/undo/undo_actions_limit
- pluma
- int
- 25
-
- Undo Actions Limit (DEPRECATED)
- Maximum number of actions that pluma will be able to
- undo or redo. Use "-1" for unlimited number of actions.
- Deprecated since 2.12.0
-
-
-
-
- /schemas/apps/pluma/preferences/editor/undo/max_undo_actions
- /apps/pluma/preferences/editor/undo/max_undo_actions
- pluma
- int
- 2000
-
- Maximum Number of Undo Actions
- Maximum number of actions that pluma will be able to
- undo or redo. Use "-1" for unlimited number of actions.
-
-
-
-
- /schemas/apps/pluma/preferences/editor/wrap_mode/wrap_mode
- /apps/pluma/preferences/editor/wrap_mode/wrap_mode
- pluma
- string
- GTK_WRAP_WORD
-
- Line Wrapping Mode
- Specifies how to wrap long lines in the editing area.
- Use "GTK_WRAP_NONE" for no wrapping, "GTK_WRAP_WORD" for
- wrapping at word boundaries, and "GTK_WRAP_CHAR" for wrapping
- at individual character boundaries. Note that the values are
- case-sensitive, so make sure they appear exactly as mentioned
- here.
-
-
-
-
- /schemas/apps/pluma/preferences/editor/tabs/tabs_size
- /apps/pluma/preferences/editor/tabs/tabs_size
- pluma
- int
- 4
-
- Tab Size
- Specifies the number of spaces that should be displayed
- instead of Tab characters.
-
-
-
-
- /schemas/apps/pluma/preferences/editor/tabs/insert_spaces
- /apps/pluma/preferences/editor/tabs/insert_spaces
- pluma
- bool
- FALSE
-
- Insert spaces
- Whether pluma should insert spaces instead of tabs.
-
-
-
-
- /schemas/apps/pluma/preferences/editor/auto_indent/auto_indent
- /apps/pluma/preferences/editor/auto_indent/auto_indent
- pluma
- bool
- FALSE
-
- Automatic indent
- Whether pluma should enable automatic indentation.
-
-
-
-
- /schemas/apps/pluma/preferences/editor/line_numbers/display_line_numbers
- /apps/pluma/preferences/editor/line_numbers/display_line_numbers
- pluma
- bool
- FALSE
-
- Display Line Numbers
- Whether pluma should display line numbers in the editing
- area.
-
-
-
-
- /schemas/apps/pluma/preferences/editor/current_line/highlight_current_line
- /apps/pluma/preferences/editor/current_line/highlight_current_line
- pluma
- bool
- FALSE
-
- Highlight Current Line
- Whether pluma should highlight the current line.
-
-
-
-
- /schemas/apps/pluma/preferences/editor/bracket_matching/bracket_matching
- /apps/pluma/preferences/editor/bracket_matching/bracket_matching
- pluma
- bool
- FALSE
-
- Highlight Matching Bracket
- Whether pluma should highlight the bracket matching the selected one.
-
-
-
-
- /schemas/apps/pluma/preferences/editor/right_margin/display_right_margin
- /apps/pluma/preferences/editor/right_margin/display_right_margin
- pluma
- bool
- FALSE
-
- Display Right Margin
- Whether pluma should display the right margin in the editing
- area.
-
-
-
-
- /schemas/apps/pluma/preferences/editor/right_margin/right_margin_position
- /apps/pluma/preferences/editor/right_margin/right_margin_position
- pluma
- int
- 80
-
- Right Margin Position
- Specifies the position of the right margin.
-
-
-
-
- /schemas/apps/pluma/preferences/editor/smart_home_end/smart_home_end
- /apps/pluma/preferences/editor/smart_home_end/smart_home_end
- pluma
- string
- after
-
- Smart Home End
- Specifies how the cursor moves when the HOME and END keys
- are pressed. Use "DISABLED" to always move at the start/end of
- the line, "AFTER" to move to the start/end of the line the first
- time the keys are pressed and to the start/end of the text ignoring
- whitespaces the second time the keys are pressed, "BEFORE" to
- move to the start/end of the text before moving to the start/end
- of the line and "ALWAYS" to always move to the start/end of the
- text instead of the start/end of the line.
-
-
-
-
- /schemas/apps/pluma/preferences/ui/toolbar/toolbar_visible
- /apps/pluma/preferences/ui/toolbar/toolbar_visible
- pluma
- bool
- TRUE
-
- Toolbar is Visible
- Whether the toolbar should be visible in editing windows.
-
-
-
-
- /schemas/apps/pluma/preferences/ui/toolbar/toolbar_buttons_style
- /apps/pluma/preferences/ui/toolbar/toolbar_buttons_style
- pluma
- string
- @TOOLBAR_STYLE@
-
- Toolbar Buttons Style
- Style for the toolbar buttons. Possible values are
- "PLUMA_TOOLBAR_SYSTEM" to use the system's default style,
- "PLUMA_TOOLBAR_ICONS" to display icons only,
- "PLUMA_TOOLBAR_ICONS_AND_TEXT" to display both icons and text, and
- "PLUMA_TOOLBAR_ICONS_BOTH_HORIZ" to display prioritized text beside icons.
- Note that the values are case-sensitive, so make sure they
- appear exactly as mentioned here.
-
-
-
-
- /schemas/apps/pluma/preferences/ui/statusbar/statusbar_visible
- /apps/pluma/preferences/ui/statusbar/statusbar_visible
- pluma
- bool
- TRUE
-
- Status Bar is Visible
- Whether the status bar at the bottom of editing windows
- should be visible.
-
-
-
-
- /schemas/apps/pluma/preferences/ui/side_pane/side_pane_visible
- /apps/pluma/preferences/ui/side_pane/side_pane_visible
- pluma
- bool
- FALSE
-
- Side Pane is Visible
- Whether the side pane at the left of editing windows
- should be visible.
-
-
-
-
- /schemas/apps/pluma/preferences/ui/bottom_panel/bottom_panel_visible
- /apps/pluma/preferences/ui/bottom_panel/bottom_panel_visible
- pluma
- bool
- FALSE
-
- Bottom Panel is Visible
- Whether the bottom panel at the bottom of editing windows
- should be visible.
-
-
-
-
- /schemas/apps/pluma/preferences/print/page/print_syntax_highlighting
- /apps/pluma/preferences/print/page/print_syntax_highlighting
- pluma
- bool
- TRUE
-
- Print Syntax Highlighting
- Whether pluma should print syntax highlighting when
- printing documents.
-
-
-
-
- /schemas/apps/pluma/preferences/print/page/print_header
- /apps/pluma/preferences/print/page/print_header
- pluma
- bool
- TRUE
-
- Print Header
- Whether pluma should include a document header when
- printing documents.
-
-
-
-
- /schemas/apps/pluma/preferences/print/page/print_wrap_mode
- /apps/pluma/preferences/print/page/print_wrap_mode
- pluma
- string
- GTK_WRAP_WORD
-
- Printing Line Wrapping Mode
- Specifies how to wrap long lines for printing. Use
- "GTK_WRAP_NONE" for no wrapping, "GTK_WRAP_WORD" for wrapping
- at word boundaries, and "GTK_WRAP_CHAR" for wrapping at
- individual character boundaries. Note that the values are
- case-sensitive, so make sure they appear exactly as mentioned
- here.
-
-
-
-
- /schemas/apps/pluma/preferences/print/page/print_line_numbers
- /apps/pluma/preferences/print/page/print_line_numbers
- pluma
- int
- 0
-
- Print Line Numbers
- If this value is 0, then no line numbers will be
- inserted when printing a document. Otherwise, pluma will
- print line numbers every such number of lines.
-
-
-
-
- /schemas/apps/pluma/preferences/print/fonts/print_font_body_pango
- /apps/pluma/preferences/print/fonts/print_font_body_pango
- pluma
- string
-
- Monospace 9
- Body Font for Printing
- Specifies the font to use for a document's body when
- printing documents.
-
-
-
-
- /schemas/apps/pluma/preferences/print/fonts/print_font_header_pango
- /apps/pluma/preferences/print/fonts/print_font_header_pango
- pluma
- string
-
- Sans 11
- Header Font for Printing
- Specifies the font to use for page headers when printing
- a document. This will only take effect if the "Print Header"
- option is turned on.
-
-
-
-
- /schemas/apps/pluma/preferences/print/fonts/print_font_numbers_pango
- /apps/pluma/preferences/print/fonts/print_font_numbers_pango
- pluma
- string
-
- Sans 8
- Line Number Font for Printing
- Specifies the font to use for line numbers when
- printing. This will only take effect if the "Print Line
- Numbers" option is non-zero.
-
-
-
-
- /schemas/apps/pluma/preferences/ui/recents/max_recents
- /apps/pluma/preferences/ui/recents/max_recents
- pluma
- int
- 5
-
- Maximum Recent Files
- Specifies the maximum number of recently opened files
- that will be displayed in the "Recent Files" submenu.
-
-
-
-
- /schemas/apps/pluma/preferences/encodings/auto_detected
- /apps/pluma/preferences/encodings/auto_detected
- pluma
- list
- string
-
- [UTF-8,CURRENT,ISO-8859-15,UTF-16]
- Automatically Detected Encodings
- Sorted list of encodings used by pluma for automatically detecting the encoding of
- a file. "CURRENT" represents the current locale encoding. Only recognized encodings are used.
-
-
-
-
- /schemas/apps/pluma/preferences/encodings/shown_in_menu
- /apps/pluma/preferences/encodings/shown_in_menu
- pluma
- list
- string
-
- [ISO-8859-15]
- Encodings shown in menu
- List of encodings shown in the Character Encoding menu in open/save file selector.
- Only recognized encodings are used.
-
-
-
-
- /schemas/apps/pluma/preferences/syntax_highlighting/enable
- /apps/pluma/preferences/syntax_highlighting/enable
- pluma
- bool
- TRUE
-
- Enable Syntax Highlighting
- Whether pluma should enable syntax highlighting.
-
-
-
-
- /schemas/apps/pluma/plugins/active-plugins
- /apps/pluma/plugins/active-plugins
- pluma
- list
- string
- [@ACTIVE_PLUGINS@]
-
- Active plugins
- List of active plugins. It contains the "Location" of the active plugins. See the .pluma-plugin file for obtaining
- the "Location" of a given plugin.
-
-
-
-
- /schemas/apps/pluma/preferences/editor/save/writable_vfs_schemes
- /apps/pluma/preferences/editor/save/writable_vfs_schemes
- pluma
- list
- string
- [dav,davs,ftp,sftp,smb,ssh]
-
- Writable VFS schemes
- List of VFS schemes pluma supports in write mode. The 'file' scheme
- is writable by default.
-
-
-
-
- /schemas/apps/pluma/preferences/editor/cursor_position/restore_cursor_position
- /apps/pluma/preferences/editor/cursor_position/restore_cursor_position
- pluma
- bool
- TRUE
-
- Restore Previous Cursor Position
- Whether pluma should restore the previous cursor position when a file is loaded.
-
-
-
-
- /schemas/apps/pluma/preferences/editor/search_highlighting/enable
- /apps/pluma/preferences/editor/search_highlighting/enable
- pluma
- bool
- TRUE
-
- Enable Search Highlighting
- Whether pluma should highlight all the occurrences of the searched text.
-
-
-
-
-