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

#123601 - ask users for page title before saving. Also tweaked at the composer encoding dialog code so the menu item would reflect encoding changes correctly

This commit is contained in:
clu%netscape.com 1998-09-11 22:19:39 +00:00
Родитель e6f2c6f8c1
Коммит 05853e57b0
1 изменённых файлов: 6 добавлений и 3 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

9
cmd/macfe/Composer/CEditView.cp
Просмотреть файл

@ -63,7 +63,7 @@
#include <LGAPopup.h> #include <LGAPopup.h>
//#define PROFILE // clu //#define PROFILE 1
#ifdef PROFILE #ifdef PROFILE
#include <profiler.h> #include <profiler.h>
extern void ProfileStart(); extern void ProfileStart();
@ -490,6 +490,7 @@ Bool CEditView::SaveDocumentAs()
if ( pagedata->pTitle ) if ( pagedata->pTitle )
{ {
EDT_SetPageData( *GetContext(), pagedata ); EDT_SetPageData( *GetContext(), pagedata );
CEditDialog::Start( EDITDLG_PAGE_TITLE, *GetContext() );
/* set to NULL since we didn't malloc this data & don't want it freed in EDT_FreePageData */ /* set to NULL since we didn't malloc this data & don't want it freed in EDT_FreePageData */
pagedata->pTitle = NULL; pagedata->pTitle = NULL;
} }
@ -1198,7 +1199,7 @@ Boolean CEditView::HandleKeyPress( const EventRecord& inKeyEvent )
while ( ::EventAvail( everyEvent, &currEvent ) ) while ( ::EventAvail( everyEvent, &currEvent ) )
{ {
if ( currEvent.what == autoKey || ( (currEvent.what == keyDown) // its a backspace-keydown if ( currEvent.what == autoKey || ( currEvent.what == keyDown // its a backspace-keydown
&& !((cmdKey | optionKey | controlKey) & currEvent.modifiers) // with no modKeys except maybe shift && !((cmdKey | optionKey | controlKey) & currEvent.modifiers) // with no modKeys except maybe shift
&& ( (static_cast<Uchar>(currEvent.message & charCodeMask)) == char_Backspace ) ) ) && ( (static_cast<Uchar>(currEvent.message & charCodeMask)) == char_Backspace ) ) )
++count; ++count;
@ -4144,8 +4145,10 @@ Boolean CEditView::ObeyCommand( CommandT inCommand, void *ioParam )
} }
else if (inCommand >= ENCODING_BASE && inCommand < ENCODING_CEILING) // FindCommandStatus for encoding is handled in the parent class - CHTMLView else if (inCommand >= ENCODING_BASE && inCommand < ENCODING_CEILING) // FindCommandStatus for encoding is handled in the parent class - CHTMLView
{ {
FLUSH_JAPANESE_TEXT
int16 csid = CPrefs::CmdNumToDocCsid( inCommand ); int16 csid = CPrefs::CmdNumToDocCsid( inCommand );
EDT_SetEncoding ( *GetContext(), csid ); if ( !EDT_SetEncoding ( *GetContext(), csid ) ) return true;
// if EDT_SetEncoding returns false, we are done - don't go to the switch statement
} }
switch ( inCommand ) switch ( inCommand )