Skip to content

V
VIZ.Package
Commit 3426b97c by liulongfei
Options

样式调整

parent c7af1699
Showing with 18 additions and 5 deletions
VIZ.Package.Module/Main/View/MainStatusView.xaml
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="*"></ColumnDefinition> <ColumnDefinition Width="*"></ColumnDefinition>
<ColumnDefinition Width="200"></ColumnDefinition> <ColumnDefinition Width="300"></ColumnDefinition>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<StackPanel Orientation="Horizontal" VerticalAlignment="Center"> <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
<!-- 項目名 --> <!-- 項目名 -->
......
VIZ.Package.Module/Main/View/MainView.xaml
...@@ -29,12 +29,14 @@ ...@@ -29,12 +29,14 @@
</Style>--> </Style>-->
<Style TargetType="{x:Type dxdo:LayoutPanel}"> <Style TargetType="{x:Type dxdo:LayoutPanel}">
<Setter Property="FloatOnDoubleClick" Value="False"></Setter>
<Setter Property="BindableName" Value="{Binding ID}" /> <Setter Property="BindableName" Value="{Binding ID}" />
<Setter Property="Caption" Value="{Binding Name}" /> <Setter Property="Caption" Value="{Binding Name}" />
<Setter Property="ShowCloseButton" Value="True"></Setter> <Setter Property="ShowCloseButton" Value="True"></Setter>
<Setter Property="Closed" Value="{Binding Path=IsClosed,Mode=TwoWay}"></Setter> <Setter Property="Closed" Value="{Binding Path=IsClosed,Mode=TwoWay}"></Setter>
</Style> </Style>
<Style TargetType="{x:Type dxdo:DocumentPanel}"> <Style TargetType="{x:Type dxdo:DocumentPanel}">
<Setter Property="FloatOnDoubleClick" Value="False"></Setter>
<Setter Property="BindableName" Value="{Binding ID}" /> <Setter Property="BindableName" Value="{Binding ID}" />
<Setter Property="Caption" Value="{Binding Name}" /> <Setter Property="Caption" Value="{Binding Name}" />
<Setter Property="ShowCloseButton" Value="True"></Setter> <Setter Property="ShowCloseButton" Value="True"></Setter>
......
VIZ.Package.Module/Main/ViewModel/MainStatusViewModel.cs
...@@ -93,6 +93,7 @@ namespace VIZ.Package.Module ...@@ -93,6 +93,7 @@ namespace VIZ.Package.Module
private void OpenVizCommandLogWindow() private void OpenVizCommandLogWindow()
{ {
ApplicationDomainEx.VizCommandLogWindow.Visibility = System.Windows.Visibility.Visible; ApplicationDomainEx.VizCommandLogWindow.Visibility = System.Windows.Visibility.Visible;
ApplicationDomainEx.VizCommandLogWindow.WindowState = System.Windows.WindowState.Normal;
} }
#endregion #endregion
...@@ -110,6 +111,7 @@ namespace VIZ.Package.Module ...@@ -110,6 +111,7 @@ namespace VIZ.Package.Module
private void OpenErrorLogWindow() private void OpenErrorLogWindow()
{ {
ApplicationDomainEx.ErrorLogWindow.Visibility = System.Windows.Visibility.Visible; ApplicationDomainEx.ErrorLogWindow.Visibility = System.Windows.Visibility.Visible;
ApplicationDomainEx.ErrorLogWindow.WindowState = System.Windows.WindowState.Normal;
} }
#endregion #endregion
......
VIZ.Package.Module/Main/ViewModel/MainViewModel.cs
...@@ -96,9 +96,11 @@ namespace VIZ.Package.Module ...@@ -96,9 +96,11 @@ namespace VIZ.Package.Module
// 创建VizCommand窗口 // 创建VizCommand窗口
ApplicationDomainEx.VizCommandLogWindow = new VizCommandWindow(); ApplicationDomainEx.VizCommandLogWindow = new VizCommandWindow();
ApplicationDomainEx.VizCommandLogWindow.Owner = ApplicationDomainEx.MainWindow;
// 创建Error窗口 // 创建Error窗口
ApplicationDomainEx.ErrorLogWindow = new ErrorLogWindow(); ApplicationDomainEx.ErrorLogWindow = new ErrorLogWindow();
ApplicationDomainEx.ErrorLogWindow.Owner = ApplicationDomainEx.MainWindow;
} }
#endregion #endregion
......
VIZ.Package.Module/Page/Group/View/PageGroupView.xaml
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
</UserControl.Resources> </UserControl.Resources>
<Grid IsEnabled="{Binding IsEnabled}"> <Grid IsEnabled="{Binding IsEnabled}">
<dx:DXTabControl Grid.Row="1" Margin="0,10,0,0" <dx:DXTabControl Grid.Row="1" Margin="0,5,0,0" Padding="0,5,0,0"
ItemsSource="{Binding Path=PageGroupModels}" ItemsSource="{Binding Path=PageGroupModels}"
SelectedItem="{Binding Path=SelectedPageGroupModel,Mode=TwoWay}"> SelectedItem="{Binding Path=SelectedPageGroupModel,Mode=TwoWay}">
<dx:DXTabControl.ContextMenu> <dx:DXTabControl.ContextMenu>
......
VIZ.Package.Module/Page/Templage/View/PageTemplateView.xaml
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
</UserControl.Resources> </UserControl.Resources>
<Grid IsEnabled="{Binding Path=IsEnabled}"> <Grid IsEnabled="{Binding Path=IsEnabled}">
<dx:DXTabControl Margin="0,10,0,10"> <dx:DXTabControl Margin="0,5,0,0" Padding="0,5,0,0">
<dx:DXTabItem Header="场景模板"> <dx:DXTabItem Header="场景模板" BorderBrush="Transparent">
<dxg:GridControl ItemsSource="{Binding Path=SceneTemplateModels}" ShowBorder="False" <dxg:GridControl ItemsSource="{Binding Path=SceneTemplateModels}" ShowBorder="False"
SelectedItem="{Binding Path=SelectedSceneTemplateModel,Mode=TwoWay}"> SelectedItem="{Binding Path=SelectedSceneTemplateModel,Mode=TwoWay}">
<dxg:GridControl.ContextMenu> <dxg:GridControl.ContextMenu>
......
VIZ.Package/VIZ.Package.csproj
...@@ -54,6 +54,9 @@ ...@@ -54,6 +54,9 @@
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit> <Prefer32Bit>true</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<PropertyGroup>
<ApplicationIcon>logo.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="DevExpress.Data.Desktop.v22.1, Version=22.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" /> <Reference Include="DevExpress.Data.Desktop.v22.1, Version=22.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Data.v22.1, Version=22.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" /> <Reference Include="DevExpress.Data.v22.1, Version=22.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
...@@ -206,6 +209,9 @@ ...@@ -206,6 +209,9 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
</ItemGroup> </ItemGroup>
<ItemGroup>
<Resource Include="logo.ico" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup> <PropertyGroup>
<PostBuildEvent>echo ========================================================== <PostBuildEvent>echo ==========================================================
......
VIZ.Package/config/config.ini
[Application] [Application]
APPLICATION_IS_DEBUG=true APPLICATION_IS_DEBUG=false
[Viz] [Viz]
VIZ_IMAGE_FILTER=ͼƬ|*.jpg;*.jpeg;*.bmp;*.png; VIZ_IMAGE_FILTER=ͼƬ|*.jpg;*.jpeg;*.bmp;*.png;
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment