Merge pull request #22 from peterkomar/structure

Structure

desktop/qrestclient.desktop → qrestclient.desktop

@@ -8,4 +8,6 @@ X-KDE-StartupNotify=true
 Icon=qrestclient
 Terminal=false
 Categories=Development;Utilities;
-InitialPreference=9
+InitialPreference=9
+StartupNotify=false
+Encoding=UTF-8

build/rpm/qrestclient-2.0.1.spec → rpm/qrestclient-2.0.1.spec

@@ -50,10 +50,10 @@ make %{?_smp_mflags}
 %install
 mkdir -p %{buildroot}/usr/bin
 mkdir -p %{buildroot}/usr/share/applications
-mkdir -p %{buildroot}/usr/share/icons
+mkdir -p %{buildroot}/usr/share/icons/hicolor
 cp bin/qrestclient %{buildroot}/usr/bin
-cp -R desktop/qrestclient.desktop %{buildroot}/usr/share/applications
-cp -R -f desktop/icons %{buildroot}/usr/share
+cp -R qrestclient.desktop %{buildroot}/usr/share/applications
+cp -R -f icons/* %{buildroot}/usr/share/icons/hicolor
 %clean
 rm -rf $RPM_BUILD_ROOT
 %post

src/menu.cpp

@@ -19,6 +19,7 @@
  ***************************************************************************/
 #include "menu.h"
 #include "restclientmainwindow.h"
+#include "responsewidget.h"
 
 #include <QMenuBar>
 #include <QActionGroup>
@@ -31,25 +32,35 @@ Menu::Menu(RestClientMainWindow* app)
     m_jsonView = new QAction("Json", app);
     m_textView = new QAction("Text", app);
     m_csvView  = new QAction("CSV", app);
+    m_htmlView = new QAction("Html", app);
 
     QActionGroup *viewGroup = new QActionGroup(app);
     viewGroup->addAction(m_jsonView);
     viewGroup->addAction(m_textView);
     viewGroup->addAction(m_csvView);
+    viewGroup->addAction(m_htmlView);
 
     m_jsonView->setCheckable(true);
     m_textView->setCheckable(true);
     m_csvView->setCheckable(true);
+    m_htmlView->setCheckable(true);
 
     m_textView->setChecked(true);
 
     view->addAction(m_jsonView);
     view->addAction(m_textView);
     view->addAction(m_csvView);
+    view->addAction(m_htmlView);
 
-    QObject::connect(m_jsonView, SIGNAL(triggered()), app, SLOT(slotViewJson()));
-    QObject::connect(m_textView, SIGNAL(triggered()), app, SLOT(slotViewText()));
-    QObject::connect(m_csvView,  SIGNAL(triggered()), app, SLOT(slotViewCsv()));
+    m_jsonView->setProperty("type", ResponseWidget::TYPE_JSON);
+    m_textView->setProperty("type", ResponseWidget::TYPE_TEXT);
+    m_csvView->setProperty("type", ResponseWidget::TYPE_CSV);
+    m_htmlView->setProperty("type", ResponseWidget::TYPE_HTML);
+
+    QObject::connect(m_jsonView, SIGNAL(triggered()), app, SLOT(slotViewMode()));
+    QObject::connect(m_textView, SIGNAL(triggered()), app, SLOT(slotViewMode()));
+    QObject::connect(m_csvView,  SIGNAL(triggered()), app, SLOT(slotViewMode()));
+    QObject::connect(m_htmlView, SIGNAL(triggered()), app, SLOT(slotViewMode()));
 
     QAction *a = new QAction(QObject::tr("About"), app);
     QMenu *m = app->menuBar()->addMenu(QObject::tr("Help"));

src/menu.h

@@ -31,6 +31,7 @@ class Menu
     QAction *m_jsonView;
     QAction *m_textView;
     QAction *m_csvView;
+    QAction *m_htmlView;
 };
 
 #endif // MENU_H

src/responsewidget.cpp

@@ -23,22 +23,25 @@
 #include "qcsvview.h"
 
 #include <QTextEdit>
-#include <QDebug>
+#include <QTextBrowser>
 
 ResponseWidget::ResponseWidget(QWidget *parent) :
     QStackedWidget(parent)
 {
     m_textView = new QTextEdit;
     m_textView->setReadOnly(true);
-    addWidget(m_textView);
+    insertWidget(TYPE_TEXT, m_textView);
+
+    m_htmlView = new QTextBrowser;
+    insertWidget(TYPE_HTML, m_htmlView);
 
     m_jsonView = new QJsonView;
-    addWidget(m_jsonView);
+    insertWidget(TYPE_JSON, m_jsonView);
 
     m_csvView = new QCsvView;
-    addWidget(m_csvView);
+    insertWidget(TYPE_CSV, m_csvView);
 
-    setCurrentIndex(0);
+    setCurrentIndex(TYPE_TEXT);
 
     m_text = "";
 }
@@ -72,6 +75,9 @@ ResponseWidget::type ResponseWidget::render(type typeResponse)
             case TYPE_CSV:  index = TYPE_CSV;
                             m_csvView->setText(body);
                             break;
+            case TYPE_HTML: index = TYPE_HTML;
+                            m_htmlView->setHtml(body);
+                            break;
 
         }
 
@@ -80,7 +86,7 @@ ResponseWidget::type ResponseWidget::render(type typeResponse)
         m_textView->setPlainText(body);
     }
 
-    setCurrentIndex(index);
+    setCurrentIndex((int)index);
 
     return index;
 }

src/responsewidget.h

@@ -26,6 +26,7 @@
 class QTextEdit;
 class QJsonView;
 class QCsvView;
+class QTextBrowser;
 
 class ResponseWidget : public QStackedWidget
 {
@@ -36,6 +37,7 @@ class ResponseWidget : public QStackedWidget
       TYPE_TEXT = 0,
       TYPE_JSON,
       TYPE_CSV,
+      TYPE_HTML,
     };
 
     explicit ResponseWidget(QWidget *parent = 0);
@@ -50,6 +52,7 @@ class ResponseWidget : public QStackedWidget
     QTextEdit *m_textView;
     QJsonView *m_jsonView;
     QCsvView  *m_csvView;
+    QTextBrowser *m_htmlView;
 
     QString m_text;
 };

src/restclientmainwindow.cpp

@@ -418,34 +418,30 @@ void RestClientMainWindow::slotHideHistoryFilter()
     loadHistory();
 }
 
-void RestClientMainWindow::slotViewJson()
+void RestClientMainWindow::slotViewMode()
 {
-    ResponseWidget::type type = m_mainPanel->m_response->render(ResponseWidget::TYPE_JSON);
+    if(QAction *action = qobject_cast<QAction *>(sender())) {
+        ResponseWidget::type typeOrigin = (ResponseWidget::type)action->property("type").toInt();
+        ResponseWidget::type type = m_mainPanel->m_response->render(typeOrigin);
 
-    if( type != ResponseWidget::TYPE_JSON ) {
-        QMessageBox::critical(this, tr("Error parese"), tr("Error parsing JSON"));
+        if (typeOrigin == ResponseWidget::TYPE_JSON && typeOrigin != type) {
+            QMessageBox::critical(this, tr("Error parese"), tr("Error parsing JSON"));
+        }
         slotNotifyMenuView(type);
     }
 }
 
-void RestClientMainWindow::slotViewText()
-{
-    ResponseWidget::type type = m_mainPanel->m_response->render(ResponseWidget::TYPE_TEXT);
-    slotNotifyMenuView(type);
-}
-
-void RestClientMainWindow::slotViewCsv()
-{
-    ResponseWidget::type type = m_mainPanel->m_response->render(ResponseWidget::TYPE_CSV);
-    slotNotifyMenuView(type);
-}
-
 void RestClientMainWindow::slotNotifyMenuView(int pos)
 {
     switch (pos) {
     case ResponseWidget::TYPE_TEXT: m_menu->m_textView->setChecked(true);
         break;
     case ResponseWidget::TYPE_JSON: m_menu->m_jsonView->setChecked(true);
+        break;
+    case ResponseWidget::TYPE_CSV: m_menu->m_csvView->setChecked(true);
+        break;
+    case ResponseWidget::TYPE_HTML: m_menu->m_htmlView->setChecked(true);
+        break;
     default:
         break;
     }

src/restclientmainwindow.h

@@ -59,9 +59,8 @@ public slots:
     void slotHideHistoryFilter();
     void slotRequestDetails();
 
-    void slotViewJson();
-    void slotViewText();
-    void slotViewCsv();
+    void slotViewMode();
+
     void slotAbout();
 
     void slotNotifyMenuView(int pos);