View the DQSD CVS repository here:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/dqsd/
Update of /cvsroot/dqsd/dqsd/src/DQSDSearchWiz
In directory usw-pr-cvs1:/tmp/cvs-serv4777/src/DQSDSearchWiz
Modified Files:
AboutDlg.h ChangeLog.txt DQSDSearchWiz.dsp DQSDSearchWiz.rc
DQSDWizardDlg.cpp DQSDWizardDlg.h resource.h
Added Files:
SearchNameEdit.cpp SearchNameEdit.h
Log Message:
restrict search name edit control to lowercase, filename characters; other misc changes
--- NEW FILE: SearchNameEdit.cpp ---
// SearchNameEdit.cpp: implementation of the CSearchNameEdit class.
//
//////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include "SearchNameEdit.h"
LRESULT CSearchNameEdit::OnChar( UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL&
bHandled)
{
if ( _tcschr( _T(";!@#%^&*()=+ \t~`/\\,<>:'\"[]{}|"), wParam ) )
return 0;
return DefWindowProc();
}
--- NEW FILE: SearchNameEdit.h ---
// SearchNameEdit.h: interface for the CSearchNameEdit class.
//
//////////////////////////////////////////////////////////////////////
#if !defined(AFX_SEARCHNAMEEDIT_H__46BB21E8_4BA4_4713_9DAD_09F6A09C168D__INCLUDED_)
#define AFX_SEARCHNAMEEDIT_H__46BB21E8_4BA4_4713_9DAD_09F6A09C168D__INCLUDED_
#if _MSC_VER > 1000
#pragma once
#endif // _MSC_VER > 1000
class CSearchNameEdit : public CWindowImpl<CSearchNameEdit>
{
public:
BEGIN_MSG_MAP(CSearchNameEdit)
MESSAGE_HANDLER(WM_CHAR, OnChar)
END_MSG_MAP()
CSearchNameEdit() {}
virtual ~CSearchNameEdit() {}
LRESULT OnChar( UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
};
#endif //
!defined(AFX_SEARCHNAMEEDIT_H__46BB21E8_4BA4_4713_9DAD_09F6A09C168D__INCLUDED_)
Index: AboutDlg.h
===================================================================
RCS file: /cvsroot/dqsd/dqsd/src/DQSDSearchWiz/AboutDlg.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AboutDlg.h 7 Aug 2002 18:22:07 -0000 1.3
--- AboutDlg.h 9 Aug 2002 14:07:08 -0000 1.4
***************
*** 37,40 ****
--- 37,41 ----
CenterWindow( GetActiveWindow() );
+ // Get file version
TCHAR szModule[ MAX_PATH + 1 ];
if ( GetModuleFileName( _Module.GetResourceInstance(), szModule,
LENGTHOF(szModule) ) )
***************
*** 46,49 ****
--- 47,69 ----
}
}
+
+ // Get change log history
+ HRSRC hrsc = FindResource( _Module.GetResourceInstance(),
+MAKEINTRESOURCE(IDR_CHANGELOG), _T("TEXT") );
+ if ( hrsc )
+ {
+ HGLOBAL hdata = LoadResource( _Module.GetResourceInstance(),
+hrsc );
+ if ( hdata )
+ {
+ LPCTSTR pszChangeLog = (LPCTSTR)LockResource( hdata );
+ if ( pszChangeLog )
+ {
+ CWindow ctlHistory( GetDlgItem(
+IDC_ChangeHistory ) );
+ ctlHistory.SetWindowText( pszChangeLog );
+ UnlockResource( hdata );
+ }
+ FreeResource( hdata );
+ }
+ }
+
return 1; // Let the system set the focus
Index: ChangeLog.txt
===================================================================
RCS file: /cvsroot/dqsd/dqsd/src/DQSDSearchWiz/ChangeLog.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ChangeLog.txt 8 Aug 2002 21:25:48 -0000 1.2
--- ChangeLog.txt 9 Aug 2002 14:07:09 -0000 1.3
***************
*** 1,7 ****
! Version 0.4 (beta) - 08-Aug-2002
! * Form element names with weird characters ([^_a-zA-Z])
! are now referenced correctly.
! * Escape <,>,& characters in user text and HTML text
Version 0.3 (beta) - 08-Aug-2002
--- 1,8 ----
! Version 0.4 (beta) - 09-Aug-2002
! * Form element names with weird characters ([^_a-zA-Z]) are now referenced correctly.
! * Escape characters < > & in user text and HTML text
! * Restrict search name to lowercase and valid filename characters
! * Minor UI changes - about box, icon, etc.
Version 0.3 (beta) - 08-Aug-2002
Index: DQSDSearchWiz.dsp
===================================================================
RCS file: /cvsroot/dqsd/dqsd/src/DQSDSearchWiz/DQSDSearchWiz.dsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DQSDSearchWiz.dsp 8 Aug 2002 21:25:48 -0000 1.6
--- DQSDSearchWiz.dsp 9 Aug 2002 14:07:09 -0000 1.7
***************
*** 144,147 ****
--- 144,151 ----
# Begin Source File
+ SOURCE=.\SearchNameEdit.cpp
+ # End Source File
+ # Begin Source File
+
SOURCE=.\SearchWizard.cpp
# End Source File
***************
*** 177,180 ****
--- 181,188 ----
# Begin Source File
+ SOURCE=.\SearchNameEdit.h
+ # End Source File
+ # Begin Source File
+
SOURCE=.\SearchWizard.h
# End Source File
***************
*** 189,192 ****
--- 197,204 ----
# Begin Source File
+ SOURCE=.\ChangeLog.txt
+ # End Source File
+ # Begin Source File
+
SOURCE=.\hot.ico
# End Source File
***************
*** 199,207 ****
SOURCE=.\SearchWizard.rgs
# End Source File
- # End Group
# Begin Source File
! SOURCE=.\ChangeLog.txt
# End Source File
# End Target
# End Project
--- 211,219 ----
SOURCE=.\SearchWizard.rgs
# End Source File
# Begin Source File
! SOURCE=.\wizard.ico
# End Source File
+ # End Group
# End Target
# End Project
Index: DQSDSearchWiz.rc
===================================================================
RCS file: /cvsroot/dqsd/dqsd/src/DQSDSearchWiz/DQSDSearchWiz.rc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** DQSDSearchWiz.rc 8 Aug 2002 21:33:21 -0000 1.9
--- DQSDSearchWiz.rc 9 Aug 2002 14:07:09 -0000 1.10
***************
*** 110,113 ****
--- 110,114 ----
IDI_NORMAL ICON DISCARDABLE "normal.ico"
IDI_HOT ICON DISCARDABLE "hot.ico"
+ IDI_WIZARD ICON DISCARDABLE "wizard.ico"
/////////////////////////////////////////////////////////////////////////////
***************
*** 116,156 ****
//
! IDD_DQSDWIZARDDLG DIALOGEX 0, 0, 368, 274
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_CONTEXTHELP
CAPTION "DQSD Search Wizard"
! FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
! RTEXT "* &Name:",IDC_STATIC,6,9,45,8
! EDITTEXT IDC_SearchName,53,6,102,14,ES_AUTOHSCROLL
! RTEXT "* &Title:",IDC_STATIC,6,24,45,8
! EDITTEXT IDC_SearchTitle,53,21,102,14,ES_AUTOHSCROLL
! RTEXT "&Link:",IDC_STATIC,6,38,45,8
! EDITTEXT IDC_Link,53,35,102,14,ES_AUTOHSCROLL
! RTEXT "&Category:",IDC_STATIC,6,52,45,8
! COMBOBOX IDC_Category,53,50,102,127,CBS_DROPDOWN | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
! RTEXT "C&ontributor:",IDC_STATIC,6,66,45,8
! EDITTEXT IDC_Contributor,53,63,102,14,ES_AUTOHSCROLL
! RTEXT "&Email:",IDC_STATIC,6,81,45,8
! EDITTEXT IDC_Email,53,78,102,14,ES_AUTOHSCROLL
! RTEXT "&Description:",IDC_STATIC,158,8,45,8
! EDITTEXT IDC_Description,205,6,102,43,ES_MULTILINE |
ES_WANTRETURN | WS_VSCROLL
! LTEXT "&Switches:",IDC_STATIC,171,51,32,8
! EDITTEXT IDC_Switches,205,50,102,42,ES_MULTILINE | ES_WANTRETURN |
WS_VSCROLL
LTEXT "* &FORMs on current page:",IDC_STATIC,6,97,84,8
CONTROL "List2",IDC_FormList2,"SysListView32",LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER |
! WS_BORDER | WS_TABSTOP,6,107,356,47,WS_EX_CLIENTEDGE
LTEXT "&HTML for selected FORM:",IDC_STATIC,6,156,84,8
! EDITTEXT IDC_FormFields,6,167,356,92,ES_MULTILINE |
ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL
! DEFPUSHBUTTON "OK",1,312,6,50,14
! PUSHBUTTON "Cancel",2,312,22,50,14
! PUSHBUTTON "&About...",IDC_About,312,49,50,14
LTEXT "* = Required",IDC_STATIC,6,260,40,8
! PUSHBUTTON "O&ptions...",IDC_Options,312,66,50,14
END
--- 117,158 ----
//
! IDD_DQSDWIZARDDLG DIALOGEX 0, 0, 380, 274
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_CONTEXTHELP
CAPTION "DQSD Search Wizard"
! FONT 8, "MS Sans Serif"
BEGIN
! RTEXT "* &Name:",IDC_STATIC,32,9,33,8
! EDITTEXT IDC_SearchName,67,6,102,14,ES_LOWERCASE | ES_AUTOHSCROLL
! RTEXT "* &Title:",IDC_STATIC,32,24,33,8
! EDITTEXT IDC_SearchTitle,67,21,102,14,ES_AUTOHSCROLL
! RTEXT "&Link:",IDC_STATIC,20,38,45,8
! EDITTEXT IDC_Link,67,35,102,14,ES_AUTOHSCROLL
! RTEXT "&Category:",IDC_STATIC,20,52,45,8
! COMBOBOX IDC_Category,67,50,102,127,CBS_DROPDOWN | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
! RTEXT "C&ontributor:",IDC_STATIC,20,66,45,8
! EDITTEXT IDC_Contributor,67,63,102,14,ES_AUTOHSCROLL
! RTEXT "&Email:",IDC_STATIC,20,81,45,8
! EDITTEXT IDC_Email,67,78,102,14,ES_AUTOHSCROLL
! RTEXT "&Description:",IDC_STATIC,172,8,45,8
! EDITTEXT IDC_Description,219,6,102,43,ES_MULTILINE |
ES_WANTRETURN | WS_VSCROLL
! LTEXT "&Switches:",IDC_STATIC,185,51,32,8
! EDITTEXT IDC_Switches,219,50,102,42,ES_MULTILINE | ES_WANTRETURN |
WS_VSCROLL
LTEXT "* &FORMs on current page:",IDC_STATIC,6,97,84,8
CONTROL "List2",IDC_FormList2,"SysListView32",LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER |
! WS_BORDER | WS_TABSTOP,6,107,368,47,WS_EX_CLIENTEDGE
LTEXT "&HTML for selected FORM:",IDC_STATIC,6,156,84,8
! EDITTEXT IDC_FormFields,6,167,368,92,ES_MULTILINE |
ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL
! DEFPUSHBUTTON "OK",1,324,6,50,14
! PUSHBUTTON "Cancel",2,324,22,50,14
! PUSHBUTTON "O&ptions...",IDC_Options,324,39,50,14
! PUSHBUTTON "&About...",IDC_About,324,77,50,14
LTEXT "* = Required",IDC_STATIC,6,260,40,8
! ICON IDI_WIZARD,IDC_STATIC,7,4,20,20
END
***************
*** 168,172 ****
END
! IDD_ABOUTDLG DIALOG DISCARDABLE 0, 0, 274, 82
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "About DQSD Search Wizard..."
--- 170,174 ----
END
! IDD_ABOUTDLG DIALOG DISCARDABLE 0, 0, 274, 135
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "About DQSD Search Wizard..."
***************
*** 179,199 ****
38,11,174,8
LTEXT "Copyright (c) 2002 Glenn Carr\nDistributed under the terms of
the\nGNU General Public License, Version 2",
! IDC_STATIC,38,51,171,25
! LTEXT "",IDC_Version,38,23,145,15
! END
!
! IDD_DWMESSAGEBOX DIALOG DISCARDABLE 0, 0, 186, 71
! STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
! CAPTION "<dialog title>"
! FONT 8, "MS Sans Serif"
! BEGIN
! EDITTEXT IDC_Message,6,6,174,36,ES_CENTER | ES_MULTILINE |
! ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
! DEFPUSHBUTTON "OK",IDOK,35,44,50,14,NOT WS_VISIBLE
! PUSHBUTTON "Cancel",IDCANCEL,101,44,50,14,NOT WS_VISIBLE
! PUSHBUTTON "&Yes",IDYES,35,44,50,14,NOT WS_VISIBLE
! PUSHBUTTON "&No",IDNO,101,44,50,14,NOT WS_VISIBLE
! CONTROL "&Don't ask me again",IDC_DontAskAgain,"Button",
! BS_AUTOCHECKBOX | WS_TABSTOP,6,60,174,10
END
--- 181,190 ----
38,11,174,8
LTEXT "Copyright (c) 2002 Glenn Carr\nDistributed under the terms of
the\nGNU General Public License, Version 2",
! IDC_STATIC,38,42,171,25
! LTEXT "<version>",IDC_Version,38,21,145,15
! LTEXT "",IDC_STATIC,91,78,176,1,SS_SUNKEN | NOT WS_GROUP
! LTEXT "Version History",IDC_STATIC,38,74,48,8
! EDITTEXT IDC_ChangeHistory,38,84,230,45,ES_MULTILINE |
! ES_READONLY | WS_VSCROLL | NOT WS_TABSTOP
END
***************
*** 210,214 ****
BEGIN
LEFTMARGIN, 6
! RIGHTMARGIN, 362
TOPMARGIN, 6
BOTTOMMARGIN, 268
--- 201,206 ----
BEGIN
LEFTMARGIN, 6
! RIGHTMARGIN, 374
! VERTGUIDE, 307
TOPMARGIN, 6
BOTTOMMARGIN, 268
***************
*** 229,242 ****
LEFTMARGIN, 6
RIGHTMARGIN, 268
TOPMARGIN, 5
! BOTTOMMARGIN, 76
! END
!
! IDD_DWMESSAGEBOX, DIALOG
! BEGIN
! LEFTMARGIN, 6
! RIGHTMARGIN, 180
! TOPMARGIN, 6
! BOTTOMMARGIN, 69
END
END
--- 221,227 ----
LEFTMARGIN, 6
RIGHTMARGIN, 268
+ VERTGUIDE, 38
TOPMARGIN, 5
! BOTTOMMARGIN, 129
END
END
***************
*** 277,280 ****
--- 262,272 ----
END
+
+ /////////////////////////////////////////////////////////////////////////////
+ //
+ // TEXT
+ //
+
+ IDR_CHANGELOG TEXT DISCARDABLE "ChangeLog.txt"
/////////////////////////////////////////////////////////////////////////////
Index: DQSDWizardDlg.cpp
===================================================================
RCS file: /cvsroot/dqsd/dqsd/src/DQSDSearchWiz/DQSDWizardDlg.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** DQSDWizardDlg.cpp 8 Aug 2002 21:25:48 -0000 1.15
--- DQSDWizardDlg.cpp 9 Aug 2002 14:07:09 -0000 1.16
***************
*** 43,46 ****
--- 43,48 ----
CenterWindow( GetActiveWindow() ); // ??? should probably use the actual
browser window
+ m_editSearchName.SubclassWindow( GetDlgItem( IDC_SearchName ) );
+
TCHAR szModule[ MAX_PATH + 1 ];
if ( GetModuleFileName( _Module.GetResourceInstance(), szModule,
LENGTHOF(szModule) ) )
Index: DQSDWizardDlg.h
===================================================================
RCS file: /cvsroot/dqsd/dqsd/src/DQSDSearchWiz/DQSDWizardDlg.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** DQSDWizardDlg.h 8 Aug 2002 21:25:48 -0000 1.9
--- DQSDWizardDlg.h 9 Aug 2002 14:07:09 -0000 1.10
***************
*** 4,7 ****
--- 4,9 ----
#define __DQSDWIZARDDLG_H_
+ #include "SearchNameEdit.h"
+
#include "resource.h" // main symbols
***************
*** 68,71 ****
--- 70,75 ----
void SaveFields();
void RestoreFields();
+
+ CSearchNameEdit m_editSearchName;
};
Index: resource.h
===================================================================
RCS file: /cvsroot/dqsd/dqsd/src/DQSDSearchWiz/resource.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** resource.h 8 Aug 2002 07:37:35 -0000 1.4
--- resource.h 9 Aug 2002 14:07:09 -0000 1.5
***************
*** 15,19 ****
--- 15,21 ----
#define IDC_SearchTitle 203
#define IDC_Switches 204
+ #define IDI_WIZARD 204
#define IDC_Contributor 205
+ #define IDR_CHANGELOG 205
#define IDC_Description 206
#define IDC_Category 207
***************
*** 30,33 ****
--- 32,36 ----
#define IDC_Message 223
#define IDC_IncludeComments 224
+ #define IDC_ChangeHistory 228
// Next default values for new objects
***************
*** 35,41 ****
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
! #define _APS_NEXT_RESOURCE_VALUE 204
#define _APS_NEXT_COMMAND_VALUE 32768
! #define _APS_NEXT_CONTROL_VALUE 227
#define _APS_NEXT_SYMED_VALUE 106
#endif
--- 38,44 ----
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
! #define _APS_NEXT_RESOURCE_VALUE 206
#define _APS_NEXT_COMMAND_VALUE 32768
! #define _APS_NEXT_CONTROL_VALUE 229
#define _APS_NEXT_SYMED_VALUE 106
#endif
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
DQSD-CVS mailing list
https://lists.sourceforge.net/lists/listinfo/dqsd-cvs
DQSD CVS repository:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/dqsd/
