Basic shortcuts should still use the common GDK_CONTROL_MASK

This commit is contained in:
Marco Cawthorne 2021-08-10 12:04:06 +02:00
parent 6a6b6e3555
commit 22f3b9ee73

View file

@ -3022,9 +3022,9 @@ void MainFrame_Construct()
/*GlobalCommands_insert("Sleep", makeCallbackF(thunk_OnSleep), /*GlobalCommands_insert("Sleep", makeCallbackF(thunk_OnSleep),
Accelerator('P', (GdkModifierType) (GDK_SHIFT_MASK | GDK_LOCK_MASK)));*/ Accelerator('P', (GdkModifierType) (GDK_SHIFT_MASK | GDK_LOCK_MASK)));*/
GlobalCommands_insert("NewMap", makeCallbackF(NewMap)); GlobalCommands_insert("NewMap", makeCallbackF(NewMap));
GlobalCommands_insert("OpenMap", makeCallbackF(OpenMap), Accelerator('O', (GdkModifierType) GDK_LOCK_MASK)); GlobalCommands_insert("OpenMap", makeCallbackF(OpenMap), Accelerator('O', (GdkModifierType) GDK_CONTROL_MASK));
GlobalCommands_insert("ImportMap", makeCallbackF(ImportMap)); GlobalCommands_insert("ImportMap", makeCallbackF(ImportMap));
GlobalCommands_insert("SaveMap", makeCallbackF(SaveMap), Accelerator('S', (GdkModifierType) GDK_LOCK_MASK)); GlobalCommands_insert("SaveMap", makeCallbackF(SaveMap), Accelerator('S', (GdkModifierType) GDK_CONTROL_MASK));
GlobalCommands_insert("SaveMapAs", makeCallbackF(SaveMapAs)); GlobalCommands_insert("SaveMapAs", makeCallbackF(SaveMapAs));
GlobalCommands_insert("ExportSelected", makeCallbackF(ExportMap)); GlobalCommands_insert("ExportSelected", makeCallbackF(ExportMap));
GlobalCommands_insert("SaveRegion", makeCallbackF(SaveRegion)); GlobalCommands_insert("SaveRegion", makeCallbackF(SaveRegion));
@ -3032,10 +3032,10 @@ void MainFrame_Construct()
GlobalCommands_insert("ProjectSettings", makeCallbackF(DoProjectSettings)); GlobalCommands_insert("ProjectSettings", makeCallbackF(DoProjectSettings));
GlobalCommands_insert("Exit", makeCallbackF(Exit)); GlobalCommands_insert("Exit", makeCallbackF(Exit));
GlobalCommands_insert("Undo", makeCallbackF(Undo), Accelerator('Z', (GdkModifierType) GDK_LOCK_MASK)); GlobalCommands_insert("Undo", makeCallbackF(Undo), Accelerator('Z', (GdkModifierType) GDK_CONTROL_MASK));
GlobalCommands_insert("Redo", makeCallbackF(Redo), Accelerator('Y', (GdkModifierType) GDK_LOCK_MASK)); GlobalCommands_insert("Redo", makeCallbackF(Redo), Accelerator('Y', (GdkModifierType) GDK_CONTROL_MASK));
GlobalCommands_insert("Copy", makeCallbackF(Copy), Accelerator('C', (GdkModifierType) GDK_LOCK_MASK)); GlobalCommands_insert("Copy", makeCallbackF(Copy), Accelerator('C', (GdkModifierType) GDK_CONTROL_MASK));
GlobalCommands_insert("Paste", makeCallbackF(Paste), Accelerator('V', (GdkModifierType) GDK_LOCK_MASK)); GlobalCommands_insert("Paste", makeCallbackF(Paste), Accelerator('V', (GdkModifierType) GDK_CONTROL_MASK));
GlobalCommands_insert("PasteToCamera", makeCallbackF(PasteToCamera), GlobalCommands_insert("PasteToCamera", makeCallbackF(PasteToCamera),
Accelerator('V', (GdkModifierType) GDK_MOD1_MASK)); Accelerator('V', (GdkModifierType) GDK_MOD1_MASK));
GlobalCommands_insert("CloneSelection", makeCallbackF(Selection_Clone), Accelerator(GDK_KEY_space)); GlobalCommands_insert("CloneSelection", makeCallbackF(Selection_Clone), Accelerator(GDK_KEY_space));