Merge lp:~spinatelli/scratch/scratch-dnd into lp:~registry/scratch/scratch

[Sergio Spinatelli]

Add basic drag and drop to open a file

[Mario Guerriero (mefrio-g)]

review: Approve

=== modified file 'src/Widgets/sourceview.vala'
--- src/Widgets/sourceview.vala	2011-08-19 10:42:12 +0000
+++ src/Widgets/sourceview.vala	2011-08-20 10:49:23 +0000
@@ -36,6 +36,7 @@
     
         public SourceView (MainWindow window) {
 
+        	Gtk.drag_dest_add_uri_targets (this);
             this.window = window;
             
             manager = new LanguageManager ();
@@ -65,6 +66,13 @@
 
         }
 
+		public override void drag_data_received (Gdk.DragContext context, int x, int y, SelectionData selection_data, uint info, uint time_) {
+			foreach (string s in selection_data.get_uris ()){
+            	window.open (Filename.from_uri (s));
+				window.set_undo_redo ();
+			}
+		}
+
         public void use_default_font (bool value) {
             
             if (!value) // if false, simply return null
 
=== modified file 'src/main_window.vala'
--- src/main_window.vala	2011-08-19 14:30:49 +0000
+++ src/main_window.vala	2011-08-20 10:49:23 +0000
@@ -217,51 +217,43 @@
 			
 			// filech.response.connect (on_response);
 			
-			if (filech.run () == ResponseType.ACCEPT) {
-				string filename = filech.get_filename ();
-				
-				if (filename != null) {
-															
-					// check if file is already opened
-					int target_page = -1;
-					
-					try {
-						set_combobox_language (filename);
-					} catch (Error e) {
-						warning ("Cannont set the combobox id");
-					}
-					
-					if (!current_notebook.welcome_screen.active) {
-																						
-						int tot_pages = current_notebook.get_n_pages ();					
-						for (int i = 0; i < tot_pages; i++) {
-							if (current_tab.filename == filename) {
-								target_page = i;
-							}
-						}
-
-					}
-					
-
-					if (target_page >= 0) {
-						message ("file already opened: %s\n", filename);
-						current_notebook.set_current_page (target_page);
-					} else {
-						message ("Opening: %s\n", filename);
-						current_notebook.show_tabs_view ();						
-						load_file (filename);
-						//set the name of the file, not all the path, in the tab label
-						var name = filename.split("/");
-						current_tab.label.label.set_text (name[name.length-1]);
-
-					}
-				}
-								
-			}
-			
+			if (filech.run () == ResponseType.ACCEPT)
+				open (filech.get_filename ());
+
 			filech.close ();
 			set_undo_redo ();
-				
+
+		}
+		
+		public void open (string filename) {
+			if (filename != null) {
+				// check if file is already opened
+				int target_page = -1;
+				
+				try {
+					set_combobox_language (filename);
+				} catch (Error e) {
+					warning ("Cannont set the combobox id");
+				}
+				
+				if (!current_notebook.welcome_screen.active) {
+	
+					int tot_pages = current_notebook.get_n_pages ();
+					for (int i = 0; i < tot_pages; i++)
+						if (current_tab.filename == filename)
+							target_page = i;
+
+				}
+				if (target_page >= 0) {
+					message ("file already opened: %s\n", filename);
+					current_notebook.set_current_page (target_page);
+				} else {
+					message ("Opening: %s\n", filename);
+					current_notebook.show_tabs_view ();	
+					var name = filename.split("/");
+					load_file (filename,name[name.length-1]);
+					}
+			}
 		}
 		
 		public void on_save_clicked() {
@@ -305,7 +297,7 @@
 		}
 
 		//generic functions
-		public void load_file (string filename) {
+		public void load_file (string filename, string? title=null) {
 			
 			if (filename != "") {				
 				try {
@@ -337,9 +329,11 @@
 					//set values for label
 					var tab = (Tab) current_notebook.get_nth_page (current_notebook.get_current_page());
 					var label = tab.label.label;
-					if (label.get_text().substring (0, 1) == "*"){
+					
+					if (title != null)
+						label.set_text (title);
+					else 
 						label.set_text (filename);
-					}
 					set_window_title (filename);
 											
 				} catch (Error e) {
@@ -348,7 +342,10 @@
 			}
 			var tab = (Tab) current_notebook.get_nth_page (current_notebook.get_current_page());
 			var label = tab.label.label;
-			if (label.get_text().substring (0, 1) == "*"){
+
+			if (title != null)
+			    label.set_text (title);
+			else if (label.get_text().substring (0, 1) == "*"){
 				label.set_text (filename);
 			}