Photos

Merge lp:~meese/pantheon-photos/metadatasidebar-fixes into lp:~pantheon-photos/pantheon-photos/trunk

  1. metadatasidebar-fixes
  2. Merge into trunk
Proposed by meese
Status: Merged
Approved by: Cody Garver
Approved revision: 2634
Merged at revision: 2642
Proposed branch: lp:~meese/pantheon-photos/metadatasidebar-fixes
Merge into: lp:~pantheon-photos/pantheon-photos/trunk
Diff against target: 57 lines (+13/-4)
2 files modified
src/sidebar/metadata/LibraryProperties.vala (+10/-4)
src/sidebar/metadata/Properties.vala (+3/-0)
To merge this branch: bzr merge lp:~meese/pantheon-photos/metadatasidebar-fixes
Reviewer Review Type Date Requested Status
Photos Devs Pending
Review via email: mp+234901@code.launchpad.net

Commit message

fixes translated strings in extended details by making the property label multiline, makes hitting enter in the sidebar tag entry saves tag changes

Description of the change

fixes translated strings in extended details by making the property label multiline, makes hitting enter in the sidebar tag entry saves tag changes

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/sidebar/metadata/LibraryProperties.vala'
2--- src/sidebar/metadata/LibraryProperties.vala 2014-09-02 22:39:13 +0000
3+++ src/sidebar/metadata/LibraryProperties.vala 2014-09-17 01:33:38 +0000
4@@ -73,14 +73,14 @@
5 if (title != null)
6 title_entry.set_text (title);
7 title_entry.changed.connect (title_entry_changed);
8- add_entry_line ("Title", title_entry);
9+ add_entry_line (_("Title"), title_entry);
10
11- comment_entry = new PlaceHolderTextView (comment, "Comment");
12+ comment_entry = new PlaceHolderTextView (comment, _("Comment"));
13 comment_entry.set_wrap_mode (Gtk.WrapMode.WORD);
14 comment_entry.set_size_request (-1, 50);
15 // textview in sidebar css class for non entry we make an exception
16 comment_entry.get_style_context ().add_class (Gtk.STYLE_CLASS_ENTRY);
17- add_entry_line ("Comment", comment_entry);
18+ add_entry_line (_("Comment"), comment_entry);
19
20 var rating_widget = new PhotoRatingWidget (true, 15);
21 rating_widget.rating = Resources.rating_int (rating);
22@@ -117,7 +117,8 @@
23 if (tags != null)
24 tags_entry.text = tags;
25 tags_entry.changed.connect (tags_entry_changed);
26- add_entry_line ("Tags, seperated by commas", tags_entry);
27+ tags_entry.activate.connect (tags_entry_activate);
28+ add_entry_line (_("Tags, seperated by commas"), tags_entry);
29 }
30 }
31
32@@ -159,6 +160,11 @@
33 tags = tags_entry.get_text ();
34 }
35
36+ private void tags_entry_activate () {
37+ tags = tags_entry.get_text ();
38+ save_changes_to_source ();
39+ }
40+
41 public override void save_changes_to_source () {
42 if (media_source != null && is_media) {
43 comment = comment_entry.get_text ().strip ();
44
45=== modified file 'src/sidebar/metadata/Properties.vala'
46--- src/sidebar/metadata/Properties.vala 2014-08-27 02:56:23 +0000
47+++ src/sidebar/metadata/Properties.vala 2014-09-17 01:33:38 +0000
48@@ -21,6 +21,9 @@
49 label.set_justify (Gtk.Justification.RIGHT);
50 label.valign = Gtk.Align.START;
51 label.set_markup (GLib.Markup.printf_escaped ("%s", label_text));
52+ label.set_line_wrap (true);
53+ label.set_line_wrap_mode (Pango.WrapMode.WORD_CHAR);
54+ label.set_lines (8);
55
56 if (multi_line) {
57 Gtk.ScrolledWindow info_scroll = new Gtk.ScrolledWindow (null, null);

Subscribers

People subscribed via source and target branches

to all changes: