rev 3802 - trunk/packages/koffice/debian/patches

[Isaac Clerencia]

Author: isaac
Date: 2006-05-22 06:46:23 +0000 (Mon, 22 May 2006)
New Revision: 3802

Added:
   trunk/packages/koffice/debian/patches/30_kexi_checkbox_data_saving.diff
   trunk/packages/koffice/debian/patches/31_kexi_form_plugins.diff
Log:
Add two upstream kexi patches


Added: trunk/packages/koffice/debian/patches/30_kexi_checkbox_data_saving.diff
===================================================================
--- trunk/packages/koffice/debian/patches/30_kexi_checkbox_data_saving.diff	2006-05-22 06:31:38 UTC (rev 3801)
+++ trunk/packages/koffice/debian/patches/30_kexi_checkbox_data_saving.diff	2006-05-22 06:46:23 UTC (rev 3802)
@@ -0,0 +1,65 @@
+Index: kexi/plugins/forms/kexidataprovider.cpp
+===================================================================
+--- kexi/plugins/forms/kexidataprovider.cpp	(revision 542130)
++++ kexi/plugins/forms/kexidataprovider.cpp	(revision 542131)
+@@ -92,7 +92,8 @@
+  	for (KexiFormDataItemInterfaceToIntMap::ConstIterator it = m_fieldNumbersForDataItems.constBegin(); 
+ 		it!=m_fieldNumbersForDataItems.constEnd(); ++it)
+ 	{
+-		kexipluginsdbg << "fill data of '" << it.key()->dataSource() <<  "' at idx=" << it.data() << endl;
++		kexipluginsdbg << "fill data of '" << it.key()->dataSource() <<  "' at idx=" << it.data() 
++			<< " data=" << row.at(it.data()) << endl;
+ 		it.key()->setValue( row.at(it.data()) );
+ 	}
+ }
+Index: kexi/plugins/forms/widgets/kexidbautofield.cpp
+===================================================================
+--- kexi/plugins/forms/widgets/kexidbautofield.cpp	(revision 542130)
++++ kexi/plugins/forms/widgets/kexidbautofield.cpp	(revision 542131)
+@@ -446,8 +446,11 @@
+ 		@todo look at makeFirstCharacterUpperCaseInAutoLabels setting [bool]
+ 		(see doc/dev/settings.txt) */
+ 			if (!text.isEmpty()) {
+-				realText = text[0].upper();
+-				realText += (text.mid(1) + ": ");
++				realText = text[0].upper() + text.mid(1);
++				if (m_widgetType!=Boolean) {
++//! @todo ":" suffix looks weird for checkbox; remove this condition when [x] is displayed _after_ label
++					realText += ": ";
++				}
+ 			}
+ 		}
+ 		else
+Index: kexi/plugins/forms/widgets/kexidbcheckbox.cpp
+===================================================================
+--- kexi/plugins/forms/widgets/kexidbcheckbox.cpp	(revision 542130)
++++ kexi/plugins/forms/widgets/kexidbcheckbox.cpp	(revision 542131)
+@@ -27,7 +27,9 @@
+  : QCheckBox(text, parent, name), KexiFormDataItemInterface()
+ {
+ 	m_invalidState = false;
++//! todo: tristate 
+ 	setTristate(true);
++	setFocusPolicy(QWidget::StrongFocus);
+ 	connect(this, SIGNAL(stateChanged(int)), this, SLOT(slotStateChanged(int)));
+ }
+ 
+@@ -56,13 +58,16 @@
+ 
+ void KexiDBCheckBox::setValueInternal(const QVariant &add, bool )
+ {
+-	setState( add.isNull() ? NoChange : (add.toBool() ? On : Off) );
++//	setState( add.isNull() ? NoChange : (add.toBool() ? On : Off) );
++	setState( m_origValue.isNull() ? NoChange : (m_origValue.toBool() ? On : Off) );
+ }
+ 
+ QVariant
+ KexiDBCheckBox::value()
+ {
+-	return QVariant( isChecked(), 3 );
++	if (state()==NoChange)
++		return QVariant();
++	return QVariant(state()==On, 1);
+ }
+ 
+ void KexiDBCheckBox::slotStateChanged(int )

Added: trunk/packages/koffice/debian/patches/31_kexi_form_plugins.diff
===================================================================
--- trunk/packages/koffice/debian/patches/31_kexi_form_plugins.diff	2006-05-22 06:31:38 UTC (rev 3801)
+++ trunk/packages/koffice/debian/patches/31_kexi_form_plugins.diff	2006-05-22 06:46:23 UTC (rev 3802)
@@ -0,0 +1,56 @@
+Index: plugins/forms/Makefile.am
+===================================================================
+--- plugins/forms/Makefile.am	(wersja 541836)
++++ plugins/forms/Makefile.am	(kopia robocza)
+@@ -23,9 +23,10 @@
+ 	kexidataprovider.cpp kexiformscrollview.cpp kexiformeventhandler.cpp \
+ 	kexidbtextwidgetinterface.cpp kexiactionselectiondialog.cpp kexiformmanager.cpp \
+ 	kexidatasourcepage.cpp kexiformpart.cpp kexiformview.cpp
+-libkexiformutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -Wnounresolved
++libkexiformutils_la_LDFLAGS = $(all_libraries) $(VER_INFO)
+ libkexiformutils_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \
+ 	$(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
++	$(top_builddir)/kexi/formeditor/libkformdesigner.la \
+ 	$(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la
+ 
+ kformdesignerservicesdir=$(kde_servicesdir)/kformdesigner
+Index: plugins/reports/Makefile.am
+===================================================================
+--- plugins/reports/Makefile.am	(wersja 541836)
++++ plugins/reports/Makefile.am	(kopia robocza)
+@@ -5,24 +5,29 @@
+ kexihandler_report_la_SOURCES = kexireports.cpp
+ kexihandler_report_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined
+ kexihandler_report_la_LIBADD = ../../core/libkexicore.la \
+-  ../../widget/utils/libkexiguiutils.la \
+-  ../../widget/libkexiextendedwidgets.la \
+-  ../../formeditor/libkformdesigner.la \
+-  ../forms/libkexiformutils.la \
++  $(top_builddir)/kexi/widget/utils/libkexiguiutils.la \
++  $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
++	$(top_builddir)/kexi/formeditor/libkformdesigner.la \
++  $(top_builddir)/kexi/plugins/forms/libkexiformutils.la \
+   ./libkexireportutils.la
+ 
+ kexireportwidgets_la_LDFLAGS =  $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module
+ kexireportwidgets_la_SOURCES =   reportwidgets.cpp kexireportfactory.cpp
+ kexireportwidgets_la_LIBADD = $(top_builddir)/kexi/formeditor/libkformdesigner.la \
++	$(top_builddir)/kexi/plugins/forms/libkexiformutils.la \
++	$(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la \
++	$(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
+ 	./libkexireportutils.la
+ 
+ lib_LTLIBRARIES = libkexireportutils.la
+ libkexireportutils_la_SOURCES = \
+ 	kexireportpart.cpp kexireportview.cpp kexireportform.cpp
+-libkexireportutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -Wnounresolved
++libkexireportutils_la_LDFLAGS = $(all_libraries) $(VER_INFO)
+ libkexireportutils_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \
++	$(top_builddir)/kexi/formeditor/libkformdesigner.la \
++	$(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la \
+ 	$(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
+-	$(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la
++	$(top_builddir)/kexi/plugins/forms/libkexiformutils.la
+ 
+ kformdesignerservicesdir=$(kde_servicesdir)/kformdesigner
+ kformdesignerservices_DATA = kformdesigner_kexireportfactory.desktop