[SCM] ktp-contact-applet packaging branch, master, updated. debian/15.12.1-1-966-gde83ac5
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:13:42 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=73ef964
The following commit has been merged in the master branch:
commit 73ef964e5493dc9f05995ac830a5864be5a2bc94
Author: David Edmundson <kde at davidedmundson.co.uk>
Date: Wed Mar 14 23:46:39 2012 +0000
Remove broken toolbar and grid view
---
.../contents/ui/ContactList.qml | 128 +--------------------
.../contents/ui/GridContactDelegate.qml | 122 --------------------
org.kde.ktp.contactlist/contents/ui/ToolBar.qml | 47 --------
3 files changed, 1 insertion(+), 296 deletions(-)
diff --git a/org.kde.ktp.contactlist/contents/ui/ContactList.qml b/org.kde.ktp.contactlist/contents/ui/ContactList.qml
index 951c2d7..d9d6bab 100644
--- a/org.kde.ktp.contactlist/contents/ui/ContactList.qml
+++ b/org.kde.ktp.contactlist/contents/ui/ContactList.qml
@@ -41,36 +41,11 @@ Item {
id: contactList
}
-
- // TOOLBAR
- ToolBar {
- id: toolbar;
- height: 20;
-
- anchors {
-// top: parent;
- left: parent.left;
- right: parent.right;
- }
- }
-
- // TOP SEPARATOR
- PlasmaWidgets.Separator {
- id: topSeparator;
- anchors {
- top: toolbar.bottom;
- topMargin: 5;
- left: parent.left;
- right:parent.right;
- }
- }
-
- // LISTVIEW
ListView {
id: contactsList;
anchors {
- top: topSeparator.bottom;
+ top: parent.top;
topMargin: 5;
left: parent.left;
right: parent.right;
@@ -84,105 +59,4 @@ Item {
delegate: ListContactDelegate {}
}
- // GRIDVIEW
- GridView {
- id: contactsGrid;
- boundsBehavior: Flickable.StopAtBounds;
- clip: true;
-
- anchors {
- top: topSeparator.bottom;
- left: parent.left;
- right: parent.right;
- bottom: parent.bottom;
- bottomMargin: 20;
- }
-
- model: contactListModel;
-
- cellWidth: 48;
- cellHeight: 48;
-
- delegate:
- GridContactDelegate {
- id: gridDelegate;
-
- //Dave - why does any of this exist just use the correct fucking names in the delegate.???
- delegateDisplayName: aliasName;
- delegateAvatar: avatar;
-// delegatePresenceIcon: presenceIcon;
- delegatePresenceName: presenceType;
- delegatePresenceMessage: presenceMessage;
-
- //Dave - this is a stupid name for the method. Be careful when using words like "set"
- onSetGridContactDisplayName: {
- console.log("SETTING NAME TO: " + gridContactDisplayName + " with presence msg: " + gridPresenceMessage);
- contactDisplay.contactNickToShow = gridContactDisplayName;
- contactDisplay.contactPresenceMessage = gridPresenceMessage;
- }
- }
- }
-
- PlasmaWidgets.Separator {
- id: separator;
- anchors {
- top: contactsGrid.bottom;
- left: parent.left;
- right:parent.right;
- bottom: contactDisplay.top;
- }
- }
-
- ContactDisplayName {
- id: contactDisplay;
-
- anchors {
- top: contactsGrid.bottom;
- left: contactListContainer.left;
- right: contactListContainer.right;
- bottom: contactListContainer.bottom;
- margins: 5;
- }
- }
-
- states: [
- State {
- name: "listView";
- PropertyChanges {
- target: contactsList;
- opacity: 1;
- }
- PropertyChanges {
- target: contactsGrid;
- opacity: 0;
- }
- PropertyChanges {
- target: contactDisplay;
- opacity: 0;
- }
- PropertyChanges {
- target: separator;
- opacity: 0
- }
- },
- State {
- name: "gridView";
- PropertyChanges {
- target: contactsList;
- opacity: 0;
- }
- PropertyChanges {
- target: contactsGrid;
- opacity: 1;
- }
- PropertyChanges {
- target: contactDisplay;
- opacity: 1;
- }
- PropertyChanges {
- target: separator;
- opacity: 1;
- }
- }
- ]
}
diff --git a/org.kde.ktp.contactlist/contents/ui/GridContactDelegate.qml b/org.kde.ktp.contactlist/contents/ui/GridContactDelegate.qml
deleted file mode 100644
index a707923..0000000
--- a/org.kde.ktp.contactlist/contents/ui/GridContactDelegate.qml
+++ /dev/null
@@ -1,122 +0,0 @@
-/***************************************************************************
- * Copyright (C) 2011 by Francesco Nwokeka <francesco.nwokeka at gmail.com> *
- * *
- * 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 02110-1301 USA *
- ***************************************************************************/
-
-import Qt 4.7
-import org.kde.plasma.graphicswidgets 0.1 as PlasmaWidgets
-
-/// TODO
-// - add status border (colour like on the presence plasmoid)
-// - bottom status bar with displayName on hover
-// - rounded borders for image
-
-Item {
- id: gridDelegate;
-
- property string delegateDisplayName;
- property string delegateAvatar;
-// property QIcon delegatePresenceIcon;
- property string delegatePresenceMessage;
-// property string delegatePresenceType;
- property string delegatePresenceName;
-
- // emitted when mouse hovers over contact
- signal setGridContactDisplayName(variant gridContactDisplayName, variant gridPresenceMessage);
-
- width: 40;
- height: 40;
-
- PlasmaWidgets.IconWidget {
- id: contactIcon;
- icon: QIcon("im-user"); // temp icon until it's sorted out
- anchors.fill: parent;
- }
-
- BorderImage {
- id: avatarFrame;
- width: parent.width;
- height: parent.height;
-
- border {
- left: 2
- right: 2
- top: 2
- bottom: 2
- }
-
- anchors {
- centerIn: gridDelegate;
- }
- }
-
- MouseArea {
- anchors.fill: parent;
- hoverEnabled: true;
-
- // set contact name in view
- onEntered: {
- gridDelegate.setGridContactDisplayName(delegateDisplayName, delegatePresenceMessage);
- }
-
- // unset contact name in view
- onExited: {
- gridDelegate.setGridContactDisplayName("", "");
- }
- }
-
- onDelegatePresenceNameChanged: {
- console.log("CHANGING BORDER to_ : " + delegatePresenceName);
- setAvatarPresenceStatus(delegatePresenceName);
- }
-
- function setAvatarPresenceStatus(presenceStatus)
- {
- switch (presenceStatus) {
- case "available":
- avatarFrame.source = "../frames/online.png";
- if (!avatar.enabled) {
- avatar.enabled = true;
- }
- break;
- case "dnd":
- avatarFrame.source = "../frames/busy.png";
- if (!avatar.enabled) {
- avatar.enabled = true;
- }
- break;
- case "away":
- avatarFrame.source = "../frames/away.png";
- if (!avatar.enabled) {
- avatar.enabled = true;
- }
- break;
- case "offline":
- avatarFrame.source = "../frames/offline.png";
- if (avatar.enabled) {
- avatar.enabled = false;
- }
- break;
- default:
- avatarFrame.source = "../frames/offline.png";
- if (avatar.enabled) {
- avatar.enabled = false;
- }
- break;
- }
- }
-}
diff --git a/org.kde.ktp.contactlist/contents/ui/ToolBar.qml b/org.kde.ktp.contactlist/contents/ui/ToolBar.qml
deleted file mode 100644
index e351b7a..0000000
--- a/org.kde.ktp.contactlist/contents/ui/ToolBar.qml
+++ /dev/null
@@ -1,47 +0,0 @@
-/***************************************************************************
- * Copyright (C) 2011 by Francesco Nwokeka <francesco.nwokeka at gmail.com> *
- * *
- * 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 02110-1301 USA *
- ***************************************************************************/
-
-import Qt 4.7
-import org.kde.plasma.graphicswidgets 0.1 as PlasmaWidgets
-
-Item {
-
- PlasmaWidgets.IconWidget {
- id: listViewButton;
-
- height: 22;
- width: 22;
- icon: QIcon("view-list-details");
-
- anchors.left: parent.left;
- }
-
- PlasmaWidgets.IconWidget {
- id: gridViewButton;
-
- height: 22;
- width: 22;
- icon: QIcon("view-list-icons");
-
- anchors {
- left: listViewButton.right;
- leftMargin: 2;
- }
- }
-}
--
ktp-contact-applet packaging
More information about the pkg-kde-commits
mailing list