Fix bug. Fix gui in MacOS

peterkomar · Nov 19, 2015 · e8baa79 · e8baa79
1 parent e9cbc35
commit e8baa79
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/src/leftpanel.cpp b/src/leftpanel.cpp
@@ -42,7 +42,7 @@ LeftPanel::LeftPanel(RestClientMainWindow* app)
     m_requestContentType->addItems(types);
     m_requestContentType->setEditable(true);
 
-    QWidget *rawTab              = new QWidget;
+    QWidget *rawTab = new QWidget;
 
     QHBoxLayout *hLayout = new QHBoxLayout;
     hLayout->addWidget(new QLabel(QObject::tr("Content Type:")));
@@ -54,6 +54,7 @@ LeftPanel::LeftPanel(RestClientMainWindow* app)
     rawTab->setLayout(rawLayout);
 
     m_tab = new QTabWidget;
+    m_tab->setTabPosition(QTabWidget::South);
     m_tab->addTab(buildParamsWidget(m_params), QObject::tr("Params"));
     m_tab->addTab(buildParamsWidget(m_headers), QObject::tr("Headers"));
     m_tab->addTab(rawTab, QObject::tr("Content to Send"));

diff --git a/src/mainpanel.cpp b/src/mainpanel.cpp
@@ -30,7 +30,7 @@ MainPanel::MainPanel(RestClientMainWindow* app)
     m_response->setMinimumSize(500, 205);
 
     m_errorResponse = new QPlainTextEdit;
-    m_errorResponse->setPlainText(QObject::tr("Error:"));
+    m_errorResponse->setPlainText(QObject::tr(""));
     m_errorResponse->setReadOnly(true);
     m_errorResponse->setMinimumSize(500, 40);
     m_errorResponse->setMaximumHeight(40);

diff --git a/src/restclientmainwindow.cpp b/src/restclientmainwindow.cpp
@@ -186,9 +186,15 @@ void RestClientMainWindow::slotSendRequest()
         ++headerIterator;
     }
 
-    QByteArray rawBody  = m_leftPanel->m_rawContent->toPlainText().toUtf8();
-    m_request->addRequestHeader("Content-Type", m_leftPanel->m_requestContentType->currentText());
-    m_request->setRaw(rawBody);
+    QString raw = m_leftPanel->m_rawContent->toPlainText().trimmed();
+    if (!raw.isEmpty()) {
+        m_request->setRaw(raw.toUtf8());
+    }
+
+    QString contentType = m_leftPanel->m_requestContentType->currentText().trimmed();
+    if (!contentType.isEmpty()) {
+        m_request->addRequestHeader("Content-Type", contentType);
+    }
 
     m_restClient = new RestClient;
     connect(m_restClient, SIGNAL(finish()), this, SLOT(slotFinishRequest()));