Sync with Debian. Remaining changes:
* Sync with Debian. Remaining changes:
- apps-menu with multiple levels
Sophie Brun
8 years ago
|
0 |
gnome-shell-extensions (3.18.4-1kali1) kali-dev; urgency=medium
|
|
1 |
|
|
2 |
* Sync with Debian. Remaining changes:
|
|
3 |
- apps-menu with multiple levels
|
|
4 |
|
|
5 |
-- Sophie Brun <[email protected]> Fri, 18 Mar 2016 15:47:43 +0100
|
|
6 |
|
| 0 | 7 |
gnome-shell-extensions (3.18.4-1) unstable; urgency=medium
|
| 1 | 8 |
|
| 2 | 9 |
* New upstream release.
|
| 208 | 208 |
continue;
|
| 209 | 209 |
}
|
| 210 | 210 |
let app = appSys.lookup_app(id);
|
| 211 | |
- if (app.get_app_info().should_show())
|
|
211 |
- if (app && app.get_app_info().should_show())
|
| 212 | 212 |
- this.applicationsByCategory[categoryId].push(app);
|
| 213 | 213 |
+ if (app.get_app_info().should_show()) {
|
| 214 | 214 |
+ let menu_id = dir.get_menu_id();
|
| 215 | 215 |
+ this.applicationsByCategory[menu_id].push(app);
|
| 216 | |
+ }
|
|
216 |
+ }
|
| 217 | 217 |
} else if (nextType == GMenu.TreeItemType.DIRECTORY) {
|
| 218 | 218 |
let subdir = iter.get_directory();
|
| 219 | 219 |
- if (!subdir.get_is_nodisplay())
|
|
| 227 | 227 |
+ categoryMenuItem = new CategoryMenuItem(this, subdir);
|
| 228 | 228 |
+ if (this.applicationsByCategory[menu_id].length > 0 || !categoryMenuItem.menu.isEmpty()) {
|
| 229 | 229 |
+ parentCategory.menu.addMenuItem(categoryMenuItem);
|
| 230 | |
+ }
|
| 231 | |
+ }
|
|
230 |
+ }
|
|
231 |
+ }
|
| 232 | 232 |
}
|
| 233 | 233 |
}
|
| 234 | 234 |
},
|