Fixes in mac build script, some gofmt works.

This commit is contained in:
2018-11-10 20:57:28 +05:00
parent 127e1b8ab9
commit 39ac02dfc5
6 changed files with 181 additions and 216 deletions

View File

@@ -1,32 +1,32 @@
package ui
import (
// stdlib
"os"
"path/filepath"
"runtime"
// stdlib
"os"
"path/filepath"
"runtime"
// other
"github.com/mattn/go-gtk/gtk"
// other
"github.com/mattn/go-gtk/gtk"
)
func (m *MainWindow) initializeMac() {
if runtime.GOOS == "darwin" {
dir, _ := filepath.Abs(filepath.Dir(os.Args[0]))
if runtime.GOOS == "darwin" {
dir, _ := filepath.Abs(filepath.Dir(os.Args[0]))
gtk.RCParse(dir + "/../Resources/themes/gtkrc-keybindings")
gtk.RCParse(dir + "/../Resources/themes/gtkrc-keybindings")
// ToDo: theming support and theme seletion in settings.
gtk.RCParse(dir + "/../Resources/themes/ClearlooksBrave/gtk-2.0/gtkrc")
}
// ToDo: theming support and theme seletion in settings.
gtk.RCParse(dir + "/../Resources/themes/ClearlooksBrave/gtk-2.0/gtkrc")
}
}
func (m *MainWindow) initializeMacAfter() {
m.toolbar.SetStyle(gtk.TOOLBAR_ICONS)
m.toolbar.SetStyle(gtk.TOOLBAR_ICONS)
}
func (m *MainWindow) initializeMacMenu() {
// This is a placeholder, in future we will use native mac menu.
// For now it launches default menu initialization.
m.InitializeMainMenu()
// This is a placeholder, in future we will use native mac menu.
// For now it launches default menu initialization.
m.InitializeMainMenu()
}

View File

@@ -1,24 +1,24 @@
package ui
import (
// stdlib
"os"
"path/filepath"
// stdlib
"os"
"path/filepath"
// other
"github.com/mattn/go-gtk/gtk"
"github.com/couchbase/goutils/platform"
// other
"github.com/couchbase/goutils/platform"
"github.com/mattn/go-gtk/gtk"
)
func (m *MainWindow) closeWin() {
platform.HideConsole(false)
platform.HideConsole(false)
}
func (m *MainWindow) initializeWin() {
platform.HideConsole(true)
platform.HideConsole(true)
dir, _ := filepath.Abs(filepath.Dir(os.Args[0]))
dir, _ := filepath.Abs(filepath.Dir(os.Args[0]))
// ToDo: theming support and theme seletion in settings.
gtk.RCParse(dir + "/themes/MS-Windows/gtk-2.0/gtkrc")
// ToDo: theming support and theme seletion in settings.
gtk.RCParse(dir + "/themes/MS-Windows/gtk-2.0/gtkrc")
}