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

FIRE-940 , "Stretch Both Sides" text clickable on build floater. Thanks Ansariel Hiller

meow-7.2.2
Arrehn 2011-04-23 10:56:49 -04:00
parent 3ae34dadda
commit 9464004fcc
12 changed files with 12 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llfloatertools.cpp
View File

@ -233,7 +233,6 @@ BOOL LLFloaterTools::postBuild()
mCheckStretchTexture = getChild<LLCheckBoxCtrl>("checkbox stretch textures");
getChild<LLUICtrl>("checkbox stretch textures")->setValue((BOOL)gSavedSettings.getBOOL("ScaleStretchTextures"));
mComboGridMode = getChild<LLComboBox>("combobox grid mode");
mCheckStretchUniformLabel = getChild<LLTextBox>("checkbox uniform label");
//
// Create Buttons
@ -312,7 +311,6 @@ LLFloaterTools::LLFloaterTools(const LLSD& key)
mComboGridMode(NULL),
mCheckStretchUniform(NULL),
mCheckStretchTexture(NULL),
mCheckStretchUniformLabel(NULL),
mBtnRotateLeft(NULL),
mBtnRotateReset(NULL),
@ -643,7 +641,6 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
//mCheckSelectLinked ->setVisible( edit_visible );
if (mCheckStretchUniform) mCheckStretchUniform->setVisible( edit_visible );
if (mCheckStretchTexture) mCheckStretchTexture->setVisible( edit_visible );
if (mCheckStretchUniformLabel) mCheckStretchUniformLabel->setVisible( edit_visible );
// Create buttons
BOOL create_visible = (tool == LLToolCompCreate::getInstance());

3
indra/newview/llfloatertools.h
View File

@ -144,9 +144,10 @@ public:
LLCheckBoxCtrl* mCheckStretchUniform;
LLCheckBoxCtrl* mCheckStretchTexture;
// Ansariel: Reverted the hack because then when clicking the label it
// doesn't check the checkbox anymore!
// !HACK! Replacement of mCheckStretchUniform label because LLCheckBoxCtrl
// doesn't support word_wrap of its label. Need to fix truncation bug EXT-6658
LLTextBox* mCheckStretchUniformLabel;
LLButton *mBtnRotateLeft;
LLButton *mBtnRotateReset;

5
indra/newview/skins/default/xui/da/floater_tools.xml
View File

@ -67,10 +67,7 @@
<text name="RenderingCost" tool_tip="Hvis beregnede rendering omkostninger for dette objekt">
þ: [COUNT]
</text>
<check_box label="" name="checkbox uniform"/>
<text label="Stræk begge sider" name="checkbox uniform label">
Stræk begge sider
</text>
<check_box label="Stræk begge sider" name="checkbox uniform"/>
<check_box initial_value="true" label="Stræk teksturer" name="checkbox stretch textures"/>
<check_box initial_value="true" label="Benyt gitter" name="checkbox snap to grid"/>
<combo_box name="combobox grid mode" tool_tip="Vælg hvilken type lineal der skal bruges til positionering af objekt">

5
indra/newview/skins/default/xui/de/floater_tools.xml
View File

@ -67,10 +67,7 @@
<text name="RenderingCost" tool_tip="Zeigt die errechneten Wiedergabekosten für dieses Objekt">
þ: [COUNT]
</text>
<check_box label="" name="checkbox uniform"/>
<text label="Beide Seiten dehnen" name="checkbox uniform label">
Beide Seiten dehnen
</text>
<check_box name="checkbox uniform" label="Beide Seiten dehnen"/>
<check_box initial_value="true" label="Texturen dehnen" name="checkbox stretch textures" top_pad="-5"/>
<check_box initial_value="true" label="An Raster ausrichten" name="checkbox snap to grid" top_pad="15"/>
<combo_box name="combobox grid mode" tool_tip="Wählen Sie ein Rasterlineal zum Positionieren des Objekts aus.">

12
indra/newview/skins/default/xui/en/floater_tools.xml
View File

@ -308,22 +308,12 @@
<check_box
control_name="ScaleUniform"
height="19"
label=""
label="Stretch Both Sides"
layout="topleft"
left="143"
name="checkbox uniform"
top="50"
width="20" />
<text
height="19"
label="Stretch Both Sides"
left="163"
name="checkbox uniform label"
top="55"
width="120"
wrap="true">
Stretch Both Sides
</text>
<check_box
control_name="ScaleStretchTextures"
height="19"

5
indra/newview/skins/default/xui/es/floater_tools.xml
View File

@ -67,10 +67,7 @@
<text name="RenderingCost" tool_tip="Muestra cuánto se calcula que cuesta renderizar este objeto">
þ: [COUNT]
</text>
<check_box label="" name="checkbox uniform"/>
<text label="Estirar ambos lados" name="checkbox uniform label">
Estirar ambos lados
</text>
<check_box label="Estirar ambos lados" name="checkbox uniform"/>
<check_box initial_value="true" label="Estirar las texturas" name="checkbox stretch textures"/>
<check_box initial_value="true" label="Usar la cuadrícula" name="checkbox snap to grid"/>
<combo_box name="combobox grid mode" tool_tip="Elige qué cuadricula usar para posicionar el objeto" width="82">

5
indra/newview/skins/default/xui/fr/floater_tools.xml
View File

@ -67,10 +67,7 @@
<text name="RenderingCost" tool_tip="Affiche le coût du rendu calculé pour cet objet">
þ : [COUNT]
</text>
<check_box label="" name="checkbox uniform"/>
<text label="Étirer les deux côtés" name="checkbox uniform label">
Étirer les deux côtés
</text>
<check_box label="Étirer les deux côtés" name="checkbox uniform"/>
<check_box initial_value="true" label="Étirer les textures" name="checkbox stretch textures"/>
<check_box initial_value="true" label="Fixer sur la grille" name="checkbox snap to grid"/>
<combo_box name="combobox grid mode" tool_tip="Choisissez le type d&apos;axe de grille pour le positionnement de l&apos;objet">

5
indra/newview/skins/default/xui/it/floater_tools.xml
View File

@ -67,10 +67,7 @@
<text name="RenderingCost" tool_tip="Mostra il costo di rendering calcolato per questo oggetto">
þ: [COUNT]
</text>
<check_box label="" name="checkbox uniform"/>
<text label="Allunga entrambi i lati" name="checkbox uniform label">
Allunga entrambi i lati
</text>
<check_box label="Stendi ambedue lati" name="checkbox uniform"/>
<check_box initial_value="true" label="Ridimensiona le texture" name="checkbox stretch textures"/>
<check_box initial_value="true" label="Posiziona nella griglia" name="checkbox snap to grid"/>
<combo_box name="combobox grid mode" tool_tip="Scegli il tipo di righello per posizionare l&apos;oggetto">

5
indra/newview/skins/default/xui/ja/floater_tools.xml
View File

@ -67,10 +67,7 @@
<text name="RenderingCost" tool_tip="このオブジェクトにかかるレンダリングコストを表示">
þ: [COUNT]
</text>
<check_box label="" left="116" name="checkbox uniform"/>
<text label="両側を延ばす" name="checkbox uniform label">
両側を延ばす
</text>
<check_box label="両側を延ばす" left="116" name="checkbox uniform"/>
<check_box initial_value="true" label="テクスチャを引き延ばす" name="checkbox stretch textures"/>
<check_box initial_value="true" label="グリッドにスナップ" left_delta="27" name="checkbox snap to grid"/>
<combo_box left_delta="60" name="combobox grid mode" tool_tip="オブジェクトの配置に使うグリッドルーラを選択します" width="76">

5
indra/newview/skins/default/xui/nl/floater_tools.xml
View File

@ -33,10 +33,7 @@
<combo_box.item name="Reference" label="Referentie"
/>
</combo_box>
<check_box left="136" name="checkbox uniform"/>
<text name="checkbox uniform label">
Beide zijden uitrekken
</text>
<check_box left="136" name="checkbox uniform" label="Rek beide zijden"/>
<check_box left="136" label="Texturen uitrekken" name="checkbox stretch textures"/>
<check_box left="136" label="Gebruik grid" name="checkbox snap to grid"/>
<button label="Opties..." label_selected="Opties..." name="Options..." height="18" bottom_delta="-15"/>

5
indra/newview/skins/default/xui/pl/floater_tools.xml
View File

@ -67,10 +67,7 @@
<text name="RenderingCost" tool_tip="Pokazuje koszt renderowania tego obiektu">
þ: [COUNT]
</text>
<check_box label="" name="checkbox uniform"/>
<text label="Rozciągnij 2 strony" name="checkbox uniform label">
Rozciągnij 2 strony
</text>
<check_box label="Rozciągnij 2 strony" name="checkbox uniform"/>
<check_box initial_value="true" label="Rozciągnij teksturę" name="checkbox stretch textures"/>
<check_box initial_value="true" label="Użyj siatki" name="checkbox snap to grid"/>
<combo_box name="combobox grid mode" tool_tip="Wybierz rodzaj linijki siatki dla pozycjonowania obiektu">

5
indra/newview/skins/default/xui/pt/floater_tools.xml
View File

@ -67,10 +67,7 @@
<text name="RenderingCost" tool_tip="Mostra o cálculo do custo de renderização do objeto">
þ: [COUNT]
</text>
<check_box label="" name="checkbox uniform"/>
<text label="Esticar ambos lados" name="checkbox uniform label">
Esticar ambos lados
</text>
<check_box label="Esticar ambos lados" name="checkbox uniform"/>
<check_box initial_value="true" label="Esticar texturas" name="checkbox stretch textures"/>
<check_box initial_value="true" label="Mostrar na grade" name="checkbox snap to grid"/>
<combo_box name="combobox grid mode" tool_tip="Selecione a régua da grade onde o objeto será colocado">