ivanszabo/Nuvolar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INIT OK 20.1.4

Browse Source
This commit is contained in:
ivanszabo
2020-06-09 10:30:25 +02:00
parent 96e5588d9d
commit 291939e03f
25 changed files with 54 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Nuvolar.Module.Win/Editor/DXPropertyEditors/NotePropertyEditor.vb
+4 -4
View File
@@ -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
Nuvolar.Module.Win/Editor/DashBoard/Designer/DashboardDesignerUserControl.Designer.vb
Generated
+9 -9
View File
@@ -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
Nuvolar.Module.Win/Editor/ExcelEditor/ExcelUserControl.vb
+6 -6
View File
@@ -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