diff --git a/EgtWindowMaker/CRMPage/CRMPageV.xaml b/EgtWindowMaker/CRMPage/CRMPageV.xaml index bf1d8dc..67838fa 100644 --- a/EgtWindowMaker/CRMPage/CRMPageV.xaml +++ b/EgtWindowMaker/CRMPage/CRMPageV.xaml @@ -38,7 +38,8 @@ + TabStripPlacement="Right" + Style="{StaticResource TabControl.NoHeader}"> diff --git a/EgtWindowMaker/EstimationDetailPage/EstimationDetailPageVM.vb b/EgtWindowMaker/EstimationDetailPage/EstimationDetailPageVM.vb index a373d24..b0fd6d8 100644 --- a/EgtWindowMaker/EstimationDetailPage/EstimationDetailPageVM.vb +++ b/EgtWindowMaker/EstimationDetailPage/EstimationDetailPageVM.vb @@ -420,6 +420,7 @@ Public Class TemplateRow m_sName = sName m_dWidth = dWidth m_dHeight = dHeight + m_sImagePath = Map.refMainWindowVM.MainWindowM.sTemplateDir & "\" & nId & ".png" End Sub End Class diff --git a/EgtWindowMaker/MainWindow/MainWindowV.xaml b/EgtWindowMaker/MainWindow/MainWindowV.xaml index 238fd4a..23be767 100644 --- a/EgtWindowMaker/MainWindow/MainWindowV.xaml +++ b/EgtWindowMaker/MainWindow/MainWindowV.xaml @@ -8,9 +8,9 @@ - + SelectedIndex="{Binding SelPage}" + Style="{StaticResource TabControl.NoHeader}"> @@ -21,7 +21,15 @@ - + + + + + + + + diff --git a/EgtWindowMaker/ManageWindow/ManageWindowV.xaml b/EgtWindowMaker/ManageWindow/ManageWindowV.xaml index a9a3c63..28f3631 100644 --- a/EgtWindowMaker/ManageWindow/ManageWindowV.xaml +++ b/EgtWindowMaker/ManageWindow/ManageWindowV.xaml @@ -77,6 +77,16 @@ + + + + + +