[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-09-11 7:22:48
Message-ID: 1252653768.426699.2474.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1022223 by smankowski:

Correction message in history when an object is deleted
Download button always visible on unit plugin.

 M  +2 -0      CHANGELOG  
 M  +4 -2      skgbasemodeler/skgobjectbase.cpp  
 M  +2 -1      skgbasemodeler/skgobjectbase.h  
 M  +1 -1      skrooge_operation/skgoperationpluginwidget.cpp  
 M  +27 -27    skrooge_unit/skgunitpluginwidget_base.ui  


--- trunk/extragear/office/skrooge/CHANGELOG #1022222:1022223
@@ -14,6 +14,8 @@
   *A setting allows to create automatically a template when an operation is \
                scheduled
   *Selection is done on duplicated object after a "Duplicate"
   *Selection is done on created template after a "Create template"
+  *Correction message in history when an object is deleted
+  *Download button always visible on unit plugin.
   
  -- maintainer Stephane MANKOWSKI <miraks@users.sourceforge.net>  xxx
  
--- trunk/extragear/office/skrooge/skgbasemodeler/skgobjectbase.cpp #1022222:1022223
@@ -376,7 +376,7 @@
         return err;
 }
 
-SKGError SKGObjectBase::remove() const
+SKGError SKGObjectBase::remove(bool iSendMessage) const
 {
         SKGError err;
         SKGTRACEINRC(20, "SKGObjectBase::remove", err);
@@ -400,8 +400,10 @@
                         }
                 }
 
+                QString displayname=getDisplayName(); //Must be done before the \
                delete order
                 if (err.isSucceeded()) err=SKGServices::executeSqliteOrder(document, \
                "DELETE FROM "+getRealTable()+" WHERE \
                id="+SKGServices::intToString(id));
-                if (err.isSucceeded()) err=((SKGDocument*) \
document)->sendMessage(i18n("[%1] has been deleted",getDisplayName()), false); +      \
if (iSendMessage && err.isSucceeded() && !displayname.isEmpty()) +                    \
err=((SKGDocument*) document)->sendMessage(i18n("[%1] has been deleted",displayname), \
false);  }
 
         return err;
--- trunk/extragear/office/skrooge/skgbasemodeler/skgobjectbase.h #1022222:1022223
@@ -296,10 +296,11 @@
 
         /**
          * delete the object into the database
+         * @param iSendMessage to send message when the object is deleted
          * @return an object managing the error
          *   @see SKGError
          */
-        virtual SKGError remove() const;
+        virtual SKGError remove(bool iSendMessage=true) const;
 
         /**
          * dump the object
--- trunk/extragear/office/skrooge/skrooge_operation/skgoperationpluginwidget.cpp \
#1022222:1022223 @@ -471,7 +471,7 @@
                                 for ( int j=0; err.isSucceeded() && j<nbsubop; ++j ) \
                {
                                         SKGObjectBase sop=subOps.at ( j );
                                         if ( !listIdSubOp.contains ( sop.getID() ) ) \
                {
-                                                err=sop.remove();
+                                                err=sop.remove(false);
                                         }
                                 }
                         }
--- trunk/extragear/office/skrooge/skrooge_unit/skgunitpluginwidget_base.ui \
#1022222:1022223 @@ -651,6 +651,23 @@
            </property>
           </spacer>
          </item>
+         <item>
+          <widget class="KPushButton" name="kUnitValueDownload">
+           <property name="enabled">
+            <bool>false</bool>
+           </property>
+           <property name="toolTip">
+            <string>Download quotes for the selected unit.
+See options to modify download frequency.</string>
+           </property>
+           <property name="statusTip">
+            <string>Download quotes for the selected unit.</string>
+           </property>
+           <property name="text">
+            <string>Download</string>
+           </property>
+          </widget>
+         </item>
         </layout>
        </item>
       </layout>
@@ -714,23 +731,6 @@
            </widget>
           </item>
           <item>
-           <widget class="KPushButton" name="kUnitValueDownload">
-            <property name="enabled">
-             <bool>false</bool>
-            </property>
-            <property name="toolTip">
-             <string>Download quotes for the selected unit.
-See options to modify download frequency.</string>
-            </property>
-            <property name="statusTip">
-             <string>Download quotes for the selected unit.</string>
-            </property>
-            <property name="text">
-             <string>Download</string>
-            </property>
-           </widget>
-          </item>
-          <item>
            <spacer name="verticalSpacer">
             <property name="orientation">
              <enum>Qt::Vertical</enum>
@@ -757,16 +757,6 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>KComboBox</class>
-   <extends>QComboBox</extends>
-   <header>kcombobox.h</header>
-  </customwidget>
-  <customwidget>
-   <class>KLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>klineedit.h</header>
-  </customwidget>
-  <customwidget>
    <class>KPlotWidget</class>
    <extends>QFrame</extends>
    <header>kplotwidget.h</header>
@@ -777,6 +767,16 @@
    <header>kpushbutton.h</header>
   </customwidget>
   <customwidget>
+   <class>KLineEdit</class>
+   <extends>QLineEdit</extends>
+   <header>klineedit.h</header>
+  </customwidget>
+  <customwidget>
+   <class>KComboBox</class>
+   <extends>QComboBox</extends>
+   <header>kcombobox.h</header>
+  </customwidget>
+  <customwidget>
    <class>SKGCalculatorEdit</class>
    <extends>KLineEdit</extends>
    <header>skgcalculatoredit.h</header>


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