Attachment 584469 Details for Bug 819492 – Attempt at a gnome-shell proof-of-concept

[patch] Attempt at a gnome-shell proof-of-concept

gs.patch (text/plain), 4.00 KB, created by Miloslav Trmač on 2012-05-14 20:37:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Miloslav Trmač

Created: 2012-05-14 20:37:31 UTC

Size: 4.00 KB

patch

obsolete

>--- ui/autorunManager.js.mitr	2012-05-14 21:45:16.239999989 +0200
>+++ ui/autorunManager.js	2012-05-14 21:52:41.322999906 +0200
>@@ -140,6 +140,7 @@
>     Name: 'AutorunManager',
> 
>     _init: function() {
>+	this._mountLabels = {}
>         this._volumeMonitor = Gio.VolumeMonitor.get();
> 
>         this._volumeMonitor.connect('mount-added',
>@@ -191,6 +192,24 @@
>         this._residentSource.removeMount(mount);
>     },
> 
>+    _startMountLabel: function(mount) {
>+	if (!this._mountLabels[mount]) {
>+	    let l = new St.Label({text:'Unmounting ' + mount.get_root().get_uri()});
>+            l.set_position(100, 100);
>+            global.stage.add_actor(l);
>+	    this._mountLabels[mount] = l;
>+            global.log("2Added unmount notification")
>+	}
>+    },
>+
>+    _endMountLabel: function(mount) {
>+	if (this._mountLabels[mount]) {
>+		this._mountLabels[mount].destroy();
>+		this._mountLabels[mount] = null;
>+		global.log("2Destroyed unmount notification")
>+	}
>+    },
>+
>     ejectMount: function(mount) {
>         let mountOp = new ShellMountOperation.ShellMountOperation(mount);
> 
>@@ -201,19 +220,24 @@
>         if (drive &&
>             drive.get_start_stop_type() == Gio.DriveStartStopType.SHUTDOWN &&
>             drive.can_stop()) {
>+	    this._startMountLabel(mount);
>             drive.stop(0, mountOp.mountOp, null,
>                        Lang.bind(this, this._onStop));
>         } else {
>             if (mount.can_eject()) {
>+	        this._startMountLabel(mount);
>                 mount.eject_with_operation(0, mountOp.mountOp, null,
>                                            Lang.bind(this, this._onEject));
>             } else if (volume && volume.can_eject()) {
>+	        this._startMountLabel(mount);
>                 volume.eject_with_operation(0, mountOp.mountOp, null,
>                                             Lang.bind(this, this._onEject));
>             } else if (drive && drive.can_eject()) {
>+	        this._startMountLabel(mount);
>                 drive.eject_with_operation(0, mountOp.mountOp, null,
>                                            Lang.bind(this, this._onEject));
>             } else if (mount.can_unmount()) {
>+	        this._startMountLabel(mount);
>                 mount.unmount_with_operation(0, mountOp.mountOp, null,
>                                              Lang.bind(this, this._onUnmount));
>             }
>@@ -221,6 +245,7 @@
>     },
> 
>     _onUnmount: function(mount, res) {
>+	this._endMountLabel(mount);
>         try {
>             mount.unmount_with_operation_finish(res);
>         } catch (e) {
>@@ -233,6 +258,7 @@
>     },
> 
>     _onEject: function(source, res) {
>+	this._endMountLabel(mount);
>         try {
>             source.eject_with_operation_finish(res);
>         } catch (e) {
>@@ -245,6 +271,7 @@
>     },
> 
>     _onStop: function(drive, res) {
>+	this._endMountLabel(mount);
>         try {
>             drive.stop_finish(res);
>         } catch (e) {
>--- ui/placeDisplay.js.mitr	2012-05-14 21:35:24.665000000 +0200
>+++ ui/placeDisplay.js	2012-05-14 21:52:49.986999798 +0200
>@@ -79,6 +79,7 @@
>         this.name = mount.get_name();
>         this._lowerName = this.name.toLowerCase();
>         this.id = 'mount:' + mount.get_root().get_uri();
>+	this.unmountLabel = null;
>     },
> 
>     iconFactory: function(size) {
>@@ -99,6 +100,12 @@
>         if (!this.isRemovable())
>             return;
> 
>+	if (!this.unmountLabel) {
>+	    this.unmountLabel = new St.Label({text:'Unmounting ' + this._mount.get_root().get_uri()});
>+	    this.unmountLabel.set_position(100, 100);
>+	    global.stage.add_actor(this.unmountLabel);
>+	    global.log("Added unmount notification")
>+	}
>         if (this._mount.can_eject())
>             this._mount.eject(0, null, Lang.bind(this, this._removeFinish));
>         else
>@@ -106,6 +113,11 @@
>     },
> 
>     _removeFinish: function(o, res, data) {
>+	if (this.unmountLabel) {
>+	    this.unmountLabel.destroy();
>+	    this.unmountLabel = null;
>+	    global.log("Destroyed unmount notification")
>+	}
>         try {
>             if (this._mount.can_eject())
>                 this._mount.eject_finish(res);

Actions: View | Diff

Attachments on bug 819492: 582641 | 582657 | 584469 | 584470 | 584471 | 584476 | 584477 | 584478 | 584479 | 584489 | 584491 | 584696 | 584797