summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArno <arno@disconnect.de>2019-11-22 16:25:30 +0100
committerArno <arno@disconnect.de>2019-11-22 16:25:30 +0100
commitb98ca1a0618865c3edd67a29c0af6da1d87ad269 (patch)
tree76894781e74b003c389273e8902e3cbc9ac6c0d3
parent7d0e2081df281f494321b25e7ba4324faff2cc90 (diff)
downloadSheMov-b98ca1a0618865c3edd67a29c0af6da1d87ad269.tar.gz
SheMov-b98ca1a0618865c3edd67a29c0af6da1d87ad269.tar.bz2
SheMov-b98ca1a0618865c3edd67a29c0af6da1d87ad269.zip
Kill hover madness, part 1
Didn't work any more, and prevents it to build even under MSYS2 (windows), since xcb.h is not available. Next, kill the configuration options.
-rw-r--r--picturelistview.cpp56
-rw-r--r--picturelistview.h5
-rw-r--r--pictureswidget.cpp1
3 files changed, 0 insertions, 62 deletions
diff --git a/picturelistview.cpp b/picturelistview.cpp
index cbd7b48..7ec185d 100644
--- a/picturelistview.cpp
+++ b/picturelistview.cpp
@@ -23,9 +23,6 @@ PictureListView::PictureListView(QWidget *parent) : SmTreeView("ui/picheaderpos"
connect(selectionModel(), &QItemSelectionModel::selectionChanged, this, &PictureListView::selectedFilesChanged);
mMappingTreeModel = static_cast<MappingTreeModel*>(SmGlobals::instance()->model("MappingTree"));
- //hover window
- mHoverWin = new HoverWindow(this);
-
//misc settings
setSortingEnabled(true);
setAttribute(Qt::WA_Hover);
@@ -81,59 +78,6 @@ void PictureListView::setPVAll(){
mPV->addFiles(data, true);
}
-void PictureListView::setHoverWinVisible(bool visible) const {
- mHoverWin->setVisible(visible);
-}
-
-void PictureListView::hideEvent(QHideEvent *){
- QByteArray pvHeader = header()->saveState();
- QSettings s;
- s.setValue("ui/pvheader", pvHeader);
-}
-
-bool PictureListView::event(QEvent *e){
- if(e->type() == QEvent::Leave){
- mHoverWin->setVisible(false);
- return SmTreeView::event(e);
- }
- QHoverEvent *hEvent = static_cast<QHoverEvent*>(e);
- if(!hEvent){
- return SmTreeView::event(e);
- }
- QPoint hotSpot(hEvent->pos().x(), hEvent->pos().y() + mCursorOffset);
- QModelIndex curIdx = indexAt(hotSpot);
- if(e->type() == QEvent::HoverEnter || e->type() == QEvent::HoverMove){
- if(!curIdx.isValid() || curIdx.column() != PicFilesModel::FileName){
- mHoverWin->setVisible(false);
- mCurHover = QModelIndex();
- return true;
- }
- }
- if(e->type() == QEvent::HoverEnter){
- mCurHover = curIdx;
- QPixmap pm;
- pm.load(mCurHover.data(PicFilesModel::FullPathRole).toString());
- mHoverWin->setPixmap(pm);
- mHoverWin->setPos();
- mHoverWin->setCaption(mCurHover.data().toString());
- mHoverWin->setVisible(true);
- return true;
- }
- if(e->type() == QEvent::HoverMove){
- if(curIdx != mCurHover){
- mCurHover = curIdx;
- QPixmap pm;
- pm.load(mCurHover.data(PicFilesModel::FullPathRole).toString());
- mHoverWin->setPixmap(pm);
- mHoverWin->setPos();
- mHoverWin->setVisible(true);
- mHoverWin->setCaption(mCurHover.data().toString());
- return true;
- }
- }
- return SmTreeView::event(e);
-}
-
void PictureListView::contextMenuEvent(QContextMenuEvent *e){
QMenu ctxMenu;
for(int i = 0; i < actions().count(); ++i){
diff --git a/picturelistview.h b/picturelistview.h
index 320102f..d1c8779 100644
--- a/picturelistview.h
+++ b/picturelistview.h
@@ -14,7 +14,6 @@
#include "smtreeview.h"
#include "picfilesmodel.h"
#include "pictureviewer2.h"
-#include "hoverwindow.h"
class PictureListView : public SmTreeView {
Q_OBJECT
@@ -32,11 +31,8 @@ class PictureListView : public SmTreeView {
void refresh();
void setPVData(int replace = false);
void setPVAll();
- void setHoverWinVisible(bool visible) const;
protected:
- virtual void hideEvent(QHideEvent *);
- virtual bool event(QEvent *e);
virtual void contextMenuEvent(QContextMenuEvent *e);
private slots:
@@ -48,7 +44,6 @@ class PictureListView : public SmTreeView {
void selectedSize(qint64);
private:
- HoverWindow *mHoverWin;
QModelIndex mCurHover;
QSortFilterProxyModel *mProxy;
PicFilesModel *mModel;
diff --git a/pictureswidget.cpp b/pictureswidget.cpp
index bc7fcc1..10ae6b0 100644
--- a/pictureswidget.cpp
+++ b/pictureswidget.cpp
@@ -191,7 +191,6 @@ void PicturesWidget::constructWindowTitle(){
MappingData selected = mMappingTree->selectedItem();
if(!selected.path.isEmpty()){
windowTitle = QString("%1 - [%2]").arg(mWindowTitleBase).arg(selected.path.join("/"));
- mPictureListView->setHoverWinVisible(false);
}
emit needWindowTitleChange(windowTitle);
}