0.5.0

jaumesegarra · Nov 11, 2017 · 7dbcb1d · 7dbcb1d
1 parent 8f2c064
commit 7dbcb1d
Show file tree

Hide file tree

Showing 19 changed files with 2,160 additions and 583 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,4 @@ app/css/**
 logo256.png
 .gitignore
 dist/**/*
+fix_win.sh
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -5,87 +5,87 @@ module.exports = function (grunt) {
     var modules = []
     var package = require('./package.json')
     if (!!package.dependencies) {
-        modules = Object.keys(package.dependencies)
-        .filter(function (m) {
-            return m != 'nodewebkit'
-        })
-        .map(function (m) {
-            return './node_modules/' + m + '/**/*'
-        });
+      modules = Object.keys(package.dependencies)
+      .filter(function (m) {
+        return m != 'nodewebkit'
+      })
+      .map(function (m) {
+        return './node_modules/' + m + '/**/*'
+      });
     }
     //Grunt Config
     grunt.initConfig({
-        shell: {
-            start: {
-                command: 'npm start'
-            }
-        },
-        bower: {
-          dev: {
-            dest: 'app/',
-            js_dest: 'app/js/_vendor/',
-            css_dest: 'app/css/_vendor/',
-            fonts_dest: 'app/fonts/',
-            options: {
-              expand: true,
-              keepExpandedHierarchy: false,
-              packageSpecific: {
-                'bootstrap': {
-                  keepExpandedHierarchy: false,
-                  stripGlobBase: true,
-                  files: [
-                  'dist/css/bootstrap.css',
-                  'dist/js/bootstrap.min.js',
-                  'themes/base/minified/**'
-                  ]
+      shell: {
+        start: {
+          command: 'npm start'
+        }
+      },
+      bower: {
+        dev: {
+          dest: 'app/',
+          js_dest: 'app/js/_vendor/',
+          css_dest: 'app/css/_vendor/',
+          fonts_dest: 'app/fonts/',
+          options: {
+            expand: true,
+            keepExpandedHierarchy: false,
+            packageSpecific: {
+              'bootstrap': {
+                keepExpandedHierarchy: false,
+                stripGlobBase: true,
+                files: [
+                'dist/css/bootstrap.css',
+                'dist/js/bootstrap.min.js',
+                'themes/base/minified/**'
+                ]
               },
               'font-awesome': {
-                  expand: false,
-                  css_dest: 'app/css/',
-                  keepExpandedHierarchy: false,
-                  stripGlobBase: true,
-                  files: [
-                  'css/font-awesome.min.css',
-                  'fonts/*'
-                  ]
+                expand: false,
+                css_dest: 'app/css/',
+                keepExpandedHierarchy: false,
+                stripGlobBase: true,
+                files: [
+                'css/font-awesome.min.css',
+                'fonts/*'
+                ]
               }
+            }
           }
-      }
-  }
-},
-sass: {
-    dist: {
-        options: {
+        }
+      },
+      sass: {
+        dist: {
+          options: {
             style: 'compressed',
             sourcemap: 'none'
-        },
-        files: [{
+          },
+          files: [{
             expand: true,
             cwd: 'app/scss',
             src: ['*.scss'],
             dest: 'app/css',
             ext: '.css'
-        }]
-    }
-},
-watch: {
-    css: {
-      files: ['app/scss/**/*.scss'],
-      tasks: ['sass'],
-  }
-},
-nwjs: {
-    options: {
-        cacheDir: './build/cache',
-        macIcns: './app-icon.icns',
-        winIco: './app-icon.ico',
-        version: '0.25.1',
-        flavor: 'normal',
+          }]
+        }
+      },
+      watch: {
+        css: {
+          files: ['app/scss/**/*.scss'],
+          tasks: ['sass'],
+        }
+      },
+      nwjs: {
+        options: {
+          cacheDir: './build/cache',
+          macIcns: './app-icon.icns',
+          winIco: './app-icon.ico',
+          version: '0.26.1',
+          flavor: 'normal',
                 buildDir: './builds', // Where the build version your app is saved
-            },
+              },
             src: ['./package.json', './app/**/*', '!./app/scss/**/**'].concat(modules) // Your NW.js app
-        }
-    });
+          }
+        });
 
     grunt.loadNpmTasks('grunt-nw-builder');
     grunt.loadNpmTasks('grunt-shell');
@@ -97,32 +97,32 @@ nwjs: {
     grunt.registerTask('default', ['sass','shell']);
     grunt.registerTask('bowerc', ['bower','sass']);
     grunt.registerTask('build', 'Custom build task.', function (platform) {
-        var platforms = [];
+      var platforms = [];
         // If no platform where specified, determine current platform
         if (arguments.length === 0) {
-            if (process.platform === 'darwin') platforms.push('osx64')
-                else if (process.platform === 'win32') platforms.push('win')
-                    else if (process.arch === 'ia32') platforms.push('linux32')
-                        else if (process.arch === 'x64') platforms.push('linux64')
+          if (process.platform === 'darwin') platforms.push('osx64')
+            else if (process.platform === 'win32') platforms.push('win')
+              else if (process.arch === 'ia32') platforms.push('linux32')
+                else if (process.arch === 'x64') platforms.push('linux64')
 
-                    } else {
-                        if (platform === 'win') platforms.push('win')
-                            if (platform === 'mac') platforms.push('osx64')
-                                if (platform === 'linux32') platforms.push('linux32')
-                                    if (platform === 'linux34') platforms.push('linux64')
+              } else {
+                if (platform === 'win') platforms.push('win')
+                  if (platform === 'mac') platforms.push('osx64')
+                    if (platform === 'linux32') platforms.push('linux32')
+                      if (platform === 'linux34') platforms.push('linux64')
 
             // Build for All platforms
-        if (platform === 'all') platforms = ['win', 'osx64', 'linux32', 'linux64']
+          if (platform === 'all') platforms = ['win', 'osx64', 'linux32', 'linux64']
 
-    }
+        }
 
 
-if (platforms) {
-    grunt.config('nwjs.options.platforms', platforms);
-}
+      if (platforms) {
+        grunt.config('nwjs.options.platforms', platforms);
+      }
 
-grunt.task.run(['sass']);
-grunt.task.run(['nwjs']);
+      grunt.task.run(['sass']);
+      grunt.task.run(['nwjs']);
 
-});
-};
+    });
+  };
diff --git a/app/config.html b/app/config.html
@@ -18,7 +18,7 @@
 				<td>
 					<div class="config-option">
 						<input type="checkbox" ng-model="hideAtLaunch" id="show-at-open"/>
-						<label for="show-at-open">Hide at launch</label>
+						<label for="show-at-open">Hide at launch (always)</label>
 					</div>
 
 					<div class="config-option">
@@ -33,7 +33,8 @@
 					<div class="config-option">
 						<label for="wall_provider" class="block">Provider:</label>
 						<div class="select-wrapper">
-							<select ng-model="wall_provider" id="wall_provider" ng-options="wprovider.name for wprovider in wproviders">
+							<select ng-model="selectedProviders" id="wall_provider" multiple="multiple" ng-change="providersChanged()" size="{{wproviders.length}}">
+								<option value="{{key}}" ng-selected="value.status" ng-repeat="(key, value) in wproviders">{{value.name}}</option>
 							</select>
 						</div>
 					</div>
@@ -51,6 +52,14 @@
 			<tr id="advanced">
 				<td><h2>Advanced options:</h2></td>
 				<td>
+					<div class="config-option" style="padding-top: 5px; padding-bottom: 15px">
+						<label>Magic Shortcut:</label>
+						<div style="margin-top: 5px"></div>
+						<input type="text" ng-model="magicShortcut" id="magicShortcut" readonly="readonly" />
+						<button ng-click="record_shortcut()" ng-class="{'red': magicShortcut_recording}">{{ !magicShortcut_recording ? 'Record' : '...' }}</button>
+						<span class="info">Blur input to cancel record or save. Restart app for try your custom shortcut!</span>
+					</div>
+
 					<div class="config-option">
 						<button style="display: block" ng-click="deleteCache()">Delete cache</button>
 						<span class="info">If you have set a ranwallpaper, it may not be established when restart the computer.</span>
@@ -63,6 +72,7 @@
 	<script src="js/_vendor/angular-random-string/angular-random-string.js"></script>
 	<script src="js/_vendor/angular-local-storage/angular-local-storage.js"></script>
 	<script type="text/javascript" src="js/app.js"></script>
+	<script type="text/javascript" src="js/configController.js"></script>
 	<script type="text/javascript" src="js/win.js"></script>
 	<script type="text/javascript" src="js/updater.js"></script>
 	<script type="text/javascript" src="js/wall.js"></script>

diff --git a/app/index.html b/app/index.html
@@ -33,6 +33,7 @@ <h2>Error trying load wallpaper</h2>
     <script src="js/_vendor/angular-random-string/angular-random-string.js"></script>
     <script src="js/_vendor/angular-local-storage/angular-local-storage.js"></script>
     <script src="js/app.js"></script>
+    <script src="js/mainController.js"></script>
     <script src="js/win.js"></script>
     <script src="js/wall.js"></script>
     <script src="js/updater.js"></script>