gtk-adwaita: Split connecting state to separate UI file Too much nesting.

Changes

5 changed files (+67/-34)

• gtk-adwaita/build.zig
  • @@ -43,6 +43,7 @@ const gresources = [_][]const u8{
    "data/ui/main-window.ui", "data/ui/server-list.ui", "data/ui/generic-error-dialog.ui", + "data/ui/server-connecting.ui", "data/ui/server-list-unexpected-error-dialog.ui", "data/ui/server-list-network-error-dialog.ui", "data/icons/scalable/actions/item-missing-symbolic.svg",
• gtk-adwaita/data/gresource.xml
  • @@ -21,6 +21,7 @@ <gresource prefix="/jp/pocka/plac/gtk-adwaita">
    <file preprocess="xml-stripblanks">ui/main-window.ui</file> <file preprocess="xml-stripblanks">ui/server-list.ui</file> <file preprocess="xml-stripblanks">ui/generic-error-dialog.ui</file> + <file preprocess="xml-stripblanks">ui/server-connecting.ui</file> <file preprocess="xml-stripblanks">ui/server-list-unexpected-error-dialog.ui</file> <file preprocess="xml-stripblanks">ui/server-list-network-error-dialog.ui</file> <file preprocess="xml-stripblanks">icons/scalable/actions/item-missing-symbolic.svg</file>
• gtk-adwaita/data/ui/main-window.ui
  • @@ -45,40 +45,7 @@ <child>
    <object class="GtkStackPage"> <property name="name">loading</property> <property name="child"> - <object class="GtkBox"> - <property name="halign">center</property> - <property name="valign">center</property> - <property name="orientation">vertical</property> - <property name="spacing">12</property> - <child> - <object class="GtkBox"> - <property name="halign">center</property> - <property name="valign">center</property> - <property name="orientation">horizontal</property> - <property name="spacing">8</property> - <style> - <class name="heading" /> - </style> - <child> - <object class="AdwSpinner" /> - </child> - <child> - <object class="GtkLabel"> - <property name="label">Connecting to Roon Server...</property> - </object> - </child> - </object> - </child> - <child> - <object class="GtkLabel"> - <style> - <class name="dimmed" /> - <!-- ~libadwaita@1.7 --> - <class name="dim-label" /> - </style> - <property name="label">If it takes too long, make sure you enabled Plac extension on Roon's settings page.</property> - </object> - </child> + <object class="PlacGtkAdwaitaServerConnecting"> </object> </property> </object>
• gtk-adwaita/data/ui/server-connecting.ui (new)
  • @@ -0,0 +1,55 @@
    + <?xml version="1.0" encoding="utf-8"?> + <!-- + Copyright 2025 Shota FUJI + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + SPDX-License-Identifier: Apache-2.0 + --> + <interface> + <template class="PlacGtkAdwaitaServerConnecting" parent="GtkBox"> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> + <child> + <object class="GtkBox"> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="orientation">horizontal</property> + <property name="spacing">8</property> + <style> + <class name="heading" /> + </style> + <child> + <object class="AdwSpinner" /> + </child> + <child> + <object class="GtkLabel"> + <property name="label">Connecting to Roon Server...</property> + </object> + </child> + </object> + </child> + <child> + <object class="GtkLabel"> + <style> + <class name="dimmed" /> + <!-- ~libadwaita@1.7 --> + <class name="dim-label" /> + </style> + <property name="label">If it takes too long, make sure you enabled Plac extension on Roon's settings page.</property> + </object> + </child> + </template> + </interface>
• gtk-adwaita/src/Application.vala
  • @@ -268,6 +268,13 @@ Object(details: details);
    } } + [GtkTemplate(ui = "/jp/pocka/plac/gtk-adwaita/ui/server-connecting.ui")] + class ServerConnecting : Gtk.Box { + public ServerConnecting() { + Object(); + } + } + [GtkTemplate(ui = "/jp/pocka/plac/gtk-adwaita/ui/main-window.ui")] class MainWindow : Adw.ApplicationWindow { [GtkChild]
  • @@ -279,6 +286,8 @@
    private unowned PlacCore.App core; public MainWindow(Gtk.Application app, PlacCore.App core) { + (typeof (ServerConnecting)).ensure(); + Object(application: app); this.core = core; }