Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Plasma Mobile
Angelfish
Commits
1bc28165
Commit
1bc28165
authored
Jan 16, 2019
by
Jonah Brüchert
🌳
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add command line url parameter
parent
24a683e6
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
6 deletions
+19
-6
org.kde.mobile.angelfish.desktop
org.kde.mobile.angelfish.desktop
+1
-1
src/contents/ui/ListWebView.qml
src/contents/ui/ListWebView.qml
+0
-2
src/contents/ui/webbrowser.qml
src/contents/ui/webbrowser.qml
+2
-2
src/main.cpp
src/main.cpp
+16
-1
No files found.
org.kde.mobile.angelfish.desktop
View file @
1bc28165
...
...
@@ -43,7 +43,7 @@ GenericName[zh_CN]=网页浏览器
GenericName[zh_TW]=網頁瀏覽器
Encoding=UTF-8
Icon=internet-web-browser
Exec=angelfish
Exec=angelfish
%u
Type=Application
X-DocPath=angelfish/index.html
Categories=Qt;KDE;Network;WebBrowser;
...
...
src/contents/ui/ListWebView.qml
View file @
1bc28165
...
...
@@ -62,8 +62,6 @@ ListView {
}
function
newTab
(
url
)
{
tabsModel
.
append
({
pageurl
:
url
});
}
}
src/contents/ui/webbrowser.qml
View file @
1bc28165
...
...
@@ -49,7 +49,6 @@ Kirigami.ApplicationWindow {
function
load
(
url
)
{
print
(
"
Loading url:
"
+
url
);
currentWebView
.
url
=
url
;
//tabs.newTab(url)
}
width
:
Kirigami
.
Units
.
gridUnit
*
20
...
...
@@ -163,6 +162,7 @@ Kirigami.ApplicationWindow {
}
Component.onCompleted
:
{
//contentView.state = "settings"; // For testing
if
(
!
initialUrl
.
isEmpty
)
load
(
initialUrl
)
}
}
src/main.cpp
View file @
1bc28165
...
...
@@ -17,20 +17,35 @@ Q_DECL_EXPORT int main(int argc, char *argv[])
QCoreApplication
::
setOrganizationDomain
(
"kde.org"
);
QCoreApplication
::
setApplicationName
(
"angelfish"
);
// Command line parser
QCommandLineParser
parser
;
QCommandLineOption
helpOption
=
parser
.
addHelpOption
();
parser
.
addPositionalArgument
(
"url"
,
"An url to open"
,
"[url]"
);
parser
.
parse
(
QGuiApplication
::
arguments
());
// QML loading
QQmlApplicationEngine
engine
;
QtWebEngine
::
initialize
();
// initial url command line parameter
if
(
!
parser
.
positionalArguments
().
isEmpty
())
engine
.
rootContext
()
->
setContextProperty
(
"initialUrl"
,
QUrl
::
fromUserInput
(
parser
.
positionalArguments
()[
0
].
toUtf8
()));
engine
.
load
(
QUrl
(
QStringLiteral
(
"qrc:///webbrowser.qml"
)));
// Browser managger
AngelFish
::
BrowserManager
*
browserManager
=
new
AngelFish
::
BrowserManager
(
engine
.
rootContext
());
engine
.
rootContext
()
->
setContextProperty
(
"browserManager"
,
browserManager
);
qmlRegisterUncreatableType
<
AngelFish
::
BrowserManager
>
(
"org.kde.mobile.angelfish"
,
1
,
0
,
"BrowserManager"
,
""
);
qmlRegisterType
<
QAbstractListModel
>
();
// Error handling
if
(
engine
.
rootObjects
().
isEmpty
())
{
return
-
1
;
}
int
ret
=
app
.
exec
();
return
ret
;
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment