diff options
| author | Micah Lee <micah@micahflee.com> | 2017-05-30 12:11:53 -0700 |
|---|---|---|
| committer | Micah Lee <micah@micahflee.com> | 2017-05-30 12:11:53 -0700 |
| commit | 4576a814fe1494e177b05f02d849671bb0c7b21a (patch) | |
| tree | 3c59bced0bf75a906968434cc668c2ecaca85d7c | |
| parent | c6400758bc3c5e1584cba71542193532f79507cd (diff) | |
| parent | 3628b2ee3c2fe4ddfb7d9aef814f4dd6c55422ad (diff) | |
| download | onionshare-4576a814fe1494e177b05f02d849671bb0c7b21a.tar.gz onionshare-4576a814fe1494e177b05f02d849671bb0c7b21a.zip | |
Merge branch 'mig5-pretty_progress_bar'
| -rw-r--r-- | onionshare_gui/downloads.py | 14 | ||||
| -rw-r--r-- | onionshare_gui/onionshare_gui.py | 18 |
2 files changed, 26 insertions, 6 deletions
diff --git a/onionshare_gui/downloads.py b/onionshare_gui/downloads.py index f3ac2cb0..a9d7fb12 100644 --- a/onionshare_gui/downloads.py +++ b/onionshare_gui/downloads.py @@ -32,14 +32,24 @@ class Download(object): self.downloaded_bytes = 0 # make a new progress bar + cssStyleData =""" + QProgressBar { + border: 2px solid grey; + border-radius: 5px; + text-align: center; + } + + QProgressBar::chunk { + background: qlineargradient(x1: 0.5, y1: 0, x2: 0.5, y2: 1, stop: 0 #b366ff, stop: 1 #d9b3ff); + width: 10px; + }""" self.progress_bar = QtWidgets.QProgressBar() self.progress_bar.setTextVisible(True) self.progress_bar.setAlignment(QtCore.Qt.AlignHCenter) self.progress_bar.setMinimum(0) self.progress_bar.setMaximum(total_bytes) self.progress_bar.setValue(0) - self.progress_bar.setStyleSheet( - "QProgressBar::chunk { background-color: #05B8CC; }") + self.progress_bar.setStyleSheet(cssStyleData) self.progress_bar.total_bytes = total_bytes # start at 0 diff --git a/onionshare_gui/onionshare_gui.py b/onionshare_gui/onionshare_gui.py index df9a3b84..d01a0c80 100644 --- a/onionshare_gui/onionshare_gui.py +++ b/onionshare_gui/onionshare_gui.py @@ -471,13 +471,23 @@ class ZipProgressBar(QtWidgets.QProgressBar): def __init__(self, total_files_size): super(ZipProgressBar, self).__init__() - self.setMaximumHeight(15) + self.setMaximumHeight(20) self.setMinimumWidth(200) self.setValue(0) self.setFormat(strings._('zip_progress_bar_format')) - self.setStyleSheet( - "QProgressBar::chunk { background-color: #05B8CC; } " - ) + cssStyleData =""" + QProgressBar { + background-color: rgba(255, 255, 255, 0.0) !important; + border: 0px; + text-align: center; + } + + QProgressBar::chunk { + border: 0px; + background: qlineargradient(x1: 0.5, y1: 0, x2: 0.5, y2: 1, stop: 0 #b366ff, stop: 1 #d9b3ff); + width: 10px; + }""" + self.setStyleSheet(cssStyleData) self._total_files_size = total_files_size self._processed_size = 0 |