diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-10-21 17:23:22 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-10-21 17:23:22 +0300 |
| commit | c29b91939d1c8e8f7772a660ad4d4bee83dec668 (patch) | |
| tree | 7de96c695fd9126e395891427643bc1f2728e89b | |
| parent | 1e5ef5ad665721a4c7824a1c8c0fb48ed7e4dc51 (diff) | |
| download | manaverse-c29b91939d1c8e8f7772a660ad4d4bee83dec668.tar.gz manaverse-c29b91939d1c8e8f7772a660ad4d4bee83dec668.tar.bz2 manaverse-c29b91939d1c8e8f7772a660ad4d4bee83dec668.tar.xz manaverse-c29b91939d1c8e8f7772a660ad4d4bee83dec668.zip | |
Rename theme file textfield_background.xml to textfield.xml
| -rw-r--r-- | data/graphics/gui/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | data/graphics/gui/Makefile.am | 2 | ||||
| -rw-r--r-- | data/graphics/gui/textfield.xml (renamed from data/graphics/gui/textfield_background.xml) | 0 | ||||
| -rw-r--r-- | data/themes/jewelry/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | data/themes/jewelry/Makefile.am | 2 | ||||
| -rw-r--r-- | data/themes/jewelry/textfield.xml (renamed from data/themes/jewelry/textfield_background.xml) | 0 | ||||
| -rw-r--r-- | src/gui/widgets/textfield.cpp | 5 |
7 files changed, 8 insertions, 5 deletions
diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt index 01b14ce9a..1f665cebb 100644 --- a/data/graphics/gui/CMakeLists.txt +++ b/data/graphics/gui/CMakeLists.txt @@ -61,7 +61,7 @@ SET (FILES target-cursor-normal-l.png target-cursor-normal-m.png target-cursor-normal-s.png - textfield_background.xml + textfield.xml unknown-item.png window.png window.xml diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am index 91ace3d34..9a3e17f37 100644 --- a/data/graphics/gui/Makefile.am +++ b/data/graphics/gui/Makefile.am @@ -64,7 +64,7 @@ gui_DATA = \ target-cursor-normal-l.png \ target-cursor-normal-m.png \ target-cursor-normal-s.png \ - textfield_background.xml \ + textfield.xml \ unknown-item.png \ window.png \ window.xml \ diff --git a/data/graphics/gui/textfield_background.xml b/data/graphics/gui/textfield.xml index 4a63cf25c..4a63cf25c 100644 --- a/data/graphics/gui/textfield_background.xml +++ b/data/graphics/gui/textfield.xml diff --git a/data/themes/jewelry/CMakeLists.txt b/data/themes/jewelry/CMakeLists.txt index 092cd95ae..ed94a87a5 100644 --- a/data/themes/jewelry/CMakeLists.txt +++ b/data/themes/jewelry/CMakeLists.txt @@ -52,7 +52,7 @@ SET (FILES tab_highlighted.xml tab_selected.xml tab_unused.xml - textfield_background.xml + textfield.xml VERSION.txt window.png window.xml diff --git a/data/themes/jewelry/Makefile.am b/data/themes/jewelry/Makefile.am index fc5981c93..950bf6572 100644 --- a/data/themes/jewelry/Makefile.am +++ b/data/themes/jewelry/Makefile.am @@ -55,7 +55,7 @@ gui_DATA = \ tab_highlighted.xml \ tab_selected.xml \ tab_unused.xml \ - textfield_background.xml \ + textfield.xml \ VERSION.txt \ window.png \ window.xml diff --git a/data/themes/jewelry/textfield_background.xml b/data/themes/jewelry/textfield.xml index f8cc88055..f8cc88055 100644 --- a/data/themes/jewelry/textfield_background.xml +++ b/data/themes/jewelry/textfield.xml diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp index d9e585d3c..afe6555a4 100644 --- a/src/gui/widgets/textfield.cpp +++ b/src/gui/widgets/textfield.cpp @@ -63,7 +63,10 @@ TextField::TextField(const Widget2 *const widget, if (instances == 0) { if (Theme::instance()) - Theme::instance()->loadRect(skin, "textfield_background.xml", ""); + { + Theme::instance()->loadRect(skin, "textfield.xml", + "textfield_background.xml"); + } } instances++; |