Commit ada5413c authored by Felix Häcker's avatar Felix Häcker

UI/libhandy refactor

parent 9d86102e
This diff is collapsed.
......@@ -33,17 +33,17 @@ async-std = "1.4.0"
isahc = "0.9"
regex = "1.3.4"
gstreamer = { version = "0.15.0", features = ["v1_10"] }
gstreamer-audio = "0.15.5"
cairo-rs = "0.8.0"
gdk = "0.12.0"
glib = { version = "0.9.0" }
gtk = { version = "0.8.0", features = ["v3_22"] }
gio = { version = "0.8.0", features = ["v2_46"] }
gdk-pixbuf = { version = "0.8.0", features = ["v2_36"] }
gstreamer = { version = "0.16.1", features = ["v1_10"] }
gstreamer-audio = "0.16.0"
cairo-rs = "0.9.0"
gdk = "0.13.0"
glib = { version = "0.10.0" }
gtk = { version = "0.9.0", features = ["v3_22"] }
gio = { version = "0.9.0", features = ["v2_46"] }
gdk-pixbuf = { version = "0.9.0", features = ["v2_36"] }
gettext-rs = { version = "0.4.4", features = ["gettext-system"] }
libhandy = { git="https://gitlab.gnome.org/bilelmoussaoui/libhandy-rs", features = ["v1_0"] }
libhandy = { git="https://gitlab.gnome.org/haecker-felix/libhandy-rs", features = ["v1_0"] }
gtk-macros = "0.2.0"
[target.'cfg(unix)'.dependencies]
mpris-player = "0.5.0"
mpris-player = "0.6.0"
......@@ -33,6 +33,19 @@
}
},
"modules" : [
{
"name" : "gst-libav",
"cleanup" : [
"*.la"
],
"sources" : [
{
"type" : "archive",
"url" : "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.16.2.tar.xz",
"sha256" : "c724f612700c15a933c7356fbeabb0bb9571fb5538f8b1b54d4d2d94188deef2"
}
]
},
{
"name" : "libhandy",
"buildsystem" : "meson",
......@@ -51,20 +64,7 @@
{
"type" : "git",
"url" : "https://gitlab.gnome.org/GNOME/libhandy",
"tag" : "v0.80.0"
}
]
},
{
"name" : "gst-libav",
"cleanup" : [
"*.la"
],
"sources" : [
{
"type" : "archive",
"url" : "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.16.2.tar.xz",
"sha256" : "c724f612700c15a933c7356fbeabb0bb9571fb5538f8b1b54d4d2d94188deef2"
"tag" : "0.81.0"
}
]
},
......
......@@ -37,6 +37,19 @@
}
},
"modules" : [
{
"name" : "gst-libav",
"cleanup" : [
"*.la"
],
"sources" : [
{
"type" : "archive",
"url" : "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.16.2.tar.xz",
"sha256" : "c724f612700c15a933c7356fbeabb0bb9571fb5538f8b1b54d4d2d94188deef2"
}
]
},
{
"name" : "libhandy",
"buildsystem" : "meson",
......@@ -55,20 +68,7 @@
{
"type" : "git",
"url" : "https://gitlab.gnome.org/GNOME/libhandy",
"tag" : "v0.80.0"
}
]
},
{
"name" : "gst-libav",
"cleanup" : [
"*.la"
],
"sources" : [
{
"type" : "archive",
"url" : "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.16.2.tar.xz",
"sha256" : "c724f612700c15a933c7356fbeabb0bb9571fb5538f8b1b54d4d2d94188deef2"
"branch" : "wip/haecker-felix/flap-widget"
}
]
},
......
......@@ -27,6 +27,17 @@
}
},
"modules" : [
{
"name" : "gst-libav",
"cleanup" : ["*.la"],
"sources" : [
{
"type" : "archive",
"url" : "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.16.2.tar.xz",
"sha256" : "c724f612700c15a933c7356fbeabb0bb9571fb5538f8b1b54d4d2d94188deef2"
}
]
},
{
"name" : "libhandy",
"buildsystem" : "meson",
......@@ -45,18 +56,7 @@
{
"type" : "git",
"url" : "https://gitlab.gnome.org/GNOME/libhandy",
"tag": "v0.80.0"
}
]
},
{
"name" : "gst-libav",
"cleanup" : ["*.la"],
"sources" : [
{
"type" : "archive",
"url" : "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.16.2.tar.xz",
"sha256" : "c724f612700c15a933c7356fbeabb0bb9571fb5538f8b1b54d4d2d94188deef2"
"tag": "0.81.0"
}
]
},
......
......@@ -2,7 +2,7 @@
<!-- Generated with glade 3.22.2 -->
<interface>
<requires lib="gtk+" version="3.22"/>
<requires lib="libhandy" version="0.0"/>
<requires lib="libhandy" version="1.0"/>
<object class="GtkBox" id="discover">
<property name="visible">True</property>
<property name="can_focus">False</property>
......@@ -20,12 +20,11 @@
<property name="can_focus">False</property>
<property name="shadow_type">none</property>
<child>
<object class="HdyColumn">
<object class="HdyClamp">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="maximum_width">1600</property>
<property name="linear_growth_width">400</property>
<property name="maximum_size">1600</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
......
......@@ -2,7 +2,7 @@
<!-- Generated with glade 3.22.2 -->
<interface>
<requires lib="gtk+" version="3.20"/>
<requires lib="libhandy" version="0.0"/>
<requires lib="libhandy" version="1.0"/>
<object class="GtkBox" id="featured_carousel">
<property name="visible">True</property>
<property name="can_focus">False</property>
......
This diff is collapsed.
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.1 -->
<!-- Generated with glade 3.36.0 -->
<interface>
<requires lib="gtk+" version="3.20"/>
<requires lib="libhandy" version="0.0"/>
<requires lib="libhandy" version="1.0"/>
<object class="GtkBox" id="player">
<property name="visible">True</property>
<property name="can_focus">False</property>
......@@ -10,12 +10,50 @@
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkRevealer" id="revealer">
<object class="HdyWindowHandle" id="header_handle">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="transition_type">slide-left</property>
<property name="transition_duration">400</property>
<property name="reveal_child">True</property>
<child>
<object class="GtkHeaderBar" id="header">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="show_close_button">True</property>
<child>
<object class="GtkButton" id="back_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="valign">center</property>
<property name="action_name">win.go-back</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">go-previous-symbolic</property>
</object>
</child>
<style>
<class name="image-button"/>
</style>
</object>
</child>
<style>
<class name="titlebar"/>
</style>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="content">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkScrolledWindow">
<property name="visible">True</property>
......@@ -27,17 +65,16 @@
<property name="can_focus">False</property>
<property name="shadow_type">none</property>
<child>
<object class="HdyColumn">
<object class="HdyClamp">
<property name="width_request">275</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="maximum_width">400</property>
<property name="maximum_size">400</property>
<property name="tightening_threshold">0</property>
<child>
<object class="GtkBox" id="player_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">6</property>
<property name="margin_right">6</property>
<property name="margin_top">22</property>
<property name="margin_bottom">22</property>
<property name="orientation">vertical</property>
......@@ -172,13 +209,27 @@
</object>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
<property name="position">1</property>
</packing>
</child>
<style>
<class name="sidebar"/>
</style>
</object>
</interface>
......@@ -2,7 +2,7 @@
<!-- Generated with glade 3.22.1 -->
<interface>
<requires lib="gtk+" version="3.22"/>
<requires lib="libhandy" version="0.0"/>
<requires lib="libhandy" version="1.0"/>
<object class="GtkBox" id="search">
<property name="visible">True</property>
<property name="can_focus">False</property>
......@@ -24,10 +24,9 @@
<property name="show-close-button">False</property>
<property name="search-mode-enabled">True</property>
<child>
<object class="HdyColumn">
<object class="HdyClamp">
<property name="visible">True</property>
<property name="maximum_width">1600</property>
<property name="linear_growth_width">400</property>
<property name="maximum_size">1600</property>
<child>
<object class="GtkSearchEntry" id="search_entry">
<property name="visible">True</property>
......@@ -54,11 +53,10 @@
<property name="can_focus">False</property>
<property name="shadow_type">none</property>
<child>
<object class="HdyColumn">
<object class="HdyClamp">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="maximum_width">1600</property>
<property name="linear_growth_width">400</property>
<property name="maximum_size">1600</property>
<property name="border_width">12</property>
<child>
<object class="GtkBox" id="results_box">
......
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.1 -->
<!-- Generated with glade 3.36.0 -->
<interface>
<requires lib="gtk+" version="3.22"/>
<object class="GtkPopover" id="error_popover">
......
......@@ -2,7 +2,7 @@
<!-- Generated with glade 3.22.1 -->
<interface>
<requires lib="gtk+" version="3.22"/>
<requires lib="libhandy" version="0.0"/>
<requires lib="libhandy" version="1.0"/>
<object class="GtkDialog" id="station_dialog">
<property name="width_request">325</property>
<property name="height_request">575</property>
......
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.1 -->
<!-- Generated with glade 3.36.0 -->
<interface>
<requires lib="gtk+" version="3.22"/>
<requires lib="libhandy" version="1.0"/>
<object class="GtkBox" id="storefront">
<property name="width_request">350</property>
<property name="visible">True</property>
......@@ -10,115 +11,190 @@
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkStack" id="storefront_stack">
<object class="HdyWindowHandle" id="header_handle">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="transition_type">slide-left-right</property>
<property name="interpolate_size">True</property>
<child>
<object class="GtkBox" id="discover_box">
<object class="GtkHeaderBar" id="header">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="title" translatable="yes">Shortwave</property>
<property name="show_close_button">True</property>
<child type="title">
<object class="HdyViewSwitcherTitle" id="header_viewswitcher">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="policy">auto</property>
<property name="stack">storefront_stack</property>
<property name="title">Shortwave</property>
</object>
</child>
<child>
<placeholder/>
<object class="GtkButton" id="back_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="valign">center</property>
<property name="action_name">win.go-back</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">go-previous-symbolic</property>
</object>
</child>
<style>
<class name="image-button"/>
</style>
</object>
</child>
<style>
<class name="titlebar"/>
</style>
</object>
<packing>
<property name="name">discover</property>
<property name="title" translatable="yes">Discover</property>
<property name="icon_name">view-grid-symbolic</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="content">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkBox" id="search_box">
<object class="GtkStack" id="storefront_stack">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="transition_type">crossfade</property>
<property name="interpolate_size">True</property>
<child>
<placeholder/>
<object class="GtkBox" id="discover_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="name">discover</property>
<property name="title" translatable="yes">Discover</property>
<property name="icon_name">view-grid-symbolic</property>
</packing>
</child>
</object>
<packing>
<property name="name">search</property>
<property name="title" translatable="yes">Search</property>
<property name="icon_name">system-search-symbolic</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkBox" id="locations_box">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel">
<object class="GtkBox" id="search_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label">Locations page</property>
<property name="orientation">vertical</property>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
<property name="name">search</property>
<property name="title" translatable="yes">Search</property>
<property name="icon_name">system-search-symbolic</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="name">locations</property>
<property name="title" translatable="yes">Locations</property>
<property name="icon_name">mark-location-symbolic</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkBox" id="languages_box">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel">
<object class="GtkBox" id="locations_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label">Languages page</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label">Locations page</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
<property name="name">locations</property>
<property name="title" translatable="yes">Locations</property>
<property name="icon_name">mark-location-symbolic</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="name">languages</property>
<property name="title" translatable="yes">Languages</property>
<property name="icon_name">preferences-desktop-locale-symbolic</property>
<property name="position">3</property>
</packing>
</child>
<child>
<object class="GtkBox" id="tags_box">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel">
<object class="GtkBox" id="languages_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label">Location page</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label">Languages page</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
<property name="name">languages</property>
<property name="title" translatable="yes">Languages</property>
<property name="icon_name">preferences-desktop-locale-symbolic</property>
<property name="position">3</property>
</packing>
</child>
<child>
<object class="GtkBox" id="tags_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label">Location page</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
</object>
<packing>
<property name="name">tags</property>
<property name="title" translatable="yes">Tags</property>
<property name="icon_name">view-paged-symbolic</property>
<property name="position">4</property>
</packing>
</child>
</object>
<packing>
<property name="name">tags</property>
<property name="title" translatable="yes">Tags</property>
<property name="icon_name">view-paged-symbolic</property>
<property name="position">4</property>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="HdyViewSwitcherBar" id="bottom_viewswitcher">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stack">storefront_stack</property>
<property name="reveal" bind-source="header_viewswitcher" bind-property="title-visible" bind-flags="sync-create">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
......
......@@ -2,7 +2,7 @@
<!-- Generated with glade 3.22.1 -->