From 08d9ade02c810f35c2a38de56de0b21598a307c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Wed, 26 May 2021 22:01:06 +0200 Subject: [PATCH] Fix various issues in downstream patches - don't duplicate logo in apps-menu in non-classic session - adjust panel-favorites, updates-dialog and systemMonitor extensions to GNOME 40 - apply style changes to pre-generated CSS Resolves: #1932261 --- 0001-Update-style.patch | 14 + ...u-add-logo-icon-to-Applications-menu.patch | 35 +- add-extra-extensions.patch | 531 +++++++++--------- gnome-shell-extensions.spec | 6 +- resurrect-system-monitor.patch | 524 ++++++++++++----- 5 files changed, 691 insertions(+), 419 deletions(-) diff --git a/0001-Update-style.patch b/0001-Update-style.patch index 5f821c9..9730bcc 100644 --- a/0001-Update-style.patch +++ b/0001-Update-style.patch @@ -24,6 +24,20 @@ index 1f46507..ad638b2 100644 // status area icons .system-status-icon { icon-size: $base_icon_size; +diff --git a/data/gnome-classic.css b/data/gnome-classic.css +index f4826de..ad71bf6 100644 +--- a/data/gnome-classic.css ++++ b/data/gnome-classic.css +@@ -1234,6 +1234,9 @@ StScrollBar { + box-shadow: none; } + #panel .panel-button:hover.clock-display .clock, #panel .panel-button:active.clock-display .clock, #panel .panel-button:overview.clock-display .clock, #panel .panel-button:focus.clock-display .clock, #panel .panel-button:checked.clock-display .clock { + box-shadow: inset 0 0 0 100px rgba(255, 255, 255, 0.2); } ++ #panel .panel-button .panel-logo-icon { ++ padding-right: .4em; ++ icon-size: 1em; } + #panel .panel-button .system-status-icon { + icon-size: 1.09em; + padding: 5px; -- 2.28.0 diff --git a/0001-apps-menu-add-logo-icon-to-Applications-menu.patch b/0001-apps-menu-add-logo-icon-to-Applications-menu.patch index 1f4bf6f..ac8df4b 100644 --- a/0001-apps-menu-add-logo-icon-to-Applications-menu.patch +++ b/0001-apps-menu-add-logo-icon-to-Applications-menu.patch @@ -1,15 +1,15 @@ -From 3fd6013393765bd8f1350da6e64b86a0961be9cd Mon Sep 17 00:00:00 2001 +From a28e752ac10f9882d33a52189fc237d11d541fed Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Tue, 21 Jan 2014 16:48:17 -0500 Subject: [PATCH] apps-menu: add logo icon to Applications menu Brand requested it. --- - extensions/apps-menu/extension.js | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) + extensions/apps-menu/extension.js | 22 +++++++++++++++++++++- + 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/extensions/apps-menu/extension.js b/extensions/apps-menu/extension.js -index 6376b52..17285fd 100644 +index 6376b524..1b1f01f1 100644 --- a/extensions/apps-menu/extension.js +++ b/extensions/apps-menu/extension.js @@ -363,13 +363,24 @@ class ApplicationsButton extends PanelMenu.Button { @@ -22,7 +22,7 @@ index 6376b52..17285fd 100644 + '/usr/share/icons/hicolor/scalable/apps/start-here.svg'); + this._icon = new St.Icon({ + gicon: new Gio.FileIcon({ file: iconFile }), -+ style_class: 'panel-logo-icon' ++ style_class: 'panel-logo-icon', + }); + hbox.add_actor(this._icon); + @@ -38,6 +38,29 @@ index 6376b52..17285fd 100644 this.name = 'panelApplications'; this.label_actor = this._label; +@@ -403,6 +414,14 @@ class ApplicationsButton extends PanelMenu.Button { + this._display(); + this._installedChangedId = appSys.connect('installed-changed', + this._onTreeChanged.bind(this)); ++ this._sessionUpdatedId = Main.sessionMode.connect('updated', ++ this._sessionUpdated.bind(this)); ++ this._sessionUpdated(); ++ } ++ ++ _sessionUpdated() { ++ this._icon.visible = ++ !Main.sessionMode.panel.left.includes('activities'); + } + + _onTreeChanged() { +@@ -428,6 +447,7 @@ class ApplicationsButton extends PanelMenu.Button { + + Main.overview.disconnect(this._showingId); + Main.overview.disconnect(this._hidingId); ++ Main.sessionMode.disconnect(this._sessionUpdatedId); + appSys.disconnect(this._installedChangedId); + this._tree.disconnect(this._treeChangedId); + this._tree = null; -- -2.28.0 +2.31.1 diff --git a/add-extra-extensions.patch b/add-extra-extensions.patch index 66a0fc2..05ddd50 100644 --- a/add-extra-extensions.patch +++ b/add-extra-extensions.patch @@ -1,4 +1,4 @@ -From 8c26a7c56c37dc0a1dea388aa8c1cc906889dca9 Mon Sep 17 00:00:00 2001 +From 5acb15db24dc404ac6752b0d42b23915a3cf965b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Wed, 20 May 2015 17:44:50 +0200 Subject: [PATCH 1/5] Add top-icons extension @@ -17,7 +17,7 @@ Subject: [PATCH 1/5] Add top-icons extension diff --git a/extensions/top-icons/extension.js b/extensions/top-icons/extension.js new file mode 100644 -index 0000000..a8eec13 +index 00000000..a8eec13c --- /dev/null +++ b/extensions/top-icons/extension.js @@ -0,0 +1,96 @@ @@ -119,7 +119,7 @@ index 0000000..a8eec13 +} diff --git a/extensions/top-icons/meson.build b/extensions/top-icons/meson.build new file mode 100644 -index 0000000..48504f6 +index 00000000..48504f63 --- /dev/null +++ b/extensions/top-icons/meson.build @@ -0,0 +1,5 @@ @@ -130,7 +130,7 @@ index 0000000..48504f6 +) diff --git a/extensions/top-icons/metadata.json.in b/extensions/top-icons/metadata.json.in new file mode 100644 -index 0000000..f1e2436 +index 00000000..f1e2436f --- /dev/null +++ b/extensions/top-icons/metadata.json.in @@ -0,0 +1,10 @@ @@ -146,13 +146,13 @@ index 0000000..f1e2436 +} diff --git a/extensions/top-icons/stylesheet.css b/extensions/top-icons/stylesheet.css new file mode 100644 -index 0000000..25134b6 +index 00000000..25134b65 --- /dev/null +++ b/extensions/top-icons/stylesheet.css @@ -0,0 +1 @@ +/* This extensions requires no special styling */ diff --git a/meson.build b/meson.build -index 91cb683..c0097f8 100644 +index 91cb683c..c0097f82 100644 --- a/meson.build +++ b/meson.build @@ -45,6 +45,7 @@ all_extensions = default_extensions @@ -164,10 +164,10 @@ index 91cb683..c0097f8 100644 ] -- -2.28.0 +2.31.1 -From f88865d22ccce4bcb4b17afacde2cac4b5f0377c Mon Sep 17 00:00:00 2001 +From a806a66301cffc3426e9511abb9a9c69b9105d48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Wed, 20 May 2015 18:05:41 +0200 Subject: [PATCH 2/5] Add dash-to-dock extension @@ -303,7 +303,7 @@ Subject: [PATCH 2/5] Add dash-to-dock extension diff --git a/extensions/dash-to-dock/Settings.ui b/extensions/dash-to-dock/Settings.ui new file mode 100644 -index 0000000..d2560de +index 00000000..d2560de5 --- /dev/null +++ b/extensions/dash-to-dock/Settings.ui @@ -0,0 +1,2660 @@ @@ -2969,7 +2969,7 @@ index 0000000..d2560de + diff --git a/extensions/dash-to-dock/appIconIndicators.js b/extensions/dash-to-dock/appIconIndicators.js new file mode 100644 -index 0000000..f015a80 +index 00000000..f015a80f --- /dev/null +++ b/extensions/dash-to-dock/appIconIndicators.js @@ -0,0 +1,1078 @@ @@ -4053,7 +4053,7 @@ index 0000000..f015a80 +}; diff --git a/extensions/dash-to-dock/appIcons.js b/extensions/dash-to-dock/appIcons.js new file mode 100644 -index 0000000..d04230e +index 00000000..d04230e6 --- /dev/null +++ b/extensions/dash-to-dock/appIcons.js @@ -0,0 +1,1273 @@ @@ -5332,7 +5332,7 @@ index 0000000..d04230e +} diff --git a/extensions/dash-to-dock/dash.js b/extensions/dash-to-dock/dash.js new file mode 100644 -index 0000000..bac49c2 +index 00000000..bac49c25 --- /dev/null +++ b/extensions/dash-to-dock/dash.js @@ -0,0 +1,1072 @@ @@ -6410,7 +6410,7 @@ index 0000000..bac49c2 +} diff --git a/extensions/dash-to-dock/dbusmenuUtils.js b/extensions/dash-to-dock/dbusmenuUtils.js new file mode 100644 -index 0000000..0d2793d +index 00000000..0d2793d0 --- /dev/null +++ b/extensions/dash-to-dock/dbusmenuUtils.js @@ -0,0 +1,274 @@ @@ -6690,7 +6690,7 @@ index 0000000..0d2793d +} diff --git a/extensions/dash-to-dock/docking.js b/extensions/dash-to-dock/docking.js new file mode 100644 -index 0000000..daa9de5 +index 00000000..daa9de59 --- /dev/null +++ b/extensions/dash-to-dock/docking.js @@ -0,0 +1,1967 @@ @@ -8663,7 +8663,7 @@ index 0000000..daa9de5 +}; diff --git a/extensions/dash-to-dock/extension.js b/extensions/dash-to-dock/extension.js new file mode 100644 -index 0000000..4b43d77 +index 00000000..4b43d773 --- /dev/null +++ b/extensions/dash-to-dock/extension.js @@ -0,0 +1,21 @@ @@ -8690,7 +8690,7 @@ index 0000000..4b43d77 +} diff --git a/extensions/dash-to-dock/fileManager1API.js b/extensions/dash-to-dock/fileManager1API.js new file mode 100644 -index 0000000..64ec621 +index 00000000..64ec6219 --- /dev/null +++ b/extensions/dash-to-dock/fileManager1API.js @@ -0,0 +1,226 @@ @@ -8922,7 +8922,7 @@ index 0000000..64ec621 +} diff --git a/extensions/dash-to-dock/intellihide.js b/extensions/dash-to-dock/intellihide.js new file mode 100644 -index 0000000..9c10938 +index 00000000..9c10938e --- /dev/null +++ b/extensions/dash-to-dock/intellihide.js @@ -0,0 +1,321 @@ @@ -9249,7 +9249,7 @@ index 0000000..9c10938 +Signals.addSignalMethods(Intellihide.prototype); diff --git a/extensions/dash-to-dock/launcherAPI.js b/extensions/dash-to-dock/launcherAPI.js new file mode 100644 -index 0000000..55f44f7 +index 00000000..55f44f7a --- /dev/null +++ b/extensions/dash-to-dock/launcherAPI.js @@ -0,0 +1,281 @@ @@ -9536,7 +9536,7 @@ index 0000000..55f44f7 +} diff --git a/extensions/dash-to-dock/locations.js b/extensions/dash-to-dock/locations.js new file mode 100644 -index 0000000..7636ff4 +index 00000000..7636ff40 --- /dev/null +++ b/extensions/dash-to-dock/locations.js @@ -0,0 +1,293 @@ @@ -9835,7 +9835,7 @@ index 0000000..7636ff4 +Signals.addSignalMethods(Removables.prototype); diff --git a/extensions/dash-to-dock/media/glossy.svg b/extensions/dash-to-dock/media/glossy.svg new file mode 100644 -index 0000000..55b71ba +index 00000000..55b71baa --- /dev/null +++ b/extensions/dash-to-dock/media/glossy.svg @@ -0,0 +1,139 @@ @@ -9980,7 +9980,7 @@ index 0000000..55b71ba + diff --git a/extensions/dash-to-dock/media/highlight_stacked_bg.svg b/extensions/dash-to-dock/media/highlight_stacked_bg.svg new file mode 100644 -index 0000000..19be5a9 +index 00000000..19be5a9d --- /dev/null +++ b/extensions/dash-to-dock/media/highlight_stacked_bg.svg @@ -0,0 +1,82 @@ @@ -10068,7 +10068,7 @@ index 0000000..19be5a9 + diff --git a/extensions/dash-to-dock/media/highlight_stacked_bg_h.svg b/extensions/dash-to-dock/media/highlight_stacked_bg_h.svg new file mode 100644 -index 0000000..eeaa869 +index 00000000..eeaa8691 --- /dev/null +++ b/extensions/dash-to-dock/media/highlight_stacked_bg_h.svg @@ -0,0 +1,82 @@ @@ -10156,7 +10156,7 @@ index 0000000..eeaa869 + diff --git a/extensions/dash-to-dock/media/logo.svg b/extensions/dash-to-dock/media/logo.svg new file mode 100644 -index 0000000..eebd0b1 +index 00000000..eebd0b1d --- /dev/null +++ b/extensions/dash-to-dock/media/logo.svg @@ -0,0 +1,528 @@ @@ -12785,7 +12785,7 @@ HcmV?d00001 diff --git a/extensions/dash-to-dock/meson.build b/extensions/dash-to-dock/meson.build new file mode 100644 -index 0000000..35ba2ec +index 00000000..35ba2ecf --- /dev/null +++ b/extensions/dash-to-dock/meson.build @@ -0,0 +1,27 @@ @@ -12818,7 +12818,7 @@ index 0000000..35ba2ec +install_subdir('media', install_dir: join_paths(extensiondir, uuid)) diff --git a/extensions/dash-to-dock/metadata.json.in b/extensions/dash-to-dock/metadata.json.in new file mode 100644 -index 0000000..641a935 +index 00000000..641a935c --- /dev/null +++ b/extensions/dash-to-dock/metadata.json.in @@ -0,0 +1,12 @@ @@ -12836,7 +12836,7 @@ index 0000000..641a935 +} diff --git a/extensions/dash-to-dock/po/ar.po b/extensions/dash-to-dock/po/ar.po new file mode 100644 -index 0000000..3bc311d +index 00000000..3bc311dd --- /dev/null +++ b/extensions/dash-to-dock/po/ar.po @@ -0,0 +1,573 @@ @@ -13415,7 +13415,7 @@ index 0000000..3bc311d +#~ msgstr "فقط عند الإخفاء التلقائي" diff --git a/extensions/dash-to-dock/po/cs.po b/extensions/dash-to-dock/po/cs.po new file mode 100644 -index 0000000..dc4f9a9 +index 00000000..dc4f9a98 --- /dev/null +++ b/extensions/dash-to-dock/po/cs.po @@ -0,0 +1,552 @@ @@ -13973,7 +13973,7 @@ index 0000000..dc4f9a9 +#~ msgstr "Adaptivní" diff --git a/extensions/dash-to-dock/po/de.po b/extensions/dash-to-dock/po/de.po new file mode 100644 -index 0000000..65f840f +index 00000000..65f840f0 --- /dev/null +++ b/extensions/dash-to-dock/po/de.po @@ -0,0 +1,586 @@ @@ -14565,7 +14565,7 @@ index 0000000..65f840f +#~ "Adwaita-Theme)" diff --git a/extensions/dash-to-dock/po/el.po b/extensions/dash-to-dock/po/el.po new file mode 100644 -index 0000000..8828521 +index 00000000..88285213 --- /dev/null +++ b/extensions/dash-to-dock/po/el.po @@ -0,0 +1,444 @@ @@ -15015,7 +15015,7 @@ index 0000000..8828521 +msgstr "Ελάχιστη πίεση" diff --git a/extensions/dash-to-dock/po/es.po b/extensions/dash-to-dock/po/es.po new file mode 100644 -index 0000000..0bdfaa6 +index 00000000..0bdfaa67 --- /dev/null +++ b/extensions/dash-to-dock/po/es.po @@ -0,0 +1,521 @@ @@ -15542,7 +15542,7 @@ index 0000000..0bdfaa6 +msgstr "Mostrar los dispositivos montados" diff --git a/extensions/dash-to-dock/po/eu.po b/extensions/dash-to-dock/po/eu.po new file mode 100644 -index 0000000..fa780b1 +index 00000000..fa780b1b --- /dev/null +++ b/extensions/dash-to-dock/po/eu.po @@ -0,0 +1,543 @@ @@ -16091,7 +16091,7 @@ index 0000000..fa780b1 +msgstr "Presio-atalasea" diff --git a/extensions/dash-to-dock/po/fr.po b/extensions/dash-to-dock/po/fr.po new file mode 100644 -index 0000000..c5a13e8 +index 00000000..c5a13e8a --- /dev/null +++ b/extensions/dash-to-dock/po/fr.po @@ -0,0 +1,529 @@ @@ -16626,7 +16626,7 @@ index 0000000..c5a13e8 +#~ msgstr "0.000" diff --git a/extensions/dash-to-dock/po/gl.po b/extensions/dash-to-dock/po/gl.po new file mode 100644 -index 0000000..15f8122 +index 00000000..15f8122f --- /dev/null +++ b/extensions/dash-to-dock/po/gl.po @@ -0,0 +1,438 @@ @@ -17070,7 +17070,7 @@ index 0000000..15f8122 +msgstr "Límite de presión" diff --git a/extensions/dash-to-dock/po/hu.po b/extensions/dash-to-dock/po/hu.po new file mode 100644 -index 0000000..3623528 +index 00000000..36235281 --- /dev/null +++ b/extensions/dash-to-dock/po/hu.po @@ -0,0 +1,440 @@ @@ -17516,7 +17516,7 @@ index 0000000..3623528 +msgstr "Nyomás küszöbszintje" diff --git a/extensions/dash-to-dock/po/id.po b/extensions/dash-to-dock/po/id.po new file mode 100644 -index 0000000..ac09c41 +index 00000000..ac09c410 --- /dev/null +++ b/extensions/dash-to-dock/po/id.po @@ -0,0 +1,450 @@ @@ -17972,7 +17972,7 @@ index 0000000..ac09c41 +#~ msgstr "Cambia spazio di lavoro scorrendo sulla dock" diff --git a/extensions/dash-to-dock/po/it.po b/extensions/dash-to-dock/po/it.po new file mode 100644 -index 0000000..2806ad5 +index 00000000..2806ad5f --- /dev/null +++ b/extensions/dash-to-dock/po/it.po @@ -0,0 +1,517 @@ @@ -18495,7 +18495,7 @@ index 0000000..2806ad5 + diff --git a/extensions/dash-to-dock/po/ja.po b/extensions/dash-to-dock/po/ja.po new file mode 100644 -index 0000000..37cf8dd +index 00000000..37cf8dd7 --- /dev/null +++ b/extensions/dash-to-dock/po/ja.po @@ -0,0 +1,585 @@ @@ -19086,7 +19086,7 @@ index 0000000..37cf8dd +msgstr "押し込み量 (ピクセル)" diff --git a/extensions/dash-to-dock/po/nb.po b/extensions/dash-to-dock/po/nb.po new file mode 100644 -index 0000000..77a0f0d +index 00000000..77a0f0db --- /dev/null +++ b/extensions/dash-to-dock/po/nb.po @@ -0,0 +1,506 @@ @@ -19598,7 +19598,7 @@ index 0000000..77a0f0d +msgstr "Trykkterskel" diff --git a/extensions/dash-to-dock/po/nl.po b/extensions/dash-to-dock/po/nl.po new file mode 100644 -index 0000000..ea742c7 +index 00000000..ea742c74 --- /dev/null +++ b/extensions/dash-to-dock/po/nl.po @@ -0,0 +1,662 @@ @@ -20266,7 +20266,7 @@ index 0000000..ea742c7 +#~ "Adwaita-Theme)" diff --git a/extensions/dash-to-dock/po/pl.po b/extensions/dash-to-dock/po/pl.po new file mode 100644 -index 0000000..b45c00a +index 00000000..b45c00a0 --- /dev/null +++ b/extensions/dash-to-dock/po/pl.po @@ -0,0 +1,558 @@ @@ -20830,7 +20830,7 @@ index 0000000..b45c00a +#~ msgstr "Adaptacyjna" diff --git a/extensions/dash-to-dock/po/pt.po b/extensions/dash-to-dock/po/pt.po new file mode 100644 -index 0000000..d65da5f +index 00000000..d65da5f1 --- /dev/null +++ b/extensions/dash-to-dock/po/pt.po @@ -0,0 +1,509 @@ @@ -21345,7 +21345,7 @@ index 0000000..d65da5f +msgstr "Limite de pressão" diff --git a/extensions/dash-to-dock/po/pt_BR.po b/extensions/dash-to-dock/po/pt_BR.po new file mode 100644 -index 0000000..6cb10a3 +index 00000000..6cb10a33 --- /dev/null +++ b/extensions/dash-to-dock/po/pt_BR.po @@ -0,0 +1,513 @@ @@ -21864,7 +21864,7 @@ index 0000000..6cb10a3 +msgstr "Limite de pressão" diff --git a/extensions/dash-to-dock/po/ru.po b/extensions/dash-to-dock/po/ru.po new file mode 100644 -index 0000000..b41fa0c +index 00000000..b41fa0c0 --- /dev/null +++ b/extensions/dash-to-dock/po/ru.po @@ -0,0 +1,626 @@ @@ -22496,7 +22496,7 @@ index 0000000..b41fa0c +#~ msgstr "Уменьшить Док за счёт промежутков" diff --git a/extensions/dash-to-dock/po/sk.po b/extensions/dash-to-dock/po/sk.po new file mode 100644 -index 0000000..9bcd344 +index 00000000..9bcd3444 --- /dev/null +++ b/extensions/dash-to-dock/po/sk.po @@ -0,0 +1,454 @@ @@ -22956,7 +22956,7 @@ index 0000000..9bcd344 +#~ msgstr "Prepínať pracovné priestory rolovaním na doku" diff --git a/extensions/dash-to-dock/po/sr.po b/extensions/dash-to-dock/po/sr.po new file mode 100644 -index 0000000..af9ff53 +index 00000000..af9ff533 --- /dev/null +++ b/extensions/dash-to-dock/po/sr.po @@ -0,0 +1,470 @@ @@ -23432,7 +23432,7 @@ index 0000000..af9ff53 +#~ msgstr "Разматрај само прозор фокусираног програма" diff --git a/extensions/dash-to-dock/po/sr@latin.po b/extensions/dash-to-dock/po/sr@latin.po new file mode 100644 -index 0000000..e7f7794 +index 00000000..e7f7794f --- /dev/null +++ b/extensions/dash-to-dock/po/sr@latin.po @@ -0,0 +1,469 @@ @@ -23907,7 +23907,7 @@ index 0000000..e7f7794 +#~ msgstr "Razmatraj samo prozor fokusiranog programa" diff --git a/extensions/dash-to-dock/po/sv.po b/extensions/dash-to-dock/po/sv.po new file mode 100644 -index 0000000..dd5b4bd +index 00000000..dd5b4bdb --- /dev/null +++ b/extensions/dash-to-dock/po/sv.po @@ -0,0 +1,545 @@ @@ -24458,7 +24458,7 @@ index 0000000..dd5b4bd +msgstr "Tröskelvärde för tryck" diff --git a/extensions/dash-to-dock/po/tr.po b/extensions/dash-to-dock/po/tr.po new file mode 100644 -index 0000000..e4bf8a8 +index 00000000..e4bf8a8b --- /dev/null +++ b/extensions/dash-to-dock/po/tr.po @@ -0,0 +1,525 @@ @@ -24989,7 +24989,7 @@ index 0000000..e4bf8a8 +#~ msgstr "Uyarlanır" diff --git a/extensions/dash-to-dock/po/uk_UA.po b/extensions/dash-to-dock/po/uk_UA.po new file mode 100644 -index 0000000..3252304 +index 00000000..3252304c --- /dev/null +++ b/extensions/dash-to-dock/po/uk_UA.po @@ -0,0 +1,575 @@ @@ -25570,7 +25570,7 @@ index 0000000..3252304 +msgstr "Зменшити Док за рахунок проміжків" diff --git a/extensions/dash-to-dock/po/zh_CN.po b/extensions/dash-to-dock/po/zh_CN.po new file mode 100644 -index 0000000..cae290f +index 00000000..cae290f7 --- /dev/null +++ b/extensions/dash-to-dock/po/zh_CN.po @@ -0,0 +1,626 @@ @@ -26202,7 +26202,7 @@ index 0000000..cae290f +#~ msgstr "仅当自动隐藏时" diff --git a/extensions/dash-to-dock/po/zh_TW.po b/extensions/dash-to-dock/po/zh_TW.po new file mode 100644 -index 0000000..84cb252 +index 00000000..84cb252a --- /dev/null +++ b/extensions/dash-to-dock/po/zh_TW.po @@ -0,0 +1,542 @@ @@ -26750,7 +26750,7 @@ index 0000000..84cb252 +#~ msgstr "0.000" diff --git a/extensions/dash-to-dock/prefs.js b/extensions/dash-to-dock/prefs.js new file mode 100644 -index 0000000..c1e57b6 +index 00000000..c1e57b67 --- /dev/null +++ b/extensions/dash-to-dock/prefs.js @@ -0,0 +1,838 @@ @@ -27594,7 +27594,7 @@ index 0000000..c1e57b6 +} diff --git a/extensions/dash-to-dock/schemas/org.gnome.shell.extensions.dash-to-dock.gschema.xml b/extensions/dash-to-dock/schemas/org.gnome.shell.extensions.dash-to-dock.gschema.xml new file mode 100644 -index 0000000..54dd9f2 +index 00000000..54dd9f21 --- /dev/null +++ b/extensions/dash-to-dock/schemas/org.gnome.shell.extensions.dash-to-dock.gschema.xml @@ -0,0 +1,551 @@ @@ -28151,7 +28151,7 @@ index 0000000..54dd9f2 + diff --git a/extensions/dash-to-dock/stylesheet.css b/extensions/dash-to-dock/stylesheet.css new file mode 100644 -index 0000000..9a427f2 +index 00000000..9a427f24 --- /dev/null +++ b/extensions/dash-to-dock/stylesheet.css @@ -0,0 +1,231 @@ @@ -28388,7 +28388,7 @@ index 0000000..9a427f2 + background-size: contain; } diff --git a/extensions/dash-to-dock/theming.js b/extensions/dash-to-dock/theming.js new file mode 100644 -index 0000000..4b9e10a +index 00000000..4b9e10ac --- /dev/null +++ b/extensions/dash-to-dock/theming.js @@ -0,0 +1,553 @@ @@ -28947,7 +28947,7 @@ index 0000000..4b9e10a +Signals.addSignalMethods(Transparency.prototype); diff --git a/extensions/dash-to-dock/utils.js b/extensions/dash-to-dock/utils.js new file mode 100644 -index 0000000..3dd8029 +index 00000000..3dd8029c --- /dev/null +++ b/extensions/dash-to-dock/utils.js @@ -0,0 +1,308 @@ @@ -29261,7 +29261,7 @@ index 0000000..3dd8029 +} diff --git a/extensions/dash-to-dock/windowPreview.js b/extensions/dash-to-dock/windowPreview.js new file mode 100644 -index 0000000..8cb14b8 +index 00000000..8cb14b88 --- /dev/null +++ b/extensions/dash-to-dock/windowPreview.js @@ -0,0 +1,598 @@ @@ -29865,7 +29865,7 @@ index 0000000..8cb14b8 +}); \ No newline at end of file diff --git a/meson.build b/meson.build -index c0097f8..2abcdee 100644 +index c0097f82..2abcdeee 100644 --- a/meson.build +++ b/meson.build @@ -44,6 +44,7 @@ default_extensions += [ @@ -29877,7 +29877,7 @@ index c0097f8..2abcdee 100644 'top-icons', 'user-theme' diff --git a/po/ar.po b/po/ar.po -index fe3ad35..5a21c94 100644 +index fe3ad350..5a21c94a 100644 --- a/po/ar.po +++ b/po/ar.po @@ -1,9 +1,18 @@ @@ -30491,7 +30491,7 @@ index fe3ad35..5a21c94 100644 +#~ msgid "Only when in autohide" +#~ msgstr "فقط عند الإخفاء التلقائي" diff --git a/po/cs.po b/po/cs.po -index 7d3258d..572b378 100644 +index 7d3258dc..572b3787 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1,11 +1,20 @@ @@ -31078,7 +31078,7 @@ index 7d3258d..572b378 100644 +#~ msgid "Adaptive" +#~ msgstr "Adaptivní" diff --git a/po/de.po b/po/de.po -index 6e797d1..30119a7 100644 +index 6e797d13..30119a76 100644 --- a/po/de.po +++ b/po/de.po @@ -1,3 +1,4 @@ @@ -31707,7 +31707,7 @@ index 6e797d1..30119a7 100644 +#~ "Benutzerdefiniertes Theme verwenden (funktioniert nur mit dem Standard-" +#~ "Adwaita-Theme)" diff --git a/po/el.po b/po/el.po -index 59b14df..bd0a7a5 100644 +index 59b14dfb..bd0a7a5f 100644 --- a/po/el.po +++ b/po/el.po @@ -1,3 +1,4 @@ @@ -32203,7 +32203,7 @@ index 59b14df..bd0a7a5 100644 #~ msgstr "Αναποδογυρισμένο" diff --git a/po/es.po b/po/es.po -index d0b5ab1..eaafe99 100644 +index d0b5ab1f..eaafe99e 100644 --- a/po/es.po +++ b/po/es.po @@ -1,3 +1,4 @@ @@ -32776,7 +32776,7 @@ index d0b5ab1..eaafe99 100644 #~ msgstr "Hacia abajo" diff --git a/po/eu.po b/po/eu.po -index 094f674..f3e2669 100644 +index 094f6749..f3e26694 100644 --- a/po/eu.po +++ b/po/eu.po @@ -1,3 +1,4 @@ @@ -33444,7 +33444,7 @@ index 094f674..f3e2669 100644 #~ msgstr "Buruz behera" diff --git a/po/fr.po b/po/fr.po -index ffa70d9..b184915 100644 +index ffa70d96..b1849159 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,3 +1,4 @@ @@ -34019,7 +34019,7 @@ index ffa70d9..b184915 100644 +#~ msgid "0.000" +#~ msgstr "0.000" diff --git a/po/gl.po b/po/gl.po -index c94dae9..f2d40ad 100644 +index c94dae98..f2d40ad6 100644 --- a/po/gl.po +++ b/po/gl.po @@ -1,14 +1,22 @@ @@ -34509,7 +34509,7 @@ index c94dae9..f2d40ad 100644 #~ msgstr "Aplicación" diff --git a/po/hu.po b/po/hu.po -index fb9d8cc..8be4d93 100644 +index fb9d8ccd..8be4d93d 100644 --- a/po/hu.po +++ b/po/hu.po @@ -1,3 +1,4 @@ @@ -34988,7 +34988,7 @@ index fb9d8cc..8be4d93 100644 #~ msgstr "Alkalmazás" diff --git a/po/id.po b/po/id.po -index a67d729..af7463f 100644 +index a67d729d..af7463f3 100644 --- a/po/id.po +++ b/po/id.po @@ -1,3 +1,4 @@ @@ -35481,7 +35481,7 @@ index a67d729..af7463f 100644 +#~ msgid "Switch workspace by scrolling on the dock" +#~ msgstr "Cambia spazio di lavoro scorrendo sulla dock" diff --git a/po/it.po b/po/it.po -index 57124ad..4b42592 100644 +index 57124ad2..4b425925 100644 --- a/po/it.po +++ b/po/it.po @@ -1,3 +1,4 @@ @@ -36032,7 +36032,7 @@ index 57124ad..4b42592 100644 +msgid "Pressure threshold" +msgstr "Soglia pressione" diff --git a/po/ja.po b/po/ja.po -index 56ef328..30b8420 100644 +index 56ef3286..30b84200 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1,3 +1,4 @@ @@ -36705,7 +36705,7 @@ index 56ef328..30b8420 100644 #~ msgstr "アイコンのサイズ" diff --git a/po/nb.po b/po/nb.po -index 66114ec..bc0f083 100644 +index 66114ec1..bc0f0833 100644 --- a/po/nb.po +++ b/po/nb.po @@ -1,12 +1,22 @@ @@ -37248,7 +37248,7 @@ index 66114ec..bc0f083 100644 +msgid "Pressure threshold" +msgstr "Trykkterskel" diff --git a/po/nl.po b/po/nl.po -index 51589f9..6a1ee07 100644 +index 51589f9d..6a1ee07c 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1,11 +1,23 @@ @@ -37952,7 +37952,7 @@ index 51589f9..6a1ee07 100644 +#~ "Benutzerdefiniertes Theme verwenden (funktioniert nur mit dem Standard-" +#~ "Adwaita-Theme)" diff --git a/po/pl.po b/po/pl.po -index bcfe2d6..a97366b 100644 +index bcfe2d6a..a97366b6 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1,11 +1,22 @@ @@ -38552,7 +38552,7 @@ index bcfe2d6..a97366b 100644 +#~ msgid "Adaptive" +#~ msgstr "Adaptacyjna" diff --git a/po/pt.po b/po/pt.po -index c1e8ad9..11b2079 100644 +index c1e8ad94..11b20794 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1,3 +1,4 @@ @@ -39112,7 +39112,7 @@ index c1e8ad9..11b2079 100644 #~ msgstr "Invertido" diff --git a/po/pt_BR.po b/po/pt_BR.po -index d1bd41b..9dc0db8 100644 +index d1bd41bc..9dc0db84 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1,3 +1,4 @@ @@ -39676,7 +39676,7 @@ index d1bd41b..9dc0db8 100644 #~ msgstr "De cabeça para baixo" diff --git a/po/ru.po b/po/ru.po -index 8aedfbd..de5dbbb 100644 +index 8aedfbd6..de5dbbb5 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,11 +1,18 @@ @@ -40352,7 +40352,7 @@ index 8aedfbd..de5dbbb 100644 +#~ msgid "Shrink the dash size by reducing padding" +#~ msgstr "Уменьшить Док за счёт промежутков" diff --git a/po/sk.po b/po/sk.po -index d352e15..e8330d0 100644 +index d352e15a..e8330d08 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1,11 +1,20 @@ @@ -40850,7 +40850,7 @@ index d352e15..e8330d0 100644 +#~ msgid "Switch workspace by scrolling on the dock" +#~ msgstr "Prepínať pracovné priestory rolovaním na doku" diff --git a/po/sr.po b/po/sr.po -index dba6f9f..92ab694 100644 +index dba6f9ff..92ab6945 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1,3 +1,4 @@ @@ -41371,7 +41371,7 @@ index dba6f9f..92ab694 100644 +#~ msgid "Only consider windows of the focused application" +#~ msgstr "Разматрај само прозор фокусираног програма" diff --git a/po/sr@latin.po b/po/sr@latin.po -index 92dae13..1a7e0f1 100644 +index 92dae13d..1a7e0f10 100644 --- a/po/sr@latin.po +++ b/po/sr@latin.po @@ -1,10 +1,19 @@ @@ -41916,7 +41916,7 @@ index 92dae13..1a7e0f1 100644 +#~ msgid "Only consider windows of the focused application" +#~ msgstr "Razmatraj samo prozor fokusiranog programa" diff --git a/po/sv.po b/po/sv.po -index 989074a..2ca88c5 100644 +index 989074aa..2ca88c58 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,3 +1,4 @@ @@ -42497,7 +42497,7 @@ index 989074a..2ca88c5 100644 +msgid "Pressure threshold" +msgstr "Tröskelvärde för tryck" diff --git a/po/tr.po b/po/tr.po -index 0a5f745..38bbc7b 100644 +index 0a5f7459..38bbc7b6 100644 --- a/po/tr.po +++ b/po/tr.po @@ -1,3 +1,4 @@ @@ -43094,7 +43094,7 @@ index 0a5f745..38bbc7b 100644 +#~ msgid "Adaptive" +#~ msgstr "Uyarlanır" diff --git a/po/zh_CN.po b/po/zh_CN.po -index feb1bff..338e86e 100644 +index feb1bff9..338e86ed 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1,3 +1,4 @@ @@ -43786,7 +43786,7 @@ index feb1bff..338e86e 100644 +#~ msgid "Only when in autohide" +#~ msgstr "仅当自动隐藏时" diff --git a/po/zh_TW.po b/po/zh_TW.po -index 6a40e21..14e60cc 100644 +index 6a40e212..14e60ccb 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -1,11 +1,20 @@ @@ -44393,21 +44393,21 @@ index 6a40e21..14e60cc 100644 +#~ msgid "0.000" +#~ msgstr "0.000" -- -2.28.0 +2.31.1 -From 5099be75e88bcd9f077ac30ed2ffda7337cc0413 Mon Sep 17 00:00:00 2001 +From 0f9f96d51e1d9edb57e63de410d6affa28b17e04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Wed, 20 May 2015 18:55:47 +0200 Subject: [PATCH 3/5] Add panel-favorites extension --- - extensions/panel-favorites/extension.js | 267 ++++++++++++++++++++ + extensions/panel-favorites/extension.js | 257 ++++++++++++++++++++ extensions/panel-favorites/meson.build | 5 + extensions/panel-favorites/metadata.json.in | 10 + - extensions/panel-favorites/stylesheet.css | 14 + + extensions/panel-favorites/stylesheet.css | 14 ++ meson.build | 1 + - 5 files changed, 297 insertions(+) + 5 files changed, 287 insertions(+) create mode 100644 extensions/panel-favorites/extension.js create mode 100644 extensions/panel-favorites/meson.build create mode 100644 extensions/panel-favorites/metadata.json.in @@ -44415,10 +44415,10 @@ Subject: [PATCH 3/5] Add panel-favorites extension diff --git a/extensions/panel-favorites/extension.js b/extensions/panel-favorites/extension.js new file mode 100644 -index 0000000..b817dbb +index 00000000..15da32da --- /dev/null +++ b/extensions/panel-favorites/extension.js -@@ -0,0 +1,267 @@ +@@ -0,0 +1,257 @@ +// Copyright (C) 2011-2013 R M Yorston +// Licence: GPLv2+ + @@ -44429,21 +44429,18 @@ index 0000000..b817dbb +const Shell = imports.gi.Shell; +const Signals = imports.signals; +const St = imports.gi.St; -+const Mainloop = imports.mainloop; + +const AppFavorites = imports.ui.appFavorites; +const Main = imports.ui.main; +const Panel = imports.ui.panel; -+const Tweener = imports.ui.tweener; + -+const PANEL_LAUNCHER_LABEL_SHOW_TIME = 0.15; -+const PANEL_LAUNCHER_LABEL_HIDE_TIME = 0.1; ++const PANEL_LAUNCHER_LABEL_SHOW_TIME = 150; ++const PANEL_LAUNCHER_LABEL_HIDE_TIME = 100; +const PANEL_LAUNCHER_HOVER_TIMEOUT = 300; + -+const PanelLauncher = new Lang.Class({ -+ Name: 'PanelLauncher', -+ -+ _init: function(app) { ++const PanelLauncher = ++class PanelLauncher { ++ constructor(app) { + this.actor = new St.Button({ style_class: 'panel-button', + reactive: true }); + this.iconSize = 24; @@ -44462,21 +44459,18 @@ index 0000000..b817dbb + this.actor.label_actor = this.label; + + this._app = app; -+ this.actor.connect('clicked', Lang.bind(this, function() { -+ this._app.open_new_window(-1); -+ })); -+ this.actor.connect('notify::hover', -+ Lang.bind(this, this._onHoverChanged)); ++ this.actor.connect('clicked', () => this._app.open_new_window(-1)); ++ this.actor.connect('notify::hover', this._onHoverChanged.bind(this)); + this.actor.opacity = 207; + -+ this.actor.connect('notify::allocation', Lang.bind(this, this._alloc)); -+ }, ++ this.actor.connect('notify::allocation', () => this._alloc()); ++ } + -+ _onHoverChanged: function(actor) { ++ _onHoverChanged(actor) { + actor.opacity = actor.hover ? 255 : 207; -+ }, ++ } + -+ _alloc: function() { ++ _alloc() { + let size = this.actor.allocation.y2 - this.actor.allocation.y1 - 3; + if ( size >= 24 && size != this.iconSize ) { + this.actor.get_child().destroy(); @@ -44484,9 +44478,9 @@ index 0000000..b817dbb + let icon = this._app.create_icon_texture(this.iconSize); + this.actor.set_child(icon); + } -+ }, ++ } + -+ showLabel: function() { ++ showLabel() { + this.label.opacity = 0; + this.label.show(); + @@ -44517,35 +44511,32 @@ index 0000000..b817dbb + } + + this.label.set_position(x, y); -+ Tweener.addTween(this.label, -+ { opacity: 255, -+ time: PANEL_LAUNCHER_LABEL_SHOW_TIME, -+ transition: 'easeOutQuad', -+ }); -+ }, ++ this.label.ease({ ++ opacity: 255, ++ duration: PANEL_LAUNCHER_LABEL_SHOW_TIME, ++ mode: Clutter.AnimationMode.EASE_OUT_QUAD, ++ }); ++ } + -+ hideLabel: function() { ++ hideLabel() { + this.label.opacity = 255; -+ Tweener.addTween(this.label, -+ { opacity: 0, -+ time: PANEL_LAUNCHER_LABEL_HIDE_TIME, -+ transition: 'easeOutQuad', -+ onComplete: Lang.bind(this, function() { -+ this.label.hide(); -+ }) -+ }); -+ }, ++ this.label.ease({ ++ opacity: 0, ++ duration: PANEL_LAUNCHER_LABEL_HIDE_TIME, ++ mode: Clutter.AnimationMode.EASE_OUT_QUAD, ++ onComplete: () => this.label.hide(), ++ }); ++ } + -+ destroy: function() { ++ destroy() { + this.label.destroy(); + this.actor.destroy(); + } -+}); ++}; + -+const PanelFavorites = new Lang.Class({ -+ Name: 'PanelFavorites', -+ -+ _init: function() { ++const PanelFavorites = ++class PanelFavorites { ++ constructor() { + this._showLabelTimeoutId = 0; + this._resetHoverTimeoutId = 0; + this._labelShowing = false; @@ -44555,24 +44546,22 @@ index 0000000..b817dbb + style_class: 'panel-favorites' }); + this._display(); + -+ this.container = new St.Bin({ y_fill: true, -+ x_fill: true, -+ child: this.actor }); ++ this.container = new St.Bin({ child: this.actor }); + -+ this.actor.connect('destroy', Lang.bind(this, this._onDestroy)); -+ this._installChangedId = Shell.AppSystem.get_default().connect('installed-changed', Lang.bind(this, this._redisplay)); -+ this._changedId = AppFavorites.getAppFavorites().connect('changed', Lang.bind(this, this._redisplay)); -+ }, ++ this.actor.connect('destroy', this._onDestroy.bind(this)); ++ this._installChangedId = Shell.AppSystem.get_default().connect('installed-changed', this._redisplay.bind(this)); ++ this._changedId = AppFavorites.getAppFavorites().connect('changed', this._redisplay.bind(this)); ++ } + -+ _redisplay: function() { ++ _redisplay() { + for ( let i=0; i this._onHover(launcher)); + this._buttons[j] = launcher; + ++j; + } -+ }, ++ } + + // this routine stolen from dash.js -+ _onHover: function(launcher) { ++ _onHover(launcher) { + if ( launcher.actor.hover ) { + if (this._showLabelTimeoutId == 0) { + let timeout = this._labelShowing ? + 0 : PANEL_LAUNCHER_HOVER_TIMEOUT; -+ this._showLabelTimeoutId = Mainloop.timeout_add(timeout, -+ Lang.bind(this, function() { ++ this._showLabelTimeoutId = GLib.timeout_add( ++ GLib.PRIORITY_DEFAULT, ++ timeout, ++ () => { + this._labelShowing = true; + launcher.showLabel(); + this._showLabelTimeoutId = 0; + return GLib.SOURCE_REMOVE; -+ })); ++ }); + if (this._resetHoverTimeoutId > 0) { -+ Mainloop.source_remove(this._resetHoverTimeoutId); ++ GLib.source_remove(this._resetHoverTimeoutId); + this._resetHoverTimeoutId = 0; + } + } + } else { + if (this._showLabelTimeoutId > 0) { -+ Mainloop.source_remove(this._showLabelTimeoutId); ++ GLib.source_remove(this._showLabelTimeoutId); + this._showLabelTimeoutId = 0; + } + launcher.hideLabel(); + if (this._labelShowing) { -+ this._resetHoverTimeoutId = Mainloop.timeout_add( ++ this._resetHoverTimeoutId = GLib.timeout_add( ++ GLib.PRIORITY_DEFAULT, + PANEL_LAUNCHER_HOVER_TIMEOUT, -+ Lang.bind(this, function() { ++ () => { + this._labelShowing = false; + this._resetHoverTimeoutId = 0; + return GLib.SOURCE_REMOVE; -+ })); ++ }); + } + } -+ }, ++ } + -+ _onDestroy: function() { ++ _onDestroy() { + if ( this._installChangedId != 0 ) { + Shell.AppSystem.get_default().disconnect(this._installChangedId); + this._installChangedId = 0; @@ -44642,7 +44632,7 @@ index 0000000..b817dbb + this._changedId = 0; + } + } -+}); ++}; +Signals.addSignalMethods(PanelFavorites.prototype); + +let myAddToStatusArea; @@ -44688,7 +44678,7 @@ index 0000000..b817dbb +} diff --git a/extensions/panel-favorites/meson.build b/extensions/panel-favorites/meson.build new file mode 100644 -index 0000000..48504f6 +index 00000000..48504f63 --- /dev/null +++ b/extensions/panel-favorites/meson.build @@ -0,0 +1,5 @@ @@ -44699,7 +44689,7 @@ index 0000000..48504f6 +) diff --git a/extensions/panel-favorites/metadata.json.in b/extensions/panel-favorites/metadata.json.in new file mode 100644 -index 0000000..037f281 +index 00000000..037f2813 --- /dev/null +++ b/extensions/panel-favorites/metadata.json.in @@ -0,0 +1,10 @@ @@ -44715,7 +44705,7 @@ index 0000000..037f281 +} diff --git a/extensions/panel-favorites/stylesheet.css b/extensions/panel-favorites/stylesheet.css new file mode 100644 -index 0000000..120adac +index 00000000..120adacb --- /dev/null +++ b/extensions/panel-favorites/stylesheet.css @@ -0,0 +1,14 @@ @@ -44734,7 +44724,7 @@ index 0000000..120adac + -y-offset: 6px; +} diff --git a/meson.build b/meson.build -index 2abcdee..fa2d31e 100644 +index 2abcdeee..fa2d31e5 100644 --- a/meson.build +++ b/meson.build @@ -46,6 +46,7 @@ all_extensions += [ @@ -44746,23 +44736,23 @@ index 2abcdee..fa2d31e 100644 'user-theme' ] -- -2.28.0 +2.31.1 -From 205cf961397dfdbd488d1d2b978c0706a50ada23 Mon Sep 17 00:00:00 2001 +From d5b32fdd9e4dd993dc767e0114ce6a562da25a9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Fri, 4 Mar 2016 17:07:21 +0100 Subject: [PATCH 4/5] Add updates-dialog extension --- - extensions/updates-dialog/extension.js | 503 ++++++++++++++++++ + extensions/updates-dialog/extension.js | 504 ++++++++++++++++++ extensions/updates-dialog/meson.build | 7 + extensions/updates-dialog/metadata.json.in | 10 + ...hell.extensions.updates-dialog.gschema.xml | 30 ++ extensions/updates-dialog/stylesheet.css | 1 + meson.build | 1 + po/POTFILES.in | 2 + - 7 files changed, 554 insertions(+) + 7 files changed, 555 insertions(+) create mode 100644 extensions/updates-dialog/extension.js create mode 100644 extensions/updates-dialog/meson.build create mode 100644 extensions/updates-dialog/metadata.json.in @@ -44771,10 +44761,10 @@ Subject: [PATCH 4/5] Add updates-dialog extension diff --git a/extensions/updates-dialog/extension.js b/extensions/updates-dialog/extension.js new file mode 100644 -index 0000000..59f6dcf +index 00000000..9fd9b33d --- /dev/null +++ b/extensions/updates-dialog/extension.js -@@ -0,0 +1,503 @@ +@@ -0,0 +1,504 @@ +/* + * Copyright (c) 2015 Red Hat, Inc. + * @@ -44794,7 +44784,7 @@ index 0000000..59f6dcf + +/* exported enable disable */ + -+const { Clutter, Gio, GLib, PackageKitGlib: PkgKit, Pango, Polkit, St } = imports.gi; ++const { Clutter, Gio, GLib, GObject, PackageKitGlib: PkgKit, Pango, Polkit, St } = imports.gi; +const Signals = imports.signals; + +const EndSessionDialog = imports.ui.endSessionDialog; @@ -44892,9 +44882,11 @@ index 0000000..59f6dcf + return text; +} + -+const UpdatesDialog = class extends ModalDialog.ModalDialog { -+ constructor(settings) { -+ super({ ++const UpdatesDialog = GObject.registerClass({ ++ Signals: { 'done': {} }, ++}, class extends ModalDialog.ModalDialog { ++ _init(settings) { ++ super._init({ + styleClass: 'end-session-dialog', + destroyOnClose: false + }); @@ -45036,8 +45028,7 @@ index 0000000..59f6dcf + setState(state) { + [this._gracePeriod, this._lastWarningPeriod, this._lastWarnings, this._secondsLeft] = state; + } -+}; -+Signals.addSignalMethods(UpdatesDialog.prototype); ++}); + +function showDialog() { + if (updatesDialog) @@ -45280,7 +45271,7 @@ index 0000000..59f6dcf +} diff --git a/extensions/updates-dialog/meson.build b/extensions/updates-dialog/meson.build new file mode 100644 -index 0000000..585c02d +index 00000000..585c02da --- /dev/null +++ b/extensions/updates-dialog/meson.build @@ -0,0 +1,7 @@ @@ -45293,7 +45284,7 @@ index 0000000..585c02d +extension_schemas += files(metadata_conf.get('gschemaname') + '.gschema.xml') diff --git a/extensions/updates-dialog/metadata.json.in b/extensions/updates-dialog/metadata.json.in new file mode 100644 -index 0000000..9946abb +index 00000000..9946abb5 --- /dev/null +++ b/extensions/updates-dialog/metadata.json.in @@ -0,0 +1,10 @@ @@ -45309,7 +45300,7 @@ index 0000000..9946abb +} diff --git a/extensions/updates-dialog/org.gnome.shell.extensions.updates-dialog.gschema.xml b/extensions/updates-dialog/org.gnome.shell.extensions.updates-dialog.gschema.xml new file mode 100644 -index 0000000..c08d33c +index 00000000..c08d33c4 --- /dev/null +++ b/extensions/updates-dialog/org.gnome.shell.extensions.updates-dialog.gschema.xml @@ -0,0 +1,30 @@ @@ -45345,13 +45336,13 @@ index 0000000..c08d33c + diff --git a/extensions/updates-dialog/stylesheet.css b/extensions/updates-dialog/stylesheet.css new file mode 100644 -index 0000000..25134b6 +index 00000000..25134b65 --- /dev/null +++ b/extensions/updates-dialog/stylesheet.css @@ -0,0 +1 @@ +/* This extensions requires no special styling */ diff --git a/meson.build b/meson.build -index fa2d31e..ad448a9 100644 +index fa2d31e5..ad448a99 100644 --- a/meson.build +++ b/meson.build @@ -48,6 +48,7 @@ all_extensions += [ @@ -45363,7 +45354,7 @@ index fa2d31e..ad448a9 100644 ] diff --git a/po/POTFILES.in b/po/POTFILES.in -index 0ed1276..10b1d51 100644 +index 0ed12762..10b1d517 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -9,6 +9,8 @@ extensions/native-window-placement/org.gnome.shell.extensions.native-window-plac @@ -45376,10 +45367,10 @@ index 0ed1276..10b1d51 100644 extensions/window-list/extension.js extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml -- -2.28.0 +2.31.1 -From ed3bc534502765b0041718b65ca3d7e370ff76da Mon Sep 17 00:00:00 2001 +From d025e3be5708992ced6c5d3160be8506bb284f5c Mon Sep 17 00:00:00 2001 From: Carlos Soriano Date: Mon, 13 Aug 2018 17:28:41 +0200 Subject: [PATCH 5/5] Add desktop icons extension @@ -45528,7 +45519,7 @@ Subject: [PATCH 5/5] Add desktop icons extension diff --git a/extensions/desktop-icons/createFolderDialog.js b/extensions/desktop-icons/createFolderDialog.js new file mode 100644 -index 0000000..027e4c6 +index 00000000..027e4c6a --- /dev/null +++ b/extensions/desktop-icons/createFolderDialog.js @@ -0,0 +1,165 @@ @@ -45699,7 +45690,7 @@ index 0000000..027e4c6 +}); diff --git a/extensions/desktop-icons/createThumbnail.js b/extensions/desktop-icons/createThumbnail.js new file mode 100755 -index 0000000..212f6b7 +index 00000000..212f6b79 --- /dev/null +++ b/extensions/desktop-icons/createThumbnail.js @@ -0,0 +1,35 @@ @@ -45740,7 +45731,7 @@ index 0000000..212f6b7 + thumbnailFactory.save_thumbnail(thumbnailPixbuf, fileUri, modifiedTime); diff --git a/extensions/desktop-icons/dbusUtils.js b/extensions/desktop-icons/dbusUtils.js new file mode 100644 -index 0000000..b2bca42 +index 00000000..b2bca421 --- /dev/null +++ b/extensions/desktop-icons/dbusUtils.js @@ -0,0 +1,127 @@ @@ -45873,7 +45864,7 @@ index 0000000..b2bca42 +} diff --git a/extensions/desktop-icons/desktopGrid.js b/extensions/desktop-icons/desktopGrid.js new file mode 100644 -index 0000000..002803c +index 00000000..002803c7 --- /dev/null +++ b/extensions/desktop-icons/desktopGrid.js @@ -0,0 +1,782 @@ @@ -46661,7 +46652,7 @@ index 0000000..002803c +}; diff --git a/extensions/desktop-icons/desktopIconsUtil.js b/extensions/desktop-icons/desktopIconsUtil.js new file mode 100644 -index 0000000..696c945 +index 00000000..696c945e --- /dev/null +++ b/extensions/desktop-icons/desktopIconsUtil.js @@ -0,0 +1,164 @@ @@ -46831,7 +46822,7 @@ index 0000000..696c945 +} diff --git a/extensions/desktop-icons/desktopManager.js b/extensions/desktop-icons/desktopManager.js new file mode 100644 -index 0000000..1aad8c6 +index 00000000..1aad8c67 --- /dev/null +++ b/extensions/desktop-icons/desktopManager.js @@ -0,0 +1,856 @@ @@ -47693,7 +47684,7 @@ index 0000000..1aad8c6 +} diff --git a/extensions/desktop-icons/extension.js b/extensions/desktop-icons/extension.js new file mode 100644 -index 0000000..be3e59d +index 00000000..be3e59d1 --- /dev/null +++ b/extensions/desktop-icons/extension.js @@ -0,0 +1,75 @@ @@ -47774,7 +47765,7 @@ index 0000000..be3e59d +} diff --git a/extensions/desktop-icons/fileItem.js b/extensions/desktop-icons/fileItem.js new file mode 100644 -index 0000000..9987e7f +index 00000000..9987e7fe --- /dev/null +++ b/extensions/desktop-icons/fileItem.js @@ -0,0 +1,961 @@ @@ -48741,7 +48732,7 @@ index 0000000..9987e7f +}); diff --git a/extensions/desktop-icons/meson.build b/extensions/desktop-icons/meson.build new file mode 100644 -index 0000000..8e69142 +index 00000000..8e691426 --- /dev/null +++ b/extensions/desktop-icons/meson.build @@ -0,0 +1,20 @@ @@ -48767,7 +48758,7 @@ index 0000000..8e69142 +) diff --git a/extensions/desktop-icons/metadata.json.in b/extensions/desktop-icons/metadata.json.in new file mode 100644 -index 0000000..78cabf0 +index 00000000..78cabf08 --- /dev/null +++ b/extensions/desktop-icons/metadata.json.in @@ -0,0 +1,11 @@ @@ -48784,7 +48775,7 @@ index 0000000..78cabf0 +} diff --git a/extensions/desktop-icons/po/LINGUAS b/extensions/desktop-icons/po/LINGUAS new file mode 100644 -index 0000000..3ca0842 +index 00000000..3ca08422 --- /dev/null +++ b/extensions/desktop-icons/po/LINGUAS @@ -0,0 +1,33 @@ @@ -48823,7 +48814,7 @@ index 0000000..3ca0842 +zh_TW diff --git a/extensions/desktop-icons/po/POTFILES.in b/extensions/desktop-icons/po/POTFILES.in new file mode 100644 -index 0000000..d9adb21 +index 00000000..d9adb218 --- /dev/null +++ b/extensions/desktop-icons/po/POTFILES.in @@ -0,0 +1,6 @@ @@ -48836,7 +48827,7 @@ index 0000000..d9adb21 \ No newline at end of file diff --git a/extensions/desktop-icons/po/ca.po b/extensions/desktop-icons/po/ca.po new file mode 100644 -index 0000000..2815269 +index 00000000..28152696 --- /dev/null +++ b/extensions/desktop-icons/po/ca.po @@ -0,0 +1,218 @@ @@ -49060,7 +49051,7 @@ index 0000000..2815269 +msgstr "Mostra la icona de la paperera a l'escriptori." diff --git a/extensions/desktop-icons/po/cs.po b/extensions/desktop-icons/po/cs.po new file mode 100644 -index 0000000..5acfe16 +index 00000000..5acfe16a --- /dev/null +++ b/extensions/desktop-icons/po/cs.po @@ -0,0 +1,235 @@ @@ -49301,7 +49292,7 @@ index 0000000..5acfe16 +#~ msgstr "Ok" diff --git a/extensions/desktop-icons/po/da.po b/extensions/desktop-icons/po/da.po new file mode 100644 -index 0000000..ff53368 +index 00000000..ff533680 --- /dev/null +++ b/extensions/desktop-icons/po/da.po @@ -0,0 +1,226 @@ @@ -49533,7 +49524,7 @@ index 0000000..ff53368 +msgstr "Vis monterede drev på skrivebordet." diff --git a/extensions/desktop-icons/po/de.po b/extensions/desktop-icons/po/de.po new file mode 100644 -index 0000000..8f2f4cb +index 00000000..8f2f4cbc --- /dev/null +++ b/extensions/desktop-icons/po/de.po @@ -0,0 +1,232 @@ @@ -49771,7 +49762,7 @@ index 0000000..8f2f4cb +#~ msgstr "Riesig" diff --git a/extensions/desktop-icons/po/el.po b/extensions/desktop-icons/po/el.po new file mode 100644 -index 0000000..302aea8 +index 00000000..302aea80 --- /dev/null +++ b/extensions/desktop-icons/po/el.po @@ -0,0 +1,190 @@ @@ -49967,7 +49958,7 @@ index 0000000..302aea8 +#~ msgstr "Εισάγετε όνομα αρχείου..." diff --git a/extensions/desktop-icons/po/en_GB.po b/extensions/desktop-icons/po/en_GB.po new file mode 100644 -index 0000000..d30b74d +index 00000000..d30b74db --- /dev/null +++ b/extensions/desktop-icons/po/en_GB.po @@ -0,0 +1,194 @@ @@ -50167,7 +50158,7 @@ index 0000000..d30b74d +#~ msgstr "OK" diff --git a/extensions/desktop-icons/po/es.po b/extensions/desktop-icons/po/es.po new file mode 100644 -index 0000000..86ea152 +index 00000000..86ea1522 --- /dev/null +++ b/extensions/desktop-icons/po/es.po @@ -0,0 +1,257 @@ @@ -50430,7 +50421,7 @@ index 0000000..86ea152 +#~ msgstr "Muestra la carpeta Vídeos en el escritorio." diff --git a/extensions/desktop-icons/po/eu.po b/extensions/desktop-icons/po/eu.po new file mode 100644 -index 0000000..d662e0d +index 00000000..d662e0d3 --- /dev/null +++ b/extensions/desktop-icons/po/eu.po @@ -0,0 +1,192 @@ @@ -50628,7 +50619,7 @@ index 0000000..d662e0d +#~ msgstr "Ados" diff --git a/extensions/desktop-icons/po/fa.po b/extensions/desktop-icons/po/fa.po new file mode 100644 -index 0000000..4538923 +index 00000000..4538923e --- /dev/null +++ b/extensions/desktop-icons/po/fa.po @@ -0,0 +1,187 @@ @@ -50821,7 +50812,7 @@ index 0000000..4538923 +msgstr "نمایش نقشک زباله‌دان در میزکار." diff --git a/extensions/desktop-icons/po/fi.po b/extensions/desktop-icons/po/fi.po new file mode 100644 -index 0000000..f2b451d +index 00000000..f2b451db --- /dev/null +++ b/extensions/desktop-icons/po/fi.po @@ -0,0 +1,231 @@ @@ -51058,7 +51049,7 @@ index 0000000..f2b451d +#~ msgstr "Valtava" diff --git a/extensions/desktop-icons/po/fr.po b/extensions/desktop-icons/po/fr.po new file mode 100644 -index 0000000..3c5958d +index 00000000..3c5958d5 --- /dev/null +++ b/extensions/desktop-icons/po/fr.po @@ -0,0 +1,225 @@ @@ -51289,7 +51280,7 @@ index 0000000..3c5958d +msgstr "Montrer les disques montés sur le bureau." diff --git a/extensions/desktop-icons/po/fur.po b/extensions/desktop-icons/po/fur.po new file mode 100644 -index 0000000..58bcb4e +index 00000000..58bcb4e4 --- /dev/null +++ b/extensions/desktop-icons/po/fur.po @@ -0,0 +1,227 @@ @@ -51522,7 +51513,7 @@ index 0000000..58bcb4e +#~ msgstr "Va ben" diff --git a/extensions/desktop-icons/po/hr.po b/extensions/desktop-icons/po/hr.po new file mode 100644 -index 0000000..11cd25f +index 00000000..11cd25f7 --- /dev/null +++ b/extensions/desktop-icons/po/hr.po @@ -0,0 +1,228 @@ @@ -51756,7 +51747,7 @@ index 0000000..11cd25f +#~ msgstr "U redu" diff --git a/extensions/desktop-icons/po/hu.po b/extensions/desktop-icons/po/hu.po new file mode 100644 -index 0000000..dead2ac +index 00000000..dead2ac5 --- /dev/null +++ b/extensions/desktop-icons/po/hu.po @@ -0,0 +1,228 @@ @@ -51990,7 +51981,7 @@ index 0000000..dead2ac +#~ msgstr "Adjon meg egy fájlnevet…" diff --git a/extensions/desktop-icons/po/id.po b/extensions/desktop-icons/po/id.po new file mode 100644 -index 0000000..04eb855 +index 00000000..04eb8551 --- /dev/null +++ b/extensions/desktop-icons/po/id.po @@ -0,0 +1,222 @@ @@ -52218,7 +52209,7 @@ index 0000000..04eb855 +msgstr "Tampilkan kandar yang dikaitkan di destop." diff --git a/extensions/desktop-icons/po/it.po b/extensions/desktop-icons/po/it.po new file mode 100644 -index 0000000..bd3eb24 +index 00000000..bd3eb249 --- /dev/null +++ b/extensions/desktop-icons/po/it.po @@ -0,0 +1,189 @@ @@ -52413,7 +52404,7 @@ index 0000000..bd3eb24 +msgstr "Mostra il cestino sulla scrivania." diff --git a/extensions/desktop-icons/po/ja.po b/extensions/desktop-icons/po/ja.po new file mode 100644 -index 0000000..71d9f53 +index 00000000..71d9f539 --- /dev/null +++ b/extensions/desktop-icons/po/ja.po @@ -0,0 +1,221 @@ @@ -52640,7 +52631,7 @@ index 0000000..71d9f53 +msgstr "デスクトップにマウントしたドライブを表示します。" diff --git a/extensions/desktop-icons/po/kab.po b/extensions/desktop-icons/po/kab.po new file mode 100644 -index 0000000..232728a +index 00000000..232728ae --- /dev/null +++ b/extensions/desktop-icons/po/kab.po @@ -0,0 +1,222 @@ @@ -52868,7 +52859,7 @@ index 0000000..232728a +msgstr "Sken iḍebsiyen irekben deg tnarit." diff --git a/extensions/desktop-icons/po/ko.po b/extensions/desktop-icons/po/ko.po new file mode 100644 -index 0000000..da87e2b +index 00000000..da87e2b1 --- /dev/null +++ b/extensions/desktop-icons/po/ko.po @@ -0,0 +1,223 @@ @@ -53097,14 +53088,14 @@ index 0000000..da87e2b +msgstr "바탕 화면에 마운트된 드라이브를 표시합니다." diff --git a/extensions/desktop-icons/po/meson.build b/extensions/desktop-icons/po/meson.build new file mode 100644 -index 0000000..b2e9e42 +index 00000000..b2e9e422 --- /dev/null +++ b/extensions/desktop-icons/po/meson.build @@ -0,0 +1 @@ +i18n.gettext (meson.project_name (), preset: 'glib') diff --git a/extensions/desktop-icons/po/nl.po b/extensions/desktop-icons/po/nl.po new file mode 100644 -index 0000000..86deae6 +index 00000000..86deae6f --- /dev/null +++ b/extensions/desktop-icons/po/nl.po @@ -0,0 +1,228 @@ @@ -53338,7 +53329,7 @@ index 0000000..86deae6 +#~ msgstr "Oké" diff --git a/extensions/desktop-icons/po/oc.po b/extensions/desktop-icons/po/oc.po new file mode 100644 -index 0000000..9be20f4 +index 00000000..9be20f48 --- /dev/null +++ b/extensions/desktop-icons/po/oc.po @@ -0,0 +1,221 @@ @@ -53565,7 +53556,7 @@ index 0000000..9be20f4 +msgstr "Mostrar los lector montats pel burèu." diff --git a/extensions/desktop-icons/po/pl.po b/extensions/desktop-icons/po/pl.po new file mode 100644 -index 0000000..feffa26 +index 00000000..feffa267 --- /dev/null +++ b/extensions/desktop-icons/po/pl.po @@ -0,0 +1,223 @@ @@ -53794,7 +53785,7 @@ index 0000000..feffa26 +msgstr "Wyświetla zamontowane napędy na pulpicie." diff --git a/extensions/desktop-icons/po/pt.po b/extensions/desktop-icons/po/pt.po new file mode 100644 -index 0000000..3faf722 +index 00000000..3faf722f --- /dev/null +++ b/extensions/desktop-icons/po/pt.po @@ -0,0 +1,222 @@ @@ -54022,7 +54013,7 @@ index 0000000..3faf722 +msgstr "Mostra as unidades montadas no ambiente de trabalho." diff --git a/extensions/desktop-icons/po/pt_BR.po b/extensions/desktop-icons/po/pt_BR.po new file mode 100644 -index 0000000..e8bf094 +index 00000000..e8bf0940 --- /dev/null +++ b/extensions/desktop-icons/po/pt_BR.po @@ -0,0 +1,235 @@ @@ -54263,7 +54254,7 @@ index 0000000..e8bf094 +#~ msgstr "Ok" diff --git a/extensions/desktop-icons/po/ro.po b/extensions/desktop-icons/po/ro.po new file mode 100644 -index 0000000..b290b89 +index 00000000..b290b89d --- /dev/null +++ b/extensions/desktop-icons/po/ro.po @@ -0,0 +1,223 @@ @@ -54492,7 +54483,7 @@ index 0000000..b290b89 +msgstr "Arată dispozitivele montate pe desktop." diff --git a/extensions/desktop-icons/po/ru.po b/extensions/desktop-icons/po/ru.po new file mode 100644 -index 0000000..a373301 +index 00000000..a373301c --- /dev/null +++ b/extensions/desktop-icons/po/ru.po @@ -0,0 +1,197 @@ @@ -54695,7 +54686,7 @@ index 0000000..a373301 +#~ msgstr "ОК" diff --git a/extensions/desktop-icons/po/sk.po b/extensions/desktop-icons/po/sk.po new file mode 100644 -index 0000000..a67f40c +index 00000000..a67f40cb --- /dev/null +++ b/extensions/desktop-icons/po/sk.po @@ -0,0 +1,222 @@ @@ -54923,7 +54914,7 @@ index 0000000..a67f40c +msgstr "Zobrazí pripojené jednotky na pracovnej ploche." diff --git a/extensions/desktop-icons/po/sl.po b/extensions/desktop-icons/po/sl.po new file mode 100644 -index 0000000..d858414 +index 00000000..d8584147 --- /dev/null +++ b/extensions/desktop-icons/po/sl.po @@ -0,0 +1,227 @@ @@ -55156,7 +55147,7 @@ index 0000000..d858414 +#~ msgstr "Velikanske" diff --git a/extensions/desktop-icons/po/sr.po b/extensions/desktop-icons/po/sr.po new file mode 100644 -index 0000000..82aeafc +index 00000000..82aeafc2 --- /dev/null +++ b/extensions/desktop-icons/po/sr.po @@ -0,0 +1,220 @@ @@ -55382,7 +55373,7 @@ index 0000000..82aeafc +msgstr "Приказује прикачене уређаје на радној површи." diff --git a/extensions/desktop-icons/po/sv.po b/extensions/desktop-icons/po/sv.po new file mode 100644 -index 0000000..5246136 +index 00000000..52461365 --- /dev/null +++ b/extensions/desktop-icons/po/sv.po @@ -0,0 +1,239 @@ @@ -55627,7 +55618,7 @@ index 0000000..5246136 +#~ msgstr "Enorm" diff --git a/extensions/desktop-icons/po/tr.po b/extensions/desktop-icons/po/tr.po new file mode 100644 -index 0000000..cd2a4f1 +index 00000000..cd2a4f13 --- /dev/null +++ b/extensions/desktop-icons/po/tr.po @@ -0,0 +1,231 @@ @@ -55864,7 +55855,7 @@ index 0000000..cd2a4f1 +#~ msgstr "Tamam" diff --git a/extensions/desktop-icons/po/uk.po b/extensions/desktop-icons/po/uk.po new file mode 100644 -index 0000000..df37099 +index 00000000..df37099a --- /dev/null +++ b/extensions/desktop-icons/po/uk.po @@ -0,0 +1,223 @@ @@ -56093,7 +56084,7 @@ index 0000000..df37099 +msgstr "Показувати змонтовані диски на стільниці." diff --git a/extensions/desktop-icons/po/zh_CN.po b/extensions/desktop-icons/po/zh_CN.po new file mode 100644 -index 0000000..8f2bea4 +index 00000000..8f2bea44 --- /dev/null +++ b/extensions/desktop-icons/po/zh_CN.po @@ -0,0 +1,228 @@ @@ -56327,7 +56318,7 @@ index 0000000..8f2bea4 +#~ msgstr "确定" diff --git a/extensions/desktop-icons/po/zh_TW.po b/extensions/desktop-icons/po/zh_TW.po new file mode 100644 -index 0000000..16fadc4 +index 00000000..16fadc48 --- /dev/null +++ b/extensions/desktop-icons/po/zh_TW.po @@ -0,0 +1,220 @@ @@ -56553,7 +56544,7 @@ index 0000000..16fadc4 +#~ msgstr "巨大圖示" diff --git a/extensions/desktop-icons/prefs.js b/extensions/desktop-icons/prefs.js new file mode 100644 -index 0000000..890bcdb +index 00000000..890bcdb4 --- /dev/null +++ b/extensions/desktop-icons/prefs.js @@ -0,0 +1,161 @@ @@ -56720,7 +56711,7 @@ index 0000000..890bcdb +} diff --git a/extensions/desktop-icons/schemas/meson.build b/extensions/desktop-icons/schemas/meson.build new file mode 100644 -index 0000000..2b17916 +index 00000000..2b179165 --- /dev/null +++ b/extensions/desktop-icons/schemas/meson.build @@ -0,0 +1,6 @@ @@ -56732,7 +56723,7 @@ index 0000000..2b17916 +) diff --git a/extensions/desktop-icons/schemas/org.gnome.shell.extensions.desktop-icons.gschema.xml b/extensions/desktop-icons/schemas/org.gnome.shell.extensions.desktop-icons.gschema.xml new file mode 100644 -index 0000000..de126b5 +index 00000000..de126b5b --- /dev/null +++ b/extensions/desktop-icons/schemas/org.gnome.shell.extensions.desktop-icons.gschema.xml @@ -0,0 +1,30 @@ @@ -56768,7 +56759,7 @@ index 0000000..de126b5 + diff --git a/extensions/desktop-icons/stylesheet.css b/extensions/desktop-icons/stylesheet.css new file mode 100644 -index 0000000..61b4ce8 +index 00000000..61b4ce86 --- /dev/null +++ b/extensions/desktop-icons/stylesheet.css @@ -0,0 +1,42 @@ @@ -56816,7 +56807,7 @@ index 0000000..61b4ce8 +} diff --git a/extensions/desktop-icons/templateManager.js b/extensions/desktop-icons/templateManager.js new file mode 100644 -index 0000000..a468f4a +index 00000000..a468f4ab --- /dev/null +++ b/extensions/desktop-icons/templateManager.js @@ -0,0 +1,104 @@ @@ -56925,7 +56916,7 @@ index 0000000..a468f4a + } +} diff --git a/meson.build b/meson.build -index ad448a9..b95dfc3 100644 +index ad448a99..b95dfc30 100644 --- a/meson.build +++ b/meson.build @@ -28,6 +28,7 @@ uuid_suffix = '@gnome-shell-extensions.gcampax.github.com' @@ -56937,7 +56928,7 @@ index ad448a9..b95dfc3 100644 'launch-new-instance', 'window-list' diff --git a/po/ca.po b/po/ca.po -index d17003f..8e21b71 100644 +index d17003f9..8e21b717 100644 --- a/po/ca.po +++ b/po/ca.po @@ -1,11 +1,18 @@ @@ -57208,7 +57199,7 @@ index d17003f..8e21b71 100644 +msgid "Show mounted drives in the desktop." +msgstr "Mostra la icona de la paperera a l'escriptori." diff --git a/po/cs.po b/po/cs.po -index 572b378..f0d57b7 100644 +index 572b3787..f0d57b72 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1,4 +1,5 @@ @@ -57510,7 +57501,7 @@ index 572b378..f0d57b7 100644 +#~ msgid "Ok" +#~ msgstr "Ok" diff --git a/po/da.po b/po/da.po -index bc592f0..4bd6d2f 100644 +index bc592f02..4bd6d2fe 100644 --- a/po/da.po +++ b/po/da.po @@ -1,3 +1,4 @@ @@ -57782,7 +57773,7 @@ index bc592f0..4bd6d2f 100644 #~ msgstr "Program" diff --git a/po/de.po b/po/de.po -index 30119a7..e824658 100644 +index 30119a76..e8246586 100644 --- a/po/de.po +++ b/po/de.po @@ -1,4 +1,5 @@ @@ -58079,7 +58070,7 @@ index 30119a7..e824658 100644 +#~ msgid "Huge" +#~ msgstr "Riesig" diff --git a/po/el.po b/po/el.po -index bd0a7a5..fde56dd 100644 +index bd0a7a5f..fde56dd9 100644 --- a/po/el.po +++ b/po/el.po @@ -1,4 +1,5 @@ @@ -58344,7 +58335,7 @@ index bd0a7a5..fde56dd 100644 +#~ msgid "Enter file name…" +#~ msgstr "Εισάγετε όνομα αρχείου..." diff --git a/po/en_GB.po b/po/en_GB.po -index 81ca114..e98f70d 100644 +index 81ca1146..e98f70dd 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -1,3 +1,4 @@ @@ -58606,7 +58597,7 @@ index 81ca114..e98f70d 100644 +#~ msgid "OK" +#~ msgstr "OK" diff --git a/po/es.po b/po/es.po -index eaafe99..8d638f0 100644 +index eaafe99e..8d638f09 100644 --- a/po/es.po +++ b/po/es.po @@ -1,4 +1,5 @@ @@ -58960,7 +58951,7 @@ index eaafe99..8d638f0 100644 +#~ msgid "Shows the Videos folder in the desktop." +#~ msgstr "Muestra la carpeta Vídeos en el escritorio." diff --git a/po/eu.po b/po/eu.po -index f3e2669..a006a08 100644 +index f3e26694..a006a082 100644 --- a/po/eu.po +++ b/po/eu.po @@ -1,4 +1,5 @@ @@ -59197,7 +59188,7 @@ index f3e2669..a006a08 100644 +#~ msgid "OK" +#~ msgstr "Ados" diff --git a/po/fa.po b/po/fa.po -index a896e08..f36354e 100644 +index a896e085..f36354ef 100644 --- a/po/fa.po +++ b/po/fa.po @@ -1,11 +1,20 @@ @@ -59588,7 +59579,7 @@ index a896e08..f36354e 100644 #~ msgstr "فعال/غیرفعال کردن مخفی‌سازی خودکار" diff --git a/po/fi.po b/po/fi.po -index e5ab20e..aec2626 100644 +index e5ab20ef..aec2626b 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,3 +1,4 @@ @@ -59899,7 +59890,7 @@ index e5ab20e..aec2626 100644 +#~ msgid "Huge" +#~ msgstr "Valtava" diff --git a/po/fr.po b/po/fr.po -index b184915..d525a5a 100644 +index b1849159..d525a5a8 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,4 +1,5 @@ @@ -60177,7 +60168,7 @@ index b184915..d525a5a 100644 #~ msgstr "Créer une nouvelle règle de concordance" diff --git a/po/fur.po b/po/fur.po -index c3a071c..d1fdf14 100644 +index c3a071c3..d1fdf148 100644 --- a/po/fur.po +++ b/po/fur.po @@ -1,10 +1,19 @@ @@ -60463,7 +60454,7 @@ index c3a071c..d1fdf14 100644 +#~ msgid "OK" +#~ msgstr "Va ben" diff --git a/po/hr.po b/po/hr.po -index 6accc6e..c35afb0 100644 +index 6accc6e0..c35afb01 100644 --- a/po/hr.po +++ b/po/hr.po @@ -1,10 +1,19 @@ @@ -60744,7 +60735,7 @@ index 6accc6e..c35afb0 100644 +#~ msgid "OK" +#~ msgstr "U redu" diff --git a/po/hu.po b/po/hu.po -index 8be4d93..6030508 100644 +index 8be4d93d..60305081 100644 --- a/po/hu.po +++ b/po/hu.po @@ -1,4 +1,5 @@ @@ -61020,7 +61011,7 @@ index 8be4d93..6030508 100644 +#~ msgid "Enter file name…" +#~ msgstr "Adjon meg egy fájlnevet…" diff --git a/po/id.po b/po/id.po -index af7463f..2226858 100644 +index af7463f3..22268582 100644 --- a/po/id.po +++ b/po/id.po @@ -1,4 +1,5 @@ @@ -61295,7 +61286,7 @@ index af7463f..2226858 100644 #~ msgstr "Aplikasi" diff --git a/po/it.po b/po/it.po -index 4b42592..2b24e1b 100644 +index 4b425925..2b24e1b1 100644 --- a/po/it.po +++ b/po/it.po @@ -1,4 +1,5 @@ @@ -61517,7 +61508,7 @@ index 4b42592..2b24e1b 100644 +msgid "Show the trash icon in the desktop." +msgstr "Mostra il cestino sulla scrivania." diff --git a/po/ja.po b/po/ja.po -index 30b8420..8eb7725 100644 +index 30b84200..8eb77253 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1,4 +1,5 @@ @@ -61841,7 +61832,7 @@ index 30b8420..8eb7725 100644 #~ msgstr "ドックの位置" diff --git a/po/kab.po b/po/kab.po -index bc98151..5184aac 100644 +index bc98151d..5184aac5 100644 --- a/po/kab.po +++ b/po/kab.po @@ -3,8 +3,10 @@ @@ -62108,7 +62099,7 @@ index bc98151..5184aac 100644 +msgid "Show mounted drives in the desktop." +msgstr "Sken iḍebsiyen irekben deg tnarit." diff --git a/po/ko.po b/po/ko.po -index aeb5010..e7926e9 100644 +index aeb5010c..e7926e95 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1,3 +1,4 @@ @@ -62382,7 +62373,7 @@ index aeb5010..e7926e9 100644 #~ msgstr "프로그램" diff --git a/po/nl.po b/po/nl.po -index 6a1ee07..b1d2aed 100644 +index 6a1ee07c..b1d2aed2 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1,4 +1,5 @@ @@ -62658,7 +62649,7 @@ index 6a1ee07..b1d2aed 100644 +#~ msgid "OK" +#~ msgstr "Oké" diff --git a/po/oc.po b/po/oc.po -index 1798ace..4e1bd63 100644 +index 1798ace8..4e1bd637 100644 --- a/po/oc.po +++ b/po/oc.po @@ -1,10 +1,19 @@ @@ -62939,7 +62930,7 @@ index 1798ace..4e1bd63 100644 -#~ msgid "Display Settings" -#~ msgstr "Afichar los paramètres" diff --git a/po/pl.po b/po/pl.po -index a97366b..7b26d43 100644 +index a97366b6..7b26d43f 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1,4 +1,5 @@ @@ -63222,7 +63213,7 @@ index a97366b..7b26d43 100644 #~ msgstr "Wyświetla kropkę dla każdego okna programu" diff --git a/po/pt.po b/po/pt.po -index 11b2079..afd0c03 100644 +index 11b20794..afd0c037 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1,4 +1,5 @@ @@ -63518,7 +63509,7 @@ index 11b2079..afd0c03 100644 -#~ msgid "Display Settings" -#~ msgstr "Definições de Visualização" diff --git a/po/pt_BR.po b/po/pt_BR.po -index 9dc0db8..16117ce 100644 +index 9dc0db84..16117cec 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1,4 +1,5 @@ @@ -63853,7 +63844,7 @@ index 9dc0db8..16117ce 100644 +#~ msgid "Ok" +#~ msgstr "Ok" diff --git a/po/ro.po b/po/ro.po -index 26edf85..6378ac7 100644 +index 26edf85e..6378ac71 100644 --- a/po/ro.po +++ b/po/ro.po @@ -1,10 +1,19 @@ @@ -64116,7 +64107,7 @@ index 26edf85..6378ac7 100644 #~ msgstr "Aplicație" diff --git a/po/ru.po b/po/ru.po -index de5dbbb..360d636 100644 +index de5dbbb5..360d636f 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,4 +1,5 @@ @@ -64353,7 +64344,7 @@ index de5dbbb..360d636 100644 +#~ msgid "Ok" +#~ msgstr "ОК" diff --git a/po/sk.po b/po/sk.po -index e8330d0..4c6c91b 100644 +index e8330d08..4c6c91b4 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1,4 +1,5 @@ @@ -64625,7 +64616,7 @@ index e8330d0..4c6c91b 100644 #~ msgid "Application" #~ msgstr "Aplikácia" diff --git a/po/sl.po b/po/sl.po -index 273c160..0a3ee8e 100644 +index 273c1606..0a3ee8e6 100644 --- a/po/sl.po +++ b/po/sl.po @@ -1,11 +1,21 @@ @@ -64915,7 +64906,7 @@ index 273c160..0a3ee8e 100644 +#~ msgid "Huge" +#~ msgstr "Velikanske" diff --git a/po/sr.po b/po/sr.po -index 92ab694..d18451a 100644 +index 92ab6945..d18451a4 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1,4 +1,5 @@ @@ -65197,7 +65188,7 @@ index 92ab694..d18451a 100644 #~ msgstr "Програм" diff --git a/po/sv.po b/po/sv.po -index 2ca88c5..dedabe1 100644 +index 2ca88c58..dedabe1b 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,4 +1,5 @@ @@ -65496,7 +65487,7 @@ index 2ca88c5..dedabe1 100644 +#~ msgid "Huge" +#~ msgstr "Enorm" diff --git a/po/tr.po b/po/tr.po -index 38bbc7b..3870d35 100644 +index 38bbc7b6..3870d35e 100644 --- a/po/tr.po +++ b/po/tr.po @@ -1,4 +1,5 @@ @@ -65783,7 +65774,7 @@ index 38bbc7b..3870d35 100644 +#~ msgid "OK" +#~ msgstr "Tamam" diff --git a/po/uk.po b/po/uk.po -index f0b0846..a73dcee 100644 +index f0b08466..a73dceec 100644 --- a/po/uk.po +++ b/po/uk.po @@ -1,3 +1,4 @@ @@ -66093,7 +66084,7 @@ index f0b0846..a73dcee 100644 #~ msgstr "Розташування панелі" diff --git a/po/zh_CN.po b/po/zh_CN.po -index 338e86e..69e6fcb 100644 +index 338e86ed..69e6fcbf 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1,4 +1,5 @@ @@ -66409,7 +66400,7 @@ index 338e86e..69e6fcb 100644 +#~ msgid "OK" +#~ msgstr "确定" diff --git a/po/zh_TW.po b/po/zh_TW.po -index 14e60cc..4bdf715 100644 +index 14e60ccb..4bdf7154 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -1,4 +1,5 @@ @@ -66739,5 +66730,5 @@ index 14e60cc..4bdf715 100644 +#~ msgid "Huge" +#~ msgstr "巨大圖示" -- -2.28.0 +2.31.1 diff --git a/gnome-shell-extensions.spec b/gnome-shell-extensions.spec index 690d9c4..1ce0729 100644 --- a/gnome-shell-extensions.spec +++ b/gnome-shell-extensions.spec @@ -7,7 +7,7 @@ Name: gnome-shell-extensions Version: 40.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Modify and extend GNOME Shell functionality and behavior License: GPLv2+ @@ -348,6 +348,10 @@ workspaces. %changelog +* Wed May 26 2021 Florian Müllner - 40.1-3 +- Fix various issues in downstream patches + Resolves: #1932261 + * Mon May 24 2021 Florian Müllner - 40.1-2 - Rebase downstream patches Resolves: #1932261 diff --git a/resurrect-system-monitor.patch b/resurrect-system-monitor.patch index f267de6..a3bad81 100644 --- a/resurrect-system-monitor.patch +++ b/resurrect-system-monitor.patch @@ -1,7 +1,7 @@ -From a226633a5acd6356f9ed8794a12f7501f25e018b Mon Sep 17 00:00:00 2001 +From 3178a99e48167ad31b1e52e9afc2041bfee34593 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Wed, 17 May 2017 19:13:50 +0200 -Subject: [PATCH 1/5] extensions: Resurrect systemMonitor extension +Subject: [PATCH 1/6] extensions: Resurrect systemMonitor extension The extension was removed upstream because: - it hooks into the message tray that was removed @@ -26,7 +26,7 @@ This reverts commit c9a6421f362cd156cf731289eadc11f44f6970ac. diff --git a/extensions/systemMonitor/extension.js b/extensions/systemMonitor/extension.js new file mode 100644 -index 0000000..7b09df0 +index 00000000..7b09df01 --- /dev/null +++ b/extensions/systemMonitor/extension.js @@ -0,0 +1,376 @@ @@ -408,7 +408,7 @@ index 0000000..7b09df0 +} diff --git a/extensions/systemMonitor/meson.build b/extensions/systemMonitor/meson.build new file mode 100644 -index 0000000..48504f6 +index 00000000..48504f63 --- /dev/null +++ b/extensions/systemMonitor/meson.build @@ -0,0 +1,5 @@ @@ -419,7 +419,7 @@ index 0000000..48504f6 +) diff --git a/extensions/systemMonitor/metadata.json.in b/extensions/systemMonitor/metadata.json.in new file mode 100644 -index 0000000..fa75007 +index 00000000..fa750074 --- /dev/null +++ b/extensions/systemMonitor/metadata.json.in @@ -0,0 +1,11 @@ @@ -436,7 +436,7 @@ index 0000000..fa75007 +} diff --git a/extensions/systemMonitor/stylesheet.css b/extensions/systemMonitor/stylesheet.css new file mode 100644 -index 0000000..13f95ec +index 00000000..13f95ec7 --- /dev/null +++ b/extensions/systemMonitor/stylesheet.css @@ -0,0 +1,35 @@ @@ -476,7 +476,7 @@ index 0000000..13f95ec + font-weight: bold; +} diff --git a/meson.build b/meson.build -index b95dfc3..ada6b92 100644 +index b95dfc30..ada6b921 100644 --- a/meson.build +++ b/meson.build @@ -48,6 +48,7 @@ all_extensions += [ @@ -488,27 +488,29 @@ index b95dfc3..ada6b92 100644 'updates-dialog', 'user-theme' -- -2.28.0 +2.31.1 -From 260d286780690b9df6020472bb1af664ecf33e43 Mon Sep 17 00:00:00 2001 +From d93f5edfc243dc065db74535de3db1222b483865 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Fri, 17 May 2019 22:55:48 +0000 -Subject: [PATCH 2/5] systemMonitor: Modernise code +Subject: [PATCH 2/6] systemMonitor: Modernise code - port to ES6 classes - replace Lang.bind() + - replace Tweener + - use standard align/expand properties - destructure imports - fix style issues (stray/missing spaces/semi-colons, indent, ...) --- - extensions/systemMonitor/extension.js | 377 +++++++++++++------------- - 1 file changed, 192 insertions(+), 185 deletions(-) + extensions/systemMonitor/extension.js | 422 +++++++++++++------------- + 1 file changed, 212 insertions(+), 210 deletions(-) diff --git a/extensions/systemMonitor/extension.js b/extensions/systemMonitor/extension.js -index 7b09df0..89f8916 100644 +index 7b09df01..f7c6a4a9 100644 --- a/extensions/systemMonitor/extension.js +++ b/extensions/systemMonitor/extension.js -@@ -1,22 +1,16 @@ +@@ -1,56 +1,57 @@ /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */ -const Clutter = imports.gi.Clutter; @@ -523,7 +525,7 @@ index 7b09df0..89f8916 100644 + +const ExtensionUtils = imports.misc.extensionUtils; const Main = imports.ui.main; - const Tweener = imports.ui.tweener; +-const Tweener = imports.ui.tweener; const Gettext = imports.gettext.domain('gnome-shell-extensions'); const _ = Gettext.gettext; @@ -535,8 +537,10 @@ index 7b09df0..89f8916 100644 const INDICATOR_UPDATE_INTERVAL = 500; const INDICATOR_NUM_GRID_LINES = 3; -@@ -24,32 +18,38 @@ const ITEM_LABEL_SHOW_TIME = 0.15; - const ITEM_LABEL_HIDE_TIME = 0.1; +-const ITEM_LABEL_SHOW_TIME = 0.15; +-const ITEM_LABEL_HIDE_TIME = 0.1; ++const ITEM_LABEL_SHOW_TIME = 150; ++const ITEM_LABEL_HIDE_TIME = 100; const ITEM_HOVER_TIMEOUT = 300; -const Indicator = new Lang.Class({ @@ -549,7 +553,11 @@ index 7b09df0..89f8916 100644 - this.drawing_area = new St.DrawingArea({ reactive: true }); - this.drawing_area.connect('repaint', Lang.bind(this, this._draw)); - this.drawing_area.connect('button-press-event', function() { -+ this._drawingArea = new St.DrawingArea({ reactive: true }); ++ this._drawingArea = new St.DrawingArea({ ++ reactive: true, ++ x_expand: true, ++ y_expand: true, ++ }); + this._drawingArea.connect('repaint', this._draw.bind(this)); + this._drawingArea.connect('button-press-event', () => { let app = Shell.AppSystem.get_default().lookup_app('gnome-system-monitor.desktop'); @@ -565,10 +573,10 @@ index 7b09df0..89f8916 100644 + style_class: 'extension-systemMonitor-indicator-area', + reactive: true, + track_hover: true, -+ x_fill: true, -+ y_fill: true + }); + this.actor.add_actor(this._drawingArea); ++ ++ this.actor.connect('destroy', this._onDestroy.bind(this)); - this._timeout = Mainloop.timeout_add(INDICATOR_UPDATE_INTERVAL, Lang.bind(this, function () { - this._updateValues(); @@ -576,9 +584,6 @@ index 7b09df0..89f8916 100644 - return true; - })); - }, -+ this.actor.connect('destroy', this._onDestroy.bind(this)); - -- showLabel: function() { + this._timeout = GLib.timeout_add(GLib.PRIORITY_DEFAULT, + INDICATOR_UPDATE_INTERVAL, + () => { @@ -587,12 +592,15 @@ index 7b09df0..89f8916 100644 + return GLib.SOURCE_CONTINUE; + }); + } -+ + +- showLabel: function() { +- if (this.label == null) + showLabel() { - if (this.label == null) ++ if (this.label === null) return; -@@ -58,12 +58,10 @@ const Indicator = new Lang.Class({ + this.label.opacity = 0; +@@ -58,12 +59,10 @@ const Indicator = new Lang.Class({ let [stageX, stageY] = this.actor.get_transformed_position(); @@ -608,7 +616,7 @@ index 7b09df0..89f8916 100644 let x = stageX + xOffset; -@@ -73,48 +71,51 @@ const Indicator = new Lang.Class({ +@@ -73,116 +72,113 @@ const Indicator = new Lang.Class({ let y = stageY - this.label.get_height() - yOffset; this.label.set_position(x, y); @@ -618,21 +626,22 @@ index 7b09df0..89f8916 100644 - transition: 'easeOutQuad', - }); - }, -- -- setLabelText: function(text) { -+ Tweener.addTween(this.label, { ++ this.label.ease({ + opacity: 255, -+ time: ITEM_LABEL_SHOW_TIME, -+ transition: 'easeOutQuad', ++ duration: ITEM_LABEL_SHOW_TIME, ++ mode: Clutter.AnimationMode.EASE_OUT_QUAD, + }); + } -+ -+ setLabelText(text) { - if (this.label == null) + +- setLabelText: function(text) { +- if (this.label == null) - this.label = new St.Label({ style_class: 'extension-systemMonitor-indicator-label'}); ++ setLabelText(text) { ++ if (this.label === null) { + this.label = new St.Label({ -+ style_class: 'extension-systemMonitor-indicator-label' ++ style_class: 'extension-systemMonitor-indicator-label', + }); ++ } this.label.set_text(text); Main.layoutManager.addChrome(this.label); @@ -655,11 +664,11 @@ index 7b09df0..89f8916 100644 + } + hideLabel() { -+ Tweener.addTween(this.label, { ++ this.label.ease({ + opacity: 0, -+ time: ITEM_LABEL_HIDE_TIME, -+ transition: 'easeOutQuad', -+ onComplete: () => this.label.hide() ++ duration: ITEM_LABEL_HIDE_TIME, ++ mode: Clutter.AnimationMode.EASE_OUT_QUAD, ++ onComplete: () => this.label.hide(), + }); + } + @@ -669,30 +678,32 @@ index 7b09df0..89f8916 100644 - this.label.destroy(); - }, + } -+ -+ _onDestroy() { -+ GLib.source_remove(this._timeout); -+ -+ if (this.label) -+ this.label.destroy(); -+ } - _initValues: function() { - }, -+ _initValues() { -+ } ++ _onDestroy() { ++ GLib.source_remove(this._timeout); - _updateValues: function() { - }, -+ _updateValues() { ++ if (this.label) ++ this.label.destroy(); ++ } ++ ++ _initValues() { + } - _draw: function(area) { ++ _updateValues() { ++ } ++ + _draw(area) { let [width, height] = area.get_surface_size(); let themeNode = this.actor.get_theme_node(); let cr = area.get_context(); -@@ -123,12 +124,12 @@ const Indicator = new Lang.Class({ + +- //draw the background grid ++ // draw the background grid let color = themeNode.get_color(this.gridColor); let gridOffset = Math.floor(height / (INDICATOR_NUM_GRID_LINES + 1)); for (let i = 1; i <= INDICATOR_NUM_GRID_LINES; ++i) { @@ -707,23 +718,61 @@ index 7b09df0..89f8916 100644 + cr.setDash([4, 1], 0); cr.stroke(); - //draw the foreground -@@ -155,12 +156,12 @@ const Indicator = new Lang.Class({ +- //draw the foreground ++ // draw the foreground + +- function makePath(values, reverse, nudge) { +- if (nudge == null) { +- nudge = 0; +- } +- //if we are going in reverse, we are completing the bottom of a chart, so use lineTo ++ function makePath(values, reverse, nudge = 0) { ++ // if we are going in reverse, we are completing the bottom of a chart, so use lineTo + if (reverse) { + cr.lineTo(values.length - 1, (1 - values[values.length - 1]) * height + nudge); +- for (let k = values.length - 2; k >= 0; --k) { ++ for (let k = values.length - 2; k >= 0; --k) + cr.lineTo(k, (1 - values[k]) * height + nudge); +- } + } else { + cr.moveTo(0, (1 - values[0]) * height + nudge); +- for (let k = 1; k < values.length; ++k) { ++ for (let k = 1; k < values.length; ++k) + cr.lineTo(k, (1 - values[k]) * height + nudge); +- } +- + } + } + let renderStats = this.renderStats; // Make sure we don't have more sample points than pixels - renderStats.map(Lang.bind(this, function(k){ -+ renderStats.map(k => { ++ renderStats.forEach(k => { let stat = this.stats[k]; - if (stat.values.length > width) { +- if (stat.values.length > width) { ++ if (stat.values.length > width) stat.values = stat.values.slice(stat.values.length - width, stat.values.length); - } +- } - })); + }); for (let i = 0; i < renderStats.length; ++i) { let stat = this.stats[renderStats[i]]; -@@ -178,10 +179,10 @@ const Indicator = new Lang.Class({ + // We outline at full opacity and fill with 40% opacity + let outlineColor = themeNode.get_color(stat.color); +- let color = new Clutter.Color(outlineColor); +- color.alpha = color.alpha * .4; ++ let fillColor = new Clutter.Color(outlineColor); ++ fillColor.alpha *= .4; + + // Render the background between us and the next level + makePath(stat.values, false); + // If there is a process below us, render the cpu between us and it, otherwise, + // render to the bottom of the chart +- if (i == renderStats.length - 1) { ++ if (i === renderStats.length - 1) { + cr.lineTo(stat.values.length - 1, height); cr.lineTo(0, height); cr.closePath(); } else { @@ -732,21 +781,23 @@ index 7b09df0..89f8916 100644 makePath(nextStat.values, true); } - cr.closePath() +- Clutter.cairo_set_source_color(cr, color); + cr.closePath(); - Clutter.cairo_set_source_color(cr, color); ++ Clutter.cairo_set_source_color(cr, fillColor); cr.fill(); -@@ -193,40 +194,42 @@ const Indicator = new Lang.Class({ + // Render the outline of this level +@@ -193,41 +189,43 @@ const Indicator = new Lang.Class({ cr.stroke(); } } -}); -- ++}; + -const CpuIndicator = new Lang.Class({ - Name: 'SystemMonitor.CpuIndicator', - Extends: Indicator, -+}; - +- - _init: function() { - this.parent(); +const CpuIndicator = class extends Indicator { @@ -764,7 +815,7 @@ index 7b09df0..89f8916 100644 + 'cpu-total': 0, + 'cpu-user': 1, + 'cpu-sys': 2, -+ 'cpu-iowait': 3 ++ 'cpu-iowait': 3, + }; + this.renderStats = this.renderStats.sort((a, b) => { return renderStatOrder[a] - renderStatOrder[b]; @@ -776,8 +827,9 @@ index 7b09df0..89f8916 100644 + } - _initValues: function() { +- this._prev = new GTop.glibtop_cpu; + _initValues() { - this._prev = new GTop.glibtop_cpu; ++ this._prev = new GTop.glibtop_cpu(); GTop.glibtop_get_cpu(this._prev); this.stats = { @@ -789,18 +841,20 @@ index 7b09df0..89f8916 100644 - }, - - _updateValues: function() { +- let cpu = new GTop.glibtop_cpu; + 'cpu-user': { color: '-cpu-user-color', values: [] }, + 'cpu-sys': { color: '-cpu-sys-color', values: [] }, + 'cpu-iowait': { color: '-cpu-iowait-color', values: [] }, -+ 'cpu-total': { color: '-cpu-total-color', values: [] } ++ 'cpu-total': { color: '-cpu-total-color', values: [] }, + }; + } + + _updateValues() { - let cpu = new GTop.glibtop_cpu; ++ let cpu = new GTop.glibtop_cpu(); let t = 0.0; GTop.glibtop_get_cpu(cpu); -@@ -246,37 +249,34 @@ const CpuIndicator = new Lang.Class({ + let total = cpu.total - this._prev.total; +@@ -246,37 +244,34 @@ const CpuIndicator = new Lang.Class({ this._prev = cpu; } @@ -834,8 +888,9 @@ index 7b09df0..89f8916 100644 + } - _initValues: function() { +- this.mem = new GTop.glibtop_mem; + _initValues() { - this.mem = new GTop.glibtop_mem; ++ this.mem = new GTop.glibtop_mem(); this.stats = { - 'mem-user': { color: "-mem-user-color", values: [] }, - 'mem-other': { color: "-mem-other-color", values: [] }, @@ -844,7 +899,7 @@ index 7b09df0..89f8916 100644 - }, + 'mem-user': { color: '-mem-user-color', values: [] }, + 'mem-other': { color: '-mem-other-color', values: [] }, -+ 'mem-cached': { color: '-mem-cached-color', values: [] } ++ 'mem-cached': { color: '-mem-cached-color', values: [] }, + }; + } @@ -853,7 +908,7 @@ index 7b09df0..89f8916 100644 GTop.glibtop_get_mem(this.mem); let t = this.mem.user / this.mem.total; -@@ -286,90 +286,97 @@ const MemoryIndicator = new Lang.Class({ +@@ -286,90 +281,97 @@ const MemoryIndicator = new Lang.Class({ t += this.mem.cached / this.mem.total; this.stats['mem-cached'].values.push(t); } @@ -926,12 +981,12 @@ index 7b09df0..89f8916 100644 + this._box = new St.BoxLayout({ + style_class: 'extension-systemMonitor-container', + x_align: Clutter.ActorAlign.START, -+ x_expand: true ++ x_expand: true, + }); + this._indicators = []; + + for (let i = 0; i < INDICATORS.length; i++) { -+ let indicator = new (INDICATORS[i])(); ++ let indicator = new INDICATORS[i](); + + indicator.actor.connect('notify::hover', () => { + this._onHover(indicator); @@ -1026,13 +1081,119 @@ index 7b09df0..89f8916 100644 function init() { return new Extension(); -- -2.28.0 +2.31.1 -From b98133d5a73701d876c3ab2be591762359a16669 Mon Sep 17 00:00:00 2001 +From 84d881157d59a8701f351f69698edfbaf806898e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Florian=20M=C3=BCllner?= +Date: Wed, 26 May 2021 19:50:37 +0200 +Subject: [PATCH 3/6] systemMonitor: Make label property private + +There is no good reason to use a public property, and the name will +clash when we subclass St.Button. +--- + extensions/systemMonitor/extension.js | 35 ++++++++++++++------------- + 1 file changed, 18 insertions(+), 17 deletions(-) + +diff --git a/extensions/systemMonitor/extension.js b/extensions/systemMonitor/extension.js +index f7c6a4a9..bde25a1d 100644 +--- a/extensions/systemMonitor/extension.js ++++ b/extensions/systemMonitor/extension.js +@@ -19,6 +19,7 @@ const ITEM_HOVER_TIMEOUT = 300; + + const Indicator = class { + constructor() { ++ this._label = null; + this._initValues(); + this._drawingArea = new St.DrawingArea({ + reactive: true, +@@ -51,28 +52,28 @@ const Indicator = class { + } + + showLabel() { +- if (this.label === null) ++ if (this._label === null) + return; + +- this.label.opacity = 0; +- this.label.show(); ++ this._label.opacity = 0; ++ this._label.show(); + + let [stageX, stageY] = this.actor.get_transformed_position(); + + let itemWidth = this.actor.allocation.x2 - this.actor.allocation.x1; + +- let labelWidth = this.label.width; ++ let labelWidth = this._label.width; + let xOffset = Math.floor((itemWidth - labelWidth) / 2); + + let x = stageX + xOffset; + +- let node = this.label.get_theme_node(); ++ let node = this._label.get_theme_node(); + let yOffset = node.get_length('-y-offset'); + +- let y = stageY - this.label.get_height() - yOffset; ++ let y = stageY - this._label.get_height() - yOffset; + +- this.label.set_position(x, y); +- this.label.ease({ ++ this._label.set_position(x, y); ++ this._label.ease({ + opacity: 255, + duration: ITEM_LABEL_SHOW_TIME, + mode: Clutter.AnimationMode.EASE_OUT_QUAD, +@@ -80,23 +81,23 @@ const Indicator = class { + } + + setLabelText(text) { +- if (this.label === null) { +- this.label = new St.Label({ ++ if (this._label === null) { ++ this._label = new St.Label({ + style_class: 'extension-systemMonitor-indicator-label', + }); + } + +- this.label.set_text(text); +- Main.layoutManager.addChrome(this.label); +- this.label.hide(); ++ this._label.set_text(text); ++ Main.layoutManager.addChrome(this._label); ++ this._label.hide(); + } + + hideLabel() { +- this.label.ease({ ++ this._label.ease({ + opacity: 0, + duration: ITEM_LABEL_HIDE_TIME, + mode: Clutter.AnimationMode.EASE_OUT_QUAD, +- onComplete: () => this.label.hide(), ++ onComplete: () => this._label.hide(), + }); + } + +@@ -107,8 +108,8 @@ const Indicator = class { + _onDestroy() { + GLib.source_remove(this._timeout); + +- if (this.label) +- this.label.destroy(); ++ if (this._label) ++ this._label.destroy(); + } + + _initValues() { +-- +2.31.1 + + +From fd961a7f6766e4c48d492bb4e37ee8bc250eb228 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Wed, 17 May 2017 19:31:58 +0200 -Subject: [PATCH 3/5] systemMonitor: Move indicators to calendar +Subject: [PATCH 4/6] systemMonitor: Move indicators to calendar The message tray joined the invisible choir, so we have to find a new home for the extension UI. The message list in the calendar @@ -1040,45 +1201,59 @@ drop-down looks like the best option, given that it replaced the old tray (and also took over the old keyboard shortcut to bring it up quickly). --- - extensions/systemMonitor/extension.js | 65 ++++++++++++------------- - extensions/systemMonitor/stylesheet.css | 14 ------ - 2 files changed, 31 insertions(+), 48 deletions(-) + extensions/systemMonitor/extension.js | 106 +++++++++++------------- + extensions/systemMonitor/stylesheet.css | 14 ---- + 2 files changed, 50 insertions(+), 70 deletions(-) diff --git a/extensions/systemMonitor/extension.js b/extensions/systemMonitor/extension.js -index 89f8916..0188960 100644 +index bde25a1d..1fd01ab4 100644 --- a/extensions/systemMonitor/extension.js +++ b/extensions/systemMonitor/extension.js -@@ -3,9 +3,11 @@ +@@ -2,10 +2,11 @@ + /* exported init */ - const { Clutter, GLib, GTop, Shell, St } = imports.gi; -+const Signals = imports.signals; +-const { Clutter, GLib, GTop, Shell, St } = imports.gi; ++const { Clutter, GLib, GObject, GTop, Shell, St } = imports.gi; const ExtensionUtils = imports.misc.extensionUtils; const Main = imports.ui.main; +const MessageList = imports.ui.messageList; - const Tweener = imports.ui.tweener; const Gettext = imports.gettext.domain('gnome-shell-extensions'); -@@ -21,22 +23,25 @@ const ITEM_HOVER_TIMEOUT = 300; - const Indicator = class { - constructor() { + const _ = Gettext.gettext; +@@ -17,30 +18,38 @@ const ITEM_LABEL_SHOW_TIME = 150; + const ITEM_LABEL_HIDE_TIME = 100; + const ITEM_HOVER_TIMEOUT = 300; + +-const Indicator = class { +- constructor() { ++const Indicator = GObject.registerClass({ ++ Signals: { ++ 'close': {}, ++ 'expanded': {}, ++ 'unexpanded': {}, ++ }, ++}, class Indicator extends St.Button { ++ _init() { + this._label = null; this._initValues(); -- this._drawingArea = new St.DrawingArea({ reactive: true }); -+ this._drawingArea = new St.DrawingArea(); + this._drawingArea = new St.DrawingArea({ +- reactive: true, + x_expand: true, + y_expand: true, + }); this._drawingArea.connect('repaint', this._draw.bind(this)); - this._drawingArea.connect('button-press-event', () => { + -+ this.actor = new St.Button({ ++ super._init({ + style_class: 'message message-content extension-systemMonitor-indicator-area', + child: this._drawingArea, + x_expand: true, -+ x_fill: true, -+ y_fill: true, -+ can_focus: true ++ can_focus: true, + }); + -+ this.actor.connect('clicked', () => { ++ this.connect('clicked', () => { let app = Shell.AppSystem.get_default().lookup_app('gnome-system-monitor.desktop'); app.open_new_window(-1); - return true; @@ -1088,66 +1263,125 @@ index 89f8916..0188960 100644 - style_class: 'extension-systemMonitor-indicator-area', - reactive: true, - track_hover: true, -- x_fill: true, -- y_fill: true + Main.overview.hide(); + Main.panel.closeCalendar(); }); - this.actor.add_actor(this._drawingArea); - this.actor.connect('destroy', this._onDestroy.bind(this)); +- this.actor.connect('destroy', this._onDestroy.bind(this)); ++ this.connect('destroy', this._onDestroy.bind(this)); -@@ -71,6 +76,7 @@ const Indicator = class { - let y = stageY - this.label.get_height() - yOffset; + this._timeout = GLib.timeout_add(GLib.PRIORITY_DEFAULT, + INDICATOR_UPDATE_INTERVAL, +@@ -58,9 +67,9 @@ const Indicator = class { + this._label.opacity = 0; + this._label.show(); - this.label.set_position(x, y); -+ this.label.get_parent().set_child_above_sibling(this.label, null); - Tweener.addTween(this.label, { +- let [stageX, stageY] = this.actor.get_transformed_position(); ++ let [stageX, stageY] = this.get_transformed_position(); + +- let itemWidth = this.actor.allocation.x2 - this.actor.allocation.x1; ++ let itemWidth = this.allocation.x2 - this.allocation.x1; + + let labelWidth = this._label.width; + let xOffset = Math.floor((itemWidth - labelWidth) / 2); +@@ -73,6 +82,7 @@ const Indicator = class { + let y = stageY - this._label.get_height() - yOffset; + + this._label.set_position(x, y); ++ this._label.get_parent().set_child_above_sibling(this._label, null); + this._label.ease({ opacity: 255, - time: ITEM_LABEL_SHOW_TIME, -@@ -98,6 +104,14 @@ const Indicator = class { + duration: ITEM_LABEL_SHOW_TIME, +@@ -101,8 +111,12 @@ const Indicator = class { }); } +- destroy() { +- this.actor.destroy(); + /* MessageList.Message boilerplate */ + canClose() { + return false; + } + + clear() { -+ } -+ - destroy() { - this.actor.destroy(); } -@@ -195,6 +209,7 @@ const Indicator = class { + + _onDestroy() { +@@ -120,7 +134,7 @@ const Indicator = class { + + _draw(area) { + let [width, height] = area.get_surface_size(); +- let themeNode = this.actor.get_theme_node(); ++ let themeNode = this.get_theme_node(); + let cr = area.get_context(); + + // draw the background grid +@@ -190,11 +204,12 @@ const Indicator = class { + cr.stroke(); } } - }; -+Signals.addSignalMethods(Indicator.prototype); // For MessageList.Message compat +-}; ++}); - const CpuIndicator = class extends Indicator { - constructor() { -@@ -300,11 +315,7 @@ class Extension { +-const CpuIndicator = class extends Indicator { +- constructor() { +- super(); ++const CpuIndicator = GObject.registerClass( ++class CpuIndicator extends Indicator { ++ _init() { ++ super._init(); + + this.gridColor = '-grid-color'; + this.renderStats = ['cpu-user', 'cpu-sys', 'cpu-iowait']; +@@ -245,11 +260,12 @@ const CpuIndicator = class extends Indicator { + + this._prev = cpu; + } +-}; ++}); + +-const MemoryIndicator = class extends Indicator { +- constructor() { +- super(); ++const MemoryIndicator = GObject.registerClass( ++class MemoryIndicator extends Indicator { ++ _init() { ++ super._init(); + + this.gridColor = '-grid-color'; + this.renderStats = ['mem-user', 'mem-other', 'mem-cached']; +@@ -282,7 +298,7 @@ const MemoryIndicator = class extends Indicator { + t += this.mem.cached / this.mem.total; + this.stats['mem-cached'].values.push(t); + } +-}; ++}); + + const INDICATORS = [CpuIndicator, MemoryIndicator]; + +@@ -296,49 +312,27 @@ class Extension { } enable() { - this._box = new St.BoxLayout({ - style_class: 'extension-systemMonitor-container', - x_align: Clutter.ActorAlign.START, -- x_expand: true +- x_expand: true, - }); +- this._indicators = []; + this._section = new MessageList.MessageListSection(_('System Monitor')); - this._indicators = []; for (let i = 0; i < INDICATORS.length; i++) { -@@ -313,32 +324,18 @@ class Extension { - indicator.actor.connect('notify::hover', () => { + let indicator = new INDICATORS[i](); + +- indicator.actor.connect('notify::hover', () => { ++ indicator.connect('notify::hover', () => { this._onHover(indicator); }); - this._box.add_actor(indicator.actor); +- this._indicators.push(indicator); + this._section.addMessage(indicator, false); - this._indicators.push(indicator); } - this._boxHolder = new St.BoxLayout({ @@ -1162,24 +1396,29 @@ index 89f8916..0188960 100644 - this._boxHolder.add_child(this._box); - this._boxHolder.add_child(menuButton); + Main.panel.statusArea.dateMenu._messageList._addSection(this._section); -+ this._section.actor.get_parent().set_child_at_index(this._section.actor, 0); ++ this._section.get_parent().set_child_at_index(this._section, 0); } disable() { - this._indicators.forEach(i => i.destroy()); - +- this._indicators.forEach(i => i.destroy()); +- - let menuButton = Main.messageTray._messageTrayMenuButton.actor; - this._boxHolder.remove_child(menuButton); - Main.messageTray.actor.add_child(menuButton); - - this._box.destroy(); - this._boxHolder.destroy(); -+ Main.panel.statusArea.dateMenu._messageList._removeSection(this._section); ++ this._section.destroy(); } _onHover(item) { +- if (item.actor.get_hover()) { ++ if (item.get_hover()) { + if (this._showLabelTimeoutId) + return; + diff --git a/extensions/systemMonitor/stylesheet.css b/extensions/systemMonitor/stylesheet.css -index 13f95ec..978ac12 100644 +index 13f95ec7..978ac12a 100644 --- a/extensions/systemMonitor/stylesheet.css +++ b/extensions/systemMonitor/stylesheet.css @@ -1,17 +1,4 @@ @@ -1209,13 +1448,13 @@ index 13f95ec..978ac12 100644 .extension-systemMonitor-indicator-label { -- -2.28.0 +2.31.1 -From 9585edb8edfd60f04607017e769891eda294b9d7 Mon Sep 17 00:00:00 2001 +From 5796b0714f03cb1faa5cd70d50b46b57f67c4eea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Thu, 18 May 2017 16:20:07 +0200 -Subject: [PATCH 4/5] systemMonitor: Handle clicks on section title +Subject: [PATCH 5/6] systemMonitor: Handle clicks on section title While on 3.24.x only the event section still has a clickable title, it's a generic message list feature in previous versions. It's easy @@ -1224,20 +1463,21 @@ the generic baseclass. Fixes: https://gitlab.gnome.org/GNOME/gnome-shell-extensions3 --- - extensions/systemMonitor/extension.js | 17 ++++++++++++++++- - 1 file changed, 16 insertions(+), 1 deletion(-) + extensions/systemMonitor/extension.js | 18 +++++++++++++++++- + 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/extensions/systemMonitor/extension.js b/extensions/systemMonitor/extension.js -index 0188960..b4d5a9d 100644 +index 1fd01ab4..57bdb51f 100644 --- a/extensions/systemMonitor/extension.js +++ b/extensions/systemMonitor/extension.js -@@ -303,6 +303,21 @@ const MemoryIndicator = class extends Indicator { +@@ -300,6 +300,22 @@ class MemoryIndicator extends Indicator { } - }; + }); ++const SystemMonitorSection = GObject.registerClass( +class SystemMonitorSection extends MessageList.MessageListSection { -+ constructor() { -+ super(_('System Monitor')); ++ _init() { ++ super._init(_('System Monitor')); + } + + _onTitleClicked() { @@ -1248,28 +1488,28 @@ index 0188960..b4d5a9d 100644 + if (app) + app.open_new_window(-1); + } -+} ++}); + const INDICATORS = [CpuIndicator, MemoryIndicator]; class Extension { -@@ -315,7 +330,7 @@ class Extension { +@@ -312,7 +328,7 @@ class Extension { } enable() { - this._section = new MessageList.MessageListSection(_('System Monitor')); + this._section = new SystemMonitorSection(); - this._indicators = []; for (let i = 0; i < INDICATORS.length; i++) { + let indicator = new INDICATORS[i](); -- -2.28.0 +2.31.1 -From 2470f7842aae83c16fc2583a0462151e23a17d12 Mon Sep 17 00:00:00 2001 +From e762e2dd17cc62b9258e44458157997a07bbdbfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Thu, 18 May 2017 18:00:17 +0200 -Subject: [PATCH 5/5] systemMonitor: Provide classic styling +Subject: [PATCH 6/6] systemMonitor: Provide classic styling The indicator tooltips currently don't work out in classic mode (dark text on dark background), so provide some mode-specific @@ -1284,7 +1524,7 @@ Fixes: #4 diff --git a/extensions/systemMonitor/classic.css b/extensions/systemMonitor/classic.css new file mode 100644 -index 0000000..946863d +index 00000000..946863dc --- /dev/null +++ b/extensions/systemMonitor/classic.css @@ -0,0 +1,6 @@ @@ -1295,7 +1535,7 @@ index 0000000..946863d + border: 1px solid #a1a1a1; +} diff --git a/extensions/systemMonitor/meson.build b/extensions/systemMonitor/meson.build -index 48504f6..b6548b1 100644 +index 48504f63..b6548b14 100644 --- a/extensions/systemMonitor/meson.build +++ b/extensions/systemMonitor/meson.build @@ -3,3 +3,7 @@ extension_data += configure_file( @@ -1307,5 +1547,5 @@ index 48504f6..b6548b1 100644 + extension_data += files('classic.css') +endif -- -2.28.0 +2.31.1