johrpan/musicus
1
0
Fork 0
mirror of https://github.com/johrpan/musicus.git synced 2025-10-26 11:47:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Switch from libhandy to libadwaita

Browse source
This commit is contained in:
Elias Projahn 2021-01-29 15:17:27 +01:00
parent 88c7256c51
commit 6378556546
52 changed files with 198 additions and 198 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Cargo.toml
View file

@ -40,9 +40,9 @@ features = ["v2_64"]
git = "https://github.com/gtk-rs/gtk4-rs"
package = "gtk4"
[dependencies.libhandy]
git = "https://gitlab.gnome.org/bilelmoussaoui/libhandy4-rs"
package = "libhandy4"
[dependencies.libadwaita]
git = "https://gitlab.gnome.org/bilelmoussaoui/libadwaita-rs"
package = "libadwaita"
[dependencies.pango]
git = "https://github.com/gtk-rs/gtk-rs/"

6
de.johrpan.musicus.json
View file

@ -93,7 +93,7 @@
]
},
{
"name" : "libhandy",
"name" : "libadwaita",
"buildsystem" : "meson",
"config-opts" : [
"-Dintrospection=enabled",
@ -109,8 +109,8 @@
"sources" : [
{
"type" : "git",
"url" : "https://gitlab.gnome.org/exalm/libhandy",
"branch" : "gtk4"
"url" : "https://gitlab.gnome.org/exalm/libadwaita.git",
"branch" : "main"
}
]
},

2
meson.build
View file

@ -11,7 +11,7 @@ dependency('gstreamer-1.0', version: '>= 1.12')
dependency('gtk+-3.0', version: '>= 3.24.7')
dependency('libcurl', version: '>= 7.24.0')
dependency('libdiscid', version: '>= 0.6.2')
dependency('libhandy-1', version: '>= 1.0.0')
dependency('libadwaita-1', version: '>= 1.0')
dependency('pango', version: '>= 1.0')
dependency('sqlite3', version: '>= 3.20')

12
res/ui/ensemble_editor.ui
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk" version="4.0"/>
<requires lib="libhandy" version="1.0"/>
<requires lib="libadwaita" version="1.0"/>
<object class="GtkStack" id="widget">
<property name="transition-type">crossfade</property>
<child>
@ -11,7 +11,7 @@
<object class="GtkBox">
<property name="orientation">vertical</property>
<child>
<object class="HdyHeaderBar">
<object class="AdwHeaderBar">
<property name="show-start-title-buttons">false</property>
<property name="show-end-title-buttons">false</property>
<property name="title-widget">
@ -46,7 +46,7 @@
<object class="GtkScrolledWindow">
<property name="vexpand">true</property>
<child>
<object class="HdyClamp">
<object class="AdwClamp">
<property name="margin-start">12</property>
<property name="margin-end">12</property>
<property name="margin-top">18</property>
@ -60,7 +60,7 @@
<object class="GtkListBox">
<property name="selection-mode">none</property>
<child>
<object class="HdyActionRow">
<object class="AdwActionRow">
<property name="activatable">True</property>
<property name="title" translatable="yes">Name</property>
<property name="activatable-widget">name_entry</property>
@ -73,7 +73,7 @@
</object>
</child>
<child>
<object class="HdyActionRow">
<object class="AdwActionRow">
<property name="activatable">True</property>
<property name="title" translatable="yes">Publish to the server</property>
<property name="activatable-widget">upload_switch</property>
@ -104,7 +104,7 @@
<object class="GtkBox">
<property name="orientation">vertical</property>
<child>
<object class="HdyHeaderBar">
<object class="AdwHeaderBar">
<property name="show-start-title-buttons">false</property>
<property name="show-end-title-buttons">false</property>
<property name="title-widget">

8
res/ui/ensemble_screen.ui
View file

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk" version="4.0"/>
<requires lib="libhandy" version="1.0"/>
<requires lib="libadwaita" version="1.0"/>
<object class="GtkBox" id="widget">
<property name="orientation">vertical</property>
<child>
<object class="HdyHeaderBar" id="header">
<object class="AdwHeaderBar" id="header">
<property name="title-widget">
<object class="GtkLabel" id="title_label">
<property name="label" translatable="yes">Ensemble</property>
@ -36,7 +36,7 @@
<object class="GtkSearchBar">
<property name="search-mode-enabled" bind-source="search_button" bind-property="active" bind-flags="bidirectional|sync-create">False</property>
<child>
<object class="HdyClamp">
<object class="AdwClamp">
<property name="maximum-size">400</property>
<property name="hexpand">true</property>
<child>
@ -67,7 +67,7 @@
<object class="GtkScrolledWindow">
<property name="vexpand">true</property>
<child>
<object class="HdyClamp">
<object class="AdwClamp">
<property name="margin-start">12</property>
<property name="margin-end">12</property>
<property name="margin-top">18</property>

12
res/ui/instrument_editor.ui
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk" version="4.0"/>
<requires lib="libhandy" version="1.0"/>
<requires lib="libadwaita" version="1.0"/>
<object class="GtkStack" id="widget">
<property name="transition-type">crossfade</property>
<child>
@ -11,7 +11,7 @@
<object class="GtkBox">
<property name="orientation">vertical</property>
<child>
<object class="HdyHeaderBar">
<object class="AdwHeaderBar">
<property name="show-start-title-buttons">false</property>
<property name="show-end-title-buttons">false</property>
<property name="title-widget">
@ -46,7 +46,7 @@
<object class="GtkScrolledWindow">
<property name="vexpand">true</property>
<child>
<object class="HdyClamp">
<object class="AdwClamp">
<property name="margin-start">12</property>
<property name="margin-end">12</property>
<property name="margin-top">18</property>
@ -60,7 +60,7 @@
<object class="GtkListBox">
<property name="selection-mode">none</property>
<child>
<object class="HdyActionRow">
<object class="AdwActionRow">
<property name="activatable">True</property>
<property name="title" translatable="yes">Name</property>
<property name="activatable-widget">name_entry</property>
@ -73,7 +73,7 @@
</object>
</child>
<child>
<object class="HdyActionRow">
<object class="AdwActionRow">
<property name="activatable">True</property>
<property name="title" translatable="yes">Publish to the server</property>
<property name="activatable-widget">upload_switch</property>
@ -104,7 +104,7 @@
<object class="GtkBox">
<property name="orientation">vertical</property>
<child>
<object class="HdyHeaderBar">
<object class="AdwHeaderBar">
<property name="show-start-title-buttons">false</property>
<property name="show-end-title-buttons">false</property>
<property name="title-widget">

12
res/ui/login_dialog.ui
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk" version="4.0"/>
<requires lib="libhandy" version="1.0"/>
<object class="HdyWindow" id="window">
<requires lib="libadwaita" version="1.0"/>
<object class="AdwWindow" id="window">
<property name="modal">True</property>
<property name="default-width">350</property>
<child>
@ -15,7 +15,7 @@
<object class="GtkBox">
<property name="orientation">vertical</property>
<child>
<object class="HdyHeaderBar">
<object class="AdwHeaderBar">
<property name="show-start-title-buttons">false</property>
<property name="show-end-title-buttons">false</property>
<property name="title-widget">
@ -57,7 +57,7 @@
<object class="GtkListBox">
<property name="selection-mode">none</property>
<child>
<object class="HdyActionRow">
<object class="AdwActionRow">
<property name="activatable">True</property>
<property name="title" translatable="yes">Username</property>
<property name="activatable-widget">username_entry</property>
@ -70,7 +70,7 @@
</object>
</child>
<child>
<object class="HdyActionRow">
<object class="AdwActionRow">
<property name="activatable">True</property>
<property name="title" translatable="yes">Password</property>
<property name="activatable-widget">password_entry</property>
@ -98,7 +98,7 @@
<object class="GtkBox">
<property name="orientation">vertical</property>
<child>
<object class="HdyHeaderBar">
<object class="AdwHeaderBar">
<property name="show-start-title-buttons">false</property>
<property name="show-end-title-buttons">false</property>
<property name="title-widget">

10
res/ui/medium_editor.ui
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk" version="4.0"/>
<requires lib="libhandy" version="1.0"/>
<requires lib="libadwaita" version="1.0"/>
<object class="GtkStack" id="widget">
<property name="transition-type">crossfade</property>
<child>
@ -11,7 +11,7 @@
<object class="GtkBox">
<property name="orientation">vertical</property>
<child>
<object class="HdyHeaderBar">
<object class="AdwHeaderBar">
<property name="show-start-title-buttons">false</property>
<property name="show-end-title-buttons">false</property>
<property name="title-widget">
@ -61,7 +61,7 @@
<object class="GtkScrolledWindow">
<property name="vexpand">True</property>
<child>
<object class="HdyClamp">
<object class="AdwClamp">
<child>
<object class="GtkBox">
<property name="margin-start">6</property>
@ -85,7 +85,7 @@
<object class="GtkListBox">
<property name="selection-mode">none</property>
<child>
<object class="HdyActionRow" id="name_row">
<object class="AdwActionRow" id="name_row">
<property name="activatable">True</property>
<property name="title" translatable="yes">Name of the medium</property>
<property name="activatable-widget">name_entry</property>
@ -98,7 +98,7 @@
</object>
</child>
<child>
<object class="HdyActionRow">
<object class="AdwActionRow">
<property name="activatable">True</property>
<property name="title" translatable="yes">Publish to the server</property>
<property name="activatable-widget">publish_switch</property>

12
res/ui/performance_editor.ui
View file

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk" version="4.0"/>
<requires lib="libhandy" version="1.0"/>
<requires lib="libadwaita" version="1.0"/>
<object class="GtkBox" id="widget">
<property name="orientation">vertical</property>
<child>
<object class="HdyHeaderBar">
<object class="AdwHeaderBar">
<property name="show-start-title-buttons">false</property>
<property name="show-end-title-buttons">false</property>
<property name="title-widget">
@ -36,7 +36,7 @@
<object class="GtkScrolledWindow">
<property name="vexpand">true</property>
<child>
<object class="HdyClamp">
<object class="AdwClamp">
<property name="margin-start">12</property>
<property name="margin-end">12</property>
<property name="margin-top">18</property>
@ -50,7 +50,7 @@
<object class="GtkListBox">
<property name="selection-mode">none</property>
<child>
<object class="HdyActionRow" id="person_row">
<object class="AdwActionRow" id="person_row">
<property name="activatable">True</property>
<property name="title" translatable="yes">Select a person</property>
<property name="activatable-widget">person_button</property>
@ -63,7 +63,7 @@
</object>
</child>
<child>
<object class="HdyActionRow" id="ensemble_row">
<object class="AdwActionRow" id="ensemble_row">
<property name="activatable">True</property>
<property name="title" translatable="yes">Select an ensemble</property>
<property name="activatable-widget">ensemble_button</property>
@ -76,7 +76,7 @@
</object>
</child>
<child>
<object class="HdyActionRow" id="role_row">
<object class="AdwActionRow" id="role_row">
<property name="activatable">True</property>
<property name="title" translatable="yes">Select a role</property>
<property name="activatable-widget">role_button</property>

14
res/ui/person_editor.ui
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk" version="4.0"/>
<requires lib="libhandy" version="1.0"/>
<requires lib="libadwaita" version="1.0"/>
<object class="GtkStack" id="widget">
<property name="transition-type">crossfade</property>
<child>
@ -11,7 +11,7 @@
<object class="GtkBox">
<property name="orientation">vertical</property>
<child>
<object class="HdyHeaderBar">
<object class="AdwHeaderBar">
<property name="show-start-title-buttons">false</property>
<property name="show-end-title-buttons">false</property>
<property name="title-widget">
@ -46,7 +46,7 @@
<object class="GtkScrolledWindow">
<property name="vexpand">true</property>
<child>
<object class="HdyClamp">
<object class="AdwClamp">
<property name="margin-start">12</property>
<property name="margin-end">12</property>
<property name="margin-top">18</property>
@ -60,7 +60,7 @@
<object class="GtkListBox">
<property name="selection-mode">none</property>
<child>
<object class="HdyActionRow">
<object class="AdwActionRow">
<property name="activatable">True</property>
<property name="title" translatable="yes">First name</property>
<property name="activatable-widget">first_name_entry</property>
@ -73,7 +73,7 @@
</object>
</child>
<child>
<object class="HdyActionRow">
<object class="AdwActionRow">
<property name="activatable">True</property>
<property name="title" translatable="yes">Last name</property>
<property name="activatable-widget">last_name_entry</property>
@ -86,7 +86,7 @@
</object>
</child>
<child>
<object class="HdyActionRow">
<object class="AdwActionRow">
<property name="activatable">True</property>
<property name="title" translatable="yes">Publish to the server</property>
<property name="activatable-widget">upload_switch</property>
@ -117,7 +117,7 @@
<object class="GtkBox">
<property name="orientation">vertical</property>
<child>
<object class="HdyHeaderBar">
<object class="AdwHeaderBar">
<property name="show-start-title-buttons">false</property>
<property name="show-end-title-buttons">false</property>
<property name="title-widget">

8
res/ui/person_screen.ui
View file

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk" version="4.0"/>
<requires lib="libhandy" version="1.0"/>
<requires lib="libadwaita" version="1.0"/>
<object class="GtkBox" id="widget">
<property name="orientation">vertical</property>
<child>
<object class="HdyHeaderBar" id="header">
<object class="AdwHeaderBar" id="header">
<property name="title-widget">
<object class="GtkLabel" id="title_label">
<property name="label" translatable="yes">Person</property>
@ -36,7 +36,7 @@
<object class="GtkSearchBar">
<property name="search-mode-enabled" bind-source="search_button" bind-property="active" bind-flags="bidirectional|sync-create">False</property>
<child>
<object class="HdyClamp">
<object class="AdwClamp">
<property name="maximum-size">400</property>
<property name="hexpand">true</property>
<child>
@ -71,7 +71,7 @@
<object class="GtkScrolledWindow">
<property name="vexpand">true</property>
<child>
<object class="HdyClamp">
<object class="AdwClamp">
<property name="margin-start">12</property>
<property name="margin-end">12</property>
<property name="margin-top">18</property>

6
res/ui/player_screen.ui
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk" version="4.0"/>
<requires lib="libhandy" version="1.0"/>
<requires lib="libadwaita" version="1.0"/>
<object class="GtkImage" id="play_image">
<property name="icon-name">media-playback-start-symbolic</property>
</object>
@ -13,7 +13,7 @@
<object class="GtkBox" id="widget">
<property name="orientation">vertical</property>
<child>
<object class="HdyHeaderBar">
<object class="AdwHeaderBar">
<property name="title-widget">
<object class="GtkLabel">
<property name="label" translatable="yes">Player</property>
@ -37,7 +37,7 @@
<object class="GtkScrolledWindow">
<property name="vexpand">true</property>
<child>
<object class="HdyClamp">
<object class="AdwClamp">
<property name="margin-start">12</property>
<property name="margin-end">12</property>
<property name="margin-top">18</property>

4
res/ui/poe_list.ui
View file

@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk" version="4.0"/>
<requires lib="libhandy" version="1.0"/>
<requires lib="libadwaita" version="1.0"/>
<object class="GtkBox" id="widget">
<property name="orientation">vertical</property>
<child>
<object class="GtkSearchBar">
<property name="search-mode-enabled">True</property>
<child>
<object class="HdyClamp">
<object class="AdwClamp">
<property name="maximum-size">400</property>
<property name="tightening-threshold">300</property>
<property name="hexpand">true</property>

16
res/ui/preferences.ui
View file

@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk" version="4.0"/>
<requires lib="libhandy" version="1.0"/>
<object class="HdyPreferencesWindow" id="window">
<requires lib="libadwaita" version="1.0"/>
<object class="AdwPreferencesWindow" id="window">
<property name="modal">True</property>
<property name="default-width">400</property>
<property name="default-height">400</property>
<child>
<object class="HdyPreferencesPage">
<object class="AdwPreferencesPage">
<property name="title" translatable="yes">General</property>
<child>
<object class="HdyPreferencesGroup">
<object class="AdwPreferencesGroup">
<property name="title" translatable="yes">Music library</property>
<child>
<object class="HdyActionRow" id="music_library_path_row">
<object class="AdwActionRow" id="music_library_path_row">
<property name="title" translatable="yes">Music library folder</property>
<property name="activatable-widget">select_music_library_path_button</property>
<property name="subtitle" translatable="yes">None selected</property>
@ -29,10 +29,10 @@
</object>
</child>
<child>
<object class="HdyPreferencesGroup">
<object class="AdwPreferencesGroup">
<property name="title" translatable="yes">Server connection</property>
<child>
<object class="HdyActionRow" id="url_row">
<object class="AdwActionRow" id="url_row">
<property name="title" translatable="yes">Server URL</property>
<property name="activatable-widget">url_button</property>
<property name="subtitle" translatable="yes">Not set</property>
@ -46,7 +46,7 @@
</object>
</child>
<child>
<object class="HdyActionRow" id="login_row">
<object class="AdwActionRow" id="login_row">
<property name="title" translatable="yes">Login credentials</property>
<property name="activatable-widget">login_button</property>
<property name="subtitle" translatable="yes">Not logged in</property>

14
res/ui/recording_editor.ui
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk" version="4.0"/>
<requires lib="libhandy" version="1.0"/>
<requires lib="libadwaita" version="1.0"/>
<object class="GtkStack" id="widget">
<child>
<object class="GtkStackPage">
@ -10,7 +10,7 @@
<object class="GtkBox">
<property name="orientation">vertical</property>
<child>
<object class="HdyHeaderBar">
<object class="AdwHeaderBar">
<property name="show-start-title-buttons">false</property>
<property name="show-end-title-buttons">false</property>
<property name="title-widget">
@ -46,7 +46,7 @@
<object class="GtkScrolledWindow">
<property name="vexpand">true</property>
<child>
<object class="HdyClamp">
<object class="AdwClamp">
<property name="margin-start">12</property>
<property name="margin-end">12</property>
<property name="margin-top">18</property>
@ -74,7 +74,7 @@
<object class="GtkListBox">
<property name="selection-mode">none</property>
<child>
<object class="HdyActionRow" id="work_row">
<object class="AdwActionRow" id="work_row">
<property name="activatable">True</property>
<property name="title" translatable="yes">Select a work</property>
<property name="activatable-widget">work_button</property>
@ -87,7 +87,7 @@
</object>
</child>
<child>
<object class="HdyActionRow">
<object class="AdwActionRow">
<property name="activatable">True</property>
<property name="title" translatable="yes">Comment</property>
<property name="activatable-widget">comment_entry</property>
@ -100,7 +100,7 @@
</object>
</child>
<child>
<object class="HdyActionRow">
<object class="AdwActionRow">
<property name="activatable">True</property>
<property name="title" translatable="yes">Publish to the server</property>
<property name="activatable-widget">upload_switch</property>
@ -160,7 +160,7 @@
<object class="GtkBox">
<property name="orientation">vertical</property>
<child>
<object class="HdyHeaderBar">
<object class="AdwHeaderBar">
<property name="show-start-title-buttons">false</property>
<property name="show-end-title-buttons">false</property>
<property name="title-widget">

6
res/ui/recording_screen.ui
View file

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk" version="4.0"/>
<requires lib="libhandy" version="1.0"/>
<requires lib="libadwaita" version="1.0"/>
<object class="GtkBox" id="widget">
<property name="orientation">vertical</property>
<child>
<object class="HdyHeaderBar" id="header">
<object class="AdwHeaderBar" id="header">
<property name="title-widget">
<object class="GtkBox">
<property name="orientation">vertical</property>
@ -59,7 +59,7 @@
<object class="GtkScrolledWindow">
<property name="vexpand">true</property>
<child>
<object class="HdyClamp">
<object class="AdwClamp">
<property name="margin-start">12</property>
<property name="margin-end">12</property>
<property name="margin-top">18</property>

8
res/ui/selector.ui
View file

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk" version="4.0"/>
<requires lib="libhandy" version="1.0"/>
<requires lib="libadwaita" version="1.0"/>
<object class="GtkBox" id="widget">
<property name="width-request">250</property>
<property name="hexpand">False</property>
<property name="orientation">vertical</property>
<child>
<object class="HdyHeaderBar" id="header">
<object class="AdwHeaderBar" id="header">
<property name="show-start-title-buttons">false</property>
<property name="show-end-title-buttons">false</property>
<property name="title-widget">
@ -47,7 +47,7 @@
<object class="GtkSearchBar">
<property name="search-mode-enabled">True</property>
<child>
<object class="HdyClamp">
<object class="AdwClamp">
<property name="maximum-size">500</property>
<property name="tightening-threshold">300</property>
<property name="hexpand">true</property>
@ -100,7 +100,7 @@
<property name="height-request">200</property>
<property name="vexpand">true</property>
<child>
<object class="HdyClamp">
<object class="AdwClamp">
<property name="maximum-size">500</property>
<property name="tightening-threshold">300</property>
<child>

8
res/ui/server_dialog.ui
View file

@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk" version="4.0"/>
<requires lib="libhandy" version="1.0"/>
<object class="HdyWindow" id="window">
<requires lib="libadwaita" version="1.0"/>
<object class="AdwWindow" id="window">
<property name="modal">True</property>
<child>
<object class="GtkBox">
<property name="orientation">vertical</property>
<child>
<object class="HdyHeaderBar">
<object class="AdwHeaderBar">
<property name="show-start-title-buttons">false</property>
<property name="show-end-title-buttons">false</property>
<property name="title-widget">
@ -39,7 +39,7 @@
<object class="GtkListBox">
<property name="selection-mode">none</property>
<child>
<object class="HdyActionRow">
<object class="AdwActionRow">
<property name="activatable">True</property>
<property name="title" translatable="yes">URL</property>
<property name="activatable-widget">url_entry</property>

6
res/ui/source_selector.ui
View file

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk" version="4.0"/>
<requires lib="libhandy" version="1.0"/>
<requires lib="libadwaita" version="1.0"/>
<object class="GtkBox" id="widget">
<property name="orientation">vertical</property>
<child>
<object class="HdyHeaderBar">
<object class="AdwHeaderBar">
<property name="show-start-title-buttons">false</property>
<property name="show-end-title-buttons">false</property>
<property name="title-widget">
@ -49,7 +49,7 @@
</object>
</child>
<child>
<object class="HdyStatusPage">
<object class="AdwStatusPage">
<property name="vexpand">true</property>
<property name="icon-name">folder-music-symbolic</property>
<property name="title" translatable="yes">Import music</property>

6
res/ui/track_editor.ui
View file

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk" version="4.0"/>
<requires lib="libhandy" version="1.0"/>
<requires lib="libadwaita" version="1.0"/>
<object class="GtkBox" id="widget">
<property name="orientation">vertical</property>
<child>
<object class="HdyHeaderBar">
<object class="AdwHeaderBar">
<property name="show-start-title-buttons">false</property>
<property name="show-end-title-buttons">false</property>
<property name="title-widget">
@ -35,7 +35,7 @@
<object class="GtkScrolledWindow">
<property name="vexpand">True</property>
<child>
<object class="HdyClamp">
<object class="AdwClamp">
<child>
<object class="GtkFrame" id="parts_frame">
<property name="valign">start</property>

6
res/ui/track_selector.ui
View file

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk" version="4.0"/>
<requires lib="libhandy" version="1.0"/>
<requires lib="libadwaita" version="1.0"/>
<object class="GtkBox" id="widget">
<property name="orientation">vertical</property>
<child>
<object class="HdyHeaderBar">
<object class="AdwHeaderBar">
<property name="show-start-title-buttons">false</property>
<property name="show-end-title-buttons">false</property>
<property name="title-widget">
@ -36,7 +36,7 @@
<object class="GtkScrolledWindow">
<property name="vexpand">True</property>
<child>
<object class="HdyClamp">
<object class="AdwClamp">
<child>
<object class="GtkFrame" id="tracks_frame">
<property name="valign">start</property>

8
res/ui/track_set_editor.ui
View file

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk" version="4.0"/>
<requires lib="libhandy" version="1.0"/>
<requires lib="libadwaita" version="1.0"/>
<object class="GtkBox" id="widget">
<property name="orientation">vertical</property>
<child>
<object class="HdyHeaderBar">
<object class="AdwHeaderBar">
<property name="show-start-title-buttons">false</property>
<property name="show-end-title-buttons">false</property>
<property name="title-widget">
@ -36,7 +36,7 @@
<object class="GtkScrolledWindow">
<property name="vexpand">True</property>
<child>
<object class="HdyClamp">
<object class="AdwClamp">
<child>
<object class="GtkBox">
<property name="margin-start">6</property>
@ -60,7 +60,7 @@
<object class="GtkListBox">
<property name="selection-mode">none</property>
<child>
<object class="HdyActionRow" id="recording_row">
<object class="AdwActionRow" id="recording_row">
<property name="activatable">True</property>
<property name="title" translatable="yes">Select a recording</property>
<property name="activatable-widget">select_recording_button</property>

18
res/ui/window.ui
View file

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk" version="4.0" />
<requires lib="libhandy" version="1.0" />
<requires lib="libadwaita" version="1.0" />
<object class="GtkBox" id="empty_screen">
<property name="orientation">vertical</property>
<child>
<object class="HdyHeaderBar">
<object class="AdwHeaderBar">
</object>
</child>
<child>
@ -47,7 +47,7 @@
</object>
</child>
</object>
<object class="HdyApplicationWindow" id="window">
<object class="AdwApplicationWindow" id="window">
<property name="default-width">800</property>
<property name="default-height">566</property>
<child>
@ -60,7 +60,7 @@
<object class="GtkBox">
<property name="orientation">vertical</property>
<child>
<object class="HdyHeaderBar">
<object class="AdwHeaderBar">
<property name="title-widget">
<object class="GtkLabel">
<property name="label">Musicus</property>
@ -130,7 +130,7 @@
<object class="GtkBox">
<property name="orientation">vertical</property>
<child>
<object class="HdyHeaderBar">
<object class="AdwHeaderBar">
</object>
</child>
<child>
@ -153,17 +153,17 @@
<object class="GtkBox" id="content_box">
<property name="orientation">vertical</property>
<child>
<object class="HdyLeaflet" id="leaflet">
<object class="AdwLeaflet" id="leaflet">
<property name="vexpand">true</property>
<child>
<object class="HdyLeafletPage">
<object class="AdwLeafletPage">
<property name="child">
<object class="GtkBox" id="sidebar_box">
<property name="width-request">250</property>
<property name="hexpand">False</property>
<property name="orientation">vertical</property>
<child>
<object class="HdyHeaderBar">
<object class="AdwHeaderBar">
<property name="show-start-title-buttons">false</property>
<property name="show-end-title-buttons">false</property>
<property name="title-widget">
@ -198,7 +198,7 @@
</object>
</child>
<child>
<object class="HdyLeafletPage">
<object class="AdwLeafletPage">
<property name="navigatable">False</property>
<property name="child">
<object class="GtkSeparator">

14
res/ui/work_editor.ui
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk" version="4.0"/>
<requires lib="libhandy" version="1.0"/>
<requires lib="libadwaita" version="1.0"/>
<object class="GtkStack" id="widget">
<child>
<object class="GtkStackPage">
@ -12,7 +12,7 @@
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="HdyHeaderBar">
<object class="AdwHeaderBar">
<property name="show-start-title-buttons">false</property>
<property name="show-end-title-buttons">false</property>
<property name="title-widget">
@ -48,7 +48,7 @@
<object class="GtkScrolledWindow">
<property name="vexpand">true</property>
<child>
<object class="HdyClamp">
<object class="AdwClamp">
<property name="margin-start">12</property>
<property name="margin-end">12</property>
<property name="margin-top">18</property>
@ -76,7 +76,7 @@
<object class="GtkListBox">
<property name="selection-mode">none</property>
<child>
<object class="HdyActionRow" id="composer_row">
<object class="AdwActionRow" id="composer_row">
<property name="activatable">True</property>
<property name="title" translatable="yes">Select a composer</property>
<property name="activatable-widget">composer_button</property>
@ -89,7 +89,7 @@
</object>
</child>
<child>
<object class="HdyActionRow">
<object class="AdwActionRow">
<property name="activatable">True</property>
<property name="title" translatable="yes">Title</property>
<property name="activatable-widget">title_entry</property>
@ -102,7 +102,7 @@
</object>
</child>
<child>
<object class="HdyActionRow">
<object class="AdwActionRow">
<property name="activatable">True</property>
<property name="title" translatable="yes">Publish to the server</property>
<property name="activatable-widget">upload_switch</property>
@ -195,7 +195,7 @@
<object class="GtkBox">
<property name="orientation">vertical</property>
<child>
<object class="HdyHeaderBar">
<object class="AdwHeaderBar">
<property name="show-start-title-buttons">false</property>
<property name="show-end-title-buttons">false</property>
<property name="title-widget">

10
res/ui/work_part_editor.ui
View file

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk" version="4.0"/>
<requires lib="libhandy" version="1.0"/>
<requires lib="libadwaita" version="1.0"/>
<object class="GtkBox" id="widget">
<property name="orientation">vertical</property>
<child>
<object class="HdyHeaderBar">
<object class="AdwHeaderBar">
<property name="show-start-title-buttons">false</property>
<property name="show-end-title-buttons">false</property>
<property name="title-widget">
@ -40,7 +40,7 @@
<object class="GtkScrolledWindow">
<property name="vexpand">true</property>
<child>
<object class="HdyClamp">
<object class="AdwClamp">
<property name="margin-start">12</property>
<property name="margin-end">12</property>
<property name="margin-top">18</property>
@ -54,7 +54,7 @@
<object class="GtkListBox">
<property name="selection-mode">none</property>
<child>
<object class="HdyActionRow">
<object class="AdwActionRow">
<property name="activatable">True</property>
<property name="title" translatable="yes">Title</property>
<property name="activatable-widget">title_entry</property>
@ -67,7 +67,7 @@
</object>
</child>
<child>
<object class="HdyActionRow" id="composer_row">
<object class="AdwActionRow" id="composer_row">
<property name="activatable">True</property>
<property name="title" translatable="yes">Select a composer</property>
<property name="activatable-widget">composer_button</property>

8
res/ui/work_screen.ui
View file

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk" version="4.0"/>
<requires lib="libhandy" version="1.0"/>
<requires lib="libadwaita" version="1.0"/>
<object class="GtkBox" id="widget">
<property name="orientation">vertical</property>
<child>
<object class="HdyHeaderBar" id="header">
<object class="AdwHeaderBar" id="header">
<property name="title-widget">
<object class="GtkBox">
<property name="orientation">vertical</property>
@ -49,7 +49,7 @@
<object class="GtkSearchBar">
<property name="search-mode-enabled" bind-source="search_button" bind-property="active" bind-flags="bidirectional|sync-create">False</property>
<child>
<object class="HdyClamp">
<object class="AdwClamp">
<property name="maximum-size">400</property>
<property name="hexpand">true</property>
<child>
@ -80,7 +80,7 @@
<object class="GtkScrolledWindow">
<property name="vexpand">true</property>
<child>
<object class="HdyClamp">
<object class="AdwClamp">
<property name="margin-start">12</property>
<property name="margin-end">12</property>
<property name="margin-top">18</property>

8
res/ui/work_section_editor.ui
View file

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk" version="4.0"/>
<requires lib="libhandy" version="1.0"/>
<requires lib="libadwaita" version="1.0"/>
<object class="GtkBox" id="widget">
<property name="orientation">vertical</property>
<child>
<object class="HdyHeaderBar">
<object class="AdwHeaderBar">
<property name="show-start-title-buttons">false</property>
<property name="show-end-title-buttons">false</property>
<property name="title-widget">
@ -40,7 +40,7 @@
<object class="GtkScrolledWindow">
<property name="vexpand">true</property>
<child>
<object class="HdyClamp">
<object class="AdwClamp">
<property name="margin-start">12</property>
<property name="margin-end">12</property>
<property name="margin-top">18</property>
@ -54,7 +54,7 @@
<object class="GtkListBox">
<property name="selection-mode">none</property>
<child>
<object class="HdyActionRow">
<object class="AdwActionRow">
<property name="activatable">True</property>
<property name="title" translatable="yes">Title</property>
<property name="activatable-widget">title_entry</property>

4
src/dialogs/login_dialog.rs
View file

@ -8,7 +8,7 @@ use std::rc::Rc;
/// A dialog for entering login credentials.
pub struct LoginDialog {
backend: Rc<Backend>,
window: libhandy::Window,
window: libadwaita::Window,
stack: gtk::Stack,
info_bar: gtk::InfoBar,
username_entry: gtk::Entry,
@ -22,7 +22,7 @@ impl LoginDialog {
// Create UI
let builder = gtk::Builder::from_resource("/de/johrpan/musicus/ui/login_dialog.ui");
get_widget!(builder, libhandy::Window, window);
get_widget!(builder, libadwaita::Window, window);
get_widget!(builder, gtk::Stack, stack);
get_widget!(builder, gtk::InfoBar, info_bar);
get_widget!(builder, gtk::Button, cancel_button);

18
src/dialogs/preferences.rs
View file

@ -4,16 +4,16 @@ use gettextrs::gettext;
use glib::clone;
use gtk::prelude::*;
use gtk_macros::get_widget;
use libhandy::prelude::*;
use libadwaita::prelude::*;
use std::rc::Rc;
/// A dialog for configuring the app.
pub struct Preferences {
backend: Rc<Backend>,
window: libhandy::Window,
music_library_path_row: libhandy::ActionRow,
url_row: libhandy::ActionRow,
login_row: libhandy::ActionRow,
window: libadwaita::Window,
music_library_path_row: libadwaita::ActionRow,
url_row: libadwaita::ActionRow,
login_row: libadwaita::ActionRow,
}
impl Preferences {
@ -22,12 +22,12 @@ impl Preferences {
// Create UI
let builder = gtk::Builder::from_resource("/de/johrpan/musicus/ui/preferences.ui");
get_widget!(builder, libhandy::Window, window);
get_widget!(builder, libhandy::ActionRow, music_library_path_row);
get_widget!(builder, libadwaita::Window, window);
get_widget!(builder, libadwaita::ActionRow, music_library_path_row);
get_widget!(builder, gtk::Button, select_music_library_path_button);
get_widget!(builder, libhandy::ActionRow, url_row);
get_widget!(builder, libadwaita::ActionRow, url_row);
get_widget!(builder, gtk::Button, url_button);
get_widget!(builder, libhandy::ActionRow, login_row);
get_widget!(builder, libadwaita::ActionRow, login_row);
get_widget!(builder, gtk::Button, login_button);
window.set_transient_for(Some(parent));

4
src/dialogs/server_dialog.rs
View file

@ -8,7 +8,7 @@ use std::rc::Rc;
/// A dialog for setting up the server.
pub struct ServerDialog {
backend: Rc<Backend>,
window: libhandy::Window,
window: libadwaita::Window,
url_entry: gtk::Entry,
selected_cb: RefCell<Option<Box<dyn Fn(String) -> ()>>>,
}
@ -19,7 +19,7 @@ impl ServerDialog {
// Create UI
let builder = gtk::Builder::from_resource("/de/johrpan/musicus/ui/server_dialog.ui");
get_widget!(builder, libhandy::Window, window);
get_widget!(builder, libadwaita::Window, window);
get_widget!(builder, gtk::Button, cancel_button);
get_widget!(builder, gtk::Button, set_button);
get_widget!(builder, gtk::Entry, url_entry);

14
src/editors/performance.rs
View file

@ -6,7 +6,7 @@ use gettextrs::gettext;
use glib::clone;
use gtk::prelude::*;
use gtk_macros::get_widget;
use libhandy::prelude::*;
use libadwaita::prelude::*;
use std::cell::RefCell;
use std::rc::Rc;
@ -15,9 +15,9 @@ pub struct PerformanceEditor {
backend: Rc<Backend>,
widget: gtk::Box,
save_button: gtk::Button,
person_row: libhandy::ActionRow,
ensemble_row: libhandy::ActionRow,
role_row: libhandy::ActionRow,
person_row: libadwaita::ActionRow,
ensemble_row: libadwaita::ActionRow,
role_row: libadwaita::ActionRow,
reset_role_button: gtk::Button,
person: RefCell<Option<Person>>,
ensemble: RefCell<Option<Ensemble>>,
@ -40,9 +40,9 @@ impl PerformanceEditor {
get_widget!(builder, gtk::Button, ensemble_button);
get_widget!(builder, gtk::Button, role_button);
get_widget!(builder, gtk::Button, reset_role_button);
get_widget!(builder, libhandy::ActionRow, person_row);
get_widget!(builder, libhandy::ActionRow, ensemble_row);
get_widget!(builder, libhandy::ActionRow, role_row);
get_widget!(builder, libadwaita::ActionRow, person_row);
get_widget!(builder, libadwaita::ActionRow, ensemble_row);
get_widget!(builder, libadwaita::ActionRow, role_row);
let this = Rc::new(PerformanceEditor {
backend,

8
src/editors/recording.rs
View file

@ -8,7 +8,7 @@ use gettextrs::gettext;
use glib::clone;
use gtk::prelude::*;
use gtk_macros::get_widget;
use libhandy::prelude::*;
use libadwaita::prelude::*;
use std::cell::RefCell;
use std::rc::Rc;
@ -18,7 +18,7 @@ pub struct RecordingEditor {
backend: Rc<Backend>,
save_button: gtk::Button,
info_bar: gtk::InfoBar,
work_row: libhandy::ActionRow,
work_row: libadwaita::ActionRow,
comment_entry: gtk::Entry,
upload_switch: gtk::Switch,
performance_list: Rc<List>,
@ -40,7 +40,7 @@ impl RecordingEditor {
get_widget!(builder, gtk::Button, back_button);
get_widget!(builder, gtk::Button, save_button);
get_widget!(builder, gtk::InfoBar, info_bar);
get_widget!(builder, libhandy::ActionRow, work_row);
get_widget!(builder, libadwaita::ActionRow, work_row);
get_widget!(builder, gtk::Button, work_button);
get_widget!(builder, gtk::Entry, comment_entry);
get_widget!(builder, gtk::Switch, upload_switch);
@ -173,7 +173,7 @@ impl RecordingEditor {
}
}));
let row = libhandy::ActionRow::new();
let row = libadwaita::ActionRow::new();
row.set_activatable(true);
row.set_title(Some(&performance.get_title()));
row.add_suffix(&delete_button);

10
src/editors/work.rs
View file

@ -9,7 +9,7 @@ use gettextrs::gettext;
use glib::clone;
use gtk::prelude::*;
use gtk_macros::get_widget;
use libhandy::prelude::*;
use libadwaita::prelude::*;
use std::cell::RefCell;
use std::convert::TryInto;
use std::rc::Rc;
@ -37,7 +37,7 @@ pub struct WorkEditor {
save_button: gtk::Button,
title_entry: gtk::Entry,
info_bar: gtk::InfoBar,
composer_row: libhandy::ActionRow,
composer_row: libadwaita::ActionRow,
upload_switch: gtk::Switch,
instrument_list: Rc<List>,
part_list: Rc<List>,
@ -62,7 +62,7 @@ impl WorkEditor {
get_widget!(builder, gtk::InfoBar, info_bar);
get_widget!(builder, gtk::Entry, title_entry);
get_widget!(builder, gtk::Button, composer_button);
get_widget!(builder, libhandy::ActionRow, composer_row);
get_widget!(builder, libadwaita::ActionRow, composer_row);
get_widget!(builder, gtk::Switch, upload_switch);
get_widget!(builder, gtk::Frame, instrument_frame);
get_widget!(builder, gtk::Button, add_instrument_button);
@ -179,7 +179,7 @@ impl WorkEditor {
this.instrument_list.update(length);
}));
let row = libhandy::ActionRow::new();
let row = libadwaita::ActionRow::new();
row.set_title(Some(&instrument.name));
row.add_suffix(&delete_button);
@ -265,7 +265,7 @@ impl WorkEditor {
}
}));
let row = libhandy::ActionRow::new();
let row = libadwaita::ActionRow::new();
row.set_activatable(true);
row.set_title(Some(&pos.get_title()));
row.add_suffix(&delete_button);

6
src/editors/work_part.rs
View file

@ -6,7 +6,7 @@ use gettextrs::gettext;
use glib::clone;
use gtk::prelude::*;
use gtk_macros::get_widget;
use libhandy::prelude::*;
use libadwaita::prelude::*;
use std::cell::RefCell;
use std::rc::Rc;
@ -15,7 +15,7 @@ pub struct WorkPartEditor {
backend: Rc<Backend>,
widget: gtk::Box,
title_entry: gtk::Entry,
composer_row: libhandy::ActionRow,
composer_row: libadwaita::ActionRow,
reset_composer_button: gtk::Button,
composer: RefCell<Option<Person>>,
ready_cb: RefCell<Option<Box<dyn Fn(WorkPart) -> ()>>>,
@ -34,7 +34,7 @@ impl WorkPartEditor {
get_widget!(builder, gtk::Button, save_button);
get_widget!(builder, gtk::Entry, title_entry);
get_widget!(builder, gtk::Button, composer_button);
get_widget!(builder, libhandy::ActionRow, composer_row);
get_widget!(builder, libadwaita::ActionRow, composer_row);
get_widget!(builder, gtk::Button, reset_composer_button);
let composer = match part {

4
src/import/medium_editor.rs
View file

@ -8,7 +8,7 @@ use glib::clone;
use glib::prelude::*;
use gtk::prelude::*;
use gtk_macros::get_widget;
use libhandy::prelude::*;
use libadwaita::prelude::*;
use std::cell::RefCell;
use std::rc::Rc;
@ -117,7 +117,7 @@ impl MediumEditor {
edit_button.set_valign(gtk::Align::Center);
edit_button.set_child(Some(&edit_image));
let row = libhandy::ActionRow::new();
let row = libadwaita::ActionRow::new();
row.set_activatable(true);
row.set_title(Some(&title));
row.set_subtitle(Some(&subtitle));

4
src/import/track_editor.rs
View file

@ -3,7 +3,7 @@ use crate::widgets::{Navigator, NavigatorScreen};
use glib::clone;
use gtk::prelude::*;
use gtk_macros::get_widget;
use libhandy::prelude::*;
use libadwaita::prelude::*;
use std::cell::RefCell;
use std::rc::Rc;
@ -76,7 +76,7 @@ impl TrackEditor {
}
}));
let row = libhandy::ActionRow::new();
let row = libadwaita::ActionRow::new();
row.add_prefix(&check);
row.set_activatable_widget(Some(&check));
row.set_title(Some(&part.title));

4
src/import/track_selector.rs
View file

@ -3,7 +3,7 @@ use crate::widgets::{Navigator, NavigatorScreen};
use glib::clone;
use gtk::prelude::*;
use gtk_macros::get_widget;
use libhandy::prelude::*;
use libadwaita::prelude::*;
use std::cell::RefCell;
use std::rc::Rc;
@ -89,7 +89,7 @@ impl TrackSelector {
let title = format!("Track {}", track.number);
let row = libhandy::ActionRow::new();
let row = libadwaita::ActionRow::new();
row.add_prefix(&check);
row.set_activatable_widget(Some(&check));
row.set_activatable(true);

8
src/import/track_set_editor.rs
View file

@ -9,7 +9,7 @@ use gettextrs::gettext;
use glib::clone;
use gtk::prelude::*;
use gtk_macros::get_widget;
use libhandy::prelude::*;
use libadwaita::prelude::*;
use std::cell::RefCell;
use std::rc::Rc;
@ -36,7 +36,7 @@ pub struct TrackSetEditor {
source: Rc<Box<dyn Source>>,
widget: gtk::Box,
save_button: gtk::Button,
recording_row: libhandy::ActionRow,
recording_row: libadwaita::ActionRow,
track_list: Rc<List>,
recording: RefCell<Option<Recording>>,
tracks: RefCell<Vec<TrackData>>,
@ -54,7 +54,7 @@ impl TrackSetEditor {
get_widget!(builder, gtk::Box, widget);
get_widget!(builder, gtk::Button, back_button);
get_widget!(builder, gtk::Button, save_button);
get_widget!(builder, libhandy::ActionRow, recording_row);
get_widget!(builder, libadwaita::ActionRow, recording_row);
get_widget!(builder, gtk::Button, select_recording_button);
get_widget!(builder, gtk::Button, edit_tracks_button);
get_widget!(builder, gtk::Frame, tracks_frame);
@ -185,7 +185,7 @@ impl TrackSetEditor {
edit_button.set_valign(gtk::Align::Center);
edit_button.set_child(Some(&edit_image));
let row = libhandy::ActionRow::new();
let row = libadwaita::ActionRow::new();
row.set_activatable(true);
row.set_title(Some(&title));
row.set_subtitle(Some(&subtitle));

2
src/main.rs
View file

@ -34,7 +34,7 @@ fn main() {
gstreamer::init().expect("Failed to initialize GStreamer!");
gtk::init().expect("Failed to initialize GTK!");
libhandy::init();
libadwaita::init();
resources::init().expect("Failed to initialize resources!");
let app = gtk::Application::new(Some("de.johrpan.musicus"), gio::ApplicationFlags::empty())

4
src/screens/ensemble_screen.rs
View file

@ -7,7 +7,7 @@ use gio::prelude::*;
use glib::clone;
use gtk::prelude::*;
use gtk_macros::get_widget;
use libhandy::prelude::*;
use libadwaita::prelude::*;
use std::cell::RefCell;
use std::rc::Rc;
@ -72,7 +72,7 @@ impl EnsembleScreen {
this.recording_list.set_make_widget_cb(clone!(@strong this => move |index| {
let recording = &this.recordings.borrow()[index];
let row = libhandy::ActionRow::new();
let row = libadwaita::ActionRow::new();
row.set_activatable(true);
row.set_title(Some(&recording.work.get_title()));
row.set_subtitle(Some(&recording.get_performers()));

6
src/screens/person_screen.rs
View file

@ -7,7 +7,7 @@ use gio::prelude::*;
use glib::clone;
use gtk::prelude::*;
use gtk_macros::get_widget;
use libhandy::prelude::*;
use libadwaita::prelude::*;
use std::cell::RefCell;
use std::rc::Rc;
@ -86,7 +86,7 @@ impl PersonScreen {
this.work_list.set_make_widget_cb(clone!(@strong this => move |index| {
let work = &this.works.borrow()[index];
let row = libhandy::ActionRow::new();
let row = libadwaita::ActionRow::new();
row.set_activatable(true);
row.set_title(Some(&work.title));
@ -111,7 +111,7 @@ impl PersonScreen {
this.recording_list.set_make_widget_cb(clone!(@strong this => move |index| {
let recording = &this.recordings.borrow()[index];
let row = libhandy::ActionRow::new();
let row = libadwaita::ActionRow::new();
row.set_activatable(true);
row.set_title(Some(&recording.work.get_title()));
row.set_subtitle(Some(&recording.get_performers()));

6
src/screens/player_screen.rs
View file

@ -4,7 +4,7 @@ use gettextrs::gettext;
use glib::clone;
use gtk::prelude::*;
use gtk_macros::get_widget;
use libhandy::prelude::*;
use libadwaita::prelude::*;
use std::cell::{Cell, RefCell};
use std::rc::Rc;
@ -155,7 +155,7 @@ impl PlayerScreen {
let playlist_item = &this.playlist.borrow()[item_index];
let recording = &playlist_item.track_set.recording;
let row = libhandy::ActionRow::new();
let row = libadwaita::ActionRow::new();
row.set_activatable(false);
row.set_selectable(false);
row.set_title(Some(&recording.work.get_title()));
@ -179,7 +179,7 @@ impl PlayerScreen {
parts.join(", ")
};
let row = libhandy::ActionRow::new();
let row = libadwaita::ActionRow::new();
row.set_selectable(false);
row.set_activatable(true);
row.set_title(Some(&title));

4
src/screens/recording_screen.rs
View file

@ -8,7 +8,7 @@ use gio::prelude::*;
use glib::clone;
use gtk::prelude::*;
use gtk_macros::get_widget;
use libhandy::prelude::*;
use libadwaita::prelude::*;
use std::cell::RefCell;
use std::rc::Rc;
@ -92,7 +92,7 @@ impl RecordingScreen {
title_parts.join(", ")
};
let row = libhandy::ActionRow::new();
let row = libadwaita::ActionRow::new();
row.set_title(Some(&title));
row.upcast()

4
src/screens/work_screen.rs
View file

@ -7,7 +7,7 @@ use gio::prelude::*;
use glib::clone;
use gtk::prelude::*;
use gtk_macros::get_widget;
use libhandy::prelude::*;
use libadwaita::prelude::*;
use std::cell::RefCell;
use std::rc::Rc;
@ -74,7 +74,7 @@ impl WorkScreen {
this.recording_list.set_make_widget_cb(clone!(@strong this => move |index| {
let recording = &this.recordings.borrow()[index];
let row = libhandy::ActionRow::new();
let row = libadwaita::ActionRow::new();
row.set_activatable(true);
row.set_title(Some(&recording.work.get_title()));
row.set_subtitle(Some(&recording.get_performers()));

4
src/selectors/ensemble.rs
View file

@ -6,7 +6,7 @@ use crate::widgets::{Navigator, NavigatorScreen};
use gettextrs::gettext;
use glib::clone;
use gtk::prelude::*;
use libhandy::prelude::*;
use libadwaita::prelude::*;
use std::cell::RefCell;
use std::rc::Rc;
@ -65,7 +65,7 @@ impl EnsembleSelector {
}));
this.selector.set_make_widget(clone!(@strong this => move |ensemble| {
let row = libhandy::ActionRow::new();
let row = libadwaita::ActionRow::new();
row.set_activatable(true);
row.set_title(Some(&ensemble.name));

4
src/selectors/instrument.rs
View file

@ -6,7 +6,7 @@ use crate::widgets::{Navigator, NavigatorScreen};
use gettextrs::gettext;
use glib::clone;
use gtk::prelude::*;
use libhandy::prelude::*;
use libadwaita::prelude::*;
use std::cell::RefCell;
use std::rc::Rc;
@ -65,7 +65,7 @@ impl InstrumentSelector {
}));
this.selector.set_make_widget(clone!(@strong this => move |instrument| {
let row = libhandy::ActionRow::new();
let row = libadwaita::ActionRow::new();
row.set_activatable(true);
row.set_title(Some(&instrument.name));

4
src/selectors/person.rs
View file

@ -6,7 +6,7 @@ use crate::widgets::{Navigator, NavigatorScreen};
use gettextrs::gettext;
use glib::clone;
use gtk::prelude::*;
use libhandy::prelude::*;
use libadwaita::prelude::*;
use std::cell::RefCell;
use std::rc::Rc;
@ -65,7 +65,7 @@ impl PersonSelector {
}));
this.selector.set_make_widget(clone!(@strong this => move |person| {
let row = libhandy::ActionRow::new();
let row = libadwaita::ActionRow::new();
row.set_activatable(true);
row.set_title(Some(&person.name_lf()));

4
src/selectors/recording.rs
View file

@ -6,7 +6,7 @@ use crate::widgets::{Navigator, NavigatorScreen};
use gettextrs::gettext;
use glib::clone;
use gtk::prelude::*;
use libhandy::prelude::*;
use libadwaita::prelude::*;
use std::cell::RefCell;
use std::rc::Rc;
@ -75,7 +75,7 @@ impl RecordingSelector {
}));
this.selector.set_make_widget(clone!(@strong this => move |recording| {
let row = libhandy::ActionRow::new();
let row = libadwaita::ActionRow::new();
row.set_activatable(true);
row.set_title(Some(&recording.get_performers()));

4
src/selectors/work.rs
View file

@ -6,7 +6,7 @@ use crate::widgets::{Navigator, NavigatorScreen};
use gettextrs::gettext;
use glib::clone;
use gtk::prelude::*;
use libhandy::prelude::*;
use libadwaita::prelude::*;
use std::cell::RefCell;
use std::rc::Rc;
@ -75,7 +75,7 @@ impl WorkSelector {
}));
this.selector.set_make_widget(clone!(@strong this => move |work| {
let row = libhandy::ActionRow::new();
let row = libadwaita::ActionRow::new();
row.set_activatable(true);
row.set_title(Some(&work.title));

6
src/widgets/navigator_window.rs
View file

@ -5,7 +5,7 @@ use std::rc::Rc;
/// A window hosting a navigator.
pub struct NavigatorWindow {
window: libhandy::Window,
window: libadwaita::Window,
navigator: Rc<Navigator>,
}
@ -14,11 +14,11 @@ impl NavigatorWindow {
pub fn new<S: NavigatorScreen + 'static>(initial_screen: Rc<S>) -> Rc<Self> {
// Create UI
let window = libhandy::Window::new();
let window = libadwaita::Window::new();
window.set_default_size(600, 424);
let placeholder = gtk::Label::new(None);
let navigator = Navigator::new(&window, &placeholder);
libhandy::WindowExt::set_child(&window, Some(&navigator.widget));
libadwaita::WindowExt::set_child(&window, Some(&navigator.widget));
let this = Rc::new(Self { window, navigator });

4
src/widgets/poe_list.rs
View file

@ -4,7 +4,7 @@ use crate::database::*;
use glib::clone;
use gtk::prelude::*;
use gtk_macros::get_widget;
use libhandy::prelude::*;
use libadwaita::prelude::*;
use std::cell::RefCell;
use std::rc::Rc;
@ -64,7 +64,7 @@ impl PoeList {
this.list.set_make_widget_cb(clone!(@strong this => move |index| {
let poe = &this.data.borrow()[index];
let row = libhandy::ActionRow::new();
let row = libadwaita::ActionRow::new();
row.set_activatable(true);
row.set_title(Some(&poe.get_title()));

8
src/window.rs
View file

@ -13,9 +13,9 @@ use std::rc::Rc;
pub struct Window {
backend: Rc<Backend>,
window: libhandy::ApplicationWindow,
window: libadwaita::ApplicationWindow,
stack: gtk::Stack,
leaflet: libhandy::Leaflet,
leaflet: libadwaita::Leaflet,
sidebar_box: gtk::Box,
poe_list: Rc<PoeList>,
navigator: Rc<Navigator>,
@ -27,11 +27,11 @@ impl Window {
pub fn new(app: &gtk::Application) -> Rc<Self> {
let builder = gtk::Builder::from_resource("/de/johrpan/musicus/ui/window.ui");
get_widget!(builder, libhandy::ApplicationWindow, window);
get_widget!(builder, libadwaita::ApplicationWindow, window);
get_widget!(builder, gtk::Stack, stack);
get_widget!(builder, gtk::Button, select_music_library_path_button);
get_widget!(builder, gtk::Box, content_box);
get_widget!(builder, libhandy::Leaflet, leaflet);
get_widget!(builder, libadwaita::Leaflet, leaflet);
get_widget!(builder, gtk::Button, add_button);
get_widget!(builder, gtk::Box, sidebar_box);
get_widget!(builder, gtk::Box, empty_screen);