diff --git a/CompoPanel/CompoPanelViewModel.vb b/CompoPanel/CompoPanelViewModel.vb
index 71d6589..2072f99 100644
--- a/CompoPanel/CompoPanelViewModel.vb
+++ b/CompoPanel/CompoPanelViewModel.vb
@@ -81,8 +81,8 @@ Public Class CompoPanelViewModel
Dim m_CurrCompoType As CompoType = DirectCast(param, CompoType)
If Not IsNothing(m_rfDoorParametersViewModel.CurrDoor) Then
m_rfDoorParametersViewModel.CurrDoor.AddNewCompo(m_CurrCompoType)
- 'richiamo la pagina della guida ssociata alla componente selezionata
- GuideViewModel.m_AddressGuide = "Compo" & "\" & m_CurrCompoType.DDFName
+ ''richiamo la pagina della guida ssociata alla componente selezionata
+ 'GuideViewModel.m_AddressGuide = "Compo" & "\" & m_CurrCompoType.DDFName
Else
MessageBox.Show(EgtMsg(50108), EgtMsg(50101), MessageBoxButton.OK, MessageBoxImage.Exclamation)
End If
diff --git a/Constants/ConstCompo.vb b/Constants/ConstCompo.vb
index a65e470..d2c326e 100644
--- a/Constants/ConstCompo.vb
+++ b/Constants/ConstCompo.vb
@@ -28,6 +28,7 @@ Module ConstCompo
Public Const K_LINE As String = "Line"
Public Const K_DATE As String = "date"
+ Public Const K_FRAME As String = "frame"
Public Const S_COMPO As String = "Compo"
Public Const S_TEMPLATE As String = "Template"
@@ -56,6 +57,8 @@ Module ConstCompo
Public Const K_SCORE As String = " - "
Public Const K_SPACE3 As String = " "
Public Const K_SPACE5 As String = " "
+ Public Const K_PARTIALEND As String = " --- "
+ Public Const K_END As String = " ... "
Public Const K_LIST As String = "List"
Public Const K_ON As String = "ON"
Public Const K_OFF As String = "OFF"
diff --git a/DoorManager/DoorManagerViewModel.vb b/DoorManager/DoorManagerViewModel.vb
index 97942ff..81d68e2 100644
--- a/DoorManager/DoorManagerViewModel.vb
+++ b/DoorManager/DoorManagerViewModel.vb
@@ -6,14 +6,20 @@ Imports EgtUILib
Public Class DoorManagerViewModel
Implements INotifyPropertyChanged
Private m_rfMainWindowViewModel As MainWindowViewModel
- ' percorso della porta corrente (creata o già esistente nella cartella)
+ ' percorso della porta corrente (creata o già esistente nella cartella) !!! attenzione !!!
+ ' ora non si parla piu di avere una porta selezoionata ma ben si un assemblay selezionato,
+ ' questo comporta che possono esistere anche due porte contemporaneamente
Private m_SelectedDoor As String
Private NewDoor As Boolean = False
Friend DeleteNewDoor As Integer = 1
+
Private SelDoor As New Door
+ ' devo aggiungere la possibilità di creare anche una seconda porta (o in latermativa di non creare nessuna porta?)
+ Private SelDoor2 As New Door
+
Friend MsgResult As MessageBoxResult
- ' creiamo un nuovo progetto: un nome e una lista di porte
+ ' creiamo un nuovo progetto: un nome e una lista di porte--> questo non deve essere modificato
Private m_CurrProject As New Project
Public Property CurrProject As Project
Get
@@ -24,7 +30,7 @@ Public Class DoorManagerViewModel
End Set
End Property
- ' percorso della porta in lettura (o creazione)
+ ' percorso della porta in lettura (o creazione)--> che in realtà è i percorso dell'assemblay
Public Property SelectedDoor As String
Get
Return m_SelectedDoor
@@ -84,7 +90,7 @@ Public Class DoorManagerViewModel
End Sub
#Region "METHODS"
-
+ ' questa funzione permetterà di leggere la scelta dell'assemblato (il nome del file da aprire)
Friend Function ChooseSelectedDoor(value As String) As Boolean
Dim Index As Integer = -1
diff --git a/DoorParameters/DoorParametersViewModel.vb b/DoorParameters/DoorParametersViewModel.vb
index debd1bf..7ed8f2c 100644
--- a/DoorParameters/DoorParametersViewModel.vb
+++ b/DoorParameters/DoorParametersViewModel.vb
@@ -157,7 +157,7 @@ Public Class DoorParametersViewModel
Public Sub F1Guide()
Dim rfGuideViewModel As New GuideViewModel
If String.IsNullOrEmpty(GuideViewModel.m_AddressGuide) Then
- GuideViewModel.m_AddressGuide = "1_1.html"
+ GuideViewModel.m_AddressGuide = "Test.html"
End If
m_rfMainWindowViewModel.ProjectManagerViewModel.Guide()
End Sub
diff --git a/EgtDOORCreator.vbproj b/EgtDOORCreator.vbproj
index 85fafae..1569167 100644
--- a/EgtDOORCreator.vbproj
+++ b/EgtDOORCreator.vbproj
@@ -127,6 +127,7 @@
CompoPanelView.xaml
+
diff --git a/Guide/GuideView.xaml.vb b/Guide/GuideView.xaml.vb
index 736718c..3124173 100644
--- a/Guide/GuideView.xaml.vb
+++ b/Guide/GuideView.xaml.vb
@@ -10,7 +10,7 @@
' Add any initialization after the InitializeComponent() call.
Me.DataContext = GuideViewModel
m_GuideViewModel = GuideViewModel
- DoorBrowser.Navigate(New Uri(IniFile.m_sHelpDir & "\" & m_Language & "\" & GuideViewModel.m_AddressGuide & ".html"))
+ DoorBrowser.Navigate(New Uri(IniFile.m_sHelpDir & "\EnglishTsetJava\" & m_Language & "\" & GuideViewModel.m_AddressGuide & ".html"))
End Sub
End Class
diff --git a/Guide/GuideViewModel.vb b/Guide/GuideViewModel.vb
index 0b6f603..1db80ce 100644
--- a/Guide/GuideViewModel.vb
+++ b/Guide/GuideViewModel.vb
@@ -5,7 +5,7 @@ Imports EgtUILib
Public Class GuideViewModel
' se non è stata selezionato ancora nulla allora faccio partire il menu principale
- Public Shared m_AddressGuide As String = "MainMenu"
+ Public Shared m_AddressGuide As String = "Test"
Public ReadOnly Property Title As String
Get
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index 12b324f..c7da865 100644
--- a/My Project/AssemblyInfo.vb
+++ b/My Project/AssemblyInfo.vb
@@ -72,5 +72,5 @@ Imports System.Windows
' by using the '*' as shown below:
'
-
-
+
+
diff --git a/OptionsWindow/OptionsViewModel.vb b/OptionsWindow/OptionsViewModel.vb
index ccf2366..87b4a6c 100644
--- a/OptionsWindow/OptionsViewModel.vb
+++ b/OptionsWindow/OptionsViewModel.vb
@@ -801,12 +801,12 @@ Public Class OptionsViewModel
Public Sub F1Guide()
Dim rfGuideViewModel As New GuideViewModel
- If String.IsNullOrEmpty(m_Chapter) Then
- GuideViewModel.m_AddressGuide = "option_page"
- Else
- GuideViewModel.m_AddressGuide = "OptionPage\" & m_Chapter
- End If
- m_rfMainWindowViewModel.ProjectManagerViewModel.Guide()
+ 'If String.IsNullOrEmpty(m_Chapter) Then
+ ' GuideViewModel.m_AddressGuide = "option_page"
+ 'Else
+ ' GuideViewModel.m_AddressGuide = "OptionPage\" & m_Chapter
+ 'End If
+ 'm_rfMainWindowViewModel.ProjectManagerViewModel.Guide()
End Sub
#End Region ' COMMANDS
diff --git a/ProjectManager/ProjectManagerView.xaml b/ProjectManager/ProjectManagerView.xaml
index b33c9d0..a4b4e8a 100644
--- a/ProjectManager/ProjectManagerView.xaml
+++ b/ProjectManager/ProjectManagerView.xaml
@@ -36,7 +36,7 @@
diff --git a/ProjectManager/ProjectManagerViewModel.vb b/ProjectManager/ProjectManagerViewModel.vb
index f6caedf..27ee1b5 100644
--- a/ProjectManager/ProjectManagerViewModel.vb
+++ b/ProjectManager/ProjectManagerViewModel.vb
@@ -86,7 +86,13 @@ Public Class ProjectManagerViewModel
Public ReadOnly Property GuideToolTip As String
Get
- Return "Guide"
+ Return EgtMsg(50305)
+ End Get
+ End Property
+
+ Public ReadOnly Property Help As String
+ Get
+ Return EgtMsg(50305)
End Get
End Property
@@ -571,8 +577,8 @@ Public Class ProjectManagerViewModel
Public Sub Guide()
Dim rfGuideViewModel As New GuideViewModel
Dim GuideWindow As New GuideView(Application.Current.MainWindow, rfGuideViewModel)
- GuideWindow.Height = 700
- GuideWindow.Width = 600
+ GuideWindow.Height = 800
+ GuideWindow.Width = 1500
GuideWindow.Show()
End Sub