Merge lp:~gcollura/scratch/scratch into lp:~registry/scratch/scratch

[Giulio Collura]

[lp:~gcollura/scratch/scratch]

13. By Giulio Collura on 2011-07-25

Added pref dialog, improved toolbar, still need a lot of work...

[Mario Guerriero (mefrio-g)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2011-07-25 18:52:59 +0000
+++ CMakeLists.txt	2011-07-25 23:31:27 +0000
@@ -43,9 +43,11 @@
 include (ValaPrecompile)
 vala_precompile (VALA_C
 	src/main_window.vala
-    src/menu.vala
-    src/notebook.vala
-    src/entry.vala
+    src/scratch.vala
+    src/Widgets/menu.vala
+    src/Widgets/notebook.vala
+    src/Widgets/toolbar.vala
+    src/Dialogs/preferences_dialog.vala
 PACKAGES
 	${SCRATCH_DEPS}
 CUSTOM_VAPIS

=== added directory 'src/Dialogs'
=== added file 'src/Dialogs/preferences_dialog.vala'
--- src/Dialogs/preferences_dialog.vala	1970-01-01 00:00:00 +0000
+++ src/Dialogs/preferences_dialog.vala	2011-07-25 23:31:27 +0000
@@ -0,0 +1,43 @@
+/***
+  BEGIN LICENSE
+	
+  Copyright (C) 2011 Giulio Collura <[e-mail]>
+  This program is free software: you can redistribute it and/or modify it	
+  under the terms of the GNU Lesser General Public License version 3, as published	
+  by the Free Software Foundation.
+	
+  This program is distributed in the hope that it will be useful, but	
+  WITHOUT ANY WARRANTY; without even the implied warranties of	
+  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR	
+  PURPOSE.  See the GNU General Public License for more details.
+	
+  You should have received a copy of the GNU General Public License along	
+  with this program.  If not, see <http://www.gnu.org/licenses/>	
+  
+  END LICENSE	
+***/
+
+
+using Gtk;
+
+namespace Scratch.Dialogs {
+
+    public class Preferences : Dialog {
+
+        public Preferences (string? title, MainWindow? window) {
+
+            this.title = title;
+            this.parent = window;
+            this.window_position = WindowPosition.CENTER;
+            this.type_hint = Gdk.WindowTypeHint.DIALOG;
+            this.set_modal(true);
+            // this.set_transient_for();
+            
+            set_default_size (400, 300); 
+            show_all ();
+
+        }
+
+    }
+
+} // Namespace

=== added directory 'src/Widgets'
=== added file 'src/Widgets/menu.vala'
--- src/Widgets/menu.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/menu.vala	2011-07-25 23:31:27 +0000
@@ -0,0 +1,45 @@
+/***
+  BEGIN LICENSE
+	
+  Copyright (C) 2011 Mario Guerriero <[e-mail]>	
+  This program is free software: you can redistribute it and/or modify it	
+  under the terms of the GNU Lesser General Public License version 3, as published	
+  by the Free Software Foundation.
+	
+  This program is distributed in the hope that it will be useful, but	
+  WITHOUT ANY WARRANTY; without even the implied warranties of	
+  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR	
+  PURPOSE.  See the GNU General Public License for more details.
+	
+  You should have received a copy of the GNU General Public License along	
+  with this program.  If not, see <http://www.gnu.org/licenses/>	
+  
+  END LICENSE	
+***/
+
+using Gtk;
+
+namespace Scratch.Widgets {
+
+    public class MenuProperties : Menu {
+
+        private ImageMenuItem preferences;
+        
+        public MenuProperties () {
+            create ();
+        }
+        
+        public void create () {		
+
+            this.preferences = new ImageMenuItem.from_stock (Stock.PREFERENCES, null);
+            this.append (preferences);
+            preferences.show();
+
+            preferences.activate.connect (() => {new Dialogs.Preferences ("Preferences", null);});
+
+        }
+        
+        
+    }
+
+} // Namespace

=== added file 'src/Widgets/notebook.vala'
--- src/Widgets/notebook.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/notebook.vala	2011-07-25 23:31:27 +0000
@@ -0,0 +1,133 @@
+/***
+  BEGIN LICENSE
+	
+  Copyright (C) 2011 Mario Guerriero <[e-mail]>	
+  This program is free software: you can redistribute it and/or modify it	
+  under the terms of the GNU Lesser General Public License version 3, as published	
+  by the Free Software Foundation.
+	
+  This program is distributed in the hope that it will be useful, but	
+  WITHOUT ANY WARRANTY; without even the implied warranties of	
+  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR	
+  PURPOSE.  See the GNU General Public License for more details.
+	
+  You should have received a copy of the GNU General Public License along	
+  with this program.  If not, see <http://www.gnu.org/licenses/>	
+  
+  END LICENSE	
+***/
+
+using Gtk;
+using Pango;
+using GtkSource;
+
+namespace Scratch.Widgets {
+
+    public class Tab : ScrolledWindow {
+
+        public TextView text_view;
+        public Label label;
+        public string filename;
+        
+        public Tab() {
+            
+            var s = new View ();
+            
+            this.set_policy (PolicyType.AUTOMATIC, PolicyType.AUTOMATIC);
+            this.text_view = new TextView ();
+            this.add (text_view);
+            this.label = new Label ("New file");
+            this.filename = null;
+            this.show_all();
+
+        }
+
+    }
+    /*
+    public class TabLabel : HBox {
+
+        public HBox tablabel;
+        public Label label;
+        public Button close;
+        
+        public TabLabel(string label) {
+            
+            this.label = new Label (label);
+            
+            var image = new Image.from_stock(Stock.CLOSE, IconSize.MENU);
+            this.close = new Button ();
+            this.close.clicked.connect (on_close_clicked);
+            this.close.set_relief (ReliefStyle.NONE);
+            this.close.set_image (image);
+            
+            this.hbox.pack_start (this.label, false, false, 0);
+            this.hbox.pack_start (this.close, false, false, 0);
+            
+            this.show_all ();		
+        }
+        
+        public void on_close_clicked() {
+            
+            return;	
+            
+        }
+        
+        public void change_label(string label) {
+            
+            this.label.set_text (label);
+            
+        }
+        
+    }
+    */
+    public class ScratchNotebook : Notebook {
+
+        //widgets for the label
+        public HBox tablabel;
+        public Label label;
+        public Button close;
+
+        public int add_tab(string tabtext="New file") {
+            
+            //tab label
+            this.tablabel = new HBox (false, 0);
+            
+            this.label = new Label (tabtext);
+            
+            var image = new Image.from_stock(Stock.CLOSE, IconSize.MENU);
+            this.close = new Button ();
+            this.close.clicked.connect (on_close_clicked);
+            this.close.set_relief (ReliefStyle.NONE);
+            this.close.set_image (image);
+            
+            this.tablabel.pack_start (this.label, false, false, 0);
+            this.tablabel.pack_start (this.close, false, false, 0);
+            
+            this.tablabel.show_all ();	
+            
+            //create the tab
+            var new_tab = new Tab();
+            this.set_tab_reorderable (new_tab, true);
+            return this.append_page (new_tab, this.tablabel);
+        }
+        
+        public void change_label(string label) {
+            
+            this.label.set_text (label);
+            
+        }
+
+        //events
+        public void on_close_clicked () {
+            
+            return;	
+            
+        }
+
+        public ScratchNotebook() {
+            this.set_scrollable (true);
+        }
+
+
+    }
+} // Namespace

=== added file 'src/Widgets/toolbar.vala'
--- src/Widgets/toolbar.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/toolbar.vala	2011-07-25 23:31:27 +0000
@@ -0,0 +1,100 @@
+/***
+  BEGIN LICENSE
+	
+  Copyright (C) 2011 Giulio Collura <[e-mail]>
+  This program is free software: you can redistribute it and/or modify it	
+  under the terms of the GNU Lesser General Public License version 3, as published	
+  by the Free Software Foundation.
+	
+  This program is distributed in the hope that it will be useful, but	
+  WITHOUT ANY WARRANTY; without even the implied warranties of	
+  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR	
+  PURPOSE.  See the GNU General Public License for more details.
+	
+  You should have received a copy of the GNU General Public License along	
+  with this program.  If not, see <http://www.gnu.org/licenses/>	
+  
+  END LICENSE	
+***/
+
+using Gtk;
+using Granite.Widgets;
+
+namespace Scratch.Widgets {
+
+    public class Toolbar : Gtk.Toolbar {
+
+        MainWindow parent;
+
+        public ToolButton new_button;
+        public ToolButton open_button;
+        public ToolButton save_button;
+        public ToolButton undo_button;
+        public ToolButton repeat_button;
+        public ComboBox combobox;
+        
+        public Entry entry;
+        public AppMenu app_menu;
+
+
+        public Toolbar (MainWindow parent) {
+
+            this.parent = parent;
+
+            // Toolbar properties
+            // compliant with elementary HIG
+			get_style_context ().add_class ("primary-toolbar");
+            
+            new_button = new ToolButton.from_stock (Stock.NEW);
+            open_button = new ToolButton.from_stock (Stock.OPEN);
+            save_button = new ToolButton.from_stock (Stock.SAVE);
+            undo_button = new ToolButton.from_stock (Stock.UNDO);
+            repeat_button = new ToolButton.from_stock (Stock.REDO);
+            
+            combobox = new ComboBox ();
+            
+            add (new_button);
+            add (open_button);
+            add (save_button);
+            add (new SeparatorToolItem ());
+            add (undo_button);
+            add (repeat_button);
+
+            add (add_spacer ());
+            add (toolitem (combobox));
+
+            entry = new SearchBar ("Search in the text...");
+                
+            var menu = new MenuProperties ();     
+            app_menu = new AppMenu (menu);
+
+            add (add_spacer ());
+            add (toolitem (entry));
+            add (app_menu);
+
+        }
+
+        private ToolItem add_spacer () {
+			
+			var spacer = new ToolItem ();
+			spacer.set_expand (true);
+			
+			return spacer;
+			
+		}
+		
+		private ToolItem toolitem (Widget widget, bool expand = true, int border_width = 0) {
+		
+		    var new_tool_item = new ToolItem ();
+		    new_tool_item.add (widget);
+
+		    if (border_width > 0) {
+		        new_tool_item.set_border_width (border_width);
+		    }
+            new_tool_item.set_expand (expand);
+
+		    return new_tool_item;
+    
+        }
+    }
+} // Namespace   

=== removed file 'src/entry.vala'
--- src/entry.vala	2011-07-25 20:14:39 +0000
+++ src/entry.vala	1970-01-01 00:00:00 +0000
@@ -1,191 +0,0 @@
-/***
-  BEGIN LICENSE
-	
-  Copyright (C) 2011 Mario Guerriero <[e-mail]>	
-  This program is free software: you can redistribute it and/or modify it	
-  under the terms of the GNU Lesser General Public License version 3, as published	
-  by the Free Software Foundation.
-	
-  This program is distributed in the hope that it will be useful, but	
-  WITHOUT ANY WARRANTY; without even the implied warranties of	
-  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR	
-  PURPOSE.  See the GNU General Public License for more details.
-	
-  You should have received a copy of the GNU General Public License along	
-  with this program.  If not, see <http://www.gnu.org/licenses/>	
-  
-  END LICENSE	
-***/
-
-public class ElementaryEntry : Gtk.Entry {
-
-    public string hint_string;
-
-    public ElementaryEntry (string hint_string) {
-    
-        this.hint_string = hint_string;
-        
-        this.hint ();
-        this.focus_in_event.connect (on_focus_in);
-        this.focus_out_event.connect (on_focus_out);
-    
-    }
-
-    private bool on_focus_in () {
-    
-        if (get_text () == "") {
-            unhint ();
-        }
-        return false;
-    
-    }
-    
-    private bool on_focus_out () {
-    
-        if (get_text () == "") {
-            hint ();
-        }
-        return false;
-    
-    }
-    
-    protected void hint () {
-
-        this.text = this.hint_string;
-        grey_out ();
-    
-    }
-
-    protected void unhint () {
-    
-        this.text = "";
-        reset_font ();
-    
-    }
-    
-    
-    private void grey_out () {
-    
-        var color = Gdk.Color ();
-        Gdk.Color.parse ("#999", out color);
-        this.modify_text (Gtk.StateType.NORMAL, color);
-        this.modify_font (Pango.FontDescription.from_string ("italic"));
-    
-    }
-    
-    private void reset_font () {
-    
-        var color = Gdk.Color ();
-        Gdk.Color.parse ("#444", out color);
-        this.modify_text (Gtk.StateType.NORMAL, color);
-        this.modify_font (Pango.FontDescription.from_string ("normal"));
-    
-    }
-    
-    protected new string get_text () {
-    
-        text = this.text;
-        if (text == this.hint_string) {
-            return "";
-        }
-        else {
-            return text;
-        }
-    
-    }
-}
-
-public class ElementarySearchEntry : ElementaryEntry {
-
-    bool is_searching;
-
-    public ElementarySearchEntry (string hint_string) {
-    
-        base(hint_string);
-        this.set_icon_from_stock(Gtk.EntryIconPosition.PRIMARY, "gtk-find");
-        this.changed.connect (manage_icon);
-        this.focus_in_event.connect (on_focus_in);
-        this.focus_out_event.connect (on_focus_out);
-        this.icon_press.connect (icon_pressed);
-        setup_clear_icon ();
-        this.is_searching = true;
-        
-    }
-
-    private void setup_clear_icon () {
-    
-        var stock_item = Gtk.StockItem ();
-        stock_item.stock_id = "edit-clear-symbolic";
-        stock_item.label = null;
-        stock_item.modifier = 0;
-        stock_item.keyval = 0;
-        stock_item.translation_domain = Gtk.Stock.CLEAR;
-        var factory = new Gtk.IconFactory ();
-        var icon_set = new Gtk.IconSet ();
-        var icon_source = new Gtk.IconSource ();
-        icon_source.set_icon_name (Gtk.Stock.CLEAR);
-        icon_set.add_source (icon_source);
-        icon_source.set_icon_name ("edit-clear-symbolic");
-        icon_set.add_source (icon_source);
-        factory.add ("edit-clear-symbolic", icon_set);
-        Gtk.Stock.add ({stock_item});
-        factory.add_default ();
-        
-    }
-
-    private new void hint () {
-    
-        this.is_searching = false;
-        this.set_icon_from_stock (Gtk.EntryIconPosition.SECONDARY, null);
-        base.hint ();
-        
-    }
-    
-    private new bool on_focus_in () {
-    
-        if (!this.is_searching) {
-            this.unhint ();
-            this.is_searching = false;
-        }
-        return false;
-    
-    }
-
-    private new bool on_focus_out () {
-        
-        if (this.get_text() == "") {
-            this.hint ();
-            this.is_searching = false;
-        }
-        return false;
-    
-    }
-
-    private void manage_icon () {
-
-        if (this.text != "") {
-            this.set_icon_from_stock (Gtk.EntryIconPosition.SECONDARY, "edit-clear-symbolic");
-        }
-        else {
-            this.set_icon_from_stock (Gtk.EntryIconPosition.SECONDARY, null);
-        }
-        
-    }
-
-    private void icon_pressed (Gtk.EntryIconPosition icon_position) {
-    
-        if (icon_position == Gtk.EntryIconPosition.SECONDARY) {
-            this.is_searching = false;
-            this.text = "";
-            this.set_icon_from_stock(Gtk.EntryIconPosition.SECONDARY, null);
-            this.is_searching = true;
-        }
-        else {
-            if (!this.is_focus) {
-                this.is_searching = false;
-                this.hint ();
-            }
-        }
-        
-    }
-}

=== modified file 'src/main_window.vala'
--- src/main_window.vala	2011-07-25 20:14:39 +0000
+++ src/main_window.vala	2011-07-25 23:31:27 +0000
@@ -20,272 +20,187 @@
 using Gtk;
 using Granite.Widgets;
 
-public class MainWindow : Window {
-
-	private const string TITLE = "Scratch";
-	
-	//widgets for the window
-	public ScratchNotebook notebook;
-	
-	//widgets for the toolbars
-	public Toolbar BasicToolbar;
-	public Toolbar SearchToolbar;
-	public HBox hbox;
-	
-	public ToolButton new_;
-	public ToolButton open_;
-	public ToolButton save_;
-	public SeparatorToolItem separator1;
-	public ToolButton cancel_;
-	public ToolButton repeat_;
-	public ToolItem combo;
-	public ComboBox cb;
-	public SeparatorToolItem separator2;
-	
-	public SeparatorToolItem separator3;
-	public ToolItem entry_cont;
-	public Entry entry;
-	public AppMenu app_menu;
-	
-	//dialogs
-	public FileChooserDialog filech;
-	
-	public MainWindow (string arg="") {
-		if (arg == "") {
-			this.title = this.TITLE;
-		}
-		else {
-			this.title = arg;
-		}
-		
-		load_file (arg);
-		
-		this.set_default_size (800, 500);
-		//this.set_icon ("text-editor");
-		//this.maximize ();
-		
-		//create_window();
-		//connect_signals();
-	}
-	
-	public void create_window () {
-		create_toolbars ();
-		//notebook, textview and its scrolledwindow
-		this.notebook = new ScratchNotebook ();
-		this.notebook.add_tab();
-
-		//addingo all to the vbox
-		var vbox = new VBox (false, 0);
-		vbox.pack_start (hbox, false, false, 0);
-		vbox.pack_start (notebook, true, true, 0); 
-		
-		this.add (vbox);		
-	
-	}
-	
-	public void connect_signals () {
-		//signals for the window
-		this.destroy.connect (Gtk.main_quit);
-		//signals for the toolbars
-		this.new_.clicked.connect (on_new_clicked);
-		this.open_.clicked.connect (on_open_clicked);
-		this.save_.clicked.connect (on_save_clicked);
-			
-	}
-	
-	public void create_toolbars () {
-		//
-		//	FIRST TOOLBAR
-		//
-		this.BasicToolbar = new Toolbar ();
-		
-		this.new_ = new ToolButton.from_stock(Stock.NEW);
-		this.open_ = new ToolButton.from_stock (Stock.OPEN);
-		this.save_ = new ToolButton.from_stock (Stock.SAVE);
-		this.separator1 = new SeparatorToolItem ();
-		this.cancel_ = new ToolButton.from_stock (Stock.UNDO);
-		this.repeat_ = new ToolButton.from_stock (Stock.REDO);
-		this.separator2 = new SeparatorToolItem ();
-		this.combo = new ToolItem ();
-		
-		this.cb = new ComboBox ();
-		this.combo.add (cb);
-		this.combo.set_expand (false);		
-		
-		BasicToolbar.add (new_);
-		BasicToolbar.add (open_);
-		BasicToolbar.add (save_);
-		BasicToolbar.add (separator1);
-		BasicToolbar.add (cancel_);
-		BasicToolbar.add (repeat_);
-		BasicToolbar.add (separator2);
-		BasicToolbar.add (combo);
-		
-		//
-		//	SECOND TOOLBAR
-		//
-		this.SearchToolbar = new Toolbar ();
-		
-		this.separator3 = new SeparatorToolItem ();	
-		
-		this.entry = new SearchBar ("Search in the text...");
-		this.entry_cont = new ToolItem ();
-		this.entry_cont.add (entry);	
-		this.entry_cont.set_expand (true);	
-			
-		//var image = new Image.from_stock (Stock.PROPERTIES, IconSize.LARGE_TOOLBAR);
-		var menu = new MenuProperties (); 
-			
-		//var w = new MainWindow ();
-			
-		this.app_menu = new AppMenu (menu);
-
-		SearchToolbar.add (separator3);
-		SearchToolbar.add (entry_cont);		
-		SearchToolbar.add (app_menu);
-		////////////
-		this.hbox = new HBox (false, 0);
-		
-		hbox.pack_start (BasicToolbar, true, true, 0);
-		hbox.pack_end (SearchToolbar, true, true, 0);
-					
-	}
-	
-	//signals functions
-	public void on_new_clicked () {
-		int new_tab_index = notebook.add_tab();
-		notebook.set_current_page(new_tab_index);
-	}
-	
-	public void on_open_clicked () {
-		this.filech = new FileChooserDialog ("Open a file", this, FileChooserAction.OPEN);
-		filech.add_button (Stock.CANCEL, ResponseType.CANCEL);
-       	 	filech.add_button (Stock.OPEN, ResponseType.ACCEPT);
-        	filech.set_default_response (ResponseType.ACCEPT);
-        	
-	       	//if (filech.run () == ResponseType.OK) {
-            	//	stdout.printf ("filename = %s\n".printf (filech.get_filename ()));
-        	//}
-        	filech.run ();
-        	filech.response.connect (on_response);
-        	
-	}
-
-
-	public void on_response (Dialog source, int response_id) {
-		switch (response_id) {
-        		case ResponseType.ACCEPT:
-        			string filename = filech.get_filename();
-        			if (filename != null) {
-					stdout.printf ("opening: %s\n".printf (filech.get_filename ()));
-		 			load_file ( filech.get_filename () );
-         			}
-         			
-         			filech.close ();
-         			break;
-        		case ResponseType.CANCEL:
-            			filech.close ();
-            			break;
-        	}
-		
-	}
-	
-	
-	public void on_save_clicked() {
-		var current_tab = (Tab) notebook.get_nth_page (notebook.get_current_page());
-		
-		if (current_tab.filename == null) {
-		
-			this.filech = new FileChooserDialog ("Save as", this, FileChooserAction.SAVE);
-			filech.add_button (Stock.CANCEL, ResponseType.CANCEL);
-	       	 	filech.add_button (Stock.SAVE, ResponseType.ACCEPT);
-			filech.set_default_response (ResponseType.ACCEPT);
-			
-			filech.run ();
-			filech.response.connect (on_save_response);
-		
-			//TODO "save as" dialog
-		}
-		
-		save_file (current_tab.filename, current_tab.text_view.buffer.text);
-	}
-	
-	
-	public void on_save_response(Dialog source, int response_id) {
-		switch (response_id) {
-			case ResponseType.ACCEPT:
-				string filename = filech.get_filename();
-				var current_tab = (Tab) notebook.get_nth_page (notebook.get_current_page());
-				save_file (filename, current_tab.text_view.buffer.text);
-				break;
-		}
-	}
-	
-	//generic functions
-	public void load_file (string filename) {
-		if (filename != "") {
-			try {
-				string text;
-           			FileUtils.get_contents (filename, out text);
-           			
-           			//get the filename from strig filename =)
-           			var name = filename.split("/");
-           			
-           			//create new tab
-           			int tab_index = notebook.add_tab(name[name.length-1]);
-           			notebook.set_current_page(tab_index);
-				var new_tab = (Tab) notebook.get_nth_page (tab_index);
-				
-				//set new values
-				new_tab.text_view.buffer.text = text;
-				new_tab.filename = filename;
-          			this.title = this.TITLE + " - " + filename;
-          			
-			} catch (Error e) {
-         	   		stderr.printf ("Error: %s\n", e.message);
-        		}
-		}
-			
-	}
-	
-	public int save_file (string filename, string contents) {
-	
-		if (filename != "") {
-			try {
-				FileUtils.set_contents (filename, contents);
-				var name = filename.split("/");
-				notebook.change_label (name[name.length-1]);
-				return 0;				
-			} catch (Error e) {
-				stderr.printf ("Error: %s\n", e.message);
-				return 1;
-			}
-				
-		} else return 1;		
-		
-	}
-	
-	public static void main (string[] args) {
-		//TO DO: modify the if loop
-		if (args[1] != null) {
-			Gtk.init (ref args);
-			var window =new MainWindow (args[1]);
-			window.create_window();
-			window.connect_signals();
-			window.show_all ();
-			Gtk.main ();
-		}
-	
-		else {
-			Gtk.init (ref args);
-			var window =new MainWindow ("");
-			window.create_window();
-			window.connect_signals();
-			window.show_all ();
-			Gtk.main ();
-		}
-	
-	}
-
-}
-	
+using Scratch.Widgets;
+using Scratch.Dialogs;
+
+namespace Scratch {
+    
+    public class MainWindow : Window {
+
+        private const string TITLE = "Scratch";
+        
+        //widgets for the window
+        public ScratchNotebook notebook;
+        
+        //widgets for the toolbars
+        public Widgets.Toolbar toolbar;
+        
+        //dialogs
+        public FileChooserDialog filech;
+        public Preferences preferences;
+        
+        public MainWindow (string arg="") {
+            if (arg == "") {
+                this.title = this.TITLE;
+            }
+            else {
+                this.title = arg;
+            }
+            
+            load_file (arg);
+            
+            this.set_default_size (800, 500);
+            //this.set_icon ("text-editor");
+            //this.maximize ();
+            
+            //create_window();
+            //connect_signals();
+        }
+        
+        public void create_window () {
+
+            //notebook, textview and its scrolledwindow
+            this.notebook = new ScratchNotebook ();
+            this.notebook.add_tab();
+            
+            this.toolbar = new Widgets.Toolbar (this);
+
+            //adding all to the vbox
+            var vbox = new VBox (false, 0);
+            vbox.pack_start (toolbar, false, false, 0);
+            vbox.pack_start (notebook, true, true, 0); 
+            
+            this.add (vbox);		
+        
+        }
+        
+        public void connect_signals () {
+
+            //signals for the window
+            this.destroy.connect (Gtk.main_quit);
+
+            //signals for the toolbar
+            toolbar.new_button.clicked.connect (on_new_clicked);
+            toolbar.open_button.clicked.connect (on_open_clicked);
+            toolbar.save_button.clicked.connect (on_save_clicked);
+                
+        }
+        
+        
+        //signals functions
+        public void on_new_clicked () {
+            int new_tab_index = notebook.add_tab ();
+            notebook.set_current_page (new_tab_index);
+        }
+        
+        public void on_open_clicked () {
+
+            this.filech = new FileChooserDialog ("Open a file", this, FileChooserAction.OPEN);
+            filech.add_button (Stock.CANCEL, ResponseType.CANCEL);
+            filech.add_button (Stock.OPEN, ResponseType.ACCEPT);
+            filech.set_default_response (ResponseType.ACCEPT);
+            
+            //if (filech.run () == ResponseType.OK) {
+                //	stdout.printf ("filename = %s\n".printf (filech.get_filename ()));
+            //}
+            filech.run ();
+            filech.response.connect (on_response);
+                
+        }
+
+
+        public void on_response (Dialog source, int response_id) {
+            switch (response_id) {
+                    case ResponseType.ACCEPT:
+                        string filename = filech.get_filename();
+                        if (filename != null) {
+                            stdout.printf ("opening: %s\n".printf (filech.get_filename ()));
+                            load_file ( filech.get_filename () );
+                        }
+                        
+                        filech.close ();
+                        break;
+                    case ResponseType.CANCEL:
+                        filech.close ();
+                        break;
+                }
+            
+        }
+        
+        
+        public void on_save_clicked() {
+            var current_tab = (Tab) notebook.get_nth_page (notebook.get_current_page());
+            
+            if (current_tab.filename == null) {
+            
+                this.filech = new FileChooserDialog ("Save as", this, FileChooserAction.SAVE);
+                filech.add_button (Stock.CANCEL, ResponseType.CANCEL);
+                    filech.add_button (Stock.SAVE, ResponseType.ACCEPT);
+                filech.set_default_response (ResponseType.ACCEPT);
+                
+                filech.run ();
+                filech.response.connect (on_save_response);
+            
+                //TODO "save as" dialog
+            }
+            
+            save_file (current_tab.filename, current_tab.text_view.buffer.text);
+        }
+        
+        
+        public void on_save_response(Dialog source, int response_id) {
+            switch (response_id) {
+                case ResponseType.ACCEPT:
+                    string filename = filech.get_filename();
+                    var current_tab = (Tab) notebook.get_nth_page (notebook.get_current_page());
+                    save_file (filename, current_tab.text_view.buffer.text);
+                    break;
+            }
+        }
+        
+        //generic functions
+        public void load_file (string filename) {
+            if (filename != "") {
+                try {
+                    string text;
+                    FileUtils.get_contents (filename, out text);
+                    
+                    //get the filename from strig filename =)
+                    var name = filename.split("/");
+                    
+                    //create new tab
+                    int tab_index = notebook.add_tab(name[name.length-1]);
+                    notebook.set_current_page(tab_index);
+                    var new_tab = (Tab) notebook.get_nth_page (tab_index);
+                    
+                    //set new values
+                    new_tab.text_view.buffer.text = text;
+                    new_tab.filename = filename;
+                    this.title = this.TITLE + " - " + filename;
+                        
+                } catch (Error e) {
+                    stderr.printf ("Error: %s\n", e.message);
+                }
+            }
+                
+        }
+        
+        public int save_file (string filename, string contents) {
+        
+            if (filename != "") {
+                try {
+                    FileUtils.set_contents (filename, contents);
+                    var name = filename.split("/");
+                    notebook.change_label (name[name.length-1]);
+                    return 0;				
+                } catch (Error e) {
+                    stderr.printf ("Error: %s\n", e.message);
+                    return 1;
+                }
+                    
+            } else return 1;		
+            
+        }
+
+    }
+} // Namespace	

=== removed file 'src/menu.vala'
--- src/menu.vala	2011-07-25 08:59:21 +0000
+++ src/menu.vala	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-/***
-  BEGIN LICENSE
-	
-  Copyright (C) 2011 Mario Guerriero <[e-mail]>	
-  This program is free software: you can redistribute it and/or modify it	
-  under the terms of the GNU Lesser General Public License version 3, as published	
-  by the Free Software Foundation.
-	
-  This program is distributed in the hope that it will be useful, but	
-  WITHOUT ANY WARRANTY; without even the implied warranties of	
-  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR	
-  PURPOSE.  See the GNU General Public License for more details.
-	
-  You should have received a copy of the GNU General Public License along	
-  with this program.  If not, see <http://www.gnu.org/licenses/>	
-  
-  END LICENSE	
-***/
-
-using Gtk;
-
-public class MenuProperties : Menu {
-
-	private ImageMenuItem preferences;
-	
-	public MenuProperties () {
-		create ();
-	}
-	
-	public void create () {		
-		this.preferences = new ImageMenuItem.from_stock (Stock.PREFERENCES, null);
-		
-		this.append (preferences);
-		preferences.show();
-	}
-	
-	
-}

=== removed file 'src/notebook.vala'
--- src/notebook.vala	2011-07-25 20:14:39 +0000
+++ src/notebook.vala	1970-01-01 00:00:00 +0000
@@ -1,130 +0,0 @@
-/***
-  BEGIN LICENSE
-	
-  Copyright (C) 2011 Mario Guerriero <[e-mail]>	
-  This program is free software: you can redistribute it and/or modify it	
-  under the terms of the GNU Lesser General Public License version 3, as published	
-  by the Free Software Foundation.
-	
-  This program is distributed in the hope that it will be useful, but	
-  WITHOUT ANY WARRANTY; without even the implied warranties of	
-  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR	
-  PURPOSE.  See the GNU General Public License for more details.
-	
-  You should have received a copy of the GNU General Public License along	
-  with this program.  If not, see <http://www.gnu.org/licenses/>	
-  
-  END LICENSE	
-***/
-
-using Gtk;
-using Pango;
-using GtkSource;
-
-public class Tab : ScrolledWindow {
-
-	public TextView text_view;
-	public Label label;
-	public string filename;
-	
-	public Tab() {
-		
-		var s = new View ();
-		
-		this.set_policy (PolicyType.AUTOMATIC, PolicyType.AUTOMATIC);
-		this.text_view = new TextView ();
-		this.add (text_view);
-		this.label = new Label ("New file");
-		this.filename = null;
-		this.show_all();
-
-	}
-
-}
-/*
-public class TabLabel : HBox {
-
-	public HBox tablabel;
-	public Label label;
-	public Button close;
-	
-	public TabLabel(string label) {
-		
-		this.label = new Label (label);
-		
-		var image = new Image.from_stock(Stock.CLOSE, IconSize.MENU);
-		this.close = new Button ();
-		this.close.clicked.connect (on_close_clicked);
-		this.close.set_relief (ReliefStyle.NONE);
-		this.close.set_image (image);
-		
-		this.hbox.pack_start (this.label, false, false, 0);
-		this.hbox.pack_start (this.close, false, false, 0);
-		
-		this.show_all ();		
-	}
-	
-	public void on_close_clicked() {
-		
-		return;	
-		
-	}
-	
-	public void change_label(string label) {
-		
-		this.label.set_text (label);
-		
-	}
-	
-}
-*/
-public class ScratchNotebook : Notebook {
-
-	//widgets for the label
-	public HBox tablabel;
-	public Label label;
-	public Button close;
-
-	public int add_tab(string tabtext="New file") {
-		
-		//tab label
-		this.tablabel = new HBox (false, 0);
-		
-		this.label = new Label (tabtext);
-		
-		var image = new Image.from_stock(Stock.CLOSE, IconSize.MENU);
-		this.close = new Button ();
-		this.close.clicked.connect (on_close_clicked);
-		this.close.set_relief (ReliefStyle.NONE);
-		this.close.set_image (image);
-		
-		this.tablabel.pack_start (this.label, false, false, 0);
-		this.tablabel.pack_start (this.close, false, false, 0);
-		
-		this.tablabel.show_all ();	
-		
-		//create the tab
-		var new_tab = new Tab();
-		this.set_tab_reorderable (new_tab, true);
-		return this.append_page (new_tab, this.tablabel);
-	}
-	
-	public void change_label(string label) {
-		
-		this.label.set_text (label);
-		
-	}
-
-	//events
-	public void on_close_clicked () {
-		
-		return;	
-		
-	}
-
-	public ScratchNotebook() {
-		this.set_scrollable (true);
-	}
-
-
-}

=== added file 'src/scratch.vala'
--- src/scratch.vala	1970-01-01 00:00:00 +0000
+++ src/scratch.vala	2011-07-25 23:31:27 +0000
@@ -0,0 +1,86 @@
+/***
+  BEGIN LICENSE
+	
+  Copyright (C) 2011 Giulio Collura <[e-mail]> 
+  This program is free software: you can redistribute it and/or modify it	
+  under the terms of the GNU Lesser General Public License version 3, as published	
+  by the Free Software Foundation.
+	
+  This program is distributed in the hope that it will be useful, but	
+  WITHOUT ANY WARRANTY; without even the implied warranties of	
+  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR	
+  PURPOSE.  See the GNU General Public License for more details.
+	
+  You should have received a copy of the GNU General Public License along	
+  with this program.  If not, see <http://www.gnu.org/licenses/>	
+  
+  END LICENSE	
+***/
+
+
+using Gtk;
+using Gdk;
+
+using Granite;
+
+namespace Scratch {
+
+    public class Scratch : Granite.Application {
+    
+        private MainWindow window = null;
+        
+        construct {
+        
+            build_data_dir = Constants.DATADIR;
+			build_pkg_data_dir = Constants.PKGDATADIR;
+			build_release_name = Constants.RELEASE_NAME;
+			build_version = Constants.VERSION;
+			build_version_info = Constants.VERSION_INFO;
+			
+            program_name = "Scratch";
+		    exec_name = "scratch";
+		    app_copyright = "GPLv3";
+		    app_icon = "text-editor";
+		    app_launcher = "scratch.desktop";
+            application_id = "net.launchpad.scratch";
+		    main_url = "https://launchpad.net/scratch";
+		    bug_url = "https://bugs.launchpad.net/scratch";
+		    help_url = "https://answers.launchpad.net/scratch";
+		    translate_url = "https://translations.launchpad.net/scratch";
+		    
+		    about_authors = {"Mario Guerriero <[e-mail]>",
+                             "Giulio Collura <[e-mail]>"};
+        					    
+        	about_documenters = {"",""};
+		    about_artists = {"Mario Guerriero <[e-mail]>"};
+		    about_translators = "";
+         
+		
+		}
+		
+		protected override void activate () {
+			
+			if (get_windows () != null) {
+				// show window if app is already open
+				window.present (); 
+
+			} else {
+			    
+			    // if not, create a new one.
+			    window = new MainWindow ();
+			    window.set_application (this);
+                window.create_window();
+			    window.connect_signals();
+
+			    window.show_all ();
+			    
+			}
+		}
+		
+		public static int main (string[] args) {
+		
+		    return new Scratch ().run (args);
+		    
+        }
+    }
+}