Context Navigation

Changeset 215

Timestamp:

05/05/10 08:12:24 (3 years ago)

Author:

mbutscher

Message:

branches/stable-2.0 and branches/mbutscher/work:

* Further changes to Mac OS keybindings

Location:

branches

Files:

r214	r215
13	13	headingsasaliases_depth = 0
14	14	wiki_name = WikidPadHelp
15		tree_expandednodes_descriptorpathes_main =
	15	wikipagetitle_creationmode = 1
16	16	wikipagetitleprefix = ++
17	17	wikipagetitle_fromlinktitle = True
…	…
20	20	versioning_storagelocation = 0
21	21	template_pagenamesre = ^template/
22		wikipagetitle_creationmode = 1
	22	tree_expandednodes_descriptorpathes_main =
23	23	tree_last_root_wiki_word = WikidPadHelp
24	24	tree_force_scratchpad_visibility = True

r178	r215
2	2
3	3	Many of the key bindings defined below may be changed, ChangingKeyBindings.
	4
	5	Please note: These bindings have been developed for use on Windows.
	6	On other Operating Systems like Apple OSX or Linux there may be differences.
	7	See KeyBindingsOnLinuxAndOsx.
4	8
5	9	Formatting
…	…
50	54	F6 switch between tree and editor
51	55	CTRL-TAB switch between tabs
52

r214	r215
31	31	ActivateLinkNewTab="Alt-Shift-L"
32	32	ActivateLinkBackground="Alt-Shift-Ctrl-L"
	33	# to test: What about Mac OSX? wx.Platform == "__WXMAC__"
	34
33	35	ViewParents="Ctrl-Up"
34	36	ViewParentless="Ctrl-Shift-Up"
…	…
46	48	GoHome="Ctrl-Shift-H"
47	49	StartIncrementalSearch="Alt-Shift-F"
48		FocusFastSearchField=""
49		# FocusFastSearchField="Ctrl-Shift-F" #todo: Find a working solution
	50	FocusFastSearchField="Alt-Shift-S"
50	51	else:
51	52	GoHome="Ctrl-Q"
…	…
80	81	ShowPreview="Ctrl-Shift-S"
81	82	ShowSwitchEditorPreview="Ctrl-Shift-Space"
	83	#if wx.Platform == "__WXMAC__":
	84	# no good keybinding found that works on Mac
	85	# ShowSwitchEditorPreview="??????"
	86
82	87	ZoomIn=""
83	88	ZoomOut=""
…	…
86	91	ContinueSearch="F3"
87	92	BackwardSearch="Shift-F3"
88		AutoComplete="Ctrl-Space"
	93	if wx.Platform == "__WXMAC__":
	94	AutoComplete="Alt-Space"
	95	else:
	96	AutoComplete="Ctrl-Space"
89	97	ActivateLink2="Ctrl-Return"
90	98	SwitchFocus="F6"

r214	r215
47	47	# wikiWordToLabel, revStr, lineendToInternal, lineendToOs
48	48
49		from Configuration import isUnicode, is~~Win9x, isLinux, isWindows, isOSX~~
	49	from Configuration import isUnicode, isOSX, isWin9x, isLinux, isWindows
50	50
51	51	try:
…	…
2544	2544
2545	2545	rect = sb.GetFieldRect(0)
2546
2547	2546	if isOSX():
2548	2547	# needed on Mac OSX to avoid cropped text

r213	r215
13	13	headingsasaliases_depth = 0
14	14	wiki_name = WikidPadHelp
15		wikipagetitle_creationmode = 1
	15	tree_expandednodes_descriptorpathes_main =
16	16	wikipagetitleprefix = ++
17	17	wikipagetitle_fromlinktitle = True
…	…
19	19	wikipagefiles_gracefuloutsideaddandremove = True
20	20	versioning_storagelocation = 0
21		tree_expandednodes_descriptorpathes_main =
	21	wikipagetitle_creationmode = 1
22	22	tree_last_root_wiki_word = WikidPadHelp
23	23	tree_force_scratchpad_visibility = True

r178	r215
2	2
3	3	Many of the key bindings defined below may be changed, ChangingKeyBindings.
	4
	5	Please note: These bindings have been developed for use on Windows.
	6	On other Operating Systems like Apple OSX or Linux there may be differences.
	7	See KeyBindingsOnLinuxAndOsx.
4	8
5	9	Formatting
…	…
50	54	F6 switch between tree and editor
51	55	CTRL-TAB switch between tabs
52

r214	r215
31	31	ActivateLinkNewTab="Alt-Shift-L"
32	32	ActivateLinkBackground="Alt-Shift-Ctrl-L"
	33	# to test: What about Mac OSX? wx.Platform == "__WXMAC__"
	34
33	35	ViewParents="Ctrl-Up"
34	36	ViewParentless="Ctrl-Shift-Up"
…	…
46	48	GoHome="Ctrl-Shift-H"
47	49	StartIncrementalSearch="Alt-Shift-F"
48		else:
49		GoHome="Ctrl-Q"
50		StartIncrementalSearch="Ctrl-F"
51
52		if wx.Platform == "__WXMAC__":
53		GoHome="Ctrl-Shift-H"
54		StartIncrementalSearch="Alt-Shift-F"
55		FocusFastSearchField=""
56		# FocusFastSearchField="Ctrl-Shift-F" #todo: Find a working solution
	50	FocusFastSearchField="Alt-Shift-S"
57	51	else:
58	52	GoHome="Ctrl-Q"
…	…
86	80	ShowPreview="Ctrl-Shift-S"
87	81	ShowSwitchEditorPreview="Ctrl-Shift-Space"
	82	#if wx.Platform == "__WXMAC__":
	83	# no good keybinding found that works on Mac
	84	# ShowSwitchEditorPreview="??????"
	85
88	86	ZoomIn=""
89	87	ZoomOut=""
…	…
92	90	ContinueSearch="F3"
93	91	BackwardSearch="Shift-F3"
94		AutoComplete="Ctrl-Space"
	92	if wx.Platform == "__WXMAC__":
	93	AutoComplete="Alt-Space"
	94	else:
	95	AutoComplete="Ctrl-Space"
95	96	ActivateLink2="Ctrl-Return"
96	97	SwitchFocus="F6"

r214	r215
39	39	# wikiWordToLabel, revStr, lineendToInternal, lineendToOs
40	40
41		from Configuration import isUnicode, isWin9x, isLinux, isWindows
	41	from Configuration import isUnicode, isOSX, isWin9x, isLinux, isWindows
42	42
43	43	try:
…	…
2284	2284
2285	2285	rect = sb.GetFieldRect(0)
2286
2287	2286	if isOSX():
2288	2287	# needed on Mac OSX to avoid cropped text