← Back to branch summary

~ubuntu-branches/ubuntu/raring/mumble/raring

« back to all changes in this revision

Viewing changes to src/mumble/UserModel.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Thorvald Natvig
  • Date: 2010-01-09 19:28:50 UTC
  • mfrom: (9.1.6 sid)
  • Revision ID: james.westby@ubuntu.com-20100109192850-zs4g5vwrrpd71kob
Tags: 1.2.1-2
Fix upgrade failure when upgrading mumble-server directly from 1.1.x
to 1.2.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mumble/UserModel.cpp
1
 
/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
 
1
/* Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
2
2
   Copyright (C) 2009, Stefan Hacker <dd0t@users.sourceforge.net>
3
3
 
4
4
   All rights reserved.
243
243
 
244
244
 
245
245
int UserModel::columnCount(const QModelIndex &) const {
246
 
        return 2;
 
246
        return 1;
247
247
}
248
248
 
249
249
QModelIndex UserModel::index(int row, int column, const QModelIndex &p) const {
363
363
                        case Qt::DecorationRole:
364
364
                                if (idx.column() == 0)
365
365
                                        switch (p->tsState) {
366
 
                                                case ClientUser::TalkingOff:
367
 
                                                        return qiTalkingOff;
368
366
                                                case ClientUser::Talking:
369
367
                                                        return qiTalkingOn;
370
368
                                                case ClientUser::TalkingWhisper:
371
369
                                                        return qiTalkingWhisper;
 
370
                                                case ClientUser::TalkingWhisperChannel:
 
371
                                                        return qiTalkingWhisperChannel;
 
372
                                                case ClientUser::TalkingOff:
372
373
                                                default:
373
 
                                                        return qiTalkingWhisperChannel;
 
374
                                                        return qiTalkingOff;
374
375
                                        }
375
376
                                break;
376
377
                        case Qt::FontRole:
387
388
                                        else
388
389
                                                return p->qsName;
389
390
                                }
390
 
                                if (! p->qsFriendName.isEmpty())
391
 
                                        l << qiFriend;
392
 
                                if (p->iId >= 0)
393
 
                                        l << qiAuthenticated;
 
391
                                if (! p->qsComment.isEmpty())
 
392
                                        l << (item->bCommentSeen ? qiCommentSeen : qiComment);
394
393
                                if (p->bMute)
395
394
                                        l << qiMutedServer;
396
395
                                if (p->bSuppress)
403
402
                                        l << qiDeafenedServer;
404
403
                                if (p->bSelfDeaf)
405
404
                                        l << qiDeafenedSelf;
406
 
                                if (! p->qsComment.isEmpty())
407
 
                                        l << (item->bCommentSeen ? qiCommentSeen : qiComment);
 
405
                                if (p->iId >= 0)
 
406
                                        l << qiAuthenticated;
 
407
                                if (! p->qsFriendName.isEmpty())
 
408
                                        l << qiFriend;
408
409
                                return l;
409
410
                        default:
410
411
                                break;
702
703
 
703
704
        if (active.isValid()) {
704
705
                sel->select(active, QItemSelectionModel::SelectCurrent);
 
706
                v->setCurrentIndex(active);
705
707
        }
706
708
        if (expanded)
707
709
                v->expand(index(t));
885
887
 
886
888
void UserModel::setUserId(ClientUser *p, int id) {
887
889
        p->iId = id;
888
 
        QModelIndex idx = index(p, 1);
 
890
        QModelIndex idx = index(p, 0);
889
891
        emit dataChanged(idx, idx);
890
892
}
891
893
 
899
901
 
900
902
void UserModel::setFriendName(ClientUser *p, const QString &name) {
901
903
        p->qsFriendName = name;
902
 
        QModelIndex idx_a = index(p, 0);
903
 
        QModelIndex idx_b = index(p, 1);
904
 
        emit dataChanged(idx_a, idx_b);
 
904
        QModelIndex idx = index(p, 0);
 
905
        emit dataChanged(idx, idx);
905
906
}
906
907
 
907
908
void UserModel::setComment(ClientUser *cu, const QString &comment) {
921
922
                }
922
923
 
923
924
                if (oldstate != newstate) {
924
 
                        QModelIndex idx = index(cu, 1);
 
925
                        QModelIndex idx = index(cu, 0);
925
926
                        emit dataChanged(idx, idx);
926
927
                }
927
928
        }
944
945
                }
945
946
 
946
947
                if (oldstate != newstate) {
947
 
                        QModelIndex idx = index(c, 1);
 
948
                        QModelIndex idx = index(c, 0);
948
949
                        emit dataChanged(idx, idx);
949
950
                }
950
951
        }
1163
1164
 
1164
1165
void UserModel::userMuteDeafChanged() {
1165
1166
        ClientUser *p=static_cast<ClientUser *>(sender());
1166
 
        QModelIndex idx = index(p, 1);
 
1167
        QModelIndex idx = index(p);
1167
1168
        emit dataChanged(idx, idx);
1168
1169
        if (g.uiSession && (p->cChannel == ClientUser::get(g.uiSession)->cChannel))
1169
1170
                updateOverlay();