From 377316999ea9ef6adbc75c52a858eb8e526616e7 Mon Sep 17 00:00:00 2001 From: Alexia Date: Thu, 12 May 2016 16:51:25 -0400 Subject: GH-767 Basic skin upload --- application/dialogs/SkinUploadDialog.cpp | 69 ++++++++++++++++++++++++++ application/dialogs/SkinUploadDialog.h | 29 +++++++++++ application/dialogs/SkinUploadDialog.ui | 85 ++++++++++++++++++++++++++++++++ 3 files changed, 183 insertions(+) create mode 100644 application/dialogs/SkinUploadDialog.cpp create mode 100644 application/dialogs/SkinUploadDialog.h create mode 100644 application/dialogs/SkinUploadDialog.ui (limited to 'application/dialogs') diff --git a/application/dialogs/SkinUploadDialog.cpp b/application/dialogs/SkinUploadDialog.cpp new file mode 100644 index 00000000..ebbab785 --- /dev/null +++ b/application/dialogs/SkinUploadDialog.cpp @@ -0,0 +1,69 @@ +#include +#include +#include +#include +#include "SkinUploadDialog.h" +#include "ui_SkinUploadDialog.h" +#include "ProgressDialog.h" +#include "CustomMessageBox.h" + +void SkinUploadDialog::on_buttonBox_rejected() +{ + close(); +} + +void SkinUploadDialog::on_buttonBox_accepted() +{ + AuthSessionPtr session = std::make_shared(); + auto login = m_acct->login(session); + ProgressDialog prog(this); + if (prog.execWithTask((Task*)login.get()) != QDialog::Accepted) + { + //FIXME: recover with password prompt + CustomMessageBox::selectable(this, tr("Failed to login!"), tr("Unknown error"), QMessageBox::Warning)->exec(); + close(); + return; + } + QString fileName = ui->skinPathTextBox->text(); + if (!QFile::exists(fileName)) + { + CustomMessageBox::selectable(this, tr("Skin file does not exist!"), tr("Unknown error"), QMessageBox::Warning)->exec(); + close(); + return; + } + SkinUpload::Model model = SkinUpload::STEVE; + if (ui->steveBtn->isChecked()) + { + model = SkinUpload::STEVE; + } + else if (ui->alexBtn->isChecked()) + { + model = SkinUpload::ALEX; + } + SkinUploadPtr upload = std::make_shared(this, session, FS::read(fileName), model); + if (prog.execWithTask((Task*)upload.get()) != QDialog::Accepted) + { + CustomMessageBox::selectable(this, tr("Failed to upload skin!"), tr("Unknown error"), QMessageBox::Warning)->exec(); + close(); + return; + } + CustomMessageBox::selectable(this, tr("Skin uploaded!"), tr("Success"), QMessageBox::Information)->exec(); + close(); +} + +void SkinUploadDialog::on_skinBrowseBtn_clicked() +{ + QString raw_path = QFileDialog::getOpenFileName(this, tr("Select Skin Texture"), QString(), "*.png"); + QString cooked_path = FS::NormalizePath(raw_path); + if (cooked_path.isEmpty() || !QFileInfo::exists(cooked_path)) + { + return; + } + ui->skinPathTextBox->setText(cooked_path); +} + +SkinUploadDialog::SkinUploadDialog(MojangAccountPtr acct, QWidget *parent) + :QDialog(parent), m_acct(acct), ui(new Ui::SkinUploadDialog) +{ + ui->setupUi(this); +} diff --git a/application/dialogs/SkinUploadDialog.h b/application/dialogs/SkinUploadDialog.h new file mode 100644 index 00000000..514eabc8 --- /dev/null +++ b/application/dialogs/SkinUploadDialog.h @@ -0,0 +1,29 @@ +#pragma once + +#include +#include + +namespace Ui +{ + class SkinUploadDialog; +} + +class SkinUploadDialog : public QDialog { + Q_OBJECT +public: + explicit SkinUploadDialog(MojangAccountPtr acct, QWidget *parent = 0); + virtual ~SkinUploadDialog() {}; + +public slots: + void on_buttonBox_accepted(); + + void on_buttonBox_rejected(); + + void on_skinBrowseBtn_clicked(); + +protected: + MojangAccountPtr m_acct; + +private: + Ui::SkinUploadDialog *ui; +}; diff --git a/application/dialogs/SkinUploadDialog.ui b/application/dialogs/SkinUploadDialog.ui new file mode 100644 index 00000000..6f5307e3 --- /dev/null +++ b/application/dialogs/SkinUploadDialog.ui @@ -0,0 +1,85 @@ + + + SkinUploadDialog + + + + 0 + 0 + 413 + 300 + + + + Skin Upload + + + + + + Skin File + + + + + + + + + + 0 + 0 + + + + + 28 + 16777215 + + + + ... + + + + + + + + + + Player Model + + + + + + Steve Model + + + true + + + + + + + Alex Model + + + + + + + + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + + -- cgit v1.2.3