numberdialog.cpp (krename-4.0.9) | : | numberdialog.cpp (krename-4.90.90) | ||
---|---|---|---|---|
skipping to change at line 23 | skipping to change at line 23 | |||
* the Free Software Foundation; either version 2 of the License, or * | * the Free Software Foundation; either version 2 of the License, or * | |||
* (at your option) any later version. * | * (at your option) any later version. * | |||
* * | * * | |||
***************************************************************************/ | ***************************************************************************/ | |||
#include "numberdialog.h" | #include "numberdialog.h" | |||
#include <QDialogButtonBox> | #include <QDialogButtonBox> | |||
#include <QVBoxLayout> | #include <QVBoxLayout> | |||
NumberDialog::NumberDialog( int start, int step, bool reset, QList<int> skip, QW | NumberDialog::NumberDialog(int start, int step, bool reset, QList<int> skip, QWi | |||
idget* parent ) | dget *parent) | |||
: QDialog( parent ) | : QDialog(parent) | |||
{ | { | |||
QVBoxLayout* layout = new QVBoxLayout( this ); | QVBoxLayout *layout = new QVBoxLayout(this); | |||
QWidget* widget = new QWidget( this ); | QWidget *widget = new QWidget(this); | |||
m_widget.setupUi( widget ); | m_widget.setupUi(widget); | |||
m_buttons = new QDialogButtonBox( QDialogButtonBox::Ok | QDialogButtonBox::C | m_buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Ca | |||
ancel, Qt::Horizontal, this ); | ncel, Qt::Horizontal, this); | |||
layout->addWidget( widget ); | layout->addWidget(widget); | |||
layout->addWidget( m_buttons ); | layout->addWidget(m_buttons); | |||
connect(m_buttons, SIGNAL(accepted()), this, SLOT(accept())); | connect(m_buttons, &QDialogButtonBox::accepted, | |||
connect(m_buttons, SIGNAL(rejected()), this, SLOT(reject())); | this, &NumberDialog::accept); | |||
connect(m_buttons, &QDialogButtonBox::rejected, | ||||
connect(m_widget.buttonAdd, SIGNAL(clicked(bool)), SLOT(slotAddN | this, &NumberDialog::reject); | |||
umber())); | ||||
connect(m_widget.buttonRemove, SIGNAL(clicked(bool)), SLOT(slotRemo | connect(m_widget.buttonAdd, &QPushButton::clicked, | |||
veNumber())); | this, &NumberDialog::slotAddNumber); | |||
connect(m_widget.listSkip, SIGNAL(itemSelectionChanged()), SLOT(slotEnab | connect(m_widget.buttonRemove, &QPushButton::clicked, this, | |||
leControls())); | &NumberDialog::slotRemoveNumber); | |||
m_widget.spinStart->setValue( start ); | connect(m_widget.listSkip, &QListWidget::itemSelectionChanged, | |||
m_widget.spinStep->setValue( step ); | this, &NumberDialog::slotEnableControls); | |||
m_widget.checkReset->setChecked( reset ); | m_widget.spinStart->setValue(start); | |||
m_widget.listSkip->setSortingEnabled( true ); // TODO: sort numeric | m_widget.spinStep->setValue(step); | |||
m_widget.checkReset->setChecked(reset); | ||||
QList<int>::ConstIterator it = skip.begin(); | m_widget.listSkip->setSortingEnabled(true); // TODO: sort numeric | |||
while( it != skip.end() ) | ||||
{ | QList<int>::ConstIterator it = skip.constBegin(); | |||
m_widget.listSkip->addItem( QString::number( *it ) ); | while (it != skip.constEnd()) { | |||
m_widget.listSkip->addItem(QString::number(*it)); | ||||
++it; | ++it; | |||
} | } | |||
} | } | |||
QList<int> NumberDialog::skipNumbers() const | QList<int> NumberDialog::skipNumbers() const | |||
{ | { | |||
QList<int> list; | QList<int> list; | |||
for( int i = 0; i < m_widget.listSkip->count(); i++ ) | for (int i = 0; i < m_widget.listSkip->count(); i++) { | |||
{ | QListWidgetItem *item = m_widget.listSkip->item(i); | |||
QListWidgetItem* item = m_widget.listSkip->item( i ); | list.append(item->data(Qt::DisplayRole).toInt()); | |||
list.append( item->data( Qt::DisplayRole ).toInt() ); | ||||
} | } | |||
return list; | return list; | |||
} | } | |||
void NumberDialog::slotEnableControls() | void NumberDialog::slotEnableControls() | |||
{ | { | |||
QList<QListWidgetItem*> selected = m_widget.listSkip->selectedItems(); | QList<QListWidgetItem *> selected = m_widget.listSkip->selectedItems(); | |||
m_widget.buttonRemove->setEnabled( selected.size() ); | m_widget.buttonRemove->setEnabled(selected.size()); | |||
} | } | |||
void NumberDialog::slotAddNumber() | void NumberDialog::slotAddNumber() | |||
{ | { | |||
m_widget.listSkip->addItem( QString::number( m_widget.spinNumber->value() ) ); | m_widget.listSkip->addItem(QString::number(m_widget.spinNumber->value())); | |||
} | } | |||
void NumberDialog::slotRemoveNumber() | void NumberDialog::slotRemoveNumber() | |||
{ | { | |||
delete m_widget.listSkip->takeItem( m_widget.listSkip->currentRow() ); | delete m_widget.listSkip->takeItem(m_widget.listSkip->currentRow()); | |||
} | } | |||
#include "numberdialog.moc" | ||||
End of changes. 10 change blocks. | ||||
36 lines changed or deleted | 36 lines changed or added |