Merge pull request #19 from adrianmteo/develop

adrianmteo · Mar 20, 2020 · 922c6bf · 922c6bf
2 parents b516cb1 + 7f0d982
commit 922c6bf
Show file tree

Hide file tree

Showing 65 changed files with 5,611 additions and 6,360 deletions.
diff --git a/.extra/setup-script.iss b/.extra/setup-script.iss
@@ -1,69 +1,85 @@
-; Script generated by the Inno Setup Script Wizard.
-; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
-
-#define MyAppName "Luna"
-#define MyAppVersion "1.0"
-#define MyAppPublisher "Adrian Mateoaea"
-#define MyAppURL "https://github.com/adrianmteo/Luna"
-#define MyAppExeName "Luna.exe"
-
-[Setup]
-; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.
-; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
-AppId={{7FDBD0F5-0E11-4048-8C62-A5F64BB878AF}
-AppName={#MyAppName}
-AppVersion={#MyAppVersion}
-;AppVerName={#MyAppName} {#MyAppVersion}
-AppPublisher={#MyAppPublisher}
-AppPublisherURL={#MyAppURL}
-AppSupportURL={#MyAppURL}
-AppUpdatesURL={#MyAppURL}
-DefaultDirName={localappdata}\{#MyAppName}
-DisableProgramGroupPage=yes
-; Remove the following line to run in administrative install mode (install for all users.)
-PrivilegesRequired=lowest
-OutputBaseFilename={#MyAppName}Setup
-Compression=lzma
-SolidCompression=yes
-WizardStyle=modern
-UninstallDisplayIcon={app}\{#MyAppExeName}
-UninstallDisplayName={#MyAppName}
-DirExistsWarning=no
-VersionInfoCompany={#MyAppPublisher}
-VersionInfoCopyright=Copyright � {#MyAppPublisher} 2020
-VersionInfoProductVersion={#MyAppVersion}
-VersionInfoVersion={#MyAppVersion}
-
-[Code]
-procedure InitializeWizard;
-begin
-  WizardForm.SelectDirBrowseLabel.Visible:=False;
-  WizardForm.DirEdit.Enabled:=False;
-  WizardForm.DirBrowseButton.Enabled:=False;
-end;
-
-[Messages]
-SetupAppTitle={#MyAppName} Setup
-SetupWindowTitle={#MyAppName} Setup
-
-[Languages]
-Name: "english"; MessagesFile: "compiler:Default.isl"
-
-[Tasks]
-Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
-
-[Files]
-Source: "..\Luna\bin\Release\Luna.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\Luna\bin\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
-; NOTE: Don't use "Flags: ignoreversion" on any shared system files
-
-[Icons]
-Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
-Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
-
-[Run]
-Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
-
-[UninstallRun]
-Filename: "{app}\{#MyAppExeName}"; Parameters: "/clean"
-
+; Script generated by the Inno Setup Script Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+
+#define MyAppSourceIcon "..\Luna\Resources\Icon.ico"
+#define MyAppSourceDir "..\Luna\bin\Release"
+#define MyAppExeName "Luna.exe"
+#define MyAppName "Luna"
+#define MyAppVersion GetStringFileInfo(MyAppSourceDir + "\" + MyAppExeName, "ProductVersion")
+#define MyAppPublisher "Adrian Mateoaea"
+#define MyAppURL "https://github.com/adrianmteo/Luna"
+
+[Setup]
+; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.
+; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
+AppId={{7FDBD0F5-0E11-4048-8C62-A5F64BB878AF}
+AppName={#MyAppName}
+AppVersion={#MyAppVersion}
+;AppVerName={#MyAppName} {#MyAppVersion}
+AppPublisher={#MyAppPublisher}
+AppPublisherURL={#MyAppURL}
+AppSupportURL={#MyAppURL}
+AppUpdatesURL={#MyAppURL}
+DefaultDirName={localappdata}\{#MyAppName}
+DisableProgramGroupPage=yes
+; Remove the following line to run in administrative install mode (install for all users.)
+PrivilegesRequired=lowest
+OutputBaseFilename={#MyAppName}Setup
+Compression=lzma
+SolidCompression=yes
+WizardStyle=modern
+UninstallDisplayIcon={app}\{#MyAppExeName}
+UninstallDisplayName={#MyAppName}
+DirExistsWarning=no
+VersionInfoCompany={#MyAppPublisher}
+VersionInfoCopyright=Copyright © {#MyAppPublisher} 2020
+VersionInfoProductVersion={#MyAppVersion}
+VersionInfoVersion={#MyAppVersion}
+SetupIconFile={#MyAppSourceIcon}
+
+[Messages]
+SetupAppTitle={#MyAppName} Setup
+SetupWindowTitle={#MyAppName} Setup
+
+[Languages]
+Name: "english"; MessagesFile: "compiler:Default.isl"
+
+[Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"
+
+[Files]
+Source: "{#MyAppSourceDir}\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#MyAppSourceDir}\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+
+[Icons]
+Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
+Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
+
+[Run]
+Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall; Check: LaunchChecked
+
+[Code]
+function CmdLineParamExists(const Value: string): Boolean;
+var
+  I: Integer;  
+begin
+  Result := False;
+  for I := 1 to ParamCount do
+    if CompareText(ParamStr(I), Value) = 0 then
+    begin
+      Result := True;
+      Exit;
+    end;
+end;
+
+function LaunchChecked: Boolean;
+begin
+  Result := not CmdLineParamExists('/NOSTART');
+end;
+
+[UninstallRun]
+Filename: "{app}\{#MyAppExeName}"; Parameters: "/clean"
+
+[UninstallDelete]
+Type: files; Name: "{app}\*.*"
diff --git a/.repo/recording.gif b/.repo/recording.gif
diff --git a/.repo/screenshot.png b/.repo/screenshot.png
diff --git a/.repo/screenshot1.png b/.repo/screenshot1.png
diff --git a/.repo/screenshot2.png b/.repo/screenshot2.png
diff --git a/.repo/theme.png b/.repo/theme.png
diff --git a/Luna/App.config b/Luna/App.config
@@ -1,45 +1,45 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-    <configSections>
-        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-            <section name="Luna.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
-        </sectionGroup>
-    </configSections>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
-    </startup>
-    <userSettings>
-        <Luna.Properties.Settings>
-            <setting name="Enabled" serializeAs="String">
-                <value>False</value>
-            </setting>
-            <setting name="ChangeAppTheme" serializeAs="String">
-                <value>False</value>
-            </setting>
-            <setting name="ChangeSystemTheme" serializeAs="String">
-                <value>False</value>
-            </setting>
-            <setting name="ChangeWallpaper" serializeAs="String">
-                <value>False</value>
-            </setting>
-            <setting name="LightWallpaperPath" serializeAs="String">
-                <value />
-            </setting>
-            <setting name="DarkWallpaperPath" serializeAs="String">
-                <value />
-            </setting>
-            <setting name="LightThemeHour" serializeAs="String">
-                <value>7</value>
-            </setting>
-            <setting name="LightThemeMinute" serializeAs="String">
-                <value>0</value>
-            </setting>
-            <setting name="DarkThemeHour" serializeAs="String">
-                <value>7</value>
-            </setting>
-            <setting name="DarkThemeMinute" serializeAs="String">
-                <value>0</value>
-            </setting>
-        </Luna.Properties.Settings>
-    </userSettings>
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <configSections>
+        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
+            <section name="Luna.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+        </sectionGroup>
+    </configSections>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
+    </startup>
+    <userSettings>
+        <Luna.Properties.Settings>
+            <setting name="Enabled" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="ChangeAppTheme" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="ChangeSystemTheme" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="ChangeWallpaper" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="LightWallpaperPath" serializeAs="String">
+                <value />
+            </setting>
+            <setting name="DarkWallpaperPath" serializeAs="String">
+                <value />
+            </setting>
+            <setting name="LightThemeHour" serializeAs="String">
+                <value>7</value>
+            </setting>
+            <setting name="LightThemeMinute" serializeAs="String">
+                <value>0</value>
+            </setting>
+            <setting name="DarkThemeHour" serializeAs="String">
+                <value>7</value>
+            </setting>
+            <setting name="DarkThemeMinute" serializeAs="String">
+                <value>0</value>
+            </setting>
+        </Luna.Properties.Settings>
+    </userSettings>
 </configuration>
diff --git a/Luna/App.xaml b/Luna/App.xaml
@@ -1,54 +1,14 @@
-<Application x:Class="Luna.App"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             StartupUri="MainWindow.xaml">
-
-    <Application.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="Themes/Metro/Dark/MetroDark.MSControls.Core.Implicit.xaml" />
-                <!-- Custom styles -->
-                <ResourceDictionary>
-                    <Style x:Key="CloseButtonStyle" TargetType="Button">
-                        <Setter Property="Foreground" Value="{DynamicResource ForegroundBrush}" />
-                        <Setter Property="Background" Value="Transparent" />
-                        <Setter Property="BorderBrush" Value="{x:Null}" />
-                        <Setter Property="BorderThickness" Value="0" />
-                        <Setter Property="Padding" Value="0" />
-                        <Setter Property="Template">
-                            <Setter.Value>
-                                <ControlTemplate TargetType="Button">
-                                    <Grid>
-                                        <VisualStateManager.VisualStateGroups>
-                                            <VisualStateGroup x:Name="CommonStates">
-                                                <VisualState x:Name="Normal" />
-                                                <VisualState x:Name="MouseOver">
-                                                    <Storyboard>
-                                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="ContentControl" Storyboard.TargetProperty="Opacity">
-                                                            <DiscreteDoubleKeyFrame KeyTime="0" Value="0.7" />
-                                                        </DoubleAnimationUsingKeyFrames>
-                                                    </Storyboard>
-                                                </VisualState>
-                                                <VisualState x:Name="Pressed">
-                                                    <Storyboard>
-                                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="ContentControl" Storyboard.TargetProperty="Opacity">
-                                                            <DiscreteDoubleKeyFrame KeyTime="0" Value="0.2" />
-                                                        </DoubleAnimationUsingKeyFrames>
-                                                    </Storyboard>
-                                                </VisualState>
-                                            </VisualStateGroup>
-                                        </VisualStateManager.VisualStateGroups>
-                                        <Rectangle Fill="{TemplateBinding Background}" />
-                                        <ContentControl x:Name="ContentControl" Foreground="{TemplateBinding Foreground}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                                            <ContentPresenter />
-                                        </ContentControl>
-                                    </Grid>
-                                </ControlTemplate>
-                            </Setter.Value>
-                        </Setter>
-                    </Style>
-                </ResourceDictionary>
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </Application.Resources>
-</Application>
+<Application x:Class="Luna.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             StartupUri="Windows/SettingsWindow.xaml">
+
+    <Application.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="Theme/MetroDark.MSControls.Core.Implicit.xaml" />
+                <ResourceDictionary Source="Theme/Styles.Extended.Wpf.Toolkit.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Application.Resources>
+</Application>