diff --git a/BlueSteel/data/borders/LEFTPAGER/border.cfg b/BlueSteel/data/borders/LEFTPAGER/border.cfg index 2d60cf1..5041deb 100644 --- a/BlueSteel/data/borders/LEFTPAGER/border.cfg +++ b/BlueSteel/data/borders/LEFTPAGER/border.cfg @@ -199,19 +199,19 @@ __END __TCLASS __BGN __NAME "LEFTPAGER_TITLE_TEXT" - __NORMAL "*norm-12" + __NORMAL "*font-border" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 192 192 192 __BACKGROUND_COLOR 0 0 0 __JUSTIFICATION 512 __ORIENTATION __FONT_TO_DOWN - __NORMAL_ACTIVE "*norm-12" + __NORMAL_ACTIVE "*font-border" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 __JUSTIFICATION 512 __ORIENTATION __FONT_TO_DOWN - __NORMAL_ACTIVE_STICKY "*norm-12" + __NORMAL_ACTIVE_STICKY "*font-border" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 diff --git a/BlueSteel/data/borders/common/border.cfg b/BlueSteel/data/borders/common/border.cfg index 02f610e..aa17418 100644 --- a/BlueSteel/data/borders/common/border.cfg +++ b/BlueSteel/data/borders/common/border.cfg @@ -649,17 +649,17 @@ __END __TCLASS __BGN __NAME "TITLE_TEXT" - __NORMAL "*norm-12" + __NORMAL "*font-border" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 192 192 192 __BACKGROUND_COLOR 0 0 0 __JUSTIFICATION 512 - __NORMAL_ACTIVE "*norm-12" + __NORMAL_ACTIVE "*font-border" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 __JUSTIFICATION 512 - __NORMAL_ACTIVE_STICKY "*norm-12" + __NORMAL_ACTIVE_STICKY "*font-border" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 @@ -668,22 +668,22 @@ __END __TCLASS __BGN __NAME "LEFTSIDE_TITLE_TEXT" - __NORMAL "*norm-12" + __NORMAL "*font-border" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 192 192 192 __BACKGROUND_COLOR 0 0 0 __JUSTIFICATION 512 - __ORIENTATION __FONT_TO_UP - __NORMAL_ACTIVE "*norm-12" + __ORIENTATION __FONT_TO_UP + __NORMAL_ACTIVE "*font-border" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 __JUSTIFICATION 512 - __ORIENTATION __FONT_TO_UP - __NORMAL_ACTIVE_STICKY "*norm-12" + __ORIENTATION __FONT_TO_UP + __NORMAL_ACTIVE_STICKY "*font-border" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 __JUSTIFICATION 512 - __ORIENTATION __FONT_TO_UP + __ORIENTATION __FONT_TO_UP __END diff --git a/BlueSteel/data/coords/coords.cfg b/BlueSteel/data/coords/coords.cfg index 132ade7..6094148 100644 --- a/BlueSteel/data/coords/coords.cfg +++ b/BlueSteel/data/coords/coords.cfg @@ -7,7 +7,7 @@ __END __TCLASS __BGN __NAME "COORDS" - __NORMAL "*norm-12" + __NORMAL "*font-coords" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 diff --git a/BlueSteel/data/dialogs/dialogs.cfg b/BlueSteel/data/dialogs/dialogs.cfg index c0def63..40a9334 100644 --- a/BlueSteel/data/dialogs/dialogs.cfg +++ b/BlueSteel/data/dialogs/dialogs.cfg @@ -109,7 +109,7 @@ __END __TCLASS __BGN __NAME "DIALOG" - __NORMAL "*norm-12" + __NORMAL "*font-dialog" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 192 192 192 __BACKGROUND_COLOR 0 0 0 @@ -118,7 +118,7 @@ __END __TCLASS __BGN __NAME "DIALOG_BUTTON" - __NORMAL "*norm-12" + __NORMAL "*font-dialog" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 @@ -127,7 +127,7 @@ __END __TCLASS __BGN __NAME "DIALOG_WIDGET_TEXT" - __NORMAL "*norm-12" + __NORMAL "*font-dialog" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 192 192 192 __BACKGROUND_COLOR 0 0 0 @@ -136,7 +136,7 @@ __END __TCLASS __BGN __NAME "DIALOG_WIDGET_CHECK_BUTTON" - __NORMAL "*norm-12" + __NORMAL "*font-dialog" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 192 192 192 __BACKGROUND_COLOR 0 0 0 @@ -145,7 +145,7 @@ __END __TCLASS __BGN __NAME "DIALOG_WIDGET_RADIO_BUTTON" - __NORMAL "*norm-12" + __NORMAL "*font-dialog" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 192 192 192 __BACKGROUND_COLOR 0 0 0 @@ -154,7 +154,7 @@ __END __TCLASS __BGN __NAME "DIALOG_WIDGET_BUTTON" - __NORMAL "*norm-12" + __NORMAL "*font-dialog" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 diff --git a/BlueSteel/data/epplets/epplets.cfg b/BlueSteel/data/epplets/epplets.cfg index ff72bf3..288e41b 100644 --- a/BlueSteel/data/epplets/epplets.cfg +++ b/BlueSteel/data/epplets/epplets.cfg @@ -286,7 +286,7 @@ __END __TCLASS __BGN __NAME "EPPLET_LABEL" - __NORMAL "*epplets-small" + __NORMAL "*font-epplet" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 182 178 190 @@ -294,11 +294,11 @@ __END __TCLASS __BGN __NAME "EPPLET_BUTTON" - __NORMAL "*epplets-small" + __NORMAL "*font-epplet" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 182 178 190 - __CLICKED "*epplets-small" + __CLICKED "*font-epplet" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 128 125 133 @@ -306,7 +306,7 @@ __END __TCLASS __BGN __NAME "EPPLET_TOGGLEBUTTON_ON" - __NORMAL "*epplets-small" + __NORMAL "*font-epplet" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 128 125 133 @@ -314,7 +314,7 @@ __END __TCLASS __BGN __NAME "EPPLET_TOGGLEBUTTON_OFF" - __NORMAL "*epplets-small" + __NORMAL "*font-epplet" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 182 178 190 @@ -322,11 +322,11 @@ __END __TCLASS __BGN __NAME "EPPLET_POPUP" - __NORMAL "*epplets-small" + __NORMAL "*font-epplet" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 182 178 190 - __CLICKED "*epplets-small" + __CLICKED "*font-epplet" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 128 125 133 @@ -334,7 +334,7 @@ __END __TCLASS __BGN __NAME "EPPLET_TEXT_TINY" - __NORMAL "*epplets-small" + __NORMAL "*font-epplet-small" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 182 178 190 @@ -342,7 +342,7 @@ __END __TCLASS __BGN __NAME "EPPLET_TEXT_MEDIUM" - __NORMAL "*epplets-medium" + __NORMAL "*font-epplet-medium" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 182 178 190 @@ -350,7 +350,7 @@ __END __TCLASS __BGN __NAME "EPPLET_TEXT_LARGE" - __NORMAL "*epplets-large" + __NORMAL "*font-epplet-large" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 182 178 190 diff --git a/BlueSteel/data/focuslist/focuslist.cfg b/BlueSteel/data/focuslist/focuslist.cfg index ce03d8d..3b5fecf 100644 --- a/BlueSteel/data/focuslist/focuslist.cfg +++ b/BlueSteel/data/focuslist/focuslist.cfg @@ -11,12 +11,12 @@ __END __TCLASS __BGN __NAME "WARPFOCUS" - __NORMAL "*norm-12" + __NORMAL "*font-focus" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 192 192 192 __BACKGROUND_COLOR 0 0 0 __JUSTIFICATION 0 - __CLICKED "*norm-12" + __CLICKED "*font-focus" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 diff --git a/BlueSteel/data/fonts.cfg b/BlueSteel/data/fonts.cfg index 9df52f7..1055769 100644 --- a/BlueSteel/data/fonts.cfg +++ b/BlueSteel/data/fonts.cfg @@ -2,10 +2,29 @@ __E_CFG_VERSION 1 __FONTS __BGN -norm-12 "vixar/12" +font-default "vixar/12" -epplets-small "-*-lucida-medium-r-normal-*-*-80-*-*-p-*-*-*,-*-helvetica-medium-r-normal-*-8-*" -epplets-medium "-*-lucida-medium-r-normal-*-*-100-*-*-p-*-*-*,-*-helvetica-medium-r-normal-*-10-*" -epplets-large "-*-lucida-medium-r-normal-*-*-120-*-*-p-*-*-*,-*-helvetica-medium-r-normal-*-12-*" +font-border "vixar/12" + +font-coords "vixar/12" + +font-dialog "vixar/12" + +font-epplet "-*-lucida-medium-r-normal-*-*-80-*-*-p-*-*-*,-*-helvetica-medium-r-normal-*-8-*" +font-epplet-small "-*-lucida-medium-r-normal-*-*-80-*-*-p-*-*-*,-*-helvetica-medium-r-normal-*-8-*" +font-epplet-medium "-*-lucida-medium-r-normal-*-*-100-*-*-p-*-*-*,-*-helvetica-medium-r-normal-*-10-*" +font-epplet-large "-*-lucida-medium-r-normal-*-*-120-*-*-p-*-*-*,-*-helvetica-medium-r-normal-*-12-*" + +font-focus "vixar/12" + +font-iconbox "vixar/12" + +font-init "vixar/12" + +font-menu "vixar/12" + +font-pager "vixar/12" + +font-tooltip "vixar/12" __END diff --git a/BlueSteel/data/iconbox/iconbox.cfg b/BlueSteel/data/iconbox/iconbox.cfg index 177150e..4fea3ef 100644 --- a/BlueSteel/data/iconbox/iconbox.cfg +++ b/BlueSteel/data/iconbox/iconbox.cfg @@ -120,7 +120,7 @@ __END __TCLASS __BGN __NAME "ICONBOX_WINDOW_TITLE" - __NORMAL "*norm-12" + __NORMAL "*font-iconbox" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 diff --git a/BlueSteel/data/init/init.cfg b/BlueSteel/data/init/init.cfg index e48afee..b1c5816 100644 --- a/BlueSteel/data/init/init.cfg +++ b/BlueSteel/data/init/init.cfg @@ -30,7 +30,7 @@ __END __TCLASS __BGN __NAME "PROGRESS_TEXT" - __NORMAL "*norm-12" + __NORMAL "*font-init" __DRAWING_EFFECT __EFFECT_NONE __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 @@ -39,7 +39,7 @@ __END __TCLASS __BGN __NAME "PROGRESS_TEXT_NUMBER" - __NORMAL "*norm-12" + __NORMAL "*font-init" __DRAWING_EFFECT __EFFECT_NONE __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 diff --git a/BlueSteel/data/menustyles/menustyles.cfg b/BlueSteel/data/menustyles/menustyles.cfg index 5a365e8..97bea1d 100644 --- a/BlueSteel/data/menustyles/menustyles.cfg +++ b/BlueSteel/data/menustyles/menustyles.cfg @@ -25,7 +25,7 @@ __END __TCLASS __BGN __NAME "MENU_TEXT" - __NORMAL "*norm-12" + __NORMAL "*font-menu" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 192 192 192 __BACKGROUND_COLOR 0 0 0 diff --git a/BlueSteel/data/pager/pager.cfg b/BlueSteel/data/pager/pager.cfg index cd3c1a7..cf82bd0 100644 --- a/BlueSteel/data/pager/pager.cfg +++ b/BlueSteel/data/pager/pager.cfg @@ -26,7 +26,7 @@ __END __TCLASS __BGN __NAME "PAGER_WINDOW_TITLE" - __NORMAL "*norm-12" + __NORMAL "*font-pager" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 diff --git a/BlueSteel/data/tooltips/tooltips.cfg b/BlueSteel/data/tooltips/tooltips.cfg index 36e8c25..7f9334f 100644 --- a/BlueSteel/data/tooltips/tooltips.cfg +++ b/BlueSteel/data/tooltips/tooltips.cfg @@ -27,7 +27,7 @@ __END __TCLASS __BGN __NAME "TOOLTIP_TEXT" - __NORMAL "*norm-12" + __NORMAL "*font-tooltip" __DRAWING_EFFECT __EFFECT_NONE __FORGROUND_COLOR 0 0 0 __JUSTIFICATION 0 diff --git a/BrushedMetal-Tigert/data/borders/common/border.cfg b/BrushedMetal-Tigert/data/borders/common/border.cfg index 46297d9..7cfb01a 100644 --- a/BrushedMetal-Tigert/data/borders/common/border.cfg +++ b/BrushedMetal-Tigert/data/borders/common/border.cfg @@ -426,22 +426,22 @@ __TCLASS __BGN __NAME "TEXT1" __JUSTIFICATION 0 - __NORMAL "*bold-10" + __NORMAL "*font-border" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 180 180 180 - __NORMAL_ACTIVE "*bold-10" + __NORMAL_ACTIVE "*font-border" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 255 255 255 - __NORMAL_STICKY "*bold-10" + __NORMAL_STICKY "*font-border" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 180 180 180 - __NORMAL_ACTIVE_STICKY "*bold-10" + __NORMAL_ACTIVE_STICKY "*font-border" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 255 255 255 diff --git a/BrushedMetal-Tigert/data/coords/coords.cfg b/BrushedMetal-Tigert/data/coords/coords.cfg index bbebc4f..278a972 100644 --- a/BrushedMetal-Tigert/data/coords/coords.cfg +++ b/BrushedMetal-Tigert/data/coords/coords.cfg @@ -2,7 +2,7 @@ __TCLASS __BGN __NAME "COORDS" __JUSTIFICATION 0 - __NORMAL "*bold-10" + __NORMAL "*font-coords" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 255 255 255 diff --git a/BrushedMetal-Tigert/data/dialogs/dialogs.cfg b/BrushedMetal-Tigert/data/dialogs/dialogs.cfg index 5a6dbed..6d9d7a2 100644 --- a/BrushedMetal-Tigert/data/dialogs/dialogs.cfg +++ b/BrushedMetal-Tigert/data/dialogs/dialogs.cfg @@ -133,7 +133,7 @@ __TCLASS __BGN __NAME "DIALOG" __JUSTIFICATION 512 - __NORMAL "*norm-10" + __NORMAL "*font-dialog" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 255 255 255 @@ -143,7 +143,7 @@ __TCLASS __BGN __NAME "DIALOG_WIDGET_BUTTON" __JUSTIFICATION 512 - __NORMAL "*norm-10" + __NORMAL "*font-dialog" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 255 255 255 @@ -153,7 +153,7 @@ __TCLASS __BGN __NAME "DIALOG_WIDGET_CHECK_BUTTON" __JUSTIFICATION 0 - __NORMAL "*norm-10" + __NORMAL "*font-dialog" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 255 255 255 @@ -163,7 +163,7 @@ __TCLASS __BGN __NAME "DIALOG_WIDGET_RADIO_BUTTON" __JUSTIFICATION 0 - __NORMAL "*norm-10" + __NORMAL "*font-dialog" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 255 255 255 @@ -173,7 +173,7 @@ __TCLASS __BGN __NAME "DIALOG_WIDGET_TEXT" __JUSTIFICATION 512 - __NORMAL "*norm-10" + __NORMAL "*font-dialog" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 255 255 255 @@ -183,7 +183,7 @@ __TCLASS __BGN __NAME "DIALOG_BUTTON" __JUSTIFICATION 512 - __NORMAL "*bold-10" + __NORMAL "*font-dialog-button" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 255 255 255 diff --git a/BrushedMetal-Tigert/data/epplets/epplets.cfg b/BrushedMetal-Tigert/data/epplets/epplets.cfg index d838b30..2f44f64 100644 --- a/BrushedMetal-Tigert/data/epplets/epplets.cfg +++ b/BrushedMetal-Tigert/data/epplets/epplets.cfg @@ -286,7 +286,7 @@ __END __TCLASS __BGN __NAME "EPPLET_LABEL" - __NORMAL "*epplets-small" + __NORMAL "*font-epplet" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 255 255 255 @@ -294,7 +294,7 @@ __END __TCLASS __BGN __NAME "EPPLET_BUTTON" - __NORMAL "*epplets-small" + __NORMAL "*font-epplet" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 255 255 255 @@ -302,7 +302,7 @@ __END __TCLASS __BGN __NAME "EPPLET_TOGGLEBUTTON_ON" - __NORMAL "*epplets-small" + __NORMAL "*font-epplet" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 255 255 255 @@ -310,7 +310,7 @@ __END __TCLASS __BGN __NAME "EPPLET_TOGGLEBUTTON_OFF" - __NORMAL "*epplets-small" + __NORMAL "*font-epplet" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 255 255 255 @@ -318,7 +318,7 @@ __END __TCLASS __BGN __NAME "EPPLET_POPUP" - __NORMAL "*epplets-small" + __NORMAL "*font-epplet" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 255 255 255 @@ -326,7 +326,7 @@ __END __TCLASS __BGN __NAME "EPPLET_TEXT_TINY" - __NORMAL "*epplets-small" + __NORMAL "*font-epplet-small" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 255 255 255 @@ -334,7 +334,7 @@ __END __TCLASS __BGN __NAME "EPPLET_TEXT_MEDIUM" - __NORMAL "*epplets-medium" + __NORMAL "*font-epplet-medium" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 255 255 255 @@ -342,7 +342,7 @@ __END __TCLASS __BGN __NAME "EPPLET_TEXT_LARGE" - __NORMAL "*epplets-large" + __NORMAL "*font-epplet-large" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 255 255 255 diff --git a/BrushedMetal-Tigert/data/focuslist/focuslist.cfg b/BrushedMetal-Tigert/data/focuslist/focuslist.cfg index 5832426..ec44b5e 100644 --- a/BrushedMetal-Tigert/data/focuslist/focuslist.cfg +++ b/BrushedMetal-Tigert/data/focuslist/focuslist.cfg @@ -2,12 +2,12 @@ __TCLASS __BGN __NAME "WARPFOCUS" __JUSTIFICATION 0 - __NORMAL "*bold-10" + __NORMAL "*font-focus" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 180 180 180 - __CLICKED "*bold-10" + __CLICKED "*font-focus" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 diff --git a/BrushedMetal-Tigert/data/fonts.cfg b/BrushedMetal-Tigert/data/fonts.cfg index da8c8dd..8caf141 100644 --- a/BrushedMetal-Tigert/data/fonts.cfg +++ b/BrushedMetal-Tigert/data/fonts.cfg @@ -2,14 +2,30 @@ __E_CFG_VERSION 1 __FONTS __BGN -norm-8 "-*-lucida-medium-r-normal-*-*-80-*-*-p-*-*-*,-*-helvetica-medium-r-normal-*-8-*" -norm-10 "-*-lucida-medium-r-normal-*-*-100-*-*-p-*-*-*,-*-helvetica-medium-r-normal-*-10-*" +font-default "-*-lucida-medium-r-normal-*-*-100-*-*-p-*-*-*,-*-helvetica-medium-r-normal-*-10-*" -bold-8 "-*-lucida-bold-r-normal-*-*-80-*-*-p-*-*-*,-*-helvetica-bold-r-normal-*-8-*" -bold-10 "-*-lucida-bold-r-normal-*-*-100-*-*-p-*-*-*,-*-helvetica-bold-r-normal-*-10-*" +font-border "-*-lucida-bold-r-normal-*-*-100-*-*-p-*-*-*,-*-helvetica-bold-r-normal-*-10-*" -epplets-small "-*-lucida-medium-r-normal-*-*-80-*-*-p-*-*-*,-*-helvetica-medium-r-normal-*-8-*" -epplets-medium "-*-lucida-bold-r-normal-*-*-100-*-*-p-*-*-*,-*-helvetica-bold-r-normal-*-10-*" -epplets-large "-*-lucida-bold-r-normal-*-*-120-*-*-p-*-*-*,-*-helvetica-bold-r-normal-*-12-*" +font-coords "-*-lucida-bold-r-normal-*-*-100-*-*-p-*-*-*,-*-helvetica-bold-r-normal-*-10-*" + +font-dialog "-*-lucida-medium-r-normal-*-*-100-*-*-p-*-*-*,-*-helvetica-medium-r-normal-*-10-*" +font-dialog-button "-*-lucida-bold-r-normal-*-*-100-*-*-p-*-*-*,-*-helvetica-bold-r-normal-*-10-*" + +font-epplet "-*-lucida-medium-r-normal-*-*-80-*-*-p-*-*-*,-*-helvetica-medium-r-normal-*-8-*" +font-epplet-small "-*-lucida-medium-r-normal-*-*-80-*-*-p-*-*-*,-*-helvetica-medium-r-normal-*-8-*" +font-epplet-medium "-*-lucida-medium-r-normal-*-*-100-*-*-p-*-*-*,-*-helvetica-medium-r-normal-*-10-*" +font-epplet-large "-*-lucida-medium-r-normal-*-*-120-*-*-p-*-*-*,-*-helvetica-medium-r-normal-*-12-*" + +font-focus "-*-lucida-bold-r-normal-*-*-100-*-*-p-*-*-*,-*-helvetica-bold-r-normal-*-10-*" + +font-iconbox "-*-lucida-bold-r-normal-*-*-80-*-*-p-*-*-*,-*-helvetica-bold-r-normal-*-8-*" + +font-init "-*-lucida-bold-r-normal-*-*-100-*-*-p-*-*-*,-*-helvetica-bold-r-normal-*-10-*" + +font-menu "-*-lucida-medium-r-normal-*-*-100-*-*-p-*-*-*,-*-helvetica-medium-r-normal-*-10-*" + +font-pager "-*-lucida-bold-r-normal-*-*-80-*-*-p-*-*-*,-*-helvetica-bold-r-normal-*-8-*" + +font-tooltip "-*-lucida-bold-r-normal-*-*-100-*-*-p-*-*-*,-*-helvetica-bold-r-normal-*-10-*" __END diff --git a/BrushedMetal-Tigert/data/iconbox/iconbox.cfg b/BrushedMetal-Tigert/data/iconbox/iconbox.cfg index 18a1a0a..ca102b2 100644 --- a/BrushedMetal-Tigert/data/iconbox/iconbox.cfg +++ b/BrushedMetal-Tigert/data/iconbox/iconbox.cfg @@ -125,7 +125,7 @@ __END __TCLASS __BGN __NAME "ICONBOX_WINDOW_TITLE" __JUSTIFICATION 0 - __NORMAL "*bold-8" + __NORMAL "*font-iconbox" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 180 180 180 diff --git a/BrushedMetal-Tigert/data/init/init.cfg b/BrushedMetal-Tigert/data/init/init.cfg index 7407b62..74fad0f 100644 --- a/BrushedMetal-Tigert/data/init/init.cfg +++ b/BrushedMetal-Tigert/data/init/init.cfg @@ -34,7 +34,7 @@ __TCLASS __BGN __NAME "PROGRESS_TEXT" __JUSTIFICATION 0 - __NORMAL "*bold-10" + __NORMAL "*font-init" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 180 180 180 @@ -45,7 +45,7 @@ __TCLASS __BGN __NAME "PROGRESS_TEXT_NUMBER" __JUSTIFICATION 512 - __NORMAL "*bold-10" + __NORMAL "*font-init" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 180 180 180 diff --git a/BrushedMetal-Tigert/data/menustyles/menustyles.cfg b/BrushedMetal-Tigert/data/menustyles/menustyles.cfg index e10cb8a..91ad08e 100644 --- a/BrushedMetal-Tigert/data/menustyles/menustyles.cfg +++ b/BrushedMetal-Tigert/data/menustyles/menustyles.cfg @@ -31,12 +31,12 @@ __TCLASS __BGN __NAME "MENU" __JUSTIFICATION 0 - __NORMAL "*norm-10" + __NORMAL "*font-menu" __DRAWING_EFFECT __EFFECT_NONE __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 0 0 0 - __HILITED "*norm-10" + __HILITED "*font-menu" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 255 255 255 diff --git a/BrushedMetal-Tigert/data/pager/pager.cfg b/BrushedMetal-Tigert/data/pager/pager.cfg index 4115418..5788bcb 100644 --- a/BrushedMetal-Tigert/data/pager/pager.cfg +++ b/BrushedMetal-Tigert/data/pager/pager.cfg @@ -27,7 +27,7 @@ __END __TCLASS __BGN __NAME "PAGER_WINDOW_TITLE" __JUSTIFICATION 0 - __NORMAL "*bold-8" + __NORMAL "*font-pager" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 180 180 180 diff --git a/BrushedMetal-Tigert/data/tooltips/tooltips.cfg b/BrushedMetal-Tigert/data/tooltips/tooltips.cfg index 6f9159a..b67ac99 100644 --- a/BrushedMetal-Tigert/data/tooltips/tooltips.cfg +++ b/BrushedMetal-Tigert/data/tooltips/tooltips.cfg @@ -34,7 +34,7 @@ __TCLASS __BGN __NAME "TT_TEXT" __JUSTIFICATION 0 - __NORMAL "*bold-10" + __NORMAL "*font-tooltip" __DRAWING_EFFECT __EFFECT_NONE __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 180 180 180 diff --git a/Ganymede/data/borders/DEFAULT/border.cfg b/Ganymede/data/borders/DEFAULT/border.cfg index 9367d96..ca7f341 100644 --- a/Ganymede/data/borders/DEFAULT/border.cfg +++ b/Ganymede/data/borders/DEFAULT/border.cfg @@ -10,17 +10,17 @@ ____________________________________________________________ __TCLASS __BGN __NAME "GANYMEDE" - __NORMAL "*norm-10" + __NORMAL "*font-border" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 200 200 200 __BACKGROUND_COLOR 0 0 0 __JUSTIFICATION 450 - __NORMAL_ACTIVE "*norm-10" + __NORMAL_ACTIVE "*font-border" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 __JUSTIFICATION 450 - __NORMAL_ACTIVE_STICKY "*norm-10" + __NORMAL_ACTIVE_STICKY "*font-border" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 diff --git a/Ganymede/data/borders/GREEN/border.cfg b/Ganymede/data/borders/GREEN/border.cfg index 3469696..e81e16c 100644 --- a/Ganymede/data/borders/GREEN/border.cfg +++ b/Ganymede/data/borders/GREEN/border.cfg @@ -10,17 +10,17 @@ ____________________________________________________________ __TCLASS __BGN __NAME "GANYMEDE_GREEN" - __NORMAL "*norm-10" + __NORMAL "*font-border" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 200 255 200 __BACKGROUND_COLOR 0 0 0 __JUSTIFICATION 450 - __NORMAL_ACTIVE "*norm-10" + __NORMAL_ACTIVE "*font-border" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 200 255 255 __BACKGROUND_COLOR 0 0 0 __JUSTIFICATION 450 - __NORMAL_ACTIVE_STICKY "*norm-10" + __NORMAL_ACTIVE_STICKY "*font-border" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 0 255 255 __BACKGROUND_COLOR 0 0 0 diff --git a/Ganymede/data/borders/MENU_BORDER/border.cfg b/Ganymede/data/borders/MENU_BORDER/border.cfg index f207e10..f9b18da 100644 --- a/Ganymede/data/borders/MENU_BORDER/border.cfg +++ b/Ganymede/data/borders/MENU_BORDER/border.cfg @@ -10,12 +10,12 @@ ____________________________________________________________ __TCLASS __BGN __NAME "GANYMEDE_SMALL_ITALIC" - __NORMAL "*italic-10" + __NORMAL "*font-border-italic" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 210 210 255 __BACKGROUND_COLOR 0 0 0 __JUSTIFICATION 512 - __NORMAL_ACTIVE "*italic-10" + __NORMAL_ACTIVE "*font-border-italic" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 diff --git a/Ganymede/data/borders/PAGER/border.cfg b/Ganymede/data/borders/PAGER/border.cfg index 5db10a2..444435e 100644 --- a/Ganymede/data/borders/PAGER/border.cfg +++ b/Ganymede/data/borders/PAGER/border.cfg @@ -10,7 +10,7 @@ ____________________________________________________________ __TCLASS __BGN __NAME "GANYMEDE_CENTERED_SMALL" - __NORMAL "*norm-7" + __NORMAL "*font-border-small" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 diff --git a/Ganymede/data/borders/PAGER_LEFT/border.cfg b/Ganymede/data/borders/PAGER_LEFT/border.cfg index 3bf6e41..34524d2 100644 --- a/Ganymede/data/borders/PAGER_LEFT/border.cfg +++ b/Ganymede/data/borders/PAGER_LEFT/border.cfg @@ -10,7 +10,7 @@ ____________________________________________________________ __TCLASS __BGN __NAME "GANYMEDE_CENTERED_SMALL_UP" - __NORMAL "*norm-7" + __NORMAL "*font-border-small" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 diff --git a/Ganymede/data/borders/PAGER_RIGHT/border.cfg b/Ganymede/data/borders/PAGER_RIGHT/border.cfg index 1971a93..ec4636e 100644 --- a/Ganymede/data/borders/PAGER_RIGHT/border.cfg +++ b/Ganymede/data/borders/PAGER_RIGHT/border.cfg @@ -9,7 +9,7 @@ ____________________________________________________________ */ __TCLASS __BGN __NAME "GANYMEDE_CENTERED_SMALL_DOWN" - __NORMAL "*norm-7" + __NORMAL "*font-border-small" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 diff --git a/Ganymede/data/borders/RED/border.cfg b/Ganymede/data/borders/RED/border.cfg index abd4a46..42538e7 100644 --- a/Ganymede/data/borders/RED/border.cfg +++ b/Ganymede/data/borders/RED/border.cfg @@ -10,17 +10,17 @@ ____________________________________________________________ __TCLASS __BGN __NAME "GANYMEDE_RED" - __NORMAL "*norm-10" + __NORMAL "*font-border" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 200 200 __BACKGROUND_COLOR 0 0 0 __JUSTIFICATION 450 - __NORMAL_ACTIVE "*norm-10" + __NORMAL_ACTIVE "*font-border" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 200 __BACKGROUND_COLOR 0 0 0 __JUSTIFICATION 450 - __NORMAL_ACTIVE_STICKY "*norm-10" + __NORMAL_ACTIVE_STICKY "*font-border" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 0 __BACKGROUND_COLOR 0 0 0 diff --git a/Ganymede/data/borders/ROTATED/border.cfg b/Ganymede/data/borders/ROTATED/border.cfg index 62b592f..c1a2434 100644 --- a/Ganymede/data/borders/ROTATED/border.cfg +++ b/Ganymede/data/borders/ROTATED/border.cfg @@ -10,7 +10,7 @@ ____________________________________________________________ __TCLASS __BGN __NAME "GANYMEDE_DOWN" - __NORMAL "*norm-10" + __NORMAL "*font-border" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 diff --git a/Ganymede/data/buttons/buttons.cfg b/Ganymede/data/buttons/buttons.cfg index d8b4fdb..8462fbe 100644 --- a/Ganymede/data/buttons/buttons.cfg +++ b/Ganymede/data/buttons/buttons.cfg @@ -90,17 +90,17 @@ __END __TCLASS __BGN __NAME "GANYMEDE_CENTERED" - __NORMAL "*norm-10" + __NORMAL "*font-pulldown" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 240 240 240 __BACKGROUND_COLOR 0 0 0 __JUSTIFICATION 512 - __HILITED "*norm-10" + __HILITED "*font-pulldown" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 __JUSTIFICATION 512 - __CLICKED "*norm-10" + __CLICKED "*font-pulldown" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 @@ -109,19 +109,19 @@ __END __TCLASS __BGN __NAME "GANYMEDE_CENTERED_DOWN" - __NORMAL "*norm-10" + __NORMAL "*font-pulldown" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 240 240 240 __BACKGROUND_COLOR 0 0 0 __JUSTIFICATION 512 __ORIENTATION __FONT_TO_DOWN - __HILITED "*norm-10" + __HILITED "*font-pulldown" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 __JUSTIFICATION 512 __ORIENTATION __FONT_TO_DOWN - __CLICKED "*norm-10" + __CLICKED "*font-pulldown" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 diff --git a/Ganymede/data/coords/coords.cfg b/Ganymede/data/coords/coords.cfg index 52dfbdb..d06a2ca 100644 --- a/Ganymede/data/coords/coords.cfg +++ b/Ganymede/data/coords/coords.cfg @@ -9,7 +9,7 @@ ____________________________________________________________ */ __TCLASS __BGN __NAME "COORDS" - __NORMAL "*norm-8" + __NORMAL "*font-coords" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 diff --git a/Ganymede/data/dialogs/dialogs.cfg b/Ganymede/data/dialogs/dialogs.cfg index 4837b15..776ec7a 100644 --- a/Ganymede/data/dialogs/dialogs.cfg +++ b/Ganymede/data/dialogs/dialogs.cfg @@ -13,7 +13,7 @@ __E_CFG_VERSION 0 __TCLASS __BGN __NAME "DIALOG" - __NORMAL "*norm-10" + __NORMAL "*font-dialog" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 @@ -22,7 +22,7 @@ __END __TCLASS __BGN __NAME "DIALOG_WIDGET_TEXT" - __NORMAL "*italic-10" + __NORMAL "*font-dialog-italic" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 @@ -31,7 +31,7 @@ __END __TCLASS __BGN __NAME "DIALOG_WIDGET_BUTTON" - __NORMAL "*norm-10" + __NORMAL "*font-dialog" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 @@ -40,7 +40,7 @@ __END __TCLASS __BGN __NAME "DIALOG_WIDGET_RADIO_BUTTON" - __NORMAL "*norm-10" + __NORMAL "*font-dialog" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 @@ -49,7 +49,7 @@ __END __TCLASS __BGN __NAME "DIALOG_WIDGET_TABLE" - __NORMAL "*norm-10" + __NORMAL "*font-dialog" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 @@ -58,7 +58,7 @@ __END __TCLASS __BGN __NAME "DIALOG_WIDGET_CHECK_BUTTON" - __NORMAL "*norm-10" + __NORMAL "*font-dialog" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 @@ -67,7 +67,7 @@ __END __TCLASS __BGN __NAME "DIALOG_WIDGET_AREA" - __NORMAL "*norm-10" + __NORMAL "*font-dialog" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 @@ -76,7 +76,7 @@ __END __TCLASS __BGN __NAME "DIALOG_WIDGET_BUTTON" - __NORMAL "*norm-10" + __NORMAL "*font-dialog" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 @@ -85,7 +85,7 @@ __END __TCLASS __BGN __NAME "DIALOG_BUTTON" - __NORMAL "*norm-10" + __NORMAL "*font-dialog" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 diff --git a/Ganymede/data/epplets/epplets.cfg b/Ganymede/data/epplets/epplets.cfg index 1b45889..c547f20 100644 --- a/Ganymede/data/epplets/epplets.cfg +++ b/Ganymede/data/epplets/epplets.cfg @@ -309,7 +309,7 @@ __END __TCLASS __BGN __NAME "EPPLET_LABEL" - __NORMAL "*norm-8" + __NORMAL "*font-epplet" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 210 210 255 __BACKGROUND_COLOR 0 0 0 @@ -318,7 +318,7 @@ __END __TCLASS __BGN __NAME "EPPLET_BUTTON" - __NORMAL "*norm-8" + __NORMAL "*font-epplet" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 210 210 255 __BACKGROUND_COLOR 0 0 0 @@ -327,7 +327,7 @@ __END __TCLASS __BGN __NAME "EPPLET_TOGGLEBUTTON_ON" - __NORMAL "*norm-8" + __NORMAL "*font-epplet" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 210 210 255 __BACKGROUND_COLOR 0 0 0 @@ -336,7 +336,7 @@ __END __TCLASS __BGN __NAME "EPPLET_TOGGLEBUTTON_OFF" - __NORMAL "*norm-8" + __NORMAL "*font-epplet" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 210 210 255 __BACKGROUND_COLOR 0 0 0 @@ -345,7 +345,7 @@ __END __TCLASS __BGN __NAME "EPPLET_POPUP" - __NORMAL "*norm-8" + __NORMAL "*font-epplet" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 210 210 255 __BACKGROUND_COLOR 0 0 0 @@ -354,7 +354,7 @@ __END __TCLASS __BGN __NAME "EPPLET_TEXT_TINY" - __NORMAL "*norm-6" + __NORMAL "*font-epplet-small" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 210 210 255 __BACKGROUND_COLOR 0 0 0 @@ -363,7 +363,7 @@ __END __TCLASS __BGN __NAME "EPPLET_TEXT_MEDIUM" - __NORMAL "*norm-8" + __NORMAL "*font-epplet-medium" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 210 210 255 __BACKGROUND_COLOR 0 0 0 @@ -372,7 +372,7 @@ __END __TCLASS __BGN __NAME "EPPLET_TEXT_LARGE" - __NORMAL "*norm-10" + __NORMAL "*font-epplet-large" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 210 210 255 __BACKGROUND_COLOR 0 0 0 diff --git a/Ganymede/data/fonts.cfg b/Ganymede/data/fonts.cfg index aefc616..67572f1 100644 --- a/Ganymede/data/fonts.cfg +++ b/Ganymede/data/fonts.cfg @@ -2,11 +2,34 @@ __E_CFG_VERSION 1 __FONTS __BGN -norm-6 "ganymede/6" -norm-7 "ganymede/7" -norm-8 "ganymede/8" -norm-9 "ganymede/9" -norm-10 "ganymede/10" -italic-10 "ganymede_italic/10" +font-default "ganymede/10" + +font-border "ganymede/10" +font-border-small "ganymede/7" +font-border-italic "ganymede_italic/10" + +font-coords "ganymede/8" + +font-dialog "ganymede/10" +font-dialog-italic "ganymede_italic/10" + +font-epplet "ganymede/8" +font-epplet-small "ganymede/6" +font-epplet-medium "ganymede/8" +font-epplet-large "ganymede/10" + +font-focus "ganymede/8" + +font-iconbox "ganymede/10" + +font-init "ganymede/10" + +font-menu "ganymede/9" + +font-pager "ganymede/10" + +font-tooltip "ganymede/8" + +font-pulldown "ganymede/10" __END diff --git a/Ganymede/data/iconbox/iconbox.cfg b/Ganymede/data/iconbox/iconbox.cfg index b6d9610..6d72f61 100644 --- a/Ganymede/data/iconbox/iconbox.cfg +++ b/Ganymede/data/iconbox/iconbox.cfg @@ -10,7 +10,7 @@ ____________________________________________________________ __TCLASS __BGN __NAME "GANYMEDE_TOOLTIP" - __NORMAL "*norm-10" + __NORMAL "*font-iconbox" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 @@ -234,14 +234,5 @@ __ICLASS __BGN __PADDING 3 3 3 3 __END -__TCLASS __BGN - __NAME "ICONBOX_WINDOW_TITLE" - __NORMAL "*norm-8" - __DRAWING_EFFECT __EFFECT_SHADOW - __FORGROUND_COLOR 255 255 255 - __BACKGROUND_COLOR 0 0 0 - __JUSTIFICATION 512 -__END - DEFINE_TOOLTIP("ICONBOX", "DEFAULT_TOOLTIP_MAIN", "DEFAULT_TOOLTIP_CLOUD1", "DEFAULT_TOOLTIP_CLOUD2", "DEFAULT_TOOLTIP_CLOUD3", "DEFAULT_TOOLTIP_CLOUD4", "GANYMEDE_TOOLTIP", 64) diff --git a/Ganymede/data/init/init.cfg b/Ganymede/data/init/init.cfg index 998d6b5..1bcf6d6 100644 --- a/Ganymede/data/init/init.cfg +++ b/Ganymede/data/init/init.cfg @@ -42,7 +42,7 @@ __END __TCLASS __BGN __NAME "PROGRESS_TEXT" - __NORMAL "*norm-10" + __NORMAL "*font-init" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 @@ -51,7 +51,7 @@ __END __TCLASS __BGN __NAME "PROGRESS_TEXT_NUMBER" - __NORMAL "*norm-10" + __NORMAL "*font-init" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 0 180 255 __BACKGROUND_COLOR 0 50 128 diff --git a/Ganymede/data/menustyles/menustyles.cfg b/Ganymede/data/menustyles/menustyles.cfg index 2760de6..254cb13 100644 --- a/Ganymede/data/menustyles/menustyles.cfg +++ b/Ganymede/data/menustyles/menustyles.cfg @@ -13,12 +13,12 @@ __E_CFG_VERSION 0 __TCLASS __BGN __NAME "GANYMEDE_MENU" - __NORMAL "*norm-9" + __NORMAL "*font-menu" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 210 210 255 __BACKGROUND_COLOR 0 0 0 __JUSTIFICATION 512 - __HILITED "*norm-9" + __HILITED "*font-menu" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 diff --git a/Ganymede/data/pager/pager.cfg b/Ganymede/data/pager/pager.cfg index d1899ba..6c0e458 100644 --- a/Ganymede/data/pager/pager.cfg +++ b/Ganymede/data/pager/pager.cfg @@ -31,7 +31,7 @@ __END __TCLASS __BGN __NAME "PAGER_WINDOW_TITLE" - __NORMAL "*norm-10" + __NORMAL "*font-pager" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 diff --git a/ShinyMetal/data/coords/coords.cfg b/ShinyMetal/data/coords/coords.cfg index 651c4fa..bb9d4e8 100644 --- a/ShinyMetal/data/coords/coords.cfg +++ b/ShinyMetal/data/coords/coords.cfg @@ -8,7 +8,7 @@ __END __TCLASS __BGN __NAME "COORDS" - __NORMAL "*norm-10" + __NORMAL "*font-coords" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 diff --git a/ShinyMetal/data/dialogs/dialogs.cfg b/ShinyMetal/data/dialogs/dialogs.cfg index 416a121..843d689 100644 --- a/ShinyMetal/data/dialogs/dialogs.cfg +++ b/ShinyMetal/data/dialogs/dialogs.cfg @@ -134,7 +134,7 @@ __TCLASS __BGN __NAME "DIALOG" __JUSTIFICATION 512 - __NORMAL "*norm-10" + __NORMAL "*font-dialog" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 @@ -145,7 +145,7 @@ __TCLASS __BGN __NAME "DIALOG_WIDGET_BUTTON" __JUSTIFICATION 512 - __NORMAL "*norm-10" + __NORMAL "*font-dialog" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 @@ -156,7 +156,7 @@ __TCLASS __BGN __NAME "DIALOG_WIDGET_CHECK_BUTTON" __JUSTIFICATION 0 - __NORMAL "*norm-10" + __NORMAL "*font-dialog" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 @@ -167,7 +167,7 @@ __TCLASS __BGN __NAME "DIALOG_WIDGET_RADIO_BUTTON" __JUSTIFICATION 0 - __NORMAL "*norm-10" + __NORMAL "*font-dialog" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 @@ -178,7 +178,7 @@ __TCLASS __BGN __NAME "DIALOG_WIDGET_TEXT" __JUSTIFICATION 512 - __NORMAL "*norm-10" + __NORMAL "*font-dialog" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 @@ -189,7 +189,7 @@ __TCLASS __BGN __NAME "DIALOG_BUTTON" __JUSTIFICATION 512 - __NORMAL "*norm-10" + __NORMAL "*font-dialog" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 diff --git a/ShinyMetal/data/epplets/epplets.cfg b/ShinyMetal/data/epplets/epplets.cfg index c02eff3..8c30f15 100644 --- a/ShinyMetal/data/epplets/epplets.cfg +++ b/ShinyMetal/data/epplets/epplets.cfg @@ -286,7 +286,7 @@ __END __TCLASS __BGN __NAME "EPPLET_LABEL" - __NORMAL "*norm-8" + __NORMAL "*font-epplet" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 @@ -295,7 +295,7 @@ __END __TCLASS __BGN __NAME "EPPLET_BUTTON" - __NORMAL "*norm-8" + __NORMAL "*font-epplet" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 @@ -304,7 +304,7 @@ __END __TCLASS __BGN __NAME "EPPLET_TOGGLEBUTTON_ON" - __NORMAL "*norm-8" + __NORMAL "*font-epplet" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 @@ -313,7 +313,7 @@ __END __TCLASS __BGN __NAME "EPPLET_TOGGLEBUTTON_OFF" - __NORMAL "*norm-8" + __NORMAL "*font-epplet" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 @@ -322,7 +322,7 @@ __END __TCLASS __BGN __NAME "EPPLET_POPUP" - __NORMAL "*norm-8" + __NORMAL "*font-epplet" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 @@ -331,7 +331,7 @@ __END __TCLASS __BGN __NAME "EPPLET_TEXT_TINY" - __NORMAL "*epplets-small" + __NORMAL "*font-epplet--small" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 @@ -339,7 +339,7 @@ __END __TCLASS __BGN __NAME "EPPLET_TEXT_MEDIUM" - __NORMAL "*epplets-medium" + __NORMAL "*font-epplet--medium" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 @@ -347,7 +347,7 @@ __END __TCLASS __BGN __NAME "EPPLET_TEXT_LARGE" - __NORMAL "*epplets-large" + __NORMAL "*font-epplet--large" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 diff --git a/ShinyMetal/data/focuslist/focuslist.cfg b/ShinyMetal/data/focuslist/focuslist.cfg index 2cdee34..122155a 100644 --- a/ShinyMetal/data/focuslist/focuslist.cfg +++ b/ShinyMetal/data/focuslist/focuslist.cfg @@ -2,12 +2,12 @@ __TCLASS __BGN __NAME "WARPFOCUS" __JUSTIFICATION 0 - __NORMAL "*special-9" + __NORMAL "*font-focus" __DRAWING_EFFECT __EFFECT_OUTLINE __FORGROUND_COLOR 255 180 0 __BACKGROUND_COLOR 120 50 0 - __CLICKED "*special-9" + __CLICKED "*font-focus" __DRAWING_EFFECT __EFFECT_OUTLINE __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 diff --git a/ShinyMetal/data/fonts.cfg b/ShinyMetal/data/fonts.cfg index c262787..b5efabb 100644 --- a/ShinyMetal/data/fonts.cfg +++ b/ShinyMetal/data/fonts.cfg @@ -2,13 +2,29 @@ __E_CFG_VERSION 1 __FONTS __BGN -norm-8 "-*-helvetica-medium-r-*-*-8-*-*-*-*-*-*-*" -norm-10 "-*-helvetica-medium-r-*-*-10-*-*-*-*-*-*-*" +font-default "-*-helvetica-medium-r-*-*-10-*-*-*-*-*-*-*" -special-9 "zirkle/9" +font-border "-*-helvetica-medium-r-*-*-10-*-*-*-*-*-*-*" -epplets-small "-*-lucida-medium-r-normal-*-*-80-*-*-p-*-*-*,-*-helvetica-medium-r-normal-*-8-*" -epplets-medium "-*-lucida-medium-r-normal-*-*-100-*-*-p-*-*-*,-*-helvetica-medium-r-normal-*-10-*" -epplets-large "-*-lucida-medium-r-normal-*-*-120-*-*-p-*-*-*,-*-helvetica-medium-r-normal-*-12-*" +font-coords "-*-helvetica-medium-r-*-*-10-*-*-*-*-*-*-*" + +font-dialog "-*-helvetica-medium-r-*-*-10-*-*-*-*-*-*-*" + +font-epplet "-*-helvetica-medium-r-*-*-8-*-*-*-*-*-*-*" +font-epplet-small "-*-lucida-medium-r-normal-*-*-80-*-*-p-*-*-*,-*-helvetica-medium-r-normal-*-8-*" +font-epplet-medium "-*-lucida-medium-r-normal-*-*-100-*-*-p-*-*-*,-*-helvetica-medium-r-normal-*-10-*" +font-epplet-large "-*-lucida-medium-r-normal-*-*-120-*-*-p-*-*-*,-*-helvetica-medium-r-normal-*-12-*" + +font-focus "zirkle/9" + +font-iconbox "zirkle/9" + +font-init "zirkle/9" + +font-menu "-*-helvetica-medium-r-*-*-10-*-*-*-*-*-*-*" + +font-pager "zirkle/9" + +font-tooltip "-*-helvetica-medium-r-*-*-10-*-*-*-*-*-*-*" __END diff --git a/ShinyMetal/data/iconbox/iconbox.cfg b/ShinyMetal/data/iconbox/iconbox.cfg index 643e3e7..d7ecfa7 100644 --- a/ShinyMetal/data/iconbox/iconbox.cfg +++ b/ShinyMetal/data/iconbox/iconbox.cfg @@ -101,7 +101,7 @@ __END __TCLASS __BGN __NAME "ICONBOX_WINDOW_TITLE" - __NORMAL "*special-9" + __NORMAL "*font-iconbox" __DRAWING_EFFECT __EFFECT_OUTLINE __FORGROUND_COLOR 255 180 0 __BACKGROUND_COLOR 120 50 0 diff --git a/ShinyMetal/data/init/init.cfg b/ShinyMetal/data/init/init.cfg index f7d4f2d..5e307fd 100644 --- a/ShinyMetal/data/init/init.cfg +++ b/ShinyMetal/data/init/init.cfg @@ -28,7 +28,7 @@ __END __TCLASS __BGN __NAME "PROGRESS_TEXT" - __NORMAL "*special-9" + __NORMAL "*font-init" __DRAWING_EFFECT __EFFECT_OUTLINE __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 @@ -37,7 +37,7 @@ __END __TCLASS __BGN __NAME "PROGRESS_TEXT_NUMBER" - __NORMAL "*special-9" + __NORMAL "*font-init" __DRAWING_EFFECT __EFFECT_OUTLINE __FORGROUND_COLOR 255 180 0 __BACKGROUND_COLOR 120 50 0 diff --git a/ShinyMetal/data/pager/pager.cfg b/ShinyMetal/data/pager/pager.cfg index e36e315..e123ffc 100644 --- a/ShinyMetal/data/pager/pager.cfg +++ b/ShinyMetal/data/pager/pager.cfg @@ -28,7 +28,7 @@ __END __TCLASS __BGN __NAME "PAGER_WINDOW_TITLE" - __NORMAL "*special-9" + __NORMAL "*font-pager" __DRAWING_EFFECT __EFFECT_OUTLINE __FORGROUND_COLOR 255 180 0 __BACKGROUND_COLOR 120 50 0 diff --git a/ShinyMetal/data/textclasses.cfg b/ShinyMetal/data/textclasses.cfg index 9784824..9fd7482 100644 --- a/ShinyMetal/data/textclasses.cfg +++ b/ShinyMetal/data/textclasses.cfg @@ -10,7 +10,7 @@ __E_CFG_VERSION 1 __TCLASS __BGN __NAME "TEXT1" - __NORMAL "*norm-10" + __NORMAL "*font-default" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 @@ -19,13 +19,13 @@ __END __TCLASS __BGN __NAME "TEXT2" - __NORMAL "*norm-10" + __NORMAL "*font-default" __DRAWING_EFFECT __EFFECT_NONE __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 0 0 0 __JUSTIFICATION 1024 - __NORMAL_ACTIVE "*norm-10" + __NORMAL_ACTIVE "*font-default" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 diff --git a/ShinyMetal/data/tooltips/tooltips.cfg b/ShinyMetal/data/tooltips/tooltips.cfg index fd25e50..be70602 100644 --- a/ShinyMetal/data/tooltips/tooltips.cfg +++ b/ShinyMetal/data/tooltips/tooltips.cfg @@ -32,7 +32,7 @@ __END __TCLASS __BGN __NAME "TOOLTIP_TEXT" - __NORMAL "*norm-10" + __NORMAL "*font-tooltip" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 255 255 255 __BACKGROUND_COLOR 0 0 0 diff --git a/winter/data/borders/common/border.cfg b/winter/data/borders/common/border.cfg index 8362000..f486ab0 100644 --- a/winter/data/borders/common/border.cfg +++ b/winter/data/borders/common/border.cfg @@ -330,22 +330,22 @@ __END __TCLASS __BGN __NAME "TITLE" __JUSTIFICATION 0 - __NORMAL "*bold-7" + __NORMAL "*font-border" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 128 128 128 __BACKGROUND_COLOR 210 210 210 __JUSTIFICATION 0 - __NORMAL_ACTIVE "*bold-7" + __NORMAL_ACTIVE "*font-border" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 70 70 70 __BACKGROUND_COLOR 170 170 170 __JUSTIFICATION 0 - __NORMAL_STICKY "*bold-7" + __NORMAL_STICKY "*font-border" __JUSTIFICATION 0 __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 128 128 128 __BACKGROUND_COLOR 210 210 210 - __NORMAL_ACTIVE_STICKY "*bold-7" + __NORMAL_ACTIVE_STICKY "*font-border" __JUSTIFICATION 0 __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 70 70 70 @@ -355,22 +355,22 @@ __END __TCLASS __BGN __NAME "MENU_TITLE" __JUSTIFICATION 0 - __NORMAL "*bold-7" + __NORMAL "*font-border" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 192 192 192 __JUSTIFICATION 0 - __NORMAL_ACTIVE "*bold-7" + __NORMAL_ACTIVE "*font-border" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 70 70 70 __BACKGROUND_COLOR 192 192 192 __JUSTIFICATION 0 - __NORMAL_STICKY "*bold-7" + __NORMAL_STICKY "*font-border" __JUSTIFICATION 0 __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 70 70 70 __BACKGROUND_COLOR 192 192 192 - __NORMAL_ACTIVE_STICKY "*bold-7" + __NORMAL_ACTIVE_STICKY "*font-border" __JUSTIFICATION 0 __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 70 70 70 diff --git a/winter/data/coords/coords.cfg b/winter/data/coords/coords.cfg index 87c6e00..084f651 100644 --- a/winter/data/coords/coords.cfg +++ b/winter/data/coords/coords.cfg @@ -2,7 +2,7 @@ __TCLASS __BGN __NAME "COORDS" __JUSTIFICATION 0 - __NORMAL "*bold-7" + __NORMAL "*font-coords" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 192 192 192 diff --git a/winter/data/dialogs/dialogs.cfg b/winter/data/dialogs/dialogs.cfg index 0c40bfe..7c57b39 100644 --- a/winter/data/dialogs/dialogs.cfg +++ b/winter/data/dialogs/dialogs.cfg @@ -146,7 +146,7 @@ __TCLASS __BGN __NAME "DIALOG" __JUSTIFICATION 512 - __NORMAL "*norm-7" + __NORMAL "*font-dialog" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 70 70 70 __BACKGROUND_COLOR 210 210 210 @@ -156,12 +156,12 @@ __TCLASS __BGN __NAME "DIALOG_WIDGET_BUTTON" __JUSTIFICATION 512 -__NORMAL "*norm-7" +__NORMAL "*font-dialog" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 70 70 70 __BACKGROUND_COLOR 210 210 210 - __HILITED "*norm-7" + __HILITED "*font-dialog" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 70 70 70 __BACKGROUND_COLOR 210 210 210 @@ -171,7 +171,7 @@ __TCLASS __BGN __NAME "DIALOG_WIDGET_CHECK_BUTTON" __JUSTIFICATION 0 - __NORMAL "*norm-7" + __NORMAL "*font-dialog" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 70 70 70 __BACKGROUND_COLOR 210 210 210 @@ -182,7 +182,7 @@ __TCLASS __BGN __NAME "DIALOG_WIDGET_RADIO_BUTTON" __JUSTIFICATION 0 -__NORMAL "*norm-7" +__NORMAL "*font-dialog" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 70 70 70 __BACKGROUND_COLOR 210 210 210 @@ -192,12 +192,12 @@ __TCLASS __BGN __NAME "DIALOG_WIDGET_TEXT" __JUSTIFICATION 512 -__NORMAL "*norm-7" +__NORMAL "*font-dialog" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 70 70 70 __BACKGROUND_COLOR 210 210 210 - __HILITED "*norm-8" + __HILITED "*font-dialog-hilite" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 70 70 70 __BACKGROUND_COLOR 210 210 210 @@ -207,12 +207,12 @@ __TCLASS __BGN __NAME "DIALOG_BUTTON" __JUSTIFICATION 512 -__NORMAL "*norm-7" +__NORMAL "*font-dialog" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 70 70 70 __BACKGROUND_COLOR 210 210 210 - __HILITED "*norm-7" + __HILITED "*font-dialog" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 70 70 70 __BACKGROUND_COLOR 210 210 210 diff --git a/winter/data/epplets/epplets.cfg b/winter/data/epplets/epplets.cfg index dc1d6c5..a651821 100644 --- a/winter/data/epplets/epplets.cfg +++ b/winter/data/epplets/epplets.cfg @@ -288,7 +288,7 @@ __END __TCLASS __BGN __NAME "EPPLET_LABEL" - __NORMAL "*norm-6" + __NORMAL "*font-epplet" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 255 255 255 @@ -296,7 +296,7 @@ __END __TCLASS __BGN __NAME "EPPLET_BUTTON" - __NORMAL "*norm-6" + __NORMAL "*font-epplet" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 255 255 255 @@ -304,7 +304,7 @@ __END __TCLASS __BGN __NAME "EPPLET_TOGGLEBUTTON_ON" - __NORMAL "*norm-6" + __NORMAL "*font-epplet" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 255 255 255 @@ -312,7 +312,7 @@ __END __TCLASS __BGN __NAME "EPPLET_TOGGLEBUTTON_OFF" - __NORMAL "*norm-6" + __NORMAL "*font-epplet" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 255 255 255 @@ -320,7 +320,7 @@ __END __TCLASS __BGN __NAME "EPPLET_POPUP" - __NORMAL "*norm-6" + __NORMAL "*font-epplet" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 255 255 255 @@ -328,7 +328,7 @@ __END __TCLASS __BGN __NAME "EPPLET_TEXT_TINY" - __NORMAL "*norm-6" + __NORMAL "*font-epplet-small" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 255 255 255 @@ -336,7 +336,7 @@ __END __TCLASS __BGN __NAME "EPPLET_TEXT_MEDIUM" - __NORMAL "*norm-8" + __NORMAL "*font-epplet-medium" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 255 255 255 @@ -344,7 +344,7 @@ __END __TCLASS __BGN __NAME "EPPLET_TEXT_LARGE" - __NORMAL "*norm-10" + __NORMAL "*font-epplet-large" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 255 255 255 diff --git a/winter/data/focuslist/focuslist.cfg b/winter/data/focuslist/focuslist.cfg index f5eaccb..4b6f883 100644 --- a/winter/data/focuslist/focuslist.cfg +++ b/winter/data/focuslist/focuslist.cfg @@ -2,12 +2,12 @@ __TCLASS __BGN __NAME "WARPFOCUS" __JUSTIFICATION 0 - __NORMAL "*bold-7" + __NORMAL "*font-focus" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 128 128 128 __BACKGROUND_COLOR 210 210 210 - __CLICKED "*bold-7" + __CLICKED "*font-focus" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 70 70 70 __BACKGROUND_COLOR 210 210 210 diff --git a/winter/data/fonts.cfg b/winter/data/fonts.cfg index ee8493f..9ae1bc2 100644 --- a/winter/data/fonts.cfg +++ b/winter/data/fonts.cfg @@ -2,12 +2,28 @@ __E_CFG_VERSION 1 __FONTS __BGN -norm-6 "Vera/6" -norm-7 "Vera/7" -norm-8 "Vera/8" -norm-10 "Vera/10" +font-border "VeraBd/7" -bold-7 "VeraBd/7" -bold-8 "VeraBd/8" +font-coords "VeraBd/7" + +font-dialog "Vera/7" +font-dialog-hilite "Vera/8" /* ??? */ + +font-epplet "Vera/6" +font-epplet-small "Vera/6" +font-epplet-medium "Vera/8" +font-epplet-large "Vera/10" + +font-focus "VeraBd/7" + +font-iconbox "VeraBd/7" + +font-init "VeraBd/8" + +font-menu "Vera/7" + +font-pager "VeraBd/7" + +font-tooltip "VeraBd/7" __END diff --git a/winter/data/iconbox/iconbox.cfg b/winter/data/iconbox/iconbox.cfg index 4fae1e1..363324d 100644 --- a/winter/data/iconbox/iconbox.cfg +++ b/winter/data/iconbox/iconbox.cfg @@ -111,7 +111,7 @@ __END __TCLASS __BGN __NAME "ICONBOX_WINDOW_TITLE" __JUSTIFICATION 512 - __NORMAL "*bold-7" + __NORMAL "*font-iconbox" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 192 192 192 diff --git a/winter/data/init/init.cfg b/winter/data/init/init.cfg index 7fe4fea..737d185 100644 --- a/winter/data/init/init.cfg +++ b/winter/data/init/init.cfg @@ -35,7 +35,7 @@ __TCLASS __BGN __NAME "PROGRESS_TEXT" __JUSTIFICATION 0 - __NORMAL "*bold-8" + __NORMAL "*font-init" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 180 180 180 @@ -46,7 +46,7 @@ __TCLASS __BGN __NAME "PROGRESS_TEXT_NUMBER" __JUSTIFICATION 512 - __NORMAL "*bold-" + __NORMAL "*font-init" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 180 180 180 diff --git a/winter/data/menustyles/menustyles.cfg b/winter/data/menustyles/menustyles.cfg index 4d7c87a..f5011d9 100644 --- a/winter/data/menustyles/menustyles.cfg +++ b/winter/data/menustyles/menustyles.cfg @@ -31,12 +31,12 @@ __TCLASS __BGN __NAME "MENU" __JUSTIFICATION 0 -__NORMAL "*norm-7" +__NORMAL "*font-menu" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 70 70 70 __BACKGROUND_COLOR 215 215 215 - __HILITED "*norm-7" + __HILITED "*font-menu" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 70 70 70 __BACKGROUND_COLOR 210 210 210 diff --git a/winter/data/pager/pager.cfg b/winter/data/pager/pager.cfg index d0d1144..c30319a 100644 --- a/winter/data/pager/pager.cfg +++ b/winter/data/pager/pager.cfg @@ -28,7 +28,7 @@ __TCLASS __BGN __NAME "PAGER_WINDOW_TITLE" __JUSTIFICATION 0 - __NORMAL "*bold-7" + __NORMAL "*font-pager" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 192 192 192 diff --git a/winter/data/tooltips/tooltips.cfg b/winter/data/tooltips/tooltips.cfg index 5dce7c2..5886bab 100644 --- a/winter/data/tooltips/tooltips.cfg +++ b/winter/data/tooltips/tooltips.cfg @@ -14,7 +14,7 @@ __TCLASS __BGN __NAME "TT_TEXT" __JUSTIFICATION 512 - __NORMAL "*bold-7" + __NORMAL "*font-tooltip" __DRAWING_EFFECT __EFFECT_SHADOW __FORGROUND_COLOR 0 0 0 __BACKGROUND_COLOR 192 192 192