Skip to content

Implement option to show files with unknown characters as new document #1283

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danirabbit merged 10 commits into from
Mar 24, 2023
Merged

Implement option to show files with unknown characters as new document #1283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
916bea7
Provide option to load invalid text into new document
Mar 15, 2023
3c050a0
Open new doc after create from clipboard
Mar 15, 2023
f69aa1b
Only give option to open in new doc if there is content
Mar 15, 2023
ee48f24
Merge branch 'master' into show-corrupt-anyway
Mar 16, 2023
8696db1
Merge branch 'master' into show-corrupt-anyway
lenemter Mar 17, 2023
5018d9f
Merge branch 'master' into show-corrupt-anyway
Mar 17, 2023
74a5bea
Use typographical quotes
Mar 17, 2023
83087da
Revise label text
Mar 17, 2023
0fbd85d
Merge branch 'master' into show-corrupt-anyway
Mar 19, 2023
6d6091b
Merge branch 'master' into show-corrupt-anyway
danirabbit Mar 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions src/MainWindow.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ namespace Scratch {
public const string ACTION_PREVIOUS_TAB = "action_previous_tab";
public const string ACTION_CLEAR_LINES = "action_clear_lines";
public const string ACTION_NEW_BRANCH = "action_new_branch";
public const string ACTION_CLOSE_TAB = "action_close_tab";
public const string ACTION_CLOSE_PROJECT_DOCS = "action_close_project_docs";
public const string ACTION_HIDE_PROJECT_DOCS = "action_hide_project_docs";
public const string ACTION_RESTORE_PROJECT_DOCS = "action_restore_project_docs";
Expand Down Expand Up @@ -141,6 +142,7 @@ namespace Scratch {
{ ACTION_PREVIOUS_TAB, action_previous_tab },
{ ACTION_CLEAR_LINES, action_clear_lines },
{ ACTION_NEW_BRANCH, action_new_branch, "s" },
{ ACTION_CLOSE_TAB, action_close_tab, "s"},
{ ACTION_HIDE_PROJECT_DOCS, action_hide_project_docs, "s"},
{ ACTION_CLOSE_PROJECT_DOCS, action_close_project_docs, "s"},
{ ACTION_RESTORE_PROJECT_DOCS, action_restore_project_docs, "s"}
Expand Down Expand Up @@ -953,6 +955,16 @@ namespace Scratch {
}
}

private void action_close_tab (SimpleAction action, Variant? param) {
var close_path = get_target_path_for_actions (param);
unowned var docs = document_view.docs;
docs.foreach ((doc) => {
if (doc.file.get_path () == close_path) {
document_view.close_document (doc);
}
});
}

private void action_hide_project_docs (SimpleAction action, Variant? param) {
close_project_docs (get_target_path_for_actions (param), true);
}
Expand Down
62 changes: 43 additions & 19 deletions src/Services/Document.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ namespace Scratch.Services {
try {
FileUtils.set_contents (file.get_path (), "");
} catch (FileError e) {
warning ("Cannot create file \"%s\": %s", get_basename (), e.message);
warning ("Cannot create file “%s”: %s", get_basename (), e.message);
return;
}
}
Expand Down Expand Up @@ -297,7 +297,7 @@ namespace Scratch.Services {

load_timout_id = Timeout.add_seconds_full (GLib.Priority.HIGH, 5, () => {
if (load_cancellable != null && !load_cancellable.is_cancelled ()) {
var title = _("Loading File \"%s\" Is Taking a Long Time").printf (get_basename ());
var title = _("Loading File “%s” Is Taking a Long Time").printf (get_basename ());
var description = _("Please wait while Code is loading the file.");
var alert_view = new Granite.Widgets.AlertView (title, description, "dialog-information");
alert_view.show_action (_("Cancel Loading"));
Expand Down Expand Up @@ -328,12 +328,11 @@ namespace Scratch.Services {
} else {
source_view.buffer.text = buffer.text;
}

} catch (Error e) {
critical (e.message);
source_view.buffer.text = "";
show_default_load_error_view ();
working = false;
show_default_load_error_view (buffer.text);
return;
} finally {
load_cancellable = null;
Expand All @@ -357,7 +356,6 @@ namespace Scratch.Services {
original_content = source_view.buffer.text;
last_save_content = source_view.buffer.text;
set_saved_status (true);

doc_opened ();
source_view.sensitive = true;

Expand Down Expand Up @@ -392,7 +390,7 @@ namespace Scratch.Services {
var parent_window = source_view.get_toplevel () as Gtk.Window;

var dialog = new Granite.MessageDialog (
_("Save changes to \"%s\" before closing?").printf (this.get_basename ()),
_("Save changes to “%s” before closing?").printf (this.get_basename ()),
_("If you don't save, changes will be permanently lost."),
new ThemedIcon ("dialog-warning"),
Gtk.ButtonsType.NONE
Expand Down Expand Up @@ -495,7 +493,7 @@ namespace Scratch.Services {
} catch (Error e) {
// We don't need to send an error message at cancellation (corresponding to error code 19)
if (e.code != 19) {
warning ("Cannot save \"%s\": %s", get_basename (), e.message);
warning ("Cannot save “%s”: %s", get_basename (), e.message);
// If called by `save_as ()` then that function will show infobar
if (!saving_as) {
ask_save_location (false);
Expand All @@ -513,7 +511,7 @@ namespace Scratch.Services {
this.set_saved_status (true);
last_save_content = source_view.buffer.text;

debug ("File \"%s\" saved successfully", get_basename ());
debug ("File “%s” saved successfully", get_basename ());

return true;
}
Expand Down Expand Up @@ -760,10 +758,36 @@ namespace Scratch.Services {
}

// Show an error view which says "Hey, I cannot read that file!"
private void show_default_load_error_view () {
var title = _("File \"%s\" Cannot Be Read").printf (get_basename ());
var description = _("It may be corrupt or you don't have permission to read it.");
private void show_default_load_error_view (string invalid_content = "") {
var title = _("Cannot read text in file “%s”").printf (get_basename ());
string description;
if (invalid_content == "") {
description = _("You may not have permission to read the file.");
} else {
description = _("The file may be corrupt or may not be a text file");
}
var alert_view = new Granite.Widgets.AlertView (title, description, "dialog-error");
// Lack of read permission results in empty content string. Do not give option to open
// in new document in that case.
if (invalid_content != "") {
alert_view.show_action (_("Show Anyway"));
alert_view.action_activated.connect (() => {
main_stack.set_visible_child_name ("content");
Idle.add (() => {
var clipboard = Gtk.Clipboard.get_for_display (get_display (), Gdk.SELECTION_CLIPBOARD);
clipboard.set_text (invalid_content, -1);
var clipboard_action = Utils.action_from_group (MainWindow.ACTION_NEW_FROM_CLIPBOARD, actions);
clipboard_action.set_enabled (true);
clipboard_action.activate (null);

var close_tab_action = Utils.action_from_group (MainWindow.ACTION_CLOSE_TAB, actions);
close_tab_action.set_enabled (true);
close_tab_action.activate (new Variant ("s", file.get_path ()));
return false;
});
});
}

alert_view.show_all ();
main_stack.add_named (alert_view, "error_alert");
main_stack.set_visible_child (alert_view);
Expand All @@ -775,7 +799,7 @@ namespace Scratch.Services {
if (!exists ()) {
if (mounted == false) {
string message = _(
"The location containing the file \"%s\" was unmounted. Do you want to save somewhere else?"
"The location containing the file “%s” was unmounted. Do you want to save somewhere else?"
).printf ("<b>%s</b>".printf (get_basename ()));

set_message (Gtk.MessageType.WARNING, message, _("Save As…"), () => {
Expand All @@ -784,7 +808,7 @@ namespace Scratch.Services {
});
} else {
string message = _(
"File \"%s\" was deleted. Do you want to save it anyway?"
"File “%s” was deleted. Do you want to save it anyway?"
).printf ("<b>%s</b>".printf (get_basename ()));

set_message (Gtk.MessageType.WARNING, message, _("Save"), () => {
Expand Down Expand Up @@ -828,7 +852,7 @@ namespace Scratch.Services {
source_view.set_text (new_buffer.text, false);
} else {
string message = _(
"File \"%s\" was modified by an external application. Do you want to load it again or continue your editing?"
"File “%s” was modified by an external application. Do you want to load it again or continue your editing?"
).printf ("<b>%s</b>".printf (get_basename ()));

set_message (Gtk.MessageType.WARNING, message, _("Load"), () => {
Expand Down Expand Up @@ -861,11 +885,11 @@ namespace Scratch.Services {
string message;
if (save_as) {
message = _(
"You cannot save the document to \"%s\". Do you want to save the file somewhere else?"
"You cannot save the document to “%s”. Do you want to save the file somewhere else?"
).printf ("<b>%s</b>".printf (get_directory ()));
} else {
message = _(
"You cannot save changes to the file \"%s\". Do you want to save the changes somewhere else?"
"You cannot save changes to the file “%s”. Do you want to save the changes somewhere else?"
).printf ("<b>%s</b>".printf (get_basename ()));
}

Expand Down Expand Up @@ -916,7 +940,7 @@ namespace Scratch.Services {
try {
file.copy (backup, FileCopyFlags.NONE);
} catch (Error e) {
warning ("Cannot create backup copy for file \"%s\": %s", get_basename (), e.message);
warning ("Cannot create backup copy for file “%s”: %s", get_basename (), e.message);
ask_save_location ();
}
}
Expand All @@ -942,7 +966,7 @@ namespace Scratch.Services {
backup.delete ();
debug ("Backup file deleted: %s", backup_file);
} catch (Error e) {
warning ("Cannot delete backup for file \"%s\": %s", get_basename (), e.message);
warning ("Cannot delete backup for file “%s”: %s", get_basename (), e.message);
}
}

Expand All @@ -955,7 +979,7 @@ namespace Scratch.Services {
file.delete ();
return true;
} catch (Error e) {
warning ("Cannot delete temporary file \"%s\": %s", file.get_uri (), e.message);
warning ("Cannot delete temporary file “%s”: %s", file.get_uri (), e.message);
}

return false;
Expand Down
5 changes: 1 addition & 4 deletions src/Widgets/DocumentView.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,11 +208,8 @@ public class Scratch.Widgets.DocumentView : Granite.Widgets.DynamicNotebook {

var doc = new Services.Document (window.actions, file);

insert_document (doc, -1);
current_document = doc;
open_document (doc);

doc.focus ();
save_opened_files ();
} catch (Error e) {
critical ("Cannot insert clipboard: %s", clipboard);
}
Expand Down