Merge branch 'master' of http://49.233.21.66/liulongfei/VIZ.Package

VIZ.Package.Domain/Plugin/PluginInfo.cs

@@ -69,6 +69,20 @@ namespace VIZ.Package.Domain
 
         #endregion
 
+        #region Icon -- 图标
+
+        private string icon;
+        /// <summary>
+        /// 图标
+        /// </summary>
+        public string Icon
+        {
+            get { return icon; }
+            set { icon = value; this.RaisePropertyChanged(nameof(Icon)); }
+        }
+
+        #endregion
+
         #region ViewType -- 视图类型
 
         private Type viewType;

VIZ.Package.Module.Resource/VIZ.Package.Module.Resource.csproj

@@ -258,5 +258,11 @@
   <ItemGroup>
     <Resource Include="Icons\icon_clear_32x32.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Icons\icon_init_32x32.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\login_large2.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file

VIZ.Package.Module/Login/View/LoginView.xaml

@@ -27,8 +27,8 @@
                 <RowDefinition Height="*"></RowDefinition>
                 <RowDefinition Height="50"></RowDefinition>
             </Grid.RowDefinitions>
-            <Image HorizontalAlignment="Center"
-                   Source="/VIZ.Package.Module.Resource;component/Images/logo_large.png"></Image>
+            <Image HorizontalAlignment="Center" Width="114" Height="114"
+                   Source="/VIZ.Package.Module.Resource;component/Images/login_large2.png"></Image>
             <TextBlock Text="摩羯座播控系统" Grid.Row="1" VerticalAlignment="Center" 
                        HorizontalAlignment="Center" FontSize="24"></TextBlock>
         </Grid>

VIZ.Package.Module/Main/View/MainView.xaml

@@ -37,6 +37,9 @@
             <Setter Property="Caption" Value="{Binding Name}" />
             <Setter Property="MinHeight" Value="60"></Setter>
             <Setter Property="ShowCloseButton" Value="True"></Setter>
+            <Setter Property="CaptionImage" Value="{Binding Path=Icon}"></Setter>
+            <Setter Property="ShowCaptionImage" Value="True"></Setter>
+            <Setter Property="CaptionWidth" Value="16"></Setter>
             <Setter Property="Closed" Value="{Binding Path=IsClosed,Mode=TwoWay}"></Setter>
         </Style>
         <Style TargetType="{x:Type dxdo:DocumentPanel}">
@@ -45,6 +48,9 @@
             <Setter Property="Caption" Value="{Binding Name}" />
             <Setter Property="MinHeight" Value="40"></Setter>
             <Setter Property="ShowCloseButton" Value="True"></Setter>
+            <Setter Property="CaptionImage" Value="{Binding Path=Icon}"></Setter>
+            <Setter Property="ShowCaptionImage" Value="True"></Setter>
+            <Setter Property="CaptionWidth" Value="24"></Setter>
             <Setter Property="Closed" Value="{Binding Path=IsClosed,Mode=TwoWay}"></Setter>
         </Style>
     </UserControl.Resources>

VIZ.Package.Module/Main/View/MainView.xaml.cs

-using System;
+using DevExpress.Xpf.Docking;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

VIZ.Package.Module/Page/Group/View/PageGroupView.xaml

@@ -46,6 +46,12 @@
                                     ToolTip="清理内存" Margin="5,0,0,0" 
                                     IconWidth="24" IconHeight="24" Width="24" Height="24"
                                     Command="{Binding TakeClearCommand}"></fcommon:IconButton>
+                <!-- 初始化 -->
+                <fcommon:IconButton Icon="/VIZ.Package.Module.Resource;component/Icons/icon_init_32x32.png"
+                                    Style="{StaticResource IconButton_Menu_Mask}"
+                                    ToolTip="初始化" Margin="5,0,0,0" 
+                                    IconWidth="24" IconHeight="24" Width="24" Height="24"
+                                    Command="{Binding TakeInitAllCommand}"></fcommon:IconButton>
             </StackPanel>
         </Border>
 
@@ -131,11 +137,16 @@
                                                                           DisplayMember="Name" ValueMember="GroupID" IsTextEditable="False"></dxe:ComboBoxEditSettings>
                                             </dxg:GridColumn.EditSettings>
                                         </dxg:GridColumn>
-                                        <dxg:GridColumn Header="加载" ReadOnly="True" AllowSorting="False" AllowColumnFiltering="False" AllowEditing="False"
-                                                        Binding="{Binding Path=SceneInfo.TakeInitedProgress}">
-                                            <dxg:GridColumn.EditSettings>
-                                                <dxe:ProgressBarEditSettings ContentDisplayMode="Value" Minimum="0" Maximum="1" />
-                                            </dxg:GridColumn.EditSettings>
+                                        <dxg:GridColumn Header="加载" ReadOnly="True" AllowSorting="False" AllowColumnFiltering="False" AllowEditing="False">
+                                            <dxg:GridColumn.CellTemplate>
+                                                <DataTemplate>
+                                                    <Grid Background="Transparent" ToolTip="{Binding Path=Row.SceneInfo.TakeInitedMessage}">
+                                                        <dxe:ProgressBarEdit Minimum="0" Maximum="1" ContentDisplayMode="Value" 
+                                                                             DisplayFormatString="{}{0:P}" Height="30" ShowBorder="False" Background="Transparent"
+                                                                             EditValue="{Binding Path=Row.SceneInfo.TakeInitedProgress}"></dxe:ProgressBarEdit>
+                                                    </Grid>
+                                                </DataTemplate>
+                                            </dxg:GridColumn.CellTemplate>
                                         </dxg:GridColumn>
                                         <dxg:GridColumn Header="引擎类型" FieldName="EngineType" ReadOnly="True" AllowSorting="False" AllowColumnFiltering="False"></dxg:GridColumn>
                                         <dxg:GridColumn Header="模板类型" ReadOnly="True" AllowSorting="False" AllowColumnFiltering="False"

VIZ.Package.Module/Page/Group/ViewModel/PageGroupViewModel.cs

@@ -50,6 +50,7 @@ namespace VIZ.Package.Module
             this.UpdateCommand = new VCommand(this.Update);
             this.TakeClearCommand = new VCommand(this.TakeClear);
             this.TakeInitCommand = new VCommand(this.TakeInit);
+            this.TakeInitAllCommand = new VCommand(this.TakeInitAll);
         }
 
         /// <summary>
@@ -417,6 +418,32 @@ namespace VIZ.Package.Module
 
         #endregion
 
+        #region TakeInitAllCommand -- 初始化全部命令
+
+        /// <summary>
+        /// 初始化全部命令
+        /// </summary>
+        public VCommand TakeInitAllCommand { get; set; }
+
+        /// <summary>
+        /// 初始化全部
+        /// </summary>
+        private void TakeInitAll()
+        {
+            if (this.SelectedPageGroupModel == null)
+                return;
+
+            if (this.SelectedPageGroupModel.Pages == null || this.SelectedPageGroupModel.Pages.Count == 0)
+                return;
+
+            List<PageModel> pages = this.SelectedPageGroupModel.Pages.ToList();
+
+            // 开始初始化
+            this.pageViewModelHelper.BeginTakeInit(pages);
+        }
+
+        #endregion
+
         // ======================================================================================
         // Message
         // ======================================================================================

VIZ.Package.Module/Plugin/PluginPluginLifeCycle.cs

@@ -42,7 +42,7 @@ namespace VIZ.Package.Module
             info.ID = PLUGIN_ID;
             info.Name = PLUGIN_NAME;
             info.ViewType = typeof(PluginView);
-
+            info.Icon = "/VIZ.Package.Module.Resource;component/Icons/icon_clear_32x32.png";
             return info;
         }
 

VIZ.Package/LoginWindow.xaml

@@ -3,8 +3,9 @@
                  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                  xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
                  xmlns:module="clr-namespace:VIZ.Package.Module;assembly=VIZ.Package.Module"
-                 Title="摩羯座播控系统" Height="600" Width="520" ControlBoxButtonSet="Close,Minimize"
-                 WindowStartupLocation="CenterScreen">
+                 Title="摩羯座播控系统" Height="600" Width="500" ControlBoxButtonSet="Close,Minimize"
+                 ResizeMode="NoResize"
+                 WindowStartupLocation="CenterScreen" BorderBrush="Black">
 
     <module:LoginView></module:LoginView>