summaryrefslogtreecommitdiff
path: root/src/gui/widgets
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-06-15 04:12:11 +0300
committerAndrei Karas <akaras@inbox.ru>2011-06-15 04:12:11 +0300
commit9e8ae9ad161c7dc587ed8e06566bb3e8aed6bfe9 (patch)
tree4e2e6dfe772408a6837a3f0d214148aeaec762b3 /src/gui/widgets
parentf53e001120632302d214c9b90c373019448a889b (diff)
downloadmv-9e8ae9ad161c7dc587ed8e06566bb3e8aed6bfe9.tar.gz
mv-9e8ae9ad161c7dc587ed8e06566bb3e8aed6bfe9.tar.bz2
mv-9e8ae9ad161c7dc587ed8e06566bb3e8aed6bfe9.tar.xz
mv-9e8ae9ad161c7dc587ed8e06566bb3e8aed6bfe9.zip
Add option to use local time in chat.
Diffstat (limited to 'src/gui/widgets')
-rw-r--r--src/gui/widgets/chattab.cpp28
1 files changed, 19 insertions, 9 deletions
diff --git a/src/gui/widgets/chattab.cpp b/src/gui/widgets/chattab.cpp
index 76f74dec8..3f2166de0 100644
--- a/src/gui/widgets/chattab.cpp
+++ b/src/gui/widgets/chattab.cpp
@@ -221,15 +221,25 @@ void ChatTab::chatLog(std::string line, Own own,
time_t t;
time(&t);
- // Format the time string properly
- std::stringstream timeStr;
- timeStr << "[" << ((((t / 60) / 60) % 24 < 10) ? "0" : "")
- << static_cast<int>(((t / 60) / 60) % 24)
- << ":" << (((t / 60) % 60 < 10) ? "0" : "")
- << static_cast<int>((t / 60) % 60)
- << "] ";
-
- line = lineColor + timeStr.str() + tmp.nick + tmp.text;
+ if (config.getBoolValue("useLocalTime"))
+ {
+ struct tm *timeInfo;
+ timeInfo = localtime(&t);
+ line = strprintf("%s[%02d:%02d] %s%s", lineColor.c_str(),
+ timeInfo->tm_hour, timeInfo->tm_min, tmp.nick.c_str(),
+ tmp.text.c_str());
+ }
+ else
+ {
+ // Format the time string properly
+ std::stringstream timeStr;
+ timeStr << "[" << ((((t / 60) / 60) % 24 < 10) ? "0" : "")
+ << static_cast<int>(((t / 60) / 60) % 24)
+ << ":" << (((t / 60) % 60 < 10) ? "0" : "")
+ << static_cast<int>((t / 60) % 60)
+ << "] ";
+ line = lineColor + timeStr.str() + tmp.nick + tmp.text;
+ }
if (config.getBoolValue("enableChatLog"))
saveToLogFile(line);