Hello community, here is the log from the commit of package kmix for openSUSE:Factory checked in at 2016-01-07 00:21:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kmix (Old) and /work/SRC/openSUSE:Factory/.kmix.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kmix" Changes: -------- --- /work/SRC/openSUSE:Factory/kmix/kmix.changes 2015-11-15 12:37:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kmix.new/kmix.changes 2016-01-07 00:21:48.000000000 +0100 @@ -1,0 +2,9 @@ +Sun Dec 13 13:22:38 UTC 2015 - [email protected] + +- Update to KDE Applications 15.12.0 + * KDE Applications 15.12.0 + * https://www.kde.org/announcements/announce-applications-15.12.0.php + * boo#958887 + + +------------------------------------------------------------------- Old: ---- kmix-15.08.3.tar.xz New: ---- kmix-15.12.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kmix.spec ++++++ --- /var/tmp/diff_new_pack.XUnawv/_old 2016-01-07 00:21:50.000000000 +0100 +++ /var/tmp/diff_new_pack.XUnawv/_new 2016-01-07 00:21:50.000000000 +0100 @@ -17,7 +17,7 @@ Name: kmix -Version: 15.08.3 +Version: 15.12.0 Release: 0 Summary: Sound Mixer License: GPL-2.0+ @@ -39,6 +39,7 @@ BuildRequires: libcanberra-devel BuildRequires: libpulse-devel BuildRequires: phonon4qt5-devel +BuildRequires: plasma-framework-devel BuildRequires: update-desktop-files BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 BuildRequires: pkgconfig(Qt5DBus) >= 5.2.0 @@ -82,5 +83,8 @@ %{_kf5_iconsdir}/hicolor/*/*/* %{_kf5_sharedir}/kmix/ %{_kf5_kxmlguidir}/kmix/ +%dir %_datadir/plasma/ +%dir %_datadir/plasma/services +%_datadir/plasma/services/mixer.operations %changelog ++++++ kmix-15.08.3.tar.xz -> kmix-15.12.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-15.08.3/CMakeLists.txt new/kmix-15.12.0/CMakeLists.txt --- old/kmix-15.08.3/CMakeLists.txt 2015-08-26 22:04:34.000000000 +0200 +++ new/kmix-15.12.0/CMakeLists.txt 2015-09-18 17:21:42.000000000 +0200 @@ -43,7 +43,7 @@ I18n XmlGui DBusAddons - KCMUtils + Plasma KDELibs4Support) find_package(KF5ConfigWidgets) find_package(KF5IconThemes) @@ -79,7 +79,10 @@ endif() find_package(Alsa) -alsa_configure_file(${CMAKE_BINARY_DIR}/config-alsa.h) +if(ALSA_FOUND) + alsa_configure_file(${CMAKE_BINARY_DIR}/config-alsa.h) + add_definitions(-DHAVE_LIBASOUND2) +endif(ALSA_FOUND) add_definitions (${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS} ${KDE4_DEFINITIONS} ) add_definitions(-DKDE_DEFAULT_DEBUG_AREA=67100) @@ -368,9 +371,7 @@ endif (CANBERRA_FOUND) ########### next target ############### -if (!KMIX_KF5_BUILD) - add_subdirectory( plasma ) -endif() +add_subdirectory( plasma ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-15.08.3/apps/KMixApp.cpp new/kmix-15.12.0/apps/KMixApp.cpp --- old/kmix-15.08.3/apps/KMixApp.cpp 2015-08-26 22:04:34.000000000 +0200 +++ new/kmix-15.12.0/apps/KMixApp.cpp 2015-09-18 17:21:42.000000000 +0200 @@ -216,4 +216,3 @@ } -#include "KMixApp.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-15.08.3/apps/kmix.cpp new/kmix-15.12.0/apps/kmix.cpp --- old/kmix-15.08.3/apps/kmix.cpp 2015-08-26 22:04:34.000000000 +0200 +++ new/kmix-15.12.0/apps/kmix.cpp 2015-09-18 17:21:42.000000000 +0200 @@ -1381,4 +1381,3 @@ } } -#include "kmix.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-15.08.3/backends/kmix-backends.cpp new/kmix-15.12.0/backends/kmix-backends.cpp --- old/kmix-15.08.3/backends/kmix-backends.cpp 2015-08-26 22:04:34.000000000 +0200 +++ new/kmix-15.12.0/backends/kmix-backends.cpp 2015-09-18 17:21:42.000000000 +0200 @@ -23,7 +23,9 @@ /* This code is being #include'd from mixer.cpp */ #include <config.h> +#ifdef HAVE_LIBASOUND2 #include <config-alsa.h> +#endif #include "mixer_backend.h" #include "core/mixer.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-15.08.3/backends/mixer_backend.cpp new/kmix-15.12.0/backends/mixer_backend.cpp --- old/kmix-15.08.3/backends/mixer_backend.cpp 2015-08-26 22:04:34.000000000 +0200 +++ new/kmix-15.12.0/backends/mixer_backend.cpp 2015-09-18 17:21:42.000000000 +0200 @@ -325,4 +325,3 @@ -#include "mixer_backend.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-15.08.3/backends/mixer_mpris2.cpp new/kmix-15.12.0/backends/mixer_mpris2.cpp --- old/kmix-15.08.3/backends/mixer_mpris2.cpp 2015-08-26 22:04:34.000000000 +0200 +++ new/kmix-15.12.0/backends/mixer_mpris2.cpp 2015-09-18 17:21:42.000000000 +0200 @@ -699,4 +699,3 @@ return "MPRIS2"; } -#include "mixer_mpris2.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-15.08.3/backends/mixer_pulse.cpp new/kmix-15.12.0/backends/mixer_pulse.cpp --- old/kmix-15.08.3/backends/mixer_pulse.cpp 2015-08-26 22:04:34.000000000 +0200 +++ new/kmix-15.12.0/backends/mixer_pulse.cpp 2015-09-18 17:21:42.000000000 +0200 @@ -1451,4 +1451,3 @@ return "PulseAudio"; } -#include "mixer_pulse.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-15.08.3/core/ControlManager.cpp new/kmix-15.12.0/core/ControlManager.cpp --- old/kmix-15.08.3/core/ControlManager.cpp 2015-08-26 22:04:34.000000000 +0200 +++ new/kmix-15.12.0/core/ControlManager.cpp 2015-09-18 17:21:42.000000000 +0200 @@ -200,4 +200,3 @@ } } -#include "ControlManager.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-15.08.3/core/kmixdevicemanager.cpp new/kmix-15.12.0/core/kmixdevicemanager.cpp --- old/kmix-15.08.3/core/kmixdevicemanager.cpp 2015-08-26 22:04:34.000000000 +0200 +++ new/kmix-15.12.0/core/kmixdevicemanager.cpp 2015-09-18 17:21:42.000000000 +0200 @@ -225,5 +225,4 @@ } -#include "kmixdevicemanager.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-15.08.3/core/mixdevice.cpp new/kmix-15.12.0/core/mixdevice.cpp --- old/kmix-15.08.3/core/mixdevice.cpp 2015-08-26 22:04:34.000000000 +0200 +++ new/kmix-15.12.0/core/mixdevice.cpp 2015-09-18 17:21:42.000000000 +0200 @@ -478,5 +478,4 @@ } -#include "mixdevice.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-15.08.3/core/mixdevicecomposite.cpp new/kmix-15.12.0/core/mixdevicecomposite.cpp --- old/kmix-15.08.3/core/mixdevicecomposite.cpp 2015-08-26 22:04:34.000000000 +0200 +++ new/kmix-15.12.0/core/mixdevicecomposite.cpp 2015-09-18 17:21:42.000000000 +0200 @@ -156,4 +156,3 @@ return isEnum; } -#include "mixdevicecomposite.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-15.08.3/core/mixer.cpp new/kmix-15.12.0/core/mixer.cpp --- old/kmix-15.08.3/core/mixer.cpp 2015-08-26 22:04:34.000000000 +0200 +++ new/kmix-15.12.0/core/mixer.cpp 2015-09-18 17:21:42.000000000 +0200 @@ -736,4 +736,3 @@ return ret; } -#include "mixer.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-15.08.3/core/mixertoolbox.cpp new/kmix-15.12.0/core/mixertoolbox.cpp --- old/kmix-15.08.3/core/mixertoolbox.cpp 2015-08-26 22:04:34.000000000 +0200 +++ new/kmix-15.12.0/core/mixertoolbox.cpp 2015-09-18 17:21:42.000000000 +0200 @@ -399,4 +399,3 @@ */ -#include "mixertoolbox.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-15.08.3/core/version.h new/kmix-15.12.0/core/version.h --- old/kmix-15.08.3/core/version.h 2015-08-26 22:04:34.000000000 +0200 +++ new/kmix-15.12.0/core/version.h 2015-09-18 17:21:42.000000000 +0200 @@ -20,6 +20,6 @@ */ #ifndef APP_VERSION -#define APP_VERSION "4.6RC1" +#define APP_VERSION "4.6" #define KMIX_CONFIG_VERSION 3 #endif // APP_VERSION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-15.08.3/dbus/dbuscontrolwrapper.cpp new/kmix-15.12.0/dbus/dbuscontrolwrapper.cpp --- old/kmix-15.08.3/dbus/dbuscontrolwrapper.cpp 2015-08-26 22:04:34.000000000 +0200 +++ new/kmix-15.12.0/dbus/dbuscontrolwrapper.cpp 2015-09-18 17:21:42.000000000 +0200 @@ -142,4 +142,3 @@ return m_md->captureVolume().hasSwitch(); } -#include "dbuscontrolwrapper.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-15.08.3/dbus/dbusmixerwrapper.cpp new/kmix-15.12.0/dbus/dbusmixerwrapper.cpp --- old/kmix-15.08.3/dbus/dbusmixerwrapper.cpp 2015-08-26 22:04:34.000000000 +0200 +++ new/kmix-15.12.0/dbus/dbusmixerwrapper.cpp 2015-09-18 17:21:42.000000000 +0200 @@ -142,4 +142,3 @@ QDBusConnection::sessionBus().send( signal ); } -#include "dbusmixerwrapper.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-15.08.3/dbus/dbusmixsetwrapper.cpp new/kmix-15.12.0/dbus/dbusmixsetwrapper.cpp --- old/kmix-15.08.3/dbus/dbusmixsetwrapper.cpp 2015-08-26 22:04:34.000000000 +0200 +++ new/kmix-15.12.0/dbus/dbusmixsetwrapper.cpp 2015-09-18 17:21:42.000000000 +0200 @@ -123,4 +123,3 @@ QDBusConnection::sessionBus().send( signal ); } -#include "dbusmixsetwrapper.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-15.08.3/gui/dialogaddview.cpp new/kmix-15.12.0/gui/dialogaddview.cpp --- old/kmix-15.08.3/gui/dialogaddview.cpp 2015-08-26 22:04:34.000000000 +0200 +++ new/kmix-15.12.0/gui/dialogaddview.cpp 2015-09-18 17:21:42.000000000 +0200 @@ -246,5 +246,4 @@ } } -#include "dialogaddview.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-15.08.3/gui/dialogchoosebackends.cpp new/kmix-15.12.0/gui/dialogchoosebackends.cpp --- old/kmix-15.08.3/gui/dialogchoosebackends.cpp 2015-08-26 22:04:34.000000000 +0200 +++ new/kmix-15.12.0/gui/dialogchoosebackends.cpp 2015-09-18 17:21:42.000000000 +0200 @@ -161,5 +161,4 @@ emit backendsModified(); } -#include "dialogchoosebackends.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-15.08.3/gui/dialogselectmaster.cpp new/kmix-15.12.0/gui/dialogselectmaster.cpp --- old/kmix-15.08.3/gui/dialogselectmaster.cpp 2015-08-26 22:04:34.000000000 +0200 +++ new/kmix-15.12.0/gui/dialogselectmaster.cpp 2015-09-18 17:21:42.000000000 +0200 @@ -235,5 +235,4 @@ } } -#include "dialogselectmaster.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-15.08.3/gui/dialogviewconfiguration.cpp new/kmix-15.12.0/gui/dialogviewconfiguration.cpp --- old/kmix-15.08.3/gui/dialogviewconfiguration.cpp 2015-08-26 22:04:34.000000000 +0200 +++ new/kmix-15.12.0/gui/dialogviewconfiguration.cpp 2015-09-18 17:21:42.000000000 +0200 @@ -459,5 +459,4 @@ } -#include "dialogviewconfiguration.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-15.08.3/gui/kmixdockwidget.cpp new/kmix-15.12.0/gui/kmixdockwidget.cpp --- old/kmix-15.08.3/gui/kmixdockwidget.cpp 2015-08-26 22:04:34.000000000 +0200 +++ new/kmix-15.12.0/gui/kmixdockwidget.cpp 2015-09-18 17:21:42.000000000 +0200 @@ -449,4 +449,3 @@ } } -#include "kmixdockwidget.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-15.08.3/gui/kmixerwidget.cpp new/kmix-15.12.0/gui/kmixerwidget.cpp --- old/kmix-15.08.3/gui/kmixerwidget.cpp 2015-08-26 22:04:34.000000000 +0200 +++ new/kmix-15.12.0/gui/kmixerwidget.cpp 2015-09-18 17:21:42.000000000 +0200 @@ -180,4 +180,3 @@ emit toggleMenuBar(); } -#include "kmixerwidget.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-15.08.3/gui/kmixprefdlg.cpp new/kmix-15.12.0/gui/kmixprefdlg.cpp --- old/kmix-15.08.3/gui/kmixprefdlg.cpp 2015-08-26 22:04:34.000000000 +0200 +++ new/kmix-15.12.0/gui/kmixprefdlg.cpp 2015-09-18 17:21:42.000000000 +0200 @@ -465,4 +465,3 @@ -#include "kmixprefdlg.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-15.08.3/gui/ksmallslider.cpp new/kmix-15.12.0/gui/ksmallslider.cpp --- old/kmix-15.08.3/gui/ksmallslider.cpp 2015-08-26 22:04:34.000000000 +0200 +++ new/kmix-15.12.0/gui/ksmallslider.cpp 2015-09-18 17:21:42.000000000 +0200 @@ -438,4 +438,3 @@ //repaint(); } -#include "ksmallslider.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-15.08.3/gui/mdwenum.cpp new/kmix-15.12.0/gui/mdwenum.cpp --- old/kmix-15.08.3/gui/mdwenum.cpp 2015-08-26 22:04:34.000000000 +0200 +++ new/kmix-15.12.0/gui/mdwenum.cpp 2015-09-18 17:21:42.000000000 +0200 @@ -196,4 +196,3 @@ return QWidget::eventFilter(obj,e); } -#include "mdwenum.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-15.08.3/gui/mdwslider.cpp new/kmix-15.12.0/gui/mdwslider.cpp --- old/kmix-15.08.3/gui/mdwslider.cpp 2015-08-26 22:04:34.000000000 +0200 +++ new/kmix-15.12.0/gui/mdwslider.cpp 2015-09-18 17:21:42.000000000 +0200 @@ -1316,4 +1316,3 @@ return QWidget::eventFilter(obj,e); } -#include "mdwslider.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-15.08.3/gui/mdwswitch.cpp new/kmix-15.12.0/gui/mdwswitch.cpp --- old/kmix-15.08.3/gui/mdwswitch.cpp 2015-08-26 22:04:34.000000000 +0200 +++ new/kmix-15.12.0/gui/mdwswitch.cpp 2015-09-18 17:21:42.000000000 +0200 @@ -229,4 +229,3 @@ // return QWidget::eventFilter(obj,e); //} // -//#include "mdwswitch.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-15.08.3/gui/mixdevicewidget.cpp new/kmix-15.12.0/gui/mixdevicewidget.cpp --- old/kmix-15.08.3/gui/mixdevicewidget.cpp 2015-08-26 22:04:34.000000000 +0200 +++ new/kmix-15.12.0/gui/mixdevicewidget.cpp 2015-09-18 17:21:42.000000000 +0200 @@ -115,4 +115,3 @@ } -#include "mixdevicewidget.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-15.08.3/gui/osdwidget.cpp new/kmix-15.12.0/gui/osdwidget.cpp --- old/kmix-15.08.3/gui/osdwidget.cpp 2015-08-26 22:04:34.000000000 +0200 +++ new/kmix-15.12.0/gui/osdwidget.cpp 2015-09-18 17:21:42.000000000 +0200 @@ -217,4 +217,3 @@ m_volumeLabel->setText(QString::number(volumeLevel) + " %"); // if you change the text, please adjust textSize in themeUpdated() } -#include "osdwidget.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-15.08.3/gui/viewbase.cpp new/kmix-15.12.0/gui/viewbase.cpp --- old/kmix-15.08.3/gui/viewbase.cpp 2015-08-26 22:04:34.000000000 +0200 +++ new/kmix-15.12.0/gui/viewbase.cpp 2015-09-18 17:21:42.000000000 +0200 @@ -500,4 +500,3 @@ // ---------- Popup stuff END --------------------- -#include "viewbase.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-15.08.3/gui/viewdockareapopup.cpp new/kmix-15.12.0/gui/viewdockareapopup.cpp --- old/kmix-15.08.3/gui/viewdockareapopup.cpp 2015-08-26 22:04:34.000000000 +0200 +++ new/kmix-15.12.0/gui/viewdockareapopup.cpp 2015-09-18 17:21:42.000000000 +0200 @@ -450,4 +450,3 @@ static_cast<QWidget*>(parent())->hide(); } -#include "viewdockareapopup.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-15.08.3/gui/viewsliders.cpp new/kmix-15.12.0/gui/viewsliders.cpp --- old/kmix-15.08.3/gui/viewsliders.cpp 2015-08-26 22:04:34.000000000 +0200 +++ new/kmix-15.12.0/gui/viewsliders.cpp 2015-09-18 17:21:42.000000000 +0200 @@ -440,4 +440,3 @@ } } -#include "viewsliders.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-15.08.3/gui/volumeslider.cpp new/kmix-15.12.0/gui/volumeslider.cpp --- old/kmix-15.08.3/gui/volumeslider.cpp 2015-08-26 22:04:34.000000000 +0200 +++ new/kmix-15.12.0/gui/volumeslider.cpp 2015-09-18 17:21:42.000000000 +0200 @@ -19,12 +19,103 @@ * License along with this program; if not, write to the Free * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include <QStyleOption> +#include <QFontMetrics> #include "volumeslider.h" +#include <kdebug.h> VolumeSlider::VolumeSlider(Qt::Orientation orientation, QWidget* parent) : QSlider(orientation, parent) +,m_orientation(orientation),m_tooltip(new QLabel(parent,Qt::ToolTip)) { + QFontMetrics metrics(m_tooltip->font()); + //Setting a size big enough for all values less than 100 + QRect labelRect = metrics.boundingRect("88"); +// m_tooltip->setContentsMargins(3,1,3,1); + m_tooltip->setMinimumWidth(labelRect.width()+5); + m_tooltip->setMinimumHeight(labelRect.height()+3); + m_tooltip->setAlignment(Qt::AlignCenter); +// m_tooltip->setAlignment(Qt::AlignVCenter); } -#include "volumeslider.moc" +void VolumeSlider::mousePressEvent(QMouseEvent* event) +{ + QSlider::mousePressEvent(event); + + QStyleOptionSlider opt; + initStyleOption(&opt); + QRect sliderHandle = style()->subControlRect(QStyle::CC_Slider,&opt,QStyle::SC_SliderHandle,this); + + if(sliderHandle.contains(event->pos())) + { + if (m_orientation == Qt::Vertical) + { + m_tooltip->move(mapToGlobal(sliderHandle.topLeft()).x()+width(),mapToGlobal(sliderHandle.topLeft()).y()); + } + else + { + m_tooltip->move(mapToGlobal(sliderHandle.topLeft()).x(),mapToGlobal(sliderHandle.topLeft()).y()+height()); + } + + /** + * 1) The following operates on the value of one individual channel slider, and thus is representing only the + * value of that channel. This is technically not 100% sound for a corner case: The average of all channels + * should be displayed in the "joined slider mode". On the other hand, in "joined slider mode", the slider + * should already represent the average of all channels. And as soon as you move the slider, all channels + * are changed. So it is likely really exact enough. + * + * 2) Future directions: It would be better to do the percentage calculation via the Volume class, as it + * handles corner cases like muting. But due to "auto-unmuting" the value is factually also correct. As the + * VolumeSlider class currently holds no pointer/reference to the "underlying" Volume object, a bit code + * "duplication" is acceptable here. + */ + qreal percentReal = ((qreal)100 * value() ) / ( maximum() - minimum()); + int percent = qRound(percentReal); + m_tooltip->setText(QString::number(percent)); + m_tooltip->show(); + } +} + +void VolumeSlider::mouseReleaseEvent(QMouseEvent* event) +{ + QSlider::mouseReleaseEvent(event); + m_tooltip->hide(); +} + +void VolumeSlider::mouseMoveEvent(QMouseEvent* event) +{ + QSlider::mouseMoveEvent(event); + + QStyleOptionSlider opt; + initStyleOption(&opt); + QRect sliderHandle = style()->subControlRect(QStyle::CC_Slider,&opt,QStyle::SC_SliderHandle,this); + + qreal percentReal = ((qreal)100 * value() ) / ( maximum() - minimum() ); + int percent = qRound(percentReal); + + //Change width of label if percent becomes 100 + if (percent == 100) + { + QFontMetrics metrics(m_tooltip->font()); + QRect labelRect = metrics.boundingRect("100"); + m_tooltip->resize(labelRect.width(),m_tooltip->height()); + } + else if(m_tooltip->width() > m_tooltip->minimumWidth()) + { + m_tooltip->resize(m_tooltip->minimumWidth(),m_tooltip->height()); + } + m_tooltip->setText(QString::number(percent)); + + if (m_orientation == Qt::Vertical) + { + m_tooltip->move(mapToGlobal(sliderHandle.topLeft()).x()+width(),mapToGlobal(sliderHandle.topLeft()).y()); + } + else + { + m_tooltip->move(mapToGlobal(sliderHandle.topLeft()).x(),mapToGlobal(sliderHandle.topLeft()).y()+height()); + } + + //kDebug() << "Position is"<<mapToGlobal(sliderHandle.topLeft()).x()<<","<<mapToGlobal(sliderHandle.topLeft()).y(); + //kDebug() << "Volume is "<<percent; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-15.08.3/gui/volumeslider.h new/kmix-15.12.0/gui/volumeslider.h --- old/kmix-15.08.3/gui/volumeslider.h 2015-08-26 22:04:34.000000000 +0200 +++ new/kmix-15.12.0/gui/volumeslider.h 2015-09-18 17:21:42.000000000 +0200 @@ -24,12 +24,22 @@ #define VOLUMESLIDER_H #include <QSlider> +#include <QLabel> +#include <QMouseEvent> #include "volumesliderextradata.h" class VolumeSlider : public QSlider { Q_OBJECT + Qt::Orientation m_orientation; + QLabel* m_tooltip; + +protected: + void mousePressEvent(QMouseEvent *event); + void mouseMoveEvent(QMouseEvent *event); + void mouseReleaseEvent(QMouseEvent *event); + public: VolumeSlider(Qt::Orientation orientation, QWidget* parent); // : QSlider(orientation, parent); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-15.08.3/kmix_autostart.desktop new/kmix-15.12.0/kmix_autostart.desktop --- old/kmix-15.08.3/kmix_autostart.desktop 2015-08-26 22:04:34.000000000 +0200 +++ new/kmix-15.12.0/kmix_autostart.desktop 2015-09-18 17:21:42.000000000 +0200 @@ -6,6 +6,7 @@ MimeType= Terminal=false X-KDE-autostart-after=panel +X-KDE-autostart-after=pulseaudio X-KDE-StartupNotify=false X-DBUS-StartupType=Unique X-KDE-autostart-condition=kmixrc:Global:AutoStart:true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-15.08.3/plasma/engine/CMakeLists.txt new/kmix-15.12.0/plasma/engine/CMakeLists.txt --- old/kmix-15.08.3/plasma/engine/CMakeLists.txt 2015-08-26 22:04:34.000000000 +0200 +++ new/kmix-15.12.0/plasma/engine/CMakeLists.txt 2015-09-18 17:21:42.000000000 +0200 @@ -5,18 +5,34 @@ mixerservice.cpp ) -qt4_add_dbus_interface(mixer_engine_SRCS ../../dbus/org.kde.kmix.mixset.xml - mixset_interface) -qt4_add_dbus_interface(mixer_engine_SRCS ../../dbus/org.kde.kmix.mixer.xml - mixer_interface) -qt4_add_dbus_interface(mixer_engine_SRCS ../../dbus/org.kde.kmix.control.xml - control_interface) - -kde4_add_plugin(plasma_engine_mixer ${mixer_engine_SRCS}) -target_link_libraries(plasma_engine_mixer ${KDE4_KDECORE_LIBS} - ${KDE4_PLASMA_LIBS}) - -install(TARGETS plasma_engine_mixer DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-engine-mixer.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -install(FILES mixer.operations DESTINATION - ${DATA_INSTALL_DIR}/plasma/services) +if (KMIX_KF5_BUILD) + qt5_add_dbus_interface(mixer_engine_SRCS ../../dbus/org.kde.kmix.mixset.xml + mixset_interface) + qt5_add_dbus_interface(mixer_engine_SRCS ../../dbus/org.kde.kmix.mixer.xml + mixer_interface) + qt5_add_dbus_interface(mixer_engine_SRCS ../../dbus/org.kde.kmix.control.xml + control_interface) + + add_library(plasma_engine_mixer MODULE ${mixer_engine_SRCS}) + target_link_libraries(plasma_engine_mixer KF5::Plasma Qt5::DBus) + kcoreaddons_desktop_to_json(plasma_engine_mixer plasma-dataengine-mixer.desktop) + + install(TARGETS plasma_engine_mixer DESTINATION ${KDE_INSTALL_PLUGINDIR}/plasma/dataengine) + install(FILES plasma-dataengine-mixer.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}) + install(FILES mixer.operations DESTINATION ${PLASMA_DATA_INSTALL_DIR}/services) +else() + qt4_add_dbus_interface(mixer_engine_SRCS ../../dbus/org.kde.kmix.mixset.xml + mixset_interface) + qt4_add_dbus_interface(mixer_engine_SRCS ../../dbus/org.kde.kmix.mixer.xml + mixer_interface) + qt4_add_dbus_interface(mixer_engine_SRCS ../../dbus/org.kde.kmix.control.xml + control_interface) + kde4_add_plugin(plasma_engine_mixer ${mixer_engine_SRCS}) + + target_link_libraries(plasma_engine_mixer ${KDE4_KDECORE_LIBS} ${KDE4_PLASMA_LIBS}) + + install(TARGETS plasma_engine_mixer DESTINATION ${PLUGIN_INSTALL_DIR}) + install(FILES plasma-dataengine-mixer.desktop DESTINATION ${SERVICES_INSTALL_DIR}) + install(FILES mixer.operations DESTINATION ${DATA_INSTALL_DIR}/plasma/services) +endif() + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-15.08.3/plasma/engine/mixerengine.cpp new/kmix-15.12.0/plasma/engine/mixerengine.cpp --- old/kmix-15.08.3/plasma/engine/mixerengine.cpp 2015-08-26 22:04:34.000000000 +0200 +++ new/kmix-15.12.0/plasma/engine/mixerengine.cpp 2015-09-18 17:21:42.000000000 +0200 @@ -24,7 +24,7 @@ #include "control_interface.h" #include "mixerservice.h" #include <QTimer> -#include <KIcon> +#include <QIcon> const QString MixerEngine::KMIX_DBUS_SERVICE = "org.kde.kmix"; @@ -45,6 +45,7 @@ this, SLOT(slotServiceRegistered(QString)) ); connect( watcher, SIGNAL(serviceUnregistered(QString)), this, SLOT(slotServiceUnregistered(QString)) ); + init(); } MixerEngine::~MixerEngine() @@ -165,7 +166,7 @@ bool MixerEngine::getMixersData() { QStringList mixerIds; - if ( interface->isServiceRegistered( KMIX_DBUS_SERVICE ) ) + if ( interface->isServiceRegistered( KMIX_DBUS_SERVICE ) && m_kmix ) { Q_FOREACH( MixerInfo* mi, m_mixers ) mixerIds.append( mi->id ); @@ -261,7 +262,7 @@ setData( source, "Mute", ci->iface->mute() ); setData( source, "Can Be Muted", ci->iface->canMute() ); setData( source, "Readable Name", ci->iface->readableName() ); - setData( source, "Icon", KIcon(ci->iface->iconName()) ); + setData( source, "Icon", QIcon::fromTheme(ci->iface->iconName()) ); setData( source, "Record Source", ci->iface->recordSource() ); setData( source, "Has Capture Switch", ci->iface->hasCaptureSwitch() ); } @@ -405,6 +406,11 @@ return new MixerService( this, curci->iface ); } +#ifdef X_KMIX_KF5_BUILD +K_EXPORT_PLASMA_DATAENGINE_WITH_JSON(mixer, MixerEngine, "plasma-dataengine-mixer.json") +#else K_EXPORT_PLASMA_DATAENGINE(mixer, MixerEngine) +#endif // X_KMIX_KF5_BUILD + #include "mixerengine.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-15.08.3/plasma/engine/mixerservice.cpp new/kmix-15.12.0/plasma/engine/mixerservice.cpp --- old/kmix-15.08.3/plasma/engine/mixerservice.cpp 2015-08-26 22:04:34.000000000 +0200 +++ new/kmix-15.12.0/plasma/engine/mixerservice.cpp 2015-09-18 17:21:42.000000000 +0200 @@ -67,4 +67,3 @@ } } -#include "mixerservice.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-15.08.3/plasma/engine/plasma-dataengine-mixer.desktop new/kmix-15.12.0/plasma/engine/plasma-dataengine-mixer.desktop --- old/kmix-15.08.3/plasma/engine/plasma-dataengine-mixer.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/kmix-15.12.0/plasma/engine/plasma-dataengine-mixer.desktop 2015-09-18 17:21:42.000000000 +0200 @@ -0,0 +1,54 @@ +[Desktop Entry] +Name=Mixer DataEngine +Name[bg]=Ядро за смесител +Name[bs]=Mikser pogon podataka +Name[ca]=Motor de dades del mesclador +Name[ca@valencia]=Motor de dades del mesclador +Name[cs]=Datový stroj směšovače +Name[da]=Datamotor til mikser +Name[de]=Mixer-Datenmodul +Name[el]=Μηχανή δεδομένων μείκτη +Name[en_GB]=Mixer DataEngine +Name[es]=Motor de datos del mezclador +Name[et]=Mikseri andmemootor +Name[fi]=Mikseritietomoottori +Name[fr]=Moteur de données du mixeur +Name[ga]=Inneall Sonraí an Mheascóra +Name[gl]=Motor de datos do mesturador +Name[hu]=Keverő adatmodul +Name[ia]=Motor de datos de Mxer +Name[id]=Mesindata Mixer +Name[is]=Hljóðblöndunargagnavél +Name[it]=Motore di dati del mixer +Name[kk]=Микшер деректер тетігі +Name[km]=ម៉ាស៊ីនទិន្នន័យនៃកម្មវិធីលាយ +Name[ko]=믹서 데이터 엔진 +Name[lt]=Maišytuvo duomenų variklis +Name[mr]=मिक्सर डेटाइंजिन +Name[nb]=Mikser datamotor +Name[nds]=Mischer-Datenkarn +Name[nl]=Gegevensengine voor mixer +Name[pa]=ਮਿਕਸਰ ਡਾਟਾਇੰਜਣ +Name[pl]=Silnik danych miksera +Name[pt]=Motor de Dados da Mesa de Mistura +Name[pt_BR]=Mecanismo de dados do mixer +Name[ro]=Motor de date Mixer +Name[ru]=Источник данных Plasma для работы с микшером +Name[sk]=Dátový engine mixéra +Name[sl]=DataEngine mešalnika +Name[sr]=Датомотор миксете +Name[sr@ijekavian]=Датомотор миксете +Name[sr@ijekavianlatin]=Datomotor miksete +Name[sr@latin]=Datomotor miksete +Name[sv]=Datagränssnitt för mixer +Name[tr]=Karıştırıcı Veri Sağlayıcısı +Name[ug]=سازلىغۇچ سانلىق مەلۇمات ماتورى +Name[uk]=Рушій даних мікшера +Name[x-test]=xxMixer DataEnginexx +Name[zh_CN]=混音器数据引擎 +Name[zh_TW]=混合器資料引擎 +X-KDE-ServiceTypes=Plasma/DataEngine +Type=Service +Icon=kmix +X-KDE-Library=plasma_engine_mixer +X-KDE-PluginInfo-Name=mixer diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-15.08.3/plasma/engine/plasma-engine-mixer.desktop new/kmix-15.12.0/plasma/engine/plasma-engine-mixer.desktop --- old/kmix-15.08.3/plasma/engine/plasma-engine-mixer.desktop 2015-08-26 22:04:34.000000000 +0200 +++ new/kmix-15.12.0/plasma/engine/plasma-engine-mixer.desktop 1970-01-01 01:00:00.000000000 +0100 @@ -1,54 +0,0 @@ -[Desktop Entry] -Name=Mixer DataEngine -Name[bg]=Ядро за смесител -Name[bs]=Mikser pogon podataka -Name[ca]=Motor de dades del mesclador -Name[ca@valencia]=Motor de dades del mesclador -Name[cs]=Datový stroj směšovače -Name[da]=Datamotor til mikser -Name[de]=Mixer-Datenmodul -Name[el]=Μηχανή δεδομένων μείκτη -Name[en_GB]=Mixer DataEngine -Name[es]=Motor de datos del mezclador -Name[et]=Mikseri andmemootor -Name[fi]=Mikseritietomoottori -Name[fr]=Moteur de données du mixeur -Name[ga]=Inneall Sonraí an Mheascóra -Name[gl]=Motor de datos do mesturador -Name[hu]=Keverő adatmodul -Name[ia]=Motor de datos de Mxer -Name[id]=Mesindata Mixer -Name[is]=Hljóðblöndunargagnavél -Name[it]=Motore di dati del mixer -Name[kk]=Микшер деректер тетігі -Name[km]=ម៉ាស៊ីនទិន្នន័យនៃកម្មវិធីលាយ -Name[ko]=믹서 데이터 엔진 -Name[lt]=Maišytuvo duomenų variklis -Name[mr]=मिक्सर डेटाइंजिन -Name[nb]=Mikser datamotor -Name[nds]=Mischer-Datenkarn -Name[nl]=Gegevensengine voor mixer -Name[pa]=ਮਿਕਸਰ ਡਾਟਾਇੰਜਣ -Name[pl]=Silnik danych miksera -Name[pt]=Motor de Dados da Mesa de Mistura -Name[pt_BR]=Mecanismo de dados do mixer -Name[ro]=Motor de date Mixer -Name[ru]=Источник данных Plasma для работы с микшером -Name[sk]=Dátový engine mixéra -Name[sl]=DataEngine mešalnika -Name[sr]=Датомотор миксете -Name[sr@ijekavian]=Датомотор миксете -Name[sr@ijekavianlatin]=Datomotor miksete -Name[sr@latin]=Datomotor miksete -Name[sv]=Datagränssnitt för mixer -Name[tr]=Karıştırıcı Veri Sağlayıcısı -Name[ug]=سازلىغۇچ سانلىق مەلۇمات ماتورى -Name[uk]=Рушій даних мікшера -Name[x-test]=xxMixer DataEnginexx -Name[zh_CN]=混音器数据引擎 -Name[zh_TW]=混合器資料引擎 -X-KDE-ServiceTypes=Plasma/DataEngine -Type=Service -Icon=kmix -X-KDE-Library=plasma_engine_mixer -X-KDE-PluginInfo-Name=mixer diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-15.08.3/restore_kmix_volumes.desktop new/kmix-15.12.0/restore_kmix_volumes.desktop --- old/kmix-15.08.3/restore_kmix_volumes.desktop 2015-08-26 22:04:34.000000000 +0200 +++ new/kmix-15.12.0/restore_kmix_volumes.desktop 2015-09-18 17:21:42.000000000 +0200 @@ -1,5 +1,6 @@ [Desktop Entry] X-KDE-autostart-phase=1 +X-KDE-autostart-after=pulseaudio X-KDE-autostart-condition=kmixrc:Global:startkdeRestore:true Type=Application Exec=kmixctrl --restore diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmix-15.08.3/tests/dialogtest.cpp new/kmix-15.12.0/tests/dialogtest.cpp --- old/kmix-15.08.3/tests/dialogtest.cpp 2015-08-26 22:04:34.000000000 +0200 +++ new/kmix-15.12.0/tests/dialogtest.cpp 2015-09-18 17:21:42.000000000 +0200 @@ -72,5 +72,4 @@ scrollArea->setWidget(vboxForScrollView); } -#include "dialogtest.moc"
