Merge pull request #1395 from onionshare/developv2.3.3

Version 2.3.3, merge develop into stable

1 files changed, 8 insertions, 4 deletions

diff --git a/desktop/src/onionshare/tab/mode/share_mode/__init__.py b/desktop/src/onionshare/tab/mode/share_mode/__init__.py
index 74a4e2c2..4056d92e 100644
--- a/desktop/src/onionshare/tab/mode/share_mode/__init__.py
+++ b/desktop/src/onionshare/tab/mode/share_mode/__init__.py
@@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import os
 from PySide2 import QtCore, QtWidgets, QtGui
 
-from onionshare_cli.onion import *
 from onionshare_cli.common import Common
 from onionshare_cli.web import Web
 
@@ -30,7 +29,7 @@ from .. import Mode
 from ..file_selection import FileSelection
 from ..history import History, ToggleHistory, ShareHistoryItem
 from .... import strings
-from ....widgets import Alert, MinimumWidthWidget
+from ....widgets import MinimumSizeWidget
 from ....gui_common import GuiCommon
 
 
@@ -77,6 +76,11 @@ class ShareMode(Mode):
             for filename in self.filenames:
                 self.file_selection.file_list.add_file(filename)
 
+        # Set title placeholder
+        self.mode_settings_widget.title_lineedit.setPlaceholderText(
+            strings._("gui_tab_name_share")
+        )
+
         # Server status
         self.server_status.set_mode("share", self.file_selection)
         self.server_status.server_started.connect(self.file_selection.server_started)
@@ -156,9 +160,9 @@ class ShareMode(Mode):
         self.main_layout = QtWidgets.QVBoxLayout()
         self.main_layout.addLayout(top_bar_layout)
         self.main_layout.addLayout(self.file_selection)
-        self.main_layout.addWidget(self.primary_action)
+        self.main_layout.addWidget(self.primary_action, stretch=1)
         self.main_layout.addWidget(self.server_status)
-        self.main_layout.addWidget(MinimumWidthWidget(700))
+        self.main_layout.addWidget(MinimumSizeWidget(700, 0))
 
         # Column layout
         self.column_layout = QtWidgets.QHBoxLayout()