x64 fixICU fixes

git-svn-id: svn://db.shs.com.ru/libs@6 a8b55f48-bf90-11e4-a774-851b48703e85
This commit is contained in:
2015-04-15 07:42:34 +00:00
parent 834e34d88f
commit fd4ffc3677
3 changed files with 161 additions and 91 deletions

View File

@@ -21,9 +21,12 @@
#include <QFileDialog>
#include "gltypes.h"
#include "ui_material_editor.h"
class MaterialEditor: public QWidget, private Ui::MaterialEditor
namespace Ui {
class MaterialEditor;
};
class MaterialEditor: public QWidget
{
Q_OBJECT
public:
@@ -36,27 +39,28 @@ protected:
void changeEvent(QEvent * e);
bool active;
Ui::MaterialEditor * ui;
private slots:
void materialChanged() {if (active) emit changed();}
void on_buttonDiffuseSelect_clicked();
void on_buttonDiffuseClear_clicked() {lineDiffuse->setText(""); lineDiffuse->setProperty("GLpath", ""); materialChanged();}
void on_buttonDiffuseClear_clicked();
void on_buttonBumpSelect_clicked();
void on_buttonBumpClear_clicked() {lineBump->setText(""); lineBump->setProperty("GLpath", ""); materialChanged();}
void on_buttonBumpClear_clicked();
void on_buttonReliefSelect_clicked();
void on_buttonReliefClear_clicked() {lineRelief->setText(""); lineRelief->setProperty("GLpath", ""); materialChanged();}
void on_buttonReliefClear_clicked();
void on_buttonReflFrontSelect_clicked();
void on_buttonReflFrontClear_clicked() {lineReflFront->setText(""); lineReflFront->setProperty("GLpath", ""); materialChanged();}
void on_buttonReflFrontClear_clicked();
void on_buttonReflBackSelect_clicked();
void on_buttonReflBackClear_clicked() {lineReflBack->setText(""); lineReflBack->setProperty("GLpath", ""); materialChanged();}
void on_buttonReflBackClear_clicked();
void on_buttonReflLeftSelect_clicked();
void on_buttonReflLeftClear_clicked() {lineReflLeft->setText(""); lineReflLeft->setProperty("GLpath", ""); materialChanged();}
void on_buttonReflLeftClear_clicked();
void on_buttonReflRightSelect_clicked();
void on_buttonReflRightClear_clicked() {lineReflRight->setText(""); lineReflRight->setProperty("GLpath", ""); materialChanged();}
void on_buttonReflRightClear_clicked();
void on_buttonReflTopSelect_clicked();
void on_buttonReflTopClear_clicked() {lineReflTop->setText(""); lineReflTop->setProperty("GLpath", ""); materialChanged();}
void on_buttonReflTopClear_clicked();
void on_buttonReflBottomSelect_clicked();
void on_buttonReflBottomClear_clicked() {lineReflBottom->setText(""); lineReflBottom->setProperty("GLpath", ""); materialChanged();}
void on_buttonReflBottomClear_clicked();
void on_buttonLoadCubeDir_clicked();
signals: