@@ -12,23 +12,22 @@
1212 *
1313 * You should have received a copy of the GNU General Public License
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− *
16− * Author: Michael Terry <michael.terry@canonical.com>
1715 */
1816
1917#include "Greeter.h"
2018#include "UsersModel.h"
19+#include <QIdentityProxyModel>
2120#include <QLightDM/UsersModel>
22−#include <QtCore/QSortFilterProxyModel>
2321
2422#include <libintl.h>
2523
2624// First, we define an internal class that wraps LightDM's UsersModel. This
2725// class will modify some of the data coming from LightDM. For example, we
28−// modify any empty Real Names into just normal Names.
26+// modify any empty Real Names into just normal Names. We also add optional
27+// rows, depending on configuration.
2928// (We can't modify the data directly in UsersModel below because it won't sort
3029// using the modified data.)
31−class MangleModel : public QSortFilterProxyModel
30+class MangleModel : public QIdentityProxyModel
3231{
3332 Q_OBJECT
3433
@@ -36,21 +35,41 @@ public:
3635 explicit MangleModel(QObject* parent=0);
3736
3837 QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
38+ int rowCount(const QModelIndex &parent = QModelIndex()) const override;
39+ QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
40+
41+private:
42+ int guestRow() const;
3943};
4044
4145MangleModel::MangleModel(QObject* parent)
42− : QSortFilterProxyModel(parent)
46+ : QIdentityProxyModel(parent)
4347{
4448 setSourceModel(new QLightDM::UsersModel(this));
4549}
4650
4751QVariant MangleModel::data(const QModelIndex &index, int role) const
4852{
49− QVariant variantData = QSortFilterProxyModel::data(index, role);
53+ QVariant variantData;
54+
55+ if (index.row() == guestRow() && index.column() == 0) {
56+ switch (role) {
57+ case QLightDM::UsersModel::NameRole:
58+ variantData = QStringLiteral("*guest"); break;
59+ case QLightDM::UsersModel::RealNameRole:
60+ variantData = gettext("Guest Session"); break;
61+ case QLightDM::UsersModel::LoggedInRole:
62+ variantData = false; break;
63+ case QLightDM::UsersModel::SessionRole:
64+ variantData = Greeter::instance()->defaultSessionHint(); break;
65+ }
66+ } else {
67+ variantData = QIdentityProxyModel::data(index, role);
68+ }
5069
5170 // If user's real name is empty, switch to unix name
5271 if (role == QLightDM::UsersModel::RealNameRole && variantData.toString().isEmpty()) {
53− variantData = QSortFilterProxyModel::data(index, QLightDM::UsersModel::NameRole);
72+ variantData = QIdentityProxyModel::data(index, QLightDM::UsersModel::NameRole);
5473 } else if (role == QLightDM::UsersModel::BackgroundPathRole && variantData.toString().startsWith('#')) {
5574 const QString stringData = "data:image/svg+xml,<svg><rect width='100%' height='100%' fill='" + variantData.toString() + "'/></svg>";
5675 variantData = stringData;
@@ -59,27 +78,15 @@ QVariant MangleModel::data(const QModelIndex &index, int role) const
5978 return variantData;
6079}
6180
62−// **** Now we continue with actual UsersModel class ****
63−
64−UsersModel::UsersModel(QObject* parent)
65− : UnitySortFilterProxyModelQML(parent)
66−{
67− setModel(new MangleModel(this));
68− setSortCaseSensitivity(Qt::CaseInsensitive);
69− setSortLocaleAware(true);
70− setSortRole(QLightDM::UsersModel::RealNameRole);
71− sort(0);
72−}
73−
74−int UsersModel::guestRow() const
81+int MangleModel::guestRow() const
7582{
7683 return Greeter::instance()->hasGuestAccount() ?
77− UnitySortFilterProxyModelQML::rowCount() : -1;
84+ QIdentityProxyModel::rowCount() : -1;
7885}
7986
80−int UsersModel::rowCount(const QModelIndex &parent) const
87+int MangleModel::rowCount(const QModelIndex &parent) const
8188{
82− auto count = UnitySortFilterProxyModelQML::rowCount(parent);
89+ auto count = QIdentityProxyModel::rowCount(parent);
8390
8491 if (Greeter::instance()->hasGuestAccount() && !parent.isValid())
8592 count++;
@@ -87,28 +94,38 @@ int UsersModel::rowCount(const QModelIndex &parent) const
8794 return count;
8895}
8996
90−QModelIndex UsersModel::index(int row, int column, const QModelIndex &parent) const
97+QModelIndex MangleModel::index(int row, int column, const QModelIndex &parent) const
9198{
9299 if (row == guestRow() && !parent.isValid()) {
93100 return createIndex(row, column);
94101 } else {
95− return UnitySortFilterProxyModelQML::index(row, column, parent);
102+ return QIdentityProxyModel::index(row, column, parent);
96103 }
97104}
98105
99−QVariant UsersModel::data(const QModelIndex &index, int role) const
106+// **** Now we continue with actual UsersModel class ****
107+
108+UsersModel::UsersModel(QObject* parent)
109+ : UnitySortFilterProxyModelQML(parent)
100110{
101− if (index.row() == guestRow() && index.column() == 0) {
102− switch (role) {
103− case QLightDM::UsersModel::NameRole: return QStringLiteral("*guest");
104− case QLightDM::UsersModel::RealNameRole: return gettext("Guest Session");
105− case QLightDM::UsersModel::LoggedInRole: return false;
106− case QLightDM::UsersModel::SessionRole: return Greeter::instance()->defaultSessionHint();
107− default: return QVariant();
108− }
109− }
111+ setModel(new MangleModel(this));
112+ setSortCaseSensitivity(Qt::CaseInsensitive);
113+ setSortLocaleAware(true);
114+ setSortRole(QLightDM::UsersModel::RealNameRole);
115+ sort(0);
116+}
117+
118+bool UsersModel::lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const
119+{
120+ auto leftName = source_left.data(QLightDM::UsersModel::NameRole);
121+ auto rightName = source_right.data(QLightDM::UsersModel::NameRole);
122+
123+ if (leftName == QStringLiteral("*guest"))
124+ return false;
125+ if (rightName == QStringLiteral("*guest"))
126+ return true;
110127
111− return QSortFilterProxyModel::data(index, role);
128+ return UnitySortFilterProxyModelQML::lessThan(source_left, source_right);
112129}
113130
114131#include "UsersModel.moc"