Merge pull request #7 from arch-linux-gui/devel

Fixed KDE theming issue & gnome desktop settings

Author: demonkillerr

.gitignore

@@ -0,0 +1,2 @@
+build/
+

app.go

@@ -79,7 +79,16 @@ func getLookAndFeelPackageKDE() string {
 		// Pure KDE approach
 		colorScheme, err := getColorSchemeFromFile(configFile, "[KDE]", "LookAndFeelPackage")
 		if err == nil {
-			return formatColorScheme(colorScheme)
+			formattedScheme := formatColorScheme(colorScheme)
+			if formattedScheme != "breeze" && formattedScheme != "breezedark" {
+				// If not breeze or breezedark, continue to themed approach
+				colorScheme, err = getColorSchemeFromFile(configFile, "[General]", "ColorScheme")
+				if err == nil {
+					return formatColorScheme(colorScheme)
+				}
+			} else {
+				return formattedScheme
+			}
 		}
 
 		// If not found, then themed KDE approach
@@ -391,7 +400,7 @@ func (a *App) ScreenResolution() {
 	case "xfce":
 		pkexecCmd = exec.Command("bash", "-c", "xfce4-display-settings")
 	case "gnome":
-		pkexecCmd = exec.Command("bash", "-c", "gnome-control-center", "display")
+		pkexecCmd = exec.Command("gnome-control-center", "display")
 	case "kde":
 		kcm_kscreen := "`kcmshell6 kcm_kscreen`"
 		pkexecCmd = exec.Command("bash", "-c", kcm_kscreen)

frontend/src/components/WelcomeScreen.tsx

@@ -1,6 +1,5 @@
 import React, { useEffect, useState } from "react";
 import appicon from "../assets/appicon.png";
-import { cn } from "@/lib/utils";
 import {
   UpdateSystem,
   ScreenResolution,
@@ -11,7 +10,6 @@ import {
 import "../globals.css";
 import extDark from "../assets/ext-dark.png";
 import extLight from "../assets/ext-light.png";
-import { Image } from "lucide-react";
 
 interface ScreenProps {
   goToScreen: (index: number) => void;

frontend/wailsjs/runtime/runtime.d.ts

@@ -233,3 +233,17 @@ export function ClipboardGetText(): Promise<string>;
 // [ClipboardSetText](https://wails.io/docs/reference/runtime/clipboard#clipboardsettext)
 // Sets a text on the clipboard
 export function ClipboardSetText(text: string): Promise<boolean>;
+
+// [OnFileDrop](https://wails.io/docs/reference/runtime/draganddrop#onfiledrop)
+// OnFileDrop listens to drag and drop events and calls the callback with the coordinates of the drop and an array of path strings.
+export function OnFileDrop(callback: (x: number, y: number ,paths: string[]) => void, useDropTarget: boolean) :void
+
+// [OnFileDropOff](https://wails.io/docs/reference/runtime/draganddrop#dragandddropoff)
+// OnFileDropOff removes the drag and drop listeners and handlers.
+export function OnFileDropOff() :void
+
+// Check if the file path resolver is available
+export function CanResolveFilePaths(): boolean;
+
+// Resolves file paths for an array of files
+export function ResolveFilePaths(files: File[]): void

frontend/wailsjs/runtime/runtime.js

@@ -199,4 +199,40 @@ export function ClipboardGetText() {
 
 export function ClipboardSetText(text) {
     return window.runtime.ClipboardSetText(text);
+}
+
+/**
+ * Callback for OnFileDrop returns a slice of file path strings when a drop is finished.
+ *
+ * @export
+ * @callback OnFileDropCallback
+ * @param {number} x - x coordinate of the drop
+ * @param {number} y - y coordinate of the drop
+ * @param {string[]} paths - A list of file paths.
+ */
+
+/**
+ * OnFileDrop listens to drag and drop events and calls the callback with the coordinates of the drop and an array of path strings.
+ *
+ * @export
+ * @param {OnFileDropCallback} callback - Callback for OnFileDrop returns a slice of file path strings when a drop is finished.
+ * @param {boolean} [useDropTarget=true] - Only call the callback when the drop finished on an element that has the drop target style. (--wails-drop-target)
+ */
+export function OnFileDrop(callback, useDropTarget) {
+    return window.runtime.OnFileDrop(callback, useDropTarget);
+}
+
+/**
+ * OnFileDropOff removes the drag and drop listeners and handlers.
+ */
+export function OnFileDropOff() {
+    return window.runtime.OnFileDropOff();
+}
+
+export function CanResolveFilePaths() {
+    return window.runtime.CanResolveFilePaths();
+}
+
+export function ResolveFilePaths(files) {
+    return window.runtime.ResolveFilePaths(files);
 }

go.sum

@@ -61,8 +61,8 @@ github.com/wailsapp/go-webview2 v1.0.10 h1:PP5Hug6pnQEAhfRzLCoOh2jJaPdrqeRgJKZhy
 github.com/wailsapp/go-webview2 v1.0.10/go.mod h1:Uk2BePfCRzttBBjFrBmqKGJd41P6QIHeV9kTgIeOZNo=
 github.com/wailsapp/mimetype v1.4.1 h1:pQN9ycO7uo4vsUUuPeHEYoUkLVkaRntMnHJxVwYhwHs=
 github.com/wailsapp/mimetype v1.4.1/go.mod h1:9aV5k31bBOv5z6u+QP8TltzvNGJPmNJD4XlAL3U+j3o=
-github.com/wailsapp/wails/v2 v2.8.2 h1:rYOn9p+7bJiZuFSi2wDyq8rBLHrIX/FoUxov+RpdUOI=
-github.com/wailsapp/wails/v2 v2.8.2/go.mod h1:5pTURIST4yZ/wRcmqDUtnM0Mk+caNax/oS610hFiy74=
+github.com/wailsapp/wails/v2 v2.9.1 h1:irsXnoQrCpeKzKTYZ2SUVlRRyeMR6I0vCO9Q1cvlEdc=
+github.com/wailsapp/wails/v2 v2.9.1/go.mod h1:7maJV2h+Egl11Ak8QZN/jlGLj2wg05bsQS+ywJPT0gI=
 golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
 golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
 golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 h1:k/i9J1pBpvlfR+9QsetwPyERsqu1GIbi967PQMq3Ivc=