From 9f9948d9e3aa985cfafab0721e5bdb7958fcbb65 Mon Sep 17 00:00:00 2001 From: Massimiliano Corsini maxcorsini Date: Mon, 10 Dec 2007 14:21:02 +0000 Subject: [PATCH] new version with correct layout --- .../render_rm/rmShadowDialog.ui | 471 ++++++++++-------- src/meshlabplugins/render_rm/rmshaderdialog.h | 25 +- 2 files changed, 273 insertions(+), 223 deletions(-) diff --git a/src/meshlabplugins/render_rm/rmShadowDialog.ui b/src/meshlabplugins/render_rm/rmShadowDialog.ui index 7820284c6..7bec12e39 100644 --- a/src/meshlabplugins/render_rm/rmShadowDialog.ui +++ b/src/meshlabplugins/render_rm/rmShadowDialog.ui @@ -5,8 +5,8 @@ 0 0 - 499 - 381 + 492 + 364 @@ -21,228 +21,269 @@ true - - - - 10 - 40 - 481 - 331 - + + + 9 - - Passes + + 6 - - - - 10 - 20 - 461 - 22 - - - - - - - 10 - 50 - 461 - 271 - - - - 0 - - - - Uniform - - - - - 10 - 10 - 441 - 231 - + + + + Passes + + + + 9 - - QFrame::Box + + 6 - - QFrame::Raised - - - 1 - - - 0 - - - - - 10 - 10 - 421 - 211 - + + + + 2 + + + + Uniform + + + + 9 + + + 6 + + + + + QFrame::Box + + + QFrame::Raised + + + 1 + + + 0 + + + + 9 + + + 6 + + + + + 0 + + + 6 + + + + + + + + + + + Textures + + + + 9 + + + 6 + + + + + QFrame::Box + + + QFrame::Raised + + + + 9 + + + 6 + + + + + 0 + + + 6 + + + + + + + + + + + OpenGL + + + + 9 + + + 6 + + + + + QFrame::Box + + + QFrame::Raised + + + 1 + + + 0 + + + + 9 + + + 6 + + + + + 0 + + + 6 + + + + + + + + + + + Vertex + + + + 9 + + + 6 + + + + + QTextEdit::NoWrap + + + true + + + false + + + + + + + + Fragment + + + + 9 + + + 6 + + + + + QTextEdit::NoWrap + + + true + + + false + + + + + + + + + + + + + + + + + 0 + + + 6 + + + + + + 4 + 5 + 0 + 0 + - - - - - - - Textures - - - - - 10 - 10 - 441 - 231 - - - - QFrame::Box - - - QFrame::Raised - - - - - 10 - 10 - 421 - 211 - + + Effect Selection - - - - - - OpenGL - - - - - 10 - 10 - 441 - 231 - - - - QFrame::Box - - - QFrame::Raised - - - - - 10 - 10 - 421 - 211 - + + + + + + + + + 0 + 0 + 0 + 0 + + + + Ok - - - - - - Vertex - - - - - 0 - 0 - 451 - 241 - - - - QTextEdit::NoWrap - - - true - - - false - - - - - - Fragment - - - - - 0 - 0 - 451 - 241 - - - - QTextEdit::NoWrap - - - true - - - false - - - - - - - - - 10 - 10 - 81 - 21 - - - - Effect Selection - - - - - - 90 - 10 - 181 - 22 - - - - - - - 280 - 10 - 75 - 23 - - - - Ok - - + + + + diff --git a/src/meshlabplugins/render_rm/rmshaderdialog.h b/src/meshlabplugins/render_rm/rmshaderdialog.h index eb9590e43..757e388ff 100644 --- a/src/meshlabplugins/render_rm/rmshaderdialog.h +++ b/src/meshlabplugins/render_rm/rmshaderdialog.h @@ -23,6 +23,9 @@ /**************************************************************************** History $Log$ +Revision 1.3 2007/12/10 14:21:02 corsini +new version with correct layout + Revision 1.2 2007/12/03 11:35:24 corsini code restyling @@ -71,18 +74,24 @@ public: // private data members private: - Ui_RmShaderDialogClass ui; - QGLWidget* glarea; - RenderMode * rendMode; - RmXmlParser * parser; - RmEffect * eff_selected; - RmPass * pass_selected; + Ui_RmShaderDialogClass ui; + + QGridLayout *layoutUniform; + QGridLayout *layoutTextures; + QGridLayout *layoutOpengl; + + QGLWidget *glarea; + RenderMode *rendMode; + RmXmlParser *parser; + + RmEffect *eff_selected; + RmPass *pass_selected; QList shown; - GLStateHolder * holder; + GLStateHolder *holder; - QSignalMapper * signaler; + QSignalMapper *signaler; // Qt slots public slots: