Apertura del repositorio

indra/integration_tests/llui_libtest/CMakeLists.txt

@@ -0,0 +1,81 @@
+# -*- cmake -*-
+
+# Only set this up for viewer builds, because the llui library is most closely
+# related to the viewer
+if (VIEWER)
+
+project (llui_libtest)
+
+include(00-Common)
+include(LLCommon)
+include(LLImage)
+include(LLImageJ2COJ)   # ugh, needed for images
+include(LLKDU)
+include(LLMath)
+include(LLMessage)
+include(LLRender)
+include(LLWindow)
+include(LLUI)
+include(LLFileSystem)
+include(LLXML)
+include(Hunspell)
+include(Linking)
+# include(Tut)
+
+set(llui_libtest_SOURCE_FILES
+    llui_libtest.cpp
+    llwidgetreg.cpp
+    )
+
+set(llui_libtest_HEADER_FILES
+    CMakeLists.txt
+    llui_libtest.h
+    llwidgetreg.h
+    )
+
+list(APPEND llui_libtest_SOURCE_FILES ${llui_libtest_HEADER_FILES})
+
+add_executable(llui_libtest ${llui_libtest_SOURCE_FILES})
+
+# Libraries on which this library depends, needed for Linux builds
+# Sort by high-level to low-level
+target_link_libraries(llui_libtest
+        llui
+        llinventory
+        llmessage
+        llrender
+        llimage
+        llkdu
+        llimagej2coj
+        )
+
+if (WINDOWS)
+    set_target_properties(llui_libtest
+        PROPERTIES 
+        LINK_FLAGS "/NODEFAULTLIB:LIBCMT"
+        )
+
+    # Copy over OpenJPEG.dll
+    # *NOTE: On Windows with VS2005, only the first comment prints
+    set(OPENJPEG_RELEASE
+        "${ARCH_PREBUILT_DIRS_RELEASE}/openjp2.dll")
+    add_custom_command( TARGET llui_libtest POST_BUILD
+            COMMAND ${CMAKE_COMMAND} -E copy_if_different
+            ${OPENJPEG_RELEASE} ${CMAKE_CURRENT_BINARY_DIR}
+        COMMENT "Copying OpenJPEG DLLs to binary directory"
+        )
+    set(OPENJPEG_DEBUG
+        "${ARCH_PREBUILT_DIRS_DEBUG}/openjp2.dll")
+    add_custom_command( TARGET llui_libtest POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different 
+            ${OPENJPEG_DEBUG} ${CMAKE_CURRENT_BINARY_DIR}
+        )
+  
+endif (WINDOWS)
+
+# Ensure people working on the viewer don't break this library
+# *NOTE: This could be removed, or only built by Parabuild, if the build
+# and link times become too long. JC
+add_dependencies(viewer llui_libtest)
+
+endif (VIEWER)

indra/integration_tests/llui_libtest/llui_libtest.cpp

@@ -0,0 +1,229 @@
+/**
+ * @file llui_libtest.cpp
+ * @brief Integration test for the LLUI library
+ *
+ * $LicenseInfo:firstyear=2009&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2010, 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$
+ */
+#include "linden_common.h"
+
+#include "llui_libtest.h"
+
+// project includes
+#include "llwidgetreg.h"
+
+// linden library includes
+#include "llcontrol.h"      // LLControlGroup
+#include "lldir.h"
+#include "lldiriterator.h"
+#include "llerrorcontrol.h"
+#include "llfloater.h"
+#include "llfontfreetype.h"
+#include "llfontgl.h"
+#include "lltransutil.h"
+#include "llui.h"
+#include "lluictrlfactory.h"
+
+#include <iostream>
+
+// *TODO: switch to using TUT
+// *TODO: teach Parabuild about this program, run automatically after full builds
+
+// I believe these must be globals, not stack variables.  JC
+LLControlGroup gSavedSettings("Global");    // saved at end of session
+LLControlGroup gSavedPerAccountSettings("PerAccount"); // saved at end of session
+LLControlGroup gWarningSettings("Warnings"); // persists ignored dialogs/warnings
+
+// [RLVa:KB] - Checked: 2010-11-12 (RLVa-1.2.2a) | Added: RLVa-1.2.2a
+#include "llavatarname.h"
+
+// Stub for rlvGetAnonym
+std::string rlvGetAnonym(const LLAvatarName& avName)
+{
+    static std::string strAnonym = "A resident";
+    return strAnonym;
+}
+// [/RLVa:KB]
+
+// We can't create LLImageGL objects because we have no window or rendering
+// context.  Provide enough of an LLUIImage to test the LLUI library without
+// an underlying image.
+class TestUIImage : public LLUIImage
+{
+public:
+    TestUIImage()
+    :   LLUIImage( std::string(), NULL ) // NULL ImageGL, don't deref!
+    { }
+
+    /*virtual*/ S32 getWidth() const
+    {
+        return 16;
+    }
+
+    /*virtual*/ S32 getHeight() const
+    {
+        return 16;
+    }
+};
+
+
+class LLTexture ;
+// We need to supply dummy images
+class TestImageProvider : public LLImageProviderInterface
+{
+public:
+    /*virtual*/ LLPointer<LLUIImage> getUIImage(const std::string& name, S32 priority)
+    {
+        return makeImage();
+    }
+
+    /*virtual*/ LLPointer<LLUIImage> getUIImageByID(const LLUUID& id, S32 priority)
+    {
+        return makeImage();
+    }
+
+    /*virtual*/ void cleanUp()
+    {
+    }
+
+    LLPointer<LLUIImage> makeImage()
+    {
+        LLPointer<LLTexture> image_gl;
+        LLPointer<LLUIImage> image = new TestUIImage(); //LLUIImage( std::string(), image_gl);
+        mImageList.push_back(image);
+        return image;
+    }
+
+public:
+    // Unclear if we need this, hold on to one copy of each image we make
+    std::vector<LLPointer<LLUIImage> > mImageList;
+};
+TestImageProvider gTestImageProvider;
+
+void init_llui()
+{
+    // Font lookup needs directory support
+#if LL_DARWIN
+    const char* newview_path = "../../../../newview";
+#else
+    const char* newview_path = "../../../newview";
+#endif
+    gDirUtilp->initAppDirs("SecondLife", newview_path);
+    gDirUtilp->setSkinFolder("default", "en");
+
+    // colors are no longer stored in a LLControlGroup file
+    LLUIColorTable::instance().loadFromSettings();
+
+    std::string config_filename = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "settings.xml");
+    gSavedSettings.loadFromFile(config_filename);
+
+    // See LLAppViewer::init()
+    LLUI::settings_map_t settings;
+    settings["config"] = &gSavedSettings;
+    settings["ignores"] = &gWarningSettings;
+    settings["floater"] = &gSavedSettings;
+    settings["account"] = &gSavedPerAccountSettings;
+
+    // Don't use real images as we don't have a GL context
+    LLUI::initClass(settings, &gTestImageProvider);
+
+    const bool no_register_widgets = false;
+    LLWidgetReg::initClass( no_register_widgets );
+
+    // Otherwise we get translation warnings when setting up floaters
+    // (tooltips for buttons)
+    std::set<std::string> default_args;
+    LLTransUtil::parseStrings("strings.xml", default_args);
+    LLTransUtil::parseLanguageStrings("language_settings.xml");
+    LLFontManager::initClass();
+
+    // Creating widgets apparently requires fonts to be initialized,
+    // otherwise it crashes.
+    LLFontGL::initClass(96.f, 1.f, 1.f,
+                        gDirUtilp->getAppRODataDir(),
+                        "fonts.xml",
+                        f.0,
+                        false );    // don't create gl textures
+
+    LLFloaterView::Params fvparams;
+    fvparams.name("Floater View");
+    fvparams.rect( LLRect(0,480,640,0) );
+    fvparams.mouse_opaque(false);
+    fvparams.follows.flags(FOLLOWS_ALL);
+    fvparams.tab_stop(false);
+    gFloaterView = LLUICtrlFactory::create<LLFloaterView> (fvparams);
+}
+
+/*==========================================================================*|
+static std::string get_xui_dir()
+{
+    std::string delim = gDirUtilp->getDirDelimiter();
+    return gDirUtilp->getSkinBaseDir() + delim + "default" + delim + "xui" + delim;
+}
+
+// buildFromFile() no longer supports generate-output-LLXMLNode
+void export_test_floaters()
+{
+    // Convert all test floaters to new XML format
+    std::string delim = gDirUtilp->getDirDelimiter();
+    std::string xui_dir = get_xui_dir() + "en" + delim;
+    std::string filename;
+
+    LLDirIterator iter(xui_dir, "floater_test_*.xml");
+    while (iter.next(filename))
+    {
+        if (filename.find("_new.xml") != std::string::npos)
+        {
+            // don't re-export other test floaters
+            continue;
+        }
+        LL_INFOS() << "Converting " << filename << LL_ENDL;
+        // Build a floater and output new attributes
+        LLXMLNodePtr output_node = new LLXMLNode();
+        LLFloater* floater = new LLFloater(LLSD());
+        floater->buildFromFile( filename,
+                                //   FALSE, // don't open floater
+                                output_node);
+        std::string out_filename = gDirUtilp->add(xui_dir, filename);
+        std::string::size_type extension_pos = out_filename.rfind(".xml");
+        out_filename.resize(extension_pos);
+        out_filename += "_new.xml";
+
+        LL_INFOS() << "Output: " << out_filename << LL_ENDL;
+        LLFILE* floater_file = LLFile::fopen(out_filename.c_str(), "w");
+        LLXMLNode::writeHeaderToFile(floater_file);
+        output_node->writeToFile(floater_file);
+        fclose(floater_file);
+    }
+}
+|*==========================================================================*/
+
+int main(int argc, char** argv)
+{
+    // Must init LLError for llerrs to actually cause errors.
+    LLError::initForApplication(".");
+
+    init_llui();
+
+//  export_test_floaters();
+
+    return 0;
+}

indra/integration_tests/llui_libtest/llui_libtest.h

@@ -0,0 +1,30 @@
+/**
+ * @file llui_libtest.h
+ *
+ * $LicenseInfo:firstyear=2009&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2010, 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 LLUI_LIBTEST_H
+#define LLUI_LIBTEST_H
+
+// TODO
+
+#endif

indra/integration_tests/llui_libtest/llwidgetreg.cpp

@@ -0,0 +1,107 @@
+/**
+ * @file llwidgetreg.cpp
+ *
+ * $LicenseInfo:firstyear=2009&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2010, 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$
+ */
+#include "linden_common.h"
+
+#include "llwidgetreg.h"
+
+#include "llbutton.h"
+#include "llcheckboxctrl.h"
+#include "llcombobox.h"
+#include "llcontainerview.h"
+#include "lliconctrl.h"
+#include "llloadingindicator.h"
+#include "llmenubutton.h"
+#include "llmenugl.h"
+#include "llmultislider.h"
+#include "llmultisliderctrl.h"
+#include "llprogressbar.h"
+#include "llradiogroup.h"
+#include "llsearcheditor.h"
+#include "llscrollcontainer.h"
+#include "llscrollingpanellist.h"
+#include "llscrolllistctrl.h"
+#include "llslider.h"
+#include "llsliderctrl.h"
+#include "llspinctrl.h"
+#include "llstatview.h"
+#include "lltabcontainer.h"
+#include "lltextbox.h"
+#include "lltexteditor.h"
+#include "lltimectrl.h"
+#include "llflyoutbutton.h"
+#include "llfiltereditor.h"
+#include "lllayoutstack.h"
+
+void LLWidgetReg::initClass(bool register_widgets)
+{
+    // Only need to register if the Windows linker has optimized away the
+    // references to the object files.
+    if (register_widgets)
+    {
+        LLDefaultChildRegistry::Register<LLButton> button("button");
+        LLDefaultChildRegistry::Register<LLMenuButton> menu_button("menu_button");
+        LLDefaultChildRegistry::Register<LLCheckBoxCtrl> check_box("check_box");
+        LLDefaultChildRegistry::Register<LLComboBox> combo_box("combo_box");
+        LLDefaultChildRegistry::Register<LLFilterEditor> filter_editor("filter_editor");
+        LLDefaultChildRegistry::Register<LLFlyoutButton> flyout_button("flyout_button");
+        LLDefaultChildRegistry::Register<LLContainerView> container_view("container_view");
+        LLDefaultChildRegistry::Register<LLIconCtrl> icon("icon");
+        LLDefaultChildRegistry::Register<LLLoadingIndicator> loading_indicator("loading_indicator");
+        LLDefaultChildRegistry::Register<LLLineEditor> line_editor("line_editor");
+        LLDefaultChildRegistry::Register<LLMenuItemSeparatorGL> menu_item_separator("menu_item_separator");
+        LLDefaultChildRegistry::Register<LLMenuItemCallGL> menu_item_call_gl("menu_item_call");
+        LLDefaultChildRegistry::Register<LLMenuItemCheckGL> menu_item_check_gl("menu_item_check");
+        LLDefaultChildRegistry::Register<LLMenuGL> menu("menu");
+        LLDefaultChildRegistry::Register<LLMenuBarGL> menu_bar("menu_bar");
+        LLDefaultChildRegistry::Register<LLContextMenu> context_menu("context_menu");
+        LLDefaultChildRegistry::Register<LLMultiSlider> multi_slider_bar("multi_slider_bar");
+        LLDefaultChildRegistry::Register<LLMultiSliderCtrl> multi_slider("multi_slider");
+        LLDefaultChildRegistry::Register<LLPanel> panel("panel", &LLPanel::fromXML);
+        LLDefaultChildRegistry::Register<LLLayoutStack> layout_stack("layout_stack");
+        LLDefaultChildRegistry::Register<LLProgressBar> progress_bar("progress_bar");
+        LLDefaultChildRegistry::Register<LLRadioGroup> radio_group("radio_group");
+        LLDefaultChildRegistry::Register<LLSearchEditor> search_editor("search_editor");
+        LLDefaultChildRegistry::Register<LLScrollContainer> scroll_container("scroll_container");
+        LLDefaultChildRegistry::Register<LLScrollingPanelList> scrolling_panel_list("scrolling_panel_list");
+        LLDefaultChildRegistry::Register<LLScrollListCtrl> scroll_list("scroll_list");
+        LLDefaultChildRegistry::Register<LLSlider> slider_bar("slider_bar");
+        LLDefaultChildRegistry::Register<LLSliderCtrl> slider("slider");
+        LLDefaultChildRegistry::Register<LLSpinCtrl> spinner("spinner");
+        LLDefaultChildRegistry::Register<LLStatBar> stat_bar("stat_bar");
+        //LLDefaultChildRegistry::Register<LLPlaceHolderPanel> placeholder("placeholder");
+        LLDefaultChildRegistry::Register<LLTabContainer> tab_container("tab_container");
+        LLDefaultChildRegistry::Register<LLTextBox> text("text");
+        LLDefaultChildRegistry::Register<LLTimeCtrl> time("time");
+        LLDefaultChildRegistry::Register<LLTextEditor> simple_text_editor("simple_text_editor");
+        LLDefaultChildRegistry::Register<LLUICtrl> ui_ctrl("ui_ctrl");
+        LLDefaultChildRegistry::Register<LLStatView> stat_view("stat_view");
+        //LLDefaultChildRegistry::Register<LLUICtrlLocate> locate("locate");
+        //LLDefaultChildRegistry::Register<LLUICtrlLocate> pad("pad");
+        LLDefaultChildRegistry::Register<LLViewBorder> view_border("view_border");
+    }
+
+    // *HACK: Usually this is registered as a viewer text editor
+    LLDefaultChildRegistry::Register<LLTextEditor> text_editor("text_editor");
+}

indra/integration_tests/llui_libtest/llwidgetreg.h

@@ -0,0 +1,37 @@
+/**
+ * @file llwidgetreg.h
+ *
+ * $LicenseInfo:firstyear=2009&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2010, 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 LLWIDGETREG_H
+#define LLWIDGETREG_H
+
+// Register all widgets with the builder registry.
+// Useful on Windows where linker discards all references to the
+// static LLDefaultChildRegistry::Register<> calls.
+class LLWidgetReg
+{
+public:
+    static void initClass(bool register_widgets);
+};
+
+#endif