Add Reset button and rename parameterWidget to customizer

This commit is contained in:
amarjeetkapoor1 2016-08-16 00:51:08 +05:30
parent 8d7ee3bc82
commit 85f4c46517
7 changed files with 42 additions and 16 deletions

View file

@ -1367,7 +1367,7 @@
<bool>true</bool>
</property>
<property name="text">
<string>Hide parameters</string>
<string>Hide Customizer</string>
</property>
</action>
</widget>

View file

@ -631,7 +631,7 @@ void MainWindow::loadViewSettings(){
hideToolbars();
if(Feature::ExperimentalParameterWidget.is_enabled()){
viewActionHideParameters->setChecked(settings.value("view/hideParameters").toBool());
viewActionHideParameters->setChecked(settings.value("view/hideCustomizer").toBool());
hideParameters();
}else{
viewActionHideParameters->setChecked(true);
@ -2490,7 +2490,7 @@ void MainWindow::consoleTopLevelChanged(bool topLevel)
void MainWindow::parameterTopLevelChanged(bool topLevel)
{
setDockWidgetTitle(parameterDock, QString(_("ParameterWidget")), topLevel);
setDockWidgetTitle(parameterDock, QString(_("Customizer")), topLevel);
}
void MainWindow::setDockWidgetTitle(QDockWidget *dockWidget, QString prefix, bool topLevel)
@ -2553,7 +2553,7 @@ void MainWindow::hideParameters()
{
QSettings settings;
bool shouldHide = viewActionHideParameters->isChecked();
settings.setValue("view/hideParameters", shouldHide);
settings.setValue("view/hideCustomizer", shouldHide);
if (viewActionHideParameters->isChecked()) {
parameterDock->hide();

View file

@ -49,6 +49,12 @@ ParameterWidget::ParameterWidget(QWidget *parent) : QWidget(parent)
connect(checkBoxAutoPreview, SIGNAL(toggled(bool)), this, SLOT(onValueChanged()));
connect(checkBoxDetailedDescription,SIGNAL(toggled(bool)),this,SLOT(onDescriptionShow()));
connect(comboBox, SIGNAL(currentIndexChanged(int)),this,SLOT(onSetChanged(int)));
connect(reset, SIGNAL(clicked()),this,SLOT(resetParameter()));
}
void ParameterWidget::resetParameter(){
this->resetPara=true;
emit previewRequested();
}
ParameterWidget::~ParameterWidget()

View file

@ -60,6 +60,7 @@ protected slots:
void onSetChanged(int idx);
void onSetAdd();
void onSetDelete();
void resetParameter();
signals:
void previewRequested();

View file

@ -14,7 +14,7 @@
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="6" column="0">
<item row="7" column="0">
<widget class="QComboBox" name="comboBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@ -24,14 +24,14 @@
</property>
</widget>
</item>
<item row="6" column="1">
<item row="7" column="1">
<widget class="QPushButton" name="addButton">
<property name="text">
<string>+</string>
</property>
</widget>
</item>
<item row="10" column="0" colspan="4">
<item row="11" column="0" colspan="4">
<widget class="QScrollArea" name="scrollArea">
<property name="widgetResizable">
<bool>true</bool>
@ -42,7 +42,7 @@
<x>0</x>
<y>0</y>
<width>472</width>
<height>502</height>
<height>496</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
@ -65,14 +65,14 @@
</widget>
</widget>
</item>
<item row="1" column="0">
<item row="2" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Preset:</string>
</property>
</widget>
</item>
<item row="0" column="0">
<item row="1" column="0">
<widget class="QCheckBox" name="checkBoxAutoPreview">
<property name="text">
<string>Automatic Preview</string>
@ -82,23 +82,30 @@
</property>
</widget>
</item>
<item row="6" column="2">
<item row="7" column="2">
<widget class="QPushButton" name="deleteButton">
<property name="text">
<string>-</string>
</property>
</widget>
</item>
<item row="0" column="1" colspan="2">
<item row="1" column="1">
<widget class="QCheckBox" name="checkBoxDetailedDescription">
<property name="text">
<string>Detailed descritpion</string>
<string>Show Details</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QPushButton" name="reset">
<property name="text">
<string>Reset</string>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>

View file

@ -4,6 +4,7 @@
ParameterExtractor::ParameterExtractor()
{
resetPara=false;
}
ParameterExtractor::~ParameterExtractor()
@ -50,18 +51,28 @@ void ParameterExtractor::setParameters(const FileModule* module)
ParameterObject *entryObject = new ParameterObject();
entryObject->setAssignment(&ctx, &assignment, defaultValue);
//need to improve structure
if(entries.find(assignment.name) == entries.end()){
//check whether object exist or not previously
if(entries.find(assignment.name) == entries.end() || resetPara){
//if object doen't exist
//or we have reset Parameters then add new entry
entries[assignment.name] = entryObject;
}else{
//if entry object is already exist we check if its modified
//or not
if(*entryObject==*entries[assignment.name]){
//if entry is not modified then we don't add new entry
entryObject=entries[assignment.name];
}else{
//if entry is modified then we add new entry
entries[assignment.name] = entryObject;
}
}
entryObject->set=true;
}
connectWidget();
this->resetPara=false;
}

View file

@ -24,6 +24,7 @@ protected:
virtual void addEntry(ParameterVirtualWidget *entry)=0;
virtual void end()=0;
virtual void connectWidget()=0;
bool resetPara;
};
#endif // PARAMETEREXTRACTOR_H