Skip to content

Commit

Permalink
cinnamon-settings: migrate to using python-xapp widgets and remove dups
Browse files Browse the repository at this point in the history
  • Loading branch information
collinss authored and mtwebster committed Nov 22, 2019
1 parent db3534a commit be7fd9d
Show file tree
Hide file tree
Showing 36 changed files with 274 additions and 1,062 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
gi.require_version("Gtk", "3.0")
from gi.repository import GLib, Gtk, Gio, GObject

from SettingsWidgets import SettingsWidget, Range, Switch
from xapp.SettingsWidgets import SettingsWidget, Range, Switch

SETTINGS_GROUP_NAME = "Settings"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
gi.require_version('Gtk', '3.0')
from gi.repository import Gio, Gtk, GObject, Gdk, GdkPixbuf, Pango, GLib

from SettingsWidgets import SidePage, SettingsStack, SettingsPage, SettingsWidget, SettingsLabel
from xapp.SettingsWidgets import SettingsStack, SettingsPage, SettingsWidget, SettingsLabel
from SettingsWidgets import SidePage
from Spices import Spice_Harvester, ThreadedTaskManager

home = os.path.expanduser('~')
Expand Down
314 changes: 0 additions & 314 deletions files/usr/share/cinnamon/cinnamon-settings/bin/GSettingsWidgets.py

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
#!/usr/bin/python3

from gi.repository import Gio, GObject
from SettingsWidgets import *
from xapp.SettingsWidgets import *
from SettingsWidgets import SoundFileChooser, TweenChooser, EffectChooser, DateChooser, Keybinding
from xapp.GSettingsWidgets import CAN_BACKEND as px_can_backend
from SettingsWidgets import CAN_BACKEND as c_can_backend
from TreeListWidgets import List
import os
import collections
import json
import operator

CAN_BACKEND.append("List")
can_backend = px_can_backend + c_can_backend
can_backend.append('List')

JSON_SETTINGS_PROPERTIES_MAP = {
"description" : "label",
Expand Down Expand Up @@ -315,5 +320,5 @@ def __init__(self, key, settings, properties):

return NewClass

for widget in CAN_BACKEND:
for widget in can_backend:
globals()["JSONSettings"+widget] = json_settings_factory(widget)
Loading

0 comments on commit be7fd9d

Please sign in to comment.