Merge pull request #8 from ridaamirini/dev

Dev
ridaamirini · May 13, 2018 · d5102d9 · d5102d9
2 parents 549f474 + 73ad642
commit d5102d9
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 12 deletions.
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "imapsyncclient",
   "displayName": "ImapSync Client",
   "productName": "ImapSync Client",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "author": "Rida Am. <rida-amirini@gmx.de>",
   "description": "It's only an Internet Message Access Protocol Synchronization Client",
   "license": "MIT",

diff --git a/revision.json b/revision.json
@@ -1,5 +1,5 @@
 {
-  "rev": "7e576bb",
-  "version": "0.0.2.7e576bb",
-  "date": "2018-5-11 18:00:46"
+  "rev": "5eafc78",
+  "version": "0.0.4.5eafc78",
+  "date": "2018-5-13 18:17:38"
 }
diff --git a/src/main/index.js b/src/main/index.js
@@ -60,7 +60,7 @@ function createWindow () {
     mainWindow.show();
   });
 
-  // @todo Disable Zoom in/out  with mouse and pinch
+  // @todo Disable Zoom in/out  with mouse and pinch (Macbook trackpad)
   /* let webFrame = require('electron').webFrame;
   webFrame.setVisualZoomLevelLimits(1,1);
   webFrame.setLayoutZoomLevelLimits(0, 0); */

diff --git a/src/renderer/components/About.vue b/src/renderer/components/About.vue
@@ -13,8 +13,8 @@
                             Author: Rida Amirini
                       </el-col>
                 </el-row>
-                <el-row :gutter="12">
-                      <el-col :span="12">
+                <el-row :gutter="18">
+                      <el-col :span="16">
                             Version: v{{version}}
                       </el-col>
                 </el-row>

diff --git a/src/renderer/components/Add/MailboxForm.vue b/src/renderer/components/Add/MailboxForm.vue
@@ -33,9 +33,11 @@
                 <shell-alike-box></shell-alike-box>
             </el-col>
             <el-col :span="4" :offset="16">
-                <el-badge class="noselect" :value="mailboxes.length" :max="9999">
+                <el-badge v-if="mailboxes.length > 0" class="noselect" :value="mailboxes.length" :max="9999">
                     <el-button type="success" icon="el-icon-plus" :disabled="isOnProcess" @click="addMailbox">Add</el-button>
                 </el-badge>
+
+                <el-button v-else type="success" icon="el-icon-plus" :disabled="isOnProcess" @click="addMailbox">Add</el-button>
             </el-col>
             <el-col :span="4">
                 <el-button type="primary" v-show="!isOnProcess" icon="el-icon-refresh" @click="startMigration" :disabled="!(mailboxes.length > 0)">Migrate</el-button>
@@ -173,12 +175,14 @@
                         this.$http.get('http://' + this.api + '/imapsync/queue/' + uuid)
                             .then((response) => {
                                 if (response.data.status === 'queue' && this.queue.map(el => el.uuid).indexOf(uuid) === -1) {
-                                    this.queue.push(response.data);
-                                    if (!this.abortMessage()) {
+                                  this.queue.push(response.data);
+                                  // This code makes no sense to me.
+                                  // @fixme https://github.com/ridaamirini/ImapSyncClient/issues/5
+                                   /* if (!this.abortMessage()) {
                                       // Abort with queue
                                       clearInterval(queueChecker);
                                       return this.abortMigration();
-                                    }
+                                    } */
                                 }
                                 // Stop on ABORT
                                 // Abort without Queue (because of request response directly back without queue)

diff --git a/src/renderer/components/ShellAlikeBox.vue b/src/renderer/components/ShellAlikeBox.vue
@@ -48,7 +48,7 @@
                 let start = el.scrollTop;
                 let end = el.scrollHeight;
                 let change = end - start;
-                let increment = 20;
+                let increment = 4;
 
                 function easeInOut (currentTime, start, change, duration) {
                     // by Robert Penner