Merge branch 'refs/heads/develop'

peterkomar · Oct 7, 2014 · 9b6f213 · 9b6f213
2 parents 2021cff + 080aecb
commit 9b6f213
Show file tree

Hide file tree

Showing 6 changed files with 74 additions and 13 deletions.
diff --git a/src/application.qrc b/src/application.qrc
diff --git a/src/qjsonview.cpp b/src/qjsonview.cpp
@@ -106,6 +106,7 @@ QTreeWidgetItem* QJsonView::createItem(const QString& name, QTreeWidgetItem *par
         item = new QTreeWidgetItem(this, type);
     }
     item->setText(0, name);
+    item->setFlags(item->flags() | Qt::ItemIsEditable);
     expandItem(item);
 
     return item;

diff --git a/src/responsewidget.cpp b/src/responsewidget.cpp
@@ -48,21 +48,23 @@ void ResponseWidget::append(const QString& text)
     m_textView->append(text);
 }
 
-void ResponseWidget::render(const QString& texType)
+int ResponseWidget::render(const QString& texType)
 {
+    int index = 0;
     try{
 
         if( texType.indexOf("application/json") > -1 ) {
             m_jsonView->setJson(toText());
-            setCurrentIndex(1);
-            return;
-        } else {
-            setCurrentIndex(0);
+            index = 1;
         }
 
     } catch( ... ) {
-        setCurrentIndex(0);
+        index = 0;
     }
+
+    setCurrentIndex(index);
+
+    return index;
 }
 
 QString ResponseWidget::toText()

diff --git a/src/responsewidget.h b/src/responsewidget.h
@@ -33,7 +33,7 @@ class ResponseWidget : public QStackedWidget
     explicit ResponseWidget(QWidget *parent = 0);
     void setText(const QString& text, const QString& textType);
     void append(const QString& text);
-    void render(const QString& texType);
+    int render(const QString& texType);
 
     void clear();
     QString toText();

diff --git a/src/restclientmainwindow.cpp b/src/restclientmainwindow.cpp
@@ -84,7 +84,7 @@ void RestClientMainWindow::_gui()
 
      QVBoxLayout *l = new QVBoxLayout;
 
-     m_response = new ResponseWidget();
+     m_response = new ResponseWidget(this);
      m_response->setMinimumSize(500, 205);
      l->addWidget(m_response);
 
@@ -104,11 +104,36 @@ void RestClientMainWindow::_gui()
      setupLeftPanel();
      setupRightPanel();
      setupBottomPabel();
+     setupMenu();
+}
+
+void RestClientMainWindow::setupMenu()
+{
+    QMenu *view = menuBar()->addMenu("View");
+
+
+    m_jsonView = new QAction("Json", this);
+    m_textView = new QAction("Text", this);
+
+    QActionGroup *viewGroup = new QActionGroup(this);
+    viewGroup->addAction(m_jsonView);
+    viewGroup->addAction(m_textView);
+
+    m_jsonView->setCheckable(true);
+    m_textView->setCheckable(true);
+    m_textView->setChecked(true);
+
+    view->addAction(m_jsonView);
+    view->addAction(m_textView);
+
+    connect(m_jsonView, SIGNAL(triggered()), this, SLOT(slotViewJson()));
+    connect(m_textView, SIGNAL(triggered()), this, SLOT(slotViewText()));
+
+    QAction *a = new QAction("About", this);
+    QMenu *m = menuBar()->addMenu("Help");
+    m->addAction(a);
+    connect(a, SIGNAL(triggered()), this, SLOT(slotAbout()));
 
-     QAction *a = new QAction("About", this);
-     QMenu *m = menuBar()->addMenu("Help");
-     m->addAction(a);
-     connect(a, SIGNAL(triggered()), this, SLOT(slotAbout()));
 }
 
 void RestClientMainWindow::setupToolBar()
@@ -446,7 +471,10 @@ void RestClientMainWindow::slotFinishRequest()
     for (int i = 0; i < headers.size(); ++i) {
 
         if( headers.at(i) == "Content-Type" ) {
-            m_response->render(m_reply->rawHeader(headers.at(i)));
+            switch(m_response->render(m_reply->rawHeader(headers.at(i)))){
+            case 0: m_textView->setChecked(true); break;
+            case 1: m_jsonView->setChecked(true); break;
+            }
         }
 
         m_responseHeaders->append("<b>"+headers.at(i) + "</b>: " + m_reply->rawHeader(headers.at(i)));
@@ -599,6 +627,27 @@ void RestClientMainWindow::slotHistoryClear()
     QApplication::restoreOverrideCursor();
 }
 
+void RestClientMainWindow::slotViewJson()
+{
+    m_response->setCurrentIndex(1);
+}
+
+void RestClientMainWindow::slotViewText()
+{
+    m_response->setCurrentIndex(0);
+}
+
+void RestClientMainWindow::slotNotifyMenuView(int pos)
+{
+    switch (pos) {
+    case 0: m_textView->setChecked(true);
+        break;
+    case 1: m_jsonView->setChecked(true);
+    default:
+        break;
+    }
+}
+
 void RestClientMainWindow::slotAbout()
 {
     QMessageBox::about(this, "About", "<b>QRestClient</b> - REST client for WEB services developers.<br/>"

diff --git a/src/restclientmainwindow.h b/src/restclientmainwindow.h
@@ -57,8 +57,12 @@ public slots:
     void slotHistoryRemoveSelected();
     void slotHistoryClear();
 
+    void slotViewJson();
+    void slotViewText();
     void slotAbout();
 
+    void slotNotifyMenuView(int pos);
+
 protected:
     void closeEvent(QCloseEvent *event);
 
@@ -83,6 +87,10 @@ public slots:
 
     QTime m_time;
 
+    QAction *m_jsonView;
+    QAction *m_textView;
+
+
     void loadHistory();
     void saveHistory(int resposeCode);
 
@@ -94,6 +102,7 @@ public slots:
     void setupLeftPanel();
     void setupRightPanel();
     void setupBottomPabel();
+    void setupMenu();
 
     QWidget* buildParamsWidget(ParamsList *);