r14852 by cbradney - #8905: change signal used to fix page range deletion
scribus-commit
scribus-commit at lists.scribus.net
Thu Mar 4 18:50:19 CET 2010
Revision: 14852
Author: cbradney
Date: 2010-03-04T17:40:07.710495Z
Commit message: #8905: change signal used to fix page range deletion
Changeset:
M /branches/Version135/Scribus/scribus/movepage.h
M /branches/Version135/Scribus/scribus/movepage.cpp
Diffs:
Index: scribus/movepage.h
===================================================================
--- scribus/movepage.h (revision 14851)
+++ scribus/movepage.h (revision 14852)
@@ -52,8 +52,8 @@
bool move;
private slots:
- virtual void fromChanged(int);
- virtual void toChanged(int);
+ virtual void fromChanged();
+ virtual void toChanged();
void mvWherePageDataDisable(int index);
};
Index: scribus/movepage.cpp
===================================================================
--- scribus/movepage.cpp (revision 14851)
+++ scribus/movepage.cpp (revision 14852)
@@ -95,17 +95,18 @@
// signals and slots connections
if (move)
- connect( toPageData, SIGNAL( valueChanged(int) ), this, SLOT( toChanged(int) ) );
+ connect( toPageData, SIGNAL( editingFinished() ), this, SLOT( toChanged() ) );
connect( mvWhereData, SIGNAL( activated(int) ), this, SLOT( mvWherePageDataDisable(int) ) );
- connect( fromPageData, SIGNAL( valueChanged(int) ), this, SLOT( fromChanged(int) ) );
+ connect( fromPageData, SIGNAL( editingFinished() ), this, SLOT( fromChanged() ) );
connect( okButton, SIGNAL( clicked() ), this, SLOT( accept() ) );
connect( cancelButton, SIGNAL( clicked() ), this, SLOT( reject() ) );
}
-void MovePages::fromChanged(int pageNumber)
+void MovePages::fromChanged()
{
if (move)
{
+ int pageNumber=fromPageData->value();
if (pageNumber > toPageData->value())
toPageData->setValue(pageNumber);
if ((pageNumber == 1) && (toPageData->value() == toPageData->maximum()))
@@ -113,8 +114,9 @@
}
}
-void MovePages::toChanged(int pageNumber)
+void MovePages::toChanged()
{
+ int pageNumber=toPageData->value();
if (pageNumber < fromPageData->value())
fromPageData->setValue(pageNumber);
if ((fromPageData->value() == 1) && (pageNumber == toPageData->maximum()))
More information about the scribus-commit
mailing list