[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1656
Date       : Thu Aug  3 13:59:40 BST 2006

Changed paths:
   M /Trunk/XaraLX/tools/texttool.cpp
   M /Trunk/XaraLX/wxOil/xrc/STANDARD_HOTKEYS.res

Allow file close on hotkey as per Bug 533


Diff:
Index: Trunk/XaraLX/tools/texttool.cpp
===================================================================
--- Trunk/XaraLX/tools/texttool.cpp	(revision 1655)
+++ Trunk/XaraLX/tools/texttool.cpp	(revision 1656)
@@ -1442,9 +1442,9 @@
 			}
 			UsedTheKeypress = TRUE;
 			break;
- 		case CAMKEY(W):
-			// Swap case
-			if (pKeyPress->IsConstrain() && !pKeyPress->IsAdjust() )
+ 		case CAMKEY(C):
+			// Swap case (was Control-W, now Control-Shift-C)
+			if (pKeyPress->IsConstrain() && pKeyPress->IsAdjust() )
 			{
 				if (IsNonCharEvent && TextStory::GetFocusStory()->GetCaret()->FindNextTextCharInStory() != NULL)
 				{
Index: Trunk/XaraLX/wxOil/xrc/STANDARD_HOTKEYS.res
===================================================================
--- Trunk/XaraLX/wxOil/xrc/STANDARD_HOTKEYS.res	(revision 1655)
+++ Trunk/XaraLX/wxOil/xrc/STANDARD_HOTKEYS.res	(revision 1656)
@@ -12,7 +12,7 @@
 HotKey	0x46		Adjust Constrain		"Ctrl+Shift+F"	"MoveForwards"
 HotKey	0x47		Constrain				"Ctrl+G"		"Group"
 HotKey	0x47		Adjust Constrain		"Ctrl+Shift+G"	"Group"
-HotKey	0x57		Constrain				"Ctrl+W"		"URLImport"
+HotKey	0x57		Constrain				"Ctrl+W"		"FileClose"
 HotKey	0x49		Adjust Constrain		"Ctrl+Shift+I"	"Import"
 HotKey	0x49		Constrain				"Ctrl+I"		"ImageSlice"
 HotKey	0x4A		Adjust Constrain		"Ctrl+Shift+J"	"ZoomDrawing"
@@ -37,6 +37,7 @@
 HotKey	0x57		Adjust Constrain		"Ctrl+Shift+W"	"WebAddressDlg"
 HotKey	0x58		Constrain				"Ctrl+X"		"Cut"
 HotKey	0x59		Constrain				"Ctrl+Y"		"Redo"
+HotKey	0x59		Adjust Constrain		"Ctrl+Shift+Y"	"URLImport"
 HotKey	0x5A		Constrain				"Ctrl+Z"		"Undo"
 HotKey  0x5A		Adjust Constrain		"Ctrl+Shift+Z"	"ZoomSelect"
 HotKey	0xBC							"<"				"Undo"


Xara