diff --git a/.version/name b/.version/name index fbafd6b..912c37b 100644 --- a/.version/name +++ b/.version/name @@ -1 +1 @@ -2.7.2 \ No newline at end of file +2.8BETA \ No newline at end of file diff --git a/hypr/apps/ml4w-welcome/ml4w-welcome.py b/hypr/apps/ml4w-welcome/ml4w-welcome.py new file mode 100644 index 0000000..139c4d6 --- /dev/null +++ b/hypr/apps/ml4w-welcome/ml4w-welcome.py @@ -0,0 +1,174 @@ +# __ __ _ _ ___ __ _ _ _ +# | \/ | | | || \ \ / / / \ | |__ ___ _ _| |_ +# | |\/| | | | || |\ \ /\ / / / _ \ | '_ \ / _ \| | | | __| +# | | | | |__|__ _\ V V / / ___ \| |_) | (_) | |_| | |_ +# |_| |_|_____| |_| \_/\_/ /_/ \_\_.__/ \___/ \__,_|\__| + +import sys +import gi +import subprocess +import os +import threading + +gi.require_version('Gtk', '4.0') +gi.require_version('Adw', '1') + +from gi.repository import Gtk, Adw, Gio +from gi.repository import GLib +from gi.repository import GObject + + +# ----------------------------------------- +# Define UI template +# ----------------------------------------- +@Gtk.Template(filename='src/welcome.ui') + +# ----------------------------------------- +# Main Window +# ----------------------------------------- +class MainWindow(Adw.ApplicationWindow): + __gtype_name__ = 'Ml4wWelcomeWindow' + + # Get objects from template + ml4w_version = Gtk.Template.Child() + ml4w_logo = Gtk.Template.Child() + update_banner = Gtk.Template.Child() + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + +# ----------------------------------------- +# Main App +# ----------------------------------------- +class MyApp(Adw.Application): + + # Path to home folder + homeFolder = os.path.expanduser('~') + current_version_name = "" + current_version_code = "" + + def __init__(self, **kwargs): + super().__init__(application_id='com.ml4w.welcome', + flags=Gio.ApplicationFlags.DEFAULT_FLAGS) + self.create_action('quit', lambda *_: self.quit(), ['q']) + self.create_action('update', self.on_system_update) + self.create_action('cleanup', self.on_system_cleanup) + self.create_action('about', self.on_about) + self.create_action('settings', self.on_settings) + self.create_action('waybar_reload', self.on_waybar_reload) + self.create_action('keybindings', self.on_keybindings) + self.create_action('gitlab', self.on_gitlab) + self.create_action('youtube', self.on_youtube) + self.create_action('wallpaper', self.on_wallpaper) + self.create_action('waybartheme', self.on_waybartheme) + self.create_action('howtoupdate', self.on_howtoupdate) + + def do_activate(self): + win = self.props.active_window + if not win: + win = MainWindow(application=self) + + # Set ML4W logo + win.ml4w_logo.set_from_file("src/icon.png") + + # Check dotfiles version + self.readDotfilesVersion(win) + + # Force dark theme + self.changeTheme(win) + + # Check for updates + self.checkForUpdates(win) + + # Show Application Window + win.present() + + def changeTheme(self,win): + app = win.get_application() + sm = app.get_style_manager() + sm.set_color_scheme(Adw.ColorScheme.PREFER_DARK) + + def checkForUpdates(self,win): + try: + result = subprocess.run(["bash", self.homeFolder + "/dotfiles/.version/update.sh"], capture_output=True, text=True) + web_version = result.stdout.strip() + # print("Update " + web_version) + + if (web_version == '0'): + # print("Show update banner") + win.update_banner.set_revealed(True) + except: + print("ERROR: Could not read the file /dotfiles/.version/update.sh") + + def readDotfilesVersion(self,win): + try: + result = subprocess.run(["bash", self.homeFolder + "/dotfiles/.version/version.sh"], capture_output=True, text=True) + # print("Version " + result.stdout) + version = result.stdout + version_arr = version.split(" ") + self.current_version_name = version_arr[0] + self.current_version_code = version_arr[1] + win.ml4w_version.set_text("Version: " + self.current_version_name) + except: + print("ERROR: Could not read the file /dotfiles/.version/version.sh") + win.ml4w_version.set_text("") + + def on_about(self, widget, _): + dialog = Adw.AboutWindow( + application_icon="application-x-executable", + application_name="ML4W Welcome", + developer_name="Stephan Raabe", + version="1.0.0", + website="https://gitlab.com/stephan-raabe/dotfiles", + issue_url="https://gitlab.com/stephan-raabe/dotfiles/-/issues", + support_url="https://gitlab.com/stephan-raabe/dotfiles/-/issues", + copyright="© 2024 Stephan Raabe", + license_type=Gtk.License.GPL_3_0_ONLY + ) + dialog.present() + + def on_settings(self, widget, _): + subprocess.Popen(["alacritty", "--class", "dotfiles-floating", "-e", self.homeFolder + "/dotfiles/hypr/start-settings.sh"]) + + def on_system_update(self, widget, _): + subprocess.Popen(["alacritty","-e", self.homeFolder + "/dotfiles/scripts/installupdates.sh"]) + + def on_system_cleanup(self, widget, _): + subprocess.Popen(["alacritty","-e", self.homeFolder + "/dotfiles/scripts/cleanup.sh"]) + + def on_waybar_reload(self, widget, _): + subprocess.Popen(["bash", self.homeFolder + "/dotfiles/waybar/launch.sh"]) + + def on_keybindings(self, widget, _): + subprocess.Popen(["bash", self.homeFolder + "/dotfiles/hypr/scripts/keybindings.sh"]) + + def on_gitlab(self, widget, _): + subprocess.run(["xdg-open", "https://gitlab.com/stephan-raabe/dotfiles"]) + + def on_howtoupdate(self, widget, _): + subprocess.run(["xdg-open", "https://gitlab.com/stephan-raabe/dotfiles#update-with-git"]) + + def on_youtube(self, widget, _): + subprocess.run(["xdg-open", "https://www.youtube.com/channel/UC0sUzmZ0CHvVCVrpRfGKZfw"]) + + def on_wallpaper(self, widget, _): + subprocess.Popen(["bash", self.homeFolder + "/dotfiles/hypr/scripts/wallpaper.sh","select"]) + + def on_waybartheme(self, widget, _): + subprocess.Popen(["bash", self.homeFolder + "/dotfiles/waybar/themeswitcher.sh"]) + + # Add Application actions + def create_action(self, name, callback, shortcuts=None): + action = Gio.SimpleAction.new(name, None) + action.connect("activate", callback) + self.add_action(action) + if shortcuts: + self.set_accels_for_action(f"app.{name}", shortcuts) + +# ----------------------------------------- +# Application Start +# ----------------------------------------- +app = MyApp() +sm = app.get_style_manager() +sm.set_color_scheme(Adw.ColorScheme.PREFER_DARK) +app.run(sys.argv) \ No newline at end of file diff --git a/hypr/apps/ml4w-welcome/src/icon-small.png b/hypr/apps/ml4w-welcome/src/icon-small.png new file mode 100644 index 0000000..92a54e0 Binary files /dev/null and b/hypr/apps/ml4w-welcome/src/icon-small.png differ diff --git a/hypr/apps/ml4w-welcome/src/icon.png b/hypr/apps/ml4w-welcome/src/icon.png new file mode 100644 index 0000000..eebdf8d Binary files /dev/null and b/hypr/apps/ml4w-welcome/src/icon.png differ diff --git a/hypr/apps/ml4w-welcome/src/welcome.ui b/hypr/apps/ml4w-welcome/src/welcome.ui new file mode 100644 index 0000000..2f9d3f0 --- /dev/null +++ b/hypr/apps/ml4w-welcome/src/welcome.ui @@ -0,0 +1,257 @@ + + + + + + + + + +
+ + ML4W GitLab + app.gitlab + + + ML4W YouTube Channel + app.youtube + +
+ +
+ + About + app.about + + + Exit + app.quit + +
+ + + + + + +
+ + Update Wallpaper + app.wallpaper + + + Change Waybar Theme + app.waybartheme + +
+
+ + Hyprland Settings + app.settings + +
+
+ + Update your system + app.update + + + Cleanup your system + app.cleanup + +
+
+ + Reload Waybar + app.waybar_reload + +
+ + + + \ No newline at end of file diff --git a/hypr/conf/ml4w.conf b/hypr/conf/ml4w.conf index d448b98..6cacacb 100644 --- a/hypr/conf/ml4w.conf +++ b/hypr/conf/ml4w.conf @@ -4,12 +4,18 @@ windowrulev2 = float,class:(com.ml4w.welcome) windowrulev2 = size 700 600,class:(com.ml4w.welcome) +windowrulev2 = nomaximizerequest,class:(com.ml4w.welcome) +windowrulev2 = nofullscreenrequest,class:(com.ml4w.welcome) windowrulev2 = center,class:(com.ml4w.welcome) windowrulev2 = float,class:(ml4w-welcome.py) windowrulev2 = size 400 500,class:(ml4w-welcome.py) +windowrulev2 = nomaximizerequest,class:(ml4w-welcome.py) +windowrulev2 = nofullscreenrequest,class:(ml4w-welcome.py) windowrulev2 = center,class:(ml4w-welcome.py) windowrulev2 = float,class:(dotfiles-floating) windowrulev2 = size 1000 800,class:(dotfiles-floating) -windowrulev2 = center,class:(dotfiles-floating) \ No newline at end of file +windowrulev2 = nomaximizerequest,class:(dotfiles-floating) +windowrulev2 = nofullscreenrequest,class:(dotfiles-floating) +windowrulev2 = center,class:(dotfiles-floating) diff --git a/waybar/modules.json b/waybar/modules.json index 9092c35..ed628c0 100644 --- a/waybar/modules.json +++ b/waybar/modules.json @@ -58,6 +58,13 @@ "separate-outputs": true }, + // ML4W Welcome App + "custom/ml4w-welcome": { + "on-click": "cd ~/dotfiles/hypr/apps/ml4w-welcome; python ml4w-welcome.py", + "format": " ", + "tooltip": false + }, + // Youtube Subscriber Count "custom/youtube": { "format": " {}", diff --git a/waybar/themes/ml4w-blur-bottom/config b/waybar/themes/ml4w-blur-bottom/config index 3ae85e0..2074112 100644 --- a/waybar/themes/ml4w-blur-bottom/config +++ b/waybar/themes/ml4w-blur-bottom/config @@ -68,6 +68,7 @@ "tray", // END TRAY TOOGLE "custom/exit", + "custom/ml4w-welcome", "clock" ] } diff --git a/waybar/themes/ml4w-blur/config b/waybar/themes/ml4w-blur/config index 694ba89..838c2b4 100644 --- a/waybar/themes/ml4w-blur/config +++ b/waybar/themes/ml4w-blur/config @@ -67,6 +67,7 @@ "tray", // END TRAY TOOGLE "custom/exit", + "custom/ml4w-welcome", "clock" ] } diff --git a/waybar/themes/ml4w-blur/style.css b/waybar/themes/ml4w-blur/style.css index b058920..f907226 100644 --- a/waybar/themes/ml4w-blur/style.css +++ b/waybar/themes/ml4w-blur/style.css @@ -183,6 +183,14 @@ window#waybar.empty #window { margin-right:20px; } +#custom-ml4w-welcome { + margin-right: 15px; + background-image: url("../../../hypr/apps/ml4w-welcome/src/icon-small.png"); + background-repeat: no-repeat; + background-position: center; + padding-right: 24px; +} + /* ----------------------------------------------------- * Idle Inhibator * ----------------------------------------------------- */ diff --git a/waybar/themes/ml4w-bottom/config b/waybar/themes/ml4w-bottom/config index 9951224..e30d232 100644 --- a/waybar/themes/ml4w-bottom/config +++ b/waybar/themes/ml4w-bottom/config @@ -67,6 +67,7 @@ "tray", // END TRAY TOOGLE "custom/exit", + "custom/ml4w-welcome", "clock" ] } diff --git a/waybar/themes/ml4w/config b/waybar/themes/ml4w/config index c7e5c4f..f66036e 100644 --- a/waybar/themes/ml4w/config +++ b/waybar/themes/ml4w/config @@ -67,6 +67,7 @@ "tray", // END TRAY TOOGLE "custom/exit", + "custom/ml4w-welcome", "clock" ] } diff --git a/waybar/themes/ml4w/style.css b/waybar/themes/ml4w/style.css index 58973a4..ebc0e17 100644 --- a/waybar/themes/ml4w/style.css +++ b/waybar/themes/ml4w/style.css @@ -184,6 +184,14 @@ window#waybar.empty #window { margin-right:20px; } +#custom-ml4w-welcome { + margin-right: 15px; + background-image: url("../../../hypr/apps/ml4w-welcome/src/icon-small.png"); + background-repeat: no-repeat; + background-position: center; + padding-right: 24px; +} + /* ----------------------------------------------------- * Idle Inhibator * ----------------------------------------------------- */