diff --git a/GtkSource - 5 Language Definition v2.0 Tutorial.pdf b/GtkSource - 5 Language Definition v2.0 Tutorial.pdf new file mode 100644 index 0000000..2f592af Binary files /dev/null and b/GtkSource - 5 Language Definition v2.0 Tutorial.pdf differ diff --git a/images/pic1.png b/images/pic1.png index 740e29e..5ad4a0a 100644 Binary files a/images/pic1.png and b/images/pic1.png differ diff --git a/src/core/controller.py b/src/core/controller.py index 470c7b0..e4aa7de 100644 --- a/src/core/controller.py +++ b/src/core/controller.py @@ -9,7 +9,6 @@ from gi.repository import Gtk # Application imports from .mixins.signals_mixins import SignalsMixins from .controller_data import ControllerData -from .widgets.transparency_scale import TransparencyScale @@ -40,8 +39,6 @@ class Controller(SignalsMixins, ControllerData): def _subscribe_to_events(self): event_system.subscribe("shutting_down", lambda: print("Shutting down...")) event_system.subscribe("handle_file_from_ipc", self.handle_file_from_ipc) - event_system.subscribe("remove_transparency", self._remove_transparency) - event_system.subscribe("update_transparency", self._update_transparency) def setup_builder_and_container(self): self.builder = Gtk.Builder() @@ -52,24 +49,12 @@ class Controller(SignalsMixins, ControllerData): glade_box = self.builder.get_object("glade_box") self.base_container = glade_box - self.ctx = self.base_container.get_style_context() - self.ctx.add_class(f"mw_transparency_{settings.theming.transparency}") settings_manager.register_signals_to_builder([self, self.base_container]) - TransparencyScale() - self.window.add(glade_box) - def _interactive_debug(self, widget = None, eve = None): event_system.emit("load_interactive_debug") - def _remove_transparency(self): - self.ctx.remove_class(f"mw_transparency_{settings.theming.transparency}") - - def _update_transparency(self): - self.ctx.add_class(f"mw_transparency_{settings.theming.transparency}") - - def _close_app(self): event_system.emit("tear_down") diff --git a/src/core/widgets/transparency_scale.py b/src/core/widgets/transparency_scale.py deleted file mode 100644 index 8914512..0000000 --- a/src/core/widgets/transparency_scale.py +++ /dev/null @@ -1,51 +0,0 @@ -# Python imports - -# Lib imports -import gi -gi.require_version('Gtk', '3.0') -from gi.repository import Gtk - -# Application imports - - - -class TransparencyScale(Gtk.Scale): - def __init__(self): - super(TransparencyScale, self).__init__() - - builder = settings_manager.get_builder() - builder.get_object("menu_box").add(self) - - self._setup_styling() - self._setup_signals() - self._subscribe_to_events() - self._load_widgets() - - self.show_all() - - - def _setup_styling(self): - self.set_digits(0) - self.set_value_pos(Gtk.PositionType.RIGHT) - self.add_mark(0.0, Gtk.PositionType.LEFT, "Transparency") - self.add_mark(50.0, Gtk.PositionType.TOP, "50%") - self.set_hexpand(True) - - def _setup_signals(self): - self.connect("value-changed", self._update_transparency) - - def _subscribe_to_events(self): - ... - - def _load_widgets(self): - adjust = self.get_adjustment() - adjust.set_lower(0) - adjust.set_upper(99) - adjust.set_value(settings.theming.transparency) - adjust.set_step_increment(1.0) - - def _update_transparency(self, range): - event_system.emit("remove_transparency") - tp = int(range.get_value()) - settings.theming.transparency = tp - event_system.emit("update_transparency") diff --git a/src/core/window.py b/src/core/window.py index 35d3d01..c2e6444 100644 --- a/src/core/window.py +++ b/src/core/window.py @@ -47,7 +47,6 @@ class Window(Gtk.ApplicationWindow): ctx = self.get_style_context() ctx.add_class("main-window") - ctx.add_class(f"mw_transparency_{settings.theming.transparency}") def _setup_signals(self): GLib.unix_signal_add(GLib.PRIORITY_DEFAULT, signal.SIGINT, self._tear_down) @@ -86,7 +85,6 @@ class Window(Gtk.ApplicationWindow): if visual and screen.is_composited() and settings.config.make_transparent == 0: self.set_visual(visual) self.set_app_paintable(True) - self.connect("draw", self._area_draw) # bind css file cssProvider = Gtk.CssProvider() @@ -95,11 +93,6 @@ class Window(Gtk.ApplicationWindow): styleContext = Gtk.StyleContext() styleContext.add_provider_for_screen(screen, cssProvider, Gtk.STYLE_PROVIDER_PRIORITY_USER) - def _area_draw(self, widget: Gtk.ApplicationWindow, cr: cairo.Context) -> None: - cr.set_source_rgba( *settings_manager.get_paint_bg_color() ) - cr.set_operator(cairo.OPERATOR_SOURCE) - cr.paint() - cr.set_operator(cairo.OPERATOR_OVER) def _load_interactive_debug(self): self.set_interactive_debugging(True) diff --git a/src/newton.zip b/src/newton.zip deleted file mode 100644 index a585001..0000000 Binary files a/src/newton.zip and /dev/null differ diff --git a/src/utils/languages.py b/src/utils/languages.py index c5dc463..d588813 100644 --- a/src/utils/languages.py +++ b/src/utils/languages.py @@ -187,7 +187,36 @@ samples['html'] = """ # samples['idl'] = """ # samples['imagej'] = """ # samples['ini'] = """ -# samples['java'] = """ +samples['java'] = """ +package com.itdominator.api; + + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Primary; +import org.springframework.core.env.Environment; +import org.springframework.context.annotation.Configuration; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.jdbc.datasource.DriverManagerDataSource; + +@Configuration +public class DataSourceConfig { + + @Autowired + Environment env; + + @Bean + @Primary + public javax.sql.DataSource dataSource() { + final DriverManagerDataSource dataSource = new DriverManagerDataSource(); + dataSource.setDriverClassName(env.getProperty("driverClassName")); + dataSource.setUrl(env.getProperty("url")); + // dataSource.setUsername(env.getProperty("user")); + // dataSource.setPassword(env.getProperty("password")); + return dataSource; + } +} + +""" samples['js'] = """ const loadBackground = () => { const bgElm = document.getElementById("bg"); diff --git a/user_config/local/share/gtksourceview-4/language-specs/c.lang b/user_config/local/share/gtksourceview-4/language-specs/c.lang new file mode 100644 index 0000000..8dcf2dd --- /dev/null +++ b/user_config/local/share/gtksourceview-4/language-specs/c.lang @@ -0,0 +1,388 @@ + + + + + text/x-c;text/x-csrc;image/x-xpixmap + *.c + // + /* + */ + .c + + + +