summaryrefslogtreecommitdiffstats
path: root/kde/patch/kde-baseapps
diff options
context:
space:
mode:
Diffstat (limited to 'kde/patch/kde-baseapps')
-rw-r--r--kde/patch/kde-baseapps/dolphin-4.8.0_ctrlclick.patch25
-rw-r--r--kde/patch/kde-baseapps/dolphin.kitemlistkeyboardsearchmanager.cpp.diff31
-rw-r--r--kde/patch/kde-baseapps/konsole-4.8.2_kdebug280896.patch62
3 files changed, 118 insertions, 0 deletions
diff --git a/kde/patch/kde-baseapps/dolphin-4.8.0_ctrlclick.patch b/kde/patch/kde-baseapps/dolphin-4.8.0_ctrlclick.patch
new file mode 100644
index 0000000..fa928c9
--- /dev/null
+++ b/kde/patch/kde-baseapps/dolphin-4.8.0_ctrlclick.patch
@@ -0,0 +1,25 @@
+From: Frank Reininghaus <frank78ac@googlemail.com>
+Date: Mon, 23 Jan 2012 18:28:21 +0000
+Subject: Make sure that Control+click toggles the selection state
+X-Git-Url: http://quickgit.kde.org/?p=kde-baseapps.git&amp;a=commitdiff&amp;h=e8bfc8724b441b70e440cad05983134975facc8b
+---
+Make sure that Control+click toggles the selection state
+
+This commit fixes a regression caused by the recent commit
+9f711b5f2e1d1fd856cd6b033e6adb96f9b46d8a.
+CCBUG: 292250
+(cherry picked from commit 84a9cc4bf6e9decc4c102102c4b04162369eb0fe)
+---
+
+
+--- a/dolphin/src/kitemviews/kitemlistcontroller.cpp
++++ b/dolphin/src/kitemviews/kitemlistcontroller.cpp
+@@ -471,7 +471,7 @@ bool KItemListController::mousePressEven
+ (!shiftOrControlPressed && !pressedItemAlreadySelected);
+ if (clearSelection) {
+ m_selectionManager->clearSelection();
+- } else if (pressedItemAlreadySelected && (event->buttons() & Qt::LeftButton)) {
++ } else if (pressedItemAlreadySelected && !shiftOrControlPressed && (event->buttons() & Qt::LeftButton)) {
+ // The user might want to start dragging multiple items, but if he clicks the item
+ // in order to trigger it instead, the other selected items must be deselected.
+ // However, we do not know yet what the user is going to do.
diff --git a/kde/patch/kde-baseapps/dolphin.kitemlistkeyboardsearchmanager.cpp.diff b/kde/patch/kde-baseapps/dolphin.kitemlistkeyboardsearchmanager.cpp.diff
new file mode 100644
index 0000000..45c830a
--- /dev/null
+++ b/kde/patch/kde-baseapps/dolphin.kitemlistkeyboardsearchmanager.cpp.diff
@@ -0,0 +1,31 @@
+commit d8732a59d3b1f2d0bebf43f294df7e9f333abde4
+Author: Frank Reininghaus <frank78ac@googlemail.com>
+Date: Thu Apr 5 18:59:58 2012 +0200
+
+ Reduce the timeout in KItemListKeyboardSearchManager to 1 second
+
+ It turned out that the longer timeout, introduced recently in
+ 02eab49b2de51c31fe46a0d9501327b579b3648e, not only made multi-letter
+ keyboard searches easier, but also had some unwanted side effects. I
+ hope that 1 second, which is between the previous value of 5 seconds and
+ the pre-KDE 4.8.2 value of 0.4 seconds, is a compromise which will fit
+ most users' needs.
+ We will try to improve the situation further in future releases by
+ providing visual feedback about the keyboard search, but such a change
+ would not be suitable for a bug-fix release.
+ CCBUG:297458
+ CCBUG:297488
+
+diff --git a/dolphin/src/kitemviews/kitemlistkeyboardsearchmanager.cpp b/dolphin/src/kitemviews/kitemlistkeyboardsearchmanager.cpp
+index f4dc1a5..592605a 100644
+--- a/dolphin/src/kitemviews/kitemlistkeyboardsearchmanager.cpp
++++ b/dolphin/src/kitemviews/kitemlistkeyboardsearchmanager.cpp
+@@ -29,7 +29,7 @@
+
+ KItemListKeyboardSearchManager::KItemListKeyboardSearchManager(QObject* parent) :
+ QObject(parent),
+- m_timeout(5000)
++ m_timeout(1000)
+ {
+ m_keyboardInputTime.invalidate();
+ }
diff --git a/kde/patch/kde-baseapps/konsole-4.8.2_kdebug280896.patch b/kde/patch/kde-baseapps/konsole-4.8.2_kdebug280896.patch
new file mode 100644
index 0000000..352adb2
--- /dev/null
+++ b/kde/patch/kde-baseapps/konsole-4.8.2_kdebug280896.patch
@@ -0,0 +1,62 @@
+commit bf3e57e94b54c1c4337d7960e0fda0ef98156451
+Author: Kurt Hindenburg <kurt.hindenburg@gmail.com>
+Date: Fri Mar 30 20:55:46 2012 -0400
+
+ A quick fix to get fonts to look OK w/ Qt4.8 and bidi off
+
+ Hopefully a temp fix for this issue. It would be better to find out
+ what happened with Qt4.8 font rendering.
+
+ Thanks to people on bug report for research and info.
+
+ CCBUG: 280896
+
+diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp
+index 1076131..ac44da9 100644
+--- a/src/TerminalDisplay.cpp
++++ b/src/TerminalDisplay.cpp
+@@ -720,10 +720,18 @@ void TerminalDisplay::drawCharacters(QPainter& painter,
+ // Qt::LeftToRight for this widget
+ //
+ // This was discussed in: http://lists.kde.org/?t=120552223600002&r=1&w=2
+- if (_bidiEnabled)
+- painter.drawText(rect,0,text);
++ if (_bidiEnabled) {
++ painter.drawText(rect, 0, text);
++ }
+ else
+- painter.drawText(rect,0,LTR_OVERRIDE_CHAR+text);
++ {
++ // See bug 280896 for more info
++#if QT_VERSION >= 0x040800
++ painter.drawText(rect, Qt::AlignBottom, LTR_OVERRIDE_CHAR + text);
++#else
++ painter.drawText(rect, 0, LTR_OVERRIDE_CHAR + text);
++#endif
++ }
+ }
+ }
+
+diff --git a/src/TerminalDisplay.h b/src/TerminalDisplay.h
+index 97b517e..c6f993e 100644
+--- a/src/TerminalDisplay.h
++++ b/src/TerminalDisplay.h
+@@ -398,7 +398,17 @@ public:
+ * Sets the status of the BiDi rendering inside the terminal display.
+ * Defaults to disabled.
+ */
+- void setBidiEnabled(bool set) { _bidiEnabled=set; }
++ void setBidiEnabled(bool set) {
++ _bidiEnabled=set;
++ // See bug 280896 for more info
++#if QT_VERSION >= 0x040800
++ if (_bidiEnabled) {
++ setLineSpacing(0);
++ } else {
++ setLineSpacing(2);
++ }
++#endif
++ }
+ /**
+ * Returns the status of the BiDi rendering in this widget.
+ */