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-serv27669/src/DQSDSearchWiz
Modified Files:
ChangeLog.txt DQSDSearchWiz.rc DQSDWizardDlg.cpp
DQSDWizardDlg.h resource.h
Log Message:
Bug fixes; completion of .7
Index: ChangeLog.txt
===================================================================
RCS file: /cvsroot/dqsd/dqsd/src/DQSDSearchWiz/ChangeLog.txt,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** ChangeLog.txt 7 Sep 2002 18:36:43 -0000 1.17
--- ChangeLog.txt 9 Sep 2002 06:01:13 -0000 1.18
***************
*** 1,7 ****
! Version 0.7 (beta) 7-Sep-2002
* Fixed indentation of 'break' in gen'd code
* Added option for mutually exclusive switches which changes gen'd code for parsing
switches
* Added feature to highlight selected FORM with user-configurable color/border
Version 0.6.1 (beta) - 5-Sep-2002
--- 1,8 ----
! Version 0.7 (beta) 9-Sep-2002
* Fixed indentation of 'break' in gen'd code
* Added option for mutually exclusive switches which changes gen'd code for parsing
switches
* Added feature to highlight selected FORM with user-configurable color/border
+ * Added button to show/hide HTML of selected FORM
Version 0.6.1 (beta) - 5-Sep-2002
Index: DQSDSearchWiz.rc
===================================================================
RCS file: /cvsroot/dqsd/dqsd/src/DQSDSearchWiz/DQSDSearchWiz.rc,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** DQSDSearchWiz.rc 7 Sep 2002 18:36:43 -0000 1.17
--- DQSDSearchWiz.rc 9 Sep 2002 06:01:13 -0000 1.18
***************
*** 55,60 ****
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 0,0,6,1
! PRODUCTVERSION 0,0,6,1
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
--- 55,60 ----
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 0,0,7,0
! PRODUCTVERSION 0,0,7,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", "0.6.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", "0.7\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", "0.6.1\0"
VALUE "SpecialBuild", "(beta)\0"
END
--- 81,85 ----
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Dave's Quick Search Deskbar Search Wizard\0"
! VALUE "ProductVersion", "0.7\0"
VALUE "SpecialBuild", "(beta)\0"
END
***************
*** 117,121 ****
//
! IDD_DQSDWIZARDDLG DIALOGEX 0, 0, 380, 274
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_CONTEXTHELP
--- 117,121 ----
//
! IDD_DQSDWIZARDDLG DIALOGEX 0, 0, 380, 271
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_CONTEXTHELP
***************
*** 148,161 ****
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
- LTEXT "* = Required",IDC_STATIC,6,260,40,8
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
! ICON IDI_WIZARD,IDC_STATIC,7,4,20,20
END
--- 148,161 ----
CONTROL "List2",IDC_FormList2,"SysListView32",LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER |
! WS_BORDER | WS_TABSTOP,6,107,315,47,WS_EX_CLIENTEDGE
! EDITTEXT IDC_FormFields,6,165,368,102,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
! ICON IDI_WIZARD,IDC_STATIC,7,4,21,20
! PUSHBUTTON "&HTML >>",IDC_ShowHideHTML,324,140,50,14
! LTEXT "* = Required",IDC_STATIC,6,155,40,8
END
***************
*** 218,221 ****
--- 218,222 ----
RIGHTMARGIN, 374
VERTGUIDE, 307
+ VERTGUIDE, 321
TOPMARGIN, 6
BOTTOMMARGIN, 268
Index: DQSDWizardDlg.cpp
===================================================================
RCS file: /cvsroot/dqsd/dqsd/src/DQSDSearchWiz/DQSDWizardDlg.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** DQSDWizardDlg.cpp 7 Sep 2002 18:36:43 -0000 1.33
--- DQSDWizardDlg.cpp 9 Sep 2002 06:01:13 -0000 1.34
***************
*** 62,65 ****
--- 62,73 ----
USES_CONVERSION;
+ RECT rcDialog;
+ GetWindowRect( &rcDialog );
+
+ m_nTallDialogHeight = rcDialog.bottom - rcDialog.top;
+ ShrinkDialog();
+
+ OnChangeSwitches( 0, 0, NULL, bHandled );
+
#ifdef _DEBUG
CWindow( GetDlgItem( IDC_SearchName ) ).SetWindowText( _T("xyzzy") );
***************
*** 125,129 ****
lvc.pszText = _T("action");
! lvc.cx = 500;
lvc.iOrder = 1;
ctlFormList2.SendMessage( LVM_INSERTCOLUMN, 1, (LPARAM)&lvc );
--- 133,137 ----
lvc.pszText = _T("action");
! lvc.cx = 430;
lvc.iOrder = 1;
ctlFormList2.SendMessage( LVM_INSERTCOLUMN, 1, (LPARAM)&lvc );
***************
*** 260,263 ****
--- 268,279 ----
if ( pNMListView->uNewState == 3 )
{
+ BSTR bstr = NULL;
+ if ( SUCCEEDED( (*pspForm)->get_outerHTML( &bstr ) ) )
+ {
+ CWindow ctlForm = GetDlgItem( IDC_FormFields );
+ ctlForm.SetWindowText( W2T( bstr ) );
+ ::SysFreeString( bstr );
+ }
+
m_spSelectedStyle = NULL;
(*pspForm)->get_style( &m_spSelectedStyle );
***************
*** 286,289 ****
--- 302,306 ----
}
+ #if 0
// Get the current FORM selection and display it's HTML
// just to help the user know which form to use
***************
*** 316,319 ****
--- 333,338 ----
}
}
+ #endif
+
}
catch ( ... )
***************
*** 1075,1080 ****
LRESULT CDQSDWizardDlg::OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL&
bHandled)
{
! m_spSelectedStyle->put_cssText( m_bstrUnselectedStyle );
! m_spSelectedStyle = NULL;
return 0;
--- 1094,1154 ----
LRESULT CDQSDWizardDlg::OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL&
bHandled)
{
! if ( m_spSelectedStyle )
! {
! m_spSelectedStyle->put_cssText( m_bstrUnselectedStyle );
! m_spSelectedStyle = NULL;
! }
!
! return 0;
! }
!
! LRESULT CDQSDWizardDlg::OnClickedShowHideHTML(WORD wNotifyCode, WORD wID, HWND
hWndCtl, BOOL& bHandled)
! {
! RECT rcDialog;
! GetWindowRect( &rcDialog );
!
! if ( m_nTallDialogHeight == ( rcDialog.bottom - rcDialog.top ) )
! {
! ShrinkDialog();
! }
! else
! {
! GrowDialog();
! }
! return 0;
! }
!
! void CDQSDWizardDlg::ShrinkDialog()
! {
! RECT rcDialog;
! GetWindowRect( &rcDialog );
!
! RECT rcHTML;
! CWindow( GetDlgItem( IDC_FormFields ) ).GetWindowRect( &rcHTML );
! CWindow( GetDlgItem( IDC_ShowHideHTML ) ).SetWindowText( _T("&HTML >>") );
!
! rcDialog.bottom -= ( rcHTML.bottom - rcHTML.top + 7 );
!
! SetWindowPos( HWND_NOTOPMOST, &rcDialog, 0 );
! }
!
! void CDQSDWizardDlg::GrowDialog()
! {
! RECT rcDialog;
! GetWindowRect( &rcDialog );
!
! CWindow( GetDlgItem( IDC_ShowHideHTML ) ).SetWindowText( _T("<< &HTML") );
!
! rcDialog.bottom = ( rcDialog.top + m_nTallDialogHeight );
!
! SetWindowPos( HWND_NOTOPMOST, &rcDialog, 0 );
! }
!
! LRESULT CDQSDWizardDlg::OnChangeSwitches(WORD wNotifyCode, WORD wID, HWND hWndCtl,
BOOL& bHandled)
! {
! TCHAR szSwitches[ 8 ];
! ::GetWindowText( GetDlgItem( IDC_Switches ), szSwitches, LENGTHOF( szSwitches
) - 1 );
!
! CWindow( GetDlgItem( IDC_MutuallyExclusiveSwitches ) ).EnableWindow( _tcslen(
szSwitches ) > 0 );
return 0;
Index: DQSDWizardDlg.h
===================================================================
RCS file: /cvsroot/dqsd/dqsd/src/DQSDSearchWiz/DQSDWizardDlg.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** DQSDWizardDlg.h 7 Sep 2002 18:36:43 -0000 1.18
--- DQSDWizardDlg.h 9 Sep 2002 06:01:14 -0000 1.19
***************
*** 16,19 ****
--- 16,20 ----
public:
CDQSDWizardDlg()
+ : m_nTallDialogHeight( 0 )
{
}
***************
*** 37,40 ****
--- 38,43 ----
COMMAND_HANDLER(IDC_About, BN_CLICKED, OnClickedAbout)
COMMAND_HANDLER(IDC_Options, BN_CLICKED, OnClickedOptions)
+ COMMAND_HANDLER(IDC_ShowHideHTML, BN_CLICKED, OnClickedShowHideHTML)
+ COMMAND_HANDLER(IDC_Switches, EN_CHANGE, OnChangeSwitches)
END_MSG_MAP()
// Handler prototypes:
***************
*** 63,66 ****
--- 66,71 ----
LRESULT OnClickedAbout(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL&
bHandled);
LRESULT OnClickedOptions(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL&
bHandled);
+ LRESULT OnClickedShowHideHTML(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL&
+bHandled);
+ LRESULT OnChangeSwitches(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL&
+bHandled);
public:
***************
*** 80,83 ****
--- 85,89 ----
map< int, CComBSTR > m_mapUnselectedStyle;
CComPtr< IHTMLStyle > m_spSelectedStyle;
+ int m_nTallDialogHeight;
private:
***************
*** 89,92 ****
--- 95,100 ----
void RestoreFields();
string GetScriptFieldName( const string& rstrFieldName );
+ void ShrinkDialog();
+ void GrowDialog();
};
Index: resource.h
===================================================================
RCS file: /cvsroot/dqsd/dqsd/src/DQSDSearchWiz/resource.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** resource.h 7 Sep 2002 18:36:43 -0000 1.7
--- resource.h 9 Sep 2002 06:01:14 -0000 1.8
***************
*** 39,42 ****
--- 39,43 ----
#define IDC_CSSborder 235
#define IDC_MutuallyExclusiveSwitches 236
+ #define IDC_ShowHideHTML 237
// Next default values for new objects
***************
*** 46,50 ****
#define _APS_NEXT_RESOURCE_VALUE 206
#define _APS_NEXT_COMMAND_VALUE 32768
! #define _APS_NEXT_CONTROL_VALUE 237
#define _APS_NEXT_SYMED_VALUE 106
#endif
--- 47,51 ----
#define _APS_NEXT_RESOURCE_VALUE 206
#define _APS_NEXT_COMMAND_VALUE 32768
! #define _APS_NEXT_CONTROL_VALUE 238
#define _APS_NEXT_SYMED_VALUE 106
#endif
-------------------------------------------------------
This sf.net email is sponsored by: OSDN - Tired of that same old
cell phone? Get a new here for FREE!
https://www.inphonic.com/r.asp?r=sourceforge1&refcode1=vs3390
_______________________________________________
DQSD-CVS mailing list
https://lists.sourceforge.net/lists/listinfo/dqsd-cvs
DQSD CVS repository:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/dqsd/
