Index: indra/newview/CMakeLists.txt =================================================================== --- indra/newview/CMakeLists.txt (révision 2220) +++ indra/newview/CMakeLists.txt (copie de travail) @@ -96,6 +96,7 @@ llcylinder.cpp lldebugmessagebox.cpp lldebugview.cpp + lldefaultperms.cpp lldelayedgestureerror.cpp lldirpicker.cpp lldrawable.cpp @@ -144,6 +145,7 @@ llfloatercolorpicker.cpp llfloatercustomize.cpp llfloaterdaycycle.cpp + llfloaterdefaultpermissions.cpp llfloaterdirectory.cpp llfloatereditui.cpp llfloaterenvsettings.cpp @@ -179,7 +181,6 @@ llfloateropenobject.cpp llfloaterparcel.cpp llfloaterpermissionsmgr.cpp - llfloaterperms.cpp llfloaterpostcard.cpp llfloaterpostprocess.cpp llfloaterpreference.cpp @@ -500,6 +501,7 @@ llcylinder.h lldebugmessagebox.h lldebugview.h + lldefaultperms.h lldelayedgestureerror.h lldirpicker.h lldrawable.h @@ -549,6 +551,7 @@ llfloatercolorpicker.h llfloatercustomize.h llfloaterdaycycle.h + llfloaterdefaultpermissions.h llfloaterdirectory.h llfloatereditui.h llfloaterenvsettings.h @@ -587,7 +590,6 @@ llfloaterpostcard.h llfloaterpostprocess.h llfloaterpreference.h - llfloaterperms.h llfloaterproperties.h llfloaterregioninfo.h llfloaterreporter.h @@ -1061,6 +1063,7 @@ skins/default/xui/en-us/floater_critical.xml skins/default/xui/en-us/floater_customize.xml skins/default/xui/en-us/floater_day_cycle_options.xml + skins/default/xui/en-us/floater_default_permissions.xml skins/default/xui/en-us/floater_device_settings.xml skins/default/xui/en-us/floater_directory.xml skins/default/xui/en-us/floater_env_settings.xml @@ -1104,7 +1107,6 @@ skins/default/xui/en-us/floater_pay.xml skins/default/xui/en-us/floater_postcard.xml skins/default/xui/en-us/floater_post_process.xml - skins/default/xui/en-us/floater_perm_prefs.xml skins/default/xui/en-us/floater_preferences.xml skins/default/xui/en-us/floater_preview_animation.xml skins/default/xui/en-us/floater_preview_classified.xml Index: indra/newview/llfloaterdefaultpermissions.cpp =================================================================== --- indra/newview/llfloaterdefaultpermissions.cpp (révision 0) +++ indra/newview/llfloaterdefaultpermissions.cpp (révision 0) @@ -0,0 +1,270 @@ +/** + * @file llfloaterdefaultpermissions.cpp + * @author Coco + * @brief Dialog to set default permissions for newly created or uploaded objects + * + * $LicenseInfo:firstyear=2008&license=viewergpl$ + * + * Copyright (c) 2008-2009, 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://secondlifegrid.net/programs/open_source/licensing/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://secondlifegrid.net/programs/open_source/licensing/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$ + */ + +#include "llviewerprecompiledheaders.h" + +#include "llfloaterdefaultpermissions.h" + +#include "lluictrlfactory.h" +#include "llviewercontrol.h" +#include "llcheckboxctrl.h" + +LLFloaterDefaultPermissions::LLFloaterDefaultPermissions(const LLSD& seed) +{ + LLUICtrlFactory::getInstance()->buildFloater(this, "floater_default_permissions.xml"); +} + +BOOL LLFloaterDefaultPermissions::postBuild() +{ + LLCheckBoxCtrl* cb; + + cb = getChild("share_with_group"); + cb->setCommitCallback(onCheckShareWithGroup); + cb->setCallbackUserData(this); + + cb = getChild("everyone_copy"); + cb->setCommitCallback(onCheckEveryoneCopy); + cb->setCallbackUserData(this); + + cb = getChild("next_owner_copy"); + cb->setCommitCallback(onCheckNextOwnerCopy); + cb->setCallbackUserData(this); + + cb = getChild("next_owner_modify"); + cb->setCommitCallback(onCheckNextOwnerModify); + cb->setCallbackUserData(this); + + cb = getChild("next_owner_transfer"); + cb->setCommitCallback(onCheckNextOwnerTransfer); + cb->setCallbackUserData(this); + + childSetAction("help", onClickHelp, this); + childSetAction("ok", onClickOK, this); + childSetAction("cancel", onClickCancel, this); + + refresh(); + + return TRUE; +} + +//static +void LLFloaterDefaultPermissions::onClickOK(void* data) +{ + LLFloaterDefaultPermissions* self = static_cast(data); + self->ok(); + self->close(); +} + +//static +void LLFloaterDefaultPermissions::onClickCancel(void* data) +{ + LLFloaterDefaultPermissions* self = static_cast(data); + self->cancel(); + self->close(); +} + +void LLFloaterDefaultPermissions::ok() +{ + refresh(); // Changes were already applied to saved settings. Refreshing internal values makes it official. +} + +void LLFloaterDefaultPermissions::cancel() +{ + gSavedSettings.setBOOL("ShareWithGroup", mShareWithGroup); + gSavedSettings.setBOOL("EveryoneCopy", mEveryoneCopy); + gSavedSettings.setBOOL("NextOwnerCopy", mNextOwnerCopy); + gSavedSettings.setBOOL("NextOwnerModify", mNextOwnerModify); + gSavedSettings.setBOOL("NextOwnerTransfer", mNextOwnerTransfer); +} + +void LLFloaterDefaultPermissions::refresh() +{ + mShareWithGroup = gSavedSettings.getBOOL("ShareWithGroup"); + mEveryoneCopy = gSavedSettings.getBOOL("EveryoneCopy"); + mNextOwnerCopy = gSavedSettings.getBOOL("NextOwnerCopy"); + mNextOwnerModify = gSavedSettings.getBOOL("NextOwnerModify"); + mNextOwnerTransfer = gSavedSettings.getBOOL("NextOwnerTransfer"); +} + +void LLFloaterDefaultPermissions::onClose(bool app_quitting) +{ + // Cancel any unsaved changes before closing. + // Note: when closed due to the OK button this amounts to a no-op. + cancel(); + LLFloater::onClose(app_quitting); +} + +//static +void LLFloaterDefaultPermissions::onClickHelp(void* data) +{ + LLNotifications::instance().add("ClickHelpDefaultPermissions"); +} + +// static +void LLFloaterDefaultPermissions::onCheckShareWithGroup(LLUICtrl* cb, void* data) +{ + if ( ((LLCheckBoxCtrl*) cb)->get() ) + { + // If user checked the box, ask for confirmation + LLFloaterDefaultPermissions* self = (LLFloaterDefaultPermissions*) data; + + LLNotifications::instance().add( + "ConfirmPermissiveShareWithGroup", + LLSD(), LLSD(), + boost::bind(&LLFloaterDefaultPermissions::callbackConfirmShareWithGroup, self, _1, _2) ); + } +} + +void LLFloaterDefaultPermissions::callbackConfirmShareWithGroup(const LLSD ¬ification, const LLSD &response) +{ + S32 choice = LLNotification::getSelectedOption(notification, response); + + // 0 == Confirm + // 1 == Cancel + if (choice == 1) + { + childSetValue("share_with_group", FALSE); + gSavedSettings.setBOOL("ShareWithGroup", FALSE); + } +} + +// static +void LLFloaterDefaultPermissions::onCheckEveryoneCopy(LLUICtrl* cb, void* data) +{ + if ( ((LLCheckBoxCtrl*) cb)->get() ) + { + // If user checked the box, ask for confirmation + LLFloaterDefaultPermissions* self = (LLFloaterDefaultPermissions*) data; + + LLNotifications::instance().add( + "ConfirmPermissiveEveryoneCopy", + LLSD(), LLSD(), + boost::bind(&LLFloaterDefaultPermissions::callbackConfirmEveryoneCopy, self, _1, _2) ); + } +} + +void LLFloaterDefaultPermissions::callbackConfirmEveryoneCopy(const LLSD ¬ification, const LLSD &response) +{ + S32 choice = LLNotification::getSelectedOption(notification, response); + + // 0 == Confirm + // 1 == Cancel + if (choice == 1) + { + childSetValue("everyone_copy", FALSE); + gSavedSettings.setBOOL("EveryoneCopy", FALSE); + } +} + +// static +void LLFloaterDefaultPermissions::onCheckNextOwnerCopy(LLUICtrl* cb, void* data) +{ + if ( ((LLCheckBoxCtrl*) cb)->get() ) + { + // If user checked the box, ask for confirmation + LLFloaterDefaultPermissions* self = (LLFloaterDefaultPermissions*) data; + + LLNotifications::instance().add( + "ConfirmPermissiveNextOwnerCopy", + LLSD(), LLSD(), + boost::bind(&LLFloaterDefaultPermissions::callbackConfirmNextOwnerCopy, self, _1, _2 ) ); + } +} + +void LLFloaterDefaultPermissions::callbackConfirmNextOwnerCopy(const LLSD ¬ification, const LLSD &response) +{ + S32 choice = LLNotification::getSelectedOption(notification, response); + + // 0 == Confirm + // 1 == Cancel + if (choice == 1) + { + childSetValue("next_owner_copy", FALSE); + gSavedSettings.setBOOL("NextOwnerCopy", FALSE); + } +} + +// static +void LLFloaterDefaultPermissions::onCheckNextOwnerModify(LLUICtrl* cb, void* data) +{ + if ( ((LLCheckBoxCtrl*) cb)->get() ) + { + // If user checked the box, ask for confirmation + LLFloaterDefaultPermissions* self = (LLFloaterDefaultPermissions*) data; + + LLNotifications::instance().add( + "ConfirmPermissiveNextOwnerModify", + LLSD(), LLSD(), + boost::bind(&LLFloaterDefaultPermissions::callbackConfirmNextOwnerModify, self, _1, _2) ); + } +} + +void LLFloaterDefaultPermissions::callbackConfirmNextOwnerModify(const LLSD ¬ification, const LLSD &response) +{ + S32 choice = LLNotification::getSelectedOption(notification, response); + + // 0 == Confirm + // 1 == Cancel + if (choice == 1) + { + childSetValue("next_owner_modify", FALSE); + gSavedSettings.setBOOL("NextOwnerModify", FALSE); + } +} + +// static +void LLFloaterDefaultPermissions::onCheckNextOwnerTransfer(LLUICtrl* cb, void* data) +{ + if ( ((LLCheckBoxCtrl*) cb)->get() ) + { + // If user checked the box, ask for confirmation + LLFloaterDefaultPermissions* self = (LLFloaterDefaultPermissions*) data; + + LLNotifications::instance().add( + "ConfirmPermissiveNextOwnerTransfer", + LLSD(), LLSD(), + boost::bind(&LLFloaterDefaultPermissions::callbackConfirmNextOwnerTransfer, self, _1, _2) ); + } +} + +void LLFloaterDefaultPermissions::callbackConfirmNextOwnerTransfer(const LLSD ¬ification, const LLSD &response) +{ + S32 choice = LLNotification::getSelectedOption(notification, response); + + // 0 == Confirm + // 1 == Cancel + if (choice == 1) + { + childSetValue("next_owner_transfer", FALSE); + gSavedSettings.setBOOL("NextOwnerTransfer", FALSE); + } +} Index: indra/newview/llfloaterdefaultpermissions.h =================================================================== --- indra/newview/llfloaterdefaultpermissions.h (révision 0) +++ indra/newview/llfloaterdefaultpermissions.h (révision 0) @@ -0,0 +1,91 @@ +/** + * @file llfloaterdefaultperms.h + * @author Coco + * @brief Dialog to set default permissions for newly created or uploaded objects + * + * $LicenseInfo:firstyear=2008&license=viewergpl$ + * + * Copyright (c) 2008-2009, 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://secondlifegrid.net/programs/open_source/licensing/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://secondlifegrid.net/programs/open_source/licensing/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$ + */ + +/* + * Dialog to set default permissions for newly created or uploaded objects + */ + +#ifndef LL_LLFLOATER_DEFAULT_PERMISSIONS_H +#define LL_LLFLOATER_DEFAULT_PERMISSIONS_H + +#include "llfloater.h" + +class LLFloaterDefaultPermissions: public LLFloater, + public LLFloaterSingleton +{ + friend class LLUISingleton >; + +public: + virtual void onClose(bool app_quitting = false); + virtual BOOL postBuild(); + void ok(); + void cancel(); + static void onClickOK(void*); + static void onClickCancel(void*); + +private: + BOOL // cached values only for implementing cancel. + mShareWithGroup, + mEveryoneCopy, + mNextOwnerCopy, + mNextOwnerModify, + mNextOwnerTransfer; + + LLFloaterDefaultPermissions(const LLSD& seed); + void refresh(); + + /// callback for the menus help button + static void onClickHelp(void* data); + + // Validation mechanism for checkboxes + static void onCheckShareWithGroup(LLUICtrl*, void*); + void callbackConfirmShareWithGroup(const LLSD &, const LLSD &); + void cancelShareWithGroup(); + + static void onCheckEveryoneCopy(LLUICtrl*, void*); + void callbackConfirmEveryoneCopy(const LLSD &, const LLSD &); + void cancelEveryoneCopy(); + + static void onCheckNextOwnerCopy(LLUICtrl*, void*); + void callbackConfirmNextOwnerCopy(const LLSD &, const LLSD &); + void cancelNextOwnerCopy(); + + static void onCheckNextOwnerModify(LLUICtrl*, void*); + void callbackConfirmNextOwnerModify(const LLSD &, const LLSD &); + void cancelNextOwnerModify(); + + static void onCheckNextOwnerTransfer(LLUICtrl*, void*); + void callbackConfirmNextOwnerTransfer(const LLSD &, const LLSD &); + void cancelNextOwnerTransfer(); +}; + +#endif Index: indra/newview/llviewermenu.cpp =================================================================== --- indra/newview/llviewermenu.cpp (révision 2220) +++ indra/newview/llviewermenu.cpp (copie de travail) @@ -98,6 +98,7 @@ #include "llfloaterchat.h" #include "llfloatercustomize.h" #include "llfloaterdaycycle.h" +#include "llfloaterdefaultpermissions.h" #include "llfloaterdirectory.h" #include "llfloatereditui.h" #include "llfloaterchatterbox.h" @@ -121,7 +122,6 @@ #include "llfloatermute.h" #include "llfloateropenobject.h" #include "llfloaterpermissionsmgr.h" -#include "llfloaterperms.h" #include "llfloaterpostprocess.h" #include "llfloaterpreference.h" #include "llfloaterregioninfo.h" @@ -5194,9 +5194,9 @@ { LLFloaterBeacons::toggleInstance(LLSD()); } - else if (floater_name == "perm prefs") + else if (floater_name == "default permissions") { - LLFloaterPerms::toggleInstance(LLSD()); + LLFloaterDefaultPermissions::toggleInstance(LLSD()); } return true; } Index: indra/newview/skins/default/xui/en-us/floater_default_permissions.xml =================================================================== --- indra/newview/skins/default/xui/en-us/floater_default_permissions.xml (révision 0) +++ indra/newview/skins/default/xui/en-us/floater_default_permissions.xml (révision 0) @@ -0,0 +1,43 @@ + + +