Add the splash screen, some reformatting

git-svn-id: file:///home/svn/framework3/trunk@5233 4d416f70-5f16-0410-b530-b9f4589650da

lib/msf/ui/gtk2/app.rb

@@ -1,5 +1,5 @@
 module Msf
-  module Ui
+module Ui
 	module Gtk2
 
 	###
@@ -9,6 +9,7 @@ module Msf
 	###
 	class GladeXML < GladeXML
 		def connect(source, target, signal, handler, data, after = false)
+
 			@handler_proc ||= Proc.new{}
 			handler = canonical_handler(handler)
 			if target
@@ -78,13 +79,47 @@ module Msf
 		end
 	end
 
+	###
+	#
+	# This class provides the splash screen
+	#
+	###
+	class MySplash < Gtk::Window
+
+		include Msf::Ui::Gtk2::MyControls
+
+		def initialize
+          	super(Gtk::Window::TOPLEVEL)
+			
+			set_type_hint(Gdk::Window::TYPE_HINT_SPLASHSCREEN)
+			
+			set_decorated(false)
+			set_window_position(Gtk::Window::POS_CENTER)
+
+			set_default_size(460,301)
+			set_border_width(0)
+			
+			image = Gtk::Image.new(driver.get_icon("splash.png"))
+			image.queue_draw
+			add(image)
+			
+			realize
+			
+			show_all
+		end
+	end
+
+	  
 	###
 	#
 	# This class provides the main window.
 	#
 	###
+
 	class MyApp < MyGlade
 
+		attr_accessor :window
+		
 		include Msf::Ui::Gtk2::MyControls
 
 		def initialize
@@ -255,5 +290,5 @@ module Msf
 	end
 
 	end
-  end
+end
 end

lib/msf/ui/gtk2/driver.rb

@@ -18,7 +18,7 @@ require 'msf/ui/gtk2/opcode'
 require 'msf/ui/gtk2/framework_event_manager'
 
 module Msf
-  module Ui
+module Ui
 	module Gtk2
 
 	###
@@ -67,11 +67,26 @@ module Msf
 			# Init GTK2
 			Gtk.init
 
-          # Initialize the Gtk2 application object
-          @gtk2app = Msf::Ui::Gtk2::MyApp.new()
 			
-          # Register event handlers
+			@splash = Msf::Ui::Gtk2::MySplash.new()
+			
+			done_splash = false
+			
+			Gtk.idle_add do 
+
+				if(done_splash)
+					@gtk2app = Msf::Ui::Gtk2::MyApp.new()
+					@gtk2app.window.show
+					@splash.destroy
 					register_event_handlers
+					false
+				else
+					@splash.queue_draw
+					done_splash = true
+					true
+				end
+			end
+
 		end
 
 		#
@@ -174,5 +189,5 @@ module Msf
 	end
 
 	end
-  end
+end
 end

lib/msf/ui/gtk2/frame/modules_view.rb

@@ -34,7 +34,7 @@ module Msf
           obj.description.each_line do |line|
             desc << line.strip + "\n"
           end
-          @buffer.insert_with_tags(start, desc, 'black_italic_wrap')
+          @buffer.insert_with_tags(start, desc, 'black_wrap')
         end
       end