moved webkit from 3.0 to 4.0
This commit is contained in:
		
							parent
							
								
									19d61a2bf7
								
							
						
					
					
						commit
						82d34bdb1f
					
				
					 5 changed files with 36 additions and 29 deletions
				
			
		| 
						 | 
					@ -19,7 +19,7 @@ pkg_check_modules(DEPS REQUIRED
 | 
				
			||||||
    gthread-2.0 
 | 
					    gthread-2.0 
 | 
				
			||||||
    granite 
 | 
					    granite 
 | 
				
			||||||
    gee-0.8 
 | 
					    gee-0.8 
 | 
				
			||||||
    webkit2gtk-3.0 
 | 
					    webkit2gtk-4.0 
 | 
				
			||||||
    libsoup-2.4 
 | 
					    libsoup-2.4 
 | 
				
			||||||
    gdk-pixbuf-2.0
 | 
					    gdk-pixbuf-2.0
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,3 +1,31 @@
 | 
				
			||||||
 | 
					/*-
 | 
				
			||||||
 | 
					 * 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>
 | 
				
			||||||
 | 
					 */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
public class AppWindow : Granite.Application {
 | 
					public class AppWindow : Granite.Application {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private Settings settings;
 | 
					    private Settings settings;
 | 
				
			||||||
| 
						 | 
					@ -13,28 +41,10 @@ public class AppWindow : Granite.Application {
 | 
				
			||||||
    private ApplicationsView apps_view;
 | 
					    private ApplicationsView apps_view;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    construct {
 | 
					    construct {
 | 
				
			||||||
        program_name = "Webby";
 | 
					        program_name = "Image Burner";
 | 
				
			||||||
        exec_name = "webby";
 | 
					        exec_name = "com.github.artemanufrij.webpin";
 | 
				
			||||||
 | 
					        application_id = "com.github.artemanufrij.webpin";
 | 
				
			||||||
        app_years = "2015";
 | 
					        app_launcher = application_id + ".desktop";
 | 
				
			||||||
        app_icon = "webby";
 | 
					 | 
				
			||||||
        app_launcher = "webby.desktop";
 | 
					 | 
				
			||||||
        application_id = "net.launchpad.webby-browser";
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        main_url = "https://code.launchpad.net/webby-browser";
 | 
					 | 
				
			||||||
        bug_url = "https://bugs.launchpad.net/webby-browser";
 | 
					 | 
				
			||||||
        help_url = "https://code.launchpad.net/webby-browser";
 | 
					 | 
				
			||||||
        translate_url = "https://translations.launchpad.net/webby-browser";
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        about_authors = {"Erasmo Marín <erasmo.marin@gmail.com>",
 | 
					 | 
				
			||||||
                            "Artem Anufrij <artem.anufrij@live.de>"};
 | 
					 | 
				
			||||||
        about_documenters = {"Erasmo Marín",
 | 
					 | 
				
			||||||
                            "Artem Anufrij <artem.anufrij@live.de>"};
 | 
					 | 
				
			||||||
        about_artists = {"Erasmo Marín <erasmo.marin@gmail.com>",
 | 
					 | 
				
			||||||
                            "Artem Anufrij <artem.anufrij@live.de>"};
 | 
					 | 
				
			||||||
        about_comments = "Development release, not all features implemented";
 | 
					 | 
				
			||||||
        about_translators = "";
 | 
					 | 
				
			||||||
        about_license_type = Gtk.License.GPL_3_0;
 | 
					 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    public static AppWindow _instance = null;
 | 
					    public static AppWindow _instance = null;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -5,7 +5,6 @@ vala_precompile(VALA_C ${CMAKE_PROJECT_NAME}
 | 
				
			||||||
    Assistant.vala
 | 
					    Assistant.vala
 | 
				
			||||||
    DesktopFile.vala
 | 
					    DesktopFile.vala
 | 
				
			||||||
    InfoDialog.vala
 | 
					    InfoDialog.vala
 | 
				
			||||||
    Launcher.vala
 | 
					 | 
				
			||||||
    Settings.vala
 | 
					    Settings.vala
 | 
				
			||||||
    UrlEntry.vala
 | 
					    UrlEntry.vala
 | 
				
			||||||
    WebApp.vala
 | 
					    WebApp.vala
 | 
				
			||||||
| 
						 | 
					@ -18,7 +17,7 @@ PACKAGES
 | 
				
			||||||
    gio-2.0
 | 
					    gio-2.0
 | 
				
			||||||
    gee-0.8
 | 
					    gee-0.8
 | 
				
			||||||
    posix
 | 
					    posix
 | 
				
			||||||
    webkit2gtk-3.0
 | 
					    webkit2gtk-4.0
 | 
				
			||||||
    libsoup-2.4
 | 
					    libsoup-2.4
 | 
				
			||||||
    gdk-pixbuf-2.0
 | 
					    gdk-pixbuf-2.0
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -15,7 +15,6 @@ public class WebBar : Gtk.HeaderBar {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    public WebBar (WebKit.WebView webview) {
 | 
					    public WebBar (WebKit.WebView webview) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
        this.get_style_context ().remove_class ("header-bar");
 | 
					        this.get_style_context ().remove_class ("header-bar");
 | 
				
			||||||
        this.webview = webview;
 | 
					        this.webview = webview;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -48,7 +47,6 @@ public class WebBar : Gtk.HeaderBar {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        back_button.clicked.connect( () => { back_event(); });
 | 
					        back_button.clicked.connect( () => { back_event(); });
 | 
				
			||||||
        back_button.activate.connect( () => { back_event(); });
 | 
					        back_button.activate.connect( () => { back_event(); });
 | 
				
			||||||
 | 
					 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    public void set_title_mode (title_mode mode) {
 | 
					    public void set_title_mode (title_mode mode) {
 | 
				
			||||||
| 
						 | 
					@ -63,8 +61,8 @@ public class WebBar : Gtk.HeaderBar {
 | 
				
			||||||
            pack_start (back_button);
 | 
					            pack_start (back_button);
 | 
				
			||||||
            pack_start (url_entry);
 | 
					            pack_start (url_entry);
 | 
				
			||||||
            pack_end (share_button);
 | 
					            pack_end (share_button);
 | 
				
			||||||
            custom_title = new Gtk.Label(null);  
 | 
					            custom_title = new Gtk.Label(null);
 | 
				
			||||||
            this.get_style_context ().add_class ("header-bar");          
 | 
					            this.get_style_context ().add_class ("header-bar");
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		
		Reference in a new issue