gitea-mirror/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-01-15 22:42:37 -08:00
Code Issues Packages Projects Releases Wiki Activity

changed chat indentation, allow leftclick for CardInfoWidget in ChatView, changed GameSelector indentation

Browse Source
This commit is contained in:
Max-Wilhelm Bruker
2011-08-03 01:19:57 +02:00
parent c90b1b6a8e
commit a569a1b8b1
4 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
cockatrice/src/chatview.cpp
View File

@@ -47,12 +47,9 @@ void ChatView::appendMessage(QString sender, QString message, QColor playerColor
QTextCursor cursor = prepareBlock(sameSender);
lastSender = sender;
if (showTimestamps) {
if (showTimestamps && !sameSender) {
QTextCharFormat timeFormat;
if (sameSender)
timeFormat.setForeground(Qt::transparent);
else
timeFormat.setForeground(Qt::black);
timeFormat.setForeground(Qt::black);
cursor.setCharFormat(timeFormat);
cursor.insertText(QDateTime::currentDateTime().toString("[hh:mm] "));
}
@@ -69,12 +66,13 @@ void ChatView::appendMessage(QString sender, QString message, QColor playerColor
if (playerBold)
senderFormat.setFontWeight(QFont::Bold);
}
if (sameSender)
senderFormat.setForeground(Qt::transparent);
cursor.setCharFormat(senderFormat);
if (!sender.isEmpty())
sender.append(": ");
cursor.insertText(sender);
if (!sameSender) {
cursor.setCharFormat(senderFormat);
if (!sender.isEmpty())
sender.append(": ");
cursor.insertText(sender);
} else
cursor.insertText(" ");
QTextCharFormat messageFormat;
if (sender.isEmpty())
@@ -179,7 +177,7 @@ void ChatView::mouseMoveEvent(QMouseEvent *event)
void ChatView::mousePressEvent(QMouseEvent *event)
{
if (event->button() == Qt::MidButton) {
if ((event->button() == Qt::MidButton) || (event->button() == Qt::LeftButton)) {
QString cardName = getCardNameUnderMouse(event->pos());
if (!cardName.isEmpty())
emit showCardInfoPopup(event->globalPos(), cardName);
@@ -190,7 +188,7 @@ void ChatView::mousePressEvent(QMouseEvent *event)
void ChatView::mouseReleaseEvent(QMouseEvent *event)
{
if (event->button() == Qt::MidButton)
if ((event->button() == Qt::MidButton) || (event->button() == Qt::LeftButton))
emit deleteCardInfoPopup(QString("_"));
QTextBrowser::mouseReleaseEvent(event);

3
cockatrice/src/gameselector.cpp
View File

@@ -23,8 +23,9 @@ GameSelector::GameSelector(AbstractClient *_client, TabRoom *_room, const QMap<i
gameListView->setModel(gameListProxyModel);
gameListView->setSortingEnabled(true);
gameListView->setAlternatingRowColors(true);
gameListView->setRootIsDecorated(true);
if (_room)
gameListView->header()->hideSection(0);
gameListView->header()->hideSection(1);
gameListView->header()->setResizeMode(1, QHeaderView::ResizeToContents);
showFullGamesCheckBox = new QCheckBox;

8
cockatrice/src/gamesmodel.cpp
View File

@@ -30,8 +30,8 @@ QVariant GamesModel::data(const QModelIndex &index, int role) const
ServerInfo_Game *g = gameList[index.row()];
switch (index.column()) {
case 0: return rooms.value(g->getRoomId());
case 1: return g->getDescription();
case 0: return g->getDescription();
case 1: return rooms.value(g->getRoomId());
case 2: return g->getCreatorInfo()->getName();
case 3: {
QStringList result;
@@ -61,8 +61,8 @@ QVariant GamesModel::headerData(int section, Qt::Orientation orientation, int ro
if ((role != Qt::DisplayRole) || (orientation != Qt::Horizontal))
return QVariant();
switch (section) {
case 0: return tr("Room");
case 1: return tr("Description");
case 0: return tr("Description");
case 1: return tr("Room");
case 2: return tr("Creator");
case 3: return tr("Game type");
case 4: return tr("Password");

3
common/server_game.cpp
View File

@@ -75,7 +75,8 @@ void Server_Game::pingClockTimeout()
int pingTime;
if (player->getProtocolHandler()) {
pingTime = player->getProtocolHandler()->getLastCommandTime();
allPlayersInactive = false;
if (!player->getSpectator())
allPlayersInactive = false;
} else
pingTime = -1;
pingList.append(new ServerInfo_PlayerPing(player->getPlayerId(), pingTime));