mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
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:
parent
4c7ea24921
commit
927bc5d601
7 changed files with 197 additions and 221 deletions
|
|
@ -4,7 +4,7 @@ QT = core gui network svg concurrent
|
|||
lessThan(QT_MAJOR_VERSION, 5) {
|
||||
QT += webkit
|
||||
} else {
|
||||
!android: QT += webkitwidgets
|
||||
!android: QT += webkitwidgets webkit
|
||||
android: QT += androidextras
|
||||
}
|
||||
INCLUDEPATH += qt-ui $$PWD
|
||||
|
|
@ -191,13 +191,13 @@ FORMS = \
|
|||
qt-ui/webservices.ui \
|
||||
qt-ui/tableview.ui \
|
||||
qt-ui/divelogimportdialog.ui \
|
||||
qt-ui/usermanual.ui \
|
||||
qt-ui/searchbar.ui \
|
||||
qt-ui/divelogexportdialog.ui \
|
||||
qt-ui/plannerSettings.ui \
|
||||
qt-ui/usersurvey.ui
|
||||
|
||||
# Nether usermanual or printing is supported on android right now
|
||||
android: FORMS -= qt-ui/usermanual.ui qt-ui/printoptions.ui
|
||||
android: FORMS -= qt-ui/printoptions.ui
|
||||
|
||||
RESOURCES = subsurface.qrc
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue