[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdemultimedia/kmix
From: Christian Esken <esken () kde ! org>
Date: 2006-02-24 23:23:57
Message-ID: 1140823437.763123.2778.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 513318 by esken:
Correct authors/credits.
Examples:
there is no NAS support => remove NAS backend author
emu10k1 supporting patch including design changes => add author
M +0 -1 KMixApp.cpp
M +2 -2 guiprofile.cpp
M +0 -4 kmix-platforms.cpp
M +0 -1 kmix.cpp
M +0 -1 kmixdockwidget.cpp
M +12 -0 kmixerwidget.cpp
M +11 -11 main.cpp
M +1 -1 mixertoolbox.cpp
--- trunk/KDE/kdemultimedia/kmix/KMixApp.cpp #513317:513318
@@ -3,7 +3,6 @@
*
* Copyright (C) 2000 Stefan Schimanski <schimmi@kde.org>
* Copyright (C) 2001 Preston Brown <pbrown@kde.org>
- * Copyright (C) 2003 Sven Leiber <s.leiber@web.de>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
--- trunk/KDE/kdemultimedia/kmix/guiprofile.cpp #513317:513318
@@ -41,7 +41,7 @@
* We reach this point, if vendor and product name is identical.
* Actually we don't care about the order then, so we decide that "p1" comes \
first.
*
- * (Hint: As this is a set comparator, the return value doesn't matter that
+ * (Hint: As this is a set comparator, the return value HERE doesn't matter that
* much. But if we would decide later to change this Comparator to be a Map \
Comparator,
* we must NOT return a "0" for identity - this would lead to non-insertion on \
insert())
*/
@@ -120,7 +120,7 @@
control->tab = tab->name;
}
} // Step (3)
- //std::cout << "Consistent Profile: " << *this;
+ std::cout << "Consistent Profile: " << *this;
} // Read OK
else {
--- trunk/KDE/kdemultimedia/kmix/kmix-platforms.cpp #513317:513318
@@ -92,10 +92,6 @@
MixerFactory g_mixerFactories[] = {
-#if defined(NAS_MIXER)
- { NAS_getMixer, 0 },
-#endif
-
#if defined(SUN_MIXER)
{ SUN_getMixer, SUN_getDriverName },
#endif
--- trunk/KDE/kdemultimedia/kmix/kmix.cpp #513317:513318
@@ -3,7 +3,6 @@
*
* Copyright (C) 2000 Stefan Schimanski <schimmi@kde.org>
* Copyright (C) 2001 Preston Brown <pbrown@kde.org>
- * Copyright (C) 2003 Sven Leiber <s.leiber@web.de>
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
--- trunk/KDE/kdemultimedia/kmix/kmixdockwidget.cpp #513317:513318
@@ -4,7 +4,6 @@
*
* Copyright (C) 2000 Stefan Schimanski <1Stein@gmx.de>
* Copyright (C) 2001 Preston Brown <pbrown@kde.org>
- * Copyright (C) 2003 Sven Leiber <s.leiber@web.de>
* Copyright (C) 2004 Christian Esken <esken@kde.org>
*
* This program is free software; you can redistribute it and/or
--- trunk/KDE/kdemultimedia/kmix/kmixerwidget.cpp #513317:513318
@@ -113,6 +113,8 @@
// Create tabs of input + output + [...]
m_ioTab = new KTabWidget( this);
m_ioTab->setObjectName( "ioTab" );
+
+
QToolButton* m_profileButton = new QToolButton( m_ioTab );
QToolTip::add(m_profileButton,i18n("Click for selecting the next profile.\nClick \
and hold for profile menu.")); m_profileButton->setIconSet( SmallIcon( "tab_new" ) \
); @@ -120,6 +122,15 @@
// !!! m_profileButton->setPopup( m_tabbarSessionsCommands );
connect(m_profileButton, SIGNAL(clicked()), SLOT(newSession()));
m_ioTab->setCornerWidget( m_profileButton, Qt::BottomLeftCorner );
+
+ QToolButton* m_closeButton = new QToolButton( m_ioTab );
+ QToolTip::add(m_closeButton,i18n("Close Tab"));
+ m_closeButton->setIconSet( SmallIcon( "tab_remove" ) );
+ m_closeButton->adjustSize();
+ connect(m_closeButton, SIGNAL(clicked()), SLOT(removeSession()));
+ m_ioTab->setCornerWidget( m_closeButton, Qt::TopRightCorner );
+
+
m_profileButton->installEventFilter(this);
m_topLayout->add( m_ioTab );
@@ -160,6 +171,7 @@
QLabel *mixerName = new QLabel(this, "mixerName");
mixerName->setText( _mixer->mixerName() );
+ mixerName->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
balanceAndDetail->addSpacing( 10 );
--- trunk/KDE/kdemultimedia/kmix/main.cpp #513317:513318
@@ -45,18 +45,18 @@
I18N_NOOP("(c) 1996-2000 Christian Esken\n(c) 2000-2003 \
Christian Esken, Stefan Schimanski\n(c) 2002-2005 Christian Esken, Helio Chissini de \
Castro"));
aboutData.addAuthor("Christian Esken", "Current maintainer", "esken@kde.org");
- aboutData.addAuthor("Helio Chissini de Castro", I18N_NOOP("Current redesign and \
co-maintainer, Alsa 0.9x port"), "helio@kde.org" );
- aboutData.addAuthor("Stefan Schimanski", 0, "schimmi@kde.org");
- aboutData.addAuthor("Sven Leiber", 0, "s.leiber@web.de");
- aboutData.addAuthor("Brian Hanson", I18N_NOOP("Solaris port"), \
"bhanson@hotmail.com");
- aboutData.addAuthor("Paul Kendall", I18N_NOOP("SGI Port"), "paul@orion.co.nz");
- aboutData.addAuthor("Sebestyen Zoltan", I18N_NOOP("*BSD fixes"), \
"szoli@digo.inf.elte.hu");
- aboutData.addAuthor("Lennart Augustsson", I18N_NOOP("*BSD fixes"), \
"augustss@cs.chalmers.se");
- aboutData.addAuthor("Nick Lopez", I18N_NOOP("ALSA port"), "kimo_sabe@usa.net");
- aboutData.addAuthor("Helge Deller", I18N_NOOP("HP/UX port"), "deller@gmx.de");
- aboutData.addAuthor("Jean Labrousse", I18N_NOOP("NAS port"), \
"jean.labrousse@alcatel.com" );
- aboutData.addCredit("Nadeem Hasan", I18N_NOOP("Mute and volume preview, other \
fixes"), "nhasan@kde.org"); + aboutData.addAuthor("Helio Chissini de Castro", \
I18N_NOOP("Co-maintainer, Alsa 0.9x port"), "helio@kde.org" ); + \
aboutData.addAuthor("Stefan Schimanski" , 0, "schimmi@kde.org"); + \
aboutData.addAuthor("Brian Hanson" , I18N_NOOP("Solaris port"), \
"bhanson@hotmail.com"); + aboutData.addAuthor("Paul Kendall" , I18N_NOOP("SGI \
Port"), "paul@orion.co.nz"); + aboutData.addAuthor("Helge Deller" , \
I18N_NOOP("HP/UX port"), "deller@gmx.de");
+ aboutData.addCredit("Erwin Mascher" , I18N_NOOP("Improving support for \
emu10k1 based soundcards"), ""); + aboutData.addCredit("Sebestyen Zoltan" , \
I18N_NOOP("*BSD fixes"), "szoli@digo.inf.elte.hu"); + aboutData.addCredit("Lennart \
Augustsson", I18N_NOOP("*BSD fixes"), "augustss@cs.chalmers.se"); + \
aboutData.addCredit("Nick Lopez" , I18N_NOOP("ALSA port"), \
"kimo_sabe@usa.net"); + aboutData.addCredit("Nadeem Hasan" , I18N_NOOP("Mute \
and volume preview, other fixes"), "nhasan@kde.org"); +
KCmdLineArgs::init( argc, argv, &aboutData );
KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
KUniqueApplication::addCmdLineOptions();
--- trunk/KDE/kdemultimedia/kmix/mixertoolbox.cpp #513317:513318
@@ -255,7 +255,7 @@
// (2) Evaluate the soundcard specific profile (the code is quite similar to the \
upper one // Here we could also start a while loop over all matching filenames, \
e.g.: "<driverName>.<cardName>*.xml"
- // But for now wie will just check one filename: "<driverName>.<cardName>.xml" \
(note the missing '*') + // But for now we will just check one filename: \
"<driverName>.<cardName>.xml" (note the missing '*') QString \
mixerNameSpacesToUnderscores = mixer->mixerName(); \
mixerNameSpacesToUnderscores.replace(" ","_"); fileName = fileNamePrefix + \
mixerNameSpacesToUnderscores + ".xml";
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic