Merge pull request #5 from cgq-qgc/improve_download_button

PR: Some improvements to the download weather data dialog

Author: jnsebgosselin

cdprep/app/mainwindow.py

@@ -130,7 +130,7 @@ def show_data_downloader(self):
         Show the download data dialog.
         """
         if self.data_downloader is None:
-            self.data_downloader = WeatherStationDownloader(self)
+            self.data_downloader = WeatherStationDownloader()
             self.data_downloader.workdir = self._workdir
             self.data_downloader.show()
             qr = self.data_downloader.frameGeometry()

cdprep/dwnld_data/dwnld_data_manager.py

@@ -267,17 +267,17 @@ def __initUI__(self):
         self.btn_addSta.hide()
 
         btn_save = QPushButton('Save')
-        btn_save.setIcon(get_icon('save'))
         btn_save.setToolTip('Save the list of selected stations to a file.')
         btn_save.clicked.connect(self.btn_save_isClicked)
         btn_save.hide()
 
         self.btn_download = QPushButton('Download')
-        self.btn_download.setIcon(get_icon('download_data'))
         self.btn_download.clicked.connect(self.start_download_process)
 
+        btn_close = QPushButton('Close')
+        btn_close.clicked.connect(self.close)
+
         self.btn_fetch = btn_fetch = QPushButton('Refresh')
-        btn_fetch.setIcon(get_icon('refresh'))
         btn_fetch.setToolTip(
             "Update the list of climate stations by fetching it again from "
             "the ECCC ftp server.")
@@ -289,8 +289,9 @@ def __initUI__(self):
         toolbar_grid.addWidget(btn_save, 1, 2)
         toolbar_grid.addWidget(btn_fetch, 1, 3)
         toolbar_grid.addWidget(self.btn_download, 1, 4)
+        toolbar_grid.addWidget(btn_close, 1, 5)
         toolbar_grid.setColumnStretch(0, 100)
-        toolbar_grid.setContentsMargins(0, 30, 0, 0)
+        toolbar_grid.setContentsMargins(0, 10, 0, 0)
 
         # Setup the left panel.
         left_panel = QFrame()