diff options
-rw-r--r-- | fileview.cpp | 8 | ||||
-rw-r--r-- | shemov.cpp | 14 | ||||
-rw-r--r-- | shemov.h | 4 |
3 files changed, 1 insertions, 25 deletions
diff --git a/fileview.cpp b/fileview.cpp index cc636ad..1fa370e 100644 --- a/fileview.cpp +++ b/fileview.cpp @@ -97,7 +97,6 @@ void FileView::createFolder(){ void FileView::readConfig(){ QSettings s; - mHoverDirs = s.value("ui/hoverdirs", true).toBool(); mHoverPics = s.value("ui/hoverpics", true).toBool(); mHoverMovies = s.value("ui/hovermovies", true).toBool(); mWhen = s.value("ui/grabframe", "00:00:00").toString(); @@ -190,12 +189,7 @@ bool FileView::event(QEvent *e){ }else{ return exitHover(); } - }else if(curIdxInfo.isDir()){ - if(!mHoverDirs){ - return exitHover(); - } - ft = Dir; - }else{ + }else{ return exitHover(); } } @@ -465,14 +465,6 @@ void SheMov::createActions(){ connect(aFilesMapper, SIGNAL(mapped(QObject*)), controller->archiveFiles(), SLOT(toggleHeader(QObject*))); controller->archiveFiles()->setHeaderGroup(mArchiveFilesAG); - //file view hover - mFSHoverGroup = new QActionGroup(this); - mFSHoverGroup->setExclusive(false); - mHoverDirectoriesA = new QAction(QIcon(":/french_maid_dress.png"), tr("Hover over directories"), this); - mHoverDirectoriesA->setData("ui/hoverdirs"); - mHoverDirectoriesA->setCheckable(true); - mFSHoverGroup->addAction(mHoverDirectoriesA); - /* very unfortunate naming of variables: * picViewer: the actual PictureViewer2 window * picView: the picture files TreeView @@ -698,9 +690,6 @@ void SheMov::createMenus(){ //FileSystem view menu mFSViewMenu = new QMenu(tr("&View"), this); - mFSHoverMenu = new QMenu(tr("Hover over"), this); - mFSHoverMenu->addActions(mFSHoverGroup->actions()); - mFSViewMenu->addMenu(mFSHoverMenu); mFSViewMenu->addSeparator(); QMenu *fsHeaderMenu = new QMenu(tr("Show headers"), this); fsHeaderMenu->addActions(mFileSysHeaderGroup->actions()); @@ -848,8 +837,6 @@ void SheMov::createToolBar(){ toolBar->addSeparator(); toolBar->addActions(mPicActionGroup->actions()); toolBar->addAction(mPVToggleA); - toolBar->addSeparator(); - toolBar->addAction(mHoverDirectoriesA); toolBar->addSeparator(); toolBar->addAction(mMountDvdA); addToolBar(Qt::LeftToolBarArea, toolBar); @@ -867,7 +854,6 @@ void SheMov::readSettings(){ mTab->setCurrentIndex(currentTab); } tabChanged(currentTab); - mHoverDirectoriesA->setChecked(s.value("ui/hoverdirs").toBool()); QString dvdMount = s.value("paths/dvdmount").toString(); if(dvdMount.isEmpty()){ mMountDvdA->setEnabled(false); @@ -103,15 +103,12 @@ class SheMov : public QMainWindow { QAction *mArchiveSelectedPicsA; QAction *mConsistencyA; QAction *mNewPicsA; - QAction *mHoverDirectoriesA; QAction *mRebuildFrameCacheA; QAction *mNewMovieWizardA; QAction *mMoveToArchiveA; QAction *mFSViewPropertiesA; //Filesystem View Actions - QActionGroup *mFSHoverGroup; - QActionGroup *mOpenWithGroupFS; QActionGroup *mOpenWithGroupAV; QActionGroup *mFileSysHeaderGroup; @@ -171,7 +168,6 @@ class SheMov : public QMainWindow { QMenu *mFSViewMenu; QMenu *mPicViewMenu; QMenu *mArchiveViewMenu; - QMenu *mFSHoverMenu; QAction *mEditFSMenuA; QAction *mEditPicMenuA; QAction *mViewFSMenuA; |