@@ -5,5 +5,5 @@ $:.push File.join(File.dirname(__FILE__), '..', 'lib') require 'redcar' Redcar.start -Redcar.app.gui.run_features(ARGV) +Redcar.gui.run_features(ARGV) Redcar.pump bin/cucumber @@ -4,13 +4,29 @@ require 'application/menu' require 'application/menu_item' module Redcar - def self.app - @app ||= Application.new + class << self + attr_reader :gui, :app + end + + def self.app=(app) + @app ||= app + end + + # Set the application GUI. + def self.gui=(gui) + raise "can't set gui twice" if @gui + @gui = gui + + bus["/system/ui/messagepump"].set_proc do + @gui.controller_for(@app) + @gui.start + end end class Application NAME = "Redcar" + include Redcar::Model include FreeBASE::DataBusHelper def self.load @@ -18,12 +34,16 @@ module Redcar end def self.start + Redcar.app = Application.new Redcar.app.new_window end + def initialize + end + # Immediately halts the gui event loop. def quit - @gui.stop + Redcar.gui.stop end # Return a list of all open windows @@ -35,22 +55,17 @@ module Redcar def new_window new_window = Application::Window.new windows << new_window - @gui.controller_for(new_window) - menu = Menu.new - menu << Menu.new("File") - menu << Menu.new("Help") + Redcar.gui.controller_for(new_window) + # menu = Menu.new + # menu << Menu.new("File") + # menu << Menu.new("Help") + new_window.show end - # Set the application GUI. - def gui=(gui) - raise "can't set gui twice" if @gui - @gui = gui - - bus["/system/ui/messagepump"].set_proc do - @gui.start - end + # The main menu. + def menu=(menu) + @menu = menu end - attr_reader :gui end end \ No newline at end of file plugins/application/lib/application.rb @@ -15,6 +15,10 @@ module Redcar Window.all << self end + def show + controller.show + end + def title "Redcar" end plugins/application/lib/application/window.rb @@ -5,7 +5,9 @@ require "application_swt/window" require "application_swt/cucumber_runner" module Redcar - module ApplicationSWT + class ApplicationSWT + include Redcar::Controller + def self.display @display ||= Swt::Widgets::Display.new end @@ -13,10 +15,11 @@ module Redcar def self.load Swt::Widgets::Display.app_name = Redcar::Application::NAME gui = Redcar::Gui.new("swt") + gui.register_controller(Application => ApplicationSWT) gui.register_event_loop(EventLoop.new) gui.register_controller(Application::Window => Window) gui.register_features_runner(CucumberRunner.new) - Redcar.app.gui = gui + Redcar.gui = gui end end end plugins/application_swt/lib/application_swt.rb @@ -1,5 +1,5 @@ module Redcar - module ApplicationSWT + class ApplicationSWT class CucumberRunner START_DELAY = 1 plugins/application_swt/lib/application_swt/cucumber_runner.rb @@ -1,6 +1,6 @@ module Redcar - module ApplicationSWT + class ApplicationSWT class EventLoop def initialize @running = false plugins/application_swt/lib/application_swt/event_loop.rb @@ -1,14 +1,16 @@ module Redcar - module ApplicationSWT + class ApplicationSWT class Window include Redcar::Controller - def initialize(window) - @window = window + def initialize @shell = Swt::Widgets::Shell.new(ApplicationSWT.display) + end + + def show @shell.open - @shell.text = window.title + @shell.text = @model.title end def close plugins/application_swt/lib/application_swt/window.rb @@ -32,7 +32,7 @@ module Redcar # # @param [Object] an instance of a Redcar model def controller_for(model) - controller = @controllers[model.class].first.new(model) + controller = @controllers[model.class].first.new model.controller = controller controller.model = model end plugins/core/lib/core/gui.rb 9f668ebe88b51073f4292f839eeed3c977764ebc Daniel Lucraft dan@fluentradical.com http://github.com/danlucraft/redcar/commit/a402cc376481c2743ec18b635144852133ca988e a402cc376481c2743ec18b635144852133ca988e 2009-09-27T03:02:14-07:00 2009-09-27T03:02:14-07:00 Refactored ApplicationSWT to be a controller for Application. Moved gui up to be global 40af123122b07f2d363bdfc677f768fa0729e5d5 Daniel Lucraft dan@fluentradical.com