dcowan/webpin
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

moved webkit from 3.0 to 4.0

Browse source
This commit is contained in:
Artem Anufrij 2017-07-31 21:10:27 +02:00
parent 19d61a2bf7
commit 82d34bdb1f
5 changed files with 36 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -19,7 +19,7 @@ pkg_check_modules(DEPS REQUIRED
gthread-2.0
granite
gee-0.8
webkit2gtk-3.0
webkit2gtk-4.0
libsoup-2.4
gdk-pixbuf-2.0
)

54
src/AppWindow.vala
View file

@ -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 {
private Settings settings;
@ -13,28 +41,10 @@ public class AppWindow : Granite.Application {
private ApplicationsView apps_view;
construct {
program_name = "Webby";
exec_name = "webby";
app_years = "2015";
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;
program_name = "Image Burner";
exec_name = "com.github.artemanufrij.webpin";
application_id = "com.github.artemanufrij.webpin";
app_launcher = application_id + ".desktop";
}
public static AppWindow _instance = null;

3
src/CMakeLists.txt
View file

@ -5,7 +5,6 @@ vala_precompile(VALA_C ${CMAKE_PROJECT_NAME}
Assistant.vala
DesktopFile.vala
InfoDialog.vala
Launcher.vala
Settings.vala
UrlEntry.vala
WebApp.vala
@ -18,7 +17,7 @@ PACKAGES
gio-2.0
gee-0.8
posix
webkit2gtk-3.0
webkit2gtk-4.0
libsoup-2.4
gdk-pixbuf-2.0

0
src/Launcher.vala
View file

6
src/WebBar.vala
View file

@ -15,7 +15,6 @@ public class WebBar : Gtk.HeaderBar {
public WebBar (WebKit.WebView webview) {
this.get_style_context ().remove_class ("header-bar");
this.webview = webview;
@ -48,7 +47,6 @@ public class WebBar : Gtk.HeaderBar {
back_button.clicked.connect( () => { back_event(); });
back_button.activate.connect( () => { back_event(); });
}
public void set_title_mode (title_mode mode) {
@ -63,8 +61,8 @@ public class WebBar : Gtk.HeaderBar {
pack_start (back_button);
pack_start (url_entry);
pack_end (share_button);
custom_title = new Gtk.Label(null);
this.get_style_context ().add_class ("header-bar");
custom_title = new Gtk.Label(null);
this.get_style_context ().add_class ("header-bar");
}
}