From f9c7761474febc38ec02c225693699c8bc9c7729 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 18 Nov 2020 16:27:27 +0100 Subject: [PATCH] ZooFlow: Small fixes --- GUIs.ZooFlow/ApplicationEvents.vb | 2 +- GUIs.ZooFlow/ClassFilehandle.vb | 4 +++- GUIs.ZooFlow/Config/ClassUIConfig.vb | 2 ++ GUIs.ZooFlow/My Project/licenses.licx | 19 ++++++++++--------- GUIs.ZooFlow/MyApplication.vb | 2 +- GUIs.ZooFlow/Queries/ClassCommonQueries.vb | 4 ++++ GUIs.ZooFlow/ZooFlow.vbproj | 10 +++++----- 7 files changed, 26 insertions(+), 17 deletions(-) diff --git a/GUIs.ZooFlow/ApplicationEvents.vb b/GUIs.ZooFlow/ApplicationEvents.vb index 6adaa98c..777dee28 100644 --- a/GUIs.ZooFlow/ApplicationEvents.vb +++ b/GUIs.ZooFlow/ApplicationEvents.vb @@ -46,7 +46,7 @@ Namespace My oCommandLineArgs.Parse(oArgs) CommandLineFunction = oCommandLineArgs.FunctionName - CommandLineArgs = oCommandLineArgs.FunctionArgs + CommandLineArguments = oCommandLineArgs.FunctionArgs End Sub Public Sub App_Shutdown(sender As Object, e As EventArgs) Handles Me.Shutdown diff --git a/GUIs.ZooFlow/ClassFilehandle.vb b/GUIs.ZooFlow/ClassFilehandle.vb index e719051a..c32d573c 100644 --- a/GUIs.ZooFlow/ClassFilehandle.vb +++ b/GUIs.ZooFlow/ClassFilehandle.vb @@ -1,4 +1,6 @@ -Imports System.IO +Option Explicit On + +Imports System.IO Imports System.Text.RegularExpressions Imports DigitalData.Modules.Logging Imports Independentsoft diff --git a/GUIs.ZooFlow/Config/ClassUIConfig.vb b/GUIs.ZooFlow/Config/ClassUIConfig.vb index 9491bc58..8e99d85b 100644 --- a/GUIs.ZooFlow/Config/ClassUIConfig.vb +++ b/GUIs.ZooFlow/Config/ClassUIConfig.vb @@ -7,6 +7,8 @@ End Class Public Class SearchFormConfig Public Property Location As New Point(0, 0) + Public Property Size As New Size(0, 0) + Public Property OpenSearchInSameWindow As Boolean = False End Class Public Class GlobixConfig Public Property FilePreview As Boolean = True diff --git a/GUIs.ZooFlow/My Project/licenses.licx b/GUIs.ZooFlow/My Project/licenses.licx index f385a333..7071bdc3 100644 --- a/GUIs.ZooFlow/My Project/licenses.licx +++ b/GUIs.ZooFlow/My Project/licenses.licx @@ -1,14 +1,15 @@ -DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.PictureEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraBars.FormAssistant, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/GUIs.ZooFlow/MyApplication.vb b/GUIs.ZooFlow/MyApplication.vb index 095ecb9d..8067b867 100644 --- a/GUIs.ZooFlow/MyApplication.vb +++ b/GUIs.ZooFlow/MyApplication.vb @@ -51,7 +51,7 @@ Namespace My Public Property GDPictureLicense As String Public CommandLineFunction As String - Public CommandLineArgs As New Dictionary(Of String, String) + Public CommandLineArguments As New Dictionary(Of String, String) End Class End Namespace diff --git a/GUIs.ZooFlow/Queries/ClassCommonQueries.vb b/GUIs.ZooFlow/Queries/ClassCommonQueries.vb index bd537361..dbab0284 100644 --- a/GUIs.ZooFlow/Queries/ClassCommonQueries.vb +++ b/GUIs.ZooFlow/Queries/ClassCommonQueries.vb @@ -6,4 +6,8 @@ Public Function FNDD_MODULE_INIT(Username As String) As String Return String.Format("SELECT * FROM [dbo].[FNZF_GET_MODULE_INFO] ('{0}')", Username) End Function + + Public Function FNIDB_GET_SEARCH_PROFILES(UserId As Integer, UserLanguage As String) As String + Return String.Format("SELECT * FROM [dbo].[FNIDB_GET_SEARCH_PROFILES] ({0},'{1}')", UserId, UserLanguage) + End Function End Class diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj index d878127d..8f3a79bd 100644 --- a/GUIs.ZooFlow/ZooFlow.vbproj +++ b/GUIs.ZooFlow/ZooFlow.vbproj @@ -145,10 +145,10 @@ Form - - frmPreSearch.vb + + frmSearchPredefined.vb - + Form @@ -210,8 +210,8 @@ frmGlobix_Index.vb - - frmPreSearch.vb + + frmSearchPredefined.vb frmSearchStart.vb