summary refs log tree commit diff
path: root/include/MainWindow.h
diff options
context:
space:
mode:
authorKonstantinos Sideris <sideris.konstantin@gmail.com>2017-09-10 13:13:02 +0300
committerKonstantinos Sideris <sideris.konstantin@gmail.com>2017-09-10 13:13:02 +0300
commit29e21e2970c2786eb1f6910c9da99a3dbbf0a49d (patch)
tree6b981d9167ef70a408fa395a720afb09ce7b5e21 /include/MainWindow.h
parentStyle change again (diff)
parentImplement image uploads (#24) (diff)
downloadnheko-29e21e2970c2786eb1f6910c9da99a3dbbf0a49d.tar.xz
Merge branch 'images'
Diffstat (limited to 'include/MainWindow.h')
-rw-r--r--include/MainWindow.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/MainWindow.h b/include/MainWindow.h

index 6f1d6e3e..de535d35 100644 --- a/include/MainWindow.h +++ b/include/MainWindow.h
@@ -21,7 +21,7 @@ #include <QSharedPointer> #include "ChatPage.h" -#include "CircularProgress.h" +#include "LoadingIndicator.h" #include "LoginPage.h" #include "MatrixClient.h" #include "OverlayModal.h" @@ -85,7 +85,7 @@ private: // Used to hide undefined states between page transitions. OverlayModal *progress_modal_; - CircularProgress *spinner_; + LoadingIndicator *spinner_; // Matrix Client API provider. QSharedPointer<MatrixClient> client_;