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

Merge pull request #795 from poixen/window_title_username

Browse source 
Added username to window title
This commit is contained in:
Zach 2015-03-03 18:49:46 -05:00
commit 855b7951fe
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/abstractclient.h
View file

@ -82,6 +82,8 @@ public:
ClientStatus getStatus() const { QMutexLocker locker(&clientMutex); return status; } ClientStatus getStatus() const { QMutexLocker locker(&clientMutex); return status; }
void sendCommand(const CommandContainer &cont); void sendCommand(const CommandContainer &cont);
void sendCommand(PendingCommand *pend); void sendCommand(PendingCommand *pend);
const QString getUserName() {return userName;}
static PendingCommand *prepareSessionCommand(const ::google::protobuf::Message &cmd); static PendingCommand *prepareSessionCommand(const ::google::protobuf::Message &cmd);
static PendingCommand *prepareRoomCommand(const ::google::protobuf::Message &cmd, int roomId); static PendingCommand *prepareRoomCommand(const ::google::protobuf::Message &cmd, int roomId);

2
cockatrice/src/window_main.cpp
View file

@ -287,7 +287,7 @@ void MainWindow::setClientStatusTitle()
case StatusConnecting: setWindowTitle(appName + " - " + tr("Connecting to %1...").arg(client->peerName())); break; case StatusConnecting: setWindowTitle(appName + " - " + tr("Connecting to %1...").arg(client->peerName())); break;
case StatusDisconnected: setWindowTitle(appName + " - " + tr("Disconnected")); break; case StatusDisconnected: setWindowTitle(appName + " - " + tr("Disconnected")); break;
case StatusLoggingIn: setWindowTitle(appName + " - " + tr("Connected, logging in at %1").arg(client->peerName())); break; case StatusLoggingIn: setWindowTitle(appName + " - " + tr("Connected, logging in at %1").arg(client->peerName())); break;
case StatusLoggedIn: setWindowTitle(appName + " - " + tr("Logged in at %1").arg(client->peerName())); break; case StatusLoggedIn: setWindowTitle(appName + " - " + tr("Logged in as %1 at %2").arg(client->getUserName()).arg(client->peerName())); break;
default: setWindowTitle(appName); default: setWindowTitle(appName);
} }
} }

2
cockatrice/translations/cockatrice_es.ts
View file

@ -1712,7 +1712,7 @@ La versión local es %1, la versión remota es %2.</translation>
</message> </message>
<message> <message>
<location filename="../src/window_main.cpp" line="290"/> <location filename="../src/window_main.cpp" line="290"/>
<source>Logged in at %1</source> <source>Logged in as %1 at %2</source>
<translation>Conectado en %1</translation> <translation>Conectado en %1</translation>
</message> </message>
<message> <message>