This commit is contained in:
JenneJ 2017-02-15 14:07:06 +01:00
parent 670f5a795a
commit a7ab84cc3f
4 changed files with 15 additions and 6 deletions

View File

@ -116,7 +116,7 @@ Public Class frmMain
LabelProxyServer.Visibility = BarItemVisibility.Never LabelProxyServer.Visibility = BarItemVisibility.Never
End If End If
End Sub End Sub
Public Shared Sub RUN_TIMER() Public Sub RUN_TIMER()
Try Try
If TIMER_SCAN.Enabled = False And CURRENT_SCAN_FOLDERWATCH <> "" And FWSCAN_started = True Then If TIMER_SCAN.Enabled = False And CURRENT_SCAN_FOLDERWATCH <> "" And FWSCAN_started = True Then
If System.IO.Directory.Exists(CURRENT_SCAN_FOLDERWATCH) = False 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 If TIMER_SCAN.Enabled = True And CURRENT_SCAN_FOLDERWATCH <> "" And FWSCAN_started = True Then
TIMER_SCAN.Enabled = False TIMER_SCAN.Enabled = False
itemRefreshProxy.Visibility = BarItemVisibility.Always itemScanInbox.Visibility = BarItemVisibility.Always
BarButtonItemScan.visibility = always
RUN_TIMER() RUN_TIMER()
Else Else
TIMER_SCAN.Enabled = False TIMER_SCAN.Enabled = False

View File

@ -91,7 +91,10 @@
<Directory Id="VERSIONCHECKER" Name="VERSION_CHECKER"> <Directory Id="VERSIONCHECKER" Name="VERSION_CHECKER">
<Component Id="RecordOrganizer_VersionChecker" Guid="37D17685-E588-4BC6-A15E-570DE749852A"> <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" /> <File Id="DD_LIB_Standards.dll" Name="DD_LIB_Standards.dll" Source="DD_LIB_Standards.dll" />
</Component> </Component>
@ -100,10 +103,11 @@
<!-- Die DD-Record-Organizer.exe und Shortcuts für Desktop und Startmenü --> <!-- Die DD-Record-Organizer.exe und Shortcuts für Desktop und Startmenü -->
<Component Id="MainExecutable" Guid="9CC5D446-F056-4A09-995D-9DF53A7F0E38"> <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="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" /> <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--> <!-- Programmordner bei Deinstallation entfernen-->
<util:RemoveFolderEx Id="RemoveApplicationFolder" On="uninstall" Property="APPLICATIONFOLDER" /> <util:RemoveFolderEx Id="RemoveApplicationFolder" On="uninstall" Property="APPLICATIONFOLDER" />
</Component> </Component>

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

View File

@ -46,6 +46,9 @@
<PropertyGroup> <PropertyGroup>
<OptionInfer>On</OptionInfer> <OptionInfer>On</OptionInfer>
</PropertyGroup> </PropertyGroup>
<PropertyGroup>
<ApplicationIcon>DD_Icons_ICO_ADDI_1.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="DD_LIB_Standards"> <Reference Include="DD_LIB_Standards">
<HintPath>..\..\..\DDLibStandards\DD_LIB_Standards\bin\Debug\DD_LIB_Standards.dll</HintPath> <HintPath>..\..\..\DDLibStandards\DD_LIB_Standards\bin\Debug\DD_LIB_Standards.dll</HintPath>
@ -126,6 +129,9 @@
</None> </None>
<None Include="App.config" /> <None Include="App.config" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Content Include="DD_Icons_ICO_ADDI_1.ico" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- 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. Other similar extension points exist, see Microsoft.Common.targets.