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

Remove "Importing old Value" script dialog position option that isn't needed anymore and fix enabled state of "Animate Script Dialogs" option

master
Ansariel 2017-03-05 20:27:31 +01:00
parent fb0b49352b
commit f6a7883a6f
17 changed files with 23 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
indra/newview/app_settings/settings.xml
View File

@ -702,13 +702,13 @@
<key>ScriptDialogsPosition</key>
<map>
<key>Comment</key>
<string>Holds the position where script llDialog floaters will show up. 1 = docked to chiclet, 2 = top left, 3 = top right, 4 = bottom left, 5 = bottom right, 0 = follow legacy ShowScriptDialogsTopRight</string>
<string>Holds the position where script llDialog floaters will show up. 1 = docked to chiclet, 2 = top left, 3 = top right, 4 = bottom left, 5 = bottom right</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
<integer>0</integer>
<integer>3</integer>
</map>
<key>DialogStackIconVisible</key>
@ -723,19 +723,6 @@
<integer>0</integer>
</map>
<!-- Legacy setting, can be removed when ScriptDialogsPosition was adopted -->
<key>ShowScriptDialogsTopRight</key>
<map>
<key>Comment</key>
<string>Show script llDialog floaters always in the top right corner of the screen (OBSOLETE, see ScriptDialogsPosition).</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>ShowGroupNoticesTopRight</key>
<map>
<key>Comment</key>

12
indra/newview/app_settings/settings_firestorm.xml
View File

@ -183,18 +183,6 @@
<integer>1</integer>
</map>
<key>ShowScriptDialogsTopRight</key>
<map>
<key>Comment</key>
<string>Show script llDialog floaters always in the top right corner of the screen.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>EnableGroupChatPopups</key>
<map>
<key>Comment</key>

12
indra/newview/app_settings/settings_hybrid.xml
View File

@ -159,18 +159,6 @@
<integer>1</integer>
</map>
<key>ShowScriptDialogsTopRight</key>
<map>
<key>Comment</key>
<string>Show script llDialog floaters always in the top right corner of the screen.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>EnableGroupChatPopups</key>
<map>
<key>Comment</key>

24
indra/newview/app_settings/settings_phoenix.xml
View File

@ -171,18 +171,6 @@
<integer>1</integer>
</map>
<key>ShowScriptDialogsTopRight</key>
<map>
<key>Comment</key>
<string>Show script llDialog floaters always in the top right corner of the screen.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>EnableGroupChatPopups</key>
<map>
<key>Comment</key>
@ -483,18 +471,6 @@
<integer>1</integer>
</map>
<key>ScriptDialogsPosition</key>
<map>
<key>Comment</key>
<string>Holds the position where script llDialog floaters will show up. 1 = docked to chiclet, 2 = top left, 3 = top right, 4 = bottom left, 5 = bottom right, 0 = follow legacy ShowScriptDialogsTopRight</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
<integer>3</integer>
</map>
<key>FSUseLegacyCursors</key>
<map>
<key>Comment</key>

12
indra/newview/app_settings/settings_text.xml
View File

@ -147,18 +147,6 @@
<integer>1</integer>
</map>
<key>ShowScriptDialogsTopRight</key>
<map>
<key>Comment</key>
<string>Show script llDialog floaters always in the top right corner of the screen.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>EnableGroupChatPopups</key>
<map>
<key>Comment</key>

8
indra/newview/app_settings/settings_v3.xml
View File

@ -183,16 +183,16 @@
<integer>0</integer>
</map>
<key>ShowScriptDialogsTopRight</key>
<key>ScriptDialogsPosition</key>
<map>
<key>Comment</key>
<string>Show script llDialog floaters always in the top right corner of the screen.</string>
<string>Holds the position where script llDialog floaters will show up. 1 = docked to chiclet, 2 = top left, 3 = top right, 4 = bottom left, 5 = bottom right</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<string>S32</string>
<key>Value</key>
<integer>0</integer>
<integer>1</integer>
</map>
<key>EnableGroupChatPopups</key>

12
indra/newview/llfloaterpreference.cpp
View File

@ -770,6 +770,10 @@ BOOL LLFloaterPreference::postBuild()
onAvatarTagSettingsChanged();
// </FS:Ansariel>
// <FS:Ansariel> Correct enabled state of Animated Script Dialogs option
gSavedSettings.getControl("ScriptDialogsPosition")->getCommitSignal()->connect(boost::bind(&LLFloaterPreference::updateAnimatedScriptDialogs, this));
updateAnimatedScriptDialogs();
// <FS:Ansariel> Set max. UI scaling factor depending on max. supported OS scaling factor
#if LL_WINDOWS
if (IsWindowsVersionOrGreater(10, 0, 0))
@ -3440,6 +3444,14 @@ void LLFloaterPreference::onAvatarTagSettingsChanged()
}
// </FS:Ansariel>
// <FS:Ansariel> Correct enabled state of Animated Script Dialogs option
void LLFloaterPreference::updateAnimatedScriptDialogs()
{
S32 position = gSavedSettings.getS32("ScriptDialogsPosition");
childSetEnabled("FSAnimatedScriptDialogs", position == 2 || position == 3);
}
// </FS:Ansariel>
//------------------------------Updater---------------------------------------
//<FS:HG> FIRE-6340, FIRE-6567 - Setting Bandwidth issues

3
indra/newview/llfloaterpreference.h
View File

@ -164,6 +164,9 @@ protected:
// <FS:Ansariel> Properly disable avatar tag setting
void onAvatarTagSettingsChanged();
// <FS:Ansariel> Correct enabled state of Animated Script Dialogs option
void updateAnimatedScriptDialogs();
public:
// This function squirrels away the current values of the controls so that
// cancel() can restore them.

50
indra/newview/llscriptfloater.cpp
View File

@ -127,47 +127,9 @@ LLScriptFloater* LLScriptFloater::show(const LLUUID& notification_id)
//LLDialog(LLGiveInventory and LLLoadURL) should no longer steal focus (see EXT-5445)
floater->setAutoFocus(FALSE);
LLScriptFloaterManager::e_object_type floaterType=LLScriptFloaterManager::getObjectType(notification_id);
// for some reason an inventory offer comes back as OBJ_UNKNOWN -Zi
if(floaterType==LLScriptFloaterManager::OBJ_UNKNOWN ||
floaterType==LLScriptFloaterManager::OBJ_SCRIPT)
if(LLScriptFloaterManager::OBJ_SCRIPT == LLScriptFloaterManager::getObjectType(notification_id))
{
floater->setSavePosition(true);
if(gSavedSettings.getBOOL("ShowScriptDialogsTopRight") ||
gSavedSettings.getBOOL("FSDisableIMChiclets")
)
{
// undock the dialog
floater->setDocked(false,true);
LLRect pos=floater->getRect();
S32 width=pos.getWidth();
S32 height=pos.getHeight();
pos.setOriginAndSize(gViewerWindow->getWorldViewWidthScaled()-width,
gViewerWindow->getWorldViewHeightScaled()-height,
width,height);
floater->setRect(pos);
floater->savePosition();
}
// do this only for inventory offers -Zi
else if(floaterType==LLScriptFloaterManager::OBJ_UNKNOWN)
{
// undock the dialog
floater->setDocked(false,true);
LLRect pos=floater->getRect();
S32 width=pos.getWidth();
S32 height=pos.getHeight();
pos.setOriginAndSize(gViewerWindow->getWorldViewWidthScaled()-width,
gViewerWindow->getWorldViewHeightScaled()-height,
width,height);
floater->setRect(pos);
floater->savePosition();
}
floater->restorePosition();
}
else
@ -892,16 +854,6 @@ LLScriptFloater* LLScriptFloater::show(const LLUUID& notification_id)
{
eDialogPosition dialog_position = (eDialogPosition)gSavedSettings.getS32("ScriptDialogsPosition");
if (dialog_position == POS_LEGACY)
{
dialog_position = POS_TOP_RIGHT;
if (!gSavedSettings.getBOOL("ShowScriptDialogsTopRight"))
{
dialog_position = POS_DOCKED;
}
gSavedSettings.setS32("ScriptDialogsPosition", (S32)dialog_position);
}
if (dialog_position == POS_DOCKED && chicletsDisabled)
{
dialog_position = POS_TOP_RIGHT;

3
indra/newview/llscriptfloater.h
View File

@ -235,8 +235,7 @@ public:
// <FS:Zi> script dialogs position
enum eDialogPosition
{
POS_LEGACY, // Use ShowScriptDialogsTopRight once and convert to one of these
POS_DOCKED,
POS_DOCKED = 1,
POS_TOP_LEFT,
POS_TOP_RIGHT,
POS_BOTTOM_LEFT,

1
indra/newview/skins/default/xui/de/panel_preferences_UI.xml
View File

@ -50,7 +50,6 @@
Skriptdialog-Position:
</text>
<combo_box name="ScriptDialogsPositionDropdown" tool_tip="Auswählen, wo Skriptdialoge (Menüs) auf dem Bildschirm erscheinen sollen.">
<combo_box.item label="Import alter Wert" name="ScriptDialogPositionOption_0"/>
<combo_box.item label="Am Chiclet angedockt" name="ScriptDialogPositionOption_1"/>
<combo_box.item label="Oben links" name="ScriptDialogPositionOption_2"/>
<combo_box.item label="Oben rechts" name="ScriptDialogPositionOption_3"/>

5
indra/newview/skins/default/xui/en/panel_preferences_UI.xml
View File

@ -346,10 +346,6 @@
tool_tip="Choose where script dialogs (menus) come up on your screen."
width="180">
<combo_box.item
label="Importing old Value"
name="ScriptDialogPositionOption_0"
value="0"/>
<combo_box.item
label="Docked to Chiclet"
name="ScriptDialogPositionOption_1"
@ -374,7 +370,6 @@
</combo_box>
<check_box
control_name="FSAnimatedScriptDialogs"
enabled_control="ShowScriptDialogsTopRight"
height="16"
initial_value="true"
label="Animate Script Dialogs"

1
indra/newview/skins/default/xui/es/panel_preferences_UI.xml
View File

@ -44,7 +44,6 @@
Posición de los diálogos de script:
</text>
<combo_box name="ScriptDialogsPositionDropdown" tool_tip="Selecciona dónde deben aparecer los diálogos de script en tu pantalla.">
<combo_box.item label="Valor anterior" name="ScriptDialogPositionOption_0"/>
<combo_box.item label="Acoplado a los chiclets" name="ScriptDialogPositionOption_1"/>
<combo_box.item label="Arriba a la izquerda" name="ScriptDialogPositionOption_2"/>
<combo_box.item label="Arriba a la derecha" name="ScriptDialogPositionOption_3"/>

1
indra/newview/skins/default/xui/fr/panel_preferences_UI.xml
View File

@ -30,7 +30,6 @@
<check_box label="Supprimer le bouton 'Ignorer'" name="FSRemoveScriptBlockButton"/>
<text name="ScriptDialogsPositionLabel" width="180">Position des dialogues de scripts :</text>
<combo_box name="ScriptDialogsPositionDropdown" width="150" tool_tip="Sélectionnez où les dialogues de scripts s'affichent à l'écran.">
<combo_box.item label="Ancienne configuration" name="ScriptDialogPositionOption_0"/>
<combo_box.item label="Liés aux Chiclets" name="ScriptDialogPositionOption_1"/>
<combo_box.item label="En haut à gauche" name="ScriptDialogPositionOption_2"/>
<combo_box.item label="En haut à droite" name="ScriptDialogPositionOption_3"/>

1
indra/newview/skins/default/xui/ja/panel_preferences_UI.xml
View File

@ -61,7 +61,6 @@
スクリプトダイアログの表示位置:
</text>
<combo_box name="ScriptDialogsPositionDropdown" tool_tip="スクリプトダイアログ（メニュー）を表示したい場所を選択して下さい。">
<combo_box.item label="前回の値を引き継ぐ" name="ScriptDialogPositionOption_0"/>
<combo_box.item label="ミニアイコンにドッキング" name="ScriptDialogPositionOption_1"/>
<combo_box.item label="左上" name="ScriptDialogPositionOption_2"/>
<combo_box.item label="右上" name="ScriptDialogPositionOption_3"/>

1
indra/newview/skins/default/xui/pl/panel_preferences_UI.xml
View File

@ -46,7 +46,6 @@
Pozycja komunikatów skryptów:
</text>
<combo_box name="ScriptDialogsPositionDropdown" tool_tip="Wybierz, w którym miejscu na ekranie mają się pojawiać komunikaty skryptów.">
<combo_box.item label="Importuj starą wartość" name="ScriptDialogPositionOption_0" />
<combo_box.item label="Przyczepione do ikonek powiadomień" name="ScriptDialogPositionOption_1" />
<combo_box.item label="Lewy górny róg ekranu" name="ScriptDialogPositionOption_2" />
<combo_box.item label="Prawy górny róg ekranu" name="ScriptDialogPositionOption_3" />

1
indra/newview/skins/default/xui/ru/panel_preferences_UI.xml
View File

@ -44,7 +44,6 @@
Размещение диалогов скрипта:
</text>
<combo_box name="ScriptDialogsPositionDropdown" tool_tip="Выберите в какой части экрана будет отображаться окно диалогового меню скрипта">
<combo_box.item label="Импортировать старое значение" name="ScriptDialogPositionOption_0" />
<combo_box.item label="Пристыкован в поле иконок" name="ScriptDialogPositionOption_1" />
<combo_box.item label="Сверху слева" name="ScriptDialogPositionOption_2" />
<combo_box.item label="Сверху справа" name="ScriptDialogPositionOption_3" />