summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/core/graphics/gui/button.bmpbin2054 -> 0 bytes
-rw-r--r--data/core/graphics/gui/button.pngbin0 -> 768 bytes
-rw-r--r--data/core/graphics/gui/button_disabled.bmpbin2054 -> 0 bytes
-rw-r--r--data/core/graphics/gui/button_disabled.pngbin0 -> 834 bytes
-rw-r--r--data/core/graphics/gui/buttonhi.bmpbin2054 -> 0 bytes
-rw-r--r--data/core/graphics/gui/buttonhi.pngbin0 -> 787 bytes
-rw-r--r--data/core/graphics/gui/buttonpress.bmpbin2054 -> 0 bytes
-rw-r--r--data/core/graphics/gui/buttonpress.pngbin0 -> 785 bytes
-rw-r--r--data/core/graphics/gui/checkbox.bmpbin1134 -> 0 bytes
-rw-r--r--data/core/graphics/gui/checkbox.pngbin0 -> 851 bytes
-rw-r--r--data/core/graphics/gui/dialog_left.bmpbin1494 -> 0 bytes
-rw-r--r--data/core/graphics/gui/dialog_left.pngbin0 -> 534 bytes
-rw-r--r--data/core/graphics/gui/dialog_middle.bmpbin1494 -> 0 bytes
-rw-r--r--data/core/graphics/gui/dialog_middle.pngbin0 -> 444 bytes
-rw-r--r--data/core/graphics/gui/dialog_right.bmpbin1494 -> 0 bytes
-rw-r--r--data/core/graphics/gui/dialog_right.pngbin0 -> 606 bytes
-rw-r--r--data/core/graphics/gui/mouse.bmpbin738 -> 0 bytes
-rw-r--r--data/core/graphics/gui/mouse.pngbin0 -> 206 bytes
-rw-r--r--data/core/graphics/gui/radioin.bmpbin374 -> 0 bytes
-rw-r--r--data/core/graphics/gui/radioin.pngbin0 -> 399 bytes
-rw-r--r--data/core/graphics/gui/radioout.bmpbin374 -> 0 bytes
-rw-r--r--data/core/graphics/gui/radioout.pngbin0 -> 339 bytes
-rw-r--r--data/core/graphics/gui/slider.bmpbin1062 -> 0 bytes
-rw-r--r--data/core/graphics/gui/slider.pngbin0 -> 479 bytes
-rw-r--r--data/core/graphics/gui/textbox.bmpbin2054 -> 0 bytes
-rw-r--r--data/core/graphics/gui/textbox.pngbin0 -> 311 bytes
-rw-r--r--data/core/graphics/gui/vscroll.bmpbin738 -> 0 bytes
-rw-r--r--data/core/graphics/gui/vscroll.pngbin0 -> 421 bytes
-rw-r--r--src/gui/button.cpp8
-rw-r--r--src/gui/checkbox.cpp2
-rw-r--r--src/gui/playerbox.cpp2
-rw-r--r--src/gui/radiobutton.cpp8
-rw-r--r--src/gui/scrollarea.cpp4
-rw-r--r--src/gui/slider.cpp2
-rw-r--r--src/gui/textfield.cpp2
-rw-r--r--src/gui/window.cpp6
36 files changed, 17 insertions, 17 deletions
diff --git a/data/core/graphics/gui/button.bmp b/data/core/graphics/gui/button.bmp
deleted file mode 100644
index b0397c69..00000000
--- a/data/core/graphics/gui/button.bmp
+++ /dev/null
Binary files differ
diff --git a/data/core/graphics/gui/button.png b/data/core/graphics/gui/button.png
new file mode 100644
index 00000000..6979f1b4
--- /dev/null
+++ b/data/core/graphics/gui/button.png
Binary files differ
diff --git a/data/core/graphics/gui/button_disabled.bmp b/data/core/graphics/gui/button_disabled.bmp
deleted file mode 100644
index d03354ef..00000000
--- a/data/core/graphics/gui/button_disabled.bmp
+++ /dev/null
Binary files differ
diff --git a/data/core/graphics/gui/button_disabled.png b/data/core/graphics/gui/button_disabled.png
new file mode 100644
index 00000000..95ba338f
--- /dev/null
+++ b/data/core/graphics/gui/button_disabled.png
Binary files differ
diff --git a/data/core/graphics/gui/buttonhi.bmp b/data/core/graphics/gui/buttonhi.bmp
deleted file mode 100644
index 757fb246..00000000
--- a/data/core/graphics/gui/buttonhi.bmp
+++ /dev/null
Binary files differ
diff --git a/data/core/graphics/gui/buttonhi.png b/data/core/graphics/gui/buttonhi.png
new file mode 100644
index 00000000..d9167820
--- /dev/null
+++ b/data/core/graphics/gui/buttonhi.png
Binary files differ
diff --git a/data/core/graphics/gui/buttonpress.bmp b/data/core/graphics/gui/buttonpress.bmp
deleted file mode 100644
index a060c192..00000000
--- a/data/core/graphics/gui/buttonpress.bmp
+++ /dev/null
Binary files differ
diff --git a/data/core/graphics/gui/buttonpress.png b/data/core/graphics/gui/buttonpress.png
new file mode 100644
index 00000000..9ece102e
--- /dev/null
+++ b/data/core/graphics/gui/buttonpress.png
Binary files differ
diff --git a/data/core/graphics/gui/checkbox.bmp b/data/core/graphics/gui/checkbox.bmp
deleted file mode 100644
index f448aa24..00000000
--- a/data/core/graphics/gui/checkbox.bmp
+++ /dev/null
Binary files differ
diff --git a/data/core/graphics/gui/checkbox.png b/data/core/graphics/gui/checkbox.png
new file mode 100644
index 00000000..0feb6938
--- /dev/null
+++ b/data/core/graphics/gui/checkbox.png
Binary files differ
diff --git a/data/core/graphics/gui/dialog_left.bmp b/data/core/graphics/gui/dialog_left.bmp
deleted file mode 100644
index 3a6f82ec..00000000
--- a/data/core/graphics/gui/dialog_left.bmp
+++ /dev/null
Binary files differ
diff --git a/data/core/graphics/gui/dialog_left.png b/data/core/graphics/gui/dialog_left.png
new file mode 100644
index 00000000..e6304285
--- /dev/null
+++ b/data/core/graphics/gui/dialog_left.png
Binary files differ
diff --git a/data/core/graphics/gui/dialog_middle.bmp b/data/core/graphics/gui/dialog_middle.bmp
deleted file mode 100644
index 82acc9d5..00000000
--- a/data/core/graphics/gui/dialog_middle.bmp
+++ /dev/null
Binary files differ
diff --git a/data/core/graphics/gui/dialog_middle.png b/data/core/graphics/gui/dialog_middle.png
new file mode 100644
index 00000000..54dc54c4
--- /dev/null
+++ b/data/core/graphics/gui/dialog_middle.png
Binary files differ
diff --git a/data/core/graphics/gui/dialog_right.bmp b/data/core/graphics/gui/dialog_right.bmp
deleted file mode 100644
index ee4772ff..00000000
--- a/data/core/graphics/gui/dialog_right.bmp
+++ /dev/null
Binary files differ
diff --git a/data/core/graphics/gui/dialog_right.png b/data/core/graphics/gui/dialog_right.png
new file mode 100644
index 00000000..9d34d2f5
--- /dev/null
+++ b/data/core/graphics/gui/dialog_right.png
Binary files differ
diff --git a/data/core/graphics/gui/mouse.bmp b/data/core/graphics/gui/mouse.bmp
deleted file mode 100644
index fc269c50..00000000
--- a/data/core/graphics/gui/mouse.bmp
+++ /dev/null
Binary files differ
diff --git a/data/core/graphics/gui/mouse.png b/data/core/graphics/gui/mouse.png
new file mode 100644
index 00000000..75afbb6f
--- /dev/null
+++ b/data/core/graphics/gui/mouse.png
Binary files differ
diff --git a/data/core/graphics/gui/radioin.bmp b/data/core/graphics/gui/radioin.bmp
deleted file mode 100644
index d3d4d4ce..00000000
--- a/data/core/graphics/gui/radioin.bmp
+++ /dev/null
Binary files differ
diff --git a/data/core/graphics/gui/radioin.png b/data/core/graphics/gui/radioin.png
new file mode 100644
index 00000000..f56e3b4e
--- /dev/null
+++ b/data/core/graphics/gui/radioin.png
Binary files differ
diff --git a/data/core/graphics/gui/radioout.bmp b/data/core/graphics/gui/radioout.bmp
deleted file mode 100644
index 2dd6a8d9..00000000
--- a/data/core/graphics/gui/radioout.bmp
+++ /dev/null
Binary files differ
diff --git a/data/core/graphics/gui/radioout.png b/data/core/graphics/gui/radioout.png
new file mode 100644
index 00000000..fd73a353
--- /dev/null
+++ b/data/core/graphics/gui/radioout.png
Binary files differ
diff --git a/data/core/graphics/gui/slider.bmp b/data/core/graphics/gui/slider.bmp
deleted file mode 100644
index 00e0000a..00000000
--- a/data/core/graphics/gui/slider.bmp
+++ /dev/null
Binary files differ
diff --git a/data/core/graphics/gui/slider.png b/data/core/graphics/gui/slider.png
new file mode 100644
index 00000000..405bd491
--- /dev/null
+++ b/data/core/graphics/gui/slider.png
Binary files differ
diff --git a/data/core/graphics/gui/textbox.bmp b/data/core/graphics/gui/textbox.bmp
deleted file mode 100644
index 5ed38eec..00000000
--- a/data/core/graphics/gui/textbox.bmp
+++ /dev/null
Binary files differ
diff --git a/data/core/graphics/gui/textbox.png b/data/core/graphics/gui/textbox.png
new file mode 100644
index 00000000..487ed3cb
--- /dev/null
+++ b/data/core/graphics/gui/textbox.png
Binary files differ
diff --git a/data/core/graphics/gui/vscroll.bmp b/data/core/graphics/gui/vscroll.bmp
deleted file mode 100644
index b8f8c2a4..00000000
--- a/data/core/graphics/gui/vscroll.bmp
+++ /dev/null
Binary files differ
diff --git a/data/core/graphics/gui/vscroll.png b/data/core/graphics/gui/vscroll.png
new file mode 100644
index 00000000..acb2f8d0
--- /dev/null
+++ b/data/core/graphics/gui/vscroll.png
Binary files differ
diff --git a/src/gui/button.cpp b/src/gui/button.cpp
index 4474d6a4..71fac17e 100644
--- a/src/gui/button.cpp
+++ b/src/gui/button.cpp
@@ -31,10 +31,10 @@ Button::Button(const std::string& caption):
// Load the skin
ResourceManager *resman = ResourceManager::getInstance();
Image *btn[4];
- btn[0] = resman->getImage("core/graphics/gui/button.bmp");
- btn[1] = resman->getImage("core/graphics/gui/buttonhi.bmp");
- btn[2] = resman->getImage("core/graphics/gui/buttonpress.bmp");
- btn[3] = resman->getImage("core/graphics/gui/button_disabled.bmp");
+ btn[0] = resman->getImage("core/graphics/gui/button.png");
+ btn[1] = resman->getImage("core/graphics/gui/buttonhi.png");
+ btn[2] = resman->getImage("core/graphics/gui/buttonpress.png");
+ btn[3] = resman->getImage("core/graphics/gui/button_disabled.png");
int bgridx[4] = {0, 9, 16, 25};
int bgridy[4] = {0, 4, 19, 24};
int a, x, y;
diff --git a/src/gui/checkbox.cpp b/src/gui/checkbox.cpp
index 5eced992..99367f18 100644
--- a/src/gui/checkbox.cpp
+++ b/src/gui/checkbox.cpp
@@ -29,7 +29,7 @@ CheckBox::CheckBox(const std::string& caption, bool marked):
gcn::CheckBox(caption, marked)
{
ResourceManager *resman = ResourceManager::getInstance();
- Image *checkBox = resman->getImage("core/graphics/gui/checkbox.bmp");
+ Image *checkBox = resman->getImage("core/graphics/gui/checkbox.png");
checkBoxNormal = checkBox->getSubImage(0, 0, 9, 10);
checkBoxChecked = checkBox->getSubImage(9, 0, 9, 10);
checkBoxDisabled = checkBox->getSubImage(18, 0, 9, 10);
diff --git a/src/gui/playerbox.cpp b/src/gui/playerbox.cpp
index 70715729..926b8b08 100644
--- a/src/gui/playerbox.cpp
+++ b/src/gui/playerbox.cpp
@@ -34,7 +34,7 @@ PlayerBox::PlayerBox():
// Load the background skin
ResourceManager *resman = ResourceManager::getInstance();
- Image *textbox = resman->getImage("core/graphics/gui/textbox.bmp");
+ Image *textbox = resman->getImage("core/graphics/gui/textbox.png");
int bggridx[4] = {0, 9, 16, 25};
int bggridy[4] = {0, 4, 19, 24};
int a = 0, x, y;
diff --git a/src/gui/radiobutton.cpp b/src/gui/radiobutton.cpp
index ef84bbc2..de2d4f68 100644
--- a/src/gui/radiobutton.cpp
+++ b/src/gui/radiobutton.cpp
@@ -29,10 +29,10 @@ RadioButton::RadioButton(const std::string& caption, const std::string& group,
gcn::RadioButton(caption, group, marked)
{
ResourceManager *resman = ResourceManager::getInstance();
- radioNormal = resman->getImage("core/graphics/gui/radioout.bmp");
- radioChecked = resman->getImage("core/graphics/gui/radioin.bmp");
- radioDisabled = resman->getImage("core/graphics/gui/radioout.bmp");
- radioDisabledChecked = resman->getImage("core/graphics/gui/radioin.bmp");
+ radioNormal = resman->getImage("core/graphics/gui/radioout.png");
+ radioChecked = resman->getImage("core/graphics/gui/radioin.png");
+ radioDisabled = resman->getImage("core/graphics/gui/radioout.png");
+ radioDisabledChecked = resman->getImage("core/graphics/gui/radioin.png");
}
void RadioButton::drawBox(gcn::Graphics* graphics)
diff --git a/src/gui/scrollarea.cpp b/src/gui/scrollarea.cpp
index 33fa1253..8bdcae70 100644
--- a/src/gui/scrollarea.cpp
+++ b/src/gui/scrollarea.cpp
@@ -43,7 +43,7 @@ void ScrollArea::init()
// Load the background skin
ResourceManager *resman = ResourceManager::getInstance();
- Image *textbox = resman->getImage("core/graphics/gui/textbox.bmp");
+ Image *textbox = resman->getImage("core/graphics/gui/textbox.png");
int bggridx[4] = {0, 9, 16, 25};
int bggridy[4] = {0, 4, 19, 24};
int a = 0, x, y;
@@ -59,7 +59,7 @@ void ScrollArea::init()
}
// Load vertical scrollbar skin
- Image *vscroll = resman->getImage("core/graphics/gui/vscroll.bmp");
+ Image *vscroll = resman->getImage("core/graphics/gui/vscroll.png");
int vsgridx[4] = {0, 4, 8, 11};
int vsgridy[4] = {0, 4, 13, 19};
a = 0;
diff --git a/src/gui/slider.cpp b/src/gui/slider.cpp
index 2d07d661..d99b777f 100644
--- a/src/gui/slider.cpp
+++ b/src/gui/slider.cpp
@@ -44,7 +44,7 @@ void Slider::init()
// Load resources
ResourceManager *resman = ResourceManager::getInstance();
- Image *slider = resman->getImage("core/graphics/gui/slider.bmp");
+ Image *slider = resman->getImage("core/graphics/gui/slider.png");
x = 0; y = 0;
w = 15; h = 6;
diff --git a/src/gui/textfield.cpp b/src/gui/textfield.cpp
index ba278718..c2b4642c 100644
--- a/src/gui/textfield.cpp
+++ b/src/gui/textfield.cpp
@@ -31,7 +31,7 @@ TextField::TextField(const std::string& text):
// Load the skin
ResourceManager *resman = ResourceManager::getInstance();
- Image *textbox = resman->getImage("core/graphics/gui/textbox.bmp");
+ Image *textbox = resman->getImage("core/graphics/gui/textbox.png");
int gridx[4] = {0, 9, 16, 25};
int gridy[4] = {0, 4, 19, 24};
int a = 0, x, y;
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index ca788883..1429830d 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -49,9 +49,9 @@ Window::Window(const std::string& text, bool modal, Window *parent):
// Load dialog title bar image
ResourceManager *resman = ResourceManager::getInstance();
- dLeft = resman->getImage("core/graphics/gui/dialog_left.bmp");
- dMid = resman->getImage("core/graphics/gui/dialog_middle.bmp");
- dRight = resman->getImage("core/graphics/gui/dialog_right.bmp");
+ dLeft = resman->getImage("core/graphics/gui/dialog_left.png");
+ dMid = resman->getImage("core/graphics/gui/dialog_middle.png");
+ dRight = resman->getImage("core/graphics/gui/dialog_right.png");
// Register mouse listener
addMouseListener(this);