split to Application.vala and MainWindow.vala

data/CMakeLists.txt

@@ -1,5 +1,5 @@
 install (FILES com.github.artemanufrij.webpin.desktop DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/applications)
-install (FILES com.github.artemanufrij.webpin.appdata.xml DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/metainfo)
+#install (FILES com.github.artemanufrij.webpin.appdata.xml DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/metainfo)
 
 install (FILES icons/artemanufrij.webpin.svg DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/icons/hicolor/)
 install (FILES icons/artemanufrij.webpin.svg DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/icons/hicolor/48x48/apps/)

data/com.github.artemanufrij.webpin.desktop

@@ -1,20 +1,11 @@
 [Desktop Entry]
-Version=1.0
+Name=Webpin
-Name=Webby
+GenericName=Webpin
-GenericName=Webby
+Comment=Pin your websites on your desktop
-Comment=Create your apps
 Keywords=internet;webapp;
-Exec=webby %u
+Exec=com.github.artemanufrij.webpin %u
-Icon=webby
+Icon=artemanufrij.webpin
 Terminal=false
 Type=Application
 Categories=Network;GNOME;GTK;
-X-GIO-NoFuse=true
+X-GNOME-Gettext-Domain=webpin
-X-GNOME-Gettext-Domain=webby
-X-GNOME-FullName=Webby
-StartupWMClass=Webby
-Actions=AboutDialog;
-
-[Desktop Action AboutDialog]
-Exec=webby --about
-Name=About Webby

src/Application.vala

@@ -0,0 +1,77 @@
+/*-
+ * Copyright (c) 2015 Erasmo Marín <erasmo.marin@gmail.com>
+ * Copyright (c) 2017-2017 Artem Anufrij <artem.anufrij@live.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The Noise authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Noise. This permission is above and beyond the permissions granted
+ * by the GPL license by which Noise is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
+ *
+ * Authored by: Artem Anufrij <artem.anufrij@live.de>
+ */
+
+namespace Webpin {
+    public class WebpinApp : Granite.Application {
+
+        static WebpinApp _instance = null;
+
+        public static WebpinApp instance {
+            get {
+                if (_instance == null)
+                    _instance = new WebpinApp ();
+                return _instance;
+            }
+        }
+
+        construct {
+            program_name = "Image Burner";
+            exec_name = "com.github.artemanufrij.webpin";
+            application_id = "com.github.artemanufrij.webpin";
+            app_launcher = application_id + ".desktop";
+        }
+
+        public Gtk.Window mainwindow;
+
+        protected override void activate () {
+            if (mainwindow != null) {
+                mainwindow.present ();
+                return;
+            }
+
+            mainwindow = new MainWindow ();
+            mainwindow.set_application(this);
+        }
+    }
+}
+static int main (string[] args) {
+
+    Gtk.init (ref args);
+
+    if (args.length < 2 || args[1] == "--about" || args[1] == "-d") {
+        var app = Webpin.WebpinApp.instance;
+        return app.run (args);
+    } else {
+        var app_info = DesktopFile.get_app_by_url (args[1]);
+        var app = new Webpin.WebAppWindow(app_info.get_display_name (), args[1]);
+        app.show_all ();
+    }
+
+    Gtk.main ();
+    return 0;
+}

src/CMakeLists.txt

@@ -1,7 +1,8 @@
 vala_precompile(VALA_C ${CMAKE_PROJECT_NAME}
     Widgets/ApplicationIcon.vala
     Widgets/ApplicationsView.vala
-    AppWindow.vala
+    Application.vala
+    MainWindow.vala
     Assistant.vala
     DesktopFile.vala
     InfoDialog.vala
@@ -9,7 +10,6 @@ vala_precompile(VALA_C ${CMAKE_PROJECT_NAME}
     UrlEntry.vala
     WebApp.vala
     WebBar.vala
-    Webby.vala
     WebAppWindow.vala
 PACKAGES
     gtk+-3.0

src/MainWindow.vala

@@ -0,0 +1,185 @@
+/*-
+ * Copyright (c) 2015 Erasmo Marín <erasmo.marin@gmail.com>
+ * Copyright (c) 2017-2017 Artem Anufrij <artem.anufrij@live.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The Noise authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Noise. This permission is above and beyond the permissions granted
+ * by the GPL license by which Noise is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
+ *
+ * Authored by: Artem Anufrij <artem.anufrij@live.de>
+ */
+
+namespace Webpin {
+    public class MainWindow : Gtk.ApplicationWindow {
+        private Settings settings;
+
+        private Gtk.Stack stack;
+        private Gtk.HeaderBar headerbar;
+        private Gtk.Button back_button;
+        private Gtk.Button add_button;
+
+        private WebbyAssistant assistant;
+        private ApplicationsView apps_view;
+
+        public MainWindow () {
+            settings = Settings.get_default ();
+
+            build_ui ();
+        }
+
+        private void build_ui () {
+            set_default_size (700, 500);
+
+            //headerbar
+            headerbar = new Gtk.HeaderBar ();
+            headerbar.show_close_button = true;
+            headerbar.title = "Webpin";
+            set_titlebar (headerbar);
+
+            back_button = new Gtk.Button.with_label (_("Applications"));
+            back_button.get_style_context ().add_class ("back-button");
+            headerbar.pack_start (back_button);
+
+            add_button = new Gtk.Button ();
+            add_button.image = new Gtk.Image.from_icon_name ("add", Gtk.IconSize.LARGE_TOOLBAR);
+            add_button.tooltip_text = _("Add a new Web App");
+            headerbar.pack_start (add_button);
+
+            var welcome = new Granite.Widgets.Welcome (_("No Web Apps Availible"), _("Create a new Webby Web App."));
+            welcome.append ("add", _("Create App"), _("Create a new Webby web app."));
+            welcome.activated.connect ((index) => {
+                switch (index) {
+                    case 0:
+                        show_assistant ();
+                        break;
+                }
+            });
+
+            apps_view = new ApplicationsView();
+            assistant = new WebbyAssistant();
+            stack = new Gtk.Stack ();
+            stack.set_transition_duration (500);
+
+            stack.add_named (welcome, "welcome");
+            stack.add_named (apps_view, "apps_view");
+            stack.add_named (assistant, "assistant");
+
+            add (stack);
+
+            apps_view.add_request.connect (() => {
+                show_assistant ();
+            });
+
+            apps_view.edit_request.connect ((desktop_file) => {
+                show_assistant (desktop_file);
+            });
+
+            apps_view.app_deleted.connect (() => {
+                if (!apps_view.has_items) {
+                    show_welcome_view (Gtk.StackTransitionType.NONE);
+                }
+            });
+
+            assistant.application_created.connect ((new_file) => {
+                apps_view.add_button (new_file);
+                apps_view.select_last_item ();
+                show_apps_view ();
+            });
+
+            assistant.application_edited.connect ((edited_file) => {
+                apps_view.update_button (edited_file);
+                show_apps_view ();
+            });
+
+            back_button.clicked.connect (() => {
+                if (apps_view.has_items)
+                    show_apps_view ();
+                else
+                    show_welcome_view ();
+            });
+
+            add_button.clicked.connect (() => {
+                show_assistant ();
+            });
+
+            delete_event.connect (() => {
+                this.store_settings ();
+                return false;
+            });
+
+            this.restore_settings ();
+            show_all ();
+
+            if (apps_view.has_items)
+                show_apps_view (Gtk.StackTransitionType.NONE);
+            else
+                show_welcome_view (Gtk.StackTransitionType.NONE);
+
+            this.present ();
+        }
+
+        private void show_assistant (DesktopFile? desktop_file = null) {
+            stack.set_transition_type (Gtk.StackTransitionType.SLIDE_LEFT);
+            stack.set_visible_child_name("assistant");
+            back_button.show_all ();
+            add_button.hide ();
+            //fix ugly border at the bottom of headerbar
+            queue_draw ();
+
+            if (desktop_file != null)
+                assistant.edit_desktop_file (desktop_file);
+        }
+
+        private void show_apps_view (Gtk.StackTransitionType slide = Gtk.StackTransitionType.SLIDE_RIGHT) {
+            stack.set_transition_type (slide);
+            stack.set_visible_child_name ("apps_view");
+            back_button.hide ();
+            add_button.show_all ();
+            assistant.reset_fields ();
+            //fix ugly border at the bottom of headerbar
+            queue_draw ();
+        }
+
+        private void show_welcome_view (Gtk.StackTransitionType slide = Gtk.StackTransitionType.SLIDE_RIGHT) {
+            stack.set_transition_type (slide);
+            stack.set_visible_child_name ("welcome");
+            back_button.hide ();
+            add_button.hide ();
+            assistant.reset_fields ();
+            //fix ugly border at the bottom of headerbar
+            queue_draw ();
+        }
+
+        private void restore_settings () {
+            this.set_default_size (settings.window_width, settings.window_height);
+
+            if (settings.window_state == Settings.WindowState.MAXIMIZED)
+                this.maximize ();
+        }
+
+        private void store_settings () {
+            settings.window_state = (this.is_maximized ? Settings.WindowState.MAXIMIZED: Settings.WindowState.NORMAL);
+            if (settings.window_state == Settings.WindowState.NORMAL) {
+                settings.window_height = this.get_allocated_height ();
+                settings.window_width = this.get_allocated_width ();
+            }
+        }
+    }
+}

src/Settings.vala

@@ -1,3 +1,32 @@
+/*-
+ * Copyright (c) 2015 Erasmo Marín <erasmo.marin@gmail.com>
+ * Copyright (c) 2017-2017 Artem Anufrij <artem.anufrij@live.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The Noise authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Noise. This permission is above and beyond the permissions granted
+ * by the GPL license by which Noise is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
+ *
+ * Authored by: Artem Anufrij <artem.anufrij@live.de>
+ */
+
+namespace Webpin {
     public class Settings : Granite.Services.Settings {
 
         private static Settings settings;
@@ -21,3 +50,4 @@ public class Settings : Granite.Services.Settings {
             FULLSCREEN
         }
     }
+}

src/WebAppWindow.vala

@@ -1,3 +1,32 @@
+/*-
+ * Copyright (c) 2015 Erasmo Marín <erasmo.marin@gmail.com>
+ * Copyright (c) 2017-2017 Artem Anufrij <artem.anufrij@live.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The Noise authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Noise. This permission is above and beyond the permissions granted
+ * by the GPL license by which Noise is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
+ *
+ * Authored by: Artem Anufrij <artem.anufrij@live.de>
+ */
+
+namespace Webpin {
     public class WebAppWindow : Gtk.ApplicationWindow {
 
         private bool is_full_screen = false;
@@ -140,3 +169,4 @@ public class WebAppWindow : Gtk.ApplicationWindow {
             return false;
         }
     }
+}

src/WebBar.vala

@@ -1,5 +1,33 @@
-public class WebBar : Gtk.HeaderBar {
+/*-
+ * Copyright (c) 2015 Erasmo Marín <erasmo.marin@gmail.com>
+ * Copyright (c) 2017-2017 Artem Anufrij <artem.anufrij@live.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The Noise authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Noise. This permission is above and beyond the permissions granted
+ * by the GPL license by which Noise is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
+ *
+ * Authored by: Artem Anufrij <artem.anufrij@live.de>
+ */
 
+namespace Webpin {
+    public class WebBar : Gtk.HeaderBar {
 
         public enum title_mode {
             TITLE,
@@ -65,6 +93,5 @@ public class WebBar : Gtk.HeaderBar {
                 this.get_style_context ().add_class ("header-bar");
             }
         }
-
+    }
-
 }