livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tag FS-specific code

Ansariel 2018-06-23 02:35:17 +02:00
parent f66f8cb37f
commit 27441aca1e
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/llfilepicker.cpp
View File

@ -1090,6 +1090,8 @@ void LLFilePicker::chooser_responder(GtkWidget *widget, gint response, gpointer
const char* cur_folder = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(widget));
if (cur_folder != NULL)
{
// <FS> FIRE-14924: Remember last used directory
//picker->mContextToPathMap[picker->mCurContextName] = cur_folder;
if (picker->mCurContextName == "openfile")
{
gSavedSettings.setString("FSFilePickerOpenDirectory", cur_folder);
@ -1098,6 +1100,7 @@ void LLFilePicker::chooser_responder(GtkWidget *widget, gint response, gpointer
{
gSavedSettings.setString("FSFilePickerSaveDirectory", cur_folder);
}
// </FS>
}
gtk_widget_destroy(widget);
@ -1135,6 +1138,15 @@ GtkWindow* LLFilePicker::buildFilePicker(bool is_save, bool is_folder, std::stri
// get the default path for this usage context if it's been
// seen before.
// <FS> FIRE-14924: Remember last used directory
//std::map<std::string,std::string>::iterator
// this_path = mContextToPathMap.find(context);
//if (this_path != mContextToPathMap.end())
//{
// gtk_file_chooser_set_current_folder
// (GTK_FILE_CHOOSER(win),
// this_path->second.c_str());
//}
std::string this_path = "";
if (context == "openfile")
@ -1152,6 +1164,7 @@ GtkWindow* LLFilePicker::buildFilePicker(bool is_save, bool is_folder, std::stri
(GTK_FILE_CHOOSER(win),
this_path.c_str());
}
// </FS>
# if LL_X11
// Make GTK tell the window manager to associate this

2
indra/newview/llfilepicker.h
View File

@ -181,6 +181,8 @@ private:
#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; // <FS> FIRE-14924: Remember last used directory
std::string mCurContextName;
// we also remember the extension of the last added file.
std::string mCurrentExtension;