lib/minicomic/ui/menubar.rb @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <ui:panel xmlns="http://www.w3.org/2002/xforms" xmlns:xlink="http://www.w3.org/199/xlink" xmlns:ui="http://moonbase.rydia.net/minicomic-ui"> - <group appearance="minimal"><label>New or Existing Projects</label> + <group ui:hints="stack" appearance="minimal"><label>New or Existing Projects</label> <trigger ui:verb="new-web-project"><label>New Web Project...</label></trigger> <trigger ui:verb="new-print-project"><label>New Print Project...</label></trigger> <trigger ui:verb="open-project"><label>Open Project...</label></trigger> </group> - <group appearance="compact"><label>Recent Projects</label> + <group ui:hints="stack" appearance="compact"><label>Recent Projects</label> <select1 id="recent-projects"> <itemset nodeset="recent-project"> <label ref="filename" /> forms/greeting.ui @@ -1,6 +1,7 @@ require 'rubygems' require 'thread' require 'minicomic/ui/application' +require 'minicomic/ui/menubar' require 'minicomic/ui/preferences' require 'minicomic/ui/session' require 'minicomic/ui/shell' lib/minicomic/ui.rb @@ -2,6 +2,7 @@ require 'java' require 'rexml/document' require 'rexml/xpath' require 'minicomic/ui/event-sequencer' +require 'minicomic/ui/menubar' require 'minicomic/util/observable' require 'minicomic/xml/namespaces' @@ -43,78 +44,17 @@ class Shell < Util::Observable @frame.set_default_close_operation javax.swing.JFrame::DISPOSE_ON_CLOSE @frame.set_minimum_size(java.awt.Dimension.new(300, 300)) - @menubar = javax.swing.JMenuBar.new - @frame.set_jmenu_bar @menubar + menubar = javax.swing.JMenuBar.new + @frame.set_jmenu_bar menubar + @menubar = MenuBar.new(menubar) @frame.set_visible true - setup_menus - end - private :setup - - def setup_menus @session.request_xml_resource("forms/menus.ui").async_result! do |res| - later do - process_menus_form(res.result) - @menubar.revalidate - end - end - end - private :setup_menus - - def process_menus_form(doc) - root = REXML::XPath.first(doc, '/ui:menubar', XML::DEFAULT_NS_MAPPINGS) - REXML::XPath.each(root, './xforms:group', XML::DEFAULT_NS_MAPPINGS) do |child| - label = REXML::XPath.first(child, './xforms:label', XML::DEFAULT_NS_MAPPINGS) - label_text = label ? label.text : nil - submenu = javax.swing.JMenu.new(label_text) - @menubar.add submenu - build_submenu(submenu, child) - end - end - private :process_menus_form - - def build_submenu(menu, element) - finished_compact = false - REXML::XPath.each(element, './xforms:group|./xforms:trigger', XML::DEFAULT_NS_MAPPINGS) do |child| - menu.add_separator if finished_compact - finished_compact = false - - label = REXML::XPath.first(child, './xforms:label', XML::DEFAULT_NS_MAPPINGS) - label_text = label ? label.text : nil - - case child.local_name - when 'group' - case child.attribute('appearance').value - when 'minimal' - build_submenu(menu, child) - when 'compact' - build_submenu(menu, child) - finished_compact = true - else - submenu = javax.swing.JMenu.new(label_text) - menu.add submenu - build_submenu(submenu, child) - end - when 'trigger' - item = javax.swing.JMenuItem.new(label_text) - menu.add item - verb = child.attribute('verb', XML::MINICOMIC_UI_NS) - item.add_action_listener verb_invoke_action(verb) if verb - end + later { @menubar.load_form(res.result) } end end - private :build_submenu - - def verb_invoke_action(verb) - Proc.new { invoke_verb verb } - end - private :verb_invoke_action - - def invoke_verb(verb) - puts "Verb #{verb} invoked" - end - private :invoke_verb + private :setup def close @session.close lib/minicomic/ui/shell.rb 7c4e4c2530af46f7e98f9aea0c837c0c8b021ddd MenTaLguY mental@rydia.net http://github.com/mental/minicomic/commit/8b3e663b9361f1b051dad25b94450761c3891321 8b3e663b9361f1b051dad25b94450761c3891321 2008-06-26T17:22:49-07:00 2008-06-26T17:22:49-07:00 split menubar into separate class 192f10a266f304ad4c7451f81e53c16c591d34b4 MenTaLguY mental@rydia.net