Hello community, here is the log from the commit of package kdelibs4 checked in at Thu Nov 20 15:36:23 CET 2008. -------- --- KDE/kdelibs4/kdelibs4.changes 2008-11-11 11:51:06.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdelibs4/kdelibs4.changes 2008-11-18 18:32:24.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Nov 18 18:25:31 CET 2008 - stbinner@suse.de + +- make single click in file dialog only select file (bnc#427318) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- kfile-select.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs4.spec ++++++ --- /var/tmp/diff_new_pack.kl9471/_old 2008-11-20 15:34:27.000000000 +0100 +++ /var/tmp/diff_new_pack.kl9471/_new 2008-11-20 15:34:27.000000000 +0100 @@ -33,7 +33,7 @@ Summary: KDE Base Libraries Url: http://www.kde.org Version: 4.1.3 -Release: 2 +Release: 3 %if %suse_version > 1010 Requires: libqt4-x11 >= %( echo `rpm -q --queryformat '%{VERSION}' libqt4-x11`) %else @@ -64,6 +64,7 @@ Patch12: desktop-translations.diff Patch13: kjs-mark-register-stack.diff Patch14: solid-interfaces.diff +Patch15: kfile-select.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?opensuse_bs} %define debug_package_requires %name = %version-%release libqt4-debuginfo @@ -98,6 +99,7 @@ %patch12 %patch13 %patch14 +%patch15 # # define KDE version exactly # @@ -380,6 +382,8 @@ /usr/share/mime/packages/kde.xml %changelog +* Tue Nov 18 2008 stbinner@suse.de +- make single click in file dialog only select file (bnc#427318) * Tue Nov 11 2008 stbinner@suse.de - install Solid powermanagement interfaces for Powerdevil * Fri Nov 07 2008 llunak@suse.cz ++++++ kfile-select.diff ++++++ Index: kfile/kdiroperator.cpp =================================================================== --- kfile/kdiroperator.cpp (revision 886149) +++ kfile/kdiroperator.cpp (working copy) @@ -272,7 +272,7 @@ previewWidth(0), leftButtonPressed(false), dirHighlighting(false), - onlyDoubleClickSelectsFiles(false), + onlyDoubleClickSelectsFiles(true), progressDelayTimer(0), dropOptions(0), actionMenu(0), @@ -2007,31 +2007,19 @@ if (!parent->onlyDoubleClickSelectsFiles()) _k_slotDoubleClicked(index); - else - _k_slotActivated(index); } void KDirOperator::Private::_k_slotActivated(const QModelIndex& index) { const QModelIndex dirIndex = proxyModel->mapToSource(index); KFileItem item = dirModel->itemForIndex(dirIndex); - bool selectDir = false; const Qt::KeyboardModifiers modifiers = QApplication::keyboardModifiers(); if (item.isNull() || (modifiers & Qt::ShiftModifier) || (modifiers & Qt::ControlModifier)) return; if (item.isDir()) { - const Qt::KeyboardModifiers modifiers = QApplication::keyboardModifiers(); - selectDir = KGlobalSettings::singleClick() && - !(modifiers & Qt::ShiftModifier) && - !(modifiers & Qt::ControlModifier); - } - - if (selectDir) { parent->selectDir(item); - } else { - parent->selectFile(item); } } Index: kfile/kdiroperator.h =================================================================== --- kfile/kdiroperator.h (revision 886149) +++ kfile/kdiroperator.h (working copy) @@ -420,14 +420,11 @@ virtual void writeConfig(KConfigGroup& configGroup); /** - * This is a KFileDialog specific hack: we want to select directories with - * single click, but not files. But as a generic class, we have to be able - * to select files on single click as well. + * This toggles between double/single click file and directory selection mode. + * When argument is true, files and directories are highlighted with single click and + * selected (executed) with double click. * - * This gives us the opportunity to do both. - * - * The default is false, set it to true if you don't want files selected - * with single click. + * The default follows the signle/double click system setting. */ void setOnlyDoubleClickSelectsFiles(bool enable); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org