From 11fe00e6202708c91ebc16cfe227d5e5c0fca4bc Mon Sep 17 00:00:00 2001 From: Rodrigo Braz Monteiro Date: Tue, 30 Oct 2007 00:00:55 +0000 Subject: [PATCH] Completely broke traydict in preparation of the next stuff. Originally committed to SVN as r1642. --- traydict/TrayDict.vcproj | 8 +++++ traydict/dict_window.cpp | 2 +- traydict/dictionary_display.cpp | 19 +++++----- traydict/dictionary_display.h | 7 ++-- traydict/gecko_display.cpp | 64 +++++++++++++++++++++++++++++++++ traydict/gecko_display.h | 50 ++++++++++++++++++++++++++ traydict/stdwx.h | 1 - 7 files changed, 135 insertions(+), 16 deletions(-) create mode 100644 traydict/gecko_display.cpp create mode 100644 traydict/gecko_display.h diff --git a/traydict/TrayDict.vcproj b/traydict/TrayDict.vcproj index 3cedeb765..79022428b 100644 --- a/traydict/TrayDict.vcproj +++ b/traydict/TrayDict.vcproj @@ -289,6 +289,14 @@ RelativePath=".\dictionary_display.h" > + + + + diff --git a/traydict/dict_window.cpp b/traydict/dict_window.cpp index c6d02b7f6..3e8dd153f 100644 --- a/traydict/dict_window.cpp +++ b/traydict/dict_window.cpp @@ -222,7 +222,7 @@ void DictWindow::Search(wxString text) { res.results.sort(); // Print - results->Print(res); + results->PrintResults(res); } } diff --git a/traydict/dictionary_display.cpp b/traydict/dictionary_display.cpp index 3098ead5d..48e27e23d 100644 --- a/traydict/dictionary_display.cpp +++ b/traydict/dictionary_display.cpp @@ -35,7 +35,6 @@ /////////// // Headers -#include #include "dictionary_display.h" #include "main.h" #include "../aegisub/text_file_reader.h" @@ -44,24 +43,23 @@ /////////////// // Constructor DictionaryDisplay::DictionaryDisplay(wxWindow *parent) -: wxHtmlWindow(parent,-1) +: GeckoDisplay(parent) { - SetBorders(0); } ///////////////// // Print results -void DictionaryDisplay::Print(const ResultSet &results) +void DictionaryDisplay::PrintResults(const ResultSet &results) { // Clear page - SetPage(_T("")); + SetText(_T("")); // Colours wchar_t col[][8] = {L"#FFFFFF",L"#FEFAED"}; // Go through each result - AppendToPage(_T("")); + AppendText(_T("
")); int i = 0; for (std::list::const_iterator cur=results.results.begin();cur!=results.results.end();cur++) { // Get entry @@ -76,10 +74,10 @@ void DictionaryDisplay::Print(const ResultSet &results) row += _T(""); // Append string to page - AppendToPage(row); + AppendText(row); i++; } - AppendToPage(_T("
")); + AppendText(_T("")); } @@ -97,7 +95,7 @@ void DictionaryDisplay::ResultsStart() } // Insert header - AppendToPage(wxString::Format(_T(""),stylesheet.c_str())); + AppendText(wxString::Format(_T(""),stylesheet.c_str())); } @@ -105,7 +103,6 @@ void DictionaryDisplay::ResultsStart() // Done printing results void DictionaryDisplay::ResultsDone() { - AppendToPage(_T("")); - HistoryClear(); + AppendText(_T("")); Thaw(); } diff --git a/traydict/dictionary_display.h b/traydict/dictionary_display.h index 48c434042..b918272b9 100644 --- a/traydict/dictionary_display.h +++ b/traydict/dictionary_display.h @@ -38,16 +38,17 @@ /////////// // Headers -#include #include "dictionary.h" +#include "gecko_display.h" /////////////////////////////////// // Dictionary result display class -class DictionaryDisplay : public wxHtmlWindow { +class DictionaryDisplay : public GeckoDisplay { public: DictionaryDisplay(wxWindow *parent); - void Print(const ResultSet &results); + + void PrintResults(const ResultSet &results); void ResultsStart(); void ResultsDone(); }; diff --git a/traydict/gecko_display.cpp b/traydict/gecko_display.cpp new file mode 100644 index 000000000..3d0f5daf6 --- /dev/null +++ b/traydict/gecko_display.cpp @@ -0,0 +1,64 @@ +// Copyright (c) 2007, Rodrigo Braz Monteiro +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are met: +// +// * Redistributions of source code must retain the above copyright notice, +// this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above copyright notice, +// this list of conditions and the following disclaimer in the documentation +// and/or other materials provided with the distribution. +// * Neither the name of the TrayDict Group nor the names of its contributors +// may be used to endorse or promote products derived from this software +// without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +// POSSIBILITY OF SUCH DAMAGE. +// +// ----------------------------------------------------------------------------- +// +// TRAYDICT +// +// Website: http://aegisub.cellosoft.com +// Contact: mailto:zeratul@cellosoft.com +// + + +/////////// +// Headers +#include "gecko_display.h" + + +/////////////// +// Constructor +GeckoDisplay::GeckoDisplay(wxWindow *parent) +: wxPanel(parent) +{ + +} + + +/////////////// +// Append text +void GeckoDisplay::AppendText(wxString text) +{ + +} + + +//////////// +// Set text +void GeckoDisplay::SetText(wxString text) +{ + +} diff --git a/traydict/gecko_display.h b/traydict/gecko_display.h new file mode 100644 index 000000000..9cc717389 --- /dev/null +++ b/traydict/gecko_display.h @@ -0,0 +1,50 @@ +// Copyright (c) 2007, Rodrigo Braz Monteiro +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are met: +// +// * Redistributions of source code must retain the above copyright notice, +// this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above copyright notice, +// this list of conditions and the following disclaimer in the documentation +// and/or other materials provided with the distribution. +// * Neither the name of the TrayDict Group nor the names of its contributors +// may be used to endorse or promote products derived from this software +// without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +// POSSIBILITY OF SUCH DAMAGE. +// +// ----------------------------------------------------------------------------- +// +// TRAYDICT +// +// Website: http://aegisub.cellosoft.com +// Contact: mailto:zeratul@cellosoft.com +// + +#pragma once + +/////////// +// Headers +#include + +///////////////// +// Gecko Display +class GeckoDisplay : public wxPanel { +public: + GeckoDisplay(wxWindow *parent); + + void AppendText(wxString text); + void SetText(wxString text); +}; diff --git a/traydict/stdwx.h b/traydict/stdwx.h index 7781ca71f..b1ccc22c1 100644 --- a/traydict/stdwx.h +++ b/traydict/stdwx.h @@ -21,7 +21,6 @@ #include #include #include -#include #include #include