From c09f63b048a178c13204d764528787ad9f9a63b6 Mon Sep 17 00:00:00 2001 From: Dreamcooled Date: Sun, 21 Dec 2014 19:28:04 +0100 Subject: [PATCH] Removed Panorama, Switched to official Metro 1.0. Cleaned Up repo. Getting nearer to v0.2 --- .gitmodules | 3 - MahApps.Metro | 1 - SjUpdater.sln | 12 - SjUpdater/App.xaml | 2 +- SjUpdater/EpisodeView.cs | 192 - .../Hardcodet.Wpf.TaskbarNotification.dll | Bin 44032 -> 0 bytes SjUpdater/MainWindow.xaml | 213 +- SjUpdater/MainWindow.xaml.cs | 2 +- SjUpdater/NotificationBalloon.xaml | 2 +- SjUpdater/Properties/AssemblyInfo.cs | 4 +- SjUpdater/Provider/TMDb.cs | 5 +- SjUpdater/Resources/Entypo-license.txt | 3 + SjUpdater/Resources/Entypo.ttf | Bin 0 -> 36376 bytes SjUpdater/Resources/Icons.xaml | 5131 +++++++++++++++++ SjUpdater/Resources/WindowsIcons-license.txt | 62 + SjUpdater/{ => Resources}/icon3.ico | Bin SjUpdater/SjUpdater.csproj | 37 +- SjUpdater/SmartThreadPool.dll | Bin 66560 -> 0 bytes SjUpdater/ViewModel/MainWindowViewModel.cs | 70 +- .../ViewModel/OverviewPanormaViewModel.cs | 73 - SjUpdater/ViewModel/ShowTileViewModel.cs | 9 +- SjUpdater/packages.config | 3 + 22 files changed, 5394 insertions(+), 430 deletions(-) delete mode 100644 .gitmodules delete mode 160000 MahApps.Metro delete mode 100644 SjUpdater/EpisodeView.cs delete mode 100644 SjUpdater/Hardcodet.Wpf.TaskbarNotification.dll create mode 100644 SjUpdater/Resources/Entypo-license.txt create mode 100644 SjUpdater/Resources/Entypo.ttf create mode 100644 SjUpdater/Resources/Icons.xaml create mode 100644 SjUpdater/Resources/WindowsIcons-license.txt rename SjUpdater/{ => Resources}/icon3.ico (100%) delete mode 100644 SjUpdater/SmartThreadPool.dll delete mode 100644 SjUpdater/ViewModel/OverviewPanormaViewModel.cs diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index eb19e66..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "MahApps.Metro"] - path = MahApps.Metro - url = https://github.com/Dreamcooled/MahApps.Metro.git diff --git a/MahApps.Metro b/MahApps.Metro deleted file mode 160000 index 0bf7384..0000000 --- a/MahApps.Metro +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0bf73841643ca3e02c10c4862ed3155b7105c471 diff --git a/SjUpdater.sln b/SjUpdater.sln index 41e4bdf..bf352a9 100644 --- a/SjUpdater.sln +++ b/SjUpdater.sln @@ -5,12 +5,8 @@ VisualStudioVersion = 12.0.30723.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SjUpdater", "SjUpdater\SjUpdater.csproj", "{96123159-7974-4FEB-BD8C-7AB562DF3E01}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MahApps.Metro", "MahApps.Metro\MahApps.Metro\MahApps.Metro.csproj", "{5B1710D2-5DC8-4754-91B2-19165DE49B3D}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "updaterhasher", "updaterhasher\updaterhasher.csproj", "{89B40DD8-7928-4B21-B792-89AF030F6B55}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MahApps.Metro.Resources", "MahApps.Metro\MahApps.Metro.Resources\MahApps.Metro.Resources.csproj", "{E708AC99-605B-42A0-8D20-ABCA8FE42DD2}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -21,18 +17,10 @@ Global {96123159-7974-4FEB-BD8C-7AB562DF3E01}.Debug|Any CPU.Build.0 = Debug|Any CPU {96123159-7974-4FEB-BD8C-7AB562DF3E01}.Release|Any CPU.ActiveCfg = Release|Any CPU {96123159-7974-4FEB-BD8C-7AB562DF3E01}.Release|Any CPU.Build.0 = Release|Any CPU - {5B1710D2-5DC8-4754-91B2-19165DE49B3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5B1710D2-5DC8-4754-91B2-19165DE49B3D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5B1710D2-5DC8-4754-91B2-19165DE49B3D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5B1710D2-5DC8-4754-91B2-19165DE49B3D}.Release|Any CPU.Build.0 = Release|Any CPU {89B40DD8-7928-4B21-B792-89AF030F6B55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {89B40DD8-7928-4B21-B792-89AF030F6B55}.Debug|Any CPU.Build.0 = Debug|Any CPU {89B40DD8-7928-4B21-B792-89AF030F6B55}.Release|Any CPU.ActiveCfg = Release|Any CPU {89B40DD8-7928-4B21-B792-89AF030F6B55}.Release|Any CPU.Build.0 = Release|Any CPU - {E708AC99-605B-42A0-8D20-ABCA8FE42DD2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E708AC99-605B-42A0-8D20-ABCA8FE42DD2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E708AC99-605B-42A0-8D20-ABCA8FE42DD2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E708AC99-605B-42A0-8D20-ABCA8FE42DD2}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/SjUpdater/App.xaml b/SjUpdater/App.xaml index 684aad6..c3c0d38 100644 --- a/SjUpdater/App.xaml +++ b/SjUpdater/App.xaml @@ -10,7 +10,7 @@ - + diff --git a/SjUpdater/EpisodeView.cs b/SjUpdater/EpisodeView.cs deleted file mode 100644 index 93aebb6..0000000 --- a/SjUpdater/EpisodeView.cs +++ /dev/null @@ -1,192 +0,0 @@ -using System.ComponentModel; -using System.Runtime.CompilerServices; -using System.Runtime.Serialization; -using System.Windows.Input; -using System.Windows.Markup; -using System.Windows.Media; -using System; -using System.CodeDom; -using System.Collections.Generic; -using System.Configuration; -using System.Linq; -using System.Security.RightsManagement; -using System.Text; -using System.Threading.Tasks; -using SjUpdater.Annotations; - -namespace SjUpdater -{ - public class EpisodeView : INotifyPropertyChanged - { - - public EpisodeView() - { - - EpisodeDescriptors = new List(); - - - } - - public int Episode - { - get - { - if (EpisodeDescriptors.Any()) - { - return EpisodeDescriptors.First().Episode; - } - return -1; - } - } - - public List EpisodeDescriptors - { - get; - private set; - } - - public string DetailTitle - { - get - { - String s = EpisodeDescriptors.First().SeasonShowName + " "; - if (EpisodeDescriptors.First().Season != -1) - { - s += "Season " + EpisodeDescriptors.First().Season +" "; - if (Episode != -1) - { - s += "Episode " + Episode; - } - } - return s; - } - } - public string Title - { - get - { - if (EpisodeDescriptors.First().Season == -1) - { - return EpisodeDescriptors.First().Title; - } - if (Episode == -1) - { - return EpisodeDescriptors.Count().ToString() + " Others"; - } - return "Episode" + Episode; - - } - } - - public string Languages - { - get - { - EpisodeDescriptor.Lang langs = EpisodeDescriptors.Aggregate(0, (current, episodeDescriptor) => current | episodeDescriptor.Language); - - switch (langs) - { - case EpisodeDescriptor.Lang.English: - return "English"; - case EpisodeDescriptor.Lang.German: - return "German"; - case EpisodeDescriptor.Lang.Both: - return "German,English"; - } - return ""; - - } - } - - public string Formats - { - - get - { - var lisFormats = new List(); - var lisFormatsComp = new List(); - foreach (var descriptor in EpisodeDescriptors) - { - string f = descriptor.Format; - if(String.IsNullOrWhiteSpace(f)) - continue; - if(!lisFormatsComp.Contains(f.ToLower())){ - lisFormats.Add(f); - lisFormatsComp.Add(f.ToLower()); - } - } - - return string.Join(",", lisFormats); - - } - } - - - public Brush Background - { - get - { - - var colors = new Color[] - { - Color.FromRgb(111, 189, 69), - Color.FromRgb(75, 179, 221), - Color.FromRgb(65, 100, 165), - Color.FromRgb(225, 32, 38), - Color.FromRgb(128, 0, 128), - Color.FromRgb(0, 128, 64), - Color.FromRgb(0, 148, 255), - Color.FromRgb(255, 0, 199), - Color.FromRgb(255, 135, 15), - Color.FromRgb(45, 255, 87), - Color.FromRgb(127, 0, 55) - }; - - int season = EpisodeDescriptors.First().Season; - if (season == -1) season = 0; - Color c = colors[season%colors.Length]; - Color cb = Colors.Black; - float a = (Episode == -1) ? 0.8f : 0.5f; - byte r = (byte) (a*cb.R + (1 - a)*c.R); - byte g = (byte)(a * cb.G + (1 - a) * c.G); - byte b = (byte)(a * cb.B + (1 - a) * c.B); - return new SolidColorBrush(Color.FromRgb(r,g,b)); - - - } - } - - #region tile stuff - - public bool IsDoubleWidth { - get - { - return Episode == -1; - } - } - - - public bool IsPressed - { - get { return _isPressed; } - set - { - if (_isPressed != value) - { - _isPressed = value; - OnPropertyChanged(); - } - } - } - private bool _isPressed; - public event PropertyChangedEventHandler PropertyChanged; - - [NotifyPropertyChangedInvocator] - protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null) - { - PropertyChangedEventHandler handler = PropertyChanged; - if (handler != null) handler(this, new PropertyChangedEventArgs(propertyName)); - } - #endregion - } -} diff --git a/SjUpdater/Hardcodet.Wpf.TaskbarNotification.dll b/SjUpdater/Hardcodet.Wpf.TaskbarNotification.dll deleted file mode 100644 index cf963457cf1950ef813ac6d9a3418f6bf0d3a78b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 44032 zcmeIbd3@B>xj+7VJ~Q)~B@3AeBmoi_L}17Uh+5nU5Fix@k|1EQI3$x~B$D6ngU9^kVF8F&t&pDr&&tyXMcklh< z`+NQFz&xMxEay4rJm)$4nNL=qaRs@E$c^s@9}qo^Cw~?T93KpWT{`{IQhLDu!x;}7 ztA046y(gXy_otHGsc2ugBbrDgGvTeVaB3hCjwiy)THC^X$ouiio}piceAZJb`Bz-&gS^DwD9O^34Q`0e`{<5$ODJ(ODO=DF4qr zHOeG>=08DnDhFOA+Q>#I_!v|S+TZ?-sJehR4k4V)x(NAzuXKnvW@0-tz%RHFAdD}U zRp%Qa`GkqiYD}e59l#`SuOh$&y#-໊)F%|1gLXh)Hq;2q3L9$>m(UL5p17|&< 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 diff --git a/SjUpdater/MainWindow.xaml b/SjUpdater/MainWindow.xaml index adb22d6..452d538 100644 --- a/SjUpdater/MainWindow.xaml +++ b/SjUpdater/MainWindow.xaml @@ -5,13 +5,13 @@ xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls" xmlns:viewModel="clr-namespace:SjUpdater.ViewModel" xmlns:utils="clr-namespace:SjUpdater.Utils" - xmlns:tb="http://www.hardcodet.net/taskbar" xmlns:model="clr-namespace:SjUpdater.Model" xmlns:metro="clr-namespace:MahApps.Metro;assembly=MahApps.Metro" + xmlns:taskbarNotification="clr-namespace:Hardcodet.Wpf.TaskbarNotification;assembly=Hardcodet.Wpf.TaskbarNotification" x:Class="SjUpdater.MainWindow" Title="Serienjunkies Updater" Height="784.65" Width="1096" x:Name="Window" SaveWindowPosition="True" MinWidth="800" MinHeight="600" - Closing="MainWindow_OnClosing" AllowsTransparency="True" WindowStyle="None" Icon="icon3.ico" TextOptions.TextFormattingMode="Display" > - + Closing="MainWindow_OnClosing" AllowsTransparency="True" WindowStyle="None" Icon="Resources/icon3.ico" TextOptions.TextFormattingMode="Display" > + - + @@ -42,8 +42,8 @@ - + + + - + + + + + + + + + + + - + - - - - - - - - + + + @@ -289,7 +304,7 @@