16 changes: 6 additions & 10 deletions src/libkstapp/datawizard.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -228,18 +228,14 @@ bool DataWizardPageVectors::isComplete() const {


void DataWizardPageVectors::remove() {
int j=0;
for (int i = 0; i < _vectorsToPlot->count(); i++) {
if (_vectorsToPlot->item(i) && _vectorsToPlot->item(i)->isSelected()) {
_vectors->addItem(_vectorsToPlot->takeItem(i));
j = i;
int j=0, i=0;
int count = _vectorsToPlot->count();
for (i = 0; i < count; ++i) {
if (_vectorsToPlot->item(i-j) && _vectorsToPlot->item(i-j)->isSelected()) {
_vectors->addItem(_vectorsToPlot->takeItem(i-j));
j += 1;
}
}
if (j>=_vectorsToPlot->count()) {
j = _vectorsToPlot->count()-1;
}
_vectorsToPlot->setFocus();
_vectorsToPlot->setCurrentRow(j);
_vectors->clearSelection();

emit completeChanged();
Expand Down
7 changes: 5 additions & 2 deletions src/libkstapp/datawizardpagevectors.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,9 @@
<property name="whatsThis">
<string>Selected data: All fields in this list are plotted. To remove fields from this list, drag them to the Available data list, double click on them, or select them and use the Remove button (right arrow icon or Alt-r). The order in which fields appear in this list is the order in which they will be plotted.</string>
</property>
<property name="selectionMode">
<enum>QAbstractItemView::ExtendedSelection</enum>
</property>
</widget>
</item>
<item row="0" column="0" colspan="2">
Expand Down Expand Up @@ -251,8 +254,8 @@
<y>152</y>
</hint>
<hint type="destinationlabel">
<x>256</x>
<y>43</y>
<x>257</x>
<y>39</y>
</hint>
</hints>
</connection>
Expand Down
6 changes: 6 additions & 0 deletions src/libkstapp/editmultiplewidget.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,12 @@ void EditMultipleWidget::selectObjects(const QStringList &objects) {
}
}
}

void EditMultipleWidget::setHeader(const QString &header)
{
_header->setText(header);
}

}

// vim: ts=2 sw=2 et
1 change: 1 addition & 0 deletions src/libkstapp/editmultiplewidget.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ class EditMultipleWidget : public QWidget, public Ui::EditMultipleWidget {
void addObject(QString name, QString descriptionTip);
QStringList selectedObjects() const;
void selectObjects(const QStringList &objects);
void setHeader(const QString &header);

private Q_SLOTS:
void selectAllObjects();
Expand Down
209 changes: 91 additions & 118 deletions src/libkstapp/editmultiplewidget.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,137 +6,110 @@
<rect>
<x>0</x>
<y>0</y>
<width>208</width>
<height>316</height>
<width>266</width>
<height>407</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="windowTitle">
<string>EditMultipleWidget</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<property name="margin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QGroupBox" name="groupBox6">
<property name="title">
<string>Select Objects to Edit</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="textLabel1">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Filter:</string>
</property>
<property name="wordWrap">
<bool>false</bool>
</property>
<property name="buddy">
<cstring>_filterEdit</cstring>
</property>
</widget>
</item>
<item row="0" column="1" colspan="2">
<widget class="QLineEdit" name="_filterEdit"/>
</item>
<item row="3" column="0" colspan="3">
<widget class="QListWidget" name="_objectList">
<property name="selectionMode">
<enum>QAbstractItemView::ExtendedSelection</enum>
</property>
</widget>
</item>
<item row="1" column="0" colspan="3">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QPushButton" name="_selectNoneBut">
<property name="text">
<string>Clear</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="_selectAllBut">
<property name="text">
<string>Select &amp;All</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<layout class="QVBoxLayout" name="_layout">
<item>
<widget class="QLabel" name="_header">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Select Objects to Edit</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="textLabel1">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Filter:</string>
</property>
<property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="_filterEdit">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>1</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QPushButton" name="_selectNoneBut">
<property name="text">
<string>Clear</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="_selectAllBut">
<property name="text">
<string>Select &amp;All</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QListWidget" name="_objectList">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>150</width>
<height>0</height>
</size>
</property>
<property name="selectionMode">
<enum>QAbstractItemView::ExtendedSelection</enum>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11"/>
<tabstops>
<tabstop>_filterEdit</tabstop>
<tabstop>_selectNoneBut</tabstop>
<tabstop>_selectAllBut</tabstop>
<tabstop>_objectList</tabstop>
</tabstops>
<resources/>
<connections>
<connection>
<sender>_selectAllBut</sender>
<signal>clicked()</signal>
<receiver>EditMultipleWidget</receiver>
<slot>selectAllObjects()</slot>
<hints>
<hint type="sourcelabel">
<x>20</x>
<y>20</y>
</hint>
<hint type="destinationlabel">
<x>20</x>
<y>20</y>
</hint>
</hints>
</connection>
<connection>
<sender>_selectNoneBut</sender>
<signal>clicked()</signal>
<receiver>_objectList</receiver>
<slot>clearSelection()</slot>
<hints>
<hint type="sourcelabel">
<x>20</x>
<y>20</y>
</hint>
<hint type="destinationlabel">
<x>136</x>
<y>142</y>
</hint>
</hints>
</connection>
<connection>
<sender>_filterEdit</sender>
<signal>textChanged(QString)</signal>
<receiver>EditMultipleWidget</receiver>
<slot>applyFilter(QString)</slot>
<hints>
<hint type="sourcelabel">
<x>20</x>
<y>20</y>
</hint>
<hint type="destinationlabel">
<x>20</x>
<y>20</y>
</hint>
</hints>
</connection>
</connections>
<connections/>
</ui>
4 changes: 2 additions & 2 deletions src/libkstapp/vectormodel.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,8 @@

namespace Kst {

VectorModel::VectorModel(VectorPtr v)
VectorModel::VectorModel()
: QAbstractTableModel () {
addVector(v);
}


Expand All @@ -35,6 +34,7 @@ bool VectorModel::addVector(VectorPtr v)
beginInsertColumns(QModelIndex(), columnCount(), columnCount());
_vectorList.append(v);
endInsertColumns();
// reset();
return true;
}
return false;
Expand Down
2 changes: 1 addition & 1 deletion src/libkstapp/vectormodel.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ namespace Kst {
class VectorModel : public QAbstractTableModel
{
public:
VectorModel(VectorPtr v);
VectorModel();
~VectorModel();

bool addVector(VectorPtr v);
Expand Down
Loading