sync

CHANGELOG.md

@@ -1,5 +1,32 @@
 Changelog
 
+### 4.1.2
+
+  * Fixed a bug that can prevent pinned apps from being dragged.
+  * Corrected the icon padding looking off-centered in some themes.
+  * Updated translations.
+
+### 4.1.1
+
+  * Added a new option allowing you to apply the monitor move option to all windows.
+  * Fixed a bug that prevents some users from using the settings dialog.
+
+### 4.1.0
+
+  * Fixed the wrong windows appearing active when switching to a new workspace while the group apps option is disabled.
+  * Fixed window thumbnails not sorting by last active window when the sort thumbnails option is enabled.
+  * The default icon padding is now more dependent on the theme's icon padding, and it will reset when changing themes
+  * New feature by [zqq90](https://github.com/jaszhix/icingtaskmanager/pull/64):
+    * Added a new assignable hotkey to show the order of apps with Super + ` by default.
+
+### 4.0.9
+
+  * Bulgarian translation added by [AdmiralAnimE](https://github.com/jaszhix/icingtaskmanager/commit/5e59cb1595c600db135cb8f841f167598708d565).
+
+### 4.0.8
+
+  * Simplified Chinese translation added by [zqq90](https://github.com/jaszhix/icingtaskmanager/pull/60).
+
 ### 4.0.7
 
   * German translation corrections by [NoXPhasma](https://github.com/jaszhix/icingtaskmanager/pull/59).

CREDITS.md

@@ -4,7 +4,11 @@ Special thanks to the contributors of this project.
 
 ### Pull requests
 
+  *  AdmiralAnimE:
+    * https://github.com/jaszhix/icingtaskmanager/commit/5e59cb1595c600db135cb8f841f167598708d565
   * zqq90:
+    * https://github.com/jaszhix/icingtaskmanager/pull/64
+    * https://github.com/jaszhix/icingtaskmanager/pull/60
     * https://github.com/jaszhix/icingtaskmanager/pull/58
     * https://github.com/jaszhix/icingtaskmanager/pull/57
   * NoXPhasma:

importPinned.py

@@ -38,6 +38,8 @@ def importConfig():
                             ('icon-padding', config['icon-padding']),
                             ('enable-iconSize', config['enable-iconSize']),
                             ('icon-size', config['icon-size']),
+                            ('show-apps-order-hotkey', config['show-apps-order-hotkey']),
+                            ('show-apps-order-timeout', config['show-apps-order-timeout']),
                             ('HoverPeek', config['HoverPeek']),
                             ('seperator2', config['seperator2']),
                             ('enable-hover-peek', config['enable-hover-peek']),
@@ -57,8 +59,9 @@ def importConfig():
                             ('AppMenu', config['AppMenu']),
                             ('seperator4', config['seperator4']),
                             ('show-recent', config['show-recent']),
-                            ('autostart-menu-item', config['autostart-menu-item']),
                             ('firefox-menu', config['firefox-menu']),
+                            ('autostart-menu-item', config['autostart-menu-item']),
+                            ('monitor-move-all-windows', config['monitor-move-all-windows']),
                             ('__md5__', config['__md5__']),
                             ])
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "icingtaskmanager",
-  "version": "4.0.7",
+  "version": "4.1.2",
   "description": "Icing Task Manager",
   "main": "gulpfile.js",
   "scripts": {

src/appGroup.js

@@ -379,9 +379,11 @@ AppGroup.prototype = {
   // updates the internal list of metaWindows
   // to include all windows corresponding to this.app on the workspace
   // metaWorkspace
-  _updateMetaWindows: function (metaWorkspace, app=null, window=null) {
+  _updateMetaWindows: function (metaWorkspace, app=null, window=null, _wsWindows=null) {
     // Get a list of all interesting windows that are part of this app on the current workspace
-    var windowsSource = window ? [window] : metaWorkspace.list_windows()
+    var wsWindows = _wsWindows ? _wsWindows : metaWorkspace.list_windows();
+    var windowsSource = window ? [window] : wsWindows;
+
     var filterArgs = _.isEqual(app, this.app)
     var windowList = _.filter(windowsSource, (win)=>{
       if (!app) {
@@ -475,6 +477,7 @@ AppGroup.prototype = {
         }
 
         this.hoverMenu.setMetaWindow(this.lastFocused, this.metaWindows)
+        this._appButton.setMetaWindow(this.lastFocused, this.metaWindows)
 
       }
 
@@ -537,6 +540,7 @@ AppGroup.prototype = {
         if (this.rightClickMenu !== undefined) {
           this.rightClickMenu.setMetaWindow(this.lastFocused, this.metaWindows)
         }
+        this._appButton.setMetaWindow(this.lastFocused, this.metaWindows)
       } else if (this.isFavapp) {
         setTimeout(()=>this._applet.refreshAppFromCurrentListById(this.appId, {favChange: true, isFavapp: this.isFavapp}), 0)
       }

src/appList.js

@@ -287,10 +287,10 @@ AppList.prototype = {
       refApp = -1
     }
 
-    var initApp = (window=null, index=null)=>{
+    var initApp = (wsWindows, window=null, index=null)=>{
       var time = Date.now()
       let appGroup = new AppGroup.AppGroup(this._applet, this, app, isFavapp, window, time, index, appId)
-      appGroup._updateMetaWindows(metaWorkspace, app, window)
+      appGroup._updateMetaWindows(metaWorkspace, app, window, wsWindows)
       appGroup.watchWorkspace(metaWorkspace) // disable for windows to stay persistent across ws'
 
       app.connect_after('windows-changed', Lang.bind(this, this._onAppWindowsChanged, app))
@@ -312,10 +312,13 @@ AppList.prototype = {
         initApp()
       } else {
         var windows = app.get_windows()
+        var wsWindows = metaWorkspace.list_windows();
+        windows = _.intersectionWith(windows, wsWindows, _.isEqual);
+
         var _windows = windows.length > 0 ? windows : [null]
 
         for (let i = 0, len = _windows.length; i < len; i++) {
-          initApp(_windows[i], i)
+          initApp(wsWindows, _windows[i], i)
         }
       }
     }

src/applet.js

@@ -297,6 +297,8 @@ MyApplet.prototype = {
       {key: 'group-apps', value: 'groupApps', cb: this.refreshCurrentAppList},
       {key: 'arrange-pinnedApps', value: 'arrangePinned', cb: null},
       {key: 'pinned-apps', value: 'pinnedApps', cb: null},
+      {key: 'show-apps-order-hotkey', value: 'showAppsOrderHotkey', cb: this._bindAppKey},
+      {key: 'show-apps-order-timeout', value: 'showAppsOrderTimeout', cb: null},
       {key: 'enable-hover-peek', value: 'enablePeek', cb: null},
       {key: 'onclick-thumbnails', value: 'onclickThumbs', cb: null},
       {key: 'hover-peek-opacity', value: 'peekOpacity', cb: null},
@@ -316,10 +318,9 @@ MyApplet.prototype = {
       {key: 'enable-iconSize', value: 'enableIconSize', cb: this.refreshCurrentAppList},
       {key: 'icon-size', value: 'iconSize', cb: null},
       {key: 'show-recent', value: 'showRecent', cb: this.refreshCurrentAppList},
-      {key: 'autostart-menu-item', value: 'autoStart', cb: this.refreshCurrentAppList},
       {key: 'firefox-menu', value: 'firefoxMenu', cb: this.refreshCurrentAppList},
-      {key: 'show-apps-order-hotkey', value: 'showAppsOrderHotkey', cb: this._bindAppKey},
-      {key: 'show-apps-order-timeout', value: 'showAppsOrderTimeout', cb: null}
+      {key: 'autostart-menu-item', value: 'autoStart', cb: this.refreshCurrentAppList},
+      {key: 'monitor-move-all-windows', value: 'monitorMoveAllWindows', cb: this.refreshCurrentAppList},
     ]
 
     if (this.c32) {
@@ -361,6 +362,7 @@ MyApplet.prototype = {
     this.signals.connect(Main.overview, 'hiding', this._onOverviewHide)
     this.signals.connect(Main.expo, 'showing', this._onOverviewShow)
     this.signals.connect(Main.expo, 'hiding', this._onOverviewHide)
+    this.signals.connect(Main.themeManager, 'theme-set', this.onThemeChange)
 
     this._dragPlaceholder = null
     this._dragPlaceholderPos = -1
@@ -431,6 +433,10 @@ MyApplet.prototype = {
     return this.metaWorkspaces[this.currentWs].appList
   },
 
+  onThemeChange(e){
+    this.refreshCurrentAppList();
+  },
+
   getAutostartApps(){
     var info