src/Builder4/ClutterFiles.bjs

src/Builder4/ClutterFiles.vala

diff --git a/src/Builder4/ClutterFiles.bjs b/src/Builder4/ClutterFiles.bjs
index f81172f..0625bf6 100644 (file)
--- a/src/Builder4/ClutterFiles.bjs
+++ b/src/Builder4/ClutterFiles.bjs
@@ -180,21 +180,6 @@
            "$ xns" : "Clutter",
            "* prop" : "layout_manager"
           },
-          {
-           "$ margin_right" : 5,
-           "$ margin_top" : 5,
-           "id" : "+image",
-           "* args" : "JsRender.JsRender file",
-           "* init" : "{\n    Gdk.Pixbuf pixbuf= null;\n    \n    var fname = file.getIconFileName(false);\n\n    try {\n        if (FileUtils.test(fname, FileTest.EXISTS)) {\n            pixbuf = new Gdk.Pixbuf.from_file(fname);\n        } \n    } catch (Error e) {\n        // noop\n    \n    }\n    if (pixbuf == null) {\n        \n        try {\n            if (_this.missing_thumb_pixbuf == null) {\n                    var icon_theme = Gtk.IconTheme.get_default ();\n                    _this.missing_thumb_pixbuf = icon_theme.load_icon (\"package-x-generic\", 92, 0);\n                    _this.missing_thumb_pixbuf.ref();\n                }\n                pixbuf = _this.missing_thumb_pixbuf;\n\n        } catch (Error e) {\n            // noop?\n        }\n    }\n    try {\n        var img = new Clutter.Image();\n        img.set_data(pixbuf.get_pixels(),   \n                            pixbuf.has_alpha \n                              ? Cogl.PixelFormat.RGBA_8888\n                              : Cogl.PixelFormat.RGB_888,\n                            pixbuf.get_width (),\n                pixbuf.get_height (),\n                            pixbuf.get_rowstride ()\n        );\n        this.el.set_content(img);\n    } catch (Error e) {\n        // noop?\n    }\n     // should probably do smarter scaling...\n    \n    \n    this.el.set_size(90, 70);\n}\n",
-           "$ x_expand" : true,
-           "* pack" : "add_child",
-           "xtype" : "Actor",
-           "$ y_align" : "Clutter.ActorAlign.START",
-           "$ margin_left" : 5,
-           "$ xns" : "Clutter",
-           "$ y_expand" : true,
-           "$ x_align" : "Clutter.ActorAlign.START"
-          },
           {
            "* ctor" : "new Clutter.Text.full(\"Sans 10px\", file.nickType(),  Clutter.Color.from_string(\"#fff\"))",
            "id" : "+typetitle",

diff --git a/src/Builder4/ClutterFiles.vala b/src/Builder4/ClutterFiles.vala
index 71bb89a..ee77e9b 100644 (file)
--- a/src/Builder4/ClutterFiles.vala
+++ b/src/Builder4/ClutterFiles.vala
@@ -611,7 +611,6 @@ public class Xcls_ClutterFiles : Object
 
             // my vars (def)
         public JsRender.JsRender file;
-        public Xcls_image image;
         public Xcls_typetitle typetitle;
         public Xcls_title title;
 
@@ -628,18 +627,14 @@ public class Xcls_ClutterFiles : Object
             var child_0 = new Xcls_BoxLayout16( _this );
             child_0.ref();
             this.el.layout_manager = child_0.el;
-            var child_1 = new Xcls_image( _this ,file);
+            var child_1 = new Xcls_typetitle( _this ,file);
             child_1.ref();
             this.el.add_child (  child_1.el  );
-            this.image =  child_1;
-            var child_2 = new Xcls_typetitle( _this ,file);
+            this.typetitle =  child_1;
+            var child_2 = new Xcls_title( _this ,file);
             child_2.ref();
             this.el.add_child (  child_2.el  );
-            this.typetitle =  child_2;
-            var child_3 = new Xcls_title( _this ,file);
-            child_3.ref();
-            this.el.add_child (  child_3.el  );
-            this.title =  child_3;
+            this.title =  child_2;
 
             // init method
 
@@ -686,84 +681,6 @@ public class Xcls_ClutterFiles : Object
         // user defined functions
     }
 
-    public class Xcls_image : Object
-    {
-        public Clutter.Actor el;
-        private Xcls_ClutterFiles  _this;
-
-
-            // my vars (def)
-
-        // ctor
-        public Xcls_image(Xcls_ClutterFiles _owner , JsRender.JsRender file)
-        {
-            _this = _owner;
-            this.el = new Clutter.Actor();
-
-            // my vars (dec)
-
-            // set gobject values
-            this.el.margin_right = 5f;
-            this.el.margin_left = 5f;
-            this.el.x_align = Clutter.ActorAlign.START;
-            this.el.x_expand = true;
-            this.el.y_align = Clutter.ActorAlign.START;
-            this.el.margin_top = 5f;
-            this.el.y_expand = true;
-
-            // init method
-
-            {
-                Gdk.Pixbuf pixbuf= null;
-                
-                var fname = file.getIconFileName(false);
-            
-                try {
-                    if (FileUtils.test(fname, FileTest.EXISTS)) {
-                        pixbuf = new Gdk.Pixbuf.from_file(fname);
-                    } 
-                } catch (Error e) {
-                    // noop
-                
-                }
-                if (pixbuf == null) {
-                    
-                    try {
-                        if (_this.missing_thumb_pixbuf == null) {
-                                var icon_theme = Gtk.IconTheme.get_default ();
-                                _this.missing_thumb_pixbuf = icon_theme.load_icon ("package-x-generic", 92, 0);
-                                _this.missing_thumb_pixbuf.ref();
-                            }
-                            pixbuf = _this.missing_thumb_pixbuf;
-            
-                    } catch (Error e) {
-                        // noop?
-                    }
-                }
-                try {
-                    var img = new Clutter.Image();
-                    img.set_data(pixbuf.get_pixels(),   
-                                        pixbuf.has_alpha 
-                                          ? Cogl.PixelFormat.RGBA_8888
-                                          : Cogl.PixelFormat.RGB_888,
-                                        pixbuf.get_width (),
-                            pixbuf.get_height (),
-                                        pixbuf.get_rowstride ()
-                    );
-                    this.el.set_content(img);
-                } catch (Error e) {
-                    // noop?
-                }
-                 // should probably do smarter scaling...
-                
-                
-                this.el.set_size(90, 70);
-            }
-        }
-
-        // user defined functions
-    }
-
     public class Xcls_typetitle : Object
     {
         public Clutter.Text el;