@@ -7,4 +7,4 @@ case "$MINICOMIC_BASE_DIR" in MINICOMIC_BASE_DIR="$PWD/$MINICOMIC_BASE_DIR" ;; esac -exec jruby -I"$MINICOMIC_BASE_DIR/lib" -rminicomic/ui -e 'Minicomic::UI.main(*ARGV)' +exec jruby -d -I"$MINICOMIC_BASE_DIR/lib" -rminicomic/ui -e 'Minicomic::UI.main(*ARGV)' bin/minicomic @@ -23,12 +23,16 @@ class Shell < Util::Observable def initialize(session) super(EventSequencer.new) @session = session - later do + later { setup } + end + + def later(&block) + super do begin - setup + block.call rescue Exception => e - $stderr.puts "#{e.class}: #{e}\n#{e.backtrace.join("\n")}" - @session.close + @session.close if @session + raise e end end end @@ -42,6 +46,8 @@ class Shell < Util::Observable @menubar = javax.swing.JMenuBar.new @frame.set_jmenu_bar @menubar + @frame.set_visible true + setup_menus end private :setup @@ -49,13 +55,8 @@ class Shell < Util::Observable def setup_menus @session.request_xml_resource("forms/menus.ui").async_result! do |res| later do - begin - process_menus_form(res.result) - @frame.set_visible true - rescue Exception => e - $stderr.puts "#{e.class}: #{e}\n#{e.backtrace.join("\n")}" - @session.close - end + process_menus_form(res.result) + @menubar.revalidate end end end lib/minicomic/ui/shell.rb dd1ec29da98e8741dadb38726594bc5f615018b4 MenTaLguY mental@rydia.net http://github.com/mental/minicomic/commit/7c4e4c2530af46f7e98f9aea0c837c0c8b021ddd 7c4e4c2530af46f7e98f9aea0c837c0c8b021ddd 2008-06-26T11:50:48-07:00 2008-06-26T11:50:48-07:00 clean up asynchronous UI setup eee911122313112d5007fdc8461c546a9f212aab MenTaLguY mental@rydia.net