Changelog:
Marcelo Duarte <wine-devel@bol.com.br>
- lesser adjustments in cdlg_Pt.rc (better visual)
- localization to the Portuguese of Brazil of wininet resource.
---
Marcelo Duarte
? dlls/wininet/wininet_Pt.rc
Index: dlls/commdlg/cdlg_Pt.rc
===================================================================
RCS file: /home/wine/wine/dlls/commdlg/cdlg_Pt.rc,v
retrieving revision 1.10
diff -u -r1.10 cdlg_Pt.rc
--- dlls/commdlg/cdlg_Pt.rc 30 Jun 2003 20:22:35 -0000 1.10
+++ dlls/commdlg/cdlg_Pt.rc 22 Jul 2003 05:07:55 -0000
@@ -96,7 +96,7 @@
LTEXT "[none]", 1088, 35, 35, 120, 9
RADIOBUTTON "Impressora &Específica", 1057, 16, 50, 80, 12
COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "Ok", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ DEFPUSHBUTTON "OK", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
PUSHBUTTON "Cancelar", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
PUSHBUTTON "&Configurar", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
GROUPBOX "Orientação", 1073, 6, 85, 100, 50, BS_GROUPBOX
@@ -166,7 +166,7 @@
CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116
CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26
- DEFPUSHBUTTON "Ok", IDOK, 4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ DEFPUSHBUTTON "OK", IDOK, 4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
PUSHBUTTON "Cancelar", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
PUSHBUTTON "Aj&uda", 1038,100,166, 44, 14
PUSHBUTTON "&Adicionar Cor Personalizada", 712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP
@@ -220,9 +220,9 @@
CAPTION "Imprimir"
FONT 8, "Helv"
{
- DEFPUSHBUTTON "Ok", IDOK, 180,164, 48,14, WS_GROUP | BS_DEFPUSHBUTTON
- PUSHBUTTON "Cancelar", IDCANCEL, 232,164, 48,14, WS_GROUP
- PUSHBUTTON "&Ajuda", pshHelp, 50, 161, 48,14, WS_GROUP
+ DEFPUSHBUTTON "OK", IDOK, 180,164, 50,14, WS_GROUP | BS_DEFPUSHBUTTON
+ PUSHBUTTON "Cancelar", IDCANCEL, 232,164, 50,14, WS_GROUP
+ PUSHBUTTON "&Ajuda", pshHelp, 50, 161, 50,14, WS_GROUP
GROUPBOX "Impressora", grp4, 8, 4, 272,84, WS_GROUP
CONTROL "Imprimir em arqui&vo", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,212,70,64,12
@@ -260,9 +260,9 @@
CAPTION "Configurações de Impressão"
FONT 8, "Helv"
BEGIN
- DEFPUSHBUTTON "OK", IDOK,180,156,48,14,WS_GROUP
- PUSHBUTTON "Cancelar", IDCANCEL,232,156,48,14
-/* PUSHBUTTON "Rede...", psh5, 284,156,48,14 */
+ DEFPUSHBUTTON "OK", IDOK,180,156,50,14,WS_GROUP
+ PUSHBUTTON "Cancelar", IDCANCEL,232,156,50,14
+/* PUSHBUTTON "Rede...", psh5, 284,156,50,14 */
GROUPBOX "Impressora", grp4, 8, 4, 272, 84, WS_GROUP
PUSHBUTTON "&Propriedades", psh2, 212, 17, 60, 14, WS_GROUP
@@ -316,7 +316,7 @@
EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON
PUSHBUTTON "Cancelar", IDCANCEL, 126, 220, 50, 14
- PUSHBUTTON "Im&pressora...", psh3, 184, 220, 48, 14
+ PUSHBUTTON "Im&pressora...", psh3, 184, 220, 50, 14
END
NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164
@@ -324,21 +324,21 @@
CAPTION "Abrir"
FONT 8, "helv"
{
- LTEXT "Procurar &em",IDC_LOOKINSTATIC,7,6,27,8, SS_NOTIFY
- COMBOBOX IDC_LOOKIN,36,3,138,300,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+ LTEXT "&Examinar:",IDC_LOOKINSTATIC,5,6,31,8, SS_NOTIFY
+ COMBOBOX IDC_LOOKIN,40,3,134,300,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
LTEXT "" , IDC_TOOLBARSTATIC, 172, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE
LISTBOX IDC_SHELLSTATIC,4,20,272,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE
- LTEXT "Nome do &arquivo:",IDC_FILENAMESTATIC,5,112,48,8, SS_NOTIFY
+ LTEXT "&Nome do arquivo:",IDC_FILENAMESTATIC,5,112,48,16, SS_NOTIFY
EDITTEXT IDC_FILENAME,54,111,155,12,ES_AUTOHSCROLL
- LTEXT "Arquivos do &tipo",IDC_FILETYPESTATIC,5,131,48,8, SS_NOTIFY
+ LTEXT "Arquivos do &tipo",IDC_FILETYPESTATIC,5,131,48,16, SS_NOTIFY
COMBOBOX IDC_FILETYPE,54,129,155,100,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
CONTROL "Abrir como &somente-leitura",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,148,74,10
- DEFPUSHBUTTON "&Abrir", IDOK,222,110,50,13
+ DEFPUSHBUTTON "&Abrir", IDOK,222,110,50,14
PUSHBUTTON "Cancelar", IDCANCEL,222,128,50,14
PUSHBUTTON "&Ajuda", pshHelp,222,145,50,14
}
Index: dlls/wininet/rsrc.rc
===================================================================
RCS file: /home/wine/wine/dlls/wininet/rsrc.rc,v
retrieving revision 1.1
diff -u -r1.1 rsrc.rc
--- dlls/wininet/rsrc.rc 22 Jul 2003 03:17:52 -0000 1.1
+++ dlls/wininet/rsrc.rc 22 Jul 2003 05:08:02 -0000
@@ -40,3 +40,4 @@
* get localized bitmaps for example.
*/
#include "wininet_En.rc"
+#include "wininit_Pt.rc"
Index: dlls/x11drv/winpos.c
===================================================================
RCS file: /home/wine/wine/dlls/x11drv/winpos.c,v
retrieving revision 1.66
diff -u -r1.66 winpos.c
--- dlls/x11drv/winpos.c 24 Jun 2003 19:31:47 -0000 1.66
+++ dlls/x11drv/winpos.c 22 Jul 2003 05:08:12 -0000
@@ -892,6 +892,9 @@
UINT wvrFlags = 0;
BOOL bChangePos;
+ /* This is needed to flush pending X ConfigureNotify events on this window */
+ MsgWaitForMultipleObjectsEx( 0, NULL, 0, 0, 0 );
+
TRACE( "hwnd %p, swp (%i,%i)-(%i,%i) flags %08x\n",
winpos->hwnd, winpos->x, winpos->y,
winpos->x + winpos->cx, winpos->y + winpos->cy, winpos->flags);
--- /dev/null 1998-05-05 17:32:27.000000000 -0300
+++ dlls/wininet/wininet_Pt.rc 2003-07-22 01:59:49.000000000 -0300
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2003 Marcelo Duarte
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT
+
+IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Entrar Senha da Rede"
+FONT 8, "Helv"
+{
+ LTEXT "Por favor, entre com o usuário e a senha:", -1, 40, 6, 150, 15
+ LTEXT "Proxy", -1, 40, 26, 50, 10
+ LTEXT "Realm", -1, 40, 46, 50, 10
+ LTEXT "Usuário", -1, 40, 66, 50, 10
+ LTEXT "Senha", -1, 40, 86, 50, 10
+ LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0
+ LTEXT "" IDC_REALM, 80, 46, 150, 14, 0
+ EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
+ EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD
+ CHECKBOX "&Salvar esta senha (inseguro)", IDC_SAVEPASSWORD,
+ 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
+ PUSHBUTTON "Cancelar", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP
+}
