[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Oct 14 14:27:51 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=e41ca57
The following commit has been merged in the master branch:
commit e41ca570450e2543ab3d550f1c939dea722416be
Author: Aleix Pol <aleixpol at kde.org>
Date: Fri Aug 1 12:04:44 2014 +0200
Improve look&feel of kdeconnect plasmoid
Provide a good initial size
Use compact representation when on a panel, full when on the desktop (this
prevented the icon to show on the system tray).
Reviewed by Albert Vaca
---
plasmoid/package/contents/ui/CompactRepresentation.qml | 5 -----
plasmoid/package/contents/ui/FullRepresentation.qml | 3 ---
plasmoid/package/contents/ui/main.qml | 11 +++++++++--
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/plasmoid/package/contents/ui/CompactRepresentation.qml b/plasmoid/package/contents/ui/CompactRepresentation.qml
index c814f7d..c4edb6d 100644
--- a/plasmoid/package/contents/ui/CompactRepresentation.qml
+++ b/plasmoid/package/contents/ui/CompactRepresentation.qml
@@ -24,11 +24,6 @@ import org.kde.plasma.core 2.0 as PlasmaCore
Item {
id: view
- //TODO: Use this to detect if we should be iconized or full size
- function isConstrained() {
- return (plasmoid.formFactor == Vertical || plasmoid.formFactor == Horizontal);
- }
-
PlasmaCore.IconItem {
id: icon
source: "kdeconnect"
diff --git a/plasmoid/package/contents/ui/FullRepresentation.qml b/plasmoid/package/contents/ui/FullRepresentation.qml
index c788b41..87749bc 100644
--- a/plasmoid/package/contents/ui/FullRepresentation.qml
+++ b/plasmoid/package/contents/ui/FullRepresentation.qml
@@ -27,9 +27,6 @@ import org.kde.kdeconnect 1.0 as KdeConnect
Item {
id: kdeconnect
- implicitWidth: 290
- implicitHeight: 340
-
PlasmaComponents.Label {
visible: devicesView.count==0
text: i18n("No paired devices available")
diff --git a/plasmoid/package/contents/ui/main.qml b/plasmoid/package/contents/ui/main.qml
index 744c697..bc584c3 100644
--- a/plasmoid/package/contents/ui/main.qml
+++ b/plasmoid/package/contents/ui/main.qml
@@ -23,8 +23,15 @@ import org.kde.plasma.plasmoid 2.0
Item
{
- Plasmoid.compactRepresentation: CompactRepresentation { }
+ width: units.gridUnit * 20
+ height: units.gridUnit * 32
+
+ function isConstrained() {
+ return (plasmoid.formFactor == Vertical || plasmoid.formFactor == Horizontal);
+ }
+
+ Plasmoid.compactRepresentation: CompactRepresentation {}
Plasmoid.fullRepresentation: FullRepresentation {}
- Plasmoid.preferredRepresentation: Plasmoid.fullRepresentation
+ Plasmoid.preferredRepresentation: isConstrained() ? Plasmoid.compactRepresentation : Plasmoid.fullRepresentation
}
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list