mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-01 12:09:50 +00:00
Code Issues Releases Wiki Activity

Revert from settings description to searchHints

Browse source
This commit is contained in:
uramer 2022-02-01 19:20:47 +01:00
parent 7f796d148e
commit ef1e72dc17
5 changed files with 4 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
apps/openmw/mwgui/settingswindow.cpp
View file

@ -244,7 +244,6 @@ namespace MWGui
getWidget(mScriptView, "ScriptView"); getWidget(mScriptView, "ScriptView");
getWidget(mScriptAdapter, "ScriptAdapter"); getWidget(mScriptAdapter, "ScriptAdapter");
getWidget(mScriptDisabled, "ScriptDisabled"); getWidget(mScriptDisabled, "ScriptDisabled");
getWidget(mScriptDescription, "ScriptDescription");
#ifndef WIN32 #ifndef WIN32
// hide gamma controls since it currently does not work under Linux // hide gamma controls since it currently does not work under Linux
@ -333,7 +332,6 @@ namespace MWGui
mScriptFilter->eventEditTextChange += MyGUI::newDelegate(this, &SettingsWindow::onScriptFilterChange); mScriptFilter->eventEditTextChange += MyGUI::newDelegate(this, &SettingsWindow::onScriptFilterChange);
mScriptList->eventListMouseItemActivate += MyGUI::newDelegate(this, &SettingsWindow::onScriptListSelection); mScriptList->eventListMouseItemActivate += MyGUI::newDelegate(this, &SettingsWindow::onScriptListSelection);
mScriptList->eventListMouseItemFocus += MyGUI::newDelegate(this, &SettingsWindow::onScriptListFocus);
} }
void SettingsWindow::onTabChanged(MyGUI::TabControl* /*_sender*/, size_t /*index*/) void SettingsWindow::onTabChanged(MyGUI::TabControl* /*_sender*/, size_t /*index*/)
@ -780,7 +778,7 @@ namespace MWGui
{ {
LuaUi::ScriptSettingsPage page = LuaUi::scriptSettingsPageAt(i); LuaUi::ScriptSettingsPage page = LuaUi::scriptSettingsPageAt(i);
int nameSearch = 2 * weightedSearch(searchRegex, page.mName); int nameSearch = 2 * weightedSearch(searchRegex, page.mName);
int descriptionSearch = weightedSearch(searchRegex, page.mDescription); int descriptionSearch = weightedSearch(searchRegex, page.mSearchHints);
int search = nameSearch + descriptionSearch; int search = nameSearch + descriptionSearch;
if (search > 0) if (search > 0)
weightedPages.push_back({ i, page, search }); weightedPages.push_back({ i, page, search });
@ -820,21 +818,6 @@ namespace MWGui
mScriptView->setCanvasSize(canvasSize); mScriptView->setCanvasSize(canvasSize);
} }
void SettingsWindow::onScriptListFocus(MyGUI::ListBox*, size_t index)
{
if (index >= mScriptList->getItemCount())
{
mScriptDescription->setVisible(false);
mScriptView->setVisible(true);
}
else {
size_t page = *mScriptList->getItemDataAt<size_t>(index);
mScriptDescription->setCaption(LuaUi::scriptSettingsPageAt(page).mDescription);
mScriptDescription->setVisible(true);
mScriptView->setVisible(false);
}
}
void SettingsWindow::onRebindAction(MyGUI::Widget* _sender) void SettingsWindow::onRebindAction(MyGUI::Widget* _sender)
{ {
int actionId = *_sender->getUserData<int>(); int actionId = *_sender->getUserData<int>();

2
apps/openmw/mwgui/settingswindow.hpp
View file

@ -52,7 +52,6 @@ namespace MWGui
MyGUI::ScrollView* mScriptView; MyGUI::ScrollView* mScriptView;
LuaUi::LuaAdapter* mScriptAdapter; LuaUi::LuaAdapter* mScriptAdapter;
MyGUI::EditBox* mScriptDisabled; MyGUI::EditBox* mScriptDisabled;
MyGUI::EditBox* mScriptDescription;
int mCurrentPage; int mCurrentPage;
void onTabChanged(MyGUI::TabControl* _sender, size_t index); void onTabChanged(MyGUI::TabControl* _sender, size_t index);
@ -84,7 +83,6 @@ namespace MWGui
void onScriptFilterChange(MyGUI::EditBox*); void onScriptFilterChange(MyGUI::EditBox*);
void onScriptListSelection(MyGUI::ListBox*, size_t index); void onScriptListSelection(MyGUI::ListBox*, size_t index);
void onScriptListFocus(MyGUI::ListBox*, size_t index);
void apply(); void apply();

4
components/lua_ui/scriptsettings.cpp
View file

@ -15,14 +15,14 @@ namespace LuaUi
ScriptSettingsPage parse(const sol::table& options) ScriptSettingsPage parse(const sol::table& options)
{ {
auto name = options.get_or("name", std::string()); auto name = options.get_or("name", std::string());
auto description = options.get_or("description", std::string()); auto searchHints = options.get_or("searchHints", std::string());
auto element = options.get_or<std::shared_ptr<LuaUi::Element>>("element", nullptr); auto element = options.get_or<std::shared_ptr<LuaUi::Element>>("element", nullptr);
if (name.empty()) if (name.empty())
Log(Debug::Warning) << "A script settings page has an empty name"; Log(Debug::Warning) << "A script settings page has an empty name";
if (!element.get()) if (!element.get())
Log(Debug::Warning) << "A script settings page has no UI element assigned"; Log(Debug::Warning) << "A script settings page has no UI element assigned";
return { return {
name, description, element name, searchHints, element
}; };
} }
} }

2
components/lua_ui/scriptsettings.hpp
View file

@ -14,7 +14,7 @@ namespace LuaUi
struct ScriptSettingsPage struct ScriptSettingsPage
{ {
std::string mName; std::string mName;
std::string mDescription; std::string mSearchHints;
std::shared_ptr<Element> mElement; std::shared_ptr<Element> mElement;
}; };
size_t scriptSettingsPageCount(); size_t scriptSettingsPageCount();

8
files/mygui/openmw_settings_window.layout
View file

@ -666,14 +666,6 @@
<Property key="CanvasSize" value="246 246"/> <Property key="CanvasSize" value="246 246"/>
<Widget name="ScriptAdapter" type="LuaAdapter" position="0 0 246 246"/> <Widget name="ScriptAdapter" type="LuaAdapter" position="0 0 246 246"/>
</Widget> </Widget>
<Widget name="ScriptDescription" type = "EditBox" skin="SandText" position="2 2 246 246" align="Stretch">
<Property key="Visible" value="false"/>
<Property key="Caption" value="Scripts settings are only available when a game is loaded."/>
<Property key="TextAlign" value="Center" />
<Property key="MultiLine" value="true" />
<Property key="WordWrap" value="true" />
<Property key="Static" value="true"/>
</Widget>
</Widget> </Widget>
<Widget name="ScriptDisabled" type="EditBox" skin="SandText" position="0 0 360 308" align="Center"> <Widget name="ScriptDisabled" type="EditBox" skin="SandText" position="0 0 360 308" align="Center">
<Property key="Visible" value="false"/> <Property key="Visible" value="false"/>