样式调整

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

@@ -4,7 +4,10 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:dxb="http://schemas.devexpress.com/winfx/2008/xaml/bars"
              xmlns:dxb="http://schemas.devexpress.com/winfx/2008/xaml/bars"
+             xmlns:dxbt="http://schemas.devexpress.com/winfx/2008/xaml/bars/themekeys"
              xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
              xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
+             xmlns:dxn="http://schemas.devexpress.com/winfx/2008/xaml/core/internal"
+             xmlns:dxet="http://schemas.devexpress.com/winfx/2008/xaml/editors/themekeys"
              xmlns:dxmvvm="http://schemas.devexpress.com/winfx/2008/xaml/mvvm"
              xmlns:dxmvvm="http://schemas.devexpress.com/winfx/2008/xaml/mvvm"
              xmlns:fcore="clr-namespace:VIZ.Framework.Core;assembly=VIZ.Framework.Core"
              xmlns:fcore="clr-namespace:VIZ.Framework.Core;assembly=VIZ.Framework.Core"
              d:DataContext="{d:DesignInstance Type=local:MainTopViewModel}" 
              d:DataContext="{d:DesignInstance Type=local:MainTopViewModel}" 
@@ -21,6 +24,7 @@
                                   IsChecked="{Binding Path=IsClosed,Mode=TwoWay,Converter={StaticResource Bool2BoolConverterSimple}}"></dxb:BarCheckItem>
                                   IsChecked="{Binding Path=IsClosed,Mode=TwoWay,Converter={StaticResource Bool2BoolConverterSimple}}"></dxb:BarCheckItem>
             </ContentControl>
             </ContentControl>
         </DataTemplate>
         </DataTemplate>
+
     </UserControl.Resources>
     </UserControl.Resources>
 
 
     <dxmvvm:Interaction.Behaviors>
     <dxmvvm:Interaction.Behaviors>
@@ -28,7 +32,22 @@
     </dxmvvm:Interaction.Behaviors>
     </dxmvvm:Interaction.Behaviors>
 
 
     <StackPanel Orientation="Horizontal">
     <StackPanel Orientation="Horizontal">
-        <dxb:MainMenuControl Caption="MainMenu" VerticalAlignment="Center">
+        <Image Source="/VIZ.Package;component/logo.ico" Margin="2,5,2,2"
+               VerticalAlignment="Center"></Image>
+
+        <dxb:MainMenuControl Caption="MainMenu" VerticalAlignment="Center" Margin="10,0,0,0">
+            <dxb:MainMenuControl.Resources>
+                <Style TargetType="dxb:BarSubItem">
+                    <Setter Property="Margin" Value="0,0,5,0"></Setter>
+                    <Setter Property="ContentTemplate">
+                        <Setter.Value>
+                            <DataTemplate>
+                                <TextBlock Text="{Binding .}" FontSize="15"></TextBlock>
+                            </DataTemplate>
+                        </Setter.Value>
+                    </Setter>
+                </Style>
+            </dxb:MainMenuControl.Resources>
             <dxb:BarSubItem Content="项目" IsEnabled="{Binding Path=IsVizPreviewReady}">
             <dxb:BarSubItem Content="项目" IsEnabled="{Binding Path=IsVizPreviewReady}">
                 <dxb:BarButtonItem Content="新建" Glyph="/VIZ.Package.Module.Resource;component/Icons/top_icon_create_20x20.png"
                 <dxb:BarButtonItem Content="新建" Glyph="/VIZ.Package.Module.Resource;component/Icons/top_icon_create_20x20.png"
                                    Command="{Binding Path=CreateProjectCommand}" />
                                    Command="{Binding Path=CreateProjectCommand}" />

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

-using System;
+using DevExpress.Xpf.Bars;
+using DevExpress.Xpf.Core.Native;
+using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq;
 using System.Text;
 using System.Text;
@@ -24,7 +26,7 @@ namespace VIZ.Package.Module
         public MainTopView()
         public MainTopView()
         {
         {
             InitializeComponent();
             InitializeComponent();
-
+            
             WPFHelper.BindingViewModel(this, new MainTopViewModel());
             WPFHelper.BindingViewModel(this, new MainTopViewModel());
         }
         }
     }
     }

VIZ.Package.Module/ProjectManager/ViewModel/ProjectTreePanelModel.cs

@@ -248,6 +248,11 @@ namespace VIZ.Package.Module
         /// </summary>
         /// </summary>
         private void Loaded()
         private void Loaded()
         {
         {
+            if (!System.IO.Directory.Exists(PROJECT_ROOT_FOLDER))
+            {
+                System.IO.Directory.CreateDirectory(PROJECT_ROOT_FOLDER);
+            }
+
             this.RootFolder = new FolderModel(PROJECT_ROOT_FOLDER);
             this.RootFolder = new FolderModel(PROJECT_ROOT_FOLDER);
             this.FolderModels = new ObservableCollection<FolderModel> { this.RootFolder };
             this.FolderModels = new ObservableCollection<FolderModel> { this.RootFolder };
             this.TryLoadFolders(this.RootFolder, true);
             this.TryLoadFolders(this.RootFolder, true);

VIZ.Package/MainWindow.xaml

@@ -2,14 +2,16 @@
                  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                  xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
                  xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
+                 xmlns:dxcn="http://schemas.devexpress.com/winfx/2008/xaml/core/internal"
                  xmlns:module="clr-namespace:VIZ.Package.Module;assembly=VIZ.Package.Module"
                  xmlns:module="clr-namespace:VIZ.Package.Module;assembly=VIZ.Package.Module"
-                 Title="魔羯座" Height="1000" Width="1600" ShowTitle="False" Padding="0"
+                 Title="魔羯座" Height="1000" Width="1600" ShowTitle="False" Padding="0" ShowIcon="False"
+                 dxcn:WindowChrome.CaptionHeight="30"
                  WindowStartupLocation="CenterScreen" WindowState="Maximized">
                  WindowStartupLocation="CenterScreen" WindowState="Maximized">
     <dx:ThemedWindow.ToolbarItems>
     <dx:ThemedWindow.ToolbarItems>
         <!-- 主视图顶部 -->
         <!-- 主视图顶部 -->
-        <module:MainTopView></module:MainTopView>
+        <module:MainTopView ></module:MainTopView>
     </dx:ThemedWindow.ToolbarItems>
     </dx:ThemedWindow.ToolbarItems>
-    <Grid>
+    <Grid Margin="0,5,0,0">
         <Grid.RowDefinitions>
         <Grid.RowDefinitions>
             <RowDefinition Height="*"></RowDefinition>
             <RowDefinition Height="*"></RowDefinition>
             <RowDefinition Height="25"></RowDefinition>
             <RowDefinition Height="25"></RowDefinition>