| Summary: | Unable to download photos in top level album with auto-album creation enabled. | ||
|---|---|---|---|
| Product: | [Applications] digikam | Reporter: | lan |
| Component: | Import-Albums | Assignee: | Digikam Developers <digikam-bugs-null> |
| Status: | RESOLVED FIXED | ||
| Severity: | normal | ||
| Priority: | NOR | ||
| Version First Reported In: | 0.7.1 | ||
| Target Milestone: | --- | ||
| Platform: | Compiled Sources | ||
| OS: | Linux | ||
| Latest Commit: | Version Fixed/Implemented In: | ||
| Sentry Crash Report: | |||
|
Description
lan
2004-12-29 07:14:00 UTC
CVS commit by pahlibar:
Allow downloading of albums into sub auto-albums of root album (if and only if
Auto album creation option is checked)
BUG: 95965
M +2 -1 cameraui.cpp 1.36
M +13 -7 dirselectdialog.cpp 1.12
M +5 -2 dirselectdialog.h 1.7
--- kdeextragear-3/digikam/utilities/cameragui/cameraui.cpp #1.35:1.36
@@ -432,5 +432,6 @@ void CameraUI::slotDownload(bool onlySel
KURL url = DirSelectDialog::selectDir(libPath, currPath,
- this, header, newDirName);
+ this, header, newDirName,
+ m_autoAlbumCheck->isChecked());
if (!url.isValid())
return;
--- kdeextragear-3/digikam/utilities/cameragui/dirselectdialog.cpp #1.11:1.12
@@ -49,5 +49,6 @@ DirSelectDialog::DirSelectDialog(const Q
QWidget* parent,
const QString& header,
- const QString& newDirString)
+ const QString& newDirString,
+ bool allowRootSelection)
: KDialogBase(parent, 0, true, i18n("Select Album"), Help|User1|Ok|Cancel)
{
@@ -56,4 +57,6 @@ DirSelectDialog::DirSelectDialog(const Q
enableButtonOK(false);
+ m_allowRootSelection = allowRootSelection;
+
QFrame *page = makeMainWidget();
QVBoxLayout* lay = new QVBoxLayout(page, 5, 5);
@@ -240,5 +243,5 @@ void DirSelectDialog::slotSelectionChang
KFileTreeViewItem* ftvItem = dynamic_cast<KFileTreeViewItem*>(item);
- if (!ftvItem || ftvItem == m_branch->root())
+ if (!ftvItem || (ftvItem == m_branch->root() && !m_allowRootSelection))
{
enableButtonOK(false);
@@ -249,10 +252,13 @@ void DirSelectDialog::slotSelectionChang
}
-KURL DirSelectDialog::selectDir(const QString& rootDir, const QString& startDir,
+KURL DirSelectDialog::selectDir(const QString& rootDir,
+ const QString& startDir,
QWidget* parent,
- const QString& header, const QString& newDirString)
-
+ const QString& header,
+ const QString& newDirString,
+ bool allowRootSelection)
{
- DirSelectDialog dlg(rootDir, startDir, parent, header, newDirString);
+ DirSelectDialog dlg(rootDir, startDir, parent, header, newDirString,
+ allowRootSelection);
if (dlg.exec() != QDialog::Accepted)
@@ -260,5 +266,5 @@ KURL DirSelectDialog::selectDir(const QS
KFileTreeViewItem* ftvItem = (KFileTreeViewItem*) dlg.m_treeView->currentItem();
- if (!ftvItem || ftvItem == dlg.m_branch->root())
+ if (!ftvItem || (ftvItem == dlg.m_branch->root() && !allowRootSelection))
return KURL();
--- kdeextragear-3/digikam/utilities/cameragui/dirselectdialog.h #1.6:1.7
@@ -43,5 +43,6 @@ public:
QWidget *parent = 0,
const QString& header=QString::null,
- const QString& newDirString=QString::null);
+ const QString& newDirString=QString::null,
+ bool allowRootSelection=false);
~DirSelectDialog();
@@ -50,5 +51,6 @@ public:
QWidget* parent=0,
const QString& header=QString::null,
- const QString& newDirString=QString::null);
+ const QString& newDirString=QString::null,
+ bool allowRootSelection=false);
private:
@@ -63,4 +65,5 @@ private:
QValueStack<KURL> m_urlsToList;
QString m_newDirString;
+ bool m_allowRootSelection;
private slots:
Thanks for quick attention :-) Happy New Year ! |