From 51bbe4193b97be6b7a4d2a917f7e80ff70f83e9c Mon Sep 17 00:00:00 2001
From: FeuRenard <feurenard@posteo.de>
Date: Sat, 18 May 2019 21:53:05 +0200
Subject: [PATCH] headerbar: Replace Add error label with icon

Validation errors of an entry should be displayed by an icon with a
tooltip explaining the reason.

For the situation when you add a podcast URL I remove the existing
error label and show the former label text as tooltip of an error icon
in the entry.
---
 podcasts-gtk/resources/gtk/headerbar.ui | 12 ----------
 podcasts-gtk/src/headerbar.rs           | 31 ++++++++++++++++---------
 2 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/podcasts-gtk/resources/gtk/headerbar.ui b/podcasts-gtk/resources/gtk/headerbar.ui
index ddbe753..a66d27e 100644
--- a/podcasts-gtk/resources/gtk/headerbar.ui
+++ b/podcasts-gtk/resources/gtk/headerbar.ui
@@ -126,18 +126,6 @@ Tobias Bernard
             <property name="position">1</property>
           </packing>
         </child>
-        <child>
-          <object class="GtkLabel" id="result_label">
-            <property name="can_focus">False</property>
-            <property name="halign">start</property>
-            <property name="label" translatable="yes">You are already subscribed to that feed!</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
       </object>
     </child>
   </object>
diff --git a/podcasts-gtk/src/headerbar.rs b/podcasts-gtk/src/headerbar.rs
index f83999d..8f8dc4c 100644
--- a/podcasts-gtk/src/headerbar.rs
+++ b/podcasts-gtk/src/headerbar.rs
@@ -51,7 +51,6 @@ pub(crate) struct Header {
 #[derive(Debug, Clone)]
 struct AddPopover {
     container: gtk::Popover,
-    result: gtk::Label,
     entry: gtk::Entry,
     add: gtk::Button,
     toggle: gtk::MenuButton,
@@ -108,25 +107,37 @@ impl AddPopover {
         match Url::parse(&url) {
             Ok(u) => {
                 if !dbqueries::source_exists(u.as_str())? {
+                    self.entry
+                        .set_icon_from_icon_name(gtk::EntryIconPosition::Secondary, None);
                     self.add.set_sensitive(true);
-                    self.result.hide();
-                    self.result.set_label("");
                 } else {
+                    self.entry.set_icon_from_icon_name(
+                        gtk::EntryIconPosition::Secondary,
+                        "dialog-error-symbolic",
+                    );
+                    self.entry.set_icon_tooltip_text(
+                        gtk::EntryIconPosition::Secondary,
+                        i18n("You are already subscribed to this show").as_str(),
+                    );
                     self.add.set_sensitive(false);
-                    self.result
-                        .set_label(i18n("You are already subscribed to this show").as_str());
-                    self.result.show();
                 }
                 Ok(())
             }
             Err(err) => {
                 self.add.set_sensitive(false);
                 if !url.is_empty() {
-                    self.result.set_label(i18n("Invalid URL").as_str());
-                    self.result.show();
+                    self.entry.set_icon_from_icon_name(
+                        gtk::EntryIconPosition::Secondary,
+                        "dialog-error-symbolic",
+                    );
+                    self.entry.set_icon_tooltip_text(
+                        gtk::EntryIconPosition::Secondary,
+                        i18n("Invalid URL").as_str(),
+                    );
                     error!("Error: {}", err);
                 } else {
-                    self.result.hide();
+                    self.entry
+                        .set_icon_from_icon_name(gtk::EntryIconPosition::Secondary, None);
                 }
                 Ok(())
             }
@@ -156,13 +167,11 @@ impl Default for Header {
         let add_popover = builder.get_object("add_popover").unwrap();
         let new_url = builder.get_object("new_url").unwrap();
         let add_button = builder.get_object("add_button").unwrap();
-        let result = builder.get_object("result_label").unwrap();
         let add = AddPopover {
             container: add_popover,
             entry: new_url,
             toggle: add_toggle,
             add: add_button,
-            result,
         };
 
         Header {