Compare commits
69
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f25840f74c | ||
|
|
ef2dc30c53 | ||
|
|
fe7bc37bf1 | ||
|
|
5b18df97d4 | ||
|
|
4c2d88b7c6 | ||
|
|
d91fd230bf | ||
|
|
1053742f9c | ||
|
|
949e3b56b9 | ||
|
|
4843192eb4 | ||
|
|
0cabfabac2 | ||
|
|
f9afce37ab | ||
|
|
a13b2d0d5b | ||
|
|
5bcd7748cd | ||
|
|
2a9382d9f5 | ||
|
|
a963602277 | ||
|
|
2b6e393bdd | ||
|
|
8b7b004a94 | ||
|
|
0600cbf7b0 | ||
|
|
b451c1cdb3 | ||
|
|
159e51d809 | ||
|
|
e3ac038c50 | ||
|
|
c6be28be3e | ||
|
|
2a1942c0f8 | ||
|
|
4aa88e9d5f | ||
|
|
751fc1d954 | ||
|
|
d9014bdeb2 | ||
|
|
77e7ce8c22 | ||
|
|
4e296f9dd9 | ||
|
|
125193e6da | ||
|
|
1d949394b1 | ||
|
|
fa11081337 | ||
|
|
eeafacaf29 | ||
|
|
f37caf8cb1 | ||
|
|
4e55f22070 | ||
|
|
93c1e19c34 | ||
|
|
b5fe9da0ed | ||
|
|
ecf0e9b12e | ||
|
|
1149251775 | ||
|
|
88f284c104 | ||
|
|
610cad3d8d | ||
|
|
a595c5b606 | ||
|
|
ed5a2f7be3 | ||
|
|
0fc1f2fb32 | ||
|
|
eaa5c0d9bc | ||
|
|
dbfd49c1b1 | ||
|
|
7ea702c58d | ||
|
|
1624158875 | ||
|
|
2b3b3d7814 | ||
|
|
3d3c092706 | ||
|
|
cddf458061 | ||
|
|
56aa7a7304 | ||
|
|
33d2f79468 | ||
|
|
e573d14a3c | ||
|
|
f80b7fb1a6 | ||
|
|
728e3aa7a0 | ||
|
|
94cf59c484 | ||
|
|
41821572ea | ||
|
|
787531d790 | ||
|
|
23ac497271 | ||
|
|
6ee586d935 | ||
|
|
64d262be5b | ||
|
|
948d0efa59 | ||
|
|
5e11e89fb2 | ||
|
|
b0758309be | ||
|
|
b95d49d59a | ||
|
|
e3de553d16 | ||
|
|
3b7392ff51 | ||
|
|
0c6ce1c959 | ||
|
|
baedd746d2 |
-16
@@ -1,16 +0,0 @@
|
||||
# A simulation of Subversion default ignores, generated by reposurgeon.
|
||||
*.o
|
||||
*.lo
|
||||
*.la
|
||||
*.al
|
||||
.libs
|
||||
*.so
|
||||
*.so.[0-9]*
|
||||
*.a
|
||||
*.pyc
|
||||
*.pyo
|
||||
*.rej
|
||||
*~
|
||||
.#*
|
||||
.*.swp
|
||||
.DS_store
|
||||
Vendored
-94
@@ -1,94 +0,0 @@
|
||||
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 ]
|
||||
* gnome-shell-extensions.gsettings-override: enable the alternative
|
||||
status menu by default. Closes: #648112.
|
||||
* Use ${gnome:Version} to generate strict dependencies, it’s very
|
||||
unlikely that extensions remain compatible after a major upgrade.
|
||||
|
||||
[ Michael Biebl ]
|
||||
* Upload to unstable.
|
||||
|
||||
[ Josselin Mouette ]
|
||||
* 01_status-menu_disable_accounts.patch: new patch. Drop the unusable
|
||||
advertisement for Google. It is already available in the control
|
||||
center anyway.
|
||||
|
||||
[ Michael Biebl ]
|
||||
* New upstream release.
|
||||
* Drop patches which have been merged upstream:
|
||||
- debian/patches/upstream/*
|
||||
- debian/patches/fix-*
|
||||
* Refresh 01_status-menu_disable_accounts.patch.
|
||||
* Add 02-Revert-all-remove-all-GSettings-usage.patch: Use GSettings since we
|
||||
install the extensions system-wide.
|
||||
* Use dh-autoreconf to generate the build system.
|
||||
* Add 03-Revert-Remove-all-references-to-localedir-from-metad.patch: Use
|
||||
locales from system-wide location.
|
||||
|
||||
-- Michael Biebl <biebl@debian.org> Sat, 11 Feb 2012 23:28:53 +0100
|
||||
|
||||
gnome-shell-extensions (3.2.0-1) experimental; urgency=low
|
||||
|
||||
[ Victor Seva ]
|
||||
* Initial release (Closes: #627515)
|
||||
Package based on the work by Bilal Akhtar <bilalakhtar@ubuntu.com>
|
||||
* debian/copyright
|
||||
- Added myself
|
||||
- Fixed syntax-error-in-dep5-copyright syntax error
|
||||
* debian/control.in
|
||||
- Added myself as maintainer.
|
||||
- Fix gnome-shell dependency.
|
||||
- Fix gir1.2-gtop-2.0 dependency for systemMonitor ext.
|
||||
* debian/rules
|
||||
- Added uploaders.mk gnome-version.mk includes.
|
||||
- Removed unused variables.
|
||||
* debian/watch added.
|
||||
* No more gnome-shell-extension-* packages.
|
||||
* debian/patches/upstream
|
||||
- patch_967aee7aad2accfb38d91ab56b6c5e91d86a2722.diff
|
||||
popup menu fix
|
||||
- patch_66242aa76a5d59fb4659551575c1fbb42e50b8fb.diff
|
||||
dock fix.
|
||||
- patch_4c5a36e4c0cbe38f2e26b6b3c8b02e88b4b939f7.diff
|
||||
patch_2bba98d6214cffae2eb5cecb9d7c1f6b6d244052.diff
|
||||
systemMonitor: Properly enable/disable
|
||||
* debian/patches
|
||||
- fix_dock_gnome-shell_version.diff
|
||||
- fix_alternate-tab_661281.diff
|
||||
- fix_alternate-tab_gnome-shell_version.diff
|
||||
* debian/rules
|
||||
- EXTENSIONS_ENABLED, EXTENSIONS_DISABLED variables
|
||||
- disabled xrandr-indicator
|
||||
|
||||
[ Michael Biebl ]
|
||||
* debian/watch: Track .xz tarballs.
|
||||
* debian/control.in:
|
||||
- Set pkg-gnome-maintainers@lists.alioth.debian.org as Maintainer and add
|
||||
Victor Seva <linuxmaniac@torreviejawireless.org> to Uploaders.
|
||||
- Wrap (Build-)Depends.
|
||||
- Add Vcs-Svn and Vcs-Browser field.
|
||||
* debian/rules:
|
||||
- Include gnome-get-source.mk.
|
||||
|
||||
-- Michael Biebl <biebl@debian.org> Sat, 12 Nov 2011 18:32:22 +0100
|
||||
Vendored
-1
@@ -1 +0,0 @@
|
||||
8
|
||||
Vendored
-41
@@ -1,41 +0,0 @@
|
||||
# This file is autogenerated. DO NOT EDIT!
|
||||
#
|
||||
# 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,
|
||||
gnome-pkg-tools,
|
||||
intltool,
|
||||
libgnome-desktop-3-dev (>= 3.2.0),
|
||||
libgtop2-dev (>= 2.28.3)
|
||||
Standards-Version: 3.9.3
|
||||
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
|
||||
|
||||
Package: gnome-shell-extensions
|
||||
Architecture: all
|
||||
Depends: ${misc:Depends},
|
||||
gnome-shell (>= ${gnome:Version}),
|
||||
gnome-shell (<< ${gnome:NextVersion}),
|
||||
gir1.2-gtop-2.0
|
||||
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,
|
||||
accessing documents, and organizing open windows in GNOME. Later, it
|
||||
will introduce a new applets eco-system and offer new solutions for
|
||||
other desktop features, such as notifications and contacts management.
|
||||
The GNOME Shell is intended to replace functions handled by the GNOME
|
||||
Panel and by the window manager in previous versions of GNOME. The GNOME
|
||||
Shell has rich visual effects enabled by new graphical technologies.
|
||||
.
|
||||
GNOME Shell is extensible using extensions. This package contains
|
||||
official GNOME Shell extensions.
|
||||
Vendored
-36
@@ -1,36 +0,0 @@
|
||||
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,
|
||||
gnome-pkg-tools,
|
||||
intltool,
|
||||
libgnome-desktop-3-dev (>= 3.2.0),
|
||||
libgtop2-dev (>= 2.28.3)
|
||||
Standards-Version: 3.9.3
|
||||
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
|
||||
|
||||
Package: gnome-shell-extensions
|
||||
Architecture: all
|
||||
Depends: ${misc:Depends},
|
||||
gnome-shell (>= ${gnome:Version}),
|
||||
gnome-shell (<< ${gnome:NextVersion}),
|
||||
gir1.2-gtop-2.0
|
||||
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,
|
||||
accessing documents, and organizing open windows in GNOME. Later, it
|
||||
will introduce a new applets eco-system and offer new solutions for
|
||||
other desktop features, such as notifications and contacts management.
|
||||
The GNOME Shell is intended to replace functions handled by the GNOME
|
||||
Panel and by the window manager in previous versions of GNOME. The GNOME
|
||||
Shell has rich visual effects enabled by new graphical technologies.
|
||||
.
|
||||
GNOME Shell is extensible using extensions. This package contains
|
||||
official GNOME Shell extensions.
|
||||
Vendored
-31
@@ -1,31 +0,0 @@
|
||||
Format: http://dep.debian.net/deps/dep5
|
||||
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/
|
||||
|
||||
Files: *
|
||||
Copyright: 2011 Giovanni Campagna <gcampagna@src.gnome.org>
|
||||
License: GPL-2.0+
|
||||
|
||||
Files: debian/*
|
||||
Copyright:
|
||||
2011 Victor Seva <linuxmaniac@torreviejawireless.org>
|
||||
2011 Bilal Akhtar <bilalakhtar@ubuntu.com>
|
||||
License: GPL-2.0+
|
||||
|
||||
License: GPL-2.0+
|
||||
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
|
||||
(at your option) any later version.
|
||||
.
|
||||
This package is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
.
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see
|
||||
.
|
||||
On Debian systems, the complete text of the GNU General
|
||||
Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
|
||||
@@ -1,2 +0,0 @@
|
||||
[org.gnome.shell]
|
||||
enabled-extensions=['alternative-status-menu@gnome-shell-extensions.gcampax.github.com']
|
||||
@@ -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
|
||||
|
||||
-302
@@ -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
|
||||
|
||||
Vendored
Vendored
-17
@@ -1,17 +0,0 @@
|
||||
#!/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"
|
||||
|
||||
DEB_DH_AUTORECONF_ARGS := ./autogen.sh
|
||||
|
||||
DEB_CONFIGURE_EXTRA_FLAGS := --enable-extensions=$(EXTENSIONS_ENABLED)
|
||||
Vendored
-1
@@ -1 +0,0 @@
|
||||
3.0 (quilt)
|
||||
Vendored
-2
@@ -1,2 +0,0 @@
|
||||
version=3
|
||||
http://ftp.gnome.org/pub/GNOME/sources/gnome-shell-extensions/([\d\.]+)/gnome-shell-extensions-([\d\.]+)\.tar\.xz
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
52b1fa7fa539548f7a13d0afd7a8c0bebb433b04
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
f38e99e55082f30046010d6c97dc64c55ca16738
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
2c8f262655641f1b79eb3ff3c91a251108d693b1
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
a736cfe160e881541f76a5ec879fe06c0f2045bc
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
79d3b313cd0c784734134ac269063e0305a2dbbd
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
79d3b313cd0c784734134ac269063e0305a2dbbd
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
2846bbd5062866ee4cc0b318f9e67cc7c0b555e5
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
2846bbd5062866ee4cc0b318f9e67cc7c0b555e5
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
5fd8273285be2b938bd8d31f78840be506ce5e5b
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
c433e2a4bc642b72d66e1a54f48cde2fc8f61ca4
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
2c6df54b936fc47686d502740ed7ce77e5c8e192
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
57535bf2c892eb5f59a6f4f11acf2f3800356463
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
1091ed854aa574caf1dc80ad9547692344504fc8
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
6989090f215ea27db6c9df15758e4099eea4aeb8
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
739e77cafd5f22798a90e5b23c689fef953beab2
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
997b6436abec6c9a5742bd9f506d6802b6403d4d
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
54ad6cdf447444cad3554a39962addb987bf6e11
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
382f0fa4328de111b63ae70fba289efaca9c3daa
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
7d0aecb9c750438571078d27b601cf758746a18a
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
ad6f959ed77a97801718550b59aadc3dc2dbffe9
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
a993b0b9a7bc588da82d5de28c9cd5b57f92fc2f
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
d91859ce33a175ff985f38e6e8bfa506582c5031
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
45d23e098af380a7d5f2cf4497e9ec8d301a4d69
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
e77f1c8e627c2d34b4deb8f8517930a565d210d0
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
f4421b5100124302331aaf97fad7b6f573df5595
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
d23db96341faad1c8355a93b8b2a285e83e02018
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
4cba9cfa5f48c41c3cd07578bf94e72727eeb51a
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
9f208bb0f2bf272f1a05ffb3ad8d55ff5da2aa4d
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
949fdb2e228d9e27f4fb0f6c779d4ce465b86d0a
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
836fea4f82b10777a265a5ffdb9efa89a4405e7a
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
c719e2544954f62938b93a7f5b892b1ac6ba1eb0
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
67421e4761dd82734811949cd1c94ab6d6e46434
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
0f74ec9f735840af4ae875f15859938fcf3c855b
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
48626944b018610fd1184467ceeb7eb7a1b415ca
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
d9f074c09904df32092318a3ac1942d8553c340a
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
9202cfc7968426d1135901d4669ec54e96dd7637
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
80e7e24ff7000ef9e601e20356fe6c4a9677c6ca
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
5c446faa0b51d1801522353428ee1f1c726a3a6c
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
ee812054f38bc1407e8fb2c96181c5dbe9bd71e3
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
376d6a09445b540b681b8871ab331e1e440d2322
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
a745ab08280c2c298d1b63bb327c581c0f638ecb
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
423a16796ec9b73928a20357bdd0b111851bc706
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
de077674a81b349d3acc05c025d349726c0fb2f5
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user