mirror of
https://gitdl.cn/https://github.com/chakralinux/desktop.git
synced 2025-02-11 03:54:38 +08:00
Sthetics
This commit is contained in:
Manuel
parent
3b259502aa
commit
3f2e758c56
@ -1,212 +0,0 @@
|
|||||||
#
|
|
||||||
# KDE SC Packages for Chakra, part of chakra-project.org
|
|
||||||
#
|
|
||||||
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
|
|
||||||
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
|
|
||||||
|
|
||||||
# include global config
|
|
||||||
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
|
|
||||||
|
|
||||||
#
|
|
||||||
# package info
|
|
||||||
#
|
|
||||||
pkgbase=('kdemultimedia')
|
|
||||||
pkgname=('kdemultimedia-common'
|
|
||||||
'kdemultimedia-dragonplayer'
|
|
||||||
'kdemultimedia-juk'
|
|
||||||
'kdemultimedia-kmix'
|
|
||||||
'kdemultimedia-kscd'
|
|
||||||
'kdemultimedia-thumbnailers')
|
|
||||||
|
|
||||||
arch=('i686' 'x86_64')
|
|
||||||
pkgver=${_kdever}
|
|
||||||
pkgrel=1
|
|
||||||
|
|
||||||
pkgdesc="split package"
|
|
||||||
url="http://www.kde.org"
|
|
||||||
license=('GPL' 'LGPL' 'FDL')
|
|
||||||
|
|
||||||
options=('docs' '!splithdr' 'splitdbg' 'log')
|
|
||||||
|
|
||||||
makedepends=('ffmpeg' 'pkgconfig' 'cmake' 'automoc4' "kdelibs>=${_kdever}" "kde-runtime>=${_kdever}"
|
|
||||||
'cdparanoia' 'mplayer' 'libpulse' 'musicbrainz>=3.0.3' 'taglib' 'automoc4' 'docbook-xsl')
|
|
||||||
|
|
||||||
source=($_mirror/${pkgbase}-$_kdever.tar.xz
|
|
||||||
http://kenai.com/projects/kde-odf-thumbnail/downloads/download/1.0.0/kde-odf-thumbnail-1.0.0.tar.gz
|
|
||||||
http://kde-apps.org/CONTENT/content-files/107128-GimpResourcesThumbnailer-2.1.0.tar.gz
|
|
||||||
http://kde-apps.org/CONTENT/content-files/114885-AudioThumbs-0.1.tar.gz
|
|
||||||
mplayerthumbs-horizontal.patch
|
|
||||||
sprocket-large.png
|
|
||||||
sprocket-medium.png
|
|
||||||
sprocket-small.png)
|
|
||||||
|
|
||||||
md5sums=(`grep ${pkgbase}-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1`
|
|
||||||
'edf694939f4b5d5e97c3fe2f91e7cec3' # kde-odf-thumbnail-1.0.0.tar.gz
|
|
||||||
'5e3022ddcf3876e07d4b9870e1806b48' # 107128-GimpResourcesThumbnailer-2.1.0.tar.gz
|
|
||||||
'07c3039ddf5e88ba0ab290570f43749d' # 114885-AudioThumbs-0.1.tar.gz
|
|
||||||
'00ff1e8a1e4c1e39e3d1146f1d08036c' # mplayerthumbs-horizontal.patch
|
|
||||||
'6eeba61989d0e6904fe2c18bb01a3775' # sprocket-large.png
|
|
||||||
'ebb3b4c68ee69e128faf5ef0b37aaeae' # sprocket-medium.png
|
|
||||||
'450cf7bf2ac02b1efe75156d9bb887f6') # sprocket-small.png
|
|
||||||
|
|
||||||
#
|
|
||||||
# build function
|
|
||||||
#
|
|
||||||
build() {
|
|
||||||
cd ${srcdir}/${pkgbase}-${pkgver}
|
|
||||||
|
|
||||||
msg "applying patches ..."
|
|
||||||
patch -Np1 -i ${srcdir}/mplayerthumbs-horizontal.patch
|
|
||||||
|
|
||||||
msg "starting build ..."
|
|
||||||
cmake . -DCMAKE_BUILD_TYPE=${_build_type} \
|
|
||||||
-DCMAKE_INSTALL_PREFIX=${_installprefix} \
|
|
||||||
-DCMAKE_SKIP_RPATH=ON \
|
|
||||||
-DWITH_PulseAudio=ON \
|
|
||||||
-DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed'
|
|
||||||
|
|
||||||
make VERBOSE=1 || return 1
|
|
||||||
|
|
||||||
pushd $srcdir/kde-odf-thumbnail-1.0.0
|
|
||||||
cmake . -DCMAKE_BUILD_TYPE=${_build_type} \
|
|
||||||
-DCMAKE_INSTALL_PREFIX=${_installprefix} \
|
|
||||||
-DCMAKE_SKIP_RPATH=ON \
|
|
||||||
-DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed'
|
|
||||||
popd
|
|
||||||
|
|
||||||
pushd $srcdir/GimpResourcesThumbnailer-2.1.0
|
|
||||||
cmake . -DCMAKE_BUILD_TYPE=${_build_type} \
|
|
||||||
-DCMAKE_INSTALL_PREFIX=${_installprefix} \
|
|
||||||
-DCMAKE_SKIP_RPATH=ON \
|
|
||||||
-DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed'
|
|
||||||
popd
|
|
||||||
|
|
||||||
pushd $srcdir/AudioThumbs-0.1
|
|
||||||
cmake . -DCMAKE_BUILD_TYPE=${_build_type} \
|
|
||||||
-DCMAKE_INSTALL_PREFIX=${_installprefix} \
|
|
||||||
-DCMAKE_SKIP_RPATH=ON \
|
|
||||||
-DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed'
|
|
||||||
popd
|
|
||||||
}
|
|
||||||
|
|
||||||
#
|
|
||||||
# split-install functions
|
|
||||||
#
|
|
||||||
package_kdemultimedia-common() {
|
|
||||||
pkgdesc="KDE multimedia - Common files and libraries"
|
|
||||||
depends=("kdelibs>=${_kdever}" "kde-runtime>=${_kdever}" 'flac' 'musicbrainz>=3.0.3' 'cdparanoia' 'taglib')
|
|
||||||
conflicts=('kdemultimedia-doc')
|
|
||||||
groups=("kde" "kdemultimedia" "kde-uninstall")
|
|
||||||
optdepends=('pulseaudio: pulseaudio support')
|
|
||||||
install=${pkgbase}.install
|
|
||||||
|
|
||||||
splitdirs="kioslave libkcddb libkcompactdisc strigi-analyzer doc/kioslave doc/kcontrol"
|
|
||||||
for i in ${splitdirs} ; do
|
|
||||||
cd ${srcdir}/${pkgbase}-${pkgver}/${i}
|
|
||||||
make DESTDIR=${pkgdir} install
|
|
||||||
done
|
|
||||||
|
|
||||||
# include our patches into the package
|
|
||||||
ls -1 ${startdir}/*.patch &>/dev/null 2>&1
|
|
||||||
if [ "$?" = "0" ]; then
|
|
||||||
warning "incuding patches into package"
|
|
||||||
mkdir -p ${pkgdir}/usr/share/chakra/patches/${pkgbase} &>/dev/null
|
|
||||||
for i in ${startdir}/*.patch; do
|
|
||||||
msg "$i"
|
|
||||||
cp $i ${pkgdir}/usr/share/chakra/patches/${pkgbase}/ &>/dev/null
|
|
||||||
done
|
|
||||||
else
|
|
||||||
warning "no patches found, skipping to include them into the package..."
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
package_kdemultimedia-dragonplayer() {
|
|
||||||
pkgdesc="Simple video player"
|
|
||||||
depends=("${pkgbase}-common>=${_kdever}")
|
|
||||||
conflicts=('kdemultimedia-doc')
|
|
||||||
groups=("kde" "${pkgbase}" "kde-uninstall")
|
|
||||||
provides=('dragonplayer')
|
|
||||||
categories=('multimedia')
|
|
||||||
install=${pkgbase}.install
|
|
||||||
|
|
||||||
splitdirs="dragonplayer doc/dragonplayer"
|
|
||||||
for i in ${splitdirs} ; do
|
|
||||||
cd ${srcdir}/${pkgbase}-${pkgver}/${i}
|
|
||||||
make DESTDIR=${pkgdir} install
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
package_kdemultimedia-juk() {
|
|
||||||
pkgdesc="An audio player with music database"
|
|
||||||
depends=("${pkgbase}-common>=${_kdever}")
|
|
||||||
conflicts=('kdemultimedia-doc')
|
|
||||||
groups=("kde" "${pkgbase}" "kde-uninstall")
|
|
||||||
provides=('juk')
|
|
||||||
categories=('multimedia')
|
|
||||||
install=${pkgbase}.install
|
|
||||||
|
|
||||||
splitdirs="juk doc/juk"
|
|
||||||
for i in ${splitdirs} ; do
|
|
||||||
cd ${srcdir}/${pkgbase}-${pkgver}/${i}
|
|
||||||
make DESTDIR=${pkgdir} install
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
package_kdemultimedia-kmix() {
|
|
||||||
pkgdesc="Audio mixer"
|
|
||||||
depends=("${pkgbase}-common>=${_kdever}")
|
|
||||||
conflicts=('kdemultimedia-doc')
|
|
||||||
groups=("kde" "${pkgbase}" "kde-uninstall")
|
|
||||||
optdepends=('pulseaudio: pulseaudio support')
|
|
||||||
provides=('kmix')
|
|
||||||
categories=('multimedia')
|
|
||||||
install=${pkgbase}.install
|
|
||||||
|
|
||||||
splitdirs="kmix doc/kmix"
|
|
||||||
for i in ${splitdirs} ; do
|
|
||||||
cd ${srcdir}/${pkgbase}-${pkgver}/${i}
|
|
||||||
make DESTDIR=${pkgdir} install
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
package_kdemultimedia-kscd() {
|
|
||||||
pkgdesc="Audio CD player"
|
|
||||||
depends=("${pkgbase}-common>=${_kdever}" 'musicbrainz')
|
|
||||||
groups=("kde" "${pkgbase}" "kde-uninstall")
|
|
||||||
provides=('kscd')
|
|
||||||
categories=('multimedia')
|
|
||||||
install=${pkgbase}.install
|
|
||||||
|
|
||||||
splitdirs="kscd"
|
|
||||||
for i in ${splitdirs} ; do
|
|
||||||
cd ${srcdir}/${pkgbase}-${pkgver}/${i}
|
|
||||||
make DESTDIR=${pkgdir} install
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
package_kdemultimedia-thumbnailers() {
|
|
||||||
pkgdesc='KDE Thumbnailers for several formats'
|
|
||||||
depends=("${pkgbase}-common>=${_kdever}" 'mplayer')
|
|
||||||
provides=("${pkgbase}-mplayerthumbs=${_kdever}" 'mplayerthumbs')
|
|
||||||
groups=("kde" "${pkgbase}" "kde-uninstall")
|
|
||||||
install=${pkgbase}.install
|
|
||||||
|
|
||||||
splitdirs="mplayerthumbs ffmpegthumbs"
|
|
||||||
for i in ${splitdirs} ; do
|
|
||||||
cd ${srcdir}/${pkgbase}-${pkgver}/${i}
|
|
||||||
make DESTDIR=${pkgdir} install
|
|
||||||
done
|
|
||||||
|
|
||||||
install -D -m644 ${srcdir}/sprocket-large.png ${pkgdir}/usr/share/apps/videothumbnail/sprocket-large.png
|
|
||||||
install -D -m644 ${srcdir}/sprocket-medium.png ${pkgdir}/usr/share/apps/videothumbnail/sprocket-medium.png
|
|
||||||
install -D -m644 ${srcdir}/sprocket-small.png ${pkgdir}/usr/share/apps/videothumbnail/sprocket-small.png
|
|
||||||
|
|
||||||
cd $srcdir/kde-odf-thumbnail-1.0.0
|
|
||||||
make DESTDIR=${pkgdir} install
|
|
||||||
|
|
||||||
cd $srcdir/GimpResourcesThumbnailer-2.1.0
|
|
||||||
make DESTDIR=${pkgdir} install
|
|
||||||
|
|
||||||
cd $srcdir/AudioThumbs-0.1
|
|
||||||
make DESTDIR=${pkgdir} install
|
|
||||||
}
|
|
||||||
@ -1,88 +0,0 @@
|
|||||||
post_install() {
|
|
||||||
if [ -e "/etc/chakra/updates.conf" ] ; then
|
|
||||||
|
|
||||||
. /etc/chakra/updates.conf
|
|
||||||
|
|
||||||
if [ "$UPDATE_XDG_ICON_DB" = "yes" ]; then
|
|
||||||
/usr/bin/chakra-update-icons
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$UPDATE_GLOBAL_CONFIG" = "yes" ]; then
|
|
||||||
/usr/bin/chakra-update-sycoca
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$UPDATE_USER_CONFIG" = "yes" ]; then
|
|
||||||
/usr/bin/chakra-update-user-sycoca
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
echo " > WARNING"
|
|
||||||
echo " The package kde-common seems not to be installed,"
|
|
||||||
echo " this can possibly break the installation. Just install it"
|
|
||||||
echo " manually after this installation/update, run the following"
|
|
||||||
echo " commands and restart KDE afterwards:"
|
|
||||||
echo " sudo chakra-config-updater"
|
|
||||||
echo " kbuildsycoca4"
|
|
||||||
echo " "
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
post_upgrade() {
|
|
||||||
if [ -e "/etc/chakra/updates.conf" ] ; then
|
|
||||||
|
|
||||||
. /etc/chakra/updates.conf
|
|
||||||
|
|
||||||
if [ "$UPDATE_XDG_ICON_DB" = "yes" ]; then
|
|
||||||
/usr/bin/chakra-update-icons
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$UPDATE_GLOBAL_CONFIG" = "yes" ]; then
|
|
||||||
/usr/bin/chakra-update-sycoca
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$UPDATE_USER_CONFIG" = "yes" ]; then
|
|
||||||
/usr/bin/chakra-update-user-sycoca
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
echo " > WARNING"
|
|
||||||
echo " The package kde-common seems not to be installed,"
|
|
||||||
echo " this can possibly break the installation. Just install it"
|
|
||||||
echo " manually after this installation/update, run the following"
|
|
||||||
echo " commands and restart KDE afterwards:"
|
|
||||||
echo " sudo chakra-config-updater"
|
|
||||||
echo " kbuildsycoca4"
|
|
||||||
echo " "
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
post_remove() {
|
|
||||||
if [ -e "/etc/chakra/updates.conf" ] ; then
|
|
||||||
|
|
||||||
. /etc/chakra/updates.conf
|
|
||||||
|
|
||||||
if [ "$UPDATE_XDG_ICON_DB" = "yes" ]; then
|
|
||||||
/usr/bin/chakra-update-icons
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$UPDATE_GLOBAL_CONFIG" = "yes" ]; then
|
|
||||||
/usr/bin/chakra-update-sycoca
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$UPDATE_USER_CONFIG" = "yes" ]; then
|
|
||||||
/usr/bin/chakra-update-user-sycoca
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
echo " > WARNING"
|
|
||||||
echo " The package kde-common seems not to be installed,"
|
|
||||||
echo " this can possibly break the installation. Just install it"
|
|
||||||
echo " manually after this installation/update, run the following"
|
|
||||||
echo " commands and restart KDE afterwards:"
|
|
||||||
echo " sudo chakra-config-updater"
|
|
||||||
echo " kbuildsycoca4"
|
|
||||||
echo " "
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
op=$1
|
|
||||||
shift
|
|
||||||
|
|
||||||
$op $*
|
|
||||||
@ -1,203 +0,0 @@
|
|||||||
Index: gui/mdwslider.h
|
|
||||||
===================================================================
|
|
||||||
--- kdemultimedia-4.7.95/kmix/gui/mdwslider.h (Revision 1270925)
|
|
||||||
+++ kdemultimedia-4.7.95/kmix/gui/mdwslider.h (Revision 1270926)
|
|
||||||
@@ -56,7 +56,7 @@
|
|
||||||
bool includePlayback, bool includeCapture,
|
|
||||||
bool small, Qt::Orientation,
|
|
||||||
QWidget* parent, ViewBase* view, ProfControl *pctl);
|
|
||||||
- ~MDWSlider() { }
|
|
||||||
+ virtual ~MDWSlider();
|
|
||||||
|
|
||||||
enum LabelType { LT_ALL, LT_FIRST_CAPTURE, LT_NONE };
|
|
||||||
void addActionToPopup( KAction *action );
|
|
||||||
Index: gui/viewbase.cpp
|
|
||||||
===================================================================
|
|
||||||
--- kdemultimedia-4.7.95/kmix/gui/viewbase.cpp (Revision 1270925)
|
|
||||||
+++ kdemultimedia-4.7.95/kmix/gui/viewbase.cpp (Revision 1270926)
|
|
||||||
@@ -128,13 +128,14 @@
|
|
||||||
// allow view to "polish" itself
|
|
||||||
constructionFinished();
|
|
||||||
|
|
||||||
- kDebug() << "CONNECT ViewBase count " << _mixers.size();
|
|
||||||
- foreach ( Mixer* mixer, _mixers )
|
|
||||||
- {
|
|
||||||
- kDebug(67100) << "CONNECT ViewBase controlschanged" << mixer->id();
|
|
||||||
- connect ( mixer, SIGNAL(controlChanged()), this, SLOT(refreshVolumeLevels()) );
|
|
||||||
- connect ( mixer, SIGNAL(controlsReconfigured(QString)), this, SLOT(controlsReconfigured(QString)) );
|
|
||||||
- }
|
|
||||||
+// Moved the following up one Level to KMixerWidget
|
|
||||||
+// kDebug() << "CONNECT ViewBase count " << _mixers.size();
|
|
||||||
+// foreach ( Mixer* mixer, _mixers )
|
|
||||||
+// {
|
|
||||||
+// kDebug(67100) << "CONNECT ViewBase controlschanged" << mixer->id();
|
|
||||||
+// connect ( mixer, SIGNAL(controlChanged()), this, SLOT(refreshVolumeLevels()) );
|
|
||||||
+// connect ( mixer, SIGNAL(controlsReconfigured(QString)), this, SLOT(controlsReconfigured(QString)) );
|
|
||||||
+// }
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -217,10 +218,6 @@
|
|
||||||
setMixSet();
|
|
||||||
kDebug(67100) << "ViewBase::controlsReconfigured() " << mixer_ID << ": Recreating widgets (mixset contains: " << _mixSet->count() << ")";
|
|
||||||
createDeviceWidgets();
|
|
||||||
-
|
|
||||||
- // We've done the low level stuff our selves but let elements
|
|
||||||
- // above know what has happened so they can reload config etc.
|
|
||||||
- emit redrawMixer(mixer_ID);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Index: gui/kmixerwidget.h
|
|
||||||
===================================================================
|
|
||||||
--- kdemultimedia-4.7.95/kmix/gui/kmixerwidget.h (Revision 1270925)
|
|
||||||
+++ kdemultimedia-4.7.95/kmix/gui/kmixerwidget.h (Revision 1270926)
|
|
||||||
@@ -75,6 +75,10 @@
|
|
||||||
void saveConfig( KConfig *config );
|
|
||||||
void loadConfig( KConfig *config );
|
|
||||||
|
|
||||||
+ private slots:
|
|
||||||
+ void controlsReconfiguredToplevel(QString mixerId);
|
|
||||||
+ void refreshVolumeLevelsToplevel();
|
|
||||||
+
|
|
||||||
private:
|
|
||||||
Mixer *_mixer;
|
|
||||||
QVBoxLayout *m_topLayout; // contains TabWidget
|
|
||||||
@@ -82,6 +86,7 @@
|
|
||||||
ProfTab* _tab;
|
|
||||||
std::vector<ViewBase*> _views;
|
|
||||||
KActionCollection* _actionCollection; // -<- applciations wide action collection
|
|
||||||
+ QWidget* _mainWindow;
|
|
||||||
|
|
||||||
|
|
||||||
void createLayout(ViewBase::ViewFlags vflags);
|
|
||||||
Index: gui/mixdevicewidget.h
|
|
||||||
===================================================================
|
|
||||||
--- kdemultimedia-4.7.95/kmix/gui/mixdevicewidget.h (Revision 1270925)
|
|
||||||
+++ kdemultimedia-4.7.95/kmix/gui/mixdevicewidget.h (Revision 1270926)
|
|
||||||
@@ -47,7 +47,7 @@
|
|
||||||
MixDeviceWidget( MixDevice* md,
|
|
||||||
bool small, Qt::Orientation orientation,
|
|
||||||
QWidget* parent, ViewBase*, ProfControl * );
|
|
||||||
- ~MixDeviceWidget();
|
|
||||||
+ virtual ~MixDeviceWidget();
|
|
||||||
|
|
||||||
void addActionToPopup( KAction *action );
|
|
||||||
|
|
||||||
Index: gui/mdwslider.cpp
|
|
||||||
===================================================================
|
|
||||||
--- kdemultimedia-4.7.95/kmix/gui/mdwslider.cpp (Revision 1270925)
|
|
||||||
+++ kdemultimedia-4.7.95/kmix/gui/mdwslider.cpp (Revision 1270926)
|
|
||||||
@@ -81,7 +81,25 @@
|
|
||||||
update();
|
|
||||||
}
|
|
||||||
|
|
||||||
+MDWSlider::~MDWSlider()
|
|
||||||
+{
|
|
||||||
+ foreach( QAbstractSlider* slider, m_slidersPlayback)
|
|
||||||
+ {
|
|
||||||
+ delete slider;
|
|
||||||
+ }
|
|
||||||
+ foreach( QAbstractSlider* slider, m_slidersCapture)
|
|
||||||
+ {
|
|
||||||
+ delete slider;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
+ /*
|
|
||||||
+ static int destructorCalls = 1;
|
|
||||||
+ kDebug() << "Destroying id=" << this->mixDevice()->id() << "desctructorCalls=" << destructorCalls;
|
|
||||||
+ ++destructorCalls;
|
|
||||||
+ */
|
|
||||||
+
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
void MDWSlider::createActions()
|
|
||||||
{
|
|
||||||
// create actions (on _mdwActions, see MixDeviceWidget)
|
|
||||||
Index: gui/kmixerwidget.cpp
|
|
||||||
===================================================================
|
|
||||||
--- kdemultimedia-4.7.95/kmix/gui/kmixerwidget.cpp (Revision 1270925)
|
|
||||||
+++ kdemultimedia-4.7.95/kmix/gui/kmixerwidget.cpp (Revision 1270926)
|
|
||||||
@@ -37,6 +37,7 @@
|
|
||||||
#include <ktabwidget.h>
|
|
||||||
|
|
||||||
// KMix
|
|
||||||
+#include "apps/kmix.h"
|
|
||||||
#include "gui/guiprofile.h"
|
|
||||||
#include "gui/kmixerwidget.h"
|
|
||||||
#include "gui/kmixtoolbox.h"
|
|
||||||
@@ -58,6 +59,8 @@
|
|
||||||
m_topLayout(0), _guiprof(guiprof),
|
|
||||||
_actionCollection(actionCollection)
|
|
||||||
{
|
|
||||||
+ _mainWindow = parent;
|
|
||||||
+ //kDebug() << "kmixWindow created: parent=" << parent << ", parentWidget()=" << parentWidget();
|
|
||||||
if ( _mixer )
|
|
||||||
{
|
|
||||||
createLayout(vflags);
|
|
||||||
@@ -126,13 +129,42 @@
|
|
||||||
connect( vbase, SIGNAL(toggleMenuBar()), parentWidget(), SLOT(toggleMenuBar()) );
|
|
||||||
// *this will be deleted on rebuildGUI(), so lets queue the signal
|
|
||||||
connect( vbase, SIGNAL(rebuildGUI()) , parentWidget(), SLOT(recreateGUIwithSavingView()), Qt::QueuedConnection );
|
|
||||||
- connect( vbase, SIGNAL(redrawMixer(QString)), parentWidget(), SLOT(redrawMixer(QString)), Qt::QueuedConnection );
|
|
||||||
+ //connect( vbase, SIGNAL(redrawMixer(QString)), parentWidget(), SLOT(redrawMixer(QString)), Qt::QueuedConnection );
|
|
||||||
+
|
|
||||||
+ kDebug() << "CONNECT ViewBase count " << vbase->getMixers().size();
|
|
||||||
+ foreach ( Mixer* mixer, vbase->getMixers() )
|
|
||||||
+ {
|
|
||||||
+ kDebug(67100) << "CONNECT ViewBase controlschanged" << mixer->id();
|
|
||||||
+ connect ( mixer, SIGNAL(controlChanged()), this, SLOT(refreshVolumeLevelsToplevel()) );
|
|
||||||
+ connect ( mixer, SIGNAL(controlsReconfigured(QString)), this, SLOT(controlsReconfiguredToplevel(QString)) );
|
|
||||||
+ }
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
+void KMixerWidget::controlsReconfiguredToplevel(QString mixerId)
|
|
||||||
+{
|
|
||||||
+ foreach ( ViewBase* vbase, _views)
|
|
||||||
+ {
|
|
||||||
+ vbase->controlsReconfigured(mixerId);
|
|
||||||
+ }
|
|
||||||
+ KMixWindow* kmixWindow = qobject_cast<KMixWindow*>(_mainWindow);
|
|
||||||
+ kDebug() << "kmixWindow to redraw: " << kmixWindow << ", not-casted=" << _mainWindow;
|
|
||||||
+ if (kmixWindow != 0)
|
|
||||||
+ {
|
|
||||||
+ kmixWindow->redrawMixer(mixerId);
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
|
|
||||||
+void KMixerWidget::refreshVolumeLevelsToplevel()
|
|
||||||
+{
|
|
||||||
+ foreach ( ViewBase* vbase, _views)
|
|
||||||
+ {
|
|
||||||
+ vbase->refreshVolumeLevels();
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
|
|
||||||
+
|
|
||||||
/**
|
|
||||||
* Returns the current View. Normally we have only one View, so we always return the first view.
|
|
||||||
* This method is only here for one reason: We can plug in an action in the main menu, so that
|
|
||||||
Index: gui/viewbase.h
|
|
||||||
===================================================================
|
|
||||||
--- kdemultimedia-4.7.95/kmix/gui/viewbase.h (Revision 1270925)
|
|
||||||
+++ kdemultimedia-4.7.95/kmix/gui/viewbase.h (Revision 1270926)
|
|
||||||
@@ -113,6 +113,8 @@
|
|
||||||
GUIProfile* guiProfile() { return _guiprof; };
|
|
||||||
KActionCollection* actionCollection() { return _actions; };
|
|
||||||
|
|
||||||
+ QSet<Mixer*>& getMixers() { return _mixers; };
|
|
||||||
+
|
|
||||||
/**
|
|
||||||
* Contains the widgets for the _mixSet. There is a 1:1 relationship, which means:
|
|
||||||
* _mdws[i] is the Widget for the MixDevice _mixSet[i] - please see ViewBase::createDeviceWidgets().
|
|
||||||
@@ -123,7 +125,7 @@
|
|
||||||
|
|
||||||
signals:
|
|
||||||
void rebuildGUI();
|
|
||||||
- void redrawMixer( const QString& mixer_ID );
|
|
||||||
+ //void redrawMixer( const QString& mixer_ID );
|
|
||||||
|
|
||||||
|
|
||||||
protected:
|
|
||||||
@ -1,19 +0,0 @@
|
|||||||
diff -Naur kdemultimedia-4.3.90.orig/mplayerthumbs/src/videopreview.cpp kdemultimedia-4.3.90/mplayerthumbs/src/videopreview.cpp
|
|
||||||
--- kdemultimedia-4.3.90.orig/mplayerthumbs/src/videopreview.cpp 2009-05-14 19:27:36.000000000 +0200
|
|
||||||
+++ kdemultimedia-4.3.90/mplayerthumbs/src/videopreview.cpp 2010-01-16 00:43:05.000000000 +0100
|
|
||||||
@@ -91,8 +91,13 @@
|
|
||||||
else
|
|
||||||
sprocket = QPixmap(KStandardDirs::locate( "data", "videothumbnail/sprocket-large.png" ));
|
|
||||||
|
|
||||||
- for (int y = 0; y < pix.height() + sprocket.height(); y += sprocket.height()) {
|
|
||||||
- painter.drawPixmap( 0, y, sprocket );
|
|
||||||
+// for (int y = 0; y < pix.height() + sprocket.height(); y += sprocket.height()) {
|
|
||||||
+// painter.drawPixmap( 0, y, sprocket );
|
|
||||||
+// }
|
|
||||||
+
|
|
||||||
+ for (int x = 0; x < pix.width() + sprocket.width(); x += sprocket.width()) {
|
|
||||||
+ painter.drawPixmap( x, 0, sprocket );
|
|
||||||
+ painter.drawPixmap( x, (pix.height() - sprocket.height()), sprocket );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// End of xine-artsplugin code
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 687 B |
Binary file not shown.
|
Before Width: | Height: | Size: 384 B |
Binary file not shown.
|
Before Width: | Height: | Size: 246 B |
Loading…
Reference in New Issue
Block a user