feat(log-window): add log window

bertyhell · Dec 23, 2020 · 522e196 · 522e196
1 parent 4fb9dad
commit 522e196
Show file tree

Hide file tree

Showing 29 changed files with 250 additions and 338 deletions.
diff --git a/PlaylistDownloader.exe b/PlaylistDownloader.exe
diff --git a/PlaylistDownloader.zip b/PlaylistDownloader.zip
diff --git a/PlaylistDownloader/Installer/InnoPlaylistDownloaderInstallerScript.iss b/PlaylistDownloader/Installer/InnoPlaylistDownloaderInstallerScript.iss
@@ -18,7 +18,7 @@ DisableDirPage=yes
 DefaultGroupName=PlaylistDownloader
 DisableProgramGroupPage=yes
 OutputBaseFilename=setup
-SetupIconFile=..\PlaylistDownloader\icon.ico
+SetupIconFile=..\PlaylistDownloader\img\icon.ico
 UninstallDisplayIcon={app}\PlaylistDownloader.exe
 Compression=lzma
 SolidCompression=yes
@@ -29,8 +29,11 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
 [Tasks]
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}";
 
+[InstallDelete]
+Type: filesandordirs; Name: {app}\*
+
 [Files]
-Source: "..\PlaylistDownloader\bin\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs; Excludes: "ffmpeg/*,youtube-dl.exe,*.log,*.vshost.*,*.pdb,youtube-dl.exe.new,youtube-dl-updater.bat"
+Source: "..\PlaylistDownloader\bin\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs; Excludes: "\ffmpeg,\youtube-dl.exe"
 Source: "..\PlaylistDownloader\bin\Release\youtube-dl.exe"; DestDir: "{userappdata}/PlaylistDownloader"; Flags: ignoreversion recursesubdirs createallsubdirs 
 Source: "..\PlaylistDownloader\bin\Release\ffmpeg\*"; DestDir: "{userappdata}/PlaylistDownloader/ffmpeg"; Flags: ignoreversion recursesubdirs createallsubdirs
 

diff --git a/PlaylistDownloader/PlaylistDownloader.UnitTests/DownloaderTests.cs b/PlaylistDownloader/PlaylistDownloader.UnitTests/DownloaderTests.cs
diff --git a/PlaylistDownloader/PlaylistDownloader.UnitTests/PlaylistDownloader.UnitTests.csproj b/PlaylistDownloader/PlaylistDownloader.UnitTests/PlaylistDownloader.UnitTests.csproj
diff --git a/PlaylistDownloader/PlaylistDownloader.UnitTests/Properties/AssemblyInfo.cs b/PlaylistDownloader/PlaylistDownloader.UnitTests/Properties/AssemblyInfo.cs
diff --git a/PlaylistDownloader/PlaylistDownloader.UnitTests/packages.config b/PlaylistDownloader/PlaylistDownloader.UnitTests/packages.config
diff --git a/PlaylistDownloader/PlaylistDownloader.sln b/PlaylistDownloader/PlaylistDownloader.sln
@@ -5,8 +5,6 @@ VisualStudioVersion = 16.0.30406.217
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SilentUpdater", "SilentUpdater\SilentUpdater.csproj", "{95EE76E5-8C7B-4BE4-8127-9515C3EF6B72}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlaylistDownloader.UnitTests", "PlaylistDownloader.UnitTests\PlaylistDownloader.UnitTests.csproj", "{CE2ACA8E-01B2-483E-9D86-C06ACA0EEE65}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlaylistDownloader", "PlaylistDownloader\PlaylistDownloader.csproj", "{7DAE846A-611D-4985-9E7B-2CBDAE6FE8DC}"
 EndProject
 Global
@@ -19,10 +17,6 @@ Global
 		{95EE76E5-8C7B-4BE4-8127-9515C3EF6B72}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{95EE76E5-8C7B-4BE4-8127-9515C3EF6B72}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{95EE76E5-8C7B-4BE4-8127-9515C3EF6B72}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CE2ACA8E-01B2-483E-9D86-C06ACA0EEE65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CE2ACA8E-01B2-483E-9D86-C06ACA0EEE65}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CE2ACA8E-01B2-483E-9D86-C06ACA0EEE65}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CE2ACA8E-01B2-483E-9D86-C06ACA0EEE65}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7DAE846A-611D-4985-9E7B-2CBDAE6FE8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7DAE846A-611D-4985-9E7B-2CBDAE6FE8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7DAE846A-611D-4985-9E7B-2CBDAE6FE8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU

diff --git a/PlaylistDownloader/PlaylistDownloader/MainWindow.xaml b/PlaylistDownloader/PlaylistDownloader/MainWindow.xaml
diff --git a/PlaylistDownloader/PlaylistDownloader/MainWindow.xaml.cs b/PlaylistDownloader/PlaylistDownloader/MainWindow.xaml.cs
diff --git a/PlaylistDownloader/PlaylistDownloader/PlaylistDownloader.csproj b/PlaylistDownloader/PlaylistDownloader/PlaylistDownloader.csproj
@@ -50,7 +50,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>icon.ico</ApplicationIcon>
+    <ApplicationIcon>img\icon.ico</ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject>PlaylistDownloader.App</StartupObject>
@@ -142,41 +142,42 @@
     <Reference Include="PresentationFramework" />
   </ItemGroup>
   <ItemGroup>
-    <ApplicationDefinition Include="App.xaml">
+    <ApplicationDefinition Include="views\App.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
-    <Compile Include="Downloader.cs">
+    <Compile Include="helpers\Downloader.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="DownloadWindow.xaml.cs">
+    <Compile Include="helpers\Logger.cs" />
+    <Compile Include="helpers\LogInfo.cs" />
+    <Compile Include="views\DownloadWindow.xaml.cs">
       <DependentUpon>DownloadWindow.xaml</DependentUpon>
     </Compile>
-    <Compile Include="PlaylistItem.cs" />
+    <Compile Include="helpers\PlaylistItem.cs" />
     <Compile Include="Properties\Annotations.cs" />
-    <Compile Include="RunSettings.cs" />
-    <Compile Include="SettingsWindow.xaml.cs">
+    <Compile Include="helpers\RunSettings.cs" />
+    <Compile Include="views\LogWindow.xaml.cs">
+      <DependentUpon>LogWindow.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="views\SettingsWindow.xaml.cs">
       <DependentUpon>SettingsWindow.xaml</DependentUpon>
     </Compile>
     <Compile Include="utils\Utils.cs" />
-    <Compile Include="YoutubeSearcher.cs" />
-    <Page Include="DownloadWindow.xaml">
+    <Compile Include="helpers\YoutubeSearcher.cs" />
+    <Page Include="views\DownloadWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="MainWindow.xaml">
-      <Generator>MSBuild:Compile</Generator>
+    <Page Include="views\LogWindow.xaml">
       <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Compile Include="App.xaml.cs">
+    <Compile Include="views\App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="MainWindow.xaml.cs">
-      <DependentUpon>MainWindow.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Page Include="SettingsWindow.xaml">
+    <Page Include="views\SettingsWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
@@ -199,7 +200,9 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <None Include="NLog.config" />
+    <Resource Include="NLog.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Resource>
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -210,17 +213,27 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="icon.ico">
+    <Content Include="img\icon.ico">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="icon.png">
+    <Content Include="img\icon.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Resource Include="img\cancel.png" />
-    <Resource Include="img\download.png" />
-    <Resource Include="img\folder_music.png" />
-    <Resource Include="img\gear.png" />
-    <Resource Include="img\search.png" />
+    <Resource Include="img\cancel.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Resource>
+    <Resource Include="img\download.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Resource>
+    <Resource Include="img\folder_music.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Resource>
+    <Resource Include="img\gear.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Resource>
+    <Resource Include="img\search.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Resource>
   </ItemGroup>
   <ItemGroup>
     <Content Include="ffmpeg\avcodec-57.dll">
@@ -256,6 +269,9 @@
     <Content Include="ffmpeg\swscale-4.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Resource Include="img\clipboard.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Resource>
     <Content Include="youtube-dl.exe">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
@@ -272,5 +288,6 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>