implements: Change the behaviour of the "Display idle players" sorting

menu #112
This commit is contained in:
doitux
2012-02-04 00:11:19 +00:00
parent 59be0ff560
commit b3239ee0cc
7 changed files with 81 additions and 54 deletions
+5 -1
View File
@@ -708,7 +708,11 @@
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QTextBrowser" name="textBrowser_ChatDisplay"/>
<widget class="QTextBrowser" name="textBrowser_ChatDisplay">
<property name="openExternalLinks">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLineEdit" name="lineEdit_ChatInput"/>
@@ -32,7 +32,7 @@ using namespace std;
gameLobbyDialogImpl::gameLobbyDialogImpl(startWindowImpl *parent, ConfigFile *c)
: QDialog(parent), myW(NULL), myStartWindow(parent), myConfig(c), currentGameName(""), myPlayerId(0), isGameAdministrator(false), inGame(false), guestMode(false), blinkingButtonAnimationState(true), myChat(NULL), keyUpCounter(0), infoMsgToShowId(0), currentInvitationGameId(0), inviteDialogIsCurrentlyShown(false), autoStartTimerCounter(0)
: QDialog(parent), myW(NULL), myStartWindow(parent), myConfig(c), currentGameName(""), myPlayerId(0), isGameAdministrator(false), inGame(false), guestMode(false), blinkingButtonAnimationState(true), myChat(NULL), keyUpCounter(0), infoMsgToShowId(0), currentInvitationGameId(0), inviteDialogIsCurrentlyShown(false), autoStartTimerCounter(0), lastNickListFilterState(0)
{
#ifdef __APPLE__
@@ -1495,12 +1495,22 @@ void gameLobbyDialogImpl::changeGameListFilter(int index)
void gameLobbyDialogImpl::changeNickListFilter(int state)
{
if(lastNickListFilterState == 0) {
myNickListSortFilterProxyModel->setLastFilterStateCountry(false);
myNickListSortFilterProxyModel->setLastFilterStateAlpha(true);
}
else if(lastNickListFilterState == 1) {
myNickListSortFilterProxyModel->setLastFilterStateCountry(true);
myNickListSortFilterProxyModel->setLastFilterStateAlpha(false);
}
myNickListSortFilterProxyModel->setFilterState(state);
myNickListModel->sort(0, Qt::DescendingOrder);
myNickListSortFilterProxyModel->setFilterRegExp(QString());
myNickListSortFilterProxyModel->setFilterKeyColumn(0);
lastNickListFilterState = state;
writeDialogSettings(2);
}
@@ -198,6 +198,7 @@ private:
QLabel *autoStartTimerOverlay;
int autoStartTimerCounter;
int lastNickListFilterState;
protected:
bool eventFilter(QObject *obj, QEvent *event);
@@ -63,7 +63,14 @@ bool MyNickListSortFilterProxyModel::lessThan(const QModelIndex &left, const QMo
}
break;
case 2: {
return QSortFilterProxyModel::lessThan(left, right);
if(lastFilterStateCountry) {
QString leftCountryAndName(sourceModel()->data(left, 33).toString().toUpper()+sourceModel()->data(left, Qt::DisplayRole).toString().toLower());
QString rightCountryAndName(sourceModel()->data(right, 33).toString().toUpper()+sourceModel()->data(right, Qt::DisplayRole).toString().toLower());
return leftCountryAndName < rightCountryAndName;
}
else if(lastFilterStateAlpha) {
return QSortFilterProxyModel::lessThan(left, right);
}
}
break;
}
@@ -28,6 +28,8 @@ public:
MyNickListSortFilterProxyModel(QObject *parent = 0);
void setFilterState(int state);
void setLastFilterStateCountry( bool country ) { lastFilterStateCountry = country;}
void setLastFilterStateAlpha( bool alpha ) { lastFilterStateAlpha = alpha;}
protected:
bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;
@@ -36,7 +38,8 @@ protected:
private:
int filterState;
bool lastFilterStateCountry;
bool lastFilterStateAlpha;
};
+52 -49
View File
@@ -299,7 +299,7 @@ p, li { white-space: pre-wrap; }
</rect>
</property>
<property name="text">
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
</property>
</widget>
<widget class="QLabel" name="label_Star23">
@@ -312,7 +312,7 @@ p, li { white-space: pre-wrap; }
</rect>
</property>
<property name="text">
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
</property>
</widget>
<widget class="QLabel" name="label_Star53">
@@ -325,7 +325,7 @@ p, li { white-space: pre-wrap; }
</rect>
</property>
<property name="text">
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
</property>
</widget>
<widget class="QLabel" name="label_Star43">
@@ -338,7 +338,7 @@ p, li { white-space: pre-wrap; }
</rect>
</property>
<property name="text">
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
</property>
</widget>
<widget class="QLabel" name="label_Star13">
@@ -602,7 +602,7 @@ p, li { white-space: pre-wrap; }
</rect>
</property>
<property name="text">
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
</property>
</widget>
<widget class="QLabel" name="label_Star22">
@@ -615,7 +615,7 @@ p, li { white-space: pre-wrap; }
</rect>
</property>
<property name="text">
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
</property>
</widget>
<widget class="QLabel" name="label_Star32">
@@ -628,7 +628,7 @@ p, li { white-space: pre-wrap; }
</rect>
</property>
<property name="text">
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
</property>
</widget>
<widget class="QLabel" name="label_Star42">
@@ -641,7 +641,7 @@ p, li { white-space: pre-wrap; }
</rect>
</property>
<property name="text">
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
</property>
</widget>
<widget class="QLabel" name="label_Star52">
@@ -654,7 +654,7 @@ p, li { white-space: pre-wrap; }
</rect>
</property>
<property name="text">
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
</property>
</widget>
</widget>
@@ -915,7 +915,7 @@ p, li { white-space: pre-wrap; }
</rect>
</property>
<property name="text">
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
</property>
</widget>
<widget class="QLabel" name="label_Star24">
@@ -928,7 +928,7 @@ p, li { white-space: pre-wrap; }
</rect>
</property>
<property name="text">
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
</property>
</widget>
<widget class="QLabel" name="label_Star54">
@@ -941,7 +941,7 @@ p, li { white-space: pre-wrap; }
</rect>
</property>
<property name="text">
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
</property>
</widget>
<widget class="QLabel" name="label_Star44">
@@ -954,7 +954,7 @@ p, li { white-space: pre-wrap; }
</rect>
</property>
<property name="text">
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
</property>
</widget>
<widget class="QLabel" name="label_Star14">
@@ -967,7 +967,7 @@ p, li { white-space: pre-wrap; }
</rect>
</property>
<property name="text">
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
</property>
</widget>
</widget>
@@ -1205,7 +1205,7 @@ p, li { white-space: pre-wrap; }
</rect>
</property>
<property name="text">
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
</property>
</widget>
<widget class="QLabel" name="label_Star25">
@@ -1218,7 +1218,7 @@ p, li { white-space: pre-wrap; }
</rect>
</property>
<property name="text">
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
</property>
</widget>
<widget class="QLabel" name="label_Star55">
@@ -1231,7 +1231,7 @@ p, li { white-space: pre-wrap; }
</rect>
</property>
<property name="text">
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
</property>
</widget>
<widget class="QLabel" name="label_Star45">
@@ -1244,7 +1244,7 @@ p, li { white-space: pre-wrap; }
</rect>
</property>
<property name="text">
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
</property>
</widget>
<widget class="QLabel" name="label_Star15">
@@ -1257,7 +1257,7 @@ p, li { white-space: pre-wrap; }
</rect>
</property>
<property name="text">
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
</property>
</widget>
</widget>
@@ -1495,7 +1495,7 @@ p, li { white-space: pre-wrap; }
</rect>
</property>
<property name="text">
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
</property>
</widget>
<widget class="QLabel" name="label_Star26">
@@ -1508,7 +1508,7 @@ p, li { white-space: pre-wrap; }
</rect>
</property>
<property name="text">
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
</property>
</widget>
<widget class="QLabel" name="label_Star56">
@@ -1521,7 +1521,7 @@ p, li { white-space: pre-wrap; }
</rect>
</property>
<property name="text">
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
</property>
</widget>
<widget class="QLabel" name="label_Star46">
@@ -1534,7 +1534,7 @@ p, li { white-space: pre-wrap; }
</rect>
</property>
<property name="text">
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
</property>
</widget>
<widget class="QLabel" name="label_Star16">
@@ -1547,7 +1547,7 @@ p, li { white-space: pre-wrap; }
</rect>
</property>
<property name="text">
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
</property>
</widget>
</widget>
@@ -1805,7 +1805,7 @@ p, li { white-space: pre-wrap; }
</rect>
</property>
<property name="text">
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
</property>
</widget>
<widget class="QLabel" name="label_Star27">
@@ -1818,7 +1818,7 @@ p, li { white-space: pre-wrap; }
</rect>
</property>
<property name="text">
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
</property>
</widget>
<widget class="QLabel" name="label_Star57">
@@ -1831,7 +1831,7 @@ p, li { white-space: pre-wrap; }
</rect>
</property>
<property name="text">
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
</property>
</widget>
<widget class="QLabel" name="label_Star47">
@@ -1844,7 +1844,7 @@ p, li { white-space: pre-wrap; }
</rect>
</property>
<property name="text">
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
</property>
</widget>
<widget class="QLabel" name="label_Star17">
@@ -1857,7 +1857,7 @@ p, li { white-space: pre-wrap; }
</rect>
</property>
<property name="text">
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
</property>
</widget>
</widget>
@@ -2108,7 +2108,7 @@ p, li { white-space: pre-wrap; }
</rect>
</property>
<property name="text">
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
</property>
</widget>
<widget class="QLabel" name="label_Star28">
@@ -2121,7 +2121,7 @@ p, li { white-space: pre-wrap; }
</rect>
</property>
<property name="text">
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
</property>
</widget>
<widget class="QLabel" name="label_Star58">
@@ -2134,7 +2134,7 @@ p, li { white-space: pre-wrap; }
</rect>
</property>
<property name="text">
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
</property>
</widget>
<widget class="QLabel" name="label_Star48">
@@ -2147,7 +2147,7 @@ p, li { white-space: pre-wrap; }
</rect>
</property>
<property name="text">
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
</property>
</widget>
<widget class="QLabel" name="label_Star18">
@@ -2160,7 +2160,7 @@ p, li { white-space: pre-wrap; }
</rect>
</property>
<property name="text">
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
</property>
</widget>
</widget>
@@ -2873,7 +2873,7 @@ p, li { white-space: pre-wrap; }
</rect>
</property>
<property name="text">
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
</property>
</widget>
<widget class="QLabel" name="label_Star21">
@@ -2886,7 +2886,7 @@ p, li { white-space: pre-wrap; }
</rect>
</property>
<property name="text">
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
</property>
</widget>
<widget class="QLabel" name="label_Star51">
@@ -2899,7 +2899,7 @@ p, li { white-space: pre-wrap; }
</rect>
</property>
<property name="text">
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
</property>
</widget>
<widget class="QLabel" name="label_Star41">
@@ -2912,7 +2912,7 @@ p, li { white-space: pre-wrap; }
</rect>
</property>
<property name="text">
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
</property>
</widget>
<widget class="QLabel" name="label_Star11">
@@ -2925,7 +2925,7 @@ p, li { white-space: pre-wrap; }
</rect>
</property>
<property name="text">
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
</property>
</widget>
</widget>
@@ -3176,7 +3176,7 @@ p, li { white-space: pre-wrap; }
</rect>
</property>
<property name="text">
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
</property>
</widget>
<widget class="QLabel" name="label_Star20">
@@ -3189,7 +3189,7 @@ p, li { white-space: pre-wrap; }
</rect>
</property>
<property name="text">
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
</property>
</widget>
<widget class="QLabel" name="label_Star50">
@@ -3202,7 +3202,7 @@ p, li { white-space: pre-wrap; }
</rect>
</property>
<property name="text">
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
</property>
</widget>
<widget class="QLabel" name="label_Star40">
@@ -3215,7 +3215,7 @@ p, li { white-space: pre-wrap; }
</rect>
</property>
<property name="text">
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
</property>
</widget>
<widget class="QLabel" name="label_Star10">
@@ -3228,7 +3228,7 @@ p, li { white-space: pre-wrap; }
</rect>
</property>
<property name="text">
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
</property>
</widget>
</widget>
@@ -3466,7 +3466,7 @@ p, li { white-space: pre-wrap; }
</rect>
</property>
<property name="text">
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
</property>
</widget>
<widget class="QLabel" name="label_Star29">
@@ -3479,7 +3479,7 @@ p, li { white-space: pre-wrap; }
</rect>
</property>
<property name="text">
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
</property>
</widget>
<widget class="QLabel" name="label_Star59">
@@ -3492,7 +3492,7 @@ p, li { white-space: pre-wrap; }
</rect>
</property>
<property name="text">
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
</property>
</widget>
<widget class="QLabel" name="label_Star49">
@@ -3505,7 +3505,7 @@ p, li { white-space: pre-wrap; }
</rect>
</property>
<property name="text">
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
</property>
</widget>
<widget class="QLabel" name="label_Star19">
@@ -3518,7 +3518,7 @@ p, li { white-space: pre-wrap; }
</rect>
</property>
<property name="text">
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
<string notr="true">&lt;a&gt;&amp;#9734;&lt;/a&gt;</string>
</property>
</widget>
</widget>
@@ -3635,6 +3635,9 @@ p, li { white-space: pre-wrap; }
<property name="horizontalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0">
-1
View File
@@ -42,7 +42,6 @@ MyAvatarLabel::MyAvatarLabel(QGroupBox* parent)
action_ReportBadAvatar = new QAction(QIcon(":/gfx/emblem-important.png"), tr("Report inappropriate avatar"), myContextMenu);
myContextMenu->addAction(action_ReportBadAvatar);
connect( action_VoteForKick, SIGNAL ( triggered() ), this, SLOT ( sendTriggerVoteOnKickSignal() ) );
connect( action_IgnorePlayer, SIGNAL ( triggered() ), this, SLOT ( putPlayerOnIgnoreList() ) );
connect( action_ReportBadAvatar, SIGNAL ( triggered() ), this, SLOT ( reportBadAvatar() ) );