分类没有卡组时修正提示

Classes/gframe/deck_con.cpp

@@ -49,7 +49,11 @@ void SetCategoryDeckNameOnButton(irr::gui::IGUIButton* button, wchar_t* string){
 	wchar_t cate[256];
 	wchar_t cate_deck[256];
 	myswprintf(cate, L"%ls%ls", (mainGame->cbDBCategory->getSelected())==2 ? L"" : mainGame->cbDBCategory->getItem(mainGame->cbDBCategory->getSelected()), (mainGame->cbDBCategory->getSelected())==2 ? L"" : string);
-	myswprintf(cate_deck, L"%ls%ls", cate, mainGame->cbDBDecks->getItem(mainGame->cbDBDecks->getSelected()));
+    if (mainGame->lstDecks->getItemCount() != 0) {
+        myswprintf(cate_deck, L"%ls%ls", cate, mainGame->lstDecks->getListItem(mainGame->lstDecks->getSelected()));
+    } else {
+        myswprintf(cate_deck, L"%ls%ls", cate, dataManager.GetSysString(1301));
+    }
 	button->setText(cate_deck);
 }
 

Classes/gframe/game.cpp

@@ -1620,7 +1620,7 @@ void Game::LoadExpansions() {
 }
 void Game::RefreshCategoryDeck(irr::gui::IGUIComboBox* cbCategory, irr::gui::IGUIComboBox* cbDeck, bool selectlastused) {
 	cbCategory->clear();
-	if (cbCategory != mainGame->cbCategorySelect) {
+	if (cbCategory == mainGame->cbDBCategory) {
 		cbCategory->addItem(dataManager.GetSysString(1450));
 	}
 	cbCategory->addItem(dataManager.GetSysString(1451));
@@ -1631,10 +1631,10 @@ void Game::RefreshCategoryDeck(irr::gui::IGUIComboBox* cbCategory, irr::gui::IGU
 			cbCategory->addItem(name);
 		}
 	});
-    if (cbCategory == mainGame->cbCategorySelect) {
-        cbCategory->setSelected(1);
-    } else {
+    if (cbCategory == mainGame->cbDBCategory) {
         cbCategory->setSelected(2);
+    } else {
+        cbCategory->setSelected(1);
     }
 	if(selectlastused) {
 		for(size_t i = 0; i < cbCategory->getItemCount(); ++i) {

Classes/gframe/menu_handler.cpp

@@ -76,7 +76,11 @@ void reSetCategoryDeckNameOnButton(irr::gui::IGUIButton* button, wchar_t* string
     wchar_t cate[256];
     wchar_t cate_deck[256];
     myswprintf(cate, L"%ls%ls", (mainGame->lstCategories->getSelected())==1 ? L"" : mainGame->lstCategories->getListItem(mainGame->lstCategories->getSelected()), (mainGame->lstCategories->getSelected())==1 ? L"" : string);
+    if (mainGame->lstDecks->getItemCount() != 0) {
 		myswprintf(cate_deck, L"%ls%ls", cate, mainGame->lstDecks->getListItem(mainGame->lstDecks->getSelected()));
+	} else {
+		myswprintf(cate_deck, L"%ls%ls", cate, dataManager.GetSysString(1301));
+	}
     button->setText(cate_deck);
 }
 

mobile/assets/data/conf/strings.conf

@@ -348,7 +348,7 @@
 !system 1298 辅助功能
 !system 1299 加快动画效果
 !system 1300 卡组：
-!system 1301 卡组列表：
+!system 1301 未选择卡组！
 !system 1302 保存
 !system 1303 另存
 !system 1304 清空

mobile/assets/en/data/conf/strings.conf

@@ -347,8 +347,8 @@
 !system 1297 Shuffle Hand
 !system 1298 Helper
 !system 1299 Quick Animation
-!system 1300 Category:
-!system 1301 Deck:
+!system 1300 Deck:
+!system 1301 No Selected Deck
 !system 1302 Save
 !system 1303 Save as
 !system 1304 Clear

mobile/assets/es/data/conf/strings.conf

@@ -347,8 +347,8 @@
 !system 1297 Barajar Mano
 !system 1298 Ayudante
 !system 1299 Animación Rápida
-!system 1300 Categoría:
-!system 1301 Deck:
+!system 1300 Deck:
+!system 1301 Selecciona un Deck válido primero.
 !system 1302 Guardar
 !system 1303 Guardar como
 !system 1304 Limpiar

mobile/assets/jp/data/conf/strings.conf

@@ -348,8 +348,8 @@
 !system 1297 シャッフル
 !system 1298 動作設定
 !system 1299 アニメーション高速化
-!system 1300 デッキ集：
-!system 1301 デッキ：
+!system 1300 デッキ：
+!system 1301 使用できるデッキを選択してください。
 !system 1302 保存
 !system 1303 別名保存
 !system 1304 クリア

mobile/assets/kor/data/conf/strings.conf

@@ -347,8 +347,8 @@
 !system 1297 패 셔플
 !system 1298 기본 설정
 !system 1299 애니메이션 고속화
-!system 1300 덱 관리:
-!system 1301 덱 목록:
+!system 1300 덱 목록:
+!system 1301 올바른 카드덱을 먼저 선택하세요.
 !system 1302 저장
 !system 1303 (으)로 저장
 !system 1304 비우기