Merged in ValentinaZhuravska/valentina/feature (pull request #75)
Resolved Issue #329. Add button to 'Scroll Up/Scroll Down' in Detail mode. --HG-- branch : develop
This commit is contained in:
commit
4ca6e23870
|
@ -78,6 +78,8 @@ DialogDetail::DialogDetail(const VContainer *data, const quint32 &toolId, QWidge
|
||||||
connect(ui.lineEditNameDetail, &QLineEdit::textChanged, this, &DialogDetail::NamePointChanged);
|
connect(ui.lineEditNameDetail, &QLineEdit::textChanged, this, &DialogDetail::NamePointChanged);
|
||||||
|
|
||||||
connect(ui.toolButtonDelete, &QToolButton::clicked, this, &DialogDetail::DeleteItem);
|
connect(ui.toolButtonDelete, &QToolButton::clicked, this, &DialogDetail::DeleteItem);
|
||||||
|
connect(ui.toolButtonUp, &QToolButton::clicked, this, &DialogDetail::ScrollUp);
|
||||||
|
connect(ui.toolButtonDown, &QToolButton::clicked, this, &DialogDetail::ScrollDown);
|
||||||
}
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
@ -176,6 +178,8 @@ void DialogDetail::NewItem(quint32 id, const Tool &typeTool, const NodeDetail &t
|
||||||
if(ui.listWidget->count() == 0)
|
if(ui.listWidget->count() == 0)
|
||||||
{
|
{
|
||||||
canAddNewPoint = true;
|
canAddNewPoint = true;
|
||||||
|
ui.toolButtonUp->setEnabled(false);
|
||||||
|
ui.toolButtonDown->setEnabled(false);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -184,6 +188,8 @@ void DialogDetail::NewItem(quint32 id, const Tool &typeTool, const NodeDetail &t
|
||||||
{
|
{
|
||||||
canAddNewPoint = true;
|
canAddNewPoint = true;
|
||||||
}
|
}
|
||||||
|
ui.toolButtonUp->setEnabled(true);
|
||||||
|
ui.toolButtonDown->setEnabled(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(canAddNewPoint)
|
if(canAddNewPoint)
|
||||||
|
@ -413,6 +419,37 @@ void DialogDetail::DeleteItem()
|
||||||
|
|
||||||
delete ui.listWidget->item(ui.listWidget->currentRow());
|
delete ui.listWidget->item(ui.listWidget->currentRow());
|
||||||
ValidObjects(DetailIsValid());
|
ValidObjects(DetailIsValid());
|
||||||
|
|
||||||
|
if(ui.listWidget->count() < 2)
|
||||||
|
{
|
||||||
|
ui.toolButtonUp->setEnabled(false);
|
||||||
|
ui.toolButtonDown->setEnabled(false);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
ui.toolButtonUp->setEnabled(true);
|
||||||
|
ui.toolButtonDown->setEnabled(true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
void DialogDetail::ScrollUp()
|
||||||
|
{
|
||||||
|
if (ui.listWidget->count() > 1)
|
||||||
|
{
|
||||||
|
QListWidgetItem *item = ui.listWidget->takeItem(0);
|
||||||
|
ui.listWidget->addItem(item);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
void DialogDetail::ScrollDown()
|
||||||
|
{
|
||||||
|
if (ui.listWidget->count() > 1)
|
||||||
|
{
|
||||||
|
QListWidgetItem *item = ui.listWidget->takeItem(ui.listWidget->count()-1);
|
||||||
|
ui.listWidget->insertItem(0, item);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
|
@ -54,6 +54,8 @@ public slots:
|
||||||
void ClickedReverse(bool checked);
|
void ClickedReverse(bool checked);
|
||||||
void ObjectChanged(int row);
|
void ObjectChanged(int row);
|
||||||
void DeleteItem();
|
void DeleteItem();
|
||||||
|
void ScrollUp();
|
||||||
|
void ScrollDown();
|
||||||
protected:
|
protected:
|
||||||
/**
|
/**
|
||||||
* @brief SaveData Put dialog data in local variables
|
* @brief SaveData Put dialog data in local variables
|
||||||
|
|
|
@ -6,8 +6,8 @@
|
||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>565</width>
|
<width>522</width>
|
||||||
<height>382</height>
|
<height>368</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
|
@ -313,14 +313,72 @@
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QToolButton" name="toolButtonDelete">
|
<layout class="QHBoxLayout" name="horizontalLayout_16">
|
||||||
<property name="enabled">
|
<property name="sizeConstraint">
|
||||||
<bool>false</bool>
|
<enum>QLayout::SetFixedSize</enum>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="leftMargin">
|
||||||
<string>Delete</string>
|
<number>10</number>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
<property name="topMargin">
|
||||||
|
<number>10</number>
|
||||||
|
</property>
|
||||||
|
<property name="rightMargin">
|
||||||
|
<number>10</number>
|
||||||
|
</property>
|
||||||
|
<property name="bottomMargin">
|
||||||
|
<number>10</number>
|
||||||
|
</property>
|
||||||
|
<item>
|
||||||
|
<widget class="QToolButton" name="toolButtonDelete">
|
||||||
|
<property name="enabled">
|
||||||
|
<bool>false</bool>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>Delete</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<spacer name="horizontalSpacer">
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Horizontal</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeHint" stdset="0">
|
||||||
|
<size>
|
||||||
|
<width>40</width>
|
||||||
|
<height>20</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
</spacer>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QToolButton" name="toolButtonDown">
|
||||||
|
<property name="toolTip">
|
||||||
|
<string>Scroll down the list</string>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>...</string>
|
||||||
|
</property>
|
||||||
|
<property name="icon">
|
||||||
|
<iconset theme="go-down"/>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QToolButton" name="toolButtonUp">
|
||||||
|
<property name="toolTip">
|
||||||
|
<string>Scroll up the list</string>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>...</string>
|
||||||
|
</property>
|
||||||
|
<property name="icon">
|
||||||
|
<iconset theme="go-up"/>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
|
@ -352,7 +410,6 @@
|
||||||
<tabstop>checkBoxSeams</tabstop>
|
<tabstop>checkBoxSeams</tabstop>
|
||||||
<tabstop>doubleSpinBoxSeams</tabstop>
|
<tabstop>doubleSpinBoxSeams</tabstop>
|
||||||
<tabstop>checkBoxClosed</tabstop>
|
<tabstop>checkBoxClosed</tabstop>
|
||||||
<tabstop>toolButtonDelete</tabstop>
|
|
||||||
<tabstop>buttonBox</tabstop>
|
<tabstop>buttonBox</tabstop>
|
||||||
</tabstops>
|
</tabstops>
|
||||||
<resources>
|
<resources>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user