Override tray patch. Leave UI as intended.

5 files changed, 42 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bcf11166ae02..3479722aefb2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mtgaprotracker
 	pkgdesc = Automatically uploads collection, decks, battles, draft and inventory from your Magic: The Gathering Arena client
 	pkgver = 2.0.15
-	pkgrel = 2
+	pkgrel = 3
 	arch = i686
 	arch = x86_64
 	license = MIT
@@ -10,15 +10,15 @@ pkgbase = mtgaprotracker
 	source = mtgaprotracker-2.0.15.tar.gz::https://github.com/Razviar/mtgap/archive/v2.0.15.tar.gz
 	source = runmtgap.sh
 	source = mtgap.desktop
-	source = home.css.patch
 	source = home.html.patch
+	source = ipc_main.ts.patch
 	source = main_window.ts.patch
 	sha256sums = 4d49ea7bf1d58659fa40f010cdd08a915a5e163288be60aaeb3307df20339225
 	sha256sums = 93dfa25b7da8394dce436a67b600bc06bb7576daa62bdabe6e48f2bf8c9e1436
 	sha256sums = 145aa9f5ccb104f5b93cccbe5221755299abcdf02d4cd4d635e5038bfca63048
-	sha256sums = 778bd9c94e45e69c735a6a4166d6df13e49cf9369e6b697352e97efa0113951b
-	sha256sums = c6f4fd4e9de36b45eeee0d03e36a7d0871afa38ca197ded6165d53d0c62fba6f
-	sha256sums = 4752632fd73d95d20f2f73f6b62f80428030970b2a6ac432b87ad566431cd1a0
+	sha256sums = ff07b2ddf0391ac0e75b8e115e5a4953e32b39991d6022c2d2d310a9c3f61576
+	sha256sums = f8b5d6b87ee2e60518da29c1540d0ff444a64a0f1870bf4d65f2aab577336052
+	sha256sums = 06bc1af01f8df685c1d6930f8882c668e25bf0f421659dd8021758824c976d19
 
 pkgname = mtgaprotracker
 
diff --git a/PKGBUILD b/PKGBUILD
index d091007c428c..30446bb6bf86 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 pkgname=mtgaprotracker
 _pkgname=mtgap
 pkgver=2.0.15
-pkgrel=2
+pkgrel=3
 pkgdesc="Automatically uploads collection, decks, battles, draft and inventory from your Magic: The Gathering Arena client"
 
 arch=('i686' 'x86_64')
@@ -11,15 +11,15 @@ makedepends=('yarn')
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Razviar/mtgap/archive/v2.0.15.tar.gz"
 	"runmtgap.sh" 
 	"${_pkgname}.desktop"
-	"home.css.patch"
 	"home.html.patch"
+	"ipc_main.ts.patch"
 	"main_window.ts.patch")
 sha256sums=('4d49ea7bf1d58659fa40f010cdd08a915a5e163288be60aaeb3307df20339225' 
 	    '93dfa25b7da8394dce436a67b600bc06bb7576daa62bdabe6e48f2bf8c9e1436'
 	    '145aa9f5ccb104f5b93cccbe5221755299abcdf02d4cd4d635e5038bfca63048'
-	    '778bd9c94e45e69c735a6a4166d6df13e49cf9369e6b697352e97efa0113951b'
-	    'c6f4fd4e9de36b45eeee0d03e36a7d0871afa38ca197ded6165d53d0c62fba6f'
-	    '4752632fd73d95d20f2f73f6b62f80428030970b2a6ac432b87ad566431cd1a0')
+	    'ff07b2ddf0391ac0e75b8e115e5a4953e32b39991d6022c2d2d310a9c3f61576'
+		'f8b5d6b87ee2e60518da29c1540d0ff444a64a0f1870bf4d65f2aab577336052'
+	    '06bc1af01f8df685c1d6930f8882c668e25bf0f421659dd8021758824c976d19')
 
 prepare() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
@@ -36,9 +36,9 @@ prepare() {
 
 build(){
 	cd "${srcdir}/${_pkgname}-${pkgver}"
-        patch -u src/app/main_window.ts < "${srcdir}/main_window.ts.patch"
-	patch -u src/windows/home/home.css < "${srcdir}/home.css.patch"
 	patch -u src/windows/home/home.html < "${srcdir}/home.html.patch"
+	patch -u src/app/ipc_main.ts < "${srcdir}/ipc_main.ts.patch"
+	patch -u src/app/main_window.ts < "${srcdir}/main_window.ts.patch"
 	yarn run package 
 }
 
diff --git a/home.html.patch b/home.html.patch
index e0a256a15697..184275751093 100644
--- a/home.html.patch
+++ b/home.html.patch
@@ -1,16 +1,25 @@
+@@ -22,7 +22,7 @@
+       <div class="button white" data-activate="accounts">
+         <img class="imgico" id="Accountsico" width="20" /> Accounts
+       </div>
+-      <div id="minimize" class="buttonClose white" title="Minimize to tray">
++      <div id="minimize" class="buttonClose white" title="Minimize">
+         &#10799;
+       </div>
+     </div>
 @@ -98,13 +98,13 @@
      <div class="tab" id="settings">
        <div class="settingRow">
          <div class="pretty p-switch p-fill">
-+          <input class="settings" data-setting="autorun" type="checkbox" value="1" disabled/>
 -          <input class="settings" data-setting="autorun" type="checkbox" value="1" />
++          <input class="settings" data-setting="autorun" type="checkbox" value="1" disabled/>
            <div class="state p-danger"><label>Start with Windows</label></div>
          </div>
        </div>
        <div class="settingRow">
          <div class="pretty p-switch p-fill">
-+          <input class="settings" data-setting="minimized" type="checkbox" value="1" disabled/>
 -          <input class="settings" data-setting="minimized" type="checkbox" value="1" />
++          <input class="settings" data-setting="minimized" type="checkbox" value="1" disabled/>
            <div class="state p-danger"><label>Start Minimized</label></div>
          </div>
        </div>
diff --git a/ipc_main.ts.patch b/ipc_main.ts.patch
new file mode 100644
index 000000000000..669320e14771
--- /dev/null
+++ b/ipc_main.ts.patch
@@ -0,0 +1,9 @@
+@@ -74,7 +74,7 @@
+       });
+   });
+ 
+-  onMessageFromBrowserWindow('minimize-me', () => withHomeWindow(w => w.hide()));
++  onMessageFromBrowserWindow('minimize-me', () => withHomeWindow(w => w.minimize()));
+ 
+   onMessageFromBrowserWindow('set-setting-autorun', newAutorun => {
+     const settings = settingsStore.get();
diff --git a/main_window.ts.patch b/main_window.ts.patch
index 2591b8ef82bc..467e05cb5e51 100644
--- a/main_window.ts.patch
+++ b/main_window.ts.patch
@@ -1,20 +1,12 @@
-@@ -31,8 +31,8 @@
-       nodeIntegration: true,
-       devTools: electronIsDev,
-     },
-+    show: true,
-+    frame: true,
--    show: false,
--    frame: false,
-     title: 'MTGA Pro Tracker',
-     icon: appIcoImg,
-     resizable: false,
-@@ -45,7 +45,7 @@
-     withHomeWindow(w => w.focus());
+@@ -51,11 +51,6 @@
+     mainWindow = undefined;
    });
  
-+  mainWindow.setMenuBarVisibility(true);
--  mainWindow.setMenuBarVisibility(false);
- 
-   mainWindow.on('closed', () => {
-     mainWindow = undefined;
+-  mainWindow.on('minimize', (event: Electron.Event) => {
+-    event.preventDefault();
+-    withHomeWindow(w => w.hide());
+-  });
+-
+   mainWindow.loadURL(HOME_WINDOW_WEBPACK_ENTRY).catch(err =>
+     error('Failure to load url in main window', err, {
+       entry: HOME_WINDOW_WEBPACK_ENTRY,