From f41ad976ea081d132e49c7ea946eb87b975de16e Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Sat, 24 Feb 2018 18:37:19 -0800 Subject: Rename in_progress_download to in_progress_downloads (plural) everywhere, to be consistent with completed_downloads --- onionshare_gui/onionshare_gui.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/onionshare_gui/onionshare_gui.py b/onionshare_gui/onionshare_gui.py index 4f664225..56a1967b 100644 --- a/onionshare_gui/onionshare_gui.py +++ b/onionshare_gui/onionshare_gui.py @@ -116,8 +116,8 @@ class OnionShareGui(QtWidgets.QMainWindow): self.info_label = QtWidgets.QLabel() self.info_label.setStyleSheet('QLabel { font-size: 12px; color: #666666; }') - self.info_in_progress_download_count = QtWidgets.QLabel() - self.info_in_progress_download_count.setStyleSheet('QLabel { font-size: 12px; color: #666666; }') + self.info_in_progress_downloads_count = QtWidgets.QLabel() + self.info_in_progress_downloads_count.setStyleSheet('QLabel { font-size: 12px; color: #666666; }') self.info_completed_downloads_count = QtWidgets.QLabel() self.info_completed_downloads_count.setStyleSheet('QLabel { font-size: 12px; color: #666666; }') @@ -127,7 +127,7 @@ class OnionShareGui(QtWidgets.QMainWindow): self.info_layout.addWidget(self.info_label) self.info_layout.addStretch() - self.info_layout.addWidget(self.info_in_progress_download_count) + self.info_layout.addWidget(self.info_in_progress_downloads_count) self.info_layout.addWidget(self.info_completed_downloads_count) self.info_widget = QtWidgets.QWidget() @@ -692,11 +692,11 @@ class OnionShareGui(QtWidgets.QMainWindow): Update the 'Downloads in progress' info widget. """ if count == 0: - self.info_in_progress_download_image = common.get_resource_path('images/download_in_progress_none.png') + self.info_in_progress_downloads_image = common.get_resource_path('images/download_in_progress_none.png') else: - self.info_in_progress_download_image = common.get_resource_path('images/download_in_progress.png') - self.info_in_progress_download_count.setText(' {1:d}'.format(self.info_in_progress_download_image, count)) - self.info_in_progress_download_count.setToolTip(strings._('info_in_progress_downloads_tooltip', True).format(count)) + self.info_in_progress_downloads_image = common.get_resource_path('images/download_in_progress.png') + self.info_in_progress_downloads_count.setText(' {1:d}'.format(self.info_in_progress_downloads_image, count)) + self.info_in_progress_downloads_count.setToolTip(strings._('info_in_progress_downloads_tooltip', True).format(count)) def closeEvent(self, e): common.log('OnionShareGui', 'closeEvent') -- cgit v1.2.3-54-g00ecf