iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Completely broke traydict in preparation of the next stuff. 

Originally committed to SVN as r1642.
This commit is contained in:
Rodrigo Braz Monteiro 2007-10-30 00:00:55 +00:00
parent 1142b17362
commit 11fe00e620
7 changed files with 135 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
traydict/TrayDict.vcproj
View File

@ -289,6 +289,14 @@
RelativePath=".\dictionary_display.h" RelativePath=".\dictionary_display.h"
> >
</File> </File>
<File
RelativePath=".\gecko_display.cpp"
>
</File>
<File
RelativePath=".\gecko_display.h"
>
</File>
</Filter> </Filter>
</Files> </Files>
<Globals> <Globals>

2
traydict/dict_window.cpp
View File

@ -222,7 +222,7 @@ void DictWindow::Search(wxString text) {
res.results.sort(); res.results.sort();
// Print // Print
results->Print(res); results->PrintResults(res);
} }
} }

19
traydict/dictionary_display.cpp
View File

@ -35,7 +35,6 @@
/////////// ///////////
// Headers // Headers
#include <wx/html/htmlwin.h>
#include "dictionary_display.h" #include "dictionary_display.h"
#include "main.h" #include "main.h"
#include "../aegisub/text_file_reader.h" #include "../aegisub/text_file_reader.h"
@ -44,24 +43,23 @@
/////////////// ///////////////
// Constructor // Constructor
DictionaryDisplay::DictionaryDisplay(wxWindow *parent) DictionaryDisplay::DictionaryDisplay(wxWindow *parent)
: wxHtmlWindow(parent,-1) : GeckoDisplay(parent)
{ {
SetBorders(0);
} }
///////////////// /////////////////
// Print results // Print results
void DictionaryDisplay::Print(const ResultSet &results) void DictionaryDisplay::PrintResults(const ResultSet &results)
{ {
// Clear page // Clear page
SetPage(_T("")); SetText(_T(""));
// Colours // Colours
wchar_t col[][8] = {L"#FFFFFF",L"#FEFAED"}; wchar_t col[][8] = {L"#FFFFFF",L"#FEFAED"};
// Go through each result // Go through each result
AppendToPage(_T("<table cellpadding='2' cellspacing='0' border='0'>")); AppendText(_T("<table cellpadding='2' cellspacing='0' border='0'>"));
int i = 0; int i = 0;
for (std::list<SearchResult>::const_iterator cur=results.results.begin();cur!=results.results.end();cur++) { for (std::list<SearchResult>::const_iterator cur=results.results.begin();cur!=results.results.end();cur++) {
// Get entry // Get entry
@ -76,10 +74,10 @@ void DictionaryDisplay::Print(const ResultSet &results)
row += _T("</tr>"); row += _T("</tr>");
// Append string to page // Append string to page
AppendToPage(row); AppendText(row);
i++; i++;
} }
AppendToPage(_T("</table>")); AppendText(_T("</table>"));
} }
@ -97,7 +95,7 @@ void DictionaryDisplay::ResultsStart()
} }
// Insert header // Insert header
AppendToPage(wxString::Format(_T("<html><head><style>%s</style></head><body>"),stylesheet.c_str())); AppendText(wxString::Format(_T("<html><head><style>%s</style></head><body>"),stylesheet.c_str()));
} }
@ -105,7 +103,6 @@ void DictionaryDisplay::ResultsStart()
// Done printing results // Done printing results
void DictionaryDisplay::ResultsDone() void DictionaryDisplay::ResultsDone()
{ {
AppendToPage(_T("</body></html>")); AppendText(_T("</body></html>"));
HistoryClear();
Thaw(); Thaw();
} }

7
traydict/dictionary_display.h
View File

@ -38,16 +38,17 @@
/////////// ///////////
// Headers // Headers
#include <wx/html/htmlwin.h>
#include "dictionary.h" #include "dictionary.h"
#include "gecko_display.h"
/////////////////////////////////// ///////////////////////////////////
// Dictionary result display class // Dictionary result display class
class DictionaryDisplay : public wxHtmlWindow { class DictionaryDisplay : public GeckoDisplay {
public: public:
DictionaryDisplay(wxWindow *parent); DictionaryDisplay(wxWindow *parent);
void Print(const ResultSet &results);
void PrintResults(const ResultSet &results);
void ResultsStart(); void ResultsStart();
void ResultsDone(); void ResultsDone();
}; };

64
traydict/gecko_display.cpp Normal file
View File

@ -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)
{
}

50
traydict/gecko_display.h Normal file
View File

@ -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 <wx/wxprec.h>
/////////////////
// Gecko Display
class GeckoDisplay : public wxPanel {
public:
GeckoDisplay(wxWindow *parent);
void AppendText(wxString text);
void SetText(wxString text);
};

1
traydict/stdwx.h
View File

@ -21,7 +21,6 @@
#include <wx/event.h> #include <wx/event.h>
#include <wx/string.h> #include <wx/string.h>
#include <wx/aui/aui.h> #include <wx/aui/aui.h>
#include <wx/html/htmlwin.h>
#include <vector> #include <vector>
#include <list> #include <list>