nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename ConversationViewer "preview" widgets to "compact"

Browse source 
Reduce confusion with Geary.Email.preview.
This commit is contained in:
Michael Gratton 2019-01-21 11:08:18 +10:30
parent 6810fd37d9
commit 23973b57ff
2 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/client/conversation-viewer/conversation-message.vala
View file

@ -161,13 +161,13 @@ public class ConversationMessage : Gtk.Grid, Geary.BaseInterface {
private Gtk.Image avatar; private Gtk.Image avatar;
[GtkChild] [GtkChild]
private Gtk.Revealer preview_revealer; private Gtk.Revealer compact_revealer;
[GtkChild] [GtkChild]
private Gtk.Label preview_from; private Gtk.Label compact_from;
[GtkChild] [GtkChild]
private Gtk.Label preview_date; private Gtk.Label compact_date;
[GtkChild] [GtkChild]
private Gtk.Label preview_body; private Gtk.Label compact_body;
[GtkChild] [GtkChild]
private Gtk.Revealer header_revealer; private Gtk.Revealer header_revealer;
@ -381,14 +381,14 @@ public class ConversationMessage : Gtk.Grid, Geary.BaseInterface {
(MenuModel) builder.get_object("context_menu_inspector"); (MenuModel) builder.get_object("context_menu_inspector");
} }
// Preview headers // Compact headers
// Translators: This is displayed in place of the from address // Translators: This is displayed in place of the from address
// when the message has no from address. // when the message has no from address.
string empty_from = _("No sender"); string empty_from = _("No sender");
this.preview_from.set_text(format_originator_preview(from, empty_from)); this.compact_from.set_text(format_originator_compact(from, empty_from));
this.preview_from.get_style_context().add_class(FROM_CLASS); this.compact_from.get_style_context().add_class(FROM_CLASS);
string date_text = ""; string date_text = "";
string date_tooltip = ""; string date_tooltip = "";
@ -400,8 +400,8 @@ public class ConversationMessage : Gtk.Grid, Geary.BaseInterface {
date.value, config.clock_format date.value, config.clock_format
); );
} }
this.preview_date.set_text(date_text); this.compact_date.set_text(date_text);
this.preview_date.set_tooltip_text(date_tooltip); this.compact_date.set_tooltip_text(date_tooltip);
if (preview != null) { if (preview != null) {
string clean_preview = preview; string clean_preview = preview;
@ -413,7 +413,7 @@ public class ConversationMessage : Gtk.Grid, Geary.BaseInterface {
// the text // the text
clean_preview += "…"; clean_preview += "…";
} }
this.preview_body.set_text(clean_preview); this.compact_body.set_text(clean_preview);
} }
// Full headers // Full headers
@ -486,19 +486,19 @@ public class ConversationMessage : Gtk.Grid, Geary.BaseInterface {
} }
/** /**
* Shows the complete message and hides the preview headers. * Shows the complete message and hides the compact headers.
*/ */
public void show_message_body(bool include_transitions=true) { public void show_message_body(bool include_transitions=true) {
set_revealer(this.preview_revealer, false, include_transitions); set_revealer(this.compact_revealer, false, include_transitions);
set_revealer(this.header_revealer, true, include_transitions); set_revealer(this.header_revealer, true, include_transitions);
set_revealer(this.body_revealer, true, include_transitions); set_revealer(this.body_revealer, true, include_transitions);
} }
/** /**
* Hides the complete message and shows the preview headers. * Hides the complete message and shows the compact headers.
*/ */
public void hide_message_body() { public void hide_message_body() {
preview_revealer.set_reveal_child(true); compact_revealer.set_reveal_child(true);
header_revealer.set_reveal_child(false); header_revealer.set_reveal_child(false);
body_revealer.set_reveal_child(false); body_revealer.set_reveal_child(false);
} }
@ -661,7 +661,7 @@ public class ConversationMessage : Gtk.Grid, Geary.BaseInterface {
return menu; return menu;
} }
private string format_originator_preview(Geary.RFC822.MailboxAddresses? from, private string format_originator_compact(Geary.RFC822.MailboxAddresses? from,
string empty_from_text) { string empty_from_text) {
string text = ""; string text = "";
if (from != null && from.size > 0) { if (from != null && from.size > 0) {
@ -672,7 +672,7 @@ public class ConversationMessage : Gtk.Grid, Geary.BaseInterface {
if (++i < list.size) if (++i < list.size)
// Translators: This separates multiple 'from' // Translators: This separates multiple 'from'
// addresses in the header preview for a message. // addresses in the compact header for a message.
text += _(", "); text += _(", ");
} }
} else { } else {

10
ui/conversation-message.ui
View file

@ -34,7 +34,7 @@
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>
<object class="GtkRevealer" id="preview_revealer"> <object class="GtkRevealer" id="compact_revealer">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
@ -46,7 +46,7 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
<child> <child>
<object class="GtkGrid" id="preview"> <object class="GtkGrid">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
@ -57,7 +57,7 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
<child> <child>
<object class="GtkLabel" id="preview_from"> <object class="GtkLabel" id="compact_from">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
@ -74,7 +74,7 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkLabel" id="preview_date"> <object class="GtkLabel" id="compact_date">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes">1/1/1970 </property> <property name="label" translatable="yes">1/1/1970 </property>
@ -95,7 +95,7 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkLabel" id="preview_body"> <object class="GtkLabel" id="compact_body">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">start</property> <property name="halign">start</property>