Added upstream ui fix for languages with accented characters. Fixes bug 344195

(Portage version: 2.1.9.24/cvs/Linux x86_64)

3 files changed, 218 insertions, 1 deletions

diff --git a/app-office/kmymoney/ChangeLog b/app-office/kmymoney/ChangeLog
index 89e69afe4ae1..0be5d88d7564 100644
--- a/app-office/kmymoney/ChangeLog
+++ b/app-office/kmymoney/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/kmymoney
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney/ChangeLog,v 1.13 2010/11/04 11:52:53 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney/ChangeLog,v 1.14 2010/11/11 23:54:50 dilfridge Exp $
+
+*kmymoney-4.5-r2 (11 Nov 2010)
+
+  11 Nov 2010; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kmymoney-4.5-r2.ebuild, +files/kmymoney-4.5-accentfix.patch:
+  Added upstream ui fix for languages with accented characters. Fixes bug
+  344195
 
 *kmymoney-4.5-r1 (04 Nov 2010)
 
diff --git a/app-office/kmymoney/files/kmymoney-4.5-accentfix.patch b/app-office/kmymoney/files/kmymoney-4.5-accentfix.patch
new file mode 100644
index 000000000000..643addcd9f38
--- /dev/null
+++ b/app-office/kmymoney/files/kmymoney-4.5-accentfix.patch
@@ -0,0 +1,133 @@
+Index: kmymoney/widgets/kmymoneycompletion.cpp
+===================================================================
+--- kmymoney/widgets/kmymoneycompletion.cpp	(Revision 1193385)
++++ kmymoney/widgets/kmymoneycompletion.cpp	(Revision 1193386)
+@@ -31,6 +31,8 @@
+ #include <QEvent>
+ #include <QDesktopWidget>
+ #include <QLineEdit>
++#include <QInputContext>
++#include <QInputContextFactory>
+ 
+ // ----------------------------------------------------------------------------
+ // KDE Includes
+@@ -47,13 +49,14 @@
+ kMyMoneyCompletion::kMyMoneyCompletion(QWidget *parent) :
+     KVBox(parent)
+ {
+-  setWindowFlags(Qt::Popup);
+-  setFrameStyle(QFrame::StyledPanel | QFrame::Raised);
++  setWindowFlags(Qt::ToolTip);
++  // make it look like the Qt completer
++  setMargin(0);
++  setLineWidth(0);
+ 
+   m_parent = parent;
+-  setFocusProxy(parent);
+-
+   m_selector = new KMyMoneySelector(this);
++  m_selector->listView()->setFocusProxy(parent);
+ 
+   // to handle the keyboard events received by this widget in the same way as
+   // the keyboard events received by the other widgets
+@@ -130,9 +133,10 @@
+   }
+ }
+ 
+-void kMyMoneyCompletion::showEvent(QShowEvent*)
++void kMyMoneyCompletion::showEvent(QShowEvent* e)
+ {
+   show(true);
++  KVBox::showEvent(e);
+ }
+ 
+ void kMyMoneyCompletion::show(bool presetSelected)
+@@ -152,8 +156,12 @@
+       c->lineEdit()->installEventFilter(this);
+     }
+   }
+-
+   KVBox::show();
++  // after the popup is shown for the first time the input context of the combobox gets messed up
++  // so replace it whit a new input context of the same type to handle input methods correctly
++  if (m_parent) {
++    m_parent->setInputContext(QInputContextFactory::create(m_parent->inputContext()->identifierName(), m_parent));
++  }
+ }
+ 
+ void kMyMoneyCompletion::hide(void)
+@@ -176,6 +184,9 @@
+   KMyMoneyCombo *c = dynamic_cast<KMyMoneyCombo*>(m_parent);
+   if (o == m_parent || (c && o == c->lineEdit()) || o == this) {
+     if (isVisible()) {
++      if (e->type() == QEvent::FocusOut) {
++        hide();
++      }
+       if (e->type() == QEvent::KeyPress) {
+         QTreeWidgetItem* item = 0;
+         QKeyEvent* ev = static_cast<QKeyEvent*>(e);
+@@ -266,9 +277,6 @@
+       }
+     }
+   }
+-  // forward any keyboard event that was received by this widget and was not handled to the parent widget
+-  if (o == this && c && (e->type() == QEvent::KeyPress || e->type() == QEvent::KeyRelease))
+-    c->event(e);
+   return KVBox::eventFilter(o, e);
+ }
+ 
+Index: kmymoney/widgets/kmymoneyaccountcompletion.cpp
+===================================================================
+--- kmymoney/widgets/kmymoneyaccountcompletion.cpp	(Revision 1193385)
++++ kmymoney/widgets/kmymoneyaccountcompletion.cpp	(Revision 1193386)
+@@ -43,7 +43,7 @@
+ {
+   delete m_selector;
+   m_selector = new kMyMoneyAccountSelector(this, 0, false);
+-  m_selector->listView()->setFocusProxy(this);
++  m_selector->listView()->setFocusProxy(parent);
+ 
+ #ifndef KMM_DESIGNER
+   // Default is to show all accounts
+Index: kmymoney/widgets/kmymoneyselector.cpp
+===================================================================
+--- kmymoney/widgets/kmymoneyselector.cpp	(Revision 1193385)
++++ kmymoney/widgets/kmymoneyselector.cpp	(Revision 1193386)
+@@ -43,6 +43,8 @@
+ KMyMoneySelector::KMyMoneySelector(QWidget *parent, Qt::WFlags flags) :
+     QWidget(parent, flags)
+ {
++  setAutoFillBackground(true);
++
+   m_selMode = QTreeWidget::SingleSelection;
+ 
+   m_treeWidget = new QTreeWidget(this);
+@@ -52,11 +54,6 @@
+   m_treeWidget->setSortingEnabled(false);
+   m_treeWidget->setAlternatingRowColors(true);
+ 
+-  if (parent) {
+-    setFocusProxy(parent->focusProxy());
+-    m_treeWidget->setFocusProxy(parent->focusProxy());
+-  }
+-
+   m_treeWidget->setAllColumnsShowFocus(true);
+ 
+   m_layout = new QHBoxLayout(this);
+Index: kmymoney/widgets/kmymoneycombo.cpp
+===================================================================
+--- kmymoney/widgets/kmymoneycombo.cpp	(Revision 1193385)
++++ kmymoney/widgets/kmymoneycombo.cpp	(Revision 1193386)
+@@ -224,12 +224,6 @@
+ 
+ void KMyMoneyCombo::focusOutEvent(QFocusEvent* e)
+ {
+-  // when showing m_completion we'll receive a focus out event even if the focus
+-  // will still remain at this widget since this widget is the completion's focus proxy
+-  // so ignore the focus out event caused by showin a widget of type Qt::Popup
+-  if (e->reason() == Qt::PopupFocusReason)
+-    return;
+-
+   if (m_inFocusOutEvent) {
+     KComboBox::focusOutEvent(e);
+     return;
diff --git a/app-office/kmymoney/kmymoney-4.5-r2.ebuild b/app-office/kmymoney/kmymoney-4.5-r2.ebuild
new file mode 100644
index 000000000000..b0a28d3eecb5
--- /dev/null
+++ b/app-office/kmymoney/kmymoney-4.5-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney/kmymoney-4.5-r2.ebuild,v 1.1 2010/11/11 23:54:50 dilfridge Exp $
+
+EAPI=3
+
+KMNAME="extragear/office"
+
+if [[ ${PV} != *9999* ]]; then
+	KDE_LINGUAS="bg ca ca@valencia cs da de el en_GB eo es et fi fr ga gl hu it lt
+	ms nds nl pl pt pt_BR ro ru sk sv tr uk zh_CN zh_TW"
+	KDE_DOC_DIRS="doc doc-translations/%lingua_${PN}"
+	KDE_HANDBOOK="optional"
+	SRC_URI="mirror://sourceforge/kmymoney2/${P}.tar.bz2
+		mirror://gentoo/${P}-aqbanking-5_x.patch.bz2"
+fi
+
+inherit virtualx kde4-base
+
+DESCRIPTION="A personal finance manager for KDE"
+HOMEPAGE="http://kmymoney2.sourceforge.net/"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="4"
+IUSE="debug calendar doc hbci ofx quotes test"
+
+COMMON_DEPEND="
+	app-crypt/gpgme
+	>=dev-libs/boost-1.33.1
+	dev-libs/libgpg-error
+	dev-libs/libxml2
+	$(add_kdebase_dep kdepimlibs)
+	calendar? ( dev-libs/libical )
+	hbci? (
+		>=net-libs/aqbanking-5.0.1
+		>=sys-libs/gwenhywfar-4.0.1[qt4]
+	)
+	ofx? ( >=dev-libs/libofx-0.9.1 )
+"
+RDEPEND="${COMMON_DEPEND}
+	quotes? ( >=dev-perl/Finance-Quote-1.17 )
+"
+DEPEND="${COMMON_DEPEND}
+	doc? ( app-doc/doxygen )
+	test? ( >=dev-util/cppunit-1.12.1 )
+"
+
+PATCHES=(	"${WORKDIR}"/${P}-aqbanking-5_x.patch
+		"${FILESDIR}"/${P}-accentfix.patch 	)
+
+src_configure() {
+	mycmakeargs=(
+		-DUSE_QT_DESIGNER=OFF
+		$(cmake-utils_use_enable calendar LIBICAL)
+		$(cmake-utils_use_use doc DEVELOPER_DOC)
+		$(cmake-utils_use_enable hbci KBANKING)
+		$(cmake-utils_use_enable ofx LIBOFX)
+		$(cmake-utils_use test KDE4_BUILD_TESTS)
+	)
+	kde4-base_src_configure
+}
+
+src_compile() {
+	kde4-base_src_compile
+	use doc && kde4-base_src_compile apidoc
+}
+
+src_install() {
+	use doc && HTML_DOCS=("${CMAKE_BUILD_DIR}/apidocs/html/")
+	kde4-base_src_install
+}
+
+src_test() {
+	export maketype="kde4-base_src_test"
+	virtualmake
+}