From 305b65f6f600b81de9a78e1246d2a5353cc3189b Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Wed, 21 Sep 2011 12:11:23 -0700
Subject: EXP-1205 PROGRESS -- As a User, I want a toybox which will contain
 all buttons that I can d&d into the toolbars EXP-1210 FIX -- Implement new
 toybox floater window EXP-1231 FIX -- Add menu option to toggle the toybox
 floater on and off

* Basic toybox floater implemented as its own class
* Toybox is available through "Me -> Toolbars..." menu option or ctrl-T shortcut
* Toolbars now have "side" type rather than simple orientation, as well as button
  state for "icons only" or "icons with text".

Reviewed by Richard
---
 indra/newview/llfloatertoybox.h | 58 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 indra/newview/llfloatertoybox.h

(limited to 'indra/newview/llfloatertoybox.h')

diff --git a/indra/newview/llfloatertoybox.h b/indra/newview/llfloatertoybox.h
new file mode 100644
index 0000000000..bb9392a0e3
--- /dev/null
+++ b/indra/newview/llfloatertoybox.h
@@ -0,0 +1,58 @@
+/** 
+ * @file llfloatertoybox.h
+ * @brief The toybox for flexibilizing the UI.
+ *
+ * $LicenseInfo:firstyear=2002&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2011, Linden Research, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLFLOATERTOYBOX_H
+#define LL_LLFLOATERTOYBOX_H
+
+#include "llfloater.h"
+
+
+class LLButton;
+
+
+class LLFloaterToybox
+: public LLFloater
+{
+public:
+	LLFloaterToybox(const LLSD& key);
+	virtual ~LLFloaterToybox();
+
+	// virtuals
+	BOOL postBuild();
+	void onOpen(const LLSD& key);
+	BOOL canClose();
+	void onClose(bool app_quitting);
+	void draw();
+	void onFocusReceived();
+
+protected:
+	void onBtnRestoreDefaults();
+
+public:
+	LLButton *	mBtnRestoreDefaults;
+};
+
+#endif // LL_LLFLOATERTOYBOX_H
-- 
cgit v1.2.3


From 565483ee1f2ea7b8d525c6d89700452216481c5e Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Thu, 22 Sep 2011 15:43:08 -0700
Subject: EXP-1205 PROGRESS -- As a User, I want a toybox which will contain
 all buttons that I can d&d into the toolbars EXP-1233 PROGRESS -- Populate
 the toybox floater window with all FUI toolbar buttons EXP-1236 FIX -- The
 toybox floater should remember its position for the user

* Basic addCommand function to the LLToolBar.  Need proper implementation.
* Added map for faster lookup of commands
* Toybox now adds commands to its toolbar for basic button setup

Reviewed by Richard.
---
 indra/newview/llfloatertoybox.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'indra/newview/llfloatertoybox.h')

diff --git a/indra/newview/llfloatertoybox.h b/indra/newview/llfloatertoybox.h
index bb9392a0e3..3574e060bf 100644
--- a/indra/newview/llfloatertoybox.h
+++ b/indra/newview/llfloatertoybox.h
@@ -31,10 +31,10 @@
 
 
 class LLButton;
+class LLToolBar;
 
 
-class LLFloaterToybox
-: public LLFloater
+class LLFloaterToybox : public LLFloater
 {
 public:
 	LLFloaterToybox(const LLSD& key);
@@ -53,6 +53,7 @@ protected:
 
 public:
 	LLButton *	mBtnRestoreDefaults;
+	LLToolBar *	mToolBar;
 };
 
 #endif // LL_LLFLOATERTOYBOX_H
-- 
cgit v1.2.3