* Remove Video entry as duplicates what's now under Display.
* Remove unessicary 'Video ' before renderer/version/vendor entries. * Put entries under Hardware->Display and bump them to the top of the list. Originally committed to SVN as r3593.
This commit is contained in:
parent
400365d831
commit
c32899df9a
6 changed files with 6 additions and 22 deletions
|
@ -178,11 +178,6 @@ public:
|
||||||
/// @retval Integer in bytes
|
/// @retval Integer in bytes
|
||||||
virtual wxString Memory()=0;
|
virtual wxString Memory()=0;
|
||||||
|
|
||||||
/// Video card
|
|
||||||
/// @return Video card description
|
|
||||||
/// @retval Any
|
|
||||||
virtual wxString Video();
|
|
||||||
|
|
||||||
/// Video card
|
/// Video card
|
||||||
/// @return Video card vendor
|
/// @return Video card vendor
|
||||||
/// @retval Any
|
/// @retval Any
|
||||||
|
|
|
@ -79,10 +79,9 @@ const Report::nameMap Report::HumanNames() {
|
||||||
nMap.insert(nPair("syslang", _TT("System Language")));
|
nMap.insert(nPair("syslang", _TT("System Language")));
|
||||||
nMap.insert(nPair("thesauruslang", _TT("Thesaurus Language")));
|
nMap.insert(nPair("thesauruslang", _TT("Thesaurus Language")));
|
||||||
nMap.insert(nPair("unix", _TT("Unix")));
|
nMap.insert(nPair("unix", _TT("Unix")));
|
||||||
nMap.insert(nPair("video", _TT("Video")));
|
nMap.insert(nPair("vendor", _TT("Vendor")));
|
||||||
nMap.insert(nPair("videovendor", _TT("Video Vendor")));
|
nMap.insert(nPair("renderer", _TT("Renderer")));
|
||||||
nMap.insert(nPair("videorenderer", _TT("Video Renderer")));
|
nMap.insert(nPair("version", _TT("Version")));
|
||||||
nMap.insert(nPair("videoversion", _TT("Video Version")));
|
|
||||||
nMap.insert(nPair("videoprovider", _TT("Video Provider")));
|
nMap.insert(nPair("videoprovider", _TT("Video Provider")));
|
||||||
nMap.insert(nPair("windows", _TT("Windows")));
|
nMap.insert(nPair("windows", _TT("Windows")));
|
||||||
nMap.insert(nPair("wxversion", _TT("wx Version")));
|
nMap.insert(nPair("wxversion", _TT("wx Version")));
|
||||||
|
|
|
@ -151,10 +151,6 @@ wxString Platform::DesktopEnvironment() {
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|
||||||
wxString Platform::Video() {
|
|
||||||
return wxString::Format("%s %s (%s)", vendor, renderer, version);
|
|
||||||
}
|
|
||||||
|
|
||||||
wxString Platform::VideoVendor() {
|
wxString Platform::VideoVendor() {
|
||||||
return vendor;
|
return vendor;
|
||||||
}
|
}
|
||||||
|
|
|
@ -70,10 +70,6 @@ wxString PlatformUnixOSX::Memory() {
|
||||||
return "";
|
return "";
|
||||||
};
|
};
|
||||||
|
|
||||||
wxString PlatformUnixOSX::Video() {
|
|
||||||
return "";
|
|
||||||
};
|
|
||||||
|
|
||||||
wxString PlatformUnixOSX::UnixLibraries() {
|
wxString PlatformUnixOSX::UnixLibraries() {
|
||||||
return "";
|
return "";
|
||||||
};
|
};
|
||||||
|
|
|
@ -34,7 +34,6 @@ public:
|
||||||
virtual wxString CPUFeatures();
|
virtual wxString CPUFeatures();
|
||||||
virtual wxString CPUFeatures2();
|
virtual wxString CPUFeatures2();
|
||||||
virtual wxString Memory();
|
virtual wxString Memory();
|
||||||
virtual wxString Video();
|
|
||||||
|
|
||||||
virtual wxString PatchLevel();
|
virtual wxString PatchLevel();
|
||||||
virtual wxString QuickTimeExt();
|
virtual wxString QuickTimeExt();
|
||||||
|
|
|
@ -80,7 +80,6 @@ Report::XMLReport Report::ReportCreate() {
|
||||||
doc.hardware = new wxXmlNode(wxXML_ELEMENT_NODE, "hardware");
|
doc.hardware = new wxXmlNode(wxXML_ELEMENT_NODE, "hardware");
|
||||||
doc.report->AddChild(doc.hardware);
|
doc.report->AddChild(doc.hardware);
|
||||||
Add(doc.hardware, "memory", p->Memory());
|
Add(doc.hardware, "memory", p->Memory());
|
||||||
Add(doc.hardware, "video", p->Video());
|
|
||||||
|
|
||||||
wxXmlNode *cpu = new wxXmlNode(wxXML_ELEMENT_NODE, "cpu");
|
wxXmlNode *cpu = new wxXmlNode(wxXML_ELEMENT_NODE, "cpu");
|
||||||
doc.hardware->AddChild(cpu);
|
doc.hardware->AddChild(cpu);
|
||||||
|
@ -93,13 +92,13 @@ Report::XMLReport Report::ReportCreate() {
|
||||||
|
|
||||||
wxXmlNode *display = new wxXmlNode(wxXML_ELEMENT_NODE, "display");
|
wxXmlNode *display = new wxXmlNode(wxXML_ELEMENT_NODE, "display");
|
||||||
doc.hardware->AddChild(display);
|
doc.hardware->AddChild(display);
|
||||||
|
Add(display, "vendor", p->VideoVendor());
|
||||||
|
Add(display, "renderer", p->VideoRenderer());
|
||||||
|
Add(display, "version", p->VideoVersion());
|
||||||
Add(display, "depth", p->DisplayDepth());
|
Add(display, "depth", p->DisplayDepth());
|
||||||
Add(display, "colour", p->DisplayColour());
|
Add(display, "colour", p->DisplayColour());
|
||||||
Add(display, "size", p->DisplaySize());
|
Add(display, "size", p->DisplaySize());
|
||||||
Add(display, "ppi", p->DisplayPPI());
|
Add(display, "ppi", p->DisplayPPI());
|
||||||
Add(doc.hardware, "videovendor", p->VideoVendor());
|
|
||||||
Add(doc.hardware, "videorenderer", p->VideoRenderer());
|
|
||||||
Add(doc.hardware, "videoversion", p->VideoVersion());
|
|
||||||
|
|
||||||
#ifdef __WINDOWS__
|
#ifdef __WINDOWS__
|
||||||
doc.windows = new wxXmlNode(wxXML_ELEMENT_NODE, "windows");
|
doc.windows = new wxXmlNode(wxXML_ELEMENT_NODE, "windows");
|
||||||
|
|
Loading…
Reference in a new issue