Fixed SearchBar layout and icons

This is almost a rewrite of the Search function on the WebView
the old code had a few uneeded things, mostly being a subclass
of QMainWindow instead of the QWebView - this makes the code
use a tiny bit less ram.

The SearchBox was also moved to an own class ( we can use it
later to filter the contents of the DiveList for instance )

and a forced use of the pixmaps for the Mac and Windows platform
was added.

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2014-06-30 17:45:52 -03:00 committed by Dirk Hohndel
parent 4c7ea24921
commit 927bc5d601
7 changed files with 197 additions and 221 deletions

View file

@ -1,31 +1,42 @@
#ifndef USERMANUAL_H
#define USERMANUAL_H
#include <QMainWindow>
#include <QWebPage>
#include <QWebView>
namespace Ui {
class UserManual;
}
#include "ui_searchbar.h"
class UserManual : public QMainWindow {
class SearchBar : public QWidget{
Q_OBJECT
public:
SearchBar(QWidget *parent = 0);
signals:
void searchTextChanged(const QString& s);
void searchNext();
void searchPrev();
protected:
void setVisible(bool visible);
private slots:
void enableButtons(const QString& s);
private:
Ui::SearchBar ui;
};
class UserManual : public QWebView {
Q_OBJECT
public:
explicit UserManual(QWidget *parent = 0);
~UserManual();
private
slots:
void showSearchPanel();
void hideSearchPanel();
void searchTextChanged(QString);
void searchTextChanged(const QString& s);
void searchNext();
void searchPrev();
void linkClickedSlot(QUrl url);
private:
Ui::UserManual *ui;
SearchBar *searchBar;
QString mLastText;
void search(QString, QWebPage::FindFlags);
};
#endif // USERMANUAL_H