screenshot-ui: Add support for disable-save-to-disk
When disable-save-to-disk is set, we only save the screenshot to the clipboard, and therefore don't add the "open file" and "open folder" actions to the notification. Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1954>
This commit is contained in:
parent
27bcf0da48
commit
7d43038312
@ -1012,6 +1012,8 @@ class ScreenshotUI extends St.Widget {
|
|||||||
visible: false,
|
visible: false,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
this._lockdownSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.lockdown' });
|
||||||
|
|
||||||
// The full-screen screenshot has a separate container so that we can
|
// The full-screen screenshot has a separate container so that we can
|
||||||
// show it without the screenshot UI fade-in for a nicer animation.
|
// show it without the screenshot UI fade-in for a nicer animation.
|
||||||
this._stageScreenshotContainer = new St.Widget({ visible: false });
|
this._stageScreenshotContainer = new St.Widget({ visible: false });
|
||||||
@ -1536,58 +1538,69 @@ class ScreenshotUI extends St.Widget {
|
|||||||
const clipboard = St.Clipboard.get_default();
|
const clipboard = St.Clipboard.get_default();
|
||||||
clipboard.set_content(St.ClipboardType.CLIPBOARD, 'image/png', bytes);
|
clipboard.set_content(St.ClipboardType.CLIPBOARD, 'image/png', bytes);
|
||||||
|
|
||||||
const dir = Gio.File.new_for_path(GLib.build_filenamev([
|
|
||||||
GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_PICTURES),
|
|
||||||
// Translators: name of the folder under ~/Pictures for screenshots.
|
|
||||||
_('Screenshots'),
|
|
||||||
]));
|
|
||||||
|
|
||||||
try {
|
|
||||||
dir.make_directory_with_parents(null);
|
|
||||||
} catch (e) {
|
|
||||||
if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.EXISTS))
|
|
||||||
throw e;
|
|
||||||
}
|
|
||||||
|
|
||||||
const time = GLib.DateTime.new_now_local();
|
const time = GLib.DateTime.new_now_local();
|
||||||
const timestamp = time.format('%Y-%m-%d %H-%M-%S');
|
|
||||||
// Translators: this is the name of the file that the screenshot is
|
|
||||||
// saved to. The placeholder is a timestamp, e.g. "2017-05-21 12-24-03".
|
|
||||||
const name = _('Screenshot from %s').format(timestamp);
|
|
||||||
|
|
||||||
// If the target file already exists, try appending a suffix with an
|
// This will be set in the first save to disk branch and then accessed
|
||||||
// increasing number to it.
|
// in the second save to disk branch, so we need to declare it outside.
|
||||||
|
let file;
|
||||||
|
|
||||||
|
// The function is declared here rather than inside the condition to
|
||||||
|
// satisfy eslint.
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns a filename suffix with an increasingly large index.
|
* Returns a filename suffix with an increasingly large index.
|
||||||
*
|
*
|
||||||
* @returns {Generator<string|*, void, *>} suffix string
|
* @returns {Generator<string|*, void, *>} suffix string
|
||||||
*/
|
*/
|
||||||
function *suffixes() {
|
function* suffixes() {
|
||||||
yield '';
|
yield '';
|
||||||
|
|
||||||
for (let i = 1; ; i++)
|
for (let i = 1; ; i++)
|
||||||
yield '-%s'.format(i);
|
yield '-%s'.format(i);
|
||||||
}
|
}
|
||||||
|
|
||||||
let file;
|
const disableSaveToDisk =
|
||||||
for (const suffix of suffixes()) {
|
this._lockdownSettings.get_boolean('disable-save-to-disk');
|
||||||
file = Gio.File.new_for_path(GLib.build_filenamev([
|
|
||||||
dir.get_path(), '%s%s.png'.format(name, suffix),
|
if (!disableSaveToDisk) {
|
||||||
|
const dir = Gio.File.new_for_path(GLib.build_filenamev([
|
||||||
|
GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_PICTURES),
|
||||||
|
// Translators: name of the folder under ~/Pictures for screenshots.
|
||||||
|
_('Screenshots'),
|
||||||
]));
|
]));
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const stream = file.create(Gio.FileCreateFlags.NONE, null);
|
dir.make_directory_with_parents(null);
|
||||||
stream.write_bytes(bytes, null);
|
|
||||||
break;
|
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.EXISTS))
|
if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.EXISTS))
|
||||||
throw e;
|
throw e;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
// Add it to recent files.
|
const timestamp = time.format('%Y-%m-%d %H-%M-%S');
|
||||||
Gtk.RecentManager.get_default().add_item(file.get_uri());
|
// Translators: this is the name of the file that the screenshot is
|
||||||
|
// saved to. The placeholder is a timestamp, e.g. "2017-05-21 12-24-03".
|
||||||
|
const name = _('Screenshot from %s').format(timestamp);
|
||||||
|
|
||||||
|
// If the target file already exists, try appending a suffix with an
|
||||||
|
// increasing number to it.
|
||||||
|
for (const suffix of suffixes()) {
|
||||||
|
file = Gio.File.new_for_path(GLib.build_filenamev([
|
||||||
|
dir.get_path(), '%s%s.png'.format(name, suffix),
|
||||||
|
]));
|
||||||
|
|
||||||
|
try {
|
||||||
|
const stream = file.create(Gio.FileCreateFlags.NONE, null);
|
||||||
|
stream.write_bytes(bytes, null);
|
||||||
|
break;
|
||||||
|
} catch (e) {
|
||||||
|
if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.EXISTS))
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add it to recent files.
|
||||||
|
Gtk.RecentManager.get_default().add_item(file.get_uri());
|
||||||
|
}
|
||||||
|
|
||||||
// Create a St.ImageContent icon for the notification. We want
|
// Create a St.ImageContent icon for the notification. We want
|
||||||
// St.ImageContent specifically because it preserves the aspect ratio when
|
// St.ImageContent specifically because it preserves the aspect ratio when
|
||||||
@ -1617,29 +1630,32 @@ class ScreenshotUI extends St.Widget {
|
|||||||
_('You can paste the image from the clipboard.'),
|
_('You can paste the image from the clipboard.'),
|
||||||
{ datetime: time, gicon: content }
|
{ datetime: time, gicon: content }
|
||||||
);
|
);
|
||||||
// Translators: button on the screenshot notification.
|
|
||||||
notification.addAction(_('Show in Files'), () => {
|
|
||||||
const app =
|
|
||||||
Gio.app_info_get_default_for_type('inode/directory', false);
|
|
||||||
|
|
||||||
if (app === null) {
|
if (!disableSaveToDisk) {
|
||||||
// It may be null e.g. in a toolbox without nautilus.
|
// Translators: button on the screenshot notification.
|
||||||
log('Error showing in files: no default app set for inode/directory');
|
notification.addAction(_('Show in Files'), () => {
|
||||||
return;
|
const app =
|
||||||
}
|
Gio.app_info_get_default_for_type('inode/directory', false);
|
||||||
|
|
||||||
|
if (app === null) {
|
||||||
|
// It may be null e.g. in a toolbox without nautilus.
|
||||||
|
log('Error showing in files: no default app set for inode/directory');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
app.launch([file], global.create_app_launch_context(0, -1));
|
||||||
|
});
|
||||||
|
notification.connect('activated', () => {
|
||||||
|
try {
|
||||||
|
Gio.app_info_launch_default_for_uri(
|
||||||
|
file.get_uri(), global.create_app_launch_context(0, -1));
|
||||||
|
} catch (err) {
|
||||||
|
logError(err, 'Error opening screenshot');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
app.launch([file], global.create_app_launch_context(0, -1));
|
|
||||||
});
|
|
||||||
notification.connect('activated', () => {
|
|
||||||
try {
|
|
||||||
Gio.app_info_launch_default_for_uri(
|
|
||||||
file.get_uri(), global.create_app_launch_context(0, -1));
|
|
||||||
} catch (err) {
|
|
||||||
logError(err, 'Error opening screenshot');
|
|
||||||
}
|
|
||||||
});
|
|
||||||
notification.setTransient(true);
|
notification.setTransient(true);
|
||||||
|
|
||||||
Main.messageTray.add(source);
|
Main.messageTray.add(source);
|
||||||
source.showNotification(notification);
|
source.showNotification(notification);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user