graphics/paysages3d
1
0
Fork 0
Code Releases Activity

paysages : Added some icons.

Browse source 
git-svn-id: https://subversion.assembla.com/svn/thunderk/paysages@408 b1fd45b6-86a6-48da-8261-f70d1f35bdcc
This commit is contained in:
Michaël Lemaire 2012-08-13 19:19:19 +00:00 committed by ThunderK
parent c734512e34
commit 623fbaa2e3
10 changed files with 45 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
TODO
View file

@ -30,6 +30,7 @@ Technology Preview 2 :
Technology Preview 3 : Technology Preview 3 :
- Restore render progress. - Restore render progress.
- Store the terrain canvases in a tree to allow "multi-res" edition.
- Implement High Dynamic Range. - Implement High Dynamic Range.
- Implement Sub Surface Scattering for water. - Implement Sub Surface Scattering for water.
- Use bicubic interpolation for antialiasing. - Use bicubic interpolation for antialiasing.

8
gui_qt/baseform.cpp
View file

@ -112,12 +112,14 @@ BaseForm::BaseForm(QWidget* parent, bool auto_apply, bool with_layers) : QWidget
control->layout()->addWidget(_buttons); control->layout()->addWidget(_buttons);
control->layout()->setAlignment(_buttons, Qt::AlignBottom); control->layout()->setAlignment(_buttons, Qt::AlignBottom);
_button_apply = addButton(tr("Apply"));
_button_apply->setEnabled(false);
connect(_button_apply, SIGNAL(clicked()), this, SLOT(applyConfig()));
_button_revert = addButton(tr("Revert")); _button_revert = addButton(tr("Revert"));
_button_revert->setIcon(QIcon("images/cancel.png"));
_button_revert->setEnabled(false); _button_revert->setEnabled(false);
connect(_button_revert, SIGNAL(clicked()), this, SLOT(revertConfig())); connect(_button_revert, SIGNAL(clicked()), this, SLOT(revertConfig()));
_button_apply = addButton(tr("Apply"));
_button_apply->setIcon(QIcon("images/apply.png"));
_button_apply->setEnabled(false);
connect(_button_apply, SIGNAL(clicked()), this, SLOT(applyConfig()));
_auto_update_previews = true; _auto_update_previews = true;

15
gui_qt/dialogcurve.cpp
View file

@ -48,17 +48,20 @@ DialogCurve::DialogCurve(QWidget *parent, Curve* curve, double xmin, double xmax
layout()->addWidget(buttons); layout()->addWidget(buttons);
buttons->setLayout(new QHBoxLayout()); buttons->setLayout(new QHBoxLayout());
_button_accept = new QPushButton(tr("Validate"), buttons); _button_cancel = new QPushButton(tr("Cancel"), buttons);
buttons->layout()->addWidget(_button_accept); _button_cancel->setIcon(QIcon("images/cancel.png"));
QObject::connect(_button_accept, SIGNAL(clicked()), this, SLOT(accept())); buttons->layout()->addWidget(_button_cancel);
QObject::connect(_button_cancel, SIGNAL(clicked()), this, SLOT(reject()));
_button_revert = new QPushButton(tr("Revert"), buttons); _button_revert = new QPushButton(tr("Revert"), buttons);
_button_revert->setIcon(QIcon("images/revert.png"));
buttons->layout()->addWidget(_button_revert); buttons->layout()->addWidget(_button_revert);
QObject::connect(_button_revert, SIGNAL(clicked()), this, SLOT(revert())); QObject::connect(_button_revert, SIGNAL(clicked()), this, SLOT(revert()));
_button_cancel = new QPushButton(tr("Cancel"), buttons); _button_accept = new QPushButton(tr("Validate"), buttons);
buttons->layout()->addWidget(_button_cancel); _button_accept->setIcon(QIcon("images/apply.png"));
QObject::connect(_button_cancel, SIGNAL(clicked()), this, SLOT(reject())); buttons->layout()->addWidget(_button_accept);
QObject::connect(_button_accept, SIGNAL(clicked()), this, SLOT(accept()));
setWindowTitle(tr("Paysages 3D - Curve editor")); setWindowTitle(tr("Paysages 3D - Curve editor"));
resize(900, 600); resize(900, 600);

11
gui_qt/dialogheightmap.cpp
View file

@ -120,17 +120,20 @@ DialogHeightMap::DialogHeightMap(QWidget* parent, HeightMap* heightmap, TerrainC
slider->setValue(200); slider->setValue(200);
// Buttons layout // Buttons layout
button = new QPushButton(tr("Validate"), buttons); button = new QPushButton(tr("Cancel"), buttons);
button->setIcon(QIcon("images/cancel.png"));
buttons->layout()->addWidget(button); buttons->layout()->addWidget(button);
QObject::connect(button, SIGNAL(clicked()), this, SLOT(accept())); QObject::connect(button, SIGNAL(clicked()), this, SLOT(reject()));
button = new QPushButton(tr("Revert"), buttons); button = new QPushButton(tr("Revert"), buttons);
button->setIcon(QIcon("images/revert.png"));
buttons->layout()->addWidget(button); buttons->layout()->addWidget(button);
QObject::connect(button, SIGNAL(clicked()), this, SLOT(revert())); QObject::connect(button, SIGNAL(clicked()), this, SLOT(revert()));
button = new QPushButton(tr("Cancel"), buttons); button = new QPushButton(tr("Validate"), buttons);
button->setIcon(QIcon("images/apply.png"));
buttons->layout()->addWidget(button); buttons->layout()->addWidget(button);
QObject::connect(button, SIGNAL(clicked()), this, SLOT(reject())); QObject::connect(button, SIGNAL(clicked()), this, SLOT(accept()));
setWindowTitle(tr("Paysages 3D - Height map painting")); setWindowTitle(tr("Paysages 3D - Height map painting"));
} }

11
gui_qt/dialoglayers.cpp
View file

@ -25,17 +25,20 @@ DialogLayers::DialogLayers(QWidget *parent, Layers* layers, QString title, FormL
layout()->addWidget(buttons); layout()->addWidget(buttons);
layout()->setAlignment(buttons, Qt::AlignBottom); layout()->setAlignment(buttons, Qt::AlignBottom);
button = new QPushButton(tr("Validate"), buttons); button = new QPushButton(tr("Cancel"), buttons);
button->setIcon(QIcon("images/cancel.png"));
buttons->layout()->addWidget(button); buttons->layout()->addWidget(button);
QObject::connect(button, SIGNAL(clicked()), this, SLOT(accept())); QObject::connect(button, SIGNAL(clicked()), this, SLOT(reject()));
button = new QPushButton(tr("Reset"), buttons); button = new QPushButton(tr("Reset"), buttons);
button->setIcon(QIcon("images/revert.png"));
buttons->layout()->addWidget(button); buttons->layout()->addWidget(button);
QObject::connect(button, SIGNAL(clicked()), this, SLOT(revert())); QObject::connect(button, SIGNAL(clicked()), this, SLOT(revert()));
button = new QPushButton(tr("Cancel"), buttons); button = new QPushButton(tr("Validate"), buttons);
button->setIcon(QIcon("images/apply.png"));
buttons->layout()->addWidget(button); buttons->layout()->addWidget(button);
QObject::connect(button, SIGNAL(clicked()), this, SLOT(reject())); QObject::connect(button, SIGNAL(clicked()), this, SLOT(accept()));
setWindowTitle(tr("Paysages 3D - ") + title); setWindowTitle(tr("Paysages 3D - ") + title);
} }

13
gui_qt/dialogmaterial.cpp
View file

@ -22,17 +22,20 @@ DialogMaterial::DialogMaterial(QWidget *parent, SurfaceMaterial* material) : Dia
layout()->addWidget(buttons); layout()->addWidget(buttons);
layout()->setAlignment(buttons, Qt::AlignBottom); layout()->setAlignment(buttons, Qt::AlignBottom);
button = new QPushButton(tr("Validate"), buttons); button = new QPushButton(tr("Cancel"), buttons);
button->setIcon(QIcon("images/cancel.png"));
buttons->layout()->addWidget(button); buttons->layout()->addWidget(button);
QObject::connect(button, SIGNAL(clicked()), this, SLOT(accept())); QObject::connect(button, SIGNAL(clicked()), this, SLOT(reject()));
button = new QPushButton(tr("Reset"), buttons); button = new QPushButton(tr("Revert"), buttons);
button->setIcon(QIcon("images/revert.png"));
buttons->layout()->addWidget(button); buttons->layout()->addWidget(button);
QObject::connect(button, SIGNAL(clicked()), this, SLOT(revert())); QObject::connect(button, SIGNAL(clicked()), this, SLOT(revert()));
button = new QPushButton(tr("Cancel"), buttons); button = new QPushButton(tr("Validate"), buttons);
button->setIcon(QIcon("images/apply.png"));
buttons->layout()->addWidget(button); buttons->layout()->addWidget(button);
QObject::connect(button, SIGNAL(clicked()), this, SLOT(reject())); QObject::connect(button, SIGNAL(clicked()), this, SLOT(accept()));
setWindowTitle(tr("Paysages 3D - Material editor")); setWindowTitle(tr("Paysages 3D - Material editor"));
} }

13
gui_qt/dialognoise.cpp
View file

@ -161,17 +161,20 @@ DialogNoise::DialogNoise(QWidget *parent, NoiseGenerator* value):
buttons->setLayout(new QHBoxLayout()); buttons->setLayout(new QHBoxLayout());
form->layout()->addWidget(buttons); form->layout()->addWidget(buttons);
button = new QPushButton(tr("Validate"), buttons); button = new QPushButton(tr("Cancel"), buttons);
button->setIcon(QIcon("images/cancel.png"));
buttons->layout()->addWidget(button); buttons->layout()->addWidget(button);
QObject::connect(button, SIGNAL(clicked()), this, SLOT(accept())); QObject::connect(button, SIGNAL(clicked()), this, SLOT(reject()));
button = new QPushButton(tr("Reset"), buttons); button = new QPushButton(tr("Revert"), buttons);
button->setIcon(QIcon("images/revert.png"));
buttons->layout()->addWidget(button); buttons->layout()->addWidget(button);
QObject::connect(button, SIGNAL(clicked()), this, SLOT(revert())); QObject::connect(button, SIGNAL(clicked()), this, SLOT(revert()));
button = new QPushButton(tr("Cancel"), buttons); button = new QPushButton(tr("Validate"), buttons);
button->setIcon(QIcon("images/apply.png"));
buttons->layout()->addWidget(button); buttons->layout()->addWidget(button);
QObject::connect(button, SIGNAL(clicked()), this, SLOT(reject())); QObject::connect(button, SIGNAL(clicked()), this, SLOT(accept()));
setWindowTitle(tr("Paysages 3D - Noise editor")); setWindowTitle(tr("Paysages 3D - Noise editor"));

BIN
images/apply.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 35 KiB

BIN
images/cancel.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5 KiB

BIN
images/revert.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.5 KiB