Merge remote-tracking branch 'origin/KDE/4.10'

wilder-work
Montel Laurent 13 years ago
commit 670f1ad7bd
  1. 7
      archivefolderdialog.cpp
  2. 2
      archivefolderdialog.h

@ -102,6 +102,8 @@ ArchiveFolderDialog::ArchiveFolderDialog( QWidget *parent )
fileNameLabel->setBuddy( mUrlRequester );
connect( mUrlRequester, SIGNAL(urlSelected(KUrl)),
this, SLOT(slotFixFileExtension()) );
connect( mUrlRequester, SIGNAL(textChanged(QString)),
this, SLOT(slotUrlChanged(QString)) );
mainLayout->addWidget( mUrlRequester, row, 1 );
row++;
@ -213,4 +215,9 @@ void ArchiveFolderDialog::slotFixFileExtension()
mUrlRequester->setUrl( fileName );
}
void ArchiveFolderDialog::slotUrlChanged(const QString &url)
{
enableButtonOk(!url.isEmpty());
}
#include "archivefolderdialog.moc"

@ -24,6 +24,7 @@
class QCheckBox;
class KUrlRequester;
class KComboBox;
class KUrl;
namespace Akonadi
{
@ -53,6 +54,7 @@ class ArchiveFolderDialog : public KDialog
void slotRecursiveCheckboxClicked();
/** reimp */
void slotButtonClicked( int button );
void slotUrlChanged(const QString&);
private:
bool allowToDeleteFolders( const Akonadi::Collection &folder) const;

Loading…
Cancel
Save