Merge lp:~davysson/daily/animations into lp:daily

[DavyS]

Unmerged revisions

17. By DavyS on 2012-07-07

added animations

=== modified file 'CMakeFiles/CMakeDetermineCompilerABI_C.bin' (properties changed: +x to -x)
=== modified file 'CMakeFiles/CMakeDetermineCompilerABI_CXX.bin' (properties changed: +x to -x)
=== modified file 'CMakeFiles/CompilerIdC/a.out' (properties changed: +x to -x)
=== modified file 'CMakeFiles/CompilerIdCXX/a.out' (properties changed: +x to -x)
=== modified file 'cmake/CMakeFiles/CMakeDetermineCompilerABI_C.bin' (properties changed: +x to -x)
=== modified file 'cmake/CMakeFiles/CMakeDetermineCompilerABI_CXX.bin' (properties changed: +x to -x)
=== modified file 'cmake/CMakeFiles/CompilerIdC/a.out' (properties changed: +x to -x)
=== modified file 'cmake/CMakeFiles/CompilerIdCXX/a.out' (properties changed: +x to -x)
=== modified file 'src/Content.vala' (properties changed: +x to -x)
--- src/Content.vala	2012-07-06 02:56:57 +0000
+++ src/Content.vala	2012-07-07 04:41:20 +0000
@@ -14,15 +14,15 @@
             insert (0, c);
             added ();
             c.clicked.connect ((item) => {
-				active_changed(index_of (c));
-				});
+                active_changed(index_of (c));
+                });
         }
         
         public void on_click (){
-			
-			
-			
-		}
+            
+            
+            
+        }
         
     }
     
@@ -68,33 +68,33 @@
             
             try {
                 if (image_path != null){
-					
-					var img = new Gdk.Pixbuf.from_file (image_path);
-					var scale = img.scale_simple (128, 128, Gdk.InterpType.BILINEAR);
-					scale.composite (pix, 5, 5, 118, 118, 0, 0, 1, 1, Gdk.InterpType.BILINEAR, 255);
-				}
-				
+                    
+                    var img = new Gdk.Pixbuf.from_file (image_path);
+                    var scale = img.scale_simple (128, 128, Gdk.InterpType.BILINEAR);
+                    scale.composite (pix, 5, 5, 118, 118, 0, 0, 1, 1, Gdk.InterpType.BILINEAR, 255);
+                }
+                
                 image_without_new = new Image.from_pixbuf (pix.copy ());
                 
             } catch (Error e){ warning (e.message); }
                 
             try {
-				
-				Gdk.Pixbuf img = new Gdk.Pixbuf.from_file (build_pkg_data_dir+"/images/new.png");
-				img.composite (pix, 3, 3, 37, 37, 0, 0, 1, 1, Gdk.InterpType.BILINEAR, 255);
-				image_with_new = new Image.from_pixbuf (pix);
-				
-			} catch (Error e){ warning (e.message); }
-			
+                
+                Gdk.Pixbuf img = new Gdk.Pixbuf.from_file (build_pkg_data_dir+"/images/new.png");
+                img.composite (pix, 3, 3, 37, 37, 0, 0, 1, 1, Gdk.InterpType.BILINEAR, 255);
+                image_with_new = new Image.from_pixbuf (pix);
+                
+            } catch (Error e){ warning (e.message); }
+            
             if (with_new){
-				
-				return image_with_new;
-				
-			} else {
-				
-				return image_without_new;
-				
-			}
+                
+                return image_with_new;
+                
+            } else {
+                
+                return image_without_new;
+                
+            }
             
         }
                 
@@ -103,28 +103,28 @@
             return "by " + author + " in " + site + " on posted " + date;
             
         }
-        		
-		private Box build_grid_box (){
-			
-			var image = create_image (image_path);
-			bool first_update = true;
-			update_image.connect (() => {
-				if (first_update){
-					image.set_from_pixbuf (create_image(image_path, false).pixbuf);
-					first_update = false;
-				}
-				});
+                
+        private Box build_grid_box (){
+            
+            var image = create_image (image_path);
+            bool first_update = true;
+            update_image.connect (() => {
+                if (first_update){
+                    image.set_from_pixbuf (create_image(image_path, false).pixbuf);
+                    first_update = false;
+                }
+                });
             
             var image_event = new EventBox ();
             image_event.visible_window = false;
             image_event.border_width = 0;
             image_event.add (image);
             image_event.button_press_event.connect (() => {
-				update_image ();
-				clicked ();
-				return false;
-				});
-				
+                update_image ();
+                clicked ();
+                return false;
+                });
+                
             string css_style = " * { font-size: 10 } ";
             
             var css = new CssProvider ();
@@ -146,28 +146,28 @@
             main_box.pack_start (title, false);
             
             return main_box;
-			
-		}
-		
-		private Box build_left_list_box (){
-			
-			var image = create_image (image_path);
-			bool first_update = true;
-			update_image.connect (() => {
-				if (first_update){
-					image.set_from_pixbuf (create_image(image_path, false).pixbuf);
-					first_update = false;
-				}
-				});
+            
+        }
+        
+        private Box build_left_list_box (){
+            
+            var image = create_image (image_path);
+            bool first_update = true;
+            update_image.connect (() => {
+                if (first_update){
+                    image.set_from_pixbuf (create_image(image_path, false).pixbuf);
+                    first_update = false;
+                }
+                });
             
             var image_event = new EventBox ();
             image_event.visible_window = false;
             image_event.add (image);
             image_event.button_press_event.connect (() => {
-				update_image ();
-				clicked ();
-				return false;
-				});
+                update_image ();
+                clicked ();
+                return false;
+                });
             
             var main_box = new Box (Orientation.VERTICAL, 0);
             main_box.halign = Align.START;
@@ -188,9 +188,6 @@
             title.get_style_context ().add_class ("title");
             title.get_style_context ().add_provider (css, 10000);
             
-            var title_event = new EventBox ();
-            title_event.add (title);
-            
             var post_info = new Label (post_info ());
             post_info.set_alignment (0, 0);
             post_info.get_style_context ().add_class ("post_info");
@@ -209,17 +206,17 @@
             content_box.pack_start (image_event);
             content_box.pack_start (content);
             
-            main_box.pack_start (title_event, false);
+            main_box.pack_start (title, false);
             main_box.pack_start (post_info, false);
             main_box.pack_start (content_box, false);
             
             return main_box;
-			
-		}
-		
-		private Box build_right_list_box (){
-			
-			var main_box = new Box (Orientation.VERTICAL, 0);
+            
+        }
+        
+        private Box build_right_list_box (){
+            
+            var main_box = new Box (Orientation.VERTICAL, 0);
             main_box.halign = Align.START;
             main_box.margin_left = 12;
             main_box.margin_right = 12;
@@ -248,19 +245,24 @@
             
             main_box.pack_start (title, false);
             main_box.pack_start (content, false);
-			
-			return main_box;
-			
-		}
-		
-		public Gtk.Box build_content_box (){
-			
-			//not implemented yet.
-			var main_box = new Box (Orientation.HORIZONTAL, 0);
-			
-			return main_box;
-			
-		}
+            
+            return main_box;
+            
+        }
+        
+        public Gtk.Box build_content_box (){
+            
+            //not implemented yet.
+            var main_box = new Box (Orientation.HORIZONTAL, 0);
+            
+            var label = new Label ("Not Implemented Yet");
+            label.valign = label.halign = Align.CENTER;
+            
+            main_box.add (label);
+            
+            return main_box;
+            
+        }
         
     }
     

=== modified file 'src/Main.vala' (properties changed: +x to -x)
--- src/Main.vala	2012-07-06 02:56:57 +0000
+++ src/Main.vala	2012-07-07 04:41:20 +0000
@@ -22,7 +22,7 @@
 
     public static int main (string[] args) {
 
-        Gtk.init (ref args);
+        GtkClutter.init (ref args);
         return new Application ().run (args);
 
     }
@@ -102,7 +102,7 @@
             window.set_default_size(810, 510);
             window.window_position = Gtk.WindowPosition.CENTER;
             window.destroy.connect (Gtk.main_quit);
-             
+                         
             var contents = new Content ();
             contents.add (new ContentItem (null, "Game Store Gameolith Expands Horizons, No Longer Linux-Only", "", "", "", "", ""));
             contents.add (new ContentItem (null, "Title", "DavyS", "june 15, 2012", "elementaryOS", "Lorem Ipsum", ""));
@@ -118,14 +118,6 @@
             var list_view = new ListView (contents);
             var content_view = new ContentView (contents);
             
-            var notebook = new Gtk.Notebook ();
-            notebook.show_tabs = false;
-            notebook.show_border = false;
-            notebook.append_page (grid_view);
-            notebook.append_page (list_view);
-            notebook.append_page (content_view);
-            notebook.page = notebook.page_num (grid_view);
-            
             var mode_button = new Granite.Widgets.ModeButton ();
             
             mode_button.append_icon ("view-grid-symbolic", Gtk.IconSize.MENU);
@@ -133,43 +125,11 @@
             
             mode_button.set_active (0);
             
-            // grid button
-            ((Gtk.ToggleButton) mode_button.get_children ().nth_data (0)).clicked.connect (() => {
-				notebook.page = notebook.page_num (grid_view);
-                });
-                
-            // list button
-            ((Gtk.ToggleButton) mode_button.get_children ().nth_data (1)).clicked.connect (() => {
-				notebook.page = notebook.page_num (list_view);
-                });
+            //buttons
                 
             var add = new Gtk.Button ();
             add.add (new Gtk.Image.from_icon_name ("list-add-symbolic", Gtk.IconSize.MENU));
-            add.clicked.connect (() => {
-				
-				//need fix multiple instances!!
-				
-				var pop = new Daily.Widgets.PopOver ();
-                var content = pop.get_content_area ();
-                content.set_size_request (300, 200);
-                
-                var source = new Gtk.Label ("Feed Source");
-                //source.valign = source.halign = Gtk.Align.START;
-                
-                var hbox = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
-                
-                var add_label = new Gtk.Label ("Add Link:");
-                var add_entry = new Gtk.Entry ();
-                
-                hbox.pack_start (add_label, false);
-                hbox.pack_start (add_entry);
-                
-                content.pack_start (source, false);
-                content.pack_start (hbox, false);
-                pop.move_to_widget (add);
-                pop.show_all ();
-				
-				});
+            
             
             var about = new Gtk.Button ();
             about.add (new Gtk.Image.from_icon_name ("dialog-information-symbolic", Gtk.IconSize.MENU));
@@ -193,13 +153,7 @@
             
             string current_url = "";
             
-            open.clicked.connect (() => {
-				
-				try{
-					Gtk.show_uri (null, current_url, Gdk.CURRENT_TIME);
-				} catch (Error e){ warning (e.message); };
-				
-				});
+            //toolbar
             
             var control_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
             control_box.pack_start (prev, false);
@@ -223,18 +177,108 @@
             hbox2.pack_start (about, false);
             hbox2.pack_start (add, false);
             hbox2.pack_end (mode_button, false);
-            
-            var box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
-            box.pack_start (notebook);
+				
+			//Animations	
+				
+			//grid clutter embed actor
+				
+			var grid_embed = new GtkClutter.Embed ();
+			var grid_actor = new GtkClutter.Actor.with_contents (grid_view);
+			grid_actor.show_all ();
+			
+			grid_embed.get_stage ().add_child (grid_actor);
+			(grid_embed.get_stage () as Clutter.Stage).use_alpha = true;
+			
+			grid_actor.add_constraint (new Clutter.BindConstraint (grid_embed.get_stage (), 
+                Clutter.BindCoordinate.WIDTH, 0));
+            grid_actor.add_constraint (new Clutter.BindConstraint (grid_embed.get_stage (), 
+                Clutter.BindCoordinate.HEIGHT, 0));
+                
+            //list clutter embed actor    
+                
+            var list_embed = new GtkClutter.Embed ();
+			var list_actor = new GtkClutter.Actor.with_contents (list_view);
+			list_actor.show_all ();
+			
+			list_embed.get_stage ().add_child (list_actor);
+			(list_embed.get_stage () as Clutter.Stage).use_alpha = true;
+			
+			list_actor.add_constraint (new Clutter.BindConstraint (list_embed.get_stage (), 
+                Clutter.BindCoordinate.WIDTH, 0));
+            list_actor.add_constraint (new Clutter.BindConstraint (list_embed.get_stage (), 
+                Clutter.BindCoordinate.HEIGHT, 0));	
+                
+            list_actor.x = list_embed.get_stage ().width;
+            list_actor.opacity = 0;
+            
+            //content clutter embed actor
+            
+            var content_embed = new GtkClutter.Embed ();
+			var content_actor = new GtkClutter.Actor.with_contents (content_view);
+			content_actor.show_all ();
+			
+			content_embed.get_stage ().add_child (content_actor);
+			(content_embed.get_stage () as Clutter.Stage).use_alpha = true;
+			
+			content_actor.add_constraint (new Clutter.BindConstraint (content_embed.get_stage (), 
+                Clutter.BindCoordinate.WIDTH, 0));
+            content_actor.add_constraint (new Clutter.BindConstraint (content_embed.get_stage (), 
+                Clutter.BindCoordinate.HEIGHT, 0));	
+                
+            content_actor.opacity = 0;
+            
+            //fix background color
+            
+            //(grid_embed.get_stage () as Clutter.Stage).set_color ({222, 222, 222, 255});
+            //(list_embed.get_stage () as Clutter.Stage).set_color ({222, 222, 222, 255});
+            //(content_embed.get_stage () as Clutter.Stage).set_color ({240, 240, 240, 255});
+            
+            //notebook
+			
+			var notebook = new Gtk.Notebook ();
+			notebook.show_border = false;
+			notebook.show_tabs = false;
+			notebook.append_page (grid_embed, null);
+			notebook.append_page (list_embed, null);
+            notebook.append_page (content_embed, null);
+			
+			notebook.page = notebook.page_num (list_embed);
+			
+			var box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
+			
+			box.pack_start (notebook);
             box.pack_end (hbox2, false);
-            
-            int previous_page = 0;
+			
+            window.add (box);
+            
+            //Events
+            
+			int previous_page = 0;
             
             contents.active_changed.connect ((id) => {
 				content_view.page = content_view.page_num (contents.get (id).content_box);
 				previous_page = notebook.page;
-				notebook.page = notebook.page_num (content_view);
 				
+				if (notebook.page == notebook.page_num (grid_embed)){
+					
+					grid_actor.animate (Clutter.AnimationMode.EASE_OUT_QUAD, 400, opacity: 0).completed.connect (() => {
+						
+						notebook.page = notebook.page_num (content_embed);
+						content_actor.animate (Clutter.AnimationMode.EASE_IN_QUAD, 400, opacity: 255);
+						
+						});
+					
+				} else if (notebook.page == notebook.page_num (list_embed)) {
+					
+					list_actor.animate (Clutter.AnimationMode.EASE_OUT_QUAD, 400, opacity: 0).completed.connect (() => {
+						
+						notebook.page = notebook.page_num (content_embed);
+						content_actor.animate (Clutter.AnimationMode.EASE_IN_QUAD, 400, opacity: 255);
+						
+						});
+					
+				}
+								
 				current_url = contents.get (id).url;
 				
 				box.remove (hbox2);
@@ -242,14 +286,91 @@
 				box.show_all ();
 				});
 				
+				
             back.clicked.connect (() => {
+				
+				content_actor.animate (Clutter.AnimationMode.EASE_OUT_QUAD, 400, opacity: 0).completed.connect (() => {
+					
+					notebook.page = previous_page;
+					if (previous_page == notebook.page_num (grid_embed)){
+						
+						grid_actor.animate (Clutter.AnimationMode.EASE_IN_QUAD, 400, opacity: 255);
+						
+					} else if (previous_page == notebook.page_num (list_embed)){
+						
+						list_actor.animate (Clutter.AnimationMode.EASE_IN_QUAD, 400, opacity: 255);
+						
+					}
+					
+					});
+				
 				notebook.page = previous_page;
 				box.remove (hbox1);
 				box.pack_end (hbox2, false);
 				box.show_all ();
 				});
             
-            window.add (box);
+            // grid button, switch to grid
+            (mode_button.get_children ().nth_data (0) as Gtk.ToggleButton).toggled.connect (() => {
+				if ((mode_button.get_children ().nth_data (0) as Gtk.ToggleButton).active){
+										
+					list_actor.animate (Clutter.AnimationMode.EASE_IN_QUAD, 400, x:grid_embed.get_stage ().width, 
+                    opacity:0).completed.connect (() => {
+						
+						notebook.page = notebook.page_num (grid_embed);
+						grid_actor.animate (Clutter.AnimationMode.EASE_OUT_QUAD, 400, x:0.0f, opacity:255);
+						});
+					
+				}
+                });
+                
+            // list button, switch to list
+            (mode_button.get_children ().nth_data (1) as Gtk.ToggleButton).toggled.connect (() => {
+				if ((mode_button.get_children ().nth_data (1) as Gtk.ToggleButton).active){
+                
+					grid_actor.animate (Clutter.AnimationMode.EASE_IN_QUAD, 400, x:-grid_embed.get_stage ().width, 
+                    opacity:0).completed.connect (() => {
+                        
+						notebook.page = notebook.page_num (list_embed);
+						list_actor.animate (Clutter.AnimationMode.EASE_OUT_QUAD, 400, x:0.0f, opacity:255);
+						});					
+				}
+                });
+                
+            add.clicked.connect (() => {
+				
+				//need fix multiple instances!!
+				
+				var pop = new Daily.Widgets.PopOver ();
+                var content = pop.get_content_area ();
+                content.set_size_request (300, 200);
+                
+                var source = new Gtk.Label ("Feed Source");
+                //source.valign = source.halign = Gtk.Align.START;
+                
+                var hbox = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
+                
+                var add_label = new Gtk.Label ("Add Link:");
+                var add_entry = new Gtk.Entry ();
+                
+                hbox.pack_start (add_label, false);
+                hbox.pack_start (add_entry);
+                
+                content.pack_start (source, false);
+                content.pack_start (hbox, false);
+                pop.move_to_widget (add);
+                pop.show_all ();
+				
+				});
+				
+				
+			open.clicked.connect (() => {
+				
+				try{
+					Gtk.show_uri (null, current_url, Gdk.CURRENT_TIME);
+				} catch (Error e){ warning (e.message); };
+				
+				});
 
         }
     } 

=== modified file 'src/Widgets/ContentView.vala' (properties changed: +x to -x)
--- src/Widgets/ContentView.vala	2012-07-05 04:39:46 +0000
+++ src/Widgets/ContentView.vala	2012-07-07 04:41:20 +0000
@@ -25,60 +25,60 @@
 using Granite.Widgets;
 
 namespace Daily.Widgets {
-	
-	public class ContentView : Notebook {
-		
-		private Content c;
-		
-		public ContentView (Content content){
-			
-			c = content;
-			c.added.connect (update);
-			c.removed.connect (update);
-			show_border = false;
-			show_tabs = false;
-			
-			update ();
-		}
-		
-		public void update (){
-			
-			clear ();
-			
-			if (!c.is_empty){
-				
-				int last = c.index_of (c.last ());
-				
-				for (int i = 0; i <= last; i++){
+    
+    public class ContentView : Notebook {
+        
+        private Content c;
+        
+        public ContentView (Content content){
+            
+            c = content;
+            c.added.connect (update);
+            c.removed.connect (update);
+            show_border = false;
+            show_tabs = false;
+            
+            update ();
+        }
+        
+        public void update (){
+            
+            clear ();
+            
+            if (!c.is_empty){
+                
+                int last = c.index_of (c.last ());
+                
+                for (int i = 0; i <= last; i++){
                 
                     add (c.get (i));
                     
                 }
-				
-			}
-			
-		}
-		
-		public new void add (ContentItem c){
-			
-			append_page (c.content_box, null);
-			
-		}
-		
-		public void clear (){
-			
-			this.foreach ((widget) => {
-				remove (widget);
-				});
-			
-		}
-		
-		public void on_window_resized (){
-			
-			
-			
-		}
-		
-	}
-	
+                
+            }
+            
+        }
+        
+        public new void add (ContentItem c){
+            
+            append_page (c.content_box, null);
+            
+        }
+        
+        public void clear (){
+            
+            this.foreach ((widget) => {
+                remove (widget);
+                });
+            
+        }
+        
+        public void on_window_resized (){
+            
+            
+            
+        }
+        
+    }
+    
 }

=== modified file 'src/Widgets/GridView.vala' (properties changed: +x to -x)
--- src/Widgets/GridView.vala	2012-07-05 04:39:46 +0000
+++ src/Widgets/GridView.vala	2012-07-07 04:41:20 +0000
@@ -38,14 +38,14 @@
             this.row_homogeneous = true;
             this.column_spacing = 48;
             this.row_spacing = 10;
-            this.border_width = 40;
+            this.border_width = 30;
             this.valign = Gtk.Align.END;
             this.halign = Gtk.Align.CENTER;
             c = content;
             c.added.connect (update);
             c.removed.connect (update);
             
-			update ();
+            update ();
             
         }
         
@@ -89,10 +89,10 @@
         }
         
         public void on_window_resized (){
-			
-			
-			
-		}
+            
+            
+            
+        }
     }
     
 }

=== modified file 'src/Widgets/ListView.vala' (properties changed: +x to -x)
--- src/Widgets/ListView.vala	2012-07-05 04:39:46 +0000
+++ src/Widgets/ListView.vala	2012-07-07 04:41:20 +0000
@@ -52,20 +52,20 @@
             pack_end (right_container, false);
             
             
-			update ();
+            update ();
             
         }
         
         private new void add (ContentItem c, int pos){
             
             if (pos == 0 || pos == 1){
-				left_container.pack_start (c.left_list_box);
-				
-			}  else if (pos == 2 || pos == 3){
-				
-				right_container.pack_start (c.right_list_box);
-				
-			}
+                left_container.pack_start (c.left_list_box);
+                
+            }  else if (pos == 2 || pos == 3){
+                
+                right_container.pack_start (c.right_list_box);
+                
+            }
             
         }
         
@@ -74,34 +74,34 @@
             clear ();
             
             if (!c.is_empty){
-				
-				int last = c.index_of (c.last ());
-				
-				for (int i = 0; i < 4 && i <= last; i++){
-				add (c.get (i), i);
-				
-				}
-				
-			}
+                
+                int last = c.index_of (c.last ());
+                
+                for (int i = 0; i < 4 && i <= last; i++){
+                add (c.get (i), i);
+                
+                }
+                
+            }
             
         }
         
         public void clear (){
-			
-			left_container.foreach ((widget) => {
-				left_container.remove (widget);
-				});
-			right_container.foreach ((widget) => {
-				right_container.remove (widget);
-				});
-			
-		}
+            
+            left_container.foreach ((widget) => {
+                left_container.remove (widget);
+                });
+            right_container.foreach ((widget) => {
+                right_container.remove (widget);
+                });
+            
+        }
         
         public void on_window_resized (){
-			
-			
-			
-		}
+            
+            
+            
+        }
         
     }