diff --git a/code/nel/tools/3d/object_viewer_qt/src/animation_form.ui b/code/nel/tools/3d/object_viewer_qt/src/animation_form.ui index aceb1eaec..10485858e 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/animation_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/animation_form.ui @@ -6,8 +6,8 @@ 0 0 - 519 - 98 + 489 + 92 @@ -18,8 +18,8 @@ - 519 - 98 + 489 + 92 @@ -42,6 +42,12 @@ + + 9 + + + 1 + diff --git a/code/nel/tools/3d/object_viewer_qt/src/animation_set_form.ui b/code/nel/tools/3d/object_viewer_qt/src/animation_set_form.ui index 9d1a03380..f472fa3ce 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/animation_set_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/animation_set_form.ui @@ -7,7 +7,7 @@ 0 0 300 - 562 + 576 @@ -43,6 +43,9 @@ + + 5 + @@ -139,9 +142,6 @@ false - - false - 1 @@ -183,9 +183,6 @@ false - - false - 1 diff --git a/code/nel/tools/3d/object_viewer_qt/src/attrib_form.ui b/code/nel/tools/3d/object_viewer_qt/src/attrib_form.ui index 3a3778109..c3efabdbd 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/attrib_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/attrib_form.ui @@ -6,8 +6,8 @@ 0 0 - 276 - 273 + 231 + 213 @@ -17,6 +17,12 @@ + + 6 + + + 5 + @@ -32,9 +38,7 @@ - - schemeWidget - + @@ -114,6 +118,12 @@ true + + 0 + + + 5 + diff --git a/code/nel/tools/3d/object_viewer_qt/src/basic_edit_form.ui b/code/nel/tools/3d/object_viewer_qt/src/basic_edit_form.ui index ce6cbac40..287adaf53 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/basic_edit_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/basic_edit_form.ui @@ -6,14 +6,20 @@ 0 0 - 283 - 99 + 241 + 75 Form + + 0 + + + 5 + diff --git a/code/nel/tools/3d/object_viewer_qt/src/color_edit_form.ui b/code/nel/tools/3d/object_viewer_qt/src/color_edit_form.ui index 14ed81b98..5ab22dac6 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/color_edit_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/color_edit_form.ui @@ -6,14 +6,20 @@ 0 0 - 255 - 116 + 204 + 103 Form + + 0 + + + 5 + diff --git a/code/nel/tools/3d/object_viewer_qt/src/constraint_mesh_form.ui b/code/nel/tools/3d/object_viewer_qt/src/constraint_mesh_form.ui index 0a6ab1cde..09847e0f2 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/constraint_mesh_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/constraint_mesh_form.ui @@ -6,14 +6,20 @@ 0 0 - 238 - 460 + 193 + 366 Form + + 0 + + + 5 + @@ -116,7 +122,7 @@ QTabWidget::South - 1 + 2 true @@ -126,8 +132,17 @@ Translation + + 6 + + + 5 + + + 5 + @@ -257,8 +272,14 @@ Scale + + 6 + + + 5 + @@ -388,6 +409,12 @@ Rotation + + 6 + + + 5 + diff --git a/code/nel/tools/3d/object_viewer_qt/src/direction_form.ui b/code/nel/tools/3d/object_viewer_qt/src/direction_form.ui index f04c7302b..586298682 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/direction_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/direction_form.ui @@ -6,15 +6,21 @@ 0 0 - 268 - 101 + 263 + 95 Form - - + + + 0 + + + 5 + + Direction: @@ -22,45 +28,98 @@ - - - - 30 - 16777215 - + + + 3 - - +I - - + + + + + 30 + 16777215 + + + + +I + + + + + + + + 30 + 16777215 + + + + +J + + + + + + + + 30 + 16777215 + + + + +K + + + + + + + + 30 + 16777215 + + + + -I + + + + + + + + 30 + 16777215 + + + + -J + + + + + + + + 30 + 16777215 + + + + -K + + + + + + + Global + + + + - - - - 30 - 16777215 - - - - +J - - - - - - - - 30 - 16777215 - - - - +K - - - - @@ -82,7 +141,7 @@ - + @@ -104,7 +163,7 @@ - + Qt::Horizontal @@ -117,52 +176,6 @@ - - - - - 30 - 16777215 - - - - -I - - - - - - - - 30 - 16777215 - - - - -J - - - - - - - - 30 - 16777215 - - - - -K - - - - - - - Global - - - diff --git a/code/nel/tools/3d/object_viewer_qt/src/edit_range_float_form.ui b/code/nel/tools/3d/object_viewer_qt/src/edit_range_float_form.ui index 066876829..a6149649d 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/edit_range_float_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/edit_range_float_form.ui @@ -6,14 +6,20 @@ 0 0 - 304 - 39 + 273 + 20 Form + + 5 + + + 0 + diff --git a/code/nel/tools/3d/object_viewer_qt/src/edit_range_uint_form.ui b/code/nel/tools/3d/object_viewer_qt/src/edit_range_uint_form.ui index d9878254e..821a8f9be 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/edit_range_uint_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/edit_range_uint_form.ui @@ -6,14 +6,20 @@ 0 0 - 294 - 32 + 231 + 20 Form + + 5 + + + 0 + diff --git a/code/nel/tools/3d/object_viewer_qt/src/emitter_form.ui b/code/nel/tools/3d/object_viewer_qt/src/emitter_form.ui index ea5f11a8b..765b829a4 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/emitter_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/emitter_form.ui @@ -6,14 +6,17 @@ 0 0 - 382 - 450 + 349 + 393 Form + + 6 + @@ -33,6 +36,9 @@ General + + 5 + diff --git a/code/nel/tools/3d/object_viewer_qt/src/hoverpoints.cpp b/code/nel/tools/3d/object_viewer_qt/src/hoverpoints.cpp index d9ae54f83..fe0751082 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/hoverpoints.cpp +++ b/code/nel/tools/3d/object_viewer_qt/src/hoverpoints.cpp @@ -1,43 +1,20 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the demonstration applications of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Object Viewer Qt - MMORPG Framework +// Copyright (C) 2010 Winch Gate Property Limited +// Copyright (C) 2010 Dzmitry Kamiahin +// Parts by Nokia Corporation (qt-info@nokia.com) Copyright (C) 2009. +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . #include "stdpch.h" #include "hoverpoints.h" diff --git a/code/nel/tools/3d/object_viewer_qt/src/hoverpoints.h b/code/nel/tools/3d/object_viewer_qt/src/hoverpoints.h index 8db9d4cdf..a43d4c772 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/hoverpoints.h +++ b/code/nel/tools/3d/object_viewer_qt/src/hoverpoints.h @@ -1,43 +1,20 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the demonstration applications of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Object Viewer Qt - MMORPG Framework +// Copyright (C) 2010 Winch Gate Property Limited +// Copyright (C) 2010 Dzmitry Kamiahin +// Parts by Nokia Corporation (qt-info@nokia.com) Copyright (C) 2009. +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . #ifndef HOVERPOINTS_H #define HOVERPOINTS_H diff --git a/code/nel/tools/3d/object_viewer_qt/src/located_bindable_form.ui b/code/nel/tools/3d/object_viewer_qt/src/located_bindable_form.ui index 8af23ac48..9df75e452 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/located_bindable_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/located_bindable_form.ui @@ -6,8 +6,8 @@ 0 0 - 352 - 494 + 262 + 473 @@ -19,7 +19,13 @@ Form - + + + 5 + + + 6 + @@ -54,7 +60,7 @@ - + @@ -90,11 +96,22 @@ - - - Global color lighting - - + + + + + No AutoLOD + + + + + + + Global color lighting + + + + @@ -124,7 +141,14 @@ - + + + + Color + + + + Qt::Vertical @@ -137,20 +161,6 @@ - - - - No AutoLOD - - - - - - - Color - - - @@ -171,7 +181,7 @@ - + false @@ -180,6 +190,19 @@ + + 9 + + + 6 + + + + + Height + + + @@ -190,17 +213,24 @@ - - - - Height - - - - + + + + Size + + + + + + + Angle 2D + + + + Qt::Vertical @@ -213,20 +243,6 @@ - - - - Size - - - - - - - Angle 2D - - - @@ -240,6 +256,13 @@ + + + + Rotation + + + @@ -256,6 +279,12 @@ + + 6 + + + 5 + @@ -309,13 +338,6 @@ - - - - Rotation - - - @@ -396,7 +418,7 @@ - + @@ -406,7 +428,7 @@ - + @@ -416,10 +438,10 @@ - + - + Qt::Vertical @@ -518,7 +540,7 @@ - + @@ -528,60 +550,70 @@ - + - + Texture U factor: - + - + Texture V factor: - + - + - + Non parametric anim only - Force constant length - - - - - - - Use hermitte interpolation + Force constant length(m): + + + false + + + + + + + LOD degradation: + + + + + + + Trail coord. system: - + @@ -605,37 +637,20 @@ - - + + - Length(m): + Use hermitte interpolation - - - - false - - - - - - - LOD degradation: - - - - - - - + - + Qt::Vertical @@ -643,7 +658,7 @@ 20 - 133 + 100 diff --git a/code/nel/tools/3d/object_viewer_qt/src/located_bindable_page.cpp b/code/nel/tools/3d/object_viewer_qt/src/located_bindable_page.cpp index 24ef4ce54..81f23092b 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/located_bindable_page.cpp +++ b/code/nel/tools/3d/object_viewer_qt/src/located_bindable_page.cpp @@ -616,7 +616,6 @@ void CLocatedBindablePage::setConstantLength(bool state) NL3D::CPSRibbonBase *ribbon = dynamic_cast(_Bindable); ribbon->setRibbonMode(state ? NL3D::CPSRibbonBase::FixedSize : NL3D::CPSRibbonBase::VariableSize); _ui.ribbonLengthWidget->setEnabled(state); - _ui.ribbonLengthLabel->setEnabled(state); } void CLocatedBindablePage::setTrailCoordSystem(int index) diff --git a/code/nel/tools/3d/object_viewer_qt/src/located_form.ui b/code/nel/tools/3d/object_viewer_qt/src/located_form.ui index 106b1bebd..8122e9815 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/located_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/located_form.ui @@ -6,14 +6,17 @@ 0 0 - 291 - 410 + 259 + 353 Form + + 6 + @@ -152,6 +155,9 @@ + + 5 + diff --git a/code/nel/tools/3d/object_viewer_qt/src/mesh_form.ui b/code/nel/tools/3d/object_viewer_qt/src/mesh_form.ui index ef44c2c3a..eb76de3a2 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/mesh_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/mesh_form.ui @@ -6,8 +6,8 @@ 0 0 - 195 - 118 + 180 + 110 @@ -17,6 +17,12 @@ + + 6 + + + 5 + diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_control_form.ui b/code/nel/tools/3d/object_viewer_qt/src/particle_control_form.ui index e85d030ff..75936fe87 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/particle_control_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/particle_control_form.ui @@ -6,14 +6,14 @@ 0 0 - 941 - 111 + 913 + 88 - 941 - 111 + 913 + 88 @@ -27,6 +27,12 @@ + + 6 + + + 5 + @@ -104,12 +110,18 @@ - 0 + 1 + + 0 + + + 4 + @@ -197,6 +209,9 @@ + + 0 + @@ -287,6 +302,9 @@ + + 3 + diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_force_form.ui b/code/nel/tools/3d/object_viewer_qt/src/particle_force_form.ui index e645fd3b0..c5c697954 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/particle_force_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/particle_force_form.ui @@ -6,14 +6,17 @@ 0 0 - 298 - 458 + 243 + 451 Form + + 6 + @@ -27,6 +30,9 @@ Target + + 3 + diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_light_form.ui b/code/nel/tools/3d/object_viewer_qt/src/particle_light_form.ui index fbdf789b9..3b7df9357 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/particle_light_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/particle_light_form.ui @@ -14,6 +14,9 @@ Form + + 6 + diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_property_dialog.cpp b/code/nel/tools/3d/object_viewer_qt/src/particle_property_dialog.cpp index 59addf3a8..0a62bd210 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/particle_property_dialog.cpp +++ b/code/nel/tools/3d/object_viewer_qt/src/particle_property_dialog.cpp @@ -49,11 +49,13 @@ void CPropertyDialog::setupUi() _dockWidgetContents = new QWidget(); _gridLayout = new QGridLayout(_dockWidgetContents); + _gridLayout->setContentsMargins(6, 6, 6, 6); _scrollArea = new QScrollArea(_dockWidgetContents); _scrollArea->setWidgetResizable(true); _scrollAreaWidgetContents = new QWidget(); _pagesGridLayout = new QGridLayout(_scrollAreaWidgetContents); + _pagesGridLayout->setContentsMargins(0, 0, 0, 0); _stackedWidget = new QStackedWidget(_scrollAreaWidgetContents); diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_sound_form.ui b/code/nel/tools/3d/object_viewer_qt/src/particle_sound_form.ui index 783126540..aeef7c78b 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/particle_sound_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/particle_sound_form.ui @@ -6,14 +6,17 @@ 0 0 - 314 - 334 + 239 + 264 Form + + 6 + diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_system_form.ui b/code/nel/tools/3d/object_viewer_qt/src/particle_system_form.ui index 6f5633731..ed2922bec 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/particle_system_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/particle_system_form.ui @@ -6,14 +6,17 @@ 0 0 - 334 - 495 + 312 + 496 Form + + 6 + diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_texture_anim_form.ui b/code/nel/tools/3d/object_viewer_qt/src/particle_texture_anim_form.ui index 139d5b2d3..26ecadcaf 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/particle_texture_anim_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/particle_texture_anim_form.ui @@ -6,18 +6,24 @@ 0 0 - 306 - 186 + 212 + 101 Form + + 0 + + + 5 + - Enable texture animation + Enable texture anim @@ -33,6 +39,9 @@ + + 5 + diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_texture_form.ui b/code/nel/tools/3d/object_viewer_qt/src/particle_texture_form.ui index 76a89ec9b..a1a6a5c32 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/particle_texture_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/particle_texture_form.ui @@ -6,14 +6,20 @@ 0 0 - 191 - 176 + 172 + 161 Form + + 0 + + + 5 + @@ -58,10 +64,59 @@ + + + + + 0 + 0 + + + + + + + + + + Name: + + + + + + + Size: + + + + + + + Memory: + + + + + + + Qt::Vertical + + + + 20 + 81 + + + + + + + - + 0 0 @@ -74,7 +129,7 @@ - + 0 0 @@ -84,22 +139,6 @@ - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 7 - 20 - - - - diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_workspace_form.ui b/code/nel/tools/3d/object_viewer_qt/src/particle_workspace_form.ui index d44d74c31..8f31809fd 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/particle_workspace_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/particle_workspace_form.ui @@ -15,6 +15,9 @@ + + 5 + @@ -23,9 +26,6 @@ false - - false - diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_zone_form.ui b/code/nel/tools/3d/object_viewer_qt/src/particle_zone_form.ui index 09a2b8540..786511d78 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/particle_zone_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/particle_zone_form.ui @@ -6,14 +6,20 @@ 0 0 - 246 - 350 + 210 + 302 Form + + 9 + + + 6 + diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/example/example.pro b/code/nel/tools/3d/object_viewer_qt/src/plugins/example/example.pro index fc1a9231f..858ed363f 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/plugins/example/example.pro +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/example/example.pro @@ -8,5 +8,4 @@ HEADERS += plugin1.h \ ../../extension_system/iplugin.h \ ../../extension_system/iplugin_manager.h \ ../../extension_system/plugin_spec.h -SOURCES += plugin1.cpp \ - ../../extension_system/plugin_spec.cpp +SOURCES += plugin1.cpp diff --git a/code/nel/tools/3d/object_viewer_qt/src/settings_dialog.cpp b/code/nel/tools/3d/object_viewer_qt/src/settings_dialog.cpp index 6df288895..3e35bf855 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/settings_dialog.cpp +++ b/code/nel/tools/3d/object_viewer_qt/src/settings_dialog.cpp @@ -49,6 +49,8 @@ CSettingsDialog::CSettingsDialog(QWidget *parent) loadPathsSettings(); loadVegetableSettings(); + connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(applyPressed())); + connect(ui.enableBloomCheckBox, SIGNAL(toggled(bool)), this, SLOT(setEnableBloom(bool))); connect(ui.squareBloomCheckBox, SIGNAL(toggled(bool)), this, SLOT(setEnableSquareBloon(bool))); connect(ui.bloomDensityHorizontalSlider, SIGNAL(valueChanged(int)), this, SLOT(setDensityBloom(int))); @@ -57,8 +59,7 @@ CSettingsDialog::CSettingsDialog(QWidget *parent) connect(ui.removeToolButton, SIGNAL(clicked()), this, SLOT(removePath())); connect(ui.upToolButton, SIGNAL(clicked()), this, SLOT(upPath())); connect(ui.downToolButton, SIGNAL(clicked()), this, SLOT(downPath())); - connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(applyPressed())); - + connect(ui.tileBankToolButton, SIGNAL(clicked()), this, SLOT(setTileBank())); connect(ui.tileFarBankToolButton, SIGNAL(clicked()), this, SLOT(setTileFarBank())); connect(ui.vegetTexToolButton, SIGNAL(clicked()), this, SLOT(setTextureVegetable())); @@ -176,7 +177,7 @@ void CSettingsDialog::addZone() { QStringList fileNames = QFileDialog::getOpenFileNames(this, tr("Add zone files"), ".", - tr("Zonel files (*.zonel);;")); + tr("Zonel files (*.zonel *.zone);;")); if (!fileNames.isEmpty()) { diff --git a/code/nel/tools/3d/object_viewer_qt/src/skeleton_scale_form.ui b/code/nel/tools/3d/object_viewer_qt/src/skeleton_scale_form.ui index 28fed61de..d61453641 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/skeleton_scale_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/skeleton_scale_form.ui @@ -15,14 +15,17 @@ + + 6 + + + 5 + true - - true - @@ -34,6 +37,12 @@ Bone scale + + 6 + + + 5 + @@ -253,6 +262,12 @@ Skin scale (slower) + + 6 + + + 5 + @@ -472,6 +487,12 @@ + + 6 + + + 5 + diff --git a/code/nel/tools/3d/object_viewer_qt/src/slot_form.ui b/code/nel/tools/3d/object_viewer_qt/src/slot_form.ui index e058d5145..a494875ba 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/slot_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/slot_form.ui @@ -26,6 +26,12 @@ false + + 6 + + + 5 + diff --git a/code/nel/tools/3d/object_viewer_qt/src/tail_form.ui b/code/nel/tools/3d/object_viewer_qt/src/tail_form.ui index 476dbfc53..811b6e01f 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/tail_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/tail_form.ui @@ -6,14 +6,20 @@ 0 0 - 206 - 90 + 187 + 72 Form + + 0 + + + 5 + diff --git a/code/nel/tools/3d/object_viewer_qt/src/vegetable_apperance_form.ui b/code/nel/tools/3d/object_viewer_qt/src/vegetable_apperance_form.ui index a1874f0a4..64c2baaa3 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/vegetable_apperance_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/vegetable_apperance_form.ui @@ -6,8 +6,8 @@ 0 0 - 340 - 309 + 273 + 252 @@ -16,6 +16,12 @@ + + + 0 + 0 + + QTabWidget::South @@ -36,6 +42,18 @@ Bend Phase + + 0 + + + 0 + + + 0 + + + 6 + @@ -50,6 +68,18 @@ Bend Factor + + 0 + + + 0 + + + 0 + + + 6 + @@ -77,7 +107,7 @@ - + 0 0 @@ -136,19 +166,6 @@ - - - - Qt::Vertical - - - - 20 - 34 - - - - diff --git a/code/nel/tools/3d/object_viewer_qt/src/vegetable_dialog_form.ui b/code/nel/tools/3d/object_viewer_qt/src/vegetable_dialog_form.ui index b16477ee7..95f04940e 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/vegetable_dialog_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/vegetable_dialog_form.ui @@ -6,8 +6,8 @@ 0 0 - 618 - 679 + 504 + 473 @@ -19,6 +19,12 @@ + + 6 + + + 5 + @@ -29,11 +35,23 @@ 0 0 - 598 - 640 + 490 + 437 + + 6 + + + 6 + + + 6 + + + 5 + @@ -68,6 +86,12 @@ List edition + + 6 + + + 5 + @@ -157,6 +181,12 @@ List Save/Load + + 6 + + + 5 + @@ -198,6 +228,9 @@ + + QTabWidget::East + 0 diff --git a/code/nel/tools/3d/object_viewer_qt/src/vegetable_landscape_form.ui b/code/nel/tools/3d/object_viewer_qt/src/vegetable_landscape_form.ui index 352fe72f4..0382a6887 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/vegetable_landscape_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/vegetable_landscape_form.ui @@ -23,6 +23,9 @@ Setup Wind + + 5 + @@ -184,6 +187,12 @@ false + + + 0 + 0 + + QTabWidget::South diff --git a/code/nel/tools/3d/object_viewer_qt/src/vegetable_noise_value_form.ui b/code/nel/tools/3d/object_viewer_qt/src/vegetable_noise_value_form.ui index a30bf0883..e27c64d94 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/vegetable_noise_value_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/vegetable_noise_value_form.ui @@ -6,8 +6,8 @@ 0 0 - 312 - 110 + 245 + 108 @@ -17,6 +17,12 @@ + + 6 + + + 5 + diff --git a/code/nel/tools/3d/object_viewer_qt/src/water_pool_form.ui b/code/nel/tools/3d/object_viewer_qt/src/water_pool_form.ui index f1103a7bd..5e81a853d 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/water_pool_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/water_pool_form.ui @@ -15,6 +15,12 @@ + + 6 + + + 5 + @@ -58,7 +64,7 @@ - + diff --git a/code/nel/tools/3d/object_viewer_qt/src/workspace_form.ui b/code/nel/tools/3d/object_viewer_qt/src/workspace_form.ui index 640cda6c2..d40352305 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/workspace_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/workspace_form.ui @@ -6,14 +6,20 @@ 0 0 - 258 - 246 + 240 + 190 Form + + 0 + + + 0 +