Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Plasma
Plasma Mobile
Commits
e14c8aeb
Commit
e14c8aeb
authored
Oct 22, 2019
by
Marco Martin
Browse files
different container for notifiactions
with different visibility rules
parent
03f57b03
Changes
3
Hide whitespace changes
Inline
Side-by-side
containments/panel/package/contents/ui/FullContainer.qml
0 → 100644
View file @
e14c8aeb
/*
* Copyright 2019 Marco Martin <mart@kde.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU 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 General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 2.010-1301, USA.
*/
import
QtQuick
2.12
import
QtQuick
.
Layouts
1.3
import
QtQml
.
Models
2.12
import
org
.
kde
.
plasma
.
core
2.0
as
PlasmaCore
DrawerBackground
{
id
:
fullContainer
property
Item
applet
property
ObjectModel
fullRepresentationModel
property
ListView
fullRepresentationView
visible
:
applet
&&
(
applet
.
status
!=
PlasmaCore
.
Types
.
HiddenStatus
&&
applet
.
status
!=
PlasmaCore
.
Types
.
PassiveStatus
)
height
:
parent
.
height
width
:
visible
?
quickSettingsParent
.
width
:
0
Layout.minimumHeight
:
applet
&&
applet
.
switchHeight
onVisibleChanged
:
{
print
(
"
OOOOOOO
"
+
fullRepresentationModel
+
fullRepresentationView
)
if
(
visible
)
{
for
(
var
i
=
0
;
i
<
fullRepresentationModel
.
count
;
++
i
)
{
if
(
fullRepresentationModel
.
get
(
i
)
===
this
)
{
return
;
}
}
fullRepresentationModel
.
append
(
this
);
fullRepresentationView
.
forceLayout
();
fullRepresentationView
.
currentIndex
=
ObjectModel
.
index
;
fullRepresentationView
.
positionViewAtIndex
(
ObjectModel
.
index
,
ListView
.
SnapPosition
)
}
else
if
(
ObjectModel
.
index
>=
0
)
{
fullRepresentationModel
.
remove
(
ObjectModel
.
index
);
fullRepresentationView
.
forceLayout
();
}
}
Connections
{
target
:
fullContainer
.
applet
onActivated
:
{
if
(
!
visible
)
{
return
;
}
fullRepresentationView
.
currentIndex
=
ObjectModel
.
index
;
}
}
}
containments/panel/package/contents/ui/FullNotificationsContainer.qml
0 → 100644
View file @
e14c8aeb
/*
* Copyright 2019 Marco Martin <mart@kde.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU 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 General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 2.010-1301, USA.
*/
import
QtQuick
2.12
import
QtQuick
.
Layouts
1.3
import
org
.
kde
.
plasma
.
core
2.0
as
PlasmaCore
import
org
.
kde
.
notificationmanager
1.0
as
NotificationManager
FullContainer
{
id
:
fullContainer
visible
:
applet
&&
historyModel
.
count
>
0
NotificationManager.Notifications
{
id
:
historyModel
showExpired
:
true
showDismissed
:
true
}
}
containments/panel/package/contents/ui/main.qml
View file @
e14c8aeb
...
...
@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 2.010-1301, USA.
*/
import
QtQuick
2.1
import
QtQuick
2.1
2
import
QtQuick
.
Layouts
1.3
import
QtQml
.
Models
2.12
...
...
@@ -60,14 +60,18 @@ PlasmaCore.ColorScope {
compactContainer
.
applet
=
applet
;
applet
.
anchors
.
fill
=
compactContainer
;
applet
.
visible
=
true
;
if
(
applet
.
pluginName
==
"
org.kde.phone.notifications
"
)
{
}
//FIXME: make a way to instantiate fullRepresentationItem without the open/close dance
applet
.
expanded
=
true
applet
.
expanded
=
false
var
fullContainer
=
fullContainerComponent
.
createObject
(
fullRepresentationView
.
contentItem
);
var
fullContainer
=
null
;
if
(
applet
.
pluginName
==
"
org.kde.plasma.notifications
"
)
{
fullContainer
=
fullNotificationsContainerComponent
.
createObject
(
fullRepresentationView
.
contentItem
,
{
"
fullRepresentationModel
"
:
fullRepresentationModel
,
"
fullRepresentationView
"
:
fullRepresentationView
});
}
else
{
fullContainer
=
fullContainerComponent
.
createObject
(
fullRepresentationView
.
contentItem
,
{
"
fullRepresentationModel
"
:
fullRepresentationModel
,
"
fullRepresentationView
"
:
fullRepresentationView
});
}
print
(
"
SDSDSDS
"
+
fullContainer
);
applet
.
fullRepresentationItem
.
parent
=
fullContainer
;
fullContainer
.
applet
=
applet
;
fullContainer
.
contentItem
=
applet
.
fullRepresentationItem
;
...
...
@@ -122,39 +126,13 @@ PlasmaCore.ColorScope {
Component
{
id
:
fullContainerComponent
DrawerBackground
{
id
:
fullContainer
property
Item
applet
visible
:
applet
&&
(
applet
.
status
!=
PlasmaCore
.
Types
.
HiddenStatus
&&
applet
.
status
!=
PlasmaCore
.
Types
.
PassiveStatus
)
height
:
parent
.
height
width
:
visible
?
quickSettingsParent
.
width
:
0
Layout.minimumHeight
:
applet
&&
applet
.
switchHeight
onVisibleChanged
:
{
if
(
visible
)
{
for
(
var
i
=
0
;
i
<
fullRepresentationModel
.
count
;
++
i
)
{
if
(
fullRepresentationModel
.
get
(
i
)
===
this
)
{
return
;
}
}
fullRepresentationModel
.
append
(
this
);
fullRepresentationView
.
forceLayout
();
fullRepresentationView
.
currentIndex
=
ObjectModel
.
index
;
fullRepresentationView
.
positionViewAtIndex
(
ObjectModel
.
index
,
ListView
.
SnapPosition
)
}
else
if
(
ObjectModel
.
index
>=
0
)
{
fullRepresentationModel
.
remove
(
ObjectModel
.
index
);
fullRepresentationView
.
forceLayout
();
}
}
Connections
{
target
:
fullContainer
.
applet
onActivated
:
{
if
(
!
visible
)
{
return
;
}
fullRepresentationView
.
currentIndex
=
ObjectModel
.
index
;
}
}
FullContainer
{
}
}
Component
{
id
:
fullNotificationsContainerComponent
FullNotificationsContainer
{
}
}
...
...
@@ -286,6 +264,7 @@ PlasmaCore.ColorScope {
ListView
{
id
:
fullRepresentationView
z
:
4
parent
:
slidingPanel
.
wideScreen
?
slidingPanel
.
flickable
.
contentItem
:
panelContents
anchors
{
left
:
parent
.
left
...
...
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