[ros-diffs] [tkreuzer] 56898: [FONTVIEW] - When no file name is passed on the command line, open a file-open-dialog - Halfplement printing - Replace Quit button with install button - Patch by milawynsrealm <sp...

15 Jul 2012

Author: tkreuzer
Date: Sun Jul 15 14:25:19 2012
New Revision: 56898
URL: http://svn.reactos.org/svn/reactos?rev=56898&view=rev
Log:
[FONTVIEW]
- When no file name is passed on the command line, open a file-open-dialog
- Halfplement printing
- Replace Quit button with install button
- Patch by milawynsrealm <spaceseel at gmail got com>
See issue #6803 for more details.
Modified:
    trunk/reactos/base/applications/fontview/CMakeLists.txt
    trunk/reactos/base/applications/fontview/display.c
    trunk/reactos/base/applications/fontview/display.h
    trunk/reactos/base/applications/fontview/fontview.c
    trunk/reactos/base/applications/fontview/fontview.h
    trunk/reactos/base/applications/fontview/fontview.rc
    trunk/reactos/base/applications/fontview/lang/bg-BG.rc
    trunk/reactos/base/applications/fontview/lang/de-DE.rc
    trunk/reactos/base/applications/fontview/lang/en-US.rc
    trunk/reactos/base/applications/fontview/lang/es-ES.rc
    trunk/reactos/base/applications/fontview/lang/fr-FR.rc
    trunk/reactos/base/applications/fontview/lang/lt-LT.rc
    trunk/reactos/base/applications/fontview/lang/no-NO.rc
    trunk/reactos/base/applications/fontview/lang/pl-PL.rc
    trunk/reactos/base/applications/fontview/lang/pt-BR.rc
    trunk/reactos/base/applications/fontview/lang/ro-RO.rc
    trunk/reactos/base/applications/fontview/lang/ru-RU.rc
    trunk/reactos/base/applications/fontview/lang/sk-SK.rc
    trunk/reactos/base/applications/fontview/lang/sv-SE.rc
    trunk/reactos/base/applications/fontview/lang/uk-UA.rc
    trunk/reactos/base/applications/fontview/lang/zh-CN.rc
    trunk/reactos/base/applications/fontview/lang/zh-TW.rc
    trunk/reactos/base/applications/fontview/resource.h
Modified: trunk/reactos/base/applications/fontview/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview…
==============================================================================

--- trunk/reactos/base/applications/fontview/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/CMakeLists.txt [iso-8859-1] Sun Jul 15
14:25:19 2012
@@ -6,6 +6,6 @@
     fontview.rc)
 set_module_type(fontview win32gui)
-add_importlibs(fontview gdi32 shell32 user32 msvcrt kernel32)
+add_importlibs(fontview comdlg32 gdi32 shell32 user32 msvcrt kernel32)
 add_cd_file(TARGET fontview DESTINATION reactos/system32 FOR all)
Modified: trunk/reactos/base/applications/fontview/display.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview…
==============================================================================
--- trunk/reactos/base/applications/fontview/display.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/display.c [iso-8859-1] Sun Jul 15 14:25:19
2012
@@ -377,6 +377,92 @@
        return 0;
 }
+LRESULT
+Display_OnPrint(HWND hwnd)
+{
+       PRINTDLG pfont;
+       TEXTMETRIC tm;
+       int copies, yPos;
+       DISPLAYDATA* pData;
+
+       pData = malloc(sizeof(DISPLAYDATA));
+       ZeroMemory(pData, sizeof(DISPLAYDATA));
+
+       /* Sets up the font layout */
+       pData = (DISPLAYDATA*)GetWindowLongPtr(hwnd, GWLP_USERDATA);
+
+       /* Clears the memory before using it */
+       ZeroMemory(&pfont, sizeof(pfont));
+
+       pfont.lStructSize = sizeof(pfont);
+       pfont.hwndOwner = hwnd;
+       pfont.hDevMode = NULL;
+       pfont.hDevNames = NULL;
+       pfont.Flags = PD_USEDEVMODECOPIESANDCOLLATE | PD_RETURNDC;
+       pfont.nCopies = 1;
+       pfont.nFromPage = 0xFFFF;
+       pfont.nToPage = 0xFFFF;
+       pfont.nMinPage = 1;
+       pfont.nMaxPage = 0xFFFF;
+
+       /* Opens up the print dialog box */
+       if (PrintDlg(&pfont))
+       {
+               DOCINFO docinfo;
+
+               docinfo.cbSize = sizeof(DOCINFO);
+               docinfo.lpszDocName = "Printing Font";
+               docinfo.lpszOutput = NULL;
+               docinfo.lpszDatatype = NULL;
+               docinfo.fwType = 0;
+
+               /* We start printing */
+               StartDoc(pfont.hDC, &docinfo);
+
+               /* Grabs the text metrics for the printer */
+               GetTextMetrics(pfont.hDC, &tm);
+
+               /* Start out with 0 for the y position for the page */
+               yPos = 0;
+
+               /* Starts out with the current page */
+               StartPage(pfont.hDC);
+
+               /* Used when printing for more than one copy */
+               for (copies = 0; copies < pfont.nCopies; copies++)
+               {
+                       /* Test output */
+                       TextOutW(pfont.hDC, 10, yPos, L"Testing...1...2...3",
19);
+
+                       /* TODO: Determine if using Display_DrawText() will work for both
rendering out to the
+                       window and to the printer output */
+                       //Display_DrawText(pfont.hDC, pData, yPos);
+
+                       /* Ends the current page */
+                       EndPage(pfont.hDC);
+
+                       /* If we are making more than one copy, start a new page */
+                       if (copies != pfont.nCopies)
+                       {
+                               yPos = 0;
+                               StartPage(pfont.hDC);
+                       }
+               }
+
+               /* The printing is now over */
+               EndDoc(pfont.hDC);
+
+               DeleteDC(pfont.hDC);
+       } else {
+               return 0;
+       }
+
+       /* Frees the memory since we no longer need it for now */
+       free(pData);
+
+       return 0;
+}
+
 LRESULT CALLBACK
 DisplayProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
Modified: trunk/reactos/base/applications/fontview/display.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview…
==============================================================================
--- trunk/reactos/base/applications/fontview/display.h [iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/display.h [iso-8859-1] Sun Jul 15 14:25:19
2012
@@ -13,3 +13,4 @@
 /* Public function */
 BOOL Display_InitClass(HINSTANCE hInstance);
+LRESULT Display_OnPrint(HWND hwnd);
Modified: trunk/reactos/base/applications/fontview/fontview.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview…
==============================================================================
--- trunk/reactos/base/applications/fontview/fontview.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/fontview.c [iso-8859-1] Sun Jul 15 14:25:19
2012
@@ -24,6 +24,7 @@
 HINSTANCE g_hInstance;
 EXTLOGFONTW g_ExtLogFontW;
+LPCWSTR g_fileName;
 static const WCHAR g_szFontViewClassName[] = L"FontViewWClass";
@@ -92,6 +93,7 @@
        WNDCLASSEXW wincl;
        HINSTANCE hDLL;
        PGFRI GetFontResourceInfoW;
+       LPCWSTR fileName;
        g_hInstance = hThisInstance;
@@ -99,14 +101,51 @@
        argv = CommandLineToArgvW(GetCommandLineW(), &argc);
        if (argc < 2)
        {
-               ErrorMsgBox(0, IDS_ERROR, IDS_ERROR_BADCMD, argv[1]);
-               return -1;
-       }
-
-       /* Try to add the font resource */
-       if (!AddFontResourceW(argv[1]))
-       {
-               ErrorMsgBox(0, IDS_ERROR, IDS_ERROR_NOFONT, argv[1]);
+               OPENFILENAMEW fontOpen;
+               WCHAR szFileName[MAX_PATH] = L"";
+               HLOCAL dialogTitle = NULL;
+
+               /* Gets the title for the dialog box ready */
+               FormatString(FORMAT_MESSAGE_ALLOCATE_BUFFER,
+                         NULL, IDS_OPEN, 0, (LPWSTR)&dialogTitle, 0, NULL);
+
+               /* Clears out any values of fontOpen before we use it */
+               ZeroMemory(&fontOpen, sizeof(fontOpen));
+
+               /* Sets up the open dialog box */
+               fontOpen.lStructSize = sizeof(fontOpen);
+               fontOpen.hwndOwner = NULL;
+               fontOpen.lpstrFilter = L"TrueType Font (*.ttf)\0*.ttf\0"
+                       L"All Files (*.*)\0*.*\0";
+               fontOpen.lpstrFile = szFileName;
+               fontOpen.lpstrTitle = dialogTitle;
+               fontOpen.nMaxFile = MAX_PATH;
+               fontOpen.Flags = OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY;
+               fontOpen.lpstrDefExt = L"ttf";
+
+               /* Opens up the Open File dialog box in order to chose a font file. */
+               if(GetOpenFileNameW(&fontOpen))
+               {
+                       fileName = fontOpen.lpstrFile;
+                       g_fileName = fileName;
+               } else {
+                       /* If the user decides to close out of the open dialog effectively
+                       exiting the program altogether */
+                       return 0;
+               }
+
+               LocalFree(dialogTitle);
+       }
+       else
+       {
+               /* Try to add the font resource from command line */
+               fileName = argv[1];
+               g_fileName = fileName;
+       }
+
+       if (!AddFontResourceW(fileName))
+       {
+               ErrorMsgBox(0, IDS_ERROR, IDS_ERROR_NOFONT, fileName);
                return -1;
        }
@@ -116,16 +155,16 @@
        /* Get the font name */
        dwSize = sizeof(g_ExtLogFontW.elfFullName);
-       if (!GetFontResourceInfoW(argv[1], &dwSize, g_ExtLogFontW.elfFullName, 1))
-       {
-               ErrorMsgBox(0, IDS_ERROR, IDS_ERROR_NOFONT, argv[1]);
+       if (!GetFontResourceInfoW(fileName, &dwSize, g_ExtLogFontW.elfFullName, 1))
+       {
+               ErrorMsgBox(0, IDS_ERROR, IDS_ERROR_NOFONT, fileName);
                return -1;
        }
        dwSize = sizeof(LOGFONTW);
-       if (!GetFontResourceInfoW(argv[1], &dwSize, &g_ExtLogFontW.elfLogFont, 2))
-       {
-               ErrorMsgBox(0, IDS_ERROR, IDS_ERROR_NOFONT, argv[1]);
+       if (!GetFontResourceInfoW(fileName, &dwSize, &g_ExtLogFontW.elfLogFont,
2))
+       {
+               ErrorMsgBox(0, IDS_ERROR, IDS_ERROR_NOFONT, fileName);
                return -1;
        }
@@ -191,7 +230,7 @@
        WCHAR szQuit[MAX_BUTTONNAME];
        WCHAR szPrint[MAX_BUTTONNAME];
        WCHAR szString[MAX_STRING];
-       HWND hDisplay, hButtonQuit, hButtonPrint;
+       HWND hDisplay, hButtonInstall, hButtonPrint;
        /* create the display window */
        hDisplay = CreateWindowExW(
@@ -217,8 +256,8 @@
        ShowWindow(hDisplay, SW_SHOWNORMAL);
        /* Create the quit button */
-       LoadStringW(g_hInstance, IDS_QUIT, szQuit, MAX_BUTTONNAME);
-       hButtonQuit = CreateWindowExW(
+       LoadStringW(g_hInstance, IDS_INSTALL, szQuit, MAX_BUTTONNAME);
+       hButtonInstall = CreateWindowExW(
                                0,                                              /*
Extended style */
                                L"button",                            /*
Classname */
                                szQuit,                                 /* Title text */
@@ -228,11 +267,11 @@
                                BUTTON_WIDTH,                   /* Width */
                                BUTTON_HEIGHT,                  /* Height */
                                hwnd,                                   /* Parent */
-                               (HMENU)IDC_QUIT,                /* Identifier */
+                               (HMENU)IDC_INSTALL,             /* Identifier */
                                g_hInstance,                    /* Program Instance
handler */
                                NULL                                    /* Window Creation
data */
                        );
-       SendMessage(hButtonQuit, WM_SETFONT, (WPARAM)GetStockObject(DEFAULT_GUI_FONT),
(LPARAM)TRUE);
+       SendMessage(hButtonInstall, WM_SETFONT, (WPARAM)GetStockObject(DEFAULT_GUI_FONT),
(LPARAM)TRUE);
        /* Create the print button */
        LoadStringW(g_hInstance, IDS_PRINT, szPrint, MAX_BUTTONNAME);
@@ -283,6 +322,26 @@
        return 0;
 }
+static LRESULT
+MainWnd_OnInstall(HWND hwnd)
+{
+       DWORD fontExists;
+
+       /* First, we have to find out if the font still exists. */
+       fontExists = GetFileAttributes((LPCSTR)g_fileName);
+       if (fontExists != 0xFFFFFFFF) /* If the file does not exist */
+       {
+               ErrorMsgBox(0, IDS_ERROR, IDS_ERROR_NOFONT, g_fileName);
+               return -1;
+       }
+
+       //CopyFile(g_fileName, NULL, TRUE);
+
+       MessageBox(hwnd, TEXT("This function is unimplemented"),
TEXT("Unimplemented"), MB_OK);
+
+       return 0;
+}
+
 LRESULT CALLBACK
 MainWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
@@ -300,12 +359,12 @@
                case WM_COMMAND:
                        switch(LOWORD(wParam))
                        {
-                               case IDC_QUIT:
-                                       PostQuitMessage (0);    /* send a WM_QUIT to the
message queue */
+                               case IDC_INSTALL:
+                                       return MainWnd_OnInstall(hwnd);
                                        break;
                                case IDC_PRINT:
-                                       MessageBox(hwnd, TEXT("This function is
unimplemented"), TEXT("Unimplemented"), MB_OK);
+                                       return Display_OnPrint(hwnd);
                                        break;
                        }
                        break;
Modified: trunk/reactos/base/applications/fontview/fontview.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview…
==============================================================================
--- trunk/reactos/base/applications/fontview/fontview.h [iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/fontview.h [iso-8859-1] Sun Jul 15 14:25:19
2012
@@ -12,7 +12,7 @@
 #define BUTTON_WIDTH 72
 #define BUTTON_HEIGHT 21
-#define IDC_QUIT 1001
+#define IDC_INSTALL 1001
 #define IDC_PRINT 1002
 #define IDC_DISPLAY 1003
Modified: trunk/reactos/base/applications/fontview/fontview.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview…
==============================================================================
--- trunk/reactos/base/applications/fontview/fontview.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/fontview.rc [iso-8859-1] Sun Jul 15 14:25:19
2012
@@ -2,6 +2,11 @@
 #include "resource.h"
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+
+#define REACTOS_STR_FILE_DESCRIPTION   "ReactOS Font Viewer\0"
+#define REACTOS_STR_INTERNAL_NAME      "fontview\0"
+#define REACTOS_STR_ORIGINAL_FILENAME  "fontview.exe\0"
+#include <reactos/version.rc>
 IDI_TT ICON "ttf.ico"
Modified: trunk/reactos/base/applications/fontview/lang/bg-BG.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview…
==============================================================================
--- trunk/reactos/base/applications/fontview/lang/bg-BG.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/lang/bg-BG.rc [iso-8859-1] Sun Jul 15
14:25:19 2012
@@ -2,12 +2,12 @@
 STRINGTABLE DISCARDABLE
 BEGIN
-       IDS_QUIT, "ÐÐ·Ñ
Ð¾Ð´"
+       IDS_INSTALL, "Install"
        IDS_PRINT, "ÐÐµÑÐ°Ñ"
        IDS_STRING, "ÐÐ±Ð²Ð³Ð´ ÐµÐ¶Ð·Ð¸Ð¹ ÐºÐ»Ð¼Ð½Ð¾ Ð¿ÑÑÑÑ ÑÑ
ÑÑÑ ÑÑÑÑÑ. 1234567890"
+       IDS_OPEN, "Open Font..."
        IDS_ERROR, "ÐÑÐµÑÐºÐ°"
        IDS_ERROR_NOMEM, "ÐÑÐ¼Ð° Ð´Ð¾ÑÑÐ°ÑÑÑÐ½Ð¾ Ð¼ÑÑÑÐ¾ Ð·Ð°
Ð·Ð°Ð²ÑÑÑÐ²Ð°Ð½Ðµ Ð½Ð° Ð´ÐµÐ¹ÑÑÐ²Ð¸ÐµÑÐ¾."
        IDS_ERROR_NOFONT, "%1 Ð½Ðµ Ðµ ÑÐµÐ´Ð¾Ð²ÐµÐ½ ÑÑÐ¸ÑÑÐ¾Ð² ÑÐ°Ð¹Ð»."
        IDS_ERROR_NOCLASS, "ÐÐµÑÑÐ¿ÐµÑÐ½Ð¾ Ð¸Ð·Ð¿ÑÐ»Ð½ÐµÐ½Ð¸Ðµ Ð½Ð° ÐºÐ»Ð°ÑÐ°
Ð½Ð° Ð¿ÑÐ¾Ð·Ð¾ÑÐµÑÐ°."
-       IDS_ERROR_BADCMD, "ÐÐµ Ðµ ÑÐºÐ°Ð·Ð°Ð½ ÑÑÐ¸ÑÑÐ¾Ð²
ÑÐ°Ð¹Ð».\nÐÐ°Ð¿Ð¸ÑÐ°Ð½Ð¾:\n  fontview.exe <font file>"
 END
Modified: trunk/reactos/base/applications/fontview/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview…
==============================================================================
--- trunk/reactos/base/applications/fontview/lang/de-DE.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/lang/de-DE.rc [iso-8859-1] Sun Jul 15
14:25:19 2012
@@ -2,12 +2,12 @@
 STRINGTABLE DISCARDABLE
 BEGIN
-       IDS_QUIT, "Fertig"
+       IDS_INSTALL, "Installieren"
        IDS_PRINT, "Drucken"
        IDS_STRING, "Franz jagt im komplett verwahrlosten Taxi quer durch Bayern.
1234567890"
+       IDS_OPEN, "Schriftartendatei Ã¶ffnen..."
        IDS_ERROR, "Fehler"
        IDS_ERROR_NOMEM, "Es steht nicht genÃ¼gend Speicher zur VerfÃ¼gung."
        IDS_ERROR_NOFONT, "Die angegebene Datei %1 ist keine gÃ¼ltige
Schriftartendatei."
        IDS_ERROR_NOCLASS, "Fehler beim Initialisieren der Fensterklasse."
-       IDS_ERROR_BADCMD, "Keine Schriftartendatei angegeben.\nSyntax:\n
fontview.exe <Schriftdatei>"
 END
Modified: trunk/reactos/base/applications/fontview/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview…
==============================================================================
--- trunk/reactos/base/applications/fontview/lang/en-US.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/lang/en-US.rc [iso-8859-1] Sun Jul 15
14:25:19 2012
@@ -2,12 +2,12 @@
 STRINGTABLE DISCARDABLE
 BEGIN
-       IDS_QUIT, "Quit"
+       IDS_INSTALL, "Install"
        IDS_PRINT, "Print"
        IDS_STRING, "Jackdaws love my big sphinx of quartz. 1234567890"
+       IDS_OPEN, "Open Font..."
        IDS_ERROR, "Error"
        IDS_ERROR_NOMEM, "There's not enough memory to complete the
operation."
        IDS_ERROR_NOFONT, "The file %1 is not a valid font file."
        IDS_ERROR_NOCLASS, "Could not initialize window class."
-       IDS_ERROR_BADCMD, "No font file given.\nSyntax:\n  fontview.exe <font
file>"
 END
Modified: trunk/reactos/base/applications/fontview/lang/es-ES.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview…
==============================================================================
--- trunk/reactos/base/applications/fontview/lang/es-ES.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/lang/es-ES.rc [iso-8859-1] Sun Jul 15
14:25:19 2012
@@ -6,12 +6,12 @@
 STRINGTABLE DISCARDABLE
 BEGIN
-       IDS_QUIT, "Cerrar"
+       IDS_INSTALL, "Install"
        IDS_PRINT, "Imprimir"
        IDS_STRING, "Haz el amor y no la guerra. 1234567890"
+       IDS_OPEN, "Open Font..."
        IDS_ERROR, "Error"
        IDS_ERROR_NOMEM, "No hay memoria suficiente para completar la
operaciÃ³n."
        IDS_ERROR_NOFONT, "El archivo %1 no es un archivo vÃ¡lido de fuente."
        IDS_ERROR_NOCLASS, "No es posible iniciar la clase."
-       IDS_ERROR_BADCMD, "No hay archivo de fuente.\nSyntax:\n  fontview.exe
<font file>"
 END
Modified: trunk/reactos/base/applications/fontview/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview…
==============================================================================
--- trunk/reactos/base/applications/fontview/lang/fr-FR.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/lang/fr-FR.rc [iso-8859-1] Sun Jul 15
14:25:19 2012
@@ -2,12 +2,12 @@
 STRINGTABLE DISCARDABLE
 BEGIN
-       IDS_QUIT, "Quitter"
+       IDS_INSTALL, "Install"
        IDS_PRINT, "Imprimer"
        IDS_STRING, "Voix ambiguÃ« d'un cÅur qui au zÃ©phyr prÃ©fÄre les jattes
de kiwis. 1234567890"
+       IDS_OPEN, "Police ouvert..."
        IDS_ERROR, "Erreur"
        IDS_ERROR_NOMEM, "MÃ©moire insuffisante pour terminer l'opÃ©ration."
        IDS_ERROR_NOFONT, "Le fichier %1 n'est pas un fichier police
valide."
        IDS_ERROR_NOCLASS, "Impossible d'initialiser la classe de fenÄtre."
-       IDS_ERROR_BADCMD, "Aucun fichier police transmis.\nSyntaxe:\n  fontview.exe
<fichier police>"
 END
Modified: trunk/reactos/base/applications/fontview/lang/lt-LT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview…
==============================================================================
--- trunk/reactos/base/applications/fontview/lang/lt-LT.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/lang/lt-LT.rc [iso-8859-1] Sun Jul 15
14:25:19 2012
@@ -4,12 +4,12 @@
 STRINGTABLE DISCARDABLE
 BEGIN
-       IDS_QUIT, "Baigti"
+       IDS_INSTALL, "Install"
        IDS_PRINT, "Spausdinti"
        IDS_STRING, "ABCDEFGHIYJKLMNOPQRSTUVWXZ Ä
ÄÄÄÄ¯Å¡Å³Å«Å¾ 1234567890"
+       IDS_OPEN, "Aatvira Å¡riftas..."
        IDS_ERROR, "Klaida"
        IDS_ERROR_NOMEM, "UÅ¾duoÄiai uÅ¾baigti, nepakanka atminties."
        IDS_ERROR_NOFONT, "%1 nÄra teisinga Å¡rifto byla."
        IDS_ERROR_NOCLASS, "Nepavyko inicijuoti lango klasÄs."
-       IDS_ERROR_BADCMD, "Nenurodyta Å¡rifto byla.\nSintaksÄ:\n  fontview.exe
<Å¡rifto byla>"
 END
Modified: trunk/reactos/base/applications/fontview/lang/no-NO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview…
==============================================================================
--- trunk/reactos/base/applications/fontview/lang/no-NO.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/lang/no-NO.rc [iso-8859-1] Sun Jul 15
14:25:19 2012
@@ -2,12 +2,12 @@
 STRINGTABLE DISCARDABLE
 BEGIN
-       IDS_QUIT, "Avslutt"
+       IDS_INSTALL, "Install"
        IDS_PRINT, "Skriv"
        IDS_STRING, "Jackdaws love my big sphinx of quartz. 1234567890"
+       IDS_OPEN, "Open Font..."
        IDS_ERROR, "Feil"
        IDS_ERROR_NOMEM, "Det er ikke nok minne for Ã¥ fullfÃ¸re oppgaven."
        IDS_ERROR_NOFONT, "Filen %1 er ikke et gyldig skriftfil."
        IDS_ERROR_NOCLASS, "Kunne ikke initialise vindu klassen."
-       IDS_ERROR_BADCMD, "Ingen skriftfil er gitt.\nSyntaks:\n  fontview.exe
<font file>"
 END
Modified: trunk/reactos/base/applications/fontview/lang/pl-PL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview…
==============================================================================
--- trunk/reactos/base/applications/fontview/lang/pl-PL.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/lang/pl-PL.rc [iso-8859-1] Sun Jul 15
14:25:19 2012
@@ -10,12 +10,12 @@
 STRINGTABLE DISCARDABLE
 BEGIN
-       IDS_QUIT, "WyjÅcie"
+       IDS_INSTALL, "Install"
        IDS_PRINT, "Drukuj"
        IDS_STRING, "ZaÅ¼Ã³ÅÄ gÄÅlÄ
 JaÅºÅ Å¼Ã³ÅwiÄ
tkiem. 1234567890. !@#$%^&*()_+=-/?"
+       IDS_OPEN, "Open Font..."
        IDS_ERROR, "BÅÄ
d"
        IDS_ERROR_NOMEM, "Brakuje pamiÄci do ukoÅczenia tej operacji."
        IDS_ERROR_NOFONT, "Plik %1 nie jest poprawnym plikiem czcionki."
        IDS_ERROR_NOCLASS, "Nie udaÅo siÄ zainicjowaÄ klasy window."
-       IDS_ERROR_BADCMD, "Brak pliku czcionki.\nSkÅadnia:\n  fontview.exe <plik
czcionki>"
 END
Modified: trunk/reactos/base/applications/fontview/lang/pt-BR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview…
==============================================================================
--- trunk/reactos/base/applications/fontview/lang/pt-BR.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/lang/pt-BR.rc [iso-8859-1] Sun Jul 15
14:25:19 2012
@@ -4,14 +4,14 @@
 STRINGTABLE DISCARDABLE
 BEGIN
-       IDS_QUIT, "Fechar"
+       IDS_INSTALL, "Install"
        IDS_PRINT, "Imprimir"
        IDS_STRING, "Jackdaws ama minha grande esfinge de quartzo. 1234567890"
+       IDS_OPEN, "Open Font..."
        IDS_ERROR, "Erro"
        IDS_ERROR_NOMEM, "NÃ£o hÃ¡ memÃ³ria suficiente para completar a
operaÃ§Ã£o."
        IDS_ERROR_NOFONT, "O arquivo %1 nÃ£o Ã© um arquivo de fonte vÃ¡lida."
        IDS_ERROR_NOCLASS, "NÃ£o foi possÃvel inicializar a janela."
-       IDS_ERROR_BADCMD, "Sem arquivos de fonte.\nSintaxe:\n  fontview.exe
<arquivo de fonte>"
 END
Modified: trunk/reactos/base/applications/fontview/lang/ro-RO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview…
==============================================================================
--- trunk/reactos/base/applications/fontview/lang/ro-RO.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/lang/ro-RO.rc [iso-8859-1] Sun Jul 15
14:25:19 2012
@@ -3,12 +3,12 @@
 STRINGTABLE DISCARDABLE
 BEGIN
-       IDS_QUIT,           "IeÈire"
-       IDS_PRINT,          "Imprimare"
+       IDS_INSTALL,        "Install"
+    IDS_PRINT,          "Imprimare"
        IDS_STRING,         "Turubinele eoliene genereazÄ cÃ¢Èiva MJ (cÃ¢Èiva
kWâ¢h) Ã®n exces, acoperind Èi necesarul familiei. QY 1234567890"
+       IDS_OPEN,                       "Open Font..."
        IDS_ERROR,          "Eroare"
        IDS_ERROR_NOMEM,    "Nu e destulÄ memorie pentru a Ã®ncheia operaÈia."
        IDS_ERROR_NOFONT,   "FiÈierul Â«%1Â» este un fiÈier font deteriorat."
        IDS_ERROR_NOCLASS,  "Nu s-a putut iniÈializa clasa de ferestre."
-       IDS_ERROR_BADCMD,   "Niciun font specificat.\nSintaxÄ:\n  fontview.exe
<fiÈier font>"
 END
Modified: trunk/reactos/base/applications/fontview/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview…
==============================================================================
--- trunk/reactos/base/applications/fontview/lang/ru-RU.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/lang/ru-RU.rc [iso-8859-1] Sun Jul 15
14:25:19 2012
@@ -4,12 +4,12 @@
 STRINGTABLE DISCARDABLE
 BEGIN
-       IDS_QUIT, "ÐÑÑ
Ð¾Ð´"
+       IDS_INSTALL, "Install"
        IDS_PRINT, "ÐÐµÑÐ°ÑÑ"
        IDS_STRING, "Ð ÑÐ°ÑÐ°Ñ
 ÑÐ³Ð° Ð¶Ð¸Ð» Ð±Ñ ÑÐ¸ÑÑÑÑ? ÐÐ°, Ð½Ð¾ ÑÐ°Ð»ÑÑÐ¸Ð²ÑÐ¹ ÑÐºÐ·ÐµÐ¼Ð¿Ð»ÑÑ!
1234567890"
+       IDS_OPEN, "Open Font..."
        IDS_ERROR, "ÐÑÐ¸Ð±ÐºÐ°"
        IDS_ERROR_NOMEM, "ÐÐµÐ´Ð¾ÑÑÐ°ÑÐ¾ÑÐ½Ð¾ Ð¿Ð°Ð¼ÑÑÐ¸, ÑÑÐ¾Ð±Ñ
Ð·Ð°Ð²ÐµÑÑÐ¸ÑÑ Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ñ."
        IDS_ERROR_NOFONT, "%1 Ð½Ðµ ÑÐ²Ð»ÑÐµÑÑÑ ÐºÐ¾ÑÑÐµÐºÑÐ½ÑÐ¼ ÑÐ°Ð¹Ð»Ð¾Ð¼
ÑÑÐ¸ÑÑÐ°."
        IDS_ERROR_NOCLASS, "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¸Ð½Ð¸ÑÐ¸Ð°Ð»Ð¸Ð·Ð¸ÑÐ¾Ð²Ð°ÑÑ
ÐºÐ»Ð°ÑÑ Ð¾ÐºÐ½Ð°."
-       IDS_ERROR_BADCMD, "ÐÐµ ÑÐºÐ°Ð·Ð°Ð½ ÑÐ°Ð¹Ð»
ÑÑÐ¸ÑÑÐ°.\nÐ¡Ð¸Ð½ÑÐ°ÐºÑÐ¸Ñ:\n  fontview.exe <ÑÐ°Ð¹Ð»_ÑÑÐ¸ÑÑÐ°>"
 END
Modified: trunk/reactos/base/applications/fontview/lang/sk-SK.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview…
==============================================================================
--- trunk/reactos/base/applications/fontview/lang/sk-SK.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/lang/sk-SK.rc [iso-8859-1] Sun Jul 15
14:25:19 2012
@@ -7,12 +7,12 @@
 STRINGTABLE DISCARDABLE
 BEGIN
-       IDS_QUIT, "Hotovo"
+       IDS_INSTALL, "Install"
        IDS_PRINT, "TlaÄiÅ¥"
        IDS_STRING, "KÅdeÄ¾ ÄatÄ¾ov uÄÃ koÅa Å¾raÅ¥ kÃ´ru. 1234567890"
+       IDS_OPEN, "Open Font..."
        IDS_ERROR, "Chyba"
        IDS_ERROR_NOMEM, "Na vykonanie tejto operÃ¡cie nie je dostatok voÄ¾nej
pamÃ¤te."
        IDS_ERROR_NOFONT, "PoÅ¾adovanÃ½ sÃºbor %1 nie je platnÃ½m sÃºborom
pÃsiem."
        IDS_ERROR_NOCLASS, "Nepodarilo sa inicializovaÅ¥ triedu window."
-       IDS_ERROR_BADCMD, "Nebol zadanÃ½ Å¾iadny sÃºbor pÃsiem.\nPouÅ¾itie:\n
fontview.exe <sÃºbor pÃsiem>"
 END
Modified: trunk/reactos/base/applications/fontview/lang/sv-SE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview…
==============================================================================
--- trunk/reactos/base/applications/fontview/lang/sv-SE.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/lang/sv-SE.rc [iso-8859-1] Sun Jul 15
14:25:19 2012
@@ -9,12 +9,12 @@
 STRINGTABLE DISCARDABLE
 BEGIN
-       IDS_QUIT, "Avsluta"
+       IDS_INSTALL, "Install"
        IDS_PRINT, "Skriv ut"
        IDS_STRING, "Jackdaws love my big sphinx of quartz. 1234567890"
+       IDS_OPEN, "Open Font..."
        IDS_ERROR, "Fel"
        IDS_ERROR_NOMEM, "Det er inte nog minne fÃ¶r att slutfÃ¶re operationen."
        IDS_ERROR_NOFONT, "Filen %1 Ã¤r inte en giltig typsnittsfil."
        IDS_ERROR_NOCLASS, "Kunde inte initialisera Windows klassen."
-       IDS_ERROR_BADCMD, "Ingen typsnittsfil Ã¤r angiven.\nSyntaxs:\n  fontview.exe
<typsnittsfil>"
 END
Modified: trunk/reactos/base/applications/fontview/lang/uk-UA.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview…
==============================================================================
--- trunk/reactos/base/applications/fontview/lang/uk-UA.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/lang/uk-UA.rc [iso-8859-1] Sun Jul 15
14:25:19 2012
@@ -10,12 +10,12 @@
 STRINGTABLE DISCARDABLE
 BEGIN
-       IDS_QUIT, "ÐÐ¸Ñ
ÑÐ´"
+       IDS_INSTALL, "Install"
        IDS_PRINT, "ÐÑÑÐº"
        IDS_STRING, "Ð§ÑÑÑ ÑÑ
, Ð´Ð¾ÑÑ, Ð³Ð°? ÐÑÐ¼ÐµÐ´Ð½Ð° Ð¶ ÑÐ¸, Ð¿ÑÐ¾ÑÐ°Ð¹ÑÑ Ð±ÐµÐ· ÒÐ¾Ð»ÑÑÑÐ²!
1234567890"
+       IDS_OPEN, "Open Font..."
        IDS_ERROR, "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ°"
        IDS_ERROR_NOMEM, "ÐÐµÐ´Ð¾ÑÑÐ°ÑÐ½ÑÐ¾ Ð¿Ð°Ð¼'ÑÑÑ Ð´Ð»Ñ
Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð½Ñ Ð¾Ð¿ÐµÑÐ°ÑÑÑ."
        IDS_ERROR_NOFONT, "Ð¤Ð°Ð¹Ð» %1 Ð½Ðµ Ñ ÐºÐ¾ÑÐµÐºÑÐ½Ð¸Ð¼ ÑÐ°Ð¹Ð»Ð¾Ð¼
ÑÑÐ¸ÑÑÑ."
        IDS_ERROR_NOCLASS, "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ ÑÐ½ÑÑÑÐ°Ð»ÑÐ·ÑÐ²Ð°ÑÐ¸
Ð²ÑÐºÐ¾Ð½Ð½Ð¸Ð¹ ÐºÐ»Ð°Ñ."
-       IDS_ERROR_BADCMD, "ÐÐµ Ð²ÐºÐ°Ð·Ð°Ð½Ð¸Ð¹ ÑÐ°Ð¹Ð»
ÑÑÐ¸ÑÑÑ.\nÐ¡Ð¸Ð½ÑÐ°ÐºÑÐ¸Ñ:\n  fontview.exe <ÑÐ°Ð¹Ð»_ÑÑÐ¸ÑÑÑ>"
 END
Modified: trunk/reactos/base/applications/fontview/lang/zh-CN.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview…
==============================================================================
--- trunk/reactos/base/applications/fontview/lang/zh-CN.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/lang/zh-CN.rc [iso-8859-1] Sun Jul 15
14:25:19 2012
@@ -10,12 +10,12 @@
 STRINGTABLE DISCARDABLE
 BEGIN
-       IDS_QUIT, "ç»æ"
+       IDS_INSTALL, "Install"
        IDS_PRINT, "åå°"
        IDS_STRING, "ReactOS
ç»ææäººä¸ä¸ªèªç±çæä½ç³»ç»ï¼1234567890"
+       IDS_OPEN, "Open Font..."
        IDS_ERROR, "éè¯¯"
        IDS_ERROR_NOMEM, "æ²¡æè¶³å¤çå
åæ¥å®ææä½ã"
        IDS_ERROR_NOFONT, "ï¼
1ä¸æ¯ä¸ä¸ªææçåä½æ¡£æ¡ã"
        IDS_ERROR_NOCLASS, "çªå£æ æ³åå§åã"
-       IDS_ERROR_BADCMD, "æ²¡ææä¾åä½æä»¶ã\nè¯æ³ï¼\n  fontview.exe
<åä½æ¡£æ¡>"
 END
Modified: trunk/reactos/base/applications/fontview/lang/zh-TW.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview…
==============================================================================
--- trunk/reactos/base/applications/fontview/lang/zh-TW.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/lang/zh-TW.rc [iso-8859-1] Sun Jul 15
14:25:19 2012
@@ -10,12 +10,12 @@
 STRINGTABLE DISCARDABLE
 BEGIN
-       IDS_QUIT, "çµæ"
+       IDS_INSTALL, "Install"
        IDS_PRINT, "åå°"
        IDS_STRING, "ReactOS çµ¦ææäººä¸åèªç±çæä½ç³»çµ±ï¼
1234567890"
+       IDS_OPEN, "Open Font..."
        IDS_ERROR, "é¯èª¤"
        IDS_ERROR_NOMEM, "æ²æè¶³å¤ çè¨æ¶é«ä¾å®ææä½ã"
        IDS_ERROR_NOFONT, "%1 ä¸æ¯ä¸åææçåé«æªæ¡ã"
        IDS_ERROR_NOCLASS, "çªå£ç¡æ³åå§åã"
-       IDS_ERROR_BADCMD, "æ²ææä¾åé«æä»¶ã\nèªæ³ï¼\n  fontview.exe
<åé«æªæ¡>"
 END
Modified: trunk/reactos/base/applications/fontview/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview…
==============================================================================
--- trunk/reactos/base/applications/fontview/resource.h [iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/resource.h [iso-8859-1] Sun Jul 15 14:25:19
2012
@@ -3,11 +3,11 @@
 #define IDS_ERROR_NOMEM 101
 #define IDS_ERROR_NOFONT 102
 #define IDS_ERROR_NOCLASS 103
-#define IDS_ERROR_BADCMD 104
-#define IDS_QUIT 500
+#define IDS_INSTALL 500
 #define IDS_PRINT 501
 #define IDS_STRING 502
+#define IDS_OPEN 503
 #define IDS_CHARSLOWER 700
 #define IDS_CHARSUPPER 701
    

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

[ros-diffs] [tkreuzer] 56898: [FONTVIEW] - When no file name is passed on the command line, open a file-open-dialog - Halfplement printing - Replace Quit button with install button - Patch by milawynsrealm <sp...