Первая версия (CLI-only) #1
@@ -24,7 +24,7 @@ type browserLauncherImpl struct {
|
||||
|
||||
// OpenAuto implements BrowserLauncher.
|
||||
func (b *browserLauncherImpl) OpenAuto(url string) error {
|
||||
if (b.useCustomCommand) {
|
||||
if b.useCustomCommand {
|
||||
return b.OpenCustom(url)
|
||||
} else {
|
||||
return b.OpenDefault(url)
|
||||
@@ -67,9 +67,9 @@ func NewBrowserLauncher(config *config.Config, log *logger.Logger) BrowserLaunch
|
||||
useCustomCommand := config.App.UseCustomBrowserCommand
|
||||
customCommand := config.App.BrowserOpenCommand
|
||||
return &browserLauncherImpl{
|
||||
config: config,
|
||||
log: log,
|
||||
config: config,
|
||||
log: log,
|
||||
useCustomCommand: useCustomCommand,
|
||||
customCommand: customCommand,
|
||||
customCommand: customCommand,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -20,6 +20,6 @@
|
||||
package constants
|
||||
|
||||
const (
|
||||
AppName = "auto-attendance"
|
||||
AppName = "auto-attendance"
|
||||
AppClassGtk = "su.weirdcat.autoattendance"
|
||||
)
|
||||
|
||||
@@ -82,7 +82,14 @@ func (q *qrminatorImpl) UpdateConfig(string) error {
|
||||
panic("unimplemented")
|
||||
}
|
||||
|
||||
func NewQrminator(cfg *config.Config, log *logger.Logger, capt screencapturer.ScreenCapturer, vis vision.Vision, val linkvalidator.LinkValidator, launch browserlauncher.BrowserLauncher) Qrminator {
|
||||
func NewQrminator(
|
||||
cfg *config.Config,
|
||||
log *logger.Logger,
|
||||
capt screencapturer.ScreenCapturer,
|
||||
vis vision.Vision,
|
||||
val linkvalidator.LinkValidator,
|
||||
launch browserlauncher.BrowserLauncher,
|
||||
) Qrminator {
|
||||
return &qrminatorImpl{
|
||||
config: cfg,
|
||||
log: log,
|
||||
|
||||
@@ -51,8 +51,8 @@ type wholeScreenCapturer struct {
|
||||
tempDirectory string
|
||||
initialized bool
|
||||
|
||||
files []string
|
||||
mu sync.RWMutex
|
||||
files []string
|
||||
mu sync.RWMutex
|
||||
}
|
||||
|
||||
// Get implements ScreenCapturer.
|
||||
|
||||
@@ -19,18 +19,16 @@
|
||||
|
||||
package ui
|
||||
|
||||
import (
|
||||
"github.com/gotk3/gotk3/gtk"
|
||||
)
|
||||
import "github.com/gotk3/gotk3/gtk"
|
||||
|
||||
func NewBuilder() (*gtk.Builder, error) {
|
||||
|
||||
gtk.Init(nil)
|
||||
|
||||
builder, err := gtk.BuilderNew()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return builder, nil
|
||||
builder, err := gtk.BuilderNew()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return builder, nil
|
||||
}
|
||||
|
||||
@@ -26,12 +26,12 @@ import (
|
||||
|
||||
type MainWindow struct {
|
||||
builder *gtk.Builder
|
||||
window *gtk.Window
|
||||
window *gtk.Window
|
||||
}
|
||||
|
||||
func (m *MainWindow) Start() {
|
||||
m.window.ShowAll()
|
||||
go func() { gtk.Main() }()
|
||||
go func() { gtk.Main() }()
|
||||
}
|
||||
|
||||
func NewMainWindow(builder *gtk.Builder) (*MainWindow, error) {
|
||||
@@ -45,7 +45,7 @@ func NewMainWindow(builder *gtk.Builder) (*MainWindow, error) {
|
||||
return nil, err
|
||||
}
|
||||
window := windowObj.(*gtk.Window)
|
||||
window.Connect("destroy", func () {
|
||||
window.Connect("destroy", func() {
|
||||
gtk.MainQuit()
|
||||
})
|
||||
|
||||
|
||||
Reference in New Issue
Block a user