Compare commits
7 Commits
3.34.2
...
benzea/sys
| Author | SHA1 | Date | |
|---|---|---|---|
|
ff1b411f74 | ||
|
|
098114f4c8 | ||
|
|
9a49b20fac | ||
|
|
d9775e41b2 | ||
|
|
5796a5d193 | ||
|
|
afefc88e02 | ||
|
|
44cd1ae25b |
@@ -54,7 +54,7 @@ build:
|
||||
- meson mutter mutter/build --prefix=/usr -Dtests=false
|
||||
- ninja -C mutter/build install
|
||||
script:
|
||||
- meson . build -Dbuiltype=debugoptimized -Dman=false --werror
|
||||
- meson . build -Dbuiltype=debugoptimized -Dman=false
|
||||
- ninja -C build
|
||||
- ninja -C build install
|
||||
<<: *only_default
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
#!/usr/bin/bash
|
||||
|
||||
shell_branch=$(git describe --contains --all HEAD)
|
||||
mutter_target=
|
||||
|
||||
git clone https://gitlab.gnome.org/GNOME/mutter.git
|
||||
@@ -25,7 +26,8 @@ if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" ]; then
|
||||
fi
|
||||
|
||||
if [ -z "$mutter_target" ]; then
|
||||
mutter_target=$(git branch -r -l origin/$CI_COMMIT_REF_NAME)
|
||||
mutter_target=$(git branch -r -l origin/$shell_branch)
|
||||
mutter_target=${mutter_target:-$(git branch -r -l ${shell_branch#remotes/})}
|
||||
mutter_target=${mutter_target:-origin/master}
|
||||
echo Using $mutter_target instead
|
||||
fi
|
||||
|
||||
@@ -66,10 +66,6 @@ create_common() {
|
||||
rm $OUTPUT_FINAL.tmp
|
||||
}
|
||||
|
||||
# Disable MR handling for now. We aren't ready to enforce
|
||||
# non-legacy style just yet ...
|
||||
unset CI_MERGE_REQUEST_TARGET_BRANCH_NAME
|
||||
|
||||
if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" ]; then
|
||||
git fetch $CI_MERGE_REQUEST_PROJECT_URL.git $CI_MERGE_REQUEST_TARGET_BRANCH_NAME
|
||||
branch_point=$(git merge-base HEAD FETCH_HEAD)
|
||||
@@ -90,16 +86,12 @@ run_eslint LEGACY
|
||||
echo Done.
|
||||
create_common
|
||||
|
||||
if ! is_empty $OUTPUT_FINAL; then
|
||||
cat $OUTPUT_FINAL
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Just show the report and succeed when not testing a MR
|
||||
if [ -z "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" ]; then
|
||||
cat $OUTPUT_FINAL
|
||||
exit 0
|
||||
fi
|
||||
|
||||
copy_matched_lines $OUTPUT_REGULAR $LINE_CHANGES $OUTPUT_MR
|
||||
copy_matched_lines $OUTPUT_FINAL $LINE_CHANGES $OUTPUT_MR
|
||||
cat $OUTPUT_MR
|
||||
is_empty $OUTPUT_MR
|
||||
|
||||
117
NEWS
117
NEWS
@@ -1,120 +1,3 @@
|
||||
3.34.2
|
||||
======
|
||||
* Fix unredirection after cancelled animations [Florian; #1788]
|
||||
* Use cached coordinates for window sorting in overview [Andrew; !763]
|
||||
* Include shadow in window screenshots [Robert; !762]
|
||||
* Use correct timezones for events [Milan, Florian; !806, #1895]
|
||||
* Adjust style of system menu action buttons [monday; !802]
|
||||
* Fix windows getting stuck on screen if closed while animating [Florian; !815]
|
||||
* Hide stopped spinner in top bar [Joonas; !834]
|
||||
* Reuse existing icons when updating the app picker grid [Georges; !841]
|
||||
* Fix not-responding dialog size when using geometry scaling [Jonas; !783]
|
||||
* Fix battery icon glitch in "100% but charging" case [Philip; !814]
|
||||
* Update window titles in app menu [Florian; #1830]
|
||||
* Improve modifier-less keyboard navigation of switcher popups [Florian; #1883]
|
||||
* Use better OSK layout fallback for unsupported variants [Florian; #1907]
|
||||
* Fix creating app folders with no pre-existing folders [Jonas; #1652]
|
||||
* Improve DND page switching in app picker [Florian, Jonas; #1693]
|
||||
* Show polkit confirmation dialog for users with no password [Joaquim; !829]
|
||||
* Fix interacting with applications when magnifier is enabled [Jonas; !754]
|
||||
* Tweak styling of notifications/media constrols [Joonas; !855, !865]
|
||||
* Fix disable command of gnome-extensions tool [Florian; #1946]
|
||||
* Enable clean session shutdown after gnome-shell failure [Benjamin; !858]
|
||||
* Also remove scaled keys when texture cache is cleared [Daniel; !567]
|
||||
* Don't show overflow indicator in switchers that fit screen [Florian; #1834]
|
||||
* Place launched applications into a systemd scope [Benjamin; !863]
|
||||
* Fix weather forecasts for automatic location when Weather is not sandboxed
|
||||
[Florian; #1823]
|
||||
* Dismiss switcher popups when a system modal dialogs opens [Florian; #1536]
|
||||
* Misc. bug fixes and cleanups [Marco, Philip, Florian, cunidev, Jonas, Joonas;
|
||||
!758, !749, !777, !811, #1884, !823, !840, !782, !847, #1836, !852, !851,
|
||||
!788, #1916, !866, !884]
|
||||
|
||||
Contributors:
|
||||
Marco Trevisan (Treviño), Benjamin Berg, Philip Chimento, Milan Crha,
|
||||
Jonas Dreßler, Joonas Henriksson, Robert Mader, Daniel García Moreno,
|
||||
Florian Müllner, Georges Basile Stavracas Neto, Joaquim Rocha, Andrew Watson,
|
||||
cunidev, monday
|
||||
|
||||
Translators:
|
||||
Stas Solovey [ru], Ricardo Silva Veloso [pt_BR], Yi-Jyun Pan [zh_TW],
|
||||
Umarzuki Bin Mochlis Moktar [ms]
|
||||
|
||||
3.34.1
|
||||
======
|
||||
* Fix "Frequent" view icons disappearing on hover [Jonas D.; #1502]
|
||||
* Allow editing app folder names [Georges, Marco; !675, !720]
|
||||
* Skip property transitions while hidden [Florian; !708]
|
||||
* Make menu animations more consistent [Florian, GB_2; #1595, !717]
|
||||
* Improve performance when enabling/disabling all extensions [Jonas D.; !96]
|
||||
* Fix extra icons appearing in "Frequent" view animation [Georges; !696]
|
||||
* Fix fading out desktop icons [Harshula; #1616]
|
||||
* Fix box-shadow glitch with prerendered resources [Daniel; #1186]
|
||||
* Fix accidentally skipped animations [Florian; #1572]
|
||||
* Fix screenshots and window animations when scaled [Robert; !728]
|
||||
* Don't leak NOTIFY_SOCKET environment variable to applications [Benjamin; !741]
|
||||
* Fix lock-up on X11 when ibus is already running on startup [Marco; #1712]
|
||||
* Fix screen dimming on idle [Marco; #1683]
|
||||
* Do not notify systemd before initialization is complete [Iain; !750]
|
||||
* Support SAE secrets in network agent [Lubomir; !751]
|
||||
* Fix various regressions with dynamic workspaces [Florian; #1497]
|
||||
* Fixed crashes [Florian, Marco; #1678, !746]
|
||||
* Misc. bug fixes and cleanups [Marco, Jonas D., Florian, Iain, Georges,
|
||||
Jonas Å., Martin, Takao, Carlos; !700, !705, !709, !711, !707, #1538, !710,
|
||||
!713, !699, !715, !718, !716, !719, !721, #1243, !725, !731, #1614, !683,
|
||||
!732, !121, !735, !736, !740, #573, #1641, #1571]
|
||||
|
||||
Contributors:
|
||||
Marco Trevisan (Treviño), Benjamin Berg, Jonas Dreßler, Takao Fujiwara, GB_2,
|
||||
Carlos Garnacho, Harshula Jayasuriya, Iain Lane, Robert Mader,
|
||||
Daniel García Moreno, Florian Müllner, Georges Basile Stavracas Neto,
|
||||
Lubomir Rintel, Martin Zurowietz, Jonas Ådahl
|
||||
|
||||
Translators:
|
||||
Rafael Fontenelle [pt_BR], Fran Dieguez [gl], Balázs Úr [hu],
|
||||
Milo Casagrande [it], Daniel Șerbănescu [ro], Kukuh Syafaat [id],
|
||||
Jiri Grönroos [fi], Daniel Mustieles [es], Piotr Drąg [pl],
|
||||
Anders Jonsson [sv], Marek Černocký [cs], Jordi Mas [ca],
|
||||
Aurimas Černius [lt], Christian Kirbach [de], Emin Tufan Çetin [tr],
|
||||
Enrico Nicoletto [pt_BR], Danial Behzadi [fa], Марко Костић [sr],
|
||||
Alexandre Franke [fr], Charles Monzat [fr], Kjartan Maraas [nb],
|
||||
Ryuta Fujii [ja], Nathan Follens [nl], Dušan Kazik [sk], Fabio Tomat [fur],
|
||||
Matej Urbančič [sl], Ask Hjorth Larsen [da], Alan Mortensen [da]
|
||||
|
||||
3.34.0
|
||||
======
|
||||
* Handle startup/shutdown of misc X11 services [Carlos; !680]
|
||||
* Fix sound volume mute/unmute [Iain; #1557]
|
||||
* Correctly terminate pasted text [Carlos; #1570]
|
||||
|
||||
Contributors:
|
||||
Carlos Garnacho, Iain Lane
|
||||
|
||||
Translators:
|
||||
Tom Tryfonidis [el], Milo Casagrande [it], Ryuta Fujii [ja],
|
||||
Efstathios Iosifidis [el], Carmen Bianca BAKKER [eo], Sabri Ünal [tr],
|
||||
Dušan Kazik [sk], Balázs Meskó [hu], Claude Paroz [fr]
|
||||
|
||||
3.33.92
|
||||
=======
|
||||
* Animate pointer a11y pie timer [Jonas D.; !688]
|
||||
* Fix restarting shell in systemd user session [Benjamin; !690]
|
||||
* Misc. bug fixes and cleanups [Florian, Jonas D., Jonas Å., Will;
|
||||
!691, !689, !692, #1552, !698]
|
||||
|
||||
Contributors:
|
||||
Jonas Ådahl, Benjamin Berg, Piotr Drąg, Jonas Dreßler, Florian Müllner,
|
||||
Will Thompson
|
||||
|
||||
Translators:
|
||||
Daniel Șerbănescu [ro], Danial Behzadi [fa], Daniel Mustieles [es],
|
||||
Jiri Grönroos [fi], Asier Sarasua Garmendia [eu], Piotr Drąg [pl],
|
||||
Rūdolfs Mazurs [lv], Anders Jonsson [sv], Fran Dieguez [gl], Jordi Mas [ca],
|
||||
Matej Urbančič [sl], Zander Brown [en_GB], Ryuta Fujii [ja], Tim Sabsch [de],
|
||||
Fabio Tomat [fur], Pawan Chitrakar [ne], A S Alam [pa], Changwoo Ryu [ko],
|
||||
Aurimas Černius [lt], Daniel Rusek [cs], Marek Černocký [cs],
|
||||
Kukuh Syafaat [id], Goran Vidović [hr], Rafael Fontenelle [pt_BR]
|
||||
|
||||
3.33.91
|
||||
=======
|
||||
* Fix regression when adjusting brightness [Florian; #1500]
|
||||
|
||||
@@ -30,6 +30,3 @@
|
||||
|
||||
/* Define if fdwalk is available in libc */
|
||||
#mesondefine HAVE_FDWALK
|
||||
|
||||
/* Define if we have gnome-desktop systemd utils */
|
||||
#mesondefine HAVE_GNOME_SYSTEMD
|
||||
|
||||
@@ -1,12 +1,11 @@
|
||||
[Unit]
|
||||
Description=Disable GNOME Shell extensions after failure
|
||||
# Note that this unit must not conflict with anything, and must
|
||||
# be able to run in parallel with the gnome-session-shutdown.target.
|
||||
DefaultDependencies=no
|
||||
|
||||
# We want to disable extensions only if gnome-shell has flagged the extensions
|
||||
# to be a likely cause of trouble.
|
||||
ConditionPathExists=%t/gnome-shell-disable-extensions
|
||||
# Only disable extensions for a short period of time after login.
|
||||
# This means we err on the side of failing the first login after a broken
|
||||
# extension was installed.
|
||||
Requisite=gnome-session-stable.timer
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
|
||||
12
data/gnome-shell-extensions-disabled-warning.desktop.in.in
Normal file
12
data/gnome-shell-extensions-disabled-warning.desktop.in.in
Normal file
@@ -0,0 +1,12 @@
|
||||
[Desktop Entry]
|
||||
Type=Application
|
||||
Name=GNOME Shell Extensions Disabled Warning
|
||||
Comment=Warning shown if extensions were disabled due to a failure
|
||||
Exec=@bindir@/gnome-shell-extension-prefs --disabled-warning
|
||||
X-GNOME-Bugzilla-Bugzilla=GNOME
|
||||
X-GNOME-Bugzilla-Product=gnome-shell
|
||||
X-GNOME-Bugzilla-Component=general
|
||||
X-GNOME-Bugzilla-Version=@VERSION@
|
||||
OnlyShowIn=GNOME;
|
||||
AutostartCondition=if-exists gnome-shell-extensions-disabled-warning
|
||||
X-GNOME-HiddenUnderSystemd=@systemd_hidden@
|
||||
13
data/gnome-shell-extensions-disabled-warning.service.in
Normal file
13
data/gnome-shell-extensions-disabled-warning.service.in
Normal file
@@ -0,0 +1,13 @@
|
||||
[Unit]
|
||||
Description=Warn about GNOME Shell extensions being disabled
|
||||
ConditionPathExists=%E/gnome-shell-extensions-disabled-warning
|
||||
|
||||
Requisite=gnome-session.target
|
||||
After=gnome-session.target
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
ExecStartPre=-/bin/rm %E/gnome-shell-extensions-disabled-warning
|
||||
ExecStart=@bindir@/gnome-shell-extension-prefs --disabled-warning
|
||||
Restart=no
|
||||
|
||||
@@ -23,5 +23,3 @@ ExecStart=@bindir@/gnome-shell
|
||||
SuccessExitStatus=1
|
||||
# On wayland we cannot restart
|
||||
Restart=no
|
||||
# Kill any stubborn child processes after this long
|
||||
TimeoutStopSec=5
|
||||
|
||||
@@ -8,3 +8,5 @@ Before=gnome-session-initialized.target
|
||||
|
||||
Requires=gnome-shell-wayland.service
|
||||
After=gnome-shell-wayland.service
|
||||
|
||||
Wants=gnome-shell-extensions-disabled-warning.service
|
||||
|
||||
@@ -29,5 +29,3 @@ SuccessExitStatus=1
|
||||
Restart=always
|
||||
# Do not wait before restarting the shell
|
||||
RestartSec=0ms
|
||||
# Kill any stubborn child processes after this long
|
||||
TimeoutStopSec=5
|
||||
|
||||
@@ -8,3 +8,5 @@ Before=gnome-session-initialized.target
|
||||
|
||||
Requires=gnome-shell-x11.service
|
||||
After=gnome-shell-x11.service
|
||||
|
||||
Wants=gnome-shell-extensions-disabled-warning.service
|
||||
|
||||
@@ -31,6 +31,19 @@ foreach desktop_file : desktop_files
|
||||
)
|
||||
endforeach
|
||||
|
||||
i18n.merge_file('desktop',
|
||||
input: configure_file(
|
||||
input: 'gnome-shell-extensions-disabled-warning.desktop.in.in',
|
||||
output: 'gnome-shell-extensions-disabled-warning.desktop.in',
|
||||
configuration: desktopconf
|
||||
),
|
||||
output: 'gnome-shell-extension-disabled-warning.desktop',
|
||||
po_dir: po_dir,
|
||||
install: true,
|
||||
install_dir: autostartdir,
|
||||
type: 'desktop'
|
||||
)
|
||||
|
||||
serviceconf = configuration_data()
|
||||
serviceconf.set('libexecdir', libexecdir)
|
||||
foreach service_file : service_files
|
||||
|
||||
@@ -610,13 +610,6 @@ StScrollBar {
|
||||
border-bottom-style: solid;
|
||||
}
|
||||
|
||||
// Rename popup
|
||||
.rename-folder-popup {
|
||||
.rename-folder-popup-item {
|
||||
spacing: 6px;
|
||||
&:ltr, &:rtl { padding: 0, 12px; }
|
||||
}
|
||||
}
|
||||
|
||||
// Background menu
|
||||
.background-menu { -boxpointer-gap: 4px; -arrow-rise: 0px; }
|
||||
@@ -749,7 +742,7 @@ StScrollBar {
|
||||
|
||||
.ws-switcher-active-up, .ws-switcher-active-down,
|
||||
.ws-switcher-active-left, .ws-switcher-active-right {
|
||||
height: 52px;
|
||||
height: 50px;
|
||||
background-color: $selected_bg_color;
|
||||
color: $selected_fg_color;
|
||||
background-size: 32px;
|
||||
@@ -1061,9 +1054,9 @@ StScrollBar {
|
||||
}
|
||||
.calendar-today {
|
||||
font-weight: bold;
|
||||
color: lighten($fg_color,5%);
|
||||
background-color: darken($bg_color,5%);
|
||||
// border: 1px solid lighten($_bubble_borders_color,20%);
|
||||
//color: lighten($fg_color,10%);
|
||||
//background-color: darken($bg_color,5%);
|
||||
border: 1px solid $_bubble_borders_color;
|
||||
}
|
||||
.calendar-day-with-events {
|
||||
color: lighten($fg_color,10%);
|
||||
@@ -1153,21 +1146,14 @@ StScrollBar {
|
||||
padding: 10px;
|
||||
}
|
||||
|
||||
.message-close-button {
|
||||
color: lighten($fg_color, 15%);
|
||||
&:hover { color: if($variant=='light', lighten($fg_color, 30%), darken($fg_color, 10%)); }
|
||||
&:active { color: if($variant=='light', lighten($fg_color, 40%), darken($fg_color, 20%)); }
|
||||
}
|
||||
|
||||
.message-media-control {
|
||||
padding: 12px;
|
||||
color: lighten($fg_color, 15%);
|
||||
|
||||
&:last-child:ltr { padding-right: 18px; }
|
||||
&:last-child:rtl { padding-left: 18px; }
|
||||
&:hover { color: if($variant=='light', lighten($fg_color, 30%), darken($fg_color, 10%)); }
|
||||
&:active { color: if($variant=='light', lighten($fg_color, 40%), darken($fg_color, 20%)); }
|
||||
&:insensitive { color: if($variant=='light', lighten($fg_color, 50%), darken($fg_color, 40%)); }
|
||||
&:hover { color: $fg_color; }
|
||||
&:insensitive { color: darken($fg_color,40%); }
|
||||
}
|
||||
|
||||
.media-message-cover-icon {
|
||||
@@ -1216,11 +1202,12 @@ StScrollBar {
|
||||
&:hover, &:focus {
|
||||
background-color: $_hover_bg_color;
|
||||
color: $fg_color;
|
||||
border: none;
|
||||
padding: 14px;
|
||||
}
|
||||
&:active {
|
||||
background-color: $selected_bg_color;
|
||||
color: $selected_fg_color;
|
||||
border-color: $selected_borders_color;
|
||||
}
|
||||
|
||||
& > StIcon { icon-size: 16px; }
|
||||
|
||||
@@ -10,7 +10,7 @@ const _ = Gettext.gettext;
|
||||
|
||||
const Config = imports.misc.config;
|
||||
const ExtensionUtils = imports.misc.extensionUtils;
|
||||
const { loadInterfaceXML } = imports.misc.fileUtils;
|
||||
const { loadInterfaceXML, deleteGFile } = imports.misc.fileUtils;
|
||||
|
||||
const { ExtensionState } = ExtensionUtils;
|
||||
|
||||
@@ -219,10 +219,33 @@ var Application = GObject.registerClass({
|
||||
Gio.SettingsBindFlags.DEFAULT |
|
||||
Gio.SettingsBindFlags.INVERT_BOOLEAN);
|
||||
|
||||
let vbox = new Gtk.Box({ orientation: Gtk.Orientation.VERTICAL });
|
||||
this._window.add(vbox);
|
||||
|
||||
this.disabledInfobar = new Gtk.InfoBar({
|
||||
message_type: Gtk.MessageType.ERROR,
|
||||
revealed: false,
|
||||
show_close_button: true
|
||||
});
|
||||
this.disabledInfobar.connect('response', () => {
|
||||
this.disabledInfobar.revealed = false;
|
||||
});
|
||||
let contentArea = this.disabledInfobar.get_content_area();
|
||||
let label = new Gtk.Label({
|
||||
label: _('A problem was detected and extensions were automatically disabled. It is recommended to disable or reconfigure any extensions that may have caused the issue before re-enabling them at the top.'),
|
||||
ellipsize: Pango.EllipsizeMode.END,
|
||||
wrap: true,
|
||||
lines: 2,
|
||||
xalign: 0,
|
||||
margin: 6
|
||||
});
|
||||
contentArea.add(label);
|
||||
vbox.add(this.disabledInfobar);
|
||||
|
||||
this._mainStack = new Gtk.Stack({
|
||||
transition_type: Gtk.StackTransitionType.CROSSFADE
|
||||
});
|
||||
this._window.add(this._mainStack);
|
||||
vbox.add(this._mainStack);
|
||||
|
||||
let scroll = new Gtk.ScrolledWindow({ hscrollbar_policy: Gtk.PolicyType.NEVER });
|
||||
|
||||
@@ -285,9 +308,8 @@ var Application = GObject.registerClass({
|
||||
log(`Failed to connect to shell proxy: ${e}`);
|
||||
this._mainStack.add_named(new NoShellPlaceholder(), 'noshell');
|
||||
this._mainStack.visible_child_name = 'noshell';
|
||||
} else {
|
||||
} else
|
||||
throw e;
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -339,6 +361,20 @@ var Application = GObject.registerClass({
|
||||
let args = commandLine.get_arguments();
|
||||
|
||||
if (args.length) {
|
||||
if (args[0] == '--disabled-warning') {
|
||||
if (!this._settings.is_writable('disable-user-extensions'))
|
||||
this.quit();
|
||||
|
||||
this.disabledInfobar.set_revealed(true);
|
||||
|
||||
let file = GLib.build_filenamev ([GLib.get_user_config_dir(), 'gnome-shell-extensions-disabled-warning']);
|
||||
let gfile = Gio.File.new_for_path(file);
|
||||
if (gfile.query_exists(null))
|
||||
deleteGFile(gfile);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
let uuid = args[0];
|
||||
|
||||
this._skipMainWindow = true;
|
||||
@@ -568,10 +604,6 @@ class ExtensionRow extends Gtk.ListBoxRow {
|
||||
this._extension = extension;
|
||||
this._prefsModule = null;
|
||||
|
||||
this.connect('destroy', this._onDestroy.bind(this));
|
||||
|
||||
this._buildUI();
|
||||
|
||||
this._extensionStateChangedId = this._app.shellProxy.connectSignal(
|
||||
'ExtensionStateChanged', (p, sender, [uuid, newState]) => {
|
||||
if (this.uuid !== uuid)
|
||||
@@ -579,13 +611,16 @@ class ExtensionRow extends Gtk.ListBoxRow {
|
||||
|
||||
this._extension = ExtensionUtils.deserializeExtension(newState);
|
||||
let state = (this._extension.state == ExtensionState.ENABLED);
|
||||
|
||||
GObject.signal_handler_block(this._switch, this._notifyActiveId);
|
||||
this._switch.freeze_notify();
|
||||
this._switch.state = state;
|
||||
GObject.signal_handler_unblock(this._switch, this._notifyActiveId);
|
||||
|
||||
this._switch.active = this._extension.isRequested;
|
||||
this._switch.sensitive = this._canToggle();
|
||||
this._switch.thaw_notify();
|
||||
});
|
||||
|
||||
this.connect('destroy', this._onDestroy.bind(this));
|
||||
|
||||
this._buildUI();
|
||||
}
|
||||
|
||||
get uuid() {
|
||||
@@ -649,15 +684,19 @@ class ExtensionRow extends Gtk.ListBoxRow {
|
||||
this._switch = new Gtk.Switch({
|
||||
valign: Gtk.Align.CENTER,
|
||||
sensitive: this._canToggle(),
|
||||
state: this._extension.state === ExtensionState.ENABLED
|
||||
});
|
||||
this._notifyActiveId = this._switch.connect('notify::active', () => {
|
||||
this._switch.connect('notify::active', () => {
|
||||
if (this._switch.active)
|
||||
this._app.shellProxy.EnableExtensionRemote(this.uuid);
|
||||
else
|
||||
this._app.shellProxy.DisableExtensionRemote(this.uuid);
|
||||
});
|
||||
this._switch.connect('state-set', () => true);
|
||||
this._switch.freeze_notify();
|
||||
this._switch.state = this._extension.state === ExtensionState.ENABLED;
|
||||
this._switch.active = this._extension.isRequested;
|
||||
this._switch.thaw_notify();
|
||||
|
||||
hbox.add(this._switch);
|
||||
}
|
||||
|
||||
|
||||
@@ -202,6 +202,7 @@ var ConsecutiveBatch = class extends Batch {
|
||||
hold.disconnect(signalId);
|
||||
this.nextTask();
|
||||
});
|
||||
return;
|
||||
} else {
|
||||
// This task finished, process the next one
|
||||
this.nextTask();
|
||||
|
||||
@@ -921,7 +921,7 @@ var LoginDialog = GObject.registerClass({
|
||||
return;
|
||||
|
||||
this._bindOpacity();
|
||||
this.ease({
|
||||
this.actor.ease({
|
||||
opacity: 255,
|
||||
duration: _FADE_ANIMATION_TIME,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
@@ -944,7 +944,7 @@ var LoginDialog = GObject.registerClass({
|
||||
|
||||
_startSession(serviceName) {
|
||||
this._bindOpacity();
|
||||
this.ease({
|
||||
this.actor.ease({
|
||||
opacity: 0,
|
||||
duration: _FADE_ANIMATION_TIME,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
|
||||
@@ -21,7 +21,6 @@ var Manager = class {
|
||||
'/org/freedesktop/realmd',
|
||||
this._reloadRealms.bind(this));
|
||||
this._realms = {};
|
||||
this._loginFormat = null;
|
||||
|
||||
this._signalId = this._aggregateProvider.connect('g-properties-changed',
|
||||
(proxy, properties) => {
|
||||
@@ -87,7 +86,7 @@ var Manager = class {
|
||||
}
|
||||
|
||||
get loginFormat() {
|
||||
if (this._loginFormat)
|
||||
if (this._loginFormat !== undefined)
|
||||
return this._loginFormat;
|
||||
|
||||
this._updateLoginFormat();
|
||||
|
||||
@@ -31,7 +31,7 @@ var ExtensionState = {
|
||||
UNINSTALLED: 99
|
||||
};
|
||||
|
||||
const SERIALIZED_PROPERTIES = ['type', 'state', 'path', 'error', 'hasPrefs', 'canChange'];
|
||||
const SERIALIZED_PROPERTIES = ['type', 'state', 'path', 'error', 'hasPrefs', 'canChange', 'isRequested'];
|
||||
|
||||
/**
|
||||
* getCurrentExtension:
|
||||
@@ -165,8 +165,8 @@ function versionCheck(required, current) {
|
||||
let requiredArray = required[i].split('.');
|
||||
if (requiredArray[0] == major &&
|
||||
requiredArray[1] == minor &&
|
||||
((requiredArray[2] === undefined && parseInt(minor) % 2 == 0) ||
|
||||
requiredArray[2] == point))
|
||||
(requiredArray[2] == point ||
|
||||
(requiredArray[2] == undefined && parseInt(minor) % 2 == 0)))
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
|
||||
@@ -28,7 +28,7 @@ var HistoryManager = class {
|
||||
this._entry = params.entry;
|
||||
|
||||
if (this._entry) {
|
||||
this._entry.connect('key-press-event',
|
||||
this._entry.connect('key-press-event',
|
||||
this._onEntryKeyPress.bind(this));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
/* exported getIBusManager */
|
||||
|
||||
const { Gio, GLib, IBus } = imports.gi;
|
||||
const Mainloop = imports.mainloop;
|
||||
const Signals = imports.signals;
|
||||
|
||||
const IBusCandidatePopup = imports.ui.ibusCandidatePopup;
|
||||
@@ -18,9 +19,9 @@ function _checkIBusVersion(requiredMajor, requiredMinor, requiredMicro) {
|
||||
IBus.MICRO_VERSION >= requiredMicro))
|
||||
return;
|
||||
|
||||
throw "Found IBus version %d.%d.%d but required is %d.%d.%d"
|
||||
.format(IBus.MAJOR_VERSION, IBus.MINOR_VERSION, IBus.MINOR_VERSION,
|
||||
requiredMajor, requiredMinor, requiredMicro);
|
||||
throw "Found IBus version %d.%d.%d but required is %d.%d.%d".
|
||||
format(IBus.MAJOR_VERSION, IBus.MINOR_VERSION, IBus.MINOR_VERSION,
|
||||
requiredMajor, requiredMinor, requiredMicro);
|
||||
}
|
||||
|
||||
function getIBusManager() {
|
||||
@@ -58,30 +59,16 @@ var IBusManager = class {
|
||||
this._spawn();
|
||||
}
|
||||
|
||||
_spawn(extraArgs = []) {
|
||||
_spawn() {
|
||||
try {
|
||||
let cmdLine = ['ibus-daemon', '--panel', 'disable', ...extraArgs];
|
||||
Gio.Subprocess.new(cmdLine, Gio.SubprocessFlags.NONE);
|
||||
Gio.Subprocess.new(['ibus-daemon', '--xim', '--panel', 'disable'],
|
||||
Gio.SubprocessFlags.NONE);
|
||||
} catch (e) {
|
||||
log(`Failed to launch ibus-daemon: ${e.message}`);
|
||||
}
|
||||
}
|
||||
|
||||
restartDaemon(extraArgs = []) {
|
||||
this._spawn(['-r', ...extraArgs]);
|
||||
}
|
||||
|
||||
_clear() {
|
||||
if (this._cancellable) {
|
||||
this._cancellable.cancel();
|
||||
this._cancellable = null;
|
||||
}
|
||||
|
||||
if (this._preloadEnginesId) {
|
||||
GLib.source_remove(this._preloadEnginesId);
|
||||
this._preloadEnginesId = 0;
|
||||
}
|
||||
|
||||
if (this._panelService)
|
||||
this._panelService.destroy();
|
||||
|
||||
@@ -93,44 +80,33 @@ var IBusManager = class {
|
||||
this._currentEngineName = null;
|
||||
|
||||
this.emit('ready', false);
|
||||
|
||||
this._spawn();
|
||||
}
|
||||
|
||||
_onConnected() {
|
||||
this._cancellable = new Gio.Cancellable();
|
||||
this._ibus.list_engines_async(-1, this._cancellable,
|
||||
this._initEngines.bind(this));
|
||||
this._ibus.list_engines_async(-1, null, this._initEngines.bind(this));
|
||||
this._ibus.request_name_async(IBus.SERVICE_PANEL,
|
||||
IBus.BusNameFlag.REPLACE_EXISTING, -1, this._cancellable,
|
||||
this._initPanelService.bind(this));
|
||||
IBus.BusNameFlag.REPLACE_EXISTING,
|
||||
-1, null,
|
||||
this._initPanelService.bind(this));
|
||||
}
|
||||
|
||||
_initEngines(ibus, result) {
|
||||
try {
|
||||
let enginesList = this._ibus.list_engines_async_finish(result);
|
||||
let enginesList = this._ibus.list_engines_async_finish(result);
|
||||
if (enginesList) {
|
||||
for (let i = 0; i < enginesList.length; ++i) {
|
||||
let name = enginesList[i].get_name();
|
||||
this._engines.set(name, enginesList[i]);
|
||||
}
|
||||
this._updateReadiness();
|
||||
} catch (e) {
|
||||
if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
|
||||
return;
|
||||
|
||||
logError(e);
|
||||
} else {
|
||||
this._clear();
|
||||
}
|
||||
}
|
||||
|
||||
_initPanelService(ibus, result) {
|
||||
let success = false;
|
||||
try {
|
||||
success = !!this._ibus.request_name_async_finish(result);
|
||||
} catch (e) {
|
||||
if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
|
||||
return;
|
||||
logError(e);
|
||||
}
|
||||
|
||||
let success = this._ibus.request_name_async_finish(result);
|
||||
if (success) {
|
||||
this._panelService = new IBus.PanelService({ connection: this._ibus.get_connection(),
|
||||
object_path: IBus.PATH_PANEL });
|
||||
@@ -157,7 +133,7 @@ var IBusManager = class {
|
||||
} catch (e) {
|
||||
}
|
||||
// If an engine is already active we need to get its properties
|
||||
this._ibus.get_global_engine_async(-1, this._cancellable, (_bus, result) => {
|
||||
this._ibus.get_global_engine_async(-1, null, (i, result) => {
|
||||
let engine;
|
||||
try {
|
||||
engine = this._ibus.get_global_engine_async_finish(result);
|
||||
@@ -229,18 +205,8 @@ var IBusManager = class {
|
||||
return;
|
||||
}
|
||||
|
||||
this._ibus.set_global_engine_async(id,
|
||||
this._MAX_INPUT_SOURCE_ACTIVATION_TIME,
|
||||
this._cancellable, (_bus, res) => {
|
||||
try {
|
||||
this._ibus.set_global_engine_async_finish(res);
|
||||
} catch (e) {
|
||||
if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
|
||||
logError(e);
|
||||
}
|
||||
if (callback)
|
||||
callback();
|
||||
});
|
||||
this._ibus.set_global_engine_async(id, this._MAX_INPUT_SOURCE_ACTIVATION_TIME,
|
||||
null, callback || null);
|
||||
}
|
||||
|
||||
preloadEngines(ids) {
|
||||
@@ -248,23 +214,21 @@ var IBusManager = class {
|
||||
return;
|
||||
|
||||
if (this._preloadEnginesId != 0) {
|
||||
GLib.source_remove(this._preloadEnginesId);
|
||||
Mainloop.source_remove(this._preloadEnginesId);
|
||||
this._preloadEnginesId = 0;
|
||||
}
|
||||
|
||||
this._preloadEnginesId =
|
||||
GLib.timeout_add_seconds(
|
||||
GLib.PRIORITY_DEFAULT,
|
||||
this._PRELOAD_ENGINES_DELAY_TIME,
|
||||
() => {
|
||||
this._ibus.preload_engines_async(
|
||||
ids,
|
||||
-1,
|
||||
this._cancellable,
|
||||
null);
|
||||
this._preloadEnginesId = 0;
|
||||
return GLib.SOURCE_REMOVE;
|
||||
});
|
||||
Mainloop.timeout_add_seconds(this._PRELOAD_ENGINES_DELAY_TIME,
|
||||
() => {
|
||||
this._ibus.preload_engines_async(
|
||||
ids,
|
||||
-1,
|
||||
null,
|
||||
null);
|
||||
this._preloadEnginesId = 0;
|
||||
return GLib.SOURCE_REMOVE;
|
||||
});
|
||||
}
|
||||
};
|
||||
Signals.addSignalMethods(IBusManager.prototype);
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
|
||||
/* exported InputMethod */
|
||||
const { Clutter, GLib, Gio, GObject, IBus } = imports.gi;
|
||||
const { Clutter, GLib, GObject, IBus } = imports.gi;
|
||||
|
||||
const Keyboard = imports.ui.status.keyboard;
|
||||
|
||||
@@ -36,7 +36,15 @@ class InputMethod extends Clutter.InputMethod {
|
||||
}
|
||||
|
||||
_updateCapabilities() {
|
||||
let caps = IBus.Capabilite.PREEDIT_TEXT | IBus.Capabilite.FOCUS | IBus.Capabilite.SURROUNDING_TEXT;
|
||||
let caps = 0;
|
||||
|
||||
if (this.can_show_preedit)
|
||||
caps |= IBus.Capabilite.PREEDIT_TEXT;
|
||||
|
||||
if (this._currentFocus)
|
||||
caps |= IBus.Capabilite.FOCUS | IBus.Capabilite.SURROUNDING_TEXT;
|
||||
else
|
||||
caps |= IBus.Capabilite.PREEDIT_TEXT | IBus.Capabilite.AUXILIARY_TEXT | IBus.Capabilite.LOOKUP_TABLE | IBus.Capabilite.PROPERTY;
|
||||
|
||||
if (this._context)
|
||||
this._context.set_capabilities(caps);
|
||||
@@ -47,22 +55,12 @@ class InputMethod extends Clutter.InputMethod {
|
||||
}
|
||||
|
||||
_onConnected() {
|
||||
this._cancellable = new Gio.Cancellable();
|
||||
this._ibus.create_input_context_async ('gnome-shell', -1,
|
||||
this._cancellable, this._setContext.bind(this));
|
||||
this._ibus.create_input_context_async ('gnome-shell', -1, null,
|
||||
this._setContext.bind(this));
|
||||
}
|
||||
|
||||
_setContext(bus, res) {
|
||||
try {
|
||||
this._context = this._ibus.create_input_context_async_finish(res);
|
||||
} catch (e) {
|
||||
if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED)) {
|
||||
logError(e);
|
||||
this._clear();
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
this._context = this._ibus.create_input_context_async_finish(res);
|
||||
this._context.connect('commit-text', this._onCommitText.bind(this));
|
||||
this._context.connect('delete-surrounding-text', this._onDeleteSurroundingText.bind(this));
|
||||
this._context.connect('update-preedit-text', this._onUpdatePreeditText.bind(this));
|
||||
@@ -74,11 +72,6 @@ class InputMethod extends Clutter.InputMethod {
|
||||
}
|
||||
|
||||
_clear() {
|
||||
if (this._cancellable) {
|
||||
this._cancellable.cancel();
|
||||
this._cancellable = null;
|
||||
}
|
||||
|
||||
this._context = null;
|
||||
this._hints = 0;
|
||||
this._purpose = 0;
|
||||
@@ -144,6 +137,7 @@ class InputMethod extends Clutter.InputMethod {
|
||||
this._currentFocus = focus;
|
||||
if (this._context) {
|
||||
this._context.focus_in();
|
||||
this._updateCapabilities();
|
||||
this._emitRequestSurrounding();
|
||||
}
|
||||
|
||||
@@ -155,8 +149,10 @@ class InputMethod extends Clutter.InputMethod {
|
||||
|
||||
vfunc_focus_out() {
|
||||
this._currentFocus = null;
|
||||
if (this._context)
|
||||
if (this._context) {
|
||||
this._context.focus_out();
|
||||
this._updateCapabilities();
|
||||
}
|
||||
|
||||
if (this._preeditStr) {
|
||||
// Unset any preedit text
|
||||
@@ -259,19 +255,17 @@ class InputMethod extends Clutter.InputMethod {
|
||||
if (event.type() == Clutter.EventType.KEY_RELEASE)
|
||||
state |= IBus.ModifierType.RELEASE_MASK;
|
||||
|
||||
this._context.process_key_event_async(
|
||||
event.get_key_symbol(),
|
||||
event.get_key_code() - 8, // Convert XKB keycodes to evcodes
|
||||
state, -1, this._cancellable,
|
||||
(context, res) => {
|
||||
try {
|
||||
let retval = context.process_key_event_async_finish(res);
|
||||
this.notify_key_event(event, retval);
|
||||
} catch (e) {
|
||||
if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
|
||||
log(`Error processing key on IM: ${e.message}`);
|
||||
}
|
||||
});
|
||||
this._context.process_key_event_async(event.get_key_symbol(),
|
||||
event.get_key_code() - 8, // Convert XKB keycodes to evcodes
|
||||
state, -1, null,
|
||||
(context, res) => {
|
||||
try {
|
||||
let retval = context.process_key_event_async_finish(res);
|
||||
this.notify_key_event(event, retval);
|
||||
} catch (e) {
|
||||
log(`Error processing key on IM: ${e.message}`);
|
||||
}
|
||||
});
|
||||
return true;
|
||||
}
|
||||
});
|
||||
|
||||
@@ -40,15 +40,6 @@ var IntrospectService = class {
|
||||
});
|
||||
|
||||
this._syncRunningApplications();
|
||||
|
||||
this._whitelistMap = new Map();
|
||||
APP_WHITELIST.forEach(appName => {
|
||||
Gio.DBus.watch_name(Gio.BusType.SESSION,
|
||||
appName,
|
||||
Gio.BusNameWatcherFlags.NONE,
|
||||
(conn, name, owner) => this._whitelistMap.set(name, owner),
|
||||
(conn, name) => this._whitelistMap.delete(name));
|
||||
});
|
||||
}
|
||||
|
||||
_isStandaloneApp(app) {
|
||||
@@ -60,7 +51,7 @@ var IntrospectService = class {
|
||||
}
|
||||
|
||||
_isSenderWhitelisted(sender) {
|
||||
return [...this._whitelistMap.values()].includes(sender);
|
||||
return APP_WHITELIST.includes(sender);
|
||||
}
|
||||
|
||||
_getSandboxedAppId(app) {
|
||||
@@ -136,8 +127,7 @@ var IntrospectService = class {
|
||||
let apps = this._appSystem.get_running();
|
||||
let windowsList = {};
|
||||
|
||||
if (!this._isIntrospectEnabled() &&
|
||||
!this._isSenderWhitelisted(invocation.get_sender())) {
|
||||
if (!this._isIntrospectEnabled()) {
|
||||
invocation.return_error_literal(Gio.DBusError,
|
||||
Gio.DBusError.ACCESS_DENIED,
|
||||
'App introspection not allowed');
|
||||
|
||||
@@ -172,7 +172,7 @@ function getPropertyNamesFromExpression(expr, commandHeader = '') {
|
||||
|
||||
// Make sure propsUnique contains one key for every
|
||||
// property so we end up with a unique list of properties
|
||||
allProps.map(p => (propsUnique[p] = null));
|
||||
allProps.map(p => propsUnique[p] = null);
|
||||
}
|
||||
return Object.keys(propsUnique).sort();
|
||||
}
|
||||
@@ -217,7 +217,7 @@ function isUnsafeExpression(str) {
|
||||
prunedStr = prunedStr.replace(/[=!]==/g, ''); //replace === and !== with nothing
|
||||
prunedStr = prunedStr.replace(/[=<>!]=/g, ''); //replace ==, <=, >=, != with nothing
|
||||
|
||||
if (prunedStr.match(/[=]/)) {
|
||||
if (prunedStr.match(/=/)) {
|
||||
return true;
|
||||
} else if (prunedStr.match(/;/)) {
|
||||
// If we contain a semicolon not inside of a quote/regex, assume we're unsafe as well
|
||||
|
||||
@@ -84,9 +84,9 @@ function _findProviderForSid(sid) {
|
||||
}
|
||||
|
||||
|
||||
// ----------------------------------------------------- //
|
||||
// Support for the old ModemManager interface (MM < 0.7) //
|
||||
// ----------------------------------------------------- //
|
||||
//------------------------------------------------------------------------------
|
||||
// Support for the old ModemManager interface (MM < 0.7)
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
|
||||
// The following are not the complete interfaces, just the methods we need
|
||||
@@ -182,9 +182,9 @@ var ModemCdma = class {
|
||||
Signals.addSignalMethods(ModemCdma.prototype);
|
||||
|
||||
|
||||
// ------------------------------------------------------- //
|
||||
// Support for the new ModemManager1 interface (MM >= 0.7) //
|
||||
// ------------------------------------------------------- //
|
||||
//------------------------------------------------------------------------------
|
||||
// Support for the new ModemManager1 interface (MM >= 0.7)
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
const BroadbandModemInterface = loadInterfaceXML('org.freedesktop.ModemManager1.Modem');
|
||||
const BroadbandModemProxy = Gio.DBusProxy.makeProxyWrapper(BroadbandModemInterface);
|
||||
|
||||
@@ -244,9 +244,8 @@ const SystemActions = GObject.registerClass({
|
||||
|
||||
_updateOrientationLockIcon() {
|
||||
let locked = this._orientationSettings.get_boolean('orientation-lock');
|
||||
let iconName = locked
|
||||
? 'rotation-locked-symbolic'
|
||||
: 'rotation-allowed-symbolic';
|
||||
let iconName = locked ? 'rotation-locked-symbolic'
|
||||
: 'rotation-allowed-symbolic';
|
||||
this._actions.get(LOCK_ORIENTATION_ACTION_ID).iconName = iconName;
|
||||
|
||||
this.notify('orientation-lock-icon');
|
||||
@@ -269,7 +268,7 @@ const SystemActions = GObject.registerClass({
|
||||
|
||||
getMatchingActions(terms) {
|
||||
// terms is a list of strings
|
||||
terms = terms.map(term => term.toLowerCase());
|
||||
terms = terms.map((term) => term.toLowerCase());
|
||||
|
||||
let results = [];
|
||||
|
||||
|
||||
@@ -3,8 +3,9 @@
|
||||
formatTime, formatTimeSpan, createTimeLabel, insertSorted,
|
||||
makeCloseButton, ensureActorVisibleInScrollView */
|
||||
|
||||
const { Clutter, Gio, GLib, GObject, Shell, St, GnomeDesktop } = imports.gi;
|
||||
const { Clutter, Gio, GLib, GObject, Shell, St } = imports.gi;
|
||||
const Gettext = imports.gettext;
|
||||
const Mainloop = imports.mainloop;
|
||||
|
||||
const Main = imports.ui.main;
|
||||
const Params = imports.misc.params;
|
||||
@@ -14,7 +15,7 @@ var SCROLL_TIME = 100;
|
||||
// http://daringfireball.net/2010/07/improved_regex_for_matching_urls
|
||||
const _balancedParens = '\\([^\\s()<>]+\\)';
|
||||
const _leadingJunk = '[\\s`(\\[{\'\\"<\u00AB\u201C\u2018]';
|
||||
const _notTrailingJunk = '[^\\s`!()\\[\\]{};:\'\\".,<>?\u00AB\u00BB\u200E\u200F\u201C\u201D\u2018\u2019\u202A\u202C]';
|
||||
const _notTrailingJunk = '[^\\s`!()\\[\\]{};:\'\\".,<>?\u00AB\u00BB\u201C\u201D\u2018\u2019]';
|
||||
|
||||
const _urlRegexp = new RegExp(
|
||||
`(^|${_leadingJunk})` +
|
||||
@@ -127,14 +128,6 @@ function trySpawn(argv) {
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
|
||||
// Async call, we don't need the reply though
|
||||
try {
|
||||
GnomeDesktop.start_systemd_scope(argv[0], pid, null, null, null, () => {});
|
||||
} catch (err) {
|
||||
// Ignore error; it likely means GnomeDesktop is too old
|
||||
}
|
||||
|
||||
// Dummy child watch; we don't want to double-fork internally
|
||||
// because then we lose the parent-child relationship, which
|
||||
// can break polkit. See https://bugzilla.redhat.com//show_bug.cgi?id=819275
|
||||
@@ -321,8 +314,7 @@ function lowerBound(array, val, cmp) {
|
||||
if (array.length == 0)
|
||||
return 0;
|
||||
|
||||
min = 0;
|
||||
max = array.length;
|
||||
min = 0; max = array.length;
|
||||
while (min < (max - 1)) {
|
||||
mid = Math.floor((min + max) / 2);
|
||||
v = cmp(array[mid], val);
|
||||
|
||||
@@ -32,7 +32,6 @@ var WeatherClient = class {
|
||||
this._gclueStarting = false;
|
||||
this._gclueLocationChangedId = 0;
|
||||
|
||||
this._needsAuth = true;
|
||||
this._weatherAuthorized = false;
|
||||
this._permStore = new PermissionStore.PermissionStore((proxy, error) => {
|
||||
if (error) {
|
||||
@@ -143,7 +142,7 @@ var WeatherClient = class {
|
||||
get _useAutoLocation() {
|
||||
return this._autoLocationRequested &&
|
||||
this._locationSettings.get_boolean('enabled') &&
|
||||
(!this._needsAuth || this._weatherAuthorized);
|
||||
this._weatherAuthorized;
|
||||
}
|
||||
|
||||
_onWeatherProxyReady(o, res) {
|
||||
@@ -176,13 +175,6 @@ var WeatherClient = class {
|
||||
|
||||
if (hadApp !== haveApp)
|
||||
this.emit('changed');
|
||||
|
||||
let neededAuth = this._needsAuth;
|
||||
this._needsAuth = this._weatherApp === null ||
|
||||
this._weatherApp.app_info.has_key('X-Flatpak');
|
||||
|
||||
if (neededAuth !== this._needsAuth)
|
||||
this._updateAutoLocation();
|
||||
}
|
||||
|
||||
_loadInfo() {
|
||||
|
||||
@@ -57,7 +57,7 @@ function waitAndDraw(milliseconds) {
|
||||
cb();
|
||||
});
|
||||
|
||||
return callback => (cb = callback);
|
||||
return callback => cb = callback;
|
||||
}
|
||||
|
||||
function waitSignal(object, signal) {
|
||||
@@ -69,7 +69,7 @@ function waitSignal(object, signal) {
|
||||
cb();
|
||||
});
|
||||
|
||||
return callback => (cb = callback);
|
||||
return callback => cb = callback;
|
||||
}
|
||||
|
||||
function extractBootTimestamp() {
|
||||
@@ -137,9 +137,9 @@ function *run() {
|
||||
Main.overview.hide();
|
||||
yield Scripting.waitLeisure();
|
||||
|
||||
// --------------------- //
|
||||
// Tests of redraw speed //
|
||||
// --------------------- //
|
||||
////////////////////////////////////////
|
||||
// Tests of redraw speed
|
||||
////////////////////////////////////////
|
||||
|
||||
global.frame_timestamps = true;
|
||||
global.frame_finish_timestamp = true;
|
||||
@@ -186,6 +186,8 @@ function *run() {
|
||||
|
||||
yield Scripting.sleep(1000);
|
||||
|
||||
////////////////////////////////////////
|
||||
|
||||
let appSys = Shell.AppSystem.get_default();
|
||||
let app = appSys.lookup_app('org.gnome.gedit.desktop');
|
||||
|
||||
|
||||
@@ -147,7 +147,7 @@ var AccessDialogDBus = class {
|
||||
subtitle, body, options);
|
||||
dialog.open();
|
||||
|
||||
dialog.connect('closed', () => (this._accessDialog = null));
|
||||
dialog.connect('closed', () => this._accessDialog = null);
|
||||
|
||||
this._accessDialog = dialog;
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
WindowCyclerPopup */
|
||||
|
||||
const { Atk, Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
|
||||
const Mainloop = imports.mainloop;
|
||||
|
||||
const Main = imports.ui.main;
|
||||
const SwitcherPopup = imports.ui.switcherPopup;
|
||||
@@ -291,7 +292,7 @@ class AppSwitcherPopup extends SwitcherPopup.SwitcherPopup {
|
||||
if (this._thumbnails)
|
||||
this._destroyThumbnails();
|
||||
if (this._thumbnailTimeoutId != 0)
|
||||
GLib.source_remove(this._thumbnailTimeoutId);
|
||||
Mainloop.source_remove(this._thumbnailTimeoutId);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -326,7 +327,7 @@ class AppSwitcherPopup extends SwitcherPopup.SwitcherPopup {
|
||||
}
|
||||
|
||||
if (this._thumbnailTimeoutId != 0) {
|
||||
GLib.source_remove(this._thumbnailTimeoutId);
|
||||
Mainloop.source_remove(this._thumbnailTimeoutId);
|
||||
this._thumbnailTimeoutId = 0;
|
||||
}
|
||||
|
||||
@@ -343,8 +344,7 @@ class AppSwitcherPopup extends SwitcherPopup.SwitcherPopup {
|
||||
this._thumbnails.highlight(window, forceAppFocus);
|
||||
} else if (this._items[this._selectedIndex].cachedWindows.length > 1 &&
|
||||
!forceAppFocus) {
|
||||
this._thumbnailTimeoutId = GLib.timeout_add(
|
||||
GLib.PRIORITY_DEFAULT,
|
||||
this._thumbnailTimeoutId = Mainloop.timeout_add (
|
||||
THUMBNAIL_POPUP_TIME,
|
||||
this._timeoutPopupThumbnails.bind(this));
|
||||
GLib.Source.set_name_by_id(this._thumbnailTimeoutId, '[gnome-shell] this._timeoutPopupThumbnails');
|
||||
@@ -437,8 +437,8 @@ class CyclerHighlight {
|
||||
if (this._clone.source)
|
||||
this._clone.source.sync_visibility();
|
||||
|
||||
let windowActor = this._window
|
||||
? this._window.get_compositor_private() : null;
|
||||
let windowActor = this._window ? this._window.get_compositor_private()
|
||||
: null;
|
||||
|
||||
if (windowActor)
|
||||
windowActor.hide();
|
||||
@@ -648,9 +648,8 @@ class WindowCyclerPopup extends CyclerPopup {
|
||||
}
|
||||
});
|
||||
|
||||
var AppIcon = GObject.registerClass({
|
||||
GTypeName: 'AltTab_AppIcon'
|
||||
}, class AppIcon extends St.BoxLayout {
|
||||
var AppIcon = GObject.registerClass(
|
||||
class AppIcon extends St.BoxLayout {
|
||||
_init(app) {
|
||||
super._init({ style_class: 'alt-tab-app',
|
||||
vertical: true });
|
||||
@@ -712,7 +711,7 @@ class AppSwitcher extends SwitcherPopup.SwitcherList {
|
||||
|
||||
_onDestroy() {
|
||||
if (this._mouseTimeOutId != 0)
|
||||
GLib.source_remove(this._mouseTimeOutId);
|
||||
Mainloop.source_remove(this._mouseTimeOutId);
|
||||
|
||||
this.icons.forEach(icon => {
|
||||
icon.app.disconnect(icon._stateChangedId);
|
||||
@@ -791,16 +790,14 @@ class AppSwitcher extends SwitcherPopup.SwitcherList {
|
||||
// activation when the thumbnail list is open
|
||||
_onItemEnter(index) {
|
||||
if (this._mouseTimeOutId != 0)
|
||||
GLib.source_remove(this._mouseTimeOutId);
|
||||
Mainloop.source_remove(this._mouseTimeOutId);
|
||||
if (this._altTabPopup.thumbnailsVisible) {
|
||||
this._mouseTimeOutId = GLib.timeout_add(
|
||||
GLib.PRIORITY_DEFAULT,
|
||||
APP_ICON_HOVER_TIMEOUT,
|
||||
() => {
|
||||
this._enterItem(index);
|
||||
this._mouseTimeOutId = 0;
|
||||
return GLib.SOURCE_REMOVE;
|
||||
});
|
||||
this._mouseTimeOutId = Mainloop.timeout_add(APP_ICON_HOVER_TIMEOUT,
|
||||
() => {
|
||||
this._enterItem(index);
|
||||
this._mouseTimeOutId = 0;
|
||||
return GLib.SOURCE_REMOVE;
|
||||
});
|
||||
GLib.Source.set_name_by_id(this._mouseTimeOutId, '[gnome-shell] this._enterItem');
|
||||
} else {
|
||||
this._itemEntered(index);
|
||||
@@ -877,9 +874,9 @@ class ThumbnailList extends SwitcherPopup.SwitcherList {
|
||||
_init(windows) {
|
||||
super._init(false);
|
||||
|
||||
this._labels = [];
|
||||
this._thumbnailBins = [];
|
||||
this._clones = [];
|
||||
this._labels = new Array();
|
||||
this._thumbnailBins = new Array();
|
||||
this._clones = new Array();
|
||||
this._windows = windows;
|
||||
|
||||
for (let i = 0; i < windows.length; i++) {
|
||||
@@ -940,7 +937,7 @@ class ThumbnailList extends SwitcherPopup.SwitcherList {
|
||||
}
|
||||
|
||||
// Make sure we only do this once
|
||||
this._thumbnailBins = [];
|
||||
this._thumbnailBins = new Array();
|
||||
}
|
||||
|
||||
_removeThumbnail(source, clone) {
|
||||
@@ -1014,9 +1011,9 @@ class WindowIcon extends St.BoxLayout {
|
||||
}
|
||||
|
||||
_createAppIcon(app, size) {
|
||||
let appIcon = app
|
||||
? app.create_icon_texture(size)
|
||||
: new St.Icon({ icon_name: 'icon-missing', icon_size: size });
|
||||
let appIcon = app ? app.create_icon_texture(size)
|
||||
: new St.Icon({ icon_name: 'icon-missing',
|
||||
icon_size: size });
|
||||
appIcon.x_expand = appIcon.y_expand = true;
|
||||
appIcon.x_align = appIcon.y_align = Clutter.ActorAlign.END;
|
||||
|
||||
@@ -1043,7 +1040,7 @@ class WindowList extends SwitcherPopup.SwitcherList {
|
||||
this.addItem(icon, icon.label);
|
||||
this.icons.push(icon);
|
||||
|
||||
icon._unmanagedSignalId = icon.window.connect('unmanaged', window => {
|
||||
icon._unmanagedSignalId = icon.window.connect('unmanaged', (window) => {
|
||||
this._removeWindow(window);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -2,8 +2,7 @@
|
||||
/* exported Animation, AnimatedIcon, Spinner */
|
||||
|
||||
const { Clutter, GLib, Gio, St } = imports.gi;
|
||||
|
||||
const Params = imports.misc.params;
|
||||
const Mainloop = imports.mainloop;
|
||||
|
||||
var ANIMATED_ICON_UPDATE_TIMEOUT = 16;
|
||||
var SPINNER_ANIMATION_TIME = 300;
|
||||
@@ -46,7 +45,7 @@ var Animation = class {
|
||||
|
||||
stop() {
|
||||
if (this._timeoutId > 0) {
|
||||
GLib.source_remove(this._timeoutId);
|
||||
Mainloop.source_remove(this._timeoutId);
|
||||
this._timeoutId = 0;
|
||||
}
|
||||
|
||||
@@ -55,19 +54,12 @@ var Animation = class {
|
||||
|
||||
_loadFile(file, width, height) {
|
||||
let [validResourceScale, resourceScale] = this.actor.get_resource_scale();
|
||||
let wasPlaying = this._isPlaying;
|
||||
|
||||
if (this._isPlaying)
|
||||
this.stop();
|
||||
|
||||
this._isLoaded = false;
|
||||
this.actor.destroy_all_children();
|
||||
|
||||
if (!validResourceScale) {
|
||||
if (wasPlaying)
|
||||
this.play();
|
||||
if (!validResourceScale)
|
||||
return;
|
||||
}
|
||||
|
||||
let textureCache = St.TextureCache.get_default();
|
||||
let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
|
||||
@@ -75,9 +67,6 @@ var Animation = class {
|
||||
scaleFactor, resourceScale,
|
||||
this._animationsLoaded.bind(this));
|
||||
this.actor.set_child(this._animations);
|
||||
|
||||
if (wasPlaying)
|
||||
this.play();
|
||||
}
|
||||
|
||||
_showFrame(frame) {
|
||||
@@ -133,22 +122,12 @@ var AnimatedIcon = class extends Animation {
|
||||
};
|
||||
|
||||
var Spinner = class extends AnimatedIcon {
|
||||
constructor(size, params) {
|
||||
// Compatibility with older callers
|
||||
if (params === true || params === false)
|
||||
params = { animate: params };
|
||||
|
||||
params = Params.parse(params, {
|
||||
animate: false,
|
||||
hideOnStop: false,
|
||||
});
|
||||
constructor(size, animate = false) {
|
||||
let file = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/process-working.svg');
|
||||
super(file, size);
|
||||
|
||||
this.actor.opacity = 0;
|
||||
this._animate = params.animate;
|
||||
this._hideOnStop = params.hideOnStop;
|
||||
this.actor.visible = !this._hideOnStop;
|
||||
this._animate = animate;
|
||||
}
|
||||
|
||||
_onDestroy() {
|
||||
@@ -158,7 +137,6 @@ var Spinner = class extends AnimatedIcon {
|
||||
|
||||
play() {
|
||||
this.actor.remove_all_transitions();
|
||||
this.actor.show();
|
||||
|
||||
if (this._animate) {
|
||||
super.play();
|
||||
@@ -180,20 +158,13 @@ var Spinner = class extends AnimatedIcon {
|
||||
if (this._animate) {
|
||||
this.actor.ease({
|
||||
opacity: 0,
|
||||
duration: SPINNER_ANIMATION_TIME,
|
||||
mode: Clutter.AnimationMode.LINEAR,
|
||||
onComplete: () => {
|
||||
super.stop();
|
||||
if (this._hideOnStop)
|
||||
this.actor.hide();
|
||||
},
|
||||
time: SPINNER_ANIMATION_TIME,
|
||||
transition: 'linear',
|
||||
onComplete: () => super.stop()
|
||||
});
|
||||
} else {
|
||||
this.actor.opacity = 0;
|
||||
super.stop();
|
||||
|
||||
if (this._hideOnStop)
|
||||
this.actor.hide();
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
|
||||
const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
|
||||
const Signals = imports.signals;
|
||||
const Mainloop = imports.mainloop;
|
||||
|
||||
const AppFavorites = imports.ui.appFavorites;
|
||||
const BoxPointer = imports.ui.boxpointer;
|
||||
@@ -40,9 +41,6 @@ var PAGE_SWITCH_TIME = 300;
|
||||
var APP_ICON_SCALE_IN_TIME = 500;
|
||||
var APP_ICON_SCALE_IN_DELAY = 700;
|
||||
|
||||
const OVERSHOOT_THRESHOLD = 20;
|
||||
const OVERSHOOT_TIMEOUT = 1000;
|
||||
|
||||
const SWITCHEROO_BUS_NAME = 'net.hadess.SwitcherooControl';
|
||||
const SWITCHEROO_OBJECT_PATH = '/net/hadess/SwitcherooControl';
|
||||
|
||||
@@ -100,10 +98,7 @@ function _findBestFolderName(apps) {
|
||||
let commonCategories = [];
|
||||
|
||||
appInfos.reduce((categories, appInfo) => {
|
||||
const appCategories = appInfo.get_categories();
|
||||
if (!appCategories)
|
||||
return categories;
|
||||
for (let category of appCategories.split(';')) {
|
||||
for (let category of appInfo.get_categories().split(';')) {
|
||||
if (!(category in categoryCounter))
|
||||
categoryCounter[category] = 0;
|
||||
|
||||
@@ -179,11 +174,10 @@ class BaseAppView {
|
||||
// Remove old app icons
|
||||
removedApps.forEach(icon => {
|
||||
let iconIndex = this._allItems.indexOf(icon);
|
||||
let id = icon.id;
|
||||
|
||||
this._allItems.splice(iconIndex, 1);
|
||||
icon.actor.destroy();
|
||||
delete this._items[id];
|
||||
this._grid.removeItem(icon);
|
||||
delete this._items[icon.id];
|
||||
});
|
||||
|
||||
// Add new app icons
|
||||
@@ -315,12 +309,7 @@ var AllView = class AllView extends BaseAppView {
|
||||
|
||||
this._grid.currentPage = 0;
|
||||
this._stack.add_actor(this._grid);
|
||||
this._eventBlocker = new St.Widget({
|
||||
x_expand: true,
|
||||
y_expand: true,
|
||||
reactive: true,
|
||||
visible: false,
|
||||
});
|
||||
this._eventBlocker = new St.Widget({ x_expand: true, y_expand: true });
|
||||
this._stack.add_actor(this._eventBlocker);
|
||||
|
||||
box.add_actor(this._stack);
|
||||
@@ -347,16 +336,12 @@ var AllView = class AllView extends BaseAppView {
|
||||
});
|
||||
this._eventBlocker.add_action(this._clickAction);
|
||||
|
||||
this._currentPopup = null;
|
||||
this._displayingPopup = false;
|
||||
this._currentPopupDestroyId = 0;
|
||||
|
||||
this._availWidth = 0;
|
||||
this._availHeight = 0;
|
||||
|
||||
this._lastOvershootY = -1;
|
||||
this._lastOvershootTimeoutId = 0;
|
||||
|
||||
Main.overview.connect('hidden', () => this.goToPage(0));
|
||||
this._grid.connect('space-opened', () => {
|
||||
let fadeEffect = this._scrollView.get_effect('fade');
|
||||
@@ -393,6 +378,8 @@ var AllView = class AllView extends BaseAppView {
|
||||
|
||||
Main.overview.connect('item-drag-begin', this._onDragBegin.bind(this));
|
||||
Main.overview.connect('item-drag-end', this._onDragEnd.bind(this));
|
||||
|
||||
this._nEventBlockerInhibits = 0;
|
||||
}
|
||||
|
||||
_redisplay() {
|
||||
@@ -439,7 +426,7 @@ var AllView = class AllView extends BaseAppView {
|
||||
}
|
||||
|
||||
_loadApps() {
|
||||
let appIcons = [];
|
||||
let newApps = [];
|
||||
this._appInfoList = Shell.AppSystem.get_default().get_installed().filter(appInfo => {
|
||||
try {
|
||||
(appInfo.get_id()); // catch invalid file encodings
|
||||
@@ -464,7 +451,7 @@ var AllView = class AllView extends BaseAppView {
|
||||
icon.connect('name-changed', this._itemNameChanged.bind(this));
|
||||
icon.connect('apps-changed', this._redisplay.bind(this));
|
||||
}
|
||||
appIcons.push(icon);
|
||||
newApps.push(icon);
|
||||
this.folderIcons.push(icon);
|
||||
});
|
||||
|
||||
@@ -477,19 +464,14 @@ var AllView = class AllView extends BaseAppView {
|
||||
let favoritesWritable = global.settings.is_writable('favorite-apps');
|
||||
|
||||
apps.forEach(appId => {
|
||||
let icon = this._items[appId];
|
||||
if (!icon) {
|
||||
let app = appSys.lookup_app(appId);
|
||||
let app = appSys.lookup_app(appId);
|
||||
|
||||
icon = new AppIcon(app, {
|
||||
isDraggable: favoritesWritable,
|
||||
});
|
||||
}
|
||||
|
||||
appIcons.push(icon);
|
||||
let icon = new AppIcon(app,
|
||||
{ isDraggable: favoritesWritable });
|
||||
newApps.push(icon);
|
||||
});
|
||||
|
||||
return appIcons;
|
||||
return newApps;
|
||||
}
|
||||
|
||||
// Overridden from BaseAppView
|
||||
@@ -524,7 +506,7 @@ var AllView = class AllView extends BaseAppView {
|
||||
opacity: 0,
|
||||
duration: VIEWS_SWITCH_TIME,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
onComplete: () => (this.opacity = 255)
|
||||
onComplete: () => this.opacity = 255
|
||||
});
|
||||
|
||||
if (animationDirection == IconGrid.AnimationDirection.OUT)
|
||||
@@ -667,7 +649,7 @@ var AllView = class AllView extends BaseAppView {
|
||||
addFolderPopup(popup) {
|
||||
this._stack.add_actor(popup.actor);
|
||||
popup.connect('open-state-changed', (popup, isOpen) => {
|
||||
this._eventBlocker.visible = isOpen;
|
||||
this._eventBlocker.reactive = isOpen;
|
||||
|
||||
if (this._currentPopup) {
|
||||
this._currentPopup.actor.disconnect(this._currentPopupDestroyId);
|
||||
@@ -681,7 +663,7 @@ var AllView = class AllView extends BaseAppView {
|
||||
this._currentPopupDestroyId = popup.actor.connect('destroy', () => {
|
||||
this._currentPopup = null;
|
||||
this._currentPopupDestroyId = 0;
|
||||
this._eventBlocker.visible = false;
|
||||
this._eventBlocker.reactive = false;
|
||||
});
|
||||
}
|
||||
this._updateIconOpacities(isOpen);
|
||||
@@ -749,58 +731,30 @@ var AllView = class AllView extends BaseAppView {
|
||||
this.folderIcons[i].adaptToSize(availWidth, availHeight);
|
||||
}
|
||||
|
||||
_resetOvershoot() {
|
||||
if (this._lastOvershootTimeoutId)
|
||||
GLib.source_remove(this._lastOvershootTimeoutId);
|
||||
this._lastOvershootTimeoutId = 0;
|
||||
this._lastOvershootY = -1;
|
||||
}
|
||||
|
||||
_handleDragOvershoot(dragEvent) {
|
||||
let [, gridY] = this.actor.get_transformed_position();
|
||||
let [, gridHeight] = this.actor.get_transformed_size();
|
||||
let gridBottom = gridY + gridHeight;
|
||||
|
||||
// Already animating
|
||||
if (this._adjustment.get_transition('value') !== null)
|
||||
return;
|
||||
|
||||
// Within the grid boundaries
|
||||
if (dragEvent.y > gridY && dragEvent.y < gridBottom) {
|
||||
// Check whether we moved out the area of the last switch
|
||||
if (Math.abs(this._lastOvershootY - dragEvent.y) > OVERSHOOT_THRESHOLD)
|
||||
this._resetOvershoot();
|
||||
|
||||
// Within the grid boundaries, or already animating
|
||||
if (dragEvent.y > gridY && dragEvent.y < gridBottom ||
|
||||
this._adjustment.get_transition('value') != null) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Still in the area of the previous page switch
|
||||
if (this._lastOvershootY >= 0)
|
||||
return;
|
||||
|
||||
// Moving above the grid
|
||||
let currentY = this._adjustment.value;
|
||||
let maxY = this._adjustment.upper - this._adjustment.page_size;
|
||||
|
||||
if (dragEvent.y <= gridY && currentY > 0)
|
||||
if (dragEvent.y <= gridY && currentY > 0) {
|
||||
this.goToPage(this._grid.currentPage - 1);
|
||||
else if (dragEvent.y >= gridBottom && currentY < maxY)
|
||||
return;
|
||||
}
|
||||
|
||||
// Moving below the grid
|
||||
let maxY = this._adjustment.upper - this._adjustment.page_size;
|
||||
if (dragEvent.y >= gridBottom && currentY < maxY) {
|
||||
this.goToPage(this._grid.currentPage + 1);
|
||||
else
|
||||
return; // don't go beyond first/last page
|
||||
|
||||
this._lastOvershootY = dragEvent.y;
|
||||
|
||||
if (this._lastOvershootTimeoutId > 0)
|
||||
GLib.source_remove(this._lastOvershootTimeoutId);
|
||||
|
||||
this._lastOvershootTimeoutId =
|
||||
GLib.timeout_add(GLib.PRIORITY_DEFAULT, OVERSHOOT_TIMEOUT, () => {
|
||||
this._resetOvershoot();
|
||||
this._handleDragOvershoot(dragEvent);
|
||||
return GLib.SOURCE_REMOVE;
|
||||
});
|
||||
GLib.Source.set_name_by_id(this._lastOvershootTimeoutId,
|
||||
'[gnome-shell] this._lastOvershootTimeoutId');
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
_onDragBegin() {
|
||||
@@ -808,8 +762,6 @@ var AllView = class AllView extends BaseAppView {
|
||||
dragMotion: this._onDragMotion.bind(this)
|
||||
};
|
||||
DND.addDragMonitor(this._dragMonitor);
|
||||
|
||||
this._eventBlocker.visible = false;
|
||||
}
|
||||
|
||||
_onDragMotion(dragEvent) {
|
||||
@@ -832,9 +784,6 @@ var AllView = class AllView extends BaseAppView {
|
||||
DND.removeDragMonitor(this._dragMonitor);
|
||||
this._dragMonitor = null;
|
||||
}
|
||||
|
||||
this._eventBlocker.visible = this._currentPopup !== null;
|
||||
this._resetOvershoot();
|
||||
}
|
||||
|
||||
_canAccept(source) {
|
||||
@@ -868,6 +817,19 @@ var AllView = class AllView extends BaseAppView {
|
||||
return true;
|
||||
}
|
||||
|
||||
inhibitEventBlocker() {
|
||||
this._nEventBlockerInhibits++;
|
||||
this._eventBlocker.visible = this._nEventBlockerInhibits == 0;
|
||||
}
|
||||
|
||||
uninhibitEventBlocker() {
|
||||
if (this._nEventBlockerInhibits === 0)
|
||||
throw new Error('Not inhibited');
|
||||
|
||||
this._nEventBlockerInhibits--;
|
||||
this._eventBlocker.visible = this._nEventBlockerInhibits == 0;
|
||||
}
|
||||
|
||||
createFolder(apps) {
|
||||
let newFolderId = GLib.uuid_string_random();
|
||||
|
||||
@@ -958,12 +920,8 @@ var FrequentView = class FrequentView extends BaseAppView {
|
||||
for (let i = 0; i < mostUsed.length; i++) {
|
||||
if (!mostUsed[i].get_app_info().should_show())
|
||||
continue;
|
||||
let appIcon = this._items[mostUsed[i].get_id()];
|
||||
if (!appIcon) {
|
||||
appIcon = new AppIcon(mostUsed[i], {
|
||||
isDraggable: favoritesWritable,
|
||||
});
|
||||
}
|
||||
let appIcon = new AppIcon(mostUsed[i],
|
||||
{ isDraggable: favoritesWritable });
|
||||
apps.push(appIcon);
|
||||
}
|
||||
|
||||
@@ -1150,9 +1108,8 @@ var AppDisplay = class AppDisplay {
|
||||
else
|
||||
this._views[i].control.remove_style_pseudo_class('checked');
|
||||
|
||||
let animationDirection = i == activeIndex
|
||||
? IconGrid.AnimationDirection.IN
|
||||
: IconGrid.AnimationDirection.OUT;
|
||||
let animationDirection = i == activeIndex ? IconGrid.AnimationDirection.IN :
|
||||
IconGrid.AnimationDirection.OUT;
|
||||
this._views[i].view.animateSwitch(animationDirection);
|
||||
}
|
||||
}
|
||||
@@ -1202,10 +1159,11 @@ var AppSearchProvider = class AppSearchProvider {
|
||||
if (id.endsWith('.desktop')) {
|
||||
let app = this._appSys.lookup_app(id);
|
||||
|
||||
metas.push({
|
||||
id: app.get_id(),
|
||||
name: app.get_name(),
|
||||
createIcon: size => app.create_icon_texture(size),
|
||||
metas.push({ 'id': app.get_id(),
|
||||
'name': app.get_name(),
|
||||
'createIcon'(size) {
|
||||
return app.create_icon_texture(size);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
let name = this._systemActions.getName(id);
|
||||
@@ -1393,10 +1351,7 @@ var FolderView = class FolderView extends BaseAppView {
|
||||
if (apps.some(appIcon => appIcon.id == appId))
|
||||
return;
|
||||
|
||||
let icon = this._items[appId];
|
||||
if (!icon)
|
||||
icon = new AppIcon(app);
|
||||
|
||||
let icon = new AppIcon(app);
|
||||
apps.push(icon);
|
||||
};
|
||||
|
||||
@@ -1434,15 +1389,15 @@ var FolderView = class FolderView extends BaseAppView {
|
||||
// Remove the folder if this is the last app icon; otherwise,
|
||||
// just remove the icon
|
||||
if (folderApps.length == 0) {
|
||||
// Resetting all keys deletes the relocatable schema
|
||||
let keys = this._folder.settings_schema.list_keys();
|
||||
for (let key of keys)
|
||||
this._folder.reset(key);
|
||||
|
||||
let settings = new Gio.Settings({ schema_id: 'org.gnome.desktop.app-folders' });
|
||||
let folders = settings.get_strv('folder-children');
|
||||
folders.splice(folders.indexOf(this._id), 1);
|
||||
settings.set_strv('folder-children', folders);
|
||||
|
||||
// Resetting all keys deletes the relocatable schema
|
||||
let keys = this._folder.settings_schema.list_keys();
|
||||
for (let key of keys)
|
||||
this._folder.reset(key);
|
||||
} else {
|
||||
this._folder.set_strv('apps', folderApps);
|
||||
}
|
||||
@@ -1483,13 +1438,6 @@ var FolderIcon = class FolderIcon {
|
||||
this._itemDragEndId = Main.overview.connect(
|
||||
'item-drag-end', this._onDragEnd.bind(this));
|
||||
|
||||
this._popupTimeoutId = 0;
|
||||
|
||||
this.actor.connect('leave-event', this._onLeaveEvent.bind(this));
|
||||
this.actor.connect('button-press-event', this._onButtonPress.bind(this));
|
||||
this.actor.connect('touch-event', this._onTouchEvent.bind(this));
|
||||
this.actor.connect('popup-menu', this._popupRenamePopup.bind(this));
|
||||
|
||||
this.actor.connect('clicked', this.open.bind(this));
|
||||
this.actor.connect('destroy', this.onDestroy.bind(this));
|
||||
this.actor.connect('notify::mapped', () => {
|
||||
@@ -1514,12 +1462,9 @@ var FolderIcon = class FolderIcon {
|
||||
|
||||
if (this._popup)
|
||||
this._popup.actor.destroy();
|
||||
|
||||
this._removeMenuTimeout();
|
||||
}
|
||||
|
||||
open() {
|
||||
this._removeMenuTimeout();
|
||||
this._ensurePopup();
|
||||
this.view.actor.vscroll.adjustment.value = 0;
|
||||
this._openSpaceForPopup();
|
||||
@@ -1534,6 +1479,8 @@ var FolderIcon = class FolderIcon {
|
||||
dragMotion: this._onDragMotion.bind(this),
|
||||
};
|
||||
DND.addDragMonitor(this._dragMonitor);
|
||||
|
||||
this._parentView.inhibitEventBlocker();
|
||||
}
|
||||
|
||||
_onDragMotion(dragEvent) {
|
||||
@@ -1549,6 +1496,7 @@ var FolderIcon = class FolderIcon {
|
||||
|
||||
_onDragEnd() {
|
||||
this.actor.remove_style_pseudo_class('drop');
|
||||
this._parentView.uninhibitEventBlocker();
|
||||
DND.removeDragMonitor(this._dragMonitor);
|
||||
}
|
||||
|
||||
@@ -1679,74 +1627,6 @@ var FolderIcon = class FolderIcon {
|
||||
this._popupInvalidated = false;
|
||||
}
|
||||
|
||||
_removeMenuTimeout() {
|
||||
if (this._popupTimeoutId > 0) {
|
||||
GLib.source_remove(this._popupTimeoutId);
|
||||
this._popupTimeoutId = 0;
|
||||
}
|
||||
}
|
||||
|
||||
_setPopupTimeout() {
|
||||
this._removeMenuTimeout();
|
||||
this._popupTimeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, MENU_POPUP_TIMEOUT, () => {
|
||||
this._popupTimeoutId = 0;
|
||||
this._popupRenamePopup();
|
||||
return GLib.SOURCE_REMOVE;
|
||||
});
|
||||
GLib.Source.set_name_by_id(this._popupTimeoutId,
|
||||
'[gnome-shell] this._popupRenamePopup');
|
||||
}
|
||||
|
||||
_onLeaveEvent(_actor, _event) {
|
||||
this.actor.fake_release();
|
||||
this._removeMenuTimeout();
|
||||
}
|
||||
|
||||
_onButtonPress(_actor, event) {
|
||||
let button = event.get_button();
|
||||
if (button == 1) {
|
||||
this._setPopupTimeout();
|
||||
} else if (button == 3) {
|
||||
this._popupRenamePopup();
|
||||
return Clutter.EVENT_STOP;
|
||||
}
|
||||
return Clutter.EVENT_PROPAGATE;
|
||||
}
|
||||
|
||||
_onTouchEvent(actor, event) {
|
||||
if (event.type() == Clutter.EventType.TOUCH_BEGIN)
|
||||
this._setPopupTimeout();
|
||||
|
||||
return Clutter.EVENT_PROPAGATE;
|
||||
}
|
||||
|
||||
_popupRenamePopup() {
|
||||
this._removeMenuTimeout();
|
||||
this.actor.fake_release();
|
||||
|
||||
if (!this._menu) {
|
||||
this._menuManager = new PopupMenu.PopupMenuManager(this.actor);
|
||||
|
||||
this._menu = new RenameFolderMenu(this, this._folder);
|
||||
this._menuManager.addMenu(this._menu);
|
||||
|
||||
this._menu.connect('open-state-changed', (menu, isPoppedUp) => {
|
||||
if (!isPoppedUp)
|
||||
this.actor.sync_hover();
|
||||
});
|
||||
let id = Main.overview.connect('hiding', () => {
|
||||
this._menu.close();
|
||||
});
|
||||
this.actor.connect('destroy', () => {
|
||||
Main.overview.disconnect(id);
|
||||
});
|
||||
}
|
||||
|
||||
this.actor.set_hover(true);
|
||||
this._menu.open();
|
||||
this._menuManager.ignoreRelease();
|
||||
}
|
||||
|
||||
adaptToSize(width, height) {
|
||||
this._parentAvailableWidth = width;
|
||||
this._parentAvailableHeight = height;
|
||||
@@ -1757,106 +1637,6 @@ var FolderIcon = class FolderIcon {
|
||||
};
|
||||
Signals.addSignalMethods(FolderIcon.prototype);
|
||||
|
||||
var RenameFolderMenuItem = GObject.registerClass(
|
||||
class RenameFolderMenuItem extends PopupMenu.PopupBaseMenuItem {
|
||||
_init(folder) {
|
||||
super._init({
|
||||
style_class: 'rename-folder-popup-item',
|
||||
reactive: false,
|
||||
});
|
||||
this.setOrnament(PopupMenu.Ornament.HIDDEN);
|
||||
|
||||
this._folder = folder;
|
||||
|
||||
// Entry
|
||||
this._entry = new St.Entry({
|
||||
x_expand: true,
|
||||
width: 200,
|
||||
});
|
||||
this.add_child(this._entry);
|
||||
|
||||
this._entry.clutter_text.connect(
|
||||
'notify::text', this._validate.bind(this));
|
||||
this._entry.clutter_text.connect(
|
||||
'activate', this._updateFolderName.bind(this));
|
||||
|
||||
// Rename button
|
||||
this._button = new St.Button({
|
||||
style_class: 'button',
|
||||
reactive: true,
|
||||
button_mask: St.ButtonMask.ONE | St.ButtonMask.TWO,
|
||||
can_focus: true,
|
||||
label: _('Rename'),
|
||||
});
|
||||
this.add_child(this._button);
|
||||
|
||||
this._button.connect('clicked', this._updateFolderName.bind(this));
|
||||
}
|
||||
|
||||
vfunc_map() {
|
||||
this._entry.text = _getFolderName(this._folder);
|
||||
this._entry.clutter_text.set_selection(0, -1);
|
||||
super.vfunc_map();
|
||||
}
|
||||
|
||||
vfunc_key_focus_in() {
|
||||
super.vfunc_key_focus_in();
|
||||
this._entry.clutter_text.grab_key_focus();
|
||||
}
|
||||
|
||||
_isValidFolderName() {
|
||||
let folderName = _getFolderName(this._folder);
|
||||
let newFolderName = this._entry.text.trim();
|
||||
|
||||
return newFolderName.length > 0 && newFolderName != folderName;
|
||||
}
|
||||
|
||||
_validate() {
|
||||
let isValid = this._isValidFolderName();
|
||||
|
||||
this._button.reactive = isValid;
|
||||
}
|
||||
|
||||
_updateFolderName() {
|
||||
if (!this._isValidFolderName())
|
||||
return;
|
||||
|
||||
let newFolderName = this._entry.text.trim();
|
||||
this._folder.set_string('name', newFolderName);
|
||||
this._folder.set_boolean('translate', false);
|
||||
this.activate(Clutter.get_current_event());
|
||||
}
|
||||
});
|
||||
|
||||
var RenameFolderMenu = class RenameFolderMenu extends PopupMenu.PopupMenu {
|
||||
constructor(source, folder) {
|
||||
super(source.actor, 0.5, St.Side.BOTTOM);
|
||||
this.actor.add_style_class_name('rename-folder-popup');
|
||||
|
||||
// We want to keep the item hovered while the menu is up
|
||||
this.blockSourceEvents = true;
|
||||
|
||||
let menuItem = new RenameFolderMenuItem(folder);
|
||||
this.addMenuItem(menuItem);
|
||||
|
||||
// Focus the text entry on menu pop-up
|
||||
this.focusActor = menuItem;
|
||||
|
||||
// Chain our visibility and lifecycle to that of the source
|
||||
this._sourceMappedId = source.actor.connect('notify::mapped', () => {
|
||||
if (!source.actor.mapped)
|
||||
this.close();
|
||||
});
|
||||
source.actor.connect('destroy', () => {
|
||||
source.actor.disconnect(this._sourceMappedId);
|
||||
this.destroy();
|
||||
});
|
||||
|
||||
Main.uiGroup.add_actor(this.actor);
|
||||
}
|
||||
};
|
||||
Signals.addSignalMethods(RenameFolderMenu.prototype);
|
||||
|
||||
var AppFolderPopup = class AppFolderPopup {
|
||||
constructor(source, side) {
|
||||
this._source = source;
|
||||
@@ -1942,17 +1722,15 @@ var AppFolderPopup = class AppFolderPopup {
|
||||
direction = St.DirectionType.TAB_FORWARD;
|
||||
break;
|
||||
case Clutter.Right:
|
||||
direction = isLtr
|
||||
? St.DirectionType.TAB_FORWARD
|
||||
: St.DirectionType.TAB_BACKWARD;
|
||||
direction = isLtr ? St.DirectionType.TAB_FORWARD :
|
||||
St.DirectionType.TAB_BACKWARD;
|
||||
break;
|
||||
case Clutter.Up:
|
||||
direction = St.DirectionType.TAB_BACKWARD;
|
||||
break;
|
||||
case Clutter.Left:
|
||||
direction = isLtr
|
||||
? St.DirectionType.TAB_BACKWARD
|
||||
: St.DirectionType.TAB_FORWARD;
|
||||
direction = isLtr ? St.DirectionType.TAB_BACKWARD :
|
||||
St.DirectionType.TAB_FORWARD;
|
||||
break;
|
||||
default:
|
||||
return Clutter.EVENT_PROPAGATE;
|
||||
@@ -2038,10 +1816,17 @@ var AppIcon = class AppIcon {
|
||||
x_fill: true,
|
||||
y_fill: true });
|
||||
|
||||
this._dot = new St.Widget({ style_class: 'app-well-app-running-dot',
|
||||
layout_manager: new Clutter.BinLayout(),
|
||||
x_expand: true, y_expand: true,
|
||||
x_align: Clutter.ActorAlign.CENTER,
|
||||
y_align: Clutter.ActorAlign.END });
|
||||
|
||||
this._iconContainer = new St.Widget({ layout_manager: new Clutter.BinLayout(),
|
||||
x_expand: true, y_expand: true });
|
||||
|
||||
this.actor.set_child(this._iconContainer);
|
||||
this._iconContainer.add_child(this._dot);
|
||||
|
||||
this.actor._delegate = this;
|
||||
|
||||
@@ -2058,16 +1843,6 @@ var AppIcon = class AppIcon {
|
||||
this.icon = new IconGrid.BaseIcon(app.get_name(), iconParams);
|
||||
this._iconContainer.add_child(this.icon);
|
||||
|
||||
this._dot = new St.Widget({
|
||||
style_class: 'app-well-app-running-dot',
|
||||
layout_manager: new Clutter.BinLayout(),
|
||||
x_expand: true,
|
||||
y_expand: true,
|
||||
x_align: Clutter.ActorAlign.CENTER,
|
||||
y_align: Clutter.ActorAlign.END,
|
||||
});
|
||||
this._iconContainer.add_child(this._dot);
|
||||
|
||||
this.actor.label_actor = this.icon.label;
|
||||
|
||||
this.actor.connect('leave-event', this._onLeaveEvent.bind(this));
|
||||
@@ -2098,7 +1873,6 @@ var AppIcon = class AppIcon {
|
||||
});
|
||||
}
|
||||
|
||||
this._dragMonitor = null;
|
||||
this._itemDragBeginId = Main.overview.connect(
|
||||
'item-drag-begin', this._onDragBegin.bind(this));
|
||||
this._itemDragEndId = Main.overview.connect(
|
||||
@@ -2123,12 +1897,6 @@ var AppIcon = class AppIcon {
|
||||
}
|
||||
if (this._stateChangedId > 0)
|
||||
this.app.disconnect(this._stateChangedId);
|
||||
|
||||
if (this._dragMonitor) {
|
||||
DND.removeDragMonitor(this._dragMonitor);
|
||||
this._dragMonitor = null;
|
||||
}
|
||||
|
||||
if (this._draggable) {
|
||||
if (this._dragging)
|
||||
Main.overview.endItemDrag(this);
|
||||
@@ -2144,7 +1912,7 @@ var AppIcon = class AppIcon {
|
||||
|
||||
_removeMenuTimeout() {
|
||||
if (this._menuTimeoutId > 0) {
|
||||
GLib.source_remove(this._menuTimeoutId);
|
||||
Mainloop.source_remove(this._menuTimeoutId);
|
||||
this._menuTimeoutId = 0;
|
||||
}
|
||||
}
|
||||
@@ -2158,7 +1926,7 @@ var AppIcon = class AppIcon {
|
||||
|
||||
_setPopupTimeout() {
|
||||
this._removeMenuTimeout();
|
||||
this._menuTimeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, MENU_POPUP_TIMEOUT, () => {
|
||||
this._menuTimeoutId = Mainloop.timeout_add(MENU_POPUP_TIMEOUT, () => {
|
||||
this._menuTimeoutId = 0;
|
||||
this.popupMenu();
|
||||
return GLib.SOURCE_REMOVE;
|
||||
@@ -2276,10 +2044,6 @@ var AppIcon = class AppIcon {
|
||||
this.icon.animateZoomOut();
|
||||
}
|
||||
|
||||
animateLaunchAtPos(x, y) {
|
||||
this.icon.animateZoomOutAtPos(x, y);
|
||||
}
|
||||
|
||||
scaleIn() {
|
||||
this.actor.scale_x = 0;
|
||||
this.actor.scale_y = 0;
|
||||
@@ -2287,16 +2051,13 @@ var AppIcon = class AppIcon {
|
||||
this.actor.ease({
|
||||
scale_x: 1,
|
||||
scale_y: 1,
|
||||
duration: APP_ICON_SCALE_IN_TIME,
|
||||
time: APP_ICON_SCALE_IN_TIME,
|
||||
delay: APP_ICON_SCALE_IN_DELAY,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUINT
|
||||
});
|
||||
}
|
||||
|
||||
shellWorkspaceLaunch(params) {
|
||||
let { stack } = new Error();
|
||||
log(`shellWorkspaceLaunch is deprecated, use app.open_new_window() instead\n${stack}`);
|
||||
|
||||
params = Params.parse(params, { workspace: -1,
|
||||
timestamp: 0 });
|
||||
|
||||
@@ -2473,8 +2234,8 @@ var AppIconMenu = class AppIconMenu extends PopupMenu.PopupMenu {
|
||||
);
|
||||
|
||||
windows.forEach(window => {
|
||||
let title = window.title
|
||||
? window.title : this._source.app.get_name();
|
||||
let title = window.title ? window.title
|
||||
: this._source.app.get_name();
|
||||
let item = this._appendMenuItem(title);
|
||||
item.connect('activate', () => {
|
||||
this.emit('activate-window', window);
|
||||
|
||||
@@ -147,11 +147,12 @@ class AppFavorites {
|
||||
|
||||
let app = Shell.AppSystem.get_default().lookup_app(appId);
|
||||
|
||||
let msg = _("%s has been added to your favorites.").format(app.get_name());
|
||||
Main.overview.setMessage(msg, {
|
||||
forFeedback: true,
|
||||
undoCallback: () => this._removeFavorite(appId),
|
||||
});
|
||||
Main.overview.setMessage(_("%s has been added to your favorites.").format(app.get_name()),
|
||||
{ forFeedback: true,
|
||||
undoCallback: () => {
|
||||
this._removeFavorite(appId);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
addFavorite(appId) {
|
||||
@@ -180,11 +181,12 @@ class AppFavorites {
|
||||
if (!this._removeFavorite(appId))
|
||||
return;
|
||||
|
||||
let msg = _("%s has been removed from your favorites.").format(app.get_name());
|
||||
Main.overview.setMessage(msg, {
|
||||
forFeedback: true,
|
||||
undoCallback: () => this._addFavorite(appId, pos),
|
||||
});
|
||||
Main.overview.setMessage(_("%s has been removed from your favorites.").format(app.get_name()),
|
||||
{ forFeedback: true,
|
||||
undoCallback: () => {
|
||||
this._addFavorite(appId, pos);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
Signals.addSignalMethods(AppFavorites.prototype);
|
||||
|
||||
@@ -161,7 +161,7 @@ var AudioDeviceSelectionDBus = class AudioDeviceSelectionDBus {
|
||||
|
||||
let [deviceNames] = params;
|
||||
let devices = 0;
|
||||
deviceNames.forEach(n => (devices |= AudioDevice[n.toUpperCase()]));
|
||||
deviceNames.forEach(n => devices |= AudioDevice[n.toUpperCase()]);
|
||||
|
||||
let dialog;
|
||||
try {
|
||||
|
||||
@@ -441,21 +441,20 @@ var Background = class Background {
|
||||
}
|
||||
|
||||
_loadAnimation(file) {
|
||||
this._cache.getAnimation({
|
||||
file: file,
|
||||
settingsSchema: this._settings.schema_id,
|
||||
onLoaded: animation => {
|
||||
this._animation = animation;
|
||||
this._cache.getAnimation({ file: file,
|
||||
settingsSchema: this._settings.schema_id,
|
||||
onLoaded: animation => {
|
||||
this._animation = animation;
|
||||
|
||||
if (!this._animation || this._cancellable.is_cancelled()) {
|
||||
this._setLoaded();
|
||||
return;
|
||||
}
|
||||
if (!this._animation || this._cancellable.is_cancelled()) {
|
||||
this._setLoaded();
|
||||
return;
|
||||
}
|
||||
|
||||
this._updateAnimation();
|
||||
this._watchFile(file);
|
||||
}
|
||||
});
|
||||
this._updateAnimation();
|
||||
this._watchFile(file);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
_loadImage(file) {
|
||||
@@ -749,14 +748,13 @@ var BackgroundManager = class BackgroundManager {
|
||||
|
||||
_createBackgroundActor() {
|
||||
let background = this._backgroundSource.getBackground(this._monitorIndex);
|
||||
let backgroundActor = new Meta.BackgroundActor({
|
||||
meta_display: global.display,
|
||||
monitor: this._monitorIndex,
|
||||
background: background.background,
|
||||
vignette: this._vignette,
|
||||
vignette_sharpness: 0.5,
|
||||
brightness: 0.5,
|
||||
});
|
||||
let backgroundActor = new Meta.BackgroundActor({ meta_display: global.display,
|
||||
monitor: this._monitorIndex,
|
||||
background: background.background,
|
||||
vignette: this._vignette,
|
||||
vignette_sharpness: 0.5,
|
||||
brightness: 0.5,
|
||||
});
|
||||
|
||||
this._container.add_child(backgroundActor);
|
||||
|
||||
|
||||
@@ -31,7 +31,7 @@ function addBackgroundMenu(actor, layoutManager) {
|
||||
|
||||
function openMenu(x, y) {
|
||||
Main.layoutManager.setDummyCursorGeometry(x, y, 0, 0);
|
||||
actor._backgroundMenu.open(BoxPointer.PopupAnimation.FULL);
|
||||
actor._backgroundMenu.open(BoxPointer.PopupAnimation.NONE);
|
||||
}
|
||||
|
||||
let clickAction = new Clutter.ClickAction();
|
||||
|
||||
@@ -172,8 +172,8 @@ var BoxPointer = GObject.registerClass({
|
||||
let borderWidth = themeNode.get_length('-arrow-border-width');
|
||||
minSize += borderWidth * 2;
|
||||
natSize += borderWidth * 2;
|
||||
if ((!isWidth && (this._arrowSide == St.Side.TOP || this._arrowSide == St.Side.BOTTOM)) ||
|
||||
(isWidth && (this._arrowSide == St.Side.LEFT || this._arrowSide == St.Side.RIGHT))) {
|
||||
if ((!isWidth && (this._arrowSide == St.Side.TOP || this._arrowSide == St.Side.BOTTOM))
|
||||
|| (isWidth && (this._arrowSide == St.Side.LEFT || this._arrowSide == St.Side.RIGHT))) {
|
||||
let rise = themeNode.get_length('-arrow-rise');
|
||||
minSize += rise;
|
||||
natSize += rise;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
|
||||
/* exported Calendar, CalendarMessageList */
|
||||
|
||||
const { Clutter, Gio, GLib, GObject, Shell, St } = imports.gi;
|
||||
const { Clutter, Gio, GLib, Shell, St } = imports.gi;
|
||||
const Signals = imports.signals;
|
||||
|
||||
const Main = imports.ui.main;
|
||||
@@ -581,9 +581,8 @@ var Calendar = class Calendar {
|
||||
if (row == 2)
|
||||
styleClass = `calendar-day-top ${styleClass}`;
|
||||
|
||||
let leftMost = rtl
|
||||
? iter.getDay() == (this._weekStart + 6) % 7
|
||||
: iter.getDay() == this._weekStart;
|
||||
let leftMost = rtl ? iter.getDay() == (this._weekStart + 6) % 7
|
||||
: iter.getDay() == this._weekStart;
|
||||
if (leftMost)
|
||||
styleClass = `calendar-day-left ${styleClass}`;
|
||||
|
||||
@@ -681,24 +680,23 @@ var EventMessage = class EventMessage extends MessageList.Message {
|
||||
*/
|
||||
title = C_("event list time", "All Day");
|
||||
} else {
|
||||
let date = this._event.date >= periodBegin
|
||||
? this._event.date
|
||||
: this._event.end;
|
||||
let date = this._event.date >= periodBegin ? this._event.date
|
||||
: this._event.end;
|
||||
title = Util.formatTime(date, { timeOnly: true });
|
||||
}
|
||||
|
||||
let rtl = Clutter.get_default_text_direction() == Clutter.TextDirection.RTL;
|
||||
if (this._event.date < periodBegin && !this._event.allDay) {
|
||||
if (rtl)
|
||||
title = `${title}${ELLIPSIS_CHAR}`;
|
||||
title = title + ELLIPSIS_CHAR;
|
||||
else
|
||||
title = `${ELLIPSIS_CHAR}${title}`;
|
||||
title = ELLIPSIS_CHAR + title;
|
||||
}
|
||||
if (this._event.end > periodEnd && !this._event.allDay) {
|
||||
if (rtl)
|
||||
title = `${ELLIPSIS_CHAR}${title}`;
|
||||
title = ELLIPSIS_CHAR + title;
|
||||
else
|
||||
title = `${title}${ELLIPSIS_CHAR}`;
|
||||
title = title + ELLIPSIS_CHAR;
|
||||
}
|
||||
return title;
|
||||
}
|
||||
@@ -1073,14 +1071,10 @@ var CalendarMessageList = class CalendarMessageList {
|
||||
this._clearButton.set_x_align(Clutter.ActorAlign.END);
|
||||
this._clearButton.connect('clicked', () => {
|
||||
let sections = [...this._sections.keys()];
|
||||
sections.forEach(s => s.clear());
|
||||
sections.forEach((s) => s.clear());
|
||||
});
|
||||
box.add_actor(this._clearButton);
|
||||
|
||||
this._placeholder.actor.bind_property('visible',
|
||||
this._clearButton, 'visible',
|
||||
GObject.BindingFlags.INVERT_BOOLEAN);
|
||||
|
||||
this._sectionList = new St.BoxLayout({ style_class: 'message-list-sections',
|
||||
vertical: true,
|
||||
y_expand: true,
|
||||
@@ -1151,6 +1145,7 @@ var CalendarMessageList = class CalendarMessageList {
|
||||
|
||||
let empty = sections.every(s => s.empty || !s.actor.visible);
|
||||
this._placeholder.actor.visible = empty;
|
||||
this._clearButton.visible = !empty;
|
||||
|
||||
let canClear = sections.some(s => s.canClear && s.actor.visible);
|
||||
this._clearButton.reactive = canClear;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
|
||||
/* exported CloseDialog */
|
||||
|
||||
const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
|
||||
const { Clutter, Gio, GLib, GObject, Meta, Shell } = imports.gi;
|
||||
|
||||
const Dialog = imports.ui.dialog;
|
||||
const Main = imports.ui.main;
|
||||
@@ -46,18 +46,6 @@ var CloseDialog = GObject.registerClass({
|
||||
return new Dialog.MessageDialogContent({ icon, title, subtitle });
|
||||
}
|
||||
|
||||
_updateScale() {
|
||||
// Since this is a child of MetaWindowActor (which, for Wayland clients,
|
||||
// applies the geometry scale factor to its children itself, see
|
||||
// meta_window_actor_set_geometry_scale()), make sure we don't apply
|
||||
// the factor twice in the end.
|
||||
if (this._window.get_client_type() !== Meta.WindowClientType.WAYLAND)
|
||||
return;
|
||||
|
||||
let { scaleFactor } = St.ThemeContext.get_for_stage(global.stage);
|
||||
this._dialog.set_scale(1 / scaleFactor, 1 / scaleFactor);
|
||||
}
|
||||
|
||||
_initDialog() {
|
||||
if (this._dialog)
|
||||
return;
|
||||
@@ -76,11 +64,6 @@ var CloseDialog = GObject.registerClass({
|
||||
key: Clutter.Escape });
|
||||
|
||||
global.focus_manager.add_group(this._dialog);
|
||||
|
||||
let themeContext = St.ThemeContext.get_for_stage(global.stage);
|
||||
themeContext.connect('notify::scale-factor', this._updateScale.bind(this));
|
||||
|
||||
this._updateScale();
|
||||
}
|
||||
|
||||
_addWindowEffect() {
|
||||
@@ -162,10 +145,10 @@ var CloseDialog = GObject.registerClass({
|
||||
this._addWindowEffect();
|
||||
this._initDialog();
|
||||
|
||||
this._dialog._dialog.scale_y = 0;
|
||||
this._dialog._dialog.set_pivot_point(0.5, 0.5);
|
||||
this._dialog.scale_y = 0;
|
||||
this._dialog.set_pivot_point(0.5, 0.5);
|
||||
|
||||
this._dialog._dialog.ease({
|
||||
this._dialog.ease({
|
||||
scale_y: 1,
|
||||
mode: Clutter.AnimationMode.LINEAR,
|
||||
duration: DIALOG_TRANSITION_TIME,
|
||||
@@ -192,7 +175,7 @@ var CloseDialog = GObject.registerClass({
|
||||
this._dialog = null;
|
||||
this._removeWindowEffect();
|
||||
|
||||
dialog._dialog.ease({
|
||||
dialog.ease({
|
||||
scale_y: 0,
|
||||
mode: Clutter.AnimationMode.LINEAR,
|
||||
duration: DIALOG_TRANSITION_TIME,
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
/* exported Component */
|
||||
|
||||
const { Gio, GLib } = imports.gi;
|
||||
const Mainloop = imports.mainloop;
|
||||
const Params = imports.misc.params;
|
||||
|
||||
const GnomeSession = imports.misc.gnomeSession;
|
||||
@@ -38,7 +39,7 @@ var AutomountManager = class {
|
||||
this._driveDisconnectedId = this._volumeMonitor.connect('drive-disconnected', this._onDriveDisconnected.bind(this));
|
||||
this._driveEjectButtonId = this._volumeMonitor.connect('drive-eject-button', this._onDriveEjectButton.bind(this));
|
||||
|
||||
this._mountAllId = GLib.idle_add(GLib.PRIORITY_DEFAULT, this._startupMountAll.bind(this));
|
||||
this._mountAllId = Mainloop.idle_add(this._startupMountAll.bind(this));
|
||||
GLib.Source.set_name_by_id(this._mountAllId, '[gnome-shell] this._startupMountAll');
|
||||
}
|
||||
|
||||
@@ -50,7 +51,7 @@ var AutomountManager = class {
|
||||
this._volumeMonitor.disconnect(this._driveEjectButtonId);
|
||||
|
||||
if (this._mountAllId > 0) {
|
||||
GLib.source_remove(this._mountAllId);
|
||||
Mainloop.source_remove(this._mountAllId);
|
||||
this._mountAllId = 0;
|
||||
}
|
||||
}
|
||||
@@ -156,7 +157,7 @@ var AutomountManager = class {
|
||||
!volume.should_automount() ||
|
||||
!volume.can_mount()) {
|
||||
// allow the autorun to run anyway; this can happen if the
|
||||
// mount gets added programmatically later, even if
|
||||
// mount gets added programmatically later, even if
|
||||
// should_automount() or can_mount() are false, like for
|
||||
// blank optical media.
|
||||
this._allowAutorun(volume);
|
||||
@@ -219,17 +220,17 @@ var AutomountManager = class {
|
||||
|
||||
_onVolumeRemoved(monitor, volume) {
|
||||
if (volume._allowAutorunExpireId && volume._allowAutorunExpireId > 0) {
|
||||
GLib.source_remove(volume._allowAutorunExpireId);
|
||||
Mainloop.source_remove(volume._allowAutorunExpireId);
|
||||
delete volume._allowAutorunExpireId;
|
||||
}
|
||||
this._volumeQueue =
|
||||
this._volumeQueue =
|
||||
this._volumeQueue.filter(element => (element != volume));
|
||||
}
|
||||
|
||||
_reaskPassword(volume) {
|
||||
let prevOperation = this._activeOperations.get(volume);
|
||||
let existingDialog = prevOperation ? prevOperation.borrowDialog() : null;
|
||||
let operation =
|
||||
let operation =
|
||||
new ShellMountOperation.ShellMountOperation(volume,
|
||||
{ existingDialog: existingDialog });
|
||||
this._mountVolume(volume, operation);
|
||||
@@ -248,7 +249,7 @@ var AutomountManager = class {
|
||||
}
|
||||
|
||||
_allowAutorunExpire(volume) {
|
||||
let id = GLib.timeout_add_seconds(GLib.PRIORITY_DEFAULT, AUTORUN_EXPIRE_TIMEOUT_SECS, () => {
|
||||
let id = Mainloop.timeout_add_seconds(AUTORUN_EXPIRE_TIMEOUT_SECS, () => {
|
||||
volume.allowAutorun = false;
|
||||
delete volume._allowAutorunExpireId;
|
||||
return GLib.SOURCE_REMOVE;
|
||||
|
||||
@@ -63,7 +63,7 @@ function startAppForMount(app, mount) {
|
||||
files.push(root);
|
||||
|
||||
try {
|
||||
retval = app.launch(files,
|
||||
retval = app.launch(files,
|
||||
global.create_app_launch_context(0, -1));
|
||||
} catch (e) {
|
||||
log(`Unable to launch the application ${app.get_name()}: ${e}`);
|
||||
@@ -72,6 +72,8 @@ function startAppForMount(app, mount) {
|
||||
return retval;
|
||||
}
|
||||
|
||||
/******************************************/
|
||||
|
||||
const HotplugSnifferIface = loadInterfaceXML('org.gnome.Shell.HotplugSniffer');
|
||||
const HotplugSnifferProxy = Gio.DBusProxy.makeProxyWrapper(HotplugSnifferIface);
|
||||
function HotplugSniffer() {
|
||||
@@ -115,9 +117,9 @@ var ContentTypeDiscoverer = class {
|
||||
|
||||
let hotplugSniffer = new HotplugSniffer();
|
||||
hotplugSniffer.SniffURIRemote(root.get_uri(),
|
||||
([contentTypes]) => {
|
||||
this._emitCallback(mount, contentTypes);
|
||||
});
|
||||
([contentTypes]) => {
|
||||
this._emitCallback(mount, contentTypes);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -213,11 +215,11 @@ var AutorunDispatcher = class {
|
||||
}
|
||||
|
||||
_addSource(mount, apps) {
|
||||
// if we already have a source showing for this
|
||||
// if we already have a source showing for this
|
||||
// mount, return
|
||||
if (this._getSourceForMount(mount))
|
||||
return;
|
||||
|
||||
|
||||
// add a new source
|
||||
this._sources.push(new AutorunSource(this._manager, mount, apps));
|
||||
}
|
||||
@@ -262,7 +264,7 @@ var AutorunDispatcher = class {
|
||||
|
||||
removeMount(mount) {
|
||||
let source = this._getSourceForMount(mount);
|
||||
|
||||
|
||||
// if we aren't tracking this mount, don't do anything
|
||||
if (!source)
|
||||
return;
|
||||
@@ -323,10 +325,10 @@ var AutorunNotification = class extends MessageTray.Notification {
|
||||
style_class: 'hotplug-notification-item-icon' });
|
||||
box.add(icon);
|
||||
|
||||
let label = new St.Bin({
|
||||
y_align: St.Align.MIDDLE,
|
||||
child: new St.Label({ text: _("Open with %s").format(app.get_name()) }),
|
||||
});
|
||||
let label = new St.Bin({ y_align: St.Align.MIDDLE,
|
||||
child: new St.Label
|
||||
({ text: _("Open with %s").format(app.get_name()) })
|
||||
});
|
||||
box.add(label);
|
||||
|
||||
let button = new St.Button({ child: box,
|
||||
|
||||
@@ -74,9 +74,7 @@ class KeyringDialog extends ModalDialog.ModalDialog {
|
||||
ShellEntry.addContextMenu(this._passwordEntry, { isPassword: true });
|
||||
this._passwordEntry.clutter_text.connect('activate', this._onPasswordActivate.bind(this));
|
||||
|
||||
this._workSpinner = new Animation.Spinner(WORK_SPINNER_ICON_SIZE, {
|
||||
animate: true,
|
||||
});
|
||||
this._workSpinner = new Animation.Spinner(WORK_SPINNER_ICON_SIZE, true);
|
||||
|
||||
if (rtl) {
|
||||
layout.attach(this._workSpinner.actor, 0, row, 1, 1);
|
||||
@@ -234,9 +232,8 @@ var KeyringPrompter = class {
|
||||
constructor() {
|
||||
this._prompter = new Gcr.SystemPrompter();
|
||||
this._prompter.connect('new-prompt', () => {
|
||||
let dialog = this._enabled
|
||||
? new KeyringDialog()
|
||||
: new KeyringDummyDialog();
|
||||
let dialog = this._enabled ? new KeyringDialog()
|
||||
: new KeyringDummyDialog();
|
||||
this._currentPrompt = dialog.prompt;
|
||||
return this._currentPrompt;
|
||||
});
|
||||
|
||||
@@ -112,17 +112,16 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog {
|
||||
expand: true });
|
||||
}
|
||||
|
||||
this._okButton = {
|
||||
label: _("Connect"),
|
||||
action: this._onOk.bind(this),
|
||||
default: true,
|
||||
};
|
||||
this._okButton = { label: _("Connect"),
|
||||
action: this._onOk.bind(this),
|
||||
default: true
|
||||
};
|
||||
|
||||
this.setButtons([{
|
||||
label: _("Cancel"),
|
||||
action: this.cancel.bind(this),
|
||||
key: Clutter.KEY_Escape,
|
||||
}, this._okButton]);
|
||||
this.setButtons([{ label: _("Cancel"),
|
||||
action: this.cancel.bind(this),
|
||||
key: Clutter.KEY_Escape,
|
||||
},
|
||||
this._okButton]);
|
||||
|
||||
this._updateOkButton();
|
||||
}
|
||||
@@ -164,9 +163,9 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog {
|
||||
if (value.length == 64) {
|
||||
// must be composed of hexadecimal digits only
|
||||
for (let i = 0; i < 64; i++) {
|
||||
if (!((value[i] >= 'a' && value[i] <= 'f') ||
|
||||
(value[i] >= 'A' && value[i] <= 'F') ||
|
||||
(value[i] >= '0' && value[i] <= '9')))
|
||||
if (!((value[i] >= 'a' && value[i] <= 'f')
|
||||
|| (value[i] >= 'A' && value[i] <= 'F')
|
||||
|| (value[i] >= '0' && value[i] <= '9')))
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
@@ -180,15 +179,15 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog {
|
||||
if (secret.wep_key_type == NM.WepKeyType.KEY) {
|
||||
if (value.length == 10 || value.length == 26) {
|
||||
for (let i = 0; i < value.length; i++) {
|
||||
if (!((value[i] >= 'a' && value[i] <= 'f') ||
|
||||
(value[i] >= 'A' && value[i] <= 'F') ||
|
||||
(value[i] >= '0' && value[i] <= '9')))
|
||||
if (!((value[i] >= 'a' && value[i] <= 'f')
|
||||
|| (value[i] >= 'A' && value[i] <= 'F')
|
||||
|| (value[i] >= '0' && value[i] <= '9')))
|
||||
return false;
|
||||
}
|
||||
} else if (value.length == 5 || value.length == 13) {
|
||||
for (let i = 0; i < value.length; i++) {
|
||||
if (!((value[i] >= 'a' && value[i] <= 'z') ||
|
||||
(value[i] >= 'A' && value[i] <= 'Z')))
|
||||
if (!((value[i] >= 'a' && value[i] <= 'z')
|
||||
|| (value[i] >= 'A' && value[i] <= 'Z')))
|
||||
return false;
|
||||
}
|
||||
} else {
|
||||
@@ -213,7 +212,6 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog {
|
||||
// First the easy ones
|
||||
case 'wpa-none':
|
||||
case 'wpa-psk':
|
||||
case 'sae':
|
||||
secrets.push({ label: _("Password: "), key: 'psk',
|
||||
value: wirelessSecuritySetting.psk || '',
|
||||
validate: this._validateWpaPsk, password: true });
|
||||
@@ -553,12 +551,11 @@ var VPNRequestHandler = class {
|
||||
let shouldAsk = keyfile.get_boolean(groups[i], 'ShouldAsk');
|
||||
|
||||
if (shouldAsk) {
|
||||
contentOverride.secrets.push({
|
||||
label: keyfile.get_string(groups[i], 'Label'),
|
||||
key: groups[i],
|
||||
value: value,
|
||||
password: keyfile.get_boolean(groups[i], 'IsSecret'),
|
||||
});
|
||||
contentOverride.secrets.push({ label: keyfile.get_string(groups[i], 'Label'),
|
||||
key: groups[i],
|
||||
value: value,
|
||||
password: keyfile.get_boolean(groups[i], 'IsSecret')
|
||||
});
|
||||
} else {
|
||||
if (!value.length) // Ignore empty secrets
|
||||
continue;
|
||||
@@ -612,11 +609,10 @@ Signals.addSignalMethods(VPNRequestHandler.prototype);
|
||||
|
||||
var NetworkAgent = class {
|
||||
constructor() {
|
||||
this._native = new Shell.NetworkAgent({
|
||||
identifier: 'org.gnome.Shell.NetworkAgent',
|
||||
capabilities: NM.SecretAgentCapabilities.VPN_HINTS,
|
||||
auto_register: false,
|
||||
});
|
||||
this._native = new Shell.NetworkAgent({ identifier: 'org.gnome.Shell.NetworkAgent',
|
||||
capabilities: NM.SecretAgentCapabilities.VPN_HINTS,
|
||||
auto_register: false
|
||||
});
|
||||
|
||||
this._dialogs = { };
|
||||
this._vpnRequests = { };
|
||||
@@ -625,7 +621,7 @@ var NetworkAgent = class {
|
||||
this._pluginDir = Gio.file_new_for_path(Config.VPNDIR);
|
||||
try {
|
||||
let monitor = this._pluginDir.monitor(Gio.FileMonitorFlags.NONE, null);
|
||||
monitor.connect('changed', () => (this._vpnCacheBuilt = false));
|
||||
monitor.connect('changed', () => this._vpnCacheBuilt = false);
|
||||
} catch (e) {
|
||||
log(`Failed to create monitor for VPN plugin dir: ${e.message}`);
|
||||
}
|
||||
|
||||
@@ -11,11 +11,6 @@ const ModalDialog = imports.ui.modalDialog;
|
||||
const ShellEntry = imports.ui.shellEntry;
|
||||
const UserWidget = imports.ui.userWidget;
|
||||
|
||||
const DialogMode = {
|
||||
AUTH: 0,
|
||||
CONFIRM: 1,
|
||||
};
|
||||
|
||||
var DIALOG_ICON_SIZE = 48;
|
||||
|
||||
var WORK_SPINNER_ICON_SIZE = 16;
|
||||
@@ -56,32 +51,47 @@ var AuthenticationDialog = GObject.registerClass({
|
||||
userName = userNames[0];
|
||||
|
||||
this._user = AccountsService.UserManager.get_default().get_user(userName);
|
||||
let userRealName = this._user.get_real_name();
|
||||
this._userLoadedId = this._user.connect('notify::is_loaded',
|
||||
this._onUserChanged.bind(this));
|
||||
this._userChangedId = this._user.connect('changed',
|
||||
this._onUserChanged.bind(this));
|
||||
|
||||
let userBox = new St.BoxLayout({
|
||||
style_class: 'polkit-dialog-user-layout',
|
||||
vertical: false,
|
||||
});
|
||||
content.messageBox.add(userBox);
|
||||
// Special case 'root'
|
||||
let userIsRoot = false;
|
||||
if (userName == 'root') {
|
||||
userIsRoot = true;
|
||||
userRealName = _("Administrator");
|
||||
}
|
||||
|
||||
this._userAvatar = new UserWidget.Avatar(this._user, {
|
||||
iconSize: DIALOG_ICON_SIZE,
|
||||
styleClass: 'polkit-dialog-user-icon',
|
||||
});
|
||||
this._userAvatar.actor.hide();
|
||||
userBox.add_child(this._userAvatar.actor);
|
||||
if (userIsRoot) {
|
||||
let userLabel = new St.Label(({ style_class: 'polkit-dialog-user-root-label',
|
||||
text: userRealName }));
|
||||
content.messageBox.add(userLabel, { x_fill: false,
|
||||
x_align: St.Align.START });
|
||||
} else {
|
||||
let userBox = new St.BoxLayout({ style_class: 'polkit-dialog-user-layout',
|
||||
vertical: false });
|
||||
content.messageBox.add(userBox);
|
||||
this._userAvatar = new UserWidget.Avatar(this._user,
|
||||
{ iconSize: DIALOG_ICON_SIZE,
|
||||
styleClass: 'polkit-dialog-user-icon' });
|
||||
this._userAvatar.actor.hide();
|
||||
userBox.add(this._userAvatar.actor,
|
||||
{ x_fill: true,
|
||||
y_fill: false,
|
||||
x_align: St.Align.END,
|
||||
y_align: St.Align.START });
|
||||
let userLabel = new St.Label(({ style_class: 'polkit-dialog-user-label',
|
||||
text: userRealName }));
|
||||
userBox.add(userLabel,
|
||||
{ x_fill: true,
|
||||
y_fill: false,
|
||||
x_align: St.Align.END,
|
||||
y_align: St.Align.MIDDLE });
|
||||
}
|
||||
|
||||
this._userLabel = new St.Label({
|
||||
style_class: userName === 'root'
|
||||
? 'polkit-dialog-user-root-label'
|
||||
: 'polkit-dialog-user-label',
|
||||
x_expand: true,
|
||||
y_align: Clutter.ActorAlign.CENTER,
|
||||
});
|
||||
|
||||
if (userName === 'root')
|
||||
this._userLabel.text = _('Administrator');
|
||||
|
||||
userBox.add_child(this._userLabel);
|
||||
this._onUserChanged();
|
||||
|
||||
this._passwordBox = new St.BoxLayout({ vertical: false, style_class: 'prompt-dialog-password-box' });
|
||||
content.messageBox.add(this._passwordBox);
|
||||
@@ -95,9 +105,7 @@ var AuthenticationDialog = GObject.registerClass({
|
||||
this._passwordBox.add(this._passwordEntry,
|
||||
{ expand: true });
|
||||
|
||||
this._workSpinner = new Animation.Spinner(WORK_SPINNER_ICON_SIZE, {
|
||||
animate: true,
|
||||
});
|
||||
this._workSpinner = new Animation.Spinner(WORK_SPINNER_ICON_SIZE, true);
|
||||
this._passwordBox.add(this._workSpinner.actor);
|
||||
|
||||
this.setInitialKeyFocus(this._passwordEntry);
|
||||
@@ -136,16 +144,8 @@ var AuthenticationDialog = GObject.registerClass({
|
||||
|
||||
this._doneEmitted = false;
|
||||
|
||||
this._mode = -1;
|
||||
|
||||
this._identityToAuth = Polkit.UnixUser.new_for_name(userName);
|
||||
this._cookie = cookie;
|
||||
|
||||
this._userLoadedId = this._user.connect('notify::is-loaded',
|
||||
this._onUserChanged.bind(this));
|
||||
this._userChangedId = this._user.connect('changed',
|
||||
this._onUserChanged.bind(this));
|
||||
this._onUserChanged();
|
||||
}
|
||||
|
||||
_setWorking(working) {
|
||||
@@ -155,9 +155,8 @@ var AuthenticationDialog = GObject.registerClass({
|
||||
this._workSpinner.stop();
|
||||
}
|
||||
|
||||
_initiateSession() {
|
||||
performAuthentication() {
|
||||
this._destroySession();
|
||||
|
||||
this._session = new PolkitAgent.Session({ identity: this._identityToAuth,
|
||||
cookie: this._cookie });
|
||||
this._sessionCompletedId = this._session.connect('completed', this._onSessionCompleted.bind(this));
|
||||
@@ -217,10 +216,7 @@ var AuthenticationDialog = GObject.registerClass({
|
||||
}
|
||||
|
||||
_onAuthenticateButtonPressed() {
|
||||
if (this._mode === DialogMode.CONFIRM)
|
||||
this._initiateSession();
|
||||
else
|
||||
this._onEntryActivate();
|
||||
this._onEntryActivate();
|
||||
}
|
||||
|
||||
_onSessionCompleted(session, gainedAuthorization) {
|
||||
@@ -251,7 +247,7 @@ var AuthenticationDialog = GObject.registerClass({
|
||||
}
|
||||
|
||||
/* Try and authenticate again */
|
||||
this._initiateSession();
|
||||
this.performAuthentication();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -307,40 +303,10 @@ var AuthenticationDialog = GObject.registerClass({
|
||||
}
|
||||
|
||||
_onUserChanged() {
|
||||
if (!this._user.is_loaded)
|
||||
return;
|
||||
|
||||
let userName = this._user.get_user_name();
|
||||
let realName = this._user.get_real_name();
|
||||
|
||||
if (userName !== 'root') {
|
||||
this._userLabel.set_text(realName);
|
||||
|
||||
if (this._user.is_loaded && this._userAvatar) {
|
||||
this._userAvatar.update();
|
||||
this._userAvatar.actor.show();
|
||||
}
|
||||
|
||||
if (this._user.get_password_mode() === AccountsService.UserPasswordMode.NONE) {
|
||||
if (this._mode === DialogMode.CONFIRM)
|
||||
return;
|
||||
|
||||
this._mode = DialogMode.CONFIRM;
|
||||
this._destroySession();
|
||||
|
||||
this._okButton.reactive = true;
|
||||
|
||||
/* We normally open the dialog when we get a "request" signal, but
|
||||
* since in this case initiating a session would perform the
|
||||
* authentication, only open the dialog and initiate the session
|
||||
* when the user confirmed. */
|
||||
this._ensureOpen();
|
||||
} else {
|
||||
if (this._mode === DialogMode.AUTH)
|
||||
return;
|
||||
|
||||
this._mode = DialogMode.AUTH;
|
||||
this._initiateSession();
|
||||
}
|
||||
}
|
||||
|
||||
cancel() {
|
||||
@@ -403,7 +369,19 @@ var AuthenticationAgent = class {
|
||||
}
|
||||
|
||||
this._currentDialog = new AuthenticationDialog(actionId, message, cookie, userNames);
|
||||
|
||||
// We actually don't want to open the dialog until we know for
|
||||
// sure that we're going to interact with the user. For
|
||||
// example, if the password for the identity to auth is blank
|
||||
// (which it will be on a live CD) then there will be no
|
||||
// conversation at all... of course, we don't *know* that
|
||||
// until we actually try it.
|
||||
//
|
||||
// See https://bugzilla.gnome.org/show_bug.cgi?id=643062 for more
|
||||
// discussion.
|
||||
|
||||
this._currentDialog.connect('done', this._onDialogDone.bind(this));
|
||||
this._currentDialog.performAuthentication();
|
||||
}
|
||||
|
||||
_onCancel(_nativeAgent) {
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
|
||||
const { Clutter, Gio, GLib, GObject, St } = imports.gi;
|
||||
const Lang = imports.lang;
|
||||
const Mainloop = imports.mainloop;
|
||||
|
||||
var Tpl = null;
|
||||
var Tp = null;
|
||||
@@ -545,8 +546,8 @@ var ChatSource = class extends MessageTray.Source {
|
||||
// Wait a bit before notifying for the received message, a handler
|
||||
// could ack it in the meantime.
|
||||
if (this._notifyTimeoutId != 0)
|
||||
GLib.source_remove(this._notifyTimeoutId);
|
||||
this._notifyTimeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, 500,
|
||||
Mainloop.source_remove(this._notifyTimeoutId);
|
||||
this._notifyTimeoutId = Mainloop.timeout_add(500,
|
||||
this._notifyTimeout.bind(this));
|
||||
GLib.Source.set_name_by_id(this._notifyTimeoutId, '[gnome-shell] this._notifyTimeout');
|
||||
}
|
||||
@@ -583,7 +584,7 @@ var ChatSource = class extends MessageTray.Source {
|
||||
|
||||
let msg = Tp.ClientMessage.new_text(type, text);
|
||||
this._channel.send_message_async(msg, 0, (src, result) => {
|
||||
this._channel.send_message_finish(result);
|
||||
this._channel.send_message_finish(result);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -640,7 +641,7 @@ var ChatNotification = class extends MessageTray.Notification {
|
||||
|
||||
destroy(reason) {
|
||||
if (this._timestampTimeoutId)
|
||||
GLib.source_remove(this._timestampTimeoutId);
|
||||
Mainloop.source_remove(this._timestampTimeoutId);
|
||||
this._timestampTimeoutId = 0;
|
||||
super.destroy(reason);
|
||||
}
|
||||
@@ -653,7 +654,7 @@ var ChatNotification = class extends MessageTray.Notification {
|
||||
* sender: the name of the sender,
|
||||
* timestamp: the time the message was sent
|
||||
* direction: a #NotificationDirection
|
||||
*
|
||||
*
|
||||
* @noTimestamp: Whether to add a timestamp. If %true, no timestamp
|
||||
* will be added, regardless of the difference since the
|
||||
* last timestamp
|
||||
@@ -673,8 +674,8 @@ var ChatNotification = class extends MessageTray.Notification {
|
||||
{ datetime: GLib.DateTime.new_from_unix_local (message.timestamp),
|
||||
bannerMarkup: true });
|
||||
|
||||
let group = (message.direction == NotificationDirection.RECEIVED
|
||||
? 'received' : 'sent');
|
||||
let group = (message.direction == NotificationDirection.RECEIVED ?
|
||||
'received' : 'sent');
|
||||
|
||||
this._append({ body: messageBody,
|
||||
group: group,
|
||||
@@ -696,8 +697,8 @@ var ChatNotification = class extends MessageTray.Notification {
|
||||
// SCROLLBACK_RECENT_LENGTH previous messages. Otherwise
|
||||
// we'll keep SCROLLBACK_IDLE_LENGTH messages.
|
||||
|
||||
let maxLength = (lastMessageTime < currentTime - SCROLLBACK_RECENT_TIME)
|
||||
? SCROLLBACK_IDLE_LENGTH : SCROLLBACK_RECENT_LENGTH;
|
||||
let maxLength = (lastMessageTime < currentTime - SCROLLBACK_RECENT_TIME) ?
|
||||
SCROLLBACK_IDLE_LENGTH : SCROLLBACK_RECENT_LENGTH;
|
||||
|
||||
let filteredHistory = this.messages.filter(item => item.realMessage);
|
||||
if (filteredHistory.length > maxLength) {
|
||||
@@ -728,7 +729,7 @@ var ChatNotification = class extends MessageTray.Notification {
|
||||
|
||||
// Reset the old message timeout
|
||||
if (this._timestampTimeoutId)
|
||||
GLib.source_remove(this._timestampTimeoutId);
|
||||
Mainloop.source_remove(this._timestampTimeoutId);
|
||||
this._timestampTimeoutId = 0;
|
||||
|
||||
let message = { realMessage: props.group != 'meta',
|
||||
@@ -746,8 +747,7 @@ var ChatNotification = class extends MessageTray.Notification {
|
||||
} else {
|
||||
// Schedule a new timestamp in SCROLLBACK_IMMEDIATE_TIME
|
||||
// from the timestamp of the message.
|
||||
this._timestampTimeoutId = GLib.timeout_add_seconds(
|
||||
GLib.PRIORITY_DEFAULT,
|
||||
this._timestampTimeoutId = Mainloop.timeout_add_seconds(
|
||||
SCROLLBACK_IMMEDIATE_TIME - (currentTime - timestamp),
|
||||
this.appendTimestamp.bind(this));
|
||||
GLib.Source.set_name_by_id(this._timestampTimeoutId, '[gnome-shell] this.appendTimestamp');
|
||||
@@ -952,15 +952,14 @@ var ChatNotificationBanner = class extends MessageTray.NotificationBanner {
|
||||
|
||||
// Remove composing timeout.
|
||||
if (this._composingTimeoutId > 0) {
|
||||
GLib.source_remove(this._composingTimeoutId);
|
||||
Mainloop.source_remove(this._composingTimeoutId);
|
||||
this._composingTimeoutId = 0;
|
||||
}
|
||||
|
||||
if (text != '') {
|
||||
this.notification.source.setChatState(Tp.ChannelChatState.COMPOSING);
|
||||
|
||||
this._composingTimeoutId = GLib.timeout_add_seconds(
|
||||
GLib.PRIORITY_DEFAULT,
|
||||
this._composingTimeoutId = Mainloop.timeout_add_seconds(
|
||||
COMPOSING_STOP_TIMEOUT,
|
||||
this._composingStopTimeout.bind(this));
|
||||
GLib.Source.set_name_by_id(this._composingTimeoutId, '[gnome-shell] this._composingStopTimeout');
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
/* exported Dash */
|
||||
|
||||
const { Clutter, GLib, GObject, Meta, Shell, St } = imports.gi;
|
||||
const Mainloop = imports.mainloop;
|
||||
const Signals = imports.signals;
|
||||
|
||||
const AppDisplay = imports.ui.appDisplay;
|
||||
@@ -499,7 +500,7 @@ var Dash = class Dash {
|
||||
// that the notify::hover handler does everything we need to.
|
||||
if (opened) {
|
||||
if (this._showLabelTimeoutId > 0) {
|
||||
GLib.source_remove(this._showLabelTimeoutId);
|
||||
Mainloop.source_remove(this._showLabelTimeoutId);
|
||||
this._showLabelTimeoutId = 0;
|
||||
}
|
||||
|
||||
@@ -513,7 +514,7 @@ var Dash = class Dash {
|
||||
if (shouldShow) {
|
||||
if (this._showLabelTimeoutId == 0) {
|
||||
let timeout = this._labelShowing ? 0 : DASH_ITEM_HOVER_TIMEOUT;
|
||||
this._showLabelTimeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, timeout,
|
||||
this._showLabelTimeoutId = Mainloop.timeout_add(timeout,
|
||||
() => {
|
||||
this._labelShowing = true;
|
||||
item.showLabel();
|
||||
@@ -522,17 +523,17 @@ var Dash = class Dash {
|
||||
});
|
||||
GLib.Source.set_name_by_id(this._showLabelTimeoutId, '[gnome-shell] item.showLabel');
|
||||
if (this._resetHoverTimeoutId > 0) {
|
||||
GLib.source_remove(this._resetHoverTimeoutId);
|
||||
Mainloop.source_remove(this._resetHoverTimeoutId);
|
||||
this._resetHoverTimeoutId = 0;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (this._showLabelTimeoutId > 0)
|
||||
GLib.source_remove(this._showLabelTimeoutId);
|
||||
Mainloop.source_remove(this._showLabelTimeoutId);
|
||||
this._showLabelTimeoutId = 0;
|
||||
item.hideLabel();
|
||||
if (this._labelShowing) {
|
||||
this._resetHoverTimeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, DASH_ITEM_HOVER_TIMEOUT,
|
||||
this._resetHoverTimeoutId = Mainloop.timeout_add(DASH_ITEM_HOVER_TIMEOUT,
|
||||
() => {
|
||||
this._labelShowing = false;
|
||||
this._resetHoverTimeoutId = 0;
|
||||
@@ -623,7 +624,7 @@ var Dash = class Dash {
|
||||
icon.icon.ease({
|
||||
width: targetWidth,
|
||||
height: targetHeight,
|
||||
duration: DASH_ANIMATION_TIME,
|
||||
time: DASH_ANIMATION_TIME,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD
|
||||
});
|
||||
}
|
||||
@@ -703,8 +704,8 @@ var Dash = class Dash {
|
||||
}
|
||||
|
||||
// App moved
|
||||
let nextApp = newApps.length > newIndex + 1
|
||||
? newApps[newIndex + 1] : null;
|
||||
let nextApp = newApps.length > newIndex + 1 ? newApps[newIndex + 1]
|
||||
: null;
|
||||
let insertHere = nextApp && nextApp == oldApp;
|
||||
let alreadyRemoved = removedActors.reduce((result, actor) => {
|
||||
let removedApp = actor.child._delegate.app;
|
||||
|
||||
@@ -30,13 +30,11 @@ var TodayButton = class TodayButton {
|
||||
// Having the ability to go to the current date if the user is already
|
||||
// on the current date can be confusing. So don't make the button reactive
|
||||
// until the selected date changes.
|
||||
this.actor = new St.Button({
|
||||
style_class: 'datemenu-today-button',
|
||||
x_align: St.Align.START,
|
||||
x_expand: true,
|
||||
can_focus: true,
|
||||
reactive: false,
|
||||
});
|
||||
this.actor = new St.Button({ style_class: 'datemenu-today-button',
|
||||
x_expand: true, x_align: St.Align.START,
|
||||
can_focus: true,
|
||||
reactive: false
|
||||
});
|
||||
this.actor.connect('clicked', () => {
|
||||
this._calendar.setDate(new Date(), false);
|
||||
});
|
||||
@@ -148,9 +146,8 @@ var WorldClocksSection = class WorldClocksSection {
|
||||
});
|
||||
|
||||
let layout = this._grid.layout_manager;
|
||||
let title = (this._locations.length == 0)
|
||||
? _("Add world clocks…")
|
||||
: _("World Clocks");
|
||||
let title = (this._locations.length == 0) ? _("Add world clocks…")
|
||||
: _("World Clocks");
|
||||
let header = new St.Label({ style_class: 'world-clocks-header',
|
||||
x_align: Clutter.ActorAlign.START,
|
||||
text: title });
|
||||
@@ -413,7 +410,7 @@ var MessagesIndicator = class MessagesIndicator {
|
||||
|
||||
_updateCount() {
|
||||
let count = 0;
|
||||
this._sources.forEach(source => (count += source.unseenCount));
|
||||
this._sources.forEach(source => count += source.unseenCount);
|
||||
count -= Main.messageTray.queueCount;
|
||||
|
||||
this.actor.visible = (count > 0);
|
||||
|
||||
14
js/ui/dnd.js
14
js/ui/dnd.js
@@ -573,15 +573,11 @@ var _Draggable = class _Draggable {
|
||||
while (target) {
|
||||
if (target._delegate && target._delegate.acceptDrop) {
|
||||
let [r_, targX, targY] = target.transform_stage_point(dropX, dropY);
|
||||
let accepted = false;
|
||||
try {
|
||||
accepted = target._delegate.acceptDrop(this.actor._delegate,
|
||||
this._dragActor, targX, targY, event.get_time());
|
||||
} catch (e) {
|
||||
// On error, skip this target
|
||||
logError(e, "Skipping drag target");
|
||||
}
|
||||
if (accepted) {
|
||||
if (target._delegate.acceptDrop(this.actor._delegate,
|
||||
this._dragActor,
|
||||
targX,
|
||||
targY,
|
||||
event.get_time())) {
|
||||
// If it accepted the drop without taking the actor,
|
||||
// handle it ourselves.
|
||||
if (this._dragActor && this._dragActor.get_parent() == Main.uiGroup) {
|
||||
|
||||
@@ -17,6 +17,8 @@
|
||||
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
const Mainloop = imports.mainloop;
|
||||
|
||||
const { AccountsService, Clutter, Gio,
|
||||
GLib, GObject, Pango, Polkit, Shell, St } = imports.gi;
|
||||
|
||||
@@ -350,15 +352,12 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
|
||||
}
|
||||
|
||||
// It only makes sense to check for this permission if PackageKit is available.
|
||||
Polkit.Permission.new(
|
||||
'org.freedesktop.packagekit.trigger-offline-update', null, null,
|
||||
(source, res) => {
|
||||
try {
|
||||
this._updatesPermission = Polkit.Permission.new_finish(res);
|
||||
} catch (e) {
|
||||
log(`No permission to trigger offline updates: ${e}`);
|
||||
}
|
||||
});
|
||||
try {
|
||||
this._updatesPermission = Polkit.Permission.new_sync(
|
||||
'org.freedesktop.packagekit.trigger-offline-update', null, null);
|
||||
} catch (e) {
|
||||
log('No permission to trigger offline updates: %s'.format(e.toString()));
|
||||
}
|
||||
}
|
||||
|
||||
_onDestroy() {
|
||||
@@ -449,16 +448,14 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
|
||||
for (let i = 0; i < dialogContent.confirmButtons.length; i++) {
|
||||
let signal = dialogContent.confirmButtons[i].signal;
|
||||
let label = dialogContent.confirmButtons[i].label;
|
||||
buttons.push({
|
||||
action: () => {
|
||||
this.close(true);
|
||||
let signalId = this.connect('closed', () => {
|
||||
this.disconnect(signalId);
|
||||
this._confirm(signal);
|
||||
});
|
||||
},
|
||||
label: label,
|
||||
});
|
||||
buttons.push({ action: () => {
|
||||
this.close(true);
|
||||
let signalId = this.connect('closed', () => {
|
||||
this.disconnect(signalId);
|
||||
this._confirm(signal);
|
||||
});
|
||||
},
|
||||
label: label });
|
||||
}
|
||||
|
||||
this.setButtons(buttons);
|
||||
@@ -565,7 +562,7 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
|
||||
let startTime = GLib.get_monotonic_time();
|
||||
this._secondsLeft = this._totalSecondsToStayOpen;
|
||||
|
||||
this._timerId = GLib.timeout_add_seconds(GLib.PRIORITY_DEFAULT, 1, () => {
|
||||
this._timerId = Mainloop.timeout_add_seconds(1, () => {
|
||||
let currentTime = GLib.get_monotonic_time();
|
||||
let secondsElapsed = ((currentTime - startTime) / 1000000);
|
||||
|
||||
@@ -587,7 +584,7 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
|
||||
|
||||
_stopTimer() {
|
||||
if (this._timerId > 0) {
|
||||
GLib.source_remove(this._timerId);
|
||||
Mainloop.source_remove(this._timerId);
|
||||
this._timerId = 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ imports.gi.versions.Gtk = '3.0';
|
||||
imports.gi.versions.TelepathyGLib = '0.12';
|
||||
imports.gi.versions.TelepathyLogger = '0.2';
|
||||
|
||||
const { Clutter, GLib, Meta, Shell, St } = imports.gi;
|
||||
const { Clutter, GLib, Shell, St } = imports.gi;
|
||||
const Gettext = imports.gettext;
|
||||
|
||||
// We can't import shell JS modules yet, because they may have
|
||||
@@ -58,16 +58,17 @@ function _patchLayoutClass(layoutClass, styleProps) {
|
||||
};
|
||||
}
|
||||
|
||||
function _makeEaseCallback(params, cleanup) {
|
||||
function _makeEaseCallback(params) {
|
||||
let onComplete = params.onComplete;
|
||||
delete params.onComplete;
|
||||
|
||||
let onStopped = params.onStopped;
|
||||
delete params.onStopped;
|
||||
|
||||
return isFinished => {
|
||||
cleanup();
|
||||
if (!onComplete && !onStopped)
|
||||
return null;
|
||||
|
||||
return isFinished => {
|
||||
if (onStopped)
|
||||
onStopped(isFinished);
|
||||
if (onComplete && isFinished)
|
||||
@@ -109,8 +110,7 @@ function _easeActor(actor, params) {
|
||||
actor.set_easing_mode(params.mode);
|
||||
delete params.mode;
|
||||
|
||||
let cleanup = () => Meta.enable_unredirect_for_display(global.display);
|
||||
let callback = _makeEaseCallback(params, cleanup);
|
||||
let callback = _makeEaseCallback(params);
|
||||
|
||||
// cancel overwritten transitions
|
||||
let animatedProps = Object.keys(params).map(p => p.replace('_', '-', 'g'));
|
||||
@@ -119,18 +119,14 @@ function _easeActor(actor, params) {
|
||||
actor.set(params);
|
||||
actor.restore_easing_state();
|
||||
|
||||
let transition = animatedProps.map(p => actor.get_transition(p))
|
||||
.find(t => t !== null);
|
||||
if (callback) {
|
||||
let transition = actor.get_transition(animatedProps[0]);
|
||||
|
||||
if (transition && transition.delay)
|
||||
transition.connect('started', () => Meta.disable_unredirect_for_display(global.display));
|
||||
else
|
||||
Meta.disable_unredirect_for_display(global.display);
|
||||
|
||||
if (transition)
|
||||
transition.connect('stopped', (t, finished) => callback(finished));
|
||||
else
|
||||
callback(true);
|
||||
if (transition)
|
||||
transition.connect('stopped', (t, finished) => callback(finished));
|
||||
else
|
||||
callback(true);
|
||||
}
|
||||
}
|
||||
|
||||
function _easeActorProperty(actor, propName, target, params) {
|
||||
@@ -143,13 +139,7 @@ function _easeActorProperty(actor, propName, target, params) {
|
||||
params.duration = adjustAnimationTime(params.duration);
|
||||
let duration = Math.floor(params.duration || 0);
|
||||
|
||||
// Copy Clutter's behavior for implicit animations, see
|
||||
// should_skip_implicit_transition()
|
||||
if (actor instanceof Clutter.Actor && !actor.mapped)
|
||||
duration = 0;
|
||||
|
||||
let cleanup = () => Meta.enable_unredirect_for_display(global.display);
|
||||
let callback = _makeEaseCallback(params, cleanup);
|
||||
let callback = _makeEaseCallback(params);
|
||||
|
||||
// cancel overwritten transition
|
||||
actor.remove_transition(propName);
|
||||
@@ -158,8 +148,8 @@ function _easeActorProperty(actor, propName, target, params) {
|
||||
let [obj, prop] = _getPropertyTarget(actor, propName);
|
||||
obj[prop] = target;
|
||||
|
||||
Meta.disable_unredirect_for_display(global.display);
|
||||
callback(true);
|
||||
if (callback)
|
||||
callback(true);
|
||||
|
||||
return;
|
||||
}
|
||||
@@ -174,12 +164,8 @@ function _easeActorProperty(actor, propName, target, params) {
|
||||
|
||||
transition.set_to(target);
|
||||
|
||||
if (transition.delay)
|
||||
transition.connect('started', () => Meta.disable_unredirect_for_display(global.display));
|
||||
else
|
||||
Meta.disable_unredirect_for_display(global.display);
|
||||
|
||||
transition.connect('stopped', (t, finished) => callback(finished));
|
||||
if (callback)
|
||||
transition.connect('stopped', (t, finished) => callback(finished));
|
||||
}
|
||||
|
||||
function _loggingFunc(...args) {
|
||||
|
||||
@@ -186,15 +186,14 @@ class InstallExtensionDialog extends ModalDialog.ModalDialog {
|
||||
this._info = info;
|
||||
this._invocation = invocation;
|
||||
|
||||
this.setButtons([{
|
||||
label: _("Cancel"),
|
||||
action: this._onCancelButtonPressed.bind(this),
|
||||
key: Clutter.Escape,
|
||||
}, {
|
||||
label: _("Install"),
|
||||
action: this._onInstallButtonPressed.bind(this),
|
||||
default: true,
|
||||
}]);
|
||||
this.setButtons([{ label: _("Cancel"),
|
||||
action: this._onCancelButtonPressed.bind(this),
|
||||
key: Clutter.Escape
|
||||
},
|
||||
{ label: _("Install"),
|
||||
action: this._onInstallButtonPressed.bind(this),
|
||||
default: true
|
||||
}]);
|
||||
|
||||
let content = new Dialog.MessageDialogContent({
|
||||
title: _("Download and install “%s” from extensions.gnome.org?").format(info.name),
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
|
||||
/* exported init connect disconnect */
|
||||
|
||||
const { GLib, Gio, St } = imports.gi;
|
||||
const { Gio, St } = imports.gi;
|
||||
const Signals = imports.signals;
|
||||
|
||||
const ExtensionUtils = imports.misc.extensionUtils;
|
||||
@@ -17,34 +17,18 @@ const EXTENSION_DISABLE_VERSION_CHECK_KEY = 'disable-extension-version-validatio
|
||||
|
||||
var ExtensionManager = class {
|
||||
constructor() {
|
||||
this._initialized = false;
|
||||
this._initted = false;
|
||||
this._enabled = false;
|
||||
|
||||
this._extensions = new Map();
|
||||
this._enabledExtensions = [];
|
||||
this._requestedExtensions = [];
|
||||
this._extensionOrder = [];
|
||||
|
||||
Main.sessionMode.connect('updated', this._sessionUpdated.bind(this));
|
||||
}
|
||||
|
||||
init() {
|
||||
// The following file should exist for a period of time when extensions
|
||||
// are enabled after start. If it exists, then the systemd unit will
|
||||
// disable extensions should gnome-shell crash.
|
||||
// Should the file already exist from a previous login, then this is OK.
|
||||
let disableFilename = GLib.build_filenamev([GLib.get_user_runtime_dir(), 'gnome-shell-disable-extensions']);
|
||||
let disableFile = Gio.File.new_for_path(disableFilename);
|
||||
try {
|
||||
disableFile.create(Gio.FileCreateFlags.REPLACE_DESTINATION, null);
|
||||
} catch (e) {
|
||||
log(`Failed to create file ${disableFilename}: ${e.message}`);
|
||||
}
|
||||
|
||||
GLib.timeout_add_seconds(GLib.PRIORITY_DEFAULT, 60, () => {
|
||||
FileUtils.deleteGFile(disableFile);
|
||||
return GLib.SOURCE_REMOVE;
|
||||
});
|
||||
|
||||
this._sessionUpdated();
|
||||
}
|
||||
|
||||
@@ -115,9 +99,6 @@ var ExtensionManager = class {
|
||||
}
|
||||
|
||||
_callExtensionEnable(uuid) {
|
||||
if (!Main.sessionMode.allowExtensions)
|
||||
return;
|
||||
|
||||
let extension = this.lookup(uuid);
|
||||
if (!extension)
|
||||
return;
|
||||
@@ -128,6 +109,8 @@ var ExtensionManager = class {
|
||||
if (extension.state != ExtensionState.DISABLED)
|
||||
return;
|
||||
|
||||
this._extensionOrder.push(uuid);
|
||||
|
||||
let stylesheetNames = [`${global.session_mode}.css`, 'stylesheet.css'];
|
||||
let theme = St.ThemeContext.get_for_stage(global.stage).get_theme();
|
||||
for (let i = 0; i < stylesheetNames.length; i++) {
|
||||
@@ -139,7 +122,7 @@ var ExtensionManager = class {
|
||||
} catch (e) {
|
||||
if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND))
|
||||
continue; // not an error
|
||||
this.logExtensionError(uuid, e);
|
||||
log(`Failed to load stylesheet for extension ${uuid}: ${e.message}`);
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -147,14 +130,15 @@ var ExtensionManager = class {
|
||||
try {
|
||||
extension.stateObj.enable();
|
||||
extension.state = ExtensionState.ENABLED;
|
||||
this._extensionOrder.push(uuid);
|
||||
this.emit('extension-state-changed', extension);
|
||||
return;
|
||||
} catch (e) {
|
||||
if (extension.stylesheet) {
|
||||
theme.unload_stylesheet(extension.stylesheet);
|
||||
delete extension.stylesheet;
|
||||
}
|
||||
this.logExtensionError(uuid, e);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -211,7 +195,7 @@ var ExtensionManager = class {
|
||||
extension.errors = [];
|
||||
extension.errors.push(message);
|
||||
|
||||
logError(error, `Extension ${uuid}`);
|
||||
log('Extension "%s" had error: %s'.format(uuid, message));
|
||||
this.emit('extension-state-changed', extension);
|
||||
}
|
||||
|
||||
@@ -267,6 +251,9 @@ var ExtensionManager = class {
|
||||
// Default to error, we set success as the last step
|
||||
extension.state = ExtensionState.ERROR;
|
||||
|
||||
let requested = this._requestedExtensions.includes(extension.uuid);
|
||||
extension.isRequested = requested;
|
||||
|
||||
let checkVersion = !global.settings.get_boolean(EXTENSION_DISABLE_VERSION_CHECK_KEY);
|
||||
|
||||
if (checkVersion && ExtensionUtils.isOutOfDate(extension)) {
|
||||
@@ -303,7 +290,7 @@ var ExtensionManager = class {
|
||||
reloadExtension(oldExtension) {
|
||||
// Grab the things we'll need to pass to createExtensionObject
|
||||
// to reload it.
|
||||
let { uuid, dir, type } = oldExtension;
|
||||
let { uuid: uuid, dir: dir, type: type } = oldExtension;
|
||||
|
||||
// Then unload the old extension.
|
||||
this.unloadExtension(oldExtension);
|
||||
@@ -321,14 +308,12 @@ var ExtensionManager = class {
|
||||
}
|
||||
|
||||
_callExtensionInit(uuid) {
|
||||
if (!Main.sessionMode.allowExtensions)
|
||||
return false;
|
||||
|
||||
let extension = this.lookup(uuid);
|
||||
if (!extension)
|
||||
throw new Error("Extension was not properly created. Call createExtensionObject first");
|
||||
|
||||
let dir = extension.dir;
|
||||
|
||||
if (!extension)
|
||||
throw new Error("Extension was not properly created. Call loadExtension first");
|
||||
|
||||
let extensionJs = dir.get_child('extension.js');
|
||||
if (!extensionJs.query_exists(null)) {
|
||||
this.logExtensionError(uuid, new Error('Missing extension.js'));
|
||||
@@ -382,10 +367,7 @@ var ExtensionManager = class {
|
||||
? DISABLE_USER_EXTENSIONS_KEY
|
||||
: ENABLED_EXTENSIONS_KEY;
|
||||
|
||||
extension.canChange =
|
||||
!hasError &&
|
||||
global.settings.is_writable(changeKey) &&
|
||||
(isMode || !modeOnly);
|
||||
extension.canChange = global.settings.is_writable(ENABLED_EXTENSIONS_KEY);
|
||||
}
|
||||
|
||||
_getEnabledExtensions() {
|
||||
@@ -399,6 +381,14 @@ var ExtensionManager = class {
|
||||
return extensions.filter(item => !disabledExtensions.includes(item));
|
||||
}
|
||||
|
||||
_getRequestedExtensions() {
|
||||
let extensions = global.settings.get_strv(ENABLED_EXTENSIONS_KEY);
|
||||
|
||||
// filter out 'disabled-extensions' which takes precedence
|
||||
let disabledExtensions = global.settings.get_strv(DISABLED_EXTENSIONS_KEY);
|
||||
return extensions.filter(item => !disabledExtensions.includes(item));
|
||||
}
|
||||
|
||||
_onUserExtensionsEnabledChanged() {
|
||||
this._onEnabledExtensionsChanged();
|
||||
this._onSettingsWritableChanged();
|
||||
@@ -407,6 +397,19 @@ var ExtensionManager = class {
|
||||
_onEnabledExtensionsChanged() {
|
||||
let newEnabledExtensions = this._getEnabledExtensions();
|
||||
|
||||
if (!this._enabled)
|
||||
return;
|
||||
|
||||
// Updated requested state and emit change notifications
|
||||
this._requestedExtensions = this._getRequestedExtensions();
|
||||
for (let extension of this._extensions.values()) {
|
||||
let requested = this._requestedExtensions.includes(extension.uuid);
|
||||
if (extension.isRequested == requested)
|
||||
continue;
|
||||
extension.isRequested = requested;
|
||||
this.emit('extension-state-changed', extension);
|
||||
}
|
||||
|
||||
// Find and enable all the newly enabled extensions: UUIDs found in the
|
||||
// new setting, but not in the old one.
|
||||
newEnabledExtensions.filter(
|
||||
@@ -417,9 +420,9 @@ var ExtensionManager = class {
|
||||
|
||||
// Find and disable all the newly disabled extensions: UUIDs found in the
|
||||
// old setting, but not in the new one.
|
||||
this._extensionOrder.filter(
|
||||
uuid => !newEnabledExtensions.includes(uuid)
|
||||
).reverse().forEach(uuid => {
|
||||
this._enabledExtensions.filter(
|
||||
item => !newEnabledExtensions.includes(item)
|
||||
).forEach(uuid => {
|
||||
this._callExtensionDisable(uuid);
|
||||
});
|
||||
|
||||
@@ -434,19 +437,22 @@ var ExtensionManager = class {
|
||||
}
|
||||
|
||||
_onVersionValidationChanged() {
|
||||
// Disabling extensions modifies the order array, so use a copy
|
||||
let extensionOrder = this._extensionOrder.slice();
|
||||
// we want to reload all extensions, but only enable
|
||||
// extensions when allowed by the sessionMode, so
|
||||
// temporarily disable them all
|
||||
this._enabledExtensions = [];
|
||||
|
||||
// Disable enabled extensions in the reverse order first to avoid
|
||||
// the "rebasing" done in _callExtensionDisable...
|
||||
extensionOrder.slice().reverse().forEach(uuid => {
|
||||
this._callExtensionDisable(uuid);
|
||||
});
|
||||
// The loop modifies the extensions map, so iterate over a copy
|
||||
let extensions = [...this._extensions.values()];
|
||||
for (let extension of extensions)
|
||||
this.reloadExtension(extension);
|
||||
this._enabledExtensions = this._getEnabledExtensions();
|
||||
|
||||
// ...and then reload and enable extensions in the correct order again.
|
||||
[...this._extensions.values()].sort((a, b) => {
|
||||
return extensionOrder.indexOf(a.uuid) - extensionOrder.indexOf(b.uuid);
|
||||
}).forEach(extension => this.reloadExtension(extension));
|
||||
if (Main.sessionMode.allowExtensions) {
|
||||
this._enabledExtensions.forEach(uuid => {
|
||||
this._callExtensionEnable(uuid);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
_loadExtensions() {
|
||||
@@ -464,6 +470,7 @@ var ExtensionManager = class {
|
||||
this._onSettingsWritableChanged.bind(this));
|
||||
|
||||
this._enabledExtensions = this._getEnabledExtensions();
|
||||
this._requestedExtensions = this._getRequestedExtensions();
|
||||
|
||||
let perUserDir = Gio.File.new_for_path(global.userdatadir);
|
||||
FileUtils.collectFromDatadirs('extensions', true, (dir, info) => {
|
||||
@@ -495,9 +502,9 @@ var ExtensionManager = class {
|
||||
if (this._enabled)
|
||||
return;
|
||||
|
||||
if (!this._initialized) {
|
||||
if (!this._initted) {
|
||||
this._loadExtensions();
|
||||
this._initialized = true;
|
||||
this._initted = true;
|
||||
} else {
|
||||
this._enabledExtensions.forEach(uuid => {
|
||||
this._callExtensionEnable(uuid);
|
||||
@@ -510,7 +517,7 @@ var ExtensionManager = class {
|
||||
if (!this._enabled)
|
||||
return;
|
||||
|
||||
if (this._initialized) {
|
||||
if (this._initted) {
|
||||
this._extensionOrder.slice().reverse().forEach(uuid => {
|
||||
this._callExtensionDisable(uuid);
|
||||
});
|
||||
@@ -525,8 +532,9 @@ var ExtensionManager = class {
|
||||
// property; it might make sense to make enabledExtensions independent
|
||||
// from allowExtensions in the future
|
||||
if (Main.sessionMode.allowExtensions) {
|
||||
// Take care of added or removed sessionMode extensions
|
||||
this._onEnabledExtensionsChanged();
|
||||
if (this._initted) {
|
||||
this._enabledExtensions = this._getEnabledExtensions();
|
||||
}
|
||||
this._enableAllExtensions();
|
||||
} else {
|
||||
this._disableAllExtensions();
|
||||
|
||||
@@ -126,9 +126,6 @@ Signals.addSignalMethods(CandidateArea.prototype);
|
||||
|
||||
var CandidatePopup = class CandidatePopup {
|
||||
constructor() {
|
||||
this._dummyCursor = new St.Widget({ opacity: 0 });
|
||||
Main.layoutManager.uiGroup.add_actor(this._dummyCursor);
|
||||
|
||||
this._boxPointer = new BoxPointer.BoxPointer(St.Side.TOP);
|
||||
this._boxPointer.visible = false;
|
||||
this._boxPointer.style_class = 'candidate-popup-boxpointer';
|
||||
@@ -275,11 +272,9 @@ var CandidatePopup = class CandidatePopup {
|
||||
}
|
||||
|
||||
_setDummyCursorGeometry(x, y, w, h) {
|
||||
this._dummyCursor.set_position(Math.round(x), Math.round(y));
|
||||
this._dummyCursor.set_size(Math.round(w), Math.round(h));
|
||||
|
||||
Main.layoutManager.setDummyCursorGeometry(x, y, w, h);
|
||||
if (this._boxPointer.visible)
|
||||
this._boxPointer.setPosition(this._dummyCursor, 0);
|
||||
this._boxPointer.setPosition(Main.layoutManager.dummyCursor, 0);
|
||||
}
|
||||
|
||||
_updateVisibility() {
|
||||
@@ -289,7 +284,7 @@ var CandidatePopup = class CandidatePopup {
|
||||
this._candidateArea.actor.visible));
|
||||
|
||||
if (isVisible) {
|
||||
this._boxPointer.setPosition(this._dummyCursor, 0);
|
||||
this._boxPointer.setPosition(Main.layoutManager.dummyCursor, 0);
|
||||
this._boxPointer.open(BoxPointer.PopupAnimation.NONE);
|
||||
this._boxPointer.raise_top();
|
||||
} else {
|
||||
|
||||
@@ -142,10 +142,6 @@ class BaseIcon extends St.Bin {
|
||||
zoomOutActor(this.child);
|
||||
}
|
||||
|
||||
animateZoomOutAtPos(x, y) {
|
||||
zoomOutActorAtPos(this.child, x, y);
|
||||
}
|
||||
|
||||
update() {
|
||||
this._createIconTexture(this.iconSize);
|
||||
}
|
||||
@@ -156,15 +152,10 @@ function clamp(value, min, max) {
|
||||
}
|
||||
|
||||
function zoomOutActor(actor) {
|
||||
let [x, y] = actor.get_transformed_position();
|
||||
zoomOutActorAtPos(actor, x, y);
|
||||
}
|
||||
|
||||
function zoomOutActorAtPos(actor, x, y) {
|
||||
let actorClone = new Clutter.Clone({ source: actor,
|
||||
reactive: false });
|
||||
let [width, height] = actor.get_transformed_size();
|
||||
|
||||
let [x, y] = actor.get_transformed_position();
|
||||
actorClone.set_size(width, height);
|
||||
actorClone.set_position(x, y);
|
||||
actorClone.opacity = 255;
|
||||
@@ -256,23 +247,10 @@ var IconGrid = GObject.registerClass({
|
||||
|
||||
_childAdded(grid, child) {
|
||||
child._iconGridKeyFocusInId = child.connect('key-focus-in', this._keyFocusIn.bind(this));
|
||||
|
||||
child._paintVisible = child.opacity > 0;
|
||||
child._opacityChangedId = child.connect('notify::opacity', () => {
|
||||
let paintVisible = child._paintVisible;
|
||||
child._paintVisible = child.opacity > 0;
|
||||
if (paintVisible !== child._paintVisible)
|
||||
this.queue_relayout();
|
||||
});
|
||||
}
|
||||
|
||||
_childRemoved(grid, child) {
|
||||
child.disconnect(child._iconGridKeyFocusInId);
|
||||
delete child._iconGridKeyFocusInId;
|
||||
|
||||
child.disconnect(child._opacityChangedId);
|
||||
delete child._opacityChangedId;
|
||||
delete child._paintVisible;
|
||||
}
|
||||
|
||||
vfunc_get_preferred_width(_forHeight) {
|
||||
@@ -282,9 +260,9 @@ var IconGrid = GObject.registerClass({
|
||||
return [0, 0];
|
||||
|
||||
let nChildren = this.get_n_children();
|
||||
let nColumns = this._colLimit
|
||||
? Math.min(this._colLimit, nChildren)
|
||||
: nChildren;
|
||||
let nColumns = this._colLimit ? Math.min(this._colLimit,
|
||||
nChildren)
|
||||
: nChildren;
|
||||
let totalSpacing = Math.max(0, nColumns - 1) * this._getSpacing();
|
||||
// Kind of a lie, but not really an issue right now. If
|
||||
// we wanted to support some sort of hidden/overflow that would
|
||||
@@ -436,7 +414,7 @@ var IconGrid = GObject.registerClass({
|
||||
* set of items to be animated.
|
||||
*/
|
||||
_getChildrenToAnimate() {
|
||||
return this._getVisibleChildren().filter(child => child.opacity > 0);
|
||||
return this._getVisibleChildren();
|
||||
}
|
||||
|
||||
_resetAnimationActors() {
|
||||
@@ -796,9 +774,8 @@ var IconGrid = GObject.registerClass({
|
||||
let neededWidth = this.usedWidthForNColumns(this._minColumns) - availWidth;
|
||||
let neededHeight = this.usedHeightForNRows(this._minRows) - availHeight;
|
||||
|
||||
let neededSpacePerItem = (neededWidth > neededHeight)
|
||||
? Math.ceil(neededWidth / this._minColumns)
|
||||
: Math.ceil(neededHeight / this._minRows);
|
||||
let neededSpacePerItem = (neededWidth > neededHeight) ? Math.ceil(neededWidth / this._minColumns)
|
||||
: Math.ceil(neededHeight / this._minRows);
|
||||
this._fixedHItemSize = Math.max(this._hItemSize - neededSpacePerItem, MIN_ICON_SIZE);
|
||||
this._fixedVItemSize = Math.max(this._vItemSize - neededSpacePerItem, MIN_ICON_SIZE);
|
||||
|
||||
@@ -894,7 +871,7 @@ var PaginatedIconGrid = GObject.registerClass({
|
||||
|
||||
// Overridden from IconGrid
|
||||
_getChildrenToAnimate() {
|
||||
let children = super._getChildrenToAnimate();
|
||||
let children = this._getVisibleChildren();
|
||||
let firstIndex = this._childrenPerPage * this.currentPage;
|
||||
let lastIndex = firstIndex + this._childrenPerPage;
|
||||
|
||||
@@ -973,7 +950,8 @@ var PaginatedIconGrid = GObject.registerClass({
|
||||
let childrenPerRow = this._childrenPerPage / this._rowsPerPage;
|
||||
let sourceRow = Math.floor((index - pageOffset) / childrenPerRow);
|
||||
|
||||
let nRowsAbove = (side == St.Side.TOP) ? sourceRow + 1 : sourceRow;
|
||||
let nRowsAbove = (side == St.Side.TOP) ? sourceRow + 1
|
||||
: sourceRow;
|
||||
let nRowsBelow = this._rowsPerPage - nRowsAbove;
|
||||
|
||||
let nRowsUp, nRowsDown;
|
||||
|
||||
@@ -76,9 +76,8 @@ var InhibitShortcutsDialog = GObject.registerClass({
|
||||
let name = this._app ? this._app.get_name() : this._window.title;
|
||||
|
||||
/* Translators: %s is an application name like "Settings" */
|
||||
let title = name
|
||||
? _("%s wants to inhibit shortcuts").format(name)
|
||||
: _("Application wants to inhibit shortcuts");
|
||||
let title = name ? _("%s wants to inhibit shortcuts").format(name)
|
||||
: _("Application wants to inhibit shortcuts");
|
||||
let icon = new Gio.ThemedIcon({ name: 'dialog-warning-symbolic' });
|
||||
|
||||
let contentParams = { icon, title };
|
||||
|
||||
@@ -27,24 +27,24 @@ class KbdA11yDialog extends GObject.Object {
|
||||
|
||||
if (whatChanged & Clutter.KeyboardA11yFlags.SLOW_KEYS_ENABLED) {
|
||||
key = KEY_SLOW_KEYS_ENABLED;
|
||||
enabled = (newFlags & Clutter.KeyboardA11yFlags.SLOW_KEYS_ENABLED) > 0;
|
||||
title = enabled
|
||||
? _("Slow Keys Turned On")
|
||||
: _("Slow Keys Turned Off");
|
||||
enabled = (newFlags & Clutter.KeyboardA11yFlags.SLOW_KEYS_ENABLED) ? true : false;
|
||||
title = enabled ?
|
||||
_("Slow Keys Turned On") :
|
||||
_("Slow Keys Turned Off");
|
||||
body = _("You just held down the Shift key for 8 seconds. This is the shortcut " +
|
||||
"for the Slow Keys feature, which affects the way your keyboard works.");
|
||||
|
||||
} else if (whatChanged & Clutter.KeyboardA11yFlags.STICKY_KEYS_ENABLED) {
|
||||
key = KEY_STICKY_KEYS_ENABLED;
|
||||
enabled = (newFlags & Clutter.KeyboardA11yFlags.STICKY_KEYS_ENABLED) > 0;
|
||||
title = enabled
|
||||
? _("Sticky Keys Turned On")
|
||||
: _("Sticky Keys Turned Off");
|
||||
body = enabled
|
||||
? _("You just pressed the Shift key 5 times in a row. This is the shortcut " +
|
||||
"for the Sticky Keys feature, which affects the way your keyboard works.")
|
||||
: _("You just pressed two keys at once, or pressed the Shift key 5 times in a row. " +
|
||||
"This turns off the Sticky Keys feature, which affects the way your keyboard works.");
|
||||
enabled = (newFlags & Clutter.KeyboardA11yFlags.STICKY_KEYS_ENABLED) ? true : false;
|
||||
title = enabled ?
|
||||
_("Sticky Keys Turned On") :
|
||||
_("Sticky Keys Turned Off");
|
||||
body = enabled ?
|
||||
_("You just pressed the Shift key 5 times in a row. This is the shortcut " +
|
||||
"for the Sticky Keys feature, which affects the way your keyboard works.") :
|
||||
_("You just pressed two keys at once, or pressed the Shift key 5 times in a row. " +
|
||||
"This turns off the Sticky Keys feature, which affects the way your keyboard works.");
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -104,10 +104,9 @@ class KeyContainer extends St.Widget {
|
||||
this._currentRow++;
|
||||
this._currentCol = 0;
|
||||
|
||||
let row = {
|
||||
keys: [],
|
||||
width: 0,
|
||||
};
|
||||
let row = new Object();
|
||||
row.keys = [];
|
||||
row.width = 0;
|
||||
this._rows.push(row);
|
||||
}
|
||||
|
||||
@@ -194,12 +193,12 @@ var LanguageSelectionPopup = class extends PopupMenu.PopupMenu {
|
||||
item = this.addAction(is.displayName, () => {
|
||||
inputSourceManager.activateInputSource(is, true);
|
||||
});
|
||||
item.can_focus = false;
|
||||
item.actor.can_focus = false;
|
||||
}
|
||||
|
||||
this.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
|
||||
item = this.addSettingsAction(_("Region & Language Settings"), 'gnome-region-panel.desktop');
|
||||
item.can_focus = false;
|
||||
item.actor.can_focus = false;
|
||||
|
||||
this._capturedEventId = 0;
|
||||
|
||||
@@ -466,17 +465,10 @@ Signals.addSignalMethods(Key.prototype);
|
||||
|
||||
var KeyboardModel = class {
|
||||
constructor(groupName) {
|
||||
let names = [groupName];
|
||||
if (names.includes('+'))
|
||||
names.push(groupName.replace(/\+.*/, ''));
|
||||
names.push('us');
|
||||
|
||||
for (let i = 0; i < names.length; i++) {
|
||||
try {
|
||||
this._model = this._loadModel(names[i]);
|
||||
break;
|
||||
} catch (e) {
|
||||
}
|
||||
try {
|
||||
this._model = this._loadModel(groupName);
|
||||
} catch (e) {
|
||||
this._model = this._loadModel('us');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -582,7 +574,7 @@ var EmojiPager = GObject.registerClass({
|
||||
'delta': GObject.ParamSpec.int(
|
||||
'delta', 'delta', 'delta',
|
||||
GObject.ParamFlags.READWRITE,
|
||||
GLib.MININT32, GLib.MAXINT32, 0)
|
||||
0, GLib.MAXINT32, 0)
|
||||
},
|
||||
Signals: {
|
||||
'emoji': { param_types: [GObject.TYPE_STRING] },
|
||||
@@ -1088,7 +1080,7 @@ var Keyboard = class Keyboard {
|
||||
this.hide();
|
||||
});
|
||||
|
||||
Meta.get_backend().connect('last-device-changed',
|
||||
Meta.get_backend().connect('last-device-changed',
|
||||
(backend, deviceId) => {
|
||||
let manager = Clutter.DeviceManager.get_default();
|
||||
let device = manager.get_device(deviceId);
|
||||
|
||||
@@ -189,7 +189,6 @@ var LayoutManager = GObject.registerClass({
|
||||
'startup-complete': {},
|
||||
'startup-prepared': {},
|
||||
'monitors-changed': {},
|
||||
'system-modal-opened': {},
|
||||
'keyboard-visible-changed': { param_types: [GObject.TYPE_BOOLEAN] } },
|
||||
}, class LayoutManager extends GObject.Object {
|
||||
_init() {
|
||||
@@ -239,12 +238,11 @@ var LayoutManager = GObject.registerClass({
|
||||
reactive: true });
|
||||
this.addChrome(this.overviewGroup);
|
||||
|
||||
this.screenShieldGroup = new St.Widget({
|
||||
name: 'screenShieldGroup',
|
||||
visible: false,
|
||||
clip_to_allocation: true,
|
||||
layout_manager: new Clutter.BinLayout(),
|
||||
});
|
||||
this.screenShieldGroup = new St.Widget({ name: 'screenShieldGroup',
|
||||
visible: false,
|
||||
clip_to_allocation: true,
|
||||
layout_manager: new Clutter.BinLayout(),
|
||||
});
|
||||
this.addChrome(this.screenShieldGroup);
|
||||
|
||||
this.panelBox = new St.BoxLayout({ name: 'panelBox',
|
||||
@@ -772,7 +770,8 @@ var LayoutManager = GObject.registerClass({
|
||||
this.keyboardBox.ease({
|
||||
anchor_y: 0,
|
||||
opacity: 0,
|
||||
duration: immediate ? 0 : KEYBOARD_ANIMATION_TIME,
|
||||
duration: immediate ? 0
|
||||
: KEYBOARD_ANIMATION_TIME,
|
||||
mode: Clutter.AnimationMode.EASE_IN_QUAD,
|
||||
onComplete: () => {
|
||||
this._hideKeyboardComplete();
|
||||
@@ -856,13 +855,12 @@ var LayoutManager = GObject.registerClass({
|
||||
index = this._findActor(ancestor);
|
||||
}
|
||||
|
||||
let ancestorData = ancestor
|
||||
? this._trackedActors[index]
|
||||
: defaultParams;
|
||||
let ancestorData = ancestor ? this._trackedActors[index]
|
||||
: defaultParams;
|
||||
// We can't use Params.parse here because we want to drop
|
||||
// the extra values like ancestorData.actor
|
||||
for (let prop in defaultParams) {
|
||||
if (!Object.prototype.hasOwnProperty.call(params, prop))
|
||||
if (!params.hasOwnProperty(prop))
|
||||
params[prop] = ancestorData[prop];
|
||||
}
|
||||
|
||||
@@ -1016,6 +1014,11 @@ var LayoutManager = GObject.registerClass({
|
||||
if (Main.modalCount > 0)
|
||||
return GLib.SOURCE_REMOVE;
|
||||
|
||||
// Bug workaround - get_transformed_position()/get_transformed_size() don't work after
|
||||
// a change in stage size until the first pick or paint.
|
||||
// https://bugzilla.gnome.org/show_bug.cgi?id=761565
|
||||
global.stage.get_actor_at_pos(Clutter.PickMode.ALL, 0, 0);
|
||||
|
||||
let rects = [], struts = [], i;
|
||||
let isPopupMenuVisible = global.top_window_group.get_children().some(isPopupMetaWindow);
|
||||
let wantsInputRegion = !isPopupMenuVisible;
|
||||
@@ -1071,17 +1074,16 @@ var LayoutManager = GObject.registerClass({
|
||||
side = Meta.Side.RIGHT;
|
||||
else
|
||||
continue;
|
||||
} else if (x1 <= monitor.x) {
|
||||
} else if (x1 <= monitor.x)
|
||||
side = Meta.Side.LEFT;
|
||||
} else if (y1 <= monitor.y) {
|
||||
else if (y1 <= monitor.y)
|
||||
side = Meta.Side.TOP;
|
||||
} else if (x2 >= monitor.x + monitor.width) {
|
||||
else if (x2 >= monitor.x + monitor.width)
|
||||
side = Meta.Side.RIGHT;
|
||||
} else if (y2 >= monitor.y + monitor.height) {
|
||||
else if (y2 >= monitor.y + monitor.height)
|
||||
side = Meta.Side.BOTTOM;
|
||||
} else {
|
||||
else
|
||||
continue;
|
||||
}
|
||||
|
||||
let strutRect = new Meta.Rectangle({ x: x1, y: y1, width: x2 - x1, height: y2 - y1 });
|
||||
let strut = new Meta.Strut({ rect: strutRect, side: side });
|
||||
@@ -1222,8 +1224,6 @@ var HotCorner = class HotCorner {
|
||||
|
||||
if (this.actor)
|
||||
this.actor.destroy();
|
||||
|
||||
this._ripples.destroy();
|
||||
}
|
||||
|
||||
_toggleOverview() {
|
||||
|
||||
@@ -108,13 +108,12 @@ var RadialShaderEffect = GObject.registerClass({
|
||||
*/
|
||||
var Lightbox = class Lightbox {
|
||||
constructor(container, params) {
|
||||
params = Params.parse(params, {
|
||||
inhibitEvents: false,
|
||||
width: null,
|
||||
height: null,
|
||||
fadeFactor: DEFAULT_FADE_FACTOR,
|
||||
radialEffect: false,
|
||||
});
|
||||
params = Params.parse(params, { inhibitEvents: false,
|
||||
width: null,
|
||||
height: null,
|
||||
fadeFactor: DEFAULT_FADE_FACTOR,
|
||||
radialEffect: false,
|
||||
});
|
||||
|
||||
this._container = container;
|
||||
this._children = container.get_children();
|
||||
@@ -173,52 +172,66 @@ var Lightbox = class Lightbox {
|
||||
}
|
||||
|
||||
show(fadeInTime) {
|
||||
this.actor.remove_all_transitions();
|
||||
fadeInTime = fadeInTime || 0;
|
||||
|
||||
let easeProps = {
|
||||
duration: fadeInTime || 0,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD
|
||||
};
|
||||
this.actor.remove_all_transitions();
|
||||
|
||||
let onComplete = () => {
|
||||
this.shown = true;
|
||||
this.emit('shown');
|
||||
};
|
||||
|
||||
this.actor.show();
|
||||
|
||||
if (this._radialEffect) {
|
||||
this.actor.ease_property(
|
||||
'@effects.radial.brightness', VIGNETTE_BRIGHTNESS, easeProps);
|
||||
'@effects.radial.brightness', VIGNETTE_BRIGHTNESS, {
|
||||
duration: fadeInTime,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD
|
||||
});
|
||||
this.actor.ease_property(
|
||||
'@effects.radial.sharpness', VIGNETTE_SHARPNESS,
|
||||
Object.assign({ onComplete }, easeProps));
|
||||
'@effects.radial.sharpness', VIGNETTE_SHARPNESS, {
|
||||
duration: fadeInTime,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
onComplete
|
||||
});
|
||||
} else {
|
||||
this.actor.ease(Object.assign(easeProps, {
|
||||
this.actor.ease({
|
||||
opacity: 255 * this._fadeFactor,
|
||||
duration: fadeInTime,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
onComplete
|
||||
}));
|
||||
});
|
||||
}
|
||||
|
||||
this.actor.show();
|
||||
}
|
||||
|
||||
hide(fadeOutTime) {
|
||||
fadeOutTime = fadeOutTime || 0;
|
||||
|
||||
this.shown = false;
|
||||
this.actor.remove_all_transitions();
|
||||
|
||||
let easeProps = {
|
||||
duration: fadeOutTime || 0,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD
|
||||
};
|
||||
|
||||
let onComplete = () => this.actor.hide();
|
||||
|
||||
if (this._radialEffect) {
|
||||
this.actor.ease_property(
|
||||
'@effects.radial.brightness', 1.0, easeProps);
|
||||
'@effects.radial.brightness', 1.0, {
|
||||
duration: fadeOutTime,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD
|
||||
});
|
||||
this.actor.ease_property(
|
||||
'@effects.radial.sharpness', 0.0, Object.assign({ onComplete }, easeProps));
|
||||
'@effects.radial.sharpness', 0.0, {
|
||||
duration: fadeOutTime,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
onComplete
|
||||
});
|
||||
} else {
|
||||
this.actor.ease(Object.assign(easeProps, { opacity: 0, onComplete }));
|
||||
this.actor.ease({
|
||||
opacity: 0,
|
||||
duration: fadeOutTime,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
onComplete
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -11,26 +11,12 @@ const LOCATE_POINTER_SCHEMA = "org.gnome.desktop.interface";
|
||||
var LocatePointer = class {
|
||||
constructor() {
|
||||
this._settings = new Gio.Settings({ schema_id: LOCATE_POINTER_SCHEMA });
|
||||
this._settings.connect(`changed::${LOCATE_POINTER_KEY}`, () => this._syncEnabled());
|
||||
this._syncEnabled();
|
||||
}
|
||||
|
||||
_syncEnabled() {
|
||||
let enabled = this._settings.get_boolean(LOCATE_POINTER_KEY);
|
||||
if (enabled == !!this._ripples)
|
||||
return;
|
||||
|
||||
if (enabled) {
|
||||
this._ripples = new Ripples.Ripples(0.5, 0.5, 'ripple-pointer-location');
|
||||
this._ripples.addTo(Main.uiGroup);
|
||||
} else {
|
||||
this._ripples.destroy();
|
||||
this._ripples = null;
|
||||
}
|
||||
this._ripples = new Ripples.Ripples(0.5, 0.5, 'ripple-pointer-location');
|
||||
this._ripples.addTo(Main.uiGroup);
|
||||
}
|
||||
|
||||
show() {
|
||||
if (!this._ripples)
|
||||
if (!this._settings.get_boolean(LOCATE_POINTER_KEY))
|
||||
return;
|
||||
|
||||
let [x, y] = global.get_pointer();
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
|
||||
const { Clutter, Cogl, Gio, GLib,
|
||||
GObject, Meta, Pango, Shell, St } = imports.gi;
|
||||
const Mainloop = imports.mainloop;
|
||||
const Signals = imports.signals;
|
||||
const System = imports.system;
|
||||
|
||||
@@ -19,6 +20,7 @@ const CHEVRON = '>>> ';
|
||||
/* Imports...feel free to add here as needed */
|
||||
var commandHeader = 'const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi; ' +
|
||||
'const Main = imports.ui.main; ' +
|
||||
'const Mainloop = imports.mainloop; ' +
|
||||
/* Utility functions...we should probably be able to use these
|
||||
* in the shell core code too. */
|
||||
'const stage = global.stage; ' +
|
||||
@@ -238,7 +240,7 @@ var Notebook = class Notebook {
|
||||
Signals.addSignalMethods(Notebook.prototype);
|
||||
|
||||
function objectToString(o) {
|
||||
if (typeof o == typeof objectToString) {
|
||||
if (typeof(o) == typeof(objectToString)) {
|
||||
// special case this since the default is way, way too verbose
|
||||
return '<js function>';
|
||||
} else {
|
||||
@@ -304,9 +306,6 @@ var WindowList = class WindowList {
|
||||
}
|
||||
|
||||
_updateWindowList() {
|
||||
if (!this._lookingGlass.isOpen)
|
||||
return;
|
||||
|
||||
this.actor.destroy_all_children();
|
||||
let windows = global.get_window_actors();
|
||||
let tracker = Shell.WindowTracker.get_default();
|
||||
@@ -338,10 +337,6 @@ var WindowList = class WindowList {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
update() {
|
||||
this._updateWindowList();
|
||||
}
|
||||
};
|
||||
Signals.addSignalMethods(WindowList.prototype);
|
||||
|
||||
@@ -374,7 +369,7 @@ var ObjInspector = class ObjInspector {
|
||||
|
||||
let hbox = new St.BoxLayout({ style_class: 'lg-obj-inspector-title' });
|
||||
this._container.add_actor(hbox);
|
||||
let label = new St.Label({ text: 'Inspecting: %s: %s'.format(typeof obj,
|
||||
let label = new St.Label({ text: 'Inspecting: %s: %s'.format(typeof(obj),
|
||||
objectToString(obj)) });
|
||||
label.single_line_mode = true;
|
||||
hbox.add(label, { expand: true, y_fill: false });
|
||||
@@ -392,7 +387,7 @@ var ObjInspector = class ObjInspector {
|
||||
button.add_actor(new St.Icon({ icon_name: 'window-close-symbolic' }));
|
||||
button.connect('clicked', this.close.bind(this));
|
||||
hbox.add(button);
|
||||
if (typeof obj == typeof {}) {
|
||||
if (typeof(obj) == typeof({})) {
|
||||
let properties = [];
|
||||
for (let propName in obj) {
|
||||
properties.push(propName);
|
||||
@@ -428,7 +423,7 @@ var ObjInspector = class ObjInspector {
|
||||
scale_x: 1,
|
||||
scale_y: 1,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
duration: 200
|
||||
time: 200
|
||||
});
|
||||
} else {
|
||||
this.actor.set_scale(1, 1);
|
||||
@@ -826,7 +821,7 @@ var LookingGlass = class LookingGlass {
|
||||
gcIcon.connect('button-press-event', () => {
|
||||
gcIcon.icon_name = 'user-trash';
|
||||
System.gc();
|
||||
this._timeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, 500, () => {
|
||||
this._timeoutId = Mainloop.timeout_add(500, () => {
|
||||
gcIcon.icon_name = 'user-trash-full';
|
||||
this._timeoutId = 0;
|
||||
return GLib.SOURCE_REMOVE;
|
||||
@@ -881,7 +876,7 @@ var LookingGlass = class LookingGlass {
|
||||
return true;
|
||||
});
|
||||
|
||||
this._history = new History.HistoryManager({ gsettingsKey: HISTORY_KEY,
|
||||
this._history = new History.HistoryManager({ gsettingsKey: HISTORY_KEY,
|
||||
entry: this._entry.clutter_text });
|
||||
|
||||
this._autoComplete = new AutoComplete(this._entry);
|
||||
@@ -1015,11 +1010,7 @@ var LookingGlass = class LookingGlass {
|
||||
}
|
||||
|
||||
getResult(idx) {
|
||||
try {
|
||||
return this._results[idx - this._offset].o;
|
||||
} catch (e) {
|
||||
throw new Error(`Unknown result at index ${idx}`);
|
||||
}
|
||||
return this._results[idx - this._offset].o;
|
||||
}
|
||||
|
||||
toggle() {
|
||||
@@ -1106,8 +1097,6 @@ var LookingGlass = class LookingGlass {
|
||||
duration,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD
|
||||
});
|
||||
|
||||
this._windowList.update();
|
||||
}
|
||||
|
||||
close() {
|
||||
@@ -1133,9 +1122,5 @@ var LookingGlass = class LookingGlass {
|
||||
onComplete: () => this.actor.hide()
|
||||
});
|
||||
}
|
||||
|
||||
get isOpen() {
|
||||
return this._open;
|
||||
}
|
||||
};
|
||||
Signals.addSignalMethods(LookingGlass.prototype);
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
const { Atspi, Clutter, GDesktopEnums,
|
||||
Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
|
||||
const Mainloop = imports.mainloop;
|
||||
const Signals = imports.signals;
|
||||
|
||||
const Background = imports.ui.background;
|
||||
@@ -127,8 +128,6 @@ var Magnifier = class Magnifier {
|
||||
* Show the system mouse pointer.
|
||||
*/
|
||||
showSystemCursor() {
|
||||
if (this._cursorTracker.set_keep_focus_while_hidden)
|
||||
this._cursorTracker.set_keep_focus_while_hidden(false);
|
||||
this._cursorTracker.set_pointer_visible(true);
|
||||
}
|
||||
|
||||
@@ -137,8 +136,6 @@ var Magnifier = class Magnifier {
|
||||
* Hide the system mouse pointer.
|
||||
*/
|
||||
hideSystemCursor() {
|
||||
if (this._cursorTracker.set_keep_focus_while_hidden)
|
||||
this._cursorTracker.set_keep_focus_while_hidden(true);
|
||||
this._cursorTracker.set_pointer_visible(false);
|
||||
}
|
||||
|
||||
@@ -173,7 +170,7 @@ var Magnifier = class Magnifier {
|
||||
// Make sure system mouse pointer is shown when all zoom regions are
|
||||
// invisible.
|
||||
if (!activate)
|
||||
this.showSystemCursor();
|
||||
this._cursorTracker.set_pointer_visible(true);
|
||||
|
||||
// Notify interested parties of this change
|
||||
this.emit('active-changed', activate);
|
||||
@@ -268,7 +265,7 @@ var Magnifier = class Magnifier {
|
||||
zoomRegion.setViewPort(viewPort);
|
||||
|
||||
// We ignore the redundant width/height on the ROI
|
||||
let fixedROI = Object.create(roi);
|
||||
let fixedROI = new Object(roi);
|
||||
fixedROI.width = viewPort.width / xMagFactor;
|
||||
fixedROI.height = viewPort.height / yMagFactor;
|
||||
zoomRegion.setROI(fixedROI);
|
||||
@@ -455,11 +452,15 @@ var Magnifier = class Magnifier {
|
||||
* @clip: Flag to indicate whether to clip the crosshairs.
|
||||
*/
|
||||
setCrosshairsClip(clip) {
|
||||
if (!this._crossHairs)
|
||||
return;
|
||||
|
||||
// Setting no clipping on crosshairs means a zero sized clip rectangle.
|
||||
this._crossHairs.setClip(clip ? CROSSHAIRS_CLIP_SIZE : [0, 0]);
|
||||
if (clip) {
|
||||
if (this._crossHairs)
|
||||
this._crossHairs.setClip(CROSSHAIRS_CLIP_SIZE);
|
||||
} else {
|
||||
// Setting no clipping on crosshairs means a zero sized clip
|
||||
// rectangle.
|
||||
if (this._crossHairs)
|
||||
this._crossHairs.setClip([0, 0]);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1143,7 +1144,7 @@ var ZoomRegion = class ZoomRegion {
|
||||
|
||||
_clearScrollContentsTimer() {
|
||||
if (this._scrollContentsTimerId != 0) {
|
||||
GLib.source_remove(this._scrollContentsTimerId);
|
||||
Mainloop.source_remove(this._scrollContentsTimerId);
|
||||
this._scrollContentsTimerId = 0;
|
||||
}
|
||||
}
|
||||
@@ -1155,7 +1156,7 @@ var ZoomRegion = class ZoomRegion {
|
||||
}
|
||||
|
||||
this._clearScrollContentsTimer();
|
||||
this._scrollContentsTimerId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, POINTER_REST_TIME, () => {
|
||||
this._scrollContentsTimerId = Mainloop.timeout_add(POINTER_REST_TIME, () => {
|
||||
this._scrollContentsToDelayed(x, y);
|
||||
return GLib.SOURCE_REMOVE;
|
||||
});
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
initializeDeferredWork, getThemeStylesheet, setThemeStylesheet */
|
||||
|
||||
const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
|
||||
const Mainloop = imports.mainloop;
|
||||
|
||||
const AccessDialog = imports.ui.accessDialog;
|
||||
const AudioDeviceSelection = imports.ui.audioDeviceSelection;
|
||||
@@ -229,11 +230,7 @@ function _initializeUI() {
|
||||
EndSessionDialog.init();
|
||||
|
||||
// We're ready for the session manager to move to the next phase
|
||||
GLib.idle_add(GLib.PRIORITY_DEFAULT, () => {
|
||||
Shell.util_sd_notify();
|
||||
Meta.register_with_session();
|
||||
return GLib.SOURCE_REMOVE;
|
||||
});
|
||||
Meta.register_with_session();
|
||||
|
||||
_startDate = new Date();
|
||||
|
||||
@@ -623,7 +620,7 @@ function _runDeferredWork(workId) {
|
||||
_deferredWorkQueue.splice(index, 1);
|
||||
_deferredWorkData[workId].callback();
|
||||
if (_deferredWorkQueue.length == 0 && _deferredTimeoutId > 0) {
|
||||
GLib.source_remove(_deferredTimeoutId);
|
||||
Mainloop.source_remove(_deferredTimeoutId);
|
||||
_deferredTimeoutId = 0;
|
||||
}
|
||||
}
|
||||
@@ -709,8 +706,9 @@ function queueDeferredWork(workId) {
|
||||
_deferredWorkQueue.push(workId);
|
||||
if (data.actor.mapped) {
|
||||
_queueBeforeRedraw(workId);
|
||||
return;
|
||||
} else if (_deferredTimeoutId == 0) {
|
||||
_deferredTimeoutId = GLib.timeout_add_seconds(GLib.PRIORITY_DEFAULT, DEFERRED_TIMEOUT_SECONDS, () => {
|
||||
_deferredTimeoutId = Mainloop.timeout_add_seconds(DEFERRED_TIMEOUT_SECONDS, () => {
|
||||
_runAllDeferredWork();
|
||||
_deferredTimeoutId = 0;
|
||||
return GLib.SOURCE_REMOVE;
|
||||
|
||||
@@ -333,10 +333,7 @@ var Message = class Message {
|
||||
|
||||
let closeIcon = new St.Icon({ icon_name: 'window-close-symbolic',
|
||||
icon_size: 16 });
|
||||
this._closeButton = new St.Button({
|
||||
style_class: 'message-close-button',
|
||||
child: closeIcon, opacity: 0,
|
||||
});
|
||||
this._closeButton = new St.Button({ child: closeIcon, opacity: 0 });
|
||||
titleBox.add_actor(this._closeButton);
|
||||
|
||||
this._bodyStack = new St.Widget({ x_expand: true });
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
SystemNotificationSource, MessageTray */
|
||||
|
||||
const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
|
||||
const Mainloop = imports.mainloop;
|
||||
const Signals = imports.signals;
|
||||
|
||||
const Calendar = imports.ui.calendar;
|
||||
@@ -136,14 +137,13 @@ var FocusGrabber = class FocusGrabber {
|
||||
// A notification without a policy object will inherit the default one.
|
||||
var NotificationPolicy = class NotificationPolicy {
|
||||
constructor(params) {
|
||||
params = Params.parse(params, {
|
||||
enable: true,
|
||||
enableSound: true,
|
||||
showBanners: true,
|
||||
forceExpanded: false,
|
||||
showInLockScreen: true,
|
||||
detailsInLockScreen: false,
|
||||
});
|
||||
params = Params.parse(params, { enable: true,
|
||||
enableSound: true,
|
||||
showBanners: true,
|
||||
forceExpanded: false,
|
||||
showInLockScreen: true,
|
||||
detailsInLockScreen: false
|
||||
});
|
||||
Object.getOwnPropertyNames(params).forEach(key => {
|
||||
let desc = Object.getOwnPropertyDescriptor(params, key);
|
||||
Object.defineProperty(this, `_${key}`, desc);
|
||||
@@ -153,7 +153,6 @@ var NotificationPolicy = class NotificationPolicy {
|
||||
// Do nothing for the default policy. These methods are only useful for the
|
||||
// GSettings policy.
|
||||
store() { }
|
||||
|
||||
destroy() { }
|
||||
|
||||
get enable() {
|
||||
@@ -335,7 +334,7 @@ class NotificationApplicationPolicy extends NotificationPolicy {
|
||||
// event sound is played when the notification is shown (if the policy for
|
||||
// @source allows playing sounds).
|
||||
//
|
||||
// [1] https://developer.gnome.org/notification-spec/#markup
|
||||
// [1] https://developer.gnome.org/notification-spec/#markup
|
||||
var Notification = class Notification {
|
||||
constructor(source, title, banner, params) {
|
||||
this.source = source;
|
||||
@@ -735,9 +734,8 @@ var Source = class Source {
|
||||
}
|
||||
|
||||
get narrowestPrivacyScope() {
|
||||
return this.notifications.every(n => n.privacyScope == PrivacyScope.SYSTEM)
|
||||
? PrivacyScope.SYSTEM
|
||||
: PrivacyScope.USER;
|
||||
return this.notifications.every(n => n.privacyScope == PrivacyScope.SYSTEM) ? PrivacyScope.SYSTEM
|
||||
: PrivacyScope.USER;
|
||||
}
|
||||
|
||||
setTitle(newTitle) {
|
||||
@@ -1006,6 +1004,7 @@ var MessageTray = class MessageTray {
|
||||
|
||||
_addSource(source) {
|
||||
let obj = {
|
||||
source: source,
|
||||
notifyId: 0,
|
||||
destroyId: 0,
|
||||
};
|
||||
@@ -1092,7 +1091,7 @@ var MessageTray = class MessageTray {
|
||||
_resetNotificationLeftTimeout() {
|
||||
this._useLongerNotificationLeftTimeout = false;
|
||||
if (this._notificationLeftTimeoutId) {
|
||||
GLib.source_remove(this._notificationLeftTimeoutId);
|
||||
Mainloop.source_remove(this._notificationLeftTimeoutId);
|
||||
this._notificationLeftTimeoutId = 0;
|
||||
this._notificationLeftMouseX = -1;
|
||||
this._notificationLeftMouseY = -1;
|
||||
@@ -1138,7 +1137,7 @@ var MessageTray = class MessageTray {
|
||||
// We wait for a longer period if the notification popped up where the mouse pointer was already positioned.
|
||||
// That gives the user more time to mouse away from the notification and mouse back in in order to expand it.
|
||||
let timeout = this._useLongerNotificationLeftTimeout ? LONGER_HIDE_TIMEOUT : HIDE_TIMEOUT;
|
||||
this._notificationLeftTimeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, timeout, this._onNotificationLeftTimeout.bind(this));
|
||||
this._notificationLeftTimeoutId = Mainloop.timeout_add(timeout, this._onNotificationLeftTimeout.bind(this));
|
||||
GLib.Source.set_name_by_id(this._notificationLeftTimeoutId, '[gnome-shell] this._onNotificationLeftTimeout');
|
||||
}
|
||||
}
|
||||
@@ -1167,10 +1166,8 @@ var MessageTray = class MessageTray {
|
||||
x < this._notificationLeftMouseX + MOUSE_LEFT_ACTOR_THRESHOLD &&
|
||||
x > this._notificationLeftMouseX - MOUSE_LEFT_ACTOR_THRESHOLD) {
|
||||
this._notificationLeftMouseX = -1;
|
||||
this._notificationLeftTimeoutId = GLib.timeout_add(
|
||||
GLib.PRIORITY_DEFAULT,
|
||||
LONGER_HIDE_TIMEOUT,
|
||||
this._onNotificationLeftTimeout.bind(this));
|
||||
this._notificationLeftTimeoutId = Mainloop.timeout_add(LONGER_HIDE_TIMEOUT,
|
||||
this._onNotificationLeftTimeout.bind(this));
|
||||
GLib.Source.set_name_by_id(this._notificationLeftTimeoutId, '[gnome-shell] this._onNotificationLeftTimeout');
|
||||
} else {
|
||||
this._notificationLeftTimeoutId = 0;
|
||||
@@ -1348,13 +1345,13 @@ var MessageTray = class MessageTray {
|
||||
|
||||
_updateNotificationTimeout(timeout) {
|
||||
if (this._notificationTimeoutId) {
|
||||
GLib.source_remove(this._notificationTimeoutId);
|
||||
Mainloop.source_remove(this._notificationTimeoutId);
|
||||
this._notificationTimeoutId = 0;
|
||||
}
|
||||
if (timeout > 0) {
|
||||
this._notificationTimeoutId =
|
||||
GLib.timeout_add(GLib.PRIORITY_DEFAULT, timeout,
|
||||
this._notificationTimeout.bind(this));
|
||||
Mainloop.timeout_add(timeout,
|
||||
this._notificationTimeout.bind(this));
|
||||
GLib.Source.set_name_by_id(this._notificationTimeoutId, '[gnome-shell] this._notificationTimeout');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -216,8 +216,6 @@ var ModalDialog = GObject.registerClass({
|
||||
if (!Main.pushModal(this, params))
|
||||
return false;
|
||||
|
||||
Main.layoutManager.emit('system-modal-opened');
|
||||
|
||||
this._hasModal = true;
|
||||
if (this._savedKeyFocus) {
|
||||
this._savedKeyFocus.grab_key_focus();
|
||||
@@ -255,7 +253,7 @@ var ModalDialog = GObject.registerClass({
|
||||
opacity: 0,
|
||||
duration: FADE_OUT_DIALOG_TIME,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
onComplete: () => (this.state = State.FADED_OUT)
|
||||
onComplete: () => this.state = State.FADED_OUT
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
@@ -71,9 +71,8 @@ var MediaMessage = class MediaMessage extends MessageList.Message {
|
||||
}
|
||||
|
||||
let isPlaying = this._player.status == 'Playing';
|
||||
let iconName = isPlaying
|
||||
? 'media-playback-pause-symbolic'
|
||||
: 'media-playback-start-symbolic';
|
||||
let iconName = isPlaying ? 'media-playback-pause-symbolic'
|
||||
: 'media-playback-start-symbolic';
|
||||
this._playPauseButton.child.icon_name = iconName;
|
||||
|
||||
this._updateNavButton(this._prevButton, this._player.canGoPrevious);
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
/* exported NotificationDaemon */
|
||||
|
||||
const { GdkPixbuf, Gio, GLib, Shell, St } = imports.gi;
|
||||
const Mainloop = imports.mainloop;
|
||||
|
||||
const Config = imports.misc.config;
|
||||
const Main = imports.ui.main;
|
||||
@@ -170,7 +171,7 @@ var FdoNotificationDaemon = class FdoNotificationDaemon {
|
||||
// Ignore replacesId since we already sent back a
|
||||
// NotificationClosed for that id.
|
||||
id = this._nextNotificationId++;
|
||||
let idleId = GLib.idle_add(GLib.PRIORITY_DEFAULT, () => {
|
||||
let idleId = Mainloop.idle_add(() => {
|
||||
this._emitNotificationClosed(id, NotificationClosedReason.DISMISSED);
|
||||
return GLib.SOURCE_REMOVE;
|
||||
});
|
||||
@@ -346,9 +347,8 @@ var FdoNotificationDaemon = class FdoNotificationDaemon {
|
||||
notification.setTransient(!!hints['transient']);
|
||||
|
||||
let privacyScope = (hints['x-gnome-privacy-scope'] || 'user');
|
||||
notification.setPrivacyScope(privacyScope == 'system'
|
||||
? MessageTray.PrivacyScope.SYSTEM
|
||||
: MessageTray.PrivacyScope.USER);
|
||||
notification.setPrivacyScope(privacyScope == 'system' ? MessageTray.PrivacyScope.SYSTEM
|
||||
: MessageTray.PrivacyScope.USER);
|
||||
|
||||
let sourceGIcon = source.useNotificationIcon ? gicon : null;
|
||||
source.processNotification(notification, sourceGIcon);
|
||||
@@ -541,23 +541,22 @@ class GtkNotificationDaemonNotification extends MessageTray.Notification {
|
||||
super(source);
|
||||
this._serialized = GLib.Variant.new('a{sv}', notification);
|
||||
|
||||
let { title,
|
||||
body,
|
||||
icon: gicon,
|
||||
urgent,
|
||||
priority,
|
||||
buttons,
|
||||
let { "title": title,
|
||||
"body": body,
|
||||
"icon": gicon,
|
||||
"urgent": urgent,
|
||||
"priority": priority,
|
||||
"buttons": buttons,
|
||||
"default-action": defaultAction,
|
||||
"default-action-target": defaultActionTarget,
|
||||
timestamp: time } = notification;
|
||||
"timestamp": time } = notification;
|
||||
|
||||
if (priority) {
|
||||
let urgency = PRIORITY_URGENCY_MAP[priority.unpack()];
|
||||
this.setUrgency(urgency != undefined ? urgency : MessageTray.Urgency.NORMAL);
|
||||
} else if (urgent) {
|
||||
this.setUrgency(urgent.unpack()
|
||||
? MessageTray.Urgency.CRITICAL
|
||||
: MessageTray.Urgency.NORMAL);
|
||||
this.setUrgency(urgent.unpack() ? MessageTray.Urgency.CRITICAL
|
||||
: MessageTray.Urgency.NORMAL);
|
||||
} else {
|
||||
this.setUrgency(MessageTray.Urgency.NORMAL);
|
||||
}
|
||||
@@ -590,8 +589,8 @@ class GtkNotificationDaemonNotification extends MessageTray.Notification {
|
||||
}
|
||||
|
||||
_onButtonClicked(button) {
|
||||
let { action, target } = button;
|
||||
this._activateAction(action.unpack(), target);
|
||||
let { 'action': action, 'target': actionTarget } = button;
|
||||
this._activateAction(action.unpack(), actionTarget);
|
||||
}
|
||||
|
||||
activate() {
|
||||
@@ -618,7 +617,7 @@ function getPlatformData() {
|
||||
|
||||
function InvalidAppError() {}
|
||||
|
||||
var GtkNotificationDaemonAppSource =
|
||||
var GtkNotificationDaemonAppSource =
|
||||
class GtkNotificationDaemonAppSource extends MessageTray.Source {
|
||||
constructor(appId) {
|
||||
let objectPath = objectPathFromAppId(appId);
|
||||
@@ -751,33 +750,29 @@ var GtkNotificationDaemon = class GtkNotificationDaemon {
|
||||
_loadNotifications() {
|
||||
this._isLoading = true;
|
||||
|
||||
try {
|
||||
let value = global.get_persistent_state('a(sa(sv))', 'notifications');
|
||||
if (value) {
|
||||
let sources = value.deep_unpack();
|
||||
sources.forEach(([appId, notifications]) => {
|
||||
if (notifications.length == 0)
|
||||
let value = global.get_persistent_state('a(sa(sv))', 'notifications');
|
||||
if (value) {
|
||||
let sources = value.deep_unpack();
|
||||
sources.forEach(([appId, notifications]) => {
|
||||
if (notifications.length == 0)
|
||||
return;
|
||||
|
||||
let source;
|
||||
try {
|
||||
source = this._ensureAppSource(appId);
|
||||
} catch (e) {
|
||||
if (e instanceof InvalidAppError)
|
||||
return;
|
||||
throw e;
|
||||
}
|
||||
|
||||
let source;
|
||||
try {
|
||||
source = this._ensureAppSource(appId);
|
||||
} catch (e) {
|
||||
if (e instanceof InvalidAppError)
|
||||
return;
|
||||
throw e;
|
||||
}
|
||||
|
||||
notifications.forEach(([notificationId, notification]) => {
|
||||
source.addNotification(notificationId, notification.deep_unpack(), false);
|
||||
});
|
||||
notifications.forEach(([notificationId, notification]) => {
|
||||
source.addNotification(notificationId, notification.deep_unpack(), false);
|
||||
});
|
||||
}
|
||||
} catch (e) {
|
||||
logError(e, 'Failed to load saved notifications');
|
||||
} finally {
|
||||
this._isLoading = false;
|
||||
});
|
||||
}
|
||||
|
||||
this._isLoading = false;
|
||||
}
|
||||
|
||||
_saveNotifications() {
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
/* exported OsdWindowManager */
|
||||
|
||||
const { Clutter, GLib, GObject, Meta, St } = imports.gi;
|
||||
const Mainloop = imports.mainloop;
|
||||
|
||||
const BarLevel = imports.ui.barLevel;
|
||||
const Layout = imports.ui.layout;
|
||||
@@ -142,9 +143,9 @@ var OsdWindow = class {
|
||||
}
|
||||
|
||||
if (this._hideTimeoutId)
|
||||
GLib.source_remove(this._hideTimeoutId);
|
||||
this._hideTimeoutId = GLib.timeout_add(
|
||||
GLib.PRIORITY_DEFAULT, HIDE_TIMEOUT, this._hide.bind(this));
|
||||
Mainloop.source_remove(this._hideTimeoutId);
|
||||
this._hideTimeoutId = Mainloop.timeout_add(HIDE_TIMEOUT,
|
||||
this._hide.bind(this));
|
||||
GLib.Source.set_name_by_id(this._hideTimeoutId, '[gnome-shell] this._hide');
|
||||
}
|
||||
|
||||
@@ -152,7 +153,7 @@ var OsdWindow = class {
|
||||
if (!this._hideTimeoutId)
|
||||
return;
|
||||
|
||||
GLib.source_remove(this._hideTimeoutId);
|
||||
Mainloop.source_remove(this._hideTimeoutId);
|
||||
this._hide();
|
||||
}
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
/* exported Overview */
|
||||
|
||||
const { Clutter, GLib, Meta, Shell, St } = imports.gi;
|
||||
const Mainloop = imports.mainloop;
|
||||
const Signals = imports.signals;
|
||||
|
||||
const Background = imports.ui.background;
|
||||
@@ -42,10 +43,9 @@ var ShellInfo = class {
|
||||
}
|
||||
|
||||
setMessage(text, options) {
|
||||
options = Params.parse(options, {
|
||||
undoCallback: null,
|
||||
forFeedback: false,
|
||||
});
|
||||
options = Params.parse(options, { undoCallback: null,
|
||||
forFeedback: false
|
||||
});
|
||||
|
||||
let undoCallback = options.undoCallback;
|
||||
let forFeedback = options.forFeedback;
|
||||
@@ -300,7 +300,7 @@ var Overview = class {
|
||||
|
||||
_resetWindowSwitchTimeout() {
|
||||
if (this._windowSwitchTimeoutId != 0) {
|
||||
GLib.source_remove(this._windowSwitchTimeoutId);
|
||||
Mainloop.source_remove(this._windowSwitchTimeoutId);
|
||||
this._windowSwitchTimeoutId = 0;
|
||||
}
|
||||
}
|
||||
@@ -323,9 +323,7 @@ var Overview = class {
|
||||
|
||||
if (targetIsWindow) {
|
||||
this._lastHoveredWindow = dragEvent.targetActor._delegate.metaWindow;
|
||||
this._windowSwitchTimeoutId = GLib.timeout_add(
|
||||
GLib.PRIORITY_DEFAULT,
|
||||
DND_WINDOW_SWITCH_TIMEOUT,
|
||||
this._windowSwitchTimeoutId = Mainloop.timeout_add(DND_WINDOW_SWITCH_TIMEOUT,
|
||||
() => {
|
||||
this._windowSwitchTimeoutId = 0;
|
||||
Main.activateWindow(dragEvent.targetActor._delegate.metaWindow,
|
||||
@@ -452,7 +450,7 @@ var Overview = class {
|
||||
this._desktopFade.show();
|
||||
this._desktopFade.ease({
|
||||
opacity: 0,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
mode: Clutter.Animates.EASE_OUT_QUAD,
|
||||
duration: ANIMATION_TIME
|
||||
});
|
||||
}
|
||||
@@ -483,13 +481,15 @@ var Overview = class {
|
||||
|
||||
if (this._shown) {
|
||||
let shouldBeModal = !this._inXdndDrag;
|
||||
if (shouldBeModal && !this._modal) {
|
||||
let actionMode = Shell.ActionMode.OVERVIEW;
|
||||
if (Main.pushModal(this._overview, { actionMode })) {
|
||||
this._modal = true;
|
||||
} else {
|
||||
this.hide();
|
||||
return false;
|
||||
if (shouldBeModal) {
|
||||
if (!this._modal) {
|
||||
if (Main.pushModal(this._overview,
|
||||
{ actionMode: Shell.ActionMode.OVERVIEW })) {
|
||||
this._modal = true;
|
||||
} else {
|
||||
this.hide();
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
|
||||
@@ -14,8 +14,8 @@ var SIDE_CONTROLS_ANIMATION_TIME = 160;
|
||||
function getRtlSlideDirection(direction, actor) {
|
||||
let rtl = (actor.text_direction == Clutter.TextDirection.RTL);
|
||||
if (rtl)
|
||||
direction = (direction == SlideDirection.LEFT)
|
||||
? SlideDirection.RIGHT : SlideDirection.LEFT;
|
||||
direction = (direction == SlideDirection.LEFT) ?
|
||||
SlideDirection.RIGHT : SlideDirection.LEFT;
|
||||
|
||||
return direction;
|
||||
}
|
||||
@@ -67,9 +67,8 @@ var SlideLayout = GObject.registerClass({
|
||||
// flags only determine what to do if the allocated box is bigger
|
||||
// than the actor's box.
|
||||
let realDirection = getRtlSlideDirection(this._direction, child);
|
||||
let alignX = (realDirection == SlideDirection.LEFT)
|
||||
? availWidth - natWidth
|
||||
: availWidth - natWidth * this._slideX;
|
||||
let alignX = (realDirection == SlideDirection.LEFT) ? (availWidth - natWidth)
|
||||
: (availWidth - natWidth * this._slideX);
|
||||
|
||||
let actorBox = new Clutter.ActorBox();
|
||||
actorBox.x1 = box.x1 + alignX + this._translationX;
|
||||
@@ -249,7 +248,6 @@ var SlidingControl = class {
|
||||
// selector; this means we can now safely set the full slide for
|
||||
// the next page, since slideIn or slideOut might have been called,
|
||||
// changing the visiblity
|
||||
this.actor.remove_transition('@layout.slide-x');
|
||||
this.layout.slide_x = this._getSlide();
|
||||
this._updateTranslation();
|
||||
}
|
||||
|
||||
@@ -126,14 +126,12 @@ class AnimatedPageIndicators extends PageIndicators {
|
||||
offset = children[0].width;
|
||||
|
||||
let isAnimationIn = animationDirection == AnimationDirection.IN;
|
||||
let delay = isAnimationIn
|
||||
? INDICATORS_ANIMATION_DELAY
|
||||
: INDICATORS_ANIMATION_DELAY_OUT;
|
||||
let delay = isAnimationIn ? INDICATORS_ANIMATION_DELAY :
|
||||
INDICATORS_ANIMATION_DELAY_OUT;
|
||||
let baseTime = isAnimationIn ? INDICATORS_BASE_TIME : INDICATORS_BASE_TIME_OUT;
|
||||
let totalAnimationTime = baseTime + delay * this._nPages;
|
||||
let maxTime = isAnimationIn
|
||||
? INDICATORS_ANIMATION_MAX_TIME
|
||||
: INDICATORS_ANIMATION_MAX_TIME_OUT;
|
||||
let maxTime = isAnimationIn ? INDICATORS_ANIMATION_MAX_TIME :
|
||||
INDICATORS_ANIMATION_MAX_TIME_OUT;
|
||||
if (totalAnimationTime > maxTime)
|
||||
delay -= (totalAnimationTime - maxTime) / this._nPages;
|
||||
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
|
||||
const { Atk, Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
|
||||
const Cairo = imports.cairo;
|
||||
const Mainloop = imports.mainloop;
|
||||
|
||||
const Animation = imports.ui.animation;
|
||||
const Config = imports.misc.config;
|
||||
@@ -170,13 +171,9 @@ class AppMenu extends PopupMenu.PopupMenu {
|
||||
let windows = this._app.get_windows();
|
||||
windows.forEach(window => {
|
||||
let title = window.title || this._app.get_name();
|
||||
let item = this._windowSection.addAction(title, event => {
|
||||
this._windowSection.addAction(title, event => {
|
||||
Main.activateWindow(window, event.get_time());
|
||||
});
|
||||
let id = window.connect('notify::title', () => {
|
||||
item.label.text = window.title || this._app.get_name();
|
||||
});
|
||||
item.connect('destroy', () => window.disconnect(id));
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -238,10 +235,7 @@ var AppMenuButton = GObject.registerClass({
|
||||
this._overviewHidingId = Main.overview.connect('hiding', this._sync.bind(this));
|
||||
this._overviewShowingId = Main.overview.connect('showing', this._sync.bind(this));
|
||||
|
||||
this._spinner = new Animation.Spinner(PANEL_ICON_SIZE, {
|
||||
animate: true,
|
||||
hideOnStop: true,
|
||||
});
|
||||
this._spinner = new Animation.Spinner(PANEL_ICON_SIZE, true);
|
||||
this._container.add_actor(this._spinner.actor);
|
||||
|
||||
let menu = new AppMenu(this);
|
||||
@@ -457,8 +451,8 @@ class ActivitiesButton extends PanelMenu.Button {
|
||||
return DND.DragMotionResult.CONTINUE;
|
||||
|
||||
if (this._xdndTimeOut != 0)
|
||||
GLib.source_remove(this._xdndTimeOut);
|
||||
this._xdndTimeOut = GLib.timeout_add(GLib.PRIORITY_DEFAULT, BUTTON_DND_ACTIVATION_TIMEOUT, () => {
|
||||
Mainloop.source_remove(this._xdndTimeOut);
|
||||
this._xdndTimeOut = Mainloop.timeout_add(BUTTON_DND_ACTIVATION_TIMEOUT, () => {
|
||||
this._xdndToggleOverview();
|
||||
});
|
||||
GLib.Source.set_name_by_id(this._xdndTimeOut, '[gnome-shell] this._xdndToggleOverview');
|
||||
@@ -502,7 +496,7 @@ class ActivitiesButton extends PanelMenu.Button {
|
||||
if (pickedActor == this && Main.overview.shouldToggleByCornerOrButton())
|
||||
Main.overview.toggle();
|
||||
|
||||
GLib.source_remove(this._xdndTimeOut);
|
||||
Mainloop.source_remove(this._xdndTimeOut);
|
||||
this._xdndTimeOut = 0;
|
||||
return GLib.SOURCE_REMOVE;
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/* exported PointerA11yTimeout */
|
||||
const { Clutter, GObject, Meta, St } = imports.gi;
|
||||
const { Clutter, GLib, GObject, Meta, St } = imports.gi;
|
||||
const Main = imports.ui.main;
|
||||
const Cairo = imports.cairo;
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
/* exported getPointerWatcher */
|
||||
|
||||
const { GLib, Meta } = imports.gi;
|
||||
const Mainloop = imports.mainloop;
|
||||
|
||||
// We stop polling if the user is idle for more than this amount of time
|
||||
var IDLE_TIME = 1000;
|
||||
@@ -86,7 +87,7 @@ var PointerWatcher = class {
|
||||
|
||||
_updateTimeout() {
|
||||
if (this._timeoutId) {
|
||||
GLib.source_remove(this._timeoutId);
|
||||
Mainloop.source_remove(this._timeoutId);
|
||||
this._timeoutId = 0;
|
||||
}
|
||||
|
||||
@@ -97,8 +98,8 @@ var PointerWatcher = class {
|
||||
for (let i = 1; i < this._watches.length; i++)
|
||||
minInterval = Math.min(this._watches[i].interval, minInterval);
|
||||
|
||||
this._timeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, minInterval,
|
||||
this._onTimeout.bind(this));
|
||||
this._timeoutId = Mainloop.timeout_add(minInterval,
|
||||
this._onTimeout.bind(this));
|
||||
GLib.Source.set_name_by_id(this._timeoutId, '[gnome-shell] this._onTimeout');
|
||||
}
|
||||
|
||||
|
||||
@@ -15,7 +15,6 @@ var Ornament = {
|
||||
NONE: 0,
|
||||
DOT: 1,
|
||||
CHECK: 2,
|
||||
HIDDEN: 3,
|
||||
};
|
||||
|
||||
function isPopupMenuItemVisible(child) {
|
||||
@@ -58,9 +57,11 @@ var PopupBaseMenuItem = GObject.registerClass({
|
||||
Properties: {
|
||||
'active': GObject.ParamSpec.boolean('active', 'active', 'active',
|
||||
GObject.ParamFlags.READWRITE,
|
||||
GObject.TYPE_BOOLEAN,
|
||||
false),
|
||||
'sensitive': GObject.ParamSpec.boolean('sensitive', 'sensitive', 'sensitive',
|
||||
GObject.ParamFlags.READWRITE,
|
||||
GObject.TYPE_BOOLEAN,
|
||||
true),
|
||||
},
|
||||
Signals: {
|
||||
@@ -68,13 +69,12 @@ var PopupBaseMenuItem = GObject.registerClass({
|
||||
}
|
||||
}, class PopupBaseMenuItem extends St.BoxLayout {
|
||||
_init(params) {
|
||||
params = Params.parse (params, {
|
||||
reactive: true,
|
||||
activate: true,
|
||||
hover: true,
|
||||
style_class: null,
|
||||
can_focus: true,
|
||||
});
|
||||
params = Params.parse (params, { reactive: true,
|
||||
activate: true,
|
||||
hover: true,
|
||||
style_class: null,
|
||||
can_focus: true
|
||||
});
|
||||
super._init({ style_class: 'popup-menu-item',
|
||||
reactive: params.reactive,
|
||||
track_hover: params.reactive,
|
||||
@@ -249,12 +249,10 @@ var PopupBaseMenuItem = GObject.registerClass({
|
||||
} else if (ornament == Ornament.CHECK) {
|
||||
this._ornamentLabel.text = '\u2713';
|
||||
this.add_accessible_state(Atk.StateType.CHECKED);
|
||||
} else if (ornament == Ornament.NONE || ornament == Ornament.HIDDEN) {
|
||||
} else if (ornament == Ornament.NONE) {
|
||||
this._ornamentLabel.text = '';
|
||||
this.remove_accessible_state(Atk.StateType.CHECKED);
|
||||
}
|
||||
|
||||
this._ornamentLabel.visible = ornament != Ornament.HIDDEN;
|
||||
}
|
||||
});
|
||||
|
||||
@@ -335,10 +333,9 @@ var PopupSwitchMenuItem = GObject.registerClass({
|
||||
this._statusBin = new St.Bin({ x_align: St.Align.END });
|
||||
this.add(this._statusBin, { expand: true, x_align: St.Align.END });
|
||||
|
||||
this._statusLabel = new St.Label({
|
||||
text: '',
|
||||
style_class: 'popup-status-menu-item',
|
||||
});
|
||||
this._statusLabel = new St.Label({ text: '',
|
||||
style_class: 'popup-status-menu-item'
|
||||
});
|
||||
this._statusBin.child = this._switch;
|
||||
}
|
||||
|
||||
@@ -428,7 +425,6 @@ var PopupMenuBase = class {
|
||||
throw new TypeError(`Cannot instantiate abstract class ${this.constructor.name}`);
|
||||
|
||||
this.sourceActor = sourceActor;
|
||||
this.focusActor = sourceActor;
|
||||
this._parent = null;
|
||||
|
||||
if (styleClass !== undefined) {
|
||||
@@ -553,7 +549,7 @@ var PopupMenuBase = class {
|
||||
}
|
||||
|
||||
_connectItemSignals(menuItem) {
|
||||
menuItem._activeChangeId = menuItem.connect('notify::active', menuItem => {
|
||||
menuItem._activeChangeId = menuItem.connect('notify::active', (menuItem) => {
|
||||
let active = menuItem.active;
|
||||
if (active && this._activeMenuItem != menuItem) {
|
||||
if (this._activeMenuItem)
|
||||
@@ -617,8 +613,8 @@ var PopupMenuBase = class {
|
||||
while (childBeforeIndex >= 0 && !isPopupMenuItemVisible(children[childBeforeIndex]))
|
||||
childBeforeIndex--;
|
||||
|
||||
if (childBeforeIndex < 0 ||
|
||||
children[childBeforeIndex]._delegate instanceof PopupSeparatorMenuItem) {
|
||||
if (childBeforeIndex < 0
|
||||
|| children[childBeforeIndex]._delegate instanceof PopupSeparatorMenuItem) {
|
||||
menuItem.actor.hide();
|
||||
return;
|
||||
}
|
||||
@@ -628,8 +624,8 @@ var PopupMenuBase = class {
|
||||
while (childAfterIndex < children.length && !isPopupMenuItemVisible(children[childAfterIndex]))
|
||||
childAfterIndex++;
|
||||
|
||||
if (childAfterIndex >= children.length ||
|
||||
children[childAfterIndex]._delegate instanceof PopupSeparatorMenuItem) {
|
||||
if (childAfterIndex >= children.length
|
||||
|| children[childAfterIndex]._delegate instanceof PopupSeparatorMenuItem) {
|
||||
menuItem.actor.hide();
|
||||
return;
|
||||
}
|
||||
@@ -722,11 +718,10 @@ var PopupMenuBase = class {
|
||||
this.disconnect(openStateChangeId);
|
||||
menuItem.disconnect(destroyId);
|
||||
});
|
||||
} else if (menuItem instanceof PopupBaseMenuItem) {
|
||||
} else if (menuItem instanceof PopupBaseMenuItem)
|
||||
this._connectItemSignals(menuItem);
|
||||
} else {
|
||||
else
|
||||
throw TypeError("Invalid argument to PopupMenuBase.addMenuItem()");
|
||||
}
|
||||
|
||||
menuItem._setParent(this);
|
||||
|
||||
@@ -804,7 +799,6 @@ var PopupMenu = class extends PopupMenuBase {
|
||||
this._keyPressId = this.sourceActor.connect('key-press-event',
|
||||
this._onKeyPress.bind(this));
|
||||
|
||||
this._systemModalOpenedId = 0;
|
||||
this._openedSubMenu = null;
|
||||
}
|
||||
|
||||
@@ -879,11 +873,6 @@ var PopupMenu = class extends PopupMenuBase {
|
||||
if (this.isEmpty())
|
||||
return;
|
||||
|
||||
if (!this._systemModalOpenedId) {
|
||||
this._systemModalOpenedId =
|
||||
Main.layoutManager.connect('system-modal-opened', () => this.close());
|
||||
}
|
||||
|
||||
this.isOpen = true;
|
||||
|
||||
this._boxPointer.setPosition(this.sourceActor, this._arrowAlignment);
|
||||
@@ -914,11 +903,6 @@ var PopupMenu = class extends PopupMenuBase {
|
||||
destroy() {
|
||||
if (this._keyPressId)
|
||||
this.sourceActor.disconnect(this._keyPressId);
|
||||
|
||||
if (this._systemModalOpenedId)
|
||||
Main.layoutManager.disconnect(this._systemModalOpenedId);
|
||||
this._systemModalOpenedId = 0;
|
||||
|
||||
super.destroy();
|
||||
}
|
||||
};
|
||||
@@ -1312,20 +1296,18 @@ var PopupMenuManager = class {
|
||||
if (open) {
|
||||
if (this.activeMenu)
|
||||
this.activeMenu.close(BoxPointer.PopupAnimation.FADE);
|
||||
this._grabHelper.grab({
|
||||
actor: menu.actor,
|
||||
focus: menu.focusActor,
|
||||
onUngrab: isUser => this._closeMenu(isUser, menu),
|
||||
});
|
||||
this._grabHelper.grab({ actor: menu.actor, focus: menu.sourceActor,
|
||||
onUngrab: isUser => {
|
||||
this._closeMenu(isUser, menu);
|
||||
} });
|
||||
} else {
|
||||
this._grabHelper.ungrab({ actor: menu.actor });
|
||||
}
|
||||
}
|
||||
|
||||
_changeMenu(newMenu) {
|
||||
newMenu.open(this.activeMenu
|
||||
? BoxPointer.PopupAnimation.FADE
|
||||
: BoxPointer.PopupAnimation.FULL);
|
||||
newMenu.open(this.activeMenu ? BoxPointer.PopupAnimation.FADE
|
||||
: BoxPointer.PopupAnimation.FULL);
|
||||
}
|
||||
|
||||
_onMenuSourceEnter(menu) {
|
||||
|
||||
@@ -34,12 +34,6 @@ var Ripples = class Ripples {
|
||||
this._ripple3.set_pivot_point(px, py);
|
||||
}
|
||||
|
||||
destroy() {
|
||||
this._ripple1.destroy();
|
||||
this._ripple2.destroy();
|
||||
this._ripple3.destroy();
|
||||
}
|
||||
|
||||
_animRipple(ripple, delay, duration, startScale, startOpacity, finalScale) {
|
||||
// We draw a ripple by using a source image and animating it scaling
|
||||
// outwards and fading away. We want the ripples to move linearly
|
||||
@@ -67,7 +61,7 @@ var Ripples = class Ripples {
|
||||
delay,
|
||||
duration,
|
||||
mode: Clutter.AnimationMode.LINEAR,
|
||||
onComplete: () => (ripple.visible = false)
|
||||
onComplete: () => ripple.visible = false
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -94,17 +94,15 @@ class RunDialog extends ModalDialog.ModalDialog {
|
||||
|
||||
this._errorBox.hide();
|
||||
|
||||
this.setButtons([{
|
||||
action: this.close.bind(this),
|
||||
label: _("Close"),
|
||||
key: Clutter.Escape,
|
||||
}]);
|
||||
this.setButtons([{ action: this.close.bind(this),
|
||||
label: _("Close"),
|
||||
key: Clutter.Escape }]);
|
||||
|
||||
this._pathCompleter = new Gio.FilenameCompleter();
|
||||
|
||||
this._history = new History.HistoryManager({ gsettingsKey: HISTORY_KEY,
|
||||
entry: this._entryText });
|
||||
this._entryText.connect('activate', o => {
|
||||
this._entryText.connect('activate', (o) => {
|
||||
this.popModal();
|
||||
this._run(o.get_text(),
|
||||
Clutter.get_current_event().get_state() & Clutter.ModifierType.CONTROL_MASK);
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
const { AccountsService, Clutter, Cogl, Gio, GLib,
|
||||
GnomeDesktop, GObject, Meta, Shell, St } = imports.gi;
|
||||
const Cairo = imports.cairo;
|
||||
const Mainloop = imports.mainloop;
|
||||
const Signals = imports.signals;
|
||||
|
||||
const Background = imports.ui.background;
|
||||
@@ -17,8 +18,6 @@ const MessageTray = imports.ui.messageTray;
|
||||
const ShellDBus = imports.ui.shellDBus;
|
||||
const SmartcardManager = imports.misc.smartcardManager;
|
||||
|
||||
const { adjustAnimationTime } = imports.ui.environment;
|
||||
|
||||
const SCREENSAVER_SCHEMA = 'org.gnome.desktop.screensaver';
|
||||
const LOCK_ENABLED_KEY = 'lock-enabled';
|
||||
const LOCK_DELAY_KEY = 'lock-delay';
|
||||
@@ -53,17 +52,11 @@ var Clock = class {
|
||||
this.actor = new St.BoxLayout({ style_class: 'screen-shield-clock',
|
||||
vertical: true });
|
||||
|
||||
this._time = new St.Label({
|
||||
style_class: 'screen-shield-clock-time',
|
||||
x_align: Clutter.ActorAlign.CENTER,
|
||||
});
|
||||
this._date = new St.Label({
|
||||
style_class: 'screen-shield-clock-date',
|
||||
x_align: Clutter.ActorAlign.CENTER,
|
||||
});
|
||||
this._time = new St.Label({ style_class: 'screen-shield-clock-time' });
|
||||
this._date = new St.Label({ style_class: 'screen-shield-clock-date' });
|
||||
|
||||
this.actor.add_child(this._time);
|
||||
this.actor.add_child(this._date);
|
||||
this.actor.add(this._time, { x_align: St.Align.MIDDLE });
|
||||
this.actor.add(this._date, { x_align: St.Align.MIDDLE });
|
||||
|
||||
this._wallClock = new GnomeDesktop.WallClock({ time_only: true });
|
||||
this._wallClock.connect('notify::clock', this._updateClock.bind(this));
|
||||
@@ -99,7 +92,7 @@ var NotificationsBox = class {
|
||||
style_class: 'screen-shield-notifications-container' });
|
||||
this._scrollView.add_actor(this._notificationBox);
|
||||
|
||||
this.actor.add_child(this._scrollView);
|
||||
this.actor.add(this._scrollView, { x_fill: true, x_align: St.Align.START });
|
||||
|
||||
this._sources = new Map();
|
||||
Main.messageTray.getSources().forEach(source => {
|
||||
@@ -140,10 +133,10 @@ var NotificationsBox = class {
|
||||
|
||||
_makeNotificationSource(source, box) {
|
||||
let sourceActor = new MessageTray.SourceActor(source, SUMMARY_ICON_SIZE);
|
||||
box.add_child(sourceActor);
|
||||
box.add(sourceActor, { y_fill: true });
|
||||
|
||||
let textBox = new St.BoxLayout({ vertical: true });
|
||||
box.add_child(textBox);
|
||||
box.add(textBox, { y_fill: false, y_align: St.Align.START });
|
||||
|
||||
let title = new St.Label({ text: source.title,
|
||||
style_class: 'screen-shield-notification-label' });
|
||||
@@ -166,7 +159,7 @@ var NotificationsBox = class {
|
||||
box.add(sourceBin);
|
||||
|
||||
let textBox = new St.BoxLayout({ vertical: true });
|
||||
box.add_child(textBox);
|
||||
box.add(textBox, { y_fill: false, y_align: St.Align.START });
|
||||
|
||||
let title = new St.Label({ text: source.title,
|
||||
style_class: 'screen-shield-notification-label' });
|
||||
@@ -181,9 +174,8 @@ var NotificationsBox = class {
|
||||
|
||||
let body = '';
|
||||
if (n.bannerBodyText) {
|
||||
body = n.bannerBodyMarkup
|
||||
? n.bannerBodyText
|
||||
: GLib.markup_escape_text(n.bannerBodyText, -1);
|
||||
body = n.bannerBodyMarkup ? n.bannerBodyText
|
||||
: GLib.markup_escape_text(n.bannerBodyText, -1);
|
||||
}
|
||||
|
||||
let label = new St.Label({ style_class: 'screen-shield-notification-count-text' });
|
||||
@@ -228,7 +220,7 @@ var NotificationsBox = class {
|
||||
obj.sourceBox = new St.BoxLayout({ style_class: 'screen-shield-notification-source',
|
||||
x_expand: true });
|
||||
this._showSource(source, obj, obj.sourceBox);
|
||||
this._notificationBox.add_child(obj.sourceBox);
|
||||
this._notificationBox.add(obj.sourceBox, { x_fill: false, x_align: St.Align.START });
|
||||
|
||||
obj.sourceCountChangedId = source.connect('count-updated', source => {
|
||||
this._countChanged(source, obj);
|
||||
@@ -438,14 +430,13 @@ var ScreenShield = class {
|
||||
this.actor = Main.layoutManager.screenShieldGroup;
|
||||
|
||||
this._lockScreenState = MessageTray.State.HIDDEN;
|
||||
this._lockScreenGroup = new St.Widget({
|
||||
x_expand: true,
|
||||
y_expand: true,
|
||||
reactive: true,
|
||||
can_focus: true,
|
||||
name: 'lockScreenGroup',
|
||||
visible: false,
|
||||
});
|
||||
this._lockScreenGroup = new St.Widget({ x_expand: true,
|
||||
y_expand: true,
|
||||
reactive: true,
|
||||
can_focus: true,
|
||||
name: 'lockScreenGroup',
|
||||
visible: false,
|
||||
});
|
||||
this._lockScreenGroup.connect('key-press-event',
|
||||
this._onLockScreenKeyPress.bind(this));
|
||||
this._lockScreenGroup.connect('scroll-event',
|
||||
@@ -840,16 +831,14 @@ var ScreenShield = class {
|
||||
|
||||
if (shouldLock) {
|
||||
let lockTimeout = Math.max(
|
||||
adjustAnimationTime(STANDARD_FADE_TIME),
|
||||
STANDARD_FADE_TIME,
|
||||
this._settings.get_uint(LOCK_DELAY_KEY) * 1000);
|
||||
this._lockTimeoutId = GLib.timeout_add(
|
||||
GLib.PRIORITY_DEFAULT,
|
||||
lockTimeout,
|
||||
() => {
|
||||
this._lockTimeoutId = 0;
|
||||
this.lock(false);
|
||||
return GLib.SOURCE_REMOVE;
|
||||
});
|
||||
this._lockTimeoutId = Mainloop.timeout_add(lockTimeout,
|
||||
() => {
|
||||
this._lockTimeoutId = 0;
|
||||
this.lock(false);
|
||||
return GLib.SOURCE_REMOVE;
|
||||
});
|
||||
GLib.Source.set_name_by_id(this._lockTimeoutId, '[gnome-shell] this.lock');
|
||||
}
|
||||
|
||||
@@ -924,8 +913,8 @@ var ScreenShield = class {
|
||||
this._lockScreenGroup.hide();
|
||||
|
||||
if (this._dialog) {
|
||||
this._dialog.grab_key_focus();
|
||||
this._dialog.navigate_focus(null, St.DirectionType.TAB_FORWARD, false);
|
||||
this._dialog.actor.grab_key_focus();
|
||||
this._dialog.actor.navigate_focus(null, St.DirectionType.TAB_FORWARD, false);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1039,7 +1028,7 @@ var ScreenShield = class {
|
||||
this._arrowActiveWatchId = 0;
|
||||
|
||||
if (!this._arrowAnimationId) {
|
||||
this._arrowAnimationId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, 6000, this._animateArrows.bind(this));
|
||||
this._arrowAnimationId = Mainloop.timeout_add(6000, this._animateArrows.bind(this));
|
||||
GLib.Source.set_name_by_id(this._arrowAnimationId, '[gnome-shell] this._animateArrows');
|
||||
this._animateArrows();
|
||||
}
|
||||
@@ -1051,7 +1040,7 @@ var ScreenShield = class {
|
||||
|
||||
_pauseArrowAnimation() {
|
||||
if (this._arrowAnimationId) {
|
||||
GLib.source_remove(this._arrowAnimationId);
|
||||
Mainloop.source_remove(this._arrowAnimationId);
|
||||
this._arrowAnimationId = 0;
|
||||
}
|
||||
|
||||
@@ -1061,7 +1050,7 @@ var ScreenShield = class {
|
||||
|
||||
_stopArrowAnimation() {
|
||||
if (this._arrowAnimationId) {
|
||||
GLib.source_remove(this._arrowAnimationId);
|
||||
Mainloop.source_remove(this._arrowAnimationId);
|
||||
this._arrowAnimationId = 0;
|
||||
}
|
||||
if (this._arrowActiveWatchId) {
|
||||
@@ -1108,7 +1097,7 @@ var ScreenShield = class {
|
||||
if (params.fadeToBlack && params.animateFade) {
|
||||
// Take a beat
|
||||
|
||||
let id = GLib.timeout_add(GLib.PRIORITY_DEFAULT, MANUAL_FADE_TIME, () => {
|
||||
let id = Mainloop.timeout_add(MANUAL_FADE_TIME, () => {
|
||||
this._activateFade(this._shortLightbox, MANUAL_FADE_TIME);
|
||||
return GLib.SOURCE_REMOVE;
|
||||
});
|
||||
@@ -1139,13 +1128,16 @@ var ScreenShield = class {
|
||||
vertical: true,
|
||||
style_class: 'screen-shield-contents-box' });
|
||||
this._clock = new Clock();
|
||||
this._lockScreenContentsBox.add_child(this._clock.actor);
|
||||
this._lockScreenContentsBox.add(this._clock.actor, { x_fill: true,
|
||||
y_fill: true });
|
||||
|
||||
this._lockScreenContents.add_actor(this._lockScreenContentsBox);
|
||||
|
||||
this._notificationsBox = new NotificationsBox();
|
||||
this._wakeUpScreenId = this._notificationsBox.connect('wake-up-screen', this._wakeUpScreen.bind(this));
|
||||
this._lockScreenContentsBox.add_child(this._notificationsBox.actor);
|
||||
this._lockScreenContentsBox.add(this._notificationsBox.actor, { x_fill: true,
|
||||
y_fill: true,
|
||||
expand: true });
|
||||
|
||||
this._hasLockScreen = true;
|
||||
}
|
||||
@@ -1248,7 +1240,7 @@ var ScreenShield = class {
|
||||
}
|
||||
|
||||
if (this._lockTimeoutId != 0) {
|
||||
GLib.source_remove(this._lockTimeoutId);
|
||||
Mainloop.source_remove(this._lockTimeoutId);
|
||||
this._lockTimeoutId = 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -116,8 +116,8 @@ var ScreenshotService = class {
|
||||
try {
|
||||
let [result, area, filenameUsed] =
|
||||
screenshot.screenshot_area_finish(res);
|
||||
this._onScreenshotComplete(
|
||||
result, area, filenameUsed, flash, invocation);
|
||||
this._onScreenshotComplete(result, area, filenameUsed,
|
||||
flash, invocation);
|
||||
} catch (e) {
|
||||
invocation.return_gerror (e);
|
||||
}
|
||||
@@ -134,8 +134,8 @@ var ScreenshotService = class {
|
||||
try {
|
||||
let [result, area, filenameUsed] =
|
||||
screenshot.screenshot_window_finish(res);
|
||||
this._onScreenshotComplete(
|
||||
result, area, filenameUsed, flash, invocation);
|
||||
this._onScreenshotComplete(result, area, filenameUsed,
|
||||
flash, invocation);
|
||||
} catch (e) {
|
||||
invocation.return_gerror (e);
|
||||
}
|
||||
@@ -152,8 +152,8 @@ var ScreenshotService = class {
|
||||
try {
|
||||
let [result, area, filenameUsed] =
|
||||
screenshot.screenshot_finish(res);
|
||||
this._onScreenshotComplete(
|
||||
result, area, filenameUsed, flash, invocation);
|
||||
this._onScreenshotComplete(result, area, filenameUsed,
|
||||
flash, invocation);
|
||||
} catch (e) {
|
||||
invocation.return_gerror (e);
|
||||
}
|
||||
@@ -271,7 +271,7 @@ var SelectArea = class {
|
||||
}
|
||||
|
||||
_onMotionEvent(actor, event) {
|
||||
if (this._startX == -1 || this._startY == -1 || this._result)
|
||||
if (this._startX == -1 || this._startY == -1)
|
||||
return Clutter.EVENT_PROPAGATE;
|
||||
|
||||
[this._lastX, this._lastY] = event.get_coords();
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
collectStatistics, runPerfScript */
|
||||
|
||||
const { Gio, GLib, Meta, Shell } = imports.gi;
|
||||
const Mainloop = imports.mainloop;
|
||||
|
||||
const Main = imports.ui.main;
|
||||
const Params = imports.misc.params;
|
||||
@@ -40,7 +41,7 @@ const { loadInterfaceXML } = imports.misc.fileUtils;
|
||||
*/
|
||||
function sleep(milliseconds) {
|
||||
return new Promise(resolve => {
|
||||
let id = GLib.timeout_add(GLib.PRIORITY_DEFAULT, milliseconds, () => {
|
||||
let id = Mainloop.timeout_add(milliseconds, () => {
|
||||
resolve();
|
||||
return GLib.SOURCE_REMOVE;
|
||||
});
|
||||
@@ -317,7 +318,7 @@ async function runPerfScript(scriptModule, outputFile) {
|
||||
|
||||
for (let step of scriptModule.run()) {
|
||||
try {
|
||||
await step; // eslint-disable-line no-await-in-loop
|
||||
await step;
|
||||
} catch (err) {
|
||||
log(`Script failed: ${err}\n${err.stack}`);
|
||||
Meta.exit(Meta.ExitCode.ERROR);
|
||||
|
||||
@@ -158,15 +158,10 @@ var SearchResultsBase = class {
|
||||
this._clipboard = St.Clipboard.get_default();
|
||||
|
||||
this._cancellable = new Gio.Cancellable();
|
||||
|
||||
this.actor.connect('destroy', this._onDestroy.bind(this));
|
||||
}
|
||||
|
||||
destroy() {
|
||||
this.actor.destroy();
|
||||
}
|
||||
|
||||
_onDestroy() {
|
||||
this._terms = [];
|
||||
}
|
||||
|
||||
@@ -346,30 +341,14 @@ var GridSearchResults = class extends SearchResultsBase {
|
||||
this._resultDisplayBin.set_child(this._bin);
|
||||
}
|
||||
|
||||
_onDestroy() {
|
||||
if (this._updateSearchLater) {
|
||||
Meta.later_remove(this._updateSearchLater);
|
||||
delete this._updateSearchLater;
|
||||
}
|
||||
|
||||
super._onDestroy();
|
||||
}
|
||||
|
||||
updateSearch(...args) {
|
||||
if (this._notifyAllocationId)
|
||||
this.actor.disconnect(this._notifyAllocationId);
|
||||
if (this._updateSearchLater) {
|
||||
Meta.later_remove(this._updateSearchLater);
|
||||
delete this._updateSearchLater;
|
||||
}
|
||||
|
||||
// Make sure the maximum number of results calculated by
|
||||
// _getMaxDisplayedResults() is updated after width changes.
|
||||
this._notifyAllocationId = this.actor.connect('notify::allocation', () => {
|
||||
if (this._updateSearchLater)
|
||||
return;
|
||||
this._updateSearchLater = Meta.later_add(Meta.LaterType.BEFORE_REDRAW, () => {
|
||||
delete this._updateSearchLater;
|
||||
Meta.later_add(Meta.LaterType.BEFORE_REDRAW, () => {
|
||||
super.updateSearch(...args);
|
||||
return GLib.SOURCE_REMOVE;
|
||||
});
|
||||
@@ -710,9 +689,8 @@ var SearchResults = class {
|
||||
navigateFocus(direction) {
|
||||
let rtl = this.actor.get_text_direction() == Clutter.TextDirection.RTL;
|
||||
if (direction == St.DirectionType.TAB_BACKWARD ||
|
||||
direction == (rtl
|
||||
? St.DirectionType.RIGHT
|
||||
: St.DirectionType.LEFT) ||
|
||||
direction == (rtl ? St.DirectionType.RIGHT
|
||||
: St.DirectionType.LEFT) ||
|
||||
direction == St.DirectionType.UP) {
|
||||
this.actor.navigate_focus(null, direction, false);
|
||||
return;
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
/* exported SessionMode, listModes */
|
||||
|
||||
const GLib = imports.gi.GLib;
|
||||
const Mainloop = imports.mainloop;
|
||||
const Signals = imports.signals;
|
||||
|
||||
const FileUtils = imports.misc.fileUtils;
|
||||
@@ -92,11 +93,11 @@ const _modes = {
|
||||
isLocked: false,
|
||||
isPrimary: true,
|
||||
unlockDialog: imports.ui.unlockDialog.UnlockDialog,
|
||||
components: Config.HAVE_NETWORKMANAGER
|
||||
? ['networkAgent', 'polkitAgent', 'telepathyClient',
|
||||
'keyring', 'autorunManager', 'automountManager']
|
||||
: ['polkitAgent', 'telepathyClient',
|
||||
'keyring', 'autorunManager', 'automountManager'],
|
||||
components: Config.HAVE_NETWORKMANAGER ?
|
||||
['networkAgent', 'polkitAgent', 'telepathyClient',
|
||||
'keyring', 'autorunManager', 'automountManager'] :
|
||||
['polkitAgent', 'telepathyClient',
|
||||
'keyring', 'autorunManager', 'automountManager'],
|
||||
|
||||
panel: {
|
||||
left: ['activities', 'appMenu'],
|
||||
@@ -111,7 +112,7 @@ function _loadMode(file, info) {
|
||||
let suffix = name.indexOf('.json');
|
||||
let modeName = suffix == -1 ? name : name.slice(name, suffix);
|
||||
|
||||
if (Object.prototype.hasOwnProperty.call(_modes, modeName))
|
||||
if (_modes.hasOwnProperty(modeName))
|
||||
return;
|
||||
|
||||
let fileContent, success_, newMode;
|
||||
@@ -140,16 +141,15 @@ function _loadModes() {
|
||||
|
||||
function listModes() {
|
||||
_loadModes();
|
||||
let loop = new GLib.MainLoop(null, false);
|
||||
let id = GLib.idle_add(GLib.PRIORITY_DEFAULT, () => {
|
||||
let id = Mainloop.idle_add(() => {
|
||||
let names = Object.getOwnPropertyNames(_modes);
|
||||
for (let i = 0; i < names.length; i++)
|
||||
if (_modes[names[i]].isPrimary)
|
||||
print(names[i]);
|
||||
loop.quit();
|
||||
Mainloop.quit('listModes');
|
||||
});
|
||||
GLib.Source.set_name_by_id(id, '[gnome-shell] listModes');
|
||||
loop.run();
|
||||
Mainloop.run('listModes');
|
||||
}
|
||||
|
||||
var SessionMode = class {
|
||||
|
||||
@@ -151,13 +151,9 @@ var GnomeShell = class {
|
||||
let connection = this._dbusImpl.get_connection();
|
||||
let info = this._dbusImpl.get_info();
|
||||
let params = { 'device-id': GLib.Variant.new('u', device.get_device_id()),
|
||||
'device-node': GLib.Variant.new('s', device.get_device_node()),
|
||||
'timestamp': GLib.Variant.new('u', timestamp),
|
||||
'action-mode': GLib.Variant.new('u', Main.actionMode) };
|
||||
|
||||
let deviceNode = device.get_device_node();
|
||||
if (deviceNode)
|
||||
params['device-node'] = GLib.Variant.new('s', deviceNode);
|
||||
|
||||
connection.emit_signal(destination,
|
||||
this._dbusImpl.get_object_path(),
|
||||
info ? info.name : null,
|
||||
|
||||
@@ -26,10 +26,9 @@ function _setButtonsForChoices(dialog, choices) {
|
||||
|
||||
for (let idx = 0; idx < choices.length; idx++) {
|
||||
let button = idx;
|
||||
buttons.unshift({
|
||||
label: choices[idx],
|
||||
action: () => dialog.emit('response', button),
|
||||
});
|
||||
buttons.unshift({ label: choices[idx],
|
||||
action: () => dialog.emit('response', button)
|
||||
});
|
||||
}
|
||||
|
||||
dialog.setButtons(buttons);
|
||||
@@ -202,7 +201,7 @@ var ShellMountOperation = class {
|
||||
_onShowUnmountProgress(op, message, timeLeft, bytesLeft) {
|
||||
if (!this._notifier)
|
||||
this._notifier = new ShellUnmountNotifier();
|
||||
|
||||
|
||||
if (bytesLeft == 0)
|
||||
this._notifier.done(message);
|
||||
else
|
||||
@@ -359,9 +358,7 @@ var ShellMountPasswordDialog = GObject.registerClass({
|
||||
this._passwordEntry.clutter_text.set_password_char('\u25cf'); // ● U+25CF BLACK CIRCLE
|
||||
ShellEntry.addContextMenu(this._passwordEntry, { isPassword: true });
|
||||
this.setInitialKeyFocus(this._passwordEntry);
|
||||
this._workSpinner = new Animation.Spinner(WORK_SPINNER_ICON_SIZE, {
|
||||
animate: true,
|
||||
});
|
||||
this._workSpinner = new Animation.Spinner(WORK_SPINNER_ICON_SIZE, true);
|
||||
this._passwordEntry.secondary_icon = this._workSpinner.actor;
|
||||
|
||||
if (rtl) {
|
||||
@@ -390,26 +387,24 @@ var ShellMountPasswordDialog = GObject.registerClass({
|
||||
this._rememberChoice = null;
|
||||
}
|
||||
|
||||
this._defaultButtons = [{
|
||||
label: _("Cancel"),
|
||||
action: this._onCancelButton.bind(this),
|
||||
key: Clutter.Escape,
|
||||
}, {
|
||||
label: _("Unlock"),
|
||||
action: this._onUnlockButton.bind(this),
|
||||
default: true,
|
||||
}];
|
||||
this._defaultButtons = [{ label: _("Cancel"),
|
||||
action: this._onCancelButton.bind(this),
|
||||
key: Clutter.Escape
|
||||
},
|
||||
{ label: _("Unlock"),
|
||||
action: this._onUnlockButton.bind(this),
|
||||
default: true
|
||||
}];
|
||||
|
||||
this._usesKeyfilesButtons = [{
|
||||
label: _("Cancel"),
|
||||
action: this._onCancelButton.bind(this),
|
||||
key: Clutter.Escape,
|
||||
}, {
|
||||
/* Translators: %s is the Disks application */
|
||||
label: _("Open %s").format(disksApp.get_name()),
|
||||
action: this._onOpenDisksButton.bind(this),
|
||||
default: true,
|
||||
}];
|
||||
this._usesKeyfilesButtons = [{ label: _("Cancel"),
|
||||
action: this._onCancelButton.bind(this),
|
||||
key: Clutter.Escape
|
||||
},
|
||||
{ /* Translators: %s is the Disks application */
|
||||
label: _("Open %s").format(disksApp.get_name()),
|
||||
action: this._onOpenDisksButton.bind(this),
|
||||
default: true
|
||||
}];
|
||||
|
||||
this.setButtons(this._defaultButtons);
|
||||
}
|
||||
|
||||
@@ -100,15 +100,10 @@ var Slider = GObject.registerClass({
|
||||
|
||||
_endDragging() {
|
||||
if (this._dragging) {
|
||||
if (this._releaseId) {
|
||||
if (this._releaseId)
|
||||
this.disconnect(this._releaseId);
|
||||
this._releaseId = 0;
|
||||
}
|
||||
|
||||
if (this._motionId) {
|
||||
if (this._motionId)
|
||||
this.disconnect(this._motionId);
|
||||
this._motionId = 0;
|
||||
}
|
||||
|
||||
if (this._grabbedSequence != null)
|
||||
this._grabbedDevice.sequence_ungrab(this._grabbedSequence);
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
/* exported ATIndicator */
|
||||
|
||||
const { Gio, GLib, GObject, St } = imports.gi;
|
||||
const Mainloop = imports.mainloop;
|
||||
|
||||
const PanelMenu = imports.ui.panelMenu;
|
||||
const PopupMenu = imports.ui.popupMenu;
|
||||
@@ -95,7 +96,7 @@ class ATIndicator extends PanelMenu.Button {
|
||||
if (this._syncMenuVisibilityIdle)
|
||||
return;
|
||||
|
||||
this._syncMenuVisibilityIdle = GLib.idle_add(GLib.PRIORITY_DEFAULT, this._syncMenuVisibility.bind(this));
|
||||
this._syncMenuVisibilityIdle = Mainloop.idle_add(this._syncMenuVisibility.bind(this));
|
||||
GLib.Source.set_name_by_id(this._syncMenuVisibilityIdle, '[gnome-shell] this._syncMenuVisibility');
|
||||
}
|
||||
|
||||
@@ -179,8 +180,8 @@ class ATIndicator extends PanelMenu.Button {
|
||||
settings.is_writable(KEY_TEXT_SCALING_FACTOR),
|
||||
enabled => {
|
||||
if (enabled)
|
||||
settings.set_double(
|
||||
KEY_TEXT_SCALING_FACTOR, DPI_FACTOR_LARGE);
|
||||
settings.set_double(KEY_TEXT_SCALING_FACTOR,
|
||||
DPI_FACTOR_LARGE);
|
||||
else
|
||||
settings.reset(KEY_TEXT_SCALING_FACTOR);
|
||||
});
|
||||
|
||||
@@ -13,8 +13,8 @@ const PanelMenu = imports.ui.panelMenu;
|
||||
const SwitcherPopup = imports.ui.switcherPopup;
|
||||
const Util = imports.misc.util;
|
||||
|
||||
var INPUT_SOURCE_TYPE_XKB = 'xkb';
|
||||
var INPUT_SOURCE_TYPE_IBUS = 'ibus';
|
||||
const INPUT_SOURCE_TYPE_XKB = 'xkb';
|
||||
const INPUT_SOURCE_TYPE_IBUS = 'ibus';
|
||||
|
||||
var LayoutMenuItem = GObject.registerClass(
|
||||
class LayoutMenuItem extends PopupMenu.PopupBaseMenuItem {
|
||||
@@ -976,8 +976,8 @@ class InputSourceIndicator extends PanelMenu.Button {
|
||||
item.prop = prop;
|
||||
radioGroup.push(item);
|
||||
item.radioGroup = radioGroup;
|
||||
item.setOrnament(prop.get_state() == IBus.PropState.CHECKED
|
||||
? PopupMenu.Ornament.DOT : PopupMenu.Ornament.NONE);
|
||||
item.setOrnament(prop.get_state() == IBus.PropState.CHECKED ?
|
||||
PopupMenu.Ornament.DOT : PopupMenu.Ornament.NONE);
|
||||
item.connect('activate', () => {
|
||||
if (item.prop.get_state() == IBus.PropState.CHECKED)
|
||||
return;
|
||||
|
||||
@@ -168,9 +168,8 @@ var Indicator = class extends PanelMenu.SystemIndicator {
|
||||
|
||||
_updateMenuLabels() {
|
||||
if (this._settings.get_boolean(ENABLED)) {
|
||||
this._item.label.text = this._indicator.visible
|
||||
? _("Location In Use")
|
||||
: _("Location Enabled");
|
||||
this._item.label.text = this._indicator.visible ? _("Location In Use")
|
||||
: _("Location Enabled");
|
||||
this._onOffAction.label.text = _("Disable");
|
||||
} else {
|
||||
this._item.label.text = _("Location Disabled");
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
|
||||
/* exported NMApplet */
|
||||
const { Clutter, Gio, GLib, GObject, NM, St } = imports.gi;
|
||||
const Mainloop = imports.mainloop;
|
||||
const Signals = imports.signals;
|
||||
|
||||
const Animation = imports.ui.animation;
|
||||
@@ -718,7 +719,7 @@ class NMWirelessDialog extends ModalDialog.ModalDialog {
|
||||
this._updateSensitivity();
|
||||
this._syncView();
|
||||
|
||||
this._scanTimeoutId = GLib.timeout_add_seconds(GLib.PRIORITY_DEFAULT, 15, this._onScanTimeout.bind(this));
|
||||
this._scanTimeoutId = Mainloop.timeout_add_seconds(15, this._onScanTimeout.bind(this));
|
||||
GLib.Source.set_name_by_id(this._scanTimeoutId, '[gnome-shell] this._onScanTimeout');
|
||||
this._onScanTimeout();
|
||||
|
||||
@@ -756,7 +757,7 @@ class NMWirelessDialog extends ModalDialog.ModalDialog {
|
||||
}
|
||||
|
||||
if (this._scanTimeoutId) {
|
||||
GLib.source_remove(this._scanTimeoutId);
|
||||
Mainloop.source_remove(this._scanTimeoutId);
|
||||
this._scanTimeoutId = 0;
|
||||
}
|
||||
}
|
||||
@@ -873,7 +874,7 @@ class NMWirelessDialog extends ModalDialog.ModalDialog {
|
||||
this._airplaneHeadline = new St.Label({ style_class: 'nm-dialog-airplane-headline headline' });
|
||||
this._airplaneText = new St.Label({ style_class: 'nm-dialog-airplane-text' });
|
||||
|
||||
let airplaneSubStack = new St.Widget({ layout_manager: new Clutter.BinLayout() });
|
||||
let airplaneSubStack = new St.Widget({ layout_manager: new Clutter.BinLayout });
|
||||
this._airplaneButton = new St.Button({ style_class: 'modal-dialog-button button' });
|
||||
this._airplaneButton.connect('clicked', () => {
|
||||
if (this._rfkill.airplaneMode)
|
||||
@@ -909,8 +910,8 @@ class NMWirelessDialog extends ModalDialog.ModalDialog {
|
||||
this._client.activate_connection_async(connection, this._device, null, null, null);
|
||||
} else {
|
||||
let accessPoints = network.accessPoints;
|
||||
if ((accessPoints[0]._secType == NMAccessPointSecurity.WPA2_ENT) ||
|
||||
(accessPoints[0]._secType == NMAccessPointSecurity.WPA_ENT)) {
|
||||
if ((accessPoints[0]._secType == NMAccessPointSecurity.WPA2_ENT)
|
||||
|| (accessPoints[0]._secType == NMAccessPointSecurity.WPA_ENT)) {
|
||||
// 802.1x-enabled APs require further configuration, so they're
|
||||
// handled in gnome-control-center
|
||||
Util.spawn(['gnome-control-center', 'wifi', 'connect-8021x-wifi',
|
||||
@@ -1073,14 +1074,13 @@ class NMWirelessDialog extends ModalDialog.ModalDialog {
|
||||
|
||||
this._resortItems();
|
||||
} else {
|
||||
network = {
|
||||
ssid: accessPoint.get_ssid(),
|
||||
mode: accessPoint.mode,
|
||||
security: this._getApSecurityType(accessPoint),
|
||||
connections: [],
|
||||
item: null,
|
||||
accessPoints: [accessPoint],
|
||||
};
|
||||
network = { ssid: accessPoint.get_ssid(),
|
||||
mode: accessPoint.mode,
|
||||
security: this._getApSecurityType(accessPoint),
|
||||
connections: [],
|
||||
item: null,
|
||||
accessPoints: [accessPoint]
|
||||
};
|
||||
network.ssidText = ssidToLabel(network.ssid);
|
||||
this._checkConnections(network, accessPoint);
|
||||
|
||||
@@ -1676,7 +1676,7 @@ var NMApplet = class extends PanelMenu.SystemIndicator {
|
||||
'network-transmit-receive');
|
||||
this._source.policy = new MessageTray.NotificationApplicationPolicy('gnome-network-panel');
|
||||
|
||||
this._source.connect('destroy', () => (this._source = null));
|
||||
this._source.connect('destroy', () => this._source = null);
|
||||
Main.messageTray.add(this._source);
|
||||
}
|
||||
}
|
||||
@@ -1976,6 +1976,7 @@ var NMApplet = class extends PanelMenu.SystemIndicator {
|
||||
// or we get to full connectivity through other means
|
||||
} else if (result == PortalHelperResult.COMPLETED) {
|
||||
this._closeConnectivityCheck(path);
|
||||
return;
|
||||
} else if (result == PortalHelperResult.RECHECK) {
|
||||
this._client.check_connectivity_async(null, (client, result) => {
|
||||
try {
|
||||
|
||||
@@ -58,12 +58,10 @@ var Indicator = class extends PanelMenu.SystemIndicator {
|
||||
let visible = this._proxy.NightLightActive;
|
||||
let disabled = this._proxy.DisabledUntilTomorrow;
|
||||
|
||||
this._item.label.text = disabled
|
||||
? _("Night Light Disabled")
|
||||
: _("Night Light On");
|
||||
this._disableItem.label.text = disabled
|
||||
? _("Resume")
|
||||
: _("Disable Until Tomorrow");
|
||||
this._item.label.text = disabled ? _("Night Light Disabled")
|
||||
: _("Night Light On");
|
||||
this._disableItem.label.text = disabled ? _("Resume")
|
||||
: _("Disable Until Tomorrow");
|
||||
this._item.visible = this._indicator.visible = visible;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -111,12 +111,9 @@ var Indicator = class extends PanelMenu.SystemIndicator {
|
||||
let chargingState = this._proxy.State == UPower.DeviceState.CHARGING
|
||||
? '-charging' : '';
|
||||
let fillLevel = 10 * Math.floor(this._proxy.Percentage / 10);
|
||||
let icon;
|
||||
if (this._proxy.State == UPower.DeviceState.FULLY_CHARGED ||
|
||||
fillLevel === 100)
|
||||
icon = 'battery-level-100-charged-symbolic';
|
||||
else
|
||||
icon = `battery-level-${fillLevel}${chargingState}-symbolic`;
|
||||
let icon = this._proxy.State == UPower.DeviceState.FULLY_CHARGED
|
||||
? 'battery-level-100-charged-symbolic'
|
||||
: `battery-level-${fillLevel}${chargingState}-symbolic`;
|
||||
|
||||
// Make sure we fall back to fallback-icon-name and not GThemedIcon's
|
||||
// default fallbacks
|
||||
|
||||
@@ -33,7 +33,7 @@ var AltSwitcher = class {
|
||||
|
||||
this.actor = new St.Bin();
|
||||
this.actor.connect('destroy', this._onDestroy.bind(this));
|
||||
this.actor.connect('notify::mapped', () => (this._flipped = false));
|
||||
this.actor.connect('notify::mapped', () => this._flipped = false);
|
||||
}
|
||||
|
||||
_sync() {
|
||||
@@ -137,6 +137,15 @@ var Indicator = class extends PanelMenu.SystemIndicator {
|
||||
this._sessionUpdated();
|
||||
}
|
||||
|
||||
_updateActionsVisibility() {
|
||||
let visible = (this._settingsAction.visible ||
|
||||
this._orientationLockAction.visible ||
|
||||
this._lockScreenAction.visible ||
|
||||
this._altSwitcher.actor.visible);
|
||||
|
||||
this.buttonGroup.visible = visible;
|
||||
}
|
||||
|
||||
_sessionUpdated() {
|
||||
this._settingsAction.visible = Main.sessionMode.allowSettings;
|
||||
}
|
||||
@@ -244,7 +253,7 @@ var Indicator = class extends PanelMenu.SystemIndicator {
|
||||
|
||||
this._orientationLockAction = this._createActionButton('', _("Orientation Lock"));
|
||||
this._orientationLockAction.connect('clicked', () => {
|
||||
this.menu.itemActivated(BoxPointer.PopupAnimation.NONE);
|
||||
this.menu.itemActivated(BoxPointer.PopupAnimation.NONE),
|
||||
this._systemActions.activateLockOrientation();
|
||||
});
|
||||
item.add(this._orientationLockAction, { expand: true, x_fill: false });
|
||||
@@ -293,18 +302,15 @@ var Indicator = class extends PanelMenu.SystemIndicator {
|
||||
|
||||
this.menu.addMenuItem(item);
|
||||
|
||||
let visibilityGroup = [
|
||||
this._settingsAction,
|
||||
this._orientationLockAction,
|
||||
this._lockScreenAction,
|
||||
this._altSwitcher.actor,
|
||||
];
|
||||
|
||||
for (let actor of visibilityGroup) {
|
||||
actor.connect('notify::visible', () => {
|
||||
this.buttonGroup.visible = visibilityGroup.some(a => a.visible);
|
||||
});
|
||||
}
|
||||
this._settingsAction.connect('notify::visible',
|
||||
() => this._updateActionsVisibility());
|
||||
this._orientationLockAction.connect('notify::visible',
|
||||
() => this._updateActionsVisibility());
|
||||
this._lockScreenAction.connect('notify::visible',
|
||||
() => this._updateActionsVisibility());
|
||||
this._altSwitcher.actor.connect('notify::visible',
|
||||
() => this._updateActionsVisibility());
|
||||
}
|
||||
|
||||
_onSettingsClicked() {
|
||||
|
||||
@@ -156,12 +156,12 @@ var AuthRobot = class {
|
||||
|
||||
/* check if authorization is enabled in the daemon. if not
|
||||
* we won't even bother authorizing, because we will only
|
||||
* get an error back. The exact contents of AuthMode might
|
||||
* get an error back. The exact contents of AuthMode might
|
||||
* change in the future, but must contain AuthMode.ENABLED
|
||||
* if it is enabled. */
|
||||
if (!cli.authMode.split('|').includes(AuthMode.ENABLED))
|
||||
return;
|
||||
|
||||
|
||||
/* check if we should enroll the device */
|
||||
let res = [false];
|
||||
this.emit('enroll-device', dev, res);
|
||||
@@ -260,7 +260,7 @@ var Indicator = class extends PanelMenu.SystemIndicator {
|
||||
if (!this._source) {
|
||||
this._source = new MessageTray.Source(_("Thunderbolt"),
|
||||
'thunderbolt-symbolic');
|
||||
this._source.connect('destroy', () => (this._source = null));
|
||||
this._source.connect('destroy', () => this._source = null);
|
||||
|
||||
Main.messageTray.add(this._source);
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
|
||||
/* exported Indicator */
|
||||
|
||||
const { Clutter, Gio, GObject, Gvc, St } = imports.gi;
|
||||
const { Clutter, Gio, Gvc, St } = imports.gi;
|
||||
const Signals = imports.signals;
|
||||
|
||||
const Main = imports.ui.main;
|
||||
@@ -36,8 +36,7 @@ var StreamSlider = class {
|
||||
this._soundSettings.connect(`changed::${ALLOW_AMPLIFIED_VOLUME_KEY}`, this._amplifySettingsChanged.bind(this));
|
||||
this._amplifySettingsChanged();
|
||||
|
||||
this._sliderChangedId = this._slider.connect('notify::value',
|
||||
this._sliderChanged.bind(this));
|
||||
this._slider.connect('notify::value', this._sliderChanged.bind(this));
|
||||
this._slider.connect('drag-end', this._notifyVolumeChange.bind(this));
|
||||
|
||||
this._icon = new St.Icon({ style_class: 'popup-menu-icon' });
|
||||
@@ -130,16 +129,10 @@ var StreamSlider = class {
|
||||
this._volumeCancellable);
|
||||
}
|
||||
|
||||
_changeSlider(value) {
|
||||
GObject.signal_handler_block(this._slider, this._sliderChangedId);
|
||||
this._slider.value = value;
|
||||
GObject.signal_handler_unblock(this._slider, this._sliderChangedId);
|
||||
}
|
||||
|
||||
_updateVolume() {
|
||||
let muted = this._stream.is_muted;
|
||||
this._changeSlider(muted
|
||||
? 0 : (this._stream.volume / this._control.get_vol_max_norm()));
|
||||
this._slider.value = muted
|
||||
? 0 : (this._stream.volume / this._control.get_vol_max_norm());
|
||||
this.emit('stream-updated');
|
||||
}
|
||||
|
||||
@@ -228,9 +221,9 @@ var OutputStreamSlider = class extends StreamSlider {
|
||||
}
|
||||
|
||||
_updateSliderIcon() {
|
||||
this._icon.icon_name = (this._hasHeadphones
|
||||
? 'audio-headphones-symbolic'
|
||||
: 'audio-speakers-symbolic');
|
||||
this._icon.icon_name = (this._hasHeadphones ?
|
||||
'audio-headphones-symbolic' :
|
||||
'audio-speakers-symbolic');
|
||||
}
|
||||
|
||||
_portChanged() {
|
||||
@@ -259,17 +252,18 @@ var InputStreamSlider = class extends StreamSlider {
|
||||
_maybeShowInput() {
|
||||
// only show input widgets if any application is recording audio
|
||||
let showInput = false;
|
||||
if (this._stream) {
|
||||
// skip gnome-volume-control and pavucontrol which appear
|
||||
// as recording because they show the input level
|
||||
let skippedApps = [
|
||||
'org.gnome.VolumeControl',
|
||||
'org.PulseAudio.pavucontrol'
|
||||
];
|
||||
|
||||
showInput = this._control.get_source_outputs().some(output => {
|
||||
return !skippedApps.includes(output.get_application_id());
|
||||
});
|
||||
let recordingApps = this._control.get_source_outputs();
|
||||
if (this._stream && recordingApps) {
|
||||
for (let i = 0; i < recordingApps.length; i++) {
|
||||
let outputStream = recordingApps[i];
|
||||
let id = outputStream.get_application_id();
|
||||
// but skip gnome-volume-control and pavucontrol
|
||||
// (that appear as recording because they show the input level)
|
||||
if (!id || (id != 'org.gnome.VolumeControl' && id != 'org.PulseAudio.pavucontrol')) {
|
||||
showInput = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
this._showInput = showInput;
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
/* exported SwitcherPopup, SwitcherList */
|
||||
|
||||
const { Clutter, GLib, GObject, Meta, St } = imports.gi;
|
||||
const Mainloop = imports.mainloop;
|
||||
|
||||
const Main = imports.ui.main;
|
||||
|
||||
@@ -46,9 +47,6 @@ var SwitcherPopup = GObject.registerClass({
|
||||
|
||||
Main.uiGroup.add_actor(this);
|
||||
|
||||
this._systemModalOpenedId =
|
||||
Main.layoutManager.connect('system-modal-opened', () => this.destroy());
|
||||
|
||||
this._haveModal = false;
|
||||
this._modifierMask = 0;
|
||||
|
||||
@@ -144,15 +142,13 @@ var SwitcherPopup = GObject.registerClass({
|
||||
|
||||
// We delay showing the popup so that fast Alt+Tab users aren't
|
||||
// disturbed by the popup briefly flashing.
|
||||
this._initialDelayTimeoutId = GLib.timeout_add(
|
||||
GLib.PRIORITY_DEFAULT,
|
||||
POPUP_DELAY_TIMEOUT,
|
||||
() => {
|
||||
Main.osdWindowManager.hideAll();
|
||||
this.opacity = 255;
|
||||
this._initialDelayTimeoutId = 0;
|
||||
return GLib.SOURCE_REMOVE;
|
||||
});
|
||||
this._initialDelayTimeoutId = Mainloop.timeout_add(POPUP_DELAY_TIMEOUT,
|
||||
() => {
|
||||
Main.osdWindowManager.hideAll();
|
||||
this.opacity = 255;
|
||||
this._initialDelayTimeoutId = 0;
|
||||
return GLib.SOURCE_REMOVE;
|
||||
});
|
||||
GLib.Source.set_name_by_id(this._initialDelayTimeoutId, '[gnome-shell] Main.osdWindow.cancel');
|
||||
return true;
|
||||
}
|
||||
@@ -183,14 +179,6 @@ var SwitcherPopup = GObject.registerClass({
|
||||
if (keysym == Clutter.Escape || keysym == Clutter.Tab)
|
||||
this.fadeAndDestroy();
|
||||
|
||||
// Allow to explicitly select the current item; this is particularly
|
||||
// useful for no-modifier popups
|
||||
if (keysym === Clutter.KEY_space ||
|
||||
keysym === Clutter.KEY_Return ||
|
||||
keysym === Clutter.KEY_KP_Enter ||
|
||||
keysym === Clutter.KEY_ISO_Enter)
|
||||
this._finish(event.get_time());
|
||||
|
||||
return Clutter.EVENT_STOP;
|
||||
}
|
||||
|
||||
@@ -261,9 +249,9 @@ var SwitcherPopup = GObject.registerClass({
|
||||
this.mouseActive = false;
|
||||
|
||||
if (this._motionTimeoutId != 0)
|
||||
GLib.source_remove(this._motionTimeoutId);
|
||||
Mainloop.source_remove(this._motionTimeoutId);
|
||||
|
||||
this._motionTimeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, DISABLE_HOVER_TIMEOUT, this._mouseTimedOut.bind(this));
|
||||
this._motionTimeoutId = Mainloop.timeout_add(DISABLE_HOVER_TIMEOUT, this._mouseTimedOut.bind(this));
|
||||
GLib.Source.set_name_by_id(this._motionTimeoutId, '[gnome-shell] this._mouseTimedOut');
|
||||
}
|
||||
|
||||
@@ -275,16 +263,14 @@ var SwitcherPopup = GObject.registerClass({
|
||||
|
||||
_resetNoModsTimeout() {
|
||||
if (this._noModsTimeoutId != 0)
|
||||
GLib.source_remove(this._noModsTimeoutId);
|
||||
Mainloop.source_remove(this._noModsTimeoutId);
|
||||
|
||||
this._noModsTimeoutId = GLib.timeout_add(
|
||||
GLib.PRIORITY_DEFAULT,
|
||||
NO_MODS_TIMEOUT,
|
||||
() => {
|
||||
this._finish(global.display.get_current_time_roundtrip());
|
||||
this._noModsTimeoutId = 0;
|
||||
return GLib.SOURCE_REMOVE;
|
||||
});
|
||||
this._noModsTimeoutId = Mainloop.timeout_add(NO_MODS_TIMEOUT,
|
||||
() => {
|
||||
this._finish(global.get_current_time());
|
||||
this._noModsTimeoutId = 0;
|
||||
return GLib.SOURCE_REMOVE;
|
||||
});
|
||||
}
|
||||
|
||||
_popModal() {
|
||||
@@ -315,14 +301,12 @@ var SwitcherPopup = GObject.registerClass({
|
||||
_onDestroy() {
|
||||
this._popModal();
|
||||
|
||||
Main.layoutManager.disconnect(this._systemModalOpenedId);
|
||||
|
||||
if (this._motionTimeoutId != 0)
|
||||
GLib.source_remove(this._motionTimeoutId);
|
||||
Mainloop.source_remove(this._motionTimeoutId);
|
||||
if (this._initialDelayTimeoutId != 0)
|
||||
GLib.source_remove(this._initialDelayTimeoutId);
|
||||
Mainloop.source_remove(this._initialDelayTimeoutId);
|
||||
if (this._noModsTimeoutId != 0)
|
||||
GLib.source_remove(this._noModsTimeoutId);
|
||||
Mainloop.source_remove(this._noModsTimeoutId);
|
||||
}
|
||||
|
||||
_select(num) {
|
||||
@@ -573,10 +557,10 @@ var SwitcherList = GObject.registerClass({
|
||||
let leftPadding = this.get_theme_node().get_padding(St.Side.LEFT);
|
||||
let rightPadding = this.get_theme_node().get_padding(St.Side.RIGHT);
|
||||
|
||||
let [minListWidth] = this._list.get_preferred_width(height);
|
||||
let [, natScrollViewWidth] = this._scrollView.get_preferred_width(height);
|
||||
|
||||
let childBox = new Clutter.ActorBox();
|
||||
let scrollable = minListWidth > width;
|
||||
let scrollable = natScrollViewWidth > width;
|
||||
|
||||
this._scrollView.allocate(contentBox, flags);
|
||||
|
||||
|
||||
@@ -2,7 +2,8 @@
|
||||
/* exported UnlockDialog */
|
||||
|
||||
const { AccountsService, Atk, Clutter,
|
||||
Gdm, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
|
||||
Gdm, Gio, GLib, Meta, Shell, St } = imports.gi;
|
||||
const Signals = imports.signals;
|
||||
|
||||
const Layout = imports.ui.layout;
|
||||
const Main = imports.ui.main;
|
||||
@@ -12,19 +13,15 @@ const AuthPrompt = imports.gdm.authPrompt;
|
||||
// The timeout before going back automatically to the lock screen (in seconds)
|
||||
const IDLE_TIMEOUT = 2 * 60;
|
||||
|
||||
var UnlockDialog = GObject.registerClass({
|
||||
Signals: { 'failed': {} },
|
||||
}, class UnlockDialog extends St.Widget {
|
||||
_init(parentActor) {
|
||||
super._init({
|
||||
accessible_role: Atk.Role.WINDOW,
|
||||
style_class: 'login-dialog',
|
||||
layout_manager: new Clutter.BoxLayout(),
|
||||
visible: false,
|
||||
});
|
||||
var UnlockDialog = class {
|
||||
constructor(parentActor) {
|
||||
this.actor = new St.Widget({ accessible_role: Atk.Role.WINDOW,
|
||||
style_class: 'login-dialog',
|
||||
layout_manager: new Clutter.BoxLayout(),
|
||||
visible: false });
|
||||
|
||||
this.add_constraint(new Layout.MonitorConstraint({ primary: true }));
|
||||
parentActor.add_child(this);
|
||||
this.actor.add_constraint(new Layout.MonitorConstraint({ primary: true }));
|
||||
parentActor.add_child(this.actor);
|
||||
|
||||
this._userManager = AccountsService.UserManager.get_default();
|
||||
this._userName = GLib.get_user_name();
|
||||
@@ -35,7 +32,7 @@ var UnlockDialog = GObject.registerClass({
|
||||
y_align: Clutter.ActorAlign.CENTER,
|
||||
x_expand: true,
|
||||
y_expand: true });
|
||||
this.add_child(this._promptBox);
|
||||
this.actor.add_child(this._promptBox);
|
||||
|
||||
this._authPrompt = new AuthPrompt.AuthPrompt(new Gdm.Client(), AuthPrompt.AuthPromptMode.UNLOCK_ONLY);
|
||||
this._authPrompt.connect('failed', this._fail.bind(this));
|
||||
@@ -67,12 +64,10 @@ var UnlockDialog = GObject.registerClass({
|
||||
this._authPrompt.reset();
|
||||
this._updateSensitivity(true);
|
||||
|
||||
Main.ctrlAltTabManager.addGroup(this, _("Unlock Window"), 'dialog-password-symbolic');
|
||||
Main.ctrlAltTabManager.addGroup(this.actor, _("Unlock Window"), 'dialog-password-symbolic');
|
||||
|
||||
this._idleMonitor = Meta.IdleMonitor.get_core();
|
||||
this._idleWatchId = this._idleMonitor.add_idle_watch(IDLE_TIMEOUT * 1000, this._escape.bind(this));
|
||||
|
||||
this.connect('destroy', this._onDestroy.bind(this));
|
||||
}
|
||||
|
||||
_updateSensitivity(sensitive) {
|
||||
@@ -111,8 +106,9 @@ var UnlockDialog = GObject.registerClass({
|
||||
this._authPrompt.cancel();
|
||||
}
|
||||
|
||||
_onDestroy() {
|
||||
destroy() {
|
||||
this.popModal();
|
||||
this.actor.destroy();
|
||||
|
||||
if (this._idleWatchId) {
|
||||
this._idleMonitor.remove_watch(this._idleWatchId);
|
||||
@@ -135,16 +131,13 @@ var UnlockDialog = GObject.registerClass({
|
||||
}
|
||||
|
||||
open(timestamp) {
|
||||
this.show();
|
||||
this.actor.show();
|
||||
|
||||
if (this._isModal)
|
||||
return true;
|
||||
|
||||
let modalParams = {
|
||||
timestamp,
|
||||
actionMode: Shell.ActionMode.UNLOCK_SCREEN,
|
||||
};
|
||||
if (!Main.pushModal(this, modalParams))
|
||||
if (!Main.pushModal(this.actor, { timestamp: timestamp,
|
||||
actionMode: Shell.ActionMode.UNLOCK_SCREEN }))
|
||||
return false;
|
||||
|
||||
this._isModal = true;
|
||||
@@ -154,8 +147,9 @@ var UnlockDialog = GObject.registerClass({
|
||||
|
||||
popModal(timestamp) {
|
||||
if (this._isModal) {
|
||||
Main.popModal(this, timestamp);
|
||||
Main.popModal(this.actor, timestamp);
|
||||
this._isModal = false;
|
||||
}
|
||||
}
|
||||
});
|
||||
};
|
||||
Signals.addSignalMethods(UnlockDialog.prototype);
|
||||
|
||||
@@ -309,10 +309,12 @@ var ViewSelector = class {
|
||||
if (params.a11yFocus)
|
||||
Main.ctrlAltTabManager.addGroup(params.a11yFocus, name, a11yIcon);
|
||||
else
|
||||
Main.ctrlAltTabManager.addGroup(actor, name, a11yIcon, {
|
||||
proxy: this.actor,
|
||||
focusCallback: () => this._a11yFocusPage(page),
|
||||
});
|
||||
Main.ctrlAltTabManager.addGroup(actor, name, a11yIcon,
|
||||
{ proxy: this.actor,
|
||||
focusCallback: () => {
|
||||
this._a11yFocusPage(page);
|
||||
}
|
||||
});
|
||||
page.hide();
|
||||
this.actor.add_actor(page);
|
||||
return page;
|
||||
@@ -389,8 +391,8 @@ var ViewSelector = class {
|
||||
}
|
||||
|
||||
_onShowAppsButtonToggled() {
|
||||
this._showPage(this._showAppsButton.checked
|
||||
? this._appsPage : this._workspacesPage);
|
||||
this._showPage(this._showAppsButton.checked ?
|
||||
this._appsPage : this._workspacesPage);
|
||||
}
|
||||
|
||||
_onStageKeyPress(actor, event) {
|
||||
@@ -424,9 +426,8 @@ var ViewSelector = class {
|
||||
}
|
||||
|
||||
_searchCancelled() {
|
||||
this._showPage(this._showAppsButton.checked
|
||||
? this._appsPage
|
||||
: this._workspacesPage);
|
||||
this._showPage(this._showAppsButton.checked ? this._appsPage
|
||||
: this._workspacesPage);
|
||||
|
||||
// Leave the entry focused when it doesn't have any text;
|
||||
// when replacing a selected search term, Clutter emits
|
||||
@@ -577,7 +578,6 @@ var ViewSelector = class {
|
||||
if (event.type() == Clutter.EventType.BUTTON_PRESS) {
|
||||
let source = event.get_source();
|
||||
if (source != this._text &&
|
||||
this._text.has_key_focus() &&
|
||||
this._text.text == '' &&
|
||||
!this._text.has_preedit () &&
|
||||
!Main.layoutManager.keyboardBox.contains(source)) {
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
/* exported WindowManager */
|
||||
|
||||
const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
|
||||
const Mainloop = imports.mainloop;
|
||||
const Signals = imports.signals;
|
||||
|
||||
const AltTab = imports.ui.altTab;
|
||||
@@ -16,7 +17,6 @@ const PadOsd = imports.ui.padOsd;
|
||||
const EdgeDragAction = imports.ui.edgeDragAction;
|
||||
const CloseDialog = imports.ui.closeDialog;
|
||||
const SwitchMonitor = imports.ui.switchMonitor;
|
||||
const IBusManager = imports.misc.ibusManager;
|
||||
|
||||
const { loadInterfaceXML } = imports.misc.fileUtils;
|
||||
|
||||
@@ -70,13 +70,13 @@ class DisplayChangeDialog extends ModalDialog.ModalDialog {
|
||||
action: this._onSuccess.bind(this),
|
||||
default: true });
|
||||
|
||||
this._timeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, ONE_SECOND, this._tick.bind(this));
|
||||
this._timeoutId = Mainloop.timeout_add(ONE_SECOND, this._tick.bind(this));
|
||||
GLib.Source.set_name_by_id(this._timeoutId, '[gnome-shell] this._tick');
|
||||
}
|
||||
|
||||
close(timestamp) {
|
||||
if (this._timeoutId > 0) {
|
||||
GLib.source_remove(this._timeoutId);
|
||||
Mainloop.source_remove(this._timeoutId);
|
||||
this._timeoutId = 0;
|
||||
}
|
||||
|
||||
@@ -187,9 +187,6 @@ var WorkspaceTracker = class {
|
||||
let workspaceManager = global.workspace_manager;
|
||||
workspaceManager.connect('notify::n-workspaces',
|
||||
this._nWorkspacesChanged.bind(this));
|
||||
workspaceManager.connect('workspaces-reordered', () => {
|
||||
this._workspaces.sort((a, b) => a.index() - b.index());
|
||||
});
|
||||
global.window_manager.connect('switch-workspace',
|
||||
this._queueCheckWorkspaces.bind(this));
|
||||
|
||||
@@ -283,9 +280,9 @@ var WorkspaceTracker = class {
|
||||
|
||||
keepWorkspaceAlive(workspace, duration) {
|
||||
if (workspace._keepAliveId)
|
||||
GLib.source_remove(workspace._keepAliveId);
|
||||
Mainloop.source_remove(workspace._keepAliveId);
|
||||
|
||||
workspace._keepAliveId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, duration, () => {
|
||||
workspace._keepAliveId = Mainloop.timeout_add(duration, () => {
|
||||
workspace._keepAliveId = 0;
|
||||
this._queueCheckWorkspaces();
|
||||
return GLib.SOURCE_REMOVE;
|
||||
@@ -296,7 +293,7 @@ var WorkspaceTracker = class {
|
||||
_windowRemoved(workspace, window) {
|
||||
workspace._lastRemovedWindow = window;
|
||||
this._queueCheckWorkspaces();
|
||||
let id = GLib.timeout_add(GLib.PRIORITY_DEFAULT, LAST_WINDOW_GRACE_TIME, () => {
|
||||
let id = Mainloop.timeout_add(LAST_WINDOW_GRACE_TIME, () => {
|
||||
if (workspace._lastRemovedWindow == window) {
|
||||
workspace._lastRemovedWindow = null;
|
||||
this._queueCheckWorkspaces();
|
||||
@@ -633,9 +630,9 @@ var AppSwitchAction = GObject.registerClass({
|
||||
let nPoints = this.get_n_current_points();
|
||||
let event = this.get_last_event (nPoints - 1);
|
||||
|
||||
if (nPoints == 3) {
|
||||
if (nPoints == 3)
|
||||
this._longPressStartTime = event.get_time();
|
||||
} else if (nPoints == 4) {
|
||||
else if (nPoints == 4) {
|
||||
// Check whether the 4th finger press happens after a 3-finger long press,
|
||||
// this only needs to be checked on the first 4th finger press
|
||||
if (this._longPressStartTime != null &&
|
||||
@@ -700,24 +697,23 @@ var WindowManager = class {
|
||||
constructor() {
|
||||
this._shellwm = global.window_manager;
|
||||
|
||||
this._minimizing = new Set();
|
||||
this._unminimizing = new Set();
|
||||
this._mapping = new Set();
|
||||
this._resizing = new Set();
|
||||
this._resizePending = new Set();
|
||||
this._destroying = new Set();
|
||||
this._minimizing = [];
|
||||
this._unminimizing = [];
|
||||
this._mapping = [];
|
||||
this._resizing = [];
|
||||
this._destroying = [];
|
||||
this._movingWindow = null;
|
||||
|
||||
this._dimmedWindows = [];
|
||||
|
||||
this._skippedActors = new Set();
|
||||
this._skippedActors = [];
|
||||
|
||||
this._allowedKeybindings = {};
|
||||
|
||||
this._isWorkspacePrepended = false;
|
||||
|
||||
this._switchData = null;
|
||||
this._shellwm.connect('kill-switch-workspace', shellwm => {
|
||||
this._shellwm.connect('kill-switch-workspace', (shellwm) => {
|
||||
if (this._switchData) {
|
||||
if (this._switchData.inProgress)
|
||||
this._switchWorkspaceDone(shellwm);
|
||||
@@ -1026,6 +1022,7 @@ var WindowManager = class {
|
||||
(proxy, error) => {
|
||||
if (error) {
|
||||
log(error.message);
|
||||
return;
|
||||
}
|
||||
});
|
||||
|
||||
@@ -1044,15 +1041,6 @@ var WindowManager = class {
|
||||
}
|
||||
});
|
||||
|
||||
global.display.connect('x11-display-opened', () => {
|
||||
IBusManager.getIBusManager().restartDaemon(['--xim']);
|
||||
Shell.util_start_systemd_unit('gnome-session-x11-services.target', 'fail');
|
||||
});
|
||||
global.display.connect('x11-display-closing', () => {
|
||||
Shell.util_stop_systemd_unit('gnome-session-x11-services.target', 'fail');
|
||||
IBusManager.getIBusManager().restartDaemon();
|
||||
});
|
||||
|
||||
Main.overview.connect('showing', () => {
|
||||
for (let i = 0; i < this._dimmedWindows.length; i++)
|
||||
this._undimWindow(this._dimmedWindows[i]);
|
||||
@@ -1118,7 +1106,7 @@ var WindowManager = class {
|
||||
|
||||
_showPadOsd(display, device, settings, imagePath, editionMode, monitorIndex) {
|
||||
this._currentPadOsd = new PadOsd.PadOsd(device, settings, imagePath, editionMode, monitorIndex);
|
||||
this._currentPadOsd.connect('closed', () => (this._currentPadOsd = null));
|
||||
this._currentPadOsd.connect('closed', () => this._currentPadOsd = null);
|
||||
|
||||
return this._currentPadOsd.actor;
|
||||
}
|
||||
@@ -1213,41 +1201,9 @@ var WindowManager = class {
|
||||
if (!Meta.prefs_get_dynamic_workspaces())
|
||||
return;
|
||||
|
||||
workspaceManager.append_new_workspace(false, global.get_current_time());
|
||||
|
||||
let windows = global.get_window_actors().map(a => a.meta_window);
|
||||
|
||||
// To create a new workspace, we slide all the windows on workspaces
|
||||
// below us to the next workspace, leaving a blank workspace for us
|
||||
// to recycle.
|
||||
windows.forEach(window => {
|
||||
// If the window is attached to an ancestor, we don't need/want
|
||||
// to move it
|
||||
if (window.get_transient_for() != null)
|
||||
return;
|
||||
// Same for OR windows
|
||||
if (window.is_override_redirect())
|
||||
return;
|
||||
// Sticky windows don't need moving, in fact moving would
|
||||
// unstick them
|
||||
if (window.on_all_workspaces)
|
||||
return;
|
||||
// Windows on workspaces below pos don't need moving
|
||||
let index = window.get_workspace().index();
|
||||
if (index < pos)
|
||||
return;
|
||||
window.change_workspace_by_index(index + 1, true);
|
||||
});
|
||||
|
||||
// If the new workspace was inserted before the active workspace,
|
||||
// activate the workspace to which its windows went
|
||||
let activeIndex = workspaceManager.get_active_workspace_index();
|
||||
if (activeIndex >= pos) {
|
||||
let newWs = workspaceManager.get_workspace_by_index(activeIndex + 1);
|
||||
this._blockAnimations = true;
|
||||
newWs.activate(global.get_current_time());
|
||||
this._blockAnimations = false;
|
||||
}
|
||||
let newWs = workspaceManager.append_new_workspace(
|
||||
false, global.get_current_time());
|
||||
workspaceManager.reorder_workspace(newWs, pos);
|
||||
}
|
||||
|
||||
keepWorkspaceAlive(workspace, duration) {
|
||||
@@ -1258,7 +1214,7 @@ var WindowManager = class {
|
||||
}
|
||||
|
||||
skipNextEffect(actor) {
|
||||
this._skippedActors.add(actor);
|
||||
this._skippedActors.push(actor);
|
||||
}
|
||||
|
||||
setCustomKeybindingHandler(name, modes, handler) {
|
||||
@@ -1287,7 +1243,7 @@ var WindowManager = class {
|
||||
}
|
||||
|
||||
_shouldAnimateActor(actor, types) {
|
||||
if (this._skippedActors.delete(actor))
|
||||
if (this._removeEffect(this._skippedActors, actor))
|
||||
return false;
|
||||
|
||||
if (!this._shouldAnimate())
|
||||
@@ -1300,6 +1256,15 @@ var WindowManager = class {
|
||||
return types.includes(type);
|
||||
}
|
||||
|
||||
_removeEffect(list, actor) {
|
||||
let idx = list.indexOf(actor);
|
||||
if (idx != -1) {
|
||||
list.splice(idx, 1);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
_minimizeWindow(shellwm, actor) {
|
||||
let types = [Meta.WindowType.NORMAL,
|
||||
Meta.WindowType.MODAL_DIALOG,
|
||||
@@ -1311,7 +1276,7 @@ var WindowManager = class {
|
||||
|
||||
actor.set_scale(1.0, 1.0);
|
||||
|
||||
this._minimizing.add(actor);
|
||||
this._minimizing.push(actor);
|
||||
|
||||
if (actor.meta_window.is_monitor_sized()) {
|
||||
actor.ease({
|
||||
@@ -1365,7 +1330,7 @@ var WindowManager = class {
|
||||
}
|
||||
|
||||
_minimizeWindowDone(shellwm, actor) {
|
||||
if (this._minimizing.delete(actor)) {
|
||||
if (this._removeEffect(this._minimizing, actor)) {
|
||||
actor.remove_all_transitions();
|
||||
actor.set_scale(1.0, 1.0);
|
||||
actor.set_opacity(255);
|
||||
@@ -1376,7 +1341,7 @@ var WindowManager = class {
|
||||
}
|
||||
|
||||
_minimizeWindowOverwritten(shellwm, actor) {
|
||||
if (this._minimizing.delete(actor)) {
|
||||
if (this._removeEffect(this._minimizing, actor)) {
|
||||
shellwm.completed_minimize(actor);
|
||||
}
|
||||
}
|
||||
@@ -1390,7 +1355,7 @@ var WindowManager = class {
|
||||
return;
|
||||
}
|
||||
|
||||
this._unminimizing.add(actor);
|
||||
this._unminimizing.push(actor);
|
||||
|
||||
if (actor.meta_window.is_monitor_sized()) {
|
||||
actor.opacity = 0;
|
||||
@@ -1447,7 +1412,7 @@ var WindowManager = class {
|
||||
}
|
||||
|
||||
_unminimizeWindowDone(shellwm, actor) {
|
||||
if (this._unminimizing.delete(actor)) {
|
||||
if (this._removeEffect(this._unminimizing, actor)) {
|
||||
actor.remove_all_transitions();
|
||||
actor.set_scale(1.0, 1.0);
|
||||
actor.set_opacity(255);
|
||||
@@ -1458,7 +1423,7 @@ var WindowManager = class {
|
||||
}
|
||||
|
||||
_unminimizeWindowOverwritten(shellwm, actor) {
|
||||
if (this._unminimizing.delete(actor)) {
|
||||
if (this._removeEffect(this._unminimizing, actor)) {
|
||||
shellwm.completed_unminimize(actor);
|
||||
}
|
||||
}
|
||||
@@ -1493,7 +1458,6 @@ var WindowManager = class {
|
||||
this._clearAnimationInfo(actor);
|
||||
});
|
||||
|
||||
this._resizePending.add(actor);
|
||||
actor.__animationInfo = { clone: actorClone,
|
||||
oldRect: oldFrameRect,
|
||||
destroyId: destroyId };
|
||||
@@ -1502,7 +1466,7 @@ var WindowManager = class {
|
||||
_sizeChangedWindow(shellwm, actor) {
|
||||
if (!actor.__animationInfo)
|
||||
return;
|
||||
if (this._resizing.has(actor))
|
||||
if (this._resizing.includes(actor))
|
||||
return;
|
||||
|
||||
let actorClone = actor.__animationInfo.clone;
|
||||
@@ -1512,8 +1476,7 @@ var WindowManager = class {
|
||||
let scaleX = targetRect.width / sourceRect.width;
|
||||
let scaleY = targetRect.height / sourceRect.height;
|
||||
|
||||
this._resizePending.delete(actor);
|
||||
this._resizing.add(actor);
|
||||
this._resizing.push(actor);
|
||||
|
||||
// Now scale and fade out the clone
|
||||
actorClone.ease({
|
||||
@@ -1566,7 +1529,7 @@ var WindowManager = class {
|
||||
}
|
||||
|
||||
_sizeChangeWindowDone(shellwm, actor) {
|
||||
if (this._resizing.delete(actor)) {
|
||||
if (this._removeEffect(this._resizing, actor)) {
|
||||
actor.remove_all_transitions();
|
||||
actor.scale_x = 1.0;
|
||||
actor.scale_y = 1.0;
|
||||
@@ -1574,13 +1537,10 @@ var WindowManager = class {
|
||||
actor.translation_y = 0;
|
||||
this._clearAnimationInfo(actor);
|
||||
}
|
||||
|
||||
if (this._resizePending.delete(actor))
|
||||
this._shellwm.completed_size_change(actor);
|
||||
}
|
||||
|
||||
_sizeChangeWindowOverwritten(shellwm, actor) {
|
||||
if (this._resizing.delete(actor))
|
||||
if (this._removeEffect(this._resizing, actor))
|
||||
this._clearAnimationInfo(actor);
|
||||
}
|
||||
|
||||
@@ -1673,7 +1633,7 @@ var WindowManager = class {
|
||||
actor.scale_y = 0.05;
|
||||
actor.opacity = 0;
|
||||
actor.show();
|
||||
this._mapping.add(actor);
|
||||
this._mapping.push(actor);
|
||||
|
||||
actor.ease({
|
||||
opacity: 255,
|
||||
@@ -1695,7 +1655,7 @@ var WindowManager = class {
|
||||
actor.scale_y = 0;
|
||||
actor.opacity = 0;
|
||||
actor.show();
|
||||
this._mapping.add(actor);
|
||||
this._mapping.push(actor);
|
||||
|
||||
actor.ease({
|
||||
opacity: 255,
|
||||
@@ -1713,11 +1673,12 @@ var WindowManager = class {
|
||||
break;
|
||||
default:
|
||||
shellwm.completed_map(actor);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
_mapWindowDone(shellwm, actor) {
|
||||
if (this._mapping.delete(actor)) {
|
||||
if (this._removeEffect(this._mapping, actor)) {
|
||||
actor.remove_all_transitions();
|
||||
actor.opacity = 255;
|
||||
actor.set_pivot_point(0, 0);
|
||||
@@ -1730,7 +1691,7 @@ var WindowManager = class {
|
||||
}
|
||||
|
||||
_mapWindowOverwrite(shellwm, actor) {
|
||||
if (this._mapping.delete(actor)) {
|
||||
if (this._removeEffect(this._mapping, actor)) {
|
||||
shellwm.completed_map(actor);
|
||||
}
|
||||
}
|
||||
@@ -1760,7 +1721,7 @@ var WindowManager = class {
|
||||
switch (actor.meta_window.window_type) {
|
||||
case Meta.WindowType.NORMAL:
|
||||
actor.set_pivot_point(0.5, 0.5);
|
||||
this._destroying.add(actor);
|
||||
this._destroying.push(actor);
|
||||
|
||||
actor.ease({
|
||||
opacity: 0,
|
||||
@@ -1774,7 +1735,7 @@ var WindowManager = class {
|
||||
case Meta.WindowType.MODAL_DIALOG:
|
||||
case Meta.WindowType.DIALOG:
|
||||
actor.set_pivot_point(0.5, 0.5);
|
||||
this._destroying.add(actor);
|
||||
this._destroying.push(actor);
|
||||
|
||||
if (window.is_attached_dialog()) {
|
||||
let parent = window.get_transient_for();
|
||||
@@ -1793,11 +1754,12 @@ var WindowManager = class {
|
||||
break;
|
||||
default:
|
||||
shellwm.completed_destroy(actor);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
_destroyWindowDone(shellwm, actor) {
|
||||
if (this._destroying.delete(actor)) {
|
||||
if (this._removeEffect(this._destroying, actor)) {
|
||||
let parent = actor.get_meta_window().get_transient_for();
|
||||
if (parent && actor._parentDestroyId) {
|
||||
parent.disconnect(actor._parentDestroyId);
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user