hedgewars: comparison QTfrontend/chatwidget.cpp

equal deleted inserted replaced

-:7cddc9201a1d
+:b2006a9f0fbc
 #include <QTextDocument>
 #include <QDir>
 #include <QSettings>
 #include <QFile>
 #include <QTextStream>
+#include <QScrollBar>
 #include "hwconsts.h"
 #include "SDLs.h"
 #include "gameuiconfig.h"
 #include "chatwidget.h"
-ListWidgetNickItem::ListWidgetNickItem(const QString& nick) : QListWidgetItem(nick) {}
+ListWidgetNickItem::ListWidgetNickItem(const QString& nick, bool isFriend, bool isIgnored) : QListWidgetItem(nick)
+{
+this->aFriend = isFriend;
+this->isIgnored = isIgnored;
+}
+void ListWidgetNickItem::setFriend(bool isFriend)
+{
+this->aFriend = isFriend;
+}
+void ListWidgetNickItem::setIgnored(bool isIgnored)
+{
+this->isIgnored = isIgnored;
+}
+bool ListWidgetNickItem::isFriend()
+{
+return aFriend;
+}
+bool ListWidgetNickItem::ignored()
+{
+return isIgnored;
+}
 bool ListWidgetNickItem::operator< (const QListWidgetItem & other) const
 {
 // case in-sensitive comparison of the associated strings
 // chars that are no letters are sorted at the end of the list
+ListWidgetNickItem otherNick = const_cast<ListWidgetNickItem &>(dynamic_cast<const ListWidgetNickItem &>(other));
+// ignored always down
+if (isIgnored != otherNick.ignored())
+return !isIgnored;
+// friends always up
+if (aFriend != otherNick.isFriend())
+return aFriend;
 QString txt1 = text().toLower();
 QString txt2 = other.text().toLower();
 bool firstIsShorter = (txt1.size() < txt2.size());
 for(int i = 0; i < list.size(); i++)
 stream << list[i] << endl;
 txt.close();
 }
-void HWChatWidget::updateIcon(QListWidgetItem *item)
+void HWChatWidget::updateNickItem(QListWidgetItem *nickItem)
 {
-QString nick = item->text();
+QString nick = nickItem->text();
+ListWidgetNickItem * item = dynamic_cast<ListWidgetNickItem*>(nickItem);
-if(ignoreList.contains(nick, Qt::CaseInsensitive))
+item->setFriend(friendsList.contains(nick, Qt::CaseInsensitive));
+item->setIgnored(ignoreList.contains(nick, Qt::CaseInsensitive));
+if(item->ignored())
 {
 item->setIcon(QIcon(showReady ? (item->data(Qt::UserRole).toBool() ? ":/res/chat_ignore_on.png" : ":/res/chat_ignore_off.png") : ":/res/chat_ignore.png"));
 item->setForeground(Qt::gray);
 }
-else if(friendsList.contains(nick, Qt::CaseInsensitive))
+else if(item->isFriend())
 {
 item->setIcon(QIcon(showReady ? (item->data(Qt::UserRole).toBool() ? ":/res/chat_friend_on.png" : ":/res/chat_friend_off.png") : ":/res/chat_friend.png"));
 item->setForeground(Qt::green);
 }
 else
 item->setIcon(QIcon(showReady ? (item->data(Qt::UserRole).toBool() ? ":/res/chat_default_on.png" : ":/res/chat_default_off.png") : ":/res/chat_default.png"));
 item->setForeground(QBrush(QColor(0xff, 0xcc, 0x00)));
 }
 }
-void HWChatWidget::updateIcons()
+void HWChatWidget::updateNickItems()
 {
 for(int i = 0; i < chatNicks->count(); i++)
-updateIcon(chatNicks->item(i));
+updateNickItem(chatNicks->item(i));
+chatNicks->sortItems();
 }
 void HWChatWidget::loadLists(const QString & nick)
 {
 loadList(ignoreList, nick.toLower() + "_ignore.txt");
 loadList(friendsList, nick.toLower() + "_friends.txt");
-updateIcons();
+updateNickItems();
 }
 void HWChatWidget::saveLists(const QString & nick)
 {
 saveList(ignoreList, nick.toLower() + "_ignore.txt");
 chatText->moveCursor(QTextCursor::End);
 }
 void HWChatWidget::nickAdded(const QString& nick, bool notifyNick)
 {
-QListWidgetItem * item = new ListWidgetNickItem(nick);
+QListWidgetItem * item = new ListWidgetNickItem(nick, friendsList.contains(nick, Qt::CaseInsensitive), ignoreList.contains(nick, Qt::CaseInsensitive));
-updateIcon(item);
+updateNickItem(item);
 chatNicks->addItem(item);
 if(notifyNick && notify && gameSettings->value("frontend/sound", true).toBool()) {
 Mix_PlayChannel(-1, sound[rand()%4], 0);
 }
 ignoreList.removeAll(curritem->text().toLower());
 onChatString(HWChatWidget::tr("%1 *** %2 has been removed from your ignore list").arg('\x03').arg(curritem->text()));
 }
 else // not on list - add
 {
+// don't consider ignored people friends
+if(friendsList.contains(curritem->text(), Qt::CaseInsensitive))
+emit onFriend();
+// scroll down on first ignore added so that people see where that nick went to
+if (ignoreList.isEmpty())
+emit chatNicks->verticalScrollBar()->setValue(chatNicks->verticalScrollBar()->maximum());
 ignoreList << curritem->text().toLower();
 onChatString(HWChatWidget::tr("%1 *** %2 has been added to your ignore list").arg('\x03').arg(curritem->text()));
 }
-updateIcon(curritem); // update icon
+updateNickItem(curritem); // update icon/sort order/etc
+chatNicks->sortItems();
 chatNickSelected(0); // update context menu
 }
 void HWChatWidget::onFriend()
 {
 friendsList.removeAll(curritem->text().toLower());
 onChatString(HWChatWidget::tr("%1 *** %2 has been removed from your friends list").arg('\x03').arg(curritem->text()));
 }
 else // not on list - add
 {
+// don't ignore the new friend
+if(ignoreList.contains(curritem->text(), Qt::CaseInsensitive))
+emit onIgnore();
+// scroll up on first friend added so that people see where that nick went to
+if (friendsList.isEmpty())
+emit chatNicks->verticalScrollBar()->setValue(chatNicks->verticalScrollBar()->minimum());
 friendsList << curritem->text().toLower();
 onChatString(HWChatWidget::tr("%1 *** %2 has been added to your friends list").arg('\x03').arg(curritem->text()));
 }
-updateIcon(curritem); // update icon
+updateNickItem(curritem); // update icon/sort order/etc
+chatNicks->sortItems();
 chatNickSelected(0); // update context menu
 }
 void HWChatWidget::chatNickDoubleClicked(QListWidgetItem * item)
 {
 qWarning("Bug: cannot find user in chat");
 return;
 }
 items[0]->setData(Qt::UserRole, isReady); // bulb status
-updateIcon(items[0]);
+updateNickItem(items[0]);
 // ensure we're still showing the status bulbs
 showReady = true;
 }

changeset 4884	b2006a9f0fbc
parent 4877	746ddd590dee
child 4892	b0610081ee95