Merge chapters plugin with a master branch

New chapters plugin
Add option to preferences to auto-load external chapters

2 files changed, 109 insertions, 0 deletions

diff --git a/data/totem.schemas.in b/data/totem.schemas.in
index 409042ebd..342c332a4 100644
--- a/data/totem.schemas.in
+++ b/data/totem.schemas.in
@@ -304,6 +304,20 @@
       </schema>
 
       <schema>
+        <key>/schemas/apps/totem/autoload_chapters</key>
+	<applyto>/apps/totem/autoload_chapters</applyto>
+	<owner>totem</owner>
+	<type>bool</type>
+	<default>true</default>
+	<locale name="C">
+	  <short>Whether to autoload external chapter files when a movie is loaded</short>
+	  <long>
+	    Whether to autoload external chapter files when a movie is loaded.
+	  </long>
+	</locale>
+      </schema>
+
+      <schema>
         <key>/schemas/apps/totem/remember_position</key>
 	<applyto>/apps/totem/remember_position</applyto>
 	<owner>totem</owner>
diff --git a/data/totem.ui b/data/totem.ui
index dfcbaa69d..587aa3150 100644
--- a/data/totem.ui
+++ b/data/totem.ui
@@ -1109,6 +1109,101 @@
 		  <property name="fill">True</property>
 		</packing>
 	      </child>
+
+	      <child>
+		<object class="GtkVBox" id="vbox7">
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">6</property>
+                  <property name="orientation">vertical</property>
+
+		  <child>
+		    <object class="GtkLabel" id="tpw_ext_chapters_label">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">External Chapters</property>
+		      <property name="use_underline">False</property>
+		      <property name="use_markup">True</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>
+		      <attributes>
+		        <attribute name="weight" value="bold"/>
+                      </attributes>
+		    </object>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <object class="GtkAlignment" id="alignment3_2">
+		      <property name="visible">True</property>
+		      <property name="xalign">0.5</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xscale">1</property>
+		      <property name="yscale">1</property>
+		      <property name="top_padding">0</property>
+		      <property name="bottom_padding">0</property>
+		      <property name="left_padding">12</property>
+		      <property name="right_padding">0</property>
+
+		      <child>
+			<object class="GtkTable" id="table3_2">
+			  <property name="visible">True</property>
+			  <property name="n_rows">1</property>
+			  <property name="n_columns">2</property>
+			  <property name="homogeneous">False</property>
+			  <property name="row_spacing">6</property>
+			  <property name="column_spacing">12</property>
+
+			  <child>
+			    <object class="GtkCheckButton" id="tpw_auto_chapters_checkbutton">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">Load _chapter files when movie is loaded</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			      <property name="active">False</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+			      <signal name="toggled" handler="auto_chapters_toggled_cb"/>
+		            </object>
+			    <packing>
+			      <property name="left_attach">0</property>
+			      <property name="right_attach">2</property>
+			      <property name="top_attach">0</property>
+			      <property name="bottom_attach">1</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options"/>
+		            </packing>
+		          </child>
+			</object>
+		      </child>
+		    </object>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+		</object>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
 	    </object>
 	    <packing>
 	      <property name="tab_expand">False</property>