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

List:       kde-commits
Subject:    koffice/kexi/plugins/tables
From:       Jaroslaw Staniek <js () iidea ! pl>
Date:       2004-03-12 15:51:38
Message-ID: 20040312155138.6F05899A8 () office ! kde ! org
[Download RAW message or body]

CVS commit by staniek: 

Alter Table Dialog
 -now KexiDataTable is inherited instead of using KexiTableView
  internally. Thus we have actions like 'row deleting' available.
 -on table schema saving: checking for duplicated field names is now
   case insensitive

The dialog is quite usable now.

CC_MAIL: dkite@shaw.ca


  M +13 -10    kexialtertabledialog.cpp   1.36
  M +6 -6      kexialtertabledialog.h   1.14


--- koffice/kexi/plugins/tables/kexialtertabledialog.cpp  #1.35:1.36
@@ -51,5 +51,5 @@
 KexiAlterTableDialog::KexiAlterTableDialog(KexiMainWindow *win, QWidget *parent, 
         KexiDB::TableSchema *table, const char *name)
- : KexiViewBase(win, parent, name)
+ : KexiDataTable(win, parent, name)
 {
         m_table = table; //orig table
@@ -126,7 +126,9 @@ void KexiAlterTableDialog::init()
         kdDebug() << "KexiAlterTableDialog::init(): vector contains " << \
m_fields.size() << " items" << endl;  
-        m_view = new KexiTableView(data, this, "tableview");
-        QVBoxLayout *box = new QVBoxLayout(this);
-        box->addWidget(m_view);
+        m_view->setData(data);
+
+//      m_view = new KexiTableView(data, this, "tableview");
+//      QVBoxLayout *box = new QVBoxLayout(this);
+//      box->addWidget(m_view);
 
         m_view->setNavigatorEnabled(false);
@@ -281,10 +283,10 @@ KexiAlterTableDialog::initActions()
 }
 
-QWidget* KexiAlterTableDialog::mainWidget() 
+/*QWidget* KexiAlterTableDialog::mainWidget() 
 {
         return m_view;
-}
+}*/
 
-QSize KexiAlterTableDialog::minimumSizeHint() const
+/*QSize KexiAlterTableDialog::minimumSizeHint() const
 {
 //      QWidget*const w= (QWidget*const)mainWidget();
@@ -297,5 +299,5 @@ QSize KexiAlterTableDialog::sizeHint() c
         return m_view->sizeHint();
 }
-
+*/
 // update actions --------------
 
@@ -366,5 +368,6 @@ bool KexiAlterTableDialog::beforeSwitchT
 KexiPropertyBuffer *KexiAlterTableDialog::propertyBuffer()
 {
-        return m_fields.at(m_view->currentRow());
+        return (m_view->currentRow() >= 0) ? 
+                m_fields.at( m_view->currentRow() ) : 0;
 //      return m_currentBufferCleared ? 0 : m_fields.at(m_view->currentRow());
 }
@@ -573,5 +576,5 @@ KexiDB::SchemaData* KexiAlterTableDialog
         bool no_fields = true;
         int i;
-        QDict<char> names;
+        QDict<char> names(101, false);
         char dummy;
         for (i=0;i<(int)m_fields.size();i++) {

--- koffice/kexi/plugins/tables/kexialtertabledialog.h  #1.13:1.14
@@ -22,5 +22,5 @@
 
 #include <qptrvector.h>
-#include <kexiviewbase.h>
+#include <kexidatatable.h>
 
 class KPopupMenu;
@@ -41,5 +41,5 @@ namespace KexiDB
 }
 
-class KexiAlterTableDialog : public KexiViewBase
+class KexiAlterTableDialog : public KexiDataTable
 {
         Q_OBJECT
@@ -55,9 +55,9 @@ class KexiAlterTableDialog : public Kexi
                 ~KexiAlterTableDialog();
 
-                virtual QWidget* mainWidget();
+//              virtual QWidget* mainWidget();
 //              KexiDataTableView* tableView() const { return m_view; }
 
-                virtual QSize minimumSizeHint() const;
-                virtual QSize sizeHint() const;
+//              virtual QSize minimumSizeHint() const;
+//              virtual QSize sizeHint() const;
 
 
@@ -111,5 +111,5 @@ class KexiAlterTableDialog : public Kexi
 
         private:
-                KexiTableView *m_view;
+//              KexiTableView *m_view;
                 const KexiDB::TableSchema *m_table; //!< original table schema
                 KexiDB::TableSchema *m_newTable; //!< new table schema


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