From 89d1071dc1d9c0e03b823a0bd5a43a46514b77f5 Mon Sep 17 00:00:00 2001 From: Dick Choi Date: Tue, 24 May 2016 20:14:53 +0900 Subject: [PATCH] update StatusBar fix width of URL status show dialog before update --- browser/main/StatusBar/StatusBar.styl | 3 ++- browser/main/StatusBar/index.js | 20 ++++++++++++++++---- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/browser/main/StatusBar/StatusBar.styl b/browser/main/StatusBar/StatusBar.styl index 7687b112..f91d5930 100644 --- a/browser/main/StatusBar/StatusBar.styl +++ b/browser/main/StatusBar/StatusBar.styl @@ -7,7 +7,7 @@ absolute left height 24px overflow ellipsis - width 350px + right 185px line-height 24px font-size 12px padding 0 15px @@ -27,6 +27,7 @@ position absolute right 60px height 24px + width 125px border-width 0 0 0 1px border-style solid border-color $ui-borderColor diff --git a/browser/main/StatusBar/index.js b/browser/main/StatusBar/index.js index f7fc5e85..4a1ade40 100644 --- a/browser/main/StatusBar/index.js +++ b/browser/main/StatusBar/index.js @@ -6,14 +6,17 @@ import ZoomManager from 'browser/main/lib/ZoomManager' const electron = require('electron') const ipc = electron.ipcRenderer const { remote } = electron -const { Menu, MenuItem } = remote +const { Menu, MenuItem, dialog } = remote const zoomOptions = [0.8, 0.9, 1, 1.1, 1.2, 1.3] class StatusBar extends React.Component { constructor (props) { super(props) - this.state = {updateAvailable: false} + + this.state = { + updateAvailable: false + } } componentDidMount () { @@ -23,7 +26,16 @@ class StatusBar extends React.Component { } updateApp () { - ipc.send('update-app', 'Deal with it.') + let index = dialog.showMessageBox(remote.getCurrentWindow(), { + type: 'warning', + message: 'Update Boostnote', + detail: 'New Boostnote is ready to be installed.', + buttons: ['Restart & Install', 'Not Now'] + }) + + if (index === 0) { + ipc.send('update-app', 'Deal with it.') + } } handleZoomButtonClick (e) { @@ -55,7 +67,7 @@ class StatusBar extends React.Component {
-
{location.pathname}
+
{location.pathname + location.search}
{this.state.updateAvailable ?