diff --git a/src/engine/log.cpp b/src/engine/log.cpp index 091933a7..1f50fde2 100644 --- a/src/engine/log.cpp +++ b/src/engine/log.cpp @@ -75,7 +75,7 @@ Log::init() char curTime[9]; time_t now = time(NULL); tm *z = localtime(&now); - strftime(curDateTime,20,"%Y-%m-%d_%H.%M.%S",z); + strftime(curDateTime,20,"%Y-%m-%d_%H%M%S",z); strftime(curDate,11,"%Y-%m-%d",z); strftime(curTime,9,"%H:%M:%S",z); diff --git a/src/game_defs.h b/src/game_defs.h index 368b39de..c23414e4 100644 --- a/src/game_defs.h +++ b/src/game_defs.h @@ -110,8 +110,8 @@ enum PlayerActionLog { LOG_ACTION_WIN_SIDE_POT,// wins (side pot) LOG_ACTION_SIT_OUT, // sits out LOG_ACTION_WIN_GAME, // wins game - LOG_ACTION_LEFT, // left the game - LOG_ACTION_KICKED, // was kicked from + LOG_ACTION_LEFT, // has left the game + LOG_ACTION_KICKED, // was kicked from the game LOG_ACTION_ADMIN, // is game admin now LOG_ACTION_JOIN // has joined the game }; diff --git a/src/pokerth.cpp b/src/pokerth.cpp index 524edb1a..3ce53ac5 100755 --- a/src/pokerth.cpp +++ b/src/pokerth.cpp @@ -133,6 +133,21 @@ int main( int argc, char **argv ) p.setColor(QPalette::Link, QColor::fromRgb(192,192,255)); p.setColor(QPalette::LinkVisited, QColor::fromRgb(192,192,255)); a.setPalette(p); +#elif MAEMO + QString font1String("QApplication, QWidget, QDialog { font-family: \"Nimbus Sans L\"; font-size: 22px; }"); + QPalette p = a.palette(); + p.setColor(QPalette::Button, QColor::fromRgb(80,80,80)); + p.setColor(QPalette::Base, QColor::fromRgb(80,80,80)); + p.setColor(QPalette::Window, QColor::fromRgb(50,50,50)); + p.setColor(QPalette::ButtonText, QColor::fromRgb(255,255,255)); + p.setColor(QPalette::Disabled, QPalette::ButtonText, QColor::fromRgb(100,100,100)); + p.setColor(QPalette::WindowText, QColor::fromRgb(255,255,255)); + p.setColor(QPalette::Disabled, QPalette::WindowText, QColor::fromRgb(100,100,100)); + p.setColor(QPalette::Text, QColor::fromRgb(255,255,255)); + p.setColor(QPalette::Disabled, QPalette::Text, QColor::fromRgb(100,100,100)); + p.setColor(QPalette::Link, QColor::fromRgb(192,192,255)); + p.setColor(QPalette::LinkVisited, QColor::fromRgb(192,192,255)); + a.setPalette(p); #else QString font1String("QApplication, QWidget, QDialog { font-family: \"Nimbus Sans L\"; font-size: 12px; }"); #endif