diff --git a/maker/widget_maker.go b/app/widget_maker.go similarity index 99% rename from maker/widget_maker.go rename to app/widget_maker.go index cb11cba5..cdde17cd 100644 --- a/maker/widget_maker.go +++ b/app/widget_maker.go @@ -1,4 +1,4 @@ -package maker +package app import ( "github.com/olebedev/config" diff --git a/app/wtf_app.go b/app/wtf_app.go index ecbe8dff..3dbb8e37 100644 --- a/app/wtf_app.go +++ b/app/wtf_app.go @@ -9,7 +9,6 @@ import ( "github.com/radovskyb/watcher" "github.com/rivo/tview" "github.com/wtfutil/wtf/cfg" - "github.com/wtfutil/wtf/maker" "github.com/wtfutil/wtf/utils" "github.com/wtfutil/wtf/wtf" ) @@ -39,7 +38,7 @@ func NewWtfApp(app *tview.Application, config *config.Config, configFilePath str } wtfApp.app.SetInputCapture(wtfApp.keyboardIntercept) - wtfApp.widgets = maker.MakeWidgets(wtfApp.app, wtfApp.pages, wtfApp.config) + wtfApp.widgets = MakeWidgets(wtfApp.app, wtfApp.pages, wtfApp.config) wtfApp.display = NewDisplay(wtfApp.widgets, wtfApp.config) wtfApp.focusTracker = NewFocusTracker(wtfApp.app, wtfApp.widgets, wtfApp.config) wtfApp.validator = NewModuleValidator() diff --git a/help/help.go b/help/help.go index d753f5bd..ccc1cbb9 100644 --- a/help/help.go +++ b/help/help.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/olebedev/config" - "github.com/wtfutil/wtf/maker" + "github.com/wtfutil/wtf/app" "github.com/wtfutil/wtf/utils" ) @@ -18,7 +18,7 @@ func Display(moduleName string, config *config.Config) { } func helpFor(moduleName string, config *config.Config) string { - widget := maker.MakeWidget(nil, nil, moduleName, config) + widget := app.MakeWidget(nil, nil, moduleName, config) result := "" result += utils.StripColorTags(widget.HelpText())