alex/yomichan-import
1
Fork 0
Code Releases Activity

fix windows quirks

Browse Source
This commit is contained in:
Alex Yatskov 2017-04-13 21:15:40 -07:00
parent 064fc74d78
commit 9b832d3f71
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
gui.go
View File

@ -23,26 +23,32 @@
package main package main
import ( import (
"fmt"
"log" "log"
"path" "path/filepath"
"strings"
"github.com/andlabs/ui" "github.com/andlabs/ui"
) )
type logger struct { type logger struct {
label *ui.Label box *ui.Box
count int
} }
func (l logger) Write(p []byte) (n int, err error) { func (l *logger) Write(p []byte) (n int, err error) {
ui.QueueMain(func() { ui.QueueMain(func() {
l.label.SetText(strings.Trim(fmt.Sprintf("%s\n%s", l.label.Text(), p), "\n")) l.box.Append(ui.NewLabel(string(p)), false)
l.count++
}) })
return len(p), nil return len(p), nil
} }
func (l *logger) clear() {
for ; l.count > 0; l.count-- {
l.box.Delete(0)
}
}
func gui() error { func gui() error {
return ui.Main(func() { return ui.Main(func() {
pathEntry := ui.NewEntry() pathEntry := ui.NewEntry()
@ -62,7 +68,7 @@ func gui() error {
formatCombo.SetSelected(0) formatCombo.SetSelected(0)
titleEntry := ui.NewEntry() titleEntry := ui.NewEntry()
outputLabel := ui.NewLabel("") outputBox := ui.NewVerticalBox()
importButton := ui.NewButton("Import dictionary...") importButton := ui.NewButton("Import dictionary...")
mainBox := ui.NewVerticalBox() mainBox := ui.NewVerticalBox()
@ -75,7 +81,7 @@ func gui() error {
mainBox.Append(ui.NewLabel("Dictionary format:"), false) mainBox.Append(ui.NewLabel("Dictionary format:"), false)
mainBox.Append(formatCombo, false) mainBox.Append(formatCombo, false)
mainBox.Append(ui.NewLabel("Application output:"), false) mainBox.Append(ui.NewLabel("Application output:"), false)
mainBox.Append(outputLabel, true) mainBox.Append(outputBox, true)
mainBox.Append(importButton, false) mainBox.Append(importButton, false)
window := ui.NewWindow("Yomichan Import", 640, 480, false) window := ui.NewWindow("Yomichan Import", 640, 480, false)
@ -88,10 +94,12 @@ func gui() error {
} }
}) })
log.SetOutput(&logger{outputLabel}) logger := &logger{outputBox, 0}
log.SetOutput(logger)
importButton.OnClicked(func(*ui.Button) { importButton.OnClicked(func(*ui.Button) {
importButton.Disable() importButton.Disable()
outputLabel.SetText("") logger.clear()
var ( var (
outputDir string outputDir string
@ -117,7 +125,7 @@ func gui() error {
format := []string{"epwing", "edict", "enamdict", "kanjidic"}[formatCombo.Selected()] format := []string{"epwing", "edict", "enamdict", "kanjidic"}[formatCombo.Selected()]
if format == "epwing" { if format == "epwing" {
inputPath = path.Dir(inputPath) inputPath = filepath.Dir(inputPath)
} }
if err := exportDb(inputPath, outputDir, format, titleEntry.Text(), DEFAULT_STRIDE, false); err != nil { if err := exportDb(inputPath, outputDir, format, titleEntry.Text(), DEFAULT_STRIDE, false); err != nil {