amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 21:06:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

A working configure&makefile; now in the process of getting it to build on gcc

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@182 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2007-01-28 22:38:59 +00:00
parent fc03b5efa1
commit 1cd80a3710
18 changed files with 8146 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/control/graph.hpp
+2 -1
View File
@@ -46,8 +46,8 @@ class GraphAxis {
GraphAxis(const String& name, bool auto_color = true, bool numeric = false)
: name(name)
, auto_color(auto_color)
, max(0)
, numeric(numeric)
, max(0)
{}
String name; ///< Name/label of this axis
@@ -91,6 +91,7 @@ class GraphData {
/** It is rendered into a sub-rectangle of the screen */
class Graph {
public:
virtual ~Graph() {}
/// Draw this graph, filling the internalRect() of the dc.
virtual void draw(RotatedDC& dc, const vector<int>& current) const = 0;
/// Find the item at the given position, the rectangle gives the screen size
src/gui/set/cards_panel.cpp
+3 -3
View File
@@ -90,9 +90,9 @@ void CardsPanel::initUI(wxToolBar* tb, wxMenuBar* mb) {
menuCard->AppendSeparator();
IconMenu* menuRotate = new IconMenu();
menuRotate->Append(ID_CARD_ROTATE_0, _("TOOL_CARD_ROTATE_0"), _("&Normal"), _("Display the card with the right side up"), wxITEM_CHECK);
menuRotate->Append(ID_CARD_ROTATE_270, _("TOOL_CARD_ROTATE_270"), _("Rotated 90° &Clockwise"), _("Display the card rotated clockwise"), wxITEM_CHECK);
menuRotate->Append(ID_CARD_ROTATE_90, _("TOOL_CARD_ROTATE_90"), _("Rotated 90° C&ounter Clockwise"), _("Display the card rotated counter-clockwise (anti-clockwise for the British)"), wxITEM_CHECK);
menuRotate->Append(ID_CARD_ROTATE_180, _("TOOL_CARD_ROTATE_180"), _("Rotated 180°, &Up Side Down"), _("Display the card up side down"), wxITEM_CHECK);
menuRotate->Append(ID_CARD_ROTATE_270, _("TOOL_CARD_ROTATE_270"), _("Rotated 90 &Clockwise"), _("Display the card rotated clockwise"), wxITEM_CHECK);
menuRotate->Append(ID_CARD_ROTATE_90, _("TOOL_CARD_ROTATE_90"), _("Rotated 90 C&ounter Clockwise"), _("Display the card rotated counter-clockwise (anti-clockwise for the British)"), wxITEM_CHECK);
menuRotate->Append(ID_CARD_ROTATE_180, _("TOOL_CARD_ROTATE_180"), _("Rotated 180, &Up Side Down"), _("Display the card up side down"), wxITEM_CHECK);
menuCard->Append(wxID_ANY, _("TOOL_CARD_ROTATE"), _("&Orientation"), _("Orientation of the card display"), wxITEM_NORMAL, menuRotate);
menuCard->AppendSeparator();
// This probably belongs in the window menu, but there we can't remove the separator once it is added
src/gui/set/stats_panel.cpp
+2 -2
View File
@@ -81,7 +81,7 @@ void StatCategoryList::drawItem(DC& dc, int x, int y, size_t item, bool selected
RealSize size = RealSize(w,h);
RealPoint pos = align_in_rect(ALIGN_MIDDLE_LEFT, size, rect);
// draw_resampled_text(dc, RealRect(pos, size), 0, 0, 0, str);
dc.DrawText(str, pos.x, pos.y);
dc.DrawText(str, (int)pos.x, (int)pos.y);
}
// ----------------------------------------------------------------------------- : StatsPanel
@@ -149,7 +149,7 @@ class StatsFilter : public CardListFilter {
virtual bool keep(const CardP& card) {
Context& ctx = set.getContext(card);
FOR_EACH(v, values) {
if (*v.first->script.invoke(ctx) != v.second) return false;
if ((String)*v.first->script.invoke(ctx) != v.second) return false;
}
return true;
}