Commit c44f4204 by wangonghui

插件加载

parent a166200f
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<!-- 插件 --> <!-- 插件 -->
<TextBlock Text="插件:" Grid.Row="3" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0,0,10,0"></TextBlock> <TextBlock Text="插件:" Grid.Row="3" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0,0,10,0"></TextBlock>
<dxe:ComboBoxEdit Grid.Row="3" Grid.Column="1" Height="30" IsTextEditable="False" <dxe:ComboBoxEdit Grid.Row="3" Grid.Column="1" Height="30" IsTextEditable="False"
ItemsSource="{Binding Path=TemplatePlugins}" DisplayMember="DisplayName" ItemsSource="{Binding Path=TemplatePlugins}" DisplayMember="Name"
SelectedItem="{Binding Path=SelectedTemplatePlugin,Mode=TwoWay}"></dxe:ComboBoxEdit> SelectedItem="{Binding Path=SelectedTemplatePlugin,Mode=TwoWay}"></dxe:ComboBoxEdit>
<!-- 按钮组 --> <!-- 按钮组 -->
......
...@@ -369,6 +369,7 @@ namespace VIZ.Package.Module ...@@ -369,6 +369,7 @@ namespace VIZ.Package.Module
page.PageType = template.PageType; page.PageType = template.PageType;
page.TemplateID = template.TemplateID; page.TemplateID = template.TemplateID;
page.ThumbnailBitmap = template.ThumbnailBitmap; page.ThumbnailBitmap = template.ThumbnailBitmap;
page.PluginID = vm.SelectedTemplatePlugin?.ID;
this.SelectedPageGroupModel.Pages.Add(page); this.SelectedPageGroupModel.Pages.Add(page);
......
...@@ -19,6 +19,6 @@ ...@@ -19,6 +19,6 @@
d:DesignHeight="450" d:DesignWidth="800"> d:DesignHeight="450" d:DesignWidth="800">
<Grid> <Grid>
<fcommon:NavigationControl ItemsSource="{Binding ItemsSource}" <fcommon:NavigationControl ItemsSource="{Binding ItemsSource}"
SelectedValue="{Binding Path=SelectedItem,Mode=TwoWay}"></fcommon:NavigationControl> SelectedValue="{Binding Path=SelectedValue,Mode=OneWay}"></fcommon:NavigationControl>
</Grid> </Grid>
</UserControl> </UserControl>
...@@ -354,12 +354,6 @@ namespace VIZ.Package.Module ...@@ -354,12 +354,6 @@ namespace VIZ.Package.Module
} }
} }
} }
#endregion #endregion
......
...@@ -66,12 +66,12 @@ namespace VIZ.Package.Storage ...@@ -66,12 +66,12 @@ namespace VIZ.Package.Storage
/// <summary> /// <summary>
/// VIZ 引擎3路径 /// VIZ 引擎3路径
/// </summary> /// </summary>
public string VIZ_Eng3Path { get; set; } = @"D:\Program Files (x86)\Vizrt\Viz3\viz.exe"; public string VIZ_Eng3Path { get; set; } = @"C:\Program Files\Vizrt\Viz3\viz.exe";
/// <summary> /// <summary>
/// VIZ 引擎4路径 /// VIZ 引擎4路径
/// </summary> /// </summary>
public string VIZ_Eng4Path { get; set; } = @"D:\Program Files (x86)\Vizrt\Viz3\viz.exe"; public string VIZ_Eng4Path { get; set; } = @"C:\Program Files\Vizrt\Viz3\viz.exe";
/// <summary> /// <summary>
/// 引擎完整类型 /// 引擎完整类型
......
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