preferences: Move document templates to its own tab.

Author: mtwebster

gresources/nemo-file-management-properties.glade

@@ -4317,6 +4317,35 @@ along with .  If not, see <http://www.gnu.org/licenses/>.
                     <property name="position">6</property>
                   </packing>
                 </child>
+                <child>
+                  <object class="GtkScrolledWindow">
+                    <property name="visible">True</property>
+                    <property name="can-focus">True</property>
+                    <child>
+                      <object class="GtkViewport">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <child>
+                          <object class="GtkBox" id="templates_box">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="border-width">4</property>
+                            <property name="orientation">vertical</property>
+                            <child>
+                              <placeholder/>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="name">templates</property>
+                    <property name="title" translatable="yes">Document Templates</property>
+                    <property name="icon-name">xsi-folder-templates-symbolic</property>
+                    <property name="position">7</property>
+                  </packing>
+                </child>
                 <child>
                   <object class="GtkScrolledWindow" id="scrolledwindow7">
                     <property name="visible">True</property>
@@ -4342,14 +4371,14 @@ along with .  If not, see <http://www.gnu.org/licenses/>.
                     <property name="name">plugins</property>
                     <property name="title" translatable="yes">Plugins</property>
                     <property name="icon-name">xapp-prefs-plugins-symbolic</property>
-                    <property name="position">7</property>
+                    <property name="position">8</property>
                   </packing>
                 </child>
               </object>
               <packing>
                 <property name="expand">True</property>
                 <property name="fill">True</property>
-                <property name="position">1</property>
+                <property name="position">2</property>
               </packing>
             </child>
           </object>

src/nemo-file-management-properties.c

@@ -41,6 +41,7 @@
 #include <libnemo-private/nemo-module.h>
 
 #include "nemo-plugin-manager.h"
+#include "nemo-template-config-widget.h"
 #include "nemo-actions.h"
 
 /* string enum preferences */
@@ -474,6 +475,18 @@ nemo_file_management_properties_dialog_setup_plugin_page (GtkBuilder *builder)
                         TRUE, TRUE, 0);
 }
 
+static void
+nemo_file_management_properties_dialog_setup_templates_page (GtkBuilder *builder)
+{
+    GtkWidget *box;
+
+    box = GTK_WIDGET (gtk_builder_get_object (builder, "templates_box"));
+
+    gtk_box_pack_start (GTK_BOX (box),
+                        GTK_WIDGET (nemo_template_config_widget_new ()),
+                        TRUE, TRUE, 0);
+}
+
 static void
 create_date_format_menu (GtkBuilder *builder)
 {
@@ -1130,6 +1143,8 @@ nemo_file_management_properties_dialog_setup (GtkBuilder  *builder,
 	nemo_file_management_properties_dialog_setup_icon_caption_page (builder);
 	nemo_file_management_properties_dialog_setup_list_column_page (builder);
     nemo_file_management_properties_dialog_setup_plugin_page (builder);
+    nemo_file_management_properties_dialog_setup_templates_page (builder);
+
 
     setup_configurable_menu_items (builder);
 

src/nemo-plugin-manager.c

@@ -39,14 +39,11 @@ nemo_plugin_manager_init (NemoPluginManager *self)
     gtk_grid_set_row_homogeneous (GTK_GRID (grid), TRUE);
     gtk_grid_set_column_homogeneous (GTK_GRID (grid), TRUE);
 
-    widget = nemo_template_config_widget_new ();
-    gtk_grid_attach (GTK_GRID (grid), widget, 0, 0, 2, 1);
-
     widget = nemo_action_config_widget_new ();
-    gtk_grid_attach (GTK_GRID (grid), widget, 0, 1, 2, 1);
+    gtk_grid_attach (GTK_GRID (grid), widget, 0, 0, 2, 1);
 
     widget = nemo_extension_config_widget_new ();
-    gtk_grid_attach (GTK_GRID (grid), widget, 0, 2, 2, 1);
+    gtk_grid_attach (GTK_GRID (grid), widget, 0, 1, 2, 1);
 
     gtk_container_add (GTK_CONTAINER (self), grid);
 

src/nemo-template-config-widget.c

@@ -578,7 +578,7 @@ nemo_template_config_widget_init (NemoTemplateConfigWidget *self)
     gtk_list_box_set_selection_mode (GTK_LIST_BOX (NEMO_CONFIG_BASE_WIDGET (self)->listbox), GTK_SELECTION_SINGLE);
     gtk_list_box_set_activate_on_single_click (GTK_LIST_BOX (NEMO_CONFIG_BASE_WIDGET (self)->listbox), FALSE);
 
-    gchar *title = g_strdup (_("New Document templates"));
+    gchar *title = g_strdup (_("Templates"));
     gchar *markup = g_strdup_printf ("<b>%s</b>", title);
 
     gtk_label_set_markup (GTK_LABEL (label), markup);
@@ -627,7 +627,7 @@ nemo_template_config_widget_init (NemoTemplateConfigWidget *self)
     g_signal_connect (widget, "clicked", G_CALLBACK (on_rename_row_clicked), self);
     self->rename_button = widget;
 
-    widget = gtk_button_new_with_label (_("Edit"));
+    widget = gtk_button_new_with_label (_("Edit content"));
     gtk_widget_set_tooltip_text (widget, _("Modify the selected template's contents"));
 
     gtk_box_pack_start (GTK_BOX (bb),