gedit

Merge lp:~larsu/gedit/wrap-labels-close-multi-doc-dialog into lp:~ubuntu-desktop/gedit/ubuntu

  1. wrap-labels-close-multi-doc-dialog
  2. Merge into ubuntu
Proposed by Lars Karlitski
Status: Merged
Merged at revision: 171
Proposed branch: lp:~larsu/gedit/wrap-labels-close-multi-doc-dialog
Merge into: lp:~ubuntu-desktop/gedit/ubuntu
Diff against target: 47 lines (+32/-0)
2 files modified
debian/changelog (+8/-0)
debian/patches/git_wrap_labels.patch (+24/-0)
To merge this branch: bzr merge lp:~larsu/gedit/wrap-labels-close-multi-doc-dialog
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Review via email: mp+237285@code.launchpad.net

Commit message

* debian/patches/git_wrap_labels:
  - amend to also wrap labels in multiple-docs close confirmation dialog
    (backport from 7c597656)

Description of the change

* debian/patches/git_wrap_labels:
  - amend to also wrap labels in multiple-docs close confirmation dialog
    (backport from 7c597656)

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-09-22 10:44:09 +0000
3+++ debian/changelog 2014-10-06 14:54:08 +0000
4@@ -1,3 +1,11 @@
5+gedit (3.10.4-0ubuntu6) UNRELEASED; urgency=medium
6+
7+ * debian/patches/git_wrap_labels:
8+ - amend to also wrap labels in multiple-docs close confirmation dialog
9+ (backport from 7c597656)
10+
11+ -- Lars Uebernickel <lars.uebernickel@ubuntu.com> Mon, 06 Oct 2014 16:50:40 +0200
12+
13 gedit (3.10.4-0ubuntu5) utopic; urgency=medium
14
15 * debian/patches/git_wrap_labels.patch:
16
17=== modified file 'debian/patches/git_wrap_labels.patch'
18--- debian/patches/git_wrap_labels.patch 2014-09-22 10:43:59 +0000
19+++ debian/patches/git_wrap_labels.patch 2014-10-06 14:54:08 +0000
20@@ -30,3 +30,27 @@
21
22 hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
23 gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
24+@@ -659,6 +661,7 @@ build_multiple_docs_dialog (GeditCloseCo
25+ gtk_widget_set_halign (primary_label, GTK_ALIGN_START);
26+ gtk_label_set_selectable (GTK_LABEL (primary_label), TRUE);
27+ gtk_widget_set_can_focus (primary_label, FALSE);
28++ gtk_label_set_max_width_chars (GTK_LABEL (primary_label), 72);
29+
30+ if (priv->disable_save_to_disk)
31+ {
32+@@ -700,6 +703,7 @@ build_multiple_docs_dialog (GeditCloseCo
33+
34+ gtk_box_pack_start (GTK_BOX (vbox2), select_label, FALSE, FALSE, 0);
35+ gtk_label_set_line_wrap (GTK_LABEL (select_label), TRUE);
36++ gtk_label_set_max_width_chars (GTK_LABEL (select_label), 72);
37+ gtk_widget_set_halign (select_label, GTK_ALIGN_START);
38+
39+ scrolledwindow = gtk_scrolled_window_new (NULL, NULL);
40+@@ -727,6 +731,7 @@ build_multiple_docs_dialog (GeditCloseCo
41+ gtk_widget_set_halign (secondary_label, GTK_ALIGN_START);
42+ gtk_misc_set_alignment (GTK_MISC (secondary_label), 0, 0.5);
43+ gtk_label_set_selectable (GTK_LABEL (secondary_label), TRUE);
44++ gtk_label_set_max_width_chars (GTK_LABEL (secondary_label), 72);
45+
46+ gtk_label_set_mnemonic_widget (GTK_LABEL (select_label), treeview);
47+

Subscribers

People subscribed via source and target branches

to all changes: