From b772cb6ab975e0146769ede0d5e0d17fce3b7b89 Mon Sep 17 00:00:00 2001 From: louis-e <44675238+louis-e@users.noreply.github.com> Date: Sat, 13 Sep 2025 14:16:55 +0200 Subject: [PATCH 1/4] Move gui-src/ to src/gui/ --- .gitattributes | 2 +- {gui-src => src/gui}/arnis.desktop | 0 {gui-src => src/gui}/css/bbox.css | 0 .../libs/ui-lightness/images/animated-overlay.gif | Bin .../ui-bg_diagonals-thick_18_b81900_40x40.png | Bin .../ui-bg_diagonals-thick_20_666666_40x40.png | Bin .../images/ui-bg_flat_10_000000_40x100.png | Bin .../images/ui-bg_glass_100_f6f6f6_1x400.png | Bin .../images/ui-bg_glass_100_fdf5ce_1x400.png | Bin .../images/ui-bg_glass_65_ffffff_1x400.png | Bin .../images/ui-bg_gloss-wave_35_f6a828_500x100.png | Bin .../ui-bg_highlight-soft_100_eeeeee_1x100.png | Bin .../images/ui-bg_highlight-soft_75_ffe45c_1x100.png | Bin .../ui-lightness/images/ui-icons_222222_256x240.png | Bin .../ui-lightness/images/ui-icons_228ef1_256x240.png | Bin .../ui-lightness/images/ui-icons_ef8c08_256x240.png | Bin .../ui-lightness/images/ui-icons_ffd27a_256x240.png | Bin .../ui-lightness/images/ui-icons_ffffff_256x240.png | Bin .../libs/ui-lightness/jquery-ui-1.10.3.custom.css | 0 .../ui-lightness/jquery-ui-1.10.3.custom.min.css | 0 .../gui}/css/maps/images/bbox-sprites.png | Bin .../gui}/css/maps/images/bbox-sprites.svg | 0 .../gui}/css/maps/images/icons-404040.png | Bin .../gui}/css/maps/images/icons-404040@2x.png | Bin .../gui}/css/maps/images/icons-ffffff.png | Bin .../gui}/css/maps/images/icons-ffffff@2x.png | Bin {gui-src => src/gui}/css/maps/images/icons.svg | 0 .../gui}/css/maps/images/spritesheet-2x.png | Bin .../gui}/css/maps/images/spritesheet.png | Bin .../gui}/css/maps/images/spritesheet.svg | 0 {gui-src => src/gui}/css/maps/leaflet.css | 0 {gui-src => src/gui}/css/maps/leaflet.draw.css | 0 {gui-src => src/gui}/css/maps/leaflet.sidebar.css | 0 {gui-src => src/gui}/css/search.css | 0 {gui-src => src/gui}/css/styles.css | 0 {gui-src => src/gui}/images/buymeacoffee.png | Bin {gui-src => src/gui}/images/crosshair.png | Bin {gui-src => src/gui}/images/discord.png | Bin {gui-src => src/gui}/images/logo.png | Bin {gui-src => src/gui}/images/marker-icon.png | Bin {gui-src => src/gui}/images/tile.png | Bin {gui-src => src/gui}/index.html | 0 {gui-src => src/gui}/js/bbox.js | 0 {gui-src => src/gui}/js/language-selector.js | 0 {gui-src => src/gui}/js/language.js | 0 {gui-src => src/gui}/js/libs/jquery-1.9.1.js | 0 {gui-src => src/gui}/js/libs/jquery-1.9.1.min.js | 0 .../gui}/js/libs/jquery-ui-1.10.3.custom.js | 0 .../gui}/js/libs/jquery-ui-1.10.3.custom.min.js | 0 {gui-src => src/gui}/js/license.js | 0 {gui-src => src/gui}/js/main.js | 0 {gui-src => src/gui}/js/maps/leaflet.draw.js | 0 {gui-src => src/gui}/js/maps/leaflet.js | 0 {gui-src => src/gui}/js/maps/leaflet.sidebar.js | 0 {gui-src => src/gui}/js/maps/proj4-src.js | 0 {gui-src => src/gui}/js/maps/proj4leaflet.js | 0 {gui-src => src/gui}/js/maps/wkt.parser.js | 0 {gui-src => src/gui}/js/search.js | 0 {gui-src => src/gui}/locales/ar.json | 0 {gui-src => src/gui}/locales/de.json | 0 {gui-src => src/gui}/locales/en-US.json | 0 {gui-src => src/gui}/locales/en.json | 0 {gui-src => src/gui}/locales/es.json | 0 {gui-src => src/gui}/locales/fi.json | 0 {gui-src => src/gui}/locales/fr-FR.json | 0 {gui-src => src/gui}/locales/hu.json | 0 {gui-src => src/gui}/locales/ko.json | 0 {gui-src => src/gui}/locales/lt.json | 0 {gui-src => src/gui}/locales/pl.json | 0 {gui-src => src/gui}/locales/ru.json | 0 {gui-src => src/gui}/locales/sv.json | 0 {gui-src => src/gui}/locales/ua.json | 0 {gui-src => src/gui}/locales/zh-CN.json | 0 {gui-src => src/gui}/maps.html | 0 tauri.conf.json | 2 +- 75 files changed, 2 insertions(+), 2 deletions(-) rename {gui-src => src/gui}/arnis.desktop (100%) rename {gui-src => src/gui}/css/bbox.css (100%) rename {gui-src => src/gui}/css/libs/ui-lightness/images/animated-overlay.gif (100%) rename {gui-src => src/gui}/css/libs/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png (100%) rename {gui-src => src/gui}/css/libs/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png (100%) rename {gui-src => src/gui}/css/libs/ui-lightness/images/ui-bg_flat_10_000000_40x100.png (100%) rename {gui-src => src/gui}/css/libs/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png (100%) rename {gui-src => src/gui}/css/libs/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png (100%) rename {gui-src => src/gui}/css/libs/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png (100%) rename {gui-src => src/gui}/css/libs/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png (100%) rename {gui-src => src/gui}/css/libs/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png (100%) rename {gui-src => src/gui}/css/libs/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png (100%) rename {gui-src => src/gui}/css/libs/ui-lightness/images/ui-icons_222222_256x240.png (100%) rename {gui-src => src/gui}/css/libs/ui-lightness/images/ui-icons_228ef1_256x240.png (100%) rename {gui-src => src/gui}/css/libs/ui-lightness/images/ui-icons_ef8c08_256x240.png (100%) rename {gui-src => src/gui}/css/libs/ui-lightness/images/ui-icons_ffd27a_256x240.png (100%) rename {gui-src => src/gui}/css/libs/ui-lightness/images/ui-icons_ffffff_256x240.png (100%) rename {gui-src => src/gui}/css/libs/ui-lightness/jquery-ui-1.10.3.custom.css (100%) rename {gui-src => src/gui}/css/libs/ui-lightness/jquery-ui-1.10.3.custom.min.css (100%) rename {gui-src => src/gui}/css/maps/images/bbox-sprites.png (100%) rename {gui-src => src/gui}/css/maps/images/bbox-sprites.svg (100%) rename {gui-src => src/gui}/css/maps/images/icons-404040.png (100%) rename {gui-src => src/gui}/css/maps/images/icons-404040@2x.png (100%) rename {gui-src => src/gui}/css/maps/images/icons-ffffff.png (100%) rename {gui-src => src/gui}/css/maps/images/icons-ffffff@2x.png (100%) rename {gui-src => src/gui}/css/maps/images/icons.svg (100%) rename {gui-src => src/gui}/css/maps/images/spritesheet-2x.png (100%) rename {gui-src => src/gui}/css/maps/images/spritesheet.png (100%) rename {gui-src => src/gui}/css/maps/images/spritesheet.svg (100%) rename {gui-src => src/gui}/css/maps/leaflet.css (100%) rename {gui-src => src/gui}/css/maps/leaflet.draw.css (100%) rename {gui-src => src/gui}/css/maps/leaflet.sidebar.css (100%) rename {gui-src => src/gui}/css/search.css (100%) rename {gui-src => src/gui}/css/styles.css (100%) rename {gui-src => src/gui}/images/buymeacoffee.png (100%) rename {gui-src => src/gui}/images/crosshair.png (100%) rename {gui-src => src/gui}/images/discord.png (100%) rename {gui-src => src/gui}/images/logo.png (100%) rename {gui-src => src/gui}/images/marker-icon.png (100%) rename {gui-src => src/gui}/images/tile.png (100%) rename {gui-src => src/gui}/index.html (100%) rename {gui-src => src/gui}/js/bbox.js (100%) rename {gui-src => src/gui}/js/language-selector.js (100%) rename {gui-src => src/gui}/js/language.js (100%) rename {gui-src => src/gui}/js/libs/jquery-1.9.1.js (100%) rename {gui-src => src/gui}/js/libs/jquery-1.9.1.min.js (100%) rename {gui-src => src/gui}/js/libs/jquery-ui-1.10.3.custom.js (100%) rename {gui-src => src/gui}/js/libs/jquery-ui-1.10.3.custom.min.js (100%) rename {gui-src => src/gui}/js/license.js (100%) rename {gui-src => src/gui}/js/main.js (100%) rename {gui-src => src/gui}/js/maps/leaflet.draw.js (100%) rename {gui-src => src/gui}/js/maps/leaflet.js (100%) rename {gui-src => src/gui}/js/maps/leaflet.sidebar.js (100%) rename {gui-src => src/gui}/js/maps/proj4-src.js (100%) rename {gui-src => src/gui}/js/maps/proj4leaflet.js (100%) rename {gui-src => src/gui}/js/maps/wkt.parser.js (100%) rename {gui-src => src/gui}/js/search.js (100%) rename {gui-src => src/gui}/locales/ar.json (100%) rename {gui-src => src/gui}/locales/de.json (100%) rename {gui-src => src/gui}/locales/en-US.json (100%) rename {gui-src => src/gui}/locales/en.json (100%) rename {gui-src => src/gui}/locales/es.json (100%) rename {gui-src => src/gui}/locales/fi.json (100%) rename {gui-src => src/gui}/locales/fr-FR.json (100%) rename {gui-src => src/gui}/locales/hu.json (100%) rename {gui-src => src/gui}/locales/ko.json (100%) rename {gui-src => src/gui}/locales/lt.json (100%) rename {gui-src => src/gui}/locales/pl.json (100%) rename {gui-src => src/gui}/locales/ru.json (100%) rename {gui-src => src/gui}/locales/sv.json (100%) rename {gui-src => src/gui}/locales/ua.json (100%) rename {gui-src => src/gui}/locales/zh-CN.json (100%) rename {gui-src => src/gui}/maps.html (100%) diff --git a/.gitattributes b/.gitattributes index f70de7a..6effdab 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1 @@ -gui-src/** linguist-vendored +src/gui/** linguist-vendored diff --git a/gui-src/arnis.desktop b/src/gui/arnis.desktop similarity index 100% rename from gui-src/arnis.desktop rename to src/gui/arnis.desktop diff --git a/gui-src/css/bbox.css b/src/gui/css/bbox.css similarity index 100% rename from gui-src/css/bbox.css rename to src/gui/css/bbox.css diff --git a/gui-src/css/libs/ui-lightness/images/animated-overlay.gif b/src/gui/css/libs/ui-lightness/images/animated-overlay.gif similarity index 100% rename from gui-src/css/libs/ui-lightness/images/animated-overlay.gif rename to src/gui/css/libs/ui-lightness/images/animated-overlay.gif diff --git a/gui-src/css/libs/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png b/src/gui/css/libs/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png similarity index 100% rename from gui-src/css/libs/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png rename to src/gui/css/libs/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png diff --git a/gui-src/css/libs/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png b/src/gui/css/libs/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png similarity index 100% rename from gui-src/css/libs/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png rename to src/gui/css/libs/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png diff --git a/gui-src/css/libs/ui-lightness/images/ui-bg_flat_10_000000_40x100.png b/src/gui/css/libs/ui-lightness/images/ui-bg_flat_10_000000_40x100.png similarity index 100% rename from gui-src/css/libs/ui-lightness/images/ui-bg_flat_10_000000_40x100.png rename to src/gui/css/libs/ui-lightness/images/ui-bg_flat_10_000000_40x100.png diff --git a/gui-src/css/libs/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png b/src/gui/css/libs/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png similarity index 100% rename from gui-src/css/libs/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png rename to src/gui/css/libs/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png diff --git a/gui-src/css/libs/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png b/src/gui/css/libs/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png similarity index 100% rename from gui-src/css/libs/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png rename to src/gui/css/libs/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png diff --git a/gui-src/css/libs/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png b/src/gui/css/libs/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png similarity index 100% rename from gui-src/css/libs/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png rename to src/gui/css/libs/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png diff --git a/gui-src/css/libs/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png b/src/gui/css/libs/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png similarity index 100% rename from gui-src/css/libs/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png rename to src/gui/css/libs/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png diff --git a/gui-src/css/libs/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png b/src/gui/css/libs/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png similarity index 100% rename from gui-src/css/libs/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png rename to src/gui/css/libs/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png diff --git a/gui-src/css/libs/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png b/src/gui/css/libs/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png similarity index 100% rename from gui-src/css/libs/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png rename to src/gui/css/libs/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png diff --git a/gui-src/css/libs/ui-lightness/images/ui-icons_222222_256x240.png b/src/gui/css/libs/ui-lightness/images/ui-icons_222222_256x240.png similarity index 100% rename from gui-src/css/libs/ui-lightness/images/ui-icons_222222_256x240.png rename to src/gui/css/libs/ui-lightness/images/ui-icons_222222_256x240.png diff --git a/gui-src/css/libs/ui-lightness/images/ui-icons_228ef1_256x240.png b/src/gui/css/libs/ui-lightness/images/ui-icons_228ef1_256x240.png similarity index 100% rename from gui-src/css/libs/ui-lightness/images/ui-icons_228ef1_256x240.png rename to src/gui/css/libs/ui-lightness/images/ui-icons_228ef1_256x240.png diff --git a/gui-src/css/libs/ui-lightness/images/ui-icons_ef8c08_256x240.png b/src/gui/css/libs/ui-lightness/images/ui-icons_ef8c08_256x240.png similarity index 100% rename from gui-src/css/libs/ui-lightness/images/ui-icons_ef8c08_256x240.png rename to src/gui/css/libs/ui-lightness/images/ui-icons_ef8c08_256x240.png diff --git a/gui-src/css/libs/ui-lightness/images/ui-icons_ffd27a_256x240.png b/src/gui/css/libs/ui-lightness/images/ui-icons_ffd27a_256x240.png similarity index 100% rename from gui-src/css/libs/ui-lightness/images/ui-icons_ffd27a_256x240.png rename to src/gui/css/libs/ui-lightness/images/ui-icons_ffd27a_256x240.png diff --git a/gui-src/css/libs/ui-lightness/images/ui-icons_ffffff_256x240.png b/src/gui/css/libs/ui-lightness/images/ui-icons_ffffff_256x240.png similarity index 100% rename from gui-src/css/libs/ui-lightness/images/ui-icons_ffffff_256x240.png rename to src/gui/css/libs/ui-lightness/images/ui-icons_ffffff_256x240.png diff --git a/gui-src/css/libs/ui-lightness/jquery-ui-1.10.3.custom.css b/src/gui/css/libs/ui-lightness/jquery-ui-1.10.3.custom.css similarity index 100% rename from gui-src/css/libs/ui-lightness/jquery-ui-1.10.3.custom.css rename to src/gui/css/libs/ui-lightness/jquery-ui-1.10.3.custom.css diff --git a/gui-src/css/libs/ui-lightness/jquery-ui-1.10.3.custom.min.css b/src/gui/css/libs/ui-lightness/jquery-ui-1.10.3.custom.min.css similarity index 100% rename from gui-src/css/libs/ui-lightness/jquery-ui-1.10.3.custom.min.css rename to src/gui/css/libs/ui-lightness/jquery-ui-1.10.3.custom.min.css diff --git a/gui-src/css/maps/images/bbox-sprites.png b/src/gui/css/maps/images/bbox-sprites.png similarity index 100% rename from gui-src/css/maps/images/bbox-sprites.png rename to src/gui/css/maps/images/bbox-sprites.png diff --git a/gui-src/css/maps/images/bbox-sprites.svg b/src/gui/css/maps/images/bbox-sprites.svg similarity index 100% rename from gui-src/css/maps/images/bbox-sprites.svg rename to src/gui/css/maps/images/bbox-sprites.svg diff --git a/gui-src/css/maps/images/icons-404040.png b/src/gui/css/maps/images/icons-404040.png similarity index 100% rename from gui-src/css/maps/images/icons-404040.png rename to src/gui/css/maps/images/icons-404040.png diff --git a/gui-src/css/maps/images/icons-404040@2x.png b/src/gui/css/maps/images/icons-404040@2x.png similarity index 100% rename from gui-src/css/maps/images/icons-404040@2x.png rename to src/gui/css/maps/images/icons-404040@2x.png diff --git a/gui-src/css/maps/images/icons-ffffff.png b/src/gui/css/maps/images/icons-ffffff.png similarity index 100% rename from gui-src/css/maps/images/icons-ffffff.png rename to src/gui/css/maps/images/icons-ffffff.png diff --git a/gui-src/css/maps/images/icons-ffffff@2x.png b/src/gui/css/maps/images/icons-ffffff@2x.png similarity index 100% rename from gui-src/css/maps/images/icons-ffffff@2x.png rename to src/gui/css/maps/images/icons-ffffff@2x.png diff --git a/gui-src/css/maps/images/icons.svg b/src/gui/css/maps/images/icons.svg similarity index 100% rename from gui-src/css/maps/images/icons.svg rename to src/gui/css/maps/images/icons.svg diff --git a/gui-src/css/maps/images/spritesheet-2x.png b/src/gui/css/maps/images/spritesheet-2x.png similarity index 100% rename from gui-src/css/maps/images/spritesheet-2x.png rename to src/gui/css/maps/images/spritesheet-2x.png diff --git a/gui-src/css/maps/images/spritesheet.png b/src/gui/css/maps/images/spritesheet.png similarity index 100% rename from gui-src/css/maps/images/spritesheet.png rename to src/gui/css/maps/images/spritesheet.png diff --git a/gui-src/css/maps/images/spritesheet.svg b/src/gui/css/maps/images/spritesheet.svg similarity index 100% rename from gui-src/css/maps/images/spritesheet.svg rename to src/gui/css/maps/images/spritesheet.svg diff --git a/gui-src/css/maps/leaflet.css b/src/gui/css/maps/leaflet.css similarity index 100% rename from gui-src/css/maps/leaflet.css rename to src/gui/css/maps/leaflet.css diff --git a/gui-src/css/maps/leaflet.draw.css b/src/gui/css/maps/leaflet.draw.css similarity index 100% rename from gui-src/css/maps/leaflet.draw.css rename to src/gui/css/maps/leaflet.draw.css diff --git a/gui-src/css/maps/leaflet.sidebar.css b/src/gui/css/maps/leaflet.sidebar.css similarity index 100% rename from gui-src/css/maps/leaflet.sidebar.css rename to src/gui/css/maps/leaflet.sidebar.css diff --git a/gui-src/css/search.css b/src/gui/css/search.css similarity index 100% rename from gui-src/css/search.css rename to src/gui/css/search.css diff --git a/gui-src/css/styles.css b/src/gui/css/styles.css similarity index 100% rename from gui-src/css/styles.css rename to src/gui/css/styles.css diff --git a/gui-src/images/buymeacoffee.png b/src/gui/images/buymeacoffee.png similarity index 100% rename from gui-src/images/buymeacoffee.png rename to src/gui/images/buymeacoffee.png diff --git a/gui-src/images/crosshair.png b/src/gui/images/crosshair.png similarity index 100% rename from gui-src/images/crosshair.png rename to src/gui/images/crosshair.png diff --git a/gui-src/images/discord.png b/src/gui/images/discord.png similarity index 100% rename from gui-src/images/discord.png rename to src/gui/images/discord.png diff --git a/gui-src/images/logo.png b/src/gui/images/logo.png similarity index 100% rename from gui-src/images/logo.png rename to src/gui/images/logo.png diff --git a/gui-src/images/marker-icon.png b/src/gui/images/marker-icon.png similarity index 100% rename from gui-src/images/marker-icon.png rename to src/gui/images/marker-icon.png diff --git a/gui-src/images/tile.png b/src/gui/images/tile.png similarity index 100% rename from gui-src/images/tile.png rename to src/gui/images/tile.png diff --git a/gui-src/index.html b/src/gui/index.html similarity index 100% rename from gui-src/index.html rename to src/gui/index.html diff --git a/gui-src/js/bbox.js b/src/gui/js/bbox.js similarity index 100% rename from gui-src/js/bbox.js rename to src/gui/js/bbox.js diff --git a/gui-src/js/language-selector.js b/src/gui/js/language-selector.js similarity index 100% rename from gui-src/js/language-selector.js rename to src/gui/js/language-selector.js diff --git a/gui-src/js/language.js b/src/gui/js/language.js similarity index 100% rename from gui-src/js/language.js rename to src/gui/js/language.js diff --git a/gui-src/js/libs/jquery-1.9.1.js b/src/gui/js/libs/jquery-1.9.1.js similarity index 100% rename from gui-src/js/libs/jquery-1.9.1.js rename to src/gui/js/libs/jquery-1.9.1.js diff --git a/gui-src/js/libs/jquery-1.9.1.min.js b/src/gui/js/libs/jquery-1.9.1.min.js similarity index 100% rename from gui-src/js/libs/jquery-1.9.1.min.js rename to src/gui/js/libs/jquery-1.9.1.min.js diff --git a/gui-src/js/libs/jquery-ui-1.10.3.custom.js b/src/gui/js/libs/jquery-ui-1.10.3.custom.js similarity index 100% rename from gui-src/js/libs/jquery-ui-1.10.3.custom.js rename to src/gui/js/libs/jquery-ui-1.10.3.custom.js diff --git a/gui-src/js/libs/jquery-ui-1.10.3.custom.min.js b/src/gui/js/libs/jquery-ui-1.10.3.custom.min.js similarity index 100% rename from gui-src/js/libs/jquery-ui-1.10.3.custom.min.js rename to src/gui/js/libs/jquery-ui-1.10.3.custom.min.js diff --git a/gui-src/js/license.js b/src/gui/js/license.js similarity index 100% rename from gui-src/js/license.js rename to src/gui/js/license.js diff --git a/gui-src/js/main.js b/src/gui/js/main.js similarity index 100% rename from gui-src/js/main.js rename to src/gui/js/main.js diff --git a/gui-src/js/maps/leaflet.draw.js b/src/gui/js/maps/leaflet.draw.js similarity index 100% rename from gui-src/js/maps/leaflet.draw.js rename to src/gui/js/maps/leaflet.draw.js diff --git a/gui-src/js/maps/leaflet.js b/src/gui/js/maps/leaflet.js similarity index 100% rename from gui-src/js/maps/leaflet.js rename to src/gui/js/maps/leaflet.js diff --git a/gui-src/js/maps/leaflet.sidebar.js b/src/gui/js/maps/leaflet.sidebar.js similarity index 100% rename from gui-src/js/maps/leaflet.sidebar.js rename to src/gui/js/maps/leaflet.sidebar.js diff --git a/gui-src/js/maps/proj4-src.js b/src/gui/js/maps/proj4-src.js similarity index 100% rename from gui-src/js/maps/proj4-src.js rename to src/gui/js/maps/proj4-src.js diff --git a/gui-src/js/maps/proj4leaflet.js b/src/gui/js/maps/proj4leaflet.js similarity index 100% rename from gui-src/js/maps/proj4leaflet.js rename to src/gui/js/maps/proj4leaflet.js diff --git a/gui-src/js/maps/wkt.parser.js b/src/gui/js/maps/wkt.parser.js similarity index 100% rename from gui-src/js/maps/wkt.parser.js rename to src/gui/js/maps/wkt.parser.js diff --git a/gui-src/js/search.js b/src/gui/js/search.js similarity index 100% rename from gui-src/js/search.js rename to src/gui/js/search.js diff --git a/gui-src/locales/ar.json b/src/gui/locales/ar.json similarity index 100% rename from gui-src/locales/ar.json rename to src/gui/locales/ar.json diff --git a/gui-src/locales/de.json b/src/gui/locales/de.json similarity index 100% rename from gui-src/locales/de.json rename to src/gui/locales/de.json diff --git a/gui-src/locales/en-US.json b/src/gui/locales/en-US.json similarity index 100% rename from gui-src/locales/en-US.json rename to src/gui/locales/en-US.json diff --git a/gui-src/locales/en.json b/src/gui/locales/en.json similarity index 100% rename from gui-src/locales/en.json rename to src/gui/locales/en.json diff --git a/gui-src/locales/es.json b/src/gui/locales/es.json similarity index 100% rename from gui-src/locales/es.json rename to src/gui/locales/es.json diff --git a/gui-src/locales/fi.json b/src/gui/locales/fi.json similarity index 100% rename from gui-src/locales/fi.json rename to src/gui/locales/fi.json diff --git a/gui-src/locales/fr-FR.json b/src/gui/locales/fr-FR.json similarity index 100% rename from gui-src/locales/fr-FR.json rename to src/gui/locales/fr-FR.json diff --git a/gui-src/locales/hu.json b/src/gui/locales/hu.json similarity index 100% rename from gui-src/locales/hu.json rename to src/gui/locales/hu.json diff --git a/gui-src/locales/ko.json b/src/gui/locales/ko.json similarity index 100% rename from gui-src/locales/ko.json rename to src/gui/locales/ko.json diff --git a/gui-src/locales/lt.json b/src/gui/locales/lt.json similarity index 100% rename from gui-src/locales/lt.json rename to src/gui/locales/lt.json diff --git a/gui-src/locales/pl.json b/src/gui/locales/pl.json similarity index 100% rename from gui-src/locales/pl.json rename to src/gui/locales/pl.json diff --git a/gui-src/locales/ru.json b/src/gui/locales/ru.json similarity index 100% rename from gui-src/locales/ru.json rename to src/gui/locales/ru.json diff --git a/gui-src/locales/sv.json b/src/gui/locales/sv.json similarity index 100% rename from gui-src/locales/sv.json rename to src/gui/locales/sv.json diff --git a/gui-src/locales/ua.json b/src/gui/locales/ua.json similarity index 100% rename from gui-src/locales/ua.json rename to src/gui/locales/ua.json diff --git a/gui-src/locales/zh-CN.json b/src/gui/locales/zh-CN.json similarity index 100% rename from gui-src/locales/zh-CN.json rename to src/gui/locales/zh-CN.json diff --git a/gui-src/maps.html b/src/gui/maps.html similarity index 100% rename from gui-src/maps.html rename to src/gui/maps.html diff --git a/tauri.conf.json b/tauri.conf.json index 771a3ff..dddac7e 100644 --- a/tauri.conf.json +++ b/tauri.conf.json @@ -4,7 +4,7 @@ "version": "2.3.0", "identifier": "com.louisdev.arnis", "build": { - "frontendDist": "gui-src" + "frontendDist": "src/gui" }, "app": { "withGlobalTauri": true, From ee59da5d9b0c272492095eecfd8abcae86fd70cd Mon Sep 17 00:00:00 2001 From: louis-e <44675238+louis-e@users.noreply.github.com> Date: Sat, 13 Sep 2025 14:19:59 +0200 Subject: [PATCH 2/4] Clean up root dir by combining assets --- README.md | 10 +++++----- {gitassets => assets/gitassets}/banner.png | Bin {gitassets => assets/gitassets}/bbox-finder.png | Bin {gitassets => assets/gitassets}/cli.gif | Bin {gitassets => assets/gitassets}/documentation.png | Bin {gitassets => assets/gitassets}/gui.png | Bin {gitassets => assets/gitassets}/preview.jpg | Bin {gitassets => assets/gitassets}/recognition.png | Bin {icons => assets/icons}/128x128.png | Bin {icons => assets/icons}/128x128@2x.png | Bin {icons => assets/icons}/32x32.png | Bin {icons => assets/icons}/icon.icns | Bin {icons => assets/icons}/icon.ico | Bin {icons => assets/icons}/icon.png | Bin {mcassets => assets/mcassets}/icon.png | Bin {mcassets => assets/mcassets}/level.dat | Bin {mcassets => assets/mcassets}/region.template | Bin src/gui.rs | 6 +++--- src/world_editor.rs | 2 +- tauri.conf.json | 10 +++++----- 20 files changed, 14 insertions(+), 14 deletions(-) rename {gitassets => assets/gitassets}/banner.png (100%) rename {gitassets => assets/gitassets}/bbox-finder.png (100%) rename {gitassets => assets/gitassets}/cli.gif (100%) rename {gitassets => assets/gitassets}/documentation.png (100%) rename {gitassets => assets/gitassets}/gui.png (100%) rename {gitassets => assets/gitassets}/preview.jpg (100%) rename {gitassets => assets/gitassets}/recognition.png (100%) rename {icons => assets/icons}/128x128.png (100%) rename {icons => assets/icons}/128x128@2x.png (100%) rename {icons => assets/icons}/32x32.png (100%) rename {icons => assets/icons}/icon.icns (100%) rename {icons => assets/icons}/icon.ico (100%) rename {icons => assets/icons}/icon.png (100%) rename {mcassets => assets/mcassets}/icon.png (100%) rename {mcassets => assets/mcassets}/level.dat (100%) rename {mcassets => assets/mcassets}/region.template (100%) diff --git a/README.md b/README.md index 369697e..faae3d4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Banner +Banner # Arnis [![CI Build Status](https://github.com/louis-e/arnis/actions/workflows/ci-build.yml/badge.svg)](https://github.com/louis-e/arnis/actions) [GitHub Release](https://github.com/louis-e/arnis/releases) [GitHub Downloads (all assets, all releases](https://github.com/louis-e/arnis/releases) [![Download here](https://img.shields.io/badge/Download-here-green)](https://github.com/louis-e/arnis/releases) [![Discord](https://img.shields.io/discord/1326192999738249267?label=Discord&color=%237289da)](https://discord.gg/mA2g69Fhxq) @@ -7,11 +7,11 @@ Arnis creates complex and accurate Minecraft Java Edition worlds that reflect re This free and open source project is designed to handle large-scale geographic data from the real world and generate detailed Minecraft worlds. The algorithm processes geospatial data from OpenStreetMap as well as elevation data to create an accurate Minecraft representation of terrain and architecture. Generate your hometown, big cities, and natural landscapes with ease! -![Minecraft Preview](https://raw.githubusercontent.com/louis-e/arnis/refs/heads/main/gitassets/preview.jpg) +![Minecraft Preview](https://raw.githubusercontent.com/louis-e/arnis/refs/heads/main/assets/gitassets/preview.jpg) This Github page is the official project website. Do not download Arnis from any other website. ## :keyboard: Usage -
+
Download the [latest release](https://github.com/louis-e/arnis/releases/) or [compile](#trophy-open-source) the project on your own. Choose your area on the map using the rectangle tool and select your Minecraft world - then simply click on Start Generation! @@ -19,7 +19,7 @@ Additionally, you can customize various generation settings, such as world scale ## 📚 Documentation -Banner +Banner Full documentation is available in the [GitHub Wiki](https://github.com/louis-e/arnis/wiki/), covering topics such as technical explanations, FAQs, contribution guidelines and roadmaps. @@ -51,7 +51,7 @@ After your pull request was merged, I will take care of regularly creating updat ## :newspaper: Academic & Press Recognition -Banner +Banner Arnis has been recognized in various academic and press publications after gaining a lot of attention in December 2024. diff --git a/gitassets/banner.png b/assets/gitassets/banner.png similarity index 100% rename from gitassets/banner.png rename to assets/gitassets/banner.png diff --git a/gitassets/bbox-finder.png b/assets/gitassets/bbox-finder.png similarity index 100% rename from gitassets/bbox-finder.png rename to assets/gitassets/bbox-finder.png diff --git a/gitassets/cli.gif b/assets/gitassets/cli.gif similarity index 100% rename from gitassets/cli.gif rename to assets/gitassets/cli.gif diff --git a/gitassets/documentation.png b/assets/gitassets/documentation.png similarity index 100% rename from gitassets/documentation.png rename to assets/gitassets/documentation.png diff --git a/gitassets/gui.png b/assets/gitassets/gui.png similarity index 100% rename from gitassets/gui.png rename to assets/gitassets/gui.png diff --git a/gitassets/preview.jpg b/assets/gitassets/preview.jpg similarity index 100% rename from gitassets/preview.jpg rename to assets/gitassets/preview.jpg diff --git a/gitassets/recognition.png b/assets/gitassets/recognition.png similarity index 100% rename from gitassets/recognition.png rename to assets/gitassets/recognition.png diff --git a/icons/128x128.png b/assets/icons/128x128.png similarity index 100% rename from icons/128x128.png rename to assets/icons/128x128.png diff --git a/icons/128x128@2x.png b/assets/icons/128x128@2x.png similarity index 100% rename from icons/128x128@2x.png rename to assets/icons/128x128@2x.png diff --git a/icons/32x32.png b/assets/icons/32x32.png similarity index 100% rename from icons/32x32.png rename to assets/icons/32x32.png diff --git a/icons/icon.icns b/assets/icons/icon.icns similarity index 100% rename from icons/icon.icns rename to assets/icons/icon.icns diff --git a/icons/icon.ico b/assets/icons/icon.ico similarity index 100% rename from icons/icon.ico rename to assets/icons/icon.ico diff --git a/icons/icon.png b/assets/icons/icon.png similarity index 100% rename from icons/icon.png rename to assets/icons/icon.png diff --git a/mcassets/icon.png b/assets/mcassets/icon.png similarity index 100% rename from mcassets/icon.png rename to assets/mcassets/icon.png diff --git a/mcassets/level.dat b/assets/mcassets/level.dat similarity index 100% rename from mcassets/level.dat rename to assets/mcassets/level.dat diff --git a/mcassets/region.template b/assets/mcassets/region.template similarity index 100% rename from mcassets/region.template rename to assets/mcassets/region.template diff --git a/src/gui.rs b/src/gui.rs index a1886dc..990cad3 100644 --- a/src/gui.rs +++ b/src/gui.rs @@ -226,13 +226,13 @@ fn create_new_world(base_path: &Path) -> Result { .map_err(|e| format!("Failed to create world directory: {e}"))?; // Copy the region template file - const REGION_TEMPLATE: &[u8] = include_bytes!("../mcassets/region.template"); + const REGION_TEMPLATE: &[u8] = include_bytes!("../assets/mcassets/region.template"); let region_path = new_world_path.join("region").join("r.0.0.mca"); fs::write(®ion_path, REGION_TEMPLATE) .map_err(|e| format!("Failed to create region file: {e}"))?; // Add the level.dat file - const LEVEL_TEMPLATE: &[u8] = include_bytes!("../mcassets/level.dat"); + const LEVEL_TEMPLATE: &[u8] = include_bytes!("../assets/mcassets/level.dat"); // Decompress the gzipped level.template let mut decoder = GzDecoder::new(LEVEL_TEMPLATE); @@ -299,7 +299,7 @@ fn create_new_world(base_path: &Path) -> Result { .map_err(|e| format!("Failed to create level.dat file: {e}"))?; // Add the icon.png file - const ICON_TEMPLATE: &[u8] = include_bytes!("../mcassets/icon.png"); + const ICON_TEMPLATE: &[u8] = include_bytes!("../assets/mcassets/icon.png"); fs::write(new_world_path.join("icon.png"), ICON_TEMPLATE) .map_err(|e| format!("Failed to create icon.png file: {e}"))?; diff --git a/src/world_editor.rs b/src/world_editor.rs index 1eef861..f5f3004 100644 --- a/src/world_editor.rs +++ b/src/world_editor.rs @@ -351,7 +351,7 @@ impl<'a> WorldEditor<'a> { fn create_region(&self, region_x: i32, region_z: i32) -> Region { let out_path: String = format!("{}/r.{}.{}.mca", self.region_dir, region_x, region_z); - const REGION_TEMPLATE: &[u8] = include_bytes!("../mcassets/region.template"); + const REGION_TEMPLATE: &[u8] = include_bytes!("../assets/mcassets/region.template"); let mut region_file: File = File::options() .read(true) diff --git a/tauri.conf.json b/tauri.conf.json index dddac7e..371f707 100644 --- a/tauri.conf.json +++ b/tauri.conf.json @@ -30,11 +30,11 @@ "active": true, "targets": "all", "icon": [ - "icons/32x32.png", - "icons/128x128.png", - "icons/128x128@2x.png", - "icons/icon.icns", - "icons/icon.ico" + "assets/icons/32x32.png", + "assets/icons/128x128.png", + "assets/icons/128x128@2x.png", + "assets/icons/icon.icns", + "assets/icons/icon.ico" ], "windows": { "webviewInstallMode": { From 280acc7a8a3fdcac6d7969beaa920231e7ad1c5f Mon Sep 17 00:00:00 2001 From: louis-e <44675238+louis-e@users.noreply.github.com> Date: Sat, 13 Sep 2025 14:24:11 +0200 Subject: [PATCH 3/4] Move example_transformations.json to tests/ directory --- src/map_transformation/transform_map.rs | 2 +- .../map_transformation/example_transformations.json | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename example_transformations.json => tests/map_transformation/example_transformations.json (100%) diff --git a/src/map_transformation/transform_map.rs b/src/map_transformation/transform_map.rs index 0b60287..505e135 100644 --- a/src/map_transformation/transform_map.rs +++ b/src/map_transformation/transform_map.rs @@ -14,7 +14,7 @@ pub fn transform_map( println!("{} Transforming map...", "[4/7]".bold()); emit_gui_progress_update(20.0, "Transforming map..."); - match fs::read_to_string("example_transformations.json") { + match fs::read_to_string("tests/map_transformation/example_transformations.json") { Err(_) => { emit_gui_progress_update(25.0, ""); } diff --git a/example_transformations.json b/tests/map_transformation/example_transformations.json similarity index 100% rename from example_transformations.json rename to tests/map_transformation/example_transformations.json From 5b3889a7bb66b5d08688f78d0e11802ea7d22984 Mon Sep 17 00:00:00 2001 From: Louis Erbkamm Date: Sat, 13 Sep 2025 15:20:32 +0200 Subject: [PATCH 4/4] Add Latvian language option to dropdown --- src/gui/index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gui/index.html b/src/gui/index.html index 88b37bd..bd79faf 100644 --- a/src/gui/index.html +++ b/src/gui/index.html @@ -171,6 +171,7 @@ +