diff --git a/Mods/vcmi/Content/config/english.json b/Mods/vcmi/Content/config/english.json index d5a7af9dd..f70cad6f5 100644 --- a/Mods/vcmi/Content/config/english.json +++ b/Mods/vcmi/Content/config/english.json @@ -53,7 +53,7 @@ "vcmi.quickExchange.moveAllUnits" : "Move All Units", "vcmi.quickExchange.swapAllUnits" : "Swap Armies", "vcmi.quickExchange.moveAllArtifacts" : "Move All Artifacts", - "vcmi.quickExchange.swapAllArtifacts" : "Swap Artifact", + "vcmi.quickExchange.swapAllArtifacts" : "Swap Artifacts", "vcmi.radialWheel.mergeSameUnit" : "Merge same creatures", "vcmi.radialWheel.fillSingleUnit" : "Fill with single creatures", diff --git a/launcher/mainwindow_moc.ui b/launcher/mainwindow_moc.ui index 2cfc6242e..99648d40e 100644 --- a/launcher/mainwindow_moc.ui +++ b/launcher/mainwindow_moc.ui @@ -29,6 +29,57 @@ + + + + + 1 + 10 + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + + true + + + + Game + + + + 64 + 64 + + + + true + + + true + + + true + + + Qt::ToolButtonTextUnderIcon + + + true + + + @@ -146,8 +197,8 @@ - 32 - 32 + 48 + 48 @@ -180,57 +231,6 @@ - - - - - 1 - 10 - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - - true - - - - Game - - - - 64 - 64 - - - - true - - - true - - - true - - - Qt::ToolButtonTextUnderIcon - - - true - - - diff --git a/launcher/modManager/cmodlistview_moc.cpp b/launcher/modManager/cmodlistview_moc.cpp index d7b78b95e..b5c222088 100644 --- a/launcher/modManager/cmodlistview_moc.cpp +++ b/launcher/modManager/cmodlistview_moc.cpp @@ -792,9 +792,9 @@ void CModListView::installFiles(QStringList files) if(!exe.empty()) { + ui->progressBar->setFormat(tr("Installing Heroes Chronicles")); ui->progressWidget->setVisible(true); ui->pushButton->setEnabled(false); - ui->progressBar->setFormat(tr("Installing chronicles")); float prog = 0.0; diff --git a/launcher/modManager/cmodlistview_moc.ui b/launcher/modManager/cmodlistview_moc.ui index 2257ba30f..07b7486bd 100644 --- a/launcher/modManager/cmodlistview_moc.ui +++ b/launcher/modManager/cmodlistview_moc.ui @@ -42,6 +42,9 @@ Filter + + true + diff --git a/launcher/startGame/StartGameTab.ui b/launcher/startGame/StartGameTab.ui index 813ec31ed..6822cf4c2 100644 --- a/launcher/startGame/StartGameTab.ui +++ b/launcher/startGame/StartGameTab.ui @@ -13,891 +13,847 @@ Form - - - - - - - true - - - - - 0 - 0 - 226 - 234 - - - - - - - - 0 - 30 - - - - - 16777215 - 30 - - - - Import from Clipboard - - - - - - - Qt::Vertical - - - - 0 - 0 - - - - - - - - - 0 - 30 - - - - - 16777215 - 30 - - - - Rename Current Preset - - - - - - - - 0 - 30 - - - - - 16777215 - 30 - - - - - Current Preset - - - - - - - - - 0 - 30 - - - - - 16777215 - 30 - - - - Create New Preset - - - - - - - - 0 - 30 - - - - - 16777215 - 30 - - - - Export to Clipboard - - - - - - - - 0 - 30 - - - - - 16777215 - 30 - - - - Delete Current Preset - - - - - - - - - - - QFrame::Sunken - - - true - - - - - 0 - 0 - 225 - 342 - - - - - - - - 0 - 30 - - - - - 16777215 - 30 - - - - Unsupported or corrupted game data detected! - - - true - - - - - - - Qt::Vertical - - - - 0 - 0 - - - - - - - - - 0 - 30 - - - - - 16777215 - 30 - - - - - - - true - - - - - - - - 40 - 30 - - - - - 40 - 30 - - - - ? - - - - - - - - 40 - 30 - - - - - 40 - 30 - - - - ? - - - - - - - - 0 - 30 - - - - - 16777215 - 30 - - - - Install Translation - - - - - - - - 40 - 30 - - - - - 40 - 30 - - - - ? - - - - - - - - 40 - 30 - - - - - 40 - 30 - - - - ? - - - - - - - - 0 - 30 - - - - - 16777215 - 30 - - - - No soundtrack detected! - - - true - - - - - - - - 40 - 30 - - - - - 40 - 30 - - - - ? - - - - - - - - 0 - 30 - - - - - 16777215 - 30 - - - - Armaggedon's Blade campaigns are missing! - - - true - - - - - - - - 40 - 30 - - - - - 40 - 30 - - - - ? - - - - - - - - 40 - 30 - - - - - 40 - 30 - - - - ? - - - - - - - - 0 - 30 - - - - - 16777215 - 30 - - - - No video files detected! - - - true - - - - - - - - 40 - 30 - - - - - 40 - 30 - - - - ? - - - - - - - - 0 - 30 - - - - - 16777215 - 30 - - - - Activate Translation - - - - - - - - 0 - 30 - - - - - 16777215 - 30 - - - - Import files - - - - - - - - 0 - 30 - - - - - 16777215 - 30 - - - - - - - - - - - - 40 - 30 - - - - - 40 - 30 - - - - ? - - - - - - - - - - - true - - - - - 0 - 0 - 240 - 222 - - - - - - - Qt::Vertical - - - - 0 - 0 - - - - - - - - - 0 - 30 - - - - - 16777215 - 30 - - - - - - - true - - - - - - - - 0 - 30 - - - - - 16777215 - 30 - - - - Check For Updates - - - - - - - - 0 - 30 - - - - - 16777215 - 30 - - - - Go to Downloads Page - - - - - - - - 0 - 30 - - - - - 16777215 - 30 - - - - Go to Changelog Page - - - - - - - - 0 - 30 - - - - - 16777215 - 30 - - - - You are using the latest version - - - true - - - - - - - - - - - - true - - - - - - - true - - - 6 - - - - - - - - true - - - - Game Data Files - - - true - - - 6 - - - - - - - - true - - - - Mod Preset - - - true - - - 6 - - - - - - - - - 9 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + true + - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - - 64 - 64 - - - - Resume - - - - 48 - 48 - - - - Qt::ToolButtonTextUnderIcon - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 20 - 20 - - - - - - - - - 0 - 0 - - - - - 100 - 100 - - - - - true - - - - Play - - - - 64 - 64 - - - - Qt::ToolButtonTextUnderIcon - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 20 - 20 - - - - - - - - - 0 - 0 - - - - - 64 - 64 - - - - Editor - - - - 48 - 48 - - - - Qt::ToolButtonTextUnderIcon - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - + + Game Data Files + + + Qt::AlignCenter + + + true + + + + + + + + true + + + + Mod Preset + + + Qt::AlignCenter + + + true + + + + + + + + true + + + + + + + Qt::AlignCenter + + + true + + + + + + + QFrame::Sunken + + + Qt::ScrollBarAlwaysOff + + + true + + + + + 0 + 0 + 246 + 350 + + + + + + + + 0 + 30 + + + + + 16777215 + 30 + + + + Unsupported or corrupted game data detected! + + + true + + + + + + + + 40 + 30 + + + + + 40 + 30 + + + + ? + + + + + + + + 40 + 30 + + + + + 40 + 30 + + + + ? + + + + + + + + 0 + 30 + + + + + 16777215 + 30 + + + + + + + true + + + + + + + + 40 + 30 + + + + + 40 + 30 + + + + ? + + + + + + + + 40 + 30 + + + + + 40 + 30 + + + + ? + + + + + + + + 0 + 30 + + + + + 16777215 + 30 + + + + Install Translation + + + + + + + + 0 + 30 + + + + + 16777215 + 30 + + + + Armaggedon's Blade campaigns are missing! + + + true + + + + + + + Qt::Vertical + + + + 0 + 0 + + + + + + + + + 0 + 30 + + + + + 16777215 + 30 + + + + No video files detected! + + + true + + + + + + + + 0 + 30 + + + + + 16777215 + 30 + + + + Import files + + + + + + + + 0 + 30 + + + + + 16777215 + 30 + + + + + + + + + + + + 40 + 30 + + + + + 40 + 30 + + + + ? + + + + + + + + 40 + 30 + + + + + 40 + 30 + + + + ? + + + + + + + + 0 + 30 + + + + + 16777215 + 30 + + + + No soundtrack detected! + + + true + + + + + + + + 40 + 30 + + + + + 40 + 30 + + + + ? + + + + + + + + 0 + 30 + + + + + 16777215 + 30 + + + + Activate Translation + + + + + + + + 40 + 30 + + + + + 40 + 30 + + + + ? + + + + + + + + 40 + 30 + + + + + 40 + 30 + + + + ? + + + + + + + + + + + Qt::ScrollBarAlwaysOff + + + true + + + + + 0 + 0 + 247 + 350 + + + + + + + + 0 + 30 + + + + + 16777215 + 30 + + + + Export to Clipboard + + + + + + + + 0 + 30 + + + + + 16777215 + 30 + + + + Create New Preset + + + + + + + + 0 + 30 + + + + + 16777215 + 30 + + + + + Current Preset + + + + + + + + + 0 + 30 + + + + + 16777215 + 30 + + + + Delete Current Preset + + + + + + + Qt::Vertical + + + + 0 + 0 + + + + + + + + + 0 + 30 + + + + + 16777215 + 30 + + + + Import from Clipboard + + + + + + + + 0 + 30 + + + + + 16777215 + 30 + + + + Rename Current Preset + + + + + + + + + + + Qt::ScrollBarAlwaysOff + + + true + + + + + 0 + 0 + 272 + 350 + + + + + + + + 0 + 30 + + + + + 16777215 + 30 + + + + You are using the latest version + + + true + + + + + + + + 0 + 30 + + + + + 16777215 + 30 + + + + + + + true + + + + + + + + 0 + 30 + + + + + 16777215 + 30 + + + + Check For Updates + + + + + + + + 0 + 30 + + + + + 16777215 + 30 + + + + Go to Downloads Page + + + + + + + + 0 + 30 + + + + + 16777215 + 30 + + + + Go to Changelog Page + + + + + + + Qt::Vertical + + + + 0 + 0 + + + + + + + + + + + 0 + 0 + + + + + 80 + 80 + + + + Resume + + + + 64 + 64 + + + + Qt::ToolButtonTextUnderIcon + + + + + + + + 0 + 0 + + + + + 80 + 80 + + + + Editor + + + + 64 + 64 + + + + Qt::ToolButtonTextUnderIcon + + + + + + + + 0 + 0 + + + + + 80 + 80 + + + + + true + + + + Play + + + + 64 + 64 + + + + Qt::ToolButtonTextUnderIcon + + + + + + + + diff --git a/launcher/translation/chinese.ts b/launcher/translation/chinese.ts index 7e7981517..aecd34639 100644 --- a/launcher/translation/chinese.ts +++ b/launcher/translation/chinese.ts @@ -480,8 +480,8 @@ Install successfully downloaded? - Installing chronicles - 安装历代记 + Installing Heroes Chronicles + 安装历代记 diff --git a/launcher/translation/english.ts b/launcher/translation/english.ts index 5a4c42fbf..5391eb3ff 100644 --- a/launcher/translation/english.ts +++ b/launcher/translation/english.ts @@ -327,7 +327,7 @@ Install successfully downloaded? - Installing chronicles + Installing Heroes Chronicles diff --git a/launcher/translation/french.ts b/launcher/translation/french.ts index 013809dcc..e2d17a8f0 100644 --- a/launcher/translation/french.ts +++ b/launcher/translation/french.ts @@ -469,7 +469,7 @@ Installer les téchargements réussis? - Installing chronicles + Installing Heroes Chronicles diff --git a/launcher/translation/german.ts b/launcher/translation/german.ts index c1f897557..5125db52a 100644 --- a/launcher/translation/german.ts +++ b/launcher/translation/german.ts @@ -476,8 +476,8 @@ Installation erfolgreich heruntergeladen? - Installing chronicles - Installation der Chronicles + Installing Heroes Chronicles + Installation der Chronicles diff --git a/launcher/translation/polish.ts b/launcher/translation/polish.ts index 8e89df19f..b579e67b4 100644 --- a/launcher/translation/polish.ts +++ b/launcher/translation/polish.ts @@ -476,8 +476,8 @@ Zainstalować pomyślnie pobrane? - Installing chronicles - Instalowanie Kronik + Installing Heroes Chronicles + Instalowanie Kronik diff --git a/launcher/translation/portuguese.ts b/launcher/translation/portuguese.ts index 7e3ecf91b..ecda0a2df 100644 --- a/launcher/translation/portuguese.ts +++ b/launcher/translation/portuguese.ts @@ -377,8 +377,8 @@ O download da instalação foi bem-sucedido? - Installing chronicles - Instalando crônicas + Installing Heroes Chronicles + Instalando crônicas diff --git a/launcher/translation/russian.ts b/launcher/translation/russian.ts index fc743f2f9..57469830c 100644 --- a/launcher/translation/russian.ts +++ b/launcher/translation/russian.ts @@ -426,7 +426,7 @@ Install successfully downloaded? - Installing chronicles + Installing Heroes Chronicles diff --git a/launcher/translation/spanish.ts b/launcher/translation/spanish.ts index 6083c12c4..6512c65f0 100644 --- a/launcher/translation/spanish.ts +++ b/launcher/translation/spanish.ts @@ -440,7 +440,7 @@ Instalar lo correctamente descargado? - Installing chronicles + Installing Heroes Chronicles diff --git a/launcher/translation/swedish.ts b/launcher/translation/swedish.ts index 7baf112c2..9d013274d 100644 --- a/launcher/translation/swedish.ts +++ b/launcher/translation/swedish.ts @@ -476,8 +476,8 @@ Installation framgångsrikt nedladdad? - Installing chronicles - Installera Chronicles + Installing Heroes Chronicles + Installera Chronicles diff --git a/launcher/translation/ukrainian.ts b/launcher/translation/ukrainian.ts index 601394727..59d71c562 100644 --- a/launcher/translation/ukrainian.ts +++ b/launcher/translation/ukrainian.ts @@ -464,7 +464,7 @@ Install successfully downloaded? - Installing chronicles + Installing Heroes Chronicles diff --git a/launcher/translation/vietnamese.ts b/launcher/translation/vietnamese.ts index fc32fdf96..adac3a14b 100644 --- a/launcher/translation/vietnamese.ts +++ b/launcher/translation/vietnamese.ts @@ -426,7 +426,7 @@ Install successfully downloaded? - Installing chronicles + Installing Heroes Chronicles