diff options
40 files changed, 99 insertions, 1711 deletions
@@ -1,4 +1,13 @@ ----------------- +Rev: 84 +Date: 25 February 2008 +User: MathStuf +----------------- +[FIX] Cleaned up .ui files +[FIX] setGui calls looking for (non-existant) images no longer pops up a BugCatcher +[FIX] Tree selecting less annoying + +----------------- Rev: 83 Date: 25 February 2008 User: MathStuf diff --git a/pokemodr/BadgeUI.cpp b/pokemodr/BadgeUI.cpp index d180ffa7..b53d4f49 100644 --- a/pokemodr/BadgeUI.cpp +++ b/pokemodr/BadgeUI.cpp @@ -63,7 +63,6 @@ void BadgeUI::setGui() } catch (OpenException& e) { - BugCatcher::report(e); } try { @@ -71,7 +70,6 @@ void BadgeUI::setGui() } catch (OpenException& e) { - BugCatcher::report(e); } varMultiplierNum->setValue(badge_mod->getStat(varStat->currentIndex()).getNum()); varMultiplierDenom->setValue(badge_mod->getStat(varStat->currentIndex()).getDenom()); diff --git a/pokemodr/PokeModrUI.cpp b/pokemodr/PokeModrUI.cpp index acef2ef4..a23f6072 100644 --- a/pokemodr/PokeModrUI.cpp +++ b/pokemodr/PokeModrUI.cpp @@ -437,58 +437,59 @@ void PokeModrUI::on_splitter_splitterMoved() config.writeEntry("panelWidth", splitter->sizes()[1]); } -void PokeModrUI::on_treePokemod_itemSelectionChanged() +void PokeModrUI::on_treePokemod_currentItemChanged(QTreeWidgetItem* current, QTreeWidgetItem* previous) { - QTreeWidgetItem* cur = treePokemod->currentItem(); - PokeModTreeItem* selected = static_cast<PokeModTreeItem*>(treePokemod->selectedItems()[0]); - if (selected->getObject()) + Object* o = static_cast<PokeModTreeItem*>(current)->getObject(); + if (!o) { - if (formPanel->widget()) - { - if (!static_cast<ObjectUI*>(formPanel->widget())->close()) - return; - } - Object* o = selected->getObject(); - QString name(o->getClassName()); - ObjectUI* widget = NULL; + if (previous) + treePokemod->setCurrentItem(previous); + return; + } + if (formPanel->widget()) + { + if (o == static_cast<ObjectUI*>(formPanel->widget())->getOriginal()) + return; + if (!static_cast<ObjectUI*>(formPanel->widget())->close()) + return; + } + QString name(o->getClassName()); + ObjectUI* widget = NULL; #define IF_IS_CLASS(class) if (name == #class) widget = new class##UI(static_cast<class*>(o), formPanel); - IF_IS_CLASS(Ability) -// else IF_IS_CLASS(AbilityEffect) - else IF_IS_CLASS(Author) - else IF_IS_CLASS(Badge) - else IF_IS_CLASS(CoinList) - else IF_IS_CLASS(CoinListObject) -// else IF_IS_CLASS(Dialog) - else IF_IS_CLASS(EggGroup) - else IF_IS_CLASS(Item) -// else IF_IS_CLASS(ItemEffect) - else IF_IS_CLASS(ItemType) - else IF_IS_CLASS(Map) -// else IF_IS_CLASS(MapEffect) -// else IF_IS_CLASS(MapTrainer) - else IF_IS_CLASS(MapTrainerTeamMember) - else IF_IS_CLASS(MapWarp) - else IF_IS_CLASS(MapWildList) - else IF_IS_CLASS(MapWildListEncounter) - else IF_IS_CLASS(Move) -// else IF_IS_CLASS(MoveEffect) - else IF_IS_CLASS(Nature) - else IF_IS_CLASS(Pokemod) - else IF_IS_CLASS(Rules) - else IF_IS_CLASS(Species) - else IF_IS_CLASS(SpeciesAbility) - else IF_IS_CLASS(SpeciesEvolution) - else IF_IS_CLASS(SpeciesItem) - else IF_IS_CLASS(SpeciesMove) - else IF_IS_CLASS(Store) - else IF_IS_CLASS(Tile) - else IF_IS_CLASS(Time) - else IF_IS_CLASS(Type) + IF_IS_CLASS(Ability) +// else IF_IS_CLASS(AbilityEffect) + else IF_IS_CLASS(Author) + else IF_IS_CLASS(Badge) + else IF_IS_CLASS(CoinList) + else IF_IS_CLASS(CoinListObject) +// else IF_IS_CLASS(Dialog) + else IF_IS_CLASS(EggGroup) + else IF_IS_CLASS(Item) +// else IF_IS_CLASS(ItemEffect) + else IF_IS_CLASS(ItemType) + else IF_IS_CLASS(Map) +// else IF_IS_CLASS(MapEffect) +// else IF_IS_CLASS(MapTrainer) + else IF_IS_CLASS(MapTrainerTeamMember) + else IF_IS_CLASS(MapWarp) + else IF_IS_CLASS(MapWildList) + else IF_IS_CLASS(MapWildListEncounter) + else IF_IS_CLASS(Move) +// else IF_IS_CLASS(MoveEffect) + else IF_IS_CLASS(Nature) + else IF_IS_CLASS(Pokemod) + else IF_IS_CLASS(Rules) + else IF_IS_CLASS(Species) + else IF_IS_CLASS(SpeciesAbility) + else IF_IS_CLASS(SpeciesEvolution) + else IF_IS_CLASS(SpeciesItem) + else IF_IS_CLASS(SpeciesMove) + else IF_IS_CLASS(Store) + else IF_IS_CLASS(Tile) + else IF_IS_CLASS(Time) + else IF_IS_CLASS(Type) #undef IF_IS_CLASS - formPanel->setWidget(widget); - connect(widget, SIGNAL(changed(bool)), selected, SLOT(updateName())); - formPanel->show(); - } - else - treePokemod->setCurrentItem(cur); + formPanel->setWidget(widget); + connect(widget, SIGNAL(changed(bool)), static_cast<PokeModTreeItem*>(current), SLOT(updateName())); + formPanel->show(); } diff --git a/pokemodr/PokeModrUI.h b/pokemodr/PokeModrUI.h index 0f0cad11..44e6a96d 100644 --- a/pokemodr/PokeModrUI.h +++ b/pokemodr/PokeModrUI.h @@ -62,7 +62,7 @@ class PokeModrUI : public KMainWindow, private Ui::formPokeModr void on_actionPaste_triggered(); void on_actionPreferences_triggered(); void on_splitter_splitterMoved(); - void on_treePokemod_itemSelectionChanged(); + void on_treePokemod_currentItemChanged(QTreeWidgetItem* current, QTreeWidgetItem* previous); private: void rebuildTree(); diff --git a/pokemodr/PokemodUI.cpp b/pokemodr/PokemodUI.cpp index 712aa4b1..35e78162 100644 --- a/pokemodr/PokemodUI.cpp +++ b/pokemodr/PokemodUI.cpp @@ -111,7 +111,6 @@ void PokemodUI::setGui() } catch (OpenException& e) { - BugCatcher::report(e); } try { @@ -119,7 +118,6 @@ void PokemodUI::setGui() } catch (OpenException& e) { - BugCatcher::report(e); } try { @@ -127,7 +125,6 @@ void PokemodUI::setGui() } catch (OpenException& e) { - BugCatcher::report(e); } try { @@ -135,7 +132,6 @@ void PokemodUI::setGui() } catch (OpenException& e) { - BugCatcher::report(e); } try { @@ -143,7 +139,6 @@ void PokemodUI::setGui() } catch (OpenException& e) { - BugCatcher::report(e); } try { @@ -151,7 +146,6 @@ void PokemodUI::setGui() } catch (OpenException& e) { - BugCatcher::report(e); } } diff --git a/pokemodr/SpeciesUI.cpp b/pokemodr/SpeciesUI.cpp index be3a81f2..158f896b 100644 --- a/pokemodr/SpeciesUI.cpp +++ b/pokemodr/SpeciesUI.cpp @@ -123,7 +123,6 @@ void SpeciesUI::setGui() } catch (OpenException& e) { - BugCatcher::report(e); } try { @@ -131,7 +130,6 @@ void SpeciesUI::setGui() } catch (OpenException& e) { - BugCatcher::report(e); } if (species->getPokemod()->getRules()->getGenderAllowed()) { @@ -141,7 +139,6 @@ void SpeciesUI::setGui() } catch (OpenException& e) { - BugCatcher::report(e); } try { @@ -149,7 +146,6 @@ void SpeciesUI::setGui() } catch (OpenException& e) { - BugCatcher::report(e); } } try @@ -158,7 +154,6 @@ void SpeciesUI::setGui() } catch (OpenException& e) { - BugCatcher::report(e); } boxGenderChance->setChecked(species_mod->getGenderFactor().getNum() == -1); varGenderChanceNum->setValue(species_mod->getGenderFactor().getNum()); diff --git a/pokemodr/TileUI.cpp b/pokemodr/TileUI.cpp index fe8e4c58..15dcead4 100644 --- a/pokemodr/TileUI.cpp +++ b/pokemodr/TileUI.cpp @@ -73,7 +73,6 @@ void TileUI::setGui() } catch (OpenException& e) { - BugCatcher::report(e); } for (int i = 0; i < varAccessibility->count(); ++i) varAccessibility->item(i)->setSelected(tile_mod->getFrom(i)); diff --git a/pokemodr/gui/ability.ui b/pokemodr/gui/ability.ui index fbb8e1cf..8dd6e7c7 100644 --- a/pokemodr/gui/ability.ui +++ b/pokemodr/gui/ability.ui @@ -1,23 +1,9 @@ <ui version="4.0" > <class>formAbility</class> <widget class="QWidget" name="formAbility" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>191</width> - <height>159</height> - </rect> - </property> <layout class="QVBoxLayout" > <item> <widget class="QGroupBox" name="boxButtons" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="title" > - <string/> - </property> <layout class="QHBoxLayout" > <item> <widget class="KPushButton" name="buttonApply" > @@ -61,19 +47,6 @@ </layout> </widget> </item> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" > - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> </layout> </widget> <customwidgets> diff --git a/pokemodr/gui/abilityeffect.ui b/pokemodr/gui/abilityeffect.ui index fea16b67..729d1e42 100644 --- a/pokemodr/gui/abilityeffect.ui +++ b/pokemodr/gui/abilityeffect.ui @@ -1,23 +1,9 @@ <ui version="4.0" > <class>formAbilityEffect</class> <widget class="QWidget" name="formAbilityEffect" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>254</width> - <height>942</height> - </rect> - </property> <layout class="QVBoxLayout" > <item> <widget class="QGroupBox" name="boxButtons" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="title" > - <string/> - </property> <layout class="QHBoxLayout" > <item> <widget class="KPushButton" name="buttonApply" > @@ -89,12 +75,6 @@ <property name="toolTip" > <string>Effect the ability has</string> </property> - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> - </property> </widget> </item> <item> @@ -108,12 +88,6 @@ <property name="toolTip" > <string>Value 1</string> </property> - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> - </property> </widget> </item> </layout> @@ -130,12 +104,6 @@ <property name="toolTip" > <string>Value 2</string> </property> - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> - </property> </widget> </item> </layout> @@ -174,12 +142,6 @@ <property name="toolTip" > <string>What triggers the effect to happen</string> </property> - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> - </property> </widget> </item> <item> @@ -193,12 +155,6 @@ <property name="toolTip" > <string>Trigger value 1</string> </property> - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> - </property> </widget> </item> </layout> @@ -246,19 +202,6 @@ </layout> </widget> </item> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" > - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> </layout> </widget> <customwidgets> diff --git a/pokemodr/gui/author.ui b/pokemodr/gui/author.ui index 6a913138..3276152f 100644 --- a/pokemodr/gui/author.ui +++ b/pokemodr/gui/author.ui @@ -1,23 +1,9 @@ <ui version="4.0" > <class>formAuthor</class> <widget class="QWidget" name="formAuthor" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>191</width> - <height>311</height> - </rect> - </property> <layout class="QVBoxLayout" > <item> <widget class="QGroupBox" name="boxButtons" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="title" > - <string/> - </property> <layout class="QHBoxLayout" > <item> <widget class="KPushButton" name="buttonApply" > @@ -99,19 +85,6 @@ </layout> </widget> </item> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" > - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> </layout> </widget> <customwidgets> diff --git a/pokemodr/gui/badge.ui b/pokemodr/gui/badge.ui index e168f6fa..7d18f367 100644 --- a/pokemodr/gui/badge.ui +++ b/pokemodr/gui/badge.ui @@ -1,23 +1,9 @@ <ui version="4.0" > <class>formBadge</class> <widget class="QWidget" name="formBadge" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>244</width> - <height>722</height> - </rect> - </property> <layout class="QVBoxLayout" > <item> <widget class="QGroupBox" name="boxButtons" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="title" > - <string/> - </property> <layout class="QHBoxLayout" > <item> <widget class="KPushButton" name="buttonApply" > @@ -91,12 +77,6 @@ <property name="orientation" > <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > - <size> - <width>40</width> - <height>20</height> - </size> - </property> </spacer> </item> <item> @@ -114,12 +94,6 @@ <property name="orientation" > <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > - <size> - <width>40</width> - <height>20</height> - </size> - </property> </spacer> </item> <item> @@ -137,12 +111,6 @@ <property name="orientation" > <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > - <size> - <width>40</width> - <height>20</height> - </size> - </property> </spacer> </item> </layout> @@ -159,12 +127,6 @@ <property name="toolTip" > <string>The stat the badge boosts</string> </property> - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> - </property> </widget> </item> <item> @@ -225,19 +187,6 @@ </layout> </widget> </item> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" > - <size> - <width>218</width> - <height>16</height> - </size> - </property> - </spacer> - </item> </layout> </widget> <customwidgets> diff --git a/pokemodr/gui/coinlist.ui b/pokemodr/gui/coinlist.ui index 4298c9d2..523a9446 100644 --- a/pokemodr/gui/coinlist.ui +++ b/pokemodr/gui/coinlist.ui @@ -1,23 +1,9 @@ <ui version="4.0" > <class>formCoinList</class> <widget class="QWidget" name="formCoinList" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>191</width> - <height>235</height> - </rect> - </property> <layout class="QVBoxLayout" > <item> <widget class="QGroupBox" name="boxButtons" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="title" > - <string/> - </property> <layout class="QHBoxLayout" > <item> <widget class="KPushButton" name="buttonApply" > @@ -69,30 +55,14 @@ <layout class="QHBoxLayout" > <item> <widget class="KComboBox" name="varValue" > - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> + <property name="toolTip" > + <string>The type of coin needed to buy items</string> </property> </widget> </item> </layout> </widget> </item> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" > - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> </layout> </widget> <customwidgets> diff --git a/pokemodr/gui/coinlistobject.ui b/pokemodr/gui/coinlistobject.ui index 8fe715a0..2c512f96 100644 --- a/pokemodr/gui/coinlistobject.ui +++ b/pokemodr/gui/coinlistobject.ui @@ -1,23 +1,9 @@ <ui version="4.0" > <class>formCoinListObject</class> <widget class="QWidget" name="formCoinListObject" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>226</width> - <height>393</height> - </rect> - </property> <layout class="QVBoxLayout" > <item> <widget class="QGroupBox" name="boxButtons" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="title" > - <string/> - </property> <layout class="QHBoxLayout" > <item> <widget class="KPushButton" name="buttonApply" > @@ -53,12 +39,6 @@ <property name="toolTip" > <string>Type of object</string> </property> - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> - </property> </widget> </item> <item> @@ -72,12 +52,6 @@ <property name="toolTip" > <string>Object to be sold</string> </property> - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> - </property> </widget> </item> </layout> @@ -124,19 +98,6 @@ </layout> </widget> </item> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" > - <size> - <width>218</width> - <height>16</height> - </size> - </property> - </spacer> - </item> </layout> </widget> <customwidgets> diff --git a/pokemodr/gui/dialog.ui b/pokemodr/gui/dialog.ui index d3963acb..94a2e9b3 100644 --- a/pokemodr/gui/dialog.ui +++ b/pokemodr/gui/dialog.ui @@ -1,23 +1,9 @@ <ui version="4.0" > <class>formDialog</class> <widget class="QWidget" name="formDialog" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>191</width> - <height>266</height> - </rect> - </property> <layout class="QVBoxLayout" > <item> <widget class="QGroupBox" name="boxButtons" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="title" > - <string/> - </property> <layout class="QHBoxLayout" > <item> <widget class="KPushButton" name="buttonApply" > @@ -69,30 +55,11 @@ <property name="toolTip" > <string>Insert a command into the dialog</string> </property> - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> - </property> </widget> </item> </layout> </widget> </item> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" > - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> </layout> </widget> <customwidgets> diff --git a/pokemodr/gui/egggroup.ui b/pokemodr/gui/egggroup.ui index f1c22099..1fad2f23 100644 --- a/pokemodr/gui/egggroup.ui +++ b/pokemodr/gui/egggroup.ui @@ -1,23 +1,9 @@ <ui version="4.0" > <class>formEggGroup</class> <widget class="QWidget" name="formEggGroup" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>191</width> - <height>159</height> - </rect> - </property> <layout class="QVBoxLayout" > <item> <widget class="QGroupBox" name="boxButtons" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="title" > - <string/> - </property> <layout class="QHBoxLayout" > <item> <widget class="KPushButton" name="buttonApply" > @@ -61,19 +47,6 @@ </layout> </widget> </item> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" > - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> </layout> </widget> <customwidgets> diff --git a/pokemodr/gui/item.ui b/pokemodr/gui/item.ui index ec0294c1..e71ab150 100644 --- a/pokemodr/gui/item.ui +++ b/pokemodr/gui/item.ui @@ -1,23 +1,9 @@ <ui version="4.0" > <class>formItem</class> <widget class="QWidget" name="formItem" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>226</width> - <height>468</height> - </rect> - </property> <layout class="QVBoxLayout" > <item> <widget class="QGroupBox" name="boxButtons" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="title" > - <string/> - </property> <layout class="QHBoxLayout" > <item> <widget class="KPushButton" name="buttonApply" > @@ -72,7 +58,6 @@ <property name="checkable" > <bool>true</bool> </property> - <layout class="QHBoxLayout" /> </widget> </item> <item> @@ -86,12 +71,6 @@ <property name="toolTip" > <string>Type of item</string> </property> - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> - </property> </widget> </item> </layout> @@ -132,19 +111,6 @@ </layout> </widget> </item> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" > - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> </layout> </widget> <customwidgets> diff --git a/pokemodr/gui/itemeffect.ui b/pokemodr/gui/itemeffect.ui index d0428b60..31f6d2a2 100644 --- a/pokemodr/gui/itemeffect.ui +++ b/pokemodr/gui/itemeffect.ui @@ -1,23 +1,9 @@ <ui version="4.0" > <class>formItemEffect</class> <widget class="QWidget" name="formItemEffect" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>244</width> - <height>704</height> - </rect> - </property> <layout class="QVBoxLayout" > <item> <widget class="QGroupBox" name="boxButtons" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="title" > - <string/> - </property> <layout class="QHBoxLayout" > <item> <widget class="KPushButton" name="buttonApply" > @@ -92,12 +78,6 @@ <property name="toolTip" > <string>Effect</string> </property> - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> - </property> </widget> </item> <item> @@ -130,12 +110,6 @@ <property name="toolTip" > <string>Value 2</string> </property> - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> - </property> </widget> </item> </layout> @@ -152,12 +126,6 @@ <property name="toolTip" > <string>Value 3</string> </property> - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> - </property> </widget> </item> </layout> @@ -205,19 +173,6 @@ </layout> </widget> </item> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" > - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> </layout> </widget> <customwidgets> diff --git a/pokemodr/gui/itemtype.ui b/pokemodr/gui/itemtype.ui index b2e0003a..038cc389 100644 --- a/pokemodr/gui/itemtype.ui +++ b/pokemodr/gui/itemtype.ui @@ -1,23 +1,9 @@ <ui version="4.0" > <class>formItemType</class> <widget class="QWidget" name="formItemType" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>226</width> - <height>317</height> - </rect> - </property> <layout class="QVBoxLayout" > <item> <widget class="QGroupBox" name="boxButtons" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="title" > - <string/> - </property> <layout class="QHBoxLayout" > <item> <widget class="KPushButton" name="buttonApply" > @@ -53,9 +39,6 @@ <property name="toolTip" > <string>Name of the item type</string> </property> - <property name="dragEnabled" > - <bool>false</bool> - </property> <property name="showClearButton" stdset="0" > <bool>true</bool> </property> @@ -102,19 +85,6 @@ </layout> </widget> </item> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" > - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> </layout> </widget> <customwidgets> diff --git a/pokemodr/gui/map.ui b/pokemodr/gui/map.ui index 45c53412..f36ac62d 100644 --- a/pokemodr/gui/map.ui +++ b/pokemodr/gui/map.ui @@ -1,23 +1,9 @@ <ui version="4.0" > <class>formMap</class> <widget class="QWidget" name="formMap" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>514</width> - <height>656</height> - </rect> - </property> <layout class="QVBoxLayout" > <item> <widget class="QGroupBox" name="boxButtons" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="title" > - <string/> - </property> <layout class="QHBoxLayout" > <item> <widget class="KPushButton" name="buttonApply" > @@ -69,21 +55,12 @@ <property name="checkable" > <bool>true</bool> </property> - <property name="checked" > - <bool>false</bool> - </property> <layout class="QHBoxLayout" > <item> <widget class="KComboBox" name="varFlyWarp" > <property name="toolTip" > <string>The destination when flown to the map</string> </property> - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> - </property> </widget> </item> </layout> @@ -100,12 +77,6 @@ <property name="toolTip" > <string>They type of map</string> </property> - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> - </property> </widget> </item> </layout> @@ -118,17 +89,7 @@ </property> <layout class="QGridLayout" > <item rowspan="6" row="0" column="0" > - <widget class="QTableView" name="varTilemap" > - <property name="minimumSize" > - <size> - <width>0</width> - <height>288</height> - </size> - </property> - <property name="wordWrap" > - <bool>false</bool> - </property> - </widget> + <widget class="QTableView" name="varTilemap" /> </item> <item row="0" column="1" > <widget class="KPushButton" name="buttonAddRow" > @@ -175,19 +136,6 @@ </layout> </widget> </item> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" > - <size> - <width>506</width> - <height>16</height> - </size> - </property> - </spacer> - </item> </layout> </widget> <customwidgets> diff --git a/pokemodr/gui/mapeffect.ui b/pokemodr/gui/mapeffect.ui index 86c6ed0a..ae017d76 100644 --- a/pokemodr/gui/mapeffect.ui +++ b/pokemodr/gui/mapeffect.ui @@ -1,23 +1,9 @@ <ui version="4.0" > <class>formMapEffect</class> <widget class="QWidget" name="formMapEffect" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>290</width> - <height>1047</height> - </rect> - </property> <layout class="QVBoxLayout" > <item> <widget class="QGroupBox" name="boxButtons" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="title" > - <string/> - </property> <layout class="QHBoxLayout" > <item> <widget class="KPushButton" name="buttonApply" > @@ -107,18 +93,12 @@ <property name="checkable" > <bool>true</bool> </property> - <property name="checked" > - <bool>false</bool> - </property> <layout class="QHBoxLayout" > <item> <widget class="KIntNumInput" name="varExistFlag" > <property name="toolTip" > <string>flag which determines if the effect is on the overworld</string> </property> - <property name="label" > - <string/> - </property> <property name="minimum" > <number>0</number> </property> @@ -148,16 +128,10 @@ <property name="orientation" > <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > - <size> - <width>40</width> - <height>20</height> - </size> - </property> </spacer> </item> <item> - <widget class="KIconButton" name="varSkin" > + <widget class="KPushButton" name="kpushbutton" > <property name="minimumSize" > <size> <width>192</width> @@ -174,12 +148,6 @@ <property name="orientation" > <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > - <size> - <width>40</width> - <height>20</height> - </size> - </property> </spacer> </item> </layout> @@ -196,15 +164,6 @@ <property name="toolTip" > <string>The effect the effect has</string> </property> - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> - </property> - <property name="autoCompletion" > - <bool>false</bool> - </property> </widget> </item> <item> @@ -218,12 +177,6 @@ <property name="toolTip" > <string>Value 1</string> </property> - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> - </property> <property name="autoCompletion" > <bool>false</bool> </property> @@ -243,15 +196,6 @@ <property name="toolTip" > <string>Value 2</string> </property> - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> - </property> - <property name="autoCompletion" > - <bool>false</bool> - </property> </widget> </item> </layout> @@ -271,15 +215,6 @@ <property name="toolTip" > <string>The direction the effect faces</string> </property> - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> - </property> - <property name="autoCompletion" > - <bool>false</bool> - </property> </widget> </item> </layout> @@ -325,30 +260,11 @@ <property name="toolTip" > <string>The dialog to use when talked to</string> </property> - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> - </property> </widget> </item> </layout> </widget> </item> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" > - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> </layout> </widget> <customwidgets> @@ -358,11 +274,6 @@ <header>kcombobox.h</header> </customwidget> <customwidget> - <class>KIconButton</class> - <extends>QPushButton</extends> - <header>kicondialog.h</header> - </customwidget> - <customwidget> <class>KIntNumInput</class> <extends>QWidget</extends> <header>knuminput.h</header> diff --git a/pokemodr/gui/maptrainer.ui b/pokemodr/gui/maptrainer.ui index d4a721d1..15b53c17 100644 --- a/pokemodr/gui/maptrainer.ui +++ b/pokemodr/gui/maptrainer.ui @@ -1,26 +1,9 @@ <ui version="4.0" > <class>formMapTrainer</class> <widget class="QWidget" name="formMapTrainer" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>290</width> - <height>1227</height> - </rect> - </property> - <property name="windowTitle" > - <string/> - </property> <layout class="QVBoxLayout" > <item> <widget class="QGroupBox" name="boxButtons" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="title" > - <string/> - </property> <layout class="QHBoxLayout" > <item> <widget class="KPushButton" name="buttonApply" > @@ -104,25 +87,16 @@ <property name="title" > <string>Skin</string> </property> - <property name="checkable" > - <bool>false</bool> - </property> <layout class="QHBoxLayout" > <item> <spacer> <property name="orientation" > <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > - <size> - <width>40</width> - <height>20</height> - </size> - </property> </spacer> </item> <item> - <widget class="KIconButton" name="varSkin" > + <widget class="KPushButton" name="varSkin" > <property name="minimumSize" > <size> <width>192</width> @@ -139,12 +113,6 @@ <property name="orientation" > <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > - <size> - <width>40</width> - <height>20</height> - </size> - </property> </spacer> </item> </layout> @@ -180,12 +148,6 @@ <property name="toolTip" > <string>Direction the trainer faces</string> </property> - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> - </property> </widget> </item> </layout> @@ -221,12 +183,6 @@ <property name="toolTip" > <string>The AI scheme used</string> </property> - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> - </property> </widget> </item> </layout> @@ -240,9 +196,6 @@ <property name="checkable" > <bool>true</bool> </property> - <property name="checked" > - <bool>false</bool> - </property> <layout class="QHBoxLayout" > <item> <widget class="KIntNumInput" name="varFlag" > @@ -284,12 +237,6 @@ <property name="toolTip" > <string>The dialog used when talked to in the overworld</string> </property> - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> - </property> </widget> </item> </layout> @@ -306,12 +253,6 @@ <property name="toolTip" > <string>The dialog used when the trainer loses</string> </property> - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> - </property> </widget> </item> </layout> @@ -328,12 +269,6 @@ <property name="toolTip" > <string>The dialog used when the trainer wins</string> </property> - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> - </property> </widget> </item> </layout> @@ -353,30 +288,11 @@ <property name="toolTip" > <string>The lead team member</string> </property> - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> - </property> </widget> </item> </layout> </widget> </item> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" > - <size> - <width>282</width> - <height>16</height> - </size> - </property> - </spacer> - </item> </layout> </widget> <customwidgets> @@ -386,11 +302,6 @@ <header>kcombobox.h</header> </customwidget> <customwidget> - <class>KIconButton</class> - <extends>QPushButton</extends> - <header>kicondialog.h</header> - </customwidget> - <customwidget> <class>KIntNumInput</class> <extends>QWidget</extends> <header>knuminput.h</header> diff --git a/pokemodr/gui/maptrainerteammember.ui b/pokemodr/gui/maptrainerteammember.ui index cb0ce6cb..0df51ed4 100644 --- a/pokemodr/gui/maptrainerteammember.ui +++ b/pokemodr/gui/maptrainerteammember.ui @@ -1,26 +1,9 @@ <ui version="4.0" > <class>formMapTrainerTeamMember</class> <widget class="QWidget" name="formMapTrainerTeamMember" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>236</width> - <height>441</height> - </rect> - </property> - <property name="windowTitle" > - <string/> - </property> <layout class="QVBoxLayout" > <item> <widget class="QGroupBox" name="boxButtons" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="title" > - <string/> - </property> <layout class="QHBoxLayout" > <item> <widget class="KPushButton" name="buttonApply" > @@ -91,12 +74,6 @@ <property name="toolTip" > <string>Nature the team member has</string> </property> - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> - </property> </widget> </item> </layout> @@ -121,19 +98,6 @@ </layout> </widget> </item> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" > - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> </layout> </widget> <customwidgets> diff --git a/pokemodr/gui/mapwarp.ui b/pokemodr/gui/mapwarp.ui index 0bc0dde5..b9713f64 100644 --- a/pokemodr/gui/mapwarp.ui +++ b/pokemodr/gui/mapwarp.ui @@ -1,26 +1,9 @@ <ui version="4.0" > <class>formMapWarp</class> <widget class="QWidget" name="formMapWarp" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>329</width> - <height>1024</height> - </rect> - </property> - <property name="windowTitle" > - <string/> - </property> <layout class="QVBoxLayout" > <item> <widget class="QGroupBox" name="boxButtons" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="title" > - <string/> - </property> <layout class="QHBoxLayout" > <item> <widget class="KPushButton" name="buttonApply" > @@ -108,7 +91,7 @@ <item> <widget class="KListWidget" name="varActivation" > <property name="toolTip" > - <string>Directions, that when walked into FROM, the warp is activated</string> + <string>Directions, that when walked into from, the warp is activated</string> </property> </widget> </item> @@ -126,12 +109,6 @@ <property name="toolTip" > <string>Direction the warp pushes things when arrived at</string> </property> - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> - </property> </widget> </item> </layout> @@ -148,12 +125,6 @@ <property name="toolTip" > <string>The type of warp</string> </property> - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> - </property> </widget> </item> </layout> @@ -218,12 +189,6 @@ <property name="toolTip" > <string>Map the warp goes to</string> </property> - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> - </property> </widget> </item> <item> @@ -237,12 +202,6 @@ <property name="toolTip" > <string>Warp on the map the warp goes to</string> </property> - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> - </property> </widget> </item> </layout> @@ -259,9 +218,6 @@ <property name="checkable" > <bool>true</bool> </property> - <property name="checked" > - <bool>false</bool> - </property> <layout class="QHBoxLayout" > <item> <widget class="KIntNumInput" name="varFlag" > @@ -297,43 +253,11 @@ <property name="toolTip" > <string>The dialog to parse when the warp is activated</string> </property> - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> - </property> </widget> </item> </layout> </widget> </item> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" > - <size> - <width>282</width> - <height>16</height> - </size> - </property> - </spacer> - </item> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" > - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> </layout> </widget> <customwidgets> diff --git a/pokemodr/gui/mapwildlist.ui b/pokemodr/gui/mapwildlist.ui index 3a1f908c..24773c9d 100644 --- a/pokemodr/gui/mapwildlist.ui +++ b/pokemodr/gui/mapwildlist.ui @@ -1,26 +1,9 @@ <ui version="4.0" > <class>formMapWildList</class> <widget class="QWidget" name="formMapWildList" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>211</width> - <height>438</height> - </rect> - </property> - <property name="windowTitle" > - <string/> - </property> <layout class="QVBoxLayout" > <item> <widget class="QGroupBox" name="boxButtons" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="title" > - <string/> - </property> <layout class="QHBoxLayout" > <item> <widget class="KPushButton" name="buttonApply" > @@ -56,12 +39,6 @@ <property name="toolTip" > <string>Type of wild list</string> </property> - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> - </property> </widget> </item> <item> @@ -110,9 +87,6 @@ <property name="checkable" > <bool>true</bool> </property> - <property name="checked" > - <bool>false</bool> - </property> <layout class="QHBoxLayout" > <item> <widget class="KComboBox" name="varScope" > @@ -124,19 +98,6 @@ </layout> </widget> </item> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" > - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> </layout> </widget> <customwidgets> diff --git a/pokemodr/gui/mapwildlistencounter.ui b/pokemodr/gui/mapwildlistencounter.ui index e894b2de..27f66b6a 100644 --- a/pokemodr/gui/mapwildlistencounter.ui +++ b/pokemodr/gui/mapwildlistencounter.ui @@ -1,26 +1,9 @@ <ui version="4.0" > <class>formMapWildListEncounter</class> <widget class="QWidget" name="formMapWildListEncounter" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>226</width> - <height>317</height> - </rect> - </property> - <property name="windowTitle" > - <string/> - </property> <layout class="QVBoxLayout" > <item> <widget class="QGroupBox" name="boxButtons" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="title" > - <string/> - </property> <layout class="QHBoxLayout" > <item> <widget class="KPushButton" name="buttonApply" > @@ -56,12 +39,6 @@ <property name="toolTip" > <string>Species of the encounter</string> </property> - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> - </property> </widget> </item> </layout> @@ -105,19 +82,6 @@ </layout> </widget> </item> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" > - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> </layout> </widget> <customwidgets> diff --git a/pokemodr/gui/move.ui b/pokemodr/gui/move.ui index 86d8207a..3d84e53c 100644 --- a/pokemodr/gui/move.ui +++ b/pokemodr/gui/move.ui @@ -1,26 +1,9 @@ <ui version="4.0" > <class>formMove</class> <widget class="QWidget" name="formMove" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>244</width> - <height>1126</height> - </rect> - </property> - <property name="windowTitle" > - <string/> - </property> <layout class="QVBoxLayout" > <item> <widget class="QGroupBox" name="boxButtons" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="title" > - <string/> - </property> <layout class="QHBoxLayout" > <item> <widget class="KPushButton" name="buttonApply" > diff --git a/pokemodr/gui/moveeffect.ui b/pokemodr/gui/moveeffect.ui index f4365756..fcadca53 100644 --- a/pokemodr/gui/moveeffect.ui +++ b/pokemodr/gui/moveeffect.ui @@ -1,26 +1,9 @@ <ui version="4.0" > <class>formMoveEffect</class> <widget class="QWidget" name="formMoveEffect" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>244</width> - <height>766</height> - </rect> - </property> - <property name="windowTitle" > - <string/> - </property> <layout class="QVBoxLayout" > <item> <widget class="QGroupBox" name="boxButtons" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="title" > - <string/> - </property> <layout class="QHBoxLayout" > <item> <widget class="KPushButton" name="buttonApply" > @@ -91,12 +74,9 @@ </property> <layout class="QVBoxLayout" > <item> - <widget class="KComboBox" name="varEffect" > - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> + <widget class="KCombobox" name="varEffect" > + <property name="toolTip" > + <string>The effect</string> </property> </widget> </item> @@ -107,12 +87,9 @@ </property> <layout class="QHBoxLayout" > <item> - <widget class="KComboBox" name="varVal1" > - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> + <widget class="KCombobox" name="varVal1" > + <property name="toolTip" > + <string>Value 1 of the effect</string> </property> </widget> </item> @@ -126,12 +103,9 @@ </property> <layout class="QHBoxLayout" > <item> - <widget class="KComboBox" name="varVal2" > - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> + <widget class="KCombobox" name="varVal2" > + <property name="toolTip" > + <string>Value 2 of the effect</string> </property> </widget> </item> diff --git a/pokemodr/gui/nature.ui b/pokemodr/gui/nature.ui index d6e386f9..099bec8a 100644 --- a/pokemodr/gui/nature.ui +++ b/pokemodr/gui/nature.ui @@ -1,26 +1,9 @@ <ui version="4.0" > <class>formNature</class> <widget class="QWidget" name="formNature" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>244</width> - <height>504</height> - </rect> - </property> - <property name="windowTitle" > - <string/> - </property> <layout class="QVBoxLayout" > <item> <widget class="QGroupBox" name="boxButtons" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="title" > - <string/> - </property> <layout class="QHBoxLayout" > <item> <widget class="KPushButton" name="buttonApply" > @@ -72,12 +55,6 @@ <property name="toolTip" > <string>Stat the nature affects</string> </property> - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> - </property> </widget> </item> <item> @@ -141,19 +118,6 @@ </layout> </widget> </item> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" > - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> </layout> </widget> <customwidgets> diff --git a/pokemodr/gui/pokemod.ui b/pokemodr/gui/pokemod.ui index c6f9edd1..950c9e7f 100644 --- a/pokemodr/gui/pokemod.ui +++ b/pokemodr/gui/pokemod.ui @@ -1,23 +1,9 @@ <ui version="4.0" > <class>formPokemod</class> <widget class="QWidget" name="formPokemod" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>470</width> - <height>758</height> - </rect> - </property> <layout class="QVBoxLayout" > <item> <widget class="QGroupBox" name="boxButtons" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="title" > - <string/> - </property> <layout class="QHBoxLayout" > <item> <widget class="KPushButton" name="buttonApply" > @@ -45,7 +31,7 @@ <item> <widget class="KTabWidget" name="notebookPokemod" > <property name="currentIndex" > - <number>2</number> + <number>0</number> </property> <widget class="QWidget" name="tabGeneral" > <attribute name="title" > @@ -117,12 +103,6 @@ <property name="toolTip" > <string>Map the player starts on</string> </property> - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> - </property> </widget> </item> <item> @@ -136,12 +116,6 @@ <property name="toolTip" > <string>Warp the player starts on</string> </property> - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> - </property> </widget> </item> </layout> @@ -202,12 +176,6 @@ <property name="orientation" > <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" > - <size> - <width>20</width> - <height>40</height> - </size> - </property> </spacer> </item> </layout> @@ -223,29 +191,11 @@ <string>Walking</string> </property> <layout class="QHBoxLayout" > - <property name="leftMargin" > - <number>4</number> - </property> - <property name="topMargin" > - <number>4</number> - </property> - <property name="rightMargin" > - <number>4</number> - </property> - <property name="bottomMargin" > - <number>4</number> - </property> <item> <spacer> <property name="orientation" > <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > - <size> - <width>40</width> - <height>20</height> - </size> - </property> </spacer> </item> <item> @@ -263,12 +213,6 @@ <property name="orientation" > <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > - <size> - <width>40</width> - <height>20</height> - </size> - </property> </spacer> </item> </layout> @@ -285,12 +229,6 @@ <property name="orientation" > <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > - <size> - <width>40</width> - <height>20</height> - </size> - </property> </spacer> </item> <item> @@ -308,12 +246,6 @@ <property name="orientation" > <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > - <size> - <width>40</width> - <height>20</height> - </size> - </property> </spacer> </item> </layout> @@ -330,12 +262,6 @@ <property name="orientation" > <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > - <size> - <width>40</width> - <height>20</height> - </size> - </property> </spacer> </item> <item> @@ -353,12 +279,6 @@ <property name="orientation" > <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > - <size> - <width>40</width> - <height>20</height> - </size> - </property> </spacer> </item> </layout> @@ -375,12 +295,6 @@ <property name="orientation" > <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > - <size> - <width>40</width> - <height>20</height> - </size> - </property> </spacer> </item> <item> @@ -398,12 +312,6 @@ <property name="orientation" > <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > - <size> - <width>40</width> - <height>20</height> - </size> - </property> </spacer> </item> </layout> @@ -420,12 +328,6 @@ <property name="orientation" > <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > - <size> - <width>40</width> - <height>20</height> - </size> - </property> </spacer> </item> <item> @@ -443,12 +345,6 @@ <property name="orientation" > <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > - <size> - <width>40</width> - <height>20</height> - </size> - </property> </spacer> </item> </layout> @@ -465,12 +361,6 @@ <property name="orientation" > <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > - <size> - <width>40</width> - <height>20</height> - </size> - </property> </spacer> </item> <item> @@ -488,12 +378,6 @@ <property name="orientation" > <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > - <size> - <width>40</width> - <height>20</height> - </size> - </property> </spacer> </item> </layout> @@ -504,12 +388,6 @@ <property name="orientation" > <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" > - <size> - <width>424</width> - <height>16</height> - </size> - </property> </spacer> </item> </layout> @@ -529,17 +407,18 @@ </property> <layout class="QVBoxLayout" > <item> - <widget class="KLineEdit" name="varEffectiveness" > - <property name="toolTip" > - <string/> + <widget class="KIntNumInput" name="varEffectivenessNum" > + <property name="minimum" > + <number>0</number> </property> </widget> </item> <item> - <widget class="KIntNumInput" name="varEffectivenessNum" /> - </item> - <item> - <widget class="KIntNumInput" name="varEffectivenessDenom" /> + <widget class="KIntNumInput" name="varEffectivenessDenom" > + <property name="minimum" > + <number>1</number> + </property> + </widget> </item> </layout> </widget> @@ -549,31 +428,12 @@ <property name="orientation" > <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" > - <size> - <width>20</width> - <height>40</height> - </size> - </property> </spacer> </item> </layout> </widget> </widget> </item> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" > - <size> - <width>452</width> - <height>16</height> - </size> - </property> - </spacer> - </item> </layout> </widget> <customwidgets> diff --git a/pokemodr/gui/pokemodr.ui b/pokemodr/gui/pokemodr.ui index 4d589e24..e162d414 100644 --- a/pokemodr/gui/pokemodr.ui +++ b/pokemodr/gui/pokemodr.ui @@ -3,10 +3,8 @@ <widget class="KMainWindow" name="formPokeModr" > <property name="geometry" > <rect> - <x>0</x> - <y>0</y> - <width>817</width> - <height>567</height> + <width>564</width> + <height>408</height> </rect> </property> <property name="windowTitle" > @@ -19,6 +17,9 @@ <property name="orientation" > <enum>Qt::Horizontal</enum> </property> + <property name="childrenCollapsible" > + <bool>false</bool> + </property> <widget class="QTreeWidget" name="treePokemod" > <column> <property name="text" > @@ -26,14 +27,7 @@ </property> </column> </widget> - <widget class="QScrollArea" name="formPanel" > - <property name="frameShape" > - <enum>QFrame::StyledPanel</enum> - </property> - <property name="frameShadow" > - <enum>QFrame::Raised</enum> - </property> - </widget> + <widget class="QScrollArea" name="formPanel" /> </widget> </item> </layout> @@ -43,7 +37,7 @@ <rect> <x>0</x> <y>0</y> - <width>817</width> + <width>564</width> <height>29</height> </rect> </property> @@ -73,9 +67,6 @@ <addaction name="menuEdit" /> </widget> <widget class="KToolBar" name="toolbar" > - <property name="windowTitle" > - <string/> - </property> <property name="movable" > <bool>true</bool> </property> diff --git a/pokemodr/gui/rules.ui b/pokemodr/gui/rules.ui index ffbb88b7..f82e9014 100644 --- a/pokemodr/gui/rules.ui +++ b/pokemodr/gui/rules.ui @@ -1,23 +1,9 @@ <ui version="4.0" > <class>formRules</class> <widget class="QWidget" name="formRules" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>418</width> - <height>839</height> - </rect> - </property> <layout class="QVBoxLayout" > <item> <widget class="QGroupBox" name="boxButtons" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="title" > - <string/> - </property> <layout class="QHBoxLayout" > <item> <widget class="KPushButton" name="buttonApply" > @@ -63,9 +49,6 @@ <property name="checkable" > <bool>true</bool> </property> - <property name="checked" > - <bool>false</bool> - </property> <layout class="QHBoxLayout" > <item> <widget class="QCheckBox" name="varBreeding" > @@ -94,9 +77,6 @@ <property name="toolTip" > <string>How many items can be held at once</string> </property> - <property name="label" > - <string/> - </property> <property name="minimum" > <number>0</number> </property> @@ -116,10 +96,6 @@ <property name="checkable" > <bool>true</bool> </property> - <property name="checked" > - <bool>false</bool> - </property> - <layout class="QHBoxLayout" /> </widget> </item> <item> @@ -133,9 +109,6 @@ <property name="checkable" > <bool>true</bool> </property> - <property name="checked" > - <bool>false</bool> - </property> <layout class="QHBoxLayout" /> </widget> </item> @@ -150,10 +123,6 @@ <property name="checkable" > <bool>true</bool> </property> - <property name="checked" > - <bool>false</bool> - </property> - <layout class="QHBoxLayout" /> </widget> </item> <item> @@ -161,12 +130,6 @@ <property name="orientation" > <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" > - <size> - <width>20</width> - <height>40</height> - </size> - </property> </spacer> </item> </layout> @@ -219,9 +182,6 @@ <property name="toolTip" > <string>The size of the largest party possible</string> </property> - <property name="label" > - <string/> - </property> <property name="minimum" > <number>1</number> </property> @@ -241,9 +201,6 @@ <property name="toolTip" > <string>Maximum amount of team members active at one time per side</string> </property> - <property name="label" > - <string/> - </property> <property name="minimum" > <number>1</number> </property> @@ -263,9 +220,6 @@ <property name="toolTip" > <string>Maximum amount of knowable moves</string> </property> - <property name="label" > - <string/> - </property> <property name="minimum" > <number>1</number> </property> @@ -285,9 +239,6 @@ <property name="toolTip" > <string>Maximum level allowed</string> </property> - <property name="label" > - <string/> - </property> <property name="minimum" > <number>1</number> </property> @@ -307,9 +258,6 @@ <property name="toolTip" > <string>Maximum amount of money allowed</string> </property> - <property name="label" > - <string/> - </property> <property name="minimum" > <number>1</number> </property> @@ -329,10 +277,6 @@ <property name="checkable" > <bool>true</bool> </property> - <property name="checked" > - <bool>false</bool> - </property> - <layout class="QHBoxLayout" /> </widget> </item> <item> @@ -340,12 +284,6 @@ <property name="orientation" > <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" > - <size> - <width>20</width> - <height>40</height> - </size> - </property> </spacer> </item> </layout> @@ -366,9 +304,6 @@ <property name="checkable" > <bool>true</bool> </property> - <property name="checked" > - <bool>false</bool> - </property> <layout class="QHBoxLayout" > <item> <widget class="QCheckBox" name="varSplitSpecialDV" > @@ -394,12 +329,6 @@ <property name="toolTip" > <string>The highest a DV may be</string> </property> - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> - </property> </widget> </item> </layout> @@ -416,9 +345,6 @@ <property name="checkable" > <bool>true</bool> </property> - <property name="checked" > - <bool>false</bool> - </property> <layout class="QVBoxLayout" > <item> <widget class="KIntNumInput" name="varFaintLoss" > @@ -473,9 +399,6 @@ <property name="checkable" > <bool>true</bool> </property> - <property name="checked" > - <bool>false</bool> - </property> <layout class="QVBoxLayout" > <item> <widget class="KIntNumInput" name="varMaxEV" > @@ -550,31 +473,12 @@ <property name="orientation" > <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" > - <size> - <width>20</width> - <height>40</height> - </size> - </property> </spacer> </item> </layout> </widget> </widget> </item> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" > - <size> - <width>410</width> - <height>16</height> - </size> - </property> - </spacer> - </item> </layout> </widget> <customwidgets> diff --git a/pokemodr/gui/species.ui b/pokemodr/gui/species.ui index 1ea6f588..2404fd55 100644 --- a/pokemodr/gui/species.ui +++ b/pokemodr/gui/species.ui @@ -2,26 +2,9 @@ <author>Ben Boeckel</author> <class>formSpecies</class> <widget class="QWidget" name="formSpecies" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>244</width> - <height>695</height> - </rect> - </property> - <property name="windowTitle" > - <string/> - </property> <layout class="QVBoxLayout" > <item> <widget class="QGroupBox" name="boxButtons" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="title" > - <string/> - </property> <layout class="QHBoxLayout" > <item> <widget class="KPushButton" name="buttonApply" > @@ -163,9 +146,6 @@ </item> <item> <widget class="KIntNumInput" name="varItemChanceNum" > - <property name="toolTip" > - <string/> - </property> <property name="label" > <string>Numerator</string> </property> @@ -195,12 +175,6 @@ <property name="orientation" > <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" > - <size> - <width>20</width> - <height>40</height> - </size> - </property> </spacer> </item> </layout> @@ -228,9 +202,6 @@ <property name="toolTip" > <string>Base value for the stat</string> </property> - <property name="label" > - <string/> - </property> <property name="minimum" > <number>0</number> </property> @@ -250,12 +221,6 @@ <property name="toolTip" > <string>Stat</string> </property> - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> - </property> </widget> </item> <item> @@ -282,18 +247,6 @@ <property name="toolTip" > <string>Level growth pattern</string> </property> - <property name="editable" > - <bool>false</bool> - </property> - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> - </property> - <property name="autoCompletion" > - <bool>false</bool> - </property> </widget> </item> </layout> @@ -345,12 +298,6 @@ <property name="orientation" > <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" > - <size> - <width>20</width> - <height>16</height> - </size> - </property> </spacer> </item> </layout> @@ -403,9 +350,6 @@ <property name="minimum" > <number>0</number> </property> - <property name="suffix" > - <string/> - </property> </widget> </item> <item> @@ -422,9 +366,6 @@ <property name="maximum" > <number>11</number> </property> - <property name="suffix" > - <string/> - </property> </widget> </item> </layout> @@ -447,12 +388,6 @@ <property name="orientation" > <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" > - <size> - <width>20</width> - <height>40</height> - </size> - </property> </spacer> </item> </layout> @@ -470,9 +405,6 @@ <property name="checkable" > <bool>true</bool> </property> - <property name="checked" > - <bool>false</bool> - </property> <layout class="QVBoxLayout" > <item> <widget class="KLineEdit" name="varGenderChance" > @@ -493,7 +425,7 @@ <string>Numerator</string> </property> <property name="minimum" > - <number>-1</number> + <number>0</number> </property> </widget> </item> @@ -524,12 +456,6 @@ <property name="toolTip" > <string>The species that hatches from an egg from this species</string> </property> - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> - </property> </widget> </item> </layout> @@ -585,12 +511,6 @@ <property name="orientation" > <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" > - <size> - <width>20</width> - <height>40</height> - </size> - </property> </spacer> </item> </layout> @@ -611,16 +531,10 @@ <property name="orientation" > <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > - <size> - <width>40</width> - <height>20</height> - </size> - </property> </spacer> </item> <item> - <widget class="KIconButton" name="varMaleFront" > + <widget class="KPushButton" name="varMaleFront" > <property name="minimumSize" > <size> <width>64</width> @@ -634,16 +548,10 @@ <property name="orientation" > <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > - <size> - <width>40</width> - <height>20</height> - </size> - </property> </spacer> </item> <item> - <widget class="KIconButton" name="varMaleBack" > + <widget class="KPushButton" name="varMaleBack" > <property name="minimumSize" > <size> <width>64</width> @@ -657,12 +565,6 @@ <property name="orientation" > <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > - <size> - <width>40</width> - <height>20</height> - </size> - </property> </spacer> </item> </layout> @@ -679,16 +581,10 @@ <property name="orientation" > <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > - <size> - <width>40</width> - <height>20</height> - </size> - </property> </spacer> </item> <item> - <widget class="KIconButton" name="varFemaleFront" > + <widget class="KPushButton" name="varFemaleFront" > <property name="minimumSize" > <size> <width>64</width> @@ -702,16 +598,10 @@ <property name="orientation" > <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > - <size> - <width>40</width> - <height>20</height> - </size> - </property> </spacer> </item> <item> - <widget class="KIconButton" name="varFemaleBack" > + <widget class="KPushButton" name="varFemaleBack" > <property name="minimumSize" > <size> <width>64</width> @@ -725,12 +615,6 @@ <property name="orientation" > <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > - <size> - <width>40</width> - <height>20</height> - </size> - </property> </spacer> </item> </layout> @@ -747,16 +631,10 @@ <property name="orientation" > <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > - <size> - <width>40</width> - <height>20</height> - </size> - </property> </spacer> </item> <item> - <widget class="KIconButton" name="varList" > + <widget class="KPushButton" name="varList" > <property name="minimumSize" > <size> <width>128</width> @@ -770,12 +648,6 @@ <property name="orientation" > <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > - <size> - <width>40</width> - <height>20</height> - </size> - </property> </spacer> </item> </layout> @@ -786,31 +658,12 @@ <property name="orientation" > <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" > - <size> - <width>20</width> - <height>40</height> - </size> - </property> </spacer> </item> </layout> </widget> </widget> </item> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" > - <size> - <width>236</width> - <height>16</height> - </size> - </property> - </spacer> - </item> </layout> </widget> <layoutdefault spacing="4" margin="4" /> @@ -821,11 +674,6 @@ <header>kcombobox.h</header> </customwidget> <customwidget> - <class>KIconButton</class> - <extends>QPushButton</extends> - <header>kicondialog.h</header> - </customwidget> - <customwidget> <class>KIntNumInput</class> <extends>QWidget</extends> <header>knuminput.h</header> diff --git a/pokemodr/gui/speciesability.ui b/pokemodr/gui/speciesability.ui index 986eaf4f..6fe8e965 100644 --- a/pokemodr/gui/speciesability.ui +++ b/pokemodr/gui/speciesability.ui @@ -1,26 +1,9 @@ <ui version="4.0" > <class>formSpeciesAbility</class> <widget class="QWidget" name="formSpeciesAbility" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>226</width> - <height>238</height> - </rect> - </property> - <property name="windowTitle" > - <string/> - </property> <layout class="QVBoxLayout" > <item> <widget class="QGroupBox" name="boxButtons" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="title" > - <string/> - </property> <layout class="QHBoxLayout" > <item> <widget class="KPushButton" name="buttonApply" > @@ -56,12 +39,6 @@ <property name="toolTip" > <string>Ability available</string> </property> - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> - </property> </widget> </item> </layout> @@ -86,19 +63,6 @@ </layout> </widget> </item> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" > - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> </layout> </widget> <customwidgets> diff --git a/pokemodr/gui/speciesevolution.ui b/pokemodr/gui/speciesevolution.ui index ca8f9a56..c5d8f15a 100644 --- a/pokemodr/gui/speciesevolution.ui +++ b/pokemodr/gui/speciesevolution.ui @@ -1,26 +1,9 @@ <ui version="4.0" > <class>formSpeciesEvolution</class> <widget class="QWidget" name="formSpeciesEvolution" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>244</width> - <height>545</height> - </rect> - </property> - <property name="windowTitle" > - <string/> - </property> <layout class="QVBoxLayout" > <item> <widget class="QGroupBox" name="boxButtons" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="title" > - <string/> - </property> <layout class="QHBoxLayout" > <item> <widget class="KPushButton" name="buttonApply" > @@ -56,12 +39,6 @@ <property name="toolTip" > <string>Species evolved into</string> </property> - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> - </property> </widget> </item> </layout> @@ -78,12 +55,6 @@ <property name="toolTip" > <string>How the evolution is triggered</string> </property> - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> - </property> </widget> </item> <item> @@ -97,12 +68,6 @@ <property name="toolTip" > <string>Value 1</string> </property> - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> - </property> </widget> </item> </layout> @@ -119,12 +84,6 @@ <property name="toolTip" > <string>Value 2</string> </property> - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> - </property> </widget> </item> </layout> @@ -168,19 +127,6 @@ </layout> </widget> </item> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" > - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> </layout> </widget> <customwidgets> diff --git a/pokemodr/gui/speciesitem.ui b/pokemodr/gui/speciesitem.ui index 93e123e4..b16d0905 100644 --- a/pokemodr/gui/speciesitem.ui +++ b/pokemodr/gui/speciesitem.ui @@ -1,26 +1,9 @@ <ui version="4.0" > <class>formSpeciesItem</class> <widget class="QWidget" name="formSpeciesItem" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>236</width> - <height>258</height> - </rect> - </property> - <property name="windowTitle" > - <string/> - </property> <layout class="QVBoxLayout" > <item> <widget class="QGroupBox" name="boxButtons" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="title" > - <string/> - </property> <layout class="QHBoxLayout" > <item> <widget class="KPushButton" name="buttonApply" > @@ -56,12 +39,6 @@ <property name="toolTip" > <string>Item that can be held</string> </property> - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> - </property> </widget> </item> </layout> @@ -86,19 +63,6 @@ </layout> </widget> </item> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" > - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> </layout> </widget> <customwidgets> diff --git a/pokemodr/gui/speciesmove.ui b/pokemodr/gui/speciesmove.ui index 167a74f6..cf1641c1 100644 --- a/pokemodr/gui/speciesmove.ui +++ b/pokemodr/gui/speciesmove.ui @@ -1,26 +1,9 @@ <ui version="4.0" > <class>formSpeciesMove</class> <widget class="QWidget" name="formSpeciesMove" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>236</width> - <height>337</height> - </rect> - </property> - <property name="windowTitle" > - <string/> - </property> <layout class="QVBoxLayout" > <item> <widget class="QGroupBox" name="boxButtons" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="title" > - <string/> - </property> <layout class="QHBoxLayout" > <item> <widget class="KPushButton" name="buttonApply" > @@ -56,12 +39,6 @@ <property name="toolTip" > <string>Move that is learned</string> </property> - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> - </property> </widget> </item> </layout> @@ -105,19 +82,6 @@ </layout> </widget> </item> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" > - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> </layout> </widget> <customwidgets> diff --git a/pokemodr/gui/store.ui b/pokemodr/gui/store.ui index 61cac586..db2c946b 100644 --- a/pokemodr/gui/store.ui +++ b/pokemodr/gui/store.ui @@ -1,23 +1,9 @@ <ui version="4.0" > <class>formStore</class> <widget class="QWidget" name="formStore" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>236</width> - <height>286</height> - </rect> - </property> <layout class="QVBoxLayout" > <item> <widget class="QGroupBox" name="boxButtons" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="title" > - <string/> - </property> <layout class="QHBoxLayout" > <item> <widget class="KPushButton" name="buttonApply" > @@ -77,19 +63,6 @@ </layout> </widget> </item> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" > - <size> - <width>218</width> - <height>16</height> - </size> - </property> - </spacer> - </item> </layout> </widget> <customwidgets> diff --git a/pokemodr/gui/tile.ui b/pokemodr/gui/tile.ui index 45cb76bc..1f6138b8 100644 --- a/pokemodr/gui/tile.ui +++ b/pokemodr/gui/tile.ui @@ -1,23 +1,9 @@ <ui version="4.0" > <class>formTile</class> <widget class="QWidget" name="formTile" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>226</width> - <height>957</height> - </rect> - </property> <layout class="QVBoxLayout" > <item> <widget class="QGroupBox" name="boxButtons" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="title" > - <string/> - </property> <layout class="QHBoxLayout" > <item> <widget class="KPushButton" name="buttonApply" > @@ -75,12 +61,6 @@ <property name="orientation" > <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > - <size> - <width>40</width> - <height>20</height> - </size> - </property> </spacer> </item> <item> @@ -101,12 +81,6 @@ <property name="orientation" > <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > - <size> - <width>40</width> - <height>20</height> - </size> - </property> </spacer> </item> </layout> @@ -123,9 +97,6 @@ <property name="toolTip" > <string>Directions into the tile</string> </property> - <property name="dragEnabled" > - <bool>true</bool> - </property> <property name="selectionMode" > <enum>QAbstractItemView::ExtendedSelection</enum> </property> @@ -143,7 +114,7 @@ <item> <widget class="KLineEdit" name="varWild" > <property name="toolTip" > - <string>Chacne of having a wild encounter on the tile</string> + <string>Chance of having a wild encounter on the tile</string> </property> <property name="readOnly" > <bool>true</bool> @@ -181,9 +152,6 @@ <property name="checkable" > <bool>true</bool> </property> - <property name="checked" > - <bool>false</bool> - </property> <layout class="QVBoxLayout" > <item> <widget class="QGroupBox" name="boxType" > @@ -196,12 +164,6 @@ <property name="toolTip" > <string>HM required to access the tile</string> </property> - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> - </property> </widget> </item> </layout> @@ -218,12 +180,6 @@ <property name="toolTip" > <string>Tile that replaces when HM is used</string> </property> - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> - </property> </widget> </item> </layout> @@ -240,9 +196,6 @@ <property name="checkable" > <bool>true</bool> </property> - <property name="checked" > - <bool>false</bool> - </property> <layout class="QVBoxLayout" > <item> <widget class="QGroupBox" name="boxForceType" > @@ -255,12 +208,6 @@ <property name="toolTip" > <string>Force the tile exerts on the player</string> </property> - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> - </property> </widget> </item> </layout> @@ -277,12 +224,6 @@ <property name="toolTip" > <string>Direction the force is exerted in</string> </property> - <property name="insertPolicy" > - <enum>QComboBox::NoInsert</enum> - </property> - <property name="sizeAdjustPolicy" > - <enum>QComboBox::AdjustToContents</enum> - </property> </widget> </item> </layout> @@ -291,19 +232,6 @@ </layout> </widget> </item> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" > - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> </layout> </widget> <customwidgets> diff --git a/pokemodr/gui/time.ui b/pokemodr/gui/time.ui index fab0e009..e6f169e3 100644 --- a/pokemodr/gui/time.ui +++ b/pokemodr/gui/time.ui @@ -1,23 +1,9 @@ <ui version="4.0" > <class>formTime</class> <widget class="QWidget" name="formTime" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>191</width> - <height>234</height> - </rect> - </property> <layout class="QVBoxLayout" > <item> <widget class="QGroupBox" name="boxButtons" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="title" > - <string/> - </property> <layout class="QHBoxLayout" > <item> <widget class="KPushButton" name="buttonApply" > @@ -83,19 +69,6 @@ </layout> </widget> </item> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" > - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> </layout> </widget> <customwidgets> diff --git a/pokemodr/gui/type.ui b/pokemodr/gui/type.ui index 2f1967c0..f6ba148d 100644 --- a/pokemodr/gui/type.ui +++ b/pokemodr/gui/type.ui @@ -1,23 +1,9 @@ <ui version="4.0" > <class>formType</class> <widget class="QWidget" name="formType" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>226</width> - <height>349</height> - </rect> - </property> <layout class="QVBoxLayout" > <item> <widget class="QGroupBox" name="boxButtons" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="title" > - <string/> - </property> <layout class="QHBoxLayout" > <item> <widget class="KPushButton" name="buttonApply" > @@ -106,19 +92,6 @@ </layout> </widget> </item> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" > - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> </layout> </widget> <customwidgets> |