Commit 65cfc2373726c12d03f37af61d753c33fa2c82ec

con <qtc-committer @no…a.com>
Fri Oct 09 13:34:56 CEST 2009

Tree SHA1: e7c3c6a
Parent SHA1: c7f054e (Debugger: Do configuration error checking early on.)
raw diff | raw patch

Enable multi key shortcuts on the Mac.

Since that was fixed in Qt.
(cherry picked from commit fe9d0bf3c5056a5336ed0fe235db2ae9aec79155)

Diff rendering mode:
inline
side by side


325	325	mwindow->addAction(cmd, Constants::G_WINDOW_NAVIGATE);
326	326	connect(m_d->m_goForwardAction, SIGNAL(triggered()), this, SLOT(goForwardInNavigationHistory()));
327	327
	328	#ifdef Q_WS_MAC
	329	QString prefix = tr("Meta+E");
	330	#else
	331	QString prefix = tr("Ctrl+E");
	332	#endif
	333
328	334	m_d->m_splitAction = new QAction(tr("Split"), this);
329	335	cmd = am->registerAction(m_d->m_splitAction, Constants::SPLIT, editManagerContext);
330		#ifndef Q_WS_MAC
331		cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+E,2")));
332		#endif
	336	cmd->setDefaultKeySequence(QKeySequence(tr("%1,2").arg(prefix)));
333	337	mwindow->addAction(cmd, Constants::G_WINDOW_SPLIT);
334	338	connect(m_d->m_splitAction, SIGNAL(triggered()), this, SLOT(split()));
335	339
336	340	m_d->m_splitSideBySideAction = new QAction(tr("Split Side by Side"), this);
337	341	cmd = am->registerAction(m_d->m_splitSideBySideAction, Constants::SPLIT_SIDE_BY_SIDE, editManagerContext);
338		#ifndef Q_WS_MAC
339		cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+E,3")));
340		#endif
	342	cmd->setDefaultKeySequence(QKeySequence(tr("%1,3").arg(prefix)));
341	343	mwindow->addAction(cmd, Constants::G_WINDOW_SPLIT);
342	344	connect(m_d->m_splitSideBySideAction, SIGNAL(triggered()), this, SLOT(splitSideBySide()));
343	345
344	346	m_d->m_removeCurrentSplitAction = new QAction(tr("Remove Current Split"), this);
345	347	cmd = am->registerAction(m_d->m_removeCurrentSplitAction, Constants::REMOVE_CURRENT_SPLIT, editManagerContext);
346		#ifndef Q_WS_MAC
347		cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+E,0")));
348		#endif
	348	cmd->setDefaultKeySequence(QKeySequence(tr("%1,0").arg(prefix)));
349	349	mwindow->addAction(cmd, Constants::G_WINDOW_SPLIT);
350	350	connect(m_d->m_removeCurrentSplitAction, SIGNAL(triggered()), this, SLOT(removeCurrentSplit()));
351	351
352	352	m_d->m_removeAllSplitsAction = new QAction(tr("Remove All Splits"), this);
353	353	cmd = am->registerAction(m_d->m_removeAllSplitsAction, Constants::REMOVE_ALL_SPLITS, editManagerContext);
354		#ifndef Q_WS_MAC
355		cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+E,1")));
356		#endif
	354	cmd->setDefaultKeySequence(QKeySequence(tr("%1,1").arg(prefix)));
357	355	mwindow->addAction(cmd, Constants::G_WINDOW_SPLIT);
358	356	connect(m_d->m_removeAllSplitsAction, SIGNAL(triggered()), this, SLOT(removeAllSplits()));
359	357
360	358	m_d->m_gotoOtherSplitAction = new QAction(tr("Goto Other Split"), this);
361	359	cmd = am->registerAction(m_d->m_gotoOtherSplitAction, Constants::GOTO_OTHER_SPLIT, editManagerContext);
362		#ifndef Q_WS_MAC
363		cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+E,o")));
364		#endif
	360	cmd->setDefaultKeySequence(QKeySequence(tr("%1,o").arg(prefix)));
365	361	mwindow->addAction(cmd, Constants::G_WINDOW_SPLIT);
366	362	connect(m_d->m_gotoOtherSplitAction, SIGNAL(triggered()), this, SLOT(gotoOtherSplit()));
367	363


113	113
114	114	m_postAction = new QAction(tr("Paste Snippet..."), this);
115	115	command = actionManager->registerAction(m_postAction, "CodePaster.Post", globalcontext);
116		#ifndef Q_WS_MAC
117	116	command->setDefaultKeySequence(QKeySequence(tr("Alt+C,Alt+P")));
118		#endif
119	117	connect(m_postAction, SIGNAL(triggered()), this, SLOT(post()));
120	118	cpContainer->addAction(command);
121	119
122	120	m_fetchAction = new QAction(tr("Fetch Snippet..."), this);
123	121	command = actionManager->registerAction(m_fetchAction, "CodePaster.Fetch", globalcontext);
124		#ifndef Q_WS_MAC
125	122	command->setDefaultKeySequence(QKeySequence(tr("Alt+C,Alt+F")));
126		#endif
127	123	connect(m_fetchAction, SIGNAL(triggered()), this, SLOT(fetch()));
128	124	cpContainer->addAction(command);
129	125


264	264	command = ami->registerAction(m_addAction, CMD_ID_ADD,
265	265	globalcontext);
266	266	command->setAttribute(Core::Command::CA_UpdateText);
267		#ifndef Q_WS_MAC
268	267	command->setDefaultKeySequence(QKeySequence(tr("Alt+C,Alt+A")));
269		#endif
270	268	connect(m_addAction, SIGNAL(triggered()), this, SLOT(addCurrentFile()));
271	269	cvsMenu->addAction(command);
272	270
…	…
294	294	command = ami->registerAction(m_diffCurrentAction,
295	295	CMD_ID_DIFF_CURRENT, globalcontext);
296	296	command->setAttribute(Core::Command::CA_UpdateText);
297		#ifndef Q_WS_MAC
298	297	command->setDefaultKeySequence(QKeySequence(tr("Alt+C,Alt+D")));
299		#endif
300	298	connect(m_diffCurrentAction, SIGNAL(triggered()), this, SLOT(diffCurrentFile()));
301	299	cvsMenu->addAction(command);
302	300
…	…
310	310	command = ami->registerAction(m_commitCurrentAction,
311	311	CMD_ID_COMMIT_CURRENT, globalcontext);
312	312	command->setAttribute(Core::Command::CA_UpdateText);
313		#ifndef Q_WS_MAC
314	313	command->setDefaultKeySequence(QKeySequence(tr("Alt+C,Alt+C")));
315		#endif
316	314	connect(m_commitCurrentAction, SIGNAL(triggered()), this, SLOT(startCommitCurrentFile()));
317	315	cvsMenu->addAction(command);
318	316


241	241	m_diffAction = new Utils::ParameterAction(tr("Diff Current File"), tr("Diff \"%1\""), Utils::ParameterAction::AlwaysEnabled, this);
242	242	command = actionManager->registerAction(m_diffAction, "Git.Diff", globalcontext);
243	243	command->setAttribute(Core::Command::CA_UpdateText);
244		#ifndef Q_WS_MAC
245	244	command->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+D")));
246		#endif
247	245	connect(m_diffAction, SIGNAL(triggered()), this, SLOT(diffCurrentFile()));
248	246	gitContainer->addAction(command);
249	247
250	248	m_statusAction = new Utils::ParameterAction(tr("File Status"), tr("Status Related to \"%1\""), Utils::ParameterAction::AlwaysEnabled, this);
251	249	command = actionManager->registerAction(m_statusAction, "Git.Status", globalcontext);
252		#ifndef Q_WS_MAC
253	250	command->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+S")));
254		#endif
255	251	command->setAttribute(Core::Command::CA_UpdateText);
256	252	connect(m_statusAction, SIGNAL(triggered()), this, SLOT(statusFile()));
257	253	gitContainer->addAction(command);
258	254
259	255	m_logAction = new Utils::ParameterAction(tr("Log File"), tr("Log of \"%1\""), Utils::ParameterAction::AlwaysEnabled, this);
260	256	command = actionManager->registerAction(m_logAction, "Git.Log", globalcontext);
261		#ifndef Q_WS_MAC
262	257	command->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+L")));
263		#endif
264	258	command->setAttribute(Core::Command::CA_UpdateText);
265	259	connect(m_logAction, SIGNAL(triggered()), this, SLOT(logFile()));
266	260	gitContainer->addAction(command);
267	261
268	262	m_blameAction = new Utils::ParameterAction(tr("Blame"), tr("Blame for \"%1\""), Utils::ParameterAction::AlwaysEnabled, this);
269	263	command = actionManager->registerAction(m_blameAction, "Git.Blame", globalcontext);
270		#ifndef Q_WS_MAC
271	264	command->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+B")));
272		#endif
273	265	command->setAttribute(Core::Command::CA_UpdateText);
274	266	connect(m_blameAction, SIGNAL(triggered()), this, SLOT(blameFile()));
275	267	gitContainer->addAction(command);
276	268
277	269	m_undoFileAction = new Utils::ParameterAction(tr("Undo Changes"), tr("Undo Changes for \"%1\""), Utils::ParameterAction::AlwaysEnabled, this);
278	270	command = actionManager->registerAction(m_undoFileAction, "Git.Undo", globalcontext);
279		#ifndef Q_WS_MAC
280	271	command->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+U")));
281		#endif
282	272	command->setAttribute(Core::Command::CA_UpdateText);
283	273	connect(m_undoFileAction, SIGNAL(triggered()), this, SLOT(undoFileChanges()));
284	274	gitContainer->addAction(command);
285	275
286	276	m_stageAction = new Utils::ParameterAction(tr("Stage File for Commit"), tr("Stage \"%1\" for Commit"), Utils::ParameterAction::AlwaysEnabled, this);
287	277	command = actionManager->registerAction(m_stageAction, "Git.Stage", globalcontext);
288		#ifndef Q_WS_MAC
289	278	command->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+A")));
290		#endif
291	279	command->setAttribute(Core::Command::CA_UpdateText);
292	280	connect(m_stageAction, SIGNAL(triggered()), this, SLOT(stageFile()));
293	281	gitContainer->addAction(command);
…	…
290	290
291	291	m_diffProjectAction = new Utils::ParameterAction(tr("Diff Current Project"), tr("Diff Project \"%1\""), Utils::ParameterAction::AlwaysEnabled, this);
292	292	command = actionManager->registerAction(m_diffProjectAction, "Git.DiffProject", globalcontext);
293		#ifndef Q_WS_MAC
294	293	command->setDefaultKeySequence(QKeySequence("Alt+G,Alt+Shift+D"));
295		#endif
296	294	command->setAttribute(Core::Command::CA_UpdateText);
297	295	connect(m_diffProjectAction, SIGNAL(triggered()), this, SLOT(diffCurrentProject()));
298	296	gitContainer->addAction(command);
…	…
303	303
304	304	m_logProjectAction = new Utils::ParameterAction(tr("Log Project"), tr("Log Project \"%1\""), Utils::ParameterAction::AlwaysEnabled, this);
305	305	command = actionManager->registerAction(m_logProjectAction, "Git.LogProject", globalcontext);
306		#ifndef Q_WS_MAC
307	306	command->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+K")));
308		#endif
309	307	command->setAttribute(Core::Command::CA_UpdateText);
310	308	connect(m_logProjectAction, SIGNAL(triggered()), this, SLOT(logProject()));
311	309	gitContainer->addAction(command);
…	…
338	338
339	339	m_commitAction = new QAction(tr("Commit..."), this);
340	340	command = actionManager->registerAction(m_commitAction, "Git.Commit", globalcontext);
341		#ifndef Q_WS_MAC
342	341	command->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+C")));
343		#endif
344	342	command->setAttribute(Core::Command::CA_UpdateText);
345	343	connect(m_commitAction, SIGNAL(triggered()), this, SLOT(startCommit()));
346	344	gitContainer->addAction(command);


260	260	m_editAction = new Utils::ParameterAction(tr("Edit"), tr("Edit \"%1\""), Utils::ParameterAction::EnabledWithParameter, this);
261	261	command = am->registerAction(m_editAction, CMD_ID_EDIT, globalcontext);
262	262	command->setAttribute(Core::Command::CA_UpdateText);
263		#ifndef Q_WS_MAC
264	263	command->setDefaultKeySequence(QKeySequence(tr("Alt+P,Alt+E")));
265		#endif
266	264	command->setDefaultText(tr("Edit File"));
267	265	connect(m_editAction, SIGNAL(triggered()), this, SLOT(openCurrentFile()));
268	266	mperforce->addAction(command);
…	…
268	268	m_addAction = new Utils::ParameterAction(tr("Add"), tr("Add \"%1\""), Utils::ParameterAction::EnabledWithParameter, this);
269	269	command = am->registerAction(m_addAction, CMD_ID_ADD, globalcontext);
270	270	command->setAttribute(Core::Command::CA_UpdateText);
271		#ifndef Q_WS_MAC
272	271	command->setDefaultKeySequence(QKeySequence(tr("Alt+P,Alt+A")));
273		#endif
274	272	command->setDefaultText(tr("Add File"));
275	273	connect(m_addAction, SIGNAL(triggered()), this, SLOT(addCurrentFile()));
276	274	mperforce->addAction(command);
…	…
283	283	m_revertAction = new Utils::ParameterAction(tr("Revert"), tr("Revert \"%1\""), Utils::ParameterAction::EnabledWithParameter, this);
284	284	command = am->registerAction(m_revertAction, CMD_ID_REVERT, globalcontext);
285	285	command->setAttribute(Core::Command::CA_UpdateText);
286		#ifndef Q_WS_MAC
287	286	command->setDefaultKeySequence(QKeySequence(tr("Alt+P,Alt+R")));
288		#endif
289	287	command->setDefaultText(tr("Revert File"));
290	288	connect(m_revertAction, SIGNAL(triggered()), this, SLOT(revertCurrentFile()));
291	289	mperforce->addAction(command);
…	…
304	304	m_diffProjectAction = new Utils::ParameterAction(diffProjectDefaultText, tr("Diff Project \"%1\""), Utils::ParameterAction::AlwaysEnabled, this);
305	305	command = am->registerAction(m_diffProjectAction, CMD_ID_DIFF_PROJECT, globalcontext);
306	306	command->setAttribute(Core::Command::CA_UpdateText);
307		#ifndef Q_WS_MAC
308	307	command->setDefaultKeySequence(QKeySequence(tr("Alt+P,Alt+D")));
309		#endif
310	308	command->setDefaultText(diffProjectDefaultText);
311	309	connect(m_diffProjectAction, SIGNAL(triggered()), this, SLOT(diffCurrentProject()));
312	310	mperforce->addAction(command);
…	…
321	321
322	322	m_openedAction = new QAction(tr("Opened"), this);
323	323	command = am->registerAction(m_openedAction, CMD_ID_OPENED, globalcontext);
324		#ifndef Q_WS_MAC
325	324	command->setDefaultKeySequence(QKeySequence(tr("Alt+P,Alt+O")));
326		#endif
327	325	connect(m_openedAction, SIGNAL(triggered()), this, SLOT(printOpenedFileList()));
328	326	mperforce->addAction(command);
329	327
…	…
369	369	m_filelogCurrentAction = new Utils::ParameterAction(tr("Filelog Current File"), tr("Filelog \"%1\""), Utils::ParameterAction::EnabledWithParameter, this);
370	370	command = am->registerAction(m_filelogCurrentAction, CMD_ID_FILELOG_CURRENT, globalcontext);
371	371	command->setAttribute(Core::Command::CA_UpdateText);
372		#ifndef Q_WS_MAC
373	372	command->setDefaultKeySequence(QKeySequence(tr("Alt+P,Alt+F")));
374		#endif
375	373	command->setDefaultText(tr("Filelog Current File"));
376	374	connect(m_filelogCurrentAction, SIGNAL(triggered()), this, SLOT(filelogCurrentFile()));
377	375	mperforce->addAction(command);


293	293	command = ami->registerAction(m_addAction, CMD_ID_ADD,
294	294	globalcontext);
295	295	command->setAttribute(Core::Command::CA_UpdateText);
296		#ifndef Q_WS_MAC
297	296	command->setDefaultKeySequence(QKeySequence(tr("Alt+S,Alt+A")));
298		#endif
299	297	connect(m_addAction, SIGNAL(triggered()), this, SLOT(addCurrentFile()));
300	298	subversionMenu->addAction(command);
301	299
…	…
323	323	command = ami->registerAction(m_diffCurrentAction,
324	324	CMD_ID_DIFF_CURRENT, globalcontext);
325	325	command->setAttribute(Core::Command::CA_UpdateText);
326		#ifndef Q_WS_MAC
327	326	command->setDefaultKeySequence(QKeySequence(tr("Alt+S,Alt+D")));
328		#endif
329	327	connect(m_diffCurrentAction, SIGNAL(triggered()), this, SLOT(diffCurrentFile()));
330	328	subversionMenu->addAction(command);
331	329
…	…
339	339	command = ami->registerAction(m_commitCurrentAction,
340	340	CMD_ID_COMMIT_CURRENT, globalcontext);
341	341	command->setAttribute(Core::Command::CA_UpdateText);
342		#ifndef Q_WS_MAC
343	342	command->setDefaultKeySequence(QKeySequence(tr("Alt+S,Alt+C")));
344		#endif
345	343	connect(m_commitCurrentAction, SIGNAL(triggered()), this, SLOT(startCommitCurrentFile()));
346	344	subversionMenu->addAction(command);
347	345


141	141	advancedMenu->addAction(command, Core::Constants::G_EDIT_FORMAT);
142	142	connect(m_formatAction, SIGNAL(triggered(bool)), this, SLOT(formatAction()));
143	143
	144	#ifdef Q_WS_MAC
	145	QString modifier = tr("Meta");
	146	#else
	147	QString modifier = tr("Ctrl");
	148	#endif
	149
144	150	m_rewrapParagraphAction = new QAction(tr("&Rewrap Paragraph"), this);
145	151	command = am->registerAction(m_rewrapParagraphAction, TextEditor::Constants::REWRAP_PARAGRAPH, m_contextId);
146		#ifndef Q_WS_MAC
147		command->setDefaultKeySequence(QKeySequence(tr("Ctrl+E, R")));
148		#endif
	152	command->setDefaultKeySequence(QKeySequence(tr("%1+E, R").arg(modifier)));
149	153	advancedMenu->addAction(command, Core::Constants::G_EDIT_FORMAT);
150	154	connect(m_rewrapParagraphAction, SIGNAL(triggered(bool)), this, SLOT(rewrapParagraphAction()));
151	155
…	…
158	158	m_visualizeWhitespaceAction->setCheckable(true);
159	159	command = am->registerAction(m_visualizeWhitespaceAction,
160	160	TextEditor::Constants::VISUALIZE_WHITESPACE, m_contextId);
161		#ifndef Q_WS_MAC
162		command->setDefaultKeySequence(QKeySequence(tr("Ctrl+E, Ctrl+V")));
163		#endif
	161	command->setDefaultKeySequence(QKeySequence(tr("%1+E, %2+V").arg(modifier, modifier)));
164	162	advancedMenu->addAction(command, Core::Constants::G_EDIT_FORMAT);
165	163	connect(m_visualizeWhitespaceAction, SIGNAL(triggered(bool)), this, SLOT(setVisualizeWhitespace(bool)));
166	164
…	…
172	172	m_textWrappingAction = new QAction(tr("Enable Text &Wrapping"), this);
173	173	m_textWrappingAction->setCheckable(true);
174	174	command = am->registerAction(m_textWrappingAction, TextEditor::Constants::TEXT_WRAPPING, m_contextId);
175		#ifndef Q_WS_MAC
176		command->setDefaultKeySequence(QKeySequence(tr("Ctrl+E, Ctrl+W")));
177		#endif
	175	command->setDefaultKeySequence(QKeySequence(tr("%1+E, %2+W").arg(modifier, modifier)));
178	176	advancedMenu->addAction(command, Core::Constants::G_EDIT_FORMAT);
179	177	connect(m_textWrappingAction, SIGNAL(triggered(bool)), this, SLOT(setTextWrapping(bool)));
180	178

Commit 65cfc2373726c12d03f37af61d753c33fa2c82ec

Gitorious