[Sphere-axis-commits] CVS: Axis drewsky.rc,1.38,1.39 AccountDlg.cpp,1.8,1.9 AccountDlg.h,1.4,1.5 set
Brought to you by:
pesterle
Menu
▾
▴
[Sphere-axis-commits] CVS: Axis drewsky.rc,1.38,1.39 AccountDlg.cpp,1.8,1.9 AccountDlg.h,1.4,1.5 settingstab.cpp,1.20,1.21 settingstab.h,1.12,1.13
|
From: Philip E. <pes...@us...> - 2002-05-25 02:42:27
|
Update of /cvsroot/sphere-axis/Axis
In directory usw-pr-cvs1:/tmp/cvs-serv30118
Modified Files:
drewsky.rc AccountDlg.cpp AccountDlg.h settingstab.cpp
settingstab.h
Log Message:
New build with resizable Account Dialog
Index: drewsky.rc
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/drewsky.rc,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -r1.38 -r1.39
*** drewsky.rc 23 May 2002 23:25:51 -0000 1.38
--- drewsky.rc 25 May 2002 02:42:20 -0000 1.39
***************
*** 1,3 ****
--- 1,4 ----
//Microsoft Developer Studio generated resource script.
+ // Last compiled 5/24/2002 at 20:36:16
//
#include "resource.h"
***************
*** 2326,2331 ****
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 0,13,1,12
! PRODUCTVERSION 0,13,1,12
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
--- 2327,2332 ----
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 0,13,1,14
! PRODUCTVERSION 0,13,1,14
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
***************
*** 2345,2349 ****
VALUE "CompanyName", "\0"
VALUE "FileDescription", "axis MFC Application\0"
! VALUE "FileVersion", "0, 13, 1, 12\0"
VALUE "InternalName", "axis\0"
VALUE "LegalCopyright", "Copyright (C) 1998-2002\0"
--- 2346,2350 ----
VALUE "CompanyName", "\0"
VALUE "FileDescription", "axis MFC Application\0"
! VALUE "FileVersion", "0, 13, 1, 14\0"
VALUE "InternalName", "axis\0"
VALUE "LegalCopyright", "Copyright (C) 1998-2002\0"
***************
*** 2352,2356 ****
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Axis\0"
! VALUE "ProductVersion", "0, 13, 1, 12\0"
VALUE "SpecialBuild", "\0"
END
--- 2353,2357 ----
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Axis\0"
! VALUE "ProductVersion", "0, 13, 1, 14\0"
VALUE "SpecialBuild", "\0"
END
Index: AccountDlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/AccountDlg.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** AccountDlg.cpp 23 May 2002 23:25:51 -0000 1.8
--- AccountDlg.cpp 25 May 2002 02:42:20 -0000 1.9
***************
*** 189,192 ****
--- 189,270 ----
GetWindowRect(m_crOriginal);
+ m_cbCancel.GetWindowRect(m_crCancel);
+ m_cbOK.GetWindowRect(m_crOK);
+ m_csLabel1.GetWindowRect(m_crLabel1);
+ m_csLabel2.GetWindowRect(m_crLabel2);
+ m_csLabel3.GetWindowRect(m_crLabel3);
+ m_csLabel4.GetWindowRect(m_crLabel4);
+ m_csLabel5.GetWindowRect(m_crLabel5);
+ m_csLabel6.GetWindowRect(m_crLabel6);
+ m_csLabel7.GetWindowRect(m_crLabel7);
+ m_csLabel8.GetWindowRect(m_crLabel8);
+ m_csLabel9.GetWindowRect(m_crLabel9);
+ m_csLabel10.GetWindowRect(m_crLabel10);
+ m_csLabel11.GetWindowRect(m_crLabel11);
+ m_csLabel12.GetWindowRect(m_crLabel12);
+ m_csLabel13.GetWindowRect(m_crLabel13);
+ m_csLabel14.GetWindowRect(m_crLabel14);
+ m_csLabel15.GetWindowRect(m_crLabel15);
+ m_csQueue.GetWindowRect(m_crQueue);
+ m_cbParam.GetWindowRect(m_crParam);
+ m_cbNew.GetWindowRect(m_crNew);
+ m_cbDelete.GetWindowRect(m_crDelete);
+ m_csFirstIP.GetWindowRect(m_crFirstIP);
+ m_ceComment.GetWindowRect(m_crComment);
+ m_clbUpdates.GetWindowRect(m_crUpdates);
+ m_csTime.GetWindowRect(m_crTime);
+ m_cePassword.GetWindowRect(m_crPassword);
+ m_clbPriv.GetWindowRect(m_crPriv);
+ m_ccbLevel.GetWindowRect(m_crLevel);
+ m_csUID.GetWindowRect(m_crUID);
+ m_csLastTime.GetWindowRect(m_crLastTime);
+ m_csLastIP.GetWindowRect(m_crLastIP);
+ m_csLastDate.GetWindowRect(m_crLastDate);
+ m_ceLang.GetWindowRect(m_crLang);
+ m_csFirstDate.GetWindowRect(m_crFirstDate);
+ m_csFailures.GetWindowRect(m_crFailures);
+ m_ceEmail.GetWindowRect(m_crEmail);
+ m_ceChat.GetWindowRect(m_crChat);
+ m_clbAcctList.GetWindowRect(m_crAcctList);
+
+ ScreenToClient(m_crOK);
+ ScreenToClient(m_crCancel);
+ ScreenToClient(m_crQueue);
+ ScreenToClient(m_crParam);
+ ScreenToClient(m_crNew);
+ ScreenToClient(m_crDelete);
+ ScreenToClient(m_crFirstIP);
+ ScreenToClient(m_crComment);
+ ScreenToClient(m_crUpdates);
+ ScreenToClient(m_crTime);
+ ScreenToClient(m_crPassword);
+ ScreenToClient(m_crPriv);
+ ScreenToClient(m_crLevel);
+ ScreenToClient(m_crUID);
+ ScreenToClient(m_crLastTime);
+ ScreenToClient(m_crLastIP);
+ ScreenToClient(m_crLastDate);
+ ScreenToClient(m_crLang);
+ ScreenToClient(m_crFirstDate);
+ ScreenToClient(m_crFailures);
+ ScreenToClient(m_crEmail);
+ ScreenToClient(m_crChat);
+ ScreenToClient(m_crAcctList);
+ ScreenToClient(m_crLabel1);
+ ScreenToClient(m_crLabel2);
+ ScreenToClient(m_crLabel3);
+ ScreenToClient(m_crLabel4);
+ ScreenToClient(m_crLabel5);
+ ScreenToClient(m_crLabel6);
+ ScreenToClient(m_crLabel7);
+ ScreenToClient(m_crLabel8);
+ ScreenToClient(m_crLabel9);
+ ScreenToClient(m_crLabel10);
+ ScreenToClient(m_crLabel11);
+ ScreenToClient(m_crLabel12);
+ ScreenToClient(m_crLabel13);
+ ScreenToClient(m_crLabel14);
+ ScreenToClient(m_crLabel15);
+
return TRUE; // return TRUE unless you set the focus to a control
***************
*** 371,374 ****
--- 449,453 ----
delete pAcct;
}
+ m_clbAcctList.ResetContent();
}
***************
*** 655,668 ****
dy = crNew.Height() - m_crOriginal.Height();
- int dx1 = dx / 2;
- int dx2 = dx - dx1;
int dy1 = dy / 2;
int dy2 = dy - dy1;
! // Resize the accounts and queue windows
!
! // Move the rest of the windows
CDialog::OnSize(nType, cx, cy);
this->Invalidate();
}
--- 734,792 ----
dy = crNew.Height() - m_crOriginal.Height();
int dy1 = dy / 2;
int dy2 = dy - dy1;
! if ( m_clbAcctList.GetSafeHwnd() != NULL )
! {
! // Resize the accounts and queue windows
! m_clbAcctList.MoveWindow(m_crAcctList.left, m_crAcctList.top, m_crAcctList.Width() + dx, m_crAcctList.Height() + dy1);
! m_clbUpdates.MoveWindow(m_crUpdates.left, m_crUpdates.top + dy1, m_crUpdates.Width() + dx, m_crUpdates.Height() + dy2);
! // Move the rest of the windows
! // Left side stuff
! RepositionWindow(&m_cbNew, m_crNew, 0, dy1);
! RepositionWindow(&m_cbDelete, m_crDelete, 0, dy1);
! RepositionWindow(&m_csQueue, m_crQueue, 0, dy1);
! // Right side stuff
! RepositionWindow(&m_cbCancel, m_crCancel, dx, 0);
! RepositionWindow(&m_cbOK, m_crOK, dx, 0);
! RepositionWindow(&m_csLabel1, m_crLabel1, dx, 0);
! RepositionWindow(&m_csLabel2, m_crLabel2, dx, 0);
! RepositionWindow(&m_csLabel3, m_crLabel3, dx, 0);
! RepositionWindow(&m_csLabel4, m_crLabel4, dx, 0);
! RepositionWindow(&m_csLabel5, m_crLabel5, dx, 0);
! RepositionWindow(&m_csLabel6, m_crLabel6, dx, 0);
! RepositionWindow(&m_csLabel7, m_crLabel7, dx, 0);
! RepositionWindow(&m_csLabel8, m_crLabel8, dx, 0);
! RepositionWindow(&m_csLabel9, m_crLabel9, dx, 0);
! RepositionWindow(&m_csLabel10, m_crLabel10, dx, 0);
! RepositionWindow(&m_csLabel11, m_crLabel11, dx, 0);
! RepositionWindow(&m_csLabel12, m_crLabel12, dx, 0);
! RepositionWindow(&m_csLabel13, m_crLabel13, dx, 0);
! RepositionWindow(&m_csLabel14, m_crLabel14, dx, 0);
! RepositionWindow(&m_csLabel15, m_crLabel15, dx, 0);
! RepositionWindow(&m_cbParam, m_crParam , dx, 0);
! RepositionWindow(&m_csFirstIP, m_crFirstIP, dx, 0);
! RepositionWindow(&m_ceComment, m_crComment, dx, 0);
! RepositionWindow(&m_csTime, m_crTime, dx, 0);
! RepositionWindow(&m_cePassword, m_crPassword, dx, 0);
! RepositionWindow(&m_clbPriv, m_crPriv, dx, 0);
! RepositionWindow(&m_ccbLevel, m_crLevel, dx, 0);
! RepositionWindow(&m_csUID, m_crUID, dx, 0);
! RepositionWindow(&m_csLastTime, m_crLastTime, dx, 0);
! RepositionWindow(&m_csLastIP, m_crLastIP, dx, 0);
! RepositionWindow(&m_csLastDate, m_crLastDate, dx, 0);
! RepositionWindow(&m_ceLang, m_crLang, dx, 0);
! RepositionWindow(&m_csFirstDate, m_crFirstDate, dx, 0);
! RepositionWindow(&m_csFailures, m_crFailures, dx, 0);
! RepositionWindow(&m_ceEmail, m_crEmail, dx, 0);
! RepositionWindow(&m_ceChat, m_crChat, dx, 0);
! }
CDialog::OnSize(nType, cx, cy);
this->Invalidate();
+ }
+
+ void CAccountDlg::RepositionWindow(CWnd * pWnd, CRect rect, int dx, int dy)
+ {
+ pWnd->MoveWindow(rect.left + dx, rect.top + dy, rect.Width(), rect.Height());
}
Index: AccountDlg.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/AccountDlg.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** AccountDlg.h 23 May 2002 23:25:51 -0000 1.4
--- AccountDlg.h 25 May 2002 02:42:20 -0000 1.5
***************
*** 94,97 ****
--- 94,98 ----
// Implementation
protected:
+ void RepositionWindow(CWnd * pWnd, CRect rect, int dx, int dy);
void TouchAccount();
bool m_bIsChanging;
***************
*** 100,103 ****
--- 101,109 ----
CRect m_crOriginal;
+ CRect m_crOK, m_crCancel, m_crQueue, m_crParam, m_crNew, m_crDelete, m_crFirstIP, m_crComment;
+ CRect m_crUpdates, m_crTime, m_crPassword, m_crPriv, m_crLevel, m_crUID, m_crLastTime, m_crLastIP;
+ CRect m_crLastDate, m_crLang, m_crFirstDate, m_crFailures, m_crEmail, m_crChat, m_crAcctList;
+ CRect m_crLabel1, m_crLabel2, m_crLabel3, m_crLabel4, m_crLabel5, m_crLabel6, m_crLabel7, m_crLabel8;
+ CRect m_crLabel9, m_crLabel10, m_crLabel11, m_crLabel12, m_crLabel13, m_crLabel14, m_crLabel15;
Index: settingstab.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/settingstab.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** settingstab.cpp 23 May 2002 23:25:51 -0000 1.20
--- settingstab.cpp 25 May 2002 02:42:20 -0000 1.21
***************
*** 66,70 ****
m_pDlgStaticTool = NULL;
m_pAcctDlg = NULL;
- m_bDeleteAcctDlg = false;
//}}AFX_DATA_INIT
}
--- 66,69 ----
***************
*** 661,669 ****
void CSettingsTab::OnAcctedit()
{
! if ( m_bDeleteAcctDlg )
{
delete m_pAcctDlg;
m_pAcctDlg = NULL;
- m_bDeleteAcctDlg = false;
}
if ( m_pAcctDlg == NULL )
--- 660,668 ----
void CSettingsTab::OnAcctedit()
{
! if ( m_pAcctDlg && !m_pAcctDlg->IsWindowVisible() )
{
+ m_pAcctDlg->DestroyWindow();
delete m_pAcctDlg;
m_pAcctDlg = NULL;
}
if ( m_pAcctDlg == NULL )
Index: settingstab.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/settingstab.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** settingstab.h 23 May 2002 23:25:51 -0000 1.12
--- settingstab.h 25 May 2002 02:42:20 -0000 1.13
***************
*** 51,55 ****
class CStaticToolDlg * m_pDlgStaticTool;
class CAccountDlg * m_pAcctDlg;
- bool m_bDeleteAcctDlg;
// Dialog Data
--- 51,54 ----
|
