Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer

Browse Source
This commit is contained in:
Latif Khalifa
2013-09-27 03:22:26 +02:00
parent ad8ea07a7a 2cc1658eda
commit d08c34cc2e
8 changed files with 100 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -753,6 +753,17 @@
<key>Value</key>
<integer>0</integer>
</map>
<key>LiruLocalTime</key>
<map>
<key>Comment</key>
<string>Whether or not to display system time in the top bar instead of server time.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<boolean>0</boolean>
</map>
<key>LiruMapShowAvCount</key>
<map>
<key>Comment</key>

62
indra/newview/daeexport.cpp
View File

@@ -74,7 +74,6 @@
// menu includes
#include "llevent.h"
#include "llmemberlistener.h"
#include "llview.h"
#include "llselectmgr.h"
// Floater and UI
@@ -82,8 +81,6 @@
#include "lluictrlfactory.h"
#include "llscrollcontainer.h"
#include "lltexturectrl.h"
#include "llcombobox.h"
#include "llcheckboxctrl.h"
// Files and cache
#include "llcallbacklist.h"
@@ -188,16 +185,13 @@ class ColladaExportFloater
{
private:
typedef std::map<LLUUID, std::string> texture_list_t;
LLButton* mExportBtn;
LLButton* mBrowseBtn;
LLLineEditor* mFileName;
LLComboBox* mTextureTypeCombo;
LLCheckBoxCtrl* mTextureExportCheck;
LLView* mExportBtn;
LLView* mFileName;
LLView* mTextureTypeCombo;
DAESaver mSaver;
texture_list_t mTexturesToSave;
S32 mTotal;
S32 mIncluded;
S32 mNumTextures;
S32 mNumExportableTextures;
std::string mObjectName;
@@ -210,16 +204,25 @@ public:
{
mCommitCallbackRegistrar.add("ColladaExport.FilePicker", boost::bind(&ColladaExportFloater::onClickBrowse, this));
mCommitCallbackRegistrar.add("ColladaExport.Export", boost::bind(&ColladaExportFloater::onClickExport, this));
mCommitCallbackRegistrar.add("ColladaExport.TextureTypeCombo", boost::bind(&ColladaExportFloater::onTextureTypeCombo, this));
mCommitCallbackRegistrar.add("ColladaExport.TextureExport", boost::bind(&ColladaExportFloater::onTextureExportCheck, this));
mCommitCallbackRegistrar.add("ColladaExport.TextureTypeCombo", boost::bind(&ColladaExportFloater::onTextureTypeCombo, this, boost::bind(&LLUICtrl::getControlName, _1), _2));
mCommitCallbackRegistrar.add("ColladaExport.TextureExport", boost::bind(&ColladaExportFloater::onTextureExportCheck, this, _2));
LLUICtrlFactory::getInstance()->buildFloater(this, "floater_dae_export.xml");
addSelectedObjects();
childSetTextArg("Object Name", "[NAME]", mObjectName);
childSetTextArg("Exportable Prims", "[COUNT]", llformat("%d", mIncluded));
childSetTextArg("Exportable Prims", "[TOTAL]", llformat("%d", mTotal));
childSetTextArg("Exportable Textures", "[COUNT]", llformat("%d", mNumExportableTextures));
childSetTextArg("Exportable Textures", "[TOTAL]", llformat("%d", mNumTextures));
if (LLUICtrl* ctrl = findChild<LLUICtrl>("Object Name"))
{
ctrl->setTextArg("[NAME]", mObjectName);
}
if (LLUICtrl* ctrl = findChild<LLUICtrl>("Exportable Prims"))
{
ctrl->setTextArg("[COUNT]", llformat("%d", mSaver.mObjects.size()));
ctrl->setTextArg("[TOTAL]", llformat("%d", mTotal));
}
if (LLUICtrl* ctrl = findChild<LLUICtrl>("Exportable Textures"))
{
ctrl->setTextArg("[COUNT]", llformat("%d", mNumExportableTextures));
ctrl->setTextArg("[TOTAL]", llformat("%d", mNumTextures));
}
addTexturePreview();
}
@@ -233,17 +236,13 @@ public:
BOOL postBuild()
{
mFileName = getChild<LLLineEditor>("file name editor");
mExportBtn = getChild<LLButton>("export button");
mBrowseBtn = getChild<LLButton>("browse button");
mTextureTypeCombo = getChild<LLComboBox>("texture type combo");
mTextureExportCheck = getChild<LLCheckBoxCtrl>("texture export check");
mFileName = getChildView("file name editor");
mExportBtn = getChildView("export button");
mTextureTypeCombo = getChildView("texture type combo");
mTitleProgress = getString("texture_progress");
mExportBtn->setEnabled(FALSE);
mFileName->setEnabled(FALSE);
mTextureTypeCombo->setValue(gSavedSettings.getS32(mTextureTypeCombo->getControlName()));
onTextureExportCheck();
onTextureExportCheck(getChildView("texture export check")->getValue());
return TRUE;
}
@@ -253,14 +252,14 @@ public:
setTitle(mTitleProgress);
}
void onTextureExportCheck()
void onTextureExportCheck(const LLSD& value)
{
mTextureTypeCombo->setEnabled(mTextureExportCheck->get());
mTextureTypeCombo->setEnabled(value);
}
void onTextureTypeCombo()
void onTextureTypeCombo(const std::string& control_name, const LLSD& value)
{
gSavedSettings.setS32(mTextureTypeCombo->getControlName(), mTextureTypeCombo->getValue());
gSavedSettings.setS32(control_name, value);
}
void onClickBrowse()
@@ -276,10 +275,7 @@ public:
if (filepicker->hasFilename())
{
mFileName->setValue(filepicker->getFilename());
if (mIncluded > 0)
{
mExportBtn->setEnabled(TRUE);
}
mExportBtn->setEnabled(TRUE);
}
}
@@ -310,14 +306,12 @@ public:
mSaver.mOffset = -selection->getFirstRootObject()->getRenderPosition();
mObjectName = selection->getFirstRootNode()->mName;
mTotal = 0;
mIncluded = 0;
for (LLObjectSelection::iterator iter = selection->begin(); iter != selection->end(); ++iter)
{
mTotal++;
LLSelectNode* node = *iter;
if (!node->getObject()->getVolume() || !DAEExportUtil::canExportNode(node)) continue;
mIncluded++;
mSaver.add(node->getObject(), node->mName);
}

22
indra/newview/llstatusbar.cpp
View File

@@ -154,6 +154,12 @@ public:
static LLDispatchUPCBalance sDispatchUPCBalance;
static void toggle_time_value()
{
LLControlVariable* control = gSavedSettings.getControl("LiruLocalTime");
control->set(!control->get());
}
LLStatusBar::LLStatusBar(const std::string& name, const LLRect& rect)
: LLPanel(name, LLRect(), FALSE), // not mouse opaque
mBalance(0),
@@ -195,6 +201,7 @@ mIsNavMeshDirty(false)
mTextHealth = getChild<LLTextBox>("HealthText" );
mTextTime = getChild<LLTextBox>("TimeText" );
mTextTime->setClickedCallback(boost::bind(toggle_time_value));
if (!mUPCSupported)
mTextUPC->setVisible(false);
@@ -314,23 +321,28 @@ void LLStatusBar::refresh()
mSGBandwidth->setThreshold(1, bwtotal);
mSGBandwidth->setThreshold(2, bwtotal);
// *TODO: Localize / translate time
// Singu Note: Use system's time if the user desires, otherwise use server time
static const LLCachedControl<bool> show_local_time("LiruLocalTime");
// Get current UTC time, adjusted for the user's clock
// being off.
time_t utc_time;
utc_time = time_corrected();
time_t utc_time = show_local_time ? time(NULL) : time_corrected();
// There's only one internal tm buffer.
struct tm* internal_time;
// Convert to Pacific, based on server's opinion of whether
// it's daylight savings time there.
internal_time = utc_to_pacific_time(utc_time, gPacificDaylightTime);
internal_time = show_local_time ? std::localtime(&utc_time) : utc_to_pacific_time(utc_time, gPacificDaylightTime);
std::string t;
timeStructToFormattedString(internal_time, gSavedSettings.getString("ShortTimeFormat"), t);
if (gPacificDaylightTime)
if (show_local_time)
{
static const std::string local(" " + getString("Local"));
t += local;
}
else if (gPacificDaylightTime)
{
t += " PDT";
}

4
indra/newview/skins/default/xui/en-us/floater_dae_export.xml
View File

@@ -2,11 +2,11 @@
<floater name="Collada Export" title="Collada Export" width="600" height="260" can_close="true" can_minimize="true">
<string name="texture_progress">Collada Export: Saving textures ([COUNT] remaining)</string>
<text name="file name" follows="bottom|left" left="10" bottom="-48" height="20">File Name:</text>
<line_editor name="file name editor" follows="bottom|left" left_delta="60" bottom_delta="4" width="360" height="20"/>
<line_editor name="file name editor" follows="bottom|left" left_delta="60" bottom_delta="4" width="360" height="20" enabled="false"/>
<button name="browse button" label="Browse" follows="bottom|left" left_delta="363" bottom_delta="0" width="80" height="20">
<button.commit_callback function="ColladaExport.FilePicker"/>
</button>
<button name="export button" label="Export" follows="bottom|left" left_delta="83" bottom_delta="0" width="80" height="20">
<button name="export button" label="Export" follows="bottom|left" left_delta="83" bottom_delta="0" width="80" height="20" enabled="false">
<button.commit_callback function="ColladaExport.Export"/>
</button>
<panel border="true" left="10" bottom_delta="-88" height="80" width="200" follows="bottom|left" name="object info panel">

1
indra/newview/skins/default/xui/en-us/panel_status_bar.xml
View File

@@ -137,4 +137,5 @@
<string name="bandwidth_tooltip">
Bandwidth
</string>
<string name="Local">Local</string>
</panel>

30
indra/newview/skins/default/xui/es/floater_dae_export.xml Normal file
View File

@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="Collada Export" title="Exportar a Collada">
<string name="texture_progress">Exportar a Collada: Guardando texturas ([COUNT] remanentes)</string>
<text name="file name" >Archivo:</text>
<line_editor name="file name editor"/>
<button name="browse button" label="Examinar"/>
<button name="export button" label="Exportar"/>
<panel name="object info panel">
<text name="Object info">Información del Objecto</text>
<text name="Object Name">Nombre: [NAME]</text>
<text name="Exportable Prims">Prims Exportables: [COUNT]/[TOTAL]</text>
<text name="Exportable Textures">Texturas Exportables: [COUNT]/[TOTAL]</text>
</panel>
<panel name="options panel">
<text name="Options">Opciones</text>
<check_box name="texture export check" label="Exportar Texturas"/>
<combo_box name="texture type combo">
<combo_item name="tga" value="0">TGA</combo_item>
<combo_item name="png" value="1">PNG</combo_item>
<combo_item name="j2c" value="2">J2C</combo_item>
<combo_item name="bmp" value="3">BMP</combo_item>
<combo_item name="jpg" value="4">JPG</combo_item>
<combo_box.commit_callback function="ColladaExport.TextureTypeCombo"/>
</combo_box>
<check_box name="consolidate check" label="Consolidar caras" tool_tip="Exporta como una sola las caras que tengan la misma textura"/>
<check_box name="skip transparent check" label="Omitir Texturas transparentes"/>
<check_box name="texture params check" label="Aplicar Parámetros de texturas"/>
</panel>
<scroll_container name="textures container"/>
</floater>

2
indra/newview/skins/default/xui/es/menu_inventory.xml
View File

@@ -6,6 +6,7 @@
<menu_item_call name="Task Properties" label="Propiedades"/>
<menu_item_call name="Task Rename" label="Renombrar"/>
<menu_item_call name="Task Remove" label="Borrar"/>
<menu_item_call label="Reiniciar" name="Task Reset"/>
<menu_item_call label="Detener Script" name="Task Set Not Running"/>
<menu_item_call label="Ejecutar Script" name="Task Set Running"/>
<menu_item_call name="Empty Trash" label="Vaciar Papelera"/>
@@ -63,6 +64,7 @@
<menu_item_call name="Wear Items" label="Vestirse objetos"/>
<menu_item_call name="Add To Outfit" label="Añadir al vestuario"/>
<menu_item_call name="Replace Outfit" label="Reemplazar Vestuario"/>
<menu_item_separator name="Replace Remove Separator"/>
<menu_item_call name="Remove From Outfit" label="Quitar del Vestuario"/>
<menu_item_call name="Conference Chat Folder" label="Iniciar Conferencia Grupal"/>
<menu_item_call name="Sound Play" label="Reproducir"/>

18
indra/newview/skins/default/xui/es/strings.xml
View File

@@ -3748,15 +3748,15 @@ Where tag = tag string to match. Removes bot's matching the tag.
<string name="Invalid Attachment">Punto de anexión inválido</string>
<!-- Account types, see LLAvatarPropertiesProcessor -->
<string name="AcctTypeResident">Resident</string>
<string name="AcctTypeTrial">Trial</string>
<string name="AcctTypeCharterMember">Charter Member</string>
<string name="AcctTypeEmployee">Linden Lab Employee</string>
<string name="PaymentInfoUsed">Payment Info Used</string>
<string name="PaymentInfoOnFile">Payment Info On File</string>
<string name="NoPaymentInfoOnFile">No Payment Info On File</string>
<string name="AgeVerified">Age-verified</string>
<string name="NotAgeVerified">Not Age-verified</string>
<string name="AcctTypeResident">Residente</string>
<string name="AcctTypeTrial">Prueba</string>
<string name="AcctTypeCharterMember">Miembro Fundador</string>
<string name="AcctTypeEmployee">Empleado de Linden Lab</string>
<string name="PaymentInfoUsed">Información de Pago utilizada</string>
<string name="PaymentInfoOnFile">Información de Pago en Archivo</string>
<string name="NoPaymentInfoOnFile">Sin Información de Pago</string>
<string name="AgeVerified">Edad Verificada</string>
<string name="NotAgeVerified">Edad No Verificada</string>
<!-- HUD Position -->
<string name="Center 2">Centro 2</string>