From cefcd7d313ab70a4d404ed3ae49fde8f17459cec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Sat, 9 Mar 2013 11:30:41 +0100 Subject: [PATCH] corregido bug que evitaba drag&drop para abrir corregido bug en el filtro de ficheros del di?logo abrir information label s?lo se muestra si hay un c?mic abierto --- YACReader/main_window_viewer.cpp | 2 +- YACReader/viewer.cpp | 18 +++++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/YACReader/main_window_viewer.cpp b/YACReader/main_window_viewer.cpp index 6e991612..332e79e0 100644 --- a/YACReader/main_window_viewer.cpp +++ b/YACReader/main_window_viewer.cpp @@ -416,7 +416,7 @@ void MainWindowViewer::reloadOptions() void MainWindowViewer::open() { QFileDialog openDialog; - QString pathFile = openDialog.getOpenFileName(this,tr("Open Comic"),currentDirectory,tr("Comic files") + "(*.cbr *.cbz *.rar *.zip *.tar *.pdf *.7z *.cb7 *.arj *.cbt"); + QString pathFile = openDialog.getOpenFileName(this,tr("Open Comic"),currentDirectory,tr("Comic files") + "(*.cbr *.cbz *.rar *.zip *.tar *.pdf *.7z *.cb7 *.arj *.cbt)"); if (!pathFile.isEmpty()) { openComicFromPath(pathFile); diff --git a/YACReader/viewer.cpp b/YACReader/viewer.cpp index df58ad8c..2075b94e 100644 --- a/YACReader/viewer.cpp +++ b/YACReader/viewer.cpp @@ -111,13 +111,7 @@ drag(false) notificationsLabel->hide(); informationLabel = new PageLabelWidget(this); - if(Configuration::getConfiguration().getShowInformation()) - { - QTimer * timer = new QTimer(); - connect(timer,SIGNAL(timeout()),this,SLOT(informationSwitch())); - connect(timer,SIGNAL(timeout()),timer,SLOT(deleteLater())); - timer->start(); - } + } void Viewer::createConnections() @@ -170,8 +164,18 @@ void Viewer::open(QString pathFile) //render->update(); verticalScrollBar()->setSliderPosition(verticalScrollBar()->minimum()); + + if(Configuration::getConfiguration().getShowInformation() && !information) + { + QTimer * timer = new QTimer(); + connect(timer,SIGNAL(timeout()),this,SLOT(informationSwitch())); + connect(timer,SIGNAL(timeout()),timer,SLOT(deleteLater())); + timer->start(); + } informationLabel->setText("..."); + + setAcceptDrops(true); } void Viewer::showMessageErrorOpening()