From a7ab84cc3f6c7eb7adf37b3e58768dc8e936aaf6 Mon Sep 17 00:00:00 2001
From: JenneJ <j.jenne@didalog.de>
Date: Wed, 15 Feb 2017 14:07:06 +0100
Subject: [PATCH] jj

---
 app/DD-Record-Organizer/frmMain.vb          |   5 ++---
 app/SetupWiX/Product.wxs                    |  10 +++++++---
 app/VERSION_CHECKER/DD_Icons_ICO_ADDI_1.ico | Bin 0 -> 14942 bytes
 app/VERSION_CHECKER/VERSION_CHECKER.vbproj  |   6 ++++++
 4 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100644 app/VERSION_CHECKER/DD_Icons_ICO_ADDI_1.ico

diff --git a/app/DD-Record-Organizer/frmMain.vb b/app/DD-Record-Organizer/frmMain.vb
index e6f87f6..4f0db7a 100644
--- a/app/DD-Record-Organizer/frmMain.vb
+++ b/app/DD-Record-Organizer/frmMain.vb
@@ -116,7 +116,7 @@ Public Class frmMain
             LabelProxyServer.Visibility = BarItemVisibility.Never
         End If
     End Sub
-    Public Shared Sub RUN_TIMER()
+    Public Sub RUN_TIMER()
         Try
             If TIMER_SCAN.Enabled = False And CURRENT_SCAN_FOLDERWATCH <> "" And FWSCAN_started = True Then
                 If System.IO.Directory.Exists(CURRENT_SCAN_FOLDERWATCH) = False Then
@@ -130,8 +130,7 @@ Public Class frmMain
                 If TIMER_SCAN.Enabled = True And CURRENT_SCAN_FOLDERWATCH <> "" And FWSCAN_started = True Then
                     TIMER_SCAN.Enabled = False
 
-                    itemRefreshProxy.Visibility = BarItemVisibility.Always
-                    BarButtonItemScan.visibility = always
+                    itemScanInbox.Visibility = BarItemVisibility.Always
                     RUN_TIMER()
                 Else
                     TIMER_SCAN.Enabled = False
diff --git a/app/SetupWiX/Product.wxs b/app/SetupWiX/Product.wxs
index f59bada..cf24bfa 100644
--- a/app/SetupWiX/Product.wxs
+++ b/app/SetupWiX/Product.wxs
@@ -91,7 +91,10 @@
               <Directory Id="VERSIONCHECKER" Name="VERSION_CHECKER">
                 
                 <Component Id="RecordOrganizer_VersionChecker" Guid="37D17685-E588-4BC6-A15E-570DE749852A">
-                  <File Id="VERSION_CHECKER.exe" Name="VERSION_CHECKER.exe" Source="VERSION_CHECKER.exe" />
+                  <File Id="VERSION_CHECKER.exe" Name="VERSION_CHECKER.exe" Source="VERSION_CHECKER.exe">
+                    <Shortcut Id="StartMenuShortcut" Directory="ProgramMenuDir" Name="ADDI-RecordOrganizer" WorkingDirectory="INSTALLDIR" Icon="DDRecordOrganizer.exe" IconIndex="0" Advertise="yes" />
+                    <Shortcut Id="DesktopShortcut" Directory="DesktopFolder" Name="ADDI-RecordOrganizer" WorkingDirectory="INSTALLDIR" Icon="DDRecordOrganizer.exe" IconIndex="0" Advertise="yes" />
+                  </File>
                   <File Id="DD_LIB_Standards.dll" Name="DD_LIB_Standards.dll" Source="DD_LIB_Standards.dll" />
                 </Component>
             
@@ -100,10 +103,11 @@
             
             <!-- Die DD-Record-Organizer.exe und Shortcuts für Desktop und Startmenü -->
             <Component Id="MainExecutable" Guid="9CC5D446-F056-4A09-995D-9DF53A7F0E38">
-              <File Id="PMOEXE" Name="DD-Record-Organizer.exe" Source="DD-Record-Organizer.exe" KeyPath="yes">
+              <!--<File Id="PMOEXE" Name="DD-Record-Organizer.exe" Source="DD-Record-Organizer.exe" KeyPath="yes">
                 <Shortcut Id="StartMenuShortcut" Directory="ProgramMenuDir" Name="ADDI-RecordOrganizer" WorkingDirectory="INSTALLDIR" Icon="DDRecordOrganizer.exe" IconIndex="0" Advertise="yes" />
                 <Shortcut Id="DesktopShortcut" Directory="DesktopFolder" Name="ADDI-RecordOrganizer" WorkingDirectory="INSTALLDIR" Icon="DDRecordOrganizer.exe" IconIndex="0" Advertise="yes" />
-              </File>
+              </File>-->
+              <File Id="PMOEXE" Name="DD-Record-Organizer.exe" Source="DD-Record-Organizer.exe" KeyPath="yes" />
               <!-- Programmordner bei Deinstallation entfernen-->
               <util:RemoveFolderEx Id="RemoveApplicationFolder" On="uninstall" Property="APPLICATIONFOLDER" />
             </Component>
diff --git a/app/VERSION_CHECKER/DD_Icons_ICO_ADDI_1.ico b/app/VERSION_CHECKER/DD_Icons_ICO_ADDI_1.ico
new file mode 100644
index 0000000000000000000000000000000000000000..0b2bcc28247b10c04d2acb86f975890d16370b1d
GIT binary patch
literal 14942
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

literal 0
HcmV?d00001

diff --git a/app/VERSION_CHECKER/VERSION_CHECKER.vbproj b/app/VERSION_CHECKER/VERSION_CHECKER.vbproj
index 4393935..1a85f68 100644
--- a/app/VERSION_CHECKER/VERSION_CHECKER.vbproj
+++ b/app/VERSION_CHECKER/VERSION_CHECKER.vbproj
@@ -46,6 +46,9 @@
   <PropertyGroup>
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>DD_Icons_ICO_ADDI_1.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="DD_LIB_Standards">
       <HintPath>..\..\..\DDLibStandards\DD_LIB_Standards\bin\Debug\DD_LIB_Standards.dll</HintPath>
@@ -126,6 +129,9 @@
     </None>
     <None Include="App.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="DD_Icons_ICO_ADDI_1.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.