diff --git a/doc/type/tagged_string.txt b/doc/type/tagged_string.txt index 30d88752..a48ee46c 100644 --- a/doc/type/tagged_string.txt +++ b/doc/type/tagged_string.txt @@ -14,6 +14,8 @@ This is written as the character with code 1 in files. ! Tag Description | @@ The text inside the tag is bold. | @@ The text inside the tag is italic. +| @@ The text inside the tag is underlined. +| @@ The text inside the tag is struck through. | @@ The text inside the tag is rendered as symbols, if a [[prop:style:symbol font]] is set for the text box. | @@ The text inside the tag is rendered with the given [[type:color]]. | @@ The text inside the tag is rendered with the given font size in points, for example @"text"@ makes the text 12 points. The text is scaled down proportionally when it does not fit in a text box and the @scale down to@ attribute allows it. diff --git a/resource/tool/dark_reminder.png b/resource/tool/dark_reminder.png index 7ad36fdc..bcd335f6 100644 Binary files a/resource/tool/dark_reminder.png and b/resource/tool/dark_reminder.png differ diff --git a/resource/tool/reminder.png b/resource/tool/reminder.png index c772e137..31173743 100644 Binary files a/resource/tool/reminder.png and b/resource/tool/reminder.png differ diff --git a/src/gui/set/stats_panel.cpp b/src/gui/set/stats_panel.cpp index 963a7d3e..ff14c08d 100644 --- a/src/gui/set/stats_panel.cpp +++ b/src/gui/set/stats_panel.cpp @@ -30,7 +30,7 @@ public: StatCategoryList(Window* parent, int id) : GalleryList(parent, id, wxVERTICAL) { - item_size = subcolumns[0].size = wxSize(150, 23); + item_size = subcolumns[0].size = wxSize(NAME_COLUMN_WIDTH, COLUMN_HEIGHT); } void show(const GameP&); @@ -105,7 +105,7 @@ public: , prefered_dimension_count(dimension_count) , show_empty(show_empty) { - subcolumns[0].size = wxSize(210, 23); + subcolumns[0].size = wxSize(NAME_COLUMN_WIDTH, COLUMN_HEIGHT); if (dimension_count > 0) { subcolumns[0].selection = NO_SELECTION; subcolumns[0].can_select = false; @@ -116,13 +116,13 @@ public: col.selection = show_empty ? NO_SELECTION : 0; col.can_select = true; col.offset.x = subcolumns[0].size.x + SPACING; - col.size = wxSize(18,23); + col.size = wxSize(DIMENSION_COLUMN_WIDTH, COLUMN_HEIGHT); for (int i = 0 ; i < dimension_count ; ++i) { subcolumns.push_back(col); col.offset.x += col.size.x + SPACING; } // total - item_size = wxSize(col.offset.x - SPACING, 23); + item_size = wxSize(col.offset.x - SPACING, COLUMN_HEIGHT); } void show(const GameP&); @@ -185,7 +185,22 @@ protected: private: GameP game; bool show_empty; - vector dimensions; ///< Dimensions, sorted by position_hint + vector dimensions; ///< Dimensions, sorted by position_hint + + static const int NAME_COLUMN_WIDTH = 210; + static const int DIMENSION_COLUMN_WIDTH = 18; + static const int COLUMN_HEIGHT = 23; + + DECLARE_EVENT_TABLE(); + + void onMotion(wxMouseEvent& ev) { + wxFrame* frame = dynamic_cast( wxGetTopLevelParent(this) ); + if (frame) { + String description = ev.GetX() > NAME_COLUMN_WIDTH + dimension_count * (DIMENSION_COLUMN_WIDTH + 1) ? + String() : dimensions[findItem(ev)]->description.get(); + frame->SetStatusText(description); + } + } }; struct ComparePositionHint2{ @@ -576,6 +591,10 @@ void StatsPanel::filterCards() { BEGIN_EVENT_TABLE(StatsPanel, wxPanel) EVT_GRAPH_SELECT(wxID_ANY, StatsPanel::onGraphSelect) END_EVENT_TABLE() + +BEGIN_EVENT_TABLE(StatDimensionList, GalleryList) + EVT_MOTION(StatDimensionList::onMotion) +END_EVENT_TABLE() // ----------------------------------------------------------------------------- : Selection