From 58b0bd4baf4e393f3163448add27b2a4ec1922a1 Mon Sep 17 00:00:00 2001
From: Alex Zolotarev <deathbaba@gmail.com>
Date: Sun, 6 Feb 2011 20:25:44 +0200
Subject: [PATCH] Download Dialog now saves it's state after closing

---
 qt/mainwindow.cpp    | 11 +++++++----
 qt/mainwindow.hpp    |  4 +++-
 qt/update_dialog.cpp | 25 +++++++++++++------------
 qt/update_dialog.hpp |  3 ++-
 4 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/qt/mainwindow.cpp b/qt/mainwindow.cpp
index 165e78a44a..2bc55c585d 100644
--- a/qt/mainwindow.cpp
+++ b/qt/mainwindow.cpp
@@ -27,9 +27,9 @@
 namespace qt
 {
 
-MainWindow::MainWindow()
+MainWindow::MainWindow() : m_updateDialog(0)
 {
-  m_pDrawWidget = new DrawWidget(this, m_Storage);
+  m_pDrawWidget = new DrawWidget(this, m_storage);
 
   CreateNavigationBar();
 
@@ -206,8 +206,11 @@ void MainWindow::CreateNavigationBar()
 
 void MainWindow::ShowUpdateDialog()
 {
-  UpdateDialog dlg(this, m_Storage);
-  dlg.exec();
+  if (!m_updateDialog)
+    m_updateDialog = new UpdateDialog(this, m_storage);
+  m_updateDialog->ShowDialog();
+  // tell download manager that we're gone...
+  m_storage.Unsubscribe();
 }
 
 void MainWindow::ShowClassifPanel()
diff --git a/qt/mainwindow.hpp b/qt/mainwindow.hpp
index 5e704ef7a5..8c41f0eaeb 100644
--- a/qt/mainwindow.hpp
+++ b/qt/mainwindow.hpp
@@ -12,14 +12,16 @@ namespace qt
 {
   class FindTableWnd;
   class DrawWidget;
+  class UpdateDialog;
 
   class MainWindow : public QMainWindow
   {
     DrawWidget * m_pDrawWidget;
     QDockWidget * m_pClassifDock;
     //FindTableWnd * m_pFindTable;
+    UpdateDialog * m_updateDialog;
 
-    storage::Storage m_Storage;
+    storage::Storage m_storage;
 
     Q_OBJECT
 
diff --git a/qt/update_dialog.cpp b/qt/update_dialog.cpp
index 3cf0a53433..7a51c6a8b3 100644
--- a/qt/update_dialog.cpp
+++ b/qt/update_dialog.cpp
@@ -73,18 +73,6 @@ namespace qt
 
     setWindowTitle(tr("Geographical Regions"));
     resize(600, 500);
-
-    // we want to receive all download progress and result events
-    m_storage.Subscribe(boost::bind(&UpdateDialog::OnCountryChanged, this, _1),
-                        boost::bind(&UpdateDialog::OnCountryDownloadProgress, this, _1, _2),
-                        boost::bind(&UpdateDialog::OnUpdateCheck, this, _1, _2));
-    FillTree();
-  }
-
-  UpdateDialog::~UpdateDialog()
-  {
-    // tell download manager that we're gone...
-    m_storage.Unsubscribe();
   }
 
   /// when user clicks on any map row in the table
@@ -328,4 +316,17 @@ namespace qt
       item->setText(KColumnIndexSize, QString("%1%").arg(progress.first * 100 / progress.second));
   }
 
+  void UpdateDialog::ShowDialog()
+  {
+    // we want to receive all download progress and result events
+    m_storage.Subscribe(boost::bind(&UpdateDialog::OnCountryChanged, this, _1),
+                        boost::bind(&UpdateDialog::OnCountryDownloadProgress, this, _1, _2),
+                        boost::bind(&UpdateDialog::OnUpdateCheck, this, _1, _2));
+    // if called for first time
+    if (!m_tree->topLevelItemCount())
+      FillTree();
+
+    exec();
+  }
+
 }
diff --git a/qt/update_dialog.hpp b/qt/update_dialog.hpp
index b372f8c83b..14d584eb49 100644
--- a/qt/update_dialog.hpp
+++ b/qt/update_dialog.hpp
@@ -17,7 +17,6 @@ namespace qt
 
   public:
     explicit UpdateDialog(QWidget * parent, storage::Storage & storage);
-    ~UpdateDialog();
 
     /// @name Called from downloader to notify GUI
     //@{
@@ -29,6 +28,8 @@ namespace qt
     void OnUpdateCheck(int64_t updateSize, char const * readme);
     //@}
 
+    void ShowDialog();
+
   private slots:
     void OnItemClick(QTreeWidgetItem * item, int column);
     void OnButtonClick(bool checked = false);