kiwix/kiwix-desktop
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-desktop.git synced 2025-09-22 11:37:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1079 from sgourdas/feature/reading_list

Browse Source 
Library list pinning behavior
This commit is contained in:
Kelson 2024-05-21 18:11:55 +02:00 committed by GitHub
commit a529627449
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 67 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/mainwindow.cpp
View File

@ -32,7 +32,7 @@ MainWindow::MainWindow(QWidget *parent) :
connect(app->getAction(KiwixApp::ToggleFullscreenAction), &QAction::triggered,
this, &MainWindow::toggleFullScreen);
connect(app->getAction(KiwixApp::ToggleReadingListAction), &QAction::toggled,
this, &MainWindow::when_ReadingList_toggled);
this, &MainWindow::readingListToggled);
connect(app->getAction(KiwixApp::AboutAction), &QAction::triggered,
mp_about, &QDialog::show);
connect(app->getAction(KiwixApp::DonateAction), &QAction::triggered,
@ -57,12 +57,11 @@ MainWindow::MainWindow(QWidget *parent) :
mp_ui->mainToolBar, &TopWidget::updateBackForwardButtons);
connect(mp_ui->tabBar, &TabBar::tabDisplayed,
this, [=](TabType tabType) {
when_libraryPageDisplayed(tabType == TabType::LibraryTab);
tabChanged(tabType);
});
connect(mp_ui->tabBar, &TabBar::currentTitleChanged,
&(mp_ui->mainToolBar->getSearchBar()), &SearchBar::currentTitleChanged);
// This signal emited more often than the history really updated
// but for now we have no better signal for it.
connect(mp_ui->tabBar, &TabBar::currentTitleChanged,
@ -120,8 +119,7 @@ bool MainWindow::eventFilter(QObject* /*object*/, QEvent* event)
return false;
}
void MainWindow::when_ReadingList_toggled(bool state)
void MainWindow::readingListToggled(bool state)
{
if (state) {
mp_ui->sideBar->setCurrentWidget(mp_ui->readinglistbar);
@ -132,19 +130,16 @@ void MainWindow::when_ReadingList_toggled(bool state)
}
}
void MainWindow::when_libraryPageDisplayed(bool showed)
void MainWindow::tabChanged(TabType tabType)
{
auto app = KiwixApp::instance();
// When library sidebar appeared, or hidden, reading list is always hidden.
app->getAction(KiwixApp::ToggleReadingListAction)->setChecked(false);
if (showed) {
QAction *readingList = KiwixApp::instance()->getAction(KiwixApp::ToggleReadingListAction);
if (tabType == TabType::SettingsTab) {
mp_ui->sideBar->hide();
} else if(tabType == TabType::LibraryTab) {
mp_ui->sideBar->setCurrentWidget(mp_ui->contentmanagerside);
mp_ui->sideBar->show();
}
else {
mp_ui->sideBar->hide();
} else {
readingListToggled(readingList->isChecked());
}
}

4
src/mainwindow.h
View File

@ -31,8 +31,8 @@ protected:
private slots:
void toggleFullScreen();
void when_ReadingList_toggled(bool state);
void when_libraryPageDisplayed(bool showed);
void tabChanged(TabBar::TabType);
void readingListToggled(bool state);
void hideTabAndTop();
void showTabAndTop();

54
src/readinglistbar.cpp
View File

@ -13,8 +13,19 @@ ReadingListBar::ReadingListBar(QWidget *parent) :
ui->setupUi(this);
connect(KiwixApp::instance()->getLibrary(), &Library::bookmarksChanged,
this, &ReadingListBar::setupList);
connect(ui->listWidget, &QListWidget::itemActivated,
this, &ReadingListBar::on_itemActivated);
connect(ui->listWidget, &QListWidget::itemClicked,
this, &ReadingListBar::onItemClicked);
connect(ui->listWidget, &QListWidget::itemDoubleClicked,
this, &ReadingListBar::onItemDoubleClicked);
connect(ui->listWidget, &QListWidget::itemPressed,
this, [this](QListWidgetItem* item) {
onItemPressed(item, QGuiApplication::mouseButtons());
});
connect(ui->listWidget, &QListWidget::itemActivated,
this, [this](QListWidgetItem* item) {
onItemActivated(item, QGuiApplication::mouseButtons());
});
setupList();
ui->label->setText(gt("reading-list-title"));
@ -25,7 +36,6 @@ ReadingListBar::~ReadingListBar()
delete ui;
}
void ReadingListBar::setupList()
{
auto library = KiwixApp::instance()->getLibrary();
@ -60,7 +70,41 @@ void ReadingListBar::setupList()
}
}
void ReadingListBar::on_itemActivated(QListWidgetItem* item)
// Receives single clicks
void ReadingListBar::onItemClicked(QListWidgetItem* item)
{
clickKind = 1;
QTimer::singleShot(QApplication::doubleClickInterval(), [=]() { // Give time for a double click be handled
if (clickKind == 1) {
openUrl(item, false);
}
});
}
// Receives double clicks
void ReadingListBar::onItemDoubleClicked(QListWidgetItem* item)
{
clickKind = 2;
openUrl(item, true);
}
// Receives single and middle click
void ReadingListBar::onItemPressed(QListWidgetItem* item, Qt::MouseButtons buttons)
{
if (buttons & Qt::MiddleButton) {
openUrl(item, true);
}
}
// Receives left clicks and activation key
void ReadingListBar::onItemActivated(QListWidgetItem* item, Qt::MouseButtons buttons)
{
if (!buttons) { // clicks are handled elsewhere, handle only the activation key case
openUrl(item, true);
}
}
void ReadingListBar::openUrl(QListWidgetItem* item, bool newTab)
{
int index = ui->listWidget->row(item);
auto bookmark = KiwixApp::instance()->getLibrary()->getBookmarks(true).at(index);
@ -68,5 +112,5 @@ void ReadingListBar::on_itemActivated(QListWidgetItem* item)
url.setScheme("zim");
url.setHost(QString::fromStdString(bookmark.getBookId())+".zim");
url.setPath(QString::fromStdString(bookmark.getUrl()));
KiwixApp::instance()->openUrl(url);
KiwixApp::instance()->openUrl(url, newTab);
}

7
src/readinglistbar.h
View File

@ -18,9 +18,14 @@ public:
public slots:
void setupList();
void on_itemActivated(QListWidgetItem *item);
void onItemClicked(QListWidgetItem* item);
void onItemDoubleClicked(QListWidgetItem *item);
void onItemPressed(QListWidgetItem* item, Qt::MouseButtons buttons);
void onItemActivated(QListWidgetItem *item, Qt::MouseButtons buttons);
private:
Ui::readinglistbar *ui;
int clickKind;
void openUrl(QListWidgetItem* item, bool newTab);
};
#endif // READINGLISTBAR_H