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

conversation-viewer: move actions to the bottom when they don't fit

Browse source
This commit is contained in:
Julian Sparber 2020-10-09 17:20:31 +02:00
parent 0923de098f
commit 9c6ca541cc
11 changed files with 170 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

18
ui/application-main-window.ui
View file

@ -137,6 +137,24 @@
<property name="navigatable">False</property>
</packing>
</child>
<child>
<object class="GtkBox" id="conversation_viewer_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="ComponentsConversationActionBar" id="conversation_viewer_action_bar">
<property name="visible">True</property>
</object>
<packing>
<property name="pack_type">end</property>
</packing>
</child>
</object>
<packing>
<property name="name">conversation</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>

21
ui/components-conversation-action-bar.ui
View file

@ -11,11 +11,28 @@
<property name="can_focus">False</property>
<property name="transition_type">slide-up</property>
<child>
<object class="GtkBox" id="action_box">
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="margin">6</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkSeparator">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
</child>
<child>
<object class="GtkBox" id="action_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="margin_top">6</property>
<property name="margin_bottom">6</property>
<property name="margin_start">6</property>
<property name="margin_end">6</property>
</object>
</child>
</object>
</child>
</template>

36
ui/components-conversation-header-bar.ui Normal file
View file

@ -0,0 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="3.20"/>
<template class="ComponentsConversationHeaderBar" parent="GtkHeaderBar">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<signal name="notify::parent" handler="update_action_bar" swapped="no"/>
<child>
<object class="GtkButton" id="conversation_back">
<property name="can_focus">False</property>
<property name="receives_default">False</property>
<property name="valign">center</property>
<property name="use-underline">True</property>
<property name="visible" bind-property="folded" bind-source="ComponentsConversationHeaderBar" bind-flags="sync-create"/>
<property name="action_name">win.navigation-back</property>
<style>
<class name="image-button"/>
</style>
<child internal-child="accessible">
<object class="AtkObject" id="a11y-conversation-back">
<property name="accessible-name" translatable="yes">Back</property>
</object>
</child>
<child>
<object class="GtkImage" id="conversation_back_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">go-previous-symbolic</property>
<property name="icon_size">1</property>
</object>
</child>
</object>
</child>
</template>
</interface>

32
ui/main-toolbar.ui
View file

@ -158,37 +158,9 @@
</packing>
</child>
<child>
<object class="GtkHeaderBar" id="conversation_header">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<object class="ComponentsConversationHeaderBar" id="conversation_header">
<property name="show_close_button" bind-source="MainToolbar" bind-property="show_close_button" bind-flags="sync-create"/>
<child>
<object class="GtkButton" id="conversation_back">
<property name="can_focus">False</property>
<property name="receives_default">False</property>
<property name="valign">center</property>
<property name="use-underline">True</property>
<property name="visible" bind-source="MainToolbar" bind-property="folded" bind-flags="sync-create"/>
<property name="action_name">win.navigation-back</property>
<style>
<class name="image-button"/>
</style>
<child internal-child="accessible">
<object class="AtkObject" id="a11y-conversation-back">
<property name="accessible-name" translatable="yes">Back</property>
</object>
</child>
<child>
<object class="GtkImage" id="conversation_back_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">go-previous-symbolic</property>
<property name="icon_size">1</property>
</object>
</child>
</object>
</child>
<property name="folded" bind-source="MainToolbar" bind-property="folded" bind-flags="sync-create"/>
</object>
<packing>
<property name="name">conversation</property>

1
ui/org.gnome.Geary.gresource.xml
View file

@ -13,6 +13,7 @@
<file compressed="true" preprocess="xml-stripblanks">components-attachment-pane.ui</file>
<file compressed="true" preprocess="xml-stripblanks">components-attachment-pane-menus.ui</file>
<file compressed="true" preprocess="xml-stripblanks">components-attachment-view.ui</file>
<file compressed="true" preprocess="xml-stripblanks">components-conversation-header-bar.ui</file>
<file compressed="true" preprocess="xml-stripblanks">components-conversation-action-bar.ui</file>
<file compressed="true" preprocess="xml-stripblanks">components-conversation-actions.ui</file>
<file compressed="true" preprocess="xml-stripblanks">components-in-app-notification.ui</file>