Skip to content

Commit

Permalink
fix: tools icon visibility
Browse files Browse the repository at this point in the history
prepare release
  • Loading branch information
degoedel committed Jul 20, 2022
1 parent f7f41f9 commit 0cd1b00
Show file tree
Hide file tree
Showing 13 changed files with 29 additions and 26 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("CatPlugin.Compress")]
[assembly: AssemblyCopyright("Copyright © 2019")]
[assembly: AssemblyCopyright("Copyright © 2022")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand All @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.4.0.0")]
[assembly: AssemblyFileVersion("1.4.0.0")]
[assembly: AssemblyVersion("2.0.0.0")]
[assembly: AssemblyFileVersion("2.0.0.0")]
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,8 @@
<Path Width="38" Height="36" Canvas.Left="19" Canvas.Top="21" Stretch="Fill" Fill="{DynamicResource BlackBrush}" Data="F1 M 38,21C 46.0622,21 52.6389,26.9365 52.9856,34.3815L 53,34C 53,31.1992 52.1188,28.5905 50.601,26.4022C 54.5262,29.6081 57,34.288 57,39.5C 57,49.165 48.4934,57 38,57C 27.5066,57 19,49.165 19,39.5C 19,34.2879 21.4738,29.6081 25.399,26.4021C 23.8812,28.5904 23,31.1992 23,34L 23.0144,34.3815C 23.3611,26.9365 29.9378,21 38,21 Z M 53,35C 53,42.732 46.2843,49 38,49C 29.7157,49 23,42.732 23,35L 23,39C 23,46.732 29.7157,52.5 38,52.5C 46.2843,52.5 53,46.732 53,39L 53,35 Z "/>
</Canvas>

<Canvas x:Key="appbar_archive" Width="76" Height="76" Clip="F1 M 0,0L 76,0L 76,76L 0,76L 0,0">
<Path Width="42.75" Height="42.75" Canvas.Left="15.8333" Canvas.Top="17.4167" Stretch="Fill" Fill="{DynamicResource BlackBrush}" Data="F1 M 31.6667,17.4167L 44.3333,17.4167L 50.6667,17.4167C 51.5411,17.4167 52.25,18.1256 52.25,19L 52.25,20.5833C 52.25,21.4578 51.5411,22.1667 50.6667,22.1667L 44.3333,22.1667C 43.4588,22.1667 42.75,21.4578 42.75,20.5834C 42.7376,20.5834 39.5771,20.5864 36.4167,22.1667L 33.25,23.75L 31.6667,23.75L 31.6667,44.3333L 33.25,44.3333C 37.9901,47.4934 42.7303,47.5 42.75,47.5C 42.75,46.6256 43.4589,45.9167 44.3333,45.9167L 50.6667,45.9167C 51.5411,45.9167 52.25,46.6255 52.25,47.5L 52.25,49.0833C 52.25,49.9578 51.5411,50.6667 50.6667,50.6667L 42.75,50.6667L 36.4167,50.6667C 36.4167,50.6667 34.226,50.6667 31.6667,50.4389L 31.6667,52.25L 30.875,52.25L 30.875,53.8333L 41.5903,53.8333C 42.1378,52.8868 43.1612,52.25 44.3333,52.25C 46.0822,52.25 47.5,53.6678 47.5,55.4167C 47.5,57.1656 46.0822,58.5833 44.3333,58.5833C 43.1612,58.5833 42.1378,57.9465 41.5903,57L 33.25,57L 33.25,58.5833C 33.25,59.4578 32.5411,60.1667 31.6667,60.1667L 25.3333,60.1667C 24.4589,60.1667 23.75,59.4578 23.75,58.5833L 23.75,57L 21.743,57C 21.1955,57.9465 20.1721,58.5833 19,58.5833C 17.2511,58.5833 15.8333,57.1656 15.8333,55.4167C 15.8333,53.6678 17.2511,52.25 19,52.25C 20.1721,52.25 21.1955,52.8868 21.743,53.8333L 26.125,53.8333L 26.125,52.25L 25.3333,52.25L 25.3333,49.1701C 24.369,48.7453 23.75,48.2 23.75,47.5L 23.75,44.3333L 25.3333,44.3333L 25.3333,23.75L 23.75,23.75L 23.75,19C 23.75,17.4167 31.6667,17.4167 31.6667,17.4167 Z M 41.1667,23.75L 51.8542,23.75L 58.5833,30.4792L 58.5833,44.3333L 41.1667,44.3333L 41.1667,23.75 Z M 44.3333,26.9167L 44.3333,41.1667L 55.4167,41.1667L 55.4167,34.8333L 47.5,34.8333L 47.5,26.9167L 44.3333,26.9167 Z M 50.6667,26.9167L 50.6667,31.6667L 55.4167,31.6667L 50.6667,26.9167 Z "/>
<Canvas x:Key="appbar_archive" Width="76" Height="76" Clip="F1 M 0,0L 76,0L 76,76L 0,76L 0,0" >
<Path Width="42.75" Height="42.75" Canvas.Left="15.8333" Canvas.Top="17.4167" Stretch="Fill" Fill="{DynamicResource BlackBrush}" Stroke="White" StrokeThickness="1.5" Data="F1 M 31.6667,17.4167L 44.3333,17.4167L 50.6667,17.4167C 51.5411,17.4167 52.25,18.1256 52.25,19L 52.25,20.5833C 52.25,21.4578 51.5411,22.1667 50.6667,22.1667L 44.3333,22.1667C 43.4588,22.1667 42.75,21.4578 42.75,20.5834C 42.7376,20.5834 39.5771,20.5864 36.4167,22.1667L 33.25,23.75L 31.6667,23.75L 31.6667,44.3333L 33.25,44.3333C 37.9901,47.4934 42.7303,47.5 42.75,47.5C 42.75,46.6256 43.4589,45.9167 44.3333,45.9167L 50.6667,45.9167C 51.5411,45.9167 52.25,46.6255 52.25,47.5L 52.25,49.0833C 52.25,49.9578 51.5411,50.6667 50.6667,50.6667L 42.75,50.6667L 36.4167,50.6667C 36.4167,50.6667 34.226,50.6667 31.6667,50.4389L 31.6667,52.25L 30.875,52.25L 30.875,53.8333L 41.5903,53.8333C 42.1378,52.8868 43.1612,52.25 44.3333,52.25C 46.0822,52.25 47.5,53.6678 47.5,55.4167C 47.5,57.1656 46.0822,58.5833 44.3333,58.5833C 43.1612,58.5833 42.1378,57.9465 41.5903,57L 33.25,57L 33.25,58.5833C 33.25,59.4578 32.5411,60.1667 31.6667,60.1667L 25.3333,60.1667C 24.4589,60.1667 23.75,59.4578 23.75,58.5833L 23.75,57L 21.743,57C 21.1955,57.9465 20.1721,58.5833 19,58.5833C 17.2511,58.5833 15.8333,57.1656 15.8333,55.4167C 15.8333,53.6678 17.2511,52.25 19,52.25C 20.1721,52.25 21.1955,52.8868 21.743,53.8333L 26.125,53.8333L 26.125,52.25L 25.3333,52.25L 25.3333,49.1701C 24.369,48.7453 23.75,48.2 23.75,47.5L 23.75,44.3333L 25.3333,44.3333L 25.3333,23.75L 23.75,23.75L 23.75,19C 23.75,17.4167 31.6667,17.4167 31.6667,17.4167 Z M 41.1667,23.75L 51.8542,23.75L 58.5833,30.4792L 58.5833,44.3333L 41.1667,44.3333L 41.1667,23.75 Z M 44.3333,26.9167L 44.3333,41.1667L 55.4167,41.1667L 55.4167,34.8333L 47.5,34.8333L 47.5,26.9167L 44.3333,26.9167 Z M 50.6667,26.9167L 50.6667,31.6667L 55.4167,31.6667L 50.6667,26.9167 Z "/>
</Canvas>

<Canvas x:Key="appbar_arrow_collapsed" Width="76" Height="76" Clip="F1 M 0,0L 76,0L 76,76L 0,76L 0,0">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("CatPlugin.Edit")]
[assembly: AssemblyCopyright("Copyright © 2019")]
[assembly: AssemblyCopyright("Copyright © 2022")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand All @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.2.0.0")]
[assembly: AssemblyFileVersion("1.2.0.0")]
[assembly: AssemblyVersion("2.0.0.0")]
[assembly: AssemblyFileVersion("2.0.0.0")]
Original file line number Diff line number Diff line change
Expand Up @@ -3125,7 +3125,7 @@
</Canvas>

<Canvas x:Key="appbar_page_edit" Width="76" Height="76" Clip="F1 M 0,0L 76,0L 76,76L 0,76L 0,0">
<Path Width="46.9461" Height="42" Canvas.Left="14.0539" Canvas.Top="17" Stretch="Fill" Fill="{DynamicResource BlackBrush}" Data="F1 M 48,30L 55.75,30L 48,22.25L 48,30 Z M 57,33L 44,33L 44,21L 29,21L 29,31.25L 25,27.25L 25,17L 48.25,17L 61,29.75L 61,59L 25,59L 25,41.75L 29,45.75L 29,55L 57,55L 57,33 Z M 24.5417,28.5L 39.5833,43.5417L 34.0417,49.0833L 19,34.0417L 24.5417,28.5 Z M 17.8125,32.8542L 14.6458,30.314C 13.6303,29.2984 14.0262,27.1405 15.0417,26.125L 16.625,24.5417C 17.6405,23.5262 19.5678,23.1303 20.5833,24.1459L 23.3541,27.3126L 17.8125,32.8542 Z M 41.9715,52.25L 35.2292,50.2709L 40.7708,44.7292L 42.6216,51.5999L 41.9715,52.25 Z "/>
<Path Width="46.9461" Height="42" Canvas.Left="14.0539" Canvas.Top="17" Stretch="Fill" Fill="{DynamicResource BlackBrush}" Stroke="White" StrokeThickness="1.5" Data="F1 M 48,30L 55.75,30L 48,22.25L 48,30 Z M 57,33L 44,33L 44,21L 29,21L 29,31.25L 25,27.25L 25,17L 48.25,17L 61,29.75L 61,59L 25,59L 25,41.75L 29,45.75L 29,55L 57,55L 57,33 Z M 24.5417,28.5L 39.5833,43.5417L 34.0417,49.0833L 19,34.0417L 24.5417,28.5 Z M 17.8125,32.8542L 14.6458,30.314C 13.6303,29.2984 14.0262,27.1405 15.0417,26.125L 16.625,24.5417C 17.6405,23.5262 19.5678,23.1303 20.5833,24.1459L 23.3541,27.3126L 17.8125,32.8542 Z M 41.9715,52.25L 35.2292,50.2709L 40.7708,44.7292L 42.6216,51.5999L 41.9715,52.25 Z "/>
</Canvas>

<Canvas x:Key="appbar_page_excel" Width="76" Height="76" Clip="F1 M 0,0L 76,0L 76,76L 0,76L 0,0">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.4.0.0")]
[assembly: AssemblyFileVersion("1.4.0.0")]
[assembly: AssemblyVersion("2.0.0.0")]
[assembly: AssemblyFileVersion("2.0.0.0")]
Original file line number Diff line number Diff line change
Expand Up @@ -3277,7 +3277,7 @@
</Canvas>

<Canvas x:Key="appbar_paperclip" Width="76" Height="76" Clip="F1 M 0,0L 76,0L 76,76L 0,76L 0,0">
<Path Width="22.1667" Height="44.3333" Canvas.Left="26.9167" Canvas.Top="15.8333" Stretch="Fill" Fill="{DynamicResource BlackBrush}" Data="F1 M 42.75,24.5417L 42.7499,44.3334C 42.7499,46.9567 40.6233,49.0834 37.9999,49.0834C 35.3766,49.0834 33.25,46.9567 33.25,44.3334L 33.25,28.5L 36.4166,28.5L 36.4166,44.3334C 36.4166,45.2078 37.1255,45.9167 37.9999,45.9167C 38.8744,45.9167 38.7916,45.2078 38.7916,44.3334L 38.7917,24.5417C 38.7917,22.3556 37.8111,20.5833 35.625,20.5833C 33.4389,20.5833 31.6667,22.3555 31.6667,24.5417L 31.6667,49.0833C 31.6667,52.5811 34.5022,55.4167 38,55.4167C 41.4978,55.4167 44.3333,52.5811 44.3333,49.0833L 44.3333,30.0833L 49.0833,30.0833L 49.0833,49.0833C 49.0833,55.2045 44.1211,60.1667 38,60.1667C 31.8788,60.1667 26.9167,55.2045 26.9167,49.0833L 26.9167,23.75C 26.9167,19.3778 30.4611,15.8333 34.8333,15.8333C 39.2056,15.8333 42.75,19.3778 42.75,23.75L 42.7109,24.5417L 42.75,24.5417 Z "/>
<Path Width="22.1667" Height="44.3333" Canvas.Left="26.9167" Canvas.Top="15.8333" Stretch="Fill" Fill="{DynamicResource BlackBrush}" Stroke="White" StrokeThickness="1.5" Data="F1 M 42.75,24.5417L 42.7499,44.3334C 42.7499,46.9567 40.6233,49.0834 37.9999,49.0834C 35.3766,49.0834 33.25,46.9567 33.25,44.3334L 33.25,28.5L 36.4166,28.5L 36.4166,44.3334C 36.4166,45.2078 37.1255,45.9167 37.9999,45.9167C 38.8744,45.9167 38.7916,45.2078 38.7916,44.3334L 38.7917,24.5417C 38.7917,22.3556 37.8111,20.5833 35.625,20.5833C 33.4389,20.5833 31.6667,22.3555 31.6667,24.5417L 31.6667,49.0833C 31.6667,52.5811 34.5022,55.4167 38,55.4167C 41.4978,55.4167 44.3333,52.5811 44.3333,49.0833L 44.3333,30.0833L 49.0833,30.0833L 49.0833,49.0833C 49.0833,55.2045 44.1211,60.1667 38,60.1667C 31.8788,60.1667 26.9167,55.2045 26.9167,49.0833L 26.9167,23.75C 26.9167,19.3778 30.4611,15.8333 34.8333,15.8333C 39.2056,15.8333 42.75,19.3778 42.75,23.75L 42.7109,24.5417L 42.75,24.5417 Z "/>
</Canvas>

<Canvas x:Key="appbar_paw" Width="76" Height="76" Clip="F1 M 0,0L 76,0L 76,76L 0,76L 0,0">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
<PackageReference Include="Prism.Core" Version="8.1.97" />
</ItemGroup>
<PropertyGroup>
<PostBuildEvent>copy /Y "$(SolutionDir)packages\7ZipExe.18.5.0\tools\x64\7z.exe" "$(SolutionDir)..\Distrib\7z.exe"</PostBuildEvent>
<PostBuildEvent>copy /Y "$(SolutionDir)packages\7ZipExe.18.5.0\tools\x64\7z.exe" "$(SolutionDir)..\Distrib\7z.exe"
copy /Y "$(SolutionDir)packages\7ZipExe.18.5.0\tools\x64\7z.dll" "$(SolutionDir)..\Distrib\7z.dll"</PostBuildEvent>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("ComicbookArchiveToolbox.CommonTools")]
[assembly: AssemblyCopyright("Copyright © 2019")]
[assembly: AssemblyCopyright("Copyright © 2022")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand All @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.3.0.0")]
[assembly: AssemblyFileVersion("1.3.0.0")]
[assembly: AssemblyVersion("2.0.0.0")]
[assembly: AssemblyFileVersion("2.0.0.0")]
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("ComicbookArchiveToolbox.SplitPlugin")]
[assembly: AssemblyCopyright("Copyright © 2019")]
[assembly: AssemblyCopyright("Copyright © 2022")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand All @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.2.0.0")]
[assembly: AssemblyFileVersion("1.2.0.0")]
[assembly: AssemblyVersion("2.0.0.0")]
[assembly: AssemblyFileVersion("2.0.0.0")]
Original file line number Diff line number Diff line change
Expand Up @@ -3862,7 +3862,7 @@
</Canvas>

<Canvas x:Key="appbar_slice" Width="76" Height="76" Clip="F1 M 0,0L 76,0L 76,76L 0,76L 0,0">
<Path Width="41.1667" Height="36.5854" Canvas.Left="17.4167" Canvas.Top="18.8312" Stretch="Fill" Fill="{DynamicResource BlackBrush}" Data="F1 M 34.6742,38L 39.5833,42.9091L 39.5833,48.7651L 17.4167,55.4167L 34.6742,38 Z M 49.1629,19L 50.7352,20.5856L 38,33.25L 38,36.4167L 41.1667,39.5833L 44.3333,39.5833L 57.0067,26.91L 58.5833,28.5L 44.3333,42.75L 41.1667,42.75L 34.8333,36.4167L 34.8333,33.25L 49.1629,19 Z M 38.227,34.5054L 53.9012,18.8312L 55.0208,19.9508L 39.3466,35.625L 38.227,34.5054 Z M 41.5625,38.2367L 57.2367,22.5625L 58.3563,23.6821L 42.6821,39.3563L 41.5625,38.2367 Z M 39.5833,36.8804L 55.2575,21.2062L 56.3771,22.3258L 40.7029,38L 39.5833,36.8804 Z "/>
<Path Width="41.1667" Height="36.5854" Canvas.Left="17.4167" Canvas.Top="18.8312" Stretch="Fill" Fill="{DynamicResource BlackBrush}" Stroke="White" StrokeThickness="1.5" Data="F1 M 34.6742,38L 39.5833,42.9091L 39.5833,48.7651L 17.4167,55.4167L 34.6742,38 Z M 49.1629,19L 50.7352,20.5856L 38,33.25L 38,36.4167L 41.1667,39.5833L 44.3333,39.5833L 57.0067,26.91L 58.5833,28.5L 44.3333,42.75L 41.1667,42.75L 34.8333,36.4167L 34.8333,33.25L 49.1629,19 Z M 38.227,34.5054L 53.9012,18.8312L 55.0208,19.9508L 39.3466,35.625L 38.227,34.5054 Z M 41.5625,38.2367L 57.2367,22.5625L 58.3563,23.6821L 42.6821,39.3563L 41.5625,38.2367 Z M 39.5833,36.8804L 55.2575,21.2062L 56.3771,22.3258L 40.7029,38L 39.5833,36.8804 Z "/>
</Canvas>

<Canvas x:Key="appbar_smiley_angry" Width="76" Height="76" Clip="F1 M 0,0L 76,0L 76,76L 0,76L 0,0">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.4.0.0")]
[assembly: AssemblyFileVersion("1.4.0.0")]
[assembly: AssemblyVersion("2.0.0.0")]
[assembly: AssemblyFileVersion("2.0.0.0")]
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<RowDefinition />
<RowDefinition Height="60"/>
</Grid.RowDefinitions>
<ContentControl Content="{Binding Icon}" Width="160" Grid.Row="0"/>
<ContentControl Content="{Binding Icon}" Width="160" Grid.Row="0" Foreground="White"/>
<TextBlock Text="{Binding Name}" FontSize="20" TextAlignment="Center" VerticalAlignment="Bottom" Grid.Row="1"/>
</Grid>
</Button>
Expand Down
8 changes: 5 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,16 @@ Window styling is made with [Mahapps.metro](https://mahapps.com),
and general architecture is made with [Prism](https://github.com/PrismLibrary/Prism).
Drag'n'drop on the merge files list uses Josh Smith code [ListViewDragDropManager](https://www.codeproject.com/script/Articles/ViewDownloads.aspx?aid=17266) .

**Comicbook Archive Toolbox is based on .NET 4.7.2.** Download runtime [here](https://dotnet.microsoft.com/download/dotnet-framework/net472)
**Comicbook Archive Toolbox is based on .NET 6.0 for Desktop Apps.** Download runtime [here](https://dotnet.microsoft.com/en-us/download/dotnet/6.0/runtime)


**Comicbook Archive Toolbox is under MIT license** (do what you want with it)

**Download portable version** [Comicbook Archive Toolbox v1.4](https://github.com/degoedel/ComicbookArchiveToolbox/releases/download/v1.4/ComicbookArchiveToolbox.v1.4.0.zip)
**Download portable version** [Comicbook Archive Toolbox v1.4](https://github.com/degoedel/ComicbookArchiveToolbox/releases/download/v2.0/ComicbookArchiveToolbox.v2.0.0.zip)

**Changelog**
**Changelog**
* *V2.0*
* FIX: The app is adapted to .Net 6 and should fix compatibility issues like crash on startup
* *V1.4*
* FEATURE: The Merge module allows reordering of files through drag'n'drop
* *V1.3*
Expand Down

0 comments on commit 0cd1b00

Please sign in to comment.