[totem/wip/hadess/remove-chapters] main: Remove mention of chapters plugin



commit b52f4f34e61a6dc254aff8dc408353b7ed294f84
Author: Bastien Nocera <hadess hadess net>
Date:   Sat Feb 23 11:52:18 2019 +0100

    main: Remove mention of chapters plugin
    
    The "autoload chapters" setting doesn't do anything since the chapters
    plugin was first disabled with the UI redesign in GNOME 3.12, and then
    removed.

 data/org.gnome.totem.gschema.xml.in |  4 --
 data/preferences.ui                 | 91 -------------------------------------
 data/totem.convert                  |  1 -
 docs/reference/meson.build          |  2 -
 help/C/preferences.page             |  5 --
 src/totem-preferences.c             |  4 --
 6 files changed, 107 deletions(-)
---
diff --git a/data/org.gnome.totem.gschema.xml.in b/data/org.gnome.totem.gschema.xml.in
index fccb4e45e..d2d0f221b 100644
--- a/data/org.gnome.totem.gschema.xml.in
+++ b/data/org.gnome.totem.gschema.xml.in
@@ -72,10 +72,6 @@
                        <default>false</default>
                        <summary>Whether to autoload text subtitle files when a movie is loaded</summary>
                </key>
-               <key name="autoload-chapters" type="b">
-                       <default>true</default>
-                       <summary>Whether to autoload external chapter files when a movie is loaded</summary>
-               </key>
                <key name="active-plugins" type="as">
                        
<default>['skipto','chapters','screenshot','media_player_keys','screensaver','movie-properties','save-file']</default>
                        <summary>Active plugins list</summary>
diff --git a/data/preferences.ui b/data/preferences.ui
index 2ed037c62..487c374ef 100644
--- a/data/preferences.ui
+++ b/data/preferences.ui
@@ -299,97 +299,6 @@
                </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="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>
-                           </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">False</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>
               <child>
                 <object class="GtkVBox" id="vbox3">
                   <property name="visible">True</property>
diff --git a/data/totem.convert b/data/totem.convert
index 586e26533..967389448 100644
--- a/data/totem.convert
+++ b/data/totem.convert
@@ -14,4 +14,3 @@ screenshot-save-uri = /apps/totem/screenshot_save_path
 disable-user-plugins = /apps/totem/disable_user_plugins
 disable-keyboard-shortcuts = /apps/totem/disable_keyboard_shortcuts
 autoload-subtitles = /apps/totem/autoload_subtitles
-autoload-chapters = /apps/totem/autoload_chapters
diff --git a/docs/reference/meson.build b/docs/reference/meson.build
index 1776eaa0c..b2b79058f 100644
--- a/docs/reference/meson.build
+++ b/docs/reference/meson.build
@@ -18,8 +18,6 @@ private_headers = [
   'icon-helpers.h',
   'screenshot-filename-builder.h',
   'totem-aspect-frame.h',
-  'totem-chapters-utils.h',
-  'totem-cmml-parser.h',
   'totem-dnd-menu.h',
   'totem-dvb-setup.h',
   'totem-edit-chapter.h',
diff --git a/help/C/preferences.page b/help/C/preferences.page
index bc107d8eb..59c566afb 100644
--- a/help/C/preferences.page
+++ b/help/C/preferences.page
@@ -51,11 +51,6 @@
               </item>
             </list>
         </item>
-        <item>
-          <title><gui>External Chapters</gui></title>
-          <p><app>Videos</app> allows you to load chapter files when the movie is
-          loaded. Do it by ticking this option.</p>
-        </item>
         <item>
           <title><gui>Plugins</gui></title>
           <p>Plugins offer extra featured and extend functionality. You can view
diff --git a/src/totem-preferences.c b/src/totem-preferences.c
index f4ef108b2..d5926e5eb 100644
--- a/src/totem-preferences.c
+++ b/src/totem-preferences.c
@@ -253,10 +253,6 @@ totem_setup_preferences (Totem *totem)
        item = POBJ ("tpw_auto_subtitles_checkbutton");
        g_settings_bind (totem->settings, "autoload-subtitles", item, "active", G_SETTINGS_BIND_DEFAULT);
 
-       /* Auto-load external chapters */
-       item = POBJ ("tpw_auto_chapters_checkbutton");
-       g_settings_bind (totem->settings, "autoload-chapters", item, "active", G_SETTINGS_BIND_DEFAULT);
-
        /* Plugins button */
        item = POBJ ("tpw_plugins_button");
        g_signal_connect (G_OBJECT (item), "clicked",


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]