[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/office/skrooge
From:       Stephane Mankowski <stephane () mankowski ! fr>
Date:       2009-10-31 21:06:59
Message-ID: 1257023219.825283.21393.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1043138 by smankowski:

Various small modifications

 M  +4 -0      TODO  
 M  +2 -0      skrooge_calculator/skgcalculatorpluginwidget.cpp  
 M  +11 -3     skrooge_report/skgreportpluginwidget.cpp  


--- trunk/extragear/office/skrooge/TODO #1043137:1043138
@@ -203,3 +203,7 @@
 If you want help with more issues, write back. I can evaluate your
 mockups or some specific issues etc. though if this project consumes
 much of my time I'd like a mention somewhere on your website back :>
+
+032:P1: On contextual menu on tabs, an action is able to open corresponding page in \
settings. +
+
--- trunk/extragear/office/skrooge/skrooge_calculator/skgcalculatorpluginwidget.cpp \
#1043137:1043138 @@ -216,6 +216,7 @@
 {
         SKGTRACEIN ( 10, "SKGCalculatorPluginWidget::dataModified" );
         Q_UNUSED(iIdTransaction);
+        QApplication::setOverrideCursor ( QCursor ( Qt::WaitCursor ) );
 
         //Refresh widgets
         QSqlDatabase* db = getDocument()->getDatabase();
@@ -256,6 +257,7 @@
         if ( db!=NULL && (iTableName=="interest" ||iTableName=="account" || \
iTableName.isEmpty())) {  computeInterest();
         }
+        QApplication::restoreOverrideCursor();
 }
 
 void SKGCalculatorPluginWidget::computeInterest()
--- trunk/extragear/office/skrooge/skrooge_report/skgreportpluginwidget.cpp \
#1043137:1043138 @@ -464,7 +464,7 @@
         }
         ui.kDateBegin->setDate ( a );
         ui.kDateEnd->setDate ( b );
-        wc += "strftime("+ strfFormat + ",d_date)>=strftime(" + strfFormat + \
",date('now', '-" + SKGServices::intToString ( val ) + " " + sqlInterval + "')) AND \
strftime("+ strfFormat + ",d_date)<=strftime(" + strfFormat + ",date('now', '-" + \
SKGServices::intToString ( one ) + " " + sqlInterval + "'))"; +        wc += \
"strftime("+ strfFormat + ",d_date)>=strftime(" + strfFormat + ",date('now', '-" + \
SKGServices::intToString ( val ) + ' ' + sqlInterval + "')) AND strftime("+ \
strfFormat + ",d_date)<=strftime(" + strfFormat + ",date('now', '-" + \
SKGServices::intToString ( one ) + ' ' + sqlInterval + "'))";  break;
     case 3:
         //Last Interval
@@ -490,7 +490,7 @@
         a=a.addDays ( 1 );
         ui.kDateBegin->setDate ( a );
         ui.kDateEnd->setDate ( b );
-        wc += "d_date > date('now','-" + SKGServices::intToString ( val ) + " " + \
sqlInterval + "') AND d_date<=date('now')"; +        wc += "d_date > date('now','-" + \
SKGServices::intToString ( val ) + ' ' + sqlInterval + "') AND d_date<=date('now')";  \
break;  case 4:
         // Custom Date
@@ -513,7 +513,7 @@
     }
     if ( operationTypes.length() > 0 )
     {
-        wc += " AND (" + operationTypes.join ( " OR " ) + ")";
+        wc += " AND (" + operationTypes.join ( " OR " ) +')';
     }
 
     if ( ui.kTransfers->isChecked() == false )
@@ -536,6 +536,7 @@
 
 void SKGReportPluginWidget::refresh()
 {
+    //Check dates
     ui.kDateSelect->setVisible ( ui.kPeriod->currentIndex() >0 );
     ui.kDateSelect->setEnabled ( ui.kPeriod->currentIndex() ==4 );
 
@@ -547,6 +548,13 @@
         ui.kDateEnd->setDate ( d1 );
     }
 
+    //Check income & expense
+    if(!ui.kIncomes->isChecked() && !ui.kExpenses->isChecked())
+    {
+      if(sender()==ui.kIncomes) ui.kExpenses->setChecked(true);
+      else ui.kIncomes->setChecked(true);
+    }
+
     bool current = ( ui.kPeriod->currentIndex() == 1 );
     bool previous = ( ui.kPeriod->currentIndex() == 2 );
     bool last = ( ui.kPeriod->currentIndex() == 3 );


[prev in list] [next in list] [prev in thread] [next in thread]