internal/ui: remove Copy FQDN button

DeedleFake · Sep 23, 2024 · 1fda307 · 1fda307
1 parent 99ff033
commit 1fda307
Show file tree

Hide file tree

Showing 7 changed files with 100 additions and 112 deletions.
diff --git a/internal/ui/mainwindow.go b/internal/ui/mainwindow.go
@@ -24,7 +24,6 @@ type MainWindow struct {
 	MainMenuButton *gtk.MenuButton
 	PeersStack     *gtk.Stack
 	WorkSpinner    *gtk.Spinner
-	CopyFQDNButton *gtk.Button
 }
 
 func NewMainWindow(app *gtk.Application) *MainWindow {

diff --git a/internal/ui/mainwindow.ui b/internal/ui/mainwindow.ui
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Cambalache 0.91.1 -->
+<!-- Created with Cambalache 0.91.3 -->
 <interface>
   <!-- interface-name mainwindow.ui -->
   <requires lib="gtk" version="4.12"/>
@@ -11,13 +11,6 @@
     <property name="height-request">400</property>
     <property name="title">Trayscale</property>
     <property name="width-request">200</property>
-    <child>
-      <object class="AdwBreakpoint">
-        <!-- Custom object fragments -->
-        <condition>max-width: 400sp</condition>
-        <setter object="SplitView" property="collapsed">True</setter>
-      </object>
-    </child>
     <child>
       <object class="AdwToastOverlay" id="ToastOverlay">
         <child>
@@ -35,13 +28,6 @@
                       <object class="AdwHeaderBar">
                         <property name="show-start-title-buttons">False</property>
                         <property name="show-title">False</property>
-                        <child type="end">
-                          <object class="GtkButton" id="CopyFQDNButton">
-                            <property name="has-frame">False</property>
-                            <property name="label">_Copy FQDN</property>
-                            <property name="use-underline">True</property>
-                          </object>
-                        </child>
                         <child type="end">
                           <object class="GtkSpinner" id="WorkSpinner"/>
                         </child>
@@ -90,5 +76,12 @@
         </child>
       </object>
     </child>
+    <child>
+      <object class="AdwBreakpoint">
+        <!-- Custom object fragments -->
+        <condition>max-width: 400sp</condition>
+        <setter object="SplitView" property="collapsed">True</setter>
+      </object>
+    </child>
   </object>
 </interface>
diff --git a/internal/ui/mullvadpage.ui b/internal/ui/mullvadpage.ui
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Cambalache 0.91.1 -->
+<!-- Created with Cambalache 0.91.3 -->
 <interface>
   <requires lib="gtk" version="4.12"/>
   <requires lib="libadwaita" version="1.0"/>

diff --git a/internal/ui/peerpage.ui b/internal/ui/peerpage.ui
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Cambalache 0.91.1 -->
+<!-- Created with Cambalache 0.91.3 -->
 <interface>
   <requires lib="gtk" version="4.12"/>
   <requires lib="libadwaita" version="1.4"/>
@@ -36,11 +36,6 @@
                 </child>
               </object>
             </child>
-            <child>
-              <object class="AdwPreferencesGroup" id="AdvertisedRoutesGroup">
-                <property name="title">Advertised Routes</property>
-              </object>
-            </child>
             <child>
               <object class="AdwPreferencesGroup" id="MiscGroup">
                 <property name="title">Misc.</property>
@@ -107,6 +102,11 @@
                 </child>
               </object>
             </child>
+            <child>
+              <object class="AdwPreferencesGroup" id="AdvertisedRoutesGroup">
+                <property name="title">Advertised Routes</property>
+              </object>
+            </child>
           </object>
         </child>
       </object>

diff --git a/internal/ui/preferences.ui b/internal/ui/preferences.ui
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Cambalache 0.91.1 -->
+<!-- Created with Cambalache 0.91.3 -->
 <interface>
   <requires lib="gtk" version="4.0"/>
   <requires lib="libadwaita" version="1.4"/>

diff --git a/internal/ui/selfpage.ui b/internal/ui/selfpage.ui
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Cambalache 0.91.1 -->
+<!-- Created with Cambalache 0.91.3 -->
 <interface>
   <requires lib="gtk" version="4.12"/>
   <requires lib="libadwaita" version="1.4"/>
@@ -141,6 +141,12 @@
                     </child>
                   </object>
                 </child>
+                <child>
+                  <object class="AdwExpanderRow" id="DERPLatencies">
+                    <property name="title">DERP Latencies</property>
+                    <property name="visible">False</property>
+                  </object>
+                </child>
                 <child>
                   <object class="AdwActionRow" id="CaptivePortalRow">
                     <property name="activatable-widget">CaptivePortal</property>
@@ -151,12 +157,6 @@
                     </child>
                   </object>
                 </child>
-                <child>
-                  <object class="AdwExpanderRow" id="DERPLatencies">
-                    <property name="title">DERP Latencies</property>
-                    <property name="visible">False</property>
-                  </object>
-                </child>
               </object>
             </child>
           </object>

diff --git a/internal/ui/trayscale.cmb b/internal/ui/trayscale.cmb
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!DOCTYPE cambalache-project SYSTEM "cambalache-project.dtd">
-<cambalache-project version="0.17.3" target_tk="gtk-4.0">
+<cambalache-project version="0.91.2" target_tk="gtk-4.0">
   <ui>
 	(1,None,"mainwindow.ui","mainwindow.ui",None,None,None,None,None,None,None),
 	(2,None,None,"peerpage.ui",None,None,None,None,None,None,None),
@@ -9,91 +9,90 @@
 	(5,None,None,"mullvadpage.ui",None,None,None,None,None,None,None)
   </ui>
   <object>
-	(1,1,"AdwApplicationWindow","MainWindow",None,None,None,None,None,None,None),
-	(1,4,"AdwToastOverlay","ToastOverlay",1,None,None,None,2,None,None),
-	(1,21,"AdwNavigationSplitView","SplitView",4,None,None,None,-1,None,None),
-	(1,34,"AdwNavigationPage",None,21,None,None,None,-1,None,None),
-	(1,35,"AdwNavigationPage",None,21,None,None,None,-1,None,None),
-	(1,52,"AdwToolbarView",None,34,None,None,None,-1,None,None),
-	(1,57,"AdwHeaderBar",None,52,None,"top",None,1,None,None),
-	(1,58,"GtkSpinner","WorkSpinner",57,None,"end",None,None,None,None),
-	(1,60,"GtkStack","PeersStack",52,None,None,None,-1,None,None),
-	(1,61,"AdwToolbarView",None,35,None,None,None,-1,None,None),
-	(1,67,"AdwHeaderBar",None,61,None,"top",None,1,None,None),
-	(1,68,"GtkSwitch","StatusSwitch",67,None,"start",None,None,None,None),
+	(1,1,"AdwApplicationWindow","MainWindow",None,None,None,None,0,None,None),
+	(1,4,"AdwToastOverlay","ToastOverlay",1,None,None,None,3,None,None),
+	(1,21,"AdwNavigationSplitView","SplitView",4,None,None,None,0,None,None),
+	(1,34,"AdwNavigationPage",None,21,None,None,None,0,None,None),
+	(1,35,"AdwNavigationPage",None,21,None,None,None,1,None,None),
+	(1,52,"AdwToolbarView",None,34,None,None,None,1,None,None),
+	(1,57,"AdwHeaderBar",None,52,None,"top",None,0,None,None),
+	(1,58,"GtkSpinner","WorkSpinner",57,None,"end",None,0,None,None),
+	(1,60,"GtkStack","PeersStack",52,None,None,None,1,None,None),
+	(1,61,"AdwToolbarView",None,35,None,None,None,0,None,None),
+	(1,67,"AdwHeaderBar",None,61,None,"top",None,0,None,None),
+	(1,68,"GtkSwitch","StatusSwitch",67,None,"start",None,0,None,None),
 	(1,69,"GtkMenuButton","MainMenuButton",67,None,"end",None,1,"&lt;property name=\"menu-model\"&gt;MainMenu&lt;/property&gt;",None),
-	(1,71,"GtkStackSidebar",None,61,None,None,None,-1,None,None),
-	(1,72,"AdwBreakpoint",None,1,None,None,None,1,"&lt;condition&gt;max-width: 400sp&lt;/condition&gt;&lt;setter object=\"SplitView\" property=\"collapsed\"&gt;True&lt;/setter&gt;",None),
-	(1,73,"GtkButton","CopyFQDNButton",57,None,"end",None,-1,None,None),
-	(2,3,"AdwStatusPage","Page",None,None,None,None,None,None,None),
-	(2,73,"AdwClamp",None,3,None,None,None,1,None,None),
-	(2,74,"GtkBox",None,73,None,None,None,None,None,None),
-	(2,75,"AdwPreferencesGroup","IPGroup",74,None,None,None,None,None,None),
-	(2,82,"AdwPreferencesGroup","SendFileGroup",74,None,None,None,3,None,None),
-	(2,83,"AdwActionRow","SendFileRow",82,None,None,None,None,None,None),
-	(2,110,"AdwPreferencesGroup","MiscGroup",74,None,None,None,6,None,None),
-	(2,135,"GtkDropTarget","DropTarget",None,None,None,None,None,None,None),
-	(2,136,"GtkButton","SendFileButton",83,None,None,None,None,None,None),
+	(1,71,"GtkStackSidebar",None,61,None,None,None,1,None,None),
+	(1,72,"AdwBreakpoint",None,1,None,None,None,4,"&lt;condition&gt;max-width: 400sp&lt;/condition&gt;&lt;setter object=\"SplitView\" property=\"collapsed\"&gt;True&lt;/setter&gt;",None),
+	(2,3,"AdwStatusPage","Page",None,None,None,None,0,None,None),
+	(2,73,"AdwClamp",None,3,None,None,None,8,None,None),
+	(2,74,"GtkBox",None,73,None,None,None,0,None,None),
+	(2,75,"AdwPreferencesGroup","IPGroup",74,None,None,None,0,None,None),
+	(2,82,"AdwPreferencesGroup","SendFileGroup",74,None,None,None,1,None,None),
+	(2,83,"AdwActionRow","SendFileRow",82,None,None,None,0,None,None),
+	(2,110,"AdwPreferencesGroup","MiscGroup",74,None,None,None,2,None,None),
+	(2,135,"GtkDropTarget","DropTarget",None,None,None,None,1,None,None),
+	(2,136,"GtkButton","SendFileButton",83,None,None,None,0,None,None),
 	(2,137,"AdwPreferencesGroup","AdvertisedRoutesGroup",74,None,None,None,3,None,None),
-	(2,138,"AdwSwitchRow","ExitNodeRow",110,None,None,None,7,None,None),
-	(2,139,"AdwActionRow","OnlineRow",110,None,None,None,7,None,None),
-	(2,140,"GtkImage","Online",139,None,None,None,None,None,None),
-	(2,141,"AdwActionRow","LastSeenRow",110,None,None,None,7,None,None),
-	(2,142,"GtkLabel","LastSeen",141,None,None,None,None,None,None),
-	(2,143,"AdwActionRow","CreatedRow",110,None,None,None,7,None,None),
-	(2,144,"GtkLabel","Created",143,None,None,None,None,None,None),
-	(2,145,"AdwActionRow","LastWriteRow",110,None,None,None,7,None,None),
-	(2,146,"GtkLabel","LastWrite",145,None,None,None,None,None,None),
-	(2,147,"AdwActionRow","LastHandshakeRow",110,None,None,None,7,None,None),
-	(2,148,"GtkLabel","LastHandshake",147,None,None,None,None,None,None),
-	(2,149,"AdwActionRow","RxBytesRow",110,None,None,None,7,None,None),
-	(2,150,"GtkLabel","RxBytes",149,None,None,None,None,None,None),
+	(2,138,"AdwSwitchRow","ExitNodeRow",110,None,None,None,0,None,None),
+	(2,139,"AdwActionRow","OnlineRow",110,None,None,None,1,None,None),
+	(2,140,"GtkImage","Online",139,None,None,None,0,None,None),
+	(2,141,"AdwActionRow","LastSeenRow",110,None,None,None,2,None,None),
+	(2,142,"GtkLabel","LastSeen",141,None,None,None,0,None,None),
+	(2,143,"AdwActionRow","CreatedRow",110,None,None,None,3,None,None),
+	(2,144,"GtkLabel","Created",143,None,None,None,0,None,None),
+	(2,145,"AdwActionRow","LastWriteRow",110,None,None,None,4,None,None),
+	(2,146,"GtkLabel","LastWrite",145,None,None,None,0,None,None),
+	(2,147,"AdwActionRow","LastHandshakeRow",110,None,None,None,5,None,None),
+	(2,148,"GtkLabel","LastHandshake",147,None,None,None,0,None,None),
+	(2,149,"AdwActionRow","RxBytesRow",110,None,None,None,6,None,None),
+	(2,150,"GtkLabel","RxBytes",149,None,None,None,0,None,None),
 	(2,151,"AdwActionRow","TxBytesRow",110,None,None,None,7,None,None),
-	(2,152,"GtkLabel","TxBytes",151,None,None,None,None,None,None),
-	(3,1,"AdwPreferencesWindow","PreferencesWindow",None,None,None,None,None,None,None),
-	(3,2,"AdwPreferencesPage",None,1,None,None,None,None,None,None),
-	(3,3,"AdwPreferencesGroup",None,2,None,None,None,None,None,None),
-	(3,14,"AdwSwitchRow","UseTrayIconRow",3,None,None,None,-1,None,None),
-	(3,15,"AdwSpinRow","PollingIntervalRow",3,None,None,None,2,None,None),
-	(3,16,"GtkAdjustment","PollingIntervalAdjustment",15,None,None,None,None,None,None),
-	(4,1,"AdwStatusPage","Page",None,None,None,None,None,None,None),
-	(4,2,"AdwClamp",None,1,None,None,None,None,None,None),
-	(4,3,"GtkBox",None,2,None,None,None,None,None,None),
-	(4,4,"AdwPreferencesGroup","IPGroup",3,None,None,None,None,None,None),
-	(4,5,"AdwPreferencesGroup","OptionsGroup",3,None,None,None,1,None,None),
-	(4,12,"AdwPreferencesGroup","FilesGroup",3,None,None,None,2,None,None),
-	(4,16,"AdwPreferencesGroup","AdvertisedRoutesGroup",3,None,None,None,4,None,None),
-	(4,17,"GtkButton","AdvertiseRouteButton",16,None,None,None,None,None,None),
-	(4,18,"AdwPreferencesGroup","NetCheckGroup",3,None,None,None,5,None,None),
-	(4,19,"GtkButton","NetCheckButton",18,None,None,None,None,None,None),
-	(4,20,"AdwActionRow","LastNetCheckRow",18,None,None,None,None,None,None),
-	(4,21,"GtkLabel","LastNetCheck",20,None,None,None,None,None,None),
-	(4,22,"AdwActionRow","UDPRow",18,None,None,None,1,None,None),
-	(4,23,"GtkImage","UDP",22,None,None,None,None,None,None),
-	(4,24,"AdwActionRow","IPv4Row",18,None,None,None,2,None,None),
-	(4,25,"GtkImage","IPv4Icon",24,None,None,None,None,None,None),
+	(2,152,"GtkLabel","TxBytes",151,None,None,None,0,None,None),
+	(3,1,"AdwPreferencesWindow","PreferencesWindow",None,None,None,None,0,None,None),
+	(3,2,"AdwPreferencesPage",None,1,None,None,None,0,None,None),
+	(3,3,"AdwPreferencesGroup",None,2,None,None,None,0,None,None),
+	(3,14,"AdwSwitchRow","UseTrayIconRow",3,None,None,None,4,None,None),
+	(3,15,"AdwSpinRow","PollingIntervalRow",3,None,None,None,5,None,None),
+	(3,16,"GtkAdjustment","PollingIntervalAdjustment",15,None,None,None,0,None,None),
+	(4,1,"AdwStatusPage","Page",None,None,None,None,0,None,None),
+	(4,2,"AdwClamp",None,1,None,None,None,1,None,None),
+	(4,3,"GtkBox",None,2,None,None,None,1,None,None),
+	(4,4,"AdwPreferencesGroup","IPGroup",3,None,None,None,0,None,None),
+	(4,5,"AdwPreferencesGroup","OptionsGroup",3,None,None,None,2,None,None),
+	(4,12,"AdwPreferencesGroup","FilesGroup",3,None,None,None,3,None,None),
+	(4,16,"AdwPreferencesGroup","AdvertisedRoutesGroup",3,None,None,None,6,None,None),
+	(4,17,"GtkButton","AdvertiseRouteButton",16,None,None,None,0,None,None),
+	(4,18,"AdwPreferencesGroup","NetCheckGroup",3,None,None,None,7,None,None),
+	(4,19,"GtkButton","NetCheckButton",18,None,None,None,0,None,None),
+	(4,20,"AdwActionRow","LastNetCheckRow",18,None,None,None,1,None,None),
+	(4,21,"GtkLabel","LastNetCheck",20,None,None,None,0,None,None),
+	(4,22,"AdwActionRow","UDPRow",18,None,None,None,2,None,None),
+	(4,23,"GtkImage","UDP",22,None,None,None,0,None,None),
+	(4,24,"AdwActionRow","IPv4Row",18,None,None,None,3,None,None),
+	(4,25,"GtkImage","IPv4Icon",24,None,None,None,0,None,None),
 	(4,26,"GtkLabel","IPv4Addr",24,None,None,None,1,None,None),
-	(4,27,"AdwActionRow","IPv6Row",18,None,None,None,3,None,None),
-	(4,28,"GtkImage","IPv6Icon",27,None,None,None,None,None,None),
+	(4,27,"AdwActionRow","IPv6Row",18,None,None,None,4,None,None),
+	(4,28,"GtkImage","IPv6Icon",27,None,None,None,0,None,None),
 	(4,29,"GtkLabel","IPv6Addr",27,None,None,None,1,None,None),
-	(4,30,"AdwActionRow","UPnPRow",18,None,None,None,4,None,None),
-	(4,31,"GtkImage","UPnP",30,None,None,None,None,None,None),
-	(4,32,"AdwActionRow","PMPRow",18,None,None,None,5,None,None),
-	(4,33,"GtkImage","PMP",32,None,None,None,None,None,None),
-	(4,34,"AdwActionRow","PCPRow",18,None,None,None,6,None,None),
-	(4,35,"GtkImage","PCP",34,None,None,None,None,None,None),
-	(4,38,"AdwActionRow","PreferredDERPRow",18,None,None,None,7,None,None),
-	(4,39,"GtkLabel","PreferredDERP",38,None,None,None,None,None,None),
+	(4,30,"AdwActionRow","UPnPRow",18,None,None,None,5,None,None),
+	(4,31,"GtkImage","UPnP",30,None,None,None,0,None,None),
+	(4,32,"AdwActionRow","PMPRow",18,None,None,None,6,None,None),
+	(4,33,"GtkImage","PMP",32,None,None,None,0,None,None),
+	(4,34,"AdwActionRow","PCPRow",18,None,None,None,7,None,None),
+	(4,35,"GtkImage","PCP",34,None,None,None,0,None,None),
+	(4,38,"AdwActionRow","PreferredDERPRow",18,None,None,None,8,None,None),
+	(4,39,"GtkLabel","PreferredDERP",38,None,None,None,0,None,None),
 	(4,40,"AdwExpanderRow","DERPLatencies",18,None,None,None,9,None,None),
-	(4,41,"AdwSwitchRow","AdvertiseExitNodeRow",5,None,None,None,None,None,None),
+	(4,41,"AdwSwitchRow","AdvertiseExitNodeRow",5,None,None,None,0,None,None),
 	(4,42,"AdwSwitchRow","AllowLANAccessRow",5,None,None,None,1,None,None),
 	(4,43,"AdwSwitchRow","AcceptRoutesRow",5,None,None,None,2,None,None),
-	(4,44,"AdwActionRow","CaptivePortalRow",18,None,None,None,8,None,None),
-	(4,45,"GtkImage","CaptivePortal",44,None,None,None,None,None,None),
-	(5,1,"AdwStatusPage","Page",None,None,None,None,None,None,None),
-	(5,2,"AdwClamp",None,1,None,None,None,None,None,None),
-	(5,3,"GtkBox",None,2,None,None,None,None,None,None),
-	(5,4,"AdwPreferencesGroup","ExitNodesGroup",3,None,None,None,None,None,None)
+	(4,44,"AdwActionRow","CaptivePortalRow",18,None,None,None,10,None,None),
+	(4,45,"GtkImage","CaptivePortal",44,None,None,None,0,None,None),
+	(5,1,"AdwStatusPage","Page",None,None,None,None,0,None,None),
+	(5,2,"AdwClamp",None,1,None,None,None,2,None,None),
+	(5,3,"GtkBox",None,2,None,None,None,2,None,None),
+	(5,4,"AdwPreferencesGroup","ExitNodesGroup",3,None,None,None,1,None,None)
   </object>
   <object_property>
 	(1,1,"AdwApplicationWindow","content","4",None,None,None,None,None,None,None,None,None),
@@ -121,9 +120,6 @@
 	(1,69,"GtkMenuButton","icon-name","open-menu-symbolic",None,None,None,None,None,None,None,None,None),
 	(1,69,"GtkMenuButton","primary","True",None,None,None,None,None,None,None,None,None),
 	(1,71,"GtkStackSidebar","stack","60",None,None,None,None,None,None,None,None,None),
-	(1,73,"GtkButton","has-frame","False",None,None,None,None,None,None,None,None,None),
-	(1,73,"GtkButton","label","_Copy FQDN",None,None,None,None,None,None,None,None,None),
-	(1,73,"GtkButton","use-underline","True",None,None,None,None,None,None,None,None,None),
 	(2,74,"GtkBox","spacing","12",None,None,None,None,None,None,None,None,None),
 	(2,74,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
 	(2,75,"AdwPreferencesGroup","title","Tailscale IPs",None,None,None,None,None,None,None,None,None),