mirrors/fort
1
0
Fork 0
mirror of https://github.com/tnodir/fort synced 2024-11-15 08:15:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: ProgramEditDialog: Use minutes for Block In, not hours

Browse Source
This commit is contained in:
Nodir Temirkhodjaev 2024-01-29 19:39:24 +03:00
parent a759c1cb32
commit c1b3145982
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/ui/form/prog/programeditdialog.cpp
View File

@ -32,7 +32,8 @@
namespace { namespace {
const std::array appBlockInHourValues = { 3, 1, 6, 12, 24, 24 * 7, 24 * 30 }; const std::array appBlockInHourValues = { 15, 1, 5, 10, 30, 60 * 1, 60 * 6, 60 * 12, 60 * 24,
60 * 24 * 7, 60 * 24 * 30 };
} }
@ -88,7 +89,7 @@ void ProgramEditDialog::initialize(const AppRow &appRow, const QVector<qint64> &
m_btZones->setUncheckedZones(appRow.rejectZones); m_btZones->setUncheckedZones(appRow.rejectZones);
m_cscBlockAppIn->checkBox()->setChecked(false); m_cscBlockAppIn->checkBox()->setChecked(false);
m_cscBlockAppIn->spinBox()->setValue(1); m_cscBlockAppIn->spinBox()->setValue(30);
m_cbBlockAppAt->setChecked(!appRow.endTime.isNull()); m_cbBlockAppAt->setChecked(!appRow.endTime.isNull());
m_dteBlockAppAt->setDateTime(appRow.endTime); m_dteBlockAppAt->setDateTime(appRow.endTime);
m_dteBlockAppAt->setMinimumDateTime(QDateTime::currentDateTime()); m_dteBlockAppAt->setMinimumDateTime(QDateTime::currentDateTime());
@ -222,11 +223,12 @@ void ProgramEditDialog::retranslatePathPlaceholderText()
void ProgramEditDialog::retranslateAppBlockInHours() void ProgramEditDialog::retranslateAppBlockInHours()
{ {
const QStringList list = { tr("Custom"), tr("1 hour"), tr("6 hours"), tr("12 hours"), tr("Day"), const QStringList list = { tr("Custom"), tr("1 minute"), tr("5 minute"), tr("10 minutes"),
tr("Week"), tr("Month") }; tr("30 minutes"), tr("1 hour"), tr("6 hours"), tr("12 hours"), tr("Day"), tr("Week"),
tr("Month") };
m_cscBlockAppIn->setNames(list); m_cscBlockAppIn->setNames(list);
m_cscBlockAppIn->spinBox()->setSuffix(tr(" hour(s)")); m_cscBlockAppIn->spinBox()->setSuffix(tr(" minute(s)"));
} }
void ProgramEditDialog::retranslateWindowTitle() void ProgramEditDialog::retranslateWindowTitle()
@ -463,9 +465,8 @@ QLayout *ProgramEditDialog::setupExtraLayout()
// Block after N hours // Block after N hours
m_cscBlockAppIn = new CheckSpinCombo(); m_cscBlockAppIn = new CheckSpinCombo();
m_cscBlockAppIn->spinBox()->setRange(1, 24 * 30 * 12); // ~Year m_cscBlockAppIn->spinBox()->setRange(1, 60 * 24 * 30 * 12); // ~Year
m_cscBlockAppIn->setValues(appBlockInHourValues); m_cscBlockAppIn->setValues(appBlockInHourValues);
m_cscBlockAppIn->setNamesByValues();
// Block at specified date & time // Block at specified date & time
auto blockAtLayout = setupCheckDateTimeEdit(); auto blockAtLayout = setupCheckDateTimeEdit();
@ -650,9 +651,9 @@ void ProgramEditDialog::fillApp(App &app) const
if (!app.blocked) { if (!app.blocked) {
if (m_cscBlockAppIn->checkBox()->isChecked()) { if (m_cscBlockAppIn->checkBox()->isChecked()) {
const int hours = m_cscBlockAppIn->spinBox()->value(); const int minutes = m_cscBlockAppIn->spinBox()->value();
app.endTime = QDateTime::currentDateTime().addSecs(hours * 60 * 60); app.endTime = QDateTime::currentDateTime().addSecs(minutes * 60);
} else if (m_cbBlockAppAt->isChecked()) { } else if (m_cbBlockAppAt->isChecked()) {
app.endTime = m_dteBlockAppAt->dateTime(); app.endTime = m_dteBlockAppAt->dateTime();
} }