Merge branch 'master' of http://dd-vmp07-com04:3000/AppStd/ClipboardWatcher
This commit is contained in:
commit
f297005973
@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
|
|||||||
' übernehmen, indem Sie "*" eingeben:
|
' übernehmen, indem Sie "*" eingeben:
|
||||||
' <Assembly: AssemblyVersion("1.0.*")>
|
' <Assembly: AssemblyVersion("1.0.*")>
|
||||||
|
|
||||||
<Assembly: AssemblyVersion("2.1.0.1")>
|
<Assembly: AssemblyVersion("2.1.0.2")>
|
||||||
<Assembly: AssemblyFileVersion("1.0.0.0")>
|
<Assembly: AssemblyFileVersion("1.0.0.0")>
|
||||||
|
|||||||
@ -228,7 +228,7 @@ Public Class frmMain
|
|||||||
NotifyIconMain.BalloonTipTitle = "Clipboard Watcher"
|
NotifyIconMain.BalloonTipTitle = "Clipboard Watcher"
|
||||||
NotifyIconMain.BalloonTipText = "Es wurden keine passenden Profile gefunden."
|
NotifyIconMain.BalloonTipText = "Es wurden keine passenden Profile gefunden."
|
||||||
NotifyIconMain.BalloonTipIcon = ToolTipIcon.Warning
|
NotifyIconMain.BalloonTipIcon = ToolTipIcon.Warning
|
||||||
NotifyIconMain.ShowBalloonTip(2000)
|
NotifyIconMain.ShowBalloonTip(2500)
|
||||||
End If
|
End If
|
||||||
|
|
||||||
ElseIf CURRENT_PROFILES_WITH_RESULTS.Count = 0 Then
|
ElseIf CURRENT_PROFILES_WITH_RESULTS.Count = 0 Then
|
||||||
@ -237,7 +237,7 @@ Public Class frmMain
|
|||||||
NotifyIconMain.BalloonTipTitle = "Clipboard Watcher"
|
NotifyIconMain.BalloonTipTitle = "Clipboard Watcher"
|
||||||
NotifyIconMain.BalloonTipText = "Es wurden weder Dokumente noch Daten gefunden!"
|
NotifyIconMain.BalloonTipText = "Es wurden weder Dokumente noch Daten gefunden!"
|
||||||
NotifyIconMain.BalloonTipIcon = ToolTipIcon.Warning
|
NotifyIconMain.BalloonTipIcon = ToolTipIcon.Warning
|
||||||
NotifyIconMain.ShowBalloonTip(2000)
|
NotifyIconMain.ShowBalloonTip(2500)
|
||||||
End If
|
End If
|
||||||
|
|
||||||
Else
|
Else
|
||||||
@ -418,6 +418,8 @@ Public Class frmMain
|
|||||||
frmAdministration.ShowDialog()
|
frmAdministration.ShowDialog()
|
||||||
TimerClose.Start()
|
TimerClose.Start()
|
||||||
MONITORING_ACTIVE = True
|
MONITORING_ACTIVE = True
|
||||||
|
|
||||||
|
RefreshUI()
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
Private Sub bbtniKonfig_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtniKonfig.ItemClick
|
Private Sub bbtniKonfig_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtniKonfig.ItemClick
|
||||||
|
|||||||
@ -143,7 +143,7 @@
|
|||||||
<Component Id="GDPictureLibs" Guid="9ea5ab43-58ff-4813-9a8b-f854784f0275">
|
<Component Id="GDPictureLibs" Guid="9ea5ab43-58ff-4813-9a8b-f854784f0275">
|
||||||
<File Id="GdPicture.NET.14" Name="GdPicture.NET.14.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll" KeyPath="yes" />
|
<File Id="GdPicture.NET.14" Name="GdPicture.NET.14.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll" KeyPath="yes" />
|
||||||
<File Id="GdPicture.NET.14.filters" Name="GdPicture.NET.14.filters.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET.14.filters.dll" />
|
<File Id="GdPicture.NET.14.filters" Name="GdPicture.NET.14.filters.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET.14.filters.dll" />
|
||||||
<File Id="GdPicture.NET.14.filters" Name="GdPicture.NET.14.filters.64.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET.14.filters.64.dll" />
|
<File Id="GdPicture.NET.14.filters64" Name="GdPicture.NET.14.filters.64.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET.14.filters.64.dll" />
|
||||||
<File Id="GdPicture.NET.14.image" Name="GdPicture.NET.14.image.gdimgplug.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET.14.image.gdimgplug.dll" />
|
<File Id="GdPicture.NET.14.image" Name="GdPicture.NET.14.image.gdimgplug.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET.14.image.gdimgplug.dll" />
|
||||||
<File Id="GdPicture.NET.14.image64" Name="GdPicture.NET.14.image.gdimgplug.64.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET.14.image.gdimgplug.64.dll" />
|
<File Id="GdPicture.NET.14.image64" Name="GdPicture.NET.14.image.gdimgplug.64.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET.14.image.gdimgplug.64.dll" />
|
||||||
<File Id="GdPicture.NET.14.Imaging" Name="GdPicture.NET.14.Imaging.Rendering.Skia.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET.14.Imaging.Rendering.Skia.dll" />
|
<File Id="GdPicture.NET.14.Imaging" Name="GdPicture.NET.14.Imaging.Rendering.Skia.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET.14.Imaging.Rendering.Skia.dll" />
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user