mirror of
https://github.com/reactos/reactos.git
synced 2025-08-04 00:25:41 +00:00
[NETSHELL] Trivial tweaks (#6484)
Some trivial tweaks that I saw while backporting other stuff: - es-ES.rc/pt-PT.rc: undesired spaces at the end of groupboxes, which were used as a historic workaround ~ 10 years ago - zh-TW.rc: wrong indentation (tabs instead of spaces) - shfldr_netconnect.cpp: superfluous GPL duplication, unneeded exclamation-marks in dbg-prints, undesired double-space formatting saves a few bytes
This commit is contained in:
parent
edf3cc7a7a
commit
874b5a4e00
4 changed files with 16 additions and 36 deletions
|
@ -21,7 +21,7 @@ BEGIN
|
||||||
PUSHBUTTON "Inst&alar", IDC_INSTALL, 9, 105, 65, 14, WS_DISABLED | WS_TABSTOP
|
PUSHBUTTON "Inst&alar", IDC_INSTALL, 9, 105, 65, 14, WS_DISABLED | WS_TABSTOP
|
||||||
PUSHBUTTON "&Desinstalar", IDC_UNINSTALL, 90, 105, 65, 14, WS_DISABLED | WS_TABSTOP
|
PUSHBUTTON "&Desinstalar", IDC_UNINSTALL, 90, 105, 65, 14, WS_DISABLED | WS_TABSTOP
|
||||||
PUSHBUTTON "&Propiedades", IDC_PROPERTIES, 174, 105, 65, 14
|
PUSHBUTTON "&Propiedades", IDC_PROPERTIES, 174, 105, 65, 14
|
||||||
GROUPBOX "Descripción ", -1, 9, 128, 230, 46, BS_GROUPBOX
|
GROUPBOX "Descripción", -1, 9, 128, 230, 46, BS_GROUPBOX
|
||||||
LTEXT "", IDC_DESCRIPTION, 15, 140, 217, 28, WS_GROUP
|
LTEXT "", IDC_DESCRIPTION, 15, 140, 217, 28, WS_GROUP
|
||||||
AUTOCHECKBOX "Mostrar icono en el área de notificación al conectarse", IDC_SHOWTASKBAR, 9, 181, 230, 12, WS_TABSTOP
|
AUTOCHECKBOX "Mostrar icono en el área de notificación al conectarse", IDC_SHOWTASKBAR, 9, 181, 230, 12, WS_TABSTOP
|
||||||
AUTOCHECKBOX "Notificarme cuando esta conexión tenga conectividad limitada o nula", IDC_NOTIFYNOCONNECTION, 9, 195, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP
|
AUTOCHECKBOX "Notificarme cuando esta conexión tenga conectividad limitada o nula", IDC_NOTIFYNOCONNECTION, 9, 195, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP
|
||||||
|
@ -39,11 +39,11 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
|
||||||
CAPTION "General"
|
CAPTION "General"
|
||||||
FONT 8, "MS Shell Dlg"
|
FONT 8, "MS Shell Dlg"
|
||||||
BEGIN
|
BEGIN
|
||||||
GROUPBOX "Conexión ", -1, 9, 8, 190, 58, BS_GROUPBOX
|
GROUPBOX "Conexión", -1, 9, 8, 190, 58, BS_GROUPBOX
|
||||||
LTEXT "Estado:", -1, 22, 20, 65, 8
|
LTEXT "Estado:", -1, 22, 20, 65, 8
|
||||||
LTEXT "Duración:", -1, 22, 34, 65, 8
|
LTEXT "Duración:", -1, 22, 34, 65, 8
|
||||||
LTEXT "Velocidad:", -1, 22, 48, 65, 8
|
LTEXT "Velocidad:", -1, 22, 48, 65, 8
|
||||||
GROUPBOX "Actividad ", -1, 9, 74, 190, 70, BS_GROUPBOX
|
GROUPBOX "Actividad", -1, 9, 74, 190, 70, BS_GROUPBOX
|
||||||
LTEXT "Enviados", -1, 60, 90, 60, 8
|
LTEXT "Enviados", -1, 60, 90, 60, 8
|
||||||
ICON "", IDC_NETSTAT, 110, 85, 32, 32
|
ICON "", IDC_NETSTAT, 110, 85, 32, 32
|
||||||
RTEXT "Recibidos", -1, 146, 90, 44, 8
|
RTEXT "Recibidos", -1, 146, 90, 44, 8
|
||||||
|
@ -62,7 +62,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
|
||||||
CAPTION "Soporte"
|
CAPTION "Soporte"
|
||||||
FONT 8, "MS Shell Dlg"
|
FONT 8, "MS Shell Dlg"
|
||||||
BEGIN
|
BEGIN
|
||||||
GROUPBOX "Estado de la conexión ", -1, 9, 8, 190, 88, BS_GROUPBOX
|
GROUPBOX "Estado de la conexión", -1, 9, 8, 190, 88, BS_GROUPBOX
|
||||||
LTEXT "Tipo de dirección:", -1, 22, 20, 80, 8
|
LTEXT "Tipo de dirección:", -1, 22, 20, 80, 8
|
||||||
LTEXT "Dirección IP:", -1, 22, 34, 80, 8
|
LTEXT "Dirección IP:", -1, 22, 34, 80, 8
|
||||||
LTEXT "Máscara de subred:", -1, 22, 48, 80, 8
|
LTEXT "Máscara de subred:", -1, 22, 48, 80, 8
|
||||||
|
|
|
@ -13,7 +13,7 @@ BEGIN
|
||||||
PUSHBUTTON "Inst&alar", IDC_INSTALL, 9, 105, 65, 14, WS_DISABLED | WS_TABSTOP
|
PUSHBUTTON "Inst&alar", IDC_INSTALL, 9, 105, 65, 14, WS_DISABLED | WS_TABSTOP
|
||||||
PUSHBUTTON "&Desinstalar", IDC_UNINSTALL, 90, 105, 65, 14, WS_DISABLED | WS_TABSTOP
|
PUSHBUTTON "&Desinstalar", IDC_UNINSTALL, 90, 105, 65, 14, WS_DISABLED | WS_TABSTOP
|
||||||
PUSHBUTTON "&Propriedades", IDC_PROPERTIES, 174, 105, 65, 14
|
PUSHBUTTON "&Propriedades", IDC_PROPERTIES, 174, 105, 65, 14
|
||||||
GROUPBOX "Descrição ", -1, 9, 128, 230, 46, BS_GROUPBOX
|
GROUPBOX "Descrição", -1, 9, 128, 230, 46, BS_GROUPBOX
|
||||||
LTEXT "", IDC_DESCRIPTION, 15, 140, 217, 28, WS_GROUP
|
LTEXT "", IDC_DESCRIPTION, 15, 140, 217, 28, WS_GROUP
|
||||||
AUTOCHECKBOX "&Mostrar icon na área de notificação quando ligado", IDC_SHOWTASKBAR, 9, 181, 230, 12, WS_TABSTOP
|
AUTOCHECKBOX "&Mostrar icon na área de notificação quando ligado", IDC_SHOWTASKBAR, 9, 181, 230, 12, WS_TABSTOP
|
||||||
AUTOCHECKBOX "&Notificar-me quando a conectividade desta ligação for limitada ou nula", IDC_NOTIFYNOCONNECTION, 9, 195, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP
|
AUTOCHECKBOX "&Notificar-me quando a conectividade desta ligação for limitada ou nula", IDC_NOTIFYNOCONNECTION, 9, 195, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP
|
||||||
|
@ -31,11 +31,11 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
|
||||||
CAPTION "Geral"
|
CAPTION "Geral"
|
||||||
FONT 8, "MS Shell Dlg"
|
FONT 8, "MS Shell Dlg"
|
||||||
BEGIN
|
BEGIN
|
||||||
GROUPBOX "Ligação ", -1, 9, 8, 190, 58, BS_GROUPBOX
|
GROUPBOX "Ligação", -1, 9, 8, 190, 58, BS_GROUPBOX
|
||||||
LTEXT "Estado:", -1, 22, 20, 65, 8
|
LTEXT "Estado:", -1, 22, 20, 65, 8
|
||||||
LTEXT "Duração:", -1, 22, 34, 65, 8
|
LTEXT "Duração:", -1, 22, 34, 65, 8
|
||||||
LTEXT "Velocidade:", -1, 22, 48, 65, 8
|
LTEXT "Velocidade:", -1, 22, 48, 65, 8
|
||||||
GROUPBOX "Actividade ", -1, 9, 74, 190, 70, BS_GROUPBOX
|
GROUPBOX "Actividade", -1, 9, 74, 190, 70, BS_GROUPBOX
|
||||||
LTEXT "Enviados", -1, 60, 90, 60, 8
|
LTEXT "Enviados", -1, 60, 90, 60, 8
|
||||||
ICON "", IDC_NETSTAT, 110, 85, 32, 32
|
ICON "", IDC_NETSTAT, 110, 85, 32, 32
|
||||||
RTEXT "Recebidos", -1, 146, 90, 44, 8
|
RTEXT "Recebidos", -1, 146, 90, 44, 8
|
||||||
|
@ -54,7 +54,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
|
||||||
CAPTION "Suporte"
|
CAPTION "Suporte"
|
||||||
FONT 8, "MS Shell Dlg"
|
FONT 8, "MS Shell Dlg"
|
||||||
BEGIN
|
BEGIN
|
||||||
GROUPBOX "Estado de ligação ", -1, 9, 8, 190, 88, BS_GROUPBOX
|
GROUPBOX "Estado de ligação", -1, 9, 8, 190, 88, BS_GROUPBOX
|
||||||
LTEXT "Tipo de endereço:", -1, 22, 20, 80, 8
|
LTEXT "Tipo de endereço:", -1, 22, 20, 80, 8
|
||||||
LTEXT "Endereço IP:", -1, 22, 34, 80, 8
|
LTEXT "Endereço IP:", -1, 22, 34, 80, 8
|
||||||
LTEXT "Máscara de sub-rede:", -1, 22, 48, 80, 8
|
LTEXT "Máscara de sub-rede:", -1, 22, 48, 80, 8
|
||||||
|
|
|
@ -93,7 +93,7 @@ BEGIN
|
||||||
LTEXT "請問您想使用一般或自訂設定:", IDC_STATIC, 53, 7, 240, 20
|
LTEXT "請問您想使用一般或自訂設定:", IDC_STATIC, 53, 7, 240, 20
|
||||||
AUTORADIOBUTTON "一般設定", IDC_NETWORK_TYPICAL, 53, 27, 253, 18, WS_TABSTOP | WS_GROUP
|
AUTORADIOBUTTON "一般設定", IDC_NETWORK_TYPICAL, 53, 27, 253, 18, WS_TABSTOP | WS_GROUP
|
||||||
AUTORADIOBUTTON "自訂設定", IDC_NETWORK_CUSTOM, 53, 72, 253, 18, WS_TABSTOP
|
AUTORADIOBUTTON "自訂設定", IDC_NETWORK_CUSTOM, 53, 72, 253, 18, WS_TABSTOP
|
||||||
LTEXT "使用 ReactOS 網路用戶端、ReactOS 網絡檔案和列印共享及具有自動指派位址功能的 TCP/IP 傳輸協議來建立網路連接。", IDC_STATIC, 65, 45, 240, 30
|
LTEXT "使用 ReactOS 網路用戶端、ReactOS 網絡檔案和列印共享及具有自動指派位址功能的 TCP/IP 傳輸協議來建立網路連接。", IDC_STATIC, 65, 45, 240, 30
|
||||||
LTEXT "可讓您手動更改網路元件。", IDC_STATIC, 65, 90, 243, 20
|
LTEXT "可讓您手動更改網路元件。", IDC_STATIC, 65, 90, 243, 20
|
||||||
END
|
END
|
||||||
|
|
||||||
|
|
|
@ -2,27 +2,7 @@
|
||||||
* PROJECT: ReactOS Shell
|
* PROJECT: ReactOS Shell
|
||||||
* LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later)
|
* LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later)
|
||||||
* PURPOSE: CNetworkConnections Shell Folder
|
* PURPOSE: CNetworkConnections Shell Folder
|
||||||
* COPYRIGHT: Copyright 2008 Johannes Anderwald (johannes.anderwald@reactos.org)
|
* COPYRIGHT: Copyright 2008 Johannes Anderwald <johannes.anderwald@reactos.org>
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Network Connections Shell Folder
|
|
||||||
*
|
|
||||||
* Copyright 2008 Johannes Anderwald <johannes.anderwald@reactos.org>
|
|
||||||
*
|
|
||||||
* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "precomp.h"
|
#include "precomp.h"
|
||||||
|
@ -256,7 +236,7 @@ HRESULT WINAPI CNetworkConnections::GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD
|
||||||
PWCHAR pwchName = ILGetConnName(pidl);
|
PWCHAR pwchName = ILGetConnName(pidl);
|
||||||
if (!pwchName)
|
if (!pwchName)
|
||||||
{
|
{
|
||||||
ERR("Got invalid pidl!\n");
|
ERR("Got invalid pidl\n");
|
||||||
return E_INVALIDARG;
|
return E_INVALIDARG;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -473,7 +453,7 @@ HRESULT WINAPI CNetConUiObject::QueryContextMenu(
|
||||||
PNETCONIDSTRUCT pdata = ILGetConnData(m_pidl);
|
PNETCONIDSTRUCT pdata = ILGetConnData(m_pidl);
|
||||||
if (!pdata)
|
if (!pdata)
|
||||||
{
|
{
|
||||||
ERR("Got invalid pidl!\n");
|
ERR("Got invalid pidl\n");
|
||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -511,7 +491,7 @@ HRESULT WINAPI CNetConUiObject::QueryContextMenu(
|
||||||
if (pdata->Status == NCS_CONNECTED)
|
if (pdata->Status == NCS_CONNECTED)
|
||||||
_InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + 7, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_PROPERTIES), MFS_ENABLED);
|
_InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + 7, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_PROPERTIES), MFS_ENABLED);
|
||||||
else
|
else
|
||||||
_InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + 7, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_PROPERTIES), MFS_DEFAULT);
|
_InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + 7, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_PROPERTIES), MFS_DEFAULT);
|
||||||
|
|
||||||
return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 9);
|
return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 9);
|
||||||
}
|
}
|
||||||
|
@ -542,7 +522,7 @@ ShowNetConnectionStatus(
|
||||||
PNETCONIDSTRUCT pdata = ILGetConnData(pidl);
|
PNETCONIDSTRUCT pdata = ILGetConnData(pidl);
|
||||||
if (!pdata)
|
if (!pdata)
|
||||||
{
|
{
|
||||||
ERR("Got invalid pidl!\n");
|
ERR("Got invalid pidl\n");
|
||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -758,7 +738,7 @@ HRESULT WINAPI CNetConUiObject::GetIconLocation(
|
||||||
PNETCONIDSTRUCT pdata = ILGetConnData(m_pidl);
|
PNETCONIDSTRUCT pdata = ILGetConnData(m_pidl);
|
||||||
if (!pdata)
|
if (!pdata)
|
||||||
{
|
{
|
||||||
ERR("Got invalid pidl!\n");
|
ERR("Got invalid pidl\n");
|
||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -832,7 +812,7 @@ HRESULT WINAPI CNetworkConnections::Execute(LPSHELLEXECUTEINFOW pei)
|
||||||
PNETCONIDSTRUCT pdata = ILGetConnData(pidl);
|
PNETCONIDSTRUCT pdata = ILGetConnData(pidl);
|
||||||
if (!pdata)
|
if (!pdata)
|
||||||
{
|
{
|
||||||
ERR("Got invalid pidl!\n");
|
ERR("Got invalid pidl\n");
|
||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue