Merge branch 'master' of https://github.com/johnnycrab/abschluss_app

peeriodproject · Sep 4, 2014 · fda8146 · fda8146
2 parents bf77f05 + 7b14a47
commit fda8146
Show file tree

Hide file tree

Showing 22 changed files with 305 additions and 166 deletions.
diff --git a/src/config/mainConfig.json b/src/config/mainConfig.json
@@ -107,7 +107,8 @@
     },
     "app"     : {
         "dataPath": "appDataFolder",
-        "internalDataPath": "initialState"
+        "internalDataPath": "initialState",
+        "checkForUpdatesOnStartup": true
     },
     "share" : {
         "downloadManagerStateConfig": "downloadManager.json"

diff --git a/src/core/App.js b/src/core/App.js
diff --git a/src/core/App.js.map b/src/core/App.js.map
diff --git a/src/core/App.ts b/src/core/App.ts
@@ -186,6 +186,12 @@ var App = {
 	},
 
 	_checkForUpdates: function () {
+		var appConfig = this._getMainConfig(['app']);
+
+		if (!appConfig.get('app.checkForUpdatesOnStartup', false)) {
+			return;
+		}
+
 		UiUpdateNotify.checkForUpdates(this._gui);
 	},
 
@@ -218,7 +224,6 @@ var App = {
 			}
 		}*/
 		this._initSplashScreen();
-		this._checkForUpdates();
 
 		if (this._environmentConfig.get('environment.startSearchDatabase')) {
 			this._startSearchDatabase();
@@ -385,6 +390,10 @@ var App = {
 		if (this._splashScreen) {
 			this._splashScreen.once('close', () => {
 				this._checkUiRoutines();
+
+				setImmediate(() => {
+					this._checkForUpdates();
+				});
 			});
 		}
 	},

diff --git a/src/core/topology/ObjectBucketStore.js b/src/core/topology/ObjectBucketStore.js
diff --git a/src/core/topology/ObjectBucketStore.js.map b/src/core/topology/ObjectBucketStore.js.map
diff --git a/src/core/topology/ObjectBucketStore.ts b/src/core/topology/ObjectBucketStore.ts
@@ -210,12 +210,11 @@ class ObjectBucketStore implements BucketStoreInterface {
 			var dataToPersist:string = JSON.stringify(this._buckets);
 
 			if (dataToPersist) {
-				fs.writeFile(this._dbPathFs, dataToPersist, {encoding: 'utf8'}, (err:Error) => {
+				fs.outputFile(this._dbPathFs, dataToPersist, (err:Error) => {
 					this._isWritingFs = false;
 				});
 			}
 		}, this._delayPersistInMs);
-
 	}
 
 	public add (bucketKey:string, id:Buffer, lastSeen:number, addresses:any):boolean {
@@ -335,8 +334,14 @@ class ObjectBucketStore implements BucketStoreInterface {
 		if (this._isOpen) return;
 
 		if (!fs.existsSync(this._dbFolderFs)) {
-			this._isUnwritableFs = true;
+			try {
+				fs.mkdirsSync(this._dbFolderFs);
+			}
+			catch (e) {
+				this._isUnwritableFs = true;
+			}
 		}
+
 		// check if the database file exists
 		else if (fs.existsSync(this._dbPathFs)) {
 			// load the contents from the file

diff --git a/src/core/ui/UiDaemon.js b/src/core/ui/UiDaemon.js
diff --git a/src/core/ui/UiDaemon.js.map b/src/core/ui/UiDaemon.js.map
diff --git a/src/core/ui/UiDaemon.ts b/src/core/ui/UiDaemon.ts
@@ -20,8 +20,8 @@ class UiDaemon implements UiDaemonInterface {
 
 	constructor (gui, appQuitHandler:AppQuitHandlerInterface) {
 		this._tray = new gui.Tray({
-			icon   : './images/icon-menubar.png',
-			alticon: './images/icon-menubar-active.png'
+			icon   : './images/icon-menubar@2x.png',
+			alticon: './images/icon-menubar-active@2x.png'
 		});
 
 		this._menu = new gui.Menu();
@@ -40,6 +40,7 @@ class UiDaemon implements UiDaemonInterface {
 
 			this._aboutWindow = gui.Window.open('./public/about.html', {
 				position       : 'center',
+				show           : false,
 				focus          : true,
 				toolbar        : false,
 				frame          : true,
@@ -52,6 +53,11 @@ class UiDaemon implements UiDaemonInterface {
 
 			this._aboutWindow.setAlwaysOnTop(true);
 
+			this._aboutWindow.once('loaded', () => {
+				this._aboutWindow.show();
+				this._aboutWindow.focus();
+			});
+
 			this._aboutWindow.once('close', () => {
 				this._aboutWindow = null;
 			});
@@ -67,7 +73,13 @@ class UiDaemon implements UiDaemonInterface {
 			label: i18n.__('UiDaemon.menu.quit.title')
 		});
 
-		quitItem.click = function () {
+		quitItem.click = () => {
+			this._menu.remove(quitItem);
+			this._menu.append(new gui.MenuItem({
+				enabled: false,
+				label: i18n.__('UiDaemon.menu.quitting.title')
+			}));
+
 			appQuitHandler.quit();
 		};