Commit 25280c73 authored by Gilles Caulier's avatar Gilles Caulier 🗼

Fix FirstRun assistant sentence about to "Keep" image collections

BUGS: 187651
FIXED-IN: 4.3.0
parent da3e2272
......@@ -6,7 +6,7 @@
* Date : 2009-28-04
* Description : first run assistant dialog
*
* Copyright (C) 2009-2013 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2009-2014 by Gilles Caulier <caulier dot gilles at gmail dot com>
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
......@@ -73,20 +73,22 @@ public:
};
CollectionPage::CollectionPage(KAssistantDialog* const dlg)
: AssistantDlgPage(dlg, i18n("<b>Configure where images and metadata are stored</b>")),
: AssistantDlgPage(dlg, i18n("<b>Configure where do you keep your images and you will store database</b>")),
d(new Private)
{
QWidget* const widget = new QWidget(this);
QVBoxLayout* const vlayout = new QVBoxLayout(widget);
QString picturesPath;
#if KDE_IS_VERSION(4,1,61)
picturesPath = KGlobalSettings::picturesPath();
#else
#if QT_VERSION >= 0x040400
# if QT_VERSION >= 0x040400
picturesPath = QDesktopServices::storageLocation(QDesktopServices::PicturesLocation);
# endif
#endif
#endif
kDebug() << picturesPath;
if (picturesPath.isEmpty())
......@@ -97,22 +99,20 @@ CollectionPage::CollectionPage(KAssistantDialog* const dlg)
QLabel* const textLabel1 = new QLabel(widget);
textLabel1->setWordWrap(true);
QString message = i18n("<p>Please enter a location where dou you keep your images.</p> "
"<p>You can choose any local folder, even one that already contains images."
"<br/> "
"More folders can be added later under the <i>Settings</i> menu. "
"</p> ");
#ifndef _WIN32
textLabel1->setText(i18n("<p>Please enter a location where you want to store your images.</p> "
"<p>You can choose any local folder, even one that already contains images."
"<br/> "
"More folders can be added later under the <i>Settings</i> menu. "
"</p> "
"<p><i>Note:</i> removable media (such as USB drives or DVDs) and remote file systems "
"(such as NFS, or Samba mounted with cifs/smbfs) are supported.</p>"));
#else
textLabel1->setText(i18n("<p>Please enter a location where you want to store your images.</p> "
"<p>You can choose any local folder, even one that already contains images."
"<br/> "
"More folders can be added later under the <i>Settings</i> menu. "
"</p> "));
message.append(i18n("<p><i>Note:</i> removable media (such as USB drives or DVDs) and remote file systems "
"(such as NFS, or Samba mounted with cifs/smbfs) are supported.</p>"));
#endif
textLabel1->setText(message);
d->rootAlbumPathRequester = new KUrlRequester(widget);
d->rootAlbumPathRequester->setMode(KFile::Directory | KFile::LocalOnly);
d->rootAlbumPathRequester->setUrl(picturesPath);
......
......@@ -6,7 +6,7 @@
* Date : 2009-28-04
* Description : first run assistant dialog
*
* Copyright (C) 2009-2013 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2009-2014 by Gilles Caulier <caulier dot gilles at gmail dot com>
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
......@@ -72,4 +72,4 @@ private:
} // namespace Digikam
#endif /* WELCOME_PAGE_H */
#endif /* COLLECTION_PAGE_H */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment