Adds a border to the splash screen, puts framework initialization into post-flash part
git-svn-id: file:///home/svn/framework3/trunk@5234 4d416f70-5f16-0410-b530-b9f4589650daunstable
parent
dde128f52c
commit
275c91dfed
|
@ -97,14 +97,11 @@ module Ui
|
|||
set_window_position(Gtk::Window::POS_CENTER)
|
||||
|
||||
set_default_size(460,301)
|
||||
set_border_width(0)
|
||||
set_border_width(5)
|
||||
|
||||
image = Gtk::Image.new(driver.get_icon("splash.png"))
|
||||
image.queue_draw
|
||||
add(image)
|
||||
|
||||
realize
|
||||
|
||||
|
||||
show_all
|
||||
end
|
||||
end
|
||||
|
|
|
@ -58,29 +58,26 @@ module Ui
|
|||
# Initialize logging
|
||||
initialize_logging
|
||||
|
||||
# Initialize attributes
|
||||
self.framework = Msf::Simple::Framework.create
|
||||
|
||||
# Create the gtk2driver global
|
||||
$gtk2driver = self
|
||||
|
||||
# Init GTK2
|
||||
Gtk.init
|
||||
|
||||
|
||||
# Initialize the splash screen
|
||||
@splash = Msf::Ui::Gtk2::MySplash.new()
|
||||
|
||||
done_splash = false
|
||||
|
||||
Gtk.idle_add do
|
||||
|
||||
if(done_splash)
|
||||
self.framework = Msf::Simple::Framework.create
|
||||
@gtk2app = Msf::Ui::Gtk2::MyApp.new()
|
||||
@gtk2app.window.show
|
||||
@splash.destroy
|
||||
register_event_handlers
|
||||
false
|
||||
else
|
||||
# Queue a redraw and let the main window start
|
||||
@splash.queue_draw
|
||||
done_splash = true
|
||||
true
|
||||
|
|
Loading…
Reference in New Issue