Update .gitlab-ci.yml

Configure Renovate

See merge request JFronny/Resizor!10

.github/workflows/main.yml

@@ -1,71 +0,0 @@
-name: CD
-
-on:
-  push:
-    branches: [ master ]
-
-jobs:
-  build:
-    runs-on: windows-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Build
-      id: base_init
-      run: |
-        $(new-object System.Net.WebClient).DownloadFile("https://www.github.com/JFronny/UpTool2/releases/latest/download/Tools.zip", "$($(pwd).Path)\Tools.zip")
-        & "C:\Program Files\7-Zip\7z.exe" x .\Tools.zip
-        rm Tools.zip
-        rm Install.bat
-        rm Remove.bat
-        dotnet build --verbosity:m -p:Configuration=Release
-        cp *\bin\Release\netcoreapp3.1\package.zip .
-        $file = Get-Item $(Resolve-Path *\bin\Release\netcoreapp3.1\*.exe).Path
-        $asm = $([Reflection.Assembly]::LoadFile($file.DirectoryName + "\" + $file.BaseName + ".dll"))
-        $asmver = $asm.GetName().Version.ToString()
-        echo "::set-output name=vers::$asmver"
-    - name: Create Release
-      id: create_release
-      uses: actions/create-release@v1.0.1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        tag_name: ${{ steps.base_init.outputs.vers }}
-        release_name: Release ${{ steps.base_init.outputs.vers }}
-        draft: false
-        prerelease: false
-    - name: Upload Release Asset
-      id: upload_release_asset
-      uses: actions/upload-release-asset@v1.0.2
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ./package.zip
-        asset_name: package.zip
-        asset_content_type: application/zip
-    - name: Generate XML
-      run: |
-        $file = Get-Item $(Resolve-Path *\bin\Release\netcoreapp3.1\*.exe).Path
-        $asm = [Reflection.Assembly]::LoadFile($file.DirectoryName + "\" + $file.BaseName + ".dll")
-        [System.XML.XMLDocument]$xml=New-Object System.XML.XMLDocument
-        [System.XML.XMLElement]$app=$xml.CreateElement("app")
-        $xml.appendChild($app)
-        $app.appendChild($xml.CreateElement("Name")).InnerText = $asm.GetName().Name
-        $app.appendChild($xml.CreateElement("Description")).InnerText = "Resize Windows with style"
-        $app.appendChild($xml.CreateElement("Version")).InnerText = "${{ steps.base_init.outputs.vers }}"
-        $app.appendChild($xml.CreateElement("ID")).InnerText = "e09cfca6-b6f7-4c56-96c4-d7cc2a318984"
-        $app.appendChild($xml.CreateElement("File")).InnerText = "${{ steps.upload_release_asset.outputs.browser_download_url }}"
-        $app.appendChild($xml.CreateElement("Hash")).InnerText = $(Get-FileHash .\package.zip).Hash
-        $app.appendChild($xml.CreateElement("Icon")).InnerText = "https://raw.githubusercontent.com/JFronny/Resizor/master/Resizor/Resizor.ico"
-        $app.appendChild($xml.CreateElement("MainFile")).InnerText = $file.Name
-        echo NULL > app.xml
-        $xml.save($(gi .\app.xml).Fullname)
-    - name: Upload XML
-      uses: actions/upload-release-asset@v1.0.2
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ./app.xml
-        asset_name: app.xml
-        asset_content_type: text/xml

.gitlab-ci.yml

@@ -0,0 +1,49 @@
+.shared_windows_runners:
+  tags:
+  - windows
+
+image: mcr.microsoft.com/dotnet/core/sdk
+
+uptool:
+  extends:
+  - .shared_windows_runners
+  stage: deploy
+  script: |
+    mkdir i
+    cd i
+    $(new-object System.Net.WebClient).DownloadFile("https://gitlab.com/JFronny/UpTool2/-/jobs/artifacts/master/raw/Installer-generic.zip?job=uptool", "$($(pwd).Path)\Install.zip")
+    & "C:\Program Files\7-Zip\7z.exe" x .\Install.zip
+    .\Installer.exe --basic i -p
+    cd ..
+    rm -R i
+    $Env:Path="$Env:Path;$Env:APPDATA\UpTool2\Install"
+    uptool --basic add-repo DevTools https://gitlab.com/JFronny/UpTool2/-/snippets/2010392/raw
+    uptool --basic update
+    uptool --basic install "UpTool2 package tools"
+    $Env:Path="$Env:Path;$Env:APPDATA\UpTool2\Apps\0e35d154-d0d3-45e0-b080-62f521263a44\app"
+
+    mkdir .\build
+    dotnet publish -o .\build -c Release
+    $file = Get-Item $(Resolve-Path .\build\*.exe).Path
+    pkgtool build --binDir build --mainBin $file --packageFile .\package.zip --noLogo
+    $asm = $([Reflection.Assembly]::LoadFile($file.DirectoryName + "\" + $file.BaseName + ".dll"))
+    $asmver = $asm.GetName().Version.ToString()
+    [System.XML.XMLDocument]$xml=New-Object System.XML.XMLDocument
+    [System.XML.XMLElement]$app=$xml.CreateElement("app")
+    $xml.appendChild($app)
+    $app.appendChild($xml.CreateElement("Name")).InnerText = $asm.GetName().Name
+    $app.appendChild($xml.CreateElement("Description")).InnerText = "Resize Windows with style"
+    $app.appendChild($xml.CreateElement("Version")).InnerText = $asmver
+    $app.appendChild($xml.CreateElement("ID")).InnerText = "e09cfca6-b6f7-4c56-96c4-d7cc2a318984"
+    $app.appendChild($xml.CreateElement("File")).InnerText = $CI_PROJECT_URL + "/-/jobs/" + $CI_JOB_ID + "/artifacts/raw/package.zip"
+    $app.appendChild($xml.CreateElement("Hash")).InnerText = $(Get-FileHash .\package.zip).Hash
+    $app.appendChild($xml.CreateElement("MainFile")).InnerText = $file.Name
+    $app.appendChild($xml.CreateElement("Icon")).InnerText = "https://gitlab.com/JFronny/Resizor/-/raw/master/Resizor/Resizor.ico"
+    echo NULL > app.xml
+    $xml.save($(gi .\app.xml).Fullname)
+  artifacts:
+    paths:
+      - package.zip
+      - app.xml
+  only:
+    - master

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 J. Fronny
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,3 +1,3 @@
 # Resizor
-Resize Windows with style! [![UpTool2](https://img.shields.io/github/v/tag/JFronny/Resizor?color=informational&label=UpTool2)](https://jfronny.github.io/home/uptool)\
+Resize Windows with style! [![UpTool2](https://img.shields.io/badge/Get%20it-on%20UpTool2-blue)](https://jfronny.gitlab.io/home/uptool)\
 <small>Uses [CC-Functions.W32](https://github.com/CreepyCrafter24/CC-Functions/tree/master/W32)</small>

Resizor/Immediate Resize.cs

@@ -5,7 +5,6 @@ using System.Linq;
 using System.Windows.Forms;
 using CC_Functions.W32;
 using CC_Functions.W32.Hooks;
-using Resizor.Properties;
 
 namespace Resizor
 {
@@ -52,7 +51,7 @@ namespace Resizor
             g.CompositingMode = CompositingMode.SourceCopy;
             g.CompositingQuality = CompositingQuality.HighSpeed;
             g.PixelOffsetMode = PixelOffsetMode.None;
-            PointF divisor = Settings.Default.ResizeDividor;
+            PointF divisor = Settings.ResizeDividor;
             Rectangle rect = _down ? FRect() : CRect();
             g.FillRectangle(new SolidBrush(Color.LightBlue), rect);
             Pen gridPen = new Pen(Color.Black, 2);
@@ -63,8 +62,8 @@ namespace Resizor
             g.DrawRectangle(new Pen(Color.Red, 2), _window.Position);
         }
 
-        private PointF GetDiv() => new PointF(_screen.Width / (float) Settings.Default.ResizeDividor.X,
-            _screen.Height / (float) Settings.Default.ResizeDividor.Y);
+        private PointF GetDiv() => new PointF(_screen.Width / (float) Settings.ResizeDividor.X,
+            _screen.Height / (float) Settings.ResizeDividor.Y);
 
         private Rectangle CRect() => P2R(F2S(MousePosition, GetDiv()), C2S(MousePosition, GetDiv()));
 

Resizor/Program.cs

@@ -73,7 +73,7 @@ namespace Resizor
 
         private static void KeyDown(KeyboardHookEventArgs e)
         {
-            if (e.Key != Settings.Default.ImmediateResizeKey || (_rez != null && !_rez.IsDisposed)) return;
+            if (e.Key != Settings.ImmediateResizeKey || (_rez != null && !_rez.IsDisposed)) return;
             _rez = new ImmResize();
             _rez.Show();
         }

Resizor/Properties/Settings.Designer.cs

@@ -1,50 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Resizor.Properties {
-    
-    
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.2.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 {
-                return defaultInstance;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("NumPad4")]
-        public global::System.Windows.Forms.Keys ImmediateResizeKey {
-            get {
-                return ((global::System.Windows.Forms.Keys)(this["ImmediateResizeKey"]));
-            }
-            set {
-                this["ImmediateResizeKey"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("4, 4")]
-        public global::System.Drawing.Point ResizeDividor {
-            get {
-                return ((global::System.Drawing.Point)(this["ResizeDividor"]));
-            }
-            set {
-                this["ResizeDividor"] = value;
-            }
-        }
-    }
-}

Resizor/Properties/Settings.settings

@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="Resizor.Properties" GeneratedClassName="Settings">
-  <Profiles />
-  <Settings>
-    <Setting Name="ImmediateResizeKey" Type="System.Windows.Forms.Keys" Scope="User">
-      <Value Profile="(Default)">NumPad4</Value>
-    </Setting>
-    <Setting Name="ResizeDividor" Type="System.Drawing.Point" Scope="User">
-      <Value Profile="(Default)">4, 4</Value>
-    </Setting>
-  </Settings>
-</SettingsFile>

Resizor/Resizor.csproj

@@ -16,7 +16,7 @@
     <Content Include="Resizor.ico" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CC-Functions.W32" Version="1.1.7384.27745" />
+    <PackageReference Include="CC-Functions.W32" Version="1.1.7468.32091" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
   </ItemGroup>

Resizor/Settings.cs

@@ -0,0 +1,85 @@
+using System;
+using System.Drawing;
+using System.IO;
+using System.Windows.Forms;
+using System.Xml.Linq;
+
+namespace Resizor
+{
+    internal static class Settings
+    {
+        private static bool loaded;
+
+        private static readonly string dir = Path.Combine(Path.GetDirectoryName(Application.ExecutablePath),
+            "Settings.xml");
+
+        private static Keys immediateResizeKey;
+        private static Point resizeDividor;
+
+        public static Keys ImmediateResizeKey
+        {
+            get
+            {
+                if (!loaded)
+                    Load();
+                return immediateResizeKey;
+            }
+            set
+            {
+                if (!loaded)
+                    Load();
+                immediateResizeKey = value;
+            }
+        }
+
+        public static Point ResizeDividor
+        {
+            get
+            {
+                if (!loaded)
+                    Load();
+                return resizeDividor;
+            }
+            set
+            {
+                if (!loaded)
+                    Load();
+                resizeDividor = value;
+            }
+        }
+
+        public static void Save() =>
+            new XElement("settings",
+                    new XElement("ImmediateResizeKey", ImmediateResizeKey),
+                    new XElement("ResizeDividorX", ResizeDividor.X),
+                    new XElement("ResizeDividorY", ResizeDividor.Y))
+                .Save(dir);
+
+        private static void Load()
+        {
+            if (!File.Exists(dir))
+                Reset();
+            else
+                try
+                {
+                    XElement settings = XDocument.Load(dir).Element("settings");
+                    immediateResizeKey = Enum.Parse<Keys>(settings.Element("ImmediateResizeKey").Value);
+                    resizeDividor = new Point(
+                        int.Parse(settings.Element("ResizeDividorX").Value),
+                        int.Parse(settings.Element("ResizeDividorY").Value));
+                }
+                catch
+                {
+                    MessageBox.Show("Something went wrong while loading. Resetting to defaults", "Resizor Settings");
+                    Reset();
+                }
+            loaded = true;
+        }
+
+        private static void Reset()
+        {
+            immediateResizeKey = Keys.NumPad4;
+            resizeDividor = new Point(4, 4);
+        }
+    }
+}

Resizor/SettingsForm.cs

@@ -4,7 +4,6 @@ using System.IO;
 using System.Windows.Forms;
 using CC_Functions.W32.Hooks;
 using Microsoft.Win32;
-using Resizor.Properties;
 
 namespace Resizor
 {
@@ -17,10 +16,10 @@ namespace Resizor
         {
             InitializeComponent();
             Program.Kh = new KeyboardHook();
-            keySelectButton.Text = Settings.Default.ImmediateResizeKey.ToString();
+            keySelectButton.Text = Settings.ImmediateResizeKey.ToString();
             keySelectButton.Tag = false;
-            rowsSelect.Value = Settings.Default.ResizeDividor.Y;
-            columnsSelect.Value = Settings.Default.ResizeDividor.X;
+            rowsSelect.Value = Settings.ResizeDividor.Y;
+            columnsSelect.Value = Settings.ResizeDividor.X;
             _rkApp = Registry.CurrentUser.OpenSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Run", true);
             startupBox.Checked = _rkApp.GetValue(AppName) != null;
         }
@@ -32,7 +31,7 @@ namespace Resizor
                 Program.Kh.OnKeyPress -= Hook_OnKeyPress;
                 keySelectButton.BackColor = SystemColors.Control;
                 keySelectButton.Tag = false;
-                keySelectButton.Text = Settings.Default.ImmediateResizeKey.ToString();
+                keySelectButton.Text = Settings.ImmediateResizeKey.ToString();
             }
             else
             {
@@ -49,27 +48,27 @@ namespace Resizor
             keySelectButton.BackColor = SystemColors.Control;
             if (e.Key != Keys.Escape)
             {
-                Settings.Default.ImmediateResizeKey = e.Key;
-                Settings.Default.Save();
+                Settings.ImmediateResizeKey = e.Key;
+                Settings.Save();
             }
-            keySelectButton.Text = Settings.Default.ImmediateResizeKey.ToString();
+            keySelectButton.Text = Settings.ImmediateResizeKey.ToString();
             keySelectButton.Tag = false;
         }
 
         private void RowsSelect_ValueChanged(object sender, EventArgs e)
         {
-            Point tmp = Settings.Default.ResizeDividor;
+            Point tmp = Settings.ResizeDividor;
             tmp.Y = (int) rowsSelect.Value;
-            Settings.Default.ResizeDividor = tmp;
-            Settings.Default.Save();
+            Settings.ResizeDividor = tmp;
+            Settings.Save();
         }
 
         private void ColumnsSelect_ValueChanged(object sender, EventArgs e)
         {
-            Point tmp = Settings.Default.ResizeDividor;
+            Point tmp = Settings.ResizeDividor;
             tmp.X = (int) columnsSelect.Value;
-            Settings.Default.ResizeDividor = tmp;
-            Settings.Default.Save();
+            Settings.ResizeDividor = tmp;
+            Settings.Save();
         }
 
         private void StartupBox_CheckedChanged(object sender, EventArgs e)

renovate.json

@@ -0,0 +1,5 @@
+{
+  "extends": [
+    "config:base"
+  ]
+}