jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-12 17:14:52 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Rename UserList class to UserListWidget (#5473)

Browse source
This commit is contained in:
RickyRister 2025-01-14 19:07:36 -08:00 • committed by GitHub
parent 25caae6d0f
commit d09b9eb533
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
14 changed files with 48 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/server/chat_view/chat_view.h
View file

@ -2,7 +2,7 @@
#define CHATVIEW_H
#include "../../client/tabs/tab_supervisor.h"
#include "../user/user_list.h"
#include "../user/user_list_widget.h"
#include "room_message_type.h"
#include "user_level.h"
#include "user_list_proxy.h"

2
cockatrice/src/server/user/user_context_menu.cpp
View file

@ -18,7 +18,7 @@
#include "pb/response_warn_list.pb.h"
#include "pb/session_commands.pb.h"
#include "user_info_box.h"
#include "user_list.h"
#include "user_list_widget.h"
#include <QAction>
#include <QMenu>

27
cockatrice/src/server/user/user_list.cpp → cockatrice/src/server/user/user_list_widget.cpp
View file

@ -1,4 +1,4 @@
#include "user_list.h"
#include "user_list_widget.h"
#include "../../client/game_logic/abstract_client.h"
#include "../../client/tabs/tab_account.h"
@ -323,9 +323,9 @@ bool UserListItemDelegate::editorEvent(QEvent *event,
QMouseEvent *const mouseEvent = static_cast<QMouseEvent *>(event);
if (mouseEvent->button() == Qt::RightButton) {
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
static_cast<UserList *>(parent())->showContextMenu(mouseEvent->globalPosition().toPoint(), index);
static_cast<UserListWidget *>(parent())->showContextMenu(mouseEvent->globalPosition().toPoint(), index);
#else
static_cast<UserList *>(parent())->showContextMenu(mouseEvent->globalPos(), index);
static_cast<UserListWidget *>(parent())->showContextMenu(mouseEvent->globalPos(), index);
#endif
return true;
}
@ -370,7 +370,10 @@ bool UserListTWI::operator<(const QTreeWidgetItem &other) const
return QString::localeAwareCompare(data(2, Qt::UserRole).toString(), other.data(2, Qt::UserRole).toString()) < 0;
}
UserList::UserList(TabSupervisor *_tabSupervisor, AbstractClient *_client, UserListType _type, QWidget *parent)
UserListWidget::UserListWidget(TabSupervisor *_tabSupervisor,
AbstractClient *_client,
UserListType _type,
QWidget *parent)
: QGroupBox(parent), tabSupervisor(_tabSupervisor), client(_client), type(_type), onlineCount(0)
{
itemDelegate = new UserListItemDelegate(this);
@ -395,7 +398,7 @@ UserList::UserList(TabSupervisor *_tabSupervisor, AbstractClient *_client, UserL
retranslateUi();
}
void UserList::retranslateUi()
void UserListWidget::retranslateUi()
{
userContextMenu->retranslateUi();
switch (type) {
@ -415,7 +418,7 @@ void UserList::retranslateUi()
updateCount();
}
void UserList::processUserInfo(const ServerInfo_User &user, bool online)
void UserListWidget::processUserInfo(const ServerInfo_User &user, bool online)
{
const QString userName = QString::fromStdString(user.name());
UserListTWI *item = users.value(userName);
@ -432,7 +435,7 @@ void UserList::processUserInfo(const ServerInfo_User &user, bool online)
item->setOnline(online);
}
bool UserList::deleteUser(const QString &userName)
bool UserListWidget::deleteUser(const QString &userName)
{
UserListTWI *twi = users.value(userName);
if (twi) {
@ -448,7 +451,7 @@ bool UserList::deleteUser(const QString &userName)
return false;
}
void UserList::setUserOnline(const QString &userName, bool online)
void UserListWidget::setUserOnline(const QString &userName, bool online)
{
UserListTWI *twi = users.value(userName);
if (!twi)
@ -462,7 +465,7 @@ void UserList::setUserOnline(const QString &userName, bool online)
updateCount();
}
void UserList::updateCount()
void UserListWidget::updateCount()
{
QString str = titleStr;
if ((type == BuddyList) || (type == IgnoreList))
@ -470,12 +473,12 @@ void UserList::updateCount()
setTitle(str.arg(userTree->topLevelItemCount()));
}
void UserList::userClicked(QTreeWidgetItem *item, int /*column*/)
void UserListWidget::userClicked(QTreeWidgetItem *item, int /*column*/)
{
emit openMessageDialog(item->data(2, Qt::UserRole).toString(), true);
}
void UserList::showContextMenu(const QPoint &pos, const QModelIndex &index)
void UserListWidget::showContextMenu(const QPoint &pos, const QModelIndex &index)
{
const ServerInfo_User &userInfo = static_cast<UserListTWI *>(userTree->topLevelItem(index.row()))->getUserInfo();
bool online = index.sibling(index.row(), 0).data(Qt::UserRole + 1).toBool();
@ -484,7 +487,7 @@ void UserList::showContextMenu(const QPoint &pos, const QModelIndex &index)
UserLevelFlags(userInfo.user_level()), online);
}
void UserList::sortItems()
void UserListWidget::sortItems()
{
userTree->sortItems(1, Qt::AscendingOrder);
}

7
cockatrice/src/server/user/user_list.h → cockatrice/src/server/user/user_list_widget.h
View file

@ -111,7 +111,7 @@ public:
bool operator<(const QTreeWidgetItem &other) const;
};
class UserList : public QGroupBox
class UserListWidget : public QGroupBox
{
Q_OBJECT
public:
@ -144,7 +144,10 @@ signals:
void removeIgnore(const QString &userName);
public:
UserList(TabSupervisor *_tabSupervisor, AbstractClient *_client, UserListType _type, QWidget *parent = nullptr);
UserListWidget(TabSupervisor *_tabSupervisor,
AbstractClient *_client,
UserListType _type,
QWidget *parent = nullptr);
void retranslateUi();
void processUserInfo(const ServerInfo_User &user, bool online);
bool deleteUser(const QString &userName);