diff --git a/install/onionshare.nsi b/install/onionshare.nsi index 9c15de47..d83da6ad 100644 --- a/install/onionshare.nsi +++ b/install/onionshare.nsi @@ -201,8 +201,8 @@ Section "install" File "${BINPATH}\share\html\index.html" SetOutPath "$INSTDIR\share\images" - File "${BINPATH}\share\images\drop_files.png" File "${BINPATH}\share\images\logo.png" + File "${BINPATH}\share\images\logo_transparent.png" File "${BINPATH}\share\images\logo_grayscale.png" File "${BINPATH}\share\images\server_started.png" File "${BINPATH}\share\images\server_stopped.png" @@ -379,8 +379,8 @@ FunctionEnd Delete "$INSTDIR\share\html\404.html" Delete "$INSTDIR\share\html\denied.html" Delete "$INSTDIR\share\html\index.html" - Delete "$INSTDIR\share\images\drop_files.png" Delete "$INSTDIR\share\images\logo.png" + Delete "$INSTDIR\share\images\logo_transparent.png" Delete "$INSTDIR\share\images\logo_grayscale.png" Delete "$INSTDIR\share\images\server_started.png" Delete "$INSTDIR\share\images\server_stopped.png" diff --git a/onionshare_gui/file_selection.py b/onionshare_gui/file_selection.py index da03d24d..a8ba92b7 100644 --- a/onionshare_gui/file_selection.py +++ b/onionshare_gui/file_selection.py @@ -50,7 +50,7 @@ class FileList(QtWidgets.QListWidget): self.setAlignment(QtCore.Qt.AlignCenter) if image: - self.setPixmap(QtGui.QPixmap.fromImage(QtGui.QImage(common.get_resource_path('images/drop_files.png')))) + self.setPixmap(QtGui.QPixmap.fromImage(QtGui.QImage(common.get_resource_path('images/logo_transparent.png')))) else: self.setText(strings._('gui_drag_and_drop', True)) self.setStyleSheet('color: #999999;') @@ -64,6 +64,7 @@ class FileList(QtWidgets.QListWidget): self.drop_here_image = DropHereLabel(self, True) self.drop_here_text = DropHereLabel(self, False) + self.resizeEvent(None) self.filenames = [] self.update() @@ -84,8 +85,9 @@ class FileList(QtWidgets.QListWidget): """ When the widget is resized, resize the drop files image and text. """ - self.drop_here_image.setGeometry(0, 0, self.width(), self.height()) - self.drop_here_text.setGeometry(0, 0, self.width(), self.height()) + offset = 70 + self.drop_here_image.setGeometry(0, 0, self.width(), self.height() - offset) + self.drop_here_text.setGeometry(0, offset, self.width(), self.height() - offset) def dragEnterEvent(self, event): """ diff --git a/share/images/drop_files.png b/share/images/drop_files.png deleted file mode 100644 index 1e2ea7d6..00000000 Binary files a/share/images/drop_files.png and /dev/null differ diff --git a/share/images/logo_transparent.png b/share/images/logo_transparent.png new file mode 100644 index 00000000..1e8ed196 Binary files /dev/null and b/share/images/logo_transparent.png differ diff --git a/share/locale/en.json b/share/locale/en.json index efbbe0cc..83a7a536 100644 --- a/share/locale/en.json +++ b/share/locale/en.json @@ -34,7 +34,7 @@ "help_debug": "Log application errors to stdout, and log web errors to disk", "help_filename": "List of files or folders to share", "help_config": "Path to a custom JSON config file (optional)", - "gui_drag_and_drop": "Drag and drop\nfiles here", + "gui_drag_and_drop": "Drag and drop files and folders\nto start sharing", "gui_add": "Add", "gui_delete": "Delete", "gui_choose_items": "Choose",