diff --git a/Nuvolar.Module.Win/BusinessObjects/Business/BusinessTransactions/Contracts/ContractTemplate_VC.vb b/Nuvolar.Module.Win/BusinessObjects/Business/BusinessTransactions/Contracts/ContractTemplate_VC.vb index e58d4be..2062742 100644 --- a/Nuvolar.Module.Win/BusinessObjects/Business/BusinessTransactions/Contracts/ContractTemplate_VC.vb +++ b/Nuvolar.Module.Win/BusinessObjects/Business/BusinessTransactions/Contracts/ContractTemplate_VC.vb @@ -39,7 +39,7 @@ Public Class ContractTemplate_VC Dim _ContractTemplate As ContractTemplate = TryCast(View.SelectedObjects(0), ContractTemplate) If _ContractTemplate Is Nothing Then Throw New Exception("*Váratlan hiba történt, a folyamat megszakadt!") If String.IsNullOrEmpty(_ContractTemplate.ContractsProperties) Then Throw New Exception("*Nem lett kiválasztva a kapcsolódó objektum!") - _RichEditControl.Document.Fields.Add(_RichEditControl.Document.CaretPosition, "DOCVARIABLE Contracts." + _ContractTemplate.ContractsProperties) + '_RichEditControl.Document.Fields.Add(_RichEditControl.Document.CaretPosition, "DOCVARIABLE Contracts." + _ContractTemplate.ContractsProperties) _ContractTemplate.ContractsProperties = "" Catch ex As Exception MsgBox(ex.Message, MsgBoxStyle.OkOnly + MsgBoxStyle.Critical, "Hiba!") @@ -57,7 +57,7 @@ Public Class ContractTemplate_VC Dim _ContractTemplate As ContractTemplate = TryCast(View.SelectedObjects(0), ContractTemplate) If _ContractTemplate Is Nothing Then Throw New Exception("*Váratlan hiba történt, a folyamat megszakadt!") If String.IsNullOrEmpty(_ContractTemplate.APCSheetByProductsProperties) Then Throw New Exception("*Nem lett kiválasztva a kapcsolódó objektum!") - _RichEditControl.Document.Fields.Add(_RichEditControl.Document.CaretPosition, "DOCVARIABLE APCSheetByProducts." + _ContractTemplate.APCSheetByProductsProperties) + '_RichEditControl.Document.Fields.Add(_RichEditControl.Document.CaretPosition, "DOCVARIABLE APCSheetByProducts." + _ContractTemplate.APCSheetByProductsProperties) _ContractTemplate.APCSheetByProductsProperties = "" Catch ex As Exception MsgBox(ex.Message, MsgBoxStyle.OkOnly + MsgBoxStyle.Critical, "Hiba!") diff --git a/Nuvolar.Module.Win/BusinessObjects/Business/BusinessTransactions/Estate/Stocks/ImmovablesCostRecordExcelVC.vb b/Nuvolar.Module.Win/BusinessObjects/Business/BusinessTransactions/Estate/Stocks/ImmovablesCostRecordExcelVC.vb index f2f544e..7ec47da 100644 --- a/Nuvolar.Module.Win/BusinessObjects/Business/BusinessTransactions/Estate/Stocks/ImmovablesCostRecordExcelVC.vb +++ b/Nuvolar.Module.Win/BusinessObjects/Business/BusinessTransactions/Estate/Stocks/ImmovablesCostRecordExcelVC.vb @@ -429,7 +429,7 @@ Public Class ImmovablesCostRecordExcelVC Dim _ActImmovables As XPCollection = _ocur.CreateCollection(GetType(Immovables), CriteriaOperator.Parse("1=2")) Dim _ImmovablesCostRecordGroup As XPCollection = _ocur.CreateCollection(GetType(ImmovablesCostRecordGroup), CriteriaOperator.Parse("1=1")) Dim _OpenFileDialog As New OpenFileDialog - If _OpenFileDialog.ShowDialog() = Windows.Forms.DialogResult.OK Then + If _OpenFileDialog.ShowDialog() = System.Windows.Forms.DialogResult.OK Then Dim _xlsFile As String = _OpenFileDialog.FileName _cs = "Provider=Microsoft.ACE.OLEDB.12.0;" _cs += "Data Source=" & _xlsFile.ToString & ";" @@ -484,7 +484,7 @@ Public Class ImmovablesCostRecordExcelVC MsgBox(ex.Message) conn.Close() Finally - _Waitformclass.FinalWork() + _WaitFormClass.FinalWork() End Try End If @@ -552,7 +552,7 @@ Public Class ImmovablesCostRecordExcelVC Dim _ImmovablesName As New ArrayList Dim _SID As New ArrayList Dim _OpenFileDialog As New OpenFileDialog - If _OpenFileDialog.ShowDialog() = Windows.Forms.DialogResult.OK Then + If _OpenFileDialog.ShowDialog() = System.Windows.Forms.DialogResult.OK Then Dim _xlsFile As String = _OpenFileDialog.FileName diff --git a/Nuvolar.Module.Win/BusinessObjects/Business/BusinessTransactions/Estate/Stocks/ImmovablesVC.vb b/Nuvolar.Module.Win/BusinessObjects/Business/BusinessTransactions/Estate/Stocks/ImmovablesVC.vb index a397110..d33d94c 100644 --- a/Nuvolar.Module.Win/BusinessObjects/Business/BusinessTransactions/Estate/Stocks/ImmovablesVC.vb +++ b/Nuvolar.Module.Win/BusinessObjects/Business/BusinessTransactions/Estate/Stocks/ImmovablesVC.vb @@ -51,7 +51,7 @@ Public Class ImmovablesVC Dim _OpenFileDialog As New OpenFileDialog _OpenFileDialog.Filter = "Xls Files (.xls)|*.xls|Xlsx Files (.xlsx)|*.xlsx|All Files (*.*)|*.*" - If _OpenFileDialog.ShowDialog() = Windows.Forms.DialogResult.OK Then + If _OpenFileDialog.ShowDialog() = System.Windows.Forms.DialogResult.OK Then If Not String.IsNullOrEmpty(_OpenFileDialog.FileName) Then Dim _xlsFile As String = _OpenFileDialog.FileName @@ -97,7 +97,7 @@ Public Class ImmovablesVC End Try - _WaitFormClass.InitWork(0, 1, _Array_UniqueObjects.Count) + _WaitFormClass.Initwork(0, 1, _Array_UniqueObjects.Count) For ik = 0 To _Array_UniqueObjects.Count - 1 Step 1 Dim _UniqueObjects As UniqueObjects = _ocur.FindObject(Of UniqueObjects)(CriteriaOperator.Parse("Name=?", _Array_UniqueObjects(ik))) If _UniqueObjects IsNot Nothing Then @@ -122,7 +122,7 @@ Public Class ImmovablesVC Next End If _ocur.CommitChanges() - _Waitformclass.FinalWork() + _WaitFormClass.FinalWork() If _MissingImmovable > 0 Then Dim _UOList As String = "" For Each _UO As String In _MissingImmovablesUO diff --git a/Nuvolar.Module.Win/BusinessObjects/Business/BusinessTransactions/Offers/OfferOut/OfferOutVC.vb b/Nuvolar.Module.Win/BusinessObjects/Business/BusinessTransactions/Offers/OfferOut/OfferOutVC.vb index a1e82df..a86a2cd 100644 --- a/Nuvolar.Module.Win/BusinessObjects/Business/BusinessTransactions/Offers/OfferOut/OfferOutVC.vb +++ b/Nuvolar.Module.Win/BusinessObjects/Business/BusinessTransactions/Offers/OfferOut/OfferOutVC.vb @@ -229,7 +229,7 @@ Public Class OfferOutVC Private Sub Grid_HandleCreated(sender As Object, e As System.EventArgs) RemoveHandler _Grid.GridControl.HandleCreated, AddressOf Grid_HandleCreated - _GridListEditor.Grid.BeginInvoke(New Windows.Forms.MethodInvoker(AddressOf SelectAll)) + _GridListEditor.Grid.BeginInvoke(New System.Windows.Forms.MethodInvoker(AddressOf SelectAll)) End Sub Private Sub SelectAll() diff --git a/Nuvolar.Module.Win/BusinessObjects/Business/Product/ProductFinderVC.vb b/Nuvolar.Module.Win/BusinessObjects/Business/Product/ProductFinderVC.vb index bf73204..cc3630a 100644 --- a/Nuvolar.Module.Win/BusinessObjects/Business/Product/ProductFinderVC.vb +++ b/Nuvolar.Module.Win/BusinessObjects/Business/Product/ProductFinderVC.vb @@ -109,7 +109,7 @@ Public Class ProductFinderVC _GridListEditor_Select.GridView.GridControl.Invoke(New EditCellDelegate(AddressOf Edit_QTT_Will_Cell)) End Sub Private Sub Edit_QTT_Will_Cell() - 'e.KeyCode = Windows.Forms.Keys.Enter And + 'e.KeyCode = System.Windows.Forms.Keys.Enter And If _GridListEditor_Select.GridView.FocusedRowHandle = GridControl.AutoFilterRowHandle And _GridListEditor_Select.GridView.RowCount >= 1 Then '_GridListEditor_Select.GridView.FocusedColumn = _GridListEditor_Select.GridView.GetVisibleColumn(_GridListEditor_Select.FindColumn("QTT_Will").VisibleIndex) _GridListEditor_Select.GridView.FocusedColumn = _GridListEditor_Select.GridView.Columns("QTT_Will") diff --git a/Nuvolar.Module.Win/BusinessObjects/Business/Product/ProductSelect_VC.vb b/Nuvolar.Module.Win/BusinessObjects/Business/Product/ProductSelect_VC.vb index e5ee3cb..dfccb16 100644 --- a/Nuvolar.Module.Win/BusinessObjects/Business/Product/ProductSelect_VC.vb +++ b/Nuvolar.Module.Win/BusinessObjects/Business/Product/ProductSelect_VC.vb @@ -107,7 +107,7 @@ Public Class ProductSelect_VC _GridListEditor_Select.GridView.GridControl.Invoke(New EditCellDelegate(AddressOf Edit_QTT_Will_Cell)) End Sub Private Sub Edit_QTT_Will_Cell() - 'e.KeyCode = Windows.Forms.Keys.Enter And + 'e.KeyCode = System.Windows.Forms.Keys.Enter And If _GridListEditor_Select.GridView.FocusedRowHandle = GridControl.AutoFilterRowHandle And _GridListEditor_Select.GridView.RowCount >= 1 Then _GridListEditor_Select.GridView.FocusedColumn = _GridListEditor_Select.GridView.Columns("QTT_Will") _GridListEditor_Select.GridView.HideEditor() diff --git a/Nuvolar.Module.Win/BusinessObjects/Business/Services/ServiceFinderVC.vb b/Nuvolar.Module.Win/BusinessObjects/Business/Services/ServiceFinderVC.vb index 26d2dd9..a03de15 100644 --- a/Nuvolar.Module.Win/BusinessObjects/Business/Services/ServiceFinderVC.vb +++ b/Nuvolar.Module.Win/BusinessObjects/Business/Services/ServiceFinderVC.vb @@ -96,7 +96,7 @@ Public Class ServiceFinderVC _GridListEditor_Select.GridView.GridControl.Invoke(New EditCellDelegate(AddressOf Edit_QTT_Will_Cell)) End Sub Private Sub Edit_QTT_Will_Cell() - 'e.KeyCode = Windows.Forms.Keys.Enter And + 'e.KeyCode = System.Windows.Forms.Keys.Enter And If _GridListEditor_Select.GridView.FocusedRowHandle = GridControl.AutoFilterRowHandle And _GridListEditor_Select.GridView.RowCount >= 1 Then '_GridListEditor_Select.GridView.FocusedColumn = _GridListEditor_Select.GridView.GetVisibleColumn(_GridListEditor_Select.FindColumn("QTT_Will").VisibleIndex) _GridListEditor_Select.GridView.FocusedColumn = _GridListEditor_Select.GridView.Columns("QTT_Will") diff --git a/Nuvolar.Module.Win/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Accounts/GLAccountsVC.vb b/Nuvolar.Module.Win/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Accounts/GLAccountsVC.vb index 8ee2a1d..4861b85 100644 --- a/Nuvolar.Module.Win/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Accounts/GLAccountsVC.vb +++ b/Nuvolar.Module.Win/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Accounts/GLAccountsVC.vb @@ -173,7 +173,7 @@ Public Class GLAccountsVC End If End If End Sub - Private Sub StringComboUserControl_KeyDown(sender As Object, e As Windows.Forms.KeyEventArgs) + Private Sub StringComboUserControl_KeyDown(sender As Object, e As System.Windows.Forms.KeyEventArgs) If e.KeyCode = System.Windows.Forms.Keys.F12 Then '// Kell egy mentĂ©s If TryCast(sender, DevExpress.XtraEditors.ComboBoxEdit) IsNot Nothing Then diff --git a/Nuvolar.Module.Win/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Bank/BankImportVC.vb b/Nuvolar.Module.Win/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Bank/BankImportVC.vb index abe6d53..d6a2aeb 100644 --- a/Nuvolar.Module.Win/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Bank/BankImportVC.vb +++ b/Nuvolar.Module.Win/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Bank/BankImportVC.vb @@ -519,7 +519,7 @@ Public Class BankImportVC _GLRows.BankImportHeaderSumDetail.BankImportHeaderSum.GLBank.IsEditable = False _ocur.CommitChanges() - Windows.Forms.MessageBox.Show("Az aktuális banki kivonathoz tartozó főkönyvi bejegyzés végledesítésre került.") + System.Windows.Forms.MessageBox.Show("Az aktuális banki kivonathoz tartozó főkönyvi bejegyzés végledesítésre került.") End Sub diff --git a/Nuvolar.Module.Win/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/LiquidAssets/GIROInfo_VC.vb b/Nuvolar.Module.Win/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/LiquidAssets/GIROInfo_VC.vb index b49493c..f0f8dd1 100644 --- a/Nuvolar.Module.Win/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/LiquidAssets/GIROInfo_VC.vb +++ b/Nuvolar.Module.Win/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/LiquidAssets/GIROInfo_VC.vb @@ -32,7 +32,7 @@ Public Class GIROInfo_VC Dim _OpenFileDialog As New OpenFileDialog _OpenFileDialog.Filter = "xls Files (.xls)|*.xls|xlsx Files (.xlsx)|*.xlsx|All Files (*.*)|*.*" _OpenFileDialog.FilterIndex = 1 - If _OpenFileDialog.ShowDialog() = Windows.Forms.DialogResult.OK And (Not String.IsNullOrEmpty(_OpenFileDialog.FileName)) Then + If _OpenFileDialog.ShowDialog() = System.Windows.Forms.DialogResult.OK And (Not String.IsNullOrEmpty(_OpenFileDialog.FileName)) Then Dim _xlsFile As String = _OpenFileDialog.FileName _cs = "Provider=Microsoft.ACE.OLEDB.12.0;" _cs += "Data Source=" & _xlsFile.ToString & ";" diff --git a/Nuvolar.Module.Win/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Reports/Ballance/BallanceVC.vb b/Nuvolar.Module.Win/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Reports/Ballance/BallanceVC.vb index 61763f0..a65d5c8 100644 --- a/Nuvolar.Module.Win/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Reports/Ballance/BallanceVC.vb +++ b/Nuvolar.Module.Win/BusinessObjects/Financial/FinancialObjects/FinancialTransactions/Reports/Ballance/BallanceVC.vb @@ -132,7 +132,7 @@ Public Class BallanceVC Dim _workbook As DevExpress.Spreadsheet.IWorkbook = _SpreadsheetControl.Document Dim _worksheet As Worksheet = _workbook.Worksheets("Borító") - Dim _worksheet_range As DevExpress.Spreadsheet.Range + Dim _worksheet_range As DevExpress.Spreadsheet.CellRange _worksheet_range = _worksheet.GetUsedRange() @@ -162,7 +162,7 @@ Public Class BallanceVC End Sub Private Sub aSpreadImportXML_Execute(sender As Object, e As SimpleActionExecuteEventArgs) Handles aSpreadImportXML.Execute - Dim openFileDialog1 As New Windows.Forms.OpenFileDialog() + Dim openFileDialog1 As New System.Windows.Forms.OpenFileDialog() openFileDialog1.InitialDirectory = My.Computer.FileSystem.SpecialDirectories.MyDocuments openFileDialog1.Filter = "XML files (*.xml)|*.xml|All files (*.*)|*.*" @@ -175,7 +175,7 @@ Public Class BallanceVC End Sub Private Sub aSpreadExportXML_Execute(sender As Object, e As SimpleActionExecuteEventArgs) Handles aSpreadExportXML.Execute - Dim openFileDialog1 As New Windows.Forms.SaveFileDialog() + Dim openFileDialog1 As New System.Windows.Forms.SaveFileDialog() openFileDialog1.InitialDirectory = My.Computer.FileSystem.SpecialDirectories.MyDocuments openFileDialog1.Filter = "XML files (*.xml)|*.xml|All files (*.*)|*.*" diff --git a/Nuvolar.Module.Win/BusinessObjects/GeneralObjects/RTFDocumentsHandler/BusinessDirectory_VC.vb b/Nuvolar.Module.Win/BusinessObjects/GeneralObjects/RTFDocumentsHandler/BusinessDirectory_VC.vb index 860b062..f17fc34 100644 --- a/Nuvolar.Module.Win/BusinessObjects/GeneralObjects/RTFDocumentsHandler/BusinessDirectory_VC.vb +++ b/Nuvolar.Module.Win/BusinessObjects/GeneralObjects/RTFDocumentsHandler/BusinessDirectory_VC.vb @@ -242,7 +242,7 @@ Public Class BusinessDirectory_VC Private Sub aOpenRTFDocument_InsertDocVariable_Execute(sender As Object, e As PopupWindowShowActionExecuteEventArgs) Handles aOpenRTFDocument_InsertDocVariable.Execute Try Dim _RTFDocumanetsHandler_DocVariable_PopUp As RTFDocumanetsHandler_DocVariable_PopUp = TryCast(e.PopupWindow.View.SelectedObjects(0), RTFDocumanetsHandler_DocVariable_PopUp) - _RichEditControl.Document.Fields.Add(_RichEditControl.Document.CaretPosition, "DOCVARIABLE " + _RTFDocumanetsHandler_DocVariable_PopUp.DocVariableString) + '_RichEditControl.Document.Fields.Add(_RichEditControl.Document.CaretPosition, "DOCVARIABLE " + _RTFDocumanetsHandler_DocVariable_PopUp.DocVariableString) Catch ex As Exception MsgBox(ex.Message, MsgBoxStyle.OkOnly + MsgBoxStyle.Critical, "Hiba!") End Try diff --git a/Nuvolar.Module.Win/BusinessObjects/GeneralObjects/RTFDocumentsHandler/RTFDocumentsHandlerVC.vb b/Nuvolar.Module.Win/BusinessObjects/GeneralObjects/RTFDocumentsHandler/RTFDocumentsHandlerVC.vb index 0634360..94423ad 100644 --- a/Nuvolar.Module.Win/BusinessObjects/GeneralObjects/RTFDocumentsHandler/RTFDocumentsHandlerVC.vb +++ b/Nuvolar.Module.Win/BusinessObjects/GeneralObjects/RTFDocumentsHandler/RTFDocumentsHandlerVC.vb @@ -135,7 +135,7 @@ Public Class RTFDocumentsHandlerVC Private Sub aRTFDocuments_InsertRTFDocVariable_Execute(sender As Object, e As PopupWindowShowActionExecuteEventArgs) Handles aRTFDocuments_InsertRTFDocVariable.Execute Try Dim _RTFDocumanetsHandler_DocVariable_PopUp As RTFDocumanetsHandler_DocVariable_PopUp = TryCast(e.PopupWindow.View.SelectedObjects(0), RTFDocumanetsHandler_DocVariable_PopUp) - _RichEditControl.Document.Fields.Add(_RichEditControl.Document.CaretPosition, "DOCVARIABLE " + _RTFDocumanetsHandler_DocVariable_PopUp.DocVariableString) + '_RichEditControl.Document.Fields.Add(_RichEditControl.Document.CaretPosition, "DOCVARIABLE " + _RTFDocumanetsHandler_DocVariable_PopUp.DocVariableString) Catch ex As Exception MsgBox(ex.Message, MsgBoxStyle.OkOnly + MsgBoxStyle.Critical, "Hiba!") End Try diff --git a/Nuvolar.Module.Win/BusinessObjects/Imports/SpreadImport/SpreadImportVC.vb b/Nuvolar.Module.Win/BusinessObjects/Imports/SpreadImport/SpreadImportVC.vb index 4d9c534..b195bc2 100644 --- a/Nuvolar.Module.Win/BusinessObjects/Imports/SpreadImport/SpreadImportVC.vb +++ b/Nuvolar.Module.Win/BusinessObjects/Imports/SpreadImport/SpreadImportVC.vb @@ -120,7 +120,7 @@ Partial Public Class SpreadImportVC Private Sub aSpreadImport_LoadDocument_Execute(sender As Object, e As SimpleActionExecuteEventArgs) Handles aSpreadImport_LoadDocument.Execute - Dim openFileDialog1 As New Windows.Forms.OpenFileDialog() + Dim openFileDialog1 As New System.Windows.Forms.OpenFileDialog() openFileDialog1.InitialDirectory = My.Computer.FileSystem.SpecialDirectories.MyDocuments openFileDialog1.Filter = "XML files (*.xml)|*.xml|All files (*.*)|*.*" @@ -133,7 +133,7 @@ Partial Public Class SpreadImportVC End Sub Private Sub aSpreadImport_SaveDocument_Execute(sender As Object, e As SimpleActionExecuteEventArgs) Handles aSpreadImport_SaveDocument.Execute - Dim openFileDialog1 As New Windows.Forms.SaveFileDialog() + Dim openFileDialog1 As New System.Windows.Forms.SaveFileDialog() openFileDialog1.InitialDirectory = My.Computer.FileSystem.SpecialDirectories.MyDocuments openFileDialog1.Filter = "XML files (*.xml)|*.xml|All files (*.*)|*.*" diff --git a/Nuvolar.Module.Win/BusinessObjects/Imports/XLS Imports/XLSImportsVC.vb b/Nuvolar.Module.Win/BusinessObjects/Imports/XLS Imports/XLSImportsVC.vb index ea457ab..b0b2c22 100644 --- a/Nuvolar.Module.Win/BusinessObjects/Imports/XLS Imports/XLSImportsVC.vb +++ b/Nuvolar.Module.Win/BusinessObjects/Imports/XLS Imports/XLSImportsVC.vb @@ -1458,7 +1458,7 @@ Public Class XLSImportsVC Dim _Import_PH_Immovables_PopUp As Import_PH_Immovables_PopUp = TryCast(View.SelectedObjects(0), Import_PH_Immovables_PopUp) If _Import_PH_Immovables_PopUp Is Nothing Then Throw New Exception("*Váratlan hiba törtĂ©nt a folyamat megszakadt!") - If _OpenFileDialog.ShowDialog() = Windows.Forms.DialogResult.OK Then + If _OpenFileDialog.ShowDialog() = System.Windows.Forms.DialogResult.OK Then _Import_PH_Immovables_PopUp.FileName = _OpenFileDialog.FileName End If Catch ex As Exception diff --git a/Nuvolar.Module.Win/Controllers/ListViewCustomization/ListViewModelManagerVC.vb b/Nuvolar.Module.Win/Controllers/ListViewCustomization/ListViewModelManagerVC.vb index a2d530f..9004022 100644 --- a/Nuvolar.Module.Win/Controllers/ListViewCustomization/ListViewModelManagerVC.vb +++ b/Nuvolar.Module.Win/Controllers/ListViewCustomization/ListViewModelManagerVC.vb @@ -139,10 +139,10 @@ Public Class ListViewModelManagerVC Private Sub aListViewModelManager_FileBrowser_Execute(sender As Object, e As SimpleActionExecuteEventArgs) Handles aListViewModelManager_FileBrowser.Execute Dim _ListViewCustomization As ListViewCustomization = TryCast(View.SelectedObjects(0), ListViewCustomization) If _ListViewCustomization IsNot Nothing Then - Dim _OpenFileDialog As New Windows.Forms.OpenFileDialog + Dim _OpenFileDialog As New System.Windows.Forms.OpenFileDialog _OpenFileDialog.Filter = "XAFML file (.xafml)|*.xafml|All Files (*.*)|*.*" - If _OpenFileDialog.ShowDialog() = Windows.Forms.DialogResult.OK Then + If _OpenFileDialog.ShowDialog() = System.Windows.Forms.DialogResult.OK Then _ListViewCustomization.XMLFileName = _OpenFileDialog.FileName End If End If diff --git a/Nuvolar.Module.Win/Controllers/MasterDetailVC.vb b/Nuvolar.Module.Win/Controllers/MasterDetailVC.vb index 1b8a835..7aa7088 100644 --- a/Nuvolar.Module.Win/Controllers/MasterDetailVC.vb +++ b/Nuvolar.Module.Win/Controllers/MasterDetailVC.vb @@ -172,15 +172,15 @@ Public Class MasterDetailVC End If End If End Sub - Private Sub view_KeyDown(ByVal sender As Object, ByVal e As Windows.Forms.KeyEventArgs) - If _view.FocusedColumn IsNot column OrElse e.KeyCode <> Windows.Forms.Keys.Space Then + Private Sub view_KeyDown(ByVal sender As Object, ByVal e As System.Windows.Forms.KeyEventArgs) + If _view.FocusedColumn IsNot column OrElse e.KeyCode <> System.Windows.Forms.Keys.Space Then Return End If InvertRowSelection(_view.FocusedRowHandle) End Sub Private Sub View_Click(ByVal sender As Object, ByVal e As EventArgs) Dim info As GridHitInfo - Dim pt As Point = _view.GridControl.PointToClient(Windows.Forms.Control.MousePosition) + Dim pt As Point = _view.GridControl.PointToClient(System.Windows.Forms.Control.MousePosition) info = _view.CalcHitInfo(pt) If info.Column Is column Then If info.InColumn Then diff --git a/Nuvolar.Module.Win/Controllers/ZIPHUVC.vb b/Nuvolar.Module.Win/Controllers/ZIPHUVC.vb index 40ed0d1..de41fef 100644 --- a/Nuvolar.Module.Win/Controllers/ZIPHUVC.vb +++ b/Nuvolar.Module.Win/Controllers/ZIPHUVC.vb @@ -76,7 +76,7 @@ Public Class ZIPHUVC _OpenFileDialog.Filter = "XLS file (.xls)|*.xls|XLSX file (.xlsx)|*.xlsx|All Files (*.*)|*.*" - If _OpenFileDialog.ShowDialog() = Windows.Forms.DialogResult.OK Then + If _OpenFileDialog.ShowDialog() = System.Windows.Forms.DialogResult.OK Then Dim _xlsFile As String = _OpenFileDialog.FileName Dim _cs As String = "Provider=Microsoft.ACE.OLEDB.12.0;" _cs += "Data Source=" & _xlsFile.ToString & ";" diff --git a/Nuvolar.Module.Win/Editor/DXPropertyEditors/NotePropertyEditor.vb b/Nuvolar.Module.Win/Editor/DXPropertyEditors/NotePropertyEditor.vb index 929472b..8e59926 100644 --- a/Nuvolar.Module.Win/Editor/DXPropertyEditors/NotePropertyEditor.vb +++ b/Nuvolar.Module.Win/Editor/DXPropertyEditors/NotePropertyEditor.vb @@ -22,18 +22,18 @@ Public Class NotePropertyEditor Return control End Function - Private Sub control_PreviewKeyDown(sender As Object, e As Windows.Forms.PreviewKeyDownEventArgs) + Private Sub control_PreviewKeyDown(sender As Object, e As System.Windows.Forms.PreviewKeyDownEventArgs) Dim control As ComboBoxEdit = TryCast(sender, ComboBoxEdit) - If e.KeyCode = Windows.Forms.Keys.F6 Then + If e.KeyCode = System.Windows.Forms.Keys.F6 Then MsgBox(control.Text) control.EditValue = control.Text End If End Sub - Private Sub control_KeyDown(sender As Object, e As Windows.Forms.KeyEventArgs) + Private Sub control_KeyDown(sender As Object, e As System.Windows.Forms.KeyEventArgs) Dim control As ComboBoxEdit = TryCast(sender, ComboBoxEdit) If control.IsPopupOpen Then - If e.KeyCode = Windows.Forms.Keys.F6 Then + If e.KeyCode = System.Windows.Forms.Keys.F6 Then control.ClosePopup() MsgBox(control.Text) End If diff --git a/Nuvolar.Module.Win/Editor/DashBoard/Designer/DashboardDesignerUserControl.Designer.vb b/Nuvolar.Module.Win/Editor/DashBoard/Designer/DashboardDesignerUserControl.Designer.vb index 8f01111..828c9bd 100644 --- a/Nuvolar.Module.Win/Editor/DashBoard/Designer/DashboardDesignerUserControl.Designer.vb +++ b/Nuvolar.Module.Win/Editor/DashBoard/Designer/DashboardDesignerUserControl.Designer.vb @@ -229,7 +229,7 @@ Partial Class DashboardDesignerUserControl Me.RangeFilterAreaSeriesTypeBarItem1 = New DevExpress.DashboardWin.Bars.RangeFilterAreaSeriesTypeBarItem() Me.RangeFilterStackedAreaSeriesTypeBarItem1 = New DevExpress.DashboardWin.Bars.RangeFilterStackedAreaSeriesTypeBarItem() Me.RangeFilterFullStackedAreaSeriesTypeBarItem1 = New DevExpress.DashboardWin.Bars.RangeFilterFullStackedAreaSeriesTypeBarItem() - Me.MapToolsBar1 = New DevExpress.DashboardWin.Bars.MapToolsBar() + 'Me.MapToolsBar1 = New DevExpress.DashboardWin.Bars.MapToolsBar() Me.MapShowLegendBarItem1 = New DevExpress.DashboardWin.Bars.MapShowLegendBarItem() Me.GalleryMapLegendPositionItem1 = New DevExpress.DashboardWin.Bars.GalleryMapLegendPositionItem() Me.MapLoadBarItem1 = New DevExpress.DashboardWin.Bars.MapLoadBarItem() @@ -378,7 +378,7 @@ Partial Class DashboardDesignerUserControl ' 'BarManager1 ' - Me.BarManager1.Bars.AddRange(New DevExpress.XtraBars.Bar() {Me.HomeBar1, Me.DataSourceBar1, Me.ViewBar1, Me.PivotToolsBar1, Me.GridToolsBar1, Me.ChartToolsBar1, Me.PiesToolsBar1, Me.GaugesToolsBar1, Me.CardsToolsBar1, Me.RangeFilterToolsBar1, Me.MapToolsBar1, Me.ImageToolsBar1, Me.TextBoxToolsBar1, Me.ChoroplethMapToolsBar1, Me.GeoPointMapToolsBar1, Me.BubbleMapToolsBar1, Me.PieMapToolsBar1, Me.FilterElementToolsBar1, Me.GroupToolsBar1, Me.ScatterChartToolsBar1}) + Me.BarManager1.Bars.AddRange(New DevExpress.XtraBars.Bar() {Me.HomeBar1, Me.DataSourceBar1, Me.ViewBar1, Me.PivotToolsBar1, Me.GridToolsBar1, Me.ChartToolsBar1, Me.PiesToolsBar1, Me.GaugesToolsBar1, Me.CardsToolsBar1, Me.RangeFilterToolsBar1, Me.ImageToolsBar1, Me.TextBoxToolsBar1, Me.ChoroplethMapToolsBar1, Me.GeoPointMapToolsBar1, Me.BubbleMapToolsBar1, Me.PieMapToolsBar1, Me.FilterElementToolsBar1, Me.GroupToolsBar1, Me.ScatterChartToolsBar1}) Me.BarManager1.Controller = Me.BarAndDockingController1 Me.BarManager1.DockControls.Add(Me.barDockControlTop) Me.BarManager1.DockControls.Add(Me.barDockControlBottom) @@ -1356,12 +1356,12 @@ Partial Class DashboardDesignerUserControl ' 'MapToolsBar1 ' - Me.MapToolsBar1.Control = Me.DashboardDesigner1 - Me.MapToolsBar1.DockCol = 12 - Me.MapToolsBar1.DockRow = 0 - Me.MapToolsBar1.DockStyle = DevExpress.XtraBars.BarDockStyle.Top - Me.MapToolsBar1.LinksPersistInfo.AddRange(New DevExpress.XtraBars.LinkPersistInfo() {New DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, Me.EditFilterBarItem1, DevExpress.XtraBars.BarItemPaintStyle.CaptionInMenu), New DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, Me.ClearFilterBarItem1, DevExpress.XtraBars.BarItemPaintStyle.CaptionInMenu), New DevExpress.XtraBars.LinkPersistInfo(Me.MasterFilterBarItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.MultipleValuesMasterFilterBarItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.CrossDataSourceFilteringBarItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.IgnoreMasterFiltersBarItem1), New DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, Me.ShowItemCaptionBarItem1, DevExpress.XtraBars.BarItemPaintStyle.CaptionInMenu), New DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, Me.EditItemNamesBarItem1, DevExpress.XtraBars.BarItemPaintStyle.CaptionInMenu), New DevExpress.XtraBars.LinkPersistInfo(Me.MapShowLegendBarItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.GalleryMapLegendPositionItem1), New DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, Me.MapLoadBarItem1, DevExpress.XtraBars.BarItemPaintStyle.CaptionInMenu), New DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, Me.MapImportBarItem1, DevExpress.XtraBars.BarItemPaintStyle.CaptionInMenu), New DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, Me.MapDefaultShapefileBarItem1, DevExpress.XtraBars.BarItemPaintStyle.CaptionInMenu)}) - Me.MapToolsBar1.Visible = False + 'Me.MapToolsBar1.Control = Me.DashboardDesigner1 + 'Me.MapToolsBar1.DockCol = 12 + 'Me.MapToolsBar1.DockRow = 0 + 'Me.MapToolsBar1.DockStyle = DevExpress.XtraBars.BarDockStyle.Top + 'Me.MapToolsBar1.LinksPersistInfo.AddRange(New DevExpress.XtraBars.LinkPersistInfo() {New DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, Me.EditFilterBarItem1, DevExpress.XtraBars.BarItemPaintStyle.CaptionInMenu), New DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, Me.ClearFilterBarItem1, DevExpress.XtraBars.BarItemPaintStyle.CaptionInMenu), New DevExpress.XtraBars.LinkPersistInfo(Me.MasterFilterBarItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.MultipleValuesMasterFilterBarItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.CrossDataSourceFilteringBarItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.IgnoreMasterFiltersBarItem1), New DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, Me.ShowItemCaptionBarItem1, DevExpress.XtraBars.BarItemPaintStyle.CaptionInMenu), New DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, Me.EditItemNamesBarItem1, DevExpress.XtraBars.BarItemPaintStyle.CaptionInMenu), New DevExpress.XtraBars.LinkPersistInfo(Me.MapShowLegendBarItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.GalleryMapLegendPositionItem1), New DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, Me.MapLoadBarItem1, DevExpress.XtraBars.BarItemPaintStyle.CaptionInMenu), New DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, Me.MapImportBarItem1, DevExpress.XtraBars.BarItemPaintStyle.CaptionInMenu), New DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, Me.MapDefaultShapefileBarItem1, DevExpress.XtraBars.BarItemPaintStyle.CaptionInMenu)}) + 'Me.MapToolsBar1.Visible = False ' 'MapShowLegendBarItem1 ' @@ -2437,7 +2437,7 @@ Partial Class DashboardDesignerUserControl Friend WithEvents RangeFilterAreaSeriesTypeBarItem1 As DevExpress.DashboardWin.Bars.RangeFilterAreaSeriesTypeBarItem Friend WithEvents RangeFilterStackedAreaSeriesTypeBarItem1 As DevExpress.DashboardWin.Bars.RangeFilterStackedAreaSeriesTypeBarItem Friend WithEvents RangeFilterFullStackedAreaSeriesTypeBarItem1 As DevExpress.DashboardWin.Bars.RangeFilterFullStackedAreaSeriesTypeBarItem - Friend WithEvents MapToolsBar1 As DevExpress.DashboardWin.Bars.MapToolsBar + 'Friend WithEvents MapToolsBar1 As DevExpress.DashboardWin.Bars.MapToolsBar Friend WithEvents MapShowLegendBarItem1 As DevExpress.DashboardWin.Bars.MapShowLegendBarItem Friend WithEvents GalleryMapLegendPositionItem1 As DevExpress.DashboardWin.Bars.GalleryMapLegendPositionItem Friend WithEvents MapLoadBarItem1 As DevExpress.DashboardWin.Bars.MapLoadBarItem diff --git a/Nuvolar.Module.Win/Editor/ExcelEditor/ExcelUserControl.vb b/Nuvolar.Module.Win/Editor/ExcelEditor/ExcelUserControl.vb index 5383a42..ec9de40 100644 --- a/Nuvolar.Module.Win/Editor/ExcelEditor/ExcelUserControl.vb +++ b/Nuvolar.Module.Win/Editor/ExcelEditor/ExcelUserControl.vb @@ -45,7 +45,7 @@ Public Class ExcelUserControl End Sub Private Sub ImportXLS_ItemClick(sender As System.Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles ImportXLS.ItemClick Me.OpenFileDialog1.Filter = "Excel (*.xls) |*.xls;*.xlsx" - If Me.OpenFileDialog1.ShowDialog() = Windows.Forms.DialogResult.OK Then + If Me.OpenFileDialog1.ShowDialog() = System.Windows.Forms.DialogResult.OK Then Me.SP.OpenExcel(Me.OpenFileDialog1.FileName) _FileName = Me.OpenFileDialog1.FileName End If @@ -53,7 +53,7 @@ Public Class ExcelUserControl Private Sub ExportXLS_ItemClick(sender As System.Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles ExportXLS.ItemClick 'Me.SaveFileDialog1 = New System.Windows.Forms.SaveFileDialog() Me.SaveFileDialog1.Filter = "Excel (*.xls) |*.xls;*.xlsx" - If Me.SaveFileDialog1.ShowDialog() = Windows.Forms.DialogResult.OK Then + If Me.SaveFileDialog1.ShowDialog() = System.Windows.Forms.DialogResult.OK Then Me.SP.SaveExcel(Me.SaveFileDialog1.FileName) End If End Sub @@ -68,14 +68,14 @@ Public Class ExcelUserControl End Sub Private Sub BarButtonItem6_ItemClick(sender As System.Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem6.ItemClick Me.OpenFileDialog1.Filter = "Spread (*.xml) |*.xml" - If Me.OpenFileDialog1.ShowDialog() = Windows.Forms.DialogResult.OK Then + If Me.OpenFileDialog1.ShowDialog() = System.Windows.Forms.DialogResult.OK Then Me.SP.Open(Me.OpenFileDialog1.FileName) _FileName = Me.OpenFileDialog1.FileName End If End Sub Private Sub BarButtonItem7_ItemClick(sender As System.Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem7.ItemClick Me.SaveFileDialog1.Filter = "Spread (*.xml) |*.xml" - If Me.SaveFileDialog1.ShowDialog() = Windows.Forms.DialogResult.OK Then + If Me.SaveFileDialog1.ShowDialog() = System.Windows.Forms.DialogResult.OK Then Me.SP.Save(Me.SaveFileDialog1.FileName, False) End If End Sub @@ -113,7 +113,7 @@ Public Class ExcelUserControl End If End Sub Private Sub SetColor(_Object As String) - Dim _ColorDialog As New Windows.Forms.ColorDialog + Dim _ColorDialog As New System.Windows.Forms.ColorDialog Select Case _Object Case "CellBackColor" If (_ColorDialog.ShowDialog() = DialogResult.OK) Then @@ -136,7 +136,7 @@ Public Class ExcelUserControl End Select End Sub Private Sub SP_CellClick(sender As System.Object, e As FarPoint.Win.Spread.CellClickEventArgs) Handles SP.CellClick - If e.Button = Windows.Forms.MouseButtons.Right Then + If e.Button = System.Windows.Forms.MouseButtons.Right Then Cursor = New Cursor(Cursor.Current.Handle) ContextMenuStrip1.Show(New System.Drawing.Point(Cursor.Position)) End If diff --git a/Nuvolar.Module.Win/Nuvolar.Module.Win.vbproj b/Nuvolar.Module.Win/Nuvolar.Module.Win.vbproj index 7709eac..30ac386 100644 --- a/Nuvolar.Module.Win/Nuvolar.Module.Win.vbproj +++ b/Nuvolar.Module.Win/Nuvolar.Module.Win.vbproj @@ -1374,7 +1374,6 @@ Component - RepairRegistryVC.vb diff --git a/Nuvolar.Module/BusinessObjects/Business/Agricultural/APCSheetReviewHeader_VC.vb b/Nuvolar.Module/BusinessObjects/Business/Agricultural/APCSheetReviewHeader_VC.vb index 9b638fa..537b464 100644 --- a/Nuvolar.Module/BusinessObjects/Business/Agricultural/APCSheetReviewHeader_VC.vb +++ b/Nuvolar.Module/BusinessObjects/Business/Agricultural/APCSheetReviewHeader_VC.vb @@ -64,7 +64,7 @@ Public Class APCSheetReviewHeader_VC _OpenFileDialog.Filter = "JPG file (.jpg)|*.jpg|BMP file (.bmp)|*.bmp|GIF file (.gif)|*.gif|All Files (*.*)|*.*" _OpenFileDialog.Multiselect = True - If _OpenFileDialog.ShowDialog() = Windows.Forms.DialogResult.OK Then + If _OpenFileDialog.ShowDialog() = System.Windows.Forms.DialogResult.OK Then RaiseEvent InitWork(1, 1, _OpenFileDialog.FileNames.Length) For Each _FileName As String In _OpenFileDialog.FileNames RaiseEvent DoWork() diff --git a/Nuvolar.Module/BusinessObjects/GeneralObjects/Contacts/ContactsVC.vb b/Nuvolar.Module/BusinessObjects/GeneralObjects/Contacts/ContactsVC.vb index d341d5f..3376908 100644 --- a/Nuvolar.Module/BusinessObjects/GeneralObjects/Contacts/ContactsVC.vb +++ b/Nuvolar.Module/BusinessObjects/GeneralObjects/Contacts/ContactsVC.vb @@ -3,6 +3,7 @@ Imports System.ComponentModel Imports System.Collections.Generic Imports System.Diagnostics Imports System.Text +Imports System.Windows Imports DevExpress.ExpressApp Imports DevExpress.ExpressApp.Actions @@ -265,8 +266,8 @@ Public Class ContactsVC Private Sub aContactEmailToClipboard_Execute(sender As Object, e As SimpleActionExecuteEventArgs) Handles aContactEmailToClipboard.Execute Dim _ClipboardText As String = "" - If Windows.Forms.Clipboard.ContainsText(System.Windows.Forms.TextDataFormat.Text) Then - _ClipboardText = Windows.Forms.Clipboard.GetText(Windows.Forms.TextDataFormat.Text) + If System.Windows.Forms.Clipboard.ContainsText(System.Windows.Forms.TextDataFormat.Text) Then + _ClipboardText = Forms.Clipboard.GetText(Forms.TextDataFormat.Text) End If For Each _Contacts As Contacts In View.SelectedObjects If _ClipboardText = "" Then @@ -275,10 +276,10 @@ Public Class ContactsVC _ClipboardText += ";" + _Contacts.Email End If Next - Windows.Forms.Clipboard.SetText(_ClipboardText, Windows.Forms.TextDataFormat.UnicodeText) + Forms.Clipboard.SetText(_ClipboardText, Forms.TextDataFormat.UnicodeText) End Sub Private Sub aClearClipboard_Execute(sender As Object, e As SimpleActionExecuteEventArgs) Handles aClearClipboard.Execute - Windows.Forms.Clipboard.Clear() + Forms.Clipboard.Clear() End Sub End Class diff --git a/Nuvolar.Module/Nuvolar.Module.vbproj b/Nuvolar.Module/Nuvolar.Module.vbproj index caa3050..fdda05a 100644 --- a/Nuvolar.Module/Nuvolar.Module.vbproj +++ b/Nuvolar.Module/Nuvolar.Module.vbproj @@ -1967,12 +1967,6 @@ Component - - LongOperationController.vb - - - Component - MasterDetailViewControllerBase.vb