From c166f50a713674859fc90a8a5887449544f3238a Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Fri, 14 Apr 2017 09:28:50 -0700 Subject: [PATCH] wip --- epwing.go | 2 ++ gui.go | 25 ++++++++----------------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/epwing.go b/epwing.go index b9266cc..93fe003 100644 --- a/epwing.go +++ b/epwing.go @@ -145,6 +145,8 @@ func epwingExportDb(inputPath, outputDir, title string, stride int, pretty bool) titles []string ) + log.Println("formatting dictionary data...") + for _, subbook := range book.Subbooks { if extractor, ok := epwingExtractors[subbook.Title]; ok { fontNarrow := extractor.getFontNarrow() diff --git a/gui.go b/gui.go index 4684dca..32b9140 100644 --- a/gui.go +++ b/gui.go @@ -31,26 +31,17 @@ import ( ) type logger struct { - box *ui.Box - count int + entry *ui.Entry } func (l *logger) Write(p []byte) (n int, err error) { - data := strings.Trim(string(p), "\n") ui.QueueMain(func() { - l.box.Append(ui.NewLabel(data), false) - l.count++ + l.entry.SetText(strings.Trim(string(p), "\n")) }) return len(p), nil } -func (l *logger) clear() { - for ; l.count > 0; l.count-- { - l.box.Delete(0) - } -} - func gui() error { return ui.Main(func() { pathEntry := ui.NewEntry() @@ -70,7 +61,7 @@ func gui() error { formatCombo.SetSelected(0) titleEntry := ui.NewEntry() - outputBox := ui.NewVerticalBox() + outputEntry := ui.NewEntry() importButton := ui.NewButton("Import dictionary...") mainBox := ui.NewVerticalBox() @@ -83,10 +74,11 @@ func gui() error { mainBox.Append(ui.NewLabel("Dictionary format:"), false) mainBox.Append(formatCombo, false) mainBox.Append(ui.NewLabel("Application output:"), false) - mainBox.Append(outputBox, true) + mainBox.Append(outputEntry, false) + mainBox.Append(ui.NewVerticalBox(), true) mainBox.Append(importButton, false) - window := ui.NewWindow("Yomichan Import", 640, 480, false) + window := ui.NewWindow("Yomichan Import", 640, 320, false) window.SetMargined(true) window.SetChild(mainBox) @@ -96,12 +88,11 @@ func gui() error { } }) - logger := &logger{outputBox, 0} - log.SetOutput(logger) + log.SetOutput(&logger{outputEntry}) importButton.OnClicked(func(*ui.Button) { importButton.Disable() - logger.clear() + outputEntry.SetText("") var ( outputDir string