From fb4728e2bfcb65735c3de49e6129b2be7ff86567 Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Mon, 4 Apr 2022 12:46:48 +0200 Subject: [PATCH 1/3] MS --- Global_Indexer/My Project/AssemblyInfo.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Global_Indexer/My Project/AssemblyInfo.vb b/Global_Indexer/My Project/AssemblyInfo.vb index b57230e..8dbfa9d 100644 --- a/Global_Indexer/My Project/AssemblyInfo.vb +++ b/Global_Indexer/My Project/AssemblyInfo.vb @@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + \ No newline at end of file From 5914e27bccb755b6ce4ecd6f0d311d9d80ce7418 Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Mon, 4 Apr 2022 12:55:57 +0200 Subject: [PATCH 2/3] MS Icons SQL Editor Griid --- Global_Indexer/Global_Indexer.vbproj | 4 +- Global_Indexer/My Project/AssemblyInfo.vb | 2 +- .../My Project/Resources.Designer.vb | 10 +++ Global_Indexer/My Project/Resources.resx | 31 ++++---- Global_Indexer/My Project/licenses.licx | 7 +- Global_Indexer/Resources/file.png | Bin 0 -> 3472 bytes Global_Indexer/file.ico | Bin 0 -> 3492 bytes Global_Indexer/frmSQL_DESIGNER.Designer.vb | 74 +++++++++--------- Global_Indexer/frmSQL_DESIGNER.vb | 2 +- Global_Indexer/frmStart.Designer.vb | 2 +- 10 files changed, 75 insertions(+), 57 deletions(-) create mode 100644 Global_Indexer/Resources/file.png create mode 100644 Global_Indexer/file.ico diff --git a/Global_Indexer/Global_Indexer.vbproj b/Global_Indexer/Global_Indexer.vbproj index 190472c..ada9466 100644 --- a/Global_Indexer/Global_Indexer.vbproj +++ b/Global_Indexer/Global_Indexer.vbproj @@ -63,7 +63,7 @@ On - Resources\DD_Icons_ICO_GLOBIX_128.ico + file.ico My Project\app.manifest @@ -775,10 +775,12 @@ PreserveNewest + PreserveNewest + diff --git a/Global_Indexer/My Project/AssemblyInfo.vb b/Global_Indexer/My Project/AssemblyInfo.vb index a4f9cde..2ca2f9a 100644 --- a/Global_Indexer/My Project/AssemblyInfo.vb +++ b/Global_Indexer/My Project/AssemblyInfo.vb @@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + \ No newline at end of file diff --git a/Global_Indexer/My Project/Resources.Designer.vb b/Global_Indexer/My Project/Resources.Designer.vb index 177efc1..dffe020 100644 --- a/Global_Indexer/My Project/Resources.Designer.vb +++ b/Global_Indexer/My Project/Resources.Designer.vb @@ -420,6 +420,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property file() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("file", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' diff --git a/Global_Indexer/My Project/Resources.resx b/Global_Indexer/My Project/Resources.resx index 8f7de54..fb2c3db 100644 --- a/Global_Indexer/My Project/Resources.resx +++ b/Global_Indexer/My Project/Resources.resx @@ -157,6 +157,9 @@ ..\Resources\action_add_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\highlight.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\database_save2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -196,6 +199,9 @@ ..\Resources\globe_handdrawn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\database_save1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\arrow_left.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -235,9 +241,6 @@ ..\Resources\itemtypechecked.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\WindowsForm_817_12x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -265,14 +268,11 @@ ..\Resources\arrow_right.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\database_save1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\page_red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\KeyDown_8461_12x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\shipmentawaiting.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\folder_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -280,12 +280,15 @@ ..\Resources\Shortcut_8169_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\shipmentawaiting.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\about.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\arrow_Up_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\KeyDown_8461_12x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\arrow_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -310,8 +313,8 @@ ..\Resources\GLOBIX_short.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\highlight.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\WindowsForm_817_12x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\save_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -322,7 +325,7 @@ ..\Resources\Einstellungen6.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\about.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\file.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/Global_Indexer/My Project/licenses.licx b/Global_Indexer/My Project/licenses.licx index 86fadc5..3ff7d7d 100644 --- a/Global_Indexer/My Project/licenses.licx +++ b/Global_Indexer/My Project/licenses.licx @@ -1,7 +1,8 @@ -DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.SearchLookUpEdit, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.PictureEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.GridLookUpEdit, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.SearchLookUpEdit, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/Global_Indexer/Resources/file.png b/Global_Indexer/Resources/file.png new file mode 100644 index 0000000000000000000000000000000000000000..a018d0949ea0397af8670b2d54075a1aba1b5ed2 GIT binary patch literal 3472 zcmb_f`9GBF`@f%=VFn{JDMn<5;j~C-GdRrDv5%OdBx1CXN|usrGY@6yBxLL4&{1)+ z97`c5jNxNTNgWX-%X}!ZG-Jy?^Lgg;{r&~t*Y}6#b>FY+eLdH8y|4Rz?)&}RVmaC< z%5RYe04UnoS{?-eLZ%SF$s&VCaDfjp$OYQET>(I0qx6Bg1~_Yo^C3ISgD%%UO%He_ zczjW7n;9zgC%8QO`iPsJ+C#H9`1F_B_M0a|k6@+`tIEGR5uNoKVkDArd;%K*UA~Ei}yyr{Ovx_n_)}d7d<-5}@*%h6odn?AW!`_As%~=d7 z-Aq566XqK~W+u!w*}J!@qT;dXdE=~#R3BY^9lE{b!QHE$7gyL_HF+hY+)!EZ;Q56b z^?KENEiMHR;&)|2DQsn|T(}=Hxl~NPk(B3H+4@&G$`YqJxS(Mhz0-YQD zUEd0l)$y1M&RxMhS_Qj6``l{9X;F000o|O^3EIJLkgaFEJJCIgl6=gLd5)h=JM}fT zTK&yAJJ%KwI_wRzCaZ(xXa5n>NnTNHku!xACR0^j_bJkbARX-Thh`DFRO4P{W=E#8 zVlnss55ITCozY@z1;$ z+D_PDx(w-h=UWllo3^tst;1)xRT2~!qeOTxGV#`D_X|`?UFTb76yvwAX=-nFT>+^T zDYSMhuHQMVlhkpQU}#d!J*+W1`vdTxSEPkxfz zFdu_-$g?x#p<)axYZdE69OR>E(-9%SzRI_C5z97elYt8UFyC9R4v(IN21V%RY0>bl zgE!28<~pQ~1MI#*pkpKXC`KR9aO68t2B2L_o1%>!d~*H zpdyICXzc?by6nCZXbMm!j_=(H;)V`rvuOZN*U@J0K?Yg3B=`j|TqCt!z&Oajf;O58 zmHiU}JS$g$lp*%g-S~W*B^kt#txnuxbRz~MIR#?E0bmg)X&sZyMO8d@T@ccK;4IYu zxrrb0rD!nxyUdWWd3b>NV$AbWkCJ)QGf9lAkZAu}fW>m+<;Z7WR=?T^TerD~&$as| zz|U#YwP+lb!B|Iw0>!P#6H0Hn5?kL zY>fP_szg6(rL#8Qqt~^!{vEcg{!cT_aF#Lo1@Bou?LFJF0^aTtN#L<6G zp|V<|Y%#CK%#lrFp=F)hv6_NQe|-^<#HSDa%GivA*`8dDEOwfl7V6j_5=Nsc+?YLH zzgm%&f#**2SATvKFA@712({;lq6qG>K{H&*>~r*zs7t-3B&gbFOWV%c&fk+imrBW# z>sGSrYktJey_QVz7DN0mGDAD*tdIV)PnAV4BJ@T$X+;A(#ZQ0F*X*XRM&|dLyqq+G zNmS7{GokfX=t0ekk%*;y;3-2vU3MWtaYH$TI4^k$*hmb_@4y+ZeZRS9?I;CGNr3gv zS;B(QZFz!wD0$ct;}N7L^?rwV?~;1ASYb$<&_f!W9Sy+NvLVAxyFpZ|JRxF6%QCc4 zrJHVnCZXfYCIcA_a0~Z$>NXUfZ}w1$zv(*A(H^$Xl&0$TUdrEsk$NZImU^Fx^D45F z!mrBz3;Q9kj1A;B0xzWE}5BqmE0&;9$tR-~4jNdhJJX*7ix%`#dO+}1|O;1rv@ zl>U)c@{qkWNiC8RGDc2=kue7AVJA&jJ_oanwj-zY-i9#?tqqQI- zRm6Q$i>R&bEJ7+pwTZl~Ldx?vo?GXDMF?QMmqvUnkN~7uK{6S#B}DT`9Ccg+(0OTm6Jk>;&Q3Yjqvj^$%4+2d5%S!s)gG6s#WQk58C*M;W#4zn%ugb#S`ynFX zj1?FpflZc}e>I4l;(!B;TWS$GB>{&7+)|^cwlNHB$QzUU9Ne}TY0!c}HrIB(Mt8iD z0q>zfnOCo`kSC1Tab$INC4?98qpbcO@lK(_Vs_sQ4+l7b`2X)q=YOuN_o*ME3{bG@ zUp&f0&&v&aKeH4NyL)}o|hb^r=|)9&R@1Oor>5Gc2*2b zg!p!y0b7TPAy#41{K9?sf2WoJ6q}~*LnI;9P6G?3`Ytcj?ClyfMxUDJ?F1QpIUy*} zS7A0;>jddMkOi_+mnHcD98FLQD3>FABDtV*#d9lsbo%~`IfSUji>b$>$_R`d$J5k? z_D>DKdiAbyxtsJ>x#eRNb`esLt?5KW70CXG2*rw3E^T5CWJZ;#z|OCmIJB!+%2NfP zy=VR(uPu_N!%w2hw!q3%->}gQjMPted~CYvggxl(m#TUucPFm2-LOy&Z2zyq@k11j zBBQu>AZ7lM&>iHasHUlD`XP$Q1yQGIh_o$%Qa*+k_vV<5OVSt4G^**6?Z`GYsy-^uHu-R@bYG@BQljG#GKh2>H$j)?82!A~_SXOi% zEpAk4as3tj(9M;5;7U6WosxI$vB_iclV4|Ff#D%U_Z=^*%~+)Gn*Wm9zFGg4t1K9L zuB)%2#wlcjya6R8Hx}Ol6jkr=)0!koyyeYhNX_q|hT9Ju0;8{f@Wb0QlH0%*n3-mU#M}pwj)_~_C!Xd zOY38CZWlV`f^pXE39gR_1vE`%<*XH*_t7=BVGL+QD^Z>(EVe%ETIXSCegeciRa(=m8UnZh92aJz|PidaiF z!OnDEwK$yfhZPGVrBC5iWW@wbcl+}d;oWbx6HA;tvTh%kx>uJ?E9T($i53%S0vzWr nrv2MCA%2Z_Jxqrd^+`T{hv)2B7f9v=A{(fui_1g;o2)?Bk z1V|uT9sm`%pK-v$S$^}@&2U%V)rEdYib@}hEZq2?F8u|Td%M!@y<*;d9S%(QpHh3a z5IA6l*>N=L70vB=h(?KOSdi@I+XFi@3!A1L?A6>OWF8#LQmrL@eOIm=_b~NP+`)J9 z4(zyt1M0~2l%sKYJbP|4qn%KFQf9&Fc&(z+m9K3#l=Q!J%+@RH_kH_MOliPRH^57CzEcYRwuQa(7m*z{zl zLh4r5xuRJA3)-H^nu|?(q%=+Wpq?vzCxrFtTvb!I1JJML*X209fmrLHYRZZIy?*6` z0ZUE!zl(qlZ91>Dho5aK`x7@>b_CIL%2ZX?z|C@Mi3kLt0lguxrZ95qDw?DwIp*q| z@SaIJFvPi5u3&!*a?u)nklupUdwcDXSAXRBUSy7SV%?6%D|T96I4UobEF=HwkPA1z z{*q&uHI81i)SW(U;#ji%7&=GN7pSEF85oAT`E3g}A4@>zXiN?%@^Md2@9T9k`PpO7 zFa(F~?ds|My&Lf+sq<$$M(LvE&80JYG}(aNm}M z8scPoE=7<;j;!0yBv_gvo5Hbt9{SOw)0nk;A)kopG?xEmSDruQa_iHld$y!~cR6aE zJEH)nCdcAA8Z&e_wu{hlMv=OwF4<9I0X;)n+J!tC4NeA$Q|c{>TigYr+HkWw=={Xxmi_n`c+Af&6y?xeTYqQ3YndXa-WQwwyM4CQFLN(QYjwXTExwyrk@Z z2i+Gl_5l4OPuJSoflfE&beWN28fBtOo=}JM{oWJ=JPaG&IGX5-Zt2LFRH9@|DCQDG_M_A_zfsVeM z;5?CZDvj-l-8us8oaAl;XCLJx*#i)-(rfff@fYWfx9dnV4L6!6X&CBQW#CzEo$e@5 z6~Z6`miH3p%$USR|6^;zI#3zjO*zpe+5uvW%_)yJVDL9vEe*S-he$9Rga*E5loJCY zGK^YLY=!8m83GOhd<%v5 zyM#$lf?TK)GsP5jJTR6FD5gC40|)rwN_YZQ6R=0k$V>}>rRk8FCUC<(n$7wfP$h)6 z5Y#>y*7!3W6$(=i2CA!6ASH+?zLHjgp%Vd{__}IKN-2^jD8k6$)6IY_d*j`wjitnz zA|GLM1k>pP7^}K4rR3 z%G^mCvD|M6j1@Lo_%-#yIm*=$y@FG;g^6CnKQWVs%R#H91Xr-}r`Fn_dx?V6Hji62 zMa~<`I8B?im=lBcsOpC4ytL-#*?9cXR%=O(^L+1qG;XH7oA}B(JX+Z1O!SGfDmO_W zj>OJD0n;MkwAK8z(*c12%MQfGmFsgcpY4Ye#NS_>nh2dJJ$3SZ1j)lg*s!agIJd#f}i*WnZ}6RIY;uCPY+aO27~0BDJh6j2jwuRjfjwX8okiZ9-bUxg$F(&lDH*h2Biep$<>y0-c+IsstivDg!NE| zY&$iPHhx=y2p+hcN=Px8cO)M$d;m}4U8O^)vM0C^gP-u#+(>;uxH7efkTe7W$?kDm@-57VfawG6jSXpjb< zD4039GV?;U%V?uUG%|QKDKPq0Tw(RlWU&5NlnCB&^t>D5)gPZ7KO2znecA0nRQ_Nv zFm@Vy9X)c%5@CHN>X}I34q40Dq28C05!hxcZEUl$9nc|iibBH6PMT_NO;KS zMLOWmd${n8WRyV$=E(;WsrGI8W@TTgc4iiaDw#{QkQ`z`Iq9sQ_L6ym2BjH+dy1?b z8Bw`U31W}l%t;H}Yyr05BXm7cgrsN(V$ya2aG~?A?v%Q^#}~No#<1up|38$a+V$9G zuiPK-!5{Ez7~U*})v|eO&1<{)^De{eK#szV=1;Aa^Lr=%G2wZ?=q_>4GfDKPTX-%G zo9r7>i*$LYR0@CK*0or8=nQ)tcQ_15!l%?T#eDBCuyxWIZ1Nj;jb~s|Gskg($}oGo zUkU4R>3T3xj0``Jcu)q8fNLxfZV3Q7$#{!z{P^0n7v&}XNt)yX-v#cyo*Rq$iJ!!m zcQge&RA^RSKwt1r_#PV;5YyEA#X4rFqJ*(tlE)YrN)`u~)NL={!4BN9F>AKP@oR z0&og2zZW-#ye%<;>4({OZ58aDZT2O2goL6s~}z$S78g*_^Zpr&H5 zRLMC-md$-<)_C1-;39K3JfAiwCiWzp>@YG=^38xZ0#)dZ^Q=^`dTm~&uchsHL0(tc zB2LHPwKSsIZrj0U8{Bq*`cnl`5g{6}kvN6mhigFX+D|d9spH+3!6Y5^?^c0l8rYYD zN&RiSKnu!;(~9H=Vxes;jJQpp>I^oM5lK|ZsR%6=ayk}K_kO`<)ZI8`JX-$+4lNv) zF8i0|KEk*0^Q#QEK5k>2_k5+KUu1G8Qd+CdB^n`EL=EKsyXgEVS8pyB?;p(qV{IQV z7IWvlf#6QJBj8o3xoS$Kd($-Ga%Tm2m0cH$4Mxjhy@8bB;ecB8PHwRy*9Tc>VpYM2 zHnWlKS!mh{uFkjw7HoR+-!5Ep%P6ksbJ5Yd854k|Db+kuztCoPlItT=xaH)uDy(tb zVC}<-BgjaDSkPeIMz8rOj@c=i0l$ZYiE;7Bst-SY156}o>WH41v*tP#s|;<{q5Jx~ zl7>rtkd-S8UHENo?WsH(I{eis%DopqS}rrzajtyu=Fn_nZd;2zuU6C5vq2;2 z`GNwe|CH$`)0mCOY&p;t77|gM{8A{Bw}s`^@XG(%x7FTCkUp9P&-CB-<&1WNUg0pW z%p#G{9vsjcq(&2_UDf)b*)w+7HKynwvoTDb(OGw-?W(uR4|(61LFOh%P#fm@GM4fD zlfx9`qO0wzjFV>$)fe}dp=nbF;NFijgt_`rMdE%1^>d~%*FsC$Pc$0F;CNM&7WOMy z1d`r#&jW9v*fy&WLEZUQtpm44#+2r2$}=dhuk|)WtxHAXG-4LUvI$YEa1A=gI?*tJpUg+?FNhh literal 0 HcmV?d00001 diff --git a/Global_Indexer/frmSQL_DESIGNER.Designer.vb b/Global_Indexer/frmSQL_DESIGNER.Designer.vb index 50102d8..3b3dcca 100644 --- a/Global_Indexer/frmSQL_DESIGNER.Designer.vb +++ b/Global_Indexer/frmSQL_DESIGNER.Designer.vb @@ -23,7 +23,6 @@ Partial Class frmSQL_DESIGNER _ Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmSQL_DESIGNER)) Me.TBDD_CONNECTIONBindingSource = New System.Windows.Forms.BindingSource(Me.components) @@ -34,7 +33,6 @@ Partial Class frmSQL_DESIGNER Me.Label4 = New System.Windows.Forms.Label() Me.Label1 = New System.Windows.Forms.Label() Me.Label5 = New System.Windows.Forms.Label() - Me.dgvResult = New System.Windows.Forms.DataGridView() Me.dgvPlaceholders = New System.Windows.Forms.DataGridView() Me.colPlaceholder = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.colReplace = New System.Windows.Forms.DataGridViewTextBoxColumn() @@ -53,9 +51,12 @@ Partial Class frmSQL_DESIGNER Me.cmbUser = New System.Windows.Forms.ComboBox() Me.Label3 = New System.Windows.Forms.Label() Me.btnAddUser = New System.Windows.Forms.Button() + Me.GridControl1 = New DevExpress.XtraGrid.GridControl() + Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView() CType(Me.TBDD_CONNECTIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.dgvResult, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.dgvPlaceholders, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'btnShowConnections @@ -96,15 +97,14 @@ Partial Class frmSQL_DESIGNER ' Me.SQL_COMMANDTextBox.AcceptsReturn = True Me.SQL_COMMANDTextBox.AcceptsTab = True - Me.SQL_COMMANDTextBox.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ - Or System.Windows.Forms.AnchorStyles.Left) _ + Me.SQL_COMMANDTextBox.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.SQL_COMMANDTextBox.Font = New System.Drawing.Font("Courier New", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.SQL_COMMANDTextBox.Location = New System.Drawing.Point(15, 125) Me.SQL_COMMANDTextBox.Multiline = True Me.SQL_COMMANDTextBox.Name = "SQL_COMMANDTextBox" Me.SQL_COMMANDTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical - Me.SQL_COMMANDTextBox.Size = New System.Drawing.Size(905, 186) + Me.SQL_COMMANDTextBox.Size = New System.Drawing.Size(936, 186) Me.SQL_COMMANDTextBox.TabIndex = 86 ' 'Label4 @@ -118,11 +118,10 @@ Partial Class frmSQL_DESIGNER ' 'Label1 ' - Me.Label1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.Label1.AutoSize = True Me.Label1.Font = New System.Drawing.Font("Segoe UI", 9.0!) Me.Label1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.Label1.Location = New System.Drawing.Point(13, 331) + Me.Label1.Location = New System.Drawing.Point(13, 328) Me.Label1.Name = "Label1" Me.Label1.Size = New System.Drawing.Size(65, 15) Me.Label1.TabIndex = 91 @@ -130,42 +129,25 @@ Partial Class frmSQL_DESIGNER ' 'Label5 ' - Me.Label5.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.Label5.AutoSize = True Me.Label5.Font = New System.Drawing.Font("Segoe UI", 9.0!) Me.Label5.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.Label5.Location = New System.Drawing.Point(365, 331) + Me.Label5.Location = New System.Drawing.Point(367, 328) Me.Label5.Name = "Label5" Me.Label5.Size = New System.Drawing.Size(55, 15) Me.Label5.TabIndex = 90 Me.Label5.Text = "Ergebnis:" ' - 'dgvResult - ' - Me.dgvResult.AllowUserToAddRows = False - Me.dgvResult.AllowUserToDeleteRows = False - DataGridViewCellStyle1.BackColor = System.Drawing.Color.Cyan - Me.dgvResult.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 - Me.dgvResult.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.dgvResult.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dgvResult.Location = New System.Drawing.Point(368, 349) - Me.dgvResult.Name = "dgvResult" - Me.dgvResult.ReadOnly = True - Me.dgvResult.Size = New System.Drawing.Size(552, 134) - Me.dgvResult.TabIndex = 89 - ' 'dgvPlaceholders ' Me.dgvPlaceholders.AllowUserToAddRows = False Me.dgvPlaceholders.AllowUserToDeleteRows = False DataGridViewCellStyle2.BackColor = System.Drawing.Color.Cyan Me.dgvPlaceholders.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 - Me.dgvPlaceholders.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.dgvPlaceholders.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvPlaceholders.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colPlaceholder, Me.colReplace}) Me.dgvPlaceholders.Enabled = False - Me.dgvPlaceholders.Location = New System.Drawing.Point(16, 349) + Me.dgvPlaceholders.Location = New System.Drawing.Point(16, 348) Me.dgvPlaceholders.Name = "dgvPlaceholders" Me.dgvPlaceholders.Size = New System.Drawing.Size(338, 133) Me.dgvPlaceholders.TabIndex = 88 @@ -183,12 +165,12 @@ Partial Class frmSQL_DESIGNER ' 'btnTestSQL ' - Me.btnTestSQL.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnTestSQL.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.btnTestSQL.Font = New System.Drawing.Font("Segoe UI Semibold", 9.75!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Italic), System.Drawing.FontStyle)) Me.btnTestSQL.Image = CType(resources.GetObject("btnTestSQL.Image"), System.Drawing.Image) Me.btnTestSQL.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnTestSQL.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnTestSQL.Location = New System.Drawing.Point(752, 314) + Me.btnTestSQL.Location = New System.Drawing.Point(783, 314) Me.btnTestSQL.Name = "btnTestSQL" Me.btnTestSQL.Size = New System.Drawing.Size(168, 29) Me.btnTestSQL.TabIndex = 87 @@ -232,7 +214,7 @@ Partial Class frmSQL_DESIGNER Me.btnSaveSQLCommand.DialogResult = System.Windows.Forms.DialogResult.OK Me.btnSaveSQLCommand.Image = CType(resources.GetObject("btnSaveSQLCommand.Image"), System.Drawing.Image) Me.btnSaveSQLCommand.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnSaveSQLCommand.Location = New System.Drawing.Point(825, 489) + Me.btnSaveSQLCommand.Location = New System.Drawing.Point(847, 655) Me.btnSaveSQLCommand.Name = "btnSaveSQLCommand" Me.btnSaveSQLCommand.Size = New System.Drawing.Size(95, 30) Me.btnSaveSQLCommand.TabIndex = 95 @@ -245,7 +227,7 @@ Partial Class frmSQL_DESIGNER Me.lblSaveFinalIndex.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.lblSaveFinalIndex.AutoSize = True Me.lblSaveFinalIndex.BackColor = System.Drawing.Color.Yellow - Me.lblSaveFinalIndex.Location = New System.Drawing.Point(367, 489) + Me.lblSaveFinalIndex.Location = New System.Drawing.Point(367, 655) Me.lblSaveFinalIndex.Name = "lblSaveFinalIndex" Me.lblSaveFinalIndex.Size = New System.Drawing.Size(38, 13) Me.lblSaveFinalIndex.TabIndex = 96 @@ -335,11 +317,31 @@ Partial Class frmSQL_DESIGNER Me.btnAddUser.TabIndex = 99 Me.btnAddUser.UseVisualStyleBackColor = True ' + 'GridControl1 + ' + Me.GridControl1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.GridControl1.Location = New System.Drawing.Point(370, 349) + Me.GridControl1.MainView = Me.GridView1 + Me.GridControl1.Name = "GridControl1" + Me.GridControl1.Size = New System.Drawing.Size(581, 300) + Me.GridControl1.TabIndex = 100 + Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) + ' + 'GridView1 + ' + Me.GridView1.GridControl = Me.GridControl1 + Me.GridView1.Name = "GridView1" + Me.GridView1.OptionsView.ShowFilterPanelMode = DevExpress.XtraGrid.Views.Base.ShowFilterPanelMode.ShowAlways + Me.GridView1.OptionsView.ShowGroupPanel = False + ' 'frmSQL_DESIGNER ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(930, 523) + Me.ClientSize = New System.Drawing.Size(952, 689) + Me.Controls.Add(Me.GridControl1) Me.Controls.Add(Me.btnAddUser) Me.Controls.Add(Me.btnAddStatic) Me.Controls.Add(Me.btnAddControl) @@ -356,7 +358,6 @@ Partial Class frmSQL_DESIGNER Me.Controls.Add(Me.cmbIndexe) Me.Controls.Add(Me.Label1) Me.Controls.Add(Me.Label5) - Me.Controls.Add(Me.dgvResult) Me.Controls.Add(Me.dgvPlaceholders) Me.Controls.Add(Me.btnTestSQL) Me.Controls.Add(Me.SQL_COMMANDTextBox) @@ -366,15 +367,15 @@ Partial Class frmSQL_DESIGNER Me.Controls.Add(Me.cmbConnection) Me.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) - Me.MaximizeBox = False Me.MinimizeBox = False Me.MinimumSize = New System.Drawing.Size(937, 392) Me.Name = "frmSQL_DESIGNER" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "SQL - Designer" CType(Me.TBDD_CONNECTIONBindingSource, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.dgvResult, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.dgvPlaceholders, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -390,7 +391,6 @@ Partial Class frmSQL_DESIGNER Friend WithEvents Label4 As System.Windows.Forms.Label Friend WithEvents Label1 As System.Windows.Forms.Label Friend WithEvents Label5 As System.Windows.Forms.Label - Friend WithEvents dgvResult As System.Windows.Forms.DataGridView Friend WithEvents dgvPlaceholders As System.Windows.Forms.DataGridView Friend WithEvents colPlaceholder As System.Windows.Forms.DataGridViewTextBoxColumn Friend WithEvents colReplace As System.Windows.Forms.DataGridViewTextBoxColumn @@ -409,4 +409,6 @@ Partial Class frmSQL_DESIGNER Friend WithEvents cmbUser As ComboBox Friend WithEvents Label3 As Label Friend WithEvents btnAddUser As Button + Friend WithEvents GridControl1 As DevExpress.XtraGrid.GridControl + Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView End Class diff --git a/Global_Indexer/frmSQL_DESIGNER.vb b/Global_Indexer/frmSQL_DESIGNER.vb index 354c697..dbb8013 100644 --- a/Global_Indexer/frmSQL_DESIGNER.vb +++ b/Global_Indexer/frmSQL_DESIGNER.vb @@ -175,7 +175,7 @@ Public Class frmSQL_DESIGNER If ds IsNot Nothing Then - dgvResult.DataSource = ds.Tables(0) + GridControl1.DataSource = ds.Tables(0) End If End Sub Private Function ExecuteWithConnection(connectionId As Integer, sql As String) As DataSet diff --git a/Global_Indexer/frmStart.Designer.vb b/Global_Indexer/frmStart.Designer.vb index 9b22c7a..8b59f8c 100644 --- a/Global_Indexer/frmStart.Designer.vb +++ b/Global_Indexer/frmStart.Designer.vb @@ -256,7 +256,7 @@ Partial Class frmStart Me.Controls.Add(Me.barDockControlBottom) Me.Controls.Add(Me.barDockControlTop) Me.IconOptions.Icon = CType(resources.GetObject("frmStart.IconOptions.Icon"), System.Drawing.Icon) - Me.IconOptions.Image = Global.Global_Indexer.My.Resources.Resources.FileFlow_Icon + Me.IconOptions.Image = Global.Global_Indexer.My.Resources.Resources.file Me.KeyPreview = True Me.MaximizeBox = False Me.Name = "frmStart" From 8424fa3e3161bca85001135800916334151547da Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Mon, 4 Apr 2022 13:05:48 +0200 Subject: [PATCH 3/3] MS LogErrorsOnly replaced --- Global_Indexer/ClassConfig.vb | 2 +- Global_Indexer/ClassInit.vb | 4 +- Global_Indexer/frmConfig_Basic.designer.vb | 6 +- Global_Indexer/frmConfig_Basic.resx | 904 +++++++-------------- Global_Indexer/frmConfig_Basic.vb | 6 +- Global_Indexer/frmSQL_DESIGNER.Designer.vb | 40 +- 6 files changed, 331 insertions(+), 631 deletions(-) diff --git a/Global_Indexer/ClassConfig.vb b/Global_Indexer/ClassConfig.vb index c96c5e8..a2d7afc 100644 --- a/Global_Indexer/ClassConfig.vb +++ b/Global_Indexer/ClassConfig.vb @@ -17,6 +17,6 @@ Public Class ClassConfig Public Property TopMost As Boolean = True ' Misc Settings - Public Property LogErrorsOnly As Boolean = True + Public Property LogDEBUG As Boolean = True Public Property WindreamSearchMaximized As Boolean = False End Class diff --git a/Global_Indexer/ClassInit.vb b/Global_Indexer/ClassInit.vb index 36d7f60..530eb67 100644 --- a/Global_Indexer/ClassInit.vb +++ b/Global_Indexer/ClassInit.vb @@ -18,11 +18,11 @@ Public Class ClassInit Public Sub InitConfig() CONFIG = New ConfigManager(Of ClassConfig)(LOGCONFIG, Application.UserAppDataPath, Application.CommonAppDataPath) - LOGCONFIG.Debug = Not CONFIG.Config.LogErrorsOnly + LOGCONFIG.Debug = Not CONFIG.Config.LogDEBUG LOGGER.Info("Debug log set to: [{0}]", LOGCONFIG.Debug) MyConnectionString = DecryptConnectionString(CONFIG.Config.ConnectionString) - LogErrorsOnly = CONFIG.Config.LogErrorsOnly + LogErrorsOnly = CONFIG.Config.LogDEBUG 'myPreviewActive = CONFIG.Config.FilePreview FW_started = CONFIG.Config.FolderWatchStarted diff --git a/Global_Indexer/frmConfig_Basic.designer.vb b/Global_Indexer/frmConfig_Basic.designer.vb index 258e1bf..f712fd0 100644 --- a/Global_Indexer/frmConfig_Basic.designer.vb +++ b/Global_Indexer/frmConfig_Basic.designer.vb @@ -23,7 +23,7 @@ Partial Class frmConfig_Basic _ Private Sub InitializeComponent() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmConfig_Basic)) - Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.TabControl1 = New System.Windows.Forms.TabControl() Me.TabPage1 = New System.Windows.Forms.TabPage() Me.chkbxUserAut = New System.Windows.Forms.CheckBox() @@ -266,8 +266,8 @@ Partial Class frmConfig_Basic ' 'DataGridView1 ' - DataGridViewCellStyle2.BackColor = System.Drawing.Color.Aqua - Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 + DataGridViewCellStyle1.BackColor = System.Drawing.Color.Aqua + Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 resources.ApplyResources(Me.DataGridView1, "DataGridView1") Me.DataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.DataGridView1.Name = "DataGridView1" diff --git a/Global_Indexer/frmConfig_Basic.resx b/Global_Indexer/frmConfig_Basic.resx index 2544fbb..b735236 100644 --- a/Global_Indexer/frmConfig_Basic.resx +++ b/Global_Indexer/frmConfig_Basic.resx @@ -117,6 +117,23 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + + 255, 58 + + + 170, 17 + + + 47 + + + Windows-Authentifizierung + chkbxUserAut @@ -129,6 +146,21 @@ 0 + + True + + + 5, 115 + + + 150, 13 + + + 46 + + + Aktueller ConnectionString: + Label5 @@ -141,6 +173,15 @@ 1 + + 8, 78 + + + 244, 21 + + + 39 + cmbDatenbank @@ -153,6 +194,21 @@ 2 + + True + + + 5, 62 + + + 67, 13 + + + 44 + + + Datenbank: + Label4 @@ -165,6 +221,21 @@ 3 + + True + + + 5, 14 + + + 74, 13 + + + 41 + + + Server-Name: + Label1 @@ -177,6 +248,21 @@ 4 + + True + + + 255, 14 + + + 83, 13 + + + 42 + + + Benutzername: + Label2 @@ -189,6 +275,21 @@ 5 + + True + + + 379, 14 + + + 56, 13 + + + 43 + + + Passwort: + Label3 @@ -201,6 +302,19 @@ 6 + + + Top, Left, Right + + + 8, 131 + + + 370, 22 + + + 45 + txtActualConnection @@ -213,6 +327,15 @@ 7 + + 6, 30 + + + 246, 22 + + + 36 + txtServer @@ -225,6 +348,15 @@ 8 + + 255, 30 + + + 118, 22 + + + 37 + txtUser @@ -237,6 +369,15 @@ 9 + + 382, 30 + + + 64, 22 + + + 38 + txtPasswort @@ -249,6 +390,24 @@ 10 + + MiddleLeft + + + 255, 75 + + + 253, 25 + + + 40 + + + Verbindung zur Datenbank herstellen + + + MiddleRight + BtnConnect @@ -261,18 +420,15 @@ 11 - 4, 22 - 3, 3, 3, 3 582, 280 - 0 @@ -458,13 +614,13 @@ 11, 51 - 146, 17 + 84, 17 3 - LogErrorsOnly (Ja/Nein) + Log DEBUG chkLogErrorsOnly @@ -568,6 +724,22 @@ 1 + + True + + + 8, 197 + + + 453, 26 + + + 13 + + + Definieren Sie hier Inhalte von Dateinamen welche von der Folderwatch-Überwachung +ausgenommen werden sollen: + Label8 @@ -580,6 +752,18 @@ 0 + + Top, Bottom, Left + + + 11, 226 + + + 192, 100 + + + 11 + DataGridView1 @@ -592,6 +776,18 @@ 1 + + 495, 140 + + + 49, 22 + + + 10 + + + ... + Button2 @@ -604,6 +800,15 @@ 2 + + 11, 142 + + + 478, 22 + + + 8 + txtScanFolderWatch @@ -616,6 +821,21 @@ 3 + + True + + + 8, 126 + + + 392, 13 + + + 7 + + + Definieren Sie hier den Ordner der für Scan2Folder verwendet werden soll: + Label7 @@ -628,6 +848,18 @@ 4 + + 495, 30 + + + 49, 22 + + + 6 + + + ... + btnsetFW_Folder @@ -640,6 +872,18 @@ 5 + + 11, 87 + + + 298, 23 + + + 3 + + + Ordner 'GlobalIndexer' in Eigenen Dateien erzeugen + btnFW_OwnFiles @@ -652,603 +896,8 @@ 6 - - btnFW_Desktop - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage3 - - - 7 - - - txtFolderWatch - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage3 - - - 8 - - - Label6 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage3 - - - 9 - - - btnSaveExclusionFiles - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage3 - - - 10 - - - btnstartstop2 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage3 - - - 11 - - - btnstartstop1 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage3 - - - 12 - - - 4, 22 - - - 3, 3, 3, 3 - - - 582, 280 - - - 2 - - - Überwachte Ordner - Folderwatch - - - TabPage3 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabControl1 - - - 2 - - - Fill - - - 0, 0 - - - 590, 306 - - - 0 - - - TabControl1 - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 0 - - - True - - - 255, 58 - - - 170, 17 - - - 47 - - - Windows-Authentifizierung - - - chkbxUserAut - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage1 - - - 0 - - - True - - - 5, 115 - - - 150, 13 - - - 46 - - - Aktueller ConnectionString: - - - Label5 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage1 - - - 1 - - - 8, 78 - - - 244, 21 - - - 39 - - - cmbDatenbank - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage1 - - - 2 - - - True - - - 5, 62 - - - 67, 13 - - - 44 - - - Datenbank: - - - Label4 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage1 - - - 3 - - - True - - - 5, 14 - - - 74, 13 - - - 41 - - - Server-Name: - - - Label1 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage1 - - - 4 - - - True - - - 255, 14 - - - 83, 13 - - - 42 - - - Benutzername: - - - Label2 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage1 - - - 5 - - - True - - - 379, 14 - - - 56, 13 - - - 43 - - - Passwort: - - - Label3 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage1 - - - 6 - - - Top, Left, Right - - - 8, 131 - - - 370, 22 - - - 45 - - - txtActualConnection - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage1 - - - 7 - - - 6, 30 - - - 246, 22 - - - 36 - - - txtServer - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage1 - - - 8 - - - 255, 30 - - - 118, 22 - - - 37 - - - txtUser - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage1 - - - 9 - - - 382, 30 - - - 64, 22 - - - 38 - - - txtPasswort - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage1 - - - 10 - - - MiddleLeft - - - 255, 75 - - - 253, 25 - - - 40 - - - Verbindung zur Datenbank herstellen - - - MiddleRight - - - BtnConnect - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage1 - - - 11 - - - True - - - 8, 197 - - - 453, 26 - - - 13 - - - Definieren Sie hier Inhalte von Dateinamen welche von der Folderwatch-Überwachung -ausgenommen werden sollen: - - - Label8 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage3 - - - 0 - - - Top, Bottom, Left - - - 11, 226 - - - 192, 100 - - - 11 - - - DataGridView1 - - - System.Windows.Forms.DataGridView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage3 - - - 1 - - - 495, 140 - - - 49, 22 - - - 10 - - - ... - - - Button2 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage3 - - - 2 - - - 11, 142 - - - 478, 22 - - - 8 - - - txtScanFolderWatch - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage3 - - - 3 - - - True - - - 8, 126 - - - 392, 13 - - - 7 - - - Definieren Sie hier den Ordner der für Scan2Folder verwendet werden soll: - - - Label7 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage3 - - - 4 - - - 495, 30 - - - 49, 22 - - - 6 - - - ... - - - btnsetFW_Folder - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage3 - - - 5 - - - 11, 87 - - - 298, 23 - - - 3 - - - Ordner 'GlobalIndexer' in Eigenen Dateien erzeugen - - - btnFW_OwnFiles - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage3 - - - 6 - - - 11, 58 + + 11, 58 298, 23 @@ -1415,6 +1064,57 @@ ausgenommen werden sollen: 12 + + 4, 22 + + + 3, 3, 3, 3 + + + 582, 280 + + + 2 + + + Überwachte Ordner - Folderwatch + + + TabPage3 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControl1 + + + 2 + + + Fill + + + 0, 0 + + + 590, 306 + + + 0 + + + TabControl1 + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + 17, 17 diff --git a/Global_Indexer/frmConfig_Basic.vb b/Global_Indexer/frmConfig_Basic.vb index 4a9d569..7ed1900 100644 --- a/Global_Indexer/frmConfig_Basic.vb +++ b/Global_Indexer/frmConfig_Basic.vb @@ -356,12 +356,12 @@ Public Class frmConfig_Basic Private Sub CheckBox1_CheckedChanged(sender As Object, e As EventArgs) Handles chkLogErrorsOnly.CheckedChanged If formloaded = True Then - CONFIG.Config.LogErrorsOnly = chkLogErrorsOnly.Checked + CONFIG.Config.LogDEBUG = chkLogErrorsOnly.Checked CONFIG.Save() 'SaveConfigValue("LogErrorsOnly", chkLogErrorsOnly.Checked) LOGGER.Info(" >> LogErrorsOnly changed to '" & chkLogErrorsOnly.Checked) LogErrorsOnly = chkLogErrorsOnly.Checked - LOGCONFIG.Debug = Not chkLogErrorsOnly.Checked + LOGCONFIG.Debug = chkLogErrorsOnly.Checked End If End Sub @@ -372,7 +372,7 @@ Public Class frmConfig_Basic End Sub Sub Load_Basics() Try - chkLogErrorsOnly.Checked = CONFIG.Config.LogErrorsOnly + chkLogErrorsOnly.Checked = CONFIG.Config.LogDEBUG If Not MyConnectionString = String.Empty Then Dim csb As New SqlClient.SqlConnectionStringBuilder With { diff --git a/Global_Indexer/frmSQL_DESIGNER.Designer.vb b/Global_Indexer/frmSQL_DESIGNER.Designer.vb index 3b3dcca..562f475 100644 --- a/Global_Indexer/frmSQL_DESIGNER.Designer.vb +++ b/Global_Indexer/frmSQL_DESIGNER.Designer.vb @@ -23,7 +23,7 @@ Partial Class frmSQL_DESIGNER _ Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmSQL_DESIGNER)) Me.TBDD_CONNECTIONBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.btnShowConnections = New System.Windows.Forms.Button() @@ -100,7 +100,7 @@ Partial Class frmSQL_DESIGNER Me.SQL_COMMANDTextBox.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.SQL_COMMANDTextBox.Font = New System.Drawing.Font("Courier New", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.SQL_COMMANDTextBox.Location = New System.Drawing.Point(15, 125) + Me.SQL_COMMANDTextBox.Location = New System.Drawing.Point(12, 115) Me.SQL_COMMANDTextBox.Multiline = True Me.SQL_COMMANDTextBox.Name = "SQL_COMMANDTextBox" Me.SQL_COMMANDTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical @@ -110,7 +110,7 @@ Partial Class frmSQL_DESIGNER 'Label4 ' Me.Label4.AutoSize = True - Me.Label4.Location = New System.Drawing.Point(9, 109) + Me.Label4.Location = New System.Drawing.Point(9, 99) Me.Label4.Name = "Label4" Me.Label4.Size = New System.Drawing.Size(81, 13) Me.Label4.TabIndex = 85 @@ -142,8 +142,8 @@ Partial Class frmSQL_DESIGNER ' Me.dgvPlaceholders.AllowUserToAddRows = False Me.dgvPlaceholders.AllowUserToDeleteRows = False - DataGridViewCellStyle2.BackColor = System.Drawing.Color.Cyan - Me.dgvPlaceholders.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 + DataGridViewCellStyle1.BackColor = System.Drawing.Color.Cyan + Me.dgvPlaceholders.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 Me.dgvPlaceholders.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvPlaceholders.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colPlaceholder, Me.colReplace}) Me.dgvPlaceholders.Enabled = False @@ -170,7 +170,7 @@ Partial Class frmSQL_DESIGNER Me.btnTestSQL.Image = CType(resources.GetObject("btnTestSQL.Image"), System.Drawing.Image) Me.btnTestSQL.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnTestSQL.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnTestSQL.Location = New System.Drawing.Point(783, 314) + Me.btnTestSQL.Location = New System.Drawing.Point(780, 314) Me.btnTestSQL.Name = "btnTestSQL" Me.btnTestSQL.Size = New System.Drawing.Size(168, 29) Me.btnTestSQL.TabIndex = 87 @@ -183,7 +183,7 @@ Partial Class frmSQL_DESIGNER Me.lbIndexe.AutoSize = True Me.lbIndexe.Enabled = False Me.lbIndexe.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lbIndexe.Location = New System.Drawing.Point(678, 13) + Me.lbIndexe.Location = New System.Drawing.Point(726, 13) Me.lbIndexe.Name = "lbIndexe" Me.lbIndexe.Size = New System.Drawing.Size(203, 16) Me.lbIndexe.TabIndex = 93 @@ -193,7 +193,7 @@ Partial Class frmSQL_DESIGNER ' Me.cmbIndexe.Enabled = False Me.cmbIndexe.FormattingEnabled = True - Me.cmbIndexe.Location = New System.Drawing.Point(681, 32) + Me.cmbIndexe.Location = New System.Drawing.Point(719, 31) Me.cmbIndexe.Name = "cmbIndexe" Me.cmbIndexe.Size = New System.Drawing.Size(194, 21) Me.cmbIndexe.TabIndex = 92 @@ -202,7 +202,7 @@ Partial Class frmSQL_DESIGNER ' Me.btnAddIndex.Enabled = False Me.btnAddIndex.Image = CType(resources.GetObject("btnAddIndex.Image"), System.Drawing.Image) - Me.btnAddIndex.Location = New System.Drawing.Point(881, 32) + Me.btnAddIndex.Location = New System.Drawing.Point(916, 32) Me.btnAddIndex.Name = "btnAddIndex" Me.btnAddIndex.Size = New System.Drawing.Size(32, 23) Me.btnAddIndex.TabIndex = 94 @@ -214,7 +214,7 @@ Partial Class frmSQL_DESIGNER Me.btnSaveSQLCommand.DialogResult = System.Windows.Forms.DialogResult.OK Me.btnSaveSQLCommand.Image = CType(resources.GetObject("btnSaveSQLCommand.Image"), System.Drawing.Image) Me.btnSaveSQLCommand.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnSaveSQLCommand.Location = New System.Drawing.Point(847, 655) + Me.btnSaveSQLCommand.Location = New System.Drawing.Point(853, 655) Me.btnSaveSQLCommand.Name = "btnSaveSQLCommand" Me.btnSaveSQLCommand.Size = New System.Drawing.Size(95, 30) Me.btnSaveSQLCommand.TabIndex = 95 @@ -237,7 +237,7 @@ Partial Class frmSQL_DESIGNER 'btnAddControl ' Me.btnAddControl.Image = CType(resources.GetObject("btnAddControl.Image"), System.Drawing.Image) - Me.btnAddControl.Location = New System.Drawing.Point(643, 32) + Me.btnAddControl.Location = New System.Drawing.Point(681, 30) Me.btnAddControl.Name = "btnAddControl" Me.btnAddControl.Size = New System.Drawing.Size(32, 23) Me.btnAddControl.TabIndex = 99 @@ -247,7 +247,7 @@ Partial Class frmSQL_DESIGNER ' Me.lblControls.AutoSize = True Me.lblControls.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblControls.Location = New System.Drawing.Point(442, 13) + Me.lblControls.Location = New System.Drawing.Point(480, 11) Me.lblControls.Name = "lblControls" Me.lblControls.Size = New System.Drawing.Size(215, 16) Me.lblControls.TabIndex = 98 @@ -256,7 +256,7 @@ Partial Class frmSQL_DESIGNER 'cmbControls ' Me.cmbControls.FormattingEnabled = True - Me.cmbControls.Location = New System.Drawing.Point(445, 31) + Me.cmbControls.Location = New System.Drawing.Point(483, 29) Me.cmbControls.Name = "cmbControls" Me.cmbControls.Size = New System.Drawing.Size(194, 21) Me.cmbControls.TabIndex = 97 @@ -265,7 +265,7 @@ Partial Class frmSQL_DESIGNER ' Me.cmbStatic.FormattingEnabled = True Me.cmbStatic.Items.AddRange(New Object() {"USERNAME", "MACHINE", "DOMAIN", "DATE"}) - Me.cmbStatic.Location = New System.Drawing.Point(445, 86) + Me.cmbStatic.Location = New System.Drawing.Point(483, 84) Me.cmbStatic.Name = "cmbStatic" Me.cmbStatic.Size = New System.Drawing.Size(194, 21) Me.cmbStatic.TabIndex = 97 @@ -273,7 +273,7 @@ Partial Class frmSQL_DESIGNER 'btnAddStatic ' Me.btnAddStatic.Image = CType(resources.GetObject("btnAddStatic.Image"), System.Drawing.Image) - Me.btnAddStatic.Location = New System.Drawing.Point(643, 86) + Me.btnAddStatic.Location = New System.Drawing.Point(681, 84) Me.btnAddStatic.Name = "btnAddStatic" Me.btnAddStatic.Size = New System.Drawing.Size(32, 23) Me.btnAddStatic.TabIndex = 99 @@ -283,7 +283,7 @@ Partial Class frmSQL_DESIGNER ' Me.Label2.AutoSize = True Me.Label2.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label2.Location = New System.Drawing.Point(442, 67) + Me.Label2.Location = New System.Drawing.Point(480, 65) Me.Label2.Name = "Label2" Me.Label2.Size = New System.Drawing.Size(112, 16) Me.Label2.TabIndex = 98 @@ -293,7 +293,7 @@ Partial Class frmSQL_DESIGNER ' Me.cmbUser.FormattingEnabled = True Me.cmbUser.Items.AddRange(New Object() {"PRENAME", "SURNAME", "SHORTNAME", "LANGUAGE", "EMAIL", "USER_ID", "PROFILE_ID"}) - Me.cmbUser.Location = New System.Drawing.Point(681, 86) + Me.cmbUser.Location = New System.Drawing.Point(719, 86) Me.cmbUser.Name = "cmbUser" Me.cmbUser.Size = New System.Drawing.Size(194, 21) Me.cmbUser.TabIndex = 97 @@ -302,7 +302,7 @@ Partial Class frmSQL_DESIGNER ' Me.Label3.AutoSize = True Me.Label3.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label3.Location = New System.Drawing.Point(678, 67) + Me.Label3.Location = New System.Drawing.Point(716, 67) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(118, 16) Me.Label3.TabIndex = 98 @@ -311,7 +311,7 @@ Partial Class frmSQL_DESIGNER 'btnAddUser ' Me.btnAddUser.Image = CType(resources.GetObject("btnAddUser.Image"), System.Drawing.Image) - Me.btnAddUser.Location = New System.Drawing.Point(881, 84) + Me.btnAddUser.Location = New System.Drawing.Point(916, 84) Me.btnAddUser.Name = "btnAddUser" Me.btnAddUser.Size = New System.Drawing.Size(32, 23) Me.btnAddUser.TabIndex = 99 @@ -325,7 +325,7 @@ Partial Class frmSQL_DESIGNER Me.GridControl1.Location = New System.Drawing.Point(370, 349) Me.GridControl1.MainView = Me.GridView1 Me.GridControl1.Name = "GridControl1" - Me.GridControl1.Size = New System.Drawing.Size(581, 300) + Me.GridControl1.Size = New System.Drawing.Size(578, 300) Me.GridControl1.TabIndex = 100 Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) '