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

List:       kde-commits
Subject:    =?utf-8?q?=5Bskrooge=5D_skrooge=5Fimportexport=3A_Small_correcti?=
From:       Stephane Mankowski <stephane () mankowski ! fr>
Date:       2011-04-30 19:32:25
Message-ID: 20110430193225.4C31AA60A9 () git ! kde ! org
[Download RAW message or body]

Git commit 773fca8c925d6acb2fd27927916906298d5b0399 by Stephane Mankowski.
Committed on 30/04/2011 at 21:31.
Pushed by smankowski into branch 'master'.

Small correction on merge operations

M  +1    -1    skrooge_importexport/skgimportexportplugin.cpp     

http://commits.kde.org/skrooge/773fca8c925d6acb2fd27927916906298d5b0399

diff --git a/skrooge_importexport/skgimportexportplugin.cpp \
b/skrooge_importexport/skgimportexportplugin.cpp index 8373e4b..32b1f77 100644
--- a/skrooge_importexport/skgimportexportplugin.cpp
+++ b/skrooge_importexport/skgimportexportplugin.cpp
@@ -558,7 +558,7 @@ void SKGImportExportPlugin::mergeImportedOperation()
             SKGOperationObject opManual = selection.at(1);
             if(opImported.isImported() != opManual.isImported()) {
                 if(!opImported.isImported())  qSwap(opImported, opManual);
-                int rc = KMessageBox::No;
+                int rc = KMessageBox::Yes;
                 if(opImported.getCurrentAmount() != opManual.getCurrentAmount()) {
                     rc = KMessageBox::questionYesNo(SKGMainPanel::getMainPanel(),
                                                     i18nc("Question",  "Amounts are \
not equals. Do you want to force the merge ?"),


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