View the DQSD CVS repository here:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/dqsd/
Update of /cvsroot/dqsd/dqsd/src/DQSDSearchWiz
In directory sc8-pr-cvs1:/tmp/cvs-serv642/src/DQSDSearchWiz
Modified Files:
ChangeLog.txt DQSDSearchWiz.rc DQSDWizardDlg.cpp
DQSDWizardDlg.h
Log Message:
1.1 final release; added ability to specify subcategories
Index: ChangeLog.txt
===================================================================
RCS file: /cvsroot/dqsd/dqsd/src/DQSDSearchWiz/ChangeLog.txt,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** ChangeLog.txt 27 Nov 2002 05:35:45 -0000 1.24
--- ChangeLog.txt 20 Jan 2003 02:06:37 -0000 1.25
***************
*** 1,2 ****
--- 1,6 ----
+ Version 1.1 (final) 19-Jan-2003
+
+ * Added ability to specify subcategories
+
Version 1.0.1 (final) 26-Nov-2002
Index: DQSDSearchWiz.rc
===================================================================
RCS file: /cvsroot/dqsd/dqsd/src/DQSDSearchWiz/DQSDSearchWiz.rc,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** DQSDSearchWiz.rc 27 Nov 2002 05:35:45 -0000 1.27
--- DQSDSearchWiz.rc 20 Jan 2003 02:06:37 -0000 1.28
***************
*** 55,60 ****
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 0,1,0,1
! PRODUCTVERSION 0,1,0,1
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
--- 55,60 ----
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 0,1,1,0
! PRODUCTVERSION 0,1,1,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
***************
*** 74,78 ****
VALUE "CompanyName", "http://www.glenncarr.com/\0";
VALUE "FileDescription", "Dave's Quick Search Deskbar Search Wizard\0"
! VALUE "FileVersion", "1.0.1\0"
VALUE "InternalName", "DQSDSearchWiz\0"
VALUE "LegalCopyright", "Copyright (c) 2002 Glenn Carr; Distributed
under the terms of the GNU General Public License, Version 2\0"
--- 74,78 ----
VALUE "CompanyName", "http://www.glenncarr.com/\0";
VALUE "FileDescription", "Dave's Quick Search Deskbar Search Wizard\0"
! VALUE "FileVersion", "1.1\0"
VALUE "InternalName", "DQSDSearchWiz\0"
VALUE "LegalCopyright", "Copyright (c) 2002 Glenn Carr; Distributed
under the terms of the GNU General Public License, Version 2\0"
***************
*** 81,85 ****
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Dave's Quick Search Deskbar Search Wizard\0"
! VALUE "ProductVersion", "1.0.1\0"
VALUE "SpecialBuild", "\0"
END
--- 81,85 ----
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Dave's Quick Search Deskbar Search Wizard\0"
! VALUE "ProductVersion", "1.1\0"
VALUE "SpecialBuild", "\0"
END
***************
*** 119,123 ****
IDD_DQSDWIZARDDLG DIALOGEX 0, 0, 394, 271
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
! FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
RTEXT "* &Abbreviation:",IDC_STATIC,29,9,49,8
--- 119,123 ----
IDD_DQSDWIZARDDLG DIALOGEX 0, 0, 394, 271
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
! FONT 8, "MS Sans Serif"
BEGIN
RTEXT "* &Abbreviation:",IDC_STATIC,29,9,49,8
***************
*** 160,164 ****
EDITTEXT IDC_FormFields,6,192,382,75,ES_MULTILINE |
ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL
! ICON IDI_WIZARD,IDC_STATIC,6,5,21,20
LTEXT "* = Required",IDC_STATIC,6,183,40,8
END
--- 160,164 ----
EDITTEXT IDC_FormFields,6,192,382,75,ES_MULTILINE |
ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL
! ICON IDI_WIZARD,IDC_STATIC,6,5,20,20
LTEXT "* = Required",IDC_STATIC,6,183,40,8
END
***************
*** 273,277 ****
1002 "Enter the title or name of the search. This is what
will be displayed in the menu."
1003 "Enter the URL that this search should default to if no
parameters are entered for the search. The wizard will try to guess this based on the
current URL, but it may not be the best default, so you should double-check it."
! 1004 "Enter the category for this search. You can select one
from the list or enter a unique category. If you don't enter a category the search
will be grouped in the ""Other"" category in the menu and the help."
1005 "If you want to receive lavish quantities of praise for
writing this search enter your name here. Or, if you feel you are not deserving of
such praise because the most excellent DQSD Search Wizard did most of the work for
you, then enter my name, Glenn Carr <just kidding>."
1006 "If you want to be able to be contacted about this
search enter your email address here. Please note that if this search ends up being
distributed with DQSD, your email will be out there for everyone to see, which isn't
necessarily bad, but I like to enter my email in the form 'glenn at glenncarr dot com'
just to keep bot email harvesters from finding it."
--- 273,277 ----
1002 "Enter the title or name of the search. This is what
will be displayed in the menu."
1003 "Enter the URL that this search should default to if no
parameters are entered for the search. The wizard will try to guess this based on the
current URL, but it may not be the best default, so you should double-check it."
! 1004 "Enter the category for this search. You can select one
from the list or enter a unique category. If you don't enter a category the search
will be grouped in the ""Other"" category in the menu and the help. Use forward
slashes (/) to specify subcategories. I.e., ""Computers/Programming""."
1005 "If you want to receive lavish quantities of praise for
writing this search enter your name here. Or, if you feel you are not deserving of
such praise because the most excellent DQSD Search Wizard did most of the work for
you, then enter my name, Glenn Carr <just kidding>."
1006 "If you want to be able to be contacted about this
search enter your email address here. Please note that if this search ends up being
distributed with DQSD, your email will be out there for everyone to see, which isn't
necessarily bad, but I like to enter my email in the form 'glenn at glenncarr dot com'
just to keep bot email harvesters from finding it."
Index: DQSDWizardDlg.cpp
===================================================================
RCS file: /cvsroot/dqsd/dqsd/src/DQSDSearchWiz/DQSDWizardDlg.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** DQSDWizardDlg.cpp 27 Nov 2002 05:35:45 -0000 1.38
--- DQSDWizardDlg.cpp 20 Jan 2003 02:06:37 -0000 1.39
***************
*** 133,137 ****
if ( moduleVersion.GetFileVersionInfo( szModule ) )
{
! m_strVersion = moduleVersion.GetValue(
_T("ProductVersion") ) + _T(" ") + moduleVersion.GetValue( _T("SpecialBuild") );
SetWindowText( ( _T("DQSD Search Wizard - Version ") +
m_strVersion ).c_str() );
--- 133,139 ----
if ( moduleVersion.GetFileVersionInfo( szModule ) )
{
! m_strVersion = moduleVersion.GetValue(
_T("ProductVersion") );
! if ( moduleVersion.GetValue( _T("SpecialBuild")
).size() > 0 )
! m_strVersion += _T(" ") +
moduleVersion.GetValue( _T("SpecialBuild") );
SetWindowText( ( _T("DQSD Search Wizard - Version ") +
m_strVersion ).c_str() );
***************
*** 186,192 ****
--- 188,200 ----
// Set up the combobox
+ // ??? It would be really cool to actually base these on the current
+ // ??? search categories/subcategories
LPCTSTR rgszCategories[] = {
_T("Computers"),
+ _T("Computers/Networking"),
+ _T("Computers/Programming"),
+ _T("Computers/Reference"),
+ _T("Computers/Software"),
_T("Entertainment"),
_T("Finance"),
***************
*** 196,199 ****
--- 204,209 ----
_T("People and Places"),
_T("Reference"),
+ _T("Reference/General"),
+ _T("Reference/Language"),
_T("Search the Web"),
_T("Shipping"),
***************
*** 433,437 ****
CWindow( GetDlgItem( IDC_Category ) ).GetWindowText( &bstr );
! strSearchFile += _T("\r\n <category>") + EscapeXML( string( W2T( bstr
) ) ) + _T("</category>");
::SysFreeString( bstr );
--- 443,447 ----
CWindow( GetDlgItem( IDC_Category ) ).GetWindowText( &bstr );
! strSearchFile += _T("\r\n <category>") + ParseCategory( W2T( bstr ) )
+ _T("</category>");
::SysFreeString( bstr );
***************
*** 1227,1229 ****
--- 1237,1260 ----
return 0;
+ }
+
+ string CDQSDWizardDlg::ParseCategory( LPCTSTR sz )
+ {
+ string XMLCategory( _T("") );
+ LPTSTR szRawCategories = (LPTSTR)_alloca( _tcslen(sz) * sizeof(TCHAR) + 2 );
+ _tcscpy( szRawCategories, sz );
+ LPTSTR pszCategory = _tcstok( szRawCategories, _T("/") );
+ int cCategories = 0;
+ while ( pszCategory )
+ {
+ XMLCategory.append( EscapeXML( string( pszCategory ) ) );
+ pszCategory = _tcstok( NULL, _T("/") );
+ cCategories += 1;
+ if ( pszCategory )
+ XMLCategory.append( _T("<category>") );
+ }
+ for ( ; cCategories > 1; cCategories-- )
+ XMLCategory.append( _T("</category>") );
+
+ return XMLCategory;
}
Index: DQSDWizardDlg.h
===================================================================
RCS file: /cvsroot/dqsd/dqsd/src/DQSDSearchWiz/DQSDWizardDlg.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** DQSDWizardDlg.h 20 Sep 2002 22:59:13 -0000 1.21
--- DQSDWizardDlg.h 20 Jan 2003 02:06:37 -0000 1.22
***************
*** 105,108 ****
--- 105,109 ----
void ShrinkDialog();
void GrowDialog();
+ string ParseCategory( LPCTSTR sz );
};
-------------------------------------------------------
This SF.NET email is sponsored by: FREE SSL Guide from Thawte
are you planning your Web Server Security? Click here to get a FREE
Thawte SSL guide and find the answers to all your SSL security issues.
http://ads.sourceforge.net/cgi-bin/redirect.pl?thaw0026en
_______________________________________________
DQSD-CVS mailing list
https://lists.sourceforge.net/lists/listinfo/dqsd-cvs
DQSD CVS repository:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/dqsd/
