Add search page

Changes

3 changed files (+24/-1)

• data/ui/browse.ui
  • @@ -81,6 +81,14 @@ SPDX-License-Identifier: Apache-2.0
    </child> </object> </child> + <child> + <object class="GtkSearchEntry" id="search_query"> + <property name="margin-top">6</property> + <binding name="margin-bottom"> + <lookup name="margin-top">metadata_labels</lookup> + </binding> + </object> + </child> </object> </child> <child>
• src/Widgets/Browse.vala
  • @@ -40,6 +40,9 @@ namespace PlacGtkAdwaita {
    [GtkChild] private unowned Gtk.ListView items; + [GtkChild] + private unowned Gtk.SearchEntry search_query; + [GtkChild] private unowned Gtk.ScrolledWindow scroller;
  • @@ -111,6 +114,11 @@ namespace PlacGtkAdwaita {
    }); settings.settings.bind(Settings.SHOW_BROWSE_ITEM_SEPARATORS, items, "show-separators", GET); + + search_query.activate.connect(() => { + this.item = null; + load_page(); + }); } public void start(Plac.Connection? conn, Plac.ZonesModel zones_model) {
  • @@ -127,6 +135,7 @@ namespace PlacGtkAdwaita {
    } private void end_loading() { + this.search_query.visible = this.hierarchy == SEARCH; is_loading = false; loading_end(); loading.visible = false;
  • @@ -178,6 +187,9 @@ namespace PlacGtkAdwaita {
    if (pop) { browse_req.pop_levels = 1; } + if (this.hierarchy == SEARCH && this.item == null) { + browse_req.input = search_query.text; + } var browse_res = yield browse_async(browse_req);
  • @@ -222,7 +234,9 @@ namespace PlacGtkAdwaita {
    title.label = load_res.list.title; } - if (load_res.list.subtitle != null) { + // Search result echo back the seach query as a subtitle, which does not + // fit to the Plac's search page UI. + if (load_res.list.subtitle != null && this.hierarchy != SEARCH) { if (settings.label_parsing_enabled) { var parsed = new Plac.Label.Parsed.from_string(load_res.list.subtitle); subtitle.label = parsed.label;
• src/Windows/MainWindow.vala
  • @@ -105,6 +105,7 @@ namespace PlacGtkAdwaita {
    browse_hierarchy.append(new BrowseHierarchyRow(COMPOSERS, "_Composers")); browse_hierarchy.append(new BrowseHierarchyRow(INTERNET_RADIO, "_Internet Radio")); browse_hierarchy.append(new BrowseHierarchyRow(SETTINGS, "Se_ttings")); + browse_hierarchy.append(new BrowseHierarchyRow(SEARCH, "_Search")); browse_hierarchy.row_selected.connect((row) => { if (row == null) {