From 21ae42762d8a57da5cb1ec40b46e7510fc3121ad Mon Sep 17 00:00:00 2001 From: fiaxh Date: Thu, 20 Jun 2024 12:05:20 +0200 Subject: Redesign and rewrite accounts and settings dialog into a combined one --- main/data/account_picker_row.ui | 32 ++++++++ main/data/gresource.xml | 4 + main/data/menu_app.ui | 8 +- main/data/preferences_window.ui | 32 ++++++++ main/data/preferences_window_account.ui | 137 ++++++++++++++++++++++++++++++++ main/data/preferences_window_general.ui | 68 ++++++++++++++++ main/data/settings_dialog.ui | 74 ----------------- main/data/style-dark.css | 2 +- main/data/style.css | 4 +- 9 files changed, 277 insertions(+), 84 deletions(-) create mode 100644 main/data/account_picker_row.ui create mode 100644 main/data/preferences_window.ui create mode 100644 main/data/preferences_window_account.ui create mode 100644 main/data/preferences_window_general.ui delete mode 100644 main/data/settings_dialog.ui (limited to 'main/data') diff --git a/main/data/account_picker_row.ui b/main/data/account_picker_row.ui new file mode 100644 index 00000000..a67f7b3b --- /dev/null +++ b/main/data/account_picker_row.ui @@ -0,0 +1,32 @@ + + + + \ No newline at end of file diff --git a/main/data/gresource.xml b/main/data/gresource.xml index 282838e0..f436ce68 100644 --- a/main/data/gresource.xml +++ b/main/data/gresource.xml @@ -1,6 +1,7 @@ + account_picker_row.ui add_conversation/add_contact_dialog.ui add_conversation/add_groupchat_dialog.ui add_conversation/conference_details_fragment.ui @@ -66,6 +67,9 @@ occupant_list.ui occupant_list_item.ui quote.ui + preferences_window.ui + preferences_window_account.ui + preferences_window_general.ui search_autocomplete.ui settings_dialog.ui style-dark.css diff --git a/main/data/menu_app.ui b/main/data/menu_app.ui index bb33ff65..9b85634d 100644 --- a/main/data/menu_app.ui +++ b/main/data/menu_app.ui @@ -3,13 +3,7 @@
- app.accounts - Accounts - -
-
- - app.settings + app.preferences Preferences diff --git a/main/data/preferences_window.ui b/main/data/preferences_window.ui new file mode 100644 index 00000000..d262dd76 --- /dev/null +++ b/main/data/preferences_window.ui @@ -0,0 +1,32 @@ + + + + + + \ No newline at end of file diff --git a/main/data/preferences_window_account.ui b/main/data/preferences_window_account.ui new file mode 100644 index 00000000..4280422d --- /dev/null +++ b/main/data/preferences_window_account.ui @@ -0,0 +1,137 @@ + + + + + \ No newline at end of file diff --git a/main/data/preferences_window_general.ui b/main/data/preferences_window_general.ui new file mode 100644 index 00000000..33d1a2c9 --- /dev/null +++ b/main/data/preferences_window_general.ui @@ -0,0 +1,68 @@ + + + + + diff --git a/main/data/settings_dialog.ui b/main/data/settings_dialog.ui deleted file mode 100644 index a8b24135..00000000 --- a/main/data/settings_dialog.ui +++ /dev/null @@ -1,74 +0,0 @@ - - - - diff --git a/main/data/style-dark.css b/main/data/style-dark.css index 3bd0add0..791ae9c8 100644 --- a/main/data/style-dark.css +++ b/main/data/style-dark.css @@ -1,3 +1,3 @@ -.dino-main .overlay-toolbar { +.overlay-toolbar { background-color: shade(@view_bg_color, 1.5); } \ No newline at end of file diff --git a/main/data/style.css b/main/data/style.css index a7a1d8df..5a70ba83 100644 --- a/main/data/style.css +++ b/main/data/style.css @@ -127,13 +127,13 @@ picture.avatar { /* Overlay Toolbar */ -.dino-main .overlay-toolbar { +.overlay-toolbar { padding: 2px; border-radius: 6px; border-spacing: 0; } -.dino-main .overlay-toolbar > * { +.overlay-toolbar > * { margin-top: 0; margin-bottom: 0; } -- cgit v1.2.3-70-g09d2 From 680f0dd0a768b201b62899905c38210e834dde91 Mon Sep 17 00:00:00 2001 From: fiaxh Date: Thu, 20 Jun 2024 13:47:25 +0200 Subject: Fix meson build files --- main/data/gresource.xml | 1 - plugins/omemo/meson.build | 3 +++ plugins/openpgp/data/gresource.xml | 5 ++--- plugins/openpgp/meson.build | 1 + 4 files changed, 6 insertions(+), 4 deletions(-) (limited to 'main/data') diff --git a/main/data/gresource.xml b/main/data/gresource.xml index f436ce68..30d0e288 100644 --- a/main/data/gresource.xml +++ b/main/data/gresource.xml @@ -71,7 +71,6 @@ preferences_window_account.ui preferences_window_general.ui search_autocomplete.ui - settings_dialog.ui style-dark.css style.css unified_main_content.ui diff --git a/plugins/omemo/meson.build b/plugins/omemo/meson.build index 05d7c265..315f69f4 100644 --- a/plugins/omemo/meson.build +++ b/plugins/omemo/meson.build @@ -65,5 +65,8 @@ c_args = [ vala_args = [ '--vapidir', meson.current_source_dir() / 'vapi', ] +if dep_libadwaita.version() == 'unknown' or dep_libadwaita.version().version_compare('>=1.2') + vala_args += ['-D', 'Adw_1_2'] +endif lib_omemo = shared_library('omemo', sources, name_prefix: '', c_args: c_args, vala_args: vala_args, include_directories: include_directories('src'), dependencies: dependencies, install: true, install_dir: get_option('libdir') / 'dino/plugins') dep_omemo = declare_dependency(link_with: lib_omemo, include_directories: include_directories('.')) diff --git a/plugins/openpgp/data/gresource.xml b/plugins/openpgp/data/gresource.xml index fbe2e8e9..75f25e67 100644 --- a/plugins/openpgp/data/gresource.xml +++ b/plugins/openpgp/data/gresource.xml @@ -1,6 +1,5 @@ - - account_settings_item.ui - + + diff --git a/plugins/openpgp/meson.build b/plugins/openpgp/meson.build index ec6f5c0e..ad1614d6 100644 --- a/plugins/openpgp/meson.build +++ b/plugins/openpgp/meson.build @@ -14,6 +14,7 @@ sources = files( 'src/contact_details_provider.vala', 'src/database.vala', 'src/encryption_list_entry.vala', + 'src/encryption_preferences_entry.vala', 'src/file_transfer/file_decryptor.vala', 'src/file_transfer/file_encryptor.vala', 'src/gpgme_fix.c', -- cgit v1.2.3-70-g09d2 From 984ae3f5b89081f97696cd5051167a18159aa60b Mon Sep 17 00:00:00 2001 From: fiaxh Date: Thu, 20 Jun 2024 18:39:25 +0200 Subject: Settings dialog: Fix account subpage for Adwaita < 1.4, other fixes fixes #1592 --- main/data/gresource.xml | 1 + main/data/preferences_window_account.ui | 3 +-- main/src/ui/main_window_controller.vala | 2 +- main/src/windows/preferences_window/account_preferences_subpage.vala | 4 ++++ plugins/omemo/CMakeLists.txt | 3 --- 5 files changed, 7 insertions(+), 6 deletions(-) (limited to 'main/data') diff --git a/main/data/gresource.xml b/main/data/gresource.xml index 30d0e288..ddf7ccf9 100644 --- a/main/data/gresource.xml +++ b/main/data/gresource.xml @@ -11,6 +11,7 @@ chat_input.ui conversation_content_view/item_metadata_header.ui conversation_content_view/view.ui + conversation_details.css conversation_details.ui conversation_item_widget.ui conversation_list_titlebar.ui diff --git a/main/data/preferences_window_account.ui b/main/data/preferences_window_account.ui index 4280422d..e0fa4f76 100644 --- a/main/data/preferences_window_account.ui +++ b/main/data/preferences_window_account.ui @@ -4,11 +4,10 @@