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.

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

Remove light mode #2874

Merged
merged 8 commits into from
Dec 19, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion conda.recipe/menu-windows.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"name": "Reset Spyder Settings",
"pyscript": "${PYTHON_SCRIPTS}/spyder-script.py --reset",
"workdir": "${USERPROFILE}",
"icon": "${PYTHON_SCRIPTS}/spyder_light.ico"
"icon": "${PYTHON_SCRIPTS}/spyder_reset.ico"
}
]
}
1 change: 0 additions & 1 deletion doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ Contents:
overview
installation
options
lightmode
console
ipythonconsole
debugging
Expand Down
22 changes: 0 additions & 22 deletions doc/lightmode.rst

This file was deleted.

1 change: 0 additions & 1 deletion doc/options.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ Spyder's command line options are the following:

Options:
-h, --help show this help message and exit
-l, --light Light version (all add-ons are disabled)
--new-instance Run a new instance of Spyder, even if the single
instance mode has been turned on (default)
--session=STARTUP_SESSION
Expand Down
File renamed without changes.
File renamed without changes
7 changes: 0 additions & 7 deletions scripts/spyder_win_post_install.py
Original file line number Diff line number Diff line change
Expand Up @@ -147,13 +147,6 @@ def install():
osp.join(ico_dir, 'spyder.ico'))
file_created(fname)

desc += '. Light configuration: console and variable explorer only.'
fname = osp.join(start_menu, 'Spyder (light).lnk')
create_shortcut(python, desc, fname,
'"%s" --light' % script, workdir,
osp.join(ico_dir, 'spyder_light.ico'))
file_created(fname)

fname = osp.join(start_menu, 'Spyder-Reset all settings.lnk')
create_shortcut(python, 'Reset Spyder settings to defaults',
fname, '"%s" --reset' % script, workdir)
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def get_data_files():
('share/pixmaps', ['img_src/spyder.png'])]
elif os.name == 'nt':
data_files = [('scripts', ['img_src/spyder.ico',
'img_src/spyder_light.ico'])]
'img_src/spyder_reset.ico'])]
else:
data_files = []
return data_files
Expand Down
2 changes: 0 additions & 2 deletions spyderlib/cli_options.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ def get_options():
return commands, message
"""
parser = optparse.OptionParser(usage="spyder [options] files")
parser.add_option('-l', '--light', action='store_true', default=False,
help="Light version (all add-ons are disabled)")
parser.add_option('--new-instance', action='store_true', default=False,
help="Run a new instance of Spyder, even if the single "
"instance mode has been turned on (default)")
Expand Down
13 changes: 1 addition & 12 deletions spyderlib/config/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -195,17 +195,6 @@ def is_gtk_desktop():
'window/is_maximized': True,
'window/is_fullscreen': False,
'window/prefs_dialog_size': (745, 411),
'lightwindow/size': (650, 400),
'lightwindow/position': (30, 30),
'lightwindow/is_maximized': False,
'lightwindow/is_fullscreen': False,

# The following setting is currently not used but necessary from
# a programmatical point of view (see spyder.py):
# (may become useful in the future if we add a button to change
# settings within the "light mode")
'lightwindow/prefs_dialog_size': (745, 411),

'show_status_bar': True,
'memory_usage/enable': True,
'memory_usage/timeout': 2000,
Expand Down Expand Up @@ -756,7 +745,7 @@ def is_gtk_desktop():
# 2. If you want to *remove* options that are no longer needed in our codebase,
# 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 = '22.0.0'
CONF_VERSION = '23.0.0'

# XXX: Previously we had load=(not DEV) here but DEV was set to *False*.
# Check if it *really* needs to be updated or not
Expand Down
Loading