Changeset 40804560fa72d53834c4466eb3c82b688d970089

Timestamp:

07/30/2008 08:19:41 AM (5 months ago)

Author:

Dave Foster <daf@minuslab.net>

git-committer:

Dave Foster <daf@minuslab.net> 1217431181 -0400

git-parent:

[cafd66941f4c7a020c73c26bd7383c6bcf522fb9]

git-author:

Dave Foster <daf@minuslab.net> 1217428086 -0400

Message:

First try at showing users what is currently saved in text.

Files:

• src/NWindow.cc (modified) (1 diff)
• src/Thumbview.cc (modified) (5 diffs)
• src/Thumbview.h (modified) (1 diff)

src/NWindow.cc

@@ -122 +122 @@
-        // save 
-    Config::get_instance()->set_bg(thedisp, file, mode, bgcolor);
+
+    // tell the row that he's now on thedisp
+    row[view.record.CurBGOnDisp] = thedisp;
+
+    // reload config "cache"
+    view.load_map_setbgs();
+
+    // find items removed by this config set. typically 0 or 1 items, which is the
+    // old background on thedisp, but could be 2 items if xinerama individual bgs
+    // are replaced by the fullscreen xinerama.
+    for (Gtk::TreeIter i = view.store->children().begin(); i != view.store->children().end(); i++)
+        {
+        Glib::ustring curbgondisp = (*i)[view.record.CurBGOnDisp];
+        if (curbgondisp == "")
+            continue;
+
+        std::map<Glib::ustring, Glib::ustring>::iterator mapiter = view.map_setbgs.find(curbgondisp);
+
+        // if filenames don't match, this row must be blanked out!
+        Glib::ustring filename = (*i)[view.record.Filename];
+        if (filename != (*mapiter).second)
+        {
+            (*i)[view.record.CurBGOnDisp] = "";
+            (*i)[view.record.Description] = Glib::ustring(filename, filename.rfind("/")+1);
+        }
+        else
+            (*i)[view.record.Description] = Glib::ustring(filename, filename.rfind("/")+1) + "\n<small><i>" + _("Currently set background for") + (*mapiter).first + "</i></small>";
+    }
-
-    if (!this->is_multihead || thedisp == "xin_-1")

src/Thumbview.cc

@@ -88 +88 @@
-Thumbview::Thumbview() : dir("") {
-        set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
-
+
+
+
+
-
-        // make our async queues
@@ -120 +123 @@
-        col_thumb->set_sizing(Gtk::TREE_VIEW_COLUMN_FIXED);
-        col_thumb->set_fixed_width(105);
-text
+markup
-        col_desc->set_sort_column (record.Filename);
-        col_desc->set_sort_indicator (true);
@@ -172 +175 @@
-        row[record.Filename] = filename;
-        row[record.Description] = Glib::ustring(filename, filename.rfind ("/")+1);
+
+    for (std::map<Glib::ustring, Glib::ustring>::iterator i = map_setbgs.begin(); i!=map_setbgs.end(); i++)
+    {
+        if (filename == (*i).second)
+        {
+            row[record.CurBGOnDisp] = (*i).first;
+            row[record.Description] = Glib::ustring(filename, filename.rfind("/")+1) + "\n<i>" + _("Currently set background for") + " " + (*i).first + "</i>";
+        }
+    }
-
-        // for modified time
@@ -502 +514 @@
-        row[record.Thumbnail] = pb;
-        // desc
-
+//
-
-        // emit a changed signal
@@ -539 +551 @@
-}
-
+/**
+ * Loads the map of displays and their set bgs. Used to indicate which
+ * files are currently set as a background.
+ */
+void Thumbview::load_map_setbgs()
+{
+    map_setbgs.clear();
+    
+    std::vector<Glib::ustring> vecgroups;
+    bool ret = Config::get_instance()->get_bg_groups(vecgroups);
+    if (!ret)
+        return;
+
+    for (std::vector<Glib::ustring>::iterator i = vecgroups.begin(); i!=vecgroups.end(); i++)
+    {
+        Glib::ustring file;
+        SetBG::SetMode mode;
+        Gdk::Color bgcolor;
+
+        ret = Config::get_instance()->get_bg(*i, file, mode, bgcolor);
+        if (!ret)
+        {
+            std::cerr << "(load_map_setbgs) Could not get background stored info for " << *i << "\n";
+            return;
+        }
+
+        map_setbgs[*i] = file;
+    }
+}
+
-#ifdef USE_INOTIFY
-

src/Thumbview.h

@@ -123 +123 @@
-                // loading image
-                Glib::RefPtr<Gdk::Pixbuf> loading_image;
+
+        // "cache" of config - maps displays to full filenames
+        std::map<Glib::ustring, Glib::ustring> map_setbgs;
+        void load_map_setbgs();
-        
-        protected: