Skip to content

Commit

Permalink
Removed DLL, added Windows7ProgressBar.vb to project
Browse files Browse the repository at this point in the history
Use Windows7ProgressBar control always
  • Loading branch information
Walkman100 committed Jul 23, 2015
1 parent 88cab7d commit e1b65be
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 26 deletions.
14 changes: 4 additions & 10 deletions BackgroundProgress.vb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Public Class BackgroundProgress
Private Sub InitializeComponent()
Me.lblStatus = New System.Windows.Forms.Label()
Me.imgLoading = New System.Windows.Forms.PictureBox()
Me.pbTaskProgress = New System.Windows.Forms.ProgressBar()
Me.pbTaskProgress = New wyDay.Controls.Windows7ProgressBar()
Me.bwFolderOperations = New System.ComponentModel.BackgroundWorker()
CType(Me.imgLoading,System.ComponentModel.ISupportInitialize).BeginInit
Me.SuspendLayout
Expand All @@ -31,14 +31,8 @@ Public Class BackgroundProgress
Me.imgLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize
Me.imgLoading.TabStop = false
'pbTaskProgress
'''
' Taskbar Progress code: uncomment the next line and the #End If below to use the normal ProgressBar
'#If IsReference = True
Me.pbTaskProgress = New wyDay.Controls.Windows7ProgressBar()
Me.pbTaskProgress.ContainerControl = Me
Me.pbTaskProgress.ShowInTaskbar = True
'#End If
'''
Me.pbTaskProgress.ContainerControl = Me
Me.pbTaskProgress.ShowInTaskbar = True
Me.pbTaskProgress.Location = New System.Drawing.Point(12, 34)
Me.pbTaskProgress.Name = "pbTaskProgress"
Me.pbTaskProgress.Size = New System.Drawing.Size(310, 23)
Expand All @@ -65,7 +59,7 @@ Public Class BackgroundProgress
Me.PerformLayout
End Sub
Friend WithEvents bwFolderOperations As System.ComponentModel.BackgroundWorker
Private pbTaskProgress As Object 'wyDay.Controls.Windows7ProgressBar
Private pbTaskProgress As wyDay.Controls.Windows7ProgressBar
Private lblStatus As System.Windows.Forms.Label
Private imgLoading As System.Windows.Forms.PictureBox

Expand Down
15 changes: 4 additions & 11 deletions Hashes.vb
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Public Class Hashes
Me.btnAllCopy = New System.Windows.Forms.Button()
Me.btnAllCalculate = New System.Windows.Forms.Button()
Me.btnClose = New System.Windows.Forms.Button()
Me.pbCalculateProgress = New System.Windows.Forms.ProgressBar()
Me.pbCalculateProgress = New wyDay.Controls.Windows7ProgressBar()
Me.bwCalcHashes = New System.ComponentModel.BackgroundWorker()
Me.grpSHA512 = New System.Windows.Forms.GroupBox()
Me.btnSHA512Copy = New System.Windows.Forms.Button()
Expand Down Expand Up @@ -174,14 +174,8 @@ Public Class Hashes
Me.btnClose.UseVisualStyleBackColor = true
AddHandler Me.btnClose.Click, AddressOf Me.btnClose_Click
'pbCalculateProgress
'''
' Taskbar Progress code: uncomment the next line and the #End If below to use the normal ProgressBar
'#If IsReference = True
Me.pbCalculateProgress = New wyDay.Controls.Windows7ProgressBar()
Me.pbCalculateProgress.ContainerControl = Me
Me.pbCalculateProgress.ShowInTaskbar = True
'#End If
'''
Me.pbCalculateProgress.ContainerControl = Me
Me.pbCalculateProgress.ShowInTaskbar = True
Me.pbCalculateProgress.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.pbCalculateProgress.Location = New System.Drawing.Point(9, 228)
Me.pbCalculateProgress.Name = "pbCalculateProgress"
Expand Down Expand Up @@ -275,8 +269,7 @@ Public Class Hashes
Private btnSHA512Copy As System.Windows.Forms.Button
Private grpSHA512 As System.Windows.Forms.GroupBox
Private bwCalcHashes As System.ComponentModel.BackgroundWorker
'wyDay.Controls.Windows7ProgressBar or System.Windows.Forms.ProgressBar
Private pbCalculateProgress As Object
Private pbCalculateProgress As wyDay.Controls.Windows7ProgressBar
Private btnClose As System.Windows.Forms.Button
Private btnAllCalculate As System.Windows.Forms.Button
Private btnAllCopy As System.Windows.Forms.Button
Expand Down
7 changes: 2 additions & 5 deletions PropertiesDotNet.vbproj
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<StartAction>Project</StartAction>
<StartArguments>..\Release-2</StartArguments>
<StartArguments>"..\..\NSIS Installer for PropertiesDotNet.nsi"</StartArguments>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Expand All @@ -50,10 +50,6 @@
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Windows7ProgressBar">
<HintPath>Windows7ProgressBar.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="BackgroundProgress.vb">
Expand Down Expand Up @@ -87,6 +83,7 @@
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
<Compile Include="Windows7ProgressBar.vb" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="PropertiesDotNet.resx">
Expand Down
Binary file removed Windows7ProgressBar.dll
Binary file not shown.

0 comments on commit e1b65be

Please sign in to comment.