livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm

meow-7.2.2
Ansariel 2020-11-05 19:19:25 +01:00
parent 5cec2d75ed fc33802939
commit 64ff551cb0
13 changed files with 131 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
indra/newview/lltexturectrl.cpp
View File

@ -152,17 +152,25 @@ void LLFloaterTexturePicker::setImageID(const LLUUID& image_id, bool set_selecti
if (LLAvatarAppearanceDefines::LLAvatarAppearanceDictionary::isBakedImageId(mImageAssetID))
{
if ( mBakeTextureEnabled && mModeSelector->getValue().asInteger() != 2)
// <FS:Ansariel> FIRE-30431: Keep radio button mode selection in texture selection
//if ( mBakeTextureEnabled && mModeSelector->getValue().asInteger() != 2)
if ( mBakeTextureEnabled && mModeSelector->getSelectedIndex() != 2)
{
mModeSelector->selectByValue(2);
// <FS:Ansariel> FIRE-30431: Keep radio button mode selection in texture selection
//mModeSelector->selectByValue(2);
mModeSelector->setSelectedIndex(2, 0);
onModeSelect(0,this);
}
}
else
{
if (mModeSelector->getValue().asInteger() == 2)
// <FS:Ansariel> FIRE-30431: Keep radio button mode selection in texture selection
//if (mModeSelector->getValue().asInteger() == 2)
if (mModeSelector->getSelectedIndex() == 2)
{
mModeSelector->selectByValue(0);
// <FS:Ansariel> FIRE-30431: Keep radio button mode selection in texture selection
//mModeSelector->selectByValue(0);
mModeSelector->setSelectedIndex(0, 0);
onModeSelect(0,this);
}
@ -417,9 +425,14 @@ BOOL LLFloaterTexturePicker::postBuild()
mInventoryPanel = getChild<LLInventoryPanel>("inventory panel");
mModeSelector = getChild<LLComboBox>("mode_selection");
// <FS:Ansariel> FIRE-30431: Keep radio button mode selection in texture selection
//mModeSelector = getChild<LLComboBox>("mode_selection");
//mModeSelector->setCommitCallback(onModeSelect, this);
//mModeSelector->selectByValue(0);
mModeSelector = getChild<LLRadioGroup>("mode_selection");
mModeSelector->setCommitCallback(onModeSelect, this);
mModeSelector->selectByValue(0);
mModeSelector->setSelectedIndex(0, 0);
// </FS:Ansariel>
if(mInventoryPanel)
{
@ -870,7 +883,9 @@ void LLFloaterTexturePicker::onSelectionChange(const std::deque<LLFolderViewItem
void LLFloaterTexturePicker::onModeSelect(LLUICtrl* ctrl, void *userdata)
{
LLFloaterTexturePicker* self = (LLFloaterTexturePicker*) userdata;
int index = self->mModeSelector->getValue().asInteger();
// <FS:Ansariel> FIRE-30431: Keep radio button mode selection in texture selection
//int index = self->mModeSelector->getValue().asInteger();
int index = self->mModeSelector->getSelectedIndex();
self->getChild<LLButton>("Default")->setVisible(index == 0 ? TRUE : FALSE);
self->getChild<LLButton>("Blank")->setVisible(index == 0 ? TRUE : FALSE);
@ -1213,28 +1228,45 @@ void LLFloaterTexturePicker::onFilterEdit(const std::string& search_string )
void LLFloaterTexturePicker::setLocalTextureEnabled(BOOL enabled)
{
mModeSelector->setEnabledByValue(1, enabled);
}
// <FS:Ansariel> FIRE-30431: Keep radio button mode selection in texture selection
//mModeSelector->setEnabledByValue(1, enabled);
mModeSelector->setIndexEnabled(1,enabled);}
void LLFloaterTexturePicker::setBakeTextureEnabled(BOOL enabled)
{
BOOL changed = (enabled != mBakeTextureEnabled);
mBakeTextureEnabled = enabled;
mModeSelector->setEnabledByValue(2, enabled);
// <FS:Ansariel> FIRE-30431: Keep radio button mode selection in texture selection
//mModeSelector->setEnabledByValue(2, enabled);
if (!mBakeTextureEnabled && (mModeSelector->getValue().asInteger() == 2))
//if (!mBakeTextureEnabled && (mModeSelector->getValue().asInteger() == 2))
//{
// mModeSelector->selectByValue(0);
//}
//
//if (changed && mBakeTextureEnabled && LLAvatarAppearanceDefines::LLAvatarAppearanceDictionary::isBakedImageId(mImageAssetID))
//{
// if (mModeSelector->getValue().asInteger() != 2)
// {
// mModeSelector->selectByValue(2);
// }
//}
mModeSelector->setIndexEnabled(2, enabled);
if (!mBakeTextureEnabled && (mModeSelector->getSelectedIndex() == 2))
{
mModeSelector->selectByValue(0);
mModeSelector->setSelectedIndex(0, 0);
}
if (changed && mBakeTextureEnabled && LLAvatarAppearanceDefines::LLAvatarAppearanceDictionary::isBakedImageId(mImageAssetID))
{
if (mModeSelector->getValue().asInteger() != 2)
if (mModeSelector->getSelectedIndex() != 2)
{
mModeSelector->selectByValue(2);
mModeSelector->setSelectedIndex(2, 0);
}
}
// </FS:Ansariel>
onModeSelect(0, this);
}

8
indra/newview/lltexturectrl.h
View File

@ -43,7 +43,9 @@
#include "llviewertexture.h"
#include "llwindow.h"
class LLComboBox;
// <FS:Ansariel> FIRE-30431: Keep radio button mode selection in texture selection
//class LLComboBox;
class LLRadioGroup;
class LLFloaterTexturePicker;
class LLInventoryItem;
class LLViewerFetchedTexture;
@ -382,7 +384,9 @@ protected:
LLSaveFolderState mSavedFolderState;
BOOL mSelectedItemPinned;
LLComboBox* mModeSelector;
// <FS:Ansariel> FIRE-30431: Keep radio button mode selection in texture selection
//LLComboBox* mModeSelector;
LLRadioGroup* mModeSelector;
LLScrollListCtrl* mLocalScrollCtrl;
private:

10
indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
View File

@ -9,11 +9,11 @@
<text name="Multiple">
Mehrere Texturen
</text>
<combo_box name="mode_selection">
<combo_box.item label="Inventar" name="inventory"/>
<combo_box.item label="Lokal" name="local"/>
<combo_box.item label="Backen" name="bake"/>
</combo_box>
<radio_group name="mode_selection">
<radio_item label="Inventar" name="inventory" width="66"/>
<radio_item label="Lokal" name="local" width="47"/>
<radio_item label="Backen" name="bake"/>
</radio_group>
<text name="size_lbl">
Größe:
[DIMENSIONS]

44
indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
View File

@ -48,27 +48,41 @@
</text>
<!-- mode selector -->
<combo_box
<radio_group
height="20"
layout="topleft"
left="6"
top_pad="77"
left="0"
top_pad="80"
name="mode_selection"
follows="left|top"
width="161">
<combo_box.item
follows="left|top">
<radio_item
label="Inventory"
name="inventory"
value="0" />
<combo_box.item
top_delta="20"
layout="topleft"
height="16"
left="0"
value="0"
width="70" />
<radio_item
label="Local"
left_pad="0"
layout="topleft"
top_delta="0"
height="16"
name="local"
value="1" />
<combo_box.item
value="1"
width="50" />
<radio_item
label="Bake"
left_pad="0"
layout="topleft"
top_delta="0"
height="16"
name="bake"
value="2" />
</combo_box>
value="2"
width="50" />
</radio_group>
<!-- -->
<text
@ -79,7 +93,7 @@
layout="topleft"
left="8"
name="size_lbl"
top_pad="4">
top_pad="1">
Size:
[DIMENSIONS]
</text>
@ -220,9 +234,9 @@
visible="false"/>
<scroll_list
name="l_name_list"
left="170"
left="175"
top="22"
width="235"
width="230"
height="260"
follows="left|top|right|bottom"
column_padding="0"

10
indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
View File

@ -9,11 +9,11 @@
<text name="Multiple">
Texturas múltiples
</text>
<combo_box name="mode_selection">
<combo_box.item label="Inventario" name="inventory"/>
<combo_box.item label="Local" name="local"/>
<combo_box.item label="Hornear" name="bake"/>
</combo_box>
<radio_group name="mode_selection">
<radio_item label="Inventario" name="inventory"/>
<radio_item label="Local" name="local"/>
<radio_item label="Hornear" name="bake"/>
</radio_group>
<text name="size_lbl">
Tamaño:
[DIMENSIONS]

10
indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
View File

@ -9,11 +9,11 @@
<text name="Multiple">
Textures multiples
</text>
<combo_box name="mode_selection">
<combo_box.item label="Inventaire" name="inventory"/>
<combo_box.item label="Local" name="local"/>
<combo_box.item label="Figer" name="bake"/>
</combo_box>
<radio_group name="mode_selection">
<radio_item label="Inventaire" name="inventory"/>
<radio_item label="Local" name="local""/>
<radio_item label="Figer" name="bake"/>
</radio_group>
<text name="size_lbl">
Taille: [DIMENSIONS]
</text>

10
indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
View File

@ -9,11 +9,11 @@
<text name="Multiple">
Texture multiple
</text>
<combo_box name="mode_selection">
<combo_box.item label="Inventario" name="inventory"/>
<combo_box.item label="Locale" name="local"/>
<combo_box.item label="Effettua il bake" name="bake"/>
</combo_box>
<radio_group name="mode_selection">
<radio_item label="Inventario" name="inventory"/>
<radio_item label="Locale" name="local"/>
<radio_item label="Bake" name="bake"/>
</radio_group>
<text name="size_lbl">
Dimensioni:
[DIMENSIONS]

10
indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
View File

@ -9,11 +9,11 @@
<text name="Multiple">
複数のテクスチャ
</text>
<combo_box name="mode_selection">
<combo_box.item label="インベントリ" name="inventory"/>
<combo_box.item label="ローカル" name="local"/>
<combo_box.item label="構築（ベーク）" name="bake"/>
</combo_box>
<radio_group name="mode_selection">
<radio_item label="インベントリ" name="inventory"/>
<radio_item label="ローカル" name="local"/>
<radio_item label="構築（ベーク）" name="bake"/>
</radio_group>
<text name="size_lbl">
サイズ：
[DIMENSIONS]

10
indra/newview/skins/default/xui/pl/floater_texture_ctrl.xml
View File

@ -9,11 +9,11 @@
<text name="Multiple">
Wiele tekstur
</text>
<combo_box name="mode_selection">
<combo_box.item label="Szafa" name="inventory" />
<combo_box.item label="Lokalna" name="local" />
<combo_box.item label="Wypiekana" name="bake" />
</combo_box>
<radio_group name="mode_selection">
<radio_item label="Szafa" name="inventory" width="51" />
<radio_item label="Lokaln." name="local" width="60" />
<radio_item label="Wypiek." name="bake" />
</radio_group>
<text name="size_lbl">
Rozmiar:
[DIMENSIONS]

10
indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
View File

@ -9,11 +9,11 @@
<text name="Multiple">
Multiplas texturas
</text>
<combo_box name="mode_selection">
<combo_box.item label="Inventário" name="inventory"/>
<combo_box.item label="Local" name="local"/>
<combo_box.item label="Assar" name="bake"/>
</combo_box>
<radio_group name="mode_selection">
<radio_item label="Inventário" name="inventory"/>
<radio_item label="Local" name="local"/>
<radio_item label="Assar" name="bake"/>
</radio_group>
<text name="size_lbl">
Tamanho:
[DIMENSÕES]

10
indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
View File

@ -13,11 +13,11 @@
</text>
<!-- mode selector -->
<combo_box name="mode_selection" >
<combo_box.item label="Инв." name="inventory"/>
<combo_box.item label="Лок." name="local"/>
<combo_box.item label="Запеч" name="bake"/>
</combo_box>
<radio_group name="mode_selection" left="7">
<radio_item label="Инв." name="inventory"/>
<radio_item label="Лок." name="local"/>
<radio_item label="Зафиксировать" name="bake"/>
</radio_group>
<text name="size_lbl">
Размер:
[DIMENSIONS]

10
indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
View File

@ -9,11 +9,11 @@
<text name="Multiple">
Birden çok doku
</text>
<combo_box name="mode_selection">
<combo_box.item label="Envanter" name="inventory"/>
<combo_box.item label="Yerel" name="local"/>
<combo_box.item label="Kurut" name="bake"/>
</combo_box>
<radio_group name="mode_selection">
<radio_item label="Envanter" name="inventory"/>
<radio_item label="Yerel" name="local"/>
<radio_item label="Kurut" name="bake"/>
</radio_group>
<text name="size_lbl">
Büyüklük:
[DIMENSIONS]

10
indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
View File

@ -9,11 +9,11 @@
<text name="Multiple">
多重材質
</text>
<combo_box name="mode_selection">
<combo_box.item label="收納區" name="inventory"/>
<combo_box.item label="本地" name="local"/>
<combo_box.item label="確定產出" name="bake"/>
</combo_box>
<radio_group name="mode_selection">
<radio_item label="收納區" name="inventory"/>
<radio_item label="本地" name="local"/>
<radio_item label="確定產出" name="bake"/>
</radio_group>
<text name="size_lbl">
尺寸：
[DIMENSIONS]