add quantity form; general overhaul (savepoint)

This commit is contained in:
Lance Edgar 2012-12-04 11:18:18 -08:00
parent 304504bdfa
commit e43dca60f2
4 changed files with 1258 additions and 784 deletions

View file

@ -111,7 +111,7 @@
<ID> 1000 </ID>
<BOUNDS>
<LEFT> 1 </LEFT>
<TOP> 148 </TOP>
<TOP> 17 </TOP>
<WIDTH> 75 </WIDTH>
<HEIGHT> 12 </HEIGHT>
</BOUNDS>
@ -128,32 +128,11 @@
<FONT_ID> STD_FONT </FONT_ID>
<MAX_VISIBLE_LINES> 0 </MAX_VISIBLE_LINES>
</FORM_FIELD>
<FORM_FIELD COMMENT="Units">
<ID> 1001 </ID>
<BOUNDS>
<LEFT> 140 </LEFT>
<TOP> 148 </TOP>
<WIDTH> 18 </WIDTH>
<HEIGHT> 12 </HEIGHT>
</BOUNDS>
<USABLE> TRUE </USABLE>
<EDITABLE> TRUE </EDITABLE>
<SINGLE_LINE> TRUE </SINGLE_LINE>
<DYNAMIC_SIZE> FALSE </DYNAMIC_SIZE>
<UNDERLINE> SOLID_UNDERLINE </UNDERLINE>
<JUSTIFICATION> RIGHT_ALIGN </JUSTIFICATION>
<AUTO_SHIFT> FALSE </AUTO_SHIFT>
<HAS_SCROLLBAR> FALSE </HAS_SCROLLBAR>
<NUMERIC> TRUE </NUMERIC>
<MAX_CHARS> 3 </MAX_CHARS>
<FONT_ID> STD_FONT </FONT_ID>
<MAX_VISIBLE_LINES> 0 </MAX_VISIBLE_LINES>
</FORM_FIELD>
<FORM_CHECKBOX COMMENT="StopOnUnits">
<ID> 1002 </ID>
<BOUNDS>
<LEFT> 123 </LEFT>
<TOP> 148 </TOP>
<TOP> 17 </TOP>
<WIDTH> 19 </WIDTH>
<HEIGHT> 12 </HEIGHT>
</BOUNDS>
@ -164,32 +143,11 @@
<GROUP_ID> 0 </GROUP_ID>
<SELECTED> FALSE </SELECTED>
</FORM_CHECKBOX>
<FORM_FIELD COMMENT="Cases">
<ID> 1003 </ID>
<BOUNDS>
<LEFT> 99 </LEFT>
<TOP> 148 </TOP>
<WIDTH> 18 </WIDTH>
<HEIGHT> 12 </HEIGHT>
</BOUNDS>
<USABLE> TRUE </USABLE>
<EDITABLE> TRUE </EDITABLE>
<SINGLE_LINE> TRUE </SINGLE_LINE>
<DYNAMIC_SIZE> FALSE </DYNAMIC_SIZE>
<UNDERLINE> SOLID_UNDERLINE </UNDERLINE>
<JUSTIFICATION> RIGHT_ALIGN </JUSTIFICATION>
<AUTO_SHIFT> FALSE </AUTO_SHIFT>
<HAS_SCROLLBAR> FALSE </HAS_SCROLLBAR>
<NUMERIC> TRUE </NUMERIC>
<MAX_CHARS> 3 </MAX_CHARS>
<FONT_ID> STD_FONT </FONT_ID>
<MAX_VISIBLE_LINES> 0 </MAX_VISIBLE_LINES>
</FORM_FIELD>
<FORM_CHECKBOX COMMENT="StopOnUnits">
<ID> 1004 </ID>
<BOUNDS>
<LEFT> 82 </LEFT>
<TOP> 148 </TOP>
<TOP> 17 </TOP>
<WIDTH> 19 </WIDTH>
<HEIGHT> 12 </HEIGHT>
</BOUNDS>
@ -204,7 +162,7 @@
<ID> 1005 </ID>
<BOUNDS>
<LEFT> 0 </LEFT>
<TOP> 16 </TOP>
<TOP> 34 </TOP>
<WIDTH> 153 </WIDTH>
<HEIGHT> 120 </HEIGHT>
</BOUNDS>
@ -233,7 +191,7 @@
<ID> 1006 </ID>
<BOUNDS>
<LEFT> 153 </LEFT>
<TOP> 16 </TOP>
<TOP> 34 </TOP>
<WIDTH> 7 </WIDTH>
<HEIGHT> 120 </HEIGHT>
</BOUNDS>
@ -243,6 +201,34 @@
<MAX_VALUE> 0 </MAX_VALUE>
<PAGE_SIZE> 11 </PAGE_SIZE>
</FORM_SCROLLBAR>
<FORM_SELECTOR_TRIGGER COMMENT="Cases">
<ID> 1003 </ID>
<BOUNDS>
<LEFT> 99 </LEFT>
<TOP> 17 </TOP>
<WIDTH> 19 </WIDTH>
<HEIGHT> 12 </HEIGHT>
</BOUNDS>
<USABLE> TRUE </USABLE>
<ENABLED> TRUE </ENABLED>
<LEFT_ANCHOR> FALSE </LEFT_ANCHOR>
<TEXT> "999" </TEXT>
<FONT_ID> STD_FONT </FONT_ID>
</FORM_SELECTOR_TRIGGER>
<FORM_SELECTOR_TRIGGER>
<ID> 1001 </ID>
<BOUNDS>
<LEFT> 139 </LEFT>
<TOP> 17 </TOP>
<WIDTH> 19 </WIDTH>
<HEIGHT> 12 </HEIGHT>
</BOUNDS>
<USABLE> TRUE </USABLE>
<ENABLED> TRUE </ENABLED>
<LEFT_ANCHOR> FALSE </LEFT_ANCHOR>
<TEXT> "999" </TEXT>
<FONT_ID> STD_FONT </FONT_ID>
</FORM_SELECTOR_TRIGGER>
</FORM_OBJECTS>
</FORM_RESOURCE>
@ -289,12 +275,12 @@
<FORM_LABEL COMMENT="Text2">
<ID> 1104 </ID>
<LOCATION>
<X> 50 </X>
<X> 46 </X>
<Y> 53 </Y>
</LOCATION>
<USABLE> TRUE </USABLE>
<FONT_ID> BOLD_FONT </FONT_ID>
<TEXT> "Version 1.0" </TEXT>
<TEXT> "Version 1.0.0" </TEXT>
</FORM_LABEL>
<FORM_BUTTON COMMENT="OK">
<ID> 1105 </ID>
@ -324,6 +310,255 @@
</FORM_OBJECTS>
</FORM_RESOURCE>
<FORM_RESOURCE RESOURCE_ID="1200" LOCALE="enUS" COMMENT="Quantity">
<FORM_ID> 1200 </FORM_ID>
<BOUNDS>
<LEFT> 2 </LEFT>
<TOP> 33 </TOP>
<WIDTH> 156 </WIDTH>
<HEIGHT> 125 </HEIGHT>
</BOUNDS>
<USABLE> TRUE </USABLE>
<MODAL> TRUE </MODAL>
<SAVE_BEHIND> TRUE </SAVE_BEHIND>
<HELP_ID> 1000 </HELP_ID>
<MENU_ID> 0 </MENU_ID>
<DEFAULT_BUTTON> 1011 </DEFAULT_BUTTON>
<TITLE_ICON> FALSE </TITLE_ICON>
<TITLE_BAR_FOCUSABLE> FALSE </TITLE_BAR_FOCUSABLE>
<FORM_OBJECTS>
<FORM_TITLE>
<TEXT> "Edit Quantity" </TEXT>
</FORM_TITLE>
<FORM_BUTTON>
<ID> 1000 </ID>
<BOUNDS>
<LEFT> 4 </LEFT>
<TOP> 16 </TOP>
<WIDTH> 45 </WIDTH>
<HEIGHT> 18 </HEIGHT>
</BOUNDS>
<USABLE> TRUE </USABLE>
<ENABLED> TRUE </ENABLED>
<TEXT> "1" </TEXT>
<LEFT_ANCHOR> FALSE </LEFT_ANCHOR>
<FONT_ID> LARGE_BOLD_FONT </FONT_ID>
<BUTTON_FRAME> STANDARD_BUTTON_FRAME </BUTTON_FRAME>
</FORM_BUTTON>
<FORM_BUTTON>
<ID> 1001 </ID>
<BOUNDS>
<LEFT> 55 </LEFT>
<TOP> 16 </TOP>
<WIDTH> 45 </WIDTH>
<HEIGHT> 18 </HEIGHT>
</BOUNDS>
<USABLE> TRUE </USABLE>
<ENABLED> TRUE </ENABLED>
<TEXT> "2" </TEXT>
<LEFT_ANCHOR> FALSE </LEFT_ANCHOR>
<FONT_ID> LARGE_BOLD_FONT </FONT_ID>
<BUTTON_FRAME> STANDARD_BUTTON_FRAME </BUTTON_FRAME>
</FORM_BUTTON>
<FORM_BUTTON>
<ID> 1002 </ID>
<BOUNDS>
<LEFT> 106 </LEFT>
<TOP> 16 </TOP>
<WIDTH> 45 </WIDTH>
<HEIGHT> 18 </HEIGHT>
</BOUNDS>
<USABLE> TRUE </USABLE>
<ENABLED> TRUE </ENABLED>
<TEXT> "3" </TEXT>
<LEFT_ANCHOR> FALSE </LEFT_ANCHOR>
<FONT_ID> LARGE_BOLD_FONT </FONT_ID>
<BUTTON_FRAME> STANDARD_BUTTON_FRAME </BUTTON_FRAME>
</FORM_BUTTON>
<FORM_BUTTON>
<ID> 1003 </ID>
<BOUNDS>
<LEFT> 4 </LEFT>
<TOP> 39 </TOP>
<WIDTH> 45 </WIDTH>
<HEIGHT> 18 </HEIGHT>
</BOUNDS>
<USABLE> TRUE </USABLE>
<ENABLED> TRUE </ENABLED>
<TEXT> "4" </TEXT>
<LEFT_ANCHOR> FALSE </LEFT_ANCHOR>
<FONT_ID> LARGE_BOLD_FONT </FONT_ID>
<BUTTON_FRAME> STANDARD_BUTTON_FRAME </BUTTON_FRAME>
</FORM_BUTTON>
<FORM_BUTTON>
<ID> 1004 </ID>
<BOUNDS>
<LEFT> 55 </LEFT>
<TOP> 39 </TOP>
<WIDTH> 45 </WIDTH>
<HEIGHT> 18 </HEIGHT>
</BOUNDS>
<USABLE> TRUE </USABLE>
<ENABLED> TRUE </ENABLED>
<TEXT> "5" </TEXT>
<LEFT_ANCHOR> FALSE </LEFT_ANCHOR>
<FONT_ID> LARGE_BOLD_FONT </FONT_ID>
<BUTTON_FRAME> STANDARD_BUTTON_FRAME </BUTTON_FRAME>
</FORM_BUTTON>
<FORM_BUTTON>
<ID> 1005 </ID>
<BOUNDS>
<LEFT> 106 </LEFT>
<TOP> 39 </TOP>
<WIDTH> 45 </WIDTH>
<HEIGHT> 18 </HEIGHT>
</BOUNDS>
<USABLE> TRUE </USABLE>
<ENABLED> TRUE </ENABLED>
<TEXT> "6" </TEXT>
<LEFT_ANCHOR> FALSE </LEFT_ANCHOR>
<FONT_ID> LARGE_BOLD_FONT </FONT_ID>
<BUTTON_FRAME> STANDARD_BUTTON_FRAME </BUTTON_FRAME>
</FORM_BUTTON>
<FORM_BUTTON>
<ID> 1006 </ID>
<BOUNDS>
<LEFT> 4 </LEFT>
<TOP> 62 </TOP>
<WIDTH> 45 </WIDTH>
<HEIGHT> 18 </HEIGHT>
</BOUNDS>
<USABLE> TRUE </USABLE>
<ENABLED> TRUE </ENABLED>
<TEXT> "7" </TEXT>
<LEFT_ANCHOR> FALSE </LEFT_ANCHOR>
<FONT_ID> LARGE_BOLD_FONT </FONT_ID>
<BUTTON_FRAME> STANDARD_BUTTON_FRAME </BUTTON_FRAME>
</FORM_BUTTON>
<FORM_BUTTON>
<ID> 1007 </ID>
<BOUNDS>
<LEFT> 55 </LEFT>
<TOP> 62 </TOP>
<WIDTH> 45 </WIDTH>
<HEIGHT> 18 </HEIGHT>
</BOUNDS>
<USABLE> TRUE </USABLE>
<ENABLED> TRUE </ENABLED>
<TEXT> "8" </TEXT>
<LEFT_ANCHOR> FALSE </LEFT_ANCHOR>
<FONT_ID> LARGE_BOLD_FONT </FONT_ID>
<BUTTON_FRAME> STANDARD_BUTTON_FRAME </BUTTON_FRAME>
</FORM_BUTTON>
<FORM_BUTTON>
<ID> 1008 </ID>
<BOUNDS>
<LEFT> 106 </LEFT>
<TOP> 62 </TOP>
<WIDTH> 45 </WIDTH>
<HEIGHT> 18 </HEIGHT>
</BOUNDS>
<USABLE> TRUE </USABLE>
<ENABLED> TRUE </ENABLED>
<TEXT> "9" </TEXT>
<LEFT_ANCHOR> FALSE </LEFT_ANCHOR>
<FONT_ID> LARGE_BOLD_FONT </FONT_ID>
<BUTTON_FRAME> STANDARD_BUTTON_FRAME </BUTTON_FRAME>
</FORM_BUTTON>
<FORM_BUTTON>
<ID> 1009 </ID>
<BOUNDS>
<LEFT> 4 </LEFT>
<TOP> 85 </TOP>
<WIDTH> 45 </WIDTH>
<HEIGHT> 18 </HEIGHT>
</BOUNDS>
<USABLE> TRUE </USABLE>
<ENABLED> TRUE </ENABLED>
<TEXT> "0" </TEXT>
<LEFT_ANCHOR> FALSE </LEFT_ANCHOR>
<FONT_ID> LARGE_BOLD_FONT </FONT_ID>
<BUTTON_FRAME> STANDARD_BUTTON_FRAME </BUTTON_FRAME>
</FORM_BUTTON>
<FORM_BUTTON>
<ID> 1010 </ID>
<BOUNDS>
<LEFT> 55 </LEFT>
<TOP> 85 </TOP>
<WIDTH> 96 </WIDTH>
<HEIGHT> 18 </HEIGHT>
</BOUNDS>
<USABLE> TRUE </USABLE>
<ENABLED> TRUE </ENABLED>
<TEXT> "OK" </TEXT>
<LEFT_ANCHOR> FALSE </LEFT_ANCHOR>
<FONT_ID> LARGE_BOLD_FONT </FONT_ID>
<BUTTON_FRAME> STANDARD_BUTTON_FRAME </BUTTON_FRAME>
</FORM_BUTTON>
<FORM_BUTTON>
<ID> 1011 </ID>
<BOUNDS>
<LEFT> 115 </LEFT>
<TOP> 108 </TOP>
<WIDTH> 36 </WIDTH>
<HEIGHT> 12 </HEIGHT>
</BOUNDS>
<USABLE> TRUE </USABLE>
<ENABLED> TRUE </ENABLED>
<TEXT> "Cancel" </TEXT>
<LEFT_ANCHOR> FALSE </LEFT_ANCHOR>
<FONT_ID> STD_FONT </FONT_ID>
<BUTTON_FRAME> STANDARD_BUTTON_FRAME </BUTTON_FRAME>
</FORM_BUTTON>
<FORM_BUTTON>
<ID> 1012 </ID>
<BOUNDS>
<LEFT> 73 </LEFT>
<TOP> 108 </TOP>
<WIDTH> 36 </WIDTH>
<HEIGHT> 12 </HEIGHT>
</BOUNDS>
<USABLE> TRUE </USABLE>
<ENABLED> TRUE </ENABLED>
<TEXT> "Clear" </TEXT>
<LEFT_ANCHOR> FALSE </LEFT_ANCHOR>
<FONT_ID> STD_FONT </FONT_ID>
<BUTTON_FRAME> STANDARD_BUTTON_FRAME </BUTTON_FRAME>
</FORM_BUTTON>
<FORM_LABEL>
<ID> 1014 </ID>
<LOCATION>
<X> 4 </X>
<Y> 109 </Y>
</LOCATION>
<USABLE> TRUE </USABLE>
<FONT_ID> STD_FONT </FONT_ID>
<TEXT> "Qty:" </TEXT>
</FORM_LABEL>
<FORM_FIELD COMMENT="Quantity">
<ID> 1013 </ID>
<BOUNDS>
<LEFT> 27 </LEFT>
<TOP> 107 </TOP>
<WIDTH> 30 </WIDTH>
<HEIGHT> 15 </HEIGHT>
</BOUNDS>
<USABLE> TRUE </USABLE>
<EDITABLE> FALSE </EDITABLE>
<SINGLE_LINE> FALSE </SINGLE_LINE>
<DYNAMIC_SIZE> FALSE </DYNAMIC_SIZE>
<UNDERLINE> NO_UNDERLINE </UNDERLINE>
<JUSTIFICATION> RIGHT_ALIGN </JUSTIFICATION>
<AUTO_SHIFT> FALSE </AUTO_SHIFT>
<HAS_SCROLLBAR> FALSE </HAS_SCROLLBAR>
<NUMERIC> FALSE </NUMERIC>
<MAX_CHARS> 80 </MAX_CHARS>
<FONT_ID> LARGE_BOLD_FONT </FONT_ID>
<MAX_VISIBLE_LINES> 0 </MAX_VISIBLE_LINES>
</FORM_FIELD>
</FORM_OBJECTS>
</FORM_RESOURCE>
<MENU_BAR_RESOURCE RESOURCE_ID="1000" LOCALE="enUS" COMMENT="Main Form">
<VISIBLE> TRUE </VISIBLE>
<MENUS>
@ -354,4 +589,10 @@
</MENUS>
</MENU_BAR_RESOURCE>
<STRING_RESOURCE RESOURCE_ID="1000">
<TEXT>
"Edit the quantity by pressing the number buttons, then press OK to accept.\n\n(Note that the quantity may not exceed 3 digits.)\n\nPressing Clear will erase the current quantity and allow you to re-enter it.\n\nIf you press Cancel, focus will be returned to the scan field."
</TEXT>
</STRING_RESOURCE>
</PALMOS_RESOURCE_FILE>

File diff suppressed because it is too large Load diff

View file

@ -11,15 +11,22 @@ typedef struct {
static void CloseBCS2Scanner();
static DmOpenRef CreateScanDatabase();
static void DrawCustomTableItem(void* table, Int16 row, Int16 col, RectangleType* bounds);
static UInt16 GetActiveFieldId(FormPtr form);
static Int16 GetCheckedValue(UInt16 objId);
static void *GetObjectPtrById(FormPtr form, UInt16 objId);
/* static Int16 GetCheckedValue(UInt16 objId); */
static Boolean IsChecked(FormPtr form, UInt16 controlID);
static void *GetObjectPtr(UInt16 objId);
static Boolean MainFormHandleEvent(EventPtr event);
static void MainFormInit(FormPtr form);
static void MainFormLoadTable(TablePtr table, Boolean updateScroll);
//static Boolean OpenBabboScanner();
static Boolean OpenBCS2Scanner();
static DmOpenRef OpenScanDatabase();
static void ProcessScan();
static void SetFieldFocus(UInt16 objId);
static void ShowQuantityForm(UInt16 triggerID, Boolean manual);
static Boolean StoreScanData();
// Quantity Form
static Boolean QuantityFormHandleEvent(EventPtr event);
static void QuantityFormInit(FormPtr form);
static void AppendQuantityDigit(UInt16 digit);
static void UpdateQuantityDisplay();
static void QuantityFormAccept();

View file

@ -24,6 +24,22 @@
#define AboutText1Label 1103 //(Left Origin = 23, Top Origin = 54, Usable = 1, Font = Standard)
#define AboutText2Label 1104 //(Left Origin = 50, Top Origin = 104, Usable = 1, Font = Bold)
#define QuantityForm 1200
#define QuantityForm1 1000
#define QuantityForm2 1001
#define QuantityForm3 1002
#define QuantityForm4 1003
#define QuantityForm5 1004
#define QuantityForm6 1005
#define QuantityForm7 1006
#define QuantityForm8 1007
#define QuantityForm9 1008
#define QuantityForm0 1009
#define QuantityFormOK 1010
#define QuantityFormClear 1012
#define QuantityFormCancel 1011
#define QuantityFormQuantity 1013
// Resource: Talt 1001
#define RomIncompatibleAlert 1001