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.

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

Properly encode pasted text containing newlines #2248

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions dub.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
"dflags-ldc": ["-disable-linker-strip-dead","-link-defaultlib-shared=false"],
"dependencies": {
"gtk-d:gtkd": {
"version": "3.10.0"
"version": "3.11.0"
},
"gtk-d:vte": {
"version": "3.10.0"
"version": "3.11.0"
}
},
"buildTypes": {
Expand Down Expand Up @@ -50,4 +50,4 @@
"versions": ["StdLoggerDisableTrace"]
}
]
}
}
2 changes: 1 addition & 1 deletion dub.selections.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"fileVersion": 1,
"versions": {
"gtk-d": "3.10.0"
"gtk-d": "3.11.0"
}
}
2 changes: 1 addition & 1 deletion source/gx/tilix/bookmark/bmeditor.d
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ protected:

Label createLabel(string text) {
Label result = new Label(text);
result.setHalign(Align.END);
result.setHalign(GtkAlign.END);
return result;
}

Expand Down
2 changes: 1 addition & 1 deletion source/gx/tilix/closedialog.d
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ private:
Box box = new Box(Orientation.VERTICAL, 6);

Label lbl = new Label("There are processes still running as shown below, close anyway?");
lbl.setHalign(Align.START);
lbl.setHalign(GtkAlign.START);
lbl.setMarginBottom(6);
box.add(lbl);

Expand Down
6 changes: 3 additions & 3 deletions source/gx/tilix/customtitle.d
Original file line number Diff line number Diff line change
Expand Up @@ -62,17 +62,17 @@ private:
bool controlRequired;

void createUI() {
setHalign(Align.FILL);
setHalign(GtkAlign.FILL);

lblTitle = new Label(_(APPLICATION_NAME));
lblTitle.setHalign(Align.CENTER);
lblTitle.setHalign(GtkAlign.CENTER);
lblTitle.getStyleContext().addClass("title");
lblTitle.setEllipsize(PangoEllipsizeMode.START);
eb = new EventBox();
eb.addOnButtonPress(&onButtonPress);
eb.addOnButtonRelease(&onButtonRelease);
eb.add(lblTitle);
eb.setHalign(Align.FILL);
eb.setHalign(GtkAlign.FILL);
addNamed(eb, PAGE_LABEL);

eTitle = new Entry();
Expand Down
2 changes: 1 addition & 1 deletion source/gx/tilix/prefeditor/advdialog.d
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ private:

Label createErrorLabel() {
Label lblErrors = new Label("");
lblErrors.setHalign(Align.START);
lblErrors.setHalign(GtkAlign.START);
lblErrors.setMarginTop(12);
lblErrors.getStyleContext().addClass("tilix-error");
lblErrors.setNoShowAll(true);
Expand Down
14 changes: 7 additions & 7 deletions source/gx/tilix/prefeditor/common.d
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,16 @@ void createAdvancedUI(Grid grid, ref uint row, GSettings delegate() scb, bool sh
// Custom Links Section
Label lblCustomLinks = new Label(format("<b>%s</b>", _("Custom Links")));
lblCustomLinks.setUseMarkup(true);
lblCustomLinks.setHalign(Align.START);
lblCustomLinks.setHalign(GtkAlign.START);
grid.attach(lblCustomLinks, 0, row, 3, 1);
row++;

string customLinksDescription = _("A list of user defined links that can be clicked on in the terminal based on regular expression definitions.");
grid.attach(createDescriptionLabel(customLinksDescription), 0, row, 2, 1);

Button btnEditLink = new Button(_("Edit"));
btnEditLink.setHalign(Align.FILL);
btnEditLink.setValign(Align.CENTER);
btnEditLink.setHalign(GtkAlign.FILL);
btnEditLink.setValign(GtkAlign.CENTER);

btnEditLink.addOnClicked(delegate(Button) {
GSettings gs = scb();
Expand All @@ -66,7 +66,7 @@ void createAdvancedUI(Grid grid, ref uint row, GSettings delegate() scb, bool sh
// Triggers Section
Label lblTriggers = new Label(format("<b>%s</b>", _("Triggers")));
lblTriggers.setUseMarkup(true);
lblTriggers.setHalign(Align.START);
lblTriggers.setHalign(GtkAlign.START);
lblTriggers.setMarginTop(12);
grid.attach(lblTriggers, 0, row, 3, 1);
row++;
Expand All @@ -75,8 +75,8 @@ void createAdvancedUI(Grid grid, ref uint row, GSettings delegate() scb, bool sh
grid.attach(createDescriptionLabel(triggersDescription), 0, row, 2, 1);

Button btnEditTriggers = new Button(_("Edit"));
btnEditTriggers.setHalign(Align.FILL);
btnEditTriggers.setValign(Align.CENTER);
btnEditTriggers.setHalign(GtkAlign.FILL);
btnEditTriggers.setValign(GtkAlign.CENTER);

btnEditTriggers.addOnClicked(delegate(Button) {
GSettings gs = scb();
Expand All @@ -102,7 +102,7 @@ Label createDescriptionLabel(string desc) {
lblDescription.setUseMarkup(true);
lblDescription.setSensitive(false);
lblDescription.setLineWrap(true);
lblDescription.setHalign(Align.START);
lblDescription.setHalign(GtkAlign.START);
if (Version.checkVersion(3, 16, 0).length == 0) {
lblDescription.setXalign(0.0);
}
Expand Down
30 changes: 15 additions & 15 deletions source/gx/tilix/prefeditor/prefdialog.d
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ private:
bProfileTitle.add(new Separator(Orientation.HORIZONTAL));
Label lblProfileTitle = new Label(format("<b>%s</b>",_("Profiles")));
lblProfileTitle.setUseMarkup(true);
lblProfileTitle.setHalign(Align.START);
lblProfileTitle.setHalign(GtkAlign.START);
lblProfileTitle.setSensitive(false);
setAllMargins(row, 6);
bProfileTitle.add(lblProfileTitle);
Expand Down Expand Up @@ -480,7 +480,7 @@ public:
_title = title;

Label label = new Label(_(name));
label.setHalign(Align.START);
label.setHalign(GtkAlign.START);
setAllMargins(label, 6);
add(label);
}
Expand Down Expand Up @@ -515,7 +515,7 @@ private:
setAllMargins(box, 6);

lblName = new Label(profile.name);
lblName.setHalign(Align.START);
lblName.setHalign(GtkAlign.START);
box.packStart(lblName, true, true, 2);

MenuButton btnMenu = new MenuButton();
Expand Down Expand Up @@ -635,7 +635,7 @@ private:
setMarginBottom(18);

Label lblEncoding = new Label(_("Encodings showing in menu:"));
lblEncoding.setHalign(Align.START);
lblEncoding.setHalign(GtkAlign.START);
add(lblEncoding);

string[] menuEncodings = gsSettings.getStrv(SETTINGS_ENCODINGS_KEY);
Expand Down Expand Up @@ -1176,7 +1176,7 @@ class AppearancePreferences: Box {
bWindowStyle.add(cbWindowStyle);

Label lblRestart = new Label(_("Window restart required"));
lblRestart.setHalign(Align.START);
lblRestart.setHalign(GtkAlign.START);
lblRestart.setSensitive(false);
bWindowStyle.add(lblRestart);

Expand Down Expand Up @@ -1256,7 +1256,7 @@ class AppearancePreferences: Box {

//Session Name
Label lblSessionName = new Label(_("Default session name"));
lblSessionName.setHalign(Align.END);
lblSessionName.setHalign(GtkAlign.END);
grid.attach(lblSessionName, 0, row, 1, 1);

Entry eSessionName = new Entry();
Expand All @@ -1271,7 +1271,7 @@ class AppearancePreferences: Box {

//Application Title
Label lblAppTitle = new Label(_("Application title"));
lblAppTitle.setHalign(Align.END);
lblAppTitle.setHalign(GtkAlign.END);
grid.attach(lblAppTitle, 0, row, 1, 1);

Entry eAppTitle = new Entry();
Expand Down Expand Up @@ -1347,7 +1347,7 @@ private:

Label lblSize = new Label(format("<b>%s</b>", _("Size")));
lblSize.setUseMarkup(true);
lblSize.setHalign(Align.START);
lblSize.setHalign(GtkAlign.START);
add(lblSize);

Grid grid = new Grid();
Expand All @@ -1360,7 +1360,7 @@ private:
Scale sHeight = new Scale(Orientation.HORIZONTAL, 10, 90, 10);
sHeight.setValuePos(GtkPositionType.RIGHT);
sHeight.setHexpand(true);
sHeight.setHalign(Align.FILL);
sHeight.setHalign(GtkAlign.FILL);
bh.bind(SETTINGS_QUAKE_HEIGHT_PERCENT_KEY, sHeight.getAdjustment(), "value", GSettingsBindFlags.DEFAULT);
grid.attach(sHeight, 1, row, 1, 1);
row++;
Expand All @@ -1371,7 +1371,7 @@ private:
Scale sWidth = new Scale(Orientation.HORIZONTAL, 10, 100, 10);
sWidth.setValuePos(GtkPositionType.RIGHT);
sWidth.setHexpand(true);
sWidth.setHalign(Align.FILL);
sWidth.setHalign(GtkAlign.FILL);
bh.bind(SETTINGS_QUAKE_WIDTH_PERCENT_KEY, sWidth.getAdjustment(), "value", GSettingsBindFlags.DEFAULT);
grid.attach(sWidth, 1, row, 1, 1);
row++;
Expand Down Expand Up @@ -1402,7 +1402,7 @@ private:

Label lblOptions = new Label(format("<b>%s</b>", _("Options")));
lblOptions.setUseMarkup(true);
lblOptions.setHalign(Align.START);
lblOptions.setHalign(GtkAlign.START);
add(lblOptions);

Box bContent = new Box(Orientation.VERTICAL, 6);
Expand Down Expand Up @@ -1532,7 +1532,7 @@ private:

Label lblBehavior = new Label(format("<b>%s</b>", _("Behavior")));
lblBehavior.setUseMarkup(true);
lblBehavior.setHalign(Align.START);
lblBehavior.setHalign(GtkAlign.START);
add(lblBehavior);

//Prompt on new session
Expand Down Expand Up @@ -1591,7 +1591,7 @@ private:
Box bNewInstance = new Box(Orientation.HORIZONTAL, 6);

Label lblNewInstance = new Label(_("On new instance"));
lblNewInstance.setHalign(Align.END);
lblNewInstance.setHalign(GtkAlign.END);
bNewInstance.add(lblNewInstance);
ComboBox cbNewInstance = createNameValueCombo([_("New Window"), _("New Session"), _("Split Right"), _("Split Down"), _("Focus Window")], SETTINGS_NEW_INSTANCE_MODE_VALUES);
bh.bind(SETTINGS_NEW_INSTANCE_MODE_KEY, cbNewInstance, "active-id", GSettingsBindFlags.DEFAULT);
Expand All @@ -1601,7 +1601,7 @@ private:
// *********** Clipboard Options
Label lblClipboard = new Label(format("<b>%s</b>", _("Clipboard")));
lblClipboard.setUseMarkup(true);
lblClipboard.setHalign(Align.START);
lblClipboard.setHalign(GtkAlign.START);
add(lblClipboard);

//Advacned paste is default
Expand Down Expand Up @@ -1653,7 +1653,7 @@ private:
void createUI() {
setAllMargins(this, 18);
Grid grid = new Grid();
grid.setHalign(Align.FILL);
grid.setHalign(GtkAlign.FILL);
grid.setColumnSpacing(12);
grid.setRowSpacing(6);

Expand Down
Loading