From 0337d7719e78dee0cc8c75e2477c2ddca79de519 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Wed, 17 Jun 2015 23:11:25 -0700 Subject: [PATCH 1/3] Add support for signing windows installers --- Gruntfile.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Gruntfile.js b/Gruntfile.js index 5958dd45..163cabf0 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -18,6 +18,9 @@ module.exports = function (grunt) { env.NODE_PATH = '..:' + env.NODE_PATH; env.NODE_ENV = target; + var certificateFile = grunt.option('certificate'); + var certificatePassword = grunt.option('password'); + var version = function (str) { var match = str.match(/(\d+\.\d+\.\d+)/); return match ? match[1] : null; @@ -107,7 +110,9 @@ module.exports = function (grunt) { setupIcon: 'util/kitematic.ico', description: 'Kitematic', title: 'Kitematic', - version: packagejson.version + version: packagejson.version, + certificateFile: certificateFile, + certificatePassword: certificatePassword }, // docker binaries From 959967fd4c8f6437724e5dc03525eea50c211839 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Wed, 17 Jun 2015 23:11:42 -0700 Subject: [PATCH 2/3] Fix bug where Kitemati for windows would maximize and user could no longer close it --- src/components/Header.react.js | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/components/Header.react.js b/src/components/Header.react.js index abdbe0e0..826b8a41 100644 --- a/src/components/Header.react.js +++ b/src/components/Header.react.js @@ -63,10 +63,21 @@ var Header = React.createClass({ remote.getCurrentWindow().minimize(); }, handleFullscreen: function () { - remote.getCurrentWindow().setFullScreen(!remote.getCurrentWindow().isFullScreen()); - this.setState({ - fullscreen: remote.getCurrentWindow().isFullScreen() - }); + if (util.isWindows()) { + if (remote.getCurrentWindow().isMaximized()) { + remote.getCurrentWindow().unmaximize(); + } else { + remote.getCurrentWindow().maximize(); + } + this.setState({ + fullscreen: remote.getCurrentWindow().isMaximized() + }); + } else { + remote.getCurrentWindow().setFullScreen(!remote.getCurrentWindow().isFullScreen()); + this.setState({ + fullscreen: remote.getCurrentWindow().isFullScreen() + }); + } }, handleFullscreenHover: function () { this.update(); From f960af6b63cb34ac1b3789b4a2932d1679e5d728 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Wed, 17 Jun 2015 23:11:57 -0700 Subject: [PATCH 3/3] Fixed incorrect styling on Windows header buttons --- styles/header.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/styles/header.less b/styles/header.less index 49040cf2..f6892847 100644 --- a/styles/header.less +++ b/styles/header.less @@ -111,14 +111,14 @@ &.button-fullscreen { .icon { background-position: center; - .at2x('windows-fullscreen.png', 14px, 2px); + .at2x('windows-fullscreen.png', 14px, 12px); } } &.button-fullscreenclose { .icon { background-position: center; - .at2x('windows-fullscreenclose.png', 14px, 2px); + .at2x('windows-fullscreenclose.png', 14px, 12px); } }