diff options
56 files changed, 243 insertions, 174 deletions
diff --git a/sigmodr/widgets/AbilityUI.cpp b/sigmodr/widgets/AbilityUI.cpp index d6bc1492..4ddf29a0 100644 --- a/sigmodr/widgets/AbilityUI.cpp +++ b/sigmodr/widgets/AbilityUI.cpp @@ -18,8 +18,8 @@ // Header include #include "AbilityUI.h" -// Sigmodr widget includes -#include "ScriptWidget.h" +// Sigmodr core widget includes +#include <sigmodr/corewidgets/ScriptWidget.h> // Sigmod includes #include <sigmod/Ability.h> @@ -34,6 +34,7 @@ using namespace Sigcore; using namespace Sigmod; +using namespace Sigmodr::CoreWidgets; using namespace Sigmodr::Widgets; AbilityUI::AbilityUI(Ability* ability, QWidget* parent) : @@ -56,7 +57,7 @@ void AbilityUI::initGui() ui_priorityScript = formWidget->findChild<ScriptWidget*>("varPriorityScript"); connect(ui_name, SIGNAL(textChanged(QString)), this, SLOT(nameChanged(QString))); connect(ui_priority, SIGNAL(valueChanged(int)), this, SLOT(priorityChanged(int))); - connect(ui_description, SIGNAL(Changed(QString)), this, SLOT(descriptionChanged(QString))); + connect(ui_description, SIGNAL(textChanged(QString)), this, SLOT(descriptionChanged(QString))); connect(ui_battleScript, SIGNAL(valueChanged(Sigcore::Script)), this, SLOT(battleScriptChanged(Sigcore::Script))); connect(ui_worldScript, SIGNAL(valueChanged(Sigcore::Script)), this, SLOT(worldScriptChanged(Sigcore::Script))); connect(ui_priorityScript, SIGNAL(valueChanged(Sigcore::Script)), this, SLOT(priorityScriptChanged(Sigcore::Script))); diff --git a/sigmodr/widgets/AbilityUI.h b/sigmodr/widgets/AbilityUI.h index 3da5a478..ba0b0f05 100644 --- a/sigmodr/widgets/AbilityUI.h +++ b/sigmodr/widgets/AbilityUI.h @@ -35,10 +35,13 @@ class Ability; namespace Sigmodr { -namespace Widgets +namespace CoreWidgets { class ScriptWidget; +} +namespace Widgets +{ class SIGMODRWIDGETS_EXPORT AbilityUI : public ObjectUI { Q_OBJECT @@ -59,9 +62,9 @@ class SIGMODRWIDGETS_EXPORT AbilityUI : public ObjectUI KLineEdit* ui_name; KIntNumInput* ui_priority; KLineEdit* ui_description; - ScriptWidget* ui_battleScript; - ScriptWidget* ui_worldScript; - ScriptWidget* ui_priorityScript; + CoreWidgets::ScriptWidget* ui_battleScript; + CoreWidgets::ScriptWidget* ui_worldScript; + CoreWidgets::ScriptWidget* ui_priorityScript; private slots: void initGui(); void setGui(); diff --git a/sigmodr/widgets/BadgeUI.cpp b/sigmodr/widgets/BadgeUI.cpp index dcd94582..83b96d93 100644 --- a/sigmodr/widgets/BadgeUI.cpp +++ b/sigmodr/widgets/BadgeUI.cpp @@ -18,8 +18,9 @@ // Header include #include "BadgeUI.h" -// Sigmodr widget includes -#include "FractionWidget.h" +// Sigmodr core widget includes +#include <sigmodr/corewidgets/FractionWidget.h> +#include <sigmodr/corewidgets/ScriptWidget.h> // Sigmod includes #include <sigmod/Badge.h> @@ -41,6 +42,7 @@ using namespace Sigcore; using namespace Sigmod; +using namespace Sigmodr::CoreWidgets; using namespace Sigmodr::Widgets; BadgeUI::BadgeUI(Badge* badge, QWidget* parent) : diff --git a/sigmodr/widgets/BadgeUI.h b/sigmodr/widgets/BadgeUI.h index bb23e126..56bc1872 100644 --- a/sigmodr/widgets/BadgeUI.h +++ b/sigmodr/widgets/BadgeUI.h @@ -37,10 +37,14 @@ class Badge; namespace Sigmodr { -namespace Widgets +namespace CoreWidgets { class FractionWidget; +class ScriptWidget; +} +namespace Widgets +{ class SIGMODRWIDGETS_EXPORT BadgeUI : public ObjectUI { Q_OBJECT @@ -63,7 +67,7 @@ class SIGMODRWIDGETS_EXPORT BadgeUI : public ObjectUI KComboBox* ui_face; KComboBox* ui_badge; QTableWidget* ui_stat; - FractionWidget* ui_statMultiplier; + CoreWidgets::FractionWidget* ui_statMultiplier; private slots: void initGui(); void refreshGui(); diff --git a/sigmodr/widgets/CMakeLists.txt b/sigmodr/widgets/CMakeLists.txt index 81c2a0b0..4ba66e43 100644 --- a/sigmodr/widgets/CMakeLists.txt +++ b/sigmodr/widgets/CMakeLists.txt @@ -11,7 +11,6 @@ set(sigmodrwidgets_HEADERS CoinListUI.h CoinListItemUI.h EggGroupUI.h - FractionWidget.h GameUI.h Global.h GlobalScriptUI.h @@ -28,7 +27,6 @@ set(sigmodrwidgets_HEADERS NatureUI.h ObjectUI.h RulesUI.h - ScriptWidget.h SkinUI.h SoundUI.h SpeciesUI.h @@ -51,7 +49,6 @@ set(sigmodrwidgets_SRCS CoinListUI.cpp CoinListItemUI.cpp EggGroupUI.cpp - FractionWidget.cpp GameUI.cpp GlobalScriptUI.cpp ItemUI.cpp @@ -67,7 +64,6 @@ set(sigmodrwidgets_SRCS NatureUI.cpp ObjectUI.cpp RulesUI.cpp - ScriptWidget.cpp SkinUI.cpp SoundUI.cpp SpeciesUI.cpp @@ -101,10 +97,11 @@ target_link_libraries(sigmodrwidgets ${KDE4_KDECORE_LIBRARY} ${KDE4_KDEUI_LIBRARY} ${KDE4_KFILE_LIBRARY} - ${KDE4_KTEXTEDITOR_LIBRARY} + ${KDE4_KIO_LIBRARY} ${PHONON_LIBRARY} sigcore sigmod + sigmodrcorewidgets ) target_link_libraries(sigmodrwidgets LINK_INTERFACE_LIBRARIES ${QT_QTGUI_LIBRARY} diff --git a/sigmodr/widgets/CoinListUI.cpp b/sigmodr/widgets/CoinListUI.cpp index 4448a984..2de9ebe6 100644 --- a/sigmodr/widgets/CoinListUI.cpp +++ b/sigmodr/widgets/CoinListUI.cpp @@ -18,8 +18,8 @@ // Header include #include "CoinListUI.h" -// Sigmodr widget includes -#include "ScriptWidget.h" +// Sigmodr core widget includes +#include <sigmodr/corewidgets/ScriptWidget.h> // Sigmod includes #include <sigmod/CoinList.h> @@ -34,6 +34,7 @@ using namespace Sigcore; using namespace Sigmod; +using namespace Sigmodr::CoreWidgets; using namespace Sigmodr::Widgets; CoinListUI::CoinListUI(CoinList* coinList, QWidget* parent) : diff --git a/sigmodr/widgets/CoinListUI.h b/sigmodr/widgets/CoinListUI.h index fc4ab452..90167027 100644 --- a/sigmodr/widgets/CoinListUI.h +++ b/sigmodr/widgets/CoinListUI.h @@ -34,10 +34,13 @@ class CoinList; namespace Sigmodr { -namespace Widgets +namespace CoreWidgets { class ScriptWidget; +} +namespace Widgets +{ class SIGMODRWIDGETS_EXPORT CoinListUI : public ObjectUI { Q_OBJECT @@ -52,7 +55,7 @@ class SIGMODRWIDGETS_EXPORT CoinListUI : public ObjectUI void scriptChanged(const Sigcore::Script& script); private: KLineEdit* ui_name; - ScriptWidget* ui_script; + CoreWidgets::ScriptWidget* ui_script; private slots: void initGui(); void setGui(); diff --git a/sigmodr/widgets/GameUI.cpp b/sigmodr/widgets/GameUI.cpp index 34960d15..d036b897 100644 --- a/sigmodr/widgets/GameUI.cpp +++ b/sigmodr/widgets/GameUI.cpp @@ -21,9 +21,9 @@ // Sigmodr widget includes #include "TypechartModel.h" -// Sigmodr widget includes -#include "FractionWidget.h" -#include "ScriptWidget.h" +// Sigmodr core widget includes +#include <sigmodr/corewidgets/FractionWidget.h> +#include <sigmodr/corewidgets/ScriptWidget.h> // Sigmod includes #include <sigmod/Game.h> @@ -43,6 +43,7 @@ using namespace Sigcore; using namespace Sigmod; +using namespace Sigmodr::CoreWidgets; using namespace Sigmodr::Widgets; GameUI::GameUI(Game* game, QWidget* parent) : diff --git a/sigmodr/widgets/GameUI.h b/sigmodr/widgets/GameUI.h index dca47704..5daf8849 100644 --- a/sigmodr/widgets/GameUI.h +++ b/sigmodr/widgets/GameUI.h @@ -41,11 +41,14 @@ class Game; namespace Sigmodr { -namespace Widgets +namespace CoreWidgets { class FractionWidget; class ScriptWidget; +} +namespace Widgets +{ class SIGMODRWIDGETS_EXPORT GameUI : public ObjectUI { Q_OBJECT @@ -68,10 +71,10 @@ class SIGMODRWIDGETS_EXPORT GameUI : public ObjectUI KLineEdit* ui_version; KLineEdit* ui_description; QCheckBox* ui_singlePlayer; - ScriptWidget* ui_startScript; + CoreWidgets::ScriptWidget* ui_startScript; QTableView* ui_typechart; QLabel* ui_labelTypes; - FractionWidget* ui_effectiveness; + CoreWidgets::FractionWidget* ui_effectiveness; bool m_changingMult; QModelIndex m_index; diff --git a/sigmodr/widgets/GlobalScriptUI.cpp b/sigmodr/widgets/GlobalScriptUI.cpp index c59ccd69..84b5d7b3 100644 --- a/sigmodr/widgets/GlobalScriptUI.cpp +++ b/sigmodr/widgets/GlobalScriptUI.cpp @@ -18,8 +18,8 @@ // Header include #include "GlobalScriptUI.h" -// Sigmodr widget includes -#include "ScriptWidget.h" +// Sigmodr core widget includes +#include <sigmodr/corewidgets/ScriptWidget.h> // Sigmod includes #include <sigmod/GlobalScript.h> @@ -33,6 +33,7 @@ using namespace Sigcore; using namespace Sigmod; +using namespace Sigmodr::CoreWidgets; using namespace Sigmodr::Widgets; GlobalScriptUI::GlobalScriptUI(GlobalScript* globalScript, QWidget* parent) : diff --git a/sigmodr/widgets/GlobalScriptUI.h b/sigmodr/widgets/GlobalScriptUI.h index a69e6718..90d49bad 100644 --- a/sigmodr/widgets/GlobalScriptUI.h +++ b/sigmodr/widgets/GlobalScriptUI.h @@ -34,10 +34,13 @@ class GlobalScript; namespace Sigmodr { -namespace Widgets +namespace CoreWidgets { class ScriptWidget; +} +namespace Widgets +{ class SIGMODRWIDGETS_EXPORT GlobalScriptUI : public ObjectUI { Q_OBJECT @@ -52,7 +55,7 @@ class SIGMODRWIDGETS_EXPORT GlobalScriptUI : public ObjectUI void scriptChanged(const Sigcore::Script& script); private: KLineEdit* ui_name; - ScriptWidget* ui_script; + CoreWidgets::ScriptWidget* ui_script; private slots: void initGui(); void setGui(); diff --git a/sigmodr/widgets/ItemUI.cpp b/sigmodr/widgets/ItemUI.cpp index ec0076ef..78fd9791 100644 --- a/sigmodr/widgets/ItemUI.cpp +++ b/sigmodr/widgets/ItemUI.cpp @@ -18,8 +18,8 @@ // Header include #include "ItemUI.h" -// Sigmodr widget includes -#include "ScriptWidget.h" +// Sigmodr core widget includes +#include <sigmodr/corewidgets/ScriptWidget.h> // Sigmod includes #include <sigmod/Game.h> @@ -39,6 +39,7 @@ using namespace Sigcore; using namespace Sigmod; +using namespace Sigmodr::CoreWidgets; using namespace Sigmodr::Widgets; ItemUI::ItemUI(Item* item, QWidget* parent) : diff --git a/sigmodr/widgets/ItemUI.h b/sigmodr/widgets/ItemUI.h index f7a7b946..bac26352 100644 --- a/sigmodr/widgets/ItemUI.h +++ b/sigmodr/widgets/ItemUI.h @@ -37,10 +37,13 @@ class Item; namespace Sigmodr { -namespace Widgets +namespace CoreWidgets { class ScriptWidget; +} +namespace Widgets +{ class SIGMODRWIDGETS_EXPORT ItemUI : public ObjectUI { Q_OBJECT @@ -67,7 +70,7 @@ class SIGMODRWIDGETS_EXPORT ItemUI : public ObjectUI KIntNumInput* ui_sellPrice; KIntNumInput* ui_weight; KLineEdit* ui_description; - ScriptWidget* ui_script; + CoreWidgets::ScriptWidget* ui_script; int m_lastType; private slots: diff --git a/sigmodr/widgets/MapEffectUI.cpp b/sigmodr/widgets/MapEffectUI.cpp index 86ebb563..133c3cda 100644 --- a/sigmodr/widgets/MapEffectUI.cpp +++ b/sigmodr/widgets/MapEffectUI.cpp @@ -18,8 +18,8 @@ // Header include #include "MapEffectUI.h" -// Sigmodr widget includes -#include "ScriptWidget.h" +// Sigmodr core widget includes +#include <sigmodr/corewidgets/ScriptWidget.h> // Sigmod includes #include <sigmod/Game.h> @@ -38,6 +38,7 @@ using namespace Sigcore; using namespace Sigmod; +using namespace Sigmodr::CoreWidgets; using namespace Sigmodr::Widgets; MapEffectUI::MapEffectUI(MapEffect* effect, QWidget* parent) : diff --git a/sigmodr/widgets/MapEffectUI.h b/sigmodr/widgets/MapEffectUI.h index 150b82e9..c3ce1fe4 100644 --- a/sigmodr/widgets/MapEffectUI.h +++ b/sigmodr/widgets/MapEffectUI.h @@ -36,10 +36,13 @@ class MapEffect; namespace Sigmodr { -namespace Widgets +namespace CoreWidgets { class ScriptWidget; +} +namespace Widgets +{ class SIGMODRWIDGETS_EXPORT MapEffectUI : public ObjectUI { Q_OBJECT @@ -57,7 +60,7 @@ class SIGMODRWIDGETS_EXPORT MapEffectUI : public ObjectUI private: KLineEdit* ui_name; KComboBox* ui_skin; - ScriptWidget* ui_script; + CoreWidgets::ScriptWidget* ui_script; QCheckBox* ui_isGhost; private slots: void initGui(); diff --git a/sigmodr/widgets/MapTrainerUI.cpp b/sigmodr/widgets/MapTrainerUI.cpp index 58cb7690..03fb8d01 100644 --- a/sigmodr/widgets/MapTrainerUI.cpp +++ b/sigmodr/widgets/MapTrainerUI.cpp @@ -18,8 +18,8 @@ // Header include #include "MapTrainerUI.h" -// Sigmodr widget includes -#include "ScriptWidget.h" +// Sigmodr core widget includes +#include <sigmodr/corewidgets/ScriptWidget.h> // Sigmod includes #include <sigmod/Game.h> @@ -43,6 +43,7 @@ using namespace Sigcore; using namespace Sigmod; +using namespace Sigmodr::CoreWidgets; using namespace Sigmodr::Widgets; MapTrainerUI::MapTrainerUI(MapTrainer* trainer, QWidget* parent) : diff --git a/sigmodr/widgets/MapTrainerUI.h b/sigmodr/widgets/MapTrainerUI.h index e5e266c3..e5c2b14b 100644 --- a/sigmodr/widgets/MapTrainerUI.h +++ b/sigmodr/widgets/MapTrainerUI.h @@ -38,10 +38,13 @@ class MapTrainer; namespace Sigmodr { -namespace Widgets +namespace CoreWidgets { class ScriptWidget; +} +namespace Widgets +{ class SIGMODRWIDGETS_EXPORT MapTrainerUI : public ObjectUI { Q_OBJECT @@ -62,7 +65,7 @@ class SIGMODRWIDGETS_EXPORT MapTrainerUI : public ObjectUI KLineEdit* ui_name; KComboBox* ui_trainerClass; KIntNumInput* ui_numberFight; - ScriptWidget* ui_script; + CoreWidgets::ScriptWidget* ui_script; KActionSelector* ui_leadTeamMembers; private slots: void initGui(); diff --git a/sigmodr/widgets/MapWarpUI.cpp b/sigmodr/widgets/MapWarpUI.cpp index c354b85e..3d396946 100644 --- a/sigmodr/widgets/MapWarpUI.cpp +++ b/sigmodr/widgets/MapWarpUI.cpp @@ -18,8 +18,8 @@ // Header include #include "MapWarpUI.h" -// Sigmodr widget includes -#include "ScriptWidget.h" +// Sigmodr core widget includes +#include <sigmodr/corewidgets/ScriptWidget.h> // Sigmod includes #include <sigmod/Game.h> @@ -36,6 +36,7 @@ using namespace Sigcore; using namespace Sigmod; +using namespace Sigmodr::CoreWidgets; using namespace Sigmodr::Widgets; MapWarpUI::MapWarpUI(MapWarp* warp, QWidget* parent) : diff --git a/sigmodr/widgets/MapWarpUI.h b/sigmodr/widgets/MapWarpUI.h index db9b1ae7..259bd8c3 100644 --- a/sigmodr/widgets/MapWarpUI.h +++ b/sigmodr/widgets/MapWarpUI.h @@ -35,10 +35,13 @@ class MapWarp; namespace Sigmodr { -namespace Widgets +namespace CoreWidgets { class ScriptWidget; +} +namespace Widgets +{ class SIGMODRWIDGETS_EXPORT MapWarpUI : public ObjectUI { Q_OBJECT @@ -59,7 +62,7 @@ class SIGMODRWIDGETS_EXPORT MapWarpUI : public ObjectUI KComboBox* ui_type; KComboBox* ui_toMap; KComboBox* ui_toWarp; - ScriptWidget* ui_script; + CoreWidgets::ScriptWidget* ui_script; int m_lastMap; private slots: diff --git a/sigmodr/widgets/MoveUI.cpp b/sigmodr/widgets/MoveUI.cpp index 3b1eefc6..95b5021b 100644 --- a/sigmodr/widgets/MoveUI.cpp +++ b/sigmodr/widgets/MoveUI.cpp @@ -18,9 +18,9 @@ // Header include #include "MoveUI.h" -// Sigmodr widget includes -#include "FractionWidget.h" -#include "ScriptWidget.h" +// Sigmodr core widget includes +#include <sigmodr/corewidgets/FractionWidget.h> +#include <sigmodr/corewidgets/ScriptWidget.h> // Sigmod includes #include <sigmod/Game.h> @@ -39,6 +39,7 @@ using namespace Sigcore; using namespace Sigmod; +using namespace Sigmodr::CoreWidgets; using namespace Sigmodr::Widgets; MoveUI::MoveUI(Move* move, QWidget* parent) : diff --git a/sigmodr/widgets/MoveUI.h b/sigmodr/widgets/MoveUI.h index 0d68aac3..ed8252dd 100644 --- a/sigmodr/widgets/MoveUI.h +++ b/sigmodr/widgets/MoveUI.h @@ -38,11 +38,14 @@ class Move; namespace Sigmodr { -namespace Widgets +namespace CoreWidgets { class FractionWidget; class ScriptWidget; +} +namespace Widgets +{ class SIGMODRWIDGETS_EXPORT MoveUI : public ObjectUI { Q_OBJECT @@ -67,15 +70,15 @@ class SIGMODRWIDGETS_EXPORT MoveUI : public ObjectUI private: KLineEdit* ui_name; KIntNumInput* ui_priority; - FractionWidget* ui_accuracy; + CoreWidgets::FractionWidget* ui_accuracy; KIntNumInput* ui_power; KComboBox* ui_type; KIntNumInput* ui_powerPoints; QCheckBox* ui_special; KLineEdit* ui_description; - ScriptWidget* ui_battleScript; - ScriptWidget* ui_worldScript; - ScriptWidget* ui_priorityScript; + CoreWidgets::ScriptWidget* ui_battleScript; + CoreWidgets::ScriptWidget* ui_worldScript; + CoreWidgets::ScriptWidget* ui_priorityScript; private slots: void initGui(); void refreshGui(); diff --git a/sigmodr/widgets/NatureUI.cpp b/sigmodr/widgets/NatureUI.cpp index e0dfa6eb..dbf2ae48 100644 --- a/sigmodr/widgets/NatureUI.cpp +++ b/sigmodr/widgets/NatureUI.cpp @@ -18,8 +18,8 @@ // Header include #include "NatureUI.h" -// Sigmodr widget includes -#include "FractionWidget.h" +// Sigmodr core widget includes +#include <sigmodr/corewidgets/FractionWidget.h> // Sigmod includes #include <sigmod/Game.h> @@ -38,6 +38,7 @@ using namespace Sigcore; using namespace Sigmod; +using namespace Sigmodr::CoreWidgets; using namespace Sigmodr::Widgets; NatureUI::NatureUI(Nature* nature, QWidget* parent) : diff --git a/sigmodr/widgets/NatureUI.h b/sigmodr/widgets/NatureUI.h index e944c91a..49988227 100644 --- a/sigmodr/widgets/NatureUI.h +++ b/sigmodr/widgets/NatureUI.h @@ -36,10 +36,13 @@ class Nature; namespace Sigmodr { -namespace Widgets +namespace CoreWidgets { class FractionWidget; +} +namespace Widgets +{ class SIGMODRWIDGETS_EXPORT NatureUI : public ObjectUI { Q_OBJECT @@ -57,7 +60,7 @@ class SIGMODRWIDGETS_EXPORT NatureUI : public ObjectUI private: KLineEdit* ui_name; QTableWidget* ui_stat; - FractionWidget* ui_statMultiplier; + CoreWidgets::FractionWidget* ui_statMultiplier; KIntNumInput* ui_weight; private slots: void initGui(); diff --git a/sigmodr/widgets/SkinUI.cpp b/sigmodr/widgets/SkinUI.cpp index 6be00d38..eee2a2e2 100644 --- a/sigmodr/widgets/SkinUI.cpp +++ b/sigmodr/widgets/SkinUI.cpp @@ -18,8 +18,8 @@ // Header include #include "SkinUI.h" -// Sigmodr widget includes -#include "ScriptWidget.h" +// Sigmodr core widget includes +#include <sigmodr/corewidgets/ScriptWidget.h> // Sigmod includes #include <sigmod/Skin.h> @@ -33,6 +33,7 @@ using namespace Sigcore; using namespace Sigmod; +using namespace Sigmodr::CoreWidgets; using namespace Sigmodr::Widgets; SkinUI::SkinUI(Skin* skin, QWidget* parent) : diff --git a/sigmodr/widgets/SkinUI.h b/sigmodr/widgets/SkinUI.h index 85ba571c..8bf49749 100644 --- a/sigmodr/widgets/SkinUI.h +++ b/sigmodr/widgets/SkinUI.h @@ -34,10 +34,13 @@ class Skin; namespace Sigmodr { -namespace Widgets +namespace CoreWidgets { class ScriptWidget; +} +namespace Widgets +{ class SIGMODRWIDGETS_EXPORT SkinUI : public ObjectUI { Q_OBJECT @@ -52,7 +55,7 @@ class SIGMODRWIDGETS_EXPORT SkinUI : public ObjectUI void scriptChanged(const Sigcore::Script& script); private: KLineEdit* ui_name; - ScriptWidget* ui_script; + CoreWidgets::ScriptWidget* ui_script; private slots: void initGui(); void setGui(); diff --git a/sigmodr/widgets/SpeciesUI.cpp b/sigmodr/widgets/SpeciesUI.cpp index 49261b58..729b9c35 100644 --- a/sigmodr/widgets/SpeciesUI.cpp +++ b/sigmodr/widgets/SpeciesUI.cpp @@ -18,9 +18,9 @@ // Header include #include "SpeciesUI.h" -// Sigmodr widget includes -#include "FractionWidget.h" -#include "ScriptWidget.h" +// Sigmodr core widget includes +#include <sigmodr/corewidgets/FractionWidget.h> +#include <sigmodr/corewidgets/ScriptWidget.h> // Sigmod includes #include <sigmod/Ability.h> @@ -51,6 +51,7 @@ using namespace Sigcore; using namespace Sigmod; +using namespace Sigmodr::CoreWidgets; using namespace Sigmodr::Widgets; SpeciesUI::SpeciesUI(Species* species, QWidget* parent) : diff --git a/sigmodr/widgets/SpeciesUI.h b/sigmodr/widgets/SpeciesUI.h index c89113d2..73c3be7c 100644 --- a/sigmodr/widgets/SpeciesUI.h +++ b/sigmodr/widgets/SpeciesUI.h @@ -42,11 +42,14 @@ class Species; namespace Sigmodr { -namespace Widgets +namespace CoreWidgets { class FractionWidget; class ScriptWidget; +} +namespace Widgets +{ class SIGMODRWIDGETS_EXPORT SpeciesUI : public ObjectUI { Q_OBJECT @@ -106,9 +109,9 @@ class SIGMODRWIDGETS_EXPORT SpeciesUI : public ObjectUI KIntNumInput* ui_experienceValue; KIntNumInput* ui_catchValue; KIntNumInput* ui_maxHoldWeight; - FractionWidget* ui_runChance; - FractionWidget* ui_fleeChance; - FractionWidget* ui_itemChance; + CoreWidgets::FractionWidget* ui_runChance; + CoreWidgets::FractionWidget* ui_fleeChance; + CoreWidgets::FractionWidget* ui_itemChance; KIntNumInput* ui_encyclopediaNumber; KIntNumInput* ui_weight; KIntNumInput* ui_height; @@ -120,11 +123,11 @@ class SIGMODRWIDGETS_EXPORT SpeciesUI : public ObjectUI KComboBox* ui_skin; QWidget* ui_genetics; QCheckBox* ui_hasGender; - FractionWidget* ui_genderChance; + CoreWidgets::FractionWidget* ui_genderChance; QGroupBox* ui_boxEggGroups; KComboBox* ui_eggSpecies; KIntNumInput* ui_eggSteps; - ScriptWidget* ui_evolution; + CoreWidgets::ScriptWidget* ui_evolution; KActionSelector* ui_types; KActionSelector* ui_eggGroups; QGroupBox* ui_boxAbilities; diff --git a/sigmodr/widgets/StatusUI.cpp b/sigmodr/widgets/StatusUI.cpp index bb4b19d0..c2506451 100644 --- a/sigmodr/widgets/StatusUI.cpp +++ b/sigmodr/widgets/StatusUI.cpp @@ -18,8 +18,8 @@ // Header include #include "StatusUI.h" -// Sigmodr widget includes -#include "ScriptWidget.h" +// Sigmodr core widget includes +#include <sigmodr/corewidgets/ScriptWidget.h> // Sigmod includes #include <sigmod/Status.h> @@ -33,6 +33,7 @@ using namespace Sigcore; using namespace Sigmod; +using namespace Sigmodr::CoreWidgets; using namespace Sigmodr::Widgets; StatusUI::StatusUI(Status* status, QWidget* parent) : diff --git a/sigmodr/widgets/StatusUI.h b/sigmodr/widgets/StatusUI.h index 08f2d768..cfa4246c 100644 --- a/sigmodr/widgets/StatusUI.h +++ b/sigmodr/widgets/StatusUI.h @@ -34,10 +34,13 @@ class Status; namespace Sigmodr { -namespace Widgets +namespace CoreWidgets { class ScriptWidget; +} +namespace Widgets +{ class SIGMODRWIDGETS_EXPORT StatusUI : public ObjectUI { Q_OBJECT @@ -53,8 +56,8 @@ class SIGMODRWIDGETS_EXPORT StatusUI : public ObjectUI void worldScriptChanged(const Sigcore::Script& worldScript); private: KLineEdit* ui_name; - ScriptWidget* ui_battleScript; - ScriptWidget* ui_worldScript; + CoreWidgets::ScriptWidget* ui_battleScript; + CoreWidgets::ScriptWidget* ui_worldScript; private slots: void initGui(); void setGui(); diff --git a/sigmodr/widgets/TileUI.cpp b/sigmodr/widgets/TileUI.cpp index 59c176e9..8c487124 100644 --- a/sigmodr/widgets/TileUI.cpp +++ b/sigmodr/widgets/TileUI.cpp @@ -18,8 +18,8 @@ // Header include #include "TileUI.h" -// Sigmodr widget includes -#include "ScriptWidget.h" +// Sigmodr core widget includes +#include <sigmodr/corewidgets/ScriptWidget.h> // Sigmod includes #include <sigmod/Game.h> @@ -36,6 +36,7 @@ using namespace Sigcore; using namespace Sigmod; +using namespace Sigmodr::CoreWidgets; using namespace Sigmodr::Widgets; TileUI::TileUI(Tile* tile, QWidget* parent) : diff --git a/sigmodr/widgets/TileUI.h b/sigmodr/widgets/TileUI.h index 5851aa37..39f9358e 100644 --- a/sigmodr/widgets/TileUI.h +++ b/sigmodr/widgets/TileUI.h @@ -35,10 +35,13 @@ class Tile; namespace Sigmodr { -namespace Widgets +namespace CoreWidgets { class ScriptWidget; +} +namespace Widgets +{ class SIGMODRWIDGETS_EXPORT TileUI : public ObjectUI { Q_OBJECT @@ -55,7 +58,7 @@ class SIGMODRWIDGETS_EXPORT TileUI : public ObjectUI private: KLineEdit* ui_name; QCheckBox* ui_walkable; - ScriptWidget* ui_script; + CoreWidgets::ScriptWidget* ui_script; private slots: void initGui(); void setGui(); diff --git a/sigmodr/widgets/TimeUI.cpp b/sigmodr/widgets/TimeUI.cpp index 3793b5b0..801053af 100644 --- a/sigmodr/widgets/TimeUI.cpp +++ b/sigmodr/widgets/TimeUI.cpp @@ -18,8 +18,8 @@ // Header include #include "TimeUI.h" -// Sigmodr widget includes -#include "ScriptWidget.h" +// Sigmodr core widget includes +#include <sigmodr/corewidgets/ScriptWidget.h> // Sigmod includes #include <sigmod/Time.h> @@ -34,6 +34,7 @@ using namespace Sigcore; using namespace Sigmod; +using namespace Sigmodr::CoreWidgets; using namespace Sigmodr::Widgets; TimeUI::TimeUI(Time* time, QWidget* parent) : diff --git a/sigmodr/widgets/TimeUI.h b/sigmodr/widgets/TimeUI.h index 5bdfcdc3..84b8f0c4 100644 --- a/sigmodr/widgets/TimeUI.h +++ b/sigmodr/widgets/TimeUI.h @@ -35,10 +35,13 @@ class Time; namespace Sigmodr { -namespace Widgets +namespace CoreWidgets { class ScriptWidget; +} +namespace Widgets +{ class SIGMODRWIDGETS_EXPORT TimeUI : public ObjectUI { Q_OBJECT @@ -55,7 +58,7 @@ class SIGMODRWIDGETS_EXPORT TimeUI : public ObjectUI private: KLineEdit* ui_name; QTimeEdit* ui_time; - ScriptWidget* ui_script; + CoreWidgets::ScriptWidget* ui_script; private slots: void initGui(); void setGui(); diff --git a/sigmodr/widgets/TypeUI.cpp b/sigmodr/widgets/TypeUI.cpp index 2b0e8a39..82029c84 100644 --- a/sigmodr/widgets/TypeUI.cpp +++ b/sigmodr/widgets/TypeUI.cpp @@ -18,8 +18,8 @@ // Header include #include "TypeUI.h" -// Sigmodr widget includes -#include "FractionWidget.h" +// Sigmodr core widget includes +#include <sigmodr/corewidgets/FractionWidget.h> // Sigmod includes #include <sigmod/Type.h> @@ -33,6 +33,7 @@ using namespace Sigcore; using namespace Sigmod; +using namespace Sigmodr::CoreWidgets; using namespace Sigmodr::Widgets; TypeUI::TypeUI(Type* type, QWidget* parent) : diff --git a/sigmodr/widgets/TypeUI.h b/sigmodr/widgets/TypeUI.h index bd3e92c3..313a5ff1 100644 --- a/sigmodr/widgets/TypeUI.h +++ b/sigmodr/widgets/TypeUI.h @@ -34,10 +34,13 @@ class Type; namespace Sigmodr { -namespace Widgets +namespace CoreWidgets { class FractionWidget; +} +namespace Widgets +{ class SIGMODRWIDGETS_EXPORT TypeUI : public ObjectUI { Q_OBJECT @@ -52,7 +55,7 @@ class SIGMODRWIDGETS_EXPORT TypeUI : public ObjectUI void stabChanged(const Sigcore::Fraction& stab); private: KLineEdit* ui_name; - FractionWidget* ui_stab; + CoreWidgets::FractionWidget* ui_stab; private slots: void initGui(); void setGui(); diff --git a/sigmodr/widgets/WeatherUI.cpp b/sigmodr/widgets/WeatherUI.cpp index 537477a8..e06db961 100644 --- a/sigmodr/widgets/WeatherUI.cpp +++ b/sigmodr/widgets/WeatherUI.cpp @@ -18,8 +18,8 @@ // Header include #include "WeatherUI.h" -// Sigmodr widget includes -#include "ScriptWidget.h" +// Sigmodr core widget includes +#include <sigmodr/corewidgets/ScriptWidget.h> // Sigmod includes #include <sigmod/Weather.h> @@ -33,6 +33,7 @@ using namespace Sigcore; using namespace Sigmod; +using namespace Sigmodr::CoreWidgets; using namespace Sigmodr::Widgets; WeatherUI::WeatherUI(Weather* weather, QWidget* parent) : diff --git a/sigmodr/widgets/WeatherUI.h b/sigmodr/widgets/WeatherUI.h index c15ba75c..ab3d0f5f 100644 --- a/sigmodr/widgets/WeatherUI.h +++ b/sigmodr/widgets/WeatherUI.h @@ -34,10 +34,13 @@ class Weather; namespace Sigmodr { -namespace Widgets +namespace CoreWidgets { class ScriptWidget; +} +namespace Widgets +{ class SIGMODRWIDGETS_EXPORT WeatherUI : public ObjectUI { Q_OBJECT @@ -52,7 +55,7 @@ class SIGMODRWIDGETS_EXPORT WeatherUI : public ObjectUI void scriptChanged(const Sigcore::Script& script); private: KLineEdit* ui_name; - ScriptWidget* ui_script; + CoreWidgets::ScriptWidget* ui_script; private slots: void initGui(); void setGui(); diff --git a/sigmodr/widgets/gui/ability.ui b/sigmodr/widgets/gui/ability.ui index 3b594491..7441aa8c 100644 --- a/sigmodr/widgets/gui/ability.ui +++ b/sigmodr/widgets/gui/ability.ui @@ -93,7 +93,7 @@ </property> <layout class="QGridLayout" > <item row="0" column="0" > - <widget class="Sigmodr::Widgets::ScriptWidget" name="varBattleScript" > + <widget class="Sigmodr::CoreWidgets::ScriptWidget" name="varBattleScript" > <property name="toolTip" > <string>The script used for the ability in the battle</string> </property> @@ -115,7 +115,7 @@ </property> <layout class="QGridLayout" > <item row="0" column="0" > - <widget class="Sigmodr::Widgets::ScriptWidget" name="varWorldScript" > + <widget class="Sigmodr::CoreWidgets::ScriptWidget" name="varWorldScript" > <property name="toolTip" > <string>The script used for the ability on the world map</string> </property> @@ -137,7 +137,7 @@ </property> <layout class="QGridLayout" > <item row="0" column="0" > - <widget class="Sigmodr::Widgets::ScriptWidget" name="varPriorityScript" > + <widget class="Sigmodr::CoreWidgets::ScriptWidget" name="varPriorityScript" > <property name="toolTip" > <string>The script used to determine if the ability should modify its priority depending on the environment</string> </property> @@ -166,9 +166,9 @@ <header location="global" >KLineEdit</header> </customwidget> <customwidget> - <class>Sigmodr::Widgets::ScriptWidget</class> + <class>Sigmodr::CoreWidgets::ScriptWidget</class> <extends>QWidget</extends> - <header>ScriptWidget.h</header> + <header location="global" >sigmodr/corewidgets/ScriptWidget.h</header> </customwidget> </customwidgets> <tabstops> diff --git a/sigmodr/widgets/gui/badge.ui b/sigmodr/widgets/gui/badge.ui index 5436c58c..6d48a459 100644 --- a/sigmodr/widgets/gui/badge.ui +++ b/sigmodr/widgets/gui/badge.ui @@ -141,7 +141,7 @@ </widget> </item> <item row="0" column="1" > - <widget class="Sigmodr::Widgets::FractionWidget" name="varStatMultiplier" > + <widget class="Sigmodr::CoreWidgets::FractionWidget" name="varStatMultiplier" > <property name="toolTip" > <string>Stat multiplier for the stat</string> </property> @@ -152,7 +152,7 @@ <string>Stat multiplier for the stat</string> </property> <property name="behavior" > - <enum>Sigmodr::Widgets::FractionWidget::Improper</enum> + <enum>Sigmodr::CoreWidgets::FractionWidget::Improper</enum> </property> </widget> </item> @@ -191,9 +191,9 @@ <header location="global" >KLineEdit</header> </customwidget> <customwidget> - <class>Sigmodr::Widgets::FractionWidget</class> + <class>Sigmodr::CoreWidgets::FractionWidget</class> <extends>QWidget</extends> - <header>FractionWidget.h</header> + <header location="global" >sigmodr/corewidgets/FractionWidget.h</header> </customwidget> </customwidgets> <tabstops> diff --git a/sigmodr/widgets/gui/coinlist.ui b/sigmodr/widgets/gui/coinlist.ui index 566d8d17..3beeff80 100644 --- a/sigmodr/widgets/gui/coinlist.ui +++ b/sigmodr/widgets/gui/coinlist.ui @@ -38,7 +38,7 @@ </property> <layout class="QGridLayout" > <item row="0" column="0" > - <widget class="Sigmodr::Widgets::ScriptWidget" name="varScript" > + <widget class="Sigmodr::CoreWidgets::ScriptWidget" name="varScript" > <property name="toolTip" > <string>The script used to control how the coin list is handled</string> </property> @@ -62,9 +62,9 @@ <header location="global" >KLineEdit</header> </customwidget> <customwidget> - <class>Sigmodr::Widgets::ScriptWidget</class> + <class>Sigmodr::CoreWidgets::ScriptWidget</class> <extends>QWidget</extends> - <header>ScriptWidget.h</header> + <header location="global" >sigmodr/corewidgets/ScriptWidget.h</header> </customwidget> </customwidgets> <tabstops> diff --git a/sigmodr/widgets/gui/game.ui b/sigmodr/widgets/gui/game.ui index 9bdc7987..2001c857 100644 --- a/sigmodr/widgets/gui/game.ui +++ b/sigmodr/widgets/gui/game.ui @@ -132,7 +132,7 @@ </property> <layout class="QGridLayout" > <item row="0" column="0" > - <widget class="Sigmodr::Widgets::ScriptWidget" name="varStartScript" > + <widget class="Sigmodr::CoreWidgets::ScriptWidget" name="varStartScript" > <property name="toolTip" > <string>The script that is executed when the sigmod begins</string> </property> @@ -197,7 +197,7 @@ </widget> </item> <item row="2" column="1" > - <widget class="Sigmodr::Widgets::FractionWidget" name="varEffectiveness" > + <widget class="Sigmodr::CoreWidgets::FractionWidget" name="varEffectiveness" > <property name="toolTip" > <string>Multiplier for attacks of the attacking type against the defending type</string> </property> @@ -208,7 +208,7 @@ <string>Multiplier for attacks of the attacking type against the defending type</string> </property> <property name="behavior" > - <enum>Sigmodr::Widgets::FractionWidget::Any</enum> + <enum>Sigmodr::CoreWidgets::FractionWidget::Any</enum> </property> </widget> </item> @@ -241,14 +241,14 @@ <container>1</container> </customwidget> <customwidget> - <class>Sigmodr::Widgets::FractionWidget</class> + <class>Sigmodr::CoreWidgets::FractionWidget</class> <extends>QWidget</extends> - <header>FractionWidget.h</header> + <header location="global" >sigmodr/corewidgets/FractionWidget.h</header> </customwidget> <customwidget> - <class>Sigmodr::Widgets::ScriptWidget</class> + <class>Sigmodr::CoreWidgets::ScriptWidget</class> <extends>QWidget</extends> - <header>ScriptWidget.h</header> + <header location="global" >sigmodr/corewidgets/ScriptWidget.h</header> </customwidget> </customwidgets> <tabstops> diff --git a/sigmodr/widgets/gui/globalscript.ui b/sigmodr/widgets/gui/globalscript.ui index cf551d07..deb3e56d 100644 --- a/sigmodr/widgets/gui/globalscript.ui +++ b/sigmodr/widgets/gui/globalscript.ui @@ -38,7 +38,7 @@ </property> <layout class="QGridLayout" > <item row="0" column="0" > - <widget class="Sigmodr::Widgets::ScriptWidget" name="varScript" > + <widget class="Sigmodr::CoreWidgets::ScriptWidget" name="varScript" > <property name="toolTip" > <string>The script</string> </property> @@ -62,9 +62,9 @@ <header location="global" >KLineEdit</header> </customwidget> <customwidget> - <class>Sigmodr::Widgets::ScriptWidget</class> + <class>Sigmodr::CoreWidgets::ScriptWidget</class> <extends>QWidget</extends> - <header>ScriptWidget.h</header> + <header location="global" >sigmodr/corewidgets/ScriptWidget.h</header> </customwidget> </customwidgets> <tabstops> diff --git a/sigmodr/widgets/gui/item.ui b/sigmodr/widgets/gui/item.ui index 415c8a73..3503b422 100644 --- a/sigmodr/widgets/gui/item.ui +++ b/sigmodr/widgets/gui/item.ui @@ -225,7 +225,7 @@ </property> <layout class="QGridLayout" > <item row="0" column="0" > - <widget class="Sigmodr::Widgets::ScriptWidget" name="varScript" > + <widget class="Sigmodr::CoreWidgets::ScriptWidget" name="varScript" > <property name="toolTip" > <string>The script that determines how the item works</string> </property> @@ -259,9 +259,9 @@ <header location="global" >KLineEdit</header> </customwidget> <customwidget> - <class>Sigmodr::Widgets::ScriptWidget</class> + <class>Sigmodr::CoreWidgets::ScriptWidget</class> <extends>QWidget</extends> - <header>ScriptWidget.h</header> + <header location="global" >sigmodr/corewidgets/ScriptWidget.h</header> </customwidget> </customwidgets> <tabstops> diff --git a/sigmodr/widgets/gui/mapeffect.ui b/sigmodr/widgets/gui/mapeffect.ui index bd8cee1c..f3ba9699 100644 --- a/sigmodr/widgets/gui/mapeffect.ui +++ b/sigmodr/widgets/gui/mapeffect.ui @@ -93,7 +93,7 @@ </property> <layout class="QGridLayout" > <item row="0" column="0" > - <widget class="Sigmodr::Widgets::ScriptWidget" name="varScript" > + <widget class="Sigmodr::CoreWidgets::ScriptWidget" name="varScript" > <property name="toolTip" > <string>The script for the effect</string> </property> @@ -122,9 +122,9 @@ <header location="global" >KLineEdit</header> </customwidget> <customwidget> - <class>Sigmodr::Widgets::ScriptWidget</class> + <class>Sigmodr::CoreWidgets::ScriptWidget</class> <extends>QWidget</extends> - <header>ScriptWidget.h</header> + <header location="global" >sigmodr/corewidgets/ScriptWidget.h</header> </customwidget> </customwidgets> <tabstops> diff --git a/sigmodr/widgets/gui/maptrainer.ui b/sigmodr/widgets/gui/maptrainer.ui index 8ae027d8..155aace1 100644 --- a/sigmodr/widgets/gui/maptrainer.ui +++ b/sigmodr/widgets/gui/maptrainer.ui @@ -118,7 +118,7 @@ </property> <layout class="QGridLayout" > <item row="0" column="0" > - <widget class="Sigmodr::Widgets::ScriptWidget" name="varScript" > + <widget class="Sigmodr::CoreWidgets::ScriptWidget" name="varScript" > <property name="toolTip" > <string>The script for the trainer</string> </property> @@ -157,9 +157,9 @@ <header location="global" >KLineEdit</header> </customwidget> <customwidget> - <class>Sigmodr::Widgets::ScriptWidget</class> + <class>Sigmodr::CoreWidgets::ScriptWidget</class> <extends>QWidget</extends> - <header>ScriptWidget.h</header> + <header location="global" >sigmodr/corewidgets/ScriptWidget.h</header> </customwidget> </customwidgets> <tabstops> diff --git a/sigmodr/widgets/gui/mapwarp.ui b/sigmodr/widgets/gui/mapwarp.ui index 7aedbc15..6c39dd66 100644 --- a/sigmodr/widgets/gui/mapwarp.ui +++ b/sigmodr/widgets/gui/mapwarp.ui @@ -138,7 +138,7 @@ </property> <layout class="QGridLayout" > <item row="0" column="0" > - <widget class="Sigmodr::Widgets::ScriptWidget" name="varScript" > + <widget class="Sigmodr::CoreWidgets::ScriptWidget" name="varScript" > <property name="toolTip" > <string>The script that is executed when the warp is activated</string> </property> @@ -167,9 +167,9 @@ <header location="global" >KLineEdit</header> </customwidget> <customwidget> - <class>Sigmodr::Widgets::ScriptWidget</class> + <class>Sigmodr::CoreWidgets::ScriptWidget</class> <extends>QWidget</extends> - <header>ScriptWidget.h</header> + <header location="global" >sigmodr/corewidgets/ScriptWidget.h</header> </customwidget> </customwidgets> <tabstops> diff --git a/sigmodr/widgets/gui/move.ui b/sigmodr/widgets/gui/move.ui index 877f2f9c..ed091d83 100644 --- a/sigmodr/widgets/gui/move.ui +++ b/sigmodr/widgets/gui/move.ui @@ -100,7 +100,7 @@ </widget> </item> <item row="3" column="1" > - <widget class="Sigmodr::Widgets::FractionWidget" name="varAccuracy" > + <widget class="Sigmodr::CoreWidgets::FractionWidget" name="varAccuracy" > <property name="toolTip" > <string>The chance that the move hits</string> </property> @@ -111,7 +111,7 @@ <string>The chance that the move hits</string> </property> <property name="behavior" > - <enum>Sigmodr::Widgets::FractionWidget::NonZero</enum> + <enum>Sigmodr::CoreWidgets::FractionWidget::NonZero</enum> </property> </widget> </item> @@ -235,7 +235,7 @@ </property> <layout class="QGridLayout" > <item row="0" column="0" > - <widget class="Sigmodr::Widgets::ScriptWidget" name="varBattleScript" > + <widget class="Sigmodr::CoreWidgets::ScriptWidget" name="varBattleScript" > <property name="toolTip" > <string>Script that controls the move when used in battle</string> </property> @@ -257,7 +257,7 @@ </property> <layout class="QGridLayout" > <item row="0" column="0" > - <widget class="Sigmodr::Widgets::ScriptWidget" name="varWorldScript" > + <widget class="Sigmodr::CoreWidgets::ScriptWidget" name="varWorldScript" > <property name="toolTip" > <string>The script that controls the move when used in the overworld</string> </property> @@ -279,7 +279,7 @@ </property> <layout class="QGridLayout" > <item row="0" column="0" > - <widget class="Sigmodr::Widgets::ScriptWidget" name="varPriorityScript" > + <widget class="Sigmodr::CoreWidgets::ScriptWidget" name="varPriorityScript" > <property name="toolTip" > <string>The script used to determine if the move should modify its priority depending on the environment</string> </property> @@ -313,14 +313,14 @@ <header location="global" >KLineEdit</header> </customwidget> <customwidget> - <class>Sigmodr::Widgets::FractionWidget</class> + <class>Sigmodr::CoreWidgets::FractionWidget</class> <extends>QWidget</extends> - <header>FractionWidget.h</header> + <header location="global" >sigmodr/corewidgets/FractionWidget.h</header> </customwidget> <customwidget> - <class>Sigmodr::Widgets::ScriptWidget</class> + <class>Sigmodr::CoreWidgets::ScriptWidget</class> <extends>QWidget</extends> - <header>ScriptWidget.h</header> + <header location="global" >sigmodr/corewidgets/ScriptWidget.h</header> </customwidget> </customwidgets> <tabstops> diff --git a/sigmodr/widgets/gui/nature.ui b/sigmodr/widgets/gui/nature.ui index d81b7144..f5fd0069 100644 --- a/sigmodr/widgets/gui/nature.ui +++ b/sigmodr/widgets/gui/nature.ui @@ -60,7 +60,7 @@ </widget> </item> <item row="0" column="1" > - <widget class="Sigmodr::Widgets::FractionWidget" name="varStatMultiplier" > + <widget class="Sigmodr::CoreWidgets::FractionWidget" name="varStatMultiplier" > <property name="toolTip" > <string>Stat multiplier for creatures with the nature</string> </property> @@ -71,7 +71,7 @@ <string>Stat multiplier for creatures with the nature</string> </property> <property name="behavior" > - <enum>Sigmodr::Widgets::FractionWidget::AnyButZero</enum> + <enum>Sigmodr::CoreWidgets::FractionWidget::AnyButZero</enum> </property> </widget> </item> @@ -134,9 +134,9 @@ <header location="global" >KLineEdit</header> </customwidget> <customwidget> - <class>Sigmodr::Widgets::FractionWidget</class> + <class>Sigmodr::CoreWidgets::FractionWidget</class> <extends>QWidget</extends> - <header>FractionWidget.h</header> + <header location="global" >sigmodr/corewidgets/FractionWidget.h</header> </customwidget> </customwidgets> <tabstops> diff --git a/sigmodr/widgets/gui/skin.ui b/sigmodr/widgets/gui/skin.ui index 1a8baa8c..fdad07ae 100644 --- a/sigmodr/widgets/gui/skin.ui +++ b/sigmodr/widgets/gui/skin.ui @@ -38,7 +38,7 @@ </property> <layout class="QGridLayout" > <item row="0" column="0" > - <widget class="Sigmodr::Widgets::ScriptWidget" name="varScript" > + <widget class="Sigmodr::CoreWidgets::ScriptWidget" name="varScript" > <property name="toolTip" > <string>The script that controls the appearance skin</string> </property> @@ -62,9 +62,9 @@ <header location="global" >KLineEdit</header> </customwidget> <customwidget> - <class>Sigmodr::Widgets::ScriptWidget</class> + <class>Sigmodr::CoreWidgets::ScriptWidget</class> <extends>QWidget</extends> - <header>ScriptWidget.h</header> + <header location="global" >sigmodr/corewidgets/ScriptWidget.h</header> </customwidget> </customwidgets> <tabstops> diff --git a/sigmodr/widgets/gui/species.ui b/sigmodr/widgets/gui/species.ui index d06c0f83..7af32f6a 100644 --- a/sigmodr/widgets/gui/species.ui +++ b/sigmodr/widgets/gui/species.ui @@ -106,7 +106,7 @@ </widget> </item> <item row="3" column="1" > - <widget class="Sigmodr::Widgets::FractionWidget" name="varRunChance" > + <widget class="Sigmodr::CoreWidgets::FractionWidget" name="varRunChance" > <property name="toolTip" > <string>The chance that the species runs in a wild battle each turn</string> </property> @@ -117,7 +117,7 @@ <string>The chance that the species runs in a wild battle each turn</string> </property> <property name="behavior" > - <enum>Sigmodr::Widgets::FractionWidget::Proper</enum> + <enum>Sigmodr::CoreWidgets::FractionWidget::Proper</enum> </property> </widget> </item> @@ -135,7 +135,7 @@ </widget> </item> <item row="4" column="1" > - <widget class="Sigmodr::Widgets::FractionWidget" name="varFleeChance" > + <widget class="Sigmodr::CoreWidgets::FractionWidget" name="varFleeChance" > <property name="toolTip" > <string>Chance that the player can flee from a wild battle with this species</string> </property> @@ -146,7 +146,7 @@ <string>Chance that the player can flee from a wild battle with this species</string> </property> <property name="behavior" > - <enum>Sigmodr::Widgets::FractionWidget::Proper</enum> + <enum>Sigmodr::CoreWidgets::FractionWidget::Proper</enum> </property> </widget> </item> @@ -164,7 +164,7 @@ </widget> </item> <item row="5" column="1" > - <widget class="Sigmodr::Widgets::FractionWidget" name="varItemChance" > + <widget class="Sigmodr::CoreWidgets::FractionWidget" name="varItemChance" > <property name="toolTip" > <string>Chance the species is carrying an item in a wild battle</string> </property> @@ -175,7 +175,7 @@ <string>Chance the species is carrying an item in a wild battle</string> </property> <property name="behavior" > - <enum>Sigmodr::Widgets::FractionWidget::Proper</enum> + <enum>Sigmodr::CoreWidgets::FractionWidget::Proper</enum> </property> </widget> </item> @@ -688,7 +688,7 @@ </widget> </item> <item row="0" column="1" > - <widget class="Sigmodr::Widgets::FractionWidget" name="varGenderChance" > + <widget class="Sigmodr::CoreWidgets::FractionWidget" name="varGenderChance" > <property name="sizePolicy" > <sizepolicy vsizetype="Minimum" hsizetype="Expanding" > <horstretch>0</horstretch> @@ -705,7 +705,7 @@ <string>Chance of getting a female version of the species (negative is genderless)</string> </property> <property name="behavior" > - <enum>Sigmodr::Widgets::FractionWidget::Proper</enum> + <enum>Sigmodr::CoreWidgets::FractionWidget::Proper</enum> </property> </widget> </item> @@ -798,7 +798,7 @@ </property> <layout class="QGridLayout" > <item row="0" column="0" > - <widget class="Sigmodr::Widgets::ScriptWidget" name="varEvolution" > + <widget class="Sigmodr::CoreWidgets::ScriptWidget" name="varEvolution" > <property name="toolTip" > <string>The script that controls how the species evolves</string> </property> @@ -1003,14 +1003,14 @@ <container>1</container> </customwidget> <customwidget> - <class>Sigmodr::Widgets::FractionWidget</class> + <class>Sigmodr::CoreWidgets::FractionWidget</class> <extends>QWidget</extends> - <header>FractionWidget.h</header> + <header location="global" >sigmodr/corewidgets/FractionWidget.h</header> </customwidget> <customwidget> - <class>Sigmodr::Widgets::ScriptWidget</class> + <class>Sigmodr::CoreWidgets::ScriptWidget</class> <extends>QWidget</extends> - <header>ScriptWidget.h</header> + <header location="global" >sigmodr/corewidgets/ScriptWidget.h</header> </customwidget> </customwidgets> <tabstops> diff --git a/sigmodr/widgets/gui/status.ui b/sigmodr/widgets/gui/status.ui index bffe8cf0..80b6180a 100644 --- a/sigmodr/widgets/gui/status.ui +++ b/sigmodr/widgets/gui/status.ui @@ -38,7 +38,7 @@ </property> <layout class="QGridLayout" > <item row="0" column="0" > - <widget class="Sigmodr::Widgets::ScriptWidget" name="varBattleScript" > + <widget class="Sigmodr::CoreWidgets::ScriptWidget" name="varBattleScript" > <property name="toolTip" > <string>The script that controls how the status works in battle</string> </property> @@ -60,7 +60,7 @@ </property> <layout class="QGridLayout" > <item row="0" column="0" > - <widget class="Sigmodr::Widgets::ScriptWidget" name="varWorldScript" > + <widget class="Sigmodr::CoreWidgets::ScriptWidget" name="varWorldScript" > <property name="toolTip" > <string>The script that controls how the status works in the overworld</string> </property> @@ -84,9 +84,9 @@ <header location="global" >KLineEdit</header> </customwidget> <customwidget> - <class>Sigmodr::Widgets::ScriptWidget</class> + <class>Sigmodr::CoreWidgets::ScriptWidget</class> <extends>QWidget</extends> - <header>ScriptWidget.h</header> + <header location="global" >sigmodr/corewidgets/ScriptWidget.h</header> </customwidget> </customwidgets> <tabstops> diff --git a/sigmodr/widgets/gui/tile.ui b/sigmodr/widgets/gui/tile.ui index eb70a2bc..a4cc7aca 100644 --- a/sigmodr/widgets/gui/tile.ui +++ b/sigmodr/widgets/gui/tile.ui @@ -67,7 +67,7 @@ </property> <layout class="QGridLayout" > <item row="0" column="0" > - <widget class="Sigmodr::Widgets::ScriptWidget" name="varScript" > + <widget class="Sigmodr::CoreWidgets::ScriptWidget" name="varScript" > <property name="toolTip" > <string>The script that is run for this tile</string> </property> @@ -91,9 +91,9 @@ <header location="global" >KLineEdit</header> </customwidget> <customwidget> - <class>Sigmodr::Widgets::ScriptWidget</class> + <class>Sigmodr::CoreWidgets::ScriptWidget</class> <extends>QWidget</extends> - <header>ScriptWidget.h</header> + <header location="global" >sigmodr/corewidgets/ScriptWidget.h</header> </customwidget> </customwidgets> <tabstops> diff --git a/sigmodr/widgets/gui/time.ui b/sigmodr/widgets/gui/time.ui index d8e57f63..f894bdde 100644 --- a/sigmodr/widgets/gui/time.ui +++ b/sigmodr/widgets/gui/time.ui @@ -76,7 +76,7 @@ </property> <layout class="QGridLayout" > <item row="0" column="0" > - <widget class="Sigmodr::Widgets::ScriptWidget" name="varScript" > + <widget class="Sigmodr::CoreWidgets::ScriptWidget" name="varScript" > <property name="toolTip" > <string>The script that gets triggered when the time changes</string> </property> @@ -100,9 +100,9 @@ <header location="global" >KLineEdit</header> </customwidget> <customwidget> - <class>Sigmodr::Widgets::ScriptWidget</class> + <class>Sigmodr::CoreWidgets::ScriptWidget</class> <extends>QWidget</extends> - <header>ScriptWidget.h</header> + <header location="global" >sigmodr/corewidgets/ScriptWidget.h</header> </customwidget> </customwidgets> <tabstops> diff --git a/sigmodr/widgets/gui/type.ui b/sigmodr/widgets/gui/type.ui index 137bc74e..ef046220 100644 --- a/sigmodr/widgets/gui/type.ui +++ b/sigmodr/widgets/gui/type.ui @@ -45,7 +45,7 @@ </widget> </item> <item row="1" column="1" > - <widget class="Sigmodr::Widgets::FractionWidget" name="varSTAB" > + <widget class="Sigmodr::CoreWidgets::FractionWidget" name="varSTAB" > <property name="toolTip" > <string>Multiplier for species with this type for using a move of this type</string> </property> @@ -56,7 +56,7 @@ <string>Multiplier for species with this type for using a move of this type</string> </property> <property name="behavior" > - <enum>Sigmodr::Widgets::FractionWidget::Improper</enum> + <enum>Sigmodr::CoreWidgets::FractionWidget::Improper</enum> </property> </widget> </item> @@ -82,9 +82,9 @@ <header location="global" >KLineEdit</header> </customwidget> <customwidget> - <class>Sigmodr::Widgets::FractionWidget</class> + <class>Sigmodr::CoreWidgets::FractionWidget</class> <extends>QWidget</extends> - <header>FractionWidget.h</header> + <header location="global" >sigmodr/corewidgets/FractionWidget.h</header> </customwidget> </customwidgets> <tabstops> diff --git a/sigmodr/widgets/gui/weather.ui b/sigmodr/widgets/gui/weather.ui index 65544b21..8ecb0c98 100644 --- a/sigmodr/widgets/gui/weather.ui +++ b/sigmodr/widgets/gui/weather.ui @@ -38,7 +38,7 @@ </property> <layout class="QGridLayout" > <item row="0" column="0" > - <widget class="Sigmodr::Widgets::ScriptWidget" name="varScript" > + <widget class="Sigmodr::CoreWidgets::ScriptWidget" name="varScript" > <property name="toolTip" > <string>The script that controls the effects of the weather</string> </property> @@ -62,9 +62,9 @@ <header location="global" >KLineEdit</header> </customwidget> <customwidget> - <class>Sigmodr::Widgets::ScriptWidget</class> + <class>Sigmodr::CoreWidgets::ScriptWidget</class> <extends>QWidget</extends> - <header>ScriptWidget.h</header> + <header location="global" >sigmodr/corewidgets/ScriptWidget.h</header> </customwidget> </customwidgets> <tabstops> diff --git a/sigmodr/widgets/gui/widgetsui.qrc b/sigmodr/widgets/gui/widgetsui.qrc index f94eafea..02a9cc2c 100644 --- a/sigmodr/widgets/gui/widgetsui.qrc +++ b/sigmodr/widgets/gui/widgetsui.qrc @@ -6,7 +6,6 @@ <file>badge.ui</file> <file>coinlist.ui</file> <file>egggroup.ui</file> - <file>fraction.ui</file> <file>game.ui</file> <file>globalscript.ui</file> <file>item.ui</file> @@ -21,7 +20,6 @@ <file>move.ui</file> <file>nature.ui</file> <file>rules.ui</file> - <file>script.ui</file> <file>skin.ui</file> <file>sound.ui</file> <file>species.ui</file> |