noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

add humanize as a dependency

Browse source
This commit is contained in:
Rasmus Karlsson 2017-06-11 21:01:08 +02:00
parent 7c3cd930f3
commit 2305afe700
5 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -4,3 +4,6 @@
[submodule "lib/settings"]
path = lib/settings
url = https://github.com/pajlada/settings
[submodule "lib/humanize"]
path = lib/humanize
url = https://github.com/pajlada/humanize.git

1
chatterino.pro
View file

@ -195,3 +195,4 @@ werr {
# External dependencies
include(dependencies/rapidjson.pri)
include(dependencies/settings.pri)
include(dependencies/humanize.pri)

2
dependencies/humanize.pri vendored Normal file
View file

@ -0,0 +1,2 @@
# settings
INCLUDEPATH += $$PWD/../lib/humanize/include/

1
lib/humanize Submodule

@ -0,0 +1 @@
Subproject commit 4e00a03623966723f23ca3034c1ad944009cd7be

13
src/messages/messagebuilder.cpp
View file

@ -33,14 +33,15 @@ void MessageBuilder::appendTimestamp(time_t time)
{
char timeStampBuffer[69];
// Add word for timestamp with no seconds
strftime(timeStampBuffer, 69, "%H:%M", localtime(&time));
QString timestamp = QString(timeStampBuffer);
strftime(timeStampBuffer, 69, "%H:%M:%S", localtime(&time));
QString timestampWithSeconds = QString(timeStampBuffer);
appendWord(Word(timestamp, Word::TimestampNoSeconds,
QString timestampNoSeconds(timeStampBuffer);
appendWord(Word(timestampNoSeconds, Word::TimestampNoSeconds,
ColorScheme::getInstance().SystemMessageColor, QString(), QString()));
// Add word for timestamp with seconds
strftime(timeStampBuffer, 69, "%H:%M:%S", localtime(&time));
QString timestampWithSeconds(timeStampBuffer);
appendWord(Word(timestampWithSeconds, Word::TimestampWithSeconds,
ColorScheme::getInstance().SystemMessageColor, QString(), QString()));
}