(cherry picked from commit 21705d1b06)
v3.5.13-sru
Darrell Anderson 13 years ago committed by Slávek Banko
parent 5a7e011a32
commit faf875647b

@ -8250,7 +8250,7 @@ v 0.1.3-beta1 - 2006-11-29
* [r598395] metadataedit/exifphoto.cpp: * [r598395] metadataedit/exifphoto.cpp:
kipiplugins from trunk : MetadataEdit plugin: Exif photo kipiplugins from trunk : MetadataEdit plugin: Exif photo
informations editor: add Focal Lenght In 35mm Film settings informations editor: add Focal Length In 35mm Film settings
CCBUGS: 103255 CCBUGS: 103255

@ -8376,7 +8376,7 @@ v 0.1.3-beta1 - 2006-11-29
* [r598395] metadataedit/exifphoto.cpp: * [r598395] metadataedit/exifphoto.cpp:
kipiplugins from trunk : MetadataEdit plugin: Exif photo kipiplugins from trunk : MetadataEdit plugin: Exif photo
informations editor: add Focal Lenght In 35mm Film settings informations editor: add Focal Length In 35mm Film settings
CCBUGS: 103255 CCBUGS: 103255

@ -190,7 +190,7 @@ void EffectImagesDialog::slotOptionsClicked(void)
if ( Type == 10) // Wave if ( Type == 10) // Wave
{ {
optionsDialog->m_waveAmplitude->setValue(m_waveAmplitude); optionsDialog->m_waveAmplitude->setValue(m_waveAmplitude);
optionsDialog->m_waveLenght->setValue(m_waveLenght); optionsDialog->m_waveLength->setValue(m_waveLength);
} }
if ( optionsDialog->exec() == KMessageBox::Ok ) if ( optionsDialog->exec() == KMessageBox::Ok )
@ -241,7 +241,7 @@ void EffectImagesDialog::slotOptionsClicked(void)
if ( Type == 10) // Wave if ( Type == 10) // Wave
{ {
m_waveAmplitude = optionsDialog->m_waveAmplitude->value(); m_waveAmplitude = optionsDialog->m_waveAmplitude->value();
m_waveLenght = optionsDialog->m_waveLenght->value(); m_waveLength = optionsDialog->m_waveLength->value();
} }
} }
@ -270,7 +270,7 @@ m_config = new KConfig("kipirc");
m_spreadRadius = m_config->readNumEntry("SpreadRadius", 3); m_spreadRadius = m_config->readNumEntry("SpreadRadius", 3);
m_swirlDegrees = m_config->readNumEntry("SwirlDegrees", 45); m_swirlDegrees = m_config->readNumEntry("SwirlDegrees", 45);
m_waveAmplitude = m_config->readNumEntry("WaveAmplitude", 50); m_waveAmplitude = m_config->readNumEntry("WaveAmplitude", 50);
m_waveLenght = m_config->readNumEntry("WaveLenght", 100); m_waveLength = m_config->readNumEntry("WaveLength", 100);
if (m_config->readEntry("SmallPreview", "true") == "true") if (m_config->readEntry("SmallPreview", "true") == "true")
m_smallPreview->setChecked( true ); m_smallPreview->setChecked( true );
@ -311,7 +311,7 @@ void EffectImagesDialog::saveSettings(void)
m_config->writeEntry("SpreadRadius", m_spreadRadius); m_config->writeEntry("SpreadRadius", m_spreadRadius);
m_config->writeEntry("SwirlDegrees", m_swirlDegrees); m_config->writeEntry("SwirlDegrees", m_swirlDegrees);
m_config->writeEntry("WaveAmplitude", m_waveAmplitude); m_config->writeEntry("WaveAmplitude", m_waveAmplitude);
m_config->writeEntry("WaveLenght", m_waveLenght); m_config->writeEntry("WaveLength", m_waveLength);
m_config->writeEntry("SmallPreview", m_smallPreview->isChecked()); m_config->writeEntry("SmallPreview", m_smallPreview->isChecked());
m_config->writeEntry("OverWriteMode", m_overWriteMode->currentItem()); m_config->writeEntry("OverWriteMode", m_overWriteMode->currentItem());
@ -423,7 +423,7 @@ TQString EffectImagesDialog::makeProcess(KProcess* proc, BatchProcessImagesItem
*proc << "-wave"; *proc << "-wave";
TQString Temp, Temp2; TQString Temp, Temp2;
Temp2 = Temp.setNum( m_waveAmplitude ) + "x"; Temp2 = Temp.setNum( m_waveAmplitude ) + "x";
Temp2.append ( Temp.setNum( m_waveLenght ) ); Temp2.append ( Temp.setNum( m_waveLength ) );
*proc << Temp2; *proc << Temp2;
} }

@ -66,7 +66,7 @@ Q_OBJECT
int m_spreadRadius; int m_spreadRadius;
int m_swirlDegrees; int m_swirlDegrees;
int m_waveAmplitude; int m_waveAmplitude;
int m_waveLenght; int m_waveLength;
TQString makeProcess(KProcess* proc, BatchProcessImagesItem *item, TQString makeProcess(KProcess* proc, BatchProcessImagesItem *item,
const TQString& albumDest, bool previewMode); const TQString& albumDest, bool previewMode);

@ -239,14 +239,14 @@ EffectOptionsDialog::EffectOptionsDialog(TQWidget *parent, int EffectType)
m_label_waveAmplitude->setBuddy( m_waveAmplitude ); m_label_waveAmplitude->setBuddy( m_waveAmplitude );
dvlay->addWidget( m_waveAmplitude ); dvlay->addWidget( m_waveAmplitude );
TQLabel *m_label_waveLenght = new TQLabel (i18n("Length:"), box); TQLabel *m_label_waveLength = new TQLabel (i18n("Length:"), box);
dvlay->addWidget( m_label_waveLenght ); dvlay->addWidget( m_label_waveLength );
m_waveLenght = new KIntNumInput(100, box); m_waveLength = new KIntNumInput(100, box);
m_waveLenght->setRange(0, 200, 1, true ); m_waveLength->setRange(0, 200, 1, true );
TQWhatsThis::add( m_waveLenght, i18n("<p>Select here the value which represents the wave length " TQWhatsThis::add( m_waveLength, i18n("<p>Select here the value which represents the wave length "
"of the sine wave.") ); "of the sine wave.") );
m_label_waveLenght->setBuddy( m_waveLenght ); m_label_waveLength->setBuddy( m_waveLength );
dvlay->addWidget( m_waveLenght ); dvlay->addWidget( m_waveLength );
} }
} }

@ -71,7 +71,7 @@ Q_OBJECT
KIntNumInput *m_swirlDegrees; KIntNumInput *m_swirlDegrees;
KIntNumInput *m_waveAmplitude; KIntNumInput *m_waveAmplitude;
KIntNumInput *m_waveLenght; KIntNumInput *m_waveLength;
}; };
} // NameSpace KIPIBatchProcessImagesPlugin } // NameSpace KIPIBatchProcessImagesPlugin

@ -532,7 +532,7 @@ void SlideShow::printProgress()
TQString progress(TQString::number(m_fileIndex+1) + "/" + TQString::number(m_fileList.count())); TQString progress(TQString::number(m_fileIndex+1) + "/" + TQString::number(m_fileList.count()));
int stringLenght = p.fontMetrics().width(progress) * progress.length(); int stringLength = p.fontMetrics().width(progress) * progress.length();
p.setPen(TQColor("black")); p.setPen(TQColor("black"));
for (int x=9; x<=11; x++) for (int x=9; x<=11; x++)
@ -540,7 +540,7 @@ void SlideShow::printProgress()
p.drawText(x, height()-y, progress); p.drawText(x, height()-y, progress);
p.setPen(TQColor("white")); p.setPen(TQColor("white"));
p.drawText(width() - stringLenght - 10, 20, progress); p.drawText(width() - stringLength - 10, 20, progress);
} }
EffectMethod SlideShow::getRandomEffect() EffectMethod SlideShow::getRandomEffect()

@ -166,7 +166,7 @@ private:
EffectMethod m_effect; EffectMethod m_effect;
bool m_effectRunning; bool m_effectRunning;
int m_commentsLinesLenght; int m_commentsLinesLength;
// values for state of various effects: // values for state of various effects:
int m_x, m_y, m_w, m_h, m_dx, m_dy, m_ix, m_iy, m_i, m_j, m_subType; int m_x, m_y, m_w, m_h, m_dx, m_dy, m_ix, m_iy, m_i, m_j, m_subType;

@ -609,7 +609,7 @@ void SlideShowGL::printProgress(TQImage& layer)
TQPainter p(&pix); TQPainter p(&pix);
int stringLenght = p.fontMetrics().width(progress) * progress.length(); int stringLength = p.fontMetrics().width(progress) * progress.length();
p.setPen(TQt::white); p.setPen(TQt::white);
p.setFont(fn); p.setFont(fn);
@ -617,7 +617,7 @@ void SlideShowGL::printProgress(TQImage& layer)
p.end(); p.end();
TQImage textimage(pix.convertToImage()); TQImage textimage(pix.convertToImage());
KImageEffect::blendOnLower(m_width - stringLenght - 10, KImageEffect::blendOnLower(m_width - stringLength - 10,
20,textimage,layer); 20,textimage,layer);
} }

Loading…
Cancel
Save