diff --git a/mozilla/cmd/winfe/eddialog.cpp b/mozilla/cmd/winfe/eddialog.cpp index fdad70a88c4..2ac5ed6c461 100644 --- a/mozilla/cmd/winfe/eddialog.cpp +++ b/mozilla/cmd/winfe/eddialog.cpp @@ -478,7 +478,6 @@ CPublishDlg::CPublishDlg(CWnd *pParent, m_csPassword = _T(""); m_csTitle = _T(""); m_csFilename = _T(""); - m_bRememberPassword = TRUE; //}}AFX_DATA_INIT ASSERT( pMWContext ); } @@ -506,7 +505,6 @@ void CPublishDlg::DoDataExchange(CDataExchange* pDX) DDX_Text(pDX, IDC_PUBLISH_PASSWORD, m_csPassword); DDX_Text(pDX, IDC_DOC_TITLE, m_csTitle); DDX_Text(pDX, IDC_PUBLISH_FILENAME, m_csFilename); - DDX_Check(pDX, IDC_PUBLISH_REMEMBER_PASSWORD, m_bRememberPassword); //}}AFX_DATA_MAP } @@ -544,10 +542,6 @@ BOOL CPublishDlg::OnInitDialog() CComboBox *pLocationComboBox; VERIFY(pLocationComboBox = (CComboBox*)GetDlgItem(IDC_PUBLISH_LOCATION_LIST)); - XP_Bool bRem; - PREF_GetBoolPref("editor.publish_save_password",&bRem); - m_bRememberPassword = bRem; - char * pPassword = NULL; char * pFilename = NULL; char * pLastLoc = NULL; diff --git a/mozilla/cmd/winfe/eddialog.h b/mozilla/cmd/winfe/eddialog.h index 1fbc1663bf5..2c7dd6b17ef 100644 --- a/mozilla/cmd/winfe/eddialog.h +++ b/mozilla/cmd/winfe/eddialog.h @@ -242,7 +242,6 @@ public: enum { IDD = IDD_PUBLISH }; CString m_csUserName; CString m_csPassword; - BOOL m_bRememberPassword; CString m_csFilename; CString m_csTitle; //}}AFX_DATA diff --git a/mozilla/cmd/winfe/edtable.cpp b/mozilla/cmd/winfe/edtable.cpp index a6f409b0976..9dcccd2b566 100755 --- a/mozilla/cmd/winfe/edtable.cpp +++ b/mozilla/cmd/winfe/edtable.cpp @@ -676,29 +676,8 @@ void CTablePage::OnChangeWidth() void CTablePage::OnChangeWidthType() { - // See if type has changed and we need to convert - // to opposite type (pixels <-> percent of parent) - int iWidthType = ((CComboBox*)GetDlgItem(IDC_WIDTH_PIX_OR_PERCENT))->GetCurSel(); - if( iWidthType != m_iWidthType ) - { - // Get current data from edit box before converting - // Note that validation uses NEW width type - if( ValidateWidthAndHeight(this, &m_iWidth, &m_iHeight, iWidthType, m_iHeightType) ) - { - if( iWidthType ) - // Convert previous from % to pixels - m_iWidth = (m_iWidth * m_iParentWidth ) / 100; - else - // Convert previous value from pixels to % - m_iWidth = (m_iWidth * 100) / m_iParentWidth; - - // This will trigger OnChange for width, - // which will set the IDC_OVERRIDE_WIDTH checkbox - UpdateWidthAndHeight(this, m_iWidth, m_iHeight); - SetModified(TRUE); - } - m_iWidthType = iWidthType; - } + m_iWidthType = ((CComboBox*)GetDlgItem(IDC_WIDTH_PIX_OR_PERCENT))->GetCurSel(); + SetModified(TRUE); } @@ -714,29 +693,8 @@ void CTablePage::OnChangeHeight() void CTablePage::OnChangeHeightType() { - // See if type has changed and we need to convert - // to opposite type (pixels <-> percent of parent) - int iHeightType = ((CComboBox*)GetDlgItem(IDC_HEIGHT_PIX_OR_PERCENT))->GetCurSel(); - if( iHeightType != m_iHeightType ) - { - // Get current data from edit box before converting - // Note that validation uses NEW height type - if( ValidateWidthAndHeight(this, &m_iWidth, &m_iHeight, m_iWidthType, iHeightType) ) - { - if( iHeightType ) - // Convert previous from % to pixels - m_iHeight = (m_iHeight * m_iParentHeight ) / 100; - else - // Convert previous value from pixels to % - m_iHeight = (m_iHeight * 100) / m_iParentHeight; - - // This will trigger OnChange for height, - // which will set the IDC_OVERRIDE_HEIGHT checkbox - UpdateWidthAndHeight(this, m_iWidth, m_iHeight); - SetModified(TRUE); - } - m_iHeightType = iHeightType; - } + m_iHeightType = ((CComboBox*)GetDlgItem(IDC_HEIGHT_PIX_OR_PERCENT))->GetCurSel(); + SetModified(TRUE); } void CTablePage::OnOverrideColor() @@ -1436,31 +1394,8 @@ void CTableCellPage::OnChangeWidth() void CTableCellPage::OnChangeWidthType() { - // See if type has changed and we need to convert - // to opposite type (pixels <-> percent of parent) - int iWidthType = ((CComboBox*)GetDlgItem(IDC_WIDTH_PIX_OR_PERCENT))->GetCurSel(); - if( iWidthType != m_iWidthType ) - { - // Get current data from edit box before converting - // Note that validation uses NEW width type - if( ValidateWidthAndHeight(this, &m_iWidth, &m_iHeight, iWidthType, m_iHeightType) ) - { - if( iWidthType ) - { - // New type = % - // Convert previous value from pixels to % - m_iWidth = (m_iWidth * 100) / m_iParentWidth; - } else { - // New type = pixels - // Convert previous from % to pixels - m_iWidth = (m_iWidth * m_iParentWidth ) / 100; - } - - UpdateWidthAndHeight(this, m_iWidth, m_iHeight); - SetModified(TRUE); - } - m_iWidthType = iWidthType; - } + m_iWidthType = ((CComboBox*)GetDlgItem(IDC_WIDTH_PIX_OR_PERCENT))->GetCurSel(); + SetModified(TRUE); } void CTableCellPage::OnChangeHeight() @@ -1475,27 +1410,8 @@ void CTableCellPage::OnChangeHeight() void CTableCellPage::OnChangeHeightType() { - // See if type has changed and we need to convert - // to opposite type (pixels <-> percent of parent) - int iHeightType = ((CComboBox*)GetDlgItem(IDC_HEIGHT_PIX_OR_PERCENT))->GetCurSel(); - if( iHeightType != m_iHeightType ) - { - // Get current data from edit box before converting - // Note that validation uses NEW height type - if( ValidateWidthAndHeight(this, &m_iWidth, &m_iHeight, m_iWidthType, iHeightType) ) - { - if( iHeightType ) - // Convert previous from % to pixels - m_iHeight = (m_iHeight * m_iParentHeight ) / 100; - else - // Convert previous value from pixels to % - m_iHeight = (m_iHeight * 100) / m_iParentHeight; - - UpdateWidthAndHeight(this, m_iWidth, m_iHeight); - SetModified(TRUE); - } - m_iHeightType = iHeightType; - } + m_iHeightType = ((CComboBox*)GetDlgItem(IDC_HEIGHT_PIX_OR_PERCENT))->GetCurSel(); + SetModified(TRUE); } void CTableCellPage::OnOverrideColor() diff --git a/mozilla/cmd/winfe/edtrcdll/src/edtrcdll.rc b/mozilla/cmd/winfe/edtrcdll/src/edtrcdll.rc index 6e26fe4584f..903a4796fc2 100644 --- a/mozilla/cmd/winfe/edtrcdll/src/edtrcdll.rc +++ b/mozilla/cmd/winfe/edtrcdll/src/edtrcdll.rc @@ -495,8 +495,7 @@ BEGIN ES_AUTOHSCROLL PUSHBUTTON "Use &Default Location",IDC_PUBLISH_DEFAULT_LOCATION,191, 74,91,14 - CONTROL "&Save password",IDC_PUBLISH_REMEMBER_PASSWORD,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,191,94,92,11 + PUSHBUTTON "N&etcenter Location",IDC_NETCENTER_LOCATION,191,94,91,14 GROUPBOX "Other files to include ",IDC_STATIC,7,115,276,74 CONTROL "&Files associated with this page", IDC_INCLUDE_IMAGE_FILES,"Button",BS_AUTORADIOBUTTON | diff --git a/mozilla/cmd/winfe/edtrcdll/src/resource.h b/mozilla/cmd/winfe/edtrcdll/src/resource.h index 5df26d37fa2..bed214b4a56 100644 --- a/mozilla/cmd/winfe/edtrcdll/src/resource.h +++ b/mozilla/cmd/winfe/edtrcdll/src/resource.h @@ -324,7 +324,7 @@ #define IDC_DOC_CLASIFICATION 2232 #define IDC_PUBLISH_HTTP 2232 #define IDC_PUBLISH_PASSWORD 2233 -#define IDC_PUBLISH_REMEMBER_PASSWORD 2235 +#define IDC_NETCENTER_LOCATION 2234 #define IDC_HEIGHT_PIX_OR_PERCENT 2236 #define IDC_NEW_DOC_TEMPLATE 2236 #define IDC_WIDTH_PIX_OR_PERCENT 2237 diff --git a/mozilla/cmd/winfe/edview.cpp b/mozilla/cmd/winfe/edview.cpp index 18df2e8ce89..cc02eb03bc0 100644 --- a/mozilla/cmd/winfe/edview.cpp +++ b/mozilla/cmd/winfe/edview.cpp @@ -3406,8 +3406,10 @@ void CNetscapeEditView::OnPublish() dlg.m_ppIncludedFiles, dlg.m_pFullLocation, bKeepImages, - bKeepLinks, - dlg.m_bRememberPassword); + bKeepLinks, + TRUE); // We always "remember" the password now, + // This simply means we copy it to the pref + // so Single Signon can use it } XP_FREE(pSrcURL); diff --git a/mozilla/cmd/winfe/resource.h b/mozilla/cmd/winfe/resource.h index f83a0665d9e..2a2c6caa8e4 100755 --- a/mozilla/cmd/winfe/resource.h +++ b/mozilla/cmd/winfe/resource.h @@ -1947,9 +1947,7 @@ #define IDC_DOC_CLASIFICATION 2232 #define IDC_PUBLISH_HTTP 2232 #define IDC_PUBLISH_PASSWORD 2233 -#define IDC_APPLET_CLASS_NAME 2234 -#define IDC_PUBLISH_SAVE_PASSWORD 2234 -#define IDC_PUBLISH_REMEMBER_PASSWORD 2235 +#define IDC_NETCENTER_LOCATION 2234 #define IDC_NEW_DOC_TEMPLATE 2236 #define IDC_RESTORE_DEFAULT_TEMPLATE 2237 #define IDC_EDAL_A 2238