From 021f120926893810ed8e3641dcb5684bfc119136 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?=
 =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= <mh@calculate.ru>
Date: Fri, 23 Nov 2018 10:59:12 +0300
Subject: [PATCH] =?UTF-8?q?Patch:=20=D0=BF=D0=B0=D1=82=D1=87=20=D0=BD?=
 =?UTF-8?q?=D0=B0=20lxqt-session?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* исправлен внешний вид кнопки отмена в диалоговом окне завершения
сессии
---
 .../lxqt-session/.calculate_directory         |  1 +
 .../lxqt-session-dialog_button.patch          | 24 +++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 profiles/templates/3.6/6_ac_install_patch/lxqt-base/lxqt-session/.calculate_directory
 create mode 100644 profiles/templates/3.6/6_ac_install_patch/lxqt-base/lxqt-session/lxqt-session-dialog_button.patch

diff --git a/profiles/templates/3.6/6_ac_install_patch/lxqt-base/lxqt-session/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/lxqt-base/lxqt-session/.calculate_directory
new file mode 100644
index 000000000..615bc8bdf
--- /dev/null
+++ b/profiles/templates/3.6/6_ac_install_patch/lxqt-base/lxqt-session/.calculate_directory
@@ -0,0 +1 @@
+# Calculate append=skip merge()!=
diff --git a/profiles/templates/3.6/6_ac_install_patch/lxqt-base/lxqt-session/lxqt-session-dialog_button.patch b/profiles/templates/3.6/6_ac_install_patch/lxqt-base/lxqt-session/lxqt-session-dialog_button.patch
new file mode 100644
index 000000000..769cbfb01
--- /dev/null
+++ b/profiles/templates/3.6/6_ac_install_patch/lxqt-base/lxqt-session/lxqt-session-dialog_button.patch
@@ -0,0 +1,24 @@
+# Calculate format=diff
+diff --git a/lxqt-leave/leavedialog.ui b/lxqt-leave/leavedialog.ui
+index c418949..34cf24c 100644
+--- a/lxqt-leave/leavedialog.ui
++++ b/lxqt-leave/leavedialog.ui
+@@ -46,17 +46,10 @@
+        </spacer>
+       </item>
+       <item>
+-       <widget class="QToolButton" name="cancelButton">
++       <widget class="QPushButton" name="cancelButton">
+         <property name="text">
+          <string>Cancel</string>
+         </property>
+-        <property name="icon">
+-         <iconset theme="dialog-cancel">
+-          <normaloff>.</normaloff>.</iconset>
+-        </property>
+-        <property name="toolButtonStyle">
+-         <enum>Qt::ToolButtonTextBesideIcon</enum>
+-        </property>
+        </widget>
+       </item>
+      </layout>