Sophtli/flashcards
1
0
Fork 0
mirror of https://gitlab.cvh-server.de/skrause/flashcards.git synced 2025-12-12 06:41:38 +01:00
Code Activity

formatting, small changes

Browse Source
This commit is contained in:
Sophie
2025-03-26 14:03:23 +01:00
parent 5f2b933a33
commit e5723d6a48
22 changed files with 563 additions and 406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
resources/flashcards.gresource.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
<gresource prefix="/li/sopht/flashcards">
<file preprocess="xml-stripblanks">ui/window.ui</file>
<file preprocess="xml-stripblanks">ui/create-category.ui</file>
<file preprocess="xml-stripblanks">ui/create-card.ui</file>
<file alias="appdata" compressed="true" preprocess="xml-stripblanks">li.sopht.Flashcards.metainfo.xml</file>
</gresource>
</gresources>

50
resources/meson.build
View File

@@ -1,47 +1,53 @@
subdir('ui')
compile_schemas = find_program('glib-compile-schemas', required: false, disabler: true)
resources = gnome.compile_resources('resources',
'flashcards.gresource.xml',
dependencies : blueprints,
c_name : 'flashcards'
)
compile_schemas = find_program('glib-compile-schemas', required : false, disabler : true)
test('Validate schema file',
compile_schemas,
args: ['--strict', '--dry-run', meson.current_source_dir()])
args : ['--strict', '--dry-run', meson.current_source_dir()])
install_data('li.sopht.Flashcards.gschema.xml',
install_dir: get_option('datadir') / 'glib-2.0' / 'schemas'
install_dir : get_option('datadir') / 'glib-2.0' / 'schemas'
)
desktop_file = i18n.merge_file(
input: 'li.sopht.Flashcards.desktop.in',
output: 'li.sopht.Flashcards.desktop',
type: 'desktop',
po_dir: '../po',
install: true,
install_dir: get_option('datadir') / 'applications'
input : 'li.sopht.Flashcards.desktop.in',
output : 'li.sopht.Flashcards.desktop',
type : 'desktop',
po_dir : '../po',
install : true,
install_dir : get_option('datadir') / 'applications'
)
desktop_utils = find_program('desktop-file-validate', required: false)
desktop_utils = find_program('desktop-file-validate', required : false)
if desktop_utils.found()
test('Validate desktop file', desktop_utils, args: [desktop_file])
test('Validate desktop file', desktop_utils, args : [desktop_file])
endif
appstream_file = i18n.merge_file(
input: 'li.sopht.Flashcards.metainfo.xml.in',
output: 'li.sopht.Flashcards.metainfo.xml',
po_dir: '../po',
install: true,
install_dir: get_option('datadir') / 'metainfo'
input : 'li.sopht.Flashcards.metainfo.xml.in',
output : 'li.sopht.Flashcards.metainfo.xml',
po_dir : '../po',
install : true,
install_dir : get_option('datadir') / 'metainfo'
)
appstreamcli = find_program('appstreamcli', required: false, disabler: true)
appstreamcli = find_program('appstreamcli', required : false, disabler : true)
test('Validate appstream file', appstreamcli,
args: ['validate', '--no-net', '--explain', appstream_file])
args : ['validate', '--no-net', '--explain', appstream_file])
service_conf = configuration_data()
service_conf.set('bindir', get_option('prefix') / get_option('bindir'))
configure_file(
input: 'li.sopht.Flashcards.service.in',
output: 'li.sopht.Flashcards.service',
configuration: service_conf,
install_dir: get_option('datadir') / 'dbus-1' / 'services'
input : 'li.sopht.Flashcards.service.in',
output : 'li.sopht.Flashcards.service',
configuration : service_conf,
install_dir : get_option('datadir') / 'dbus-1' / 'services'
)
subdir('icons')

26
resources/ui/create-card.blp Normal file
View File

@@ -0,0 +1,26 @@
using Gtk 4.0;
using Adw 1;
template $FlashcardsCreateCardDialog : Adw.AlertDialog {
heading: _("Create a new card");
close-response: "cancel";
responses [
cancel: _("Cancel"),
add: _("Add") suggested,
]
response => $on_response();
Adw.EntryRow entry {
title: _("Title");
styles [
"card",
]
}
Adw.EntryRow entry {
title: _("Answer");
styles [
"card",
]
}
}

12
resources/ui/create-category.blp
View File

@@ -5,15 +5,15 @@ template $FlashcardsCreateCategoryDialog : Adw.AlertDialog {
heading: _("Create a new category");
close-response: "cancel";
responses [
cancel: _("Cancel"),
add: _("Add") suggested,
cancel: _("Cancel"),
add: _("Add") suggested,
]
response => $on_response();
Adw.EntryRow entry {
title: _("Category title");
styles [
"card",
]
title: _("Title");
styles [
"card",
]
}
}

8
resources/ui/flashcards.gresource.xml
View File

@@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
<gresource prefix="/li/sopht/flashcards">
<file preprocess="xml-stripblanks">window.ui</file>
<file preprocess="xml-stripblanks">create-category.ui</file>
<file alias="appdata" compressed="true" preprocess="xml-stripblanks">../li.sopht.Flashcards.metainfo.xml</file>
</gresource>
</gresources>

18
resources/ui/meson.build
View File

@@ -1,14 +1,8 @@
blueprints = custom_target('blueprints',
input: files(
'window.blp',
'create-category.blp'
),
output: '.',
command: [find_program('blueprint-compiler'), 'batch-compile', '@OUTPUT@', '@CURRENT_SOURCE_DIR@', '@INPUT@'],
)
resources = gnome.compile_resources('resources',
'flashcards.gresource.xml',
dependencies: blueprints,
c_name: 'flashcards'
input : files(
'window.blp',
'create-category.blp'
),
output : '.',
command : [find_program('blueprint-compiler'), 'batch-compile', '@OUTPUT@', '@CURRENT_SOURCE_DIR@', '@INPUT@'],
)

24
resources/ui/window.blp
View File

@@ -47,7 +47,7 @@ template $FlashcardsAppWindow : Adw.ApplicationWindow {
valign: start;
selection-mode: single;
activate-on-single-click: true;
row-activated => $on_category_selected();
row-activated => $on_select_category();
styles ["navigation-sidebar"]
}
};
@@ -61,11 +61,17 @@ template $FlashcardsAppWindow : Adw.ApplicationWindow {
Adw.ToolbarView {
[top]
Adw.HeaderBar {
[start]
Gtk.Button {
icon-name: "list-add-symbolic";
clicked => $on_add_card();
tooltip-text: _("Add card");
}
[start]
Gtk.Button {
icon-name: "user-trash-symbolic";
clicked => $on_delete_category();
tooltip-text: _("Delete flashcard");
clicked => $on_delete_card();
tooltip-text: _("Delete card");
}
[title]
Adw.WindowTitle title {
@@ -76,12 +82,19 @@ template $FlashcardsAppWindow : Adw.ApplicationWindow {
content: Adw.ViewStack main_view {
Adw.ViewStackPage {
child: Adw.StatusPage placeholder {
child: Adw.StatusPage placeholder_category {
title: _("Select a category");
icon-name: "edit-find-symbolic";
};
}
Adw.ViewStackPage {
child: Adw.StatusPage placeholder_card {
title: _("Add a card");
icon-name: "list-add-symbolic";
};
}
Adw.ViewStackPage {
child: Adw.Clamp flashcard {
maximum-size: 800;
@@ -119,16 +132,19 @@ template $FlashcardsAppWindow : Adw.ApplicationWindow {
styles ["pill"]
label: _("Easy");
hexpand: true;
clicked => $on_answer_easy();
}
Button {
styles ["pill"]
label: _("Medium");
hexpand: true;
clicked => $on_answer_medium();
}
Button {
styles ["pill"]
label: _("Hard");
hexpand: true;
clicked => $on_answer_hard();
}
}
}