Merge lp:~harp37/writer/ImageToolBar into lp:writer

Proposed by Anthony Huben
Status: Merged
Merged at revision: 77
Proposed branch: lp:~harp37/writer/ImageToolBar
Merge into: lp:writer
Diff against target: 35 lines (+1/-6)
1 file modified
src/Widgets/ImageToolBar.vala (+1/-6)
To merge this branch: bzr merge lp:~harp37/writer/ImageToolBar
Reviewer Review Type Date Requested Status
Tuur Dutoit Pending
Review via email: mp+247501@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Widgets/ImageToolBar.vala'
2--- src/Widgets/ImageToolBar.vala 2014-10-26 10:41:33 +0000
3+++ src/Widgets/ImageToolBar.vala 2015-01-24 05:20:16 +0000
4@@ -39,8 +39,6 @@
5 var wrap_combobox = new Gtk.ComboBoxText ();
6 wrap_combobox.append ("In line of text", ("In line of text"));
7 wrap_combobox.append ("Float above text", ("Float above text"));
8- wrap_combobox.append ("On the left", ("On the left"));
9- wrap_combobox.append ("On the right", ("On the right"));
10 wrap_combobox.set_active_id ("In line of text");
11 var wrap_item = new Gtk.ToolItem ();
12 wrap_item.add (wrap_combobox);
13@@ -54,7 +52,6 @@
14 align_button.append (new Gtk.Button.from_icon_name ("format-justify-left-symbolic", Gtk.IconSize.BUTTON));
15 align_button.append (new Gtk.Button.from_icon_name ("format-justify-center-symbolic", Gtk.IconSize.BUTTON));
16 align_button.append (new Gtk.Button.from_icon_name ("format-justify-right-symbolic", Gtk.IconSize.BUTTON));
17- align_button.append (new Gtk.Button.from_icon_name ("format-justify-fill-symbolic", Gtk.IconSize.BUTTON));
18 align_item.add (align_button);
19
20 var edit_image_button = new Gtk.Button.with_label ("Edit Image");
21@@ -83,12 +80,10 @@
22 editor.set_justification ("center"); break;
23 case 2:
24 editor.set_justification ("right"); break;
25- case 3:
26- editor.set_justification ("fill"); break;
27 default:
28 editor.set_justification ("left"); break;
29 }
30 }
31
32 }
33-}
34\ No newline at end of file
35+}

Subscribers

People subscribed via source and target branches

to all changes: