Differential D11053 Diff 28950 kmymoney/dialogs/kreportconfigurationfilterdlg.cpp

Changeset View

Standalone View

View Options

kmymoney/dialogs/kreportconfigurationfilterdlg.cpp

Show First 20 Lines • Show All 191 Lines • ▼ Show 20 Line(s)158 if (m_tab2) {
192 //set moving average days 192​ //set moving average days
193 if (m_tab2->findChild<QSpinBox*>("m_movingAverageDays")->isEnabled()) { 193​ if (m_tab2->findChild<QSpinBox*>("m_movingAverageDays")->isEnabled()) {
194 m_currentState.setMovingAverageDays(m_tab2->findChild<QSpinBox*>("m_movingAverageDays")->value()); 194​ m_currentState.setMovingAverageDays(m_tab2->findChild<QSpinBox*>("m_movingAverageDays")->value());
195 } 195​ }
196 } else if (m_tab3) { 196​ } else if (m_tab3) {
197 MyMoneyReport::ERowType rtq[8] = { MyMoneyReport::eCategory, MyMoneyReport::eTopCategory, MyMoneyReport::eTag, MyMoneyReport::ePayee, MyMoneyReport::eAccount, MyMoneyReport::eTopAccount, MyMoneyReport::eMonth, MyMoneyReport::eWeek }; 197​ MyMoneyReport::ERowType rtq[8] = { MyMoneyReport::eCategory, MyMoneyReport::eTopCategory, MyMoneyReport::eTag, MyMoneyReport::ePayee, MyMoneyReport::eAccount, MyMoneyReport::eTopAccount, MyMoneyReport::eMonth, MyMoneyReport::eWeek };
198 m_currentState.setRowType(rtq[m_tab3->findChild<KComboBox*>("m_comboOrganizeBy")->currentIndex()]); 198​ m_currentState.setRowType(rtq[m_tab3->findChild<KComboBox*>("m_comboOrganizeBy")->currentIndex()]);
199 199​
200 unsigned qc = MyMoneyReport::eQCnone; 200​ unsigned qc = MyMoneyReport::QueryColumns::None;
201 201​
202 if (m_currentState.queryColumns() & MyMoneyReport::eQCloan) 202​ if (m_currentState.queryColumns() & MyMoneyReport::QueryColumns::Loan)
203 // once a loan report, always a loan report 203​ // once a loan report, always a loan report
204 qc = MyMoneyReport::eQCloan; 204​ qc = MyMoneyReport::QueryColumns::Loan;
205 205​
206 if (m_tab3->findChild<QCheckBox*>("m_checkNumber")->isChecked()) 206​ if (m_tab3->findChild<QCheckBox*>("m_checkNumber")->isChecked())
207 qc |= MyMoneyReport::eQCnumber; 207​ qc |= MyMoneyReport::QueryColumns::Number;
208 if (m_tab3->findChild<QCheckBox*>("m_checkPayee")->isChecked()) 208​ if (m_tab3->findChild<QCheckBox*>("m_checkPayee")->isChecked())
209 qc |= MyMoneyReport::eQCpayee; 209​ qc |= MyMoneyReport::QueryColumns::Payee;
210 if (m_tab3->findChild<QCheckBox*>("m_checkTag")->isChecked()) 210​ if (m_tab3->findChild<QCheckBox*>("m_checkTag")->isChecked())
211 qc |= MyMoneyReport::eQCtag; 211​ qc |= MyMoneyReport::QueryColumns::Tag;
212 if (m_tab3->findChild<QCheckBox*>("m_checkCategory")->isChecked()) 212​ if (m_tab3->findChild<QCheckBox*>("m_checkCategory")->isChecked())
213 qc |= MyMoneyReport::eQCcategory; 213​ qc |= MyMoneyReport::QueryColumns::Category;
214 if (m_tab3->findChild<QCheckBox*>("m_checkMemo")->isChecked()) 214​ if (m_tab3->findChild<QCheckBox*>("m_checkMemo")->isChecked())
215 qc |= MyMoneyReport::eQCmemo; 215​ qc |= MyMoneyReport::QueryColumns::Memo;
216 if (m_tab3->findChild<QCheckBox*>("m_checkAccount")->isChecked()) 216​ if (m_tab3->findChild<QCheckBox*>("m_checkAccount")->isChecked())
217 qc |= MyMoneyReport::eQCaccount; 217​ qc |= MyMoneyReport::QueryColumns::Account;
218 if (m_tab3->findChild<QCheckBox*>("m_checkReconciled")->isChecked()) 218​ if (m_tab3->findChild<QCheckBox*>("m_checkReconciled")->isChecked())
219 qc |= MyMoneyReport::eQCreconciled; 219​ qc |= MyMoneyReport::QueryColumns::Reconciled;
220 if (m_tab3->findChild<QCheckBox*>("m_checkAction")->isChecked()) 220​ if (m_tab3->findChild<QCheckBox*>("m_checkAction")->isChecked())
221 qc |= MyMoneyReport::eQCaction; 221​ qc |= MyMoneyReport::QueryColumns::Action;
222 if (m_tab3->findChild<QCheckBox*>("m_checkShares")->isChecked()) 222​ if (m_tab3->findChild<QCheckBox*>("m_checkShares")->isChecked())
223 qc |= MyMoneyReport::eQCshares; 223​ qc |= MyMoneyReport::QueryColumns::Shares;
224 if (m_tab3->findChild<QCheckBox*>("m_checkPrice")->isChecked()) 224​ if (m_tab3->findChild<QCheckBox*>("m_checkPrice")->isChecked())
225 qc |= MyMoneyReport::eQCprice; 225​ qc |= MyMoneyReport::QueryColumns::Price;
226 if (m_tab3->findChild<QCheckBox*>("m_checkBalance")->isChecked()) 226​ if (m_tab3->findChild<QCheckBox*>("m_checkBalance")->isChecked())
227 qc |= MyMoneyReport::eQCbalance; 227​ qc |= MyMoneyReport::QueryColumns::Balance;
228 228​
229 m_currentState.setQueryColumns(static_cast<MyMoneyReport::EQueryColumns>(qc)); 229​ m_currentState.setQueryColumns(static_cast<MyMoneyReport::QueryColumns::Type>(qc));
230 230​
231 m_currentState.setTax(m_tab3->findChild<QCheckBox*>("m_checkTax")->isChecked()); 231​ m_currentState.setTax(m_tab3->findChild<QCheckBox*>("m_checkTax")->isChecked());
232 m_currentState.setInvestmentsOnly(m_tab3->findChild<QCheckBox*>("m_checkInvestments")->isChecked()); 232​ m_currentState.setInvestmentsOnly(m_tab3->findChild<QCheckBox*>("m_checkInvestments")->isChecked());
233 m_currentState.setLoansOnly(m_tab3->findChild<QCheckBox*>("m_checkLoans")->isChecked()); 233​ m_currentState.setLoansOnly(m_tab3->findChild<QCheckBox*>("m_checkLoans")->isChecked());
234 234​
235 m_currentState.setDetailLevel(m_tab3->findChild<QCheckBox*>("m_checkHideSplitDetails")->isChecked() ? 235​ m_currentState.setDetailLevel(m_tab3->findChild<QCheckBox*>("m_checkHideSplitDetails")->isChecked() ?
236 MyMoneyReport::eDetailNone : MyMoneyReport::eDetailAll); 236​ MyMoneyReport::eDetailNone : MyMoneyReport::eDetailAll);
237 } 237​ }
▲ Show 20 Lines • Show All 180 Lines • ▼ Show 20 Line(s)395 switch (m_initialState.rowType()) {
418 case MyMoneyReport::eWeek: 418​ case MyMoneyReport::eWeek:
419 combo->setCurrentItem(i18n("Week"), false); 419​ combo->setCurrentItem(i18n("Week"), false);
420 break; 420​ break;
421 default: 421​ default:
422 throw MYMONEYEXCEPTION("KReportConfigurationFilterDlg::slotReset(): QueryTable report has invalid rowtype"); 422​ throw MYMONEYEXCEPTION("KReportConfigurationFilterDlg::slotReset(): QueryTable report has invalid rowtype");
423 } 423​ }
424 424​
425 unsigned qc = m_initialState.queryColumns(); 425​ unsigned qc = m_initialState.queryColumns();
426 m_tab3->findChild<QCheckBox*>("m_checkNumber")->setChecked(qc & MyMoneyReport::eQCnumber); 426​ m_tab3->findChild<QCheckBox*>("m_checkNumber")->setChecked(qc & MyMoneyReport::QueryColumns::Number);
427 m_tab3->findChild<QCheckBox*>("m_checkPayee")->setChecked(qc & MyMoneyReport::eQCpayee); 427​ m_tab3->findChild<QCheckBox*>("m_checkPayee")->setChecked(qc & MyMoneyReport::QueryColumns::Payee);
428 m_tab3->findChild<QCheckBox*>("m_checkTag")->setChecked(qc & MyMoneyReport::eQCtag); 428​ m_tab3->findChild<QCheckBox*>("m_checkTag")->setChecked(qc & MyMoneyReport::QueryColumns::Tag);
429 m_tab3->findChild<QCheckBox*>("m_checkCategory")->setChecked(qc & MyMoneyReport::eQCcategory); 429​ m_tab3->findChild<QCheckBox*>("m_checkCategory")->setChecked(qc & MyMoneyReport::QueryColumns::Category);
430 m_tab3->findChild<QCheckBox*>("m_checkMemo")->setChecked(qc & MyMoneyReport::eQCmemo); 430​ m_tab3->findChild<QCheckBox*>("m_checkMemo")->setChecked(qc & MyMoneyReport::QueryColumns::Memo);
431 m_tab3->findChild<QCheckBox*>("m_checkAccount")->setChecked(qc & MyMoneyReport::eQCaccount); 431​ m_tab3->findChild<QCheckBox*>("m_checkAccount")->setChecked(qc & MyMoneyReport::QueryColumns::Account);
432 m_tab3->findChild<QCheckBox*>("m_checkReconciled")->setChecked(qc & MyMoneyReport::eQCreconciled); 432​ m_tab3->findChild<QCheckBox*>("m_checkReconciled")->setChecked(qc & MyMoneyReport::QueryColumns::Reconciled);
433 m_tab3->findChild<QCheckBox*>("m_checkAction")->setChecked(qc & MyMoneyReport::eQCaction); 433​ m_tab3->findChild<QCheckBox*>("m_checkAction")->setChecked(qc & MyMoneyReport::QueryColumns::Action);
434 m_tab3->findChild<QCheckBox*>("m_checkShares")->setChecked(qc & MyMoneyReport::eQCshares); 434​ m_tab3->findChild<QCheckBox*>("m_checkShares")->setChecked(qc & MyMoneyReport::QueryColumns::Shares);
435 m_tab3->findChild<QCheckBox*>("m_checkPrice")->setChecked(qc & MyMoneyReport::eQCprice); 435​ m_tab3->findChild<QCheckBox*>("m_checkPrice")->setChecked(qc & MyMoneyReport::QueryColumns::Price);
436 m_tab3->findChild<QCheckBox*>("m_checkBalance")->setChecked(qc & MyMoneyReport::eQCbalance); 436​ m_tab3->findChild<QCheckBox*>("m_checkBalance")->setChecked(qc & MyMoneyReport::QueryColumns::Balance);
437 437​
438 m_tab3->findChild<QCheckBox*>("m_checkTax")->setChecked(m_initialState.isTax()); 438​ m_tab3->findChild<QCheckBox*>("m_checkTax")->setChecked(m_initialState.isTax());
439 m_tab3->findChild<QCheckBox*>("m_checkInvestments")->setChecked(m_initialState.isInvestmentsOnly()); 439​ m_tab3->findChild<QCheckBox*>("m_checkInvestments")->setChecked(m_initialState.isInvestmentsOnly());
440 m_tab3->findChild<QCheckBox*>("m_checkLoans")->setChecked(m_initialState.isLoansOnly()); 440​ m_tab3->findChild<QCheckBox*>("m_checkLoans")->setChecked(m_initialState.isLoansOnly());
441 441​
442 m_tab3->findChild<QCheckBox*>("m_checkHideSplitDetails")->setChecked 442​ m_tab3->findChild<QCheckBox*>("m_checkHideSplitDetails")->setChecked
443 (m_initialState.detailLevel() == MyMoneyReport::eDetailNone); 443​ (m_initialState.detailLevel() == MyMoneyReport::eDetailNone);
444 } 444​ }
▲ Show 20 Lines • Show All 223 Lines • Show Last 20 Lines