Key modifier mask changes.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@25453 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,12 @@
+2007-09-05 00:41-EDT Gregory John Casamento <greg_casamento@yahoo.com>
+
+	* Palettes/2Controls/GormButtonAttributesInspector.h: Added ivars
+	for new buttons.
+	* Palettes/2Controls/GormButtonAttributesInspector.m: Addeed code
+	in ok: and revert: to handle modifier settings
+	* Palettes/2Controls/GormNSButtonInspector.gorm: Added key equivalent
+	modifier buttons.
+
 2007-09-03 23:12-EDT Gregory John Casamento <greg_casamento@yahoo.com>
 
 	* Palettes/2Controls/GormButtonAttributesInspector.m: added

Palettes/2Controls/GormButtonAttributesInspector.h

@@ -40,6 +40,7 @@
 @class NSForm;
 @class NSMatrix;
 @class NSPopUpButton;
+@class NSSwitch;
 
 @interface GormButtonAttributesInspector: IBInspector
 {
@@ -51,6 +52,10 @@
   NSForm *titleForm;
   NSPopUpButton *typeButton;
   NSPopUpButton *keyEquiv;
+  NSSwitch *altMod;
+  NSSwitch *shiftMod;
+  NSSwitch *ctrlMod;
+  NSSwitch *cmdMod;
 }
 
 @end

Palettes/2Controls/GormButtonAttributesInspector.m

@@ -259,6 +259,50 @@ NSString *rtString = nil;
             */
       [object setButtonType: [sender tag]];
     }
+  else if (sender == altMod)
+    {
+      if([altMod state] == NSOnState)
+	{
+	  [object setKeyEquivalentModifierMask: [object keyEquivalentModifierMask] | NSAlternateKeyMask];
+	}
+      else
+	{
+	  [object setKeyEquivalentModifierMask: [object keyEquivalentModifierMask] & ~NSAlternateKeyMask];
+	}
+    }
+  else if (sender == ctrlMod)
+    {
+      if([ctrlMod state] == NSOnState)
+	{
+	  [object setKeyEquivalentModifierMask: [object keyEquivalentModifierMask] | NSControlKeyMask];
+	}
+      else
+	{
+	  [object setKeyEquivalentModifierMask: [object keyEquivalentModifierMask] & ~NSControlKeyMask];
+	}
+    }
+  else if (sender == shiftMod)
+    {
+      if([shiftMod state] == NSOnState)
+	{
+	  [object setKeyEquivalentModifierMask: [object keyEquivalentModifierMask] | NSShiftKeyMask];
+	}
+      else
+	{
+	  [object setKeyEquivalentModifierMask: [object keyEquivalentModifierMask] & ~NSShiftKeyMask];
+	}
+    }
+  else if (sender == cmdMod)
+    {
+      if([cmdMod state] == NSOnState)
+	{
+	  [object setKeyEquivalentModifierMask: [object keyEquivalentModifierMask] | NSCommandKeyMask];
+	}
+      else
+	{
+	  [object setKeyEquivalentModifierMask: [object keyEquivalentModifierMask] & ~NSCommandKeyMask];
+	}
+    }
 
   [super ok: sender];
 }
@@ -270,6 +314,7 @@ NSString *rtString = nil;
   if(sender != nil)
     {
       NSString *key = VSTR([object keyEquivalent]);
+      unsigned int flags = [object keyEquivalentModifierMask];
       
       [alignMatrix selectCellWithTag: [object alignment]];
       [iconMatrix selectCellWithTag: [object imagePosition]];
@@ -349,6 +394,28 @@ NSString *rtString = nil;
 	  [[titleForm cellAtIndex: 3] setStringValue: @""];
 	}
       
+      // key modifier mask...
+      [altMod setState: NSOffState];
+      [ctrlMod setState: NSOffState];
+      [shiftMod setState: NSOffState];
+      [cmdMod setState: NSOffState];
+      if(flags & NSAlternateKeyMask)
+	{
+	  [altMod setState: NSOnState];
+	}
+      if(flags & NSControlKeyMask)
+	{
+	  [ctrlMod setState: NSOnState];
+	}
+      if(flags & NSShiftKeyMask)
+	{
+	  [shiftMod setState: NSOnState];
+	}
+      if(flags & NSCommandKeyMask)
+	{
+	  [cmdMod setState: NSOnState];
+	}
+
       [typeButton selectItemAtIndex: 
 		    [typeButton indexOfItemWithTag: 
 				  [self buttonTypeForObject: object]]];

Palettes/2Controls/GormNSButtonInspector.gorm/data.classes

@@ -11,7 +11,11 @@
 	    tagForm,
 	    titleForm,
 	    typeButton,
-	    keyEquiv
+	    keyEquiv,
+	    altMod,
+	    ctrlMod,
+	    shiftMod,
+	    cmdMod
 	);
 	Super = IBInspector;
     };