Remove options from the main window

onionshare_gui/__init__.py

@@ -29,7 +29,6 @@ from .menu import Menu
 from .file_selection import FileSelection
 from .server_status import ServerStatus
 from .downloads import Downloads
-from .options import Options
 from .alert import Alert
 
 class Application(QtWidgets.QApplication):
@@ -116,9 +115,6 @@ class OnionShareGui(QtWidgets.QMainWindow):
         self.downloads_container.hide() # downloads start out hidden
         self.new_download = False
 
-        # options
-        self.options = Options(web, self.app)
-
         # status bar
         self.status_bar = QtWidgets.QStatusBar()
         self.status_bar.setSizeGripEnabled(False)
@@ -136,7 +132,6 @@ class OnionShareGui(QtWidgets.QMainWindow):
         self.layout.addLayout(self.server_status)
         self.layout.addWidget(self.filesize_warning)
         self.layout.addWidget(self.downloads_container)
-        self.layout.addLayout(self.options)
         central_widget = QtWidgets.QWidget()
         central_widget.setLayout(self.layout)
         self.setCentralWidget(central_widget)
@@ -160,9 +155,6 @@ class OnionShareGui(QtWidgets.QMainWindow):
         # pick an available local port for the http service to listen on
         self.app.choose_port()
 
-        # disable the stealth option
-        self.options.set_advanced_enabled(False)
-
         # start onionshare http service in new thread
         t = threading.Thread(target=web.start, args=(self.app.port, self.app.stay_open, self.app.transparent_torification))
         t.daemon = True
@@ -245,7 +237,6 @@ class OnionShareGui(QtWidgets.QMainWindow):
             web.stop(self.app.port)
         self.app.cleanup()
         self.filesize_warning.hide()
-        self.options.set_advanced_enabled(True)
         self.stop_server_finished.emit()
 
     @staticmethod

onionshare_gui/options.py

@@ -1,98 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-OnionShare | https://onionshare.org/
-
-Copyright (C) 2017 Micah Lee <micah@micahflee.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-"""
-from PyQt5 import QtCore, QtWidgets
-
-from onionshare import strings, helpers
-
-class Options(QtWidgets.QVBoxLayout):
-    """
-    The extra onionshare options in the GUI.
-    """
-    def __init__(self, web, app):
-        super(Options, self).__init__()
-
-        self.web = web
-        self.app = app
-
-        # close automatically
-        self.close_automatically = QtWidgets.QCheckBox()
-        if self.web.stay_open:
-            self.close_automatically.setCheckState(QtCore.Qt.Unchecked)
-        else:
-            self.close_automatically.setCheckState(QtCore.Qt.Checked)
-        self.close_automatically.setText(strings._("close_on_finish", True))
-        self.close_automatically.stateChanged.connect(self.stay_open_changed)
-
-        # stealth
-        self.stealth = QtWidgets.QCheckBox()
-        self.stealth.setCheckState(QtCore.Qt.Unchecked)
-        self.stealth.setText(strings._("gui_create_stealth", True))
-        self.stealth.stateChanged.connect(self.stealth_changed)
-
-        # advanced options group
-        self.advanced_group = QtWidgets.QGroupBox(strings._("gui_advanced_options", True))
-        self.advanced_group.setCheckable(True)
-        self.advanced_group.setChecked(False)
-        self.advanced_group.setFlat(True)
-        self.advanced_group.toggled.connect(self.advanced_options_changed)
-        advanced_group_layout = QtWidgets.QVBoxLayout()
-        advanced_group_layout.addWidget(self.stealth)
-        self.advanced_group.setLayout(advanced_group_layout)
-
-        # add the widgets
-        self.addWidget(self.close_automatically)
-        self.addWidget(self.advanced_group)
-
-    def stay_open_changed(self, state):
-        """
-        When the 'close automatically' checkbox is toggled, let the web app know.
-        """
-        if state == 0:
-            self.web.set_stay_open(True)
-            self.app.stay_open = True
-        else:
-            self.web.set_stay_open(False)
-            self.app.stay_open = False
-
-    def advanced_options_changed(self, checked):
-        """
-        When the 'advanced options' checkbox is unchecked, uncheck all advanced
-        options, and let the onionshare app know.
-        """
-        if not checked:
-            self.stealth.setChecked(False)
-            self.app.set_stealth(False)
-
-    def stealth_changed(self, state):
-        """
-        When the 'stealth' checkbox is toggled, let the onionshare app know.
-        """
-        if state == 2:
-            self.app.set_stealth(True)
-        else:
-            self.app.set_stealth(False)
-
-    def set_advanced_enabled(self, enabled):
-        """
-        You cannot toggle stealth after an onion service has started. This method
-        disables and re-enabled the advanced options group, including the stealth
-        checkbox.
-        """
-        self.advanced_group.setEnabled(enabled)