Skip to content

Commit

Permalink
Refactored addition of bookmark item
Browse files Browse the repository at this point in the history
Code duplication when adding items in the ReadingListBar. Prepares for next step which is including bookmarks of books that cannot be found in the library
  • Loading branch information
ShaopengLin committed Jun 16, 2024
1 parent 5afaeb2 commit bfe264d
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
21 changes: 10 additions & 11 deletions src/readinglistbar.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ void ReadingListBar::setupList()
{
auto library = KiwixApp::instance()->getLibrary();
auto bookmarks = library->getBookmarks();
auto listWidget = ui->listWidget;
listWidget->clear();
ui->listWidget->clear();
for(auto& bookmark:bookmarks) {
std::shared_ptr<zim::Archive> archive;
const QString& title = QString::fromStdString(bookmark.getTitle());
try {
archive = library->getArchive(QString::fromStdString(bookmark.getBookId()));
} catch (std::out_of_range& e) {
Expand All @@ -56,16 +56,9 @@ void ReadingListBar::setupList()
QPixmap pixmap;
pixmap.loadFromData(reinterpret_cast<const uchar*>(content.data()), content.size());
auto icon = QIcon(pixmap);
auto item = new QListWidgetItem(
icon,
QString::fromStdString(bookmark.getTitle()),
listWidget);
item->setTextAlignment(Qt::TextWordWrap);
addItem(title, icon);
} catch (zim::EntryNotFound& e) {
auto item = new QListWidgetItem(
QString::fromStdString(bookmark.getTitle()),
listWidget);
item->setTextAlignment(Qt::TextWordWrap);
addItem(title);
}
}
}
Expand Down Expand Up @@ -104,6 +97,12 @@ void ReadingListBar::onItemActivated(QListWidgetItem* item, Qt::MouseButtons but
}
}

void ReadingListBar::addItem(const QString &title, const QIcon &icon)
{
auto item = new QListWidgetItem(icon, title, ui->listWidget);
item->setTextAlignment(Qt::TextWordWrap);
}

void ReadingListBar::openUrl(QListWidgetItem* item, bool newTab)
{
int index = ui->listWidget->row(item);
Expand Down
1 change: 1 addition & 0 deletions src/readinglistbar.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ public slots:
void onItemDoubleClicked(QListWidgetItem *item);
void onItemPressed(QListWidgetItem* item, Qt::MouseButtons buttons);
void onItemActivated(QListWidgetItem *item, Qt::MouseButtons buttons);
void addItem(const QString& title, const QIcon& icon = QIcon{});
private:
Ui::readinglistbar *ui;
int clickKind;
Expand Down

0 comments on commit bfe264d

Please sign in to comment.