Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge

Browse source
This commit is contained in:
dnk-88 2011-05-26 13:47:58 +03:00
parent 00da147524
commit 75d4eeadac
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
code/nel/tools/3d/object_viewer_qt/src/plugins/core/core_plugin.cpp
View file

@ -66,6 +66,7 @@ bool CorePlugin::initialize(ExtensionSystem::IPluginManager *pluginManager, QStr
generalSettings->applyGeneralSettings(); generalSettings->applyGeneralSettings();
searchPathPage->applySearchPaths(); searchPathPage->applySearchPaths();
recureseSearchPathPage->applySearchPaths();
addAutoReleasedObject(generalSettings); addAutoReleasedObject(generalSettings);
addAutoReleasedObject(searchPathPage); addAutoReleasedObject(searchPathPage);
addAutoReleasedObject(recureseSearchPathPage); addAutoReleasedObject(recureseSearchPathPage);

5
code/nel/tools/3d/object_viewer_qt/src/plugins/core/search_paths_settings_page.cpp
View file

@ -193,10 +193,11 @@ void CSearchPathsSettingsPage::writeSettings()
QSettings *settings = Core::ICore::instance()->settings(); QSettings *settings = Core::ICore::instance()->settings();
settings->beginGroup(Core::Constants::DATA_PATH_SECTION); settings->beginGroup(Core::Constants::DATA_PATH_SECTION);
if (m_recurse) if (m_recurse)
paths = settings->value(Core::Constants::RECURSIVE_SEARCH_PATHS).toStringList(); settings->setValue(Core::Constants::RECURSIVE_SEARCH_PATHS, paths);
else else
paths = settings->value(Core::Constants::SEARCH_PATHS).toStringList(); settings->setValue(Core::Constants::SEARCH_PATHS, paths);
settings->endGroup(); settings->endGroup();
settings->sync();
} }
void CSearchPathsSettingsPage::checkEnabledButton() void CSearchPathsSettingsPage::checkEnabledButton()