Merge branch 'BUG_4086_Installer_Fonts'

MediaPortal · Dec 6, 2012 · e8d34f1 · e8d34f1
2 parents 438b92b + c3a5c72
commit e8d34f1
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 1 deletion.
diff --git a/...ult/MPDefaultFonts/MediaPortalDefault.ttf → ...ult/MPDefaultFonts/MediaPortalDefault.ttf b/...ult/MPDefaultFonts/MediaPortalDefault.ttf → ...ult/MPDefaultFonts/MediaPortalDefault.ttf
diff --git a/...ide/MPDefaultFonts/MediaPortalDefault.ttf → ...ide/MPDefaultFonts/MediaPortalDefault.ttf b/...ide/MPDefaultFonts/MediaPortalDefault.ttf → ...ide/MPDefaultFonts/MediaPortalDefault.ttf
diff --git a/...diaportal.base/skin/Titan/Fonts/Titan.ttf → ...diaPortal.Base/skin/Titan/Fonts/Titan.ttf b/...diaportal.base/skin/Titan/Fonts/Titan.ttf → ...diaPortal.Base/skin/Titan/Fonts/Titan.ttf
diff --git a/...rtal.base/skin/Titan/Fonts/TitanLight.ttf → ...rtal.Base/skin/Titan/Fonts/TitanLight.ttf b/...rtal.base/skin/Titan/Fonts/TitanLight.ttf → ...rtal.Base/skin/Titan/Fonts/TitanLight.ttf
diff --git a/...tal.base/skin/Titan/Fonts/TitanMedium.ttf → ...tal.Base/skin/Titan/Fonts/TitanMedium.ttf b/...tal.base/skin/Titan/Fonts/TitanMedium.ttf → ...tal.Base/skin/Titan/Fonts/TitanMedium.ttf
diff --git a/mediaportal/Setup/setup.nsi b/mediaportal/Setup/setup.nsi
@@ -516,7 +516,7 @@ Section "MediaPortal core files (required)" SecCore
 
   ; used for Titan Skin
   StrCpy $FONT_DIR $FONTS
-  !insertmacro InstallTTFFont "${MEDIAPORTAL.BASE}\skin\Titan\Fonts\mayatypeui.ttf"
+  !insertmacro InstallTTFFont "${MEDIAPORTAL.BASE}\skin\Titan\Fonts\TitanSmall.ttf"
   SendMessage ${HWND_BROADCAST} ${WM_FONTCHANGE} 0 0 /TIMEOUT=5000  
 
   StrCpy $FONT_DIR $FONTS

diff --git a/mediaportal/mediaportal.base/skin/Titan/Fonts/mayatypeui.ttf b/mediaportal/mediaportal.base/skin/Titan/Fonts/mayatypeui.ttf