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

List:       kde-commits
Subject:    [calligra/kexi-master3-staniek] /: Merge branch 'kexi-frameworks9-staniek'
From:       Jaroslaw Staniek <staniek () kde ! org>
Date:       2015-09-01 1:49:29
Message-ID: E1ZWahV-0005Ih-2V () scm ! kde ! org
[Download RAW message or body]

Git commit c3fd2a52c6d1d98010f9752e2a58153209f1c3c4 by Jaroslaw Staniek.
Committed on 01/09/2015 at 00:41.
Pushed by staniek into branch 'kexi-master3-staniek'.

Merge branch 'kexi-frameworks9-staniek'

Kexi 3 Port!

Conflicts:
	kexi/plugins/importexport/csv/kexicsvexport.cpp
	kexi/plugins/importexport/csv/kexicsvimportdialog.cpp

M  +11   -5    CMakeLists.txt
M  +1    -1    CalligraProducts.cmake
M  +10   -10   kexi/kexi.appdata.xml
M  +0    -1    kexi/kexiutils/KexiCommandLinkButton.cpp
M  +69   -69   kexi/plugins/importexport/csv/kexicsvexport.cpp
M  +307  -324  kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
M  +20   -28   kexi/plugins/importexport/csv/kexicsvimportdialog.h

http://commits.kde.org/calligra/c3fd2a52c6d1d98010f9752e2a58153209f1c3c4

diff --cc kexi/plugins/importexport/csv/kexicsvexport.cpp
index 3e55398,7f77fb7..d1b2c78
--- a/kexi/plugins/importexport/csv/kexicsvexport.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvexport.cpp
@@@ -194,11 -195,10 +195,10 @@@ bool KexiCSVExport::exportData(KDbTable
  //  isFloatingPoint[i] = fields[i]->field->isFPNumericType();
      }
  
- kDebug() << 1;
      // 1. Output column names
      if (options.addColumnNames) {
-         for (uint i = 0; i < fieldsCount; i++) {
-             //kDebug() << "Adding column names";
+         for (int i = 0; i < fieldsCount; i++) {
 -            qDebug() << "Adding column names";
++            //qDebug() << "Adding column names";
              if (i > 0) {
                  APPEND(delimiter);
              }
@@@ -269,8 -269,8 +269,8 @@@
  
      if (kSaveFile) {
          stream->flush();
-         if (!kSaveFile->finalize()) {
-             kWarning() << "Error finalizing stream!";
+         if (!kSaveFile->commit()) {
 -                qDebug() << "Error commiting the file" << kSaveFile->fileName();
++            qWarning() << "Error commiting the file" << kSaveFile->fileName();
          }
      }
      return true;
diff --cc kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
index 69a2ab5,738c430..93b724d
--- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
@@@ -916,8 -909,7 +910,8 @@@ void KexiCSVImportDialog::fillTable(
      m_columnsAdjusted = true;
  
      if (m_primaryKeyColumn >= 0 && m_primaryKeyColumn < m_table->columnCount()) {
-         if (KexiDB::Field::Integer != d->detectedType(m_primaryKeyColumn)) {
+         if (KDbField::Integer != d->detectedType(m_primaryKeyColumn)) {
 +            setPrimaryKeyIcon(m_primaryKeyColumn, false);
              m_primaryKeyColumn = -1;
          }
      }
@@@ -1340,34 -1332,21 +1333,34 @@@ tristate KexiCSVImportDialog::loadRows(
      return true;
  }
  
 -void KexiCSVImportDialog::updateColumnText(int col)
 +void KexiCSVImportDialog::updateColumn(int col)
  {
-     KexiDB::Field::Type detectedType = d->detectedType(col);
-     if (detectedType == KexiDB::Field::InvalidType) {
-         d->setDetectedType(col, KexiDB::Field::Text); //entirely empty column
-         detectedType = KexiDB::Field::Text;
+     KDbField::Type detectedType = d->detectedType(col);
+     if (detectedType == KDbField::InvalidType) {
+         d->setDetectedType(col, KDbField::Text); //entirely empty column
+         detectedType = KDbField::Text;
      }
  
      m_table->setHeaderData(col, Qt::Horizontal,
-         QString(i18n("Column %1", col + 1) + "  \n(" + \
kexiCSVImportStatic->typeNames[detectedType].toLower() + ")  ")); +         \
QString(xi18n("Column %1", col + 1) + "  \n(" + \
kexiCSVImportStatic->typeNames[detectedType].toLower() + ")  "));  \
m_tableView->horizontalHeader()->adjustSize();  +    if (m_primaryKeyColumn == -1 && \
isPrimaryKeyAllowed(col)) {  +        m_primaryKeyColumn = col;
 +    }
 +}
  
 -    //check uniqueness
 +bool KexiCSVImportDialog::isPrimaryKeyAllowed(int col)
 +{
      QList<int> *list = d->uniquenessTest(col);
 -    if (m_primaryKeyColumn == -1 && list && !list->isEmpty()) {
 +    if (m_primaryKeyColumn != -1 || !list || list->isEmpty()) {
 +        return false;
 +    }
 +    bool result = false;
 +    int expectedRowCount = m_table->rowCount();
 +    if (m_table->firstRowForFieldNames()) {
 +        expectedRowCount--;
 +    }
 +    if (list->count() == expectedRowCount) {
          qSort(*list);
          QList<int>::ConstIterator it = list->constBegin();
          int prevValue = *it;
@@@ -1707,11 -1683,11 +1691,11 @@@ void KexiCSVImportDialog::formatChanged
  {
      if (index < 0 || index >= kexiCSVImportStatic->types.size())
          return;
-     KexiDB::Field::Type type = kexiCSVImportStatic->types[index];
+     KDbField::Type type = kexiCSVImportStatic->types[index];
      d->setDetectedType(m_tableView->currentIndex().column(), type);
-     m_primaryKeyField->setEnabled(KexiDB::Field::Integer == type);
+     m_primaryKeyField->setEnabled(KDbField::Integer == type);
      m_primaryKeyField->setChecked(m_primaryKeyColumn == \
                m_tableView->currentIndex().column() && \
                m_primaryKeyField->isEnabled());
 -    updateColumnText(m_tableView->currentIndex().column());
 +    updateColumn(m_tableView->currentIndex().column());
  }
  
  void KexiCSVImportDialog::delimiterChanged(const QString& delimiter)


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