Rename project and assembly

This commit is contained in:
Royce551 2020-09-13 20:13:08 -05:00
parent e460876b7c
commit 84e3bdb89f
30 changed files with 58 additions and 62 deletions

View file

@ -2,7 +2,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local1="clr-namespace:FRESHMusicPlayer"
xmlns:resx = "clr-namespace:FRESHMusicPlayer_WPF_UI_Test.Properties"
xmlns:resx = "clr-namespace:FRESHMusicPlayer.Properties"
DispatcherUnhandledException="Application_DispatcherUnhandledException"
Startup="App_Startup">
<Application.Resources>

View file

@ -44,7 +44,7 @@ namespace FRESHMusicPlayer
string fileName = $"\\{DateTime.Now:M.d.yyyy hh mm tt}.txt";
if (!Directory.Exists(logPath)) Directory.CreateDirectory(logPath);
File.WriteAllText(logPath + fileName, e.Exception.ToString());
MessageBox.Show(string.Format(FRESHMusicPlayer_WPF_UI_Test.Properties.Resources.APPLICATION_CRITICALERROR, e.Exception.Message.ToString(), logPath + fileName));
MessageBox.Show(string.Format(FRESHMusicPlayer.Properties.Resources.APPLICATION_CRITICALERROR, e.Exception.Message.ToString(), logPath + fileName));
e.Handled = true;
}
}

View file

@ -6,8 +6,8 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{7C89A964-E4D9-46A5-A36F-A283D3B1F55E}</ProjectGuid>
<OutputType>WinExe</OutputType>
<RootNamespace>FRESHMusicPlayer_WPF_UI_Test</RootNamespace>
<AssemblyName>FRESHMusicPlayer-WPF-UI-Test</AssemblyName>
<RootNamespace>FRESHMusicPlayer</RootNamespace>
<AssemblyName>FRESHMusicPlayer</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>

View file

@ -1,10 +1,10 @@
<Window x:Class="FRESHMusicPlayer_WPF_UI_Test.Forms.TagEditor"
<Window x:Class="FRESHMusicPlayer.Forms.TagEditor"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:resx = "clr-namespace:FRESHMusicPlayer_WPF_UI_Test.Properties"
xmlns:local="clr-namespace:FRESHMusicPlayer_WPF_UI_Test.Forms"
xmlns:resx = "clr-namespace:FRESHMusicPlayer.Properties"
xmlns:local="clr-namespace:FRESHMusicPlayer.Forms"
mc:Ignorable="d"
Title="TagEditor" Height="451" Width="600" Closing="Window_Closing">
<Grid Background="{StaticResource BackgroundColor}">

View file

@ -10,7 +10,7 @@ using System.Windows.Controls;
using Winforms = System.Windows.Forms;
using System.Windows.Shapes;
namespace FRESHMusicPlayer_WPF_UI_Test.Forms
namespace FRESHMusicPlayer.Forms
{
/// <summary>
/// Interaction logic for TagEditor.xaml

View file

@ -3,7 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:resx = "clr-namespace:FRESHMusicPlayer_WPF_UI_Test.Properties"
xmlns:resx = "clr-namespace:FRESHMusicPlayer.Properties"
mc:Ignorable="d"
Title="FRESHMusicPlayer 8 Development" Height="540" Width="800" Closed="Window_Closed" KeyDown="Window_PreviewKeyDown" DragOver="Window_DragOver" Drop="Window_Drop" AllowDrop="True" Background="White" SourceInitialized="Window_SourceInitialized">
<Window.Resources>

View file

@ -2,7 +2,7 @@
using FRESHMusicPlayer.Handlers;
using FRESHMusicPlayer.Handlers.Notifications;
using FRESHMusicPlayer.Utilities;
using FRESHMusicPlayer_WPF_UI_Test.Forms;
using FRESHMusicPlayer.Forms;
using Microsoft.Win32;
using System;
using System.Collections.Generic;
@ -279,7 +279,7 @@ namespace FRESHMusicPlayer
Track track = new Track(Player.FilePath);
Title = $"{track.Artist} - {track.Title} | FRESHMusicPlayer 8 Development";
TitleLabel.Text = track.Title;
ArtistLabel.Text = track.Artist == "" ? FRESHMusicPlayer_WPF_UI_Test.Properties.Resources.MAINWINDOW_NOARTIST : track.Artist;
ArtistLabel.Text = track.Artist == "" ? FRESHMusicPlayer.Properties.Resources.MAINWINDOW_NOARTIST : track.Artist;
ProgressBar.Maximum = Player.CurrentBackend.TotalTime.TotalSeconds;
if (Player.CurrentBackend.TotalTime.TotalSeconds != 0) ProgressIndicator2.Text = Player.CurrentBackend.TotalTime.ToString(@"mm\:ss");
else ProgressIndicator2.Text = "∞";
@ -303,7 +303,7 @@ namespace FRESHMusicPlayer
NotificationHandler.Add(new Notification
{
HeaderText = "A playback error occured",
ContentText = String.Format(FRESHMusicPlayer_WPF_UI_Test.Properties.Resources.MAINWINDOW_PLAYBACK_ERROR_DETAILS),
ContentText = String.Format(FRESHMusicPlayer.Properties.Resources.MAINWINDOW_PLAYBACK_ERROR_DETAILS),
IsImportant = true,
DisplayAsToast = true,
Type = NotificationType.Failure

View file

@ -1,10 +1,10 @@
<Page x:Class="FRESHMusicPlayer_WPF_UI_Test.Pages.ImportPage"
<Page x:Class="FRESHMusicPlayer.Pages.ImportPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:FRESHMusicPlayer_WPF_UI_Test.Pages"
xmlns:resx = "clr-namespace:FRESHMusicPlayer_WPF_UI_Test.Properties"
xmlns:local="clr-namespace:FRESHMusicPlayer.Pages"
xmlns:resx = "clr-namespace:FRESHMusicPlayer.Properties"
mc:Ignorable="d"
d:DesignHeight="372" d:DesignWidth="694"
Title="ImportPage" DragEnter="Page_DragEnter" Drop="Page_Drop" AllowDrop="True">

View file

@ -14,7 +14,7 @@ using System.Windows.Controls;
using System.Windows.Input;
using WinForms = System.Windows.Forms;
namespace FRESHMusicPlayer_WPF_UI_Test.Pages
namespace FRESHMusicPlayer.Pages
{
/// <summary>
/// Interaction logic for ImportPage.xaml

View file

@ -1,10 +1,10 @@
<Page x:Class="FRESHMusicPlayer_WPF_UI_Test.Pages.Library.LibraryPage"
<Page x:Class="FRESHMusicPlayer.Pages.Library.LibraryPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:resx = "clr-namespace:FRESHMusicPlayer_WPF_UI_Test.Properties"
xmlns:local="clr-namespace:FRESHMusicPlayer_WPF_UI_Test.Pages.Library"
xmlns:resx = "clr-namespace:FRESHMusicPlayer.Properties"
xmlns:local="clr-namespace:FRESHMusicPlayer.Pages.Library"
mc:Ignorable="d"
d:DesignHeight="372" d:DesignWidth="694"
Title="LibraryPage" Unloaded="Page_Unloaded" DragEnter="Page_DragEnter" Drop="Page_Drop" AllowDrop="True">

View file

@ -23,7 +23,7 @@ using System.Diagnostics;
using LiteDB;
using FRESHMusicPlayer.Utilities;
namespace FRESHMusicPlayer_WPF_UI_Test.Pages.Library
namespace FRESHMusicPlayer.Pages.Library
{
/// <summary>
/// Interaction logic for LibraryPage.xaml

View file

@ -1,9 +1,9 @@
<Page x:Class="FRESHMusicPlayer_WPF_UI_Test.Pages.Library.SearchPage"
<Page x:Class="FRESHMusicPlayer.Pages.Library.SearchPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:FRESHMusicPlayer_WPF_UI_Test.Pages.Library"
xmlns:local="clr-namespace:FRESHMusicPlayer.Pages.Library"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800"
Title="SearchPage">

View file

@ -20,7 +20,7 @@ using System.Windows.Navigation;
using System.Windows.Shapes;
using System.Windows.Threading;
namespace FRESHMusicPlayer_WPF_UI_Test.Pages.Library
namespace FRESHMusicPlayer.Pages.Library
{
/// <summary>
/// Interaction logic for SearchPage.xaml

View file

@ -1,9 +1,9 @@
<UserControl x:Class="FRESHMusicPlayer_WPF_UI_Test.Pages.Library.SongEntry"
<UserControl x:Class="FRESHMusicPlayer.Pages.Library.SongEntry"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:FRESHMusicPlayer_WPF_UI_Test.Pages.Library"
xmlns:local="clr-namespace:FRESHMusicPlayer.Pages.Library"
mc:Ignorable="d"
d:DesignHeight="40" d:DesignWidth="344" MouseEnter="UserControl_MouseEnter" MouseLeave="UserControl_MouseLeave" MouseLeftButtonDown="UserControl_MouseLeftButtonDown">
<UserControl.Triggers>

View file

@ -7,7 +7,7 @@ using System.Windows.Controls;
using System.Windows.Input;
using System.Windows.Media.Animation;
namespace FRESHMusicPlayer_WPF_UI_Test.Pages.Library
namespace FRESHMusicPlayer.Pages.Library
{
/// <summary>
/// Interaction logic for SongEntry.xaml

View file

@ -1,10 +1,10 @@
<Page x:Class="FRESHMusicPlayer_WPF_UI_Test.Pages.NotificationPage"
<Page x:Class="FRESHMusicPlayer.Pages.NotificationPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:FRESHMusicPlayer_WPF_UI_Test.Pages"
xmlns:resx = "clr-namespace:FRESHMusicPlayer_WPF_UI_Test.Properties"
xmlns:local="clr-namespace:FRESHMusicPlayer.Pages"
xmlns:resx = "clr-namespace:FRESHMusicPlayer.Properties"
mc:Ignorable="d"
d:DesignHeight="372" d:DesignWidth="235"
Title="NotificationPage" Unloaded="Page_Unloaded">

View file

@ -17,7 +17,7 @@ using FRESHMusicPlayer.Handlers.Notifications;
using FRESHMusicPlayer;
using System.Windows.Media.Animation;
namespace FRESHMusicPlayer_WPF_UI_Test.Pages
namespace FRESHMusicPlayer.Pages
{
/// <summary>
/// Interaction logic for NotificationPage.xaml

View file

@ -1,4 +1,4 @@
<UserControl x:Class="FRESHMusicPlayer_WPF_UI_Test.Pages.QueueEntry"
<UserControl x:Class="FRESHMusicPlayer.Pages.QueueEntry"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

View file

@ -15,7 +15,7 @@ using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace FRESHMusicPlayer_WPF_UI_Test.Pages
namespace FRESHMusicPlayer.Pages
{
/// <summary>
/// Interaction logic for QueueEntry.xaml

View file

@ -1,10 +1,10 @@
<Page x:Class="FRESHMusicPlayer_WPF_UI_Test.Pages.QueueManagement"
<Page x:Class="FRESHMusicPlayer.Pages.QueueManagement"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:resx = "clr-namespace:FRESHMusicPlayer_WPF_UI_Test.Properties"
xmlns:local="clr-namespace:FRESHMusicPlayer_WPF_UI_Test.Pages"
xmlns:resx = "clr-namespace:FRESHMusicPlayer.Properties"
xmlns:local="clr-namespace:FRESHMusicPlayer.Pages"
mc:Ignorable="d"
d:DesignHeight="372" d:DesignWidth="235"
Title="QueueManagementPage" Unloaded="Page_Unloaded">

View file

@ -20,7 +20,7 @@ using ATL.Playlist;
using FRESHMusicPlayer.Handlers.Notifications;
using System.IO;
namespace FRESHMusicPlayer_WPF_UI_Test.Pages
namespace FRESHMusicPlayer.Pages
{
/// <summary>
/// Interaction logic for QueueManagementPage.xaml

View file

@ -1,9 +1,9 @@
<Page x:Class="FRESHMusicPlayer_WPF_UI_Test.Pages.SettingsPage"
<Page x:Class="FRESHMusicPlayer.Pages.SettingsPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:FRESHMusicPlayer_WPF_UI_Test.Pages"
xmlns:local="clr-namespace:FRESHMusicPlayer.Pages"
mc:Ignorable="d"
d:DesignHeight="1072" d:DesignWidth="335"
Title="SettingsPage" Unloaded="Page_Unloaded">

View file

@ -16,7 +16,7 @@ using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace FRESHMusicPlayer_WPF_UI_Test.Pages
namespace FRESHMusicPlayer.Pages
{
/// <summary>
/// Interaction logic for SettingsPage.xaml

View file

@ -1,9 +1,9 @@
<Page x:Class="FRESHMusicPlayer_WPF_UI_Test.Pages.TestPage"
<Page x:Class="FRESHMusicPlayer.Pages.TestPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:FRESHMusicPlayer_WPF_UI_Test.Pages"
xmlns:local="clr-namespace:FRESHMusicPlayer.Pages"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800"
Title="TestPage">

View file

@ -14,7 +14,7 @@ using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace FRESHMusicPlayer_WPF_UI_Test.Pages
namespace FRESHMusicPlayer.Pages
{
/// <summary>
/// Interaction logic for TestPage.xaml

View file

@ -1,10 +1,10 @@
<Page x:Class="FRESHMusicPlayer_WPF_UI_Test.Pages.TrackInfoPage"
<Page x:Class="FRESHMusicPlayer.Pages.TrackInfoPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:resx = "clr-namespace:FRESHMusicPlayer_WPF_UI_Test.Properties"
xmlns:local="clr-namespace:FRESHMusicPlayer_WPF_UI_Test.Pages"
xmlns:resx = "clr-namespace:FRESHMusicPlayer.Properties"
xmlns:local="clr-namespace:FRESHMusicPlayer.Pages"
mc:Ignorable="d"
d:DesignHeight="372" d:DesignWidth="235"
Title="TrackInfoPage" Unloaded="Page_Unloaded">

View file

@ -17,7 +17,7 @@ using System.Windows.Navigation;
using Imaging = System.Drawing.Imaging;
using System.Windows.Shapes;
namespace FRESHMusicPlayer_WPF_UI_Test.Pages
namespace FRESHMusicPlayer.Pages
{
/// <summary>
/// Interaction logic for TrackInfoPage.xaml

View file

@ -8,7 +8,7 @@
// </auto-generated>
//------------------------------------------------------------------------------
namespace FRESHMusicPlayer_WPF_UI_Test.Properties {
namespace FRESHMusicPlayer.Properties {
using System;
@ -39,7 +39,7 @@ namespace FRESHMusicPlayer_WPF_UI_Test.Properties {
public static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("FRESHMusicPlayer_WPF_UI_Test.Properties.Resources", typeof(Resources).Assembly);
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("FRESHMusicPlayer.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;

View file

@ -8,21 +8,17 @@
// </auto-generated>
//------------------------------------------------------------------------------
namespace FRESHMusicPlayer_WPF_UI_Test.Properties
{
namespace FRESHMusicPlayer.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
{
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.7.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
public static Settings Default
{
get
{
public static Settings Default {
get {
return defaultInstance;
}
}

View file

@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29613.14
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FRESHMusicPlayer-WPF-UI-Test", "FRESHMusicPlayer-WPF-UI-Test\FRESHMusicPlayer-WPF-UI-Test.csproj", "{7C89A964-E4D9-46A5-A36F-A283D3B1F55E}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FRESHMusicPlayer", "FRESHMusicPlayer-WPF-UI-Test\FRESHMusicPlayer.csproj", "{7C89A964-E4D9-46A5-A36F-A283D3B1F55E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution