Merge lp:~philip.scott/pantheon-notes/open-with into lp:pantheon-notes

[Felipe Escoto]

open-with support

[Zisu Andrei (matzipan)]

Some feedback. I can't see anything obviously wrong. Haven't build it.

[Zisu Andrei (matzipan)]

Built it and ran it, and I couldn't find any "Open with" menu entry.

review: Needs Fixing

Unmerged revisions

10. By Felipe Escoto on 2016-03-22

Open-with support

9. By Felipe Escoto on 2016-03-15

working with CMD args

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-03-06 22:25:43 +0000
+++ CMakeLists.txt	2016-03-22 22:02:29 +0000
@@ -69,7 +69,6 @@
 include(ValaPrecompile)
 
 vala_precompile(VALA_C
-  src/Main.vala
   src/Application.vala
   src/Services/FileManager.vala
   src/Services/Notebook.vala

=== modified file 'data/pantheon-notes.desktop'
--- data/pantheon-notes.desktop	2016-03-06 22:25:43 +0000
+++ data/pantheon-notes.desktop	2016-03-22 22:02:29 +0000
@@ -2,8 +2,9 @@
 Encoding=UTF-8
 Name=Notes
 Comment=Simple note taking
-Exec=/usr/bin/pantheon-notes
+Exec=/usr/bin/pantheon-notes %U
 Icon=pantheon-notes
+MimeType=text/plain;
 Terminal=false
 Type=Application
 StartupNotify=true

=== modified file 'src/Application.vala'
--- src/Application.vala	2016-03-07 12:11:58 +0000
+++ src/Application.vala	2016-03-22 22:02:29 +0000
@@ -1,26 +1,69 @@
 
 namespace Notes {
-    public Notes.PagesList pages_list;
-    public Notes.Editor editor;
-    public Notes.Services.Settings settings;
-    public Notes.Window window;
     public string NOTES_DIR;
+    public static const string APP_NAME = "Notes";
+    public static const string CODE_NAME = "pantheon-notes";
 }
 
 public class Notes.Application : Granite.Application {
+    private Notes.Window window;
+
     public const string PROGRAM_NAME = N_("Notes");
     public const string COMMENT = N_("Simple notes editing");
     public const string ABOUT_STOCK = N_("About Notes");
 
     public bool running = false;
 
+    public static int main (string[] args) {
+        Application app = Application.instance;
+        return app.run (args);
+    }
+
+    construct {
+        flags |= ApplicationFlags.HANDLES_OPEN;
+
+        program_name = APP_NAME;
+        exec_name = "pantheon-notes";
+        app_years = "2011-2015";
+        app_icon = "accessories-notes";
+        app_launcher = "pantheon-notes.desktop";
+        application_id = "org.elementary." + CODE_NAME.down ();
+        main_url = "https://launchpad.net/pantheon-notes";
+        bug_url = "https://bugs.launchpad.net/pantheon-notes";
+        help_url = "https://elementary.io/help/pantheon-notes";
+        translate_url = "https://translations.launchpad.net/pantheon-notes";
+        about_authors = { "Felipe Escoto <[e-mail]>", null};
+        about_documenters = { "",null };
+        about_artists = { "", null};
+        about_translators = _("translator-credits");
+        about_license_type = Gtk.License.GPL_3_0;
+    }
+
     public Application () {
-        Object (application_id: "org.pantheon-notes");
+        Intl.setlocale (LocaleCategory.ALL, Intl.get_language_names ()[0]);
+        Environment.set_application_name (APP_NAME);
+        Environment.set_prgname (APP_NAME);
+    }
+
+    public static Application _instance = null;
+
+    public static Application instance {
+        get {
+            if (_instance == null)
+                _instance = new Application ();
+            return _instance;
+        }
     }
 
     public override void activate () {
+        this.hold ();
+        app_window ();
+        this.release ();
+    }
+
+    private void app_window () {
         if (!running) {
-            settings = new Notes.Services.Settings ();
+            var settings = new Notes.Services.Settings ();
 
             if (settings.notes_location == "") {
                 settings.notes_location = Path.build_filename (Environment.get_user_data_dir (), CODE_NAME);
@@ -36,4 +79,16 @@
 
         window.show_app ();
     }
+
+    private void file_window (File file) {
+        var window = new Notes.Window.with_file (this, file);
+        window.show_app ();
+    }
+
+    //the application was requested to open some files
+    public override void open (File[] files, string hint) {
+        foreach (File file in files) {
+            file_window (file);
+        }
+    }
 }

=== modified file 'src/Main.vala'
--- src/Main.vala	2016-03-07 12:10:23 +0000
+++ src/Main.vala	2016-03-22 22:02:29 +0000
@@ -14,20 +14,3 @@
     with this program. If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-public static const string APP_NAME = "Notes";
-public static const string CODE_NAME = "pantheon-notes";
-
-public static int main (string[] args) {
-    /* Initiliaze gettext support */
-    Intl.setlocale (LocaleCategory.ALL, Intl.get_language_names ()[0]);
-    //Intl.textdomain (Config.GETTEXT_PACKAGE);
-
-    Environment.set_application_name (APP_NAME);
-    Environment.set_prgname (CODE_NAME);
-
-    var application = new Notes.Application ();
-
-    return application.run (args);
-}
-
-

=== modified file 'src/Services/Page.vala'
--- src/Services/Page.vala	2016-03-06 21:56:56 +0000
+++ src/Services/Page.vala	2016-03-22 22:02:29 +0000
@@ -28,6 +28,16 @@
 		load_subtitle (load_text ());
 	}
 
+	public Page.from_file (File file) {
+	    this.file = file;
+        if (!file.query_exists ()) {
+			new_page = true;
+		}
+
+		this.path = file.get_path ();
+        this.name = file.get_basename ();
+	}
+
 	private void load_subtitle (string data) {
         setup ();
         string line[2];
@@ -71,7 +81,7 @@
             return;
         }
 
-        string file_name = make_filename ();
+        string file_name = make_filename (data);
 
         try {
 		    if (file.query_exists ()) {
@@ -111,11 +121,15 @@
     	return output;
     }
 
-    private string make_filename () {
-        string file_name = editor.get_text ().split ("\n", 2)[0];
-        file_name = file_name.replace ("#", "").replace ("\n", "");
+    private string make_filename (string page_contents) {
+        string file_name = "";
+        if (ID != -1) {
+            file_name = page_contents.split ("\n", 2)[0];
+            file_name = file_name.replace ("#", "").replace ("\n", "");
+            file_name = ID.to_string () + "§" + file_name;
+        }
 
-        return ID.to_string () + "§" + file_name;
+        return file_name;
     }
 
     private void setup () {

=== modified file 'src/Widgets/Editor.vala'
--- src/Widgets/Editor.vala	2016-03-07 12:10:23 +0000
+++ src/Widgets/Editor.vala	2016-03-22 22:02:29 +0000
@@ -1,4 +1,5 @@
 public class Notes.Editor : Gtk.Box {
+    private Notes.Window window;
     private Gtk.SourceView code_view;
     private Gtk.SourceBuffer code_buffer;
 
@@ -6,18 +7,22 @@
 
     public Notes.Page current_page = null;
 
-    public Editor () {
+    public Editor (Notes.Window window) {
+        this.window = window;
+
         build_ui ();
         reset (true);
         load_settings ();
     }
 
     public void load_file (Notes.Page page) {
+        window.set_title (page.name);
+
         code_buffer.begin_not_undoable_action ();
 
         save_file ();
 
-	    current_page = page;
+        current_page = page;
         code_buffer.text = page.load_text ();
 
         code_buffer.end_not_undoable_action ();
@@ -58,7 +63,7 @@
         if (disable_save) {
             edited = false;
         }
-        
+
         code_buffer.text = "";
     }
 
@@ -71,8 +76,8 @@
     }
 
     public void load_settings () {
-        set_scheme (settings.editor_scheme);
-        set_font (settings.editor_font);
+        set_scheme (window.settings.editor_scheme);
+        set_font (window.settings.editor_font);
     }
 
     public void set_font (string name) {
@@ -91,8 +96,6 @@
     }
 
     private void build_ui () {
-        var manager = Gtk.SourceLanguageManager.get_default ();
-        var language = manager.guess_language (null, "text/x-markdown");
         code_buffer = new Gtk.SourceBuffer (null);
         code_buffer.set_max_undo_levels (100);
 
@@ -108,13 +111,13 @@
         code_view.wrap_mode = Gtk.WrapMode.WORD;
         code_view.show_line_numbers = false;
 
-	    var scroll_box = new Gtk.ScrolledWindow (null, null);
-	    scroll_box.add (code_view);
+        var scroll_box = new Gtk.ScrolledWindow (null, null);
+        scroll_box.add (code_view);
 
-	    this.set_orientation (Gtk.Orientation.VERTICAL);
+        this.set_orientation (Gtk.Orientation.VERTICAL);
         this.add (scroll_box);
         this.set_sensitive (false);
-	    scroll_box.expand = true;
+        scroll_box.expand = true;
         this.show_all ();
     }
 }

=== modified file 'src/Widgets/PagesList.vala'
--- src/Widgets/PagesList.vala	2016-03-07 12:10:23 +0000
+++ src/Widgets/PagesList.vala	2016-03-22 22:02:29 +0000
@@ -2,6 +2,9 @@
     private Gtk.ListBox listbox;
     private Gtk.Frame toolbar;
 
+    private Notes.Editor editor;
+    private Notes.Window window;
+
     private Gtk.Separator separator;
     private Gtk.Button minus_button;
     private Gtk.Button plus_button;
@@ -10,7 +13,10 @@
 
     public Notes.Notebook current_notebook;
 
-    public PagesList () {
+    public PagesList (Notes.Window window, Notes.Editor editor) {
+        this.window = window;
+        this.editor = editor;
+
         build_ui ();
         connect_signals ();
 
@@ -23,10 +29,12 @@
         orientation = Gtk.Orientation.VERTICAL;
 
         var scroll_box = new Gtk.ScrolledWindow (null, null);
+
         listbox = new Gtk.ListBox ();
-        listbox.set_size_request (200,250);
+        listbox.activate_on_single_click = true;
+        listbox.vexpand = true;
+
         scroll_box.set_size_request (200,250);
-        listbox.vexpand = true;
         toolbar = build_toolbar ();
 
         scroll_box.add (listbox);
@@ -144,6 +152,8 @@
         editor.load_file (page);
         listbox.prepend (page_item);
         listbox.show_all ();
+
+        listbox.select_row (page_item);
     }
 
     private void connect_signals () {
@@ -165,7 +175,11 @@
 
         listbox.row_selected.connect ((row) => {
             minus_button.sensitive = (row != null);
-            if (row == null) return;
+            if (row == null) {
+                window.set_title (null);
+                return;
+            }
+
             editor.load_file (((Notes.PageItem) row).page);
             editor.give_focus ();
         });

=== modified file 'src/Widgets/Window.vala'
--- src/Widgets/Window.vala	2016-03-07 12:10:23 +0000
+++ src/Widgets/Window.vala	2016-03-22 22:02:29 +0000
@@ -1,38 +1,66 @@
 public class Notes.Window : Gtk.ApplicationWindow {
+    public Notes.Services.Settings settings;
+
     private Notes.Headerbar headerbar;
+    private Notes.Editor editor;
+    private Notes.PagesList pages_list;
+
     private Gtk.Paned pane;
 
+    private bool full_app = true;
+
     public Window (Gtk.Application app) {
-		Object (application: app);
-
-	    build_ui ();
+        Object (application: app);
+
+        settings = new Notes.Services.Settings ();
+
+        build_ui ();
         connect_signals (app);
         load_settings ();
     }
 
+    public Window.with_file (Gtk.Application app, File file) {
+        Object (application: app);
+
+        settings = new Notes.Services.Settings ();
+
+        simple_ui ();
+        simple_settings ();
+
+        full_app = false;
+
+        var page = new Notes.Page.from_file (file);
+        editor.load_file (page);
+    }
+
     protected override bool delete_event (Gdk.EventAny event) {
-	    int width;
-	    int height;
-	    int x;
-		int y;
-		
-		editor.save_file ();
-		get_size (out width, out height);
-		get_position (out x, out y);
-		
-		settings.pos_x = x;
-		settings.pos_y = y;
-		settings.panel_size = pane.position;
-		settings.window_width = width;
-		settings.window_height = height;
-		settings.last_folder = pages_list.current_notebook.path;
-		settings.page_path = editor.current_page.full_path;
-
-		return false;
-	}
+        int width;
+        int height;
+        int x;
+        int y;
+
+        this.get_size (out width, out height);
+        this.get_position (out x, out y);
+
+        settings.pos_x = x;
+        settings.pos_y = y;
+        settings.window_width = width;
+        settings.window_height = height;
+
+        if (full_app) {
+            editor.save_file ();
+            settings.panel_size = pane.position;
+            settings.last_folder = pages_list.current_notebook.path;
+            settings.page_path = editor.current_page.full_path;
+        } else {
+            editor.save_file ();
+        }
+
+        return false;
+    }
 
 	protected override bool key_press_event (Gdk.EventKey event) {
-		if (pages_list.current_notebook.pages.length () <= 0) {
+		if (full_app && pages_list.current_notebook.pages.length () <= 0) {
 			new_page ();
 			pages_list.select_first ();
 		}
@@ -40,22 +68,31 @@
 		return base.key_press_event (event);
 	}
 
-	private void load_settings () {
+    private void load_settings () {
+        simple_settings ();
+        pane.position = settings.panel_size;
+
+        if (settings.last_folder != "") {
+            var notebook = new Notes.Notebook (settings.last_folder);
+            notebook.refresh ();
+
+            pages_list.load_pages (notebook);
+        }
+
+        string path = settings.page_path;
+
+        if (path != "") {
+            var page = new Notes.Page (path);
+
+            if (!page.new_page)
+                editor.load_file (page);
+        }
+    }
+
+    private void simple_settings () {
         resize (settings.window_width, settings.window_height);
-		pane.position = settings.panel_size;
-
-	    if (settings.last_folder != "") {
-		    var notebook = new Notes.Notebook (settings.last_folder);
-		    notebook.refresh ();
-
-		    pages_list.load_pages (notebook);
-		}
-
-		var row = pages_list.get_row_from_path (settings.page_path);
-		if (row != null) {
-			row.activate ();
-		}
-	}
+        Gtk.Settings.get_default ().gtk_application_prefer_dark_theme = true;
+    }
 
     private void build_ui () {
         headerbar = new Notes.Headerbar ();
@@ -63,8 +100,8 @@
         set_titlebar (headerbar);
 
         pane = new Gtk.Paned (Gtk.Orientation.HORIZONTAL);
-        editor = new Notes.Editor ();
-        pages_list = new Notes.PagesList ();
+        editor = new Notes.Editor (this);
+        pages_list = new Notes.PagesList (this, editor);
 
         pane.pack1 (pages_list, false, false);
         pane.pack2 (editor, true, false);
@@ -75,6 +112,16 @@
 		this.show_all ();
     }
 
+    private void simple_ui () {
+        this.headerbar = new Notes.Headerbar ();
+        set_titlebar (headerbar);
+
+        editor = new Notes.Editor (this);
+
+        this.add (editor);
+        this.show_all ();
+    }
+
     private void connect_signals (Gtk.Application app) {
         var save_action = new SimpleAction ("save", null);
         save_action.activate.connect (save);
@@ -110,4 +157,12 @@
 
     	editor.give_focus ();
 	}
+
+	public new void set_title (string? title) {
+	    if (title != null) {
+	        headerbar.set_title (title);
+	    } else {
+	        headerbar.set_title (APP_NAME);
+	    }
+    }
 }