Merge pull request #1059 from GargantuaX/master

update zh-hans docs

cmd/linux.go

@@ -74,6 +74,8 @@ const (
 	NixOS
 	// Artix linux distribution
 	ArtixLinux
+	//Uos distribution
+	Uos
 )
 
 // DistroInfo contains all the information relating to a linux distribution
@@ -190,6 +192,8 @@ func parseOsRelease(osRelease string) *DistroInfo {
 		result.Distribution = NixOS
 	case "artix":
 		result.Distribution = ArtixLinux
+	case "uos":
+		result.Distribution = Uos
 	default:
 		result.Distribution = Unknown
 	}

cmd/linuxdb.yaml

@@ -100,6 +100,15 @@ distributions:
         gccversioncommand: *gccdumpfullversion
         programs: *debiandefaultprograms
         libraries: *debiandefaultlibraries
+  uos:
+    id: uos
+    releases:
+      default:
+        version: default
+        name: Uos
+        gccversioncommand: *gccdumpfullversion
+        programs: *debiandefaultprograms
+        libraries: *debiandefaultlibraries
   void:
     id: void
     releases:

cmd/system.go

@@ -278,7 +278,7 @@ func CheckDependencies(logger *Logger) (bool, error) {
 		distroInfo := GetLinuxDistroInfo()
 
 		switch distroInfo.Distribution {
-		case Ubuntu, Debian, Zorin, Parrot, Linuxmint, Elementary, Kali, Neon, Deepin, Raspbian, PopOS:
+		case Ubuntu, Debian, Zorin, Parrot, Linuxmint, Elementary, Kali, Neon, Deepin, Raspbian, PopOS, Uos:
 			libraryChecker = DpkgInstalled
 		case Arch, ArcoLinux, ArchLabs, Ctlos, Manjaro, ManjaroARM, EndeavourOS, ArtixLinux:
 			libraryChecker = PacmanInstalled

v2/internal/frontend/desktop/linux/calloc.go

@@ -1,32 +0,0 @@
-package linux
-
-/*
-#include <stdlib.h>
-*/
-import "C"
-import "unsafe"
-
-// Calloc handles alloc/dealloc of C data
-type Calloc struct {
-	pool []unsafe.Pointer
-}
-
-// NewCalloc creates a new allocator
-func NewCalloc() Calloc {
-	return Calloc{}
-}
-
-// String creates a new C string and retains a reference to it
-func (c Calloc) String(in string) *C.char {
-	result := C.CString(in)
-	c.pool = append(c.pool, unsafe.Pointer(result))
-	return result
-}
-
-// Free frees all allocated C memory
-func (c Calloc) Free() {
-	for _, str := range c.pool {
-		C.free(str)
-	}
-	c.pool = []unsafe.Pointer{}
-}

v2/internal/frontend/desktop/linux/dialog.go

@@ -3,24 +3,10 @@
 
 package linux
 
-import (
+import "github.com/wailsapp/wails/v2/internal/frontend"
-	"github.com/wailsapp/wails/v2/internal/frontend"
-)
-import "C"
 
-var openFileResults = make(chan string)
+func (f *Frontend) OpenFileDialog(dialogOptions frontend.OpenDialogOptions) (string, error) {
-
+	panic("implement me")
-func (f *Frontend) OpenFileDialog(dialogOptions frontend.OpenDialogOptions) (result string, err error) {
-
-	f.dispatch(func() {
-		println("Before OpenFileDialog")
-		f.mainWindow.OpenFileDialog(dialogOptions)
-		println("After OpenFileDialog")
-	})
-	println("Waiting for result")
-	result = <-openFileResults
-	println("Got result")
-	return
 }
 
 func (f *Frontend) OpenMultipleFilesDialog(dialogOptions frontend.OpenDialogOptions) ([]string, error) {
@@ -38,8 +24,3 @@ func (f *Frontend) SaveFileDialog(dialogOptions frontend.SaveDialogOptions) (str
 func (f *Frontend) MessageDialog(dialogOptions frontend.MessageDialogOptions) (string, error) {
 	panic("implement me")
 }
-
-//export processOpenFileResult
-func processOpenFileResult(result *C.char) {
-	openFileResults <- C.GoString(result)
-}

v2/internal/frontend/desktop/linux/frontend.go

@@ -24,7 +24,6 @@ import "C"
 import (
 	"context"
 	"encoding/json"
-	"fmt"
 	"log"
 	"os"
 	"strconv"
@@ -63,7 +62,6 @@ type Frontend struct {
 
 func NewFrontend(ctx context.Context, appoptions *options.App, myLogger *logger.Logger, appBindings *binding.Bindings, dispatcher frontend.Dispatcher) *Frontend {
 
-	println("[NewFrontend] PID:", os.Getpid())
 	// Set GDK_BACKEND=x11 to prevent warnings
 	os.Setenv("GDK_BACKEND", "x11")
 
@@ -303,11 +301,10 @@ var dispatchCallbackLock sync.Mutex
 
 //export callDispatchedMethod
 func callDispatchedMethod(cid C.int) {
-	println("[callDispatchedMethod] PID:", os.Getpid())
 	id := int(cid)
 	fn := dispatchCallbacks[id]
 	if fn != nil {
-		fn()
+		go fn()
 		dispatchCallbackLock.Lock()
 		delete(dispatchCallbacks, id)
 		dispatchCallbackLock.Unlock()
@@ -345,25 +342,12 @@ func (f *Frontend) processRequest(request unsafe.Pointer) {
 
 	// Load file from asset store
 	content, mimeType, err := f.assets.Load(file)
-
-	// TODO How to return 404/500 errors to webkit?
 	if err != nil {
-		if os.IsNotExist(err) {
-			f.dispatch(func() {
-				message := C.CString("not found")
-				defer C.free(unsafe.Pointer(message))
-				C.webkit_uri_scheme_request_finish_error(req, C.g_error_new_literal(C.G_FILE_ERROR_NOENT, C.int(404), message))
-			})
-		} else {
-			err = fmt.Errorf("Error processing request %s: %w", uri, err)
-			f.logger.Error(err.Error())
-			message := C.CString("internal server error")
-			defer C.free(unsafe.Pointer(message))
-			C.webkit_uri_scheme_request_finish_error(req, C.g_error_new_literal(C.G_FILE_ERROR_NOENT, C.int(500), message))
-		}
 		return
 	}
 
+	// TODO How to return 404/500 errors to webkit?
+
 	cContent := C.CString(string(content))
 	defer C.free(unsafe.Pointer(cContent))
 	cMimeType := C.CString(mimeType)

v2/internal/frontend/desktop/linux/window.go

@@ -4,11 +4,10 @@
 package linux
 
 /*
-#cgo linux pkg-config: gtk+-3.0 webkit2gtk-4.0 x11
+#cgo linux pkg-config: gtk+-3.0 webkit2gtk-4.0
 
 #include "gtk/gtk.h"
 #include "webkit2/webkit2.h"
-#include <X11/Xlib.h>
 #include <stdio.h>
 #include <limits.h>
 
@@ -106,11 +105,6 @@ ulong setupInvokeSignal(void* contentManager) {
 	return g_signal_connect((WebKitUserContentManager*)contentManager, "script-message-received::external", G_CALLBACK(sendMessageToBackend), NULL);
 }
 
-void initThreads() {
-	printf("init threads\n");
-	XInitThreads();
-}
-
 // These are the x,y & time of the last mouse down event
 // It's used for window dragging
 float xroot = 0.0f;
@@ -190,36 +184,10 @@ static void startDrag(void *webview, GtkWindow* mainwindow)
     gtk_window_begin_move_drag(mainwindow, 1, xroot, yroot, dragTime);
 }
 
-void extern processOpenFileResult(char*);
-
-static void OpenDialog(GtkWindow* window, char *title) {
-	printf("Here\n");
-      GtkWidget *dlg = gtk_file_chooser_dialog_new(title, window, GTK_FILE_CHOOSER_ACTION_OPEN,
-          "_Cancel", GTK_RESPONSE_CANCEL,
-          "_Open", GTK_RESPONSE_ACCEPT,
-			NULL);
-	printf("Here3\n");
-
-	gint response = gtk_dialog_run(GTK_DIALOG(dlg));
-	printf("Here 4\n");
-
-  if (response == GTK_RESPONSE_ACCEPT)
-      {
-	printf("Here 5\n");
-
-        gchar *filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dlg));
-        processOpenFileResult(filename);
-        g_free(filename);
-      }
-      gtk_widget_destroy(dlg);
-}
-
 */
 import "C"
 import (
-	"github.com/wailsapp/wails/v2/internal/frontend"
 	"github.com/wailsapp/wails/v2/pkg/options"
-	"os"
 	"unsafe"
 )
 
@@ -401,8 +369,6 @@ func (w *Window) Run() {
 	case options.Maximised:
 		w.Maximise()
 	}
-
-	C.initThreads()
 	C.gtk_main()
 	w.Destroy()
 }
@@ -442,11 +408,3 @@ func (w *Window) StartDrag() {
 func (w *Window) Quit() {
 	C.gtk_main_quit()
 }
-
-func (w *Window) OpenFileDialog(dialogOptions frontend.OpenDialogOptions) {
-	println("OpenFileDialog PID:", os.Getpid())
-	mem := NewCalloc()
-	title := mem.String(dialogOptions.Title)
-	C.OpenDialog(w.asGTKWindow(), title)
-	mem.Free()
-}

v2/internal/frontend/desktop/windows/window.go

@@ -57,10 +57,10 @@ func NewWindow(parent winc.Controller, appoptions *options.App) *Window {
 	result.SetText(appoptions.Title)
 	if appoptions.Frameless == false && !appoptions.Fullscreen {
 		result.EnableMaxButton(!appoptions.DisableResize)
-		result.EnableSizable(!appoptions.DisableResize)
 		result.SetMinSize(appoptions.MinWidth, appoptions.MinHeight)
 		result.SetMaxSize(appoptions.MaxWidth, appoptions.MaxHeight)
 	}
+	result.EnableSizable(!appoptions.DisableResize)
 
 	if appoptions.Windows != nil {
 		if appoptions.Windows.WindowIsTranslucent {

v2/pkg/runtime/dialog.go

@@ -2,7 +2,9 @@ package runtime
 
 import (
 	"context"
+	"fmt"
 	"github.com/wailsapp/wails/v2/internal/frontend"
+	"github.com/wailsapp/wails/v2/internal/fs"
 )
 
 // FileFilter defines a filter for dialog boxes
@@ -29,24 +31,44 @@ type MessageDialogOptions = frontend.MessageDialogOptions
 // OpenDirectoryDialog prompts the user to select a directory
 func OpenDirectoryDialog(ctx context.Context, dialogOptions OpenDialogOptions) (string, error) {
 	appFrontend := getFrontend(ctx)
+	if dialogOptions.DefaultDirectory != "" {
+		if !fs.DirExists(dialogOptions.DefaultDirectory) {
+			return "", fmt.Errorf("default directory '%s' does not exist", dialogOptions.DefaultDirectory)
+		}
+	}
 	return appFrontend.OpenDirectoryDialog(dialogOptions)
 }
 
 // OpenFileDialog prompts the user to select a file
 func OpenFileDialog(ctx context.Context, dialogOptions OpenDialogOptions) (string, error) {
 	appFrontend := getFrontend(ctx)
+	if dialogOptions.DefaultDirectory != "" {
+		if !fs.DirExists(dialogOptions.DefaultDirectory) {
+			return "", fmt.Errorf("default directory '%s' does not exist", dialogOptions.DefaultDirectory)
+		}
+	}
 	return appFrontend.OpenFileDialog(dialogOptions)
 }
 
 // OpenMultipleFilesDialog prompts the user to select a file
 func OpenMultipleFilesDialog(ctx context.Context, dialogOptions OpenDialogOptions) ([]string, error) {
 	appFrontend := getFrontend(ctx)
+	if dialogOptions.DefaultDirectory != "" {
+		if !fs.DirExists(dialogOptions.DefaultDirectory) {
+			return nil, fmt.Errorf("default directory '%s' does not exist", dialogOptions.DefaultDirectory)
+		}
+	}
 	return appFrontend.OpenMultipleFilesDialog(dialogOptions)
 }
 
 // SaveFileDialog prompts the user to select a file
 func SaveFileDialog(ctx context.Context, dialogOptions SaveDialogOptions) (string, error) {
 	appFrontend := getFrontend(ctx)
+	if dialogOptions.DefaultDirectory != "" {
+		if !fs.DirExists(dialogOptions.DefaultDirectory) {
+			return "", fmt.Errorf("default directory '%s' does not exist", dialogOptions.DefaultDirectory)
+		}
+	}
 	return appFrontend.SaveFileDialog(dialogOptions)
 }
 

website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/community/templates.mdx

@@ -27,3 +27,13 @@ sidebar_position: 1
 ## Angular
 
 - [wails-angular-template](https://github.com/TAINCER/wails-angular-template) - 带有 TypeScript, Sass, 热重载, 代码拆分和 i18n 的 Angular
+
+## React
+
+- [wails-react-template](https://github.com/AlienRecall/wails-react-template) - 基于 reactjs 的模板
+- [wails-react-template](https://github.com/flin7/wails-react-template) - 基于 React 并支持实时开发模式的轻量级模板
+
+## Svelte
+
+- [wails-svelte-template](https://github.com/raitonoberu/wails-svelte-template) - 基于 Svelte 的模板
+