Moved "enabled" functionality into LauncherItem

[simple-launcher] / sla-list.cc

diff --git a/sla-list.cc b/sla-list.cc
index e63e918..7022211 100644 (file)
--- a/sla-list.cc
+++ b/sla-list.cc
@@ -27,7 +27,7 @@
 
 #include "sla-list.h"
 
-SLAList::SLAList(int icon_size, LaunchableItems& items): myWidget(0), myStore(0), myView(0), mySelection(0), myItems(items) {
+SLAList::SLAList(int icon_size, LauncherItems& items): myWidget(0), myStore(0), myView(0), mySelection(0), myItems(items) {
   GtkTreeViewColumn *column;
   GtkCellRenderer *renderer;
 
@@ -87,9 +87,9 @@ SLAList::SLAList(int icon_size, LaunchableItems& items): myWidget(0), myStore(0)
 
   gtk_widget_show_all(myWidget);
 
-  for (LaunchableItems::const_iterator item = myItems.begin(); item != myItems.end(); ++item) {
+  for (LauncherItems::const_iterator item = myItems.begin(); item != myItems.end(); ++item) {
     GtkTreeIter iter;
-    
+
     gtk_list_store_append(myStore, &iter);
     gtk_list_store_set(myStore, &iter, 0, item->second->getIcon(icon_size), 1, item-myItems.begin(), -1);
   }
@@ -123,14 +123,17 @@ void SLAList::renderText(GtkTreeViewColumn *, GtkCellRenderer *cell, GtkTreeMode
   int index;
 
   gtk_tree_model_get(GTK_TREE_MODEL(myStore), iter, 1, &index, -1);
-
+#if 1
   if (gtk_tree_selection_iter_is_selected(mySelection, iter)) {
     gchar *text = g_markup_printf_escaped("%s\n<small>%s</small>", myItems[index].second->getName().c_str(), myItems[index].second->getComment().c_str());
     g_object_set(cell, "markup", text, 0);
     g_free(text);
   } else {
+#endif
     g_object_set(cell, "text", myItems[index].second->getName().c_str(), 0);
+#if 1
   }
+#endif
 }
 
 void SLAList::renderBool(GtkTreeViewColumn *, GtkCellRenderer *cell, GtkTreeModel *model, GtkTreeIter *iter) {
@@ -142,17 +145,13 @@ void SLAList::renderBool(GtkTreeViewColumn *, GtkCellRenderer *cell, GtkTreeMode
 }
 
 void SLAList::toggleBool(GtkCellRendererToggle *renderer, const gchar *spath) {
-  GtkTreePath *path = gtk_tree_path_new_from_string(spath);
+  GtkTreeIter iter;
 
-  if (path != 0) {
-    GtkTreeIter iter;
+  if (gtk_tree_model_get_iter_from_string(GTK_TREE_MODEL(myStore), &iter, spath)) {
+    int index;
 
-    if (gtk_tree_model_get_iter(GTK_TREE_MODEL(myStore), &iter, path)) {
-      int index;
-
-      gtk_tree_model_get(GTK_TREE_MODEL(myStore), &iter, 1, &index, -1);
-      myItems[index].second->toggle();
-    }
+    gtk_tree_model_get(GTK_TREE_MODEL(myStore), &iter, 1, &index, -1);
+    myItems[index].second->toggle();
   }
 }