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

List:       kde-commits
Subject:    playground/office/kmymoney/kmymoney2
From:       Laurent Montel <montel () kde ! org>
Date:       2009-05-17 12:36:04
Message-ID: 1242563764.353887.23126.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 969047 by mlaurent:

Port++


 M  +4 -4      dialogs/CMakeLists.txt  
 M  +6 -6      dialogs/ksplittransactiondlg.cpp  
 M  +2 -2      dialogs/kstartdlg.cpp  
 M  +21 -40    dialogs/mymoneyqifprofileeditor.cpp  
 M  +1 -1      wizards/newuserwizard/knewuserwizard.cpp  


--- trunk/playground/office/kmymoney/kmymoney2/dialogs/CMakeLists.txt #969046:969047
@@ -47,14 +47,14 @@
   krecentfileitem.cpp 
   kreconciledlg.cpp
   kreconcilelistitem.cpp 
-  kreportconfigurationfilterdlg.cpp
+  #kreportconfigurationfilterdlg.cpp
   #ksecuritylisteditor.cpp 
   kselectdatabasedlg.cpp
-  #kselecttransactionsdlg.cpp 
+  kselecttransactionsdlg.cpp 
   #ksplittransactiondlg.cpp 
   #kstartdlg.cpp
-  #kupdatestockpricedlg.cpp 
-  #mymoneyqifprofileeditor.cpp
+  kupdatestockpricedlg.cpp 
+  mymoneyqifprofileeditor.cpp
   #transactioneditor.cpp 
   transactionmatcher.cpp
   )
--- trunk/playground/office/kmymoney/kmymoney2/dialogs/ksplittransactiondlg.cpp \
#969046:969047 @@ -55,7 +55,7 @@
 #include <mymoneyfile.h>
 
 #include "kmymoneysplittable.h"
-#include "../dialogs/ksplitcorrectiondlg.h"
+#include "ui_ksplitcorrectiondlg.h"
 
 KSplitTransactionDlg::KSplitTransactionDlg(const MyMoneyTransaction& t,
                                            const MyMoneySplit& s,
@@ -126,8 +126,8 @@
   transactionsTable->setup(priceInfo);
 
   QSize size(width(), height());
-  KGlobal::config()->setGroup("SplitTransactionEditor");
-  size = KGlobal::config()->readSizeEntry("Geometry", &size);
+  KConfigGroup grp = KGlobal::config()->group("SplitTransactionEditor");
+  size = grp.readEntry("Geometry", &size);
   size.setHeight(size.height()-1);
   QDialog::resize( size.expandedTo(minimumSizeHint()) );
 
@@ -142,8 +142,8 @@
 
 KSplitTransactionDlg::~KSplitTransactionDlg()
 {
-  KGlobal::config()->setGroup("SplitTransactionEditor");
-  KGlobal::config()->writeEntry("Geometry", size());
+  KConfigGroup grp =  KGlobal::config()->group("SplitTransactionEditor");
+  grp.writeEntry("Geometry", size());
 }
 
 int KSplitTransactionDlg::exec(void)
@@ -210,7 +210,7 @@
         corrDlg->leaveBtn->setText(q);
 
         if((rc = corrDlg->exec()) == QDialog::Accepted) {
-          QButton* button = corrDlg->buttonGroup->selected();
+          QAbstractButton* button = corrDlg->buttonGroup->selected();
           if(button != 0) {
             switch(corrDlg->buttonGroup->id(button)) {
               case 0:       // continue to edit
--- trunk/playground/office/kmymoney/kmymoney2/dialogs/kstartdlg.cpp #969046:969047
@@ -95,7 +95,7 @@
   //allow user to select either a .kmy file, or any generic file.
   kurlrequest->fileDialog()->setFilter( i18n("%1|KMyMoney files (*.kmy)\n" "%2|All \
files (*.*)").arg("*.kmy").arg("*.*") );  \
                kurlrequest->fileDialog()->setMode(KFile::File || \
                KFile::ExistingOnly);
-  kurlrequest->fileDialog()->setURL(KUrl(kmymoney2->readLastUsedDir()));//kurlrequest->fileDialog()->setURL(KUrl(KGlobalSettings::documentPath()));
 +  kurlrequest->fileDialog()->setUrl(KUrl(kmymoney2->readLastUsedDir()));//kurlrequest->fileDialog()->setURL(KUrl(KGlobalSettings::documentPath()));
  mainLayout->addWidget( kurlrequest );
 
   QLabel *label1 = new QLabel( recentMainFrame, "label1" );
@@ -184,7 +184,7 @@
   if(!kitem) return;
 
   isopenfile = true;
-  kurlrequest->setURL( kitem->fileURL() );
+  kurlrequest->setUrl( kitem->fileURL() );
   // Close the window if the user press an icon
   slotOk();
 }
--- trunk/playground/office/kmymoney/kmymoney2/dialogs/mymoneyqifprofileeditor.cpp \
#969046:969047 @@ -59,8 +59,8 @@
 QValidator::State MyMoneyQifProfileNameValidator::validate(QString& name, int&) \
const  {
   KSharedConfigPtr config = KGlobal::config();
-  config->group("Profiles");
-  QStringList list = grp.readEntry("profiles");
+  KConfigGroup grp = config->group("Profiles");
+  QStringList list = grp.readEntry("profiles", QStringList());
 
   // invalid character?
   if(name.contains(",") != 0)
@@ -121,12 +121,12 @@
   connect(m_thousandsBox, SIGNAL(activated(const QString&)), this, \
SLOT(slotThousandsChanged(const QString&)));  
   connect(m_editInputFilterLocation, SIGNAL(textChanged(const QString&)), \
                &m_profile, SLOT(setFilterScriptImport(const QString&)));
-  connect(m_editInputFilterLocation, SIGNAL(urlSelected(const QString&)), \
m_editInputFilterLocation, SLOT(setURL(const QString&))); +  \
connect(m_editInputFilterLocation, SIGNAL(urlSelected(const QString&)), \
m_editInputFilterLocation, SLOT(setUrl(const QString&)));  
   connect(m_editInputFilterFileType, SIGNAL(textChanged(const QString&)), \
&m_profile, SLOT(setFilterFileType(const QString&)));  
   connect(m_editOutputFilterLocation, SIGNAL(textChanged(const QString&)), \
                &m_profile, SLOT(setFilterScriptExport(const QString&)));
-  connect(m_editOutputFilterLocation, SIGNAL(urlSelected(const QString&)), \
m_editOutputFilterLocation, SLOT(setURL(const QString&))); +  \
connect(m_editOutputFilterLocation, SIGNAL(urlSelected(const QString&)), \
m_editOutputFilterLocation, SLOT(setUrl(const QString&)));  
   connect(m_attemptMatch, SIGNAL(toggled(bool)), &m_profile, \
SLOT(setAttemptMatchDuplicates(bool)));  }
@@ -227,16 +227,16 @@
 
   QStringList list;
   KSharedConfigPtr config = KGlobal::config();
-  config->group("Profiles");
-  list = grp.readEntry("profiles");
+  KConfigGroup grp = config->group("Profiles");
+  list = grp.readEntry("profiles", QStringList());
 
   if(list.count() == 0) {
     m_profile.clear();
     m_profile.setProfileDescription(i18n("The default QIF profile"));
     addProfile("Default");
 
-    config->group("Profiles");
-    list = grp.readEntry("profiles");
+    grp = config->group("Profiles");
+    list = grp.readEntry("profiles", QStringList());
   }
 
   list.sort();
@@ -263,13 +263,13 @@
     m_isDirty = true;
   }
 
-  if(m_profileListBox->findItem(profileName, Qt::ExactMatch | Qt::CaseSensitive) == \
NULL) { +  if(m_profileListBox->findItem(profileName, Q3ListView::ExactMatch | \
Qt::CaseSensitive) == NULL) {  profileName = m_profileListBox->text(0);
   }
 
   m_profile.loadProfile("Profile-" + profileName);
 
-  Q3ListBoxItem *lbi = m_profileListBox->findItem(profileName, Qt::ExactMatch | \
Qt::CaseSensitive); +  Q3ListBoxItem *lbi = m_profileListBox->findItem(profileName, \
Q3ListView::ExactMatch | Qt::CaseSensitive);  int idx = m_profileListBox->index(lbi);
   showProfile();
   if(idx >= 0) {
@@ -284,8 +284,8 @@
   m_editOpeningBalance->setText(m_profile.openingBalanceText());
   m_editAccountDelimiter->setText(m_profile.accountDelimiter());
   m_editVoidMark->setText(m_profile.voidMark());
-  m_editInputFilterLocation->setURL(m_profile.filterScriptImport());
-  m_editOutputFilterLocation->setURL(m_profile.filterScriptExport());
+  m_editInputFilterLocation->setUrl(m_profile.filterScriptImport());
+  m_editOutputFilterLocation->setUrl(m_profile.filterScriptExport());
   m_editInputFilterFileType->setText(m_profile.filterFileType());
 
   m_editDateFormat->setCurrentText(m_profile.outputDateFormat());
@@ -316,23 +316,23 @@
 
   config->deleteGroup("Profile-" + name);
 
-  config->group("Profiles");
-  QStringList list = grp.readEntry("profiles");
+  KConfigGroup grp = config->group("Profiles");
+  QStringList list = grp.readEntry("profiles", QStringList());
   list.remove(name);
 
-  config->writeEntry("profiles", list);
+  grp.writeEntry("profiles", list);
   m_isDirty = true;
 }
 
 void MyMoneyQifProfileEditor::addProfile(const QString& name)
 {
   KSharedConfigPtr config = KGlobal::config();
-  config->group("Profiles");
-  QStringList list = grp.readEntry("profiles");
+  KConfigGroup grp = config->group("Profiles");
+  QStringList list = grp.readEntry("profiles", QStringList());
 
   list += name;
   list.sort();
-  config->writeEntry("profiles", list);
+  grp.writeEntry("profiles", list);
 
   m_profile.setProfileName("Profile-" + name);
   m_profile.saveProfile();
@@ -360,7 +360,8 @@
   m_profile.saveProfile();
 
   KSharedConfigPtr config = KGlobal::config();
-  config->rollback();
+#warning "port to kde4"
+  //config->rollback();
   config->reparseConfiguration();
 
   QString currentProfile = m_profile.profileName().mid(8);
@@ -398,34 +399,14 @@
 const QString MyMoneyQifProfileEditor::enterName(bool& ok)
 {
   MyMoneyQifProfileNameValidator val(this, "Validator");
-#if KDE_IS_VERSION(3,2,0)
   return KInputDialog::getText(i18n("QIF Profile Editor"),
                                i18n("Enter new profile name"),
                                QString::null,
                                &ok,
                                this,
-                               0,
+
                                &val,
                                0);
-#else
-  QString rc;
-
-  // the blank in the next line as the value for the edit box is
-  // there on purpose, so that with the following call to validateAndSet
-  // the state is changed and the OK-Button is greyed
-  KLineEditDlg* dlg = new KLineEditDlg(i18n("Enter new profile name"), " ", this);
-  dlg->lineEdit()->setValidator(&val);
-  dlg->lineEdit()->validateAndSet("", 0, 0, 0);
-
-  ok = false;
-  if(dlg->exec()) {
-    ok = true;
-  }
-  rc = dlg->lineEdit()->text();
-  delete dlg;
-
-  return rc;
-#endif
 }
 
 void MyMoneyQifProfileEditor::slotDelete(void)
--- trunk/playground/office/kmymoney/kmymoney2/wizards/newuserwizard/knewuserwizard.cpp \
#969046:969047 @@ -331,7 +331,7 @@
 
   KUser user;
   m_dataFileEdit->setShowLocalProtocol(false);
-  m_dataFileEdit->setURL(QString("%1/%2.kmy").arg(QDir::homePath(), \
user.loginName())); +  \
m_dataFileEdit->setUrl(QString("%1/%2.kmy").arg(QDir::homePath(), user.loginName())); \
}  
 bool FilePage::isComplete(void) const


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