jni/src/gettext.cpp \
jni/src/guiChatConsole.cpp \
jni/src/guiEngine.cpp \
- jni/src/guiFileSelectMenu.cpp \
+ jni/src/guiPathSelectMenu.cpp \
jni/src/guiFormSpecMenu.cpp \
jni/src/guiKeyChangeMenu.cpp \
jni/src/guiPasswordChange.cpp \
return
end
- if setting_type == "path" then
+ if setting_type == "path" or setting_type == "filepath" then
local default = remaining_line:match("^(.*)$")
if not default then
table.insert(settings, {
name = name,
readable_name = readable_name,
- type = "path",
+ type = setting_type,
default = default,
comment = current_comment,
})
end
formspec = formspec .. ";" .. selected_index .. "]"
- elseif setting.type == "path" then
+ elseif setting.type == "path" or setting.type == "filepath" then
local current_value = dialogdata.selected_path
if not current_value then
current_value = get_current_value(setting)
end
formspec = formspec .. "field[0.5,4;7.5,1;te_setting_value;;"
.. core.formspec_escape(current_value) .. "]"
- .. "button[8,3.75;2,1;btn_browser_path;" .. fgettext("Browse") .. "]"
+ .. "button[8,3.75;2,1;btn_browser_" .. setting.type .. ";" .. fgettext("Browse") .. "]"
else
-- TODO: fancy input for float, int, flags, noise_params, v3f
end
if fields["btn_browser_path"] then
- core.show_file_open_dialog("dlg_browse_path", fgettext_ne("Select path"))
+ core.show_path_select_dialog("dlg_browse_path",
+ fgettext_ne("Select directory"), false)
+ end
+
+ if fields["btn_browser_filepath"] then
+ core.show_path_select_dialog("dlg_browse_path",
+ fgettext_ne("Select file"), true)
end
if fields["dlg_browse_path_accepted"] then
# - float
# - enum
# - path
+# - filepath
# - key (will be ignored in GUI, since a special key change dialog exists)
# - flags
# - noise_params
# - default value1,value2,...
# * path:
# - default (if default is not specified then "" is set)
+# * filepath:
+# - default (if default is not specified then "" is set)
# * key:
# - default
# * flags:
freetype (Freetype fonts) bool true
# Path to TrueTypeFont or bitmap.
-font_path (Font path) path fonts/liberationsans.ttf
+font_path (Font path) filepath fonts/liberationsans.ttf
font_size (Font size) int 16
# Font shadow alpha (opaqueness, between 0 and 255).
font_shadow_alpha (Font shadow alpha) int 127 0 255
-mono_font_path (Monospace font path) path fonts/liberationmono.ttf
+mono_font_path (Monospace font path) filepath fonts/liberationmono.ttf
mono_font_size (Monospace font size) int 15
# This font will be used for certain languages.
-fallback_font_path (Fallback font) path fonts/DroidSansFallbackFull.ttf
+fallback_font_path (Fallback font) filepath fonts/DroidSansFallbackFull.ttf
fallback_font_size (Fallback font size) int 15
fallback_font_shadow (Fallback font shadow) int 1
fallback_font_shadow_alpha (Fallback font shadow alpha) int 128 0 255
# freetype = true
# Path to TrueTypeFont or bitmap.
-# type: path
+# type: filepath
# font_path = fonts/liberationsans.ttf
# type: int
# type: int min: 0 max: 255
# font_shadow_alpha = 127
-# type: path
+# type: filepath
# mono_font_path = fonts/liberationmono.ttf
# type: int
# mono_font_size = 15
# This font will be used for certain languages.
-# type: path
+# type: filepath
# fallback_font_path = fonts/DroidSansFallbackFull.ttf
# type: int
game.cpp
guiChatConsole.cpp
guiEngine.cpp
- guiFileSelectMenu.cpp
+ guiPathSelectMenu.cpp
guiFormSpecMenu.cpp
guiKeyChangeMenu.cpp
guiPasswordChange.cpp
+++ /dev/null
-/*
- Minetest
- Copyright (C) 2013 sapier
-
- This program 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; either version 2.1 of the License, or
- (at your option) any later version.
-
- This program 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 program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "guiFileSelectMenu.h"
-
-GUIFileSelectMenu::GUIFileSelectMenu(gui::IGUIEnvironment* env,
- gui::IGUIElement* parent, s32 id, IMenuManager *menumgr,
- const std::string &title, const std::string &formname) :
- GUIModalMenu(env, parent, id, menumgr),
- m_title(utf8_to_wide(title)),
- m_accepted(false),
- m_text_dst(NULL),
- m_formname(formname)
-{
-}
-
-GUIFileSelectMenu::~GUIFileSelectMenu()
-{
- removeChildren();
- setlocale(LC_NUMERIC, "C");
-}
-
-void GUIFileSelectMenu::removeChildren()
-{
- const core::list<gui::IGUIElement*> &children = getChildren();
- core::list<gui::IGUIElement*> children_copy;
- for (core::list<gui::IGUIElement*>::ConstIterator i = children.begin(); i
- != children.end(); i++)
- {
- children_copy.push_back(*i);
- }
- for (core::list<gui::IGUIElement*>::Iterator i = children_copy.begin(); i
- != children_copy.end(); i++)
- {
- (*i)->remove();
- }
-}
-
-void GUIFileSelectMenu::regenerateGui(v2u32 screensize)
-{
- removeChildren();
- m_fileOpenDialog = 0;
-
- core::dimension2du size(600,400);
- core::rect < s32 > rect(0,0,screensize.X,screensize.Y);
-
- DesiredRect = rect;
- recalculateAbsolutePosition(false);
-
- m_fileOpenDialog =
- Environment->addFileOpenDialog(m_title.c_str(),false,this,-1);
-
- core::position2di pos = core::position2di(screensize.X/2 - size.Width/2,screensize.Y/2 -size.Height/2);
- m_fileOpenDialog->setRelativePosition(pos);
- m_fileOpenDialog->setMinSize(size);
-}
-
-void GUIFileSelectMenu::drawMenu()
-{
- gui::IGUISkin* skin = Environment->getSkin();
- if (!skin)
- return;
-
- gui::IGUIElement::draw();
-}
-
-void GUIFileSelectMenu::acceptInput() {
- if ((m_text_dst != 0) && (this->m_formname != "")){
- StringMap fields;
-
- if (m_accepted)
- fields[m_formname + "_accepted"] = wide_to_utf8(m_fileOpenDialog->getFileName());
- else
- fields[m_formname + "_canceled"] = m_formname;
-
- this->m_text_dst->gotText(fields);
- }
-}
-
-bool GUIFileSelectMenu::OnEvent(const SEvent& event)
-{
-
- if (event.EventType == irr::EET_GUI_EVENT) {
- switch (event.GUIEvent.EventType) {
- case gui::EGET_ELEMENT_CLOSED:
- case gui::EGET_FILE_CHOOSE_DIALOG_CANCELLED:
- m_accepted=false;
- acceptInput();
- quitMenu();
- return true;
- case gui::EGET_DIRECTORY_SELECTED:
- case gui::EGET_FILE_SELECTED:
- m_accepted=true;
- acceptInput();
- quitMenu();
- return true;
- default:
- //ignore this event
- break;
- }
- }
- return Parent ? Parent->OnEvent(event) : false;
-}
+++ /dev/null
-/*
- Minetest
- Copyright (C) 2013 sapier
-
- This program 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; either version 2.1 of the License, or
- (at your option) any later version.
-
- This program 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 program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef GUIFILESELECTMENU_H_
-#define GUIFILESELECTMENU_H_
-
-#include <string>
-
-#include "modalMenu.h"
-#include "IGUIFileOpenDialog.h"
-#include "guiFormSpecMenu.h" //required because of TextDest only !!!
-
-class GUIFileSelectMenu : public GUIModalMenu
-{
-public:
- GUIFileSelectMenu(gui::IGUIEnvironment *env, gui::IGUIElement *parent, s32 id,
- IMenuManager *menumgr, const std::string &title,
- const std::string &formid);
- ~GUIFileSelectMenu();
-
- void removeChildren();
-
- /*
- Remove and re-add (or reposition) stuff
- */
- void regenerateGui(v2u32 screensize);
-
- void drawMenu();
-
- bool OnEvent(const SEvent &event);
-
- void setTextDest(TextDest *dest) { m_text_dst = dest; }
-
-private:
- void acceptInput();
-
- std::wstring m_title;
- bool m_accepted;
-
- gui::IGUIFileOpenDialog *m_fileOpenDialog;
-
- TextDest *m_text_dst;
-
- std::string m_formname;
-};
-
-#endif /* GUIFILESELECTMENU_H_ */
--- /dev/null
+/*
+ Minetest
+ Copyright (C) 2013 sapier
+
+ This program 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; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ This program 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 program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "guiPathSelectMenu.h"
+
+GUIFileSelectMenu::GUIFileSelectMenu(gui::IGUIEnvironment* env,
+ gui::IGUIElement* parent, s32 id, IMenuManager *menumgr,
+ const std::string &title, const std::string &formname,
+ bool is_file_select) :
+ GUIModalMenu(env, parent, id, menumgr),
+ m_title(utf8_to_wide(title)),
+ m_accepted(false),
+ m_text_dst(NULL),
+ m_formname(formname),
+ m_file_select_dialog(is_file_select)
+{
+}
+
+GUIFileSelectMenu::~GUIFileSelectMenu()
+{
+ removeChildren();
+ setlocale(LC_NUMERIC, "C");
+}
+
+void GUIFileSelectMenu::regenerateGui(v2u32 screensize)
+{
+ removeChildren();
+ m_fileOpenDialog = 0;
+
+ core::dimension2du size(600, 400);
+ core::rect<s32> rect(0, 0, screensize.X, screensize.Y);
+
+ DesiredRect = rect;
+ recalculateAbsolutePosition(false);
+
+ m_fileOpenDialog =
+ Environment->addFileOpenDialog(m_title.c_str(), false, this, -1);
+
+ core::position2di pos = core::position2di(screensize.X / 2 - size.Width / 2,
+ screensize.Y / 2 - size.Height / 2);
+ m_fileOpenDialog->setRelativePosition(pos);
+ m_fileOpenDialog->setMinSize(size);
+}
+
+void GUIFileSelectMenu::drawMenu()
+{
+ gui::IGUISkin *skin = Environment->getSkin();
+ if (!skin)
+ return;
+
+ gui::IGUIElement::draw();
+}
+
+void GUIFileSelectMenu::acceptInput()
+{
+ if ((m_text_dst != 0) && (this->m_formname != "")) {
+ StringMap fields;
+ if (m_accepted) {
+ std::string path;
+ if (!m_file_select_dialog) {
+ core::string<fschar_t> string =
+ m_fileOpenDialog->getDirectoryName();
+ path = std::string(string.c_str());
+ } else {
+ path = wide_to_utf8(m_fileOpenDialog->getFileName());
+ }
+ fields[m_formname + "_accepted"] = path;
+ } else {
+ fields[m_formname + "_canceled"] = m_formname;
+ }
+ this->m_text_dst->gotText(fields);
+ }
+ quitMenu();
+}
+
+bool GUIFileSelectMenu::OnEvent(const SEvent &event)
+{
+ if (event.EventType == irr::EET_GUI_EVENT) {
+ switch (event.GUIEvent.EventType) {
+ case gui::EGET_ELEMENT_CLOSED:
+ case gui::EGET_FILE_CHOOSE_DIALOG_CANCELLED:
+ m_accepted = false;
+ acceptInput();
+ return true;
+ case gui::EGET_DIRECTORY_SELECTED:
+ m_accepted = !m_file_select_dialog;
+ acceptInput();
+ return true;
+ case gui::EGET_FILE_SELECTED:
+ m_accepted = m_file_select_dialog;
+ acceptInput();
+ return true;
+ default:
+ // ignore this event
+ break;
+ }
+ }
+ return Parent ? Parent->OnEvent(event) : false;
+}
--- /dev/null
+/*
+ Minetest
+ Copyright (C) 2013 sapier
+
+ This program 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; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ This program 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 program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef GUIFILESELECTMENU_H_
+#define GUIFILESELECTMENU_H_
+
+#include <string>
+
+#include "modalMenu.h"
+#include "IGUIFileOpenDialog.h"
+#include "guiFormSpecMenu.h" //required because of TextDest only !!!
+
+class GUIFileSelectMenu : public GUIModalMenu
+{
+public:
+ GUIFileSelectMenu(gui::IGUIEnvironment *env, gui::IGUIElement *parent, s32 id,
+ IMenuManager *menumgr, const std::string &title,
+ const std::string &formid, bool is_file_select);
+ ~GUIFileSelectMenu();
+
+ /*
+ Remove and re-add (or reposition) stuff
+ */
+ void regenerateGui(v2u32 screensize);
+
+ void drawMenu();
+
+ bool OnEvent(const SEvent &event);
+
+ void setTextDest(TextDest *dest) { m_text_dst = dest; }
+
+private:
+ void acceptInput();
+
+ std::wstring m_title;
+ bool m_accepted;
+
+ gui::IGUIFileOpenDialog *m_fileOpenDialog;
+
+ TextDest *m_text_dst;
+
+ std::string m_formname;
+ bool m_file_select_dialog;
+};
+
+#endif /* GUIFILESELECTMENU_H_ */
#include "guiEngine.h"
#include "guiMainMenu.h"
#include "guiKeyChangeMenu.h"
-#include "guiFileSelectMenu.h"
+#include "guiPathSelectMenu.h"
#include "subgame.h"
#include "version.h"
#include "porting.h"
}
/******************************************************************************/
-int ModApiMainMenu::l_show_file_open_dialog(lua_State *L)
+int ModApiMainMenu::l_show_path_select_dialog(lua_State *L)
{
GUIEngine* engine = getGuiEngine(L);
sanity_check(engine != NULL);
const char *formname= luaL_checkstring(L, 1);
const char *title = luaL_checkstring(L, 2);
+ bool is_file_select = lua_toboolean(L, 3);
GUIFileSelectMenu* fileOpenMenu =
new GUIFileSelectMenu(engine->m_device->getGUIEnvironment(),
-1,
engine->m_menumanager,
title,
- formname);
+ formname,
+ is_file_select);
fileOpenMenu->setTextDest(engine->m_buttonhandler);
fileOpenMenu->drop();
return 0;
API_FCT(copy_dir);
API_FCT(extract_zip);
API_FCT(get_mainmenu_path);
- API_FCT(show_file_open_dialog);
+ API_FCT(show_path_select_dialog);
API_FCT(download_file);
API_FCT(get_modstore_details);
API_FCT(get_modstore_list);
static int l_show_keys_menu(lua_State *L);
- static int l_show_file_open_dialog(lua_State *L);
+ static int l_show_path_select_dialog(lua_State *L);
static int l_set_topleft_text(lua_State *L);
src/guiChatConsole.h
src/guiEngine.cpp
src/guiEngine.h
-src/guiFileSelectMenu.cpp
+src/guiPathSelectMenu.cpp
+src/guiPathSelectMenu.h
src/guiFormSpecMenu.cpp
src/guiFormSpecMenu.h
src/guiKeyChangeMenu.cpp
projects / oweals / minetest.git / commitdiff