summaryrefslogtreecommitdiff
path: root/src/gui/windows
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-04-16 15:45:40 +0300
committerAndrei Karas <akaras@inbox.ru>2016-04-16 15:45:40 +0300
commitfdbf478bdce6cdbad0a532621b2ef559a51b3daa (patch)
treefc4bce3ebdbac3fa67ac9da3de9e2da27d003bb8 /src/gui/windows
parent04febee98f22dd2af0c2e712542ba40083be680f (diff)
downloadmv-fdbf478bdce6cdbad0a532621b2ef559a51b3daa.tar.gz
mv-fdbf478bdce6cdbad0a532621b2ef559a51b3daa.tar.bz2
mv-fdbf478bdce6cdbad0a532621b2ef559a51b3daa.tar.xz
mv-fdbf478bdce6cdbad0a532621b2ef559a51b3daa.zip
Move serverdialogdownloadstatus into separate file.
And convert into strong typed enum.
Diffstat (limited to 'src/gui/windows')
-rw-r--r--src/gui/windows/serverdialog.cpp20
-rw-r--r--src/gui/windows/serverdialog.h15
2 files changed, 13 insertions, 22 deletions
diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp
index 82d44c1b0..93512e053 100644
--- a/src/gui/windows/serverdialog.cpp
+++ b/src/gui/windows/serverdialog.cpp
@@ -123,7 +123,7 @@ ServerDialog::ServerDialog(ServerInfo *const serverInfo,
mServerInfo(serverInfo),
mPersistentIPCheckBox(nullptr),
mDownloadProgress(-1.0F),
- mDownloadStatus(DOWNLOADING_UNKNOWN)
+ mDownloadStatus(ServerDialogDownloadStatus::UNKNOWN)
{
if (isSafeMode)
{
@@ -390,28 +390,28 @@ void ServerDialog::logic()
BLOCK_START("ServerDialog::logic")
{
MutexLocker tempLock(&mMutex);
- if (mDownloadStatus == DOWNLOADING_COMPLETE)
+ if (mDownloadStatus == ServerDialogDownloadStatus::COMPLETE)
{
- mDownloadStatus = DOWNLOADING_OVER;
+ mDownloadStatus = ServerDialogDownloadStatus::OVER;
mDescription->setCaption(std::string());
}
- else if (mDownloadStatus == DOWNLOADING_IN_PROGRESS)
+ else if (mDownloadStatus == ServerDialogDownloadStatus::IN_PROGRESS)
{
// TRANSLATORS: servers dialog label
mDescription->setCaption(strprintf(_("Downloading server list..."
"%2.2f%%"), static_cast<double>(mDownloadProgress * 100)));
}
- else if (mDownloadStatus == DOWNLOADING_IDLE)
+ else if (mDownloadStatus == ServerDialogDownloadStatus::IDLE)
{
// TRANSLATORS: servers dialog label
mDescription->setCaption(_("Waiting for server..."));
}
- else if (mDownloadStatus == DOWNLOADING_PREPARING)
+ else if (mDownloadStatus == ServerDialogDownloadStatus::PREPARING)
{
// TRANSLATORS: servers dialog label
mDescription->setCaption(_("Preparing download"));
}
- else if (mDownloadStatus == DOWNLOADING_ERROR)
+ else if (mDownloadStatus == ServerDialogDownloadStatus::ERROR)
{
// TRANSLATORS: servers dialog label
mDescription->setCaption(_("Error retreiving server list!"));
@@ -764,7 +764,7 @@ int ServerDialog::downloadUpdate(void *ptr,
{
logger->log("Error retreiving server list: %s\n",
sd->mDownload->getError());
- sd->mDownloadStatus = DOWNLOADING_ERROR;
+ sd->mDownloadStatus = ServerDialogDownloadStatus::ERROR;
}
else
{
@@ -778,7 +778,7 @@ int ServerDialog::downloadUpdate(void *ptr,
progress = 1.0F;
MutexLocker lock1(&sd->mMutex);
- sd->mDownloadStatus = DOWNLOADING_IN_PROGRESS;
+ sd->mDownloadStatus = ServerDialogDownloadStatus::IN_PROGRESS;
sd->mDownloadProgress = progress;
}
@@ -786,7 +786,7 @@ int ServerDialog::downloadUpdate(void *ptr,
{
sd->loadServers();
MutexLocker lock1(&sd->mMutex);
- sd->mDownloadStatus = DOWNLOADING_COMPLETE;
+ sd->mDownloadStatus = ServerDialogDownloadStatus::COMPLETE;
}
return 0;
diff --git a/src/gui/windows/serverdialog.h b/src/gui/windows/serverdialog.h
index 348f1f1f0..e273b7809 100644
--- a/src/gui/windows/serverdialog.h
+++ b/src/gui/windows/serverdialog.h
@@ -25,6 +25,8 @@
#include "gui/widgets/window.h"
+#include "enums/gui/serverdialogdonwloadstatus.h"
+
#include "enums/net/downloadstatus.h"
#include "net/serverinfo.h"
@@ -136,23 +138,12 @@ class ServerDialog final : public Window,
ServersListModel *mServersListModel A_NONNULLPOINTER;
ListBox *mServersList A_NONNULLPOINTER;
- enum ServerDialogDownloadStatus
- {
- DOWNLOADING_UNKNOWN = 0,
- DOWNLOADING_ERROR,
- DOWNLOADING_PREPARING,
- DOWNLOADING_IDLE,
- DOWNLOADING_IN_PROGRESS,
- DOWNLOADING_COMPLETE,
- DOWNLOADING_OVER
- };
-
/** Status of the current download. */
Net::Download *mDownload;
ServerInfo *mServerInfo;
CheckBox *mPersistentIPCheckBox;
float mDownloadProgress;
- ServerDialogDownloadStatus mDownloadStatus;
+ ServerDialogDownloadStatusT mDownloadStatus;
};
#endif // GUI_WINDOWS_SERVERDIALOG_H