Big code evolution for file transfer feature.
Added methods to the TransferQueue class for flag managing.
Added upload() and download() methods to the FileTransfer class.
Reconstruction of FTProgress class.
Code improvements.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@418 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/vncviewer/FTProgress.cxx b/vncviewer/FTProgress.cxx
index 46316f0..95b4dd4 100644
--- a/vncviewer/FTProgress.cxx
+++ b/vncviewer/FTProgress.cxx
@@ -33,6 +33,11 @@
m_pSingleProgress = NULL;
m_pGeneralProgress = NULL;
+
+ m_hwndSinglePercent = GetDlgItem(m_hwndParent, IDC_FTSINGLEPERCENT);
+ m_hwndGeneralPercent = GetDlgItem(m_hwndParent, IDC_FTGENERALPERCENT);
+
+ m_bInitialized = createProgressBarObjects();
}
FTProgress::~FTProgress()
@@ -40,26 +45,6 @@
destroyProgressBarObjects();
}
-bool
-FTProgress::initialize(DWORD64 totalMaxValue, DWORD maxValue)
-{
- m_bInitialized = false;
-
- m_hwndSinglePercent = GetDlgItem(m_hwndParent, IDC_FTSINGLEPERCENT);
- m_hwndGeneralPercent = GetDlgItem(m_hwndParent, IDC_FTGENERALPERCENT);
-
- if ((m_hwndSinglePercent == NULL) || (m_hwndGeneralPercent == NULL)) return false;
-
- if (!createProgressBarObjects()) return false;
-
- if (!initProgressControls(totalMaxValue, maxValue)) return false;
-
- setProgressText();
-
- m_bInitialized = true;
- return true;
-}
-
void
FTProgress::increase(DWORD value)
{
@@ -72,11 +57,23 @@
}
void
-FTProgress::clearSingle()
+FTProgress::clearAndInitGeneral(DWORD64 dw64MaxValue, DWORD64 dw64Position)
+{
+ if (!m_bInitialized) return;
+
+ m_pGeneralProgress->clear();
+ m_pGeneralProgress->init(dw64MaxValue, dw64Position);
+
+ setProgressText();
+}
+
+void
+FTProgress::clearAndInitSingle(DWORD dwMaxValue, DWORD dwPosition)
{
if (!m_bInitialized) return;
m_pSingleProgress->clear();
+ m_pSingleProgress->init(dwMaxValue, dwPosition);
setProgressText();
}
@@ -130,22 +127,6 @@
return true;
}
-bool
-FTProgress::initProgressControls(DWORD64 totalMaxValue, DWORD maxValue)
-{
- bool bResult = true;
-
- if ((m_pSingleProgress != NULL) && (m_pGeneralProgress != NULL)) {
- if (!m_pSingleProgress->init(totalMaxValue, 0)) return false;
- if (!m_pGeneralProgress->init(maxValue, 0)) return false;
- } else {
- return false;
- }
-
- setProgressText();
- return true;
-}
-
void
FTProgress::setProgressText()
{