pfuel-commit Mailing List for PFuel
Status: Alpha
Brought to you by:
papadoc
Menu
▾
▴
pfuel-commit — CVS commit
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(22) |
Aug
(60) |
Sep
(54) |
Oct
(45) |
Nov
(59) |
Dec
(33) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(13) |
Feb
(2) |
Mar
(19) |
Apr
(23) |
May
(6) |
Jun
(17) |
Jul
|
Aug
(3) |
Sep
(2) |
Oct
(1) |
Nov
(60) |
Dec
(22) |
| 2006 |
Jan
(13) |
Feb
(3) |
Mar
(3) |
Apr
|
May
|
Jun
(4) |
Jul
|
Aug
(3) |
Sep
(2) |
Oct
(4) |
Nov
(2) |
Dec
(7) |
| 2007 |
Jan
(15) |
Feb
(10) |
Mar
(4) |
Apr
|
May
|
Jun
(13) |
Jul
(4) |
Aug
(10) |
Sep
(6) |
Oct
|
Nov
|
Dec
(2) |
| 2008 |
Jan
|
Feb
(8) |
Mar
(2) |
Apr
(1) |
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <pa...@us...> - 2008-05-28 12:15:41
|
Revision: 513
http://pfuel.svn.sourceforge.net/pfuel/?rev=513&view=rev
Author: papaDoc
Date: 2008-05-28 05:15:49 -0700 (Wed, 28 May 2008)
Log Message:
-----------
20080528-RR-01
- Development:
- Update the version number to create the new zip.
- Remove the debug flag.
Modified Paths:
--------------
branches/pFuel-0-04-stable/pFuel/CHANGELOG
branches/pFuel-0-04-stable/pFuel/Src/Makefile
branches/pFuel-0-04-stable/pFuel/Src/pFuel.ver
Modified: branches/pFuel-0-04-stable/pFuel/CHANGELOG
===================================================================
--- branches/pFuel-0-04-stable/pFuel/CHANGELOG 2008-04-08 13:09:58 UTC (rev 512)
+++ branches/pFuel-0-04-stable/pFuel/CHANGELOG 2008-05-28 12:15:49 UTC (rev 513)
@@ -14,6 +14,11 @@
Version 0.04.06
+20080528-RR-01
+ - Development:
+ - Update the version number to create the new zip.
+ - Remove the debug flag.
+
20080308-RR-01
- Bugs:
- Bug In One_Hand_Mode selecting a row in the main form and then tapping
Modified: branches/pFuel-0-04-stable/pFuel/Src/Makefile
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/Makefile 2008-04-08 13:09:58 UTC (rev 512)
+++ branches/pFuel-0-04-stable/pFuel/Src/Makefile 2008-05-28 12:15:49 UTC (rev 513)
@@ -116,7 +116,7 @@
# uncomment this if you want to build a gdb debuggable version
# -On: n=Optimization-level (0=none), -g: needed for debugging
-CFLAGS = -O2 -Wall -MD -g
+CFLAGS = -O2 -Wall -MD
OBJRES = m68k-palmos-obj-res
Modified: branches/pFuel-0-04-stable/pFuel/Src/pFuel.ver
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/pFuel.ver 2008-04-08 13:09:58 UTC (rev 512)
+++ branches/pFuel-0-04-stable/pFuel/Src/pFuel.ver 2008-05-28 12:15:49 UTC (rev 513)
@@ -1 +1 @@
-0.04.06a
+0.04.06
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pa...@us...> - 2008-04-08 13:11:09
|
Revision: 512
http://pfuel.svn.sourceforge.net/pfuel/?rev=512&view=rev
Author: papaDoc
Date: 2008-04-08 06:09:58 -0700 (Tue, 08 Apr 2008)
Log Message:
-----------
20080308-RR-01
- Bugs:
- Bug In One_Hand_Mode selecting a row in the main form and then tapping
the add button will create a crash if in the Add form a "move up" action
is done.
- GraphDrawGraph must Set the Date
- Development:
- The Navigate action now check if the objID is valid before assuming a
NAV_TABLE_FOCUS
- Comment out TRACE output
- Move out TRACE(... XXXEvent) from XXXHandleEvent to UnitTest function
- GraphDrawGraph must Set the Date
Modified Paths:
--------------
branches/pFuel-0-04-stable/pFuel/CHANGELOG
branches/pFuel-0-04-stable/pFuel/README
branches/pFuel-0-04-stable/pFuel/Src/export.c
branches/pFuel-0-04-stable/pFuel/Src/fuelStats.c
branches/pFuel-0-04-stable/pFuel/Src/graph.c
branches/pFuel-0-04-stable/pFuel/Src/maintenance.c
branches/pFuel-0-04-stable/pFuel/Src/navigation.c
branches/pFuel-0-04-stable/pFuel/Src/navigation.h
branches/pFuel-0-04-stable/pFuel/Src/pFuel.c
branches/pFuel-0-04-stable/pFuel/Src/pfRecord.c
branches/pFuel-0-04-stable/pFuel/Src/utility.c
Modified: branches/pFuel-0-04-stable/pFuel/CHANGELOG
===================================================================
--- branches/pFuel-0-04-stable/pFuel/CHANGELOG 2008-03-04 13:49:14 UTC (rev 511)
+++ branches/pFuel-0-04-stable/pFuel/CHANGELOG 2008-04-08 13:09:58 UTC (rev 512)
@@ -13,6 +13,25 @@
#------------------------------------------------------------
Version 0.04.06
+
+20080308-RR-01
+ - Bugs:
+ - Bug In One_Hand_Mode selecting a row in the main form and then tapping
+ the add button will create a crash if in the Add form a "move up" action
+ is done.
+ - GraphDrawGraph must Set the Date
+ - Development:
+ - The Navigate action now check if the objID is valid before assuming a
+ NAV_TABLE_FOCUS
+ - Comment out TRACE output
+ - Move out TRACE(... XXXEvent) from XXXHandleEvent to UnitTest function
+ - GraphDrawGraph must Set the Date
+
+20080304-RR-01
+ - Development:
+ - repeatingButtonCtl should send repeating event and not a CtlHotControl.
+
+
20080302-RR-01
- Bugs:
- The scroll up and down button on the Stat Form were not higlighted in the OHM
@@ -24,6 +43,7 @@
- In the rcp.in file, the macro PREVTOP is used to position the ScrollDownButton.
- The position off the ScrollUpButton is adjusted.
+
20080229-RR-01
- Bugs:
- Bug #1902151: reported by Markus by email.
@@ -41,6 +61,7 @@
- The scroller are hided instead of greyed since even if they are grey they
were fucosable and this was causing problem. See above.
+
20080227-RR-01
- Bugs:
- Bug #1902151: reported by Markus by email.
@@ -53,6 +74,7 @@
fields remain hidden.
+ Fixed
+
20080226-RR-01
- Bugs:
- Bug #1902151: reported by Markus by email.
@@ -70,6 +92,7 @@
(scrolling down with the "down" hardware button is working fine).
+ Fixed
+
20080222-RR-01
- Development:
- Code clean up.
Modified: branches/pFuel-0-04-stable/pFuel/README
===================================================================
--- branches/pFuel-0-04-stable/pFuel/README 2008-03-04 13:49:14 UTC (rev 511)
+++ branches/pFuel-0-04-stable/pFuel/README 2008-04-08 13:09:58 UTC (rev 512)
@@ -98,6 +98,8 @@
2) Enter data and enjoy!
3) We would really like to hear feedback. You can
report bugs on the Sourceforge site.
+4) If you really like the program you can send me some money
+ by paypal. If you don't have money you can send me a postal card.
Converting FuelLog Data
@@ -130,6 +132,7 @@
will be automatically calculated. (Volume, Cost, Price/Volume)
* Maintenance alert can be added to remind you of you next (Oil
change, tire rotation, etc)
+ * Work in a one hand mode
* Completely 100% Free (licensed under the GPL 2.0). If you like it
you can send some money to me from 0.01$ to ???
This can be done by paypal. See the link on the sourceforge site.
Modified: branches/pFuel-0-04-stable/pFuel/Src/export.c
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/export.c 2008-03-04 13:49:14 UTC (rev 511)
+++ branches/pFuel-0-04-stable/pFuel/Src/export.c 2008-04-08 13:09:58 UTC (rev 512)
@@ -135,7 +135,7 @@
cursor->date.day,
cursor->date.year + 1904,
shortDateFormat, (Char *)lstr);
- TRACE("Exporting date=%s", lstr);
+// TRACE("Exporting date=%s", lstr);
StrCat(lstr, delimiter);
// The string representation of a number may contain spaces, comma, or apostrophe.
@@ -300,10 +300,10 @@
handleMemo = DmQueryNextInCategory(MemoDB, &recordNum, dmAllCategories);
strMemo = MemHandleLock(handleMemo);
- TRACE("Import: Reading memo %s", strMemo);
+// TRACE("Import: Reading memo %s", strMemo);
if (StrNCompare(strMemo, text, strLen) == 0)
{
- TRACE("Importing this memeo %s", strMemo);
+// TRACE("Importing this memeo %s", strMemo);
useThisIndex = recordNum;
MemHandleUnlock(handleMemo);
continue;
@@ -343,7 +343,7 @@
start = findNextToken(&strMemo, ' ') + 1; // Do we need this
end = findNextToken(&strMemo, '\n'); // Do we need this
recordNum = StrAToI(start);
- TRACE("Import: number of records %d (from %s)", recordNum, start);
+// TRACE("Import: number of records %d (from %s)", recordNum, start);
// goto next line by incrementing pass the newline.
strMemo++;
}
@@ -370,7 +370,7 @@
{
// We assume we can't do the import
error = 3;
- TRACE("Import: reading fuel record %d", i);
+// TRACE("Import: reading fuel record %d", i);
MemSet(tmpRec, sizeof(PFRecord), 0);
@@ -397,7 +397,7 @@
// We change the \n by a the delimiter to be able to use findNextFloat
strRec[strLen] = chrNull;
- TRACE("Record to import: %s", strRec);
+// TRACE("Record to import: %s", strRec);
// get the date
end = start = strRec;
@@ -405,7 +405,7 @@
{
*end = '\0';
AsciiToDate(&(tmpRec->date), shortDateFormat, start);
- TRACE("Import: memo date=%s date=%s)", start, str);
+// TRACE("Import: memo date=%s date=%s)", start, str);
}
else
{
@@ -419,8 +419,8 @@
{
tmpRec->fuel = convertVolume(cvt_atof(start),
cCarPref->fuelUnit, LITRES);
- TRACE("Import: volume string=%s, float=%s", start,
- FormatFloat(str, tmpRec->fuel, 4));
+// TRACE("Import: volume string=%s, float=%s", start,
+// FormatFloat(str, tmpRec->fuel, 4));
}
else
{
@@ -435,8 +435,8 @@
tmpRec->odometer = convertDistance(cvt_atof(start),
cCarPref->odoUnit, KM);
- TRACE("Import: Odometer value string%s, float=%s", start,
- FormatFloat(str, tmpRec->odometer, 4));
+// TRACE("Import: Odometer value string%s, float=%s", start,
+// FormatFloat(str, tmpRec->odometer, 4));
}
else
{
@@ -449,8 +449,8 @@
if ( findNextFloat(&start, &end) != NULL )
{
tmpRec->price = cvt_atof(start);
- TRACE("Import: price string%s, float=%s", start,
- FormatFloat(str, tmpRec->price, 4));
+// TRACE("Import: price string%s, float=%s", start,
+// FormatFloat(str, tmpRec->price, 4));
}
else
{
@@ -471,7 +471,7 @@
tmpRec->flags = StrAToI(start);
// We don't need to do a |= since this is the first flag
- TRACE("Import: was the tank full: %d",tmpRec->flags & FULL_TANK_RECFLAG);
+// TRACE("Import: was the tank full: %d",tmpRec->flags & FULL_TANK_RECFLAG);
}
else
{
@@ -535,7 +535,7 @@
{
while ( (**ptr != token) && (**ptr != '\n') && (**ptr != '\0') )
{
- TRACE("findNextToken char=|%c|", **ptr);
+// TRACE("findNextToken char=|%c|", **ptr);
(*ptr)++;
}
Modified: branches/pFuel-0-04-stable/pFuel/Src/fuelStats.c
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/fuelStats.c 2008-03-04 13:49:14 UTC (rev 511)
+++ branches/pFuel-0-04-stable/pFuel/Src/fuelStats.c 2008-04-08 13:09:58 UTC (rev 512)
@@ -1065,7 +1065,6 @@
break;
case ctlRepeatEvent: // an onscreen scroll button is pressed
- TRACE("SFHE: keyDownEvent");
switch ( eventP->data.ctlRepeat.controlID )
{
case ScrollUpButton :
@@ -1078,15 +1077,11 @@
break;
// We pass trough
case keyDownEvent: // Handle the physical scroll buttons
- TRACE("SFHE: keyDownEvent");
-
handled = StatFormHandleField(eventP);
// Repeating controls don't repeat if handled is set true.
break;
case frmOpenEvent:
- TRACE("SFHE: form->id=%hu", FrmGetActiveFormID());
-
setCarCategoryLabel(pFuelDB, StatCarPopTrigger, StatCarList,
CurrentCategory);
@@ -1118,7 +1113,6 @@
case frmCloseEvent:
NotesRO = false;
-// TRACE("StatFormHandleEvent: form->id=%hu", FrmGetActiveFormID());
if (CurrentNoteHandle)
{
Modified: branches/pFuel-0-04-stable/pFuel/Src/graph.c
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/graph.c 2008-03-04 13:49:14 UTC (rev 511)
+++ branches/pFuel-0-04-stable/pFuel/Src/graph.c 2008-04-08 13:09:58 UTC (rev 512)
@@ -149,7 +149,6 @@
RectangleType myRect;
const CustomPatternType pattern = { 0xf0, 0xf0, 0x0f, 0x0f, 0xf0, 0xf0, 0x0f, 0x0f };
- TRACE("Ici 2.1");
switch (graphType)
@@ -162,12 +161,6 @@
break;
}
- // This is used to avoid a problem with a debug rom
- // Error: read from memory location 0x80000020
- //FrmDrawForm(frm);
-
-
- TRACE("Ici 2.2");
strLst = MemHandleLock(DmGetResource('tSTL', STR_GRAPHS_TYPE));
title = (Char *)FrmGetTitle(frm);
FrmSetTitle(frm, getString(strLst, graphType - GraphFormMenu, title));
@@ -183,8 +176,8 @@
FrmGetObjectBounds(frm, FrmGetObjectIndex(frm, FromSelTrigger), &myRect);
r.extent.y = myRect.topLeft.y - r.topLeft.y - 2;
- TRACE("Bound = top=%hd %hd extend=%hd %hd",
- r.topLeft.x, r.topLeft.y, r.extent.x, r.extent.y);
+ FormSetDates(frm, datefilterset, DateFilterCheckbox,
+ FromSelTrigger, ToSelTrigger, DateFilterToLabel);
WinEraseRectangle(&r,0);
@@ -201,13 +194,10 @@
r.topLeft.y += (FntCharHeight()/2.0);
r.extent.y -= (FntCharHeight()/2.0);
- TRACE("Ici 2.6");
-
WinEraseRectangle(&r, 0);
currFont = FntSetFont(stdFont);
- TRACE("Ici 2.7");
// Find min and max for y and the number of item
curs = firstFuel(fullTankRequired, category, 0);
@@ -468,11 +458,7 @@
FormType *frm;
Int16 error;
- TRACE("Ici 1");
-
frm = FrmGetActiveForm();
- TRACE("Ici 1.1");
-
switch (eventP->eType)
{
case menuEvent:
@@ -530,12 +516,9 @@
break;
case keyDownEvent:
- TRACE("GraphFormHandleEvent: keyDownEvent");
-
handled = GraphHandleField(eventP);
break;
case frmOpenEvent:
- TRACE("GraphFormHandleEvent: Open");
setCarCategoryLabel(pFuelDB, GraphCarPopTrigger, GraphCarList,
CurrentCategory);
FrmDrawForm(frm);
Modified: branches/pFuel-0-04-stable/pFuel/Src/maintenance.c
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/maintenance.c 2008-03-04 13:49:14 UTC (rev 511)
+++ branches/pFuel-0-04-stable/pFuel/Src/maintenance.c 2008-04-08 13:09:58 UTC (rev 512)
@@ -645,18 +645,6 @@
cMtnRec->odo = 0;
-// if (rec->flags&MTN_LINK)
-// {
-// cMtnRec->mtnIndex.value = ((MtnSIndex *)p)->value;
-// cMtnRec->mtnIndex.cnt = ((MtnSIndex *)p)->cnt;
-// p += sizeof(MtnSIndex);
-// }
-// else
-// {
-// cMtnRec->mtnIndex.cnt = 0;
-// }
-
-
if (rec->flags & MTN_EVERY_ODO)
{
cMtnRec->eOdo.value = ((EveryOdo *)p)->value;
@@ -1165,8 +1153,6 @@
Boolean handled = false;
WChar chr = eventP->data.keyDown.chr;
-
-
if (globalPrefs.flags & ONE_HAND_MODE)
{
if (navCol != noFocus)
Modified: branches/pFuel-0-04-stable/pFuel/Src/navigation.c
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/navigation.c 2008-03-04 13:49:14 UTC (rev 511)
+++ branches/pFuel-0-04-stable/pFuel/Src/navigation.c 2008-04-08 13:09:58 UTC (rev 512)
@@ -870,6 +870,10 @@
* is.
*
* @return true if the action was handled.
+ *
+ *
+ * @note Since this function can call itself the Focus set deep in the call
+ * stack can be erase by a redraw after poping the stack of function call
*///
Boolean
Navigate(const UInt16 *navTable,const UInt16 nbRow, const UInt16 nbCol,
@@ -901,13 +905,22 @@
kind = GetObjectType(objID);
}
-
- if (focus & NAV_TABLE_FOCUS)
+ if (objID)
{
- // If handled
- if ( NavigateTable(objID, &focus, chr) )
- return true;
+ if (focus & NAV_TABLE_FOCUS)
+ {
+ // If handled
+ if ( NavigateTable(objID, &focus, chr) )
+ return true;
+ }
}
+ else
+ {
+ // If objID is 0 the focus can't be in NAV_TABLE_FOCUS
+ // This can happen if the system was in a NAV_TABLE_FOCUS but tapping a button
+ // move it out but opening another form
+ focus &= ~NAV_TABLE_FOCUS;
+ }
switch (kind)
@@ -1081,7 +1094,6 @@
*row = i / nbCol;
*col = i % nbCol;
SetFocus(navTable[nbCol * (*row) + (*col)], NAV_FOCUS);
- TRACE("5.1.1");
return;
}
}
Modified: branches/pFuel-0-04-stable/pFuel/Src/navigation.h
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/navigation.h 2008-03-04 13:49:14 UTC (rev 511)
+++ branches/pFuel-0-04-stable/pFuel/Src/navigation.h 2008-04-08 13:09:58 UTC (rev 512)
@@ -62,7 +62,7 @@
EXTERN Boolean Navigate(const UInt16 *navTable,
const UInt16 nbRow, const UInt16 nbCol,
- UInt16 *row, UInt16 *col, WChar ch, UInt16 deep) NAV_SECTION;
+ UInt16 *row, UInt16 *col, WChar chr, UInt16 deep) NAV_SECTION;
EXTERN void FindRowColInFocus(UInt16 *row, UInt16 *col,
const UInt16 nbRow, const UInt16 nbCol,
Modified: branches/pFuel-0-04-stable/pFuel/Src/pFuel.c
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/pFuel.c 2008-03-04 13:49:14 UTC (rev 511)
+++ branches/pFuel-0-04-stable/pFuel/Src/pFuel.c 2008-04-08 13:09:58 UTC (rev 512)
@@ -124,6 +124,9 @@
#define IDX_ODO 3
#define IDX_COST 4
+
+// #define UNITTEST
+
/***********************************************************************
*
* Global variables
@@ -310,7 +313,7 @@
PFRecord *p=0; // Used to get the offset for the different element
Char *msg = (Char *)MemHandleLock(DmGetResource(strRsc,
COULD_NOT_WRITE_TO_NEW_RECORD));
- TRACE("CreateRecord: Start");
+// TRACE("CreateRecord: Start");
// Create a new first record in the database
h = DmNewRecord(pFuelDB, &index, sizeof(PFRecord));
@@ -354,7 +357,7 @@
MemPtrUnlock(msg);
- TRACE("CreateRecord: Stop index=%hu", index);
+// TRACE("CreateRecord: Stop index=%hu", index);
return index;
}
@@ -367,7 +370,7 @@
Char str[12];
- TRACE("DeleteRecords: Start");
+// TRACE("DeleteRecords: Start");
if (errNone != DmSeekRecordInCategory(pFuelDB, &index, 0,
dmSeekForward, category))
@@ -408,7 +411,7 @@
recH = DmQueryNextInCategory(pFuelDB, &index, category);
}
- TRACE("DeleteRecords: Stop bottom");
+// TRACE("DeleteRecords: Stop bottom");
}
@@ -732,7 +735,7 @@
UInt8 catIdx = ( (CurrentCategory == dmAllCategories) ||
(CurrentCategory == dmUnfiledCategory) );
- TRACE("MainCarsDrawTblHeader: Start");
+// TRACE("MainCarsDrawTblHeader: Start");
if ( catIdx == 1 )
@@ -820,7 +823,7 @@
static UInt16
MainFormSelectCategory(FormType *frm)
{
- TRACE("MainFormSelectCategory: Start");
+// TRACE("MainFormSelectCategory: Start");
// Process the category popup list.
if ( SelectCategory(frm, MainCarPopTrigger, MainCarList, true, &CurrentCategory) )
@@ -830,47 +833,11 @@
MainCarsDrawTable(frm);
}
- TRACE("MainFormSelectCategory: Stop");
+// TRACE("MainFormSelectCategory: Stop");
return CurrentCategory;
}
-// /**
-// * This function select or deselect a row of the table.
-// *
-// * @param frm The pointer to the form containing the table
-// * @param fldID The id of the table
-// * @param row The row to be highlithed or not
-// *
-// * @return true If there was a row to hightlight. If the table is empty
-// * false will be returned
-// *///
-// static Boolean
-// MainFormSelectTableRow(FormType *frm, UInt16 fldID, int row)
-// {
-// RectangleType dummy;
-// TRACE("MainFormSelectTableRow: fld=%hu row=%d", fldID, row);
-
-// FrmGlueNavRemoveFocusRing(frm);
-// FrmSetFocus(frm, FrmGetObjectIndex(frm, fldID));
-
-// if ( DmNumRecordsInCategory(pFuelDB, CurrentCategory) )
-// {
-// invert = 1;
-// MainFormDrawRecord(GetObjectPtr(Table), row, 0, &dummy);
-// invert = 0;
-
-// TblSelectItem(GetObjectPtr(Table));
-
-
-// return true;
-// }
-
-// TRACE("MainFormSelectTableRow: End");
-// return false;
-// }
-
-
/**
* Handle the case when a key is pressed. When we are in One Hand mode or not.
*
@@ -909,7 +876,7 @@
case vchrNextField:
case chrHorizontalTabulation:
case chrLineFeed:
- TRACE("MainFormHandleKeyDown: vchrRockerDown");
+ TRACE("MFHKD: vchrRockerDown");
TableScrollPage(pFuelDB, Table, &TopVisibleRecord, &CurrentRecord,
winDown, CurrentCategory, &MainFormDrawRecord);
@@ -920,7 +887,7 @@
case vchrRockerUp:
case chrUpArrow:
case vchrPrevField:
- TRACE("MainFormHandleKeyDown:vchrRockerUp");
+ TRACE("MFHKD:vchrRockerUp");
TableScrollPage(pFuelDB, Table, &TopVisibleRecord, &CurrentRecord,
winUp, CurrentCategory, &MainFormDrawRecord);
@@ -952,7 +919,6 @@
static Boolean tblpenup;
static UInt16 tblcolumn;
-
switch (eventP->eType)
{
case menuEvent:
@@ -964,13 +930,10 @@
// TRACE("MainFormHandleEvent:l sclRepeatEvent");
// break;
- case lstSelectEvent:
- TRACE("MainFormHandleEvent:lstSelectEvent");
- break;
+// case lstSelectEvent:
+// break;
case ctlSelectEvent:
- TRACE("MainFormHandleEvent: ctlSelectEvent");
-
switch (eventP->data.ctlEnter.controlID)
{
case MainAddButton :
@@ -1012,14 +975,10 @@
break;
case keyDownEvent: // Handle the physical scroll buttons
- TRACE("MainFormHandleEvent:keyDownEvent");
-
handled = MainFormHandleKeyDown(frm, eventP);
break;
case sclExitEvent: // The user has left the pen from the scrollbar
- TRACE("MainFormHandleEvent: slcExitEvent");
-
// This is the equivalent of scroll up or down by one line
TopVisibleRecord = RecordInCategory(pFuelDB, CurrentCategory,
eventP->data.sclExit.value,
@@ -1031,8 +990,6 @@
break;
case tblSelectEvent:
- TRACE("MainFormHandleEvent: tblSelectEvent");
-
// Edit the record at the selected table item.
CurrentRecord = TblGetItemInt(eventP->data.tblSelect.pTable,
eventP->data.tblSelect.row, 0);
@@ -1043,7 +1000,6 @@
case penUpEvent:
TRACE("MFHE: penUpEvent");
-
if (tblpenup)
{
tblpenup = false;
@@ -1063,17 +1019,14 @@
}
else
handled = false;
- TRACE("MFHE: penUpEvent");
+ TRACE("MFHE: penUpEvent: End");
break;
case winEnterEvent:
- TRACE("MainFormHandleEvent: winEnterEvent");
handled = false;
break;
case frmOpenEvent:
- TRACE("MFHE: frmOpenEvent");
-
//lastFocusID = -1;
if (Resort)
{
@@ -1147,7 +1100,7 @@
if ( (globalPrefs.flags & ONE_HAND_MODE) && eventP->eType == keyHoldEvent )
{
- TRACE("SpecialKeyDownHandleEvent: Hold Down");
+ TRACE("SKDHE: Hold Down");
FrmCustomAlert(MtnReadWarning, "SpecialKeyDownHandleEvent: Hold Down", NULL, NULL);
handled = true;
}
@@ -1185,7 +1138,7 @@
chr = vchrRockerUp;
break;
case vchrPageDown :
- TRACE("SpecialKeyDownHandleEvent: vchrPageDown");
+ //TRACE("SpecialKeyDownHandleEvent: vchrPageDown");
chr = vchrRockerDown;
break;
@@ -1241,7 +1194,7 @@
//EvtAddEventToQueue( eventP );
if (handled)
{
- TRACE("SpecialKeyDownHandleEvent: handling the conversion");
+ TRACE("SKDHE: handling the conversion");
if (0 != EvtEnqueueKey(chr, 0, commandKeyMask) )
{
@@ -1351,6 +1304,212 @@
return false;
}
+#ifdef UNITTEST
+void
+UnitTest(EventType *e)
+{
+ static UInt16 cnt = 0;
+
+ TRACE("UT: Frm %hu, Cnt=%hu", FrmGetActiveFormID(), cnt++);
+ switch (e->eType)
+ {
+ case ctlEnterEvent:
+ TRACE("UT: ctlEnterEvent");
+ break;
+ case ctlRepeatEvent:
+ TRACE("UT: ctlRepeatEvent");
+ break;
+ case ctlSelectEvent:
+ TRACE("UT: ctlSelectEvent id=%hu", e->data.ctlEnter.controlID);
+ break;
+ case daySelectEvent:
+ TRACE("UT: daySelectEvent");
+ break;
+ case fldChangedEvent:
+ TRACE("UT: fldChangedEvent");
+ break;
+ case fldEnterEvent:
+ TRACE("UT: fldEnterEvent");
+ break;
+ case frmCloseEvent:
+ TRACE("UT: frmCloseEvent");
+ break;
+ case frmLoadEvent:
+ TRACE("UT: frmLoadEvent");
+ break;
+ case frmOpenEvent:
+ TRACE("UT: frmOpenEvent");
+ break;
+ case frmUpdateEvent:
+ TRACE("UT: frmUpdateEvent");
+ break;
+ case keyDownEvent: // Handle the physical scroll buttons
+ {
+ UInt16 chr = e->data.keyDown.chr;
+ char *strKeyDown = "";
+ char *strchrNav = "";
+
+ switch (chr)
+ {
+ case chrDownArrow: strKeyDown="chrDownArrow"; break;
+ case chrUpArrow: strKeyDown="chrUpArrow"; break;
+ case chrHorizontalTabulation: strKeyDown="chrHorizontalTabulation";break;
+ case chrLineFeed: strKeyDown="chrLineFeed";break;
+ case vchrHard2: strKeyDown="vchrHard2"; break; // Address Book
+ case vchrHard3: strKeyDown="vchrHard3"; break; // Todo
+ case vchrHard4: strKeyDown="vchrHard4"; break; // memo
+ case vchrNextField: strKeyDown="vchrNextField";break;
+ case vchrPageUp: strKeyDown="vchrPageUp";break;
+ case vchrPageDown: strKeyDown="vchrPageDown";break;
+ case vchrPrevField: strKeyDown="vchrPrevField"; break;
+ case vchrRockerCenter: strKeyDown="vchrRockerCenter";break;
+ case vchrRockerDown: strKeyDown="vchrRockerDown";break;
+ case vchrRockerUp: strKeyDown="vchrRockerUp";break;
+ case vchrHardRockerCenter: strKeyDown="vchrHardRockerCenter";break;
+ case vchrNavChange : //
+ {
+ UInt16 keyCode = e->data.keyDown.keyCode;
+ //TRACE("SpecialKeyDownHandleEvent: vchrNavChange");
+ switch (keyCode & navBitsAll)
+ {
+ case navBitUp :
+ strchrNav = "navBitUp";
+ break;
+ case navBitDown :
+ strchrNav = "navBitDown";
+ break;
+ case navBitLeft :
+ strchrNav = "navBitLeft";
+ break;
+ case navBitRight:
+ strchrNav = "navBitRight";
+ break;
+ case 0:
+ if ((keyCode & navChangeBitsAll) == navChangeSelect)
+ strchrNav = "navChangeSelect";
+ break;
+// default :
+// break;
+ }
+ }
+ break;
+// default :
+// break;
+ }
+ TRACE("UT: keyDownEvent: chr=%hu %s nav=%s", chr, strKeyDown, strchrNav);
+ }
+ break;
+ case keyHoldEvent: // Handle the physical scroll buttons
+ TRACE("UT: keyHoldEvent");
+ break;
+ case keyUpEvent: // Handle the physical scroll buttons
+ {
+ TRACE("UT: keyUpEvent");
+ }
+ break;
+ case nilEvent:
+ TRACE("UT: nilEvent");
+ break;
+ case penMoveEvent:
+ TRACE("UT: penMoveEvent");
+ break;
+ case penUpEvent:
+ TRACE("UT: penUpEvent: start=[%hu, %hu] end=[%hu, %hu] screenPos=[%hu, %hu]",
+ e->data.penUp.start.x, e->data.penUp.start.y,
+ e->data.penUp.end.x, e->data.penUp.end.y,
+ e->screenX, e->screenY);
+ break;
+ case sclEnterEvent:
+ TRACE("UT: sclEnterEvent");
+ break;
+ case winEnterEvent:
+ TRACE("UT: winEnterEvent");
+ break;
+// default: // N.B. Remove this to have warning about which event not handled
+// break;
+ };
+
+// #define UNITTEST_1
+#ifdef UNITTEST_1
+ {
+ // At least one record should exist
+ // Set the ONE_HAND_MODE to ON
+ // MainForm: Go up so be in the table mode
+ // MainForm: Push the add button
+ // RecordFrm: Go up
+ // Object #0 in form #1100 is missing
+ // ## The program was in NAV_TABLE_FOCUS and was never
+ // removed from this state
+ static Boolean done = false;
+ EventType event;
+ globalPrefs.flags |= ONE_HAND_MODE;
+ if (!done)
+ {
+ TRACE("Unittest: Running UNITTEST 1");
+ done = true;
+ }
+
+
+ if (2 == cnt)
+ {
+ MemSet(&event,sizeof(event),0);
+ event.eType = penUpEvent;
+ event.data.penUp.start.x = 75;
+ event.data.penUp.start.y = 102;
+ event.data.penUp.end.x = 75;
+ event.data.penUp.end.y = 102;
+ event.screenX = 75;
+ event.screenY = 102;
+ EvtAddEventToQueue( &event );
+ }
+ if (4 == cnt || 9 == cnt || 10 == cnt)
+ {
+ MemSet(&event,sizeof(event),0);
+ event.eType = nilEvent;
+ EvtAddEventToQueue( &event );
+ }
+
+ if (5 == cnt) // Go to table
+ {
+ MemSet(&event,sizeof(event),0);
+ event.eType = keyDownEvent;
+ event.data.keyDown.chr = vchrPageUp;
+ event.data.keyDown.keyCode |= navBitUp;
+ EvtAddEventToQueue( &event );
+ }
+ if (7 == cnt) // Select row
+ {
+ MemSet(&event,sizeof(event),0);
+ event.eType = keyDownEvent;
+ event.data.keyDown.chr = vchrHard4;
+ event.data.keyDown.keyCode |= navBitUp;
+ EvtAddEventToQueue( &event );
+ }
+
+ if (12 == cnt) // Equivalent to Hit MainAddButton
+ {
+ // CtlHitControl(GetObjectPtr( MainAddButton));
+ MemSet(&event,sizeof(event),0);
+ event.eType = ctlSelectEvent;
+ event.data.ctlSelect.controlID = MainAddButton;
+ event.data.ctlSelect.on = true;
+ EvtAddEventToQueue( &event );
+ }
+
+
+ if (23 == cnt) // Go up
+ {
+ MemSet(&event,sizeof(event),0);
+ event.eType = keyDownEvent;
+ event.data.keyDown.chr = vchrPageUp;
+ event.data.keyDown.keyCode |= navBitUp;
+ EvtAddEventToQueue( &event );
+ }
+ }
+#endif // UNITTEST_1
+}
+#endif // UNITTEST
+
/**
* This routine is the event loop for the application.
*
@@ -1369,6 +1528,10 @@
EvtGetEvent(&event, evtWaitForever);
+#ifdef UNITTEST
+ UnitTest(&event);
+#endif
+
if (!SpecialKeyDownHandleEvent(&event))
if (!SysHandleEvent(&event))
if (!MenuHandleEvent(0, &event, &error))
Modified: branches/pFuel-0-04-stable/pFuel/Src/pfRecord.c
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/pfRecord.c 2008-03-04 13:49:14 UTC (rev 511)
+++ branches/pFuel-0-04-stable/pFuel/Src/pfRecord.c 2008-04-08 13:09:58 UTC (rev 512)
@@ -815,18 +815,16 @@
// { // DEVEL
// float tata;
- //TRACE("AddPetrolHandleEvent: start");
+ //TRACE("APHE: start");
switch (eventP->eType)
{
case ctlSelectEvent:
- TRACE("AddPetrolHandleEvent: SelectEvent");
-
switch (eventP->data.ctlSelect.controlID)
{
case OKButton :
- TRACE("AddPetrolHandleEvent: OK");
+ TRACE("APHE: OK");
if (AddPetrolSaveData())
{
@@ -867,7 +865,7 @@
FrmGotoForm(MainForm);
break;
case AddPetrolDeleteButton :
- TRACE("AddPetrolHandleEvent: Delete");
+ TRACE("APHE: Delete");
if (FrmAlert(DeleteRecordAlert) == DeleteRecordYes)
{
@@ -878,7 +876,7 @@
released = true;
break;
case AddPetrolNoteButton :
- TRACE("AddPetrolHandleEvent: Note");
+ TRACE("APHE: Note");
if ( CurrentRecord == noRecordSelected ) {
DmReleaseRecord(pFuelDB, CurrentRecord, true);
}
@@ -886,7 +884,7 @@
FrmPopupForm(NoteForm);
break;
case AddPetrolCarPopTrigger :
- TRACE("AddPetrolHandleEvent: CarPop");
+ TRACE("APHE: CarPop");
SelectCategory(frmP, AddPetrolCarPopTrigger, AddPetrolCarList, false,
&CurrentCategory);
@@ -897,12 +895,12 @@
FrmUpdateForm(AddPetrolForm, updateCategoryChanged);
break;
case AddPetrolDateSelTrigger :
- TRACE("AddPetrolHandleEvent: DateSelTrigger");
+ TRACE("APHE: DateSelTrigger");
Resort = GetDateAndSelect(&CurrentDate, AddPetrolDateSelTrigger,
true, "Log Date");
break;
case AddPetrolOdometerSelTrigger :
- TRACE("AddPetrolHandleEvent: AddPetrolOdometerSelTrigger");
+ TRACE("APHE: AddPetrolOdometerSelTrigger");
if (LstPopupList(GetObjectPtr(AddPetrolOdometerList)) == TRIP_CHOICE)
editedRec.flags |= TRIP_RECFLAG;
else
@@ -916,11 +914,11 @@
((editedRec.flags & TRIP_RECFLAG) ? 1 : 0)));
break;
case ScrollUpButton :
- TRACE("AddPetrolHandleEvent: ScrollUp");
+ TRACE("APHE: ScrollUp");
AddPetrolScroll(winUp);
break;
case ScrollDownButton :
- TRACE("AddPetrolHandleEvent: ScrollDown");
+ TRACE("APHE: ScrollDown");
AddPetrolScroll(winDown);
break;
case ScrollRightButton :
@@ -928,10 +926,10 @@
break;
default:
- TRACE("AddPetrolHandleEvent: Default");
+ TRACE("APHE: Default");
- TRACE("AddPetrolHandleEvent: Missing state=%hu",
+ TRACE("APHE: Missing state=%hu",
CtlGetValue(GetObjectPtr(AddPetrolMissingRecordCheckbox)));
handled = false;
break;
@@ -943,11 +941,11 @@
switch ( eventP->data.ctlRepeat.controlID)
{
case ScrollUpButton :
- TRACE("AddPetrolHandleEvent: ScrollUp");
+ TRACE("APHE: ScrollUp");
AddPetrolScroll(winUp);
break;
case ScrollDownButton :
- TRACE("AddPetrolHandleEvent: ScrollDown");
+ TRACE("APHE: ScrollDown");
AddPetrolScroll(winDown);
break;
}
@@ -959,13 +957,10 @@
navTable, eventP->data.fldEnter.fieldID);
break;
case keyDownEvent: // Handle the physical scroll buttons
- TRACE("AddPetrolHandleEvent: keyDownEvent");
handled = AddPetrolHandleField(eventP, &changeDigit);
break;
case firstUserEvent: // Handle the keyboard popping down
- TRACE("AddPetrolHandleEvent: firstUserEvent");
-
SetUpdatedFields(eventP->data.fldChanged.fieldID);
AddPetrolUpdateField(updatedFields);
@@ -977,8 +972,6 @@
Char *title = (Char *)FrmGetTitle(frmP);
MemHandle hNewTitle;
- TRACE("APHE: OpenEvent");
-
// Set the default navigation position on the OK button
updatedFields = 0x00; // No field updated yet since we just open the form.
@@ -1049,13 +1042,10 @@
}
break;
case frmUpdateEvent:
- TRACE("AddPetrolHandleEvent: UpdateEvent");
handled = AddPetrolUpdateDisplay(eventP->data.frmUpdate.updateCode);
break;
case frmCloseEvent:
- TRACE("AddPetrolHandleEvent: CloseEvent chr=%hu", chr);
-
if (CurrentNoteHandle)
{
MemHandleFree(CurrentNoteHandle);
@@ -1078,10 +1068,10 @@
}
else
{
- TRACE("AddPetrolHandleEvent: checking maintenance");
+ TRACE("APHE: checking maintenance");
if (checkMaintenance(CurrentCategory, CurrentRecord) != MtnAlertGoTo)
{
- TRACE("AddPetrolHandleEvent: after checking maintenance");
+ TRACE("APHE: after checking maintenance");
FrmGotoForm(MainForm);
}
Modified: branches/pFuel-0-04-stable/pFuel/Src/utility.c
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/utility.c 2008-03-04 13:49:14 UTC (rev 511)
+++ branches/pFuel-0-04-stable/pFuel/Src/utility.c 2008-04-08 13:09:58 UTC (rev 512)
@@ -1332,7 +1332,6 @@
{
UInt16 oldCat = *category;
Boolean changed;
- Boolean categoryEdited;
Char *label = (Char *)CtlGetLabel(GetObjectPtr(trigger));
@@ -1340,8 +1339,7 @@
// Have the system ui present the user with a list of categories
// and return what the user selects.
- categoryEdited = CategorySelect(pFuelDB, frm, trigger, list, all, category,
- label, 1, 0);
+ CategorySelect(pFuelDB, frm, trigger, list, all, category, label, 1, 0);
changed = (*category != oldCat);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pa...@us...> - 2008-03-04 13:49:09
|
Revision: 511
http://pfuel.svn.sourceforge.net/pfuel/?rev=511&view=rev
Author: papaDoc
Date: 2008-03-04 05:49:14 -0800 (Tue, 04 Mar 2008)
Log Message:
-----------
20080304-RR-01
- Development:
- repeatingButtonCtl should send repeating event and not a CtlHotControl.
Modified Paths:
--------------
branches/pFuel-0-04-stable/pFuel/Src/fuelStats.c
branches/pFuel-0-04-stable/pFuel/Src/navigation.c
Modified: branches/pFuel-0-04-stable/pFuel/Src/fuelStats.c
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/fuelStats.c 2008-03-03 14:26:35 UTC (rev 510)
+++ branches/pFuel-0-04-stable/pFuel/Src/fuelStats.c 2008-03-04 13:49:14 UTC (rev 511)
@@ -1030,6 +1030,7 @@
AddingRecord = false;
FrmGotoForm(AddPetrolForm);
break;
+
case StatCarPopTrigger :
if ( SelectCategory(frm, StatCarPopTrigger, StatCarList, false, &CurrentCategory) )
{
@@ -1064,6 +1065,7 @@
break;
case ctlRepeatEvent: // an onscreen scroll button is pressed
+ TRACE("SFHE: keyDownEvent");
switch ( eventP->data.ctlRepeat.controlID )
{
case ScrollUpButton :
@@ -1083,7 +1085,7 @@
break;
case frmOpenEvent:
-// TRACE("StatFormHandleEvent: form->id=%hu", FrmGetActiveFormID());
+ TRACE("SFHE: form->id=%hu", FrmGetActiveFormID());
setCarCategoryLabel(pFuelDB, StatCarPopTrigger, StatCarList,
CurrentCategory);
Modified: branches/pFuel-0-04-stable/pFuel/Src/navigation.c
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/navigation.c 2008-03-03 14:26:35 UTC (rev 510)
+++ branches/pFuel-0-04-stable/pFuel/Src/navigation.c 2008-03-04 13:49:14 UTC (rev 511)
@@ -563,6 +563,16 @@
objID, (*row), (*col));
switch (style)
{
+ case repeatingButtonCtl:
+ TRACE("Select: repeatingButtonCtl:");
+ {
+ EventType event;
+ MemSet(&event,sizeof(event),0);
+ event.eType = ctlRepeatEvent;
+ event.data.ctlRepeat.controlID = objID;
+ EvtAddEventToQueue( &event );
+ }
+ break;
case checkboxCtl:
CtlSetValue(GetObjectPtr(objID), !CtlGetValue(GetObjectPtr(objID)));
break;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pa...@us...> - 2008-03-03 14:26:30
|
Revision: 510
http://pfuel.svn.sourceforge.net/pfuel/?rev=510&view=rev
Author: papaDoc
Date: 2008-03-03 06:26:35 -0800 (Mon, 03 Mar 2008)
Log Message:
-----------
20080302-RR-01
- Bugs:
- The scroll up and down button on the Stat Form were not higlighted in the OHM
mode when in Focus.
- Development:
- Change how the scroll buttons are handled.
- The check for the scrollable(Down|Up) is done in the function StatFormScroll
- All scroll (up | down) button are not REPEATBUTTON
- In the rcp.in file, the macro PREVTOP is used to position the ScrollDownButton.
- The position off the ScrollUpButton is adjusted.
Modified Paths:
--------------
branches/pFuel-0-04-stable/pFuel/CHANGELOG
branches/pFuel-0-04-stable/pFuel/Src/fuelStats.c
branches/pFuel-0-04-stable/pFuel/Src/navigation.c
branches/pFuel-0-04-stable/pFuel/Src/pFuel.rcp.in
branches/pFuel-0-04-stable/pFuel/Src/pFuel.ver
branches/pFuel-0-04-stable/pFuel/Src/pfRecord.c
Modified: branches/pFuel-0-04-stable/pFuel/CHANGELOG
===================================================================
--- branches/pFuel-0-04-stable/pFuel/CHANGELOG 2008-02-29 14:26:47 UTC (rev 509)
+++ branches/pFuel-0-04-stable/pFuel/CHANGELOG 2008-03-03 14:26:35 UTC (rev 510)
@@ -13,6 +13,16 @@
#------------------------------------------------------------
Version 0.04.06
+20080302-RR-01
+ - Bugs:
+ - The scroll up and down button on the Stat Form were not higlighted in the OHM
+ mode when in Focus.
+ - Development:
+ - Change how the scroll buttons are handled.
+ - The check for the scrollable(Down|Up) is done in the function StatFormScroll
+ - All scroll (up | down) button are not REPEATBUTTON
+ - In the rcp.in file, the macro PREVTOP is used to position the ScrollDownButton.
+ - The position off the ScrollUpButton is adjusted.
20080229-RR-01
- Bugs:
Modified: branches/pFuel-0-04-stable/pFuel/Src/fuelStats.c
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/fuelStats.c 2008-02-29 14:26:47 UTC (rev 509)
+++ branches/pFuel-0-04-stable/pFuel/Src/fuelStats.c 2008-03-03 14:26:35 UTC (rev 510)
@@ -450,7 +450,7 @@
float odoFrom = 0.0, odoTo = 0.0;
float distAtStart, distAtEnd;
-// TRACE("StatFormDoStats: Start");
+ TRACE("StatFormDoStats: Start");
FormSetDates(frmP, datefilterset, DateFilterCheckbox,
FromSelTrigger, ToSelTrigger, DateFilterToLabel);
@@ -498,10 +498,11 @@
++i;
}
}
+
if ( !i )
{
FrmAlert(InsufficientDataAlert);
- return 0;
+ return ErrorInsufficientDataAlert;;
}
if (divider > 1.1)
@@ -852,10 +853,10 @@
*
* @param direction WinUp or winDowm
*
- * @return nothing
+ * @return true
*
*///
-static void
+static Boolean
StatFormScroll(WinDirectionType direction)
{
UInt16 newRecord = CurrentRecord;
@@ -863,7 +864,7 @@
// TRACE("StatFormScroll:");
- if (direction == winDown) // Scroll the table down.
+ if (direction == winDown && scrollableDown) // Scroll the table down.
{
if (DmSeekRecordInCategory(pFuelDB, &newRecord, 1,
dmSeekForward, CurrentCategory))
@@ -881,7 +882,7 @@
MemHandleUnlock(recH);
}
}
- else // Scroll the table up.
+ else if ( scrollableUp )// Scroll the table up.
{
// Scroll up a single line
DmSeekRecordInCategory(pFuelDB, &newRecord,
@@ -923,6 +924,8 @@
FrmGotoForm(StatRecordForm);
}
}
+
+ return true;
}
@@ -967,20 +970,13 @@
}
}
} // End of if ONE_HAN_MODE
- else
+
+ if ( !handled )
{
- if ( (eventP->data.ctlRepeat.controlID == ScrollUpButton ||
- chr == pageUpChr) && scrollableUp)
- {
- StatFormScroll(winUp);
- handled = true;
- }
- else if ( (eventP->data.ctlRepeat.controlID == ScrollDownButton ||
- chr == pageDownChr)&& scrollableDown)
- {
- StatFormScroll(winDown);
- handled = true;
- }
+ if ( chr == pageUpChr )
+ handled = StatFormScroll(winUp);
+ else if ( chr == pageDownChr )
+ handled = StatFormScroll(winDown);
}
@@ -1004,7 +1000,7 @@
Int16 error;
-// TRACE("StatFormHandleEvent: Start");
+ TRACE("SFHE: Start");
// TRACE("StatFormHandleEvent: Ici 91");
// FrmSetLabelAlign(frm, StatFormLine7Unit, "Tata", ALIGN_LEFT);
// TRACE("StatFormHandleEvent: Ici 92: effUnit=%d", cCarPref->effUnit);
@@ -1030,22 +1026,6 @@
handled = true;
break;
- case ScrollUpButton:
- TRACE("SFHE: ScrollUpButton");
- if (scrollableUp)
- {
- StatFormScroll(winUp);
- handled = true;
- }
- break;
- case ScrollDownButton:
- TRACE("SFHE: ScrollDownButton");
- if (scrollableDown)
- {
- StatFormScroll(winDown);
- handled = true;
- }
- break;
case ScrollRightButton :
AddingRecord = false;
FrmGotoForm(AddPetrolForm);
@@ -1061,15 +1041,15 @@
handled = true;
break;
case DateFilterCheckbox :
- TRACE("StatFormHandleEvent: DateFilterCheckbox");
+ TRACE("SFHE: DateFilterCheckbox");
datefilterset = CtlGetValue(GetObjectPtr(DateFilterCheckbox));
- StatFormDoStats(frm, CurrentCategory);
FrmDrawForm(frm);
+ StatFormDoStats(frm, CurrentCategory);
handled = true;
break;
case FromSelTrigger :
case ToSelTrigger :
- TRACE("StatFormHandleEvent: ToSelTrigger: Ici 1");
+ TRACE("SFHE: ToSelTrigger: Ici 1");
SetFilterDate(eventP->data.ctlSelect.controlID);
// TRACE("StatFormHandleEvent: ToSelTrigger: Ici 2");
StatFormDoStats(frm, CurrentCategory);
@@ -1082,7 +1062,18 @@
break;
}
break;
+
case ctlRepeatEvent: // an onscreen scroll button is pressed
+ switch ( eventP->data.ctlRepeat.controlID )
+ {
+ case ScrollUpButton :
+ handled = StatFormScroll(winUp);
+ break;
+ case ScrollDownButton:
+ handled = StatFormScroll(winDown);
+ break;
+ }
+ break;
// We pass trough
case keyDownEvent: // Handle the physical scroll buttons
TRACE("SFHE: keyDownEvent");
Modified: branches/pFuel-0-04-stable/pFuel/Src/navigation.c
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/navigation.c 2008-02-29 14:26:47 UTC (rev 509)
+++ branches/pFuel-0-04-stable/pFuel/Src/navigation.c 2008-03-03 14:26:35 UTC (rev 510)
@@ -463,6 +463,7 @@
switch (style)
{
+ case repeatingButtonCtl:
case buttonCtl:
if (objID & NO_BUTTON_FRAME)
UpdateFrame(objID, noFrame, roundFrame, focus);
Modified: branches/pFuel-0-04-stable/pFuel/Src/pFuel.rcp.in
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/pFuel.rcp.in 2008-02-29 14:26:47 UTC (rev 509)
+++ branches/pFuel-0-04-stable/pFuel/Src/pFuel.rcp.in 2008-03-03 14:26:35 UTC (rev 510)
@@ -307,8 +307,8 @@
BUTTON "Cancel" ID AddPetrolCancelButton AT (PREVRIGHT+4 PREVTOP AUTO AUTO) LEFTANCHOR
BUTTON "Delete" ID AddPetrolDeleteButton AT (PREVRIGHT+4 PREVTOP AUTO AUTO) USABLE LEFTANCHOR
- BUTTON "\001" ID ScrollUpButton AT (143 144 AUTO AUTO) NONUSABLE LEFTANCHOR NOFRAME FONT 5
- BUTTON "\002" ID ScrollDownButton AT (PREVLEFT 152 AUTO AUTO) NONUSABLE LEFTANCHOR NOFRAME FONT 5
+ REPEATBUTTON "\001" ID ScrollUpButton AT (143 144 AUTO AUTO) NONUSABLE LEFTANCHOR NOFRAME FONT 5
+ REPEATBUTTON "\002" ID ScrollDownButton AT (PREVLEFT PREVTOP+8 AUTO AUTO) NONUSABLE LEFTANCHOR NOFRAME FONT 5
GRAFFITISTATEINDICATOR AT (137 150)
END
@@ -391,8 +391,8 @@
BUTTON "Cancel" ID CancelButton AT (PREVRIGHT+4 PrevTop AUTO AUTO) LEFTANCHOR
BUTTON "Delete" ID DeleteButton AT (PREVRIGHT+4 PrevTop AUTO AUTO) NONUSABLE LEFTANCHOR
- BUTTON "\001" ID ScrollUpButton AT (143 144 AUTO AUTO) NONUSABLE LEFTANCHOR NOFRAME FONT 5
- BUTTON "\002" ID ScrollDownButton AT (PREVLEFT 152 AUTO AUTO) NONUSABLE LEFTANCHOR NOFRAME FONT 5
+ REPEATBUTTON "\001" ID ScrollUpButton AT (143 144 AUTO AUTO) NONUSABLE LEFTANCHOR NOFRAME FONT 5
+ REPEATBUTTON "\002" ID ScrollDownButton AT (PREVLEFT 152 AUTO AUTO) NONUSABLE LEFTANCHOR NOFRAME FONT 5
GRAFFITISTATEINDICATOR AT (137 150)
END
@@ -475,8 +475,8 @@
BUTTON "Done" ID StatFormDoneButton AT (1 147 AUTO AUTO) LEFTANCHOR
BUTTON "Graph" ID StatFormGraphButton AT (PREVRIGHT+4 PREVTOP AUTO AUTO) LEFTANCHOR
- REPEATBUTTON "\001" ScrollUpButton AT (147 144 13 8) LEFTANCHOR NOFRAME FONT 5
- REPEATBUTTON "\002" ScrollDownButton AT (PREVLEFT 152 PREVWIDTH PREVHEIGHT) LEFTANCHOR NOFRAME FONT 5
+ REPEATBUTTON "\001" ScrollUpButton AT (143 144 AUTO AUTO) LEFTANCHOR NOFRAME FONT 5
+ REPEATBUTTON "\002" ScrollDownButton AT (PREVLEFT PREVTOP+8 AUTO AUTO) LEFTANCHOR NOFRAME FONT 5
END
NAVIGATION ID StatOverAllForm
@@ -558,8 +558,8 @@
BUTTON "Graph" ID StatFormGraphButton AT (PREVRIGHT+4 PREVTOP AUTO AUTO) LEFTANCHOR
BUTTON "Stats" ID StatFormStatsButton AT (PREVRIGHT+4 PREVTOP AUTO AUTO) LEFTANCHOR
- REPEATBUTTON "\001" ID ScrollUpButton AT (147 144 13 8) LEFTANCHOR NOFRAME FONT 5
- REPEATBUTTON "\002" ID ScrollDownButton AT (PREVLEFT 152 PREVWIDTH PREVHEIGHT) LEFTANCHOR NOFRAME FONT 5
+ REPEATBUTTON "\001" ID ScrollUpButton AT (143 144 AUTO AUTO) LEFTANCHOR NOFRAME FONT 5
+ REPEATBUTTON "\002" ID ScrollDownButton AT (PREVLEFT PREVTOP+8 AUTO AUTO) LEFTANCHOR NOFRAME FONT 5
END
NAVIGATION ID StatRecordForm
Modified: branches/pFuel-0-04-stable/pFuel/Src/pFuel.ver
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/pFuel.ver 2008-02-29 14:26:47 UTC (rev 509)
+++ branches/pFuel-0-04-stable/pFuel/Src/pFuel.ver 2008-03-03 14:26:35 UTC (rev 510)
@@ -1 +1 @@
-0.04.06
+0.04.06a
Modified: branches/pFuel-0-04-stable/pFuel/Src/pfRecord.c
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/pfRecord.c 2008-02-29 14:26:47 UTC (rev 509)
+++ branches/pFuel-0-04-stable/pFuel/Src/pfRecord.c 2008-03-03 14:26:35 UTC (rev 510)
@@ -939,6 +939,21 @@
break;
+ case ctlRepeatEvent: // an onscreen scroll button is pressed
+ switch ( eventP->data.ctlRepeat.controlID)
+ {
+ case ScrollUpButton :
+ TRACE("AddPetrolHandleEvent: ScrollUp");
+ AddPetrolScroll(winUp);
+ break;
+ case ScrollDownButton :
+ TRACE("AddPetrolHandleEvent: ScrollDown");
+ AddPetrolScroll(winDown);
+ break;
+ }
+ break;
+
+
case fldEnterEvent:
FindRowColInFocus(&navRow, &navCol, NB_NAVROW, NB_NAVCOL,
navTable, eventP->data.fldEnter.fieldID);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pa...@us...> - 2008-02-29 14:26:40
|
Revision: 509
http://pfuel.svn.sourceforge.net/pfuel/?rev=509&view=rev
Author: papaDoc
Date: 2008-02-29 06:26:47 -0800 (Fri, 29 Feb 2008)
Log Message:
-----------
20080229-RR-01
- Bugs:
- Bug #1902151: reported by Markus by email.
4.) - Go to the "Stats" screen
- press the "task" hardware button twice to navigate all the way to the
right. Now no element seems to be selected, but I guess the two small
triangles which allow flipping through the records are actually selected.
- press the "Memo" hardware button twice.
-> exception "Form.c, Line:1728, Object not in form"
- Fixed
- When the scroll button are grey and you select it with the memo button
the col becomes 65535 and make the application crash. Fixed
- The up and down arrow on the Stat form were not working. Fixed
- Development:
- The scroller are hided instead of greyed since even if they are grey they
were fucosable and this was causing problem. See above.
Modified Paths:
--------------
branches/pFuel-0-04-stable/pFuel/CHANGELOG
branches/pFuel-0-04-stable/pFuel/Src/fuelStats.c
branches/pFuel-0-04-stable/pFuel/Src/utility.c
Modified: branches/pFuel-0-04-stable/pFuel/CHANGELOG
===================================================================
--- branches/pFuel-0-04-stable/pFuel/CHANGELOG 2008-02-27 14:47:47 UTC (rev 508)
+++ branches/pFuel-0-04-stable/pFuel/CHANGELOG 2008-02-29 14:26:47 UTC (rev 509)
@@ -13,6 +13,24 @@
#------------------------------------------------------------
Version 0.04.06
+
+20080229-RR-01
+ - Bugs:
+ - Bug #1902151: reported by Markus by email.
+ 4.) - Go to the "Stats" screen
+ - press the "task" hardware button twice to navigate all the way to the
+ right. Now no element seems to be selected, but I guess the two small
+ triangles which allow flipping through the records are actually selected.
+ - press the "Memo" hardware button twice.
+ -> exception "Form.c, Line:1728, Object not in form"
+ - Fixed
+ - When the scroll button are grey and you select it with the memo button
+ the col becomes 65535 and make the application crash. Fixed
+ - The up and down arrow on the Stat form were not working. Fixed
+ - Development:
+ - The scroller are hided instead of greyed since even if they are grey they
+ were fucosable and this was causing problem. See above.
+
20080227-RR-01
- Bugs:
- Bug #1902151: reported by Markus by email.
Modified: branches/pFuel-0-04-stable/pFuel/Src/fuelStats.c
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/fuelStats.c 2008-02-27 14:47:47 UTC (rev 508)
+++ branches/pFuel-0-04-stable/pFuel/Src/fuelStats.c 2008-02-29 14:26:47 UTC (rev 509)
@@ -959,7 +959,8 @@
StatFormDoneButton, StatFormGraphButton, ScrollDownButton, 0
};
handled = Navigate(navTableOverAllStat, OVERALL_NB_NAVROW, NB_NAVCOL, &navRow, &navCol, chr, 0);
- if (DateFilterCheckbox == navTableOverAllStat[(NB_NAVCOL * navRow) + navCol] )
+
+ if (DateFilterCheckbox == navTableOverAllStat[(NB_NAVCOL * navRow) + navCol])
{
datefilterset = CtlGetValue(GetObjectPtr(DateFilterCheckbox));
StatFormDoStats(FrmGetActiveForm(), CurrentCategory);
@@ -1029,6 +1030,22 @@
handled = true;
break;
+ case ScrollUpButton:
+ TRACE("SFHE: ScrollUpButton");
+ if (scrollableUp)
+ {
+ StatFormScroll(winUp);
+ handled = true;
+ }
+ break;
+ case ScrollDownButton:
+ TRACE("SFHE: ScrollDownButton");
+ if (scrollableDown)
+ {
+ StatFormScroll(winDown);
+ handled = true;
+ }
+ break;
case ScrollRightButton :
AddingRecord = false;
FrmGotoForm(AddPetrolForm);
Modified: branches/pFuel-0-04-stable/pFuel/Src/utility.c
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/utility.c 2008-02-27 14:47:47 UTC (rev 508)
+++ branches/pFuel-0-04-stable/pFuel/Src/utility.c 2008-02-29 14:26:47 UTC (rev 509)
@@ -1712,10 +1712,23 @@
}
// Update the scroll button.
- FrmUpdateScrollers(frm,
- FrmGetObjectIndex(frm, ScrollUpButton),
- FrmGetObjectIndex(frm, ScrollDownButton),
- *scrollableUp, *scrollableDown);
+
+// This only make it grey and it cause problem when in OHM
+// since the object will still be focusable.
+// FrmUpdateScrollers(frm,
+// FrmGetObjectIndex(frm, ScrollUpButton),
+// FrmGetObjectIndex(frm, ScrollDownButton),
+// *scrollableUp, *scrollableDown);
+
+ if ( *scrollableUp )
+ FrmShowObject(frm, FrmGetObjectIndex(frm, ScrollUpButton));
+ else
+ FrmHideObject(frm, FrmGetObjectIndex(frm, ScrollUpButton));
+
+ if ( *scrollableDown )
+ FrmShowObject(frm, FrmGetObjectIndex(frm, ScrollDownButton));
+ else
+ FrmHideObject(frm, FrmGetObjectIndex(frm, ScrollDownButton));
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pa...@us...> - 2008-02-27 14:47:49
|
Revision: 508
http://pfuel.svn.sourceforge.net/pfuel/?rev=508&view=rev
Author: papaDoc
Date: 2008-02-27 06:47:47 -0800 (Wed, 27 Feb 2008)
Log Message:
-----------
20080227-RR-01
- Bugs:
- Bug #1902151: reported by Markus by email.
3.) - Go to the "Graph" screen.
- Navigate via hardware buttons to the "Filter" box.
- Press the "Memo" hardware button to select the filter option.
-> expected behaviour: the fields where you can select a startdate and
an enddate should appear
-> actual behaviour: box ist selected but the startdate and enddate
fields remain hidden.
+ Fixed
Modified Paths:
--------------
branches/pFuel-0-04-stable/pFuel/CHANGELOG
branches/pFuel-0-04-stable/pFuel/Src/graph.c
branches/pFuel-0-04-stable/pFuel/Src/utility.c
Modified: branches/pFuel-0-04-stable/pFuel/CHANGELOG
===================================================================
--- branches/pFuel-0-04-stable/pFuel/CHANGELOG 2008-02-26 13:56:06 UTC (rev 507)
+++ branches/pFuel-0-04-stable/pFuel/CHANGELOG 2008-02-27 14:47:47 UTC (rev 508)
@@ -13,6 +13,17 @@
#------------------------------------------------------------
Version 0.04.06
+20080227-RR-01
+ - Bugs:
+ - Bug #1902151: reported by Markus by email.
+ 3.) - Go to the "Graph" screen.
+ - Navigate via hardware buttons to the "Filter" box.
+ - Press the "Memo" hardware button to select the filter option.
+ -> expected behaviour: the fields where you can select a startdate and
+ an enddate should appear
+ -> actual behaviour: box ist selected but the startdate and enddate
+ fields remain hidden.
+ + Fixed
20080226-RR-01
- Bugs:
Modified: branches/pFuel-0-04-stable/pFuel/Src/graph.c
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/graph.c 2008-02-26 13:56:06 UTC (rev 507)
+++ branches/pFuel-0-04-stable/pFuel/Src/graph.c 2008-02-27 14:47:47 UTC (rev 508)
@@ -432,14 +432,16 @@
if (globalPrefs.flags & ONE_HAND_MODE)
{
+ FormType *frm = FrmGetActiveForm();
+ // Handle the vchrRockerCenter
+ handled = Navigate(navTable, NB_NAVROW, NB_NAVCOL, &navRow, &navCol, chr, 0);
+ if (DateFilterCheckbox == navTable[(NB_NAVCOL * navRow) + navCol] )
{
- // Handle the vchrRockerCenter
- handled = Navigate(navTable, NB_NAVROW, NB_NAVCOL, &navRow, &navCol, chr, 0);
- if (DateFilterCheckbox == navTable[(NB_NAVCOL * navRow) + navCol] )
- {
- datefilterset = CtlGetValue(GetObjectPtr(DateFilterCheckbox));
- GraphDrawGraph(FrmGetActiveForm(), CurrentCategory, graphType);
- }
+ datefilterset = CtlGetValue(GetObjectPtr(DateFilterCheckbox));
+ FormSetDates(frm, datefilterset, DateFilterCheckbox,
+ FromSelTrigger, ToSelTrigger, DateFilterToLabel);
+ GraphDrawGraph(frm, CurrentCategory, graphType);
+ SetFocus(DateFilterCheckbox, 1);
}
} // End of if ONE_HAN_MODE
@@ -539,6 +541,8 @@
FrmDrawForm(frm);
error = GraphDrawGraph(frm, CurrentCategory, graphType);
+ FormSetDates(frm, datefilterset, DateFilterCheckbox,
+ FromSelTrigger, ToSelTrigger, DateFilterToLabel);
if (globalPrefs.flags & ONE_HAND_MODE)
{
Modified: branches/pFuel-0-04-stable/pFuel/Src/utility.c
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/utility.c 2008-02-26 13:56:06 UTC (rev 507)
+++ branches/pFuel-0-04-stable/pFuel/Src/utility.c 2008-02-27 14:47:47 UTC (rev 508)
@@ -1407,7 +1407,7 @@
{
const Char *from, *to;
- FrmShowObject(frm, FrmGetObjectIndex(frm, checkBox));
+ //FrmShowObject(frm, FrmGetObjectIndex(frm, checkBox));
CtlSetValue(GetObjectPtr(checkBox), filter);
if (filter)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pa...@us...> - 2008-02-26 13:56:23
|
Revision: 507
http://pfuel.svn.sourceforge.net/pfuel/?rev=507&view=rev
Author: papaDoc
Date: 2008-02-26 05:56:06 -0800 (Tue, 26 Feb 2008)
Log Message:
-----------
20080226-RR-01
- Bugs:
- Bug #1902151: reported by Markus by email.
1.) Prerequisites: Add a sufficient number of records, so that not
all records fit on the pFuel overview screen
- scroll down in the table a bit, so that the first visible row on
the screen is not the first row of the table.
- navigate to the table with the hardware buttons.
- press the "Memo" button to select the first row of the table.
- press the "up" hardware button (repeatedly).
* expected behaviour: the table should be scrolled up until the first
visible row = the first row of the table.
* actual behaviour: scrolling upwards via the "up" hardware button
is not working.
(scrolling down with the "down" hardware button is working fine).
+ Fixed
Modified Paths:
--------------
branches/pFuel-0-04-stable/pFuel/CHANGELOG
branches/pFuel-0-04-stable/pFuel/Src/navigation.c
Modified: branches/pFuel-0-04-stable/pFuel/CHANGELOG
===================================================================
--- branches/pFuel-0-04-stable/pFuel/CHANGELOG 2008-02-22 14:49:35 UTC (rev 506)
+++ branches/pFuel-0-04-stable/pFuel/CHANGELOG 2008-02-26 13:56:06 UTC (rev 507)
@@ -13,6 +13,24 @@
#------------------------------------------------------------
Version 0.04.06
+
+20080226-RR-01
+ - Bugs:
+ - Bug #1902151: reported by Markus by email.
+ 1.) Prerequisites: Add a sufficient number of records, so that not
+ all records fit on the pFuel overview screen
+ - scroll down in the table a bit, so that the first visible row on
+ the screen is not the first row of the table.
+ - navigate to the table with the hardware buttons.
+ - press the "Memo" button to select the first row of the table.
+ - press the "up" hardware button (repeatedly).
+ * expected behaviour: the table should be scrolled up until the first
+ visible row = the first row of the table.
+ * actual behaviour: scrolling upwards via the "up" hardware button
+ is not working.
+ (scrolling down with the "down" hardware button is working fine).
+ + Fixed
+
20080222-RR-01
- Development:
- Code clean up.
Modified: branches/pFuel-0-04-stable/pFuel/Src/navigation.c
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/navigation.c 2008-02-22 14:49:35 UTC (rev 506)
+++ branches/pFuel-0-04-stable/pFuel/Src/navigation.c 2008-02-26 13:56:06 UTC (rev 507)
@@ -796,10 +796,9 @@
rowInTable, DmNumRecordsInCategory(pFuelDB, CurrentCategory));
if (rowInTable >= 1)
- {
SetTableFocus(tableID, rowInTable, 0);
+
--rowInTable;
- }
if (rowInTable < 0)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pa...@us...> - 2008-02-22 14:49:30
|
Revision: 506
http://pfuel.svn.sourceforge.net/pfuel/?rev=506&view=rev
Author: papaDoc
Date: 2008-02-22 06:49:35 -0800 (Fri, 22 Feb 2008)
Log Message:
-----------
Version 0.04.06
20080222-RR-01
- Development:
- Code clean up.
Modified Paths:
--------------
branches/pFuel-0-04-stable/pFuel/CHANGELOG
branches/pFuel-0-04-stable/pFuel/Src/maintenance.c
branches/pFuel-0-04-stable/pFuel/Src/maintenance.h
branches/pFuel-0-04-stable/pFuel/Src/navigation.c
branches/pFuel-0-04-stable/pFuel/Src/pFuel.c
branches/pFuel-0-04-stable/pFuel/Src/pFuel.rcp.in
branches/pFuel-0-04-stable/pFuel/Src/pfRecord.c
branches/pFuel-0-04-stable/pFuel/Src/utils.h
Modified: branches/pFuel-0-04-stable/pFuel/CHANGELOG
===================================================================
--- branches/pFuel-0-04-stable/pFuel/CHANGELOG 2008-02-21 14:19:35 UTC (rev 505)
+++ branches/pFuel-0-04-stable/pFuel/CHANGELOG 2008-02-22 14:49:35 UTC (rev 506)
@@ -12,6 +12,62 @@
#
#------------------------------------------------------------
+Version 0.04.06
+20080222-RR-01
+ - Development:
+ - Code clean up.
+
+
+20080221-RR-01
+ - Features:
+ - Add One Hand More to the Stat Form
+ - Bugs:
+ - In the Add form In the One Hand Mode going up twice. The Date countour is
+ not updated correctly.
+ - Bug #1890272: Buig report submitted by hetos
+ 1.)
+ - add a new record
+ - navigate all the way to the top (the field where you can choose between
+ diferrent cars)
+ - press the "down" hardware button
+ - the cursor starts blinking in the field where the mileage is entered
+ giving the impression that now htis field is selected (which is not the
+ expected bahaviour)
+ - actually the "Date" field is selected (which is the expected bahaviour)
+ - Bug In One Hand Mode selecting the filter does not display the date in the Graph and
+ Stat form.
+ 6.)
+ a)
+ - on the pFuel overview screen navigate to the top to the first table row
+ - select this row (Memo hardware button) -> row is now highlighted
+ - press agin the "Memo" button to show the details of the selected record.
+ - details screen of the selected record is completely empty. Only in the
+ "Date" field there is some very long number (no date).
+ b)
+ - press the "Cancel" soft button
+ - exception "DataMgr.c, Line:8589,Index out of range
+ 3.)
+ - on the pFuel overview screen navigate to the top to the first table row
+ - select this row (Memo hardware button) -> row is now highlighted
+ - navigate down (down hardware button)
+ - while navigating downwards, additional rows are highlighted, but the
+ previously selected rows also stay highlighted giving the impression of
+ some sort of "multi selection". Is this really the intended behaviour?
+ No !
+ - In the Add Form release the record only when necessary
+ - Doing the following step can crash the application or delete the record
+ - In the Main form:
+ - Move up with the hardware key,
+ - Select row with the memo key,
+ - Tap on the selected row with the pen
+ - In the Record form hit cancel
+ - In the Main form Move up with the hardware key,
+ - Development:
+ - Redo how the graph form is draw. Don't redraw the form twice. Redraw only the
+ graphic part.
+ - Draw the Add Form only once.
+
+
20080213-RR-01
- Bugs:
- Bug #1890272: Buig report submitted by hetos
Modified: branches/pFuel-0-04-stable/pFuel/Src/maintenance.c
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/maintenance.c 2008-02-21 14:19:35 UTC (rev 505)
+++ branches/pFuel-0-04-stable/pFuel/Src/maintenance.c 2008-02-22 14:49:35 UTC (rev 506)
@@ -45,7 +45,7 @@
static void saveMtnCopyForEvery(CompleteMaintenance *cMtn, UInt16 category,
UInt16 index) MTN_SECTION;
static Int16 displayAlert(CompleteMaintenance *cMtn, double odometer, Char* trigger,
- UInt16 flag,UInt16 category, UInt16 index) MTN_SECTION;
+ UInt16 flag,UInt16 category, UInt16 index) MTN_SECTION;
static UInt32 sizeofMtn(UInt16 flags) MTN_SECTION;
static Boolean getLastTwoPFRecord(PFRecord *rec1,
PFRecord *rec2, UInt16 category) MTN_SECTION;
@@ -114,31 +114,31 @@
if (rep == 0 && ( (fr1->flags&MTN_ODO) || fr2->flags&MTN_ODO) )
{
- if ( fr1->flags&MTN_ODO && !(fr2->flags&MTN_ODO) )
- rep = -1;
- else if ( !(fr1->flags&MTN_ODO) && fr2->flags&MTN_ODO)
- rep = 1;
- else
- {
+ if ( fr1->flags&MTN_ODO && !(fr2->flags&MTN_ODO) )
+ rep = -1;
+ else if ( !(fr1->flags&MTN_ODO) && fr2->flags&MTN_ODO)
+ rep = 1;
+ else
+ {
- offset1 = offsetMtn(fr1->flags, MTN_ODO);
- offset2 = offsetMtn(fr2->flags, MTN_ODO);
+ offset1 = offsetMtn(fr1->flags, MTN_ODO);
+ offset2 = offsetMtn(fr2->flags, MTN_ODO);
- { // DEBUG
+ { // DEBUG
#if REPORTER_TRACES
- Char str1[20], str2[20];
- FormatFloat(str1, *((float *)(rec1 + offset1)), 2);
- FormatFloat(str2, *((float *)(rec2 + offset2)), 2);
- TRACE("CompareMtn: odo offset = %ld %ld", offset1, offset2);
- TRACE("CompareMtn: odo value = %s %s", str1, str2);
+ Char str1[20], str2[20];
+ FormatFloat(str1, *((float *)(rec1 + offset1)), 2);
+ FormatFloat(str2, *((float *)(rec2 + offset2)), 2);
+ TRACE("CompareMtn: odo offset = %ld %ld", offset1, offset2);
+ TRACE("CompareMtn: odo value = %s %s", str1, str2);
#endif
- }
-
- if ( *((float *)(rec1 + offset1)) < *((float *)(rec2 + offset2)) )
- rep = -1;
- else if ( *((float *)(rec1 + offset1)) > *((float *)(rec2 + offset2)) )
- rep = 1;
}
+
+ if ( *((float *)(rec1 + offset1)) < *((float *)(rec2 + offset2)) )
+ rep = -1;
+ else if ( *((float *)(rec1 + offset1)) > *((float *)(rec2 + offset2)) )
+ rep = 1;
+ }
}
if ( (rep == 0) && (fr1->flags&MTN_DATE || fr2->flags&MTN_DATE))
@@ -169,16 +169,16 @@
{ // DEBUG
#ifdef REPORTER_TRACES
- Char str2[20];
- Int16 year;
- Int16 month;
- Int16 day;
- DateType *date = (DateType *)(rec2 + offset2);
- year = date->year + 1904;
- month = date->month;
- day = date->day;
- DateToAscii(month, day, year, longDateFormat, str2);
- TRACE("CompareMtn: Date2 value = %s rep=%d", str2, rep);
+ Char str2[20];
+ Int16 year;
+ Int16 month;
+ Int16 day;
+ DateType *date = (DateType *)(rec2 + offset2);
+ year = date->year + 1904;
+ month = date->month;
+ day = date->day;
+ DateToAscii(month, day, year, longDateFormat, str2);
+ TRACE("CompareMtn: Date2 value = %s rep=%d", str2, rep);
#endif
}
@@ -190,23 +190,23 @@
{ // DEBUG
#if REPORTER_TRACES
- Char str1[20], str2[20];
- Int16 year;
- Int16 month;
- Int16 day;
- DateType *date = (DateType *)(rec1 + offset1);
- year = date->year + 1904;
- month = date->month;
- day = date->day;
- DateToAscii(month, day, year, longDateFormat, str1);
- date = (DateType *)(rec2 + offset2);
- year = date->year + 1904;
- month = date->month;
- day = date->day;
- DateToAscii(month, day, year, longDateFormat, str2);
+ Char str1[20], str2[20];
+ Int16 year;
+ Int16 month;
+ Int16 day;
+ DateType *date = (DateType *)(rec1 + offset1);
+ year = date->year + 1904;
+ month = date->month;
+ day = date->day;
+ DateToAscii(month, day, year, longDateFormat, str1);
+ date = (DateType *)(rec2 + offset2);
+ year = date->year + 1904;
+ month = date->month;
+ day = date->day;
+ DateToAscii(month, day, year, longDateFormat, str2);
- TRACE("CompareMtn: Date offset = %ld %ld", offset1, offset2);
- TRACE("CompareMtn: Date value = %s %s", str1, str2);
+ TRACE("CompareMtn: Date offset = %ld %ld", offset1, offset2);
+ TRACE("CompareMtn: Date value = %s %s", str1, str2);
#endif
} // DEBUG
@@ -603,7 +603,7 @@
{
MemHandle h = 0;
Maintenance *rec = NULL;
- void *p;
+ void *p;
h = DmQueryRecord(pFuelMtnDB, index);
@@ -738,12 +738,12 @@
//
// #######################################################
- MemHandle h;
- Maintenance *rec;
+ MemHandle h;
+ Maintenance *rec;
UInt16 attr;
Err error = 0;
UInt32 size;
- UInt32 offset;
+ UInt32 offset;
TRACE("MtnRecSaveData: start cat=%hu index=%hu", category, index);
@@ -995,7 +995,7 @@
changed = true;
cMtn->date = CurrentDate;
- }
+ }
if (flags&MTN_ODO)
@@ -1180,78 +1180,78 @@
if (GetObjectType(fldID) == frmFieldObj)
{
- hnd = (MemHandle)FldGetTextHandle(fldP);
- if (hnd)
- {
- StrCopy(str, MemHandleLock(hnd));
- MemHandleUnlock(hnd);
- }
- else
- str[0] = '\0';
+ hnd = (MemHandle)FldGetTextHandle(fldP);
+ if (hnd)
+ {
+ StrCopy(str, MemHandleLock(hnd));
+ MemHandleUnlock(hnd);
+ }
+ else
+ str[0] = '\0';
- length = StrLen(str);
+ length = StrLen(str);
- if (vchrRockerCenter != chr)
- {
- if (changeDigit)
- {
- FldGetSelection(fldP, &start, &end);
- if (start != end)
- {
- if (vchrRockerLeft == chr)
+ if (vchrRockerCenter != chr)
+ {
+ if (changeDigit)
+ {
+ FldGetSelection(fldP, &start, &end);
+ if (start != end)
+ {
+ if (vchrRockerLeft == chr)
handled = OneHandModeLeftFldNum(fldID, str, length,
(fldID == MtnRecDescField ? 'a' : '1'),
(fldID == MtnRecDescField ? false : true));
- if (vchrRockerRight == chr)
+ if (vchrRockerRight == chr)
handled = OneHandModeRightFldNum(fldID, str, length,
(fldID == MtnRecDescField ? 'a' : '0'),
(fldID == MtnRecDescField ? false : true));
- if (vchrRockerUp == chr)
- {
+ if (vchrRockerUp == chr)
+ {
handled = OneHandModeUpDownFldNum(fldID, str, true,
(fldID == MtnRecDescField ? false : true));
- }
+ }
- if (vchrRockerDown == chr)
- {
+ if (vchrRockerDown == chr)
+ {
handled = OneHandModeUpDownFldNum(fldID, str, false,
(fldID == MtnRecDescField ? false : true));
- }
- }
- }
- }
- else
+ }
+ }
+ }
+ }
+ else
{ // vchrRockerCenter == chr
- if (!changeDigit)
- {
- changeDigit = true;
- if (0 == length)
+ if (!changeDigit)
+ {
+ changeDigit = true;
+ if (0 == length)
{
if (fldID == MtnRecDescField)
OneHandModeRightFldNum(fldID, str, length, 'a', false); // Text mode add a 'a'
else
OneHandModeLeftFldNum(fldID, str, length, '0', true); // Add a zero
- length = 1;
- }
+ length = 1;
+ }
- end = length;
- start = end-1;
- FldSetSelection(fldP, start, end);
- }
- else
- {
- changeDigit = false;
- start = 0;
- end = 0;
- FldSetSelection(fldP, start, end);
- }
- handled = true;
- }
+ end = length;
+ start = end-1;
+ FldSetSelection(fldP, start, end);
+ }
+ else
+ {
+ changeDigit = false;
+ start = 0;
+ end = 0;
+ FldSetSelection(fldP, start, end);
+ }
+ handled = true;
+ }
}
// There is focus but we did not handle the action yet
@@ -1263,7 +1263,7 @@
if (!handled && (GetObjectType(fldID) == frmFieldObj) )
{
- handled = FldHandleEvent(fldP, eventP);
+ handled = FldHandleEvent(fldP, eventP);
}
}
@@ -1307,7 +1307,7 @@
{
UInt16 i;
Boolean handled = true;
- FormType *frm = FrmGetActiveForm();
+ FormType *frm = FrmGetActiveForm();
// WChar chr = eventP->data.keyDown.chr; // we will need it later
CompleteMaintenance cMtn;
static Boolean toBeSaved = true;
@@ -1328,7 +1328,7 @@
TRACE("MtnRecFHE: OK: Ici 2");
}
TRACE("MtnRecFHE: OK: Stop");
- break;
+ break;
case CancelButton :
TRACE("MtnRecFHE: Cancel: Start");
toBeSaved = false;
@@ -1677,7 +1677,7 @@
RectangleType *bounds)
{
MemHandle recHandle = 0;
- CompleteMaintenance cMtn;
+ CompleteMaintenance cMtn;
Maintenance *mtnRec = NULL;
UInt16 recordNum = 0;
@@ -1739,10 +1739,10 @@
}
else
{
- DateType date;
- Int16 year;
- Int16 month;
- Int16 day;
+ DateType date;
+ Int16 year;
+ Int16 month;
+ Int16 day;
UInt32 mtnDays = DateToDays(cMtn.date);
if (cMtn.flags&MTN_EVERY_DATE)
{
@@ -1876,11 +1876,11 @@
Boolean
MtnFormHandleEvent(EventType *eventP)
{
- Boolean handled = true;
- FormType *frm = FrmGetActiveForm();
+ Boolean handled = true;
+ FormType *frm = FrmGetActiveForm();
Coord x, y, width;
- static Boolean tblPenUp;
+ static Boolean tblPenUp;
static UInt16 tblColumn;
switch (eventP->eType)
@@ -1895,7 +1895,7 @@
break;
case MtnAddButton :
- {
+ {
PFRecord m1, m2;
getLastTwoPFRecord(&m1, &m2, CurrentCategory);
if ( (CurrentRecord = CreateMtnRecord(CurrentCategory)) != noRecordSelected)
@@ -1904,8 +1904,8 @@
AddingRecord = true;
FrmGotoForm(MtnRecForm);
}
- }
- break;
+ }
+ break;
case MtnCarPopTrigger :
if ( SelectCategory(frm, MtnCarPopTrigger, MtnCarList, true, &CurrentCategory) )
@@ -2037,36 +2037,17 @@
handled = false; // ???????????????
TRACE("MFHE: Open: Stop");
- break;
- case frmUpdateEvent:
- TRACE("MFHE: frmUpdateEvent");
- if (eventP->data.frmUpdate.updateCode != frmRedrawOnlyHeaderCode)
- {
- FrmDrawForm(frm);
- }
- MtnDrawTblHeader(frm);
- handled = true;
break;
-// case keyDownEvent: // Handle the physical scroll buttons
-// TRACE("MFHE: keyDownEvent");
-// if (chr == pageUpChr && !AddingRecord)
+ // This can be removed ?? 2008/02/22
+// case frmUpdateEvent:
+// TRACE("MFHE: frmUpdateEvent");
+// if (eventP->data.frmUpdate.updateCode != frmRedrawOnlyHeaderCode)
// {
-// TRACE("MFHE: Scroll up");
-// TableScrollPage(pFuelMtnDB, Table, &MtnTopVisibleRecord, &CurrentRecord,
-// winUp, CurrentCategory, &MtnFormDrawRecord);
+// FrmDrawForm(frm);
// }
-// else if (chr == pageDownChr && !AddingRecord)
-// {
-// TRACE("MFHE: Scroll down");
-// TableScrollPage(pFuelMtnDB, Table, &MtnTopVisibleRecord, &CurrentRecord,
-// winDown, CurrentCategory, &MtnFormDrawRecord);
-// }
-// else
-// handled = MtnRecHandleField(eventP);
+// MtnDrawTblHeader(frm);
+// handled = true;
// break;
-// case frmUpdateEvent:
-// TRACE("MFHE: frmUpdateEvent");
-// break;
case frmCloseEvent:
TRACE("MtnFormHandleEvent: Close");
MenuEraseStatus(0);
Modified: branches/pFuel-0-04-stable/pFuel/Src/maintenance.h
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/maintenance.h 2008-02-21 14:19:35 UTC (rev 505)
+++ branches/pFuel-0-04-stable/pFuel/Src/maintenance.h 2008-02-22 14:49:35 UTC (rev 506)
@@ -44,9 +44,9 @@
EXTERN UInt16 MtnTopVisibleRecord INIT(0);
enum MTN_FLAGS {
- MTN_DAYS = 0x001, ///< Used to know whic of the EveryDate list is selected
- MTN_WEEKS = 0x002, ///< Used to know whic of the EveryDate list is selected
- MTN_MONTHS = 0x004, ///< Used to know whic of the EveryDate list is selected
+ MTN_DAYS = 0x001, ///< Used to know which of the EveryDate list is selected
+ MTN_WEEKS = 0x002, ///< Used to know which of the EveryDate list is selected
+ MTN_MONTHS = 0x004, ///< Used to know which of the EveryDate list is selected
MTN_EVERY_DATE_MASK = MTN_DAYS | MTN_WEEKS | MTN_MONTHS,
MTN_DATE = 0x008,
MTN_ODO = 0x010,
Modified: branches/pFuel-0-04-stable/pFuel/Src/navigation.c
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/navigation.c 2008-02-21 14:19:35 UTC (rev 505)
+++ branches/pFuel-0-04-stable/pFuel/Src/navigation.c 2008-02-22 14:49:35 UTC (rev 506)
@@ -1,59 +1,59 @@
/**
- *****************************************************************************
- * Thuis file regroup function related to navigation and one hand mode.
- *
- *
- * @file navigation.h
- *
- * @par Project: pFuel
- *
- * @author Remi Ricard
- *
- * @par Created: 24 Jul 2006
- *
- * $Date: 2007-09-27 11:43:14 $
- *
- * $Revision: 1.4.2.2 $
- *
- * @remarks .
- * @par
- *
- *
- * ControlStyleType
- * ----------------
- * buttonCtl
- * Button. Buttons display a text label in a box. The
- * ButtonFrameType specifies the type of box.
- * pushButtonCtl
- * Push button. Selecting a push button inverts its display so that
- * it appears highlighted.
- * checkboxCtl
- * Check box. Check boxes display a setting of either on (checked)
- * or off (unchecked)
- * popupTriggerCtl
- * Popup trigger. Popup triggers display a graphic element followed
- * by a text label. They are used to display popup lists.
- * selectorTriggerCtl
- * Selector trigger. Selector triggers display a text label
- * surrounded by a gray rectangular frame. The control expands or
- * contracts to the width of the new label.
- * repeatingButtonCtl
- * Repeating button. Repeating buttons look like buttons; however, a
- * repeating button is repeatedly selected if the user holds the pen
- * on it.
- * sliderCtl
- * Slider. Sliders display two bitmaps: one representing the current
- * value (the thumb), and another representing the scale of available
- * values. The user can slide the thumb to the left or the right to
- * change the value.
- * feedbackSliderCtl
- * Feedback slider. A feedback slider looks like a slider; however, a
- * feedback slider sends events each time the thumb moves while the
- * pen is still down. A regular slider sends an event only when the
- * user releases the pen.
- *
- * @note Button for which objID & 0x1000 == 1 ahve no frame ( 0x1000 == 4096)
- **************************************************************************///
+*****************************************************************************
+* Thuis file regroup function related to navigation and one hand mode.
+*
+*
+* @file navigation.h
+*
+* @par Project: pFuel
+*
+* @author Remi Ricard
+*
+* @par Created: 24 Jul 2006
+*
+* $Date: 2007-09-27 11:43:14 $
+*
+* $Revision: 1.4.2.2 $
+*
+* @remarks .
+* @par
+*
+*
+* ControlStyleType
+* ----------------
+* buttonCtl
+* Button. Buttons display a text label in a box. The
+* ButtonFrameType specifies the type of box.
+* pushButtonCtl
+* Push button. Selecting a push button inverts its display so that
+* it appears highlighted.
+* checkboxCtl
+* Check box. Check boxes display a setting of either on (checked)
+* or off (unchecked)
+* popupTriggerCtl
+* Popup trigger. Popup triggers display a graphic element followed
+* by a text label. They are used to display popup lists.
+* selectorTriggerCtl
+* Selector trigger. Selector triggers display a text label
+* surrounded by a gray rectangular frame. The control expands or
+* contracts to the width of the new label.
+* repeatingButtonCtl
+* Repeating button. Repeating buttons look like buttons; however, a
+* repeating button is repeatedly selected if the user holds the pen
+* on it.
+* sliderCtl
+* Slider. Sliders display two bitmaps: one representing the current
+* value (the thumb), and another representing the scale of available
+* values. The user can slide the thumb to the left or the right to
+* change the value.
+* feedbackSliderCtl
+* Feedback slider. A feedback slider looks like a slider; however, a
+* feedback slider sends events each time the thumb moves while the
+* pen is still down. A regular slider sends an event only when the
+* user releases the pen.
+*
+* @note Button for which objID & 0x1000 == 1 ahve no frame ( 0x1000 == 4096)
+**************************************************************************///
//234567890123456789012345678901234567890123456789012345678901234567890123456789
// 1 2 3 4 5 6 7
#define NAVIGATION_C
@@ -151,7 +151,7 @@
*///
Boolean
OneHandModeRightFldNum(UInt16 fldID, Char *str, UInt16 length, Char starting,
- Boolean numFldOnly)
+ Boolean numFldOnly)
{
UInt16 start, end;
FieldType *fld = GetObjectPtr(fldID);
@@ -278,11 +278,9 @@
{
TRACE("UpdateFrame: no focus");
-
WinEraseRectangleFrame(focusFrame, &boldRect);
FrmHideObject(frmP, idx);
FrmShowObject(frmP, idx);
- //WinDrawRectangleFrame(objFrame, &rect);
}
}
@@ -330,8 +328,8 @@
// This is used if we want only one cell
if (FrmGetFormPtr(MainForm) == frm )
{
- i = 0;
- nb = 1;
+ i = 0;
+ nb = 1;
}
else if ( FrmGetFormPtr(MtnForm) == frm )
{
@@ -360,7 +358,7 @@
}
/**
- * This function check if an object is "focusable".
+ * This function check if an object is "focussable".
* i.e. For a regular object this means not hidden.
* For a table this means having at leat a row.
*
@@ -375,7 +373,7 @@
{
case frmTableObj:
{
- DmOpenRef db;
+ DmOpenRef db = pFuelDB;
FormType *frm = FrmGetActiveForm();
@@ -418,8 +416,8 @@
default:
break;
}
- return true;
- }
+ return true;
+ }
return false;
}
@@ -451,37 +449,37 @@
FormObjectKind kind = GetObjectType(objID);
switch (kind)
{
- case frmListObj:
+ case frmListObj:
UpdateFrame(objID, noFrame, popupFrame, focus);
- break;
+ break;
case frmTableObj:
SetTableFocus(objID, 0, (focus & NAV_FOCUS ? (focus | NAV_TABLE_FOCUS) : focus) );
- break;
+ break;
- case frmControlObj:
- {
- ControlStyleType style = CtlGlueGetControlStyle(GetObjectPtr(objID));
+ case frmControlObj:
+ {
+ ControlStyleType style = CtlGlueGetControlStyle(GetObjectPtr(objID));
- switch (style)
- {
- case buttonCtl:
- if (objID & NO_BUTTON_FRAME)
+ switch (style)
+ {
+ case buttonCtl:
+ if (objID & NO_BUTTON_FRAME)
UpdateFrame(objID, noFrame, roundFrame, focus);
- else
+ else
UpdateFrame(objID, roundFrame, boldRoundFrame, focus);
break;
case pushButtonCtl:
UpdateFrame(objID, simpleFrame, popupFrame, focus);
TRACE("Set Focus to %hu", objID);
- break;
- case checkboxCtl:
+ break;
+ case checkboxCtl:
UpdateFrame(objID, noFrame, boldRoundFrame, focus);
- break;
- case selectorTriggerCtl:
+ break;
+ case selectorTriggerCtl:
UpdateFrame(objID, simpleFrame, popupFrame, focus);
- break;
- case popupTriggerCtl:
+ break;
+ case popupTriggerCtl:
UpdateFrame(objID, noFrame, popupFrame, focus);
// if (0 == focus)
// {
@@ -495,30 +493,30 @@
// // after the SetFocus
// FrmUpdateForm(frmP, frmRedrawOnlyHeaderCode);
// }
- break;
- default: // Used to remove warnings
- break;
- }
- }
- break;
+ break;
+ default: // Used to remove warnings
+ break;
+ }
+ }
+ break;
- case frmFieldObj:
+ case frmFieldObj:
if (focus)
- FrmSetFocus(frmP, FrmGetObjectIndex(frmP, objID));
- else
- FldReleaseFocus(GetObjectPtr(objID));
- break;
+ FrmSetFocus(frmP, FrmGetObjectIndex(frmP, objID));
+ else
+ FldReleaseFocus(GetObjectPtr(objID));
+ break;
- default: // Used to remove warnings
- break;
+ default: // Used to remove warnings
+ break;
}
}
else
{
if (focus)
- FrmGlueNavObjectTakeFocus(frmP, objID);
+ FrmGlueNavObjectTakeFocus(frmP, objID);
else
- FrmGlueNavRemoveFocusRing(frmP);
+ FrmGlueNavRemoveFocusRing(frmP);
}
TRACE("SetFocus: end: true");
@@ -649,7 +647,7 @@
break;
- // Move up
+ // Move up
case vchrRockerUp:
case chrUpArrow:
case vchrPrevField:
@@ -759,12 +757,12 @@
{
switch(chr)
{
- // Move down
- case vchrRockerDown:
- case chrDownArrow:
- case vchrNextField:
- case chrHorizontalTabulation:
- case chrLineFeed:
+ // Move down
+ case vchrRockerDown:
+ case chrDownArrow:
+ case vchrNextField:
+ case chrHorizontalTabulation:
+ case chrLineFeed:
TRACE("NavigateTable: vchrRockerDown");
if ( rowInTable < (nbRecords-1) )
@@ -790,9 +788,9 @@
SetTableFocus(tableID, rowInTable, *focus);
break;
- // Move up
- case vchrRockerUp:
- case chrUpArrow:
+ // Move up
+ case vchrRockerUp:
+ case chrUpArrow:
case vchrPrevField:
TRACE("NavigateTable: vchrRockerUp rowInTable=%d numRecord=%hu",
rowInTable, DmNumRecordsInCategory(pFuelDB, CurrentCategory));
@@ -816,24 +814,24 @@
break;
- case vchrRockerLeft:
- TRACE("NavigateTable: vchrRockerLeft");
+ case vchrRockerLeft:
+ TRACE("NavigateTable: vchrRockerLeft");
- // Keep only the first column selected
- *focus &= ~NAV_ROW_FOCUS;
+ // Keep only the first column selected
+ *focus &= ~NAV_ROW_FOCUS;
SetTableFocus(tableID, rowInTable, *focus);
break;
-// case vchrRockerRight:
-// *focus |= (NAV_ROW_FOCUS);
+// case vchrRockerRight:
+// *focus |= (NAV_ROW_FOCUS);
-// SetTableFocus(tableID, rowInTable, *focus);
-// break;
+// SetTableFocus(tableID, rowInTable, *focus);
+// break;
- default:
- return false;
+ default:
+ return false;
}
handled = true;
} // End of row focus
@@ -914,19 +912,19 @@
{
case vchrRockerCenter :
Select(objID, nbRow, row, col, &focus);
- break;
+ break;
- case vchrRockerLeft:
+ case vchrRockerLeft:
TRACE("Navigate: Left");
- // Move left until we find something on the left or go out of the table
- // We also check for col < 255 since --((UInt16) 0) =>
- for (--(*col); ((*col) >= 0) && (*col) < 65535 &&
- ( !(objID = navTable[nbCol * (*row) + (*col)]) || // realy a = not a ==
- !IsObjectFocusable(objID) );
- --(*col))
- /* Everything is done in the for loop */ ;
+ // Move left until we find something on the left or go out of the table
+ // We also check for col < 255 since --((UInt16) 0) =>
+ for (--(*col); ((*col) >= 0) && (*col) < 65535 &&
+ ( !(objID = navTable[nbCol * (*row) + (*col)]) || // realy a = not a ==
+ !IsObjectFocusable(objID) );
+ --(*col))
+ /* Everything is done in the for loop */ ;
- if ((*col) >= 0 && (*col) < 65535 && IsObjectFocusable(objID) )
+ if ((*col) >= 0 && (*col) < 65535 && IsObjectFocusable(objID) )
{
// Nothing to do here
}
@@ -935,21 +933,20 @@
*col = tmpCol;
return false;
}
- break;
+ break;
- case vchrRockerRight:
- {
+ case vchrRockerRight:
+ {
TRACE("Navigate: Right");
- tmpCol = (*col);
- // Move right until we find something on the left or go out of the table
- for (++(*col); ((*col) < nbCol) &&
- ( !(objID = navTable[nbCol * (*row) + (*col)]) || // realy a = not a ==
- !IsObjectFocusable(objID) );
- ++(*col))
- /* Everything is done in the for loop */ ;
+ // Move right until we find something on the left or go out of the table
+ for (++(*col); ((*col) < nbCol) &&
+ ( !(objID = navTable[nbCol * (*row) + (*col)]) || // realy a = not a ==
+ !IsObjectFocusable(objID) );
+ ++(*col))
+ /* Everything is done in the for loop */ ;
- if ((*col) < nbCol && IsObjectFocusable(navTable[nbCol * (*row) + (*col)]) )
+ if ((*col) < nbCol && IsObjectFocusable(navTable[nbCol * (*row) + (*col)]) )
{
// Nothing to do here
}
@@ -958,20 +955,20 @@
*col = tmpCol;
return false;
}
- }
+ }
- break;
+ break;
- // Move down
- case vchrRockerDown:
- case chrDownArrow:
- case vchrNextField:
- case chrHorizontalTabulation:
- case chrLineFeed:
+ // Move down
+ case vchrRockerDown:
+ case chrDownArrow:
+ case vchrNextField:
+ case chrHorizontalTabulation:
+ case chrLineFeed:
TRACE("Navigate: Down");
if ( (*row) < (nbRow -1) )
- {
- if ( (objID = navTable[(nbCol * (++(*row))) + (*col)]) && // realy a = not a ==
+ {
+ if ( (objID = navTable[(nbCol * (++(*row))) + (*col)]) && // realy a = not a ==
IsObjectFocusable(objID) )
{
// Nothing to do here
@@ -985,27 +982,27 @@
// Nothing to do here
}
else
- {
- *row = tmpRow;
+ {
+ *row = tmpRow;
*col = tmpCol;
return false;
- }
- }
+ }
+ }
- break;
+ break;
- // Move up
- case vchrRockerUp:
- case chrUpArrow:
- case vchrPrevField:
+ // Move up
+ case vchrRockerUp:
+ case chrUpArrow:
+ case vchrPrevField:
TRACE("Navigate: Up");
if ( (*row) > 0 )
- {
- if ( (objID = navTable[(nbCol * (--(*row))) + (*col)]) && // realy a = not a ==
+ {
+ if ( (objID = navTable[(nbCol * (--(*row))) + (*col)]) && // realy a = not a ==
IsObjectFocusable(objID) )
- {
+ {
focus |= NAV_TABLE_FOCUS;
- }
+ }
else if( Navigate(navTable, nbRow, nbCol, row, col, vchrRockerLeft,stack) )
{
// Nothing to do here
@@ -1015,21 +1012,20 @@
// Nothing to do here
}
else
- {
- *row = tmpRow;
+ {
+ *row = tmpRow;
*col = tmpCol;
return false;
- }
- }
+ }
+ }
break;
- default:
- return false;
+ default:
+ return false;
}
break;
}
-
--stack;
if (0 == stack)
{
Modified: branches/pFuel-0-04-stable/pFuel/Src/pFuel.c
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/pFuel.c 2008-02-21 14:19:35 UTC (rev 505)
+++ branches/pFuel-0-04-stable/pFuel/Src/pFuel.c 2008-02-22 14:49:35 UTC (rev 506)
@@ -1020,7 +1020,7 @@
case sclExitEvent: // The user has left the pen from the scrollbar
TRACE("MainFormHandleEvent: slcExitEvent");
- // This is the equivalent of scroll up or down2by one line
+ // This is the equivalent of scroll up or down by one line
TopVisibleRecord = RecordInCategory(pFuelDB, CurrentCategory,
eventP->data.sclExit.value,
globalPrefs.ordering);
@@ -1092,9 +1092,8 @@
FormLoadTable(pFuelDB, frm, CurrentRecord, CurrentCategory,
&TopVisibleRecord, &MainFormDrawRecord);
- TRACE("Ici 1");
MainCarsDrawTable(frm);
- TRACE("Ici 2");
+
if (globalPrefs.flags & ONE_HAND_MODE)
{
navRow = NB_NAVROW -1;
@@ -1106,15 +1105,16 @@
navCol = noFocus;
TRACE("MFHE: frmOpenEvent: end");
break;
- case frmUpdateEvent:
- TRACE("MainFormHandleEvent: frmUpdateEvent");
- if (eventP->data.frmUpdate.updateCode != frmRedrawOnlyHeaderCode)
- {
- FrmDrawForm(frm);
- }
- MainCarsDrawTblHeader(frm);
- handled = true;
- break;
+ // Do we really need this ? 2008/02/21
+// case frmUpdateEvent:
+// TRACE("MainFormHandleEvent: frmUpdateEvent");
+// if (eventP->data.frmUpdate.updateCode != frmRedrawOnlyHeaderCode)
+// {
+// FrmDrawForm(frm);
+// }
+// MainCarsDrawTblHeader(frm);
+// handled = true;
+// break;
case frmCloseEvent:
handled = false; // Need false so the program clean the pointers
break;
Modified: branches/pFuel-0-04-stable/pFuel/Src/pFuel.rcp.in
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/pFuel.rcp.in 2008-02-21 14:19:35 UTC (rev 505)
+++ branches/pFuel-0-04-stable/pFuel/Src/pFuel.rcp.in 2008-02-22 14:49:35 UTC (rev 506)
@@ -330,7 +330,7 @@
BUTTON "Done" ID MtnDoneButton AT (1 147 AUTO AUTO) LEFTANCHOR
- BUTTON "Add" ID MtnAddButton AT (PREVRIGHT+4 PREVTOP AUTO 12) LEFTANCHOR
+ BUTTON "Add" ID MtnAddButton AT (PREVRIGHT+4 PREVTOP AUTO AUTO) LEFTANCHOR
END
// Note: The Label "MtnRecOdoUnit" must be large enough to contain the
Modified: branches/pFuel-0-04-stable/pFuel/Src/pfRecord.c
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/pfRecord.c 2008-02-21 14:19:35 UTC (rev 505)
+++ branches/pFuel-0-04-stable/pFuel/Src/pfRecord.c 2008-02-22 14:49:35 UTC (rev 506)
@@ -144,7 +144,6 @@
// table with new records and redraw it.
if (!AddPetrolSaveData())
return;
- TRACE("Ici 6");
DmReleaseRecord(pFuelDB, CurrentRecord, true);
CurrentRecord = newRecord;
@@ -190,14 +189,6 @@
LoadCarPref(&hcCarPref, &cCarPref, CurrentCategory);
}
-// // If old style record, convert it by adding an empty note to the end
-// if (MemHandleSize(recHandle) == sizeof(PFRecord))
-// {
-// MemHandleResize(recHandle, sizeof(PFRecord) + 1);
-// rec = MemHandleLock(recHandle);
-// DmSet(rec, sizeof(PFRecord), 1, 0); // The NULL!
-// MemHandleUnlock(recHandle);
-// }
// Retrieve data into form
rec = MemHandleLock(recHandle);
@@ -213,26 +204,26 @@
CurrentDate = editedRec.date;
DateToAscii(editedRec.date.month, editedRec.date.day,
- editedRec.date.year + 1904, longDateFormat, label);
+ editedRec.date.year + 1904, longDateFormat, label);
CtlSetLabel(GetObjectPtr(AddPetrolDateSelTrigger), label);
CtlSetValue(GetObjectPtr(AddPetrolFullTankCheckbox),
(Int16)(editedRec.flags & FULL_TANK_RECFLAG) ? 1 : 0);
- CtlSetValue(GetObjectPtr(AddPetrolMissingRecordCheckbox),
+ CtlSetValue(GetObjectPtr(AddPetrolMissingRecordCheckbox),
(Int16)(editedRec.flags & MISSING_DATA_RECFLAG));
//TRACE("AddPetrolRetrieveData: date=%s", str);
- if ( AddingRecord && (globalPrefs.flags & TRIP_AS_DEFAULT_FLAG) )
- editedRec.flags |= TRIP_RECFLAG;
+ if ( AddingRecord && (globalPrefs.flags & TRIP_AS_DEFAULT_FLAG) )
+ editedRec.flags |= TRIP_RECFLAG;
- // ### WARNING ERROR If the previous record was trip than this one is trip also
- LstSetSelection(GetObjectPtr(AddPetrolOdometerList),
- ((editedRec.flags & TRIP_RECFLAG) ? 1 : 0));
+ // ### WARNING ERROR If the previous record was trip than this one is trip also
+ LstSetSelection(GetObjectPtr(AddPetrolOdometerList),
+ ((editedRec.flags & TRIP_RECFLAG) ? 1 : 0));
- CtlSetLabel(GetObjectPtr(AddPetrolOdometerSelTrigger),
- LstGetSelectionText(GetObjectPtr(AddPetrolOdometerList),
- ((editedRec.flags & TRIP_RECFLAG) ? 1 : 0)));
+ CtlSetLabel(GetObjectPtr(AddPetrolOdometerSelTrigger),
+ LstGetSelectionText(GetObjectPtr(AddPetrolOdometerList),
+ ((editedRec.flags & TRIP_RECFLAG) ? 1 : 0)));
if (editedRec.odometer || !AddingRecord)
@@ -342,7 +333,7 @@
if ( !(editedRec.flags |= MISSING_DATA_RECFLAG) )
return false;
else
- editedRec.fuel = 0.0;
+ editedRec.fuel = 0.0;
}
else
{
@@ -455,7 +446,7 @@
*
* @param updateCode A code that indicated what changes have been
* made to the view.
- *
+ *
* @return nothing
*
**///
@@ -471,7 +462,7 @@
setCarCategoryLabel(pFuelDB, AddPetrolCarPopTrigger, AddPetrolCarList,
CurrentCategory);
- rep = true;
+ rep = true;
}
TRACE("AddPetrolUpdateDisplay: Stop");
@@ -789,7 +780,7 @@
/* No previous register in this category */
if ( (DmNumRecordsInCategory(pFuelDB, CurrentCategory) > 1) &&
( DmSeekRecordInCategory(pFuelDB, &index, 1, dmSeekBackward,
- CurrentCategory) ) == errNone )
+ CurrentCategory) ) == errNone )
{
recHandle = DmQueryRecord(pFuelDB, index);
if (!recHandle)
@@ -822,6 +813,8 @@
static Int16 released;
WChar chr = eventP->data.keyDown.chr;
+// { // DEVEL
+// float tata;
//TRACE("AddPetrolHandleEvent: start");
@@ -839,7 +832,6 @@
{
released = true;
Resort = true;
- TRACE("Ici 2");
DmReleaseRecord(pFuelDB, CurrentRecord, true);
saveNote(pFuelDB, CurrentRecord, sizeof(PFRecord),
&CurrentNoteHandle);
@@ -887,9 +879,7 @@
break;
case AddPetrolNoteButton :
TRACE("AddPetrolHandleEvent: Note");
- if ( CurrentRecord == noRecordSelected )
- {
- TRACE("Ici 3");
+ if ( CurrentRecord == noRecordSelected ) {
DmReleaseRecord(pFuelDB, CurrentRecord, true);
}
released = true;
@@ -909,8 +899,8 @@
case AddPetrolDateSelTrigger :
TRACE("AddPetrolHandleEvent: DateSelTrigger");
Resort = GetDateAndSelect(&CurrentDate, AddPetrolDateSelTrigger,
- true, "Log Date");
- break;
+ true, "Log Date");
+ break;
case AddPetrolOdometerSelTrigger :
TRACE("AddPetrolHandleEvent: AddPetrolOdometerSelTrigger");
if (LstPopupList(GetObjectPtr(AddPetrolOdometerList)) == TRIP_CHOICE)
@@ -972,7 +962,7 @@
Char *title = (Char *)FrmGetTitle(frmP);
MemHandle hNewTitle;
- TRACE("AddPetrolHandleEvent: OpenEvent");
+ TRACE("APHE: OpenEvent");
// Set the default navigation position on the OK button
@@ -982,7 +972,6 @@
CurrentCategory);
released = false;
-
if (AddingRecord)
{
hNewTitle = DmGetResource(strRsc, STR_TITLE_PETROL_FORM_ADDING);
@@ -999,16 +988,13 @@
if (globalPrefs.flags & ONE_HAND_MODE)
{
changeDigit = false;
-// if (0 != EvtEnqueueKey(vchrRockerCenter, 0, commandKeyMask) )
-// {
-// TRACE("AddPetrolHandleEvent: Problem sending the key event");
-// }
}
+ else
+ navCol = noFocus;
}
else
{
hNewTitle = DmGetResource(strRsc, STR_TITLE_PETROL_FORM_MODIFYING);
-
// We don't need to set the button to true since they are true by default
// in the rcp file
}
@@ -1065,7 +1051,6 @@
{
if (AddPetrolSaveData())
{
- TRACE("Ici 5");
DmReleaseRecord(pFuelDB, CurrentRecord, true);
released = true;
}
@@ -1090,9 +1075,9 @@
handled = false; // We need that to enable the form to clean itself
break;
- default:
- handled = false;
- break;
+ default:
+ handled = false;
+ break;
}
return handled;
Modified: branches/pFuel-0-04-stable/pFuel/Src/utils.h
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/utils.h 2008-02-21 14:19:35 UTC (rev 505)
+++ branches/pFuel-0-04-stable/pFuel/Src/utils.h 2008-02-22 14:49:35 UTC (rev 506)
@@ -197,8 +197,6 @@
/// This value is used by a fuelcursor but not a record
#define TRIP_PREVIOUS_RECFLAG 0x08
-#define frmRedrawOnlyHeaderCode frmRedrawUpdateCode + 1
-
/// The structure of a pFuel record
typedef struct
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pa...@us...> - 2008-02-21 14:19:30
|
Revision: 505
http://pfuel.svn.sourceforge.net/pfuel/?rev=505&view=rev
Author: papaDoc
Date: 2008-02-21 06:19:35 -0800 (Thu, 21 Feb 2008)
Log Message:
-----------
20080221-RR-01
- Features:
- Add One Hand More to the Stat Form
- Bugs:
- In the Add form In the One Hand Mode going up twice. The Date countour is
not updated correctly.
- Bug #1890272: Buig report submitted by hetos
1.)
- add a new record
- navigate all the way to the top (the field where you can choose between
diferrent cars)
- press the "down" hardware button
- the cursor starts blinking in the field where the mileage is entered
giving the impression that now htis field is selected (which is not the
expected bahaviour)
- actually the "Date" field is selected (which is the expected bahaviour)
- Bug In One Hand Mode selecting the filter does not display the date in the Graph and
Stat form.
6.)
a)
- on the pFuel overview screen navigate to the top to the first table row
- select this row (Memo hardware button) -> row is now highlighted
- press agin the "Memo" button to show the details of the selected record.
- details screen of the selected record is completely empty. Only in the
"Date" field there is some very long number (no date).
b)
- press the "Cancel" soft button
- exception "DataMgr.c, Line:8589,Index out of range
3.)
- on the pFuel overview screen navigate to the top to the first table row
- select this row (Memo hardware button) -> row is now highlighted
- navigate down (down hardware button)
- while navigating downwards, additional rows are highlighted, but the
previously selected rows also stay highlighted giving the impression of
some sort of "multi selection". Is this really the intended behaviour?
No !
- In the Add Form release the record only when necessary
- Doing the following step can crash the application or delete the record
- In the Main form:
- Move up with the hardware key,
- Select row with the memo key,
- Tap on the selected row with the pen
- In the Record form hit cancel
- In the Main form Move up with the hardware key,
- Development:
- Redo how the graph form is draw. Don't redraw the form twice. Redraw only the
graphic part.
- Draw the Add Form only once.
Modified Paths:
--------------
branches/pFuel-0-04-stable/pFuel/Src/fuelStats.c
branches/pFuel-0-04-stable/pFuel/Src/graph.c
branches/pFuel-0-04-stable/pFuel/Src/navigation.c
branches/pFuel-0-04-stable/pFuel/Src/pFuel.c
branches/pFuel-0-04-stable/pFuel/Src/pFuel.rcp.in
branches/pFuel-0-04-stable/pFuel/Src/pFuel.ver
branches/pFuel-0-04-stable/pFuel/Src/pfRecord.c
branches/pFuel-0-04-stable/pFuel/Src/utility.c
branches/pFuel-0-04-stable/pFuel/Src/utility.h
Modified: branches/pFuel-0-04-stable/pFuel/Src/fuelStats.c
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/fuelStats.c 2008-02-13 14:26:07 UTC (rev 504)
+++ branches/pFuel-0-04-stable/pFuel/Src/fuelStats.c 2008-02-21 14:19:35 UTC (rev 505)
@@ -24,11 +24,19 @@
#include <PalmOS.h>
#include "pFuelRsc.h"
+#include "utils.h"
+#include "utility.h"
#include "note.h"
-#include "utility.h"
-#include "utils.h"
+#include "navigation.h"
#include "maintenance.h"
+#define OVERALL_NB_NAVROW 3
+#define RECORD_NB_NAVROW 4
+#define NB_NAVCOL 4
+
+static Boolean scrollableUp = true;
+static Boolean scrollableDown = true;
+
static
float calculateMtnAmount(const DateType *fromDate, const DateType *toDate,
float fromOdo, float odoTo,
@@ -919,6 +927,66 @@
/**
+ *
+ *
+ *
+ *///
+static Boolean
+StatFormHandleField(EventType * eventP)
+{
+ Boolean handled = false;
+ WChar chr = eventP->data.keyDown.chr;
+
+ if (globalPrefs.flags & ONE_HAND_MODE)
+ {
+ if ( FrmGetActiveFormID() == StatRecordForm )
+ {
+ const UInt16 navTableRecordStat[RECORD_NB_NAVROW * NB_NAVCOL] =
+ {
+ StatCarPopTrigger, 0, 0, 0,
+ ScrollRightButton, 0, 0, 0,
+ ScrollUpButton, 0, 0, 0,
+ StatFormDoneButton, StatFormGraphButton, StatFormStatsButton, ScrollDownButton
+ };
+ handled = Navigate(navTableRecordStat, RECORD_NB_NAVROW, NB_NAVCOL, &navRow, &navCol, chr, 0);
+ }
+ else
+ {
+ const UInt16 navTableOverAllStat[OVERALL_NB_NAVROW * NB_NAVCOL] =
+ {
+ StatCarPopTrigger, 0, 0, 0,
+ DateFilterCheckbox, FromSelTrigger, ToSelTrigger, ScrollUpButton,
+ StatFormDoneButton, StatFormGraphButton, ScrollDownButton, 0
+ };
+ handled = Navigate(navTableOverAllStat, OVERALL_NB_NAVROW, NB_NAVCOL, &navRow, &navCol, chr, 0);
+ if (DateFilterCheckbox == navTableOverAllStat[(NB_NAVCOL * navRow) + navCol] )
+ {
+ datefilterset = CtlGetValue(GetObjectPtr(DateFilterCheckbox));
+ StatFormDoStats(FrmGetActiveForm(), CurrentCategory);
+ }
+ }
+ } // End of if ONE_HAN_MODE
+ else
+ {
+ if ( (eventP->data.ctlRepeat.controlID == ScrollUpButton ||
+ chr == pageUpChr) && scrollableUp)
+ {
+ StatFormScroll(winUp);
+ handled = true;
+ }
+ else if ( (eventP->data.ctlRepeat.controlID == ScrollDownButton ||
+ chr == pageDownChr)&& scrollableDown)
+ {
+ StatFormScroll(winDown);
+ handled = true;
+ }
+ }
+
+
+ return handled;
+}
+
+/**
* This routine is the event handler for the "StatForm" of this
* application.
*
@@ -930,9 +998,6 @@
Boolean
StatFormHandleEvent(EventType * eventP)
{
- static Boolean scrollableUp = true;
- static Boolean scrollableDown = true;
-
Boolean handled = false;
FormType *frm = FrmGetActiveForm();
Int16 error;
@@ -979,7 +1044,7 @@
handled = true;
break;
case DateFilterCheckbox :
-// TRACE("StatFormHandleEvent: DateFilterCheckbox");
+ TRACE("StatFormHandleEvent: DateFilterCheckbox");
datefilterset = CtlGetValue(GetObjectPtr(DateFilterCheckbox));
StatFormDoStats(frm, CurrentCategory);
FrmDrawForm(frm);
@@ -987,7 +1052,7 @@
break;
case FromSelTrigger :
case ToSelTrigger :
-// TRACE("StatFormHandleEvent: ToSelTrigger: Ici 1");
+ TRACE("StatFormHandleEvent: ToSelTrigger: Ici 1");
SetFilterDate(eventP->data.ctlSelect.controlID);
// TRACE("StatFormHandleEvent: ToSelTrigger: Ici 2");
StatFormDoStats(frm, CurrentCategory);
@@ -1003,19 +1068,9 @@
case ctlRepeatEvent: // an onscreen scroll button is pressed
// We pass trough
case keyDownEvent: // Handle the physical scroll buttons
- if ( (eventP->data.ctlRepeat.controlID == ScrollUpButton ||
- eventP->data.keyDown.chr == pageUpChr) && scrollableUp)
- {
- StatFormScroll(winUp);
- handled = true;
- }
- else if ( (eventP->data.ctlRepeat.controlID == ScrollDownButton ||
- eventP->data.keyDown.chr == pageDownChr)&& scrollableDown)
- {
- StatFormScroll(winDown);
- handled = true;
- }
-
+ TRACE("SFHE: keyDownEvent");
+
+ handled = StatFormHandleField(eventP);
// Repeating controls don't repeat if handled is set true.
break;
@@ -1027,10 +1082,12 @@
if ( StatOverAllForm == eventP->data.frmLoad.formID )
{
+ navRow = OVERALL_NB_NAVROW -1;
error = StatFormDoStats(frm, CurrentCategory);
}
else
{
+ navRow = RECORD_NB_NAVROW -1;
StatFormDoRecord(frm, CurrentCategory, CurrentRecord);
}
@@ -1038,6 +1095,15 @@
handled = true;
FrmDrawForm(frm);
+
+ if (globalPrefs.flags & ONE_HAND_MODE)
+ {
+ navCol = 0;
+ // This should be done after the drawing of the form
+ SetFocus(StatFormDoneButton, true);
+ }
+ else
+ navCol = noFocus;
break;
case frmCloseEvent:
Modified: branches/pFuel-0-04-stable/pFuel/Src/graph.c
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/graph.c 2008-02-13 14:26:07 UTC (rev 504)
+++ branches/pFuel-0-04-stable/pFuel/Src/graph.c 2008-02-21 14:19:35 UTC (rev 505)
@@ -164,7 +164,7 @@
// This is used to avoid a problem with a debug rom
// Error: read from memory location 0x80000020
- FrmDrawForm(frm);
+ //FrmDrawForm(frm);
TRACE("Ici 2.2");
@@ -173,28 +173,20 @@
FrmSetTitle(frm, getString(strLst, graphType - GraphFormMenu, title));
MemPtrUnlock(strLst);
- setCarCategoryLabel(pFuelDB, GraphCarPopTrigger, GraphCarList,
- category);
- TRACE("Ici 2.3");
- FormSetDates(frm, datefilterset, DateFilterCheckbox,
- FromSelTrigger, ToSelTrigger, DateFilterToLabel);
- TRACE("Ici 2.4");
+ r.topLeft.x = 0;
+ // We don't want to erase the Header of the form
+ FrmGetObjectBounds(frm, FrmGetObjectIndex(frm, GraphCarPopTrigger), &myRect);
+ r.topLeft.y = myRect.topLeft.y + myRect.extent.y + 2; // +2 for the header line
+ r.extent.x = 160;
+ // We don't want to erase the Filter and button at the bottom
+ // Find where they start
+ FrmGetObjectBounds(frm, FrmGetObjectIndex(frm, FromSelTrigger), &myRect);
+ r.extent.y = myRect.topLeft.y - r.topLeft.y - 2;
- myRect.topLeft.x=0;
- myRect.topLeft.y=0;
- myRect.extent.x=160;
- myRect.extent.y=160;
- TRACE("Ici 2.4.1");
- WinEraseRectangle(&myRect,0);
- TRACE("Ici 2.4.2");
- FrmDrawForm(frm);
- TRACE("Ici 2.4.3");
+ TRACE("Bound = top=%hd %hd extend=%hd %hd",
+ r.topLeft.x, r.topLeft.y, r.extent.x, r.extent.y);
- r.topLeft.x = 0;
- r.topLeft.y = 15;
- r.extent.x = 160;
- r.extent.y = 115;
- TRACE("Ici 2.5");
+ WinEraseRectangle(&r,0);
FtrGet(sysFtrCreator, sysFtrNumWinVersion, &version);
@@ -443,6 +435,11 @@
{
// Handle the vchrRockerCenter
handled = Navigate(navTable, NB_NAVROW, NB_NAVCOL, &navRow, &navCol, chr, 0);
+ if (DateFilterCheckbox == navTable[(NB_NAVCOL * navRow) + navCol] )
+ {
+ datefilterset = CtlGetValue(GetObjectPtr(DateFilterCheckbox));
+ GraphDrawGraph(FrmGetActiveForm(), CurrentCategory, graphType);
+ }
}
} // End of if ONE_HAN_MODE
@@ -514,6 +511,8 @@
// todate = fromdate;
// }
// }
+ FormSetDates(frm, datefilterset, DateFilterCheckbox,
+ FromSelTrigger, ToSelTrigger, DateFilterToLabel);
GraphDrawGraph(frm, CurrentCategory, graphType);
break;
case FromSelTrigger :
@@ -528,13 +527,17 @@
}
break;
- case keyDownEvent:
+ case keyDownEvent:
TRACE("GraphFormHandleEvent: keyDownEvent");
- handled = GraphHandleField(eventP);
+ handled = GraphHandleField(eventP);
break;
case frmOpenEvent:
TRACE("GraphFormHandleEvent: Open");
+ setCarCategoryLabel(pFuelDB, GraphCarPopTrigger, GraphCarList,
+ CurrentCategory);
+ FrmDrawForm(frm);
+
error = GraphDrawGraph(frm, CurrentCategory, graphType);
if (globalPrefs.flags & ONE_HAND_MODE)
Modified: branches/pFuel-0-04-stable/pFuel/Src/navigation.c
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/navigation.c 2008-02-13 14:26:07 UTC (rev 504)
+++ branches/pFuel-0-04-stable/pFuel/Src/navigation.c 2008-02-21 14:19:35 UTC (rev 505)
@@ -278,8 +278,11 @@
{
TRACE("UpdateFrame: no focus");
+
WinEraseRectangleFrame(focusFrame, &boldRect);
- WinDrawRectangleFrame(objFrame, &rect);
+ FrmHideObject(frmP, idx);
+ FrmShowObject(frmP, idx);
+ //WinDrawRectangleFrame(objFrame, &rect);
}
}
@@ -291,7 +294,8 @@
*
* @param tableID The id of the table
* @param row The table row we want to set/unset focus
- * @param focus Navigation Flag saying if we want the focus or table or on the row
+ * @param focus Navigation Flag saying if we want the focus on table cell
+ * or on the row
*///
Boolean
SetTableFocus(UInt16 tableID, UInt16 row, UInt16 focus)
@@ -340,6 +344,7 @@
{
i = 0;
nb = TblGlueGetNumberOfColumns(objPtr);
+ CurrentRecord = TblGetItemInt(objPtr, row, 0);
}
invert = 1;
@@ -478,18 +483,18 @@
break;
case popupTriggerCtl:
UpdateFrame(objID, noFrame, popupFrame, focus);
- if (0 == focus)
- {
- TRACE("SetFocus redraw", objID);
- FrmDrawForm(frmP);
- // Some of the Form have custom drawing
- // Ex. Table header
- // So a special call is needed to be able to catch an update
- // N.B. We can't call the FrmDrawForm in this function
- // since this is done later in the event loop and
- // after the SetFocus
- FrmUpdateForm(frmP, frmRedrawOnlyHeaderCode);
- }
+// if (0 == focus)
+// {
+// TRACE("SetFocus redraw", objID);
+// FrmDrawForm(frmP);
+// // Some of the Form have custom drawing
+// // Ex. Table header
+// // So a special call is needed to be able to catch an update
+// // N.B. We can't call the FrmDrawForm in this function
+// // since this is done later in the event loop and
+// // after the SetFocus
+// FrmUpdateForm(frmP, frmRedrawOnlyHeaderCode);
+// }
break;
default: // Used to remove warnings
break;
@@ -601,87 +606,17 @@
return false;
}
-
-// /**
-// * This function call the appropriate action when you press the
-// * vchrRockerCenter and you have a focus on a object and you are in
-// * ONE_HAND_MODE for the table.
-// *
-// * After selecting the table you will be able to navigate the table
-// * and select a row
-// *
-// * @param focus The state of focus we want.
-// *///
-// Boolean
-// SelectTable(UInt16 objID, UInt16 *focus)
-// {
-// FormType *frm = FrmGetActiveForm();
-
-// FrmGlueNavRemoveFocusRing(frm);
-
-// if (focus)
-// {
-// Int16 rowInTable;
-// Int16 colInTable;
-
-// FrmSetFocus(frm, FrmGetObjectIndex(frm, objID));
-
-
-// TblGetSelection(GetObjectPtr(objID), & rowInTable, colInTable);
-// CurrentRecord = TblGetItemInt(GetObjectPtr(objID), rowInTable, 0);
-
-// if (GetObjectPtr(MainForm) == frm )
-// {
-// AddingRecord = false;
-// FrmGotoForm(AddPetrolForm);
-// }
-// else if ( GetObjectPtr(MtnForm) == frm )
-// {
-// }
-// else
-// {
-// return false; // ERROR
-// }
-
-// }
-// else
-// {
-// void (*drawFctPtr)(MemPtr tableP, Int16 row, Int16 column,
-// RectangleType *bounds);
-
-// if (GetObjectPtr(MainForm) == frm )
-// {
-// db = pFuelDB;
-// drawFctPtr = &MainFormDrawRecord;
-// gotoFormID = AddPetrolForm;
-// }
-// else if ( GetObjectPtr(MtnForm) == frm )
-// {
-// db = pFuelMtnDB;
-// drawFctPtr = &MtnDrawRecord;
-// gotoFormID = MtnRecForm;
-// }
-// else
-// return false; // ERROR
-
-// // Erase the old hightlight
-// if (GetObjectPtr(MainForm) == frm )
-// {
-// MainCarsDrawTable(frm);
-// }
-// else if ( GetObjectPtr(MtnForm) == frm )
-// {
-// }
-// else
-// {
-// return false; // ERROR
-// }
-// }
-
-// return true;
-// }
-
-
+////////////////////////////////////////////////////////////////////////////////
+///
+/// @param navTable
+/// @param nbRow
+/// @param nbCol
+/// @param row
+/// @param col
+/// @param chr
+///
+/// @return
+////////////////////////////////////////////////////////////////////////////////
static Boolean
NavigateList(const UInt16 *navTable, const UInt16 nbRow, const UInt16 nbCol,
UInt16 *row, UInt16 *col, WChar chr)
@@ -795,6 +730,7 @@
{
if ( *focus & NAV_ROW_FOCUS )
{
+ AddingRecord = false;
*focus &= ~(NAV_TABLE_FOCUS | NAV_ROW_FOCUS);
FrmGotoForm(gotoFormID);
@@ -832,8 +768,12 @@
TRACE("NavigateTable: vchrRockerDown");
if ( rowInTable < (nbRecords-1) )
+ {
+ SetTableFocus(tableID, rowInTable, 0);
++rowInTable;
+ }
+
if (rowInTable >= (nbRowsInTable))
{
TRACE("NavigateTable: vchrRockerDown scroll");
@@ -858,7 +798,10 @@
rowInTable, DmNumRecordsInCategory(pFuelDB, CurrentCategory));
if (rowInTable >= 1)
+ {
+ SetTableFocus(tableID, rowInTable, 0);
--rowInTable;
+ }
if (rowInTable < 0)
{
@@ -975,9 +918,6 @@
case vchrRockerLeft:
TRACE("Navigate: Left");
-
- tmpCol = (*col);
-
// Move left until we find something on the left or go out of the table
// We also check for col < 255 since --((UInt16) 0) =>
for (--(*col); ((*col) >= 0) && (*col) < 65535 &&
@@ -1029,13 +969,7 @@
case chrHorizontalTabulation:
case chrLineFeed:
TRACE("Navigate: Down");
-
- // Keep a copy of the old position since we might not be
- // able to do the move
- tmpRow = *row;
- tmpCol = *col;
-
- if ( (*row) < (nbRow -1) )
+ if ( (*row) < (nbRow -1) )
{
if ( (objID = navTable[(nbCol * (++(*row))) + (*col)]) && // realy a = not a ==
IsObjectFocusable(objID) )
@@ -1065,11 +999,7 @@
case chrUpArrow:
case vchrPrevField:
TRACE("Navigate: Up");
-
- tmpRow = *row;
- tmpCol = *col;
-
- if ( (*row) > 0 )
+ if ( (*row) > 0 )
{
if ( (objID = navTable[(nbCol * (--(*row))) + (*col)]) && // realy a = not a ==
IsObjectFocusable(objID) )
@@ -1091,7 +1021,7 @@
return false;
}
}
- break;
+ break;
default:
return false;
Modified: branches/pFuel-0-04-stable/pFuel/Src/pFuel.c
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/pFuel.c 2008-02-13 14:26:07 UTC (rev 504)
+++ branches/pFuel-0-04-stable/pFuel/Src/pFuel.c 2008-02-21 14:19:35 UTC (rev 505)
@@ -1042,7 +1042,7 @@
break;
case penUpEvent:
- TRACE("MainFormHandleEvent: penUpEvent");
+ TRACE("MFHE: penUpEvent");
if (tblpenup)
{
@@ -1063,6 +1063,7 @@
}
else
handled = false;
+ TRACE("MFHE: penUpEvent");
break;
case winEnterEvent:
@@ -1071,6 +1072,8 @@
break;
case frmOpenEvent:
+ TRACE("MFHE: frmOpenEvent");
+
//lastFocusID = -1;
if (Resort)
{
@@ -1089,8 +1092,9 @@
FormLoadTable(pFuelDB, frm, CurrentRecord, CurrentCategory,
&TopVisibleRecord, &MainFormDrawRecord);
+ TRACE("Ici 1");
MainCarsDrawTable(frm);
-
+ TRACE("Ici 2");
if (globalPrefs.flags & ONE_HAND_MODE)
{
navRow = NB_NAVROW -1;
@@ -1100,6 +1104,7 @@
}
else
navCol = noFocus;
+ TRACE("MFHE: frmOpenEvent: end");
break;
case frmUpdateEvent:
TRACE("MainFormHandleEvent: frmUpdateEvent");
@@ -1152,10 +1157,11 @@
eventP->eType == keyDownEvent )
{
// Rewrite the button and some key
- if ( formId == AddPetrolForm || formId == MainForm ||
- formId == MtnForm || formId == MtnRecForm ||
- formId == PreferencesForm || formId == GPrefsForm ||
- formId == GraphForm)
+ if ( formId == AddPetrolForm || formId == MainForm ||
+ formId == MtnForm || formId == MtnRecForm ||
+ formId == PreferencesForm || formId == GPrefsForm ||
+ formId == StatRecordForm || formId == StatOverAllForm ||
+ formId == GraphForm )
{
handled = true;
Modified: branches/pFuel-0-04-stable/pFuel/Src/pFuel.rcp.in
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/pFuel.rcp.in 2008-02-13 14:26:07 UTC (rev 504)
+++ branches/pFuel-0-04-stable/pFuel/Src/pFuel.rcp.in 2008-02-21 14:19:35 UTC (rev 505)
@@ -467,7 +467,7 @@
CHECKBOX "Filter" ID DateFilterCheckbox AT (0 128 AUTO AUTO) LEFTANCHOR
- SELECTORTRIGGER "XX/XX/XX" ID FromSelTrigger AT (PREVRIGHT+3 PREVTOP AUTO AUTO) LEFTANCHOR
+ SELECTORTRIGGER "XX/XX/XX" ID FromSelTrigger AT (PREVRIGHT+3 PREVTOP AUTO AUTO) NONUSABLE LEFTANCHOR
LABEL "to" ID DateFilterToLabel AT (90 PREVTOP) NONUSABLE
SELECTORTRIGGER "XX/XX/XX" ID ToSelTrigger AT (PREVRIGHT+3 PREVTOP AUTO AUTO) NONUSABLE LEFTANCHOR
@@ -570,7 +570,7 @@
ROW StatCarPopTrigger
ROW ScrollRightButton
ROW ScrollUpButton
- ROW StatFormDoneButton StatFormGraphButton StatFormStatsButton ScrollDownButton
+ ROW StatFormDoneButton StatFormGraphButton StatFormStatsButton ScrollDownButton
END
@@ -652,7 +652,7 @@
POPUPLIST ID GraphCarPopTrigger GraphCarList
CHECKBOX "Filter" ID DateFilterCheckbox AT (0 132 AUTO AUTO) LEFTANCHOR
- SELECTORTRIGGER "XX/XX/XX" ID FromSelTrigger AT (PREVRIGHT+3 PREVTOP AUTO AUTO) LEFTANCHOR
+ SELECTORTRIGGER "XX/XX/XX" ID FromSelTrigger AT (PREVRIGHT+3 PREVTOP AUTO AUTO) NONUSABLE LEFTANCHOR
LABEL "to" ID DateFilterToLabel AT (90 PREVTOP) NONUSABLE
SELECTORTRIGGER "XX/XX/XX" ID ToSelTrigger AT (PREVRIGHT+3 PREVTOP AUTO AUTO) NONUSABLE LEFTANCHOR
Modified: branches/pFuel-0-04-stable/pFuel/Src/pFuel.ver
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/pFuel.ver 2008-02-13 14:26:07 UTC (rev 504)
+++ branches/pFuel-0-04-stable/pFuel/Src/pFuel.ver 2008-02-21 14:19:35 UTC (rev 505)
@@ -1 +1 @@
-0.04.05
+0.04.06
Modified: branches/pFuel-0-04-stable/pFuel/Src/pfRecord.c
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/pfRecord.c 2008-02-13 14:26:07 UTC (rev 504)
+++ branches/pFuel-0-04-stable/pFuel/Src/pfRecord.c 2008-02-21 14:19:35 UTC (rev 505)
@@ -144,6 +144,7 @@
// table with new records and redraw it.
if (!AddPetrolSaveData())
return;
+ TRACE("Ici 6");
DmReleaseRecord(pFuelDB, CurrentRecord, true);
CurrentRecord = newRecord;
@@ -175,8 +176,9 @@
// Check to make sure there is a record to retrieve.
if (CurrentRecord != noRecordSelected && DmNumRecords(pFuelDB) > 0)
{
+ TRACE("AddPetrolRetrieveData: Does not retreive");
// Get a handle for the first record.
- recHandle = DmQueryRecord(pFuelDB, CurrentRecord);
+ recHandle = DmQueryRecord(pFuelDB, CurrentRecord); // Don't need to release later
// Set the global variable that keeps track of the current category
// to the category of the current record.
@@ -284,9 +286,11 @@
/**
* Saves the data to the CurrentRecord of a database
*
- * @return false if not able to do the save.
+ * @return false if not able to do the save or the save is not needed.
* This can happend if we are not able to parse the fields.
*
+ * @note It it necessary to DmReleaseRecord if a save was done.
+ *
* @todo We pass the record to be saved.
*
*///
@@ -495,27 +499,18 @@
TRACE("SetUpdateFields: Litre");
if ( (updatedFields>>3) ^ VOLUME_FIELD)
updatedFields >>= 3;
-// if ( (updatedFields & PRICE_FIELD) &&
-// (updatedFields & PRICE_PER_UNIT_FIELD) )
-// updatedFields = 0x00;
updatedFields |= VOLUME_FIELD<<3;
break;
case AddPetrolPriceField:
TRACE("SetUpdateFields:: Cost");
if ( (updatedFields>>3) ^ PRICE_FIELD)
updatedFields >>= 3;
-// if ( (updatedFields & VOLUME_FIELD) &&
-// (updatedFields & PRICE_PER_UNIT_FIELD) )
-// updatedFields = 0x00;
updatedFields |= PRICE_FIELD<<3;
break;
case AddPetrolPUnitField:
TRACE("SetUpdateFields: Price");
if ( (updatedFields>>3) ^ PRICE_PER_UNIT_FIELD)
updatedFields >>= 3;
-// if ( (updatedFields & VOLUME_FIELD) &&
-// (updatedFields & PRICE_FIELD) )
-// updatedFields = 0x00;
updatedFields |= PRICE_PER_UNIT_FIELD<<3;
break;
}
@@ -827,11 +822,7 @@
static Int16 released;
WChar chr = eventP->data.keyDown.chr;
- { // DEVEL
- float tata;
- TRACE("AddPetrolHandleEvent: start");
- ParseFixed(AddPetrolLitresField, &tata);
- }
+ //TRACE("AddPetrolHandleEvent: start");
switch (eventP->eType)
@@ -847,7 +838,8 @@
if (AddPetrolSaveData())
{
released = true;
- Resort = true;
+ Resort = true;
+ TRACE("Ici 2");
DmReleaseRecord(pFuelDB, CurrentRecord, true);
saveNote(pFuelDB, CurrentRecord, sizeof(PFRecord),
&CurrentNoteHandle);
@@ -855,16 +847,18 @@
}
break;
case AddPetrolCancelButton :
- TRACE("AddPetrolHandleEvent: Cancel");
+ TRACE("APHE: Cancel");
if (AddingRecord)
{
+ TRACE("APHE: Removing");
DmRemoveRecord(pFuelDB, CurrentRecord);
CurrentRecord = noRecordSelected;
}
else
{
UInt16 RecordCategory;
+ TRACE("APHE: Removing");
// TODO:
// If Category was changed then put it back
@@ -876,7 +870,6 @@
CurrentCategory = RecordCategory;
LoadCarPref(&hcCarPref, &cCarPref, CurrentCategory);
}
- DmReleaseRecord(pFuelDB, CurrentRecord, false);
}
released = true;
FrmGotoForm(MainForm);
@@ -894,7 +887,9 @@
break;
case AddPetrolNoteButton :
TRACE("AddPetrolHandleEvent: Note");
- if ( CurrentRecord == noRecordSelected ) {
+ if ( CurrentRecord == noRecordSelected )
+ {
+ TRACE("Ici 3");
DmReleaseRecord(pFuelDB, CurrentRecord, true);
}
released = true;
@@ -987,7 +982,8 @@
CurrentCategory);
released = false;
- if (AddingRecord)
+
+ if (AddingRecord)
{
hNewTitle = DmGetResource(strRsc, STR_TITLE_PETROL_FORM_ADDING);
@@ -1000,13 +996,6 @@
SetOdometerFromLatestRecord();
- FrmSetFocus(frmP, FrmGetObjectIndex(frmP, AddPetrolMileageField));
-
-
- // Check if this as effect
- navRow = 3;
- navCol = 2;
- SetFocus(AddPetrolMileageField, true);
if (globalPrefs.flags & ONE_HAND_MODE)
{
changeDigit = false;
@@ -1018,10 +1007,6 @@
}
else
{
- navRow = NB_NAVROW -1;
- navCol = 0;
- SetFocus(OKButton, true);
-
hNewTitle = DmGetResource(strRsc, STR_TITLE_PETROL_FORM_MODIFYING);
// We don't need to set the button to true since they are true by default
@@ -1043,11 +1028,23 @@
if (tappedNotes)
{
- DmReleaseRecord(pFuelDB, CurrentRecord, true);
released = true;
FrmPopupForm(NoteForm);
}
+ // This should be done before the SetFocus since SetFocus need a valid
+ // Form
FrmDrawForm(frmP);
+ if (AddingRecord)
+ {
+ navRow = 3;
+ navCol = 2;
+ }
+ else
+ {
+ navRow = NB_NAVROW -1;
+ navCol = 0;
+ }
+ SetFocus(navTable[NB_NAVCOL * navRow + navCol], true);
}
break;
case frmUpdateEvent:
@@ -1067,7 +1064,8 @@
if (!released)
{
if (AddPetrolSaveData())
- {
+ {
+ TRACE("Ici 5");
DmReleaseRecord(pFuelDB, CurrentRecord, true);
released = true;
}
Modified: branches/pFuel-0-04-stable/pFuel/Src/utility.c
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/utility.c 2008-02-13 14:26:07 UTC (rev 504)
+++ branches/pFuel-0-04-stable/pFuel/Src/utility.c 2008-02-21 14:19:35 UTC (rev 505)
@@ -1158,6 +1158,7 @@
TblGetItemBounds(GetObjectPtr(ID), ((-1 == row) ? 0 : row), column, &bounds);
+
if (-1 == row)
{
bounds.topLeft.y -= bounds.extent.y+1;
@@ -1662,7 +1663,9 @@
* This routine draws or erases the list view scroll arrow buttons.
* The scroller buttons must be called ScrollUpButton and ScrollDownButton
*
- * @param frm Pointer to the to do list form
+ * @param frm Pointer to the to do list form
+ * @param scrollableUp If set to true the arrow up is displayed
+ * @param scrollableDown If set to true the arrow down is displayed
*
* @return nothing
*
@@ -1688,11 +1691,11 @@
if ( datefilterset &&
*(UInt16 *) & rec->date < *(UInt16 *) & globalPrefs.fromDate)
*scrollableUp = false;
+
MemHandleUnlock(recH);
- if ( FrmGetActiveFormID() == StatRecordForm ||
- FrmGetActiveFormID()== StatRecordForm )
+ if ( FrmGetActiveFormID() == StatRecordForm )
{
// We always have a down button to go to the overall stat form
// The overall form for which CrrentRecord == noRecordSelected does not
Modified: branches/pFuel-0-04-stable/pFuel/Src/utility.h
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/utility.h 2008-02-13 14:26:07 UTC (rev 504)
+++ branches/pFuel-0-04-stable/pFuel/Src/utility.h 2008-02-21 14:19:35 UTC (rev 505)
@@ -129,7 +129,7 @@
EXTERN DateFormatType shortDateFormat;
EXTERN PFRecord editedRec; // Remove this variable
-EXTERN Int16 AddingRecord;
+EXTERN Int16 AddingRecord INIT(false);
EXTERN Boolean tappedNotes;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pa...@us...> - 2008-02-13 14:26:07
|
Revision: 504
http://pfuel.svn.sourceforge.net/pfuel/?rev=504&view=rev
Author: papaDoc
Date: 2008-02-13 06:26:07 -0800 (Wed, 13 Feb 2008)
Log Message:
-----------
20080213-RR-01
- Bugs:
- Bug #1890272: Buig report submitted by hetos
1.)
- press the "add" button to create a new entry
- press the "up" or "down" hardware button (while the focus is on the field
where the mileage is entered)
-> exception "Form.c, Line:1728, Object not in form"
2.)
- add a new record
- go to the field where the mileage is entered
- switch from navigation mode to "data entry mode" (Memo hardware button)
- press the left (task) hardware button twice to place the cursor at the
right border of the filed
- press the "up" or "down" hardware button
-> exception "Form.c, Line:1728, Object not in form"
3.)
- add a new record
- navigate down with the hardware buttons until the "note" button is
highlighted
- press the "up" hardware button
-> exception "Form.c, Line:1728, Object not in form"
4.)
- on the pFuel overview screen navigate left, so that the "Stats" button is
highlighted
- press the "up" hardware button
-> exception "Form.c, Line:1728, Object not in form"
5.)
- on the pFuel overview screen navigate left, so that the "Graph" button is
highlighted
- press the "up" hardware button
-> exception "Form.c, Line:1728, Object not in form"
- In the One Hand Mode: On the main form and the maintenance from navigating to the Category
list then down. The header of the table is not displayed.
- Going to the About form then back to the main form the table header was not
redraw.
Modified Paths:
--------------
branches/pFuel-0-04-stable/pFuel/CHANGELOG
branches/pFuel-0-04-stable/pFuel/Src/Makefile
branches/pFuel-0-04-stable/pFuel/Src/graph.c
branches/pFuel-0-04-stable/pFuel/Src/maintenance.c
branches/pFuel-0-04-stable/pFuel/Src/navigation.c
branches/pFuel-0-04-stable/pFuel/Src/navigation.h
branches/pFuel-0-04-stable/pFuel/Src/pFuel.c
branches/pFuel-0-04-stable/pFuel/Src/pfRecord.c
branches/pFuel-0-04-stable/pFuel/Src/preferences.c
branches/pFuel-0-04-stable/pFuel/Src/utility.c
branches/pFuel-0-04-stable/pFuel/Src/utils.h
Modified: branches/pFuel-0-04-stable/pFuel/CHANGELOG
===================================================================
--- branches/pFuel-0-04-stable/pFuel/CHANGELOG 2008-02-12 13:28:22 UTC (rev 503)
+++ branches/pFuel-0-04-stable/pFuel/CHANGELOG 2008-02-13 14:26:07 UTC (rev 504)
@@ -12,6 +12,43 @@
#
#------------------------------------------------------------
+20080213-RR-01
+ - Bugs:
+ - Bug #1890272: Buig report submitted by hetos
+ 1.)
+ - press the "add" button to create a new entry
+ - press the "up" or "down" hardware button (while the focus is on the field
+ where the mileage is entered)
+ -> exception "Form.c, Line:1728, Object not in form"
+ 2.)
+ - add a new record
+ - go to the field where the mileage is entered
+ - switch from navigation mode to "data entry mode" (Memo hardware button)
+ - press the left (task) hardware button twice to place the cursor at the
+ right border of the filed
+ - press the "up" or "down" hardware button
+ -> exception "Form.c, Line:1728, Object not in form"
+ 3.)
+ - add a new record
+ - navigate down with the hardware buttons until the "note" button is
+ highlighted
+ - press the "up" hardware button
+ -> exception "Form.c, Line:1728, Object not in form"
+ 4.)
+ - on the pFuel overview screen navigate left, so that the "Stats" button is
+ highlighted
+ - press the "up" hardware button
+ -> exception "Form.c, Line:1728, Object not in form"
+ 5.)
+ - on the pFuel overview screen navigate left, so that the "Graph" button is
+ highlighted
+ - press the "up" hardware button
+ -> exception "Form.c, Line:1728, Object not in form"
+ - In the One Hand Mode: On the main form and the maintenance from navigating to the Category
+ list then down. The header of the table is not displayed.
+ - Going to the About form then back to the main form the table header was not
+ redraw.
+
20080212-RR-01
- Bugs:
- In the Global Preference form the One Hand Mode navigation was
Modified: branches/pFuel-0-04-stable/pFuel/Src/Makefile
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/Makefile 2008-02-12 13:28:22 UTC (rev 503)
+++ branches/pFuel-0-04-stable/pFuel/Src/Makefile 2008-02-13 14:26:07 UTC (rev 504)
@@ -116,7 +116,7 @@
# uncomment this if you want to build a gdb debuggable version
# -On: n=Optimization-level (0=none), -g: needed for debugging
-CFLAGS = -O2 -Wall -MD
+CFLAGS = -O2 -Wall -MD -g
OBJRES = m68k-palmos-obj-res
Modified: branches/pFuel-0-04-stable/pFuel/Src/graph.c
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/graph.c 2008-02-12 13:28:22 UTC (rev 503)
+++ branches/pFuel-0-04-stable/pFuel/Src/graph.c 2008-02-13 14:26:07 UTC (rev 504)
@@ -442,7 +442,7 @@
{
{
// Handle the vchrRockerCenter
- handled = Navigate(navTable, NB_NAVROW, NB_NAVCOL, &navRow, &navCol, chr);
+ handled = Navigate(navTable, NB_NAVROW, NB_NAVCOL, &navRow, &navCol, chr, 0);
}
} // End of if ONE_HAN_MODE
Modified: branches/pFuel-0-04-stable/pFuel/Src/maintenance.c
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/maintenance.c 2008-02-12 13:28:22 UTC (rev 503)
+++ branches/pFuel-0-04-stable/pFuel/Src/maintenance.c 2008-02-13 14:26:07 UTC (rev 504)
@@ -1258,7 +1258,7 @@
// maybe we want to navigate
if (!handled)
{
- handled = Navigate(navTableRec, NB_NAVROW_REC, NB_NAVCOL_REC, &navRow, &navCol, chr);
+ handled = Navigate(navTableRec, NB_NAVROW_REC, NB_NAVCOL_REC, &navRow, &navCol, chr, 0);
}
if (!handled && (GetObjectType(fldID) == frmFieldObj) )
@@ -1270,7 +1270,7 @@
else
{
// Handle the vchrRockerCenter
- handled = Navigate(navTableRec, NB_NAVROW_REC, NB_NAVCOL_REC, &navRow, &navCol, chr);
+ handled = Navigate(navTableRec, NB_NAVROW_REC, NB_NAVCOL_REC, &navRow, &navCol, chr, 0);
}
} // End of if ONE_HAN_MODE
@@ -1797,22 +1797,37 @@
}
+////////////////////////////////////////////////////////////////////////////////
+/// Draw the header of the Maintenance table.
+///
+/// @param frm The current form *(i.e. MtnForm)
+///
+////////////////////////////////////////////////////////////////////////////////
static void
-MtnDrawTable(FormType *frm)
+MtnDrawTblHeader(FormType *frm)
{
- Int16 i;
+ UInt16 i;
Char *txt;
- TRACE("MFDT: Start");
-
-
for (i=0; i<TblGlueGetNumberOfColumns(GetObjectPtr(Table)); ++i)
{
txt = (Char *)MemHandleLock(DmGetResource(strRsc, STR_MTNTABLE_HEADER+i));
DrawCellTable(frm, Table, -1, i, txt, boldFont, ALIGN_CENTER);
MemPtrUnlock(txt);
}
+}
+////////////////////////////////////////////////////////////////////////////////
+///
+/// @param frm
+///
+////////////////////////////////////////////////////////////////////////////////
+static void
+MtnDrawTable(FormType *frm)
+{
+ TRACE("MFDT: Start");
+
+ MtnDrawTblHeader(frm);
TblRedrawTable(GetObjectPtr(Table));
TRACE("MFDT: End");
@@ -1842,7 +1857,7 @@
if (globalPrefs.flags & ONE_HAND_MODE)
{
- handled = Navigate(navTable, NB_NAVROW, NB_NAVCOL, &navRow, &navCol, chr);
+ handled = Navigate(navTable, NB_NAVROW, NB_NAVCOL, &navRow, &navCol, chr, 0);
}
@@ -2023,6 +2038,15 @@
handled = false; // ???????????????
TRACE("MFHE: Open: Stop");
break;
+ case frmUpdateEvent:
+ TRACE("MFHE: frmUpdateEvent");
+ if (eventP->data.frmUpdate.updateCode != frmRedrawOnlyHeaderCode)
+ {
+ FrmDrawForm(frm);
+ }
+ MtnDrawTblHeader(frm);
+ handled = true;
+ break;
// case keyDownEvent: // Handle the physical scroll buttons
// TRACE("MFHE: keyDownEvent");
// if (chr == pageUpChr && !AddingRecord)
Modified: branches/pFuel-0-04-stable/pFuel/Src/navigation.c
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/navigation.c 2008-02-12 13:28:22 UTC (rev 503)
+++ branches/pFuel-0-04-stable/pFuel/Src/navigation.c 2008-02-13 14:26:07 UTC (rev 504)
@@ -273,7 +273,6 @@
WinEraseRectangleFrame(objFrame, &boldRect);
WinDrawRectangleFrame(focusFrame, &rect);
- FrmSetFocus(frmP, GetObjectIdx(objID));
}
else
{
@@ -482,7 +481,14 @@
if (0 == focus)
{
TRACE("SetFocus redraw", objID);
- FrmDrawForm(frmP);
+ FrmDrawForm(frmP);
+ // Some of the Form have custom drawing
+ // Ex. Table header
+ // So a special call is needed to be able to catch an update
+ // N.B. We can't call the FrmDrawForm in this function
+ // since this is done later in the event loop and
+ // after the SetFocus
+ FrmUpdateForm(frmP, frmRedrawOnlyHeaderCode);
}
break;
default: // Used to remove warnings
@@ -907,24 +913,29 @@
* @param nbRow The number of rows in the table
* @param nbCol The number of columns in the table
* @param row The row of the item/field in Focus
- * @param col The column of the item/field in Focus1
+ * @param col The column of the item/field in Focus
+ * @param deep The function use a recursive way to navigate the table.
+ * This indicate how deep in the recursion the current function call
+ * is.
*
* @return true if the action was handled.
*///
Boolean
Navigate(const UInt16 *navTable,const UInt16 nbRow, const UInt16 nbCol,
- UInt16 *row, UInt16 *col, WChar chr)
+ UInt16 *row, UInt16 *col, WChar chr, UInt16 deep)
{
// Those 2 variables have 2 use.
// To revert to the old position if we can't make the move
// And to remove the Focus from the previous position if we can make the move
- static UInt16 focus;
- UInt16 objID = 0;
- UInt16 tmpRow, tmpCol;
- FormObjectKind kind;
+ static UInt16 focus = 0;
+ UInt16 objID = 0;
+ UInt16 tmpRow = *row;
+ UInt16 tmpCol = *col;
+ FormObjectKind kind = 0;
+ UInt16 stack = deep + 1;
- TRACE("Navigate start: id=%hu chr=%hu row=%hu col=%hu",
- navTable[nbCol * (*row) + (*col)], chr, (*row), (*col));
+ TRACE("Navigate start: id=%hu chr=%hu row=%hu col=%hu stack=%hu",
+ navTable[nbCol * (*row) + (*col)], chr, (*row), (*col), stack);
focus |= NAV_FOCUS;
@@ -935,7 +946,8 @@
else
{
objID = navTable[nbCol * (*row) + (*col)];
- kind = GetObjectType(objID);
+ if (objID)
+ kind = GetObjectType(objID);
}
@@ -975,9 +987,8 @@
/* Everything is done in the for loop */ ;
if ((*col) >= 0 && (*col) < 65535 && IsObjectFocusable(objID) )
- {
- SetFocus(navTable[nbCol * (*row) + tmpCol], 0);
- SetFocus(navTable[nbCol * (*row) + (*col)], NAV_FOCUS);
+ {
+ // Nothing to do here
}
else
{
@@ -999,9 +1010,8 @@
/* Everything is done in the for loop */ ;
if ((*col) < nbCol && IsObjectFocusable(navTable[nbCol * (*row) + (*col)]) )
- {
- SetFocus(navTable[nbCol * (*row) + tmpCol], 0);
- SetFocus(navTable[nbCol * (*row) + (*col)], NAV_FOCUS);
+ {
+ // Nothing to do here
}
else
{
@@ -1030,16 +1040,15 @@
if ( (objID = navTable[(nbCol * (++(*row))) + (*col)]) && // realy a = not a ==
IsObjectFocusable(objID) )
{
- SetFocus(navTable[nbCol * tmpRow + (*col)], 0);
- SetFocus(navTable[nbCol * (*row) + (*col)], NAV_FOCUS);
+ // Nothing to do here
}
- else if( Navigate(navTable, nbRow, nbCol, row, col, vchrRockerLeft) )
- {
- SetFocus(navTable[nbCol * tmpRow + tmpCol], 0);
+ else if( Navigate(navTable, nbRow, nbCol, row, col, vchrRockerLeft, stack) )
+ {
+ // Nothing to do here
}
- else if ( Navigate(navTable, nbRow, nbCol, row, col, vchrRockerDown) )
+ else if ( Navigate(navTable, nbRow, nbCol, row, col, vchrRockerDown, stack) )
{
- SetFocus(navTable[nbCol * tmpRow + tmpCol], 0);
+ // Nothing to do here
}
else
{
@@ -1065,18 +1074,16 @@
if ( (objID = navTable[(nbCol * (--(*row))) + (*col)]) && // realy a = not a ==
IsObjectFocusable(objID) )
{
- SetFocus(navTable[nbCol * tmpRow + (*col)], 0);
- SetFocus(navTable[nbCol * (*row) + (*col)], NAV_FOCUS);
focus |= NAV_TABLE_FOCUS;
}
- else if( Navigate(navTable, nbRow, nbCol, row, col, vchrRockerLeft) )
- {
- SetFocus(navTable[nbCol * tmpRow + tmpCol], 0);
- }
- else if ( Navigate(navTable, nbRow, nbCol, row, col, vchrRockerUp) )
+ else if( Navigate(navTable, nbRow, nbCol, row, col, vchrRockerLeft,stack) )
{
- SetFocus(navTable[nbCol * tmpRow + tmpCol], 0);
+ // Nothing to do here
}
+ else if ( Navigate(navTable, nbRow, nbCol, row, col, vchrRockerUp, stack) )
+ {
+ // Nothing to do here
+ }
else
{
*row = tmpRow;
@@ -1092,6 +1099,15 @@
break;
}
+
+ --stack;
+ if (0 == stack)
+ {
+ SetFocus(navTable[nbCol * tmpRow + tmpCol], 0);
+ SetFocus(navTable[nbCol * (*row) + (*col)], NAV_FOCUS);
+ }
+
+
if ( navTable[nbCol * (*row) + (*col)] == Table)
focus |= NAV_TABLE_FOCUS;
else
Modified: branches/pFuel-0-04-stable/pFuel/Src/navigation.h
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/navigation.h 2008-02-12 13:28:22 UTC (rev 503)
+++ branches/pFuel-0-04-stable/pFuel/Src/navigation.h 2008-02-13 14:26:07 UTC (rev 504)
@@ -62,7 +62,7 @@
EXTERN Boolean Navigate(const UInt16 *navTable,
const UInt16 nbRow, const UInt16 nbCol,
- UInt16 *row, UInt16 *col, WChar chr) NAV_SECTION;
+ UInt16 *row, UInt16 *col, WChar ch, UInt16 deep) NAV_SECTION;
EXTERN void FindRowColInFocus(UInt16 *row, UInt16 *col,
const UInt16 nbRow, const UInt16 nbCol,
Modified: branches/pFuel-0-04-stable/pFuel/Src/pFuel.c
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/pFuel.c 2008-02-12 13:28:22 UTC (rev 503)
+++ branches/pFuel-0-04-stable/pFuel/Src/pFuel.c 2008-02-13 14:26:07 UTC (rev 504)
@@ -713,9 +713,14 @@
//TRACE("MainFormDrawRecord: end");
}
-
+////////////////////////////////////////////////////////////////////////////////
+/// Draw the header of the main form table.
+///
+/// @param frm The current form (i.e MainFrom)
+///
+////////////////////////////////////////////////////////////////////////////////
static void
-MainCarsDrawTable(FormType *frm)
+MainCarsDrawTblHeader(FormType *frm)
{
Char *txt;
Char unit[9];
@@ -727,22 +732,9 @@
UInt8 catIdx = ( (CurrentCategory == dmAllCategories) ||
(CurrentCategory == dmUnfiledCategory) );
- if (WinGetDrawWindow() != NULL)
- {
- RectangleType myRect;
+ TRACE("MainCarsDrawTblHeader: Start");
- myRect.topLeft.x=0;
- myRect.topLeft.y=0;
- myRect.extent.x=160;
- myRect.extent.y=160;
- WinEraseRectangle(&myRect,0);
- }
-
- FrmDrawForm(frm);
-
-
-
if ( catIdx == 1 )
{
TblSetColumnWidth(tableP, colPos[catIdx][IDX_CAR], colWidth[IDX_CAR]);
@@ -782,8 +774,35 @@
getString(unitsDistAbrvLst, cCarPref->odoUnit, unit);
DrawCellTable(frm, Table, -1, colPos[catIdx][IDX_ODO],
unit, boldFont, ALIGN_CENTER);
+}
+////////////////////////////////////////////////////////////////////////////////
+///
+/// @param frm
+///
+////////////////////////////////////////////////////////////////////////////////
+static void
+MainCarsDrawTable(FormType *frm)
+{
+ TableType *tableP = GetObjectPtr(Table);
+ if (WinGetDrawWindow() != NULL)
+ {
+ RectangleType myRect;
+
+ myRect.topLeft.x=0;
+ myRect.topLeft.y=0;
+ myRect.extent.x=160;
+ myRect.extent.y=160;
+
+ WinEraseRectangle(&myRect,0);
+ }
+
+ FrmDrawForm(frm);
+
+ MainCarsDrawTblHeader(frm);
+
+
TblRedrawTable(tableP);
}
@@ -876,7 +895,7 @@
if (globalPrefs.flags & ONE_HAND_MODE)
{
- handled = Navigate(navTable, NB_NAVROW, NB_NAVCOL, &navRow, &navCol, chr);
+ handled = Navigate(navTable, NB_NAVROW, NB_NAVCOL, &navRow, &navCol, chr, 0);
}
else
{
@@ -1001,7 +1020,7 @@
case sclExitEvent: // The user has left the pen from the scrollbar
TRACE("MainFormHandleEvent: slcExitEvent");
- // This is the equivalent of scroll up or down by one line
+ // This is the equivalent of scroll up or down2by one line
TopVisibleRecord = RecordInCategory(pFuelDB, CurrentCategory,
eventP->data.sclExit.value,
globalPrefs.ordering);
@@ -1082,6 +1101,15 @@
else
navCol = noFocus;
break;
+ case frmUpdateEvent:
+ TRACE("MainFormHandleEvent: frmUpdateEvent");
+ if (eventP->data.frmUpdate.updateCode != frmRedrawOnlyHeaderCode)
+ {
+ FrmDrawForm(frm);
+ }
+ MainCarsDrawTblHeader(frm);
+ handled = true;
+ break;
case frmCloseEvent:
handled = false; // Need false so the program clean the pointers
break;
Modified: branches/pFuel-0-04-stable/pFuel/Src/pfRecord.c
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/pfRecord.c 2008-02-12 13:28:22 UTC (rev 503)
+++ branches/pFuel-0-04-stable/pFuel/Src/pfRecord.c 2008-02-13 14:26:07 UTC (rev 504)
@@ -720,7 +720,7 @@
// maybe we want to navigate
if (!handled)
{
- handled = Navigate(navTable, NB_NAVROW, NB_NAVCOL, &navRow, &navCol, chr);
+ handled = Navigate(navTable, NB_NAVROW, NB_NAVCOL, &navRow, &navCol, chr, 0);
}
if (!handled && (GetObjectType(fldID) == frmFieldObj))
@@ -737,7 +737,7 @@
else
{
// Handle the vchrRockerCenter
- handled = Navigate(navTable, NB_NAVROW, NB_NAVCOL, &navRow, &navCol, chr);
+ handled = Navigate(navTable, NB_NAVROW, NB_NAVCOL, &navRow, &navCol, chr, 0);
}
} // End of if ONE_HAN_MODE
Modified: branches/pFuel-0-04-stable/pFuel/Src/preferences.c
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/preferences.c 2008-02-12 13:28:22 UTC (rev 503)
+++ branches/pFuel-0-04-stable/pFuel/Src/preferences.c 2008-02-13 14:26:07 UTC (rev 504)
@@ -131,7 +131,7 @@
{
{
// Handle the vchrRockerCenter
- handled = Navigate(navTable, NB_NAVROW, NB_NAVCOL, &navRow, &navCol, chr);
+ handled = Navigate(navTable, NB_NAVROW, NB_NAVCOL, &navRow, &navCol, chr, 0);
}
} // End of if ONE_HAN_MODE
@@ -403,7 +403,7 @@
{
// Handle the vchrRockerCenter
- handled = Navigate(navTable, G_NB_NAVROW, G_NB_NAVCOL, &navRow, &navCol, chr);
+ handled = Navigate(navTable, G_NB_NAVROW, G_NB_NAVCOL, &navRow, &navCol, chr, 0);
}
} // End of if ONE_HAN_MODE
}
Modified: branches/pFuel-0-04-stable/pFuel/Src/utility.c
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/utility.c 2008-02-12 13:28:22 UTC (rev 503)
+++ branches/pFuel-0-04-stable/pFuel/Src/utility.c 2008-02-13 14:26:07 UTC (rev 504)
@@ -828,7 +828,7 @@
if (!hnd)
{
- TRACE("Could not Parse field %d", FieldID);
+// TRACE("Could not Parse field %d", FieldID);
return false;
}
Modified: branches/pFuel-0-04-stable/pFuel/Src/utils.h
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/utils.h 2008-02-12 13:28:22 UTC (rev 503)
+++ branches/pFuel-0-04-stable/pFuel/Src/utils.h 2008-02-13 14:26:07 UTC (rev 504)
@@ -197,6 +197,8 @@
/// This value is used by a fuelcursor but not a record
#define TRIP_PREVIOUS_RECFLAG 0x08
+#define frmRedrawOnlyHeaderCode frmRedrawUpdateCode + 1
+
/// The structure of a pFuel record
typedef struct
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pa...@us...> - 2008-02-12 13:28:17
|
Revision: 503
http://pfuel.svn.sourceforge.net/pfuel/?rev=503&view=rev
Author: papaDoc
Date: 2008-02-12 05:28:22 -0800 (Tue, 12 Feb 2008)
Log Message:
-----------
20080212-RR-01
- Bugs:
- In the Global Preference form the One Hand Mode navigation was
navigating to strange land since the wrong number of row was used.
Modified Paths:
--------------
branches/pFuel-0-04-stable/pFuel/CHANGELOG
branches/pFuel-0-04-stable/pFuel/README
branches/pFuel-0-04-stable/pFuel/Src/preferences.c
Modified: branches/pFuel-0-04-stable/pFuel/CHANGELOG
===================================================================
--- branches/pFuel-0-04-stable/pFuel/CHANGELOG 2008-02-06 13:34:46 UTC (rev 502)
+++ branches/pFuel-0-04-stable/pFuel/CHANGELOG 2008-02-12 13:28:22 UTC (rev 503)
@@ -12,6 +12,11 @@
#
#------------------------------------------------------------
+20080212-RR-01
+ - Bugs:
+ - In the Global Preference form the One Hand Mode navigation was
+ navigating to strange land since the wrong number of row was used.
+
Version 0.04.05
20071204-RR-01
- Features:
Modified: branches/pFuel-0-04-stable/pFuel/README
===================================================================
--- branches/pFuel-0-04-stable/pFuel/README 2008-02-06 13:34:46 UTC (rev 502)
+++ branches/pFuel-0-04-stable/pFuel/README 2008-02-12 13:28:22 UTC (rev 503)
@@ -54,7 +54,7 @@
If you like this program and you are using it for your job.
You can think about sending me some money. You can send me an email
and I will send you my address or you can send it with paypal at
-r...@gm... (But don't forget you don't have to)
+pa...@vi... .
If you like the application and don't know what to do
with some paper money (even if it worth almost nothing you can still send
Modified: branches/pFuel-0-04-stable/pFuel/Src/preferences.c
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/preferences.c 2008-02-06 13:34:46 UTC (rev 502)
+++ branches/pFuel-0-04-stable/pFuel/Src/preferences.c 2008-02-12 13:28:22 UTC (rev 503)
@@ -320,7 +320,7 @@
if (navCol != noFocus) // (fldNo != noFocus)
{
- UInt16 fldID = navTable[(NB_NAVCOL*navRow) + navCol]; //GetObjectId(frmP, fldNo);
+ UInt16 fldID = navTable[(G_NB_NAVCOL*navRow) + navCol]; //GetObjectId(frmP, fldNo);
FieldType *fldP = GetObjectPtr(fldID);
MemHandle hnd = NULL;// = (MemHandle)FldGetTextHandle(fldP);
Char str[2];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pa...@us...> - 2008-02-06 13:34:42
|
Revision: 502
http://pfuel.svn.sourceforge.net/pfuel/?rev=502&view=rev
Author: papaDoc
Date: 2008-02-06 05:34:46 -0800 (Wed, 06 Feb 2008)
Log Message:
-----------
20080206-RR-01
- Features:
- Add new efficieny calculation Miles / Liters
- Bug:
- Bug: 1841416 and 1824049: Trying to select a field to enter data in the
Add form crash the application for some Palm.
- Make the Done button to ajust its size automatically depending on the
language used.
- Change the way the Note... button is possitionned to avoid extenting out
of the screen when using different language.
- In the Maintenance form. If there is value in the description field and
the date is checked but not changed the application can crash.
- Fix a problem when running with a debug ROM
- Fix the border of the List and the popTrigger in ONE_HAND_MODE when moving
out of focus.
- Development:
- Rewrite the function Navigation.c to unset and set the focus only once per
real call to this function.
Modified Paths:
--------------
trunk/pFuel/CHANGELOG
trunk/pFuel/README
trunk/pFuel/Src/fuelStats.h
trunk/pFuel/Src/graph.c
trunk/pFuel/Src/graph.h
trunk/pFuel/Src/maintenance.c
trunk/pFuel/Src/navigation.c
trunk/pFuel/Src/navigation.h
trunk/pFuel/Src/pFuel.c
trunk/pFuel/Src/pFuel.rcp.in
trunk/pFuel/Src/pfRecord.c
trunk/pFuel/Src/preferences.c
trunk/pFuel/Src/utility.c
trunk/pFuel/Src/utils.h
Modified: trunk/pFuel/CHANGELOG
===================================================================
--- trunk/pFuel/CHANGELOG 2007-12-12 14:46:17 UTC (rev 501)
+++ trunk/pFuel/CHANGELOG 2008-02-06 13:34:46 UTC (rev 502)
@@ -12,6 +12,26 @@
#
#------------------------------------------------------------
+20080206-RR-01
+ - Features:
+ - Add new efficieny calculation Miles / Liters
+ - Bug:
+ - Bug: 1841416 and 1824049: Trying to select a field to enter data in the
+ Add form crash the application for some Palm.
+ - Make the Done button to ajust its size automatically depending on the
+ language used.
+ - Change the way the Note... button is possitionned to avoid extenting out
+ of the screen when using different language.
+ - In the Maintenance form. If there is value in the description field and
+ the date is checked but not changed the application can crash.
+ - Fix a problem when running with a debug ROM
+ - Fix the border of the List and the popTrigger in ONE_HAND_MODE when moving
+ out of focus.
+ - Development:
+ - Rewrite the function Navigation.c to unset and set the focus only once per
+ real call to this function.
+
+
27092007-RR-01
- Bug:
- The visual cue for the focus was not moved to the new item in focus
Modified: trunk/pFuel/README
===================================================================
--- trunk/pFuel/README 2007-12-12 14:46:17 UTC (rev 501)
+++ trunk/pFuel/README 2008-02-06 13:34:46 UTC (rev 502)
@@ -54,7 +54,7 @@
If you like this program and you are using it for your job.
You can think about sending me some money. You can send me an email
and I will send you my address or you can send it with paypal at
-r...@gm... (But don't forget you don't have to)
+pa...@vi... .
If you like the application and don't know what to do
with some paper money (even if it worth almost nothing you can still send
Modified: trunk/pFuel/Src/fuelStats.h
===================================================================
--- trunk/pFuel/Src/fuelStats.h 2007-12-12 14:46:17 UTC (rev 501)
+++ trunk/pFuel/Src/fuelStats.h 2008-02-06 13:34:46 UTC (rev 502)
@@ -7,7 +7,10 @@
*
* $Date: 2004-04-17 20:12:34 $ (Last revision)
* $Revision: 1.1.1.1 $
- * $Log: not supported by cvs2svn $
+ * $Log: fuelStats.h,v $
+ * Revision 1.1.1.1 2004/04/17 20:12:34 papadoc
+ * Initial import.
+ *
*
*///
// *****************************************************************************
Modified: trunk/pFuel/Src/graph.c
===================================================================
--- trunk/pFuel/Src/graph.c 2007-12-12 14:46:17 UTC (rev 501)
+++ trunk/pFuel/Src/graph.c 2008-02-06 13:34:46 UTC (rev 502)
@@ -428,7 +428,7 @@
{
{
// Handle the vchrRockerCenter
- handled = Navigate(navTable, NB_NAVROW, NB_NAVCOL, &navRow, &navCol, chr);
+ handled = Navigate(navTable, NB_NAVROW, NB_NAVCOL, &navRow, &navCol, chr, 0);
}
} // End of if ONE_HAN_MODE
Modified: trunk/pFuel/Src/graph.h
===================================================================
--- trunk/pFuel/Src/graph.h 2007-12-12 14:46:17 UTC (rev 501)
+++ trunk/pFuel/Src/graph.h 2008-02-06 13:34:46 UTC (rev 502)
@@ -7,7 +7,10 @@
*
* $Date: 2004-04-17 20:12:34 $ (Last revision)
* $Revision: 1.1.1.1 $
- * $Log: not supported by cvs2svn $
+ * $Log: graph.h,v $
+ * Revision 1.1.1.1 2004/04/17 20:12:34 papadoc
+ * Initial import.
+ *
*
*///
// *****************************************************************************
Modified: trunk/pFuel/Src/maintenance.c
===================================================================
--- trunk/pFuel/Src/maintenance.c 2007-12-12 14:46:17 UTC (rev 501)
+++ trunk/pFuel/Src/maintenance.c 2008-02-06 13:34:46 UTC (rev 502)
@@ -1361,7 +1361,7 @@
// maybe we want to navigate
if (!handled)
{
- handled = Navigate(navTableRec, NB_NAVROW_REC, NB_NAVCOL_REC, &navRow, &navCol, chr);
+ handled = Navigate(navTableRec, NB_NAVROW_REC, NB_NAVCOL_REC, &navRow, &navCol, chr, 0);
}
if (!handled && (GetObjectType(fldID) == frmFieldObj) )
@@ -1373,7 +1373,7 @@
else
{
// Handle the vchrRockerCenter
- handled = Navigate(navTableRec, NB_NAVROW_REC, NB_NAVCOL_REC, &navRow, &navCol, chr);
+ handled = Navigate(navTableRec, NB_NAVROW_REC, NB_NAVCOL_REC, &navRow, &navCol, chr, 0);
}
} // End of if ONE_HAN_MODE
@@ -1585,6 +1585,7 @@
GetDateAndSelect(&(cMtn.date), MtnRecDateSelTrigger, false,
"Maintenance Date");
+ StartDate = cMtn.date;
FrmCopyLabel(frm, MtnRecOdoUnit,
getString(unitsDistAbrvLst, cCarPref->odoUnit, str));
@@ -1635,15 +1636,10 @@
FrmDrawForm(frm);
- if (globalPrefs.flags & ONE_HAND_MODE)
- {
- navRow = NB_NAVROW_REC -1;
- navCol = 0;
- // This should be done after the drawing of the form
- SetFocus(OKButton, NAV_FOCUS);
- }
- else
- navCol = noFocus;
+ navRow = NB_NAVROW_REC -1;
+ navCol = 0;
+ // This should be done after the drawing of the form
+ SetFocus(OKButton, NAV_FOCUS);
TRACE("MRFHE: Open: Stop");
break;
@@ -1930,7 +1926,7 @@
if (globalPrefs.flags & ONE_HAND_MODE)
{
- handled = Navigate(navTable, NB_NAVROW, NB_NAVCOL, &navRow, &navCol, chr);
+ handled = Navigate(navTable, NB_NAVROW, NB_NAVCOL, &navRow, &navCol, chr, 0);
}
@@ -2102,15 +2098,10 @@
&MtnTopVisibleRecord, &MtnFormDrawRecord);
MtnDrawTable(frm);
- if (globalPrefs.flags & ONE_HAND_MODE)
- {
- navRow = NB_NAVROW -1;
- navCol = 0;
- // This should be done after the drawing of the form
- SetFocus(MtnDoneButton, NAV_FOCUS);
- }
- else
- navCol = noFocus;
+ navRow = NB_NAVROW -1;
+ navCol = 0;
+ // This should be done after the drawing of the form
+ SetFocus(MtnDoneButton, NAV_FOCUS);
handled = false; // ???????????????
Modified: trunk/pFuel/Src/navigation.c
===================================================================
--- trunk/pFuel/Src/navigation.c 2007-12-12 14:46:17 UTC (rev 501)
+++ trunk/pFuel/Src/navigation.c 2008-02-06 13:34:46 UTC (rev 502)
@@ -273,7 +273,6 @@
WinEraseRectangleFrame(objFrame, &boldRect);
WinDrawRectangleFrame(focusFrame, &rect);
- FrmSetFocus(frmP, GetObjectIdx(objID));
}
else
{
@@ -364,31 +363,66 @@
Boolean
IsObjectFocusable(UInt16 objID)
{
+ TRACE("isObjectFocusable start: objID=%hu",objID);
if (IsObjectUsable(objID))
{
- DmOpenRef db = pFuelDB;
- FormType *frm = FrmGetActiveForm();
+ FormObjectKind kind = GetObjectType(objID);
+ switch (kind)
+ {
+ case frmTableObj:
+ {
+ DmOpenRef db = pFuelDB;
+ FormType *frm = FrmGetActiveForm();
+ TRACE("isObjectFocusable kind: Table");
-// if (FrmGetFormPtr(MainForm) == frm )
-// {
-// db = pFuelDB;
-// }
-// else
- if ( FrmGetFormPtr(MtnForm) == frm )
- {
- db = pFuelMtnDB;
- }
+ if (FrmGetFormPtr(MainForm) == frm )
+ {
+ db = pFuelDB;
+ }
+ else if ( FrmGetFormPtr(MtnForm) == frm )
+ {
+ db = pFuelMtnDB;
+ }
- if ( frmTableObj == GetObjectType(objID) &&
- 0 == DmNumRecordsInCategory(db, CurrentCategory) )
- {
- return false;
+ if ( 0 == DmNumRecordsInCategory(db, CurrentCategory) )
+ {
+ return false;
+ }
+ }
+ break;
+ case frmControlObj:
+ {
+ ControlStyleType style = CtlGlueGetControlStyle(GetObjectPtr(objID));
+ TRACE("isObjectFocusable kind: Control");
+
+ switch (style)
+ {
+ case buttonCtl:
+ TRACE("isObjectFocusable style: Button ... fall");
+ case pushButtonCtl:
+ TRACE("isObjectFocusable style: pushButton ... fall");
+ case popupTriggerCtl:
+ TRACE("isObjectFocusable style: TriggerCtl ... fall");
+ case selectorTriggerCtl:
+ TRACE("isObjectFocusable style: TriggerCtl");
+ TRACE("isObjectFocusable style: flags=%hu MODE=%hu rep=%hu",
+ globalPrefs.flags, ONE_HAND_MODE, !(globalPrefs.flags & ONE_HAND_MODE));
+ if ( !(globalPrefs.flags & ONE_HAND_MODE) )
+ {
+ return false;
+ }
+ break;
+ default:
+ break;
+ }
+ }
+ default:
+ TRACE("isObjectFocusable kind: default");
+ break;
}
- else
- return true;
+ return true;
}
-
return false;
}
@@ -447,8 +481,16 @@
case checkboxCtl:
UpdateFrame(objID, noFrame, boldRoundFrame, focus);
break;
- case selectorTriggerCtl:
+ case selectorTriggerCtl:
UpdateFrame(objID, simpleFrame, popupFrame, focus);
+ if (0 == focus)
+ {
+ TRACE("SetFocus redraw", objID);
+ FrmDrawForm(frmP);
+ // The draw will set the focus on the default object
+ // and we don't want that
+ SetFocus(FrmGetObjectId(frmP, FrmGetFocus(frmP)), 0);
+ }
break;
case popupTriggerCtl:
UpdateFrame(objID, noFrame, popupFrame, focus);
@@ -456,6 +498,9 @@
{
TRACE("SetFocus redraw", objID);
FrmDrawForm(frmP);
+ // The draw will set the focus on the default object
+ // and we don't want that
+ SetFocus(FrmGetObjectId(frmP, FrmGetFocus(frmP)), 0);
}
break;
default: // Used to remove warnings
@@ -881,23 +926,32 @@
* @param nbCol The number of columns in the table
* @param row The row of the item/field in Focus
* @param col The column of the item/field in Focus1
+ * @param deep The function use a recursive way to navigate the table.
+ * This indicate how deep in the recursion the current function call
+ * is.
*
* @return true if the action was handled.
+ *
+ *
+ * @note Since this function can call itself the Focus set deep in the call
+ * stack can be erase by a redraw after poping the stack of function call
*///
Boolean
Navigate(const UInt16 *navTable,const UInt16 nbRow, const UInt16 nbCol,
- UInt16 *row, UInt16 *col, WChar chr)
+ UInt16 *row, UInt16 *col, WChar chr, UInt16 deep)
{
// Those 2 variables have 2 use.
// To revert to the old position if we can't make the move
// And to remove the Focus from the previous position if we can make the move
- static UInt16 focus;
+ static UInt16 focus = 0;
UInt16 objID = 0;
- UInt16 tmpRow, tmpCol;
- FormObjectKind kind;
+ UInt16 tmpRow = *row;
+ UInt16 tmpCol = *col;
+ FormObjectKind kind=0;
+ UInt16 stack = deep + 1;
- TRACE("Navigate start: id=%hu chr=%hu row=%hu col=%hu",
- navTable[nbCol * (*row) + (*col)], chr, (*row), (*col));
+ TRACE("Navigate start: id=%hu chr=%hu row=%hu col=%hu stack=%hu",
+ navTable[nbCol * (*row) + (*col)], chr, (*row), (*col), stack);
focus |= NAV_FOCUS;
@@ -908,7 +962,8 @@
else
{
objID = navTable[nbCol * (*row) + (*col)];
- kind = GetObjectType(objID);
+ if (objID)
+ kind = GetObjectType(objID);
}
@@ -937,8 +992,6 @@
case vchrRockerLeft:
TRACE("Navigate: Left");
- tmpCol = (*col);
-
// Move left until we find something on the left or go out of the table
// We also check for col < 255 since --((UInt16) 0) =>
for (--(*col); ((*col) >= 0) && (*col) < 65535 &&
@@ -948,9 +1001,8 @@
/* Everything is done in the for loop */ ;
if ((*col) >= 0 && (*col) < 65535 && IsObjectFocusable(objID) )
- {
- SetFocus(navTable[nbCol * (*row) + tmpCol], 0);
- SetFocus(navTable[nbCol * (*row) + (*col)], NAV_FOCUS);
+ {
+ // Nothing to do here
}
else
{
@@ -962,7 +1014,6 @@
case vchrRockerRight:
{
TRACE("Navigate: Right");
- tmpCol = (*col);
// Move right until we find something on the left or go out of the table
for (++(*col); ((*col) < nbCol) &&
@@ -972,9 +1023,8 @@
/* Everything is done in the for loop */ ;
if ((*col) < nbCol && IsObjectFocusable(navTable[nbCol * (*row) + (*col)]) )
- {
- SetFocus(navTable[nbCol * (*row) + tmpCol], 0);
- SetFocus(navTable[nbCol * (*row) + (*col)], NAV_FOCUS);
+ {
+ // Nothing to do here
}
else
{
@@ -995,24 +1045,20 @@
// Keep a copy of the old position since we might not be
// able to do the move
- tmpRow = *row;
- tmpCol = *col;
-
- if ( (*row) < (nbRow -1) )
+ if ( (*row) < (nbRow -1) )
{
if ( (objID = navTable[(nbCol * (++(*row))) + (*col)]) && // realy a = not a ==
IsObjectFocusable(objID) )
{
- SetFocus(navTable[nbCol * tmpRow + (*col)], 0);
- SetFocus(navTable[nbCol * (*row) + (*col)], NAV_FOCUS);
+ // Nothing to do here
}
- else if( Navigate(navTable, nbRow, nbCol, row, col, vchrRockerLeft) )
- {
- SetFocus(navTable[nbCol * tmpRow + tmpCol], 0);
+ else if( Navigate(navTable, nbRow, nbCol, row, col, vchrRockerLeft, stack) )
+ {
+ // Nothing to do here
}
- else if ( Navigate(navTable, nbRow, nbCol, row, col, vchrRockerDown) )
+ else if ( Navigate(navTable, nbRow, nbCol, row, col, vchrRockerDown, stack) )
{
- SetFocus(navTable[nbCol * tmpRow + tmpCol], 0);
+ // Nothing to do here
}
else
{
@@ -1030,24 +1076,19 @@
case vchrPrevField:
TRACE("Navigate: Up");
- tmpRow = *row;
- tmpCol = *col;
-
- if ( (*row) > 0 )
+ if ( (*row) > 0 )
{
if ( (objID = navTable[(nbCol * (--(*row))) + (*col)]) && // realy a = not a ==
IsObjectFocusable(objID) )
{
- SetFocus(navTable[nbCol * tmpRow + (*col)], 0);
- SetFocus(navTable[nbCol * (*row) + (*col)], NAV_FOCUS);
focus |= NAV_TABLE_FOCUS;
}
- else if( Navigate(navTable, nbRow, nbCol, row, col, vchrRockerLeft) )
- {
- SetFocus(navTable[nbCol * tmpRow + tmpCol], 0);
- }
- else if ( Navigate(navTable, nbRow, nbCol, row, col, vchrRockerUp) )
+ else if( Navigate(navTable, nbRow, nbCol, row, col, vchrRockerLeft, stack) )
{
+ // Nothing to do here
+ }
+ else if ( Navigate(navTable, nbRow, nbCol, row, col, vchrRockerUp, stack) )
+ {
SetFocus(navTable[nbCol * tmpRow + tmpCol], 0);
}
else
@@ -1065,6 +1106,14 @@
break;
}
+ --stack;
+ if (0 == stack)
+ {
+ SetFocus(navTable[nbCol * tmpRow + tmpCol], 0);
+ SetFocus(navTable[nbCol * (*row) + (*col)], NAV_FOCUS);
+ }
+
+
if ( navTable[nbCol * (*row) + (*col)] == Table)
focus |= NAV_TABLE_FOCUS;
else
@@ -1092,20 +1141,17 @@
FindRowColInFocus(UInt16 *row, UInt16 *col, const UInt16 nbRow, const UInt16 nbCol,
const UInt16 navTable[], const UInt16 idInFocus)
{
+ UInt16 i=0;
+
SetFocus(navTable[nbCol * (*row) + *col], 0);
- if (globalPrefs.flags & ONE_HAND_MODE)
+ for (/*already done */; i < (nbRow*nbCol); ++i)
{
- UInt16 i=0;
- for (/*already done */; i < (nbRow*nbCol); ++i)
+ if (navTable[i] == idInFocus)
{
- if (navTable[i] == idInFocus)
- {
- *row = i / nbCol;
- *col = i % nbCol;
- SetFocus(navTable[nbCol * (*row) + (*col)], NAV_FOCUS);
- return;
- }
+ *row = i / nbCol;
+ *col = i % nbCol;
+ SetFocus(navTable[nbCol * (*row) + (*col)], NAV_FOCUS);
+ return;
}
}
-
}
Modified: trunk/pFuel/Src/navigation.h
===================================================================
--- trunk/pFuel/Src/navigation.h 2007-12-12 14:46:17 UTC (rev 501)
+++ trunk/pFuel/Src/navigation.h 2008-02-06 13:34:46 UTC (rev 502)
@@ -62,7 +62,7 @@
EXTERN Boolean Navigate(const UInt16 *navTable,
const UInt16 nbRow, const UInt16 nbCol,
- UInt16 *row, UInt16 *col, WChar chr) NAV_SECTION;
+ UInt16 *row, UInt16 *col, WChar chr, UInt16 deep) NAV_SECTION;
EXTERN void FindRowColInFocus(UInt16 *row, UInt16 *col,
const UInt16 nbRow, const UInt16 nbCol,
Modified: trunk/pFuel/Src/pFuel.c
===================================================================
--- trunk/pFuel/Src/pFuel.c 2007-12-12 14:46:17 UTC (rev 501)
+++ trunk/pFuel/Src/pFuel.c 2008-02-06 13:34:46 UTC (rev 502)
@@ -876,7 +876,7 @@
if (globalPrefs.flags & ONE_HAND_MODE)
{
- handled = Navigate(navTable, NB_NAVROW, NB_NAVCOL, &navRow, &navCol, chr);
+ handled = Navigate(navTable, NB_NAVROW, NB_NAVCOL, &navRow, &navCol, chr, 0);
}
else
{
Modified: trunk/pFuel/Src/pFuel.rcp.in
===================================================================
--- trunk/pFuel/Src/pFuel.rcp.in 2007-12-12 14:46:17 UTC (rev 501)
+++ trunk/pFuel/Src/pFuel.rcp.in 2008-02-06 13:34:46 UTC (rev 502)
@@ -95,6 +95,7 @@
"Mi" = "Mi"
"Miles" = "Miles"
"Miles/Gallon" = "Miles/Gallon"
+"Miles/L" = "Miles/L"
"Miles/US Gallon" = "Miles/US Gallon"
"Missing Data" = "Missing Data"
"Months" = "Months"
@@ -299,7 +300,7 @@
CHECKBOX "Full Tank" ID AddPetrolFullTankCheckbox AT (11 120 AUTO AUTO) LEFTANCHOR GROUP AddPetrolFormGroupID
CHECKBOX "Missing Data" ID AddPetrolMissingRecordCheckbox AT (PREVLEFT PREVTOP+12 AUTO AUTO) LEFTANCHOR GROUP AddPetrolFormGroupID
- BUTTON "Note..." ID AddPetrolNoteButton AT (120 130 AUTO AUTO) LEFTANCHOR
+ BUTTON "Note..." ID AddPetrolNoteButton AT (RIGHT@158 130 AUTO AUTO) LEFTANCHOR
BUTTON "OK" ID OKButton AT (1 147 AUTO AUTO) LEFTANCHOR
BUTTON "Cancel" ID AddPetrolCancelButton AT (PREVRIGHT+4 PREVTOP AUTO AUTO) LEFTANCHOR
@@ -327,8 +328,8 @@
SCROLLBAR ID Scrollbar AT (PREVRIGHT PREVTOP 7 PREVBOTTOM-PREVTOP) USABLE VALUE 0 MIN 0 MAX 9 PAGESIZE 3
- BUTTON "Done" ID MtnDoneButton AT (1 147 36 12) LEFTANCHOR
- BUTTON "Add" ID MtnAddButton AT (PREVRIGHT+4 PREVTOP AUTO 12) LEFTANCHOR
+ BUTTON "Done" ID MtnDoneButton AT (1 147 AUTO AUTO) LEFTANCHOR
+ BUTTON "Add" ID MtnAddButton AT (PREVRIGHT+4 PREVTOP AUTO AUTO) LEFTANCHOR
END
// Note: The Label "MtnRecOdoUnit" must be large enough to contain the
@@ -383,7 +384,7 @@
- BUTTON "Note..." ID MtnRecNoteButton AT (120 130 AUTO AUTO) LEFTANCHOR
+ BUTTON "Note..." ID MtnRecNoteButton AT (RIGHT@158 130 AUTO AUTO) LEFTANCHOR
BUTTON "OK" ID OKButton AT (1 147 AUTO AUTO) LEFTANCHOR
BUTTON "Cancel" ID CancelButton AT (PREVRIGHT+4 PrevTop AUTO AUTO) LEFTANCHOR
@@ -549,7 +550,7 @@
LABEL " " ID StatFormLine9Label AT (0 PREVTOP+12)
FIELD ID StatFormLine9Value AT (PREVLEFT+100 PREVTOP 45 12) FONT 1 MAXCHARS 8 NONEDITABLE RIGHTALIGN
- BUTTON "Note..." ID NoteButton AT (120 130 AUTO AUTO) LEFTANCHOR
+ BUTTON "Note..." ID NoteButton AT (RIGHT@158 130 AUTO AUTO) LEFTANCHOR
BUTTON "Done" ID StatFormDoneButton AT (1 147 AUTO AUTO) LEFTANCHOR
@@ -695,7 +696,7 @@
LABEL "Efficiency:" ID PreferencesFuelEffLabel AT (10 PREVTOP+12)
POPUPTRIGGER "" ID PreferencesEfficiencyPopTrigger AT (PREVLEFT+50 PREVTOP AUTO 12) LEFTANCHOR
- LIST "L/100Km" "Km/L" "Km/Gal" "Miles/Gallon" "Km/US Gallon" "Miles/US Gallon" ID PreferencesEfficiencyList AT (PREVLEFT+10 PREVTOP+2 AUTO AUTO) VISIBLEITEMS 6 NONUSABLE DISABLED
+ LIST "L/100Km" "Km/L" "Km/Gal" "Miles/Gallon" "Km/US Gallon" "Miles/US Gallon" "Miles/L" ID PreferencesEfficiencyList AT (PREVLEFT+10 PREVTOP+2 AUTO AUTO) VISIBLEITEMS 7 NONUSABLE DISABLED
POPUPLIST ID PreferencesEfficiencyPopTrigger PreferencesEfficiencyList
LABEL "Decimal places:" ID PreferencesDecimalLabel AT (3 PREVTOP+12) FONT 1
@@ -963,7 +964,7 @@
"L" "Gal" "USG"
STRINGTABLE ID STR_EFF_UNIT_ABVR
- "L/100Km" "Km/L" "Km/Gal" "MPG" "Km/Gal" "MPG"
+ "L/100Km" "Km/L" "Km/Gal" "MPG" "Km/Gal" "MPG" "M/L"
STRINGTABLE ID STR_GRAPHS_TYPE
"Efficiency " "Price/Volume"
Modified: trunk/pFuel/Src/pfRecord.c
===================================================================
--- trunk/pFuel/Src/pfRecord.c 2007-12-12 14:46:17 UTC (rev 501)
+++ trunk/pFuel/Src/pfRecord.c 2008-02-06 13:34:46 UTC (rev 502)
@@ -720,7 +720,7 @@
// maybe we want to navigate
if (!handled)
{
- handled = Navigate(navTable, NB_NAVROW, NB_NAVCOL, &navRow, &navCol, chr);
+ handled = Navigate(navTable, NB_NAVROW, NB_NAVCOL, &navRow, &navCol, chr, 0);
}
if (!handled && (GetObjectType(fldID) == frmFieldObj))
@@ -737,7 +737,7 @@
else
{
// Handle the vchrRockerCenter
- handled = Navigate(navTable, NB_NAVROW, NB_NAVCOL, &navRow, &navCol, chr);
+ handled = Navigate(navTable, NB_NAVROW, NB_NAVCOL, &navRow, &navCol, chr, 0);
}
} // End of if ONE_HAN_MODE
@@ -827,11 +827,11 @@
static Int16 released;
WChar chr = eventP->data.keyDown.chr;
- { // DEVEL
- float tata;
- TRACE("AddPetrolHandleEvent: start");
- ParseFixed(AddPetrolLitresField, &tata);
- }
+// { // DEVEL
+// float tata;
+// TRACE("AddPetrolHandleEvent: start");
+// ParseFixed(AddPetrolLitresField, &tata);
+// }
switch (eventP->eType)
@@ -999,17 +999,13 @@
// Check if this as effect
+ navRow = 3;
+ navCol = 2;
if (globalPrefs.flags & ONE_HAND_MODE)
{
- navRow = 3;
- navCol = 2;
SetFocus(AddPetrolMileageField, true);
changeDigit = false;
- if (0 != EvtEnqueueKey(vchrRockerCenter, 0, commandKeyMask) )
- {
- TRACE("AddPetrolHandleEvent: Problem sending the key event");
- }
}
else
navCol = noFocus;
@@ -1017,14 +1013,9 @@
else
{
// Check if this as effect
- if (globalPrefs.flags & ONE_HAND_MODE)
- {
- navRow = NB_NAVROW -1;
- navCol = 0;
- SetFocus(OKButton, true);
- }
- else
- navCol = noFocus;
+ navRow = NB_NAVROW -1;
+ navCol = 0;
+ SetFocus(OKButton, true);
hNewTitle = DmGetResource(strRsc, STR_TITLE_PETROL_FORM_MODIFYING);
Modified: trunk/pFuel/Src/preferences.c
===================================================================
--- trunk/pFuel/Src/preferences.c 2007-12-12 14:46:17 UTC (rev 501)
+++ trunk/pFuel/Src/preferences.c 2008-02-06 13:34:46 UTC (rev 502)
@@ -131,7 +131,7 @@
{
{
// Handle the vchrRockerCenter
- handled = Navigate(navTable, NB_NAVROW, NB_NAVCOL, &navRow, &navCol, chr);
+ handled = Navigate(navTable, NB_NAVROW, NB_NAVCOL, &navRow, &navCol, chr, 0);
}
} // End of if ONE_HAN_MODE
@@ -403,7 +403,7 @@
{
// Handle the vchrRockerCenter
- handled = Navigate(navTable, G_NB_NAVROW, G_NB_NAVCOL, &navRow, &navCol, chr);
+ handled = Navigate(navTable, G_NB_NAVROW, G_NB_NAVCOL, &navRow, &navCol, chr, 0);
}
} // End of if ONE_HAN_MODE
}
Modified: trunk/pFuel/Src/utility.c
===================================================================
--- trunk/pFuel/Src/utility.c 2007-12-12 14:46:17 UTC (rev 501)
+++ trunk/pFuel/Src/utility.c 2008-02-06 13:34:46 UTC (rev 502)
@@ -288,6 +288,11 @@
// Convert volume to gallons
return ( (d*D_KM2M)/(v*D_L2USG) );
break;
+ case MPL:
+ // Convert distance to miles
+ // Convert volume to litres. We don't need convertion
+ return ( (d*D_KM2M)/v );
+ break;
case KMPL:
// Convert distance to Km. We dont't need convertion
// Convert volume to litres. We don't need convertion
@@ -826,7 +831,7 @@
if (!hnd)
{
- TRACE("Could not Parse field %d", FieldID);
+// TRACE("Could not Parse field %d", FieldID);
return false;
}
Modified: trunk/pFuel/Src/utils.h
===================================================================
--- trunk/pFuel/Src/utils.h 2007-12-12 14:46:17 UTC (rev 501)
+++ trunk/pFuel/Src/utils.h 2008-02-06 13:34:46 UTC (rev 502)
@@ -51,7 +51,7 @@
enum FuelUnits {LITRES, GALLONS, USGALLONS };
enum OdoUnits {KM, MILES };
-enum EffUnits {LP100KM, KMPL, KMPG, MPG, KMPUSG, MPUSG};
+enum EffUnits {LP100KM, KMPL, KMPG, MPG, KMPUSG, MPUSG, MPL};
enum COLUMN {COLUMN_CATEGORY, COLUMN_DATE, COLUMN_VOLUME, COLUMN_DISTANCE};
/// This include the '\0' caractere so the real string is STR_LEN-1 long.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pa...@us...> - 2007-12-12 14:46:12
|
Revision: 501
http://pfuel.svn.sourceforge.net/pfuel/?rev=501&view=rev
Author: papaDoc
Date: 2007-12-12 06:46:17 -0800 (Wed, 12 Dec 2007)
Log Message:
-----------
20071204-RR-01
- Features:
- Add POLSKI translation
- Bug:
- Bug: 1841416 and 1824049: Trying to select a field to enter data in the
Add form crash the application for some Palm.
- Make the Done button to ajust its size automatically depending on the
language used.
- Change the way the Note... button is possitionned to avoid extenting out
of the screen when using different language.
- In the Maintenance form. If there is value in the description field and
the date is checked but not changed the application can crash.
- Fix a problem when running with a debug ROM
Modified Paths:
--------------
branches/pFuel-0-04-stable/pFuel/CHANGELOG
branches/pFuel-0-04-stable/pFuel/README
Modified: branches/pFuel-0-04-stable/pFuel/CHANGELOG
===================================================================
--- branches/pFuel-0-04-stable/pFuel/CHANGELOG 2007-12-12 14:45:02 UTC (rev 500)
+++ branches/pFuel-0-04-stable/pFuel/CHANGELOG 2007-12-12 14:46:17 UTC (rev 501)
@@ -12,8 +12,23 @@
#
#------------------------------------------------------------
+Version 0.04.05
+20071204-RR-01
+ - Features:
+ - Add POLSKI translation
+ - Bug:
+ - Bug: 1841416 and 1824049: Trying to select a field to enter data in the
+ Add form crash the application for some Palm.
+ - Make the Done button to ajust its size automatically depending on the
+ language used.
+ - Change the way the Note... button is possitionned to avoid extenting out
+ of the screen when using different language.
+ - In the Maintenance form. If there is value in the description field and
+ the date is checked but not changed the application can crash.
+ - Fix a problem when running with a debug ROM
+
Version 0.04.04
-27092007-RR-01
+20070927-RR-01
- Bug #1792788: Selecting Field with Stylus not working.
- Fix the bug for the maintenance form
Modified: branches/pFuel-0-04-stable/pFuel/README
===================================================================
--- branches/pFuel-0-04-stable/pFuel/README 2007-12-12 14:45:02 UTC (rev 500)
+++ branches/pFuel-0-04-stable/pFuel/README 2007-12-12 14:46:17 UTC (rev 501)
@@ -33,8 +33,8 @@
pFuel_gl.prc : Versi\xF3n Galega
pFuel_it.prc : Italian version
pFuel_nl.prc : Nederlandstalige versie
+pFuel_po.prc : Polski version
-
N.B. If you want to make a translation you can ask me for the string
at pa...@vi...
N.B. If you find a string not translated you can make the translation
@@ -154,7 +154,7 @@
You should now have pFuel.prc r pFuel_xx.prc
If you plan to help with development of pFuel please use the latest copy
-from CVS. It can be found at:
+from Subversion. It can be found at:
http://sourceforge.net/projects/pfuel/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pa...@us...> - 2007-12-12 14:44:58
|
Revision: 500
http://pfuel.svn.sourceforge.net/pfuel/?rev=500&view=rev
Author: papaDoc
Date: 2007-12-12 06:45:02 -0800 (Wed, 12 Dec 2007)
Log Message:
-----------
20071204-RR-01
- Features:
- Add POLSKI translation
- Bug:
- Bug: 1841416 and 1824049: Trying to select a field to enter data in the
Add form crash the application for some Palm.
- Make the Done button to ajust its size automatically depending on the
language used.
- Change the way the Note... button is possitionned to avoid extenting out
of the screen when using different language.
- In the Maintenance form. If there is value in the description field and
the date is checked but not changed the application can crash.
- Fix a problem when running with a debug ROM
Modified Paths:
--------------
branches/pFuel-0-04-stable/pFuel/Src/Makefile
branches/pFuel-0-04-stable/pFuel/Src/graph.c
branches/pFuel-0-04-stable/pFuel/Src/maintenance.c
branches/pFuel-0-04-stable/pFuel/Src/navigation.c
branches/pFuel-0-04-stable/pFuel/Src/pFuel.rcp.in
branches/pFuel-0-04-stable/pFuel/Src/pFuel.ver
branches/pFuel-0-04-stable/pFuel/Src/pfRecord.c
Added Paths:
-----------
branches/pFuel-0-04-stable/pFuel/Src/pFuel.rcp.in.po
Property Changed:
----------------
branches/pFuel-0-04-stable/pFuel/Src/cnvtFLog.c
branches/pFuel-0-04-stable/pFuel/Src/cnvtFLog.h
branches/pFuel-0-04-stable/pFuel/Src/cnvtFLogRsc.h
branches/pFuel-0-04-stable/pFuel/Src/export.c
branches/pFuel-0-04-stable/pFuel/Src/export.h
branches/pFuel-0-04-stable/pFuel/Src/fuelStats.c
branches/pFuel-0-04-stable/pFuel/Src/fuelStats.h
branches/pFuel-0-04-stable/pFuel/Src/graph.c
branches/pFuel-0-04-stable/pFuel/Src/graph.h
branches/pFuel-0-04-stable/pFuel/Src/maintenance.c
branches/pFuel-0-04-stable/pFuel/Src/maintenance.h
branches/pFuel-0-04-stable/pFuel/Src/navigation.c
branches/pFuel-0-04-stable/pFuel/Src/navigation.h
branches/pFuel-0-04-stable/pFuel/Src/note.c
branches/pFuel-0-04-stable/pFuel/Src/note.h
branches/pFuel-0-04-stable/pFuel/Src/pFuel.c
branches/pFuel-0-04-stable/pFuel/Src/pFuel.h
branches/pFuel-0-04-stable/pFuel/Src/pFuelRsc.h
branches/pFuel-0-04-stable/pFuel/Src/pfRecord.c
branches/pFuel-0-04-stable/pFuel/Src/pfRecord.h
branches/pFuel-0-04-stable/pFuel/Src/preferences.c
branches/pFuel-0-04-stable/pFuel/Src/preferences.h
branches/pFuel-0-04-stable/pFuel/Src/section.h
branches/pFuel-0-04-stable/pFuel/Src/utility.c
branches/pFuel-0-04-stable/pFuel/Src/utility.h
branches/pFuel-0-04-stable/pFuel/Src/utils.c
branches/pFuel-0-04-stable/pFuel/Src/utils.h
Modified: branches/pFuel-0-04-stable/pFuel/Src/Makefile
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/Makefile 2007-09-27 12:33:19 UTC (rev 499)
+++ branches/pFuel-0-04-stable/pFuel/Src/Makefile 2007-12-12 14:45:02 UTC (rev 500)
@@ -1,7 +1,7 @@
LANG = # Default is english
LANGUAGE = ENGLISH
-LANGUAGES = br ca cs es fr ge gl it nl
+LANGUAGES = br ca cs es fr ge gl it nl po
ifeq ($(lang),br)
LANG = _br
@@ -48,8 +48,13 @@
LANGUAGE = DUTCH
endif
+ifeq ($(lang),po)
+ LANG = _po
+ LANGUAGE = POLSKI
+endif
+
# Verifier si deja definie
# Specific to a given APP
#==========================
Property changes on: branches/pFuel-0-04-stable/pFuel/Src/cnvtFLog.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: branches/pFuel-0-04-stable/pFuel/Src/cnvtFLog.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: branches/pFuel-0-04-stable/pFuel/Src/cnvtFLogRsc.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: branches/pFuel-0-04-stable/pFuel/Src/export.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: branches/pFuel-0-04-stable/pFuel/Src/export.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: branches/pFuel-0-04-stable/pFuel/Src/fuelStats.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: branches/pFuel-0-04-stable/pFuel/Src/fuelStats.h
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: branches/pFuel-0-04-stable/pFuel/Src/graph.c
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/graph.c 2007-09-27 12:33:19 UTC (rev 499)
+++ branches/pFuel-0-04-stable/pFuel/Src/graph.c 2007-12-12 14:45:02 UTC (rev 500)
@@ -127,7 +127,6 @@
GraphDrawGraph(FormType *frm, Int16 category, UInt16 effUnit)
{
Boolean fullTankRequired;
-
struct fuelcursor *curs;
UInt32 version;
float max = 0, min = 9999999, avg = 0, total=0;
@@ -150,6 +149,7 @@
RectangleType myRect;
const CustomPatternType pattern = { 0xf0, 0xf0, 0x0f, 0x0f, 0xf0, 0xf0, 0x0f, 0x0f };
+ TRACE("Ici 2.1");
switch (graphType)
@@ -162,6 +162,12 @@
break;
}
+ // This is used to avoid a problem with a debug rom
+ // Error: read from memory location 0x80000020
+ FrmDrawForm(frm);
+
+
+ TRACE("Ici 2.2");
strLst = MemHandleLock(DmGetResource('tSTL', STR_GRAPHS_TYPE));
title = (Char *)FrmGetTitle(frm);
FrmSetTitle(frm, getString(strLst, graphType - GraphFormMenu, title));
@@ -169,21 +175,26 @@
setCarCategoryLabel(pFuelDB, GraphCarPopTrigger, GraphCarList,
category);
-
+ TRACE("Ici 2.3");
FormSetDates(frm, datefilterset, DateFilterCheckbox,
FromSelTrigger, ToSelTrigger, DateFilterToLabel);
+ TRACE("Ici 2.4");
myRect.topLeft.x=0;
myRect.topLeft.y=0;
myRect.extent.x=160;
myRect.extent.y=160;
+ TRACE("Ici 2.4.1");
WinEraseRectangle(&myRect,0);
+ TRACE("Ici 2.4.2");
FrmDrawForm(frm);
+ TRACE("Ici 2.4.3");
r.topLeft.x = 0;
r.topLeft.y = 15;
r.extent.x = 160;
r.extent.y = 115;
+ TRACE("Ici 2.5");
FtrGet(sysFtrCreator, sysFtrNumWinVersion, &version);
@@ -198,10 +209,13 @@
r.topLeft.y += (FntCharHeight()/2.0);
r.extent.y -= (FntCharHeight()/2.0);
+ TRACE("Ici 2.6");
+
WinEraseRectangle(&r, 0);
currFont = FntSetFont(stdFont);
+ TRACE("Ici 2.7");
// Find min and max for y and the number of item
curs = firstFuel(fullTankRequired, category, 0);
@@ -455,7 +469,11 @@
FormType *frm;
Int16 error;
+ TRACE("Ici 1");
+
frm = FrmGetActiveForm();
+ TRACE("Ici 1.1");
+
switch (eventP->eType)
{
case menuEvent:
Property changes on: branches/pFuel-0-04-stable/pFuel/Src/graph.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: branches/pFuel-0-04-stable/pFuel/Src/graph.h
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: branches/pFuel-0-04-stable/pFuel/Src/maintenance.c
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/maintenance.c 2007-09-27 12:33:19 UTC (rev 499)
+++ branches/pFuel-0-04-stable/pFuel/Src/maintenance.c 2007-12-12 14:45:02 UTC (rev 500)
@@ -1473,6 +1473,7 @@
GetDateAndSelect(&(cMtn.date), MtnRecDateSelTrigger, false,
"Maintenance Date");
+ StartDate = cMtn.date;
FrmCopyLabel(frm, MtnRecOdoUnit,
getString(unitsDistAbrvLst, cCarPref->odoUnit, str));
@@ -1523,15 +1524,10 @@
FrmDrawForm(frm);
- if (globalPrefs.flags & ONE_HAND_MODE)
- {
- navRow = NB_NAVROW_REC -1;
- navCol = 0;
- // This should be done after the drawing of the form
- SetFocus(OKButton, NAV_FOCUS);
- }
- else
- navCol = noFocus;
+ navRow = NB_NAVROW_REC -1;
+ navCol = 0;
+ // This should be done after the drawing of the form
+ SetFocus(OKButton, NAV_FOCUS);
TRACE("MRFHE: Open: Stop");
break;
@@ -1818,6 +1814,8 @@
}
TblRedrawTable(GetObjectPtr(Table));
+
+ TRACE("MFDT: End");
}
/**
@@ -2016,15 +2014,10 @@
&MtnTopVisibleRecord, &MtnFormDrawRecord);
MtnDrawTable(frm);
- if (globalPrefs.flags & ONE_HAND_MODE)
- {
- navRow = NB_NAVROW -1;
- navCol = 0;
- // This should be done after the drawing of the form
- SetFocus(MtnDoneButton, NAV_FOCUS);
- }
- else
- navCol = noFocus;
+ navRow = NB_NAVROW -1;
+ navCol = 0;
+ // This should be done after the drawing of the form
+ SetFocus(MtnDoneButton, NAV_FOCUS);
handled = false; // ???????????????
Property changes on: branches/pFuel-0-04-stable/pFuel/Src/maintenance.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: branches/pFuel-0-04-stable/pFuel/Src/maintenance.h
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: branches/pFuel-0-04-stable/pFuel/Src/navigation.c
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/navigation.c 2007-09-27 12:33:19 UTC (rev 499)
+++ branches/pFuel-0-04-stable/pFuel/Src/navigation.c 2007-12-12 14:45:02 UTC (rev 500)
@@ -366,28 +366,56 @@
{
if (IsObjectUsable(objID))
{
- DmOpenRef db;
- FormType *frm = FrmGetActiveForm();
+ FormObjectKind kind = GetObjectType(objID);
+ switch (kind)
+ {
+ case frmTableObj:
+ {
+ DmOpenRef db;
+ FormType *frm = FrmGetActiveForm();
- if (FrmGetFormPtr(MainForm) == frm )
- {
- db = pFuelDB;
- }
- else if ( FrmGetFormPtr(MtnForm) == frm )
- {
- db = pFuelMtnDB;
- }
+ if (FrmGetFormPtr(MainForm) == frm )
+ {
+ db = pFuelDB;
+ }
+ else if ( FrmGetFormPtr(MtnForm) == frm )
+ {
+ db = pFuelMtnDB;
+ }
- if ( frmTableObj == GetObjectType(objID) &&
- 0 == DmNumRecordsInCategory(db, CurrentCategory) )
- {
- return false;
+ if ( 0 == DmNumRecordsInCategory(db, CurrentCategory) )
+ {
+ return false;
+ }
+ }
+ break;
+ case frmControlObj:
+ {
+ ControlStyleType style = CtlGlueGetControlStyle(GetObjectPtr(objID));
+ switch (style)
+ {
+ case buttonCtl:
+ if (!(globalPrefs.flags & ONE_HAND_MODE) )
+ {
+ return false;
+ }
+ break;
+ case pushButtonCtl:
+ if (!(globalPrefs.flags & ONE_HAND_MODE) )
+ {
+ return false;
+ }
+ break;
+ default:
+ break;
+ }
+ }
+ default:
+ break;
}
- else
return true;
- }
-
+ }
return false;
}
@@ -661,7 +689,6 @@
case vchrRockerCenter :
{
UInt16 focus = NAV_FOCUS;
- TRACE("NavigateList: RockerCenter");
Select(navTable[nbCol * (*row) + (*col)], nbRow, row, col, &focus);
FrmDrawForm(FrmGetActiveForm());
UpdateFrame(navTable[nbCol * (*row) + (*col)], noFrame, popupFrame, NAV_FOCUS);
@@ -1079,7 +1106,8 @@
}
////////////////////////////////////////////////////////////////////////////////
-///
+/// This function find the row and column number in the navigation table
+/// when an id in the form is provided.
///
/// @param row
/// @param col
@@ -1091,17 +1119,18 @@
FindRowColInFocus(UInt16 *row, UInt16 *col, const UInt16 nbRow, const UInt16 nbCol,
const UInt16 navTable[], const UInt16 idInFocus)
{
- if (globalPrefs.flags & ONE_HAND_MODE)
+ UInt16 i=0;
+
+ SetFocus(navTable[nbCol * (*row) + *col], 0);
+ for (/*already done */; i < (nbRow*nbCol); ++i)
{
- UInt16 i=0;
- for (/*already done */; i < (nbRow*nbCol); ++i)
+ if (navTable[i] == idInFocus)
{
- if (navTable[i] == idInFocus)
- {
- *row = i / nbCol;
- *col = i % nbCol;
- return;
- }
+ *row = i / nbCol;
+ *col = i % nbCol;
+ SetFocus(navTable[nbCol * (*row) + (*col)], NAV_FOCUS);
+ TRACE("5.1.1");
+ return;
}
}
}
Property changes on: branches/pFuel-0-04-stable/pFuel/Src/navigation.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: branches/pFuel-0-04-stable/pFuel/Src/navigation.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: branches/pFuel-0-04-stable/pFuel/Src/note.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: branches/pFuel-0-04-stable/pFuel/Src/note.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: branches/pFuel-0-04-stable/pFuel/Src/pFuel.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: branches/pFuel-0-04-stable/pFuel/Src/pFuel.h
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: branches/pFuel-0-04-stable/pFuel/Src/pFuel.rcp.in
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/pFuel.rcp.in 2007-09-27 12:33:19 UTC (rev 499)
+++ branches/pFuel-0-04-stable/pFuel/Src/pFuel.rcp.in 2007-12-12 14:45:02 UTC (rev 500)
@@ -173,9 +173,11 @@
#include "pFuel.rcp.in.es"
#include "pFuel.rcp.in.fr"
#include "pFuel.rcp.in.ge"
-#include "pFuel.rcp.in.nl"
-#include "pFuel.rcp.in.it"
#include "pFuel.rcp.in.gl"
+#include "pFuel.rcp.in.it"
+#include "pFuel.rcp.in.nl"
+#include "pFuel.rcp.in.po"
+
#define kFrmNavHeaderFlagsObjectFocusStartState 0x00000001
#define kFrmNavHeaderFlagsAppFocusStartState 0x00000002
@@ -299,7 +301,7 @@
CHECKBOX "Full Tank" ID AddPetrolFullTankCheckbox AT (11 120 AUTO AUTO) LEFTANCHOR GROUP AddPetrolFormGroupID
CHECKBOX "Missing Data" ID AddPetrolMissingRecordCheckbox AT (PREVLEFT PREVTOP+12 AUTO AUTO) LEFTANCHOR GROUP AddPetrolFormGroupID
- BUTTON "Note..." ID AddPetrolNoteButton AT (120 130 AUTO AUTO) LEFTANCHOR
+ BUTTON "Note..." ID AddPetrolNoteButton AT (RIGHT@158 130 AUTO AUTO) LEFTANCHOR
BUTTON "OK" ID OKButton AT (1 147 AUTO AUTO) LEFTANCHOR
BUTTON "Cancel" ID AddPetrolCancelButton AT (PREVRIGHT+4 PREVTOP AUTO AUTO) LEFTANCHOR
@@ -327,7 +329,7 @@
SCROLLBAR ID Scrollbar AT (PREVRIGHT PREVTOP 7 PREVBOTTOM-PREVTOP) USABLE VALUE 0 MIN 0 MAX 9 PAGESIZE 3
- BUTTON "Done" ID MtnDoneButton AT (1 147 36 12) LEFTANCHOR
+ BUTTON "Done" ID MtnDoneButton AT (1 147 AUTO AUTO) LEFTANCHOR
BUTTON "Add" ID MtnAddButton AT (PREVRIGHT+4 PREVTOP AUTO 12) LEFTANCHOR
END
@@ -383,7 +385,7 @@
- BUTTON "Note..." ID MtnRecNoteButton AT (120 130 AUTO AUTO) LEFTANCHOR
+ BUTTON "Note..." ID MtnRecNoteButton AT (RIGHT@158 130 AUTO AUTO) LEFTANCHOR
BUTTON "OK" ID OKButton AT (1 147 AUTO AUTO) LEFTANCHOR
BUTTON "Cancel" ID CancelButton AT (PREVRIGHT+4 PrevTop AUTO AUTO) LEFTANCHOR
@@ -549,7 +551,7 @@
LABEL " " ID StatFormLine9Label AT (0 PREVTOP+12)
FIELD ID StatFormLine9Value AT (PREVLEFT+100 PREVTOP 45 12) FONT 1 MAXCHARS 8 NONEDITABLE RIGHTALIGN
- BUTTON "Note..." ID NoteButton AT (120 130 AUTO AUTO) LEFTANCHOR
+ BUTTON "Note..." ID NoteButton AT (RIGHT@158 130 AUTO AUTO) LEFTANCHOR
BUTTON "Done" ID StatFormDoneButton AT (1 147 AUTO AUTO) LEFTANCHOR
Added: branches/pFuel-0-04-stable/pFuel/Src/pFuel.rcp.in.po
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/pFuel.rcp.in.po (rev 0)
+++ branches/pFuel-0-04-stable/pFuel/Src/pFuel.rcp.in.po 2007-12-12 14:45:02 UTC (rev 500)
@@ -0,0 +1,189 @@
+/**
+ *
+ * @file pFuel.prc.in.po
+ *
+ * @author Remi Ricard <pa...@vi...>
+ * @date 2007/11/09 (created)
+ * @date $Date: $ (last revision)
+ *
+ *
+ * DESCRIPTION:
+ * This file is included by pFuel.prc.in It contains the
+ * Polish translation of the strings done by Marcin Wegienek
+ *
+ * $Revision:$
+ *g1
+ * @remarks None
+ *
+ *///
+
+TRANSLATION "POLSKI"
+BEGIN
+"About..." = "O..."
+"About pFuel" = "O pFuel"
+"Add" = "Dodaj"
+"Add Form, set Trip as default" =
+"Dodaj Formularz, domyslnie Trasa"
+"Amount per day" = "Dzienna ilosc"
+"Ascending" = "Rosnacaco"
+"Avg days between fills" = "Ile dni miedzy tank.(sred)"
+"Avg dist per tank" = "Srednia odleglosc"
+"Cancel" = "Anuluj"
+"Car" = "Auto"
+"Check 'filter' to select only\ra range of records." =
+"Zaznacz 'filtr' by skasowac tylko\ra zakres danych"
+"Continue" = "Kontynuuj"
+"Copy" = "Kopiuj"
+"Cost" = "Koszt"
+"Couldn't find memos containing the pFuel header." =
+"Nie moge znalezc notatek z naglowkiem pFuel"
+"Couldn't create new database (%s). err=%d" =
+"Nie moge utworzyc nowej bazy (%s). err=%d"
+"Couldn't get database info." =
+"Nie moge odczytac inf. o bazie"
+"Couldn't open Memo Pad database." =
+"Nie moge otworzyc bazy Memo Pad"
+"Couldn't write to new record." =
+"Nie moge zapisac nowego rekordu"
+"Currency Symbol:" = "Symbol waluty:"
+"Cut" = "Wytnij"
+"Date" = "Data"
+"Date,FuelVolume,Odometer,Price,Flag,Category\n" =
+"Data,IloscPaliwa,Stan licznika,Cena,Flaga,Kategoria\n"
+"Days" = "Dni"
+"Decimal places:" = "Ilosc miejsc dziesietnych:"
+"Delete" = "Kasuj"
+"Delete..." = "Kasuje..."
+"Delete Records" = "Kasuj rekordy"
+"Delete the record(s)?" = "Kasowac rekord(y)?"
+"Delete this note?" = "Kasowac notatke?"
+"Descending" = "Malejaco"
+"Description" = "Opis"
+"Difference" = "Roznica"
+"Done" = "Zrobione"
+"Edit" = "Edycja"
+"Efficiency " = "Efektywnosc "
+"Efficiency:" = "Efektywnosc:"
+"Every" = "Co"
+"Export..." = "Export..."
+"Export pFuel Records" = "Eksport pFuel danych"
+"Export Too Large" = "Eksport za duzy"
+"Fill Field with default values" = "Wypelnij Pola wart. domyslnymi"
+"Filter" = "Filtr"
+"for tank" = "na pelnym zbiorniku"
+"Formatting problem in the header of the memo" =
+"Problem z formatem naglowka notatki"
+"From Date" = "Od daty"
+"Fuel:" = "Paliwo:"
+"Fuel volume:" = "Ilosc paliwa:"
+"Full Tank" = "Do pelna"
+"Gal" = "Gal"
+"Gallons" = "Gallony"
+"Global Preferences" = "Glowne ustawienia"
+"Global Preferences..." = "Glowne ustawienia..."
+"GO TO" = "Idz do"
+"Graph" = "Wykres"
+"Graphics" = "Wykresy"
+"Import..." = "Import..."
+"Import car's data in CSV format\rfrom the Memo Pad." =
+"Import danych auta w formacie CSV \rz Memo Pad."
+"Import Error" = "Blad importu"
+"Import failed" = "Import sie nie udal"
+"Import pFuel Record" = "Import pFuel danych"
+"Include Maintenances Cost" = "Wraz z kosztem serwisu"
+"Insufficient Data" = "Dane niepelne"
+"Kilometers" = "Kilometry"
+"Km" = "Km"
+"Km " = "Km "
+"Km/Gal" = "Km/Gal"
+"Km/L" = "Km/L"
+"Km/US Gallon" = "Km/Galony USA"
+"L" = "L"
+"Litres" = "Litry"
+"L/100Km" = "L/100Km"
+"Maintenances" = "Serwis"
+"Maintenances..." = "Serwis..."
+"Maintenance Alert" = "Serwis - alarm"
+"Maintenance Record" = "Serwis - dane"
+"Max dist. per tank" = "Max odl. po tankow."
+"Mi" = "Mi"
+"Miles" = "Mile"
+"Miles/Gallon" = "Mile/Galony"
+"Miles/US Gallon" = "Mile/Galony US"
+"Missing Data" = "Brak danych"
+"Months" = "Miesiace"
+"MPG" = "MPG"
+"Not able to open database (%s) in read only mode." =
+"Nie moge otworzyc bazy (%s) w trybie TYLKO DO ODCZYTU."
+"Not able to read the ^1 value on line ^2" =
+"Nie moge odczytac ^1 wartosci w linii ^2" // ^1 to Koszt lub Stan licznika lub ... Moze byc liczba ^2
+"Note" = "Notka"
+"Note..." = "Notka..."
+"Number Format:" = "Format liczb:"
+"Odometer" = "Stan licz"
+"Odometer:" = "Stan licznika:"
+"OFF" = "Wyl"
+"OK" = "OK"
+"ON" = " Wl"
+"One Hand Mode:" = "Tylko reka"
+"One of the record to be imported don't follow the formatting or records are missing" =
+"Format rekordu importowanego jest zly lub brak danych"
+"Options" = "Opcje"
+"Ordering:" = "Kolejnosc:"
+"Overall Stat" = "Stat. ogolna"
+"Paste" = "Wklej"
+"per unit" = "na jedn."
+"pFuel" = "pFuel"
+"pFuel export for all categories except unfiled" =
+"pFuel eksport dla wszystkich kategorii poza 'UNFILED'"
+"pFuel Log" = "pFuel Log"
+"pFuel Main Form" = "Glowne okno pFuel"
+"pFuel: Preferences" = "pFuel: Ustawienia"
+"Preferences..." = "Ustawienia..."
+"Price" = "Cena"
+"Prices:" = "Ceny:"
+"Price/Volume" = "Cena/Ilosc"
+"Record" = "Zapis"
+"Record Stat" = "Stat. zapisow"
+"Records:" = "Zapisy:"
+"Reducing Odometer Reading" = "Zmniejszenie stanu licznika"
+"SNOOZE" = "DRZEMKA"
+"Start Date" = "Od daty"
+"Stats" = "Statystyki"
+"System Incompatible" =
+"Niewlasciwy System"
+"System Version 3.2 or greater is required to run this application." = "Do uruchomienia programu wymagany jest system w wersji min 3.2."
+"Tapping OK will delete the records\rof the current Car category" = "Po kliknieciu OK skasuje wszystkie\rdane biezacej kategorii Auto"
+"Tapping OK will export the\rcurrent car's data in CSV format\rto the Memo Pad." = "Po kliknieciu OK wyeksportuje\rdane biezacego auta w formacie\rCSV do Memo Pad."
+"The exported data is too large for the memo pad application, please choose a smaller date range and try again." = "Dane po eksporcie nie mieszcza sie w Memo Pad, wybierz inny zakres dat i sprobowuj ponownie."
+"The maintenance (^1) is due as of ^23" = "Serwis (^1) sie zbliza dla ^23"
+"The option (^1) is checked but the field is empty" = "Opcja (^1) jest zaznaczona, ale pole jest puste"
+"to" = "do"
+"To Date" = "Do daty"
+"Total cost" =
+"Koszt razem"
+"Total distance" =
+"Calkowita odleglosc"
+"Trigger at" = "Przypomnij co"
+"Trip" = "Podroz"
+"Trip entries are continuous" =
+"Wpisy podrozy sa ciagle"
+"Unfiled" =
+"Bez opisu"
+"Units:" = "Jednostki:"
+"US Gallons" = "Gallony US"
+"USG" = "USG"
+"Version" = "Wersja"
+"We had to resize the preference. The preference values have been reset." = "Trzeba bylo zmienic ustawienia. Wartosci ustawien zostaly wyzerowane."
+"Weeks" = "Tygodnie"
+"$/Tank" = "$/tank."
+"-Desc- Distance Abreviation with padding" = "Km "
+"-Desc- First Column header for the Maintenance table (1 char)" = "D"
+"-Desc- License" = "This program is released under the\rGPL. Any practical application of this\rprogram is purely coincidental, and\rthis program is not warrantied for\ruse for any purpose whatsoever."
+"-Desc- Shortcut for Copy" = "C"
+"-Desc- Shortcut for Cut" = "X"
+"-Desc- Shortcut for Paste" = "P"
+"-Desc- Title Adding Petrol Record Form (Max Char=17)" = "Dodaje rekordy"
+"-Desc- Title Modifying Petrol Record Form (Max Char=17)" = "Zmieniam rekordy"
+"-- Gallons" = "-- Galony"
+END
\ No newline at end of file
Property changes on: branches/pFuel-0-04-stable/pFuel/Src/pFuel.rcp.in.po
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Modified: branches/pFuel-0-04-stable/pFuel/Src/pFuel.ver
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/pFuel.ver 2007-09-27 12:33:19 UTC (rev 499)
+++ branches/pFuel-0-04-stable/pFuel/Src/pFuel.ver 2007-12-12 14:45:02 UTC (rev 500)
@@ -1 +1 @@
-0.04.04
+0.04.05
Property changes on: branches/pFuel-0-04-stable/pFuel/Src/pFuelRsc.h
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: branches/pFuel-0-04-stable/pFuel/Src/pfRecord.c
===================================================================
--- branches/pFuel-0-04-stable/pFuel/Src/pfRecord.c 2007-09-27 12:33:19 UTC (rev 499)
+++ branches/pFuel-0-04-stable/pFuel/Src/pfRecord.c 2007-12-12 14:45:02 UTC (rev 500)
@@ -1000,33 +1000,27 @@
SetOdometerFromLatestRecord();
+ FrmSetFocus(frmP, FrmGetObjectIndex(frmP, AddPetrolMileageField));
+
+
// Check if this as effect
+ navRow = 3;
+ navCol = 2;
+ SetFocus(AddPetrolMileageField, true);
if (globalPrefs.flags & ONE_HAND_MODE)
{
- navRow = 3;
- navCol = 2;
- SetFocus(AddPetrolMileageField, true);
-
changeDigit = false;
- if (0 != EvtEnqueueKey(vchrRockerCenter, 0, commandKeyMask) )
- {
- TRACE("AddPetrolHandleEvent: Problem sending the key event");
- }
+// if (0 != EvtEnqueueKey(vchrRockerCenter, 0, commandKeyMask) )
+// {
+// TRACE("AddPetrolHandleEvent: Problem sending the key event");
+// }
}
- else
- navCol = noFocus;
- }
+ }
else
{
- // Check if this as effect
- if (globalPrefs.flags & ONE_HAND_MODE)
- {
- navRow = NB_NAVROW -1;
- navCol = 0;
- SetFocus(OKButton, true);
- }
- else
- navCol = noFocus;
+ navRow = NB_NAVROW -1;
+ navCol = 0;
+ SetFocus(OKButton, true);
hNewTitle = DmGetResource(strRsc, STR_TITLE_PETROL_FORM_MODIFYING);
Property changes on: branches/pFuel-0-04-stable/pFuel/Src/pfRecord.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: branches/pFuel-0-04-stable/pFuel/Src/pfRecord.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: branches/pFuel-0-04-stable/pFuel/Src/preferences.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: branches/pFuel-0-04-stable/pFuel/Src/preferences.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: branches/pFuel-0-04-stable/pFuel/Src/section.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: branches/pFuel-0-04-stable/pFuel/Src/utility.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: branches/pFuel-0-04-stable/pFuel/Src/utility.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: branches/pFuel-0-04-stable/pFuel/Src/utils.c
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: branches/pFuel-0-04-stable/pFuel/Src/utils.h
___________________________________________________________________
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Remi R. <pa...@us...> - 2007-09-27 12:33:17
|
Update of /cvsroot/pfuel/pFuel/Src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17120/Src Modified Files: maintenance.c navigation.c navigation.h pfRecord.c Log Message: 27092007-RR-01 - Bug: - The visual cue for the focus was not moved to the new item in focus when selecting with the stylus. - Bug #1792788: Selecting Field with Stylus not working. Fix the bug for the maintenance form Index: navigation.h =================================================================== RCS file: /cvsroot/pfuel/pFuel/Src/navigation.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** navigation.h 5 Oct 2006 12:50:36 -0000 1.3 --- navigation.h 27 Sep 2007 12:33:19 -0000 1.4 *************** *** 65,68 **** --- 65,71 ---- UInt16 *row, UInt16 *col, WChar chr) NAV_SECTION; + EXTERN void FindRowColInFocus(UInt16 *row, UInt16 *col, + const UInt16 nbRow, const UInt16 nbCol, + const UInt16 navTable[], const UInt16 idInFocus) NAV_SECTION; // --------------- // static variables Index: pfRecord.c =================================================================== RCS file: /cvsroot/pfuel/pFuel/Src/pfRecord.c,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** pfRecord.c 25 Jan 2007 14:14:06 -0000 1.42 --- pfRecord.c 27 Sep 2007 12:33:19 -0000 1.43 *************** *** 95,98 **** --- 95,112 ---- #define NB_NAVCOL 4 + const UInt16 navTable[NB_NAVROW * NB_NAVCOL] = + { + AddPetrolCarPopTrigger, 0, 0, 0, + ScrollRightButton, 0, 0, 0, + AddPetrolDateSelTrigger, 0, 0, 0, + AddPetrolOdometerSelTrigger, AddPetrolOdometerList, AddPetrolMileageField, 0, + AddPetrolLitresField, 0, 0, 0, + AddPetrolPriceField, 0, 0, 0, + AddPetrolPUnitField, 0, 0, 0, + AddPetrolFullTankCheckbox, 0, 0, 0, + AddPetrolMissingRecordCheckbox, AddPetrolNoteButton, 0, ScrollUpButton, + OKButton, AddPetrolCancelButton, AddPetrolDeleteButton, ScrollDownButton, + }; + /** *************** *** 612,629 **** WChar chr = eventP->data.keyDown.chr; - const UInt16 navTable[NB_NAVROW * NB_NAVCOL] = - { - AddPetrolCarPopTrigger, 0, 0, 0, - ScrollRightButton, 0, 0, 0, - AddPetrolDateSelTrigger, 0, 0, 0, - AddPetrolOdometerSelTrigger, AddPetrolOdometerList, AddPetrolMileageField, 0, - AddPetrolLitresField, 0, 0, 0, - AddPetrolPriceField, 0, 0, 0, - AddPetrolPUnitField, 0, 0, 0, - AddPetrolFullTankCheckbox, 0, 0, 0, - AddPetrolMissingRecordCheckbox, AddPetrolNoteButton, 0, ScrollUpButton, - OKButton, AddPetrolCancelButton, AddPetrolDeleteButton, ScrollDownButton, - }; - //TRACE("AddPetrolHandleField: Start"); --- 626,629 ---- *************** *** 953,956 **** --- 953,960 ---- } break; + case fldEnterEvent: + FindRowColInFocus(&navRow, &navCol, NB_NAVROW, NB_NAVCOL, + navTable, eventP->data.fldEnter.fieldID); + break; case keyDownEvent: // Handle the physical scroll buttons TRACE("AddPetrolHandleEvent: keyDownEvent"); Index: navigation.c =================================================================== RCS file: /cvsroot/pfuel/pFuel/Src/navigation.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** navigation.c 29 Aug 2007 12:42:06 -0000 1.5 --- navigation.c 27 Sep 2007 12:33:19 -0000 1.6 *************** *** 357,361 **** /** ! * This function check if an object is "focusable". * i.e. For a regular object this means not hidden. * For a table this means having at leat a row. --- 357,361 ---- /** ! * This function check if an object is "focussable". * i.e. For a regular object this means not hidden. * For a table this means having at leat a row. *************** *** 367,379 **** if (IsObjectUsable(objID)) { ! DmOpenRef db; FormType *frm = FrmGetActiveForm(); ! if (FrmGetFormPtr(MainForm) == frm ) ! { ! db = pFuelDB; ! } ! else if ( FrmGetFormPtr(MtnForm) == frm ) { db = pFuelMtnDB; --- 367,380 ---- if (IsObjectUsable(objID)) { ! DmOpenRef db = pFuelDB; FormType *frm = FrmGetActiveForm(); ! // if (FrmGetFormPtr(MainForm) == frm ) ! // { ! // db = pFuelDB; ! // } ! // else ! if ( FrmGetFormPtr(MtnForm) == frm ) { db = pFuelMtnDB; *************** *** 381,385 **** if ( frmTableObj == GetObjectType(objID) && ! 0 == DmNumRecordsInCategory(db, CurrentCategory) ) { return false; --- 382,386 ---- if ( frmTableObj == GetObjectType(objID) && ! 0 == DmNumRecordsInCategory(db, CurrentCategory) ) { return false; *************** *** 1077,1078 **** --- 1078,1111 ---- return true; } + + //////////////////////////////////////////////////////////////////////////////// + /// This function find the row and column number in the navigation table + /// when an id in the form is provided. + /// + /// @param row + /// @param col + /// @param navTable + /// @param idInFocus + /// + //////////////////////////////////////////////////////////////////////////////// + void + FindRowColInFocus(UInt16 *row, UInt16 *col, const UInt16 nbRow, const UInt16 nbCol, + const UInt16 navTable[], const UInt16 idInFocus) + { + SetFocus(navTable[nbCol * (*row) + *col], 0); + if (globalPrefs.flags & ONE_HAND_MODE) + { + UInt16 i=0; + for (/*already done */; i < (nbRow*nbCol); ++i) + { + if (navTable[i] == idInFocus) + { + *row = i / nbCol; + *col = i % nbCol; + SetFocus(navTable[nbCol * (*row) + (*col)], NAV_FOCUS); + return; + } + } + } + + } Index: maintenance.c =================================================================== RCS file: /cvsroot/pfuel/pFuel/Src/maintenance.c,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** maintenance.c 29 Aug 2007 12:42:06 -0000 1.40 --- maintenance.c 27 Sep 2007 12:33:19 -0000 1.41 *************** *** 73,76 **** --- 73,89 ---- #define NB_NAVCOL_REC 3 + const UInt16 navTableRec[NB_NAVROW_REC * NB_NAVCOL_REC] = + { + MtnRecCarPopTrigger, 0, 0, + MtnRecDescField, 0, 0, + MtnRecDateCheckbox, MtnRecDateSelTrigger, 0, + MtnRecEveryDateCheckbox, MtnRecEveryDateField, MtnRecEveryDateList, + MtnRecOdoCheckbox, MtnRecOdoField, 0, + MtnRecStartDateCheckbox, MtnRecStartDateSelTrigger, 0, + MtnRecEveryOdoCheckbox, MtnRecEveryOdoField, 0, + MtnRecCostField, MtnRecNoteButton, 0, + OKButton, CancelButton, DeleteButton + }; + /// Used to have a more explicit if #define YES_CREATE_NEXT_RECORD 0 *************** *** 1258,1279 **** WChar chr = eventP->data.keyDown.chr; - const UInt16 navTable[NB_NAVROW_REC * NB_NAVCOL_REC] = - { - MtnRecCarPopTrigger, 0, 0, - MtnRecDescField, 0, 0, - MtnRecDateCheckbox, MtnRecDateSelTrigger, 0, - MtnRecEveryDateCheckbox, MtnRecEveryDateField, MtnRecEveryDateList, - MtnRecOdoCheckbox, MtnRecOdoField, 0, - MtnRecStartDateCheckbox, MtnRecStartDateSelTrigger, 0, - MtnRecEveryOdoCheckbox, MtnRecEveryOdoField, 0, - MtnRecCostField, MtnRecNoteButton, 0, - OKButton, CancelButton, DeleteButton - }; - if (globalPrefs.flags & ONE_HAND_MODE) { if (navCol != noFocus) { ! UInt16 fldID = navTable[(NB_NAVCOL_REC*navRow) + navCol]; FieldType *fldP = GetObjectPtr(fldID); MemHandle hnd = NULL; --- 1271,1279 ---- WChar chr = eventP->data.keyDown.chr; if (globalPrefs.flags & ONE_HAND_MODE) { if (navCol != noFocus) { ! UInt16 fldID = navTableRec[(NB_NAVCOL_REC*navRow) + navCol]; FieldType *fldP = GetObjectPtr(fldID); MemHandle hnd = NULL; *************** *** 1362,1366 **** if (!handled) { ! handled = Navigate(navTable, NB_NAVROW_REC, NB_NAVCOL_REC, &navRow, &navCol, chr); } --- 1362,1366 ---- if (!handled) { ! handled = Navigate(navTableRec, NB_NAVROW_REC, NB_NAVCOL_REC, &navRow, &navCol, chr); } *************** *** 1374,1378 **** { // Handle the vchrRockerCenter ! handled = Navigate(navTable, NB_NAVROW_REC, NB_NAVCOL_REC, &navRow, &navCol, chr); } --- 1374,1378 ---- { // Handle the vchrRockerCenter ! handled = Navigate(navTableRec, NB_NAVROW_REC, NB_NAVCOL_REC, &navRow, &navCol, chr); } *************** *** 1508,1511 **** --- 1508,1517 ---- } break; + + case fldEnterEvent: + FindRowColInFocus(&navRow, &navCol, NB_NAVROW_REC, NB_NAVCOL_REC, + navTableRec, eventP->data.fldEnter.fieldID); + break; + case keyDownEvent: // Handle the physical scroll buttons handled = MtnRecHandleField(eventP); |
|
From: Remi R. <pa...@us...> - 2007-09-27 12:33:17
|
Update of /cvsroot/pfuel/pFuel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17120 Modified Files: CHANGELOG Log Message: 27092007-RR-01 - Bug: - The visual cue for the focus was not moved to the new item in focus when selecting with the stylus. - Bug #1792788: Selecting Field with Stylus not working. Fix the bug for the maintenance form Index: CHANGELOG =================================================================== RCS file: /cvsroot/pfuel/pFuel/CHANGELOG,v retrieving revision 1.124 retrieving revision 1.125 diff -C2 -d -r1.124 -r1.125 *** CHANGELOG 29 Aug 2007 12:42:06 -0000 1.124 --- CHANGELOG 27 Sep 2007 12:33:19 -0000 1.125 *************** *** 13,16 **** --- 13,23 ---- #------------------------------------------------------------ + 27092007-RR-01 + - Bug: + - The visual cue for the focus was not moved to the new item in focus + when selecting with the stylus. + - Bug #1792788: Selecting Field with Stylus not working. + Fix the bug for the maintenance form + 20070825-RR-01 - Bug: |
|
From: Remi R. <pa...@us...> - 2007-09-27 11:44:17
|
Update of /cvsroot/pfuel/pFuel/Src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30543/Src Modified Files: Tag: pFuel-0-04-stable maintenance.c navigation.c navigation.h pfRecord.c Log Message: 27092007-RR-01 - Bug #1792788: Selecting Field with Stylus not working. - Fix the bug for the maintenance form Index: navigation.h =================================================================== RCS file: /cvsroot/pfuel/pFuel/Src/navigation.h,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -d -r1.3 -r1.3.2.1 *** navigation.h 5 Oct 2006 12:50:36 -0000 1.3 --- navigation.h 27 Sep 2007 11:43:14 -0000 1.3.2.1 *************** *** 65,68 **** --- 65,71 ---- UInt16 *row, UInt16 *col, WChar chr) NAV_SECTION; + EXTERN void FindRowColInFocus(UInt16 *row, UInt16 *col, + const UInt16 nbRow, const UInt16 nbCol, + const UInt16 navTable[], const UInt16 idInFocus) NAV_SECTION; // --------------- // static variables Index: pfRecord.c =================================================================== RCS file: /cvsroot/pfuel/pFuel/Src/pfRecord.c,v retrieving revision 1.42.2.2 retrieving revision 1.42.2.3 diff -C2 -d -r1.42.2.2 -r1.42.2.3 *** pfRecord.c 19 Sep 2007 13:23:41 -0000 1.42.2.2 --- pfRecord.c 27 Sep 2007 11:43:14 -0000 1.42.2.3 *************** *** 95,99 **** #define NB_NAVCOL 4 ! static const UInt16 navTable[NB_NAVROW * NB_NAVCOL] = { AddPetrolCarPopTrigger, 0, 0, 0, --- 95,99 ---- #define NB_NAVCOL 4 ! static const UInt16 navTable[NB_NAVROW * NB_NAVCOL] = { AddPetrolCarPopTrigger, 0, 0, 0, *************** *** 956,974 **** case fldEnterEvent: ! if (globalPrefs.flags & ONE_HAND_MODE) ! { ! Boolean found = false; ! for (navRow=0; navRow < NB_NAVROW && !found; ++navRow) ! { ! for (navCol = 0; navCol < NB_NAVCOL; ++navCol) ! if (navTable[(NB_NAVCOL*navRow) + navCol] == eventP->data.fldEnter.fieldID) ! { ! found = true; ! break; ! } ! if (found) ! break; ! } ! } break; case keyDownEvent: // Handle the physical scroll buttons --- 956,961 ---- case fldEnterEvent: ! FindRowColInFocus(&navRow, &navCol, NB_NAVROW, NB_NAVCOL, ! navTable, eventP->data.fldEnter.fieldID); break; case keyDownEvent: // Handle the physical scroll buttons Index: navigation.c =================================================================== RCS file: /cvsroot/pfuel/pFuel/Src/navigation.c,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -d -r1.4.2.1 -r1.4.2.2 *** navigation.c 22 Aug 2007 14:35:11 -0000 1.4.2.1 --- navigation.c 27 Sep 2007 11:43:14 -0000 1.4.2.2 *************** *** 1078,1079 **** --- 1078,1108 ---- return true; } + + //////////////////////////////////////////////////////////////////////////////// + /// + /// + /// @param row + /// @param col + /// @param navTable + /// @param idInFocus + /// + //////////////////////////////////////////////////////////////////////////////// + void + FindRowColInFocus(UInt16 *row, UInt16 *col, const UInt16 nbRow, const UInt16 nbCol, + const UInt16 navTable[], const UInt16 idInFocus) + { + if (globalPrefs.flags & ONE_HAND_MODE) + { + UInt16 i=0; + for (/*already done */; i < (nbRow*nbCol); ++i) + { + if (navTable[i] == idInFocus) + { + *row = i / nbCol; + *col = i % nbCol; + return; + } + } + } + } + Index: maintenance.c =================================================================== RCS file: /cvsroot/pfuel/pFuel/Src/maintenance.c,v retrieving revision 1.38 retrieving revision 1.38.2.1 diff -C2 -d -r1.38 -r1.38.2.1 *** maintenance.c 9 Feb 2007 15:51:19 -0000 1.38 --- maintenance.c 27 Sep 2007 11:43:14 -0000 1.38.2.1 *************** *** 65,68 **** --- 65,81 ---- #define NB_NAVCOL_REC 3 + static const UInt16 navTableRec[NB_NAVROW_REC * NB_NAVCOL_REC] = + { + MtnRecCarPopTrigger, 0, 0, + MtnRecDescField, 0, 0, + MtnRecDateCheckbox, MtnRecDateSelTrigger, 0, + MtnRecEveryDateCheckbox, MtnRecEveryDateField, MtnRecEveryDateList, + MtnRecOdoCheckbox, MtnRecOdoField, 0, + MtnRecStartDateCheckbox, MtnRecStartDateSelTrigger, 0, + MtnRecEveryOdoCheckbox, MtnRecEveryOdoField, 0, + MtnRecCostField, MtnRecNoteButton, 0, + OKButton, CancelButton, DeleteButton + }; + /** * Compare two Maintenance records *************** *** 1153,1168 **** WChar chr = eventP->data.keyDown.chr; ! const UInt16 navTable[NB_NAVROW_REC * NB_NAVCOL_REC] = ! { ! MtnRecCarPopTrigger, 0, 0, ! MtnRecDescField, 0, 0, ! MtnRecDateCheckbox, MtnRecDateSelTrigger, 0, ! MtnRecEveryDateCheckbox, MtnRecEveryDateField, MtnRecEveryDateList, ! MtnRecOdoCheckbox, MtnRecOdoField, 0, ! MtnRecStartDateCheckbox, MtnRecStartDateSelTrigger, 0, ! MtnRecEveryOdoCheckbox, MtnRecEveryOdoField, 0, ! MtnRecCostField, MtnRecNoteButton, 0, ! OKButton, CancelButton, DeleteButton ! }; if (globalPrefs.flags & ONE_HAND_MODE) --- 1166,1170 ---- WChar chr = eventP->data.keyDown.chr; ! if (globalPrefs.flags & ONE_HAND_MODE) *************** *** 1170,1174 **** if (navCol != noFocus) { ! UInt16 fldID = navTable[(NB_NAVCOL_REC*navRow) + navCol]; FieldType *fldP = GetObjectPtr(fldID); MemHandle hnd = NULL; --- 1172,1176 ---- if (navCol != noFocus) { ! UInt16 fldID = navTableRec[(NB_NAVCOL_REC*navRow) + navCol]; FieldType *fldP = GetObjectPtr(fldID); MemHandle hnd = NULL; *************** *** 1257,1261 **** if (!handled) { ! handled = Navigate(navTable, NB_NAVROW_REC, NB_NAVCOL_REC, &navRow, &navCol, chr); } --- 1259,1263 ---- if (!handled) { ! handled = Navigate(navTableRec, NB_NAVROW_REC, NB_NAVCOL_REC, &navRow, &navCol, chr); } *************** *** 1269,1273 **** { // Handle the vchrRockerCenter ! handled = Navigate(navTable, NB_NAVROW_REC, NB_NAVCOL_REC, &navRow, &navCol, chr); } --- 1271,1275 ---- { // Handle the vchrRockerCenter ! handled = Navigate(navTableRec, NB_NAVROW_REC, NB_NAVCOL_REC, &navRow, &navCol, chr); } *************** *** 1397,1400 **** --- 1399,1407 ---- } break; + + case fldEnterEvent: + FindRowColInFocus(&navRow, &navCol, NB_NAVROW_REC, NB_NAVCOL_REC, + navTableRec, eventP->data.fldEnter.fieldID); + break; case keyDownEvent: // Handle the physical scroll buttons handled = MtnRecHandleField(eventP); |
|
From: Remi R. <pa...@us...> - 2007-09-27 11:44:16
|
Update of /cvsroot/pfuel/pFuel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30543 Modified Files: Tag: pFuel-0-04-stable CHANGELOG Log Message: 27092007-RR-01 - Bug #1792788: Selecting Field with Stylus not working. - Fix the bug for the maintenance form Index: CHANGELOG =================================================================== RCS file: /cvsroot/pfuel/pFuel/CHANGELOG,v retrieving revision 1.121.2.7 retrieving revision 1.121.2.8 diff -C2 -d -r1.121.2.7 -r1.121.2.8 *** CHANGELOG 19 Sep 2007 13:23:41 -0000 1.121.2.7 --- CHANGELOG 27 Sep 2007 11:43:13 -0000 1.121.2.8 *************** *** 14,17 **** --- 14,21 ---- Version 0.04.04 + 27092007-RR-01 + - Bug #1792788: Selecting Field with Stylus not working. + - Fix the bug for the maintenance form + 20070919-RR-01 - Bug: |
|
From: Remi R. <pa...@us...> - 2007-09-19 13:23:41
|
Update of /cvsroot/pfuel/pFuel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19165 Modified Files: Tag: pFuel-0-04-stable CHANGELOG Log Message: 2007-0919-RR-01 - Bug #1792788: Selecting Field with Stylus not working. When in One Hand Mode selecting a field with the stylus has no effect. Index: CHANGELOG =================================================================== RCS file: /cvsroot/pfuel/pFuel/CHANGELOG,v retrieving revision 1.121.2.6 retrieving revision 1.121.2.7 diff -C2 -d -r1.121.2.6 -r1.121.2.7 *** CHANGELOG 29 Aug 2007 12:31:03 -0000 1.121.2.6 --- CHANGELOG 19 Sep 2007 13:23:41 -0000 1.121.2.7 *************** *** 13,16 **** --- 13,22 ---- #------------------------------------------------------------ + Version 0.04.04 + 20070919-RR-01 + - Bug: + - Bug #1792788: Selecting Field with Stylus not working. + When in One Hand Mode selecting a field with the stylus has no effect. + 20070825-RR-01 - Development: |
|
From: Remi R. <pa...@us...> - 2007-09-19 13:23:39
|
Update of /cvsroot/pfuel/pFuel/Src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19165/Src Modified Files: Tag: pFuel-0-04-stable pFuel.ver pfRecord.c Log Message: 2007-0919-RR-01 - Bug #1792788: Selecting Field with Stylus not working. When in One Hand Mode selecting a field with the stylus has no effect. Index: pfRecord.c =================================================================== RCS file: /cvsroot/pfuel/pFuel/Src/pfRecord.c,v retrieving revision 1.42.2.1 retrieving revision 1.42.2.2 diff -C2 -d -r1.42.2.1 -r1.42.2.2 *** pfRecord.c 22 Aug 2007 14:35:11 -0000 1.42.2.1 --- pfRecord.c 19 Sep 2007 13:23:41 -0000 1.42.2.2 *************** *** 95,98 **** --- 95,113 ---- #define NB_NAVCOL 4 + static const UInt16 navTable[NB_NAVROW * NB_NAVCOL] = + { + AddPetrolCarPopTrigger, 0, 0, 0, + ScrollRightButton, 0, 0, 0, + AddPetrolDateSelTrigger, 0, 0, 0, + AddPetrolOdometerSelTrigger, AddPetrolOdometerList, AddPetrolMileageField, 0, + AddPetrolLitresField, 0, 0, 0, + AddPetrolPriceField, 0, 0, 0, + AddPetrolPUnitField, 0, 0, 0, + AddPetrolFullTankCheckbox, 0, 0, 0, + AddPetrolMissingRecordCheckbox, AddPetrolNoteButton, 0, ScrollUpButton, + OKButton, AddPetrolCancelButton, AddPetrolDeleteButton, ScrollDownButton, + }; + + /** *************** *** 611,629 **** Boolean handled = false; WChar chr = eventP->data.keyDown.chr; - - const UInt16 navTable[NB_NAVROW * NB_NAVCOL] = - { - AddPetrolCarPopTrigger, 0, 0, 0, - ScrollRightButton, 0, 0, 0, - AddPetrolDateSelTrigger, 0, 0, 0, - AddPetrolOdometerSelTrigger, AddPetrolOdometerList, AddPetrolMileageField, 0, - AddPetrolLitresField, 0, 0, 0, - AddPetrolPriceField, 0, 0, 0, - AddPetrolPUnitField, 0, 0, 0, - AddPetrolFullTankCheckbox, 0, 0, 0, - AddPetrolMissingRecordCheckbox, AddPetrolNoteButton, 0, ScrollUpButton, - OKButton, AddPetrolCancelButton, AddPetrolDeleteButton, ScrollDownButton, - }; - //TRACE("AddPetrolHandleField: Start"); --- 626,629 ---- *************** *** 953,956 **** --- 953,975 ---- } break; + + + case fldEnterEvent: + if (globalPrefs.flags & ONE_HAND_MODE) + { + Boolean found = false; + for (navRow=0; navRow < NB_NAVROW && !found; ++navRow) + { + for (navCol = 0; navCol < NB_NAVCOL; ++navCol) + if (navTable[(NB_NAVCOL*navRow) + navCol] == eventP->data.fldEnter.fieldID) + { + found = true; + break; + } + if (found) + break; + } + } + break; case keyDownEvent: // Handle the physical scroll buttons TRACE("AddPetrolHandleEvent: keyDownEvent"); Index: pFuel.ver =================================================================== RCS file: /cvsroot/pfuel/pFuel/Src/pFuel.ver,v retrieving revision 1.29.2.2 retrieving revision 1.29.2.3 diff -C2 -d -r1.29.2.2 -r1.29.2.3 *** pFuel.ver 24 Aug 2007 13:34:44 -0000 1.29.2.2 --- pFuel.ver 19 Sep 2007 13:23:41 -0000 1.29.2.3 *************** *** 1 **** ! 0.04.03 --- 1 ---- ! 0.04.04 |
Update of /cvsroot/pfuel/pFuel/Src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10181/Src Modified Files: Makefile fuelStats.c graph.c maintenance.c maintenance.h navigation.c pFuel.rcp.in pFuel.rcp.in.fr pFuelRsc.h Log Message: 20070825-RR-01 - Bug: - Bug #1744197: The value displayed for Avg Days Between Fills was wrong. when a filter was set. Fixed. - In the Add Record the form was not redrawed correctly after selecting the "Odometer/Distance" list. Reported by Fernando Deambrosio - Fix some problems in the French string. Spelling mistake, sentence not translated. Reported by Fernando Deambrosio - The first points on the graph cost/Volume are not calculated correctly. - Development: - Add in the Makefile the push of the new ChangeLog to the SF Home web site. Index: fuelStats.c =================================================================== RCS file: /cvsroot/pfuel/pFuel/Src/fuelStats.c,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** fuelStats.c 27 Jun 2007 12:31:28 -0000 1.45 --- fuelStats.c 29 Aug 2007 12:42:06 -0000 1.46 *************** *** 477,482 **** } - avg = DateToDays(curs->date); - maxDistancePerTank = 0.0; if (curs->distance > maxDistancePerTank) --- 477,480 ---- *************** *** 484,498 **** i = 0; while (curs) { curs = nextFuel(curs, false, category); ! ! if (curs && curs->distance > maxDistancePerTank) { maxDistancePerTank = curs->distance; ++i; } - } if ( !i ) --- 482,501 ---- i = 0; + divider = 0; + avg = 0; + while (curs) { curs = nextFuel(curs, false, category); ! if (curs) { + if (curs->distance > maxDistancePerTank) maxDistancePerTank = curs->distance; + + divider += curs->nbfillssincefull; + avg += curs->days; ++i; } } if ( !i ) *************** *** 502,515 **** } - curs = finalFuel(); - - - avg = DateToDays(curs->date) - avg; // Date of last record - date of fist record - - - divider = DmNumRecordsInCategory(pFuelDB, category); if (divider > 1.1) { ! SetFieldMaxf(StatAvgDayBetweenFillValue, avg / ((float)(divider - 1)), 1); } --- 505,511 ---- } if (divider > 1.1) { ! SetFieldMaxf(StatAvgDayBetweenFillValue, avg / ((float)divider), 1); } Index: maintenance.c =================================================================== RCS file: /cvsroot/pfuel/pFuel/Src/maintenance.c,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** maintenance.c 27 Jun 2007 12:31:28 -0000 1.39 --- maintenance.c 29 Aug 2007 12:42:06 -0000 1.40 *************** *** 16,19 **** --- 16,21 ---- * @bug AsciiToDate accept only shortDateFormat by the label of Start date is long. * @todo StartDate should be saved directly to cMtnRec so we don't need AscioToDate + * + * TODO: Test when alert because of a Date. */// // ***************************************************************************** *************** *** 43,50 **** SortRecordInfoType * rec2SortInfo, MemHandle appInfoH) MTN_SECTION; ! static void saveMtnCopyForEvery(CompleteMaintenance *cMtn, UInt16 category, ! UInt16 index) MTN_SECTION; ! static Int16 displayAlert(CompleteMaintenance *cMtn, double odometer, Char* trigger, ! UInt16 flag,UInt16 category, UInt16 index) MTN_SECTION; static UInt32 sizeofMtn(UInt16 flags) MTN_SECTION; static Boolean getLastTwoPFRecord(PFRecord *rec1, --- 45,58 ---- SortRecordInfoType * rec2SortInfo, MemHandle appInfoH) MTN_SECTION; ! ! static void SaveDoneMtnRecAndUpdateForNext(CompleteMaintenance *cMtn, double odometer, ! UInt16 category, UInt16 index) MTN_SECTION; ! ! static void SaveDoneMtnRec(CompleteMaintenance *cMtn, ! UInt16 category, UInt16 index) MTN_SECTION; ! static Int16 DisplayAlert(CompleteMaintenance *cMtn, double odometer, Char* trigger, ! UInt16 category, UInt16 index) MTN_SECTION; ! static void DisplayCreateNextMtnRec(CompleteMaintenance *cMtn, UInt16 category, ! UInt16 index) MTN_SECTION; static UInt32 sizeofMtn(UInt16 flags) MTN_SECTION; static Boolean getLastTwoPFRecord(PFRecord *rec1, *************** *** 65,68 **** --- 73,85 ---- #define NB_NAVCOL_REC 3 + /// Used to have a more explicit if + #define YES_CREATE_NEXT_RECORD 0 + + /// Contain the index of the pfRecord that triggered the + /// maintenance alert or 0. + /// If this is different then zeo the user selected the GOTO + /// button on the Maintenance alert. + static UInt16 comingFromGoTo = 0; + /** * Compare two Maintenance records *************** *** 222,271 **** } ! /** ! * This function save a copy of the Maintenance record if one the ! * every flag is set. ! * If after an alert we say OK then we make a copy of the current ! * maintenance and save it. ! * If after an alert we say SNOOZE we make a copy so that there will ! * be an alert for the next new pfRecord. (The counter of the main ! * mainteance record was incremented). ! * ! * @param cMtn The Complete maintenance to be copied and saved. ! * N.B. some value will be changed. ! * @param category The category of the maintenance record. ! * @param index The index of the maintenance record. ! */// void ! saveMtnCopyForEvery(CompleteMaintenance *cMtn, UInt16 category, UInt16 index) { ! if ( cMtn->flags & (MTN_EVERY_ODO | MTN_EVERY_DATE) ) { ! // Read the note of the old record ! readNote(pFuelMtnDB, index, sizeofMtn(cMtn->flags), &CurrentNoteHandle); ! // Create a new record in the database ! index = CreateMtnRecord(category); ! // We save the current mtn info but without the every stuff ! cMtn->flags &= ~(MTN_ACTIVE | MTN_EVERY_ODO | MTN_EVERY_DATE); ! MtnRecSaveData(category, index, *cMtn); ! saveNote(pFuelMtnDB, index, sizeofMtn(cMtn->flags), &CurrentNoteHandle); } } ! /** ! * This function display an alert if the new record trigger the alert. ! * It will increment the every counter when necessary and ! * If we choose to snooze then a new maintenance record is created. ! * ! * @param cMtn The maintenance record triggered by the new record ! * @param trigger Description of what triggered the alert. ! * @param flag The trigger was caused by a odo or date' ! * ! * @return The value of the button press in the alert form ! */// Int16 ! displayAlert(CompleteMaintenance *cMtn, double odometer, Char* trigger, UInt16 flag, UInt16 category, UInt16 index) { --- 239,360 ---- } + //////////////////////////////////////////////////////////////////////////////// + /// This function makes a copy of a Maintenance record. + /// + /// It will save the new maintenance record as inactive since it is \b done. + /// The MTN_EVERY_XXX state is also \b remove since the original record is updated + /// to trigger the next maintenance alert. + /// + /// @param cMtn The Complete maintenance to be copied and saved. + /// N.B. some value will be changed. + /// @param category The category of the maintenance record. + /// @param index The index of the pFuelMtnDB record. + //////////////////////////////////////////////////////////////////////////////// + void + SaveDoneMtnRec(CompleteMaintenance *cMtn, UInt16 category, UInt16 index) + { + // Read the note of the old record + readNote(pFuelMtnDB, index, sizeofMtn(cMtn->flags), &CurrentNoteHandle); ! // Create a new record in the database ! index = CreateMtnRecord(category); ! ! // We save the current mtn info but without the every stuff ! cMtn->flags &= ~(MTN_ACTIVE | MTN_EVERY_ODO | MTN_EVERY_DATE); ! ! MtnRecSaveData(category, index, *cMtn); ! saveNote(pFuelMtnDB, index, sizeofMtn(cMtn->flags), &CurrentNoteHandle); ! } ! ! ! //////////////////////////////////////////////////////////////////////////////// ! /// This function save a done maintenance and update the current maintenance ! /// to be able to trigger the next maintenance alert. ! /// ! /// @param cMtn The maintenance record triggered by the new record ! /// @param odometer The odometer value of the pFuel record triggering the alert ! /// @param trigger Description of what triggered the alert. ! /// @param flag The trigger was caused by a odo or date' ! /// @param category The category of the maintenance record. ! /// @param index The index of the pFuelMtnDB record. ! //////////////////////////////////////////////////////////////////////////////// void ! SaveDoneMtnRecAndUpdateForNext(CompleteMaintenance *cMtn, double odometer, ! UInt16 category, UInt16 index) { ! UInt16 oldcMtnFlags = cMtn->flags; // The value can be changed in saveDoneMtnRec ! ! if (1) // Should check for preference { ! cMtn->odo = odometer; ! DateSecondsToDate(TimGetSeconds(), &(cMtn->date)); ! } ! if ( cMtn->flags & (MTN_EVERY_DATE | MTN_EVERY_ODO) ) ! { ! // Save a copy of the record since it will be updated ! // to trigger the next alert. ! SaveDoneMtnRec(cMtn, category, index); ! cMtn->flags = oldcMtnFlags; // The value can be changed in saveDoneMtnRec ! } ! else ! { ! // Remove the active state since this was a one time alert ! cMtn->flags &= ~MTN_ACTIVE; ! } ! ! // Update the date to be the today date ! DateSecondsToDate(TimGetSeconds(), &(cMtn->date)); ! ! if (cMtn->eDate.cnt) ! { ! UInt32 mtnDays = DateToDays(cMtn->date); ! ! switch (cMtn->flags&MTN_EVERY_DATE_MASK ) ! { ! case MTN_DAYS: ! // we do nothing; ! break; ! case MTN_WEEKS: ! cMtn->eDate.value *= 7; ! break; ! case MTN_MONTHS: ! cMtn->eDate.value *= 30; ! break; ! } ! mtnDays += cMtn->eDate.value; ! DateDaysToDate(mtnDays, &(cMtn->date)); } + + if (cMtn->eOdo.cnt) + { + cMtn->odo += cMtn->eOdo.value; + } + + MtnRecSaveData(CurrentCategory, index, *cMtn); } ! //////////////////////////////////////////////////////////////////////////////// ! /// This function display an alert if the new record trigger the alert. ! /// It will increment the every counter when necessary and ! /// If we choose to snooze then a new maintenance record is created. ! /// ! /// If after an alert we say OK then we make a copy of the current ! /// maintenance and save it as done. ! /// If after an alert we say SNOOZE we make a copy so that there will ! /// be an alert for the next new pfRecord. (The counter of the main ! /// mainteance record was incremented). ! /// ! /// ! /// @param cMtn The maintance record triggered by the new record ! /// @param odometer The odometer value of the pFuel record triggering the alert ! /// @param trigger Description of what triggered the alert. ! /// @param category The category of the maintenance record. ! /// @param index The index of the pFuelMtnDB record triggering the alert. ! /// @return The value of the button press in the alert form ! //////////////////////////////////////////////////////////////////////////////// Int16 ! DisplayAlert(CompleteMaintenance *cMtn, double odometer, Char* trigger, UInt16 category, UInt16 index) { *************** *** 274,279 **** alertCode = FrmCustomAlert(MtnAlert, cMtn->desc, str, trigger); // DEBUG ! // When we have an EVERY_DATE or EVERY_ODO then a new ecord ! // is always created. // The difference between SNOOZE and OK: // With OK the record is not active and the odometer value --- 363,370 ---- alertCode = FrmCustomAlert(MtnAlert, cMtn->desc, str, trigger); // DEBUG ! // When we have an EVERY_DATE or EVERY_ODO then a new record ! // is automatically created by the OK or SNOOZE button. ! // If the GOTO butoon is selected exiting the Maintenance form the user ! // will be asked if he wants to create a new record // The difference between SNOOZE and OK: // With OK the record is not active and the odometer value *************** *** 283,312 **** switch ( alertCode ) { ! case MtnAlertOK : ! if (flag & MTN_DATE) ! cMtn->eDate.cnt += 1; ! if (flag & MTN_ODO) ! cMtn->eOdo.cnt += 1; ! ! if ( !(cMtn->flags & (MTN_EVERY_DATE | MTN_EVERY_ODO)) ) ! cMtn->flags &= ~MTN_ACTIVE; ! ! // Save the cnt and possibly the new active state for this record ! MtnRecSaveData(CurrentCategory, index, *cMtn); ! ! cMtn->odo = odometer; ! DateSecondsToDate(TimGetSeconds(), &(cMtn->date)); ! saveMtnCopyForEvery(cMtn, category, index); break; case MtnAlertGoTo : ! AddingRecord = false; ! CurrentRecord = index; FrmGotoForm(MtnRecForm); break; ! case MtnAlertSnooze : ! saveMtnCopyForEvery(cMtn, category, index); ! break; } --- 374,393 ---- switch ( alertCode ) { ! case MtnAlertSnooze : ! // Do nothing. Will have the same alert next time break; case MtnAlertGoTo : ! AddingRecord = false; ! comingFromGoTo = cMtn->info.pfIdx; ! CurrentRecord = index; ! CurrentCategory = category; FrmGotoForm(MtnRecForm); break; ! case MtnAlertOK : // Fall to default ! default: ! SaveDoneMtnRecAndUpdateForNext(cMtn, odometer, category, index); ! break; } *************** *** 315,318 **** --- 396,440 ---- + //////////////////////////////////////////////////////////////////////////////// + /// This function display an alert if the user exit the Maintenance Record form + /// and the user was sent to this form by the GOTO button of the Maintenance + /// Alert. + /// It will give the option to create the next Maintenance record + /// + /// @param cMtn The maintenance record triggered by the new record + /// @param category The category of the maintenance record. + /// @param index The index of the pFuelMtnDB record triggering the alert. + /// @return The value of the button press in the alert form + //////////////////////////////////////////////////////////////////////////////// + void + DisplayCreateNextMtnRec(CompleteMaintenance *cMtn, UInt16 category, UInt16 index) + { + cMtn->info.pfIdx = comingFromGoTo; + comingFromGoTo = 0; // Reset the value + if ( cMtn->flags & (MTN_EVERY_DATE | MTN_EVERY_ODO) ) + { + if ( FrmAlert(MtnCreateNext) == YES_CREATE_NEXT_RECORD) + { + MemHandle h; + PFRecord *pfRec; + + h = DmQueryRecord(pFuelDB, cMtn->info.pfIdx); + if (h) + { + pfRec = MemHandleLock(h); + } + else + return; + + SaveDoneMtnRecAndUpdateForNext(cMtn, pfRec->odometer, category, index); + + MemHandleUnlock(h); + } + FrmGotoForm(MtnForm); + } + } + + + /** * Check if the the values of the current record are below the treshold alert *************** *** 321,325 **** * * @param category The car category we want to check ! * @param index The index of the record for the car we want to check. * Usually it will be the last record * <PRE> --- 443,447 ---- * * @param category The car category we want to check ! * @param pfIndex The index of the pFuelDB record for the car we want to check. * Usually it will be the last record * <PRE> *************** *** 339,343 **** */// Int16 ! checkMaintenance(UInt16 category, UInt16 index) { MemHandle h; --- 461,465 ---- */// Int16 ! checkMaintenance(UInt16 category, UInt16 pfIndex) { MemHandle h; *************** *** 345,348 **** --- 467,471 ---- Int16 i, nb; CompleteMaintenance cMtn; + UInt16 index; UInt16 alertCode = -1; Char strUnit[5]; *************** *** 350,354 **** // Boolean changed = false; ! h = DmQueryRecord(pFuelDB, index); if (h) { --- 473,477 ---- // Boolean changed = false; ! h = DmQueryRecord(pFuelDB, pfIndex); if (h) { *************** *** 375,395 **** UInt32 mtnDays = DateToDays(cMtn.date); - if (cMtn.flags&MTN_EVERY_DATE) - { - switch (cMtn.flags&MTN_EVERY_DATE_MASK ) - { - case MTN_DAYS: - // we do nothing; - break; - case MTN_WEEKS: - cMtn.eDate.value *= 7; - break; - case MTN_MONTHS: - cMtn.eDate.value *= 30; - break; - } - mtnDays += cMtn.eDate.cnt*cMtn.eDate.value; - } - if (mtnDays < recDays) { --- 498,501 ---- *************** *** 408,413 **** DateToAscii(month, day, year, shortDateFormat, str); ! alertCode = displayAlert(&cMtn, pfRec->odometer, "", MTN_DATE, ! category, index); } } --- 514,520 ---- DateToAscii(month, day, year, shortDateFormat, str); ! cMtn.eDate.cnt = 1; ! cMtn.info.pfIdx = pfIndex; ! alertCode = DisplayAlert(&cMtn, pfRec->odometer, "", category, index); } } *************** *** 416,428 **** if ( (cMtn.flags&MTN_ODO) && !(pfRec->flags&TRIP_RECFLAG) ) { ! if ( (cMtn.odo+cMtn.eOdo.cnt*cMtn.eOdo.value) < pfRec->odometer) { //TRACE("checkMaintenance: triggered by Odo desc=%s", cMtn.desc); ! FormatFloat(str, convertDistance(cMtn.odo+cMtn.eOdo.cnt*cMtn.eOdo.value, KM, ! cCarPref->odoUnit), cCarPref->decimalsOdo); getString(unitsDistAbrvLst, cCarPref->odoUnit, strUnit); ! alertCode = displayAlert(&cMtn, pfRec->odometer, strUnit, MTN_ODO, category, index); } } --- 523,536 ---- if ( (cMtn.flags&MTN_ODO) && !(pfRec->flags&TRIP_RECFLAG) ) { ! if ( cMtn.odo < pfRec->odometer) { //TRACE("checkMaintenance: triggered by Odo desc=%s", cMtn.desc); ! FormatFloat(str, convertDistance(cMtn.odo, KM, cCarPref->odoUnit), cCarPref->decimalsOdo); getString(unitsDistAbrvLst, cCarPref->odoUnit, strUnit); ! cMtn.eOdo.cnt = 1; ! cMtn.info.pfIdx = pfIndex; ! alertCode = DisplayAlert(&cMtn, pfRec->odometer, strUnit, category, index); } } *************** *** 442,454 **** } ! if (cMtn.eOdo.cnt*cMtn.eOdo.value < dist) { //TRACE("checkMaintenance: triggered by Odo desc=%s", cMtn.desc); ! FormatFloat(str, convertDistance(cMtn.eOdo.cnt*cMtn.eOdo.value, KM, ! cCarPref->odoUnit), cCarPref->decimalsOdo); getString(unitsDistAbrvLst, cCarPref->odoUnit, strUnit); ! alertCode = displayAlert(&cMtn, pfRec->odometer, strUnit, MTN_ODO, category,index); } --- 550,563 ---- } ! if (cMtn.eOdo.value < dist) { //TRACE("checkMaintenance: triggered by Odo desc=%s", cMtn.desc); ! FormatFloat(str, convertDistance(cMtn.eOdo.value, KM, cCarPref->odoUnit), cCarPref->decimalsOdo); getString(unitsDistAbrvLst, cCarPref->odoUnit, strUnit); ! cMtn.eOdo.cnt = 1; ! cMtn.info.pfIdx = pfIndex; ! alertCode = DisplayAlert(&cMtn, pfRec->odometer, strUnit, category, index); } *************** *** 542,547 **** // We don't want a break here case MTN_EVERY_DATE : ! size += ((flags&MTN_LINK) ? sizeof(MtnSIndex) : 0 ); ! case MTN_LINK : size += ((flags&MTN_ODO) ? sizeof(float) : 0 ); case MTN_ODO : --- 651,656 ---- // We don't want a break here case MTN_EVERY_DATE : ! size += ((flags&MTN_INFO) ? sizeof(MtnInfo) : 0 ); ! case MTN_INFO : size += ((flags&MTN_ODO) ? sizeof(float) : 0 ); case MTN_ODO : *************** *** 568,572 **** size += ((flags&MTN_DATE) ? sizeof(DateType) : 0); size += ((flags&MTN_ODO) ? sizeof(float) : 0 ); ! size += ((flags&MTN_LINK) ? sizeof(MtnSIndex) : 0 ); size += ((flags&MTN_EVERY_DATE) ? sizeof(EveryDate) : 0 ); size += ((flags&MTN_EVERY_ODO) ? sizeof(EveryOdo) : 0 ); --- 677,681 ---- size += ((flags&MTN_DATE) ? sizeof(DateType) : 0); size += ((flags&MTN_ODO) ? sizeof(float) : 0 ); ! size += ((flags&MTN_INFO) ? sizeof(MtnInfo) : 0 ); size += ((flags&MTN_EVERY_DATE) ? sizeof(EveryDate) : 0 ); size += ((flags&MTN_EVERY_ODO) ? sizeof(EveryOdo) : 0 ); *************** *** 633,652 **** - // if (rec->flags&MTN_LINK) - // { - // cMtnRec->mtnIndex.value = ((MtnSIndex *)p)->value; - // cMtnRec->mtnIndex.cnt = ((MtnSIndex *)p)->cnt; - // p += sizeof(MtnSIndex); - // } - // else - // { - // cMtnRec->mtnIndex.cnt = 0; - // } - - if (rec->flags & MTN_EVERY_ODO) { cMtnRec->eOdo.value = ((EveryOdo *)p)->value; cMtnRec->eOdo.cnt = ((EveryOdo *)p)->cnt; p += sizeof(EveryOdo); } --- 742,757 ---- if (rec->flags & MTN_EVERY_ODO) { cMtnRec->eOdo.value = ((EveryOdo *)p)->value; cMtnRec->eOdo.cnt = ((EveryOdo *)p)->cnt; + if ( cMtnRec->eOdo.cnt && cMtnRec->eOdo.cnt > 1) + { + // Has of version 0.05.01 cnt can only take value 0 and 1 + // So we convert old entry + cMtnRec->odo += (cMtnRec->eOdo.cnt-1) * cMtnRec->eOdo.value; + cMtnRec->eOdo.cnt = 1; + } + p += sizeof(EveryOdo); } *************** *** 1150,1155 **** { static Boolean changeDigit = false; ! Boolean handled = false; ! WChar chr = eventP->data.keyDown.chr; const UInt16 navTable[NB_NAVROW_REC * NB_NAVCOL_REC] = --- 1255,1260 ---- { static Boolean changeDigit = false; ! Boolean handled = false; ! WChar chr = eventP->data.keyDown.chr; const UInt16 navTable[NB_NAVROW_REC * NB_NAVCOL_REC] = *************** *** 1323,1327 **** TRACE("MtnRecFHE: OK: Ici 1"); toBeSaved = true; ! FrmGotoForm(MtnForm); TRACE("MtnRecFHE: OK: Ici 2"); } --- 1428,1435 ---- TRACE("MtnRecFHE: OK: Ici 1"); toBeSaved = true; ! if (comingFromGoTo) ! DisplayCreateNextMtnRec(&cMtn, CurrentCategory, CurrentRecord); ! else ! FrmGotoForm(MtnForm); TRACE("MtnRecFHE: OK: Ici 2"); } *************** *** 1332,1336 **** toBeSaved = false; ! FrmGotoForm(MtnForm); TRACE("MtnRecFHE: Cancel: Stop"); break; --- 1440,1447 ---- toBeSaved = false; ! if (comingFromGoTo) ! DisplayCreateNextMtnRec(&cMtn, CurrentCategory, CurrentRecord); ! else ! FrmGotoForm(MtnForm); TRACE("MtnRecFHE: Cancel: Stop"); break; *************** *** 1731,1736 **** Char tmp[13]; // xxx,xxx.xxxxUN Char units[3]; ! FormatFloat(tmp, convertDistance(cMtn.odo+cMtn.eOdo.cnt*cMtn.eOdo.value, KM, ! cCarPref->odoUnit), cCarPref->decimalsOdo); getString(unitsDistAbrvLst, cCarPref->odoUnit, units); --- 1842,1846 ---- Char tmp[13]; // xxx,xxx.xxxxUN Char units[3]; ! FormatFloat(tmp, convertDistance(cMtn.odo, KM, cCarPref->odoUnit), cCarPref->decimalsOdo); getString(unitsDistAbrvLst, cCarPref->odoUnit, units); *************** *** 1739,1769 **** else { ! DateType date; ! Int16 year; ! Int16 month; ! Int16 day; ! UInt32 mtnDays = DateToDays(cMtn.date); ! if (cMtn.flags&MTN_EVERY_DATE) ! { ! switch (cMtn.flags&MTN_EVERY_DATE_MASK ) ! { ! case MTN_DAYS: ! // we do nothing; ! break; ! case MTN_WEEKS: ! cMtn.eDate.value *= 7; ! break; ! case MTN_MONTHS: ! cMtn.eDate.value *= 30; ! break; ! } ! mtnDays += cMtn.eDate.cnt*cMtn.eDate.value; ! } ! ! DateDaysToDate(mtnDays, &date); ! year = date.year + 1904; ! month = date.month; ! day = date.day; ! DateToAscii(month, day, year, shortDateFormat, str); } --- 1849,1854 ---- else { ! DateToAscii(cMtn.date.month, cMtn.date.day, cMtn.date.year + 1904, ! shortDateFormat, str); } Index: pFuel.rcp.in.fr =================================================================== RCS file: /cvsroot/pfuel/pFuel/Src/pFuel.rcp.in.fr,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** pFuel.rcp.in.fr 27 Jun 2007 12:31:28 -0000 1.6 --- pFuel.rcp.in.fr 29 Aug 2007 12:42:06 -0000 1.7 *************** *** 23,34 **** "About pFuel" = "À propos de pFuel" "Add" = "Ajouter" ! "Add Form, set Trip as default" = "Add Form, Mettre Distance comme défaut" "Amount per day" = "Montant par jour" "Ascending" = "Ascendant" ! "Avg days between fills" = "Nb jrs moy. entre plein" "Avg dist per tank" = "Dist moy. par réservoir" "Cancel" = "Annuler" "Car" = "Véhicule" ! "Check 'filter' to select only\ra range of records." = "Cocher le filtre pour selecionner\rseulement un ensemble de données." "Continue" = "Continuer" "Copy" = "Copier" --- 23,34 ---- "About pFuel" = "À propos de pFuel" "Add" = "Ajouter" ! "Add Form, set Trip as default" = "Ajout:Item, distance par défaut" "Amount per day" = "Montant par jour" "Ascending" = "Ascendant" ! "Avg days between fills" = "Moy. jrs entre pleins" "Avg dist per tank" = "Dist moy. par réservoir" "Cancel" = "Annuler" "Car" = "Véhicule" ! "Check 'filter' to select only\ra range of records." = "Cocher le filtre pour sélecionner\rseulement un ensemble de données." "Continue" = "Continuer" "Copy" = "Copier" *************** *** 61,65 **** "Export..." = "Exporter..." "Export Too Large" = "Transfert trop gros" ! "Fill Field with default values" = "Remplir les champs avec des valeurs par défault" "Filter" = "Filtre" "for tank" = "du plein" --- 61,65 ---- "Export..." = "Exporter..." "Export Too Large" = "Transfert trop gros" ! "Fill Field with default values" = "Mettre valeurs par défaut" "Filter" = "Filtre" "for tank" = "du plein" *************** *** 71,84 **** "Gal" = "Gal" "Gallons" = "Gallons" ! "Global Preferences" = "Preferences Globales" ! "Global Preferences..." = "Preferences Globales..." "GO TO" = "ALLER À" "Graph" = "Graphe" "Graphics" = "Graphes" ! "Import car's data in CSV format\rfrom the Memo Pad." = "Importer les données en format CSV\rprovenant du Memo Pad pour le véhicule courrant." "Import Error" = "Erreur d'importation" "Import failed" = "Problème à l'importation" "Import..." = "Importer..." ! "Import pFuel Record" = "Importer les items de pFuel" "Include Maintenances Cost" = "Inclure Frais de Maintenances" "Insufficient Data" = "Données insuffisantes" --- 71,84 ---- "Gal" = "Gal" "Gallons" = "Gallons" ! "Global Preferences" = "Préférences Globales" ! "Global Preferences..." = "Préférences Globales..." "GO TO" = "ALLER À" "Graph" = "Graphe" "Graphics" = "Graphes" ! "Import car's data in CSV format\rfrom the Memo Pad." = "Importer les données en format CSV\rprovenant du Memo Pad pour le\rvéhicule courant." "Import Error" = "Erreur d'importation" "Import failed" = "Problème à l'importation" "Import..." = "Importer..." ! "Import pFuel Records" = "Importer les items de pFuel" "Include Maintenances Cost" = "Inclure Frais de Maintenances" "Insufficient Data" = "Données insuffisantes" *************** *** 111,115 **** --- 111,118 ---- "Odometer" = "Odomètre" "Odometer:" = "Odomètre:" + "OFF" = "OFF" "OK" = "OK" + "ON" = " ON" + "One Hand Mode:" = "Mode une main:" "One of the record to be imported don't follow the formatting or records are missing" = "Une des entrées importées n'a pas le bon format ou une entrée est manquante" "Options" = "Options" *************** *** 138,142 **** "Tank" = "Plein" "Tapping OK will delete the records\rof the current Car category" = "Choisir OK va effacer les données\rde la catétgorie courante" ! "Tapping OK will export the\rcurrent car's data in CSV format\rto the Memo Pad." = "Choisir OK va transférer les\rdonnées sous format CSV dans une\rentré du Memo Pad" "The exported data is too large for the memo pad application, please choose a smaller date range and try again." = "La quantité de données à transférer est trop grande. Choisir un ensemble de données plus petit." "The maintenance (^1) is due as of ^2^3" = "L'entretien (^1) est dû depuis ^2^3" --- 141,145 ---- "Tank" = "Plein" "Tapping OK will delete the records\rof the current Car category" = "Choisir OK va effacer les données\rde la catétgorie courante" ! "Tapping OK will export the\rcurrent car's data in CSV format\rto the Memo Pad." = "Choisir OK va transférer les\rdonnées sous format CSV dans une\rentrée du Memo Pad" "The exported data is too large for the memo pad application, please choose a smaller date range and try again." = "La quantité de données à transférer est trop grande. Choisir un ensemble de données plus petit." "The maintenance (^1) is due as of ^2^3" = "L'entretien (^1) est dû depuis ^2^3" *************** *** 148,152 **** "Trigger at" = "Échéance à" "Trip" = "Distance" ! "Trip entries are continuous" = "Les entrées des distance sont en continues" "Unfiled" = "Non classé" "Units:" = "Unitées" --- 151,155 ---- "Trigger at" = "Échéance à" "Trip" = "Distance" ! "Trip entries are continuous" = "Distances en continues" "Unfiled" = "Non classé" "Units:" = "Unitées" Index: navigation.c =================================================================== RCS file: /cvsroot/pfuel/pFuel/Src/navigation.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** navigation.c 28 Nov 2006 14:13:08 -0000 1.4 --- navigation.c 29 Aug 2007 12:42:06 -0000 1.5 *************** *** 246,250 **** * @param frm The form containing the frame * @param idx The index of the Ctl object in the frame ! * @param objrame The frame currently around the object * @param focusFrame The frame to draw around the current frame to indicate * the focus is on this object. --- 246,250 ---- * @param frm The form containing the frame * @param idx The index of the Ctl object in the frame ! * @param objFrame The frame currently around the object * @param focusFrame The frame to draw around the current frame to indicate * the focus is on this object. *************** *** 258,261 **** --- 258,262 ---- RectangleType boldRect; + FormType *frmP = FrmGetActiveForm(); UInt16 idx = FrmGetObjectIndex(frmP, objID); *************** *** 266,276 **** WinGetFramesRectangle(objFrame, &rect, &boldRect); if (focus & NAV_FOCUS) { ! WinDrawRectangleFrame(focusFrame, &boldRect); FrmSetFocus(frmP, GetObjectIdx(objID)); } else { WinEraseRectangleFrame(focusFrame, &boldRect); WinDrawRectangleFrame(objFrame, &rect); --- 267,283 ---- WinGetFramesRectangle(objFrame, &rect, &boldRect); + if (focus & NAV_FOCUS) { ! TRACE("UpdateFrame: focus"); ! ! WinEraseRectangleFrame(objFrame, &boldRect); ! WinDrawRectangleFrame(focusFrame, &rect); FrmSetFocus(frmP, GetObjectIdx(objID)); } else { + TRACE("UpdateFrame: no focus"); + WinEraseRectangleFrame(focusFrame, &boldRect); WinDrawRectangleFrame(objFrame, &rect); *************** *** 393,396 **** --- 400,405 ---- * For List: A frame is drawed * + * @param focus If true then the focus is objID + * * @return false if the objID is not valid (i.e ovbjID == 0) * *************** *** 405,409 **** if ( objID && IsObjectFocusable(objID) ) { ! TRACE("Set Focus to %hu", objID); if (!FrmGlueNavIsSupported()) { --- 414,418 ---- if ( objID && IsObjectFocusable(objID) ) { ! TRACE("Set Focus to %hu focus=%hu", objID, focus); if (!FrmGlueNavIsSupported()) { *************** *** 443,446 **** --- 452,460 ---- case popupTriggerCtl: UpdateFrame(objID, noFrame, popupFrame, focus); + if (0 == focus) + { + TRACE("SetFocus redraw", objID); + FrmDrawForm(frmP); + } break; default: // Used to remove warnings *************** *** 649,652 **** --- 663,668 ---- UInt16 focus = NAV_FOCUS; Select(navTable[nbCol * (*row) + (*col)], nbRow, row, col, &focus); + FrmDrawForm(FrmGetActiveForm()); + UpdateFrame(navTable[nbCol * (*row) + (*col)], noFrame, popupFrame, NAV_FOCUS); } break; Index: Makefile =================================================================== RCS file: /cvsroot/pfuel/pFuel/Src/Makefile,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** Makefile 29 Jun 2007 12:18:27 -0000 1.25 --- Makefile 29 Aug 2007 12:42:06 -0000 1.26 *************** *** 112,116 **** # uncomment this if you want to build a gdb debuggable version # -On: n=Optimization-level (0=none), -g: needed for debugging ! CFLAGS = -O2 -Wall -MD OBJRES = m68k-palmos-obj-res --- 112,116 ---- # uncomment this if you want to build a gdb debuggable version # -On: n=Optimization-level (0=none), -g: needed for debugging ! CFLAGS = -O2 -Wall -MD -g OBJRES = m68k-palmos-obj-res *************** *** 191,195 **** @if ( ! test -d zip ); then $(MKDIR) zip; fi; # Create the ChangeLog.html ! # ./Script/changelog.py -i ../Docs/changelog.tpl -o ../Docs/changeLog.html -c ../CHANGELOG gmake clean; gmake APP=cnvtFLog; --- 191,196 ---- @if ( ! test -d zip ); then $(MKDIR) zip; fi; # Create the ChangeLog.html ! ./Script/changelog.py -i ../Docs/changelog.tpl -o ../Docs/changeLog.html -c ../CHANGELOG ! scp ../Docs/changelog.html pa...@sh...:/home/groups/p/pf/pfuel/htdocs/Development/changelog.html gmake clean; gmake APP=cnvtFLog; Index: maintenance.h =================================================================== RCS file: /cvsroot/pfuel/pFuel/Src/maintenance.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** maintenance.h 9 Feb 2007 15:51:19 -0000 1.11 --- maintenance.h 29 Aug 2007 12:42:06 -0000 1.12 *************** *** 45,55 **** enum MTN_FLAGS { ! MTN_DAYS = 0x001, ///< Used to know whic of the EveryDate list is selected ! MTN_WEEKS = 0x002, ///< Used to know whic of the EveryDate list is selected ! MTN_MONTHS = 0x004, ///< Used to know whic of the EveryDate list is selected MTN_EVERY_DATE_MASK = MTN_DAYS | MTN_WEEKS | MTN_MONTHS, MTN_DATE = 0x008, MTN_ODO = 0x010, ! MTN_LINK = 0x020, MTN_EVERY_DATE = 0x040, MTN_EVERY_ODO = 0x080, --- 45,55 ---- enum MTN_FLAGS { ! MTN_DAYS = 0x001, ///< Used to know which of the EveryDate list is selected ! MTN_WEEKS = 0x002, ///< Used to know which of the EveryDate list is selected ! MTN_MONTHS = 0x004, ///< Used to know which of the EveryDate list is selected MTN_EVERY_DATE_MASK = MTN_DAYS | MTN_WEEKS | MTN_MONTHS, MTN_DATE = 0x008, MTN_ODO = 0x010, ! MTN_INFO = 0x020, MTN_EVERY_DATE = 0x040, MTN_EVERY_ODO = 0x080, *************** *** 62,65 **** --- 62,69 ---- { float value; ///< The units of this value is defided by flgs|MTN_EVERY_DATE_MASK + /// A value of 1 indicates that the alert was triggered by the date. + /// @warning Has of version 0.05.01 This value can only be 0 and 1 + /// Before it was used to hold the number of alert generated by this + /// maintenance record. UInt8 cnt; } EveryDate; *************** *** 68,71 **** --- 72,79 ---- { float value; + /// A value of 1 indicates that the alert was triggered by the odometer value. + /// @warning Has of version 0.05.01 This value can only be 0 and 1. + /// Before it was used to hold the number of alert generated by this + /// maintenance record. UInt8 cnt; } EveryOdo; *************** *** 73,79 **** typedef struct { ! UInt16 value; UInt8 cnt; ! } MtnSIndex; --- 81,87 ---- typedef struct { ! UInt16 pfIdx; ///< Index of the pFuelDB record which triggered the alert UInt8 cnt; ! } MtnInfo; *************** *** 106,113 **** { UInt16 flags; ///< Flag that give you which field are used. ! Char desc[STR_LEN]; ///< Description of the maintenance DateType date; float odo; ! MtnSIndex mtnIndex; EveryOdo eOdo; EveryDate eDate; --- 114,125 ---- { UInt16 flags; ///< Flag that give you which field are used. ! Char desc[STR_LEN]; ///< Description of the maintenance ! /// Date value for the next maintance if active or the date at which ! /// the maintenance was done. DateType date; + /// Odometer value for the next maintance if active or the odometer value at which + /// the maintenance was done. float odo; ! MtnInfo info; EveryOdo eOdo; EveryDate eDate; Index: pFuelRsc.h =================================================================== RCS file: /cvsroot/pfuel/pFuel/Src/pFuelRsc.h,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** pFuelRsc.h 27 Jun 2007 12:31:28 -0000 1.42 --- pFuelRsc.h 29 Aug 2007 12:42:06 -0000 1.43 *************** *** 366,369 **** --- 366,374 ---- // Resource: Talt 1120 + #define MtnCreateNext 1130 + #define MtnCreateNextOK 0 + #define MtnCreateNextCancel 1 + + // Resource: Talt 1120 #define MtnReadWarning 1220 Index: graph.c =================================================================== RCS file: /cvsroot/pfuel/pFuel/Src/graph.c,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** graph.c 5 Jan 2007 13:15:47 -0000 1.28 --- graph.c 29 Aug 2007 12:42:06 -0000 1.29 *************** *** 246,251 **** ++nbRecords; ! max = (y > max) ? y : max; ! min = (y < min) ? y : min; curs = nextFuel(curs, fullTankRequired, category); --- 246,254 ---- ++nbRecords; ! if (curs->price && curs->fuel) ! { ! max = (y > max) ? y : max; ! min = (y < min) ? y : min; ! } curs = nextFuel(curs, fullTankRequired, category); *************** *** 348,353 **** else if (0 == delay) { // We have jumped over the gap so reinitiasze the pt. ! lasty = r.topLeft.y + (r.extent.y *(1.0f - (y - min)/(max - min))); lastx = r.topLeft.x + r.extent.x * ((recno) / (nbRecords-1.0)); --- 351,358 ---- else if (0 == delay) { + if (0 ==recno) + avg = y; // We have jumped over the gap so reinitiasze the pt. ! lastAvg = lasty = r.topLeft.y + (r.extent.y *(1.0f - (y - min)/(max - min))); lastx = r.topLeft.x + r.extent.x * ((recno) / (nbRecords-1.0)); Index: pFuel.rcp.in =================================================================== RCS file: /cvsroot/pfuel/pFuel/Src/pFuel.rcp.in,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** pFuel.rcp.in 27 Jun 2007 12:31:28 -0000 1.63 --- pFuel.rcp.in 29 Aug 2007 12:42:06 -0000 1.64 *************** *** 813,816 **** --- 813,825 ---- END + ALERT ID MtnCreateNext + ERROR + BEGIN + TITLE "Every Maintenance Info" + MESSAGE "Since your are comming from and alert.\r Do you want to save this record and create the set the next maintenance record." + BUTTONS "OK" "CANCEL" + END + + ALERT ID MtnReadWarning ERROR |
|
From: Remi R. <pa...@us...> - 2007-08-29 12:42:05
|
Update of /cvsroot/pfuel/pFuel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10181 Modified Files: CHANGELOG Log Message: 20070825-RR-01 - Bug: - Bug #1744197: The value displayed for Avg Days Between Fills was wrong. when a filter was set. Fixed. - In the Add Record the form was not redrawed correctly after selecting the "Odometer/Distance" list. Reported by Fernando Deambrosio - Fix some problems in the French string. Spelling mistake, sentence not translated. Reported by Fernando Deambrosio - The first points on the graph cost/Volume are not calculated correctly. - Development: - Add in the Makefile the push of the new ChangeLog to the SF Home web site. Index: CHANGELOG =================================================================== RCS file: /cvsroot/pfuel/pFuel/CHANGELOG,v retrieving revision 1.123 retrieving revision 1.124 diff -C2 -d -r1.123 -r1.124 *** CHANGELOG 29 Jun 2007 12:18:27 -0000 1.123 --- CHANGELOG 29 Aug 2007 12:42:06 -0000 1.124 *************** *** 13,16 **** --- 13,45 ---- #------------------------------------------------------------ + 20070825-RR-01 + - Bug: + - Bug #1744197: The value displayed for Avg Days Between Fills was wrong. + when a filter was set. Fixed. + - In the Add Record the form was not redrawed correctly after selecting + the "Odometer/Distance" list. Reported by Fernando Deambrosio + - Fix some problems in the French string. Spelling mistake, sentence not + translated. Reported by Fernando Deambrosio + - The first points on the graph cost/Volume are not calculated correctly. + - Development: + - Add in the Makefile the push of the new ChangeLog to the SF Home web site. + + + 20070726-RR-01 + - Bug: + - Fix some problems in the French string. Spelling mistake, sentence not + showing completely. Reported by Gilbert Mikonio + - The initial point of the smoothed line for the graph Cost/Volume was not + initialized with the good value on some case. Reported by Gilbert Mikonio + - Features: + - After a maintenance alert. If the goto button is selected. When exiting the + Maintenance Record form, you are asked if you want to save a copy of the item. + - After a mainenance alert the saved record can have the current date and odometer + value or the one in the maintenance record. + - Development: + - Update Makefile to create the html version of the Changelog automatically + when creating the zip file of the new version. + - Change the meaning of some of the maintenance member variable. (Mostly cnt). + 20070629-RR-01 - Development: |
|
From: Remi R. <pa...@us...> - 2007-08-29 12:31:07
|
Update of /cvsroot/pfuel/pFuel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6256 Modified Files: Tag: pFuel-0-04-stable CHANGELOG Log Message: 20070825-RR-01 - Development: - Add in the Makefile the push of the new ChangeLog to the SF Home web site. Index: CHANGELOG =================================================================== RCS file: /cvsroot/pfuel/pFuel/CHANGELOG,v retrieving revision 1.121.2.5 retrieving revision 1.121.2.6 diff -C2 -d -r1.121.2.5 -r1.121.2.6 *** CHANGELOG 24 Aug 2007 13:34:44 -0000 1.121.2.5 --- CHANGELOG 29 Aug 2007 12:31:03 -0000 1.121.2.6 *************** *** 13,16 **** --- 13,20 ---- #------------------------------------------------------------ + 20070825-RR-01 + - Development: + - Add in the Makefile the push of the new ChangeLog to the SF Home web site. + Version 0.04.03 20070824-RR-01 |
|
From: Remi R. <pa...@us...> - 2007-08-29 12:31:06
|
Update of /cvsroot/pfuel/pFuel/Src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6256/Src Modified Files: Tag: pFuel-0-04-stable Makefile Log Message: 20070825-RR-01 - Development: - Add in the Makefile the push of the new ChangeLog to the SF Home web site. Index: Makefile =================================================================== RCS file: /cvsroot/pfuel/pFuel/Src/Makefile,v retrieving revision 1.24.2.2 retrieving revision 1.24.2.3 diff -C2 -d -r1.24.2.2 -r1.24.2.3 *** Makefile 24 Aug 2007 13:34:44 -0000 1.24.2.2 --- Makefile 29 Aug 2007 12:31:03 -0000 1.24.2.3 *************** *** 192,195 **** --- 192,196 ---- # Create the ChangeLog.html ./Script/changelog.py -i ../Docs/changelog.tpl -o ../Docs/changeLog.html -c ../CHANGELOG + scp ../Docs/changelog.html pa...@sh...:/home/groups/p/pf/pfuel/htdocs/v0_04_zz/changelog.html gmake clean; gmake APP=cnvtFLog; |
|
From: Remi R. <pa...@us...> - 2007-08-24 13:35:03
|
Update of /cvsroot/pfuel/pFuel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9783 Modified Files: Tag: pFuel-0-04-stable CHANGELOG Log Message: 20070824-RR-01 - Bug: - Bug #1744197: The value displayed for Avg Days Between Fills was wrong. when a filter was set. Fixed. Index: CHANGELOG =================================================================== RCS file: /cvsroot/pfuel/pFuel/CHANGELOG,v retrieving revision 1.121.2.4 retrieving revision 1.121.2.5 diff -C2 -d -r1.121.2.4 -r1.121.2.5 *** CHANGELOG 22 Aug 2007 14:35:11 -0000 1.121.2.4 --- CHANGELOG 24 Aug 2007 13:34:44 -0000 1.121.2.5 *************** *** 13,16 **** --- 13,22 ---- #------------------------------------------------------------ + Version 0.04.03 + 20070824-RR-01 + - Bug: + - Bug #1744197: The value displayed for Avg Days Between Fills was wrong. + when a filter was set. Fixed. + 20070822-RR-01 - Bug: |