Skip to content
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

Jump to bottom

294 reverse phrasing #299

Merged
merged 9 commits into from
Nov 16, 2018
Merged

294 reverse phrasing #299

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
009f573
Changing paste dialog message, tick CheckButton by default.
Oct 8, 2018
6907624
Correctly set gsettings and update po files. Fix #294
Oct 8, 2018
0133f2b
Remove unnecessary call to `set_active ()`.
Oct 8, 2018
ccae655
Revert "Correctly set gsettings and update po files. Fix #294"
Oct 9, 2018
00e9606
Keep the one required change from the last undone commit.
Oct 9, 2018
921b46d
Merge branch 'master' into 294-reverse-phrasing
cassidyjames Oct 9, 2018
68fc8b7
Merge branch 'master' into 294-reverse-phrasing
cassidyjames Oct 10, 2018
03c30d4
Merge branch 'master' into 294-reverse-phrasing
danirabbit Oct 25, 2018
fd833c4
Merge branch 'master' into 294-reverse-phrasing
danirabbit Nov 16, 2018
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
10 changes: 5 additions & 5 deletions src/Dialogs/UnsafePasteDialog.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ public class PantheonTerminal.UnsafePasteDialog : Gtk.Dialog {
);
secondary_label.xalign = 0;

var do_not_show_check = new Gtk.CheckButton.with_label (_("Do not show this dialog again"));
do_not_show_check.margin_bottom = 12;
do_not_show_check.margin_top = 12;
settings.schema.bind ("unsafe-paste-alert", do_not_show_check, "active", SettingsBindFlags.DEFAULT | SettingsBindFlags.INVERT_BOOLEAN);
var show_protection_warnings = new Gtk.CheckButton.with_label (_("Show paste protection warnings"));
show_protection_warnings.margin_bottom = 12;
show_protection_warnings.margin_top = 12;
settings.schema.bind ("unsafe-paste-alert", show_protection_warnings, "active", SettingsBindFlags.DEFAULT);

var grid = new Gtk.Grid ();
grid.column_spacing = 12;
Expand All @@ -57,7 +57,7 @@ public class PantheonTerminal.UnsafePasteDialog : Gtk.Dialog {
grid.attach (warning_image, 0, 0, 1, 2);
grid.attach (primary_label, 1, 0, 1, 1);
grid.attach (secondary_label, 1, 1, 1, 1);
grid.attach (do_not_show_check, 1, 2, 1, 1);
grid.attach (show_protection_warnings, 1, 2, 1, 1);

((Gtk.Box) get_content_area ()).add (grid);

Expand Down