From 41b815f0b3799303d44d32741887f23c66b51452 Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Sun, 8 Sep 2019 17:24:18 -0700 Subject: [PATCH] Add web requests counter icon to history widget --- onionshare_gui/mode/history.py | 37 +++++++++++++++++++++------ share/images/share_requests.png | Bin 0 -> 738 bytes share/images/share_requests_none.png | Bin 0 -> 754 bytes share/locale/en.json | 1 + 4 files changed, 30 insertions(+), 8 deletions(-) create mode 100644 share/images/share_requests.png create mode 100644 share/images/share_requests_none.png diff --git a/onionshare_gui/mode/history.py b/onionshare_gui/mode/history.py index 2fd7cddb..650e57be 100644 --- a/onionshare_gui/mode/history.py +++ b/onionshare_gui/mode/history.py @@ -237,6 +237,7 @@ class ReceiveHistoryItemFile(QtWidgets.QWidget): elif self.common.platform == 'Windows': subprocess.Popen(['explorer', '/select,{}'.format(abs_filename)]) + class ReceiveHistoryItem(HistoryItem): def __init__(self, common, id, content_length): super(ReceiveHistoryItem, self).__init__() @@ -442,6 +443,7 @@ class IndividualFileHistoryItem(HistoryItem): self.total_bytes, self.started) + class HistoryItemList(QtWidgets.QScrollArea): """ List of items @@ -524,12 +526,15 @@ class History(QtWidgets.QWidget): # In progress and completed counters self.in_progress_count = 0 self.completed_count = 0 + self.requests_count = 0 - # In progress and completed labels + # In progress, completed, and requests labels self.in_progress_label = QtWidgets.QLabel() self.in_progress_label.setStyleSheet(self.common.css['mode_info_label']) self.completed_label = QtWidgets.QLabel() self.completed_label.setStyleSheet(self.common.css['mode_info_label']) + self.requests_label = QtWidgets.QLabel() + self.requests_label.setStyleSheet(self.common.css['mode_info_label']) # Header self.header_label = QtWidgets.QLabel(header_text) @@ -543,6 +548,7 @@ class History(QtWidgets.QWidget): header_layout.addStretch() header_layout.addWidget(self.in_progress_label) header_layout.addWidget(self.completed_label) + header_layout.addWidget(self.requests_label) header_layout.addWidget(clear_button) # When there are no items @@ -621,6 +627,10 @@ class History(QtWidgets.QWidget): self.completed_count = 0 self.update_completed() + # Reset web requests counter + self.requests_count = 0 + self.update_requests() + def update_completed(self): """ Update the 'completed' widget. @@ -636,14 +646,25 @@ class History(QtWidgets.QWidget): """ Update the 'in progress' widget. """ - if self.mode != 'website': - if self.in_progress_count == 0: - image = self.common.get_resource_path('images/share_in_progress_none.png') - else: - image = self.common.get_resource_path('images/share_in_progress.png') + if self.in_progress_count == 0: + image = self.common.get_resource_path('images/share_in_progress_none.png') + else: + image = self.common.get_resource_path('images/share_in_progress.png') - self.in_progress_label.setText(' {1:d}'.format(image, self.in_progress_count)) - self.in_progress_label.setToolTip(strings._('history_in_progress_tooltip').format(self.in_progress_count)) + self.in_progress_label.setText(' {1:d}'.format(image, self.in_progress_count)) + self.in_progress_label.setToolTip(strings._('history_in_progress_tooltip').format(self.in_progress_count)) + + def update_requests(self): + """ + Update the 'web requests' widget. + """ + if self.requests_count == 0: + image = self.common.get_resource_path('images/share_requests_none.png') + else: + image = self.common.get_resource_path('images/share_requests.png') + + self.requests_label.setText(' {1:d}'.format(image, self.in_progress_count)) + self.requests_label.setToolTip(strings._('history_requests_tooltip').format(self.in_progress_count)) class ToggleHistory(QtWidgets.QPushButton): diff --git a/share/images/share_requests.png b/share/images/share_requests.png new file mode 100644 index 0000000000000000000000000000000000000000..4965744d57bebe31125cca767c4a1bb63dcfbd08 GIT binary patch literal 738 zcmV<80v-K{P)EX>4Tx04R}tkv&MmKp2MKrfO9x4t5Z6$WWauh>AFB6^c+H)C#RSm|Xe?O&XFE z7e~Rh;NZ_<)xpJCR|i)?5c~mgadlF3krKa43N2#1?&BYF{Svtpa+Scy zv49FR$gUs!4}SO7%1=&sN#Quq`QkVqBS2^uXw)3%``B?BCqVESxYAqxN*$Q_B)!(s zqDMggHgIv>(v&^mat9cEGGtSBr64UKp9kL0=$o>@z%9_b=Jl<4j?)JqO}$Fq00)P_ zXo0fVecs*O-nV~in*I9$wKj5FNcgT>00006VoOIv00000008+zyMF)x010qNS#tmY zE+YT{E+YYWr9XB6000McNliru;|U1>4>Ds@qc{Kn0N+VOK~yNumC~V315pqK(DOD8 zLEuQk2Y^C!HD(oYBZ_{4t9`M@ro(R5YrQ%rus4qkA9aWuT+ z0mt~l`6yzXhN1EkV_XgDMS&TXU6m8om<|k6tV3I3R-nXV7!I%+G^~OXp0e;y6vz<^ z-Y^;Hli-9Wr@Ak%aku3IHzTw-+wxo6A~x6rF^`zT$n(&euF9MA$7vh|{p&Qo0Z!;Y U2m*6azW@LL07*qoM6N<$f^Tm@n*aa+ literal 0 HcmV?d00001 diff --git a/share/images/share_requests_none.png b/share/images/share_requests_none.png new file mode 100644 index 0000000000000000000000000000000000000000..93a71ef3455a614f95a1f1270585d0b1c121d5dc GIT binary patch literal 754 zcmVEX>4Tx04R}tkv&MmKp2MKrfO9x4t5Z6$WWauh>AFB6^c+H)C#RSm|Xe?O&XFE z7e~Rh;NZ_<)xpJCR|i)?5c~mgadlF3krKa43N2#1?&BYF{Svtpa+Scy zv49FR$gUs!4}SO7%1=&sN#Quq`QkVqBS2^uXw)3%``B?BCqVESxYAqxN*$Q_B)!(s zqDMggHgIv>(v&^mat9cEGGtSBr64UKp9kL0=$o>@z%9_b=Jl<4j?)JqO}$Fq00)P_ zXo0fVecs*O-nV~in*I9$wKj5FNcgT>00006VoOIv00000008+zyMF)x010qNS#tmY zE+YT{E+YYWr9XB6000McNliru;|U1>4<`P2LqQOQ;qSHu zK~N+O4}e3oVkHCvn4$oS<%XaMJOBy|u3~ux=##7{0t4m>NC=h?(u9B+adG9io%zq1 z$!sN5*Yz?^af~%oc*ZTpIp+`P2E2taj5XyyFh* zm|?#cYwQHD<*)iUX}wQ7IKXwzxxx!ZEntL~=w0KWgCXt%Sj9uj@DMe@3_Jd*4yLgd zykXGl527ZRX;s(tIj-g$aM6qV@6LJFakrE*ODQ$j#2&s|ANPfX2A4VKr!JIInv~K6 kpOLl_hF9F+Ea&_Lzx&EXpjdPhH~;_u07*qoM6N<$g0PxPp8x;= literal 0 HcmV?d00001 diff --git a/share/locale/en.json b/share/locale/en.json index c84c5538..aab6153d 100644 --- a/share/locale/en.json +++ b/share/locale/en.json @@ -134,6 +134,7 @@ "gui_file_info_single": "{} file, {}", "history_in_progress_tooltip": "{} in progress", "history_completed_tooltip": "{} completed", + "history_requests_tooltip": "{} web requests", "error_cannot_create_data_dir": "Could not create OnionShare data folder: {}", "gui_receive_mode_warning": "Receive mode lets people upload files to your computer.

Some files can potentially take control of your computer if you open them. Only open things from people you trust, or if you know what you are doing.", "gui_mode_share_button": "Share Files",