Merge remote-tracking branch 'origin/master'

meow-7.2.2
Beq 2023-04-03 21:35:35 +01:00
commit 2f128c90ed
23 changed files with 229 additions and 137 deletions

View File

@ -26294,5 +26294,16 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<integer>0</integer>
</map>
<key>FSAnimationPreviewExpanded</key>
<map>
<key>Comment</key>
<string>Expand or collapse the advanced animation information in the animation preview floater by default</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
</map>
</llsd>

View File

@ -40,13 +40,17 @@
#include "lluictrlfactory.h"
#include "lldatapacker.h"
#include "llviewercontrol.h" // <FS:Zi> Make advanced animation preview optional
extern LLAgent gAgent;
//const S32 ADVANCED_VPAD = 3; // <FS:Ansariel> Improved animation preview
LLPreviewAnim::LLPreviewAnim(const LLSD& key)
: LLPreview( key )
{
mCommitCallbackRegistrar.add("PreviewAnim.Play", boost::bind(&LLPreviewAnim::play, this, _2));
// <FS:Zi> Make advanced animation preview optional
mCommitCallbackRegistrar.add("PreviewAnim.Expand", boost::bind(&LLPreviewAnim::expand, this, _2));
// </FS:Zi>
}
// virtual
@ -54,15 +58,15 @@ BOOL LLPreviewAnim::postBuild()
{
childSetCommitCallback("desc", LLPreview::onText, this);
getChild<LLLineEditor>("desc")->setPrevalidate(&LLTextValidate::validateASCIIPrintableNoPipe);
// <FS:Ansariel> Improved animation preview
//getChild<LLTextBox>("adv_trigger")->setClickedCallback(boost::bind(&LLPreviewAnim::showAdvanced, this));
//pAdvancedStatsTextBox = getChild<LLTextBox>("AdvancedStats");
//// Assume that advanced stats start visible (for XUI preview tool's purposes)
//pAdvancedStatsTextBox->setVisible(FALSE);
//LLRect rect = getRect();
//reshape(rect.getWidth(), rect.getHeight() - pAdvancedStatsTextBox->getRect().getHeight() - ADVANCED_VPAD, FALSE);
// </FS:Ansariel>
// <FS:Zi> Make advanced animation preview optional
bool expanded = gSavedSettings.getBOOL("FSAnimationPreviewExpanded");
getChild<LLView>("advanced_info_panel")->setVisible(!expanded);
getChild<LLButton>("btn_expand")->setToggleState(expanded);
expand(LLSD());
// </FS:Zi>
return LLPreview::postBuild();
}
@ -214,42 +218,36 @@ void LLPreviewAnim::onClose(bool app_quitting)
}
}
// <FS:Ansariel> Improved animation preview
//void LLPreviewAnim::showAdvanced()
//{
// BOOL was_visible = pAdvancedStatsTextBox->getVisible();
//
// if (was_visible)
// {
// pAdvancedStatsTextBox->setVisible(FALSE);
// LLRect rect = getRect();
// reshape(rect.getWidth(), rect.getHeight() - pAdvancedStatsTextBox->getRect().getHeight() - ADVANCED_VPAD, FALSE);
// }
// else
// {
// pAdvancedStatsTextBox->setVisible(TRUE);
// LLRect rect = getRect();
// reshape(rect.getWidth(), rect.getHeight() + pAdvancedStatsTextBox->getRect().getHeight() + ADVANCED_VPAD, FALSE);
//
// LLMotion *motion = NULL;
// const LLInventoryItem* item = getItem();
// if (item)
// {
// // if motion exists, will return existing one.
// // Needed because viewer can purge motions
// motion = gAgentAvatarp->createMotion(item->getAssetUUID());
// }
//
// // set text
// if (motion)
// {
// pAdvancedStatsTextBox->setTextArg("[PRIORITY]", llformat("%d", pMotion->getPriority()));
// pAdvancedStatsTextBox->setTextArg("[DURATION]", llformat("%.2f", pMotion->getDuration()));
// pAdvancedStatsTextBox->setTextArg("[EASE_IN]", llformat("%.2f", pMotion->getEaseInDuration()));
// pAdvancedStatsTextBox->setTextArg("[EASE_OUT]", llformat("%.2f", pMotion->getEaseOutDuration()));
// pAdvancedStatsTextBox->setTextArg("[IS_LOOP]", (pMotion->getLoop() ? LLTrans::getString("PermYes") : LLTrans::getString("PermNo")));
// pAdvancedStatsTextBox->setTextArg("[NUM_JOINTS]", llformat("%d", pMotion->getNumJointMotions()));
// }
// }
//}
// </FS:Ansariel>
// <FS:Zi> Make advanced animation preview optional
void LLPreviewAnim::expand(const LLSD& param)
{
LLView* basic_info_panel = getChild<LLView>("basic_info_panel");
LLView* advanced_info_panel = getChild<LLView>("advanced_info_panel");
// I don't get why we can't use getLocalRect().mTop or something similar to get the .top from the XML -Zi
S32 height = getRect().getHeight() - basic_info_panel->getRect().mTop;
S32 basic_info_height = basic_info_panel->getRect().getHeight();
S32 advanced_info_height = advanced_info_panel->getRect().getHeight();
bool was_expanded = advanced_info_panel->getVisible();
advanced_info_panel->setVisible(!was_expanded);
height += basic_info_height;
if (!was_expanded)
{
height += advanced_info_height;
}
LLRect rect = getRect();
rect.setLeftTopAndSize(rect.mLeft, rect.mTop, rect.getWidth(), height);
reshape(rect.getWidth(), rect.getHeight(), false);
setRect(rect);
if(getHost())
{
getHost()->growToFit(rect.getWidth(), height);
}
}
// </FS:Zi>

View File

@ -45,15 +45,13 @@ public:
void cleanup(); // cleanup 'playing' state
void play(const LLSD& param);
// <FS:Ansariel> Improved animation preview
//void showAdvanced();
protected:
void expand(const LLSD& param); // <FS:Zi> Make advanced animation preview optional
LLUUID mItemID; // Not an item id, but a playing asset id
bool mDidStart;
// <FS:Ansariel> Improved animation preview
//LLTextBox* pAdvancedStatsTextBox;
};
#endif // LL_LLPREVIEWANIM_H

View File

@ -3,9 +3,11 @@
<floater.string name="Title">
Animation: [NAME]
</floater.string>
<text name="desc txt">
Beskrivelse:
</text>
<button label="Afspil i verden" label_selected="Stop" name="Anim play btn" tool_tip="Vis denne animation så andre kan se den"/>
<button label="Afspil lokalt" label_selected="Stop" name="Anim audition btn" tool_tip="Vis denne animation så kun du kan se den"/>
<panel name="basic_info_panel">
<text name="desc txt">
Beskrivelse:
</text>
<button label="Afspil i verden" label_selected="Stop" name="Anim play btn" tool_tip="Vis denne animation så andre kan se den"/>
<button label="Afspil lokalt" label_selected="Stop" name="Anim audition btn" tool_tip="Vis denne animation så kun du kan se den"/>
</panel>
</floater>

View File

@ -3,20 +3,23 @@
<floater.string name="Title">
Animation: [NAME]
</floater.string>
<text name="desc txt" width="90">
Beschreibung:
</text>
<line_editor name="desc"/>
<button label="Inworld abspielen" label_selected="Stopp" name="Inworld" tool_tip="Diese Animation so wiedergeben, dass andere sie sehen können."/>
<button label="Lokal wiedergeben" label_selected="Stopp" name="Locally" tool_tip="Diese Animation so wiedergeben, dass nur Sie sie sehen."/>
<text name="AdvancedStatsLeft">
<panel name="basic_info_panel">
<text name="desc txt" width="90">
Beschreibung:
</text>
<button label="Inworld abspielen" label_selected="Stopp" name="Inworld" tool_tip="Diese Animation so wiedergeben, dass andere sie sehen können."/>
<button label="Lokal wiedergeben" label_selected="Stopp" name="Locally" tool_tip="Diese Animation so wiedergeben, dass nur Sie sie sehen."/>
</panel>
<panel name="advanced_info_panel">
<text name="AdvancedStatsLeft">
Priorität: [PRIORITY]
Dauer: [DURATION]s
Schleife: [IS_LOOP]
</text>
<text name="AdvancedStatsRight">
</text>
<text name="AdvancedStatsRight">
Einblenden: [EASE_IN]s
Ausblenden: [EASE_OUT]s
Gelenke: [NUM_JOINTS]
</text>
</text>
</panel>
</floater>

View File

@ -1,7 +1,18 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<!-- <FS:Zi> This floater's height changes at runtime when display of advanced info changes:
collapsed:
floater height = basic_info_panel.top + basic_info_panel.height 25 + 60
expanded:
floater height = basic_info_panel.top + basic_info_panel.height + advanced_info_panel.height 25 + 60 + 56
-->
<floater
legacy_header_height="18"
height="121"
height="141"
layout="topleft"
name="preview_anim"
help_topic="fs_animation_inventory_preview"
@ -12,6 +23,17 @@
name="Title">
Animation: [NAME]
</floater.string>
<!-- <FS:Zi> panel that holds the basic animation info and gives size hints to the code -->
<panel
follows="left|top|right"
height="60"
layout="topleft"
left="0"
name="basic_info_panel"
top="25"
width="320">
<text
type="string"
length="1"
@ -21,7 +43,6 @@
layout="topleft"
left="10"
name="desc txt"
top="25"
width="80">
Description:
</text>
@ -38,6 +59,7 @@
top_delta="-2"
right="-10" />
<button
follows="left|top"
height="20"
label="Play Inworld"
label_selected="Stop"
@ -45,37 +67,63 @@
left="8"
name="Inworld"
tool_tip="Play this animation so that others can see it"
top="47"
width="150">
top_pad="8"
width="132">
<button.commit_callback
function="PreviewAnim.Play"
parameter="Inworld" />
</button>
<button
follows="left|top"
height="20"
label="Play Locally"
label_selected="Stop"
layout="topleft"
left_pad="5"
left_pad="6"
name="Locally"
tool_tip="Play this animation so that only you can see it"
top_delta="0"
width="150">
width="132">
<button.commit_callback
function="PreviewAnim.Play"
parameter="Locally" />
</button>
<button
follows="left|top"
height="20"
image_overlay="DisclosureArrow_Opened_Off"
layout="topleft"
left_pad="5"
name="btn_expand"
toggle="true"
tool_tip="Expand to see advanced information about this animation"
top_delta="0"
width="32">
<button.commit_callback
function="PreviewAnim.Expand" />
</button>
</panel>
<!-- <FS:Zi> panel that holds the (optional) advanced animation info and gives size hints to the code -->
<panel
follows="left|top|right"
height="56"
layout="topleft"
name="advanced_info_panel"
top_pad="0"
visible="true">
<text
type="string"
length="1"
follows="left|top"
font="SansSerif"
height="91"
height="52"
layout="topleft"
left="10"
name="AdvancedStatsLeft"
top_pad="3"
top_pad="0"
width="150">
Priority: [PRIORITY]
Duration: [DURATION]s
@ -86,9 +134,9 @@ Loop: [IS_LOOP]
length="1"
follows="left|top"
font="SansSerif"
height="91"
height="52"
layout="topleft"
left_pad="5"
left_pad="10"
name="AdvancedStatsRight"
top_delta="0"
width="150">
@ -96,4 +144,5 @@ Ease In: [EASE_IN]s
Ease Out: [EASE_OUT]s
Joints: [NUM_JOINTS]
</text>
</panel>
</floater>

View File

@ -1629,6 +1629,14 @@
tool_tip="If enabled, you can preview animations during the upload process on your own avatar"
name="FSUploadAnimationOnOwnAvatar"
control_name="FSUploadAnimationOnOwnAvatar"/>
<check_box
top_pad="8"
follows="left|top"
height="16"
label="Always expand animation preview advanced information"
tool_tip="Expand the advanced animation information in the animation preview floater by default"
name="FSAnimationPreviewExpanded"
control_name="FSAnimationPreviewExpanded"/>
<check_box
top_pad="8"
follows="left|top"

View File

@ -3,9 +3,11 @@
<floater.string name="Title">
Animación: [NAME]
</floater.string>
<text name="desc txt">
Descripción:
</text>
<button label="Ver en el mundo" label_selected="Detener" name="Inworld" tool_tip="Ejecutar esta animación de modo que puedan verla los demás" width="130"/>
<button label="Ejecutarla para usted" label_selected="Detener" left="135" name="Locally" tool_tip="Ejecutar esta animación de modo que sólo la vea yo" width="130"/>
<panel name="basic_info_panel">
<text name="desc txt">
Descripción:
</text>
<button label="Ver en el mundo" label_selected="Detener" name="Inworld" tool_tip="Ejecutar esta animación de modo que puedan verla los demás" width="130"/>
<button label="Ejecutarla para usted" label_selected="Detener" left="135" name="Locally" tool_tip="Ejecutar esta animación de modo que sólo la vea yo" width="130"/>
</panel>
</floater>

View File

@ -2,7 +2,7 @@
<floater name="Image Preview">
<text name="name_label">Nom :</text>
<text name="description_label">Description :</text>
<text name="preview_label" width="115">Prévisualiser l'image en tant que :</text>
<text name="preview_label" width="115">Prévisualiser :</text>
<combo_box label="Type de vêtement" left_delta="115" name="clothing_type_combo">
<item label="Image" name="Image"/>
<item label="Cheveux" name="Hair"/>

View File

@ -1,8 +1,10 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="preview_anim" width="350">
<floater name="preview_anim" width="380">
<floater.string name="Title">Animation : [NAME]</floater.string>
<text name="desc txt">Description :</text>
<line_editor name="desc" width="230" />
<button label="Jouer devant tout le monde" width="160" label_selected="Arrêter" name="Inworld" tool_tip="Jouer cette animation de façon à ce que les autres la voient"/>
<button label="Jouer localement" width="160" label_selected="Arrêter" name="Locally" tool_tip="Jouer cette animation de façon à ce que vous soyez la seule personne à la voir"/>
<panel name="basic_info_panel" width="380">
<text name="desc txt">Description :</text>
<line_editor name="desc" width="230" />
<button label="Jouer devant tout le monde" width="160" label_selected="Arrêter" name="Inworld" tool_tip="Jouer cette animation de façon à ce que les autres la voient"/>
<button label="Jouer localement" width="160" label_selected="Arrêter" name="Locally" tool_tip="Jouer cette animation de façon à ce que vous soyez la seule personne à la voir"/>
</panel>
</floater>

View File

@ -7,7 +7,7 @@
Descrizione:
</text>
<text name="preview_label">
Anteprima dell&apos;immagine come:
Anteprima come:
</text>
<combo_box label="Tipo di capo" left="120" name="clothing_type_combo">
<item label="Immagine" name="Image"/>

View File

@ -3,9 +3,11 @@
<floater.string name="Title">
Animazione: [NAME]
</floater.string>
<text name="desc txt">
Descrizione:
</text>
<button label="Riproduci in mondo" label_selected="Ferma" name="Inworld" tool_tip="Riproduci questa animazione così che gli altri possano vederla"/>
<button label="Riproduci in locale" label_selected="Ferma" name="Locally" tool_tip="Riproduci questa animazione così che solo tu possa vederla"/>
<panel name="basic_info_panel">
<text name="desc txt">
Descrizione:
</text>
<button label="Riproduci in mondo" label_selected="Ferma" name="Inworld" tool_tip="Riproduci questa animazione così che gli altri possano vederla"/>
<button label="Riproduci in locale" label_selected="Ferma" name="Locally" tool_tip="Riproduci questa animazione così che solo tu possa vederla"/>
</panel>
</floater>

View File

@ -3,9 +3,11 @@
<floater.string name="Title">
アニメーション: [NAME]
</floater.string>
<text name="desc txt">
説明:
</text>
<button label="インワールドで再生" label_selected="停止" name="Inworld" tool_tip="他人に見えるように再生"/>
<button label="ローカル再生" label_selected="停止" name="Locally" tool_tip="自分だけが見えるように再生"/>
<panel name="basic_info_panel">
<text name="desc txt">
説明:
</text>
<button label="インワールドで再生" label_selected="停止" name="Inworld" tool_tip="他人に見えるように再生"/>
<button label="ローカル再生" label_selected="停止" name="Locally" tool_tip="自分だけが見えるように再生"/>
</panel>
</floater>

View File

@ -7,7 +7,7 @@
Opis:
</text>
<text name="preview_label">
Wyświetl obraz jako:
Wyświetl jako:
</text>
<combo_box label="Rodzaj Ubrania" name="clothing_type_combo">
<item label="Obraz" name="Image" />

View File

@ -3,19 +3,24 @@
<floater.string name="Title">
Animacja: [NAME]
</floater.string>
<text name="desc txt">
Opis:
</text>
<button label="Uruchom publicznie" label_selected="Zatrzymaj" name="Inworld" tool_tip="Uruchom animację tak, aby widzieli ją pozostali Rezydenci"/>
<button label="Uruchom prywatnie" label_selected="Zatrzymaj" name="Locally" tool_tip="Uruchom animację tak, aby była ona widoczna tylko dla Ciebie"/>
<text name="AdvancedStatsLeft">
<panel name="basic_info_panel">
<text name="desc txt">
Opis:
</text>
<button label="Uruchom publicznie" label_selected="Zatrzymaj" name="Inworld" tool_tip="Uruchom animację tak, aby widzieli ją pozostali Rezydenci"/>
<button label="Uruchom prywatnie" label_selected="Zatrzymaj" name="Locally" tool_tip="Uruchom animację tak, aby była ona widoczna tylko dla Ciebie"/>
<button name="btn_expand" tool_tip="Rozwiń, aby zobaczyć zaawansowane informacje o tej animacji" />
</panel>
<panel name="advanced_info_panel">
<text name="AdvancedStatsLeft">
Priorytet: [PRIORITY]
Długość: [DURATION]s
Zapętlona: [IS_LOOP]
</text>
<text name="AdvancedStatsRight">
</text>
<text name="AdvancedStatsRight">
Wygł. startu: [EASE_IN]s
Wygł. końca: [EASE_OUT]s
Stawy: [NUM_JOINTS]
</text>
</text>
</panel>
</floater>

View File

@ -211,6 +211,7 @@
<check_box label="Używaj CTRL+myszki, aby chwytać obiekty i manipulować nimi" tool_tip="Gdy zaznaczysz tą opcję, to będziesz w stanie chwytać i przesuwać obiekty za pomocą myszki oraz klawisza CTRL." name="FSEnableGrab" />
<check_box label="Przesuwaj / skaluj tekstury budując, gdy trzymany jest przycisk myszy oraz klawisz caps-lock" tool_tip="Gdy zaznaczysz tą opcję, to będziesz mógł/mogła przesuwać lub skalować strony tekstur trzymając przycisk myszy (wraz z klawiszem caps-lock) w trybie budowania. Ta funkcja jest eksperymentalna i powinna być używana ostrożnie." name="FSExperimentalDragTexture" />
<check_box label="Podgląd animacji na własnym awatarze podczas przesyłania ich na serwer" tool_tip="Gdy zaznaczysz tą opcję, to będziesz w stanie oglądać animacje na swoim własnym awatarze podczas przesyłania ich na serwer" name="FSUploadAnimationOnOwnAvatar" />
<check_box label="Zawsze rozwijaj zaawansowane informacje o podglądzie animacji" tool_tip="Domyślnie rozwiń zaawansowane informacje o animacji w oknie podglądu animacji" name="FSAnimationPreviewExpanded" />
<check_box label="Włącz rozszerzanie funkcjonalności informacji o skryptach" tool_tip="Gdy zaznaczysz tą opcję, to podstawowa funkcjonalność informacji o skryptach zostanie rozszerzona za pomocą różnych szczegółów przydatnych dla budowniczych" name="FSScriptInfoExtended" />
</panel>
<panel label="Nowe pliki" name="UploadsTab">

View File

@ -7,8 +7,7 @@
Descrição:
</text>
<text name="preview_label">
Prévia da
imagem como:
Pré-visualizar:
</text>
<combo_box label="Tipo de Roupas" name="clothing_type_combo">
<item label="Imagem" name="Image" value="Imagem"/>

View File

@ -3,9 +3,11 @@
<floater.string name="Title">
Animação: [NOME]
</floater.string>
<text name="desc txt">
Descrição:
</text>
<button label="Tocar inworld" label_selected="Parar" name="Inworld" tool_tip="Executar essa animação de forma que outros possam ver"/>
<button label="Tocar localmente" label_selected="Parar" name="Locally" tool_tip="Executar animação de forma que apenas você possa ver"/>
<panel name="basic_info_panel">
<text name="desc txt">
Descrição:
</text>
<button label="Tocar inworld" label_selected="Parar" name="Inworld" tool_tip="Executar essa animação de forma que outros possam ver"/>
<button label="Tocar localmente" label_selected="Parar" name="Locally" tool_tip="Executar animação de forma que apenas você possa ver"/>
</panel>
</floater>

View File

@ -7,7 +7,7 @@
Описание:
</text>
<text name="preview_label">
Показать изображение как:
Показать как:
</text>
<combo_box label="Тип одежды" name="clothing_type_combo">
<item label="Изображение" name="Image" value="Изображение"/>

View File

@ -3,19 +3,23 @@
<floater.string name="Title">
Анимация: [NAME]
</floater.string>
<text name="desc txt">
Описание:
</text>
<button label="Запустить публично" label_selected="Остановить" name="Inworld" tool_tip="Запустить анимацию аватара, чтоб ее видели все вокруг"/>
<button label="Запустить для себя" label_selected="Остановить" name="Locally" tool_tip="Запустить анимацию аватара, чтоб ее видели только вы"/>
<text name="AdvancedStatsLeft">
<panel name="basic_info_panel">
<text name="desc txt">
Описание:
</text>
<button label="Запустить публично" label_selected="Остановить" name="Inworld" tool_tip="Запустить анимацию аватара, чтоб ее видели все вокруг"/>
<button label="Запустить для себя" label_selected="Остановить" name="Locally" tool_tip="Запустить анимацию аватара, чтоб ее видели только вы"/>
</panel>
<panel name="advanced_info_panel">
<text name="AdvancedStatsLeft">
Приоритет: [PRIORITY]
Длительн.: [DURATION]с
Цикл: [IS_LOOP]
</text>
<text name="AdvancedStatsRight">
</text>
<text name="AdvancedStatsRight">
Запуск: [EASE_IN]с
Останов: [EASE_OUT]с
Суставы: [NUM_JOINTS]
</text>
</text>
</panel>
</floater>

View File

@ -7,7 +7,7 @@
Açıklama:
</text>
<text name="preview_label">
Görüntüyü şu şekilde önizle:
Olarak önizleyin:
</text>
<combo_box label="Giysi Türü" name="clothing_type_combo">
<item label="Görüntü" name="Image" value="Görüntü"/>

View File

@ -3,9 +3,11 @@
<floater.string name="Title">
Animasyon: [NAME]
</floater.string>
<text name="desc txt">
Açıklama:
</text>
<button label="SL Dünyasında Oynat" label_selected="Durdur" name="Inworld" tool_tip="Bu animasyonu başkaları görebilecek şekilde oynatın"/>
<button label="Yerel Olarak Oynat" label_selected="Durdur" name="Locally" tool_tip="Bu animasyonu sadece kendinizin görebileceği şekilde oynatın"/>
<panel name="basic_info_panel">
<text name="desc txt">
Açıklama:
</text>
<button label="SL Dünyasında Oynat" label_selected="Durdur" name="Inworld" tool_tip="Bu animasyonu başkaları görebilecek şekilde oynatın"/>
<button label="Yerel Olarak Oynat" label_selected="Durdur" name="Locally" tool_tip="Bu animasyonu sadece kendinizin görebileceği şekilde oynatın"/>
</panel>
</floater>

View File

@ -3,9 +3,11 @@
<floater.string name="Title">
動作:[NAME]
</floater.string>
<text name="desc txt">
描述:
</text>
<button label="在虛擬世界播放" label_selected="停止" name="Inworld" tool_tip="播放此動作讓他人看見"/>
<button label="在本地播放" label_selected="停止" name="Locally" tool_tip="播放此動作,只給自己看"/>
<panel name="basic_info_panel">
<text name="desc txt">
描述:
</text>
<button label="在虛擬世界播放" label_selected="停止" name="Inworld" tool_tip="播放此動作讓他人看見"/>
<button label="在本地播放" label_selected="停止" name="Locally" tool_tip="播放此動作,只給自己看"/>
</panel>
</floater>