brough back to MacOSX the fit to width slider //ugly solution

This commit is contained in:
Luis Ángel San Martín
2014-11-10 17:59:57 +01:00
parent 1ae1f04eb7
commit e5fe87142f
6 changed files with 150 additions and 66 deletions

View File

@ -488,13 +488,23 @@ void MainWindowViewer::createToolBars()
//comicToolBar->addAction(adjustWidth);
#ifdef Q_OS_MAC
sliderAction = new YACReaderSlider(this);
sliderAction->hide();
comicToolBar->addAction(adjustWidthAction);
QAction * action = comicToolBar->addFitToWidthSlider(adjustWidthAction);
connect(action,SIGNAL(triggered()),this,SLOT(toggleFitToWidthSlider()));
#else
QMenu * menu = new QMenu();
sliderAction = new YACReaderSliderAction(this);
sliderAction = new YACReaderSliderAction(this);
menu->setAutoFillBackground(false);
menu->setStyleSheet(" QMenu {background:transparent; border: 0px;padding: 0px; }"
);
@ -503,16 +513,15 @@ void MainWindowViewer::createToolBars()
tb2->addAction(adjustWidthAction);
tb2->setMenu(menu);
connect(sliderAction,SIGNAL(fitToWidthRatioChanged(float)),viewer,SLOT(updateFitToWidthRatio(float)));
connect(optionsDialog,SIGNAL(fitToWidthRatioChanged(float)),sliderAction,SLOT(updateFitToWidthRatio(float)));
//tb2->addAction();
tb2->setPopupMode(QToolButton::MenuButtonPopup);
tb2->setDefaultAction(adjustWidthAction);
comicToolBar->addWidget(tb2);
#endif
connect(sliderAction,SIGNAL(fitToWidthRatioChanged(float)),viewer,SLOT(updateFitToWidthRatio(float)));
connect(optionsDialog,SIGNAL(fitToWidthRatioChanged(float)),sliderAction,SLOT(updateFitToWidthRatio(float)));
comicToolBar->addAction(adjustHeightAction);
comicToolBar->addAction(adjustToFullSizeAction);
comicToolBar->addAction(leftRotationAction);
@ -1129,6 +1138,20 @@ void MainWindowViewer::setUpShortcutsManagement()
ShortcutsManager::getShortcutsManager().registerActions(allActions);
}
#include "QsLog.h"
void MainWindowViewer::toggleFitToWidthSlider()
{
if(sliderAction->isVisible())
{
sliderAction->hide();
}
else
{
sliderAction->move(250,0);
sliderAction->show();
}
}
void MainWindowViewer::changeFit()