[cinnamon/f17] Add patch to port window settings to gsettings
leigh123linux
leigh123linux at fedoraproject.org
Sat Jul 21 08:27:33 UTC 2012
commit c4711ff4612fd6de0a838da7f95f1632e2ebabd3
Author: leigh123linux <leigh123linux at googlemail.com>
Date: Sat Jul 21 09:26:55 2012 +0100
Add patch to port window settings to gsettings
cinnamon-1.4.1_settings.patch | 8 --------
cinnamon.spec | 8 +++++++-
port-window-gsettings.patch | 40 ++++++++++++++++++++++++++++++++++++++++
3 files changed, 47 insertions(+), 9 deletions(-)
---
diff --git a/cinnamon-1.4.1_settings.patch b/cinnamon-1.4.1_settings.patch
index ddf4b3b..6ddd0de 100644
--- a/cinnamon-1.4.1_settings.patch
+++ b/cinnamon-1.4.1_settings.patch
@@ -285,14 +285,6 @@
sidePage = SidePage(_("Hot corner"), "overview.svg", self.content_box)
self.sidePages.append((sidePage, "hotcorner"))
-@@ -1347,7 +1092,6 @@ class MainWindow:
- sidePage.add_widget(GSettingsFontButton(_("Default font"), "org.gnome.desktop.interface", "font-name"))
- sidePage.add_widget(GSettingsFontButton(_("Document font"), "org.gnome.desktop.interface", "document-font-name"))
- sidePage.add_widget(GSettingsFontButton(_("Monospace font"), "org.gnome.desktop.interface", "monospace-font-name"))
-- sidePage.add_widget(GConfFontButton(_("Window title font"), "/apps/metacity/general/titlebar_font"))
- sidePage.add_widget(GSettingsComboBox(_("Hinting"), "org.gnome.settings-daemon.plugins.xsettings", "hinting", [(i, i.title()) for i in ("none", "slight", "medium", "full")]))
- sidePage.add_widget(GSettingsComboBox(_("Antialiasing"), "org.gnome.settings-daemon.plugins.xsettings", "antialiasing", [(i, i.title()) for i in ("none", "grayscale", "rgba")]))
-
@@ -1394,8 +1138,6 @@ class MainWindow:
self.top_button_box.hide()
self.side_view_sw.show_all()
diff --git a/cinnamon.spec b/cinnamon.spec
index 338385f..8b17d97 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -8,7 +8,7 @@
Name: cinnamon
Version: 1.4.1
-Release: 0.8.git%{_internal_version}%{?dist}
+Release: 0.9.git%{_internal_version}%{?dist}
Summary: Window management and application launching for GNOME
Group: User Interface/Desktops
@@ -38,6 +38,8 @@ Patch2: cinnamon-1.4.1_f17_favourite-apps-firefox.patch
Patch10: cinnamon-1.4.1_systray.patch
# https://github.com/linuxmint/Cinnamon/pull/929
Patch11: cinnamon-menu.patch
+# https://github.com/linuxmint/Cinnamon/issues/944
+Patch12: port-window-gsettings.patch
%global clutter_version 1.7.5
%global gobject_introspection_version 0.10.1
@@ -121,6 +123,7 @@ The emphasis is put on making users feel at home and providing
# upstream patches and pending pulls
%patch10 -p1
%patch11 -p1
+%patch12 -p1
# remove gschema
@@ -228,6 +231,9 @@ fi
%changelog
+* Sat Jul 21 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.4.1-0.9.git7959517
+- Add patch to port window settings to gsettings
+
* Fri Jul 20 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.4.1-0.8.git7959517
- filter provides and requires
- Remove requires dbus-x11
diff --git a/port-window-gsettings.patch b/port-window-gsettings.patch
new file mode 100644
index 0000000..4a0a28e
--- /dev/null
+++ b/port-window-gsettings.patch
@@ -0,0 +1,40 @@
++++ a/files/usr/lib/cinnamon-settings/cinnamon-settings.py
++++ b/files/usr/lib/cinnamon-settings/cinnamon-settings.py
+@@ -1062,17 +1061,17 @@ class MainWindow:
+
+ sidePage = SidePage(_("Windows"), "windows.svg", self.content_box)
+ self.sidePages.append((sidePage, "windows"))
+- sidePage.add_widget(GConfComboBox(_("Action on title bar double-click"),
+- "/apps/metacity/general/action_double_click_titlebar",
+- [(i, i.replace("_", " ").title()) for i in ('toggle_shade', 'toggle_maximize', 'toggle_maximize_horizontally', 'toggle_maximize_vertically', 'minimize', 'shade', 'menu', 'lower', 'none')]))
+- sidePage.add_widget(GConfComboBox(_("Action on title bar middle-click"),
+- "/apps/metacity/general/action_middle_click_titlebar",
+- [(i, i.replace("_", " ").title()) for i in ('toggle_shade', 'toggle_maximize', 'toggle_maximize_horizontally', 'toggle_maximize_vertically', 'minimize', 'shade', 'menu', 'lower', 'none')]))
+- sidePage.add_widget(GConfComboBox(_("Action on title bar right-click"),
+- "/apps/metacity/general/action_right_click_titlebar",
+- [(i, i.replace("_", " ").title()) for i in ('toggle_shade', 'toggle_maximize', 'toggle_maximize_horizontally', 'toggle_maximize_vertically', 'minimize', 'shade', 'menu', 'lower', 'none')]))
+- sidePage.add_widget(GConfComboBox(_("Window focus mode"),
+- "/apps/metacity/general/focus_mode",
++ sidePage.add_widget(GSettingsComboBox(_("Action on title bar double-click"),
++ "org.gnome.desktop.wm.preferences", "action-double-click-titlebar",
++ [(i, i.replace("-", " ").title()) for i in ('toggle-shade', 'toggle-maximize', 'toggle-maximize-horizontally', 'toggle-maximize-vertically', 'minimize', 'shade', 'menu', 'lower', 'none')]))
++ sidePage.add_widget(GSettingsComboBox(_("Action on title bar middle-click"),
++ "org.gnome.desktop.wm.preferences", "action-middle-click-titlebar",
++ [(i, i.replace("-", " ").title()) for i in ('toggle-shade', 'toggle-maximize', 'toggle-maximize-horizontally', 'toggle-maximize-vertically', 'minimize', 'shade', 'menu', 'lower', 'none')]))
++ sidePage.add_widget(GSettingsComboBox(_("Action on title bar right-click"),
++ "org.gnome.desktop.wm.preferences", "action-right-click-titlebar",
++ [(i, i.replace("-", " ").title()) for i in ('toggle-shade', 'toggle-maximize', 'toggle-maximize-horizontally', 'toggle-maximize-vertically', 'minimize', 'shade', 'menu', 'lower', 'none')]))
++ sidePage.add_widget(GSettingsComboBox(_("Window focus mode"),
++ "org.gnome.desktop.wm.preferences", "focus-mode",
+ [(i, i.title()) for i in ("click","sloppy","mouse")]))
+ sidePage.add_widget(TitleBarButtonsOrderSelector())
+ sidePage.add_widget(GSettingsCheckButton(_("Enable ALT+Tab outline and window preview"), "org.cinnamon", "enable-alttab-outline"))
+@@ -1092,7 +1092,7 @@
+ sidePage.add_widget(GSettingsFontButton(_("Default font"), "org.gnome.desktop.interface", "font-name"))
+ sidePage.add_widget(GSettingsFontButton(_("Document font"), "org.gnome.desktop.interface", "document-font-name"))
+ sidePage.add_widget(GSettingsFontButton(_("Monospace font"), "org.gnome.desktop.interface", "monospace-font-name"))
+- sidePage.add_widget(GConfFontButton(_("Window title font"), "/apps/metacity/general/titlebar_font"))
++ sidePage.add_widget(GSettingsFontButton(_("Window title font"), "org.gnome.desktop.wm.preferences", "titlebar-font"))
+ sidePage.add_widget(GSettingsComboBox(_("Hinting"), "org.gnome.settings-daemon.plugins.xsettings", "hinting", [(i, i.title()) for i in ("none", "slight", "medium", "full")]))
+ sidePage.add_widget(GSettingsComboBox(_("Antialiasing"), "org.gnome.settings-daemon.plugins.xsettings", "antialiasing", [(i, i.title()) for i in ("none", "grayscale", "rgba")]))
+
More information about the scm-commits
mailing list