Fixed GetOpenFileName and GetSaveFileName dialogs.
Fixed Print dialog and introduced PrinterSetup dialog. Fixed PageSetup dialog: values are now correctly initialized (had to change all *.rc files) Preliminary file drag and drop support.
This commit is contained in:
Marcel Baur
Alexandre Julliard
parent
97d2b92a78
commit
a43295d1ec
|
|
@ -46,7 +46,9 @@
|
|||
#define MENU_INFO_NO_WARRANTY "&NO WARRANTY"
|
||||
#define MENU_INFO_ABOUT_WINE "&Om WINE"
|
||||
|
||||
|
||||
/* Dialogs */
|
||||
|
||||
#define DIALOG_OK "OK"
|
||||
#define DIALOG_CANCEL "Annuller"
|
||||
#define DIALOG_BROWSE "&Gennemse..."
|
||||
|
|
@ -63,6 +65,14 @@
|
|||
|
||||
|
||||
/* Strings */
|
||||
|
||||
#define STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */
|
||||
#define STRING_PAGESETUP_FOOTERVALUE "Page &s" /* FIXME */
|
||||
#define STRING_PAGESETUP_LEFTVALUE "20 mm" /* FIXME */
|
||||
#define STRING_PAGESETUP_RIGHTVALUE "20 mm" /* FIXME */
|
||||
#define STRING_PAGESETUP_TOPVALUE "25 mm" /* FIXME */
|
||||
#define STRING_PAGESETUP_BOTTOMVALUE "25 mm" /* FIXME */
|
||||
|
||||
#define STRING_NOTEPAD "Notesblok"
|
||||
#define STRING_ERROR "FEJL"
|
||||
#define STRING_WARNING "ADVARSEL"
|
||||
|
|
@ -86,6 +96,3 @@ denne operation. \nAfslut et eller flere aktive programmer for at frig
|
|||
hukommelse, og prøv så igen."
|
||||
|
||||
#include "notepad.rc"
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,15 @@
|
|||
/*
|
||||
* Notepad (German resources)
|
||||
*
|
||||
* Copyright 1997 Marcel Baur <mbaur@g26.ethz.ch>
|
||||
* Copyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>
|
||||
* To be distributed under the Wine License
|
||||
*/
|
||||
|
||||
#define LANGUAGE_ID De
|
||||
#define LANGUAGE_NUMBER 2
|
||||
#define LANGUAGE_MENU_ITEM "&Deutsch"
|
||||
|
||||
|
||||
/* Menu */
|
||||
|
||||
#define MENU_FILE "&Datei"
|
||||
|
|
@ -65,6 +67,14 @@
|
|||
|
||||
|
||||
/* Strings */
|
||||
|
||||
#define STRING_PAGESETUP_HEADERVALUE "&n"
|
||||
#define STRING_PAGESETUP_FOOTERVALUE "Page &s"
|
||||
#define STRING_PAGESETUP_LEFTVALUE "20 mm"
|
||||
#define STRING_PAGESETUP_RIGHTVALUE "20 mm"
|
||||
#define STRING_PAGESETUP_TOPVALUE "25 mm"
|
||||
#define STRING_PAGESETUP_BOTTOMVALUE "25 mm"
|
||||
|
||||
#define STRING_NOTEPAD "Editor"
|
||||
#define STRING_ERROR "FEHLER"
|
||||
#define STRING_WARNING "ACHTUNG"
|
||||
|
|
@ -89,3 +99,5 @@ um diese Funktion \nabzuschlie
|
|||
\nAnwendungen, um den verfügbaren Arbeitsspeicher zu \nerhöhen."
|
||||
|
||||
#include "notepad.rc"
|
||||
|
||||
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* Notepad (English resources)
|
||||
*
|
||||
* Copyright 1997 Marcel Baur <mbaur@g26.ethz.ch>
|
||||
* Copyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>
|
||||
* Proofread 1998 by David Lee Lambert <lamber45@egr.msu.edu>
|
||||
*/
|
||||
|
||||
|
|
@ -9,6 +9,7 @@
|
|||
#define LANGUAGE_NUMBER 0
|
||||
#define LANGUAGE_MENU_ITEM "&English"
|
||||
|
||||
|
||||
/* Menu */
|
||||
|
||||
#define MENU_FILE "&File"
|
||||
|
|
@ -47,6 +48,7 @@
|
|||
#define MENU_INFO_NO_WARRANTY "&NO WARRANTY"
|
||||
#define MENU_INFO_ABOUT_WINE "&About Wine"
|
||||
|
||||
|
||||
/* Dialogs */
|
||||
|
||||
#define DIALOG_OK "OK"
|
||||
|
|
@ -65,6 +67,14 @@
|
|||
|
||||
|
||||
/* Strings */
|
||||
|
||||
#define STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */
|
||||
#define STRING_PAGESETUP_FOOTERVALUE "Page &s" /* FIXME */
|
||||
#define STRING_PAGESETUP_LEFTVALUE "20 mm" /* FIXME */
|
||||
#define STRING_PAGESETUP_RIGHTVALUE "20 mm" /* FIXME */
|
||||
#define STRING_PAGESETUP_TOPVALUE "25 mm" /* FIXME */
|
||||
#define STRING_PAGESETUP_BOTTOMVALUE "25 mm" /* FIXME */
|
||||
|
||||
#define STRING_NOTEPAD "Notepad"
|
||||
#define STRING_ERROR "ERROR"
|
||||
#define STRING_WARNING "WARNING"
|
||||
|
|
@ -88,8 +98,3 @@ task. \nClose one or more applications to increase the amount of \nfree \
|
|||
memory."
|
||||
|
||||
#include "notepad.rc"
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* Notepad (French resources)
|
||||
*
|
||||
* Copyright 1997 Marcel Baur <mbaur@g26.ethz.ch>
|
||||
* Copyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>
|
||||
* Translation by Laurent Buffler <laurent@bluewin.ch>
|
||||
*/
|
||||
|
||||
|
|
@ -9,6 +9,7 @@
|
|||
#define LANGUAGE_NUMBER 3
|
||||
#define LANGUAGE_MENU_ITEM "&Français"
|
||||
|
||||
|
||||
/* Menu */
|
||||
|
||||
#define MENU_FILE "&Fichier"
|
||||
|
|
@ -47,6 +48,7 @@
|
|||
#define MENU_INFO_NO_WARRANTY "&SANS GARANTIE"
|
||||
#define MENU_INFO_ABOUT_WINE "&A propos de Wine"
|
||||
|
||||
|
||||
/* Dialogs */
|
||||
|
||||
#define DIALOG_OK "OK"
|
||||
|
|
@ -65,6 +67,14 @@
|
|||
|
||||
|
||||
/* Strings */
|
||||
|
||||
#define STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */
|
||||
#define STRING_PAGESETUP_FOOTERVALUE "Page &s" /* FIXME */
|
||||
#define STRING_PAGESETUP_LEFTVALUE "20 mm" /* FIXME */
|
||||
#define STRING_PAGESETUP_RIGHTVALUE "20 mm" /* FIXME */
|
||||
#define STRING_PAGESETUP_TOPVALUE "25 mm" /* FIXME */
|
||||
#define STRING_PAGESETUP_BOTTOMVALUE "25 mm" /* FIXME */
|
||||
|
||||
#define STRING_NOTEPAD "Notepad"
|
||||
#define STRING_ERROR "ERREUR"
|
||||
#define STRING_WARNING "AVERTISSEMENT"
|
||||
|
|
@ -88,3 +98,6 @@ Veuillez utiliser un autre
|
|||
de la mémoire."
|
||||
|
||||
#include "notepad.rc"
|
||||
|
||||
/* Strings */
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* Notepad (Swedish resources)
|
||||
*
|
||||
* Copyright 1997 Marcel Baur <mbaur@g26.ethz.ch>
|
||||
* Copyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>
|
||||
* Swedish language by Karl Backström <karl_b@geocities.com>
|
||||
*/
|
||||
|
||||
|
|
@ -9,6 +9,7 @@
|
|||
#define LANGUAGE_NUMBER 1d
|
||||
#define LANGUAGE_MENU_ITEM "&Svenska"
|
||||
|
||||
|
||||
/* Menu */
|
||||
|
||||
#define MENU_FILE "&Arkiv"
|
||||
|
|
@ -47,6 +48,7 @@
|
|||
#define MENU_INFO_NO_WARRANTY "&INGEN GARANTI"
|
||||
#define MENU_INFO_ABOUT_WINE "&Om Wine"
|
||||
|
||||
|
||||
/* Dialogs */
|
||||
|
||||
#define DIALOG_OK "OK"
|
||||
|
|
@ -65,6 +67,14 @@
|
|||
|
||||
|
||||
/* Strings */
|
||||
|
||||
#define STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */
|
||||
#define STRING_PAGESETUP_FOOTERVALUE "Page &s" /* FIXME */
|
||||
#define STRING_PAGESETUP_LEFTVALUE "20 mm" /* FIXME */
|
||||
#define STRING_PAGESETUP_RIGHTVALUE "20 mm" /* FIXME */
|
||||
#define STRING_PAGESETUP_TOPVALUE "25 mm" /* FIXME */
|
||||
#define STRING_PAGESETUP_BOTTOMVALUE "25 mm" /* FIXME */
|
||||
|
||||
#define STRING_NOTEPAD "Anteckningar"
|
||||
#define STRING_ERROR "FEL"
|
||||
#define STRING_WARNING "VARNING"
|
||||
|
|
|
|||
|
|
@ -7,9 +7,4 @@
|
|||
- Notepad segfaults when selecting "Find" button in "Search" dialog.
|
||||
This is probably a problem related to Winelib.
|
||||
|
||||
- Page Setup dialog box should exchange strings with the corresponding
|
||||
Globals.szMargin???-strings (needed to evaluate strings when printing)
|
||||
|
||||
- Fields in "Page Setup" dialog box should be initialized.
|
||||
|
||||
- create new *.rc files for all languages you know.
|
||||
|
|
|
|||
|
|
@ -1,23 +1,27 @@
|
|||
/*
|
||||
* Notepad
|
||||
* Notepad (dialog.c)
|
||||
*
|
||||
* Copyright 1998 Marcel Baur <mbaur@g26.ethz.ch>
|
||||
* To be distributed under the Wine License
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include "windows.h"
|
||||
#include "commdlg.h"
|
||||
#include "winnls.h"
|
||||
#include "winerror.h"
|
||||
#include <windows.h>
|
||||
#include <commdlg.h>
|
||||
#include <winerror.h>
|
||||
|
||||
#ifdef WINELIB
|
||||
#include "shell.h"
|
||||
#include "options.h"
|
||||
#endif
|
||||
|
||||
#include "main.h"
|
||||
#include "license.h"
|
||||
#include "language.h"
|
||||
#include "dialog.h"
|
||||
|
||||
#include "version.h"
|
||||
#include "winnls.h"
|
||||
#include "debug.h"
|
||||
|
||||
|
||||
|
|
@ -42,7 +46,7 @@ void AlertFileNotFound(LPCSTR szFilename) {
|
|||
|
||||
int nResult;
|
||||
|
||||
nResult = AlertIDS(IDS_NOTFOUND, IDS_ERROR, 0);
|
||||
nResult = AlertIDS(IDS_NOTFOUND, IDS_ERROR, MB_ICONEXCLAMATION);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -50,7 +54,7 @@ VOID AlertOutOfMemory(void) {
|
|||
|
||||
int nResult;
|
||||
|
||||
nResult = AlertIDS(IDS_OUT_OF_MEMORY, IDS_ERROR, 0);
|
||||
nResult = AlertIDS(IDS_OUT_OF_MEMORY, IDS_ERROR, MB_ICONEXCLAMATION);
|
||||
PostQuitMessage(1);
|
||||
}
|
||||
|
||||
|
|
@ -60,10 +64,10 @@ BOOL ExistFile(LPCSTR szFilename) {
|
|||
* Returns: TRUE - if "szFileName" exists
|
||||
* FALSE - if it does not
|
||||
*/
|
||||
WIN32_FIND_DATA32A entry;
|
||||
WIN32_FIND_DATA entry;
|
||||
HANDLE32 handle;
|
||||
|
||||
handle = FindFirstFile32A(szFilename, &entry);
|
||||
handle = FindFirstFile(szFilename, &entry);
|
||||
|
||||
return (handle!=INVALID_HANDLE_VALUE32);
|
||||
}
|
||||
|
|
@ -91,6 +95,9 @@ BOOL DoCloseFile(void) {
|
|||
// FIXME: The following resources are not yet in the .rc files
|
||||
// szMessage, szCaption show up random values. Please keep these lines!
|
||||
|
||||
strcpy(szMessage, "Save changes ?");
|
||||
strcpy(szCaption, "Save changes");
|
||||
|
||||
// LoadString(Globals.hInstance, ids_savechanges, szMessage, sizeof(szMessage));
|
||||
// LoadString(Globals.hInstance, ids_savetitle, szCaption, sizeof(szCaption));
|
||||
|
||||
|
|
@ -99,7 +106,9 @@ BOOL DoCloseFile(void) {
|
|||
switch (nResult) {
|
||||
case IDYES: DoSaveFile();
|
||||
break;
|
||||
|
||||
case IDNO: break;
|
||||
|
||||
case IDCANCEL: return(FALSE);
|
||||
break;
|
||||
|
||||
|
|
@ -111,8 +120,7 @@ BOOL DoCloseFile(void) {
|
|||
}
|
||||
|
||||
// Forget file name
|
||||
|
||||
lstrcpyn(Globals.szFileName, "\0", 1);
|
||||
lstrcpy(Globals.szFileName, "");
|
||||
LANGUAGE_UpdateWindowCaption();
|
||||
|
||||
return(TRUE);
|
||||
|
|
@ -126,7 +134,7 @@ void DoOpenFile(LPCSTR szFileName) {
|
|||
if (DoCloseFile) {
|
||||
|
||||
// Open file
|
||||
lstrcpyn(Globals.szFileName, szFileName, strlen(szFileName)+1);
|
||||
lstrcpy(Globals.szFileName, szFileName);
|
||||
LANGUAGE_UpdateWindowCaption();
|
||||
|
||||
}
|
||||
|
|
@ -151,8 +159,11 @@ VOID DIALOG_FileOpen(VOID)
|
|||
CHAR szPath[MAX_PATHNAME_LEN];
|
||||
CHAR szDir[MAX_PATHNAME_LEN];
|
||||
CHAR szzFilter[2 * MAX_STRING_LEN + 100];
|
||||
CHAR szDefaultExt[4];
|
||||
LPSTR p = szzFilter;
|
||||
|
||||
lstrcpy(szDefaultExt, "txt");
|
||||
|
||||
LoadString(Globals.hInstance, IDS_TEXT_FILES_TXT, p, MAX_STRING_LEN);
|
||||
p += strlen(p) + 1;
|
||||
lstrcpy(p, "*.txt");
|
||||
|
|
@ -163,9 +174,10 @@ VOID DIALOG_FileOpen(VOID)
|
|||
p += strlen(p) + 1;
|
||||
*p = '\0';
|
||||
|
||||
GetWindowsDirectory(szDir, sizeof(szDir));
|
||||
GetCurrentDirectory(sizeof(szDir), szDir);
|
||||
lstrcpy(szPath,"*.txt");
|
||||
|
||||
openfilename.lStructSize = sizeof(openfilename);
|
||||
openfilename.lStructSize = sizeof(OPENFILENAME);
|
||||
openfilename.hwndOwner = Globals.hMainWnd;
|
||||
openfilename.hInstance = Globals.hInstance;
|
||||
openfilename.lpstrFilter = szzFilter;
|
||||
|
|
@ -178,10 +190,10 @@ VOID DIALOG_FileOpen(VOID)
|
|||
openfilename.nMaxFileTitle = 0;
|
||||
openfilename.lpstrInitialDir = szDir;
|
||||
openfilename.lpstrTitle = 0;
|
||||
openfilename.Flags = 0;
|
||||
openfilename.Flags = OFN_FILEMUSTEXIST + OFN_PATHMUSTEXIST;
|
||||
openfilename.nFileOffset = 0;
|
||||
openfilename.nFileExtension = 0;
|
||||
openfilename.lpstrDefExt = 0;
|
||||
openfilename.lpstrDefExt = szDefaultExt;
|
||||
openfilename.lCustData = 0;
|
||||
openfilename.lpfnHook = 0;
|
||||
openfilename.lpTemplateName = 0;
|
||||
|
|
@ -194,7 +206,6 @@ VOID DIALOG_FileOpen(VOID)
|
|||
AlertFileNotFound(openfilename.lpstrFile);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
VOID DIALOG_FileSave(VOID)
|
||||
|
|
@ -207,9 +218,13 @@ VOID DIALOG_FileSaveAs(VOID)
|
|||
OPENFILENAME saveas;
|
||||
CHAR szPath[MAX_PATHNAME_LEN];
|
||||
CHAR szDir[MAX_PATHNAME_LEN];
|
||||
CHAR szDefaultExt[4];
|
||||
CHAR szzFilter[2 * MAX_STRING_LEN + 100];
|
||||
|
||||
LPSTR p = szzFilter;
|
||||
|
||||
lstrcpy(szDefaultExt, "txt");
|
||||
|
||||
LoadString(Globals.hInstance, IDS_TEXT_FILES_TXT, p, MAX_STRING_LEN);
|
||||
p += strlen(p) + 1;
|
||||
lstrcpy(p, "*.txt");
|
||||
|
|
@ -220,9 +235,11 @@ VOID DIALOG_FileSaveAs(VOID)
|
|||
p += strlen(p) + 1;
|
||||
*p = '\0';
|
||||
|
||||
GetWindowsDirectory(szDir, sizeof(szDir));
|
||||
lstrcpy(szPath,"*.*");
|
||||
|
||||
saveas.lStructSize = 0;
|
||||
GetCurrentDirectory(sizeof(szDir), szDir);
|
||||
|
||||
saveas.lStructSize = sizeof(OPENFILENAME);
|
||||
saveas.hwndOwner = Globals.hMainWnd;
|
||||
saveas.hInstance = Globals.hInstance;
|
||||
saveas.lpstrFilter = szzFilter;
|
||||
|
|
@ -235,17 +252,16 @@ VOID DIALOG_FileSaveAs(VOID)
|
|||
saveas.nMaxFileTitle = 0;
|
||||
saveas.lpstrInitialDir = szDir;
|
||||
saveas.lpstrTitle = 0;
|
||||
saveas.Flags = 0;
|
||||
saveas.Flags = OFN_PATHMUSTEXIST + OFN_OVERWRITEPROMPT + OFN_HIDEREADONLY;
|
||||
saveas.nFileOffset = 0;
|
||||
saveas.nFileExtension = 0;
|
||||
saveas.lpstrDefExt = 0;
|
||||
saveas.lpstrDefExt = szDefaultExt;
|
||||
saveas.lCustData = 0;
|
||||
saveas.lpfnHook = 0;
|
||||
saveas.lpTemplateName = 0;
|
||||
|
||||
if (GetSaveFileName(&saveas)) {
|
||||
lstrcpyn(Globals.szFileName, saveas.lpstrFile,
|
||||
strlen(saveas.lpstrFile)+1);
|
||||
lstrcpy(Globals.szFileName, saveas.lpstrFile);
|
||||
LANGUAGE_UpdateWindowCaption();
|
||||
DIALOG_FileSave();
|
||||
}
|
||||
|
|
@ -254,7 +270,7 @@ VOID DIALOG_FileSaveAs(VOID)
|
|||
VOID DIALOG_FilePrint(VOID)
|
||||
{
|
||||
PRINTDLG printer;
|
||||
printer.lStructSize = sizeof(printer);
|
||||
printer.lStructSize = sizeof(PRINTDLG);
|
||||
printer.hwndOwner = Globals.hMainWnd;
|
||||
printer.hInstance = Globals.hInstance;
|
||||
printer.hDevMode = 0;
|
||||
|
|
@ -265,7 +281,7 @@ VOID DIALOG_FilePrint(VOID)
|
|||
printer.nToPage = 0;
|
||||
printer.nMinPage = 0;
|
||||
printer.nMaxPage = 0;
|
||||
printer.nCopies = 0;
|
||||
printer.nCopies = 1;
|
||||
printer.lCustData = 0;
|
||||
printer.lpfnPrintHook = 0;
|
||||
printer.lpfnSetupHook = 0;
|
||||
|
|
@ -274,7 +290,7 @@ VOID DIALOG_FilePrint(VOID)
|
|||
printer.hPrintTemplate = 0;
|
||||
printer.hSetupTemplate = 0;
|
||||
|
||||
if (PrintDlg16(&printer)) {
|
||||
if (PrintDlg(&printer)) {
|
||||
// do nothing
|
||||
};
|
||||
}
|
||||
|
|
@ -286,7 +302,31 @@ VOID DIALOG_FilePageSetup(VOID)
|
|||
|
||||
VOID DIALOG_FilePrinterSetup(VOID)
|
||||
{
|
||||
fprintf(stderr, "FilePrinterSetup()\n");
|
||||
PRINTDLG printer;
|
||||
printer.lStructSize = sizeof(PRINTDLG);
|
||||
printer.hwndOwner = Globals.hMainWnd;
|
||||
printer.hInstance = Globals.hInstance;
|
||||
printer.hDevMode = 0;
|
||||
printer.hDevNames = 0;
|
||||
printer.hDC = 0;
|
||||
printer.Flags = PD_PRINTSETUP;
|
||||
printer.nFromPage = 0;
|
||||
printer.nToPage = 0;
|
||||
printer.nMinPage = 0;
|
||||
printer.nMaxPage = 0;
|
||||
printer.nCopies = 1;
|
||||
printer.lCustData = 0;
|
||||
printer.lpfnPrintHook = 0;
|
||||
printer.lpfnSetupHook = 0;
|
||||
printer.lpPrintTemplateName = 0;
|
||||
printer.lpSetupTemplateName = 0;
|
||||
printer.hPrintTemplate = 0;
|
||||
printer.hSetupTemplate = 0;
|
||||
|
||||
if (PrintDlg(&printer)) {
|
||||
// do nothing
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
VOID DIALOG_FileExit(VOID)
|
||||
|
|
@ -341,27 +381,36 @@ VOID DIALOG_EditWrap(VOID)
|
|||
VOID DIALOG_Search(VOID)
|
||||
{
|
||||
FINDREPLACE find;
|
||||
CHAR szFind[MAX_PATHNAME_LEN];
|
||||
CHAR szFind[MAX_PATHNAME_LEN+10];
|
||||
CHAR szReplace[MAX_PATHNAME_LEN+10];
|
||||
|
||||
lstrcpyn(szFind, Globals.szFindText, strlen(Globals.szFindText)+1);
|
||||
HWND hResult;
|
||||
|
||||
find.lStructSize = sizeof(find);
|
||||
lstrcpy(szReplace, "");
|
||||
lstrcpy(szFind, Globals.szFindText);
|
||||
|
||||
find.lStructSize = sizeof(FINDREPLACE);
|
||||
find.hwndOwner = Globals.hMainWnd;
|
||||
find.hInstance = Globals.hInstance;
|
||||
find.hInstance = 0;
|
||||
find.lpstrFindWhat = szFind;
|
||||
find.wFindWhatLen = sizeof(szFind);
|
||||
find.Flags = 0;
|
||||
find.wFindWhatLen = MAX_PATHNAME_LEN;
|
||||
find.lpstrReplaceWith = szReplace;
|
||||
find.wReplaceWithLen = MAX_PATHNAME_LEN;
|
||||
find.Flags = FR_DOWN;
|
||||
find.lCustData = 0;
|
||||
find.lpfnHook = 0;
|
||||
find.lpTemplateName = 0;
|
||||
|
||||
if (FindText(&find)) {
|
||||
lstrcpyn(Globals.szFindText, szFind, strlen(szFind)+1);
|
||||
hResult = FindText(&find);
|
||||
|
||||
if (hResult) {
|
||||
lstrcpy(Globals.szFindText, szFind);
|
||||
}
|
||||
else
|
||||
{
|
||||
// do nothing yet
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
VOID DIALOG_SearchNext(VOID)
|
||||
|
|
@ -406,7 +455,9 @@ VOID DIALOG_HelpAboutWine(VOID)
|
|||
|
||||
VOID DIALOG_PageSetup(VOID)
|
||||
{
|
||||
WNDPROC lpfnDlg = MakeProcInstance(DIALOG_PAGESETUP_DlgProc, Globals.hInstance);
|
||||
WNDPROC lpfnDlg;
|
||||
|
||||
lpfnDlg = MakeProcInstance(DIALOG_PAGESETUP_DlgProc, Globals.hInstance);
|
||||
DialogBox(Globals.hInstance, STRING_PAGESETUP_Xx, Globals.hMainWnd, lpfnDlg);
|
||||
FreeProcInstance(lpfnDlg);
|
||||
}
|
||||
|
|
@ -456,6 +507,19 @@ static LRESULT DIALOG_PAGESETUP_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPAR
|
|||
EndDialog(hDlg, IDCANCEL);
|
||||
return TRUE;
|
||||
}
|
||||
break;
|
||||
|
||||
case WM_INITDIALOG:
|
||||
SetDlgItemText(hDlg, NP_PAGESETUP_HEAD, Globals.szHeader);
|
||||
SetDlgItemText(hDlg, NP_PAGESETUP_TAIL, Globals.szFooter);
|
||||
SetDlgItemText(hDlg, NP_PAGESETUP_TOP, Globals.szMarginTop);
|
||||
SetDlgItemText(hDlg, NP_PAGESETUP_BOTTOM, Globals.szMarginBottom);
|
||||
SetDlgItemText(hDlg, NP_PAGESETUP_LEFT, Globals.szMarginLeft);
|
||||
SetDlgItemText(hDlg, NP_PAGESETUP_RIGHT, Globals.szMarginRight);
|
||||
break;
|
||||
|
||||
case WM_CLOSE:
|
||||
break;
|
||||
}
|
||||
return FALSE;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Notepad
|
||||
* Notepad (dialog.h)
|
||||
*
|
||||
* Copyright 1998 Marcel Baur <mbaur@g26.ethz.ch>
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -1,14 +1,15 @@
|
|||
/*
|
||||
* Notepad
|
||||
*
|
||||
* Copyright 1997 Marcel Baur <mbaur@g26.ethz.ch>
|
||||
* Copyright 1998 Karl Backström <karl_b@geocities.com>
|
||||
* Copyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>
|
||||
* Copyright 1998 Karl Backstr÷m <karl_b@geocities.com>
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include "windows.h"
|
||||
#include "main.h"
|
||||
#include "language.h"
|
||||
|
||||
#ifdef WINELIB
|
||||
#include "options.h"
|
||||
#endif
|
||||
|
|
@ -147,7 +148,8 @@ VOID LANGUAGE_Init(VOID)
|
|||
PROFILE_GetWineIniString("programs", "language", "language",
|
||||
buffer, sizeof(buffer));
|
||||
Globals.lpszLanguage = p = LocalLock(LocalAlloc(LMEM_FIXED, lstrlen(buffer)));
|
||||
hmemcpy(p, buffer, 1 + lstrlen(buffer));
|
||||
strcpy(p, buffer);
|
||||
// hmemcpy(p, buffer, 1 + lstrlen(buffer));
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
/*
|
||||
* Notepad
|
||||
*
|
||||
* Copyright 1997 Marcel Baur <mbaur@g26.ethz.ch>
|
||||
* Copyright 1998 Karl Backström <karl_b@geocities.com>
|
||||
* Copyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>
|
||||
* Copyright 1998 Karl Backstr÷m <karl_b@geocities.com>
|
||||
*/
|
||||
|
||||
VOID LANGUAGE_UpdateWindowCaption(VOID);
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
/*
|
||||
* Notepad (license.h)
|
||||
*
|
||||
* Copyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>
|
||||
* To be distributed under the Wine License
|
||||
*/
|
||||
|
||||
#include "windows.h"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
/*
|
||||
* Notepad (license.h)
|
||||
*
|
||||
* Copyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>
|
||||
* To be distributed under the Wine License
|
||||
*/
|
||||
|
||||
VOID WineLicense(HWND hWnd, LPCSTR lpszLanguage);
|
||||
|
|
|
|||
|
|
@ -1,19 +1,23 @@
|
|||
/*
|
||||
* Notepad
|
||||
*
|
||||
* Copyright 1997 Marcel Baur <mbaur@g26.ethz.ch>
|
||||
* Copyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>
|
||||
* To be distributed under the Wine License
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include "windows.h"
|
||||
#include "shell.h"
|
||||
#include "main.h"
|
||||
#include "license.h"
|
||||
#include "dialog.h"
|
||||
#include "language.h"
|
||||
|
||||
#ifdef WINELIB
|
||||
#include "options.h"
|
||||
#include "resource.h"
|
||||
#include "shell.h"
|
||||
void LIBWINE_Register_Da();
|
||||
void LIBWINE_Register_De();
|
||||
void LIBWINE_Register_En();
|
||||
void LIBWINE_Register_Sw();
|
||||
|
|
@ -76,6 +80,9 @@ int NOTEPAD_MenuCommand (WPARAM wParam)
|
|||
LRESULT NOTEPAD_WndProc (HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
PAINTSTRUCT ps;
|
||||
CHAR szFileName[MAX_STRING_LEN];
|
||||
|
||||
lstrcpy(szFileName, "");
|
||||
|
||||
switch (msg) {
|
||||
|
||||
|
|
@ -95,6 +102,13 @@ LRESULT NOTEPAD_WndProc (HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
|
|||
PostQuitMessage (0);
|
||||
break;
|
||||
|
||||
case WM_DROPFILES:
|
||||
DragQueryFiles(wParam, 0, szFileName, sizeof(szFileName));
|
||||
printf("file %s to be opened by drag and drop !\n", szFileName);
|
||||
DragFinish(wParam);
|
||||
break;
|
||||
|
||||
|
||||
default:
|
||||
return DefWindowProc (hWnd, msg, wParam, lParam);
|
||||
}
|
||||
|
|
@ -117,33 +131,35 @@ int PASCAL WinMain (HANDLE hInstance, HANDLE prev, LPSTR cmdline, int show)
|
|||
|
||||
#if defined(WINELIB) && !defined(HAVE_WINE_CONSTRUCTOR)
|
||||
/* Register resources */
|
||||
LIBWINE_Register_Da();
|
||||
LIBWINE_Register_De();
|
||||
LIBWINE_Register_En();
|
||||
LIBWINE_Register_Sw();
|
||||
#endif
|
||||
|
||||
/* Select Language */
|
||||
LANGUAGE_Init();
|
||||
|
||||
|
||||
/* Setup Globals */
|
||||
|
||||
Globals.lpszIniFile = "notepad.ini";
|
||||
Globals.lpszIcoFile = "notepad.ico";
|
||||
|
||||
/* Select Language */
|
||||
LANGUAGE_Init();
|
||||
|
||||
Globals.hInstance = hInstance;
|
||||
Globals.hMainIcon = ExtractIcon(Globals.hInstance,
|
||||
Globals.lpszIcoFile, 0);
|
||||
if (!Globals.hMainIcon) Globals.hMainIcon =
|
||||
LoadIcon(0, MAKEINTRESOURCE(DEFAULTICON));
|
||||
|
||||
lstrcpyn(Globals.szFindText, "\0", 1);
|
||||
lstrcpyn(Globals.szFileName, "\0", 1);
|
||||
lstrcpyn(Globals.szMarginTop, "\0", 1);
|
||||
lstrcpyn(Globals.szMarginBottom, "\0", 1);
|
||||
lstrcpyn(Globals.szMarginLeft, "\0", 1);
|
||||
lstrcpyn(Globals.szMarginRight, "\0", 1);
|
||||
lstrcpyn(Globals.szHeader, "\0", 1);
|
||||
lstrcpyn(Globals.szFooter, "\0", 1);
|
||||
lstrcpy(Globals.szFindText, "");
|
||||
lstrcpy(Globals.szFileName, "");
|
||||
lstrcpy(Globals.szMarginTop, "25 mm");
|
||||
lstrcpy(Globals.szMarginBottom, "25 mm");
|
||||
lstrcpy(Globals.szMarginLeft, "20 mm");
|
||||
lstrcpy(Globals.szMarginRight, "20 mm");
|
||||
lstrcpy(Globals.szHeader, "&n");
|
||||
lstrcpy(Globals.szFooter, "Page &s");
|
||||
|
||||
if (!prev){
|
||||
class.style = CS_HREDRAW | CS_VREDRAW;
|
||||
|
|
@ -179,7 +195,7 @@ int PASCAL WinMain (HANDLE hInstance, HANDLE prev, LPSTR cmdline, int show)
|
|||
|
||||
{
|
||||
CHAR option;
|
||||
LPCSTR topic_id;
|
||||
// LPCSTR topic_id;
|
||||
|
||||
if (*cmdline++ == ' ') continue;
|
||||
|
||||
|
|
@ -196,7 +212,9 @@ int PASCAL WinMain (HANDLE hInstance, HANDLE prev, LPSTR cmdline, int show)
|
|||
}
|
||||
}
|
||||
|
||||
DragAcceptFiles(Globals.hMainWnd, TRUE);
|
||||
|
||||
// now enter mesage loop
|
||||
|
||||
while (GetMessage (&msg, 0, 0, 0)) {
|
||||
TranslateMessage (&msg);
|
||||
|
|
@ -208,4 +226,3 @@ int PASCAL WinMain (HANDLE hInstance, HANDLE prev, LPSTR cmdline, int show)
|
|||
/* Local Variables: */
|
||||
/* c-file-style: "GNU" */
|
||||
/* End: */
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
/*
|
||||
* Notepad (notepad.h)
|
||||
*
|
||||
* Copyright 1997 Marcel Baur <mbaur@g26.ethz.ch>
|
||||
* Copyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>
|
||||
* To be distributed under the Wine License
|
||||
*/
|
||||
|
||||
#define MAX_STRING_LEN 255
|
||||
|
|
@ -74,6 +75,13 @@ extern CHAR STRING_PAGESETUP_Xx[];
|
|||
#define IDS_OUT_OF_MEMORY STRINGID(0B)
|
||||
#define IDS_UNTITLED STRINGID(0C)
|
||||
|
||||
#define IDS_PAGESETUP_HEADERVALUE STRINGID(0D)
|
||||
#define IDS_PAGESETUP_FOOTERVALUE STRINGID(0E)
|
||||
#define IDS_PAGESETUP_LEFTVALUE STRINGID(0F)
|
||||
#define IDS_PAGESETUP_RIGHTVALUE STRINGID(010)
|
||||
#define IDS_PAGESETUP_TOPVALUE STRINGID(011)
|
||||
#define IDS_PAGESETUP_BOTTOMVALUE STRINGID(012)
|
||||
|
||||
/* main menu */
|
||||
|
||||
#define NP_FILE_NEW 100
|
||||
|
|
@ -114,17 +122,16 @@ extern CHAR STRING_PAGESETUP_Xx[];
|
|||
#define NP_PAGESETUP_HEAD_TXT 1001
|
||||
#define NP_PAGESETUP_TAIL 1002
|
||||
#define NP_PAGESETUP_TAIL_TXT 1003
|
||||
#define NP_PAGESETUP_LEFT 1005
|
||||
#define NP_PAGESETUP_LEFT_TXT 1006
|
||||
#define NP_PAGESETUP_RIGHT 1007
|
||||
#define NP_PAGESETUP_RIGHT_TXT 1008
|
||||
#define NP_PAGESETUP_TOP 1009
|
||||
#define NP_PAGESETUP_TOP_TXT 1010
|
||||
#define NP_PAGESETUP_BOTTOM 1011
|
||||
#define NP_PAGESETUP_BOTTOM_TXT 1012
|
||||
#define NP_HELP 1013
|
||||
#define NP_PAGESETUP_MARGIN 1014
|
||||
|
||||
#define NP_PAGESETUP_LEFT 1004
|
||||
#define NP_PAGESETUP_LEFT_TXT 1005
|
||||
#define NP_PAGESETUP_RIGHT 1006
|
||||
#define NP_PAGESETUP_RIGHT_TXT 1007
|
||||
#define NP_PAGESETUP_TOP 1008
|
||||
#define NP_PAGESETUP_TOP_TXT 1009
|
||||
#define NP_PAGESETUP_BOTTOM 1010
|
||||
#define NP_PAGESETUP_BOTTOM_TXT 1011
|
||||
#define NP_HELP 1012
|
||||
#define NP_PAGESETUP_MARGIN 1013
|
||||
|
||||
/* Local Variables: */
|
||||
/* c-file-style: "GNU" */
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
/*
|
||||
* Notepad (notepad.rc)
|
||||
*
|
||||
* Copyright 1997 Marcel Baur <mbaur@g26.ethz.ch>
|
||||
* Copyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>
|
||||
* To be distributed under the Wine License
|
||||
*/
|
||||
|
||||
#include "windows.h"
|
||||
|
|
@ -69,18 +70,20 @@ FONT 8, "Helv"
|
|||
CAPTION DIALOG_PAGESETUP_CAPTION
|
||||
{
|
||||
LTEXT DIALOG_PAGESETUP_HEAD, NP_PAGESETUP_HEAD_TXT, 10, 07, 40, 15
|
||||
EDITTEXT NP_PAGESETUP_HEAD, 60, 05, 110, 12, WS_BORDER | WS_TABSTOP
|
||||
EDITTEXT NP_PAGESETUP_HEAD, 60, 05,110, 12, WS_BORDER | WS_TABSTOP
|
||||
LTEXT DIALOG_PAGESETUP_TAIL, NP_PAGESETUP_TAIL_TXT, 10, 24, 40, 15
|
||||
EDITTEXT NP_PAGESETUP_TAIL, 60, 22, 110, 12, WS_BORDER | WS_TABSTOP
|
||||
GROUPBOX DIALOG_PAGESETUP_MARGIN, NP_PAGESETUP_MARGIN, 10, 43, 160, 45
|
||||
EDITTEXT NP_PAGESETUP_TAIL, 60, 22,110, 12, WS_BORDER | WS_TABSTOP
|
||||
|
||||
GROUPBOX DIALOG_PAGESETUP_MARGIN,NP_PAGESETUP_MARGIN, 10, 43,160, 45
|
||||
LTEXT DIALOG_PAGESETUP_LEFT, NP_PAGESETUP_LEFT_TXT, 20, 55, 30, 10, WS_CHILD
|
||||
EDITTEXT NP_PAGESETUP_LEFT, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
|
||||
LTEXT DIALOG_PAGESETUP_TOP, NP_PAGESETUP_TOP_TXT, 20, 73, 30, 10, WS_CHILD
|
||||
EDITTEXT NP_PAGESETUP_TOP, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
|
||||
LTEXT DIALOG_PAGESETUP_RIGHT, NP_PAGESETUP_RIGHT_TXT, 100, 55, 30, 10, WS_CHILD
|
||||
EDITTEXT NP_PAGESETUP_RIGHT, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
|
||||
LTEXT DIALOG_PAGESETUP_BOTTOM, NP_PAGESETUP_BOTTOM_TXT, 100, 73, 30, 10, WS_CHILD
|
||||
LTEXT DIALOG_PAGESETUP_BOTTOM,NP_PAGESETUP_BOTTOM_TXT,100, 73, 30, 10, WS_CHILD
|
||||
EDITTEXT NP_PAGESETUP_BOTTOM, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
|
||||
|
||||
DEFPUSHBUTTON DIALOG_OK, IDOK, 180, 3, 40, 15, WS_TABSTOP
|
||||
PUSHBUTTON DIALOG_CANCEL, IDCANCEL, 180, 21, 40, 15, WS_TABSTOP
|
||||
PUSHBUTTON DIALOG_HELP, NP_HELP, 180, 39, 40, 15, WS_TABSTOP
|
||||
|
|
@ -114,4 +117,10 @@ ADDSTRING(NOTEXT)
|
|||
ADDSTRING(NOTFOUND)
|
||||
ADDSTRING(OUT_OF_MEMORY)
|
||||
ADDSTRING(UNTITLED)
|
||||
ADDSTRING(PAGESETUP_HEADERVALUE)
|
||||
ADDSTRING(PAGESETUP_FOOTERVALUE)
|
||||
ADDSTRING(PAGESETUP_LEFTVALUE)
|
||||
ADDSTRING(PAGESETUP_RIGHTVALUE)
|
||||
ADDSTRING(PAGESETUP_TOPVALUE)
|
||||
ADDSTRING(PAGESETUP_BOTTOMVALUE)
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue