easthighNerd/qcma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delay the progress dialog by one second so it doesn't show on quick scans.

Browse Source 
Do not show the disconnect message if no connection is established.
Show correct directory separators on Windows.
This commit is contained in:
codestation
2014-01-16 21:38:05 -04:30
parent 230bbcfb43
commit 04ce71a9f3
7 changed files with 44 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/forms/configwidget.cpp
View File

@@ -67,17 +67,17 @@ void ConfigWidget::setDefaultData()
QString defaultdir;
QSettings settings;
defaultdir = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation);
ui->photoPath->setText(settings.value("photoPath", defaultdir).toString());
ui->photoPath->setText(QDir::toNativeSeparators(settings.value("photoPath", defaultdir).toString()));
defaultdir = QStandardPaths::writableLocation(QStandardPaths::MusicLocation);
ui->musicPath->setText(settings.value("musicPath", defaultdir).toString());
ui->musicPath->setText(QDir::toNativeSeparators(settings.value("musicPath", defaultdir).toString()));
defaultdir = QStandardPaths::writableLocation(QStandardPaths::MoviesLocation);
ui->videoPath->setText(settings.value("videoPath", defaultdir).toString());
ui->videoPath->setText(QDir::toNativeSeparators(settings.value("videoPath", defaultdir).toString()));
defaultdir = QStandardPaths::writableLocation(QStandardPaths::HomeLocation);
defaultdir.append(QDir::separator()).append("PS Vita");
ui->appPath->setText(settings.value("appsPath", defaultdir).toString());
ui->appPath->setText(QDir::toNativeSeparators(settings.value("appsPath", defaultdir).toString()));
defaultdir = QStandardPaths::writableLocation(QStandardPaths::HomeLocation);
defaultdir.append(QDir::separator()).append("PSV Updates");
ui->urlPath->setText(settings.value("urlPath", defaultdir).toString());
ui->urlPath->setText(QDir::toNativeSeparators(settings.value("urlPath", defaultdir).toString()));
ui->offlineCheck->setChecked(settings.value("offlineMode", true).toBool());
ui->metadataCheck->setChecked(settings.value("skipMetadata", false).toBool());
@@ -128,7 +128,7 @@ void ConfigWidget::browseBtnPressed(int btn)
QString selected = QFileDialog::getExistingDirectory(this, msg, lineedit->text(), QFileDialog::ShowDirsOnly);
if(!selected.isEmpty()) {
lineedit->setText(selected);
lineedit->setText(QDir::toNativeSeparators((selected)));
}
}
@@ -138,7 +138,7 @@ void ConfigWidget::savePath(QSettings &settings, const QLineEdit *edit, const QS
if(path.endsWith(QDir::separator())) {
path.chop(1);
}
settings.setValue(key, path);
settings.setValue(key, QDir::fromNativeSeparators(path));
QDir(QDir::root()).mkpath(path);
}

13
src/forms/progressform.cpp
View File

@@ -62,3 +62,16 @@ void ProgressForm::setDirectoryName(QString dir)
QString elided = ui->directoryLabel->fontMetrics().elidedText(dir, Qt::ElideMiddle, ui->directoryLabel->width(), 0);
ui->directoryLabel->setText(elided);
}
void ProgressForm::showDelayed(int msec)
{
timer.setSingleShot(true);
timer.setInterval(msec);
connect(&timer, SIGNAL(timeout()), this, SLOT(show()));
timer.start();
}
void ProgressForm::interruptShow()
{
timer.stop();
}

6
src/forms/progressform.h
View File

@@ -20,6 +20,7 @@
#ifndef PROGRESSFORM_H
#define PROGRESSFORM_H
#include <QTimer>
#include <QWidget>
namespace Ui {
@@ -34,9 +35,14 @@ public:
explicit ProgressForm(QWidget *parent = 0);
~ProgressForm();
void showDelayed(int msec = 1000);
void interruptShow();
private:
Ui::ProgressForm *ui;
QTimer timer;
signals:
void canceled();