From f99afa8365baa9519a4076e43395989b6b3dae0b Mon Sep 17 00:00:00 2001 From: arcan1s Date: Sun, 27 Jul 2014 23:20:09 +0400 Subject: [PATCH] fix newlines --- sources/src/main.cpp | 2 +- sources/src/reportabug.cpp | 77 ++++++++++++++++++++++---------------- sources/src/reportabug.h | 8 ++-- sources/src/reportabug.ui | 5 ++- 4 files changed, 52 insertions(+), 40 deletions(-) diff --git a/sources/src/main.cpp b/sources/src/main.cpp index 9045950..4e2f3bb 100644 --- a/sources/src/main.cpp +++ b/sources/src/main.cpp @@ -26,7 +26,7 @@ int main(int argc, char *argv[]) { QApplication a(argc, argv); - Reportabug w; + Reportabug w(0, true); w.show(); return a.exec(); } diff --git a/sources/src/reportabug.cpp b/sources/src/reportabug.cpp index d977223..d5a5ed1 100644 --- a/sources/src/reportabug.cpp +++ b/sources/src/reportabug.cpp @@ -29,8 +29,9 @@ #include "config.h" -Reportabug::Reportabug(QWidget *parent) +Reportabug::Reportabug(QWidget *parent, bool debugCmd) : QMainWindow(parent), + debug(debugCmd), ui(new Ui::Reportabug) { ui->setupUi(this); @@ -42,12 +43,16 @@ Reportabug::Reportabug(QWidget *parent) Reportabug::~Reportabug() { + if (debug) qDebug() << "[Reportabug]" << "[~Reportabug]"; + delete ui; } void Reportabug::createActions() { + if (debug) qDebug() << "[Reportabug]" << "[createActions]"; + connect(ui->comboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(updateTabs(int))); connect(ui->buttonBox->button(QDialogButtonBox::Close), SIGNAL(clicked(bool)), this, SLOT(close())); connect(ui->buttonBox->button(QDialogButtonBox::Ok), SIGNAL(clicked(bool)), this, SLOT(sendReport())); @@ -56,6 +61,8 @@ void Reportabug::createActions() void Reportabug::createComboBox() { + if (debug) qDebug() << "[Reportabug]" << "[createComboBox]"; + ui->comboBox->clear(); if (ENABLE_GITHUB) ui->comboBox->addItem(QString(GITHUB_COMBOBOX)); @@ -66,6 +73,9 @@ void Reportabug::createComboBox() int Reportabug::getNumberByIndex(const int index) { + if (debug) qDebug() << "[Reportabug]" << "[getNumberByIndex]"; + if (debug) qDebug() << "[Reportabug]" << "[getNumberByIndex]" << ":" << "Index" << index; + if (index == -1) // nothing to do return -1; @@ -87,39 +97,18 @@ int Reportabug::getNumberByIndex(const int index) // ESC press event void Reportabug::keyPressEvent(QKeyEvent *pressedKey) { + if (debug) qDebug() << "[Reportabug]" << "[keyPressEvent]"; + if (pressedKey->key() == Qt::Key_Escape) close(); } -QString Reportabug::parseCmd(QString line, - const QString password, - const QString text, - const QString username) -{ - if (line.contains(QString("$ISSUES_URL"))) - line = line.split(QString("$ISSUES_URL"))[0] + - parseString(QString(ISSUES_URL)) + - line.split(QString("$ISSUES_URL"))[1]; - if (line.contains(QString("$PASSWORD"))) - line = line.split(QString("$PASSWORD"))[0] + - password + - line.split(QString("$PASSWORD"))[1]; - if (line.contains(QString("$TEXT"))) - line = line.split(QString("$TEXT"))[0] + - text + - line.split(QString("$TEXT"))[1]; - if (line.contains(QString("$USERNAME"))) - line = line.split(QString("$USERNAME"))[0] + - username + - line.split(QString("$USERNAME"))[1]; - - return line; -} - - QString Reportabug::parseString(QString line) { + if (debug) qDebug() << "[Reportabug]" << "[parseString]"; + if (debug) qDebug() << "[Reportabug]" << "[parseString]" << ":" << "Parse line" << line; + if (line.contains(QString("$OWNER"))) line = line.split(QString("$OWNER"))[0] + QString(OWNER) + @@ -135,9 +124,15 @@ QString Reportabug::parseString(QString line) QByteArray Reportabug::prepareRequest(const QString title, const QString body) { + if (debug) qDebug() << "[Reportabug]" << "[prepareRequest]"; + if (debug) qDebug() << "[Reportabug]" << "[prepareRequest]" << ":" << "Title" << title; + if (debug) qDebug() << "[Reportabug]" << "[prepareRequest]" << ":" << "Title" << body; + QStringList requestList; requestList.append(QString("\"title\":\"") + title + QString("\"")); - requestList.append(QString("\"body\":\"") + body + QString("\"")); + QString fixBody = body; + fixBody.replace(QString("\n"), QString("
")); + requestList.append(QString("\"body\":\"") + fixBody + QString("\"")); if (!QString(TAG_ASSIGNEE).isEmpty()) requestList.append(QString("\"assignee\":\"") + parseString(QString(TAG_ASSIGNEE)) + QString("\"")); if (!QString(TAG_MILESTONE).isEmpty()) @@ -160,7 +155,10 @@ QByteArray Reportabug::prepareRequest(const QString title, const QString body) void Reportabug::sendReport() { + if (debug) qDebug() << "[Reportabug]" << "[sendReport]"; + int number = getNumberByIndex(ui->comboBox->currentIndex()); + if (number == -1) return; else if (number == 0) @@ -172,8 +170,12 @@ void Reportabug::sendReport() void Reportabug::updateTabs(const int index) { + if (debug) qDebug() << "[Reportabug]" << "[updateTabs]"; + if (debug) qDebug() << "[Reportabug]" << "[updateTabs]" << ":" << "Index" << index; + int number = getNumberByIndex(index); ui->stackedWidget->setCurrentIndex(number + 1); + if (number == -1) return; else if (number == 0) @@ -185,23 +187,30 @@ void Reportabug::updateTabs(const int index) void Reportabug::updateGithubTab() { + if (debug) qDebug() << "[Reportabug]" << "[updateGithubTab]"; + ui->lineEdit_username->clear(); ui->lineEdit_password->clear(); ui->lineEdit_title->setText(QString(TAG_TITLE)); - ui->plainTextEdit->setPlainText(QString(TAG_BODY)); + ui->textEdit->setPlainText(QString(TAG_BODY)); } void Reportabug::updateGitreportTab() { - + if (debug) qDebug() << "[Reportabug]" << "[updateGitreportTab]"; } void Reportabug::replyFinished(QNetworkReply *reply) { + if (debug) qDebug() << "[Reportabug]" << "[replyFinished]"; + if (debug) qDebug() << "[Reportabug]" << "[replyFinished]" << ":" << "Error state" << reply->error(); + if (debug) qDebug() << "[Reportabug]" << "[replyFinished]" << ":" << "Reply size" << reply->readBufferSize(); + int state = true; QString answer = reply->readAll(); + if (debug) qDebug() << "[Reportabug]" << "[replyFinished]" << ":" << answer; QString messageBody, messageTitle; QMessageBox::Icon icon = QMessageBox::NoIcon; if (answer.contains(QString("\"html_url\":"))) { @@ -255,7 +264,9 @@ void Reportabug::replyFinished(QNetworkReply *reply) void Reportabug::sendReportUsingGithub() { - // authorization + if (debug) qDebug() << "[Reportabug]" << "[sendReportUsingGithub]"; + + // authentication QString username = ui->lineEdit_username->text(); QString password = ui->lineEdit_password->text(); QString concatenated = username + QString(":") + password; @@ -263,7 +274,7 @@ void Reportabug::sendReportUsingGithub() QString headerData = QString("Basic ") + userData; // text QString title = ui->lineEdit_title->text(); - QString body = ui->plainTextEdit->toPlainText(); + QString body = ui->textEdit->toPlainText(); QByteArray text = prepareRequest(title, body); QByteArray textSize = QByteArray::number(text.size()); // sending request @@ -282,5 +293,5 @@ void Reportabug::sendReportUsingGithub() void Reportabug::sendReportUsingGitreport() { - + if (debug) qDebug() << "[Reportabug]" << "[sendReportUsingGitreport]"; } diff --git a/sources/src/reportabug.h b/sources/src/reportabug.h index 2815cf0..cc72f6b 100644 --- a/sources/src/reportabug.h +++ b/sources/src/reportabug.h @@ -33,7 +33,8 @@ class Reportabug : public QMainWindow Q_OBJECT public: - explicit Reportabug(QWidget *parent = 0); + explicit Reportabug(QWidget *parent = 0, + bool debugCmd = false); ~Reportabug(); public slots: @@ -50,16 +51,13 @@ private slots: void replyFinished(QNetworkReply *reply); private: + bool debug; Ui::Reportabug *ui; void createActions(); void createComboBox(); int getNumberByIndex(const int index); // ESC pressed event void keyPressEvent(QKeyEvent *pressedKey); - QString parseCmd(QString line, - const QString password = QString(), - const QString text = QString(), - const QString username = QString()); QString parseString(QString line); QByteArray prepareRequest(const QString title, const QString body); }; diff --git a/sources/src/reportabug.ui b/sources/src/reportabug.ui index 433bb6e..712d361 100644 --- a/sources/src/reportabug.ui +++ b/sources/src/reportabug.ui @@ -101,10 +101,13 @@ - + Text of the report + + false +