[ekohl] 68394: [NETCFGX] - Initialize the 'IP Address' and 'Gateway Address' edit dialogs properly. - OK pushbuttons are default pushbuttons.
12 Jul
2015
12 Jul
'15
9:49 p.m.
Author: ekohl
Date: Sun Jul 12 21:49:10 2015
New Revision: 68394
URL: http://svn.reactos.org/svn/reactos?rev=68394&view=rev
Log:
[NETCFGX]
- Initialize the 'IP Address' and 'Gateway Address' edit dialogs
properly.
- OK pushbuttons are default pushbuttons.
Modified:
trunk/reactos/dll/win32/netcfgx/lang/bg-BG.rc
trunk/reactos/dll/win32/netcfgx/lang/cs-CZ.rc
trunk/reactos/dll/win32/netcfgx/lang/da-DK.rc
trunk/reactos/dll/win32/netcfgx/lang/de-DE.rc
trunk/reactos/dll/win32/netcfgx/lang/el-GR.rc
trunk/reactos/dll/win32/netcfgx/lang/en-US.rc
trunk/reactos/dll/win32/netcfgx/lang/es-ES.rc
trunk/reactos/dll/win32/netcfgx/lang/fr-FR.rc
trunk/reactos/dll/win32/netcfgx/lang/he-IL.rc
trunk/reactos/dll/win32/netcfgx/lang/hu-HU.rc
trunk/reactos/dll/win32/netcfgx/lang/id-ID.rc
trunk/reactos/dll/win32/netcfgx/lang/it-IT.rc
trunk/reactos/dll/win32/netcfgx/lang/ja-JP.rc
trunk/reactos/dll/win32/netcfgx/lang/nl-NL.rc
trunk/reactos/dll/win32/netcfgx/lang/no-NO.rc
trunk/reactos/dll/win32/netcfgx/lang/pl-PL.rc
trunk/reactos/dll/win32/netcfgx/lang/ro-RO.rc
trunk/reactos/dll/win32/netcfgx/lang/ru-RU.rc
trunk/reactos/dll/win32/netcfgx/lang/sk-SK.rc
trunk/reactos/dll/win32/netcfgx/lang/sq-AL.rc
trunk/reactos/dll/win32/netcfgx/lang/sv-SE.rc
trunk/reactos/dll/win32/netcfgx/lang/tr-TR.rc
trunk/reactos/dll/win32/netcfgx/lang/uk-UA.rc
trunk/reactos/dll/win32/netcfgx/lang/zh-CN.rc
trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c
Modified: trunk/reactos/dll/win32/netcfgx/lang/bg-BG.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/bg-…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/lang/bg-BG.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/lang/bg-BG.rc [iso-8859-1] Sun Jul 12 21:49:10 2015
@@ -116,7 +116,7 @@
LTEXT "IP адÑеÑ:", -1, 5, 15, 70, 12
LTEXT "ÐодмÑежова маÑка:", -1, 5, 30, 70, 12
CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100,
30, 80, 12
- PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
+ DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
PUSHBUTTON "ÐÑказ", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
END
@@ -130,7 +130,7 @@
CHECKBOX "ÐвÑомаÑиÑни меÑни единиÑи", IDC_USEMETRIC,
15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
- PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
+ DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
PUSHBUTTON "ÐÑказ", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
END
Modified: trunk/reactos/dll/win32/netcfgx/lang/cs-CZ.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/cs-…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/lang/cs-CZ.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/lang/cs-CZ.rc [iso-8859-1] Sun Jul 12 21:49:10 2015
@@ -122,7 +122,7 @@
LTEXT "IP adresa:", -1, 5, 15, 70, 12
LTEXT "Maska podsÃtÄ:", -1, 5, 30, 70, 12
CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100,
30, 80, 12
- PUSHBUTTON "OK", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
+ DEFPUSHBUTTON "OK", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
PUSHBUTTON "Storno", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
END
@@ -136,7 +136,7 @@
CHECKBOX "Automatická metrika", IDC_USEMETRIC, 15, 30, 190, 12,
BS_AUTOCHECKBOX | WS_TABSTOP
LTEXT "&Metrika:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
- PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
+ DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
PUSHBUTTON "Storno", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
END
Modified: trunk/reactos/dll/win32/netcfgx/lang/da-DK.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/da-…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/lang/da-DK.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/lang/da-DK.rc [iso-8859-1] Sun Jul 12 21:49:10 2015
@@ -116,7 +116,7 @@
LTEXT "IP address:", -1, 5, 15, 70, 12
LTEXT "Subnet mask:", -1, 5, 30, 70, 12
CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100,
30, 80, 12
- PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
+ DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
END
@@ -130,7 +130,7 @@
CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12,
BS_AUTOCHECKBOX | WS_TABSTOP
LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
- PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
+ DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
END
Modified: trunk/reactos/dll/win32/netcfgx/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/de-…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/lang/de-DE.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/lang/de-DE.rc [iso-8859-1] Sun Jul 12 21:49:10 2015
@@ -116,7 +116,7 @@
LTEXT "IP-Adresse:", -1, 5, 15, 70, 12
LTEXT "Subnetzmaske:", -1, 5, 30, 70, 12
CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100,
30, 80, 12
- PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
+ DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
PUSHBUTTON "Abbrechen", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
END
@@ -130,7 +130,7 @@
CHECKBOX "Automatische Metrik", IDC_USEMETRIC, 15, 30, 190, 12,
BS_AUTOCHECKBOX | WS_TABSTOP
LTEXT "&Metrik:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
- PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
+ DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
PUSHBUTTON "Abbrechen", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
END
Modified: trunk/reactos/dll/win32/netcfgx/lang/el-GR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/el-…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/lang/el-GR.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/lang/el-GR.rc [iso-8859-1] Sun Jul 12 21:49:10 2015
@@ -116,7 +116,7 @@
LTEXT "IP address:", -1, 5, 15, 70, 12
LTEXT "Subnet mask:", -1, 5, 30, 70, 12
CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100,
30, 80, 12
- PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
+ DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
END
@@ -130,7 +130,7 @@
CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12,
BS_AUTOCHECKBOX | WS_TABSTOP
LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
- PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
+ DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
END
Modified: trunk/reactos/dll/win32/netcfgx/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/en-…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/lang/en-US.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/lang/en-US.rc [iso-8859-1] Sun Jul 12 21:49:10 2015
@@ -116,7 +116,7 @@
LTEXT "IP address:", -1, 5, 15, 70, 12
LTEXT "Subnet mask:", -1, 5, 30, 70, 12
CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100,
30, 80, 12
- PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
+ DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
END
@@ -130,7 +130,7 @@
CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12,
BS_AUTOCHECKBOX | WS_TABSTOP
LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
- PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
+ DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
END
Modified: trunk/reactos/dll/win32/netcfgx/lang/es-ES.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/es-…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/lang/es-ES.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/lang/es-ES.rc [iso-8859-1] Sun Jul 12 21:49:10 2015
@@ -116,7 +116,7 @@
LTEXT "Dirección IP:", -1, 5, 15, 70, 12
LTEXT "Máscara de subred:", -1, 5, 30, 70, 12
CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100,
30, 80, 12
- PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
+ DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
PUSHBUTTON "Cancelar", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
END
@@ -130,7 +130,7 @@
CHECKBOX "Métrica automática", IDC_USEMETRIC, 15, 30, 190, 12,
BS_AUTOCHECKBOX | WS_TABSTOP
LTEXT "&Métrica:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
- PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
+ DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
PUSHBUTTON "Cancelar", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
END
Modified: trunk/reactos/dll/win32/netcfgx/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/fr-…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/lang/fr-FR.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/lang/fr-FR.rc [iso-8859-1] Sun Jul 12 21:49:10 2015
@@ -116,7 +116,7 @@
LTEXT "Adresse IP:", -1, 5, 15, 70, 12
LTEXT "Masque de sous-réseau:", -1, 5, 30, 70, 12
CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100,
30, 80, 12
- PUSHBUTTON "Ajouter", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
+ DEFPUSHBUTTON "Ajouter", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
PUSHBUTTON "Annuler", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
END
@@ -130,7 +130,7 @@
CHECKBOX "Métrique automatique", IDC_USEMETRIC, 15, 30, 190, 12,
BS_AUTOCHECKBOX | WS_TABSTOP
LTEXT "Métrique :", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
- PUSHBUTTON "Ajouter", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
+ DEFPUSHBUTTON "Ajouter", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
PUSHBUTTON "Annuler", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
END
Modified: trunk/reactos/dll/win32/netcfgx/lang/he-IL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/he-…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/lang/he-IL.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/lang/he-IL.rc [iso-8859-1] Sun Jul 12 21:49:10 2015
@@ -116,7 +116,7 @@
LTEXT "×ת××ת IP:", -1, 5, 15, 70, 12
LTEXT "×ס×ת רשת ××©× ×:", -1, 5, 30, 70, 12
CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100,
30, 80, 12
- PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
+ DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
PUSHBUTTON "×××××", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
END
@@ -130,7 +130,7 @@
CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12,
BS_AUTOCHECKBOX | WS_TABSTOP
LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
- PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
+ DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
PUSHBUTTON "×××××", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
END
Modified: trunk/reactos/dll/win32/netcfgx/lang/hu-HU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/hu-…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/lang/hu-HU.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/lang/hu-HU.rc [iso-8859-1] Sun Jul 12 21:49:10 2015
@@ -116,7 +116,7 @@
LTEXT "IP address:", -1, 5, 15, 70, 12
LTEXT "Subnet mask:", -1, 5, 30, 70, 12
CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100,
30, 80, 12
- PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
+ DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
END
@@ -130,7 +130,7 @@
CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12,
BS_AUTOCHECKBOX | WS_TABSTOP
LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
- PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
+ DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
END
Modified: trunk/reactos/dll/win32/netcfgx/lang/id-ID.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/id-…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/lang/id-ID.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/lang/id-ID.rc [iso-8859-1] Sun Jul 12 21:49:10 2015
@@ -116,7 +116,7 @@
LTEXT "IP address:", -1, 5, 15, 70, 12
LTEXT "Subnet mask:", -1, 5, 30, 70, 12
CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100,
30, 80, 12
- PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
+ DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
END
@@ -130,7 +130,7 @@
CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12,
BS_AUTOCHECKBOX | WS_TABSTOP
LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
- PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
+ DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
END
Modified: trunk/reactos/dll/win32/netcfgx/lang/it-IT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/it-…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/lang/it-IT.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/lang/it-IT.rc [iso-8859-1] Sun Jul 12 21:49:10 2015
@@ -116,7 +116,7 @@
LTEXT "Indirizzo IP:", -1, 5, 15, 70, 12
LTEXT "Subnet mask:", -1, 5, 30, 70, 12
CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100,
30, 80, 12
- PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
+ DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
PUSHBUTTON "Annulla", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
END
@@ -130,7 +130,7 @@
CHECKBOX "Metriche automatiche", IDC_USEMETRIC, 15, 30, 190, 12,
BS_AUTOCHECKBOX | WS_TABSTOP
LTEXT "&Metrica:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
- PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
+ DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
PUSHBUTTON "Annulla", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
END
Modified: trunk/reactos/dll/win32/netcfgx/lang/ja-JP.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/ja-…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/lang/ja-JP.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/lang/ja-JP.rc [iso-8859-1] Sun Jul 12 21:49:10 2015
@@ -116,7 +116,7 @@
LTEXT "IP address:", -1, 5, 15, 70, 12
LTEXT "Subnet mask:", -1, 5, 30, 70, 12
CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100,
30, 80, 12
- PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
+ DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
END
@@ -130,7 +130,7 @@
CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12,
BS_AUTOCHECKBOX | WS_TABSTOP
LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
- PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
+ DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
END
Modified: trunk/reactos/dll/win32/netcfgx/lang/nl-NL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/nl-…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/lang/nl-NL.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/lang/nl-NL.rc [iso-8859-1] Sun Jul 12 21:49:10 2015
@@ -116,7 +116,7 @@
LTEXT "IP address:", -1, 5, 15, 70, 12
LTEXT "Subnet mask:", -1, 5, 30, 70, 12
CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100,
30, 80, 12
- PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
+ DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
END
@@ -130,7 +130,7 @@
CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12,
BS_AUTOCHECKBOX | WS_TABSTOP
LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
- PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
+ DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
END
Modified: trunk/reactos/dll/win32/netcfgx/lang/no-NO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/no-…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/lang/no-NO.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/lang/no-NO.rc [iso-8859-1] Sun Jul 12 21:49:10 2015
@@ -116,7 +116,7 @@
LTEXT "IP adresse:", -1, 5, 15, 70, 12
LTEXT "Subnet maske:", -1, 5, 30, 70, 12
CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100,
30, 80, 12
- PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
+ DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
PUSHBUTTON "Avbryt", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
END
@@ -130,7 +130,7 @@
CHECKBOX "Automatisk metrisk", IDC_USEMETRIC, 15, 30, 190, 12,
BS_AUTOCHECKBOX | WS_TABSTOP
LTEXT "&Metrisk:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
- PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
+ DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
PUSHBUTTON "Avbryt", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
END
Modified: trunk/reactos/dll/win32/netcfgx/lang/pl-PL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/pl-…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/lang/pl-PL.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/lang/pl-PL.rc [iso-8859-1] Sun Jul 12 21:49:10 2015
@@ -123,7 +123,7 @@
LTEXT "Adres IP:", -1, 5, 15, 70, 12
LTEXT "Maska podsieci:", -1, 5, 30, 70, 12
CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100,
30, 80, 12
- PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
+ DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
PUSHBUTTON "Anuluj", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
END
@@ -137,7 +137,7 @@
CHECKBOX "Metryka automatyczna", IDC_USEMETRIC, 15, 30, 190, 12,
BS_AUTOCHECKBOX | WS_TABSTOP
LTEXT "&Metryka:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
- PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
+ DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
PUSHBUTTON "Anuluj", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
END
Modified: trunk/reactos/dll/win32/netcfgx/lang/ro-RO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/ro-…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/lang/ro-RO.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/lang/ro-RO.rc [iso-8859-1] Sun Jul 12 21:49:10 2015
@@ -123,7 +123,7 @@
LTEXT "AdresÄ &IP:", -1, 5, 15, 70, 12
LTEXT "MascÄ de &subreÈea:", -1, 5, 30, 70, 12
CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100,
30, 80, 12
- PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
+ DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
PUSHBUTTON "A&nuleazÄ", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
END
@@ -137,7 +137,7 @@
CHECKBOX "MetricÄ stabilitÄ a&utomat", IDC_USEMETRIC, 15, 30, 190,
12, BS_AUTOCHECKBOX | WS_TABSTOP
LTEXT "&MetricÄ:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
- PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
+ DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
PUSHBUTTON "A&nuleazÄ", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
END
Modified: trunk/reactos/dll/win32/netcfgx/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/ru-…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/lang/ru-RU.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/lang/ru-RU.rc [iso-8859-1] Sun Jul 12 21:49:10 2015
@@ -116,7 +116,7 @@
LTEXT "IP адÑеÑ:", -1, 5, 15, 70, 12
LTEXT "ÐаÑка подÑеÑи:", -1, 5, 30, 70, 12
CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100,
30, 80, 12
- PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
+ DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
PUSHBUTTON "ÐÑмена", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
END
@@ -130,7 +130,7 @@
CHECKBOX "ÐвÑомаÑиÑеÑÐºÐ°Ñ Ð¼ÐµÑÑика", IDC_USEMETRIC, 15,
30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
LTEXT "&ÐеÑÑика:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
- PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
+ DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
PUSHBUTTON "ÐÑмена", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
END
Modified: trunk/reactos/dll/win32/netcfgx/lang/sk-SK.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/sk-…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/lang/sk-SK.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/lang/sk-SK.rc [iso-8859-1] Sun Jul 12 21:49:10 2015
@@ -116,7 +116,7 @@
LTEXT "Adresa IP:", -1, 5, 15, 70, 12
LTEXT "Maska podsiete:", -1, 5, 30, 70, 12
CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100,
30, 80, 12
- PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
+ DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
PUSHBUTTON "Zrušiť", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
END
@@ -130,7 +130,7 @@
CHECKBOX "Automatická metrika", IDC_USEMETRIC, 15, 30, 190, 12,
BS_AUTOCHECKBOX | WS_TABSTOP
LTEXT "&Metrika:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
- PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
+ DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
PUSHBUTTON "Zrušiť", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
END
Modified: trunk/reactos/dll/win32/netcfgx/lang/sq-AL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/sq-…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/lang/sq-AL.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/lang/sq-AL.rc [iso-8859-1] Sun Jul 12 21:49:10 2015
@@ -121,7 +121,7 @@
LTEXT "Adresa IP:", -1, 5, 15, 70, 12
LTEXT "Subnet mask:", -1, 5, 30, 70, 12
CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100,
30, 80, 12
- PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
+ DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
PUSHBUTTON "Anulo", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
END
@@ -135,7 +135,7 @@
CHECKBOX "Automatik metrik", IDC_USEMETRIC, 15, 30, 190, 12,
BS_AUTOCHECKBOX | WS_TABSTOP
LTEXT "&Metrik:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
- PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
+ DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
PUSHBUTTON "Anulo", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
END
Modified: trunk/reactos/dll/win32/netcfgx/lang/sv-SE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/sv-…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/lang/sv-SE.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/lang/sv-SE.rc [iso-8859-1] Sun Jul 12 21:49:10 2015
@@ -116,7 +116,7 @@
LTEXT "IP address:", -1, 5, 15, 70, 12
LTEXT "Subnet mask:", -1, 5, 30, 70, 12
CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100,
30, 80, 12
- PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
+ DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
END
@@ -130,7 +130,7 @@
CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12,
BS_AUTOCHECKBOX | WS_TABSTOP
LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
- PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
+ DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
END
Modified: trunk/reactos/dll/win32/netcfgx/lang/tr-TR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/tr-…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/lang/tr-TR.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/lang/tr-TR.rc [iso-8859-1] Sun Jul 12 21:49:10 2015
@@ -118,7 +118,7 @@
LTEXT "IP Adresi:", -1, 5, 15, 70, 12
LTEXT "Alt AÄ Maskesi:", -1, 5, 30, 70, 12
CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100,
30, 80, 12
- PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
+ DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
PUSHBUTTON "Ä°ptal", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
END
@@ -132,7 +132,7 @@
CHECKBOX "KendiliÄinden Ãlçü", IDC_USEMETRIC, 15, 30, 190, 12,
BS_AUTOCHECKBOX | WS_TABSTOP
LTEXT "&Ãlçü:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
- PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
+ DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
PUSHBUTTON "Ä°ptal", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
END
Modified: trunk/reactos/dll/win32/netcfgx/lang/uk-UA.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/uk-…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/lang/uk-UA.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/lang/uk-UA.rc [iso-8859-1] Sun Jul 12 21:49:10 2015
@@ -116,7 +116,7 @@
LTEXT "IP-адÑеÑа:", -1, 5, 15, 70, 12
LTEXT "ÐаÑка пÑдмеÑежÑ:", -1, 5, 30, 70, 12
CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100,
30, 80, 12
- PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
+ DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
PUSHBUTTON "СкаÑÑваÑи", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
END
@@ -130,7 +130,7 @@
CHECKBOX "ÐвÑомаÑиÑна меÑÑика", IDC_USEMETRIC, 15, 30,
190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
LTEXT "&ÐеÑÑика:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
- PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
+ DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
PUSHBUTTON "СкаÑÑваÑи", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
END
Modified: trunk/reactos/dll/win32/netcfgx/lang/zh-CN.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/zh-…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/lang/zh-CN.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/lang/zh-CN.rc [iso-8859-1] Sun Jul 12 21:49:10 2015
@@ -124,7 +124,7 @@
LTEXT "IP å°å:", -1, 5, 15, 70, 12
LTEXT "åç½æ©ç :", -1, 5, 30, 70, 12
CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100,
30, 80, 12
- PUSHBUTTON "ç¡®å®", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
+ DEFPUSHBUTTON "ç¡®å®", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
PUSHBUTTON "åæ¶", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
END
@@ -138,7 +138,7 @@
CHECKBOX "èªå¨è·ç¹è®¡æ°", IDC_USEMETRIC, 15, 30, 190, 12,
BS_AUTOCHECKBOX | WS_TABSTOP
LTEXT "å
¬å¶(&M):", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
- PUSHBUTTON "ç¡®å®", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
+ DEFPUSHBUTTON "ç¡®å®", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
PUSHBUTTON "åæ¶", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
END
Modified: trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/tcpipcon…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c [iso-8859-1] Sun Jul 12 21:49:10
2015
@@ -123,6 +123,7 @@
VOID InsertColumnToListView(HWND hDlgCtrl, UINT ResId, UINT SubItem, UINT Size);
INT_PTR StoreTcpipBasicSettings(HWND hwndDlg, TcpipConfNotifyImpl * This, BOOL bApply);
HRESULT Initialize(TcpipConfNotifyImpl * This);
+UINT GetIpAddressFromStringW(WCHAR *szBuffer);
VOID
DisplayError(UINT ResTxt, UINT ResTitle, UINT Type)
@@ -755,41 +756,46 @@
case WM_INITDIALOG:
pGwSettings = (TcpipGwSettings *)lParam;
SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)lParam);
- if (pGwSettings->bAdd)
- {
- if (LoadStringW(netcfgx_hInstance, IDS_ADD, szBuffer,
sizeof(szBuffer)/sizeof(WCHAR)))
- {
- szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0';
- SendDlgItemMessageW(hwndDlg, IDC_OK, WM_SETTEXT, 0,
(LPARAM)szBuffer);
- }
- EnableWindow(GetDlgItem(hwndDlg, IDC_OK), FALSE);
- SendDlgItemMessageW(hwndDlg, IDC_USEMETRIC, BM_SETCHECK, BST_CHECKED,
0);
- }
- else
- {
- if (LoadStringW(netcfgx_hInstance, IDS_MOD, szBuffer,
sizeof(szBuffer)/sizeof(WCHAR)))
- {
- szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0';
- SendDlgItemMessageW(hwndDlg, IDC_OK, WM_SETTEXT, 0,
(LPARAM)szBuffer);
- }
- SendDlgItemMessageW(hwndDlg, IDC_IPADDR, WM_SETTEXT, 0,
(LPARAM)pGwSettings->szIP);
- if (pGwSettings->Metric)
- {
- SetDlgItemInt(hwndDlg, IDC_METRIC, pGwSettings->Metric, FALSE);
- EnableWindow(GetDlgItem(hwndDlg, IDC_METRIC), TRUE);
- EnableWindow(GetDlgItem(hwndDlg, IDC_METRICTXT), TRUE);
- }
- else
- {
- SendDlgItemMessageW(hwndDlg, IDC_USEMETRIC, BM_SETCHECK, BST_CHECKED,
0);
- EnableWindow(GetDlgItem(hwndDlg, IDC_METRIC), FALSE);
- EnableWindow(GetDlgItem(hwndDlg, IDC_METRICTXT), FALSE);
- }
- }
+
SendDlgItemMessageW(hwndDlg, IDC_IPADDR, IPM_SETRANGE, 0, MAKEIPRANGE(1,
223));
SendDlgItemMessageW(hwndDlg, IDC_IPADDR, IPM_SETRANGE, 1, MAKEIPRANGE(0,
255));
SendDlgItemMessageW(hwndDlg, IDC_IPADDR, IPM_SETRANGE, 2, MAKEIPRANGE(0,
255));
SendDlgItemMessageW(hwndDlg, IDC_IPADDR, IPM_SETRANGE, 3, MAKEIPRANGE(0,
255));
+
+ if (pGwSettings->bAdd)
+ {
+ if (LoadStringW(netcfgx_hInstance, IDS_ADD, szBuffer,
sizeof(szBuffer)/sizeof(WCHAR)))
+ {
+ szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0';
+ SendDlgItemMessageW(hwndDlg, IDC_OK, WM_SETTEXT, 0,
(LPARAM)szBuffer);
+ }
+ EnableWindow(GetDlgItem(hwndDlg, IDC_OK), FALSE);
+ SendDlgItemMessageW(hwndDlg, IDC_USEMETRIC, BM_SETCHECK, BST_CHECKED,
0);
+ }
+ else
+ {
+ if (LoadStringW(netcfgx_hInstance, IDS_MOD, szBuffer,
sizeof(szBuffer)/sizeof(WCHAR)))
+ {
+ szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0';
+ SendDlgItemMessageW(hwndDlg, IDC_OK, WM_SETTEXT, 0,
(LPARAM)szBuffer);
+ }
+
+ if (pGwSettings->szIP)
+ SendDlgItemMessageW(hwndDlg, IDC_IPADDR, IPM_SETADDRESS, 0,
(LPARAM)GetIpAddressFromStringW(pGwSettings->szIP));
+
+ if (pGwSettings->Metric)
+ {
+ SetDlgItemInt(hwndDlg, IDC_METRIC, pGwSettings->Metric, FALSE);
+ EnableWindow(GetDlgItem(hwndDlg, IDC_METRIC), TRUE);
+ EnableWindow(GetDlgItem(hwndDlg, IDC_METRICTXT), TRUE);
+ }
+ else
+ {
+ SendDlgItemMessageW(hwndDlg, IDC_USEMETRIC, BM_SETCHECK, BST_CHECKED,
0);
+ EnableWindow(GetDlgItem(hwndDlg, IDC_METRIC), FALSE);
+ EnableWindow(GetDlgItem(hwndDlg, IDC_METRICTXT), FALSE);
+ }
+ }
return TRUE;
case WM_COMMAND:
if (LOWORD(wParam) == IDC_USEMETRIC)
@@ -934,8 +940,12 @@
szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0';
SendDlgItemMessageW(hwndDlg, IDC_OK, WM_SETTEXT, 0,
(LPARAM)szBuffer);
}
- SendDlgItemMessageW(hwndDlg, IDC_IPADDR, WM_SETTEXT, 0,
(LPARAM)pIpSettings->szIP);
- SendDlgItemMessageW(hwndDlg, IDC_SUBNETMASK, WM_SETTEXT, 0,
(LPARAM)pIpSettings->szMask);
+
+ if (pIpSettings->szIP)
+ SendDlgItemMessageW(hwndDlg, IDC_IPADDR, IPM_SETADDRESS, 0,
(LPARAM)GetIpAddressFromStringW(pIpSettings->szIP));
+
+ if (pIpSettings->szMask)
+ SendDlgItemMessageW(hwndDlg, IDC_SUBNETMASK, IPM_SETADDRESS, 0,
(LPARAM)GetIpAddressFromStringW(pIpSettings->szMask));
}
return TRUE;
case WM_NOTIFY:
3414
days inactive
3414
days old
0 comments
1 participants
participants (1)
-
ekohl＠svn.reactos.org