Hello community, here is the log from the commit of package kmix.1678 for openSUSE:12.3:Update checked in at 2013-06-05 11:44:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3:Update/kmix.1678 (Old) and /work/SRC/openSUSE:12.3:Update/.kmix.1678.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kmix.1678" Changes: -------- New Changes file: --- /dev/null 2013-05-23 01:40:31.032032505 +0200 +++ /work/SRC/openSUSE:12.3:Update/.kmix.1678.new/kmix.changes 2013-06-05 11:44:21.000000000 +0200 @@ -0,0 +1,1969 @@ +------------------------------------------------------------------- +Sat May 4 17:02:47 UTC 2013 - [email protected] + +- Update to 4.10.3 + * Bugfix release + * See http://www.kde.org/announcements/announce-4.10.3.php + * resolves bnc#818500 + +------------------------------------------------------------------- +Fri Apr 5 14:47:37 UTC 2013 - [email protected] + +- Update to 4.10.2 + * Bugfixes + +------------------------------------------------------------------- +Sat Mar 2 15:43:27 UTC 2013 - [email protected] + +- Update to 4.10.1 + * Contains bug fixes. See http://www.kde.org/announcements/ + for more information + +------------------------------------------------------------------- +Mon Feb 25 22:24:50 UTC 2013 - [email protected] + +- Added patch correct_volume_change_with_mousewheel.diff to + correct the volume change step when used with mousewheel + (bko#313579) + +------------------------------------------------------------------- +Thu Jan 31 17:55:09 UTC 2013 - [email protected] + +- Update to 4.10.0 + * This is the final release for 4.10. Contains bugfixes + +------------------------------------------------------------------- +Thu Jan 17 08:12:23 UTC 2013 - [email protected] + +- Update to 4.9.98 + * This is the third RC release for 4.10. Contains bugfixes + +------------------------------------------------------------------- +Thu Jan 3 21:18:37 UTC 2013 - [email protected] + +- Update to 4.9.97 + * This is the second RC release for 4.10. Contains bugfixes + +------------------------------------------------------------------- +Wed Dec 19 18:45:03 UTC 2012 - [email protected] + +- Update to 4.9.95 + * This is the first RC release for 4.10. Contains bugfixes + +------------------------------------------------------------------- +Sat Dec 1 20:11:08 UTC 2012 - [email protected] + +- Update to 4.9.90 + * This is the second Beta release for 4.10. Contains bugfixes + +------------------------------------------------------------------- +Sat Nov 24 12:58:36 UTC 2012 - [email protected] + +- Update to 4.9.80 + * See http://www.kde.org/announcements/announce-4.10-beta1.php +- Remove patch kmix-autostart.diff due to upstream support for + autostart in desktop file. + +------------------------------------------------------------------- +Tue Nov 20 17:23:54 UTC 2012 - [email protected] + +- Fix the SLES build (%make_install is not expanded on SLES) + +------------------------------------------------------------------- +Fri Nov 2 16:56:12 UTC 2012 - [email protected] + +- Update to 4.9.3 + * see http://kde.org/announcements/announce-4.9.3.php for details + +------------------------------------------------------------------- +Sat Sep 29 10:17:49 UTC 2012 - [email protected] + +- Update to 4.9.2 + * see http://kde.org/announcements/announce-4.9.2.php for details + +------------------------------------------------------------------- +Tue Sep 4 11:02:15 UTC 2012 - [email protected] + +- Update to 4.9.1 + * see http://kde.org/announcements/4.9.1/ for details +- Rebase kmix_autostart patch + +------------------------------------------------------------------- +Tue Jul 31 11:02:37 UTC 2012 - [email protected] + +- Update to 4.9.0 + * see http://kde.org/announcements/4.9/ for details + +------------------------------------------------------------------- +Thu Jul 19 13:14:09 UTC 2012 - [email protected] + +- update to 4.8.97 + * RC2 milestone release of KDE 4.9 + * see http://kde.org/announcements/announce-4.9-rc2.php for details + +------------------------------------------------------------------- +Fri Jun 29 09:47:54 UTC 2012 - [email protected] + +- Update to 4.8.95_20120629 + +------------------------------------------------------------------- +Sun Jun 17 07:47:38 UTC 2012 - [email protected] + +- Update to 4.8.90_20120617 + +------------------------------------------------------------------- +Tue May 29 15:05:56 UTC 2012 - [email protected] + +- Update to 4.8.80_20120529 + +------------------------------------------------------------------- +Sun May 13 16:31:47 UTC 2012 - [email protected] + +- Update to 4.8.42_20120513 + +------------------------------------------------------------------- +Sun May 6 14:04:38 UTC 2012 - [email protected] + +- Update to 4.8.42_20120506 + +------------------------------------------------------------------- +Tue Nov 22 09:14:37 UTC 2011 - [email protected] + +- Update to 4.7.80_20111122 + +------------------------------------------------------------------- +Sun Nov 20 08:41:31 UTC 2011 - [email protected] + +- Update to 4.7.80_20111120 + +------------------------------------------------------------------- +Fri Nov 18 09:38:45 UTC 2011 - [email protected] + +- Update to 4.7.80_20111118 + +------------------------------------------------------------------- +Wed Nov 16 17:45:08 UTC 2011 - [email protected] + +- Update to 4.7.46_20111116 + +------------------------------------------------------------------- +Tue Nov 15 06:02:23 UTC 2011 - [email protected] + +- Update to 4.7.46_20111115 + +------------------------------------------------------------------- +Mon Nov 14 20:20:10 UTC 2011 - [email protected] + +- Update to 4.7.46_20111114 + +------------------------------------------------------------------- +Sun Nov 13 09:22:22 UTC 2011 - [email protected] + +- Update to 4.7.46_20111113 + +------------------------------------------------------------------- +Fri Nov 11 15:49:33 UTC 2011 - [email protected] + +- Update to 4.7.45_20111111 + +------------------------------------------------------------------- +Mon Nov 7 14:19:26 UTC 2011 - [email protected] + +- Update to 4.7.45_20111107 + +------------------------------------------------------------------- +Sun Nov 6 16:01:37 UTC 2011 - [email protected] + +- Update to 4.7.45_20111106 + +------------------------------------------------------------------- +Fri Nov 4 09:45:40 UTC 2011 - [email protected] + +- Update to 4.7.45_20111104 + +------------------------------------------------------------------- +Thu Nov 3 10:28:42 UTC 2011 - [email protected] + +- Update to 4.7.45_20111103 + +------------------------------------------------------------------- +Tue Nov 1 21:01:25 UTC 2011 - [email protected] + +- Update to 4.7.45_20111101 + +------------------------------------------------------------------- +Mon Oct 31 13:12:07 UTC 2011 - [email protected] + +- Update to 4.7.45_20111031 ++++ 1772 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:12.3:Update/.kmix.1678.new/kmix.changes New: ---- correct_volume_change_with_mousewheel.diff kmix-4.10.3.tar.xz kmix.changes kmix.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kmix.spec ++++++ # # spec file for package kmix # # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: kmix BuildRequires: alsa-devel BuildRequires: glib2-devel BuildRequires: libcanberra-devel BuildRequires: libkde4-devel BuildRequires: libpulse-devel BuildRequires: xz Summary: Sound Mixer License: GPL-2.0+ Group: Productivity/Multimedia/Sound/Mixers Url: http://www.kde.org Version: 4.10.3 Release: 0 Source0: %{name}-%{version}.tar.xz #PATCH-FIX-UPSTREAM correct_volume_change_with_mousewheel.diff [email protected] -- Correct the volume change step when done with mousewheel Patch1: correct_volume_change_with_mousewheel.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires %description KDE's full featured mini mixer %prep %setup -q %patch1 -p1 %build %cmake_kde4 -d build %make_jobs %install pushd build %kde4_makeinstall popd %suse_update_desktop_file kmix AudioVideo Mixer %kde_post_install %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root) %{_kde4_applicationsdir}/kmix.desktop %{_kde4_appsdir}/kmix/ %{_kde4_appsdir}/plasma/ %{_kde4_bindir}/kmix %{_kde4_bindir}/kmixctrl %{_kde4_datadir}/autostart/kmix_autostart.desktop %{_kde4_datadir}/autostart/restore_kmix_volumes.desktop %{_kde4_datadir}/dbus-1/interfaces/org.kde.kmix.* %{_kde4_htmldir}/en/kmix/ %{_kde4_iconsdir}/hicolor/*/apps/kmix.* %{_kde4_libdir}/libkdeinit4_kmix.so %{_kde4_libdir}/libkdeinit4_kmixctrl.so %{_kde4_modulesdir}/kded_kmixd.so %{_kde4_modulesdir}/plasma_engine_mixer.so %{_kde4_servicesdir}/kded/kmixd.desktop %{_kde4_servicesdir}/kmixctrl_restore.desktop %{_kde4_servicesdir}/plasma-engine-mixer.desktop %changelog ++++++ correct_volume_change_with_mousewheel.diff ++++++ diff --git a/gui/kmixdockwidget.cpp b/gui/kmixdockwidget.cpp index 3bda22e..fee74d9 100644 --- a/gui/kmixdockwidget.cpp +++ b/gui/kmixdockwidget.cpp @@ -347,10 +347,16 @@ KMixDockWidget::trayWheelEvent(int delta,Qt::Orientation wheelOrientation) if ( inc < 1 ) inc = 1; + if (delta < 0) + inc = -inc; + if (wheelOrientation == Qt::Horizontal) // Reverse horizontal scroll: bko228780 - delta = -delta; + inc = -inc; - long int cv = inc * (delta / 120 ); + // bko313579 Do not use "delta", as that is setting more related to documents (Editor, Browser). KMix should + // simply always use its own VOLUME_STEP_DIVISOR as a base for percentage change. + //long int cv = inc * (delta / 120 ); + long cv = inc; bool isInactive = vol.isCapture() ? !md->isRecSource() : md->isMuted(); kDebug() << "Operating on capture=" << vol.isCapture() << ", isInactive=" << isInactive; if ( cv > 0 && isInactive) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
