Compare commits
111 Commits
debian/3.2
...
debian/3.2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a4f054105e | ||
|
|
109d3aad6a | ||
|
|
15779e204d | ||
|
|
49e403f822 | ||
|
|
ffb5b76f4e | ||
|
|
b21932ffd9 | ||
|
|
46d8f1c8d9 | ||
|
|
8caffac3d7 | ||
|
|
40da5360a4 | ||
|
|
5b9f91991f | ||
|
|
a565f2d984 | ||
|
|
0b7269a4b8 | ||
|
|
c7805b4b40 | ||
|
|
e6b65be75a | ||
|
|
7043fe592c | ||
|
|
f7d35c41ae | ||
|
|
afb4942a72 | ||
|
|
4f7bd0918b | ||
|
|
fb8d34254a | ||
|
|
2a390c4c25 | ||
|
|
040fbf72e9 | ||
|
|
395e9aea3c | ||
|
|
bb3508327f | ||
|
|
068ae45f6c | ||
|
|
02ff0f658b | ||
|
|
3c14d9b524 | ||
|
|
8de00babad | ||
|
|
59768f0514 | ||
|
|
e185fe30f8 | ||
|
|
0d20be43d4 | ||
|
|
356632063c | ||
|
|
3a592ddb59 | ||
|
|
652ade33b5 | ||
|
|
05e6188921 | ||
|
|
b222ebed80 | ||
|
|
179d9b9ae1 | ||
|
|
ab7f50d2c8 | ||
|
|
51cc3c7cd1 | ||
|
|
d51f14529a | ||
|
|
563dfc3d4d | ||
|
|
3ad72a04af | ||
|
|
d43130f779 | ||
|
|
ce997ff4fd | ||
|
|
7a5d530358 | ||
|
|
dd0520f334 | ||
|
|
aab9143c13 | ||
|
|
b689ec2ef4 | ||
|
|
c9c2da444b | ||
|
|
9c931c175c | ||
|
|
39db8f1768 | ||
|
|
f7ed9ff131 | ||
|
|
4423126272 | ||
|
|
5294bc510b | ||
|
|
1b599315a2 | ||
|
|
b561655503 | ||
|
|
64923382b4 | ||
|
|
5ef6525be7 | ||
|
|
6dc066f7dd | ||
|
|
380cf61811 | ||
|
|
4624ca952e | ||
|
|
6f1475e944 | ||
|
|
22256eec46 | ||
|
|
31a5de2577 | ||
|
|
269e008541 | ||
|
|
79d866e9b5 | ||
|
|
6d4341f8a4 | ||
|
|
61dd96a29e | ||
|
|
9e2a8e0fb2 | ||
|
|
82ff7afe2b | ||
|
|
0017eaebfc | ||
|
|
fa729854b8 | ||
|
|
5644aebac7 | ||
|
|
941f5e43b4 | ||
|
|
a595407d39 | ||
|
|
60417b361e | ||
|
|
c3adf1724c | ||
|
|
435bbff3b0 | ||
|
|
706ea0dd7e | ||
|
|
e7c37a9d54 | ||
|
|
a7f66d648e | ||
|
|
013dc818e3 | ||
|
|
9430670019 | ||
|
|
67c795b610 | ||
|
|
42158401ac | ||
|
|
06a9891d77 | ||
|
|
c53e5325c3 | ||
|
|
6161d531fc | ||
|
|
ad52e75e97 | ||
|
|
2db7b6756d | ||
|
|
2f70c6c8a7 | ||
|
|
8fd8943460 | ||
|
|
695b533be1 | ||
|
|
491e9fb3e9 | ||
|
|
4d8bccc861 | ||
|
|
88b5fea2f9 | ||
|
|
91e886c564 | ||
|
|
1e8ff58d82 | ||
|
|
0b84052458 | ||
|
|
4abc92ef44 | ||
|
|
d12833afc4 | ||
|
|
8de34e23a3 | ||
|
|
3158caa1be | ||
|
|
8a6d13c416 | ||
|
|
90fe2cfb36 | ||
|
|
c91d5ebec1 | ||
|
|
5a00d5e117 | ||
|
|
1b938d9d5b | ||
|
|
62cbbef068 | ||
|
|
684547a66d | ||
|
|
261569c9fd | ||
|
|
e8d3ad369a |
337
debian/changelog
vendored
337
debian/changelog
vendored
@@ -1,3 +1,340 @@
|
||||
gnome-shell-extensions (3.25.91-1) experimental; urgency=medium
|
||||
|
||||
* Team upload
|
||||
* New upstream release, for GNOME Shell 3.25.91
|
||||
- d/p/adapt-to-gsd324.patch: Drop, applied upstream
|
||||
- Switch dependency to gir1.2-mutter-1
|
||||
|
||||
-- Simon McVittie <smcv@debian.org> Tue, 05 Sep 2017 16:43:01 +0100
|
||||
|
||||
gnome-shell-extensions (3.22.2-2) unstable; urgency=medium
|
||||
|
||||
* Add adapt-to-gsd324.patch (Closes: #869948):
|
||||
- Adjust gnome-session file for gnome-settings-daemon 3.24
|
||||
* debian/control.in:
|
||||
- Bump Standards-Version to 4.0.0
|
||||
- Explicitly depend on gnome-settings-daemon >= 3.24
|
||||
- Drop version from gnome-tweak-tool recommends
|
||||
- Depend on gnome-session-bin instead of gnome-session (LP: #1702832)
|
||||
|
||||
-- Jeremy Bicha <jbicha@ubuntu.com> Sun, 06 Aug 2017 17:38:06 -0400
|
||||
|
||||
gnome-shell-extensions (3.22.2-1) unstable; urgency=medium
|
||||
|
||||
* New upstream release.
|
||||
|
||||
-- Michael Biebl <biebl@debian.org> Thu, 10 Nov 2016 19:36:44 +0100
|
||||
|
||||
gnome-shell-extensions (3.22.1-1) unstable; urgency=medium
|
||||
|
||||
* New upstream release.
|
||||
|
||||
-- Michael Biebl <biebl@debian.org> Tue, 11 Oct 2016 17:58:31 +0200
|
||||
|
||||
gnome-shell-extensions (3.22.0-1) unstable; urgency=medium
|
||||
|
||||
* New upstream release.
|
||||
|
||||
-- Michael Biebl <biebl@debian.org> Tue, 20 Sep 2016 01:59:50 +0200
|
||||
|
||||
gnome-shell-extensions (3.21.92-1) unstable; urgency=medium
|
||||
|
||||
* New upstream development release.
|
||||
* Replace Build-Depends gnome-common with pkg-config and gettext.
|
||||
|
||||
-- Michael Biebl <biebl@debian.org> Tue, 13 Sep 2016 22:13:19 +0200
|
||||
|
||||
gnome-shell-extensions (3.21.91-1) unstable; urgency=medium
|
||||
|
||||
* New upstream beta release.
|
||||
|
||||
-- Andreas Henriksson <andreas@fatal.se> Tue, 30 Aug 2016 19:57:32 +0200
|
||||
|
||||
gnome-shell-extensions (3.21.90-1) experimental; urgency=medium
|
||||
|
||||
[ Andreas Henriksson ]
|
||||
* New upstream beta release.
|
||||
* Update build-dependencies according to configure.ac changes:
|
||||
- drop intltool, now gettext is used instead.
|
||||
|
||||
[ Jeremy Bicha ]
|
||||
* Convert from cdbs to dh
|
||||
* Add debian/docs to install NEWS and README
|
||||
* Bump dh compat to 10
|
||||
* Update Vcs fields
|
||||
* Refresh patches
|
||||
|
||||
-- Andreas Henriksson <andreas@fatal.se> Sun, 21 Aug 2016 05:36:17 +0200
|
||||
|
||||
gnome-shell-extensions (3.21.4-1) experimental; urgency=medium
|
||||
|
||||
* New upstream development release.
|
||||
* Stop hard-coding Victor Seva in the Uploaders field
|
||||
|
||||
-- Andreas Henriksson <andreas@fatal.se> Fri, 12 Aug 2016 16:28:33 +0200
|
||||
|
||||
gnome-shell-extensions (3.20.1-1) unstable; urgency=medium
|
||||
|
||||
* New upstream release.
|
||||
* Bump Standards-Version to 3.9.8.
|
||||
|
||||
-- Michael Biebl <biebl@debian.org> Wed, 11 May 2016 15:21:35 +0200
|
||||
|
||||
gnome-shell-extensions (3.20.0-2) unstable; urgency=medium
|
||||
|
||||
* Upload to unstable.
|
||||
|
||||
-- Michael Biebl <biebl@debian.org> Sun, 17 Apr 2016 00:25:25 +0200
|
||||
|
||||
gnome-shell-extensions (3.20.0-1) experimental; urgency=medium
|
||||
|
||||
* New upstream release.
|
||||
|
||||
-- Andreas Henriksson <andreas@fatal.se> Fri, 25 Mar 2016 10:48:00 +0100
|
||||
|
||||
gnome-shell-extensions (3.19.92-1) experimental; urgency=medium
|
||||
|
||||
* New upstream release.
|
||||
* Update dont-require-nautilus-classic.patch to apply.
|
||||
|
||||
-- Andreas Henriksson <andreas@fatal.se> Thu, 17 Mar 2016 12:51:13 +0100
|
||||
|
||||
gnome-shell-extensions (3.18.4-1) unstable; urgency=medium
|
||||
|
||||
* New upstream release.
|
||||
* Bump Standards-Version to 3.9.7.
|
||||
|
||||
-- Michael Biebl <biebl@debian.org> Sun, 06 Mar 2016 22:38:57 +0100
|
||||
|
||||
gnome-shell-extensions (3.18.3-2) unstable; urgency=medium
|
||||
|
||||
* Add Breaks/Replaces gnome-shell-common (<< 3.18) (Closes: #808906)
|
||||
- Helps upgrades from Jessie by allowing overwriting
|
||||
/usr/share/gnome-shell/theme/calendar-today.svg et.al.
|
||||
which was previously shipped in gnome-shell-common.
|
||||
|
||||
-- Andreas Henriksson <andreas@fatal.se> Wed, 10 Feb 2016 01:24:42 +0100
|
||||
|
||||
gnome-shell-extensions (3.18.3-1) unstable; urgency=medium
|
||||
|
||||
* New upstream release.
|
||||
|
||||
-- Michael Biebl <biebl@debian.org> Thu, 14 Jan 2016 22:49:16 +0100
|
||||
|
||||
gnome-shell-extensions (3.18.2-1) unstable; urgency=medium
|
||||
|
||||
* New upstream release.
|
||||
|
||||
-- Michael Biebl <biebl@debian.org> Fri, 13 Nov 2015 00:04:09 +0100
|
||||
|
||||
gnome-shell-extensions (3.18.1-1) unstable; urgency=medium
|
||||
|
||||
* New upstream release.
|
||||
|
||||
-- Michael Biebl <biebl@debian.org> Fri, 16 Oct 2015 22:09:01 +0200
|
||||
|
||||
gnome-shell-extensions (3.18.0-1) unstable; urgency=medium
|
||||
|
||||
* New upstream release.
|
||||
|
||||
-- Laurent Bigonville <bigon@debian.org> Sun, 11 Oct 2015 16:29:18 +0200
|
||||
|
||||
gnome-shell-extensions (3.17.92-1) experimental; urgency=medium
|
||||
|
||||
* New upstream release candidate.
|
||||
|
||||
-- Andreas Henriksson <andreas@fatal.se> Fri, 18 Sep 2015 17:28:06 +0200
|
||||
|
||||
gnome-shell-extensions (3.16.2-1) unstable; urgency=medium
|
||||
|
||||
[ Emilio Pozuelo Monfort ]
|
||||
* debian/gnome-shell-extensions.gsettings-override:
|
||||
+ Dropped, no longer needed as the enabled extension no longer exists.
|
||||
Thanks Artur Rona for noticing. (Closes: #782747)
|
||||
|
||||
[ Michael Biebl ]
|
||||
* New upstream release.
|
||||
* Update Homepage.
|
||||
* Bump debhelper compatibility level to 9.
|
||||
|
||||
-- Michael Biebl <biebl@debian.org> Thu, 02 Jul 2015 19:13:32 +0200
|
||||
|
||||
gnome-shell-extensions (3.16.1-1) unstable; urgency=medium
|
||||
|
||||
* New upstream release.
|
||||
* debian/control.in,
|
||||
debian/rules:
|
||||
+ The system monitor extension was removed. Drop the libgtop
|
||||
build and runtime dependencies and stop enabling it.
|
||||
* debian/patches/apps-center-labels.patch,
|
||||
debian/patches/window-list-pointerInNotification.patch,
|
||||
debian/patches/menu-arrows-icons.patch:
|
||||
+ Dropped, merged upstream.
|
||||
* debian/patches/dont-require-nautilus-classic.patch:
|
||||
+ Updated for the new version.
|
||||
|
||||
-- Emilio Pozuelo Monfort <pochu@debian.org> Sun, 14 Jun 2015 15:23:59 +0200
|
||||
|
||||
gnome-shell-extensions (3.14.2-1) unstable; urgency=medium
|
||||
|
||||
* New upstream bugfix release.
|
||||
* menu-arrows-icons: new patch. Make arrows consistent with the rest
|
||||
of the shell.
|
||||
* apps-center-labels.patch: patch from upstream git. Center labels
|
||||
vertically in the applications menu.
|
||||
* window-list-pointerInNotification.patch: patch from upstream git.
|
||||
Update window-list extension for an older shell API change.
|
||||
|
||||
-- Josselin Mouette <joss@debian.org> Sun, 30 Nov 2014 16:06:59 +0100
|
||||
|
||||
gnome-shell-extensions (3.14.1-1) unstable; urgency=medium
|
||||
|
||||
* New upstream release.
|
||||
* debian/control.in: Bump Standards-Version to 3.9.6 (no further changes)
|
||||
* Add missing dependencies against gir packages, including gir1.2-gmenu-3.0,
|
||||
this should fix the apps-menu extension for some people (Closes: #765460).
|
||||
|
||||
-- Laurent Bigonville <bigon@debian.org> Sun, 19 Oct 2014 21:17:58 +0200
|
||||
|
||||
gnome-shell-extensions (3.14.0-2) unstable; urgency=medium
|
||||
|
||||
* Drop xrandr from EXTENSIONS_DISABLED, this extension was removed
|
||||
upstream.
|
||||
* Add new screenshot-window-sizer extension to EXTENSIONS_ENABLED.
|
||||
|
||||
-- Michael Biebl <biebl@debian.org> Wed, 24 Sep 2014 01:15:32 +0200
|
||||
|
||||
gnome-shell-extensions (3.14.0-1) unstable; urgency=medium
|
||||
|
||||
* debian/watch: only scan for stable releases.
|
||||
* New upstream release.
|
||||
* Upload to unstable.
|
||||
|
||||
-- Andreas Henriksson <andreas@fatal.se> Tue, 23 Sep 2014 15:46:30 +0200
|
||||
|
||||
gnome-shell-extensions (3.13.91-1) experimental; urgency=medium
|
||||
|
||||
* New upstream development release.
|
||||
|
||||
-- Andreas Henriksson <andreas@fatal.se> Sat, 06 Sep 2014 11:16:39 -0700
|
||||
|
||||
gnome-shell-extensions (3.12.2-1) unstable; urgency=medium
|
||||
|
||||
* New upstream release.
|
||||
* Bump Standards-Version to 3.9.5
|
||||
* Upload to unstable.
|
||||
|
||||
-- Andreas Henriksson <andreas@fatal.se> Tue, 15 Jul 2014 00:06:09 +0200
|
||||
|
||||
gnome-shell-extensions (3.12.0-1) experimental; urgency=low
|
||||
|
||||
[ Jean Schurger ]
|
||||
* New upstream release (3.10.1)
|
||||
* debian/rules: remove one of the 'windowsNavigator' extension listed twice
|
||||
and the 'alternative-system-menu' extension (does not exists anymore)
|
||||
* debian/copyright: Update 'Format:' line
|
||||
|
||||
[ Andreas Henriksson ]
|
||||
* New upstream release (3.12.0)
|
||||
* debian/local/gnome-session-classic,
|
||||
debian/patches/gnome-session-classic-wrapper-script.patch:
|
||||
- update script to include new GNOME_SHELL_SESSION_MODE env variable
|
||||
and update patch to apply again.
|
||||
|
||||
-- Andreas Henriksson <andreas@fatal.se> Fri, 04 Apr 2014 21:43:18 +0200
|
||||
|
||||
gnome-shell-extensions (3.8.4-2) unstable; urgency=low
|
||||
|
||||
* Upload to unstable.
|
||||
|
||||
-- Emilio Pozuelo Monfort <pochu@debian.org> Sun, 13 Oct 2013 18:11:33 +0200
|
||||
|
||||
gnome-shell-extensions (3.8.4-1) experimental; urgency=low
|
||||
|
||||
[ Jeremy Bicha ]
|
||||
* New upstream release
|
||||
* Dropped patches applied in new version:
|
||||
- fix-hibernate.patch
|
||||
- fix-applications-menu-resolution-change.patch
|
||||
- look-in-data-home-for-themes.patch
|
||||
|
||||
[ Michael Biebl ]
|
||||
* Add a wrapper script to start the GNOME Classic session as currently
|
||||
Xsession doesn't allow to run gnome-session with custom arguments due to
|
||||
#653327.
|
||||
|
||||
-- Michael Biebl <biebl@debian.org> Fri, 11 Oct 2013 18:55:23 +0200
|
||||
|
||||
gnome-shell-extensions (3.8.3.1-1) experimental; urgency=low
|
||||
|
||||
[ Jeremy Bicha ]
|
||||
* New upstream release
|
||||
- default-min-max and static-workspaces extensions have been dropped.
|
||||
Use Classic Mode or tweak org.gnome.shell.overrides in dconf-editor
|
||||
* debian/control.in:
|
||||
- Depend on gnome-session 3.8, required for the new Classic mode.
|
||||
- Update homepage
|
||||
* debian/patches/dont-require-nautilus-classic.patch:
|
||||
- Don't require nautilus-classic since it forces desktop icons
|
||||
* debian/patches/fix-applications-menu-resolution-change.patch:
|
||||
- Backport commit to not break applications menu when screen resolution
|
||||
changes
|
||||
* debian/patches/fix-hibernate.patch:
|
||||
- Backport patch to fix checking whether hibernate is allowed
|
||||
* debian/patches/look-in-data-home-for-themes.patch:
|
||||
- Backport commit to also look in XDG_DATA_HOME (usually ~/.local/share/)
|
||||
for user themes
|
||||
* debian/rules:
|
||||
- Run autoreconf
|
||||
|
||||
-- Andreas Henriksson <andreas@fatal.se> Fri, 16 Aug 2013 20:25:30 +0200
|
||||
|
||||
gnome-shell-extensions (3.8.2-1) experimental; urgency=low
|
||||
|
||||
* Team upload
|
||||
|
||||
[ Victor Seva ]
|
||||
* Recommends gnome-tweak-tool
|
||||
|
||||
[ Jean Schurger ]
|
||||
* New upstream release 3.7.92 (LP: #1017979, #1059152).
|
||||
* Enabled new extensions.
|
||||
* Dropped 'dock' and 'gajim'.
|
||||
* Use ./configure instead of autoreconf.
|
||||
* Bumped Standards-Version to 3.9.4.
|
||||
* Updated Vcs-Svn.
|
||||
* debian/control.in
|
||||
- Added runtime dependency to 'gvfs' (>= 1.16.0).
|
||||
The 'Places' extension rely on a 'gvfs' linked to 'udisks2'.
|
||||
|
||||
[ Simon McVittie ]
|
||||
* New upstream release 3.8.2.
|
||||
* Install the "classic mode"
|
||||
* Enable windowNavigator extension (this means we have everything except
|
||||
example and xrandr, the same as in the Ubuntu gnome3-team's PPA)
|
||||
|
||||
-- Simon McVittie <smcv@debian.org> Thu, 23 May 2013 09:07:23 +0100
|
||||
|
||||
gnome-shell-extensions (3.4.0-2) unstable; urgency=low
|
||||
|
||||
* Upload to unstable.
|
||||
|
||||
-- Michael Biebl <biebl@debian.org> Wed, 30 May 2012 13:22:54 +0200
|
||||
|
||||
gnome-shell-extensions (3.4.0-1) experimental; urgency=low
|
||||
|
||||
* New upstream release.
|
||||
* Remove 01_status-menu_disable_accounts.patch: The alternative-status-menu
|
||||
extension no longer recreates the complete user menu but reuses the one
|
||||
from gnome-shell, so we can't easily get rid of the "Online Accounts" menu
|
||||
entry. We will patch gnome-shell directly instead.
|
||||
* Remove 02-Revert-all-remove-all-GSettings-usage.patch and
|
||||
03-Revert-Remove-all-references-to-localedir-from-metad.patch, no longer
|
||||
required.
|
||||
* Bump Standards-Version to 3.9.3
|
||||
|
||||
-- Michael Biebl <biebl@debian.org> Mon, 21 May 2012 00:24:56 +0200
|
||||
|
||||
gnome-shell-extensions (3.2.3-1) unstable; urgency=low
|
||||
|
||||
[ Josselin Mouette ]
|
||||
|
||||
2
debian/compat
vendored
2
debian/compat
vendored
@@ -1 +1 @@
|
||||
8
|
||||
10
|
||||
|
||||
35
debian/control
vendored
35
debian/control
vendored
@@ -2,31 +2,40 @@
|
||||
#
|
||||
# Modifications should be made to debian/control.in instead.
|
||||
# This file is regenerated automatically in the clean target.
|
||||
|
||||
Source: gnome-shell-extensions
|
||||
Section: gnome
|
||||
Priority: optional
|
||||
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
|
||||
Uploaders: Victor Seva <linuxmaniac@torreviejawireless.org>, Michael Biebl <biebl@debian.org>
|
||||
Build-Depends: debhelper (>= 8.0.0),
|
||||
cdbs,
|
||||
dh-autoreconf,
|
||||
gnome-common,
|
||||
Uploaders: Andreas Henriksson <andreas@fatal.se>, Michael Biebl <biebl@debian.org>
|
||||
Build-Depends: debhelper (>= 10),
|
||||
pkg-config (>= 0.22),
|
||||
gettext,
|
||||
gnome-pkg-tools,
|
||||
intltool,
|
||||
libgnome-desktop-3-dev (>= 3.2.0),
|
||||
libgtop2-dev (>= 2.28.3)
|
||||
Standards-Version: 3.9.2
|
||||
Homepage: http://live.gnome.org/GnomeShell/Extensions
|
||||
Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/packages/unstable/gnome-shell-extensions
|
||||
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/gnome-shell-extensions
|
||||
Standards-Version: 4.0.0
|
||||
Homepage: https://wiki.gnome.org/Projects/GnomeShell/Extensions
|
||||
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-shell-extensions
|
||||
Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-shell-extensions
|
||||
|
||||
Package: gnome-shell-extensions
|
||||
Architecture: all
|
||||
Depends: ${misc:Depends},
|
||||
gnome-shell (>= ${gnome:Version}),
|
||||
gnome-shell (<< ${gnome:NextVersion}),
|
||||
gir1.2-gtop-2.0
|
||||
gir1.2-atk-1.0,
|
||||
gir1.2-clutter-1.0,
|
||||
gir1.2-gdkpixbuf-2.0,
|
||||
gir1.2-glib-2.0,
|
||||
gir1.2-gmenu-3.0,
|
||||
gir1.2-gtk-3.0,
|
||||
gir1.2-mutter-1,
|
||||
gir1.2-pango-1.0,
|
||||
gvfs (>= 1.16.0),
|
||||
gnome-session-bin (>= 3.8),
|
||||
gnome-settings-daemon (>= 3.24)
|
||||
Recommends: gnome-tweak-tool
|
||||
Replaces: gnome-shell-common (<< 3.18)
|
||||
Breaks: gnome-shell-common (<< 3.18)
|
||||
Description: Extensions to extend functionality of GNOME Shell
|
||||
The GNOME Shell redefines user interactions with the GNOME desktop. In
|
||||
particular, it offers new paradigms for launching applications,
|
||||
|
||||
34
debian/control.in
vendored
34
debian/control.in
vendored
@@ -2,26 +2,36 @@ Source: gnome-shell-extensions
|
||||
Section: gnome
|
||||
Priority: optional
|
||||
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
|
||||
Uploaders: Victor Seva <linuxmaniac@torreviejawireless.org>, @GNOME_TEAM@
|
||||
Build-Depends: debhelper (>= 8.0.0),
|
||||
cdbs,
|
||||
dh-autoreconf,
|
||||
gnome-common,
|
||||
Uploaders: @GNOME_TEAM@
|
||||
Build-Depends: debhelper (>= 10),
|
||||
pkg-config (>= 0.22),
|
||||
gettext,
|
||||
gnome-pkg-tools,
|
||||
intltool,
|
||||
libgnome-desktop-3-dev (>= 3.2.0),
|
||||
libgtop2-dev (>= 2.28.3)
|
||||
Standards-Version: 3.9.2
|
||||
Homepage: http://live.gnome.org/GnomeShell/Extensions
|
||||
Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/packages/unstable/gnome-shell-extensions
|
||||
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/gnome-shell-extensions
|
||||
Standards-Version: 4.0.0
|
||||
Homepage: https://wiki.gnome.org/Projects/GnomeShell/Extensions
|
||||
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-shell-extensions
|
||||
Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-shell-extensions
|
||||
|
||||
Package: gnome-shell-extensions
|
||||
Architecture: all
|
||||
Depends: ${misc:Depends},
|
||||
gnome-shell (>= ${gnome:Version}),
|
||||
gnome-shell (<< ${gnome:NextVersion}),
|
||||
gir1.2-gtop-2.0
|
||||
gir1.2-atk-1.0,
|
||||
gir1.2-clutter-1.0,
|
||||
gir1.2-gdkpixbuf-2.0,
|
||||
gir1.2-glib-2.0,
|
||||
gir1.2-gmenu-3.0,
|
||||
gir1.2-gtk-3.0,
|
||||
gir1.2-mutter-1,
|
||||
gir1.2-pango-1.0,
|
||||
gvfs (>= 1.16.0),
|
||||
gnome-session-bin (>= 3.8),
|
||||
gnome-settings-daemon (>= 3.24)
|
||||
Recommends: gnome-tweak-tool
|
||||
Replaces: gnome-shell-common (<< 3.18)
|
||||
Breaks: gnome-shell-common (<< 3.18)
|
||||
Description: Extensions to extend functionality of GNOME Shell
|
||||
The GNOME Shell redefines user interactions with the GNOME desktop. In
|
||||
particular, it offers new paradigms for launching applications,
|
||||
|
||||
10
debian/copyright
vendored
10
debian/copyright
vendored
@@ -1,19 +1,19 @@
|
||||
Format: http://dep.debian.net/deps/dep5
|
||||
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
|
||||
Upstream-Name: gnome-shell-extensions
|
||||
Upstream-Contact: 2011 Giovanni Campagna <gcampagna@src.gnome.org>
|
||||
Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-shell-extensions/
|
||||
Source: https://download.gnome.org/sources/gnome-shell-extensions/
|
||||
|
||||
Files: *
|
||||
Copyright: 2011 Giovanni Campagna <gcampagna@src.gnome.org>
|
||||
License: GPL-2.0+
|
||||
License: GPL-2+
|
||||
|
||||
Files: debian/*
|
||||
Copyright:
|
||||
2011 Victor Seva <linuxmaniac@torreviejawireless.org>
|
||||
2011 Bilal Akhtar <bilalakhtar@ubuntu.com>
|
||||
License: GPL-2.0+
|
||||
License: GPL-2+
|
||||
|
||||
License: GPL-2.0+
|
||||
License: GPL-2+
|
||||
This package is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
|
||||
2
debian/docs
vendored
Normal file
2
debian/docs
vendored
Normal file
@@ -0,0 +1,2 @@
|
||||
NEWS
|
||||
README
|
||||
1
debian/install
vendored
Normal file
1
debian/install
vendored
Normal file
@@ -0,0 +1 @@
|
||||
debian/local/gnome-session-classic usr/bin
|
||||
2
debian/local/gnome-session-classic
vendored
Normal file
2
debian/local/gnome-session-classic
vendored
Normal file
@@ -0,0 +1,2 @@
|
||||
#! /bin/sh
|
||||
env GNOME_SHELL_SESSION_MODE=classic gnome-session --session gnome-classic "$@"
|
||||
@@ -1,15 +0,0 @@
|
||||
Index: gnome-shell-extensions-3.2.3/extensions/alternative-status-menu/extension.js
|
||||
===================================================================
|
||||
--- gnome-shell-extensions-3.2.3.orig/extensions/alternative-status-menu/extension.js 2011-12-16 22:11:51.000000000 +0100
|
||||
+++ gnome-shell-extensions-3.2.3/extensions/alternative-status-menu/extension.js 2012-02-11 22:47:20.650757433 +0100
|
||||
@@ -50,10 +50,6 @@
|
||||
item = new PopupMenu.PopupSeparatorMenuItem();
|
||||
this.menu.addMenuItem(item);
|
||||
|
||||
- item = new PopupMenu.PopupMenuItem(_("Online Accounts"));
|
||||
- item.connect('activate', Lang.bind(this, this._onOnlineAccountsActivate));
|
||||
- this.menu.addMenuItem(item);
|
||||
-
|
||||
item = new PopupMenu.PopupMenuItem(_("System Settings"));
|
||||
item.connect('activate', Lang.bind(this, this._onPreferencesActivate));
|
||||
this.menu.addMenuItem(item);
|
||||
@@ -1,526 +0,0 @@
|
||||
From cd9d86ce3938465b4c9f08ae20e351906cdaf44c Mon Sep 17 00:00:00 2001
|
||||
From: Michael Biebl <biebl@debian.org>
|
||||
Date: Sat, 11 Feb 2012 22:51:28 +0100
|
||||
Subject: [PATCH] Revert "all: remove all GSettings usage"
|
||||
|
||||
This reverts commit 374abed8a13f81d514bcccc2ed4b4f18e7d8d058.
|
||||
---
|
||||
extensions/alternate-tab/Makefile.am | 11 ++
|
||||
extensions/alternate-tab/extension.js | 21 +++--
|
||||
...e.shell.extensions.alternate-tab.gschema.xml.in | 18 ++++
|
||||
extensions/auto-move-windows/Makefile.am | 11 ++
|
||||
extensions/auto-move-windows/extension.js | 10 +-
|
||||
...ell.extensions.auto-move-windows.gschema.xml.in | 10 ++
|
||||
extensions/dock/Makefile.am | 11 ++
|
||||
extensions/dock/extension.js | 101 +++++++++++++++++---
|
||||
.../org.gnome.shell.extensions.dock.gschema.xml.in | 38 ++++++++
|
||||
extensions/native-window-placement/Makefile.am | 11 ++
|
||||
extensions/native-window-placement/extension.js | 25 +++--
|
||||
...tensions.native-window-placement.gschema.xml.in | 26 +++++
|
||||
po/POTFILES.in | 4 +
|
||||
13 files changed, 259 insertions(+), 38 deletions(-)
|
||||
create mode 100644 extensions/alternate-tab/org.gnome.shell.extensions.alternate-tab.gschema.xml.in
|
||||
create mode 100644 extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in
|
||||
create mode 100644 extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in
|
||||
create mode 100644 extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in
|
||||
|
||||
diff --git a/extensions/alternate-tab/Makefile.am b/extensions/alternate-tab/Makefile.am
|
||||
index b8fde76..bade7cd 100644
|
||||
--- a/extensions/alternate-tab/Makefile.am
|
||||
+++ b/extensions/alternate-tab/Makefile.am
|
||||
@@ -1,3 +1,14 @@
|
||||
EXTENSION_ID = alternate-tab
|
||||
|
||||
include ../../extension.mk
|
||||
+
|
||||
+gschemas_in = $(gschemabase).alternate-tab.gschema.xml.in
|
||||
+
|
||||
+@INTLTOOL_XML_NOMERGE_RULE@
|
||||
+
|
||||
+gsettings_SCHEMAS = $(gschemas_in:.xml.in=.xml)
|
||||
+
|
||||
+@GSETTINGS_RULES@
|
||||
+
|
||||
+CLEANFILES += $(gschemas_in:.xml.in=.valid) $(gsettings_SCHEMAS)
|
||||
+EXTRA_DIST += $(gschemas_in)
|
||||
diff --git a/extensions/alternate-tab/extension.js b/extensions/alternate-tab/extension.js
|
||||
index ce65bf5..a53b396 100644
|
||||
--- a/extensions/alternate-tab/extension.js
|
||||
+++ b/extensions/alternate-tab/extension.js
|
||||
@@ -26,9 +26,9 @@ const N_ = function(e) { return e };
|
||||
|
||||
const POPUP_DELAY_TIMEOUT = 150; // milliseconds
|
||||
|
||||
-// Settings: choose one of MODES, the description is in MESSAGE
|
||||
-// (master branch has a nice dialog, but we cannot in gnome 3.2)
|
||||
-const BEHAVIOUR = 'all_thumbnails';
|
||||
+const SETTINGS_SCHEMA = 'org.gnome.shell.extensions.alternate-tab';
|
||||
+const SETTINGS_BEHAVIOUR_KEY = 'behaviour';
|
||||
+const SETTINGS_FIRST_TIME_KEY = 'first-time';
|
||||
|
||||
const MODES = {
|
||||
all_thumbnails: function(shellwm, binding, mask, window, backwards) {
|
||||
@@ -267,8 +267,6 @@ WindowSwitcher.prototype = {
|
||||
}
|
||||
};
|
||||
|
||||
-/* This object is never instantiated in the current branch, but
|
||||
- I don't trust git merge enough to remove it */
|
||||
function AltTabSettingsDialog() {
|
||||
this._init();
|
||||
}
|
||||
@@ -600,9 +598,16 @@ function init(metadata) {
|
||||
}
|
||||
|
||||
function doAltTab(shellwm, binding, mask, window, backwards) {
|
||||
- let behaviour = BEHAVIOUR;
|
||||
- if(behaviour in MODES) {
|
||||
- MODES[behaviour](shellwm, binding, mask, window, backwards);
|
||||
+ let settings = new Gio.Settings({ schema: SETTINGS_SCHEMA });
|
||||
+
|
||||
+
|
||||
+ if(settings.get_boolean(SETTINGS_FIRST_TIME_KEY)) {
|
||||
+ new AltTabSettingsDialog().open();
|
||||
+ } else {
|
||||
+ let behaviour = settings.get_string(SETTINGS_BEHAVIOUR_KEY);
|
||||
+ if(behaviour in MODES) {
|
||||
+ MODES[behaviour](shellwm, binding, mask, window, backwards);
|
||||
+ }
|
||||
}
|
||||
}
|
||||
|
||||
diff --git a/extensions/alternate-tab/org.gnome.shell.extensions.alternate-tab.gschema.xml.in b/extensions/alternate-tab/org.gnome.shell.extensions.alternate-tab.gschema.xml.in
|
||||
new file mode 100644
|
||||
index 0000000..66861ad
|
||||
--- /dev/null
|
||||
+++ b/extensions/alternate-tab/org.gnome.shell.extensions.alternate-tab.gschema.xml.in
|
||||
@@ -0,0 +1,18 @@
|
||||
+<schemalist gettext-domain="gnome-shell-extensions">
|
||||
+ <enum id="org.gnome.shell.extensions.alternate-tab.BehaviourMode">
|
||||
+ <value value="1" nick="all_thumbnails"/>
|
||||
+ <value value="2" nick="workspace_icons"/>
|
||||
+ </enum>
|
||||
+ <schema id="org.gnome.shell.extensions.alternate-tab" path="/org/gnome/shell/extensions/alternate-tab/">
|
||||
+ <key name="behaviour" enum="org.gnome.shell.extensions.alternate-tab.BehaviourMode">
|
||||
+ <default>'all_thumbnails'</default>
|
||||
+ <_summary>The alt tab behaviour.</_summary>
|
||||
+ <_description>Sets the Alt-Tab behaviour. Possible values are: native, all_thumbnails and workspace_icons.</_description>
|
||||
+ </key>
|
||||
+ <key type="b" name="first-time">
|
||||
+ <default>true</default>
|
||||
+ <_summary>Indicates if Alternate Tab is newly installed</_summary>
|
||||
+ <_description>Ask the user for a default behaviour if true.</_description>
|
||||
+ </key>
|
||||
+ </schema>
|
||||
+</schemalist>
|
||||
diff --git a/extensions/auto-move-windows/Makefile.am b/extensions/auto-move-windows/Makefile.am
|
||||
index a0bca70..be6e7bc 100644
|
||||
--- a/extensions/auto-move-windows/Makefile.am
|
||||
+++ b/extensions/auto-move-windows/Makefile.am
|
||||
@@ -1,3 +1,14 @@
|
||||
EXTENSION_ID = auto-move-windows
|
||||
|
||||
include ../../extension.mk
|
||||
+
|
||||
+gschemas_in = $(gschemabase).auto-move-windows.gschema.xml.in
|
||||
+
|
||||
+@INTLTOOL_XML_NOMERGE_RULE@
|
||||
+
|
||||
+gsettings_SCHEMAS = $(gschemas_in:.xml.in=.xml)
|
||||
+
|
||||
+@GSETTINGS_RULES@
|
||||
+
|
||||
+CLEANFILES += $(gschemas_in:.xml.in=.valid) $(gsettings_SCHEMAS)
|
||||
+EXTRA_DIST += $(gschemas_in)
|
||||
diff --git a/extensions/auto-move-windows/extension.js b/extensions/auto-move-windows/extension.js
|
||||
index b08b0e3..fe5d7f9 100644
|
||||
--- a/extensions/auto-move-windows/extension.js
|
||||
+++ b/extensions/auto-move-windows/extension.js
|
||||
@@ -11,9 +11,8 @@ const St = imports.gi.St;
|
||||
|
||||
const Main = imports.ui.main;
|
||||
|
||||
-// list of applications and workspace pairs
|
||||
-// format: "desktop-file-id.desktop:<num>"
|
||||
-const APPLICATIONS = [ ];
|
||||
+const SETTINGS_SCHEMA = 'org.gnome.shell.extensions.auto-move-windows';
|
||||
+const SETTINGS_KEY = 'application-list';
|
||||
|
||||
function WindowMover() {
|
||||
this._init();
|
||||
@@ -21,6 +20,7 @@ function WindowMover() {
|
||||
|
||||
WindowMover.prototype = {
|
||||
_init: function() {
|
||||
+ this._settings = new Gio.Settings({ schema: SETTINGS_SCHEMA });
|
||||
this._windowTracker = Shell.WindowTracker.get_default();
|
||||
|
||||
let display = global.screen.get_display();
|
||||
@@ -46,7 +46,7 @@ WindowMover.prototype = {
|
||||
if (!this._windowTracker.is_window_interesting(window))
|
||||
return;
|
||||
|
||||
- let spaces = APPLICATIONS;
|
||||
+ let spaces = this._settings.get_strv(SETTINGS_KEY);
|
||||
|
||||
let app = this._windowTracker.get_window_app(window);
|
||||
if (!app) {
|
||||
@@ -159,4 +159,4 @@ function enable() {
|
||||
function disable() {
|
||||
Main._checkWorkspaces = prevCheckWorkspaces;
|
||||
winMover.destroy();
|
||||
-}
|
||||
+}
|
||||
\ No newline at end of file
|
||||
diff --git a/extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in b/extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in
|
||||
new file mode 100644
|
||||
index 0000000..59753dc
|
||||
--- /dev/null
|
||||
+++ b/extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in
|
||||
@@ -0,0 +1,10 @@
|
||||
+<schemalist gettext-domain="gnome-shell-extensions">
|
||||
+ <schema id="org.gnome.shell.extensions.auto-move-windows" path="/org/gnome/shell/extensions/auto-move-windows/">
|
||||
+ <key name="application-list" type="as">
|
||||
+ <!-- FIXME: should be a(su), when JS supports more of GVariant -->
|
||||
+ <default>[ ]</default>
|
||||
+ <_summary>Application and workspace list</_summary>
|
||||
+ <_description>A list of strings, each containing an application id (desktop file name), followed by a colon and the workspace number</_description>
|
||||
+ </key>
|
||||
+ </schema>
|
||||
+</schemalist>
|
||||
diff --git a/extensions/dock/Makefile.am b/extensions/dock/Makefile.am
|
||||
index 2531858..827f81c 100644
|
||||
--- a/extensions/dock/Makefile.am
|
||||
+++ b/extensions/dock/Makefile.am
|
||||
@@ -1,3 +1,14 @@
|
||||
EXTENSION_ID = dock
|
||||
|
||||
include ../../extension.mk
|
||||
+
|
||||
+gschemas_in = $(gschemabase).dock.gschema.xml.in
|
||||
+
|
||||
+@INTLTOOL_XML_NOMERGE_RULE@
|
||||
+
|
||||
+gsettings_SCHEMAS = $(gschemas_in:.xml.in=.xml)
|
||||
+
|
||||
+@GSETTINGS_RULES@
|
||||
+
|
||||
+CLEANFILES += $(gschemas_in:.xml.in=.valid) $(gsettings_SCHEMAS)
|
||||
+EXTRA_DIST += $(gschemas_in)
|
||||
diff --git a/extensions/dock/extension.js b/extensions/dock/extension.js
|
||||
index d851bb8..cc53827 100644
|
||||
--- a/extensions/dock/extension.js
|
||||
+++ b/extensions/dock/extension.js
|
||||
@@ -25,6 +25,15 @@ const AltTab = imports.ui.altTab;
|
||||
const Gettext = imports.gettext.domain('gnome-shell-extensions');
|
||||
const _ = Gettext.gettext;
|
||||
|
||||
+// Settings
|
||||
+const DOCK_SETTINGS_SCHEMA = 'org.gnome.shell.extensions.dock';
|
||||
+const DOCK_POSITION_KEY = 'position';
|
||||
+const DOCK_SIZE_KEY = 'size';
|
||||
+const DOCK_HIDE_KEY = 'autohide';
|
||||
+const DOCK_EFFECTHIDE_KEY = 'hide-effect';
|
||||
+const DOCK_AUTOHIDE_ANIMATION_TIME_KEY = 'hide-effect-duration';
|
||||
+
|
||||
+
|
||||
//hide
|
||||
//const autohide_animation_time = 0.3;
|
||||
|
||||
@@ -40,15 +49,6 @@ const AutoHideEffect = {
|
||||
MOVE: 2
|
||||
};
|
||||
|
||||
-// Settings
|
||||
-const DOCK_POSITION = PositionMode.RIGHT;
|
||||
-const DOCK_SIZE = 48;
|
||||
-const DOCK_AUTOHIDE = true;
|
||||
-const DOCK_EFFECTHIDE = AutoHideEffect.MOVE;
|
||||
-const DOCK_AUTOHIDE_ANIMATION_TIME = 0.3;
|
||||
-// Do not change anything below this line (it is intentionally duplicate to keep in
|
||||
-// sync with master branch)
|
||||
-
|
||||
let position = PositionMode.RIGHT;
|
||||
let dockicon_size = 48;
|
||||
let hideable = true;
|
||||
@@ -340,11 +340,15 @@ Dock.prototype = {
|
||||
this._favorites = [];
|
||||
|
||||
// Load Settings
|
||||
- position = DOCK_POSITION;
|
||||
- dockicon_size = DOCK_SIZE;
|
||||
- hideDock = hideable = DOCK_AUTOHIDE;
|
||||
- hideEffect = DOCK_EFFECTHIDE;
|
||||
- autohide_animation_time = DOCK_AUTOHIDE_ANIMATION_TIME;
|
||||
+ this._settings = new Gio.Settings({ schema: DOCK_SETTINGS_SCHEMA });
|
||||
+ position = this._settings.get_enum(DOCK_POSITION_KEY);
|
||||
+ dockicon_size = this._settings.get_int(DOCK_SIZE_KEY);
|
||||
+ hideDock = hideable = this._settings.get_boolean(DOCK_HIDE_KEY);
|
||||
+ hideEffect = this._settings.get_enum(DOCK_EFFECTHIDE_KEY);
|
||||
+ autohide_animation_time = this._settings.get_double(DOCK_AUTOHIDE_ANIMATION_TIME_KEY);
|
||||
+ //global.log("POSITION: " + position);
|
||||
+ //global.log("dockicon_size: " + dockicon_size);
|
||||
+
|
||||
|
||||
this._spacing = 4;
|
||||
this._item_size = dockicon_size;
|
||||
@@ -378,6 +382,72 @@ Dock.prototype = {
|
||||
}));
|
||||
Main.layoutManager.addChrome(this.actor);
|
||||
|
||||
+ //hidden
|
||||
+ this._settings.connect('changed::'+DOCK_POSITION_KEY, Lang.bind(this, function (){
|
||||
+ if (!this._settings)
|
||||
+ return;
|
||||
+
|
||||
+ let primary = Main.layoutManager.primaryMonitor;
|
||||
+ position = this._settings.get_enum(DOCK_POSITION_KEY);
|
||||
+ this.actor.y=primary.y;
|
||||
+ this._redisplay();
|
||||
+ }));
|
||||
+
|
||||
+ this._settings.connect('changed::'+DOCK_SIZE_KEY, Lang.bind(this, function (){
|
||||
+ if (!this._settings)
|
||||
+ return;
|
||||
+
|
||||
+ dockicon_size = this._settings.get_int(DOCK_SIZE_KEY);
|
||||
+ this._redisplay();
|
||||
+ }));
|
||||
+
|
||||
+ this._settings.connect('changed::'+DOCK_HIDE_KEY, Lang.bind(this, function (){
|
||||
+ if (!this._settings)
|
||||
+ return;
|
||||
+
|
||||
+ hideable = this._settings.get_boolean(DOCK_HIDE_KEY);
|
||||
+ if (hideable){
|
||||
+ hideDock=false;
|
||||
+ this._hideDock();
|
||||
+ } else {
|
||||
+ hideDock=true;
|
||||
+ this._showDock();
|
||||
+ }
|
||||
+ }));
|
||||
+
|
||||
+ this._settings.connect('changed::'+DOCK_EFFECTHIDE_KEY, Lang.bind(this, function () {
|
||||
+ if (!this._settings)
|
||||
+ return;
|
||||
+
|
||||
+ hideEffect = this._settings.get_enum(DOCK_EFFECTHIDE_KEY);
|
||||
+
|
||||
+ switch (hideEffect) {
|
||||
+ case AutoHideEffect.RESCALE:
|
||||
+ this._item_size=dockicon_size;
|
||||
+ break;
|
||||
+ case AutoHideEffect.RESIZE:
|
||||
+ this.actor.set_scale (1,1);
|
||||
+ break;
|
||||
+ case AutoHideEffect.MOVE:
|
||||
+ ;
|
||||
+ }
|
||||
+ this.actor.disconnect(this._leave_event);
|
||||
+ this.actor.disconnect(this._enter_event);
|
||||
+
|
||||
+ this._selectFunctionsHide ();
|
||||
+
|
||||
+ this._leave_event = this.actor.connect('leave-event', Lang.bind(this, this._hideDock));
|
||||
+ this._enter_event = this.actor.connect('enter-event', Lang.bind(this, this._showDock));
|
||||
+ this._redisplay();
|
||||
+ }));
|
||||
+
|
||||
+ this._settings.connect('changed::'+DOCK_AUTOHIDE_ANIMATION_TIME_KEY, Lang.bind(this,function (){
|
||||
+ if (!this._settings)
|
||||
+ return;
|
||||
+
|
||||
+ autohide_animation_time = this._settings.get_double(DOCK_AUTOHIDE_ANIMATION_TIME_KEY);
|
||||
+ }));
|
||||
+
|
||||
this._leave_event = this.actor.connect('leave-event', Lang.bind(this, this._hideDock));
|
||||
this._enter_event = this.actor.connect('enter-event', Lang.bind(this, this._showDock));
|
||||
|
||||
@@ -413,13 +483,14 @@ Dock.prototype = {
|
||||
this.actor.destroy();
|
||||
|
||||
// Break reference cycles
|
||||
+ this._settings = null;
|
||||
this._appSystem = null;
|
||||
this._tracker = null;
|
||||
},
|
||||
|
||||
// fuctions hide
|
||||
_restoreHideDock: function(){
|
||||
- hideable = DOCK_AUTOHIDE;
|
||||
+ hideable = this._settings.get_boolean(DOCK_HIDE_KEY);
|
||||
},
|
||||
|
||||
_disableHideDock: function (){
|
||||
diff --git a/extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in b/extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in
|
||||
new file mode 100644
|
||||
index 0000000..351c9a7
|
||||
--- /dev/null
|
||||
+++ b/extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in
|
||||
@@ -0,0 +1,38 @@
|
||||
+<schemalist gettext-domain="gnome-shell-extensions">
|
||||
+ <enum id='org.gnome.shell.extensions.dock.PositionMode'>
|
||||
+ <value nick='left' value='0'/>
|
||||
+ <value nick='right' value='1'/>
|
||||
+ </enum>
|
||||
+ <enum id='org.gnome.shell.extensions.dock.AutoHideEffect'>
|
||||
+ <value nick='resize' value='0'/>
|
||||
+ <value nick='rescale' value='1'/>
|
||||
+ <value nick='move' value='2'/>
|
||||
+ </enum>
|
||||
+
|
||||
+ <schema id="org.gnome.shell.extensions.dock" path="/org/gnome/shell/extensions/dock/">
|
||||
+ <key name="position" enum="org.gnome.shell.extensions.dock.PositionMode">
|
||||
+ <default>'right'</default>
|
||||
+ <_summary>Position of the dock</_summary>
|
||||
+ <_description>Sets the position of the dock in the screen. Allowed values are 'right' or 'left'</_description>
|
||||
+ </key>
|
||||
+ <key name="size" type="i">
|
||||
+ <default>48</default>
|
||||
+ <_summary>Icon size</_summary>
|
||||
+ <_description>Sets icon size of the dock.</_description>
|
||||
+ </key>
|
||||
+ <key name="autohide" type="b">
|
||||
+ <default>true</default>
|
||||
+ <_summary>Enable/disable autohide</_summary>
|
||||
+ </key>
|
||||
+ <key name="hide-effect" enum="org.gnome.shell.extensions.dock.AutoHideEffect">
|
||||
+ <default>'resize'</default>
|
||||
+ <_summary>Autohide effect</_summary>
|
||||
+ <_description>Sets the effect of the hide dock. Allowed values are 'resize' or 'rescale'</_description>
|
||||
+ </key>
|
||||
+ <key name="hide-effect-duration" type="d">
|
||||
+ <default>0.3</default>
|
||||
+ <_summary>Autohide duration</_summary>
|
||||
+ <_description>Sets the time duration of the autohide effect.</_description>
|
||||
+ </key>
|
||||
+ </schema>
|
||||
+</schemalist>
|
||||
diff --git a/extensions/native-window-placement/Makefile.am b/extensions/native-window-placement/Makefile.am
|
||||
index c53a614..0d6c4bc 100644
|
||||
--- a/extensions/native-window-placement/Makefile.am
|
||||
+++ b/extensions/native-window-placement/Makefile.am
|
||||
@@ -1,3 +1,14 @@
|
||||
EXTENSION_ID = native-window-placement
|
||||
|
||||
include ../../extension.mk
|
||||
+
|
||||
+gschemas_in = $(gschemabase).native-window-placement.gschema.xml.in
|
||||
+
|
||||
+@INTLTOOL_XML_NOMERGE_RULE@
|
||||
+
|
||||
+gsettings_SCHEMAS = $(gschemas_in:.xml.in=.xml)
|
||||
+
|
||||
+@GSETTINGS_RULES@
|
||||
+
|
||||
+CLEANFILES += $(gschemas_in:.xml.in=.valid) $(gsettings_SCHEMAS)
|
||||
+EXTRA_DIST += $(gschemas_in)
|
||||
diff --git a/extensions/native-window-placement/extension.js b/extensions/native-window-placement/extension.js
|
||||
index 7031ce9..67bc34f 100644
|
||||
--- a/extensions/native-window-placement/extension.js
|
||||
+++ b/extensions/native-window-placement/extension.js
|
||||
@@ -25,12 +25,6 @@ const WindowPlacementStrategy = {
|
||||
GRID: 1,
|
||||
};
|
||||
|
||||
-/* Begin user settings */
|
||||
-const PLACEMENT_STRATEGY = WindowPlacementStrategy.NATURAL;
|
||||
-const USE_MORE_SCREEN = true;
|
||||
-const WINDOW_CAPTIONS_ON_TOP = true;
|
||||
-/* End user settings - do not change anything below this line */
|
||||
-
|
||||
// testing settings for natural window placement strategy:
|
||||
const WINDOW_PLACEMENT_NATURAL_FILLGAPS = true; // enlarge windows at the end to fill gaps // not implemented yet
|
||||
const WINDOW_PLACEMENT_NATURAL_GRID_FALLBACK = true; // fallback to grid mode if all windows have the same size and positions. // not implemented yet
|
||||
@@ -123,8 +117,19 @@ function resetState() {
|
||||
function enable() {
|
||||
resetState();
|
||||
|
||||
- let placementStrategy = PLACEMENT_STRATEGY;
|
||||
- let useMoreScreen = USE_MORE_SCREEN;
|
||||
+ let settings = new Gio.Settings({ schema: 'org.gnome.shell.extensions.native-window-placement' });
|
||||
+ let placementStrategy = settings.get_enum('strategy');
|
||||
+ let signalId = settings.connect('changed::strategy', function() {
|
||||
+ placementStrategy = settings.get_enum('strategy');
|
||||
+ // we don't update immediately, we wait for a relayout
|
||||
+ // (and hope for the best)
|
||||
+ });
|
||||
+ connectedSignals.push({ obj: settings, id: signalId });
|
||||
+ let useMoreScreen = settings.get_boolean('use-more-screen');
|
||||
+ signalId = settings.connect('changed::use-more-screen', function() {
|
||||
+ useMoreScreen = settings.get_boolean('use-more-screen');
|
||||
+ });
|
||||
+ connectedSignals.push({ obj: settings, id: signalId });
|
||||
|
||||
/**
|
||||
* _calculateWindowTransformationsNatural:
|
||||
@@ -410,7 +415,7 @@ function enable() {
|
||||
}
|
||||
|
||||
/// position window titles on top of windows in overlay ////
|
||||
- if (WINDOW_CAPTIONS_ON_TOP) {
|
||||
+ if (settings.get_boolean('window-captions-on-top')) {
|
||||
winInjections['_init'] = Workspace.WindowOverlay.prototype._init;
|
||||
Workspace.WindowOverlay.prototype._init = function(windowClone, parentActor) {
|
||||
let metaWindow = windowClone.metaWindow;
|
||||
@@ -524,4 +529,4 @@ function disable() {
|
||||
|
||||
function init() {
|
||||
/* do nothing */
|
||||
-}
|
||||
+}
|
||||
\ No newline at end of file
|
||||
diff --git a/extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in b/extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in
|
||||
new file mode 100644
|
||||
index 0000000..873bfd7
|
||||
--- /dev/null
|
||||
+++ b/extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in
|
||||
@@ -0,0 +1,26 @@
|
||||
+<schemalist gettext-domain="gnome-shell-extensions">
|
||||
+ <enum id="org.gnome.shell.extensions.native-window-placement.strategy">
|
||||
+ <value nick="natural" value="0" />
|
||||
+ <value nick="grid" value="1" />
|
||||
+ </enum>
|
||||
+ <schema id="org.gnome.shell.extensions.native-window-placement" path="/org/gnome/shell/extensions/native-window-placement/">
|
||||
+ <key name="strategy" enum="org.gnome.shell.extensions.native-window-placement.strategy">
|
||||
+ <default>'natural'</default>
|
||||
+ <_summary>Window placement strategy</_summary>
|
||||
+ <_description>The algorithm used to layout thumbnails in the overview. 'grid' to use the default grid based algorithm,
|
||||
+ 'natural' to use another one that reflects more the position and size of the actual window</_description>
|
||||
+ </key>
|
||||
+ <key name="use-more-screen" type="b">
|
||||
+ <default>true</default>
|
||||
+ <_summary>Use more screen for windows</_summary>
|
||||
+ <_description>Try to use more screen for placing window thumbnails by adapting to screen aspect ratio, and consolidating
|
||||
+ them further to reduce the bounding box. This setting applies only with the natural placement strategy.</_description>
|
||||
+ </key>
|
||||
+ <key name="window-captions-on-top" type="b">
|
||||
+ <default>true</default>
|
||||
+ <_summary>Place window captions on top</_summary>
|
||||
+ <_description>If true, place window captions on top the respective thumbnail, overriding shell default of placing it at
|
||||
+ the bottom. Changing this setting requires restarting the shell to have any effect.</_description>
|
||||
+ </key>
|
||||
+ </schema>
|
||||
+</schemalist>
|
||||
diff --git a/po/POTFILES.in b/po/POTFILES.in
|
||||
index b82572e..d1be54b 100644
|
||||
--- a/po/POTFILES.in
|
||||
+++ b/po/POTFILES.in
|
||||
@@ -1,9 +1,13 @@
|
||||
extensions/alternative-status-menu/extension.js
|
||||
extensions/alternate-tab/extension.js
|
||||
+extensions/alternate-tab/org.gnome.shell.extensions.alternate-tab.gschema.xml.in
|
||||
extensions/auto-move-windows/extension.js
|
||||
+extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in
|
||||
extensions/dock/extension.js
|
||||
+extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in
|
||||
extensions/example/extension.js
|
||||
extensions/gajim/extension.js
|
||||
+extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in
|
||||
extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in
|
||||
extensions/windowsNavigator/extension.js
|
||||
extensions/xrandr-indicator/extension.js
|
||||
--
|
||||
1.7.9
|
||||
|
||||
@@ -1,302 +0,0 @@
|
||||
From 87b039cc3ee850fb82fbcc4a1a0dadde3db9c0be Mon Sep 17 00:00:00 2001
|
||||
From: Michael Biebl <biebl@debian.org>
|
||||
Date: Sat, 11 Feb 2012 23:21:30 +0100
|
||||
Subject: [PATCH] Revert "Remove all references to localedir from
|
||||
metadata.json"
|
||||
|
||||
This reverts commit c4b40926bd62c4561bdf07ea0f2144494e0f4917.
|
||||
|
||||
Conflicts:
|
||||
|
||||
extensions/dock/extension.js
|
||||
---
|
||||
extension.mk | 3 ++-
|
||||
extensions/alternate-tab/extension.js | 2 +-
|
||||
extensions/alternate-tab/metadata.json.in | 1 +
|
||||
extensions/alternative-status-menu/extension.js | 3 +--
|
||||
.../alternative-status-menu/metadata.json.in | 1 +
|
||||
extensions/apps-menu/metadata.json.in | 1 +
|
||||
extensions/auto-move-windows/metadata.json.in | 1 +
|
||||
extensions/dock/metadata.json.in | 1 +
|
||||
extensions/drive-menu/extension.js | 2 +-
|
||||
extensions/drive-menu/metadata.json.in | 1 +
|
||||
extensions/example/extension.js | 2 +-
|
||||
extensions/example/metadata.json.in | 1 +
|
||||
extensions/gajim/metadata.json.in | 1 +
|
||||
.../native-window-placement/metadata.json.in | 1 +
|
||||
extensions/places-menu/extension.js | 2 +-
|
||||
extensions/places-menu/metadata.json.in | 1 +
|
||||
extensions/systemMonitor/metadata.json.in | 1 +
|
||||
extensions/windowsNavigator/metadata.json.in | 1 +
|
||||
extensions/workspace-indicator/metadata.json.in | 1 +
|
||||
extensions/xrandr-indicator/extension.js | 4 ++--
|
||||
extensions/xrandr-indicator/metadata.json.in | 1 +
|
||||
21 files changed, 23 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/extension.mk b/extension.mk
|
||||
index 220f00c..b16f64f 100644
|
||||
--- a/extension.mk
|
||||
+++ b/extension.mk
|
||||
@@ -6,7 +6,8 @@ nodist_extension_DATA = metadata.json $(EXTRA_EXTENSION)
|
||||
EXTRA_DIST = metadata.json.in
|
||||
|
||||
metadata.json: metadata.json.in $(top_builddir)/config.status
|
||||
- $(AM_V_GEN) sed -e "s|[@]uuid@|$(uuid)|" \
|
||||
+ $(AM_V_GEN) sed -e "s|[@]LOCALEDIR@|$(datadir)/locale|" \
|
||||
+ -e "s|[@]uuid@|$(uuid)|" \
|
||||
-e "s|[@]shell_current@|$(PACKAGE_VERSION)|" \
|
||||
-e "s|[@]url@|$(extensionurl)|" $< > $@
|
||||
|
||||
diff --git a/extensions/alternate-tab/extension.js b/extensions/alternate-tab/extension.js
|
||||
index a53b396..3f35d21 100644
|
||||
--- a/extensions/alternate-tab/extension.js
|
||||
+++ b/extensions/alternate-tab/extension.js
|
||||
@@ -594,7 +594,7 @@ WindowList.prototype = {
|
||||
};
|
||||
|
||||
function init(metadata) {
|
||||
- imports.gettext.bindtextdomain('gnome-shell-extensions', GLib.build_filenamev([metadata.path, 'locale']));
|
||||
+ imports.gettext.bindtextdomain('gnome-shell-extensions', metadata.localedir);
|
||||
}
|
||||
|
||||
function doAltTab(shellwm, binding, mask, window, backwards) {
|
||||
diff --git a/extensions/alternate-tab/metadata.json.in b/extensions/alternate-tab/metadata.json.in
|
||||
index d13c1b8..8aa86e3 100644
|
||||
--- a/extensions/alternate-tab/metadata.json.in
|
||||
+++ b/extensions/alternate-tab/metadata.json.in
|
||||
@@ -4,5 +4,6 @@
|
||||
"description": "A replacement for Alt-Tab, allows to cycle between windows and does not group by application",
|
||||
"original-authors": [ "jw@bargsten.org", "thomas.bouffon@gmail.com" ],
|
||||
"shell-version": [ "@shell_current@", "3.2" ],
|
||||
+"localedir": "@LOCALEDIR@",
|
||||
"url": "@url@"
|
||||
}
|
||||
diff --git a/extensions/alternative-status-menu/extension.js b/extensions/alternative-status-menu/extension.js
|
||||
index 08c2f9e..d13df0f 100644
|
||||
--- a/extensions/alternative-status-menu/extension.js
|
||||
+++ b/extensions/alternative-status-menu/extension.js
|
||||
@@ -1,5 +1,4 @@
|
||||
/* -*- mode: js2 - indent-tabs-mode: nil - js2-basic-offset: 4 -*- */
|
||||
-const GLib = imports.gi.GLib;
|
||||
const Lang = imports.lang;
|
||||
const St = imports.gi.St;
|
||||
|
||||
@@ -100,7 +99,7 @@ function createSubMenu() {
|
||||
|
||||
// Put your extension initialization code here
|
||||
function init(metadata) {
|
||||
- imports.gettext.bindtextdomain('gnome-shell-extensions', GLib.build_filenamev([metadata.path, 'locale']));
|
||||
+ imports.gettext.bindtextdomain('gnome-shell-extensions', metadata.localedir);
|
||||
}
|
||||
|
||||
function predestroy(statusMenu) {
|
||||
diff --git a/extensions/alternative-status-menu/metadata.json.in b/extensions/alternative-status-menu/metadata.json.in
|
||||
index dc3fd7b..91bb82f 100644
|
||||
--- a/extensions/alternative-status-menu/metadata.json.in
|
||||
+++ b/extensions/alternative-status-menu/metadata.json.in
|
||||
@@ -3,5 +3,6 @@
|
||||
"name": "Alternative Status Menu",
|
||||
"description": "Replaces GNOME Shell Status Menu with one showing Suspend/Hibernate and Power Off as separate items",
|
||||
"shell-version": [ "@shell_current@", "3.2" ],
|
||||
+ "localedir": "@LOCALEDIR@",
|
||||
"url": "@url@"
|
||||
}
|
||||
diff --git a/extensions/apps-menu/metadata.json.in b/extensions/apps-menu/metadata.json.in
|
||||
index 9f40989..550bb81 100644
|
||||
--- a/extensions/apps-menu/metadata.json.in
|
||||
+++ b/extensions/apps-menu/metadata.json.in
|
||||
@@ -3,5 +3,6 @@
|
||||
"name": "Applications Menu",
|
||||
"description": "Add a gnome 2.x style menu for applications",
|
||||
"shell-version": [ "@shell_current@", "3.2" ],
|
||||
+"localedir": "@LOCALEDIR@",
|
||||
"url": "@url@"
|
||||
}
|
||||
diff --git a/extensions/auto-move-windows/metadata.json.in b/extensions/auto-move-windows/metadata.json.in
|
||||
index cf9b433..c8aa632 100644
|
||||
--- a/extensions/auto-move-windows/metadata.json.in
|
||||
+++ b/extensions/auto-move-windows/metadata.json.in
|
||||
@@ -3,6 +3,7 @@
|
||||
"name": "Auto Move Windows",
|
||||
"description": "Move applications to specific workspaces when they create windows",
|
||||
"shell-version": [ "@shell_current@", "3.2" ],
|
||||
+ "localedir": "@LOCALEDIR@",
|
||||
"original-authors": [ "alessandro.crismani@gmail.com", "thomas.bouffon@gmail.com" ],
|
||||
"url": "@url@"
|
||||
}
|
||||
diff --git a/extensions/dock/metadata.json.in b/extensions/dock/metadata.json.in
|
||||
index d9dca6c..96237b4 100644
|
||||
--- a/extensions/dock/metadata.json.in
|
||||
+++ b/extensions/dock/metadata.json.in
|
||||
@@ -4,5 +4,6 @@
|
||||
"description": "A dock for the GNOME Shell -- displays favorite and running applications",
|
||||
"original-author": "tclaesson@gmail.com",
|
||||
"shell-version": [ "@shell_current@", "3.2" ],
|
||||
+"localedir": "@LOCALEDIR@",
|
||||
"url": "@url@"
|
||||
}
|
||||
diff --git a/extensions/drive-menu/extension.js b/extensions/drive-menu/extension.js
|
||||
index bcc44ec..20044ab 100644
|
||||
--- a/extensions/drive-menu/extension.js
|
||||
+++ b/extensions/drive-menu/extension.js
|
||||
@@ -92,7 +92,7 @@ DriveMenu.prototype = {
|
||||
|
||||
// Put your extension initialization code here
|
||||
function init(metadata) {
|
||||
- imports.gettext.bindtextdomain('gnome-shell-extensions', GLib.build_filenamev([metadata.path, 'locale']));
|
||||
+ imports.gettext.bindtextdomain('gnome-shell-extensions', metadata.localedir);
|
||||
}
|
||||
|
||||
let _indicator;
|
||||
diff --git a/extensions/drive-menu/metadata.json.in b/extensions/drive-menu/metadata.json.in
|
||||
index f5a834c..def7c84 100644
|
||||
--- a/extensions/drive-menu/metadata.json.in
|
||||
+++ b/extensions/drive-menu/metadata.json.in
|
||||
@@ -3,5 +3,6 @@
|
||||
"name": "Removable Drive Menu",
|
||||
"description": "A status menu for accessing and unmounting removable devices",
|
||||
"shell-version": [ "@shell_current@", "3.2" ],
|
||||
+ "localedir": "@LOCALEDIR@",
|
||||
"url": "@url@"
|
||||
}
|
||||
diff --git a/extensions/example/extension.js b/extensions/example/extension.js
|
||||
index 28274d4..1aec221 100644
|
||||
--- a/extensions/example/extension.js
|
||||
+++ b/extensions/example/extension.js
|
||||
@@ -20,7 +20,7 @@ function _showHello() {
|
||||
function init(metadata) {
|
||||
log ('Example extension initalized');
|
||||
|
||||
- imports.gettext.bindtextdomain('gnome-shell-extensions', GLib.build_filenamev([metadata.path, 'locale']));
|
||||
+ imports.gettext.bindtextdomain('gnome-shell-extensions', metadata.localedir);
|
||||
}
|
||||
|
||||
let signalId;
|
||||
diff --git a/extensions/example/metadata.json.in b/extensions/example/metadata.json.in
|
||||
index 89402dd..239ae01 100644
|
||||
--- a/extensions/example/metadata.json.in
|
||||
+++ b/extensions/example/metadata.json.in
|
||||
@@ -3,5 +3,6 @@
|
||||
"name": "Hello, World!",
|
||||
"description": "An example extension to show how it works. Shows Hello, world when clicking on the top panel.",
|
||||
"shell-version": [ "@shell_current@", "3.2" ],
|
||||
+ "localedir": "@LOCALEDIR@",
|
||||
"url": "@url@"
|
||||
}
|
||||
diff --git a/extensions/gajim/metadata.json.in b/extensions/gajim/metadata.json.in
|
||||
index d7aa644..d258ca4 100644
|
||||
--- a/extensions/gajim/metadata.json.in
|
||||
+++ b/extensions/gajim/metadata.json.in
|
||||
@@ -3,5 +3,6 @@
|
||||
"name": "Gajim IM integration",
|
||||
"description": "Display Gajim incoming chats as notifications in the Shell message tray.",
|
||||
"shell-version": [ "@shell_current@", "3.2" ],
|
||||
+ "localedir": "@LOCALEDIR@",
|
||||
"url": "http://base-art.net"
|
||||
}
|
||||
diff --git a/extensions/native-window-placement/metadata.json.in b/extensions/native-window-placement/metadata.json.in
|
||||
index 798fb0d..d6c7424 100644
|
||||
--- a/extensions/native-window-placement/metadata.json.in
|
||||
+++ b/extensions/native-window-placement/metadata.json.in
|
||||
@@ -3,6 +3,7 @@
|
||||
"name": "Native Window Placement",
|
||||
"description": "Arrange windows in overview in a more native way",
|
||||
"shell-version": [ "@shell_current@", "3.2" ],
|
||||
+ "localedir": "@LOCALEDIR@",
|
||||
"url": "@url@",
|
||||
"original-authors": [ "wepmaschda@gmx.de" ]
|
||||
}
|
||||
diff --git a/extensions/places-menu/extension.js b/extensions/places-menu/extension.js
|
||||
index a871a81..17bfe73 100644
|
||||
--- a/extensions/places-menu/extension.js
|
||||
+++ b/extensions/places-menu/extension.js
|
||||
@@ -114,7 +114,7 @@ PlacesMenu.prototype = {
|
||||
|
||||
|
||||
function init(metadata) {
|
||||
- imports.gettext.bindtextdomain('gnome-shell-extensions', GLib.build_filenamev([metadata.path, 'locale']));
|
||||
+ imports.gettext.bindtextdomain('gnome-shell-extensions', metadata.localedir);
|
||||
}
|
||||
|
||||
let _indicator;
|
||||
diff --git a/extensions/places-menu/metadata.json.in b/extensions/places-menu/metadata.json.in
|
||||
index 2e483c3..2ea7271 100644
|
||||
--- a/extensions/places-menu/metadata.json.in
|
||||
+++ b/extensions/places-menu/metadata.json.in
|
||||
@@ -3,5 +3,6 @@
|
||||
"name": "Places Status Indicator",
|
||||
"description": "Add a systems status menu for quickly navigating places in the system",
|
||||
"shell-version": [ "@shell_current@", "3.2" ],
|
||||
+"localedir": "@LOCALEDIR@",
|
||||
"url": "@url@"
|
||||
}
|
||||
diff --git a/extensions/systemMonitor/metadata.json.in b/extensions/systemMonitor/metadata.json.in
|
||||
index 569e9d8..2eb29cc 100644
|
||||
--- a/extensions/systemMonitor/metadata.json.in
|
||||
+++ b/extensions/systemMonitor/metadata.json.in
|
||||
@@ -1,6 +1,7 @@
|
||||
{
|
||||
"shell-version": ["@shell_current@", "3.2" ],
|
||||
"uuid": "@uuid@",
|
||||
+ "localedir": "@LOCALEDIR@",
|
||||
"original-author": "zaspire@rambler.ru",
|
||||
"name": "SystemMonitor",
|
||||
"description": "System Monitor",
|
||||
diff --git a/extensions/windowsNavigator/metadata.json.in b/extensions/windowsNavigator/metadata.json.in
|
||||
index 9dd84de..93bdb59 100644
|
||||
--- a/extensions/windowsNavigator/metadata.json.in
|
||||
+++ b/extensions/windowsNavigator/metadata.json.in
|
||||
@@ -1,6 +1,7 @@
|
||||
{
|
||||
"shell-version": ["@shell_current@", "3.2" ],
|
||||
"uuid": "@uuid@",
|
||||
+ "localedir": "@LOCALEDIR@",
|
||||
"original-author": "zaspire@rambler.ru",
|
||||
"name": "windowNavigator",
|
||||
"description": "Allow keyboard selection of windows and workspaces in overlay mode",
|
||||
diff --git a/extensions/workspace-indicator/metadata.json.in b/extensions/workspace-indicator/metadata.json.in
|
||||
index 851b55f..5a331fa 100644
|
||||
--- a/extensions/workspace-indicator/metadata.json.in
|
||||
+++ b/extensions/workspace-indicator/metadata.json.in
|
||||
@@ -3,6 +3,7 @@
|
||||
"name": "Workspace Indicator",
|
||||
"description": "Put an indicator on the panel signaling in which workspace you are, and give you the possibility of switching to another one",
|
||||
"shell-version": [ "@shell_current@", "3.2" ],
|
||||
+ "localedir": "@LOCALEDIR@",
|
||||
"original-authors": [ "erick.red@gmail.com" ],
|
||||
"url": "@url@"
|
||||
}
|
||||
diff --git a/extensions/xrandr-indicator/extension.js b/extensions/xrandr-indicator/extension.js
|
||||
index 2f846d0..979e549 100644
|
||||
--- a/extensions/xrandr-indicator/extension.js
|
||||
+++ b/extensions/xrandr-indicator/extension.js
|
||||
@@ -137,7 +137,7 @@ Indicator.prototype = {
|
||||
|
||||
|
||||
function init(metadata) {
|
||||
- imports.gettext.bindtextdomain('gnome-shell-extensions', GLib.build_filenamev([metadata.path, 'locale']));
|
||||
+ imports.gettext.bindtextdomain('gnome-shell-extensions', metadata.localedir);
|
||||
}
|
||||
|
||||
let _indicator;
|
||||
@@ -149,4 +149,4 @@ function enable() {
|
||||
|
||||
function disable() {
|
||||
_indicator.destroy();
|
||||
-}
|
||||
+}
|
||||
\ No newline at end of file
|
||||
diff --git a/extensions/xrandr-indicator/metadata.json.in b/extensions/xrandr-indicator/metadata.json.in
|
||||
index a1f8526..0da402d 100644
|
||||
--- a/extensions/xrandr-indicator/metadata.json.in
|
||||
+++ b/extensions/xrandr-indicator/metadata.json.in
|
||||
@@ -3,5 +3,6 @@
|
||||
"name": "Monitor Status Indicator",
|
||||
"description": "Add a systems status menu for rotating monitors (overrides what is currently provided by gnome-settings-daemon)",
|
||||
"shell-version": [ "@shell_current@", "3.2" ],
|
||||
+"localedir": "@LOCALEDIR@",
|
||||
"url": "@url@"
|
||||
}
|
||||
--
|
||||
1.7.9
|
||||
|
||||
11
debian/patches/dont-require-nautilus-classic.patch
vendored
Normal file
11
debian/patches/dont-require-nautilus-classic.patch
vendored
Normal file
@@ -0,0 +1,11 @@
|
||||
Description: Don't use nautilus-classic since it forces desktop icons
|
||||
Author: Jeremy Bicha <jbicha@ubuntu.com>
|
||||
Bug: https://bugzilla.gnome.org/695088
|
||||
|
||||
--- a/data/gnome-classic.session.desktop.in
|
||||
+++ b/data/gnome-classic.session.desktop.in
|
||||
@@ -1,3 +1,3 @@
|
||||
[GNOME Session]
|
||||
Name=GNOME Classic
|
||||
-RequiredComponents=org.gnome.Shell;org.gnome.SettingsDaemon.A11yKeyboard;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;nautilus-classic;
|
||||
+RequiredComponents=org.gnome.Shell;org.gnome.SettingsDaemon.A11yKeyboard;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;
|
||||
144
debian/patches/fix_alternate-tab_661281.diff
vendored
Normal file
144
debian/patches/fix_alternate-tab_661281.diff
vendored
Normal file
@@ -0,0 +1,144 @@
|
||||
From 37c96f6a8a6898c56c633c3a0e158e5b5ecd774b Mon Sep 17 00:00:00 2001
|
||||
From: Joachim Bargsten <jw@bargsten.org>
|
||||
Date: Tue, 4 Oct 2011 00:40:59 +0200
|
||||
Subject: [PATCH 1/3] alternate-tab: workspace and icons part 3.2 ready
|
||||
|
||||
The workspace and icons switcher is now gnome 3.2 ready.
|
||||
--- a/extensions/alternate-tab/extension.js
|
||||
+++ b/extensions/alternate-tab/extension.js
|
||||
@@ -23,21 +23,26 @@
|
||||
const _ = Gettext.gettext;
|
||||
const N_ = function(e) { return e };
|
||||
|
||||
-const POPUP_FADE_TIME = 0.1; // seconds
|
||||
+const POPUP_DELAY_TIMEOUT = 150; // milliseconds
|
||||
|
||||
const SETTINGS_SCHEMA = 'org.gnome.shell.extensions.alternate-tab';
|
||||
const SETTINGS_BEHAVIOUR_KEY = 'behaviour';
|
||||
const SETTINGS_FIRST_TIME_KEY = 'first-time';
|
||||
|
||||
const MODES = {
|
||||
- native: function() {
|
||||
- Main.wm._startAppSwitcher();
|
||||
+ native: function(shellwm, binding, mask, window, backwards) {
|
||||
+ shellwm._startAppSwitcher(shellwm, binding, mask, window, backwards);
|
||||
},
|
||||
all_thumbnails: function() {
|
||||
new AltTabPopup2();
|
||||
},
|
||||
- workspace_icons: function() {
|
||||
- new AltTabPopupW().show();
|
||||
+ workspace_icons: function(shellwm, binding, mask, window, backwards) {
|
||||
+ if (shellwm._workspaceSwitcherPopup != null)
|
||||
+ shellwm._workspaceSwitcherPopup.actor.hide();
|
||||
+
|
||||
+ let tabPopup = new AltTabPopupW();
|
||||
+ if (!tabPopup.show(backwards, binding, mask))
|
||||
+ tabPopup.destroy();
|
||||
}
|
||||
};
|
||||
|
||||
@@ -68,7 +73,9 @@
|
||||
AltTabPopupW.prototype = {
|
||||
__proto__ : AltTab.AltTabPopup.prototype,
|
||||
|
||||
- show : function(backward, switch_group) {
|
||||
+ _windowActivated : function(thumbnailList, n) { },
|
||||
+
|
||||
+ show : function(backward, binding, mask) {
|
||||
let appSys = Shell.AppSystem.get_default();
|
||||
let apps = appSys.get_running ();
|
||||
|
||||
@@ -78,6 +85,7 @@
|
||||
if (!Main.pushModal(this.actor))
|
||||
return false;
|
||||
this._haveModal = true;
|
||||
+ this._modifierMask = AltTab.primaryModifier(mask);
|
||||
|
||||
this.actor.connect('key-press-event', Lang.bind(this, this._keyPressEvent));
|
||||
this.actor.connect('key-release-event', Lang.bind(this, this._keyReleaseEvent));
|
||||
@@ -92,16 +100,22 @@
|
||||
|
||||
this._appIcons = this._appSwitcher.icons;
|
||||
|
||||
+ // Need to force an allocation so we can figure out whether we
|
||||
+ // need to scroll when selecting
|
||||
+ this.actor.opacity = 0;
|
||||
+ this.actor.show();
|
||||
+ this.actor.get_allocation_box();
|
||||
+
|
||||
// Make the initial selection
|
||||
- if (switch_group) {
|
||||
- if (backward) {
|
||||
- this._select(0, this._appIcons[0].cachedWindows.length - 1);
|
||||
- } else {
|
||||
- if (this._appIcons[0].cachedWindows.length > 1)
|
||||
- this._select(0, 1);
|
||||
- else
|
||||
- this._select(0, 0);
|
||||
- }
|
||||
+ if (binding == 'switch_group') {
|
||||
+ //see AltTab.AltTabPopup.show function
|
||||
+ //cached windows are always of length one, so select first app and the window
|
||||
+ //the direction doesn't matter, so ignore backward
|
||||
+ this._select(0, 0);
|
||||
+ } else if (binding == 'switch_group_backward') {
|
||||
+ this._select(0, 0);
|
||||
+ } else if (binding == 'switch_windows_backward') {
|
||||
+ this._select(this._appIcons.length - 1);
|
||||
} else if (this._appIcons.length == 1) {
|
||||
this._select(0);
|
||||
} else if (backward) {
|
||||
@@ -110,24 +124,25 @@
|
||||
this._select(1);
|
||||
}
|
||||
|
||||
+
|
||||
// There's a race condition; if the user released Alt before
|
||||
// we got the grab, then we won't be notified. (See
|
||||
// https://bugzilla.gnome.org/show_bug.cgi?id=596695 for
|
||||
// details.) So we check now. (Have to do this after updating
|
||||
// selection.)
|
||||
let [x, y, mods] = global.get_pointer();
|
||||
- if (!(mods & Gdk.ModifierType.MOD1_MASK)) {
|
||||
+ if (!(mods & this._modifierMask)) {
|
||||
this._finish();
|
||||
return false;
|
||||
}
|
||||
|
||||
- this.actor.opacity = 0;
|
||||
- this.actor.show();
|
||||
- Tweener.addTween(this.actor,
|
||||
- { opacity: 255,
|
||||
- time: POPUP_FADE_TIME,
|
||||
- transition: 'easeOutQuad'
|
||||
- });
|
||||
+ // We delay showing the popup so that fast Alt+Tab users aren't
|
||||
+ // disturbed by the popup briefly flashing.
|
||||
+ this._initialDelayTimeoutId = Mainloop.timeout_add(POPUP_DELAY_TIMEOUT,
|
||||
+ Lang.bind(this, function () {
|
||||
+ this.actor.opacity = 255;
|
||||
+ this._initialDelayTimeoutId = 0;
|
||||
+ }));
|
||||
|
||||
return true;
|
||||
},
|
||||
@@ -545,15 +560,16 @@
|
||||
imports.gettext.bindtextdomain('gnome-shell-extensions', metadata.localedir);
|
||||
}
|
||||
|
||||
-function doAltTab(shellwm, binding, window, backwards) {
|
||||
+function doAltTab(shellwm, binding, mask, window, backwards) {
|
||||
let settings = new Gio.Settings({ schema: SETTINGS_SCHEMA });
|
||||
|
||||
+
|
||||
if(settings.get_boolean(SETTINGS_FIRST_TIME_KEY)) {
|
||||
new AltTabSettingsDialog().open();
|
||||
} else {
|
||||
let behaviour = settings.get_string(SETTINGS_BEHAVIOUR_KEY);
|
||||
if(behaviour in MODES) {
|
||||
- MODES[behaviour](binding, backwards);
|
||||
+ MODES[behaviour](shellwm, binding, mask, window, backwards);
|
||||
}
|
||||
}
|
||||
}
|
||||
11
debian/patches/fix_alternate-tab_gnome-shell_version.diff
vendored
Normal file
11
debian/patches/fix_alternate-tab_gnome-shell_version.diff
vendored
Normal file
@@ -0,0 +1,11 @@
|
||||
--- a/extensions/alternate-tab/metadata.json.in
|
||||
+++ b/extensions/alternate-tab/metadata.json.in
|
||||
@@ -3,7 +3,7 @@
|
||||
"name": "AlternateTab",
|
||||
"description": "A replacement for Alt-Tab, allows to cycle between windows and does not group by application",
|
||||
"original-authors": [ "jw@bargsten.org", "thomas.bouffon@gmail.com" ],
|
||||
-"shell-version": [ "@shell_current@" ],
|
||||
+"shell-version": [ "3.2" ],
|
||||
"localedir": "@LOCALEDIR@",
|
||||
"url": "@url@"
|
||||
}
|
||||
11
debian/patches/fix_dock_gnome-shell_version.diff
vendored
Normal file
11
debian/patches/fix_dock_gnome-shell_version.diff
vendored
Normal file
@@ -0,0 +1,11 @@
|
||||
--- a/extensions/dock/metadata.json.in
|
||||
+++ b/extensions/dock/metadata.json.in
|
||||
@@ -3,7 +3,7 @@
|
||||
"name": "Dock",
|
||||
"description": "A dock for the GNOME Shell -- displays favorite and running applications",
|
||||
"original-author": "tclaesson@gmail.com",
|
||||
-"shell-version": [ "@shell_current@" ],
|
||||
+"shell-version": [ "3.2" ],
|
||||
"localedir": "@LOCALEDIR@",
|
||||
"url": "@url@"
|
||||
}
|
||||
25
debian/patches/gnome-session-classic-wrapper-script.patch
vendored
Normal file
25
debian/patches/gnome-session-classic-wrapper-script.patch
vendored
Normal file
@@ -0,0 +1,25 @@
|
||||
Description: Use a wrapper script to start GNOME classic session
|
||||
Xsession currently doesn't allow to pass more then one argument, as it
|
||||
otherwise fails with
|
||||
Xsession: unable to launch "gnome-session --session classic" X session ---
|
||||
"gnome-session --session classic" not found; falling back to default session.
|
||||
.
|
||||
This is due to [1]. Add a wrapper script to start the GNOME classic session
|
||||
as a workaround. Once [1] is fixed, this should be removed again.
|
||||
.
|
||||
[1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=653327.
|
||||
Author: Michael Biebl <biebl@debian.org>
|
||||
|
||||
Index: gnome-shell-extensions-3.21.90/data/gnome-classic.desktop.in
|
||||
===================================================================
|
||||
--- gnome-shell-extensions-3.21.90.orig/data/gnome-classic.desktop.in
|
||||
+++ gnome-shell-extensions-3.21.90/data/gnome-classic.desktop.in
|
||||
@@ -1,7 +1,7 @@
|
||||
[Desktop Entry]
|
||||
Name=GNOME Classic
|
||||
Comment=This session logs you into GNOME Classic
|
||||
-Exec=env GNOME_SHELL_SESSION_MODE=classic gnome-session --session gnome-classic
|
||||
+Exec=gnome-session-classic
|
||||
TryExec=gnome-session
|
||||
Type=Application
|
||||
DesktopNames=GNOME-Classic;GNOME;
|
||||
5
debian/patches/series
vendored
5
debian/patches/series
vendored
@@ -1,3 +1,2 @@
|
||||
01_status-menu_disable_accounts.patch
|
||||
02-Revert-all-remove-all-GSettings-usage.patch
|
||||
03-Revert-Remove-all-references-to-localedir-from-metad.patch
|
||||
dont-require-nautilus-classic.patch
|
||||
gnome-session-classic-wrapper-script.patch
|
||||
|
||||
42
debian/patches/upstream/patch_2bba98d6214cffae2eb5cecb9d7c1f6b6d244052.diff
vendored
Normal file
42
debian/patches/upstream/patch_2bba98d6214cffae2eb5cecb9d7c1f6b6d244052.diff
vendored
Normal file
@@ -0,0 +1,42 @@
|
||||
From 2bba98d6214cffae2eb5cecb9d7c1f6b6d244052 Mon Sep 17 00:00:00 2001
|
||||
From: Jasper St. Pierre <jstpierre@mecheye.net>
|
||||
Date: Tue, 25 Oct 2011 18:21:01 +0000
|
||||
Subject: systemMonitor: Properly enable/disable
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=662705
|
||||
---
|
||||
diff --git a/extensions/systemMonitor/extension.js b/extensions/systemMonitor/extension.js
|
||||
index 39801ab..6aa117a 100644
|
||||
--- a/extensions/systemMonitor/extension.js
|
||||
+++ b/extensions/systemMonitor/extension.js
|
||||
@@ -35,13 +35,18 @@ Indicator.prototype = {
|
||||
reactive: true});
|
||||
this.actor.add_actor(this.drawing_area);
|
||||
|
||||
- Mainloop.timeout_add(INDICATOR_UPDATE_INTERVAL, Lang.bind(this, function () {
|
||||
+ this._timeout = Mainloop.timeout_add(INDICATOR_UPDATE_INTERVAL, Lang.bind(this, function () {
|
||||
this._updateValues();
|
||||
this.drawing_area.queue_repaint();
|
||||
return true;
|
||||
}));
|
||||
},
|
||||
|
||||
+ destroy: function() {
|
||||
+ Mainloop.source_remove(this._timeout);
|
||||
+ this.actor.destroy();
|
||||
+ },
|
||||
+
|
||||
_initValues: function() {
|
||||
},
|
||||
|
||||
@@ -239,6 +244,8 @@ function enable() {
|
||||
|
||||
function disable() {
|
||||
_cpuIndicator.destroy();
|
||||
+ _cpuIndicator = null;
|
||||
_memIndicator.destroy();
|
||||
+ _memIndicator = null;
|
||||
_box.destroy();
|
||||
}
|
||||
--
|
||||
cgit v0.9.0.2
|
||||
311
debian/patches/upstream/patch_4c5a36e4c0cbe38f2e26b6b3c8b02e88b4b939f7.diff
vendored
Normal file
311
debian/patches/upstream/patch_4c5a36e4c0cbe38f2e26b6b3c8b02e88b4b939f7.diff
vendored
Normal file
@@ -0,0 +1,311 @@
|
||||
From 4c5a36e4c0cbe38f2e26b6b3c8b02e88b4b939f7 Mon Sep 17 00:00:00 2001
|
||||
From: Jason Siefken <siefkenj@gmail.com>
|
||||
Date: Tue, 11 Oct 2011 09:15:05 +0000
|
||||
Subject: Added prettier drawing operations and css colors
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=661443
|
||||
---
|
||||
diff --git a/extensions/systemMonitor/extension.js b/extensions/systemMonitor/extension.js
|
||||
index db7fe59..39801ab 100644
|
||||
--- a/extensions/systemMonitor/extension.js
|
||||
+++ b/extensions/systemMonitor/extension.js
|
||||
@@ -9,6 +9,9 @@ const Shell = imports.gi.Shell;
|
||||
|
||||
const Main = imports.ui.main;
|
||||
|
||||
+const INDICATOR_UPDATE_INTERVAL = 500;
|
||||
+const INDICATOR_NUM_GRID_LINES = 3;
|
||||
+
|
||||
let _cpuIndicator;
|
||||
let _memIndicator;
|
||||
let _box;
|
||||
@@ -19,29 +22,24 @@ function Indicator() {
|
||||
|
||||
Indicator.prototype = {
|
||||
_init: function() {
|
||||
- this._initValues();
|
||||
- this.actor = new St.DrawingArea({ style_class: "extension-systemMonitor-indicator-area",
|
||||
- reactive: true});
|
||||
- this.actor.connect('repaint', Lang.bind(this, this._draw));
|
||||
- this.actor.connect('button-press-event', function() {
|
||||
+ this._initValues();
|
||||
+ this.drawing_area = new St.DrawingArea({ reactive: true });
|
||||
+ this.drawing_area.width = 100; this.drawing_area.height = 100;
|
||||
+ this.drawing_area.connect('repaint', Lang.bind(this, this._draw));
|
||||
+ this.drawing_area.connect('button-press-event', function() {
|
||||
let app = Shell.AppSystem.get_default().lookup_app('gnome-system-monitor.desktop');
|
||||
app.open_new_window(-1);
|
||||
});
|
||||
|
||||
- this._timeoutId = Mainloop.timeout_add(250, Lang.bind(this, function () {
|
||||
- this._updateValues();
|
||||
- this.actor.queue_repaint();
|
||||
- return true;
|
||||
- }));
|
||||
- },
|
||||
+ this.actor = new St.Bin({ style_class: "extension-systemMonitor-indicator-area",
|
||||
+ reactive: true});
|
||||
+ this.actor.add_actor(this.drawing_area);
|
||||
|
||||
- destroy: function() {
|
||||
- if (this._timeoutId) {
|
||||
- Mainloop.source_remove(this._timeoutId);
|
||||
- this._timeoutId = 0;
|
||||
- }
|
||||
-
|
||||
- this.actor.destroy();
|
||||
+ Mainloop.timeout_add(INDICATOR_UPDATE_INTERVAL, Lang.bind(this, function () {
|
||||
+ this._updateValues();
|
||||
+ this.drawing_area.queue_repaint();
|
||||
+ return true;
|
||||
+ }));
|
||||
},
|
||||
|
||||
_initValues: function() {
|
||||
@@ -54,23 +52,83 @@ Indicator.prototype = {
|
||||
let [width, height] = area.get_surface_size();
|
||||
let themeNode = this.actor.get_theme_node();
|
||||
let cr = area.get_context();
|
||||
- for (let i = this.values.length - 1; i >= 0; i--) {
|
||||
- let color = themeNode.get_color(this.values[i].color);
|
||||
- cr.moveTo(0, height);
|
||||
- let k;
|
||||
- for (k = 0; k < this.values[i].values.length; k++) {
|
||||
- cr.lineTo(k, (1 - this.values[i].values[k]) * height);
|
||||
+
|
||||
+ //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) {
|
||||
+ cr.moveTo(0, i * gridOffset + .5);
|
||||
+ cr.lineTo(width, i * gridOffset + .5);
|
||||
+ }
|
||||
+ Clutter.cairo_set_source_color(cr, color);
|
||||
+ cr.setLineWidth(1);
|
||||
+ cr.setDash([4,1], 0);
|
||||
+ cr.stroke();
|
||||
+
|
||||
+ //draw the foreground
|
||||
+
|
||||
+ function makePath(values, reverse, nudge) {
|
||||
+ if (nudge == null) {
|
||||
+ nudge = 0;
|
||||
}
|
||||
- if (k > width)
|
||||
- this.values[i].values.shift();
|
||||
- cr.lineTo(k, height);
|
||||
- cr.lineTo(0, height);
|
||||
- cr.closePath();
|
||||
- Clutter.cairo_set_source_color(cr, color);
|
||||
+ //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) {
|
||||
+ 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) {
|
||||
+ cr.lineTo(k, (1 - values[k]) * height + nudge);
|
||||
+ }
|
||||
|
||||
- cr.fill();
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ let renderStats = this.renderStats;
|
||||
+
|
||||
+ // Make sure we don't have more sample points than pixels
|
||||
+ renderStats.map(Lang.bind(this, function(k){
|
||||
+ let stat = this.stats[k];
|
||||
+ 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]];
|
||||
+ // 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;
|
||||
+
|
||||
+ // 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) {
|
||||
+ cr.lineTo(stat.values.length - 1, height);
|
||||
+ cr.lineTo(0, height);
|
||||
+ cr.closePath();
|
||||
+ } else {
|
||||
+ let nextStat = this.stats[renderStats[i+1]];
|
||||
+ makePath(nextStat.values, true);
|
||||
+ }
|
||||
+ cr.closePath()
|
||||
+ Clutter.cairo_set_source_color(cr, color);
|
||||
+ cr.fill();
|
||||
+
|
||||
+ // Render the outline of this level
|
||||
+ makePath(stat.values, false, .5);
|
||||
+ Clutter.cairo_set_source_color(cr, outlineColor);
|
||||
+ cr.setLineWidth(1.0);
|
||||
+ cr.setDash([], 0);
|
||||
+ cr.stroke();
|
||||
}
|
||||
+
|
||||
}
|
||||
+
|
||||
};
|
||||
|
||||
function CpuIndicator() {
|
||||
@@ -80,14 +138,28 @@ function CpuIndicator() {
|
||||
CpuIndicator.prototype = {
|
||||
__proto__: Indicator.prototype,
|
||||
|
||||
+ _init: function() {
|
||||
+ Indicator.prototype._init.call(this);
|
||||
+ this.gridColor = '-grid-color';
|
||||
+ this.renderStats = [ 'cpu-user', 'cpu-sys', 'cpu-iowait' ];
|
||||
+
|
||||
+ // Make sure renderStats is sorted as necessary for rendering
|
||||
+ let renderStatOrder = {'cpu-total': 0, 'cpu-user': 1, 'cpu-sys': 2, 'cpu-iowait': 3};
|
||||
+ this.renderStats = this.renderStats.sort(function(a,b) {
|
||||
+ return renderStatOrder[a] - renderStatOrder[b];
|
||||
+ });
|
||||
+ },
|
||||
+
|
||||
_initValues: function() {
|
||||
this._prev = new GTop.glibtop_cpu;
|
||||
GTop.glibtop_get_cpu(this._prev);
|
||||
|
||||
- this.values = [];
|
||||
- this.values.push({color: "-cpu-user-color", values: []});
|
||||
- this.values.push({color: "-cpu-sys-color", values: []});
|
||||
- this.values.push({color: "-cpu-iowait-color", values: []});
|
||||
+ this.stats = {
|
||||
+ '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: []}
|
||||
+ };
|
||||
},
|
||||
|
||||
_updateValues: function() {
|
||||
@@ -98,15 +170,16 @@ CpuIndicator.prototype = {
|
||||
let user = cpu.user - this._prev.user;
|
||||
let sys = cpu.sys - this._prev.sys;
|
||||
let iowait = cpu.iowait - this._prev.iowait;
|
||||
+ let idle = cpu.idle - this._prev.idle;
|
||||
|
||||
- t = user / total;
|
||||
- this.values[0].values.push(t);
|
||||
-
|
||||
- t += sys / total;
|
||||
- this.values[1].values.push(t);
|
||||
t += iowait / total;
|
||||
- this.values[2].values.push(t);
|
||||
-
|
||||
+ this.stats['cpu-iowait'].values.push(t);
|
||||
+ t += sys / total;
|
||||
+ this.stats['cpu-sys'].values.push(t);
|
||||
+ t += user / total;
|
||||
+ this.stats['cpu-user'].values.push(t);
|
||||
+ this.stats['cpu-total'].values.push(1 - idle / total);
|
||||
+
|
||||
this._prev = cpu;
|
||||
}
|
||||
};
|
||||
@@ -117,24 +190,37 @@ function MemoryIndicator() {
|
||||
|
||||
MemoryIndicator.prototype = {
|
||||
__proto__: Indicator.prototype,
|
||||
+
|
||||
+ _init: function() {
|
||||
+ Indicator.prototype._init.call(this);
|
||||
+ this.gridColor = '-grid-color';
|
||||
+ this.renderStats = [ 'mem-user', 'mem-other', 'mem-cached' ];
|
||||
+
|
||||
+ // Make sure renderStats is sorted as necessary for rendering
|
||||
+ let renderStatOrder = { 'mem-cached': 0, 'mem-other': 1, 'mem-user': 2 };
|
||||
+ this.renderStats = this.renderStats.sort(function(a,b) {
|
||||
+ return renderStatOrder[a] - renderStatOrder[b];
|
||||
+ });
|
||||
+ },
|
||||
|
||||
_initValues: function() {
|
||||
this.mem = new GTop.glibtop_mem;
|
||||
- this.values = [];
|
||||
- this.values.push({ color: "-mem-user-color", values: [] });
|
||||
- this.values.push({ color: "-mem-other-color", values: [] });
|
||||
- this.values.push({ color: "-mem-cached-color", values: [] });
|
||||
+ this.stats = {
|
||||
+ 'mem-user': { color: "-mem-user-color", values: [] },
|
||||
+ 'mem-other': { color: "-mem-other-color", values: [] },
|
||||
+ 'mem-cached': { color: "-mem-cached-color", values: [] }
|
||||
+ };
|
||||
},
|
||||
|
||||
_updateValues: function() {
|
||||
GTop.glibtop_get_mem(this.mem);
|
||||
|
||||
let t = this.mem.user / this.mem.total;
|
||||
- this.values[0].values.push(t);
|
||||
+ this.stats['mem-user'].values.push(t);
|
||||
t += (this.mem.used - this.mem.user - this.mem.cached) / this.mem.total;
|
||||
- this.values[1].values.push(t);
|
||||
+ this.stats['mem-other'].values.push(t);
|
||||
t += this.mem.cached / this.mem.total;
|
||||
- this.values[2].values.push(t);
|
||||
+ this.stats['mem-cached'].values.push(t);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -143,7 +229,7 @@ function init() {
|
||||
}
|
||||
|
||||
function enable() {
|
||||
- _cpuIndicator = new CpuIndicator();
|
||||
+ _cpuIndicator = new CpuIndicator();
|
||||
_memIndicator = new MemoryIndicator();
|
||||
_box = new St.BoxLayout({ style_class: 'extension-systemMonitor-container' });
|
||||
_box.add(_cpuIndicator.actor);
|
||||
diff --git a/extensions/systemMonitor/stylesheet.css b/extensions/systemMonitor/stylesheet.css
|
||||
index 26aad6b..daad48d 100644
|
||||
--- a/extensions/systemMonitor/stylesheet.css
|
||||
+++ b/extensions/systemMonitor/stylesheet.css
|
||||
@@ -1,16 +1,23 @@
|
||||
.extension-systemMonitor-container {
|
||||
spacing: 5px;
|
||||
+ padding-left: 5px;
|
||||
+ padding-right: 5px;
|
||||
+ padding-bottom: 1px;
|
||||
+ padding-top: 0px;
|
||||
}
|
||||
|
||||
.extension-systemMonitor-indicator-area {
|
||||
- border: 1px solid #000;
|
||||
+ border: 1px solid #8d8d8d;
|
||||
+ border-radius: 3px;
|
||||
width: 100px;
|
||||
- height: 34px;
|
||||
- -cpu-user-color: #f00;
|
||||
- -cpu-sys-color: #0f0;
|
||||
- -cpu-iowait-color: #00f;
|
||||
- -mem-user-color: #ff0;
|
||||
- -mem-cached-color: #0ff;
|
||||
- -mem-other-color: #111;
|
||||
- background-color: #fff;
|
||||
+ height: 30px;
|
||||
+ -grid-color: #575757;
|
||||
+ -cpu-total-color: rgb(0,154,62);
|
||||
+ -cpu-user-color: rgb(69,154,0);
|
||||
+ -cpu-sys-color: rgb(255,253,81);
|
||||
+ -cpu-iowait-color: rgb(210,148,0);
|
||||
+ -mem-user-color: rgb(210,148,0);
|
||||
+ -mem-cached-color: rgb(90,90,90);
|
||||
+ -mem-other-color: rgb(205,203,41);
|
||||
+ background-color: #1e1e1e;
|
||||
}
|
||||
--
|
||||
cgit v0.9.0.2
|
||||
39
debian/patches/upstream/patch_66242aa76a5d59fb4659551575c1fbb42e50b8fb.diff
vendored
Normal file
39
debian/patches/upstream/patch_66242aa76a5d59fb4659551575c1fbb42e50b8fb.diff
vendored
Normal file
@@ -0,0 +1,39 @@
|
||||
From 66242aa76a5d59fb4659551575c1fbb42e50b8fb Mon Sep 17 00:00:00 2001
|
||||
From: Giovanni Campagna <gcampagna@src.gnome.org>
|
||||
Date: Tue, 18 Oct 2011 08:19:50 +0000
|
||||
Subject: [PATCH 1/2] Make dock extension actually work with gnome-3.2
|
||||
|
||||
Without this patch dock is invisible, but reacts on mouse clicks
|
||||
|
||||
Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
|
||||
---
|
||||
diff --git a/extensions/dock/extension.js b/extensions/dock/extension.js
|
||||
index 240f8a8..02c9650 100644
|
||||
--- a/extensions/dock/extension.js
|
||||
+++ b/extensions/dock/extension.js
|
||||
@@ -304,7 +304,6 @@ Dock.prototype = {
|
||||
this.actor.show();
|
||||
}));
|
||||
Main.layoutManager.addChrome(this.actor);
|
||||
- this.actor.lower_bottom();
|
||||
|
||||
//hidden
|
||||
this._settings.connect('changed::'+DOCK_POSITION_KEY, Lang.bind(this, function (){
|
||||
@@ -372,6 +371,8 @@ Dock.prototype = {
|
||||
|
||||
this.actor.connect('leave-event', Lang.bind(this, this._hideDock));
|
||||
this.actor.connect('enter-event', Lang.bind(this, this._showDock));
|
||||
+
|
||||
+ this._hideDock();
|
||||
},
|
||||
|
||||
destroy: function() {
|
||||
@@ -861,4 +862,4 @@ function enable() {
|
||||
function disable() {
|
||||
dock.destroy();
|
||||
dock = null;
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
--
|
||||
cgit v0.9.0.2
|
||||
33
debian/patches/upstream/patch_967aee7aad2accfb38d91ab56b6c5e91d86a2722.diff
vendored
Normal file
33
debian/patches/upstream/patch_967aee7aad2accfb38d91ab56b6c5e91d86a2722.diff
vendored
Normal file
@@ -0,0 +1,33 @@
|
||||
From 967aee7aad2accfb38d91ab56b6c5e91d86a2722 Mon Sep 17 00:00:00 2001
|
||||
From: Stefan 'psYchotic' Zwanenburg <stefanhetzwaantje@gmail.com>
|
||||
Date: Wed, 12 Oct 2011 01:16:18 +0000
|
||||
Subject: dock: Fix popup menus
|
||||
|
||||
The dock popup menus weren't working because a signal had been renamed
|
||||
('popup' -> 'open-state-changed').
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=661484
|
||||
---
|
||||
diff --git a/extensions/dock/extension.js b/extensions/dock/extension.js
|
||||
index 47cd76f..240f8a8 100644
|
||||
--- a/extensions/dock/extension.js
|
||||
+++ b/extensions/dock/extension.js
|
||||
@@ -682,7 +682,7 @@ DockIcon.prototype = {
|
||||
this._menu.connect('activate-window', Lang.bind(this, function (menu, window) {
|
||||
this.activateWindow(window);
|
||||
}));
|
||||
- this._menu.connect('popup', Lang.bind(this, function (menu, isPoppedUp) {
|
||||
+ this._menu.connect('open-state-changed', Lang.bind(this, function (menu, isPoppedUp) {
|
||||
if (!isPoppedUp){
|
||||
//Restore value of autohidedock
|
||||
this._dock._restoreHideDock();
|
||||
@@ -776,7 +776,6 @@ DockIconMenu.prototype = {
|
||||
this._source = source;
|
||||
|
||||
this.connect('activate', Lang.bind(this, this._onActivate));
|
||||
- this.connect('open-state-changed', Lang.bind(this, this._onOpenStateChanged));
|
||||
|
||||
this.actor.add_style_class_name('dock-menu');
|
||||
|
||||
--
|
||||
cgit v0.9.0.2
|
||||
24
debian/rules
vendored
24
debian/rules
vendored
@@ -1,17 +1,17 @@
|
||||
#!/usr/bin/make -f
|
||||
|
||||
include /usr/share/cdbs/1/rules/debhelper.mk
|
||||
include /usr/share/cdbs/1/rules/autoreconf.mk
|
||||
include /usr/share/cdbs/1/class/gnome.mk
|
||||
include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
|
||||
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
|
||||
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
|
||||
|
||||
EXTENSIONS_ENABLED="alternate-tab auto-move-windows workspace-indicator\
|
||||
alternative-status-menu dock gajim native-window-placement user-theme\
|
||||
apps-menu drive-menu places-menu windowsNavigator systemMonitor"
|
||||
EXTENSIONS_DISABLED="xrandr-indicator"
|
||||
EXTENSIONS_ENABLED="alternate-tab apps-menu auto-move-windows \
|
||||
drive-menu launch-new-instance native-window-placement places-menu \
|
||||
screenshot-window-sizer user-theme window-list windowsNavigator \
|
||||
workspace-indicator"
|
||||
|
||||
DEB_DH_AUTORECONF_ARGS := ./autogen.sh
|
||||
EXTENSIONS_DISABLED="example"
|
||||
|
||||
DEB_CONFIGURE_EXTRA_FLAGS := --enable-extensions=$(EXTENSIONS_ENABLED)
|
||||
%:
|
||||
dh $@ --with gnome
|
||||
|
||||
override_dh_auto_configure:
|
||||
dh_auto_configure -- \
|
||||
--enable-extensions=$(EXTENSIONS_ENABLED) \
|
||||
--enable-classic-mode
|
||||
|
||||
5
debian/watch
vendored
5
debian/watch
vendored
@@ -1,2 +1,3 @@
|
||||
version=3
|
||||
http://ftp.gnome.org/pub/GNOME/sources/gnome-shell-extensions/([\d\.]+)/gnome-shell-extensions-([\d\.]+)\.tar\.xz
|
||||
version=4
|
||||
https://download.gnome.org/sources/@PACKAGE@/([\d\.]+[02468])/ \
|
||||
@PACKAGE@@ANY_VERSION@\.tar\.xz
|
||||
|
||||
Reference in New Issue
Block a user