Mailinglist Archive: opensuse-commit (858 mails)

< Previous Next >
commit kdemultimedia4
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Fri, 02 Nov 2007 12:05:15 +0100
  • Message-id: <20071102110515.DE676678182@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package kdemultimedia4
checked in at Fri Nov 2 12:05:15 CET 2007.

--------
--- KDE/kdemultimedia4/kdemultimedia4.changes 2007-10-26 13:34:05.000000000
+0200
+++ /mounts/work_src_done/STABLE/kdemultimedia4/kdemultimedia4.changes
2007-11-01 12:21:08.000000000 +0100
@@ -1,0 +2,5 @@
+Thu Nov 1 12:21:08 CET 2007 - dmueller@xxxxxxx
+
+- update to 3.95.1
+
+-------------------------------------------------------------------

Old:
----
kdemultimedia-3.95.0.tar.bz2

New:
----
kdemultimedia-3.95.1.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kdemultimedia4.spec ++++++
--- /var/tmp/diff_new_pack.P18153/_old 2007-11-02 12:05:01.000000000 +0100
+++ /var/tmp/diff_new_pack.P18153/_new 2007-11-02 12:05:01.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdemultimedia4 (Version 3.95.0)
+# spec file for package kdemultimedia4 (Version 3.95.1)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -17,9 +17,9 @@
Group: System/GUI/KDE
Summary: kdemultimedia base package
Url: http://www.kde.org
-Version: 3.95.0
+Version: 3.95.1
Release: 1
-%define rversion 3.95.0
+%define rversion 3.95.1
Source0: kdemultimedia-%rversion.tar.bz2
Source1: _upstream
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -389,6 +389,8 @@
%_kde_share_dir/config.kcfg/libkcddb.kcfg
%_kde_share_dir/services/libkcddb.desktop
%changelog
+* Thu Nov 01 2007 - dmueller@xxxxxxx
+- update to 3.95.1
* Fri Oct 26 2007 - dmueller@xxxxxxx
- update to KDE 4.0 beta4
* Sat Oct 20 2007 - dmueller@xxxxxxx

++++++ kdemultimedia-3.95.0.tar.bz2 -> kdemultimedia-3.95.1.tar.bz2 ++++++
Files old/kdemultimedia-3.95.0/doc/juk/index.cache.bz2 and
new/kdemultimedia-3.95.1/doc/juk/index.cache.bz2 differ
Files old/kdemultimedia-3.95.0/doc/kmix/index.cache.bz2 and
new/kdemultimedia-3.95.1/doc/kmix/index.cache.bz2 differ
Files old/kdemultimedia-3.95.0/doc/kscd/index.cache.bz2 and
new/kdemultimedia-3.95.1/doc/kscd/index.cache.bz2 differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdemultimedia-3.95.0/juk/juk.cpp
new/kdemultimedia-3.95.1/juk/juk.cpp
--- old/kdemultimedia-3.95.0/juk/juk.cpp 2007-08-29 11:56:43.000000000
+0200
+++ new/kdemultimedia-3.95.1/juk/juk.cpp 2007-10-31 21:42:30.000000000
+0100
@@ -134,7 +134,6 @@

void JuK::setupActions()
{
- ActionCollection::actions()->setAssociatedWidget(this);
KActionCollection *collection = ActionCollection::actions();

// Setup KDE standard actions that JuK uses.
@@ -275,6 +274,8 @@

m_sliderAction = new SliderAction(i18n("Track Position"), this);
collection->addAction("trackPositionAction", m_sliderAction);
+
+ ActionCollection::actions()->associateWidget(this);
}

void JuK::setupSystemTray()
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdemultimedia-3.95.0/kmix/dialogviewconfiguration.cpp
new/kdemultimedia-3.95.1/kmix/dialogviewconfiguration.cpp
--- old/kdemultimedia-3.95.0/kmix/dialogviewconfiguration.cpp 2007-06-27
12:59:22.000000000 +0200
+++ new/kdemultimedia-3.95.1/kmix/dialogviewconfiguration.cpp 2007-10-31
21:42:33.000000000 +0100
@@ -58,7 +58,7 @@
mdName.replace('&', "&&"); // Quoting the '&' needed, to prevent
QCheckBox creating an accelerator
QCheckBox* cb = new QCheckBox( mdName, frame );
_qEnabledCB.append(cb);
- cb->setChecked( !mdw->isDisabled() ); //mdw->isVisible() );
+ cb->setChecked( mdw->isVisible() );
_layout->addWidget(cb);
}
} // for all MDW's
@@ -84,10 +84,10 @@
if ( qw->inherits("MixDeviceWidget") ) {
MixDeviceWidget *mdw = static_cast<MixDeviceWidget*>(qw);
if ( cb->isChecked() ) {
- mdw->setDisabled(false);
+ mdw->show();
}
else {
- mdw->setDisabled(true);
+ mdw->hide();
}
}
} // for all MDW's
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdemultimedia-3.95.0/kmix/guiprofile.cpp
new/kdemultimedia-3.95.1/kmix/guiprofile.cpp
--- old/kdemultimedia-3.95.0/kmix/guiprofile.cpp 2007-06-27
12:59:22.000000000 +0200
+++ new/kdemultimedia-3.95.1/kmix/guiprofile.cpp 2007-10-31
21:42:33.000000000 +0100
@@ -471,7 +471,7 @@
}
else {
// delimiter found
- result.first = pairString.mid(0,delimPos); // check this
!!!
+ result.first = pairString.mid(0,delimPos);
result.second = pairString.left(delimPos+1);
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdemultimedia-3.95.0/kmix/kmixapplet.desktop
new/kdemultimedia-3.95.1/kmix/kmixapplet.desktop
--- old/kdemultimedia-3.95.0/kmix/kmixapplet.desktop 2007-10-23
10:39:36.000000000 +0200
+++ new/kdemultimedia-3.95.1/kmix/kmixapplet.desktop 2007-10-31
21:42:33.000000000 +0100
@@ -78,6 +78,7 @@
Comment[pt_BR]=Mostra e permite que você controle os volumes do som
Comment[sv]=Visar och låter dig ändra ljudvolym
Comment[th]=แสดงและอนุญาตให้คุณควบคุมระดับเสียง
+Comment[uk]=Показує і дає можливість керувати гучністю звуку
Comment[x-test]=xxShows and let you control sound volumesxx
Comment[zh_CN]=显示和控制音量
Comment[zh_TW]=顯示並讓您控制音量
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdemultimedia-3.95.0/kmix/kmix.cpp
new/kdemultimedia-3.95.1/kmix/kmix.cpp
--- old/kdemultimedia-3.95.0/kmix/kmix.cpp 2007-10-16 16:50:29.000000000
+0200
+++ new/kdemultimedia-3.95.1/kmix/kmix.cpp 2007-10-31 21:42:33.000000000
+0100
@@ -67,7 +67,6 @@
m_isVisible (false), // initialize, as we don't trigger a hideEvent()
m_visibilityUpdateAllowed( true ),
m_multiDriverMode (false), // -<- I never-ever want the multi-drivermode to
be activated by accident
- m_surroundView (false), // -<- Also the experimental surround View (3D)
m_dockWidget()
{
setObjectName("KMixWindow");
@@ -206,10 +205,10 @@
}

// @todo basically this should be moved in the views later (e.g. KDE4.2 ?)
- if ( m_toplevelOrientation == Qt::Vertical )
- config.writeEntry( "Orientation","Vertical" );
- else
+ if ( m_toplevelOrientation == Qt::Horizontal )
config.writeEntry( "Orientation","Horizontal" );
+ else
+ config.writeEntry( "Orientation","Vertical" );
}

void KMixWindow::saveViewConfig()
@@ -270,17 +269,16 @@
kDebug(67100) << "MultiDriver a = " << m_multiDriverMode;
m_multiDriverMode = config.readEntry("MultiDriver", false);
kDebug(67100) << "MultiDriver b = " << m_multiDriverMode;
- m_surroundView = config.readEntry("Experimental-ViewSurround", false );
- const QString& orientationString = config.readEntry("Orientation",
"Horizontal");
+ const QString& orientationString = config.readEntry("Orientation",
"Vertical");
QString mixerMasterCard = config.readEntry( "MasterMixer", "" );
QString masterDev = config.readEntry( "MasterMixerDevice", "" );
Mixer::setGlobalMaster(mixerMasterCard, masterDev);


- if ( orientationString == "Vertical" )
- m_toplevelOrientation = Qt::Vertical;
+ if ( orientationString == "Horizontal" )
+ m_toplevelOrientation = Qt::Horizontal;
else
- m_toplevelOrientation = Qt::Horizontal;
+ m_toplevelOrientation = Qt::Vertical;

// show/hide menu bar
bool showMenubar = config.readEntry("Menubar", true);
@@ -336,7 +334,7 @@
addMixerWidget(mixer->id());
}
bool dockingSucceded = updateDocking();
- if( !dockingSucceded )
+ if( !dockingSucceded && Mixer::mixers().count() > 0 )
show(); // avoid invisible and unaccessible main window
}
else {
@@ -382,9 +380,6 @@
if ( m_showMenubar ) {
vflags |= ViewBase::MenuBarVisible;
}
- if ( m_surroundView ) {
- vflags |= ViewBase::Experimental_SurroundView;
- }
if ( m_toplevelOrientation == Qt::Vertical ) {
vflags |= ViewBase::Horizontal;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdemultimedia-3.95.0/kmix/kmixdockwidget.cpp
new/kdemultimedia-3.95.1/kmix/kmixdockwidget.cpp
--- old/kdemultimedia-3.95.0/kmix/kmixdockwidget.cpp 2007-10-26
11:05:41.000000000 +0200
+++ new/kdemultimedia-3.95.1/kmix/kmixdockwidget.cpp 2007-10-31
21:42:33.000000000 +0100
@@ -232,9 +232,9 @@
// Pixmap must be changed => do so
switch ( newPixmapType ) {
case 'e': setIcon( loadIcon( "kmixdocked_error" ) ); break;
- case 'm': setIcon( loadIcon( "kmixdocked_mute" ) ); break;
- case '1': setIcon( loadIcon( "kmixdocked_mute" ) ); break; // @todo
- case '2': setIcon( loadIcon( "kmixdocked_error" ) ); break; // @todo
+ case 'm': setIcon( loadIcon( "audio-volume-muted" ) ); break;
+ case '1': setIcon( loadIcon( "audio-volume-low" ) ); break; // @todo
+ case '2': setIcon( loadIcon( "audio-volume-medium" ) ); break; //
@todo
case '3': setIcon( loadIcon( "audio-volume-high" ) ); break;
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdemultimedia-3.95.0/kmix/kmixerwidget.cpp
new/kdemultimedia-3.95.1/kmix/kmixerwidget.cpp
--- old/kdemultimedia-3.95.0/kmix/kmixerwidget.cpp 2007-10-25
11:35:04.000000000 +0200
+++ new/kdemultimedia-3.95.1/kmix/kmixerwidget.cpp 2007-10-31
21:42:33.000000000 +0100
@@ -23,6 +23,7 @@
#include <QLabel>
#include <QLayout>
#include <qpixmap.h>
+#include <QRegExp>
#include <qslider.h>
#include <QString>
#include <qtoolbutton.h>
@@ -118,7 +119,7 @@
createViewsByProfile(_mixer, guiprof, vflags);


- // *** Lower part: Slider and Mixer Name
************************************************
+ // *** Lower part: Balance s
************************************************
QHBoxLayout *balanceAndDetail = new QHBoxLayout();
m_topLayout->addItem( balanceAndDetail );
balanceAndDetail->setObjectName( "balanceAndDetail" );
@@ -136,32 +137,14 @@
m_balanceSlider->setMinimumSize( m_balanceSlider->sizeHint() );
m_balanceSlider->setFixedHeight( m_balanceSlider->sizeHint().height() );

-/*
- QLabel *mixerName = new QLabel(this );
- mixerName->setObjectName("mixerName");
- mixerName->setText( _mixer->readableName() );
- mixerName->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
-*/
-
// 10 Pixels at the front; Balance-Slider; Mixer-Name; 10 Pixels at the end
balanceAndDetail->addSpacing( 10 );
balanceAndDetail->addWidget( m_balanceSlider );
-// balanceAndDetail->addWidget( mixerName );
balanceAndDetail->addSpacing( 10 );

connect( m_balanceSlider, SIGNAL(valueChanged(int)), this,
SLOT(balanceChanged(int)) );
m_balanceSlider->setToolTip( i18n("Left/Right balancing") );

- /* @todo : update all Background Pixmaps
- const QPixmap bgPixmap = UserIcon("bg_speaker");
- setBackgroundPixmap ( bgPixmap );
- const std::vector<ViewBase*>::const_iterator viewsEnd = _views.end();
- for ( std::vector<ViewBase*>::const_iterator it = _views.begin(); it !=
viewsEnd; ++it) {
- ViewBase* view = *it;
- view->setBackgroundPixmap ( bgPixmap );
- } // for all Views
- */
-
show();
// kDebug(67100) << "KMixerWidget::createLayout(): EXIT\n";
}
@@ -212,6 +195,7 @@
vbase->createDeviceWidgets();
//vbase->show();
m_topLayout->addWidget(vbase);
+ _views.push_back(vbase);

/*
QString finalTabName;
@@ -264,6 +248,7 @@
*/
void KMixerWidget::loadConfig( KConfig *config, const QString &grp )
{
+ kDebug(67100) << "KMixToolBox::loadConfig()";
#ifdef __GNUC__
#warning port to KConfigGroup. see also comments in KMixToolBox --ossi
#endif
@@ -271,6 +256,7 @@

const std::vector<ViewBase*>::const_iterator viewsEnd = _views.end();
for ( std::vector<ViewBase*>::const_iterator it = _views.begin(); it !=
viewsEnd; ++it) {
+ kDebug(67100) << "KMixToolBox::loadConfig() view";
ViewBase* view = *it;
KMixToolBox::loadView(view,config);
KMixToolBox::loadKeys(view,config);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdemultimedia-3.95.0/kmix/kmix.h
new/kdemultimedia-3.95.1/kmix/kmix.h
--- old/kdemultimedia-3.95.0/kmix/kmix.h 2007-06-27 12:59:22.000000000
+0200
+++ new/kdemultimedia-3.95.1/kmix/kmix.h 2007-10-31 21:42:33.000000000
+0100
@@ -107,7 +107,6 @@
bool m_isVisible;
bool m_visibilityUpdateAllowed;
bool m_multiDriverMode; // Not officially supported.
- bool m_surroundView; // Experimental. Off by defualt
Qt::Orientation m_toplevelOrientation;

KTabWidget *m_wsMixers;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdemultimedia-3.95.0/kmix/kmixtoolbox.cpp
new/kdemultimedia-3.95.1/kmix/kmixtoolbox.cpp
--- old/kdemultimedia-3.95.0/kmix/kmixtoolbox.cpp 2007-10-08
09:42:18.000000000 +0200
+++ new/kdemultimedia-3.95.1/kmix/kmixtoolbox.cpp 2007-10-31
21:42:33.000000000 +0100
@@ -28,6 +28,7 @@
#include <kglobalaccel.h>
#include <klocale.h>

+#include "guiprofile.h"
#include "mdwslider.h"
#include "mixdevicewidget.h"
#include "mixdevice.h"
@@ -93,7 +94,35 @@
bool splitChannels = devcg.readEntry("Split", false);
mdw->setStereoLinked( !splitChannels );
}
- mdw->setDisabled( !devcg.readEntry("Show", true) );
+
+ bool mdwEnabled = false;
+ if ( devcg.hasKey("Show") )
+ {
+ mdwEnabled = ( true == devcg.readEntry("Show", true) );
+ kDebug(67100) << "KMixToolBox::loadView() for" << devgrp << "from
config-file: mdwEnabled==" << mdwEnabled;
+ }
+ else
+ {
+ // if not configured in config file, use the default from the
profile
+ GUIProfile::ControlSet cset = (view->guiProfile()->_controls);
+ for ( std::vector<ProfControl*>::const_iterator it =
cset.begin(); it != cset.end(); ++it)
+ {
+ ProfControl* pControl = *it;
+ QRegExp idRegExp(pControl->id);
+ kDebug(67100) << "KMixToolBox::loadView() try match " <<
(*pControl).id << " for " << mdw->mixDevice()->id();
+ if ( mdw->mixDevice()->id().contains(idRegExp) ) {
+ if ( pControl->show == "simple" )
+ {
+ mdwEnabled = true;
+ kDebug(67100) << "KMixToolBox::loadView() for" << devgrp
<< "from profile: mdwEnabled==" << mdwEnabled;
+ }
+ break;
+ }
+ }
+ }
+ kDebug(67100) << "KMixToolBox::loadView() for" << devgrp << "FINAL:
mdwEnabled==" << mdwEnabled;
+ //mdw->setEnabled(mdwEnabled); // I have no idea why
dialogselectmaster works with "enabled" instead of "visible"
+ if (!mdwEnabled) { mdw->hide(); } else { mdw->show(); }

} // inherits MixDeviceWidget
} // for all MDW's
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdemultimedia-3.95.0/kmix/main.cpp
new/kdemultimedia-3.95.1/kmix/main.cpp
--- old/kdemultimedia-3.95.0/kmix/main.cpp 2007-07-26 12:45:22.000000000
+0200
+++ new/kdemultimedia-3.95.1/kmix/main.cpp 2007-10-31 21:42:33.000000000
+0100
@@ -35,7 +35,7 @@
{
KAboutData aboutData( "kmix", 0, ki18n("KMix"),
APP_VERSION, ki18n(description),
KAboutData::License_GPL,
- ki18n("(c) 1996-2000 Christian Esken\n(c) 2000-2003
Christian Esken, Stefan Schimanski\n(c) 2002-2005 Christian Esken, Helio
Chissini de Castro"));
+ ki18n("(c) 1996-2007 Christian Esken\n(c) 2000-2003
Stefan Schimanski\n(c) 2002-2005 Helio Chissini de Castro"));

aboutData.addAuthor(ki18n("Christian Esken"), ki18n("Current maintainer"),
"esken@xxxxxxx");
aboutData.addAuthor(ki18n("Helio Chissini de Castro"),
ki18n("Co-maintainer, Alsa 0.9x port"), "helio@xxxxxxx" );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdemultimedia-3.95.0/kmix/mdwslider.cpp
new/kdemultimedia-3.95.1/kmix/mdwslider.cpp
--- old/kdemultimedia-3.95.0/kmix/mdwslider.cpp 2007-06-27 12:59:22.000000000
+0200
+++ new/kdemultimedia-3.95.1/kmix/mdwslider.cpp 2007-10-31 21:42:33.000000000
+0100
@@ -34,6 +34,7 @@
#include <qtoolbutton.h>
#include <QObject>
#include <qcursor.h>
+#include <QCheckBox>
#include <QMouseEvent>
#include <qslider.h>
#include <QLabel>
@@ -64,7 +65,7 @@
bool small, Qt::Orientation orientation,
QWidget* parent, ViewBase* mw) :
MixDeviceWidget(md,small,orientation,parent,mw),
- m_linked(true), m_iconLabel( 0 ), m_iconLabelSimple(0), m_recordLED( 0 ),
m_label( 0 ), _layout(0)
+ m_linked(true), m_iconLabelSimple(0), m_recordLED( 0 ), m_label( 0 ),
_layout(0), m_qcb(0)
{
// create actions (on _mdwActions, see MixDeviceWidget)

@@ -168,22 +169,16 @@
QBoxLayout *labelLayout;
if ( _orientation == Qt::Vertical ) {
labelLayout = new QVBoxLayout( );
- slidersLayout->addItem( labelLayout );
labelLayout->setAlignment(Qt::AlignHCenter);
+ m_label = new VerticalText( this,
m_mixdevice->readableName().toUtf8().data() );
}
else {
labelLayout = new QHBoxLayout();
- slidersLayout->addItem( labelLayout );
labelLayout->setAlignment(Qt::AlignVCenter);
- }
- if ( _orientation == Qt::Vertical ) {
- m_label = new VerticalText( this,
m_mixdevice->readableName().toUtf8().data() );
- }
- else {
m_label = new QLabel(this);
static_cast<QLabel*>(m_label) ->setText(m_mixdevice->readableName());
}
-
+ slidersLayout->addItem( labelLayout );
m_label->hide();

labelLayout->addWidget( m_label );
@@ -202,31 +197,39 @@

slidersLayout->addItem( sliLayout );
// --- ICON ----------------------------
- QBoxLayout *iconLayout;
+ QBoxLayout *iconLayout, *iconInternalLayout;
if ( _orientation == Qt::Vertical ) {
- iconLayout = new QVBoxLayout( );
- iconLayout->setAlignment(Qt::AlignCenter);
+ iconLayout = new QHBoxLayout( );
+ iconInternalLayout = new QVBoxLayout( );
}
else {
- iconLayout = new QHBoxLayout( );
- iconLayout->setAlignment(Qt::AlignCenter);
+ iconLayout = new QVBoxLayout( );
+ iconInternalLayout = new QHBoxLayout( );
}
+ iconLayout->setAlignment(Qt::AlignCenter);
+ iconInternalLayout->setAlignment(Qt::AlignCenter);
+ iconLayout->addItem(iconInternalLayout);
sliLayout->addItem( iconLayout );
- iconLayout->setSizeConstraint(QLayout::SetFixedSize);
+ //iconLayout->setSizeConstraint(QLayout::SetFixedSize);

- m_iconLabel = 0;
m_iconLabelSimple = 0L;
if ( showMuteLED ) {
+ kDebug(67100) << ">>> MixDevice " << m_mixdevice->readableName() << "
icon calculation:" << endl;
setIcon( m_mixdevice->type() );
- QWidget* theLabel = m_iconLabel!=0 ? (QWidget*)m_iconLabel :
(QWidget*)m_iconLabelSimple;
- iconLayout->addWidget( theLabel );
+ iconInternalLayout->addWidget( m_iconLabelSimple );
+ QString muteTip( m_mixdevice->readableName() );
+ m_iconLabelSimple->setToolTip( muteTip );
if ( m_mixdevice->playbackVolume().hasSwitch() ) {
- QString muteTip( i18n( "Mute/Unmute %1", m_mixdevice->readableName()
) );
- theLabel->setToolTip( muteTip );
+ iconInternalLayout->addSpacing( 3 );
+ m_qcb = new QCheckBox(this);
+ iconInternalLayout->addWidget( m_qcb );
+ m_qcb->installEventFilter(this);
+ connect ( m_qcb, SIGNAL( toggled(bool) ), this, SLOT(toggleMuted() )
);
+ QString muteTip2( i18n( "Mute/Unmute %1", m_mixdevice->readableName()
) );
+ m_qcb->setToolTip( muteTip2 );
} // can be muted
else {
- QString muteTip( m_mixdevice->readableName() );
- theLabel->setToolTip( muteTip );
+ //
} // cannot be muted

sliLayout->addSpacing( 3 );
@@ -251,7 +254,7 @@
if ( m_mixdevice->captureVolume().count() > 0 )
addSliders( volLayout, 'c' );
if ( m_mixdevice->playbackVolume().count() == 0 &&
m_mixdevice->captureVolume().count() == 0 )
- { // no siders => put a label with the name.
+ { // no sliders => put a label with the name.
// But I won't add " (capture)" as on the sliders, because there is only
one "column"
if ( _orientation == Qt::Vertical ) {
m_label = new VerticalText( this, m_mixdevice->readableName() );
@@ -300,8 +303,7 @@
// !! possibly not necessary any more (we are layouted)
QWidget *qw = new QWidget(this );
qw->setObjectName( "Spacer" );
- qw->setFixedSize( QSize(16, 16) );
- reclayout->addWidget(qw);
+ qw->setFixedSize( QSize(16, 16) ); reclayout->addWidget(qw);
qw->installEventFilter( this );
} // has no Record LED
} // showRecordLED
@@ -389,16 +391,16 @@
QPixmap miniDevPM;
switch (icontype) {
case MixDevice::AUDIO:
- miniDevPM = UserIcon("mix_audio"); break;
+ miniDevPM = KIconLoader::global()->loadIcon( "mix_audio",
KIconLoader::Small, KIconLoader::SizeSmallMedium ); break;
case MixDevice::BASS:
case MixDevice::SURROUND_LFE: // "LFE" SHOULD have an own icon
miniDevPM = UserIcon("mix_bass"); break;
case MixDevice::CD:
miniDevPM = UserIcon("mix_cd"); break;
case MixDevice::EXTERNAL:
- miniDevPM = UserIcon("mix_ext"); break;
+ miniDevPM = KIconLoader::global()->loadIcon( "audio-input-line",
KIconLoader::Small, KIconLoader::SizeMedium ); break;
case MixDevice::MICROPHONE:
- miniDevPM = UserIcon("mix_microphone");break;
+ miniDevPM = UserIcon("audio-input-microphone");break;
case MixDevice::MIDI:
miniDevPM = UserIcon("mix_midi"); break;
case MixDevice::RECMONITOR:
@@ -417,7 +419,7 @@
case MixDevice::SURROUND_CENTERBACK:
miniDevPM = UserIcon("mix_surround"); break;
case MixDevice::HEADPHONE:
- miniDevPM = UserIcon( "mix_headphone" ); break;
+ miniDevPM = KIconLoader::global()->loadIcon( "audio-headset",
KIconLoader::Small, KIconLoader::SizeSmallMedium ); break;
case MixDevice::DIGITAL:
miniDevPM = UserIcon( "mix_digital" ); break;
case MixDevice::AC97:
@@ -432,25 +434,12 @@
void
MDWSlider::setIcon( int icontype )
{
- if( m_mixdevice->playbackVolume().hasSwitch() ) {
- if( !m_iconLabel )
- {
- m_iconLabel = new QToolButton(this);
- connect ( m_iconLabel, SIGNAL( toggled(bool) ), this,
SLOT(toggleMuted() ) );
- m_iconLabel->setCheckable(true);
- installEventFilter( m_iconLabel );
- }
- } // has playback switch
- else {
- if( !m_iconLabelSimple )
- {
+ if( !m_iconLabelSimple )
+ {
m_iconLabelSimple = new QLabel(this);
installEventFilter( m_iconLabelSimple );
- }
}

-
-
QPixmap miniDevPM = icon( icontype );
if ( !miniDevPM.isNull() )
{
@@ -459,29 +448,16 @@
// scale icon
QMatrix t;
t = t.scale( 10.0/miniDevPM.width(), 10.0/miniDevPM.height() );
- if ( m_iconLabel ) {
- m_iconLabel->setIcon( miniDevPM.transformed( t ) );
- m_iconLabel->resize( 10, 10 );
- }
- else{
- m_iconLabelSimple->setPixmap( miniDevPM.transformed( t ) );
- m_iconLabelSimple->resize( 10, 10 );
- }
+ m_iconLabelSimple->setPixmap( miniDevPM.transformed( t ) );
+ m_iconLabelSimple->resize( 10, 10 );
} // small size
else
{
- if ( m_iconLabel ) {
- QIcon icon(miniDevPM);
- icon.addPixmap( miniDevPM, QIcon::Normal, QIcon::On ) ;
- QPixmap pixmapOff = icon.pixmap(miniDevPM.size(), QIcon::Disabled,
QIcon::Off);
- icon.addPixmap( pixmapOff, QIcon::Normal, QIcon::Off );
- m_iconLabel->setIcon( icon );
- }
- else {
m_iconLabelSimple->setPixmap( miniDevPM );
- }
+ kDebug(67100) << " > simple > icontype=" <<icontype<< "size=" <<
miniDevPM.size() << endl;
} // normal size
- } else
+ }
+ else
{
kError(67100) << "Pixmap missing." << endl;
}
@@ -601,13 +577,12 @@
void
MDWSlider::setIcons(bool value)
{
- QWidget* theLabel = m_iconLabel!=0 ? (QWidget*)m_iconLabel :
(QWidget*)m_iconLabelSimple;
- if ( theLabel != 0 ) {
- if ( ( !theLabel->isHidden()) !=value ) {
+ if ( m_iconLabelSimple != 0 ) {
+ if ( ( ! m_iconLabelSimple->isHidden()) !=value ) {
if (value)
- theLabel->show();
+ m_iconLabelSimple->show();
else
- theLabel->hide();
+ m_iconLabelSimple->hide();

layout()->activate();
}
@@ -847,10 +822,16 @@


// update mute
- if( m_iconLabel != 0 ) {
- m_iconLabel->blockSignals( true );
- m_iconLabel->setChecked( !m_mixdevice->isMuted() );
- m_iconLabel->blockSignals( false );
+
+ if( m_iconLabelSimple != 0 ) {
+/*
+ m_iconLabelSimple->blockSignals( true );
+ m_iconLabelSimple->setChecked( !m_mixdevice->isMuted() );
+ m_iconLabelSimple->blockSignals( false );
+*/
+ m_qcb->blockSignals( true );
+ m_qcb->setChecked( m_mixdevice->isMuted() );
+ m_qcb->blockSignals( false );
}

// update recsrc
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdemultimedia-3.95.0/kmix/mdwslider.h
new/kdemultimedia-3.95.1/kmix/mdwslider.h
--- old/kdemultimedia-3.95.0/kmix/mdwslider.h 2007-06-27 12:59:22.000000000
+0200
+++ new/kdemultimedia-3.95.1/kmix/mdwslider.h 2007-10-31 21:42:33.000000000
+0100
@@ -23,6 +23,7 @@
#ifndef MDWSLIDER_H
#define MDWSLIDER_H

+#include <QCheckBox>
#include <QList>
#include <QWidget>
#include <qlist.h>
@@ -109,11 +110,11 @@


bool m_linked;
- QToolButton *m_iconLabel;
QLabel *m_iconLabelSimple;
KLedButton *m_recordLED;
QWidget *m_label; // is either QLabel or VerticalText
QBoxLayout *_layout;
+ QCheckBox* m_qcb;
QList<QWidget *> m_slidersPlayback;
QList<QWidget *> m_slidersCapture;
QList<Volume::ChannelID> _slidersChidsPlayback;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdemultimedia-3.95.0/kmix/profiles/ALSA.default.xml
new/kdemultimedia-3.95.1/kmix/profiles/ALSA.default.xml
--- old/kdemultimedia-3.95.0/kmix/profiles/ALSA.default.xml 2007-06-27
12:59:21.000000000 +0200
+++ new/kdemultimedia-3.95.1/kmix/profiles/ALSA.default.xml 2007-10-31
21:42:33.000000000 +0100
@@ -6,7 +6,7 @@
version="*:*"
name="*"
type="*"
- generation="1"
+ generation="2"

<!-- Example from above:
Driver : ALSA, Versions 1.2.5 and newer.
@@ -82,17 +82,20 @@
<control id="CD:1" controls="*" tab="Play" show="extended" />
-->

-<control id="^Master:0$" tab="Base" name="Front"/>
-<control id="^Surround:0$" tab="Base" />
-<control id="^Center:0$" tab="Base" />
-<control id="^LFE:0$" tab="Base" />
-<control id="^PCM:0$" tab="Base" />
-<control id="^CD:0$" tab="Base" />
-<control id="^Headphone:0$" tab="Base" />
-<control id="^DAC:0$" tab="Base" />
+<control id="^Master:0$" tab="Base" name="Front" show="simple" />
+<control id="^Surround:0$" tab="Base" show="simple"/>
+<control id="^Center:0$" tab="Base" show="simple"/>
+<control id="^LFE:0$" tab="Base" show="simple"/>
+<control id="^PCM:0$" tab="Base" show="simple"/>
+<control id="^CD:0$" tab="Base" show="simple"/>
+<control id="^Headphone:0$" tab="Base" show="simple"/>
+<control id="^DAC:0$" tab="Base" show="simple"/>
+<control id="^ADC:0$" tab="Base" show="simple"/>

-<control id="^.*$" tab="All" show="extended" />

+<!--
+<control id="^.*$" tab="Base" show="extended" />
+-->

<!-- Define the type of the used tabs: We need this, for knowing how the
controls should be layouted -->
<!--
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdemultimedia-3.95.0/kmix/viewbase.h
new/kdemultimedia-3.95.1/kmix/viewbase.h
--- old/kdemultimedia-3.95.0/kmix/viewbase.h 2007-06-27 12:59:22.000000000
+0200
+++ new/kdemultimedia-3.95.1/kmix/viewbase.h 2007-10-31 21:42:33.000000000
+0100
@@ -52,9 +52,7 @@
HasMenuBar = 0x0001,
MenuBarVisible = 0x0002,
Horizontal = 0x0004,
- Vertical = 0x0008,
- // Experimental flags
- Experimental_SurroundView = 0x1000
+ Vertical = 0x0008
};

ViewBase(QWidget* parent, const char* id, Mixer* mixer, Qt::WFlags=0,
ViewFlags vflags=0, GUIProfile *guiprof=0, KActionCollection* actionCollection
= 0);
@@ -97,6 +95,7 @@
void setIcons(bool on);
void setLabels(bool on);
void setTicks(bool on);
+ GUIProfile* guiProfile() { return _guiprof; };

/**
* Contains the widgets for the _mixSet. There is a 1:1 relationship,
which means:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdemultimedia-3.95.0/kmix/viewsliders.cpp
new/kdemultimedia-3.95.1/kmix/viewsliders.cpp
--- old/kdemultimedia-3.95.0/kmix/viewsliders.cpp 2007-06-27
12:59:22.000000000 +0200
+++ new/kdemultimedia-3.95.1/kmix/viewsliders.cpp 2007-10-31
21:42:33.000000000 +0100
@@ -39,9 +39,8 @@


/**
- * Don't instanciate objects of this class directly. It won't work
- * correctly because init() does not get called.
- * See ViewInput and ViewOutput for "real" implementations.
+ * Generic View implementation. This can hold now all kinds of controls (not
just Sliders, as
+ * the class name suggests).
*/
ViewSliders::ViewSliders(QWidget* parent, const char* name, Mixer* mixer,
ViewBase::ViewFlags vflags, GUIProfile *guiprof, KActionCollection *actColl)
: ViewBase(parent, name, mixer, Qt::FramelessWindowHint, vflags,
guiprof, actColl)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdemultimedia-3.95.0/kmix/viewsliderset.cpp
new/kdemultimedia-3.95.1/kmix/viewsliderset.cpp
--- old/kdemultimedia-3.95.0/kmix/viewsliderset.cpp 2007-06-27
12:59:22.000000000 +0200
+++ new/kdemultimedia-3.95.1/kmix/viewsliderset.cpp 2007-10-31
21:42:33.000000000 +0100
@@ -29,6 +29,7 @@
#include <QWidget>


+// Obsolete. See class ViewSliders instead.
ViewSliderSet::ViewSliderSet(QWidget* parent, const char* name, Mixer* mixer,
ViewBase::ViewFlags vflags, GUIProfile *guiprof, KActionCollection*
actionCollection)
: ViewSliders(parent, name, mixer, vflags, guiprof, actionCollection)
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdemultimedia-3.95.0/kscd/kscd.cpp
new/kdemultimedia-3.95.1/kscd/kscd.cpp
--- old/kdemultimedia-3.95.0/kscd/kscd.cpp 2007-10-03 13:47:39.000000000
+0200
+++ new/kdemultimedia-3.95.1/kscd/kscd.cpp 2007-10-31 21:42:30.000000000
+0100
@@ -30,6 +30,7 @@

#include <config-alsa.h>

+
#include <QCloseEvent>
#include <QKeyEvent>
#include <QEvent>
@@ -71,7 +72,7 @@
updateTime(true),
m_dockWidget(0)
{
- QDBusConnection::sessionBus().registerObject("/CDPlayer", this);
+ QDBusConnection::sessionBus().registerObject("/CDPlayer", this,
QDBusConnection::ExportScriptableSlots);
setupUi(this);
m_cd = new KCompactDisc();
cddbInfo.clear(); // The first freedb revision is "0" //!!!!
@@ -528,6 +529,7 @@
"device '%1'(%2), audio system '%3'",
Prefs::cdDevice(),
KCompactDisc::urlToDevice(Prefs::cdDevice()), audioSystem);
KMessageBox::error(this, str, i18n("Error"));
+
} else {
kDebug(67000) << "Vendor: " << m_cd->deviceVendor();
kDebug(67000) << "Model: " << m_cd->deviceModel();
@@ -747,7 +749,9 @@
{
// Some sanity provisions to ensure that the number of records matches
what
// the CD actually contains.
+
Q_ASSERT(info.numberOfTracks() == cddbInfo.numberOfTracks());
+
cddbInfo = info;
populateSongList();
restoreArtistLabel();
@@ -1220,7 +1224,6 @@
KUniqueApplication a;

KSCD *k = new KSCD();
- QDBusConnection::sessionBus().registerObject("/CDPlayer", k);

a.setTopWidget( k );
a.setMainWidget( k );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdemultimedia-3.95.0/kscd/kscd.h
new/kdemultimedia-3.95.1/kscd/kscd.h
--- old/kdemultimedia-3.95.0/kscd/kscd.h 2007-08-29 11:56:43.000000000
+0200
+++ new/kdemultimedia-3.95.1/kscd/kscd.h 2007-10-31 21:42:30.000000000
+0100
@@ -1,7 +1,7 @@
/*
Kscd - A simple cd player for the KDE Project

- $Id: kscd.h 699677 2007-08-13 21:25:58Z kernalex $
+ $Id: kscd.h 730252 2007-10-28 09:29:37Z bouchikhi $

Copyright (c) 1997 Bernd Johannes Wuebben <wuebben@xxxxxxxxxxxxxxxx>
Copyright (c) 2002 Aaron J. Seigo <aseigo@xxxxxxx>
@@ -72,7 +72,7 @@
Q_OBJECT
Q_CLASSINFO("D-Bus Interface", "org.kde.KSCD")

-public Q_SLOTS:
+public /*Q_SLOTS*/slots:
Q_SCRIPTABLE bool playing();
Q_SCRIPTABLE void play() { playClicked(); }
Q_SCRIPTABLE void stop() { stopClicked(); }
@@ -98,7 +98,7 @@
Q_SCRIPTABLE int getStatus();
Q_SCRIPTABLE QString currentTrackTitle();
Q_SCRIPTABLE QString currentAlbum();
- Q_SCRIPTABLE QString currentArtist();
+ Q_SCRIPTABLE QString currentArtist();
Q_SCRIPTABLE QStringList trackList();

public:



++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread