summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Boeckel <MathStuf@gmail.com>2008-06-18 02:25:40 +0000
committerBen Boeckel <MathStuf@gmail.com>2008-06-18 02:25:40 +0000
commit5d7d71ddb75f636f94028da346f43565ffb798df (patch)
treeeb57ebbe15c6b54cf7d7632a59e4242a56c1002f
parent0b90d8e63582366a056ae13775bf72870a06ec0b (diff)
[FIX] Minor spelling errors in widgets
[FIX] Setting the Pokemod as dirty happens only when something happens [FIX] Toolbar cleaned up git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@211 6ecfd1a5-f3ed-3746-8530-beee90d26b22
-rw-r--r--Changelog9
-rw-r--r--pokemodr/PokemodTree.cpp1
-rw-r--r--pokemodr/PokemodrUI.cpp6
-rw-r--r--pokemodr/RulesUI.cpp2
4 files changed, 12 insertions, 6 deletions
diff --git a/Changelog b/Changelog
index 21469212..7afe395f 100644
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,13 @@
-----------------
+Rev: 211
+Date: 17 June 2008
+User: MathStuf
+-----------------
+[FIX] Minor spelling errors in widgets
+[FIX] Setting the Pokemod as dirty happens only when something happens
+[FIX] Toolbar cleaned up
+
+-----------------
Rev: 210
Date: 17 June 2008
User: MathStuf
diff --git a/pokemodr/PokemodTree.cpp b/pokemodr/PokemodTree.cpp
index 5f92ab73..2ccf5fdd 100644
--- a/pokemodr/PokemodTree.cpp
+++ b/pokemodr/PokemodTree.cpp
@@ -48,7 +48,6 @@ QString Pokemodr::PokemodTree::description(const QModelIndex& index)
Pokemodr::ObjectUI* Pokemodr::PokemodTree::editorWidget(const QModelIndex& index)
{
Pokemodr::ObjectUI* widget = static_cast<Pokemodr::ObjectUI*>(model()->data(index, Pokemodr::BaseModel::WidgetRole).value<QWidget*>());
- connect(widget, SIGNAL(changed(bool)), this, SLOT(setDirty()));
return widget;
}
diff --git a/pokemodr/PokemodrUI.cpp b/pokemodr/PokemodrUI.cpp
index 0cc15987..9d502cec 100644
--- a/pokemodr/PokemodrUI.cpp
+++ b/pokemodr/PokemodrUI.cpp
@@ -254,7 +254,7 @@ bool Pokemodr::PokemodrUI::closePokemod(const Pokemod::Pokemod* pokemod, const b
if (force)
result = KMessageBox::questionYesNo(this, "You have unsaved changes, would you like to save them?", QString::fromUtf8("Unsaved Pokémod"));
else
- result = KMessageBox::questionYesNoCancel(this, "You have unsaved changes, would you like to save them?", QString::fromUtf8("Unsaved PokémMod"));
+ result = KMessageBox::questionYesNoCancel(this, "You have unsaved changes, would you like to save them?", QString::fromUtf8("Unsaved Pokémod"));
switch (result)
{
case KMessageBox::Yes:
@@ -415,9 +415,5 @@ void Pokemodr::PokemodrUI::setupActions()
toolbar->addAction(cut);
toolbar->addAction(copy);
toolbar->addAction(paste);
- toolbar->addSeparator();
- toolbar->addAction(preferences);
- toolbar->addSeparator();
- toolbar->addAction(quit);
addToolBar(toolbar);
}
diff --git a/pokemodr/RulesUI.cpp b/pokemodr/RulesUI.cpp
index f1a85c13..ca733e9e 100644
--- a/pokemodr/RulesUI.cpp
+++ b/pokemodr/RulesUI.cpp
@@ -108,6 +108,8 @@ void Pokemodr::RulesUI::on_varSwitchStyle_toggled(const bool switchStyle)
void Pokemodr::RulesUI::on_boxSplitSpecial_toggled(const bool splitSpecial)
{
static_cast<Pokemod::Rules*>(modified())->setSpecialSplit(splitSpecial);
+ if (!splitSpecial)
+ static_cast<Pokemod::Rules*>(modified())->setSpecialDVSplit(false);
}
void Pokemodr::RulesUI::on_varSplitSpecialDV_toggled(const bool splitSpecialDV)