From: Robert K. <may...@us...> - 2001-07-12 00:50:38
|
Update of /cvsroot/bitcollider/supercollider In directory usw-pr-cvs1:/tmp/cvs-serv5330 Modified Files: analyzer.cpp filecache.cpp filecache.h localhtml.cpp localhtml.h main.cpp main.h reminderdialog.cpp reminderdialog.dfm supercollider.bpr supercollider.cpp Log Message: Added a delete option so that users can delete files from the pending list. Index: analyzer.cpp =================================================================== RCS file: /cvsroot/bitcollider/supercollider/analyzer.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** analyzer.cpp 2001/07/11 19:07:00 1.1 --- analyzer.cpp 2001/07/12 00:50:35 1.2 *************** *** 120,123 **** --- 120,124 ---- fileCache->setAttributes(index, list); fileCache->setStatus(index, eAnalyzed); + fileCache->setTimestamp(index, GetTickCount()); parent->setStatus(" "); *************** *** 137,141 **** bitcollider_shutdown(bc); } - Debug_v("Analyzer exit."); } --- 138,141 ---- Index: filecache.cpp =================================================================== RCS file: /cvsroot/bitcollider/supercollider/filecache.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** filecache.cpp 2001/07/11 19:07:00 1.1 --- filecache.cpp 2001/07/12 00:50:35 1.2 *************** *** 86,89 **** --- 86,90 ---- entry->status = eNew; entry->attrs = NULL; + entry->timestamp = 0; mutex->Acquire(); *************** *** 126,129 **** --- 127,170 ---- } + DWORD FileCache::getTimestamp(int index) + { + DWORD timestamp = 0; + + mutex->Acquire(); + if (index >= 0 && index < cache->Count) + { + timestamp = ((CacheEntry *)cache->Items[index])->timestamp; + } + mutex->Release(); + + return timestamp; + } + + void FileCache::setTimestamp(int index, DWORD timestamp) + { + mutex->Acquire(); + if (index >= 0 && index < cache->Count) + { + ((CacheEntry *)cache->Items[index])->timestamp = timestamp; + } + mutex->Release(); + } + + int FileCache::getIndexFromTimestamp(DWORD timestamp) + { + int index = -1; + + mutex->Acquire(); + for(int i = cache->Count - 1; i >= 0; i--) + if (((CacheEntry *)cache->Items[i])->timestamp == timestamp) + { + index = i; + break; + } + mutex->Release(); + + return index; + } + void FileCache::getFileName(int index, AnsiString &fileName) { *************** *** 175,179 **** // TODO: Delete attrs cache->Delete(i); ! } } mutex->Release(); --- 216,220 ---- // TODO: Delete attrs cache->Delete(i); ! } } mutex->Release(); Index: filecache.h =================================================================== RCS file: /cvsroot/bitcollider/supercollider/filecache.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** filecache.h 2001/07/11 19:07:00 1.1 --- filecache.h 2001/07/12 00:50:35 1.2 *************** *** 25,28 **** --- 25,29 ---- CacheEntryStatus status; TList *attrs; + DWORD timestamp; }; *************** *** 44,48 **** CacheEntryStatus getStatus(int index); ! void getFileName(int index, AnsiString &fileName); void setAttributes(int index, TList *list); --- 45,53 ---- CacheEntryStatus getStatus(int index); ! void getFileName(int index, AnsiString &fileName); ! ! DWORD getTimestamp(int index); ! void setTimestamp(int index, DWORD timestamp); ! int getIndexFromTimestamp(DWORD timestamp); void setAttributes(int index, TList *list); Index: localhtml.cpp =================================================================== RCS file: /cvsroot/bitcollider/supercollider/localhtml.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** localhtml.cpp 2001/07/11 19:07:00 1.1 --- localhtml.cpp 2001/07/12 00:50:35 1.2 *************** *** 58,61 **** --- 58,64 ---- GenerateSubmissionPage(fileCache, html); OutputFile("submit.html", html, fileURL); + + GenerateDeletePage(fileCache, html, "", ""); + OutputFile("delete.html", html, fileURL); } *************** *** 73,77 **** return false; ! ret = fwrite(html.c_str(), html.Length(), 1, out) == (int)html.Length(); fclose(out); --- 76,80 ---- return false; ! ret = fwrite(html.c_str(), 1, html.Length(), out) == (unsigned)html.Length(); fclose(out); *************** *** 101,110 **** else { ! char file[MAX_PATH], ext[MAX_PATH]; numTotal = fileCache->getNumItems(); html.Add("<table width=\"100%%\">"); ! html.Add("<tr><td colspan=\"2\" align=\"center\"><h3>"); if (numItems != 1) html.Add("There are "); --- 104,113 ---- else { ! char file[MAX_PATH], ext[MAX_PATH], timestampText[12]; numTotal = fileCache->getNumItems(); html.Add("<table width=\"100%%\">"); ! html.Add("<tr><td colspan=\"3\" align=\"center\"><h3>"); if (numItems != 1) html.Add("There are "); *************** *** 125,128 **** --- 128,132 ---- { fileCache->getFileName(i, fileName); + sprintf(timestampText, "%08X", fileCache->getTimestamp(i)); fnsplit(fileName.c_str(), NULL, NULL, file, ext); html.Add("<tr><td width=\"80%%\">"); *************** *** 130,137 **** if (fileName[2] == ':') fileName[2] = '|'; ! html.Add("</td><td width=\10%%\"><a href=\"file://"); html.Add(fileName); html.Add("\" target=\"_blank\">Review</a></td>"); ! html.Add("<td width=\"10%%\">Rate</td></tr>"); } } --- 134,145 ---- if (fileName[2] == ':') fileName[2] = '|'; ! html.Add("</td><td valign=\"top\" width=\10%%\"><a href=\"file://"); html.Add(fileName); html.Add("\" target=\"_blank\">Review</a></td>"); ! html.Add("<td width=\"10%%\" valign=\"top\">"); ! html.Add("<a href=\"delete-"); ! html.Add(timestampText); ! html.Add(".html\">Delete</a></td>"); ! html.Add("<td valign=\"top\" width=\"10%%\">Rate</td></tr>"); } } *************** *** 224,225 **** --- 232,251 ---- } + void __fastcall LocalHTML::GenerateDeletePage(FileCache *fileCache, + AnsiString &htmlArg, + const AnsiString &fileName, + const AnsiString &ident) + { + HTMLOutput html("Delete file", false); + + if (fileName.Length() > 0) + { + html.Add("<p><center>Are you sure you want to delete file<br><b>"); + html.Add(fileName); + html.Add("</b><br><a href=\"remove-" + ident + ".html\">Yes</a>"); + html.Add(" <a href=\"pending.html\">No</a>"); + html.Add("</center>"); + } + + html.Output(htmlArg); + } Index: localhtml.h =================================================================== RCS file: /cvsroot/bitcollider/supercollider/localhtml.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** localhtml.h 2001/07/11 19:07:00 1.1 --- localhtml.h 2001/07/12 00:50:35 1.2 *************** *** 19,28 **** void __fastcall GenerateSubmissionPage(FileCache *fileCache, AnsiString &htmlArg); ! ! private: ! bool __fastcall OutputFile(const AnsiString &fileName, AnsiString &html, AnsiString &fileURL); AnsiString cacheDir; --- 19,32 ---- void __fastcall GenerateSubmissionPage(FileCache *fileCache, AnsiString &htmlArg); ! void __fastcall GenerateDeletePage(FileCache *fileCache, ! AnsiString &htmlArg, ! const AnsiString &fileName, ! const AnsiString &ident); bool __fastcall OutputFile(const AnsiString &fileName, AnsiString &html, AnsiString &fileURL); + + private: + AnsiString cacheDir; Index: main.cpp =================================================================== RCS file: /cvsroot/bitcollider/supercollider/main.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** main.cpp 2001/07/11 19:07:00 1.1 --- main.cpp 2001/07/12 00:50:35 1.2 *************** *** 39,42 **** --- 39,43 ---- submitUrl = "http://bitzi.com/lookup/"; reminderForm = NULL; + onPendingPage = true; if (prefs->getPrefs().folderList->Count > 0) *************** *** 227,252 **** reminderForm->SetNumItemsPending(numPending); ! if (pendingUrl.Length() > 0 && ! currentUrl.Length() > 0 && ! currentUrl != pendingUrl) { ! if (fileCache->getNumReadyItems() > 0) ! { ! int newTop, bottom, newHeight; ! ! bottom = bitziWebBrowser->Top + bitziWebBrowser->Height; ! newTop = alertImage->Top + alertImage->Height + 3; ! newHeight = bottom - newTop; ! if (bitziWebBrowser->Top != newTop) ! { ! bitziWebBrowser->Height = newHeight; ! bitziWebBrowser->Top = newTop; ! } ! } ! pendingButton->Enabled = fileCache->getNumReadyItems() > 0; } ! else { if (bitziWebBrowser->Top != alertImage->Top) { --- 228,248 ---- reminderForm->SetNumItemsPending(numPending); ! if (!onPendingPage && fileCache->getNumReadyItems() > 0) { + int newTop, bottom, newHeight; ! // Move the browser window down to uncover the alert image ! bottom = bitziWebBrowser->Top + bitziWebBrowser->Height; ! newTop = alertImage->Top + alertImage->Height + 3; ! newHeight = bottom - newTop; ! if (bitziWebBrowser->Top != newTop) ! { ! bitziWebBrowser->Height = newHeight; ! bitziWebBrowser->Top = newTop; ! } } ! if (onPendingPage || (!onPendingPage && fileCache->getNumReadyItems() == 0)) { + // Move the browser window over the alert image if (bitziWebBrowser->Top != alertImage->Top) { *************** *** 258,261 **** --- 254,258 ---- } } + pendingButton->Enabled = fileCache->getNumReadyItems() > 0; } *************** *** 287,298 **** void __fastcall TSuperColliderForm::wake(void) { - if (pendingUrl.Length() > 0 && - currentUrl.Length() > 0 && - currentUrl != pendingUrl) - { - EnableButtons(); - return; - } - UpdatePendingDisplay(); --- 284,287 ---- *************** *** 310,316 **** local.OutputLocalPages(fileCache, fileURL); ! URL = fileURL; ! bitziWebBrowser->Navigate(BSTR(URL)); ! pendingUrl = fileURL; EnableButtons(); } --- 299,307 ---- local.OutputLocalPages(fileCache, fileURL); ! if (onPendingPage) ! { ! URL = fileURL; ! bitziWebBrowser->Navigate(BSTR(URL)); ! } EnableButtons(); } *************** *** 447,461 **** TOLEBOOL *Cancel) { ! AnsiString url = *URL; bitziWebBrowser->Cursor = crHourGlass; // If this is a local document, don't tell the user about it. if (url[2] == ':') { - currentUrl = ""; return; } - currentUrl = url; setStatus("Loading " + *URL); spinTimer->Enabled = true; --- 438,496 ---- TOLEBOOL *Cancel) { ! AnsiString url = *URL; ! char *ptr; ! ! ptr = strrchr(url.c_str(), '\\'); ! if (ptr) ! { ! char command[20]; ! DWORD timestamp; ! ! ptr++; ! if (sscanf(ptr, "%[^-]-%8X.html", command, ×tamp) == 2) ! { ! LocalHTML local; ! AnsiString html; ! int index; ! ! index = fileCache->getIndexFromTimestamp(timestamp); ! if (index >= 0) ! { ! AnsiString fileName, newUrl; ! char ident[100]; ! ! if (strcmp(command, "delete") == 0) ! { ! sprintf(ident, "%08X", timestamp); ! fileCache->getFileName(index, fileName); ! local.GenerateDeletePage(fileCache, html, fileName, ident); ! if (local.OutputFile("confirm.html", html, newUrl)) ! { ! PostMessage(Handle, WM_NAVIGATE, 0, (LPARAM)strdup(newUrl.c_str())); ! *Cancel = true; ! return; ! } ! } ! if (strcmp(command, "remove") == 0) ! { ! fileCache->getFileName(index, fileName); ! fileCache->remove(index); ! unlink(fileName.c_str()); ! PostMessage(Handle, WM_NAVIGATE, 0, 0); ! *Cancel = true; ! return; ! } ! } ! } ! } bitziWebBrowser->Cursor = crHourGlass; + onPendingPage = strcmp(url.c_str() + url.Length() - 12, "pending.html") == 0; // If this is a local document, don't tell the user about it. if (url[2] == ':') { return; } setStatus("Loading " + *URL); spinTimer->Enabled = true; *************** *** 485,489 **** if (url[2] == ':') { ! currentUrl = ""; return; } --- 520,524 ---- if (url[2] == ':') { ! EnableButtons(); return; } *************** *** 491,495 **** setStatus("Document Loaded."); } - currentUrl = url; } --- 526,529 ---- *************** *** 498,502 **** void __fastcall TSuperColliderForm::pendingButtonClick(TObject *Sender) { ! currentUrl = ""; UpdatePendingDisplay(); EnableButtons(); --- 532,536 ---- void __fastcall TSuperColliderForm::pendingButtonClick(TObject *Sender) { ! onPendingPage = true; UpdatePendingDisplay(); EnableButtons(); *************** *** 683,685 **** --- 717,737 ---- } + //--------------------------------------------------------------------------- + + void __fastcall TSuperColliderForm::navigateMessage(TMessage &Message) + { + char *url = (char *)Message.LParam; + WideString URL; + + if (url == NULL) + { + onPendingPage = true; + UpdatePendingDisplay(); + return; + } + + URL = url; + bitziWebBrowser->Navigate(BSTR(URL)); + free(url); + } Index: main.h =================================================================== RCS file: /cvsroot/bitcollider/supercollider/main.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** main.h 2001/07/11 19:07:00 1.1 --- main.h 2001/07/12 00:50:35 1.2 *************** *** 28,31 **** --- 28,32 ---- #define WM_REMINDERCLICKED (WM_USER + 2) #define WM_SHOWMAINWINDOW (WM_USER + 3) + #define WM_NAVIGATE (WM_USER + 4) //--------------------------------------------------------------------------- *************** *** 86,89 **** --- 87,91 ---- void __fastcall showMainWindow(void); void __fastcall showMainWindowMessage(TMessage &Message); + void __fastcall navigateMessage(TMessage &Message); private: *************** *** 115,119 **** Preferences *prefs; Graphics::TBitmap *spinBitmaps[8]; ! bool reminderVisible; TReminderForm *reminderForm; --- 117,121 ---- Preferences *prefs; Graphics::TBitmap *spinBitmaps[8]; ! bool onPendingPage; TReminderForm *reminderForm; *************** *** 125,128 **** --- 127,131 ---- MESSAGE_HANDLER(WM_REMINDERCLICKED, TMessage, reminderClicked); MESSAGE_HANDLER(WM_SHOWMAINWINDOW, TMessage, showMainWindowMessage); + MESSAGE_HANDLER(WM_NAVIGATE, TMessage, navigateMessage); END_MESSAGE_MAP(TForm) __fastcall TSuperColliderForm(TComponent* Owner); *************** *** 135,139 **** void __fastcall updateProgress(int percent); void __fastcall endProgress(void); - }; //--------------------------------------------------------------------------- --- 138,141 ---- Index: reminderdialog.cpp =================================================================== RCS file: /cvsroot/bitcollider/supercollider/reminderdialog.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** reminderdialog.cpp 2001/07/11 19:07:00 1.1 --- reminderdialog.cpp 2001/07/12 00:50:35 1.2 *************** *** 87,91 **** if (!Visible) { ! if (timerCount < prefs->getPrefs().reminderInterval) return; --- 87,91 ---- if (!Visible) { ! if (timerCount < prefs->getPrefs().reminderInterval * 60) return; Index: reminderdialog.dfm =================================================================== RCS file: /cvsroot/bitcollider/supercollider/reminderdialog.dfm,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** reminderdialog.dfm 2001/07/11 19:07:00 1.1 --- reminderdialog.dfm 2001/07/12 00:50:35 1.2 *************** *** 88,92 **** object reminderTimer: TTimer Enabled = False - Interval = 60000 OnTimer = reminderTimerTimer Left = 22 --- 88,91 ---- Index: supercollider.bpr =================================================================== RCS file: /cvsroot/bitcollider/supercollider/supercollider.bpr,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** supercollider.bpr 2001/07/11 19:03:35 1.1 --- supercollider.bpr 2001/07/12 00:50:35 1.2 *************** *** 8,12 **** watcher.obj debug.obj htmoutput.obj localhtml.obj preferences.obj optionsdialog.obj reminderdialog.obj"/> ! <RESFILES value="supercollider.res bitmaps.res"/> <IDLFILES value=""/> <IDLGENFILES value=""/> --- 8,12 ---- watcher.obj debug.obj htmoutput.obj localhtml.obj preferences.obj optionsdialog.obj reminderdialog.obj"/> ! <RESFILES value="supercollider.res rc\resources.res"/> <IDLFILES value=""/> <IDLGENFILES value=""/> *************** *** 19,42 **** <PATHCPP value=".;"/> <PATHPAS value=".;"/> ! <PATHRC value=".;"/> <PATHASM value=".;"/> <DEBUGLIBPATH value="$(BCB)\lib\debug"/> <RELEASELIBPATH value="$(BCB)\lib\release"/> <LINKER value="tlink32"/> ! <USERDEFINES value="NO_WIN32_LEAN_AND_MEAN;_DEBUG"/> <SYSDEFINES value="NO_STRICT;USEPACKAGES"/> <MAINSOURCE value="supercollider.cpp"/> ! <INCLUDEPATH value="D:\freeamp\freeamp\ui\freeamp\win32\include\;"C:\Program Files\Borland\CBuilder5\Bin\";$(BCB)\include;$(BCB)\include\vcl;..\bitcollider\include"/> ! <LIBPATH value="D:\freeamp\freeamp\ui\freeamp\win32\include\;"C:\Program Files\Borland\CBuilder5\Bin\";$(BCB)\lib\obj;$(BCB)\lib"/> <WARNINGS value="-w-par"/> </MACROS> <OPTIONS> <IDLCFLAGS value="-I$(BCB)\include -I$(BCB)\include\vcl -src_suffix cpp -boa"/> ! <CFLAG1 value="-Od -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -c ! -tW -tWM"/> ! <PFLAGS value="-$Y+ -$W -$O- -v -JPHNE -M"/> <RFLAGS value=""/> ! <AFLAGS value="/mx /w2 /zi"/> ! <LFLAGS value="-D"" -aa -Tpe -x -Gn -v"/> </OPTIONS> <LINKER> --- 19,41 ---- <PATHCPP value=".;"/> <PATHPAS value=".;"/> ! <PATHRC value=".;rc"/> <PATHASM value=".;"/> <DEBUGLIBPATH value="$(BCB)\lib\debug"/> <RELEASELIBPATH value="$(BCB)\lib\release"/> <LINKER value="tlink32"/> ! <USERDEFINES value="NO_WIN32_LEAN_AND_MEAN"/> <SYSDEFINES value="NO_STRICT;USEPACKAGES"/> <MAINSOURCE value="supercollider.cpp"/> ! <INCLUDEPATH value="rc;D:\freeamp\freeamp\ui\freeamp\win32\include\;"C:\Program Files\Borland\CBuilder5\Bin\";$(BCB)\include;$(BCB)\include\vcl;..\bitcollider\include"/> ! <LIBPATH value="rc;D:\freeamp\freeamp\ui\freeamp\win32\include\;"C:\Program Files\Borland\CBuilder5\Bin\";$(BCB)\lib\obj;$(BCB)\lib"/> <WARNINGS value="-w-par"/> </MACROS> <OPTIONS> <IDLCFLAGS value="-I$(BCB)\include -I$(BCB)\include\vcl -src_suffix cpp -boa"/> ! <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -b- -k- -vi -c -tW -tWM"/> ! <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/> <RFLAGS value=""/> ! <AFLAGS value="/mx /w2 /zn"/> ! <LFLAGS value="-D"" -aa -Tpe -x -Gn"/> </OPTIONS> <LINKER> *************** *** 74,93 **** [HistoryLists\hlIncludePath] ! Count=7 ! Item0=D:\freeamp\freeamp\ui\freeamp\win32\include\;C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl;..\bitcollider\include ! Item1=D:\freeamp\freeamp\ui\freeamp\win32\include;C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl;..\bitcollider\include ! Item2=C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl;..\bitcollider\include ! Item3=C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl;D:\bitzi\bitcollider\include ! Item4=C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl ! Item5=C:\Program Files\Borland\CBuilder5\Bin;$(BCB)\include;$(BCB)\include\vcl ! Item6=$(BCB)\include;$(BCB)\include\vcl [HistoryLists\hlLibraryPath] ! Count=5 ! Item0=D:\freeamp\freeamp\ui\freeamp\win32\include\;C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\lib\obj;$(BCB)\lib ! Item1=D:\freeamp\freeamp\ui\freeamp\win32\include;C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\lib\obj;$(BCB)\lib ! Item2=C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\lib\obj;$(BCB)\lib ! Item3=C:\Program Files\Borland\CBuilder5\Bin;$(BCB)\lib\obj;$(BCB)\lib ! Item4=$(BCB)\lib\obj;$(BCB)\lib [HistoryLists\hlDebugSourcePath] --- 73,96 ---- [HistoryLists\hlIncludePath] ! Count=9 ! Item0=rc;D:\freeamp\freeamp\ui\freeamp\win32\include\;C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl;..\bitcollider\include ! Item1=rc\;D:\freeamp\freeamp\ui\freeamp\win32\include\;C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl;..\bitcollider\include ! Item2=D:\freeamp\freeamp\ui\freeamp\win32\include\;C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl;..\bitcollider\include ! Item3=D:\freeamp\freeamp\ui\freeamp\win32\include;C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl;..\bitcollider\include ! Item4=C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl;..\bitcollider\include ! Item5=C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl;D:\bitzi\bitcollider\include ! Item6=C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\include;$(BCB)\include\vcl ! Item7=C:\Program Files\Borland\CBuilder5\Bin;$(BCB)\include;$(BCB)\include\vcl ! Item8=$(BCB)\include;$(BCB)\include\vcl [HistoryLists\hlLibraryPath] ! Count=7 ! Item0=rc;D:\freeamp\freeamp\ui\freeamp\win32\include\;C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\lib\obj;$(BCB)\lib ! Item1=rc\;D:\freeamp\freeamp\ui\freeamp\win32\include\;C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\lib\obj;$(BCB)\lib ! Item2=D:\freeamp\freeamp\ui\freeamp\win32\include\;C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\lib\obj;$(BCB)\lib ! Item3=D:\freeamp\freeamp\ui\freeamp\win32\include;C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\lib\obj;$(BCB)\lib ! Item4=C:\Program Files\Borland\CBuilder5\Bin\;$(BCB)\lib\obj;$(BCB)\lib ! Item5=C:\Program Files\Borland\CBuilder5\Bin;$(BCB)\lib\obj;$(BCB)\lib ! Item6=$(BCB)\lib\obj;$(BCB)\lib [HistoryLists\hlDebugSourcePath] *************** *** 97,102 **** [HistoryLists\hlConditionals] Count=4 ! Item0=NO_WIN32_LEAN_AND_MEAN;_DEBUG ! Item1=NO_WIN32_LEAN_AND_MEAN Item2=_DEBUG;NO_WIN32_LEAN_AND_MEAN Item3=_DEBUG --- 100,105 ---- [HistoryLists\hlConditionals] Count=4 ! Item0=NO_WIN32_LEAN_AND_MEAN ! Item1=NO_WIN32_LEAN_AND_MEAN;_DEBUG Item2=_DEBUG;NO_WIN32_LEAN_AND_MEAN Item3=_DEBUG Index: supercollider.cpp =================================================================== RCS file: /cvsroot/bitcollider/supercollider/supercollider.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** supercollider.cpp 2001/07/11 19:07:00 1.1 --- supercollider.cpp 2001/07/12 00:50:35 1.2 *************** *** 15,20 **** USEUNIT("preferences.cpp"); USEFORM("optionsdialog.cpp", PreferencesForm); - USERC("bitmaps.rc"); USEFORM("reminderdialog.cpp", ReminderForm); //--------------------------------------------------------------------------- WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int) --- 15,20 ---- USEUNIT("preferences.cpp"); USEFORM("optionsdialog.cpp", PreferencesForm); USEFORM("reminderdialog.cpp", ReminderForm); + USERC("rc\resources.rc"); //--------------------------------------------------------------------------- WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int) *************** *** 26,30 **** Application->Title = "SuperCollider"; Application->CreateForm(__classid(TSuperColliderForm), &SuperColliderForm); ! Application->Run(); } catch (Exception &exception) --- 26,30 ---- Application->Title = "SuperCollider"; Application->CreateForm(__classid(TSuperColliderForm), &SuperColliderForm); ! Application->Run(); } catch (Exception &exception) |