Changeset View
Changeset View
Standalone View
Standalone View
kmymoney/dialogs/kreportconfigurationfilterdlg.cpp
Show First 20 Lines • Show All 88 Lines • ▼ Show 20 Line(s) | 73 | public: | |||
---|---|---|---|---|---|
89 | QPointer<ReportTabPerformance> m_tabPerformance; | 89 | QPointer<ReportTabPerformance> m_tabPerformance; | ||
90 | 90 | | |||
91 | MyMoneyReport m_initialState; | 91 | MyMoneyReport m_initialState; | ||
92 | MyMoneyReport m_currentState; | 92 | MyMoneyReport m_currentState; | ||
93 | QVector<MyMoneyBudget> m_budgets; | 93 | QVector<MyMoneyBudget> m_budgets; | ||
94 | }; | 94 | }; | ||
95 | 95 | | |||
96 | KReportConfigurationFilterDlg::KReportConfigurationFilterDlg(MyMoneyReport report, QWidget *parent) : | 96 | KReportConfigurationFilterDlg::KReportConfigurationFilterDlg(MyMoneyReport report, QWidget *parent) : | ||
97 | KFindTransactionDlg(*new KReportConfigurationFilterDlgPrivate(this), parent, (report.rowType() == MyMoneyReport::eAccount)) | 97 | KFindTransactionDlg(*new KReportConfigurationFilterDlgPrivate(this), parent, (report.rowType() == MyMoneyReport::Row::Account)) | ||
98 | { | 98 | { | ||
99 | Q_D(KReportConfigurationFilterDlg); | 99 | Q_D(KReportConfigurationFilterDlg); | ||
100 | 100 | | |||
101 | d->m_initialState = report; | 101 | d->m_initialState = report; | ||
102 | d->m_currentState = report; | 102 | d->m_currentState = report; | ||
103 | 103 | | |||
104 | // | 104 | // | ||
105 | // Rework labeling | 105 | // Rework labeling | ||
Show All 12 Lines | |||||
118 | 118 | | |||
119 | // | 119 | // | ||
120 | // Add new tabs | 120 | // Add new tabs | ||
121 | // | 121 | // | ||
122 | 122 | | |||
123 | d->m_tabGeneral = new ReportTabGeneral(d->ui->m_criteriaTab); | 123 | d->m_tabGeneral = new ReportTabGeneral(d->ui->m_criteriaTab); | ||
124 | d->ui->m_criteriaTab->insertTab(0, d->m_tabGeneral, i18nc("General tab", "General")); | 124 | d->ui->m_criteriaTab->insertTab(0, d->m_tabGeneral, i18nc("General tab", "General")); | ||
125 | 125 | | |||
126 | if (d->m_initialState.reportType() == MyMoneyReport::ePivotTable) { | 126 | if (d->m_initialState.reportType() == MyMoneyReport::Report::PivotTable) { | ||
127 | int tabNr = 1; | 127 | int tabNr = 1; | ||
128 | if (!(d->m_initialState.isIncludingPrice() || d->m_initialState.isIncludingAveragePrice())) { | 128 | if (!(d->m_initialState.isIncludingPrice() || d->m_initialState.isIncludingAveragePrice())) { | ||
129 | d->m_tabRowColPivot = new ReportTabRowColPivot(d->ui->m_criteriaTab); | 129 | d->m_tabRowColPivot = new ReportTabRowColPivot(d->ui->m_criteriaTab); | ||
130 | d->ui->m_criteriaTab->insertTab(tabNr++, d->m_tabRowColPivot, i18n("Rows/Columns")); | 130 | d->ui->m_criteriaTab->insertTab(tabNr++, d->m_tabRowColPivot, i18n("Rows/Columns")); | ||
131 | connect(d->m_tabRowColPivot->ui->m_comboRows, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), this, static_cast<void (KReportConfigurationFilterDlg::*)(int)>(&KReportConfigurationFilterDlg::slotRowTypeChanged)); | 131 | connect(d->m_tabRowColPivot->ui->m_comboRows, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), this, static_cast<void (KReportConfigurationFilterDlg::*)(int)>(&KReportConfigurationFilterDlg::slotRowTypeChanged)); | ||
132 | connect(d->m_tabRowColPivot->ui->m_comboRows, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), this, static_cast<void (KReportConfigurationFilterDlg::*)(int)>(&KReportConfigurationFilterDlg::slotUpdateColumnsCombo)); | 132 | connect(d->m_tabRowColPivot->ui->m_comboRows, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), this, static_cast<void (KReportConfigurationFilterDlg::*)(int)>(&KReportConfigurationFilterDlg::slotUpdateColumnsCombo)); | ||
133 | //control the state of the includeTransfer check | 133 | //control the state of the includeTransfer check | ||
134 | connect(d->ui->m_categoriesView, &KMyMoneySelector::stateChanged, this, &KReportConfigurationFilterDlg::slotUpdateCheckTransfers); | 134 | connect(d->ui->m_categoriesView, &KMyMoneySelector::stateChanged, this, &KReportConfigurationFilterDlg::slotUpdateCheckTransfers); | ||
Show All 15 Lines | |||||
150 | // reconnect signal | 150 | // reconnect signal | ||
151 | connect(d->m_dateRange, &DateRangeDlg::rangeChanged, this, &KReportConfigurationFilterDlg::slotUpdateSelections); | 151 | connect(d->m_dateRange, &DateRangeDlg::rangeChanged, this, &KReportConfigurationFilterDlg::slotUpdateSelections); | ||
152 | 152 | | |||
153 | if (!(d->m_initialState.isIncludingPrice() || d->m_initialState.isIncludingAveragePrice())) { | 153 | if (!(d->m_initialState.isIncludingPrice() || d->m_initialState.isIncludingAveragePrice())) { | ||
154 | connect(d->m_tabRange->ui->m_comboColumns, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), this, &KReportConfigurationFilterDlg::slotColumnTypeChanged); | 154 | connect(d->m_tabRange->ui->m_comboColumns, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), this, &KReportConfigurationFilterDlg::slotColumnTypeChanged); | ||
155 | connect(d->m_tabRange->ui->m_comboColumns, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), this, static_cast<void (KReportConfigurationFilterDlg::*)(int)>(&KReportConfigurationFilterDlg::slotUpdateColumnsCombo)); | 155 | connect(d->m_tabRange->ui->m_comboColumns, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), this, static_cast<void (KReportConfigurationFilterDlg::*)(int)>(&KReportConfigurationFilterDlg::slotUpdateColumnsCombo)); | ||
156 | } | 156 | } | ||
157 | connect(d->m_tabChart->ui->m_logYaxis, &QCheckBox::stateChanged, this, &KReportConfigurationFilterDlg::slotLogAxisChanged); | 157 | connect(d->m_tabChart->ui->m_logYaxis, &QCheckBox::stateChanged, this, &KReportConfigurationFilterDlg::slotLogAxisChanged); | ||
158 | } else if (d->m_initialState.reportType() == MyMoneyReport::eQueryTable) { | 158 | } else if (d->m_initialState.reportType() == MyMoneyReport::Report::QueryTable) { | ||
159 | // eInvestmentHoldings is a special-case report, and you cannot configure the | 159 | // eInvestmentHoldings is a special-case report, and you cannot configure the | ||
160 | // rows & columns of that report. | 160 | // rows & columns of that report. | ||
161 | if (d->m_initialState.rowType() < MyMoneyReport::eAccountByTopAccount) { | 161 | if (d->m_initialState.rowType() < MyMoneyReport::Row::AccountByTopAccount) { | ||
162 | d->m_tabRowColQuery = new ReportTabRowColQuery(d->ui->m_criteriaTab); | 162 | d->m_tabRowColQuery = new ReportTabRowColQuery(d->ui->m_criteriaTab); | ||
163 | d->ui->m_criteriaTab->insertTab(1, d->m_tabRowColQuery, i18n("Rows/Columns")); | 163 | d->ui->m_criteriaTab->insertTab(1, d->m_tabRowColQuery, i18n("Rows/Columns")); | ||
164 | } | 164 | } | ||
165 | if (d->m_initialState.queryColumns() & MyMoneyReport::eQCcapitalgain) { | 165 | if (d->m_initialState.queryColumns() & MyMoneyReport::QueryColumns::Capitalgain) { | ||
166 | d->m_tabCapitalGain = new ReportTabCapitalGain(d->ui->m_criteriaTab); | 166 | d->m_tabCapitalGain = new ReportTabCapitalGain(d->ui->m_criteriaTab); | ||
167 | d->ui->m_criteriaTab->insertTab(1, d->m_tabCapitalGain, i18n("Report")); | 167 | d->ui->m_criteriaTab->insertTab(1, d->m_tabCapitalGain, i18n("Report")); | ||
168 | } | 168 | } | ||
169 | if (d->m_initialState.queryColumns() & MyMoneyReport::eQCperformance) { | 169 | if (d->m_initialState.queryColumns() & MyMoneyReport::QueryColumns::Performance) { | ||
170 | d->m_tabPerformance = new ReportTabPerformance(d->ui->m_criteriaTab); | 170 | d->m_tabPerformance = new ReportTabPerformance(d->ui->m_criteriaTab); | ||
171 | d->ui->m_criteriaTab->insertTab(1, d->m_tabPerformance, i18n("Report")); | 171 | d->ui->m_criteriaTab->insertTab(1, d->m_tabPerformance, i18n("Report")); | ||
172 | } | 172 | } | ||
173 | } | 173 | } | ||
174 | 174 | | |||
175 | d->ui->m_criteriaTab->setCurrentIndex(d->ui->m_criteriaTab->indexOf(d->m_tabGeneral)); | 175 | d->ui->m_criteriaTab->setCurrentIndex(d->ui->m_criteriaTab->indexOf(d->m_tabGeneral)); | ||
176 | d->ui->m_criteriaTab->setMinimumSize(500, 200); | 176 | d->ui->m_criteriaTab->setMinimumSize(500, 200); | ||
177 | 177 | | |||
Show All 37 Lines | 201 | { | |||
215 | 215 | | |||
216 | if (d->m_tabRowColPivot) { | 216 | if (d->m_tabRowColPivot) { | ||
217 | MyMoneyReport::EDetailLevel dl[4] = { MyMoneyReport::eDetailAll, MyMoneyReport::eDetailTop, MyMoneyReport::eDetailGroup, MyMoneyReport::eDetailTotal }; | 217 | MyMoneyReport::EDetailLevel dl[4] = { MyMoneyReport::eDetailAll, MyMoneyReport::eDetailTop, MyMoneyReport::eDetailGroup, MyMoneyReport::eDetailTotal }; | ||
218 | 218 | | |||
219 | d->m_currentState.setDetailLevel(dl[d->m_tabRowColPivot->ui->m_comboDetail->currentIndex()]); | 219 | d->m_currentState.setDetailLevel(dl[d->m_tabRowColPivot->ui->m_comboDetail->currentIndex()]); | ||
220 | 220 | | |||
221 | // modify the rowtype only if the widget is enabled | 221 | // modify the rowtype only if the widget is enabled | ||
222 | if (d->m_tabRowColPivot->ui->m_comboRows->isEnabled()) { | 222 | if (d->m_tabRowColPivot->ui->m_comboRows->isEnabled()) { | ||
223 | MyMoneyReport::ERowType rt[2] = { MyMoneyReport::eExpenseIncome, MyMoneyReport::eAssetLiability }; | 223 | MyMoneyReport::Row::Type rt[2] = { MyMoneyReport::Row::ExpenseIncome, MyMoneyReport::Row::AssetLiability }; | ||
224 | d->m_currentState.setRowType(rt[d->m_tabRowColPivot->ui->m_comboRows->currentIndex()]); | 224 | d->m_currentState.setRowType(rt[d->m_tabRowColPivot->ui->m_comboRows->currentIndex()]); | ||
225 | } | 225 | } | ||
226 | 226 | | |||
227 | d->m_currentState.setShowingRowTotals(false); | 227 | d->m_currentState.setShowingRowTotals(false); | ||
228 | if (d->m_tabRowColPivot->ui->m_comboRows->currentIndex() == 0) | 228 | if (d->m_tabRowColPivot->ui->m_comboRows->currentIndex() == 0) | ||
229 | d->m_currentState.setShowingRowTotals(d->m_tabRowColPivot->ui->m_checkTotalColumn->isChecked()); | 229 | d->m_currentState.setShowingRowTotals(d->m_tabRowColPivot->ui->m_checkTotalColumn->isChecked()); | ||
230 | 230 | | |||
231 | d->m_currentState.setShowingColumnTotals(d->m_tabRowColPivot->ui->m_checkTotalRow->isChecked()); | 231 | d->m_currentState.setShowingColumnTotals(d->m_tabRowColPivot->ui->m_checkTotalRow->isChecked()); | ||
232 | d->m_currentState.setIncludingSchedules(d->m_tabRowColPivot->ui->m_checkScheduled->isChecked()); | 232 | d->m_currentState.setIncludingSchedules(d->m_tabRowColPivot->ui->m_checkScheduled->isChecked()); | ||
233 | 233 | | |||
234 | d->m_currentState.setIncludingTransfers(d->m_tabRowColPivot->ui->m_checkTransfers->isChecked()); | 234 | d->m_currentState.setIncludingTransfers(d->m_tabRowColPivot->ui->m_checkTransfers->isChecked()); | ||
235 | 235 | | |||
236 | d->m_currentState.setIncludingUnusedAccounts(d->m_tabRowColPivot->ui->m_checkUnused->isChecked()); | 236 | d->m_currentState.setIncludingUnusedAccounts(d->m_tabRowColPivot->ui->m_checkUnused->isChecked()); | ||
237 | 237 | | |||
238 | if (d->m_tabRowColPivot->ui->m_comboBudget->isEnabled()) { | 238 | if (d->m_tabRowColPivot->ui->m_comboBudget->isEnabled()) { | ||
239 | d->m_currentState.setBudget(d->m_budgets[d->m_tabRowColPivot->ui->m_comboBudget->currentItem()].id(), d->m_initialState.rowType() == MyMoneyReport::eBudgetActual); | 239 | d->m_currentState.setBudget(d->m_budgets[d->m_tabRowColPivot->ui->m_comboBudget->currentItem()].id(), d->m_initialState.rowType() == MyMoneyReport::Row::BudgetActual); | ||
240 | } else { | 240 | } else { | ||
241 | d->m_currentState.setBudget(QString(), false); | 241 | d->m_currentState.setBudget(QString(), false); | ||
242 | } | 242 | } | ||
243 | 243 | | |||
244 | //set moving average days | 244 | //set moving average days | ||
245 | if (d->m_tabRowColPivot->ui->m_movingAverageDays->isEnabled()) { | 245 | if (d->m_tabRowColPivot->ui->m_movingAverageDays->isEnabled()) { | ||
246 | d->m_currentState.setMovingAverageDays(d->m_tabRowColPivot->ui->m_movingAverageDays->value()); | 246 | d->m_currentState.setMovingAverageDays(d->m_tabRowColPivot->ui->m_movingAverageDays->value()); | ||
247 | } | 247 | } | ||
248 | } else if (d->m_tabRowColQuery) { | 248 | } else if (d->m_tabRowColQuery) { | ||
249 | MyMoneyReport::ERowType rtq[8] = { MyMoneyReport::eCategory, MyMoneyReport::eTopCategory, MyMoneyReport::eTag, MyMoneyReport::ePayee, MyMoneyReport::eAccount, MyMoneyReport::eTopAccount, MyMoneyReport::eMonth, MyMoneyReport::eWeek }; | 249 | MyMoneyReport::Row::Type rtq[8] = { MyMoneyReport::Row::Category, MyMoneyReport::Row::TopCategory, MyMoneyReport::Row::Tag, MyMoneyReport::Row::Payee, MyMoneyReport::Row::Account, MyMoneyReport::Row::TopAccount, MyMoneyReport::Row::Month, MyMoneyReport::Row::Week }; | ||
250 | d->m_currentState.setRowType(rtq[d->m_tabRowColQuery->ui->m_comboOrganizeBy->currentIndex()]); | 250 | d->m_currentState.setRowType(rtq[d->m_tabRowColQuery->ui->m_comboOrganizeBy->currentIndex()]); | ||
251 | 251 | | |||
252 | unsigned qc = MyMoneyReport::eQCnone; | 252 | unsigned qc = MyMoneyReport::QueryColumns::None; | ||
253 | 253 | | |||
254 | if (d->m_currentState.queryColumns() & MyMoneyReport::eQCloan) | 254 | if (d->m_currentState.queryColumns() & MyMoneyReport::QueryColumns::Loan) | ||
255 | // once a loan report, always a loan report | 255 | // once a loan report, always a loan report | ||
256 | qc = MyMoneyReport::eQCloan; | 256 | qc = MyMoneyReport::QueryColumns::Loan; | ||
257 | 257 | | |||
258 | if (d->m_tabRowColQuery->ui->m_checkNumber->isChecked()) | 258 | if (d->m_tabRowColQuery->ui->m_checkNumber->isChecked()) | ||
259 | qc |= MyMoneyReport::eQCnumber; | 259 | qc |= MyMoneyReport::QueryColumns::Number; | ||
260 | if (d->m_tabRowColQuery->ui->m_checkPayee->isChecked()) | 260 | if (d->m_tabRowColQuery->ui->m_checkPayee->isChecked()) | ||
261 | qc |= MyMoneyReport::eQCpayee; | 261 | qc |= MyMoneyReport::QueryColumns::Payee; | ||
262 | if (d->m_tabRowColQuery->ui->m_checkTag->isChecked()) | 262 | if (d->m_tabRowColQuery->ui->m_checkTag->isChecked()) | ||
263 | qc |= MyMoneyReport::eQCtag; | 263 | qc |= MyMoneyReport::QueryColumns::Tag; | ||
264 | if (d->m_tabRowColQuery->ui->m_checkCategory->isChecked()) | 264 | if (d->m_tabRowColQuery->ui->m_checkCategory->isChecked()) | ||
265 | qc |= MyMoneyReport::eQCcategory; | 265 | qc |= MyMoneyReport::QueryColumns::Category; | ||
266 | if (d->m_tabRowColQuery->ui->m_checkMemo->isChecked()) | 266 | if (d->m_tabRowColQuery->ui->m_checkMemo->isChecked()) | ||
267 | qc |= MyMoneyReport::eQCmemo; | 267 | qc |= MyMoneyReport::QueryColumns::Memo; | ||
268 | if (d->m_tabRowColQuery->ui->m_checkAccount->isChecked()) | 268 | if (d->m_tabRowColQuery->ui->m_checkAccount->isChecked()) | ||
269 | qc |= MyMoneyReport::eQCaccount; | 269 | qc |= MyMoneyReport::QueryColumns::Account; | ||
270 | if (d->m_tabRowColQuery->ui->m_checkReconciled->isChecked()) | 270 | if (d->m_tabRowColQuery->ui->m_checkReconciled->isChecked()) | ||
271 | qc |= MyMoneyReport::eQCreconciled; | 271 | qc |= MyMoneyReport::QueryColumns::Reconciled; | ||
272 | if (d->m_tabRowColQuery->ui->m_checkAction->isChecked()) | 272 | if (d->m_tabRowColQuery->ui->m_checkAction->isChecked()) | ||
273 | qc |= MyMoneyReport::eQCaction; | 273 | qc |= MyMoneyReport::QueryColumns::Action; | ||
274 | if (d->m_tabRowColQuery->ui->m_checkShares->isChecked()) | 274 | if (d->m_tabRowColQuery->ui->m_checkShares->isChecked()) | ||
275 | qc |= MyMoneyReport::eQCshares; | 275 | qc |= MyMoneyReport::QueryColumns::Shares; | ||
276 | if (d->m_tabRowColQuery->ui->m_checkPrice->isChecked()) | 276 | if (d->m_tabRowColQuery->ui->m_checkPrice->isChecked()) | ||
277 | qc |= MyMoneyReport::eQCprice; | 277 | qc |= MyMoneyReport::QueryColumns::Price; | ||
278 | if (d->m_tabRowColQuery->ui->m_checkBalance->isChecked()) | 278 | if (d->m_tabRowColQuery->ui->m_checkBalance->isChecked()) | ||
279 | qc |= MyMoneyReport::eQCbalance; | 279 | qc |= MyMoneyReport::QueryColumns::Balance; | ||
280 | 280 | | |||
281 | d->m_currentState.setQueryColumns(static_cast<MyMoneyReport::EQueryColumns>(qc)); | 281 | d->m_currentState.setQueryColumns(static_cast<MyMoneyReport::QueryColumns::Type>(qc)); | ||
282 | 282 | | |||
283 | d->m_currentState.setTax(d->m_tabRowColQuery->ui->m_checkTax->isChecked()); | 283 | d->m_currentState.setTax(d->m_tabRowColQuery->ui->m_checkTax->isChecked()); | ||
284 | d->m_currentState.setInvestmentsOnly(d->m_tabRowColQuery->ui->m_checkInvestments->isChecked()); | 284 | d->m_currentState.setInvestmentsOnly(d->m_tabRowColQuery->ui->m_checkInvestments->isChecked()); | ||
285 | d->m_currentState.setLoansOnly(d->m_tabRowColQuery->ui->m_checkLoans->isChecked()); | 285 | d->m_currentState.setLoansOnly(d->m_tabRowColQuery->ui->m_checkLoans->isChecked()); | ||
286 | 286 | | |||
287 | d->m_currentState.setDetailLevel(d->m_tabRowColQuery->ui->m_checkHideSplitDetails->isChecked() ? | 287 | d->m_currentState.setDetailLevel(d->m_tabRowColQuery->ui->m_checkHideSplitDetails->isChecked() ? | ||
288 | MyMoneyReport::eDetailNone : MyMoneyReport::eDetailAll); | 288 | MyMoneyReport::eDetailNone : MyMoneyReport::eDetailAll); | ||
289 | d->m_currentState.setHideTransactions(d->m_tabRowColQuery->ui->m_checkHideTransactions->isChecked()); | 289 | d->m_currentState.setHideTransactions(d->m_tabRowColQuery->ui->m_checkHideTransactions->isChecked()); | ||
Show All 15 Lines | |||||
305 | if (d->m_tabRange) { | 305 | if (d->m_tabRange) { | ||
306 | d->m_currentState.setDataRangeStart(d->m_tabRange->ui->m_dataRangeStart->text()); | 306 | d->m_currentState.setDataRangeStart(d->m_tabRange->ui->m_dataRangeStart->text()); | ||
307 | d->m_currentState.setDataRangeEnd(d->m_tabRange->ui->m_dataRangeEnd->text()); | 307 | d->m_currentState.setDataRangeEnd(d->m_tabRange->ui->m_dataRangeEnd->text()); | ||
308 | d->m_currentState.setDataMajorTick(d->m_tabRange->ui->m_dataMajorTick->text()); | 308 | d->m_currentState.setDataMajorTick(d->m_tabRange->ui->m_dataMajorTick->text()); | ||
309 | d->m_currentState.setDataMinorTick(d->m_tabRange->ui->m_dataMinorTick->text()); | 309 | d->m_currentState.setDataMinorTick(d->m_tabRange->ui->m_dataMinorTick->text()); | ||
310 | d->m_currentState.setYLabelsPrecision(d->m_tabRange->ui->m_yLabelsPrecision->value()); | 310 | d->m_currentState.setYLabelsPrecision(d->m_tabRange->ui->m_yLabelsPrecision->value()); | ||
311 | d->m_currentState.setDataFilter((MyMoneyReport::dataOptionE)d->m_tabRange->ui->m_dataLock->currentIndex()); | 311 | d->m_currentState.setDataFilter((MyMoneyReport::dataOptionE)d->m_tabRange->ui->m_dataLock->currentIndex()); | ||
312 | 312 | | |||
313 | MyMoneyReport::EColumnType ct[6] = { MyMoneyReport::eDays, MyMoneyReport::eWeeks, MyMoneyReport::eMonths, MyMoneyReport::eBiMonths, MyMoneyReport::eQuarters, MyMoneyReport::eYears }; | 313 | MyMoneyReport::Column::Type ct[6] = { MyMoneyReport::Column::Days, MyMoneyReport::Column::Weeks, MyMoneyReport::Column::Months, MyMoneyReport::Column::BiMonths, MyMoneyReport::Column::Quarters, MyMoneyReport::Column::Years }; | ||
314 | bool dy[6] = { true, true, false, false, false, false }; | 314 | bool dy[6] = { true, true, false, false, false, false }; | ||
315 | d->m_currentState.setColumnType(ct[d->m_tabRange->ui->m_comboColumns->currentIndex()]); | 315 | d->m_currentState.setColumnType(ct[d->m_tabRange->ui->m_comboColumns->currentIndex()]); | ||
316 | 316 | | |||
317 | //TODO (Ace) This should be implicit in the call above. MMReport needs fixin' | 317 | //TODO (Ace) This should be implicit in the call above. MMReport needs fixin' | ||
318 | d->m_currentState.setColumnsAreDays(dy[d->m_tabRange->ui->m_comboColumns->currentIndex()]); | 318 | d->m_currentState.setColumnsAreDays(dy[d->m_tabRange->ui->m_comboColumns->currentIndex()]); | ||
319 | } | 319 | } | ||
320 | 320 | | |||
321 | // setup the date lock | 321 | // setup the date lock | ||
▲ Show 20 Lines • Show All 94 Lines • ▼ Show 20 Line(s) | 414 | case MyMoneyReport::eDetailGroup: | |||
416 | break; | 416 | break; | ||
417 | case MyMoneyReport::eDetailTotal: | 417 | case MyMoneyReport::eDetailTotal: | ||
418 | combo->setCurrentItem(i18n("Totals"), false); | 418 | combo->setCurrentItem(i18n("Totals"), false); | ||
419 | break; | 419 | break; | ||
420 | } | 420 | } | ||
421 | 421 | | |||
422 | combo = d->m_tabRowColPivot->ui->m_comboRows; | 422 | combo = d->m_tabRowColPivot->ui->m_comboRows; | ||
423 | switch (d->m_initialState.rowType()) { | 423 | switch (d->m_initialState.rowType()) { | ||
424 | case MyMoneyReport::eExpenseIncome: | 424 | case MyMoneyReport::Row::ExpenseIncome: | ||
425 | case MyMoneyReport::eBudget: | 425 | case MyMoneyReport::Row::Budget: | ||
426 | case MyMoneyReport::eBudgetActual: | 426 | case MyMoneyReport::Row::BudgetActual: | ||
427 | combo->setCurrentItem(i18n("Income & Expenses"), false); // income / expense | 427 | combo->setCurrentItem(i18n("Income & Expenses"), false); // income / expense | ||
428 | break; | 428 | break; | ||
429 | default: | 429 | default: | ||
430 | combo->setCurrentItem(i18n("Assets & Liabilities"), false); // asset / liability | 430 | combo->setCurrentItem(i18n("Assets & Liabilities"), false); // asset / liability | ||
431 | break; | 431 | break; | ||
432 | } | 432 | } | ||
433 | d->m_tabRowColPivot->ui->m_checkTotalColumn->setChecked(d->m_initialState.isShowingRowTotals()); | 433 | d->m_tabRowColPivot->ui->m_checkTotalColumn->setChecked(d->m_initialState.isShowingRowTotals()); | ||
434 | d->m_tabRowColPivot->ui->m_checkTotalRow->setChecked(d->m_initialState.isShowingColumnTotals()); | 434 | d->m_tabRowColPivot->ui->m_checkTotalRow->setChecked(d->m_initialState.isShowingColumnTotals()); | ||
435 | 435 | | |||
436 | slotRowTypeChanged(combo->currentIndex()); | 436 | slotRowTypeChanged(combo->currentIndex()); | ||
437 | 437 | | |||
438 | //load budgets combo | 438 | //load budgets combo | ||
439 | if (d->m_initialState.rowType() == MyMoneyReport::eBudget | 439 | if (d->m_initialState.rowType() == MyMoneyReport::Row::Budget | ||
440 | || d->m_initialState.rowType() == MyMoneyReport::eBudgetActual) { | 440 | || d->m_initialState.rowType() == MyMoneyReport::Row::BudgetActual) { | ||
441 | d->m_tabRowColPivot->ui->m_comboRows->setEnabled(false); | 441 | d->m_tabRowColPivot->ui->m_comboRows->setEnabled(false); | ||
442 | d->m_tabRowColPivot->ui->m_budgetFrame->setEnabled(!d->m_budgets.empty()); | 442 | d->m_tabRowColPivot->ui->m_budgetFrame->setEnabled(!d->m_budgets.empty()); | ||
443 | auto i = 0; | 443 | auto i = 0; | ||
444 | for (QVector<MyMoneyBudget>::const_iterator it_b = d->m_budgets.constBegin(); it_b != d->m_budgets.constEnd(); ++it_b) { | 444 | for (QVector<MyMoneyBudget>::const_iterator it_b = d->m_budgets.constBegin(); it_b != d->m_budgets.constEnd(); ++it_b) { | ||
445 | d->m_tabRowColPivot->ui->m_comboBudget->insertItem((*it_b).name(), i); | 445 | d->m_tabRowColPivot->ui->m_comboBudget->insertItem((*it_b).name(), i); | ||
446 | //set the current selected item | 446 | //set the current selected item | ||
447 | if ((d->m_initialState.budget() == "Any" && (*it_b).budgetStart().year() == QDate::currentDate().year()) | 447 | if ((d->m_initialState.budget() == "Any" && (*it_b).budgetStart().year() == QDate::currentDate().year()) | ||
448 | || d->m_initialState.budget() == (*it_b).id()) | 448 | || d->m_initialState.budget() == (*it_b).id()) | ||
Show All 10 Lines | |||||
459 | } | 459 | } | ||
460 | 460 | | |||
461 | d->m_tabRowColPivot->ui->m_checkScheduled->setChecked(d->m_initialState.isIncludingSchedules()); | 461 | d->m_tabRowColPivot->ui->m_checkScheduled->setChecked(d->m_initialState.isIncludingSchedules()); | ||
462 | d->m_tabRowColPivot->ui->m_checkTransfers->setChecked(d->m_initialState.isIncludingTransfers()); | 462 | d->m_tabRowColPivot->ui->m_checkTransfers->setChecked(d->m_initialState.isIncludingTransfers()); | ||
463 | d->m_tabRowColPivot->ui->m_checkUnused->setChecked(d->m_initialState.isIncludingUnusedAccounts()); | 463 | d->m_tabRowColPivot->ui->m_checkUnused->setChecked(d->m_initialState.isIncludingUnusedAccounts()); | ||
464 | } else if (d->m_tabRowColQuery) { | 464 | } else if (d->m_tabRowColQuery) { | ||
465 | KComboBox *combo = d->m_tabRowColQuery->ui->m_comboOrganizeBy; | 465 | KComboBox *combo = d->m_tabRowColQuery->ui->m_comboOrganizeBy; | ||
466 | switch (d->m_initialState.rowType()) { | 466 | switch (d->m_initialState.rowType()) { | ||
467 | case MyMoneyReport::eNoColumns: | 467 | case MyMoneyReport::Column::NoColumns: | ||
468 | case MyMoneyReport::eCategory: | 468 | case MyMoneyReport::Row::Category: | ||
469 | combo->setCurrentItem(i18n("Categories"), false); | 469 | combo->setCurrentItem(i18n("Categories"), false); | ||
470 | break; | 470 | break; | ||
471 | case MyMoneyReport::eTopCategory: | 471 | case MyMoneyReport::Row::TopCategory: | ||
472 | combo->setCurrentItem(i18n("Top Categories"), false); | 472 | combo->setCurrentItem(i18n("Top Categories"), false); | ||
473 | break; | 473 | break; | ||
474 | case MyMoneyReport::eTag: | 474 | case MyMoneyReport::Row::Tag: | ||
475 | combo->setCurrentItem(i18n("Tags"), false); | 475 | combo->setCurrentItem(i18n("Tags"), false); | ||
476 | break; | 476 | break; | ||
477 | case MyMoneyReport::ePayee: | 477 | case MyMoneyReport::Row::Payee: | ||
478 | combo->setCurrentItem(i18n("Payees"), false); | 478 | combo->setCurrentItem(i18n("Payees"), false); | ||
479 | break; | 479 | break; | ||
480 | case MyMoneyReport::eAccount: | 480 | case MyMoneyReport::Row::Account: | ||
481 | combo->setCurrentItem(i18n("Accounts"), false); | 481 | combo->setCurrentItem(i18n("Accounts"), false); | ||
482 | break; | 482 | break; | ||
483 | case MyMoneyReport::eTopAccount: | 483 | case MyMoneyReport::Row::TopAccount: | ||
484 | combo->setCurrentItem(i18n("Top Accounts"), false); | 484 | combo->setCurrentItem(i18n("Top Accounts"), false); | ||
485 | break; | 485 | break; | ||
486 | case MyMoneyReport::eMonth: | 486 | case MyMoneyReport::Row::Month: | ||
487 | combo->setCurrentItem(i18n("Month"), false); | 487 | combo->setCurrentItem(i18n("Month"), false); | ||
488 | break; | 488 | break; | ||
489 | case MyMoneyReport::eWeek: | 489 | case MyMoneyReport::Row::Week: | ||
490 | combo->setCurrentItem(i18n("Week"), false); | 490 | combo->setCurrentItem(i18n("Week"), false); | ||
491 | break; | 491 | break; | ||
492 | default: | 492 | default: | ||
493 | throw MYMONEYEXCEPTION("KReportConfigurationFilterDlg::slotReset(): QueryTable report has invalid rowtype"); | 493 | throw MYMONEYEXCEPTION("KReportConfigurationFilterDlg::slotReset(): QueryTable report has invalid rowtype"); | ||
494 | } | 494 | } | ||
495 | 495 | | |||
496 | unsigned qc = d->m_initialState.queryColumns(); | 496 | unsigned qc = d->m_initialState.queryColumns(); | ||
497 | d->m_tabRowColQuery->ui->m_checkNumber->setChecked(qc & MyMoneyReport::eQCnumber); | 497 | d->m_tabRowColQuery->ui->m_checkNumber->setChecked(qc & MyMoneyReport::QueryColumns::Number); | ||
498 | d->m_tabRowColQuery->ui->m_checkPayee->setChecked(qc & MyMoneyReport::eQCpayee); | 498 | d->m_tabRowColQuery->ui->m_checkPayee->setChecked(qc & MyMoneyReport::QueryColumns::Payee); | ||
499 | d->m_tabRowColQuery->ui->m_checkTag->setChecked(qc & MyMoneyReport::eQCtag); | 499 | d->m_tabRowColQuery->ui->m_checkTag->setChecked(qc & MyMoneyReport::QueryColumns::Tag); | ||
500 | d->m_tabRowColQuery->ui->m_checkCategory->setChecked(qc & MyMoneyReport::eQCcategory); | 500 | d->m_tabRowColQuery->ui->m_checkCategory->setChecked(qc & MyMoneyReport::QueryColumns::Category); | ||
501 | d->m_tabRowColQuery->ui->m_checkMemo->setChecked(qc & MyMoneyReport::eQCmemo); | 501 | d->m_tabRowColQuery->ui->m_checkMemo->setChecked(qc & MyMoneyReport::QueryColumns::Memo); | ||
502 | d->m_tabRowColQuery->ui->m_checkAccount->setChecked(qc & MyMoneyReport::eQCaccount); | 502 | d->m_tabRowColQuery->ui->m_checkAccount->setChecked(qc & MyMoneyReport::QueryColumns::Account); | ||
503 | d->m_tabRowColQuery->ui->m_checkReconciled->setChecked(qc & MyMoneyReport::eQCreconciled); | 503 | d->m_tabRowColQuery->ui->m_checkReconciled->setChecked(qc & MyMoneyReport::QueryColumns::Reconciled); | ||
504 | d->m_tabRowColQuery->ui->m_checkAction->setChecked(qc & MyMoneyReport::eQCaction); | 504 | d->m_tabRowColQuery->ui->m_checkAction->setChecked(qc & MyMoneyReport::QueryColumns::Action); | ||
505 | d->m_tabRowColQuery->ui->m_checkShares->setChecked(qc & MyMoneyReport::eQCshares); | 505 | d->m_tabRowColQuery->ui->m_checkShares->setChecked(qc & MyMoneyReport::QueryColumns::Shares); | ||
506 | d->m_tabRowColQuery->ui->m_checkPrice->setChecked(qc & MyMoneyReport::eQCprice); | 506 | d->m_tabRowColQuery->ui->m_checkPrice->setChecked(qc & MyMoneyReport::QueryColumns::Price); | ||
507 | d->m_tabRowColQuery->ui->m_checkBalance->setChecked(qc & MyMoneyReport::eQCbalance); | 507 | d->m_tabRowColQuery->ui->m_checkBalance->setChecked(qc & MyMoneyReport::QueryColumns::Balance); | ||
508 | 508 | | |||
509 | d->m_tabRowColQuery->ui->m_checkTax->setChecked(d->m_initialState.isTax()); | 509 | d->m_tabRowColQuery->ui->m_checkTax->setChecked(d->m_initialState.isTax()); | ||
510 | d->m_tabRowColQuery->ui->m_checkInvestments->setChecked(d->m_initialState.isInvestmentsOnly()); | 510 | d->m_tabRowColQuery->ui->m_checkInvestments->setChecked(d->m_initialState.isInvestmentsOnly()); | ||
511 | d->m_tabRowColQuery->ui->m_checkLoans->setChecked(d->m_initialState.isLoansOnly()); | 511 | d->m_tabRowColQuery->ui->m_checkLoans->setChecked(d->m_initialState.isLoansOnly()); | ||
512 | 512 | | |||
513 | d->m_tabRowColQuery->ui->m_checkHideTransactions->setChecked(d->m_initialState.isHideTransactions()); | 513 | d->m_tabRowColQuery->ui->m_checkHideTransactions->setChecked(d->m_initialState.isHideTransactions()); | ||
514 | d->m_tabRowColQuery->ui->m_checkHideTotals->setChecked(!d->m_initialState.isShowingColumnTotals()); | 514 | d->m_tabRowColQuery->ui->m_checkHideTotals->setChecked(!d->m_initialState.isShowingColumnTotals()); | ||
515 | d->m_tabRowColQuery->ui->m_checkHideSplitDetails->setEnabled(!d->m_initialState.isHideTransactions()); | 515 | d->m_tabRowColQuery->ui->m_checkHideSplitDetails->setEnabled(!d->m_initialState.isHideTransactions()); | ||
Show All 32 Lines | 545 | if (d->m_tabRange) { | |||
548 | d->m_tabRange->ui->m_dataMajorTick->setText(d->m_initialState.dataMajorTick()); | 548 | d->m_tabRange->ui->m_dataMajorTick->setText(d->m_initialState.dataMajorTick()); | ||
549 | d->m_tabRange->ui->m_dataMinorTick->setText(d->m_initialState.dataMinorTick()); | 549 | d->m_tabRange->ui->m_dataMinorTick->setText(d->m_initialState.dataMinorTick()); | ||
550 | d->m_tabRange->ui->m_yLabelsPrecision->setValue(d->m_initialState.yLabelsPrecision()); | 550 | d->m_tabRange->ui->m_yLabelsPrecision->setValue(d->m_initialState.yLabelsPrecision()); | ||
551 | d->m_tabRange->ui->m_dataLock->setCurrentIndex((int)d->m_initialState.dataFilter()); | 551 | d->m_tabRange->ui->m_dataLock->setCurrentIndex((int)d->m_initialState.dataFilter()); | ||
552 | 552 | | |||
553 | KComboBox *combo = d->m_tabRange->ui->m_comboColumns; | 553 | KComboBox *combo = d->m_tabRange->ui->m_comboColumns; | ||
554 | if (d->m_initialState.isColumnsAreDays()) { | 554 | if (d->m_initialState.isColumnsAreDays()) { | ||
555 | switch (d->m_initialState.columnType()) { | 555 | switch (d->m_initialState.columnType()) { | ||
556 | case MyMoneyReport::eNoColumns: | 556 | case MyMoneyReport::Column::NoColumns: | ||
557 | case MyMoneyReport::eDays: | 557 | case MyMoneyReport::Column::Days: | ||
558 | combo->setCurrentItem(i18nc("@item the columns will display daily data", "Daily"), false); | 558 | combo->setCurrentItem(i18nc("@item the columns will display daily data", "Daily"), false); | ||
559 | break; | 559 | break; | ||
560 | case MyMoneyReport::eWeeks: | 560 | case MyMoneyReport::Column::Weeks: | ||
561 | combo->setCurrentItem(i18nc("@item the columns will display weekly data", "Weekly"), false); | 561 | combo->setCurrentItem(i18nc("@item the columns will display weekly data", "Weekly"), false); | ||
562 | break; | 562 | break; | ||
563 | default: | 563 | default: | ||
564 | break; | 564 | break; | ||
565 | } | 565 | } | ||
566 | } else { | 566 | } else { | ||
567 | switch (d->m_initialState.columnType()) { | 567 | switch (d->m_initialState.columnType()) { | ||
568 | case MyMoneyReport::eNoColumns: | 568 | case MyMoneyReport::Column::NoColumns: | ||
569 | case MyMoneyReport::eMonths: | 569 | case MyMoneyReport::Column::Months: | ||
570 | combo->setCurrentItem(i18nc("@item the columns will display monthly data", "Monthly"), false); | 570 | combo->setCurrentItem(i18nc("@item the columns will display monthly data", "Monthly"), false); | ||
571 | break; | 571 | break; | ||
572 | case MyMoneyReport::eBiMonths: | 572 | case MyMoneyReport::Column::BiMonths: | ||
573 | combo->setCurrentItem(i18nc("@item the columns will display bi-monthly data", "Bi-Monthly"), false); | 573 | combo->setCurrentItem(i18nc("@item the columns will display bi-monthly data", "Bi-Monthly"), false); | ||
574 | break; | 574 | break; | ||
575 | case MyMoneyReport::eQuarters: | 575 | case MyMoneyReport::Column::Quarters: | ||
576 | combo->setCurrentItem(i18nc("@item the columns will display quarterly data", "Quarterly"), false); | 576 | combo->setCurrentItem(i18nc("@item the columns will display quarterly data", "Quarterly"), false); | ||
577 | break; | 577 | break; | ||
578 | case MyMoneyReport::eYears: | 578 | case MyMoneyReport::Column::Years: | ||
579 | combo->setCurrentItem(i18nc("@item the columns will display yearly data", "Yearly"), false); | 579 | combo->setCurrentItem(i18nc("@item the columns will display yearly data", "Yearly"), false); | ||
580 | break; | 580 | break; | ||
581 | default: | 581 | default: | ||
582 | break; | 582 | break; | ||
583 | } | 583 | } | ||
584 | } | 584 | } | ||
585 | } | 585 | } | ||
586 | 586 | | |||
▲ Show 20 Lines • Show All 213 Lines • Show Last 20 Lines |