Changeset cafd66941f4c7a020c73c26bd7383c6bcf522fb9

Timestamp:

07/29/08 11:25:01 (4 months ago)

Author:

Dave Foster <daf@minuslab.net>

git-committer:

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

git-parent:

[90ee6b7c31468b9b240ffdce54f2f6e4345f1608]

git-author:

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

Message:

Better rounded tree model record, added stub for currently set bg display.

Files:

• src/NWindow.cc (modified) (3 diffs)
• src/Thumbview.cc (modified) (9 diffs)
• src/Thumbview.h (modified) (4 diffs)

src/NWindow.cc

@@ -99 +99 @@
-        Gtk::TreeModel::iterator iter = (view.store)->get_iter(path);
-        Gtk::TreeModel::Row row = *iter;
-f
+record.F
-
-}
@@ -113 +113 @@
-        Gtk::TreeModel::iterator iter = view.view.get_selection()->get_selected ();
-        Gtk::TreeModel::Row row = *iter;
-f
+record.F
-        this->set_bg(file);
-
@@ -301 +301 @@
-                for (Gtk::TreeIter iter = view.store->children().begin(); iter != view.store->children().end(); iter++)
-                {
-f
+record.F
-                                view.view.get_selection()->select(iter);
-                                view.view.scroll_to_row(Gtk::TreeModel::Path(iter), 0.5);

src/Thumbview.cc

@@ -67 +67 @@
-                Glib::RefPtr<Gdk::Pixbuf> thumb = base.get();
-
-loadingt
+record.LoadingT
-                {
-                        TreePair* tp = new TreePair();
-f
+record.F
-                        tp->iter = iter;
-
-loadingt
+record.LoadingT
-
-                        Util::program_log("Custom model: planning on loading %s\n", tp->file.c_str());
@@ -94 +94 @@
-        this->aqueue_createthumbs = g_async_queue_new();
-        this->aqueue_donethumbs = g_async_queue_new();  
-
-        // build model record
-        record.add (thumbnail);
-        record.add (description);
-        record.add (filename);
-        record.add (time);
-        record.add (loadingthumb);
-
-        // create store
@@ -124 +117 @@
-        this->col_desc = new Gtk::TreeViewColumn("description", this->rend);
-        
-t
+record.T
-        col_thumb->set_sizing(Gtk::TREE_VIEW_COLUMN_FIXED);
-        col_thumb->set_fixed_width(105);
-d
-f
+record.D
+record.F
-        col_desc->set_sort_indicator (true);
-        col_desc->set_sort_order (Gtk::SORT_ASCENDING);
@@ -137 +130 @@
-
-        // enable search
-d
+record.D
-        view.set_search_equal_func (sigc::mem_fun (this, &Thumbview::search_compare));
-
@@ -176 +169 @@
-        Gtk::TreeModel::Row row = *iter;
-        Glib::RefPtr<Gdk::Pixbuf> thumb = this->loading_image; 
-t
-this->f
-d
+record.T
+record.F
+record.D
-
-        // for modified time
-t
+record.T
-
-        Util::program_log("add_file(): Adding file %s\n", filename.c_str());
@@ -507 +500 @@
-{
-        Gtk::TreeModel::Row row = *iter;
-t
+record.T
-        // desc
-d
+record.D
-
-        // emit a changed signal
@@ -519 +512 @@
- */
-bool Thumbview::search_compare (const Glib::RefPtr<Gtk::TreeModel>& model, int column, const Glib::ustring& key, const Gtk::TreeModel::iterator& iter) {
-d
+record.D
-        if (target.find (key) != Glib::ustring::npos) {
-                return false;
@@ -532 +525 @@
-        switch (mode) {
-                case SORT_ALPHA:
-d
+record.D
-                        break;
-                case SORT_RALPHA:
-d
+record.D
-                        break;
-                case SORT_TIME:
-t
+record.T
-                        break;
-                case SORT_RTIME:
-t
+record.T
-                        break;
-        }
@@ -562 +555 @@
-        Gtk::TreeModel::Children children = store->children();
-        for (iter = children.begin(); iter != children.end(); iter++) {
-this->f
+record.F
-                if (this_filename == filename) {
-                        // remove this iter.

src/Thumbview.h

@@ -62 +62 @@
-};
-
+/////////////////////////////////////////////////////////////////////////////
+
+/**
+ * Column record for the Thumbview store.
+ */
+class ThumbviewRecord : public Gtk::TreeModelColumnRecord
+{
+    public:
+        ThumbviewRecord()
+        {
+            add(Thumbnail);
+            add(Description);
+            add(Filename);
+            add(Time);
+            add(LoadingThumb);
+            add(CurBGOnDisp);
+        }
+
+                Gtk::TreeModelColumn<Glib::ustring> Filename;
+                Gtk::TreeModelColumn<Glib::ustring> Description;
+                Gtk::TreeModelColumn< Glib::RefPtr<Gdk::Pixbuf> > Thumbnail;
+                Gtk::TreeModelColumn<time_t> Time;
+                Gtk::TreeModelColumn<bool> LoadingThumb;
+        Gtk::TreeModelColumn<Glib::ustring> CurBGOnDisp;
+};
+
+
+/////////////////////////////////////////////////////////////////////////////
+
-class Thumbview : public Gtk::ScrolledWindow {
-        public:
@@ -76 +105 @@
-                void set_dir(std::string indir) { this->dir = indir; }
-                
-                // TODO: make private?
-                Gtk::TreeModelColumn<Glib::ustring> filename;
-                Gtk::TreeModelColumn<Glib::ustring> description;
-                Gtk::TreeModelColumn< Glib::RefPtr<Gdk::Pixbuf> >  thumbnail;
-                Gtk::TreeModelColumn<time_t> time;
-                Gtk::TreeModelColumn<bool> loadingthumb;
-                
-                Glib::RefPtr<DelayLoadingStore> store;
-                Gtk::TreeView view;
-
+
+
-                // dispatcher 
-                Glib::Dispatcher dispatch_thumb;
@@ -100 +123 @@
-                // loading image
-                Glib::RefPtr<Gdk::Pixbuf> loading_image;
-       
+
-        protected:
-
@@ -112 +135 @@
-                void add_file(std::string filename);
-                void handle_dispatch_thumb();
-
-                Gtk::TreeModel::ColumnRecord record;
-                
-                Gtk::TreeViewColumn *col_thumb;