aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merging

Browse Source 
--HG--
branch : feature
This commit is contained in:
BojanKverh 2016-07-18 21:02:02 +02:00
parent fbe7d2ef65
commit 363714985c
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/valentina/dialogs/dialogpatternproperties.cpp
View File

@ -392,7 +392,6 @@ void DialogPatternProperties::DescEdited()
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
<<<<<<< local
void DialogPatternProperties::ToggleComboBox() void DialogPatternProperties::ToggleComboBox()
{ {
ui->comboBoxHeight->setEnabled(ui->radioButtonDefFromP->isChecked()); ui->comboBoxHeight->setEnabled(ui->radioButtonDefFromP->isChecked());
@ -418,8 +417,6 @@ void DialogPatternProperties::GeneralInfoChanged()
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
=======
>>>>>>> other
void DialogPatternProperties::SetHeightsChecked(bool enabled) void DialogPatternProperties::SetHeightsChecked(bool enabled)
{ {
ui->checkBoxH92->setChecked(enabled); ui->checkBoxH92->setChecked(enabled);

4
src/app/valentina/dialogs/dialogpatternproperties.h
View File

@ -52,13 +52,10 @@ public:
signals: signals:
void UpdateGradation(); void UpdateGradation();
private slots: private slots:
<<<<<<< local
void ToggleComboBox(); void ToggleComboBox();
void DefValueChanged(); void DefValueChanged();
void SecurityValueChanged(); void SecurityValueChanged();
void GeneralInfoChanged(); void GeneralInfoChanged();
void DeleteImage();
=======
void Apply(); void Apply();
void Ok(); void Ok();
void SelectAll(int state); void SelectAll(int state);
@ -66,7 +63,6 @@ private slots:
void CheckStateSize(int state); void CheckStateSize(int state);
void DescEdited(); void DescEdited();
void ChangeImage(); void ChangeImage();
>>>>>>> other
void SaveImage(); void SaveImage();
private: private:
Q_DISABLE_COPY(DialogPatternProperties) Q_DISABLE_COPY(DialogPatternProperties)