[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [calligra] kexi: Merge branch 'kexi-mobile-adam_pigg'
From: Jaroslaw Staniek <staniek () kde ! org>
Date: 2011-08-31 23:06:35
Message-ID: 20110831230635.20329A6078 () git ! kde ! org
[Download RAW message or body]
Git commit 33d53c29657a7125d78af01da5fbd37db4e1988f by Jaroslaw Staniek.
Committed on 31/08/2011 at 21:54.
Pushed by staniek into branch 'master'.
Merge branch 'kexi-mobile-adam_pigg'
Conflicts:
kexi/widget/tableview/kexidataawareobjectiface.h
kexi/widget/tableview/kexitableview.cpp
kexi/widget/tableview/kexitableview.h
kexi/widget/utils/kexirecordnavigator.h
M +1 -1 kexi/widget/dataviewcommon/kexitableviewdata.h
M +0 -0 kexi/widget/dataviewcommon/kexitableviewdata.cpp
M +1 -1 kexi/plugins/tables/kexitablepart.cpp
M +1 -1 kexi/widget/dataviewcommon/kexidataawarepropertyset.h
M +19 -3 kexi/widget/tableview/kexitableedit.cpp
M +0 -0 kexi/widget/dataviewcommon/kexidataawareview.cpp
M +2 -2 kexi/widget/tableview/kexidatatable.h
M +19 -4 kexi/plugins/reports/CMakeLists.txt
M +1 -0 kexi/core/KexiView.h
M +1 -1 kexi/plugins/tables/kexitabledesignerview_p.cpp
M +1 -1 kexi/widget/dataviewcommon/kexidataprovider.h
M +1 -0 kexi/main/KexiMainWindow.cpp
M +3 -0 kexi/plugins/reports/kexisourceselector.h
M +10 -23 kexi/widget/utils/kexirecordnavigator.h
M +5 -2 kexi/widget/tableview/kexitableview.h
M +5 -1 kexi/plugins/forms/kexiformscrollview.h
M +3 -10 kexi/widget/utils/kexirecordnavigator.cpp
M +5 -1 kexi/widget/tableview/kexitableedit.h
M +32 -19 kexi/widget/dataviewcommon/kexidataawareobjectiface.cpp
M +2 -2 kexi/plugins/queries/kexiquerydesignerguieditor.cpp
M +14 -9 kexi/widget/tableview/kexitableview.cpp
M +0 -0 kexi/widget/dataviewcommon/kexidataawarepropertyset.cpp
M +11 -0 kexi/plugins/reports/kexisourceselector.cpp
M +1 -1 kexi/widget/dataviewcommon/kexidataawareview.h
M +1 -1 kexi/plugins/forms/kexiformview.cpp
M +1 -1 kexi/plugins/tables/kexitabledesignerview.cpp
M +4 -4 kexi/widget/dataviewcommon/kexidataawareobjectiface.h
http://commits.kde.org/calligra/33d53c29657a7125d78af01da5fbd37db4e1988f
diff --cc kexi/plugins/reports/CMakeLists.txt
index be85541,90fc4c9..b89fd85
--- a/kexi/plugins/reports/CMakeLists.txt
+++ b/kexi/plugins/reports/CMakeLists.txt
@@@ -22,12 -22,19 +22,20 @@@ set(kexihandler_report_SRC
kexireportview.cpp
kexireportdesignview.cpp
kexidbreportdata.cpp
- keximigratereportdata.cpp
kexisourceselector.cpp
krscriptfunctions.cpp
+ InternalSourceSelector.cpp
)
+ if (KEXI_MOBILE)
+
+ else (KEXI_MOBILE)
+ LIST(APPEND kexihandler_report_SRCS
+ keximigratereportdata.cpp
+ )
+ endif (KEXI_MOBILE)
+
+
qt4_wrap_cpp(kexihandler_report_SRCS \
../scripting/kexiscripting/kexiscriptadaptor.h)
kde4_add_plugin(kexihandler_report ${kexihandler_report_SRCS})
diff --cc kexi/plugins/reports/kexisourceselector.cpp
index 2b1dbaf,ee8768e..808ae5b
--- a/kexi/plugins/reports/kexisourceselector.cpp
+++ b/kexi/plugins/reports/kexisourceselector.cpp
@@@ -82,9 -85,36 +85,11 @@@ KexiSourceSelector::KexiSourceSelector(
KexiSourceSelector::~KexiSourceSelector()
{
delete m_kexiDBData;
+ #ifndef KEXI_MOBILE
delete m_kexiMigrateData;
+ #endif
}
-QStringList KexiSourceSelector::queryList()
-{
- //Get the list of queries in the database
- QStringList qs;
- if (m_conn && m_conn->isConnected()) {
- QList<int> tids = m_conn->tableIds();
- qs << "";
- for (int i = 0; i < tids.size(); ++i) {
- KexiDB::TableSchema* tsc = m_conn->tableSchema(tids[i]);
- if (tsc)
- qs << tsc->name();
- }
-
- QList<int> qids = m_conn->queryIds();
- qs << "";
- for (int i = 0; i < qids.size(); ++i) {
- KexiDB::QuerySchema* qsc = m_conn->querySchema(qids[i]);
- if (qsc)
- qs << qsc->name();
- }
- }
-
- return qs;
-}
-
void KexiSourceSelector::setConnectionData(QDomElement c)
{
if (c.attribute("type") == "internal") {
diff --cc kexi/widget/tableview/kexitableview.cpp
index 4a06903,5592cb0..6d2569f
--- a/kexi/widget/tableview/kexitableview.cpp
+++ b/kexi/widget/tableview/kexitableview.cpp
@@@ -117,9 -117,9 +117,9 @@@ public
//const int topMargin = m_tv->horizontalHeaderVisible() ? \
m_tv->d->pTopHeader->height() : 0;
//const int bottomMargin = m_tv->d->appearance.navigatorEnabled ? \
m_tv->m_navPanel->height() : 0;
if (KexiUtils::hasParent(m_tv->verticalHeader(), m_tv->childAt(pos))) {
- return i18n("Contains a pointer to the currently selected row");
+ return i18n("Contains a pointer to the currently selected record");
- } else if (KexiUtils::hasParent(m_tv->m_navPanel, m_tv->childAt(pos))) {
+ } else if (KexiUtils::hasParent(dynamic_cast<QObject*>(m_tv->m_navPanel), \
m_tv->childAt(pos))) {
- return i18n("Row navigator");
+ return i18n("Record navigator");
// return QWhatsThis::textFor(m_tv->m_navPanel, QPoint( pos.x(), pos.y() - \
m_tv->height() + bottomMargin )); }
const int col = m_tv->columnAt(pos.x() - leftMargin);
@@@ -2603,13 -2603,13 +2603,13 @@@ void KexiTableView::setAppearance(cons
m_horizontalHeader->sizeHint().height(), 0, 0);
}
// }
- if (a.rowHighlightingEnabled)
+ if (a.recordHighlightingEnabled)
m_updateEntireRowWhenMovingToOtherRow = true;
- m_navPanel->setVisible(a.navigatorEnabled);
+ navPanelWidget()->setVisible(a.navigatorEnabled);
- d->highlightedRow = -1;
+ d->highlightedRecord = -1;
//! @todo is setMouseTracking useful for other purposes?
- viewport()->setMouseTracking(a.rowMouseOverHighlightingEnabled);
+ viewport()->setMouseTracking(a.recordMouseOverHighlightingEnabled);
d->appearance = a;
diff --cc kexi/widget/tableview/kexitableview.h
index bc5f5b9,86a6f54..f1fc2ae
--- a/kexi/widget/tableview/kexitableview.h
+++ b/kexi/widget/tableview/kexitableview.h
@@@ -681,13 -678,8 +682,15 @@@ protected
// //! Called to repaint contents after a row is deleted.
// void repaintAfterDelete();
+ /*! Implementation for KexiDataItemChangesListener.
+ Reaction for change of \a item. */
+ virtual void valueChanged(KexiDataItemInterface* item);
+
+ /*! Implementation for KexiDataItemChangesListener. */
+ virtual bool cursorAtNewRow() const;
+
+ QWidget* navPanelWidget() const;
+
KexiTableViewPrivate * const d;
class WhatsThis;
diff --cc kexi/widget/utils/kexirecordnavigator.h
index 60e2e4a,e5ab7c8..b73fe4f
--- a/kexi/widget/utils/kexirecordnavigator.h
+++ b/kexi/widget/utils/kexirecordnavigator.h
@@@ -155,13 -142,13 +142,13 @@@ public slots
/*! Sets record count for this navigator.
This can also affect button's enabling and disabling.
By default count is 0. */
- void setRecordCount(uint count);
+ virtual void setRecordCount(uint count);
- void updateGeometry(int leftMargin);
+ virtual void updateGeometry(int leftMargin);
/*! Sets label text at the left of the for record navigator's button.
- By default this label contains translated "Row:" text. */
+ By default this label contains translated "Record:" text. */
- void setLabelText(const QString& text);
+ virtual void setLabelText(const QString& text);
void setButtonToolTipText(KexiRecordNavigator::Button, const QString&);
signals:
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic