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

Allow ConversationEmail to manage its infobars indep. of ConversationMessage.

Browse source 
* src/client/conversation-viewer/conversation-email.vala: Move the
  draft_infobar wdiget from ConversationMessage, when the message is a
  draft add it to ConversationMessage's infobar box and show it.

* ui/conversation-email.ui: Move the draft_infobar definition from
  conversation-message.ui here.

* ui/conversation-message.ui: Wrap the remote messages infobar in an box
  so that ConversationEmail can easily append its own in the same location.
This commit is contained in:
Michael James Gratton 2016-04-21 16:07:08 +10:00
parent cfe68ef8c1
commit ad035f799c
4 changed files with 176 additions and 164 deletions
Download patch file Download diff file Expand all files Collapse all files

74
ui/conversation-email.ui
View file

@ -163,6 +163,80 @@
</packing>
</child>
</object>
<object class="GtkInfoBar" id="draft_infobar">
<property name="app_paintable">True</property>
<property name="can_focus">False</property>
<property name="message_type">warning</property>
<child internal-child="action_area">
<object class="GtkButtonBox">
<property name="can_focus">False</property>
<property name="spacing">6</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="button3">
<property name="label" translatable="yes">Edit Draft</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child internal-child="content_area">
<object class="GtkBox">
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Draft message</property>
<property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">This message has not yet been sent.</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<action-widgets>
<action-widget response="1">button3</action-widget>
</action-widgets>
</object>
<object class="GtkBox" id="sub_messages_box">
<property name="visible">True</property>
<property name="can_focus">False</property>