From 4d0a7d99ebf55ad2d0e583759699b8b4d77a7907 Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Wed, 24 Jul 2024 13:23:55 +0200 Subject: app: move ui code to ui library --- res/.gitignore | 1 - res/CMakeLists.txt | 55 ------------- res/style-dark.css | 27 ------ res/style.css | 27 ------ res/tests/windows.cpp | 13 --- res/ui.cmb | 223 -------------------------------------------------- 6 files changed, 346 deletions(-) delete mode 100644 res/.gitignore delete mode 100644 res/CMakeLists.txt delete mode 100644 res/style-dark.css delete mode 100644 res/style.css delete mode 100644 res/tests/windows.cpp delete mode 100644 res/ui.cmb (limited to 'res') diff --git a/res/.gitignore b/res/.gitignore deleted file mode 100644 index 25284c2..0000000 --- a/res/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.ui \ No newline at end of file diff --git a/res/CMakeLists.txt b/res/CMakeLists.txt deleted file mode 100644 index a825e4c..0000000 --- a/res/CMakeLists.txt +++ /dev/null @@ -1,55 +0,0 @@ -# Library - -add_library("res") - -set(UI_FILES - "widgets/participant_row.ui" - "widgets/turn_order_view.ui" - "windows/participant_editor.ui" - "windows/tracker.ui" -) - -export_cambalache_files("ui.cmb" UI_FILES ${UI_FILES}) - -target_add_glib_resources("res" - PREFIX "ch/arknet/Turns" - UI_FILES ${UI_FILES} - CSS_FILES - "style.css" - "style-dark.css" -) - -target_compile_options("res" PRIVATE - "$<$,$>:-fprofile-arcs>" - "$<$,$>:-ftest-coverage>" -) - -target_link_libraries("res" PUBLIC - "$<$,$>:gcov>" - - "PkgConfig::adwaita" - "PkgConfig::gtkmm" -) - -target_link_options("res" PRIVATE - "$<$,$>:--coverage>" -) - -add_library("turns::res" ALIAS "res") - -# Tests - -add_executable("res-tests" - "tests/windows.cpp" -) - -target_link_libraries("res-tests" PRIVATE - "Catch2::Catch2" - - "$<$:-Wl,--whole-archive>" - "turns::res" - "$<$:-Wl,--no-whole-archive>" - "turns::gtk-test-main" -) - -catch_discover_tests("res-tests") \ No newline at end of file diff --git a/res/style-dark.css b/res/style-dark.css deleted file mode 100644 index 926150f..0000000 --- a/res/style-dark.css +++ /dev/null @@ -1,27 +0,0 @@ -button.disposition-hostile { - background-color: mix(shade(@red_3, 0.8), @window_bg_color, 0.5); -} - -button:checked.disposition-hostile { - background-color: mix(shade(@red_3, 0.5), @window_bg_color, 0.5); -} - -button.disposition-friendly { - background-color: mix(shade(@green_3, 0.8), @window_bg_color, 0.5); -} - -button:checked.disposition-friendly { - background-color: mix(shade(@green_3, 0.5), @window_bg_color, 0.5); -} - -button.disposition-secret { - background-color: mix(shade(@purple_1, 0.8), @window_bg_color, 0.5); -} - -button:checked.disposition-secret { - background-color: mix(shade(@purple_1, 0.5), @window_bg_color, 0.5); -} - -.active-participant { - background-color: mix(shade(@accent_bg_color, 0.5), @card_bg_color, 0.5); -} \ No newline at end of file diff --git a/res/style.css b/res/style.css deleted file mode 100644 index fbc70ad..0000000 --- a/res/style.css +++ /dev/null @@ -1,27 +0,0 @@ -button.disposition-hostile { - background-color: mix(shade(@red_3, 1.6), @window_bg_color, 0.5); -} - -button:checked.disposition-hostile { - background-color: mix(shade(@red_3, 1), @window_bg_color, 0.5); -} - -button.disposition-friendly { - background-color: mix(shade(@green_3, 1.6), @window_bg_color, 0.5); -} - -button:checked.disposition-friendly { - background-color: mix(shade(@green_3, 1), @window_bg_color, 0.5); -} - -button.disposition-secret { - background-color: mix(shade(@purple_3, 1.6), @window_bg_color, 0.5); -} - -button:checked.disposition-secret { - background-color: mix(shade(@purple_3, 1), @window_bg_color, 0.5); -} - -.active-participant { - background-color: mix(shade(@accent_bg_color, 1.5), @card_bg_color, 0.5); -} \ No newline at end of file diff --git a/res/tests/windows.cpp b/res/tests/windows.cpp deleted file mode 100644 index 75e21fb..0000000 --- a/res/tests/windows.cpp +++ /dev/null @@ -1,13 +0,0 @@ -#include - -#include - -TEST_CASE("GResource for tracker") -{ - auto builder = Gtk::Builder::create_from_resource("/ch/arknet/Turns/windows/tracker.ui"); - - SECTION("can create Gtk.Builder for the main window UI definition") - { - REQUIRE(builder); - } -} \ No newline at end of file diff --git a/res/ui.cmb b/res/ui.cmb deleted file mode 100644 index f3cc8e8..0000000 --- a/res/ui.cmb +++ /dev/null @@ -1,223 +0,0 @@ - - - - - (1,None,None,"windows/tracker.ui",None,None,None,None,None,None,None), - (2,None,None,"windows/participant_editor.ui",None,None,None,None,None,None,None), - (3,1,None,"widgets/participant_row.ui",None,None,None,None,None,None,None), - (4,1,None,"widgets/turn_order_view.ui",None,None,None,None,None,None,None) - - - (1,"gtk","4.14",None), - (1,"libadwaita","1.5",None), - (2,"gtk","4.14",None), - (2,"libadwaita","1.5",None), - (3,"gtk","4.14",None) - - - (1,1,"AdwApplicationWindow","tracker",None,None,None,None,-1,None,None), - (1,2,"AdwToolbarView",None,1,None,None,None,-1,None,None), - (1,3,"AdwHeaderBar","header",2,None,"top",None,-1,None,None), - (1,6,"AdwWindowTitle","title",3,None,None,None,3,None,None), - (1,7,"GtkMenuButton","open_main_menu",3,None,"end",None,None,None,None), - (1,8,"GtkButton","add_participant",3,None,"start",None,1,None,None), - (1,9,"(menu)","main_menu",None,None,None,None,-1,None,None), - (1,10,"(item)",None,9,None,None,None,1,None,None), - (1,11,"GtkStack","stack",2,None,None,None,-1,None,None), - (1,16,"AdwStatusPage","empty",11,None,None,None,-1,None,None), - (1,17,"GtkButton",None,16,None,None,None,-1,None,None), - (1,18,"GtkButton","start",3,None,"start",None,2,None,None), - (1,19,"(item)",None,9,None,None,None,None,None,None), - (1,20,"GtkRevealer","controls",2,None,"bottom",None,-1,None,None), - (1,21,"GtkActionBar",None,20,None,None,None,-1,None,None), - (1,22,"GtkButton",None,21,None,"start",None,-1,None,None), - (1,23,"GtkButton",None,21,None,"center",None,-1,None,None), - (1,24,"GtkButton",None,21,None,"end",None,-1,None,None), - (2,1,"AdwDialog","participant_editor",None,None,None,None,-1,None,None), - (2,2,"AdwToolbarView",None,1,None,None,None,-1,None,None), - (2,3,"AdwHeaderBar",None,2,None,"top",None,-1,None,None), - (2,4,"AdwClamp",None,2,None,None,None,-1,None,None), - (2,5,"GtkBox",None,4,None,None,None,-1,None,None), - (2,6,"GtkListBox",None,5,None,None,None,None,None,None), - (2,7,"AdwEntryRow","name",6,None,None,None,None,None,None), - (2,9,"GtkButton","finish",5,None,None,None,1,None,None), - (2,10,"AdwSpinRow","priority",6,None,None,None,1,None,None), - (2,11,"AdwComboRow","disposition",6,None,None,None,2,None,None), - (2,12,"GtkAdjustment",None,10,None,None,None,-1,None,None), - (3,1,"GtkListBoxRow","gtkmm__CustomObject_participant_row",None,None,None,None,-1,None,None), - (3,2,"GtkBox",None,1,None,None,None,-1,None,None), - (3,3,"GtkBox",None,2,None,None,None,-1,None,None), - (3,4,"GtkBox",None,2,None,None,None,-1,None,None), - (3,5,"GtkBox",None,2,None,None,None,-1,None,None), - (3,6,"GtkToggleButton","toggle_defeated",3,None,None,None,-1,None,None), - (3,7,"GtkLabel","title",4,None,None,None,-1,None,None), - (3,8,"GtkLabel","subtitle",4,None,None,None,-1,None,None), - (3,9,"GtkButton","delete",5,None,None,None,-1,None,None), - (3,10,"GtkButton","edit",5,None,None,None,-1,None,None), - (4,1,"GtkScrolledWindow","gtkmm__CustomObject_turn_order_view",None,None,None,None,-1,None,None), - (4,2,"AdwClamp",None,1,None,None,None,-1,None,None), - (4,3,"GtkListBox","view",2,None,None,None,-1,None,None) - - - (1,1,"AdwApplicationWindow","content",None,None,None,None,None,2,None,None,None,None), - (1,1,"GtkWidget","height-request","480",None,None,None,None,None,None,None,None,None), - (1,1,"GtkWidget","width-request","360",None,None,None,None,None,None,None,None,None), - (1,1,"GtkWindow","default-height","720",None,None,None,None,None,None,None,None,None), - (1,1,"GtkWindow","default-width","360",None,None,None,None,None,None,None,None,None), - (1,2,"AdwToolbarView","content",None,None,None,None,None,11,None,None,None,None), - (1,3,"AdwHeaderBar","title-widget",None,None,None,None,None,6,None,None,None,None), - (1,6,"AdwWindowTitle","subtitle","No active turn order",1,None,None,None,None,None,None,None,None), - (1,6,"AdwWindowTitle","title","Turns",1,None,None,None,None,None,None,None,None), - (1,7,"GtkMenuButton","icon-name","open-menu",None,None,None,None,None,None,None,None,None), - (1,7,"GtkMenuButton","menu-model","9",None,None,None,None,None,None,None,None,None), - (1,7,"GtkWidget","tooltip-text","Main Menu",1,None,None,None,None,None,None,None,None), - (1,8,"GtkActionable","action-name","win.add_participant",None,None,None,None,None,None,None,None,None), - (1,8,"GtkButton","icon-name","contact-new",None,None,None,None,None,None,None,None,None), - (1,8,"GtkWidget","tooltip-text","Add participant",1,None,None,None,None,None,None,None,None), - (1,10,"(item)","action","app.quit",None,None,None,None,None,None,None,None,None), - (1,10,"(item)","label","_Quit",1,None,None,None,None,None,None,None,None), - (1,11,"GtkStack","transition-type","crossfade",None,None,None,None,None,None,None,None,None), - (1,16,"AdwStatusPage","child",None,None,None,None,None,17,None,None,None,None), - (1,16,"AdwStatusPage","icon-name","contact-new-symbolic",None,None,None,None,None,None,None,None,None), - (1,17,"GtkActionable","action-name","win.add_participant",None,None,None,None,None,None,None,None,None), - (1,17,"GtkButton","label","Add participant",1,None,None,None,None,None,None,None,None), - (1,17,"GtkWidget","halign","center",None,None,None,None,None,None,None,None,None), - (1,18,"GtkActionable","action-name","win.start",None,None,None,None,None,None,None,None,None), - (1,18,"GtkButton","icon-name","media-playback-start-symbolic",None,None,None,None,None,None,None,None,None), - (1,18,"GtkWidget","tooltip-text","Start turn order",1,None,None,None,None,None,None,None,None), - (1,19,"(item)","action","win.clear",None,None,None,None,None,None,None,None,None), - (1,19,"(item)","label","_Clear",1,None,None,None,None,None,None,None,None), - (1,20,"GtkRevealer","child",None,None,None,None,None,21,None,None,None,None), - (1,20,"GtkRevealer","transition-type","slide-up",None,None,None,None,None,None,None,None,None), - (1,22,"GtkActionable","action-name","win.previous",None,None,None,None,None,None,None,None,None), - (1,22,"GtkButton","icon-name","media-skip-backward-symbolic",None,None,None,None,None,None,None,None,None), - (1,22,"GtkWidget","tooltip-markup","Previous participant",1,None,None,None,None,None,None,None,None), - (1,23,"GtkActionable","action-name","win.stop",None,None,None,None,None,None,None,None,None), - (1,23,"GtkButton","icon-name","media-playback-stop-symbolic",None,None,None,None,None,None,None,None,None), - (1,23,"GtkWidget","tooltip-markup","End turn order",1,None,None,None,None,None,None,None,None), - (1,24,"GtkActionable","action-name","win.next",None,None,None,None,None,None,None,None,None), - (1,24,"GtkButton","icon-name","media-skip-forward-symbolic",None,None,None,None,None,None,None,None,None), - (1,24,"GtkWidget","tooltip-markup","Next participant",1,None,None,None,None,None,None,None,None), - (2,1,"AdwDialog","child",None,None,None,None,None,2,None,None,None,None), - (2,1,"AdwDialog","default-widget",None,None,None,None,None,None,None,None,None,None), - (2,1,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None), - (2,2,"AdwToolbarView","content",None,None,None,None,None,4,None,None,None,None), - (2,4,"AdwClamp","child",None,None,None,None,None,5,None,None,None,None), - (2,5,"GtkBox","spacing","18",None,None,None,None,None,None,None,None,None), - (2,5,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None), - (2,5,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None), - (2,5,"GtkWidget","margin-bottom","18",None,None,None,None,None,None,None,None,None), - (2,5,"GtkWidget","margin-end","12",None,None,None,None,None,None,None,None,None), - (2,5,"GtkWidget","margin-start","12",None,None,None,None,None,None,None,None,None), - (2,5,"GtkWidget","margin-top","18",None,None,None,None,None,None,None,None,None), - (2,5,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None), - (2,7,"AdwPreferencesRow","title","Name",1,None,None,None,None,None,None,None,None), - (2,9,"GtkButton","label","Finish",1,None,None,None,None,None,None,None,None), - (2,9,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None), - (2,10,"AdwPreferencesRow","title","Priority",1,None,None,None,None,None,None,None,None), - (2,10,"AdwSpinRow","adjustment",None,None,None,None,None,12,None,None,None,None), - (2,10,"AdwSpinRow","digits","1",None,None,None,None,None,None,None,None,None), - (2,10,"AdwSpinRow","numeric","True",None,None,None,None,None,None,None,None,None), - (2,11,"AdwPreferencesRow","title","Disposition",1,None,None,None,None,None,None,None,None), - (2,12,"GtkAdjustment","lower","-1000.0",None,None,None,None,None,None,None,None,None), - (2,12,"GtkAdjustment","step-increment","1.0",None,None,None,None,None,None,None,None,None), - (2,12,"GtkAdjustment","upper","1000.0",None,None,None,None,None,None,None,None,None), - (3,1,"GtkListBoxRow","activatable","False",None,None,None,None,None,None,None,None,None), - (3,1,"GtkListBoxRow","child",None,None,None,None,None,2,None,None,None,None), - (3,1,"GtkListBoxRow","selectable","False",None,None,None,None,None,None,None,None,None), - (3,1,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None), - (3,4,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None), - (3,4,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None), - (3,4,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None), - (3,5,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None), - (3,6,"GtkButton","icon-name","face-smile-symbolic",None,None,None,None,None,None,None,None,None), - (3,6,"GtkWidget","halign","center",None,None,None,None,None,None,None,None,None), - (3,6,"GtkWidget","tooltip-text","Mark as defeated",1,None,None,None,None,None,None,None,None), - (3,6,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None), - (3,7,"GtkLabel","wrap-mode","word-char",None,None,None,None,None,None,None,None,None), - (3,7,"GtkLabel","xalign","0.0",None,None,None,None,None,None,None,None,None), - (3,8,"GtkLabel","wrap-mode","word-char",None,None,None,None,None,None,None,None,None), - (3,8,"GtkLabel","xalign","0.0",None,None,None,None,None,None,None,None,None), - (3,9,"GtkButton","icon-name","edit-delete-symbolic",None,None,None,None,None,None,None,None,None), - (3,9,"GtkWidget","tooltip-text","Delete participant",1,None,None,None,None,None,None,None,None), - (3,10,"GtkButton","icon-name","document-edit-symbolic",None,None,None,None,None,None,None,None,None), - (3,10,"GtkWidget","tooltip-text","Edit participant",1,None,None,None,None,None,None,None,None), - (4,1,"GtkScrolledWindow","child",None,None,None,None,None,2,None,None,None,None), - (4,2,"AdwClamp","child",None,None,None,None,None,3,None,None,None,None), - (4,2,"GtkWidget","margin-bottom","18",None,None,None,None,None,None,None,None,None), - (4,2,"GtkWidget","margin-end","12",None,None,None,None,None,None,None,None,None), - (4,2,"GtkWidget","margin-start","12",None,None,None,None,None,None,None,None,None), - (4,2,"GtkWidget","margin-top","12",None,None,None,None,None,None,None,None,None), - (4,3,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None) - - - (1,1,"GtkWidget",2,2,None,1,None,None,None,None), - (1,3,"GtkWidget",1,1,None,None,None,None,None,None), - (1,2,"GtkWidget",1,1,None,None,None,None,None,None), - (2,6,"GtkWidget",1,1,None,None,None,None,None,None), - (2,6,"GtkWidget",2,2,None,1,None,None,None,None), - (2,9,"GtkWidget",1,1,None,None,None,None,None,None), - (2,9,"GtkWidget",2,2,None,1,None,None,None,None), - (2,9,"GtkWidget",2,3,None,1,None,None,None,None), - (1,17,"GtkWidget",1,1,None,None,None,None,None,None), - (1,17,"GtkWidget",2,2,None,1,None,None,None,None), - (1,17,"GtkWidget",2,3,None,1,None,None,None,None), - (3,6,"GtkWidget",1,1,None,None,None,None,None,None), - (3,6,"GtkWidget",2,2,None,1,None,None,None,None), - (3,2,"GtkWidget",1,1,None,None,None,None,None,None), - (3,2,"GtkWidget",2,2,None,1,None,None,None,None), - (3,7,"GtkWidget",1,1,None,None,None,None,None,None), - (3,7,"GtkWidget",2,2,None,1,None,None,None,None), - (3,8,"GtkWidget",1,1,None,None,None,None,None,None), - (3,8,"GtkWidget",2,2,None,1,None,None,None,None), - (3,9,"GtkWidget",1,1,None,None,None,None,None,None), - (3,9,"GtkWidget",2,2,None,1,None,None,None,None), - (3,10,"GtkWidget",1,1,None,None,None,None,None,None), - (3,10,"GtkWidget",2,2,None,1,None,None,None,None), - (3,9,"GtkWidget",2,3,None,1,None,None,None,None), - (3,10,"GtkWidget",2,3,None,1,None,None,None,None), - (3,5,"GtkWidget",1,1,None,None,None,None,None,None), - (3,5,"GtkWidget",2,2,None,1,None,None,None,None), - (3,3,"GtkWidget",1,1,None,None,None,None,None,None), - (3,3,"GtkWidget",2,2,None,1,None,None,None,None), - (4,3,"GtkWidget",1,1,None,None,None,None,None,None), - (4,3,"GtkWidget",2,2,None,1,None,None,None,None), - (1,22,"GtkWidget",1,1,None,None,None,None,None,None), - (1,22,"GtkWidget",2,2,None,1,None,None,None,None), - (1,22,"GtkWidget",2,3,None,1,None,None,None,None), - (1,23,"GtkWidget",1,1,None,None,None,None,None,None), - (1,23,"GtkWidget",2,2,None,1,None,None,None,None), - (1,23,"GtkWidget",2,3,None,1,None,None,None,None), - (1,24,"GtkWidget",1,1,None,None,None,None,None,None), - (1,24,"GtkWidget",2,2,None,1,None,None,None,None), - (1,24,"GtkWidget",2,3,None,1,None,None,None,None), - (1,21,"GtkWidget",1,1,None,None,None,None,None,None), - (1,21,"GtkWidget",2,2,None,1,None,None,None,None) - - - (1,1,"GtkWidget",2,2,"name","background"), - (2,6,"GtkWidget",2,2,"name","boxed-list"), - (2,9,"GtkWidget",2,2,"name","pill"), - (2,9,"GtkWidget",2,3,"name","suggested-action"), - (1,17,"GtkWidget",2,2,"name","pill"), - (1,17,"GtkWidget",2,3,"name","suggested-action"), - (3,6,"GtkWidget",2,2,"name","circular"), - (3,2,"GtkWidget",2,2,"name","header"), - (3,7,"GtkWidget",2,2,"name","title"), - (3,8,"GtkWidget",2,2,"name","subtitle"), - (3,9,"GtkWidget",2,2,"name","circular"), - (3,10,"GtkWidget",2,2,"name","circular"), - (3,9,"GtkWidget",2,3,"name","destructive-action"), - (3,10,"GtkWidget",2,3,"name","suggested-action"), - (3,5,"GtkWidget",2,2,"name","suffixes"), - (3,3,"GtkWidget",2,2,"name","prefixes"), - (4,3,"GtkWidget",2,2,"name","boxed-list"), - (1,22,"GtkWidget",2,2,"name","pill"), - (1,22,"GtkWidget",2,3,"name","suggested-action"), - (1,23,"GtkWidget",2,2,"name","pill"), - (1,23,"GtkWidget",2,3,"name","destructive-action"), - (1,24,"GtkWidget",2,2,"name","pill"), - (1,24,"GtkWidget",2,3,"name","suggested-action"), - (1,21,"GtkWidget",2,2,"name","toolbar") - - -- cgit v1.2.3