Add network error messages to retrieve methods

fathomssen · May 7, 2016 · 699e4ac · 699e4ac
1 parent f14f091
commit 699e4ac
Show file tree

Hide file tree

Showing 9 changed files with 140 additions and 85 deletions.
diff --git a/IssueCreator.cpp b/IssueCreator.cpp
@@ -51,10 +51,10 @@ IssueCreator::IssueCreator( SimpleRedmineClient* redmine, QQuickView* parent )
     connect( qml("create"), SIGNAL(clicked()), this, SLOT(save()) );
 
     // Connect the cancel button clicked signal to the close slot
-    connect( qml("cancel"), SIGNAL(clicked()), this, SLOT(closeWin()) );
+    connect( qml("cancel"), SIGNAL(clicked()), this, SLOT(close()) );
 
     // Connect the closed signal to the close slot
-    connect( this, &Window::closed, [=](){ closeWin(); } );
+    connect( this, &Window::closed, [=](){ close(); } );
 
     RETURN();
 }
@@ -66,16 +66,18 @@ IssueCreator::~IssueCreator()
 }
 
 void
-IssueCreator::closeWin()
+IssueCreator::close()
 {
     ENTER();
 
     if( isVisible() )
     {
         DEBUG() << "Closing issue creator window";
+
         if( cancelOnClose_ )
             cancelled();
-        close();
+
+        Window::close();
     }
 
     RETURN();
@@ -100,9 +102,20 @@ IssueCreator::loadCurrentUser()
 {
     ENTER();
 
-    redmine_->retrieveCurrentUser( [&]( User user )
+    redmine_->retrieveCurrentUser( [&]( User user, RedmineError redmineError, QStringList errors )
     {
         ENTER();
+
+        if( redmineError != NO_ERROR )
+        {
+            QString errorMsg = tr("Could not load issue statuses.");
+            for( const auto& error : errors )
+                errorMsg.append("\n").append(error);
+
+            message( errorMsg, QtCriticalMsg );
+            RETURN();
+        }
+
         currentUserId_ = user.id;
         RETURN();
     } );
@@ -115,10 +128,20 @@ IssueCreator::loadProjects()
 {
     ENTER();
 
-    redmine_->retrieveProjects( [&]( Projects projects )
+    redmine_->retrieveProjects( [&]( Projects projects, RedmineError redmineError, QStringList errors )
     {
         ENTER();
 
+        if( redmineError != NO_ERROR )
+        {
+            QString errorMsg = tr("Could not load projects.");
+            for( const auto& error : errors )
+                errorMsg.append("\n").append(error);
+
+            message( errorMsg, QtCriticalMsg );
+            RETURN();
+        }
+
         projectModel_.clear();
         projectModel_.push_back( SimpleItem(NULL_ID, "Choose project") );
         for( const auto& project : projects )
@@ -139,10 +162,20 @@ IssueCreator::loadTrackers()
 {
     ENTER();
 
-    redmine_->retrieveTrackers( [&]( Trackers trackers )
+    redmine_->retrieveTrackers( [&]( Trackers trackers, RedmineError redmineError, QStringList errors )
     {
         ENTER();
 
+        if( redmineError != NO_ERROR )
+        {
+            QString errorMsg = tr("Could not load trackers.");
+            for( const auto& error : errors )
+                errorMsg.append("\n").append(error);
+
+            message( errorMsg, QtCriticalMsg );
+            RETURN();
+        }
+
         trackerModel_.clear();
         trackerModel_.push_back( SimpleItem(NULL_ID, "Choose tracker") );
         for( const auto& tracker : trackers )
@@ -226,7 +259,7 @@ IssueCreator::save()
         message( tr("New issue created with ID %1").arg(id) );
 
         created( id );
-        closeWin();
+        close();
 
         RETURN();
     } );

diff --git a/IssueCreator.h b/IssueCreator.h
@@ -82,7 +82,7 @@ public slots:
     /**
      * @brief Close the issue selector dialog
      */
-    void closeWin();
+    void close();
 
     /**
      * @brief Display the issue selector dialog

diff --git a/IssueSelector.cpp b/IssueSelector.cpp
@@ -104,10 +104,20 @@ IssueSelector::loadIssues()
 {
     ENTER()(projectId_);
 
-    redmine_->retrieveIssues( [&]( Issues issues )
+    redmine_->retrieveIssues( [&]( Issues issues, RedmineError redmineError, QStringList errors )
     {
         ENTER();
 
+        if( redmineError != NO_ERROR )
+        {
+            QString errorMsg = tr("Could not load issues.");
+            for( const auto& error : errors )
+                errorMsg.append("\n").append(error);
+
+            message( errorMsg, QtCriticalMsg );
+            RETURN();
+        }
+
         issuesModel_.clear();
 
         for( const auto& issue : issues )
@@ -129,10 +139,20 @@ IssueSelector::loadProjects()
     projectModel_.clear();
     projectModel_.push_back( SimpleItem(NULL_ID, "Choose project") );
 
-    redmine_->retrieveProjects( [=]( Projects projects )
+    redmine_->retrieveProjects( [=]( Projects projects, RedmineError redmineError, QStringList errors )
     {
         ENTER();
 
+        if( redmineError != NO_ERROR )
+        {
+            QString errorMsg = tr("Could not load projects.");
+            for( const auto& error : errors )
+                errorMsg.append("\n").append(error);
+
+            message( errorMsg, QtCriticalMsg );
+            RETURN();
+        }
+
         int currentIndex = 0;
 
         // Reset in case this has changed since calling loadProjects()

diff --git a/IssueSelector.h b/IssueSelector.h
@@ -49,13 +49,6 @@ class IssueSelector : public Window
      */
     int getProjectId() const;
 
-    /**
-     * @brief Get the issue selector window
-     *
-     * @return Issue selector window
-     */
-    QQuickView* window() const;
-
     /// @}
 
     /// @name Setters

diff --git a/RedTimer.cpp b/RedTimer.cpp
@@ -23,7 +23,7 @@ RedTimer::RedTimer( QApplication* parent, bool trayIcon )
     redmine_ = new SimpleRedmineClient( this );
 
     // Settings initialisation
-    settings_ = new Settings( redmine_, this );
+    settings_ = new Settings( redmine_ );
     settings_->load();
 
     // Main window initialisation
@@ -78,7 +78,7 @@ RedTimer::RedTimer( QApplication* parent, bool trayIcon )
     ctx_->setContextProperty( "issueStatusModel", &issueStatusModel_ );
 
     // Set transient window parent
-    settings_->window()->setTransientParent( this );
+    settings_->setTransientParent( this );
 
     // Connect the create issue button
     connect( qml("createIssue"), SIGNAL(clicked()), this, SLOT(createIssue()) );
@@ -381,10 +381,21 @@ RedTimer::loadActivities()
 {
     ENTER();
 
-    redmine_->retrieveTimeEntryActivities( [&]( Enumerations activities )
+    redmine_->retrieveTimeEntryActivities( [&]( Enumerations activities, RedmineError redmineError,
+                                                QStringList errors )
     {
         ENTER();
 
+        if( redmineError != NO_ERROR )
+        {
+            QString errorMsg = tr("Could not load activities.");
+            for( const auto& error : errors )
+                errorMsg.append("\n").append(error);
+
+            message( errorMsg, QtCriticalMsg );
+            RETURN();
+        }
+
         int currentIndex = 0;
 
         activityModel_.clear();
@@ -448,10 +459,20 @@ RedTimer::loadIssue( int issueId, bool startTimer, bool saveNewIssue )
     if( timer_->isActive() )
         stop( true, false );
 
-    redmine_->retrieveIssue( [=]( Issue issue )
+    redmine_->retrieveIssue( [=]( Issue issue, RedmineError redmineError, QStringList errors )
     {
         ENTER()(issue);
 
+        if( redmineError != NO_ERROR )
+        {
+            QString errorMsg = tr("Could not load issue.");
+            for( const auto& error : errors )
+                errorMsg.append("\n").append(error);
+
+            message( errorMsg, QtCriticalMsg );
+            RETURN();
+        }
+
         issue_ = issue;
 
         addRecentIssue( issue );
@@ -480,10 +501,21 @@ RedTimer::loadIssueStatuses()
 {
     ENTER();
 
-    redmine_->retrieveIssueStatuses( [&]( IssueStatuses issueStatuses )
+    redmine_->retrieveIssueStatuses( [&]( IssueStatuses issueStatuses, RedmineError redmineError,
+                                          QStringList errors )
     {
         ENTER();
 
+        if( redmineError != NO_ERROR )
+        {
+            QString errorMsg = tr("Could not load issue statuses.");
+            for( const auto& error : errors )
+                errorMsg.append("\n").append(error);
+
+            message( errorMsg, QtCriticalMsg );
+            RETURN();
+        }
+
         int currentIndex = 0;
 
         issueStatusModel_.clear();
@@ -518,10 +550,21 @@ RedTimer::loadLatestActivity()
         RETURN();
     }
 
-    redmine_->retrieveTimeEntries( [&]( TimeEntries timeEntries )
+    redmine_->retrieveTimeEntries( [&]( TimeEntries timeEntries, RedmineError redmineError,
+                                        QStringList errors )
     {
         ENTER();
 
+        if( redmineError != NO_ERROR )
+        {
+            QString errorMsg = tr("Could not load time entries.");
+            for( const auto& error : errors )
+                errorMsg.append("\n").append(error);
+
+            message( errorMsg, QtCriticalMsg );
+            RETURN();
+        }
+
         if( timeEntries.size() == 1 )
             activityId_ = timeEntries[0].activity.id;
 

diff --git a/RedTimer.pro b/RedTimer.pro
@@ -6,7 +6,7 @@ QMAKE_CXXFLAGS += -std=c++11
 RC_ICONS = icons/clock_red.ico
 ICON = icons/clock_red.icns
 
-VERSION = 0.1.0
+VERSION = 0.1.1
 QMAKE_TARGET_COMPANY = "Thomssen IT"
 QMAKE_TARGET_PRODUCT = "RedTimer"
 QMAKE_TARGET_DESCRIPTION = "Redmine Time Tracker"

diff --git a/Settings.cpp b/Settings.cpp
@@ -8,24 +8,18 @@ using namespace qtredmine;
 using namespace redtimer;
 using namespace std;
 
-Settings::Settings( SimpleRedmineClient* redmine, QObject* parent )
-    : QObject( parent ),
+Settings::Settings( SimpleRedmineClient* redmine, QQuickView* parent )
+    : Window( "qrc:/Settings.qml", parent ),
       redmine_( redmine ),
       settings_( "RedTimer.ini", QSettings::IniFormat, this )
 {
     ENTER();
 
     // Settings window initialisation
-    win_ = new QQuickView();
-    win_->setResizeMode( QQuickView::SizeRootObjectToView );
-    win_->setSource( QUrl(QStringLiteral("qrc:/Settings.qml")) );
-    win_->setModality( Qt::ApplicationModal );
-    win_->setFlags( Qt::Dialog );
-    win_->setTitle( "Settings" );
-
-    // Settings window access members
-    ctx_ = win_->rootContext();
-    item_ = qobject_cast<QQuickItem*>( win_->rootObject() );
+    setResizeMode( QQuickView::SizeRootObjectToView );
+    setModality( Qt::ApplicationModal );
+    setFlags( Qt::Dialog );
+    setTitle( "Settings" );
 
     // Connect the cancel button
     connect( qml("cancel"), SIGNAL(clicked()), this, SLOT(close()) );
@@ -83,10 +77,10 @@ Settings::close()
 {
     ENTER();
 
-    if( win_->isVisible() )
+    if( isVisible() )
     {
         DEBUG() << "Closing settings window";
-        win_->close();
+        Window::close();
     }
 
     RETURN();
@@ -106,10 +100,10 @@ Settings::display()
 
     updateIssueStatuses();
 
-    if( !win_->isVisible() )
+    if( !isVisible() )
     {
         DEBUG() << "Displaying settings window";
-        win_->show();
+        show();
     }
 
     RETURN();
@@ -168,13 +162,6 @@ Settings::load()
     RETURN();
 }
 
-QQuickItem*
-Settings::qml( QString qmlItem )
-{
-    ENTER()(qmlItem);
-    RETURN( item_->findChild<QQuickItem*>(qmlItem) );
-}
-
 void
 Settings::save()
 {
@@ -221,10 +208,21 @@ Settings::updateIssueStatuses()
         RETURN();
     }
 
-    redmine_->retrieveIssueStatuses( [&]( IssueStatuses issueStatuses )
+    redmine_->retrieveIssueStatuses( [&]( IssueStatuses issueStatuses, RedmineError redmineError,
+                                          QStringList errors )
     {
         ENTER();
 
+        if( redmineError != NO_ERROR )
+        {
+            QString errorMsg = tr("Could not load issue statuses.");
+            for( const auto& error : errors )
+                errorMsg.append("\n").append(error);
+
+            message( errorMsg, QtCriticalMsg );
+            RETURN();
+        }
+
         int currentIndex = 0;
 
         // Sort issues ascending by ID
@@ -253,10 +251,3 @@ Settings::updateIssueStatuses()
 
     RETURN();
 }
-
-QQuickView*
-Settings::window() const
-{
-    ENTER();
-    RETURN( win_ );
-}