IronNails.Contracts/ViewModels/LoginViewModel.cs @@ -93,6 +93,7 @@ <DependentUpon>Settings.settings</DependentUpon> <DesignTimeSharedInput>True</DesignTimeSharedInput> </Compile> + <Compile Include="ViewModels\LoginViewModel.cs" /> <Compile Include="ViewModels\MainWindowViewModel.cs"> <SubType>Code</SubType> </Compile> IronNails.Contracts/IronNails.Contracts.csproj @@ -80,7 +80,8 @@ namespace IronNails.Library /// <param name="arg">The arg.</param> void ICommand.Execute(object arg) { - ((UIElement) arg).Dispatcher.Invoke(DispatcherPriority.Normal, _handler); + //((UIElement) arg).Dispatcher.Invoke(DispatcherPriority.Normal, _handler); + _handler(); } #endregion IronNails.Library/DelegateCommand.cs @@ -1,6 +1,6 @@ class LoginController < IronNails::Controller::Base - view_object :username + view_object :username, "Hello" view_object :password view_action :authenticate IronNails/app/controllers/login_controller.rb @@ -2,10 +2,11 @@ class MainWindowController < IronNails::Controller::Base view_object :status_bar_message, "The message" - view_action :refresh_feeds, :mode => :asynchronous + view_action :refresh_feeds def refresh_feeds @status_bar_message = "#@status_bar_message 1" + add_child_view(:content, :login) end end \ No newline at end of file IronNails/app/controllers/main_window_controller.rb @@ -3,15 +3,16 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:behaviors="clr-namespace:IronNails.Library.Behaviors;assembly=IronNails.Library" mc:Ignorable="d" x:Name="LoginControl" Width="225" Height="270"> <Border x:Name="layout_root" CornerRadius="5,5,5,5" BorderBrush="{DynamicResource PrimaryBorderBrush}" BorderThickness="1,0,1,1" Background="{DynamicResource LoginBackgroundBrush}"> <StackPanel Width="150" VerticalAlignment="Center"> <Label Content="Username:"/> - <TextBox HorizontalAlignment="Stretch" Margin="5,0,0,0" Text="{Binding Objects[UserName].Value}" x:Name="username" TextWrapping="Wrap"/> + <TextBox HorizontalAlignment="Stretch" Margin="5,0,0,0" Text="{Binding Objects[Username].Value}" x:Name="username" TextWrapping="Wrap"/> <Label Content="Password:"/> - <PasswordBox HorizontalAlignment="Stretch" Margin="5,0,0,0" x:Name="password" Text="{Binding Objects[Password].Value}" Width="Auto"/> + <PasswordBox HorizontalAlignment="Stretch" Margin="5,0,0,0" x:Name="password" Width="Auto"/> <Button HorizontalAlignment="Stretch" Margin="10,15,10,0" behaviors:ClickBehavior.LeftClick="{Binding Commands[Authenticate] }" x:Name="login_button" Content="Login" IsDefault="True"/> </StackPanel> </Border> IronNails/app/views/login.xaml IronNails/bin/IronNails.Contracts.dll IronNails/bin/IronNails.Contracts.pdb IronNails/bin/IronNails.Library.dll IronNails/vendor/iron_nails/bin/IronNails.Library.dll IronNails/vendor/iron_nails/bin/IronNails.Library.pdb @@ -26,8 +26,9 @@ module IronNails end def add_child_view(target, view_name) - controller = "#{view_name.camelize}Controller".classify.new + controller = "#{view_name.to_s.camelize}Controller".classify.new controller.setup_for_showing_view + controller.view_model.configure_view_for_showing current_view.add_control(target, controller.current_view.instance) end IronNails/vendor/iron_nails/lib/controller/base.rb @@ -48,6 +48,11 @@ module IronNails # shows this view (probably a window) def show_view(reload=false) + configure_view_for_showing + view.show + end + + def configure_view_for_showing unless configured? if view.nil? || reload load_and_configure_view @@ -55,7 +60,6 @@ module IronNails configure_view end end - view.show end # returns a configured instance of the view IronNails/vendor/iron_nails/lib/view/view_model.rb @@ -14,7 +14,7 @@ module IronNails def_delegators :@model, :view, :show_view, :synchronise_with_controller, :delete_observers, :count_observers, :add_observer, - :delete_observer, :set_view_name + :delete_observer, :set_view_name, :configure_view_for_showing def_delegator :@model, :class, :viewmodel_class IronNails/vendor/iron_nails/lib/view/view_model_builder.rb @@ -107,7 +107,7 @@ module IronNails if parent.respond_to? :content= parent.content = view elsif parent.respond_to? :children - parent.children.add command[:view] + parent.children.add view end end IronNails/vendor/iron_nails/lib/view/view_proxy.rb libs/IronNails.Library.dll 63a32766268aff19ca9518da98f84952fce676ae Ivan Porto Carrero ivan@flanders.co.nz http://github.com/casualjim/ironnails/commit/95d51db2e545f6feed536723968e47b02d375094 95d51db2e545f6feed536723968e47b02d375094 2008-08-22T04:33:02-07:00 2008-08-22T04:33:02-07:00 We now have the ability to use subviews with their presenters f048286c3a69fadb01ef0e4fa79abcdc59cb608a Ivan Porto Carrero ivan@flanders.co.nz