[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: extragear/multimedia/k3b/src/projects
From: Sebastian Trueg <sebastian () trueg ! de>
Date: 2006-08-21 10:13:35
Message-ID: 1156155215.404316.25974.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 575333 by trueg:
Drop the on-the-fly checkbox in favor of the new cache-image checkbox.
M +8 -8 k3baudioburndialog.cpp
M +1 -1 k3baudioburndialog.h
M +1 -1 k3bdataburndialog.cpp
M +1 -1 k3bdvdburndialog.cpp
M +8 -8 k3bmixedburndialog.cpp
M +1 -1 k3bmixedburndialog.h
M +1 -1 k3bmovixburndialog.cpp
M +1 -1 k3bmovixdvdburndialog.cpp
M +11 -11 k3bprojectburndialog.cpp
M +1 -1 k3bprojectburndialog.h
M +1 -1 k3bvcdburndialog.cpp
M +1 -1 k3bvideodvdburndialog.cpp
--- trunk/extragear/multimedia/k3b/src/projects/k3baudioburndialog.cpp #575332:575333
@@ -105,7 +105,7 @@
connect( m_writerSelectionWidget, SIGNAL(writingAppChanged(int)), this, \
SLOT(slotToggleAll()) ); connect( m_checkNormalize, SIGNAL(toggled(bool)), this, \
SLOT(slotNormalizeToggled(bool)) );
- connect( m_checkOnTheFly, SIGNAL(toggled(bool)), this, \
SLOT(slotOnTheFlyToggled(bool)) ); + connect( m_checkCacheImage, \
SIGNAL(toggled(bool)), this, SLOT(slotCacheImageToggled(bool)) ); connect( \
m_writingModeWidget, SIGNAL(writingModeChanged(int)), this, SLOT(slotToggleAll()) ); \
// ToolTips
@@ -251,10 +251,10 @@
m_cdtextWidget->setEnabled( !m_checkOnlyCreateImage->isChecked() );
}
- m_checkOnTheFly->setEnabled( !m_checkOnlyCreateImage->isChecked() &&
- onTheFly );
+ m_checkCacheImage->setEnabled( !m_checkOnlyCreateImage->isChecked() &&
+ onTheFly );
if( !onTheFly )
- m_checkOnTheFly->setChecked( false );
+ m_checkCacheImage->setChecked( true );
m_cdtextWidget->setEnabled( !m_checkOnlyCreateImage->isChecked() &&
cdText &&
m_writingModeWidget->writingMode() != K3b::TAO );
@@ -305,7 +305,7 @@
"use this functionality, please install it first.") );
m_checkNormalize->setChecked( false );
}
- else if( m_checkOnTheFly->isChecked() && !m_checkOnlyCreateImage->isChecked() ) \
{ + else if( !m_checkCacheImage->isChecked() && \
!m_checkOnlyCreateImage->isChecked() ) {
if( KMessageBox::warningYesNo( this, i18n("<p>K3b is not able to normalize \
audio tracks when burning on-the-fly. "
"The external program used for this task only supports normalizing a set "
"of audio files."),
@@ -315,13 +315,13 @@
"audioProjectNormalizeOrOnTheFly" ) == KMessageBox::Yes )
m_checkNormalize->setChecked( false );
else
- m_checkOnTheFly->setChecked( false );
+ m_checkCacheImage->setChecked( true );
}
}
}
-void K3bAudioBurnDialog::slotOnTheFlyToggled( bool on )
+void K3bAudioBurnDialog::slotCacheImageToggled( bool on )
{
if( on ) {
if( m_checkNormalize->isChecked() ) {
@@ -334,7 +334,7 @@
"audioProjectNormalizeOrOnTheFly" ) == KMessageBox::Yes )
m_checkNormalize->setChecked( false );
else
- m_checkOnTheFly->setChecked( false );
+ m_checkCacheImage->setChecked( false );
}
}
}
--- trunk/extragear/multimedia/k3b/src/projects/k3baudioburndialog.h #575332:575333
@@ -61,7 +61,7 @@
* Reimplemented for internal reasons (shut down the audio player)
*/
void slotStartClicked();
- void slotOnTheFlyToggled( bool on );
+ void slotCacheImageToggled( bool on );
void slotNormalizeToggled( bool on );
private:
--- trunk/extragear/multimedia/k3b/src/projects/k3bdataburndialog.cpp #575332:575333
@@ -180,7 +180,7 @@
void K3bDataBurnDialog::slotStartClicked()
{
if( m_checkOnlyCreateImage->isChecked() ||
- !m_checkOnTheFly->isChecked() ) {
+ m_checkCacheImage->isChecked() ) {
QFileInfo fi( m_tempDirSelectionWidget->tempPath() );
if( fi.isDir() )
m_tempDirSelectionWidget->setTempPath( fi.filePath() + "/image.iso" );
--- trunk/extragear/multimedia/k3b/src/projects/k3bdvdburndialog.cpp #575332:575333
@@ -292,7 +292,7 @@
void K3bDvdBurnDialog::slotStartClicked()
{
if( m_checkOnlyCreateImage->isChecked() ||
- !m_checkOnTheFly->isChecked() ) {
+ m_checkCacheImage->isChecked() ) {
QFileInfo fi( m_tempDirSelectionWidget->tempPath() );
if( fi.isDir() )
m_tempDirSelectionWidget->setTempPath( fi.filePath() + "/image.iso" );
--- trunk/extragear/multimedia/k3b/src/projects/k3bmixedburndialog.cpp #575332:575333
@@ -92,7 +92,7 @@
m_optionGroupLayout->addItem( spacer );
connect( m_checkNormalize, SIGNAL(toggled(bool)), this, \
SLOT(slotNormalizeToggled(bool)) );
- connect( m_checkOnTheFly, SIGNAL(toggled(bool)), this, \
SLOT(slotOnTheFlyToggled(bool)) ); + connect( m_checkCacheImage, \
SIGNAL(toggled(bool)), this, SLOT(slotCacheImageToggled(bool)) ); connect( \
m_writerSelectionWidget, SIGNAL(writingAppChanged(int)), this, SLOT(slotToggleAll()) \
); connect( m_writingModeWidget, SIGNAL(writingModeChanged(int)), this, \
SLOT(slotToggleAll()) ); }
@@ -337,10 +337,10 @@
cdText = cdrecordCdText;
}
- m_checkOnTheFly->setEnabled( !m_checkOnlyCreateImage->isChecked() &&
- onTheFly );
+ m_checkCacheImage->setEnabled( !m_checkOnlyCreateImage->isChecked() &&
+ onTheFly );
if( !onTheFly )
- m_checkOnTheFly->setChecked( false );
+ m_checkCacheImage->setChecked( true );
m_cdtextWidget->setEnabled( !m_checkOnlyCreateImage->isChecked() &&
cdText &&
@@ -361,7 +361,7 @@
"use this functionality, please install it first.") );
m_checkNormalize->setChecked( false );
}
- else if( m_checkOnTheFly->isChecked() && !m_checkOnlyCreateImage->isChecked() ) \
{ + else if( !m_checkCacheImage->isChecked() && \
!m_checkOnlyCreateImage->isChecked() ) {
if( KMessageBox::warningYesNo( this, i18n("<p>K3b is not able to normalize \
audio tracks when burning on-the-fly. "
"The external program used for this task only supports normalizing a set "
"of audio files."),
@@ -371,13 +371,13 @@
"audioProjectNormalizeOrOnTheFly" ) == KMessageBox::Yes )
m_checkNormalize->setChecked( false );
else
- m_checkOnTheFly->setChecked( false );
+ m_checkCacheImage->setChecked( true );
}
}
}
-void K3bMixedBurnDialog::slotOnTheFlyToggled( bool on )
+void K3bMixedBurnDialog::slotCacheImageToggled( bool on )
{
if( on ) {
if( m_checkNormalize->isChecked() ) {
@@ -390,7 +390,7 @@
"audioProjectNormalizeOrOnTheFly" ) == KMessageBox::Yes )
m_checkNormalize->setChecked( false );
else
- m_checkOnTheFly->setChecked( false );
+ m_checkCacheImage->setChecked( true );
}
}
}
--- trunk/extragear/multimedia/k3b/src/projects/k3bmixedburndialog.h #575332:575333
@@ -60,7 +60,7 @@
void saveSettings();
void readSettings();
- void slotOnTheFlyToggled( bool on );
+ void slotCacheImageToggled( bool on );
void slotNormalizeToggled( bool on );
private:
--- trunk/extragear/multimedia/k3b/src/projects/k3bmovixburndialog.cpp #575332:575333
@@ -229,7 +229,7 @@
void K3bMovixBurnDialog::slotStartClicked()
{
if( m_checkOnlyCreateImage->isChecked() ||
- !m_checkOnTheFly->isChecked() ) {
+ m_checkCacheImage->isChecked() ) {
QFileInfo fi( m_tempDirSelectionWidget->tempPath() );
if( fi.isDir() )
m_tempDirSelectionWidget->setTempPath( fi.filePath() + "/image.iso" );
--- trunk/extragear/multimedia/k3b/src/projects/k3bmovixdvdburndialog.cpp \
#575332:575333 @@ -188,7 +188,7 @@
void K3bMovixDvdBurnDialog::slotStartClicked()
{
if( m_checkOnlyCreateImage->isChecked() ||
- !m_checkOnTheFly->isChecked() ) {
+ m_checkCacheImage->isChecked() ) {
QFileInfo fi( m_tempDirSelectionWidget->tempPath() );
if( fi.isDir() )
m_tempDirSelectionWidget->setTempPath( fi.filePath() + "/image.iso" );
--- trunk/extragear/multimedia/k3b/src/projects/k3bprojectburndialog.cpp \
#575332:575333 @@ -126,13 +126,13 @@
m_writingModeWidget->setDisabled( m_checkOnlyCreateImage->isChecked() );
m_checkSimulate->setDisabled( m_checkOnlyCreateImage->isChecked() );
- m_checkOnTheFly->setDisabled( m_checkOnlyCreateImage->isChecked() );
- m_checkRemoveBufferFiles->setDisabled( m_checkOnlyCreateImage->isChecked() || \
m_checkOnTheFly->isChecked() ); + m_checkCacheImage->setDisabled( \
m_checkOnlyCreateImage->isChecked() ); + m_checkRemoveBufferFiles->setDisabled( \
m_checkOnlyCreateImage->isChecked() || !m_checkCacheImage->isChecked() ); if( \
m_checkOnlyCreateImage->isChecked() ) { m_checkRemoveBufferFiles->setChecked(false);
m_buttonStart->setDisabled(false);
}
- m_tempDirSelectionWidget->setDisabled( m_checkOnTheFly->isChecked() && \
!m_checkOnlyCreateImage->isChecked() ); + m_tempDirSelectionWidget->setDisabled( \
!m_checkCacheImage->isChecked() && !m_checkOnlyCreateImage->isChecked() ); \
m_writerSelectionWidget->setDisabled( m_checkOnlyCreateImage->isChecked() ); \
m_spinCopies->setDisabled( m_checkSimulate->isChecked() || \
m_checkOnlyCreateImage->isChecked() );
@@ -254,13 +254,13 @@
m_optionGroupLayout->setSpacing( KDialog::spacingHint() );
// add the options
- m_checkOnTheFly = K3bStdGuiItems::onTheFlyCheckbox( m_optionGroup );
+ m_checkCacheImage = K3bStdGuiItems::createCacheImageCheckbox( m_optionGroup );
m_checkSimulate = K3bStdGuiItems::simulateCheckbox( m_optionGroup );
m_checkRemoveBufferFiles = K3bStdGuiItems::removeImagesCheckbox( m_optionGroup );
m_checkOnlyCreateImage = K3bStdGuiItems::onlyCreateImagesCheckbox( m_optionGroup \
);
m_optionGroupLayout->addWidget(m_checkSimulate);
- m_optionGroupLayout->addWidget(m_checkOnTheFly);
+ m_optionGroupLayout->addWidget(m_checkCacheImage);
m_optionGroupLayout->addWidget(m_checkOnlyCreateImage);
m_optionGroupLayout->addWidget(m_checkRemoveBufferFiles);
@@ -304,7 +304,7 @@
connect( m_writerSelectionWidget, SIGNAL(writerChanged(K3bDevice::Device*)),
m_writingModeWidget, SLOT(determineSupportedModesFromMedium(K3bDevice::Device*)) \
); connect( m_writerSelectionWidget, SIGNAL(writingAppChanged(int)), this, \
SLOT(slotWritingAppChanged(int)) );
- connect( m_checkOnTheFly, SIGNAL(toggled(bool)), this, SLOT(slotToggleAll()) );
+ connect( m_checkCacheImage, SIGNAL(toggled(bool)), this, SLOT(slotToggleAll()) );
connect( m_checkSimulate, SIGNAL(toggled(bool)), this, SLOT(slotToggleAll()) );
connect( m_checkOnlyCreateImage, SIGNAL(toggled(bool)), this, \
SLOT(slotToggleAll()) ); connect( m_writingModeWidget, \
SIGNAL(writingModeChanged(int)), this, SLOT(slotToggleAll()) ); @@ -320,7 +320,7 @@
void K3bProjectBurnDialog::saveSettings()
{
m_doc->setDummy( m_checkSimulate->isChecked() );
- m_doc->setOnTheFly( m_checkOnTheFly->isChecked() );
+ m_doc->setOnTheFly( !m_checkCacheImage->isChecked() );
m_doc->setOnlyCreateImages( m_checkOnlyCreateImage->isChecked() );
m_doc->setRemoveImages( m_checkRemoveBufferFiles->isChecked() );
m_doc->setSpeed( m_writerSelectionWidget->writerSpeed() );
@@ -334,7 +334,7 @@
void K3bProjectBurnDialog::readSettings()
{
m_checkSimulate->setChecked( doc()->dummy() );
- m_checkOnTheFly->setChecked( doc()->onTheFly() );
+ m_checkCacheImage->setChecked( !doc()->onTheFly() );
m_checkOnlyCreateImage->setChecked( m_doc->onlyCreateImages() );
m_checkRemoveBufferFiles->setChecked( m_doc->removeImages() );
m_writingModeWidget->setWritingMode( doc()->writingMode() );
@@ -349,7 +349,7 @@
{
m_writingModeWidget->saveConfig( c );
c->writeEntry( "simulate", m_checkSimulate->isChecked() );
- c->writeEntry( "on_the_fly", m_checkOnTheFly->isChecked() );
+ c->writeEntry( "on_the_fly", !m_checkCacheImage->isChecked() );
c->writeEntry( "remove_image", m_checkRemoveBufferFiles->isChecked() );
c->writeEntry( "only_create_image", m_checkOnlyCreateImage->isChecked() );
@@ -362,7 +362,7 @@
{
m_writingModeWidget->loadConfig( c );
m_checkSimulate->setChecked( c->readBoolEntry( "simulate", false ) );
- m_checkOnTheFly->setChecked( c->readBoolEntry( "on_the_fly", true ) );
+ m_checkCacheImage->setChecked( !c->readBoolEntry( "on_the_fly", true ) );
m_checkRemoveBufferFiles->setChecked( c->readBoolEntry( "remove_image", true ) );
m_checkOnlyCreateImage->setChecked( c->readBoolEntry( "only_create_image", false ) \
);
@@ -376,7 +376,7 @@
m_writerSelectionWidget->loadDefaults();
m_writingModeWidget->setWritingMode( K3b::WRITING_MODE_AUTO );
m_checkSimulate->setChecked( false );
- m_checkOnTheFly->setChecked( true );
+ m_checkCacheImage->setChecked( false );
m_checkRemoveBufferFiles->setChecked( true );
m_checkOnlyCreateImage->setChecked( false );
--- trunk/extragear/multimedia/k3b/src/projects/k3bprojectburndialog.h #575332:575333
@@ -175,7 +175,7 @@
K3bWritingModeWidget* m_writingModeWidget;
QGroupBox* m_optionGroup;
QVBoxLayout* m_optionGroupLayout;
- QCheckBox* m_checkOnTheFly;
+ QCheckBox* m_checkCacheImage;
QCheckBox* m_checkSimulate;
QCheckBox* m_checkRemoveBufferFiles;
QCheckBox* m_checkOnlyCreateImage;
--- trunk/extragear/multimedia/k3b/src/projects/k3bvcdburndialog.cpp #575332:575333
@@ -77,7 +77,7 @@
else
m_writerSelectionWidget->setSupportedWritingApps( K3b::CDRDAO );
- m_checkOnTheFly->hide();
+ m_checkCacheImage->hide();
QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, \
QSizePolicy::Expanding ); m_optionGroupLayout->addItem( spacer );
--- trunk/extragear/multimedia/k3b/src/projects/k3bvideodvdburndialog.cpp \
#575332:575333 @@ -163,7 +163,7 @@
void K3bVideoDvdBurnDialog::slotStartClicked()
{
if( m_checkOnlyCreateImage->isChecked() ||
- !m_checkOnTheFly->isChecked() ) {
+ m_checkCacheImage->isChecked() ) {
QFileInfo fi( m_tempDirSelectionWidget->tempPath() );
if( fi.isDir() )
m_tempDirSelectionWidget->setTempPath( fi.filePath() + "/image.iso" );
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic