Bring folder manager plugin into core (elementary#350)

Timecraft · Mar 15, 2018 · 2e97091 · 2e97091
1 parent 9a1b77c
commit 2e97091
Show file tree

Hide file tree

Showing 20 changed files with 83 additions and 226 deletions.
diff --git a/data/io.elementary.code.gschema.xml b/data/io.elementary.code.gschema.xml
@@ -162,4 +162,11 @@
 			<description>Set the preferred policy.</description>
 		</key>
 	</schema>
+    <schema path="/io/elementary/code/folder-manager/" id="io.elementary.code.folder-manager">
+        <key name="opened-folders" type="as">
+            <default>[]</default>
+            <summary>Opened folders.</summary>
+            <description>Opened folders that should be restored in startup.</description>
+        </key>
+    </schema>
 </schemalist>
diff --git a/data/io.elementary.code.plugins.folder-manager.gschema.xml b/data/io.elementary.code.plugins.folder-manager.gschema.xml
diff --git a/data/meson.build b/data/meson.build
@@ -13,7 +13,6 @@ endforeach
 
 install_data(
     'io.elementary.code.gschema.xml',
-    'io.elementary.code.plugins.folder-manager.gschema.xml',
     'io.elementary.code.plugins.spell.gschema.xml',
     'io.elementary.code.plugins.terminal.gschema.xml',
     install_dir: join_paths(get_option('prefix'), get_option('datadir'), 'glib-2.0', 'schemas')

diff --git a/plugins/folder-manager/FolderManagerPlugin.vala b/plugins/folder-manager/FolderManagerPlugin.vala
diff --git a/plugins/folder-manager/Settings.vala b/plugins/folder-manager/Settings.vala
diff --git a/plugins/folder-manager/folder-manager.plugin b/plugins/folder-manager/folder-manager.plugin
diff --git a/plugins/folder-manager/meson.build b/plugins/folder-manager/meson.build
diff --git a/plugins/meson.build b/plugins/meson.build
@@ -4,7 +4,6 @@ subdir('brackets-completion')
 subdir('browser-preview')
 subdir('contractor')
 subdir('detect-indent')
-subdir('folder-manager')
 subdir('highlight-word-selection')
 subdir('open-with')
 subdir('outline')

diff --git a/po/plugins/POTFILES b/po/plugins/POTFILES
@@ -2,7 +2,6 @@ plugins/brackets-completion/brackets-completion.plugin
 plugins/browser-preview/browser-preview.plugin
 plugins/contractor/contractor.plugin
 plugins/detect-indent/detect-indent.plugin
-plugins/folder-manager/folder-manager.plugin
 plugins/highlight-word-selection/highlight-word-selection.plugin
 plugins/open-with/open-with.plugin
 plugins/outline/outline.plugin

diff --git a/plugins/folder-manager/File.vala → src/FolderManager/File.vala b/plugins/folder-manager/File.vala → src/FolderManager/File.vala
@@ -18,7 +18,7 @@
  * Authored by: Julien Spautz <[email protected]>, Andrei-Costin Zisu <[email protected]>
  */
 
-namespace Scratch.Plugins.FolderManager {
+namespace Scratch.FolderManager {
 
     /**
      * Class for easily dealing with files.

diff --git a/plugins/folder-manager/FileItem.vala → src/FolderManager/FileItem.vala b/plugins/folder-manager/FileItem.vala → src/FolderManager/FileItem.vala
@@ -18,7 +18,7 @@
  * Authored by: Julien Spautz <[email protected]>, Andrei-Costin Zisu <[email protected]>
  */
 
-namespace Scratch.Plugins.FolderManager {
+namespace Scratch.FolderManager {
     /**
      * Normal item in the source list, represents a textfile.
      */

diff --git a/plugins/folder-manager/FileView.vala → src/FolderManager/FileView.vala b/plugins/folder-manager/FileView.vala → src/FolderManager/FileView.vala
@@ -18,12 +18,12 @@
  * Authored by: Julien Spautz <[email protected]>, Andrei-Costin Zisu <[email protected]>
  */
 
-namespace Scratch.Plugins.FolderManager {
+namespace Scratch.FolderManager {
     /**
      * SourceList that displays folders and their contents.
      */
     internal class FileView : Granite.Widgets.SourceList, Code.PaneSwitcher {
-        private Settings settings;
+        private FolderManagerSettings settings;
 
         public signal void select (string file);
 
@@ -40,7 +40,7 @@ namespace Scratch.Plugins.FolderManager {
 
             item_selected.connect (on_item_selected);
 
-            settings = new Settings ();
+            settings = new FolderManagerSettings ();
         }
 
         private void on_item_selected (Granite.Widgets.SourceList.Item? item) {

diff --git a/plugins/folder-manager/FolderItem.vala → src/FolderManager/FolderItem.vala b/plugins/folder-manager/FolderItem.vala → src/FolderManager/FolderItem.vala
@@ -18,7 +18,7 @@
  * Authored by: Julien Spautz <[email protected]>, Andrei-Costin Zisu <[email protected]>
  */
 
-namespace Scratch.Plugins.FolderManager {
+namespace Scratch.FolderManager {
     /**
      * Expandable item in the source list, represents a folder.
      * Monitored for changes inside the directory.

diff --git a/plugins/folder-manager/Item.vala → src/FolderManager/Item.vala b/plugins/folder-manager/Item.vala → src/FolderManager/Item.vala
@@ -18,7 +18,7 @@
  * Authored by: Julien Spautz <[email protected]>, Andrei-Costin Zisu <[email protected]>
  */
 
-namespace Scratch.Plugins.FolderManager {
+namespace Scratch.FolderManager {
     /**
      * Common abstract class for file and folder items.
      */

diff --git a/plugins/folder-manager/MainFolderItem.vala → src/FolderManager/MainFolderItem.vala b/plugins/folder-manager/MainFolderItem.vala → src/FolderManager/MainFolderItem.vala
@@ -18,7 +18,7 @@
  * Authored by: Julien Spautz <[email protected]>, Andrei-Costin Zisu <[email protected]>
  */
 
-namespace Scratch.Plugins.FolderManager {
+namespace Scratch.FolderManager {
     internal class MainFolderItem : FolderItem {
         public signal void closed ();