From 33c787d70be219913ca7e94bf147091db0881196 Mon Sep 17 00:00:00 2001 From: Sasha Koshka Date: Wed, 3 May 2023 19:40:30 -0400 Subject: [PATCH] Changed import paths --- ability/element.go | 6 +++--- artist/artutil/util.go | 4 ++-- artist/patterns/border.go | 2 +- artist/patterns/texture.go | 2 +- artist/patterns/uniform.go | 6 +++--- artist/shapes/ellipse.go | 2 +- artist/shapes/line.go | 2 +- artist/shapes/rectangle.go | 4 ++-- default/config/config.go | 2 +- default/theme/default.go | 10 +++++----- element.go | 2 +- elements/box.go | 6 +++--- elements/button.go | 8 ++++---- elements/cell.go | 6 +++--- elements/checkbox.go | 8 ++++---- elements/combobox.go | 10 +++++----- elements/container.go | 2 +- elements/directory.go | 10 +++++----- elements/document.go | 8 ++++---- elements/file.go | 6 +++--- elements/fun/clock.go | 6 +++--- elements/fun/piano.go | 10 +++++----- elements/icon.go | 4 ++-- elements/image.go | 6 +++--- elements/label.go | 10 +++++----- elements/lerpslider.go | 2 +- elements/list.go | 10 +++++----- elements/progressbar.go | 4 ++-- elements/scroll.go | 8 ++++---- elements/scrollbar.go | 6 +++--- elements/slider.go | 6 +++--- elements/spacer.go | 4 ++-- elements/switch.go | 8 ++++---- elements/testing/artist.go | 14 +++++++------- elements/testing/mouse.go | 10 +++++----- elements/textbox.go | 16 ++++++++-------- elements/togglebutton.go | 8 ++++---- entity.go | 2 +- examples/clipboard/main.go | 10 +++++----- examples/document/main.go | 6 +++--- examples/drawing/main.go | 6 +++--- examples/fileBrowser/main.go | 6 +++--- examples/goroutines/main.go | 8 ++++---- examples/icons/main.go | 6 +++--- examples/image/image.go | 8 ++++---- examples/input/main.go | 8 ++++---- examples/label/main.go | 6 +++--- examples/list/main.go | 12 ++++++------ examples/panels/main.go | 6 +++--- examples/popups/main.go | 8 ++++---- examples/progress/main.go | 8 ++++---- examples/spacer/main.go | 6 +++--- go.mod | 2 +- nasin/application.go | 2 +- nasin/plugin.go | 2 +- plugins/wintergreen/main.go | 4 ++-- plugins/wintergreen/wintergreen/wintergreen.go | 10 +++++----- plugins/x/main.go | 4 ++-- plugins/x/x/encoding.go | 2 +- plugins/x/x/entity.go | 6 +++--- plugins/x/x/event.go | 6 +++--- plugins/x/x/selection.go | 2 +- plugins/x/x/selectionclaim.go | 2 +- plugins/x/x/system.go | 4 ++-- plugins/x/x/window.go | 6 +++--- plugins/x/x/x.go | 6 +++--- popups/dialog.go | 4 ++-- textdraw/drawer.go | 2 +- theme.go | 4 ++-- window.go | 2 +- 70 files changed, 207 insertions(+), 207 deletions(-) diff --git a/ability/element.go b/ability/element.go index 3f55e60..3343b8c 100644 --- a/ability/element.go +++ b/ability/element.go @@ -2,9 +2,9 @@ package ability import "image" -import "git.tebibyte.media/sashakoshka/tomo" -import "git.tebibyte.media/sashakoshka/tomo/input" -import "git.tebibyte.media/sashakoshka/tomo/artist" +import "tomo" +import "tomo/input" +import "tomo/artist" // Layoutable represents an element that needs to perform layout calculations // before it can draw itself. diff --git a/artist/artutil/util.go b/artist/artutil/util.go index 68d115c..19b7e98 100644 --- a/artist/artutil/util.go +++ b/artist/artutil/util.go @@ -4,8 +4,8 @@ package artutil import "image" import "image/color" -import "git.tebibyte.media/sashakoshka/tomo/artist" -import "git.tebibyte.media/sashakoshka/tomo/shatter" +import "tomo/artist" +import "tomo/shatter" // Fill fills the destination canvas with the given pattern. func Fill (destination artist.Canvas, source artist.Pattern) (updated image.Rectangle) { diff --git a/artist/patterns/border.go b/artist/patterns/border.go index b86962f..76f3d74 100644 --- a/artist/patterns/border.go +++ b/artist/patterns/border.go @@ -1,7 +1,7 @@ package patterns import "image" -import "git.tebibyte.media/sashakoshka/tomo/artist" +import "tomo/artist" // Border is a pattern that behaves similarly to border-image in CSS. It divides // a source canvas into nine sections... diff --git a/artist/patterns/texture.go b/artist/patterns/texture.go index 72869a7..0692325 100644 --- a/artist/patterns/texture.go +++ b/artist/patterns/texture.go @@ -1,7 +1,7 @@ package patterns import "image" -import "git.tebibyte.media/sashakoshka/tomo/artist" +import "tomo/artist" // Texture is a pattern that tiles the content of a canvas both horizontally and // vertically. diff --git a/artist/patterns/uniform.go b/artist/patterns/uniform.go index 06b9bbb..be40f46 100644 --- a/artist/patterns/uniform.go +++ b/artist/patterns/uniform.go @@ -2,9 +2,9 @@ package patterns import "image" import "image/color" -import "git.tebibyte.media/sashakoshka/tomo/artist" -import "git.tebibyte.media/sashakoshka/tomo/artist/shapes" -import "git.tebibyte.media/sashakoshka/tomo/artist/artutil" +import "tomo/artist" +import "tomo/artist/shapes" +import "tomo/artist/artutil" // Uniform is a pattern that draws a solid color. type Uniform color.RGBA diff --git a/artist/shapes/ellipse.go b/artist/shapes/ellipse.go index f5fae0d..79d3b7b 100644 --- a/artist/shapes/ellipse.go +++ b/artist/shapes/ellipse.go @@ -3,7 +3,7 @@ package shapes import "math" import "image" import "image/color" -import "git.tebibyte.media/sashakoshka/tomo/artist" +import "tomo/artist" // TODO: redo fill ellipse, stroke ellipse, etc. so that it only takes in // destination and source, using the bounds of destination as the bounds of the diff --git a/artist/shapes/line.go b/artist/shapes/line.go index 4593e4b..312354b 100644 --- a/artist/shapes/line.go +++ b/artist/shapes/line.go @@ -2,7 +2,7 @@ package shapes import "image" import "image/color" -import "git.tebibyte.media/sashakoshka/tomo/artist" +import "tomo/artist" // ColorLine draws a line from one point to another with the specified weight // and color. diff --git a/artist/shapes/rectangle.go b/artist/shapes/rectangle.go index 6282233..49f81d5 100644 --- a/artist/shapes/rectangle.go +++ b/artist/shapes/rectangle.go @@ -2,8 +2,8 @@ package shapes import "image" import "image/color" -import "git.tebibyte.media/sashakoshka/tomo/artist" -import "git.tebibyte.media/sashakoshka/tomo/shatter" +import "tomo/artist" +import "tomo/shatter" // TODO: return updatedRegion for all routines in this package diff --git a/default/config/config.go b/default/config/config.go index 0d35567..56f28fd 100644 --- a/default/config/config.go +++ b/default/config/config.go @@ -1,7 +1,7 @@ package config import "time" -import "git.tebibyte.media/sashakoshka/tomo" +import "tomo" // Default specifies default configuration values. type Default struct { } diff --git a/default/theme/default.go b/default/theme/default.go index 04e66b5..fc70481 100644 --- a/default/theme/default.go +++ b/default/theme/default.go @@ -7,11 +7,11 @@ import _ "image/png" import "image/color" import "golang.org/x/image/font" import "golang.org/x/image/font/basicfont" -import "git.tebibyte.media/sashakoshka/tomo" -import "git.tebibyte.media/sashakoshka/tomo/data" -import "git.tebibyte.media/sashakoshka/tomo/artist" -import "git.tebibyte.media/sashakoshka/tomo/artist/artutil" -import "git.tebibyte.media/sashakoshka/tomo/artist/patterns" +import "tomo" +import "tomo/data" +import "tomo/artist" +import "tomo/artist/artutil" +import "tomo/artist/patterns" //go:embed assets/default.png var defaultAtlasBytes []byte diff --git a/element.go b/element.go index 6a8d72d..e124116 100644 --- a/element.go +++ b/element.go @@ -1,6 +1,6 @@ package tomo -import "git.tebibyte.media/sashakoshka/tomo/artist" +import "tomo/artist" // Element represents a basic on-screen object. Extended element interfaces are // defined in the ability module. diff --git a/elements/box.go b/elements/box.go index 63677b2..8988436 100644 --- a/elements/box.go +++ b/elements/box.go @@ -1,9 +1,9 @@ package elements import "image" -import "git.tebibyte.media/sashakoshka/tomo" -import "git.tebibyte.media/sashakoshka/tomo/artist" -import "git.tebibyte.media/sashakoshka/tomo/shatter" +import "tomo" +import "tomo/artist" +import "tomo/shatter" var boxCase = tomo.C("tomo", "box") diff --git a/elements/button.go b/elements/button.go index 2aaa1c9..72a9453 100644 --- a/elements/button.go +++ b/elements/button.go @@ -1,10 +1,10 @@ package elements import "image" -import "git.tebibyte.media/sashakoshka/tomo" -import "git.tebibyte.media/sashakoshka/tomo/input" -import "git.tebibyte.media/sashakoshka/tomo/artist" -import "git.tebibyte.media/sashakoshka/tomo/textdraw" +import "tomo" +import "tomo/input" +import "tomo/artist" +import "tomo/textdraw" var buttonCase = tomo.C("tomo", "button") diff --git a/elements/cell.go b/elements/cell.go index 2337d65..97990e9 100644 --- a/elements/cell.go +++ b/elements/cell.go @@ -1,8 +1,8 @@ package elements -import "git.tebibyte.media/sashakoshka/tomo" -import "git.tebibyte.media/sashakoshka/tomo/artist" -import "git.tebibyte.media/sashakoshka/tomo/artist/artutil" +import "tomo" +import "tomo/artist" +import "tomo/artist/artutil" var cellCase = tomo.C("tomo", "cell") diff --git a/elements/checkbox.go b/elements/checkbox.go index 53eb38d..354fde1 100644 --- a/elements/checkbox.go +++ b/elements/checkbox.go @@ -1,10 +1,10 @@ package elements import "image" -import "git.tebibyte.media/sashakoshka/tomo" -import "git.tebibyte.media/sashakoshka/tomo/input" -import "git.tebibyte.media/sashakoshka/tomo/artist" -import "git.tebibyte.media/sashakoshka/tomo/textdraw" +import "tomo" +import "tomo/input" +import "tomo/artist" +import "tomo/textdraw" var checkboxCase = tomo.C("tomo", "checkbox") diff --git a/elements/combobox.go b/elements/combobox.go index dbd66ca..6d1b483 100644 --- a/elements/combobox.go +++ b/elements/combobox.go @@ -1,11 +1,11 @@ package elements import "image" -import "git.tebibyte.media/sashakoshka/tomo" -import "git.tebibyte.media/sashakoshka/tomo/input" -import "git.tebibyte.media/sashakoshka/tomo/artist" -import "git.tebibyte.media/sashakoshka/tomo/ability" -import "git.tebibyte.media/sashakoshka/tomo/textdraw" +import "tomo" +import "tomo/input" +import "tomo/artist" +import "tomo/ability" +import "tomo/textdraw" var comboBoxCase = tomo.C("tomo", "comboBox") diff --git a/elements/container.go b/elements/container.go index df61e45..915fcc7 100644 --- a/elements/container.go +++ b/elements/container.go @@ -1,6 +1,6 @@ package elements -import "git.tebibyte.media/sashakoshka/tomo" +import "tomo" type scratchEntry struct { expand bool diff --git a/elements/directory.go b/elements/directory.go index 9234a2d..9dbe742 100644 --- a/elements/directory.go +++ b/elements/directory.go @@ -2,11 +2,11 @@ package elements import "image" import "path/filepath" -import "git.tebibyte.media/sashakoshka/tomo" -import "git.tebibyte.media/sashakoshka/tomo/input" -import "git.tebibyte.media/sashakoshka/tomo/artist" -import "git.tebibyte.media/sashakoshka/tomo/ability" -import "git.tebibyte.media/sashakoshka/tomo/shatter" +import "tomo" +import "tomo/input" +import "tomo/artist" +import "tomo/ability" +import "tomo/shatter" // TODO: base on flow implementation of list. also be able to switch to a table // variant for a more information dense view. diff --git a/elements/document.go b/elements/document.go index 5f92c8c..0e84f7a 100644 --- a/elements/document.go +++ b/elements/document.go @@ -1,10 +1,10 @@ package elements import "image" -import "git.tebibyte.media/sashakoshka/tomo" -import "git.tebibyte.media/sashakoshka/tomo/artist" -import "git.tebibyte.media/sashakoshka/tomo/ability" -import "git.tebibyte.media/sashakoshka/tomo/shatter" +import "tomo" +import "tomo/artist" +import "tomo/ability" +import "tomo/shatter" var documentCase = tomo.C("tomo", "document") diff --git a/elements/file.go b/elements/file.go index 0c3e105..25d6540 100644 --- a/elements/file.go +++ b/elements/file.go @@ -3,9 +3,9 @@ package elements import "time" import "io/fs" import "image" -import "git.tebibyte.media/sashakoshka/tomo" -import "git.tebibyte.media/sashakoshka/tomo/input" -import "git.tebibyte.media/sashakoshka/tomo/artist" +import "tomo" +import "tomo/input" +import "tomo/artist" var fileCase = tomo.C("files", "file") diff --git a/elements/fun/clock.go b/elements/fun/clock.go index 69be434..cfe114c 100644 --- a/elements/fun/clock.go +++ b/elements/fun/clock.go @@ -4,9 +4,9 @@ import "time" import "math" import "image" import "image/color" -import "git.tebibyte.media/sashakoshka/tomo" -import "git.tebibyte.media/sashakoshka/tomo/artist" -import "git.tebibyte.media/sashakoshka/tomo/artist/shapes" +import "tomo" +import "tomo/artist" +import "tomo/artist/shapes" var clockCase = tomo.C("tomo", "clock") diff --git a/elements/fun/piano.go b/elements/fun/piano.go index 973fb38..e8e85b1 100644 --- a/elements/fun/piano.go +++ b/elements/fun/piano.go @@ -1,11 +1,11 @@ package fun import "image" -import "git.tebibyte.media/sashakoshka/tomo" -import "git.tebibyte.media/sashakoshka/tomo/input" -import "git.tebibyte.media/sashakoshka/tomo/artist" -import "git.tebibyte.media/sashakoshka/tomo/artist/artutil" -import "git.tebibyte.media/sashakoshka/tomo/elements/fun/music" +import "tomo" +import "tomo/input" +import "tomo/artist" +import "tomo/artist/artutil" +import "tomo/elements/fun/music" var pianoCase = tomo.C("tomo", "piano") var flatCase = tomo.C("tomo", "piano", "flatKey") diff --git a/elements/icon.go b/elements/icon.go index db02085..3f74e40 100644 --- a/elements/icon.go +++ b/elements/icon.go @@ -1,8 +1,8 @@ package elements import "image" -import "git.tebibyte.media/sashakoshka/tomo" -import "git.tebibyte.media/sashakoshka/tomo/artist" +import "tomo" +import "tomo/artist" var iconCase = tomo.C("tomo", "icon") diff --git a/elements/image.go b/elements/image.go index 271a654..720c1ab 100644 --- a/elements/image.go +++ b/elements/image.go @@ -1,9 +1,9 @@ package elements import "image" -import "git.tebibyte.media/sashakoshka/tomo" -import "git.tebibyte.media/sashakoshka/tomo/artist" -import "git.tebibyte.media/sashakoshka/tomo/artist/patterns" +import "tomo" +import "tomo/artist" +import "tomo/artist/patterns" // TODO: this element is lame need to make it better diff --git a/elements/label.go b/elements/label.go index 0d28b1b..6ec63a9 100644 --- a/elements/label.go +++ b/elements/label.go @@ -2,11 +2,11 @@ package elements import "image" import "golang.org/x/image/math/fixed" -import "git.tebibyte.media/sashakoshka/tomo" -import "git.tebibyte.media/sashakoshka/tomo/data" -import "git.tebibyte.media/sashakoshka/tomo/input" -import "git.tebibyte.media/sashakoshka/tomo/artist" -import "git.tebibyte.media/sashakoshka/tomo/textdraw" +import "tomo" +import "tomo/data" +import "tomo/input" +import "tomo/artist" +import "tomo/textdraw" var labelCase = tomo.C("tomo", "label") diff --git a/elements/lerpslider.go b/elements/lerpslider.go index 9d62618..0dcf4d7 100644 --- a/elements/lerpslider.go +++ b/elements/lerpslider.go @@ -1,6 +1,6 @@ package elements -import "git.tebibyte.media/sashakoshka/tomo" +import "tomo" // Numeric is a type constraint representing a number. type Numeric interface { diff --git a/elements/list.go b/elements/list.go index db1c006..3856a42 100644 --- a/elements/list.go +++ b/elements/list.go @@ -1,11 +1,11 @@ package elements import "image" -import "git.tebibyte.media/sashakoshka/tomo" -import "git.tebibyte.media/sashakoshka/tomo/input" -import "git.tebibyte.media/sashakoshka/tomo/artist" -import "git.tebibyte.media/sashakoshka/tomo/ability" -import "git.tebibyte.media/sashakoshka/tomo/artist/artutil" +import "tomo" +import "tomo/input" +import "tomo/artist" +import "tomo/ability" +import "tomo/artist/artutil" type list struct { container diff --git a/elements/progressbar.go b/elements/progressbar.go index c4c5308..2bb5580 100644 --- a/elements/progressbar.go +++ b/elements/progressbar.go @@ -1,8 +1,8 @@ package elements import "image" -import "git.tebibyte.media/sashakoshka/tomo" -import "git.tebibyte.media/sashakoshka/tomo/artist" +import "tomo" +import "tomo/artist" var progressBarCase = tomo.C("tomo", "progressBar") diff --git a/elements/scroll.go b/elements/scroll.go index cd39609..bc065cb 100644 --- a/elements/scroll.go +++ b/elements/scroll.go @@ -1,10 +1,10 @@ package elements import "image" -import "git.tebibyte.media/sashakoshka/tomo" -import "git.tebibyte.media/sashakoshka/tomo/input" -import "git.tebibyte.media/sashakoshka/tomo/artist" -import "git.tebibyte.media/sashakoshka/tomo/ability" +import "tomo" +import "tomo/input" +import "tomo/artist" +import "tomo/ability" var scrollCase = tomo.C("tomo", "scroll") diff --git a/elements/scrollbar.go b/elements/scrollbar.go index e3424e2..cb029a9 100644 --- a/elements/scrollbar.go +++ b/elements/scrollbar.go @@ -1,9 +1,9 @@ package elements import "image" -import "git.tebibyte.media/sashakoshka/tomo" -import "git.tebibyte.media/sashakoshka/tomo/input" -import "git.tebibyte.media/sashakoshka/tomo/artist" +import "tomo" +import "tomo/input" +import "tomo/artist" // ScrollBar is an element similar to Slider, but it has special behavior that // makes it well suited for controlling the viewport position on one axis of a diff --git a/elements/slider.go b/elements/slider.go index 5e67425..3666a00 100644 --- a/elements/slider.go +++ b/elements/slider.go @@ -1,9 +1,9 @@ package elements import "image" -import "git.tebibyte.media/sashakoshka/tomo" -import "git.tebibyte.media/sashakoshka/tomo/input" -import "git.tebibyte.media/sashakoshka/tomo/artist" +import "tomo" +import "tomo/input" +import "tomo/artist" // Slider is a slider control with a floating point value between zero and one. type Slider struct { diff --git a/elements/spacer.go b/elements/spacer.go index 1f072df..070a1aa 100644 --- a/elements/spacer.go +++ b/elements/spacer.go @@ -1,7 +1,7 @@ package elements -import "git.tebibyte.media/sashakoshka/tomo" -import "git.tebibyte.media/sashakoshka/tomo/artist" +import "tomo" +import "tomo/artist" var spacerCase = tomo.C("tomo", "spacer") diff --git a/elements/switch.go b/elements/switch.go index dd6ea85..ee9aaa5 100644 --- a/elements/switch.go +++ b/elements/switch.go @@ -1,10 +1,10 @@ package elements import "image" -import "git.tebibyte.media/sashakoshka/tomo" -import "git.tebibyte.media/sashakoshka/tomo/input" -import "git.tebibyte.media/sashakoshka/tomo/artist" -import "git.tebibyte.media/sashakoshka/tomo/textdraw" +import "tomo" +import "tomo/input" +import "tomo/artist" +import "tomo/textdraw" var switchCase = tomo.C("tomo", "switch") diff --git a/elements/testing/artist.go b/elements/testing/artist.go index d1a1497..ce2eec5 100644 --- a/elements/testing/artist.go +++ b/elements/testing/artist.go @@ -4,13 +4,13 @@ import "fmt" import "time" import "image" import "image/color" -import "git.tebibyte.media/sashakoshka/tomo" -import "git.tebibyte.media/sashakoshka/tomo/artist" -import "git.tebibyte.media/sashakoshka/tomo/shatter" -import "git.tebibyte.media/sashakoshka/tomo/textdraw" -import "git.tebibyte.media/sashakoshka/tomo/artist/shapes" -import "git.tebibyte.media/sashakoshka/tomo/artist/artutil" -import "git.tebibyte.media/sashakoshka/tomo/artist/patterns" +import "tomo" +import "tomo/artist" +import "tomo/shatter" +import "tomo/textdraw" +import "tomo/artist/shapes" +import "tomo/artist/artutil" +import "tomo/artist/patterns" // Artist is an element that displays shapes and patterns drawn by the artist // package in order to test it. diff --git a/elements/testing/mouse.go b/elements/testing/mouse.go index 29be390..80b3ee1 100644 --- a/elements/testing/mouse.go +++ b/elements/testing/mouse.go @@ -1,11 +1,11 @@ package testing import "image" -import "git.tebibyte.media/sashakoshka/tomo" -import "git.tebibyte.media/sashakoshka/tomo/input" -import "git.tebibyte.media/sashakoshka/tomo/artist" -import "git.tebibyte.media/sashakoshka/tomo/artist/shapes" -import "git.tebibyte.media/sashakoshka/tomo/artist/artutil" +import "tomo" +import "tomo/input" +import "tomo/artist" +import "tomo/artist/shapes" +import "tomo/artist/artutil" var mouseCase = tomo.C("tomo", "mouse") diff --git a/elements/textbox.go b/elements/textbox.go index 81cc5e0..42d0511 100644 --- a/elements/textbox.go +++ b/elements/textbox.go @@ -3,14 +3,14 @@ package elements import "io" import "time" import "image" -import "git.tebibyte.media/sashakoshka/tomo" -import "git.tebibyte.media/sashakoshka/tomo/data" -import "git.tebibyte.media/sashakoshka/tomo/input" -import "git.tebibyte.media/sashakoshka/tomo/artist" -import "git.tebibyte.media/sashakoshka/tomo/textdraw" -import "git.tebibyte.media/sashakoshka/tomo/textmanip" -import "git.tebibyte.media/sashakoshka/tomo/fixedutil" -import "git.tebibyte.media/sashakoshka/tomo/artist/shapes" +import "tomo" +import "tomo/data" +import "tomo/input" +import "tomo/artist" +import "tomo/textdraw" +import "tomo/textmanip" +import "tomo/fixedutil" +import "tomo/artist/shapes" var textBoxCase = tomo.C("tomo", "textBox") diff --git a/elements/togglebutton.go b/elements/togglebutton.go index 55e0e1e..83cf954 100644 --- a/elements/togglebutton.go +++ b/elements/togglebutton.go @@ -1,10 +1,10 @@ package elements import "image" -import "git.tebibyte.media/sashakoshka/tomo" -import "git.tebibyte.media/sashakoshka/tomo/input" -import "git.tebibyte.media/sashakoshka/tomo/artist" -import "git.tebibyte.media/sashakoshka/tomo/textdraw" +import "tomo" +import "tomo/input" +import "tomo/artist" +import "tomo/textdraw" var toggleButtonCase = tomo.C("tomo", "toggleButton") diff --git a/entity.go b/entity.go index 6dc279f..72be102 100644 --- a/entity.go +++ b/entity.go @@ -1,7 +1,7 @@ package tomo import "image" -import "git.tebibyte.media/sashakoshka/tomo/artist" +import "tomo/artist" // Entity is a handle given to elements by the backend. Extended entity // interfaces are defined in the ability module. diff --git a/examples/clipboard/main.go b/examples/clipboard/main.go index 8eb2539..abb633d 100644 --- a/examples/clipboard/main.go +++ b/examples/clipboard/main.go @@ -5,11 +5,11 @@ import "image" import _ "image/png" import _ "image/gif" import _ "image/jpeg" -import "git.tebibyte.media/sashakoshka/tomo" -import "git.tebibyte.media/sashakoshka/tomo/data" -import "git.tebibyte.media/sashakoshka/tomo/nasin" -import "git.tebibyte.media/sashakoshka/tomo/popups" -import "git.tebibyte.media/sashakoshka/tomo/elements" +import "tomo" +import "tomo/data" +import "tomo/nasin" +import "tomo/popups" +import "tomo/elements" var validImageTypes = []data.Mime { data.M("image", "png"), diff --git a/examples/document/main.go b/examples/document/main.go index 2ecd67b..c56ae15 100644 --- a/examples/document/main.go +++ b/examples/document/main.go @@ -3,9 +3,9 @@ package main import "os" import "image" import _ "image/png" -import "git.tebibyte.media/sashakoshka/tomo" -import "git.tebibyte.media/sashakoshka/tomo/nasin" -import "git.tebibyte.media/sashakoshka/tomo/elements" +import "tomo" +import "tomo/nasin" +import "tomo/elements" func main () { nasin.Run(Application { }) diff --git a/examples/drawing/main.go b/examples/drawing/main.go index 00e47bb..082ec58 100644 --- a/examples/drawing/main.go +++ b/examples/drawing/main.go @@ -1,8 +1,8 @@ package main -import "git.tebibyte.media/sashakoshka/tomo" -import "git.tebibyte.media/sashakoshka/tomo/nasin" -import "git.tebibyte.media/sashakoshka/tomo/elements/testing" +import "tomo" +import "tomo/nasin" +import "tomo/elements/testing" import "git.tebibyte.media/sashakoshka/ezprof/ez" func main () { diff --git a/examples/fileBrowser/main.go b/examples/fileBrowser/main.go index 2c1bf19..f274422 100644 --- a/examples/fileBrowser/main.go +++ b/examples/fileBrowser/main.go @@ -2,9 +2,9 @@ package main import "os" import "path/filepath" -import "git.tebibyte.media/sashakoshka/tomo" -import "git.tebibyte.media/sashakoshka/tomo/nasin" -import "git.tebibyte.media/sashakoshka/tomo/elements" +import "tomo" +import "tomo/nasin" +import "tomo/elements" func main () { nasin.Run(Application { }) diff --git a/examples/goroutines/main.go b/examples/goroutines/main.go index 7994031..d622aca 100644 --- a/examples/goroutines/main.go +++ b/examples/goroutines/main.go @@ -1,10 +1,10 @@ package main import "time" -import "git.tebibyte.media/sashakoshka/tomo" -import "git.tebibyte.media/sashakoshka/tomo/nasin" -import "git.tebibyte.media/sashakoshka/tomo/elements" -import "git.tebibyte.media/sashakoshka/tomo/elements/fun" +import "tomo" +import "tomo/nasin" +import "tomo/elements" +import "tomo/elements/fun" func main () { nasin.Run(Application { }) diff --git a/examples/icons/main.go b/examples/icons/main.go index a9e2417..d820401 100644 --- a/examples/icons/main.go +++ b/examples/icons/main.go @@ -1,8 +1,8 @@ package main -import "git.tebibyte.media/sashakoshka/tomo" -import "git.tebibyte.media/sashakoshka/tomo/nasin" -import "git.tebibyte.media/sashakoshka/tomo/elements" +import "tomo" +import "tomo/nasin" +import "tomo/elements" func main () { nasin.Run(Application { }) diff --git a/examples/image/image.go b/examples/image/image.go index daa9b60..c786f65 100644 --- a/examples/image/image.go +++ b/examples/image/image.go @@ -5,10 +5,10 @@ import "image" import "bytes" import _ "image/png" import "github.com/jezek/xgbutil/gopher" -import "git.tebibyte.media/sashakoshka/tomo" -import "git.tebibyte.media/sashakoshka/tomo/nasin" -import "git.tebibyte.media/sashakoshka/tomo/popups" -import "git.tebibyte.media/sashakoshka/tomo/elements" +import "tomo" +import "tomo/nasin" +import "tomo/popups" +import "tomo/elements" func main () { nasin.Run(Application { }) diff --git a/examples/input/main.go b/examples/input/main.go index ce2cf13..94fb824 100644 --- a/examples/input/main.go +++ b/examples/input/main.go @@ -1,9 +1,9 @@ package main -import "git.tebibyte.media/sashakoshka/tomo" -import "git.tebibyte.media/sashakoshka/tomo/nasin" -import "git.tebibyte.media/sashakoshka/tomo/popups" -import "git.tebibyte.media/sashakoshka/tomo/elements" +import "tomo" +import "tomo/nasin" +import "tomo/popups" +import "tomo/elements" func main () { nasin.Run(Application { }) diff --git a/examples/label/main.go b/examples/label/main.go index 034bc92..7d08afb 100644 --- a/examples/label/main.go +++ b/examples/label/main.go @@ -1,8 +1,8 @@ package main -import "git.tebibyte.media/sashakoshka/tomo" -import "git.tebibyte.media/sashakoshka/tomo/nasin" -import "git.tebibyte.media/sashakoshka/tomo/elements" +import "tomo" +import "tomo/nasin" +import "tomo/elements" func main () { nasin.Run(Application { }) diff --git a/examples/list/main.go b/examples/list/main.go index e709f2e..1e6d089 100644 --- a/examples/list/main.go +++ b/examples/list/main.go @@ -1,11 +1,11 @@ package main -import "git.tebibyte.media/sashakoshka/tomo" -import "git.tebibyte.media/sashakoshka/tomo/nasin" -import "git.tebibyte.media/sashakoshka/tomo/popups" -import "git.tebibyte.media/sashakoshka/tomo/ability" -import "git.tebibyte.media/sashakoshka/tomo/elements" -import "git.tebibyte.media/sashakoshka/tomo/elements/testing" +import "tomo" +import "tomo/nasin" +import "tomo/popups" +import "tomo/ability" +import "tomo/elements" +import "tomo/elements/testing" func main () { nasin.Run(Application { }) diff --git a/examples/panels/main.go b/examples/panels/main.go index 66ce8a1..bc9fd16 100644 --- a/examples/panels/main.go +++ b/examples/panels/main.go @@ -2,9 +2,9 @@ package main import "fmt" import "image" -import "git.tebibyte.media/sashakoshka/tomo" -import "git.tebibyte.media/sashakoshka/tomo/nasin" -import "git.tebibyte.media/sashakoshka/tomo/elements" +import "tomo" +import "tomo/nasin" +import "tomo/elements" func main () { nasin.Run(Application { }) diff --git a/examples/popups/main.go b/examples/popups/main.go index d1ba9cc..6e55ac2 100644 --- a/examples/popups/main.go +++ b/examples/popups/main.go @@ -1,9 +1,9 @@ package main -import "git.tebibyte.media/sashakoshka/tomo" -import "git.tebibyte.media/sashakoshka/tomo/nasin" -import "git.tebibyte.media/sashakoshka/tomo/popups" -import "git.tebibyte.media/sashakoshka/tomo/elements" +import "tomo" +import "tomo/nasin" +import "tomo/popups" +import "tomo/elements" func main () { nasin.Run(Application { }) diff --git a/examples/progress/main.go b/examples/progress/main.go index 6be1f32..29ba1b7 100644 --- a/examples/progress/main.go +++ b/examples/progress/main.go @@ -1,10 +1,10 @@ package main import "time" -import "git.tebibyte.media/sashakoshka/tomo" -import "git.tebibyte.media/sashakoshka/tomo/nasin" -import "git.tebibyte.media/sashakoshka/tomo/popups" -import "git.tebibyte.media/sashakoshka/tomo/elements" +import "tomo" +import "tomo/nasin" +import "tomo/popups" +import "tomo/elements" func main () { nasin.Run(Application { }) diff --git a/examples/spacer/main.go b/examples/spacer/main.go index 4221ac2..bfd840a 100644 --- a/examples/spacer/main.go +++ b/examples/spacer/main.go @@ -1,8 +1,8 @@ package main -import "git.tebibyte.media/sashakoshka/tomo" -import "git.tebibyte.media/sashakoshka/tomo/nasin" -import "git.tebibyte.media/sashakoshka/tomo/elements" +import "tomo" +import "tomo/nasin" +import "tomo/elements" func main () { nasin.Run(Application { }) diff --git a/go.mod b/go.mod index be44d33..64d9d0b 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module git.tebibyte.media/sashakoshka/tomo +module tomo go 1.19 diff --git a/nasin/application.go b/nasin/application.go index 31a2844..2f75131 100644 --- a/nasin/application.go +++ b/nasin/application.go @@ -2,7 +2,7 @@ package nasin import "image" import "errors" -import "git.tebibyte.media/sashakoshka/tomo" +import "tomo" // Application represents a Tomo/Nasin application. type Application interface { diff --git a/nasin/plugin.go b/nasin/plugin.go index 0411845..a60b87d 100644 --- a/nasin/plugin.go +++ b/nasin/plugin.go @@ -6,7 +6,7 @@ import "os" // the generic extract function we have here for extra type safety goodness. import "plugin" import "path/filepath" -import "git.tebibyte.media/sashakoshka/tomo" +import "tomo" type backendFactory func () (tomo.Backend, error) var factories []backendFactory diff --git a/plugins/wintergreen/main.go b/plugins/wintergreen/main.go index 6d1bcc4..fe36e03 100644 --- a/plugins/wintergreen/main.go +++ b/plugins/wintergreen/main.go @@ -1,8 +1,8 @@ // Plugin wintergreen provides a calm, bluish green theme. package main -import "git.tebibyte.media/sashakoshka/tomo" -import "git.tebibyte.media/sashakoshka/tomo/plugins/wintergreen/wintergreen" +import "tomo" +import "tomo/plugins/wintergreen/wintergreen" func Expects () tomo.Version { return tomo.Version { 0, 0, 0 } diff --git a/plugins/wintergreen/wintergreen/wintergreen.go b/plugins/wintergreen/wintergreen/wintergreen.go index 4be904e..61be20d 100644 --- a/plugins/wintergreen/wintergreen/wintergreen.go +++ b/plugins/wintergreen/wintergreen/wintergreen.go @@ -7,11 +7,11 @@ import _ "image/png" import "image/color" import "golang.org/x/image/font" import "golang.org/x/image/font/basicfont" -import "git.tebibyte.media/sashakoshka/tomo" -import "git.tebibyte.media/sashakoshka/tomo/data" -import "git.tebibyte.media/sashakoshka/tomo/artist" -import "git.tebibyte.media/sashakoshka/tomo/artist/artutil" -import "git.tebibyte.media/sashakoshka/tomo/artist/patterns" +import "tomo" +import "tomo/data" +import "tomo/artist" +import "tomo/artist/artutil" +import "tomo/artist/patterns" //go:embed assets/wintergreen.png var defaultAtlasBytes []byte diff --git a/plugins/x/main.go b/plugins/x/main.go index bce6b24..409413e 100644 --- a/plugins/x/main.go +++ b/plugins/x/main.go @@ -1,8 +1,8 @@ // Plugin x provides the X11 backend as a plugin. package main -import "git.tebibyte.media/sashakoshka/tomo" -import "git.tebibyte.media/sashakoshka/tomo/plugins/x/x" +import "tomo" +import "tomo/plugins/x/x" func Expects () tomo.Version { return tomo.Version { 0, 0, 0 } diff --git a/plugins/x/x/encoding.go b/plugins/x/x/encoding.go index 296163f..65bc16e 100644 --- a/plugins/x/x/encoding.go +++ b/plugins/x/x/encoding.go @@ -3,7 +3,7 @@ package x import "unicode" import "github.com/jezek/xgb/xproto" import "github.com/jezek/xgbutil/keybind" -import "git.tebibyte.media/sashakoshka/tomo/input" +import "tomo/input" // when making changes to this file, look at keysymdef.h and // https://tronche.com/gui/x/xlib/input/keyboard-encoding.html diff --git a/plugins/x/x/entity.go b/plugins/x/x/entity.go index 7718e57..dc5a1ee 100644 --- a/plugins/x/x/entity.go +++ b/plugins/x/x/entity.go @@ -1,9 +1,9 @@ package x import "image" -import "git.tebibyte.media/sashakoshka/tomo" -import "git.tebibyte.media/sashakoshka/tomo/artist" -import "git.tebibyte.media/sashakoshka/tomo/ability" +import "tomo" +import "tomo/artist" +import "tomo/ability" type entity struct { backend *backend diff --git a/plugins/x/x/event.go b/plugins/x/x/event.go index 182a607..4650240 100644 --- a/plugins/x/x/event.go +++ b/plugins/x/x/event.go @@ -1,9 +1,9 @@ package x import "image" -import "git.tebibyte.media/sashakoshka/tomo" -import "git.tebibyte.media/sashakoshka/tomo/input" -import "git.tebibyte.media/sashakoshka/tomo/ability" +import "tomo" +import "tomo/input" +import "tomo/ability" import "github.com/jezek/xgbutil" import "github.com/jezek/xgb/xproto" diff --git a/plugins/x/x/selection.go b/plugins/x/x/selection.go index befe208..72066f0 100644 --- a/plugins/x/x/selection.go +++ b/plugins/x/x/selection.go @@ -7,7 +7,7 @@ import "github.com/jezek/xgbutil" import "github.com/jezek/xgb/xproto" import "github.com/jezek/xgbutil/xprop" import "github.com/jezek/xgbutil/xevent" -import "git.tebibyte.media/sashakoshka/tomo/data" +import "tomo/data" const clipboardName = "CLIPBOARD" diff --git a/plugins/x/x/selectionclaim.go b/plugins/x/x/selectionclaim.go index c5fefb7..ec87854 100644 --- a/plugins/x/x/selectionclaim.go +++ b/plugins/x/x/selectionclaim.go @@ -6,7 +6,7 @@ import "github.com/jezek/xgbutil" import "github.com/jezek/xgb/xproto" import "github.com/jezek/xgbutil/xprop" import "github.com/jezek/xgbutil/xevent" -import "git.tebibyte.media/sashakoshka/tomo/data" +import "tomo/data" type selectionClaim struct { window *window diff --git a/plugins/x/x/system.go b/plugins/x/x/system.go index 4143774..436c0c6 100644 --- a/plugins/x/x/system.go +++ b/plugins/x/x/system.go @@ -1,8 +1,8 @@ package x import "image" -import "git.tebibyte.media/sashakoshka/tomo/artist" -import "git.tebibyte.media/sashakoshka/tomo/ability" +import "tomo/artist" +import "tomo/ability" type entitySet map[*entity] struct { } diff --git a/plugins/x/x/window.go b/plugins/x/x/window.go index 18cbbf9..22706e2 100644 --- a/plugins/x/x/window.go +++ b/plugins/x/x/window.go @@ -11,9 +11,9 @@ import "github.com/jezek/xgbutil/xwindow" import "github.com/jezek/xgbutil/keybind" import "github.com/jezek/xgbutil/mousebind" import "github.com/jezek/xgbutil/xgraphics" -import "git.tebibyte.media/sashakoshka/tomo" -import "git.tebibyte.media/sashakoshka/tomo/data" -import "git.tebibyte.media/sashakoshka/tomo/artist" +import "tomo" +import "tomo/data" +import "tomo/artist" type mainWindow struct { *window } type menuWindow struct { *window } diff --git a/plugins/x/x/x.go b/plugins/x/x/x.go index c76be69..0fc1bb0 100644 --- a/plugins/x/x/x.go +++ b/plugins/x/x/x.go @@ -1,8 +1,8 @@ package x -import "git.tebibyte.media/sashakoshka/tomo" -import defaultTheme "git.tebibyte.media/sashakoshka/tomo/default/theme" -import defaultConfig "git.tebibyte.media/sashakoshka/tomo/default/config" +import "tomo" +import defaultTheme "tomo/default/theme" +import defaultConfig "tomo/default/config" import "github.com/jezek/xgbutil" import "github.com/jezek/xgb/xproto" diff --git a/popups/dialog.go b/popups/dialog.go index b7978dd..8d6e2ef 100644 --- a/popups/dialog.go +++ b/popups/dialog.go @@ -1,8 +1,8 @@ package popups import "image" -import "git.tebibyte.media/sashakoshka/tomo" -import "git.tebibyte.media/sashakoshka/tomo/elements" +import "tomo" +import "tomo/elements" // DialogKind defines the semantic role of a dialog window. type DialogKind int diff --git a/textdraw/drawer.go b/textdraw/drawer.go index f5cbcfc..f371eca 100644 --- a/textdraw/drawer.go +++ b/textdraw/drawer.go @@ -5,7 +5,7 @@ import "unicode" import "image/draw" import "image/color" import "golang.org/x/image/math/fixed" -import "git.tebibyte.media/sashakoshka/tomo/artist" +import "tomo/artist" // Drawer is an extended TypeSetter that is able to draw text. Much like // TypeSetter, It has no constructor and its zero value can be used safely. diff --git a/theme.go b/theme.go index 8e5ebd0..4f6f3ae 100644 --- a/theme.go +++ b/theme.go @@ -3,8 +3,8 @@ package tomo import "image" import "image/color" import "golang.org/x/image/font" -import "git.tebibyte.media/sashakoshka/tomo/data" -import "git.tebibyte.media/sashakoshka/tomo/artist" +import "tomo/data" +import "tomo/artist" // Color lits a number of cannonical colors, each with its own ID. type Color int; const ( diff --git a/window.go b/window.go index a88b2c8..7f4ef15 100644 --- a/window.go +++ b/window.go @@ -1,7 +1,7 @@ package tomo import "image" -import "git.tebibyte.media/sashakoshka/tomo/data" +import "tomo/data" // TODO: add support for the icon window because imagine if we allowed // applications to display live updating information readouts on their icons.