• some further bit field editing preparations

• re-enabled length checking while editing in FieldEditorSheet
• FieldEditorSheet now shows field type declaration
• some preparations for BINARY editing in FieldEditorSheet

1 files changed, 96 insertions, 3 deletions

diff --git a/Source/SPFieldEditorController.h b/Source/SPFieldEditorController.h
index 6ba9018b..e3877a2d 100644
--- a/Source/SPFieldEditorController.h
+++ b/Source/SPFieldEditorController.h
@@ -24,7 +24,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-@interface SPFieldEditorController : NSWindowController 
+@interface SPFieldEditorController : NSWindowController
 {
 	IBOutlet id editSheetProgressBar;
 	IBOutlet id editSheetSegmentControl;
@@ -41,11 +41,94 @@
 	IBOutlet id editSheetOpenButton;
 	IBOutlet id editSheetFieldName;
 
+	IBOutlet id bitSheet;
+	IBOutlet NSTextField *bitSheetFieldName;
+	IBOutlet NSTextField *bitSheetHexTextField;
+	IBOutlet NSTextField *bitSheetIntegerTextField;
+	IBOutlet NSTextField *bitSheetOctalTextField;
+	IBOutlet NSButton *bitSheetOkButton;
+	IBOutlet NSButton *bitSheetCloseButton;
+	IBOutlet NSButton *bitSheetBitButton0;
+	IBOutlet NSButton *bitSheetBitButton1;
+	IBOutlet NSButton *bitSheetBitButton2;
+	IBOutlet NSButton *bitSheetBitButton3;
+	IBOutlet NSButton *bitSheetBitButton4;
+	IBOutlet NSButton *bitSheetBitButton5;
+	IBOutlet NSButton *bitSheetBitButton6;
+	IBOutlet NSButton *bitSheetBitButton7;
+	IBOutlet NSButton *bitSheetBitButton8;
+	IBOutlet NSButton *bitSheetBitButton9;
+	IBOutlet NSButton *bitSheetBitButton10;
+	IBOutlet NSButton *bitSheetBitButton11;
+	IBOutlet NSButton *bitSheetBitButton12;
+	IBOutlet NSButton *bitSheetBitButton13;
+	IBOutlet NSButton *bitSheetBitButton14;
+	IBOutlet NSButton *bitSheetBitButton15;
+	IBOutlet NSButton *bitSheetBitButton16;
+	IBOutlet NSButton *bitSheetBitButton17;
+	IBOutlet NSButton *bitSheetBitButton18;
+	IBOutlet NSButton *bitSheetBitButton19;
+	IBOutlet NSButton *bitSheetBitButton20;
+	IBOutlet NSButton *bitSheetBitButton21;
+	IBOutlet NSButton *bitSheetBitButton22;
+	IBOutlet NSButton *bitSheetBitButton23;
+	IBOutlet NSButton *bitSheetBitButton24;
+	IBOutlet NSButton *bitSheetBitButton25;
+	IBOutlet NSButton *bitSheetBitButton26;
+	IBOutlet NSButton *bitSheetBitButton27;
+	IBOutlet NSButton *bitSheetBitButton28;
+	IBOutlet NSButton *bitSheetBitButton29;
+	IBOutlet NSButton *bitSheetBitButton30;
+	IBOutlet NSButton *bitSheetBitButton31;
+	IBOutlet NSButton *bitSheetBitButton32;
+	IBOutlet NSButton *bitSheetBitButton33;
+	IBOutlet NSButton *bitSheetBitButton34;
+	IBOutlet NSButton *bitSheetBitButton35;
+	IBOutlet NSButton *bitSheetBitButton36;
+	IBOutlet NSButton *bitSheetBitButton37;
+	IBOutlet NSButton *bitSheetBitButton38;
+	IBOutlet NSButton *bitSheetBitButton39;
+	IBOutlet NSButton *bitSheetBitButton40;
+	IBOutlet NSButton *bitSheetBitButton41;
+	IBOutlet NSButton *bitSheetBitButton42;
+	IBOutlet NSButton *bitSheetBitButton43;
+	IBOutlet NSButton *bitSheetBitButton44;
+	IBOutlet NSButton *bitSheetBitButton45;
+	IBOutlet NSButton *bitSheetBitButton46;
+	IBOutlet NSButton *bitSheetBitButton47;
+	IBOutlet NSButton *bitSheetBitButton48;
+	IBOutlet NSButton *bitSheetBitButton49;
+	IBOutlet NSButton *bitSheetBitButton50;
+	IBOutlet NSButton *bitSheetBitButton51;
+	IBOutlet NSButton *bitSheetBitButton52;
+	IBOutlet NSButton *bitSheetBitButton53;
+	IBOutlet NSButton *bitSheetBitButton54;
+	IBOutlet NSButton *bitSheetBitButton55;
+	IBOutlet NSButton *bitSheetBitButton56;
+	IBOutlet NSButton *bitSheetBitButton57;
+	IBOutlet NSButton *bitSheetBitButton58;
+	IBOutlet NSButton *bitSheetBitButton59;
+	IBOutlet NSButton *bitSheetBitButton60;
+	IBOutlet NSButton *bitSheetBitButton61;
+	IBOutlet NSButton *bitSheetBitButton62;
+	IBOutlet NSButton *bitSheetBitButton63;
+	IBOutlet NSTextField *bitSheetBitLabel0;
+	IBOutlet NSTextField *bitSheetBitLabel8;
+	IBOutlet NSTextField *bitSheetBitLabel16;
+	IBOutlet NSTextField *bitSheetBitLabel24;
+	IBOutlet NSTextField *bitSheetBitLabel32;
+	IBOutlet NSTextField *bitSheetBitLabel40;
+	IBOutlet NSTextField *bitSheetBitLabel48;
+	IBOutlet NSTextField *bitSheetBitLabel56;
+
 	id sheetEditData;
 	BOOL editSheetWillBeInitialized;
-	BOOL isBlob;
+	BOOL _isBlob;
+	BOOL _isEditable;
 	NSInteger quickLookCloseMarker;
 	NSStringEncoding encoding;
+	NSString *fieldType;
+	NSString *fieldEncoding;
 	NSString *stringValue;
 	NSString *tmpFileName;
 	NSString *tmpDirPath;
@@ -57,6 +140,8 @@
 	BOOL wasCutPaste;
 	BOOL selectionChanged;
 
+	NSArray *bitSheetBitButtonsArray;
+
 	NSUserDefaults *prefs;
 
 	NSDictionary *qlTypes;
@@ -74,10 +159,18 @@
 - (IBAction)quickLookFormatButton:(id)sender;
 - (IBAction)dropImage:(id)sender;
 
-- (id)editWithObject:(id)data fieldName:(NSString*)fieldName usingEncoding:(NSStringEncoding)anEncoding 
+- (IBAction)closeBitSheet:(id)sender;
+- (IBAction)bitSheetSelectBit0:(id)sender;
+- (IBAction)bitSheetBitButtonWasClicked:(id)sender;
+- (IBAction)bitSheetOperatorButtonWasClicked:(id)sender;
+
+
+- (id)editWithObject:(id)data fieldName:(NSString*)fieldName usingEncoding:(NSStringEncoding)anEncoding
 	isObjectBlob:(BOOL)isFieldBlob isEditable:(BOOL)isEditable withWindow:(NSWindow *)theWindow;
 
 - (void)setTextMaxLength:(unsigned long long)length;
+- (void)setFieldType:(NSString*)aType;
+- (void)setFieldEncoding:(NSString*)aEncoding;
 
 - (void)processPasteImageData;
 - (void)processUpdatedImageData:(NSData *)data;