set action icon when entering text

blahgeek · Jul 22, 2017 · 0e0e974 · 0e0e974
1 parent dde6016
commit 0e0e974
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 9 deletions.
diff --git a/src/frontend_gtk/app.rs b/src/frontend_gtk/app.rs
@@ -2,7 +2,7 @@
 * @Author: BlahGeek
 * @Date:   2017-04-23
 * @Last Modified by:   BlahGeek
-* @Last Modified time: 2017-07-20
+* @Last Modified time: 2017-07-22
 */
 
 extern crate glib;
@@ -103,23 +103,23 @@ impl MinionsApp {
             Status::Initial => {
                 self.ui.set_entry(None);
                 self.ui.set_filter_text("");
-                self.ui.set_action_name(None);
+                self.ui.set_action(None);
                 self.ui.set_reference(None);
                 self.ui.set_items(Vec::new(), -1, &self.ctx);
                 self.ui.set_spinning(false);
             },
             Status::Running(_) => {
                 self.ui.set_entry(None);
                 self.ui.set_filter_text("");
-                self.ui.set_action_name(None);
+                self.ui.set_action(None);
                 self.ui.set_reference(None);
                 self.ui.set_items(Vec::new(), -1, &self.ctx);
                 self.ui.set_spinning(true);
             },
             Status::Error(ref error) => {
                 self.ui.set_entry(None);
                 self.ui.set_filter_text("");
-                self.ui.set_action_name(None);
+                self.ui.set_action(None);
                 self.ui.set_reference(None);
                 self.ui.set_items(Vec::new(), -1, &self.ctx);
                 self.ui.set_spinning(false);
@@ -129,7 +129,7 @@ impl MinionsApp {
                 self.ui.set_spinning(false);
                 self.ui.set_entry(None);
                 self.ui.set_filter_text("");
-                self.ui.set_action_name(None);
+                self.ui.set_action(None);
                 self.ui.set_reference(self.ctx.reference.as_ref());
                 if self.ctx.list_items.len() == 0 {
                     warn!("No more listing items!");
@@ -155,7 +155,7 @@ impl MinionsApp {
                 }
                 self.ui.set_spinning(false);
                 self.ui.set_filter_text(&filter_text);
-                self.ui.set_action_name(None);
+                self.ui.set_action(None);
                 self.ui.set_reference(self.ctx.reference.as_ref());
                 self.ui.set_items(filter_indices.iter().map(|x| &self.ctx.list_items[x.clone()])
                                   .collect::<Vec<&Item>>(), selected_idx, &self.ctx);
@@ -179,7 +179,7 @@ impl MinionsApp {
 
                 self.ui.set_filter_text("");
                 // self.ui.set_reference_item(Some(&self.ctx.list_items[idx]));
-                self.ui.set_action_name(Some(&self.ctx.list_items[idx].title));
+                self.ui.set_action(Some(&self.ctx.list_items[idx]));
                 self.ui.set_reference(None);
                 self.ui.set_items(Vec::new(), -1, &self.ctx);
             }

diff --git a/src/frontend_gtk/ui.rs b/src/frontend_gtk/ui.rs
@@ -2,7 +2,7 @@
 * @Author: BlahGeek
 * @Date:   2017-04-22
 * @Last Modified by:   BlahGeek
-* @Last Modified time: 2017-07-15
+* @Last Modified time: 2017-07-22
 */
 
 extern crate gdk_pixbuf;
@@ -150,7 +150,7 @@ impl MinionsUI {
         }
     }
 
-    pub fn set_action_name(&self, name: Option<&str>) {
+    fn set_action_name(&self, name: Option<&str>) {
         let action_box = self.window_builder.get_object::<gtk::Box>("action_box").unwrap();
         let action_name = self.window_builder.get_object::<gtk::Label>("action_name").unwrap();
         if let Some(name) = name {
@@ -161,6 +161,17 @@ impl MinionsUI {
         }
     }
 
+    pub fn set_action(&self, item: Option<&Item>) {
+        if let Some(item) = item {
+            if let Some(ref ico) = item.icon {
+                set_image_icon(&self.icon, &self.icon_text, ico);
+            }
+            self.set_action_name(Some(&item.title));
+        } else {
+            self.set_action_name(None)
+        }
+    }
+
     fn build_item(item: &Item, ctx: &Context) -> gtk::Box {
         let builder = gtk::Builder::new_from_string(include_str!("resource/item_template.glade"));
         let item_ui = builder.get_object::<gtk::Box>("item_template")