Commit c7fa0a50 authored by Jan Möbius's avatar Jan Möbius
Browse files

GUI cosmetics



git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@12635 383ad7c9-94d9-4d36-a494-682f7c89f535
parent bd7a887c
...@@ -83,7 +83,7 @@ void SplatCloudRenderingControlPlugin::initializePlugin() ...@@ -83,7 +83,7 @@ void SplatCloudRenderingControlPlugin::initializePlugin()
// pointsizeScale layout // pointsizeScale layout
QHBoxLayout *toolboxPointsizeScaleLayout = new QHBoxLayout(); QHBoxLayout *toolboxPointsizeScaleLayout = new QHBoxLayout();
toolboxPointsizeScaleLayout->addWidget( new QLabel( "Pointsize Scale:" ) ); toolboxPointsizeScaleLayout->addWidget( new QLabel( "Pointsize Scale:" ) );
toolboxPointsizeScaleLayout->addItem ( new QSpacerItem( 8, 8, QSizePolicy::Expanding, QSizePolicy::Expanding ) ); toolboxPointsizeScaleLayout->addItem ( new QSpacerItem( 6, 6, QSizePolicy::Expanding, QSizePolicy::Expanding ) );
toolboxPointsizeScaleLayout->addWidget( toolboxPointsizeScale_ ); toolboxPointsizeScaleLayout->addWidget( toolboxPointsizeScale_ );
// buttons // buttons
...@@ -92,25 +92,20 @@ void SplatCloudRenderingControlPlugin::initializePlugin() ...@@ -92,25 +92,20 @@ void SplatCloudRenderingControlPlugin::initializePlugin()
QPushButton *toolboxReloadShadersButton = new QPushButton( "Reload Shaders" ); QPushButton *toolboxReloadShadersButton = new QPushButton( "Reload Shaders" );
QPushButton *toolboxRebuildVBOsButton = new QPushButton( "Rebuild VBOs" ); QPushButton *toolboxRebuildVBOsButton = new QPushButton( "Rebuild VBOs" );
// top buttons layout // buttons layout
QHBoxLayout *toolboxTopButtonsLayout = new QHBoxLayout(); QGridLayout *toolboxButtonsLayout = new QGridLayout();
toolboxTopButtonsLayout->addWidget( toolboxEnableBackfaceCullingButton ); toolboxButtonsLayout->setSpacing( 6 );
toolboxTopButtonsLayout->addItem ( new QSpacerItem( 8, 8 ) ); toolboxButtonsLayout->addWidget( toolboxEnableBackfaceCullingButton, 0, 0 );
toolboxTopButtonsLayout->addWidget( toolboxDisableBackfaceCullingButton ); toolboxButtonsLayout->addWidget( toolboxDisableBackfaceCullingButton, 0, 1 );
toolboxButtonsLayout->addWidget( toolboxReloadShadersButton, 1, 0 );
// bottom buttons layout toolboxButtonsLayout->addWidget( toolboxRebuildVBOsButton, 1, 1 );
QHBoxLayout *toolboxBottomButtonsLayout = new QHBoxLayout();
toolboxBottomButtonsLayout->addWidget( toolboxReloadShadersButton );
toolboxBottomButtonsLayout->addItem ( new QSpacerItem( 8, 8 ) );
toolboxBottomButtonsLayout->addWidget( toolboxRebuildVBOsButton );
// options layout // options layout
QVBoxLayout *toolboxOptionsLayout = new QVBoxLayout(); QVBoxLayout *toolboxOptionsLayout = new QVBoxLayout();
toolboxOptionsLayout->addItem ( new QSpacerItem( 8, 8, QSizePolicy::Expanding, QSizePolicy::Expanding ) ); toolboxOptionsLayout->addItem ( new QSpacerItem( 6, 6, QSizePolicy::Expanding, QSizePolicy::Expanding ) );
toolboxOptionsLayout->addItem ( toolboxPointsizeScaleLayout ); toolboxOptionsLayout->addItem ( toolboxPointsizeScaleLayout );
toolboxOptionsLayout->addItem ( new QSpacerItem( 8, 8, QSizePolicy::Expanding, QSizePolicy::Expanding ) ); toolboxOptionsLayout->addItem ( new QSpacerItem( 6, 6, QSizePolicy::Expanding, QSizePolicy::Expanding ) );
toolboxOptionsLayout->addItem ( toolboxTopButtonsLayout ); toolboxOptionsLayout->addItem ( toolboxButtonsLayout );
toolboxOptionsLayout->addItem ( toolboxBottomButtonsLayout );
// ---- defaults ---- // ---- defaults ----
...@@ -134,11 +129,11 @@ void SplatCloudRenderingControlPlugin::initializePlugin() ...@@ -134,11 +129,11 @@ void SplatCloudRenderingControlPlugin::initializePlugin()
// defaultNormal layout // defaultNormal layout
QHBoxLayout *toolboxDefaultNormalLayout = new QHBoxLayout(); QHBoxLayout *toolboxDefaultNormalLayout = new QHBoxLayout();
toolboxDefaultNormalLayout->addWidget( new QLabel( "Default Normal:" ) ); toolboxDefaultNormalLayout->addWidget( new QLabel( "Default Normal:" ) );
toolboxDefaultNormalLayout->addItem ( new QSpacerItem( 8, 8, QSizePolicy::Expanding, QSizePolicy::Expanding ) ); toolboxDefaultNormalLayout->addItem ( new QSpacerItem( 6, 6, QSizePolicy::Expanding, QSizePolicy::Expanding ) );
toolboxDefaultNormalLayout->addWidget( toolboxDefaultNormalX_ ); toolboxDefaultNormalLayout->addWidget( toolboxDefaultNormalX_ );
toolboxDefaultNormalLayout->addItem ( new QSpacerItem( 4, 4 ) ); toolboxDefaultNormalLayout->addItem ( new QSpacerItem( 6, 6 ) );
toolboxDefaultNormalLayout->addWidget( toolboxDefaultNormalY_ ); toolboxDefaultNormalLayout->addWidget( toolboxDefaultNormalY_ );
toolboxDefaultNormalLayout->addItem ( new QSpacerItem( 4, 4 ) ); toolboxDefaultNormalLayout->addItem ( new QSpacerItem( 6, 6 ) );
toolboxDefaultNormalLayout->addWidget( toolboxDefaultNormalZ_ ); toolboxDefaultNormalLayout->addWidget( toolboxDefaultNormalZ_ );
// defaultPointsize // defaultPointsize
...@@ -151,7 +146,7 @@ void SplatCloudRenderingControlPlugin::initializePlugin() ...@@ -151,7 +146,7 @@ void SplatCloudRenderingControlPlugin::initializePlugin()
// defaultPointsize layout // defaultPointsize layout
QHBoxLayout *toolboxDefaultPointsizeLayout = new QHBoxLayout(); QHBoxLayout *toolboxDefaultPointsizeLayout = new QHBoxLayout();
toolboxDefaultPointsizeLayout->addWidget( new QLabel( "Default Pointsize:" ) ); toolboxDefaultPointsizeLayout->addWidget( new QLabel( "Default Pointsize:" ) );
toolboxDefaultPointsizeLayout->addItem ( new QSpacerItem( 8, 8, QSizePolicy::Expanding, QSizePolicy::Expanding ) ); toolboxDefaultPointsizeLayout->addItem ( new QSpacerItem( 6, 6, QSizePolicy::Expanding, QSizePolicy::Expanding ) );
toolboxDefaultPointsizeLayout->addWidget( toolboxDefaultPointsize_ ); toolboxDefaultPointsizeLayout->addWidget( toolboxDefaultPointsize_ );
// defaultColor // defaultColor
...@@ -171,11 +166,11 @@ void SplatCloudRenderingControlPlugin::initializePlugin() ...@@ -171,11 +166,11 @@ void SplatCloudRenderingControlPlugin::initializePlugin()
// defaultColor layout // defaultColor layout
QHBoxLayout *toolboxDefaultColorLayout = new QHBoxLayout(); QHBoxLayout *toolboxDefaultColorLayout = new QHBoxLayout();
toolboxDefaultColorLayout->addWidget( new QLabel( "Default Color:" ) ); toolboxDefaultColorLayout->addWidget( new QLabel( "Default Color:" ) );
toolboxDefaultColorLayout->addItem ( new QSpacerItem( 8, 8, QSizePolicy::Expanding, QSizePolicy::Expanding ) ); toolboxDefaultColorLayout->addItem ( new QSpacerItem( 6, 6, QSizePolicy::Expanding, QSizePolicy::Expanding ) );
toolboxDefaultColorLayout->addWidget( toolboxDefaultColorR_ ); toolboxDefaultColorLayout->addWidget( toolboxDefaultColorR_ );
toolboxDefaultColorLayout->addItem ( new QSpacerItem( 4, 4 ) ); toolboxDefaultColorLayout->addItem ( new QSpacerItem( 6, 6 ) );
toolboxDefaultColorLayout->addWidget( toolboxDefaultColorG_ ); toolboxDefaultColorLayout->addWidget( toolboxDefaultColorG_ );
toolboxDefaultColorLayout->addItem ( new QSpacerItem( 4, 4 ) ); toolboxDefaultColorLayout->addItem ( new QSpacerItem( 6, 6 ) );
toolboxDefaultColorLayout->addWidget( toolboxDefaultColorB_ ); toolboxDefaultColorLayout->addWidget( toolboxDefaultColorB_ );
// applyDefaults button // applyDefaults button
...@@ -186,7 +181,7 @@ void SplatCloudRenderingControlPlugin::initializePlugin() ...@@ -186,7 +181,7 @@ void SplatCloudRenderingControlPlugin::initializePlugin()
toolboxDefaultsLayout->addItem ( toolboxDefaultNormalLayout ); toolboxDefaultsLayout->addItem ( toolboxDefaultNormalLayout );
toolboxDefaultsLayout->addItem ( toolboxDefaultPointsizeLayout ); toolboxDefaultsLayout->addItem ( toolboxDefaultPointsizeLayout );
toolboxDefaultsLayout->addItem ( toolboxDefaultColorLayout ); toolboxDefaultsLayout->addItem ( toolboxDefaultColorLayout );
toolboxDefaultsLayout->addItem ( new QSpacerItem( 8, 8, QSizePolicy::Expanding, QSizePolicy::Expanding ) ); toolboxDefaultsLayout->addItem ( new QSpacerItem( 6, 6, QSizePolicy::Expanding, QSizePolicy::Expanding ) );
toolboxDefaultsLayout->addWidget( toolboxApplyDefaultsButton ); toolboxDefaultsLayout->addWidget( toolboxApplyDefaultsButton );
// ---- // ----
...@@ -281,7 +276,7 @@ void SplatCloudRenderingControlPlugin::initializePlugin() ...@@ -281,7 +276,7 @@ void SplatCloudRenderingControlPlugin::initializePlugin()
// pointsizeScale layout // pointsizeScale layout
QHBoxLayout *scaleWidgetPointsizeScaleLayout = new QHBoxLayout(); QHBoxLayout *scaleWidgetPointsizeScaleLayout = new QHBoxLayout();
scaleWidgetPointsizeScaleLayout->addWidget( new QLabel( "Pointsize Scale:" ) ); scaleWidgetPointsizeScaleLayout->addWidget( new QLabel( "Pointsize Scale:" ) );
scaleWidgetPointsizeScaleLayout->addItem ( new QSpacerItem( 8, 8, QSizePolicy::Expanding, QSizePolicy::Expanding ) ); scaleWidgetPointsizeScaleLayout->addItem ( new QSpacerItem( 6, 6, QSizePolicy::Expanding, QSizePolicy::Expanding ) );
scaleWidgetPointsizeScaleLayout->addWidget( scaleWidgetPointsizeScale_ ); scaleWidgetPointsizeScaleLayout->addWidget( scaleWidgetPointsizeScale_ );
// widget layout // widget layout
...@@ -319,11 +314,11 @@ void SplatCloudRenderingControlPlugin::initializePlugin() ...@@ -319,11 +314,11 @@ void SplatCloudRenderingControlPlugin::initializePlugin()
// defaultNormal layout // defaultNormal layout
QHBoxLayout *defaultsWidgetDefaultNormalLayout = new QHBoxLayout(); QHBoxLayout *defaultsWidgetDefaultNormalLayout = new QHBoxLayout();
defaultsWidgetDefaultNormalLayout->addWidget( new QLabel( "Default Normal:" ) ); defaultsWidgetDefaultNormalLayout->addWidget( new QLabel( "Default Normal:" ) );
defaultsWidgetDefaultNormalLayout->addItem ( new QSpacerItem( 8, 8, QSizePolicy::Expanding, QSizePolicy::Expanding ) ); defaultsWidgetDefaultNormalLayout->addItem ( new QSpacerItem( 6, 6, QSizePolicy::Expanding, QSizePolicy::Expanding ) );
defaultsWidgetDefaultNormalLayout->addWidget( defaultsWidgetDefaultNormalX_ ); defaultsWidgetDefaultNormalLayout->addWidget( defaultsWidgetDefaultNormalX_ );
defaultsWidgetDefaultNormalLayout->addItem ( new QSpacerItem( 4, 4 ) ); defaultsWidgetDefaultNormalLayout->addItem ( new QSpacerItem( 6, 6 ) );
defaultsWidgetDefaultNormalLayout->addWidget( defaultsWidgetDefaultNormalY_ ); defaultsWidgetDefaultNormalLayout->addWidget( defaultsWidgetDefaultNormalY_ );
defaultsWidgetDefaultNormalLayout->addItem ( new QSpacerItem( 4, 4 ) ); defaultsWidgetDefaultNormalLayout->addItem ( new QSpacerItem( 6, 6 ) );
defaultsWidgetDefaultNormalLayout->addWidget( defaultsWidgetDefaultNormalZ_ ); defaultsWidgetDefaultNormalLayout->addWidget( defaultsWidgetDefaultNormalZ_ );
// defaultPointsize // defaultPointsize
...@@ -335,7 +330,7 @@ void SplatCloudRenderingControlPlugin::initializePlugin() ...@@ -335,7 +330,7 @@ void SplatCloudRenderingControlPlugin::initializePlugin()
// defaultPointsize layout // defaultPointsize layout
QHBoxLayout *defaultsWidgetDefaultPointsizeLayout = new QHBoxLayout(); QHBoxLayout *defaultsWidgetDefaultPointsizeLayout = new QHBoxLayout();
defaultsWidgetDefaultPointsizeLayout->addWidget( new QLabel( "Default Pointsize:" ) ); defaultsWidgetDefaultPointsizeLayout->addWidget( new QLabel( "Default Pointsize:" ) );
defaultsWidgetDefaultPointsizeLayout->addItem ( new QSpacerItem( 8, 8, QSizePolicy::Expanding, QSizePolicy::Expanding ) ); defaultsWidgetDefaultPointsizeLayout->addItem ( new QSpacerItem( 6, 6, QSizePolicy::Expanding, QSizePolicy::Expanding ) );
defaultsWidgetDefaultPointsizeLayout->addWidget( defaultsWidgetDefaultPointsize_ ); defaultsWidgetDefaultPointsizeLayout->addWidget( defaultsWidgetDefaultPointsize_ );
// defaultColor // defaultColor
...@@ -352,11 +347,11 @@ void SplatCloudRenderingControlPlugin::initializePlugin() ...@@ -352,11 +347,11 @@ void SplatCloudRenderingControlPlugin::initializePlugin()
// defaultColor layout // defaultColor layout
QHBoxLayout *defaultsWidgetDefaultColorLayout = new QHBoxLayout(); QHBoxLayout *defaultsWidgetDefaultColorLayout = new QHBoxLayout();
defaultsWidgetDefaultColorLayout->addWidget( new QLabel( "Default Color:" ) ); defaultsWidgetDefaultColorLayout->addWidget( new QLabel( "Default Color:" ) );
defaultsWidgetDefaultColorLayout->addItem ( new QSpacerItem( 8, 8, QSizePolicy::Expanding, QSizePolicy::Expanding ) ); defaultsWidgetDefaultColorLayout->addItem ( new QSpacerItem( 6, 6, QSizePolicy::Expanding, QSizePolicy::Expanding ) );
defaultsWidgetDefaultColorLayout->addWidget( defaultsWidgetDefaultColorR_ ); defaultsWidgetDefaultColorLayout->addWidget( defaultsWidgetDefaultColorR_ );
defaultsWidgetDefaultColorLayout->addItem ( new QSpacerItem( 4, 4 ) ); defaultsWidgetDefaultColorLayout->addItem ( new QSpacerItem( 6, 6 ) );
defaultsWidgetDefaultColorLayout->addWidget( defaultsWidgetDefaultColorG_ ); defaultsWidgetDefaultColorLayout->addWidget( defaultsWidgetDefaultColorG_ );
defaultsWidgetDefaultColorLayout->addItem ( new QSpacerItem( 4, 4 ) ); defaultsWidgetDefaultColorLayout->addItem ( new QSpacerItem( 6, 6 ) );
defaultsWidgetDefaultColorLayout->addWidget( defaultsWidgetDefaultColorB_ ); defaultsWidgetDefaultColorLayout->addWidget( defaultsWidgetDefaultColorB_ );
// cancel and apply buttons // cancel and apply buttons
...@@ -366,7 +361,7 @@ void SplatCloudRenderingControlPlugin::initializePlugin() ...@@ -366,7 +361,7 @@ void SplatCloudRenderingControlPlugin::initializePlugin()
// buttons layout // buttons layout
QHBoxLayout *defaultsWidgetButtonsLayout = new QHBoxLayout(); QHBoxLayout *defaultsWidgetButtonsLayout = new QHBoxLayout();
defaultsWidgetButtonsLayout->addWidget( defaultsWidgetCancelButton ); defaultsWidgetButtonsLayout->addWidget( defaultsWidgetCancelButton );
defaultsWidgetButtonsLayout->addItem ( new QSpacerItem( 8, 8, QSizePolicy::Expanding, QSizePolicy::Expanding ) ); defaultsWidgetButtonsLayout->addItem ( new QSpacerItem( 6, 6, QSizePolicy::Expanding, QSizePolicy::Expanding ) );
defaultsWidgetButtonsLayout->addWidget( defaultsWidgetApplyButton ); defaultsWidgetButtonsLayout->addWidget( defaultsWidgetApplyButton );
// widget layout // widget layout
...@@ -374,7 +369,7 @@ void SplatCloudRenderingControlPlugin::initializePlugin() ...@@ -374,7 +369,7 @@ void SplatCloudRenderingControlPlugin::initializePlugin()
defaultsWidgetLayout->addItem( defaultsWidgetDefaultNormalLayout ); defaultsWidgetLayout->addItem( defaultsWidgetDefaultNormalLayout );
defaultsWidgetLayout->addItem( defaultsWidgetDefaultPointsizeLayout ); defaultsWidgetLayout->addItem( defaultsWidgetDefaultPointsizeLayout );
defaultsWidgetLayout->addItem( defaultsWidgetDefaultColorLayout ); defaultsWidgetLayout->addItem( defaultsWidgetDefaultColorLayout );
defaultsWidgetLayout->addItem( new QSpacerItem( 8, 8, QSizePolicy::Expanding, QSizePolicy::Expanding ) ); defaultsWidgetLayout->addItem( new QSpacerItem( 6, 6, QSizePolicy::Expanding, QSizePolicy::Expanding ) );
defaultsWidgetLayout->addItem( defaultsWidgetButtonsLayout ); defaultsWidgetLayout->addItem( defaultsWidgetButtonsLayout );
// widget // widget
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment