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 ec1505bce..69a76c963 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,32 +6,41 @@ 0 0 - 913 - 88 + 1101 + 121 + + + 0 + 0 + + - 913 - 88 + 950 + 121 524287 - 524287 + 121 Particles system control + + + 0 + 0 + + - - 6 - - - 5 + + 9 @@ -69,113 +78,214 @@ - - - - - 0 - 0 - - - - - 16777215 - 40 - - - - - - - - :/images/stop.png:/images/stop.png - - - - 32 - 32 - - - - true - - - - - - - - 0 - 0 - - - - 0 - - - - - 0 - - + + + + + 0 + + + + + QFrame::StyledPanel + + + QFrame::Plain + - - 4 - - - + + 0 0 - - Loop - - - - - - - - 0 - 0 - - - - Display helpers + + 1 + + + + 9 + + + 3 + + + + + + 0 + 0 + + + + Loop + + + + + + + + 0 + 0 + + + + Display helpers + + + + + + + + 0 + 0 + + + + Enable auto count + + + + + + + + 0 + 0 + + + + Display box + + + + + + + + 0 + 0 + + + + All particle system + + + + + + + false + + + + 0 + 0 + + + + Reset auto count + + + + + + + + + 0 + + + + + false + + + Link play to scene play + + + + + + + true + + + Link to skeleton + + + false + + + + + + + true + + + Unlink + + + + + + + true + + + true + + + + + + + false + + + Restick all objects + + + + + + + false + + + Set anim + + + + + + + false + + + Clear anim + + + + + + + false + + + + + - - - - 0 - 0 - - - - Enable auto count - - - - - - - - 0 - 0 - - - - Display box - - - - - + 0 @@ -183,15 +293,12 @@ - All particle system + General - - - false - + 0 @@ -199,214 +306,165 @@ - Reset auto count - - - - - - - - - - - 0 - - - - - - - false - - - Link play to scene play - - - - - - - true - - - Link to skeleton - - - false - - - - - - - true - - - Unlink - - - - - - - true - - - true - - - - - - - false - - - Restick all objects - - - - - - - false - - - Set anim - - - - - - - false - - - Clear anim + Additional - - - - false + + + + Qt::Vertical - - - - - - - - - 3 - - - - - - 0 - 0 - - - - General - - - - - - - - 0 - 0 - - - - Additional - - - - - - - - - - 0 - 0 - - - - Num particles:9999999 - + + + + + + + 0 + 0 + + + + System time:99999999999 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + Num particles:9999999 + + + + + + + + 0 + 0 + + + + Num wanted faces:9999999 + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + 100 + + + 100 + + + 100 + + + true + + + Qt::Horizontal + + + false + + + false + + + QSlider::TicksBelow + + + 20 + + + + + + + 0 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + 100 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + - - + + - + 0 0 - - Num wanted faces:9999999 - - - - - - - - 0 - 0 - + + + 16777215 + 40 + - System time:99999999999 - - - - - - - - 0 - 0 - - - - 100 + - - 100 + + + :/images/stop.png:/images/stop.png - - 100 + + + 32 + 32 + - + true - - Qt::Horizontal - - - false - - - false - - - QSlider::TicksBelow - - - 20 - 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 9e0dcfa70..bc2ebdd4a 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,8 +6,8 @@ 0 0 - 198 - 310 + 426 + 361 @@ -53,32 +53,6 @@ - - - - - 30 - 16777215 - - - - < - - - - - - - - 30 - 16777215 - - - - > - - - @@ -129,6 +103,32 @@ + + + + + 30 + 16777215 + + + + Qt::LeftArrow + + + + + + + + 30 + 16777215 + + + + Qt::RightArrow + + + diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_zone_page.cpp b/code/nel/tools/3d/object_viewer_qt/src/particle_zone_page.cpp index af086596b..8dc7904a5 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/particle_zone_page.cpp +++ b/code/nel/tools/3d/object_viewer_qt/src/particle_zone_page.cpp @@ -38,8 +38,8 @@ CZonePage::CZonePage(QWidget *parent) _ui.bounceFactorWidget->setRange(0.f, 1.f); - connect(_ui.toTargetsPushButton, SIGNAL(clicked()), this, SLOT(addTarget())); - connect(_ui.toAvaibleTargetsPushButton, SIGNAL(clicked()), this, SLOT(removeTarget())); + connect(_ui.toTargetsToolButton, SIGNAL(clicked()), this, SLOT(addTarget())); + connect(_ui.toAvaibleTargetsToolButton, SIGNAL(clicked()), this, SLOT(removeTarget())); connect(_ui.bounceComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(setBounce(int))); connect(_ui.bounceFactorWidget, SIGNAL(valueChanged(float)), this, SLOT(setBounceFactor(float))); diff --git a/code/nel/tools/3d/object_viewer_qt/src/settings_form.ui b/code/nel/tools/3d/object_viewer_qt/src/settings_form.ui index 03df2ecd5..5f18a43fb 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/settings_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/settings_form.ui @@ -75,7 +75,7 @@ QFrame::Plain - 0 + 3 @@ -340,6 +340,15 @@ 0 + + + + + + + + + diff --git a/code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_de.ts b/code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_de.ts index db0b55429..d692c0744 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_de.ts +++ b/code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_de.ts @@ -406,17 +406,17 @@ Day/Night - + Tag/Nacht Day - + Tag Night - + Nacht @@ -429,7 +429,7 @@ Direction: - + Richtung: @@ -652,12 +652,12 @@ Targets: - + Ziele: Avaible targets: - + Verfügbare Ziele: @@ -1839,52 +1839,52 @@ About plugins - + Über Plugins State - + Status Name - + Name Version - + Version Vendor - + Autor Location - + Ort Details - + Details Error details - + Fehler Details Close - + Beenden All objects list - + Objekt Liste @@ -1924,22 +1924,22 @@ Graphics - + Video Sound - + Audio Paths - + Verzeichnisse Vegetable - + Vegetation @@ -2028,45 +2028,45 @@ - + Search paths - - - - - - - - - + + + + + + + + + ... - + Setup Landscape - + Tile bank: - + Tile far bank: - + Vegetable texture: - + Landscape zones: @@ -2347,7 +2347,7 @@ Sun color - + Sonnenfarbe @@ -2555,22 +2555,22 @@ Form - + Pflanzen Dichte Seite Vegetable mesh selection - + Pflanzen Mesh Auswahl Browse - + Durchsuchen Distance of creation - + Erstellungsdistanz @@ -2580,52 +2580,52 @@ Density - + Dichte MaxDensity - + Maximale Dichte MaxDensity enabled - + maximale Dichte aktiviert Angle setup - + Winkel Konfiguration Angle Mode: - + Winkel Modus: Floor - + Boden Wall - + Wand Ceiling - + Decke AngleMin - + Min Winkel AngleMax - + Max Winkel @@ -2633,102 +2633,102 @@ Vegetable editor - + Pflanzen Editor Vegetables: - + Pflanzen: List edition - + Liste bearbeiten Add vegetable - + Pflanze hinzufügen Insert vegetable - + Pflanze einfügen Remove vegetable - + Pflanze entfernen Clear all vegetables - + Alle entfernen Copy Vegetable - + Pflanze kopieren Load .vegetdesc - + Lade .vegetdesc Save .vegetdesc - + Speichere .vegetdesc List Save/Load - + Liste speichern/laden Load .vegetset - + Lade .vegetset Append .vegetset - + Anfügen eines.vegetset Save .vegetset - + Speichere.vegetset Display Vegetables - + Pflanzen anzeigen Landscape - + Landschaft General/Density - + Allgemein/Dichte Appearance - + Aussehen Scale - + Größe Rotation - + Drehung @@ -2736,47 +2736,47 @@ Form - + Pflanzen Landschaft Seite Setup Wind - + Wind konfigurieren Power: - + Kraft: Bend Start: - + Start der Beugung: Frequency - + Frequenz Ambient color - + Ambient Farbe Diffuse color - + Diffuse Farbe Show Vegetable Lands - + Zeige Pflanzen Snap Camera To Ground - + Kamera bleibt am Boden @@ -2784,22 +2784,22 @@ Form - + Pflanzen Drehungs Seite Rotate X - + Drehung X Rotate Y - + Drehung Y Rotate Z - + Drehung Z @@ -2807,22 +2807,22 @@ Form - + Pflanzen Größen seite Scale X/Y - + Größe X/Y Scale Z - + Größe Z Bend Frequency Factor - + Faktor Beugungsfrequenz @@ -2940,70 +2940,66 @@ Load - + Laden Save - + Speichern CWorkspacePage - Form - - - - + Particle system editor - + Partikelsystem Editor - - Workspace: - + + Workspace + Arbeitsbereich - + New - + Neu - + Load - + Laden - + Save - + Speichern - + Save As - + Speichern als ... - - Particle system: - + + Particle system + Partikelsystem - + Insert New - + Neu einfügen - + Create New - + Neu erstellen - + Reset all - + Alles zurücksetzen @@ -3011,40 +3007,30 @@ Form - + Partikel Zonen Editor Targets: - + Ziele: Avaible targets: - + Verfügbare Ziele: - - < - - - - - > - - - - + Bounce - + Destroy - + Bounce factor: @@ -3167,12 +3153,12 @@ Search Paths - + Verzeichnisse General - + Allgemein @@ -3180,12 +3166,12 @@ New settings - + Neue Einstellungen About plugins - + Über Plugins @@ -3779,190 +3765,190 @@ Right click to remove points. Open NeL data file - + Öffne NeL Daten Dateien All NeL files (*.shape *.ps *.ig);;NeL shape files (*.shape);;NeL particle system files (*.ps)NeL Instance Group files (*.ig) - + Alle NeL Dateien (*.shape *.ps *.ig);;NeL shape (*.shape);;NeL Partikelsystem(*.ps)NeL Instanz Gruppen (*.ig) Open skeleton file - + Öffne Skelett Datei NeL skeleton file (*.skel) - + NeL Skelet (*.skel) About Object Viewer Qt - Über Object Viewer Qt + Über Object Viewer Qt <h2>Object Viewer Qt 8-)</h2><p> Authors: dnk-88, sfb, Kaetemi, kervala <p>Compiled on %1 %2 - + <h2>Object Viewer Qt 8-)</h2><p> Autoren: dnk-88, sfb, Kaetemi, kervala <p>Kompiliert am %1 %2 &Open... - &Öffnen... + &Öffnen... Open an existing file - Datei öffnen + Datei öffnen E&xit - B&eenden + B&eenden Ctrl+Q - Ctrl+Q + Ctrl+Q Exit the application - Object Viewer verlassen + Object Viewer verlassen Set &background color - + Hintergrundfar&be setzen Set background color - + Hintergrundfarbe setzen Reset camera - + Kamera zurücksetzen Ctrl+R - + Ctrl+R Reset current camera - + Aktuelle Kamera zurücksetzen Ctrl+M - + Ctrl+M Change render mode (Line, Point, Filled) - + Render Modus ändern (Linie, Punkt, Gefüllt) &Reset scene - + Szene zu&rücksetzen Reset current scene - + Aktuelle Szene zurücksetzen Reload textures - + Texturen neu laden Save &Screenshot - + Screenshot &Speichern Make a screenshot of the current viewport and save - + Speichert ein Screenshot der aktuellen Szene &Settings - Ein&stellungen + Ein&stellungen Settings - + Einstellungen &About - &Über + &Über Show the application's About box - Zeigt Informationen über den Object Viewer + Zeigt Informationen über den Object Viewer About &Qt - Über &Qt + Über &Qt Show the Qt library's About box - Zeigt Informationen über Qt + Zeigt Informationen über Qt &File - &Datei + &Datei &View - &Ansicht + &Ansicht &Scene - + &Szene &Tools - &Werkzeuge + &Werkzeuge &Help - &Hilfe + &Hilfe StatusReady - Status Fertig + Status Fertig Loading canceled - + Laden abgebrochen File loaded - + Datei geladen @@ -4149,7 +4135,7 @@ Right click to remove points. Save - + Speichern @@ -4320,7 +4306,7 @@ Right click to remove points. Property editor - + Eigenschaften @@ -4328,7 +4314,7 @@ Right click to remove points. Settings - + Einstellungen diff --git a/code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_en.ts b/code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_en.ts index c941fc29d..6c6df8ff9 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_en.ts +++ b/code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_en.ts @@ -1303,92 +1303,92 @@ CParticleControlDialog - + Particles system control - + Loop - + Display helpers - + Enable auto count - + Display box - + All particle system - + Reset auto count - + Link play to scene play - + Link to skeleton - + Unlink - + Restick all objects - + Set anim - + Clear anim - + General - + Additional - + Num particles:9999999 - + Num wanted faces:9999999 - + System time:99999999999 @@ -2028,45 +2028,45 @@ - + Search paths - - - - - - - - - + + + + + + + + + ... - + Setup Landscape - + Tile bank: - + Tile far bank: - + Vegetable texture: - + Landscape zones: @@ -2951,57 +2951,53 @@ CWorkspacePage - - Form - - - - + + Particle system editor - - Workspace: + + Workspace - + New - + Load - + Save - + Save As - - Particle system: + + Particle system - + Insert New - + Create New - + Reset all @@ -3024,27 +3020,17 @@ - - < - - - - - > - - - - + Bounce - + Destroy - + Bounce factor: diff --git a/code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_fr.ts b/code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_fr.ts index cf3cb08ed..6109874d7 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_fr.ts +++ b/code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_fr.ts @@ -1303,92 +1303,92 @@ CParticleControlDialog - + Particles system control - + Loop - + Display helpers - + Enable auto count - + Display box - + All particle system - + Reset auto count - + Link play to scene play - + Link to skeleton - + Unlink - + Restick all objects - + Set anim - + Clear anim - + General - + Additional - + Num particles:9999999 - + Num wanted faces:9999999 - + System time:99999999999 @@ -2028,45 +2028,45 @@ - + Search paths - - - - - - - - - + + + + + + + + + ... - + Setup Landscape - + Tile bank: - + Tile far bank: - + Vegetable texture: - + Landscape zones: @@ -2951,57 +2951,53 @@ CWorkspacePage - - Form - - - - + + Particle system editor - - Workspace: + + Workspace - + New - + Load - + Save - + Save As - - Particle system: + + Particle system - + Insert New - + Create New - + Reset all @@ -3024,27 +3020,17 @@ - - < - - - - - > - - - - + Bounce - + Destroy - + Bounce factor: diff --git a/code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_ru.ts b/code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_ru.ts index fa6b0af74..c036ed224 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_ru.ts +++ b/code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_ru.ts @@ -1303,92 +1303,92 @@ CParticleControlDialog - + Particles system control - + Loop Повтор - + Display helpers - + Enable auto count Включить авто подсчет - + Display box - + All particle system Все системы частиц - + Reset auto count Сбросить авто подсчет - + Link play to scene play - + Link to skeleton - + Unlink - + Restick all objects - + Set anim Выбрать anim - + Clear anim - + General Главное - + Additional Дополнительное - + Num particles:9999999 Кол-во частиц:9999999 - + Num wanted faces:9999999 - + System time:99999999999 Время:99999999999 @@ -2028,45 +2028,45 @@ - + Search paths Пути поиска - - - - - - - - - + + + + + + + + + ... - + Setup Landscape - + Tile bank: - + Tile far bank: - + Vegetable texture: - + Landscape zones: @@ -2951,57 +2951,53 @@ CWorkspacePage - - Form - Форма - - - + + Particle system editor Редактор системы частиц - - Workspace: - Рабочее пространство: + + Workspace + - + New Создать - + Load Загрузить - + Save Сохранить - + Save As Сохранить как - - Particle system: - Система частиц: + + Particle system + - + Insert New Вставить - + Create New Создать - + Reset all Сбросить @@ -3024,27 +3020,17 @@ Доступные цели: - - < - - - - - > - - - - + Bounce Отскок - + Destroy Уничтожение - + Bounce factor: Сила отскока: 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 d40352305..64292fce6 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,449 +6,413 @@ 0 0 - 240 - 190 + 282 + 232 + + + 0 + 0 + + - Form + Particle system editor - - - 0 - - - 0 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 11 - 75 - false - true - true - - - - 0 - - - Particle system editor - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - Qt::Vertical + + + + + + 11 + 75 + false + true + true + - - - 20 - 1 - + + 0 - + + Particle system editor + + + Qt::AlignCenter + + - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Workspace: - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - + + + + Workspace + + + + + + + 0 + 0 + + + + + 55 + 0 + + + + + 16777215 + 16777215 + + + + New + + + + :/images/new.png:/images/new.png + + + + 32 + 32 + + + + Qt::ToolButtonTextUnderIcon + + + true + + + + + + + + 0 + 0 + + + + + 55 + 0 + + + + + 16777215 + 16777215 + + + + Load + + + + :/images/open-file.png:/images/open-file.png + + + + 32 + 32 + + + + Qt::ToolButtonTextUnderIcon + + + true + + + + + + + false + + + + 0 + 0 + + + + + 55 + 0 + + + + + 16777215 + 16777215 + + + + Save + + + + :/images/save.png:/images/save.png + + + + 32 + 32 + + + + false + + + Qt::ToolButtonTextUnderIcon + + + true + + + + + + + false + + + + 0 + 0 + + + + + 55 + 0 + + + + + 16777215 + 16777215 + + + + Save As + + + + :/images/save-as.png:/images/save-as.png + + + + 32 + 32 + + + + Qt::ToolButtonTextUnderIcon + + + true + + + + + + + Qt::Horizontal + + + + 0 + 0 + + + + + + - - - - - - - 55 - 55 - - - - - 55 - 55 - - - - New - - - - :/images/new.png:/images/new.png - - - - 32 - 32 - - - - Qt::ToolButtonTextUnderIcon - - - true - - - - - - - - 55 - 55 - - - - - 55 - 55 - - - - Load - - - - :/images/open-file.png:/images/open-file.png - - - - 32 - 32 - - - - Qt::ToolButtonTextUnderIcon - - - true - - - - - - - false - - - - 55 - 55 - - - - - 55 - 55 - - - - Save - - - - :/images/save.png:/images/save.png - - - - 32 - 32 - - - - false - - - Qt::ToolButtonTextUnderIcon - - - true - - - - - - - false - - - - 55 - 55 - - - - - 55 - 55 - - - - Save As - - - - :/images/save-as.png:/images/save-as.png - - - - 32 - 32 - - - - Qt::ToolButtonTextUnderIcon - - - true - - - - + + + + Particle system + + + + + + false + + + + 0 + 0 + + + + + 55 + 0 + + + + + 16777215 + 16777215 + + + + Insert New + + + + :/images/pqrticles.png:/images/pqrticles.png + + + + 32 + 32 + + + + Qt::ToolButtonTextUnderIcon + + + true + + + + + + + false + + + + 0 + 0 + + + + + 55 + 0 + + + + + 16777215 + 16777215 + + + + Create New + + + + :/images/insert.png:/images/insert.png + + + + 32 + 32 + + + + Qt::ToolButtonTextUnderIcon + + + true + + + + + + + false + + + + 0 + 0 + + + + + 55 + 0 + + + + + 16777215 + 16777215 + + + + Reset all + + + + :/images/clear.png:/images/clear.png + + + + 32 + 32 + + + + Qt::ToolButtonTextUnderIcon + + + true + + + + + + + Qt::Horizontal + + + + 0 + 0 + + + + + + - - + + Qt::Vertical - 20 - 1 + 0 + 0 - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Particle system: - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - false - - - - 70 - 65 - - - - - 61 - 61 - - - - Insert New - - - - :/images/pqrticles.png:/images/pqrticles.png - - - - 32 - 32 - - - - Qt::ToolButtonTextUnderIcon - - - true - - - - - - - false - - - - 70 - 65 - - - - - 61 - 61 - - - - Create New - - - - :/images/insert.png:/images/insert.png - - - - 32 - 32 - - - - Qt::ToolButtonTextUnderIcon - - - true - - - - - - - false - - - - 70 - 65 - - - - - 61 - 61 - - - - Reset all - - - - :/images/clear.png:/images/clear.png - - - - 32 - 32 - - - - Qt::ToolButtonTextUnderIcon - - - true - - - - - - - + + - Qt::Vertical + Qt::Horizontal - 20 - 3 + 40 + 20