From 3818c4e571da1af58983d0b3f1df6cd2ce570b82 Mon Sep 17 00:00:00 2001 From: "cmanske%netscape.com" Date: Mon, 27 Jul 1998 01:18:38 +0000 Subject: [PATCH] Fixed lots of Composer bugs, modified property dialogs for tables, images; menu updates git-svn-id: svn://10.0.0.236/trunk@6504 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/cmd/winfe/editor.rc | 7 +- mozilla/cmd/winfe/edprops.cpp | 322 ++++++++------------- mozilla/cmd/winfe/edprops.h | 60 +--- mozilla/cmd/winfe/edtable.cpp | 31 +- mozilla/cmd/winfe/edtrcdll/src/edtrcdll.rc | 237 +++++++-------- mozilla/cmd/winfe/edtrcdll/src/resource.h | 1 - mozilla/cmd/winfe/edview2.cpp | 2 +- mozilla/cmd/winfe/fenet.cpp | 7 +- mozilla/cmd/winfe/genframe.cpp | 2 +- mozilla/cmd/winfe/res/editor.rc2 | 71 ++--- mozilla/cmd/winfe/resource.h | 9 +- 11 files changed, 274 insertions(+), 475 deletions(-) diff --git a/mozilla/cmd/winfe/editor.rc b/mozilla/cmd/winfe/editor.rc index 103e7e2991e..04d435f00f7 100644 --- a/mozilla/cmd/winfe/editor.rc +++ b/mozilla/cmd/winfe/editor.rc @@ -464,8 +464,6 @@ BEGIN IDS_COLUMN "Column" IDS_CELL "Cell" IDS_PERCENT_TABLE "% of table" - IDS_APPLY_CELL_MSG "Apply changes before changing selection?" - IDS_CHANGE_SEL_CAPTION "Change Table Selection" IDS_SMALL_ROMAN "i, ii, iii..." END @@ -487,6 +485,8 @@ BEGIN IDS_WHITE_ON_VIOLET "White on Violet" IDS_BLACK_ON_WHITE "Black on White" IDS_INTEGER_RANGE_ERROR "Please enter an integer between %d and %d" + IDS_MISSING_IMAGE "You must supply an Image URL and\nAlternate Text for the image" + IDS_MISSING_LINK "You must supply an Link Location" END STRINGTABLE PRELOAD DISCARDABLE @@ -635,6 +635,7 @@ BEGIN IDS_EDIT_DOC_SOURCE "Edit page &Source" IDS_TEXT_PROPS_CAPTION "Character Properties" IDS_IMAGE_PROPS_CAPTION "Image Properties" + IDS_LINK_PROPS_CAPTION "Link Properties" END STRINGTABLE DISCARDABLE @@ -660,7 +661,7 @@ BEGIN "Unable to launch external editor! Error code=%d" IDS_IMAGE_IS_REMOTE "Image is at a remote location.\nSave image to disk before editing." IDS_EDIT_IMAGE_CAPTION "Edit Image" - ID_EDT_NEW_DOC_BLANK "Create a new page\nNew" + ID_EDT_NEW_DOC_BLANK "Create a new page\nNew\nNew" ID_EDT_NEW_DOC_TEMPLATE "Use a template to create a new web page" IDS_FILE_IS_MODIFIED "This page has been modified by another program.\nReload page to see changes?" IDS_FILE_MODIFIED_CAPTION "Reload File" diff --git a/mozilla/cmd/winfe/edprops.cpp b/mozilla/cmd/winfe/edprops.cpp index 8cebd380aa9..e61d113880d 100644 --- a/mozilla/cmd/winfe/edprops.cpp +++ b/mozilla/cmd/winfe/edprops.cpp @@ -6278,16 +6278,8 @@ ED_Alignment CAlignControls::GetAlignment() m_EdAlign = ED_ALIGN_TOP; break; case IDC_EDAL_C: - m_EdAlign = ED_ALIGN_CENTER; -// m_EdAlign = ED_ALIGN_ABSCENTER; - break; case IDC_EDALCB: - m_EdAlign = ED_ALIGN_ABSCENTER; -// m_EdAlign = ED_ALIGN_CENTER; - break; - case IDC_EDAL_B: - m_EdAlign = ED_ALIGN_BOTTOM; -// m_EdAlign = ED_ALIGN_ABSBOTTOM; + m_EdAlign = ED_ALIGN_ABSCENTER; // Should write "CENTER" to HTML break; case IDC_EDAL_L: m_EdAlign = ED_ALIGN_LEFT; @@ -6296,7 +6288,7 @@ ED_Alignment CAlignControls::GetAlignment() m_EdAlign = ED_ALIGN_RIGHT; break; default: - m_EdAlign = ED_ALIGN_BASELINE; + m_EdAlign = ED_ALIGN_BASELINE; // Should write no param (default) break; } return m_EdAlign; @@ -6329,7 +6321,6 @@ CImagePage::CImagePage(CWnd* pParent, MWContext * pMWContext, //{{AFX_DATA_INIT(CImagePage) m_csImage = _T(""); - m_csLowRes = _T(""); m_csAltText = _T(""); m_bNoSave = 0; m_bSetAsBackground = 0; @@ -6381,6 +6372,7 @@ void CImagePage::DoDataExchange(CDataExchange* pDX) DDV_MinMaxInt(pDX, m_iBorder, 0, 1000); DDX_CBIndex(pDX, IDC_HEIGHT_PIX_OR_PERCENT, m_iHeightPixOrPercent); DDX_CBIndex(pDX, IDC_WIDTH_PIX_OR_PERCENT, m_iWidthPixOrPercent); + DDX_Text(pDX, IDC_IMAGE_ALT_TEXT, m_csAltText); //}}AFX_DATA_MAP } @@ -6389,10 +6381,9 @@ BEGIN_MESSAGE_MAP(CImagePage, CNetscapePropertyPage) //{{AFX_MSG_MAP(CImagePage) ON_BN_CLICKED(IDC_IMAGE_FILE, OnImageFile) ON_EN_CHANGE(IDC_IMAGE_URL, OnChangeImageURL) - ON_EN_KILLFOCUS(IDC_LOWRES_URL, OnKillfocusImage) + ON_EN_KILLFOCUS(IDC_IMAGE_URL, OnKillfocusImage) ON_BN_CLICKED(IDC_IMAGE_ORIGINAL_SIZE, OnImageOriginalSize) ON_BN_CLICKED(IDC_EDIT_IMAGE, OnEditImage) - ON_BN_CLICKED(IDC_ALT_TEXT_LOWRES, OnAltTextLowRes) ON_BN_CLICKED(IDC_NO_SAVE_IMAGE, OnNoSave) ON_BN_CLICKED(IDC_REMOVE_ISMAP, OnRemoveIsmap) ON_BN_CLICKED(IDC_MAKE_IMAGE_BACKGROUND, OnSetAsBackground) @@ -6412,6 +6403,7 @@ BEGIN_MESSAGE_MAP(CImagePage, CNetscapePropertyPage) ON_EN_CHANGE(IDC_IMAGE_BORDER, OnChangeBorder) ON_BN_CLICKED(IDC_EXTRA_HTML, OnExtraHTML) ON_BN_CLICKED(IDC_LOCK_ASPECT, OnLockAspect) + ON_EN_CHANGE(IDC_IMAGE_ALT_TEXT, OnChangeAltText) //}}AFX_MSG_MAP END_MESSAGE_MAP() @@ -6515,9 +6507,6 @@ BOOL CImagePage::OnSetActive() wfe_InitPixOrPercentCombos(this); // Controls specific to Image page: - if ( m_pData->pLowSrc ){ - m_csLowRes = m_pData->pLowSrc; - } m_csAltText = m_pData->pAlt; // Get possible HREF for image @@ -6530,15 +6519,13 @@ BOOL CImagePage::OnSetActive() m_csImageStart = m_csImage; // Also save last valid image filenames m_csLastValidImage = m_csImage; -// m_csLastValidLowRes = m_csLowRes; m_bImageChanged = FALSE; -// m_bLowResChanged = FALSE; // Only allow removing bIsMap on images that already have it, // i.e., we can't add it to raw images (YET!) (GetDlgItem(IDC_REMOVE_ISMAP))->EnableWindow(m_pData->bIsMap); - + SetOKEnable(); m_bNoSave = m_pData->bNoSave; @@ -6556,6 +6543,14 @@ void CImagePage::OnHelp() NetHelp(HELP_PROPS_IMAGE); } +void CImagePage::SetOKEnable() +{ + // Enable OK only if we have both Image URL and Alt text, + // but Alt text isn't needed if image will be used for background + (GetParent()->GetDlgItem(IDOK))->EnableWindow( !(m_csImage.IsEmpty()) && + (m_bSetAsBackground || !(m_csAltText.IsEmpty())) ); +} + void CImagePage::OnOK() { //EDT_BeginBatchChanges(m_pMWContext); @@ -6563,7 +6558,8 @@ void CImagePage::OnOK() // Always set HREF data for image if struct exists, even if we didn't visit this page // since the value may be changed by CLinkPage - if( m_pData->pHREFData ){ + if( m_pData->pHREFData ) + { // If m_pData->pHREFData->pURL is NULL or empty, this clears any existing link EDT_SetHREFData(m_pMWContext, m_pData->pHREFData); } @@ -6572,28 +6568,30 @@ void CImagePage::OnOK() // no change !IS_APPLY_ENABLED(this) || // or error in data - !UpdateData(TRUE) ) { + !UpdateData(TRUE) ) + { //EDT_EndBatchChanges(m_pMWContext); return; } - - CleanupString(m_csImage); - - if ( m_csImage.IsEmpty() ){ + if ( m_csImage.IsEmpty() ) + { // No image -- do nothing // WHAT IF THERE IS A LOWRES IMAGE??? ADD MESSAGEBOX? - if ( m_bInsert ){ + if ( m_bInsert ) return; - } + // TODO: delete current image here? // Currently, EDT_SetImageData does not check for m_pImageData = NULL; return; } + // Validate/Relativize images // (Shouldn't really need this - validation is done on killfocus of edit boxes) - if ( m_bImageChanged && !m_bValidImage ){ - if ( !wfe_ValidateImage( m_pMWContext, m_csImage ) ) { + if ( m_bImageChanged && !m_bValidImage ) + { + if ( !wfe_ValidateImage( m_pMWContext, m_csImage ) ) + { m_bValidImage = TRUE; UpdateData(FALSE); return; @@ -6619,10 +6617,12 @@ void CImagePage::OnOK() return; } - if( m_bSetAsBackground ){ + if( m_bSetAsBackground ) + { // Real simple - ignore all data except for image name and save EDT_PageData * pPageData = EDT_GetPageData(m_pMWContext); - if( pPageData ){ + if( pPageData ) + { XP_FREEIF(pPageData->pBackgroundImage); pPageData->pBackgroundImage = XP_STRDUP((char*)LPCSTR(m_csImage)); pPageData->bBackgroundNoSave = m_bNoSave; @@ -6632,7 +6632,8 @@ void CImagePage::OnOK() } else { // Get the Alignment/Size data m_pData->align = m_AlignControls.GetAlignment(); - if( m_bOriginalButtonPressed ){ + if( m_bOriginalButtonPressed ) + { // Trick backend into getting size from image, // not the values edited m_pData->iWidth = 0; @@ -6643,21 +6644,21 @@ void CImagePage::OnOK() } m_pData->iHSpace = m_iHSpace; m_pData->iVSpace = m_iVSpace; - if( m_bDefaultBorder ){ + + if( m_bDefaultBorder ) m_pData->iBorder = -1; - } else { + else m_pData->iBorder = m_iBorder; - } + m_pData->bWidthPercent = m_iWidthPixOrPercent; m_pData->bHeightPercent = m_iHeightPixOrPercent; // Data specific to Image: - CleanupString(m_csLowRes); CleanupString(m_csAltText); - if ( m_pData->pSrc ){ + if ( m_pData->pSrc ) XP_FREE(m_pData->pSrc); - } + m_pData->pSrc = XP_STRDUP(m_csImage); if ( m_pData->pLowSrc ){ @@ -6665,28 +6666,27 @@ void CImagePage::OnOK() m_pData->pLowSrc = NULL; } - if ( !m_csLowRes.IsEmpty() ){ - m_pData->pLowSrc = XP_STRDUP(m_csLowRes); - } - // Note: deleting Alt text in editbox to remove Alt Text - if ( m_pData->pAlt ){ + if ( m_pData->pAlt ) + { XP_FREE(m_pData->pAlt); m_pData->pAlt = NULL; } - if ( !m_csAltText.IsEmpty() ){ + if ( !m_csAltText.IsEmpty() ) + { m_pData->pAlt = XP_STRDUP(m_csAltText); } m_pData->bNoSave = m_bNoSave; if ( m_bInsert ) - { + { EDT_InsertImage(m_pMWContext, m_pData, !m_bNoSave); // We insert just ONE image (on 1st "Apply" usage) // Thus other Apply or OK will modify newly-inserted image m_bInsert = FALSE; } - else { + else + { EDT_SetImageData(m_pMWContext, m_pData, !m_bNoSave); } //Note: ImageData and HrefData should be freed by caller @@ -6701,15 +6701,31 @@ void CImagePage::OnOK() // so it is up to date if we switch to the Link dialog page BOOL CImagePage::OnKillActive() { - if( !UpdateData(TRUE) ){ + if( !UpdateData(TRUE) ) + return FALSE; + + if ( m_bImageChanged && !m_bValidImage ) + wfe_ValidateImage( m_pMWContext, m_csImage ); + + CleanupString(m_csAltText); + CleanupString(m_csImage); + + if( m_csImage.IsEmpty() || (!m_bSetAsBackground && m_csAltText.IsEmpty()) ) + { + // Notify user they must have both image URL and alt text filled in + MessageBox(szLoadString(IDS_MISSING_IMAGE), + szLoadString(IDS_IMAGE_PROPS_CAPTION), + MB_ICONEXCLAMATION | MB_OK); + + // Put focus in the offending control + // And select all text, just like DDV functions + CEdit *pEdit = (CEdit*)GetDlgItem(m_csImage.IsEmpty() ? IDC_IMAGE_URL : IDC_IMAGE_ALT_TEXT); + pEdit->SetFocus(); + pEdit->SetSel(0, -1, TRUE); return FALSE; } - if ( m_bImageChanged && !m_bValidImage ){ - wfe_ValidateImage( m_pMWContext, m_csImage ); - } - if ( m_pData->pSrc ){ - XP_FREE(m_pData->pSrc); - } + + XP_FREEIF(m_pData->pSrc); m_pData->pSrc = XP_STRDUP(m_csImage); // Contrary to MFC help, this does NOT call our OnOK @@ -6722,11 +6738,9 @@ void CImagePage::SetImageFileSaved(char * pImageURL, int iImageNumber ) { UpdateData(TRUE); - if( iImageNumber == 1 ){ + if( iImageNumber == 1 ) m_csImage = pImageURL; - } else if ( iImageNumber == 2 ) { - m_csLowRes = pImageURL; - } + UpdateData(FALSE); } @@ -6735,17 +6749,18 @@ void CImagePage::OnImageFile() UpdateData(TRUE); char * szFilename = wfe_GetExistingImageFileName(this->m_hWnd, szLoadString(IDS_SELECT_IMAGE), TRUE); - if ( szFilename != NULL ){ + if ( szFilename != NULL ) + { m_csImage = szFilename; // Note that we don't tell user if file is "bad" since // it is difficult to validate in all cases wfe_ValidateImage( m_pMWContext, m_csImage ); - UpdateData(FALSE); XP_FREE( szFilename ); SetModified(TRUE); UpdateData(FALSE); m_bValidImage = TRUE; m_csLastValidImage = m_csImage; + SetOKEnable(); } } @@ -6759,12 +6774,14 @@ void CImagePage::OnChangeImageURL() m_csImage.TrimLeft(); m_csImage.TrimRight(); GetDlgItem(IDC_EDIT_IMAGE)->EnableWindow(!m_csImage.IsEmpty()); + SetOKEnable(); } void CImagePage::OnKillfocusImage() { if( m_bImageChanged && - UpdateData(TRUE) ){ + UpdateData(TRUE) ) + { wfe_ValidateImage( m_pMWContext, m_csImage ); m_bValidImage = TRUE; UpdateData(FALSE); @@ -6802,27 +6819,22 @@ void CImagePage::OnSetAsBackground() GetDlgItem(IDC_IMAGE_SPACE_HORIZ)->EnableWindow(!m_bSetAsBackground); GetDlgItem(IDC_IMAGE_SPACE_VERT)->EnableWindow(!m_bSetAsBackground); GetDlgItem(IDC_IMAGE_BORDER)->EnableWindow(!m_bSetAsBackground); - GetDlgItem(IDC_ALT_TEXT_LOWRES)->EnableWindow(!m_bSetAsBackground); GetDlgItem(IDC_EXTRA_HTML)->EnableWindow(!m_bSetAsBackground); GetDlgItem(IDC_REMOVE_ISMAP)->EnableWindow(!m_bSetAsBackground && m_pData->bIsMap); + GetDlgItem(IDC_IMAGE_ALT_TEXT)->EnableWindow(!m_bSetAsBackground); + SetLockAspectEnable(); + SetOKEnable(); SetModified(TRUE); } -void CImagePage::OnAltTextLowRes() +void CImagePage::OnChangeAltText() { - CImageAltDlg dlg(this, m_pMWContext, m_csAltText, m_csLowRes); - if( dlg.DoModal() ){ - // Get new strings only if they changed - if( dlg.m_csAltText != m_csAltText ){ - SetModified(TRUE); - m_csAltText = dlg.m_csAltText; - } - if( dlg.m_csLowRes != m_csLowRes ){ - SetModified(TRUE); - m_csLowRes = dlg.m_csLowRes; - } - } + // Get the alt text + UpdateData(TRUE); + CleanupString(m_csAltText); + SetOKEnable(); + SetModified(TRUE); } void CImagePage::OnNoSave() @@ -6895,7 +6907,8 @@ void CImagePage::OnImageOriginalSize() void CImagePage::OnChangeHeight() { - if( m_bLockAspect && ((CButton*)GetDlgItem(IDC_LOCK_ASPECT))->IsWindowEnabled() ) { + if( m_bLockAspect && ((CButton*)GetDlgItem(IDC_LOCK_ASPECT))->IsWindowEnabled() ) + { // Get value just enterred and set the opposite // to a value that keeps aspect ratio of original CWnd *pHeightEdit = GetDlgItem(IDC_IMAGE_HEIGHT); @@ -6906,7 +6919,8 @@ void CImagePage::OnChangeHeight() int32 iHeight = (int)strtol( pValue, &pEnd, 10 ); // Bad conversion if end pointer isn't at terminal null; - if( *pEnd == '\0' ){ + if( *pEnd == '\0' ) + { m_iHeight = iHeight; // Add 0.5 to round off when converting back to int m_iWidth = (int)((iHeight * m_iOriginalWidth) / m_iOriginalHeight); @@ -6918,15 +6932,16 @@ void CImagePage::OnChangeHeight() m_bLockAspect = TRUE; } } - if( m_iHeight != m_iOriginalHeight){ + if( m_iHeight != m_iOriginalHeight) m_bOriginalButtonPressed = FALSE; - } + SetModified(TRUE); } void CImagePage::OnChangeWidth() { - if( m_bLockAspect && ((CButton*)GetDlgItem(IDC_LOCK_ASPECT))->IsWindowEnabled() ){ + if( m_bLockAspect && ((CButton*)GetDlgItem(IDC_LOCK_ASPECT))->IsWindowEnabled() ) + { // Get value just enterred and set the opposite // to a value that keeps aspect ratio of original CWnd *pWidthEdit = GetDlgItem(IDC_IMAGE_WIDTH); @@ -6936,7 +6951,8 @@ void CImagePage::OnChangeWidth() pWidthEdit->GetWindowText(pValue, 10); int32 iWidth = (int32)strtol( pValue, &pEnd, 10 ); - if( *pEnd == '\0' ){ + if( *pEnd == '\0' ) + { m_iWidth = iWidth; m_iHeight = (int)((iWidth * m_iOriginalHeight) / m_iOriginalWidth); wsprintf(pValue, "%d", m_iHeight); @@ -6948,9 +6964,9 @@ void CImagePage::OnChangeWidth() m_bLockAspect = TRUE; } } - if( m_iWidth != m_iOriginalWidth){ + if( m_iWidth != m_iOriginalWidth) m_bOriginalButtonPressed = FALSE; - } + SetModified(TRUE); } @@ -6993,9 +7009,8 @@ void CImagePage::OnChangeBorder() void CImagePage::OnExtraHTML() { CExtraHTMLDlg dlg(this, &m_pData->pExtra, IDS_IMG_TAG); - if( dlg.DoModal() && dlg.m_bDataChanged ){ + if( dlg.DoModal() && dlg.m_bDataChanged ) SetModified(TRUE); - } } void CImagePage::OnLockAspect() @@ -7003,123 +7018,6 @@ void CImagePage::OnLockAspect() m_bLockAspect = ((CButton*)GetDlgItem(IDC_LOCK_ASPECT))->GetCheck(); } -///////////////////////////////////////////////////////////////////////////// -// CAltImageDlg dialog (modal popup over CImagePage for Alt text and Lowres Image) - -CImageAltDlg::CImageAltDlg(CWnd *pParent, - MWContext *pMWContext, - CString& csAltText, - CString& csLowRes ) - : CDialog(CImageAltDlg::IDD, pParent), - m_pMWContext(pMWContext), - m_bImageChanged(FALSE) -{ - //{{AFX_DATA_INIT(CImageAltDlg) - m_csAltText = csAltText; - m_csLowRes = csLowRes; - //}}AFX_DATA_INIT - ASSERT( pMWContext ); -} - -CImageAltDlg::~CImageAltDlg() -{ -} - -void CImageAltDlg::DoDataExchange(CDataExchange* pDX) -{ - CDialog::DoDataExchange(pDX); - //{{AFX_DATA_MAP(CImageAltDlg) - DDX_Text(pDX, IDC_LOWRES_URL, m_csLowRes); - DDX_Text(pDX, IDC_IMAGE_ALT_TEXT, m_csAltText); - //}}AFX_DATA_MAP -} - - -BEGIN_MESSAGE_MAP(CImageAltDlg, CDialog) - //{{AFX_MSG_MAP(CImageAltDlg) - ON_BN_CLICKED(IDC_IMAGE_FILE, OnLowResFile) - ON_EN_CHANGE(IDC_LOWRES_URL, OnChangeLowResURL) - ON_BN_CLICKED(IDC_EDIT_IMAGE, OnEditImage) - ON_BN_CLICKED(ID_HELP, OnHelp) - //}}AFX_MSG_MAP -#ifdef XP_WIN32 - ON_WM_HELPINFO() -#endif //XP_WIN32 -END_MESSAGE_MAP() - - -BOOL CImageAltDlg::OnInitDialog() -{ - // Switch back to NETSCAPE.EXE for resource hInstance - m_ResourceSwitcher.Reset(); - - CDialog::OnInitDialog(); - - GetDlgItem(IDC_EDIT_IMAGE)->EnableWindow(!m_csLowRes.IsEmpty()); - - return TRUE; // return TRUE unless you set the focus to a control - // EXCEPTION: OCX Property Pages should return FALSE -} - -void CImageAltDlg::OnHelp() -{ - NetHelp(HELP_PROPS_IMAGE); // TODO: ADD THIS TO HELP -} - -#ifdef XP_WIN32 -BOOL CImageAltDlg::OnHelpInfo(HELPINFO *)//32bit messagemapping. -{ - OnHelp(); - return TRUE; -} -#endif//XP_WIN32 - -void CImageAltDlg::OnOK() -{ - CDialog::OnOK(); - // Strip off leading and ending spaces - m_csAltText.TrimLeft(); - m_csAltText.TrimRight(); - m_csLowRes.TrimLeft(); - m_csLowRes.TrimRight(); - if( !m_bImageChanged ){ - wfe_ValidateImage( m_pMWContext, m_csLowRes ); - } -} - -void CImageAltDlg::OnLowResFile() -{ - UpdateData(TRUE); - char * szFilename = wfe_GetExistingImageFileName(this->m_hWnd, - szLoadString(IDS_SELECT_LOWRES_IMAGE), TRUE); - if ( szFilename == NULL ){ - return; - } - - m_csLowRes = szFilename; - wfe_ValidateImage( m_pMWContext, m_csLowRes ); - m_bImageChanged = TRUE; - UpdateData(FALSE); - XP_FREE( szFilename ); -} - -void CImageAltDlg::OnChangeLowResURL() -{ - m_bImageChanged = FALSE; - // Disable Edit button if no image name - GetDlgItem(IDC_LOWRES_URL)->GetWindowText(m_csLowRes); - m_csLowRes.TrimLeft(); - m_csLowRes.TrimRight(); - GetDlgItem(IDC_EDIT_IMAGE)->EnableWindow(!m_csLowRes.IsEmpty()); -} - -void CImageAltDlg::OnEditImage() -{ - UpdateData(TRUE); - // Get our view from the context and call edit method - ((CNetscapeEditView*)WINCX(m_pMWContext)->GetView())->EditImage((char*)LPCSTR(m_csLowRes)); -} - ///////////////////////////////////////////////////////////////////////////// // CExtraHTMLDlg dialog (modal popup over CImagePage or CLinkPage for Extra HTML @@ -7426,7 +7324,8 @@ BOOL CLinkPage::OnSetActive() UpdateData(FALSE); // Allow Apply button to be active if we are inserting a new object SetModified(m_bInsert); - return(TRUE); + + return TRUE; } // Set the HREF data @@ -7440,6 +7339,21 @@ BOOL CLinkPage::OnKillActive() if ( !m_bValidHref ){ ValidateHref(); } + if( m_csHref.IsEmpty() ) + { + // Notify user they must have a URL filled in + MessageBox(szLoadString(IDS_MISSING_LINK), + szLoadString(IDS_LINK_PROPS_CAPTION), + MB_ICONEXCLAMATION | MB_OK); + + // Put focus in the offending control + // And select all text, just like DDV functions + CEdit *pEdit = (CEdit*)GetDlgItem(IDC_HREF_URL); + pEdit->SetFocus(); + pEdit->SetSel(0, -1, TRUE); + return FALSE; + } + return CPropertyPage::OnKillActive(); } @@ -7696,7 +7610,7 @@ void CLinkPage::ValidateHref() UpdateData(FALSE); } // We must always set the HREF data immediately - // common data because it will be accessed by + // because it will be accessed by // CImagePage::OnOK before CLinkPage::OnOK SetHrefData(); } @@ -7775,7 +7689,7 @@ void CLinkPage::OnOK() } else /* if(m_pData->pURL) */{ // We created a new link - - // Anchor text should have beeen typed + // Anchor text should have been typed char * szAnchor; if ( m_csAnchorEdit.IsEmpty() ) { // No anchor text supplied, use URL diff --git a/mozilla/cmd/winfe/edprops.h b/mozilla/cmd/winfe/edprops.h index 313da8a1642..b6936eb1fe7 100644 --- a/mozilla/cmd/winfe/edprops.h +++ b/mozilla/cmd/winfe/edprops.h @@ -1211,10 +1211,7 @@ public: UINT m_nIDBitmap; private: - // These are changed via CImageAltDlg dialog - CString m_csLowRes; CString m_csAltText; - MWContext *m_pMWContext; EDT_ImageData *m_pData; BOOL m_bInsert; @@ -1250,6 +1247,8 @@ private: public: // Called after saving file to disk -- has new image path+name void SetImageFileSaved(char * pImageURL, BOOL bMainImage); + // Set state of OK button + void SetOKEnable(); protected: @@ -1268,7 +1267,6 @@ protected: afx_msg void OnRemoveIsmap(); afx_msg void OnImageOriginalSize(); afx_msg void OnEditImage(); - afx_msg void OnAltTextLowRes(); afx_msg void OnAlignBaseline(); afx_msg void OnAlignBottom(); afx_msg void OnAlignCenter(); @@ -1285,63 +1283,13 @@ protected: afx_msg void OnChangeBorder(); afx_msg void OnExtraHTML(); afx_msg void OnLockAspect(); + afx_msg void OnChangeAltText(); //}}AFX_MSG DECLARE_MESSAGE_MAP() }; ///////////////////////////////////////////////////////////////////////////// -// CAltImageDlg dialog (modal popup over CImagePage for Alt text and Lowres Image) - -class CImageAltDlg : public CDialog -{ -// Construction -public: - CImageAltDlg(CWnd *pParent, MWContext *pMWContext, - CString& csAltText, CString& csLowRes ); - ~CImageAltDlg(); - - // Dialog Data - //{{AFX_DATA(CImageAltDlg) - enum { IDD = IDD_IMAGE_ALT }; - CString m_csLowRes; - CString m_csAltText; - //}}AFX_DATA - - MWContext *m_pMWContext; - BOOL m_bImageChanged; - -private: - // This will change resource hInstance to Editor dll (in constructor) - CEditorResourceSwitcher m_ResourceSwitcher; - -// Overrides - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(CImageAltDlg) - protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - //}}AFX_VIRTUAL - -// Implementation -protected: - - // Generated message map functions - //{{AFX_MSG(CImageAltDlg) - afx_msg void OnHelp(); - virtual void OnOK(); - virtual BOOL OnInitDialog(); - afx_msg void OnLowResFile(); - afx_msg void OnChangeLowResURL(); - afx_msg void OnEditImage(); - //}}AFX_MSG -#ifdef XP_WIN32 - afx_msg BOOL OnHelpInfo(HELPINFO *); -#endif - DECLARE_MESSAGE_MAP() -}; - - -///////////////////////////////////////////////////////////////////////////// -// CExtraHTMLDlg dialog (modal popup over CImagePage or CLinkPage for Extra HTML +// CExtraHTMLDlg dialog (modal popup over most all property dialogs) class CExtraHTMLDlg : public CDialog { diff --git a/mozilla/cmd/winfe/edtable.cpp b/mozilla/cmd/winfe/edtable.cpp index a3229d11809..a6f409b0976 100755 --- a/mozilla/cmd/winfe/edtable.cpp +++ b/mozilla/cmd/winfe/edtable.cpp @@ -38,14 +38,14 @@ extern char * ed_pDontChange; // Convert the front-end valign (0..2) to the back end alignment codes. -// FE Vertical: Top, Center, Bottom, Baseline +// FE Vertical: Top, Center, Bottom, // [NO MORE "Baseline"] // FE Horizontal: Left, center, right -static const ED_Alignment kFEToXPVAlign[4] = {ED_ALIGN_ABSTOP, ED_ALIGN_ABSCENTER, ED_ALIGN_ABSBOTTOM, ED_ALIGN_BASELINE}; +static const ED_Alignment kFEToXPVAlign[3] = {ED_ALIGN_ABSTOP, ED_ALIGN_ABSCENTER, ED_ALIGN_ABSBOTTOM}; static const ED_Alignment kFEToXPAlign[3] = {ED_ALIGN_LEFT, ED_ALIGN_ABSCENTER, ED_ALIGN_RIGHT }; // Base -1 (default = -1) -// default center left right top bottom baseline abscenter absbotom abstop +// default center left right top bottom baseline abscenter absbottom abstop static const int kXPToFEAlign[10] = {0, 1, 0, 2, -1, -1, -1, 1, -1, -1}; // Default is shown as LEFT in listbox -static const int kXPToFEVAlign[10] = {1, -1, -1, -1, 0, 2, 3, 1, 2, 0}; // Default is shown as CENTER in listbox +static const int kXPToFEVAlign[10] = {1, -1, -1, -1, 0, 2, 2, 1, 2, 0}; // Default is shown as CENTER in listbox static const ED_HitType kFEToXPSelType[3] = {ED_HIT_SEL_CELL, ED_HIT_SEL_ROW, ED_HIT_SEL_COL}; static const int kXPToFESelType[10] = {-1, -1, 2, 1, 0, 0, -1, -1, -1, -1}; @@ -1004,7 +1004,7 @@ BOOL CTableCellPage::OnSetActive() pCombo->AddString(szLoadString(IDS_TOP)); pCombo->AddString(szLoadString(IDS_CENTER)); pCombo->AddString(szLoadString(IDS_BOTTOM)); - pCombo->AddString(szLoadString(IDS_BASELINE)); + //pCombo->AddString(szLoadString(IDS_BASELINE)); // Initialize width and height Units comboboxex pCombo = (CComboBox*)GetDlgItem(IDC_HEIGHT_PIX_OR_PERCENT); @@ -1060,14 +1060,14 @@ void CTableCellPage::InitPageData() { m_iVAlign = kXPToFEVAlign[m_pCellData->valign+1]; // Remove "Dont change" item in combo if already there - if( pCombo->GetCount() == 5 ) - pCombo->DeleteString(4); + if( pCombo->GetCount() == 4 ) + pCombo->DeleteString(3); } else { m_iVAlign = -1; // Add "Dont change" item to combo if not already there - if( pCombo->GetCount() == 4 ) + if( pCombo->GetCount() == 3 ) pCombo->AddString(ed_pDontChange); } @@ -1388,17 +1388,12 @@ void CTableCellPage::OnChangeSelectionType() void CTableCellPage::ChangeSelection(ED_MoveSelType iMoveType) { - if( iMoveType != ED_MOVE_NONE && m_bModified && - IDYES == MessageBox(szLoadString(IDS_APPLY_CELL_MSG), szLoadString(IDS_CHANGE_SEL_CAPTION), - MB_YESNO | MB_ICONQUESTION) ) + // Save current data + if( OnKillActive() ) { - // Save current data - if( OnKillActive() ) - { - OnOK(); - } else { - return; - } + OnOK(); + } else { + return; } EDT_ChangeTableSelection(m_pMWContext, m_iSelectionType, iMoveType, m_pCellData); diff --git a/mozilla/cmd/winfe/edtrcdll/src/edtrcdll.rc b/mozilla/cmd/winfe/edtrcdll/src/edtrcdll.rc index 597c7ebc2a5..111757d4458 100644 --- a/mozilla/cmd/winfe/edtrcdll/src/edtrcdll.rc +++ b/mozilla/cmd/winfe/edtrcdll/src/edtrcdll.rc @@ -166,26 +166,6 @@ BEGIN PUSHBUTTON "&No",IDNO,106,73,49,14,NOT WS_VISIBLE END -IDD_IMAGE_ALT DIALOG DISCARDABLE 0, 0, 267, 148 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION -CAPTION "Alternate Image Properties" -FONT 8, "MS Sans Serif" -BEGIN - GROUPBOX "Alternate text ",IDC_STATIC,8,6,249,47,WS_GROUP - EDITTEXT IDC_IMAGE_ALT_TEXT,18,17,226,12,ES_AUTOHSCROLL - LTEXT "This text will appear while image is loading, when the ""Show Images"" option is turned off, and in text-only browsers.", - IDC_STATIC,21,31,221,20 - GROUPBOX "Low resolution image ",IDC_STATIC,8,57,249,65 - EDITTEXT IDC_LOWRES_URL,18,68,226,12,ES_AUTOHSCROLL - LTEXT "This image will be displayed before the main image.\nUse an image with a smaller file size (usually fewer colors) than the main image so it loads faster.", - IDC_STATIC,21,86,167,27 - PUSHBUTTON "&Choose File...",IDC_IMAGE_FILE,193,84,50,14,WS_GROUP - PUSHBUTTON "&Edit Image",IDC_EDIT_IMAGE,193,102,50,14 - DEFPUSHBUTTON "OK",IDOK,51,128,50,14,WS_GROUP - PUSHBUTTON "Cancel",IDCANCEL,109,128,50,14 - PUSHBUTTON "Help",ID_HELP,167,128,50,14 -END - IDD_LOADING_IMAGES DIALOG DISCARDABLE 0, 0, 140, 61 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION CAPTION "Loading Images" @@ -339,7 +319,7 @@ CAPTION "Image" FONT 8, "MS Sans Serif" BEGIN GROUPBOX "&Image location - Enter a remote URL or local file ", - IDC_STATIC,7,4,275,43,WS_GROUP + IDC_STATIC,7,4,275,61,WS_GROUP EDITTEXT IDC_IMAGE_URL,17,16,142,12,ES_AUTOHSCROLL PUSHBUTTON "&Choose File...",IDC_IMAGE_FILE,164,15,53,14,WS_GROUP PUSHBUTTON "&Edit Image",IDC_EDIT_IMAGE,224,15,50,14 @@ -349,23 +329,21 @@ BEGIN CONTROL "&Use as background",IDC_MAKE_IMAGE_BACKGROUND,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,184,33,89,10 GROUPBOX "Text alignment and wrapping around images ",IDC_STATIC, - 7,50,275,49,WS_GROUP + 7,67,275,34,WS_GROUP CONTROL "EDAL_T_",IDC_EDAL_T,"Button",BS_OWNERDRAW | WS_GROUP | - WS_TABSTOP,20,63,32,22 + WS_TABSTOP,20,76,32,22 CONTROL "EDAL_C_",IDC_EDAL_C,"Button",BS_OWNERDRAW | WS_TABSTOP, - 56,63,32,22 + 56,76,32,22 CONTROL "EDALCB_",IDC_EDALCB,"Button",BS_OWNERDRAW | WS_TABSTOP, - 92,63,32,22 + 92,76,32,22 CONTROL "EDAL_A_",IDC_EDAL_A,"Button",BS_OWNERDRAW | WS_TABSTOP, - 128,63,32,22 + 128,76,32,22 CONTROL "EDAL_B_",IDC_EDAL_B,"Button",BS_OWNERDRAW | WS_TABSTOP, - 164,63,32,22 + 164,76,32,22 CONTROL "EDAL_L_",IDC_EDAL_L,"Button",BS_OWNERDRAW | WS_TABSTOP, - 200,63,32,22 + 200,76,32,22 CONTROL "EDAL_R_",IDC_EDAL_R,"Button",BS_OWNERDRAW | WS_TABSTOP, - 236,63,32,22 - RTEXT "To see wrapped text, view page in Navigator window.", - IDC_NOWRAP_MSG,19,87,243,9 + 236,76,32,22 GROUPBOX "Size ",IDC_STATIC,7,102,141,57,WS_GROUP LTEXT "&Height:",IDC_STATIC,18,113,29,8 EDITTEXT IDC_IMAGE_HEIGHT,51,112,24,12 @@ -388,11 +366,11 @@ BEGIN LTEXT "Solid &border:",IDC_STATIC,160,145,57,10 EDITTEXT IDC_IMAGE_BORDER,219,142,24,12 LTEXT "pixels",IDC_STATIC,246,145,29,10 - PUSHBUTTON "&Remove Image Map",IDC_REMOVE_ISMAP,7,163,89,14, + PUSHBUTTON "&Remove Image Map",IDC_REMOVE_ISMAP,33,163,89,14, WS_GROUP - PUSHBUTTON "Alt.Text / Lo&wRes...",IDC_ALT_TEXT_LOWRES,105,163,89, - 14 - PUSHBUTTON "E&xtra HTML...",IDC_EXTRA_HTML,203,163,79,14 + PUSHBUTTON "E&xtra HTML...",IDC_EXTRA_HTML,176,163,79,14 + EDITTEXT IDC_IMAGE_ALT_TEXT,82,47,192,12,ES_AUTOHSCROLL + LTEXT "Alternate Text:",IDC_STATIC,17,49,61,8 END IDD_PAGE_LINK DIALOG DISCARDABLE 0, 0, 290, 180 @@ -578,113 +556,111 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,105,40,50,14 END -IDD_PAGE_TABLE DIALOG DISCARDABLE 0, 0, 260, 220 +IDD_PAGE_TABLE DIALOG DISCARDABLE 0, 0, 290, 190 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Table" FONT 8, "MS Sans Serif" BEGIN - GROUPBOX "Number of ",IDC_STATIC,7,3,245,28 - RTEXT "Col&umns:",IDC_STATIC,18,15,60,8 - EDITTEXT IDC_COLUMNS,81,13,24,13 - RTEXT "&Rows:",IDC_STATIC,114,15,48,8 - EDITTEXT IDC_ROWS,166,13,24,13 - GROUPBOX "Size ",IDC_STATIC,7,33,245,43 - CONTROL "&Width",IDC_OVERRIDE_WIDTH,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,16,44,69,10 - EDITTEXT IDC_WIDTH,16,56,24,13 - COMBOBOX IDC_WIDTH_PIX_OR_PERCENT,43,56,74,64,CBS_DROPDOWNLIST | + GROUPBOX "Size ",IDC_STATIC,7,3,275,48 + LTEXT "&Rows:",IDC_STATIC,16,16,42,8 + EDITTEXT IDC_ROWS,58,14,24,13 + LTEXT "Col&umns:",IDC_STATIC,16,33,42,8 + EDITTEXT IDC_COLUMNS,58,31,24,13 + CONTROL "&Height:",IDC_OVERRIDE_HEIGHT,"Button",BS_AUTOCHECKBOX | + WS_GROUP | WS_TABSTOP,116,16,52,10 + EDITTEXT IDC_HEIGHT,172,14,24,13 + COMBOBOX IDC_HEIGHT_PIX_OR_PERCENT,200,14,74,64,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Minimum &Height",IDC_OVERRIDE_HEIGHT,"Button", - BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,139,44,75,10 - EDITTEXT IDC_HEIGHT,139,56,24,13 - COMBOBOX IDC_HEIGHT_PIX_OR_PERCENT,166,56,74,64,CBS_DROPDOWNLIST | + CONTROL "&Width:",IDC_OVERRIDE_WIDTH,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,116,33,52,10 + EDITTEXT IDC_WIDTH,172,31,24,13 + COMBOBOX IDC_WIDTH_PIX_OR_PERCENT,200,31,74,64,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Borders and Spacing ",IDC_STATIC,7,79,245,46 - CONTROL "&Border width",IDC_USE_BORDER,"Button",BS_AUTOCHECKBOX | - WS_GROUP | WS_TABSTOP,16,93,55,10 - EDITTEXT IDC_BORDER,15,106,24,13 - LTEXT "pixels",IDC_STATIC,42,108,31,8 - RTEXT "&Spacing:",IDC_STATIC,93,92,41,8 - EDITTEXT IDC_CELL_SPACING,139,90,24,13 - LTEXT "pixels between cells",IDC_STATIC,165,92,82,8 - RTEXT "&Padding:",IDC_STATIC,93,108,41,8 - EDITTEXT IDC_CELL_PADDING,139,106,24,13 - LTEXT "pixels between border and cell contents",IDC_STATIC,165, - 104,82,16 - GROUPBOX "Table Alignment ",IDC_STATIC,7,127,79,30,WS_GROUP - COMBOBOX IDC_TABLE_ALIGN,14,138,65,77,CBS_DROPDOWNLIST | + GROUPBOX "Borders and Spacing ",IDC_STATIC,7,54,159,69 + CONTROL "&Border width:",IDC_USE_BORDER,"Button",BS_AUTOCHECKBOX | + WS_GROUP | WS_TABSTOP,16,68,67,10 + EDITTEXT IDC_BORDER,85,66,24,13 + LTEXT "pixels",IDC_STATIC,112,68,31,8 + LTEXT "&Spacing:",IDC_STATIC,16,88,41,8 + EDITTEXT IDC_CELL_SPACING,58,86,24,13 + LTEXT "pixels between cells",IDC_STATIC,84,88,82,8 + LTEXT "&Padding:",IDC_STATIC,16,104,41,8 + EDITTEXT IDC_CELL_PADDING,58,102,24,13 + LTEXT "pixels between border and cell contents",IDC_STATIC,84, + 100,81,16 + LTEXT "Table Alignment:",IDC_STATIC,171,63,36,19 + COMBOBOX IDC_TABLE_ALIGN,209,66,65,77,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Caption ",IDC_STATIC,94,127,79,30 - COMBOBOX IDC_TABLE_CAPTION,100,138,65,77,CBS_DROPDOWNLIST | + LTEXT "Caption:",IDC_STATIC,171,88,27,8 + COMBOBOX IDC_TABLE_CAPTION,209,86,65,77,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "E&xtra HTML...",IDC_EXTRA_HTML,180,138,62,14 - GROUPBOX "Background ",IDC_STATIC,7,160,245,56 - CONTROL "&Color",IDC_OVERRIDE_COLOR,"Button",BS_AUTOCHECKBOX | - WS_GROUP | WS_TABSTOP,16,173,48,10 + PUSHBUTTON "E&xtra HTML...",IDC_EXTRA_HTML,209,108,65,14 + GROUPBOX "Background ",IDC_STATIC,7,127,275,59 + CONTROL "&Color:",IDC_OVERRIDE_COLOR,"Button",BS_AUTOCHECKBOX | + WS_GROUP | WS_TABSTOP,16,140,48,10 CONTROL "&O",IDC_CHOOSE_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP, - 15,186,38,12 - CONTROL "&Image",IDC_BKGRND_USE_IMAGE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,77,173,56,10 - PUSHBUTTON "Choose I&mage...",IDC_CHOOSE_BACKGROUND,180,169,62,14 - EDITTEXT IDC_BKGRND_IMAGE,77,186,166,14,ES_AUTOHSCROLL + 72,138,38,12 + CONTROL "&Image:",IDC_BKGRND_USE_IMAGE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,16,157,51,10 + EDITTEXT IDC_BKGRND_IMAGE,72,155,134,14,ES_AUTOHSCROLL + PUSHBUTTON "Choose I&mage...",IDC_CHOOSE_BACKGROUND,212,155,62,14 CONTROL "Leave image at the &original location", IDC_NO_SAVE_IMAGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 78,203,166,10 + 72,172,166,10 END -IDD_PAGE_TABLE_CELL DIALOG DISCARDABLE 0, 0, 260, 220 +IDD_PAGE_TABLE_CELL DIALOG DISCARDABLE 0, 0, 290, 190 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Cell" FONT 8, "MS Sans Serif" BEGIN - GROUPBOX "Change Selection ",IDC_STATIC,7,3,184,33 - COMBOBOX IDC_TABLE_SELECTION_TYPE,126,15,58,53,CBS_DROPDOWNLIST | + GROUPBOX "Selection ",IDC_STATIC,7,3,275,30 + COMBOBOX IDC_TABLE_SELECTION_TYPE,16,14,79,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Previous",IDC_PREVIOUS,14,15,50,14 - PUSHBUTTON "&Next",IDC_NEXT,70,15,50,14 - PUSHBUTTON "In&sert...",IDC_INSERT,200,7,52,13 - PUSHBUTTON "&Delete...",IDC_DELETE,200,24,52,13 - GROUPBOX "Size ",IDC_STATIC,7,38,245,43 - CONTROL "Column &Width:",IDC_OVERRIDE_WIDTH,"Button", - BS_AUTO3STATE | WS_TABSTOP,16,50,96,9 - EDITTEXT IDC_WIDTH,16,62,24,13 - COMBOBOX IDC_WIDTH_PIX_OR_PERCENT,43,62,76,46,CBS_DROPDOWNLIST | + PUSHBUTTON "&Previous",IDC_PREVIOUS,111,13,62,14,WS_GROUP + PUSHBUTTON "&Next",IDC_NEXT,183,13,62,14 + GROUPBOX "Size ",IDC_STATIC,7,35,275,43,WS_GROUP + CONTROL "&Width:",IDC_OVERRIDE_WIDTH,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,16,46,52,10 + EDITTEXT IDC_WIDTH,72,44,24,13 + COMBOBOX IDC_WIDTH_PIX_OR_PERCENT,100,44,74,64,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Minimum Row &Height:",IDC_OVERRIDE_HEIGHT,"Button", - BS_AUTO3STATE | WS_GROUP | WS_TABSTOP,142,50,102,9 - EDITTEXT IDC_HEIGHT,142,62,24,13 - COMBOBOX IDC_HEIGHT_PIX_OR_PERCENT,169,62,74,46,CBS_DROPDOWNLIST | + CONTROL "&Height:",IDC_OVERRIDE_HEIGHT,"Button",BS_AUTOCHECKBOX | + WS_GROUP | WS_TABSTOP,16,62,52,10 + EDITTEXT IDC_HEIGHT,72,60,24,13 + COMBOBOX IDC_HEIGHT_PIX_OR_PERCENT,100,60,74,64,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Content Alignment ",IDC_STATIC,7,84,158,46 - RTEXT "Hori&zontal:",IDC_STATIC,17,96,56,8 - COMBOBOX IDC_TABLE_CELL_ALIGN,77,94,66,77,CBS_DROPDOWNLIST | + RTEXT "Spans:",IDC_STATIC,177,46,30,8 + EDITTEXT IDC_ROWSPAN,210,44,24,13,WS_GROUP + LTEXT "rows",IDC_STATIC,235,46,39,8 + EDITTEXT IDC_COLSPAN,210,60,24,13 + LTEXT "columns",IDC_STATIC,235,62,39,8 + GROUPBOX "Content Alignment ",IDC_STATIC,7,80,138,44 + LTEXT "Hori&zontal:",IDC_STATIC,16,91,52,8 + COMBOBOX IDC_TABLE_CELL_ALIGN,72,89,66,77,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - RTEXT "&Vertical:",IDC_STATIC,13,113,60,8 - COMBOBOX IDC_TABLE_CELL_VALIGN,77,111,66,74,CBS_DROPDOWNLIST | + LTEXT "&Vertical:",IDC_STATIC,16,108,54,8 + COMBOBOX IDC_TABLE_CELL_VALIGN,72,106,66,74,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Cell Span ",IDC_STATIC,171,85,81,45 - RTEXT "Columns:",IDC_STATIC,178,96,39,8 - EDITTEXT IDC_COLSPAN,219,94,24,13 - RTEXT "Rows:",IDC_STATIC,177,113,39,8 - EDITTEXT IDC_ROWSPAN,219,111,24,13,WS_GROUP - GROUPBOX "Text Style ",IDC_STATIC,7,132,158,25 + GROUPBOX "Text Style",IDC_STATIC,151,80,131,24 CONTROL "H&eader",IDC_HEADER,"Button",BS_AUTO3STATE | WS_GROUP | - WS_TABSTOP,16,143,57,10 + WS_TABSTOP,157,90,49,10 CONTROL "Non&breaking",IDC_WRAP,"Button",BS_AUTO3STATE | - WS_GROUP | WS_TABSTOP,77,143,63,10 - PUSHBUTTON "E&xtra HTML...",IDC_EXTRA_HTML,181,141,62,14 - GROUPBOX "Background ",IDC_STATIC,7,160,245,56 - CONTROL "&Color",IDC_OVERRIDE_COLOR,"Button",BS_AUTO3STATE | - WS_GROUP | WS_TABSTOP,16,173,48,10 - CONTROL "&O",IDC_CHOOSE_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP, - 15,186,38,12 - CONTROL "&Image",IDC_BKGRND_USE_IMAGE,"Button",BS_AUTO3STATE | - WS_TABSTOP,77,173,56,10 - PUSHBUTTON "Choose I&mage...",IDC_CHOOSE_BACKGROUND,180,169,62,14 - EDITTEXT IDC_BKGRND_IMAGE,77,186,166,14,ES_AUTOHSCROLL + WS_TABSTOP,210,90,63,10 + PUSHBUTTON "E&xtra HTML...",IDC_EXTRA_HTML,210,110,64,14,WS_GROUP + GROUPBOX "Background ",IDC_STATIC,7,127,275,59,WS_GROUP + CONTROL "&Color:",IDC_OVERRIDE_COLOR,"Button",BS_AUTOCHECKBOX | + WS_GROUP | WS_TABSTOP,16,140,48,10 + CONTROL "&O",IDC_CHOOSE_COLOR,"Button",BS_OWNERDRAW | WS_GROUP | + WS_TABSTOP,72,138,38,12 + CONTROL "&Image:",IDC_BKGRND_USE_IMAGE,"Button",BS_AUTOCHECKBOX | + WS_GROUP | WS_TABSTOP,16,157,51,10 + EDITTEXT IDC_BKGRND_IMAGE,72,155,134,14,ES_AUTOHSCROLL + PUSHBUTTON "Choose I&mage...",IDC_CHOOSE_BACKGROUND,210,155,64,14, + WS_GROUP CONTROL "Leave image at the &original location", - IDC_NO_SAVE_IMAGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 78,203,166,10 + IDC_NO_SAVE_IMAGE,"Button",BS_AUTOCHECKBOX | WS_GROUP | + WS_TABSTOP,72,172,166,10 END IDD_PROPS_HRULE DIALOG DISCARDABLE 0, 0, 192, 140 @@ -793,7 +769,8 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION CAPTION "Page Title" FONT 8, "MS Sans Serif" BEGIN - LTEXT "Enter a title for the current page",IDC_STATIC,8,7,224,8 + LTEXT "Enter a title for the current page",IDC_STATIC,8,7,224, + 8 EDITTEXT IDC_DOC_TITLE,8,19,224,14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK",IDOK,98,86,62,14,WS_GROUP PUSHBUTTON "Cancel",IDCANCEL,169,86,62,14 @@ -845,7 +822,6 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,84,133,50,14 END - IDD_PASTE_SPECIAL DIALOG DISCARDABLE 0, 0, 142, 81 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Paste Special" @@ -864,12 +840,13 @@ FONT 8, "MS Sans Serif" BEGIN LTEXT "Enter number of columns for new table:",IDC_STATIC,7,7, 139,19 - EDITTEXT IDC_TABLE_COLUMNS, 50,25,25,14,ES_AUTOHSCROLL | WS_GROUP + EDITTEXT IDC_TABLE_COLUMNS,50,25,25,14,ES_AUTOHSCROLL | WS_GROUP LTEXT "columns",IDC_STATIC,81,27,65,8 DEFPUSHBUTTON "OK",IDOK,16,52,50,14,WS_GROUP PUSHBUTTON "Cancel",IDCANCEL,87,52,50,14 END + ///////////////////////////////////////////////////////////////////////////// // // DESIGNINFO @@ -894,14 +871,6 @@ BEGIN BOTTOMMARGIN, 91 END - IDD_IMAGE_ALT, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 260 - TOPMARGIN, 7 - BOTTOMMARGIN, 141 - END - IDD_PAGE_CHARACTER, DIALOG BEGIN LEFTMARGIN, 7 @@ -964,15 +933,15 @@ BEGIN IDD_PAGE_TABLE, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 252 - BOTTOMMARGIN, 216 + RIGHTMARGIN, 282 + BOTTOMMARGIN, 186 END IDD_PAGE_TABLE_CELL, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 252 - BOTTOMMARGIN, 216 + RIGHTMARGIN, 282 + BOTTOMMARGIN, 186 END IDD_PROPS_HRULE, DIALOG @@ -1138,8 +1107,8 @@ BEGIN IDS_SELECTED_CELLS_CAPTION "Selected Cells" IDS_SELECTED_ROW_CAPTION "Selected Cells in Row" IDS_SELECTED_COLUMN_CAPTION "Selected Cells in Column" - IDS_BUILT_IN " (Built-in)" - IDS_PLUGIN " (Plugin)" + IDS_BUILT_IN " (Built-in)" + IDS_PLUGIN " (Plugin)" END #endif // English (U.S.) resources diff --git a/mozilla/cmd/winfe/edtrcdll/src/resource.h b/mozilla/cmd/winfe/edtrcdll/src/resource.h index 1612f09e4d1..458844ec80c 100644 --- a/mozilla/cmd/winfe/edtrcdll/src/resource.h +++ b/mozilla/cmd/winfe/edtrcdll/src/resource.h @@ -30,7 +30,6 @@ #define IDC_FONTFACE_COMBO 213 #define IDC_AUTO_SAVE_MINUTES 214 #define IDC_PUBLISH_USER_NAME 217 -#define IDC_ALT_TEXT_LOWRES 373 #define IDC_USE_EXTERNAL_CHANGES 373 #define IDC_EXTRA_HTML 374 #define IDC_USE_INTERNAL_CHANGES 374 diff --git a/mozilla/cmd/winfe/edview2.cpp b/mozilla/cmd/winfe/edview2.cpp index b14ae704bfe..78776d6192c 100644 --- a/mozilla/cmd/winfe/edview2.cpp +++ b/mozilla/cmd/winfe/edview2.cpp @@ -1507,7 +1507,7 @@ void CNetscapeEditView::OnRButtonDown(UINT uFlags, CPoint cpPoint) if(nIDS) { // Why on earth does ID_PROPS_LINK get disabled if used here??? - cmPopup.AppendMenu(MF_ENABLED, ID_POPUP_PROPS_LINK, szLoadString(nIDS)); + cmPopup.AppendMenu(MF_ENABLED, ID_MAKE_LINK /*ID_POPUP_PROPS_LINK*/, szLoadString(nIDS)); bLinkPopup = TRUE; } diff --git a/mozilla/cmd/winfe/fenet.cpp b/mozilla/cmd/winfe/fenet.cpp index 6637d8432fe..78260ab9cde 100755 --- a/mozilla/cmd/winfe/fenet.cpp +++ b/mozilla/cmd/winfe/fenet.cpp @@ -515,8 +515,9 @@ wfe_GetSaveFileName(HWND m_hWnd, char * prompt, char * initial, int * type, char // try to guess the type if(initial) { - - if( bHtmlOnly || strcasestr(initial, "htm") || strcasestr(initial, "html")) { + BOOL bHTM = (NULL != strcasestr(initial, "htm")); + BOOL bHTML = (NULL != strcasestr(initial, "html")); + if( bHtmlOnly || bHTM || bHTML ) { /*__EDITOR__*/ // Use ".html" for 32-bit versions #ifdef XP_WIN16 @@ -524,7 +525,7 @@ wfe_GetSaveFileName(HWND m_hWnd, char * prompt, char * initial, int * type, char #else extension = "html"; #endif - if( bHtmlOnly ){ + if( bHtmlOnly && !bHTM && !bHTML ){ // This will force replacing any existing EXT with value "extension" bAppendHTML_Ext = TRUE; } diff --git a/mozilla/cmd/winfe/genframe.cpp b/mozilla/cmd/winfe/genframe.cpp index 94fe4e03067..dc4ccf2bd92 100644 --- a/mozilla/cmd/winfe/genframe.cpp +++ b/mozilla/cmd/winfe/genframe.cpp @@ -3132,7 +3132,7 @@ BOOL CGenericFrame::OnCommand(UINT wParam,LONG lParam) // Don't load into a Composer frame if within mail // TODO QUESTION: Should we even load into a Composer when within a Compose Frame? if(EDT_IS_EDITOR(pContext) && !pContext->bIsComposeWindow) - FE_LoadUrl(nodeURL, TRUE); + FE_LoadUrl(nodeURL, LOAD_URL_COMPOSER); else #endif { diff --git a/mozilla/cmd/winfe/res/editor.rc2 b/mozilla/cmd/winfe/res/editor.rc2 index 2dc9272b71a..2705e4cbc3d 100644 --- a/mozilla/cmd/winfe/res/editor.rc2 +++ b/mozilla/cmd/winfe/res/editor.rc2 @@ -235,13 +235,6 @@ BEGIN END POPUP "T&able" BEGIN - POPUP "&Align Table" - BEGIN - MENUITEM "&Left", ID_ALIGN_TABLE_LEFT - MENUITEM "&Center", ID_ALIGN_TABLE_CENTER - MENUITEM "&Right", ID_ALIGN_TABLE_RIGHT - END - MENUITEM SEPARATOR // Will be replaced with IDM_COMPOSER_TABLE_INSERTMENU MENUITEM "{&I}" ID_INSERT_TABLE // Will be replaced with IDM_COMPOSER_TABLE_DELETEMENU @@ -249,9 +242,15 @@ BEGIN // Will be replaced with IDM_COMPOSER_TABLE_SELECTMENU MENUITEM "{&S}" ID_SELECT_TABLE MENUITEM SEPARATOR - // "&Join..." + POPUP "&Align Table" + BEGIN + MENUITEM "&Left", ID_ALIGN_TABLE_LEFT + MENUITEM "&Center", ID_ALIGN_TABLE_CENTER + MENUITEM "&Right", ID_ALIGN_TABLE_RIGHT + END + MENUITEM SEPARATOR + // "&Join..." or "Spli&t Cell" MENUITEM "{&J}" ID_MERGE_TABLE_CELLS - //MENUITEM "Spli&t Cell" ID_SPLIT_TABLE_CELL // "&Convert Text To Table" or "&Convert Table To Text" MENUITEM "{&C}" ID_TABLE_TEXT_CONVERT MENUITEM SEPARATOR @@ -372,8 +371,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&HTML Source", ID_FILE_EDITSOURCE MENUITEM SEPARATOR - MENUITEM "Pr&eferences", ID_OPTIONS_PREFERENCES - // MENUITEM "&Mail and News Preferences...", ID_OPTIONS_MAILANDNEWS + MENUITEM "Pr&eferences...", ID_OPTIONS_PREFERENCES END POPUP "&View" BEGIN @@ -385,7 +383,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Reload", ID_NAVIGATE_RELOAD MENUITEM "Show &Images", ID_VIEW_LOADIMAGES - MENUITEM "Re&fresh", ID_NAVIGATE_REPAINT + MENUITEM "Refres&h", ID_NAVIGATE_REPAINT MENUITEM "&Stop Loading\t", ID_NAVIGATE_INTERRUPT MENUITEM SEPARATOR MENUITEM "Page So&urce", ID_FILE_VIEWSOURCE @@ -431,8 +429,8 @@ BEGIN MENUITEM "T&arget...", ID_INSERT_TARGET MENUITEM "&Image...", ID_INSERT_IMAGE MENUITEM "H&orizontal Line", ID_INSERT_HRULE - MENUITEM "&Table..." ID_INSERT_TABLE - MENUITEM "&HTML Tag...", ID_INSERT_TAG + MENUITEM "&Table..." ID_INSERT_TABLE + MENUITEM "&HTML Tag...", ID_INSERT_TAG MENUITEM SEPARATOR MENUITEM "&New Line Break\tShift+Enter" ID_INSERT_LINE_BREAK MENUITEM "&Break below Image(s)" ID_INSERT_BREAK_BOTH @@ -508,13 +506,6 @@ BEGIN END POPUP "T&able" BEGIN - POPUP "&Align Table" - BEGIN - MENUITEM "&Left", ID_ALIGN_TABLE_LEFT - MENUITEM "&Center", ID_ALIGN_TABLE_CENTER - MENUITEM "&Right", ID_ALIGN_TABLE_RIGHT - END - MENUITEM SEPARATOR // Will be replaced with IDM_COMPOSER_TABLE_INSERTMENU MENUITEM "{&I}" ID_INSERT_TABLE // Will be replaced with IDM_COMPOSER_TABLE_DELETEMENU @@ -522,22 +513,19 @@ BEGIN // Will be replaced with IDM_COMPOSER_TABLE_SELECTMENU MENUITEM "{&S}" ID_SELECT_TABLE MENUITEM SEPARATOR - // "&Join..." + POPUP "&Align Table" + BEGIN + MENUITEM "&Left", ID_ALIGN_TABLE_LEFT + MENUITEM "&Center", ID_ALIGN_TABLE_CENTER + MENUITEM "&Right", ID_ALIGN_TABLE_RIGHT + END + MENUITEM SEPARATOR + // "&Join..." or "Spli&t Cell" MENUITEM "{&J}" ID_MERGE_TABLE_CELLS - //MENUITEM "Spli&t Cell" ID_SPLIT_TABLE_CELL // "&Convert Text To Table" or "&Convert Table To Text" MENUITEM "{&C}" ID_TABLE_TEXT_CONVERT MENUITEM SEPARATOR MENUITEM "&Properties" ID_PROPS_TABLE -#if 0 - POPUP "&Properties" - BEGIN - MENUITEM "&Table" ID_PROPS_TABLE - MENUITEM "&Row" ID_PROPS_TABLE_ROW - MENUITEM "C&olumn" ID_PROPS_TABLE_COLUMN - MENUITEM "&Cell" ID_PROPS_TABLE_CELL - END -#endif END // Translate this menu group string and the string IDS_TOOLS_MENU(in editor.rc) identically. // The code tries to find this menu entry using the string resource. @@ -610,17 +598,8 @@ END IDM_COMPOSER_TABLE_INSERTMENU MENU DISCARDABLE BEGIN -#if 0 -// Use this for final release - MENUITEM "&Row" ID_INSERT_TABLE_ROW_ABOVE - MENUITEM "C&olumn" ID_INSERT_TABLE_COLUMN_BEFORE - MENUITEM "&Cell" ID_INSERT_TABLE_CELL_BEFORE + MENUITEM "&Table..." ID_INSERT_TABLE MENUITEM SEPARATOR - MENUITEM "C&aption" ID_INSERT_TABLE_CAPTION - MENUITEM "&More..." ID_INSERT_TABLE_MORE -#endif -//#if 0 -// Use this for debugging all possible insert modes MENUITEM "&Row Above" ID_INSERT_TABLE_ROW_ABOVE MENUITEM "Row &Below" ID_INSERT_TABLE_ROW MENUITEM SEPARATOR @@ -629,21 +608,15 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Cell Before" ID_INSERT_TABLE_CELL_BEFORE MENUITEM "C&ell After" ID_INSERT_TABLE_CELL - MENUITEM SEPARATOR - MENUITEM "C&aption" ID_INSERT_TABLE_CAPTION - MENUITEM "&More..." ID_INSERT_TABLE_MORE -//#endif END IDM_COMPOSER_TABLE_DELETEMENU MENU DISCARDABLE BEGIN + MENUITEM "&Table" ID_DELETE_TABLE MENUITEM "&Row" ID_DELETE_TABLE_ROW MENUITEM "C&olumn" ID_DELETE_TABLE_COLUMN MENUITEM "&Cell" ID_DELETE_TABLE_CELL - MENUITEM "&Table" ID_DELETE_TABLE - MENUITEM "C&aption" ID_DELETE_TABLE_CAPTION - MENUITEM "&More..." ID_DELETE_TABLE_MORE END ///////////////////////////////////////////////////////////////////////////// diff --git a/mozilla/cmd/winfe/resource.h b/mozilla/cmd/winfe/resource.h index ea1a19227a4..af3a4e15e95 100755 --- a/mozilla/cmd/winfe/resource.h +++ b/mozilla/cmd/winfe/resource.h @@ -442,7 +442,6 @@ #define IDC_BUTTON1 373 #define IDC_SHORTCUT1 373 #define IDC_USE_EXTERNAL_CHANGES 373 -#define IDC_ALT_TEXT_LOWRES 373 #define IDC_USE_INTERNAL_CHANGES 374 #define IDC_SHORTCUT2 374 #define IDC_EXTRA_HTML 374 @@ -2738,8 +2737,8 @@ #define IDS_TEXT_PROPS_CAPTION 42190 #define IDS_IMAGE_PROPS_CAPTION 42191 #define IDS_LINK_PROPS_CAPTION 42192 -#define IDS_REMOVE_LINKS_CAPTION 42192 -#define IDS_JAVA_PROPS_CAPTION 42193 +#define IDS_REMOVE_LINKS_CAPTION 42193 +#define IDS_JAVA_PROPS_CAPTION 42194 #define IDS_ERROR_READ_ONLY 42206 #define IDS_FILE_ERROR_CAPTION 42207 #define IDS_ERROR_BLOCKED 42208 @@ -2842,7 +2841,8 @@ #define IDS_SELECTED_CELLS_CAPTION 42321 #define IDS_SELECTED_ROW_CAPTION 42322 #define IDS_SELECTED_COLUMN_CAPTION 42323 -#define IDS_CHANGE_SEL_CAPTION 42324 +#define IDS_MISSING_IMAGE 42324 +#define IDS_MISSING_LINK 42325 #define ID_PROPS_TABLE 42330 #define ID_PROPS_TABLE_ROW 42331 #define ID_PROPS_TABLE_COLUMN 42332 @@ -2872,7 +2872,6 @@ #define IDS_CELL 42357 #define IDS_TABLE 42358 #define IDS_PERCENT_TABLE 42359 -#define IDS_APPLY_CELL_MSG 42360 #define IDS_SMALL_ROMAN 42363 #define ID_NAVIGATE_CONTINUE 42365 #define ID_DISPLAY_TABLES 42366