From 5e1e7c33933df031496cb8aeba2a421d7f3ffffd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Mon, 24 Jun 2013 10:31:21 +0200 Subject: [PATCH] eliminada la opci?n always on top del visor hasta que est? arreglada --- YACReader/main_window_viewer.cpp | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/YACReader/main_window_viewer.cpp b/YACReader/main_window_viewer.cpp index 78d07ad7..e3096d46 100644 --- a/YACReader/main_window_viewer.cpp +++ b/YACReader/main_window_viewer.cpp @@ -124,10 +124,10 @@ void MainWindowViewer::setupUI() viewer->setFocusPolicy(Qt::StrongFocus); - if(Configuration::getConfiguration().getAlwaysOnTop()) - { - setWindowFlags(this->windowFlags() | Qt::CustomizeWindowHint | Qt::WindowStaysOnTopHint); - } + //if(Configuration::getConfiguration().getAlwaysOnTop()) + //{ + // setWindowFlags(this->windowFlags() | Qt::CustomizeWindowHint | Qt::WindowStaysOnTopHint); + //} if(fullscreen) toFullScreen(); @@ -348,12 +348,13 @@ void MainWindowViewer::createToolBars() comicToolBar->addAction(prevAction); comicToolBar->addAction(nextAction); comicToolBar->addAction(goToPage); -#ifndef Q_OS_MAC - comicToolBar->addSeparator(); - comicToolBar->addAction(alwaysOnTopAction); -#else - alwaysOnTopAction->setEnabled(false); -#endif + +//#ifndef Q_OS_MAC +// comicToolBar->addSeparator(); +// comicToolBar->addAction(alwaysOnTopAction); +//#else +// alwaysOnTopAction->setEnabled(false); +//#endif #ifdef Q_OS_MAC comicToolBar->addWidget(new MacToolBarSeparator(5)); @@ -555,7 +556,7 @@ void MainWindowViewer::enableActions() adjustHeight->setDisabled(false); adjustWidth->setDisabled(false); goToPage->setDisabled(false); - alwaysOnTopAction->setDisabled(false); + //alwaysOnTopAction->setDisabled(false); leftRotationAction->setDisabled(false); rightRotationAction->setDisabled(false); showMagnifyingGlass->setDisabled(false); @@ -575,7 +576,7 @@ void MainWindowViewer::disableActions() adjustHeight->setDisabled(true); adjustWidth->setDisabled(true); goToPage->setDisabled(true); - alwaysOnTopAction->setDisabled(true); + //alwaysOnTopAction->setDisabled(true); leftRotationAction->setDisabled(true); rightRotationAction->setDisabled(true); showMagnifyingGlass->setDisabled(true);