Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-13 10:32:11 +01:00
Code Releases Activity

Don't proceed to fetching icons if exported bookmarks list is empty

Browse Source
This commit is contained in:
nowrep 2012-08-11 17:45:56 +02:00
parent f017aba8e7
commit e6a5b18675
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/lib/bookmarksimport/bookmarksimportdialog.cpp
View File

@ -192,7 +192,6 @@ bool BookmarksImportDialog::exportedOK()
QMessageBox::critical(this, tr("Error!"), firefox.errorString()); QMessageBox::critical(this, tr("Error!"), firefox.errorString());
return false; return false;
} }
return true;
} }
else if (m_browser == Chrome) { else if (m_browser == Chrome) {
ChromeImporter chrome(this); ChromeImporter chrome(this);
@ -205,7 +204,6 @@ bool BookmarksImportDialog::exportedOK()
QMessageBox::critical(this, tr("Error!"), chrome.errorString()); QMessageBox::critical(this, tr("Error!"), chrome.errorString());
return false; return false;
} }
return true;
} }
else if (m_browser == Opera) { else if (m_browser == Opera) {
OperaImporter opera(this); OperaImporter opera(this);
@ -218,7 +216,6 @@ bool BookmarksImportDialog::exportedOK()
QMessageBox::critical(this, tr("Error!"), opera.errorString()); QMessageBox::critical(this, tr("Error!"), opera.errorString());
return false; return false;
} }
return true;
} }
else if (m_browser == Html) { else if (m_browser == Html) {
HtmlImporter html(this); HtmlImporter html(this);
@ -231,10 +228,14 @@ bool BookmarksImportDialog::exportedOK()
QMessageBox::critical(this, tr("Error!"), html.errorString()); QMessageBox::critical(this, tr("Error!"), html.errorString());
return false; return false;
} }
return true;
} }
return false; if (m_exportedBookmarks.isEmpty()) {
QMessageBox::critical(this, tr("Error!"), tr("The file doesn't contain any bookmark."));
return false;
}
return true;
} }
void BookmarksImportDialog::setFile() void BookmarksImportDialog::setFile()

6
src/lib/preferences/preferences.ui
View File

@ -1738,7 +1738,11 @@
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QLineEdit" name="externalDownArguments"/> <widget class="QLineEdit" name="externalDownArguments">
<property name="placeholderText">
<string>Leave blank if unsure</string>
</property>
</widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_7"> <layout class="QHBoxLayout" name="horizontalLayout_7">