Merge branch 'pretty_progress_bar' of https://github.com/mig5/onionshare into mig5-pretty_progress_bar

This commit is contained in:
Micah Lee 2017-05-30 12:07:49 -07:00
commit 3628b2ee3c
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
2 changed files with 26 additions and 6 deletions

View File

@ -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

View File

@ -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