From e518be48a9d52d6b1b7bcfcbfb564d42f3b6ae98 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 23 Feb 2009 20:28:36 -0500 Subject: UI files now use the correct namespace for Fraction and Script widgets --- sigmodr/widgets/gui/ability.ui | 8 ++++---- sigmodr/widgets/gui/badge.ui | 6 +++--- sigmodr/widgets/gui/coinlist.ui | 4 ++-- sigmodr/widgets/gui/coinlistitem.ui | 6 ++++++ sigmodr/widgets/gui/globalscript.ui | 4 ++-- sigmodr/widgets/gui/item.ui | 4 ++-- sigmodr/widgets/gui/map.ui | 4 ++-- sigmodr/widgets/gui/mapeffect.ui | 4 ++-- sigmodr/widgets/gui/maptrainer.ui | 4 ++-- sigmodr/widgets/gui/mapwarp.ui | 4 ++-- sigmodr/widgets/gui/move.ui | 14 +++++++------- sigmodr/widgets/gui/nature.ui | 6 +++--- sigmodr/widgets/gui/sigmod.ui | 10 +++++----- sigmodr/widgets/gui/skin.ui | 4 ++-- sigmodr/widgets/gui/species.ui | 34 +++++++++++++++++----------------- sigmodr/widgets/gui/status.ui | 6 +++--- sigmodr/widgets/gui/tile.ui | 4 ++-- sigmodr/widgets/gui/time.ui | 4 ++-- sigmodr/widgets/gui/type.ui | 6 +++--- sigmodr/widgets/gui/weather.ui | 4 ++-- 20 files changed, 73 insertions(+), 67 deletions(-) diff --git a/sigmodr/widgets/gui/ability.ui b/sigmodr/widgets/gui/ability.ui index 819f1893..3b594491 100644 --- a/sigmodr/widgets/gui/ability.ui +++ b/sigmodr/widgets/gui/ability.ui @@ -93,7 +93,7 @@ - + The script used for the ability in the battle @@ -115,7 +115,7 @@ - + The script used for the ability on the world map @@ -137,7 +137,7 @@ - + The script used to determine if the ability should modify its priority depending on the environment @@ -166,7 +166,7 @@
KLineEdit
- Sigmodr::ScriptWidget + Sigmodr::Widgets::ScriptWidget QWidget
ScriptWidget.h
diff --git a/sigmodr/widgets/gui/badge.ui b/sigmodr/widgets/gui/badge.ui index c130691d..5436c58c 100644 --- a/sigmodr/widgets/gui/badge.ui +++ b/sigmodr/widgets/gui/badge.ui @@ -141,7 +141,7 @@
- + Stat multiplier for the stat @@ -152,7 +152,7 @@ Stat multiplier for the stat - Sigmodr::FractionWidget::Improper + Sigmodr::Widgets::FractionWidget::Improper @@ -191,7 +191,7 @@
KLineEdit
- Sigmodr::FractionWidget + Sigmodr::Widgets::FractionWidget QWidget
FractionWidget.h
diff --git a/sigmodr/widgets/gui/coinlist.ui b/sigmodr/widgets/gui/coinlist.ui index ebb3f96a..566d8d17 100644 --- a/sigmodr/widgets/gui/coinlist.ui +++ b/sigmodr/widgets/gui/coinlist.ui @@ -38,7 +38,7 @@ - + The script used to control how the coin list is handled @@ -62,7 +62,7 @@
KLineEdit
- Sigmodr::ScriptWidget + Sigmodr::Widgets::ScriptWidget QWidget
ScriptWidget.h
diff --git a/sigmodr/widgets/gui/coinlistitem.ui b/sigmodr/widgets/gui/coinlistitem.ui index 70e293ea..8e9e2800 100644 --- a/sigmodr/widgets/gui/coinlistitem.ui +++ b/sigmodr/widgets/gui/coinlistitem.ui @@ -132,6 +132,12 @@
KIntNumInput
+ + varItem + varSpecies + varObject + varCost + diff --git a/sigmodr/widgets/gui/globalscript.ui b/sigmodr/widgets/gui/globalscript.ui index bfb95470..cf551d07 100644 --- a/sigmodr/widgets/gui/globalscript.ui +++ b/sigmodr/widgets/gui/globalscript.ui @@ -38,7 +38,7 @@ - + The script @@ -62,7 +62,7 @@
KLineEdit
- Sigmodr::ScriptWidget + Sigmodr::Widgets::ScriptWidget QWidget
ScriptWidget.h
diff --git a/sigmodr/widgets/gui/item.ui b/sigmodr/widgets/gui/item.ui index 0cbc0267..415c8a73 100644 --- a/sigmodr/widgets/gui/item.ui +++ b/sigmodr/widgets/gui/item.ui @@ -225,7 +225,7 @@ - + The script that determines how the item works @@ -259,7 +259,7 @@
KLineEdit
- Sigmodr::ScriptWidget + Sigmodr::Widgets::ScriptWidget QWidget
ScriptWidget.h
diff --git a/sigmodr/widgets/gui/map.ui b/sigmodr/widgets/gui/map.ui index 2a1d2acf..149ca799 100644 --- a/sigmodr/widgets/gui/map.ui +++ b/sigmodr/widgets/gui/map.ui @@ -64,7 +64,7 @@ - +
@@ -88,7 +88,7 @@
KLineEdit
- Sigmodr::MapEditor + Sigmodr::Widgets::MapEditor QWidget
MapEditor.h
diff --git a/sigmodr/widgets/gui/mapeffect.ui b/sigmodr/widgets/gui/mapeffect.ui index c422ae18..bd8cee1c 100644 --- a/sigmodr/widgets/gui/mapeffect.ui +++ b/sigmodr/widgets/gui/mapeffect.ui @@ -93,7 +93,7 @@ - + The script for the effect @@ -122,7 +122,7 @@
KLineEdit
- Sigmodr::ScriptWidget + Sigmodr::Widgets::ScriptWidget QWidget
ScriptWidget.h
diff --git a/sigmodr/widgets/gui/maptrainer.ui b/sigmodr/widgets/gui/maptrainer.ui index 8dbae74f..e128c577 100644 --- a/sigmodr/widgets/gui/maptrainer.ui +++ b/sigmodr/widgets/gui/maptrainer.ui @@ -118,7 +118,7 @@ - + The script for the trainer @@ -157,7 +157,7 @@
KLineEdit
- Sigmodr::ScriptWidget + Sigmodr::Widgets::ScriptWidget QWidget
ScriptWidget.h
diff --git a/sigmodr/widgets/gui/mapwarp.ui b/sigmodr/widgets/gui/mapwarp.ui index 140f58c5..7aedbc15 100644 --- a/sigmodr/widgets/gui/mapwarp.ui +++ b/sigmodr/widgets/gui/mapwarp.ui @@ -138,7 +138,7 @@ - + The script that is executed when the warp is activated @@ -167,7 +167,7 @@
KLineEdit
- Sigmodr::ScriptWidget + Sigmodr::Widgets::ScriptWidget QWidget
ScriptWidget.h
diff --git a/sigmodr/widgets/gui/move.ui b/sigmodr/widgets/gui/move.ui index e197aebf..877f2f9c 100644 --- a/sigmodr/widgets/gui/move.ui +++ b/sigmodr/widgets/gui/move.ui @@ -100,7 +100,7 @@
- + The chance that the move hits @@ -111,7 +111,7 @@ The chance that the move hits - Sigmodr::FractionWidget::NonZero + Sigmodr::Widgets::FractionWidget::NonZero @@ -235,7 +235,7 @@ - + Script that controls the move when used in battle @@ -257,7 +257,7 @@ - + The script that controls the move when used in the overworld @@ -279,7 +279,7 @@ - + The script used to determine if the move should modify its priority depending on the environment @@ -313,12 +313,12 @@
KLineEdit
- Sigmodr::FractionWidget + Sigmodr::Widgets::FractionWidget QWidget
FractionWidget.h
- Sigmodr::ScriptWidget + Sigmodr::Widgets::ScriptWidget QWidget
ScriptWidget.h
diff --git a/sigmodr/widgets/gui/nature.ui b/sigmodr/widgets/gui/nature.ui index c28cf0aa..d81b7144 100644 --- a/sigmodr/widgets/gui/nature.ui +++ b/sigmodr/widgets/gui/nature.ui @@ -60,7 +60,7 @@
- + Stat multiplier for creatures with the nature @@ -71,7 +71,7 @@ Stat multiplier for creatures with the nature - Sigmodr::FractionWidget::AnyButZero + Sigmodr::Widgets::FractionWidget::AnyButZero @@ -134,7 +134,7 @@
KLineEdit
- Sigmodr::FractionWidget + Sigmodr::Widgets::FractionWidget QWidget
FractionWidget.h
diff --git a/sigmodr/widgets/gui/sigmod.ui b/sigmodr/widgets/gui/sigmod.ui index 0b1af59a..66f78eb8 100644 --- a/sigmodr/widgets/gui/sigmod.ui +++ b/sigmodr/widgets/gui/sigmod.ui @@ -132,7 +132,7 @@ - + The script that is executed when the sigmod begins @@ -197,7 +197,7 @@ - + Multiplier for attacks of the attacking type against the defending type @@ -208,7 +208,7 @@ Multiplier for attacks of the attacking type against the defending type - Sigmodr::FractionWidget::Any + Sigmodr::Widgets::FractionWidget::Any @@ -241,12 +241,12 @@ 1 - Sigmodr::FractionWidget + Sigmodr::Widgets::FractionWidget QWidget
FractionWidget.h
- Sigmodr::ScriptWidget + Sigmodr::Widgets::ScriptWidget QWidget
ScriptWidget.h
diff --git a/sigmodr/widgets/gui/skin.ui b/sigmodr/widgets/gui/skin.ui index 8dcff23a..1a8baa8c 100644 --- a/sigmodr/widgets/gui/skin.ui +++ b/sigmodr/widgets/gui/skin.ui @@ -38,7 +38,7 @@ - + The script that controls the appearance skin @@ -62,7 +62,7 @@
KLineEdit
- Sigmodr::ScriptWidget + Sigmodr::Widgets::ScriptWidget QWidget
ScriptWidget.h
diff --git a/sigmodr/widgets/gui/species.ui b/sigmodr/widgets/gui/species.ui index 73bbd2a8..d06c0f83 100644 --- a/sigmodr/widgets/gui/species.ui +++ b/sigmodr/widgets/gui/species.ui @@ -106,7 +106,7 @@
- + The chance that the species runs in a wild battle each turn @@ -117,7 +117,7 @@ The chance that the species runs in a wild battle each turn - Sigmodr::FractionWidget::Proper + Sigmodr::Widgets::FractionWidget::Proper @@ -135,7 +135,7 @@
- + Chance that the player can flee from a wild battle with this species @@ -146,7 +146,7 @@ Chance that the player can flee from a wild battle with this species - Sigmodr::FractionWidget::Proper + Sigmodr::Widgets::FractionWidget::Proper @@ -164,7 +164,7 @@
- + Chance the species is carrying an item in a wild battle @@ -175,7 +175,7 @@ Chance the species is carrying an item in a wild battle - Sigmodr::FractionWidget::Proper + Sigmodr::Widgets::FractionWidget::Proper @@ -552,13 +552,13 @@ - The weight of the species in grams + The weight of the species - The weight of the species in grams + The weight of the species - The weight of the species in grams + The weight of the species 0 @@ -581,13 +581,13 @@ - Height of the species in centimeters + Height of the species - Height of the species in centimeters + Height of the species - Height of the species in centimeters + Height of the species 0 @@ -688,7 +688,7 @@ - + 0 @@ -705,7 +705,7 @@ Chance of getting a female version of the species (negative is genderless) - Sigmodr::FractionWidget::Proper + Sigmodr::Widgets::FractionWidget::Proper @@ -798,7 +798,7 @@ - + The script that controls how the species evolves @@ -1003,12 +1003,12 @@ 1 - Sigmodr::FractionWidget + Sigmodr::Widgets::FractionWidget QWidget
FractionWidget.h
- Sigmodr::ScriptWidget + Sigmodr::Widgets::ScriptWidget QWidget
ScriptWidget.h
diff --git a/sigmodr/widgets/gui/status.ui b/sigmodr/widgets/gui/status.ui index 03e45487..bffe8cf0 100644 --- a/sigmodr/widgets/gui/status.ui +++ b/sigmodr/widgets/gui/status.ui @@ -38,7 +38,7 @@ - + The script that controls how the status works in battle @@ -60,7 +60,7 @@ - + The script that controls how the status works in the overworld @@ -84,7 +84,7 @@
KLineEdit
- Sigmodr::ScriptWidget + Sigmodr::Widgets::ScriptWidget QWidget
ScriptWidget.h
diff --git a/sigmodr/widgets/gui/tile.ui b/sigmodr/widgets/gui/tile.ui index 6a37e24b..eb70a2bc 100644 --- a/sigmodr/widgets/gui/tile.ui +++ b/sigmodr/widgets/gui/tile.ui @@ -67,7 +67,7 @@ - + The script that is run for this tile @@ -91,7 +91,7 @@
KLineEdit
- Sigmodr::ScriptWidget + Sigmodr::Widgets::ScriptWidget QWidget
ScriptWidget.h
diff --git a/sigmodr/widgets/gui/time.ui b/sigmodr/widgets/gui/time.ui index b8708f99..d8e57f63 100644 --- a/sigmodr/widgets/gui/time.ui +++ b/sigmodr/widgets/gui/time.ui @@ -76,7 +76,7 @@ - + The script that gets triggered when the time changes @@ -100,7 +100,7 @@
KLineEdit
- Sigmodr::ScriptWidget + Sigmodr::Widgets::ScriptWidget QWidget
ScriptWidget.h
diff --git a/sigmodr/widgets/gui/type.ui b/sigmodr/widgets/gui/type.ui index 484195ce..137bc74e 100644 --- a/sigmodr/widgets/gui/type.ui +++ b/sigmodr/widgets/gui/type.ui @@ -45,7 +45,7 @@
- + Multiplier for species with this type for using a move of this type @@ -56,7 +56,7 @@ Multiplier for species with this type for using a move of this type - Sigmodr::FractionWidget::Improper + Sigmodr::Widgets::FractionWidget::Improper @@ -82,7 +82,7 @@
KLineEdit
- Sigmodr::FractionWidget + Sigmodr::Widgets::FractionWidget QWidget
FractionWidget.h
diff --git a/sigmodr/widgets/gui/weather.ui b/sigmodr/widgets/gui/weather.ui index 0feac7eb..65544b21 100644 --- a/sigmodr/widgets/gui/weather.ui +++ b/sigmodr/widgets/gui/weather.ui @@ -38,7 +38,7 @@ - + The script that controls the effects of the weather @@ -62,7 +62,7 @@
KLineEdit
- Sigmodr::ScriptWidget + Sigmodr::Widgets::ScriptWidget QWidget
ScriptWidget.h
-- cgit