Merge pull request #1754 from mercury233/patch-3

change deck edit button position

gframe/game.cpp

@@ -391,15 +391,15 @@ bool Game::Initialize() {
 	cbDBDecks->setMaxSelectionRows(15);
 	for(unsigned int i = 0; i < deckManager._lfList.size(); ++i)
 		cbDBLFList->addItem(deckManager._lfList[i].listName);
-	btnSaveDeck = env->addButton(rect<s32>(225, 5, 290, 30), wDeckEdit, BUTTON_SAVE_DECK, dataManager.GetSysString(1302));
-	btnDeleteDeck = env->addButton(rect<s32>(225, 35, 290, 60), wDeckEdit, BUTTON_DELETE_DECK, dataManager.GetSysString(1308));
+	btnSaveDeck = env->addButton(rect<s32>(225, 35, 290, 60), wDeckEdit, BUTTON_SAVE_DECK, dataManager.GetSysString(1302));
 	ebDeckname = env->addEditBox(L"", rect<s32>(80, 65, 220, 90), true, wDeckEdit, -1);
 	ebDeckname->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER);
 	btnSaveDeckAs = env->addButton(rect<s32>(225, 65, 290, 90), wDeckEdit, BUTTON_SAVE_DECK_AS, dataManager.GetSysString(1303));
-	btnClearDeck = env->addButton(rect<s32>(240, 95, 290, 116), wDeckEdit, BUTTON_CLEAR_DECK, dataManager.GetSysString(1304));
-	btnSortDeck = env->addButton(rect<s32>(185, 95, 235, 116), wDeckEdit, BUTTON_SORT_DECK, dataManager.GetSysString(1305));
-	btnShuffleDeck = env->addButton(rect<s32>(130, 95, 180, 116), wDeckEdit, BUTTON_SHUFFLE_DECK, dataManager.GetSysString(1307));
-	btnDBExit = env->addButton(rect<s32>(10, 95, 90, 116), wDeckEdit, BUTTON_DBEXIT, dataManager.GetSysString(1306));
+	btnShuffleDeck = env->addButton(rect<s32>(75, 95, 125, 116), wDeckEdit, BUTTON_SHUFFLE_DECK, dataManager.GetSysString(1307));
+	btnSortDeck = env->addButton(rect<s32>(130, 95, 180, 116), wDeckEdit, BUTTON_SORT_DECK, dataManager.GetSysString(1305));
+	btnClearDeck = env->addButton(rect<s32>(185, 95, 235, 116), wDeckEdit, BUTTON_CLEAR_DECK, dataManager.GetSysString(1304));
+	btnDeleteDeck = env->addButton(rect<s32>(240, 95, 290, 116), wDeckEdit, BUTTON_DELETE_DECK, dataManager.GetSysString(1308));
+	btnDBExit = env->addButton(rect<s32>(10, 65, 70, 116), wDeckEdit, BUTTON_DBEXIT, dataManager.GetSysString(1306));
 	btnSideOK = env->addButton(rect<s32>(510, 40, 820, 80), 0, BUTTON_SIDE_OK, dataManager.GetSysString(1334));
 	btnSideOK->setVisible(false);
 	//filters

strings.conf

@@ -285,7 +285,7 @@
 !system 1303 另存
 !system 1304 清空
 !system 1305 排序
-!system 1306 退出编辑
+!system 1306 退出
 !system 1307 打乱
 !system 1308 删除
 !system 1310 （无）
@@ -313,7 +313,7 @@
 !system 1334 副卡组更换完成
 !system 1335 保存成功
 !system 1336 刻度：
-!system 1337 是否删除？
+!system 1337 是否删除这个卡组？
 !system 1338 删除成功
 !system 1340 是否保存录像？
 !system 1341 保存