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

added total number of cards to random pack panel

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1122 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2008-08-09 17:34:13 +00:00
parent 290f034d98
commit cb72dbea2f
11 changed files with 41 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/chs.mse-locale/locale
+2 -1
View File
@@ -423,6 +423,7 @@ label:
#_ADD pack selection: Pack selection
#_ADD pack totals: Totals
#_ADD seed: Seed
#_ADD total cards: Total
# Open dialogs
all files 全部文件
@@ -468,7 +469,7 @@ label:
filename format: 格式:
filename conflicts: 处理重复文件名:
export filenames: 文件名
cards to export: 导出卡牌
#_DEL cards to export: 导出卡牌
filename is ignored: （忽略文件名）
# apprentice export
data/de.mse-locale/locale
+2 -1
View File
@@ -423,6 +423,7 @@ label:
#_ADD pack selection: Pack selection
#_ADD pack totals: Totals
#_ADD seed: Seed
#_ADD total cards: Total
# Open dialogs
all files Alle Dateien
@@ -468,7 +469,7 @@ label:
filename format: &Format:
filename conflicts: &Doppelte Dateinamen:
export filenames: Dateinamen
cards to export: Exportierte Karten
#_DEL cards to export: Exportierte Karten
filename is ignored: (Dateiname wird ignoriert)
# apprentice export
data/en.mse-locale/locale
+1 -1
View File
@@ -423,6 +423,7 @@ label:
pack selection: Pack selection
pack totals: Totals
seed: Seed
total cards: Total
# Open dialogs
all files All files
@@ -468,7 +469,6 @@ label:
filename format: &Format:
filename conflicts: &Handle duplicating filenames:
export filenames: Filenames
cards to export: Cards to export
filename is ignored: (filename is ignored)
# apprentice export
data/es.mse-locale/locale
+2 -1
View File
@@ -423,6 +423,7 @@ label:
#_ADD pack selection: Pack selection
#_ADD pack totals: Totals
#_ADD seed: Seed
#_ADD total cards: Total
# Open dialogs
all files Todos los archivos
@@ -468,7 +469,7 @@ label:
filename format: &Formato:
filename conflicts: &Soportar duplicado de nombres de archivos:
export filenames: Nombres de archivo
cards to export: Cartas a exportar
#_DEL cards to export: Cartas a exportar
filename is ignored: (filename is ignored)
# apprentice export
data/fr.mse-locale/locale
+2 -1
View File
@@ -423,6 +423,7 @@ label:
#_ADD pack selection: Pack selection
#_ADD pack totals: Totals
#_ADD seed: Seed
#_ADD total cards: Total
# Open dialogs
all files All files
@@ -468,7 +469,7 @@ label:
filename format: &Format:
filename conflicts: &Handle duplicating filenames:
export filenames: Filenames
cards to export: Cards to export
#_DEL cards to export: Cards to export
filename is ignored: (filename is ignored)
# apprentice export
data/it.mse-locale/locale
+3 -2
View File
@@ -1,4 +1,4 @@
#_DEL mse version: 0.3.7
#_DEL #_DEL #_DEL mse version: 0.3.7
#_ADD mse version: 0.3.7
installer group: translations/Italiano
full name: Italiano
@@ -424,6 +424,7 @@ label:
#_ADD pack selection: Pack selection
#_ADD pack totals: Totals
#_ADD seed: Seed
#_ADD total cards: Total
# Open dialogs
all files Tutti i file
@@ -469,7 +470,7 @@ label:
filename format: &Formato:
filename conflicts: &Handle duplicating filenames:
export filenames: Filenames
cards to export: Carte da esportare
#_DEL cards to export: Carte da esportare
filename is ignored: (il filename è ignorato)
# apprentice export
data/jp.mse-locale/locale
+2 -1
View File
@@ -423,6 +423,7 @@ label:
#_ADD pack selection: Pack selection
#_ADD pack totals: Totals
#_ADD seed: Seed
#_ADD total cards: Total
# Open dialogs
all files 全てのファイル
@@ -468,7 +469,7 @@ label:
filename format: &フォーマット：
filename conflicts: &取っ手を複写することのファイル名：
export filenames: ファイル名
cards to export: エクスポートするカード
#_DEL cards to export: エクスポートするカード
filename is ignored: (ファイル名は無視されます)
# apprentice export
data/magic.mse-game/script
+1
View File
@@ -199,6 +199,7 @@ hybrid_cost_sort := {
else if colors = "UG" then "GJ"
else "GK"
}
# A code for the color of the card
color_of_card := {
card_color := card.card_color
casting_cost := card.casting_cost
src/cli/cli_main.cpp
+1 -1
View File
@@ -150,7 +150,7 @@ void CLISetInterface::handleCommand(const String& command) {
if (arg.empty()) {
cli.showError(_("Give a shell command to execute."));
} else {
#if UNICODE
#ifdef UNICODE
#ifdef __WXMSW__
_wsystem(arg.c_str()); // TODO: is this function available on other platforms?
#else
src/gui/set/random_pack_panel.cpp
+23 -7
View File
@@ -87,6 +87,7 @@ class PackTotalsPanel : public wxPanel {
GameP game;
void onPaint(wxPaintEvent&);
void draw(DC& dc);
void drawItem(DC& dc, int& y, const String& name, int value);
map<String,int> amounts;
};
@@ -104,15 +105,30 @@ void PackTotalsPanel::draw(DC& dc) {
dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNTEXT));
dc.SetFont(*wxNORMAL_FONT);
int y = 0;
int total = 0;
FOR_EACH(item, game->pack_items) {
int w,h;
String name = capitalize(item->name);
String amount; amount << amounts[item->name];
dc.GetTextExtent(amount,&w,&h);
dc.DrawText(name, 0, y);
dc.DrawText(amount, size.x-w, y);//align right
y += h + 10;
int value = amounts[item->name];
drawItem(dc, y, item->name, value);
total += value;
}
// draw total
dc.SetPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW));
dc.DrawLine(0, y-4, size.x, y-4);
dc.SetPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DHIGHLIGHT));
dc.DrawLine(0, y-3, size.x, y-3);
y += 6;
drawItem(dc, y, _LABEL_("total cards"), total);
}
void PackTotalsPanel::drawItem(DC& dc, int& y, const String& name, int value) {
wxSize size = dc.GetSize();
int w,h;
String cap_name = capitalize(name);
String amount; amount << value;
dc.GetTextExtent(amount,&w,&h);
dc.DrawText(cap_name, 0, y);
dc.DrawText(amount, size.x-w, y);//align right
y += h + 10;
}
void PackTotalsPanel::setGame(const GameP& game) {
src/resource/common/expected_locale_keys
+2 -2
View File
@@ -1,6 +1,6 @@
# This file contains the keys expected to be in MSE locales
# It was automatically generated by tools/locale/locale.pl
# Generated on Fri Aug 8 23:23:10 2008
# Generated on Sat Aug 9 19:00:54 2008
action:
add control point: 0
@@ -273,7 +273,6 @@ label:
auto replace: 0
card display: 0
card notes: 0
cards to export: 0
check at startup: 0
checking requires internet: 0
columns: 0
@@ -332,6 +331,7 @@ label:
style type: 0
stylesheet not found: 1
styling options: 0
total cards: 0
upgrade package: 0
uses: 0
zoom: 0