mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-27 08:47:22 +03:00
Code Issues Projects Releases Packages Wiki Activity

Sharedialog: use QProgressIndicator

Browse source 
This is a merge from the movie in the original commit (which was local) to the
QProgressIndicator. However, on all connections I tested it, it did not add
much since the API is in gernal pretty quick. So maybe we can just remove this.
This commit is contained in:
Roeland Jago Douma 2015-01-14 18:42:56 +01:00
parent 3e81839af5
commit 7b1cfd69d7
2 changed files with 21 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/gui/sharedialog.cpp
View file

@ -4,6 +4,7 @@
#include "account.h"
#include "json.h"
#include "folderman.h"
#include "QProgressIndicator.h"
#include <QBuffer>
#include <QMovie>
#include <QMessageBox>
@ -32,23 +33,20 @@ ShareDialog::ShareDialog(const QString &path, const bool &isDir, QWidget *parent
_ui->setupUi(this);
_ui->pushButton_copy->setIcon(QIcon::fromTheme("edit-copy"));
layout()->setSizeConstraint(QLayout::SetFixedSize);
QMovie *movie = new QMovie("/home/azelphur/ownCloud-share-tools/loading-icon.gif");
movie->start();
_ui->labelShareSpinner->setMovie(movie);
_ui->labelShareSpinner->hide();
_ui->labelPasswordSpinner->setMovie(movie);
_ui->labelPasswordSpinner->hide();
_pi_link = new QProgressIndicator();
_pi_password = new QProgressIndicator();
_pi_date = new QProgressIndicator();
_ui->horizontalLayout_4->addWidget(_pi_link);
_ui->horizontalLayout_5->addWidget(_pi_password);
_ui->horizontalLayout_3->addWidget(_pi_date);
_ui->labelCalendarSpinner->setMovie(movie);
_ui->labelCalendarSpinner->hide();
connect(_ui->checkBox_shareLink, SIGNAL(clicked()), this, SLOT(slotCheckBoxShareLinkClicked()));
connect(_ui->checkBox_password, SIGNAL(clicked()), this, SLOT(slotCheckBoxPasswordClicked()));
connect(_ui->lineEdit_password, SIGNAL(returnPressed()), this, SLOT(slotPasswordReturnPressed()));
connect(_ui->checkBox_expire, SIGNAL(clicked()), this, SLOT(slotCheckBoxExpireClicked()));
connect(_ui->calendar, SIGNAL(clicked(QDate)), SLOT(slotCalendarClicked(QDate)));
_ui->labelShareSpinner->hide();
_ui->lineEdit_shareLink->hide();
_ui->pushButton_copy->hide();
_ui->lineEdit_password->hide();
@ -112,7 +110,7 @@ ShareDialog::ShareDialog(const QString &path, const bool &isDir, QWidget *parent
void ShareDialog::setExpireDate(const QString &date)
{
_ui->labelCalendarSpinner->show();
_pi_date->startAnimation();
QUrl url = Account::concatUrlPath(AccountManager::instance()->account()->url(), QString("ocs/v1.php/apps/files_sharing/api/v1/shares/").append(QString::number(_public_share_id)));
QUrl postData;
QList<QPair<QString, QString> > getParams;
@ -128,7 +126,7 @@ void ShareDialog::setExpireDate(const QString &date)
void ShareDialog::slotExpireSet(const QString & /* reply */)
{
_ui->labelCalendarSpinner->hide();
_pi_date->stopAnimation();
}
void ShareDialog::slotCalendarClicked(const QDate &date)
@ -162,7 +160,7 @@ void ShareDialog::slotPasswordReturnPressed()
void ShareDialog::setPassword(QString password)
{
_ui->labelPasswordSpinner->show();
_pi_password->startAnimation();
QUrl url = Account::concatUrlPath(AccountManager::instance()->account()->url(), QString("ocs/v1.php/apps/files_sharing/api/v1/shares/").append(QString::number(_public_share_id)));
QUrl postData;
QList<QPair<QString, QString> > getParams;
@ -178,7 +176,7 @@ void ShareDialog::setPassword(QString password)
void ShareDialog::slotPasswordSet(const QString & /* reply */)
{
_ui->labelPasswordSpinner->hide();
_pi_password->stopAnimation();
}
void ShareDialog::getShares()
@ -302,7 +300,7 @@ void ShareDialog::slotSharesFetched(const QString &reply)
void ShareDialog::slotDeleteShareFetched(const QString & /* reply */)
{
_ui->labelShareSpinner->hide();
_pi_link->stopAnimation();
_ui->lineEdit_shareLink->hide();
_ui->pushButton_copy->hide();
_ui->lineEdit_password->hide();
@ -315,7 +313,7 @@ void ShareDialog::slotCheckBoxShareLinkClicked()
{
if (_ui->checkBox_shareLink->checkState() == Qt::Checked)
{
_ui->labelShareSpinner->show();
_pi_link->startAnimation();
QUrl url = Account::concatUrlPath(AccountManager::instance()->account()->url(), QLatin1String("ocs/v1.php/apps/files_sharing/api/v1/shares"));
QUrl postData;
QList<QPair<QString, QString> > getParams;
@ -331,7 +329,7 @@ void ShareDialog::slotCheckBoxShareLinkClicked()
}
else
{
_ui->labelShareSpinner->show();
_pi_link->startAnimation();
QUrl url = Account::concatUrlPath(AccountManager::instance()->account()->url(), QString("ocs/v1.php/apps/files_sharing/api/v1/shares/").append(QString::number(_public_share_id)));
QList<QPair<QString, QString> > getParams;
getParams.append(qMakePair(QString::fromLatin1("format"), QString::fromLatin1("json")));
@ -344,7 +342,7 @@ void ShareDialog::slotCheckBoxShareLinkClicked()
void ShareDialog::slotCreateShareFetched(const QString &reply)
{
_ui->labelShareSpinner->hide();
_pi_link->stopAnimation();
bool success;
QVariantMap json = QtJson::parse(reply, success).toMap();
_public_share_id = json.value("ocs").toMap().values("data")[0].toMap().value("id").toULongLong();
@ -366,7 +364,7 @@ void ShareDialog::slotCheckBoxPasswordClicked()
else
{
ShareDialog::setPassword(QString());
_ui->labelPasswordSpinner->show();
_pi_password->startAnimation();
_ui->lineEdit_password->hide();
}
}

5
src/gui/sharedialog.h
View file

@ -15,6 +15,7 @@
#define SHAREDIALOG_H
#include "networkjobs.h"
#include "QProgressIndicator.h"
#include <QDialog>
#include <QTreeWidgetItem>
@ -85,6 +86,10 @@ private:
void setPassword(QString password);
void setExpireDate(const QString &date);
int checkJsonReturnCode(const QString &reply);
QProgressIndicator *_pi_link;
QProgressIndicator *_pi_password;
QProgressIndicator *_pi_date;
};
}