From fe2635a832d1960b0566f9db94ac5e58d9f52fc6 Mon Sep 17 00:00:00 2001
From: Emanuele Petriglia <inbox@emanuelepetriglia.com>
Date: Sat, 30 Nov 2019 14:31:01 +0100
Subject: [PATCH 1/2] Use Xfce's about dialog via libxfce4ui

Signed-off-by: Emanuele Petriglia <inbox@emanuelepetriglia.com>
---
 xfce4-panel-profiles/xfce4-panel-profiles.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/xfce4-panel-profiles/xfce4-panel-profiles.py b/xfce4-panel-profiles/xfce4-panel-profiles.py
index 82f8cb2..4aef3a8 100644
--- a/xfce4-panel-profiles/xfce4-panel-profiles.py
+++ b/xfce4-panel-profiles/xfce4-panel-profiles.py
@@ -32,8 +32,9 @@ import warnings
 
 import gi
 gi.require_version('Gtk', '3.0')
+gi.require_version('libxfce4ui', '2.0')
 
-from gi.repository import Gtk, GLib, Gio
+from gi.repository import Gtk, GLib, Gio, libxfce4ui
 
 from panelconfig import PanelConfig
 
@@ -302,10 +303,11 @@ class XfcePanelProfiles:
         Gtk.main_quit()
 
     def on_help_clicked(self, *args):
-        '''Navigate to the application documentation on Help click.'''
-        screen = self.window.get_screen()
-        link = "https://docs.xfce.org/apps/xfce4-panel-profiles/start"
-        Gtk.show_uri(screen, link, Gtk.get_current_event_time())
+        '''Shows Xfce's standard help dialog.'''
+        libxfce4ui.dialog_show_help(parent=self.window,
+                                    component='xfce4-panel-profiles',
+                                    page='xfce4-panel-profiles',
+                                    offset=None)
 
 
 class PanelSaveDialog(Gtk.MessageDialog):
-- 
2.21.0


From 3b1a499a832830749281d9ad1ee4efe8d278ddaa Mon Sep 17 00:00:00 2001
From: Emanuele Petriglia <inbox@emanuelepetriglia.com>
Date: Sat, 30 Nov 2019 17:51:21 +0100
Subject: [PATCH 2/2] Use XfceTitledDialog from libxfce4ui

Signed-off-by: Emanuele Petriglia <inbox@emanuelepetriglia.com>
---
 .../xfce4-panel-profiles.glade                | 92 ++-----------------
 xfce4-panel-profiles/xfce4-panel-profiles.py  | 16 +---
 2 files changed, 9 insertions(+), 99 deletions(-)

diff --git a/xfce4-panel-profiles/xfce4-panel-profiles.glade b/xfce4-panel-profiles/xfce4-panel-profiles.glade
index 74966fe..ef9335b 100644
--- a/xfce4-panel-profiles/xfce4-panel-profiles.glade
+++ b/xfce4-panel-profiles/xfce4-panel-profiles.glade
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
+  <requires lib="libxfce4ui-2" version="4.12"/>
   <object class="GtkListStore" id="liststore1">
     <columns>
       <!-- column-name filename -->
@@ -12,100 +12,20 @@
       <column type="gint"/>
     </columns>
   </object>
-  <object class="GtkWindow" id="xfpanel_switch_window">
+  <object class="XfceTitledDialog" id="xfpanel_switch_window">
+    <property name="title" translatable="yes">Panel Profiles</property>
+    <property name="subtitle" translatable="yes">Backup and restore your panel configuration</property>
+    <property name="type_hint">dialog</property>
     <property name="can_focus">False</property>
     <property name="default_width">350</property>
     <property name="default_height">400</property>
     <property name="icon_name">xfce4-panel</property>
     <signal name="delete-event" handler="on_window_destroy" swapped="no"/>
-    <child>
+    <child internal-child="vbox">
       <object class="GtkBox" id="box1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
-        <child>
-          <object class="GtkBox" id="box3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="hexpand">True</property>
-            <property name="vexpand">False</property>
-            <property name="orientation">vertical</property>
-            <child>
-              <object class="GtkEventBox" id="xfce_header">
-                <property name="name">xfce_header</property>
-                <property name="height_request">60</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <object class="GtkBox" id="box2">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="hexpand">True</property>
-                    <property name="vexpand">True</property>
-                    <child>
-                      <object class="GtkImage" id="appicon">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="margin_start">6</property>
-                        <property name="margin_top">1</property>
-                        <property name="pixel_size">48</property>
-                        <property name="icon_name">xfce4-panel</property>
-                        <property name="icon_size">6</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="apptitle">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="margin_start">12</property>
-                        <property name="label" translatable="yes">&lt;b&gt;&lt;big&gt;Panel Profiles&lt;/big&gt;&lt;/b&gt;
-Backup and restore your panel configuration</property>
-                        <property name="use_markup">True</property>
-                        <property name="ellipsize">end</property>
-                        <property name="xalign">0</property>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                </child>
-                <style>
-                  <class name="XfceHeading"/>
-                </style>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkSeparator" id="separator1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</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="GtkAlignment" id="alignment1">
             <property name="visible">True</property>
diff --git a/xfce4-panel-profiles/xfce4-panel-profiles.py b/xfce4-panel-profiles/xfce4-panel-profiles.py
index 4aef3a8..c1d610a 100644
--- a/xfce4-panel-profiles/xfce4-panel-profiles.py
+++ b/xfce4-panel-profiles/xfce4-panel-profiles.py
@@ -51,6 +51,9 @@ class XfcePanelProfiles:
 
     def __init__(self):
         '''Initialize the Panel Profiles application.'''
+        # Temporary fix: https://stackoverflow.com/a/44230815
+        _ = libxfce4ui.TitledDialog()
+
         self.builder = Gtk.Builder()
         self.builder.set_translation_domain('xfce4-panel-profiles')
 
@@ -60,8 +63,6 @@ class XfcePanelProfiles:
         self.builder.connect_signals(self)
 
         self.window = self.builder.get_object("xfpanel_switch_window")
-        self.window.set_title(_("Panel Profiles"))
-        self.fix_xfce_header()
 
         self.load_xfconf()
 
@@ -124,17 +125,6 @@ class XfcePanelProfiles:
             interface,
             cancellable)
 
-    def fix_xfce_header(self):
-        ''' Set background-color of frame to base-color to make it resemble the
-        XfceHeading widget '''
-        self.xfce_header = self.builder.get_object("xfce_header")
-        entry = Gtk.Entry.new()
-        style = entry.get_style_context()
-        base_color = style.lookup_color("theme_base_color")
-        self.xfce_header.override_background_color(0, base_color[1])
-        fg_color = style.lookup_color("theme_fg_color")
-        self.xfce_header.override_color(0, fg_color[1])
-
     def get_data_dirs(self):
         dirs = []
         for directory in GLib.get_system_data_dirs():
-- 
2.21.0