Thanks to visit codestin.com
Credit goes to github.com

Skip to content

OverwriteUncommittedConfirmationDialog: Correct icon name and buttons order #1544

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 2 commits into from
Mar 2, 2025
Merged

OverwriteUncommittedConfirmationDialog: Correct icon name and buttons order #1544

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0049593
OverwriteUncommittedConfirmationDialog: Correct icon name and buttons…
ryonakano Mar 2, 2025
a2de916
Merge branch 'master' into ryonakano/overwrite-dialog-fix
danirabbit Mar 2, 2025
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
7 changes: 3 additions & 4 deletions src/Dialogs/OverwriteUncommittedConfirmationDialog.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,14 @@ public class Scratch.Dialogs.OverwriteUncommittedConfirmationDialog : Granite.Me

construct {
modal = true;
image_icon = new ThemedIcon ("dialog-stop");
image_icon = new ThemedIcon ("dialog-warning");

primary_text = _("There are uncommitted changes in the current branch");
///TRANSLATORS '%s' is a placeholder for the name of the branch to be checked out
secondary_text = _("Uncommitted changes will be permanently lost if <b>'%s'</b> is checked out now.\n\n<i>It is recommended that uncommitted changes are stashed, committed, or reverted before proceeding </i>").printf (branch_name);
secondary_text = _("Uncommitted changes will be permanently lost if <b>'%s'</b> is checked out now.\n\n<i>It is recommended that uncommitted changes are stashed, committed, or reverted before proceeding.</i>").printf (branch_name);

var cancel_button = add_button (_("Do not Checkout"), Gtk.ResponseType.REJECT);
var proceed_button = (Gtk.Button) add_button (_("Checkout and Overwrite"), Gtk.ResponseType.ACCEPT);
proceed_button.get_style_context ().add_class (Gtk.STYLE_CLASS_DESTRUCTIVE_ACTION);
var cancel_button = add_button (_("Do not Checkout"), Gtk.ResponseType.REJECT);
cancel_button.get_style_context ().add_class (Gtk.STYLE_CLASS_SUGGESTED_ACTION);
}
}