mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

More Composer bug fixes: Removed password remembering from Publish dialog and removed pixel to % conversion for table and cell widths

This commit is contained in:
cmanske%netscape.com 1998-09-29 23:50:44 +00:00
Родитель 191c84a963
Коммит fb2c9d7db8
7 изменённых файлов: 15 добавлений и 107 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
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;

1
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

92
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);
m_iWidthType = ((CComboBox*)GetDlgItem(IDC_WIDTH_PIX_OR_PERCENT))->GetCurSel();
SetModified(TRUE);
}
m_iWidthType = iWidthType;
}
}
@ -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);
m_iHeightType = ((CComboBox*)GetDlgItem(IDC_HEIGHT_PIX_OR_PERCENT))->GetCurSel();
SetModified(TRUE);
}
m_iHeightType = iHeightType;
}
}
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);
m_iWidthType = ((CComboBox*)GetDlgItem(IDC_WIDTH_PIX_OR_PERCENT))->GetCurSel();
SetModified(TRUE);
}
m_iWidthType = iWidthType;
}
}
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);
m_iHeightType = ((CComboBox*)GetDlgItem(IDC_HEIGHT_PIX_OR_PERCENT))->GetCurSel();
SetModified(TRUE);
}
m_iHeightType = iHeightType;
}
}
void CTableCellPage::OnOverrideColor()

3
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 |

2
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

4
cmd/winfe/edview.cpp
Просмотреть файл

@ -3407,7 +3407,9 @@ void CNetscapeEditView::OnPublish()
dlg.m_pFullLocation,
bKeepImages,
bKeepLinks,
dlg.m_bRememberPassword);
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);

4
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