diff --git a/modules/core_fonts/core_fonts.otmod b/modules/core_fonts/core_fonts.otmod index 2514df3d..ed74aaee 100644 --- a/modules/core_fonts/core_fonts.otmod +++ b/modules/core_fonts/core_fonts.otmod @@ -6,18 +6,10 @@ Module version: 0.2 autoLoad: true onLoad: | - importFont('helvetica-11px-bold') - importFont('helvetica-11px') - importFont('helvetica-12px-bold') - importFont('helvetica-12px') - importFont('helvetica-14px-bold') + importFont('verdana-11px-antialised') + importFont('verdana-11px-monochrome') + importFont('verdana-11px-rounded') importFont('terminus-14px-bold') - - importFont('tibia-8px-antialised') - importFont('tibia-10px-antialised') - importFont('tibia-10px-monochrome') - importFont('tibia-12px-rounded') - - setDefaultFont('helvetica-12px') + setDefaultFont('verdana-11px-antialised') return true diff --git a/modules/core_fonts/helvetica-11px-bold.otfont b/modules/core_fonts/helvetica-11px-bold.otfont deleted file mode 100644 index 32ee09e6..00000000 --- a/modules/core_fonts/helvetica-11px-bold.otfont +++ /dev/null @@ -1,12 +0,0 @@ -Font - name: helvetica-11px-bold - height: 14 - spacing: 1 1 - top margin: 2 - texture: helvetica-11px-bold.png - glyph size: 16 16 - - glyph widths: - 32: 4 - 65: 8 - diff --git a/modules/core_fonts/helvetica-11px-bold.png b/modules/core_fonts/helvetica-11px-bold.png deleted file mode 100644 index 3c334571..00000000 Binary files a/modules/core_fonts/helvetica-11px-bold.png and /dev/null differ diff --git a/modules/core_fonts/helvetica-11px.otfont b/modules/core_fonts/helvetica-11px.otfont deleted file mode 100644 index 1f4be47c..00000000 --- a/modules/core_fonts/helvetica-11px.otfont +++ /dev/null @@ -1,11 +0,0 @@ -Font - name: helvetica-11px - height: 14 - spacing: 1 1 - top margin: 1 - texture: helvetica-11px.png - glyph size: 16 16 - - glyph widths: - 32: 4 - diff --git a/modules/core_fonts/helvetica-11px.png b/modules/core_fonts/helvetica-11px.png deleted file mode 100644 index 3f716a7f..00000000 Binary files a/modules/core_fonts/helvetica-11px.png and /dev/null differ diff --git a/modules/core_fonts/helvetica-12px-bold.otfont b/modules/core_fonts/helvetica-12px-bold.otfont deleted file mode 100644 index 28512f4f..00000000 --- a/modules/core_fonts/helvetica-12px-bold.otfont +++ /dev/null @@ -1,12 +0,0 @@ -Font - name: helvetica-12px-bold - height: 16 - spacing: 1 1 - top margin: 2 - texture: helvetica-12px-bold.png - glyph size: 18 18 - - glyph widths: - 32: 4 - 65: 9 - diff --git a/modules/core_fonts/helvetica-12px-bold.png b/modules/core_fonts/helvetica-12px-bold.png deleted file mode 100644 index 9db4920b..00000000 Binary files a/modules/core_fonts/helvetica-12px-bold.png and /dev/null differ diff --git a/modules/core_fonts/helvetica-12px.otfont b/modules/core_fonts/helvetica-12px.otfont deleted file mode 100644 index 2d32cf6e..00000000 --- a/modules/core_fonts/helvetica-12px.otfont +++ /dev/null @@ -1,11 +0,0 @@ -Font - name: helvetica-12px - height: 15 - spacing: 1 1 - top margin: 1 - texture: helvetica-12px.png - glyph size: 16 16 - - glyph widths: - 32: 4 - 65: 8 diff --git a/modules/core_fonts/helvetica-12px.png b/modules/core_fonts/helvetica-12px.png deleted file mode 100644 index 079da8f7..00000000 Binary files a/modules/core_fonts/helvetica-12px.png and /dev/null differ diff --git a/modules/core_fonts/helvetica-14px-bold.otfont b/modules/core_fonts/helvetica-14px-bold.otfont deleted file mode 100644 index 2a91bed0..00000000 --- a/modules/core_fonts/helvetica-14px-bold.otfont +++ /dev/null @@ -1,12 +0,0 @@ -Font - name: helvetica-14px-bold - height: 16 - spacing: 1 1 - top margin: 2 - texture: helvetica-14px-bold.png - glyph size: 20 20 - - glyph widths: - 32: 4 - 65: 9 - diff --git a/modules/core_fonts/helvetica-14px-bold.png b/modules/core_fonts/helvetica-14px-bold.png deleted file mode 100644 index c89524f3..00000000 Binary files a/modules/core_fonts/helvetica-14px-bold.png and /dev/null differ diff --git a/modules/core_fonts/terminus-14px-bold.png b/modules/core_fonts/terminus-14px-bold.png index e55e08ec..8992fcac 100644 Binary files a/modules/core_fonts/terminus-14px-bold.png and b/modules/core_fonts/terminus-14px-bold.png differ diff --git a/modules/core_fonts/tibia-10px-antialised.otfont b/modules/core_fonts/tibia-10px-antialised.otfont deleted file mode 100644 index ea67e925..00000000 --- a/modules/core_fonts/tibia-10px-antialised.otfont +++ /dev/null @@ -1,10 +0,0 @@ -Font - name: tibia-10px-antialised - height: 10 - spacing: 1 1 - top margin: 3 - texture: tibia-10px-antialised.png - glyph size: 8 16 - - glyph widths: - 32: 2 diff --git a/modules/core_fonts/tibia-10px-antialised.png b/modules/core_fonts/tibia-10px-antialised.png deleted file mode 100644 index e3757851..00000000 Binary files a/modules/core_fonts/tibia-10px-antialised.png and /dev/null differ diff --git a/modules/core_fonts/tibia-10px-monochrome.otfont b/modules/core_fonts/tibia-10px-monochrome.otfont deleted file mode 100644 index 87d777c0..00000000 --- a/modules/core_fonts/tibia-10px-monochrome.otfont +++ /dev/null @@ -1,10 +0,0 @@ -Font - name: tibia-10px-monochrome - height: 10 - spacing: 1 1 - top margin: 3 - texture: tibia-10px-monochrome.png - glyph size: 8 16 - - glyph widths: - 32: 2 diff --git a/modules/core_fonts/tibia-10px-monochrome.png b/modules/core_fonts/tibia-10px-monochrome.png deleted file mode 100644 index 9f71d8d3..00000000 Binary files a/modules/core_fonts/tibia-10px-monochrome.png and /dev/null differ diff --git a/modules/core_fonts/tibia-8px-antialised.otfont b/modules/core_fonts/tibia-8px-antialised.otfont deleted file mode 100644 index f464734e..00000000 --- a/modules/core_fonts/tibia-8px-antialised.otfont +++ /dev/null @@ -1,10 +0,0 @@ -Font - name: tibia-8px-antialised - height: 8 - spacing: 0 1 - top margin: 1 - texture: tibia-8px-antialised.png - glyph size: 8 8 - - glyph widths: - 32: 2 diff --git a/modules/core_fonts/tibia-8px-antialised.png b/modules/core_fonts/tibia-8px-antialised.png deleted file mode 100644 index 1c526104..00000000 Binary files a/modules/core_fonts/tibia-8px-antialised.png and /dev/null differ diff --git a/modules/core_fonts/verdana-11px-antialised.otfont b/modules/core_fonts/verdana-11px-antialised.otfont new file mode 100644 index 00000000..7707d3d9 --- /dev/null +++ b/modules/core_fonts/verdana-11px-antialised.otfont @@ -0,0 +1,8 @@ +Font + name: verdana-11px-antialised + height: 14 + texture: verdana-11px-antialised.png + glyph size: 16 16 + + glyph widths: + 32: 4 diff --git a/modules/core_fonts/verdana-11px-antialised.png b/modules/core_fonts/verdana-11px-antialised.png new file mode 100644 index 00000000..e3a14d5f Binary files /dev/null and b/modules/core_fonts/verdana-11px-antialised.png differ diff --git a/modules/core_fonts/verdana-11px-monochrome.otfont b/modules/core_fonts/verdana-11px-monochrome.otfont new file mode 100644 index 00000000..3f7d83f2 --- /dev/null +++ b/modules/core_fonts/verdana-11px-monochrome.otfont @@ -0,0 +1,8 @@ +Font + name: verdana-11px-monochrome + height: 14 + texture: verdana-11px-monochrome.png + glyph size: 16 16 + + glyph widths: + 32: 2 diff --git a/modules/core_fonts/verdana-11px-monochrome.png b/modules/core_fonts/verdana-11px-monochrome.png new file mode 100644 index 00000000..f455efa2 Binary files /dev/null and b/modules/core_fonts/verdana-11px-monochrome.png differ diff --git a/modules/core_fonts/tibia-12px-rounded.otfont b/modules/core_fonts/verdana-11px-rounded.otfont similarity index 95% rename from modules/core_fonts/tibia-12px-rounded.otfont rename to modules/core_fonts/verdana-11px-rounded.otfont index c01805a6..8d427ba4 100644 --- a/modules/core_fonts/tibia-12px-rounded.otfont +++ b/modules/core_fonts/verdana-11px-rounded.otfont @@ -1,9 +1,7 @@ Font - name: tibia-12px-rounded - height: 12 - glyph spacing: 0 1 - top margin: 3 - texture: tibia-12px-rounded.png + name: verdana-11px-rounded + height: 14 + texture: verdana-11px-rounded.png glyph size: 16 16 glyph widths: diff --git a/modules/core_fonts/tibia-12px-rounded.png b/modules/core_fonts/verdana-11px-rounded.png similarity index 100% rename from modules/core_fonts/tibia-12px-rounded.png rename to modules/core_fonts/verdana-11px-rounded.png diff --git a/modules/core_ui/styles/buttons.otui b/modules/core_ui/styles/buttons.otui index d249931e..656e5619 100644 --- a/modules/core_ui/styles/buttons.otui +++ b/modules/core_ui/styles/buttons.otui @@ -1,5 +1,5 @@ Button < UIButton - font: helvetica-11px-bold + font: verdana-11px-antialised background-color: white color: #f0ad4dff size: 106 24 diff --git a/modules/core_ui/styles/labels.otui b/modules/core_ui/styles/labels.otui index 98782ec6..76f1c379 100644 --- a/modules/core_ui/styles/labels.otui +++ b/modules/core_ui/styles/labels.otui @@ -1,8 +1,6 @@ Label < UILabel - font: helvetica-12px - color: #ffffff + font: verdana-11px-antialised + color: #aaaaaa LargerLabel < Label - font: helvetica-12px-bold - color: white diff --git a/modules/core_ui/styles/lineedits.otui b/modules/core_ui/styles/lineedits.otui index 5ff45246..a8f3dabd 100644 --- a/modules/core_ui/styles/lineedits.otui +++ b/modules/core_ui/styles/lineedits.otui @@ -1,5 +1,6 @@ LineEdit < UILineEdit - font: helvetica-12px + font: verdana-11px-antialised + color: #aaaaaa size: 86 20 text margin: 3 border-image: diff --git a/modules/core_ui/styles/windows.otui b/modules/core_ui/styles/windows.otui index a3a45378..a100c52a 100644 --- a/modules/core_ui/styles/windows.otui +++ b/modules/core_ui/styles/windows.otui @@ -1,5 +1,5 @@ Window < UIWindow - font: helvetica-12px-bold + font: verdana-11px-antialised size: 200 200 opacity: 255 background-color: white diff --git a/modules/game/ui/skillwindow.otui b/modules/game/ui/skillwindow.otui index 40659c85..26d61e48 100644 --- a/modules/game/ui/skillwindow.otui +++ b/modules/game/ui/skillwindow.otui @@ -3,17 +3,17 @@ SkillFirstWidget < UIWidget anchors.top: parent.top SkillNameLabel < Label - font: tibia-10px-monochrome - + font: verdana-11px-monochrome + margin.top: 2 margin.left: 10 margin.right: 10 anchors.top: prev.bottom anchors.left: parent.left anchors.right: parent.right - + SkillLevelLabel < Label - font: tibia-10px-monochrome + font: verdana-11px-monochrome align: right margin.top: 2 margin.left: 10 @@ -21,7 +21,7 @@ SkillLevelLabel < Label anchors.top: prev.top anchors.left: parent.left anchors.right: parent.right - + SkillPercentPanel < UIWidget color: blue background-color: red @@ -37,7 +37,7 @@ Window id: skillWindow title: Skills size: 200 200 - + Panel id: skillPanel anchors.fill: parent diff --git a/modules/game/ui/textmessage.otui b/modules/game/ui/textmessage.otui index aab2e1e9..31b7020b 100644 --- a/modules/game/ui/textmessage.otui +++ b/modules/game/ui/textmessage.otui @@ -1,5 +1,5 @@ CenterLabel < Label - font: tibia-12px-rounded + font: verdana-11px-rounded height: 16 align: center anchors.top: parent.verticalCenter @@ -8,7 +8,7 @@ CenterLabel < Label anchors.right: parent.right BottomLabel < Label - font: tibia-12px-rounded + font: verdana-11px-rounded height: 16 align: center anchors.bottom: parent.bottom diff --git a/modules/game/ui/vipwindow.otui b/modules/game/ui/vipwindow.otui index 6df2be33..3d57ee93 100644 --- a/modules/game/ui/vipwindow.otui +++ b/modules/game/ui/vipwindow.otui @@ -1,12 +1,12 @@ VipListLabel < Label - font: tibia-10px-monochrome + font: verdana-11px-monochrome margin.left: 30 Window id: vipWindow title: VIP size: 200 200 - + TextList id: vipList anchors.fill: parent diff --git a/modules/mainmenu/entergame.lua b/modules/mainmenu/entergame.lua index e9a49aac..1a1788ee 100644 --- a/modules/mainmenu/entergame.lua +++ b/modules/mainmenu/entergame.lua @@ -17,7 +17,8 @@ local function onMotd(protocol, motd) loadBox:destroy() local motdNumber = tonumber(string.sub(motd, 0, string.find(motd, "\n"))) local motdMessage = string.sub(motd, string.find(motd, "\n") + 1, string.len(motd)) - if motdNumber ~= tonumber(Configs.get("motd")) then + local lastMotdNumber = tonumber(Configs.get("motd")) + if motdNumber ~= lastMotdNumber then hideCharlist = true local motdBox = displayInfoBox("Message of the day", motdMessage) motdBox.onOk = function() diff --git a/modules/mainmenu/ui/charlist.otui b/modules/mainmenu/ui/charlist.otui index cf0a2102..72d1288d 100644 --- a/modules/mainmenu/ui/charlist.otui +++ b/modules/mainmenu/ui/charlist.otui @@ -1,6 +1,6 @@ CharacterListLabel < Label image: /core_ui/images/empty_rect.png - font: tibia-10px-monochrome + font: verdana-11px-monochrome background-color: #00000000 offset: 2 0 focusable: true @@ -33,7 +33,6 @@ MainWindow text: |- Account Status: Free Account - font: helvetica-11px-bold anchors.left: parent.left anchors.right: parent.right anchors.bottom: next.top diff --git a/modules/mainmenu/ui/entergamewindow.otui b/modules/mainmenu/ui/entergamewindow.otui index e5f6c6fa..7760f646 100644 --- a/modules/mainmenu/ui/entergamewindow.otui +++ b/modules/mainmenu/ui/entergamewindow.otui @@ -18,6 +18,7 @@ MainWindow anchors.left: parent.left anchors.right: parent.right anchors.top: prev.bottom + margin.top: 2 margin.left: 18 margin.right: 18 @@ -33,6 +34,7 @@ MainWindow anchors.left: parent.left anchors.right: parent.right anchors.top: prev.bottom + margin.top: 2 margin.left: 18 margin.right: 18 diff --git a/src/framework/graphics/fontmanager.cpp b/src/framework/graphics/fontmanager.cpp index 55e855e3..b1cb04ce 100644 --- a/src/framework/graphics/fontmanager.cpp +++ b/src/framework/graphics/fontmanager.cpp @@ -79,6 +79,7 @@ FontPtr FontManager::getFont(const std::string& fontName) } // when not found, fallback to default font + logError("font '", fontName, "' not found"); return getDefaultFont(); } diff --git a/src/framework/ui/uilineedit.cpp b/src/framework/ui/uilineedit.cpp index 75493e32..59ba975f 100644 --- a/src/framework/ui/uilineedit.cpp +++ b/src/framework/ui/uilineedit.cpp @@ -45,6 +45,7 @@ void UILineEdit::render() int textLength = m_text.length(); const TexturePtr& texture = m_font->getTexture(); + g_graphics.bindColor(m_foregroundColor); for(int i=0;i + inkscape:snap-global="true" + borderlayer="true"> image/svg+xml - + @@ -93,7 +94,7 @@ transform="translate(0,-540.36218)"> ! # $ % & ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; < = > ? @ A B C D E F G H I J K L M N O P Q R S T U V W X Y Z [ \ ] ^ _ ` a b c d e f g h i j k l m n o p q r s t u v w x y z { | } ~ £ ¤ ¥ ¦ § ª « ¬ ® ¯ ° ± ² ³ ´ µ · ¸ ¹ º ¼ ½ ¾ ¿ À ¨ ¢ Ã Ä Ç É Ê Í Ñ Ò Õ × Ú Û Ý ß Ð ã ä æ è é ì î ñ ò õ ÷ ú û ý ÿ ð Å ˆ Š Œ Ž ž = 141 and i <= 144) or i == 157: + string = u"\u25A1" + else: + string = chr(i).decode('cp1252') offset = i - char_begin x_pos = (offset % 16) * int(glyph_width) diff --git a/tools/layout_sketch.svg b/tools/layout_sketch.svg deleted file mode 100644 index 358efc77..00000000 --- a/tools/layout_sketch.svg +++ /dev/null @@ -1,713 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - Login - - - Account - Password - - Remeber password - Auto login - - - - EXIT - - - - OPTIONS - MOTD - - - OTCLIENT LOGO - An alternative client for otserv - developed by edubart and baxnie - - ABOUT - Wed, 11:59 AM - - - - Enter Game - - - EXIT - - - - OPTIONS - MOTD - - - OTCLIENT LOGO - An alternative client for otserv - developed by edubart and baxnie - - ABOUT - Wed, 11:59 AM - - - Maria - Level: 23 - World: Venus - Cancel - - - Joao - Level: 23 - World: Marte - Account status: Free Account - -