eliminada la opci?n always on top del visor hasta que est? arreglada

This commit is contained in:
Luis Ángel San Martín 2013-06-24 10:31:21 +02:00
parent 8de7cdb4dd
commit 5e1e7c3393

View File

@ -124,10 +124,10 @@ void MainWindowViewer::setupUI()
viewer->setFocusPolicy(Qt::StrongFocus); viewer->setFocusPolicy(Qt::StrongFocus);
if(Configuration::getConfiguration().getAlwaysOnTop()) //if(Configuration::getConfiguration().getAlwaysOnTop())
{ //{
setWindowFlags(this->windowFlags() | Qt::CustomizeWindowHint | Qt::WindowStaysOnTopHint); // setWindowFlags(this->windowFlags() | Qt::CustomizeWindowHint | Qt::WindowStaysOnTopHint);
} //}
if(fullscreen) if(fullscreen)
toFullScreen(); toFullScreen();
@ -348,12 +348,13 @@ void MainWindowViewer::createToolBars()
comicToolBar->addAction(prevAction); comicToolBar->addAction(prevAction);
comicToolBar->addAction(nextAction); comicToolBar->addAction(nextAction);
comicToolBar->addAction(goToPage); comicToolBar->addAction(goToPage);
#ifndef Q_OS_MAC
comicToolBar->addSeparator(); //#ifndef Q_OS_MAC
comicToolBar->addAction(alwaysOnTopAction); // comicToolBar->addSeparator();
#else // comicToolBar->addAction(alwaysOnTopAction);
alwaysOnTopAction->setEnabled(false); //#else
#endif // alwaysOnTopAction->setEnabled(false);
//#endif
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
comicToolBar->addWidget(new MacToolBarSeparator(5)); comicToolBar->addWidget(new MacToolBarSeparator(5));
@ -555,7 +556,7 @@ void MainWindowViewer::enableActions()
adjustHeight->setDisabled(false); adjustHeight->setDisabled(false);
adjustWidth->setDisabled(false); adjustWidth->setDisabled(false);
goToPage->setDisabled(false); goToPage->setDisabled(false);
alwaysOnTopAction->setDisabled(false); //alwaysOnTopAction->setDisabled(false);
leftRotationAction->setDisabled(false); leftRotationAction->setDisabled(false);
rightRotationAction->setDisabled(false); rightRotationAction->setDisabled(false);
showMagnifyingGlass->setDisabled(false); showMagnifyingGlass->setDisabled(false);
@ -575,7 +576,7 @@ void MainWindowViewer::disableActions()
adjustHeight->setDisabled(true); adjustHeight->setDisabled(true);
adjustWidth->setDisabled(true); adjustWidth->setDisabled(true);
goToPage->setDisabled(true); goToPage->setDisabled(true);
alwaysOnTopAction->setDisabled(true); //alwaysOnTopAction->setDisabled(true);
leftRotationAction->setDisabled(true); leftRotationAction->setDisabled(true);
rightRotationAction->setDisabled(true); rightRotationAction->setDisabled(true);
showMagnifyingGlass->setDisabled(true); showMagnifyingGlass->setDisabled(true);