Implement Fine-Tuned Zim Search

kiwix-desktop.pro

@@ -61,6 +61,8 @@ SOURCES += \
  src/kiwixloader.cpp \
  src/rownode.cpp \
  src/suggestionlistworker.cpp \
+ src/suggestionlistmodel.cpp \
+ src/suggestionlistdelegate.cpp \
  src/thumbnaildownloader.cpp \
  src/translation.cpp \
  src/main.cpp \
@@ -109,6 +111,8 @@ HEADERS += \
  src/node.h \
  src/rownode.h \
  src/suggestionlistworker.h \
+ src/suggestionlistmodel.h \
+ src/suggestionlistdelegate.h \
  src/thumbnaildownloader.h \
  src/translation.h \
  src/mainwindow.h \

resources/css/popup.css

@@ -1,8 +1,31 @@
-QWidget {
+QTreeView {
  background-color: white;
+ outline: 0px;
  border: none;
 }
 
+QTreeView::item:selected {
+ border: 1px solid #3366CC;
+ background-color: #D9E9FF;
+ color: black;
+}
+
+/* data of src/suggestionlistModel.cpp and SearchBarLineEdit of src/searchbar.cpp
+ references the line-height and padding.
+*/
+QHeaderView::section {
+ border: none;
+ color: #3b3b3b;
+ padding-top: 10px;
+ padding-left: 10px;
+ padding-right: 10px;
+ padding-bottom: 5px;
+ background-color: white;
+ font-size: 16px;
+ line-height: 24px;
+ font-weight: 400;
+}
+
 QScrollBar {
  width: 5px;
  border: none;

resources/css/style.css

@@ -30,9 +30,10 @@ QToolButton {
  border: none;
 }
 
+/* getCompleterRect of src/searchbar.cpp references the margin and border */
 SearchBar {
  background-color: white;
- margin: 2px 5px;
+ margin: 2px;
  border: 1px solid #ccc;
  border-radius: 3px;
 
@@ -43,7 +44,7 @@ SearchBar > QLabel#searchIcon {
  padding: 0;
  border: none;
  background-color: none;
- margin: 0px 4px 0px 9px;
+ margin: 0px 6px;
 
  max-height: 38px;
  max-width: 38px;
@@ -68,11 +69,6 @@ SearchBar > QToolButton {
  max-width: 38px;
 }
 
-SearchBar > BookmarkButton {
- margin-right: 3px;
- margin-left: 3px; 
-}
-
 SearchBar > QToolButton:pressed,
 SearchBar > QToolButton:hover {
  border: 1px solid #3366CC;

resources/i18n/en.json

@@ -168,5 +168,6 @@
  "save-page-as": "Save As...",
  "portable-disabled-tooltip": "Function disabled in portable mode",
  "scroll-next-tab": "Scroll to next tab",
- "scroll-previous-tab": "Scroll to previous tab"
+ "scroll-previous-tab": "Scroll to previous tab",
+ "kiwix-search": "Kiwix search"
 }

resources/i18n/qqq.json

@@ -176,5 +176,6 @@
  "save-page-as": "Represents the action of saving the current tab content to a file chosen by the user.",
  "portable-disabled-tooltip": "Tooltip used to explain disabled components in the portable version.",
  "scroll-next-tab": "Represents the action of scrolling to the next tab of the current tab which toward the end of the tab bar.",
- "scroll-previous-tab": "Represents the action of scrolling to the previous tab of the current tab which toward the start of the tab bar."
+ "scroll-previous-tab": "Represents the action of scrolling to the previous tab of the current tab which toward the start of the tab bar.",
+ "kiwix-search": "Title text for a list of search results, which notes to the user those are from Kiwix's Search Engine"
 }

src/kiwixapp.cpp

@@ -133,7 +133,7 @@ KiwixApp::~KiwixApp()
 void KiwixApp::newTab()
 {
  getTabWidget()->createNewTab(true, false);
- auto& searchBarLineEdit = mp_mainWindow->getTopWidget()->getSearchBar().getLineEdit();
+ auto& searchBarLineEdit = getSearchBar().getLineEdit();
  searchBarLineEdit.setFocus(Qt::MouseFocusReason);
  searchBarLineEdit.clear();
  searchBarLineEdit.clearSuggestions();

src/kiwixapp.h

@@ -83,6 +83,7 @@ class KiwixApp : public QtSingleApplication
  MainWindow* getMainWindow() { return mp_mainWindow; }
  ContentManager* getContentManager() { return mp_manager; }
  TabBar* getTabWidget() { return getMainWindow()->getTabBar(); }
+ SearchBar& getSearchBar() { return getMainWindow()->getTopWidget()->getSearchBar(); }
  QAction* getAction(Actions action);
  QString getLibraryDirectory() { return m_libraryDirectory; };
  kiwix::Server* getLocalServer() { return &m_server; }

src/library.cpp

@@ -3,6 +3,7 @@
 
 #include <kiwix/manager.h>
 #include <kiwix/tools.h>
+#include <zim/item.h>
 
 #include <QtDebug>
 #include <QtConcurrent/QtConcurrentRun>
@@ -72,6 +73,23 @@ std::shared_ptr<zim::Searcher> Library::getSearcher(const QString &zimId)
  return mp_library->getSearcherById(zimId.toStdString());
 }
 
+QIcon Library::getZimIcon(const QString &zimId, QIcon defaultIcon)
+{
+ try 
+ {
+ auto book = getBookById(zimId);
+ auto illustration = book.getIllustration(48);
+ std::string content = illustration->getData();
+ QPixmap pixmap;
+ pixmap.loadFromData((const uchar*)content.data(), content.size());
+ return QIcon(pixmap);
+ } 
+ catch (...) 
+ {
+ return defaultIcon;
+ }
+}
+
 QStringList Library::getBookIds() const
 {
  QStringList list;

src/library.h

@@ -12,6 +12,7 @@
 #include <QSharedPointer>
 #include <QMap>
 #include <QMutex>
+#include <QIcon>
 
 #define TQS(v) (QString::fromStdString(v))
 #define FORWARD_GETTER(METH) QString METH() const { return TQS(mp_book->METH()); }
@@ -33,6 +34,7 @@ class Library : public QObject
  QString openBookFromPath(const QString& zimPath);
  std::shared_ptr<zim::Archive> getArchive(const QString& zimId);
  std::shared_ptr<zim::Searcher> getSearcher(const QString& zimId);
+ QIcon getZimIcon(const QString& zimId, QIcon defaultIcon = QIcon{});
  QStringList getBookIds() const;
  QStringList listBookIds(const kiwix::Filter& filter, kiwix::supportedListSortBy sortBy, bool ascending) const;
  const std::vector<kiwix::Bookmark> getBookmarks(bool onlyValidBookmarks = false) const { return mp_library->getBookmarks(onlyValidBookmarks); }

src/readinglistbar.cpp

@@ -57,28 +57,17 @@ void ReadingListBar::setupList()
  auto listWidget = ui->listWidget;
  listWidget->clear();
  for(auto& bookmark:bookmarks) {
- std::shared_ptr<zim::Archive> archive;
+ auto zimId = QString::fromStdString(bookmark.getBookId());
  try {
- archive = library->getArchive(QString::fromStdString(bookmark.getBookId()));
+ library->getArchive(zimId);
  } catch (std::out_of_range& e) {
  continue;
  }
- try {
- auto illustration = archive->getIllustrationItem(48);
- std::string content = illustration.getData();
- std::string mimeType = illustration.getMimetype();
- QPixmap pixmap;
- pixmap.loadFromData(reinterpret_cast<const uchar*>(content.data()), content.size());
- auto icon = QIcon(pixmap);
- new QListWidgetItem(
- icon,
- QString::fromStdString(bookmark.getTitle()),
- listWidget);
- } catch (zim::EntryNotFound& e) {
- new QListWidgetItem(
+ auto item = new QListWidgetItem(
+ library->getZimIcon(zimId),
  QString::fromStdString(bookmark.getTitle()),
  listWidget);
- }
+ item->setTextAlignment(Qt::TextWordWrap);
  }
 }