Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Plasma Mobile
Angelfish
Commits
23f97490
Verified
Commit
23f97490
authored
Oct 14, 2019
by
Jonah Brüchert
Browse files
Move drawers to correct parent
parent
08ba58f6
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/contents/ui/ListWebView.qml
View file @
23f97490
...
...
@@ -46,7 +46,7 @@ ListView {
model
:
ListModel
{
id
:
tabsModel
ListElement
{
pageurl
:
"
https://plasma-mobile.org
"
}
ListElement
{
pageurl
:
"
about:blank
"
}
}
delegate
:
WebView
{
...
...
src/contents/ui/WebView.qml
View file @
23f97490
...
...
@@ -189,7 +189,7 @@ WebEngineView {
//print("Load: " + loadRequest.errorCode + " " + loadRequest.errorString);
//if (loadRequest.status == WebEngineView.LoadStartedStatus) {
//}
if
(
loadRequest
.
status
==
WebEngineView
.
LoadSucceededStatus
)
{
if
(
loadRequest
.
status
==
=
WebEngineView
.
LoadSucceededStatus
)
{
// record history, set current page info
//contentView.state = "hidden"
//pageInfo.url = webEngineView.url;
...
...
@@ -200,7 +200,7 @@ WebEngineView {
addHistoryEntry
();
}
if
(
loadRequest
.
status
==
WebEngineView
.
LoadFailedStatus
)
{
if
(
loadRequest
.
status
==
=
WebEngineView
.
LoadFailedStatus
)
{
print
(
"
Load failed:
"
+
loadRequest
.
errorCode
+
"
"
+
loadRequest
.
errorString
);
ec
=
loadRequest
.
errorCode
;
es
=
loadRequest
.
errorString
;
...
...
src/contents/ui/webbrowser.qml
View file @
23f97490
...
...
@@ -75,6 +75,56 @@ Kirigami.ApplicationWindow {
pageStack.globalToolBar.style
:
layerShown
?
Kirigami
.
ApplicationHeaderStyle
.
Auto
:
Kirigami
.
ApplicationHeaderStyle
.
None
globalDrawer
:
Kirigami.GlobalDrawer
{
id
:
globalDrawer
handleVisible
:
false
actions
:
[
Kirigami.Action
{
icon.name
:
"
tab-duplicate
"
onTriggered
:
{
pageStack
.
layers
.
push
(
"
Tabs.qml
"
)
}
text
:
i18n
(
"
Tabs
"
)
},
Kirigami.Action
{
icon.name
:
"
view-private
"
onTriggered
:
{
rootPage
.
privateMode
?
rootPage
.
privateMode
=
false
:
rootPage
.
privateMode
=
true
}
text
:
rootPage
.
privateMode
?
i18n
(
"
Leave private mode
"
)
:
i18n
(
"
Private mode
"
)
},
Kirigami.Action
{
icon.name
:
"
bookmarks
"
onTriggered
:
{
pageStack
.
layers
.
push
(
"
Bookmarks.qml
"
)
}
text
:
i18n
(
"
Bookmarks
"
)
},
Kirigami.Action
{
icon.name
:
"
view-history
"
onTriggered
:
{
pageStack
.
layers
.
push
(
"
History.qml
"
)
}
text
:
i18n
(
"
History
"
)
},
Kirigami.Action
{
icon.name
:
"
configure
"
text
:
i18n
(
"
Settings
"
)
onTriggered
:
{
pageStack
.
layers
.
push
(
"
Settings.qml
"
)
}
}
]
}
contextDrawer
:
Kirigami.ContextDrawer
{
id
:
contextDrawer
handleVisible
:
false
}
pageStack.initialPage
:
Kirigami.Page
{
id
:
rootPage
leftPadding
:
0
...
...
@@ -247,56 +297,6 @@ Kirigami.ApplicationWindow {
id
:
shareSheet
}
Kirigami.ContextDrawer
{
id
:
contextDrawer
handleVisible
:
false
}
Kirigami.GlobalDrawer
{
id
:
globalDrawer
handleVisible
:
false
actions
:
[
Kirigami.Action
{
icon.name
:
"
tab-duplicate
"
onTriggered
:
{
pageStack
.
layers
.
push
(
"
Tabs.qml
"
)
}
text
:
i18n
(
"
Tabs
"
)
},
Kirigami.Action
{
icon.name
:
"
view-private
"
onTriggered
:
{
rootPage
.
privateMode
?
rootPage
.
privateMode
=
false
:
rootPage
.
privateMode
=
true
}
text
:
rootPage
.
privateMode
?
i18n
(
"
Leave private mode
"
)
:
i18n
(
"
Private mode
"
)
},
Kirigami.Action
{
icon.name
:
"
bookmarks
"
onTriggered
:
{
pageStack
.
layers
.
push
(
"
Bookmarks.qml
"
)
}
text
:
i18n
(
"
Bookmarks
"
)
},
Kirigami.Action
{
icon.name
:
"
view-history
"
onTriggered
:
{
pageStack
.
layers
.
push
(
"
History.qml
"
)
}
text
:
i18n
(
"
History
"
)
},
Kirigami.Action
{
icon.name
:
"
configure
"
text
:
i18n
(
"
Settings
"
)
onTriggered
:
{
pageStack
.
layers
.
push
(
"
Settings.qml
"
)
}
}
]
}
// The menu at the top right
contextualActions
:
[
Kirigami.Action
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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