Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (10cd6606eb06377ff29b3b0ee9e19d5f4906e2e6)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (10cd6606eb06377ff29b3b0ee9e19d5f4906e2e6)
  • Date: Fri, 14 Jul 2006 12:02:27 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT scarlet.be>:

kde-apps/koffice/DETAILS | 4 -
kde-apps/koffice/HISTORY | 5 +
kde-apps/koffice/PRE_BUILD | 4 -
kde-apps/koffice/form_plugins.patch | 52 --------------------
kde-apps/koffice/kexi_checkbox_data_saving.patch | 59
-----------------------
5 files changed, 7 insertions(+), 117 deletions(-)

New commits:
commit 10cd6606eb06377ff29b3b0ee9e19d5f4906e2e6
Merge: df1408396550dcbd9ad9e1299b3815da5304ee22
e093cdaa2ca6dc9ac3c53672b09d29fd3d614d2a
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire

commit df1408396550dcbd9ad9e1299b3815da5304ee22
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

koffice-1.5.2

diff --git a/kde-apps/koffice/DETAILS b/kde-apps/koffice/DETAILS
index c6ab805..58815f0 100755
--- a/kde-apps/koffice/DETAILS
+++ b/kde-apps/koffice/DETAILS
@@ -1,7 +1,7 @@
source $SECTION_DIRECTORY/KDE_DETAILS
SPELL=koffice
- VERSION=1.5.1
-
SOURCE_HASH=sha512:99305f67d452062a5a8c35fb913bf28ec4cd78ac0aa4db9d4ee6249a1b79d80b032b96671d5812ea0a4288dfb737fb004980f2cc607c8f4cc51a3660c4479f8d
+ VERSION=1.5.2
+
SOURCE_HASH=sha512:b5696c75926ac75265e015cb29ac12734d943b6ce459e15a142775b27484139d03ae6bffba2cf451ad7aee69966bf2ca88e5e0670f9ceb2ae8bc9637f171991a
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$KDE_URL/stable/$SPELL-$VERSION/src/$SOURCE
diff --git a/kde-apps/koffice/HISTORY b/kde-apps/koffice/HISTORY
index 56526b3..903fbe1 100644
--- a/kde-apps/koffice/HISTORY
+++ b/kde-apps/koffice/HISTORY
@@ -1,3 +1,8 @@
+2006-07-14 Treeve Jelbert <treeve01 AT pi.be>
+ * DETAILS: version 1.5.2
+ * PRE_BUILD, *.patch: deleted
+ no longer needed
+
2006-06-29 Eric Sandall <eric AT sandall.us>
* DETAILS: Removed BUILD_API=2, set grimoire-wide

diff --git a/kde-apps/koffice/PRE_BUILD b/kde-apps/koffice/PRE_BUILD
deleted file mode 100755
index a53d93f..0000000
--- a/kde-apps/koffice/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p0 < $SPELL_DIRECTORY/form_plugins.patch &&
-patch -p0 < $SPELL_DIRECTORY/kexi_checkbox_data_saving.patch
diff --git a/kde-apps/koffice/form_plugins.patch
b/kde-apps/koffice/form_plugins.patch
deleted file mode 100644
index 3d7c7c4..0000000
--- a/kde-apps/koffice/form_plugins.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- kexi/plugins/forms/Makefile.am (wersja 541836)
-+++ kexi/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
---- kexi/plugins/reports/Makefile.am (wersja 541836)
-+++ kexi/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
diff --git a/kde-apps/koffice/kexi_checkbox_data_saving.patch
b/kde-apps/koffice/kexi_checkbox_data_saving.patch
deleted file mode 100644
index a9853f0..0000000
--- a/kde-apps/koffice/kexi_checkbox_data_saving.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- 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()) );
- }
- }
---- 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
---- 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 )



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (10cd6606eb06377ff29b3b0ee9e19d5f4906e2e6), Treeve Jelbert, 07/14/2006

Archive powered by MHonArc 2.6.24.

Top of Page