From d76fdf9cb931d6d189938102a98a71030ea907ad Mon Sep 17 00:00:00 2001
From: Robin Haberkorn <robin.haberkorn@googlemail.com>
Date: Thu, 31 May 2012 19:07:16 +0200
Subject: allow transcript formatting without markup (like search-as-you type)

 * controlled via checkbox
 * if markup is disabled the entered text is only regular expressions
 * default text attributes are used according to some constants (in configure.ac, later they will be configurable via config file)
 * fixed return value of gtk_experiment_transcript_load_formats()
 * care about possible capture mismatches in regular expressions (capture braces are inserted automatically - the user is not allowed specify own captures)
 * display state of interactive format via icon (successful/error)
---
 src/default.ui | 100 ++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 82 insertions(+), 18 deletions(-)

(limited to 'src/default.ui')

diff --git a/src/default.ui b/src/default.ui
index ee9195e..d526dbd 100644
--- a/src/default.ui
+++ b/src/default.ui
@@ -13,7 +13,6 @@
     <child>
       <object class="GtkVBox" id="player_window_vbox">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
         <child>
           <object class="GtkMenuBar" id="player_window_menubar">
             <property name="visible">True</property>
@@ -265,7 +264,6 @@ audio-volume-medium</property>
     <child>
       <object class="GtkVBox" id="info_window_vbox">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
         <child>
           <object class="GtkMenuBar" id="info_window_menubar">
             <property name="visible">True</property>
@@ -356,41 +354,107 @@ audio-volume-medium</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkEntry" id="transcript_wizard_entry">
+                  <object class="GtkComboBox" id="transcript_wizard_combo">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="invisible_char">&#x25CF;</property>
-                    <signal name="changed" handler="generic_transcript_entry_changed_cb" object="transcript_wizard_widget"/>
+                    <signal name="changed" handler="generic_transcript_combo_changed_cb" object="transcript_wizard_widget"/>
                   </object>
                   <packing>
-                    <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
+                    <property name="top_attach">1</property>
+                    <property name="bottom_attach">2</property>
                     <property name="y_options">GTK_FILL</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkEntry" id="transcript_proband_entry">
+                  <object class="GtkHBox" id="transcript_wizard_entry_hbox">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="invisible_char">&#x25CF;</property>
-                    <signal name="changed" handler="generic_transcript_entry_changed_cb" object="transcript_proband_widget"/>
+                    <child>
+                      <object class="GtkEntry" id="transcript_wizard_entry">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="invisible_char">&#x25CF;</property>
+                        <property name="primary_icon_stock">gtk-apply</property>
+                        <signal name="changed" handler="generic_transcript_entry_changed_cb" object="transcript_wizard_widget"/>
+                      </object>
+                      <packing>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkVSeparator" id="transcript_wizard_entry_separator">
+                        <property name="visible">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="padding">5</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="transcript_wizard_entry_check">
+                        <property name="label" translatable="yes">Markup</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="draw_indicator">True</property>
+                        <signal name="toggled" handler="generic_transcript_entry_check_toggled_cb" object="transcript_wizard_entry"/>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
                   </object>
                   <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
                     <property name="top_attach">2</property>
                     <property name="bottom_attach">3</property>
                     <property name="y_options">GTK_FILL</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkComboBox" id="transcript_wizard_combo">
+                  <object class="GtkHBox" id="transcript_proband_entry_hbox">
                     <property name="visible">True</property>
-                    <signal name="changed" handler="generic_transcript_combo_changed_cb" object="transcript_wizard_widget"/>
+                    <child>
+                      <object class="GtkEntry" id="transcript_proband_entry">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="invisible_char">&#x25CF;</property>
+                        <property name="primary_icon_stock">gtk-apply</property>
+                        <signal name="changed" handler="generic_transcript_entry_changed_cb" object="transcript_proband_widget"/>
+                      </object>
+                      <packing>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkVSeparator" id="transcript_proband_entry_separator">
+                        <property name="visible">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="padding">5</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="transcript_proband_entry_check">
+                        <property name="label" translatable="yes">Markup</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="draw_indicator">True</property>
+                        <signal name="toggled" handler="generic_transcript_entry_check_toggled_cb" object="transcript_proband_entry"/>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
                   </object>
                   <packing>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">2</property>
+                    <property name="bottom_attach">3</property>
                     <property name="y_options">GTK_FILL</property>
                   </packing>
                 </child>
-- 
cgit v1.2.3