Cleanup of previous merge

Author: andersevenrud

src/packages/default/CoreWM/locales.js

@@ -42,6 +42,8 @@
       'Create shortcut' : 'Lag snarvei',
       'Set as wallpaper' : 'Sett som bakgrunn',
       'An error occured while creating PanelItem: {0}' : 'En feil oppstod under lasting av PanelItem: {0}',
+      'Show Icons' : 'Vis Ikoner',
+      'Hide Icons' : 'Skjul Ikoner',
 
       'Development' : 'Utvikling',
       'Education' : 'Utdanning',

src/packages/default/CoreWM/main.js

@@ -841,26 +841,29 @@
 
   CoreWM.prototype.openDesktopMenu = function(ev) {
     var self = this;
-    var _openDesktopSettings = function() {
-      self.showSettings();
-    };
-    var _enableIconView = function() {
-       var settings = {enableIconView: true};
-       var wm = OSjs.Core.getWindowManager();
-       wm.applySettings(settings, false, true);
-    };
-    var _disableIconView = function() {
-       var settings = {enableIconView: false};
-       var wm = OSjs.Core.getWindowManager();
-       wm.applySettings(settings, false, true);
-    };
-    var wm = OSjs.Core.getWindowManager();
-    var enabled = wm.getSetting('enableIconView') === true;
-    if (enabled) {
-    	OSjs.API.createMenu([{title: OSjs.Applications.CoreWM._('Hide Icon'), onClick: function(ev) {_disableIconView();}}, {title: OSjs.Applications.CoreWM._('Open settings'), onClick: function(ev) {_openDesktopSettings();}}], {x: ev.clientX, y: ev.clientY});
+    var menu = [
+      {title: OSjs.Applications.CoreWM._('Open settings'), onClick: function(ev) {
+        self.showSettings();
+      }}
+    ];
+
+    if ( this.getSetting('enableIconView') === true ) {
+      menu.push({
+        title: OSjs.Applications.CoreWM._('Hide Icons'),
+        onClick: function(ev) {
+         self.applySettings({enableIconView: false}, false, true);
+        }
+      });
     } else {
-    	OSjs.API.createMenu([{title: OSjs.Applications.CoreWM._('Show Icon'), onClick: function(ev) {_enableIconView();}}, {title: OSjs.Applications.CoreWM._('Open settings'), onClick: function(ev) {_openDesktopSettings();}}], {x: ev.clientX, y: ev.clientY});
+      menu.push({
+        title: OSjs.Applications.CoreWM._('Show Icons'),
+        onClick: function(ev) {
+         self.applySettings({enableIconView: true}, false, true);
+        }
+      });
     }
+
+    API.createMenu(menu, ev);
   };
 
   CoreWM.prototype.applySettings = function(settings, force, save) {

src/packages/default/CoreWM/panel.js

@@ -60,6 +60,27 @@
 
   Panel.prototype.init = function(root) {
     var self = this;
+    var wm = OSjs.Core.getWindowManager();
+
+    function createMenu(ev) {
+      var menu = [
+        {title: OSjs.Applications.CoreWM._('Open Panel Settings'), onClick: function(ev) {
+          wm.showSettings('panel');
+        }}
+      ];
+
+      if ( wm.getSetting('useTouchMenu') === true ) {
+        menu.push({title: OSjs.Applications.CoreWM._('Turn off TouchMenu'), onClick: function(ev) {
+          wm.applySettings({useTouchMenu: false}, false, true);
+        }});
+      } else {
+        menu.push({title: OSjs.Applications.CoreWM._('Turn on TouchMenu'), onClick: function(ev) {
+          wm.applySettings({useTouchMenu: true}, false, true);
+        }});
+      }
+
+      API.createMenu(menu, ev);
+    }
 
     this._$container = document.createElement('corewm-panel-container');
     this._$element = document.createElement('corewm-panel');
@@ -78,28 +99,7 @@
       OSjs.API.blurMenu();
     };
     this._$element.oncontextmenu = function(ev) {
-      var wm = OSjs.Core.getWindowManager();
-      var enabled = wm.getSetting('useTouchMenu') === true;
-      if (enabled) {
-        OSjs.API.createMenu([{title: OSjs.Applications.CoreWM._('Open Panel Settings'), onClick: function(ev) {
-          var wm = OSjs.Core.getWindowManager();
-          if ( wm ) {
-            wm.showSettings('panel');
-          }}},{title: OSjs.Applications.CoreWM._('Turn off TouchMenu'), onClick: function(ev) {
-            var settings = {useTouchMenu: false};
-            var wm = OSjs.Core.getWindowManager();
-            wm.applySettings(settings, false, true);
-          }}], {x: ev.clientX, y: ev.clientY});
-      } else {
-        OSjs.API.createMenu([{title: OSjs.Applications.CoreWM._('Open Panel Settings'), onClick: function(ev) {
-          var wm = OSjs.Core.getWindowManager();
-          if ( wm ) {
-            wm.showSettings('panel');
-          }}},{title: OSjs.Applications.CoreWM._('Turn on TouchMenu'), onClick: function(ev) {
-            var settings = {useTouchMenu: true};
-            var wm = OSjs.Core.getWindowManager();
-            wm.applySettings(settings, false, true);
-          }}], {x: ev.clientX, y: ev.clientY});}
+      createMenu(ev);
       return false;
     };
 

src/packages/default/Settings/main.js

@@ -175,14 +175,15 @@
   // WINDOWS
   /////////////////////////////////////////////////////////////////////////////
 
-  function ApplicationSettingsWindow(app, metadata, scheme) {
+  function ApplicationSettingsWindow(app, metadata, scheme, category) {
     Window.apply(this, ['ApplicationSettingsWindow', {
       icon: metadata.icon,
       title: metadata.name,
       width: 500,
       height: 500
     }, app, scheme]);
 
+    this.category = category;
     this.settings = {};
     this.panelItems = [];
   }
@@ -248,7 +249,8 @@
     this.initUserTab(wm, scheme);
     this.initPackagesTab(wm, scheme);
 
-    setContainer(0);
+    var cat = this.category === 'panel' ? 2 : 0;
+    setContainer(cat);
 
     return root;
   };
@@ -741,8 +743,9 @@
     var self = this;
     var url = API.getApplicationResource(this, './scheme.html');
     var scheme = GUI.createScheme(url);
+    var category = this._getArgument('category');
     scheme.load(function(error, result) {
-      self._addWindow(new ApplicationSettingsWindow(self, metadata, scheme));
+      self._addWindow(new ApplicationSettingsWindow(self, metadata, scheme, category));
 
       onInited();
     });