diff --git a/data/de.wolfvollprecht.UberWriter.gschema.xml b/data/de.wolfvollprecht.UberWriter.gschema.xml
index 5c43fd2..a043c68 100644
--- a/data/de.wolfvollprecht.UberWriter.gschema.xml
+++ b/data/de.wolfvollprecht.UberWriter.gschema.xml
@@ -32,14 +32,6 @@
Enable or disable spellchecking.
-
- false
- Draw scroll gradient
-
- Show a gradient overlay over the text at the top anf bottom of the window.
- It can cause performance problems to some users.
-
-
true
Synchronize editor/preview scrolling
diff --git a/data/ui/Preferences.ui b/data/ui/Preferences.ui
index 55c54db..509e55d 100644
--- a/data/ui/Preferences.ui
+++ b/data/ui/Preferences.ui
@@ -41,54 +41,6 @@
16
8
8
-
-
-
- 0
- 0
-
-
-
-
-
- 2
- 0
-
-
-
-
-
- 0
- 1
-
-
-
-
-
- 2
- 1
-
-
0
- 3
+ 1
@@ -110,31 +62,7 @@
2
- 3
-
-
-
-
-
- 0
- 4
-
-
-
-
-
- 2
- 4
+ 1
@@ -147,7 +75,7 @@
0
- 5
+ 2
@@ -160,7 +88,7 @@
2
- 5
+ 2
@@ -172,7 +100,7 @@
1
- 5
+ 2
@@ -186,7 +114,7 @@
0
- 2
+ 0
@@ -197,7 +125,7 @@
2
- 2
+ 0
@@ -206,15 +134,6 @@
-
-
-
-
-
-
-
-
-
False
diff --git a/uberwriter/application.py b/uberwriter/application.py
index 35f9d24..c1a7959 100644
--- a/uberwriter/application.py
+++ b/uberwriter/application.py
@@ -196,12 +196,10 @@ class Application(Gtk.Application):
settings.props.gtk_theme_name = "HighContrast"
def on_settings_changed(self, settings, key):
- if key == "dark-mode-auto" or key == "dark-mode":
+ if key == "dark-mode":
self._set_dark_mode ()
elif key == "spellcheck":
self.window.toggle_spellcheck(settings.get_value(key))
- elif key == "gradient-overlay":
- self.window.toggle_gradient_overlay(settings.get_value(key))
elif key == "input-format":
self.window.reload_preview()
elif key == "sync-scroll":
diff --git a/uberwriter/main_window.py b/uberwriter/main_window.py
index bd3d931..997e948 100644
--- a/uberwriter/main_window.py
+++ b/uberwriter/main_window.py
@@ -142,11 +142,6 @@ class MainWindow(StyledWindow):
self.previewbars_visible = True
self.buffer_modified_for_status_bar = False
- # some people seems to have performance problems with the overlay.
- # Let them disable it
- self.overlay_id = None
- self.toggle_gradient_overlay(self.settings.get_value("gradient-overlay"))
-
# Init file name with None
self.set_filename()
@@ -487,18 +482,6 @@ class MainWindow(StyledWindow):
self.text_view.set_spellcheck(state.get_boolean())
- def toggle_gradient_overlay(self, state):
- """Toggle the gradient overlay
-
- Arguments:
- state {gtk bool} -- Desired state of the gradient overlay (enabled/disabled)
- """
-
- if state.get_boolean():
- self.overlay_id = self.scrolled_window.connect_after("draw", self.draw_gradient)
- elif self.overlay_id:
- self.scrolled_window.disconnect(self.overlay_id)
-
def reload_preview(self, reshow=False):
self.preview_handler.reload(reshow=reshow)
@@ -649,35 +632,6 @@ class MainWindow(StyledWindow):
self.buffer_modified_for_status_bar = False
- def draw_gradient(self, _widget, cr):
- """draw fading gradient over the top and the bottom of the
- TextWindow
- """
- bg_color = self.get_style_context().get_background_color(Gtk.StateFlags.ACTIVE)
-
- lg_top = cairo.LinearGradient(0, 0, 0, 32) # pylint: disable=no-member
- lg_top.add_color_stop_rgba(
- 0, bg_color.red, bg_color.green, bg_color.blue, 1)
- lg_top.add_color_stop_rgba(
- 1, bg_color.red, bg_color.green, bg_color.blue, 0)
-
- width = self.scrolled_window.get_allocation().width
- height = self.scrolled_window.get_allocation().height
-
- cr.rectangle(0, 0, width, 32)
- cr.set_source(lg_top)
- cr.fill()
- cr.rectangle(0, height - 32, width, height)
-
- lg_btm = cairo.LinearGradient(0, height - 32, 0, height) # pylint: disable=no-member
- lg_btm.add_color_stop_rgba(
- 1, bg_color.red, bg_color.green, bg_color.blue, 1)
- lg_btm.add_color_stop_rgba(
- 0, bg_color.red, bg_color.green, bg_color.blue, 0)
-
- cr.set_source(lg_btm)
- cr.fill()
-
def on_delete_called(self, _widget, _data=None):
"""Called when the TexteditorWindow is closed.
"""
diff --git a/uberwriter/preferences_dialog.py b/uberwriter/preferences_dialog.py
index 850379f..d679dca 100644
--- a/uberwriter/preferences_dialog.py
+++ b/uberwriter/preferences_dialog.py
@@ -67,14 +67,6 @@ class PreferencesDialog:
self.builder.add_from_resource(
"/de/wolfvollprecht/UberWriter/ui/Preferences.ui")
- self.dark_mode_auto_switch = self.builder.get_object("dark_mode_auto_switch")
- self.dark_mode_auto_switch.set_active(self.settings.get_value("dark-mode-auto"))
- self.dark_mode_auto_switch.connect("state-set", self.on_dark_mode_auto)
-
- self.dark_mode_switch = self.builder.get_object("dark_mode_switch")
- self.dark_mode_switch.set_active(self.settings.get_value("dark-mode"))
- self.dark_mode_switch.connect("state-set", self.on_dark_mode)
-
self.autohide_headerbar_switch = self.builder.get_object("autohide_headerbar_switch")
self.autohide_headerbar_switch.set_active(self.settings.get_value("autohide-headerbar"))
self.autohide_headerbar_switch.connect("state-set", self.on_autohide_headerbar)
@@ -83,10 +75,6 @@ class PreferencesDialog:
self.spellcheck_switch.set_active(self.settings.get_value("spellcheck"))
self.spellcheck_switch.connect("state-set", self.on_spellcheck)
- self.gradient_overlay_switch = self.builder.get_object("gradient_overlay_switch")
- self.gradient_overlay_switch.set_active(self.settings.get_value("gradient-overlay"))
- self.gradient_overlay_switch.connect("state-set", self.on_gradient_overlay)
-
input_format_store = Gtk.ListStore(int, str)
input_format = self.settings.get_string("input-format")
input_format_active = 0
@@ -111,18 +99,6 @@ class PreferencesDialog:
preferences_window.set_transient_for(window)
preferences_window.show()
- def on_dark_mode_auto(self, _, state):
- self.settings.set_boolean("dark-mode-auto", state)
- if state and self.dark_mode_switch.get_active():
- self.dark_mode_switch.set_active(GLib.Variant.new_boolean(False))
- return False
-
- def on_dark_mode(self, _, state):
- self.settings.set_boolean("dark-mode", state)
- if state and self.dark_mode_auto_switch.get_active():
- self.dark_mode_auto_switch.set_active(GLib.Variant.new_boolean(False))
- return False
-
def on_autohide_headerbar(self, _, state):
self.settings.set_boolean("autohide-headerbar", state)
return False
@@ -131,10 +107,6 @@ class PreferencesDialog:
self.settings.set_boolean("spellcheck", state)
return False
- def on_gradient_overlay(self, _, state):
- self.settings.set_boolean("gradient-overlay", state)
- return False
-
def on_input_format(self, combobox):
fmt = self.formats[combobox.get_active()]
self.settings.set_string("input-format", fmt["format"])
diff --git a/uberwriter/theme.py b/uberwriter/theme.py
index 732c774..a80cc18 100644
--- a/uberwriter/theme.py
+++ b/uberwriter/theme.py
@@ -31,10 +31,9 @@ class Theme:
@classmethod
def get_current_changed(cls):
theme_name = Gtk.Settings.get_default().get_property('gtk-theme-name')
- dark_mode_auto = cls.settings.get_boolean('dark-mode-auto')
dark_mode = cls.settings.get_boolean('dark-mode')
current_theme = cls.get_for_name(theme_name)
- if not dark_mode_auto and dark_mode != current_theme.is_dark and current_theme.inverse_name:
+ if dark_mode != current_theme.is_dark and current_theme.inverse_name:
current_theme = cls.get_for_name(current_theme.inverse_name, current_theme.name)
changed = current_theme != cls.previous
cls.previous = current_theme