From f145c5d63b34bed702f071a6b8f26d0d45645734 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 17 May 2017 16:32:40 +0200 Subject: [PATCH] jj 17.05 --- Global_Indexer/Global_Indexer.vbproj | 4 +++ Global_Indexer/My Project/licenses.licx | 3 ++ Global_Indexer/My Project/licenses.licx.bak | 3 -- Global_Indexer/frmHistory.resx | 20 ++++++------- Global_Indexer/frmStart.resx | 32 ++++++++++----------- SetupWix/Product.wxs | 1 + 6 files changed, 34 insertions(+), 29 deletions(-) delete mode 100644 Global_Indexer/My Project/licenses.licx.bak diff --git a/Global_Indexer/Global_Indexer.vbproj b/Global_Indexer/Global_Indexer.vbproj index d14090e..605e499 100644 --- a/Global_Indexer/Global_Indexer.vbproj +++ b/Global_Indexer/Global_Indexer.vbproj @@ -125,6 +125,10 @@ False D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraGrid.v15.2.dll + + False + D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraLayout.v15.2.dll + False D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraNavBar.v15.2.dll diff --git a/Global_Indexer/My Project/licenses.licx b/Global_Indexer/My Project/licenses.licx index e69de29..394ef9a 100644 --- a/Global_Indexer/My Project/licenses.licx +++ b/Global_Indexer/My Project/licenses.licx @@ -0,0 +1,3 @@ +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraPdfViewer.PdfViewer, DevExpress.XtraPdfViewer.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/Global_Indexer/My Project/licenses.licx.bak b/Global_Indexer/My Project/licenses.licx.bak deleted file mode 100644 index 395f626..0000000 --- a/Global_Indexer/My Project/licenses.licx.bak +++ /dev/null @@ -1,3 +0,0 @@ -DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraPdfViewer.PdfViewer, DevExpress.XtraPdfViewer.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/Global_Indexer/frmHistory.resx b/Global_Indexer/frmHistory.resx index 42fb331..7b7dcb5 100644 --- a/Global_Indexer/frmHistory.resx +++ b/Global_Indexer/frmHistory.resx @@ -362,7 +362,7 @@ GridControl1 - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -383,7 +383,7 @@ Segoe UI, 8.25pt - History - Dateien indexiert + Historie - Indexierte Dateien TBGI_HISTORYBindingSource @@ -395,7 +395,7 @@ MyDataset - Global_Indexer.MyDataset, MyDataset.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + Global_Indexer.MyDataset, MyDataset.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null BindingNavigatorCountItem @@ -473,43 +473,43 @@ TBGI_HISTORYTableAdapter - Global_Indexer.MyDatasetTableAdapters.TBGI_HISTORYTableAdapter, MyDataset.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + Global_Indexer.MyDatasetTableAdapters.TBGI_HISTORYTableAdapter, MyDataset.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TableAdapterManager - Global_Indexer.MyDatasetTableAdapters.TableAdapterManager, MyDataset.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + Global_Indexer.MyDatasetTableAdapters.TableAdapterManager, MyDataset.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null GridView1 - DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colGUID - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colFILENAME_ORIGINAL - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colFILENAME_NEW - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colADDED_WHEN - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a frmHistory diff --git a/Global_Indexer/frmStart.resx b/Global_Indexer/frmStart.resx index 818d09c..c8ef43a 100644 --- a/Global_Indexer/frmStart.resx +++ b/Global_Indexer/frmStart.resx @@ -134,34 +134,34 @@ Hotkey - Einstellungen - 217, 22 + 220, 22 Administration - 214, 6 + 217, 6 - 217, 22 + 220, 22 User Basis Einstellungen - 217, 22 + 220, 22 Hotkeys User - 217, 22 + 220, 22 - History - Indexierte Dateien + Historie - Indexierte Dateien - 217, 22 + 220, 22 Info @@ -559,7 +559,7 @@ in diesen Bereich oder LabelControl1 - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -1634,37 +1634,37 @@ in diesen Bereich oder LabelMachine - DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a LabelUser - DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a LabelLoggedIn - DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a LabelVersion - DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a RibbonMiniToolbar1 - DevExpress.XtraBars.Ribbon.RibbonMiniToolbar, DevExpress.XtraBars.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.Ribbon.RibbonMiniToolbar, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a MyDataset - Global_Indexer.MyDataset, MyDataset.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + Global_Indexer.MyDataset, MyDataset.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TBHOTKEY_USER_PROFILEBindingSource @@ -1676,13 +1676,13 @@ in diesen Bereich oder TBHOTKEY_USER_PROFILETableAdapter - Global_Indexer.MyDatasetTableAdapters.TBHOTKEY_USER_PROFILETableAdapter, MyDataset.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + Global_Indexer.MyDatasetTableAdapters.TBHOTKEY_USER_PROFILETableAdapter, MyDataset.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TableAdapterManager - Global_Indexer.MyDatasetTableAdapters.TableAdapterManager, MyDataset.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + Global_Indexer.MyDatasetTableAdapters.TableAdapterManager, MyDataset.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null frmStart diff --git a/SetupWix/Product.wxs b/SetupWix/Product.wxs index ec1e742..3f44f4f 100644 --- a/SetupWix/Product.wxs +++ b/SetupWix/Product.wxs @@ -126,6 +126,7 @@ +