| 1 | Index: welcomedialog.h |
|---|
| 2 | =================================================================== |
|---|
| 3 | --- welcomedialog.h (revision 15218) |
|---|
| 4 | +++ welcomedialog.h (working copy) |
|---|
| 5 | @@ -70,6 +70,7 @@ |
|---|
| 6 | |
|---|
| 7 | QString m_installDir; |
|---|
| 8 | QString m_timeFormat; |
|---|
| 9 | + QString m_dateFormat; |
|---|
| 10 | bool m_isRecording; |
|---|
| 11 | bool m_hasConflicts; |
|---|
| 12 | bool m_bWillShutdown; |
|---|
| 13 | Index: welcomedialog.cpp |
|---|
| 14 | =================================================================== |
|---|
| 15 | --- welcomedialog.cpp (revision 15218) |
|---|
| 16 | +++ welcomedialog.cpp (working copy) |
|---|
| 17 | @@ -45,6 +45,7 @@ |
|---|
| 18 | gContext->GetNumSetting("idleWaitForRecordingTime", 15); |
|---|
| 19 | |
|---|
| 20 | m_timeFormat = gContext->GetSetting("TimeFormat", "h:mm AP"); |
|---|
| 21 | + m_dateFormat = gContext->GetSetting("DateFormat", "ddd d MMMM"); |
|---|
| 22 | |
|---|
| 23 | // if idleTimeoutSecs is 0, the user disabled the auto-shutdown feature |
|---|
| 24 | m_bWillShutdown = (gContext->GetNumSetting("idleTimeoutSecs", 0) != 0); |
|---|
| 25 | @@ -333,7 +334,7 @@ |
|---|
| 26 | if (s != m_time_text->GetText()) |
|---|
| 27 | m_time_text->SetText(s); |
|---|
| 28 | |
|---|
| 29 | - s = QDateTime::currentDateTime().toString("dddd\ndd MMM yyyy"); |
|---|
| 30 | + s = QDateTime::currentDateTime().toString(m_dateFormat); |
|---|
| 31 | |
|---|
| 32 | if (s != m_date_text->GetText()) |
|---|
| 33 | m_date_text->SetText(s); |
|---|
| 34 | @@ -374,7 +375,7 @@ |
|---|
| 35 | if (tuner->program.subtitle != "") |
|---|
| 36 | status += "\n(" + tuner->program.subtitle + ")"; |
|---|
| 37 | status += "\n" + tuner->program.startTime.toString("hh:mm") + |
|---|
| 38 | - " to " + tuner->program.endTime.toString("hh:mm"); |
|---|
| 39 | + " " + tr("to") + " " + tuner->program.endTime.toString("hh:mm"); |
|---|
| 40 | } |
|---|
| 41 | else |
|---|
| 42 | status = QString(tr("Tuner %1 is not recording")).arg(tuner->id); |
|---|
| 43 | @@ -404,9 +405,9 @@ |
|---|
| 44 | if (prog->subtitle != "") |
|---|
| 45 | status += "\n(" + prog->subtitle + ")"; |
|---|
| 46 | |
|---|
| 47 | - status += "\n" + prog->startTime. |
|---|
| 48 | - toString("ddd dd MMM yyyy (hh:mm") + " to " + |
|---|
| 49 | - prog->endTime.toString("hh:mm)"); |
|---|
| 50 | + status += "\n" + prog->startTime.toString(m_dateFormat + " (" + m_timeFormat) + |
|---|
| 51 | + " " + tr("to") + " " + |
|---|
| 52 | + prog->endTime.toString("hh:mm)"); |
|---|
| 53 | |
|---|
| 54 | if (m_screenScheduledNo < m_scheduledList.count() - 1) |
|---|
| 55 | m_screenScheduledNo++; |
|---|
