Remove windows message

Merge branch 'develop' into firebug
Initial support for firebug
2026-04-03 21:52:45 -07:00 · 2020-10-28 21:16:33 +11:00 · 2020-10-28 21:14:39 +11:00 · 2020-10-28 21:11:13 +11:00
9 changed files with 19 additions and 67 deletions
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -39,4 +39,3 @@ Wails is what it is because of the time and effort given by these great people.
  * [Kyle](https://github.com/kmuchmore)
  * [Balakrishna Prasad Ganne](https://github.com/aayush420)
  * [Charaf Rezrazi](https://github.com/Rezrazi)
-  * [misitebao](https://github.com/misitebao)
--- a/cmd/linux.go
+++ b/cmd/linux.go
@@ -65,8 +65,6 @@ const (
 	Solus
 	// Ctlos Linux distribution
 	Ctlos
-	// EndeavourOS linux distribution
-	EndeavourOS
 )

 // DistroInfo contains all the information relating to a linux distribution
@@ -134,7 +132,7 @@ func parseOsRelease(osRelease string) *DistroInfo {
 	case "archlabs":
 		result.Distribution = ArchLabs
 	case "ctlos":
-		result.Distribution = Ctlos
+		result.Distribution = Ctlos	
 	case "debian":
 		result.Distribution = Debian
 	case "ubuntu":
@@ -173,8 +171,6 @@ func parseOsRelease(osRelease string) *DistroInfo {
 		result.Distribution = PopOS
 	case "solus":
 		result.Distribution = Solus
-	case "endeavouros":
-		result.Distribution = EndeavourOS
 	default:
 		result.Distribution = Unknown
 	}
--- a/cmd/linuxdb.yaml
+++ b/cmd/linuxdb.yaml
@@ -202,16 +202,7 @@ distributions:
        name: Ctlos Linux
        gccversioncommand: *gccdumpversion
        programs: *archdefaultprograms
-        libraries: *archdefaultlibraries   
-  endeavouros:
-    id: endeavouros
-    releases:
-      default:
-        version: default
-        name: EndeavourOS
-        gccversioncommand: *gccdumpversion
-        programs: *archdefaultprograms
-        libraries: *archdefaultlibraries             
+        libraries: *archdefaultlibraries                
  manjaro:
    id: manjaro
    releases:
--- a/cmd/system.go
+++ b/cmd/system.go
@@ -276,7 +276,7 @@ func CheckDependencies(logger *Logger) (bool, error) {
 		switch distroInfo.Distribution {
 		case Ubuntu, Debian, Zorin, Parrot, Linuxmint, Elementary, Kali, Neon, Deepin, Raspbian, PopOS:
 			libraryChecker = DpkgInstalled
-		case Arch, ArcoLinux, ArchLabs, Ctlos, Manjaro, ManjaroARM, EndeavourOS:
+		case Arch, ArcoLinux, ArchLabs, Ctlos, Manjaro, ManjaroARM:
 			libraryChecker = PacmanInstalled
 		case CentOS, Fedora, Tumbleweed, Leap:
 			libraryChecker = RpmInstalled
--- a/cmd/version.go
+++ b/cmd/version.go
@@ -1,4 +1,4 @@
 package cmd

 // Version - Wails version
-const Version = "v1.10.0-pre1"
+const Version = "v1.8.1-pre6"
--- a/cmd/wails/4_build.go
+++ b/cmd/wails/4_build.go
@@ -73,6 +73,7 @@ func init() {
 		// Project options
 		projectOptions := &cmd.ProjectOptions{}
 		projectOptions.Verbose = verbose
+		projectOptions.UseFirebug = usefirebug

 		// Check we are in project directory
 		// Check project.json loads correctly
@@ -82,9 +83,6 @@ func init() {
 			return fmt.Errorf("Unable to find 'project.json'. Please check you are in a Wails project directory")
 		}

-		// Set firebug flag
-		projectOptions.UseFirebug = usefirebug
-
 		// Check that this platform is supported
 		if !projectOptions.PlatformSupported() {
 			logger.Yellow("WARNING: This project is unsupported on %s - it probably won't work!\n         Valid platforms: %s\n", runtime.GOOS, strings.Join(projectOptions.Platforms, ", "))
--- a/config.go
+++ b/config.go
@@ -1,39 +1,20 @@
 package wails

 import (
-	"fmt"
-	"net/url"
-	"strings"
-
 	"github.com/leaanthony/mewn"
 	"github.com/wailsapp/wails/runtime"
 )

 // AppConfig is the configuration structure used when creating a Wails App object
 type AppConfig struct {
-	// The width and height of your application in pixels
-	Width, Height int
-
-	// The title to put in the title bar
-	Title string
-
-	// The HTML your app should use. If you leave it blank, a default will be used:
-	// <!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="IE=edge" content="IE=edge"></head><body><div id="app"></div><script type="text/javascript"></script></body></html>
-	HTML string
-
-	// The Javascript your app should use. Normally this should be generated by a bundler.
-	JS string
-
-	// The CSS your app should use. Normally this should be generated by a bundler.
-	CSS string
-
-	// The colour of your window. Can take "#fff", "rgb(255,255,255)", "rgba(255,255,255,1)" formats
-	Colour string
-
-	// Indicates whether your app should be resizable
-	Resizable bool
-
-	// Indicated if the devtools should be disabled
+	Width, Height    int
+	Title            string
+	defaultHTML      string
+	HTML             string
+	JS               string
+	CSS              string
+	Colour           string
+	Resizable        bool
 	DisableInspector bool
 }

@@ -52,14 +33,9 @@ func (a *AppConfig) GetTitle() string {
 	return a.Title
 }

-// GetHTML returns the default HTML
-func (a *AppConfig) GetHTML() string {
-	if len(a.HTML) > 0 {
-		a.HTML = url.QueryEscape(a.HTML)
-		a.HTML = "data:text/html," + strings.ReplaceAll(a.HTML, "+", "%20")
-		a.HTML = strings.ReplaceAll(a.HTML, "%3D", "=")
-	}
-	return a.HTML
+// GetDefaultHTML returns the default HTML
+func (a *AppConfig) GetDefaultHTML() string {
+	return a.defaultHTML
 }

 // GetResizable returns true if the window should be resizable
@@ -103,10 +79,6 @@ func (a *AppConfig) merge(in *AppConfig) error {
 		a.JS = in.JS
 	}

-	if in.HTML != "" {
-		a.HTML = in.HTML
-	}
-
 	if in.Width != 0 {
 		a.Width = in.Width
 	}
@@ -137,9 +109,5 @@ func newConfig(userConfig *AppConfig) (*AppConfig, error) {
 		}
 	}

-	println("****************************************************")
-	fmt.Printf("%+v\n", result)
-	println("****************************************************")
-
 	return result, nil
 }
--- a/lib/interfaces/appconfig.go
+++ b/lib/interfaces/appconfig.go
@@ -6,9 +6,9 @@ type AppConfig interface {
 	GetHeight() int
 	GetTitle() string
 	GetResizable() bool
-	GetHTML() string
+	GetDefaultHTML() string
 	GetDisableInspector() bool
 	GetColour() string
 	GetCSS() string
 	GetJS() string
-}
+}
--- a/lib/renderer/webview.go
+++ b/lib/renderer/webview.go
@@ -58,7 +58,7 @@ func (w *WebView) Initialise(config interfaces.AppConfig, ipc interfaces.IPCMana
 		Height:    config.GetHeight(),
 		Title:     config.GetTitle(),
 		Resizable: config.GetResizable(),
-		URL:       config.GetHTML(),
+		URL:       config.GetDefaultHTML(),
 		Debug:     !config.GetDisableInspector(),
 		ExternalInvokeCallback: func(_ wv.WebView, message string) {
 			w.ipc.Dispatch(message, w.callback)
Author	SHA1	Message	Date
Lea Anthony	02d6fe609c	Remove windows message	2020-10-28 21:16:33 +11:00
Lea Anthony	93e7432ba9	Merge branch 'develop' into firebug	2020-10-28 21:14:39 +11:00
Lea Anthony	cb933cc987	Initial support for firebug	2020-10-28 21:11:13 +11:00