[Nbftools-cvs-logs] CellTrack CellDB.cpp,1.28,1.29 CellTrack.rc,1.33,1.34 DlgMain.cpp,1.46,1.47 LocalDB.cpp,1.12,1.13

[Martin R. <zo...@us...>]

Update of /cvsroot/nbftools/CellTrack
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31588

Modified Files:
	CellDB.cpp CellTrack.rc DlgMain.cpp LocalDB.cpp 
Log Message:
Some other bugfixes; Syncing Remote->Local CellDB finally works now :p

Index: CellTrack.rc
===================================================================
RCS file: /cvsroot/nbftools/CellTrack/CellTrack.rc,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- CellTrack.rc	30 Aug 2005 19:25:34 -0000	1.33
+++ CellTrack.rc	25 Oct 2005 21:23:00 -0000	1.34
@@ -208,7 +208,7 @@
 BEGIN
     LISTBOX         IDC_LST_TIMES,3,26,86,12,LBS_SORT | LBS_NOINTEGRALHEIGHT | 
                     WS_TABSTOP
-    CONTROL         "Select Time",IDC_SPIN,"msctls_updown32",UDS_WRAP | UDS_EXPANDABLE |
+    CONTROL         "Select Time",IDC_SPIN,"msctls_updown32",UDS_WRAP | 
                     UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | 
                     UDS_ARROWKEYS | UDS_HORZ | 0x200,3,26,15,11
     CONTROL         "Ignore Cell ID Changes",IDC_CHK_IGNORE,"Button",
@@ -293,12 +293,12 @@
 BEGIN
     LISTBOX         IDC_LSTCELLS,5,15,86,10,LBS_SORT | LBS_NOINTEGRALHEIGHT | 
                     WS_TABSTOP
-    EDITTEXT        IDC_EDT_NAME,5,36,75,12,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDT_NAME,5,36,75,12,ES_AUTOHSCROLL | ES_READONLY
     LTEXT           "Cell LAC-ID:",IDC_STATIC,5,5,42,10
     LTEXT           "Cell Name",IDC_STATIC,5,27,90,8
     LTEXT           "IDC_LBLINFO",IDC_LBLINFO,5,52,90,10
     LTEXT           "Total Cells []",IDC_TOTALCELLS,5,65,90,10
-    CONTROL         "Select Cell",IDC_SPIN_CELLS,"msctls_updown32",UDS_WRAP | UDS_EXPANDABLE |
+    CONTROL         "Select Cell",IDC_SPIN_CELLS,"msctls_updown32",UDS_WRAP | 
                     UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_ARROWKEYS | 
                     UDS_HORZ | 0x200,85,15,13,10
 END
@@ -325,7 +325,7 @@
 BEGIN
     LISTBOX         IDC_LSTCELLS,1,12,79,12,LBS_SORT | LBS_NOINTEGRALHEIGHT | 
                     WS_TABSTOP
-    CONTROL         "Select Cell",IDC_SPIN,"msctls_updown32",UDS_WRAP | UDS_EXPANDABLE |
+    CONTROL         "Select Cell",IDC_SPIN,"msctls_updown32",UDS_WRAP | 
                     UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | 
                     UDS_ARROWKEYS | 0x200,86,12,11,12
     LTEXT           "Available Cells",IDC_STATIC,1,1,88,8
@@ -342,13 +342,13 @@
     LISTBOX         IDC_LSTCOMM,0,38,83,11,LBS_SORT | LBS_NOINTEGRALHEIGHT | 
                     WS_TABSTOP
     CONTROL         "Select COM Port",IDC_SPIN_COMM,"msctls_updown32",
-                    UDS_WRAP | UDS_EXPANDABLE | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | 
+                    UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | 
                     UDS_ARROWKEYS | UDS_HORZ | 0x200,85,38,11,11
     LTEXT           "Incoming COM Port",IDC_STATIC,0,30,66,9
     LISTBOX         IDC_LSTINTERVAL,0,59,83,11,LBS_SORT | 
                     LBS_NOINTEGRALHEIGHT | WS_TABSTOP
     CONTROL         "Select Interval",IDC_SPIN_INTERVAL,"msctls_updown32",
-                    UDS_WRAP | UDS_EXPANDABLE | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | 
+                    UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | 
                     UDS_ARROWKEYS | UDS_HORZ | 0x200,86,59,11,11
     LTEXT           "Interval",IDC_STATIC,0,50,66,9
 END

Index: LocalDB.cpp
===================================================================
RCS file: /cvsroot/nbftools/CellTrack/LocalDB.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- LocalDB.cpp	25 Oct 2005 20:54:11 -0000	1.12
+++ LocalDB.cpp	25 Oct 2005 21:23:00 -0000	1.13
@@ -153,6 +153,10 @@
 
 					pWork->CellInfo.ulCellID = ulID;						// keep the same ID
 
+					CString strTemp;
+					strTemp.Format(L"Updated cell # %d, new name: '%s'", ulID, pWork->CellInfo.szLocName);
+					g_pLog->Log(LOG_DEBUG, strTemp);
+
 					bRet = true;
 				}
 #ifdef DEBUG

Index: DlgMain.cpp
===================================================================
RCS file: /cvsroot/nbftools/CellTrack/DlgMain.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- DlgMain.cpp	25 Oct 2005 16:53:02 -0000	1.46
+++ DlgMain.cpp	25 Oct 2005 21:23:00 -0000	1.47
@@ -589,7 +589,7 @@
 	SelectObject(hdc, hOldf);
 	DeleteObject(hf);
 	
-	//Look up location group from CellID database in registry
+	//Look up location group from LocalDB
 	if (tInfo.bGroupNameID)
 	{
 		T_GROUPINFO		tGroupInfo;

Index: CellDB.cpp
===================================================================
RCS file: /cvsroot/nbftools/CellTrack/CellDB.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- CellDB.cpp	25 Oct 2005 20:54:10 -0000	1.28
+++ CellDB.cpp	25 Oct 2005 21:23:00 -0000	1.29
@@ -329,6 +329,7 @@
 			if (g_pSettings->GetCellDBOveride())
 			{
 				g_pLog->Log(LOG_DEBUG, L"Overwriting local CellDB entry with remote one");
+				CellInfo.bUserName = true;	//Location Name is known for this Cell
 				g_pLocalDB->AddCellInfo(&CellInfo, true);
 			}