From 2f44a0e0335200f7337bb388fcaa52e2cb507492 Mon Sep 17 00:00:00 2001
From: itdominator <1itdominator@gmail.com>
Date: Mon, 23 Oct 2023 00:04:07 -0500
Subject: [PATCH] cleaned up themes; added peacocks in space theme
---
.../widgets/base/notebook/editor_events.py | 3 +-
src/core/widgets/controls/theme_button.py | 6 +-
.../widgets/controls/transparency_scale.py | 3 +
src/core/widgets/save_file_dialog.py | 4 +-
src/utils/settings_manager/options/theming.py | 2 +-
.../gtksourceview-4/styles/blackleaf.xml | 113 -----------------
.../styles/chocolateicecream.xml | 114 -----------------
.../styles/darkchocolateicecream.xml | 67 ----------
.../styles/peacocks-in-space.xml | 115 ++++++++++++++++++
user_config/usr/share/newton/settings.json | 2 +-
10 files changed, 130 insertions(+), 299 deletions(-)
delete mode 100644 user_config/local/share/gtksourceview-4/styles/blackleaf.xml
delete mode 100755 user_config/local/share/gtksourceview-4/styles/chocolateicecream.xml
delete mode 100755 user_config/local/share/gtksourceview-4/styles/darkchocolateicecream.xml
create mode 100644 user_config/local/share/gtksourceview-4/styles/peacocks-in-space.xml
diff --git a/src/core/widgets/base/notebook/editor_events.py b/src/core/widgets/base/notebook/editor_events.py
index c1dc5be..c0a37a0 100644
--- a/src/core/widgets/base/notebook/editor_events.py
+++ b/src/core/widgets/base/notebook/editor_events.py
@@ -132,4 +132,5 @@ class EditorEventsMixin:
source_view.set_buffer_language(language)
def set_buffer_style(self, source_view, style = settings.theming.syntax_theme):
- source_view.set_buffer_style(style)
+ buffer = source_view.get_buffer()
+ source_view.set_buffer_style(buffer, style)
\ No newline at end of file
diff --git a/src/core/widgets/controls/theme_button.py b/src/core/widgets/controls/theme_button.py
index 5fe2698..f166d2a 100644
--- a/src/core/widgets/controls/theme_button.py
+++ b/src/core/widgets/controls/theme_button.py
@@ -33,7 +33,11 @@ class ThemePopover(Gtk.Popover):
event_system.subscribe("show_theme_popup", self._show_theme_popup)
def _load_widgets(self):
+ manager = GtkSource.StyleSchemeManager()
+ style_scheme = manager.get_scheme(settings.theming.syntax_theme)
+
self._style_choser = GtkSource.StyleSchemeChooserWidget()
+ self._style_choser.set_style_scheme(style_scheme)
self._style_choser.show_all()
self._style_choser.connect("button-release-event", self._set_theme)
@@ -82,4 +86,4 @@ class ThemeButton(Gtk.Button):
def _show_popover(self, widget, eve = None):
- event_system.emit("show_theme_popup")
\ No newline at end of file
+ event_system.emit("show_theme_popup")
diff --git a/src/core/widgets/controls/transparency_scale.py b/src/core/widgets/controls/transparency_scale.py
index f38ecae..3e0fc9f 100644
--- a/src/core/widgets/controls/transparency_scale.py
+++ b/src/core/widgets/controls/transparency_scale.py
@@ -24,7 +24,10 @@ class TransparencyScale(Gtk.Scale):
def _setup_styling(self):
self.set_digits(0)
+ self.set_hexpand(True)
+ self.set_size_request(240, -1)
self.set_value_pos(Gtk.PositionType.RIGHT)
+ self.add_mark(0.0, Gtk.PositionType.TOP, "Transparency:")
self.add_mark(50.0, Gtk.PositionType.TOP, "50%")
diff --git a/src/core/widgets/save_file_dialog.py b/src/core/widgets/save_file_dialog.py
index 6c28eec..998afcc 100644
--- a/src/core/widgets/save_file_dialog.py
+++ b/src/core/widgets/save_file_dialog.py
@@ -33,7 +33,7 @@ class SaveFileDialog:
def _load_widgets(self):
self._file_filter_text = Gtk.FileFilter()
- self._file_filter_text.set_name("Text Files")
+ self._file_filter_text.set_name("Code Files")
for p in settings.filters.code:
self._file_filter_text.add_pattern(p)
@@ -53,7 +53,9 @@ class SaveFileDialog:
dlg.add_filter(self._file_filter_all)
if current_filename == "":
+ import os
dlg.set_current_name("new.txt")
+ filechooser.set_current_folder(os.path.expanduser('~'))
else:
dlg.set_current_folder(current_file.get_parent().get_path())
dlg.set_current_name(current_filename)
diff --git a/src/utils/settings_manager/options/theming.py b/src/utils/settings_manager/options/theming.py
index 8a4fdc9..12efaf6 100644
--- a/src/utils/settings_manager/options/theming.py
+++ b/src/utils/settings_manager/options/theming.py
@@ -8,7 +8,7 @@ from dataclasses import dataclass
@dataclass
class Theming:
- transparency: int = 64
+ transparency: int = 62
default_zoom: int = 12
syntax_theme: str = "tango"
success_color: str = "#88cc27"
diff --git a/user_config/local/share/gtksourceview-4/styles/blackleaf.xml b/user_config/local/share/gtksourceview-4/styles/blackleaf.xml
deleted file mode 100644
index 1bd4aaf..0000000
--- a/user_config/local/share/gtksourceview-4/styles/blackleaf.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-
- Hamad Al Marri
- Color scheme using Black Leaf color palette
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/user_config/local/share/gtksourceview-4/styles/chocolateicecream.xml b/user_config/local/share/gtksourceview-4/styles/chocolateicecream.xml
deleted file mode 100755
index ac5b1a8..0000000
--- a/user_config/local/share/gtksourceview-4/styles/chocolateicecream.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-
- Hamad Al Marri
- Color scheme using Chocolate Ice Cream color palette
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/user_config/local/share/gtksourceview-4/styles/darkchocolateicecream.xml b/user_config/local/share/gtksourceview-4/styles/darkchocolateicecream.xml
deleted file mode 100755
index 1eed0ea..0000000
--- a/user_config/local/share/gtksourceview-4/styles/darkchocolateicecream.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-
- Hamad Al Marri
- Color scheme using Dark Chocolate Ice Cream color palette
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/user_config/local/share/gtksourceview-4/styles/peacocks-in-space.xml b/user_config/local/share/gtksourceview-4/styles/peacocks-in-space.xml
new file mode 100644
index 0000000..d93c659
--- /dev/null
+++ b/user_config/local/share/gtksourceview-4/styles/peacocks-in-space.xml
@@ -0,0 +1,115 @@
+
+ ITDominator
+ A port of Dayle Rees' Peacocks In Space theme with some modifications.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/user_config/usr/share/newton/settings.json b/user_config/usr/share/newton/settings.json
index 44c27c9..27b0c98 100644
--- a/user_config/usr/share/newton/settings.json
+++ b/user_config/usr/share/newton/settings.json
@@ -110,7 +110,7 @@
]
},
"theming":{
- "transparency":64,
+ "transparency":62,
"default_zoom":12,
"syntax_theme":"solarized-dark",
"success_color":"#88cc27",