[SCM] ktp-send-file packaging branch, master, updated. debian/15.12.1-2-216-g8f07cdf
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:13:56 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-send-file.git;a=commitdiff;h=fde1b75
The following commit has been merged in the master branch:
commit fde1b75ef40ba0caaa47b023218f448d3c57dbe7
Author: David Edmundson <kde at davidedmundson.co.uk>
Date: Wed Jun 8 11:59:19 2011 +0100
Updated models to latest versions
---
CMakeLists.txt | 1 +
account-filter-model.cpp | 93 +++++++++++++++++++++++++++---------------------
account-filter-model.h | 6 ++++
accounts-model-item.cpp | 4 ++-
accounts-model.cpp | 31 +++-------------
accounts-model.h | 6 ++--
contact-model-item.cpp | 3 +-
mainwindow.ui | 46 +++++++++++++++++++++++-
8 files changed, 117 insertions(+), 73 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ebcfe8d..e48b01a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,6 +37,7 @@ set(MAINWINDOW_SRCS
accounts-model.cpp
contact-model-item.cpp
tree-node.cpp
+ flat-model-proxy.cpp
)
set(TELEPATHY_KDE_FILE_TRANSFER_UI
diff --git a/account-filter-model.cpp b/account-filter-model.cpp
index 28b82aa..97d7327 100644
--- a/account-filter-model.cpp
+++ b/account-filter-model.cpp
@@ -47,7 +47,7 @@ bool AccountFilterModel::filterAcceptsRow(int source_row, const QModelIndex &sou
{
bool rowAccepted = true;
//if we're looking at filtering an account or not
- if (true) {
+ if (source_parent != QModelIndex()) {
//filter by name in the contact list
if (m_filterByName &&
!source_parent.child(source_row, 0).data(AccountsModel::AliasRole).toString()
@@ -56,27 +56,30 @@ bool AccountFilterModel::filterAcceptsRow(int source_row, const QModelIndex &sou
rowAccepted = false;
}
- qDebug() << "checking to filter offline user " << m_filterOfflineUsers;
-
- qDebug() << source_parent.child(source_row, 0).data(AccountsModel::PresenceTypeRole).toUInt();
-
//filter offline users out
if (m_filterOfflineUsers &&
((source_parent.child(source_row, 0).data(AccountsModel::PresenceTypeRole).toUInt()
- == Tp::ConnectionPresenceTypeOffline) ||
+ == Tp::ConnectionPresenceTypeOffline) ||
(source_parent.child(source_row, 0).data(AccountsModel::PresenceTypeRole).toUInt()
- == Tp::ConnectionPresenceTypeUnknown))) {
+ == Tp::ConnectionPresenceTypeUnknown))) {
rowAccepted = false;
}
} else {
- if (!sourceModel()->index(source_row, 0).data(AccountsModel::EnabledRole).toBool()) {
- rowAccepted = false;
- }
- if (sourceModel()->index(source_row, 0).data(AccountsModel::ConnectionStatusRole).toUInt()
- != Tp::ConnectionStatusConnected) {
-
- rowAccepted = false;
+ QModelIndex index = sourceModel()->index(source_row, 0);
+ if (index.isValid()) {
+ if (m_groupsActive) {
+ rowAccepted = true;
+ } else {
+ if (!index.data(AccountsModel::EnabledRole).toBool()) {
+ rowAccepted = false;
+ }
+ if (index.data(AccountsModel::ConnectionStatusRole).toUInt()
+ != Tp::ConnectionStatusConnected) {
+
+ rowAccepted = false;
+ }
+ }
}
}
@@ -99,34 +102,34 @@ void AccountFilterModel::clearFilterString()
bool AccountFilterModel::lessThan( const QModelIndex &left, const QModelIndex &right ) const
{
- uint leftPresence;
- uint rightPresence;
-
- QString leftDisplayedName = sourceModel()->data(left).toString();
- QString rightDisplayedName = sourceModel()->data(right).toString();
-
- if (sortRole() == AccountsModel::PresenceTypeRole) {
- leftPresence = sourceModel()->data(left, AccountsModel::PresenceTypeRole).toUInt();
- rightPresence = sourceModel()->data(right, AccountsModel::PresenceTypeRole).toUInt();
-
- if (leftPresence == rightPresence) {
- return QString::localeAwareCompare(leftDisplayedName, rightDisplayedName) < 0;
- } else {
- if (leftPresence == Tp::ConnectionPresenceTypeAvailable) {
- return true;
+ uint leftPresence;
+ uint rightPresence;
+
+ QString leftDisplayedName = sourceModel()->data(left).toString();
+ QString rightDisplayedName = sourceModel()->data(right).toString();
+
+ if (sortRole() == AccountsModel::PresenceTypeRole) {
+ leftPresence = sourceModel()->data(left, AccountsModel::PresenceTypeRole).toUInt();
+ rightPresence = sourceModel()->data(right, AccountsModel::PresenceTypeRole).toUInt();
+
+ if (leftPresence == rightPresence) {
+ return QString::localeAwareCompare(leftDisplayedName, rightDisplayedName) < 0;
+ } else {
+ if (leftPresence == Tp::ConnectionPresenceTypeAvailable) {
+ return true;
+ }
+ if (leftPresence == Tp::ConnectionPresenceTypeUnset ||
+ leftPresence == Tp::ConnectionPresenceTypeOffline ||
+ leftPresence == Tp::ConnectionPresenceTypeUnknown ||
+ leftPresence == Tp::ConnectionPresenceTypeError) {
+ return false;
+ }
+
+ return leftPresence < rightPresence;
}
- if (leftPresence == Tp::ConnectionPresenceTypeUnset ||
- leftPresence == Tp::ConnectionPresenceTypeOffline ||
- leftPresence == Tp::ConnectionPresenceTypeUnknown ||
- leftPresence == Tp::ConnectionPresenceTypeError) {
- return false;
- }
-
- return leftPresence < rightPresence;
+ } else {
+ return QString::localeAwareCompare(leftDisplayedName, rightDisplayedName) < 0;
}
- } else {
- return QString::localeAwareCompare(leftDisplayedName, rightDisplayedName) < 0;
- }
}
void AccountFilterModel::setSortByPresence(bool enabled)
@@ -143,4 +146,14 @@ bool AccountFilterModel::isSortedByPresence() const
return sortRole() == AccountsModel::PresenceTypeRole;
}
+bool AccountFilterModel::groupsActive() const
+{
+ return m_groupsActive;
+}
+
+void AccountFilterModel::setGroupsActive(bool active)
+{
+ m_groupsActive = active;
+}
+
#include "account-filter-model.moc"
diff --git a/account-filter-model.h b/account-filter-model.h
index 6591355..007c2a9 100644
--- a/account-filter-model.h
+++ b/account-filter-model.h
@@ -48,6 +48,9 @@ public:
*/
bool isSortedByPresence() const;
+ bool groupsActive() const;
+ void setGroupsActive(bool active);
+
public slots:
void filterOfflineUsers(bool filterOfflineUsers);
@@ -73,6 +76,9 @@ private:
/// Holds the string which is searched in the model
QString m_filterString;
+
+ /// True if the source is groups model
+ bool m_groupsActive;
};
#endif // ACCOUNTFILTERMODEL_H
diff --git a/accounts-model-item.cpp b/accounts-model-item.cpp
index d6fa8aa..6facdea 100644
--- a/accounts-model-item.cpp
+++ b/accounts-model-item.cpp
@@ -299,7 +299,9 @@ void AccountsModelItem::onConnectionChanged(const Tp::ConnectionPtr &connection)
if (connection.isNull()
|| !connection->isValid()
|| connection->status() == Tp::ConnectionStatusDisconnected) {
- emit childrenRemoved(this, 0, size() - 1);
+ if (size() > 0) {
+ emit childrenRemoved(this, 0, size() - 1);
+ }
return;
}
diff --git a/accounts-model.cpp b/accounts-model.cpp
index dbad4dc..47fc697 100644
--- a/accounts-model.cpp
+++ b/accounts-model.cpp
@@ -218,41 +218,18 @@ int AccountsModel::rowCount(const QModelIndex &parent) const
QVariant AccountsModel::data(const QModelIndex &index, int role) const
{
if (!index.isValid()) {
- qDebug() << "fail";
return QVariant();
}
return mPriv->node(index)->data(role);
}
-Tp::AccountPtr AccountsModel::accountForIndex(const QModelIndex &index) const
-{
- TreeNode *accountNode = mPriv->node(index);
- AccountsModelItem *item = qobject_cast<AccountsModelItem *>(accountNode);
- if (item) {
- return item->account();
- } else {
- return Tp::AccountPtr();
- }
-}
-
-Tp::ContactPtr AccountsModel::contactForIndex(const QModelIndex& index) const
-{
- TreeNode *contactNode = mPriv->node(index);
- ContactModelItem *item = qobject_cast<ContactModelItem *>(contactNode);
- if (item) {
- return item->contact();
- } else {
- return Tp::ContactPtr();
- }
-}
-Tp::AccountPtr AccountsModel::accountForContactIndex(const QModelIndex& index) const
+Tp::AccountPtr AccountsModel::accountForContactItem(ContactModelItem *contactItem) const
{
- TreeNode *contactNode = mPriv->node(index);
- AccountsModelItem *item = qobject_cast<AccountsModelItem*>(contactNode->parent());
- if (item) {
- return item->account();
+ AccountsModelItem *accountItem = qobject_cast<AccountsModelItem*>(contactItem->parent());
+ if (accountItem) {
+ return accountItem->account();
} else {
return Tp::AccountPtr();
}
diff --git a/accounts-model.h b/accounts-model.h
index 0eda7f4..96e8994 100644
--- a/accounts-model.h
+++ b/accounts-model.h
@@ -32,6 +32,8 @@
#include "accounts-model-item.h"
+class ContactModelItem;
+
class AccountsModel : public QAbstractItemModel
{
Q_OBJECT
@@ -93,10 +95,8 @@ public:
virtual int rowCount(const QModelIndex &parent = QModelIndex()) const;
virtual int columnCount(const QModelIndex &parent = QModelIndex()) const;
virtual QVariant data(const QModelIndex &index, int role) const;
- Tp::AccountPtr accountForIndex(const QModelIndex &index) const;
- Tp::ContactPtr contactForIndex(const QModelIndex &index) const;
- Tp::AccountPtr accountForContactIndex(const QModelIndex &index) const;
+ Tp::AccountPtr accountForContactItem(ContactModelItem* contactItem) const;
virtual Qt::ItemFlags flags(const QModelIndex &index) const;
virtual bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
diff --git a/contact-model-item.cpp b/contact-model-item.cpp
index 175291b..f9fb80d 100644
--- a/contact-model-item.cpp
+++ b/contact-model-item.cpp
@@ -44,6 +44,7 @@ struct ContactModelItem::Private
ContactModelItem::ContactModelItem(const Tp::ContactPtr &contact)
: mPriv(new Private(contact))
{
+
connect(contact.data(),
SIGNAL(aliasChanged(QString)),
SLOT(onChanged()));
@@ -94,7 +95,6 @@ QVariant ContactModelItem::data(int role) const
case AccountsModel::PresenceStatusRole:
return mPriv->mContact->presence().status();
case AccountsModel::PresenceTypeRole:
- qDebug() << "asked for presence type role";
return mPriv->mContact->presence().type();
case AccountsModel::PresenceMessageRole:
return mPriv->mContact->presence().statusMessage();
@@ -131,6 +131,7 @@ QVariant ContactModelItem::data(int role) const
default:
break;
}
+
return QVariant();
}
diff --git a/mainwindow.ui b/mainwindow.ui
index 024a979..a8d8d26 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -94,7 +94,44 @@
<item>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
- <widget class="QListView" name="listView"/>
+ <widget class="KCategorizedView" name="listView">
+ <property name="showDropIndicator" stdset="0">
+ <bool>false</bool>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>40</width>
+ <height>40</height>
+ </size>
+ </property>
+ <property name="verticalScrollMode">
+ <enum>QAbstractItemView::ScrollPerPixel</enum>
+ </property>
+ <property name="horizontalScrollMode">
+ <enum>QAbstractItemView::ScrollPerPixel</enum>
+ </property>
+ <property name="movement">
+ <enum>QListView::Static</enum>
+ </property>
+ <property name="flow">
+ <enum>QListView::LeftToRight</enum>
+ </property>
+ <property name="isWrapping" stdset="0">
+ <bool>true</bool>
+ </property>
+ <property name="resizeMode">
+ <enum>QListView::Adjust</enum>
+ </property>
+ <property name="viewMode">
+ <enum>QListView::IconMode</enum>
+ </property>
+ <property name="uniformItemSizes">
+ <bool>true</bool>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ </widget>
</item>
</layout>
</item>
@@ -109,6 +146,13 @@
</item>
</layout>
</widget>
+ <customwidgets>
+ <customwidget>
+ <class>KCategorizedView</class>
+ <extends>QListView</extends>
+ <header>kcategorizedview.h</header>
+ </customwidget>
+ </customwidgets>
<resources/>
<connections/>
</ui>
--
ktp-send-file packaging
More information about the pkg-kde-commits
mailing list