From 06922101423a8f9fce4d07f6c703194a7619f73f Mon Sep 17 00:00:00 2001 From: Nihil Carcosa Date: Wed, 3 Dec 2025 21:43:30 +0100 Subject: [PATCH] further rewrites, interface fixes, added temporary icon --- .buildconfig | 14 + data/resources/.meson.build.kate-swp | Bin 294 -> 0 bytes data/resources/gnomeframe.gresource.xml | 10 +- .../apps/gay.valhrafnaz.Gnomeframe.svg | 323 ++++++++++------- .../apps/gay.valhrafnaz.Gnomeframe.svg.old | 130 +++++++ .../check-round-outline2-symbolic.svg | 0 .../{ => actions}/compass2-symbolic.svg | 0 .../{ => actions}/floppy-symbolic.svg | 0 .../symbolic/actions/open-menu-symbolic.svg | 8 + .../{ => actions}/settings-symbolic.svg | 0 .../gay.valhrafnaz.Gnomeframe-symbolic.svg | 335 +++++++++++++++++- ...gay.valhrafnaz.Gnomeframe-symbolic.svg.old | 1 + data/resources/icons/meson.build | 2 +- data/resources/meson.build | 4 +- data/resources/ui/checklist.blp | 18 + data/resources/ui/checklist.ui | 19 + data/resources/ui/home.blp | 21 +- data/resources/ui/home.ui | 21 +- data/resources/ui/settings.blp | 16 +- data/resources/ui/settings.ui | 18 +- data/resources/ui/window.blp | 11 +- data/resources/ui/window.ui | 12 +- gnomeframe-logo-symbolic.svg | 334 +++++++++++++++++ gnomeframe-logo.png | Bin 0 -> 12423 bytes gnomeframe-logo.svg | 199 +++++++++++ meson.build | 6 +- src/gnomeframe/backend.py | 2 + src/gnomeframe/main.py | 12 +- src/gnomeframe/pages/checklist.py | 45 ++- src/gnomeframe/window.py | 13 +- 30 files changed, 1398 insertions(+), 176 deletions(-) create mode 100644 .buildconfig delete mode 100644 data/resources/.meson.build.kate-swp create mode 100644 data/resources/icons/hicolor/scalable/apps/gay.valhrafnaz.Gnomeframe.svg.old rename data/resources/icons/hicolor/symbolic/{ => actions}/check-round-outline2-symbolic.svg (100%) rename data/resources/icons/hicolor/symbolic/{ => actions}/compass2-symbolic.svg (100%) rename data/resources/icons/hicolor/symbolic/{ => actions}/floppy-symbolic.svg (100%) create mode 100644 data/resources/icons/hicolor/symbolic/actions/open-menu-symbolic.svg rename data/resources/icons/hicolor/symbolic/{ => actions}/settings-symbolic.svg (100%) create mode 100644 data/resources/icons/hicolor/symbolic/apps/gay.valhrafnaz.Gnomeframe-symbolic.svg.old create mode 100644 gnomeframe-logo-symbolic.svg create mode 100644 gnomeframe-logo.png create mode 100644 gnomeframe-logo.svg create mode 100644 src/gnomeframe/backend.py diff --git a/.buildconfig b/.buildconfig new file mode 100644 index 0000000..1a79e37 --- /dev/null +++ b/.buildconfig @@ -0,0 +1,14 @@ +[default] +name=Default +runtime=host +toolchain=default +config-opts= +run-opts= +prefix=/home/nihil/Projects/.gnome-builder/projects/gnomeframe/install/host +app-id= +postbuild= +prebuild= +run-command= + +[default.environment] +XDG_DATA_DIRS=${PROJECT_ROOT}/data/icons:${XDG_DATA_DIRS} diff --git a/data/resources/.meson.build.kate-swp b/data/resources/.meson.build.kate-swp deleted file mode 100644 index f7b4496507f7ad1cf97ddf999bf074b450dd365b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 294 zcmZQzU=Z?7EJ;-eE>A2_aLdd|RWQ;sU|?Vn@qGBk_I&Yf@8~u4Ojlo>e&&>CUl|$b$JuhI4@AlM(WqAbviA&jsS=A^6-Nez7Y6kTNA; diff --git a/data/resources/gnomeframe.gresource.xml b/data/resources/gnomeframe.gresource.xml index 0129ff6..c47bb82 100644 --- a/data/resources/gnomeframe.gresource.xml +++ b/data/resources/gnomeframe.gresource.xml @@ -8,9 +8,11 @@ ui/home.ui ui/settings.ui ui/welcome.ui - icons/hicolor/symbolic/floppy-symbolic.svg - icons/hicolor/symbolic/check-round-outline2-symbolic.svg - icons/hicolor/symbolic/compass2-symbolic.svg - icons/hicolor/symbolic/settings-symbolic.svg + + + icons/hicolor/symbolic/actions/floppy-symbolic.svg + icons/hicolor/symbolic/actions/check-round-outline2-symbolic.svg + icons/hicolor/symbolic/actions/compass2-symbolic.svg + icons/hicolor/symbolic/actions/settings-symbolic.svg diff --git a/data/resources/icons/hicolor/scalable/apps/gay.valhrafnaz.Gnomeframe.svg b/data/resources/icons/hicolor/scalable/apps/gay.valhrafnaz.Gnomeframe.svg index a74c4df..62bc827 100644 --- a/data/resources/icons/hicolor/scalable/apps/gay.valhrafnaz.Gnomeframe.svg +++ b/data/resources/icons/hicolor/scalable/apps/gay.valhrafnaz.Gnomeframe.svg @@ -1,130 +1,199 @@ + + - - - - - - - - - - - - image/svg+xml - - - - - - - - application-x-executable - - - - - - - - - - - - - - - - + id="svg1" + xml:space="preserve" + inkscape:version="1.4.2 (ebf0e940d0, 2025-05-08)" + sodipodi:docname="gnomeframe-logo.svg" + inkscape:export-filename="gnomeframe-logo.png" + inkscape:export-xdpi="24" + inkscape:export-ydpi="24" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg"> diff --git a/data/resources/icons/hicolor/scalable/apps/gay.valhrafnaz.Gnomeframe.svg.old b/data/resources/icons/hicolor/scalable/apps/gay.valhrafnaz.Gnomeframe.svg.old new file mode 100644 index 0000000..a74c4df --- /dev/null +++ b/data/resources/icons/hicolor/scalable/apps/gay.valhrafnaz.Gnomeframe.svg.old @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + application-x-executable + + + + + + + + + + + + + + + + diff --git a/data/resources/icons/hicolor/symbolic/check-round-outline2-symbolic.svg b/data/resources/icons/hicolor/symbolic/actions/check-round-outline2-symbolic.svg similarity index 100% rename from data/resources/icons/hicolor/symbolic/check-round-outline2-symbolic.svg rename to data/resources/icons/hicolor/symbolic/actions/check-round-outline2-symbolic.svg diff --git a/data/resources/icons/hicolor/symbolic/compass2-symbolic.svg b/data/resources/icons/hicolor/symbolic/actions/compass2-symbolic.svg similarity index 100% rename from data/resources/icons/hicolor/symbolic/compass2-symbolic.svg rename to data/resources/icons/hicolor/symbolic/actions/compass2-symbolic.svg diff --git a/data/resources/icons/hicolor/symbolic/floppy-symbolic.svg b/data/resources/icons/hicolor/symbolic/actions/floppy-symbolic.svg similarity index 100% rename from data/resources/icons/hicolor/symbolic/floppy-symbolic.svg rename to data/resources/icons/hicolor/symbolic/actions/floppy-symbolic.svg diff --git a/data/resources/icons/hicolor/symbolic/actions/open-menu-symbolic.svg b/data/resources/icons/hicolor/symbolic/actions/open-menu-symbolic.svg new file mode 100644 index 0000000..73ca203 --- /dev/null +++ b/data/resources/icons/hicolor/symbolic/actions/open-menu-symbolic.svg @@ -0,0 +1,8 @@ + + + + + + diff --git a/data/resources/icons/hicolor/symbolic/settings-symbolic.svg b/data/resources/icons/hicolor/symbolic/actions/settings-symbolic.svg similarity index 100% rename from data/resources/icons/hicolor/symbolic/settings-symbolic.svg rename to data/resources/icons/hicolor/symbolic/actions/settings-symbolic.svg diff --git a/data/resources/icons/hicolor/symbolic/apps/gay.valhrafnaz.Gnomeframe-symbolic.svg b/data/resources/icons/hicolor/symbolic/apps/gay.valhrafnaz.Gnomeframe-symbolic.svg index 0444828..03a98c4 100644 --- a/data/resources/icons/hicolor/symbolic/apps/gay.valhrafnaz.Gnomeframe-symbolic.svg +++ b/data/resources/icons/hicolor/symbolic/apps/gay.valhrafnaz.Gnomeframe-symbolic.svg @@ -1 +1,334 @@ - \ No newline at end of file + + + + diff --git a/data/resources/icons/hicolor/symbolic/apps/gay.valhrafnaz.Gnomeframe-symbolic.svg.old b/data/resources/icons/hicolor/symbolic/apps/gay.valhrafnaz.Gnomeframe-symbolic.svg.old new file mode 100644 index 0000000..0444828 --- /dev/null +++ b/data/resources/icons/hicolor/symbolic/apps/gay.valhrafnaz.Gnomeframe-symbolic.svg.old @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/resources/icons/meson.build b/data/resources/icons/meson.build index e366041..620324d 100644 --- a/data/resources/icons/meson.build +++ b/data/resources/icons/meson.build @@ -10,4 +10,4 @@ symbolic_dir = 'hicolor' / 'symbolic' / 'apps' install_data( symbolic_dir / ('@0@-symbolic.svg').format(application_id), install_dir: get_option('datadir') / 'icons' / symbolic_dir -) +) \ No newline at end of file diff --git a/data/resources/meson.build b/data/resources/meson.build index 8bc9c95..918a8cc 100644 --- a/data/resources/meson.build +++ b/data/resources/meson.build @@ -15,10 +15,10 @@ blueprints = custom_target('blueprints', command: [find_program('blueprint-compiler'), 'batch-compile', '@OUTPUT', '@CURRENT_SOURCE_DIRECTORY@' , '@INPUT@'], ) - -gnome.compile_resources('gnomeframe', +resources = gnome.compile_resources('gnomeframe', 'gnomeframe.gresource.xml', gresource_bundle: true, + source_dir: meson.current_build_dir(), install: true, install_dir: pkgdatadir, dependencies: blueprints, diff --git a/data/resources/ui/checklist.blp b/data/resources/ui/checklist.blp index 610e8a3..fd8560f 100644 --- a/data/resources/ui/checklist.blp +++ b/data/resources/ui/checklist.blp @@ -424,6 +424,12 @@ template $ChecklistPage: Box { margin-bottom: 4; } + ToggleButton uriel { + name: "uriel"; + label: _("Uriel"); + margin-bottom: 4; + } + ToggleButton valkyr { name: "valkyr"; label: _("Valykr"); @@ -944,6 +950,18 @@ template $ChecklistPage: Box { margin-bottom: 4; } + ToggleButton uriel_prime { + name: "uriel_prime"; + label: _("Uriel Prime"); + margin-bottom: 4; + can-target: false; + can-focus: false; + + styles [ + "disabled", + ] + } + ToggleButton valkyr_prime { name: "valkyr_prime"; label: _("Valykr Prime"); diff --git a/data/resources/ui/checklist.ui b/data/resources/ui/checklist.ui index 2747ba5..d2e699a 100644 --- a/data/resources/ui/checklist.ui +++ b/data/resources/ui/checklist.ui @@ -501,6 +501,13 @@ corresponding .blp file and regenerate this file with blueprint-compiler. 4 + + + uriel + Uriel + 4 + + valkyr @@ -1091,6 +1098,18 @@ corresponding .blp file and regenerate this file with blueprint-compiler. 4 + + + uriel_prime + Uriel Prime + 4 + false + false + + + valkyr_prime diff --git a/data/resources/ui/home.blp b/data/resources/ui/home.blp index fb558db..eef70f2 100644 --- a/data/resources/ui/home.blp +++ b/data/resources/ui/home.blp @@ -2,12 +2,21 @@ using Gtk 4.0; using Adw 1; template $HomePage: Box { - Adw.StatusPage { - title: _("Home"); - Box { - Text { - text: _("This is a placeholder."); + orientation: vertical; + baseline-position: center; + Adw.Clamp { + Adw.StatusPage { + title: _("Home"); + Box { + baseline-position: center; + orientation: vertical; + Label { + justify: center; + wrap: true; + wrap-mode: word; + label: _("Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Etiam ultricies nisi vel augue. Curabitur ullamcorper ultricies nisi. Nam eget dui."); + } + } } } - } } \ No newline at end of file diff --git a/data/resources/ui/home.ui b/data/resources/ui/home.ui index aeb417d..aec3d7b 100644 --- a/data/resources/ui/home.ui +++ b/data/resources/ui/home.ui @@ -7,14 +7,25 @@ corresponding .blp file and regenerate this file with blueprint-compiler.