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

FIRE-593: Audio stream URL drop down in About Land

Cinders 2013-03-14 20:42:35 -06:00
parent cefb6d2e83
commit 96be4a4e68
4 changed files with 121 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20073,5 +20073,16 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<string>44e98907-3764-119f-1c13-cba9945d2ff4</string>
</map>
<key>FSStreamList</key>
<map>
<key>Comment</key>
<string>Saved list of media streams</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>LLSD</string>
<key>Value</key>
<string />
</map>
</map>
</llsd>

75
indra/newview/llpanellandaudio.cpp
View File

@ -40,7 +40,7 @@
#include "llcombobox.h"
#include "llfloaterurlentry.h"
#include "llfocusmgr.h"
#include "lllineeditor.h"
//#include "lllineeditor.h" // <FS:CR> FIRE-593 - Unused since we use a combobox instead
#include "llparcel.h"
#include "lltextbox.h"
#include "llradiogroup.h"
@ -50,6 +50,8 @@
#include "roles_constants.h"
#include "llscrolllistctrl.h"
#include "llviewercontrol.h" // <FS:CR> FIRE-593 - Needed for gSavedSettings where we store our media list
// Values for the parcel voice settings radio group
enum
{
@ -88,8 +90,17 @@ BOOL LLPanelLandAudio::postBuild()
mCheckParcelVoiceLocal = getChild<LLCheckBoxCtrl>("parcel_enable_voice_channel_local");
childSetCommitCallback("parcel_enable_voice_channel_local", onCommitAny, this);
mMusicURLEdit = getChild<LLLineEditor>("music_url");
// <FS:CR> FIRE-593 - We use a combobox now, not a line editor, also set callbacks for new add/remove stream buttons
//mMusicURLEdit = getChild<LLLineEditor>("music_url");
mMusicURLEdit = getChild<LLComboBox>("music_url");
childSetCommitCallback("music_url", onCommitAny, this);
mBtnStreamAdd = getChild<LLButton>("stream_add_btn");
childSetCommitCallback("stream_add_btn", onBtnStreamAdd, this);
mBtnStreamDelete = getChild<LLButton>("stream_delete_btn");
childSetCommitCallback("stream_delete_btn", onBtnStreamDelete, this);
// </FS:CR>
mCheckAVSoundAny = getChild<LLCheckBoxCtrl>("all av sound check");
childSetCommitCallback("all av sound check", onCommitAny, this);
@ -148,7 +159,25 @@ void LLPanelLandAudio::refresh()
mCheckParcelEnableVoice->set(allow_voice);
mCheckParcelVoiceLocal->set(!parcel->getParcelFlagUseEstateVoiceChannel());
mMusicURLEdit->setText(parcel->getMusicURL());
// <FS:CR> FIRE-593 - Populate the audio combobox with our saved urls, then add the parcel's current url up top.
//mMusicURLEdit->setText(parcel->getMusicURL());
std::string current_url = parcel->getMusicURL();
mMusicURLEdit->clearRows();
LLSD streamlist = gSavedSettings.getLLSD("FSStreamList");
LLSD streams = streamlist["audio"];
for(LLSD::array_iterator s_itr = streams.beginArray(); s_itr != streams.endArray(); ++s_itr)
{
mMusicURLEdit->add(LLSD(*s_itr));
lldebugs << "adding: " << *s_itr << " to the audio stream combo." << llendl;
}
mMusicURLEdit->addSeparator(ADD_TOP);
mMusicURLEdit->add(LLSD(current_url), ADD_TOP);
mMusicURLEdit->selectByValue(current_url);
mBtnStreamAdd->setEnabled( can_change_media );
mBtnStreamDelete->setEnabled( can_change_media );
// </FS:CR>
mMusicURLEdit->setEnabled( can_change_media );
BOOL can_change_av_sounds = LLViewerParcelMgr::isParcelModifiableByAgent(parcel, GP_LAND_OPTIONS) && parcel->getHaveNewParcelLimitData();
@ -172,7 +201,10 @@ void LLPanelLandAudio::onCommitAny(LLUICtrl*, void *userdata)
// Extract data from UI
BOOL sound_local = self->mCheckSoundLocal->get();
std::string music_url = self->mMusicURLEdit->getText();
// <FS:CR> FIRE-593 - It's a combobox now
//std::string music_url = self->mMusicURLEdit->getText();
std::string music_url = self->mMusicURLEdit->getSimple();
// </FS:CR>
BOOL voice_enabled = self->mCheckParcelEnableVoice->get();
BOOL voice_estate_chan = !self->mCheckParcelVoiceLocal->get();
@ -201,3 +233,38 @@ void LLPanelLandAudio::onCommitAny(LLUICtrl*, void *userdata)
// Might have changed properties, so let's redraw!
self->refresh();
}
// <FS:CR> FIRE-593 - Add/remove streams from the list with these. They're fantastic!
// static
void LLPanelLandAudio::onBtnStreamAdd(LLUICtrl*, void *userdata)
{
LLPanelLandAudio *self = (LLPanelLandAudio *)userdata;
std::string music_url = self->mMusicURLEdit->getSimple();
LLStringUtil::trim(music_url);
if (!music_url.empty())
{
LLSD streamlist = gSavedSettings.getLLSD("FSStreamList");
streamlist["audio"].append(music_url);
gSavedSettings.setLLSD("FSStreamList", streamlist);
self->refresh();
}
}
// static
void LLPanelLandAudio::onBtnStreamDelete(LLUICtrl*, void *userdata)
{
LLPanelLandAudio *self = (LLPanelLandAudio *)userdata;
std::string music_url = self->mMusicURLEdit->getSimple();
LLStringUtil::trim(music_url);
LLSD streamlist = gSavedSettings.getLLSD("FSStreamList");
// TODO: Make this remove specific items from the list instead of flushing the whole list.
streamlist.clear();
gSavedSettings.setLLSD("FSStreamList", streamlist);
self->refresh();
}
// </FS:CR>

19
indra/newview/llpanellandaudio.h
View File

@ -28,7 +28,11 @@
#ifndef LLPANELLANDAUDIO_H
#define LLPANELLANDAUDIO_H
#include "lllineeditor.h"
// <FS:CR> FIRE-593 - We use a combobox now, not a lineeditor
//#include "lllineeditor.h"
#include "llcombobox.h"
#include "llbutton.h"
// </FS:CR>
#include "llpanel.h"
#include "llparcelselection.h"
#include "lluifwd.h" // widget pointer types
@ -44,13 +48,22 @@ public:
private:
static void onCommitAny(LLUICtrl* ctrl, void *userdata);
// <FS:CR> FIRE-593 - Add/remove streams from the list
static void onBtnStreamAdd(LLUICtrl* ctrl, void *userdata);
static void onBtnStreamDelete(LLUICtrl* ctrl, void *userdata);
// </FS:CR>
private:
LLCheckBoxCtrl* mCheckSoundLocal;
LLCheckBoxCtrl* mCheckParcelEnableVoice;
LLCheckBoxCtrl* mCheckEstateDisabledVoice;
LLCheckBoxCtrl* mCheckParcelVoiceLocal;
LLLineEditor* mMusicURLEdit;
LLCheckBoxCtrl* mCheckParcelVoiceLocal;
// <FS:CR> FIRE-593 - Use a combobox, also add buttons so we can add/remove items from it.
//LLLineEditor* mMusicURLEdit;
LLComboBox* mMusicURLEdit;
LLButton* mBtnStreamAdd;
LLButton* mBtnStreamDelete;
// </FS:CR>
LLCheckBoxCtrl* mMusicUrlCheck;
LLCheckBoxCtrl* mCheckAVSoundAny;
LLCheckBoxCtrl* mCheckAVSoundGroup;

26
indra/newview/skins/default/xui/en/floater_about_land.xml
View File

@ -1837,16 +1837,36 @@ Only large parcels can be listed in search.
width="364">
Music URL:
</text>
<line_editor
<combo_box
follows="left|top"
height="23"
layout="topleft"
left="100"
max_length_bytes="255"
max_chars="255"
name="music_url"
top_delta="0"
right="-15"
right="-54"
allow_text_entry="true"
allow_new_values="true"
select_on_focus="true" />
<button
follows="left|top"
height="23"
label="+"
layout="topleft"
left_pad="0"
top_delta="0"
name="stream_add_btn"
width="23" />
<button
follows="left|top"
height="23"
label="-"
layout="topleft"
left_pad="4"
top_delta="0"
name="stream_delete_btn"
width="23" />
<text
type="string"
length="1"