rename llpanelmediahud to llpanelprimmediacontrols
parent
ba5377025b
commit
67879996ca
|
|
@ -63,13 +63,13 @@ include_directories(
|
|||
)
|
||||
|
||||
set(viewer_SOURCE_FILES
|
||||
llaccordionctrltab.cpp
|
||||
llaccordionctrl.cpp
|
||||
llaccordionctrltab.cpp
|
||||
llagent.cpp
|
||||
llagentlistener.cpp
|
||||
llagentaccess.cpp
|
||||
llagentdata.cpp
|
||||
llagentlanguage.cpp
|
||||
llagentlistener.cpp
|
||||
llagentpicksinfo.cpp
|
||||
llagentpilot.cpp
|
||||
llagentui.cpp
|
||||
|
|
@ -78,8 +78,8 @@ set(viewer_SOURCE_FILES
|
|||
llappearancemgr.cpp
|
||||
llappviewer.cpp
|
||||
llappviewerlistener.cpp
|
||||
llassetuploadresponders.cpp
|
||||
llassetuploadqueue.cpp
|
||||
llassetuploadresponders.cpp
|
||||
llaudiosourcevo.cpp
|
||||
llavataractions.cpp
|
||||
llavatariconctrl.cpp
|
||||
|
|
@ -95,8 +95,8 @@ set(viewer_SOURCE_FILES
|
|||
llcaphttpsender.cpp
|
||||
llchannelmanager.cpp
|
||||
llchatbar.cpp
|
||||
llchatitemscontainerctrl.cpp
|
||||
llchathistory.cpp
|
||||
llchatitemscontainerctrl.cpp
|
||||
llchatmsgbox.cpp
|
||||
llchiclet.cpp
|
||||
llclassifiedinfo.cpp
|
||||
|
|
@ -116,10 +116,10 @@ set(viewer_SOURCE_FILES
|
|||
lldirpicker.cpp
|
||||
lldndbutton.cpp
|
||||
lldrawable.cpp
|
||||
lldrawpool.cpp
|
||||
lldrawpoolalpha.cpp
|
||||
lldrawpoolavatar.cpp
|
||||
lldrawpoolbump.cpp
|
||||
lldrawpool.cpp
|
||||
lldrawpoolground.cpp
|
||||
lldrawpoolsimple.cpp
|
||||
lldrawpoolsky.cpp
|
||||
|
|
@ -151,8 +151,8 @@ set(viewer_SOURCE_FILES
|
|||
llfloaterbuildoptions.cpp
|
||||
llfloaterbulkpermission.cpp
|
||||
llfloaterbump.cpp
|
||||
llfloaterbuycontents.cpp
|
||||
llfloaterbuy.cpp
|
||||
llfloaterbuycontents.cpp
|
||||
llfloaterbuycurrency.cpp
|
||||
llfloaterbuyland.cpp
|
||||
llfloatercall.cpp
|
||||
|
|
@ -163,8 +163,8 @@ set(viewer_SOURCE_FILES
|
|||
llfloatercustomize.cpp
|
||||
llfloaterdaycycle.cpp
|
||||
llfloaterenvsettings.cpp
|
||||
llfloaterfriends.cpp
|
||||
llfloaterfonttest.cpp
|
||||
llfloaterfriends.cpp
|
||||
llfloatergesture.cpp
|
||||
llfloatergodtools.cpp
|
||||
llfloatergroupinvite.cpp
|
||||
|
|
@ -172,8 +172,6 @@ set(viewer_SOURCE_FILES
|
|||
llfloaterhandler.cpp
|
||||
llfloaterhardwaresettings.cpp
|
||||
llfloaterhelpbrowser.cpp
|
||||
llfloatermediabrowser.cpp
|
||||
llfloatermediasettings.cpp
|
||||
llfloaterhud.cpp
|
||||
llfloaterimagepreview.cpp
|
||||
llfloaterinspect.cpp
|
||||
|
|
@ -183,6 +181,8 @@ set(viewer_SOURCE_FILES
|
|||
llfloaterland.cpp
|
||||
llfloaterlandholdings.cpp
|
||||
llfloatermap.cpp
|
||||
llfloatermediabrowser.cpp
|
||||
llfloatermediasettings.cpp
|
||||
llfloatermemleak.cpp
|
||||
llfloaternamedesc.cpp
|
||||
llfloaternotificationsconsole.cpp
|
||||
|
|
@ -227,8 +227,8 @@ set(viewer_SOURCE_FILES
|
|||
llgroupmgr.cpp
|
||||
llgroupnotify.cpp
|
||||
llhomelocationresponder.cpp
|
||||
llhudeffectbeam.cpp
|
||||
llhudeffect.cpp
|
||||
llhudeffectbeam.cpp
|
||||
llhudeffectlookat.cpp
|
||||
llhudeffectpointat.cpp
|
||||
llhudeffecttrail.cpp
|
||||
|
|
@ -238,11 +238,11 @@ set(viewer_SOURCE_FILES
|
|||
llhudrender.cpp
|
||||
llhudtext.cpp
|
||||
llhudview.cpp
|
||||
llimcontrolpanel.cpp
|
||||
llimfloater.cpp
|
||||
llimhandler.cpp
|
||||
llimpanel.cpp
|
||||
llimview.cpp
|
||||
llimcontrolpanel.cpp
|
||||
llinspect.cpp
|
||||
llinspectavatar.cpp
|
||||
llinspectgroup.cpp
|
||||
|
|
@ -260,7 +260,6 @@ set(viewer_SOURCE_FILES
|
|||
lllocaltextureobject.cpp
|
||||
lllocationhistory.cpp
|
||||
lllocationinputctrl.cpp
|
||||
llurllineeditorctrl.cpp
|
||||
lllogchat.cpp
|
||||
llloginhandler.cpp
|
||||
lllogininstance.cpp
|
||||
|
|
@ -312,8 +311,8 @@ set(viewer_SOURCE_FILES
|
|||
llpanelgrouplandmoney.cpp
|
||||
llpanelgroupnotices.cpp
|
||||
llpanelgrouproles.cpp
|
||||
llpanelinventory.cpp
|
||||
llpanelimcontrolpanel.cpp
|
||||
llpanelinventory.cpp
|
||||
llpanelland.cpp
|
||||
llpanellandaudio.cpp
|
||||
llpanellandmarks.cpp
|
||||
|
|
@ -322,11 +321,10 @@ set(viewer_SOURCE_FILES
|
|||
llpanellookinfo.cpp
|
||||
llpanellooks.cpp
|
||||
llpanelmedia.cpp
|
||||
llpanelmediahud.cpp
|
||||
llpanelmeprofile.cpp
|
||||
llpanelmediasettingsgeneral.cpp
|
||||
llpanelmediasettingssecurity.cpp
|
||||
llpanelmediasettingspermissions.cpp
|
||||
llpanelmediasettingssecurity.cpp
|
||||
llpanelmeprofile.cpp
|
||||
llpanelobject.cpp
|
||||
llpanelpeople.cpp
|
||||
llpanelpeoplemenus.cpp
|
||||
|
|
@ -335,11 +333,12 @@ set(viewer_SOURCE_FILES
|
|||
llpanelpicks.cpp
|
||||
llpanelplace.cpp
|
||||
llpanelplaceinfo.cpp
|
||||
llpanelshower.cpp
|
||||
llpanelplaces.cpp
|
||||
llpanelplacestab.cpp
|
||||
llpanelprimmediacontrols.cpp
|
||||
llpanelprofile.cpp
|
||||
llpanelprofileview.cpp
|
||||
llpanelshower.cpp
|
||||
llpanelteleporthistory.cpp
|
||||
llpanelvolume.cpp
|
||||
llparcelselection.cpp
|
||||
|
|
@ -348,8 +347,8 @@ set(viewer_SOURCE_FILES
|
|||
llplacesinventorybridge.cpp
|
||||
llpolymesh.cpp
|
||||
llpolymorph.cpp
|
||||
llpreviewanim.cpp
|
||||
llpreview.cpp
|
||||
llpreviewanim.cpp
|
||||
llpreviewgesture.cpp
|
||||
llpreviewnotecard.cpp
|
||||
llpreviewscript.cpp
|
||||
|
|
@ -398,10 +397,10 @@ set(viewer_SOURCE_FILES
|
|||
lltoastimpanel.cpp
|
||||
lltoastnotifypanel.cpp
|
||||
lltoastpanel.cpp
|
||||
lltool.cpp
|
||||
lltoolbar.cpp
|
||||
lltoolbrush.cpp
|
||||
lltoolcomp.cpp
|
||||
lltool.cpp
|
||||
lltooldraganddrop.cpp
|
||||
lltoolface.cpp
|
||||
lltoolfocus.cpp
|
||||
|
|
@ -425,6 +424,7 @@ set(viewer_SOURCE_FILES
|
|||
llurl.cpp
|
||||
llurldispatcher.cpp
|
||||
llurlhistory.cpp
|
||||
llurllineeditorctrl.cpp
|
||||
llurlsimstring.cpp
|
||||
llurlwhitelist.cpp
|
||||
llvectorperfoptions.cpp
|
||||
|
|
@ -441,18 +441,18 @@ set(viewer_SOURCE_FILES
|
|||
llviewerhelp.cpp
|
||||
llviewerhelputil.cpp
|
||||
llviewerinventory.cpp
|
||||
llviewerjointattachment.cpp
|
||||
llviewerjoint.cpp
|
||||
llviewerjointattachment.cpp
|
||||
llviewerjointmesh.cpp
|
||||
llviewerjointmesh_sse2.cpp
|
||||
llviewerjointmesh_sse.cpp
|
||||
llviewerjointmesh_sse2.cpp
|
||||
llviewerjointmesh_vec.cpp
|
||||
llviewerjoystick.cpp
|
||||
llviewerkeyboard.cpp
|
||||
llviewerlayer.cpp
|
||||
llviewermedia.cpp
|
||||
llviewermediafocus.cpp
|
||||
llviewermedia_streamingaudio.cpp
|
||||
llviewermediafocus.cpp
|
||||
llviewermenu.cpp
|
||||
llviewermenufile.cpp
|
||||
llviewermessage.cpp
|
||||
|
|
@ -487,9 +487,9 @@ set(viewer_SOURCE_FILES
|
|||
llvoground.cpp
|
||||
llvoicechannel.cpp
|
||||
llvoiceclient.cpp
|
||||
llvoicecontrolpanel.cpp
|
||||
llvoiceremotectrl.cpp
|
||||
llvoicevisualizer.cpp
|
||||
llvoicecontrolpanel.cpp
|
||||
llvoinventorylistener.cpp
|
||||
llvopartgroup.cpp
|
||||
llvosky.cpp
|
||||
|
|
@ -540,25 +540,25 @@ endif (LINUX)
|
|||
set(viewer_HEADER_FILES
|
||||
CMakeLists.txt
|
||||
ViewerInstall.cmake
|
||||
llaccordionctrltab.h
|
||||
llaccordionctrl.h
|
||||
llaccordionctrltab.h
|
||||
llagent.h
|
||||
llagentlistener.h
|
||||
llagentaccess.h
|
||||
llagentdata.h
|
||||
llagentlanguage.h
|
||||
llagentlistener.h
|
||||
llagentpicksinfo.h
|
||||
llagentpilot.h
|
||||
llagentui.h
|
||||
llagentwearables.h
|
||||
llanimstatelabels.h
|
||||
llappearance.h
|
||||
llappearancemgr.h
|
||||
llappviewer.h
|
||||
llappviewerlistener.h
|
||||
llassetuploadresponders.h
|
||||
llassetuploadqueue.h
|
||||
llassetuploadresponders.h
|
||||
llaudiosourcevo.h
|
||||
llappearancemgr.h
|
||||
llavataractions.h
|
||||
llavatariconctrl.h
|
||||
llavatarlist.h
|
||||
|
|
@ -574,8 +574,8 @@ set(viewer_HEADER_FILES
|
|||
llcaphttpsender.h
|
||||
llchannelmanager.h
|
||||
llchatbar.h
|
||||
llchatitemscontainerctrl.h
|
||||
llchathistory.h
|
||||
llchatitemscontainerctrl.h
|
||||
llchatmsgbox.h
|
||||
llchiclet.h
|
||||
llclassifiedinfo.h
|
||||
|
|
@ -652,8 +652,6 @@ set(viewer_HEADER_FILES
|
|||
llfloaterhandler.h
|
||||
llfloaterhardwaresettings.h
|
||||
llfloaterhelpbrowser.h
|
||||
llfloatermediabrowser.h
|
||||
llfloatermediasettings.h
|
||||
llfloaterhud.h
|
||||
llfloaterimagepreview.h
|
||||
llfloaterinspect.h
|
||||
|
|
@ -663,16 +661,18 @@ set(viewer_HEADER_FILES
|
|||
llfloaterland.h
|
||||
llfloaterlandholdings.h
|
||||
llfloatermap.h
|
||||
llfloatermediabrowser.h
|
||||
llfloatermediasettings.h
|
||||
llfloatermemleak.h
|
||||
llfloaternamedesc.h
|
||||
llfloaternotificationsconsole.h
|
||||
llfloateropenobject.h
|
||||
llfloaterparcel.h
|
||||
llfloaterpay.h
|
||||
llfloaterperms.h
|
||||
llfloaterpostcard.h
|
||||
llfloaterpostprocess.h
|
||||
llfloaterpreference.h
|
||||
llfloaterperms.h
|
||||
llfloaterproperties.h
|
||||
llfloaterregioninfo.h
|
||||
llfloaterreporter.h
|
||||
|
|
@ -718,12 +718,12 @@ set(viewer_HEADER_FILES
|
|||
llhudrender.h
|
||||
llhudtext.h
|
||||
llhudview.h
|
||||
llimcontrolpanel.h
|
||||
llimfloater.h
|
||||
llimpanel.h
|
||||
llimview.h
|
||||
llimcontrolpanel.h
|
||||
llinspectavatar.h
|
||||
llinspect.h
|
||||
llinspectavatar.h
|
||||
llinspectgroup.h
|
||||
llinspectobject.h
|
||||
llinventorybridge.h
|
||||
|
|
@ -740,7 +740,6 @@ set(viewer_HEADER_FILES
|
|||
lllocaltextureobject.h
|
||||
lllocationhistory.h
|
||||
lllocationinputctrl.h
|
||||
llurllineeditorctrl.h
|
||||
lllogchat.h
|
||||
llloginhandler.h
|
||||
lllogininstance.h
|
||||
|
|
@ -749,6 +748,7 @@ set(viewer_HEADER_FILES
|
|||
llmanipscale.h
|
||||
llmaniptranslate.h
|
||||
llmapresponders.h
|
||||
llmediactrl.h
|
||||
llmediadataclient.h
|
||||
llmediaremotectrl.h
|
||||
llmemoryview.h
|
||||
|
|
@ -788,8 +788,8 @@ set(viewer_HEADER_FILES
|
|||
llpanelgrouplandmoney.h
|
||||
llpanelgroupnotices.h
|
||||
llpanelgrouproles.h
|
||||
llpanelinventory.h
|
||||
llpanelimcontrolpanel.h
|
||||
llpanelinventory.h
|
||||
llpanelland.h
|
||||
llpanellandaudio.h
|
||||
llpanellandmarks.h
|
||||
|
|
@ -798,11 +798,10 @@ set(viewer_HEADER_FILES
|
|||
llpanellookinfo.h
|
||||
llpanellooks.h
|
||||
llpanelmedia.h
|
||||
llpanelmediahud.h
|
||||
llpanelmeprofile.h
|
||||
llpanelmediasettingsgeneral.h
|
||||
llpanelmediasettingssecurity.h
|
||||
llpanelmediasettingspermissions.h
|
||||
llpanelmediasettingssecurity.h
|
||||
llpanelmeprofile.h
|
||||
llpanelobject.h
|
||||
llpanelpeople.h
|
||||
llpanelpeoplemenus.h
|
||||
|
|
@ -811,11 +810,12 @@ set(viewer_HEADER_FILES
|
|||
llpanelpicks.h
|
||||
llpanelplace.h
|
||||
llpanelplaceinfo.h
|
||||
llpanelshower.h
|
||||
llpanelplaces.h
|
||||
llpanelplacestab.h
|
||||
llpanelprimmediacontrols.h
|
||||
llpanelprofile.h
|
||||
llpanelprofileview.h
|
||||
llpanelshower.h
|
||||
llpanelteleporthistory.h
|
||||
llpanelvolume.h
|
||||
llparcelselection.h
|
||||
|
|
@ -838,9 +838,9 @@ set(viewer_HEADER_FILES
|
|||
llremoteparcelrequest.h
|
||||
llresourcedata.h
|
||||
llrootview.h
|
||||
llsavedsettingsglue.h
|
||||
llscreenchannel.h
|
||||
llscrollingpanelparam.h
|
||||
llsavedsettingsglue.h
|
||||
llsearchcombobox.h
|
||||
llsearchhistory.h
|
||||
llselectmgr.h
|
||||
|
|
@ -905,6 +905,7 @@ set(viewer_HEADER_FILES
|
|||
llurl.h
|
||||
llurldispatcher.h
|
||||
llurlhistory.h
|
||||
llurllineeditorctrl.h
|
||||
llurlsimstring.h
|
||||
llurlwhitelist.h
|
||||
llvectorperfoptions.h
|
||||
|
|
@ -928,8 +929,8 @@ set(viewer_HEADER_FILES
|
|||
llviewerkeyboard.h
|
||||
llviewerlayer.h
|
||||
llviewermedia.h
|
||||
llviewermediaobserver.h
|
||||
llviewermediafocus.h
|
||||
llviewermediaobserver.h
|
||||
llviewermenu.h
|
||||
llviewermenufile.h
|
||||
llviewermessage.h
|
||||
|
|
@ -965,9 +966,9 @@ set(viewer_HEADER_FILES
|
|||
llvoground.h
|
||||
llvoicechannel.h
|
||||
llvoiceclient.h
|
||||
llvoicecontrolpanel.h
|
||||
llvoiceremotectrl.h
|
||||
llvoicevisualizer.h
|
||||
llvoicecontrolpanel.h
|
||||
llvoinventorylistener.h
|
||||
llvopartgroup.h
|
||||
llvosky.h
|
||||
|
|
@ -985,7 +986,6 @@ set(viewer_HEADER_FILES
|
|||
llwearabledictionary.h
|
||||
llwearablelist.h
|
||||
llweb.h
|
||||
llmediactrl.h
|
||||
llwind.h
|
||||
llwindebug.h
|
||||
llwlanimator.h
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,148 @@
|
|||
/**
|
||||
* @file llpanelmediahud.h
|
||||
* @brief Pop-up media controls panel
|
||||
*
|
||||
* $LicenseInfo:firstyear=2003&license=viewergpl$
|
||||
*
|
||||
* Copyright (c) 2003-2007, Linden Research, Inc.
|
||||
*
|
||||
* Second Life Viewer Source Code
|
||||
* The source code in this file ("Source Code") is provided by Linden Lab
|
||||
* to you under the terms of the GNU General Public License, version 2.0
|
||||
* ("GPL"), unless you have obtained a separate licensing agreement
|
||||
* ("Other License"), formally executed by you and Linden Lab. Terms of
|
||||
* the GPL can be found in doc/GPL-license.txt in this distribution, or
|
||||
* online at http://secondlife.com/developers/opensource/gplv2
|
||||
*
|
||||
* There are special exceptions to the terms and conditions of the GPL as
|
||||
* it is applied to this Source Code. View the full text of the exception
|
||||
* in the file doc/FLOSS-exception.txt in this software distribution, or
|
||||
* online at http://secondlife.com/developers/opensource/flossexception
|
||||
*
|
||||
* By copying, modifying or distributing this software, you acknowledge
|
||||
* that you have read and understood your obligations described above,
|
||||
* and agree to abide by those obligations.
|
||||
*
|
||||
* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
|
||||
* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
|
||||
* COMPLETENESS OR PERFORMANCE.
|
||||
* $/LicenseInfo$
|
||||
*/
|
||||
|
||||
#ifndef LL_PANELMEDIAHUD_H
|
||||
#define LL_PANELMEDIAHUD_H
|
||||
|
||||
#include "llpanel.h"
|
||||
#include "llviewermedia.h"
|
||||
|
||||
class LLCoordWindow;
|
||||
class LLViewerMediaImpl;
|
||||
|
||||
class LLPanelMediaControls : public LLPanel
|
||||
{
|
||||
public:
|
||||
LLPanelMediaControls();
|
||||
virtual ~LLPanelMediaControls();
|
||||
/*virtual*/ BOOL postBuild();
|
||||
virtual void draw();
|
||||
virtual BOOL handleScrollWheel(S32 x, S32 y, S32 clicks);
|
||||
|
||||
virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
|
||||
virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask);
|
||||
virtual BOOL handleKeyHere(KEY key, MASK mask);
|
||||
|
||||
void updateShape();
|
||||
bool isMouseOver();
|
||||
void nextZoomLevel();
|
||||
void resetZoomLevel();
|
||||
void close();
|
||||
|
||||
LLHandle<LLPanelMediaControls> getHandle() const { return mPanelHandle; }
|
||||
void setMediaFace(LLPointer<LLViewerObject> objectp, S32 face, viewer_media_t media_impl, LLVector3 pick_normal = LLVector3::zero);
|
||||
|
||||
|
||||
enum EZoomLevel
|
||||
{
|
||||
ZOOM_NONE = 0,
|
||||
ZOOM_FAR,
|
||||
ZOOM_MEDIUM,
|
||||
ZOOM_NEAR
|
||||
};
|
||||
static const EZoomLevel kZoomLevels[];
|
||||
static const int kNumZoomLevels;
|
||||
|
||||
enum EScrollDir
|
||||
{
|
||||
SCROLL_UP = 0,
|
||||
SCROLL_DOWN,
|
||||
SCROLL_LEFT,
|
||||
SCROLL_RIGHT,
|
||||
SCROLL_NONE
|
||||
};
|
||||
|
||||
private:
|
||||
void onClickClose();
|
||||
void onClickBack();
|
||||
void onClickForward();
|
||||
void onClickHome();
|
||||
void onClickOpen();
|
||||
void onClickReload();
|
||||
void onClickPlay();
|
||||
void onClickPause();
|
||||
void onClickStop();
|
||||
void onClickZoom();
|
||||
void onCommitURL();
|
||||
|
||||
void updateZoom();
|
||||
void setCurrentURL();
|
||||
void onCommitSlider();
|
||||
|
||||
void onCommitVolumeUp();
|
||||
void onCommitVolumeDown();
|
||||
void onToggleMute();
|
||||
|
||||
static void onScrollUp(void* user_data);
|
||||
static void onScrollUpHeld(void* user_data);
|
||||
static void onScrollLeft(void* user_data);
|
||||
static void onScrollLeftHeld(void* user_data);
|
||||
static void onScrollRight(void* user_data);
|
||||
static void onScrollRightHeld(void* user_data);
|
||||
static void onScrollDown(void* user_data);
|
||||
static void onScrollDownHeld(void* user_data);
|
||||
static void onScrollStop(void* user_data);
|
||||
|
||||
static void onInputURL(LLFocusableElement* caller, void *userdata);
|
||||
static bool hasControlsPermission(LLViewerObject *obj, const LLMediaEntry *media_entry);
|
||||
|
||||
void focusOnTarget();
|
||||
|
||||
LLViewerMediaImpl* getTargetMediaImpl();
|
||||
LLViewerObject* getTargetObject();
|
||||
LLPluginClassMedia* getTargetMediaPlugin();
|
||||
bool mPauseFadeout;
|
||||
bool mUpdateSlider;
|
||||
bool mClearFaceOnFade;
|
||||
|
||||
LLMatrix4 mLastCameraMat;
|
||||
EZoomLevel mCurrentZoom;
|
||||
EScrollDir mScrollState;
|
||||
LLCoordWindow mLastCursorPos;
|
||||
LLFrameTimer mInactivityTimer;
|
||||
LLFrameTimer mFadeTimer;
|
||||
F32 mInactiveTimeout;
|
||||
F32 mControlFadeTime;
|
||||
LLRootHandle<LLPanelMediaControls> mPanelHandle;
|
||||
F32 mAlpha;
|
||||
std::string mCurrentURL;
|
||||
std::string mPreviousURL;
|
||||
F64 mCurrentRate;
|
||||
F64 mMovieDuration;
|
||||
int mUpdatePercent;
|
||||
|
||||
LLUUID mTargetObjectID;
|
||||
S32 mTargetObjectFace;
|
||||
LLUUID mTargetImplID;
|
||||
LLVector3 mTargetObjectNormal;
|
||||
};
|
||||
|
||||
#endif // LL_PANELMEDIAHUD_H
|
||||
|
|
@ -35,7 +35,7 @@
|
|||
|
||||
//LLViewerMediaFocus
|
||||
#include "llviewerobjectlist.h"
|
||||
#include "llpanelmediahud.h"
|
||||
#include "llpanelprimmediacontrols.h"
|
||||
#include "llpluginclassmedia.h"
|
||||
#include "llagent.h"
|
||||
#include "lltoolpie.h"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,594 @@
|
|||
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
|
||||
<panel
|
||||
follows="left|right|top|bottom"
|
||||
name="MediaControls"
|
||||
bg_alpha_color="1 1 1 0"
|
||||
height="160"
|
||||
layout="topleft"
|
||||
mouse_opaque="false"
|
||||
width="800">
|
||||
<panel
|
||||
name="media_region"
|
||||
bottom="125"
|
||||
follows="left|right|top|bottom"
|
||||
layout="topleft"
|
||||
left="20"
|
||||
mouse_opaque="false"
|
||||
right="-20"
|
||||
top="20" />
|
||||
<layout_stack
|
||||
follows="left|right|bottom"
|
||||
height="32"
|
||||
layout="topleft"
|
||||
animate="false"
|
||||
left="0"
|
||||
orientation="horizontal"
|
||||
top="96">
|
||||
<!-- outer layout_panels center the inner one -->
|
||||
<layout_panel
|
||||
width="0"
|
||||
layout="topleft"
|
||||
user_resize="false" />
|
||||
<panel
|
||||
name="media_progress_indicator"
|
||||
height="22"
|
||||
layout="topleft"
|
||||
left="0"
|
||||
top="0"
|
||||
auto_resize="false"
|
||||
user_resize="false"
|
||||
min_width="100"
|
||||
width="200">
|
||||
<progress_bar
|
||||
name="media_progress_bar"
|
||||
color_bar="1 1 1 0.96"
|
||||
follows="left|right|top"
|
||||
height="16"
|
||||
layout="topleft"
|
||||
left="0"
|
||||
tool_tip="Media is Loading"/>
|
||||
</panel>
|
||||
<layout_panel
|
||||
width="0"
|
||||
layout="topleft"
|
||||
user_resize="false" />
|
||||
</layout_stack>
|
||||
<layout_stack
|
||||
name="media_controls"
|
||||
follows="left|right"
|
||||
animate="false"
|
||||
height="32"
|
||||
layout="topleft"
|
||||
left="0"
|
||||
orientation="horizontal"
|
||||
top="128">
|
||||
<!-- outer layout_panels center the inner one -->
|
||||
<layout_panel
|
||||
width="0"
|
||||
layout="topleft"
|
||||
user_resize="false" />
|
||||
<layout_panel
|
||||
name="back"
|
||||
auto_resize="false"
|
||||
user_resize="false"
|
||||
layout="topleft"
|
||||
min_width="22"
|
||||
width="22"
|
||||
top="4">
|
||||
<button
|
||||
auto_resize="false"
|
||||
height="22"
|
||||
image_selected="media_btn_back.png"
|
||||
image_unselected="media_btn_back.png"
|
||||
layout="topleft"
|
||||
tool_tip="Step back"
|
||||
picture_style="true"
|
||||
width="22"
|
||||
top_delta="4">
|
||||
<button.commit_callback
|
||||
function="MediaCtrl.Back" />
|
||||
</button>
|
||||
</layout_panel>
|
||||
<layout_panel
|
||||
name="fwd"
|
||||
auto_resize="false"
|
||||
user_resize="false"
|
||||
layout="topleft"
|
||||
top="10"
|
||||
min_width="17"
|
||||
width="17">
|
||||
<button
|
||||
height="22"
|
||||
image_selected="media_btn_forward.png"
|
||||
image_unselected="media_btn_forward.png"
|
||||
layout="topleft"
|
||||
tool_tip="Step forward"
|
||||
picture_style="true"
|
||||
top_delta="0"
|
||||
min_width="17"
|
||||
width="17">
|
||||
<button.commit_callback
|
||||
function="MediaCtrl.Forward" />
|
||||
</button>
|
||||
</layout_panel>
|
||||
<!--
|
||||
<panel
|
||||
height="22"
|
||||
layout="topleft"
|
||||
auto_resize="false"
|
||||
min_width="3"
|
||||
width="3">
|
||||
<icon
|
||||
height="22"
|
||||
image_name="media_panel_divider.png"
|
||||
layout="topleft"
|
||||
top="0"
|
||||
min_width="3"
|
||||
width="3" />
|
||||
</panel>
|
||||
-->
|
||||
<layout_panel
|
||||
name="home"
|
||||
auto_resize="false"
|
||||
user_resize="false"
|
||||
layout="topleft"
|
||||
top="-2"
|
||||
min_width="22"
|
||||
width="22">
|
||||
<button
|
||||
height="22"
|
||||
image_selected="media_btn_home.png"
|
||||
image_unselected="media_btn_home.png"
|
||||
layout="topleft"
|
||||
tool_tip="Home page"
|
||||
picture_style="true"
|
||||
min_width="22"
|
||||
width="22">
|
||||
<button.commit_callback
|
||||
function="MediaCtrl.Home" />
|
||||
</button>
|
||||
</layout_panel>
|
||||
<layout_panel
|
||||
name="media_stop"
|
||||
auto_resize="false"
|
||||
user_resize="false"
|
||||
layout="topleft"
|
||||
top="2"
|
||||
min_width="22"
|
||||
width="22">
|
||||
<button
|
||||
height="22"
|
||||
image_selected="button_anim_stop.tga"
|
||||
image_unselected="button_anim_stop.tga"
|
||||
layout="topleft"
|
||||
tool_tip="Stop media"
|
||||
picture_style="true"
|
||||
min_width="22"
|
||||
width="22">
|
||||
<button.commit_callback
|
||||
function="MediaCtrl.Stop" />
|
||||
</button>
|
||||
</layout_panel>
|
||||
<!--
|
||||
<panel
|
||||
height="22"
|
||||
layout="topleft"
|
||||
auto_resize="false"
|
||||
min_width="3"
|
||||
width="3">
|
||||
<icon
|
||||
height="22"
|
||||
image_name="media_panel_divider.png"
|
||||
layout="topleft"
|
||||
top="0"
|
||||
min_width="3"
|
||||
width="3" />
|
||||
</panel>
|
||||
-->
|
||||
<layout_panel
|
||||
name="reload"
|
||||
auto_resize="false"
|
||||
user_resize="false"
|
||||
layout="topleft"
|
||||
top="6"
|
||||
min_width="22"
|
||||
width="22">
|
||||
<button
|
||||
height="22"
|
||||
image_selected="media_btn_reload.png"
|
||||
image_unselected="media_btn_reload.png"
|
||||
layout="topleft"
|
||||
tool_tip="Reload"
|
||||
picture_style="true"
|
||||
min_width="22"
|
||||
width="22">
|
||||
<button.commit_callback
|
||||
function="MediaCtrl.Reload" />
|
||||
</button>
|
||||
</layout_panel>
|
||||
<layout_panel
|
||||
name="stop"
|
||||
auto_resize="false"
|
||||
user_resize="false"
|
||||
layout="topleft"
|
||||
top="10"
|
||||
min_width="22"
|
||||
width="22">
|
||||
<button
|
||||
height="22"
|
||||
image_selected="media_btn_stoploading.png"
|
||||
image_unselected="media_btn_stoploading.png"
|
||||
layout="topleft"
|
||||
picture_style="true"
|
||||
tool_tip = "Stop loading"
|
||||
min_width="22"
|
||||
width="22">
|
||||
<button.commit_callback
|
||||
function="MediaCtrl.Stop" />
|
||||
</button>
|
||||
</layout_panel>
|
||||
<layout_panel
|
||||
name="play"
|
||||
auto_resize="false"
|
||||
user_resize="false"
|
||||
layout="topleft"
|
||||
top="14"
|
||||
min_width="22"
|
||||
width="22">
|
||||
<button
|
||||
height="22"
|
||||
image_selected="button_anim_play.tga"
|
||||
image_unselected="button_anim_play.tga"
|
||||
layout="topleft"
|
||||
tool_tip = "Play media"
|
||||
picture_style="true"
|
||||
min_width="22"
|
||||
width="22">
|
||||
<button.commit_callback
|
||||
function="MediaCtrl.Play" />
|
||||
</button>
|
||||
</layout_panel>
|
||||
<layout_panel
|
||||
name="pause"
|
||||
auto_resize="false"
|
||||
user_resize="false"
|
||||
layout="topleft"
|
||||
top="18"
|
||||
min_width="22"
|
||||
width="22">
|
||||
<button
|
||||
height="22"
|
||||
image_selected="button_anim_pause.tga"
|
||||
image_unselected="button_anim_pause.tga"
|
||||
layout="topleft"
|
||||
tool_tip = "Pause media"
|
||||
picture_style="true">
|
||||
<button.commit_callback
|
||||
function="MediaCtrl.Pause" />
|
||||
</button>
|
||||
</layout_panel>
|
||||
<!-- media URL entry -->
|
||||
<layout_panel
|
||||
name="media_address"
|
||||
auto_resize="true"
|
||||
user_resize="false"
|
||||
height="22"
|
||||
follows="left|right|bottom"
|
||||
layout="topleft"
|
||||
width="190"
|
||||
min_width="90">
|
||||
<!--
|
||||
RE-ENABLE THIS WHEN WE HAVE A HISTORY DROP-DOWN AGAIN
|
||||
|
||||
<combo_box
|
||||
name="media_address_url"
|
||||
allow_text_entry="true"
|
||||
height="22"
|
||||
layout="topleft"
|
||||
max_chars="1024"
|
||||
tool_tip = "Media URL"
|
||||
<combo_box.commit_callback
|
||||
function="MediaCtrl.CommitURL" />
|
||||
</combo_box>
|
||||
-->
|
||||
<line_editor
|
||||
name="media_address_url"
|
||||
follows="left|right"
|
||||
height="22"
|
||||
top="0"
|
||||
tool_tip="Media URL"
|
||||
text_pad_right="16">
|
||||
<line_editor.commit_callback
|
||||
function="MediaCtrl.CommitURL"/>
|
||||
</line_editor>
|
||||
<layout_stack
|
||||
animate="false"
|
||||
follows="right"
|
||||
width="32"
|
||||
min_width="32"
|
||||
height="16"
|
||||
top="3"
|
||||
orientation="horizontal"
|
||||
left_pad="-38">
|
||||
<icon
|
||||
name="media_whitelist_flag"
|
||||
follows="top|right"
|
||||
height="16"
|
||||
image_name="smicon_warn.tga"
|
||||
layout="topleft"
|
||||
tool_tip="White List enabled"
|
||||
min_width="16"
|
||||
width="16" />
|
||||
<icon
|
||||
name="media_secure_lock_flag"
|
||||
height="16"
|
||||
image_name="inv_item_eyes.tga"
|
||||
layout="topleft"
|
||||
tool_tip="Secured Browsing"
|
||||
min_width="16"
|
||||
width="16" />
|
||||
</layout_stack>
|
||||
</layout_panel>
|
||||
<layout_panel
|
||||
name="media_play_position"
|
||||
auto_resize="true"
|
||||
user_resize="false"
|
||||
follows="left|right|top|bottom"
|
||||
layout="topleft"
|
||||
min_width="100"
|
||||
width="200">
|
||||
<slider_bar
|
||||
name="media_play_slider"
|
||||
follows="left|right|top"
|
||||
height="22"
|
||||
increment="0.05"
|
||||
initial_value="0.5"
|
||||
layout="topleft"
|
||||
tool_tip="Movie play progress"
|
||||
min_width="100"
|
||||
width="200">
|
||||
<slider_bar.commit_callback
|
||||
function="MediaCtrl.JumpProgress" />
|
||||
</slider_bar>
|
||||
</layout_panel>
|
||||
<layout_panel
|
||||
name="media_volume"
|
||||
auto_resize="false"
|
||||
user_resize="false"
|
||||
layout="topleft"
|
||||
height="24"
|
||||
min_width="24"
|
||||
width="24">
|
||||
<button
|
||||
name="media_volume_button"
|
||||
height="22"
|
||||
image_selected="icn_speaker-muted_dark.tga"
|
||||
image_unselected="icn_speaker_dark.tga"
|
||||
is_toggle="true"
|
||||
layout="topleft"
|
||||
scale_image="false"
|
||||
picture_style="true"
|
||||
tool_tip="Mute This Media"
|
||||
top_delta="22"
|
||||
min_width="24"
|
||||
width="24" >
|
||||
<button.commit_callback
|
||||
function="MediaCtrl.ToggleMute" />
|
||||
</button>
|
||||
</layout_panel>
|
||||
<layout_panel
|
||||
name="volume_up"
|
||||
auto_resize="false"
|
||||
user_resize="false"
|
||||
layout="topleft"
|
||||
min_width="20"
|
||||
height="14"
|
||||
width="20">
|
||||
<button
|
||||
top="-3"
|
||||
height="14"
|
||||
image_selected="media_btn_scrollup.png"
|
||||
image_unselected="media_btn_scrollup.png"
|
||||
layout="topleft"
|
||||
tool_tip="Volume up"
|
||||
picture_style="true"
|
||||
scale_image="true"
|
||||
min_width="20"
|
||||
width="20" >
|
||||
<button.commit_callback
|
||||
function="MediaCtrl.CommitVolumeUp" />
|
||||
</button>
|
||||
</layout_panel>
|
||||
<layout_panel
|
||||
name="volume_down"
|
||||
auto_resize="false"
|
||||
user_resize="false"
|
||||
layout="topleft"
|
||||
min_width="20"
|
||||
height="14"
|
||||
width="20">
|
||||
<button
|
||||
top="-5"
|
||||
height="14"
|
||||
image_selected="media_btn_scrolldown.png"
|
||||
image_unselected="media_btn_scrolldown.png"
|
||||
layout="topleft"
|
||||
tool_tip="Volume down"
|
||||
picture_style="true"
|
||||
scale_image="true"
|
||||
min_width="20"
|
||||
width="20">
|
||||
<button.commit_callback
|
||||
function="MediaCtrl.CommitVolumeDown" />
|
||||
</button>
|
||||
</layout_panel>
|
||||
<!-- Scroll pad -->
|
||||
<layout_panel
|
||||
name="media_panel_scroll"
|
||||
auto_resize="false"
|
||||
user_resize="false"
|
||||
height="32"
|
||||
follows="left|right|top|bottom"
|
||||
layout="topleft"
|
||||
min_width="32"
|
||||
width="32">
|
||||
<icon
|
||||
height="32"
|
||||
image_name="media_panel_scrollbg.png"
|
||||
layout="topleft"
|
||||
top="0"
|
||||
min_width="32"
|
||||
width="32" />
|
||||
<button
|
||||
name="scrollup"
|
||||
height="8"
|
||||
image_selected="media_btn_scrollup.png"
|
||||
image_unselected="media_btn_scrollup.png"
|
||||
layout="topleft"
|
||||
tool_tip="Scroll up"
|
||||
picture_style="true"
|
||||
scale_image="false"
|
||||
left="12"
|
||||
top_delta="4"
|
||||
min_width="8"
|
||||
width="8" />
|
||||
<button
|
||||
name="scrollleft"
|
||||
height="8"
|
||||
image_selected="media_btn_scrollleft.png"
|
||||
image_unselected="media_btn_scrollleft.png"
|
||||
layout="topleft"
|
||||
left="3"
|
||||
tool_tip="Scroll left"
|
||||
picture_style="true"
|
||||
scale_image="false"
|
||||
top="12"
|
||||
min_width="8"
|
||||
width="8" />
|
||||
<button
|
||||
name="scrollright"
|
||||
height="8"
|
||||
image_selected="media_btn_scrollright.png"
|
||||
image_unselected="media_btn_scrollright.png"
|
||||
layout="topleft"
|
||||
left_pad="9"
|
||||
tool_tip="Scroll right"
|
||||
picture_style="true"
|
||||
scale_image="false"
|
||||
top_delta="0"
|
||||
min_width="8"
|
||||
width="8" />
|
||||
<button
|
||||
name="scrolldown"
|
||||
height="8"
|
||||
image_selected="media_btn_scrolldown.png"
|
||||
image_unselected="media_btn_scrolldown.png"
|
||||
layout="topleft"
|
||||
left="12"
|
||||
tool_tip="Scroll down"
|
||||
picture_style="true"
|
||||
scale_image="false"
|
||||
top="20"
|
||||
min_width="8"
|
||||
width="8" />
|
||||
</layout_panel>
|
||||
<layout_panel
|
||||
name="zoom_frame"
|
||||
auto_resize="false"
|
||||
user_resize="false"
|
||||
layout="topleft"
|
||||
height="28"
|
||||
min_width="22"
|
||||
width="22">
|
||||
<button
|
||||
height="22"
|
||||
image_selected="media_btn_optimalzoom.png"
|
||||
image_unselected="media_btn_optimalzoom.png"
|
||||
layout="topleft"
|
||||
tool_tip="Zoom"
|
||||
picture_style="true"
|
||||
min_width="22"
|
||||
width="22">
|
||||
<button.commit_callback
|
||||
function="MediaCtrl.Zoom" />
|
||||
</button>
|
||||
</layout_panel>
|
||||
<!--
|
||||
<panel
|
||||
height="22"
|
||||
layout="topleft"
|
||||
auto_resize="false"
|
||||
min_width="3"
|
||||
width="3">
|
||||
<icon
|
||||
height="22"
|
||||
image_name="media_panel_divider.png"
|
||||
layout="topleft"
|
||||
top="0"
|
||||
min_width="3"
|
||||
width="3" />
|
||||
</panel>
|
||||
-->
|
||||
<layout_panel
|
||||
name="new_window"
|
||||
auto_resize="false"
|
||||
user_resize="false"
|
||||
layout="topleft"
|
||||
min_width="22"
|
||||
width="22">
|
||||
<button
|
||||
height="22"
|
||||
image_selected="media_btn_newwindow.png"
|
||||
image_unselected="media_btn_newwindow.png"
|
||||
layout="topleft"
|
||||
tool_tip = "Open URL in browser"
|
||||
picture_style="true"
|
||||
top_delta="-3"
|
||||
min_width="24"
|
||||
width="24" >
|
||||
<button.commit_callback
|
||||
function="MediaCtrl.Open" />
|
||||
</button>
|
||||
</layout_panel>
|
||||
<!--
|
||||
<panel
|
||||
height="22"
|
||||
layout="topleft"
|
||||
auto_resize="false"
|
||||
min_width="3"
|
||||
width="3">
|
||||
<icon
|
||||
height="22"
|
||||
image_name="media_panel_divider.png"
|
||||
layout="topleft"
|
||||
top="0"
|
||||
min_width="3"
|
||||
width="3" />
|
||||
</panel>
|
||||
-->
|
||||
<layout_panel
|
||||
name="close"
|
||||
auto_resize="false"
|
||||
user_resize="false"
|
||||
layout="topleft"
|
||||
min_width="21"
|
||||
width="21" >
|
||||
<button
|
||||
height="22"
|
||||
image_selected="media_btn_done.png"
|
||||
image_unselected="media_btn_done.png"
|
||||
layout="topleft"
|
||||
tool_tip ="Close media control"
|
||||
picture_style="true"
|
||||
top_delta="-4"
|
||||
width="21" >
|
||||
<button.commit_callback
|
||||
function="MediaCtrl.Close" />
|
||||
</button>
|
||||
</layout_panel>
|
||||
<layout_panel
|
||||
width="0"
|
||||
layout="topleft"
|
||||
user_resize="false" />
|
||||
</layout_stack>
|
||||
</panel>
|
||||
Loading…
Reference in New Issue