crtxcr/looqs
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

gui: mainwindow: remove dead code and unused members

Browse Source
This commit is contained in:
Albert S. 2019-04-29 23:09:23 +02:00
parent 09804a83cc
commit b319edea15
2 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gui/mainwindow.cpp
View File

@ -28,9 +28,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
throw std::runtime_error("Failed to open database"); throw std::runtime_error("Failed to open database");
} }
connectSignals(); connectSignals();
searchThread.start();
ui->treeResultsList->setContextMenuPolicy(Qt::ContextMenuPolicy::CustomContextMenu); ui->treeResultsList->setContextMenuPolicy(Qt::ContextMenuPolicy::CustomContextMenu);
ui->tabWidget->setCurrentIndex(0); ui->tabWidget->setCurrentIndex(0);
ui->statusBar->addWidget(ui->lblSearchResults); ui->statusBar->addWidget(ui->lblSearchResults);
ui->statusBar->addWidget(ui->pdfProcessBar); ui->statusBar->addWidget(ui->pdfProcessBar);
@ -42,7 +40,6 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
void MainWindow::connectSignals() void MainWindow::connectSignals()
{ {
connect(ui->txtSearch, &QLineEdit::returnPressed, this, &MainWindow::lineEditReturnPressed); connect(ui->txtSearch, &QLineEdit::returnPressed, this, &MainWindow::lineEditReturnPressed);
// connect(this, &MainWindow::beginSearch, searchWorker, &SearchWorker::search);
connect(&searchWatcher, &QFutureWatcher<SearchResult>::finished, this, connect(&searchWatcher, &QFutureWatcher<SearchResult>::finished, this,
[&] [&]
{ {
@ -59,12 +56,8 @@ void MainWindow::connectSignals()
connect(&pdfWorkerWatcher, &QFutureWatcher<PdfPreview>::resultReadyAt, this, connect(&pdfWorkerWatcher, &QFutureWatcher<PdfPreview>::resultReadyAt, this,
[&](int index) { pdfPreviewReceived(pdfWorkerWatcher.resultAt(index)); }); [&](int index) { pdfPreviewReceived(pdfWorkerWatcher.resultAt(index)); });
connect(&pdfWorkerWatcher, &QFutureWatcher<PdfPreview>::progressValueChanged, ui->pdfProcessBar, connect(&pdfWorkerWatcher, &QFutureWatcher<PdfPreview>::progressValueChanged, ui->pdfProcessBar,
&QProgressBar::setValue); &QProgressBar::setValue);
// connect(searchWorker, &SearchWorker::searchCancelled, this, &MainWindow::handleCancelledSearch);
// connect(searchWorker, &SearchWorker::searchError, this, &MainWindow::handleSearchError);
connect(ui->treeResultsList, &QTreeWidget::itemActivated, this, &MainWindow::treeSearchItemActivated); connect(ui->treeResultsList, &QTreeWidget::itemActivated, this, &MainWindow::treeSearchItemActivated);
connect(ui->treeResultsList, &QTreeWidget::customContextMenuRequested, this, connect(ui->treeResultsList, &QTreeWidget::customContextMenuRequested, this,
&MainWindow::showSearchResultsContextMenu); &MainWindow::showSearchResultsContextMenu);
@ -225,10 +218,6 @@ void MainWindow::makePdfPreview()
ui->pdfProcessBar->setMinimum(this->pdfWorkerWatcher.progressMinimum()); ui->pdfProcessBar->setMinimum(this->pdfWorkerWatcher.progressMinimum());
} }
void MainWindow::handleCancelledSearch()
{
}
void MainWindow::handleSearchError(QString error) void MainWindow::handleSearchError(QString error)
{ {
ui->lblSearchResults->setText("Error:" + error); ui->lblSearchResults->setText("Error:" + error);

8
gui/mainwindow.h
View File

@ -30,23 +30,19 @@ class MainWindow : public QMainWindow
QFileIconProvider iconProvider; QFileIconProvider iconProvider;
bool pdfDirty; bool pdfDirty;
QSqlDatabase db; QSqlDatabase db;
QFuture<QVector<SearchResult>> searchFuture;
QFutureWatcher<QVector<SearchResult>> searchWatcher; QFutureWatcher<QVector<SearchResult>> searchWatcher;
QFutureWatcher<PdfPreview> pdfWorkerWatcher; QFutureWatcher<PdfPreview> pdfWorkerWatcher;
void add(QString path, unsigned int page); void add(QString path, unsigned int page);
QThread searchThread;
QThread pdfWorkerThread;
QVector<SearchResult> pdfSearchResults; QVector<SearchResult> pdfSearchResults;
void connectSignals(); void connectSignals();
void makePdfPreview(); void makePdfPreview();
bool pdfTabActive(); bool pdfTabActive();
void keyPressEvent(QKeyEvent *event) override; void keyPressEvent(QKeyEvent *event) override;
unsigned int processedPdfPreviews; unsigned int processedPdfPreviews;
void handleSearchResults(const QVector<SearchResult> &results);
void handleSearchError(QString error);
private slots: private slots:
void lineEditReturnPressed(); void lineEditReturnPressed();
void handleSearchResults(const QVector<SearchResult> &results);
void handleCancelledSearch();
void handleSearchError(QString error);
void treeSearchItemActivated(QTreeWidgetItem *item, int i); void treeSearchItemActivated(QTreeWidgetItem *item, int i);
void showSearchResultsContextMenu(const QPoint &point); void showSearchResultsContextMenu(const QPoint &point);
void tabChanged(); void tabChanged();