diff --git a/debian/changelog b/debian/changelog index ba538b6..e5573ab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +gnome-shell-extensions (3.26.2-1kali1) kali-dev; urgency=medium + + * Sync with Debian. Remaining changes: + - apps-menu with multiple levels + + -- Sophie Brun Mon, 06 Nov 2017 16:04:03 +0100 + gnome-shell-extensions (3.26.2-1) unstable; urgency=medium * New upstream release diff --git a/debian/patches/apps-menu-with-multiple-levels.patch b/debian/patches/apps-menu-with-multiple-levels.patch index 3de12f4..91e81f4 100644 --- a/debian/patches/apps-menu-with-multiple-levels.patch +++ b/debian/patches/apps-menu-with-multiple-levels.patch @@ -5,7 +5,7 @@ --- a/extensions/apps-menu/extension.js +++ b/extensions/apps-menu/extension.js -@@ -92,10 +92,9 @@ const ApplicationMenuItem = new Lang.Cla +@@ -124,10 +124,9 @@ const ApplicationMenuItem = new Lang.Cla const CategoryMenuItem = new Lang.Class({ Name: 'CategoryMenuItem', @@ -17,7 +17,7 @@ this._category = category; this._button = button; -@@ -108,8 +107,121 @@ const CategoryMenuItem = new Lang.Class( +@@ -140,8 +139,121 @@ const CategoryMenuItem = new Lang.Class( else name = _("Favorites"); @@ -141,7 +141,7 @@ }, activate: function(event) { -@@ -201,12 +313,29 @@ const CategoryMenuItem = new Lang.Class( +@@ -233,12 +345,29 @@ const CategoryMenuItem = new Lang.Class( setActive: function(active, params) { if (active) { this._button.selectCategory(this._category, this); @@ -172,7 +172,7 @@ const ApplicationsMenu = new Lang.Class({ Name: 'ApplicationsMenu', Extends: PopupMenu.PopupMenu, -@@ -292,7 +421,7 @@ const ApplicationsButton = new Lang.Clas +@@ -473,7 +602,7 @@ const ApplicationsButton = new Lang.Clas this._installedChangedId = appSys.connect('installed-changed', Lang.bind(this, function() { if (this.menu.isOpen) { this._redisplay(); @@ -181,7 +181,7 @@ } else { this.reloadFlag = true; } -@@ -371,7 +500,8 @@ const ApplicationsButton = new Lang.Clas +@@ -546,7 +675,8 @@ const ApplicationsButton = new Lang.Clas this._redisplay(); this.reloadFlag = false; } @@ -191,7 +191,7 @@ } this.parent(menu, open); }, -@@ -387,11 +517,11 @@ const ApplicationsButton = new Lang.Clas +@@ -562,11 +692,11 @@ const ApplicationsButton = new Lang.Clas _redisplay: function() { this.applicationsBox.destroy_all_children(); @@ -205,7 +205,7 @@ let iter = dir.iter(); let nextType; while ((nextType = iter.next()) != GMenu.TreeItemType.INVALID) { -@@ -406,12 +536,24 @@ const ApplicationsButton = new Lang.Clas +@@ -581,12 +711,24 @@ const ApplicationsButton = new Lang.Clas let app = appSys.lookup_app(id); if (!app) app = new Shell.App({ app_info: entry.get_app_info() }); @@ -234,7 +234,7 @@ } } }, -@@ -432,8 +574,8 @@ const ApplicationsButton = new Lang.Clas +@@ -607,8 +749,8 @@ const ApplicationsButton = new Lang.Clas }, scrollToCatButton: function(button) { @@ -245,7 +245,7 @@ let currentScrollValue = catsScrollBoxAdj.get_value(); let boxHeight = catsScrollBoxAlloc.y2 - catsScrollBoxAlloc.y1; let buttonAlloc = button.actor.get_allocation_box(); -@@ -447,10 +589,16 @@ const ApplicationsButton = new Lang.Clas +@@ -622,10 +764,16 @@ const ApplicationsButton = new Lang.Clas }, _createLayout: function() { @@ -264,7 +264,7 @@ this.applicationsScrollBox = new St.ScrollView({ x_fill: true, y_fill: false, y_align: St.Align.START, style_class: 'apps-menu vfade' }); -@@ -462,41 +610,55 @@ const ApplicationsButton = new Lang.Clas +@@ -637,41 +785,54 @@ const ApplicationsButton = new Lang.Clas vscroll.connect('scroll-stop', Lang.bind(this, function() { this.menu.passEvents = false; })); @@ -291,8 +291,8 @@ this.applicationsBox = new St.BoxLayout({ vertical: true }); this.applicationsScrollBox.add_actor(this.applicationsBox); - this.categoriesBox = new St.BoxLayout({ vertical: true }); -- this.categoriesScrollBox.add_actor(this.categoriesBox, { expand: true, x_fill: false }); - +- this.categoriesScrollBox.add_actor(this.categoriesBox); +- - this.mainBox.add(this.leftBox); - this.mainBox.add(this._createVertSeparator(), { expand: false, x_fill: false, y_fill: true}); - this.mainBox.add(this.applicationsScrollBox, { expand: true, x_fill: true, y_fill: true }); @@ -303,7 +303,7 @@ + this.menu.passEvents = true; + })); + vscroll.connect('scroll-stop', Lang.bind(this, function() { -+ this.menu.passEvents = false; ++ this.menu.passEvents = false; + })); + this.leftBox.addMenuItem(this.categoriesBox); + // FIXME we re-add it to apply the right properties, but re-adding @@ -337,7 +337,7 @@ }, _display: function() { - this._applicationsButtons = new Array(); + this._applicationsButtons.clear(); - this.mainBox.style=('width: 35em;'); - this.mainBox.hide(); + this.mainBox.actor.style=('width: 35em;'); @@ -345,7 +345,7 @@ //Load categories this.applicationsByCategory = {}; -@@ -504,7 +666,7 @@ const ApplicationsButton = new Lang.Clas +@@ -679,7 +840,7 @@ const ApplicationsButton = new Lang.Clas tree.load_sync(); let root = tree.get_root_directory(); let categoryMenuItem = new CategoryMenuItem(this, null); @@ -354,7 +354,7 @@ let iter = root.iter(); let nextType; while ((nextType = iter.next()) != GMenu.TreeItemType.INVALID) { -@@ -513,10 +675,12 @@ const ApplicationsButton = new Lang.Clas +@@ -688,10 +849,12 @@ const ApplicationsButton = new Lang.Clas if (!dir.get_is_nodisplay()) { let categoryId = dir.get_menu_id(); this.applicationsByCategory[categoryId] = []; @@ -371,7 +371,7 @@ } } } -@@ -525,8 +689,9 @@ const ApplicationsButton = new Lang.Clas +@@ -700,8 +863,9 @@ const ApplicationsButton = new Lang.Clas //Load applications this._displayButtons(this._listApplications(null));