rtoss

Subversion Repositories:
Compare Path: Rev
With Path: Rev
/GreenPad/ @ 140  →  /GreenPad/ @ 141
/GreenPad/rsrc/gp_rsrc.rc
@@ -478,11 +478,11 @@
BEGIN
LTEXT "",1119,0,0,187,13,SS_SUNKEN | NOT WS_VISIBLE | NOT
WS_GROUP
LTEXT "&Charactor Encode:",IDC_STATIC,7,18,58,8
COMBOBOX IDC_CODELIST,69,16,108,103,CBS_DROPDOWNLIST | WS_VSCROLL |
LTEXT "&Character Encoding:",IDC_STATIC,6,18,70,8
COMBOBOX IDC_CODELIST,76,16,120,103,CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
LTEXT "&Line-end:",IDC_STATIC,7,37,41,8
COMBOBOX IDC_CRLFLIST,69,35,57,103,CBS_DROPDOWNLIST | WS_VSCROLL |
LTEXT "&Line ending:",IDC_STATIC,6,37,70,8
COMBOBOX IDC_CRLFLIST,76,35,60,103,CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
END
 
@@ -492,8 +492,8 @@
CAPTION "ReOpen File"
FONT 9, "MS Sans Serif"
BEGIN
LTEXT "&Charactor Encode:",IDC_STATIC,9,13,54,8
COMBOBOX IDC_CODELIST,72,11,105,103,CBS_DROPDOWNLIST | WS_VSCROLL |
LTEXT "&Character Encoding:",IDC_STATIC,4,13,68,8
COMBOBOX IDC_CODELIST,70,11,112,103,CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
PUSHBUTTON "OK",IDOK,66,32,56,14
PUSHBUTTON "Cancel",IDCANCEL,125,32,56,14
@@ -505,8 +505,8 @@
BEGIN
LTEXT "",1119,0,0,187,13,SS_SUNKEN | NOT WS_VISIBLE | NOT
WS_GROUP
LTEXT "&Charactor Encode:",IDC_STATIC,7,18,54,8
COMBOBOX IDC_CODELIST,66,16,111,103,CBS_DROPDOWNLIST | WS_VSCROLL |
LTEXT "&Character Encoding:",IDC_STATIC,4,18,68,8
COMBOBOX IDC_CODELIST,76,16,120,103,CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
END
 
/GreenPad/rsrc/FILEOPEN.DLG
@@ -33,79 +33,7 @@
#define LBS_DISABLENOSCROLL 0x1000L
#define IDC_STATIC -1
 
 
 
 
//
// New File Open and Save As Dialogs.
//
 
NEWFILEOPENORD DIALOG DISCARDABLE 0, 0, 280, 164
STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU | DS_CONTEXTHELP | WS_CLIPCHILDREN
CAPTION "Open"
FONT 9, "System"
BEGIN
LTEXT "Look &in:", stc4, 7, 6, 27, 8, SS_NOTIFY
COMBOBOX cmb2, 36, 3, 138, 300,
CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
WS_VSCROLL | WS_TABSTOP
 
LTEXT "", stc1, 172, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE
LISTBOX lst1, 4, 20, 272, 85,
LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN |
WS_HSCROLL | NOT WS_VISIBLE
 
LTEXT "File &name:", stc3, 5, 112, 48, 8, SS_NOTIFY
EDITTEXT edt1, 54, 111, 155, 12, ES_AUTOHSCROLL
 
LTEXT "Files of &type:", stc2, 5, 131, 48, 8, SS_NOTIFY
COMBOBOX cmb1, 54, 129, 155, 100,
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 
AUTOCHECKBOX "Open as &read-only", chx1, 54, 148, 74, 10, WS_TABSTOP
 
DEFPUSHBUTTON "&Open", IDOK, 222, 110, 50, 14
PUSHBUTTON "Cancel", IDCANCEL, 222, 128, 50, 14
PUSHBUTTON "&Help", pshHelp, 222, 145, 50, 14
END
 
 
 
NEWOBJECTOPENORD DIALOG DISCARDABLE 0, 0, 280, 164
STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU | DS_CONTEXTHELP | WS_CLIPCHILDREN
CAPTION "Open"
FONT 9, "System"
BEGIN
LTEXT "Look &in:", stc4, 7, 6, 27, 8, SS_NOTIFY
COMBOBOX cmb2, 36, 3, 138, 300,
CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
WS_VSCROLL | WS_TABSTOP
 
LTEXT "", stc1, 172, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE
LISTBOX lst1, 4, 20, 272, 85,
LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN |
WS_HSCROLL | NOT WS_VISIBLE
 
LTEXT "Object &name:", stc3, 5, 112, 54, 8, SS_NOTIFY
EDITTEXT edt1, 60, 111, 149, 12, ES_AUTOHSCROLL
 
LTEXT "Objects of &type:", stc2, 5, 131, 54, 8, SS_NOTIFY
COMBOBOX cmb1, 60, 129, 149, 100,
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 
AUTOCHECKBOX "Open as &read-only", chx1, 60, 148, 74, 10, WS_TABSTOP
 
DEFPUSHBUTTON "&Open", IDOK, 222, 110, 50, 14
PUSHBUTTON "Cancel", IDCANCEL, 222, 128, 50, 14
PUSHBUTTON "&Help", pshHelp, 222, 145, 50, 14
END
 
 
 
 
//
// Old File Open and Save As Dialogs.
//
 
@@ -144,47 +72,11 @@
 
PUSHBUTTON "&Help", pshHelp, 212, 46, 50, 14, WS_GROUP
AUTOCHECKBOX "&Read only", chx1, 212, 68, 50, 12, WS_TABSTOP | WS_GROUP
LTEXT "&Charactor Encode:",IDC_STATIC,6,131,80,8
LTEXT "&Character Encoding:",IDC_STATIC,6,131,100,8
COMBOBOX IDC_CODELIST,6,140,126,103,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "&Line-end:",IDC_STATIC,142,131,38,8
LTEXT "&Line ending:",IDC_STATIC,142,131,56,8
COMBOBOX IDC_CRLFLIST,141,140,67,103,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
END
 
 
 
MULTIFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 268, 134
STYLE WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_MODALFRAME |
DS_CONTEXTHELP | DS_3DLOOK
CAPTION "Open"
FONT 9, "System"
BEGIN
LTEXT "File &name:", stc3, 6, 6, 76, 9
EDITTEXT edt1, 6, 16, 90, 12,
ES_AUTOHSCROLL | WS_TABSTOP | ES_OEMCONVERT
LISTBOX lst1, 6, 32, 90, 68,
LBS_SORT | LBS_NOTIFY | LBS_DISABLENOSCROLL | WS_VSCROLL |
WS_TABSTOP | LBS_EXTENDEDSEL | LBS_HASSTRINGS |
LBS_OWNERDRAWFIXED
 
LTEXT "&Folders:", -1, 110, 6, 96, 9
LTEXT "", stc1, 110, 16, 96, 9, SS_NOPREFIX
LISTBOX lst2, 110, 32, 96, 68,
LBS_SORT | LBS_HASSTRINGS | LBS_NOTIFY |
LBS_DISABLENOSCROLL | WS_VSCROLL |
WS_TABSTOP | LBS_OWNERDRAWFIXED
 
LTEXT "List files of &type:", stc2, 6, 104, 90, 9
COMBOBOX cmb1, 6, 114, 90, 96,
CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
 
LTEXT "Dri&ves:", stc4, 110, 104, 96, 9
COMBOBOX cmb2, 110, 114, 96, 68,
CBS_SORT | CBS_HASSTRINGS | CBS_OWNERDRAWFIXED |
CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
 
DEFPUSHBUTTON "OK", IDOK, 212, 6, 50, 14, WS_GROUP
PUSHBUTTON "Cancel", IDCANCEL, 212, 24, 50, 14, WS_GROUP
 
PUSHBUTTON "&Help", pshHelp, 212, 46, 50, 14, WS_GROUP
AUTOCHECKBOX "&Read only", chx1, 212, 68, 50, 12, WS_TABSTOP | WS_GROUP
END
/GreenPad/kilib/textfile.cpp
@@ -441,7 +441,7 @@
 
void Skip() { fb+=skip; skip=0; }
bool Eof() { return fb==fe; }
uchar GetChar() { return *(fb+(skip++)); }
uchar GetChar() { return fb+skip>fe ? 0 : *(fb+(skip++)); }
unicode PeekC()
{
c = GetChar();
@@ -527,7 +527,17 @@
Skip();
return PeekC();
}
else
{
Skip();
return PeekC();
}
}
else
{
Skip();
return PeekC();
}
}
};