"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "modules/pymol/controlling.py" between
pymol-v1.8.6.0.tar.bz2 and pymol-v2.1.0.tar.bz2

About: PyMOL is a Python-enhanced molecular graphics tool. It excels at 3D visualization of proteins, small molecules, density, surfaces, and trajectories. It also includes molecular editing, ray tracing, and movies. Open Source version.

controlling.py  (pymol-v1.8.6.0.tar.bz2)	:	controlling.py  (pymol-v2.1.0.tar.bz2)
skipping to change at line 200		skipping to change at line 200
mouse, button		mouse, button
'''		'''
global mouse_ring		global mouse_ring
ring=ring_dict_sc.auto_err(ring,'mouse cycle')		ring=ring_dict_sc.auto_err(ring,'mouse cycle')
if ring in ring_dict:		if ring in ring_dict:
_self.set("button_mode",0);		_self.set("button_mode",0);
mouse_ring = ring_dict[ring]		mouse_ring = ring_dict[ring]
if not quiet:		if not quiet:
print(" config_mouse: %s"%ring)		print(" config_mouse: %s"%ring)
_self.mouse(quiet=1,_self=_self)		_self.mouse(quiet=1)
else:		else:
print(" Error: unrecognized mouse ring: '%s'"%ring)		print(" Error: unrecognized mouse ring: '%s'"%ring)
mouse_ring = ring_dict['three_button']		mouse_ring = ring_dict['three_button']
mode_name_dict = {		mode_name_dict = {
'three_button_lights' : '3-Button Lights',		'three_button_lights' : '3-Button Lights',
'three_button_maestro' : '3-Button Maestro',		'three_button_maestro' : '3-Button Maestro',
'three_button_viewing' : '3-Button Viewing',		'three_button_viewing' : '3-Button Viewing',
'three_button_editing' : '3-Button Editing',		'three_button_editing' : '3-Button Editing',
skipping to change at line 327		skipping to change at line 327
('single_left','shft','+/-'),		('single_left','shft','+/-'),
('single_left','alt', 'cent'),		('single_left','alt', 'cent'),
],		],
'three_button_viewing' :		'three_button_viewing' :
[ ('l','none','rota'),		[ ('l','none','rota'),
('m','none','move'),		('m','none','move'),
('r','none','movz'),		('r','none','movz'),
('l','shft','+Box'),		('l','shft','+Box'),
('m','shft','-Box'),		('m','shft','-Box'),
('r','shft','clip'),		('r','shft','clip'),
('l','ctrl','+/-'),		('l','ctrl','move'),
('m','ctrl','pkat'),		('m','ctrl','pkat'),
('r','ctrl','pk1'),		('r','ctrl','pk1'),
('l','ctsh','Sele'),		('l','ctsh','Sele'),
('m','ctsh','orig'),		('m','ctsh','orig'),
('r','ctsh','clip'),		('r','ctsh','clip'),
('l','alt' ,'move'),		('l','alt' ,'move'),
('m','alt' ,'none'),		('m','alt' ,'none'),
('r','alt' ,'none'),		('r','alt' ,'none'),
('w','none','slab'),		('w','none','slab'),
('w','shft','movs'),		('w','shft','movs'),
('w','ctrl','mvsz'),		('w','ctrl','mvsz'),
('w','ctsh','movz'),		('w','ctsh','movz'),
('double_left','none','menu'),		('double_left','none','menu'),
('double_middle','none','none'),		('double_middle','none','none'),
('double_right','none', 'pkat'),		('double_right','none', 'pkat'),
('single_left','none','+/-'),		('single_left','none','+/-'),
('single_middle','none','cent'),		('single_middle','none','cent'),
('single_right','none', 'menu'),		('single_right','none', 'menu'),
('single_left','alt', 'cent'),		('single_left','alt', 'cent'),
		('single_left','ctrl', 'cent'),
],		],
'three_button_editing':		'three_button_editing':
[ ('l','none','rota'),		[ ('l','none','rota'),
('m','none','move'),		('m','none','move'),
('r','none','movz'),		('r','none','movz'),
('l','shft','roto'),		('l','shft','roto'),
('m','shft','movo'),		('m','shft','movo'),
('r','shft','mvoz') ,		('r','shft','mvoz') ,
('l','ctrl','torf'),		('l','ctrl','torf'),
('m','ctrl','+/-'),		('m','ctrl','+/-'),
skipping to change at line 375		skipping to change at line 376
('w','shft','movs'),		('w','shft','movs'),
('w','ctrl','mvsz'),		('w','ctrl','mvsz'),
('w','ctsh','movz'),		('w','ctsh','movz'),
('double_left','none','torf'),		('double_left','none','torf'),
('double_middle','none','drgm'),		('double_middle','none','drgm'),
('double_right','none', 'pktb'),		('double_right','none', 'pktb'),
('single_left','none','pkat'),		('single_left','none','pkat'),
('single_middle','none','cent'),		('single_middle','none','cent'),
('single_right','none', 'menu'),		('single_right','none', 'menu'),
('single_left','alt', 'cent'),		('single_left','alt', 'cent'),
		('single_left','ctrl', 'cent'),
],		],
'three_button_motions':		'three_button_motions':
[ ('l','none','rota'),		[ ('l','none','rota'),
('m','none','move'),		('m','none','move'),
('r','none','movz'),		('r','none','movz'),
('l','shft','rotv'),		('l','shft','rotv'),
('m','shft','movv'),		('m','shft','movv'),
('r','shft','mvvz') ,		('r','shft','mvvz') ,
('l','ctrl','torf'),		('l','ctrl','torf'),
('m','ctrl','pkat'),		('m','ctrl','pkat'),
skipping to change at line 404		skipping to change at line 406
('w','ctrl','mvsz'),		('w','ctrl','mvsz'),
('w','ctsh','movz'),		('w','ctsh','movz'),
('double_left','none','menu'),		('double_left','none','menu'),
('double_left','none','torf'),		('double_left','none','torf'),
('double_middle','none','drgm'),		('double_middle','none','drgm'),
('double_right','none', 'pktb'),		('double_right','none', 'pktb'),
('single_left','none','pkat'),		('single_left','none','pkat'),
('single_middle','none','cent'),		('single_middle','none','cent'),
('single_right','none', 'menu'),		('single_right','none', 'menu'),
('single_left','alt', 'cent'),		('single_left','alt', 'cent'),
		('single_left','ctrl', 'cent'),
],		],
'two_button_viewing' :		'two_button_viewing' :
[ ('l','none','rota'),		[ ('l','none','rota'),
('m','none','none'),		('m','none','none'),
('r','none','movz'),		('r','none','movz'),
('l','shft','pk1'),		('l','shft','pk1'),
('m','shft','none'),		('m','shft','none'),
('r','shft','clip'),		('r','shft','clip'),
('l','ctrl','move'),		('l','ctrl','move'),
('m','ctrl','none'),		('m','ctrl','none'),
End of changes. 5 change blocks.
2 lines changed or deleted		5 lines changed or added

---