aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

chat improvements

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2009-08-23 17:06:12 +02:00
parent b113b78e7c
commit 74ae1c41fc
3 changed files with 83 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
cockatrice/src/chatwidget.cpp
View file

@ -6,6 +6,7 @@ ChannelWidget::ChannelWidget(Client *_client, const QString &_name, bool readOnl
: QWidget(parent), client(_client), name(_name), virtualChannel(_virtualChannel) : QWidget(parent), client(_client), name(_name), virtualChannel(_virtualChannel)
{ {
playerList = new QListWidget; playerList = new QListWidget;
playerList->setFixedWidth(100);
textEdit = new QTextEdit; textEdit = new QTextEdit;
textEdit->setReadOnly(true); textEdit->setReadOnly(true);
@ -22,7 +23,6 @@ ChannelWidget::ChannelWidget(Client *_client, const QString &_name, bool readOnl
QHBoxLayout *hbox = new QHBoxLayout; QHBoxLayout *hbox = new QHBoxLayout;
hbox->addLayout(vbox); hbox->addLayout(vbox);
hbox->addWidget(playerList); hbox->addWidget(playerList);
playerList->setFixedWidth(100);
setLayout(hbox); setLayout(hbox);
} }
@ -76,6 +76,8 @@ ChatWidget::ChatWidget(Client *_client, QWidget *parent)
: QWidget(parent), client(_client) : QWidget(parent), client(_client)
{ {
channelList = new QTreeWidget; channelList = new QTreeWidget;
channelList->setRootIsDecorated(false);
channelList->setFixedWidth(200);
joinButton = new QPushButton; joinButton = new QPushButton;
connect(joinButton, SIGNAL(clicked()), this, SLOT(joinClicked())); connect(joinButton, SIGNAL(clicked()), this, SLOT(joinClicked()));
@ -103,8 +105,8 @@ void ChatWidget::retranslateUi()
QTreeWidgetItem *header = channelList->headerItem(); QTreeWidgetItem *header = channelList->headerItem();
Q_ASSERT(header != 0); Q_ASSERT(header != 0);
header->setText(0, tr("Channel")); header->setText(0, tr("Channel"));
header->setText(1, tr("Description")); header->setText(1, tr("Players"));
header->setText(2, tr("Players")); header->setTextAlignment(1, Qt::AlignRight);
} }
void ChatWidget::enableChat() void ChatWidget::enableChat()
@ -136,12 +138,17 @@ void ChatWidget::chatEvent(const ChatEventData &data)
for (int i = 0; i < channelList->topLevelItemCount(); ++i) { for (int i = 0; i < channelList->topLevelItemCount(); ++i) {
QTreeWidgetItem *twi = channelList->topLevelItem(i); QTreeWidgetItem *twi = channelList->topLevelItem(i);
if (twi->text(0) == msg[0]) { if (twi->text(0) == msg[0]) {
twi->setText(1, msg[1]); twi->setToolTip(0, msg[1]);
twi->setText(2, msg[2]); twi->setText(1, msg[2]);
return; return;
} }
} }
channelList->addTopLevelItem(new QTreeWidgetItem(QStringList() << msg[0] << msg[1] << msg[2])); QTreeWidgetItem *twi = new QTreeWidgetItem(QStringList() << msg[0] << msg[2]);
twi->setTextAlignment(1, Qt::AlignRight);
twi->setToolTip(0, msg[1]);
channelList->addTopLevelItem(twi);
channelList->resizeColumnToContents(0);
channelList->resizeColumnToContents(1);
if (msg[3] == "1") if (msg[3] == "1")
joinChannel(msg[0]); joinChannel(msg[0]);
break; break;

71
cockatrice/translations/cockatrice_de.ts
View file

@ -55,22 +55,22 @@
<context> <context>
<name>CardInfoWidget</name> <name>CardInfoWidget</name>
<message> <message>
<location filename="../src/cardinfowidget.cpp" line="93"/> <location filename="../src/cardinfowidget.cpp" line="94"/>
<source>Name:</source> <source>Name:</source>
<translation>Name:</translation> <translation>Name:</translation>
</message> </message>
<message> <message>
<location filename="../src/cardinfowidget.cpp" line="94"/> <location filename="../src/cardinfowidget.cpp" line="95"/>
<source>Mana cost:</source> <source>Mana cost:</source>
<translation>Manakosten:</translation> <translation>Manakosten:</translation>
</message> </message>
<message> <message>
<location filename="../src/cardinfowidget.cpp" line="95"/> <location filename="../src/cardinfowidget.cpp" line="96"/>
<source>Card type:</source> <source>Card type:</source>
<translation>Kartentyp:</translation> <translation>Kartentyp:</translation>
</message> </message>
<message> <message>
<location filename="../src/cardinfowidget.cpp" line="96"/> <location filename="../src/cardinfowidget.cpp" line="97"/>
<source>P / T:</source> <source>P / T:</source>
<translation>S/W:</translation> <translation>S/W:</translation>
</message> </message>
@ -86,12 +86,12 @@
<context> <context>
<name>ChannelWidget</name> <name>ChannelWidget</name>
<message> <message>
<location filename="../src/chatwidget.cpp" line="36"/> <location filename="../src/chatwidget.cpp" line="46"/>
<source>%1 has joined the channel.</source> <source>%1 has joined the channel.</source>
<translation>%1 hat den Raum betreten.</translation> <translation>%1 hat den Raum betreten.</translation>
</message> </message>
<message> <message>
<location filename="../src/chatwidget.cpp" line="47"/> <location filename="../src/chatwidget.cpp" line="57"/>
<source>%1 has left the channel.</source> <source>%1 has left the channel.</source>
<translation>%1 hat den Raum verlassen.</translation> <translation>%1 hat den Raum verlassen.</translation>
</message> </message>
@ -99,22 +99,21 @@
<context> <context>
<name>ChatWidget</name> <name>ChatWidget</name>
<message> <message>
<location filename="../src/chatwidget.cpp" line="86"/> <location filename="../src/chatwidget.cpp" line="103"/>
<source>Joi&amp;n</source> <source>Joi&amp;n</source>
<translation>Teil&amp;nehmen</translation> <translation>Teil&amp;nehmen</translation>
</message> </message>
<message> <message>
<location filename="../src/chatwidget.cpp" line="90"/> <location filename="../src/chatwidget.cpp" line="107"/>
<source>Channel</source> <source>Channel</source>
<translation>Raum</translation> <translation>Raum</translation>
</message> </message>
<message> <message>
<location filename="../src/chatwidget.cpp" line="91"/>
<source>Description</source> <source>Description</source>
<translation>Beschreibung</translation> <translation type="obsolete">Beschreibung</translation>
</message> </message>
<message> <message>
<location filename="../src/chatwidget.cpp" line="92"/> <location filename="../src/chatwidget.cpp" line="108"/>
<source>Players</source> <source>Players</source>
<translation>Spielerzahl</translation> <translation>Spielerzahl</translation>
</message> </message>
@ -572,32 +571,32 @@
<context> <context>
<name>GameSelector</name> <name>GameSelector</name>
<message> <message>
<location filename="../src/gameselector.cpp" line="101"/> <location filename="../src/gameselector.cpp" line="94"/>
<source>C&amp;reate</source> <source>C&amp;reate</source>
<translation>Spiel e&amp;rstellen</translation> <translation>Spiel e&amp;rstellen</translation>
</message> </message>
<message> <message>
<location filename="../src/gameselector.cpp" line="102"/> <location filename="../src/gameselector.cpp" line="95"/>
<source>&amp;Join</source> <source>&amp;Join</source>
<translation>&amp;Teilnehmen</translation> <translation>&amp;Teilnehmen</translation>
</message> </message>
<message> <message>
<location filename="../src/gameselector.cpp" line="59"/> <location filename="../src/gameselector.cpp" line="53"/>
<source>Error</source> <source>Error</source>
<translation>Fehler</translation> <translation>Fehler</translation>
</message> </message>
<message> <message>
<location filename="../src/gameselector.cpp" line="59"/> <location filename="../src/gameselector.cpp" line="53"/>
<source>XXX</source> <source>XXX</source>
<translation>XXX</translation> <translation>XXX</translation>
</message> </message>
<message> <message>
<location filename="../src/gameselector.cpp" line="73"/> <location filename="../src/gameselector.cpp" line="67"/>
<source>Join game</source> <source>Join game</source>
<translation>Spiel beitreten</translation> <translation>Spiel beitreten</translation>
</message> </message>
<message> <message>
<location filename="../src/gameselector.cpp" line="73"/> <location filename="../src/gameselector.cpp" line="67"/>
<source>Password:</source> <source>Password:</source>
<translation>Passwort:</translation> <translation>Passwort:</translation>
</message> </message>
@ -695,97 +694,97 @@
<context> <context>
<name>MainWindow</name> <name>MainWindow</name>
<message> <message>
<location filename="../src/window_main.cpp" line="191"/> <location filename="../src/window_main.cpp" line="193"/>
<source>Error</source> <source>Error</source>
<translation>Fehler</translation> <translation>Fehler</translation>
</message> </message>
<message> <message>
<location filename="../src/window_main.cpp" line="191"/> <location filename="../src/window_main.cpp" line="193"/>
<source>Server timeout</source> <source>Server timeout</source>
<translation>Server Zeitüberschreitung</translation> <translation>Server Zeitüberschreitung</translation>
</message> </message>
<message> <message>
<location filename="../src/window_main.cpp" line="198"/> <location filename="../src/window_main.cpp" line="200"/>
<source>&amp;Connect...</source> <source>&amp;Connect...</source>
<translation>&amp;Verbinden...</translation> <translation>&amp;Verbinden...</translation>
</message> </message>
<message> <message>
<location filename="../src/window_main.cpp" line="199"/> <location filename="../src/window_main.cpp" line="201"/>
<source>&amp;Disconnect</source> <source>&amp;Disconnect</source>
<translation>Verbindung &amp;trennen</translation> <translation>Verbindung &amp;trennen</translation>
</message> </message>
<message> <message>
<location filename="../src/window_main.cpp" line="200"/> <location filename="../src/window_main.cpp" line="202"/>
<source>&amp;Restart game...</source> <source>&amp;Restart game...</source>
<translation>Spiel neu sta&amp;rten...</translation> <translation>Spiel neu sta&amp;rten...</translation>
</message> </message>
<message> <message>
<location filename="../src/window_main.cpp" line="201"/> <location filename="../src/window_main.cpp" line="203"/>
<source>F2</source> <source>F2</source>
<translation>F2</translation> <translation>F2</translation>
</message> </message>
<message> <message>
<location filename="../src/window_main.cpp" line="202"/> <location filename="../src/window_main.cpp" line="204"/>
<source>&amp;Leave game</source> <source>&amp;Leave game</source>
<translation>Spiel ver&amp;lassen</translation> <translation>Spiel ver&amp;lassen</translation>
</message> </message>
<message> <message>
<location filename="../src/window_main.cpp" line="203"/> <location filename="../src/window_main.cpp" line="205"/>
<source>&amp;Deck editor</source> <source>&amp;Deck editor</source>
<translation>&amp;Deck-Editor</translation> <translation>&amp;Deck-Editor</translation>
</message> </message>
<message> <message>
<location filename="../src/window_main.cpp" line="204"/> <location filename="../src/window_main.cpp" line="206"/>
<source>&amp;Full screen</source> <source>&amp;Full screen</source>
<translation>&amp;Vollbild</translation> <translation>&amp;Vollbild</translation>
</message> </message>
<message> <message>
<location filename="../src/window_main.cpp" line="205"/> <location filename="../src/window_main.cpp" line="207"/>
<source>Ctrl+F</source> <source>Ctrl+F</source>
<translation>Ctrl+F</translation> <translation>Ctrl+F</translation>
</message> </message>
<message> <message>
<location filename="../src/window_main.cpp" line="206"/> <location filename="../src/window_main.cpp" line="208"/>
<source>&amp;Settings...</source> <source>&amp;Settings...</source>
<translation>&amp;Einstellungen...</translation> <translation>&amp;Einstellungen...</translation>
</message> </message>
<message> <message>
<location filename="../src/window_main.cpp" line="207"/> <location filename="../src/window_main.cpp" line="209"/>
<source>&amp;Exit</source> <source>&amp;Exit</source>
<translation>&amp;Beenden</translation> <translation>&amp;Beenden</translation>
</message> </message>
<message> <message>
<location filename="../src/window_main.cpp" line="208"/> <location filename="../src/window_main.cpp" line="210"/>
<source>Close most recent zone view</source> <source>Close most recent zone view</source>
<translation>Letzte Zonenansicht schließen</translation> <translation>Letzte Zonenansicht schließen</translation>
</message> </message>
<message> <message>
<location filename="../src/window_main.cpp" line="209"/> <location filename="../src/window_main.cpp" line="211"/>
<source>Esc</source> <source>Esc</source>
<translation>Esc</translation> <translation>Esc</translation>
</message> </message>
<message> <message>
<location filename="../src/window_main.cpp" line="211"/> <location filename="../src/window_main.cpp" line="213"/>
<source>&amp;Game</source> <source>&amp;Game</source>
<translation>Spi&amp;el</translation> <translation>Spi&amp;el</translation>
</message> </message>
<message> <message>
<location filename="../src/window_main.cpp" line="212"/> <location filename="../src/window_main.cpp" line="214"/>
<source>&amp;Actions</source> <source>&amp;Actions</source>
<translation>&amp;Aktionen</translation> <translation>&amp;Aktionen</translation>
</message> </message>
<message> <message>
<location filename="../src/window_main.cpp" line="213"/> <location filename="../src/window_main.cpp" line="215"/>
<source>&amp;Card</source> <source>&amp;Card</source>
<translation>&amp;Karte</translation> <translation>&amp;Karte</translation>
</message> </message>
<message> <message>
<location filename="../src/window_main.cpp" line="215"/> <location filename="../src/window_main.cpp" line="217"/>
<source>&amp;Say:</source> <source>&amp;Say:</source>
<translation>&amp;Sagen:</translation> <translation>&amp;Sagen:</translation>
</message> </message>
<message> <message>
<location filename="../src/window_main.cpp" line="196"/> <location filename="../src/window_main.cpp" line="198"/>
<source>Cockatrice</source> <source>Cockatrice</source>
<translation>Cockatrice</translation> <translation>Cockatrice</translation>
</message> </message>

73
cockatrice/translations/cockatrice_en.ts
View file

@ -32,22 +32,22 @@
<context> <context>
<name>CardInfoWidget</name> <name>CardInfoWidget</name>
<message> <message>
<location filename="../src/cardinfowidget.cpp" line="93"/> <location filename="../src/cardinfowidget.cpp" line="94"/>
<source>Name:</source> <source>Name:</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/cardinfowidget.cpp" line="94"/> <location filename="../src/cardinfowidget.cpp" line="95"/>
<source>Mana cost:</source> <source>Mana cost:</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/cardinfowidget.cpp" line="95"/> <location filename="../src/cardinfowidget.cpp" line="96"/>
<source>Card type:</source> <source>Card type:</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/cardinfowidget.cpp" line="96"/> <location filename="../src/cardinfowidget.cpp" line="97"/>
<source>P / T:</source> <source>P / T:</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -55,12 +55,12 @@
<context> <context>
<name>ChannelWidget</name> <name>ChannelWidget</name>
<message> <message>
<location filename="../src/chatwidget.cpp" line="36"/> <location filename="../src/chatwidget.cpp" line="46"/>
<source>%1 has joined the channel.</source> <source>%1 has joined the channel.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/chatwidget.cpp" line="47"/> <location filename="../src/chatwidget.cpp" line="57"/>
<source>%1 has left the channel.</source> <source>%1 has left the channel.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -68,22 +68,17 @@
<context> <context>
<name>ChatWidget</name> <name>ChatWidget</name>
<message> <message>
<location filename="../src/chatwidget.cpp" line="86"/> <location filename="../src/chatwidget.cpp" line="103"/>
<source>Joi&amp;n</source> <source>Joi&amp;n</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/chatwidget.cpp" line="90"/> <location filename="../src/chatwidget.cpp" line="107"/>
<source>Channel</source> <source>Channel</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/chatwidget.cpp" line="91"/> <location filename="../src/chatwidget.cpp" line="108"/>
<source>Description</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/chatwidget.cpp" line="92"/>
<source>Players</source> <source>Players</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -478,32 +473,32 @@
<context> <context>
<name>GameSelector</name> <name>GameSelector</name>
<message> <message>
<location filename="../src/gameselector.cpp" line="101"/> <location filename="../src/gameselector.cpp" line="94"/>
<source>C&amp;reate</source> <source>C&amp;reate</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/gameselector.cpp" line="102"/> <location filename="../src/gameselector.cpp" line="95"/>
<source>&amp;Join</source> <source>&amp;Join</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/gameselector.cpp" line="59"/> <location filename="../src/gameselector.cpp" line="53"/>
<source>Error</source> <source>Error</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/gameselector.cpp" line="59"/> <location filename="../src/gameselector.cpp" line="53"/>
<source>XXX</source> <source>XXX</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/gameselector.cpp" line="73"/> <location filename="../src/gameselector.cpp" line="67"/>
<source>Join game</source> <source>Join game</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/gameselector.cpp" line="73"/> <location filename="../src/gameselector.cpp" line="67"/>
<source>Password:</source> <source>Password:</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -601,97 +596,97 @@
<context> <context>
<name>MainWindow</name> <name>MainWindow</name>
<message> <message>
<location filename="../src/window_main.cpp" line="191"/> <location filename="../src/window_main.cpp" line="193"/>
<source>Error</source> <source>Error</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/window_main.cpp" line="191"/> <location filename="../src/window_main.cpp" line="193"/>
<source>Server timeout</source> <source>Server timeout</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/window_main.cpp" line="198"/> <location filename="../src/window_main.cpp" line="200"/>
<source>&amp;Connect...</source> <source>&amp;Connect...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/window_main.cpp" line="199"/> <location filename="../src/window_main.cpp" line="201"/>
<source>&amp;Disconnect</source> <source>&amp;Disconnect</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/window_main.cpp" line="200"/> <location filename="../src/window_main.cpp" line="202"/>
<source>&amp;Restart game...</source> <source>&amp;Restart game...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/window_main.cpp" line="201"/> <location filename="../src/window_main.cpp" line="203"/>
<source>F2</source> <source>F2</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/window_main.cpp" line="202"/> <location filename="../src/window_main.cpp" line="204"/>
<source>&amp;Leave game</source> <source>&amp;Leave game</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/window_main.cpp" line="203"/> <location filename="../src/window_main.cpp" line="205"/>
<source>&amp;Deck editor</source> <source>&amp;Deck editor</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/window_main.cpp" line="204"/> <location filename="../src/window_main.cpp" line="206"/>
<source>&amp;Full screen</source> <source>&amp;Full screen</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/window_main.cpp" line="205"/> <location filename="../src/window_main.cpp" line="207"/>
<source>Ctrl+F</source> <source>Ctrl+F</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/window_main.cpp" line="206"/> <location filename="../src/window_main.cpp" line="208"/>
<source>&amp;Settings...</source> <source>&amp;Settings...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/window_main.cpp" line="207"/> <location filename="../src/window_main.cpp" line="209"/>
<source>&amp;Exit</source> <source>&amp;Exit</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/window_main.cpp" line="208"/> <location filename="../src/window_main.cpp" line="210"/>
<source>Close most recent zone view</source> <source>Close most recent zone view</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/window_main.cpp" line="209"/> <location filename="../src/window_main.cpp" line="211"/>
<source>Esc</source> <source>Esc</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/window_main.cpp" line="211"/> <location filename="../src/window_main.cpp" line="213"/>
<source>&amp;Game</source> <source>&amp;Game</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/window_main.cpp" line="212"/> <location filename="../src/window_main.cpp" line="214"/>
<source>&amp;Actions</source> <source>&amp;Actions</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/window_main.cpp" line="213"/> <location filename="../src/window_main.cpp" line="215"/>
<source>&amp;Card</source> <source>&amp;Card</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/window_main.cpp" line="215"/> <location filename="../src/window_main.cpp" line="217"/>
<source>&amp;Say:</source> <source>&amp;Say:</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/window_main.cpp" line="196"/> <location filename="../src/window_main.cpp" line="198"/>
<source>Cockatrice</source> <source>Cockatrice</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>