From c32899df9aa035bc8d26d6db0f6722f2b43393ef Mon Sep 17 00:00:00 2001 From: Amar Takhar Date: Sun, 27 Sep 2009 09:27:44 +0000 Subject: [PATCH] * 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. --- aegisub/reporter/include/platform.h | 5 ----- aegisub/reporter/name_map.cpp | 7 +++---- aegisub/reporter/platform.cpp | 4 ---- aegisub/reporter/platform_unix_osx.cpp | 4 ---- aegisub/reporter/platform_unix_osx.h | 1 - aegisub/reporter/report.cpp | 7 +++---- 6 files changed, 6 insertions(+), 22 deletions(-) diff --git a/aegisub/reporter/include/platform.h b/aegisub/reporter/include/platform.h index 4c92e4a9d..fb1b62fdf 100644 --- a/aegisub/reporter/include/platform.h +++ b/aegisub/reporter/include/platform.h @@ -178,11 +178,6 @@ public: /// @retval Integer in bytes virtual wxString Memory()=0; - /// Video card - /// @return Video card description - /// @retval Any - virtual wxString Video(); - /// Video card /// @return Video card vendor /// @retval Any diff --git a/aegisub/reporter/name_map.cpp b/aegisub/reporter/name_map.cpp index ccd254228..fcddbfe22 100644 --- a/aegisub/reporter/name_map.cpp +++ b/aegisub/reporter/name_map.cpp @@ -79,10 +79,9 @@ const Report::nameMap Report::HumanNames() { nMap.insert(nPair("syslang", _TT("System Language"))); nMap.insert(nPair("thesauruslang", _TT("Thesaurus Language"))); nMap.insert(nPair("unix", _TT("Unix"))); - nMap.insert(nPair("video", _TT("Video"))); - nMap.insert(nPair("videovendor", _TT("Video Vendor"))); - nMap.insert(nPair("videorenderer", _TT("Video Renderer"))); - nMap.insert(nPair("videoversion", _TT("Video Version"))); + nMap.insert(nPair("vendor", _TT("Vendor"))); + nMap.insert(nPair("renderer", _TT("Renderer"))); + nMap.insert(nPair("version", _TT("Version"))); nMap.insert(nPair("videoprovider", _TT("Video Provider"))); nMap.insert(nPair("windows", _TT("Windows"))); nMap.insert(nPair("wxversion", _TT("wx Version"))); diff --git a/aegisub/reporter/platform.cpp b/aegisub/reporter/platform.cpp index 1b194614c..56c1a02eb 100644 --- a/aegisub/reporter/platform.cpp +++ b/aegisub/reporter/platform.cpp @@ -151,10 +151,6 @@ wxString Platform::DesktopEnvironment() { return ""; } -wxString Platform::Video() { - return wxString::Format("%s %s (%s)", vendor, renderer, version); -} - wxString Platform::VideoVendor() { return vendor; } diff --git a/aegisub/reporter/platform_unix_osx.cpp b/aegisub/reporter/platform_unix_osx.cpp index 3b4b1ceb2..e1a752220 100644 --- a/aegisub/reporter/platform_unix_osx.cpp +++ b/aegisub/reporter/platform_unix_osx.cpp @@ -70,10 +70,6 @@ wxString PlatformUnixOSX::Memory() { return ""; }; -wxString PlatformUnixOSX::Video() { - return ""; -}; - wxString PlatformUnixOSX::UnixLibraries() { return ""; }; diff --git a/aegisub/reporter/platform_unix_osx.h b/aegisub/reporter/platform_unix_osx.h index 761fe619e..fb7d35142 100644 --- a/aegisub/reporter/platform_unix_osx.h +++ b/aegisub/reporter/platform_unix_osx.h @@ -34,7 +34,6 @@ public: virtual wxString CPUFeatures(); virtual wxString CPUFeatures2(); virtual wxString Memory(); - virtual wxString Video(); virtual wxString PatchLevel(); virtual wxString QuickTimeExt(); diff --git a/aegisub/reporter/report.cpp b/aegisub/reporter/report.cpp index 1028d1b02..4b95fb789 100644 --- a/aegisub/reporter/report.cpp +++ b/aegisub/reporter/report.cpp @@ -80,7 +80,6 @@ Report::XMLReport Report::ReportCreate() { doc.hardware = new wxXmlNode(wxXML_ELEMENT_NODE, "hardware"); doc.report->AddChild(doc.hardware); Add(doc.hardware, "memory", p->Memory()); - Add(doc.hardware, "video", p->Video()); wxXmlNode *cpu = new wxXmlNode(wxXML_ELEMENT_NODE, "cpu"); doc.hardware->AddChild(cpu); @@ -93,13 +92,13 @@ Report::XMLReport Report::ReportCreate() { wxXmlNode *display = new wxXmlNode(wxXML_ELEMENT_NODE, "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, "colour", p->DisplayColour()); Add(display, "size", p->DisplaySize()); 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__ doc.windows = new wxXmlNode(wxXML_ELEMENT_NODE, "windows");