Split plugin classes and derive AIFilePicker from BasicPluginBase (part 3).
This commit deletes all indra/media_plugins and copied one-on-one the indra/plugins directory from my (imprudence) statemachine branch (which contains the AIFilePicker patch). git shows this as a lot of 'renamed' files because originally it was a rename. However, there are a lot of changes as well: it's both an upgrade to a newer plugin system (changes by LL) as well as an upgrade to my refactored plugin system with a file picker as plugin. Since this commit is a one-on-one copy, it disregards any changes that were in Singularity and not in imprudence in indra/media_plugins however. I will add those back in the next commit.
This commit is contained in:
81
indra/plugins/filepicker/CMakeLists.txt
Normal file
81
indra/plugins/filepicker/CMakeLists.txt
Normal file
@@ -0,0 +1,81 @@
|
||||
# -*- cmake -*-
|
||||
|
||||
project(basic_plugin_filepicker)
|
||||
|
||||
include(00-Common)
|
||||
include(LLCommon)
|
||||
include(LLPlugin)
|
||||
include(Linking)
|
||||
include(PluginAPI)
|
||||
include(BasicPluginBase)
|
||||
include(UI)
|
||||
|
||||
include_directories(
|
||||
${LLPLUGIN_INCLUDE_DIRS}
|
||||
${LLCOMMON_INCLUDE_DIRS}
|
||||
${BASIC_PLUGIN_BASE_INCLUDE_DIRS}
|
||||
${LLUI_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
### basic_plugin_filepicker
|
||||
|
||||
if(NOT CMAKE_SIZEOF_VOID_P MATCHES 4)
|
||||
if(WINDOWS)
|
||||
add_definitions(/FIXED:NO)
|
||||
else(WINDOWS) # not windows therefore gcc LINUX and DARWIN
|
||||
add_definitions(-fPIC)
|
||||
endif(WINDOWS)
|
||||
endif (NOT CMAKE_SIZEOF_VOID_P MATCHES 4)
|
||||
|
||||
set(basic_plugin_filepicker_SOURCE_FILES
|
||||
basic_plugin_filepicker.cpp
|
||||
llfilepicker.cpp
|
||||
)
|
||||
|
||||
set(basic_plugin_filepicker_HEADER_FILES
|
||||
llfilepicker.h
|
||||
)
|
||||
|
||||
set_source_files_properties(${basic_plugin_filepicker_HEADER_FILES}
|
||||
PROPERTIES HEADER_FILE_ONLY TRUE)
|
||||
|
||||
list(APPEND basic_plugin_filepicker_SOURCE_FILES ${basic_plugin_filepicker_HEADER_FILES})
|
||||
|
||||
add_library(basic_plugin_filepicker
|
||||
SHARED
|
||||
${basic_plugin_filepicker_SOURCE_FILES}
|
||||
)
|
||||
|
||||
target_link_libraries(basic_plugin_filepicker
|
||||
${LLPLUGIN_LIBRARIES}
|
||||
${LLCOMMON_LIBRARIES}
|
||||
${BASIC_PLUGIN_BASE_LIBRARIES}
|
||||
${UI_LIBRARIES}
|
||||
)
|
||||
|
||||
add_dependencies(basic_plugin_filepicker
|
||||
${LLPLUGIN_LIBRARIES}
|
||||
${LLCOMMON_LIBRARIES}
|
||||
${BASIC_PLUGIN_BASE_LIBRARIES}
|
||||
)
|
||||
|
||||
if (WINDOWS)
|
||||
set_target_properties(
|
||||
basic_plugin_filepicker
|
||||
PROPERTIES
|
||||
LINK_FLAGS "/MANIFEST:NO"
|
||||
)
|
||||
endif (WINDOWS)
|
||||
|
||||
if (DARWIN)
|
||||
# Don't prepend 'lib' to the executable name, and don't embed a full path in the library's install name
|
||||
set_target_properties(
|
||||
basic_plugin_filepicker
|
||||
PROPERTIES
|
||||
PREFIX ""
|
||||
BUILD_WITH_INSTALL_RPATH 1
|
||||
INSTALL_NAME_DIR "@executable_path"
|
||||
LINK_FLAGS "-exported_symbols_list ${CMAKE_CURRENT_SOURCE_DIR}/../base_basic/basic_plugin_base.exp"
|
||||
)
|
||||
|
||||
endif (DARWIN)
|
||||
1414
indra/plugins/filepicker/llfilepicker.cpp
Normal file
1414
indra/plugins/filepicker/llfilepicker.cpp
Normal file
File diff suppressed because it is too large
Load Diff
231
indra/plugins/filepicker/llfilepicker.h
Normal file
231
indra/plugins/filepicker/llfilepicker.h
Normal file
@@ -0,0 +1,231 @@
|
||||
/**
|
||||
* @file llfilepicker.h
|
||||
* @brief OS-specific file picker
|
||||
*
|
||||
* $LicenseInfo:firstyear=2001&license=viewergpl$
|
||||
*
|
||||
* Copyright (c) 2001-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$
|
||||
*/
|
||||
|
||||
// OS specific file selection dialog. This is implemented as a
|
||||
// singleton class, so call the instance() method to get the working
|
||||
// instance. When you call getMultipleLoadFile(), it locks the picker
|
||||
// until you iterate to the end of the list of selected files with
|
||||
// getNextFile() or call reset().
|
||||
|
||||
#ifndef LL_LLFILEPICKER_H
|
||||
#define LL_LLFILEPICKER_H
|
||||
|
||||
#include "stdtypes.h"
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <map>
|
||||
|
||||
#if LL_DARWIN
|
||||
#include <Carbon/Carbon.h>
|
||||
|
||||
// AssertMacros.h does bad things.
|
||||
#undef verify
|
||||
#undef check
|
||||
#undef require
|
||||
|
||||
#include "llstring.h"
|
||||
|
||||
#endif
|
||||
|
||||
// Need commdlg.h for OPENFILENAMEA
|
||||
#ifdef LL_WINDOWS
|
||||
#include <commdlg.h>
|
||||
#endif
|
||||
|
||||
// mostly for Linux, possible on others
|
||||
#if LL_GTK
|
||||
# include "gtk/gtk.h"
|
||||
#endif // LL_GTK
|
||||
|
||||
// also mostly for Linux, for some X11-specific filepicker usability tweaks
|
||||
#if LL_X11
|
||||
#include "SDL/SDL_syswm.h"
|
||||
#endif
|
||||
|
||||
// This class is used as base class of a singleton and is therefore not
|
||||
// allowed to have any static members or static local variables!
|
||||
class LLFilePickerBase
|
||||
{
|
||||
public:
|
||||
enum ELoadFilter
|
||||
{
|
||||
FFLOAD_ALL = 1,
|
||||
FFLOAD_WAV = 2,
|
||||
FFLOAD_IMAGE = 3,
|
||||
FFLOAD_ANIM = 4,
|
||||
#ifdef _CORY_TESTING
|
||||
FFLOAD_GEOMETRY = 5,
|
||||
#endif
|
||||
FFLOAD_XML = 6,
|
||||
FFLOAD_SLOBJECT = 7,
|
||||
FFLOAD_RAW = 8,
|
||||
FFLOAD_TEXT = 9,
|
||||
};
|
||||
|
||||
enum ESaveFilter
|
||||
{
|
||||
FFSAVE_ALL = 1,
|
||||
FFSAVE_WAV = 3,
|
||||
FFSAVE_TGA = 4,
|
||||
FFSAVE_BMP = 5,
|
||||
FFSAVE_AVI = 6,
|
||||
FFSAVE_ANIM = 7,
|
||||
#ifdef _CORY_TESTING
|
||||
FFSAVE_GEOMETRY = 8,
|
||||
#endif
|
||||
FFSAVE_XML = 9,
|
||||
FFSAVE_COLLADA = 10,
|
||||
FFSAVE_RAW = 11,
|
||||
FFSAVE_J2C = 12,
|
||||
FFSAVE_PNG = 13,
|
||||
FFSAVE_JPEG = 14,
|
||||
FFSAVE_HPA = 15,
|
||||
FFSAVE_TEXT = 16,
|
||||
FFSAVE_LSL = 17
|
||||
};
|
||||
|
||||
// open the dialog. This is a modal operation
|
||||
bool getSaveFile(ESaveFilter filter, std::string const& filename, std::string const& folder);
|
||||
bool getLoadFile(ELoadFilter filter, std::string const& folder);
|
||||
bool getMultipleLoadFiles(ELoadFilter filter, std::string const& folder);
|
||||
|
||||
// Get the filename(s) found. getFirstFile() sets the pointer to
|
||||
// the start of the structure and allows the start of iteration.
|
||||
const std::string getFirstFile();
|
||||
|
||||
// getNextFile() increments the internal representation and
|
||||
// returns the next file specified by the user. Returns NULL when
|
||||
// no more files are left. Further calls to getNextFile() are
|
||||
// undefined.
|
||||
const std::string getNextFile();
|
||||
|
||||
// This utility function extracts the current file name without
|
||||
// doing any incrementing.
|
||||
const std::string getCurFile();
|
||||
|
||||
// Returns the index of the current file.
|
||||
S32 getCurFileNum() const { return mCurrentFile; }
|
||||
|
||||
S32 getFileCount() const { return (S32)mFiles.size(); }
|
||||
|
||||
// See llvfs/lldir.h : getBaseFileName and getDirName to extract base or directory names
|
||||
|
||||
// clear any lists of buffers or whatever, and make sure the file
|
||||
// picker isn't locked.
|
||||
void reset();
|
||||
|
||||
private:
|
||||
enum
|
||||
{
|
||||
SINGLE_FILENAME_BUFFER_SIZE = 1024,
|
||||
//FILENAME_BUFFER_SIZE = 65536
|
||||
FILENAME_BUFFER_SIZE = 65000
|
||||
};
|
||||
|
||||
#if LL_WINDOWS
|
||||
OPENFILENAMEW mOFN; // for open and save dialogs
|
||||
WCHAR mFilesW[FILENAME_BUFFER_SIZE];
|
||||
|
||||
public:
|
||||
void setWindowID(unsigned long window_id) { mOFN.hwndOwner = (HWND)window_id; }
|
||||
|
||||
private:
|
||||
bool setupFilter(ELoadFilter filter);
|
||||
#endif // LL_WINDOWS
|
||||
|
||||
#if LL_DARWIN
|
||||
NavDialogCreationOptions mNavOptions;
|
||||
std::vector<std::string> mFileVector;
|
||||
UInt32 mFileIndex;
|
||||
|
||||
OSStatus doNavChooseDialog(ELoadFilter filter);
|
||||
OSStatus doNavSaveDialog(ESaveFilter filter, const std::string& filename);
|
||||
void getFilePath(SInt32 index);
|
||||
void getFileName(SInt32 index);
|
||||
static Boolean navOpenFilterProc(AEDesc *theItem, void *info, void *callBackUD, NavFilterModes filterMode);
|
||||
#endif // LL_DARWIN
|
||||
|
||||
#if LL_GTK
|
||||
static void add_to_selectedfiles(gpointer data, gpointer user_data);
|
||||
static void chooser_responder(GtkWidget *widget, gint response, gpointer user_data);
|
||||
// we remember the last path that was accessed for a particular usage
|
||||
std::map <std::string, std::string> mContextToPathMap;
|
||||
std::string mCurContextName;
|
||||
#if LL_X11
|
||||
Window mX11WindowID;
|
||||
#endif
|
||||
|
||||
public:
|
||||
std::map <std::string, std::string>& get_ContextToPathMap(void) { return mContextToPathMap; }
|
||||
#if LL_X11
|
||||
void setWindowID(unsigned long window_id) { mX11WindowID = (Window)window_id; }
|
||||
#endif
|
||||
|
||||
#endif // LL_GTK
|
||||
#if !LL_WINDOWS && !(LL_GTK && LL_X11)
|
||||
void setWindowID(unsigned long window_id) { PLS_WARNS << "Calling unimplemented LLFilePickerBase::setWindowID" << PLS_ENDL; }
|
||||
#endif
|
||||
|
||||
private:
|
||||
std::vector<std::string> mFiles;
|
||||
S32 mCurrentFile;
|
||||
bool mLocked;
|
||||
bool mMultiFile;
|
||||
|
||||
protected:
|
||||
#if LL_GTK
|
||||
GtkWindow* buildFilePicker(bool is_save, bool is_folder, std::string const& folder);
|
||||
#endif
|
||||
|
||||
protected:
|
||||
LLFilePickerBase();
|
||||
};
|
||||
|
||||
// True singleton, private constructors (and no friends).
|
||||
class LLFilePicker : public LLFilePickerBase
|
||||
{
|
||||
public:
|
||||
// calling this before main() is undefined
|
||||
static LLFilePicker& instance( void ) { return sInstance; }
|
||||
|
||||
private:
|
||||
static LLFilePicker sInstance;
|
||||
|
||||
LLFilePicker() { }
|
||||
};
|
||||
|
||||
namespace translation
|
||||
{
|
||||
void add(std::string const& key, std::string const& translation);
|
||||
}
|
||||
|
||||
#endif
|
||||
Reference in New Issue
Block a user