diff options
| -rw-r--r-- | Changelog | 9 | ||||
| -rw-r--r-- | pokemod/Rules.cpp | 2 | ||||
| -rw-r--r-- | pokemodr/PokeModrUI.cpp | 1 | ||||
| -rw-r--r-- | pokemodr/PokeModrUI.h | 1 | ||||
| -rw-r--r-- | pokemodr/gui/pokemodr.ui | 24 |
5 files changed, 28 insertions, 9 deletions
@@ -1,4 +1,13 @@ ----------------- +Rev: 46 +Date: 24 January 2008 +User: MathStuf +----------------- +[FIX] pokemodr.ui now uses QScrollArea rather than QAbstractScrollArea +[FIX] Compare in Rules.cpp +[FIX] PokeModrUI now saves the KConfgiGroup so preferences can be saved back + +----------------- Rev: 45 Date: 24 January 2008 User: MathStuf diff --git a/pokemod/Rules.cpp b/pokemod/Rules.cpp index 6bf47102..866c3d13 100644 --- a/pokemod/Rules.cpp +++ b/pokemod/Rules.cpp @@ -224,7 +224,7 @@ void Rules::setMaxParty(const unsigned m) throw(BoundsException) if (!m) throw(BoundsException(className, "maxParty")); maxParty = m; - if (maxFight < m) + if (m < maxFight) setMaxFight(m); } diff --git a/pokemodr/PokeModrUI.cpp b/pokemodr/PokeModrUI.cpp index 3115d2d3..1b5400c2 100644 --- a/pokemodr/PokeModrUI.cpp +++ b/pokemodr/PokeModrUI.cpp @@ -35,6 +35,7 @@ PokeModrUI::PokeModrUI(KConfigGroup cfg, KConfigGroup history, QWidget* parent) : QMainWindow(parent), + config(cfg), recent("&Recent Files...", NULL) { setupUi(this); diff --git a/pokemodr/PokeModrUI.h b/pokemodr/PokeModrUI.h index 2b404a8c..c4ebbd52 100644 --- a/pokemodr/PokeModrUI.h +++ b/pokemodr/PokeModrUI.h @@ -52,6 +52,7 @@ class PokeModrUI : public QMainWindow, private Ui::formPokeModr void on_splitter_splitterMoved(const int pos); // void on_treePokemod_itemChanged(QTreeWidgetItem* item); private: + KConfigGroup config; KRecentFilesAction recent; }; diff --git a/pokemodr/gui/pokemodr.ui b/pokemodr/gui/pokemodr.ui index ca69fdfe..21c52cd8 100644 --- a/pokemodr/gui/pokemodr.ui +++ b/pokemodr/gui/pokemodr.ui @@ -5,8 +5,8 @@ <rect> <x>0</x> <y>0</y> - <width>774</width> - <height>561</height> + <width>817</width> + <height>567</height> </rect> </property> <property name="windowTitle" > @@ -26,7 +26,14 @@ </property> </column> </widget> - <widget class="QAbstractScrollArea" native="1" name="formPanel" /> + <widget class="QScrollArea" name="formPanel" > + <property name="frameShape" > + <enum>QFrame::StyledPanel</enum> + </property> + <property name="frameShadow" > + <enum>QFrame::Raised</enum> + </property> + </widget> </widget> </item> </layout> @@ -36,8 +43,8 @@ <rect> <x>0</x> <y>0</y> - <width>774</width> - <height>29</height> + <width>817</width> + <height>25</height> </rect> </property> <widget class="QMenu" name="menuFile" > @@ -184,9 +191,10 @@ </widget> <customwidgets> <customwidget> - <class>QAbstractScrollArea</class> - <extends>QWidget</extends> - <header>qabstractscrollarea.h</header> + <class>QScrollArea</class> + <extends>QFrame</extends> + <header>QScrollArea</header> + <container>1</container> </customwidget> </customwidgets> <resources/> |