From 6c6deab3b59b2ebf6123292fb62d189d4919084d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
Date: Fri, 19 Jul 2019 10:18:52 +0200
Subject: [PATCH 1/5] Add editorconfig
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Prompted by tabs in ui files.

Signed-off-by: Guido Günther <guido.gunther@puri.sm>
---
 .editorconfig | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..e1fae6cc5
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,28 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+
+[meson.build]
+indent_size = 2
+tab_size = 2
+indent_style = space
+
+[*.{c,h,h.in}]
+indent_size = 2
+tab_size = 2
+indent_style = space
+max_line_length = 80
+
+[*.css]
+indent_size = 2
+tab_size = 2
+indent_style = space
+
+[*.xml]
+indent_size = 2
+tab_size = 2
+indent_style = space
+
-- 
GitLab


From 4ed3c4f7f0658351658985fa2bb0991dd3e34c3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
Date: Fri, 19 Jul 2019 10:18:52 +0200
Subject: [PATCH 2/5] PolkitAuthPrompt: Make background app paintable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This makes it consistent with the gcr system modal dialogs.

Signed-off-by: Guido Günther <guido.gunther@puri.sm>
---
 src/polkit-auth-prompt.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/polkit-auth-prompt.c b/src/polkit-auth-prompt.c
index 201a32b92..df87ac742 100644
--- a/src/polkit-auth-prompt.c
+++ b/src/polkit-auth-prompt.c
@@ -439,6 +439,7 @@ phosh_polkit_auth_prompt_constructed (GObject *object)
   gtk_entry_set_buffer (GTK_ENTRY (self->entry_password),
                         GTK_ENTRY_BUFFER (self->password_buffer));
 
+  gtk_widget_set_app_paintable(GTK_WIDGET (self), TRUE);
   g_signal_connect (G_OBJECT(self),
                     "draw",
                     G_CALLBACK(draw_cb),
-- 
GitLab


From 345326a1dfe1017d4300456cfe6a0777f8768cda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
Date: Fri, 19 Jul 2019 10:18:52 +0200
Subject: [PATCH 3/5] Use the same style class for gcr and polkit prompts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This makes sure they stay visually consistent.

Signed-off-by: Guido Günther <guido.gunther@puri.sm>
---
 src/style.css                | 14 ++------------
 src/ui/polkit-auth-prompt.ui |  6 +++---
 src/ui/system-prompt.ui      |  2 +-
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/style.css b/src/style.css
index 81a6a9144..25249e05c 100644
--- a/src/style.css
+++ b/src/style.css
@@ -112,18 +112,8 @@ phosh-home, .phosh-panel {
     100% {-gtk-icon-transform: translateY(0); opacity: 0.7}
 }
 
-/* polkit auth agent */
-.phosh-polkit-auth-agent {
-    background-color: black;
-    border: solid 20px;
-    border-color: black;
-}
-
-.phosh-system-prompt {
-    background-color: black;
-}
-
-.phosh-system-dialog {
+/* system modal dialogs (polkit, gcr) */
+.phosh-system-modal-dialog {
     background-color: black;
     border: solid 2px;
     border-color: white;
diff --git a/src/ui/polkit-auth-prompt.ui b/src/ui/polkit-auth-prompt.ui
index 6951d0f9f..3768f4c21 100644
--- a/src/ui/polkit-auth-prompt.ui
+++ b/src/ui/polkit-auth-prompt.ui
@@ -174,9 +174,9 @@
             <property name="width">2</property>
           </packing>
         </child>
-        <child>
-          <placeholder/>
-        </child>
+        <style>
+          <class name="phosh-system-modal-dialog"/>
+        </style>
         <style>
           <class name="phosh-polkit-auth-agent"/>
         </style>
diff --git a/src/ui/system-prompt.ui b/src/ui/system-prompt.ui
index b91b4062a..8ac253a12 100644
--- a/src/ui/system-prompt.ui
+++ b/src/ui/system-prompt.ui
@@ -206,7 +206,7 @@
           <placeholder/>
         </child>
         <style>
-          <class name="phosh-system-dialog"/>
+	  <class name="phosh-system-modal-dialog"/>
         </style>
       </object>
     </child>
-- 
GitLab


From 102a7d2a94d116fe514d8e3769752b22586d38b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
Date: Fri, 19 Jul 2019 10:18:52 +0200
Subject: [PATCH 4/5] PhoshSystemPrompt: Swap ok and cancel
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Conform to GNOME HIG.

Signed-off-by: Guido Günther <guido.gunther@puri.sm>
---
 src/ui/system-prompt.ui | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/ui/system-prompt.ui b/src/ui/system-prompt.ui
index 8ac253a12..2d8a29723 100644
--- a/src/ui/system-prompt.ui
+++ b/src/ui/system-prompt.ui
@@ -133,15 +133,19 @@
           </packing>
         </child>
         <child>
-          <object class="GtkButton" id="btn_cancel">
+          <object class="GtkButton" id="btn_continue">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="can_default">True</property>
-            <property name="receives_default">False</property>
+            <property name="has_default">True</property>
+            <property name="receives_default">True</property>
             <property name="halign">end</property>
             <property name="valign">center</property>
             <property name="margin_top">12</property>
             <property name="use_stock">True</property>
+            <style>
+              <class name="suggested-action"/>
+            </style>
           </object>
           <packing>
             <property name="left_attach">1</property>
@@ -180,19 +184,15 @@
           </packing>
         </child>
         <child>
-          <object class="GtkButton" id="btn_continue">
+          <object class="GtkButton" id="btn_cancel">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="can_default">True</property>
-            <property name="has_default">True</property>
-            <property name="receives_default">True</property>
+            <property name="receives_default">False</property>
             <property name="halign">start</property>
             <property name="valign">center</property>
             <property name="margin_top">12</property>
             <property name="use_stock">True</property>
-            <style>
-              <class name="suggested-action"/>
-            </style>
           </object>
           <packing>
             <property name="left_attach">0</property>
-- 
GitLab


From d7b18c1d9d1ea2b2875930b34a2eda35a37ab50c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
Date: Fri, 19 Jul 2019 10:18:52 +0200
Subject: [PATCH 5/5] PolkitAuthPrompt: Swap ok and cancel.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Conform to GNOME HIG.

Signed-off-by: Guido Günther <guido.gunther@puri.sm>
---
 src/ui/polkit-auth-prompt.ui | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/ui/polkit-auth-prompt.ui b/src/ui/polkit-auth-prompt.ui
index 3768f4c21..29968eda7 100644
--- a/src/ui/polkit-auth-prompt.ui
+++ b/src/ui/polkit-auth-prompt.ui
@@ -131,17 +131,15 @@
             <property name="can_focus">False</property>
             <property name="margin_top">12</property>
             <child>
-              <object class="GtkButton" id="btn_authenticate">
+              <object class="GtkButton" id="btn_cancel">
+                <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">True</property>
+                <property name="receives_default">False</property>
                 <property name="halign">start</property>
                 <property name="valign">center</property>
-                <style>
-                  <class name="suggested-action"/>
-                </style>
+                <property name="use_stock">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -150,15 +148,17 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="btn_cancel">
-                <property name="label">gtk-cancel</property>
+              <object class="GtkButton" id="btn_authenticate">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="receives_default">False</property>
+                <property name="has_default">True</property>
+                <property name="receives_default">True</property>
                 <property name="halign">end</property>
                 <property name="valign">center</property>
-                <property name="use_stock">True</property>
+                <style>
+                  <class name="suggested-action"/>
+                </style>
               </object>
               <packing>
                 <property name="expand">False</property>
-- 
GitLab