From 4f613e635c780c1798a5cce42d4e170ecc6c49a6 Mon Sep 17 00:00:00 2001 From: Stephan Binner Date: Sun, 14 Aug 2005 21:05:29 +0000 Subject: [PATCH] SVN_SILENT fixuifiles / i18n style guide fixes svn path=/branches/KDE/3.5/kdepim/; revision=449257 --- kmfolderseldlg.cpp | 4 ++-- newfolderdialog.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/kmfolderseldlg.cpp b/kmfolderseldlg.cpp index ed616b6af..8decb47b9 100644 --- a/kmfolderseldlg.cpp +++ b/kmfolderseldlg.cpp @@ -231,7 +231,7 @@ KMFolderSelDlg::KMFolderSelDlg( KMMainWidget * parent, const QString& caption, bool mustBeReadWrite, bool useGlobalSettings ) : KDialogBase( parent, "folder dialog", true, caption, Ok|Cancel|User1, Ok, true, - KGuiItem(i18n("&New Subfolder"), "folder_new", + KGuiItem(i18n("&New Subfolder..."), "folder_new", i18n("Create a new subfolder under the currently selected folder")) ), // mainwin as parent, modal mUseGlobalSettings( useGlobalSettings ) @@ -251,7 +251,7 @@ KMFolderSelDlg::KMFolderSelDlg( QWidget * parent, KMFolderTree * tree, const QString& caption, bool mustBeReadWrite, bool useGlobalSettings ) : KDialogBase( parent, "folder dialog", true, caption, Ok|Cancel|User1, Ok, true, - KGuiItem(i18n("&New Subfolder"), "folder_new", + KGuiItem(i18n("&New Subfolder..."), "folder_new", i18n("Create a new subfolder under the currently selected folder")) ), // mainwin as parent, modal mUseGlobalSettings( useGlobalSettings ) diff --git a/newfolderdialog.cpp b/newfolderdialog.cpp index e7310804f..488800c8d 100644 --- a/newfolderdialog.cpp +++ b/newfolderdialog.cpp @@ -62,7 +62,7 @@ NewFolderDialog::NewFolderDialog( QWidget* parent, KMFolder *folder ) { setWFlags( getWFlags() | WDestructiveClose ); if ( folder ) { - setCaption( i18n("New Subfolder of: %1").arg( folder->prettyURL() ) ); + setCaption( i18n("New Subfolder of %1").arg( folder->prettyURL() ) ); } QWidget* privateLayoutWidget = new QWidget( this, "mTopLevelLayout" ); privateLayoutWidget->setGeometry( QRect( 10, 10, 260, 80 ) ); @@ -132,7 +132,7 @@ NewFolderDialog::NewFolderDialog( QWidget* parent, KMFolder *folder ) mContentsHBox->addWidget( mContentsComboBox ); mTopLevelLayout->addLayout( mContentsHBox ); } - + if ( mFolder && ( mFolder->folderType() == KMFolderTypeImap || mFolder->folderType() == KMFolderTypeCachedImap ) ) { @@ -199,7 +199,7 @@ void NewFolderDialog::slotOk() if ( fldName.startsWith( "." ) ) { KMessageBox::error( this, i18n( "Folder names cannot start with a . (dot) character; please choose another folder name." ) ); return; - } else if ( mFolder && + } else if ( mFolder && ( mFolder->folderType() == KMFolderTypeImap || mFolder->folderType() == KMFolderTypeCachedImap ) ) { QString delimiter; @@ -267,7 +267,7 @@ void NewFolderDialog::slotOk() newStorage->initializeFrom( selectedStorage ); if ( mNamespacesComboBox ) { // create folder with namespace - QString path = selectedStorage->account()->addPathToNamespace( + QString path = selectedStorage->account()->addPathToNamespace( mNamespacesComboBox->currentText() ) + fldName; newStorage->setImapPathForCreation( path ); }