# HG changeset patch # User sheepluva # Date 1319900086 -7200 # Node ID 810b9ced2b671a892a89ba147ec17a76689318ca # Parent 4c834af76c3bb9b75272d7751fca65ee3745c96c change default timestamp format to hh:mm diff -r 4c834af76c3b -r 810b9ced2b67 QTfrontend/res/css/chat.css --- a/QTfrontend/res/css/chat.css Sat Oct 29 15:31:45 2011 +0200 +++ b/QTfrontend/res/css/chat.css Sat Oct 29 16:54:46 2011 +0200 @@ -62,8 +62,8 @@ /* display: none; */ } -.timestamp:hours { display: none; } -/* .timestamp:seconds { display: none; } */ +/* .timestamp:hours { display: none; } */ +.timestamp:seconds { display: none; } /* you can also set timestamp style for different msg types */ .msg_FriendChat .timestamp { color: #ffffff; } diff -r 4c834af76c3b -r 810b9ced2b67 QTfrontend/ui/widget/chatwidget.cpp --- a/QTfrontend/ui/widget/chatwidget.cpp Sat Oct 29 15:31:45 2011 +0200 +++ b/QTfrontend/ui/widget/chatwidget.cpp Sat Oct 29 16:54:46 2011 +0200 @@ -191,9 +191,9 @@ { s_isTimeStamped = true; s_tsFormat = - ((victims.contains("timestamp:hours"))?"":"hh") + - QString(":mm:") + - ((victims.contains("timestamp:seconds"))?"":"ss"); + ((victims.contains("timestamp:hours"))?"":"hh:") + + QString("mm") + + ((victims.contains("timestamp:seconds"))?"":":ss"); } victims.removeAll("timestamp:hours");