From 59c0131f2195c22b3cfc2dc147e474f633893382 Mon Sep 17 00:00:00 2001
From: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
Date: Mon, 18 Jan 2021 14:02:23 +0100
Subject: [PATCH] Use infobar for root warning box

---
 src/process-window.c  | 14 +---------
 src/process-window.ui | 62 ++++++++++++++++++++++++++++++-------------
 2 files changed, 45 insertions(+), 31 deletions(-)

diff --git a/src/process-window.c b/src/process-window.c
index 1536eab..179f988 100644
--- a/src/process-window.c
+++ b/src/process-window.c
@@ -314,19 +314,7 @@ xtm_process_window_init (XtmProcessWindow *window)
 	gtk_widget_show (window->statusbar);
 	gtk_box_pack_start (GTK_BOX (gtk_builder_get_object (window->builder, "graph-vbox")), window->statusbar, FALSE, FALSE, 0);
 
-	if (geteuid () == 0)
-	{
-		GtkCssProvider *css_provider;
-		css_provider = gtk_css_provider_new ();
-		gtk_css_provider_load_from_data (css_provider,
-										"#root-warning { background-color: #e53935; color: #ffffff; }",
-										-1, NULL);
-		gtk_style_context_add_provider_for_screen (gdk_screen_get_default (), GTK_STYLE_PROVIDER (css_provider),
-                                               GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-		g_object_unref (css_provider);
-		gtk_widget_set_name (GTK_WIDGET (gtk_builder_get_object (window->builder, "root-warning-ebox")), "root-warning");
-		gtk_widget_show_all (GTK_WIDGET (gtk_builder_get_object (window->builder, "root-warning-box")));
-	}
+	gtk_widget_set_visible (GTK_WIDGET (gtk_builder_get_object (window->builder, "root-warning-box")), geteuid () == 0);
 
 	window->treeview = xtm_process_tree_view_new ();
 	gtk_widget_show (window->treeview);
diff --git a/src/process-window.ui b/src/process-window.ui
index ca055e4..73a8eab 100644
--- a/src/process-window.ui
+++ b/src/process-window.ui
@@ -90,21 +90,23 @@
           </packing>
         </child>
         <child>
-          <object class="GtkBox" id="root-warning-box">
+          <object class="GtkInfoBar" id="root-warning-box">
+            <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="orientation">vertical</property>
-            <child>
-              <object class="GtkEventBox" id="root-warning-ebox">
-                <property name="visible">True</property>
+            <property name="message_type">warning</property>
+            <child internal-child="action_area">
+              <object class="GtkButtonBox">
                 <property name="can_focus">False</property>
+                <property name="spacing">6</property>
+                <property name="layout_style">end</property>
                 <child>
-                  <object class="GtkLabel" id="root-warning-label">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xpad">6</property>
-                    <property name="ypad">3</property>
-                    <property name="label" translatable="yes">Warning, you are using the root account, you may harm your system.</property>
-                  </object>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
                 </child>
               </object>
               <packing>
@@ -113,13 +115,37 @@
                 <property name="position">0</property>
               </packing>
             </child>
-            <child>
-              <object class="GtkSeparator" id="root-warning-separator">
-                <property name="visible">True</property>
+            <child internal-child="content_area">
+              <object class="GtkBox">
                 <property name="can_focus">False</property>
+                <property name="spacing">16</property>
+                <child>
+                  <object class="GtkImage">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="icon_name">dialog-warning-symbolic</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">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child type="center">
+              <object class="GtkLabel">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">You are using the root account, you may harm your system.</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
                 <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
@@ -127,8 +153,8 @@
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">2</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
           </packing>
         </child>
         <child>
@@ -291,7 +317,7 @@
           <packing>
             <property name="expand">True</property>
             <property name="fill">True</property>
-            <property name="position">3</property>
+            <property name="position">4</property>
           </packing>
         </child>
       </object>