talkatu/talkatu

Merged in default (pull request #13)

2019-06-07, Gary Kramlich
0097ffa45221
Parents 8c898a23474b87a62ed46c0a
Children 97d38097e16a
Merged in default (pull request #13)

Make the demo use a GtkPaned to make it easier to view input and history

Approved-by: Elliott Sales de Andrade
1 files changed, 143 insertions(+), 128 deletions(-)
  • +143 -128
    demo/data/demo.ui
    • --- a/demo/data/demo.ui Thu Jun 06 22:02:40 2019 -0500
    +++ b/demo/data/demo.ui Fri Jun 07 03:50:56 2019 +0000
    @@ -24,13 +24,11 @@
    <property name="border_width">12</property>
    <signal name="delete-event" handler="talkatu_demo_window_closed_cb" swapped="no"/>
    <child>
    - <placeholder/>
    - </child>
    - <child>
    - <object class="GtkBox">
    + <object class="GtkPaned">
    <property name="visible">True</property>
    - <property name="can_focus">False</property>
    + <property name="can_focus">True</property>
    <property name="orientation">vertical</property>
    + <property name="wide_handle">True</property>
    <child>
    <object class="GtkScrolledWindow">
    <property name="visible">True</property>
    @@ -50,150 +48,167 @@
    </child>
    </object>
    <packing>
    - <property name="expand">True</property>
    - <property name="fill">True</property>
    - <property name="position">0</property>
    + <property name="resize">True</property>
    + <property name="shrink">False</property>
    </packing>
    </child>
    <child>
    - <object class="GtkToolbar">
    + <object class="GtkBox">
    <property name="visible">True</property>
    <property name="can_focus">False</property>
    + <property name="orientation">vertical</property>
    <child>
    - <object class="GtkRadioToolButton" id="toggle_plain">
    - <property name="visible">True</property>
    - <property name="can_focus">False</property>
    - <property name="tooltip_text" translatable="yes">Use a TalkatuBuffer</property>
    - <property name="label" translatable="yes">Plain</property>
    - <property name="use_underline">True</property>
    - <property name="icon_name">text-x-generic</property>
    - <property name="active">True</property>
    - <signal name="toggled" handler="talkatu_demo_window_buffer_changed_cb" object="TalkatuDemoWindow" swapped="no"/>
    - </object>
    - <packing>
    - <property name="expand">False</property>
    - <property name="homogeneous">True</property>
    - </packing>
    - </child>
    - <child>
    - <object class="GtkRadioToolButton" id="toggle_whole">
    + <object class="GtkToolbar">
    <property name="visible">True</property>
    <property name="can_focus">False</property>
    - <property name="label" translatable="yes">Whole</property>
    - <property name="use_underline">True</property>
    - <property name="icon_name">ascii</property>
    - <property name="group">toggle_plain</property>
    - <signal name="toggled" handler="talkatu_demo_window_buffer_changed_cb" object="TalkatuDemoWindow" swapped="no"/>
    - </object>
    - <packing>
    - <property name="expand">False</property>
    - <property name="homogeneous">True</property>
    - </packing>
    - </child>
    - <child>
    - <object class="GtkRadioToolButton" id="toggle_html">
    - <property name="visible">True</property>
    - <property name="can_focus">False</property>
    - <property name="tooltip_text" translatable="yes">Use a TalkatuHTMLBuffer</property>
    - <property name="label" translatable="yes">HTML</property>
    - <property name="use_underline">True</property>
    - <property name="icon_name">text-html</property>
    - <property name="active">True</property>
    - <property name="group">toggle_plain</property>
    - <signal name="toggled" handler="talkatu_demo_window_buffer_changed_cb" object="TalkatuDemoWindow" swapped="no"/>
    + <child>
    + <object class="GtkRadioToolButton" id="toggle_plain">
    + <property name="visible">True</property>
    + <property name="can_focus">False</property>
    + <property name="tooltip_text" translatable="yes">Use a TalkatuBuffer</property>
    + <property name="label" translatable="yes">Plain</property>
    + <property name="use_underline">True</property>
    + <property name="icon_name">text-x-generic</property>
    + <property name="active">True</property>
    + <signal name="toggled" handler="talkatu_demo_window_buffer_changed_cb" object="TalkatuDemoWindow" swapped="no"/>
    + </object>
    + <packing>
    + <property name="expand">False</property>
    + <property name="homogeneous">True</property>
    + </packing>
    + </child>
    + <child>
    + <object class="GtkRadioToolButton" id="toggle_whole">
    + <property name="visible">True</property>
    + <property name="can_focus">False</property>
    + <property name="label" translatable="yes">Whole</property>
    + <property name="use_underline">True</property>
    + <property name="icon_name">ascii</property>
    + <property name="group">toggle_plain</property>
    + <signal name="toggled" handler="talkatu_demo_window_buffer_changed_cb" object="TalkatuDemoWindow" swapped="no"/>
    + </object>
    + <packing>
    + <property name="expand">False</property>
    + <property name="homogeneous">True</property>
    + </packing>
    + </child>
    + <child>
    + <object class="GtkRadioToolButton" id="toggle_html">
    + <property name="visible">True</property>
    + <property name="can_focus">False</property>
    + <property name="tooltip_text" translatable="yes">Use a TalkatuHTMLBuffer</property>
    + <property name="label" translatable="yes">HTML</property>
    + <property name="use_underline">True</property>
    + <property name="icon_name">text-html</property>
    + <property name="group">toggle_plain</property>
    + <signal name="toggled" handler="talkatu_demo_window_buffer_changed_cb" object="TalkatuDemoWindow" swapped="no"/>
    + </object>
    + <packing>
    + <property name="expand">False</property>
    + <property name="homogeneous">True</property>
    + </packing>
    + </child>
    + <child>
    + <object class="GtkRadioToolButton" id="toggle_markdown">
    + <property name="visible">True</property>
    + <property name="can_focus">False</property>
    + <property name="tooltip_text" translatable="yes">Use a TalkatuHTMLBuffer</property>
    + <property name="label" translatable="yes">Markdown</property>
    + <property name="use_underline">True</property>
    + <property name="icon_name">text-x-generic-template</property>
    + <property name="group">toggle_plain</property>
    + <signal name="toggled" handler="talkatu_demo_window_buffer_changed_cb" object="TalkatuDemoWindow" swapped="no"/>
    + </object>
    + <packing>
    + <property name="expand">False</property>
    + <property name="homogeneous">True</property>
    + </packing>
    + </child>
    + <child>
    + <object class="GtkSeparatorToolItem">
    + <property name="visible">True</property>
    + <property name="can_focus">False</property>
    + </object>
    + <packing>
    + <property name="expand">False</property>
    + <property name="homogeneous">True</property>
    + </packing>
    + </child>
    + <child>
    + <object class="GtkToolButton">
    + <property name="visible">True</property>
    + <property name="can_focus">False</property>
    + <property name="label" translatable="yes">Insert HTML</property>
    + <property name="use_underline">True</property>
    + <property name="icon_name">text-html</property>
    + <signal name="clicked" handler="talkatu_demo_window_insert_html_cb" object="TalkatuDemoWindow" swapped="no"/>
    + </object>
    + <packing>
    + <property name="expand">False</property>
    + <property name="homogeneous">True</property>
    + </packing>
    + </child>
    + <child>
    + <object class="GtkToolButton">
    + <property name="visible">True</property>
    + <property name="can_focus">False</property>
    + <property name="label" translatable="yes">Insert Markdown</property>
    + <property name="use_underline">True</property>
    + <property name="icon_name">text-x-generic</property>
    + <signal name="clicked" handler="talkatu_demo_window_insert_markdown_cb" object="TalkatuDemoWindow" swapped="no"/>
    + </object>
    + <packing>
    + <property name="expand">False</property>
    + <property name="homogeneous">True</property>
    + </packing>
    + </child>
    </object>
    <packing>
    <property name="expand">False</property>
    - <property name="homogeneous">True</property>
    - </packing>
    - </child>
    - <child>
    - <object class="GtkRadioToolButton" id="toggle_markdown">
    - <property name="visible">True</property>
    - <property name="can_focus">False</property>
    - <property name="tooltip_text" translatable="yes">Use a TalkatuHTMLBuffer</property>
    - <property name="label" translatable="yes">Markdown</property>
    - <property name="use_underline">True</property>
    - <property name="icon_name">text-x-generic-template</property>
    - <property name="group">toggle_plain</property>
    - <signal name="toggled" handler="talkatu_demo_window_buffer_changed_cb" object="TalkatuDemoWindow" swapped="no"/>
    - </object>
    - <packing>
    - <property name="expand">False</property>
    - <property name="homogeneous">True</property>
    + <property name="fill">True</property>
    + <property name="position">1</property>
    </packing>
    </child>
    <child>
    - <object class="GtkSeparatorToolItem">
    + <object class="TalkatuEditor" id="editor">
    + <property name="orientation">vertical</property>
    <property name="visible">True</property>
    - <property name="can_focus">False</property>
    + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
    + <property name="hexpand_set">True</property>
    + <property name="vexpand_set">True</property>
    + <child internal-child="toolbar">
    + <object class="TalkatuToolbar">
    + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
    + <property name="hexpand_set">True</property>
    + <property name="vexpand_set">True</property>
    + </object>
    + <packing>
    + <property name="fill">False</property>
    + </packing>
    + </child>
    + <child internal-child="view">
    + <object class="TalkatuView">
    + <property name="hexpand_set">True</property>
    + <property name="vexpand_set">True</property>
    + <property name="buffer">buffer_plain</property>
    + <signal name="open-url" handler="talkatu_demo_window_view_open_url_cb" object="TalkatuDemoWindow" swapped="no"/>
    + <signal name="send-message" handler="talkatu_demo_window_view_send_message_cb" object="TalkatuDemoWindow" swapped="no"/>
    + </object>
    + <packing>
    + <property name="fill">False</property>
    + </packing>
    + </child>
    </object>
    <packing>
    - <property name="expand">False</property>
    - <property name="homogeneous">True</property>
    - </packing>
    - </child>
    - <child>
    - <object class="GtkToolButton">
    - <property name="visible">True</property>
    - <property name="can_focus">False</property>
    - <property name="label" translatable="yes">Insert HTML</property>
    - <property name="use_underline">True</property>
    - <property name="icon_name">text-html</property>
    - <signal name="clicked" handler="talkatu_demo_window_insert_html_cb" object="TalkatuDemoWindow" swapped="no"/>
    - </object>
    - <packing>
    - <property name="expand">False</property>
    - <property name="homogeneous">True</property>
    - </packing>
    - </child>
    - <child>
    - <object class="GtkToolButton">
    - <property name="visible">True</property>
    - <property name="can_focus">False</property>
    - <property name="label" translatable="yes">Insert Markdown</property>
    - <property name="use_underline">True</property>
    - <property name="icon_name">text-x-generic</property>
    - <signal name="clicked" handler="talkatu_demo_window_insert_markdown_cb" object="TalkatuDemoWindow" swapped="no"/>
    - </object>
    - <packing>
    - <property name="expand">False</property>
    - <property name="homogeneous">True</property>
    + <property name="expand">True</property>
    + <property name="fill">True</property>
    + <property name="position">2</property>
    </packing>
    </child>
    </object>
    <packing>
    - <property name="expand">False</property>
    - <property name="fill">True</property>
    - <property name="position">1</property>
    - </packing>
    - </child>
    - <child>
    - <object class="TalkatuEditor" id="editor">
    - <property name="orientation">vertical</property>
    - <property name="visible">True</property>
    - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
    - <child internal-child="toolbar">
    - <object class="TalkatuToolbar"/>
    - <packing>
    - <property name="fill">False</property>
    - </packing>
    - </child>
    - <child internal-child="view">
    - <object class="TalkatuView">
    - <property name="buffer">buffer_plain</property>
    - <signal name="open-url" handler="talkatu_demo_window_view_open_url_cb" object="TalkatuDemoWindow" swapped="no"/>
    - <signal name="send-message" handler="talkatu_demo_window_view_send_message_cb" object="TalkatuDemoWindow" swapped="no"/>
    - </object>
    - <packing>
    - <property name="fill">False</property>
    - </packing>
    - </child>
    - </object>
    - <packing>
    - <property name="expand">False</property>
    - <property name="fill">True</property>
    - <property name="position">2</property>
    + <property name="resize">True</property>
    + <property name="shrink">False</property>
    </packing>
    </child>
    </object>