Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2024-10-01 01:35:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Designed file list items to look better, prevent scrolling horizintally, and ensuring the delete button does not overlap the filename

Browse Source
This commit is contained in:
Micah Lee 2018-02-10 18:15:44 -08:00
parent d3848a25ec
commit b41b89add8
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
onionshare_gui/file_selection.py
View File

@ -212,14 +212,20 @@ class FileList(QtWidgets.QListWidget):
else: else:
size_bytes = common.dir_size(filename) size_bytes = common.dir_size(filename)
size_readable = common.human_readable_filesize(size_bytes) size_readable = common.human_readable_filesize(size_bytes)
item_name = '{0:s} ({1:s})'.format(basename, size_readable)
# Create a new item # Create a new item
item = QtWidgets.QListWidgetItem(item_name) item = QtWidgets.QListWidgetItem()
item.setToolTip(size_readable)
item.setIcon(icon) item.setIcon(icon)
item.size_bytes = size_bytes item.size_bytes = size_bytes
# Item's name and size labels
item_name = QtWidgets.QLabel(basename)
item_name.setWordWrap(False)
item_name.setSizePolicy(QtWidgets.QSizePolicy.Ignored, QtWidgets.QSizePolicy.Fixed)
item_name.setStyleSheet('QLabel { color: #000000; font-size: 13px; }')
item_size = QtWidgets.QLabel(size_readable)
item_size.setStyleSheet('QLabel { color: #666666; font-size: 11px; }')
# Item's delete button # Item's delete button
def delete_item(): def delete_item():
itemrow = self.row(item) itemrow = self.row(item)
@ -232,16 +238,22 @@ class FileList(QtWidgets.QListWidget):
item.item_button.setFlat(True) item.item_button.setFlat(True)
item.item_button.setIcon( QtGui.QIcon(common.get_resource_path('images/file_delete.png')) ) item.item_button.setIcon( QtGui.QIcon(common.get_resource_path('images/file_delete.png')) )
item.item_button.clicked.connect(delete_item) item.item_button.clicked.connect(delete_item)
item.item_button.setSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed)
# Create an item widget to display on the item # Create the item's widget and layouts
item_widget_layout = QtWidgets.QHBoxLayout() item_vlayout = QtWidgets.QVBoxLayout()
item_widget_layout.addStretch() item_vlayout.addWidget(item_name)
item_widget_layout.addWidget(item.item_button) item_vlayout.addWidget(item_size)
item_widget = QtWidgets.QWidget() item_hlayout = QtWidgets.QHBoxLayout()
item_widget.setLayout(item_widget_layout) item_hlayout.addLayout(item_vlayout)
item_hlayout.addWidget(item.item_button)
widget = QtWidgets.QWidget()
widget.setLayout(item_hlayout)
item.setSizeHint(widget.sizeHint())
self.addItem(item) self.addItem(item)
self.setItemWidget(item, item_widget) self.setItemWidget(item, widget)
self.files_updated.emit() self.files_updated.emit()