From bf6e9617ec4ca4f3bb6e41f661ee129e2ed13784 Mon Sep 17 00:00:00 2001
From: DYefremov <dmitry.v.yefremov@gmail.com>
Date: Sat, 30 Oct 2021 18:25:20 +0300
Subject: [PATCH] header bar changes in the backup dialog

---
 app/ui/backup.py           | 20 +++++++++++++++++++-
 app/ui/backup_dialog.glade |  2 +-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/app/ui/backup.py b/app/ui/backup.py
index 9815718c..5885b108 100644
--- a/app/ui/backup.py
+++ b/app/ui/backup.py
@@ -38,7 +38,7 @@ from app.commons import run_idle
 from app.settings import SettingsType, SEP
 from app.ui.dialogs import show_dialog, DialogType, get_builder
 from app.ui.main_helper import append_text_to_tview
-from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, KeyboardKey, MOD_MASK
+from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, KeyboardKey, MOD_MASK, IS_GNOME_SESSION
 
 
 class RestoreType(Enum):
@@ -74,6 +74,24 @@ class BackupDialog:
         self._info_check_button = builder.get_object("info_check_button")
         self._info_bar = builder.get_object("info_bar")
         self._message_label = builder.get_object("message_label")
+
+        if IS_GNOME_SESSION:
+            header_bar = Gtk.HeaderBar(visible=True, show_close_button=True)
+            self._dialog_window.set_titlebar(header_bar)
+
+            button_box = builder.get_object("main_button_box")
+            button_box.set_margin_top(0)
+            button_box.set_margin_bottom(0)
+            button_box.set_margin_left(0)
+            button_box.reparent(header_bar)
+
+            ch_button = builder.get_object("info_check_button")
+            ch_button.set_margin_right(0)
+            h_bar = builder.get_object("header_bar")
+            h_bar.remove(ch_button)
+            h_bar.set_visible(False)
+            header_bar.pack_end(ch_button)
+
         # Setting the last size of the dialog window if it was saved
         window_size = self._settings.get("backup_tool_window_size")
         if window_size:
diff --git a/app/ui/backup_dialog.glade b/app/ui/backup_dialog.glade
index ef725731..dcb43305 100644
--- a/app/ui/backup_dialog.glade
+++ b/app/ui/backup_dialog.glade
@@ -124,7 +124,6 @@ Author: Dmitriy Yefremov
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
-        <property name="spacing">5</property>
         <child>
           <object class="GtkBox" id="header_bar">
             <property name="visible">True</property>
@@ -232,6 +231,7 @@ Author: Dmitriy Yefremov
           <object class="GtkPaned" id="main_paned">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
+            <property name="margin_top">5</property>
             <property name="margin_left">5</property>
             <property name="margin_right">5</property>
             <property name="margin_bottom">5</property>