DefineTimeZoneWindow.cpp   DefineTimeZoneWindow.cpp 
skipping to change at line 296 skipping to change at line 296
ui->comboBoxDstStartDay->clear(); ui->comboBoxDstStartDay->clear();
ui->comboBoxDstStartDay->addItems(dayList); ui->comboBoxDstStartDay->addItems(dayList);
ui->comboBoxDstEndDay->clear(); ui->comboBoxDstEndDay->clear();
ui->comboBoxDstEndDay->addItems(dayList); ui->comboBoxDstEndDay->addItems(dayList);
} }
void DefineTimeZoneWindow::updateDayNumberMaximum(int monthIndex, QSpinBox *spinBoxDay) void DefineTimeZoneWindow::updateDayNumberMaximum(int monthIndex, QSpinBox *spinBoxDay)
{ {
int maximum = 31; int maximum = 31;
switch (monthIndex) switch (monthIndex)
{ {
case 0: //January case 0: //January
case 2: //March case 2: //March
case 4: //May case 4: //May
case 6: //July case 6: //July
case 7: //August case 7: //August
case 9: //October case 9: //October
case 11: //December case 11: //December
maximum = 31; maximum = 31;
break; break;
case 3: //April case 3: //April
case 5: //June case 5: //June
case 8: //September case 8: //September
case 10: //November case 10: //November
maximum = 30; maximum = 30;
break; break;
case 1: //February case 1: //February
maximum = 29; maximum = 29;
break; break;
default: default:
;// ;//
} }
if (spinBoxDay->value() > maximum) if (spinBoxDay->value() > maximum)
spinBoxDay->setValue(maximum); spinBoxDay->setValue(maximum);
spinBoxDay->setRange(1, maximum); spinBoxDay->setRange(1, maximum);
} }
void DefineTimeZoneWindow::updateDayNumberMaximumDstStart(int monthIndex) void DefineTimeZoneWindow::updateDayNumberMaximumDstStart(int monthIndex)
{ {
updateDayNumberMaximum(monthIndex, ui->spinBoxDstStartDateDay); updateDayNumberMaximum(monthIndex, ui->spinBoxDstStartDateDay);
skipping to change at line 372 skipping to change at line 372
comboBoxWeek = ui->comboBoxDstEndWeek; comboBoxWeek = ui->comboBoxDstEndWeek;
comboBoxMonth = ui->comboBoxDstEndMonth; comboBoxMonth = ui->comboBoxDstEndMonth;
comboBoxDay = ui->comboBoxDstEndDay; comboBoxDay = ui->comboBoxDstEndDay;
timeEdit = ui->timeEditDstEnd; timeEdit = ui->timeEditDstEnd;
} }
QRegExp endPointFormat("(J\\d{1,3}|\\d{1,3}|M\\d{1,2}\\.\\d\\.\\d)(? :\\/(\\d{1,2}(?:\\:(?:\\d{1,2})(?:\\:(?:\\d{1,2}))?)?))?"); QRegExp endPointFormat("(J\\d{1,3}|\\d{1,3}|M\\d{1,2}\\.\\d\\.\\d)(? :\\/(\\d{1,2}(?:\\:(?:\\d{1,2})(?:\\:(?:\\d{1,2}))?)?))?");
if (!endPointFormat.exactMatch(string)) if (!endPointFormat.exactMatch(string))
return false; return false;
if (endPointFormat.numCaptures() == 2) if (endPointFormat.captureCount() == 2)
{ {
QString timeString = endPointFormat.cap(2).trimmed(); QString timeString = endPointFormat.cap(2).trimmed();
if (!timeString.isEmpty()) if (!timeString.isEmpty())
{ {
int hours, minutes, seconds; int hours, minutes, seconds;
TimeZoneConfigurationWindow::readTzTimeString(timeSt ring, TimeZoneConfigurationWindow::readTzTimeString(timeSt ring,
hours, hours,
minute s, minute s,
second s); second s);
QTime time(hours, minutes, seconds); QTime time(hours, minutes, seconds);
 End of changes. 2 change blocks. 
21 lines changed or deleted 21 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/