diff --git a/cockatrice/translations/cockatrice_de.ts b/cockatrice/translations/cockatrice_de.ts index 244bba3c..020549b4 100644 --- a/cockatrice/translations/cockatrice_de.ts +++ b/cockatrice/translations/cockatrice_de.ts @@ -564,32 +564,54 @@ DlgSettings - + + + + Error + Fehler + + + + Your card database is invalid. Please check if the path is set correctly. + Ihre Kartendatenbank ist ungültig. Bitte überprüfen Sie, ob der Pfad korrekt gesetzt ist. + + + + The path to your deck directory is invalid. + Der Pfad zum Deckverzeichnis ist ungültig. + + + + The path to your card pictures directory is invalid. + Der Pfad zum Kartenbilderverzeichnis ist ungültig. + + + Settings Einstellungen - + General Allgemeines - + Appearance Erscheinungsbild - + User interface Bedienung - + Messages Nachrichten - + &Close S&chließen @@ -2237,17 +2259,17 @@ Deck - + no deck kein Deck - + local deck lokales Deck - + ID #%1 ID #%1 @@ -2770,17 +2792,17 @@ Willst du die Änderungen speichern? alphabetisch sortieren - + sort by name nach Namen sortieren - + sort by type nach Kartentypen sortieren - + shuffle when closing beim Schließen mischen diff --git a/cockatrice/translations/cockatrice_en.ts b/cockatrice/translations/cockatrice_en.ts index de83275a..c0b2a4a3 100644 --- a/cockatrice/translations/cockatrice_en.ts +++ b/cockatrice/translations/cockatrice_en.ts @@ -453,32 +453,54 @@ DlgSettings - - Settings + + + + Error - - General - - - - - Appearance + + Your card database is invalid. Please check if the path is set correctly. - User interface - - - - - Messages + The path to your deck directory is invalid. + The path to your card pictures directory is invalid. + + + + + Settings + + + + + General + + + + + Appearance + + + + + User interface + + + + + Messages + + + + &Close @@ -1516,17 +1538,17 @@ - + no deck - + local deck - + ID #%1 @@ -1992,17 +2014,17 @@ Do you want to save the changes? ZoneViewWidget - + sort by name - + sort by type - + shuffle when closing diff --git a/nsis/cockatrice.nsi b/nsis/cockatrice.nsi new file mode 100644 index 00000000..1518f993 --- /dev/null +++ b/nsis/cockatrice.nsi @@ -0,0 +1,68 @@ +!include "MUI2.nsh" + +Name "Cockatrice" +OutFile "cockatrice_win32.exe" +SetCompressor lzma +InstallDir "$PROGRAMFILES\Cockatrice" + +!define MUI_ABORTWARNING +!define MUI_WELCOMEFINISHPAGE_BITMAP "leftimage.bmp" +!define MUI_HEADERIMAGE +!define MUI_HEADERIMAGE_BITMAP "headerimage.bmp" +!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of Cockatrice.$\r$\n$\r$\nClick Next to continue." +!define MUI_FINISHPAGE_RUN "$INSTDIR/oracle.exe" +!define MUI_FINISHPAGE_RUN_TEXT "Run card database downloader now" +!define MUI_FINISHPAGE_RUN_PARAMETERS "-dlsets" + +!insertmacro MUI_PAGE_WELCOME +!insertmacro MUI_PAGE_COMPONENTS +!insertmacro MUI_PAGE_DIRECTORY +!insertmacro MUI_PAGE_INSTFILES +!insertmacro MUI_PAGE_FINISH + +!insertmacro MUI_LANGUAGE "English" + +Section "Application" SecApplication + SetOutPath "$INSTDIR" + File ..\cockatrice\release\cockatrice.exe + File ..\oracle\release\oracle.exe + File data\libgcc_s_dw2-1.dll + File data\mingwm10.dll + File data\QtCore4.dll + File data\QtGui4.dll + File data\QtNetwork4.dll + File data\QtSvg4.dll + File data\QtXml4.dll + + SetOutPath "$INSTDIR\zonebg" + File /r ..\zonebg\*.* + + SetOutPath "$INSTDIR\plugins" + File /r data\plugins\*.* + + SetOutPath "$INSTDIR\pics" + SetOutPath "$INSTDIR\decks" + +SectionEnd + +Section "Update configuration" SecUpdateConfig + WriteRegStr HKCU "Software\Cockatrice\Cockatrice\paths" "carddatabase" "$INSTDIR\cards.xml" + WriteRegStr HKCU "Software\Cockatrice\Cockatrice\paths" "decks" "$INSTDIR\decks" + WriteRegStr HKCU "Software\Cockatrice\Cockatrice\paths" "pics" "$INSTDIR\pics" +SectionEnd + +Section "Start menu item" SecStartMenu + createDirectory "$SMPROGRAMS\Cockatrice" + createShortCut "$SMPROGRAMS\Cockatrice\Cockatrice.lnk" "$INSTDIR\cockatrice.exe" + createShortCut "$SMPROGRAMS\Cockatrice\Oracle.lnk" "$INSTDIR\oracle.exe" +SectionEnd + +LangString DESC_SecApplication ${LANG_ENGLISH} "Cockatrice program files" +LangString DESC_SecUpdateConfig ${LANG_ENGLISH} "Update the paths in the application settings according to the installation paths." +LangString DESC_SecStartMenu ${LANG_ENGLISH} "Create start menu items for Cockatrice and Oracle." +!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN + !insertmacro MUI_DESCRIPTION_TEXT ${SecApplication} $(DESC_SecApplication) + !insertmacro MUI_DESCRIPTION_TEXT ${SecUpdateConfig} $(DESC_SecUpdateConfig) + !insertmacro MUI_DESCRIPTION_TEXT ${SecStartMenu} $(DESC_SecStartMenu) +!insertmacro MUI_FUNCTION_DESCRIPTION_END + diff --git a/nsis/headerimage.bmp b/nsis/headerimage.bmp new file mode 100644 index 00000000..73c88d6d Binary files /dev/null and b/nsis/headerimage.bmp differ diff --git a/nsis/leftimage.bmp b/nsis/leftimage.bmp new file mode 100644 index 00000000..e89fdd95 Binary files /dev/null and b/nsis/leftimage.bmp differ