[xiph-commits] r11688 - trunk/souffleur

daraku at svn.xiph.org daraku at svn.xiph.org
Sun Jul 2 11:30:04 PDT 2006


Author: daraku
Date: 2006-07-02 11:29:54 -0700 (Sun, 02 Jul 2006)
New Revision: 11688

Modified:
   trunk/souffleur/GPlayer.py
   trunk/souffleur/Souffleur.py
   trunk/souffleur/Subtitles.py
   trunk/souffleur/souffleur.glade
Log:
Add more fuctions to playback, fix BUG with windows formated (\r\n) sub files.

Modified: trunk/souffleur/GPlayer.py
===================================================================
--- trunk/souffleur/GPlayer.py	2006-07-02 17:07:20 UTC (rev 11687)
+++ trunk/souffleur/GPlayer.py	2006-07-02 18:29:54 UTC (rev 11688)
@@ -50,12 +50,12 @@
         if t == gst.MESSAGE_ERROR:
             err, debug = message.parse_error()
             print "Error: %s" % err, debug
-            if self.on_eos:
-                self.on_eos()
+            #if self.on_eos:
+            #    self.on_eos()
             self.playing = False
         elif t == gst.MESSAGE_EOS:
-            if self.on_eos:
-                self.on_eos()
+            #if self.on_eos:
+            #    self.on_eos()
             self.playing = False
 
     def set_location(self, location):

Modified: trunk/souffleur/Souffleur.py
===================================================================
--- trunk/souffleur/Souffleur.py	2006-07-02 17:07:20 UTC (rev 11687)
+++ trunk/souffleur/Souffleur.py	2006-07-02 18:29:54 UTC (rev 11688)
@@ -61,7 +61,9 @@
         
         self.Subtitle = None
         self.curSub = -1
-        
+        self.scroll = 0
+        self.videoWidgetGst=None
+        self.player=None
         #self.videoWidget=VideoWidget();
         #gtk.glade.set_custom_handler(self.videoWidget, VideoWidget())
 
@@ -78,7 +80,14 @@
         #	"gtk_main_quit" : (gtk.mainquit) }
         dic = { "gtk_main_quit" : (gtk.main_quit),\
             "on_main_file_quit_activate": (gtk.main_quit), \
-            "on_main_file_open_activate": self.mainFileOpen}
+            "on_main_file_open_activate": self.mainFileOpen, \
+            "on_TOOL_PLAY_clicked": self.playerPlay,\
+            "on_TOOL_PAUSE_clicked": self.playerPause,\
+            "on_TOOL_STOP_clicked": self.playerStop,\
+            "on_MEDIA_ADJUSTMENT_button_press_event": self.buttonPressAdjustment,\
+            "on_MEDIA_ADJUSTMENT_button_release_event": self.buttonReleaseAdjustment,\
+            "on_MEDIA_ADJUSTMENT_change_value": self.changeValueAdjustment,\
+            "on_VIDEO_OUT_PUT_expose_event": self.exposeEventVideoOut}
         self.wTree.signal_autoconnect (dic)
         
         self.windowFileOpen=None
@@ -99,6 +108,36 @@
         self.SubEdit = self.wTree.get_widget("VIEW_SUB")
         return
 #==============================================================================
+    def exposeEventVideoOut(self, widget, event):
+        if self.videoWidgetGst:
+            self.videoWidgetGst.do_expose_event(event)
+#==============================================================================
+    def changeValueAdjustment(self, widget, t1, t2):
+        if (not self.scroll):
+            real = long(self.adjustment.get_value() * self.p_duration / 100) # in ns
+            self.player.seek(real)
+            # allow for a preroll
+            self.player.get_state(timeout=50*gst.MSECOND) # 50 ms
+
+#==============================================================================
+    def buttonReleaseAdjustment(self, widget, event):
+        self.scroll=0
+#==============================================================================
+    def buttonPressAdjustment(self, widget, event):
+        self.scroll=1
+#==============================================================================
+    def playerStop(self, widget):
+        if self.player:
+            self.player.stop()
+#==============================================================================
+    def playerPause(self, widget):
+        if self.player:
+            self.player.pause()
+#==============================================================================
+    def playerPlay(self, widget):
+        if self.player:
+            self.player.play()
+#==============================================================================
     def mainFileOpen(self, widget):
         if(self.windowFileOpen==None):
             self.windowFileOpen=gtk.glade.XML (self.gladefile,"OPEN_OGG")
@@ -204,7 +243,7 @@
                     BUF.set_text("")
                     self.SubEdit.set_buffer(BUF)
                     self.curSub=-1
-        if self.p_position != gst.CLOCK_TIME_NONE:
+        if (self.p_position != gst.CLOCK_TIME_NONE) and (not self.scroll):
             value = self.p_position * 100.0 / self.p_duration
             self.adjustment.set_value(value)
             #if not had_duration:

Modified: trunk/souffleur/Subtitles.py
===================================================================
--- trunk/souffleur/Subtitles.py	2006-07-02 17:07:20 UTC (rev 11687)
+++ trunk/souffleur/Subtitles.py	2006-07-02 18:29:54 UTC (rev 11688)
@@ -33,12 +33,15 @@
         DATA=os.read(FILE,FS.st_size)
         os.close(FILE)
 
-        self._subLoadFromString(DATA)
+        self._subSRTLoadFromString(DATA)
 
         self.subSource=fileName
 
-    def _subLoadFromString(self, DATA):
-        DATA=string.split(DATA,"\n")
+    def _subSRTLoadFromString(self, DATA):
+        if (string.find(DATA, "\r\n")==-1):
+            DATA=string.split(DATA,"\n")
+        else:
+            DATA=string.split(DATA,"\r\n")
         i=0
         while(i<len(DATA)):
             #i=i+1

Modified: trunk/souffleur/souffleur.glade
===================================================================
--- trunk/souffleur/souffleur.glade	2006-07-02 17:07:20 UTC (rev 11687)
+++ trunk/souffleur/souffleur.glade	2006-07-02 18:29:54 UTC (rev 11688)
@@ -183,441 +183,359 @@
       </child>
 
       <child>
-	<widget class="GtkDrawingArea" id="VIDEO_OUT_PUT">
-	  <property name="width_request">640</property>
-	  <property name="height_request">320</property>
+	<widget class="GtkVPaned" id="vpaned1">
 	  <property name="visible">True</property>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
+	  <property name="can_focus">True</property>
+	  <property name="position">0</property>
 
-      <child>
-	<widget class="GtkDrawingArea" id="AUDIO_GPAPH">
-	  <property name="height_request">64</property>
-	  <property name="visible">True</property>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkToolbar" id="SUB_TOOLS">
-	  <property name="visible">True</property>
-	  <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
-	  <property name="toolbar_style">GTK_TOOLBAR_ICONS</property>
-	  <property name="tooltips">True</property>
-	  <property name="show_arrow">True</property>
-
 	  <child>
-	    <widget class="GtkToolButton" id="TOOL_PREV">
+	    <widget class="GtkVBox" id="vbox8">
+	      <property name="width_request">640</property>
 	      <property name="visible">True</property>
-	      <property name="stock_id">gtk-media-previous</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	      <property name="is_important">False</property>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">True</property>
-	    </packing>
-	  </child>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">0</property>
 
-	  <child>
-	    <widget class="GtkToolButton" id="TOOL_NEXT">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes"></property>
-	      <property name="use_underline">True</property>
-	      <property name="stock_id">gtk-media-next</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	      <property name="is_important">False</property>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">True</property>
-	    </packing>
-	  </child>
+	      <child>
+		<widget class="GtkDrawingArea" id="VIDEO_OUT_PUT">
+		  <property name="width_request">640</property>
+		  <property name="height_request">320</property>
+		  <property name="visible">True</property>
+		  <signal name="expose_event" handler="on_VIDEO_OUT_PUT_expose_event" last_modification_time="Sun, 02 Jul 2006 18:11:59 GMT"/>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">True</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
 
-	  <child>
-	    <widget class="GtkSeparatorToolItem" id="separatortoolitem1">
-	      <property name="visible">True</property>
-	      <property name="draw">True</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">False</property>
-	    </packing>
-	  </child>
+	      <child>
+		<widget class="GtkDrawingArea" id="AUDIO_GPAPH">
+		  <property name="height_request">64</property>
+		  <property name="visible">True</property>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
 
-	  <child>
-	    <widget class="GtkToolButton" id="TOOL_PLAY">
-	      <property name="visible">True</property>
-	      <property name="stock_id">gtk-media-play</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	      <property name="is_important">False</property>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">True</property>
-	    </packing>
-	  </child>
+	      <child>
+		<widget class="GtkToolbar" id="SUB_TOOLS">
+		  <property name="visible">True</property>
+		  <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
+		  <property name="toolbar_style">GTK_TOOLBAR_ICONS</property>
+		  <property name="tooltips">True</property>
+		  <property name="show_arrow">True</property>
 
-	  <child>
-	    <widget class="GtkToolButton" id="TOOL_PAUSE">
-	      <property name="visible">True</property>
-	      <property name="stock_id">gtk-media-pause</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	      <property name="is_important">False</property>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">True</property>
-	    </packing>
-	  </child>
+		  <child>
+		    <widget class="GtkToolButton" id="TOOL_PREV">
+		      <property name="visible">True</property>
+		      <property name="stock_id">gtk-media-previous</property>
+		      <property name="visible_horizontal">True</property>
+		      <property name="visible_vertical">True</property>
+		      <property name="is_important">False</property>
+		    </widget>
+		    <packing>
+		      <property name="expand">False</property>
+		      <property name="homogeneous">True</property>
+		    </packing>
+		  </child>
 
-	  <child>
-	    <widget class="GtkToolButton" id="TOOL_STOP">
-	      <property name="visible">True</property>
-	      <property name="stock_id">gtk-media-stop</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	      <property name="is_important">False</property>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">True</property>
-	    </packing>
-	  </child>
+		  <child>
+		    <widget class="GtkToolButton" id="TOOL_NEXT">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes"></property>
+		      <property name="use_underline">True</property>
+		      <property name="stock_id">gtk-media-next</property>
+		      <property name="visible_horizontal">True</property>
+		      <property name="visible_vertical">True</property>
+		      <property name="is_important">False</property>
+		    </widget>
+		    <packing>
+		      <property name="expand">False</property>
+		      <property name="homogeneous">True</property>
+		    </packing>
+		  </child>
 
-	  <child>
-	    <widget class="GtkSeparatorToolItem" id="separatortoolitem2">
-	      <property name="visible">True</property>
-	      <property name="draw">True</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">False</property>
-	    </packing>
-	  </child>
+		  <child>
+		    <widget class="GtkSeparatorToolItem" id="separatortoolitem1">
+		      <property name="visible">True</property>
+		      <property name="draw">True</property>
+		      <property name="visible_horizontal">True</property>
+		      <property name="visible_vertical">True</property>
+		    </widget>
+		    <packing>
+		      <property name="expand">False</property>
+		      <property name="homogeneous">False</property>
+		    </packing>
+		  </child>
 
-	  <child>
-	    <widget class="GtkToolButton" id="TOOL_FIRST">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Previous subtitle</property>
-	      <property name="use_underline">True</property>
-	      <property name="stock_id">gtk-goto-first</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	      <property name="is_important">False</property>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">True</property>
-	    </packing>
-	  </child>
+		  <child>
+		    <widget class="GtkToolButton" id="TOOL_PLAY">
+		      <property name="visible">True</property>
+		      <property name="stock_id">gtk-media-play</property>
+		      <property name="visible_horizontal">True</property>
+		      <property name="visible_vertical">True</property>
+		      <property name="is_important">False</property>
+		      <signal name="clicked" handler="on_TOOL_PLAY_clicked" last_modification_time="Sun, 02 Jul 2006 17:28:58 GMT"/>
+		    </widget>
+		    <packing>
+		      <property name="expand">False</property>
+		      <property name="homogeneous">True</property>
+		    </packing>
+		  </child>
 
-	  <child>
-	    <widget class="GtkToolButton" id="TOOL_LAST">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Next subtitle</property>
-	      <property name="use_underline">True</property>
-	      <property name="stock_id">gtk-goto-last</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	      <property name="is_important">False</property>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">True</property>
-	    </packing>
-	  </child>
+		  <child>
+		    <widget class="GtkToolButton" id="TOOL_PAUSE">
+		      <property name="visible">True</property>
+		      <property name="stock_id">gtk-media-pause</property>
+		      <property name="visible_horizontal">True</property>
+		      <property name="visible_vertical">True</property>
+		      <property name="is_important">False</property>
+		      <signal name="clicked" handler="on_TOOL_PAUSE_clicked" last_modification_time="Sun, 02 Jul 2006 17:29:05 GMT"/>
+		    </widget>
+		    <packing>
+		      <property name="expand">False</property>
+		      <property name="homogeneous">True</property>
+		    </packing>
+		  </child>
 
-	  <child>
-	    <widget class="GtkSeparatorToolItem" id="separatortoolitem3">
-	      <property name="visible">True</property>
-	      <property name="draw">True</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">False</property>
-	    </packing>
-	  </child>
+		  <child>
+		    <widget class="GtkToolButton" id="TOOL_STOP">
+		      <property name="visible">True</property>
+		      <property name="stock_id">gtk-media-stop</property>
+		      <property name="visible_horizontal">True</property>
+		      <property name="visible_vertical">True</property>
+		      <property name="is_important">False</property>
+		      <signal name="clicked" handler="on_TOOL_STOP_clicked" last_modification_time="Sun, 02 Jul 2006 17:29:10 GMT"/>
+		    </widget>
+		    <packing>
+		      <property name="expand">False</property>
+		      <property name="homogeneous">True</property>
+		    </packing>
+		  </child>
 
-	  <child>
-	    <widget class="GtkToolButton" id="TOOL_ADD">
-	      <property name="visible">True</property>
-	      <property name="stock_id">gtk-add</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	      <property name="is_important">False</property>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">True</property>
-	    </packing>
-	  </child>
+		  <child>
+		    <widget class="GtkSeparatorToolItem" id="separatortoolitem2">
+		      <property name="visible">True</property>
+		      <property name="draw">True</property>
+		      <property name="visible_horizontal">True</property>
+		      <property name="visible_vertical">True</property>
+		    </widget>
+		    <packing>
+		      <property name="expand">False</property>
+		      <property name="homogeneous">False</property>
+		    </packing>
+		  </child>
 
-	  <child>
-	    <widget class="GtkToolButton" id="TOOL_DELETE">
-	      <property name="visible">True</property>
-	      <property name="stock_id">gtk-delete</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	      <property name="is_important">False</property>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">True</property>
-	    </packing>
-	  </child>
+		  <child>
+		    <widget class="GtkToolButton" id="TOOL_FIRST">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">Previous subtitle</property>
+		      <property name="use_underline">True</property>
+		      <property name="stock_id">gtk-goto-first</property>
+		      <property name="visible_horizontal">True</property>
+		      <property name="visible_vertical">True</property>
+		      <property name="is_important">False</property>
+		    </widget>
+		    <packing>
+		      <property name="expand">False</property>
+		      <property name="homogeneous">True</property>
+		    </packing>
+		  </child>
 
-	  <child>
-	    <widget class="GtkSeparatorToolItem" id="separatortoolitem4">
-	      <property name="visible">True</property>
-	      <property name="draw">True</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">False</property>
-	    </packing>
-	  </child>
+		  <child>
+		    <widget class="GtkToolButton" id="TOOL_LAST">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">Next subtitle</property>
+		      <property name="use_underline">True</property>
+		      <property name="stock_id">gtk-goto-last</property>
+		      <property name="visible_horizontal">True</property>
+		      <property name="visible_vertical">True</property>
+		      <property name="is_important">False</property>
+		    </widget>
+		    <packing>
+		      <property name="expand">False</property>
+		      <property name="homogeneous">True</property>
+		    </packing>
+		  </child>
 
-	  <child>
-	    <widget class="GtkToolButton" id="TOOL_START">
-	      <property name="visible">True</property>
-	      <property name="tooltip" translatable="yes">Set start time of subtitle</property>
-	      <property name="label" translatable="yes">Set start time</property>
-	      <property name="use_underline">True</property>
-	      <property name="stock_id">gtk-go-up</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	      <property name="is_important">False</property>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">True</property>
-	    </packing>
-	  </child>
+		  <child>
+		    <widget class="GtkSeparatorToolItem" id="separatortoolitem3">
+		      <property name="visible">True</property>
+		      <property name="draw">True</property>
+		      <property name="visible_horizontal">True</property>
+		      <property name="visible_vertical">True</property>
+		    </widget>
+		    <packing>
+		      <property name="expand">False</property>
+		      <property name="homogeneous">False</property>
+		    </packing>
+		  </child>
 
-	  <child>
-	    <widget class="GtkToolButton" id="TOOL_END">
-	      <property name="visible">True</property>
-	      <property name="tooltip" translatable="yes">Set end time of subtitle</property>
-	      <property name="label" translatable="yes">Set end time</property>
-	      <property name="use_underline">True</property>
-	      <property name="stock_id">gtk-go-down</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	      <property name="is_important">False</property>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">True</property>
-	    </packing>
-	  </child>
+		  <child>
+		    <widget class="GtkToolButton" id="TOOL_ADD">
+		      <property name="visible">True</property>
+		      <property name="stock_id">gtk-add</property>
+		      <property name="visible_horizontal">True</property>
+		      <property name="visible_vertical">True</property>
+		      <property name="is_important">False</property>
+		    </widget>
+		    <packing>
+		      <property name="expand">False</property>
+		      <property name="homogeneous">True</property>
+		    </packing>
+		  </child>
 
-	  <child>
-	    <widget class="GtkSeparatorToolItem" id="separatortoolitem5">
-	      <property name="visible">True</property>
-	      <property name="draw">True</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">False</property>
-	    </packing>
-	  </child>
+		  <child>
+		    <widget class="GtkToolButton" id="TOOL_DELETE">
+		      <property name="visible">True</property>
+		      <property name="stock_id">gtk-delete</property>
+		      <property name="visible_horizontal">True</property>
+		      <property name="visible_vertical">True</property>
+		      <property name="is_important">False</property>
+		    </widget>
+		    <packing>
+		      <property name="expand">False</property>
+		      <property name="homogeneous">True</property>
+		    </packing>
+		  </child>
 
-	  <child>
-	    <widget class="GtkToolButton" id="toolbutton18">
-	      <property name="visible">True</property>
-	      <property name="stock_id">gtk-save</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	      <property name="is_important">False</property>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">True</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
+		  <child>
+		    <widget class="GtkSeparatorToolItem" id="separatortoolitem4">
+		      <property name="visible">True</property>
+		      <property name="draw">True</property>
+		      <property name="visible_horizontal">True</property>
+		      <property name="visible_vertical">True</property>
+		    </widget>
+		    <packing>
+		      <property name="expand">False</property>
+		      <property name="homogeneous">False</property>
+		    </packing>
+		  </child>
 
-      <child>
-	<widget class="GtkHScrollbar" id="MEDIA_ADJUSTMENT">
-	  <property name="visible">True</property>
-	  <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-	  <property name="inverted">False</property>
-	  <property name="adjustment">0 0 100 0.10000000149 1 1</property>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
+		  <child>
+		    <widget class="GtkToolButton" id="TOOL_START">
+		      <property name="visible">True</property>
+		      <property name="tooltip" translatable="yes">Set start time of subtitle</property>
+		      <property name="label" translatable="yes">Set start time</property>
+		      <property name="use_underline">True</property>
+		      <property name="stock_id">gtk-go-up</property>
+		      <property name="visible_horizontal">True</property>
+		      <property name="visible_vertical">True</property>
+		      <property name="is_important">False</property>
+		    </widget>
+		    <packing>
+		      <property name="expand">False</property>
+		      <property name="homogeneous">True</property>
+		    </packing>
+		  </child>
 
-      <child>
-	<widget class="GtkVBox" id="vbox5">
-	  <property name="border_width">8</property>
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">8</property>
+		  <child>
+		    <widget class="GtkToolButton" id="TOOL_END">
+		      <property name="visible">True</property>
+		      <property name="tooltip" translatable="yes">Set end time of subtitle</property>
+		      <property name="label" translatable="yes">Set end time</property>
+		      <property name="use_underline">True</property>
+		      <property name="stock_id">gtk-go-down</property>
+		      <property name="visible_horizontal">True</property>
+		      <property name="visible_vertical">True</property>
+		      <property name="is_important">False</property>
+		    </widget>
+		    <packing>
+		      <property name="expand">False</property>
+		      <property name="homogeneous">True</property>
+		    </packing>
+		  </child>
 
-	  <child>
-	    <widget class="GtkHBox" id="hbox1">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">8</property>
+		  <child>
+		    <widget class="GtkSeparatorToolItem" id="separatortoolitem5">
+		      <property name="visible">True</property>
+		      <property name="draw">True</property>
+		      <property name="visible_horizontal">True</property>
+		      <property name="visible_vertical">True</property>
+		    </widget>
+		    <packing>
+		      <property name="expand">False</property>
+		      <property name="homogeneous">False</property>
+		    </packing>
+		  </child>
 
-	      <child>
-		<widget class="GtkLabel" id="label1">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Start time (s)</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.479999989271</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">True</property>
-		  <property name="angle">0</property>
+		  <child>
+		    <widget class="GtkToolButton" id="toolbutton18">
+		      <property name="visible">True</property>
+		      <property name="stock_id">gtk-save</property>
+		      <property name="visible_horizontal">True</property>
+		      <property name="visible_vertical">True</property>
+		      <property name="is_important">False</property>
+		    </widget>
+		    <packing>
+		      <property name="expand">False</property>
+		      <property name="homogeneous">True</property>
+		    </packing>
+		  </child>
 		</widget>
 		<packing>
 		  <property name="padding">0</property>
 		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkSpinButton" id="spinbutton1">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="climb_rate">1</property>
-		  <property name="digits">0</property>
-		  <property name="numeric">False</property>
-		  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-		  <property name="snap_to_ticks">False</property>
-		  <property name="wrap">False</property>
-		  <property name="adjustment">1 0 100 1 10 10</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
 		  <property name="fill">True</property>
 		</packing>
 	      </child>
 
 	      <child>
-		<widget class="GtkLabel" id="label2">
+		<widget class="GtkHScrollbar" id="MEDIA_ADJUSTMENT">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">End time (s)</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">True</property>
-		  <property name="angle">0</property>
+		  <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
+		  <property name="inverted">False</property>
+		  <property name="adjustment">0 0 100 0.10000000149 1 1</property>
+		  <signal name="button_press_event" handler="on_MEDIA_ADJUSTMENT_button_press_event" last_modification_time="Sun, 02 Jul 2006 17:36:01 GMT"/>
+		  <signal name="button_release_event" handler="on_MEDIA_ADJUSTMENT_button_release_event" last_modification_time="Sun, 02 Jul 2006 17:36:13 GMT"/>
+		  <signal name="change_value" handler="on_MEDIA_ADJUSTMENT_change_value" last_modification_time="Sun, 02 Jul 2006 17:37:36 GMT"/>
 		</widget>
 		<packing>
 		  <property name="padding">0</property>
 		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkSpinButton" id="spinbutton2">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="climb_rate">1</property>
-		  <property name="digits">0</property>
-		  <property name="numeric">False</property>
-		  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-		  <property name="snap_to_ticks">False</property>
-		  <property name="wrap">False</property>
-		  <property name="adjustment">1 0 100 1 10 10</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
 		  <property name="fill">True</property>
 		</packing>
 	      </child>
 	    </widget>
 	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">True</property>
+	      <property name="shrink">False</property>
+	      <property name="resize">True</property>
 	    </packing>
 	  </child>
 
 	  <child>
-	    <widget class="GtkHPaned" id="hpaned1">
+	    <widget class="GtkVBox" id="vbox5">
+	      <property name="border_width">8</property>
 	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="position">0</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">8</property>
 
 	      <child>
-		<widget class="GtkVBox" id="vbox6">
-		  <property name="border_width">8</property>
+		<widget class="GtkHBox" id="hbox1">
 		  <property name="visible">True</property>
 		  <property name="homogeneous">False</property>
 		  <property name="spacing">8</property>
 
 		  <child>
-		    <widget class="GtkLabel" id="label3">
+		    <widget class="GtkLabel" id="label1">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Subtitle attributes</property>
+		      <property name="label" translatable="yes">Start time (s)</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">False</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
 		      <property name="wrap">False</property>
 		      <property name="selectable">False</property>
-		      <property name="xalign">0</property>
+		      <property name="xalign">0.479999989271</property>
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
 		      <property name="ypad">0</property>
 		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 		      <property name="width_chars">-1</property>
-		      <property name="single_line_mode">False</property>
+		      <property name="single_line_mode">True</property>
 		      <property name="angle">0</property>
 		    </widget>
 		    <packing>
@@ -628,87 +546,16 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkToolbar" id="toolbar4">
-		      <property name="width_request">120</property>
+		    <widget class="GtkSpinButton" id="spinbutton1">
 		      <property name="visible">True</property>
-		      <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
-		      <property name="toolbar_style">GTK_TOOLBAR_ICONS</property>
-		      <property name="tooltips">True</property>
-		      <property name="show_arrow">True</property>
-
-		      <child>
-			<widget class="GtkToolButton" id="TOOL_ADD_ATTR">
-			  <property name="visible">True</property>
-			  <property name="stock_id">gtk-add</property>
-			  <property name="visible_horizontal">True</property>
-			  <property name="visible_vertical">True</property>
-			  <property name="is_important">False</property>
-			</widget>
-			<packing>
-			  <property name="expand">False</property>
-			  <property name="homogeneous">True</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkToolButton" id="TOOL_MOD_ATTR">
-			  <property name="visible">True</property>
-			  <property name="stock_id">gtk-edit</property>
-			  <property name="visible_horizontal">True</property>
-			  <property name="visible_vertical">True</property>
-			  <property name="is_important">False</property>
-			</widget>
-			<packing>
-			  <property name="expand">False</property>
-			  <property name="homogeneous">True</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkToolButton" id="TOOL_DELETE_ATTR">
-			  <property name="visible">True</property>
-			  <property name="stock_id">gtk-delete</property>
-			  <property name="visible_horizontal">True</property>
-			  <property name="visible_vertical">True</property>
-			  <property name="is_important">False</property>
-			</widget>
-			<packing>
-			  <property name="expand">False</property>
-			  <property name="homogeneous">True</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkScrolledWindow" id="scrolledwindow3">
-		      <property name="width_request">120</property>
-		      <property name="visible">True</property>
 		      <property name="can_focus">True</property>
-		      <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-		      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-		      <property name="shadow_type">GTK_SHADOW_NONE</property>
-		      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-		      <child>
-			<widget class="GtkTreeView" id="LIST_ATTRS">
-			  <property name="width_request">120</property>
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="headers_visible">True</property>
-			  <property name="rules_hint">False</property>
-			  <property name="reorderable">False</property>
-			  <property name="enable_search">True</property>
-			  <property name="fixed_height_mode">True</property>
-			  <property name="hover_selection">False</property>
-			  <property name="hover_expand">False</property>
-			</widget>
-		      </child>
+		      <property name="climb_rate">1</property>
+		      <property name="digits">0</property>
+		      <property name="numeric">False</property>
+		      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+		      <property name="snap_to_ticks">False</property>
+		      <property name="wrap">False</property>
+		      <property name="adjustment">1 0 100 1 10 10</property>
 		    </widget>
 		    <packing>
 		      <property name="padding">0</property>
@@ -716,36 +563,23 @@
 		      <property name="fill">True</property>
 		    </packing>
 		  </child>
-		</widget>
-		<packing>
-		  <property name="shrink">True</property>
-		  <property name="resize">True</property>
-		</packing>
-	      </child>
 
-	      <child>
-		<widget class="GtkVBox" id="vbox7">
-		  <property name="border_width">8</property>
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">8</property>
-
 		  <child>
-		    <widget class="GtkLabel" id="label4">
+		    <widget class="GtkLabel" id="label2">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Subtitle text</property>
+		      <property name="label" translatable="yes">End time (s)</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">False</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
 		      <property name="wrap">False</property>
 		      <property name="selectable">False</property>
-		      <property name="xalign">0</property>
+		      <property name="xalign">0.5</property>
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
 		      <property name="ypad">0</property>
 		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 		      <property name="width_chars">-1</property>
-		      <property name="single_line_mode">False</property>
+		      <property name="single_line_mode">True</property>
 		      <property name="angle">0</property>
 		    </widget>
 		    <packing>
@@ -756,225 +590,423 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkToolbar" id="toolbar5">
+		    <widget class="GtkSpinButton" id="spinbutton2">
 		      <property name="visible">True</property>
-		      <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
-		      <property name="toolbar_style">GTK_TOOLBAR_ICONS</property>
-		      <property name="tooltips">True</property>
-		      <property name="show_arrow">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="climb_rate">1</property>
+		      <property name="digits">0</property>
+		      <property name="numeric">False</property>
+		      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+		      <property name="snap_to_ticks">False</property>
+		      <property name="wrap">False</property>
+		      <property name="adjustment">1 0 100 1 10 10</property>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
 
-		      <child>
-			<widget class="GtkToolButton" id="TOOL_SUB_CUT">
-			  <property name="visible">True</property>
-			  <property name="stock_id">gtk-cut</property>
-			  <property name="visible_horizontal">True</property>
-			  <property name="visible_vertical">True</property>
-			  <property name="is_important">False</property>
-			</widget>
-			<packing>
-			  <property name="expand">False</property>
-			  <property name="homogeneous">True</property>
-			</packing>
-		      </child>
+	      <child>
+		<widget class="GtkHPaned" id="hpaned1">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="position">0</property>
 
+		  <child>
+		    <widget class="GtkVBox" id="vbox6">
+		      <property name="border_width">8</property>
+		      <property name="visible">True</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">8</property>
+
 		      <child>
-			<widget class="GtkToolButton" id="TOOL_SUB_COPY">
+			<widget class="GtkLabel" id="label3">
 			  <property name="visible">True</property>
-			  <property name="stock_id">gtk-copy</property>
-			  <property name="visible_horizontal">True</property>
-			  <property name="visible_vertical">True</property>
-			  <property name="is_important">False</property>
+			  <property name="label" translatable="yes">Subtitle attributes</property>
+			  <property name="use_underline">False</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">0</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
+			  <property name="padding">0</property>
 			  <property name="expand">False</property>
-			  <property name="homogeneous">True</property>
+			  <property name="fill">False</property>
 			</packing>
 		      </child>
 
 		      <child>
-			<widget class="GtkToolButton" id="TOOL_SUB_PASTE">
+			<widget class="GtkToolbar" id="toolbar4">
+			  <property name="width_request">120</property>
 			  <property name="visible">True</property>
-			  <property name="stock_id">gtk-paste</property>
-			  <property name="visible_horizontal">True</property>
-			  <property name="visible_vertical">True</property>
-			  <property name="is_important">False</property>
-			</widget>
-			<packing>
-			  <property name="expand">False</property>
-			  <property name="homogeneous">True</property>
-			</packing>
-		      </child>
+			  <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
+			  <property name="toolbar_style">GTK_TOOLBAR_ICONS</property>
+			  <property name="tooltips">True</property>
+			  <property name="show_arrow">True</property>
 
-		      <child>
-			<widget class="GtkSeparatorToolItem" id="separatortoolitem6">
-			  <property name="visible">True</property>
-			  <property name="draw">True</property>
-			  <property name="visible_horizontal">True</property>
-			  <property name="visible_vertical">True</property>
+			  <child>
+			    <widget class="GtkToolButton" id="TOOL_ADD_ATTR">
+			      <property name="visible">True</property>
+			      <property name="stock_id">gtk-add</property>
+			      <property name="visible_horizontal">True</property>
+			      <property name="visible_vertical">True</property>
+			      <property name="is_important">False</property>
+			    </widget>
+			    <packing>
+			      <property name="expand">False</property>
+			      <property name="homogeneous">True</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkToolButton" id="TOOL_MOD_ATTR">
+			      <property name="visible">True</property>
+			      <property name="stock_id">gtk-edit</property>
+			      <property name="visible_horizontal">True</property>
+			      <property name="visible_vertical">True</property>
+			      <property name="is_important">False</property>
+			    </widget>
+			    <packing>
+			      <property name="expand">False</property>
+			      <property name="homogeneous">True</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkToolButton" id="TOOL_DELETE_ATTR">
+			      <property name="visible">True</property>
+			      <property name="stock_id">gtk-delete</property>
+			      <property name="visible_horizontal">True</property>
+			      <property name="visible_vertical">True</property>
+			      <property name="is_important">False</property>
+			    </widget>
+			    <packing>
+			      <property name="expand">False</property>
+			      <property name="homogeneous">True</property>
+			    </packing>
+			  </child>
 			</widget>
 			<packing>
+			  <property name="padding">0</property>
 			  <property name="expand">False</property>
-			  <property name="homogeneous">False</property>
+			  <property name="fill">False</property>
 			</packing>
 		      </child>
 
 		      <child>
-			<widget class="GtkToolButton" id="TOOL_SUB_UNDO">
+			<widget class="GtkScrolledWindow" id="scrolledwindow3">
+			  <property name="width_request">120</property>
 			  <property name="visible">True</property>
-			  <property name="stock_id">gtk-undo</property>
-			  <property name="visible_horizontal">True</property>
-			  <property name="visible_vertical">True</property>
-			  <property name="is_important">False</property>
-			</widget>
-			<packing>
-			  <property name="expand">False</property>
-			  <property name="homogeneous">True</property>
-			</packing>
-		      </child>
+			  <property name="can_focus">True</property>
+			  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+			  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+			  <property name="shadow_type">GTK_SHADOW_NONE</property>
+			  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
-		      <child>
-			<widget class="GtkToolButton" id="TOOL_SUB_REDO">
-			  <property name="visible">True</property>
-			  <property name="stock_id">gtk-redo</property>
-			  <property name="visible_horizontal">True</property>
-			  <property name="visible_vertical">True</property>
-			  <property name="is_important">False</property>
+			  <child>
+			    <widget class="GtkTreeView" id="LIST_ATTRS">
+			      <property name="width_request">120</property>
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="headers_visible">True</property>
+			      <property name="rules_hint">False</property>
+			      <property name="reorderable">False</property>
+			      <property name="enable_search">True</property>
+			      <property name="fixed_height_mode">True</property>
+			      <property name="hover_selection">False</property>
+			      <property name="hover_expand">False</property>
+			    </widget>
+			  </child>
 			</widget>
 			<packing>
-			  <property name="expand">False</property>
-			  <property name="homogeneous">True</property>
+			  <property name="padding">0</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
 			</packing>
 		      </child>
+		    </widget>
+		    <packing>
+		      <property name="shrink">False</property>
+		      <property name="resize">True</property>
+		    </packing>
+		  </child>
 
+		  <child>
+		    <widget class="GtkVBox" id="vbox7">
+		      <property name="border_width">8</property>
+		      <property name="visible">True</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">8</property>
+
 		      <child>
-			<widget class="GtkSeparatorToolItem" id="separatortoolitem7">
+			<widget class="GtkLabel" id="label4">
 			  <property name="visible">True</property>
-			  <property name="draw">True</property>
-			  <property name="visible_horizontal">True</property>
-			  <property name="visible_vertical">True</property>
+			  <property name="label" translatable="yes">Subtitle text</property>
+			  <property name="use_underline">False</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">0</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
+			  <property name="padding">0</property>
 			  <property name="expand">False</property>
-			  <property name="homogeneous">False</property>
+			  <property name="fill">False</property>
 			</packing>
 		      </child>
 
 		      <child>
-			<widget class="GtkToolButton" id="TOOL_SUB_BOLD">
+			<widget class="GtkToolbar" id="toolbar5">
 			  <property name="visible">True</property>
-			  <property name="stock_id">gtk-bold</property>
-			  <property name="visible_horizontal">True</property>
-			  <property name="visible_vertical">True</property>
-			  <property name="is_important">False</property>
-			</widget>
-			<packing>
-			  <property name="expand">False</property>
-			  <property name="homogeneous">True</property>
-			</packing>
-		      </child>
+			  <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
+			  <property name="toolbar_style">GTK_TOOLBAR_ICONS</property>
+			  <property name="tooltips">True</property>
+			  <property name="show_arrow">True</property>
 
-		      <child>
-			<widget class="GtkToolButton" id="TOOL_SUB_ITALIC">
-			  <property name="visible">True</property>
-			  <property name="stock_id">gtk-italic</property>
-			  <property name="visible_horizontal">True</property>
-			  <property name="visible_vertical">True</property>
-			  <property name="is_important">False</property>
+			  <child>
+			    <widget class="GtkToolButton" id="TOOL_SUB_CUT">
+			      <property name="visible">True</property>
+			      <property name="stock_id">gtk-cut</property>
+			      <property name="visible_horizontal">True</property>
+			      <property name="visible_vertical">True</property>
+			      <property name="is_important">False</property>
+			    </widget>
+			    <packing>
+			      <property name="expand">False</property>
+			      <property name="homogeneous">True</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkToolButton" id="TOOL_SUB_COPY">
+			      <property name="visible">True</property>
+			      <property name="stock_id">gtk-copy</property>
+			      <property name="visible_horizontal">True</property>
+			      <property name="visible_vertical">True</property>
+			      <property name="is_important">False</property>
+			    </widget>
+			    <packing>
+			      <property name="expand">False</property>
+			      <property name="homogeneous">True</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkToolButton" id="TOOL_SUB_PASTE">
+			      <property name="visible">True</property>
+			      <property name="stock_id">gtk-paste</property>
+			      <property name="visible_horizontal">True</property>
+			      <property name="visible_vertical">True</property>
+			      <property name="is_important">False</property>
+			    </widget>
+			    <packing>
+			      <property name="expand">False</property>
+			      <property name="homogeneous">True</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkSeparatorToolItem" id="separatortoolitem6">
+			      <property name="visible">True</property>
+			      <property name="draw">True</property>
+			      <property name="visible_horizontal">True</property>
+			      <property name="visible_vertical">True</property>
+			    </widget>
+			    <packing>
+			      <property name="expand">False</property>
+			      <property name="homogeneous">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkToolButton" id="TOOL_SUB_UNDO">
+			      <property name="visible">True</property>
+			      <property name="stock_id">gtk-undo</property>
+			      <property name="visible_horizontal">True</property>
+			      <property name="visible_vertical">True</property>
+			      <property name="is_important">False</property>
+			    </widget>
+			    <packing>
+			      <property name="expand">False</property>
+			      <property name="homogeneous">True</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkToolButton" id="TOOL_SUB_REDO">
+			      <property name="visible">True</property>
+			      <property name="stock_id">gtk-redo</property>
+			      <property name="visible_horizontal">True</property>
+			      <property name="visible_vertical">True</property>
+			      <property name="is_important">False</property>
+			    </widget>
+			    <packing>
+			      <property name="expand">False</property>
+			      <property name="homogeneous">True</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkSeparatorToolItem" id="separatortoolitem7">
+			      <property name="visible">True</property>
+			      <property name="draw">True</property>
+			      <property name="visible_horizontal">True</property>
+			      <property name="visible_vertical">True</property>
+			    </widget>
+			    <packing>
+			      <property name="expand">False</property>
+			      <property name="homogeneous">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkToolButton" id="TOOL_SUB_BOLD">
+			      <property name="visible">True</property>
+			      <property name="stock_id">gtk-bold</property>
+			      <property name="visible_horizontal">True</property>
+			      <property name="visible_vertical">True</property>
+			      <property name="is_important">False</property>
+			    </widget>
+			    <packing>
+			      <property name="expand">False</property>
+			      <property name="homogeneous">True</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkToolButton" id="TOOL_SUB_ITALIC">
+			      <property name="visible">True</property>
+			      <property name="stock_id">gtk-italic</property>
+			      <property name="visible_horizontal">True</property>
+			      <property name="visible_vertical">True</property>
+			      <property name="is_important">False</property>
+			    </widget>
+			    <packing>
+			      <property name="expand">False</property>
+			      <property name="homogeneous">True</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkToolButton" id="TOOL_SUB_UNDER">
+			      <property name="visible">True</property>
+			      <property name="stock_id">gtk-underline</property>
+			      <property name="visible_horizontal">True</property>
+			      <property name="visible_vertical">True</property>
+			      <property name="is_important">False</property>
+			    </widget>
+			    <packing>
+			      <property name="expand">False</property>
+			      <property name="homogeneous">True</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkToolButton" id="TOOL_SUB_COLOR">
+			      <property name="visible">True</property>
+			      <property name="stock_id">gtk-select-color</property>
+			      <property name="visible_horizontal">True</property>
+			      <property name="visible_vertical">True</property>
+			      <property name="is_important">False</property>
+			    </widget>
+			    <packing>
+			      <property name="expand">False</property>
+			      <property name="homogeneous">True</property>
+			    </packing>
+			  </child>
 			</widget>
 			<packing>
+			  <property name="padding">0</property>
 			  <property name="expand">False</property>
-			  <property name="homogeneous">True</property>
+			  <property name="fill">False</property>
 			</packing>
 		      </child>
 
 		      <child>
-			<widget class="GtkToolButton" id="TOOL_SUB_UNDER">
+			<widget class="GtkScrolledWindow" id="scrolledwindow4">
 			  <property name="visible">True</property>
-			  <property name="stock_id">gtk-underline</property>
-			  <property name="visible_horizontal">True</property>
-			  <property name="visible_vertical">True</property>
-			  <property name="is_important">False</property>
-			</widget>
-			<packing>
-			  <property name="expand">False</property>
-			  <property name="homogeneous">True</property>
-			</packing>
-		      </child>
+			  <property name="can_focus">True</property>
+			  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+			  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+			  <property name="shadow_type">GTK_SHADOW_NONE</property>
+			  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
-		      <child>
-			<widget class="GtkToolButton" id="TOOL_SUB_COLOR">
-			  <property name="visible">True</property>
-			  <property name="stock_id">gtk-select-color</property>
-			  <property name="visible_horizontal">True</property>
-			  <property name="visible_vertical">True</property>
-			  <property name="is_important">False</property>
+			  <child>
+			    <widget class="GtkTextView" id="VIEW_SUB">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="editable">True</property>
+			      <property name="overwrite">False</property>
+			      <property name="accepts_tab">True</property>
+			      <property name="justification">GTK_JUSTIFY_CENTER</property>
+			      <property name="wrap_mode">GTK_WRAP_WORD</property>
+			      <property name="cursor_visible">True</property>
+			      <property name="pixels_above_lines">0</property>
+			      <property name="pixels_below_lines">0</property>
+			      <property name="pixels_inside_wrap">0</property>
+			      <property name="left_margin">0</property>
+			      <property name="right_margin">0</property>
+			      <property name="indent">0</property>
+			      <property name="text" translatable="yes"></property>
+			    </widget>
+			  </child>
 			</widget>
 			<packing>
-			  <property name="expand">False</property>
-			  <property name="homogeneous">True</property>
+			  <property name="padding">0</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
 			</packing>
 		      </child>
 		    </widget>
 		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
+		      <property name="shrink">True</property>
+		      <property name="resize">True</property>
 		    </packing>
 		  </child>
-
-		  <child>
-		    <widget class="GtkScrolledWindow" id="scrolledwindow4">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-		      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-		      <property name="shadow_type">GTK_SHADOW_NONE</property>
-		      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-		      <child>
-			<widget class="GtkTextView" id="VIEW_SUB">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="editable">True</property>
-			  <property name="overwrite">False</property>
-			  <property name="accepts_tab">True</property>
-			  <property name="justification">GTK_JUSTIFY_CENTER</property>
-			  <property name="wrap_mode">GTK_WRAP_WORD</property>
-			  <property name="cursor_visible">True</property>
-			  <property name="pixels_above_lines">0</property>
-			  <property name="pixels_below_lines">0</property>
-			  <property name="pixels_inside_wrap">0</property>
-			  <property name="left_margin">0</property>
-			  <property name="right_margin">0</property>
-			  <property name="indent">0</property>
-			  <property name="text" translatable="yes"></property>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
 		</widget>
 		<packing>
-		  <property name="shrink">True</property>
-		  <property name="resize">True</property>
+		  <property name="padding">8</property>
+		  <property name="expand">True</property>
+		  <property name="fill">True</property>
 		</packing>
 	      </child>
 	    </widget>
 	    <packing>
-	      <property name="padding">8</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
+	      <property name="shrink">True</property>
+	      <property name="resize">True</property>
 	    </packing>
 	  </child>
 	</widget>
 	<packing>
 	  <property name="padding">0</property>
 	  <property name="expand">True</property>
-	  <property name="fill">True</property>
+	  <property name="fill">False</property>
 	</packing>
       </child>
     </widget>



More information about the commits mailing list