Compare commits
4 Commits
wip/carlos
...
wip/hadess
| Author | SHA1 | Date | |
|---|---|---|---|
|
752b1df659 | ||
|
|
366b06716d | ||
|
|
4d47b16d33 | ||
|
|
6526e9edf6 |
6
.eslintrc.json
Normal file
6
.eslintrc.json
Normal file
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"extends": [
|
||||
"./lint/eslintrc-gjs.json",
|
||||
"./lint/eslintrc-shell.json"
|
||||
]
|
||||
}
|
||||
@@ -1,3 +0,0 @@
|
||||
extends:
|
||||
- ./lint/eslintrc-gjs.yml
|
||||
- ./lint/eslintrc-shell.yml
|
||||
@@ -14,7 +14,7 @@ variables:
|
||||
- merge_requests
|
||||
|
||||
check_commit_log:
|
||||
image: registry.gitlab.gnome.org/gnome/mutter/master:v3
|
||||
image: registry.gitlab.gnome.org/gnome/mutter/master:v2
|
||||
stage: review
|
||||
variables:
|
||||
GIT_DEPTH: "100"
|
||||
@@ -47,7 +47,7 @@ eslint:
|
||||
when: always
|
||||
|
||||
build:
|
||||
image: registry.gitlab.gnome.org/gnome/mutter/master:v3
|
||||
image: registry.gitlab.gnome.org/gnome/mutter/master:v2
|
||||
stage: build
|
||||
before_script:
|
||||
- .gitlab-ci/checkout-mutter.sh
|
||||
@@ -65,15 +65,14 @@ build:
|
||||
- build
|
||||
|
||||
test:
|
||||
image: registry.gitlab.gnome.org/gnome/mutter/master:v3
|
||||
image: registry.gitlab.gnome.org/gnome/mutter/master:v2
|
||||
stage: test
|
||||
variables:
|
||||
XDG_RUNTIME_DIR: "$CI_PROJECT_DIR/runtime-dir"
|
||||
NO_AT_BRIDGE: "1"
|
||||
before_script:
|
||||
- ninja -C mutter/build install
|
||||
script:
|
||||
- dbus-run-session -- xvfb-run meson test -C build --no-rebuild
|
||||
- xvfb-run meson test -C build --no-rebuild
|
||||
<<: *only_default
|
||||
artifacts:
|
||||
expire_in: 1 day
|
||||
@@ -82,7 +81,7 @@ test:
|
||||
when: on_failure
|
||||
|
||||
test-pot:
|
||||
image: registry.gitlab.gnome.org/gnome/mutter/master:v3
|
||||
image: registry.gitlab.gnome.org/gnome/mutter/master:v2
|
||||
stage: test
|
||||
before_script:
|
||||
- ninja -C mutter/build install
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -13,7 +13,7 @@ is_empty() {
|
||||
}
|
||||
|
||||
run_eslint() {
|
||||
ARGS_LEGACY='--config lint/eslintrc-legacy.yml'
|
||||
ARGS_LEGACY='--config lint/eslintrc-legacy.json'
|
||||
|
||||
local extra_args=ARGS_$1
|
||||
local output_var=OUTPUT_$1
|
||||
|
||||
14
HACKING.md
14
HACKING.md
@@ -163,17 +163,11 @@ you to inherit from a type to use it, you can do so:
|
||||
return [100, 100];
|
||||
}
|
||||
|
||||
vfunc_paint(paintContext) {
|
||||
let framebuffer = paintContext.get_framebuffer();
|
||||
let coglContext = framebuffer.get_context();
|
||||
vfunc_paint() {
|
||||
let alloc = this.get_allocation_box();
|
||||
|
||||
let pipeline = new Cogl.Pipeline(coglContext);
|
||||
pipeline.set_color4ub(255, 0, 0, 255);
|
||||
|
||||
framebuffer.draw_rectangle(pipeline,
|
||||
alloc.x1, alloc.y1,
|
||||
alloc.x2, alloc.y2);
|
||||
Cogl.set_source_color4ub(255, 0, 0, 255);
|
||||
Cogl.rectangle(alloc.x1, alloc.y1,
|
||||
alloc.x2, alloc.y2);
|
||||
}
|
||||
});
|
||||
```
|
||||
|
||||
65
NEWS
65
NEWS
@@ -1,68 +1,3 @@
|
||||
3.35.2
|
||||
======
|
||||
* Fix unredirection after cancelled animations [Florian; #1788]
|
||||
* Include shadow in window screenshots [Robert; !762]
|
||||
* Show indicator when microphone is active [Florian; !729]
|
||||
* Use inheritance instead of delegate pattern [Marco; !559]
|
||||
* Use cached coordinates for window sorting in overview [Andrew; !763]
|
||||
* Wiggle login/unlock password entries on failure [Georges; !769]
|
||||
* Update window titles in app menu [Florian; #1830]
|
||||
* Fix window animations getting stuck by workspace switches [Jonas D.; !784]
|
||||
* Fix not-responding dialog size when using geometry scaling [Jonas D.; !783]
|
||||
* Handle buggy MPRIS clients more gracefully [Philip; #1362]
|
||||
* Deprecate StBoxLayout's child properties [Florian; !780]
|
||||
* Remove StBin's align properties [Florian; !803]
|
||||
* Use correct timezones for events [Milan, Florian; !806, #1895]
|
||||
* Reduce overhead of tracking stylesheet changes [Carlos; !779]
|
||||
* Replace action icons in system menu with regular menu items [Florian; #270]
|
||||
* Refine polkit dialogs [Jonas D.; !788]
|
||||
* Fix battery icon glitch in "100% but charging" case [Philip; !814]
|
||||
* Fix windows getting stuck on screen if closed while animating [Florian; !815]
|
||||
* Use font from interface settings [Florian; #688288]
|
||||
* Show polkit confirmation dialog for users with no password
|
||||
[Joaquim, Jonas D.; !829]
|
||||
* Use better OSK layout fallback for unsupported variants [Florian; #1907]
|
||||
* Hide stopped spinner in top bar [Joonas; !832]
|
||||
* Reuse existing icons when updating the app picker grid [Georges; !841]
|
||||
* Show switcher popups immediately on second key press [Florian; #1928]
|
||||
* Add position-based animation to page indicators [Alexander; !843]
|
||||
* Improve modifier-less keyboard navigation of switcher popups [Florian; #1883]
|
||||
* Improve weather integration [Florian; #1927, #1926]
|
||||
* Add back sound feedback when scrolling volume indicator [Florian; #53]
|
||||
* Fix creating app folders with no pre-existing folders [Jonas D.; #1652]
|
||||
* Improve DND page switching in app picker [Florian, Jonas D.; #1693]
|
||||
* Fix disable command of gnome-extensions tool [Florian; #1946]
|
||||
* Tweak styling of notifications/media constrols [Joonas; !855, !865]
|
||||
* Enable clean session shutdown after gnome-shell failure [Benjamin; !858]
|
||||
* Also remove scaled keys when texture cache is cleared [Daniel M.; !567]
|
||||
* Don't show overflow indicator in switchers that fit screen [Florian; #1834]
|
||||
* Move libcroco dependency in-tree [Federico; !861]
|
||||
* Move to app folder location when it is created/renamed [Georges; !883]
|
||||
* Dismiss switcher popups when a system modal dialogs opens [Florian; #1536]
|
||||
* Fix weather forecasts for automatic location when Weather is not sandboxed
|
||||
[Florian; #1823]
|
||||
* Place launched applications into a systemd scope [Benjamin; !863]
|
||||
* Fixed crashes [Jonas D., Carlos; !787, !813]
|
||||
* Misc. bug fixes and cleanups [Marco, Georges, Daniel V., Florian, Robert,
|
||||
Kalev, Philip, Jonas D., Will, Carlos, Jonas Å., cunidev, Joonas, Federico;
|
||||
!747, !765, !421, !759, !749, !730, !770, #1799, !774, !773, !776, !777,
|
||||
!782, !794, !778, !792, !790, !190, !796, !795, !797, !798, !800, !804, !808,
|
||||
!807, !810, !811, !563, !809, !805, !817, !818, !822, !830, !828, !823, !835,
|
||||
!840, !842, !833, !845, !846, !847, !851, #1916, !862, !866, #1979, !827,
|
||||
#1976, !884, !873, !885, !799, !887, !891, !816]
|
||||
|
||||
Contributors:
|
||||
Marco Trevisan (Treviño), Benjamin Berg, Philip Chimento, Milan Crha,
|
||||
Jonas Dreßler, Carlos Garnacho, Joonas Henriksson, Kalev Lember, Robert Mader,
|
||||
Alexander Mikhaylenko, Daniel García Moreno, Florian Müllner,
|
||||
Georges Basile Stavracas Neto, Federico Mena Quintero, Joaquim Rocha,
|
||||
Will Thompson, Daniel van Vugt, Andrew Watson, cunidev, Jonas Ådahl
|
||||
|
||||
Translators:
|
||||
Daniel Mustieles [es], Goran Vidović [hr], Fabio Tomat [fur],
|
||||
Danial Behzadi [fa], Andika Triwidada [id], Efstathios Iosifidis [el],
|
||||
Ricardo Silva Veloso [pt_BR]
|
||||
|
||||
3.35.1
|
||||
======
|
||||
* Misc. bug fixes and cleanups [Marco; Matthias; !758, #701212]
|
||||
|
||||
@@ -1,46 +1,5 @@
|
||||
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
|
||||
"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
|
||||
|
||||
<node>
|
||||
|
||||
<!--
|
||||
net.hadess.SwitcherooControl:
|
||||
@short_description: D-Bus proxy to access dual-GPU controls.
|
||||
|
||||
After checking the availability of two switchable GPUs in the machine,
|
||||
check the value of net.hadess.SwitcherooControl.HasDualGpu to see
|
||||
if running applications on the discrete GPU should be offered.
|
||||
|
||||
The object path will be "/net/hadess/SwitcherooControl".
|
||||
-->
|
||||
<interface name="net.hadess.SwitcherooControl">
|
||||
<!--
|
||||
HasDualGpu:
|
||||
|
||||
Whether two switchable GPUs are present on the system. This property
|
||||
has been obsoleted in favour of the "NumGPUs" property.
|
||||
-->
|
||||
<property name="HasDualGpu" type="b" access="read"/>
|
||||
|
||||
<!--
|
||||
NumGPUs:
|
||||
|
||||
The number of GPUs available on the system. Note that while having no
|
||||
GPUs is unlikely, consumers of this API should probably not throw errors
|
||||
if that were the case.
|
||||
-->
|
||||
<property name="NumGPUs" type="u" access="read"/>
|
||||
|
||||
<!--
|
||||
GPUs:
|
||||
|
||||
An array of key-pair values representing each GPU. The key named "Name" (s)
|
||||
will contain a user-facing name for the GPU, the "Environment" (as) key will
|
||||
contain an array of even number of strings, each being an environment
|
||||
variable to set to use the GPU, followed by its value, the "Default" (b) key
|
||||
will tag the default (usually integrated) GPU.
|
||||
-->
|
||||
<property name="GPUs" type="aa{sv}" access="read"/>
|
||||
|
||||
</interface>
|
||||
</node>
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -36,8 +36,10 @@ $_hover_bg_color: lighten($bg_color,if($variant=='light', 5%, 3%));
|
||||
$_active_bg_color: if($variant == 'light', darken($bg_color, 14%), darken($bg_color, 9%));
|
||||
|
||||
$font-size: 11;
|
||||
$font-family: Cantarell, Sans-Serif;
|
||||
|
||||
stage {
|
||||
font-family: $font-family;
|
||||
@include fontsize($font-size);
|
||||
color: $fg_color;
|
||||
}
|
||||
@@ -977,7 +979,6 @@ StScrollBar {
|
||||
spacing-columns: 0.8em;
|
||||
}
|
||||
|
||||
.weather-header-box,
|
||||
.weather-box {
|
||||
spacing: 0.4em;
|
||||
}
|
||||
@@ -1060,9 +1061,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%);
|
||||
@@ -1152,21 +1153,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 {
|
||||
@@ -1196,8 +1190,7 @@ StScrollBar {
|
||||
|
||||
.aggregate-menu {
|
||||
min-width: 21em;
|
||||
.popup-menu-icon { padding: 0 4px;
|
||||
-st-icon-style: symbolic; }
|
||||
.popup-menu-icon { padding: 0 4px; }
|
||||
.popup-sub-menu .popup-menu-item > :first-child {
|
||||
&:ltr { /* 12px spacing + 2*4px padding */
|
||||
padding-left: 20px; margin-left: 1.09em; }
|
||||
@@ -1206,6 +1199,27 @@ StScrollBar {
|
||||
}
|
||||
}
|
||||
|
||||
.system-menu-action {
|
||||
-st-icon-style: symbolic;
|
||||
color: $fg_color;
|
||||
border-radius: 32px; /* wish we could do 50% */
|
||||
padding: 13px;
|
||||
border: 1px solid $_bubble_borders_color;
|
||||
|
||||
&:hover, &:focus {
|
||||
background-color: $_hover_bg_color;
|
||||
color: $fg_color;
|
||||
border: none;
|
||||
padding: 14px;
|
||||
}
|
||||
&:active {
|
||||
background-color: $selected_bg_color;
|
||||
color: $selected_fg_color;
|
||||
}
|
||||
|
||||
& > StIcon { icon-size: 16px; }
|
||||
}
|
||||
|
||||
// Activities Ripples
|
||||
.ripple-box {
|
||||
width: 52px;
|
||||
@@ -1557,14 +1571,20 @@ StScrollBar {
|
||||
}
|
||||
|
||||
.page-indicator {
|
||||
padding: 7px 16px;
|
||||
padding: 15px 20px;
|
||||
|
||||
.page-indicator-icon {
|
||||
width: 12px;
|
||||
height: 12px;
|
||||
background-color: white;
|
||||
border-radius: 6px;
|
||||
background-color: transparent;
|
||||
border: 2px solid rgba(255, 255, 255, 0.4);
|
||||
border-radius: 12px;
|
||||
}
|
||||
|
||||
&:hover .page-indicator-icon { border-color: white; }
|
||||
&:active .page-indicator-icon { border: none; margin: 2px; background-color: white; }
|
||||
&:checked .page-indicator-icon,
|
||||
&:checked:active .page-indicator-icon { background-color: white;}
|
||||
}
|
||||
|
||||
.no-frequent-applications-label { @extend %status_text; }
|
||||
@@ -1764,8 +1784,8 @@ StScrollBar {
|
||||
padding: 4px 4px;
|
||||
|
||||
.page-indicator-icon {
|
||||
width: 8px;
|
||||
height: 8px;
|
||||
width: 6px;
|
||||
height: 6px
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -23,13 +23,14 @@ function stripPrefix(string, prefix) {
|
||||
return string;
|
||||
}
|
||||
|
||||
var Application = GObject.registerClass(
|
||||
class Application extends Gtk.Application {
|
||||
var Application = GObject.registerClass({
|
||||
GTypeName: 'ExtensionPrefs_Application'
|
||||
}, class Application extends Gtk.Application {
|
||||
_init() {
|
||||
GLib.set_prgname('gnome-shell-extension-prefs');
|
||||
super._init({
|
||||
application_id: 'org.gnome.shell.ExtensionPrefs',
|
||||
flags: Gio.ApplicationFlags.HANDLES_COMMAND_LINE,
|
||||
flags: Gio.ApplicationFlags.HANDLES_COMMAND_LINE
|
||||
});
|
||||
|
||||
this._startupUuid = null;
|
||||
@@ -60,12 +61,12 @@ class Application extends Gtk.Application {
|
||||
|
||||
let dialog = new Gtk.Window({
|
||||
modal: !this._skipMainWindow,
|
||||
type_hint: Gdk.WindowTypeHint.DIALOG,
|
||||
type_hint: Gdk.WindowTypeHint.DIALOG
|
||||
});
|
||||
dialog.set_titlebar(new Gtk.HeaderBar({
|
||||
show_close_button: true,
|
||||
title: row.name,
|
||||
visible: true,
|
||||
visible: true
|
||||
}));
|
||||
|
||||
if (this._skipMainWindow) {
|
||||
@@ -88,20 +89,20 @@ class Application extends Gtk.Application {
|
||||
_buildErrorUI(row, exc) {
|
||||
let scroll = new Gtk.ScrolledWindow({
|
||||
hscrollbar_policy: Gtk.PolicyType.NEVER,
|
||||
propagate_natural_height: true,
|
||||
propagate_natural_height: true
|
||||
});
|
||||
|
||||
let box = new Gtk.Box({
|
||||
orientation: Gtk.Orientation.VERTICAL,
|
||||
spacing: 12,
|
||||
margin: 100,
|
||||
margin_bottom: 60,
|
||||
margin_bottom: 60
|
||||
});
|
||||
scroll.add(box);
|
||||
|
||||
let label = new Gtk.Label({
|
||||
label: '<span size="x-large">%s</span>'.format(_("Something’s gone wrong")),
|
||||
use_markup: true,
|
||||
use_markup: true
|
||||
});
|
||||
label.get_style_context().add_class(Gtk.STYLE_CLASS_DIM_LABEL);
|
||||
box.add(label);
|
||||
@@ -109,13 +110,13 @@ class Application extends Gtk.Application {
|
||||
label = new Gtk.Label({
|
||||
label: _("We’re very sorry, but there’s been a problem: the settings for this extension can’t be displayed. We recommend that you report the issue to the extension authors."),
|
||||
justify: Gtk.Justification.CENTER,
|
||||
wrap: true,
|
||||
wrap: true
|
||||
});
|
||||
box.add(label);
|
||||
|
||||
let expander = new Expander({
|
||||
label: _("Technical Details"),
|
||||
margin_top: 12,
|
||||
margin_top: 12
|
||||
});
|
||||
box.add(expander);
|
||||
|
||||
@@ -126,14 +127,14 @@ class Application extends Gtk.Application {
|
||||
|
||||
let buffer = new Gtk.TextBuffer({ text: errortext });
|
||||
let textview = new Gtk.TextView({
|
||||
buffer,
|
||||
buffer: buffer,
|
||||
wrap_mode: Gtk.WrapMode.WORD,
|
||||
monospace: true,
|
||||
editable: false,
|
||||
top_margin: 12,
|
||||
bottom_margin: 12,
|
||||
left_margin: 12,
|
||||
right_margin: 12,
|
||||
right_margin: 12
|
||||
});
|
||||
|
||||
let toolbar = new Gtk.Toolbar();
|
||||
@@ -149,7 +150,7 @@ class Application extends Gtk.Application {
|
||||
|
||||
let copyButton = new Gtk.ToolButton({
|
||||
icon_name: 'edit-copy-symbolic',
|
||||
tooltip_text: _("Copy Error"),
|
||||
tooltip_text: _("Copy Error")
|
||||
});
|
||||
toolbar.add(copyButton);
|
||||
|
||||
@@ -158,15 +159,15 @@ class Application extends Gtk.Application {
|
||||
// markdown for pasting in gitlab issues
|
||||
let lines = [
|
||||
`The settings of extension ${row.uuid} had an error:`,
|
||||
'```', // '`' (xgettext throws up on odd number of backticks)
|
||||
'```',
|
||||
`${exc}`,
|
||||
'```', // '`'
|
||||
'```',
|
||||
'',
|
||||
'Stack trace:',
|
||||
'```', // '`'
|
||||
'```',
|
||||
exc.stack.replace(/\n$/, ''), // stack without trailing newline
|
||||
'```', // '`'
|
||||
'',
|
||||
'```',
|
||||
''
|
||||
];
|
||||
clipboard.set_text(lines.join('\n'), -1);
|
||||
});
|
||||
@@ -179,7 +180,7 @@ class Application extends Gtk.Application {
|
||||
label: _("Homepage"),
|
||||
tooltip_text: _("Visit extension homepage"),
|
||||
no_show_all: true,
|
||||
visible: row.url != null,
|
||||
visible: row.url != null
|
||||
});
|
||||
toolbar.add(urlButton);
|
||||
|
||||
@@ -189,7 +190,7 @@ class Application extends Gtk.Application {
|
||||
});
|
||||
|
||||
let expandedBox = new Gtk.Box({
|
||||
orientation: Gtk.Orientation.VERTICAL,
|
||||
orientation: Gtk.Orientation.VERTICAL
|
||||
});
|
||||
expandedBox.add(textview);
|
||||
expandedBox.add(toolbar);
|
||||
@@ -219,7 +220,7 @@ class Application extends Gtk.Application {
|
||||
Gio.SettingsBindFlags.INVERT_BOOLEAN);
|
||||
|
||||
this._mainStack = new Gtk.Stack({
|
||||
transition_type: Gtk.StackTransitionType.CROSSFADE,
|
||||
transition_type: Gtk.StackTransitionType.CROSSFADE
|
||||
});
|
||||
this._window.add(this._mainStack);
|
||||
|
||||
@@ -258,15 +259,23 @@ class Application extends Gtk.Application {
|
||||
}
|
||||
|
||||
_onExtensionStateChanged(proxy, senderName, [uuid, newState]) {
|
||||
let extension = ExtensionUtils.deserializeExtension(newState);
|
||||
let row = this._findExtensionRow(uuid);
|
||||
|
||||
if (row) {
|
||||
if (extension.state === ExtensionState.UNINSTALLED)
|
||||
let { state } = ExtensionUtils.deserializeExtension(newState);
|
||||
if (state == ExtensionState.UNINSTALLED)
|
||||
row.destroy();
|
||||
return; // we only deal with new and deleted extensions here
|
||||
}
|
||||
this._addExtensionRow(extension);
|
||||
|
||||
this._shellProxy.GetExtensionInfoRemote(uuid, ([serialized]) => {
|
||||
let extension = ExtensionUtils.deserializeExtension(serialized);
|
||||
if (!extension)
|
||||
return;
|
||||
// check the extension wasn't added in between
|
||||
if (this._findExtensionRow(uuid) != null)
|
||||
return;
|
||||
this._addExtensionRow(extension);
|
||||
});
|
||||
}
|
||||
|
||||
_scanExtensions() {
|
||||
@@ -352,20 +361,20 @@ var Expander = GObject.registerClass({
|
||||
'label', 'label', 'label',
|
||||
GObject.ParamFlags.READWRITE,
|
||||
null
|
||||
),
|
||||
},
|
||||
)
|
||||
}
|
||||
}, class Expander extends Gtk.Box {
|
||||
_init(params = {}) {
|
||||
this._labelText = null;
|
||||
|
||||
super._init(Object.assign(params, {
|
||||
orientation: Gtk.Orientation.VERTICAL,
|
||||
spacing: 0,
|
||||
spacing: 0
|
||||
}));
|
||||
|
||||
this._frame = new Gtk.Frame({
|
||||
shadow_type: Gtk.ShadowType.IN,
|
||||
hexpand: true,
|
||||
hexpand: true
|
||||
});
|
||||
|
||||
let eventBox = new Gtk.EventBox();
|
||||
@@ -373,12 +382,12 @@ var Expander = GObject.registerClass({
|
||||
|
||||
let hbox = new Gtk.Box({
|
||||
spacing: 6,
|
||||
margin: 12,
|
||||
margin: 12
|
||||
});
|
||||
eventBox.add(hbox);
|
||||
|
||||
this._arrow = new Gtk.Image({
|
||||
icon_name: 'pan-end-symbolic',
|
||||
icon_name: 'pan-end-symbolic'
|
||||
});
|
||||
hbox.add(this._arrow);
|
||||
|
||||
@@ -388,7 +397,7 @@ var Expander = GObject.registerClass({
|
||||
this._revealer = new Gtk.Revealer();
|
||||
|
||||
this._childBin = new Gtk.Frame({
|
||||
shadow_type: Gtk.ShadowType.IN,
|
||||
shadow_type: Gtk.ShadowType.IN
|
||||
});
|
||||
this._revealer.add(this._childBin);
|
||||
|
||||
@@ -406,7 +415,7 @@ var Expander = GObject.registerClass({
|
||||
this._gesture = new Gtk.GestureMultiPress({
|
||||
widget: this._frame,
|
||||
button: 0,
|
||||
exclusive: true,
|
||||
exclusive: true
|
||||
});
|
||||
this._gesture.connect('released', (gesture, nPress) => {
|
||||
if (nPress == 1)
|
||||
@@ -451,7 +460,7 @@ class EmptyPlaceholder extends Gtk.Box {
|
||||
super._init({
|
||||
orientation: Gtk.Orientation.VERTICAL,
|
||||
spacing: 6,
|
||||
margin: 32,
|
||||
margin: 32
|
||||
});
|
||||
|
||||
let image = new Gtk.Image({
|
||||
@@ -459,15 +468,15 @@ class EmptyPlaceholder extends Gtk.Box {
|
||||
pixel_size: 96,
|
||||
visible: true,
|
||||
vexpand: true,
|
||||
valign: Gtk.Align.END,
|
||||
valign: Gtk.Align.END
|
||||
});
|
||||
image.get_style_context().add_class(Gtk.STYLE_CLASS_DIM_LABEL);
|
||||
this.add(image);
|
||||
|
||||
let label = new Gtk.Label({
|
||||
label: `<b><span size="x-large">${_("No Extensions Installed")}</span></b>`,
|
||||
label: `<b><span size="x-large">${_("No Extensions Installed" )}</span></b>`,
|
||||
use_markup: true,
|
||||
visible: true,
|
||||
visible: true
|
||||
});
|
||||
label.get_style_context().add_class(Gtk.STYLE_CLASS_DIM_LABEL);
|
||||
this.add(label);
|
||||
@@ -482,9 +491,9 @@ class EmptyPlaceholder extends Gtk.Box {
|
||||
visible: true,
|
||||
max_width_chars: 50,
|
||||
hexpand: true,
|
||||
vexpand: appInfo == null,
|
||||
vexpand: (appInfo == null),
|
||||
halign: Gtk.Align.CENTER,
|
||||
valign: Gtk.Align.START,
|
||||
valign: Gtk.Align.START
|
||||
});
|
||||
this.add(desc);
|
||||
|
||||
@@ -492,14 +501,14 @@ class EmptyPlaceholder extends Gtk.Box {
|
||||
let button = new Gtk.Button({
|
||||
label: _("Browse in Software"),
|
||||
image: new Gtk.Image({
|
||||
icon_name: "org.gnome.Software-symbolic",
|
||||
icon_name: "org.gnome.Software-symbolic"
|
||||
}),
|
||||
always_show_image: true,
|
||||
margin_top: 12,
|
||||
visible: true,
|
||||
halign: Gtk.Align.CENTER,
|
||||
valign: Gtk.Align.START,
|
||||
vexpand: true,
|
||||
vexpand: true
|
||||
});
|
||||
this.add(button);
|
||||
|
||||
@@ -518,13 +527,13 @@ class NoShellPlaceholder extends Gtk.Box {
|
||||
orientation: Gtk.Orientation.VERTICAL,
|
||||
spacing: 12,
|
||||
margin: 100,
|
||||
margin_bottom: 60,
|
||||
margin_bottom: 60
|
||||
});
|
||||
|
||||
let label = new Gtk.Label({
|
||||
label: '<span size="x-large">%s</span>'.format(
|
||||
_("Something’s gone wrong")),
|
||||
use_markup: true,
|
||||
use_markup: true
|
||||
});
|
||||
label.get_style_context().add_class(Gtk.STYLE_CLASS_DIM_LABEL);
|
||||
this.add(label);
|
||||
@@ -532,7 +541,7 @@ class NoShellPlaceholder extends Gtk.Box {
|
||||
label = new Gtk.Label({
|
||||
label: _("We’re very sorry, but it was not possible to get the list of installed extensions. Make sure you are logged into GNOME and try again."),
|
||||
justify: Gtk.Justification.CENTER,
|
||||
wrap: true,
|
||||
wrap: true
|
||||
});
|
||||
this.add(label);
|
||||
|
||||
@@ -569,11 +578,11 @@ class ExtensionRow extends Gtk.ListBoxRow {
|
||||
return;
|
||||
|
||||
this._extension = ExtensionUtils.deserializeExtension(newState);
|
||||
let state = this._extension.state == ExtensionState.ENABLED;
|
||||
let state = (this._extension.state == ExtensionState.ENABLED);
|
||||
|
||||
this._switch.block_signal_handler(this._notifyActiveId);
|
||||
GObject.signal_handler_block(this._switch, this._notifyActiveId);
|
||||
this._switch.state = state;
|
||||
this._switch.unblock_signal_handler(this._notifyActiveId);
|
||||
GObject.signal_handler_unblock(this._switch, this._notifyActiveId);
|
||||
|
||||
this._switch.sensitive = this._canToggle();
|
||||
});
|
||||
@@ -640,7 +649,7 @@ class ExtensionRow extends Gtk.ListBoxRow {
|
||||
this._switch = new Gtk.Switch({
|
||||
valign: Gtk.Align.CENTER,
|
||||
sensitive: this._canToggle(),
|
||||
state: this._extension.state === ExtensionState.ENABLED,
|
||||
state: this._extension.state === ExtensionState.ENABLED
|
||||
});
|
||||
this._notifyActiveId = this._switch.connect('notify::active', () => {
|
||||
if (this._switch.active)
|
||||
@@ -657,12 +666,12 @@ class ExtensionRow extends Gtk.ListBoxRow {
|
||||
}
|
||||
|
||||
get prefsModule() {
|
||||
// give extension prefs access to their own extension object
|
||||
ExtensionUtils.getCurrentExtension = () => this._extension;
|
||||
|
||||
if (!this._prefsModule) {
|
||||
ExtensionUtils.installImporter(this._extension);
|
||||
|
||||
// give extension prefs access to their own extension object
|
||||
ExtensionUtils.getCurrentExtension = () => this._extension;
|
||||
|
||||
this._prefsModule = this._extension.imports.prefs;
|
||||
this._prefsModule.init(this._extension.metadata);
|
||||
}
|
||||
@@ -683,7 +692,7 @@ function initEnvironment() {
|
||||
log(`ERROR: ${s}`);
|
||||
},
|
||||
|
||||
userdatadir: GLib.build_filenamev([GLib.get_user_data_dir(), 'gnome-shell']),
|
||||
userdatadir: GLib.build_filenamev([GLib.get_user_data_dir(), 'gnome-shell'])
|
||||
};
|
||||
|
||||
String.prototype.format = Format.format;
|
||||
|
||||
@@ -23,19 +23,19 @@ const N_WIGGLES = 3;
|
||||
|
||||
var AuthPromptMode = {
|
||||
UNLOCK_ONLY: 0,
|
||||
UNLOCK_OR_LOG_IN: 1,
|
||||
UNLOCK_OR_LOG_IN: 1
|
||||
};
|
||||
|
||||
var AuthPromptStatus = {
|
||||
NOT_VERIFYING: 0,
|
||||
VERIFYING: 1,
|
||||
VERIFICATION_FAILED: 2,
|
||||
VERIFICATION_SUCCEEDED: 3,
|
||||
VERIFICATION_SUCCEEDED: 3
|
||||
};
|
||||
|
||||
var BeginRequestType = {
|
||||
PROVIDE_USERNAME: 0,
|
||||
DONT_PROVIDE_USERNAME: 1,
|
||||
DONT_PROVIDE_USERNAME: 1
|
||||
};
|
||||
|
||||
var AuthPrompt = GObject.registerClass({
|
||||
@@ -45,12 +45,12 @@ var AuthPrompt = GObject.registerClass({
|
||||
'next': {},
|
||||
'prompted': {},
|
||||
'reset': { param_types: [GObject.TYPE_UINT] },
|
||||
},
|
||||
}
|
||||
}, class AuthPrompt extends St.BoxLayout {
|
||||
_init(gdmClient, mode) {
|
||||
super._init({
|
||||
style_class: 'login-dialog-prompt-layout',
|
||||
vertical: true,
|
||||
vertical: true
|
||||
});
|
||||
|
||||
this.verificationStatus = AuthPromptStatus.NOT_VERIFYING;
|
||||
@@ -64,7 +64,7 @@ var AuthPrompt = GObject.registerClass({
|
||||
else if (this._mode == AuthPromptMode.UNLOCK_OR_LOG_IN)
|
||||
reauthenticationOnly = false;
|
||||
|
||||
this._userVerifier = new GdmUtil.ShellUserVerifier(this._gdmClient, { reauthenticationOnly });
|
||||
this._userVerifier = new GdmUtil.ShellUserVerifier(this._gdmClient, { reauthenticationOnly: reauthenticationOnly });
|
||||
|
||||
this._userVerifier.connect('ask-question', this._onAskQuestion.bind(this));
|
||||
this._userVerifier.connect('show-message', this._onShowMessage.bind(this));
|
||||
@@ -78,61 +78,59 @@ var AuthPrompt = GObject.registerClass({
|
||||
this.connect('next', () => {
|
||||
this.updateSensitivity(false);
|
||||
this.startSpinning();
|
||||
if (this._queryingService)
|
||||
if (this._queryingService) {
|
||||
this._userVerifier.answerQuery(this._queryingService, this._entry.text);
|
||||
else
|
||||
} else {
|
||||
this._preemptiveAnswer = this._entry.text;
|
||||
}
|
||||
});
|
||||
|
||||
this.connect('destroy', this._onDestroy.bind(this));
|
||||
|
||||
this._userWell = new St.Bin({
|
||||
x_expand: true,
|
||||
y_expand: true,
|
||||
});
|
||||
this.add_child(this._userWell);
|
||||
this._label = new St.Label({
|
||||
style_class: 'login-dialog-prompt-label',
|
||||
x_expand: false,
|
||||
y_expand: true,
|
||||
this._userWell = new St.Bin({ x_fill: true, x_align: St.Align.START });
|
||||
this.add(this._userWell, {
|
||||
x_align: St.Align.START,
|
||||
x_fill: true,
|
||||
y_fill: true,
|
||||
expand: true
|
||||
});
|
||||
this._label = new St.Label({ style_class: 'login-dialog-prompt-label' });
|
||||
|
||||
this.add_child(this._label);
|
||||
this._entry = new St.Entry({
|
||||
style_class: 'login-dialog-prompt-entry',
|
||||
can_focus: true,
|
||||
x_expand: false,
|
||||
y_expand: true,
|
||||
this.add(this._label, {
|
||||
expand: true,
|
||||
x_fill: false,
|
||||
y_fill: true,
|
||||
x_align: St.Align.START
|
||||
});
|
||||
this._entry = new St.Entry({ style_class: 'login-dialog-prompt-entry',
|
||||
can_focus: true });
|
||||
ShellEntry.addContextMenu(this._entry, { isPassword: true, actionMode: Shell.ActionMode.NONE });
|
||||
|
||||
this.add_child(this._entry);
|
||||
this.add(this._entry, {
|
||||
expand: true,
|
||||
x_fill: true,
|
||||
y_fill: false,
|
||||
x_align: St.Align.START
|
||||
});
|
||||
|
||||
this._entry.grab_key_focus();
|
||||
|
||||
this._message = new St.Label({
|
||||
opacity: 0,
|
||||
styleClass: 'login-dialog-message',
|
||||
x_expand: false,
|
||||
y_expand: true,
|
||||
y_align: Clutter.ActorAlign.START,
|
||||
});
|
||||
this._message = new St.Label({ opacity: 0,
|
||||
styleClass: 'login-dialog-message' });
|
||||
this._message.clutter_text.line_wrap = true;
|
||||
this._message.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
|
||||
this.add_child(this._message);
|
||||
this.add(this._message, { x_fill: false, x_align: St.Align.START, y_align: St.Align.START });
|
||||
|
||||
this._buttonBox = new St.BoxLayout({
|
||||
style_class: 'login-dialog-button-box',
|
||||
vertical: false,
|
||||
y_align: Clutter.ActorAlign.END,
|
||||
this._buttonBox = new St.BoxLayout({ style_class: 'login-dialog-button-box',
|
||||
vertical: false });
|
||||
this.add(this._buttonBox, {
|
||||
expand: true,
|
||||
x_align: St.Align.MIDDLE,
|
||||
y_align: St.Align.END
|
||||
});
|
||||
this.add_child(this._buttonBox);
|
||||
|
||||
this._defaultButtonWell = new St.Widget({
|
||||
layout_manager: new Clutter.BinLayout(),
|
||||
x_align: Clutter.ActorAlign.END,
|
||||
y_align: Clutter.ActorAlign.CENTER,
|
||||
});
|
||||
this._defaultButtonWell = new St.Widget({ layout_manager: new Clutter.BinLayout() });
|
||||
this._defaultButtonWellActor = null;
|
||||
|
||||
this._initButtons();
|
||||
|
||||
@@ -154,32 +152,38 @@ var AuthPrompt = GObject.registerClass({
|
||||
}
|
||||
|
||||
_initButtons() {
|
||||
this.cancelButton = new St.Button({
|
||||
style_class: 'modal-dialog-button button',
|
||||
button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
|
||||
reactive: true,
|
||||
can_focus: true,
|
||||
label: _("Cancel"),
|
||||
x_expand: true,
|
||||
x_align: Clutter.ActorAlign.START,
|
||||
y_align: Clutter.ActorAlign.END,
|
||||
});
|
||||
this.cancelButton = new St.Button({ style_class: 'modal-dialog-button button',
|
||||
button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
|
||||
reactive: true,
|
||||
can_focus: true,
|
||||
label: _("Cancel") });
|
||||
this.cancelButton.connect('clicked', () => this.cancel());
|
||||
this._buttonBox.add_child(this.cancelButton);
|
||||
this._buttonBox.add(this.cancelButton,
|
||||
{ expand: false,
|
||||
x_fill: false,
|
||||
y_fill: false,
|
||||
x_align: St.Align.START,
|
||||
y_align: St.Align.END });
|
||||
|
||||
this._buttonBox.add_child(this._defaultButtonWell);
|
||||
this.nextButton = new St.Button({
|
||||
style_class: 'modal-dialog-button button',
|
||||
button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
|
||||
reactive: true,
|
||||
can_focus: true,
|
||||
label: _("Next"),
|
||||
x_align: Clutter.ActorAlign.END,
|
||||
y_align: Clutter.ActorAlign.END,
|
||||
});
|
||||
this._buttonBox.add(this._defaultButtonWell,
|
||||
{ expand: true,
|
||||
x_fill: false,
|
||||
y_fill: false,
|
||||
x_align: St.Align.END,
|
||||
y_align: St.Align.MIDDLE });
|
||||
this.nextButton = new St.Button({ style_class: 'modal-dialog-button button',
|
||||
button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
|
||||
reactive: true,
|
||||
can_focus: true,
|
||||
label: _("Next") });
|
||||
this.nextButton.connect('clicked', () => this.emit('next'));
|
||||
this.nextButton.add_style_pseudo_class('default');
|
||||
this._buttonBox.add_child(this.nextButton);
|
||||
this._buttonBox.add(this.nextButton,
|
||||
{ expand: false,
|
||||
x_fill: false,
|
||||
y_fill: false,
|
||||
x_align: St.Align.END,
|
||||
y_align: St.Align.END });
|
||||
|
||||
this._updateNextButtonSensitivity(this._entry.text.length > 0);
|
||||
|
||||
@@ -321,7 +325,7 @@ var AuthPrompt = GObject.registerClass({
|
||||
if (this._spinner)
|
||||
this._spinner.stop();
|
||||
}
|
||||
},
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -330,16 +334,15 @@ var AuthPrompt = GObject.registerClass({
|
||||
if (isSpinner)
|
||||
this._spinner.play();
|
||||
|
||||
if (!animate) {
|
||||
if (!animate)
|
||||
actor.opacity = 255;
|
||||
} else {
|
||||
else
|
||||
actor.ease({
|
||||
opacity: 255,
|
||||
duration: DEFAULT_BUTTON_WELL_ANIMATION_TIME,
|
||||
delay: DEFAULT_BUTTON_WELL_ANIMATION_DELAY,
|
||||
mode: Clutter.AnimationMode.LINEAR,
|
||||
mode: Clutter.AnimationMode.LINEAR
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
this._defaultButtonWellActor = actor;
|
||||
@@ -392,7 +395,7 @@ var AuthPrompt = GObject.registerClass({
|
||||
this._message.ease({
|
||||
opacity: 0,
|
||||
duration: MESSAGE_FADE_OUT_ANIMATION_TIME,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD
|
||||
});
|
||||
}
|
||||
|
||||
@@ -445,7 +448,6 @@ var AuthPrompt = GObject.registerClass({
|
||||
|
||||
if (user) {
|
||||
let userWidget = new UserWidget.UserWidget(user);
|
||||
userWidget.x_align = Clutter.ActorAlign.START;
|
||||
this._userWell.set_child(userWidget);
|
||||
}
|
||||
}
|
||||
@@ -525,9 +527,9 @@ var AuthPrompt = GObject.registerClass({
|
||||
}
|
||||
|
||||
cancel() {
|
||||
if (this.verificationStatus == AuthPromptStatus.VERIFICATION_SUCCEEDED)
|
||||
if (this.verificationStatus == AuthPromptStatus.VERIFICATION_SUCCEEDED) {
|
||||
return;
|
||||
|
||||
}
|
||||
this.reset();
|
||||
this.emit('cancelled');
|
||||
}
|
||||
|
||||
@@ -112,12 +112,13 @@ var Batch = class extends Task {
|
||||
for (let i = 0; i < tasks.length; i++) {
|
||||
let task;
|
||||
|
||||
if (tasks[i] instanceof Task)
|
||||
if (tasks[i] instanceof Task) {
|
||||
task = tasks[i];
|
||||
else if (typeof tasks[i] == 'function')
|
||||
} else if (typeof tasks[i] == 'function') {
|
||||
task = new Task(scope, tasks[i]);
|
||||
else
|
||||
} else {
|
||||
throw new Error('Batch tasks must be functions or Task, Hold or Batch objects');
|
||||
}
|
||||
|
||||
this.tasks.push(task);
|
||||
}
|
||||
@@ -128,8 +129,9 @@ var Batch = class extends Task {
|
||||
}
|
||||
|
||||
runTask() {
|
||||
if (!(this._currentTaskIndex in this.tasks))
|
||||
if (!(this._currentTaskIndex in this.tasks)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return this.tasks[this._currentTaskIndex].run();
|
||||
}
|
||||
@@ -177,8 +179,9 @@ var ConcurrentBatch = class extends Batch {
|
||||
process() {
|
||||
let hold = this.runTask();
|
||||
|
||||
if (hold)
|
||||
if (hold) {
|
||||
this.hold.acquireUntilAfter(hold);
|
||||
}
|
||||
|
||||
// Regardless of the state of the just run task,
|
||||
// fire off the next one, so all the tasks can run
|
||||
|
||||
@@ -20,7 +20,7 @@ function FprintManager() {
|
||||
g_interface_info: FprintManagerInfo,
|
||||
g_name: 'net.reactivated.Fprint',
|
||||
g_object_path: '/net/reactivated/Fprint/Manager',
|
||||
g_flags: Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES });
|
||||
g_flags: (Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES) });
|
||||
|
||||
try {
|
||||
self.init(null);
|
||||
|
||||
@@ -39,20 +39,19 @@ const _LOGO_ICON_HEIGHT = 48;
|
||||
const _MAX_BOTTOM_MENU_ITEMS = 5;
|
||||
|
||||
var UserListItem = GObject.registerClass({
|
||||
Signals: { 'activate': {} },
|
||||
GTypeName: 'LoginDialog_UserListItem',
|
||||
Signals: { 'activate': {} }
|
||||
}, class UserListItem extends St.Button {
|
||||
_init(user) {
|
||||
let layout = new St.BoxLayout({
|
||||
vertical: true,
|
||||
x_align: Clutter.ActorAlign.START,
|
||||
});
|
||||
let layout = new St.BoxLayout({ vertical: true });
|
||||
super._init({
|
||||
style_class: 'login-dialog-user-list-item',
|
||||
button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
|
||||
can_focus: true,
|
||||
x_expand: true,
|
||||
child: layout,
|
||||
reactive: true,
|
||||
x_align: St.Align.START,
|
||||
x_fill: true
|
||||
});
|
||||
|
||||
this.user = user;
|
||||
@@ -125,7 +124,7 @@ var UserListItem = GObject.registerClass({
|
||||
|
||||
let startTime = GLib.get_monotonic_time();
|
||||
|
||||
this._timedLoginTimeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, 33,
|
||||
this._timedLoginTimeoutId = GLib.timeout_add (GLib.PRIORITY_DEFAULT, 33,
|
||||
() => {
|
||||
let currentTime = GLib.get_monotonic_time();
|
||||
let elapsedTime = (currentTime - startTime) / GLib.USEC_PER_SEC;
|
||||
@@ -156,17 +155,14 @@ var UserListItem = GObject.registerClass({
|
||||
});
|
||||
|
||||
var UserList = GObject.registerClass({
|
||||
GTypeName: 'LoginDialog_UserList',
|
||||
Signals: {
|
||||
'activate': { param_types: [UserListItem.$gtype] },
|
||||
'item-added': { param_types: [UserListItem.$gtype] },
|
||||
},
|
||||
}
|
||||
}, class UserList extends St.ScrollView {
|
||||
_init() {
|
||||
super._init({
|
||||
style_class: 'login-dialog-user-list-view',
|
||||
x_expand: true,
|
||||
y_expand: true,
|
||||
});
|
||||
super._init({ style_class: 'login-dialog-user-list-view' });
|
||||
this.set_policy(St.PolicyType.NEVER,
|
||||
St.PolicyType.AUTOMATIC);
|
||||
|
||||
@@ -224,7 +220,7 @@ var UserList = GObject.registerClass({
|
||||
let value = (box.y1 + adjustment.step_increment / 2.0) - (adjustment.page_size / 2.0);
|
||||
adjustment.ease(value, {
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
duration: _SCROLL_ANIMATION_TIME,
|
||||
duration: _SCROLL_ANIMATION_TIME
|
||||
});
|
||||
}
|
||||
|
||||
@@ -269,7 +265,7 @@ var UserList = GObject.registerClass({
|
||||
this.removeUser(user);
|
||||
|
||||
let item = new UserListItem(user);
|
||||
this._box.add_child(item);
|
||||
this._box.add(item, { x_fill: true });
|
||||
|
||||
this._items[userName] = item;
|
||||
|
||||
@@ -307,7 +303,8 @@ var UserList = GObject.registerClass({
|
||||
});
|
||||
|
||||
var SessionMenuButton = GObject.registerClass({
|
||||
Signals: { 'session-activated': { param_types: [GObject.TYPE_STRING] } },
|
||||
GTypeName: 'LoginDialog_SessionMenuButton',
|
||||
Signals: { 'session-activated': { param_types: [GObject.TYPE_STRING] } }
|
||||
}, class SessionMenuButton extends St.Bin {
|
||||
_init() {
|
||||
let gearIcon = new St.Icon({ icon_name: 'emblem-system-symbolic' });
|
||||
@@ -318,7 +315,7 @@ var SessionMenuButton = GObject.registerClass({
|
||||
can_focus: true,
|
||||
accessible_name: _("Choose Session"),
|
||||
accessible_role: Atk.Role.MENU,
|
||||
child: gearIcon,
|
||||
child: gearIcon
|
||||
});
|
||||
|
||||
super._init({ child: button });
|
||||
@@ -446,7 +443,10 @@ var LoginDialog = GObject.registerClass({
|
||||
this.add_child(this._userSelectionBox);
|
||||
|
||||
this._userList = new UserList();
|
||||
this._userSelectionBox.add_child(this._userList);
|
||||
this._userSelectionBox.add(this._userList,
|
||||
{ expand: true,
|
||||
x_fill: true,
|
||||
y_fill: true });
|
||||
|
||||
this._authPrompt = new AuthPrompt.AuthPrompt(this._gdmClient, AuthPrompt.AuthPromptMode.UNLOCK_OR_LOG_IN);
|
||||
this._authPrompt.connect('prompted', this._onPrompted.bind(this));
|
||||
@@ -457,24 +457,24 @@ var LoginDialog = GObject.registerClass({
|
||||
// translators: this message is shown below the user list on the
|
||||
// login screen. It can be activated to reveal an entry for
|
||||
// manually entering the username.
|
||||
let notListedLabel = new St.Label({
|
||||
text: _("Not listed?"),
|
||||
style_class: 'login-dialog-not-listed-label',
|
||||
x_align: Clutter.ActorAlign.START,
|
||||
});
|
||||
this._notListedButton = new St.Button({
|
||||
style_class: 'login-dialog-not-listed-button',
|
||||
button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
|
||||
can_focus: true,
|
||||
child: notListedLabel,
|
||||
reactive: true,
|
||||
});
|
||||
let notListedLabel = new St.Label({ text: _("Not listed?"),
|
||||
style_class: 'login-dialog-not-listed-label' });
|
||||
this._notListedButton = new St.Button({ style_class: 'login-dialog-not-listed-button',
|
||||
button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
|
||||
can_focus: true,
|
||||
child: notListedLabel,
|
||||
reactive: true,
|
||||
x_align: St.Align.START,
|
||||
x_fill: true });
|
||||
|
||||
this._notListedButton.connect('clicked', this._hideUserListAskForUsernameAndBeginVerification.bind(this));
|
||||
|
||||
this._notListedButton.hide();
|
||||
|
||||
this._userSelectionBox.add_child(this._notListedButton);
|
||||
this._userSelectionBox.add(this._notListedButton,
|
||||
{ expand: false,
|
||||
x_align: St.Align.START,
|
||||
x_fill: true });
|
||||
|
||||
this._bannerView = new St.ScrollView({ style_class: 'login-dialog-banner-view',
|
||||
opacity: 0,
|
||||
@@ -509,7 +509,7 @@ var LoginDialog = GObject.registerClass({
|
||||
this._sessionMenuButton = new SessionMenuButton();
|
||||
this._sessionMenuButton.connect('session-activated',
|
||||
(list, sessionId) => {
|
||||
this._greeter.call_select_session_sync(sessionId, null);
|
||||
this._greeter.call_select_session_sync (sessionId, null);
|
||||
});
|
||||
this._sessionMenuButton.opacity = 0;
|
||||
this._sessionMenuButton.show();
|
||||
@@ -702,8 +702,9 @@ var LoginDialog = GObject.registerClass({
|
||||
}
|
||||
|
||||
// Finally hand out the allocations
|
||||
if (bannerAllocation)
|
||||
if (bannerAllocation) {
|
||||
this._bannerView.allocate(bannerAllocation, flags);
|
||||
}
|
||||
|
||||
if (authPromptAllocation)
|
||||
this._authPrompt.allocate(authPromptAllocation, flags);
|
||||
@@ -776,7 +777,7 @@ var LoginDialog = GObject.registerClass({
|
||||
this._bannerView.ease({
|
||||
opacity: 255,
|
||||
duration: _FADE_ANIMATION_TIME,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD
|
||||
});
|
||||
}
|
||||
|
||||
@@ -819,9 +820,9 @@ var LoginDialog = GObject.registerClass({
|
||||
|
||||
_resetGreeterProxy() {
|
||||
if (GLib.getenv('GDM_GREETER_TEST') != '1') {
|
||||
if (this._greeter)
|
||||
if (this._greeter) {
|
||||
this._greeter.run_dispose();
|
||||
|
||||
}
|
||||
this._greeter = this._gdmClient.get_greeter_sync(null);
|
||||
|
||||
this._defaultSessionChangedId = this._greeter.connect('default-session-name-changed',
|
||||
@@ -877,7 +878,7 @@ var LoginDialog = GObject.registerClass({
|
||||
this._authPrompt.ease({
|
||||
opacity: 255,
|
||||
duration: _FADE_ANIMATION_TIME,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD
|
||||
});
|
||||
this._fadeInBannerView();
|
||||
}
|
||||
@@ -945,7 +946,7 @@ var LoginDialog = GObject.registerClass({
|
||||
if (this._authPrompt.verificationStatus != AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
|
||||
this._authPrompt.reset();
|
||||
this._unbindOpacity();
|
||||
},
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -967,7 +968,7 @@ var LoginDialog = GObject.registerClass({
|
||||
onComplete: () => {
|
||||
this._greeter.call_start_session_when_ready_sync(serviceName, true, null);
|
||||
this._unbindOpacity();
|
||||
},
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -984,7 +985,7 @@ var LoginDialog = GObject.registerClass({
|
||||
let hold = new Batch.Hold();
|
||||
let signalId = this._userList.connect('item-added',
|
||||
() => {
|
||||
item = this._userList.getItemFromUserName(userName);
|
||||
let item = this._userList.getItemFromUserName(userName);
|
||||
|
||||
if (item)
|
||||
hold.release();
|
||||
@@ -1038,8 +1039,9 @@ var LoginDialog = GObject.registerClass({
|
||||
|
||||
() => {
|
||||
// If we're just starting out, start on the right item.
|
||||
if (!this._userManager.is_loaded)
|
||||
if (!this._userManager.is_loaded) {
|
||||
this._userList.jumpToItem(loginItem);
|
||||
}
|
||||
},
|
||||
|
||||
() => {
|
||||
@@ -1090,8 +1092,9 @@ var LoginDialog = GObject.registerClass({
|
||||
// Restart timed login on user interaction
|
||||
global.stage.connect('captured-event', (actor, event) => {
|
||||
if (event.type() == Clutter.EventType.KEY_PRESS ||
|
||||
event.type() == Clutter.EventType.BUTTON_PRESS)
|
||||
event.type() == Clutter.EventType.BUTTON_PRESS) {
|
||||
this._startTimedLogin(userName, seconds);
|
||||
}
|
||||
|
||||
return Clutter.EVENT_PROPAGATE;
|
||||
});
|
||||
@@ -1134,7 +1137,8 @@ var LoginDialog = GObject.registerClass({
|
||||
let userName = item.user.get_user_name();
|
||||
let hold = new Batch.Hold();
|
||||
|
||||
this._authPrompt.begin({ userName, hold });
|
||||
this._authPrompt.begin({ userName: userName,
|
||||
hold: hold });
|
||||
return hold;
|
||||
}
|
||||
|
||||
@@ -1197,8 +1201,9 @@ var LoginDialog = GObject.registerClass({
|
||||
|
||||
let users = this._userManager.list_users();
|
||||
|
||||
for (let i = 0; i < users.length; i++)
|
||||
for (let i = 0; i < users.length; i++) {
|
||||
this._userList.addUser(users[i]);
|
||||
}
|
||||
|
||||
this._updateDisableUserList();
|
||||
|
||||
@@ -1240,7 +1245,7 @@ var LoginDialog = GObject.registerClass({
|
||||
this.ease({
|
||||
opacity: 255,
|
||||
duration: 1000,
|
||||
mode: Clutter.AnimationMode.EASE_IN_QUAD,
|
||||
mode: Clutter.AnimationMode.EASE_IN_QUAD
|
||||
});
|
||||
|
||||
return true;
|
||||
|
||||
@@ -23,7 +23,7 @@ function OVirtCredentials() {
|
||||
g_interface_info: OVirtCredentialsInfo,
|
||||
g_name: 'org.ovirt.vdsm.Credentials',
|
||||
g_object_path: '/org/ovirt/vdsm/Credentials',
|
||||
g_flags: Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES });
|
||||
g_flags: (Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES) });
|
||||
self.init(null);
|
||||
return self;
|
||||
}
|
||||
|
||||
@@ -37,7 +37,7 @@ var MessageType = {
|
||||
NONE: 0,
|
||||
ERROR: 1,
|
||||
INFO: 2,
|
||||
HINT: 3,
|
||||
HINT: 3
|
||||
};
|
||||
|
||||
function fadeInActor(actor) {
|
||||
@@ -58,7 +58,7 @@ function fadeInActor(actor) {
|
||||
onComplete: () => {
|
||||
this.set_height(-1);
|
||||
hold.release();
|
||||
},
|
||||
}
|
||||
});
|
||||
|
||||
return hold;
|
||||
@@ -81,7 +81,7 @@ function fadeOutActor(actor) {
|
||||
this.hide();
|
||||
this.set_height(-1);
|
||||
hold.release();
|
||||
},
|
||||
}
|
||||
});
|
||||
return hold;
|
||||
}
|
||||
@@ -109,7 +109,7 @@ function cloneAndFadeOutActor(actor) {
|
||||
onComplete: () => {
|
||||
clone.destroy();
|
||||
hold.release();
|
||||
},
|
||||
}
|
||||
});
|
||||
return hold;
|
||||
}
|
||||
@@ -272,7 +272,7 @@ var ShellUserVerifier = class {
|
||||
let interval = this._getIntervalForMessage(message);
|
||||
|
||||
this.hasPendingMessages = true;
|
||||
this._messageQueue.push({ text: message, type: messageType, interval });
|
||||
this._messageQueue.push({ text: message, type: messageType, interval: interval });
|
||||
this._queueMessageTimeout();
|
||||
}
|
||||
|
||||
@@ -544,7 +544,6 @@ var ShellUserVerifier = class {
|
||||
});
|
||||
}
|
||||
} else {
|
||||
// eslint-disable-next-line no-lonely-if
|
||||
if (!this.hasPendingMessages) {
|
||||
this._cancelAndReset();
|
||||
} else {
|
||||
@@ -572,8 +571,9 @@ var ShellUserVerifier = class {
|
||||
// if the password service fails, then cancel everything.
|
||||
// But if, e.g., fingerprint fails, still give
|
||||
// password authentication a chance to succeed
|
||||
if (this.serviceIsForeground(serviceName))
|
||||
if (this.serviceIsForeground(serviceName)) {
|
||||
this._verificationFailed(true);
|
||||
}
|
||||
}
|
||||
};
|
||||
Signals.addSignalMethods(ShellUserVerifier.prototype);
|
||||
|
||||
@@ -15,7 +15,7 @@ const Config = imports.misc.config;
|
||||
|
||||
var ExtensionType = {
|
||||
SYSTEM: 1,
|
||||
PER_USER: 2,
|
||||
PER_USER: 2
|
||||
};
|
||||
|
||||
var ExtensionState = {
|
||||
@@ -28,7 +28,7 @@ var ExtensionState = {
|
||||
|
||||
// Used as an error state for operations on unknown extensions,
|
||||
// should never be in a real extensionMeta object.
|
||||
UNINSTALLED: 99,
|
||||
UNINSTALLED: 99
|
||||
};
|
||||
|
||||
const SERIALIZED_PROPERTIES = ['type', 'state', 'path', 'error', 'hasPrefs', 'canChange'];
|
||||
@@ -36,11 +36,10 @@ const SERIALIZED_PROPERTIES = ['type', 'state', 'path', 'error', 'hasPrefs', 'ca
|
||||
/**
|
||||
* getCurrentExtension:
|
||||
*
|
||||
* @returns {?object} - The current extension, or null if not called from
|
||||
* an extension.
|
||||
* Returns the current extension, or null if not called from an extension.
|
||||
*/
|
||||
function getCurrentExtension() {
|
||||
let stack = new Error().stack.split('\n');
|
||||
let stack = (new Error()).stack.split('\n');
|
||||
let extensionStackLine;
|
||||
|
||||
// Search for an occurrence of an extension stack frame
|
||||
@@ -85,7 +84,7 @@ function getCurrentExtension() {
|
||||
|
||||
/**
|
||||
* initTranslations:
|
||||
* @param {string=} domain - the gettext domain to use
|
||||
* @domain: (optional): the gettext domain to use
|
||||
*
|
||||
* Initialize Gettext to load translations from extensionsdir/locale.
|
||||
* If @domain is not provided, it will be taken from metadata['gettext-domain']
|
||||
@@ -109,8 +108,7 @@ function initTranslations(domain) {
|
||||
|
||||
/**
|
||||
* getSettings:
|
||||
* @param {string=} schema - the GSettings schema id
|
||||
* @returns {Gio.Settings} - a new settings object for @schema
|
||||
* @schema: (optional): the GSettings schema id
|
||||
*
|
||||
* Builds and returns a GSettings schema for @schema, using schema files
|
||||
* in extensionsdir/schemas. If @schema is omitted, it is taken from
|
||||
@@ -130,13 +128,12 @@ function getSettings(schema) {
|
||||
// SYSTEM extension that has been installed in the same prefix as the shell
|
||||
let schemaDir = extension.dir.get_child('schemas');
|
||||
let schemaSource;
|
||||
if (schemaDir.query_exists(null)) {
|
||||
if (schemaDir.query_exists(null))
|
||||
schemaSource = GioSSS.new_from_directory(schemaDir.get_path(),
|
||||
GioSSS.get_default(),
|
||||
false);
|
||||
} else {
|
||||
else
|
||||
schemaSource = GioSSS.get_default();
|
||||
}
|
||||
|
||||
let schemaObj = schemaSource.lookup(schema, true);
|
||||
if (!schemaObj)
|
||||
@@ -147,9 +144,8 @@ function getSettings(schema) {
|
||||
|
||||
/**
|
||||
* versionCheck:
|
||||
* @param {string[]} required - an array of versions we're compatible with
|
||||
* @param {string} current - the version we have
|
||||
* @returns {bool} - true if @current is compatible with @required
|
||||
* @required: an array of versions we're compatible with
|
||||
* @current: the version we have
|
||||
*
|
||||
* Check if a component is compatible for an extension.
|
||||
* @required is an array, and at least one version must match.
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
|
||||
/* exported collectFromDatadirs, recursivelyDeleteDir,
|
||||
/* exported collectFromDatadirs, deleteGFile, recursivelyDeleteDir,
|
||||
recursivelyMoveDir, loadInterfaceXML */
|
||||
|
||||
const { Gio, GLib } = imports.gi;
|
||||
@@ -29,6 +29,11 @@ function collectFromDatadirs(subdir, includeUserDir, processFile) {
|
||||
}
|
||||
}
|
||||
|
||||
function deleteGFile(file) {
|
||||
// Work around 'delete' being a keyword in JS.
|
||||
return file['delete'](null);
|
||||
}
|
||||
|
||||
function recursivelyDeleteDir(dir, deleteParent) {
|
||||
let children = dir.enumerate_children('standard::name,standard::type',
|
||||
Gio.FileQueryInfoFlags.NONE, null);
|
||||
@@ -38,13 +43,13 @@ function recursivelyDeleteDir(dir, deleteParent) {
|
||||
let type = info.get_file_type();
|
||||
let child = dir.get_child(info.get_name());
|
||||
if (type == Gio.FileType.REGULAR)
|
||||
child.delete(null);
|
||||
deleteGFile(child);
|
||||
else if (type == Gio.FileType.DIRECTORY)
|
||||
recursivelyDeleteDir(child, true);
|
||||
}
|
||||
|
||||
if (deleteParent)
|
||||
dir.delete(null);
|
||||
deleteGFile(dir);
|
||||
}
|
||||
|
||||
function recursivelyMoveDir(srcDir, destDir) {
|
||||
@@ -70,14 +75,14 @@ let _ifaceResource = null;
|
||||
function loadInterfaceXML(iface) {
|
||||
if (!_ifaceResource) {
|
||||
// don't use global.datadir so the method is usable from tests/tools
|
||||
let dir = GLib.getenv('GNOME_SHELL_DATADIR') || Config.PKGDATADIR;
|
||||
let path = `${dir}/gnome-shell-dbus-interfaces.gresource`;
|
||||
let dir = GLib.getenv ('GNOME_SHELL_DATADIR') || Config.PKGDATADIR;
|
||||
let path = dir + '/gnome-shell-dbus-interfaces.gresource';
|
||||
_ifaceResource = Gio.Resource.load(path);
|
||||
_ifaceResource._register();
|
||||
}
|
||||
|
||||
let xml = null;
|
||||
let uri = `resource:///org/gnome/shell/dbus-interfaces/${iface}.xml`;
|
||||
let uri = 'resource:///org/gnome/shell/dbus-interfaces/' + iface + '.xml';
|
||||
let f = Gio.File.new_for_uri(uri);
|
||||
|
||||
try {
|
||||
|
||||
@@ -11,7 +11,7 @@ var PresenceStatus = {
|
||||
AVAILABLE: 0,
|
||||
INVISIBLE: 1,
|
||||
BUSY: 2,
|
||||
IDLE: 3,
|
||||
IDLE: 3
|
||||
};
|
||||
|
||||
var PresenceProxy = Gio.DBusProxy.makeProxyWrapper(PresenceIface);
|
||||
|
||||
@@ -82,11 +82,11 @@ var HistoryManager = class {
|
||||
|
||||
_onEntryKeyPress(entry, event) {
|
||||
let symbol = event.get_key_symbol();
|
||||
if (symbol == Clutter.KEY_Up)
|
||||
if (symbol == Clutter.KEY_Up) {
|
||||
return this._setPrevItem(entry.get_text());
|
||||
else if (symbol == Clutter.KEY_Down)
|
||||
} else if (symbol == Clutter.KEY_Down) {
|
||||
return this._setNextItem(entry.get_text());
|
||||
|
||||
}
|
||||
return Clutter.EVENT_PROPAGATE;
|
||||
}
|
||||
|
||||
|
||||
@@ -142,7 +142,7 @@ var IBusManager = class {
|
||||
});
|
||||
this._panelService.connect('focus-in', (panel, path) => {
|
||||
if (!GLib.str_has_suffix(path, '/InputContext_1'))
|
||||
this.emit('focus-in');
|
||||
this.emit ('focus-in');
|
||||
});
|
||||
this._panelService.connect('focus-out', () => this.emit('focus-out'));
|
||||
|
||||
@@ -157,10 +157,10 @@ 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, res) => {
|
||||
this._ibus.get_global_engine_async(-1, this._cancellable, (_bus, result) => {
|
||||
let engine;
|
||||
try {
|
||||
engine = this._ibus.get_global_engine_async_finish(res);
|
||||
engine = this._ibus.get_global_engine_async_finish(result);
|
||||
if (!engine)
|
||||
return;
|
||||
} catch (e) {
|
||||
|
||||
@@ -48,7 +48,7 @@ class InputMethod extends Clutter.InputMethod {
|
||||
|
||||
_onConnected() {
|
||||
this._cancellable = new Gio.Cancellable();
|
||||
this._ibus.create_input_context_async('gnome-shell', -1,
|
||||
this._ibus.create_input_context_async ('gnome-shell', -1,
|
||||
this._cancellable, this._setContext.bind(this));
|
||||
}
|
||||
|
||||
@@ -69,7 +69,6 @@ class InputMethod extends Clutter.InputMethod {
|
||||
this._context.connect('show-preedit-text', this._onShowPreeditText.bind(this));
|
||||
this._context.connect('hide-preedit-text', this._onHidePreeditText.bind(this));
|
||||
this._context.connect('forward-key-event', this._onForwardKeyEvent.bind(this));
|
||||
this._context.connect('destroy', this._clear.bind(this));
|
||||
|
||||
this._updateCapabilities();
|
||||
}
|
||||
@@ -129,7 +128,7 @@ class InputMethod extends Clutter.InputMethod {
|
||||
|
||||
_onForwardKeyEvent(_context, keyval, keycode, state) {
|
||||
let press = (state & IBus.ModifierType.RELEASE_MASK) == 0;
|
||||
state &= ~IBus.ModifierType.RELEASE_MASK;
|
||||
state &= ~(IBus.ModifierType.RELEASE_MASK);
|
||||
|
||||
let curEvent = Clutter.get_current_event();
|
||||
let time;
|
||||
@@ -265,9 +264,6 @@ class InputMethod extends Clutter.InputMethod {
|
||||
event.get_key_code() - 8, // Convert XKB keycodes to evcodes
|
||||
state, -1, this._cancellable,
|
||||
(context, res) => {
|
||||
if (context != this._context)
|
||||
return;
|
||||
|
||||
try {
|
||||
let retval = context.process_key_event_async_finish(res);
|
||||
this.notify_key_event(event, retval);
|
||||
|
||||
@@ -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) {
|
||||
@@ -79,7 +70,7 @@ var IntrospectService = class {
|
||||
|
||||
for (let app of apps) {
|
||||
let appInfo = {};
|
||||
let isAppActive = focusedApp == app;
|
||||
let isAppActive = (focusedApp == app);
|
||||
|
||||
if (!this._isStandaloneApp(app))
|
||||
continue;
|
||||
@@ -113,10 +104,10 @@ var IntrospectService = class {
|
||||
return false;
|
||||
|
||||
let type = window.get_window_type();
|
||||
return type == Meta.WindowType.NORMAL ||
|
||||
return (type == Meta.WindowType.NORMAL ||
|
||||
type == Meta.WindowType.DIALOG ||
|
||||
type == Meta.WindowType.MODAL_DIALOG ||
|
||||
type == Meta.WindowType.UTILITY;
|
||||
type == Meta.WindowType.UTILITY);
|
||||
}
|
||||
|
||||
GetRunningApplicationsAsync(params, invocation) {
|
||||
@@ -161,9 +152,9 @@ var IntrospectService = class {
|
||||
'app-id': GLib.Variant.new('s', app.get_id()),
|
||||
'client-type': GLib.Variant.new('u', window.get_client_type()),
|
||||
'is-hidden': GLib.Variant.new('b', window.is_hidden()),
|
||||
'has-focus': GLib.Variant.new('b', window == focusWindow),
|
||||
'has-focus': GLib.Variant.new('b', (window == focusWindow)),
|
||||
'width': GLib.Variant.new('u', frameRect.width),
|
||||
'height': GLib.Variant.new('u', frameRect.height),
|
||||
'height': GLib.Variant.new('u', frameRect.height)
|
||||
};
|
||||
|
||||
// These properties may not be available for all windows:
|
||||
@@ -173,10 +164,9 @@ var IntrospectService = class {
|
||||
if (wmClass != null)
|
||||
windowsList[windowId]['wm-class'] = GLib.Variant.new('s', wmClass);
|
||||
|
||||
if (sandboxedAppId != null) {
|
||||
if (sandboxedAppId != null)
|
||||
windowsList[windowId]['sandboxed-app-id'] =
|
||||
GLib.Variant.new('s', sandboxedAppId);
|
||||
}
|
||||
}
|
||||
}
|
||||
invocation.return_value(new GLib.Variant('(a{ta{sv}})', [windowsList]));
|
||||
|
||||
@@ -11,8 +11,9 @@ function getCompletions(text, commandHeader, globalCompletionList) {
|
||||
let methods = [];
|
||||
let expr_, base;
|
||||
let attrHead = '';
|
||||
if (globalCompletionList == null)
|
||||
if (globalCompletionList == null) {
|
||||
globalCompletionList = [];
|
||||
}
|
||||
|
||||
let offset = getExpressionOffset(text, text.length - 1);
|
||||
if (offset >= 0) {
|
||||
@@ -58,8 +59,9 @@ function isStopChar(c) {
|
||||
function findMatchingQuote(expr, offset) {
|
||||
let quoteChar = expr.charAt(offset);
|
||||
for (let i = offset - 1; i >= 0; --i) {
|
||||
if (expr.charAt(i) == quoteChar && expr.charAt(i - 1) != '\\')
|
||||
if (expr.charAt(i) == quoteChar && expr.charAt(i - 1) != '\\') {
|
||||
return i;
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
@@ -67,8 +69,9 @@ function findMatchingQuote(expr, offset) {
|
||||
// Given the ending position of a regex, find where it starts
|
||||
function findMatchingSlash(expr, offset) {
|
||||
for (let i = offset - 1; i >= 0; --i) {
|
||||
if (expr.charAt(i) == '/' && expr.charAt(i - 1) != '\\')
|
||||
if (expr.charAt(i) == '/' && expr.charAt(i - 1) != '\\') {
|
||||
return i;
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
@@ -79,30 +82,31 @@ function findMatchingSlash(expr, offset) {
|
||||
// findMatchingBrace("[(])", 3) returns 1.
|
||||
function findMatchingBrace(expr, offset) {
|
||||
let closeBrace = expr.charAt(offset);
|
||||
let openBrace = { ')': '(', ']': '[' }[closeBrace];
|
||||
let openBrace = ({ ')': '(', ']': '[' })[closeBrace];
|
||||
|
||||
return findTheBrace(expr, offset - 1, openBrace, closeBrace);
|
||||
}
|
||||
function findTheBrace(expr, offset) {
|
||||
if (offset < 0) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
function findTheBrace(expr, offset, ...braces) {
|
||||
let [openBrace, closeBrace] = braces;
|
||||
if (expr.charAt(offset) == openBrace) {
|
||||
return offset;
|
||||
}
|
||||
if (expr.charAt(offset).match(/['"]/)) {
|
||||
return findTheBrace(expr, findMatchingQuote(expr, offset) - 1);
|
||||
}
|
||||
if (expr.charAt(offset) == '/') {
|
||||
return findTheBrace(expr, findMatchingSlash(expr, offset) - 1);
|
||||
}
|
||||
if (expr.charAt(offset) == closeBrace) {
|
||||
return findTheBrace(expr, findTheBrace(expr, offset - 1) - 1);
|
||||
}
|
||||
|
||||
if (offset < 0)
|
||||
return -1;
|
||||
return findTheBrace(expr, offset - 1);
|
||||
|
||||
if (expr.charAt(offset) == openBrace)
|
||||
return offset;
|
||||
}
|
||||
|
||||
if (expr.charAt(offset).match(/['"]/))
|
||||
return findTheBrace(expr, findMatchingQuote(expr, offset) - 1, ...braces);
|
||||
|
||||
if (expr.charAt(offset) == '/')
|
||||
return findTheBrace(expr, findMatchingSlash(expr, offset) - 1, ...braces);
|
||||
|
||||
if (expr.charAt(offset) == closeBrace)
|
||||
return findTheBrace(expr, findTheBrace(expr, offset - 1, ...braces) - 1, ...braces);
|
||||
|
||||
return findTheBrace(expr, offset - 1, ...braces);
|
||||
return findTheBrace(expr, offset - 1);
|
||||
}
|
||||
|
||||
// Walk expr backwards from offset looking for the beginning of an
|
||||
@@ -114,11 +118,13 @@ function getExpressionOffset(expr, offset) {
|
||||
while (offset >= 0) {
|
||||
let currChar = expr.charAt(offset);
|
||||
|
||||
if (isStopChar(currChar))
|
||||
if (isStopChar(currChar)) {
|
||||
return offset + 1;
|
||||
}
|
||||
|
||||
if (currChar.match(/[)\]]/))
|
||||
if (currChar.match(/[)\]]/)) {
|
||||
offset = findMatchingBrace(expr, offset);
|
||||
}
|
||||
|
||||
--offset;
|
||||
}
|
||||
@@ -135,10 +141,10 @@ function isValidPropertyName(w) {
|
||||
// To get all properties (enumerable and not), we need to walk
|
||||
// the prototype chain ourselves
|
||||
function getAllProps(obj) {
|
||||
if (obj === null || obj === undefined)
|
||||
if (obj === null || obj === undefined) {
|
||||
return [];
|
||||
|
||||
return Object.getOwnPropertyNames(obj).concat(getAllProps(Object.getPrototypeOf(obj)));
|
||||
}
|
||||
return Object.getOwnPropertyNames(obj).concat( getAllProps(Object.getPrototypeOf(obj)) );
|
||||
}
|
||||
|
||||
// Given a string _expr_, returns all methods
|
||||
@@ -162,7 +168,7 @@ function getPropertyNamesFromExpression(expr, commandHeader = '') {
|
||||
if (typeof obj === 'object') {
|
||||
let allProps = getAllProps(obj);
|
||||
// Get only things we are allowed to complete following a '.'
|
||||
allProps = allProps.filter(isValidPropertyName);
|
||||
allProps = allProps.filter( isValidPropertyName );
|
||||
|
||||
// Make sure propsUnique contains one key for every
|
||||
// property so we end up with a unique list of properties
|
||||
@@ -183,26 +189,24 @@ function getCommonPrefix(words) {
|
||||
return word;
|
||||
}
|
||||
|
||||
// Remove any blocks that are quoted or are in a regex
|
||||
function removeLiterals(str) {
|
||||
if (str.length == 0)
|
||||
return '';
|
||||
|
||||
let currChar = str.charAt(str.length - 1);
|
||||
if (currChar == '"' || currChar == '\'') {
|
||||
return removeLiterals(
|
||||
str.slice(0, findMatchingQuote(str, str.length - 1)));
|
||||
} else if (currChar == '/') {
|
||||
return removeLiterals(
|
||||
str.slice(0, findMatchingSlash(str, str.length - 1)));
|
||||
}
|
||||
|
||||
return removeLiterals(str.slice(0, str.length - 1)) + currChar;
|
||||
}
|
||||
|
||||
// Returns true if there is reason to think that eval(str)
|
||||
// will modify the global scope
|
||||
function isUnsafeExpression(str) {
|
||||
// Remove any blocks that are quoted or are in a regex
|
||||
function removeLiterals(str) {
|
||||
if (str.length == 0) {
|
||||
return '';
|
||||
}
|
||||
|
||||
let currChar = str.charAt(str.length - 1);
|
||||
if (currChar == '"' || currChar == '\'') {
|
||||
return removeLiterals(str.slice(0, findMatchingQuote(str, str.length - 1)));
|
||||
} else if (currChar == '/') {
|
||||
return removeLiterals(str.slice(0, findMatchingSlash(str, str.length - 1)));
|
||||
}
|
||||
|
||||
return removeLiterals(str.slice(0, str.length - 1)) + currChar;
|
||||
}
|
||||
|
||||
// Check for any sort of assignment
|
||||
// The strategy used is dumb: remove any quotes
|
||||
@@ -210,8 +214,8 @@ function isUnsafeExpression(str) {
|
||||
// If there is, it might be an unsafe assignment.
|
||||
|
||||
let prunedStr = removeLiterals(str);
|
||||
prunedStr = prunedStr.replace(/[=!]==/g, ''); // replace === and !== with nothing
|
||||
prunedStr = prunedStr.replace(/[=<>!]=/g, ''); // replace ==, <=, >=, != with nothing
|
||||
prunedStr = prunedStr.replace(/[=!]==/g, ''); //replace === and !== with nothing
|
||||
prunedStr = prunedStr.replace(/[=<>!]=/g, ''); //replace ==, <=, >=, != with nothing
|
||||
|
||||
if (prunedStr.match(/[=]/)) {
|
||||
return true;
|
||||
|
||||
@@ -74,9 +74,8 @@ function registerSessionWithGDM() {
|
||||
let _loginManager = null;
|
||||
|
||||
/**
|
||||
* getLoginManager:
|
||||
* LoginManager:
|
||||
* An abstraction over systemd/logind and ConsoleKit.
|
||||
* @returns {object} - the LoginManager singleton
|
||||
*
|
||||
*/
|
||||
function getLoginManager() {
|
||||
@@ -104,21 +103,21 @@ var LoginManagerSystemd = class {
|
||||
|
||||
getCurrentSessionProxy(callback) {
|
||||
if (this._currentSession) {
|
||||
callback(this._currentSession);
|
||||
callback (this._currentSession);
|
||||
return;
|
||||
}
|
||||
|
||||
let sessionId = GLib.getenv('XDG_SESSION_ID');
|
||||
if (!sessionId) {
|
||||
log('Unset XDG_SESSION_ID, getCurrentSessionProxy() called outside a user session. Asking logind directly.');
|
||||
let [session, objectPath] = this._userProxy.Display;
|
||||
let [session, objectPath_] = this._userProxy.Display;
|
||||
if (session) {
|
||||
log(`Will monitor session ${session}`);
|
||||
sessionId = session;
|
||||
} else {
|
||||
log('Failed to find "Display" session; are we the greeter?');
|
||||
|
||||
for ([session, objectPath] of this._userProxy.Sessions) {
|
||||
for (let [session, objectPath] of this._userProxy.Sessions) {
|
||||
let sessionProxy = new SystemdLoginSession(Gio.DBus.system,
|
||||
'org.freedesktop.login1',
|
||||
objectPath);
|
||||
@@ -186,7 +185,7 @@ var LoginManagerSystemd = class {
|
||||
try {
|
||||
let [outVariant_, fdList] = proxy.call_with_unix_fd_list_finish(result);
|
||||
fd = fdList.steal_fds()[0];
|
||||
callback(new Gio.UnixInputStream({ fd }));
|
||||
callback(new Gio.UnixInputStream({ fd: fd }));
|
||||
} catch (e) {
|
||||
logError(e, "Error getting systemd inhibitor");
|
||||
callback(null);
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
|
||||
/* exported ModemBase, ModemGsm, ModemCdma, BroadbandModem */
|
||||
|
||||
const { Gio, GObject, NM, NMA } = imports.gi;
|
||||
const { Gio, NMA } = imports.gi;
|
||||
const Signals = imports.signals;
|
||||
|
||||
const { loadInterfaceXML } = imports.misc.fileUtils;
|
||||
|
||||
@@ -98,46 +98,21 @@ const ModemGsmNetworkProxy = Gio.DBusProxy.makeProxyWrapper(ModemGsmNetworkInter
|
||||
const ModemCdmaInterface = loadInterfaceXML('org.freedesktop.ModemManager.Modem.Cdma');
|
||||
const ModemCdmaProxy = Gio.DBusProxy.makeProxyWrapper(ModemCdmaInterface);
|
||||
|
||||
var ModemBase = GObject.registerClass({
|
||||
GTypeFlags: GObject.TypeFlags.ABSTRACT,
|
||||
Properties: {
|
||||
'operator-name': GObject.ParamSpec.string(
|
||||
'operator-name', 'operator-name', 'operator-name',
|
||||
GObject.ParamFlags.READABLE,
|
||||
null),
|
||||
'signal-quality': GObject.ParamSpec.int(
|
||||
'signal-quality', 'signal-quality', 'signal-quality',
|
||||
GObject.ParamFlags.READABLE,
|
||||
0, 100, 0),
|
||||
},
|
||||
}, class ModemBase extends GObject.Object {
|
||||
_setOperatorName(operatorName) {
|
||||
if (this.operator_name == operatorName)
|
||||
return;
|
||||
this.operator_name = operatorName;
|
||||
this.notify('operator-name');
|
||||
}
|
||||
|
||||
_setSignalQuality(signalQuality) {
|
||||
if (this.signal_quality == signalQuality)
|
||||
return;
|
||||
this.signal_quality = signalQuality;
|
||||
this.notify('signal-quality');
|
||||
}
|
||||
});
|
||||
|
||||
var ModemGsm = GObject.registerClass(
|
||||
class ModemGsm extends ModemBase {
|
||||
_init(path) {
|
||||
super._init();
|
||||
var ModemGsm = class {
|
||||
constructor(path) {
|
||||
this._proxy = new ModemGsmNetworkProxy(Gio.DBus.system, 'org.freedesktop.ModemManager', path);
|
||||
|
||||
this.signal_quality = 0;
|
||||
this.operator_name = null;
|
||||
|
||||
// Code is duplicated because the function have different signatures
|
||||
this._proxy.connectSignal('SignalQuality', (proxy, sender, [quality]) => {
|
||||
this._setSignalQuality(quality);
|
||||
this.signal_quality = quality;
|
||||
this.emit('notify::signal-quality');
|
||||
});
|
||||
this._proxy.connectSignal('RegistrationInfo', (proxy, sender, [_status, code, name]) => {
|
||||
this._setOperatorName(_findProviderForMccMnc(name, code));
|
||||
this.operator_name = _findProviderForMccMnc(name, code);
|
||||
this.emit('notify::operator-name');
|
||||
});
|
||||
this._proxy.GetRegistrationInfoRemote(([result], err) => {
|
||||
if (err) {
|
||||
@@ -146,28 +121,32 @@ class ModemGsm extends ModemBase {
|
||||
}
|
||||
|
||||
let [status_, code, name] = result;
|
||||
this._setOperatorName(_findProviderForMccMnc(name, code));
|
||||
this.operator_name = _findProviderForMccMnc(name, code);
|
||||
this.emit('notify::operator-name');
|
||||
});
|
||||
this._proxy.GetSignalQualityRemote((result, err) => {
|
||||
if (err) {
|
||||
// it will return an error if the device is not connected
|
||||
this._setSignalQuality(0);
|
||||
this.signal_quality = 0;
|
||||
} else {
|
||||
let [quality] = result;
|
||||
this._setSignalQuality(quality);
|
||||
this.signal_quality = quality;
|
||||
}
|
||||
this.emit('notify::signal-quality');
|
||||
});
|
||||
}
|
||||
});
|
||||
};
|
||||
Signals.addSignalMethods(ModemGsm.prototype);
|
||||
|
||||
var ModemCdma = GObject.registerClass(
|
||||
class ModemCdma extends ModemBase {
|
||||
_init(path) {
|
||||
super._init();
|
||||
var ModemCdma = class {
|
||||
constructor(path) {
|
||||
this._proxy = new ModemCdmaProxy(Gio.DBus.system, 'org.freedesktop.ModemManager', path);
|
||||
|
||||
this.signal_quality = 0;
|
||||
this.operator_name = null;
|
||||
this._proxy.connectSignal('SignalQuality', (proxy, sender, params) => {
|
||||
this._setSignalQuality(params[0]);
|
||||
this.signal_quality = params[0];
|
||||
this.emit('notify::signal-quality');
|
||||
|
||||
// receiving this signal means the device got activated
|
||||
// and we can finally call GetServingSystem
|
||||
@@ -177,11 +156,12 @@ class ModemCdma extends ModemBase {
|
||||
this._proxy.GetSignalQualityRemote((result, err) => {
|
||||
if (err) {
|
||||
// it will return an error if the device is not connected
|
||||
this._setSignalQuality(0);
|
||||
this.signal_quality = 0;
|
||||
} else {
|
||||
let [quality] = result;
|
||||
this._setSignalQuality(quality);
|
||||
this.signal_quality = quality;
|
||||
}
|
||||
this.emit('notify::signal-quality');
|
||||
});
|
||||
}
|
||||
|
||||
@@ -189,14 +169,17 @@ class ModemCdma extends ModemBase {
|
||||
this._proxy.GetServingSystemRemote(([result], err) => {
|
||||
if (err) {
|
||||
// it will return an error if the device is not connected
|
||||
this._setOperatorName(null);
|
||||
this.operator_name = null;
|
||||
} else {
|
||||
let [bandClass_, band_, sid] = result;
|
||||
this._setOperatorName(_findProviderForSid(sid));
|
||||
|
||||
this.operator_name = _findProviderForSid(sid);
|
||||
}
|
||||
this.emit('notify::operator-name');
|
||||
});
|
||||
}
|
||||
});
|
||||
};
|
||||
Signals.addSignalMethods(ModemCdma.prototype);
|
||||
|
||||
|
||||
// ------------------------------------------------------- //
|
||||
@@ -212,20 +195,12 @@ const BroadbandModem3gppProxy = Gio.DBusProxy.makeProxyWrapper(BroadbandModem3gp
|
||||
const BroadbandModemCdmaInterface = loadInterfaceXML('org.freedesktop.ModemManager1.Modem.ModemCdma');
|
||||
const BroadbandModemCdmaProxy = Gio.DBusProxy.makeProxyWrapper(BroadbandModemCdmaInterface);
|
||||
|
||||
var BroadbandModem = GObject.registerClass({
|
||||
Properties: {
|
||||
'capabilities': GObject.ParamSpec.flags(
|
||||
'capabilities', 'capabilities', 'capabilities',
|
||||
GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT_ONLY,
|
||||
NM.DeviceModemCapabilities.$gtype,
|
||||
NM.DeviceModemCapabilities.NONE),
|
||||
},
|
||||
}, class BroadbandModem extends ModemBase {
|
||||
_init(path, capabilities) {
|
||||
super._init({ capabilities });
|
||||
this._proxy = new BroadbandModemProxy(Gio.DBus.system, 'org.freedesktop.ModemManager', path);
|
||||
var BroadbandModem = class {
|
||||
constructor(path, capabilities) {
|
||||
this._proxy = new BroadbandModemProxy(Gio.DBus.system, 'org.freedesktop.ModemManager1', path);
|
||||
this._proxy_3gpp = new BroadbandModem3gppProxy(Gio.DBus.system, 'org.freedesktop.ModemManager1', path);
|
||||
this._proxy_cdma = new BroadbandModemCdmaProxy(Gio.DBus.system, 'org.freedesktop.ModemManager1', path);
|
||||
this._capabilities = capabilities;
|
||||
|
||||
this._proxy.connect('g-properties-changed', (proxy, properties) => {
|
||||
if ('SignalQuality' in properties.deep_unpack())
|
||||
@@ -249,8 +224,9 @@ var BroadbandModem = GObject.registerClass({
|
||||
}
|
||||
|
||||
_reloadSignalQuality() {
|
||||
let [quality, recent_] = this.SignalQuality;
|
||||
this._setSignalQuality(quality);
|
||||
let [quality, recent_] = this._proxy.SignalQuality;
|
||||
this.signal_quality = quality;
|
||||
this.emit('notify::signal-quality');
|
||||
}
|
||||
|
||||
_reloadOperatorName() {
|
||||
@@ -264,7 +240,8 @@ var BroadbandModem = GObject.registerClass({
|
||||
newName += this.operator_name_cdma;
|
||||
}
|
||||
|
||||
this._setOperatorName(newName);
|
||||
this.operator_name = newName;
|
||||
this.emit('notify::operator-name');
|
||||
}
|
||||
|
||||
_reload3gppOperatorName() {
|
||||
@@ -279,4 +256,5 @@ var BroadbandModem = GObject.registerClass({
|
||||
this.operator_name_cdma = _findProviderForSid(sid);
|
||||
this._reloadOperatorName();
|
||||
}
|
||||
});
|
||||
};
|
||||
Signals.addSignalMethods(BroadbandModem.prototype);
|
||||
|
||||
@@ -192,8 +192,9 @@ var ObjectManager = class {
|
||||
_onNameAppeared() {
|
||||
this._managerProxy.GetManagedObjectsRemote((result, error) => {
|
||||
if (!result) {
|
||||
if (error)
|
||||
if (error) {
|
||||
logError(error, `could not get remote objects for service ${this._serviceName} path ${this._managerPath}`);
|
||||
}
|
||||
|
||||
this._tryToCompleteLoad();
|
||||
return;
|
||||
|
||||
@@ -17,10 +17,9 @@
|
||||
// @params and @defaults
|
||||
function parse(params = {}, defaults, allowExtras) {
|
||||
if (!allowExtras) {
|
||||
for (let prop in params) {
|
||||
for (let prop in params)
|
||||
if (!(prop in defaults))
|
||||
throw new Error(`Unrecognized parameter "${prop}"`);
|
||||
}
|
||||
}
|
||||
|
||||
let defaultsCopy = Object.assign({}, defaults);
|
||||
|
||||
@@ -72,10 +72,11 @@ var SmartcardManager = class {
|
||||
if ('IsInserted' in properties.deep_unpack()) {
|
||||
this._updateToken(token);
|
||||
|
||||
if (token.IsInserted)
|
||||
if (token.IsInserted) {
|
||||
this.emit('smartcard-inserted', token);
|
||||
else
|
||||
} else {
|
||||
this.emit('smartcard-removed', token);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
@@ -74,8 +74,8 @@ const SystemActions = GObject.registerClass({
|
||||
'orientation-lock-icon',
|
||||
'orientation-lock-icon',
|
||||
GObject.ParamFlags.READWRITE,
|
||||
null),
|
||||
},
|
||||
null)
|
||||
}
|
||||
}, class SystemActions extends GObject.Object {
|
||||
_init() {
|
||||
super._init();
|
||||
@@ -90,7 +90,7 @@ const SystemActions = GObject.registerClass({
|
||||
iconName: 'system-shutdown-symbolic',
|
||||
// Translators: A list of keywords that match the power-off action, separated by semicolons
|
||||
keywords: _("power off;shutdown;reboot;restart").split(/[; ]/),
|
||||
available: false,
|
||||
available: false
|
||||
});
|
||||
this._actions.set(LOCK_SCREEN_ACTION_ID, {
|
||||
// Translators: The name of the lock screen action in search
|
||||
@@ -98,7 +98,7 @@ const SystemActions = GObject.registerClass({
|
||||
iconName: 'system-lock-screen-symbolic',
|
||||
// Translators: A list of keywords that match the lock screen action, separated by semicolons
|
||||
keywords: _("lock screen").split(/[; ]/),
|
||||
available: false,
|
||||
available: false
|
||||
});
|
||||
this._actions.set(LOGOUT_ACTION_ID, {
|
||||
// Translators: The name of the logout action in search
|
||||
@@ -106,7 +106,7 @@ const SystemActions = GObject.registerClass({
|
||||
iconName: 'application-exit-symbolic',
|
||||
// Translators: A list of keywords that match the logout action, separated by semicolons
|
||||
keywords: _("logout;log out;sign off").split(/[; ]/),
|
||||
available: false,
|
||||
available: false
|
||||
});
|
||||
this._actions.set(SUSPEND_ACTION_ID, {
|
||||
// Translators: The name of the suspend action in search
|
||||
@@ -114,7 +114,7 @@ const SystemActions = GObject.registerClass({
|
||||
iconName: 'media-playback-pause-symbolic',
|
||||
// Translators: A list of keywords that match the suspend action, separated by semicolons
|
||||
keywords: _("suspend;sleep").split(/[; ]/),
|
||||
available: false,
|
||||
available: false
|
||||
});
|
||||
this._actions.set(SWITCH_USER_ACTION_ID, {
|
||||
// Translators: The name of the switch user action in search
|
||||
@@ -122,7 +122,7 @@ const SystemActions = GObject.registerClass({
|
||||
iconName: 'system-switch-user-symbolic',
|
||||
// Translators: A list of keywords that match the switch user action, separated by semicolons
|
||||
keywords: _("switch user").split(/[; ]/),
|
||||
available: false,
|
||||
available: false
|
||||
});
|
||||
this._actions.set(LOCK_ORIENTATION_ACTION_ID, {
|
||||
// Translators: The name of the lock orientation action in search
|
||||
@@ -130,7 +130,7 @@ const SystemActions = GObject.registerClass({
|
||||
iconName: '',
|
||||
// Translators: A list of keywords that match the lock orientation action, separated by semicolons
|
||||
keywords: _("lock orientation;screen;rotation").split(/[; ]/),
|
||||
available: false,
|
||||
available: false
|
||||
});
|
||||
|
||||
this._loginScreenSettings = new Gio.Settings({ schema_id: LOGIN_SCREEN_SCHEMA });
|
||||
@@ -233,10 +233,9 @@ const SystemActions = GObject.registerClass({
|
||||
|
||||
_updateOrientationLock() {
|
||||
let available = false;
|
||||
if (this._sensorProxy.g_name_owner) {
|
||||
if (this._sensorProxy.g_name_owner)
|
||||
available = this._sensorProxy.HasAccelerometer &&
|
||||
this._monitorManager.get_is_builtin_display_on();
|
||||
}
|
||||
|
||||
this._actions.get(LOCK_ORIENTATION_ACTION_ID).available = available;
|
||||
|
||||
@@ -274,10 +273,9 @@ const SystemActions = GObject.registerClass({
|
||||
|
||||
let results = [];
|
||||
|
||||
for (let [key, { available, keywords }] of this._actions) {
|
||||
for (let [key, { available, keywords }] of this._actions)
|
||||
if (available && terms.every(t => keywords.some(k => k.startsWith(t))))
|
||||
results.push(key);
|
||||
}
|
||||
|
||||
return results;
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
formatTime, formatTimeSpan, createTimeLabel, insertSorted,
|
||||
makeCloseButton, ensureActorVisibleInScrollView, wiggle */
|
||||
|
||||
const { Clutter, Gio, GLib, GObject, Shell, St, GnomeDesktop } = imports.gi;
|
||||
const { Clutter, Gio, GLib, GObject, Shell, St } = imports.gi;
|
||||
const Gettext = imports.gettext;
|
||||
|
||||
const Main = imports.ui.main;
|
||||
@@ -121,15 +121,12 @@ function trySpawn(argv) {
|
||||
// We are only interested in the part in the parentheses. (And
|
||||
// we can't pattern match the text, since it gets localized.)
|
||||
let message = err.message.replace(/.*\((.+)\)/, '$1');
|
||||
throw new err.constructor({ code: err.code, message });
|
||||
throw new (err.constructor)({ code: err.code,
|
||||
message: message });
|
||||
} else {
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
|
||||
// Async call, we don't need the reply though
|
||||
GnomeDesktop.start_systemd_scope(argv[0], pid, null, null, null, () => {});
|
||||
|
||||
// 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
|
||||
@@ -175,28 +172,23 @@ function formatTimeSpan(date) {
|
||||
|
||||
if (minutesAgo < 5)
|
||||
return _("Just now");
|
||||
if (hoursAgo < 1) {
|
||||
if (hoursAgo < 1)
|
||||
return Gettext.ngettext("%d minute ago",
|
||||
"%d minutes ago", minutesAgo).format(minutesAgo);
|
||||
}
|
||||
if (daysAgo < 1) {
|
||||
if (daysAgo < 1)
|
||||
return Gettext.ngettext("%d hour ago",
|
||||
"%d hours ago", hoursAgo).format(hoursAgo);
|
||||
}
|
||||
if (daysAgo < 2)
|
||||
return _("Yesterday");
|
||||
if (daysAgo < 15) {
|
||||
if (daysAgo < 15)
|
||||
return Gettext.ngettext("%d day ago",
|
||||
"%d days ago", daysAgo).format(daysAgo);
|
||||
}
|
||||
if (weeksAgo < 8) {
|
||||
if (weeksAgo < 8)
|
||||
return Gettext.ngettext("%d week ago",
|
||||
"%d weeks ago", weeksAgo).format(weeksAgo);
|
||||
}
|
||||
if (yearsAgo < 1) {
|
||||
if (yearsAgo < 1)
|
||||
return Gettext.ngettext("%d month ago",
|
||||
"%d months ago", monthsAgo).format(monthsAgo);
|
||||
}
|
||||
return Gettext.ngettext("%d year ago",
|
||||
"%d years ago", yearsAgo).format(yearsAgo);
|
||||
}
|
||||
@@ -221,10 +213,7 @@ function formatTime(time, params) {
|
||||
_desktopSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.interface' });
|
||||
let clockFormat = _desktopSettings.get_string('clock-format');
|
||||
|
||||
params = Params.parse(params, {
|
||||
timeOnly: false,
|
||||
ampm: true,
|
||||
});
|
||||
params = Params.parse(params, { timeOnly: false });
|
||||
|
||||
if (clockFormat == '24h') {
|
||||
// Show only the time if date is on today
|
||||
@@ -257,7 +246,7 @@ function formatTime(time, params) {
|
||||
format = N_("%B %-d %Y, %H\u2236%M");
|
||||
} else {
|
||||
// Show only the time if date is on today
|
||||
if (daysAgo < 1 || params.timeOnly) // eslint-disable-line no-lonely-if
|
||||
if (daysAgo < 1 || params.timeOnly)
|
||||
/* Translators: Time in 12h format */
|
||||
format = N_("%l\u2236%M %p");
|
||||
// Show the word "Yesterday" and time if date is on yesterday
|
||||
@@ -286,11 +275,6 @@ function formatTime(time, params) {
|
||||
format = N_("%B %-d %Y, %l\u2236%M %p");
|
||||
}
|
||||
|
||||
// Time in short 12h format, without the equivalent of "AM" or "PM"; used
|
||||
// when it is clear from the context
|
||||
if (!params.ampm)
|
||||
format = format.replace(/\s*%p/g, '');
|
||||
|
||||
let formattedTime = date.format(Shell.util_translate_time_string(format));
|
||||
// prepend LTR-mark to colon/ratio to force a text direction on times
|
||||
return formattedTime.replace(/([:\u2236])/g, '\u200e$1');
|
||||
@@ -341,7 +325,7 @@ function lowerBound(array, val, cmp) {
|
||||
max = mid;
|
||||
}
|
||||
|
||||
return min == max || cmp(array[min], val) < 0 ? max : min;
|
||||
return (min == max || cmp(array[min], val) < 0) ? max : min;
|
||||
}
|
||||
|
||||
// insertSorted:
|
||||
@@ -362,13 +346,19 @@ function insertSorted(array, val, cmp) {
|
||||
var CloseButton = GObject.registerClass(
|
||||
class CloseButton extends St.Button {
|
||||
_init(boxpointer) {
|
||||
super._init({
|
||||
style_class: 'notification-close',
|
||||
x_expand: true,
|
||||
y_expand: true,
|
||||
x_align: Clutter.ActorAlign.END,
|
||||
y_align: Clutter.ActorAlign.START,
|
||||
});
|
||||
super._init({ style_class: 'notification-close' });
|
||||
|
||||
// This is a bit tricky. St.Bin has its own x-align/y-align properties
|
||||
// that compete with Clutter's properties. This should be fixed for
|
||||
// Clutter 2.0. Since St.Bin doesn't define its own setters, the
|
||||
// setters are a workaround to get Clutter's version.
|
||||
this.set_x_align(Clutter.ActorAlign.END);
|
||||
this.set_y_align(Clutter.ActorAlign.START);
|
||||
|
||||
// XXX Clutter 2.0 workaround: ClutterBinLayout needs expand
|
||||
// to respect the alignments.
|
||||
this.set_x_expand(true);
|
||||
this.set_y_expand(true);
|
||||
|
||||
this._boxPointer = boxpointer;
|
||||
if (boxpointer)
|
||||
@@ -421,7 +411,7 @@ function ensureActorVisibleInScrollView(scrollView, actor) {
|
||||
if (!parent)
|
||||
throw new Error("actor not in scroll view");
|
||||
|
||||
box = parent.get_allocation_box();
|
||||
let box = parent.get_allocation_box();
|
||||
y1 += box.y1;
|
||||
y2 += box.y1;
|
||||
parent = parent.get_parent();
|
||||
@@ -436,7 +426,7 @@ function ensureActorVisibleInScrollView(scrollView, actor) {
|
||||
|
||||
adjustment.ease(value, {
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
duration: SCROLL_TIME,
|
||||
duration: SCROLL_TIME
|
||||
});
|
||||
}
|
||||
|
||||
@@ -468,8 +458,8 @@ function wiggle(actor, params) {
|
||||
duration: params.duration,
|
||||
mode: Clutter.AnimationMode.EASE_IN_QUAD,
|
||||
});
|
||||
},
|
||||
}
|
||||
});
|
||||
},
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -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) {
|
||||
@@ -48,11 +47,11 @@ var WeatherClient = class {
|
||||
return;
|
||||
}
|
||||
|
||||
this._permStore.LookupRemote('gnome', 'geolocation', (res, err) => {
|
||||
if (err)
|
||||
log(`Error looking up permission: ${err.message}`);
|
||||
this._permStore.LookupRemote('gnome', 'geolocation', (res, error) => {
|
||||
if (error)
|
||||
log(`Error looking up permission: ${error.message}`);
|
||||
|
||||
let [perms, data] = err ? [{}, null] : res;
|
||||
let [perms, data] = error ? [{}, null] : res;
|
||||
let params = ['gnome', 'geolocation', false, data, perms];
|
||||
this._onPermStoreChanged(this._permStore, '', params);
|
||||
});
|
||||
@@ -91,7 +90,7 @@ var WeatherClient = class {
|
||||
this._onWeatherProxyReady.bind(this));
|
||||
|
||||
this._settings = new Gio.Settings({
|
||||
schema_id: 'org.gnome.shell.weather',
|
||||
schema_id: 'org.gnome.shell.weather'
|
||||
});
|
||||
this._settings.connect('changed::automatic-location',
|
||||
this._onAutomaticLocationChanged.bind(this));
|
||||
@@ -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) {
|
||||
@@ -170,19 +169,12 @@ var WeatherClient = class {
|
||||
}
|
||||
|
||||
_onInstalledChanged() {
|
||||
let hadApp = this._weatherApp != null;
|
||||
let hadApp = (this._weatherApp != null);
|
||||
this._weatherApp = this._appSystem.lookup_app(WEATHER_APP_ID);
|
||||
let haveApp = this._weatherApp != null;
|
||||
let haveApp = (this._weatherApp != null);
|
||||
|
||||
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() {
|
||||
@@ -213,7 +205,7 @@ var WeatherClient = class {
|
||||
|
||||
this._weatherInfo.abort();
|
||||
this._weatherInfo.set_location(location);
|
||||
this._locationValid = location != null;
|
||||
this._locationValid = (location != null);
|
||||
|
||||
this._weatherInfo.set_enabled_providers(location ? this._providers : 0);
|
||||
|
||||
|
||||
@@ -57,7 +57,7 @@ var METRICS = {
|
||||
units: "us" },
|
||||
applicationsShowTimeSubsequent:
|
||||
{ description: "Time to switch to applications view, second time",
|
||||
units: "us" },
|
||||
units: "us" }
|
||||
};
|
||||
|
||||
let WINDOW_CONFIGS = [
|
||||
@@ -67,7 +67,7 @@ let WINDOW_CONFIGS = [
|
||||
{ width: 640, height: 480, alpha: false, maximized: true, count: 5, metric: 'overviewFps5Maximized' },
|
||||
{ width: 640, height: 480, alpha: false, maximized: true, count: 10, metric: 'overviewFps10Maximized' },
|
||||
{ width: 640, height: 480, alpha: true, maximized: false, count: 5, metric: 'overviewFps5Alpha' },
|
||||
{ width: 640, height: 480, alpha: true, maximized: false, count: 10, metric: 'overviewFps10Alpha' },
|
||||
{ width: 640, height: 480, alpha: true, maximized: false, count: 10, metric: 'overviewFps10Alpha' }
|
||||
];
|
||||
|
||||
function *run() {
|
||||
@@ -94,12 +94,11 @@ function *run() {
|
||||
let config = WINDOW_CONFIGS[i / 2];
|
||||
yield Scripting.destroyTestWindows();
|
||||
|
||||
for (let k = 0; k < config.count; k++) {
|
||||
for (let k = 0; k < config.count; k++)
|
||||
yield Scripting.createTestWindow({ width: config.width,
|
||||
height: config.height,
|
||||
alpha: config.alpha,
|
||||
maximized: config.maximized });
|
||||
}
|
||||
|
||||
yield Scripting.waitTestWindows();
|
||||
yield Scripting.sleep(1000);
|
||||
@@ -175,10 +174,11 @@ function script_applicationsShowDone(time) {
|
||||
}
|
||||
|
||||
function script_afterShowHide(_time) {
|
||||
if (overviewShowCount == 1)
|
||||
if (overviewShowCount == 1) {
|
||||
METRICS.usedAfterOverview.value = mallocUsedSize;
|
||||
else
|
||||
} else {
|
||||
METRICS.leakedAfterOverview.value = mallocUsedSize - METRICS.usedAfterOverview.value;
|
||||
}
|
||||
}
|
||||
|
||||
function malloc_usedSize(time, bytes) {
|
||||
|
||||
@@ -114,7 +114,7 @@ function *run() {
|
||||
Scripting.scriptEvent('desktopShown');
|
||||
|
||||
let interfaceSettings = new Gio.Settings({
|
||||
schema_id: 'org.gnome.desktop.interface',
|
||||
schema_id: 'org.gnome.desktop.interface'
|
||||
});
|
||||
interfaceSettings.set_boolean('enable-animations', false);
|
||||
|
||||
|
||||
@@ -11,17 +11,17 @@ const { loadInterfaceXML } = imports.misc.fileUtils;
|
||||
const PortalHelperResult = {
|
||||
CANCELLED: 0,
|
||||
COMPLETED: 1,
|
||||
RECHECK: 2,
|
||||
RECHECK: 2
|
||||
};
|
||||
|
||||
const PortalHelperSecurityLevel = {
|
||||
NOT_YET_DETERMINED: 0,
|
||||
SECURE: 1,
|
||||
INSECURE: 2,
|
||||
INSECURE: 2
|
||||
};
|
||||
|
||||
const CONNECTIVITY_CHECK_HOST = 'nmcheck.gnome.org';
|
||||
const CONNECTIVITY_CHECK_URI = `http://${CONNECTIVITY_CHECK_HOST}`;
|
||||
const CONNECTIVITY_CHECK_URI = 'http://' + CONNECTIVITY_CHECK_HOST;
|
||||
const CONNECTIVITY_RECHECK_RATELIMIT_TIMEOUT = 30 * GLib.USEC_PER_SEC;
|
||||
|
||||
const HelperDBusInterface = loadInterfaceXML('org.gnome.Shell.PortalHelper');
|
||||
@@ -92,7 +92,7 @@ class PortalHeaderBar extends Gtk.HeaderBar {
|
||||
var PortalWindow = GObject.registerClass(
|
||||
class PortalWindow extends Gtk.ApplicationWindow {
|
||||
_init(application, url, timestamp, doneCallback) {
|
||||
super._init({ application });
|
||||
super._init({ application: application });
|
||||
|
||||
this.connect('delete-event', this.destroyWindow.bind(this));
|
||||
this._headerBar = new PortalHeaderBar();
|
||||
@@ -287,7 +287,7 @@ class WebPortalHelper extends Gtk.Application {
|
||||
}
|
||||
|
||||
Authenticate(connection, url, timestamp) {
|
||||
this._queue.push({ connection, url, timestamp });
|
||||
this._queue.push({ connection: connection, url: url, timestamp: timestamp });
|
||||
|
||||
this._processQueue();
|
||||
}
|
||||
|
||||
@@ -13,7 +13,7 @@ const AccessIface = loadInterfaceXML('org.freedesktop.impl.portal.Access');
|
||||
var DialogResponse = {
|
||||
OK: 0,
|
||||
CANCEL: 1,
|
||||
CLOSED: 2,
|
||||
CLOSED: 2
|
||||
};
|
||||
|
||||
var AccessDialog = GObject.registerClass(
|
||||
@@ -35,7 +35,7 @@ class AccessDialog extends ModalDialog.ModalDialog {
|
||||
|
||||
_buildLayout(title, subtitle, body, options) {
|
||||
// No support for non-modal system dialogs, so ignore the option
|
||||
// let modal = options['modal'] || true;
|
||||
//let modal = options['modal'] || true;
|
||||
let denyLabel = options['deny_label'] || _("Deny Access");
|
||||
let grantLabel = options['grant_label'] || _("Grant Access");
|
||||
let iconName = options['icon'] || null;
|
||||
|
||||
123
js/ui/altTab.js
123
js/ui/altTab.js
@@ -62,7 +62,7 @@ class AppSwitcherPopup extends SwitcherPopup.SwitcherPopup {
|
||||
|
||||
this.thumbnailsVisible = false;
|
||||
|
||||
let apps = Shell.AppSystem.get_default().get_running();
|
||||
let apps = Shell.AppSystem.get_default().get_running ();
|
||||
|
||||
if (apps.length == 0)
|
||||
return;
|
||||
@@ -111,12 +111,14 @@ class AppSwitcherPopup extends SwitcherPopup.SwitcherPopup {
|
||||
|
||||
_initialSelection(backward, binding) {
|
||||
if (binding == 'switch-group') {
|
||||
if (backward)
|
||||
if (backward) {
|
||||
this._select(0, this._items[0].cachedWindows.length - 1);
|
||||
else if (this._items[0].cachedWindows.length > 1)
|
||||
this._select(0, 1);
|
||||
else
|
||||
this._select(0, 0);
|
||||
} else {
|
||||
if (this._items[0].cachedWindows.length > 1)
|
||||
this._select(0, 1);
|
||||
else
|
||||
this._select(0, 0);
|
||||
}
|
||||
} else if (binding == 'switch-group-backward') {
|
||||
this._select(0, this._items[0].cachedWindows.length - 1);
|
||||
} else if (binding == 'switch-applications-backward') {
|
||||
@@ -178,27 +180,28 @@ class AppSwitcherPopup extends SwitcherPopup.SwitcherPopup {
|
||||
this._select(this._next());
|
||||
} else if (action == Meta.KeyBindingAction.SWITCH_APPLICATIONS_BACKWARD) {
|
||||
this._select(this._previous());
|
||||
} else if (keysym === Clutter.KEY_q) {
|
||||
} else if (keysym == Clutter.q) {
|
||||
this._quitApplication(this._selectedIndex);
|
||||
} else if (this._thumbnailsFocused) {
|
||||
if (keysym === Clutter.KEY_Left)
|
||||
if (keysym == Clutter.Left)
|
||||
this._select(this._selectedIndex, this._previousWindow());
|
||||
else if (keysym === Clutter.KEY_Right)
|
||||
else if (keysym == Clutter.Right)
|
||||
this._select(this._selectedIndex, this._nextWindow());
|
||||
else if (keysym === Clutter.KEY_Up)
|
||||
else if (keysym == Clutter.Up)
|
||||
this._select(this._selectedIndex, null, true);
|
||||
else if (keysym === Clutter.KEY_w || keysym === Clutter.KEY_F4)
|
||||
else if (keysym == Clutter.w || keysym == Clutter.F4)
|
||||
this._closeAppWindow(this._selectedIndex, this._currentWindow);
|
||||
else
|
||||
return Clutter.EVENT_PROPAGATE;
|
||||
} else if (keysym == Clutter.KEY_Left) {
|
||||
this._select(this._previous());
|
||||
} else if (keysym == Clutter.KEY_Right) {
|
||||
this._select(this._next());
|
||||
} else if (keysym == Clutter.KEY_Down) {
|
||||
this._select(this._selectedIndex, 0);
|
||||
} else {
|
||||
return Clutter.EVENT_PROPAGATE;
|
||||
if (keysym == Clutter.Left)
|
||||
this._select(this._previous());
|
||||
else if (keysym == Clutter.Right)
|
||||
this._select(this._next());
|
||||
else if (keysym == Clutter.Down)
|
||||
this._select(this._selectedIndex, 0);
|
||||
else
|
||||
return Clutter.EVENT_PROPAGATE;
|
||||
}
|
||||
|
||||
return Clutter.EVENT_STOP;
|
||||
@@ -293,9 +296,9 @@ class AppSwitcherPopup extends SwitcherPopup.SwitcherPopup {
|
||||
|
||||
/**
|
||||
* _select:
|
||||
* @param {number} app: index of the app to select
|
||||
* @param {number=} window: index of which of @app's windows to select
|
||||
* @param {bool} forceAppFocus: optional flag, see below
|
||||
* @app: index of the app to select
|
||||
* @window: (optional) index of which of @app's windows to select
|
||||
* @forceAppFocus: optional flag, see below
|
||||
*
|
||||
* Selects the indicated @app, and optional @window, and sets
|
||||
* this._thumbnailsFocused appropriately to indicate whether the
|
||||
@@ -365,15 +368,15 @@ class AppSwitcherPopup extends SwitcherPopup.SwitcherPopup {
|
||||
onComplete: () => {
|
||||
thumbnailsActor.destroy();
|
||||
this.thumbnailsVisible = false;
|
||||
},
|
||||
}
|
||||
});
|
||||
this._thumbnails = null;
|
||||
if (this._switcherList._items[this._selectedIndex])
|
||||
this._switcherList._items[this._selectedIndex].remove_accessible_state(Atk.StateType.EXPANDED);
|
||||
this._switcherList._items[this._selectedIndex].remove_accessible_state (Atk.StateType.EXPANDED);
|
||||
}
|
||||
|
||||
_createThumbnails() {
|
||||
this._thumbnails = new ThumbnailList(this._items[this._selectedIndex].cachedWindows);
|
||||
this._thumbnails = new ThumbnailList (this._items[this._selectedIndex].cachedWindows);
|
||||
this._thumbnails.connect('item-activated', this._windowActivated.bind(this));
|
||||
this._thumbnails.connect('item-entered', this._windowEntered.bind(this));
|
||||
this._thumbnails.connect('item-removed', this._windowRemoved.bind(this));
|
||||
@@ -395,10 +398,10 @@ class AppSwitcherPopup extends SwitcherPopup.SwitcherPopup {
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
onComplete: () => {
|
||||
this.thumbnailsVisible = true;
|
||||
},
|
||||
}
|
||||
});
|
||||
|
||||
this._switcherList._items[this._selectedIndex].add_accessible_state(Atk.StateType.EXPANDED);
|
||||
this._switcherList._items[this._selectedIndex].add_accessible_state (Atk.StateType.EXPANDED);
|
||||
}
|
||||
});
|
||||
|
||||
@@ -415,7 +418,7 @@ class CyclerHighlight extends St.Widget {
|
||||
this.add_actor(this._highlight);
|
||||
|
||||
let coordinate = Clutter.BindCoordinate.ALL;
|
||||
let constraint = new Clutter.BindConstraint({ coordinate });
|
||||
let constraint = new Clutter.BindConstraint({ coordinate: coordinate });
|
||||
this._clone.bind_property('source', constraint, 'source', 0);
|
||||
|
||||
this.add_constraint(constraint);
|
||||
@@ -474,7 +477,7 @@ var CyclerList = GObject.registerClass({
|
||||
});
|
||||
|
||||
var CyclerPopup = GObject.registerClass({
|
||||
GTypeFlags: GObject.TypeFlags.ABSTRACT,
|
||||
GTypeFlags: GObject.TypeFlags.ABSTRACT
|
||||
}, class CyclerPopup extends SwitcherPopup.SwitcherPopup {
|
||||
_init() {
|
||||
super._init();
|
||||
@@ -588,18 +591,20 @@ class WindowSwitcherPopup extends SwitcherPopup.SwitcherPopup {
|
||||
}
|
||||
|
||||
_keyPressHandler(keysym, action) {
|
||||
if (action == Meta.KeyBindingAction.SWITCH_WINDOWS)
|
||||
if (action == Meta.KeyBindingAction.SWITCH_WINDOWS) {
|
||||
this._select(this._next());
|
||||
else if (action == Meta.KeyBindingAction.SWITCH_WINDOWS_BACKWARD)
|
||||
} else if (action == Meta.KeyBindingAction.SWITCH_WINDOWS_BACKWARD) {
|
||||
this._select(this._previous());
|
||||
else if (keysym == Clutter.KEY_Left)
|
||||
this._select(this._previous());
|
||||
else if (keysym == Clutter.KEY_Right)
|
||||
this._select(this._next());
|
||||
else if (keysym == Clutter.KEY_w || keysym == Clutter.KEY_F4)
|
||||
this._closeWindow(this._selectedIndex);
|
||||
else
|
||||
return Clutter.EVENT_PROPAGATE;
|
||||
} else {
|
||||
if (keysym == Clutter.Left)
|
||||
this._select(this._previous());
|
||||
else if (keysym == Clutter.Right)
|
||||
this._select(this._next());
|
||||
else if (keysym == Clutter.w || keysym == Clutter.F4)
|
||||
this._closeWindow(this._selectedIndex);
|
||||
else
|
||||
return Clutter.EVENT_PROPAGATE;
|
||||
}
|
||||
|
||||
return Clutter.EVENT_STOP;
|
||||
}
|
||||
@@ -642,22 +647,20 @@ class WindowCyclerPopup extends CyclerPopup {
|
||||
}
|
||||
});
|
||||
|
||||
var AppIcon = GObject.registerClass(
|
||||
class AppIcon extends St.BoxLayout {
|
||||
var AppIcon = GObject.registerClass({
|
||||
GTypeName: 'AltTab_AppIcon'
|
||||
}, class AppIcon extends St.BoxLayout {
|
||||
_init(app) {
|
||||
super._init({ style_class: 'alt-tab-app',
|
||||
vertical: true });
|
||||
|
||||
this.app = app;
|
||||
this.icon = null;
|
||||
this._iconBin = new St.Bin();
|
||||
this._iconBin = new St.Bin({ x_fill: true, y_fill: true });
|
||||
|
||||
this.add_child(this._iconBin);
|
||||
this.label = new St.Label({
|
||||
text: this.app.get_name(),
|
||||
x_align: Clutter.ActorAlign.CENTER,
|
||||
});
|
||||
this.add_child(this.label);
|
||||
this.add(this._iconBin, { x_fill: false, y_fill: false } );
|
||||
this.label = new St.Label({ text: this.app.get_name() });
|
||||
this.add(this.label, { x_fill: false });
|
||||
}
|
||||
|
||||
// eslint-disable-next-line camelcase
|
||||
@@ -693,7 +696,7 @@ class AppSwitcher extends SwitcherPopup.SwitcherList {
|
||||
// Cache the window list now; we don't handle dynamic changes here,
|
||||
// and we don't want to be continually retrieving it
|
||||
appIcon.cachedWindows = allWindows.filter(
|
||||
w => windowTracker.get_window_app(w) == appIcon.app
|
||||
w => windowTracker.get_window_app (w) == appIcon.app
|
||||
);
|
||||
if (appIcon.cachedWindows.length > 0)
|
||||
this._addIcon(appIcon);
|
||||
@@ -717,9 +720,9 @@ class AppSwitcher extends SwitcherPopup.SwitcherList {
|
||||
|
||||
_setIconSize() {
|
||||
let j = 0;
|
||||
while (this._items.length > 1 && this._items[j].style_class != 'item-box')
|
||||
while (this._items.length > 1 && this._items[j].style_class != 'item-box') {
|
||||
j++;
|
||||
|
||||
}
|
||||
let themeNode = this._items[j].get_theme_node();
|
||||
this._list.ensure_style();
|
||||
|
||||
@@ -853,7 +856,7 @@ class AppSwitcher extends SwitcherPopup.SwitcherList {
|
||||
if (appIcon.cachedWindows.length == 1)
|
||||
arrow.hide();
|
||||
else
|
||||
item.add_accessible_state(Atk.StateType.EXPANDABLE);
|
||||
item.add_accessible_state (Atk.StateType.EXPANDABLE);
|
||||
}
|
||||
|
||||
_removeIcon(app) {
|
||||
@@ -889,13 +892,12 @@ class ThumbnailList extends SwitcherPopup.SwitcherList {
|
||||
|
||||
let title = windows[i].get_title();
|
||||
if (title) {
|
||||
let name = new St.Label({
|
||||
text: title,
|
||||
// St.Label doesn't support text-align
|
||||
x_align: Clutter.ActorAlign.CENTER,
|
||||
});
|
||||
this._labels.push(name);
|
||||
box.add_actor(name);
|
||||
let name = new St.Label({ text: title });
|
||||
// St.Label doesn't support text-align so use a Bin
|
||||
let bin = new St.Bin({ x_align: St.Align.MIDDLE });
|
||||
this._labels.push(bin);
|
||||
bin.add_actor(name);
|
||||
box.add_actor(bin);
|
||||
|
||||
this.addItem(box, name);
|
||||
} else {
|
||||
@@ -974,7 +976,7 @@ class WindowIcon extends St.BoxLayout {
|
||||
|
||||
this._icon = new St.Widget({ layout_manager: new Clutter.BinLayout() });
|
||||
|
||||
this.add_child(this._icon);
|
||||
this.add(this._icon, { x_fill: false, y_fill: false } );
|
||||
this.label = new St.Label({ text: window.get_title() });
|
||||
|
||||
let tracker = Shell.WindowTracker.get_default();
|
||||
@@ -997,10 +999,9 @@ class WindowIcon extends St.BoxLayout {
|
||||
size = WINDOW_PREVIEW_SIZE;
|
||||
this._icon.add_actor(_createWindowClone(mutterWindow, size * scaleFactor));
|
||||
|
||||
if (this.app) {
|
||||
if (this.app)
|
||||
this._icon.add_actor(this._createAppIcon(this.app,
|
||||
APP_ICON_SIZE_SMALL));
|
||||
}
|
||||
break;
|
||||
|
||||
case AppIconMode.APP_ICON_ONLY:
|
||||
|
||||
@@ -3,8 +3,6 @@
|
||||
|
||||
const { Clutter, GLib, GObject, Gio, St } = imports.gi;
|
||||
|
||||
const Params = imports.misc.params;
|
||||
|
||||
var ANIMATED_ICON_UPDATE_TIMEOUT = 16;
|
||||
var SPINNER_ANIMATION_TIME = 300;
|
||||
var SPINNER_ANIMATION_DELAY = 1000;
|
||||
@@ -12,7 +10,7 @@ var SPINNER_ANIMATION_DELAY = 1000;
|
||||
var Animation = GObject.registerClass(
|
||||
class Animation extends St.Bin {
|
||||
_init(file, width, height, speed) {
|
||||
super._init({ width, height });
|
||||
super._init({ width: width, height: height });
|
||||
this.connect('destroy', this._onDestroy.bind(this));
|
||||
this.connect('resource-scale-changed',
|
||||
this._loadFile.bind(this, file, width, height));
|
||||
@@ -73,10 +71,6 @@ class Animation extends St.Bin {
|
||||
this._animations = textureCache.load_sliced_image(file, width, height,
|
||||
scaleFactor, resourceScale,
|
||||
this._animationsLoaded.bind(this));
|
||||
this._animations.set({
|
||||
x_align: Clutter.ActorAlign.CENTER,
|
||||
y_align: Clutter.ActorAlign.CENTER,
|
||||
});
|
||||
this.set_child(this._animations);
|
||||
|
||||
if (wasPlaying)
|
||||
@@ -88,7 +82,7 @@ class Animation extends St.Bin {
|
||||
if (oldFrameActor)
|
||||
oldFrameActor.hide();
|
||||
|
||||
this._frame = frame % this._animations.get_n_children();
|
||||
this._frame = (frame % this._animations.get_n_children());
|
||||
|
||||
let newFrameActor = this._animations.get_child_at_index(this._frame);
|
||||
if (newFrameActor)
|
||||
@@ -138,18 +132,12 @@ class AnimatedIcon extends Animation {
|
||||
|
||||
var Spinner = GObject.registerClass(
|
||||
class Spinner extends AnimatedIcon {
|
||||
_init(size, params) {
|
||||
params = Params.parse(params, {
|
||||
animate: false,
|
||||
hideOnStop: false,
|
||||
});
|
||||
_init(size, animate = false) {
|
||||
let file = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/process-working.svg');
|
||||
super._init(file, size);
|
||||
|
||||
this.opacity = 0;
|
||||
this._animate = params.animate;
|
||||
this._hideOnStop = params.hideOnStop;
|
||||
this.visible = !this._hideOnStop;
|
||||
this._animate = animate;
|
||||
}
|
||||
|
||||
_onDestroy() {
|
||||
@@ -159,7 +147,6 @@ class Spinner extends AnimatedIcon {
|
||||
|
||||
play() {
|
||||
this.remove_all_transitions();
|
||||
this.show();
|
||||
|
||||
if (this._animate) {
|
||||
super.play();
|
||||
@@ -167,7 +154,7 @@ class Spinner extends AnimatedIcon {
|
||||
opacity: 255,
|
||||
delay: SPINNER_ANIMATION_DELAY,
|
||||
duration: SPINNER_ANIMATION_TIME,
|
||||
mode: Clutter.AnimationMode.LINEAR,
|
||||
mode: Clutter.AnimationMode.LINEAR
|
||||
});
|
||||
} else {
|
||||
this.opacity = 255;
|
||||
@@ -183,18 +170,11 @@ class Spinner extends AnimatedIcon {
|
||||
opacity: 0,
|
||||
duration: SPINNER_ANIMATION_TIME,
|
||||
mode: Clutter.AnimationMode.LINEAR,
|
||||
onComplete: () => {
|
||||
super.stop();
|
||||
if (this._hideOnStop)
|
||||
this.hide();
|
||||
},
|
||||
onComplete: () => super.stop()
|
||||
});
|
||||
} else {
|
||||
this.opacity = 0;
|
||||
super.stop();
|
||||
|
||||
if (this._hideOnStop)
|
||||
this.hide();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -9,13 +9,13 @@ const { loadInterfaceXML } = imports.misc.fileUtils;
|
||||
var AudioDevice = {
|
||||
HEADPHONES: 1 << 0,
|
||||
HEADSET: 1 << 1,
|
||||
MICROPHONE: 1 << 2,
|
||||
MICROPHONE: 1 << 2
|
||||
};
|
||||
|
||||
const AudioDeviceSelectionIface = loadInterfaceXML('org.gnome.Shell.AudioDeviceSelection');
|
||||
|
||||
var AudioDeviceSelectionDialog = GObject.registerClass({
|
||||
Signals: { 'device-selected': { param_types: [GObject.TYPE_UINT] } },
|
||||
Signals: { 'device-selected': { param_types: [GObject.TYPE_UINT] } }
|
||||
}, class AudioDeviceSelectionDialog extends ModalDialog.ModalDialog {
|
||||
_init(devices) {
|
||||
super._init({ styleClass: 'audio-device-selection-dialog' });
|
||||
@@ -43,19 +43,15 @@ var AudioDeviceSelectionDialog = GObject.registerClass({
|
||||
this.contentLayout.style_class = 'audio-selection-content';
|
||||
this.contentLayout.add(title);
|
||||
|
||||
this._selectionBox = new St.BoxLayout({
|
||||
style_class: 'audio-selection-box',
|
||||
x_expand: true,
|
||||
});
|
||||
this.contentLayout.add_child(this._selectionBox);
|
||||
this._selectionBox = new St.BoxLayout({ style_class: 'audio-selection-box' });
|
||||
this.contentLayout.add(this._selectionBox, { expand: true });
|
||||
|
||||
if (Main.sessionMode.allowSettings) {
|
||||
if (Main.sessionMode.allowSettings)
|
||||
this.addButton({ action: this._openSettings.bind(this),
|
||||
label: _("Sound Settings") });
|
||||
}
|
||||
this.addButton({ action: this.close.bind(this),
|
||||
label: _("Cancel"),
|
||||
key: Clutter.KEY_Escape });
|
||||
key: Clutter.Escape });
|
||||
}
|
||||
|
||||
_getDeviceLabel(device) {
|
||||
|
||||
@@ -145,7 +145,7 @@ var BackgroundCache = class BackgroundCache {
|
||||
|
||||
let monitor = file.monitor(Gio.FileMonitorFlags.NONE, null);
|
||||
monitor.connect('changed',
|
||||
(obj, theFile, otherFile, eventType) => {
|
||||
(obj, file, otherFile, eventType) => {
|
||||
// Ignore CHANGED and CREATED events, since in both cases
|
||||
// we'll get a CHANGES_DONE_HINT event when done.
|
||||
if (eventType != Gio.FileMonitorEvent.CHANGED &&
|
||||
@@ -222,7 +222,7 @@ function getBackgroundCache() {
|
||||
}
|
||||
|
||||
var Background = GObject.registerClass({
|
||||
Signals: { 'loaded': {}, 'bg-changed': {} },
|
||||
Signals: { 'loaded': {}, 'bg-changed': {} }
|
||||
}, class Background extends Meta.Background {
|
||||
_init(params) {
|
||||
params = Params.parse(params, { monitorIndex: 0,
|
||||
@@ -269,9 +269,9 @@ var Background = GObject.registerClass({
|
||||
|
||||
let i;
|
||||
let keys = Object.keys(this._fileWatches);
|
||||
for (i = 0; i < keys.length; i++)
|
||||
for (i = 0; i < keys.length; i++) {
|
||||
this._cache.disconnect(this._fileWatches[keys[i]]);
|
||||
|
||||
}
|
||||
this._fileWatches = null;
|
||||
|
||||
if (this._timezoneChangedId != 0)
|
||||
@@ -403,7 +403,6 @@ var Background = GObject.registerClass({
|
||||
if (numPendingImages == 0)
|
||||
finish();
|
||||
} else {
|
||||
// eslint-disable-next-line no-loop-func
|
||||
let id = image.connect('loaded', () => {
|
||||
image.disconnect(id);
|
||||
numPendingImages--;
|
||||
@@ -445,7 +444,7 @@ var Background = GObject.registerClass({
|
||||
|
||||
_loadAnimation(file) {
|
||||
this._cache.getAnimation({
|
||||
file,
|
||||
file: file,
|
||||
settingsSchema: this._settings.schema_id,
|
||||
onLoaded: animation => {
|
||||
this._animation = animation;
|
||||
@@ -457,7 +456,7 @@ var Background = GObject.registerClass({
|
||||
|
||||
this._updateAnimation();
|
||||
this._watchFile(file);
|
||||
},
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -501,7 +500,7 @@ var Background = GObject.registerClass({
|
||||
let _systemBackground;
|
||||
|
||||
var SystemBackground = GObject.registerClass({
|
||||
Signals: { 'loaded': {} },
|
||||
Signals: { 'loaded': {} }
|
||||
}, class SystemBackground extends Meta.BackgroundActor {
|
||||
_init() {
|
||||
let file = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/noise-texture.png');
|
||||
@@ -515,7 +514,7 @@ var SystemBackground = GObject.registerClass({
|
||||
super._init({
|
||||
meta_display: global.display,
|
||||
monitor: 0,
|
||||
background: _systemBackground,
|
||||
background: _systemBackground
|
||||
});
|
||||
|
||||
let cache = Meta.BackgroundImageCache.get_default();
|
||||
@@ -593,11 +592,11 @@ var BackgroundSource = class BackgroundSource {
|
||||
|
||||
if (!(monitorIndex in this._backgrounds)) {
|
||||
let background = new Background({
|
||||
monitorIndex,
|
||||
monitorIndex: monitorIndex,
|
||||
layoutManager: this._layoutManager,
|
||||
settings: this._settings,
|
||||
file,
|
||||
style,
|
||||
file: file,
|
||||
style: style
|
||||
});
|
||||
|
||||
background._changedId = background.connect('bg-changed', () => {
|
||||
@@ -626,11 +625,11 @@ var BackgroundSource = class BackgroundSource {
|
||||
}
|
||||
};
|
||||
|
||||
var Animation = GObject.registerClass(
|
||||
class Animation extends GnomeDesktop.BGSlideShow {
|
||||
_init(params) {
|
||||
super._init(params);
|
||||
var Animation = class Animation {
|
||||
constructor(params) {
|
||||
params = Params.parse(params, { file: null });
|
||||
|
||||
this.file = params.file;
|
||||
this.keyFrameFiles = [];
|
||||
this.transitionProgress = 0.0;
|
||||
this.transitionDuration = 0.0;
|
||||
@@ -638,7 +637,9 @@ class Animation extends GnomeDesktop.BGSlideShow {
|
||||
}
|
||||
|
||||
load(callback) {
|
||||
this.load_async(null, () => {
|
||||
this._show = new GnomeDesktop.BGSlideShow({ file: this.file });
|
||||
|
||||
this._show.load_async(null, () => {
|
||||
this.loaded = true;
|
||||
if (callback)
|
||||
callback();
|
||||
@@ -648,11 +649,13 @@ class Animation extends GnomeDesktop.BGSlideShow {
|
||||
update(monitor) {
|
||||
this.keyFrameFiles = [];
|
||||
|
||||
if (this.get_num_slides() < 1)
|
||||
if (!this._show)
|
||||
return;
|
||||
|
||||
let [progress, duration, isFixed_, filename1, filename2] =
|
||||
this.get_current_slide(monitor.width, monitor.height);
|
||||
if (this._show.get_num_slides() < 1)
|
||||
return;
|
||||
|
||||
let [progress, duration, isFixed_, filename1, filename2] = this._show.get_current_slide(monitor.width, monitor.height);
|
||||
|
||||
this.transitionDuration = duration;
|
||||
this.transitionProgress = progress;
|
||||
@@ -663,7 +666,8 @@ class Animation extends GnomeDesktop.BGSlideShow {
|
||||
if (filename2)
|
||||
this.keyFrameFiles.push(Gio.File.new_for_path(filename2));
|
||||
}
|
||||
});
|
||||
};
|
||||
Signals.addSignalMethods(Animation.prototype);
|
||||
|
||||
var BackgroundManager = class BackgroundManager {
|
||||
constructor(params) {
|
||||
@@ -714,7 +718,7 @@ var BackgroundManager = class BackgroundManager {
|
||||
opacity: 0,
|
||||
duration: FADE_ANIMATION_TIME,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
onComplete: () => oldBackgroundActor.destroy(),
|
||||
onComplete: () => oldBackgroundActor.destroy()
|
||||
});
|
||||
}
|
||||
|
||||
@@ -763,7 +767,7 @@ var BackgroundManager = class BackgroundManager {
|
||||
if (this._controlPosition) {
|
||||
let monitor = this._layoutManager.monitors[this._monitorIndex];
|
||||
backgroundActor.set_position(monitor.x, monitor.y);
|
||||
this._container.set_child_below_sibling(backgroundActor, null);
|
||||
backgroundActor.lower_bottom();
|
||||
}
|
||||
|
||||
let changeSignalId = background.connect('bg-changed', () => {
|
||||
|
||||
@@ -35,12 +35,11 @@ function addBackgroundMenu(actor, layoutManager) {
|
||||
}
|
||||
|
||||
let clickAction = new Clutter.ClickAction();
|
||||
clickAction.connect('long-press', (action, theActor, state) => {
|
||||
if (state == Clutter.LongPressState.QUERY) {
|
||||
return (action.get_button() == 0 ||
|
||||
clickAction.connect('long-press', (action, actor, state) => {
|
||||
if (state == Clutter.LongPressState.QUERY)
|
||||
return ((action.get_button() == 0 ||
|
||||
action.get_button() == 1) &&
|
||||
!actor._backgroundMenu.isOpen;
|
||||
}
|
||||
!actor._backgroundMenu.isOpen);
|
||||
if (state == Clutter.LongPressState.ACTIVATE) {
|
||||
let [x, y] = action.get_coords();
|
||||
openMenu(x, y);
|
||||
|
||||
@@ -16,8 +16,8 @@ var BarLevel = GObject.registerClass({
|
||||
'overdrive-start': GObject.ParamSpec.double(
|
||||
'overdrive-start', 'overdrive-start', 'overdrive-start',
|
||||
GObject.ParamFlags.READWRITE,
|
||||
1, 2, 1),
|
||||
},
|
||||
1, 2, 1)
|
||||
}
|
||||
}, class BarLevel extends St.DrawingArea {
|
||||
_init(params) {
|
||||
this._maxValue = 1;
|
||||
@@ -27,7 +27,7 @@ var BarLevel = GObject.registerClass({
|
||||
|
||||
let defaultParams = {
|
||||
style_class: 'barlevel',
|
||||
accessible_role: Atk.Role.LEVEL_BAR,
|
||||
accessible_role: Atk.Role.LEVEL_BAR
|
||||
};
|
||||
super._init(Object.assign(defaultParams, params));
|
||||
this.connect('allocation-changed', (actor, box) => {
|
||||
@@ -88,10 +88,9 @@ var BarLevel = GObject.registerClass({
|
||||
if (this._overdriveStart == value)
|
||||
return;
|
||||
|
||||
if (value > this._maxValue) {
|
||||
if (value > this._maxValue)
|
||||
throw new Error(`Tried to set overdrive value to ${value}, ` +
|
||||
`which is a number greater than the maximum allowed value ${this._maxValue}`);
|
||||
}
|
||||
|
||||
this._overdriveStart = value;
|
||||
this.notify('overdrive-start');
|
||||
|
||||
@@ -44,7 +44,7 @@ var BoxPointer = GObject.registerClass({
|
||||
this._border = new St.DrawingArea();
|
||||
this._border.connect('repaint', this._drawBorder.bind(this));
|
||||
this.add_actor(this._border);
|
||||
this.set_child_above_sibling(this.bin, this._border);
|
||||
this.bin.raise(this._border);
|
||||
this._sourceAlignment = 0.5;
|
||||
this._muteInput = true;
|
||||
|
||||
@@ -72,7 +72,7 @@ var BoxPointer = GObject.registerClass({
|
||||
open(animate, onComplete) {
|
||||
let themeNode = this.get_theme_node();
|
||||
let rise = themeNode.get_length('-arrow-rise');
|
||||
let animationTime = animate & PopupAnimation.FULL ? POPUP_ANIMATION_TIME : 0;
|
||||
let animationTime = (animate & PopupAnimation.FULL) ? POPUP_ANIMATION_TIME : 0;
|
||||
|
||||
if (animate & PopupAnimation.FADE)
|
||||
this.opacity = 0;
|
||||
@@ -108,7 +108,7 @@ var BoxPointer = GObject.registerClass({
|
||||
this._muteInput = false;
|
||||
if (onComplete)
|
||||
onComplete();
|
||||
},
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -120,8 +120,8 @@ var BoxPointer = GObject.registerClass({
|
||||
let translationY = 0;
|
||||
let themeNode = this.get_theme_node();
|
||||
let rise = themeNode.get_length('-arrow-rise');
|
||||
let fade = animate & PopupAnimation.FADE;
|
||||
let animationTime = animate & PopupAnimation.FULL ? POPUP_ANIMATION_TIME : 0;
|
||||
let fade = (animate & PopupAnimation.FADE);
|
||||
let animationTime = (animate & PopupAnimation.FULL) ? POPUP_ANIMATION_TIME : 0;
|
||||
|
||||
if (animate & PopupAnimation.SLIDE) {
|
||||
switch (this._arrowSide) {
|
||||
@@ -156,7 +156,7 @@ var BoxPointer = GObject.registerClass({
|
||||
this.translation_y = 0;
|
||||
if (onComplete)
|
||||
onComplete();
|
||||
},
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -247,10 +247,11 @@ var BoxPointer = GObject.registerClass({
|
||||
let [absX, absY] = this.get_transformed_position();
|
||||
|
||||
if (this._arrowSide == St.Side.TOP ||
|
||||
this._arrowSide == St.Side.BOTTOM)
|
||||
this._arrowSide == St.Side.BOTTOM) {
|
||||
this._arrowOrigin = sourceX - absX + sourceWidth / 2;
|
||||
else
|
||||
} else {
|
||||
this._arrowOrigin = sourceY - absY + sourceHeight / 2;
|
||||
}
|
||||
}
|
||||
|
||||
let borderWidth = themeNode.get_length('-arrow-border-width');
|
||||
@@ -265,19 +266,20 @@ var BoxPointer = GObject.registerClass({
|
||||
|
||||
let [width, height] = area.get_surface_size();
|
||||
let [boxWidth, boxHeight] = [width, height];
|
||||
if (this._arrowSide == St.Side.TOP || this._arrowSide == St.Side.BOTTOM)
|
||||
if (this._arrowSide == St.Side.TOP || this._arrowSide == St.Side.BOTTOM) {
|
||||
boxHeight -= rise;
|
||||
else
|
||||
} else {
|
||||
boxWidth -= rise;
|
||||
|
||||
}
|
||||
let cr = area.get_context();
|
||||
|
||||
// Translate so that box goes from 0,0 to boxWidth,boxHeight,
|
||||
// with the arrow poking out of that
|
||||
if (this._arrowSide == St.Side.TOP)
|
||||
if (this._arrowSide == St.Side.TOP) {
|
||||
cr.translate(0, rise);
|
||||
else if (this._arrowSide == St.Side.LEFT)
|
||||
} else if (this._arrowSide == St.Side.LEFT) {
|
||||
cr.translate(rise, 0);
|
||||
}
|
||||
|
||||
let [x1, y1] = [halfBorder, halfBorder];
|
||||
let [x2, y2] = [boxWidth - halfBorder, boxHeight - halfBorder];
|
||||
@@ -473,7 +475,7 @@ var BoxPointer = GObject.registerClass({
|
||||
let borderWidth = themeNode.get_length('-arrow-border-width');
|
||||
let arrowBase = themeNode.get_length('-arrow-base');
|
||||
let borderRadius = themeNode.get_length('-arrow-border-radius');
|
||||
let margin = 4 * borderRadius + borderWidth + arrowBase;
|
||||
let margin = (4 * borderRadius + borderWidth + arrowBase);
|
||||
|
||||
let gap = themeNode.get_length('-boxpointer-gap');
|
||||
let padding = themeNode.get_length('-arrow-rise');
|
||||
@@ -524,11 +526,11 @@ var BoxPointer = GObject.registerClass({
|
||||
arrowOrigin = sourceCenterX - resX;
|
||||
if (arrowOrigin <= (x1 + (borderRadius + halfBase))) {
|
||||
if (arrowOrigin > x1)
|
||||
resX += arrowOrigin - x1;
|
||||
resX += (arrowOrigin - x1);
|
||||
arrowOrigin = x1;
|
||||
} else if (arrowOrigin >= (x2 - (borderRadius + halfBase))) {
|
||||
if (arrowOrigin < x2)
|
||||
resX -= x2 - arrowOrigin;
|
||||
resX -= (x2 - arrowOrigin);
|
||||
arrowOrigin = x2;
|
||||
}
|
||||
break;
|
||||
@@ -543,11 +545,11 @@ var BoxPointer = GObject.registerClass({
|
||||
arrowOrigin = sourceCenterY - resY;
|
||||
if (arrowOrigin <= (y1 + (borderRadius + halfBase))) {
|
||||
if (arrowOrigin > y1)
|
||||
resY += arrowOrigin - y1;
|
||||
resY += (arrowOrigin - y1);
|
||||
arrowOrigin = y1;
|
||||
} else if (arrowOrigin >= (y2 - (borderRadius + halfBase))) {
|
||||
if (arrowOrigin < y2)
|
||||
resX -= y2 - arrowOrigin;
|
||||
resX -= (y2 - arrowOrigin);
|
||||
arrowOrigin = y2;
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
|
||||
/* exported Calendar, CalendarMessageList, DBusEventSource */
|
||||
/* exported Calendar, CalendarMessageList */
|
||||
|
||||
const { Clutter, Gio, GLib, GObject, Shell, St } = imports.gi;
|
||||
const Signals = imports.signals;
|
||||
|
||||
const Main = imports.ui.main;
|
||||
const MessageList = imports.ui.messageList;
|
||||
@@ -20,7 +21,7 @@ var MESSAGE_ICON_SIZE = -1; // pick up from CSS
|
||||
var NC_ = (context, str) => `${context}\u0004${str}`;
|
||||
|
||||
function sameYear(dateA, dateB) {
|
||||
return dateA.getYear() == dateB.getYear();
|
||||
return (dateA.getYear() == dateB.getYear());
|
||||
}
|
||||
|
||||
function sameMonth(dateA, dateB) {
|
||||
@@ -78,7 +79,7 @@ function _getCalendarDayAbbreviation(dayNumber) {
|
||||
/* Translators: Calendar grid abbreviation for Friday */
|
||||
NC_("grid friday", "F"),
|
||||
/* Translators: Calendar grid abbreviation for Saturday */
|
||||
NC_("grid saturday", "S"),
|
||||
NC_("grid saturday", "S")
|
||||
];
|
||||
return Shell.util_translate_time_string(abbreviations[dayNumber]);
|
||||
}
|
||||
@@ -98,54 +99,17 @@ var CalendarEvent = class CalendarEvent {
|
||||
// Interface for appointments/events - e.g. the contents of a calendar
|
||||
//
|
||||
|
||||
var EventSourceBase = GObject.registerClass({
|
||||
GTypeFlags: GObject.TypeFlags.ABSTRACT,
|
||||
Properties: {
|
||||
'has-calendars': GObject.ParamSpec.boolean(
|
||||
'has-calendars', 'has-calendars', 'has-calendars',
|
||||
GObject.ParamFlags.READABLE,
|
||||
false),
|
||||
'is-loading': GObject.ParamSpec.boolean(
|
||||
'is-loading', 'is-loading', 'is-loading',
|
||||
GObject.ParamFlags.READABLE,
|
||||
false),
|
||||
},
|
||||
Signals: { 'changed': {} },
|
||||
}, class EventSourceBase extends GObject.Object {
|
||||
get isLoading() {
|
||||
throw new GObject.NotImplementedError(`isLoading in ${this.constructor.name}`);
|
||||
}
|
||||
|
||||
get hasCalendars() {
|
||||
throw new GObject.NotImplementedError(`hasCalendars in ${this.constructor.name}`);
|
||||
// First, an implementation with no events
|
||||
var EmptyEventSource = class EmptyEventSource {
|
||||
constructor() {
|
||||
this.isLoading = false;
|
||||
this.isDummy = true;
|
||||
this.hasCalendars = false;
|
||||
}
|
||||
|
||||
destroy() {
|
||||
}
|
||||
|
||||
requestRange(_begin, _end) {
|
||||
throw new GObject.NotImplementedError(`requestRange in ${this.constructor.name}`);
|
||||
}
|
||||
|
||||
getEvents(_begin, _end) {
|
||||
throw new GObject.NotImplementedError(`getEvents in ${this.constructor.name}`);
|
||||
}
|
||||
|
||||
hasEvents(_day) {
|
||||
throw new GObject.NotImplementedError(`hasEvents in ${this.constructor.name}`);
|
||||
}
|
||||
});
|
||||
|
||||
var EmptyEventSource = GObject.registerClass(
|
||||
class EmptyEventSource extends EventSourceBase {
|
||||
get isLoading() {
|
||||
return false;
|
||||
}
|
||||
|
||||
get hasCalendars() {
|
||||
return false;
|
||||
}
|
||||
|
||||
requestRange(_begin, _end) {
|
||||
}
|
||||
|
||||
@@ -157,7 +121,8 @@ class EmptyEventSource extends EventSourceBase {
|
||||
hasEvents(_day) {
|
||||
return false;
|
||||
}
|
||||
});
|
||||
};
|
||||
Signals.addSignalMethods(EmptyEventSource.prototype);
|
||||
|
||||
const CalendarServerIface = loadInterfaceXML('org.gnome.Shell.CalendarServer');
|
||||
|
||||
@@ -189,12 +154,11 @@ function _dateIntervalsOverlap(a0, a1, b0, b1) {
|
||||
}
|
||||
|
||||
// an implementation that reads data from a session bus service
|
||||
var DBusEventSource = GObject.registerClass(
|
||||
class DBusEventSource extends EventSourceBase {
|
||||
_init() {
|
||||
super._init();
|
||||
var DBusEventSource = class DBusEventSource {
|
||||
constructor() {
|
||||
this._resetCache();
|
||||
this._isLoading = false;
|
||||
this.isLoading = false;
|
||||
this.isDummy = false;
|
||||
|
||||
this._initialized = false;
|
||||
this._dbusProxy = new CalendarServer();
|
||||
@@ -229,12 +193,12 @@ class DBusEventSource extends EventSourceBase {
|
||||
});
|
||||
|
||||
this._dbusProxy.connect('g-properties-changed', () => {
|
||||
this.notify('has-calendars');
|
||||
this.emit('notify::has-calendars');
|
||||
});
|
||||
|
||||
this._initialized = loaded;
|
||||
if (loaded) {
|
||||
this.notify('has-calendars');
|
||||
this.emit('notify::has-calendars');
|
||||
this._onNameAppeared();
|
||||
}
|
||||
});
|
||||
@@ -251,10 +215,6 @@ class DBusEventSource extends EventSourceBase {
|
||||
return false;
|
||||
}
|
||||
|
||||
get isLoading() {
|
||||
return this._isLoading;
|
||||
}
|
||||
|
||||
_resetCache() {
|
||||
this._events = [];
|
||||
this._lastRequestBegin = null;
|
||||
@@ -292,7 +252,7 @@ class DBusEventSource extends EventSourceBase {
|
||||
newEvents.sort((ev1, ev2) => ev1.date.getTime() - ev2.date.getTime());
|
||||
|
||||
this._events = newEvents;
|
||||
this._isLoading = false;
|
||||
this.isLoading = false;
|
||||
this.emit('changed');
|
||||
}
|
||||
|
||||
@@ -312,7 +272,7 @@ class DBusEventSource extends EventSourceBase {
|
||||
|
||||
requestRange(begin, end) {
|
||||
if (!(_datesEqual(begin, this._lastRequestBegin) && _datesEqual(end, this._lastRequestEnd))) {
|
||||
this._isLoading = true;
|
||||
this.isLoading = true;
|
||||
this._lastRequestBegin = begin;
|
||||
this._lastRequestEnd = end;
|
||||
this._curRequestBegin = begin;
|
||||
@@ -326,8 +286,9 @@ class DBusEventSource extends EventSourceBase {
|
||||
for (let n = 0; n < this._events.length; n++) {
|
||||
let event = this._events[n];
|
||||
|
||||
if (_dateIntervalsOverlap(event.date, event.end, begin, end))
|
||||
if (_dateIntervalsOverlap (event.date, event.end, begin, end)) {
|
||||
result.push(event);
|
||||
}
|
||||
}
|
||||
result.sort((event1, event2) => {
|
||||
// sort events by end time on ending day
|
||||
@@ -349,10 +310,11 @@ class DBusEventSource extends EventSourceBase {
|
||||
|
||||
return true;
|
||||
}
|
||||
});
|
||||
};
|
||||
Signals.addSignalMethods(DBusEventSource.prototype);
|
||||
|
||||
var Calendar = GObject.registerClass({
|
||||
Signals: { 'selected-date-changed': { param_types: [GLib.DateTime.$gtype] } },
|
||||
Signals: { 'selected-date-changed': { param_types: [GLib.DateTime.$gtype] } }
|
||||
}, class Calendar extends St.Widget {
|
||||
_init() {
|
||||
this._weekStart = Shell.util_get_week_start();
|
||||
@@ -386,17 +348,16 @@ var Calendar = GObject.registerClass({
|
||||
|
||||
super._init({
|
||||
style_class: 'calendar',
|
||||
layout_manager: new Clutter.GridLayout(),
|
||||
reactive: true,
|
||||
layout_manager: new Clutter.TableLayout(),
|
||||
reactive: true
|
||||
});
|
||||
|
||||
this._buildHeader();
|
||||
this._buildHeader ();
|
||||
}
|
||||
|
||||
// @eventSource: is an object implementing the EventSource API, e.g. the
|
||||
// requestRange(), getEvents(), hasEvents() methods and the ::changed signal.
|
||||
setEventSource(eventSource) {
|
||||
if (!(eventSource instanceof EventSourceBase))
|
||||
throw new Error('Event source is not valid type');
|
||||
|
||||
this._eventSource = eventSource;
|
||||
this._eventSource.connect('changed', () => {
|
||||
this._rebuildCalendar();
|
||||
@@ -433,7 +394,8 @@ var Calendar = GObject.registerClass({
|
||||
|
||||
// Top line of the calendar '<| September 2009 |>'
|
||||
this._topBox = new St.BoxLayout();
|
||||
layout.attach(this._topBox, 0, 0, offsetCols + 7, 1);
|
||||
layout.pack(this._topBox, 0, 0);
|
||||
layout.set_span(this._topBox, offsetCols + 7, 1);
|
||||
|
||||
this._backButton = new St.Button({ style_class: 'calendar-change-month-back pager-button',
|
||||
accessible_name: _("Previous month"),
|
||||
@@ -442,13 +404,9 @@ var Calendar = GObject.registerClass({
|
||||
this._topBox.add(this._backButton);
|
||||
this._backButton.connect('clicked', this._onPrevMonthButtonClicked.bind(this));
|
||||
|
||||
this._monthLabel = new St.Label({
|
||||
style_class: 'calendar-month-label',
|
||||
can_focus: true,
|
||||
x_align: Clutter.ActorAlign.CENTER,
|
||||
x_expand: true,
|
||||
});
|
||||
this._topBox.add_child(this._monthLabel);
|
||||
this._monthLabel = new St.Label({ style_class: 'calendar-month-label',
|
||||
can_focus: true });
|
||||
this._topBox.add(this._monthLabel, { expand: true, x_fill: false, x_align: St.Align.MIDDLE });
|
||||
|
||||
this._forwardButton = new St.Button({ style_class: 'calendar-change-month-forward pager-button',
|
||||
accessible_name: _("Next month"),
|
||||
@@ -478,7 +436,7 @@ var Calendar = GObject.registerClass({
|
||||
col = 6 - (7 + iter.getDay() - this._weekStart) % 7;
|
||||
else
|
||||
col = offsetCols + (7 + iter.getDay() - this._weekStart) % 7;
|
||||
layout.attach(label, col, 1, 1, 1);
|
||||
layout.pack(label, col, 1);
|
||||
iter.setTime(iter.getTime() + MSECS_IN_DAY);
|
||||
}
|
||||
|
||||
@@ -605,7 +563,7 @@ var Calendar = GObject.registerClass({
|
||||
can_focus: true });
|
||||
let rtl = button.get_text_direction() == Clutter.TextDirection.RTL;
|
||||
|
||||
if (this._eventSource instanceof EmptyEventSource)
|
||||
if (this._eventSource.isDummy)
|
||||
button.reactive = false;
|
||||
|
||||
button._date = new Date(iter);
|
||||
@@ -649,7 +607,7 @@ var Calendar = GObject.registerClass({
|
||||
col = 6 - (7 + iter.getDay() - this._weekStart) % 7;
|
||||
else
|
||||
col = offsetCols + (7 + iter.getDay() - this._weekStart) % 7;
|
||||
layout.attach(button, col, row, 1, 1);
|
||||
layout.pack(button, col, row);
|
||||
|
||||
this._buttons.push(button);
|
||||
|
||||
@@ -659,7 +617,7 @@ var Calendar = GObject.registerClass({
|
||||
can_focus: true });
|
||||
let weekFormat = Shell.util_translate_time_string(N_("Week %V"));
|
||||
label.accessible_name = iter.toLocaleFormat(weekFormat);
|
||||
layout.attach(label, rtl ? 7 : 0, row, 1, 1);
|
||||
layout.pack(label, rtl ? 7 : 0, row);
|
||||
}
|
||||
|
||||
iter.setTime(iter.getTime() + MSECS_IN_DAY);
|
||||
@@ -712,15 +670,15 @@ class EventMessage extends MessageList.Message {
|
||||
|
||||
vfunc_style_changed() {
|
||||
let iconVisible = this.get_parent().has_style_pseudo_class('first-child');
|
||||
this._icon.opacity = iconVisible ? 255 : 0;
|
||||
this._icon.opacity = (iconVisible ? 255 : 0);
|
||||
super.vfunc_style_changed();
|
||||
}
|
||||
|
||||
_formatEventTime() {
|
||||
let periodBegin = _getBeginningOfDay(this._date);
|
||||
let periodEnd = _getEndOfDay(this._date);
|
||||
let allDay = this._event.allDay || (this._event.date <= periodBegin &&
|
||||
this._event.end >= periodEnd);
|
||||
let allDay = (this._event.allDay || (this._event.date <= periodBegin &&
|
||||
this._event.end >= periodEnd));
|
||||
let title;
|
||||
if (allDay) {
|
||||
/* Translators: Shown in calendar event list for all day events
|
||||
@@ -777,12 +735,11 @@ class NotificationMessage extends MessageList.Message {
|
||||
}
|
||||
|
||||
_getIcon() {
|
||||
if (this.notification.gicon) {
|
||||
if (this.notification.gicon)
|
||||
return new St.Icon({ gicon: this.notification.gicon,
|
||||
icon_size: MESSAGE_ICON_SIZE });
|
||||
} else {
|
||||
else
|
||||
return this.notification.source.createIcon(MESSAGE_ICON_SIZE);
|
||||
}
|
||||
}
|
||||
|
||||
_onUpdated(n, _clear) {
|
||||
@@ -829,8 +786,8 @@ class EventsSection extends MessageList.MessageListSection {
|
||||
|
||||
this._title = new St.Button({ style_class: 'events-section-title',
|
||||
label: '',
|
||||
x_align: St.Align.START,
|
||||
can_focus: true });
|
||||
this._title.child.x_align = Clutter.ActorAlign.START;
|
||||
this.insert_child_below(this._title, null);
|
||||
|
||||
this._title.connect('clicked', this._onTitleClicked.bind(this));
|
||||
@@ -842,9 +799,6 @@ class EventsSection extends MessageList.MessageListSection {
|
||||
}
|
||||
|
||||
setEventSource(eventSource) {
|
||||
if (!(eventSource instanceof EventSourceBase))
|
||||
throw new Error('Event source is not valid type');
|
||||
|
||||
this._eventSource = eventSource;
|
||||
this._eventSource.connect('changed', this._reloadEvents.bind(this));
|
||||
}
|
||||
@@ -861,15 +815,14 @@ class EventsSection extends MessageList.MessageListSection {
|
||||
|
||||
let dayFormat;
|
||||
let now = new Date();
|
||||
if (sameYear(this._date, now)) {
|
||||
if (sameYear(this._date, now))
|
||||
/* Translators: Shown on calendar heading when selected day occurs on current year */
|
||||
dayFormat = Shell.util_translate_time_string(NC_("calendar heading",
|
||||
"%A, %B %-d"));
|
||||
} else {
|
||||
else
|
||||
/* Translators: Shown on calendar heading when selected day occurs on different year */
|
||||
dayFormat = Shell.util_translate_time_string(NC_("calendar heading",
|
||||
"%A, %B %-d, %Y"));
|
||||
}
|
||||
this._title.label = this._date.toLocaleFormat(dayFormat);
|
||||
}
|
||||
|
||||
@@ -910,7 +863,7 @@ class EventsSection extends MessageList.MessageListSection {
|
||||
|
||||
_appInstalledChanged() {
|
||||
this._calendarApp = undefined;
|
||||
this._title.reactive = this._getCalendarApp() != null;
|
||||
this._title.reactive = (this._getCalendarApp() != null);
|
||||
}
|
||||
|
||||
_getCalendarApp() {
|
||||
@@ -962,7 +915,7 @@ class NotificationTimeLabel extends St.Label {
|
||||
super._init({
|
||||
style_class: 'event-time',
|
||||
x_align: Clutter.ActorAlign.START,
|
||||
y_align: Clutter.ActorAlign.END,
|
||||
y_align: Clutter.ActorAlign.END
|
||||
});
|
||||
this._datetime = datetime;
|
||||
}
|
||||
@@ -998,7 +951,7 @@ class NotificationSection extends MessageList.MessageListSection {
|
||||
notificationAddedId: 0,
|
||||
};
|
||||
|
||||
obj.destroyId = source.connect('destroy', () => {
|
||||
obj.destroyId = source.connect('destroy', source => {
|
||||
this._onSourceDestroy(source, obj);
|
||||
});
|
||||
obj.notificationAddedId = source.connect('notification-added',
|
||||
@@ -1109,7 +1062,7 @@ class CalendarMessageList extends St.Widget {
|
||||
style_class: 'message-list',
|
||||
layout_manager: new Clutter.BinLayout(),
|
||||
x_expand: true,
|
||||
y_expand: true,
|
||||
y_expand: true
|
||||
});
|
||||
|
||||
this._placeholder = new Placeholder();
|
||||
@@ -1119,20 +1072,17 @@ class CalendarMessageList extends St.Widget {
|
||||
x_expand: true, y_expand: true });
|
||||
this.add_actor(box);
|
||||
|
||||
this._scrollView = new St.ScrollView({
|
||||
style_class: 'vfade',
|
||||
overlay_scrollbars: true,
|
||||
x_expand: true, y_expand: true,
|
||||
});
|
||||
this._scrollView = new St.ScrollView({ style_class: 'vfade',
|
||||
overlay_scrollbars: true,
|
||||
x_expand: true, y_expand: true,
|
||||
x_fill: true, y_fill: true });
|
||||
this._scrollView.set_policy(St.PolicyType.NEVER, St.PolicyType.AUTOMATIC);
|
||||
box.add_actor(this._scrollView);
|
||||
|
||||
this._clearButton = new St.Button({
|
||||
style_class: 'message-list-clear-button button',
|
||||
label: _('Clear'),
|
||||
can_focus: true,
|
||||
x_align: Clutter.ActorAlign.END,
|
||||
});
|
||||
this._clearButton = new St.Button({ style_class: 'message-list-clear-button button',
|
||||
label: _("Clear"),
|
||||
can_focus: true });
|
||||
this._clearButton.set_x_align(Clutter.ActorAlign.END);
|
||||
this._clearButton.connect('clicked', () => {
|
||||
this._sectionList.get_children().forEach(s => s.clear());
|
||||
});
|
||||
@@ -1144,7 +1094,6 @@ class CalendarMessageList extends St.Widget {
|
||||
|
||||
this._sectionList = new St.BoxLayout({ style_class: 'message-list-sections',
|
||||
vertical: true,
|
||||
x_expand: true,
|
||||
y_expand: true,
|
||||
y_align: Clutter.ActorAlign.START });
|
||||
this._sectionList.connect('actor-added', this._sync.bind(this));
|
||||
@@ -1174,7 +1123,7 @@ class CalendarMessageList extends St.Widget {
|
||||
Util.ensureActorVisibleInScrollView(this._scrollView, messageActor);
|
||||
}));
|
||||
|
||||
connectionsIds.push(section.connect('destroy', () => {
|
||||
connectionsIds.push(section.connect('destroy', (section) => {
|
||||
connectionsIds.forEach(id => section.disconnect(id));
|
||||
this._sectionList.remove_actor(section);
|
||||
}));
|
||||
|
||||
@@ -4,19 +4,19 @@ const { Clutter, GObject, Pango, St } = imports.gi;
|
||||
var CheckBox = GObject.registerClass(
|
||||
class CheckBox extends St.Button {
|
||||
_init(label) {
|
||||
let container = new St.BoxLayout({
|
||||
x_expand: true,
|
||||
y_expand: true,
|
||||
});
|
||||
let container = new St.BoxLayout();
|
||||
super._init({
|
||||
style_class: 'check-box',
|
||||
child: container,
|
||||
button_mask: St.ButtonMask.ONE,
|
||||
toggle_mode: true,
|
||||
can_focus: true,
|
||||
x_fill: true,
|
||||
y_fill: true
|
||||
});
|
||||
|
||||
this._box = new St.Bin({ y_align: Clutter.ActorAlign.START });
|
||||
this._box = new St.Bin();
|
||||
this._box.set_y_align(Clutter.ActorAlign.START);
|
||||
container.add_actor(this._box);
|
||||
|
||||
this._label = new St.Label();
|
||||
|
||||
@@ -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;
|
||||
@@ -13,7 +13,7 @@ var ALIVE_TIMEOUT = 5000;
|
||||
var CloseDialog = GObject.registerClass({
|
||||
Implements: [Meta.CloseDialog],
|
||||
Properties: {
|
||||
'window': GObject.ParamSpec.override('window', Meta.CloseDialog),
|
||||
'window': GObject.ParamSpec.override('window', Meta.CloseDialog)
|
||||
},
|
||||
}, class CloseDialog extends GObject.Object {
|
||||
_init(window) {
|
||||
@@ -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;
|
||||
@@ -73,14 +61,9 @@ var CloseDialog = GObject.registerClass({
|
||||
default: true });
|
||||
this._dialog.addButton({ label: _('Wait'),
|
||||
action: this._onWait.bind(this),
|
||||
key: Clutter.KEY_Escape });
|
||||
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() {
|
||||
@@ -124,12 +107,11 @@ var CloseDialog = GObject.registerClass({
|
||||
if (this._tracked === shouldTrack)
|
||||
return;
|
||||
|
||||
if (shouldTrack) {
|
||||
if (shouldTrack)
|
||||
Main.layoutManager.trackChrome(this._dialog,
|
||||
{ affectsInputRegion: true });
|
||||
} else {
|
||||
else
|
||||
Main.layoutManager.untrackChrome(this._dialog);
|
||||
}
|
||||
|
||||
// The buttons are broken when they aren't added to the input region,
|
||||
// so disable them properly in that case
|
||||
@@ -163,14 +145,14 @@ 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,
|
||||
onComplete: this._onFocusChanged.bind(this),
|
||||
onComplete: this._onFocusChanged.bind(this)
|
||||
});
|
||||
}
|
||||
|
||||
@@ -193,11 +175,11 @@ 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,
|
||||
onComplete: () => dialog.destroy(),
|
||||
onComplete: () => dialog.destroy()
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -58,8 +58,9 @@ var AutomountManager = class {
|
||||
_InhibitorsChanged(_object, _senderName, [_inhibitor]) {
|
||||
this._session.IsInhibitedRemote(GNOME_SESSION_AUTOMOUNT_INHIBIT,
|
||||
(result, error) => {
|
||||
if (!error)
|
||||
if (!error) {
|
||||
this._inhibited = result[0];
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -109,7 +110,7 @@ var AutomountManager = class {
|
||||
// mount operation object
|
||||
if (drive.can_stop()) {
|
||||
drive.stop(Gio.MountUnmountFlags.FORCE, null, null,
|
||||
(o, res) => {
|
||||
(drive, res) => {
|
||||
try {
|
||||
drive.stop_finish(res);
|
||||
} catch (e) {
|
||||
@@ -118,7 +119,7 @@ var AutomountManager = class {
|
||||
});
|
||||
} else if (drive.can_eject()) {
|
||||
drive.eject_with_operation(Gio.MountUnmountFlags.FORCE, null, null,
|
||||
(o, res) => {
|
||||
(drive, res) => {
|
||||
try {
|
||||
drive.eject_with_operation_finish(res);
|
||||
} catch (e) {
|
||||
@@ -222,7 +223,7 @@ var AutomountManager = class {
|
||||
delete volume._allowAutorunExpireId;
|
||||
}
|
||||
this._volumeQueue =
|
||||
this._volumeQueue.filter(element => element != volume);
|
||||
this._volumeQueue.filter(element => (element != volume));
|
||||
}
|
||||
|
||||
_reaskPassword(volume) {
|
||||
@@ -230,7 +231,7 @@ var AutomountManager = class {
|
||||
let existingDialog = prevOperation ? prevOperation.borrowDialog() : null;
|
||||
let operation =
|
||||
new ShellMountOperation.ShellMountOperation(volume,
|
||||
{ existingDialog });
|
||||
{ existingDialog: existingDialog });
|
||||
this._mountVolume(volume, operation);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
|
||||
/* exported Component */
|
||||
|
||||
const { Clutter, Gio, GObject, St } = imports.gi;
|
||||
const { Gio, GObject, St } = imports.gi;
|
||||
|
||||
const GnomeSession = imports.misc.gnomeSession;
|
||||
const Main = imports.ui.main;
|
||||
@@ -20,7 +20,7 @@ var AutorunSetting = {
|
||||
RUN: 0,
|
||||
IGNORE: 1,
|
||||
FILES: 2,
|
||||
ASK: 3,
|
||||
ASK: 3
|
||||
};
|
||||
|
||||
// misc utils
|
||||
@@ -41,7 +41,7 @@ function isMountRootHidden(root) {
|
||||
let path = root.get_path();
|
||||
|
||||
// skip any mounts in hidden directory hierarchies
|
||||
return path.includes('/.');
|
||||
return (path.includes('/.'));
|
||||
}
|
||||
|
||||
function isMountNonLocal(mount) {
|
||||
@@ -52,7 +52,7 @@ function isMountNonLocal(mount) {
|
||||
if (volume == null)
|
||||
return true;
|
||||
|
||||
return volume.get_identifier("class") == "network";
|
||||
return (volume.get_identifier("class") == "network");
|
||||
}
|
||||
|
||||
function startAppForMount(app, mount) {
|
||||
@@ -115,8 +115,7 @@ var ContentTypeDiscoverer = class {
|
||||
|
||||
let hotplugSniffer = new HotplugSniffer();
|
||||
hotplugSniffer.SniffURIRemote(root.get_uri(),
|
||||
result => {
|
||||
[contentTypes] = result;
|
||||
([contentTypes]) => {
|
||||
this._emitCallback(mount, contentTypes);
|
||||
});
|
||||
}
|
||||
@@ -125,7 +124,7 @@ var ContentTypeDiscoverer = class {
|
||||
_emitCallback(mount, contentTypes = []) {
|
||||
// we're not interested in win32 software content types here
|
||||
contentTypes = contentTypes.filter(
|
||||
type => type != 'x-content/win32-software'
|
||||
type => (type != 'x-content/win32-software')
|
||||
);
|
||||
|
||||
let apps = [];
|
||||
@@ -167,7 +166,7 @@ var AutorunManager = class {
|
||||
if (!this._session.SessionIsActive)
|
||||
return;
|
||||
|
||||
let discoverer = new ContentTypeDiscoverer((m, apps, contentTypes) => {
|
||||
let discoverer = new ContentTypeDiscoverer((mount, apps, contentTypes) => {
|
||||
this._dispatcher.addMount(mount, apps, contentTypes);
|
||||
});
|
||||
discoverer.guessContentTypes(mount);
|
||||
@@ -202,7 +201,7 @@ var AutorunDispatcher = class {
|
||||
}
|
||||
|
||||
_getSourceForMount(mount) {
|
||||
let filtered = this._sources.filter(source => source.mount == mount);
|
||||
let filtered = this._sources.filter(source => (source.mount == mount));
|
||||
|
||||
// we always make sure not to add two sources for the same
|
||||
// mount in addMount(), so it's safe to assume filtered.length
|
||||
@@ -246,10 +245,11 @@ var AutorunDispatcher = class {
|
||||
let success = false;
|
||||
let app = null;
|
||||
|
||||
if (setting == AutorunSetting.RUN)
|
||||
if (setting == AutorunSetting.RUN) {
|
||||
app = Gio.app_info_get_default_for_type(contentTypes[0], false);
|
||||
else if (setting == AutorunSetting.FILES)
|
||||
} else if (setting == AutorunSetting.FILES) {
|
||||
app = Gio.app_info_get_default_for_type('inode/directory', false);
|
||||
}
|
||||
|
||||
if (app)
|
||||
success = startAppForMount(app, mount);
|
||||
@@ -320,23 +320,20 @@ class AutorunNotification extends MessageTray.Notification {
|
||||
}
|
||||
|
||||
_buttonForApp(app) {
|
||||
let box = new St.BoxLayout({
|
||||
x_expand: true,
|
||||
x_align: Clutter.ActorAlign.START,
|
||||
});
|
||||
let box = new St.BoxLayout();
|
||||
let icon = new St.Icon({ gicon: app.get_icon(),
|
||||
style_class: 'hotplug-notification-item-icon' });
|
||||
box.add(icon);
|
||||
|
||||
let label = new St.Bin({
|
||||
child: new St.Label({
|
||||
text: _("Open with %s").format(app.get_name()),
|
||||
y_align: Clutter.ActorAlign.CENTER,
|
||||
}),
|
||||
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,
|
||||
x_fill: true,
|
||||
x_align: St.Align.START,
|
||||
x_expand: true,
|
||||
button_mask: St.ButtonMask.ONE,
|
||||
style_class: 'hotplug-notification-item button' });
|
||||
|
||||
@@ -33,7 +33,7 @@ class KeyringDialog extends ModalDialog.ModalDialog {
|
||||
|
||||
this._cancelButton = this.addButton({ label: '',
|
||||
action: this._onCancelButton.bind(this),
|
||||
key: Clutter.KEY_Escape });
|
||||
key: Clutter.Escape });
|
||||
this._continueButton = this.addButton({ label: '',
|
||||
action: this._onContinueButton.bind(this),
|
||||
default: true });
|
||||
@@ -54,12 +54,8 @@ class KeyringDialog extends ModalDialog.ModalDialog {
|
||||
|
||||
_buildControlTable() {
|
||||
let layout = new Clutter.GridLayout({ orientation: Clutter.Orientation.VERTICAL });
|
||||
let table = new St.Widget({
|
||||
style_class: 'keyring-dialog-control-table',
|
||||
layout_manager: layout,
|
||||
x_expand: true,
|
||||
y_expand: true,
|
||||
});
|
||||
let table = new St.Widget({ style_class: 'keyring-dialog-control-table',
|
||||
layout_manager: layout });
|
||||
layout.hookup_style(table);
|
||||
let rtl = table.get_text_direction() == Clutter.TextDirection.RTL;
|
||||
let row = 0;
|
||||
@@ -78,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, 0, row, 1, 1);
|
||||
@@ -98,9 +92,9 @@ class KeyringDialog extends ModalDialog.ModalDialog {
|
||||
}
|
||||
|
||||
if (this.prompt.confirm_visible) {
|
||||
var label = new St.Label({ style_class: 'prompt-dialog-password-label',
|
||||
x_align: Clutter.ActorAlign.START,
|
||||
y_align: Clutter.ActorAlign.CENTER });
|
||||
var label = new St.Label(({ style_class: 'prompt-dialog-password-label',
|
||||
x_align: Clutter.ActorAlign.START,
|
||||
y_align: Clutter.ActorAlign.CENTER }));
|
||||
label.set_text(_("Type again:"));
|
||||
this._confirmEntry = new St.Entry({ style_class: 'prompt-dialog-password-entry',
|
||||
text: '',
|
||||
@@ -146,7 +140,7 @@ class KeyringDialog extends ModalDialog.ModalDialog {
|
||||
}
|
||||
|
||||
this._controlTable = table;
|
||||
this._content.messageBox.add_child(table);
|
||||
this._content.messageBox.add(table, { x_fill: true, y_fill: true });
|
||||
}
|
||||
|
||||
_updateSensitivity(sensitive) {
|
||||
@@ -234,11 +228,10 @@ var KeyringDummyDialog = class {
|
||||
}
|
||||
};
|
||||
|
||||
var KeyringPrompter = GObject.registerClass(
|
||||
class KeyringPrompter extends Gcr.SystemPrompter {
|
||||
_init() {
|
||||
super._init();
|
||||
this.connect('new-prompt', () => {
|
||||
var KeyringPrompter = class {
|
||||
constructor() {
|
||||
this._prompter = new Gcr.SystemPrompter();
|
||||
this._prompter.connect('new-prompt', () => {
|
||||
let dialog = this._enabled
|
||||
? new KeyringDialog()
|
||||
: new KeyringDummyDialog();
|
||||
@@ -253,7 +246,7 @@ class KeyringPrompter extends Gcr.SystemPrompter {
|
||||
|
||||
enable() {
|
||||
if (!this._registered) {
|
||||
this.register(Gio.DBus.session);
|
||||
this._prompter.register(Gio.DBus.session);
|
||||
this._dbusId = Gio.DBus.session.own_name('org.gnome.keyring.SystemPrompter',
|
||||
Gio.BusNameOwnerFlags.ALLOW_REPLACEMENT, null, null);
|
||||
this._registered = true;
|
||||
@@ -264,10 +257,10 @@ class KeyringPrompter extends Gcr.SystemPrompter {
|
||||
disable() {
|
||||
this._enabled = false;
|
||||
|
||||
if (this.prompting)
|
||||
if (this._prompter.prompting)
|
||||
this._currentPrompt.cancel();
|
||||
this._currentPrompt = null;
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
var Component = KeyringPrompter;
|
||||
|
||||
@@ -56,7 +56,7 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog {
|
||||
|
||||
secret.entry = new St.Entry({ style_class: 'prompt-dialog-password-entry',
|
||||
text: secret.value, can_focus: reactive,
|
||||
reactive,
|
||||
reactive: reactive,
|
||||
x_expand: true });
|
||||
ShellEntry.addContextMenu(secret.entry,
|
||||
{ isPassword: secret.password });
|
||||
@@ -106,7 +106,10 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog {
|
||||
descriptionLabel.clutter_text.line_wrap = true;
|
||||
descriptionLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
|
||||
|
||||
contentBox.messageBox.add_child(descriptionLabel);
|
||||
contentBox.messageBox.add(descriptionLabel,
|
||||
{ y_fill: true,
|
||||
y_align: St.Align.START,
|
||||
expand: true });
|
||||
}
|
||||
|
||||
this._okButton = {
|
||||
@@ -169,7 +172,7 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog {
|
||||
return true;
|
||||
}
|
||||
|
||||
return value.length >= 8 && value.length <= 63;
|
||||
return (value.length >= 8 && value.length <= 63);
|
||||
}
|
||||
|
||||
_validateStaticWep(secret) {
|
||||
@@ -222,12 +225,11 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog {
|
||||
validate: this._validateStaticWep, password: true });
|
||||
break;
|
||||
case 'ieee8021x':
|
||||
if (wirelessSecuritySetting.auth_alg == 'leap') { // Cisco LEAP
|
||||
if (wirelessSecuritySetting.auth_alg == 'leap') // Cisco LEAP
|
||||
secrets.push({ label: _("Password: "), key: 'leap-password',
|
||||
value: wirelessSecuritySetting.leap_password || '', password: true });
|
||||
} else { // Dynamic (IEEE 802.1x) WEP
|
||||
else // Dynamic (IEEE 802.1x) WEP
|
||||
this._get8021xSecrets(secrets);
|
||||
}
|
||||
break;
|
||||
case 'wpa-eap':
|
||||
this._get8021xSecrets(secrets);
|
||||
@@ -242,18 +244,15 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog {
|
||||
|
||||
/* If hints were given we know exactly what we need to ask */
|
||||
if (this._settingName == "802-1x" && this._hints.length) {
|
||||
if (this._hints.includes('identity')) {
|
||||
if (this._hints.includes('identity'))
|
||||
secrets.push({ label: _("Username: "), key: 'identity',
|
||||
value: ieee8021xSetting.identity || '', password: false });
|
||||
}
|
||||
if (this._hints.includes('password')) {
|
||||
if (this._hints.includes('password'))
|
||||
secrets.push({ label: _("Password: "), key: 'password',
|
||||
value: ieee8021xSetting.password || '', password: true });
|
||||
}
|
||||
if (this._hints.includes('private-key-password')) {
|
||||
if (this._hints.includes('private-key-password'))
|
||||
secrets.push({ label: _("Private key password: "), key: 'private-key-password',
|
||||
value: ieee8021xSetting.private_key_password || '', password: true });
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -557,7 +556,7 @@ var VPNRequestHandler = class {
|
||||
contentOverride.secrets.push({
|
||||
label: keyfile.get_string(groups[i], 'Label'),
|
||||
key: groups[i],
|
||||
value,
|
||||
value: value,
|
||||
password: keyfile.get_boolean(groups[i], 'IsSecret'),
|
||||
});
|
||||
} else {
|
||||
|
||||
@@ -11,19 +11,12 @@ 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;
|
||||
|
||||
const DELAYED_RESET_TIMEOUT = 200;
|
||||
|
||||
var AuthenticationDialog = GObject.registerClass({
|
||||
Signals: { 'done': { param_types: [GObject.TYPE_BOOLEAN] } },
|
||||
Signals: { 'done': { param_types: [GObject.TYPE_BOOLEAN] } }
|
||||
}, class AuthenticationDialog extends ModalDialog.ModalDialog {
|
||||
_init(actionId, body, cookie, userNames) {
|
||||
super._init({ styleClass: 'prompt-dialog' });
|
||||
@@ -31,6 +24,7 @@ var AuthenticationDialog = GObject.registerClass({
|
||||
this.actionId = actionId;
|
||||
this.message = body;
|
||||
this.userNames = userNames;
|
||||
this._wasDismissed = false;
|
||||
|
||||
this._sessionUpdatedId = Main.sessionMode.connect('updated', () => {
|
||||
this.visible = !Main.sessionMode.isLocked;
|
||||
@@ -57,63 +51,70 @@ 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',
|
||||
});
|
||||
userBox.add_child(this._userAvatar);
|
||||
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.hide();
|
||||
userBox.add(this._userAvatar,
|
||||
{ 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);
|
||||
this._passwordLabel = new St.Label({
|
||||
style_class: 'prompt-dialog-password-label',
|
||||
y_align: Clutter.ActorAlign.CENTER,
|
||||
});
|
||||
this._passwordBox.add_child(this._passwordLabel);
|
||||
this._passwordEntry = new St.Entry({
|
||||
style_class: 'prompt-dialog-password-entry',
|
||||
text: "",
|
||||
can_focus: true,
|
||||
x_expand: true,
|
||||
});
|
||||
this._passwordLabel = new St.Label(({ style_class: 'prompt-dialog-password-label' }));
|
||||
this._passwordBox.add(this._passwordLabel, { y_fill: false, y_align: St.Align.MIDDLE });
|
||||
this._passwordEntry = new St.Entry({ style_class: 'prompt-dialog-password-entry',
|
||||
text: "",
|
||||
can_focus: true });
|
||||
ShellEntry.addContextMenu(this._passwordEntry, { isPassword: true });
|
||||
this._passwordEntry.clutter_text.connect('activate', this._onEntryActivate.bind(this));
|
||||
this._passwordEntry.bind_property('reactive',
|
||||
this._passwordEntry.clutter_text, 'editable',
|
||||
GObject.BindingFlags.SYNC_CREATE);
|
||||
this._passwordBox.add_child(this._passwordEntry);
|
||||
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);
|
||||
|
||||
this.setInitialKeyFocus(this._passwordEntry);
|
||||
this._passwordBox.hide();
|
||||
|
||||
this._errorMessageLabel = new St.Label({ style_class: 'prompt-dialog-error-label' });
|
||||
this._errorMessageLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
|
||||
this._errorMessageLabel.clutter_text.line_wrap = true;
|
||||
content.messageBox.add_child(this._errorMessageLabel);
|
||||
content.messageBox.add(this._errorMessageLabel, { x_fill: false, x_align: St.Align.START });
|
||||
this._errorMessageLabel.hide();
|
||||
|
||||
this._infoMessageLabel = new St.Label({ style_class: 'prompt-dialog-info-label' });
|
||||
@@ -136,30 +137,15 @@ var AuthenticationDialog = GObject.registerClass({
|
||||
|
||||
this._cancelButton = this.addButton({ label: _("Cancel"),
|
||||
action: this.cancel.bind(this),
|
||||
key: Clutter.KEY_Escape });
|
||||
key: Clutter.Escape });
|
||||
this._okButton = this.addButton({ label: _("Authenticate"),
|
||||
action: this._onAuthenticateButtonPressed.bind(this),
|
||||
reactive: false });
|
||||
this._okButton.bind_property('reactive',
|
||||
this._okButton, 'can-focus',
|
||||
GObject.BindingFlags.SYNC_CREATE);
|
||||
|
||||
this._passwordEntry.clutter_text.connect('text-changed', text => {
|
||||
this._okButton.reactive = text.get_text().length > 0;
|
||||
});
|
||||
default: true });
|
||||
|
||||
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) {
|
||||
@@ -169,9 +155,8 @@ var AuthenticationDialog = GObject.registerClass({
|
||||
this._workSpinner.stop();
|
||||
}
|
||||
|
||||
_initiateSession() {
|
||||
this._destroySession(DELAYED_RESET_TIMEOUT);
|
||||
|
||||
performAuthentication() {
|
||||
this._destroySession();
|
||||
this._session = new PolkitAgent.Session({ identity: this._identityToAuth,
|
||||
cookie: this._cookie });
|
||||
this._sessionCompletedId = this._session.connect('completed', this._onSessionCompleted.bind(this));
|
||||
@@ -210,15 +195,18 @@ var AuthenticationDialog = GObject.registerClass({
|
||||
}
|
||||
}
|
||||
|
||||
_updateSensitivity(sensitive) {
|
||||
this._passwordEntry.reactive = sensitive;
|
||||
this._passwordEntry.clutter_text.editable = sensitive;
|
||||
|
||||
this._okButton.can_focus = sensitive;
|
||||
this._okButton.reactive = sensitive;
|
||||
this._setWorking(!sensitive);
|
||||
}
|
||||
|
||||
_onEntryActivate() {
|
||||
let response = this._passwordEntry.get_text();
|
||||
if (response.length === 0)
|
||||
return;
|
||||
|
||||
this._passwordEntry.reactive = false;
|
||||
this._okButton.reactive = false;
|
||||
this._setWorking(true);
|
||||
|
||||
this._updateSensitivity(false);
|
||||
this._session.response(response);
|
||||
// When the user responds, dismiss already shown info and
|
||||
// error texts (if any)
|
||||
@@ -228,10 +216,7 @@ var AuthenticationDialog = GObject.registerClass({
|
||||
}
|
||||
|
||||
_onAuthenticateButtonPressed() {
|
||||
if (this._mode === DialogMode.CONFIRM)
|
||||
this._initiateSession();
|
||||
else
|
||||
this._onEntryActivate();
|
||||
this._onEntryActivate();
|
||||
}
|
||||
|
||||
_onSessionCompleted(session, gainedAuthorization) {
|
||||
@@ -250,7 +235,7 @@ var AuthenticationDialog = GObject.registerClass({
|
||||
* error providing authentication-method specific information),
|
||||
* show "Sorry, that didn't work. Please try again."
|
||||
*/
|
||||
if (!this._errorMessageLabel.visible) {
|
||||
if (!this._errorMessageLabel.visible && !this._wasDismissed) {
|
||||
/* Translators: "that didn't work" refers to the fact that the
|
||||
* requested authentication was not gained; this can happen
|
||||
* because of an authentication error (like invalid password),
|
||||
@@ -262,16 +247,11 @@ var AuthenticationDialog = GObject.registerClass({
|
||||
}
|
||||
|
||||
/* Try and authenticate again */
|
||||
this._initiateSession();
|
||||
this.performAuthentication();
|
||||
}
|
||||
}
|
||||
|
||||
_onSessionRequest(session, request, echoOn) {
|
||||
if (this._sessionRequestTimeoutId) {
|
||||
GLib.source_remove(this._sessionRequestTimeoutId);
|
||||
this._sessionRequestTimeoutId = 0;
|
||||
}
|
||||
|
||||
// Cheap localization trick
|
||||
if (request == 'Password:' || request == 'Password: ')
|
||||
this._passwordLabel.set_text(_("Password:"));
|
||||
@@ -285,12 +265,9 @@ var AuthenticationDialog = GObject.registerClass({
|
||||
|
||||
this._passwordBox.show();
|
||||
this._passwordEntry.set_text('');
|
||||
this._passwordEntry.reactive = true;
|
||||
this._okButton.reactive = false;
|
||||
this._setWorking(false);
|
||||
|
||||
this._ensureOpen();
|
||||
this._passwordEntry.grab_key_focus();
|
||||
this._updateSensitivity(true);
|
||||
this._ensureOpen();
|
||||
}
|
||||
|
||||
_onSessionShowError(session, text) {
|
||||
@@ -311,78 +288,29 @@ var AuthenticationDialog = GObject.registerClass({
|
||||
this._ensureOpen();
|
||||
}
|
||||
|
||||
_destroySession(delay = 0) {
|
||||
_destroySession() {
|
||||
if (this._session) {
|
||||
if (!this._completed)
|
||||
this._session.cancel();
|
||||
this._completed = false;
|
||||
|
||||
this._session.disconnect(this._sessionCompletedId);
|
||||
this._session.disconnect(this._sessionRequestId);
|
||||
this._session.disconnect(this._sessionShowErrorId);
|
||||
this._session.disconnect(this._sessionShowInfoId);
|
||||
|
||||
if (!this._completed)
|
||||
this._session.cancel();
|
||||
|
||||
this._completed = false;
|
||||
this._session = null;
|
||||
}
|
||||
|
||||
if (this._sessionRequestTimeoutId) {
|
||||
GLib.source_remove(this._sessionRequestTimeoutId);
|
||||
this._sessionRequestTimeoutId = 0;
|
||||
}
|
||||
|
||||
let resetDialog = () => {
|
||||
if (this.state != ModalDialog.State.OPENED)
|
||||
return;
|
||||
|
||||
this._passwordBox.hide();
|
||||
this._cancelButton.grab_key_focus();
|
||||
this._okButton.reactive = false;
|
||||
};
|
||||
|
||||
if (delay) {
|
||||
this._sessionRequestTimeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, delay, resetDialog);
|
||||
GLib.Source.set_name_by_id(this._sessionRequestTimeoutId, '[gnome-shell] this._sessionRequestTimeoutId');
|
||||
} else {
|
||||
resetDialog();
|
||||
}
|
||||
}
|
||||
|
||||
_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);
|
||||
|
||||
this._userAvatar.update();
|
||||
|
||||
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();
|
||||
if (this._user.is_loaded && this._userAvatar) {
|
||||
this._userAvatar.update();
|
||||
this._userAvatar.show();
|
||||
}
|
||||
}
|
||||
|
||||
cancel() {
|
||||
this._wasDismissed = true;
|
||||
this.close(global.get_current_time());
|
||||
this._emitDone(true);
|
||||
}
|
||||
@@ -390,10 +318,7 @@ var AuthenticationDialog = GObject.registerClass({
|
||||
_onDialogClosed() {
|
||||
if (this._sessionUpdatedId)
|
||||
Main.sessionMode.disconnect(this._sessionUpdatedId);
|
||||
|
||||
if (this._sessionRequestTimeoutId)
|
||||
GLib.source_remove(this._sessionRequestTimeoutId);
|
||||
this._sessionRequestTimeoutId = 0;
|
||||
this._sessionUpdatedId = 0;
|
||||
|
||||
if (this._user) {
|
||||
this._user.disconnect(this._userLoadedId);
|
||||
@@ -405,20 +330,19 @@ var AuthenticationDialog = GObject.registerClass({
|
||||
}
|
||||
});
|
||||
|
||||
var AuthenticationAgent = GObject.registerClass(
|
||||
class AuthenticationAgent extends Shell.PolkitAuthenticationAgent {
|
||||
_init() {
|
||||
super._init();
|
||||
|
||||
var AuthenticationAgent = class {
|
||||
constructor() {
|
||||
this._currentDialog = null;
|
||||
this.connect('initiate', this._onInitiate.bind(this));
|
||||
this.connect('cancel', this._onCancel.bind(this));
|
||||
this._handle = null;
|
||||
this._native = new Shell.PolkitAuthenticationAgent();
|
||||
this._native.connect('initiate', this._onInitiate.bind(this));
|
||||
this._native.connect('cancel', this._onCancel.bind(this));
|
||||
this._sessionUpdatedId = 0;
|
||||
}
|
||||
|
||||
enable() {
|
||||
try {
|
||||
this.register();
|
||||
this._native.register();
|
||||
} catch (e) {
|
||||
log('Failed to register AuthenticationAgent');
|
||||
}
|
||||
@@ -426,7 +350,7 @@ class AuthenticationAgent extends Shell.PolkitAuthenticationAgent {
|
||||
|
||||
disable() {
|
||||
try {
|
||||
this.unregister();
|
||||
this._native.unregister();
|
||||
} catch (e) {
|
||||
log('Failed to unregister AuthenticationAgent');
|
||||
}
|
||||
@@ -445,7 +369,19 @@ class AuthenticationAgent extends Shell.PolkitAuthenticationAgent {
|
||||
}
|
||||
|
||||
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) {
|
||||
@@ -464,8 +400,8 @@ class AuthenticationAgent extends Shell.PolkitAuthenticationAgent {
|
||||
Main.sessionMode.disconnect(this._sessionUpdatedId);
|
||||
this._sessionUpdatedId = 0;
|
||||
|
||||
this.complete(dismissed);
|
||||
this._native.complete(dismissed);
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
var Component = AuthenticationAgent;
|
||||
|
||||
@@ -19,7 +19,7 @@ const MessageTray = imports.ui.messageTray;
|
||||
const Params = imports.misc.params;
|
||||
const Util = imports.misc.util;
|
||||
|
||||
const HAVE_TP = Tp != null && Tpl != null;
|
||||
const HAVE_TP = (Tp != null && Tpl != null);
|
||||
|
||||
// See Notification.appendMessage
|
||||
var SCROLLBACK_IMMEDIATE_TIME = 3 * 60; // 3 minutes
|
||||
@@ -37,7 +37,7 @@ var CHAT_EXPAND_LINES = 12;
|
||||
|
||||
var NotificationDirection = {
|
||||
SENT: 'chat-sent',
|
||||
RECEIVED: 'chat-received',
|
||||
RECEIVED: 'chat-received'
|
||||
};
|
||||
|
||||
function makeMessageFromTpMessage(tpMessage, direction) {
|
||||
@@ -49,10 +49,10 @@ function makeMessageFromTpMessage(tpMessage, direction) {
|
||||
|
||||
return {
|
||||
messageType: tpMessage.get_message_type(),
|
||||
text,
|
||||
text: text,
|
||||
sender: tpMessage.sender.alias,
|
||||
timestamp,
|
||||
direction,
|
||||
timestamp: timestamp,
|
||||
direction: direction
|
||||
};
|
||||
}
|
||||
|
||||
@@ -66,7 +66,7 @@ function makeMessageFromTplEvent(event) {
|
||||
text: event.get_message(),
|
||||
sender: event.get_sender().get_alias(),
|
||||
timestamp: event.get_timestamp(),
|
||||
direction,
|
||||
direction: direction
|
||||
};
|
||||
}
|
||||
|
||||
@@ -158,7 +158,7 @@ class TelepathyClient extends Tp.BaseClient {
|
||||
continue;
|
||||
|
||||
/* Only observe contact text channels */
|
||||
if (!(channel instanceof Tp.TextChannel) ||
|
||||
if ((!(channel instanceof Tp.TextChannel)) ||
|
||||
targetHandleType != Tp.HandleType.CONTACT)
|
||||
continue;
|
||||
|
||||
@@ -231,12 +231,11 @@ class TelepathyClient extends Tp.BaseClient {
|
||||
return;
|
||||
}
|
||||
|
||||
if (chanType == Tp.IFACE_CHANNEL_TYPE_TEXT) {
|
||||
if (chanType == Tp.IFACE_CHANNEL_TYPE_TEXT)
|
||||
this._approveTextChannel(account, conn, channel, dispatchOp, context);
|
||||
} else {
|
||||
else
|
||||
context.fail(new Tp.Error({ code: Tp.Error.INVALID_ARGUMENT,
|
||||
message: 'Unsupported channel type' }));
|
||||
}
|
||||
}
|
||||
|
||||
_approveTextChannel(account, conn, channel, dispatchOp, context) {
|
||||
@@ -249,7 +248,7 @@ class TelepathyClient extends Tp.BaseClient {
|
||||
}
|
||||
|
||||
// Approve private text channels right away as we are going to handle it
|
||||
dispatchOp.claim_with_async(this, (o, result) => {
|
||||
dispatchOp.claim_with_async(this, (dispatchOp, result) => {
|
||||
try {
|
||||
dispatchOp.claim_with_finish(result);
|
||||
this._handlingChannels(account, conn, [channel], false);
|
||||
@@ -350,10 +349,11 @@ class ChatSource extends MessageTray.Source {
|
||||
|
||||
getIcon() {
|
||||
let file = this._contact.get_avatar_file();
|
||||
if (file)
|
||||
return new Gio.FileIcon({ file });
|
||||
else
|
||||
if (file) {
|
||||
return new Gio.FileIcon({ file: file });
|
||||
} else {
|
||||
return new Gio.ThemedIcon({ name: 'avatar-default' });
|
||||
}
|
||||
}
|
||||
|
||||
getSecondaryIcon() {
|
||||
@@ -387,11 +387,10 @@ class ChatSource extends MessageTray.Source {
|
||||
|
||||
_updateAvatarIcon() {
|
||||
this.iconUpdated();
|
||||
if (this._notifiction) {
|
||||
if (this._notifiction)
|
||||
this._notification.update(this._notification.title,
|
||||
this._notification.bannerBodyText,
|
||||
{ gicon: this.getIcon() });
|
||||
}
|
||||
}
|
||||
|
||||
open() {
|
||||
@@ -603,11 +602,10 @@ class ChatSource extends MessageTray.Source {
|
||||
}
|
||||
|
||||
_presenceChanged(_contact, _presence, _status, _message) {
|
||||
if (this._notification) {
|
||||
if (this._notification)
|
||||
this._notification.update(this._notification.title,
|
||||
this._notification.bannerBodyText,
|
||||
{ secondaryGIcon: this.getSecondaryIcon() });
|
||||
}
|
||||
}
|
||||
|
||||
_pendingRemoved(channel, message) {
|
||||
@@ -635,7 +633,7 @@ var ChatNotification = HAVE_TP ? GObject.registerClass({
|
||||
'message-removed': { param_types: [Tp.Message.$gtype] },
|
||||
'message-added': { param_types: [Tp.Message.$gtype] },
|
||||
'timestamp-changed': { param_types: [Tp.Message.$gtype] },
|
||||
},
|
||||
}
|
||||
}, class ChatNotification extends MessageTray.Notification {
|
||||
_init(source) {
|
||||
super._init(source, source.title, null,
|
||||
@@ -656,16 +654,16 @@ var ChatNotification = HAVE_TP ? GObject.registerClass({
|
||||
|
||||
/**
|
||||
* appendMessage:
|
||||
* @param {Object} message: An object with the properties
|
||||
* {string} message.text: the body of the message,
|
||||
* {Tp.ChannelTextMessageType} message.messageType: the type
|
||||
* {string} message.sender: the name of the sender,
|
||||
* {number} message.timestamp: the time the message was sent
|
||||
* {NotificationDirection} message.direction: a #NotificationDirection
|
||||
* @message: An object with the properties:
|
||||
* text: the body of the message,
|
||||
* messageType: a #Tp.ChannelTextMessageType,
|
||||
* sender: the name of the sender,
|
||||
* timestamp: the time the message was sent
|
||||
* direction: a #NotificationDirection
|
||||
*
|
||||
* @param {bool} noTimestamp: Whether to add a timestamp. If %true,
|
||||
* no timestamp will be added, regardless of the difference since
|
||||
* the last timestamp
|
||||
* @noTimestamp: Whether to add a timestamp. If %true, no timestamp
|
||||
* will be added, regardless of the difference since the
|
||||
* last timestamp
|
||||
*/
|
||||
appendMessage(message, noTimestamp) {
|
||||
let messageBody = GLib.markup_escape_text(message.text, -1);
|
||||
@@ -677,20 +675,19 @@ var ChatNotification = HAVE_TP ? GObject.registerClass({
|
||||
styles.push('chat-action');
|
||||
}
|
||||
|
||||
if (message.direction == NotificationDirection.RECEIVED) {
|
||||
if (message.direction == NotificationDirection.RECEIVED)
|
||||
this.update(this.source.title, messageBody,
|
||||
{ datetime: GLib.DateTime.new_from_unix_local(message.timestamp),
|
||||
{ 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,
|
||||
styles,
|
||||
group: group,
|
||||
styles: styles,
|
||||
timestamp: message.timestamp,
|
||||
noTimestamp });
|
||||
noTimestamp: noTimestamp });
|
||||
}
|
||||
|
||||
_filterMessages() {
|
||||
@@ -698,7 +695,7 @@ var ChatNotification = HAVE_TP ? GObject.registerClass({
|
||||
return;
|
||||
|
||||
let lastMessageTime = this.messages[0].timestamp;
|
||||
let currentTime = Date.now() / 1000;
|
||||
let currentTime = (Date.now() / 1000);
|
||||
|
||||
// Keep the scrollback from growing too long. If the most
|
||||
// recent message (before the one we just added) is within
|
||||
@@ -706,7 +703,7 @@ var ChatNotification = HAVE_TP ? GObject.registerClass({
|
||||
// SCROLLBACK_RECENT_LENGTH previous messages. Otherwise
|
||||
// we'll keep SCROLLBACK_IDLE_LENGTH messages.
|
||||
|
||||
let maxLength = lastMessageTime < currentTime - SCROLLBACK_RECENT_TIME
|
||||
let maxLength = (lastMessageTime < currentTime - SCROLLBACK_RECENT_TIME)
|
||||
? SCROLLBACK_IDLE_LENGTH : SCROLLBACK_RECENT_LENGTH;
|
||||
|
||||
let filteredHistory = this.messages.filter(item => item.realMessage);
|
||||
@@ -720,16 +717,16 @@ var ChatNotification = HAVE_TP ? GObject.registerClass({
|
||||
|
||||
/**
|
||||
* _append:
|
||||
* @param {Object} props: An object with the properties:
|
||||
* {string} props.body: The text of the message.
|
||||
* {string} props.group: The group of the message, one of:
|
||||
* @props: An object with the properties:
|
||||
* body: The text of the message.
|
||||
* group: The group of the message, one of:
|
||||
* 'received', 'sent', 'meta'.
|
||||
* {string[]} props.styles: Style class names for the message to have.
|
||||
* {number} props.timestamp: The timestamp of the message.
|
||||
* {bool} props.noTimestamp: suppress timestamp signal?
|
||||
* styles: Style class names for the message to have.
|
||||
* timestamp: The timestamp of the message.
|
||||
* noTimestamp: suppress timestamp signal?
|
||||
*/
|
||||
_append(props) {
|
||||
let currentTime = Date.now() / 1000;
|
||||
let currentTime = (Date.now() / 1000);
|
||||
props = Params.parse(props, { body: null,
|
||||
group: null,
|
||||
styles: [],
|
||||
|
||||
@@ -12,7 +12,7 @@ var POPUP_APPICON_SIZE = 96;
|
||||
var SortGroup = {
|
||||
TOP: 0,
|
||||
MIDDLE: 1,
|
||||
BOTTOM: 2,
|
||||
BOTTOM: 2
|
||||
};
|
||||
|
||||
var CtrlAltTabManager = class CtrlAltTabManager {
|
||||
@@ -86,26 +86,25 @@ var CtrlAltTabManager = class CtrlAltTabManager {
|
||||
for (let i = 0; i < windows.length; i++) {
|
||||
let icon = null;
|
||||
let iconName = null;
|
||||
if (windows[i].get_window_type() == Meta.WindowType.DESKTOP) {
|
||||
if (windows[i].get_window_type () == Meta.WindowType.DESKTOP) {
|
||||
iconName = 'video-display-symbolic';
|
||||
} else {
|
||||
let app = windowTracker.get_window_app(windows[i]);
|
||||
if (app) {
|
||||
if (app)
|
||||
icon = app.create_icon_texture(POPUP_APPICON_SIZE);
|
||||
} else {
|
||||
else
|
||||
icon = textureCache.bind_cairo_surface_property(windows[i],
|
||||
'icon',
|
||||
POPUP_APPICON_SIZE);
|
||||
}
|
||||
}
|
||||
|
||||
items.push({ name: windows[i].title,
|
||||
proxy: windows[i].get_compositor_private(),
|
||||
focusCallback: timestamp => {
|
||||
Main.activateWindow(windows[i], timestamp);
|
||||
},
|
||||
focusCallback: function(timestamp) {
|
||||
Main.activateWindow(this, timestamp);
|
||||
}.bind(windows[i]),
|
||||
iconActor: icon,
|
||||
iconName,
|
||||
iconName: iconName,
|
||||
sortGroup: SortGroup.MIDDLE });
|
||||
}
|
||||
}
|
||||
@@ -144,9 +143,9 @@ class CtrlAltTabPopup extends SwitcherPopup.SwitcherPopup {
|
||||
this._select(this._next());
|
||||
else if (action == Meta.KeyBindingAction.SWITCH_PANELS_BACKWARD)
|
||||
this._select(this._previous());
|
||||
else if (keysym == Clutter.KEY_Left)
|
||||
else if (keysym == Clutter.Left)
|
||||
this._select(this._previous());
|
||||
else if (keysym == Clutter.KEY_Right)
|
||||
else if (keysym == Clutter.Right)
|
||||
this._select(this._next());
|
||||
else
|
||||
return Clutter.EVENT_PROPAGATE;
|
||||
@@ -178,13 +177,10 @@ class CtrlAltTabSwitcher extends SwitcherPopup.SwitcherList {
|
||||
icon = new St.Icon({ icon_name: item.iconName,
|
||||
icon_size: POPUP_APPICON_SIZE });
|
||||
}
|
||||
box.add_child(icon);
|
||||
box.add(icon, { x_fill: false, y_fill: false } );
|
||||
|
||||
let text = new St.Label({
|
||||
text: item.name,
|
||||
x_align: Clutter.ActorAlign.CENTER,
|
||||
});
|
||||
box.add_child(text);
|
||||
let text = new St.Label({ text: item.name });
|
||||
box.add(text, { x_fill: false });
|
||||
|
||||
this.addItem(box, text);
|
||||
}
|
||||
|
||||
@@ -16,10 +16,11 @@ var DASH_ITEM_LABEL_HIDE_TIME = 100;
|
||||
var DASH_ITEM_HOVER_TIMEOUT = 300;
|
||||
|
||||
function getAppFromSource(source) {
|
||||
if (source instanceof AppDisplay.AppIcon)
|
||||
if (source instanceof AppDisplay.AppIcon) {
|
||||
return source.app;
|
||||
else
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
var DashIcon = GObject.registerClass(
|
||||
@@ -27,7 +28,7 @@ class DashIcon extends AppDisplay.AppIcon {
|
||||
_init(app) {
|
||||
super._init(app, {
|
||||
setSizeManually: true,
|
||||
showLabel: false,
|
||||
showLabel: false
|
||||
});
|
||||
}
|
||||
|
||||
@@ -125,7 +126,7 @@ class DashItemContainer extends St.Widget {
|
||||
this.label.ease({
|
||||
opacity: 255,
|
||||
duration: DASH_ITEM_LABEL_SHOW_TIME,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD
|
||||
});
|
||||
}
|
||||
|
||||
@@ -139,7 +140,7 @@ class DashItemContainer extends St.Widget {
|
||||
opacity: 0,
|
||||
duration: DASH_ITEM_LABEL_HIDE_TIME,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
onComplete: () => this.label.hide(),
|
||||
onComplete: () => this.label.hide()
|
||||
});
|
||||
}
|
||||
|
||||
@@ -163,7 +164,7 @@ class DashItemContainer extends St.Widget {
|
||||
scale_y: 1,
|
||||
opacity: 255,
|
||||
duration: time,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD
|
||||
});
|
||||
}
|
||||
|
||||
@@ -182,7 +183,7 @@ class DashItemContainer extends St.Widget {
|
||||
opacity: 0,
|
||||
duration: DASH_ANIMATION_TIME,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
onComplete: () => this.destroy(),
|
||||
onComplete: () => this.destroy()
|
||||
});
|
||||
}
|
||||
});
|
||||
@@ -284,12 +285,9 @@ var DashActor = GObject.registerClass(
|
||||
class DashActor extends St.Widget {
|
||||
_init() {
|
||||
let layout = new Clutter.BoxLayout({ orientation: Clutter.Orientation.VERTICAL });
|
||||
super._init({
|
||||
name: 'dash',
|
||||
layout_manager: layout,
|
||||
clip_to_allocation: true,
|
||||
y_align: Clutter.ActorAlign.CENTER,
|
||||
});
|
||||
super._init({ name: 'dash',
|
||||
layout_manager: layout,
|
||||
clip_to_allocation: true });
|
||||
}
|
||||
|
||||
vfunc_allocate(box, flags) {
|
||||
@@ -334,7 +332,7 @@ class DashActor extends St.Widget {
|
||||
const baseIconSizes = [16, 22, 24, 32, 48, 64];
|
||||
|
||||
var Dash = GObject.registerClass({
|
||||
Signals: { 'icon-size-changed': {} },
|
||||
Signals: { 'icon-size-changed': {} }
|
||||
}, class Dash extends St.Bin {
|
||||
_init() {
|
||||
this._maxHeight = -1;
|
||||
@@ -397,7 +395,7 @@ var Dash = GObject.registerClass({
|
||||
_onDragBegin() {
|
||||
this._dragCancelled = false;
|
||||
this._dragMonitor = {
|
||||
dragMotion: this._onDragMotion.bind(this),
|
||||
dragMotion: this._onDragMotion.bind(this)
|
||||
};
|
||||
DND.addDragMonitor(this._dragMonitor);
|
||||
|
||||
@@ -481,7 +479,7 @@ var Dash = GObject.registerClass({
|
||||
let appIcon = new DashIcon(app);
|
||||
|
||||
appIcon.connect('menu-state-changed',
|
||||
(o, opened) => {
|
||||
(appIcon, opened) => {
|
||||
this._itemMenuStateChanged(item, opened);
|
||||
});
|
||||
|
||||
@@ -629,7 +627,7 @@ var Dash = GObject.registerClass({
|
||||
width: targetWidth,
|
||||
height: targetHeight,
|
||||
duration: DASH_ANIMATION_TIME,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -728,10 +726,9 @@ var Dash = GObject.registerClass({
|
||||
}
|
||||
}
|
||||
|
||||
for (let i = 0; i < addedItems.length; i++) {
|
||||
for (let i = 0; i < addedItems.length; i++)
|
||||
this._box.insert_child_at_index(addedItems[i].item,
|
||||
addedItems[i].pos);
|
||||
}
|
||||
|
||||
for (let i = 0; i < removedActors.length; i++) {
|
||||
let item = removedActors[i];
|
||||
@@ -755,8 +752,9 @@ var Dash = GObject.registerClass({
|
||||
if (!this._shownInitially)
|
||||
this._shownInitially = true;
|
||||
|
||||
for (let i = 0; i < addedItems.length; i++)
|
||||
for (let i = 0; i < addedItems.length; i++) {
|
||||
addedItems[i].item.show(animate);
|
||||
}
|
||||
|
||||
// Workaround for https://bugzilla.gnome.org/show_bug.cgi?id=692744
|
||||
// Without it, StBoxLayout may use a stale size cache
|
||||
@@ -836,8 +834,8 @@ var Dash = GObject.registerClass({
|
||||
}
|
||||
|
||||
this._dragPlaceholder = new DragPlaceholderItem();
|
||||
this._dragPlaceholder.child.set_width(this.iconSize);
|
||||
this._dragPlaceholder.child.set_height(this.iconSize / 2);
|
||||
this._dragPlaceholder.child.set_width (this.iconSize);
|
||||
this._dragPlaceholder.child.set_height (this.iconSize / 2);
|
||||
this._box.insert_child_at_index(this._dragPlaceholder,
|
||||
this._dragPlaceholderPos);
|
||||
this._dragPlaceholder.show(fadeIn);
|
||||
@@ -851,7 +849,7 @@ var Dash = GObject.registerClass({
|
||||
if (!this._dragPlaceholder)
|
||||
return DND.DragMotionResult.NO_DROP;
|
||||
|
||||
let srcIsFavorite = favPos != -1;
|
||||
let srcIsFavorite = (favPos != -1);
|
||||
|
||||
if (srcIsFavorite)
|
||||
return DND.DragMotionResult.MOVE_DROP;
|
||||
@@ -864,8 +862,9 @@ var Dash = GObject.registerClass({
|
||||
let app = getAppFromSource(source);
|
||||
|
||||
// Don't allow favoriting of transient apps
|
||||
if (app == null || app.is_window_backed())
|
||||
if (app == null || app.is_window_backed()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!global.settings.is_writable('favorite-apps'))
|
||||
return false;
|
||||
@@ -874,7 +873,7 @@ var Dash = GObject.registerClass({
|
||||
|
||||
let favorites = AppFavorites.getAppFavorites().getFavoriteMap();
|
||||
|
||||
let srcIsFavorite = id in favorites;
|
||||
let srcIsFavorite = (id in favorites);
|
||||
|
||||
let favPos = 0;
|
||||
let children = this._box.get_children();
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
/* exported DateMenuButton */
|
||||
|
||||
const { Clutter, Gio, GLib, GnomeDesktop,
|
||||
GObject, GWeather, Pango, Shell, St } = imports.gi;
|
||||
GObject, GWeather, Shell, St } = imports.gi;
|
||||
|
||||
const Util = imports.misc.util;
|
||||
const Main = imports.ui.main;
|
||||
@@ -37,9 +37,10 @@ class TodayButton extends St.Button {
|
||||
// until the selected date changes.
|
||||
super._init({
|
||||
style_class: 'datemenu-today-button',
|
||||
x_align: St.Align.START,
|
||||
x_expand: true,
|
||||
can_focus: true,
|
||||
reactive: false,
|
||||
reactive: false
|
||||
});
|
||||
|
||||
let hbox = new St.BoxLayout({ vertical: true });
|
||||
@@ -72,14 +73,14 @@ class TodayButton extends St.Button {
|
||||
* "Tue 9:29 AM"). The string itself should become a full date, e.g.,
|
||||
* "February 17 2015".
|
||||
*/
|
||||
let dateFormat = Shell.util_translate_time_string(N_("%B %-d %Y"));
|
||||
let dateFormat = Shell.util_translate_time_string (N_("%B %-d %Y"));
|
||||
this._dateLabel.set_text(date.toLocaleFormat(dateFormat));
|
||||
|
||||
/* Translators: This is the accessible name of the date button shown
|
||||
* below the time in the shell; it should combine the weekday and the
|
||||
* date, e.g. "Tuesday February 17 2015".
|
||||
*/
|
||||
dateFormat = Shell.util_translate_time_string(N_("%A %B %e %Y"));
|
||||
dateFormat = Shell.util_translate_time_string (N_("%A %B %e %Y"));
|
||||
this.accessible_name = date.toLocaleFormat(dateFormat);
|
||||
}
|
||||
});
|
||||
@@ -89,8 +90,8 @@ class WorldClocksSection extends St.Button {
|
||||
_init() {
|
||||
super._init({
|
||||
style_class: 'world-clocks-button',
|
||||
can_focus: true,
|
||||
x_expand: true,
|
||||
x_fill: true,
|
||||
can_focus: true
|
||||
});
|
||||
this._clock = new GnomeDesktop.WallClock();
|
||||
this._clockNotifyId = 0;
|
||||
@@ -99,7 +100,6 @@ class WorldClocksSection extends St.Button {
|
||||
|
||||
let layout = new Clutter.GridLayout({ orientation: Clutter.Orientation.VERTICAL });
|
||||
this._grid = new St.Widget({ style_class: 'world-clocks-grid',
|
||||
x_expand: true,
|
||||
layout_manager: layout });
|
||||
layout.hookup_style(this._grid);
|
||||
|
||||
@@ -115,7 +115,7 @@ class WorldClocksSection extends St.Button {
|
||||
Gio.DBusProxyFlags.DO_NOT_AUTO_START | Gio.DBusProxyFlags.GET_INVALIDATED_PROPERTIES);
|
||||
|
||||
this._settings = new Gio.Settings({
|
||||
schema_id: 'org.gnome.shell.world-clocks',
|
||||
schema_id: 'org.gnome.shell.world-clocks'
|
||||
});
|
||||
this._settings.connect('changed', this._clocksChanged.bind(this));
|
||||
this._clocksChanged();
|
||||
@@ -157,7 +157,7 @@ class WorldClocksSection extends St.Button {
|
||||
});
|
||||
|
||||
let layout = this._grid.layout_manager;
|
||||
let title = this._locations.length == 0
|
||||
let title = (this._locations.length == 0)
|
||||
? _("Add world clocks…")
|
||||
: _("World Clocks");
|
||||
let header = new St.Label({ style_class: 'world-clocks-header',
|
||||
@@ -182,8 +182,8 @@ class WorldClocksSection extends St.Button {
|
||||
|
||||
let otherOffset = this._getTimeAtLocation(l).get_utc_offset();
|
||||
let offset = (otherOffset - localOffset) / GLib.TIME_SPAN_HOUR;
|
||||
let fmt = Math.trunc(offset) == offset ? '%s%.0f' : '%s%.1f';
|
||||
let prefix = offset >= 0 ? '+' : '-';
|
||||
let fmt = (Math.trunc(offset) == offset) ? '%s%.0f' : '%s%.1f';
|
||||
let prefix = (offset >= 0) ? '+' : '-';
|
||||
let tz = new St.Label({ style_class: 'world-clocks-timezone',
|
||||
text: fmt.format(prefix, Math.abs(offset)),
|
||||
x_align: Clutter.ActorAlign.END,
|
||||
@@ -203,10 +203,9 @@ class WorldClocksSection extends St.Button {
|
||||
}
|
||||
|
||||
if (this._grid.get_n_children() > 1) {
|
||||
if (!this._clockNotifyId) {
|
||||
if (!this._clockNotifyId)
|
||||
this._clockNotifyId =
|
||||
this._clock.connect('notify::clock', this._updateLabels.bind(this));
|
||||
}
|
||||
this._updateLabels();
|
||||
} else {
|
||||
if (this._clockNotifyId)
|
||||
@@ -253,42 +252,31 @@ class WeatherSection extends St.Button {
|
||||
_init() {
|
||||
super._init({
|
||||
style_class: 'weather-button',
|
||||
can_focus: true,
|
||||
x_expand: true,
|
||||
x_fill: true,
|
||||
can_focus: true
|
||||
});
|
||||
|
||||
this._weatherClient = new Weather.WeatherClient();
|
||||
|
||||
let box = new St.BoxLayout({
|
||||
style_class: 'weather-box',
|
||||
vertical: true,
|
||||
x_expand: true,
|
||||
});
|
||||
let box = new St.BoxLayout({ style_class: 'weather-box',
|
||||
vertical: true });
|
||||
|
||||
this.child = box;
|
||||
|
||||
let titleBox = new St.BoxLayout({ style_class: 'weather-header-box' });
|
||||
titleBox.add_child(new St.Label({
|
||||
style_class: 'weather-header',
|
||||
x_align: Clutter.ActorAlign.START,
|
||||
x_expand: true,
|
||||
y_align: Clutter.ActorAlign.END,
|
||||
text: _('Weather'),
|
||||
}));
|
||||
let titleBox = new St.BoxLayout();
|
||||
titleBox.add_child(new St.Label({ style_class: 'weather-header',
|
||||
x_align: Clutter.ActorAlign.START,
|
||||
x_expand: true,
|
||||
text: _("Weather") }));
|
||||
box.add_child(titleBox);
|
||||
|
||||
this._titleLocation = new St.Label({
|
||||
style_class: 'weather-header location',
|
||||
x_align: Clutter.ActorAlign.END,
|
||||
y_align: Clutter.ActorAlign.END,
|
||||
});
|
||||
this._titleLocation = new St.Label({ style_class: 'weather-header location',
|
||||
x_align: Clutter.ActorAlign.END });
|
||||
titleBox.add_child(this._titleLocation);
|
||||
|
||||
let layout = new Clutter.GridLayout({ orientation: Clutter.Orientation.VERTICAL });
|
||||
this._forecastGrid = new St.Widget({
|
||||
style_class: 'weather-grid',
|
||||
layout_manager: layout,
|
||||
});
|
||||
this._forecastGrid = new St.Widget({ style_class: 'weather-grid',
|
||||
layout_manager: layout });
|
||||
layout.hookup_style(this._forecastGrid);
|
||||
box.add_child(this._forecastGrid);
|
||||
|
||||
@@ -309,27 +297,25 @@ class WeatherSection extends St.Button {
|
||||
}
|
||||
|
||||
_getInfos() {
|
||||
let forecasts = this._weatherClient.info.get_forecast_list();
|
||||
let info = this._weatherClient.info;
|
||||
let forecasts = info.get_forecast_list();
|
||||
|
||||
let now = GLib.DateTime.new_now_local();
|
||||
let current = GLib.DateTime.new_from_unix_local(0);
|
||||
let infos = [];
|
||||
let current = info;
|
||||
let infos = [info];
|
||||
for (let i = 0; i < forecasts.length; i++) {
|
||||
const [valid, timestamp] = forecasts[i].get_value_update();
|
||||
if (!valid || timestamp === 0)
|
||||
continue; // 0 means 'never updated'
|
||||
let [ok_, timestamp] = forecasts[i].get_value_update();
|
||||
let datetime = new Date(timestamp * 1000);
|
||||
if (!_isToday(datetime))
|
||||
continue; // Ignore forecasts from other days
|
||||
|
||||
const datetime = GLib.DateTime.new_from_unix_local(timestamp);
|
||||
if (now.difference(datetime) > 0)
|
||||
continue; // Ignore earlier forecasts
|
||||
|
||||
if (datetime.difference(current) < GLib.TIME_SPAN_HOUR)
|
||||
[ok_, timestamp] = current.get_value_update();
|
||||
let currenttime = new Date(timestamp * 1000);
|
||||
if (currenttime.getHours() == datetime.getHours())
|
||||
continue; // Enforce a minimum interval of 1h
|
||||
|
||||
if (infos.push(forecasts[i]) == MAX_FORECASTS)
|
||||
current = forecasts[i];
|
||||
if (infos.push(current) == MAX_FORECASTS)
|
||||
break; // Use a maximum of five forecasts
|
||||
|
||||
current = datetime;
|
||||
}
|
||||
return infos;
|
||||
}
|
||||
@@ -343,31 +329,21 @@ class WeatherSection extends St.Button {
|
||||
|
||||
let col = 0;
|
||||
infos.forEach(fc => {
|
||||
const [valid_, timestamp] = fc.get_value_update();
|
||||
let [ok_, timestamp] = fc.get_value_update();
|
||||
let timeStr = Util.formatTime(new Date(timestamp * 1000), {
|
||||
timeOnly: true,
|
||||
ampm: false,
|
||||
timeOnly: true
|
||||
});
|
||||
|
||||
let icon = new St.Icon({
|
||||
style_class: 'weather-forecast-icon',
|
||||
icon_name: fc.get_symbolic_icon_name(),
|
||||
x_align: Clutter.ActorAlign.CENTER,
|
||||
x_expand: true,
|
||||
});
|
||||
let temp = new St.Label({
|
||||
style_class: 'weather-forecast-temp',
|
||||
text: fc.get_temp_summary(),
|
||||
x_align: Clutter.ActorAlign.CENTER,
|
||||
});
|
||||
let time = new St.Label({
|
||||
style_class: 'weather-forecast-time',
|
||||
text: timeStr,
|
||||
x_align: Clutter.ActorAlign.CENTER,
|
||||
});
|
||||
|
||||
temp.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
|
||||
time.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
|
||||
let icon = new St.Icon({ style_class: 'weather-forecast-icon',
|
||||
icon_name: fc.get_symbolic_icon_name(),
|
||||
x_align: Clutter.ActorAlign.CENTER,
|
||||
x_expand: true });
|
||||
let temp = new St.Label({ style_class: 'weather-forecast-temp',
|
||||
text: fc.get_temp_summary(),
|
||||
x_align: Clutter.ActorAlign.CENTER });
|
||||
let time = new St.Label({ style_class: 'weather-forecast-time',
|
||||
text: timeStr,
|
||||
x_align: Clutter.ActorAlign.CENTER });
|
||||
|
||||
layout.attach(icon, col, 0, 1, 1);
|
||||
layout.attach(temp, col, 1, 1, 1);
|
||||
@@ -391,12 +367,7 @@ class WeatherSection extends St.Button {
|
||||
}
|
||||
|
||||
let info = this._weatherClient.info;
|
||||
let loc = info.get_location();
|
||||
if (loc.get_level() !== GWeather.LocationLevel.CITY && loc.has_coords()) {
|
||||
let world = GWeather.Location.get_world();
|
||||
loc = world.find_nearest_city(...loc.get_coords());
|
||||
}
|
||||
this._titleLocation.text = loc.get_name();
|
||||
this._titleLocation.text = info.get_location().get_name();
|
||||
|
||||
if (this._weatherClient.loading) {
|
||||
this._setStatusLabel(_("Loading…"));
|
||||
@@ -434,7 +405,7 @@ class MessagesIndicator extends St.Icon {
|
||||
icon_size: 16,
|
||||
visible: false,
|
||||
y_expand: true,
|
||||
y_align: Clutter.ActorAlign.CENTER,
|
||||
y_align: Clutter.ActorAlign.CENTER
|
||||
});
|
||||
|
||||
this._sources = [];
|
||||
@@ -463,7 +434,7 @@ class MessagesIndicator extends St.Icon {
|
||||
this._sources.forEach(source => (count += source.unseenCount));
|
||||
count -= Main.messageTray.queueCount;
|
||||
|
||||
this.visible = count > 0;
|
||||
this.visible = (count > 0);
|
||||
}
|
||||
});
|
||||
|
||||
@@ -564,7 +535,7 @@ class DateMenuButton extends PanelMenu.Button {
|
||||
|
||||
this.label_actor = this._clockDisplay;
|
||||
this.add_actor(box);
|
||||
this.add_style_class_name('clock-display');
|
||||
this.add_style_class_name ('clock-display');
|
||||
|
||||
let layout = new FreezableBinLayout();
|
||||
let bin = new St.Widget({ layout_manager: layout });
|
||||
@@ -594,7 +565,7 @@ class DateMenuButton extends PanelMenu.Button {
|
||||
|
||||
// Fill up the first column
|
||||
this._messageList = new Calendar.CalendarMessageList();
|
||||
hbox.add_child(this._messageList);
|
||||
hbox.add(this._messageList, { expand: true, y_fill: false, y_align: St.Align.START });
|
||||
|
||||
// Fill up the second column
|
||||
let boxLayout = new CalendarColumnLayout(this._calendar);
|
||||
@@ -609,21 +580,20 @@ class DateMenuButton extends PanelMenu.Button {
|
||||
vbox.add_actor(this._calendar);
|
||||
|
||||
this._displaysSection = new St.ScrollView({ style_class: 'datemenu-displays-section vfade',
|
||||
x_expand: true,
|
||||
x_expand: true, x_fill: true,
|
||||
overlay_scrollbars: true });
|
||||
this._displaysSection.set_policy(St.PolicyType.NEVER, St.PolicyType.AUTOMATIC);
|
||||
vbox.add_actor(this._displaysSection);
|
||||
|
||||
let displaysBox = new St.BoxLayout({ vertical: true,
|
||||
x_expand: true,
|
||||
style_class: 'datemenu-displays-box' });
|
||||
this._displaysSection.add_actor(displaysBox);
|
||||
|
||||
this._clocksItem = new WorldClocksSection();
|
||||
displaysBox.add_child(this._clocksItem);
|
||||
displaysBox.add(this._clocksItem, { x_fill: true });
|
||||
|
||||
this._weatherItem = new WeatherSection();
|
||||
displaysBox.add_child(this._weatherItem);
|
||||
displaysBox.add(this._weatherItem, { x_fill: true });
|
||||
|
||||
// Done with hbox for calendar and event list
|
||||
|
||||
@@ -661,11 +631,11 @@ class DateMenuButton extends PanelMenu.Button {
|
||||
_sessionUpdated() {
|
||||
let eventSource;
|
||||
let showEvents = Main.sessionMode.showCalendarEvents;
|
||||
if (showEvents)
|
||||
if (showEvents) {
|
||||
eventSource = this._getEventSource();
|
||||
else
|
||||
} else {
|
||||
eventSource = new Calendar.EmptyEventSource();
|
||||
|
||||
}
|
||||
this._setEventSource(eventSource);
|
||||
|
||||
// Displays are not actually expected to launch Settings when activated
|
||||
|
||||
@@ -36,15 +36,19 @@ class Dialog extends St.Widget {
|
||||
this._dialog.request_mode = Clutter.RequestMode.HEIGHT_FOR_WIDTH;
|
||||
this._dialog.set_offscreen_redirect(Clutter.OffscreenRedirect.ALWAYS);
|
||||
|
||||
this.contentLayout = new St.BoxLayout({
|
||||
vertical: true,
|
||||
style_class: 'modal-dialog-content-box',
|
||||
y_expand: true,
|
||||
});
|
||||
this._dialog.add_child(this.contentLayout);
|
||||
this.contentLayout = new St.BoxLayout({ vertical: true,
|
||||
style_class: "modal-dialog-content-box" });
|
||||
this._dialog.add(this.contentLayout,
|
||||
{ expand: true,
|
||||
x_fill: true,
|
||||
y_fill: true,
|
||||
x_align: St.Align.MIDDLE,
|
||||
y_align: St.Align.START });
|
||||
|
||||
this.buttonLayout = new St.Widget({ layout_manager: new Clutter.BoxLayout({ homogeneous: true }) });
|
||||
this._dialog.add_child(this.buttonLayout);
|
||||
this.buttonLayout = new St.Widget ({ layout_manager: new Clutter.BoxLayout({ homogeneous: true }) });
|
||||
this._dialog.add(this.buttonLayout,
|
||||
{ x_align: St.Align.MIDDLE,
|
||||
y_align: St.Align.START });
|
||||
}
|
||||
|
||||
_onDestroy() {
|
||||
@@ -96,7 +100,7 @@ class Dialog extends St.Widget {
|
||||
}
|
||||
|
||||
addContent(actor) {
|
||||
this.contentLayout.add(actor, { expand: true });
|
||||
this.contentLayout.add (actor, { expand: true });
|
||||
}
|
||||
|
||||
addButton(buttonInfo) {
|
||||
@@ -117,7 +121,7 @@ class Dialog extends St.Widget {
|
||||
can_focus: true,
|
||||
x_expand: true,
|
||||
y_expand: true,
|
||||
label });
|
||||
label: label });
|
||||
button.connect('clicked', action);
|
||||
|
||||
buttonInfo['button'] = button;
|
||||
@@ -159,8 +163,8 @@ var MessageDialogContent = GObject.registerClass({
|
||||
'body': GObject.ParamSpec.string('body', 'body', 'body',
|
||||
GObject.ParamFlags.READWRITE |
|
||||
GObject.ParamFlags.CONSTRUCT,
|
||||
null),
|
||||
},
|
||||
null)
|
||||
}
|
||||
}, class MessageDialogContent extends St.BoxLayout {
|
||||
_init(params) {
|
||||
this._icon = new St.Icon({ y_align: Clutter.ActorAlign.START });
|
||||
@@ -211,7 +215,7 @@ var MessageDialogContent = GObject.registerClass({
|
||||
set icon(icon) {
|
||||
this._icon.set({
|
||||
gicon: icon,
|
||||
visible: icon != null,
|
||||
visible: icon != null
|
||||
});
|
||||
this.notify('icon');
|
||||
}
|
||||
@@ -231,7 +235,7 @@ var MessageDialogContent = GObject.registerClass({
|
||||
_setLabel(label, prop, value) {
|
||||
label.set({
|
||||
text: value || '',
|
||||
visible: value != null,
|
||||
visible: value != null
|
||||
});
|
||||
this.notify(prop);
|
||||
}
|
||||
|
||||
61
js/ui/dnd.js
61
js/ui/dnd.js
@@ -18,7 +18,7 @@ var DragMotionResult = {
|
||||
NO_DROP: 0,
|
||||
COPY_DROP: 1,
|
||||
MOVE_DROP: 2,
|
||||
CONTINUE: 3,
|
||||
CONTINUE: 3
|
||||
};
|
||||
|
||||
var DragState = {
|
||||
@@ -30,13 +30,13 @@ var DragState = {
|
||||
var DRAG_CURSOR_MAP = {
|
||||
0: Meta.Cursor.DND_UNSUPPORTED_TARGET,
|
||||
1: Meta.Cursor.DND_COPY,
|
||||
2: Meta.Cursor.DND_MOVE,
|
||||
2: Meta.Cursor.DND_MOVE
|
||||
};
|
||||
|
||||
var DragDropResult = {
|
||||
FAILURE: 0,
|
||||
SUCCESS: 1,
|
||||
CONTINUE: 2,
|
||||
CONTINUE: 2
|
||||
};
|
||||
var dragMonitors = [];
|
||||
|
||||
@@ -61,12 +61,11 @@ function addDragMonitor(monitor) {
|
||||
}
|
||||
|
||||
function removeDragMonitor(monitor) {
|
||||
for (let i = 0; i < dragMonitors.length; i++) {
|
||||
for (let i = 0; i < dragMonitors.length; i++)
|
||||
if (dragMonitors[i] == monitor) {
|
||||
dragMonitors.splice(i, 1);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var _Draggable = class _Draggable {
|
||||
@@ -151,12 +150,12 @@ var _Draggable = class _Draggable {
|
||||
if (touchSequence)
|
||||
pointer.sequence_grab(touchSequence, actor);
|
||||
else if (pointer)
|
||||
pointer.grab(actor);
|
||||
pointer.grab (actor);
|
||||
|
||||
this._grabbedDevice = pointer;
|
||||
this._touchSequence = touchSequence;
|
||||
|
||||
this._capturedEventId = global.stage.connect('captured-event', (o, event) => {
|
||||
this._capturedEventId = global.stage.connect('captured-event', (actor, event) => {
|
||||
let device = event.get_device();
|
||||
if (device != this._grabbedDevice &&
|
||||
device.get_device_type() != Clutter.InputDeviceType.KEYBOARD_DEVICE)
|
||||
@@ -172,7 +171,7 @@ var _Draggable = class _Draggable {
|
||||
}
|
||||
|
||||
if (this._touchSequence)
|
||||
this._grabbedDevice.sequence_ungrab(this._touchSequence);
|
||||
this._grabbedDevice.sequence_ungrab (this._touchSequence);
|
||||
else
|
||||
this._grabbedDevice.ungrab();
|
||||
|
||||
@@ -213,9 +212,9 @@ var _Draggable = class _Draggable {
|
||||
|
||||
_eventIsRelease(event) {
|
||||
if (event.type() == Clutter.EventType.BUTTON_RELEASE) {
|
||||
let buttonMask = Clutter.ModifierType.BUTTON1_MASK |
|
||||
let buttonMask = (Clutter.ModifierType.BUTTON1_MASK |
|
||||
Clutter.ModifierType.BUTTON2_MASK |
|
||||
Clutter.ModifierType.BUTTON3_MASK;
|
||||
Clutter.ModifierType.BUTTON3_MASK);
|
||||
/* We only obey the last button release from the device,
|
||||
* other buttons may get pressed/released during the DnD op.
|
||||
*/
|
||||
@@ -259,16 +258,16 @@ var _Draggable = class _Draggable {
|
||||
} else if (event.type() == Clutter.EventType.MOTION ||
|
||||
(event.type() == Clutter.EventType.TOUCH_UPDATE &&
|
||||
global.display.is_pointer_emulating_sequence(event.get_event_sequence()))) {
|
||||
if (this._dragActor && this._dragState == DragState.DRAGGING)
|
||||
if (this._dragActor && this._dragState == DragState.DRAGGING) {
|
||||
return this._updateDragPosition(event);
|
||||
else if (this._dragActor == null && this._dragState != DragState.CANCELLED)
|
||||
} else if (this._dragActor == null && this._dragState != DragState.CANCELLED) {
|
||||
return this._maybeStartDrag(event);
|
||||
|
||||
}
|
||||
// We intercept KEY_PRESS event so that we can process Esc key press to cancel
|
||||
// dragging and ignore all other key presses.
|
||||
} else if (event.type() == Clutter.EventType.KEY_PRESS && this._dragState == DragState.DRAGGING) {
|
||||
let symbol = event.get_key_symbol();
|
||||
if (symbol == Clutter.KEY_Escape) {
|
||||
if (symbol == Clutter.Escape) {
|
||||
this._cancelDrag(event.get_time());
|
||||
return Clutter.EVENT_STOP;
|
||||
}
|
||||
@@ -292,11 +291,9 @@ var _Draggable = class _Draggable {
|
||||
|
||||
/**
|
||||
* startDrag:
|
||||
* @param {number} stageX: X coordinate of event
|
||||
* @param {number} stageY: Y coordinate of event
|
||||
* @param {number} time: Event timestamp
|
||||
* @param {Clutter.EventSequence=} sequence: Event sequence
|
||||
* @param {Clutter.InputDevice=} device: device that originated the event
|
||||
* @stageX: X coordinate of event
|
||||
* @stageY: Y coordinate of event
|
||||
* @time: Event timestamp
|
||||
*
|
||||
* Directly initiate a drag and drop operation from the given actor.
|
||||
* This function is useful to call if you've specified manualMode
|
||||
@@ -341,7 +338,7 @@ var _Draggable = class _Draggable {
|
||||
if (this.actor._delegate && this.actor._delegate.getDragActor) {
|
||||
this._dragActor = this.actor._delegate.getDragActor();
|
||||
Main.uiGroup.add_child(this._dragActor);
|
||||
Main.uiGroup.set_child_above_sibling(this._dragActor, null);
|
||||
this._dragActor.raise_top();
|
||||
Shell.util_set_hidden_from_pick(this._dragActor, true);
|
||||
|
||||
// Drag actor does not always have to be the same as actor. For example drag actor
|
||||
@@ -391,7 +388,7 @@ var _Draggable = class _Draggable {
|
||||
|
||||
this._dragOrigParent.remove_actor(this._dragActor);
|
||||
Main.uiGroup.add_child(this._dragActor);
|
||||
Main.uiGroup.set_child_above_sibling(this._dragActor, null);
|
||||
this._dragActor.raise_top();
|
||||
Shell.util_set_hidden_from_pick(this._dragActor, true);
|
||||
}
|
||||
|
||||
@@ -430,7 +427,7 @@ var _Draggable = class _Draggable {
|
||||
scale_x: scale * origScale,
|
||||
scale_y: scale * origScale,
|
||||
duration: SCALE_ANIMATION_TIME,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD
|
||||
});
|
||||
|
||||
this._dragActor.get_transition('scale-x').connect('new-frame', () => {
|
||||
@@ -475,7 +472,7 @@ var _Draggable = class _Draggable {
|
||||
y: this._dragY,
|
||||
dragActor: this._dragActor,
|
||||
source: this.actor._delegate,
|
||||
targetActor: target,
|
||||
targetActor: target
|
||||
};
|
||||
|
||||
let targetActorDestroyHandlerId;
|
||||
@@ -554,11 +551,11 @@ var _Draggable = class _Draggable {
|
||||
let dropEvent = {
|
||||
dropActor: this._dragActor,
|
||||
targetActor: target,
|
||||
clutterEvent: event,
|
||||
clutterEvent: event
|
||||
};
|
||||
for (let i = 0; i < dragMonitors.length; i++) {
|
||||
let dropFunc = dragMonitors[i].dragDrop;
|
||||
if (dropFunc) {
|
||||
if (dropFunc)
|
||||
switch (dropFunc(dropEvent)) {
|
||||
case DragDropResult.FAILURE:
|
||||
case DragDropResult.SUCCESS:
|
||||
@@ -566,7 +563,6 @@ var _Draggable = class _Draggable {
|
||||
case DragDropResult.CONTINUE:
|
||||
continue;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// At this point it is too late to cancel a drag by destroying
|
||||
@@ -646,7 +642,7 @@ var _Draggable = class _Draggable {
|
||||
|
||||
_cancelDrag(eventTime) {
|
||||
this.emit('drag-cancelled', eventTime);
|
||||
let wasCancelled = this._dragState == DragState.CANCELLED;
|
||||
let wasCancelled = (this._dragState == DragState.CANCELLED);
|
||||
this._dragState = DragState.CANCELLED;
|
||||
|
||||
if (this._actorDestroyed || wasCancelled) {
|
||||
@@ -667,7 +663,7 @@ var _Draggable = class _Draggable {
|
||||
y: snapBackY,
|
||||
scale_x: snapBackScale,
|
||||
scale_y: snapBackScale,
|
||||
duration: SNAP_BACK_ANIMATION_TIME,
|
||||
duration: SNAP_BACK_ANIMATION_TIME
|
||||
});
|
||||
}
|
||||
|
||||
@@ -681,7 +677,7 @@ var _Draggable = class _Draggable {
|
||||
this._dragActor.opacity = 0;
|
||||
|
||||
this._animateDragEnd(eventTime, {
|
||||
duration: REVERT_ANIMATION_TIME,
|
||||
duration: REVERT_ANIMATION_TIME
|
||||
});
|
||||
}
|
||||
|
||||
@@ -694,7 +690,7 @@ var _Draggable = class _Draggable {
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
onComplete: () => {
|
||||
this._onAnimationComplete(this._dragActor, eventTime);
|
||||
},
|
||||
}
|
||||
}));
|
||||
}
|
||||
|
||||
@@ -748,9 +744,8 @@ Signals.addSignalMethods(_Draggable.prototype);
|
||||
|
||||
/**
|
||||
* makeDraggable:
|
||||
* @param {Clutter.Actor} actor: Source actor
|
||||
* @param {Object=} params: Additional parameters
|
||||
* @returns {Object} a new Draggable
|
||||
* @actor: Source actor
|
||||
* @params: (optional) Additional parameters
|
||||
*
|
||||
* Create an object which controls drag and drop for the given actor.
|
||||
*
|
||||
|
||||
@@ -37,17 +37,17 @@ var EdgeDragAction = GObject.registerClass({
|
||||
let [x, y] = this.get_press_coords(0);
|
||||
let monitorRect = this._getMonitorRect(x, y);
|
||||
|
||||
return (this._side == St.Side.LEFT && x < monitorRect.x + EDGE_THRESHOLD) ||
|
||||
return ((this._side == St.Side.LEFT && x < monitorRect.x + EDGE_THRESHOLD) ||
|
||||
(this._side == St.Side.RIGHT && x > monitorRect.x + monitorRect.width - EDGE_THRESHOLD) ||
|
||||
(this._side == St.Side.TOP && y < monitorRect.y + EDGE_THRESHOLD) ||
|
||||
(this._side == St.Side.BOTTOM && y > monitorRect.y + monitorRect.height - EDGE_THRESHOLD);
|
||||
(this._side == St.Side.BOTTOM && y > monitorRect.y + monitorRect.height - EDGE_THRESHOLD));
|
||||
}
|
||||
|
||||
vfunc_gesture_progress(_actor) {
|
||||
let [startX, startY] = this.get_press_coords(0);
|
||||
let [x, y] = this.get_motion_coords(0);
|
||||
let offsetX = Math.abs(x - startX);
|
||||
let offsetY = Math.abs(y - startY);
|
||||
let offsetX = Math.abs (x - startX);
|
||||
let offsetY = Math.abs (y - startY);
|
||||
|
||||
if (offsetX < EDGE_THRESHOLD && offsetY < EDGE_THRESHOLD)
|
||||
return true;
|
||||
|
||||
@@ -128,7 +128,7 @@ const DialogType = {
|
||||
SHUTDOWN: 1 /* GSM_SHELL_END_SESSION_DIALOG_TYPE_SHUTDOWN */,
|
||||
RESTART: 2 /* GSM_SHELL_END_SESSION_DIALOG_TYPE_RESTART */,
|
||||
UPDATE_RESTART: 3,
|
||||
UPGRADE_RESTART: 4,
|
||||
UPGRADE_RESTART: 4
|
||||
};
|
||||
|
||||
const DialogContent = {
|
||||
@@ -136,7 +136,7 @@ const DialogContent = {
|
||||
1 /* DialogType.SHUTDOWN */: shutdownDialogContent,
|
||||
2 /* DialogType.RESTART */: restartDialogContent,
|
||||
3 /* DialogType.UPDATE_RESTART */: restartUpdateDialogContent,
|
||||
4 /* DialogType.UPGRADE_RESTART */: restartUpgradeDialogContent,
|
||||
4 /* DialogType.UPGRADE_RESTART */: restartUpgradeDialogContent
|
||||
};
|
||||
|
||||
var MAX_USERS_IN_SESSION_DIALOG = 5;
|
||||
@@ -218,7 +218,7 @@ function init() {
|
||||
// This always returns the same singleton object
|
||||
// By instantiating it initially, we register the
|
||||
// bus object, etc.
|
||||
new EndSessionDialog();
|
||||
(new EndSessionDialog());
|
||||
}
|
||||
|
||||
var EndSessionDialog = GObject.registerClass(
|
||||
@@ -263,35 +263,38 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
|
||||
this._userLoadedId = this._user.connect('notify::is_loaded', this._sync.bind(this));
|
||||
this._userChangedId = this._user.connect('changed', this._sync.bind(this));
|
||||
|
||||
let mainContentLayout = new St.BoxLayout({
|
||||
vertical: false,
|
||||
x_expand: true,
|
||||
y_expand: false,
|
||||
});
|
||||
this.contentLayout.add_child(mainContentLayout);
|
||||
let mainContentLayout = new St.BoxLayout({ vertical: false });
|
||||
this.contentLayout.add(mainContentLayout,
|
||||
{ x_fill: true,
|
||||
y_fill: false });
|
||||
|
||||
this._iconBin = new St.Bin({
|
||||
x_expand: true,
|
||||
x_align: Clutter.ActorAlign.END,
|
||||
});
|
||||
mainContentLayout.add_child(this._iconBin);
|
||||
this._iconBin = new St.Bin();
|
||||
mainContentLayout.add(this._iconBin,
|
||||
{ x_fill: true,
|
||||
y_fill: false,
|
||||
x_align: St.Align.END,
|
||||
y_align: St.Align.START });
|
||||
|
||||
let messageLayout = new St.BoxLayout({ vertical: true,
|
||||
style_class: 'end-session-dialog-layout' });
|
||||
mainContentLayout.add_child(messageLayout);
|
||||
mainContentLayout.add(messageLayout,
|
||||
{ y_align: St.Align.START });
|
||||
|
||||
this._subjectLabel = new St.Label({ style_class: 'end-session-dialog-subject' });
|
||||
|
||||
messageLayout.add_child(this._subjectLabel);
|
||||
messageLayout.add(this._subjectLabel,
|
||||
{ x_fill: false,
|
||||
y_fill: false,
|
||||
x_align: St.Align.START,
|
||||
y_align: St.Align.START });
|
||||
|
||||
this._descriptionLabel = new St.Label({
|
||||
style_class: 'end-session-dialog-description',
|
||||
y_expand: true,
|
||||
});
|
||||
this._descriptionLabel = new St.Label({ style_class: 'end-session-dialog-description' });
|
||||
this._descriptionLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
|
||||
this._descriptionLabel.clutter_text.line_wrap = true;
|
||||
|
||||
messageLayout.add_child(this._descriptionLabel);
|
||||
messageLayout.add(this._descriptionLabel,
|
||||
{ y_fill: true,
|
||||
y_align: St.Align.START });
|
||||
|
||||
this._checkBox = new CheckBox.CheckBox();
|
||||
this._checkBox.connect('clicked', this._sync.bind(this));
|
||||
@@ -303,13 +306,11 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
|
||||
this._batteryWarning.clutter_text.line_wrap = true;
|
||||
messageLayout.add(this._batteryWarning);
|
||||
|
||||
this._scrollView = new St.ScrollView({
|
||||
style_class: 'end-session-dialog-list',
|
||||
x_expand: true,
|
||||
y_expand: true,
|
||||
});
|
||||
this._scrollView = new St.ScrollView({ style_class: 'end-session-dialog-list' });
|
||||
this._scrollView.set_policy(St.PolicyType.NEVER, St.PolicyType.AUTOMATIC);
|
||||
this.contentLayout.add_child(this._scrollView);
|
||||
this.contentLayout.add(this._scrollView,
|
||||
{ x_fill: true,
|
||||
y_fill: true });
|
||||
this._scrollView.hide();
|
||||
|
||||
this._inhibitorSection = new St.BoxLayout({ vertical: true,
|
||||
@@ -366,7 +367,7 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
|
||||
}
|
||||
|
||||
_sync() {
|
||||
let open = this.state == ModalDialog.State.OPENING || this.state == ModalDialog.State.OPENED;
|
||||
let open = (this.state == ModalDialog.State.OPENING || this.state == ModalDialog.State.OPENED);
|
||||
if (!open)
|
||||
return;
|
||||
|
||||
@@ -443,7 +444,7 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
|
||||
let dialogContent = DialogContent[this._type];
|
||||
let buttons = [{ action: this.cancel.bind(this),
|
||||
label: _("Cancel"),
|
||||
key: Clutter.KEY_Escape }];
|
||||
key: Clutter.Escape }];
|
||||
|
||||
for (let i = 0; i < dialogContent.confirmButtons.length; i++) {
|
||||
let signal = dialogContent.confirmButtons[i].signal;
|
||||
@@ -456,7 +457,7 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
|
||||
this._confirm(signal);
|
||||
});
|
||||
},
|
||||
label,
|
||||
label: label,
|
||||
});
|
||||
}
|
||||
|
||||
@@ -566,7 +567,7 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
|
||||
|
||||
this._timerId = GLib.timeout_add_seconds(GLib.PRIORITY_DEFAULT, 1, () => {
|
||||
let currentTime = GLib.get_monotonic_time();
|
||||
let secondsElapsed = (currentTime - startTime) / 1000000;
|
||||
let secondsElapsed = ((currentTime - startTime) / 1000000);
|
||||
|
||||
this._secondsLeft = this._totalSecondsToStayOpen - secondsElapsed;
|
||||
if (this._secondsLeft > 0) {
|
||||
@@ -681,12 +682,11 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
|
||||
continue;
|
||||
|
||||
let sessionId = GLib.getenv('XDG_SESSION_ID');
|
||||
if (!sessionId) {
|
||||
if (!sessionId)
|
||||
this._loginManager.getCurrentSessionProxy(currentSessionProxy => {
|
||||
sessionId = currentSessionProxy.Id;
|
||||
log(`endSessionDialog: No XDG_SESSION_ID, fetched from logind: ${sessionId}`);
|
||||
});
|
||||
}
|
||||
|
||||
if (proxy.Id == sessionId)
|
||||
continue;
|
||||
@@ -754,14 +754,14 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
|
||||
let updatesAllowed = this._updatesPermission && this._updatesPermission.allowed;
|
||||
|
||||
_setCheckBoxLabel(this._checkBox, dialogContent.checkBoxText || '');
|
||||
this._checkBox.visible = dialogContent.checkBoxText && updatePrepared && updatesAllowed;
|
||||
this._checkBox.checked = updatePrepared && updateTriggered;
|
||||
this._checkBox.visible = (dialogContent.checkBoxText && updatePrepared && updatesAllowed);
|
||||
this._checkBox.checked = (updatePrepared && updateTriggered);
|
||||
|
||||
// We show the warning either together with the checkbox, or when
|
||||
// updates have already been triggered, but the user doesn't have
|
||||
// enough permissions to cancel them.
|
||||
this._batteryWarning.visible = dialogContent.showBatteryWarning &&
|
||||
(this._checkBox.visible || updatePrepared && updateTriggered && !updatesAllowed);
|
||||
this._batteryWarning.visible = (dialogContent.showBatteryWarning &&
|
||||
(this._checkBox.visible || updatePrepared && updateTriggered && !updatesAllowed));
|
||||
|
||||
this._updateButtons();
|
||||
|
||||
|
||||
@@ -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, GObject, Meta, Shell, St } = imports.gi;
|
||||
const { Clutter, GLib, Meta, Shell, St } = imports.gi;
|
||||
const Gettext = imports.gettext;
|
||||
|
||||
// We can't import shell JS modules yet, because they may have
|
||||
@@ -23,7 +23,7 @@ const Gettext = imports.gettext;
|
||||
// of interfaces in Javascript
|
||||
function _patchContainerClass(containerClass) {
|
||||
// This one is a straightforward mapping of the C method
|
||||
containerClass.prototype.child_set = function (actor, props) {
|
||||
containerClass.prototype.child_set = function(actor, props) {
|
||||
let meta = this.get_child_meta(actor);
|
||||
for (let prop in props)
|
||||
meta[prop] = props[prop];
|
||||
@@ -32,7 +32,7 @@ function _patchContainerClass(containerClass) {
|
||||
// clutter_container_add() actually is a an add-many-actors
|
||||
// method. We conveniently, but somewhat dubiously, take the
|
||||
// this opportunity to make it do something more useful.
|
||||
containerClass.prototype.add = function (actor, props) {
|
||||
containerClass.prototype.add = function(actor, props) {
|
||||
this.add_actor(actor);
|
||||
if (props)
|
||||
this.child_set(actor, props);
|
||||
@@ -40,8 +40,8 @@ function _patchContainerClass(containerClass) {
|
||||
}
|
||||
|
||||
function _patchLayoutClass(layoutClass, styleProps) {
|
||||
if (styleProps) {
|
||||
layoutClass.prototype.hookup_style = function (container) {
|
||||
if (styleProps)
|
||||
layoutClass.prototype.hookup_style = function(container) {
|
||||
container.connect('style-changed', () => {
|
||||
let node = container.get_theme_node();
|
||||
for (let prop in styleProps) {
|
||||
@@ -51,7 +51,11 @@ function _patchLayoutClass(layoutClass, styleProps) {
|
||||
}
|
||||
});
|
||||
};
|
||||
}
|
||||
layoutClass.prototype.child_set = function(actor, props) {
|
||||
let meta = this.get_child_meta(actor.get_parent(), actor);
|
||||
for (let prop in props)
|
||||
meta[prop] = props[prop];
|
||||
};
|
||||
}
|
||||
|
||||
function _makeEaseCallback(params, cleanup) {
|
||||
@@ -229,37 +233,37 @@ function init() {
|
||||
window.ngettext = Gettext.ngettext;
|
||||
window.N_ = s => s;
|
||||
|
||||
GObject.gtypeNameBasedOnJSPath = true;
|
||||
|
||||
// Miscellaneous monkeypatching
|
||||
_patchContainerClass(St.BoxLayout);
|
||||
|
||||
_patchLayoutClass(Clutter.TableLayout, { row_spacing: 'spacing-rows',
|
||||
column_spacing: 'spacing-columns' });
|
||||
_patchLayoutClass(Clutter.GridLayout, { row_spacing: 'spacing-rows',
|
||||
column_spacing: 'spacing-columns' });
|
||||
_patchLayoutClass(Clutter.BoxLayout, { spacing: 'spacing' });
|
||||
|
||||
let origSetEasingDuration = Clutter.Actor.prototype.set_easing_duration;
|
||||
Clutter.Actor.prototype.set_easing_duration = function (msecs) {
|
||||
Clutter.Actor.prototype.set_easing_duration = function(msecs) {
|
||||
origSetEasingDuration.call(this, adjustAnimationTime(msecs));
|
||||
};
|
||||
let origSetEasingDelay = Clutter.Actor.prototype.set_easing_delay;
|
||||
Clutter.Actor.prototype.set_easing_delay = function (msecs) {
|
||||
Clutter.Actor.prototype.set_easing_delay = function(msecs) {
|
||||
origSetEasingDelay.call(this, adjustAnimationTime(msecs));
|
||||
};
|
||||
|
||||
Clutter.Actor.prototype.ease = function (props, easingParams) {
|
||||
Clutter.Actor.prototype.ease = function(props, easingParams) {
|
||||
_easeActor(this, props, easingParams);
|
||||
};
|
||||
Clutter.Actor.prototype.ease_property = function (propName, target, params) {
|
||||
Clutter.Actor.prototype.ease_property = function(propName, target, params) {
|
||||
_easeActorProperty(this, propName, target, params);
|
||||
};
|
||||
St.Adjustment.prototype.ease = function (target, params) {
|
||||
St.Adjustment.prototype.ease = function(target, params) {
|
||||
// we're not an actor of course, but we implement the same
|
||||
// transition API as Clutter.Actor, so this works anyway
|
||||
_easeActorProperty(this, 'value', target, params);
|
||||
};
|
||||
|
||||
Clutter.Actor.prototype.toString = function () {
|
||||
Clutter.Actor.prototype.toString = function() {
|
||||
return St.describe_actor(this);
|
||||
};
|
||||
// Deprecation warning for former JS classes turned into an actor subclass
|
||||
@@ -269,17 +273,17 @@ function init() {
|
||||
let { stack } = new Error();
|
||||
log(`Usage of object.actor is deprecated for ${klass}\n${stack}`);
|
||||
return this;
|
||||
},
|
||||
}
|
||||
});
|
||||
|
||||
St.set_slow_down_factor = function (factor) {
|
||||
St.set_slow_down_factor = function(factor) {
|
||||
let { stack } = new Error();
|
||||
log(`St.set_slow_down_factor() is deprecated, use St.Settings.slow_down_factor\n${stack}`);
|
||||
St.Settings.get().slow_down_factor = factor;
|
||||
};
|
||||
|
||||
let origToString = Object.prototype.toString;
|
||||
Object.prototype.toString = function () {
|
||||
Object.prototype.toString = function() {
|
||||
let base = origToString.call(this);
|
||||
try {
|
||||
if ('actor' in this && this.actor instanceof Clutter.Actor)
|
||||
@@ -292,9 +296,8 @@ function init() {
|
||||
};
|
||||
|
||||
// Work around https://bugzilla.mozilla.org/show_bug.cgi?id=508783
|
||||
Date.prototype.toLocaleFormat = function (format) {
|
||||
let dt = GLib.DateTime.new_from_unix_local(this.getTime() / 1000);
|
||||
return dt ? dt.format(format) : '';
|
||||
Date.prototype.toLocaleFormat = function(format) {
|
||||
return Shell.util_format_date(format, this.getTime());
|
||||
};
|
||||
|
||||
let slowdownEnv = GLib.getenv('GNOME_SHELL_SLOWDOWN_FACTOR');
|
||||
|
||||
@@ -19,12 +19,12 @@ var REPOSITORY_URL_UPDATE = `${REPOSITORY_URL_BASE}/update-info/`;
|
||||
let _httpSession;
|
||||
|
||||
function installExtension(uuid, invocation) {
|
||||
let params = { uuid,
|
||||
let params = { uuid: uuid,
|
||||
shell_version: Config.PACKAGE_VERSION };
|
||||
|
||||
let message = Soup.form_request_new_from_hash('GET', REPOSITORY_URL_INFO, params);
|
||||
|
||||
_httpSession.queue_message(message, () => {
|
||||
_httpSession.queue_message(message, (session, message) => {
|
||||
if (message.status_code != Soup.KnownStatusCode.OK) {
|
||||
Main.extensionManager.logExtensionError(uuid, `downloading info: ${message.status_code}`);
|
||||
invocation.return_dbus_error('org.gnome.Shell.DownloadInfoError', message.status_code.toString());
|
||||
@@ -90,7 +90,7 @@ function gotExtensionZipFile(session, message, uuid, dir, callback, errback) {
|
||||
return;
|
||||
}
|
||||
|
||||
GLib.child_watch_add(GLib.PRIORITY_DEFAULT, pid, (o, status) => {
|
||||
GLib.child_watch_add(GLib.PRIORITY_DEFAULT, pid, (pid, status) => {
|
||||
GLib.spawn_close_pid(pid);
|
||||
|
||||
if (status != 0)
|
||||
@@ -113,7 +113,7 @@ function updateExtension(uuid) {
|
||||
let url = REPOSITORY_URL_DOWNLOAD.format(uuid);
|
||||
let message = Soup.form_request_new_from_hash('GET', url, params);
|
||||
|
||||
_httpSession.queue_message(message, session => {
|
||||
_httpSession.queue_message(message, (session, message) => {
|
||||
gotExtensionZipFile(session, message, uuid, newExtensionTmpDir, () => {
|
||||
let oldExtension = Main.extensionManager.lookup(uuid);
|
||||
let extensionDir = oldExtension.dir;
|
||||
@@ -145,8 +145,8 @@ function updateExtension(uuid) {
|
||||
}
|
||||
|
||||
FileUtils.recursivelyDeleteDir(oldExtensionTmpDir, true);
|
||||
}, (code, msg) => {
|
||||
log(`Error while updating extension ${uuid}: ${code} (${msg})`);
|
||||
}, (code, message) => {
|
||||
log('Error while updating extension %s: %s (%s)'.format(uuid, code, message ? message : ''));
|
||||
});
|
||||
});
|
||||
}
|
||||
@@ -162,7 +162,7 @@ function checkForUpdates() {
|
||||
|
||||
let url = REPOSITORY_URL_UPDATE;
|
||||
let message = Soup.form_request_new_from_hash('GET', url, params);
|
||||
_httpSession.queue_message(message, () => {
|
||||
_httpSession.queue_message(message, (session, message) => {
|
||||
if (message.status_code != Soup.KnownStatusCode.OK)
|
||||
return;
|
||||
|
||||
@@ -189,7 +189,7 @@ class InstallExtensionDialog extends ModalDialog.ModalDialog {
|
||||
this.setButtons([{
|
||||
label: _("Cancel"),
|
||||
action: this._onCancelButtonPressed.bind(this),
|
||||
key: Clutter.KEY_Escape,
|
||||
key: Clutter.Escape,
|
||||
}, {
|
||||
label: _("Install"),
|
||||
action: this._onInstallButtonPressed.bind(this),
|
||||
@@ -199,8 +199,8 @@ class InstallExtensionDialog extends ModalDialog.ModalDialog {
|
||||
let content = new Dialog.MessageDialogContent({
|
||||
title: _("Download and install “%s” from extensions.gnome.org?").format(info.name),
|
||||
icon: new Gio.FileIcon({
|
||||
file: Gio.File.new_for_uri(`${REPOSITORY_URL_BASE}${info.icon}`),
|
||||
}),
|
||||
file: Gio.File.new_for_uri(`${REPOSITORY_URL_BASE}${info.icon}`)
|
||||
})
|
||||
});
|
||||
|
||||
this.contentLayout.add(content);
|
||||
@@ -220,9 +220,10 @@ class InstallExtensionDialog extends ModalDialog.ModalDialog {
|
||||
let uuid = this._uuid;
|
||||
let dir = Gio.File.new_for_path(GLib.build_filenamev([global.userdatadir, 'extensions', uuid]));
|
||||
let invocation = this._invocation;
|
||||
function errback(code, msg) {
|
||||
log(`Error while installing ${uuid}: ${code} (${msg})`);
|
||||
invocation.return_dbus_error(`org.gnome.Shell.${code}`, msg || '');
|
||||
function errback(code, message) {
|
||||
let msg = message ? message.toString() : '';
|
||||
log('Error while installing %s: %s (%s)'.format(uuid, code, msg));
|
||||
invocation.return_dbus_error(`org.gnome.Shell.${code}`, msg);
|
||||
}
|
||||
|
||||
function callback() {
|
||||
@@ -240,7 +241,7 @@ class InstallExtensionDialog extends ModalDialog.ModalDialog {
|
||||
invocation.return_value(GLib.Variant.new('(s)', ['successful']));
|
||||
}
|
||||
|
||||
_httpSession.queue_message(message, session => {
|
||||
_httpSession.queue_message(message, (session, message) => {
|
||||
gotExtensionZipFile(session, message, uuid, dir, callback, errback);
|
||||
});
|
||||
|
||||
|
||||
@@ -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;
|
||||
@@ -28,23 +28,6 @@ var ExtensionManager = class {
|
||||
}
|
||||
|
||||
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, () => {
|
||||
disableFile.delete(null);
|
||||
return GLib.SOURCE_REMOVE;
|
||||
});
|
||||
|
||||
this._sessionUpdated();
|
||||
}
|
||||
|
||||
@@ -77,11 +60,11 @@ var ExtensionManager = class {
|
||||
let orderReversed = order.slice().reverse();
|
||||
|
||||
for (let i = 0; i < orderReversed.length; i++) {
|
||||
let otherUuid = orderReversed[i];
|
||||
let uuid = orderReversed[i];
|
||||
try {
|
||||
this.lookup(otherUuid).stateObj.disable();
|
||||
this.lookup(uuid).stateObj.disable();
|
||||
} catch (e) {
|
||||
this.logExtensionError(otherUuid, e);
|
||||
this.logExtensionError(uuid, e);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -98,11 +81,11 @@ var ExtensionManager = class {
|
||||
}
|
||||
|
||||
for (let i = 0; i < order.length; i++) {
|
||||
let otherUuid = order[i];
|
||||
let uuid = order[i];
|
||||
try {
|
||||
this.lookup(otherUuid).stateObj.enable();
|
||||
this.lookup(uuid).stateObj.enable();
|
||||
} catch (e) {
|
||||
this.logExtensionError(otherUuid, e);
|
||||
this.logExtensionError(uuid, e);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -217,8 +200,9 @@ var ExtensionManager = class {
|
||||
|
||||
createExtensionObject(uuid, dir, type) {
|
||||
let metadataFile = dir.get_child('metadata.json');
|
||||
if (!metadataFile.query_exists(null))
|
||||
if (!metadataFile.query_exists(null)) {
|
||||
throw new Error('Missing metadata.json');
|
||||
}
|
||||
|
||||
let metadataContents, success_;
|
||||
try {
|
||||
@@ -238,12 +222,14 @@ var ExtensionManager = class {
|
||||
let requiredProperties = ['uuid', 'name', 'description', 'shell-version'];
|
||||
for (let i = 0; i < requiredProperties.length; i++) {
|
||||
let prop = requiredProperties[i];
|
||||
if (!meta[prop])
|
||||
if (!meta[prop]) {
|
||||
throw new Error(`missing "${prop}" property in metadata.json`);
|
||||
}
|
||||
}
|
||||
|
||||
if (uuid != meta.uuid)
|
||||
if (uuid != meta.uuid) {
|
||||
throw new Error(`uuid "${meta.uuid}" from metadata.json does not match directory name "${uuid}"`);
|
||||
}
|
||||
|
||||
let extension = {
|
||||
metadata: meta,
|
||||
@@ -253,7 +239,7 @@ var ExtensionManager = class {
|
||||
path: dir.get_path(),
|
||||
error: '',
|
||||
hasPrefs: dir.get_child('prefs.js').query_exists(null),
|
||||
canChange: false,
|
||||
canChange: false
|
||||
};
|
||||
this._extensions.set(uuid, extension);
|
||||
|
||||
|
||||
@@ -195,7 +195,7 @@ var GrabHelper = class GrabHelper {
|
||||
}
|
||||
|
||||
_takeModalGrab() {
|
||||
let firstGrab = this._modalCount == 0;
|
||||
let firstGrab = (this._modalCount == 0);
|
||||
if (firstGrab) {
|
||||
if (!Main.pushModal(this._owner, this._modalParams))
|
||||
return false;
|
||||
@@ -292,7 +292,7 @@ var GrabHelper = class GrabHelper {
|
||||
let touchEnd = type == Clutter.EventType.TOUCH_END;
|
||||
let touch = touchUpdate || touchBegin || touchEnd;
|
||||
|
||||
if (touch && !global.display.is_pointer_emulating_sequence(event.get_event_sequence()))
|
||||
if (touch && !global.display.is_pointer_emulating_sequence (event.get_event_sequence()))
|
||||
return Clutter.EVENT_PROPAGATE;
|
||||
|
||||
if (this._ignoreUntilRelease && (motion || release || touch)) {
|
||||
|
||||
@@ -20,13 +20,13 @@ var CandidateArea = GObject.registerClass({
|
||||
'cursor-up': {},
|
||||
'next-page': {},
|
||||
'previous-page': {},
|
||||
},
|
||||
}
|
||||
}, class CandidateArea extends St.BoxLayout {
|
||||
_init() {
|
||||
super._init({
|
||||
vertical: true,
|
||||
reactive: true,
|
||||
visible: false,
|
||||
visible: false
|
||||
});
|
||||
this._candidateBoxes = [];
|
||||
for (let i = 0; i < MAX_CANDIDATES_PER_PAGE; ++i) {
|
||||
@@ -35,8 +35,8 @@ var CandidateArea = GObject.registerClass({
|
||||
track_hover: true });
|
||||
box._indexLabel = new St.Label({ style_class: 'candidate-index' });
|
||||
box._candidateLabel = new St.Label({ style_class: 'candidate-label' });
|
||||
box.add_child(box._indexLabel);
|
||||
box.add_child(box._candidateLabel);
|
||||
box.add(box._indexLabel, { y_fill: false });
|
||||
box.add(box._candidateLabel, { y_fill: false });
|
||||
this._candidateBoxes.push(box);
|
||||
this.add(box);
|
||||
|
||||
@@ -49,19 +49,13 @@ var CandidateArea = GObject.registerClass({
|
||||
|
||||
this._buttonBox = new St.BoxLayout({ style_class: 'candidate-page-button-box' });
|
||||
|
||||
this._previousButton = new St.Button({
|
||||
style_class: 'candidate-page-button candidate-page-button-previous button',
|
||||
x_expand: true,
|
||||
});
|
||||
this._previousButton = new St.Button({ style_class: 'candidate-page-button candidate-page-button-previous button' });
|
||||
this._previousButton.child = new St.Icon({ style_class: 'candidate-page-button-icon' });
|
||||
this._buttonBox.add_child(this._previousButton);
|
||||
this._buttonBox.add(this._previousButton, { expand: true });
|
||||
|
||||
this._nextButton = new St.Button({
|
||||
style_class: 'candidate-page-button candidate-page-button-next button',
|
||||
x_expand: true,
|
||||
});
|
||||
this._nextButton = new St.Button({ style_class: 'candidate-page-button candidate-page-button-next button' });
|
||||
this._nextButton.child = new St.Icon({ style_class: 'candidate-page-button-icon' });
|
||||
this._buttonBox.add_child(this._nextButton);
|
||||
this._buttonBox.add(this._nextButton, { expand: true });
|
||||
|
||||
this.add(this._buttonBox);
|
||||
|
||||
@@ -118,7 +112,7 @@ var CandidateArea = GObject.registerClass({
|
||||
if (!visible)
|
||||
continue;
|
||||
|
||||
box._indexLabel.text = indexes && indexes[i] ? indexes[i] : DEFAULT_INDEX_LABELS[i];
|
||||
box._indexLabel.text = ((indexes && indexes[i]) ? indexes[i] : DEFAULT_INDEX_LABELS[i]);
|
||||
box._candidateLabel.text = candidates[i];
|
||||
}
|
||||
|
||||
@@ -215,10 +209,9 @@ class IbusCandidatePopup extends BoxPointer.BoxPointer {
|
||||
this._preeditText.text = text.get_text();
|
||||
|
||||
let attrs = text.get_attributes();
|
||||
if (attrs) {
|
||||
if (attrs)
|
||||
this._setTextAttributes(this._preeditText.clutter_text,
|
||||
attrs);
|
||||
}
|
||||
});
|
||||
panelService.connect('show-preedit-text', () => {
|
||||
this._preeditText.show();
|
||||
@@ -250,7 +243,7 @@ class IbusCandidatePopup extends BoxPointer.BoxPointer {
|
||||
let cursorPos = lookupTable.get_cursor_pos();
|
||||
let pageSize = lookupTable.get_page_size();
|
||||
let nPages = Math.ceil(nCandidates / pageSize);
|
||||
let page = cursorPos == 0 ? 0 : Math.floor(cursorPos / pageSize);
|
||||
let page = ((cursorPos == 0) ? 0 : Math.floor(cursorPos / pageSize));
|
||||
let startIndex = page * pageSize;
|
||||
let endIndex = Math.min((page + 1) * pageSize, nCandidates);
|
||||
|
||||
@@ -301,15 +294,15 @@ class IbusCandidatePopup extends BoxPointer.BoxPointer {
|
||||
}
|
||||
|
||||
_updateVisibility() {
|
||||
let isVisible = !Main.keyboard.visible &&
|
||||
let isVisible = (!Main.keyboard.visible &&
|
||||
(this._preeditText.visible ||
|
||||
this._auxText.visible ||
|
||||
this._candidateArea.visible);
|
||||
this._candidateArea.visible));
|
||||
|
||||
if (isVisible) {
|
||||
this.setPosition(this._dummyCursor, 0);
|
||||
this.open(BoxPointer.PopupAnimation.NONE);
|
||||
this.get_parent().set_child_above_sibling(this, null);
|
||||
this.raise_top();
|
||||
} else {
|
||||
this.close(BoxPointer.PopupAnimation.NONE);
|
||||
}
|
||||
@@ -317,9 +310,8 @@ class IbusCandidatePopup extends BoxPointer.BoxPointer {
|
||||
|
||||
_setTextAttributes(clutterText, ibusAttrList) {
|
||||
let attr;
|
||||
for (let i = 0; (attr = ibusAttrList.get(i)); ++i) {
|
||||
for (let i = 0; (attr = ibusAttrList.get(i)); ++i)
|
||||
if (attr.get_attr_type() == IBus.AttrType.BACKGROUND)
|
||||
clutterText.set_selection(attr.get_start_index(), attr.get_end_index());
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
@@ -22,7 +22,7 @@ var ANIMATION_BOUNCE_ICON_SCALE = 1.1;
|
||||
|
||||
var AnimationDirection = {
|
||||
IN: 0,
|
||||
OUT: 1,
|
||||
OUT: 1
|
||||
};
|
||||
|
||||
var APPICON_ANIMATION_OUT_SCALE = 3;
|
||||
@@ -39,19 +39,18 @@ class BaseIcon extends St.Bin {
|
||||
if (params.showLabel)
|
||||
styleClass += ' overview-icon-with-label';
|
||||
|
||||
super._init({ style_class: styleClass });
|
||||
super._init({ style_class: styleClass,
|
||||
x_fill: true,
|
||||
y_fill: true });
|
||||
|
||||
this.connect('destroy', this._onDestroy.bind(this));
|
||||
|
||||
this._box = new St.BoxLayout({
|
||||
vertical: true,
|
||||
x_expand: true,
|
||||
y_expand: true,
|
||||
});
|
||||
this._box = new St.BoxLayout({ vertical: true });
|
||||
this.set_child(this._box);
|
||||
|
||||
this.iconSize = ICON_SIZE;
|
||||
this._iconBin = new St.Bin();
|
||||
this._iconBin = new St.Bin({ x_align: St.Align.MIDDLE,
|
||||
y_align: St.Align.MIDDLE });
|
||||
|
||||
this._box.add_actor(this._iconBin);
|
||||
|
||||
@@ -59,7 +58,7 @@ class BaseIcon extends St.Bin {
|
||||
this.label = new St.Label({ text: label });
|
||||
this.label.clutter_text.set({
|
||||
x_align: Clutter.ActorAlign.CENTER,
|
||||
y_align: Clutter.ActorAlign.CENTER,
|
||||
y_align: Clutter.ActorAlign.CENTER
|
||||
});
|
||||
this._box.add_actor(this.label);
|
||||
} else {
|
||||
@@ -190,7 +189,7 @@ function zoomOutActorAtPos(actor, x, y) {
|
||||
opacity: 0,
|
||||
duration: APPICON_ANIMATION_OUT_TIME,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
onComplete: () => actorClone.destroy(),
|
||||
onComplete: () => actorClone.destroy()
|
||||
});
|
||||
}
|
||||
|
||||
@@ -246,7 +245,7 @@ var IconGrid = GObject.registerClass({
|
||||
|
||||
_onDestroy() {
|
||||
if (this._updateIconSizesLaterId) {
|
||||
Meta.later_remove(this._updateIconSizesLaterId);
|
||||
Meta.later_remove (this._updateIconSizesLaterId);
|
||||
this._updateIconSizesLaterId = 0;
|
||||
}
|
||||
}
|
||||
@@ -432,7 +431,7 @@ var IconGrid = GObject.registerClass({
|
||||
return true;
|
||||
}
|
||||
|
||||
/*
|
||||
/**
|
||||
* Intended to be override by subclasses if they need a different
|
||||
* set of items to be animated.
|
||||
*/
|
||||
@@ -455,10 +454,9 @@ var IconGrid = GObject.registerClass({
|
||||
}
|
||||
|
||||
animatePulse(animationDirection) {
|
||||
if (animationDirection != AnimationDirection.IN) {
|
||||
if (animationDirection != AnimationDirection.IN)
|
||||
throw new GObject.NotImplementedError("Pulse animation only implements " +
|
||||
"'in' animation direction");
|
||||
}
|
||||
|
||||
this._resetAnimationActors();
|
||||
|
||||
@@ -488,7 +486,7 @@ var IconGrid = GObject.registerClass({
|
||||
scale_y: ANIMATION_BOUNCE_ICON_SCALE,
|
||||
duration: bounceUpTime,
|
||||
mode: Clutter.AnimationMode.EASE_IN_OUT_QUAD,
|
||||
delay,
|
||||
delay: delay,
|
||||
onComplete: () => {
|
||||
let duration = ANIMATION_TIME_IN - bounceUpTime;
|
||||
actor.ease({
|
||||
@@ -500,9 +498,9 @@ var IconGrid = GObject.registerClass({
|
||||
if (isLastItem)
|
||||
this._animationDone();
|
||||
actor.reactive = true;
|
||||
},
|
||||
}
|
||||
});
|
||||
},
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -569,7 +567,7 @@ var IconGrid = GObject.registerClass({
|
||||
scale_y: 1,
|
||||
duration: ANIMATION_TIME_IN,
|
||||
mode: Clutter.AnimationMode.EASE_IN_OUT_QUAD,
|
||||
delay,
|
||||
delay
|
||||
};
|
||||
|
||||
if (isLastItem)
|
||||
@@ -579,7 +577,7 @@ var IconGrid = GObject.registerClass({
|
||||
opacity: 255,
|
||||
duration: ANIMATION_FADE_IN_TIME_FOR_ITEM,
|
||||
mode: Clutter.AnimationMode.EASE_IN_OUT_QUAD,
|
||||
delay,
|
||||
delay
|
||||
};
|
||||
} else {
|
||||
let isLastItem = actor._distance == maxDist;
|
||||
@@ -595,7 +593,7 @@ var IconGrid = GObject.registerClass({
|
||||
scale_y: scaleY,
|
||||
duration: ANIMATION_TIME_OUT,
|
||||
mode: Clutter.AnimationMode.EASE_IN_OUT_QUAD,
|
||||
delay,
|
||||
delay
|
||||
};
|
||||
|
||||
if (isLastItem)
|
||||
@@ -605,7 +603,7 @@ var IconGrid = GObject.registerClass({
|
||||
opacity: 0,
|
||||
duration: ANIMATION_FADE_IN_TIME_FOR_ITEM,
|
||||
mode: Clutter.AnimationMode.EASE_IN_OUT_QUAD,
|
||||
delay: ANIMATION_TIME_OUT + delay - ANIMATION_FADE_IN_TIME_FOR_ITEM,
|
||||
delay: ANIMATION_TIME_OUT + delay - ANIMATION_FADE_IN_TIME_FOR_ITEM
|
||||
};
|
||||
}
|
||||
|
||||
@@ -678,8 +676,8 @@ var IconGrid = GObject.registerClass({
|
||||
|
||||
nRows(forWidth) {
|
||||
let children = this._getVisibleChildren();
|
||||
let nColumns = forWidth < 0 ? children.length : this._computeLayout(forWidth)[0];
|
||||
let nRows = nColumns > 0 ? Math.ceil(children.length / nColumns) : 0;
|
||||
let nColumns = (forWidth < 0) ? children.length : this._computeLayout(forWidth)[0];
|
||||
let nRows = (nColumns > 0) ? Math.ceil(children.length / nColumns) : 0;
|
||||
if (this._rowLimit)
|
||||
nRows = Math.min(nRows, this._rowLimit);
|
||||
return nRows;
|
||||
@@ -785,7 +783,7 @@ var IconGrid = GObject.registerClass({
|
||||
this.topPadding = this.rightPadding = this.bottomPadding = this.leftPadding = spacing;
|
||||
}
|
||||
|
||||
/*
|
||||
/**
|
||||
* This function must to be called before iconGrid allocation,
|
||||
* to know how much spacing can the grid has
|
||||
*/
|
||||
@@ -798,7 +796,7 @@ var IconGrid = GObject.registerClass({
|
||||
let neededWidth = this.usedWidthForNColumns(this._minColumns) - availWidth;
|
||||
let neededHeight = this.usedHeightForNRows(this._minRows) - availHeight;
|
||||
|
||||
let neededSpacePerItem = neededWidth > neededHeight
|
||||
let neededSpacePerItem = (neededWidth > neededHeight)
|
||||
? Math.ceil(neededWidth / this._minColumns)
|
||||
: Math.ceil(neededHeight / this._minRows);
|
||||
this._fixedHItemSize = Math.max(this._hItemSize - neededSpacePerItem, MIN_ICON_SIZE);
|
||||
@@ -806,10 +804,9 @@ var IconGrid = GObject.registerClass({
|
||||
|
||||
this._updateSpacingForSize(availWidth, availHeight);
|
||||
}
|
||||
if (!this._updateIconSizesLaterId) {
|
||||
if (!this._updateIconSizesLaterId)
|
||||
this._updateIconSizesLaterId = Meta.later_add(Meta.LaterType.BEFORE_REDRAW,
|
||||
this._updateIconSizes.bind(this));
|
||||
}
|
||||
}
|
||||
|
||||
// Note that this is ICON_SIZE as used by BaseIcon, not elsewhere in IconGrid; it's a bit messed up
|
||||
@@ -817,9 +814,9 @@ var IconGrid = GObject.registerClass({
|
||||
this._updateIconSizesLaterId = 0;
|
||||
let scale = Math.min(this._fixedHItemSize, this._fixedVItemSize) / Math.max(this._hItemSize, this._vItemSize);
|
||||
let newIconSize = Math.floor(ICON_SIZE * scale);
|
||||
for (let i in this._items)
|
||||
for (let i in this._items) {
|
||||
this._items[i].icon.setIconSize(newIconSize);
|
||||
|
||||
}
|
||||
return GLib.SOURCE_REMOVE;
|
||||
}
|
||||
});
|
||||
@@ -881,9 +878,9 @@ var PaginatedIconGrid = GObject.registerClass({
|
||||
children[i].show();
|
||||
|
||||
columnIndex++;
|
||||
if (columnIndex == nColumns)
|
||||
if (columnIndex == nColumns) {
|
||||
columnIndex = 0;
|
||||
|
||||
}
|
||||
if (columnIndex == 0) {
|
||||
y += this._getVItemSize() + spacing;
|
||||
if ((i + 1) % this._childrenPerPage == 0)
|
||||
@@ -958,10 +955,9 @@ var PaginatedIconGrid = GObject.registerClass({
|
||||
|
||||
/**
|
||||
* openExtraSpace:
|
||||
* @param {Clutter.Actor} sourceItem: item for which to create extra space
|
||||
* @param {St.Side} side: where @sourceItem should be located relative to
|
||||
* the created space
|
||||
* @param {number} nRows: the amount of space to create
|
||||
* @sourceItem: the item for which to create extra space
|
||||
* @side: where @sourceItem should be located relative to the created space
|
||||
* @nRows: the amount of space to create
|
||||
*
|
||||
* Pan view to create extra space for @nRows above or below @sourceItem.
|
||||
*/
|
||||
@@ -977,7 +973,7 @@ 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;
|
||||
@@ -1020,7 +1016,7 @@ var PaginatedIconGrid = GObject.registerClass({
|
||||
let params = {
|
||||
translation_y: translationY,
|
||||
duration: EXTRA_SPACE_ANIMATION_TIME,
|
||||
mode: Clutter.AnimationMode.EASE_IN_OUT_QUAD,
|
||||
mode: Clutter.AnimationMode.EASE_IN_OUT_QUAD
|
||||
};
|
||||
if (i == (children.length - 1))
|
||||
params.onComplete = () => this.emit('space-opened');
|
||||
@@ -1041,7 +1037,7 @@ var PaginatedIconGrid = GObject.registerClass({
|
||||
translation_y: 0,
|
||||
duration: EXTRA_SPACE_ANIMATION_TIME,
|
||||
mode: Clutter.AnimationMode.EASE_IN_OUT_QUAD,
|
||||
onComplete: () => this.emit('space-closed'),
|
||||
onComplete: () => this.emit('space-closed')
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18,8 +18,8 @@ var DialogResponse = Meta.InhibitShortcutsDialogResponse;
|
||||
var InhibitShortcutsDialog = GObject.registerClass({
|
||||
Implements: [Meta.InhibitShortcutsDialog],
|
||||
Properties: {
|
||||
'window': GObject.ParamSpec.override('window', Meta.InhibitShortcutsDialog),
|
||||
},
|
||||
'window': GObject.ParamSpec.override('window', Meta.InhibitShortcutsDialog)
|
||||
}
|
||||
}, class InhibitShortcutsDialog extends GObject.Object {
|
||||
_init(window) {
|
||||
super._init();
|
||||
@@ -84,11 +84,10 @@ var InhibitShortcutsDialog = GObject.registerClass({
|
||||
let contentParams = { icon, title };
|
||||
|
||||
let restoreAccel = this._getRestoreAccel();
|
||||
if (restoreAccel) {
|
||||
if (restoreAccel)
|
||||
contentParams.subtitle =
|
||||
/* Translators: %s is a keyboard shortcut like "Super+x" */
|
||||
_("You can restore shortcuts by pressing %s.").format(restoreAccel);
|
||||
}
|
||||
|
||||
let content = new Dialog.MessageDialogContent(contentParams);
|
||||
this._dialog.contentLayout.add_actor(content);
|
||||
@@ -135,10 +134,10 @@ var InhibitShortcutsDialog = GObject.registerClass({
|
||||
|
||||
this._permStore.LookupRemote(APP_PERMISSIONS_TABLE,
|
||||
APP_PERMISSIONS_ID,
|
||||
(res, err) => {
|
||||
if (err) {
|
||||
(res, error) => {
|
||||
if (error) {
|
||||
this._dialog.open();
|
||||
log(err.message);
|
||||
log(error.message);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -61,7 +61,7 @@ class KbdA11yDialog extends GObject.Object {
|
||||
dialog.close();
|
||||
},
|
||||
default: enabled,
|
||||
key: !enabled ? Clutter.KEY_Escape : null });
|
||||
key: !enabled ? Clutter.Escape : null });
|
||||
|
||||
dialog.addButton({ label: enabled ? _("Turn Off") : _("Leave Off"),
|
||||
action: () => {
|
||||
@@ -69,7 +69,7 @@ class KbdA11yDialog extends GObject.Object {
|
||||
dialog.close();
|
||||
},
|
||||
default: !enabled,
|
||||
key: enabled ? Clutter.KEY_Escape : null });
|
||||
key: enabled ? Clutter.Escape : null });
|
||||
|
||||
dialog.open();
|
||||
}
|
||||
|
||||
@@ -92,7 +92,7 @@ class KeyContainer extends St.Widget {
|
||||
super._init({
|
||||
layout_manager: gridLayout,
|
||||
x_expand: true,
|
||||
y_expand: true,
|
||||
y_expand: true
|
||||
});
|
||||
this._gridLayout = gridLayout;
|
||||
this._currentRow = 0;
|
||||
@@ -120,7 +120,7 @@ class KeyContainer extends St.Widget {
|
||||
left: this._currentCol,
|
||||
top: this._currentRow,
|
||||
width,
|
||||
height,
|
||||
height
|
||||
};
|
||||
|
||||
let row = this._rows[this._rows.length - 1];
|
||||
@@ -167,11 +167,7 @@ class KeyContainer extends St.Widget {
|
||||
var Suggestions = GObject.registerClass(
|
||||
class Suggestions extends St.BoxLayout {
|
||||
_init() {
|
||||
super._init({
|
||||
style_class: 'word-suggestions',
|
||||
vertical: false,
|
||||
x_align: Clutter.ActorAlign.CENTER,
|
||||
});
|
||||
super._init({ style_class: 'word-suggestions', vertical: false });
|
||||
this.show();
|
||||
}
|
||||
|
||||
@@ -255,7 +251,7 @@ var Key = GObject.registerClass({
|
||||
'long-press': {},
|
||||
'pressed': { param_types: [GObject.TYPE_UINT, GObject.TYPE_STRING] },
|
||||
'released': { param_types: [GObject.TYPE_UINT, GObject.TYPE_STRING] },
|
||||
},
|
||||
}
|
||||
}, class Key extends St.BoxLayout {
|
||||
_init(key, extendedKeys) {
|
||||
super._init({ style_class: 'key-container' });
|
||||
@@ -266,11 +262,11 @@ var Key = GObject.registerClass({
|
||||
/* Add the key in a container, so keys can be padded without losing
|
||||
* logical proportions between those.
|
||||
*/
|
||||
this.add_child(this.keyButton);
|
||||
this.add(this.keyButton, { expand: true, x_fill: true });
|
||||
this.connect('destroy', this._onDestroy.bind(this));
|
||||
|
||||
this._extendedKeys = extendedKeys;
|
||||
this._extendedKeyboard = null;
|
||||
this._extended_keys = extendedKeys;
|
||||
this._extended_keyboard = null;
|
||||
this._pressTimeoutId = 0;
|
||||
this._capturedPress = false;
|
||||
|
||||
@@ -289,13 +285,13 @@ var Key = GObject.registerClass({
|
||||
}
|
||||
|
||||
_ensureExtendedKeysPopup() {
|
||||
if (this._extendedKeys.length === 0)
|
||||
if (this._extended_keys.length == 0)
|
||||
return;
|
||||
|
||||
if (this._boxPointer)
|
||||
return;
|
||||
|
||||
this._boxPointer = new BoxPointer.BoxPointer(St.Side.BOTTOM);
|
||||
this._boxPointer = new BoxPointer.BoxPointer(St.Side.BOTTOM,
|
||||
{ x_fill: true,
|
||||
y_fill: true,
|
||||
x_align: St.Align.START });
|
||||
this._boxPointer.hide();
|
||||
Main.layoutManager.addTopChrome(this._boxPointer);
|
||||
this._boxPointer.setPosition(this.keyButton, 0.5);
|
||||
@@ -303,7 +299,7 @@ var Key = GObject.registerClass({
|
||||
// Adds style to existing keyboard style to avoid repetition
|
||||
this._boxPointer.add_style_class_name('keyboard-subkeys');
|
||||
this._getExtendedKeys();
|
||||
this.keyButton._extendedKeys = this._extendedKeyboard;
|
||||
this.keyButton._extended_keys = this._extended_keyboard;
|
||||
}
|
||||
|
||||
_getKeyval(key) {
|
||||
@@ -314,28 +310,29 @@ var Key = GObject.registerClass({
|
||||
_press(key) {
|
||||
this.emit('activated');
|
||||
|
||||
if (key !== this.key || this._extendedKeys.length === 0)
|
||||
if (key != this.key || this._extended_keys.length == 0) {
|
||||
this.emit('pressed', this._getKeyval(key), key);
|
||||
}
|
||||
|
||||
if (key == this.key) {
|
||||
this._pressTimeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT,
|
||||
KEY_LONG_PRESS_TIME,
|
||||
() => {
|
||||
this._longPress = true;
|
||||
this._pressTimeoutId = 0;
|
||||
KEY_LONG_PRESS_TIME,
|
||||
() => {
|
||||
this._longPress = true;
|
||||
this._pressTimeoutId = 0;
|
||||
|
||||
this.emit('long-press');
|
||||
this.emit('long-press');
|
||||
|
||||
if (this._extendedKeys.length > 0) {
|
||||
this._touchPressed = false;
|
||||
this._ensureExtendedKeysPopup();
|
||||
this.keyButton.set_hover(false);
|
||||
this.keyButton.fake_release();
|
||||
this._showSubkeys();
|
||||
}
|
||||
if (this._extended_keys.length > 0) {
|
||||
this._touchPressed = false;
|
||||
this.keyButton.set_hover(false);
|
||||
this.keyButton.fake_release();
|
||||
this._ensureExtendedKeysPopup();
|
||||
this._showSubkeys();
|
||||
}
|
||||
|
||||
return GLib.SOURCE_REMOVE;
|
||||
});
|
||||
return GLib.SOURCE_REMOVE;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -345,7 +342,7 @@ var Key = GObject.registerClass({
|
||||
this._pressTimeoutId = 0;
|
||||
}
|
||||
|
||||
if (!this._longPress && key === this.key && this._extendedKeys.length > 0)
|
||||
if (!this._longPress && key == this.key && this._extended_keys.length > 0)
|
||||
this.emit('pressed', this._getKeyval(key), key);
|
||||
|
||||
this.emit('released', this._getKeyval(key), key);
|
||||
@@ -365,8 +362,8 @@ var Key = GObject.registerClass({
|
||||
|
||||
_onCapturedEvent(actor, event) {
|
||||
let type = event.type();
|
||||
let press = type == Clutter.EventType.BUTTON_PRESS || type == Clutter.EventType.TOUCH_BEGIN;
|
||||
let release = type == Clutter.EventType.BUTTON_RELEASE || type == Clutter.EventType.TOUCH_END;
|
||||
let press = (type == Clutter.EventType.BUTTON_PRESS || type == Clutter.EventType.TOUCH_BEGIN);
|
||||
let release = (type == Clutter.EventType.BUTTON_RELEASE || type == Clutter.EventType.TOUCH_END);
|
||||
|
||||
if (event.get_source() == this._boxPointer.bin ||
|
||||
this._boxPointer.bin.contains(event.get_source()))
|
||||
@@ -406,11 +403,8 @@ var Key = GObject.registerClass({
|
||||
|
||||
_makeKey(key) {
|
||||
let label = GLib.markup_escape_text(key, -1);
|
||||
let button = new St.Button({
|
||||
label,
|
||||
style_class: 'keyboard-key',
|
||||
x_expand: true,
|
||||
});
|
||||
let button = new St.Button ({ label: label,
|
||||
style_class: 'keyboard-key' });
|
||||
|
||||
button.keyWidth = 1;
|
||||
button.connect('button-press-event', () => {
|
||||
@@ -448,22 +442,19 @@ var Key = GObject.registerClass({
|
||||
}
|
||||
|
||||
_getExtendedKeys() {
|
||||
this._extendedKeyboard = new St.BoxLayout({
|
||||
style_class: 'key-container',
|
||||
vertical: false,
|
||||
});
|
||||
for (let i = 0; i < this._extendedKeys.length; ++i) {
|
||||
let extendedKey = this._extendedKeys[i];
|
||||
this._extended_keyboard = new St.BoxLayout({ style_class: 'key-container',
|
||||
vertical: false });
|
||||
for (let i = 0; i < this._extended_keys.length; ++i) {
|
||||
let extendedKey = this._extended_keys[i];
|
||||
let key = this._makeKey(extendedKey);
|
||||
|
||||
key.extendedKey = extendedKey;
|
||||
this._extendedKeyboard.add(key);
|
||||
key.extended_key = extendedKey;
|
||||
this._extended_keyboard.add(key);
|
||||
|
||||
key.set_size(...this.keyButton.allocation.get_size());
|
||||
this.keyButton.connect('notify::allocation',
|
||||
() => key.set_size(...this.keyButton.allocation.get_size()));
|
||||
key.width = this.keyButton.width;
|
||||
key.height = this.keyButton.height;
|
||||
}
|
||||
this._boxPointer.bin.add_actor(this._extendedKeyboard);
|
||||
this._boxPointer.bin.add_actor(this._extended_keyboard);
|
||||
}
|
||||
|
||||
get subkeys() {
|
||||
@@ -484,17 +475,10 @@ var Key = GObject.registerClass({
|
||||
|
||||
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');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -600,20 +584,20 @@ var EmojiPager = GObject.registerClass({
|
||||
'delta': GObject.ParamSpec.int(
|
||||
'delta', 'delta', 'delta',
|
||||
GObject.ParamFlags.READWRITE,
|
||||
GLib.MININT32, GLib.MAXINT32, 0),
|
||||
GLib.MININT32, GLib.MAXINT32, 0)
|
||||
},
|
||||
Signals: {
|
||||
'emoji': { param_types: [GObject.TYPE_STRING] },
|
||||
'page-changed': {
|
||||
param_types: [GObject.TYPE_INT, GObject.TYPE_INT, GObject.TYPE_INT],
|
||||
},
|
||||
},
|
||||
param_types: [GObject.TYPE_INT, GObject.TYPE_INT, GObject.TYPE_INT]
|
||||
}
|
||||
}
|
||||
}, class EmojiPager extends St.Widget {
|
||||
_init(sections, nCols, nRows) {
|
||||
super._init({
|
||||
layout_manager: new Clutter.BinLayout(),
|
||||
reactive: true,
|
||||
clip_to_allocation: true,
|
||||
clip_to_allocation: true
|
||||
});
|
||||
this._sections = sections;
|
||||
this._nCols = nCols;
|
||||
@@ -741,7 +725,7 @@ var EmojiPager = GObject.registerClass({
|
||||
duration: time,
|
||||
onComplete: () => {
|
||||
this.setCurrentPage(this.getFollowingPage());
|
||||
},
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -887,14 +871,14 @@ var EmojiSelection = GObject.registerClass({
|
||||
'emoji-selected': { param_types: [GObject.TYPE_STRING] },
|
||||
'close-request': {},
|
||||
'toggle': {},
|
||||
},
|
||||
}
|
||||
}, class EmojiSelection extends St.BoxLayout {
|
||||
_init() {
|
||||
super._init({
|
||||
style_class: 'emoji-panel',
|
||||
x_expand: true,
|
||||
y_expand: true,
|
||||
vertical: true,
|
||||
vertical: true
|
||||
});
|
||||
|
||||
this._sections = [
|
||||
@@ -918,22 +902,17 @@ var EmojiSelection = GObject.registerClass({
|
||||
this._emojiPager.connect('emoji', (pager, str) => {
|
||||
this.emit('emoji-selected', str);
|
||||
});
|
||||
this.add_child(this._emojiPager);
|
||||
this.add(this._emojiPager, { expand: true });
|
||||
|
||||
this._pageIndicator = new PageIndicators.PageIndicators(
|
||||
Clutter.Orientation.HORIZONTAL
|
||||
);
|
||||
this.add_child(this._pageIndicator);
|
||||
this.add(this._pageIndicator, { expand: true, x_fill: false, y_fill: false });
|
||||
this._pageIndicator.setReactive(false);
|
||||
|
||||
this._emojiPager.connect('notify::delta', () => {
|
||||
this._updateIndicatorPosition();
|
||||
});
|
||||
|
||||
let bottomRow = this._createBottomRow();
|
||||
this.add_child(bottomRow);
|
||||
this.add(bottomRow, { expand: true, x_fill: false, y_fill: false });
|
||||
|
||||
this._curPage = 0;
|
||||
this._emojiPager.setCurrentPage(0);
|
||||
}
|
||||
|
||||
@@ -948,9 +927,8 @@ var EmojiSelection = GObject.registerClass({
|
||||
}
|
||||
|
||||
_onPageChanged(sectionLabel, page, nPages) {
|
||||
this._curPage = page;
|
||||
this._pageIndicator.setNPages(nPages);
|
||||
this._updateIndicatorPosition();
|
||||
this._pageIndicator.setCurrentPage(page);
|
||||
|
||||
for (let i = 0; i < this._sections.length; i++) {
|
||||
let sect = this._sections[i];
|
||||
@@ -958,11 +936,6 @@ var EmojiSelection = GObject.registerClass({
|
||||
}
|
||||
}
|
||||
|
||||
_updateIndicatorPosition() {
|
||||
this._pageIndicator.setCurrentPosition(this._curPage -
|
||||
this._emojiPager.delta / this._emojiPager.width);
|
||||
}
|
||||
|
||||
_findSection(emoji) {
|
||||
for (let i = 0; i < this._sections.length; i++) {
|
||||
if (this._sections[i].first == emoji)
|
||||
@@ -1052,7 +1025,7 @@ var EmojiSelection = GObject.registerClass({
|
||||
var Keypad = GObject.registerClass({
|
||||
Signals: {
|
||||
'keyval': { param_types: [GObject.TYPE_UINT] },
|
||||
},
|
||||
}
|
||||
}, class Keypad extends AspectContainer {
|
||||
_init() {
|
||||
let keys = [
|
||||
@@ -1073,7 +1046,7 @@ var Keypad = GObject.registerClass({
|
||||
super._init({
|
||||
layout_manager: new Clutter.BinLayout(),
|
||||
x_expand: true,
|
||||
y_expand: true,
|
||||
y_expand: true
|
||||
});
|
||||
|
||||
let gridLayout = new Clutter.GridLayout({ orientation: Clutter.Orientation.HORIZONTAL,
|
||||
@@ -1183,7 +1156,7 @@ var KeyboardManager = class KeyBoardManager {
|
||||
|
||||
let actor = event.get_source();
|
||||
return Main.layoutManager.keyboardBox.contains(actor) ||
|
||||
!!actor._extendedKeys || !!actor.extendedKey;
|
||||
!!actor._extended_keys || !!actor.extended_key;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -1288,10 +1261,10 @@ class Keyboard extends St.BoxLayout {
|
||||
this._currentPage = null;
|
||||
|
||||
this._suggestions = new Suggestions();
|
||||
this.add_child(this._suggestions);
|
||||
this.add(this._suggestions, { x_align: St.Align.MIDDLE, x_fill: false });
|
||||
|
||||
this._aspectContainer = new AspectContainer({ layout_manager: new Clutter.BinLayout() });
|
||||
this.add_child(this._aspectContainer);
|
||||
this.add(this._aspectContainer, { expand: true });
|
||||
|
||||
this._emojiSelection = new EmojiSelection();
|
||||
this._emojiSelection.connect('toggle', this._toggleEmoji.bind(this));
|
||||
@@ -1331,10 +1304,9 @@ class Keyboard extends St.BoxLayout {
|
||||
this._connectSignal(global.stage, 'notify::key-focus',
|
||||
this._onKeyFocusChanged.bind(this));
|
||||
|
||||
if (Meta.is_wayland_compositor()) {
|
||||
if (Meta.is_wayland_compositor())
|
||||
this._connectSignal(this._keyboardController, 'emoji-visible',
|
||||
this._onEmojiKeyVisible.bind(this));
|
||||
}
|
||||
|
||||
this._relayout();
|
||||
}
|
||||
@@ -1345,7 +1317,7 @@ class Keyboard extends St.BoxLayout {
|
||||
// Showing an extended key popup and clicking a key from the extended keys
|
||||
// will grab focus, but ignore that
|
||||
let extendedKeysWereFocused = this._focusInExtendedKeys;
|
||||
this._focusInExtendedKeys = focus && (focus._extendedKeys || focus.extendedKey);
|
||||
this._focusInExtendedKeys = focus && (focus._extended_keys || focus.extended_key);
|
||||
if (this._focusInExtendedKeys || extendedKeysWereFocused)
|
||||
return;
|
||||
|
||||
@@ -1374,7 +1346,7 @@ class Keyboard extends St.BoxLayout {
|
||||
* basically). We however make things consistent by skipping that
|
||||
* second level.
|
||||
*/
|
||||
let level = i >= 1 && levels.length == 3 ? i + 1 : i;
|
||||
let level = (i >= 1 && levels.length == 3) ? i + 1 : i;
|
||||
|
||||
let layout = new KeyContainer();
|
||||
layout.shiftKeys = [];
|
||||
@@ -1463,7 +1435,7 @@ class Keyboard extends St.BoxLayout {
|
||||
if (switchToLevel != null) {
|
||||
this._setActiveLayer(switchToLevel);
|
||||
// Shift only gets latched on long press
|
||||
this._latched = switchToLevel != 1;
|
||||
this._latched = (switchToLevel != 1);
|
||||
} else if (keyval != null) {
|
||||
this._keyboardController.keyvalPress(keyval);
|
||||
}
|
||||
@@ -1563,7 +1535,7 @@ class Keyboard extends St.BoxLayout {
|
||||
for (let i = 0; i < rows.length; ++i) {
|
||||
layout.appendRow();
|
||||
let [pre, post] = this._getDefaultKeysForRow(i, rows.length, level);
|
||||
this._mergeRowKeys(layout, pre, rows[i], post, numLevels);
|
||||
this._mergeRowKeys (layout, pre, rows[i], post, numLevels);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1633,7 +1605,7 @@ class Keyboard extends St.BoxLayout {
|
||||
else if (state == Clutter.InputPanelState.ON)
|
||||
enabled = true;
|
||||
else if (state == Clutter.InputPanelState.TOGGLE)
|
||||
enabled = this._keyboardVisible == false;
|
||||
enabled = (this._keyboardVisible == false);
|
||||
else
|
||||
return;
|
||||
|
||||
@@ -1688,12 +1660,12 @@ class Keyboard extends St.BoxLayout {
|
||||
|
||||
this._clearKeyboardRestTimer();
|
||||
this._keyboardRestingId = GLib.timeout_add(GLib.PRIORITY_DEFAULT,
|
||||
KEYBOARD_REST_TIME,
|
||||
() => {
|
||||
this._clearKeyboardRestTimer();
|
||||
this._open(monitor);
|
||||
return GLib.SOURCE_REMOVE;
|
||||
});
|
||||
KEYBOARD_REST_TIME,
|
||||
() => {
|
||||
this._clearKeyboardRestTimer();
|
||||
this._open(monitor);
|
||||
return GLib.SOURCE_REMOVE;
|
||||
});
|
||||
GLib.Source.set_name_by_id(this._keyboardRestingId, '[gnome-shell] this._clearKeyboardRestTimer');
|
||||
}
|
||||
|
||||
@@ -1722,12 +1694,12 @@ class Keyboard extends St.BoxLayout {
|
||||
|
||||
this._clearKeyboardRestTimer();
|
||||
this._keyboardRestingId = GLib.timeout_add(GLib.PRIORITY_DEFAULT,
|
||||
KEYBOARD_REST_TIME,
|
||||
() => {
|
||||
this._clearKeyboardRestTimer();
|
||||
this._close();
|
||||
return GLib.SOURCE_REMOVE;
|
||||
});
|
||||
KEYBOARD_REST_TIME,
|
||||
() => {
|
||||
this._clearKeyboardRestTimer();
|
||||
this._close();
|
||||
return GLib.SOURCE_REMOVE;
|
||||
});
|
||||
GLib.Source.set_name_by_id(this._keyboardRestingId, '[gnome-shell] this._clearKeyboardRestTimer');
|
||||
}
|
||||
|
||||
@@ -1778,7 +1750,7 @@ class Keyboard extends St.BoxLayout {
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
onComplete: () => {
|
||||
this._windowSlideAnimationComplete(window, -deltaY);
|
||||
},
|
||||
}
|
||||
});
|
||||
} else {
|
||||
windowActor.ease({
|
||||
@@ -1787,7 +1759,7 @@ class Keyboard extends St.BoxLayout {
|
||||
mode: Clutter.AnimationMode.EASE_IN_QUAD,
|
||||
onComplete: () => {
|
||||
this._windowSlideAnimationComplete(window, deltaY);
|
||||
},
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -1835,8 +1807,8 @@ var KeyboardController = class {
|
||||
this._inputSourceManager = InputSourceManager.getInputSourceManager();
|
||||
this._sourceChangedId = this._inputSourceManager.connect('current-source-changed',
|
||||
this._onSourceChanged.bind(this));
|
||||
this._sourcesModifiedId = this._inputSourceManager.connect('sources-changed',
|
||||
this._onSourcesModified.bind(this));
|
||||
this._sourcesModifiedId = this._inputSourceManager.connect ('sources-changed',
|
||||
this._onSourcesModified.bind(this));
|
||||
this._currentSource = this._inputSourceManager.currentSource;
|
||||
|
||||
Main.inputMethod.connect('notify::content-purpose',
|
||||
|
||||
@@ -44,7 +44,7 @@ var MonitorConstraint = GObject.registerClass({
|
||||
'work-area': GObject.ParamSpec.boolean('work-area',
|
||||
'Work-area', 'Track monitor\'s work-area',
|
||||
GObject.ParamFlags.READABLE | GObject.ParamFlags.WRITABLE,
|
||||
false),
|
||||
false)
|
||||
},
|
||||
}, class MonitorConstraint extends Clutter.Constraint {
|
||||
_init(props) {
|
||||
@@ -167,12 +167,12 @@ var Monitor = class Monitor {
|
||||
|
||||
const UiActor = GObject.registerClass(
|
||||
class UiActor extends St.Widget {
|
||||
vfunc_get_preferred_width(_forHeight) {
|
||||
vfunc_get_preferred_width (_forHeight) {
|
||||
let width = global.stage.width;
|
||||
return [width, width];
|
||||
}
|
||||
|
||||
vfunc_get_preferred_height(_forWidth) {
|
||||
vfunc_get_preferred_height (_forWidth) {
|
||||
let height = global.stage.height;
|
||||
return [height, height];
|
||||
}
|
||||
@@ -181,7 +181,7 @@ class UiActor extends St.Widget {
|
||||
const defaultParams = {
|
||||
trackFullscreen: false,
|
||||
affectsStruts: false,
|
||||
affectsInputRegion: true,
|
||||
affectsInputRegion: true
|
||||
};
|
||||
|
||||
var LayoutManager = GObject.registerClass({
|
||||
@@ -189,13 +189,12 @@ 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() {
|
||||
super._init();
|
||||
|
||||
this._rtl = Clutter.get_default_text_direction() == Clutter.TextDirection.RTL;
|
||||
this._rtl = (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL);
|
||||
this.monitors = [];
|
||||
this.primaryMonitor = null;
|
||||
this.primaryIndex = -1;
|
||||
@@ -213,6 +212,11 @@ var LayoutManager = GObject.registerClass({
|
||||
this._startingUp = true;
|
||||
this._pendingLoadBackground = false;
|
||||
|
||||
// We don't want to paint the stage background color because either
|
||||
// the SystemBackground we create or the MetaBackgroundActor inside
|
||||
// global.window_group covers the entirety of the screen.
|
||||
global.stage.no_clear_hint = true;
|
||||
|
||||
// Set up stage hierarchy to group all UI actors under one container.
|
||||
this.uiGroup = new UiActor({ name: 'uiGroup' });
|
||||
this.uiGroup.set_flags(Clutter.ActorFlags.NO_LAYOUT);
|
||||
@@ -270,11 +274,11 @@ var LayoutManager = GObject.registerClass({
|
||||
|
||||
this._backgroundGroup = new Meta.BackgroundGroup();
|
||||
global.window_group.add_child(this._backgroundGroup);
|
||||
global.window_group.set_child_below_sibling(this._backgroundGroup, null);
|
||||
this._backgroundGroup.lower_bottom();
|
||||
this._bgManagers = [];
|
||||
|
||||
this._interfaceSettings = new Gio.Settings({
|
||||
schema_id: 'org.gnome.desktop.interface',
|
||||
schema_id: 'org.gnome.desktop.interface'
|
||||
});
|
||||
|
||||
this._interfaceSettings.connect('changed::enable-hot-corners',
|
||||
@@ -340,11 +344,10 @@ var LayoutManager = GObject.registerClass({
|
||||
|
||||
this.monitors = [];
|
||||
let nMonitors = display.get_n_monitors();
|
||||
for (let i = 0; i < nMonitors; i++) {
|
||||
for (let i = 0; i < nMonitors; i++)
|
||||
this.monitors.push(new Monitor(i,
|
||||
display.get_monitor_geometry(i),
|
||||
display.get_monitor_scale(i)));
|
||||
}
|
||||
|
||||
if (nMonitors == 0) {
|
||||
this.primaryIndex = this.bottomIndex = -1;
|
||||
@@ -447,7 +450,7 @@ var LayoutManager = GObject.registerClass({
|
||||
_createBackgroundManager(monitorIndex) {
|
||||
let bgManager = new Background.BackgroundManager({ container: this._backgroundGroup,
|
||||
layoutManager: this,
|
||||
monitorIndex });
|
||||
monitorIndex: monitorIndex });
|
||||
|
||||
bgManager.connect('changed', this._addBackgroundMenu.bind(this));
|
||||
this._addBackgroundMenu(bgManager);
|
||||
@@ -464,14 +467,15 @@ var LayoutManager = GObject.registerClass({
|
||||
backgroundActor.ease({
|
||||
opacity: 255,
|
||||
duration: BACKGROUND_FADE_ANIMATION_TIME,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
_updateBackgrounds() {
|
||||
for (let i = 0; i < this._bgManagers.length; i++)
|
||||
let i;
|
||||
for (i = 0; i < this._bgManagers.length; i++)
|
||||
this._bgManagers[i].destroy();
|
||||
|
||||
this._bgManagers = [];
|
||||
@@ -699,7 +703,7 @@ var LayoutManager = GObject.registerClass({
|
||||
translation_y: 0,
|
||||
duration: STARTUP_ANIMATION_TIME,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
onComplete: () => this._startupAnimationComplete(),
|
||||
onComplete: () => this._startupAnimationComplete()
|
||||
});
|
||||
}
|
||||
|
||||
@@ -710,7 +714,7 @@ var LayoutManager = GObject.registerClass({
|
||||
opacity: 255,
|
||||
duration: STARTUP_ANIMATION_TIME,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
onComplete: () => this._startupAnimationComplete(),
|
||||
onComplete: () => this._startupAnimationComplete()
|
||||
});
|
||||
}
|
||||
|
||||
@@ -744,7 +748,7 @@ var LayoutManager = GObject.registerClass({
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
onComplete: () => {
|
||||
this._showKeyboardComplete();
|
||||
},
|
||||
}
|
||||
});
|
||||
this.emit('keyboard-visible-changed', true);
|
||||
}
|
||||
@@ -771,7 +775,7 @@ var LayoutManager = GObject.registerClass({
|
||||
mode: Clutter.AnimationMode.EASE_IN_QUAD,
|
||||
onComplete: () => {
|
||||
this._hideKeyboardComplete();
|
||||
},
|
||||
}
|
||||
});
|
||||
|
||||
this.emit('keyboard-visible-changed', false);
|
||||
@@ -957,7 +961,7 @@ var LayoutManager = GObject.registerClass({
|
||||
findIndexForActor(actor) {
|
||||
let [x, y] = actor.get_transformed_position();
|
||||
let [w, h] = actor.get_transformed_size();
|
||||
let rect = new Meta.Rectangle({ x, y, width: w, height: h });
|
||||
let rect = new Meta.Rectangle({ x: x, y: y, width: w, height: h });
|
||||
return global.display.get_monitor_index_for_rect(rect);
|
||||
}
|
||||
|
||||
@@ -972,10 +976,9 @@ var LayoutManager = GObject.registerClass({
|
||||
if (this._startingUp)
|
||||
return;
|
||||
|
||||
if (!this._updateRegionIdle) {
|
||||
if (!this._updateRegionIdle)
|
||||
this._updateRegionIdle = Meta.later_add(Meta.LaterType.BEFORE_REDRAW,
|
||||
this._updateRegions.bind(this));
|
||||
}
|
||||
}
|
||||
|
||||
_getWindowActorsForWorkspace(workspace) {
|
||||
@@ -1029,7 +1032,7 @@ var LayoutManager = GObject.registerClass({
|
||||
h = Math.round(h);
|
||||
|
||||
if (actorData.affectsInputRegion && wantsInputRegion && actorData.actor.get_paint_visibility())
|
||||
rects.push(new Meta.Rectangle({ x, y, width: w, height: h }));
|
||||
rects.push(new Meta.Rectangle({ x: x, y: y, width: w, height: h }));
|
||||
|
||||
let monitor = null;
|
||||
if (actorData.affectsStruts)
|
||||
@@ -1080,7 +1083,7 @@ var LayoutManager = GObject.registerClass({
|
||||
}
|
||||
|
||||
let strutRect = new Meta.Rectangle({ x: x1, y: y1, width: x2 - x1, height: y2 - y1 });
|
||||
let strut = new Meta.Strut({ rect: strutRect, side });
|
||||
let strut = new Meta.Strut({ rect: strutRect, side: side });
|
||||
struts.push(strut);
|
||||
}
|
||||
}
|
||||
@@ -1189,7 +1192,7 @@ class HotCorner extends Clutter.Actor {
|
||||
y: this._y,
|
||||
width: 3,
|
||||
height: 3,
|
||||
reactive: true,
|
||||
reactive: true
|
||||
});
|
||||
|
||||
this._corner = new Clutter.Actor({ name: 'hot-corner',
|
||||
|
||||
@@ -33,8 +33,8 @@ var RadialShaderEffect = GObject.registerClass({
|
||||
'sharpness', 'sharpness', 'sharpness',
|
||||
GObject.ParamFlags.READWRITE,
|
||||
0, 1, 0
|
||||
),
|
||||
},
|
||||
)
|
||||
}
|
||||
}, class RadialShaderEffect extends Shell.GLSLEffect {
|
||||
_init(params) {
|
||||
this._brightness = undefined;
|
||||
@@ -109,7 +109,7 @@ var Lightbox = GObject.registerClass({
|
||||
Properties: {
|
||||
'active': GObject.ParamSpec.boolean(
|
||||
'active', 'active', 'active', GObject.ParamFlags.READABLE, false),
|
||||
},
|
||||
}
|
||||
}, class Lightbox extends St.Bin {
|
||||
_init(container, params) {
|
||||
params = Params.parse(params, {
|
||||
@@ -124,7 +124,7 @@ var Lightbox = GObject.registerClass({
|
||||
reactive: params.inhibitEvents,
|
||||
width: params.width,
|
||||
height: params.height,
|
||||
visible: false,
|
||||
visible: false
|
||||
});
|
||||
|
||||
this._active = false;
|
||||
@@ -139,14 +139,14 @@ var Lightbox = GObject.registerClass({
|
||||
this.set({ opacity: 0, style_class: 'lightbox' });
|
||||
|
||||
container.add_actor(this);
|
||||
container.set_child_above_sibling(this, null);
|
||||
this.raise_top();
|
||||
|
||||
this.connect('destroy', this._onDestroy.bind(this));
|
||||
|
||||
if (!params.width || !params.height) {
|
||||
this.add_constraint(new Clutter.BindConstraint({
|
||||
source: container,
|
||||
coordinate: Clutter.BindCoordinate.ALL,
|
||||
coordinate: Clutter.BindCoordinate.ALL
|
||||
}));
|
||||
}
|
||||
|
||||
@@ -187,7 +187,7 @@ var Lightbox = GObject.registerClass({
|
||||
|
||||
let easeProps = {
|
||||
duration: fadeInTime || 0,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD
|
||||
};
|
||||
|
||||
let onComplete = () => {
|
||||
@@ -206,7 +206,7 @@ var Lightbox = GObject.registerClass({
|
||||
} else {
|
||||
this.ease(Object.assign(easeProps, {
|
||||
opacity: 255 * this._fadeFactor,
|
||||
onComplete,
|
||||
onComplete
|
||||
}));
|
||||
}
|
||||
}
|
||||
@@ -219,7 +219,7 @@ var Lightbox = GObject.registerClass({
|
||||
|
||||
let easeProps = {
|
||||
duration: fadeOutTime || 0,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD
|
||||
};
|
||||
|
||||
let onComplete = () => this.hide();
|
||||
@@ -245,7 +245,7 @@ var Lightbox = GObject.registerClass({
|
||||
|
||||
/**
|
||||
* highlight:
|
||||
* @param {Clutter.Actor=} window: actor to highlight
|
||||
* @window: actor to highlight
|
||||
*
|
||||
* Highlights the indicated actor and unhighlights any other
|
||||
* currently-highlighted actor. With no arguments or a false/null
|
||||
@@ -264,9 +264,9 @@ var Lightbox = GObject.registerClass({
|
||||
let below = this;
|
||||
for (let i = this._children.length - 1; i >= 0; i--) {
|
||||
if (this._children[i] == window)
|
||||
this._container.set_child_above_sibling(this._children[i], null);
|
||||
this._children[i].raise_top();
|
||||
else if (this._children[i] == this._highlighted)
|
||||
this._container.set_child_below_sibling(this._children[i], below);
|
||||
this._children[i].lower(below);
|
||||
else
|
||||
below = this._children[i];
|
||||
}
|
||||
|
||||
@@ -54,9 +54,9 @@ var AutoComplete = class AutoComplete {
|
||||
}
|
||||
|
||||
_processCompletionRequest(event) {
|
||||
if (event.completions.length == 0)
|
||||
if (event.completions.length == 0) {
|
||||
return;
|
||||
|
||||
}
|
||||
// Unique match = go ahead and complete; multiple matches + single tab = complete the common starting string;
|
||||
// multiple matches + double tab = emit a suggest event with all possible options
|
||||
if (event.completions.length == 1) {
|
||||
@@ -78,20 +78,20 @@ var AutoComplete = class AutoComplete {
|
||||
_entryKeyPressEvent(actor, event) {
|
||||
let cursorPos = this._entry.clutter_text.get_cursor_position();
|
||||
let text = this._entry.get_text();
|
||||
if (cursorPos != -1)
|
||||
if (cursorPos != -1) {
|
||||
text = text.slice(0, cursorPos);
|
||||
|
||||
if (event.get_key_symbol() == Clutter.KEY_Tab) {
|
||||
}
|
||||
if (event.get_key_symbol() == Clutter.Tab) {
|
||||
let [completions, attrHead] = JsParse.getCompletions(text, commandHeader, AUTO_COMPLETE_GLOBAL_KEYWORDS);
|
||||
let currTime = global.get_current_time();
|
||||
if ((currTime - this._lastTabTime) < AUTO_COMPLETE_DOUBLE_TAB_DELAY) {
|
||||
this._processCompletionRequest({ tabType: 'double',
|
||||
completions,
|
||||
attrHead });
|
||||
completions: completions,
|
||||
attrHead: attrHead });
|
||||
} else {
|
||||
this._processCompletionRequest({ tabType: 'single',
|
||||
completions,
|
||||
attrHead });
|
||||
completions: completions,
|
||||
attrHead: attrHead });
|
||||
}
|
||||
this._lastTabTime = currTime;
|
||||
}
|
||||
@@ -114,10 +114,7 @@ var Notebook = GObject.registerClass({
|
||||
Signals: { 'selection': { param_types: [Clutter.Actor.$gtype] } },
|
||||
}, class Notebook extends St.BoxLayout {
|
||||
_init() {
|
||||
super._init({
|
||||
vertical: true,
|
||||
y_expand: true,
|
||||
});
|
||||
super._init({ vertical: true });
|
||||
|
||||
this.tabControls = new St.BoxLayout({ style_class: 'labels' });
|
||||
|
||||
@@ -134,21 +131,21 @@ var Notebook = GObject.registerClass({
|
||||
this.selectChild(child);
|
||||
return true;
|
||||
});
|
||||
labelBox.add_child(label);
|
||||
labelBox.add(label, { expand: true });
|
||||
this.tabControls.add(labelBox);
|
||||
|
||||
let scrollview = new St.ScrollView({ y_expand: true });
|
||||
let scrollview = new St.ScrollView({ x_fill: true, y_fill: true });
|
||||
scrollview.get_hscroll_bar().hide();
|
||||
scrollview.add_actor(child);
|
||||
|
||||
let tabData = { child,
|
||||
labelBox,
|
||||
label,
|
||||
let tabData = { child: child,
|
||||
labelBox: labelBox,
|
||||
label: label,
|
||||
scrollView: scrollview,
|
||||
_scrollToBottom: false };
|
||||
this._tabs.push(tabData);
|
||||
scrollview.hide();
|
||||
this.add_child(scrollview);
|
||||
this.add(scrollview, { expand: true });
|
||||
|
||||
let vAdjust = scrollview.vscroll.adjustment;
|
||||
vAdjust.connect('changed', () => this._onAdjustScopeChanged(tabData));
|
||||
@@ -224,16 +221,18 @@ var Notebook = GObject.registerClass({
|
||||
|
||||
nextTab() {
|
||||
let nextIndex = this._selectedIndex;
|
||||
if (nextIndex < this._tabs.length - 1)
|
||||
if (nextIndex < this._tabs.length - 1) {
|
||||
++nextIndex;
|
||||
}
|
||||
|
||||
this.selectIndex(nextIndex);
|
||||
}
|
||||
|
||||
prevTab() {
|
||||
let prevIndex = this._selectedIndex;
|
||||
if (prevIndex > 0)
|
||||
if (prevIndex > 0) {
|
||||
--prevIndex;
|
||||
}
|
||||
|
||||
this.selectIndex(prevIndex);
|
||||
}
|
||||
@@ -262,8 +261,7 @@ class ObjLink extends St.Button {
|
||||
reactive: true,
|
||||
track_hover: true,
|
||||
style_class: 'shell-link',
|
||||
label: text,
|
||||
x_align: Clutter.ActorAlign.START,
|
||||
label: text
|
||||
});
|
||||
this.get_child().single_line_mode = true;
|
||||
|
||||
@@ -276,8 +274,9 @@ class ObjLink extends St.Button {
|
||||
}
|
||||
});
|
||||
|
||||
var Result = GObject.registerClass(
|
||||
class Result extends St.BoxLayout {
|
||||
var Result = GObject.registerClass({
|
||||
GTypeName: 'LookingClass_Result'
|
||||
}, class Result extends St.BoxLayout {
|
||||
_init(lookingGlass, command, o, index) {
|
||||
super._init({ vertical: true });
|
||||
|
||||
@@ -300,6 +299,7 @@ class Result extends St.BoxLayout {
|
||||
});
|
||||
|
||||
var WindowList = GObject.registerClass({
|
||||
GTypeName: 'LookingClass_WindowList'
|
||||
}, class WindowList extends St.BoxLayout {
|
||||
_init(lookingGlass) {
|
||||
super._init({ name: 'Windows', vertical: true, style: 'spacing: 8px' });
|
||||
@@ -328,7 +328,7 @@ var WindowList = GObject.registerClass({
|
||||
let box = new St.BoxLayout({ vertical: true });
|
||||
this.add(box);
|
||||
let windowLink = new ObjLink(this._lookingGlass, metaWindow, metaWindow.title);
|
||||
box.add_child(windowLink);
|
||||
box.add(windowLink, { x_align: St.Align.START, x_fill: false });
|
||||
let propsBox = new St.BoxLayout({ vertical: true, style: 'padding-left: 6px;' });
|
||||
box.add(propsBox);
|
||||
propsBox.add(new St.Label({ text: `wmclass: ${metaWindow.get_wm_class()}` }));
|
||||
@@ -337,10 +337,10 @@ var WindowList = GObject.registerClass({
|
||||
let icon = app.create_icon_texture(22);
|
||||
let propBox = new St.BoxLayout({ style: 'spacing: 6px; ' });
|
||||
propsBox.add(propBox);
|
||||
propBox.add_child(new St.Label({ text: 'app: ' }));
|
||||
propBox.add(new St.Label({ text: 'app: ' }), { y_fill: false });
|
||||
let appLink = new ObjLink(this._lookingGlass, app, app.get_id());
|
||||
propBox.add_child(appLink);
|
||||
propBox.add_child(icon);
|
||||
propBox.add(appLink, { y_fill: false });
|
||||
propBox.add(icon, { y_fill: false });
|
||||
} else {
|
||||
propsBox.add(new St.Label({ text: '<untracked>' }));
|
||||
}
|
||||
@@ -357,6 +357,8 @@ class ObjInspector extends St.ScrollView {
|
||||
_init(lookingGlass) {
|
||||
super._init({
|
||||
pivot_point: new Graphene.Point({ x: 0.5, y: 0.5 }),
|
||||
x_fill: true,
|
||||
y_fill: true
|
||||
});
|
||||
|
||||
this._obj = null;
|
||||
@@ -365,13 +367,9 @@ class ObjInspector extends St.ScrollView {
|
||||
this._parentList = [];
|
||||
|
||||
this.get_hscroll_bar().hide();
|
||||
this._container = new St.BoxLayout({
|
||||
name: 'LookingGlassPropertyInspector',
|
||||
style_class: 'lg-dialog',
|
||||
vertical: true,
|
||||
x_expand: true,
|
||||
y_expand: true,
|
||||
});
|
||||
this._container = new St.BoxLayout({ name: 'LookingGlassPropertyInspector',
|
||||
style_class: 'lg-dialog',
|
||||
vertical: true });
|
||||
this.add_actor(this._container);
|
||||
|
||||
this._lookingGlass = lookingGlass;
|
||||
@@ -388,12 +386,10 @@ class ObjInspector extends St.ScrollView {
|
||||
|
||||
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, objectToString(obj)),
|
||||
x_expand: true,
|
||||
});
|
||||
let label = new St.Label({ text: 'Inspecting: %s: %s'.format(typeof obj,
|
||||
objectToString(obj)) });
|
||||
label.single_line_mode = true;
|
||||
hbox.add_child(label);
|
||||
hbox.add(label, { expand: true, y_fill: false });
|
||||
let button = new St.Button({ label: 'Insert', style_class: 'lg-obj-inspector-button' });
|
||||
button.connect('clicked', this._onInsert.bind(this));
|
||||
hbox.add(button);
|
||||
@@ -410,8 +406,9 @@ class ObjInspector extends St.ScrollView {
|
||||
hbox.add(button);
|
||||
if (typeof obj == typeof {}) {
|
||||
let properties = [];
|
||||
for (let propName in obj)
|
||||
for (let propName in obj) {
|
||||
properties.push(propName);
|
||||
}
|
||||
properties.sort();
|
||||
|
||||
for (let i = 0; i < properties.length; i++) {
|
||||
@@ -423,10 +420,10 @@ class ObjInspector extends St.ScrollView {
|
||||
} catch (e) {
|
||||
link = new St.Label({ text: '<error>' });
|
||||
}
|
||||
let box = new St.BoxLayout();
|
||||
box.add(new St.Label({ text: `${propName}: ` }));
|
||||
box.add(link);
|
||||
this._container.add_actor(box);
|
||||
let hbox = new St.BoxLayout();
|
||||
hbox.add(new St.Label({ text: `${propName}: ` }));
|
||||
hbox.add(link);
|
||||
this._container.add_actor(hbox);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -443,7 +440,7 @@ class ObjInspector extends St.ScrollView {
|
||||
scale_x: 1,
|
||||
scale_y: 1,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
duration: 200,
|
||||
duration: 200
|
||||
});
|
||||
} else {
|
||||
this.set_scale(1, 1);
|
||||
@@ -472,40 +469,25 @@ class ObjInspector extends St.ScrollView {
|
||||
|
||||
var RedBorderEffect = GObject.registerClass(
|
||||
class RedBorderEffect extends Clutter.Effect {
|
||||
_init() {
|
||||
super._init();
|
||||
this._pipeline = null;
|
||||
}
|
||||
|
||||
vfunc_paint(paintContext) {
|
||||
let framebuffer = paintContext.get_framebuffer();
|
||||
let coglContext = framebuffer.get_context();
|
||||
vfunc_paint() {
|
||||
let actor = this.get_actor();
|
||||
actor.continue_paint(paintContext);
|
||||
actor.continue_paint();
|
||||
|
||||
if (!this._pipeline) {
|
||||
let color = new Cogl.Color();
|
||||
color.init_from_4ub(0xff, 0, 0, 0xc4);
|
||||
|
||||
this._pipeline = new Cogl.Pipeline(coglContext);
|
||||
this._pipeline.set_color(color);
|
||||
}
|
||||
let color = new Cogl.Color();
|
||||
color.init_from_4ub(0xff, 0, 0, 0xc4);
|
||||
Cogl.set_source_color(color);
|
||||
|
||||
let alloc = actor.get_allocation_box();
|
||||
let width = 2;
|
||||
|
||||
// clockwise order
|
||||
framebuffer.draw_rectangle(this._pipeline,
|
||||
0, 0, alloc.get_width(), width);
|
||||
framebuffer.draw_rectangle(this._pipeline,
|
||||
alloc.get_width() - width, width,
|
||||
alloc.get_width(), alloc.get_height());
|
||||
framebuffer.draw_rectangle(this._pipeline,
|
||||
0, alloc.get_height(),
|
||||
alloc.get_width() - width, alloc.get_height() - width);
|
||||
framebuffer.draw_rectangle(this._pipeline,
|
||||
0, alloc.get_height() - width,
|
||||
width, width);
|
||||
Cogl.rectangle(0, 0, alloc.get_width(), width);
|
||||
Cogl.rectangle(alloc.get_width() - width, width,
|
||||
alloc.get_width(), alloc.get_height());
|
||||
Cogl.rectangle(0, alloc.get_height(),
|
||||
alloc.get_width() - width, alloc.get_height() - width);
|
||||
Cogl.rectangle(0, alloc.get_height() - width,
|
||||
width, width);
|
||||
}
|
||||
});
|
||||
|
||||
@@ -523,8 +505,8 @@ var Inspector = GObject.registerClass({
|
||||
reactive: true });
|
||||
this._eventHandler = eventHandler;
|
||||
this.add_actor(eventHandler);
|
||||
this._displayText = new St.Label({ x_expand: true });
|
||||
eventHandler.add_child(this._displayText);
|
||||
this._displayText = new St.Label();
|
||||
eventHandler.add(this._displayText, { expand: true });
|
||||
|
||||
eventHandler.connect('key-press-event', this._onKeyPressEvent.bind(this));
|
||||
eventHandler.connect('button-press-event', this._onButtonPressEvent.bind(this));
|
||||
@@ -577,7 +559,7 @@ var Inspector = GObject.registerClass({
|
||||
}
|
||||
|
||||
_onKeyPressEvent(actor, event) {
|
||||
if (event.get_key_symbol() === Clutter.KEY_Escape)
|
||||
if (event.get_key_symbol() == Clutter.Escape)
|
||||
this._close();
|
||||
return Clutter.EVENT_STOP;
|
||||
}
|
||||
@@ -650,6 +632,7 @@ var Inspector = GObject.registerClass({
|
||||
});
|
||||
|
||||
var Extensions = GObject.registerClass({
|
||||
GTypeName: 'LookingClass_Extensions'
|
||||
}, class Extensions extends St.BoxLayout {
|
||||
_init(lookingGlass) {
|
||||
super._init({ vertical: true, name: 'lookingGlassExtensions' });
|
||||
@@ -682,7 +665,7 @@ var Extensions = GObject.registerClass({
|
||||
if (this._numExtensions == 0)
|
||||
this._extensionsList.remove_actor(this._noExtensions);
|
||||
|
||||
this._numExtensions++;
|
||||
this._numExtensions ++;
|
||||
this._extensionsList.add(extensionDisplay);
|
||||
}
|
||||
|
||||
@@ -707,7 +690,7 @@ var Extensions = GObject.registerClass({
|
||||
let errors = extension.errors;
|
||||
let errorDisplay = new St.BoxLayout({ vertical: true });
|
||||
if (errors && errors.length) {
|
||||
for (let i = 0; i < errors.length; i++)
|
||||
for (let i = 0; i < errors.length; i ++)
|
||||
errorDisplay.add(new St.Label({ text: errors[i] }));
|
||||
} else {
|
||||
/* Translators: argument is an extension UUID. */
|
||||
@@ -746,18 +729,12 @@ var Extensions = GObject.registerClass({
|
||||
|
||||
_createExtensionDisplay(extension) {
|
||||
let box = new St.BoxLayout({ style_class: 'lg-extension', vertical: true });
|
||||
let name = new St.Label({
|
||||
style_class: 'lg-extension-name',
|
||||
text: extension.metadata.name,
|
||||
x_expand: true,
|
||||
});
|
||||
box.add_child(name);
|
||||
let description = new St.Label({
|
||||
style_class: 'lg-extension-description',
|
||||
text: extension.metadata.description || 'No description',
|
||||
x_expand: true,
|
||||
});
|
||||
box.add_child(description);
|
||||
let name = new St.Label({ style_class: 'lg-extension-name',
|
||||
text: extension.metadata.name });
|
||||
box.add(name, { expand: true });
|
||||
let description = new St.Label({ style_class: 'lg-extension-description',
|
||||
text: extension.metadata.description || 'No description' });
|
||||
box.add(description, { expand: true });
|
||||
|
||||
let metaBox = new St.BoxLayout({ style_class: 'lg-extension-meta' });
|
||||
box.add(metaBox);
|
||||
@@ -805,7 +782,7 @@ class LookingGlass extends St.BoxLayout {
|
||||
style_class: 'lg-dialog',
|
||||
vertical: true,
|
||||
visible: false,
|
||||
reactive: true,
|
||||
reactive: true
|
||||
});
|
||||
|
||||
this._borderPaintTarget = null;
|
||||
@@ -874,37 +851,27 @@ class LookingGlass extends St.BoxLayout {
|
||||
|
||||
let notebook = new Notebook();
|
||||
this._notebook = notebook;
|
||||
this.add_child(notebook);
|
||||
this.add(notebook, { expand: true });
|
||||
|
||||
let emptyBox = new St.Bin({ x_expand: true });
|
||||
toolbar.add_child(emptyBox);
|
||||
let emptyBox = new St.Bin();
|
||||
toolbar.add(emptyBox, { expand: true });
|
||||
toolbar.add_actor(notebook.tabControls);
|
||||
|
||||
this._evalBox = new St.BoxLayout({ name: 'EvalBox', vertical: true });
|
||||
notebook.appendPage('Evaluator', this._evalBox);
|
||||
|
||||
this._resultsArea = new St.BoxLayout({
|
||||
name: 'ResultsArea',
|
||||
vertical: true,
|
||||
y_expand: true,
|
||||
});
|
||||
this._evalBox.add_child(this._resultsArea);
|
||||
this._resultsArea = new St.BoxLayout({ name: 'ResultsArea', vertical: true });
|
||||
this._evalBox.add(this._resultsArea, { expand: true });
|
||||
|
||||
this._entryArea = new St.BoxLayout({
|
||||
name: 'EntryArea',
|
||||
y_align: Clutter.ActorAlign.END,
|
||||
});
|
||||
this._entryArea = new St.BoxLayout({ name: 'EntryArea' });
|
||||
this._evalBox.add_actor(this._entryArea);
|
||||
|
||||
let label = new St.Label({ text: CHEVRON });
|
||||
this._entryArea.add(label);
|
||||
|
||||
this._entry = new St.Entry({
|
||||
can_focus: true,
|
||||
x_expand: true,
|
||||
});
|
||||
this._entry = new St.Entry({ can_focus: true });
|
||||
ShellEntry.addContextMenu(this._entry);
|
||||
this._entryArea.add_child(this._entry);
|
||||
this._entryArea.add(this._entry, { expand: true });
|
||||
|
||||
this._windowList = new WindowList(this);
|
||||
notebook.appendPage('Windows', this._windowList);
|
||||
@@ -1009,7 +976,7 @@ class LookingGlass extends St.BoxLayout {
|
||||
height: naturalHeight,
|
||||
opacity: 255,
|
||||
duration,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -1026,7 +993,7 @@ class LookingGlass extends St.BoxLayout {
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
onComplete: () => {
|
||||
this._completionActor.hide();
|
||||
},
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -1108,19 +1075,21 @@ class LookingGlass extends St.BoxLayout {
|
||||
// Handle key events which are relevant for all tabs of the LookingGlass
|
||||
vfunc_key_press_event(keyPressEvent) {
|
||||
let symbol = keyPressEvent.keyval;
|
||||
if (symbol == Clutter.KEY_Escape) {
|
||||
if (this._objInspector.visible)
|
||||
if (symbol == Clutter.Escape) {
|
||||
if (this._objInspector.visible) {
|
||||
this._objInspector.close();
|
||||
else
|
||||
} else {
|
||||
this.close();
|
||||
}
|
||||
return Clutter.EVENT_STOP;
|
||||
}
|
||||
// Ctrl+PgUp and Ctrl+PgDown switches tabs in the notebook view
|
||||
if (keyPressEvent.modifier_state & Clutter.ModifierType.CONTROL_MASK) {
|
||||
if (symbol == Clutter.KEY_Page_Up)
|
||||
if (symbol == Clutter.KEY_Page_Up) {
|
||||
this._notebook.prevTab();
|
||||
else if (symbol == Clutter.KEY_Page_Down)
|
||||
} else if (symbol == Clutter.KEY_Page_Down) {
|
||||
this._notebook.nextTab();
|
||||
}
|
||||
}
|
||||
return Clutter.EVENT_PROPAGATE;
|
||||
}
|
||||
@@ -1145,7 +1114,7 @@ class LookingGlass extends St.BoxLayout {
|
||||
this.ease({
|
||||
y: this._targetY,
|
||||
duration,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD
|
||||
});
|
||||
|
||||
this._windowList.update();
|
||||
@@ -1171,7 +1140,7 @@ class LookingGlass extends St.BoxLayout {
|
||||
y: this._hiddenY,
|
||||
duration,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
onComplete: () => this.hide(),
|
||||
onComplete: () => this.hide()
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -55,7 +55,7 @@ var MouseSpriteContent = GObject.registerClass({
|
||||
return [true, this._texture.get_width(), this._texture.get_height()];
|
||||
}
|
||||
|
||||
vfunc_paint_content(actor, node, _paintContext) {
|
||||
vfunc_paint_content(actor, node) {
|
||||
if (!this._texture)
|
||||
return;
|
||||
|
||||
@@ -118,7 +118,7 @@ var Magnifier = class Magnifier {
|
||||
});
|
||||
|
||||
// Export to dbus.
|
||||
new MagnifierDBus.ShellMagnifier();
|
||||
(new MagnifierDBus.ShellMagnifier());
|
||||
this.setActive(St.Settings.get().magnifier_active);
|
||||
}
|
||||
|
||||
@@ -141,7 +141,7 @@ var Magnifier = class Magnifier {
|
||||
/**
|
||||
* setActive:
|
||||
* Show/hide all the zoom regions.
|
||||
* @param {bool} activate: Boolean to activate or de-activate the magnifier.
|
||||
* @activate: Boolean to activate or de-activate the magnifier.
|
||||
*/
|
||||
setActive(activate) {
|
||||
let isActive = this.isActive();
|
||||
@@ -177,7 +177,7 @@ var Magnifier = class Magnifier {
|
||||
|
||||
/**
|
||||
* isActive:
|
||||
* @returns {bool} Whether the magnifier is active.
|
||||
* @return Whether the magnifier is active (boolean).
|
||||
*/
|
||||
isActive() {
|
||||
// Sufficient to check one ZoomRegion since Magnifier's active
|
||||
@@ -212,7 +212,7 @@ var Magnifier = class Magnifier {
|
||||
|
||||
/**
|
||||
* isTrackingMouse:
|
||||
* @returns {bool} whether the magnifier is currently tracking the mouse
|
||||
* Is the magnifier tracking the mouse currently?
|
||||
*/
|
||||
isTrackingMouse() {
|
||||
return !!this._mouseTrackingId;
|
||||
@@ -222,7 +222,7 @@ var Magnifier = class Magnifier {
|
||||
* scrollToMousePos:
|
||||
* Position all zoom regions' ROI relative to the current location of the
|
||||
* system pointer.
|
||||
* @returns {bool} true.
|
||||
* @return true.
|
||||
*/
|
||||
scrollToMousePos() {
|
||||
let [xMouse, yMouse] = global.get_pointer();
|
||||
@@ -247,17 +247,17 @@ var Magnifier = class Magnifier {
|
||||
/**
|
||||
* createZoomRegion:
|
||||
* Create a ZoomRegion instance with the given properties.
|
||||
* @param {number} xMagFactor:
|
||||
* The power to set horizontal magnification of the ZoomRegion. A value
|
||||
* of 1.0 means no magnification, a value of 2.0 doubles the size.
|
||||
* @param {number} yMagFactor:
|
||||
* The power to set the vertical magnification of the ZoomRegion.
|
||||
* @param {{x: number, y: number, width: number, height: number}} roi:
|
||||
* The reg Object that defines the region to magnify, given in
|
||||
* unmagnified coordinates.
|
||||
* @param {{x: number, y: number, width: number, height: number}} viewPort:
|
||||
* Object that defines the position of the ZoomRegion on screen.
|
||||
* @returns {ZoomRegion} the newly created ZoomRegion.
|
||||
* @xMagFactor: The power to set horizontal magnification of the
|
||||
* ZoomRegion. A value of 1.0 means no magnification. A
|
||||
* value of 2.0 doubles the size.
|
||||
* @yMagFactor: The power to set the vertical magnification of the
|
||||
* ZoomRegion.
|
||||
* @roi Object in the form { x, y, width, height } that
|
||||
* defines the region to magnify. Given in unmagnified
|
||||
* coordinates.
|
||||
* @viewPort Object in the form { x, y, width, height } that defines
|
||||
* the position of the ZoomRegion on screen.
|
||||
* @return The newly created ZoomRegion.
|
||||
*/
|
||||
createZoomRegion(xMagFactor, yMagFactor, roi, viewPort) {
|
||||
let zoomRegion = new ZoomRegion(this, this._cursorRoot);
|
||||
@@ -277,7 +277,7 @@ var Magnifier = class Magnifier {
|
||||
* addZoomRegion:
|
||||
* Append the given ZoomRegion to the list of currently defined ZoomRegions
|
||||
* for this Magnifier instance.
|
||||
* @param {ZoomRegion} zoomRegion: The zoomRegion to add.
|
||||
* @zoomRegion: The zoomRegion to add.
|
||||
*/
|
||||
addZoomRegion(zoomRegion) {
|
||||
if (zoomRegion) {
|
||||
@@ -290,7 +290,7 @@ var Magnifier = class Magnifier {
|
||||
/**
|
||||
* getZoomRegions:
|
||||
* Return a list of ZoomRegion's for this Magnifier.
|
||||
* @returns {number[]} The Magnifier's zoom region list.
|
||||
* @return: The Magnifier's zoom region list (array).
|
||||
*/
|
||||
getZoomRegions() {
|
||||
return this._zoomRegions;
|
||||
@@ -330,7 +330,7 @@ var Magnifier = class Magnifier {
|
||||
this.setCrosshairsClip(clip);
|
||||
|
||||
let theCrossHairs = this._crossHairs;
|
||||
this._zoomRegions.forEach(zoomRegion => {
|
||||
this._zoomRegions.forEach (zoomRegion => {
|
||||
zoomRegion.addCrosshairs(theCrossHairs);
|
||||
});
|
||||
}
|
||||
@@ -338,7 +338,7 @@ var Magnifier = class Magnifier {
|
||||
/**
|
||||
* setCrosshairsVisible:
|
||||
* Show or hide the cross hair.
|
||||
* @param {bool} visible: Flag that indicates show (true) or hide (false).
|
||||
* @visible Flag that indicates show (true) or hide (false).
|
||||
*/
|
||||
setCrosshairsVisible(visible) {
|
||||
if (visible) {
|
||||
@@ -346,7 +346,6 @@ var Magnifier = class Magnifier {
|
||||
this.addCrosshairs();
|
||||
this._crossHairs.show();
|
||||
} else {
|
||||
// eslint-disable-next-line no-lonely-if
|
||||
if (this._crossHairs)
|
||||
this._crossHairs.hide();
|
||||
}
|
||||
@@ -355,7 +354,7 @@ var Magnifier = class Magnifier {
|
||||
/**
|
||||
* setCrosshairsColor:
|
||||
* Set the color of the crosshairs for all ZoomRegions.
|
||||
* @param {string} color: The color as a string, e.g. '#ff0000ff' or 'red'.
|
||||
* @color: The color as a string, e.g. '#ff0000ff' or 'red'.
|
||||
*/
|
||||
setCrosshairsColor(color) {
|
||||
if (this._crossHairs) {
|
||||
@@ -367,7 +366,7 @@ var Magnifier = class Magnifier {
|
||||
/**
|
||||
* getCrosshairsColor:
|
||||
* Get the color of the crosshairs.
|
||||
* @returns {string} The color as a string, e.g. '#0000ffff' or 'blue'.
|
||||
* @return: The color as a string, e.g. '#0000ffff' or 'blue'.
|
||||
*/
|
||||
getCrosshairsColor() {
|
||||
if (this._crossHairs) {
|
||||
@@ -381,8 +380,8 @@ var Magnifier = class Magnifier {
|
||||
/**
|
||||
* setCrosshairsThickness:
|
||||
* Set the crosshairs thickness for all ZoomRegions.
|
||||
* @param {number} thickness: The width of the vertical and
|
||||
* horizontal lines of the crosshairs.
|
||||
* @thickness: The width of the vertical and horizontal lines of the
|
||||
* crosshairs.
|
||||
*/
|
||||
setCrosshairsThickness(thickness) {
|
||||
if (this._crossHairs)
|
||||
@@ -392,8 +391,8 @@ var Magnifier = class Magnifier {
|
||||
/**
|
||||
* getCrosshairsThickness:
|
||||
* Get the crosshairs thickness.
|
||||
* @returns {number} The width of the vertical and horizontal
|
||||
* lines of the crosshairs.
|
||||
* @return: The width of the vertical and horizontal lines of the
|
||||
* crosshairs.
|
||||
*/
|
||||
getCrosshairsThickness() {
|
||||
if (this._crossHairs)
|
||||
@@ -404,8 +403,7 @@ var Magnifier = class Magnifier {
|
||||
|
||||
/**
|
||||
* setCrosshairsOpacity:
|
||||
* @param {number} opacity: Value between 0.0 (transparent)
|
||||
* and 1.0 (fully opaque).
|
||||
* @opacity: Value between 0.0 (transparent) and 1.0 (fully opaque).
|
||||
*/
|
||||
setCrosshairsOpacity(opacity) {
|
||||
if (this._crossHairs)
|
||||
@@ -414,7 +412,7 @@ var Magnifier = class Magnifier {
|
||||
|
||||
/**
|
||||
* getCrosshairsOpacity:
|
||||
* @returns {number} Value between 0.0 (transparent) and 1.0 (fully opaque).
|
||||
* @return: Value between 0.0 (transparent) and 1.0 (fully opaque).
|
||||
*/
|
||||
getCrosshairsOpacity() {
|
||||
if (this._crossHairs)
|
||||
@@ -426,8 +424,8 @@ var Magnifier = class Magnifier {
|
||||
/**
|
||||
* setCrosshairsLength:
|
||||
* Set the crosshairs length for all ZoomRegions.
|
||||
* @param {number} length: The length of the vertical and horizontal
|
||||
* lines making up the crosshairs.
|
||||
* @length: The length of the vertical and horizontal lines making up the
|
||||
* crosshairs.
|
||||
*/
|
||||
setCrosshairsLength(length) {
|
||||
if (this._crossHairs)
|
||||
@@ -437,8 +435,8 @@ var Magnifier = class Magnifier {
|
||||
/**
|
||||
* getCrosshairsLength:
|
||||
* Get the crosshairs length.
|
||||
* @returns {number} The length of the vertical and horizontal
|
||||
* lines making up the crosshairs.
|
||||
* @return: The length of the vertical and horizontal lines making up the
|
||||
* crosshairs.
|
||||
*/
|
||||
getCrosshairsLength() {
|
||||
if (this._crossHairs)
|
||||
@@ -450,7 +448,7 @@ var Magnifier = class Magnifier {
|
||||
/**
|
||||
* setCrosshairsClip:
|
||||
* Set whether the crosshairs are clipped at their intersection.
|
||||
* @param {bool} clip: Flag to indicate whether to clip the crosshairs.
|
||||
* @clip: Flag to indicate whether to clip the crosshairs.
|
||||
*/
|
||||
setCrosshairsClip(clip) {
|
||||
if (!this._crossHairs)
|
||||
@@ -463,18 +461,18 @@ var Magnifier = class Magnifier {
|
||||
/**
|
||||
* getCrosshairsClip:
|
||||
* Get whether the crosshairs are clipped by the mouse image.
|
||||
* @returns {bool} Whether the crosshairs are clipped.
|
||||
* @return: Whether the crosshairs are clipped.
|
||||
*/
|
||||
getCrosshairsClip() {
|
||||
if (this._crossHairs) {
|
||||
let [clipWidth, clipHeight] = this._crossHairs.getClip();
|
||||
return clipWidth > 0 && clipHeight > 0;
|
||||
return (clipWidth > 0 && clipHeight > 0);
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
// Private methods //
|
||||
//// Private methods ////
|
||||
|
||||
_updateMouseSprite() {
|
||||
this._updateSpriteTexture();
|
||||
@@ -625,8 +623,9 @@ var Magnifier = class Magnifier {
|
||||
|
||||
_updateLensMode() {
|
||||
// Applies only to the first zoom region.
|
||||
if (this._zoomRegions.length)
|
||||
if (this._zoomRegions.length) {
|
||||
this._zoomRegions[0].setLensMode(this._settings.get_boolean(LENS_MODE_KEY));
|
||||
}
|
||||
}
|
||||
|
||||
_updateClampMode() {
|
||||
@@ -773,16 +772,15 @@ var ZoomRegion = class ZoomRegion {
|
||||
}
|
||||
|
||||
_updateScreenPosition() {
|
||||
if (this._screenPosition == GDesktopEnums.MagnifierScreenPosition.NONE) {
|
||||
if (this._screenPosition == GDesktopEnums.MagnifierScreenPosition.NONE)
|
||||
this._setViewPort({
|
||||
x: this._viewPortX,
|
||||
y: this._viewPortY,
|
||||
width: this._viewPortWidth,
|
||||
height: this._viewPortHeight,
|
||||
height: this._viewPortHeight
|
||||
});
|
||||
} else {
|
||||
else
|
||||
this.setScreenPosition(this._screenPosition);
|
||||
}
|
||||
}
|
||||
|
||||
_updateFocus(caller, event) {
|
||||
@@ -820,7 +818,7 @@ var ZoomRegion = class ZoomRegion {
|
||||
|
||||
/**
|
||||
* setActive:
|
||||
* @param {bool} activate: Boolean to show/hide the ZoomRegion.
|
||||
* @activate: Boolean to show/hide the ZoomRegion.
|
||||
*/
|
||||
setActive(activate) {
|
||||
if (activate == this.isActive())
|
||||
@@ -846,7 +844,7 @@ var ZoomRegion = class ZoomRegion {
|
||||
|
||||
/**
|
||||
* isActive:
|
||||
* @returns {bool} Whether this ZoomRegion is active
|
||||
* @return Whether this ZoomRegion is active (boolean).
|
||||
*/
|
||||
isActive() {
|
||||
return this._magView != null;
|
||||
@@ -854,24 +852,24 @@ var ZoomRegion = class ZoomRegion {
|
||||
|
||||
/**
|
||||
* setMagFactor:
|
||||
* @param {number} xMagFactor: The power to set the horizontal
|
||||
* magnification factor to of the magnified view. A value of 1.0
|
||||
* means no magnification. A value of 2.0 doubles the size.
|
||||
* @param {number} yMagFactor: The power to set the vertical
|
||||
* magnification factor to of the magnified view.
|
||||
* @xMagFactor: The power to set the horizontal magnification factor to
|
||||
* of the magnified view. A value of 1.0 means no
|
||||
* magnification. A value of 2.0 doubles the size.
|
||||
* @yMagFactor: The power to set the vertical magnification factor to
|
||||
* of the magnified view.
|
||||
*/
|
||||
setMagFactor(xMagFactor, yMagFactor) {
|
||||
this._changeROI({ xMagFactor,
|
||||
yMagFactor,
|
||||
this._changeROI({ xMagFactor: xMagFactor,
|
||||
yMagFactor: yMagFactor,
|
||||
redoCursorTracking: this._followingCursor });
|
||||
}
|
||||
|
||||
/**
|
||||
* getMagFactor:
|
||||
* @returns {number[]} an array, [xMagFactor, yMagFactor], containing
|
||||
* the horizontal and vertical magnification powers. A value of
|
||||
* 1.0 means no magnification. A value of 2.0 means the contents
|
||||
* are doubled in size, and so on.
|
||||
* @return an array, [xMagFactor, yMagFactor], containing the horizontal
|
||||
* and vertical magnification powers. A value of 1.0 means no
|
||||
* magnification. A value of 2.0 means the contents are doubled
|
||||
* in size, and so on.
|
||||
*/
|
||||
getMagFactor() {
|
||||
return [this._xMagFactor, this._yMagFactor];
|
||||
@@ -879,7 +877,7 @@ var ZoomRegion = class ZoomRegion {
|
||||
|
||||
/**
|
||||
* setMouseTrackingMode
|
||||
* @param {GDesktopEnums.MagnifierMouseTrackingMode} mode: the new mode
|
||||
* @mode: One of the enum MouseTrackingMode values.
|
||||
*/
|
||||
setMouseTrackingMode(mode) {
|
||||
if (mode >= GDesktopEnums.MagnifierMouseTrackingMode.NONE &&
|
||||
@@ -889,7 +887,7 @@ var ZoomRegion = class ZoomRegion {
|
||||
|
||||
/**
|
||||
* getMouseTrackingMode
|
||||
* @returns {GDesktopEnums.MagnifierMouseTrackingMode} the current mode
|
||||
* @return: One of the enum MouseTrackingMode values.
|
||||
*/
|
||||
getMouseTrackingMode() {
|
||||
return this._mouseTrackingMode;
|
||||
@@ -897,7 +895,7 @@ var ZoomRegion = class ZoomRegion {
|
||||
|
||||
/**
|
||||
* setFocusTrackingMode
|
||||
* @param {GDesktopEnums.MagnifierFocusTrackingMode} mode: the new mode
|
||||
* @mode: One of the enum FocusTrackingMode values.
|
||||
*/
|
||||
setFocusTrackingMode(mode) {
|
||||
this._focusTrackingMode = mode;
|
||||
@@ -906,7 +904,7 @@ var ZoomRegion = class ZoomRegion {
|
||||
|
||||
/**
|
||||
* setCaretTrackingMode
|
||||
* @param {GDesktopEnums.MagnifierCaretTrackingMode} mode: the new mode
|
||||
* @mode: One of the enum CaretTrackingMode values.
|
||||
*/
|
||||
setCaretTrackingMode(mode) {
|
||||
this._caretTrackingMode = mode;
|
||||
@@ -936,9 +934,9 @@ var ZoomRegion = class ZoomRegion {
|
||||
/**
|
||||
* setViewPort
|
||||
* Sets the position and size of the ZoomRegion on screen.
|
||||
* @param {{x: number, y: number, width: number, height: number}} viewPort:
|
||||
* Object defining the position and size of the view port.
|
||||
* The values are in stage coordinate space.
|
||||
* @viewPort: Object defining the position and size of the view port.
|
||||
* It has members x, y, width, height. The values are in
|
||||
* stage coordinate space.
|
||||
*/
|
||||
setViewPort(viewPort) {
|
||||
this._setViewPort(viewPort);
|
||||
@@ -948,9 +946,9 @@ var ZoomRegion = class ZoomRegion {
|
||||
/**
|
||||
* setROI
|
||||
* Sets the "region of interest" that the ZoomRegion is magnifying.
|
||||
* @param {{x: number, y: number, width: number, height: number}} roi:
|
||||
* Object that defines the region of the screen to magnify.
|
||||
* The values are in screen (unmagnified) coordinate space.
|
||||
* @roi: Object that defines the region of the screen to magnify. It
|
||||
* has members x, y, width, height. The values are in
|
||||
* screen (unmagnified) coordinate space.
|
||||
*/
|
||||
setROI(roi) {
|
||||
if (roi.width <= 0 || roi.height <= 0)
|
||||
@@ -968,8 +966,8 @@ var ZoomRegion = class ZoomRegion {
|
||||
* Retrieves the "region of interest" -- the rectangular bounds of that part
|
||||
* of the desktop that the magnified view is showing (x, y, width, height).
|
||||
* The bounds are given in non-magnified coordinates.
|
||||
* @returns {number[]} an array, [x, y, width, height], representing
|
||||
* the bounding rectangle of what is shown in the magnified view.
|
||||
* @return an array, [x, y, width, height], representing the bounding
|
||||
* rectangle of what is shown in the magnified view.
|
||||
*/
|
||||
getROI() {
|
||||
let roiWidth = this._viewPortWidth / this._xMagFactor;
|
||||
@@ -984,18 +982,18 @@ var ZoomRegion = class ZoomRegion {
|
||||
* setLensMode:
|
||||
* Turn lens mode on/off. In full screen mode, lens mode does nothing since
|
||||
* a lens the size of the screen is pointless.
|
||||
* @param {bool} lensMode: Whether lensMode should be active
|
||||
* @lensMode: A boolean to set the sense of lens mode.
|
||||
*/
|
||||
setLensMode(lensMode) {
|
||||
this._lensMode = lensMode;
|
||||
if (!this._lensMode)
|
||||
this.setScreenPosition(this._screenPosition);
|
||||
this.setScreenPosition (this._screenPosition);
|
||||
}
|
||||
|
||||
/**
|
||||
* isLensMode:
|
||||
* Is lens mode on or off?
|
||||
* @returns {bool} The lens mode state.
|
||||
* @return The lens mode state as a boolean.
|
||||
*/
|
||||
isLensMode() {
|
||||
return this._lensMode;
|
||||
@@ -1005,7 +1003,7 @@ var ZoomRegion = class ZoomRegion {
|
||||
* setClampScrollingAtEdges:
|
||||
* Stop vs. allow scrolling of the magnified contents when it scroll beyond
|
||||
* the edges of the screen.
|
||||
* @param {bool} clamp: Boolean to turn on/off clamping.
|
||||
* @clamp: Boolean to turn on/off clamping.
|
||||
*/
|
||||
setClampScrollingAtEdges(clamp) {
|
||||
this._clampScrollingAtEdges = clamp;
|
||||
@@ -1089,7 +1087,9 @@ var ZoomRegion = class ZoomRegion {
|
||||
* setScreenPosition:
|
||||
* Positions the zoom region to one of the enumerated positions on the
|
||||
* screen.
|
||||
* @param {GDesktopEnums.MagnifierScreenPosition} inPosition: the position
|
||||
* @position: one of Magnifier.FULL_SCREEN, Magnifier.TOP_HALF,
|
||||
* Magnifier.BOTTOM_HALF,Magnifier.LEFT_HALF, or
|
||||
* Magnifier.RIGHT_HALF.
|
||||
*/
|
||||
setScreenPosition(inPosition) {
|
||||
switch (inPosition) {
|
||||
@@ -1115,7 +1115,7 @@ var ZoomRegion = class ZoomRegion {
|
||||
* getScreenPosition:
|
||||
* Tell the outside world what the current mode is -- magnifiying the
|
||||
* top half, bottom half, etc.
|
||||
* @returns {GDesktopEnums.MagnifierScreenPosition}: the current position.
|
||||
* @return: the current mode.
|
||||
*/
|
||||
getScreenPosition() {
|
||||
return this._screenPosition;
|
||||
@@ -1124,8 +1124,7 @@ var ZoomRegion = class ZoomRegion {
|
||||
/**
|
||||
* scrollToMousePos:
|
||||
* Set the region of interest based on the position of the system pointer.
|
||||
* @returns {bool}: Whether the system mouse pointer is over the
|
||||
* magnified view.
|
||||
* @return: Whether the system mouse pointer is over the magnified view.
|
||||
*/
|
||||
scrollToMousePos() {
|
||||
this._followingCursor = true;
|
||||
@@ -1162,8 +1161,8 @@ var ZoomRegion = class ZoomRegion {
|
||||
* scrollContentsTo:
|
||||
* Shift the contents of the magnified view such it is centered on the given
|
||||
* coordinate.
|
||||
* @param {number} x: The x-coord of the point to center on.
|
||||
* @param {number} y: The y-coord of the point to center on.
|
||||
* @x: The x-coord of the point to center on.
|
||||
* @y: The y-coord of the point to center on.
|
||||
*/
|
||||
scrollContentsTo(x, y) {
|
||||
this._clearScrollContentsTimer();
|
||||
@@ -1176,21 +1175,22 @@ var ZoomRegion = class ZoomRegion {
|
||||
/**
|
||||
* addCrosshairs:
|
||||
* Add crosshairs centered on the magnified mouse.
|
||||
* @param {Crosshairs} crossHairs: Crosshairs instance
|
||||
* @crossHairs: Crosshairs instance
|
||||
*/
|
||||
addCrosshairs(crossHairs) {
|
||||
this._crossHairs = crossHairs;
|
||||
|
||||
// If the crossHairs is not already within a larger container, add it
|
||||
// to this zoom region. Otherwise, add a clone.
|
||||
if (crossHairs && this.isActive())
|
||||
if (crossHairs && this.isActive()) {
|
||||
this._crossHairsActor = crossHairs.addToZoomRegion(this, this._mouseActor);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* setInvertLightness:
|
||||
* Set whether to invert the lightness of the magnified view.
|
||||
* @param {bool} flag: whether brightness should be inverted
|
||||
* @flag Boolean to either invert brightness (true), or not (false).
|
||||
*/
|
||||
setInvertLightness(flag) {
|
||||
this._invertLightness = flag;
|
||||
@@ -1201,7 +1201,7 @@ var ZoomRegion = class ZoomRegion {
|
||||
/**
|
||||
* getInvertLightness:
|
||||
* Retrieve whether the lightness is inverted.
|
||||
* @returns {bool} whether brightness should be inverted
|
||||
* @return Boolean indicating inversion (true), or not (false).
|
||||
*/
|
||||
getInvertLightness() {
|
||||
return this._invertLightness;
|
||||
@@ -1210,9 +1210,9 @@ var ZoomRegion = class ZoomRegion {
|
||||
/**
|
||||
* setColorSaturation:
|
||||
* Set the color saturation of the magnified view.
|
||||
* @param {number} saturation: A value from 0.0 to 1.0 that defines
|
||||
* the color saturation, with 0.0 defining no color (grayscale),
|
||||
* and 1.0 defining full color.
|
||||
* @sauration A value from 0.0 to 1.0 that defines the color
|
||||
* saturation, with 0.0 defining no color (grayscale),
|
||||
* and 1.0 defining full color.
|
||||
*/
|
||||
setColorSaturation(saturation) {
|
||||
this._colorSaturation = saturation;
|
||||
@@ -1223,7 +1223,6 @@ var ZoomRegion = class ZoomRegion {
|
||||
/**
|
||||
* getColorSaturation:
|
||||
* Retrieve the color saturation of the magnified view.
|
||||
* @returns {number} the color saturation
|
||||
*/
|
||||
getColorSaturation() {
|
||||
return this._colorSaturation;
|
||||
@@ -1232,14 +1231,10 @@ var ZoomRegion = class ZoomRegion {
|
||||
/**
|
||||
* setBrightness:
|
||||
* Alter the brightness of the magnified view.
|
||||
* @param {Object} brightness: Object containing the contrast for the
|
||||
* red, green, and blue channels. Values of 0.0 represent "standard"
|
||||
* brightness (no change), whereas values less or greater than
|
||||
* 0.0 indicate decreased or incresaed brightness, respectively.
|
||||
*
|
||||
* {number} brightness.r - the red component
|
||||
* {number} brightness.g - the green component
|
||||
* {number} brightness.b - the blue component
|
||||
* @brightness Object containing the contrast for the red, green,
|
||||
* and blue channels. Values of 0.0 represent "standard"
|
||||
* brightness (no change), whereas values less or greater than
|
||||
* 0.0 indicate decreased or incresaed brightness, respectively.
|
||||
*/
|
||||
setBrightness(brightness) {
|
||||
this._brightness.r = brightness.r;
|
||||
@@ -1252,14 +1247,10 @@ var ZoomRegion = class ZoomRegion {
|
||||
/**
|
||||
* setContrast:
|
||||
* Alter the contrast of the magnified view.
|
||||
* @param {Object} contrast: Object containing the contrast for the
|
||||
* red, green, and blue channels. Values of 0.0 represent "standard"
|
||||
* contrast (no change), whereas values less or greater than
|
||||
* 0.0 indicate decreased or incresaed contrast, respectively.
|
||||
*
|
||||
* {number} contrast.r - the red component
|
||||
* {number} contrast.g - the green component
|
||||
* {number} contrast.b - the blue component
|
||||
* @contrast Object containing the contrast for the red, green,
|
||||
* and blue channels. Values of 0.0 represent "standard"
|
||||
* contrast (no change), whereas values less or greater than
|
||||
* 0.0 indicate decreased or incresaed contrast, respectively.
|
||||
*/
|
||||
setContrast(contrast) {
|
||||
this._contrast.r = contrast.r;
|
||||
@@ -1272,8 +1263,8 @@ var ZoomRegion = class ZoomRegion {
|
||||
/**
|
||||
* getContrast:
|
||||
* Retrieve the contrast of the magnified view.
|
||||
* @returns {{r: number, g: number, b: number}}: Object containing
|
||||
* the contrast for the red, green, and blue channels.
|
||||
* @return Object containing the contrast for the red, green,
|
||||
* and blue channels.
|
||||
*/
|
||||
getContrast() {
|
||||
let contrast = {};
|
||||
@@ -1283,15 +1274,15 @@ var ZoomRegion = class ZoomRegion {
|
||||
return contrast;
|
||||
}
|
||||
|
||||
// Private methods //
|
||||
//// Private methods ////
|
||||
|
||||
_createActors() {
|
||||
// The root actor for the zoom region
|
||||
this._magView = new St.Bin({ style_class: 'magnifier-zoom-region' });
|
||||
this._magView = new St.Bin({ style_class: 'magnifier-zoom-region', x_fill: true, y_fill: true });
|
||||
global.stage.add_actor(this._magView);
|
||||
|
||||
// hide the magnified region from CLUTTER_PICK_ALL
|
||||
Shell.util_set_hidden_from_pick(this._magView, true);
|
||||
Shell.util_set_hidden_from_pick (this._magView, true);
|
||||
|
||||
// Add a group to clip the contents of the magnified view.
|
||||
let mainGroup = new Clutter.Actor({ clip_to_allocation: true });
|
||||
@@ -1331,7 +1322,7 @@ var ZoomRegion = class ZoomRegion {
|
||||
|
||||
_destroyActors() {
|
||||
if (this._mouseActor == this._mouseSourceActor)
|
||||
this._mouseActor.get_parent().remove_actor(this._mouseActor);
|
||||
this._mouseActor.get_parent().remove_actor (this._mouseActor);
|
||||
if (this._crossHairs)
|
||||
this._crossHairs.removeFromParent(this._crossHairsActor);
|
||||
|
||||
@@ -1411,12 +1402,11 @@ var ZoomRegion = class ZoomRegion {
|
||||
// If in lens mode, move the magnified view such that it is centered
|
||||
// over the actual mouse. However, in full screen mode, the "lens" is
|
||||
// the size of the screen -- pointless to move such a large lens around.
|
||||
if (this._lensMode && !this._isFullScreen()) {
|
||||
if (this._lensMode && !this._isFullScreen())
|
||||
this._setViewPort({ x: this._xCenter - this._viewPortWidth / 2,
|
||||
y: this._yCenter - this._viewPortHeight / 2,
|
||||
width: this._viewPortWidth,
|
||||
height: this._viewPortHeight }, true);
|
||||
}
|
||||
|
||||
this._updateCloneGeometry();
|
||||
this._updateMousePosition();
|
||||
@@ -1430,9 +1420,10 @@ var ZoomRegion = class ZoomRegion {
|
||||
let xMouse = this._magnifier.xMouse;
|
||||
let yMouse = this._magnifier.yMouse;
|
||||
|
||||
mouseIsOver =
|
||||
mouseIsOver = (
|
||||
xMouse >= this._viewPortX && xMouse < (this._viewPortX + this._viewPortWidth) &&
|
||||
yMouse >= this._viewPortY && yMouse < (this._viewPortY + this._viewPortHeight);
|
||||
yMouse >= this._viewPortY && yMouse < (this._viewPortY + this._viewPortHeight)
|
||||
);
|
||||
}
|
||||
return mouseIsOver;
|
||||
}
|
||||
@@ -1457,12 +1448,13 @@ var ZoomRegion = class ZoomRegion {
|
||||
let xMouse = this._magnifier.xMouse;
|
||||
let yMouse = this._magnifier.yMouse;
|
||||
|
||||
if (this._mouseTrackingMode == GDesktopEnums.MagnifierMouseTrackingMode.PROPORTIONAL)
|
||||
if (this._mouseTrackingMode == GDesktopEnums.MagnifierMouseTrackingMode.PROPORTIONAL) {
|
||||
return this._centerFromPointProportional(xMouse, yMouse);
|
||||
else if (this._mouseTrackingMode == GDesktopEnums.MagnifierMouseTrackingMode.PUSH)
|
||||
} else if (this._mouseTrackingMode == GDesktopEnums.MagnifierMouseTrackingMode.PUSH) {
|
||||
return this._centerFromPointPush(xMouse, yMouse);
|
||||
else if (this._mouseTrackingMode == GDesktopEnums.MagnifierMouseTrackingMode.CENTERED)
|
||||
} else if (this._mouseTrackingMode == GDesktopEnums.MagnifierMouseTrackingMode.CENTERED) {
|
||||
return this._centerFromPointCentered(xMouse, yMouse);
|
||||
}
|
||||
|
||||
return null; // Should never be hit
|
||||
}
|
||||
@@ -1504,14 +1496,14 @@ var ZoomRegion = class ZoomRegion {
|
||||
let yRoiBottom = yRoi + heightRoi - cursorHeight;
|
||||
|
||||
if (xPoint < xRoi)
|
||||
xPos -= xRoi - xPoint;
|
||||
xPos -= (xRoi - xPoint);
|
||||
else if (xPoint > xRoiRight)
|
||||
xPos += xPoint - xRoiRight;
|
||||
xPos += (xPoint - xRoiRight);
|
||||
|
||||
if (yPoint < yRoi)
|
||||
yPos -= yRoi - yPoint;
|
||||
yPos -= (yRoi - yPoint);
|
||||
else if (yPoint > yRoiBottom)
|
||||
yPos += yPoint - yRoiBottom;
|
||||
yPos += (yPoint - yRoiBottom);
|
||||
|
||||
return [xPos, yPos];
|
||||
}
|
||||
@@ -1608,7 +1600,7 @@ class Crosshairs extends Clutter.Actor {
|
||||
super._init({
|
||||
clip_to_allocation: false,
|
||||
width: groupWidth,
|
||||
height: groupHeight,
|
||||
height: groupHeight
|
||||
});
|
||||
this._horizLeftHair = new Clutter.Actor();
|
||||
this._horizRightHair = new Clutter.Actor();
|
||||
@@ -1637,12 +1629,11 @@ class Crosshairs extends Clutter.Actor {
|
||||
* already part of some other ZoomRegion, create a clone of the crosshairs
|
||||
* actor, and add the clone instead. Returns either the original or the
|
||||
* clone.
|
||||
* @param {ZoomRegion} zoomRegion: The container to add the crosshairs
|
||||
* group to.
|
||||
* @param {Clutter.Actor} magnifiedMouse: The mouse actor for the
|
||||
* zoom region -- used to position the crosshairs and properly
|
||||
* layer them below the mouse.
|
||||
* @returns {Clutter.Actor} The crosshairs actor, or its clone.
|
||||
* @zoomRegion: The container to add the crosshairs group to.
|
||||
* @magnifiedMouse: The mouse actor for the zoom region -- used to
|
||||
* position the crosshairs and properly layer them below
|
||||
* the mouse.
|
||||
* @return The crosshairs actor, or its clone.
|
||||
*/
|
||||
addToZoomRegion(zoomRegion, magnifiedMouse) {
|
||||
let crosshairsActor = null;
|
||||
@@ -1660,7 +1651,7 @@ class Crosshairs extends Clutter.Actor {
|
||||
}
|
||||
|
||||
container.add_actor(crosshairsActor);
|
||||
container.set_child_above_sibling(magnifiedMouse, crosshairsActor);
|
||||
container.raise_child(magnifiedMouse, crosshairsActor);
|
||||
let [xMouse, yMouse] = magnifiedMouse.get_position();
|
||||
let [crosshairsWidth, crosshairsHeight] = crosshairsActor.get_size();
|
||||
crosshairsActor.set_position(xMouse - crosshairsWidth / 2, yMouse - crosshairsHeight / 2);
|
||||
@@ -1671,8 +1662,7 @@ class Crosshairs extends Clutter.Actor {
|
||||
|
||||
/**
|
||||
* removeFromParent:
|
||||
* @param {Clutter.Actor} childActor: the actor returned from
|
||||
* addToZoomRegion
|
||||
* @childActor: the actor returned from addToZoomRegion
|
||||
* Remove the crosshairs actor from its parent container, or destroy the
|
||||
* child actor if it was just a clone of the crosshairs actor.
|
||||
*/
|
||||
@@ -1686,7 +1676,7 @@ class Crosshairs extends Clutter.Actor {
|
||||
/**
|
||||
* setColor:
|
||||
* Set the color of the crosshairs.
|
||||
* @param {Clutter.Color} clutterColor: The color
|
||||
* @clutterColor: The color as a Clutter.Color.
|
||||
*/
|
||||
setColor(clutterColor) {
|
||||
this._horizLeftHair.background_color = clutterColor;
|
||||
@@ -1698,7 +1688,7 @@ class Crosshairs extends Clutter.Actor {
|
||||
/**
|
||||
* getColor:
|
||||
* Get the color of the crosshairs.
|
||||
* @returns {ClutterColor} the crosshairs color
|
||||
* @color: The color as a Clutter.Color.
|
||||
*/
|
||||
getColor() {
|
||||
return this._horizLeftHair.get_color();
|
||||
@@ -1707,7 +1697,7 @@ class Crosshairs extends Clutter.Actor {
|
||||
/**
|
||||
* setThickness:
|
||||
* Set the width of the vertical and horizontal lines of the crosshairs.
|
||||
* @param {number} thickness: the new thickness value
|
||||
* @thickness
|
||||
*/
|
||||
setThickness(thickness) {
|
||||
this._horizLeftHair.set_height(thickness);
|
||||
@@ -1720,7 +1710,7 @@ class Crosshairs extends Clutter.Actor {
|
||||
/**
|
||||
* getThickness:
|
||||
* Get the width of the vertical and horizontal lines of the crosshairs.
|
||||
* @returns {number} The thickness of the crosshairs.
|
||||
* @return: The thickness of the crosshairs.
|
||||
*/
|
||||
getThickness() {
|
||||
return this._horizLeftHair.get_height();
|
||||
@@ -1729,8 +1719,7 @@ class Crosshairs extends Clutter.Actor {
|
||||
/**
|
||||
* setOpacity:
|
||||
* Set how opaque the crosshairs are.
|
||||
* @param {number} opacity: Value between 0 (fully transparent)
|
||||
* and 255 (full opaque).
|
||||
* @opacity: Value between 0 (fully transparent) and 255 (full opaque).
|
||||
*/
|
||||
setOpacity(opacity) {
|
||||
// set_opacity() throws an exception for values outside the range
|
||||
@@ -1749,7 +1738,7 @@ class Crosshairs extends Clutter.Actor {
|
||||
/**
|
||||
* setLength:
|
||||
* Set the length of the vertical and horizontal lines in the crosshairs.
|
||||
* @param {number} length: The length of the crosshairs.
|
||||
* @length: The length of the crosshairs.
|
||||
*/
|
||||
setLength(length) {
|
||||
this._horizLeftHair.set_width(length);
|
||||
@@ -1762,7 +1751,7 @@ class Crosshairs extends Clutter.Actor {
|
||||
/**
|
||||
* getLength:
|
||||
* Get the length of the vertical and horizontal lines in the crosshairs.
|
||||
* @returns {number} The length of the crosshairs.
|
||||
* @return: The length of the crosshairs.
|
||||
*/
|
||||
getLength() {
|
||||
return this._horizLeftHair.get_width();
|
||||
@@ -1772,8 +1761,8 @@ class Crosshairs extends Clutter.Actor {
|
||||
* setClip:
|
||||
* Set the width and height of the rectangle that clips the crosshairs at
|
||||
* their intersection
|
||||
* @param {number[]} size: Array of [width, height] defining the size
|
||||
* of the clip rectangle.
|
||||
* @size: Array of [width, height] defining the size of the clip
|
||||
* rectangle.
|
||||
*/
|
||||
setClip(size) {
|
||||
if (size) {
|
||||
@@ -1793,7 +1782,7 @@ class Crosshairs extends Clutter.Actor {
|
||||
* Reposition the horizontal and vertical hairs such that they cross at
|
||||
* the center of crosshairs group. If called with the dimensions of
|
||||
* the clip rectangle, these are used to update the size of the clip.
|
||||
* @param {number[]=} clipSize: If present, the clip's [width, height].
|
||||
* @clipSize: Optional. If present, an array of the form [width, height].
|
||||
*/
|
||||
reCenter(clipSize) {
|
||||
let [groupWidth, groupHeight] = this.get_size();
|
||||
@@ -1851,7 +1840,7 @@ var MagShaderEffects = class MagShaderEffects {
|
||||
/**
|
||||
* setInvertLightness:
|
||||
* Enable/disable invert lightness effect.
|
||||
* @param {bool} invertFlag: Enabled flag.
|
||||
* @invertFlag: Enabled flag.
|
||||
*/
|
||||
setInvertLightness(invertFlag) {
|
||||
this._inverse.set_enabled(invertFlag);
|
||||
@@ -1864,14 +1853,11 @@ var MagShaderEffects = class MagShaderEffects {
|
||||
/**
|
||||
* setBrightness:
|
||||
* Set the brightness of the magnified view.
|
||||
* @param {Object} brightness: Object containing the contrast for the
|
||||
* red, green, and blue channels. Values of 0.0 represent "standard"
|
||||
* brightness (no change), whereas values less or greater than
|
||||
* 0.0 indicate decreased or incresaed brightness, respectively.
|
||||
*
|
||||
* {number} brightness.r - the red component
|
||||
* {number} brightness.g - the green component
|
||||
* {number} brightness.b - the blue component
|
||||
* @brightness: Object containing the brightness for the red, green,
|
||||
* and blue channels. Values of 0.0 represent "standard"
|
||||
* brightness (no change), whereas values less or greater than
|
||||
* 0.0 indicate decreased or incresaed brightness,
|
||||
* respectively.
|
||||
*/
|
||||
setBrightness(brightness) {
|
||||
let bRed = brightness.r;
|
||||
@@ -1883,21 +1869,17 @@ var MagShaderEffects = class MagShaderEffects {
|
||||
// it modifies the brightness and/or contrast.
|
||||
let [cRed, cGreen, cBlue] = this._brightnessContrast.get_contrast();
|
||||
this._brightnessContrast.set_enabled(
|
||||
bRed != NO_CHANGE || bGreen != NO_CHANGE || bBlue != NO_CHANGE ||
|
||||
cRed != NO_CHANGE || cGreen != NO_CHANGE || cBlue != NO_CHANGE
|
||||
(bRed != NO_CHANGE || bGreen != NO_CHANGE || bBlue != NO_CHANGE ||
|
||||
cRed != NO_CHANGE || cGreen != NO_CHANGE || cBlue != NO_CHANGE)
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the contrast of the magnified view.
|
||||
* @param {Object} contrast: Object containing the contrast for the
|
||||
* red, green, and blue channels. Values of 0.0 represent "standard"
|
||||
* contrast (no change), whereas values less or greater than
|
||||
* 0.0 indicate decreased or incresaed contrast, respectively.
|
||||
*
|
||||
* {number} contrast.r - the red component
|
||||
* {number} contrast.g - the green component
|
||||
* {number} contrast.b - the blue component
|
||||
* @contrast: Object containing the contrast for the red, green,
|
||||
* and blue channels. Values of 0.0 represent "standard"
|
||||
* contrast (no change), whereas values less or greater than
|
||||
* 0.0 indicate decreased or incresaed contrast, respectively.
|
||||
*/
|
||||
setContrast(contrast) {
|
||||
let cRed = contrast.r;
|
||||
|
||||
@@ -32,7 +32,7 @@ var ShellMagnifier = class ShellMagnifier {
|
||||
|
||||
/**
|
||||
* setActive:
|
||||
* @param {bool} activate: activate or de-activate the magnifier.
|
||||
* @activate: Boolean to activate or de-activate the magnifier.
|
||||
*/
|
||||
setActive(activate) {
|
||||
Main.magnifier.setActive(activate);
|
||||
@@ -40,7 +40,7 @@ var ShellMagnifier = class ShellMagnifier {
|
||||
|
||||
/**
|
||||
* isActive:
|
||||
* @returns {bool} Whether the magnifier is active.
|
||||
* @return Whether the magnifier is active (boolean).
|
||||
*/
|
||||
isActive() {
|
||||
return Main.magnifier.isActive();
|
||||
@@ -65,25 +65,22 @@ var ShellMagnifier = class ShellMagnifier {
|
||||
/**
|
||||
* createZoomRegion:
|
||||
* Create a new ZoomRegion and return its object path.
|
||||
* @param {number} xMagFactor:
|
||||
* The power to set horizontal magnification of the ZoomRegion.
|
||||
* A value of 1.0 means no magnification. A value of 2.0 doubles
|
||||
* the size.
|
||||
* @param {number} yMagFactor:
|
||||
* The power to set the vertical magnification of the
|
||||
* ZoomRegion.
|
||||
* @param {number[]} roi
|
||||
* Array of integers defining the region of the screen/desktop
|
||||
* to magnify. The array has the form [left, top, right, bottom].
|
||||
* @param {number[]} viewPort
|
||||
* Array of integers, [left, top, right, bottom] that defines
|
||||
* the position of the ZoomRegion on screen.
|
||||
* @xMagFactor: The power to set horizontal magnification of the
|
||||
* ZoomRegion. A value of 1.0 means no magnification. A
|
||||
* value of 2.0 doubles the size.
|
||||
* @yMagFactor: The power to set the vertical magnification of the
|
||||
* ZoomRegion.
|
||||
* @roi Array of integers defining the region of the
|
||||
* screen/desktop to magnify. The array has the form
|
||||
* [left, top, right, bottom].
|
||||
* @viewPort Array of integers, [left, top, right, bottom] that defines
|
||||
* the position of the ZoomRegion on screen.
|
||||
*
|
||||
* FIXME: The arguments here are redundant, since the width and height of
|
||||
* the ROI are determined by the viewport and magnification factors.
|
||||
* We ignore the passed in width and height.
|
||||
*
|
||||
* @returns {ZoomRegion} The newly created ZoomRegion.
|
||||
* @return The newly created ZoomRegion.
|
||||
*/
|
||||
createZoomRegion(xMagFactor, yMagFactor, roi, viewPort) {
|
||||
let ROI = { x: roi[0], y: roi[1], width: roi[2] - roi[0], height: roi[3] - roi[1] };
|
||||
@@ -103,9 +100,7 @@ var ShellMagnifier = class ShellMagnifier {
|
||||
/**
|
||||
* addZoomRegion:
|
||||
* Append the given ZoomRegion to the magnifier's list of ZoomRegions.
|
||||
* @param {string} zoomerObjectPath: The object path for the zoom
|
||||
* region proxy.
|
||||
* @returns {bool} whether the region was added successfully
|
||||
* @zoomerObjectPath: The object path for the zoom region proxy.
|
||||
*/
|
||||
addZoomRegion(zoomerObjectPath) {
|
||||
let proxyAndZoomRegion = this._zoomers[zoomerObjectPath];
|
||||
@@ -120,8 +115,8 @@ var ShellMagnifier = class ShellMagnifier {
|
||||
/**
|
||||
* getZoomRegions:
|
||||
* Return a list of ZoomRegion object paths for this Magnifier.
|
||||
* @returns {string[]}: The Magnifier's zoom region list as an array
|
||||
* of DBus object paths.
|
||||
* @return: The Magnifier's zoom region list as an array of DBus object
|
||||
* paths.
|
||||
*/
|
||||
getZoomRegions() {
|
||||
// There may be more ZoomRegions in the magnifier itself than have
|
||||
@@ -130,7 +125,7 @@ var ShellMagnifier = class ShellMagnifier {
|
||||
let zoomRegions = Main.magnifier.getZoomRegions();
|
||||
let objectPaths = [];
|
||||
let thoseZoomers = this._zoomers;
|
||||
zoomRegions.forEach(aZoomRegion => {
|
||||
zoomRegions.forEach (aZoomRegion => {
|
||||
let found = false;
|
||||
for (let objectPath in thoseZoomers) {
|
||||
let proxyAndZoomRegion = thoseZoomers[objectPath];
|
||||
@@ -142,7 +137,7 @@ var ShellMagnifier = class ShellMagnifier {
|
||||
}
|
||||
if (!found) {
|
||||
// Got a ZoomRegion with no DBus proxy, make one.
|
||||
let newPath = `${ZOOM_SERVICE_PATH}/zoomer${_zoomRegionInstanceCount}`;
|
||||
let newPath = ZOOM_SERVICE_PATH + '/zoomer' + _zoomRegionInstanceCount;
|
||||
_zoomRegionInstanceCount++;
|
||||
let zoomRegionProxy = new ShellMagnifierZoomRegion(newPath, aZoomRegion);
|
||||
let proxyAndZoomer = {};
|
||||
@@ -174,7 +169,7 @@ var ShellMagnifier = class ShellMagnifier {
|
||||
/**
|
||||
* fullScreenCapable:
|
||||
* Consult if the Magnifier can magnify in full-screen mode.
|
||||
* @returns {bool} Always return true.
|
||||
* @return Always return true.
|
||||
*/
|
||||
fullScreenCapable() {
|
||||
return true;
|
||||
@@ -183,7 +178,7 @@ var ShellMagnifier = class ShellMagnifier {
|
||||
/**
|
||||
* setCrosswireSize:
|
||||
* Set the crosswire size of all ZoomRegions.
|
||||
* @param {number} size: The thickness of each line in the cross wire.
|
||||
* @size: The thickness of each line in the cross wire.
|
||||
*/
|
||||
setCrosswireSize(size) {
|
||||
Main.magnifier.setCrosshairsThickness(size);
|
||||
@@ -192,7 +187,7 @@ var ShellMagnifier = class ShellMagnifier {
|
||||
/**
|
||||
* getCrosswireSize:
|
||||
* Get the crosswire size of all ZoomRegions.
|
||||
* @returns {number}: The thickness of each line in the cross wire.
|
||||
* @return: The thickness of each line in the cross wire.
|
||||
*/
|
||||
getCrosswireSize() {
|
||||
return Main.magnifier.getCrosshairsThickness();
|
||||
@@ -201,16 +196,16 @@ var ShellMagnifier = class ShellMagnifier {
|
||||
/**
|
||||
* setCrosswireLength:
|
||||
* Set the crosswire length of all zoom-regions..
|
||||
* @param {number} length: The length of each line in the cross wire.
|
||||
* @size: The length of each line in the cross wire.
|
||||
*/
|
||||
setCrosswireLength(length) {
|
||||
Main.magnifier.setCrosshairsLength(length);
|
||||
}
|
||||
|
||||
/**
|
||||
* getCrosswireSize:
|
||||
* Get the crosswire length of all zoom-regions.
|
||||
* @returns {number} size: The length of each line in the cross wire.
|
||||
* setCrosswireSize:
|
||||
* Set the crosswire size of all zoom-regions.
|
||||
* @size: The thickness of each line in the cross wire.
|
||||
*/
|
||||
getCrosswireLength() {
|
||||
return Main.magnifier.getCrosshairsLength();
|
||||
@@ -219,7 +214,7 @@ var ShellMagnifier = class ShellMagnifier {
|
||||
/**
|
||||
* setCrosswireClip:
|
||||
* Set if the crosswire will be clipped by the cursor image..
|
||||
* @param {bool} clip: Flag to indicate whether to clip the crosswire.
|
||||
* @clip: Flag to indicate whether to clip the crosswire.
|
||||
*/
|
||||
setCrosswireClip(clip) {
|
||||
Main.magnifier.setCrosshairsClip(clip);
|
||||
@@ -228,7 +223,7 @@ var ShellMagnifier = class ShellMagnifier {
|
||||
/**
|
||||
* getCrosswireClip:
|
||||
* Get the crosswire clip value.
|
||||
* @returns {bool}: Whether the crosswire is clipped by the cursor image.
|
||||
* @return: Whether the crosswire is clipped by the cursor image.
|
||||
*/
|
||||
getCrosswireClip() {
|
||||
return Main.magnifier.getCrosshairsClip();
|
||||
@@ -237,7 +232,7 @@ var ShellMagnifier = class ShellMagnifier {
|
||||
/**
|
||||
* setCrosswireColor:
|
||||
* Set the crosswire color of all ZoomRegions.
|
||||
* @param {number} color: Unsigned int of the form rrggbbaa.
|
||||
* @color: Unsigned int of the form rrggbbaa.
|
||||
*/
|
||||
setCrosswireColor(color) {
|
||||
Main.magnifier.setCrosshairsColor('#%08x'.format(color));
|
||||
@@ -246,8 +241,7 @@ var ShellMagnifier = class ShellMagnifier {
|
||||
/**
|
||||
* getCrosswireClip:
|
||||
* Get the crosswire color of all ZoomRegions.
|
||||
* @returns {number}: The crosswire color as an unsigned int in
|
||||
* the form rrggbbaa.
|
||||
* @return: The crosswire color as an unsigned int in the form rrggbbaa.
|
||||
*/
|
||||
getCrosswireColor() {
|
||||
let colorString = Main.magnifier.getCrosshairsColor();
|
||||
@@ -272,11 +266,11 @@ var ShellMagnifierZoomRegion = class ShellMagnifierZoomRegion {
|
||||
|
||||
/**
|
||||
* setMagFactor:
|
||||
* @param {number} xMagFactor: The power to set the horizontal
|
||||
* magnification factor to of the magnified view. A value of
|
||||
* 1.0 means no magnification. A value of 2.0 doubles the size.
|
||||
* @param {number} yMagFactor: The power to set the vertical
|
||||
* magnification factor to of the magnified view.
|
||||
* @xMagFactor: The power to set the horizontal magnification factor to
|
||||
* of the magnified view. A value of 1.0 means no
|
||||
* magnification. A value of 2.0 doubles the size.
|
||||
* @yMagFactor: The power to set the vertical magnification factor to
|
||||
* of the magnified view.
|
||||
*/
|
||||
setMagFactor(xMagFactor, yMagFactor) {
|
||||
this._zoomRegion.setMagFactor(xMagFactor, yMagFactor);
|
||||
@@ -284,7 +278,7 @@ var ShellMagnifierZoomRegion = class ShellMagnifierZoomRegion {
|
||||
|
||||
/**
|
||||
* getMagFactor:
|
||||
* @returns {number[]}: [xMagFactor, yMagFactor], containing the horizontal
|
||||
* @return an array, [xMagFactor, yMagFactor], containing the horizontal
|
||||
* and vertical magnification powers. A value of 1.0 means no
|
||||
* magnification. A value of 2.0 means the contents are doubled
|
||||
* in size, and so on.
|
||||
@@ -296,9 +290,9 @@ var ShellMagnifierZoomRegion = class ShellMagnifierZoomRegion {
|
||||
/**
|
||||
* setRoi:
|
||||
* Sets the "region of interest" that the ZoomRegion is magnifying.
|
||||
* @param {number[]} roi: [left, top, right, bottom], defining the
|
||||
* region of the screen to magnify.
|
||||
* The values are in screen (unmagnified) coordinate space.
|
||||
* @roi Array, [left, top, right, bottom], defining the region of the
|
||||
* screen to magnify. The values are in screen (unmagnified)
|
||||
* coordinate space.
|
||||
*/
|
||||
setRoi(roi) {
|
||||
let roiObject = { x: roi[0], y: roi[1], width: roi[2] - roi[0], height: roi[3] - roi[1] };
|
||||
@@ -310,7 +304,7 @@ var ShellMagnifierZoomRegion = class ShellMagnifierZoomRegion {
|
||||
* Retrieves the "region of interest" -- the rectangular bounds of that part
|
||||
* of the desktop that the magnified view is showing (x, y, width, height).
|
||||
* The bounds are given in non-magnified coordinates.
|
||||
* @returns {Array}: [left, top, right, bottom], representing the bounding
|
||||
* @return an array, [left, top, right, bottom], representing the bounding
|
||||
* rectangle of what is shown in the magnified view.
|
||||
*/
|
||||
getRoi() {
|
||||
@@ -323,11 +317,10 @@ var ShellMagnifierZoomRegion = class ShellMagnifierZoomRegion {
|
||||
/**
|
||||
* Set the "region of interest" by centering the given screen coordinate
|
||||
* within the zoom region.
|
||||
* @param {number} x: The x-coord of the point to place at the
|
||||
* center of the zoom region.
|
||||
* @param {number} y: The y-coord.
|
||||
* @returns {bool} Whether the shift was successful (for GS-mag, this
|
||||
* is always true).
|
||||
* @x The x-coord of the point to place at the center of the zoom region.
|
||||
* @y The y-coord.
|
||||
* @return Whether the shift was successful (for GS-mag, this is always
|
||||
* true).
|
||||
*/
|
||||
shiftContentsTo(x, y) {
|
||||
this._zoomRegion.scrollContentsTo(x, y);
|
||||
@@ -337,8 +330,8 @@ var ShellMagnifierZoomRegion = class ShellMagnifierZoomRegion {
|
||||
/**
|
||||
* moveResize
|
||||
* Sets the position and size of the ZoomRegion on screen.
|
||||
* @param {number[]} viewPort: [left, top, right, bottom], defining
|
||||
* the position and size on screen to place the zoom region.
|
||||
* @viewPort Array, [left, top, right, bottom], defining the position and
|
||||
* size on screen to place the zoom region.
|
||||
*/
|
||||
moveResize(viewPort) {
|
||||
let viewRect = { x: viewPort[0], y: viewPort[1], width: viewPort[2] - viewPort[0], height: viewPort[3] - viewPort[1] };
|
||||
|
||||
108
js/ui/main.js
108
js/ui/main.js
@@ -199,12 +199,12 @@ function _initializeUI() {
|
||||
layoutManager.init();
|
||||
overview.init();
|
||||
|
||||
new PointerA11yTimeout.PointerA11yTimeout();
|
||||
(new PointerA11yTimeout.PointerA11yTimeout());
|
||||
|
||||
_a11ySettings = new Gio.Settings({ schema_id: A11Y_SCHEMA });
|
||||
|
||||
global.display.connect('overlay-key', () => {
|
||||
if (!_a11ySettings.get_boolean(STICKY_KEYS_ENABLE))
|
||||
if (!_a11ySettings.get_boolean (STICKY_KEYS_ENABLE))
|
||||
overview.toggle();
|
||||
});
|
||||
|
||||
@@ -248,17 +248,17 @@ function _initializeUI() {
|
||||
}
|
||||
|
||||
layoutManager.connect('startup-complete', () => {
|
||||
if (actionMode == Shell.ActionMode.NONE)
|
||||
if (actionMode == Shell.ActionMode.NONE) {
|
||||
actionMode = Shell.ActionMode.NORMAL;
|
||||
|
||||
if (screenShield)
|
||||
}
|
||||
if (screenShield) {
|
||||
screenShield.lockIfWasLocked();
|
||||
|
||||
}
|
||||
if (sessionMode.currentMode != 'gdm' &&
|
||||
sessionMode.currentMode != 'initial-setup') {
|
||||
GLib.log_structured(LOG_DOMAIN, GLib.LogLevelFlags.LEVEL_MESSAGE, {
|
||||
'MESSAGE': `GNOME Shell started at ${_startDate}`,
|
||||
'MESSAGE_ID': GNOMESHELL_STARTED_MESSAGE_ID,
|
||||
'MESSAGE_ID': GNOMESHELL_STARTED_MESSAGE_ID
|
||||
});
|
||||
}
|
||||
|
||||
@@ -289,19 +289,19 @@ function _initializeUI() {
|
||||
function _getStylesheet(name) {
|
||||
let stylesheet;
|
||||
|
||||
stylesheet = Gio.File.new_for_uri(`resource:///org/gnome/shell/theme/${name}`);
|
||||
stylesheet = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/' + name);
|
||||
if (stylesheet.query_exists(null))
|
||||
return stylesheet;
|
||||
|
||||
let dataDirs = GLib.get_system_data_dirs();
|
||||
for (let i = 0; i < dataDirs.length; i++) {
|
||||
let path = GLib.build_filenamev([dataDirs[i], 'gnome-shell', 'theme', name]);
|
||||
stylesheet = Gio.file_new_for_path(path);
|
||||
let stylesheet = Gio.file_new_for_path(path);
|
||||
if (stylesheet.query_exists(null))
|
||||
return stylesheet;
|
||||
}
|
||||
|
||||
stylesheet = Gio.File.new_for_path(`${global.datadir}/theme/${name}`);
|
||||
stylesheet = Gio.File.new_for_path(global.datadir + '/theme/' + name);
|
||||
if (stylesheet.query_exists(null))
|
||||
return stylesheet;
|
||||
|
||||
@@ -337,7 +337,7 @@ function _loadDefaultStylesheet() {
|
||||
*
|
||||
* Get the theme CSS file that the shell will load
|
||||
*
|
||||
* @returns {?Gio.File}: A #GFile that contains the theme CSS,
|
||||
* Returns: A #GFile that contains the theme CSS,
|
||||
* null if using the default
|
||||
*/
|
||||
function getThemeStylesheet() {
|
||||
@@ -346,8 +346,8 @@ function getThemeStylesheet() {
|
||||
|
||||
/**
|
||||
* setThemeStylesheet:
|
||||
* @param {string=} cssStylesheet: A file path that contains the theme CSS,
|
||||
* set it to null to use the default
|
||||
* @cssStylesheet: A file path that contains the theme CSS,
|
||||
* set it to null to use the default
|
||||
*
|
||||
* Set the theme CSS file that the shell will load
|
||||
*/
|
||||
@@ -359,12 +359,12 @@ function reloadThemeResource() {
|
||||
if (_themeResource)
|
||||
_themeResource._unregister();
|
||||
|
||||
_themeResource = Gio.Resource.load(`${global.datadir}/gnome-shell-theme.gresource`);
|
||||
_themeResource = Gio.Resource.load(global.datadir + '/gnome-shell-theme.gresource');
|
||||
_themeResource._register();
|
||||
}
|
||||
|
||||
function _loadOskLayouts() {
|
||||
_oskResource = Gio.Resource.load(`${global.datadir}/gnome-shell-osk-layouts.gresource`);
|
||||
_oskResource = Gio.Resource.load(global.datadir + '/gnome-shell-osk-layouts.gresource');
|
||||
_oskResource._register();
|
||||
}
|
||||
|
||||
@@ -374,13 +374,11 @@ function _loadOskLayouts() {
|
||||
* Reloads the theme CSS file
|
||||
*/
|
||||
function loadTheme() {
|
||||
let themeContext = St.ThemeContext.get_for_stage(global.stage);
|
||||
let themeContext = St.ThemeContext.get_for_stage (global.stage);
|
||||
let previousTheme = themeContext.get_theme();
|
||||
|
||||
let theme = new St.Theme({
|
||||
application_stylesheet: _cssStylesheet,
|
||||
default_stylesheet: _defaultCssStylesheet,
|
||||
});
|
||||
let theme = new St.Theme ({ application_stylesheet: _cssStylesheet,
|
||||
default_stylesheet: _defaultCssStylesheet });
|
||||
|
||||
if (theme.default_stylesheet == null)
|
||||
throw new Error("No valid stylesheet found for '%s'".format(sessionMode.stylesheetName));
|
||||
@@ -392,13 +390,13 @@ function loadTheme() {
|
||||
theme.load_stylesheet(customStylesheets[i]);
|
||||
}
|
||||
|
||||
themeContext.set_theme(theme);
|
||||
themeContext.set_theme (theme);
|
||||
}
|
||||
|
||||
/**
|
||||
* notify:
|
||||
* @param {string} msg: A message
|
||||
* @param {string} details: Additional information
|
||||
* @msg: A message
|
||||
* @details: Additional information
|
||||
*/
|
||||
function notify(msg, details) {
|
||||
let source = new MessageTray.SystemNotificationSource();
|
||||
@@ -410,8 +408,8 @@ function notify(msg, details) {
|
||||
|
||||
/**
|
||||
* notifyError:
|
||||
* @param {string} msg: An error message
|
||||
* @param {string} details: Additional information
|
||||
* @msg: An error message
|
||||
* @details: Additional information
|
||||
*
|
||||
* See shell_global_notify_problem().
|
||||
*/
|
||||
@@ -435,8 +433,8 @@ function _findModal(actor) {
|
||||
|
||||
/**
|
||||
* pushModal:
|
||||
* @param {Clutter.Actor} actor: actor which will be given keyboard focus
|
||||
* @param {Object=} params: optional parameters
|
||||
* @actor: #ClutterActor which will be given keyboard focus
|
||||
* @params: optional parameters
|
||||
*
|
||||
* Ensure we are in a mode where all keyboard and mouse input goes to
|
||||
* the stage, and focus @actor. Multiple calls to this function act in
|
||||
@@ -459,7 +457,7 @@ function _findModal(actor) {
|
||||
* global keybindings; the default of NONE will filter
|
||||
* out all keybindings
|
||||
*
|
||||
* @returns {bool}: true iff we successfully acquired a grab or already had one
|
||||
* Returns: true iff we successfully acquired a grab or already had one
|
||||
*/
|
||||
function pushModal(actor, params) {
|
||||
params = Params.parse(params, { timestamp: global.get_current_time(),
|
||||
@@ -490,11 +488,11 @@ function pushModal(actor, params) {
|
||||
modalActorFocusStack[index].prevFocus = null;
|
||||
});
|
||||
}
|
||||
modalActorFocusStack.push({ actor,
|
||||
modalActorFocusStack.push({ actor: actor,
|
||||
destroyId: actorDestroyId,
|
||||
prevFocus,
|
||||
prevFocusDestroyId,
|
||||
actionMode });
|
||||
prevFocus: prevFocus,
|
||||
prevFocusDestroyId: prevFocusDestroyId,
|
||||
actionMode: actionMode });
|
||||
|
||||
actionMode = params.actionMode;
|
||||
global.stage.set_key_focus(actor);
|
||||
@@ -503,9 +501,8 @@ function pushModal(actor, params) {
|
||||
|
||||
/**
|
||||
* popModal:
|
||||
* @param {Clutter.Actor} actor: the actor passed to original invocation
|
||||
* of pushModal()
|
||||
* @param {number=} timestamp: optional timestamp
|
||||
* @actor: #ClutterActor passed to original invocation of pushModal()
|
||||
* @timestamp: optional timestamp
|
||||
*
|
||||
* Reverse the effect of pushModal(). If this invocation is undoing
|
||||
* the topmost invocation, then the focus will be restored to the
|
||||
@@ -576,24 +573,24 @@ function popModal(actor, timestamp) {
|
||||
}
|
||||
|
||||
function createLookingGlass() {
|
||||
if (lookingGlass == null)
|
||||
if (lookingGlass == null) {
|
||||
lookingGlass = new LookingGlass.LookingGlass();
|
||||
|
||||
}
|
||||
return lookingGlass;
|
||||
}
|
||||
|
||||
function openRunDialog() {
|
||||
if (runDialog == null)
|
||||
if (runDialog == null) {
|
||||
runDialog = new RunDialog.RunDialog();
|
||||
|
||||
}
|
||||
runDialog.open();
|
||||
}
|
||||
|
||||
/**
|
||||
* activateWindow:
|
||||
* @param {Meta.Window} window: the window to activate
|
||||
* @param {number=} time: current event time
|
||||
* @param {number=} workspaceNum: window's workspace number
|
||||
* @window: the Meta.Window to activate
|
||||
* @time: (optional) current event time
|
||||
* @workspaceNum: (optional) window's workspace number
|
||||
*
|
||||
* Activates @window, switching to its workspace first if necessary,
|
||||
* and switching out of the overview if it's currently active
|
||||
@@ -601,7 +598,7 @@ function openRunDialog() {
|
||||
function activateWindow(window, time, workspaceNum) {
|
||||
let workspaceManager = global.workspace_manager;
|
||||
let activeWorkspaceNum = workspaceManager.get_active_workspace_index();
|
||||
let windowWorkspaceNum = workspaceNum !== undefined ? workspaceNum : window.get_workspace().index();
|
||||
let windowWorkspaceNum = (workspaceNum !== undefined) ? workspaceNum : window.get_workspace().index();
|
||||
|
||||
if (!time)
|
||||
time = global.get_current_time();
|
||||
@@ -669,8 +666,8 @@ function _queueBeforeRedraw(workId) {
|
||||
|
||||
/**
|
||||
* initializeDeferredWork:
|
||||
* @param {Clutter.Actor} actor: an actor
|
||||
* @param {callback} callback: Function to invoke to perform work
|
||||
* @actor: A #ClutterActor
|
||||
* @callback: Function to invoke to perform work
|
||||
*
|
||||
* This function sets up a callback to be invoked when either the
|
||||
* given actor is mapped, or after some period of time when the machine
|
||||
@@ -683,13 +680,13 @@ function _queueBeforeRedraw(workId) {
|
||||
* initialization as well, under the assumption that new actors
|
||||
* will need it.
|
||||
*
|
||||
* @returns {string}: A string work identifier
|
||||
* Returns: A string work identifier
|
||||
*/
|
||||
function initializeDeferredWork(actor, callback) {
|
||||
// Turn into a string so we can use as an object property
|
||||
let workId = `${++_deferredWorkSequence}`;
|
||||
_deferredWorkData[workId] = { actor,
|
||||
callback };
|
||||
let workId = `${(++_deferredWorkSequence)}`;
|
||||
_deferredWorkData[workId] = { 'actor': actor,
|
||||
'callback': callback };
|
||||
actor.connect('notify::mapped', () => {
|
||||
if (!(actor.mapped && _deferredWorkQueue.includes(workId)))
|
||||
return;
|
||||
@@ -707,7 +704,7 @@ function initializeDeferredWork(actor, callback) {
|
||||
|
||||
/**
|
||||
* queueDeferredWork:
|
||||
* @param {string} workId: work identifier
|
||||
* @workId: work identifier
|
||||
*
|
||||
* Ensure that the work identified by @workId will be
|
||||
* run on map or timeout. You should call this function
|
||||
@@ -743,13 +740,12 @@ class RestartMessage extends ModalDialog.ModalDialog {
|
||||
shouldFadeIn: false,
|
||||
destroyOnClose: true });
|
||||
|
||||
let label = new St.Label({
|
||||
text: message,
|
||||
x_align: Clutter.ActorAlign.CENTER,
|
||||
y_align: Clutter.ActorAlign.CENTER,
|
||||
});
|
||||
let label = new St.Label({ text: message });
|
||||
|
||||
this.contentLayout.add_child(label);
|
||||
this.contentLayout.add(label, { x_fill: false,
|
||||
y_fill: false,
|
||||
x_align: St.Align.MIDDLE,
|
||||
y_align: St.Align.MIDDLE });
|
||||
this.buttonLayout.hide();
|
||||
}
|
||||
});
|
||||
|
||||
@@ -39,7 +39,7 @@ class URLHighlighter extends St.Label {
|
||||
reactive: true,
|
||||
style_class: 'url-highlighter',
|
||||
x_expand: true,
|
||||
x_align: Clutter.ActorAlign.START,
|
||||
x_align: Clutter.ActorAlign.START
|
||||
});
|
||||
this._linkColor = '#ccccff';
|
||||
this.connect('style-changed', () => {
|
||||
@@ -79,7 +79,7 @@ class URLHighlighter extends St.Label {
|
||||
if (urlId != -1) {
|
||||
let url = this._urls[urlId].url;
|
||||
if (!url.includes(':'))
|
||||
url = `http://${url}`;
|
||||
url = 'http://' + url;
|
||||
|
||||
Gio.app_info_launch_default_for_uri(
|
||||
url, global.create_app_launch_context(0, -1));
|
||||
@@ -132,7 +132,7 @@ class URLHighlighter extends St.Label {
|
||||
for (let i = 0; i < urls.length; i++) {
|
||||
let url = urls[i];
|
||||
let str = this._text.substr(pos, url.pos - pos);
|
||||
markup += `${str}<span foreground="${this._linkColor}"><u>${url.url}</u></span>`;
|
||||
markup += str + '<span foreground="' + this._linkColor + '"><u>' + url.url + '</u></span>';
|
||||
pos = url.pos + url.url.length;
|
||||
}
|
||||
markup += this._text.substr(pos);
|
||||
@@ -150,11 +150,10 @@ class URLHighlighter extends St.Label {
|
||||
findPos = i;
|
||||
}
|
||||
if (findPos != -1) {
|
||||
for (let i = 0; i < this._urls.length; i++) {
|
||||
for (let i = 0; i < this._urls.length; i++)
|
||||
if (findPos >= this._urls[i].pos &&
|
||||
this._urls[i].pos + this._urls[i].url.length > findPos)
|
||||
return i;
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
@@ -171,22 +170,20 @@ class ScaleLayout extends Clutter.BinLayout {
|
||||
if (this._container == container)
|
||||
return;
|
||||
|
||||
if (this._container) {
|
||||
if (this._container)
|
||||
for (let id of this._signals)
|
||||
this._container.disconnect(id);
|
||||
}
|
||||
|
||||
this._container = container;
|
||||
this._signals = [];
|
||||
|
||||
if (this._container) {
|
||||
if (this._container)
|
||||
for (let signal of ['notify::scale-x', 'notify::scale-y']) {
|
||||
let id = this._container.connect(signal, () => {
|
||||
this.layout_changed();
|
||||
});
|
||||
this._signals.push(id);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
vfunc_get_preferred_width(container, forHeight) {
|
||||
@@ -213,7 +210,7 @@ var LabelExpanderLayout = GObject.registerClass({
|
||||
'Expansion of the layout, between 0 (collapsed) ' +
|
||||
'and 1 (fully expanded',
|
||||
GObject.ParamFlags.READABLE | GObject.ParamFlags.WRITABLE,
|
||||
0, 1, 0),
|
||||
0, 1, 0)
|
||||
},
|
||||
}, class LabelExpanderLayout extends Clutter.LayoutManager {
|
||||
_init(params) {
|
||||
@@ -235,7 +232,7 @@ var LabelExpanderLayout = GObject.registerClass({
|
||||
|
||||
let visibleIndex = this._expansion > 0 ? 1 : 0;
|
||||
for (let i = 0; this._container && i < this._container.get_n_children(); i++)
|
||||
this._container.get_child_at_index(i).visible = i == visibleIndex;
|
||||
this._container.get_child_at_index(i).visible = (i == visibleIndex);
|
||||
|
||||
this.layout_changed();
|
||||
}
|
||||
@@ -298,11 +295,12 @@ var LabelExpanderLayout = GObject.registerClass({
|
||||
|
||||
|
||||
var Message = GObject.registerClass({
|
||||
GTypeName: 'MessageList_Message',
|
||||
Signals: {
|
||||
'close': {},
|
||||
'expanded': {},
|
||||
'unexpanded': {},
|
||||
},
|
||||
}
|
||||
}, class Message extends St.Button {
|
||||
_init(title, body) {
|
||||
super._init({
|
||||
@@ -310,16 +308,13 @@ var Message = GObject.registerClass({
|
||||
accessible_role: Atk.Role.NOTIFICATION,
|
||||
can_focus: true,
|
||||
x_expand: true,
|
||||
y_expand: true,
|
||||
x_fill: true
|
||||
});
|
||||
|
||||
this.expanded = false;
|
||||
this._useBodyMarkup = false;
|
||||
|
||||
let vbox = new St.BoxLayout({
|
||||
vertical: true,
|
||||
x_expand: true,
|
||||
});
|
||||
let vbox = new St.BoxLayout({ vertical: true });
|
||||
this.set_child(vbox);
|
||||
|
||||
let hbox = new St.BoxLayout();
|
||||
@@ -331,7 +326,7 @@ var Message = GObject.registerClass({
|
||||
|
||||
this._iconBin = new St.Bin({ style_class: 'message-icon-bin',
|
||||
y_expand: true,
|
||||
y_align: Clutter.ActorAlign.START,
|
||||
y_align: St.Align.START,
|
||||
visible: false });
|
||||
hbox.add_actor(this._iconBin);
|
||||
|
||||
@@ -349,18 +344,14 @@ var Message = GObject.registerClass({
|
||||
this.setTitle(title);
|
||||
titleBox.add_actor(this.titleLabel);
|
||||
|
||||
this._secondaryBin = new St.Bin({
|
||||
style_class: 'message-secondary-bin',
|
||||
x_expand: true, y_expand: true,
|
||||
});
|
||||
this._secondaryBin = new St.Bin({ style_class: 'message-secondary-bin',
|
||||
x_expand: true, y_expand: true,
|
||||
x_fill: true, y_fill: true });
|
||||
titleBox.add_actor(this._secondaryBin);
|
||||
|
||||
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 });
|
||||
@@ -385,7 +376,7 @@ var Message = GObject.registerClass({
|
||||
|
||||
setIcon(actor) {
|
||||
this._iconBin.child = actor;
|
||||
this._iconBin.visible = actor != null;
|
||||
this._iconBin.visible = (actor != null);
|
||||
}
|
||||
|
||||
setSecondaryActor(actor) {
|
||||
@@ -456,7 +447,7 @@ var Message = GObject.registerClass({
|
||||
expand(animate) {
|
||||
this.expanded = true;
|
||||
|
||||
this._actionBin.visible = this._actionBin.get_n_children() > 0;
|
||||
this._actionBin.visible = (this._actionBin.get_n_children() > 0);
|
||||
|
||||
if (this._bodyStack.get_n_children() < 2) {
|
||||
this._expandedLabel = new URLHighlighter(this._bodyText,
|
||||
@@ -474,7 +465,7 @@ var Message = GObject.registerClass({
|
||||
this._actionBin.ease({
|
||||
scale_y: 1,
|
||||
duration: MessageTray.ANIMATION_TIME,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD
|
||||
});
|
||||
} else {
|
||||
this._bodyStack.layout_manager.expansion = 1;
|
||||
@@ -498,7 +489,7 @@ var Message = GObject.registerClass({
|
||||
onComplete: () => {
|
||||
this._actionBin.hide();
|
||||
this.expanded = false;
|
||||
},
|
||||
}
|
||||
});
|
||||
} else {
|
||||
this._bodyStack.layout_manager.expansion = 0;
|
||||
@@ -549,14 +540,14 @@ var MessageListSection = GObject.registerClass({
|
||||
'can-clear-changed': {},
|
||||
'empty-changed': {},
|
||||
'message-focused': { param_types: [Message.$gtype] },
|
||||
},
|
||||
}
|
||||
}, class MessageListSection extends St.BoxLayout {
|
||||
_init() {
|
||||
super._init({
|
||||
style_class: 'message-list-section',
|
||||
clip_to_allocation: true,
|
||||
vertical: true,
|
||||
x_expand: true,
|
||||
x_expand: true
|
||||
});
|
||||
|
||||
this._list = new St.BoxLayout({ style_class: 'message-list-section-list',
|
||||
@@ -615,6 +606,8 @@ var MessageListSection = GObject.registerClass({
|
||||
|
||||
let listItem = new St.Bin({
|
||||
child: message,
|
||||
x_fill: true,
|
||||
y_fill: true,
|
||||
layout_manager: new ScaleLayout(),
|
||||
pivot_point: new Graphene.Point({ x: .5, y: .5 }),
|
||||
});
|
||||
@@ -638,14 +631,14 @@ var MessageListSection = GObject.registerClass({
|
||||
scale_x: 1,
|
||||
scale_y: 1,
|
||||
duration: MESSAGE_ANIMATION_TIME,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
moveMessage(message, index, animate) {
|
||||
if (!this._messages.includes(message))
|
||||
throw new Error(`Impossible to move untracked message`);
|
||||
throw new Error(`Impossible to move the untracked message ${message}`);
|
||||
|
||||
let listItem = message.get_parent();
|
||||
|
||||
@@ -660,7 +653,7 @@ var MessageListSection = GObject.registerClass({
|
||||
scale_x: 1,
|
||||
scale_y: 1,
|
||||
duration: MESSAGE_ANIMATION_TIME,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD
|
||||
});
|
||||
};
|
||||
listItem.ease({
|
||||
@@ -668,13 +661,13 @@ var MessageListSection = GObject.registerClass({
|
||||
scale_y: 0,
|
||||
duration: MESSAGE_ANIMATION_TIME,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
onComplete,
|
||||
onComplete
|
||||
});
|
||||
}
|
||||
|
||||
removeMessage(message, animate) {
|
||||
if (!this._messages.includes(message))
|
||||
throw new Error(`Impossible to remove untracked message`);
|
||||
throw new Error(`Impossible to remove the untracked message ${message}`);
|
||||
|
||||
let listItem = message.get_parent();
|
||||
listItem._connectionsIds.forEach(id => message.disconnect(id));
|
||||
@@ -688,7 +681,7 @@ var MessageListSection = GObject.registerClass({
|
||||
onComplete: () => {
|
||||
listItem.destroy();
|
||||
global.sync_pointer();
|
||||
},
|
||||
}
|
||||
});
|
||||
} else {
|
||||
listItem.destroy();
|
||||
@@ -716,7 +709,7 @@ var MessageListSection = GObject.registerClass({
|
||||
duration: MESSAGE_ANIMATION_TIME,
|
||||
delay: i * delay,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
onComplete: () => message.close(),
|
||||
onComplete: () => message.close()
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -33,7 +33,7 @@ var State = {
|
||||
HIDDEN: 0,
|
||||
SHOWING: 1,
|
||||
SHOWN: 2,
|
||||
HIDING: 3,
|
||||
HIDING: 3
|
||||
};
|
||||
|
||||
// These reasons are useful when we destroy the notifications received through
|
||||
@@ -47,7 +47,7 @@ var NotificationDestroyedReason = {
|
||||
EXPIRED: 1,
|
||||
DISMISSED: 2,
|
||||
SOURCE_CLOSED: 3,
|
||||
REPLACED: 4,
|
||||
REPLACED: 4
|
||||
};
|
||||
|
||||
// Message tray has its custom Urgency enumeration. LOW, NORMAL and CRITICAL
|
||||
@@ -58,7 +58,7 @@ var Urgency = {
|
||||
LOW: 0,
|
||||
NORMAL: 1,
|
||||
HIGH: 2,
|
||||
CRITICAL: 3,
|
||||
CRITICAL: 3
|
||||
};
|
||||
|
||||
// The privacy of the details of a notification. USER is for notifications which
|
||||
@@ -134,6 +134,7 @@ var FocusGrabber = class FocusGrabber {
|
||||
//
|
||||
// A notification without a policy object will inherit the default one.
|
||||
var NotificationPolicy = GObject.registerClass({
|
||||
GTypeName: 'MessageTray_NotificationPolicy',
|
||||
Properties: {
|
||||
'enable': GObject.ParamSpec.boolean(
|
||||
'enable', 'enable', 'enable',
|
||||
@@ -159,7 +160,7 @@ var NotificationPolicy = GObject.registerClass({
|
||||
'details-in-lock-screen', 'details-in-lock-screen', 'details-in-lock-screen',
|
||||
GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT_ONLY,
|
||||
false),
|
||||
},
|
||||
}
|
||||
}, class NotificationPolicy extends GObject.Object {
|
||||
// Do nothing for the default policy. These methods are only useful for the
|
||||
// GSettings policy.
|
||||
@@ -191,6 +192,7 @@ var NotificationPolicy = GObject.registerClass({
|
||||
});
|
||||
|
||||
var NotificationGenericPolicy = GObject.registerClass({
|
||||
GTypeName: 'MessageTray_NotificationGenericPolicy'
|
||||
}, class NotificationGenericPolicy extends NotificationPolicy {
|
||||
_init() {
|
||||
super._init();
|
||||
@@ -221,6 +223,7 @@ var NotificationGenericPolicy = GObject.registerClass({
|
||||
});
|
||||
|
||||
var NotificationApplicationPolicy = GObject.registerClass({
|
||||
GTypeName: 'MessageTray_NotificationApplicationPolicy'
|
||||
}, class NotificationApplicationPolicy extends NotificationPolicy {
|
||||
_init(id) {
|
||||
super._init();
|
||||
@@ -347,6 +350,7 @@ var NotificationApplicationPolicy = GObject.registerClass({
|
||||
//
|
||||
// [1] https://developer.gnome.org/notification-spec/#markup
|
||||
var Notification = GObject.registerClass({
|
||||
GTypeName: 'MessageTray_Notification',
|
||||
Properties: {
|
||||
'acknowledged': GObject.ParamSpec.boolean(
|
||||
'acknowledged', 'acknowledged', 'acknowledged',
|
||||
@@ -357,7 +361,7 @@ var Notification = GObject.registerClass({
|
||||
'activated': {},
|
||||
'destroy': { param_types: [GObject.TYPE_UINT] },
|
||||
'updated': { param_types: [GObject.TYPE_BOOLEAN] },
|
||||
},
|
||||
}
|
||||
}, class Notification extends GObject.Object {
|
||||
_init(source, title, banner, params) {
|
||||
super._init();
|
||||
@@ -435,7 +439,7 @@ var Notification = GObject.registerClass({
|
||||
// @label: the label for the action's button
|
||||
// @callback: the callback for the action
|
||||
addAction(label, callback) {
|
||||
this.actions.push({ label, callback });
|
||||
this.actions.push({ label: label, callback: callback });
|
||||
}
|
||||
|
||||
get acknowledged() {
|
||||
@@ -522,7 +526,7 @@ var NotificationBanner = GObject.registerClass({
|
||||
Signals: {
|
||||
'done-displaying': {},
|
||||
'unfocused': {},
|
||||
},
|
||||
}
|
||||
}, class NotificationBanner extends Calendar.NotificationMessage {
|
||||
_init(notification) {
|
||||
super._init(notification);
|
||||
@@ -609,7 +613,7 @@ var NotificationBanner = GObject.registerClass({
|
||||
|
||||
addAction(label, callback) {
|
||||
let button = new St.Button({ style_class: 'notification-button',
|
||||
label,
|
||||
label: label,
|
||||
x_expand: true,
|
||||
can_focus: true });
|
||||
|
||||
@@ -632,7 +636,8 @@ class SourceActor extends St.Widget {
|
||||
this._actorDestroyed = false;
|
||||
|
||||
let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
|
||||
this._iconBin = new St.Bin({ x_expand: true,
|
||||
this._iconBin = new St.Bin({ x_fill: true,
|
||||
x_expand: true,
|
||||
height: size * scaleFactor,
|
||||
width: size * scaleFactor });
|
||||
|
||||
@@ -728,6 +733,7 @@ class SourceActorWithLabel extends SourceActor {
|
||||
});
|
||||
|
||||
var Source = GObject.registerClass({
|
||||
GTypeName: 'MessageTray_Source',
|
||||
Properties: {
|
||||
'count': GObject.ParamSpec.int(
|
||||
'count', 'count', 'count',
|
||||
@@ -747,10 +753,10 @@ var Source = GObject.registerClass({
|
||||
'icon-updated': {},
|
||||
'notification-added': { param_types: [Notification.$gtype] },
|
||||
'notification-show': { param_types: [Notification.$gtype] },
|
||||
},
|
||||
}
|
||||
}, class Source extends GObject.Object {
|
||||
_init(title, iconName) {
|
||||
super._init({ title });
|
||||
super._init({ title: title });
|
||||
|
||||
this.SOURCE_ICON_SIZE = 48;
|
||||
|
||||
@@ -856,10 +862,11 @@ var Source = GObject.registerClass({
|
||||
notification.acknowledged = false;
|
||||
this.pushNotification(notification);
|
||||
|
||||
if (this.policy.showBanners || notification.urgency == Urgency.CRITICAL)
|
||||
if (this.policy.showBanners || notification.urgency == Urgency.CRITICAL) {
|
||||
this.emit('notification-show', notification);
|
||||
else
|
||||
} else {
|
||||
notification.playSound();
|
||||
}
|
||||
}
|
||||
|
||||
notify(propName) {
|
||||
@@ -900,10 +907,9 @@ var Source = GObject.registerClass({
|
||||
}
|
||||
|
||||
destroyNonResidentNotifications() {
|
||||
for (let i = this.notifications.length - 1; i >= 0; i--) {
|
||||
for (let i = this.notifications.length - 1; i >= 0; i--)
|
||||
if (!this.notifications[i].resident)
|
||||
this.notifications[i].destroy();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
@@ -912,13 +918,13 @@ var MessageTray = GObject.registerClass({
|
||||
'queue-changed': {},
|
||||
'source-added': { param_types: [Source.$gtype] },
|
||||
'source-removed': { param_types: [Source.$gtype] },
|
||||
},
|
||||
}
|
||||
}, class MessageTray extends St.Widget {
|
||||
_init() {
|
||||
super._init({
|
||||
visible: false,
|
||||
clip_to_allocation: true,
|
||||
layout_manager: new Clutter.BinLayout(),
|
||||
layout_manager: new Clutter.BinLayout()
|
||||
});
|
||||
|
||||
this._presence = new GnomeSession.Presence((proxy, _error) => {
|
||||
@@ -1162,7 +1168,7 @@ var MessageTray = GObject.registerClass({
|
||||
// indicator in the panel; however do make an exception for CRITICAL
|
||||
// notifications, as only banner mode allows expansion.
|
||||
let bannerCount = this._notification ? 1 : 0;
|
||||
let full = this.queueCount + bannerCount >= MAX_NOTIFICATIONS_IN_QUEUE;
|
||||
let full = (this.queueCount + bannerCount >= MAX_NOTIFICATIONS_IN_QUEUE);
|
||||
if (!full || notification.urgency == Urgency.CRITICAL) {
|
||||
notification.connect('destroy',
|
||||
this._onNotificationDestroy.bind(this));
|
||||
@@ -1309,7 +1315,7 @@ var MessageTray = GObject.registerClass({
|
||||
let nextNotification = this._notificationQueue[0] || null;
|
||||
if (hasNotifications && nextNotification) {
|
||||
let limited = this._busy || Main.layoutManager.primaryMonitor.inFullscreen;
|
||||
let showNextNotification = !limited || nextNotification.forFeedback || nextNotification.urgency == Urgency.CRITICAL;
|
||||
let showNextNotification = (!limited || nextNotification.forFeedback || nextNotification.urgency == Urgency.CRITICAL);
|
||||
if (showNextNotification)
|
||||
this._showNotification();
|
||||
}
|
||||
@@ -1319,7 +1325,7 @@ var MessageTray = GObject.registerClass({
|
||||
this._notification.urgency != Urgency.CRITICAL &&
|
||||
!this._banner.focused &&
|
||||
!this._pointerInNotification) || this._notificationExpired;
|
||||
let mustClose = this._notificationRemoved || !hasNotifications || expired;
|
||||
let mustClose = (this._notificationRemoved || !hasNotifications || expired);
|
||||
|
||||
if (mustClose) {
|
||||
let animate = hasNotifications && !this._notificationRemoved;
|
||||
@@ -1414,7 +1420,7 @@ var MessageTray = GObject.registerClass({
|
||||
this._bannerBin.ease({
|
||||
opacity: 255,
|
||||
duration: ANIMATION_TIME,
|
||||
mode: Clutter.AnimationMode.LINEAR,
|
||||
mode: Clutter.AnimationMode.LINEAR
|
||||
});
|
||||
this._bannerBin.ease({
|
||||
y: 0,
|
||||
@@ -1424,7 +1430,7 @@ var MessageTray = GObject.registerClass({
|
||||
this._notificationState = State.SHOWN;
|
||||
this._showNotificationCompleted();
|
||||
this._updateState();
|
||||
},
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -1490,7 +1496,7 @@ var MessageTray = GObject.registerClass({
|
||||
this._bannerBin.ease({
|
||||
opacity: 0,
|
||||
duration: ANIMATION_TIME,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_BACK,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_BACK
|
||||
});
|
||||
this._bannerBin.ease({
|
||||
y: -this._bannerBin.height,
|
||||
@@ -1500,7 +1506,7 @@ var MessageTray = GObject.registerClass({
|
||||
this._notificationState = State.HIDDEN;
|
||||
this._hideNotificationCompleted();
|
||||
this._updateState();
|
||||
},
|
||||
}
|
||||
});
|
||||
} else {
|
||||
this._bannerBin.y = -this._bannerBin.height;
|
||||
|
||||
@@ -17,7 +17,7 @@ var State = {
|
||||
CLOSED: 1,
|
||||
OPENING: 2,
|
||||
CLOSING: 3,
|
||||
FADED_OUT: 4,
|
||||
FADED_OUT: 4
|
||||
};
|
||||
|
||||
var ModalDialog = GObject.registerClass({
|
||||
@@ -26,9 +26,9 @@ var ModalDialog = GObject.registerClass({
|
||||
GObject.ParamFlags.READABLE,
|
||||
Math.min(...Object.values(State)),
|
||||
Math.max(...Object.values(State)),
|
||||
State.CLOSED),
|
||||
State.CLOSED)
|
||||
},
|
||||
Signals: { 'opened': {}, 'closed': {} },
|
||||
Signals: { 'opened': {}, 'closed': {} }
|
||||
}, class ModalDialog extends St.Widget {
|
||||
_init(params) {
|
||||
super._init({ visible: false,
|
||||
@@ -57,12 +57,9 @@ var ModalDialog = GObject.registerClass({
|
||||
coordinate: Clutter.BindCoordinate.ALL });
|
||||
this.add_constraint(constraint);
|
||||
|
||||
this.backgroundStack = new St.Widget({
|
||||
layout_manager: new Clutter.BinLayout(),
|
||||
x_expand: true,
|
||||
y_expand: true,
|
||||
});
|
||||
this._backgroundBin = new St.Bin({ child: this.backgroundStack });
|
||||
this.backgroundStack = new St.Widget({ layout_manager: new Clutter.BinLayout() });
|
||||
this._backgroundBin = new St.Bin({ child: this.backgroundStack,
|
||||
x_fill: true, y_fill: true });
|
||||
this._monitorConstraint = new Layout.MonitorConstraint();
|
||||
this._backgroundBin.add_constraint(this._monitorConstraint);
|
||||
this.add_actor(this._backgroundBin);
|
||||
@@ -134,7 +131,7 @@ var ModalDialog = GObject.registerClass({
|
||||
onComplete: () => {
|
||||
this._setState(State.OPENED);
|
||||
this.emit('opened');
|
||||
},
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -183,7 +180,7 @@ var ModalDialog = GObject.registerClass({
|
||||
opacity: 0,
|
||||
duration: OPEN_AND_CLOSE_TIME,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
onComplete: () => this._closeComplete(),
|
||||
onComplete: () => this._closeComplete()
|
||||
});
|
||||
} else {
|
||||
this._closeComplete();
|
||||
@@ -206,7 +203,7 @@ var ModalDialog = GObject.registerClass({
|
||||
this._hasModal = false;
|
||||
|
||||
if (!this._shellReactive)
|
||||
this.backgroundStack.set_child_above_sibling(this._eventBlocker, null);
|
||||
this._eventBlocker.raise_top();
|
||||
}
|
||||
|
||||
pushModal(timestamp) {
|
||||
@@ -219,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();
|
||||
@@ -231,7 +226,7 @@ var ModalDialog = GObject.registerClass({
|
||||
}
|
||||
|
||||
if (!this._shellReactive)
|
||||
this.backgroundStack.set_child_below_sibling(this._eventBlocker, null);
|
||||
this._eventBlocker.lower_bottom();
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -258,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)
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
@@ -44,19 +44,11 @@ class MediaMessage extends MessageList.Message {
|
||||
this._player.next();
|
||||
});
|
||||
|
||||
this._updateHandlerId =
|
||||
this._player.connect('changed', this._update.bind(this));
|
||||
this._closedHandlerId =
|
||||
this._player.connect('closed', this.close.bind(this));
|
||||
this._player.connect('changed', this._update.bind(this));
|
||||
this._player.connect('closed', this.close.bind(this));
|
||||
this._update();
|
||||
}
|
||||
|
||||
_onDestroy() {
|
||||
super._onDestroy();
|
||||
this._player.disconnect(this._updateHandlerId);
|
||||
this._player.disconnect(this._closedHandlerId);
|
||||
}
|
||||
|
||||
vfunc_clicked() {
|
||||
this._player.raise();
|
||||
Main.panel.closeCalendar();
|
||||
@@ -72,7 +64,7 @@ class MediaMessage extends MessageList.Message {
|
||||
|
||||
if (this._player.trackCoverUrl) {
|
||||
let file = Gio.File.new_for_uri(this._player.trackCoverUrl);
|
||||
this._icon.gicon = new Gio.FileIcon({ file });
|
||||
this._icon.gicon = new Gio.FileIcon({ file: file });
|
||||
this._icon.remove_style_class_name('fallback');
|
||||
} else {
|
||||
this._icon.icon_name = 'audio-x-generic-symbolic';
|
||||
@@ -103,7 +95,6 @@ var MprisPlayer = class MprisPlayer {
|
||||
this._trackArtists = [];
|
||||
this._trackTitle = '';
|
||||
this._trackCoverUrl = '';
|
||||
this._busName = busName;
|
||||
}
|
||||
|
||||
get status() {
|
||||
@@ -186,39 +177,9 @@ var MprisPlayer = class MprisPlayer {
|
||||
for (let prop in this._playerProxy.Metadata)
|
||||
metadata[prop] = this._playerProxy.Metadata[prop].deep_unpack();
|
||||
|
||||
// Validate according to the spec; some clients send buggy metadata:
|
||||
// https://www.freedesktop.org/wiki/Specifications/mpris-spec/metadata
|
||||
this._trackArtists = metadata['xesam:artist'];
|
||||
if (!Array.isArray(this._trackArtists) ||
|
||||
!this._trackArtists.every(artist => typeof artist === 'string')) {
|
||||
if (typeof this._trackArtists !== 'undefined') {
|
||||
log(`Received faulty track artist metadata from ${
|
||||
this._busName}; expected an array of strings, got ${
|
||||
this._trackArtists} (${typeof this._trackArtists})`);
|
||||
}
|
||||
this._trackArtists = [_("Unknown artist")];
|
||||
}
|
||||
|
||||
this._trackTitle = metadata['xesam:title'];
|
||||
if (typeof this._trackTitle !== 'string') {
|
||||
if (typeof this._trackTitle !== 'undefined') {
|
||||
log(`Received faulty track title metadata from ${
|
||||
this._busName}; expected a string, got ${
|
||||
this._trackTitle} (${typeof this._trackTitle})`);
|
||||
}
|
||||
this._trackTitle = _("Unknown title");
|
||||
}
|
||||
|
||||
this._trackCoverUrl = metadata['mpris:artUrl'];
|
||||
if (typeof this._trackCoverUrl !== 'string') {
|
||||
if (typeof this._trackCoverUrl !== 'undefined') {
|
||||
log(`Received faulty track cover art metadata from ${
|
||||
this._busName}; expected a string, got ${
|
||||
this._trackCoverUrl} (${typeof this._trackCoverUrl})`);
|
||||
}
|
||||
this._trackCoverUrl = '';
|
||||
}
|
||||
|
||||
this._trackArtists = metadata['xesam:artist'] || [_("Unknown artist")];
|
||||
this._trackTitle = metadata['xesam:title'] || _("Unknown title");
|
||||
this._trackCoverUrl = metadata['mpris:artUrl'] || '';
|
||||
this.emit('changed');
|
||||
|
||||
let visible = this._playerProxy.CanPlay;
|
||||
@@ -228,7 +189,7 @@ var MprisPlayer = class MprisPlayer {
|
||||
if (visible)
|
||||
this.emit('show');
|
||||
else
|
||||
this.emit('hide');
|
||||
this._close();
|
||||
}
|
||||
}
|
||||
};
|
||||
@@ -256,20 +217,15 @@ class MediaSection extends MessageList.MessageListSection {
|
||||
return;
|
||||
|
||||
let player = new MprisPlayer(busName);
|
||||
let message = null;
|
||||
player.connect('closed',
|
||||
() => {
|
||||
this._players.delete(busName);
|
||||
});
|
||||
player.connect('show', () => {
|
||||
message = new MediaMessage(player);
|
||||
this.addMessage(message, true);
|
||||
});
|
||||
player.connect('hide', () => {
|
||||
this.removeMessage(message, true);
|
||||
message = null;
|
||||
});
|
||||
|
||||
player.connect('show',
|
||||
() => {
|
||||
let message = new MediaMessage(player);
|
||||
this.addMessage(message, true);
|
||||
});
|
||||
this._players.set(busName, player);
|
||||
}
|
||||
|
||||
|
||||
@@ -23,13 +23,13 @@ var NotificationClosedReason = {
|
||||
EXPIRED: 1,
|
||||
DISMISSED: 2,
|
||||
APP_CLOSED: 3,
|
||||
UNDEFINED: 4,
|
||||
UNDEFINED: 4
|
||||
};
|
||||
|
||||
var Urgency = {
|
||||
LOW: 0,
|
||||
NORMAL: 1,
|
||||
CRITICAL: 2,
|
||||
CRITICAL: 2
|
||||
};
|
||||
|
||||
const rewriteRules = {
|
||||
@@ -39,8 +39,8 @@ const rewriteRules = {
|
||||
{ pattern: /^XChat: New public message from: (\S*) \((.*)\)$/,
|
||||
replacement: '$2 <$1>' },
|
||||
{ pattern: /^XChat: Highlighted message from: (\S*) \((.*)\)$/,
|
||||
replacement: '$2 <$1>' },
|
||||
],
|
||||
replacement: '$2 <$1>' }
|
||||
]
|
||||
};
|
||||
|
||||
var FdoNotificationDaemon = class FdoNotificationDaemon {
|
||||
@@ -201,13 +201,13 @@ var FdoNotificationDaemon = class FdoNotificationDaemon {
|
||||
hints['image-data'] = hints['icon_data'];
|
||||
}
|
||||
|
||||
let ndata = { appName,
|
||||
icon,
|
||||
summary,
|
||||
body,
|
||||
actions,
|
||||
hints,
|
||||
timeout };
|
||||
let ndata = { appName: appName,
|
||||
icon: icon,
|
||||
summary: summary,
|
||||
body: body,
|
||||
actions: actions,
|
||||
hints: hints,
|
||||
timeout: timeout };
|
||||
if (replacesId != 0 && this._notifications[replacesId]) {
|
||||
ndata.id = id = replacesId;
|
||||
ndata.notification = this._notifications[replacesId].notification;
|
||||
@@ -245,7 +245,7 @@ var FdoNotificationDaemon = class FdoNotificationDaemon {
|
||||
return;
|
||||
}
|
||||
|
||||
[pid] = result;
|
||||
let [pid] = result;
|
||||
source = this._getSource(appName, pid, ndata, sender, null);
|
||||
|
||||
this._senderToPid[sender] = pid;
|
||||
@@ -299,7 +299,7 @@ var FdoNotificationDaemon = class FdoNotificationDaemon {
|
||||
else if (!gicon)
|
||||
gicon = this._fallbackIconForNotificationData(hints);
|
||||
|
||||
notification.update(summary, body, { gicon,
|
||||
notification.update(summary, body, { gicon: gicon,
|
||||
bannerMarkup: true,
|
||||
clear: true,
|
||||
soundFile: hints['sound-file'],
|
||||
@@ -310,13 +310,12 @@ var FdoNotificationDaemon = class FdoNotificationDaemon {
|
||||
if (actions.length) {
|
||||
for (let i = 0; i < actions.length - 1; i += 2) {
|
||||
let [actionId, label] = [actions[i], actions[i + 1]];
|
||||
if (actionId == 'default') {
|
||||
if (actionId == 'default')
|
||||
hasDefaultAction = true;
|
||||
} else {
|
||||
else
|
||||
notification.addAction(label, () => {
|
||||
this._emitActionInvoked(ndata.id, actionId);
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -346,7 +345,7 @@ var FdoNotificationDaemon = class FdoNotificationDaemon {
|
||||
// of the 'transient' hint with hints['transient'] rather than hints.transient
|
||||
notification.setTransient(!!hints['transient']);
|
||||
|
||||
let privacyScope = hints['x-gnome-privacy-scope'] || 'user';
|
||||
let privacyScope = (hints['x-gnome-privacy-scope'] || 'user');
|
||||
notification.setPrivacyScope(privacyScope == 'system'
|
||||
? MessageTray.PrivacyScope.SYSTEM
|
||||
: MessageTray.PrivacyScope.USER);
|
||||
@@ -384,7 +383,7 @@ var FdoNotificationDaemon = class FdoNotificationDaemon {
|
||||
Config.PACKAGE_NAME,
|
||||
'GNOME',
|
||||
Config.PACKAGE_VERSION,
|
||||
'1.2',
|
||||
'1.2'
|
||||
];
|
||||
}
|
||||
|
||||
@@ -428,14 +427,13 @@ class FdoNotificationDaemonSource extends MessageTray.Source {
|
||||
else
|
||||
this.useNotificationIcon = true;
|
||||
|
||||
if (sender) {
|
||||
if (sender)
|
||||
this._nameWatcherId = Gio.DBus.session.watch_name(sender,
|
||||
Gio.BusNameWatcherFlags.NONE,
|
||||
null,
|
||||
this._onNameVanished.bind(this));
|
||||
} else {
|
||||
else
|
||||
this._nameWatcherId = 0;
|
||||
}
|
||||
}
|
||||
|
||||
_createPolicy() {
|
||||
@@ -534,7 +532,7 @@ const PRIORITY_URGENCY_MAP = {
|
||||
low: MessageTray.Urgency.LOW,
|
||||
normal: MessageTray.Urgency.NORMAL,
|
||||
high: MessageTray.Urgency.HIGH,
|
||||
urgent: MessageTray.Urgency.CRITICAL,
|
||||
urgent: MessageTray.Urgency.CRITICAL
|
||||
};
|
||||
|
||||
var GtkNotificationDaemonNotification = GObject.registerClass(
|
||||
|
||||
@@ -66,7 +66,7 @@ var OsdMonitorLabeler = class {
|
||||
|
||||
_trackClient(client) {
|
||||
if (this._client)
|
||||
return this._client == client;
|
||||
return (this._client == client);
|
||||
|
||||
this._client = client;
|
||||
this._clientWatchId = Gio.bus_watch_name(Gio.BusType.SESSION, client, 0, null,
|
||||
|
||||
@@ -48,7 +48,7 @@ class OsdWindow extends St.Widget {
|
||||
x_expand: true,
|
||||
y_expand: true,
|
||||
x_align: Clutter.ActorAlign.CENTER,
|
||||
y_align: Clutter.ActorAlign.CENTER,
|
||||
y_align: Clutter.ActorAlign.CENTER
|
||||
});
|
||||
|
||||
this._monitorIndex = monitorIndex;
|
||||
@@ -61,15 +61,15 @@ class OsdWindow extends St.Widget {
|
||||
this._box.add_constraint(this._boxConstraint);
|
||||
this.add_actor(this._box);
|
||||
|
||||
this._icon = new St.Icon({ y_expand: true });
|
||||
this._box.add_child(this._icon);
|
||||
this._icon = new St.Icon();
|
||||
this._box.add(this._icon, { expand: true });
|
||||
|
||||
this._label = new St.Label();
|
||||
this._box.add(this._label);
|
||||
|
||||
this._level = new BarLevel.BarLevel({
|
||||
style_class: 'level',
|
||||
value: 0,
|
||||
value: 0
|
||||
});
|
||||
this._box.add(this._level);
|
||||
|
||||
@@ -105,22 +105,21 @@ class OsdWindow extends St.Widget {
|
||||
}
|
||||
|
||||
setLabel(label) {
|
||||
this._label.visible = label != undefined;
|
||||
this._label.visible = (label != undefined);
|
||||
if (label)
|
||||
this._label.text = label;
|
||||
}
|
||||
|
||||
setLevel(value) {
|
||||
this._level.visible = value != undefined;
|
||||
this._level.visible = (value != undefined);
|
||||
if (value != undefined) {
|
||||
if (this.visible) {
|
||||
if (this.visible)
|
||||
this._level.ease_property('value', value, {
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
duration: LEVEL_ANIMATION_TIME,
|
||||
duration: LEVEL_ANIMATION_TIME
|
||||
});
|
||||
} else {
|
||||
else
|
||||
this._level.value = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -141,7 +140,7 @@ class OsdWindow extends St.Widget {
|
||||
this.ease({
|
||||
opacity: 255,
|
||||
duration: FADE_TIME,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD
|
||||
});
|
||||
}
|
||||
|
||||
@@ -169,7 +168,7 @@ class OsdWindow extends St.Widget {
|
||||
onComplete: () => {
|
||||
this._reset();
|
||||
Meta.enable_unredirect_for_display(global.display);
|
||||
},
|
||||
}
|
||||
});
|
||||
return GLib.SOURCE_REMOVE;
|
||||
}
|
||||
|
||||
@@ -84,7 +84,7 @@ class OverviewActor extends St.BoxLayout {
|
||||
/* Translators: This is the main view to select
|
||||
activities. See also note for "Activities" string. */
|
||||
accessible_name: _("Overview"),
|
||||
vertical: true,
|
||||
vertical: true
|
||||
});
|
||||
|
||||
this.add_constraint(new LayoutManager.MonitorConstraint({ primary: true }));
|
||||
@@ -94,7 +94,7 @@ class OverviewActor extends St.BoxLayout {
|
||||
let panelGhost = new St.Bin({
|
||||
child: new Clutter.Clone({ source: Main.panel }),
|
||||
reactive: false,
|
||||
opacity: 0,
|
||||
opacity: 0
|
||||
});
|
||||
this.add_actor(panelGhost);
|
||||
|
||||
@@ -106,19 +106,18 @@ class OverviewActor extends St.BoxLayout {
|
||||
characters. */
|
||||
hint_text: _("Type to search…"),
|
||||
track_hover: true,
|
||||
can_focus: true,
|
||||
can_focus: true
|
||||
});
|
||||
this._searchEntry.set_offscreen_redirect(Clutter.OffscreenRedirect.ALWAYS);
|
||||
let searchEntryBin = new St.Bin({
|
||||
child: this._searchEntry,
|
||||
x_align: Clutter.ActorAlign.CENTER,
|
||||
x_align: St.Align.MIDDLE
|
||||
});
|
||||
this.add_actor(searchEntryBin);
|
||||
|
||||
this._controls = new OverviewControls.ControlsManager(this._searchEntry);
|
||||
|
||||
// Add our same-line elements after the search entry
|
||||
this.add_child(this._controls);
|
||||
this.add(this._controls, { y_fill: true, expand: true });
|
||||
}
|
||||
|
||||
get dash() {
|
||||
@@ -206,7 +205,7 @@ var Overview = class {
|
||||
|
||||
// XDND
|
||||
this._dragMonitor = {
|
||||
dragMotion: this._onDragMotion.bind(this),
|
||||
dragMotion: this._onDragMotion.bind(this)
|
||||
};
|
||||
|
||||
|
||||
@@ -245,11 +244,11 @@ var Overview = class {
|
||||
for (let i = 0; i < backgrounds.length; i++) {
|
||||
backgrounds[i].ease_property('brightness', 1.0, {
|
||||
duration: SHADE_ANIMATION_TIME,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD
|
||||
});
|
||||
backgrounds[i].ease_property('vignette-sharpness', 0.0, {
|
||||
duration: SHADE_ANIMATION_TIME,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -259,11 +258,11 @@ var Overview = class {
|
||||
for (let i = 0; i < backgrounds.length; i++) {
|
||||
backgrounds[i].ease_property('brightness', Lightbox.VIGNETTE_BRIGHTNESS, {
|
||||
duration: SHADE_ANIMATION_TIME,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD
|
||||
});
|
||||
backgrounds[i].ease_property('vignette-sharpness', Lightbox.VIGNETTE_SHARPNESS, {
|
||||
duration: SHADE_ANIMATION_TIME,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -476,7 +475,7 @@ var Overview = class {
|
||||
this._desktopFade.ease({
|
||||
opacity: 255,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
duration: ANIMATION_TIME,
|
||||
duration: ANIMATION_TIME
|
||||
});
|
||||
}
|
||||
|
||||
@@ -494,7 +493,7 @@ var Overview = class {
|
||||
this._desktopFade.ease({
|
||||
opacity: 0,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
duration: ANIMATION_TIME,
|
||||
duration: ANIMATION_TIME
|
||||
});
|
||||
}
|
||||
|
||||
@@ -534,7 +533,6 @@ var Overview = class {
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// eslint-disable-next-line no-lonely-if
|
||||
if (this._modal) {
|
||||
Main.popModal(this._overview);
|
||||
this._modal = false;
|
||||
@@ -578,12 +576,11 @@ var Overview = class {
|
||||
opacity: 255,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
duration: ANIMATION_TIME,
|
||||
onComplete: () => this._showDone(),
|
||||
onComplete: () => this._showDone()
|
||||
});
|
||||
this._shadeBackgrounds();
|
||||
|
||||
Main.layoutManager.overviewGroup.set_child_above_sibling(
|
||||
this._coverPane, null);
|
||||
this._coverPane.raise_top();
|
||||
this._coverPane.show();
|
||||
this.emit('showing');
|
||||
}
|
||||
@@ -615,8 +612,8 @@ var Overview = class {
|
||||
let event = Clutter.get_current_event();
|
||||
if (event) {
|
||||
let type = event.type();
|
||||
let button = type == Clutter.EventType.BUTTON_PRESS ||
|
||||
type == Clutter.EventType.BUTTON_RELEASE;
|
||||
let button = (type == Clutter.EventType.BUTTON_PRESS ||
|
||||
type == Clutter.EventType.BUTTON_RELEASE);
|
||||
let ctrl = (event.get_state() & Clutter.ModifierType.CONTROL_MASK) != 0;
|
||||
if (button && ctrl)
|
||||
return;
|
||||
@@ -642,12 +639,11 @@ var Overview = class {
|
||||
opacity: 0,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
duration: ANIMATION_TIME,
|
||||
onComplete: () => this._hideDone(),
|
||||
onComplete: () => this._hideDone()
|
||||
});
|
||||
this._unshadeBackgrounds();
|
||||
|
||||
Main.layoutManager.overviewGroup.set_child_above_sibling(
|
||||
this._coverPane, null);
|
||||
this._coverPane.raise_top();
|
||||
this._coverPane.show();
|
||||
this.emit('hiding');
|
||||
}
|
||||
|
||||
@@ -12,17 +12,17 @@ const WorkspaceThumbnail = imports.ui.workspaceThumbnail;
|
||||
var SIDE_CONTROLS_ANIMATION_TIME = 160;
|
||||
|
||||
function getRtlSlideDirection(direction, actor) {
|
||||
let rtl = actor.text_direction == Clutter.TextDirection.RTL;
|
||||
if (rtl) {
|
||||
direction = direction == SlideDirection.LEFT
|
||||
let rtl = (actor.text_direction == Clutter.TextDirection.RTL);
|
||||
if (rtl)
|
||||
direction = (direction == SlideDirection.LEFT)
|
||||
? SlideDirection.RIGHT : SlideDirection.LEFT;
|
||||
}
|
||||
|
||||
return direction;
|
||||
}
|
||||
|
||||
var SlideDirection = {
|
||||
LEFT: 0,
|
||||
RIGHT: 1,
|
||||
RIGHT: 1
|
||||
};
|
||||
|
||||
var SlideLayout = GObject.registerClass({
|
||||
@@ -34,8 +34,8 @@ var SlideLayout = GObject.registerClass({
|
||||
'translation-x': GObject.ParamSpec.double(
|
||||
'translation-x', 'translation-x', 'translation-x',
|
||||
GObject.ParamFlags.READWRITE,
|
||||
-Infinity, Infinity, 0),
|
||||
},
|
||||
-Infinity, Infinity, 0)
|
||||
}
|
||||
}, class SlideLayout extends Clutter.FixedLayout {
|
||||
_init(params) {
|
||||
this._slideX = 1;
|
||||
@@ -67,7 +67,7 @@ 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
|
||||
let alignX = (realDirection == SlideDirection.LEFT)
|
||||
? availWidth - natWidth
|
||||
: availWidth - natWidth * this._slideX;
|
||||
|
||||
@@ -128,7 +128,7 @@ class SlidingControl extends St.Widget {
|
||||
super._init({
|
||||
layout_manager: this.layout,
|
||||
style_class: 'overview-controls',
|
||||
clip_to_allocation: true,
|
||||
clip_to_allocation: true
|
||||
});
|
||||
|
||||
this._visible = true;
|
||||
@@ -168,7 +168,7 @@ class SlidingControl extends St.Widget {
|
||||
let visibleWidth = this.getVisibleWidth();
|
||||
|
||||
if (direction == SlideDirection.LEFT)
|
||||
return -visibleWidth;
|
||||
return - visibleWidth;
|
||||
else
|
||||
return visibleWidth;
|
||||
}
|
||||
@@ -178,11 +178,12 @@ class SlidingControl extends St.Widget {
|
||||
let translationEnd = 0;
|
||||
let translation = this._getTranslation();
|
||||
|
||||
let shouldShow = this._getSlide() > 0;
|
||||
if (shouldShow)
|
||||
let shouldShow = (this._getSlide() > 0);
|
||||
if (shouldShow) {
|
||||
translationStart = translation;
|
||||
else
|
||||
} else {
|
||||
translationEnd = translation;
|
||||
}
|
||||
|
||||
if (this.layout.translation_x == translationEnd)
|
||||
return;
|
||||
@@ -223,7 +224,7 @@ class SlidingControl extends St.Widget {
|
||||
this.ease({
|
||||
opacity: 255,
|
||||
duration: SIDE_CONTROLS_ANIMATION_TIME / 2,
|
||||
mode: Clutter.AnimationMode.EASE_IN_QUAD,
|
||||
mode: Clutter.AnimationMode.EASE_IN_QUAD
|
||||
});
|
||||
}
|
||||
|
||||
@@ -231,7 +232,7 @@ class SlidingControl extends St.Widget {
|
||||
this.ease({
|
||||
opacity: 128,
|
||||
duration: SIDE_CONTROLS_ANIMATION_TIME / 2,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD
|
||||
});
|
||||
}
|
||||
|
||||
@@ -428,7 +429,7 @@ class ControlsManager extends St.Widget {
|
||||
layout_manager: layout,
|
||||
x_expand: true,
|
||||
y_expand: true,
|
||||
clip_to_allocation: true,
|
||||
clip_to_allocation: true
|
||||
});
|
||||
|
||||
this.dash = new Dash.Dash();
|
||||
@@ -451,7 +452,7 @@ class ControlsManager extends St.Widget {
|
||||
this.add_actor(this._dashSlider);
|
||||
|
||||
this._group.add_actor(this._dashSpacer);
|
||||
this._group.add_child(this.viewSelector);
|
||||
this._group.add(this.viewSelector, { x_fill: true, expand: true });
|
||||
this._group.add_actor(this._thumbnailsSlider);
|
||||
|
||||
layout.connect('allocation-changed', this._updateWorkspacesGeometry.bind(this));
|
||||
@@ -462,7 +463,7 @@ class ControlsManager extends St.Widget {
|
||||
_updateWorkspacesGeometry() {
|
||||
let [x, y] = this.get_transformed_position();
|
||||
let [width, height] = this.get_transformed_size();
|
||||
let geometry = { x, y, width, height };
|
||||
let geometry = { x: x, y: y, width: width, height: height };
|
||||
|
||||
let spacing = this.get_theme_node().get_length('spacing');
|
||||
let dashWidth = this._dashSlider.getVisibleWidth() + spacing;
|
||||
@@ -489,9 +490,9 @@ class ControlsManager extends St.Widget {
|
||||
return;
|
||||
|
||||
let activePage = this.viewSelector.getActivePage();
|
||||
let dashVisible = activePage == ViewSelector.ViewPage.WINDOWS ||
|
||||
activePage == ViewSelector.ViewPage.APPS;
|
||||
let thumbnailsVisible = activePage == ViewSelector.ViewPage.WINDOWS;
|
||||
let dashVisible = (activePage == ViewSelector.ViewPage.WINDOWS ||
|
||||
activePage == ViewSelector.ViewPage.APPS);
|
||||
let thumbnailsVisible = (activePage == ViewSelector.ViewPage.WINDOWS);
|
||||
|
||||
if (dashVisible)
|
||||
this._dashSlider.slideIn();
|
||||
@@ -509,7 +510,7 @@ class ControlsManager extends St.Widget {
|
||||
return;
|
||||
|
||||
let activePage = this.viewSelector.getActivePage();
|
||||
this._dashSpacer.visible = activePage == ViewSelector.ViewPage.WINDOWS;
|
||||
this._dashSpacer.visible = (activePage == ViewSelector.ViewPage.WINDOWS);
|
||||
}
|
||||
|
||||
_onPageEmpty() {
|
||||
|
||||
@@ -23,23 +23,23 @@ const UP = 0;
|
||||
const DOWN = 1;
|
||||
|
||||
var PadChooser = GObject.registerClass({
|
||||
Signals: { 'pad-selected': { param_types: [Clutter.InputDevice.$gtype] } },
|
||||
Signals: { 'pad-selected': { param_types: [Clutter.InputDevice.$gtype] } }
|
||||
}, class PadChooser extends St.Button {
|
||||
_init(device, groupDevices) {
|
||||
super._init({
|
||||
style_class: 'pad-chooser-button',
|
||||
toggle_mode: true,
|
||||
x_fill: false,
|
||||
y_fill: false,
|
||||
x_align: St.Align.MIDDLE,
|
||||
y_align: St.Align.MIDDLE
|
||||
});
|
||||
this.currentDevice = device;
|
||||
this._padChooserMenu = null;
|
||||
|
||||
let arrow = new St.Icon({
|
||||
style_class: 'popup-menu-arrow',
|
||||
icon_name: 'pan-down-symbolic',
|
||||
accessible_role: Atk.Role.ARROW,
|
||||
x_align: Clutter.ActorAlign.CENTER,
|
||||
y_align: Clutter.ActorAlign.CENTER,
|
||||
});
|
||||
let arrow = new St.Icon({ style_class: 'popup-menu-arrow',
|
||||
icon_name: 'pan-down-symbolic',
|
||||
accessible_role: Atk.Role.ARROW });
|
||||
this.set_child(arrow);
|
||||
this._ensureMenu(groupDevices);
|
||||
|
||||
@@ -89,7 +89,8 @@ var PadChooser = GObject.registerClass({
|
||||
});
|
||||
|
||||
var KeybindingEntry = GObject.registerClass({
|
||||
Signals: { 'keybinding-edited': {} },
|
||||
GTypeName: 'PadOsd_KeybindingEntry',
|
||||
Signals: { 'keybinding-edited': {} }
|
||||
}, class KeybindingEntry extends St.Entry {
|
||||
_init() {
|
||||
super._init({ hint_text: _("New shortcut…"), style: 'width: 10em' });
|
||||
@@ -110,7 +111,8 @@ var KeybindingEntry = GObject.registerClass({
|
||||
});
|
||||
|
||||
var ActionComboBox = GObject.registerClass({
|
||||
Signals: { 'action-selected': { param_types: [GObject.TYPE_INT] } },
|
||||
GTypeName: 'PadOsd_ActionComboBox',
|
||||
Signals: { 'action-selected': { param_types: [GObject.TYPE_INT] } }
|
||||
}, class ActionComboBox extends St.Button {
|
||||
_init() {
|
||||
super._init({ style_class: 'button' });
|
||||
@@ -192,7 +194,8 @@ var ActionComboBox = GObject.registerClass({
|
||||
});
|
||||
|
||||
var ActionEditor = GObject.registerClass({
|
||||
Signals: { 'done': {} },
|
||||
GTypeName: 'PadOsd_ActionEditor',
|
||||
Signals: { 'done': {} }
|
||||
}, class ActionEditor extends St.Widget {
|
||||
_init() {
|
||||
let boxLayout = new Clutter.BoxLayout({ orientation: Clutter.Orientation.HORIZONTAL,
|
||||
@@ -233,7 +236,7 @@ var ActionEditor = GObject.registerClass({
|
||||
this._actionComboBox.setAction(this._currentAction);
|
||||
this._updateKeybindingEntryState();
|
||||
|
||||
let isButton = action == Meta.PadActionType.BUTTON;
|
||||
let isButton = (action == Meta.PadActionType.BUTTON);
|
||||
this._actionComboBox.setButtonActionsActive(isButton);
|
||||
}
|
||||
|
||||
@@ -291,7 +294,7 @@ var PadDiagram = GObject.registerClass({
|
||||
'Editor actor',
|
||||
GObject.ParamFlags.READWRITE |
|
||||
GObject.ParamFlags.CONSTRUCT_ONLY,
|
||||
Clutter.Actor.$gtype),
|
||||
Clutter.Actor.$gtype)
|
||||
},
|
||||
}, class PadDiagram extends St.DrawingArea {
|
||||
_init(params) {
|
||||
@@ -344,19 +347,17 @@ var PadDiagram = GObject.registerClass({
|
||||
}
|
||||
|
||||
_wrappingSvgHeader() {
|
||||
return '<?xml version="1.0" encoding="UTF-8" standalone="no"?>' +
|
||||
'<svg version="1.1" xmlns="http://www.w3.org/2000/svg" ' +
|
||||
'xmlns:xi="http://www.w3.org/2001/XInclude" ' +
|
||||
`width="${ // " (give xgettext the paired quotes it expects)
|
||||
this._imageWidth
|
||||
}" height="${this._imageHeight}"> ` + // "
|
||||
'<style type="text/css">';
|
||||
return ('<?xml version="1.0" encoding="UTF-8" standalone="no"?>' +
|
||||
'<svg version="1.1" xmlns="http://www.w3.org/2000/svg" ' +
|
||||
'xmlns:xi="http://www.w3.org/2001/XInclude" ' +
|
||||
`width="${this._imageWidth}" height="${this._imageHeight}"> ` +
|
||||
'<style type="text/css">');
|
||||
}
|
||||
|
||||
_wrappingSvgFooter() {
|
||||
return '</style>' +
|
||||
return ('</style>' +
|
||||
'<xi:include href="' + this._imagePath + '" />' +
|
||||
'</svg>';
|
||||
'</svg>');
|
||||
}
|
||||
|
||||
_cssString() {
|
||||
@@ -618,10 +619,7 @@ var PadDiagram = GObject.registerClass({
|
||||
});
|
||||
|
||||
var PadOsd = GObject.registerClass({
|
||||
Signals: {
|
||||
'pad-selected': { param_types: [Clutter.InputDevice.$gtype] },
|
||||
'closed': {},
|
||||
},
|
||||
Signals: { 'pad-selected': { param_types: [Clutter.InputDevice.$gtype] } }
|
||||
}, class PadOsd extends St.BoxLayout {
|
||||
_init(padDevice, settings, imagePath, editionMode, monitorIndex) {
|
||||
super._init({
|
||||
@@ -629,7 +627,7 @@ var PadOsd = GObject.registerClass({
|
||||
vertical: true,
|
||||
x_expand: true,
|
||||
y_expand: true,
|
||||
reactive: true,
|
||||
reactive: true
|
||||
});
|
||||
|
||||
this.padDevice = padDevice;
|
||||
@@ -735,12 +733,10 @@ var PadOsd = GObject.registerClass({
|
||||
x_align: Clutter.ActorAlign.CENTER,
|
||||
y_align: Clutter.ActorAlign.CENTER });
|
||||
this.add_actor(buttonBox);
|
||||
this._editButton = new St.Button({
|
||||
label: _('Edit…'),
|
||||
style_class: 'button',
|
||||
can_focus: true,
|
||||
x_align: Clutter.ActorAlign.CENTER,
|
||||
});
|
||||
this._editButton = new St.Button({ label: _("Edit…"),
|
||||
style_class: 'button',
|
||||
x_align: Clutter.ActorAlign.CENTER,
|
||||
can_focus: true });
|
||||
this._editButton.connect('clicked', () => {
|
||||
this.setEditionMode(true);
|
||||
});
|
||||
@@ -797,7 +793,7 @@ var PadOsd = GObject.registerClass({
|
||||
this._padDiagram.deactivateButton(event.get_button());
|
||||
return Clutter.EVENT_STOP;
|
||||
} else if (event.type() == Clutter.EventType.KEY_PRESS &&
|
||||
(!this._editionMode || event.get_key_symbol() === Clutter.KEY_Escape)) {
|
||||
(!this._editionMode || event.get_key_symbol() == Clutter.Escape)) {
|
||||
if (this._editedAction != null)
|
||||
this._endActionEdition();
|
||||
else
|
||||
@@ -844,23 +840,22 @@ var PadOsd = GObject.registerClass({
|
||||
this._tipLabel.set_text(_("Press any key to exit"));
|
||||
}
|
||||
|
||||
this._titleLabel.clutter_text.set_markup(
|
||||
`<span size="larger"><b>${title}</b></span>`);
|
||||
this._titleLabel.clutter_text.set_markup('<span size="larger"><b>' + title + '</b></span>');
|
||||
}
|
||||
|
||||
_isEditedAction(type, number, dir) {
|
||||
if (!this._editedAction)
|
||||
return false;
|
||||
|
||||
return this._editedAction.type == type &&
|
||||
return (this._editedAction.type == type &&
|
||||
this._editedAction.number == number &&
|
||||
this._editedAction.dir == dir;
|
||||
this._editedAction.dir == dir);
|
||||
}
|
||||
|
||||
_followUpActionEdition(str) {
|
||||
let { type, dir, number, mode } = this._editedAction;
|
||||
let hasNextAction = type == Meta.PadActionType.RING && dir == CCW ||
|
||||
type == Meta.PadActionType.STRIP && dir == UP;
|
||||
let hasNextAction = (type == Meta.PadActionType.RING && dir == CCW ||
|
||||
type == Meta.PadActionType.STRIP && dir == UP);
|
||||
if (!hasNextAction)
|
||||
return false;
|
||||
|
||||
|
||||
@@ -1,15 +1,10 @@
|
||||
// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
|
||||
/* exported PageIndicators, AnimatedPageIndicators */
|
||||
|
||||
const { Clutter, GLib, Graphene, GObject, Meta, St } = imports.gi;
|
||||
const { Clutter, GLib, GObject, Meta, St } = imports.gi;
|
||||
|
||||
const { ANIMATION_TIME_OUT, ANIMATION_MAX_DELAY_OUT_FOR_ITEM, AnimationDirection } = imports.ui.iconGrid;
|
||||
|
||||
const INDICATOR_INACTIVE_OPACITY = 128;
|
||||
const INDICATOR_INACTIVE_OPACITY_HOVER = 255;
|
||||
const INDICATOR_INACTIVE_SCALE = 2 / 3;
|
||||
const INDICATOR_INACTIVE_SCALE_PRESSED = 0.5;
|
||||
|
||||
var INDICATORS_BASE_TIME = 250;
|
||||
var INDICATORS_BASE_TIME_OUT = 125;
|
||||
var INDICATORS_ANIMATION_DELAY = 125;
|
||||
@@ -17,13 +12,13 @@ var INDICATORS_ANIMATION_DELAY_OUT = 62.5;
|
||||
var INDICATORS_ANIMATION_MAX_TIME = 750;
|
||||
var SWITCH_TIME = 400;
|
||||
var INDICATORS_ANIMATION_MAX_TIME_OUT =
|
||||
Math.min(SWITCH_TIME,
|
||||
ANIMATION_TIME_OUT + ANIMATION_MAX_DELAY_OUT_FOR_ITEM);
|
||||
Math.min (SWITCH_TIME,
|
||||
ANIMATION_TIME_OUT + ANIMATION_MAX_DELAY_OUT_FOR_ITEM);
|
||||
|
||||
var ANIMATION_DELAY = 100;
|
||||
|
||||
var PageIndicators = GObject.registerClass({
|
||||
Signals: { 'page-activated': { param_types: [GObject.TYPE_INT] } },
|
||||
Signals: { 'page-activated': { param_types: [GObject.TYPE_INT] } }
|
||||
}, class PageIndicators extends St.BoxLayout {
|
||||
_init(orientation = Clutter.Orientation.VERTICAL) {
|
||||
let vertical = orientation == Clutter.Orientation.VERTICAL;
|
||||
@@ -34,10 +29,10 @@ var PageIndicators = GObject.registerClass({
|
||||
x_align: vertical ? Clutter.ActorAlign.END : Clutter.ActorAlign.CENTER,
|
||||
y_align: vertical ? Clutter.ActorAlign.CENTER : Clutter.ActorAlign.END,
|
||||
reactive: true,
|
||||
clip_to_allocation: true,
|
||||
clip_to_allocation: true
|
||||
});
|
||||
this._nPages = 0;
|
||||
this._currentPosition = 0;
|
||||
this._currentPage = undefined;
|
||||
this._reactive = true;
|
||||
this._reactive = true;
|
||||
}
|
||||
@@ -71,21 +66,13 @@ var PageIndicators = GObject.registerClass({
|
||||
button_mask: St.ButtonMask.ONE |
|
||||
St.ButtonMask.TWO |
|
||||
St.ButtonMask.THREE,
|
||||
reactive: this._reactive });
|
||||
indicator.child = new St.Widget({
|
||||
style_class: 'page-indicator-icon',
|
||||
pivot_point: new Graphene.Point({ x: 0.5, y: 0.5 }),
|
||||
});
|
||||
toggle_mode: true,
|
||||
reactive: this._reactive,
|
||||
checked: pageIndex == this._currentPage });
|
||||
indicator.child = new St.Widget({ style_class: 'page-indicator-icon' });
|
||||
indicator.connect('clicked', () => {
|
||||
this.emit('page-activated', pageIndex);
|
||||
});
|
||||
indicator.connect('notify::hover', () => {
|
||||
this._updateIndicator(indicator, pageIndex);
|
||||
});
|
||||
indicator.connect('notify::pressed', () => {
|
||||
this._updateIndicator(indicator, pageIndex);
|
||||
});
|
||||
this._updateIndicator(indicator, pageIndex);
|
||||
this.add_actor(indicator);
|
||||
}
|
||||
} else {
|
||||
@@ -94,31 +81,15 @@ var PageIndicators = GObject.registerClass({
|
||||
children[i].destroy();
|
||||
}
|
||||
this._nPages = nPages;
|
||||
this.visible = this._nPages > 1;
|
||||
this.visible = (this._nPages > 1);
|
||||
}
|
||||
|
||||
_updateIndicator(indicator, pageIndex) {
|
||||
let progress =
|
||||
Math.max(1 - Math.abs(this._currentPosition - pageIndex), 0);
|
||||
|
||||
let inactiveScale = indicator.pressed
|
||||
? INDICATOR_INACTIVE_SCALE_PRESSED : INDICATOR_INACTIVE_SCALE;
|
||||
let inactiveOpacity = indicator.hover
|
||||
? INDICATOR_INACTIVE_OPACITY_HOVER : INDICATOR_INACTIVE_OPACITY;
|
||||
|
||||
let scale = inactiveScale + (1 - inactiveScale) * progress;
|
||||
let opacity = inactiveOpacity + (255 - inactiveOpacity) * progress;
|
||||
|
||||
indicator.child.set_scale(scale, scale);
|
||||
indicator.child.opacity = opacity;
|
||||
}
|
||||
|
||||
setCurrentPosition(currentPosition) {
|
||||
this._currentPosition = currentPosition;
|
||||
setCurrentPage(currentPage) {
|
||||
this._currentPage = currentPage;
|
||||
|
||||
let children = this.get_children();
|
||||
for (let i = 0; i < children.length; i++)
|
||||
this._updateIndicator(children[i], i);
|
||||
children[i].set_checked(i == this._currentPage);
|
||||
}
|
||||
});
|
||||
|
||||
@@ -183,7 +154,7 @@ class AnimatedPageIndicators extends PageIndicators {
|
||||
translation_x: isAnimationIn ? 0 : offset,
|
||||
duration: baseTime + delay * i,
|
||||
mode: Clutter.AnimationMode.EASE_IN_OUT_QUAD,
|
||||
delay: isAnimationIn ? ANIMATION_DELAY : 0,
|
||||
delay: isAnimationIn ? ANIMATION_DELAY : 0
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -57,7 +57,8 @@ function _unpremultiply(color) {
|
||||
let red = Math.min((color.red * 255 + 127) / color.alpha, 255);
|
||||
let green = Math.min((color.green * 255 + 127) / color.alpha, 255);
|
||||
let blue = Math.min((color.blue * 255 + 127) / color.alpha, 255);
|
||||
return new Clutter.Color({ red, green, blue, alpha: color.alpha });
|
||||
return new Clutter.Color({ red: red, green: green,
|
||||
blue: blue, alpha: color.alpha });
|
||||
}
|
||||
|
||||
class AppMenu extends PopupMenu.PopupMenu {
|
||||
@@ -118,7 +119,7 @@ class AppMenu extends PopupMenu.PopupMenu {
|
||||
|
||||
_updateDetailsVisibility() {
|
||||
let sw = this._appSystem.lookup_app('org.gnome.Software.desktop');
|
||||
this._detailsItem.visible = sw != null;
|
||||
this._detailsItem.visible = (sw != null);
|
||||
}
|
||||
|
||||
isEmpty() {
|
||||
@@ -169,13 +170,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));
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -237,10 +234,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);
|
||||
|
||||
let menu = new AppMenu(this);
|
||||
@@ -270,7 +264,7 @@ var AppMenuButton = GObject.registerClass({
|
||||
this.ease({
|
||||
opacity: 255,
|
||||
duration: Overview.ANIMATION_TIME,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD
|
||||
});
|
||||
}
|
||||
|
||||
@@ -285,7 +279,7 @@ var AppMenuButton = GObject.registerClass({
|
||||
opacity: 0,
|
||||
mode: Clutter.Animation.EASE_OUT_QUAD,
|
||||
duration: Overview.ANIMATION_TIME,
|
||||
onComplete: () => this.hide(),
|
||||
onComplete: () => this.hide()
|
||||
});
|
||||
}
|
||||
|
||||
@@ -346,10 +340,9 @@ var AppMenuButton = GObject.registerClass({
|
||||
if (focusedApp && focusedApp.is_on_workspace(workspace))
|
||||
return focusedApp;
|
||||
|
||||
for (let i = 0; i < this._startingApps.length; i++) {
|
||||
for (let i = 0; i < this._startingApps.length; i++)
|
||||
if (this._startingApps[i].is_on_workspace(workspace))
|
||||
return this._startingApps[i];
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
@@ -372,21 +365,21 @@ var AppMenuButton = GObject.registerClass({
|
||||
}
|
||||
}
|
||||
|
||||
let visible = this._targetApp != null && !Main.overview.visibleTarget;
|
||||
let visible = (this._targetApp != null && !Main.overview.visibleTarget);
|
||||
if (visible)
|
||||
this.fadeIn();
|
||||
else
|
||||
this.fadeOut();
|
||||
|
||||
let isBusy = this._targetApp != null &&
|
||||
let isBusy = (this._targetApp != null &&
|
||||
(this._targetApp.get_state() == Shell.AppState.STARTING ||
|
||||
this._targetApp.get_busy());
|
||||
this._targetApp.get_busy()));
|
||||
if (isBusy)
|
||||
this.startAnimation();
|
||||
else
|
||||
this.stopAnimation();
|
||||
|
||||
this.reactive = visible && !isBusy;
|
||||
this.reactive = (visible && !isBusy);
|
||||
|
||||
this._syncIcon();
|
||||
this.menu.setApp(this._targetApp);
|
||||
@@ -439,11 +432,11 @@ class ActivitiesButton extends PanelMenu.Button {
|
||||
|
||||
Main.overview.connect('showing', () => {
|
||||
this.add_style_pseudo_class('overview');
|
||||
this.add_accessible_state(Atk.StateType.CHECKED);
|
||||
this.add_accessible_state (Atk.StateType.CHECKED);
|
||||
});
|
||||
Main.overview.connect('hiding', () => {
|
||||
this.remove_style_pseudo_class('overview');
|
||||
this.remove_accessible_state(Atk.StateType.CHECKED);
|
||||
this.remove_accessible_state (Atk.StateType.CHECKED);
|
||||
});
|
||||
|
||||
this._xdndTimeOut = 0;
|
||||
@@ -474,24 +467,23 @@ class ActivitiesButton extends PanelMenu.Button {
|
||||
|
||||
vfunc_event(event) {
|
||||
if (event.type() == Clutter.EventType.TOUCH_END ||
|
||||
event.type() == Clutter.EventType.BUTTON_RELEASE) {
|
||||
event.type() == Clutter.EventType.BUTTON_RELEASE)
|
||||
if (Main.overview.shouldToggleByCornerOrButton())
|
||||
Main.overview.toggle();
|
||||
}
|
||||
|
||||
return Clutter.EVENT_PROPAGATE;
|
||||
}
|
||||
|
||||
vfunc_key_release_event(keyEvent) {
|
||||
let symbol = keyEvent.keyval;
|
||||
if (symbol == Clutter.KEY_Return || symbol == Clutter.KEY_space) {
|
||||
if (Main.overview.shouldToggleByCornerOrButton()) {
|
||||
Main.overview.toggle();
|
||||
return Clutter.EVENT_STOP;
|
||||
let ret = super.vfunc_key_release_event(keyEvent);
|
||||
if (ret == Clutter.EVENT_PROPAGATE) {
|
||||
let symbol = keyEvent.keyval;
|
||||
if (symbol == Clutter.KEY_Return || symbol == Clutter.KEY_space) {
|
||||
if (Main.overview.shouldToggleByCornerOrButton())
|
||||
Main.overview.toggle();
|
||||
}
|
||||
}
|
||||
|
||||
return Clutter.EVENT_PROPAGATE;
|
||||
return ret;
|
||||
}
|
||||
|
||||
_xdndToggleOverview() {
|
||||
@@ -533,8 +525,8 @@ class PanelCorner extends St.DrawingArea {
|
||||
if (index < 0)
|
||||
return null;
|
||||
|
||||
if (!children[index].has_style_class_name('panel-menu') &&
|
||||
!children[index].has_style_class_name('panel-button'))
|
||||
if (!(children[index].has_style_class_name('panel-menu')) &&
|
||||
!(children[index].has_style_class_name('panel-button')))
|
||||
return this._findRightmostButton(children[index]);
|
||||
|
||||
return children[index];
|
||||
@@ -558,8 +550,8 @@ class PanelCorner extends St.DrawingArea {
|
||||
if (index == children.length)
|
||||
return null;
|
||||
|
||||
if (!children[index].has_style_class_name('panel-menu') &&
|
||||
!children[index].has_style_class_name('panel-button'))
|
||||
if (!(children[index].has_style_class_name('panel-menu')) &&
|
||||
!(children[index].has_style_class_name('panel-button')))
|
||||
return this._findLeftmostButton(children[index]);
|
||||
|
||||
return children[index];
|
||||
@@ -627,15 +619,14 @@ class PanelCorner extends St.DrawingArea {
|
||||
cr.setOperator(Cairo.Operator.SOURCE);
|
||||
|
||||
cr.moveTo(0, offsetY);
|
||||
if (this._side == St.Side.LEFT) {
|
||||
if (this._side == St.Side.LEFT)
|
||||
cr.arc(cornerRadius,
|
||||
borderWidth + cornerRadius,
|
||||
cornerRadius, Math.PI, 3 * Math.PI / 2);
|
||||
} else {
|
||||
else
|
||||
cr.arc(0,
|
||||
borderWidth + cornerRadius,
|
||||
cornerRadius, 3 * Math.PI / 2, 2 * Math.PI);
|
||||
}
|
||||
cr.lineTo(cornerRadius, offsetY);
|
||||
cr.closePath();
|
||||
|
||||
@@ -651,7 +642,7 @@ class PanelCorner extends St.DrawingArea {
|
||||
Clutter.cairo_set_source_color(cr, backgroundColor);
|
||||
|
||||
cr.save();
|
||||
cr.translate(xOffsetDirection * offset, -offset);
|
||||
cr.translate(xOffsetDirection * offset, - offset);
|
||||
cr.appendPath(savedPath);
|
||||
cr.fill();
|
||||
cr.restore();
|
||||
@@ -713,15 +704,16 @@ class AggregateMenu extends PanelMenu.Button {
|
||||
this._indicators = new St.BoxLayout({ style_class: 'panel-status-indicators-box' });
|
||||
this.add_child(this._indicators);
|
||||
|
||||
if (Config.HAVE_NETWORKMANAGER)
|
||||
if (Config.HAVE_NETWORKMANAGER) {
|
||||
this._network = new imports.ui.status.network.NMApplet();
|
||||
else
|
||||
} else {
|
||||
this._network = null;
|
||||
|
||||
if (Config.HAVE_BLUETOOTH)
|
||||
}
|
||||
if (Config.HAVE_BLUETOOTH) {
|
||||
this._bluetooth = new imports.ui.status.bluetooth.Indicator();
|
||||
else
|
||||
} else {
|
||||
this._bluetooth = null;
|
||||
}
|
||||
|
||||
this._remoteAccess = new imports.ui.status.remoteAccess.RemoteAccessApplet();
|
||||
this._power = new imports.ui.status.power.Indicator();
|
||||
@@ -738,10 +730,12 @@ class AggregateMenu extends PanelMenu.Button {
|
||||
this._indicators.add_child(this._screencast);
|
||||
this._indicators.add_child(this._location);
|
||||
this._indicators.add_child(this._nightLight);
|
||||
if (this._network)
|
||||
if (this._network) {
|
||||
this._indicators.add_child(this._network);
|
||||
if (this._bluetooth)
|
||||
}
|
||||
if (this._bluetooth) {
|
||||
this._indicators.add_child(this._bluetooth);
|
||||
}
|
||||
this._indicators.add_child(this._remoteAccess);
|
||||
this._indicators.add_child(this._rfkill);
|
||||
this._indicators.add_child(this._volume);
|
||||
@@ -751,24 +745,23 @@ class AggregateMenu extends PanelMenu.Button {
|
||||
this.menu.addMenuItem(this._volume.menu);
|
||||
this.menu.addMenuItem(this._brightness.menu);
|
||||
this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
|
||||
if (this._network)
|
||||
if (this._network) {
|
||||
this.menu.addMenuItem(this._network.menu);
|
||||
|
||||
if (this._bluetooth)
|
||||
}
|
||||
if (this._bluetooth) {
|
||||
this.menu.addMenuItem(this._bluetooth.menu);
|
||||
|
||||
}
|
||||
this.menu.addMenuItem(this._remoteAccess.menu);
|
||||
this.menu.addMenuItem(this._location.menu);
|
||||
this.menu.addMenuItem(this._rfkill.menu);
|
||||
this.menu.addMenuItem(this._power.menu);
|
||||
this.menu.addMenuItem(this._nightLight.menu);
|
||||
this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
|
||||
this.menu.addMenuItem(this._system.menu);
|
||||
|
||||
menuLayout.addSizeChild(this._location.menu.actor);
|
||||
menuLayout.addSizeChild(this._rfkill.menu.actor);
|
||||
menuLayout.addSizeChild(this._power.menu.actor);
|
||||
menuLayout.addSizeChild(this._system.menu.actor);
|
||||
menuLayout.addSizeChild(this._system.buttonGroup);
|
||||
}
|
||||
});
|
||||
|
||||
@@ -1108,7 +1101,7 @@ class Panel extends St.Widget {
|
||||
let boxes = {
|
||||
left: this._leftBox,
|
||||
center: this._centerBox,
|
||||
right: this._rightBox,
|
||||
right: this._rightBox
|
||||
};
|
||||
let boxContainer = boxes[box] || this._rightBox;
|
||||
this.statusArea[role] = indicator;
|
||||
|
||||
@@ -10,17 +10,15 @@ const PopupMenu = imports.ui.popupMenu;
|
||||
var ButtonBox = GObject.registerClass(
|
||||
class ButtonBox extends St.Widget {
|
||||
_init(params) {
|
||||
params = Params.parse(params, {
|
||||
style_class: 'panel-button',
|
||||
x_expand: true,
|
||||
y_expand: true,
|
||||
}, true);
|
||||
params = Params.parse(params, { style_class: 'panel-button' }, true);
|
||||
|
||||
super._init(params);
|
||||
|
||||
this._delegate = this;
|
||||
|
||||
this.container = new St.Bin({ child: this });
|
||||
this.container = new St.Bin({ y_fill: true,
|
||||
x_fill: true,
|
||||
child: this });
|
||||
|
||||
this.connect('style-changed', this._onStyleChanged.bind(this));
|
||||
this.connect('destroy', this._onDestroy.bind(this));
|
||||
@@ -154,7 +152,7 @@ var Button = GObject.registerClass({
|
||||
if (symbol == Clutter.KEY_Left || symbol == Clutter.KEY_Right) {
|
||||
let group = global.focus_manager.get_group(this);
|
||||
if (group) {
|
||||
let direction = symbol == Clutter.KEY_Left ? St.DirectionType.LEFT : St.DirectionType.RIGHT;
|
||||
let direction = (symbol == Clutter.KEY_Left) ? St.DirectionType.LEFT : St.DirectionType.RIGHT;
|
||||
group.navigate_focus(this, direction, false);
|
||||
return Clutter.EVENT_STOP;
|
||||
}
|
||||
@@ -179,7 +177,7 @@ var Button = GObject.registerClass({
|
||||
// measures are in logical pixels, so make sure to consider the scale
|
||||
// factor when computing max-height
|
||||
let maxHeight = Math.round((workArea.height - verticalMargins) / scaleFactor);
|
||||
this.menu.actor.style = 'max-height: %spx;'.format(maxHeight);
|
||||
this.menu.actor.style = ('max-height: %spx;').format(maxHeight);
|
||||
}
|
||||
|
||||
_onDestroy() {
|
||||
@@ -197,13 +195,14 @@ var Button = GObject.registerClass({
|
||||
* of an icon and a menu section, which will be composed into the
|
||||
* aggregate menu.
|
||||
*/
|
||||
var SystemIndicator = GObject.registerClass(
|
||||
class SystemIndicator extends St.BoxLayout {
|
||||
var SystemIndicator = GObject.registerClass({
|
||||
GTypeName: 'PanelMenu_SystemIndicator',
|
||||
}, class SystemIndicator extends St.BoxLayout {
|
||||
_init() {
|
||||
super._init({
|
||||
style_class: 'panel-status-indicators-box',
|
||||
reactive: true,
|
||||
visible: false,
|
||||
visible: false
|
||||
});
|
||||
this.menu = new PopupMenu.PopupMenuSection();
|
||||
}
|
||||
|
||||
@@ -10,8 +10,8 @@ var PieTimer = GObject.registerClass({
|
||||
'angle': GObject.ParamSpec.double(
|
||||
'angle', 'angle', 'angle',
|
||||
GObject.ParamFlags.READWRITE,
|
||||
0, 2 * Math.PI, 0),
|
||||
},
|
||||
0, 2 * Math.PI, 0)
|
||||
}
|
||||
}, class PieTimer extends St.DrawingArea {
|
||||
_init() {
|
||||
this._angle = 0;
|
||||
@@ -20,7 +20,7 @@ var PieTimer = GObject.registerClass({
|
||||
opacity: 0,
|
||||
visible: false,
|
||||
can_focus: false,
|
||||
reactive: false,
|
||||
reactive: false
|
||||
});
|
||||
|
||||
this.set_pivot_point(0.5, 0.5);
|
||||
@@ -84,13 +84,13 @@ var PieTimer = GObject.registerClass({
|
||||
this.ease({
|
||||
opacity: 255,
|
||||
duration: duration / 4,
|
||||
mode: Clutter.AnimationMode.EASE_IN_QUAD,
|
||||
mode: Clutter.AnimationMode.EASE_IN_QUAD
|
||||
});
|
||||
|
||||
this.ease_property('angle', 2 * Math.PI, {
|
||||
duration,
|
||||
mode: Clutter.AnimationMode.LINEAR,
|
||||
onComplete: this._onTransitionComplete.bind(this),
|
||||
onComplete: this._onTransitionComplete.bind(this)
|
||||
});
|
||||
}
|
||||
|
||||
@@ -101,7 +101,7 @@ var PieTimer = GObject.registerClass({
|
||||
opacity: 0,
|
||||
duration: SUCCESS_ZOOM_OUT_DURATION,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
onStopped: () => this.destroy(),
|
||||
onStopped: () => this.destroy()
|
||||
});
|
||||
}
|
||||
});
|
||||
@@ -110,7 +110,7 @@ var PointerA11yTimeout = class PointerA11yTimeout {
|
||||
constructor() {
|
||||
let manager = Clutter.DeviceManager.get_default();
|
||||
|
||||
manager.connect('ptr-a11y-timeout-started', (o, device, type, timeout) => {
|
||||
manager.connect('ptr-a11y-timeout-started', (manager, device, type, timeout) => {
|
||||
let [x, y] = global.get_pointer();
|
||||
|
||||
this._pieTimer = new PieTimer();
|
||||
@@ -123,7 +123,7 @@ var PointerA11yTimeout = class PointerA11yTimeout {
|
||||
global.display.set_cursor(Meta.Cursor.CROSSHAIR);
|
||||
});
|
||||
|
||||
manager.connect('ptr-a11y-timeout-stopped', (o, device, type, clicked) => {
|
||||
manager.connect('ptr-a11y-timeout-stopped', (manager, device, type, clicked) => {
|
||||
if (!clicked)
|
||||
this._pieTimer.destroy();
|
||||
|
||||
|
||||
@@ -19,17 +19,14 @@ var Ornament = {
|
||||
};
|
||||
|
||||
function isPopupMenuItemVisible(child) {
|
||||
if (child._delegate instanceof PopupMenuSection) {
|
||||
if (child._delegate instanceof PopupMenuSection)
|
||||
if (child._delegate.isEmpty())
|
||||
return false;
|
||||
}
|
||||
return child.visible;
|
||||
}
|
||||
|
||||
/**
|
||||
* arrowIcon
|
||||
* @param {St.Side} side - Side to which the arrow points.
|
||||
* @returns {St.Icon} a new arrow icon
|
||||
* @side Side to which the arrow points.
|
||||
*/
|
||||
function arrowIcon(side) {
|
||||
let iconName;
|
||||
@@ -68,10 +65,10 @@ var PopupBaseMenuItem = GObject.registerClass({
|
||||
},
|
||||
Signals: {
|
||||
'activate': { param_types: [Clutter.Event.$gtype] },
|
||||
},
|
||||
}
|
||||
}, class PopupBaseMenuItem extends St.BoxLayout {
|
||||
_init(params) {
|
||||
params = Params.parse(params, {
|
||||
params = Params.parse (params, {
|
||||
reactive: true,
|
||||
activate: true,
|
||||
hover: true,
|
||||
@@ -121,18 +118,18 @@ var PopupBaseMenuItem = GObject.registerClass({
|
||||
this._parent = parent;
|
||||
}
|
||||
|
||||
vfunc_button_press_event() {
|
||||
vfunc_button_press_event(buttonEvent) {
|
||||
if (!this._activatable)
|
||||
return Clutter.EVENT_PROPAGATE;
|
||||
return super.vfunc_button_press_event(buttonEvent);
|
||||
|
||||
// This is the CSS active state
|
||||
this.add_style_pseudo_class('active');
|
||||
return Clutter.EVENT_PROPAGATE;
|
||||
}
|
||||
|
||||
vfunc_button_release_event() {
|
||||
vfunc_button_release_event(buttonEvent) {
|
||||
if (!this._activatable)
|
||||
return Clutter.EVENT_PROPAGATE;
|
||||
return super.vfunc_button_release_event(buttonEvent);
|
||||
|
||||
this.remove_style_pseudo_class('active');
|
||||
this.activate(Clutter.get_current_event());
|
||||
@@ -141,7 +138,7 @@ var PopupBaseMenuItem = GObject.registerClass({
|
||||
|
||||
vfunc_touch_event(touchEvent) {
|
||||
if (!this._activatable)
|
||||
return Clutter.EVENT_PROPAGATE;
|
||||
return super.vfunc_touch_event(touchEvent);
|
||||
|
||||
if (touchEvent.type == Clutter.EventType.TOUCH_END) {
|
||||
this.remove_style_pseudo_class('active');
|
||||
@@ -272,7 +269,7 @@ class PopupMenuItem extends PopupBaseMenuItem {
|
||||
_init(text, params) {
|
||||
super._init(params);
|
||||
|
||||
this.label = new St.Label({ text });
|
||||
this.label = new St.Label({ text: text });
|
||||
this.add_child(this.label);
|
||||
this.label_actor = this.label;
|
||||
}
|
||||
@@ -294,10 +291,9 @@ class PopupSeparatorMenuItem extends PopupBaseMenuItem {
|
||||
this._syncVisibility();
|
||||
|
||||
this._separator = new St.Widget({ style_class: 'popup-separator-menu-item',
|
||||
x_expand: true,
|
||||
y_expand: true,
|
||||
y_align: Clutter.ActorAlign.CENTER });
|
||||
this.add_child(this._separator);
|
||||
this.add(this._separator, { expand: true });
|
||||
}
|
||||
|
||||
_syncVisibility() {
|
||||
@@ -328,12 +324,12 @@ class Switch extends St.Bin {
|
||||
});
|
||||
|
||||
var PopupSwitchMenuItem = GObject.registerClass({
|
||||
Signals: { 'toggled': { param_types: [GObject.TYPE_BOOLEAN] } },
|
||||
Signals: { 'toggled': { param_types: [GObject.TYPE_BOOLEAN] }, },
|
||||
}, class PopupSwitchMenuItem extends PopupBaseMenuItem {
|
||||
_init(text, active, params) {
|
||||
super._init(params);
|
||||
|
||||
this.label = new St.Label({ text });
|
||||
this.label = new St.Label({ text: text });
|
||||
this._switch = new Switch(active);
|
||||
|
||||
this.accessible_role = Atk.Role.CHECK_MENU_ITEM;
|
||||
@@ -342,11 +338,8 @@ var PopupSwitchMenuItem = GObject.registerClass({
|
||||
|
||||
this.add_child(this.label);
|
||||
|
||||
this._statusBin = new St.Bin({
|
||||
x_align: Clutter.ActorAlign.END,
|
||||
x_expand: true,
|
||||
});
|
||||
this.add_child(this._statusBin);
|
||||
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: '',
|
||||
@@ -419,7 +412,7 @@ class PopupImageMenuItem extends PopupBaseMenuItem {
|
||||
this._icon = new St.Icon({ style_class: 'popup-menu-icon',
|
||||
x_align: Clutter.ActorAlign.END });
|
||||
this.add_child(this._icon);
|
||||
this.label = new St.Label({ text });
|
||||
this.label = new St.Label({ text: text });
|
||||
this.add_child(this.label);
|
||||
this.label_actor = this.label;
|
||||
|
||||
@@ -444,14 +437,12 @@ var PopupMenuBase = class {
|
||||
this.focusActor = sourceActor;
|
||||
this._parent = null;
|
||||
|
||||
this.box = new St.BoxLayout({
|
||||
vertical: true,
|
||||
x_expand: true,
|
||||
y_expand: true,
|
||||
});
|
||||
|
||||
if (styleClass !== undefined)
|
||||
this.box.style_class = styleClass;
|
||||
if (styleClass !== undefined) {
|
||||
this.box = new St.BoxLayout({ style_class: styleClass,
|
||||
vertical: true });
|
||||
} else {
|
||||
this.box = new St.BoxLayout({ vertical: true });
|
||||
}
|
||||
this.length = 0;
|
||||
|
||||
this.isOpen = false;
|
||||
@@ -510,7 +501,7 @@ var PopupMenuBase = class {
|
||||
menuItem = new PopupMenuItem(title);
|
||||
|
||||
this.addMenuItem(menuItem);
|
||||
menuItem.connect('activate', (o, event) => {
|
||||
menuItem.connect('activate', (menuItem, event) => {
|
||||
callback(event);
|
||||
});
|
||||
|
||||
@@ -568,7 +559,7 @@ var PopupMenuBase = class {
|
||||
}
|
||||
|
||||
_connectItemSignals(menuItem) {
|
||||
menuItem._activeChangeId = menuItem.connect('notify::active', () => {
|
||||
menuItem._activeChangeId = menuItem.connect('notify::active', menuItem => {
|
||||
let active = menuItem.active;
|
||||
if (active && this._activeMenuItem != menuItem) {
|
||||
if (this._activeMenuItem)
|
||||
@@ -592,7 +583,7 @@ var PopupMenuBase = class {
|
||||
menuItem.actor.grab_key_focus();
|
||||
}
|
||||
});
|
||||
menuItem._activateId = menuItem.connect_after('activate', () => {
|
||||
menuItem._activateId = menuItem.connect_after('activate', (menuItem, _event) => {
|
||||
this.emit('activate', menuItem);
|
||||
this.itemActivated(BoxPointer.PopupAnimation.FULL);
|
||||
});
|
||||
@@ -605,7 +596,7 @@ var PopupMenuBase = class {
|
||||
// the menuItem may have, called destroyId
|
||||
// (FIXME: in the future it may make sense to have container objects
|
||||
// like PopupMenuManager does)
|
||||
menuItem._popupMenuDestroyId = menuItem.connect('destroy', () => {
|
||||
menuItem._popupMenuDestroyId = menuItem.connect('destroy', menuItem => {
|
||||
menuItem.disconnect(menuItem._popupMenuDestroyId);
|
||||
menuItem.disconnect(menuItem._activateId);
|
||||
menuItem.disconnect(menuItem._activeChangeId);
|
||||
@@ -801,7 +792,10 @@ var PopupMenu = class extends PopupMenuBase {
|
||||
this._arrowAlignment = arrowAlignment;
|
||||
this._arrowSide = arrowSide;
|
||||
|
||||
this._boxPointer = new BoxPointer.BoxPointer(arrowSide);
|
||||
this._boxPointer = new BoxPointer.BoxPointer(arrowSide,
|
||||
{ x_fill: true,
|
||||
y_fill: true,
|
||||
x_align: St.Align.START });
|
||||
this.actor = this._boxPointer;
|
||||
this.actor._delegate = this;
|
||||
this.actor.style_class = 'popup-menu-boxpointer';
|
||||
@@ -812,12 +806,10 @@ var PopupMenu = class extends PopupMenuBase {
|
||||
global.focus_manager.add_group(this.actor);
|
||||
this.actor.reactive = true;
|
||||
|
||||
if (this.sourceActor) {
|
||||
if (this.sourceActor)
|
||||
this._keyPressId = this.sourceActor.connect('key-press-event',
|
||||
this._onKeyPress.bind(this));
|
||||
}
|
||||
|
||||
this._systemModalOpenedId = 0;
|
||||
this._openedSubMenu = null;
|
||||
}
|
||||
|
||||
@@ -892,17 +884,12 @@ 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);
|
||||
this._boxPointer.open(animate);
|
||||
|
||||
this.actor.get_parent().set_child_above_sibling(this.actor, null);
|
||||
this.actor.raise_top();
|
||||
|
||||
this.emit('open-state-changed', true);
|
||||
}
|
||||
@@ -927,11 +914,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();
|
||||
}
|
||||
};
|
||||
@@ -1045,12 +1027,12 @@ var PopupSubMenu = class extends PopupMenuBase {
|
||||
height: naturalHeight,
|
||||
duration: 250,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_EXPO,
|
||||
onComplete: () => this.actor.set_height(-1),
|
||||
onComplete: () => this.actor.set_height(-1)
|
||||
});
|
||||
this._arrow.ease({
|
||||
rotation_angle_z: targetAngle,
|
||||
duration: 250,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_EXPO,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_EXPO
|
||||
});
|
||||
} else {
|
||||
this._arrow.rotation_angle_z = targetAngle;
|
||||
@@ -1078,12 +1060,12 @@ var PopupSubMenu = class extends PopupMenuBase {
|
||||
onComplete: () => {
|
||||
this.actor.hide();
|
||||
this.actor.set_height(-1);
|
||||
},
|
||||
}
|
||||
});
|
||||
this._arrow.ease({
|
||||
rotation_angle_z: 0,
|
||||
duration: 250,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_EXPO,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_EXPO
|
||||
});
|
||||
} else {
|
||||
this._arrow.rotation_angle_z = 0;
|
||||
@@ -1144,17 +1126,14 @@ class PopupSubMenuMenuItem extends PopupBaseMenuItem {
|
||||
this.add_child(this.icon);
|
||||
}
|
||||
|
||||
this.label = new St.Label({ text,
|
||||
this.label = new St.Label({ text: text,
|
||||
y_expand: true,
|
||||
y_align: Clutter.ActorAlign.CENTER });
|
||||
this.add_child(this.label);
|
||||
this.label_actor = this.label;
|
||||
|
||||
let expander = new St.Bin({
|
||||
style_class: 'popup-menu-item-expander',
|
||||
x_expand: true,
|
||||
});
|
||||
this.add_child(expander);
|
||||
let expander = new St.Bin({ style_class: 'popup-menu-item-expander' });
|
||||
this.add(expander, { expand: true });
|
||||
|
||||
this._triangle = arrowIcon(St.Side.RIGHT);
|
||||
this._triangle.pivot_point = new Graphene.Point({ x: 0.5, y: 0.6 });
|
||||
@@ -1192,7 +1171,7 @@ class PopupSubMenuMenuItem extends PopupBaseMenuItem {
|
||||
} else {
|
||||
this.remove_style_pseudo_class('open');
|
||||
this._getTopMenu()._setOpenedSubMenu(null);
|
||||
this.remove_accessible_state(Atk.StateType.EXPANDED);
|
||||
this.remove_accessible_state (Atk.StateType.EXPANDED);
|
||||
this.remove_style_pseudo_class('checked');
|
||||
}
|
||||
}
|
||||
@@ -1266,11 +1245,11 @@ var PopupMenuManager = class {
|
||||
return;
|
||||
|
||||
let menudata = {
|
||||
menu,
|
||||
menu: menu,
|
||||
openStateChangeId: menu.connect('open-state-changed', this._onMenuOpenState.bind(this)),
|
||||
destroyId: menu.connect('destroy', this._onMenuDestroy.bind(this)),
|
||||
enterId: 0,
|
||||
focusInId: 0,
|
||||
focusInId: 0
|
||||
};
|
||||
|
||||
let source = menu.sourceActor;
|
||||
|
||||
@@ -181,7 +181,7 @@ function loadRemoteSearchProviders(searchSettings, callback) {
|
||||
return -1;
|
||||
|
||||
// finally, if both providers are found, return their order in the list
|
||||
return idxA - idxB;
|
||||
return (idxA - idxB);
|
||||
});
|
||||
|
||||
callback(loadedProviders);
|
||||
@@ -228,7 +228,8 @@ var RemoteSearchProvider = class {
|
||||
}
|
||||
|
||||
if (gicon)
|
||||
icon = new St.Icon({ gicon, icon_size: size });
|
||||
icon = new St.Icon({ gicon: gicon,
|
||||
icon_size: size });
|
||||
return icon;
|
||||
}
|
||||
|
||||
|
||||
@@ -53,13 +53,13 @@ var Ripples = class Ripples {
|
||||
ripple.visible = true;
|
||||
ripple.opacity = 255 * Math.sqrt(startOpacity);
|
||||
ripple.scale_x = ripple.scale_y = startScale;
|
||||
ripple.set_translation(-this._px * ripple.width, -this._py * ripple.height, 0.0);
|
||||
ripple.set_translation( - this._px * ripple.width, - this._py * ripple.height, 0.0);
|
||||
|
||||
ripple.ease({
|
||||
opacity: 0,
|
||||
delay,
|
||||
duration,
|
||||
mode: Clutter.AnimationMode.EASE_IN_QUAD,
|
||||
mode: Clutter.AnimationMode.EASE_IN_QUAD
|
||||
});
|
||||
ripple.ease({
|
||||
scale_x: finalScale,
|
||||
@@ -67,7 +67,7 @@ var Ripples = class Ripples {
|
||||
delay,
|
||||
duration,
|
||||
mode: Clutter.AnimationMode.LINEAR,
|
||||
onComplete: () => (ripple.visible = false),
|
||||
onComplete: () => (ripple.visible = false)
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -57,7 +57,9 @@ class RunDialog extends ModalDialog.ModalDialog {
|
||||
let label = new St.Label({ style_class: 'run-dialog-label',
|
||||
text: _("Enter a Command") });
|
||||
|
||||
this.contentLayout.add_child(label);
|
||||
this.contentLayout.add(label, { x_fill: false,
|
||||
x_align: St.Align.START,
|
||||
y_align: St.Align.START });
|
||||
|
||||
let entry = new St.Entry({ style_class: 'run-dialog-entry',
|
||||
can_focus: true });
|
||||
@@ -66,36 +68,36 @@ class RunDialog extends ModalDialog.ModalDialog {
|
||||
entry.label_actor = label;
|
||||
|
||||
this._entryText = entry.clutter_text;
|
||||
this.contentLayout.add_child(entry);
|
||||
this.contentLayout.add(entry, { y_align: St.Align.START });
|
||||
this.setInitialKeyFocus(this._entryText);
|
||||
|
||||
this._errorBox = new St.BoxLayout({ style_class: 'run-dialog-error-box' });
|
||||
|
||||
this.contentLayout.add_child(this._errorBox);
|
||||
this.contentLayout.add(this._errorBox, { expand: true });
|
||||
|
||||
let errorIcon = new St.Icon({ icon_name: 'dialog-error-symbolic',
|
||||
icon_size: 24,
|
||||
style_class: 'run-dialog-error-icon',
|
||||
y_align: Clutter.ActorAlign.CENTER });
|
||||
style_class: 'run-dialog-error-icon' });
|
||||
|
||||
this._errorBox.add_child(errorIcon);
|
||||
this._errorBox.add(errorIcon, { y_align: St.Align.MIDDLE });
|
||||
|
||||
this._commandError = false;
|
||||
|
||||
this._errorMessage = new St.Label({
|
||||
style_class: 'run-dialog-error-label',
|
||||
y_align: Clutter.ActorAlign.CENTER,
|
||||
});
|
||||
this._errorMessage = new St.Label({ style_class: 'run-dialog-error-label' });
|
||||
this._errorMessage.clutter_text.line_wrap = true;
|
||||
|
||||
this._errorBox.add_child(this._errorMessage);
|
||||
this._errorBox.add(this._errorMessage, { expand: true,
|
||||
x_align: St.Align.START,
|
||||
x_fill: false,
|
||||
y_align: St.Align.MIDDLE,
|
||||
y_fill: false });
|
||||
|
||||
this._errorBox.hide();
|
||||
|
||||
this.setButtons([{
|
||||
action: this.close.bind(this),
|
||||
label: _("Close"),
|
||||
key: Clutter.KEY_Escape,
|
||||
key: Clutter.Escape,
|
||||
}]);
|
||||
|
||||
this._pathCompleter = new Gio.FilenameCompleter();
|
||||
@@ -112,7 +114,7 @@ class RunDialog extends ModalDialog.ModalDialog {
|
||||
});
|
||||
this._entryText.connect('key-press-event', (o, e) => {
|
||||
let symbol = e.get_key_symbol();
|
||||
if (symbol === Clutter.KEY_Tab) {
|
||||
if (symbol == Clutter.Tab) {
|
||||
let text = o.get_text();
|
||||
let prefix;
|
||||
if (text.lastIndexOf(' ') == -1)
|
||||
@@ -175,10 +177,11 @@ class RunDialog extends ModalDialog.ModalDialog {
|
||||
}
|
||||
|
||||
_getCompletion(text) {
|
||||
if (text.includes('/'))
|
||||
if (text.includes('/')) {
|
||||
return this._pathCompleter.get_completion_suffix(text);
|
||||
else
|
||||
} else {
|
||||
return this._getCommandCompletion(text);
|
||||
}
|
||||
}
|
||||
|
||||
_run(input, inTerminal) {
|
||||
@@ -209,7 +212,7 @@ class RunDialog extends ModalDialog.ModalDialog {
|
||||
} else {
|
||||
if (input.charAt(0) == '~')
|
||||
input = input.slice(1);
|
||||
path = `${GLib.get_home_dir()}/${input}`;
|
||||
path = GLib.get_home_dir() + '/' + input;
|
||||
}
|
||||
|
||||
if (GLib.file_test(path, GLib.FileTest.EXISTS)) {
|
||||
@@ -217,12 +220,12 @@ class RunDialog extends ModalDialog.ModalDialog {
|
||||
try {
|
||||
Gio.app_info_launch_default_for_uri(file.get_uri(),
|
||||
global.create_app_launch_context(0, -1));
|
||||
} catch (err) {
|
||||
} catch (e) {
|
||||
// The exception from gjs contains an error string like:
|
||||
// Error invoking Gio.app_info_launch_default_for_uri: No application
|
||||
// is registered as handling this file
|
||||
// We are only interested in the part after the first colon.
|
||||
let message = err.message.replace(/[^:]*: *(.+)/, '$1');
|
||||
let message = e.message.replace(/[^:]*: *(.+)/, '$1');
|
||||
this._showError(message);
|
||||
}
|
||||
} else {
|
||||
@@ -249,7 +252,7 @@ class RunDialog extends ModalDialog.ModalDialog {
|
||||
onComplete: () => {
|
||||
parentActor.set_height(-1);
|
||||
this._errorBox.show();
|
||||
},
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
|
||||
|
||||
const { AccountsService, Clutter, Gio, GLib,
|
||||
const { AccountsService, Clutter, Cogl, Gio, GLib,
|
||||
GnomeDesktop, GObject, Graphene, Meta, Shell, St } = imports.gi;
|
||||
const Cairo = imports.cairo;
|
||||
const Signals = imports.signals;
|
||||
@@ -53,17 +53,11 @@ class ScreenShieldClock extends St.BoxLayout {
|
||||
_init() {
|
||||
super._init({ 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.add_child(this._time);
|
||||
this.add_child(this._date);
|
||||
this.add(this._time, { x_align: St.Align.MIDDLE });
|
||||
this.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));
|
||||
@@ -89,21 +83,22 @@ class ScreenShieldClock extends St.BoxLayout {
|
||||
});
|
||||
|
||||
var NotificationsBox = GObject.registerClass({
|
||||
Signals: { 'wake-up-screen': {} },
|
||||
Signals: { 'wake-up-screen': {} }
|
||||
}, class NotificationsBox extends St.BoxLayout {
|
||||
_init() {
|
||||
super._init({
|
||||
vertical: true,
|
||||
name: 'screenShieldNotifications',
|
||||
style_class: 'screen-shield-notifications-container',
|
||||
style_class: 'screen-shield-notifications-container'
|
||||
});
|
||||
|
||||
this._scrollView = new St.ScrollView({ hscrollbar_policy: St.PolicyType.NEVER });
|
||||
this._scrollView = new St.ScrollView({ x_fill: false, x_align: St.Align.START,
|
||||
hscrollbar_policy: St.PolicyType.NEVER });
|
||||
this._notificationBox = new St.BoxLayout({ vertical: true,
|
||||
style_class: 'screen-shield-notifications-container' });
|
||||
this._scrollView.add_actor(this._notificationBox);
|
||||
|
||||
this.add_child(this._scrollView);
|
||||
this.add(this._scrollView, { x_fill: true, x_align: St.Align.START });
|
||||
|
||||
this._sources = new Map();
|
||||
Main.messageTray.getSources().forEach(source => {
|
||||
@@ -123,8 +118,9 @@ var NotificationsBox = GObject.registerClass({
|
||||
}
|
||||
|
||||
let items = this._sources.entries();
|
||||
for (let [source, obj] of items)
|
||||
for (let [source, obj] of items) {
|
||||
this._removeSource(source, obj);
|
||||
}
|
||||
}
|
||||
|
||||
_updateVisibility() {
|
||||
@@ -143,10 +139,10 @@ var NotificationsBox = GObject.registerClass({
|
||||
|
||||
_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' });
|
||||
@@ -163,11 +159,13 @@ var NotificationsBox = GObject.registerClass({
|
||||
|
||||
_makeNotificationDetailedSource(source, box) {
|
||||
let sourceActor = new MessageTray.SourceActor(source, SUMMARY_ICON_SIZE);
|
||||
let sourceBin = new St.Bin({ child: sourceActor });
|
||||
let sourceBin = new St.Bin({ y_align: St.Align.START,
|
||||
x_align: St.Align.START,
|
||||
child: sourceActor });
|
||||
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' });
|
||||
@@ -188,7 +186,7 @@ var NotificationsBox = GObject.registerClass({
|
||||
}
|
||||
|
||||
let label = new St.Label({ style_class: 'screen-shield-notification-count-text' });
|
||||
label.clutter_text.set_markup(`<b>${n.title}</b> ${body}`);
|
||||
label.clutter_text.set_markup('<b>' + n.title + '</b> ' + body);
|
||||
textBox.add(label);
|
||||
|
||||
visible = true;
|
||||
@@ -204,10 +202,11 @@ var NotificationsBox = GObject.registerClass({
|
||||
}
|
||||
|
||||
_showSource(source, obj, box) {
|
||||
if (obj.detailed)
|
||||
if (obj.detailed) {
|
||||
[obj.titleLabel, obj.countLabel] = this._makeNotificationDetailedSource(source, box);
|
||||
else
|
||||
} else {
|
||||
[obj.titleLabel, obj.countLabel] = this._makeNotificationSource(source, box);
|
||||
}
|
||||
|
||||
box.visible = obj.visible && (source.unseenCount > 0);
|
||||
}
|
||||
@@ -228,12 +227,12 @@ var NotificationsBox = GObject.registerClass({
|
||||
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('notify::count', () => {
|
||||
obj.sourceCountChangedId = source.connect('notify::count', source => {
|
||||
this._countChanged(source, obj);
|
||||
});
|
||||
obj.sourceTitleChangedId = source.connect('notify::title', () => {
|
||||
obj.sourceTitleChangedId = source.connect('notify::title', source => {
|
||||
this._titleChanged(source, obj);
|
||||
});
|
||||
obj.policyChangedId = source.policy.connect('notify', (policy, pspec) => {
|
||||
@@ -242,7 +241,7 @@ var NotificationsBox = GObject.registerClass({
|
||||
else
|
||||
this._detailedChanged(source, obj);
|
||||
});
|
||||
obj.sourceDestroyId = source.connect('destroy', () => {
|
||||
obj.sourceDestroyId = source.connect('destroy', source => {
|
||||
this._onSourceDestroy(source, obj);
|
||||
});
|
||||
|
||||
@@ -264,7 +263,7 @@ var NotificationsBox = GObject.registerClass({
|
||||
onComplete: () => {
|
||||
this._scrollView.vscrollbar_policy = St.PolicyType.AUTOMATIC;
|
||||
widget.set_height(-1);
|
||||
},
|
||||
}
|
||||
});
|
||||
|
||||
this._updateVisibility();
|
||||
@@ -350,11 +349,9 @@ var Arrow = GObject.registerClass(
|
||||
class ScreenShieldArrow extends St.Bin {
|
||||
_init(params) {
|
||||
super._init(params);
|
||||
this.x_fill = this.y_fill = true;
|
||||
|
||||
this._drawingArea = new St.DrawingArea({
|
||||
x_expand: true,
|
||||
y_expand: true,
|
||||
});
|
||||
this._drawingArea = new St.DrawingArea();
|
||||
this._drawingArea.connect('repaint', this._drawArrow.bind(this));
|
||||
this.child = this._drawingArea;
|
||||
|
||||
@@ -407,18 +404,18 @@ class ScreenShieldArrow extends St.Bin {
|
||||
super.vfunc_style_changed();
|
||||
}
|
||||
|
||||
vfunc_paint(paintContext) {
|
||||
vfunc_paint() {
|
||||
if (this._shadowHelper) {
|
||||
this._shadowHelper.update(this._drawingArea);
|
||||
|
||||
let allocation = this._drawingArea.get_allocation_box();
|
||||
let paintOpacity = this._drawingArea.get_paint_opacity();
|
||||
let framebuffer = paintContext.get_framebuffer();
|
||||
let framebuffer = Cogl.get_draw_framebuffer();
|
||||
|
||||
this._shadowHelper.paint(framebuffer, allocation, paintOpacity);
|
||||
}
|
||||
|
||||
this._drawingArea.paint(paintContext);
|
||||
this._drawingArea.paint();
|
||||
}
|
||||
});
|
||||
|
||||
@@ -462,7 +459,7 @@ var ScreenShield = class {
|
||||
this._backgroundGroup = new Clutter.Actor();
|
||||
|
||||
this._lockScreenGroup.add_actor(this._backgroundGroup);
|
||||
this._lockScreenGroup.set_child_below_sibling(this._backgroundGroup, null);
|
||||
this._backgroundGroup.lower_bottom();
|
||||
this._bgManagers = [];
|
||||
|
||||
this._updateBackgrounds();
|
||||
@@ -600,7 +597,7 @@ var ScreenShield = class {
|
||||
height: monitor.height });
|
||||
|
||||
let bgManager = new Background.BackgroundManager({ container: widget,
|
||||
monitorIndex,
|
||||
monitorIndex: monitorIndex,
|
||||
controlPosition: false,
|
||||
settingsSchema: SCREENSAVER_SCHEMA });
|
||||
|
||||
@@ -671,12 +668,12 @@ var ScreenShield = class {
|
||||
if (this._lockScreenState != MessageTray.State.SHOWN)
|
||||
return Clutter.EVENT_PROPAGATE;
|
||||
|
||||
let isEnter = symbol == Clutter.KEY_Return ||
|
||||
let isEnter = (symbol == Clutter.KEY_Return ||
|
||||
symbol == Clutter.KEY_KP_Enter ||
|
||||
symbol == Clutter.KEY_ISO_Enter;
|
||||
let isEscape = symbol == Clutter.KEY_Escape;
|
||||
let isLiftChar = GLib.unichar_isprint(unichar) &&
|
||||
(this._isLocked || !GLib.unichar_isgraph(unichar));
|
||||
symbol == Clutter.KEY_ISO_Enter);
|
||||
let isEscape = (symbol == Clutter.KEY_Escape);
|
||||
let isLiftChar = (GLib.unichar_isprint(unichar) &&
|
||||
(this._isLocked || !GLib.unichar_isgraph(unichar)));
|
||||
if (!isEnter && !isEscape && !isLiftChar)
|
||||
return Clutter.EVENT_PROPAGATE;
|
||||
|
||||
@@ -702,8 +699,9 @@ var ScreenShield = class {
|
||||
this._lockScreenScrollCounter += delta;
|
||||
|
||||
// 7 standard scrolls to lift up
|
||||
if (this._lockScreenScrollCounter > 35)
|
||||
if (this._lockScreenScrollCounter > 35) {
|
||||
this._liftShield(true, 0);
|
||||
}
|
||||
|
||||
return Clutter.EVENT_STOP;
|
||||
}
|
||||
@@ -711,8 +709,8 @@ var ScreenShield = class {
|
||||
_syncInhibitor() {
|
||||
let lockEnabled = this._settings.get_boolean(LOCK_ENABLED_KEY);
|
||||
let lockLocked = this._lockSettings.get_boolean(DISABLE_LOCK_KEY);
|
||||
let inhibit = this._loginSession && this._loginSession.Active &&
|
||||
!this._isActive && lockEnabled && !lockLocked;
|
||||
let inhibit = (this._loginSession && this._loginSession.Active &&
|
||||
!this._isActive && lockEnabled && !lockLocked);
|
||||
if (inhibit) {
|
||||
this._loginManager.inhibit(_("GNOME needs to lock the screen"),
|
||||
inhibitor => {
|
||||
@@ -751,9 +749,9 @@ var ScreenShield = class {
|
||||
arrows[i].ease({
|
||||
opacity: 0,
|
||||
duration: ARROW_ANIMATION_TIME / 2,
|
||||
mode: Clutter.AnimationMode.EASE_IN_QUAD,
|
||||
mode: Clutter.AnimationMode.EASE_IN_QUAD
|
||||
});
|
||||
},
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -793,7 +791,7 @@ var ScreenShield = class {
|
||||
// restore the lock screen to its original place
|
||||
// try to use the same speed as the normal animation
|
||||
let h = global.stage.height;
|
||||
let duration = MANUAL_FADE_TIME * -this._lockScreenGroup.y / h;
|
||||
let duration = MANUAL_FADE_TIME * (-this._lockScreenGroup.y) / h;
|
||||
this._lockScreenGroup.remove_all_transitions();
|
||||
this._lockScreenGroup.ease({
|
||||
y: 0,
|
||||
@@ -802,7 +800,7 @@ var ScreenShield = class {
|
||||
onComplete: () => {
|
||||
this._lockScreenGroup.fixed_position_set = false;
|
||||
this._lockScreenState = MessageTray.State.SHOWN;
|
||||
},
|
||||
}
|
||||
});
|
||||
|
||||
this._maybeCancelDialog();
|
||||
@@ -945,7 +943,7 @@ var ScreenShield = class {
|
||||
// use the same speed regardless of original position
|
||||
// if velocity is specified, it's in pixels per milliseconds
|
||||
let h = global.stage.height;
|
||||
let delta = h + this._lockScreenGroup.y;
|
||||
let delta = (h + this._lockScreenGroup.y);
|
||||
let minVelocity = global.stage.height / CURTAIN_SLIDE_TIME;
|
||||
|
||||
velocity = Math.max(minVelocity, velocity);
|
||||
@@ -955,7 +953,7 @@ var ScreenShield = class {
|
||||
y: -h,
|
||||
duration,
|
||||
mode: Clutter.AnimationMode.EASE_IN_QUAD,
|
||||
onComplete: () => this._hideLockScreenComplete(),
|
||||
onComplete: () => this._hideLockScreenComplete()
|
||||
});
|
||||
} else {
|
||||
this._hideLockScreenComplete();
|
||||
@@ -1022,11 +1020,12 @@ var ScreenShield = class {
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
onComplete: () => {
|
||||
this._lockScreenShown({ fadeToBlack, animateFade: true });
|
||||
},
|
||||
}
|
||||
});
|
||||
} else {
|
||||
this._lockScreenGroup.fixed_position_set = false;
|
||||
this._lockScreenShown({ fadeToBlack, animateFade: false });
|
||||
this._lockScreenShown({ fadeToBlack: fadeToBlack,
|
||||
animateFade: false });
|
||||
}
|
||||
|
||||
this._lockScreenGroup.grab_key_focus();
|
||||
@@ -1044,10 +1043,9 @@ var ScreenShield = class {
|
||||
this._animateArrows();
|
||||
}
|
||||
|
||||
if (!this._arrowWatchId) {
|
||||
if (!this._arrowWatchId)
|
||||
this._arrowWatchId = this.idleMonitor.add_idle_watch(ARROW_IDLE_TIME,
|
||||
this._pauseArrowAnimation.bind(this));
|
||||
}
|
||||
}
|
||||
|
||||
_pauseArrowAnimation() {
|
||||
@@ -1140,13 +1138,20 @@ var ScreenShield = class {
|
||||
vertical: true,
|
||||
style_class: 'screen-shield-contents-box' });
|
||||
this._clock = new Clock();
|
||||
this._lockScreenContentsBox.add_child(this._clock);
|
||||
this._lockScreenContentsBox.add(this._clock, {
|
||||
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);
|
||||
this._lockScreenContentsBox.add(this._notificationsBox, {
|
||||
x_fill: true,
|
||||
y_fill: true,
|
||||
expand: true
|
||||
});
|
||||
|
||||
this._hasLockScreen = true;
|
||||
}
|
||||
@@ -1229,7 +1234,7 @@ var ScreenShield = class {
|
||||
scale_y: 0,
|
||||
duration: animate ? Overview.ANIMATION_TIME : 0,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
onComplete: () => this._completeDeactivate(),
|
||||
onComplete: () => this._completeDeactivate()
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -64,55 +64,7 @@ var ScreenshotService = class {
|
||||
y + height <= global.screen_height;
|
||||
}
|
||||
|
||||
*_resolveRelativeFilename(filename) {
|
||||
if (GLib.str_has_suffix(filename, '.png'))
|
||||
filename = filename.substr(0, -4);
|
||||
|
||||
let path = [
|
||||
GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_PICTURES),
|
||||
GLib.get_home_dir(),
|
||||
].find(p => GLib.file_test(p, GLib.FileTest.EXISTS));
|
||||
|
||||
if (!path)
|
||||
return null;
|
||||
|
||||
yield Gio.File.new_for_path(
|
||||
GLib.build_filenamev([path, `${filename}.png`]));
|
||||
|
||||
for (let idx = 1; ; idx++) {
|
||||
yield Gio.File.new_for_path(
|
||||
GLib.build_filenamev([path, `${filename}-${idx}.png`]));
|
||||
}
|
||||
}
|
||||
|
||||
_createStream(filename) {
|
||||
if (filename == '')
|
||||
return [Gio.MemoryOutputStream.new_resizable(), null];
|
||||
|
||||
if (GLib.path_is_absolute(filename)) {
|
||||
try {
|
||||
let file = Gio.File.new_for_path(filename);
|
||||
let stream = file.replace(null, false, Gio.FileCreateFlags.NONE, null);
|
||||
return [stream, file];
|
||||
} catch (e) {
|
||||
return [null, null];
|
||||
}
|
||||
}
|
||||
|
||||
for (let file of this._resolveRelativeFilename(filename)) {
|
||||
try {
|
||||
let stream = file.create(Gio.FileCreateFlags.NONE, null);
|
||||
return [stream, file];
|
||||
} catch (e) {
|
||||
if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.EXISTS))
|
||||
return [null, null];
|
||||
}
|
||||
}
|
||||
|
||||
return [null, null];
|
||||
}
|
||||
|
||||
_onScreenshotComplete(result, area, stream, file, flash, invocation) {
|
||||
_onScreenshotComplete(result, area, filenameUsed, flash, invocation) {
|
||||
if (result) {
|
||||
if (flash) {
|
||||
let flashspot = new Flashspot(area);
|
||||
@@ -124,17 +76,6 @@ var ScreenshotService = class {
|
||||
}
|
||||
}
|
||||
|
||||
stream.close(null);
|
||||
|
||||
let filenameUsed = '';
|
||||
if (file) {
|
||||
filenameUsed = file.get_path();
|
||||
} else {
|
||||
let bytes = stream.steal_as_bytes();
|
||||
let clipboard = St.Clipboard.get_default();
|
||||
clipboard.set_content(St.ClipboardType.CLIPBOARD, 'image/png', bytes);
|
||||
}
|
||||
|
||||
let retval = GLib.Variant.new('(bs)', [result, filenameUsed]);
|
||||
invocation.return_value(retval);
|
||||
}
|
||||
@@ -169,18 +110,15 @@ var ScreenshotService = class {
|
||||
let screenshot = this._createScreenshot(invocation);
|
||||
if (!screenshot)
|
||||
return;
|
||||
|
||||
let [stream, file] = this._createStream(filename);
|
||||
|
||||
screenshot.screenshot_area(x, y, width, height, stream,
|
||||
screenshot.screenshot_area (x, y, width, height, filename,
|
||||
(o, res) => {
|
||||
try {
|
||||
let [result, area] =
|
||||
let [result, area, filenameUsed] =
|
||||
screenshot.screenshot_area_finish(res);
|
||||
this._onScreenshotComplete(
|
||||
result, area, stream, file, flash, invocation);
|
||||
result, area, filenameUsed, flash, invocation);
|
||||
} catch (e) {
|
||||
invocation.return_gerror(e);
|
||||
invocation.return_gerror (e);
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -190,18 +128,15 @@ var ScreenshotService = class {
|
||||
let screenshot = this._createScreenshot(invocation);
|
||||
if (!screenshot)
|
||||
return;
|
||||
|
||||
let [stream, file] = this._createStream(filename);
|
||||
|
||||
screenshot.screenshot_window(includeFrame, includeCursor, stream,
|
||||
screenshot.screenshot_window (includeFrame, includeCursor, filename,
|
||||
(o, res) => {
|
||||
try {
|
||||
let [result, area] =
|
||||
let [result, area, filenameUsed] =
|
||||
screenshot.screenshot_window_finish(res);
|
||||
this._onScreenshotComplete(
|
||||
result, area, stream, file, flash, invocation);
|
||||
result, area, filenameUsed, flash, invocation);
|
||||
} catch (e) {
|
||||
invocation.return_gerror(e);
|
||||
invocation.return_gerror (e);
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -211,18 +146,15 @@ var ScreenshotService = class {
|
||||
let screenshot = this._createScreenshot(invocation);
|
||||
if (!screenshot)
|
||||
return;
|
||||
|
||||
let [stream, file] = this._createStream(filename);
|
||||
|
||||
screenshot.screenshot(includeCursor, stream,
|
||||
screenshot.screenshot(includeCursor, filename,
|
||||
(o, res) => {
|
||||
try {
|
||||
let [result, area] =
|
||||
let [result, area, filenameUsed] =
|
||||
screenshot.screenshot_finish(res);
|
||||
this._onScreenshotComplete(
|
||||
result, area, stream, file, flash, invocation);
|
||||
result, area, filenameUsed, flash, invocation);
|
||||
} catch (e) {
|
||||
invocation.return_gerror(e);
|
||||
invocation.return_gerror (e);
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -230,7 +162,7 @@ var ScreenshotService = class {
|
||||
SelectAreaAsync(params, invocation) {
|
||||
let selectArea = new SelectArea();
|
||||
selectArea.show();
|
||||
selectArea.connect('finished', (o, areaRectangle) => {
|
||||
selectArea.connect('finished', (selectArea, areaRectangle) => {
|
||||
if (areaRectangle) {
|
||||
let retRectangle = this._unscaleArea(areaRectangle.x, areaRectangle.y,
|
||||
areaRectangle.width, areaRectangle.height);
|
||||
@@ -252,7 +184,7 @@ var ScreenshotService = class {
|
||||
"Invalid params");
|
||||
return;
|
||||
}
|
||||
let flashspot = new Flashspot({ x, y, width, height });
|
||||
let flashspot = new Flashspot({ x: x, y: y, width: width, height: height });
|
||||
flashspot.fire();
|
||||
invocation.return_value(null);
|
||||
}
|
||||
@@ -260,7 +192,7 @@ var ScreenshotService = class {
|
||||
PickColorAsync(params, invocation) {
|
||||
let pickPixel = new PickPixel();
|
||||
pickPixel.show();
|
||||
pickPixel.connect('finished', (obj, coords) => {
|
||||
pickPixel.connect('finished', (pickPixel, coords) => {
|
||||
if (coords) {
|
||||
let screenshot = this._createScreenshot(invocation, false);
|
||||
if (!screenshot)
|
||||
@@ -272,8 +204,8 @@ var ScreenshotService = class {
|
||||
color: GLib.Variant.new('(ddd)', [
|
||||
red / 255.0,
|
||||
green / 255.0,
|
||||
blue / 255.0,
|
||||
]),
|
||||
blue / 255.0
|
||||
])
|
||||
}]);
|
||||
this._removeShooterForSender(invocation.get_sender());
|
||||
invocation.return_value(retval);
|
||||
@@ -287,7 +219,8 @@ var ScreenshotService = class {
|
||||
};
|
||||
|
||||
var SelectArea = GObject.registerClass({
|
||||
Signals: { 'finished': { param_types: [Meta.Rectangle.$gtype] } },
|
||||
GTypeName: 'Screenshot_SelectArea',
|
||||
Signals: { 'finished': { param_types: [Meta.Rectangle.$gtype] } }
|
||||
}, class SelectArea extends St.Widget {
|
||||
_init() {
|
||||
this._startX = -1;
|
||||
@@ -300,7 +233,7 @@ var SelectArea = GObject.registerClass({
|
||||
visible: false,
|
||||
reactive: true,
|
||||
x: 0,
|
||||
y: 0,
|
||||
y: 0
|
||||
});
|
||||
Main.uiGroup.add_actor(this);
|
||||
|
||||
@@ -312,7 +245,7 @@ var SelectArea = GObject.registerClass({
|
||||
|
||||
this._rubberband = new St.Widget({
|
||||
style_class: 'select-area-rubberband',
|
||||
visible: false,
|
||||
visible: false
|
||||
});
|
||||
this.add_actor(this._rubberband);
|
||||
}
|
||||
@@ -332,7 +265,7 @@ var SelectArea = GObject.registerClass({
|
||||
x: Math.min(this._startX, this._lastX),
|
||||
y: Math.min(this._startY, this._lastY),
|
||||
width: Math.abs(this._startX - this._lastX) + 1,
|
||||
height: Math.abs(this._startY - this._lastY) + 1,
|
||||
height: Math.abs(this._startY - this._lastY) + 1
|
||||
});
|
||||
}
|
||||
|
||||
@@ -367,7 +300,7 @@ var SelectArea = GObject.registerClass({
|
||||
opacity: 0,
|
||||
duration: 200,
|
||||
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
|
||||
onComplete: () => this._grabHelper.ungrab(),
|
||||
onComplete: () => this._grabHelper.ungrab()
|
||||
});
|
||||
return Clutter.EVENT_PROPAGATE;
|
||||
}
|
||||
@@ -384,7 +317,8 @@ var SelectArea = GObject.registerClass({
|
||||
});
|
||||
|
||||
var PickPixel = GObject.registerClass({
|
||||
Signals: { 'finished': { param_types: [Graphene.Point.$gtype] } },
|
||||
GTypeName: 'Screenshot_PickPixel',
|
||||
Signals: { 'finished': { param_types: [Graphene.Point.$gtype] } }
|
||||
}, class PickPixel extends St.Widget {
|
||||
_init() {
|
||||
super._init({ visible: false, reactive: true });
|
||||
@@ -436,7 +370,7 @@ class Flashspot extends Lightbox.Lightbox {
|
||||
super._init(Main.uiGroup, {
|
||||
inhibitEvents: true,
|
||||
width: area.width,
|
||||
height: area.height,
|
||||
height: area.height
|
||||
});
|
||||
this.style_class = 'flashspot';
|
||||
this.set_position(area.x, area.y);
|
||||
@@ -452,7 +386,7 @@ class Flashspot extends Lightbox.Lightbox {
|
||||
if (doneCallback)
|
||||
doneCallback();
|
||||
this.destroy();
|
||||
},
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
@@ -32,8 +32,7 @@ const { loadInterfaceXML } = imports.misc.fileUtils;
|
||||
|
||||
/**
|
||||
* sleep:
|
||||
* @param {number} milliseconds - number of milliseconds to wait
|
||||
* @returns {Promise} that resolves after @milliseconds ms
|
||||
* @milliseconds: number of milliseconds to wait
|
||||
*
|
||||
* Used within an automation script to pause the the execution of the
|
||||
* current script for the specified amount of time. Use as
|
||||
@@ -51,7 +50,6 @@ function sleep(milliseconds) {
|
||||
|
||||
/**
|
||||
* waitLeisure:
|
||||
* @returns {Promise} that resolves when the shell is idle
|
||||
*
|
||||
* Used within an automation script to pause the the execution of the
|
||||
* current script until the shell is completely idle. Use as
|
||||
@@ -92,13 +90,13 @@ function _callRemote(obj, method, ...args) {
|
||||
|
||||
/**
|
||||
* createTestWindow:
|
||||
* @param {Object} params: options for window creation.
|
||||
* {number} [params.width=640] - width of window, in pixels
|
||||
* {number} [params.height=480] - height of window, in pixels
|
||||
* {bool} [params.alpha=false] - whether the window should have an alpha channel
|
||||
* {bool} [params.maximized=false] - whether the window should be created maximized
|
||||
* {bool} [params.redraws=false] - whether the window should continually redraw itself
|
||||
* @returns {Promise}
|
||||
* @params: options for window creation.
|
||||
* width - width of window, in pixels (default 640)
|
||||
* height - height of window, in pixels (default 480)
|
||||
* alpha - whether the window should have an alpha channel (default false)
|
||||
* maximized - whether the window should be created maximized (default false)
|
||||
* redraws - whether the window should continually redraw itself (default false)
|
||||
* @maximized: whethe the window should be created maximized
|
||||
*
|
||||
* Creates a window using gnome-shell-perf-helper for testing purposes.
|
||||
* While this function can be used with yield in an automation
|
||||
@@ -121,7 +119,6 @@ function createTestWindow(params) {
|
||||
|
||||
/**
|
||||
* waitTestWindows:
|
||||
* @returns {Promise}
|
||||
*
|
||||
* Used within an automation script to pause until all windows previously
|
||||
* created with createTestWindow have been mapped and exposed.
|
||||
@@ -133,7 +130,6 @@ function waitTestWindows() {
|
||||
|
||||
/**
|
||||
* destroyTestWindows:
|
||||
* @returns {Promise}
|
||||
*
|
||||
* Destroys all windows previously created with createTestWindow().
|
||||
* While this function can be used with yield in an automation
|
||||
@@ -148,8 +144,8 @@ function destroyTestWindows() {
|
||||
|
||||
/**
|
||||
* defineScriptEvent
|
||||
* @param {string} name: The event will be called script.<name>
|
||||
* @param {string} description: Short human-readable description of the event
|
||||
* @name: The event will be called script.<name>
|
||||
* @description: Short human-readable description of the event
|
||||
*
|
||||
* Convenience function to define a zero-argument performance event
|
||||
* within the 'script' namespace that is reserved for events defined locally
|
||||
@@ -163,7 +159,7 @@ function defineScriptEvent(name, description) {
|
||||
|
||||
/**
|
||||
* scriptEvent
|
||||
* @param {string} name: Name registered with defineScriptEvent()
|
||||
* @name: Name registered with defineScriptEvent()
|
||||
*
|
||||
* Convenience function to record a script-local performance event
|
||||
* previously defined with defineScriptEvent
|
||||
@@ -204,8 +200,8 @@ function _collect(scriptModule, outputFile) {
|
||||
let raw = f.replace(null, false,
|
||||
Gio.FileCreateFlags.NONE,
|
||||
null);
|
||||
let out = Gio.BufferedOutputStream.new_sized(raw, 4096);
|
||||
Shell.write_string_to_stream(out, "{\n");
|
||||
let out = Gio.BufferedOutputStream.new_sized (raw, 4096);
|
||||
Shell.write_string_to_stream (out, "{\n");
|
||||
|
||||
Shell.write_string_to_stream(out, '"events":\n');
|
||||
Shell.PerfLog.get_default().dump_events(out);
|
||||
@@ -254,10 +250,10 @@ function _collect(scriptModule, outputFile) {
|
||||
}
|
||||
Shell.write_string_to_stream(out, ' ]');
|
||||
|
||||
Shell.write_string_to_stream(out, ',\n"log":\n');
|
||||
Shell.write_string_to_stream (out, ',\n"log":\n');
|
||||
Shell.PerfLog.get_default().dump_log(out);
|
||||
|
||||
Shell.write_string_to_stream(out, '\n}\n');
|
||||
Shell.write_string_to_stream (out, '\n}\n');
|
||||
out.close(null);
|
||||
} else {
|
||||
let metrics = [];
|
||||
@@ -266,21 +262,20 @@ function _collect(scriptModule, outputFile) {
|
||||
|
||||
metrics.sort();
|
||||
|
||||
print('------------------------------------------------------------');
|
||||
print ('------------------------------------------------------------');
|
||||
for (let i = 0; i < metrics.length; i++) {
|
||||
let metric = metrics[i];
|
||||
print(`# ${scriptModule.METRICS[metric].description}`);
|
||||
print(`${metric}: ${scriptModule.METRICS[metric].value}${scriptModule.METRICS[metric].units}`);
|
||||
print (`# ${scriptModule.METRICS[metric].description}`);
|
||||
print (`${metric}: ${scriptModule.METRICS[metric].value}${scriptModule.METRICS[metric].units}`);
|
||||
}
|
||||
print('------------------------------------------------------------');
|
||||
print ('------------------------------------------------------------');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* runPerfScript
|
||||
* @param {Object} scriptModule: module object with run and finish
|
||||
* functions and event handlers
|
||||
* @param {string} outputFile: path to write output to
|
||||
* @scriptModule: module object with run and finish functions
|
||||
* and event handlers
|
||||
*
|
||||
* Runs a script for automated collection of performance data. The
|
||||
* script is defined as a Javascript module with specified contents.
|
||||
|
||||
141
js/ui/search.js
141
js/ui/search.js
@@ -43,6 +43,8 @@ class SearchResult extends St.Button {
|
||||
reactive: true,
|
||||
can_focus: true,
|
||||
track_hover: true,
|
||||
x_align: St.Align.START,
|
||||
y_fill: true
|
||||
});
|
||||
}
|
||||
|
||||
@@ -53,10 +55,9 @@ class SearchResult extends St.Button {
|
||||
activate() {
|
||||
this.provider.activateResult(this.metaInfo.id, this._resultsView.terms);
|
||||
|
||||
if (this.metaInfo.clipboardText) {
|
||||
if (this.metaInfo.clipboardText)
|
||||
St.Clipboard.get_default().set_text(
|
||||
St.ClipboardType.CLIPBOARD, this.metaInfo.clipboardText);
|
||||
}
|
||||
Main.overview.toggle();
|
||||
}
|
||||
});
|
||||
@@ -67,44 +68,41 @@ class ListSearchResult extends SearchResult {
|
||||
super._init(provider, metaInfo, resultsView);
|
||||
|
||||
this.style_class = 'list-search-result';
|
||||
this.x_fill = true;
|
||||
|
||||
let content = new St.BoxLayout({
|
||||
style_class: 'list-search-result-content',
|
||||
vertical: false,
|
||||
x_align: Clutter.ActorAlign.START,
|
||||
x_expand: true,
|
||||
y_expand: true,
|
||||
});
|
||||
let content = new St.BoxLayout({ style_class: 'list-search-result-content',
|
||||
vertical: false });
|
||||
this.set_child(content);
|
||||
|
||||
this._termsChangedId = 0;
|
||||
|
||||
let titleBox = new St.BoxLayout({
|
||||
style_class: 'list-search-result-title',
|
||||
y_align: Clutter.ActorAlign.CENTER,
|
||||
});
|
||||
let titleBox = new St.BoxLayout({ style_class: 'list-search-result-title' });
|
||||
|
||||
content.add_child(titleBox);
|
||||
content.add(titleBox, { x_fill: true,
|
||||
y_fill: false,
|
||||
x_align: St.Align.START,
|
||||
y_align: St.Align.MIDDLE });
|
||||
|
||||
// An icon for, or thumbnail of, content
|
||||
let icon = this.metaInfo['createIcon'](this.ICON_SIZE);
|
||||
if (icon)
|
||||
if (icon) {
|
||||
titleBox.add(icon);
|
||||
}
|
||||
|
||||
let title = new St.Label({
|
||||
text: this.metaInfo['name'],
|
||||
y_align: Clutter.ActorAlign.CENTER,
|
||||
});
|
||||
titleBox.add_child(title);
|
||||
let title = new St.Label({ text: this.metaInfo['name'] });
|
||||
titleBox.add(title, { x_fill: false,
|
||||
y_fill: false,
|
||||
x_align: St.Align.START,
|
||||
y_align: St.Align.MIDDLE });
|
||||
|
||||
this.label_actor = title;
|
||||
|
||||
if (this.metaInfo['description']) {
|
||||
this._descriptionLabel = new St.Label({
|
||||
style_class: 'list-search-result-description',
|
||||
y_align: Clutter.ActorAlign.CENTER,
|
||||
});
|
||||
content.add_child(this._descriptionLabel);
|
||||
this._descriptionLabel = new St.Label({ style_class: 'list-search-result-description' });
|
||||
content.add(this._descriptionLabel, { x_fill: false,
|
||||
y_fill: false,
|
||||
x_align: St.Align.START,
|
||||
y_align: St.Align.MIDDLE });
|
||||
|
||||
this._termsChangedId =
|
||||
this._resultsView.connect('terms-changed',
|
||||
@@ -141,12 +139,7 @@ class GridSearchResult extends SearchResult {
|
||||
|
||||
this.icon = new IconGrid.BaseIcon(this.metaInfo['name'],
|
||||
{ createIcon: this.metaInfo['createIcon'] });
|
||||
let content = new St.Bin({
|
||||
child: this.icon,
|
||||
x_align: Clutter.ActorAlign.START,
|
||||
x_expand: true,
|
||||
y_expand: true,
|
||||
});
|
||||
let content = new St.Bin({ child: this.icon });
|
||||
this.set_child(content);
|
||||
this.label_actor = this.icon.label;
|
||||
}
|
||||
@@ -159,7 +152,7 @@ var SearchResultsBase = GObject.registerClass({
|
||||
'focus-child', 'focus-child', 'focus-child',
|
||||
GObject.ParamFlags.READABLE,
|
||||
Clutter.Actor.$gtype),
|
||||
},
|
||||
}
|
||||
}, class SearchResultsBase extends St.BoxLayout {
|
||||
_init(provider, resultsView) {
|
||||
super._init({ style_class: 'search-section', vertical: true });
|
||||
@@ -170,8 +163,9 @@ var SearchResultsBase = GObject.registerClass({
|
||||
this._terms = [];
|
||||
this._focusChild = null;
|
||||
|
||||
this._resultDisplayBin = new St.Bin();
|
||||
this.add_child(this._resultDisplayBin);
|
||||
this._resultDisplayBin = new St.Bin({ x_fill: true,
|
||||
y_fill: true });
|
||||
this.add(this._resultDisplayBin, { expand: true });
|
||||
|
||||
let separator = new St.Widget({ style_class: 'search-section-separator' });
|
||||
this.add(separator);
|
||||
@@ -308,14 +302,14 @@ class ListSearchResults extends SearchResultsBase {
|
||||
Main.overview.toggle();
|
||||
});
|
||||
|
||||
this._container.add_child(this.providerInfo);
|
||||
this._container.add(this.providerInfo, { x_fill: false,
|
||||
y_fill: false,
|
||||
x_align: St.Align.START,
|
||||
y_align: St.Align.START });
|
||||
|
||||
this._content = new St.BoxLayout({
|
||||
style_class: 'list-search-results',
|
||||
vertical: true,
|
||||
x_expand: true,
|
||||
});
|
||||
this._container.add_child(this._content);
|
||||
this._content = new St.BoxLayout({ style_class: 'list-search-results',
|
||||
vertical: true });
|
||||
this._container.add(this._content, { expand: true });
|
||||
|
||||
this._resultDisplayBin.set_child(this._container);
|
||||
}
|
||||
@@ -357,7 +351,7 @@ class GridSearchResults extends SearchResultsBase {
|
||||
this._grid = new IconGrid.IconGrid({ rowLimit: MAX_GRID_SEARCH_RESULTS_ROWS,
|
||||
xAlign: St.Align.START });
|
||||
|
||||
this._bin = new St.Bin({ x_align: Clutter.ActorAlign.CENTER });
|
||||
this._bin = new St.Bin({ x_align: St.Align.MIDDLE });
|
||||
this._bin.set_child(this._grid);
|
||||
|
||||
this._resultDisplayBin.set_child(this._bin);
|
||||
@@ -426,23 +420,18 @@ class GridSearchResults extends SearchResultsBase {
|
||||
});
|
||||
|
||||
var SearchResultsView = GObject.registerClass({
|
||||
Signals: { 'terms-changed': {} },
|
||||
Signals: { 'terms-changed': {} }
|
||||
}, class SearchResultsView extends St.BoxLayout {
|
||||
_init() {
|
||||
super._init({ name: 'searchResults', vertical: true });
|
||||
|
||||
this._content = new MaxWidthBox({
|
||||
name: 'searchResultsContent',
|
||||
vertical: true,
|
||||
x_expand: true,
|
||||
});
|
||||
this._content = new MaxWidthBox({ name: 'searchResultsContent',
|
||||
vertical: true });
|
||||
|
||||
this._scrollView = new St.ScrollView({
|
||||
overlay_scrollbars: true,
|
||||
style_class: 'search-display vfade',
|
||||
x_expand: true,
|
||||
y_expand: true,
|
||||
});
|
||||
this._scrollView = new St.ScrollView({ x_fill: true,
|
||||
y_fill: false,
|
||||
overlay_scrollbars: true,
|
||||
style_class: 'search-display vfade' });
|
||||
this._scrollView.set_policy(St.PolicyType.NEVER, St.PolicyType.AUTOMATIC);
|
||||
this._scrollView.add_actor(this._content);
|
||||
|
||||
@@ -450,15 +439,18 @@ var SearchResultsView = GObject.registerClass({
|
||||
action.connect('pan', this._onPan.bind(this));
|
||||
this._scrollView.add_action(action);
|
||||
|
||||
this.add_child(this._scrollView);
|
||||
|
||||
this._statusText = new St.Label({
|
||||
style_class: 'search-statustext',
|
||||
x_align: Clutter.ActorAlign.CENTER,
|
||||
y_align: Clutter.ActorAlign.CENTER,
|
||||
this.add(this._scrollView, {
|
||||
x_fill: true,
|
||||
y_fill: true,
|
||||
expand: true,
|
||||
x_align: St.Align.START,
|
||||
y_align: St.Align.STAR
|
||||
});
|
||||
this._statusBin = new St.Bin({ y_expand: true });
|
||||
this.add_child(this._statusBin);
|
||||
|
||||
this._statusText = new St.Label({ style_class: 'search-statustext' });
|
||||
this._statusBin = new St.Bin({ x_align: St.Align.MIDDLE,
|
||||
y_align: St.Align.MIDDLE });
|
||||
this.add(this._statusBin, { expand: true });
|
||||
this._statusBin.add_actor(this._statusText);
|
||||
|
||||
this._highlightDefault = false;
|
||||
@@ -550,20 +542,19 @@ var SearchResultsView = GObject.registerClass({
|
||||
provider.searchInProgress = true;
|
||||
|
||||
let previousProviderResults = previousResults[provider.id];
|
||||
if (this._isSubSearch && previousProviderResults) {
|
||||
if (this._isSubSearch && previousProviderResults)
|
||||
provider.getSubsearchResultSet(previousProviderResults,
|
||||
this._terms,
|
||||
results => {
|
||||
this._gotResults(results, provider);
|
||||
},
|
||||
this._cancellable);
|
||||
} else {
|
||||
else
|
||||
provider.getInitialResultSet(this._terms,
|
||||
results => {
|
||||
this._gotResults(results, provider);
|
||||
},
|
||||
this._cancellable);
|
||||
}
|
||||
});
|
||||
|
||||
this._updateSearchProgress();
|
||||
@@ -683,17 +674,18 @@ var SearchResultsView = GObject.registerClass({
|
||||
_updateSearchProgress() {
|
||||
let haveResults = this._providers.some(provider => {
|
||||
let display = provider.display;
|
||||
return display.getFirstResult() != null;
|
||||
return (display.getFirstResult() != null);
|
||||
});
|
||||
|
||||
this._scrollView.visible = haveResults;
|
||||
this._statusBin.visible = !haveResults;
|
||||
|
||||
if (!haveResults) {
|
||||
if (this.searchInProgress)
|
||||
if (this.searchInProgress) {
|
||||
this._statusText.set_text(_("Searching…"));
|
||||
else
|
||||
} else {
|
||||
this._statusText.set_text(_("No results."));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -774,14 +766,11 @@ var ProviderInfo = GObject.registerClass(
|
||||
class ProviderInfo extends St.Button {
|
||||
_init(provider) {
|
||||
this.provider = provider;
|
||||
super._init({
|
||||
style_class: 'search-provider-icon',
|
||||
reactive: true,
|
||||
can_focus: true,
|
||||
accessible_name: provider.appInfo.get_name(),
|
||||
track_hover: true,
|
||||
y_align: Clutter.ActorAlign.START,
|
||||
});
|
||||
super._init({ style_class: 'search-provider-icon',
|
||||
reactive: true,
|
||||
can_focus: true,
|
||||
accessible_name: provider.appInfo.get_name(),
|
||||
track_hover: true });
|
||||
|
||||
this._content = new St.BoxLayout({ vertical: false,
|
||||
style_class: 'list-search-provider-content' });
|
||||
|
||||
@@ -34,9 +34,9 @@ const _modes = {
|
||||
panel: {
|
||||
left: [],
|
||||
center: [],
|
||||
right: [],
|
||||
right: []
|
||||
},
|
||||
panelStyle: null,
|
||||
panelStyle: null
|
||||
},
|
||||
|
||||
'gdm': {
|
||||
@@ -48,9 +48,9 @@ const _modes = {
|
||||
panel: {
|
||||
left: [],
|
||||
center: ['dateMenu'],
|
||||
right: ['dwellClick', 'a11y', 'keyboard', 'aggregateMenu'],
|
||||
right: ['dwellClick', 'a11y', 'keyboard', 'aggregateMenu']
|
||||
},
|
||||
panelStyle: 'login-screen',
|
||||
panelStyle: 'login-screen'
|
||||
},
|
||||
|
||||
'lock-screen': {
|
||||
@@ -61,9 +61,9 @@ const _modes = {
|
||||
panel: {
|
||||
left: [],
|
||||
center: [],
|
||||
right: ['aggregateMenu'],
|
||||
right: ['aggregateMenu']
|
||||
},
|
||||
panelStyle: 'lock-screen',
|
||||
panelStyle: 'lock-screen'
|
||||
},
|
||||
|
||||
'unlock-dialog': {
|
||||
@@ -73,9 +73,9 @@ const _modes = {
|
||||
panel: {
|
||||
left: [],
|
||||
center: [],
|
||||
right: ['dwellClick', 'a11y', 'keyboard', 'aggregateMenu'],
|
||||
right: ['dwellClick', 'a11y', 'keyboard', 'aggregateMenu']
|
||||
},
|
||||
panelStyle: 'unlock-screen',
|
||||
panelStyle: 'unlock-screen'
|
||||
},
|
||||
|
||||
'user': {
|
||||
@@ -101,9 +101,9 @@ const _modes = {
|
||||
panel: {
|
||||
left: ['activities', 'appMenu'],
|
||||
center: ['dateMenu'],
|
||||
right: ['dwellClick', 'a11y', 'keyboard', 'aggregateMenu'],
|
||||
},
|
||||
},
|
||||
right: ['dwellClick', 'a11y', 'keyboard', 'aggregateMenu']
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
function _loadMode(file, info) {
|
||||
@@ -143,10 +143,9 @@ function listModes() {
|
||||
let loop = new GLib.MainLoop(null, false);
|
||||
let id = GLib.idle_add(GLib.PRIORITY_DEFAULT, () => {
|
||||
let names = Object.getOwnPropertyNames(_modes);
|
||||
for (let i = 0; i < names.length; i++) {
|
||||
for (let i = 0; i < names.length; i++)
|
||||
if (_modes[names[i]].isPrimary)
|
||||
print(names[i]);
|
||||
}
|
||||
loop.quit();
|
||||
});
|
||||
GLib.Source.set_name_by_id(id, '[gnome-shell] listModes');
|
||||
@@ -156,8 +155,8 @@ function listModes() {
|
||||
var SessionMode = class {
|
||||
constructor() {
|
||||
_loadModes();
|
||||
let isPrimary = _modes[global.session_mode] &&
|
||||
_modes[global.session_mode].isPrimary;
|
||||
let isPrimary = (_modes[global.session_mode] &&
|
||||
_modes[global.session_mode].isPrimary);
|
||||
let mode = isPrimary ? global.session_mode : 'user';
|
||||
this._modeStack = [mode];
|
||||
this._sync();
|
||||
@@ -189,12 +188,11 @@ var SessionMode = class {
|
||||
_sync() {
|
||||
let params = _modes[this.currentMode];
|
||||
let defaults;
|
||||
if (params.parentMode) {
|
||||
if (params.parentMode)
|
||||
defaults = Params.parse(_modes[params.parentMode],
|
||||
_modes[DEFAULT_MODE]);
|
||||
} else {
|
||||
else
|
||||
defaults = _modes[DEFAULT_MODE];
|
||||
}
|
||||
params = Params.parse(params, defaults);
|
||||
|
||||
// A simplified version of Lang.copyProperties, handles
|
||||
|
||||
@@ -39,8 +39,7 @@ var GnomeShell = class {
|
||||
|
||||
/**
|
||||
* Eval:
|
||||
* @param {string} code: A string containing JavaScript code
|
||||
* @returns {Array}
|
||||
* @code: A string containing JavaScript code
|
||||
*
|
||||
* This function executes arbitrary code in the main
|
||||
* loop, and returns a boolean success and
|
||||
@@ -305,7 +304,7 @@ var GnomeShellExtensions = class {
|
||||
let app = appSys.lookup_app('gnome-shell-extension-prefs.desktop');
|
||||
let info = app.get_app_info();
|
||||
let timestamp = global.display.get_current_time_roundtrip();
|
||||
info.launch_uris([`extension:///${uuid}`],
|
||||
info.launch_uris(['extension:///' + uuid],
|
||||
global.create_app_launch_context(timestamp, -1));
|
||||
}
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user