Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PR: Remove startup options of working directory plugin #4752

Merged
merged 2 commits into from
Jul 24, 2017
Merged

PR: Remove startup options of working directory plugin #4752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca23979
Working dir: Remove startup options because they are conflicting with…
ccordoba12 Jul 15, 2017
aaf88a6
Working directory: Use cwd when opening new consoles because that was…
ccordoba12 Jul 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions spyder/config/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,9 +281,8 @@
{
'working_dir_adjusttocontents': False,
'working_dir_history': 20,
'startup/use_project_or_home_directory': True,
'console/use_project_or_home_directory': True,
'console/use_cwd': False,
'console/use_project_or_home_directory': False,
'console/use_cwd': True,
'console/use_fixed_directory': False,
}),
('shortcuts',
Expand Down Expand Up @@ -633,7 +632,7 @@
# or if you want to *rename* options, then you need to do a MAJOR update in
# version, e.g. from 3.0.0 to 4.0.0
# 3. You don't need to touch this value if you're just adding a new option
CONF_VERSION = '39.0.0'
CONF_VERSION = '40.0.0'

# Main configuration instance
try:
Expand Down
42 changes: 3 additions & 39 deletions spyder/plugins/workingdirectory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,41 +40,6 @@ def setup_page(self):
"and the current directory for the File Explorer."))
about_label.setWordWrap(True)

startup_group = QGroupBox(_("Startup"))
startup_bg = QButtonGroup(startup_group)
startup_label = QLabel(_("At startup, the current working "
"directory is:"))
startup_label.setWordWrap(True)
lastdir_radio = self.create_radiobutton(
_("The current project directory "
"or user home directory "
"(if no project is active)"),
'startup/use_project_or_home_directory',
True,
_("At startup,"), # TODO
button_group=startup_bg)
thisdir_radio = self.create_radiobutton(
_("the following directory:"),
'startup/use_fixed_directory', False,
_("At startup, the current working "
"directory will be the specified path"),
button_group=startup_bg)
thisdir_bd = self.create_browsedir("", 'startup/fixed_directory',
getcwd())
thisdir_radio.toggled.connect(thisdir_bd.setEnabled)
lastdir_radio.toggled.connect(thisdir_bd.setDisabled)
thisdir_layout = QHBoxLayout()
thisdir_layout.addWidget(thisdir_radio)
thisdir_layout.addWidget(thisdir_bd)

startup_layout = QVBoxLayout()
startup_layout.addWidget(startup_label)
startup_layout.addWidget(lastdir_radio)
startup_layout.addLayout(thisdir_layout)
startup_group.setLayout(startup_layout)

# Console Directory

console_group = QGroupBox(_("Console directory"))
console_label = QLabel(_("The working directory for new consoles is:"))
console_label.setWordWrap(True)
Expand Down Expand Up @@ -117,7 +82,6 @@ def setup_page(self):
vlayout = QVBoxLayout()
vlayout.addWidget(about_label)
vlayout.addSpacing(10)
vlayout.addWidget(startup_group)
vlayout.addWidget(console_group)
vlayout.addStretch(1)
self.setLayout(vlayout)
Expand Down Expand Up @@ -185,12 +149,12 @@ def __init__(self, parent, workdir=None, **kwds):
self.pathedit.setMaxCount(self.get_option('working_dir_history'))
wdhistory = self.load_wdhistory(workdir)
if workdir is None:
if self.get_option('startup/use_project_or_home_directory'):
if self.get_option('console/use_project_or_home_directory'):
workdir = get_home_dir()
else:
workdir = self.get_option('startup/fixed_directory', ".")
workdir = self.get_option('console/fixed_directory', default='')
if not osp.isdir(workdir):
workdir = "."
workdir = get_home_dir()
self.chdir(workdir)
self.pathedit.addItems(wdhistory)
self.pathedit.selected_text = self.pathedit.currentText()
Expand Down