CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reorganize all the screenshot files

Browse Source
This commit is contained in:
Petr Mrázek
2014-02-25 00:51:24 +01:00
parent b1cddb4600
commit cb5cfe7242
10 changed files with 60 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gui/dialogs/ScreenshotDialog.cpp
View File

@ -7,8 +7,8 @@
#include "ProgressDialog.h"
#include "CustomMessageBox.h"
#include "logic/net/NetJob.h"
#include "logic/net/ImgurUpload.h"
#include "logic/net/ImgurAlbumCreation.h"
#include "logic/screenshots/ImgurUpload.h"
#include "logic/screenshots/ImgurAlbumCreation.h"
#include "logic/tasks/SequentialTask.h"
ScreenshotDialog::ScreenshotDialog(ScreenshotList *list, QWidget *parent)
@ -30,10 +30,10 @@ QString ScreenshotDialog::message() const
.arg(m_imgurAlbum->id(), m_imgurAlbum->deleteHash());
}
QList<ScreenShot *> ScreenshotDialog::selected() const
QList<ScreenshotPtr> ScreenshotDialog::selected() const
{
QList<std::shared_ptr<ScreenShot>> list;
QList<std::shared_ptr<ScreenShot>> first = m_list->screenshots();
QList<ScreenshotPtr> list;
QList<ScreenshotPtr> first = m_list->screenshots();
for (QModelIndex index : ui->listView->selectionModel()->selectedRows())
{
list.append(first.at(index.row()));
@ -51,14 +51,14 @@ void ScreenshotDialog::on_uploadBtn_clicked()
}
SequentialTask *task = new SequentialTask(this);
NetJob *job = new NetJob("Screenshot Upload");
for (std::shared_ptr<ScreenShot> shot : m_uploaded)
for (auto shot : m_uploaded)
{
job->addNetAction(ImgurUpload::make(shot));
}
NetJob *albumTask = new NetJob("Imgur Album Creation");
albumTask->addNetAction(m_imgurAlbum = ImgurAlbumCreation::make(m_uploaded));
task->addTask(std::shared_ptr<NetJob>(job));
task->addTask(std::shared_ptr<NetJob>(albumTask));
task->addTask(NetJobPtr(job));
task->addTask(NetJobPtr(albumTask));
ProgressDialog prog(this);
if (prog.exec(task) == QDialog::Accepted)
{

6
gui/dialogs/ScreenshotDialog.h
View File

@ -1,7 +1,7 @@
#pragma once
#include <QDialog>
#include "logic/lists/ScreenshotList.h"
#include "logic/screenshots/ScreenshotList.h"
class ImgurAlbumCreation;
@ -24,7 +24,7 @@ public:
};
QString message() const;
QList<std::shared_ptr<ScreenShot>> selected() const;
QList<ScreenshotPtr> selected() const;
private
slots:
@ -35,6 +35,6 @@ slots:
private:
Ui::ScreenshotDialog *ui;
ScreenshotList *m_list;
QList<std::shared_ptr<ScreenShot>> m_uploaded;
QList<ScreenshotPtr> m_uploaded;
std::shared_ptr<ImgurAlbumCreation> m_imgurAlbum;
};