Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Donald Haase
Cockatrice
Commits
855b7951
Commit
855b7951
authored
Mar 03, 2015
by
Zach
Browse files
Merge pull request #795 from poixen/window_title_username
Added username to window title
parents
ebf08836
8f732325
Changes
3
Hide whitespace changes
Inline
Side-by-side
cockatrice/src/abstractclient.h
View file @
855b7951
...
@@ -82,6 +82,8 @@ public:
...
@@ -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
);
...
...
cockatrice/src/window_main.cpp
View file @
855b7951
...
@@ -287,7 +287,7 @@ void MainWindow::setClientStatusTitle()
...
@@ -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 a
t %1"
).
arg
(
client
->
peerName
()));
break
;
case
StatusLoggedIn
:
setWindowTitle
(
appName
+
" - "
+
tr
(
"Logged in a
s %1 at %2"
).
arg
(
client
->
getUserName
()
).
arg
(
client
->
peerName
()));
break
;
default:
setWindowTitle
(
appName
);
default:
setWindowTitle
(
appName
);
}
}
}
}
...
...
cockatrice/translations/cockatrice_es.ts
View file @
855b7951
...
@@ -1712,7 +1712,7 @@ La versión local es %1, la versión remota es %2.</translation>
...
@@ -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
a
t
%
1
<
/source
>
<
source
>
Logged
in
a
s
%
1
at
%
2
<
/source
>
<
translation
>
Conectado
en
%
1
<
/translation
>
<
translation
>
Conectado
en
%
1
<
/translation
>
<
/message
>
<
/message
>
<
message
>
<
message
>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment