[gnote] Cleanup some old settings
- From: Aurimas Černius <aurimasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnote] Cleanup some old settings
- Date: Sat, 12 Dec 2020 22:02:42 +0000 (UTC)
commit 377216cbb0ec5b4c1408883bc8235a985da58759
Author: Aurimas Černius <aurisc4 gmail com>
Date: Sat Dec 12 22:21:51 2020 +0200
Cleanup some old settings
data/org.gnome.gnote.gschema.xml.in | 33 ---------------------------------
src/preferences.cpp | 9 ---------
src/preferences.hpp | 9 ---------
3 files changed, 51 deletions(-)
---
diff --git a/data/org.gnome.gnote.gschema.xml.in b/data/org.gnome.gnote.gschema.xml.in
index ad6d63f3..36a84d6e 100644
--- a/data/org.gnome.gnote.gschema.xml.in
+++ b/data/org.gnome.gnote.gschema.xml.in
@@ -41,11 +41,6 @@
<_summary>Custom Font Face</_summary>
<_description>If enable-custom-font is true, the font name set here will be used as the font when
displaying notes.</_description>
</key>
- <key name="enable-keybindings" type="b">
- <default>true</default>
- <_summary>Enable global keybindings</_summary>
- <_description>If true, the desktop-global keybindings set in /org/gnome/gnote/global-keybindings will
be enabled, allowing for useful Gnote actions to be available from any application.</_description>
- </key>
<key name="start-note" type="s">
<default>''</default>
<_summary>Start Here Note</_summary>
@@ -141,40 +136,12 @@
<_summary>Use client side window decorations</_summary>
<_description>Should Gnote draw its window titlebar, or leave that to window manager. Possible values
are 'enabled' to draw them, 'disabled' to leave them to window manager, or a comma separated list of desktop
environments, where Gnote should draw decorations itself. Requires application restart.</_description>
</key>
- <child name="global-keybindings" schema="org.gnome.gnote.global-keybindings" />
<child name="export-html" schema="org.gnome.gnote.export-html" />
<child name="sync" schema="org.gnome.gnote.sync" />
<child name="sync-gvfs" schema="org.gnome.gnote.sync.gvfs" />
<child name="insert-timestamp" schema="org.gnome.gnote.insert-timestamp" />
<child name="note-directory-watcher" schema="org.gnome.gnote.note-directory-watcher" />
</schema>
- <schema id="org.gnome.gnote.global-keybindings" path="/org/gnome/gnote/global-keybindings/">
- <key name="show-note-menu" type="s">
- <default>'<Alt>F12'</default>
- <_summary>Show applet menu</_summary>
- <_description>Deprecated, has no effect.</_description>
- </key>
- <key name="open-start-here" type="s">
- <default>'<Alt>F11'</default>
- <_summary>Open Start Here</_summary>
- <_description>Deprecated, has no effect.</_description>
- </key>
- <key name="create-new-note" type="s">
- <default>'disabled'</default>
- <_summary>Create a new Note</_summary>
- <_description>Deprecated, has no effect.</_description>
- </key>
- <key name="open-search" type="s">
- <default>'disabled'</default>
- <_summary>Open Search Dialog</_summary>
- <_description>Deprecated, has no effect.</_description>
- </key>
- <key name="open-recent-changes" type="s">
- <default>'disabled'</default>
- <_summary>Open Recent Changes</_summary>
- <_description>Deprecated, has no effect.</_description>
- </key>
- </schema>
<schema id="org.gnome.gnote.export-html" path="/org/gnome/gnote/export-html/">
<key name="last-directory" type="s">
<default>''</default>
diff --git a/src/preferences.cpp b/src/preferences.cpp
index 021afc82..e4c6b0d3 100644
--- a/src/preferences.cpp
+++ b/src/preferences.cpp
@@ -29,7 +29,6 @@ namespace gnote {
const char * Preferences::SCHEMA_GNOTE = "org.gnome.gnote";
- const char * Preferences::SCHEMA_KEYBINDINGS = "org.gnome.gnote.global-keybindings";
const char * Preferences::SCHEMA_SYNC = "org.gnome.gnote.sync";
const char * Preferences::SCHEMA_SYNC_GVFS = "org.gnome.gnote.sync.gvfs";
const char * Preferences::SCHEMA_SYNC_WDFS = "org.gnome.gnote.sync.wdfs";
@@ -39,7 +38,6 @@ namespace gnote {
const char * Preferences::ENABLE_URL_LINKS = "enable-url-links";
const char * Preferences::ENABLE_WIKIWORDS = "enable-wikiwords";
const char * Preferences::ENABLE_CUSTOM_FONT = "enable-custom-font";
- const char * Preferences::ENABLE_KEYBINDINGS = "enable-keybindings";
const char * Preferences::ENABLE_AUTO_BULLETED_LISTS = "enable-bulleted-lists";
const char * Preferences::ENABLE_ICON_PASTE = "enable-icon-paste";
const char * Preferences::ENABLE_CLOSE_NOTE_ON_ESCAPE = "enable-close-note-on-escape";
@@ -49,12 +47,6 @@ namespace gnote {
const char * Preferences::MENU_NOTE_COUNT = "menu-note-count";
const char * Preferences::MENU_PINNED_NOTES = "menu-pinned-notes";
- const char * Preferences::KEYBINDING_SHOW_NOTE_MENU = "show-note-menu";
- const char * Preferences::KEYBINDING_OPEN_START_HERE = "open-start-here";
- const char * Preferences::KEYBINDING_CREATE_NEW_NOTE = "create-new-note";
- const char * Preferences::KEYBINDING_OPEN_SEARCH = "open-search";
- const char * Preferences::KEYBINDING_OPEN_RECENT_CHANGES = "open-recent-changes";
-
const char * Preferences::SYNC_CLIENT_ID = "sync-guid";
const char * Preferences::SYNC_LOCAL_PATH = "sync-local-path";
const char * Preferences::SYNC_SELECTED_SERVICE_ADDIN = "sync-selected-service-addin";
@@ -87,7 +79,6 @@ namespace gnote {
void Preferences::init()
{
m_schemas[SCHEMA_GNOTE] = Gio::Settings::create(SCHEMA_GNOTE);
- m_schemas[SCHEMA_KEYBINDINGS] = Gio::Settings::create(SCHEMA_KEYBINDINGS);
m_schema_gnome_interface = Gio::Settings::create(SCHEMA_DESKTOP_GNOME_INTERFACE);
}
diff --git a/src/preferences.hpp b/src/preferences.hpp
index 5a9c1778..d1b7b107 100644
--- a/src/preferences.hpp
+++ b/src/preferences.hpp
@@ -25,7 +25,6 @@
#define __PREFERENCES_HPP_
#include <map>
-#include <sigc++/signal.h>
#include <giomm/settings.h>
namespace gnote {
@@ -34,7 +33,6 @@ namespace gnote {
{
public:
static const char *SCHEMA_GNOTE;
- static const char *SCHEMA_KEYBINDINGS;
static const char *SCHEMA_SYNC;
static const char *SCHEMA_SYNC_GVFS;
static const char *SCHEMA_SYNC_WDFS;
@@ -44,7 +42,6 @@ namespace gnote {
static const char *ENABLE_URL_LINKS;
static const char *ENABLE_WIKIWORDS;
static const char *ENABLE_CUSTOM_FONT;
- static const char *ENABLE_KEYBINDINGS;
static const char *ENABLE_AUTO_BULLETED_LISTS;
static const char *ENABLE_ICON_PASTE;
static const char *ENABLE_CLOSE_NOTE_ON_ESCAPE;
@@ -66,12 +63,6 @@ namespace gnote {
static const char *SEARCH_SORTING;
static const char *USE_CLIENT_SIDE_DECORATIONS;
- static const char *KEYBINDING_SHOW_NOTE_MENU;
- static const char *KEYBINDING_OPEN_START_HERE;
- static const char *KEYBINDING_CREATE_NEW_NOTE;
- static const char *KEYBINDING_OPEN_SEARCH;
- static const char *KEYBINDING_OPEN_RECENT_CHANGES;
-
static const char *SYNC_CLIENT_ID;
static const char *SYNC_LOCAL_PATH;
static const char *SYNC_SELECTED_SERVICE_ADDIN;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]