diff options
Diffstat (limited to 'data')
43 files changed, 57 insertions, 13 deletions
diff --git a/data/fonts/CMakeLists.txt b/data/fonts/CMakeLists.txt index f5812e5d..61ea9805 100644 --- a/data/fonts/CMakeLists.txt +++ b/data/fonts/CMakeLists.txt @@ -1,6 +1,6 @@ SET (FILES - dejavusans.ttf - dejavusans-bold.ttf + DejaVuSerifCondensed.ttf + DejaVuSerifCondensed-Bold.ttf dejavusans-mono.ttf ) diff --git a/data/fonts/DejaVuSerifCondensed-Bold.ttf b/data/fonts/DejaVuSerifCondensed-Bold.ttf Binary files differnew file mode 100644 index 00000000..55adca41 --- /dev/null +++ b/data/fonts/DejaVuSerifCondensed-Bold.ttf diff --git a/data/fonts/DejaVuSerifCondensed.ttf b/data/fonts/DejaVuSerifCondensed.ttf Binary files differnew file mode 100644 index 00000000..83120cd9 --- /dev/null +++ b/data/fonts/DejaVuSerifCondensed.ttf diff --git a/data/fonts/dejavusans-bold.ttf b/data/fonts/dejavusans-bold.ttf Binary files differdeleted file mode 100644 index 0f4d5e9d..00000000 --- a/data/fonts/dejavusans-bold.ttf +++ /dev/null diff --git a/data/fonts/dejavusans.ttf b/data/fonts/dejavusans.ttf Binary files differdeleted file mode 100644 index 27cff476..00000000 --- a/data/fonts/dejavusans.ttf +++ /dev/null diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt index cc257eee..ab114449 100644 --- a/data/graphics/gui/CMakeLists.txt +++ b/data/graphics/gui/CMakeLists.txt @@ -1,4 +1,5 @@ SET (FILES + bg.xml bubble.png button.png button-icon-confirm.png @@ -29,12 +30,15 @@ SET (FILES hscroll_right_pressed.png item_shortcut_bgr.png mouse.png + npcdialog.png + npcdialog.xml progress-indicator.png radioin.png radioin_highlight.png radioout.png radioout_highlight.png resize.png + scrolls.png selection.png slider.png slider_hilight.png @@ -55,6 +59,7 @@ SET (FILES vscroll_up_highlight.png vscroll_up_pressed.png window.png + lpc_window.png window.xml ) diff --git a/data/graphics/gui/bg.xml b/data/graphics/gui/bg.xml new file mode 100644 index 00000000..c4fd11f6 --- /dev/null +++ b/data/graphics/gui/bg.xml @@ -0,0 +1,18 @@ +<skinset name="Default" image="scrolls.png"> + <widget type="Window"> + <!-- Top Row --> + <part type="top-left-corner" xpos="0" ypos="0" width="64" height="64" /> + <part type="top-edge" xpos="64" ypos="0" width="167" height="64" /> + <part type="top-right-corner" xpos="231" ypos="0" width="64" height="64" /> + + <!-- Middle Row --> + <part type="left-edge" xpos="0" ypos="64" width="64" height="155" /> + <part type="bg-quad" xpos="64" ypos="64" width="167" height="155" /> + <part type="right-edge" xpos="231" ypos="64" width="64" height="155" /> + + <!-- Bottom Row --> + <part type="bottom-left-corner" xpos="0" ypos="219" width="64" height="64" /> + <part type="bottom-edge" xpos="64" ypos="219" width="167" height="64" /> + <part type="bottom-right-corner" xpos="231" ypos="219" width="64" height="64" /> + </widget> +</skinset> diff --git a/data/graphics/gui/button.png b/data/graphics/gui/button.png Binary files differindex 9ebbea63..d23d5fc2 100644 --- a/data/graphics/gui/button.png +++ b/data/graphics/gui/button.png diff --git a/data/graphics/gui/button_disabled.png b/data/graphics/gui/button_disabled.png Binary files differindex 0ce3aa6f..f0646193 100644 --- a/data/graphics/gui/button_disabled.png +++ b/data/graphics/gui/button_disabled.png diff --git a/data/graphics/gui/buttonhi.png b/data/graphics/gui/buttonhi.png Binary files differindex c4772634..63a71fd8 100644 --- a/data/graphics/gui/buttonhi.png +++ b/data/graphics/gui/buttonhi.png diff --git a/data/graphics/gui/buttonpress.png b/data/graphics/gui/buttonpress.png Binary files differindex e9cd1765..05e7020d 100644 --- a/data/graphics/gui/buttonpress.png +++ b/data/graphics/gui/buttonpress.png diff --git a/data/graphics/gui/checkbox.png b/data/graphics/gui/checkbox.png Binary files differindex 29b64100..67af8c99 100644 --- a/data/graphics/gui/checkbox.png +++ b/data/graphics/gui/checkbox.png diff --git a/data/graphics/gui/close_button.png b/data/graphics/gui/close_button.png Binary files differindex f87cc2a9..b3ce4ef4 100644 --- a/data/graphics/gui/close_button.png +++ b/data/graphics/gui/close_button.png diff --git a/data/graphics/gui/colors.xml b/data/graphics/gui/colors.xml index 4a35d081..db35ac41 100644 --- a/data/graphics/gui/colors.xml +++ b/data/graphics/gui/colors.xml @@ -1,5 +1,6 @@ <colors> <color id="TEXT" color="#000000" /> + <color id="NPC_DIALOG_TEXT" color="#000000" /> <color id="SHADOW" color="#000000" /> <color id="OUTLINE" color="#000000" /> <color id="PROGRESS_BAR" color="#ffffff" /> @@ -47,4 +48,5 @@ <progressbar id="INVY_SLOTS" color="#e1c819" /> <progressbar id="WEIGHT" color="#0000ff,ffff00,ff0000" /> <progressbar id="JOB" color="#e187cb" /> + <progressbar id="DOWNLOAD" color="#ded387" /> </colors> diff --git a/data/graphics/gui/hscroll_left_default.png b/data/graphics/gui/hscroll_left_default.png Binary files differindex 2f763d30..1d792525 100644 --- a/data/graphics/gui/hscroll_left_default.png +++ b/data/graphics/gui/hscroll_left_default.png diff --git a/data/graphics/gui/hscroll_left_highlight.png b/data/graphics/gui/hscroll_left_highlight.png Binary files differindex 6be5ae25..1bf98865 100644 --- a/data/graphics/gui/hscroll_left_highlight.png +++ b/data/graphics/gui/hscroll_left_highlight.png diff --git a/data/graphics/gui/hscroll_left_pressed.png b/data/graphics/gui/hscroll_left_pressed.png Binary files differindex b8ebcb46..d5142d80 100644 --- a/data/graphics/gui/hscroll_left_pressed.png +++ b/data/graphics/gui/hscroll_left_pressed.png diff --git a/data/graphics/gui/hscroll_right_default.png b/data/graphics/gui/hscroll_right_default.png Binary files differindex 33fdddd0..93418c56 100644 --- a/data/graphics/gui/hscroll_right_default.png +++ b/data/graphics/gui/hscroll_right_default.png diff --git a/data/graphics/gui/hscroll_right_highlight.png b/data/graphics/gui/hscroll_right_highlight.png Binary files differindex e9e633ea..1c7d0529 100644 --- a/data/graphics/gui/hscroll_right_highlight.png +++ b/data/graphics/gui/hscroll_right_highlight.png diff --git a/data/graphics/gui/hscroll_right_pressed.png b/data/graphics/gui/hscroll_right_pressed.png Binary files differindex 53972f2b..55490a47 100644 --- a/data/graphics/gui/hscroll_right_pressed.png +++ b/data/graphics/gui/hscroll_right_pressed.png diff --git a/data/graphics/gui/lpc_window.png b/data/graphics/gui/lpc_window.png Binary files differnew file mode 100644 index 00000000..ddcef395 --- /dev/null +++ b/data/graphics/gui/lpc_window.png diff --git a/data/graphics/gui/npcdialog.png b/data/graphics/gui/npcdialog.png Binary files differnew file mode 100644 index 00000000..61f0c5ce --- /dev/null +++ b/data/graphics/gui/npcdialog.png diff --git a/data/graphics/gui/npcdialog.xml b/data/graphics/gui/npcdialog.xml new file mode 100644 index 00000000..40f1fcc6 --- /dev/null +++ b/data/graphics/gui/npcdialog.xml @@ -0,0 +1,18 @@ +<skinset name="SpeechBubble" image="npcdialog.png"> + <widget type="Window"> + <!-- Top Row --> + <part type="top-left-corner" xpos="0" ypos="0" width="16" height="13" /> + <part type="top-edge" xpos="16" ypos="0" width="15" height="13" /> + <part type="top-right-corner" xpos="31" ypos="0" width="16" height="13" /> + + <!-- Middle Row --> + <part type="left-edge" xpos="0" ypos="13" width="16" height="14" /> + <part type="bg-quad" xpos="16" ypos="13" width="15" height="14" /> + <part type="right-edge" xpos="31" ypos="13" width="16" height="14" /> + + <!-- Bottom Row --> + <part type="bottom-left-corner" xpos="0" ypos="27" width="16" height="15" /> + <part type="bottom-edge" xpos="16" ypos="27" width="15" height="15" /> + <part type="bottom-right-corner" xpos="31" ypos="27" width="16" height="15" /> + </widget> +</skinset> diff --git a/data/graphics/gui/scrolls.png b/data/graphics/gui/scrolls.png Binary files differnew file mode 100644 index 00000000..79f534e3 --- /dev/null +++ b/data/graphics/gui/scrolls.png diff --git a/data/graphics/gui/scrololol.png b/data/graphics/gui/scrololol.png Binary files differnew file mode 100644 index 00000000..e0bd67d3 --- /dev/null +++ b/data/graphics/gui/scrololol.png diff --git a/data/graphics/gui/slider.png b/data/graphics/gui/slider.png Binary files differindex 465ad0e8..dc5ef556 100644 --- a/data/graphics/gui/slider.png +++ b/data/graphics/gui/slider.png diff --git a/data/graphics/gui/slider_hilight.png b/data/graphics/gui/slider_hilight.png Binary files differindex 37c780cd..11727ea2 100644 --- a/data/graphics/gui/slider_hilight.png +++ b/data/graphics/gui/slider_hilight.png diff --git a/data/graphics/gui/tab.png b/data/graphics/gui/tab.png Binary files differindex 91eadf08..098fe0b3 100644 --- a/data/graphics/gui/tab.png +++ b/data/graphics/gui/tab.png diff --git a/data/graphics/gui/tab_hilight.png b/data/graphics/gui/tab_hilight.png Binary files differindex f6b39942..69b95c19 100644 --- a/data/graphics/gui/tab_hilight.png +++ b/data/graphics/gui/tab_hilight.png diff --git a/data/graphics/gui/tabselected.png b/data/graphics/gui/tabselected.png Binary files differindex e2983060..1a727e4f 100644 --- a/data/graphics/gui/tabselected.png +++ b/data/graphics/gui/tabselected.png diff --git a/data/graphics/gui/vscroll_down_default.png b/data/graphics/gui/vscroll_down_default.png Binary files differindex c4292489..0780e9fa 100644 --- a/data/graphics/gui/vscroll_down_default.png +++ b/data/graphics/gui/vscroll_down_default.png diff --git a/data/graphics/gui/vscroll_down_highlight.png b/data/graphics/gui/vscroll_down_highlight.png Binary files differindex ac88f7c7..f01caad2 100644 --- a/data/graphics/gui/vscroll_down_highlight.png +++ b/data/graphics/gui/vscroll_down_highlight.png diff --git a/data/graphics/gui/vscroll_down_pressed.png b/data/graphics/gui/vscroll_down_pressed.png Binary files differindex 9dcc89f6..d5525ca1 100644 --- a/data/graphics/gui/vscroll_down_pressed.png +++ b/data/graphics/gui/vscroll_down_pressed.png diff --git a/data/graphics/gui/vscroll_grey.png b/data/graphics/gui/vscroll_grey.png Binary files differindex f99da467..46132a6c 100644 --- a/data/graphics/gui/vscroll_grey.png +++ b/data/graphics/gui/vscroll_grey.png diff --git a/data/graphics/gui/vscroll_highlight.png b/data/graphics/gui/vscroll_highlight.png Binary files differindex 2e0fcbfc..d00744e1 100644 --- a/data/graphics/gui/vscroll_highlight.png +++ b/data/graphics/gui/vscroll_highlight.png diff --git a/data/graphics/gui/vscroll_up_default.png b/data/graphics/gui/vscroll_up_default.png Binary files differindex 1cecc351..c71cc6de 100644 --- a/data/graphics/gui/vscroll_up_default.png +++ b/data/graphics/gui/vscroll_up_default.png diff --git a/data/graphics/gui/vscroll_up_highlight.png b/data/graphics/gui/vscroll_up_highlight.png Binary files differindex 7b5009f3..85a80b6a 100644 --- a/data/graphics/gui/vscroll_up_highlight.png +++ b/data/graphics/gui/vscroll_up_highlight.png diff --git a/data/graphics/gui/vscroll_up_pressed.png b/data/graphics/gui/vscroll_up_pressed.png Binary files differindex 2320ec42..4518e100 100644 --- a/data/graphics/gui/vscroll_up_pressed.png +++ b/data/graphics/gui/vscroll_up_pressed.png diff --git a/data/graphics/gui/window.xml b/data/graphics/gui/window.xml index f27dbc7f..3310cd89 100644 --- a/data/graphics/gui/window.xml +++ b/data/graphics/gui/window.xml @@ -1,18 +1,18 @@ -<skinset name="Default" image="window.png"> +<skinset name="Default" image="lpc_window.png"> <widget type="Window"> <!-- Top Row --> - <part type="top-left-corner" xpos="0" ypos="0" width="4" height="4" /> - <part type="top-edge" xpos="4" ypos="0" width="32" height="4" /> - <part type="top-right-corner" xpos="36" ypos="0" width="4" height="4" /> + <part type="top-left-corner" xpos="0" ypos="0" width="32" height="13" /> + <part type="top-edge" xpos="32" ypos="0" width="33" height="13" /> + <part type="top-right-corner" xpos="65" ypos="0" width="32" height="13" /> <!-- Middle Row --> - <part type="left-edge" xpos="0" ypos="4" width="4" height="216" /> - <part type="bg-quad" xpos="4" ypos="4" width="32" height="216" /> - <part type="right-edge" xpos="36" ypos="4" width="4" height="216" /> + <part type="left-edge" xpos="0" ypos="13" width="32" height="7" /> + <part type="bg-quad" xpos="32" ypos="13" width="33" height="7" /> + <part type="right-edge" xpos="65" ypos="13" width="32" height="7" /> <!-- Bottom Row --> - <part type="bottom-left-corner" xpos="0" ypos="220" width="4" height="4" /> - <part type="bottom-edge" xpos="4" ypos="220" width="32" height="4" /> - <part type="bottom-right-corner" xpos="36" ypos="220" width="4" height="4" /> + <part type="bottom-left-corner" xpos="0" ypos="20" width="32" height="12" /> + <part type="bottom-edge" xpos="32" ypos="20" width="33" height="12" /> + <part type="bottom-right-corner" xpos="65" ypos="20" width="32" height="12" /> </widget> </skinset> diff --git a/data/graphics/images/CMakeLists.txt b/data/graphics/images/CMakeLists.txt index 6694f254..f3fa7180 100644 --- a/data/graphics/images/CMakeLists.txt +++ b/data/graphics/images/CMakeLists.txt @@ -1,5 +1,6 @@ SET(FILES - login_wallpaper.png + bg_image.png + bg_overlay.png ) INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/graphics/images) diff --git a/data/graphics/images/bg_image.png b/data/graphics/images/bg_image.png Binary files differnew file mode 100644 index 00000000..c9a25826 --- /dev/null +++ b/data/graphics/images/bg_image.png diff --git a/data/graphics/images/bg_overlay.png b/data/graphics/images/bg_overlay.png Binary files differnew file mode 100644 index 00000000..018b5f7b --- /dev/null +++ b/data/graphics/images/bg_overlay.png diff --git a/data/graphics/images/login_wallpaper.png b/data/graphics/images/login_wallpaper.png Binary files differdeleted file mode 100644 index 109acccd..00000000 --- a/data/graphics/images/login_wallpaper.png +++ /dev/null |
