mirror of
https://github.com/ultimatepp/ultimatepp.git
synced 2026-07-19 14:16:46 -06:00
SysInfo_demo_gui: Added more ip6 support
git-svn-id: svn://ultimatepp.org/upp/trunk@7517 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
koldo
parent
bb032f4780
commit
dfd5271230
2 changed files with 54 additions and 46 deletions
|
|
@ -48,31 +48,33 @@ LAYOUT(SystemInfo, 844, 540)
|
|||
ITEM(Label, dv___14, SetLabel(t_("CPU Speed")).LeftPosZ(204, 88).TopPosZ(52, 16))
|
||||
ITEM(Label, TextBiosVersion, SetFrame(ThinInsetFrame()).LeftPosZ(292, 372).TopPosZ(0, 16))
|
||||
ITEM(Label, TextVersion, SetFrame(ThinInsetFrame()).LeftPosZ(88, 116).TopPosZ(32, 16))
|
||||
ITEM(Label, TextDomain, SetFrame(ThinInsetFrame()).LeftPosZ(764, 76).TopPosZ(16, 16))
|
||||
ITEM(Label, TextIp6, SetFrame(ThinInsetFrame()).HSizePosZ(764, 4).TopPosZ(116, 16))
|
||||
ITEM(Label, TextIp4, SetFrame(ThinInsetFrame()).LeftPosZ(764, 84).TopPosZ(100, 16))
|
||||
ITEM(Label, TextDomain, SetFrame(ThinInsetFrame()).LeftPosZ(764, 128).TopPosZ(84, 16))
|
||||
ITEM(Label, TextKerArchitecture, SetFrame(ThinInsetFrame()).LeftPosZ(528, 136).TopPosZ(72, 16))
|
||||
ITEM(Label, dv___19, SetLabel(t_("Version")).LeftPosZ(0, 88).TopPosZ(32, 16))
|
||||
ITEM(Label, dv___20, SetLabel(t_("Architecture")).LeftPosZ(464, 64).TopPosZ(72, 16))
|
||||
ITEM(Label, dv___21, SetLabel(t_("Version")).LeftPosZ(0, 88).TopPosZ(32, 16))
|
||||
ITEM(Label, dv___22, SetLabel(t_("Architecture")).LeftPosZ(464, 64).TopPosZ(72, 16))
|
||||
ITEM(Label, TextDeskVersion, SetFrame(ThinInsetFrame()).LeftPosZ(292, 116).TopPosZ(104, 16))
|
||||
ITEM(Label, dv___22, SetLabel(t_("Version")).LeftPosZ(204, 88).TopPosZ(104, 16))
|
||||
ITEM(Label, dv___24, SetLabel(t_("Version")).LeftPosZ(204, 88).TopPosZ(104, 16))
|
||||
ITEM(Label, TextMemPercentage, SetFrame(ThinInsetFrame()).LeftPosZ(88, 36).TopPosZ(124, 16))
|
||||
ITEM(Label, TextMemFreeVirtualbytes, SetFrame(ThinInsetFrame()).LeftPosZ(584, 68).TopPosZ(156, 16))
|
||||
ITEM(Label, TextMemFreeVirtual, SetFrame(ThinInsetFrame()).LeftPosZ(688, 52).TopPosZ(156, 16))
|
||||
ITEM(Label, TextMemTotVirtual, SetFrame(ThinInsetFrame()).LeftPosZ(688, 52).TopPosZ(140, 16))
|
||||
ITEM(Label, TextMemTotVirtualbytes, SetFrame(ThinInsetFrame()).LeftPosZ(584, 68).TopPosZ(140, 16))
|
||||
ITEM(Label, TextMemFreeVirtualbytes, SetFrame(ThinInsetFrame()).LeftPosZ(584, 92).TopPosZ(156, 16))
|
||||
ITEM(Label, TextMemFreeVirtual, SetFrame(ThinInsetFrame()).LeftPosZ(716, 52).TopPosZ(156, 16))
|
||||
ITEM(Label, TextMemTotVirtual, SetFrame(ThinInsetFrame()).LeftPosZ(716, 52).TopPosZ(140, 16))
|
||||
ITEM(Label, TextMemTotVirtualbytes, SetFrame(ThinInsetFrame()).LeftPosZ(584, 92).TopPosZ(140, 16))
|
||||
ITEM(Label, TextDesktop, SetFrame(ThinInsetFrame()).LeftPosZ(88, 116).TopPosZ(104, 16))
|
||||
ITEM(Label, dv___29, SetLabel(t_("%")).LeftPosZ(124, 16).TopPosZ(124, 16))
|
||||
ITEM(Label, dv___30, SetLabel(t_("Free Virtual")).LeftPosZ(496, 88).TopPosZ(156, 16))
|
||||
ITEM(Label, dv___31, SetLabel(t_("bytes =")).LeftPosZ(652, 36).TopPosZ(156, 16))
|
||||
ITEM(Label, dv___32, SetLabel(t_("bytes =")).LeftPosZ(652, 36).TopPosZ(140, 16))
|
||||
ITEM(Label, dv___33, SetLabel(t_("Total Virtual")).LeftPosZ(496, 88).TopPosZ(140, 16))
|
||||
ITEM(Label, dv___31, SetLabel(t_("%")).LeftPosZ(124, 16).TopPosZ(124, 16))
|
||||
ITEM(Label, dv___32, SetLabel(t_("Free Virtual")).LeftPosZ(496, 88).TopPosZ(156, 16))
|
||||
ITEM(Label, dv___33, SetLabel(t_("bytes =")).LeftPosZ(680, 36).TopPosZ(156, 16))
|
||||
ITEM(Label, dv___34, SetLabel(t_("bytes =")).LeftPosZ(680, 36).TopPosZ(140, 16))
|
||||
ITEM(Label, dv___35, SetLabel(t_("Total Virtual")).LeftPosZ(496, 88).TopPosZ(140, 16))
|
||||
ITEM(Label, TextMemFreePagingbytes, SetFrame(ThinInsetFrame()).LeftPosZ(336, 68).TopPosZ(156, 16))
|
||||
ITEM(Label, TextMemFreePaging, SetFrame(ThinInsetFrame()).LeftPosZ(440, 52).TopPosZ(156, 16))
|
||||
ITEM(Label, TextMemTotPaging, SetFrame(ThinInsetFrame()).LeftPosZ(440, 52).TopPosZ(140, 16))
|
||||
ITEM(Label, TextMemTotPagingbytes, SetFrame(ThinInsetFrame()).LeftPosZ(336, 68).TopPosZ(140, 16))
|
||||
ITEM(Label, dv___38, SetLabel(t_("Free Paging")).LeftPosZ(248, 88).TopPosZ(156, 16))
|
||||
ITEM(Label, dv___39, SetLabel(t_("bytes =")).LeftPosZ(404, 36).TopPosZ(156, 16))
|
||||
ITEM(Label, dv___40, SetLabel(t_("bytes =")).LeftPosZ(404, 36).TopPosZ(140, 16))
|
||||
ITEM(Label, dv___41, SetLabel(t_("Total Paging")).LeftPosZ(248, 88).TopPosZ(140, 16))
|
||||
ITEM(Label, dv___40, SetLabel(t_("Free Paging")).LeftPosZ(248, 88).TopPosZ(156, 16))
|
||||
ITEM(Label, dv___41, SetLabel(t_("bytes =")).LeftPosZ(404, 36).TopPosZ(156, 16))
|
||||
ITEM(Label, dv___42, SetLabel(t_("bytes =")).LeftPosZ(404, 36).TopPosZ(140, 16))
|
||||
ITEM(Label, dv___43, SetLabel(t_("Total Paging")).LeftPosZ(248, 88).TopPosZ(140, 16))
|
||||
ITEM(Label, TextCompilationBits, SetFrame(ThinInsetFrame()).LeftPosZ(640, 40).TopPosZ(176, 16))
|
||||
ITEM(Label, TextCompilerVersion, SetFrame(ThinInsetFrame()).LeftPosZ(200, 64).TopPosZ(176, 16))
|
||||
ITEM(Label, TextCompiler, SetFrame(ThinInsetFrame()).LeftPosZ(112, 44).TopPosZ(176, 16))
|
||||
|
|
@ -80,45 +82,47 @@ LAYOUT(SystemInfo, 844, 540)
|
|||
ITEM(Label, TextMemFreePhysical, SetFrame(ThinInsetFrame()).LeftPosZ(192, 52).TopPosZ(156, 16))
|
||||
ITEM(Label, TextMemTotPhysical, SetFrame(ThinInsetFrame()).LeftPosZ(192, 52).TopPosZ(140, 16))
|
||||
ITEM(Label, TextMemTotPhysicalbytes, SetFrame(ThinInsetFrame()).LeftPosZ(88, 68).TopPosZ(140, 16))
|
||||
ITEM(Label, dv___49, SetLabel(t_("Bits:")).LeftPosZ(604, 36).TopPosZ(176, 16))
|
||||
ITEM(Label, dv___51, SetLabel(t_("Bits:")).LeftPosZ(604, 36).TopPosZ(176, 16))
|
||||
ITEM(Label, TextCompilationMode, SetFrame(ThinInsetFrame()).LeftPosZ(520, 76).TopPosZ(176, 16))
|
||||
ITEM(Label, dv___51, SetLabel(t_("Mode:")).LeftPosZ(484, 36).TopPosZ(176, 16))
|
||||
ITEM(Label, dv___53, SetLabel(t_("Mode:")).LeftPosZ(484, 36).TopPosZ(176, 16))
|
||||
ITEM(Label, TextCompilationDate, SetFrame(ThinInsetFrame()).LeftPosZ(356, 124).TopPosZ(176, 16))
|
||||
ITEM(Label, dv___53, SetLabel(t_("Compilation date:")).LeftPosZ(268, 88).TopPosZ(176, 16))
|
||||
ITEM(Label, dv___54, SetLabel(t_("Program compiled with:")).LeftPosZ(0, 112).TopPosZ(176, 16))
|
||||
ITEM(Label, dv___55, SetLabel(t_("Free Physical")).LeftPosZ(0, 88).TopPosZ(156, 16))
|
||||
ITEM(Label, dv___56, SetLabel(t_("Version:")).LeftPosZ(160, 40).TopPosZ(176, 16))
|
||||
ITEM(Label, dv___57, SetLabel(t_("bytes =")).LeftPosZ(156, 36).TopPosZ(156, 16))
|
||||
ITEM(Label, dv___58, SetLabel(t_("bytes =")).LeftPosZ(156, 36).TopPosZ(140, 16))
|
||||
ITEM(Label, dv___59, SetLabel(t_("Total Physical")).LeftPosZ(0, 88).TopPosZ(140, 16))
|
||||
ITEM(Label, dv___60, SetLabel(t_("Memory in use")).LeftPosZ(0, 88).TopPosZ(124, 16))
|
||||
ITEM(Label, dv___61, SetLabel(t_("Desktop")).LeftPosZ(0, 88).TopPosZ(104, 16))
|
||||
ITEM(Label, dv___55, SetLabel(t_("Compilation date:")).LeftPosZ(268, 88).TopPosZ(176, 16))
|
||||
ITEM(Label, dv___56, SetLabel(t_("Program compiled with:")).LeftPosZ(0, 112).TopPosZ(176, 16))
|
||||
ITEM(Label, dv___57, SetLabel(t_("Free Physical")).LeftPosZ(0, 88).TopPosZ(156, 16))
|
||||
ITEM(Label, dv___58, SetLabel(t_("Version:")).LeftPosZ(160, 40).TopPosZ(176, 16))
|
||||
ITEM(Label, dv___59, SetLabel(t_("bytes =")).LeftPosZ(156, 36).TopPosZ(156, 16))
|
||||
ITEM(Label, dv___60, SetLabel(t_("bytes =")).LeftPosZ(156, 36).TopPosZ(140, 16))
|
||||
ITEM(Label, dv___61, SetLabel(t_("Total Physical")).LeftPosZ(0, 88).TopPosZ(140, 16))
|
||||
ITEM(Label, dv___62, SetLabel(t_("Memory in use")).LeftPosZ(0, 88).TopPosZ(124, 16))
|
||||
ITEM(Label, dv___63, SetLabel(t_("Desktop")).LeftPosZ(0, 88).TopPosZ(104, 16))
|
||||
ITEM(Label, TextDistVersion, SetFrame(ThinInsetFrame()).LeftPosZ(292, 116).TopPosZ(88, 16))
|
||||
ITEM(Label, dv___63, SetLabel(t_("Network domain:")).LeftPosZ(672, 92).TopPosZ(16, 16))
|
||||
ITEM(Label, Textnname, SetFrame(ThinInsetFrame()).LeftPosZ(764, 76).TopPosZ(0, 16))
|
||||
ITEM(Label, dv___65, SetLabel(t_("Network PC name:")).LeftPosZ(672, 92).TopPosZ(0, 16))
|
||||
ITEM(Label, dv___66, SetLabel(t_("Version")).LeftPosZ(204, 88).TopPosZ(88, 16))
|
||||
ITEM(Label, dv___65, SetLabel(t_("IP6 address:")).LeftPosZ(668, 92).TopPosZ(116, 16))
|
||||
ITEM(Label, dv___66, SetLabel(t_("IP4 address:")).LeftPosZ(668, 92).TopPosZ(100, 16))
|
||||
ITEM(Label, dv___67, SetLabel(t_("Network domain:")).LeftPosZ(668, 92).TopPosZ(84, 16))
|
||||
ITEM(Label, Textnname, SetFrame(ThinInsetFrame()).LeftPosZ(764, 128).TopPosZ(68, 16))
|
||||
ITEM(Label, dv___69, SetLabel(t_("Network PC name:")).LeftPosZ(668, 92).TopPosZ(68, 16))
|
||||
ITEM(Label, dv___70, SetLabel(t_("Version")).LeftPosZ(204, 88).TopPosZ(88, 16))
|
||||
ITEM(Label, TextDistro, SetFrame(ThinInsetFrame()).LeftPosZ(88, 116).TopPosZ(88, 16))
|
||||
ITEM(Label, dv___68, SetLabel(t_("Distro")).LeftPosZ(0, 88).TopPosZ(88, 16))
|
||||
ITEM(Label, dv___72, SetLabel(t_("Distro")).LeftPosZ(0, 88).TopPosZ(88, 16))
|
||||
ITEM(Label, TextKerVersion, SetFrame(ThinInsetFrame()).LeftPosZ(292, 168).TopPosZ(72, 16))
|
||||
ITEM(Label, dv___70, SetLabel(t_("Version")).LeftPosZ(204, 88).TopPosZ(72, 16))
|
||||
ITEM(Label, dv___74, SetLabel(t_("Version")).LeftPosZ(204, 88).TopPosZ(72, 16))
|
||||
ITEM(Label, TextKernel, SetFrame(ThinInsetFrame()).LeftPosZ(88, 116).TopPosZ(72, 16))
|
||||
ITEM(Label, dv___72, SetLabel(t_("Kernel")).LeftPosZ(0, 88).TopPosZ(72, 16))
|
||||
ITEM(Label, dv___76, SetLabel(t_("Kernel")).LeftPosZ(0, 88).TopPosZ(72, 16))
|
||||
ITEM(Label, TextNumber, SetFrame(ThinInsetFrame()).LeftPosZ(88, 116).TopPosZ(52, 16))
|
||||
ITEM(Label, dv___74, SetLabel(t_("Processors num.")).LeftPosZ(0, 88).TopPosZ(52, 16))
|
||||
ITEM(Label, dv___75, SetLabel(t_("Manufacturer")).LeftPosZ(0, 88).TopPosZ(0, 16))
|
||||
ITEM(Label, dv___76, SetLabel(t_("Product name")).LeftPosZ(0, 88).TopPosZ(16, 16))
|
||||
ITEM(Label, dv___78, SetLabel(t_("Processors num.")).LeftPosZ(0, 88).TopPosZ(52, 16))
|
||||
ITEM(Label, dv___79, SetLabel(t_("Manufacturer")).LeftPosZ(0, 88).TopPosZ(0, 16))
|
||||
ITEM(Label, dv___80, SetLabel(t_("Product name")).LeftPosZ(0, 88).TopPosZ(16, 16))
|
||||
ITEM(ArrayCtrl, Adapters, HSizePosZ(0, 4).TopPosZ(372, 56))
|
||||
ITEM(Label, dv___78, SetLabel(t_("Drives")).SetFrame(ThinOutsetFrame()).HSizePosZ(0, 4).TopPosZ(432, 16))
|
||||
ITEM(Label, dv___82, SetLabel(t_("Drives")).SetFrame(ThinOutsetFrame()).HSizePosZ(0, 4).TopPosZ(432, 16))
|
||||
ITEM(ArrayCtrl, Drives, HSizePosZ(0, 4).VSizePosZ(448, 36))
|
||||
ITEM(Label, dv___80, SetLabel(t_("Video")).SetFrame(ThinOutsetFrame()).HSizePosZ(0, 4).TopPosZ(280, 16))
|
||||
ITEM(Label, dv___84, SetLabel(t_("Video")).SetFrame(ThinOutsetFrame()).HSizePosZ(0, 4).TopPosZ(280, 16))
|
||||
ITEM(ArrayCtrl, Video, HSizePosZ(0, 4).TopPosZ(296, 56))
|
||||
ITEM(Label, dv___82, SetLabel(t_("Processors")).SetFrame(ThinOutsetFrame()).HSizePosZ(0, 4).TopPosZ(196, 16))
|
||||
ITEM(Label, dv___86, SetLabel(t_("Processors")).SetFrame(ThinOutsetFrame()).HSizePosZ(0, 4).TopPosZ(196, 16))
|
||||
ITEM(ArrayCtrl, Processors, HSizePosZ(0, 4).TopPosZ(212, 64))
|
||||
ITEM(Button, ButUpdate, SetLabel(t_("Update")).LeftPosZ(4, 88).BottomPosZ(5, 23))
|
||||
ITEM(Label, dv___85, SetLabel(t_("Bios serial")).LeftPosZ(204, 88).TopPosZ(32, 16))
|
||||
ITEM(Label, dv___89, SetLabel(t_("Bios serial")).LeftPosZ(204, 88).TopPosZ(32, 16))
|
||||
ITEM(Label, TextBiosSerial, SetFrame(ThinInsetFrame()).LeftPosZ(292, 80).TopPosZ(32, 16))
|
||||
ITEM(Label, dv___87, SetLabel(t_("Bios release")).LeftPosZ(204, 88).TopPosZ(16, 16))
|
||||
ITEM(Label, dv___91, SetLabel(t_("Bios release")).LeftPosZ(204, 88).TopPosZ(16, 16))
|
||||
ITEM(Label, TextBiosRelease, SetFrame(ThinInsetFrame()).LeftPosZ(292, 80).TopPosZ(16, 16))
|
||||
END_LAYOUT
|
||||
|
||||
|
|
|
|||
|
|
@ -109,10 +109,12 @@ void SystemInfo::Fill() {
|
|||
TextDeskVersion = deskVersion;
|
||||
}
|
||||
|
||||
String nname, domain;
|
||||
if (GetNetworkInfo(nname, domain)) {
|
||||
String nname, domain, ip4, ip6;
|
||||
if (GetNetworkInfo(nname, domain, ip4, ip6)) {
|
||||
Textnname = nname;
|
||||
TextDomain = domain;
|
||||
TextIp4 = ip4;
|
||||
TextIp6 = ip6;
|
||||
}
|
||||
|
||||
int memoryLoad;
|
||||
|
|
@ -217,10 +219,12 @@ void SystemInfo::Fill() {
|
|||
Adapters.AddColumn("Description", 20);
|
||||
Adapters.AddColumn("Fullname", 20);
|
||||
Adapters.AddColumn("MAC", 10);
|
||||
Adapters.AddColumn("IP4", 10);
|
||||
Adapters.AddColumn("IP6", 10);
|
||||
Array <NetAdapter> adapters = GetAdapterInfo();
|
||||
for (int i = 0; i < adapters.GetCount(); ++i)
|
||||
Adapters.Add(adapters[i].type, adapters[i].description, adapters[i].fullname,
|
||||
adapters[i].mac);
|
||||
adapters[i].mac, adapters[i].ip4, adapters[i].ip6);
|
||||
ButUpdate.WhenPush = THISBACK(ButUpdate_Push);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue