From dab8b328c4e1a3dc449da9431269d4d34beee459 Mon Sep 17 00:00:00 2001 From: MAtahualpa Date: Thu, 16 Feb 2017 12:48:47 +0100 Subject: [PATCH 1/6] Replace light emitter check boxes with a combo box (fixes #3752) Replaces the four emitter check boxes in Light records with an "Emitter Type" combo box. Related issue: - Fixes #3752: Editor: Replace emitter check boxes in Light records with "Emitter Type" combo box (https://bugs.openmw.org/issues/3752) Tests: The changes were successfully tested in OpenMW-CS by manipulating several Light records. Please note that this fix also prevents users from erroneously assigning two or more emitter types at the same time. (I don't know which one would prevail in that case.) --- apps/opencs/model/world/columnbase.hpp | 1 + apps/opencs/model/world/columns.cpp | 12 +++++--- apps/opencs/model/world/columns.hpp | 6 ++-- apps/opencs/model/world/refidadapterimp.cpp | 34 +++++++++++++++++++++ apps/opencs/model/world/refidadapterimp.hpp | 1 + apps/opencs/model/world/refidcollection.cpp | 7 ++--- apps/opencs/view/doc/viewmanager.cpp | 3 +- 7 files changed, 51 insertions(+), 13 deletions(-) diff --git a/apps/opencs/model/world/columnbase.hpp b/apps/opencs/model/world/columnbase.hpp index 19028de08..a4763bc77 100644 --- a/apps/opencs/model/world/columnbase.hpp +++ b/apps/opencs/model/world/columnbase.hpp @@ -133,6 +133,7 @@ namespace CSMWorld Display_LongString256, Display_BookType, Display_BloodType, + Display_EmitterType, Display_EffectSkill, // must display at least one, unlike Display_Skill Display_EffectAttribute, // must display at least one, unlike Display_Attribute diff --git a/apps/opencs/model/world/columns.cpp b/apps/opencs/model/world/columns.cpp index 534d7da05..32275e8b1 100644 --- a/apps/opencs/model/world/columns.cpp +++ b/apps/opencs/model/world/columns.cpp @@ -123,10 +123,8 @@ namespace CSMWorld { ColumnId_Dynamic, "Dynamic" }, { ColumnId_Portable, "Portable" }, { ColumnId_NegativeLight, "Negative Light" }, - { ColumnId_Flickering, "Flickering" }, - { ColumnId_SlowFlickering, "Slow Flickering" }, - { ColumnId_Pulsing, "Pulsing" }, - { ColumnId_SlowPulsing, "Slow Pulsing" }, + { ColumnId_EmitterType, "Emitter Type" }, + { ColumnId_Fire, "Fire" }, { ColumnId_OffByDefault, "Off by default" }, { ColumnId_IsKey, "Is Key" }, @@ -563,6 +561,11 @@ namespace "Default (Red)", "Skeleton Blood (White)", "Metal Blood (Golden)", 0 }; + static const char *sEmitterType[] = + { + "", "Flickering", "Flickering (Slow)", "Pulsing", "Pulsing (Slow)", 0 + }; + const char **getEnumNames (CSMWorld::Columns::ColumnId column) { switch (column) @@ -594,6 +597,7 @@ namespace case CSMWorld::Columns::ColumnId_InfoCondComp: return CSMWorld::ConstInfoSelectWrapper::RelationEnumStrings; case CSMWorld::Columns::ColumnId_BookType: return sBookType; case CSMWorld::Columns::ColumnId_BloodType: return sBloodType; + case CSMWorld::Columns::ColumnId_EmitterType: return sEmitterType; default: return 0; } diff --git a/apps/opencs/model/world/columns.hpp b/apps/opencs/model/world/columns.hpp index 2438d2de2..5f95d8696 100644 --- a/apps/opencs/model/world/columns.hpp +++ b/apps/opencs/model/world/columns.hpp @@ -118,10 +118,8 @@ namespace CSMWorld ColumnId_Dynamic = 103, ColumnId_Portable = 104, ColumnId_NegativeLight = 105, - ColumnId_Flickering = 106, - ColumnId_SlowFlickering = 107, - ColumnId_Pulsing = 108, - ColumnId_SlowPulsing = 109, + ColumnId_EmitterType = 106, + // unused (3x) ColumnId_Fire = 110, ColumnId_OffByDefault = 111, ColumnId_IsKey = 112, diff --git a/apps/opencs/model/world/refidadapterimp.cpp b/apps/opencs/model/world/refidadapterimp.cpp index b80f1ac2f..1fc05e187 100644 --- a/apps/opencs/model/world/refidadapterimp.cpp +++ b/apps/opencs/model/world/refidadapterimp.cpp @@ -628,6 +628,25 @@ QVariant CSMWorld::LightRefIdAdapter::getData (const RefIdColumn *column, const if (column==mColumns.mSound) return QString::fromUtf8 (record.get().mSound.c_str()); + if (column == mColumns.mEmitterType) + { + int mask = ESM::Light::Flicker | ESM::Light::FlickerSlow | ESM::Light::Pulse | ESM::Light::PulseSlow; + + if ((record.get().mData.mFlags & mask) == ESM::Light::Flicker) + return 1; + + if ((record.get().mData.mFlags & mask) == ESM::Light::FlickerSlow) + return 2; + + if ((record.get().mData.mFlags & mask) == ESM::Light::Pulse) + return 3; + + if ((record.get().mData.mFlags & mask) == ESM::Light::PulseSlow) + return 4; + + return 0; + } + std::map::const_iterator iter = mColumns.mFlags.find (column); @@ -653,6 +672,21 @@ void CSMWorld::LightRefIdAdapter::setData (const RefIdColumn *column, RefIdData& light.mData.mColor = value.toInt(); else if (column==mColumns.mSound) light.mSound = value.toString().toUtf8().constData(); + else if (column == mColumns.mEmitterType) + { + int mask = ~(ESM::Light::Flicker | ESM::Light::FlickerSlow | ESM::Light::Pulse | ESM::Light::PulseSlow); + + if (value.toInt() == 0) + light.mData.mFlags = light.mData.mFlags & mask; + else if (value.toInt() == 1) + light.mData.mFlags = (light.mData.mFlags & mask) | ESM::Light::Flicker; + else if (value.toInt() == 2) + light.mData.mFlags = (light.mData.mFlags & mask) | ESM::Light::FlickerSlow; + else if (value.toInt() == 3) + light.mData.mFlags = (light.mData.mFlags & mask) | ESM::Light::Pulse; + else + light.mData.mFlags = (light.mData.mFlags & mask) | ESM::Light::PulseSlow; + } else { std::map::const_iterator iter = diff --git a/apps/opencs/model/world/refidadapterimp.hpp b/apps/opencs/model/world/refidadapterimp.hpp index b89b87ab1..121183266 100644 --- a/apps/opencs/model/world/refidadapterimp.hpp +++ b/apps/opencs/model/world/refidadapterimp.hpp @@ -802,6 +802,7 @@ namespace CSMWorld const RefIdColumn *mRadius; const RefIdColumn *mColor; const RefIdColumn *mSound; + const RefIdColumn *mEmitterType; std::map mFlags; LightColumns (const InventoryColumns& columns); diff --git a/apps/opencs/model/world/refidcollection.cpp b/apps/opencs/model/world/refidcollection.cpp index a85ee5d25..0f3164fb6 100644 --- a/apps/opencs/model/world/refidcollection.cpp +++ b/apps/opencs/model/world/refidcollection.cpp @@ -443,6 +443,9 @@ CSMWorld::RefIdCollection::RefIdCollection() mColumns.push_back (RefIdColumn (Columns::ColumnId_Sound, ColumnBase::Display_Sound)); lightColumns.mSound = &mColumns.back(); + mColumns.push_back(RefIdColumn(Columns::ColumnId_EmitterType, ColumnBase::Display_EmitterType)); + lightColumns.mEmitterType = &mColumns.back(); + static const struct { int mName; @@ -452,10 +455,6 @@ CSMWorld::RefIdCollection::RefIdCollection() { Columns::ColumnId_Dynamic, ESM::Light::Dynamic }, { Columns::ColumnId_Portable, ESM::Light::Carry }, { Columns::ColumnId_NegativeLight, ESM::Light::Negative }, - { Columns::ColumnId_Flickering, ESM::Light::Flicker }, - { Columns::ColumnId_SlowFlickering, ESM::Light::FlickerSlow }, - { Columns::ColumnId_Pulsing, ESM::Light::Pulse }, - { Columns::ColumnId_SlowPulsing, ESM::Light::PulseSlow }, { Columns::ColumnId_Fire, ESM::Light::Fire }, { Columns::ColumnId_OffByDefault, ESM::Light::OffDefault }, { -1, 0 } diff --git a/apps/opencs/view/doc/viewmanager.cpp b/apps/opencs/view/doc/viewmanager.cpp index b3a8d03d4..d3116f3ac 100644 --- a/apps/opencs/view/doc/viewmanager.cpp +++ b/apps/opencs/view/doc/viewmanager.cpp @@ -108,7 +108,8 @@ CSVDoc::ViewManager::ViewManager (CSMDoc::DocumentManager& documentManager) { CSMWorld::ColumnBase::Display_EffectSkill, CSMWorld::Columns::ColumnId_Skill, false }, { CSMWorld::ColumnBase::Display_EffectAttribute, CSMWorld::Columns::ColumnId_Attribute, false }, { CSMWorld::ColumnBase::Display_BookType, CSMWorld::Columns::ColumnId_BookType, false}, - { CSMWorld::ColumnBase::Display_BloodType, CSMWorld::Columns::ColumnId_BloodType, false} + { CSMWorld::ColumnBase::Display_BloodType, CSMWorld::Columns::ColumnId_BloodType, false}, + { CSMWorld::ColumnBase::Display_EmitterType, CSMWorld::Columns::ColumnId_EmitterType, false} }; for (std::size_t i=0; i Date: Thu, 16 Feb 2017 19:43:10 +0900 Subject: [PATCH 2/6] Fix Clang and OS X Travis CI warnings --- apps/openmw/mwrender/animation.cpp | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp index ec28d4295..30d3a049e 100644 --- a/apps/openmw/mwrender/animation.cpp +++ b/apps/openmw/mwrender/animation.cpp @@ -179,15 +179,6 @@ namespace { } - virtual void apply(osg::Group& node) - { - traverse(node); - } - virtual void apply(osg::MatrixTransform& node) - { - traverse(node); - } - void remove() { for (RemoveVec::iterator it = mToRemove.begin(); it != mToRemove.end(); ++it) @@ -209,6 +200,15 @@ namespace applyImpl(drw); } + virtual void apply(osg::Group& node) + { + traverse(node); + } + virtual void apply(osg::MatrixTransform& node) + { + traverse(node); + } + void applyImpl(osg::Node& node) { osg::NodePath::iterator parent = getNodePath().end()-2; @@ -240,6 +240,15 @@ namespace applyImpl(drw); } + virtual void apply(osg::Group& node) + { + traverse(node); + } + virtual void apply(osg::MatrixTransform& node) + { + traverse(node); + } + void applyImpl(osg::Node& node) { const std::string toFind = "tri bip"; From fb2618fe7bee571e3a9ec1cc8f4289b384cfc901 Mon Sep 17 00:00:00 2001 From: MAtahualpa Date: Thu, 16 Feb 2017 22:05:15 +0100 Subject: [PATCH 3/6] Update request for AUTHORS.md If you don't mind, please update our credits file with the following changes. (Sorted the name entries in the PR section along the way.) --- AUTHORS.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index 5d714fded..432b3ee1c 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -90,7 +90,7 @@ Programmers Mark Siewert (mark76) Marco Melletti (mellotanica) Marco Schulze - MAtahualpa + Martin Otto (MAtahualpa) Mateusz Kołaczek (PL_kolek) Mateusz Malisz (malice) megaton @@ -170,14 +170,15 @@ Public Relations and Translations --------------------------------- Artem Kotsynyak (greye) - Russian News Writer + Dawid Lakomy (Vedyimyn) - Polish News Writer Jim Clauwaert (Zedd) - Public Outreach Julien Voisin (jvoisin/ap0) - French News Writer - Tom Koenderink (Okulo) - English News Writer Lukasz Gromanowski (lgro) - English News Writer + Martin Otto (Atahualpa) - Podcaster, Public Outreach, German Translator Mickey Lyle (raevol) - Release Manager Pithorn - Chinese News Writer sir_herrbatka - Polish News Writer - Dawid Lakomy (Vedyimyn) - Polish News Writer + Tom Koenderink (Okulo) - English News Writer Website ------- From a39b593b9b2e672209c27ece2205deac41d080a1 Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Thu, 16 Feb 2017 22:54:45 +0100 Subject: [PATCH 4/6] add beginning of openmw-cs docs --- docs/source/conf.py | 15 +++++++-- docs/source/source/index.rst | 3 +- docs/source/source/opencs/index.rst | 11 ++++++ docs/source/source/opencs/model/index.rst | 41 +++++++++++++++++++++++ docs/source/source/opencs/view/index.rst | 2 ++ 5 files changed, 69 insertions(+), 3 deletions(-) create mode 100644 docs/source/source/opencs/index.rst create mode 100644 docs/source/source/opencs/model/index.rst create mode 100644 docs/source/source/opencs/view/index.rst diff --git a/docs/source/conf.py b/docs/source/conf.py index 63016d53a..273b2f7d5 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -55,12 +55,23 @@ openmw_sub_dirs = os.walk(openmw_path).next()[1] openmw_headers = insensitive_glob(os.path.join(openmw_path, "*.hpp")) for dir in openmw_sub_dirs: openmw_headers += insensitive_glob(os.path.join(openmw_path, dir, "*.hpp")) - # massage the headers to get the relative path needed openmw_headers = [os.path.relpath(x, openmw_path) for x in openmw_headers] +opencs_path = os.path.join(project_root, "apps", "opencs") +opencs_sub_dirs = os.walk(opencs_path).next()[1] +opencs_headers = insensitive_glob(os.path.join(opencs_path, "*.hpp")) +opencs_sub_sub_dirs = [] +for dir in opencs_sub_dirs: + opencs_headers += insensitive_glob(os.path.join(opencs_path, dir, "*.hpp")) + opencs_sub_sub_dirs += os.walk(os.path.join(opencs_path, dir)).next()[1] + for sub_dir in opencs_sub_sub_dirs: + opencs_headers += insensitive_glob(os.path.join(opencs_path, dir, sub_dir, "*.hpp")) +opencs_headers = [os.path.relpath(x, opencs_path) for x in opencs_headers] + breathe_projects_source = { - "openmw": (openmw_path, openmw_headers) + "openmw": (openmw_path, openmw_headers), + "opencs": (opencs_path, opencs_headers), } # Add any paths that contain templates here, relative to this directory. diff --git a/docs/source/source/index.rst b/docs/source/source/index.rst index 36ac318fd..b58bf2b37 100644 --- a/docs/source/source/index.rst +++ b/docs/source/source/index.rst @@ -4,4 +4,5 @@ Project Source Documentation .. toctree:: :maxdepth: 2 - openmw/index \ No newline at end of file + openmw/index + opencs/index \ No newline at end of file diff --git a/docs/source/source/opencs/index.rst b/docs/source/source/opencs/index.rst new file mode 100644 index 000000000..b648bc49c --- /dev/null +++ b/docs/source/source/opencs/index.rst @@ -0,0 +1,11 @@ +OpenMW-CS Source Documentation +############################## + +.. toctree:: + :maxdepth: 2 + + model/index + view/index + +.. autodoxygenfile:: editor.hpp + :project: opencs \ No newline at end of file diff --git a/docs/source/source/opencs/model/index.rst b/docs/source/source/opencs/model/index.rst new file mode 100644 index 000000000..7cabf8c01 --- /dev/null +++ b/docs/source/source/opencs/model/index.rst @@ -0,0 +1,41 @@ +./opencs/model +############## + +.. autodoxygenfile:: model/doc/blacklist.hpp + :project: opencs + +.. autodoxygenfile:: model/doc/document.hpp + :project: opencs + +.. autodoxygenfile:: model/doc/documentmanager.hpp + :project: opencs + +.. autodoxygenfile:: model/doc/loader.hpp + :project: opencs + +.. autodoxygenfile:: model/doc/messages.hpp + :project: opencs + +.. autodoxygenfile:: model/doc/operationholder.hpp + :project: opencs + +.. autodoxygenfile:: model/doc/operation.hpp + :project: opencs + +.. autodoxygenfile:: model/doc/runner.hpp + :project: opencs + +.. autodoxygenfile:: model/doc/saving.hpp + :project: opencs + +.. autodoxygenfile:: model/doc/savingstages.hpp + :project: opencs + +.. autodoxygenfile:: model/doc/savingstate.hpp + :project: opencs + +.. autodoxygenfile:: model/doc/stage.hpp + :project: opencs + +.. autodoxygenfile:: model/doc/state.hpp + :project: opencs diff --git a/docs/source/source/opencs/view/index.rst b/docs/source/source/opencs/view/index.rst new file mode 100644 index 000000000..f53457671 --- /dev/null +++ b/docs/source/source/opencs/view/index.rst @@ -0,0 +1,2 @@ +./opencs/view +############# \ No newline at end of file From a4372b6c5fa0e8c71953029d7023b91a09783698 Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Fri, 17 Feb 2017 11:51:11 +0100 Subject: [PATCH 5/6] get openmw-cs model covered --- docs/source/source/opencs/model/index.rst | 369 ++++++++++++++++++++-- 1 file changed, 343 insertions(+), 26 deletions(-) diff --git a/docs/source/source/opencs/model/index.rst b/docs/source/source/opencs/model/index.rst index 7cabf8c01..38ca0c31c 100644 --- a/docs/source/source/opencs/model/index.rst +++ b/docs/source/source/opencs/model/index.rst @@ -1,41 +1,358 @@ ./opencs/model ############## -.. autodoxygenfile:: model/doc/blacklist.hpp - :project: opencs +doc +--- + .. autodoxygenfile:: model/doc/blacklist.hpp + :project: opencs -.. autodoxygenfile:: model/doc/document.hpp - :project: opencs + .. autodoxygenfile:: model/doc/document.hpp + :project: opencs -.. autodoxygenfile:: model/doc/documentmanager.hpp - :project: opencs + .. autodoxygenfile:: model/doc/documentmanager.hpp + :project: opencs -.. autodoxygenfile:: model/doc/loader.hpp - :project: opencs + .. autodoxygenfile:: model/doc/loader.hpp + :project: opencs -.. autodoxygenfile:: model/doc/messages.hpp - :project: opencs + .. autodoxygenfile:: model/doc/messages.hpp + :project: opencs -.. autodoxygenfile:: model/doc/operationholder.hpp - :project: opencs + .. autodoxygenfile:: model/doc/operationholder.hpp + :project: opencs -.. autodoxygenfile:: model/doc/operation.hpp - :project: opencs + .. autodoxygenfile:: model/doc/operation.hpp + :project: opencs -.. autodoxygenfile:: model/doc/runner.hpp - :project: opencs + .. autodoxygenfile:: model/doc/runner.hpp + :project: opencs -.. autodoxygenfile:: model/doc/saving.hpp - :project: opencs + .. autodoxygenfile:: model/doc/saving.hpp + :project: opencs -.. autodoxygenfile:: model/doc/savingstages.hpp - :project: opencs + .. autodoxygenfile:: model/doc/savingstages.hpp + :project: opencs -.. autodoxygenfile:: model/doc/savingstate.hpp - :project: opencs + .. autodoxygenfile:: model/doc/savingstate.hpp + :project: opencs -.. autodoxygenfile:: model/doc/stage.hpp - :project: opencs + .. autodoxygenfile:: model/doc/stage.hpp + :project: opencs + + .. autodoxygenfile:: model/doc/state.hpp + :project: opencs + +filter +------ + .. autodoxygenfile:: model/filter/andnode.hpp + :project: opencs + + .. autodoxygenfile:: model/filter/booleannode.hpp + :project: opencs + + .. autodoxygenfile:: model/filter/leafnode.hpp + :project: opencs + + .. autodoxygenfile:: model/filter/narynode.hpp + :project: opencs + + .. autodoxygenfile:: model/filter/node.hpp + :project: opencs + + .. autodoxygenfile:: model/filter/notnode.hpp + :project: opencs + + .. autodoxygenfile:: model/filter/ornode.hpp + :project: opencs + + .. autodoxygenfile:: model/filter/parser.hpp + :project: opencs + + .. autodoxygenfile:: model/filter/textnode.hpp + :project: opencs + + .. autodoxygenfile:: model/filter/unarynode.hpp + :project: opencs + + .. autodoxygenfile:: model/filter/valuenode.hpp + :project: opencs + +prefs +----- + .. autodoxygenfile:: model/prefs/boolsetting.hpp + :project: opencs + + .. autodoxygenfile:: model/prefs/category.hpp + :project: opencs + + .. autodoxygenfile:: model/prefs/coloursetting.hpp + :project: opencs + + .. autodoxygenfile:: model/prefs/doublesetting.hpp + :project: opencs + + .. autodoxygenfile:: model/prefs/enumsetting.hpp + :project: opencs + + .. autodoxygenfile:: model/prefs/intsetting.hpp + :project: opencs + + .. autodoxygenfile:: model/prefs/modifiersetting.hpp + :project: opencs + + .. autodoxygenfile:: model/prefs/setting.hpp + :project: opencs + + .. autodoxygenfile:: model/prefs/shortcuteventhandler.hpp + :project: opencs + + .. autodoxygenfile:: model/prefs/shortcut.hpp + :project: opencs + + .. autodoxygenfile:: model/prefs/shortcutmanager.hpp + :project: opencs + + .. autodoxygenfile:: model/prefs/shortcutsetting.hpp + :project: opencs + + .. autodoxygenfile:: model/prefs/state.hpp + :project: opencs + +tools +----- + .. autodoxygenfile:: model/tools/birthsigncheck.hpp + :project: opencs + + .. autodoxygenfile:: model/tools/bodypartcheck.hpp + :project: opencs + + .. autodoxygenfile:: model/tools/classcheck.hpp + :project: opencs + + .. autodoxygenfile:: model/tools/factioncheck.hpp + :project: opencs + + .. autodoxygenfile:: model/tools/gmstcheck.hpp + :project: opencs + + .. autodoxygenfile:: model/tools/journalcheck.hpp + :project: opencs + + .. autodoxygenfile:: model/tools/magiceffectcheck.hpp + :project: opencs + + .. autodoxygenfile:: model/tools/mandatoryid.hpp + :project: opencs + + .. autodoxygenfile:: model/tools/mergeoperation.hpp + :project: opencs + + .. autodoxygenfile:: model/tools/mergestages.hpp + :project: opencs + + .. autodoxygenfile:: model/tools/mergestate.hpp + :project: opencs + + .. autodoxygenfile:: model/tools/pathgridcheck.hpp + :project: opencs + + .. autodoxygenfile:: model/tools/racecheck.hpp + :project: opencs + + .. autodoxygenfile:: model/tools/referenceablecheck.hpp + :project: opencs + + .. autodoxygenfile:: model/tools/referencecheck.hpp + :project: opencs + + .. autodoxygenfile:: model/tools/regioncheck.hpp + :project: opencs + + .. autodoxygenfile:: model/tools/reportmodel.hpp + :project: opencs + + .. autodoxygenfile:: model/tools/scriptcheck.hpp + :project: opencs + + .. autodoxygenfile:: model/tools/search.hpp + :project: opencs + + .. autodoxygenfile:: model/tools/searchoperation.hpp + :project: opencs + + .. autodoxygenfile:: model/tools/searchstage.hpp + :project: opencs + + .. autodoxygenfile:: model/tools/skillcheck.hpp + :project: opencs + + .. autodoxygenfile:: model/tools/soundcheck.hpp + :project: opencs + + .. autodoxygenfile:: model/tools/soundgencheck.hpp + :project: opencs + + .. autodoxygenfile:: model/tools/spellcheck.hpp + :project: opencs + + .. autodoxygenfile:: model/tools/startscriptcheck.hpp + :project: opencs + + .. autodoxygenfile:: model/tools/tools.hpp + :project: opencs + + .. autodoxygenfile:: model/tools/topicinfocheck.hpp + :project: opencs + +world +----- + .. autodoxygenfile:: model/world/cellcoordinates.hpp + :project: opencs + + .. autodoxygenfile:: model/world/cell.hpp + :project: opencs + + .. autodoxygenfile:: model/world/cellselection.hpp + :project: opencs + + .. autodoxygenfile:: model/world/collectionbase.hpp + :project: opencs + + .. autodoxygenfile:: model/world/collection.hpp + :project: opencs + + .. autodoxygenfile:: model/world/columnbase.hpp + :project: opencs + + .. autodoxygenfile:: model/world/columnimp.hpp + :project: opencs + + .. autodoxygenfile:: model/world/columns.hpp + :project: opencs + + .. autodoxygenfile:: model/world/commanddispatcher.hpp + :project: opencs + + .. autodoxygenfile:: model/world/commandmacro.hpp + :project: opencs + + .. autodoxygenfile:: model/world/commands.hpp + :project: opencs + + .. autodoxygenfile:: model/world/data.hpp + :project: opencs + + .. autodoxygenfile:: model/world/defaultgmsts.hpp + :project: opencs + + .. autodoxygenfile:: model/world/idcollection.hpp + :project: opencs + + .. autodoxygenfile:: model/world/idcompletionmanager.hpp + :project: opencs + + .. autodoxygenfile:: model/world/idtablebase.hpp + :project: opencs + + .. autodoxygenfile:: model/world/idtable.hpp + :project: opencs + + .. autodoxygenfile:: model/world/idtableproxymodel.hpp + :project: opencs + + .. autodoxygenfile:: model/world/idtree.hpp + :project: opencs + + .. autodoxygenfile:: model/world/infocollection.hpp + :project: opencs + + .. autodoxygenfile:: model/world/info.hpp + :project: opencs + + .. autodoxygenfile:: model/world/infoselectwrapper.hpp + :project: opencs + + .. autodoxygenfile:: model/world/infotableproxymodel.hpp + :project: opencs + + .. autodoxygenfile:: model/world/land.hpp + :project: opencs + + .. autodoxygenfile:: model/world/landtexture.hpp + :project: opencs + + .. autodoxygenfile:: model/world/metadata.hpp + :project: opencs + + .. autodoxygenfile:: model/world/nestedcoladapterimp.hpp + :project: opencs + + .. autodoxygenfile:: model/world/nestedcollection.hpp + :project: opencs + + .. autodoxygenfile:: model/world/nestedcolumnadapter.hpp + :project: opencs + + .. autodoxygenfile:: model/world/nestedidcollection.hpp + :project: opencs + + .. autodoxygenfile:: model/world/nestedinfocollection.hpp + :project: opencs + + .. autodoxygenfile:: model/world/nestedtableproxymodel.hpp + :project: opencs + + .. autodoxygenfile:: model/world/nestedtablewrapper.hpp + :project: opencs + + .. autodoxygenfile:: model/world/pathgrid.hpp + :project: opencs + + .. autodoxygenfile:: model/world/record.hpp + :project: opencs + + .. autodoxygenfile:: model/world/refcollection.hpp + :project: opencs + + .. autodoxygenfile:: model/world/ref.hpp + :project: opencs + + .. autodoxygenfile:: model/world/refidadapter.hpp + :project: opencs + + .. autodoxygenfile:: model/world/refidadapterimp.hpp + :project: opencs + + .. autodoxygenfile:: model/world/refidcollection.hpp + :project: opencs + + .. autodoxygenfile:: model/world/refiddata.hpp + :project: opencs + + .. autodoxygenfile:: model/world/regionmap.hpp + :project: opencs + + .. autodoxygenfile:: model/world/resources.hpp + :project: opencs + + .. autodoxygenfile:: model/world/resourcesmanager.hpp + :project: opencs + + .. autodoxygenfile:: model/world/resourcetable.hpp + :project: opencs + + .. autodoxygenfile:: model/world/scope.hpp + :project: opencs + + .. autodoxygenfile:: model/world/scriptcontext.hpp + :project: opencs + + .. autodoxygenfile:: model/world/subcellcollection.hpp + :project: opencs + + .. autodoxygenfile:: model/world/tablemimedata.hpp + :project: opencs + + .. autodoxygenfile:: model/world/universalid.hpp + :project: opencs -.. autodoxygenfile:: model/doc/state.hpp - :project: opencs From e0afaf3a7d38120dfed93bf2cb5bd8fbe4324e37 Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Fri, 17 Feb 2017 12:21:22 +0100 Subject: [PATCH 6/6] finish up openmw-cs --- docs/source/source/opencs/view/index.rst | 340 ++++++++++++++++++++++- 1 file changed, 339 insertions(+), 1 deletion(-) diff --git a/docs/source/source/opencs/view/index.rst b/docs/source/source/opencs/view/index.rst index f53457671..54d00ccc0 100644 --- a/docs/source/source/opencs/view/index.rst +++ b/docs/source/source/opencs/view/index.rst @@ -1,2 +1,340 @@ ./opencs/view -############# \ No newline at end of file +############# + +doc +--- + .. autodoxygenfile:: view/doc/adjusterwidget.hpp + :project: opencs + + .. autodoxygenfile:: view/doc/filedialog.hpp + :project: opencs + + .. autodoxygenfile:: view/doc/filewidget.hpp + :project: opencs + + .. autodoxygenfile:: view/doc/globaldebugprofilemenu.hpp + :project: opencs + + .. autodoxygenfile:: view/doc/loader.hpp + :project: opencs + + .. autodoxygenfile:: view/doc/newgame.hpp + :project: opencs + + .. autodoxygenfile:: view/doc/operation.hpp + :project: opencs + + .. autodoxygenfile:: view/doc/operations.hpp + :project: opencs + + .. autodoxygenfile:: view/doc/runlogsubview.hpp + :project: opencs + + .. autodoxygenfile:: view/doc/sizehint.hpp + :project: opencs + + .. autodoxygenfile:: view/doc/startup.hpp + :project: opencs + + .. autodoxygenfile:: view/doc/subviewfactory.hpp + :project: opencs + + .. autodoxygenfile:: view/doc/subviewfactoryimp.hpp + :project: opencs + + .. autodoxygenfile:: view/doc/subview.hpp + :project: opencs + + .. autodoxygenfile:: view/doc/view.hpp + :project: opencs + + .. autodoxygenfile:: view/doc/viewmanager.hpp + :project: opencs + +filter +------ + .. autodoxygenfile:: view/filter/editwidget.hpp + :project: opencs + + .. autodoxygenfile:: view/filter/filterbox.hpp + :project: opencs + + .. autodoxygenfile:: view/filter/recordfilterbox.hpp + :project: opencs + +prefs +----- + .. autodoxygenfile:: view/prefs/dialogue.hpp + :project: opencs + + .. autodoxygenfile:: view/prefs/keybindingpage.hpp + :project: opencs + + .. autodoxygenfile:: view/prefs/pagebase.hpp + :project: opencs + + .. autodoxygenfile:: view/prefs/page.hpp + :project: opencs + +render +------ + .. autodoxygenfile:: view/render/cameracontroller.hpp + :project: opencs + + .. autodoxygenfile:: view/render/cellarrow.hpp + :project: opencs + + .. autodoxygenfile:: view/render/cellborder.hpp + :project: opencs + + .. autodoxygenfile:: view/render/cell.hpp + :project: opencs + + .. autodoxygenfile:: view/render/cellmarker.hpp + :project: opencs + + .. autodoxygenfile:: view/render/cellwater.hpp + :project: opencs + + .. autodoxygenfile:: view/render/editmode.hpp + :project: opencs + + .. autodoxygenfile:: view/render/instancemode.hpp + :project: opencs + + .. autodoxygenfile:: view/render/instancemovemode.hpp + :project: opencs + + .. autodoxygenfile:: view/render/instanceselectionmode.hpp + :project: opencs + + .. autodoxygenfile:: view/render/lightingbright.hpp + :project: opencs + + .. autodoxygenfile:: view/render/lightingday.hpp + :project: opencs + + .. autodoxygenfile:: view/render/lighting.hpp + :project: opencs + + .. autodoxygenfile:: view/render/lightingnight.hpp + :project: opencs + + .. autodoxygenfile:: view/render/mask.hpp + :project: opencs + + .. autodoxygenfile:: view/render/object.hpp + :project: opencs + + .. autodoxygenfile:: view/render/orbitcameramode.hpp + :project: opencs + + .. autodoxygenfile:: view/render/pagedworldspacewidget.hpp + :project: opencs + + .. autodoxygenfile:: view/render/pathgrid.hpp + :project: opencs + + .. autodoxygenfile:: view/render/pathgridmode.hpp + :project: opencs + + .. autodoxygenfile:: view/render/pathgridselectionmode.hpp + :project: opencs + + .. autodoxygenfile:: view/render/previewwidget.hpp + :project: opencs + + .. autodoxygenfile:: view/render/scenewidget.hpp + :project: opencs + + .. autodoxygenfile:: view/render/selectionmode.hpp + :project: opencs + + .. autodoxygenfile:: view/render/tagbase.hpp + :project: opencs + + .. autodoxygenfile:: view/render/terrainstorage.hpp + :project: opencs + + .. autodoxygenfile:: view/render/unpagedworldspacewidget.hpp + :project: opencs + + .. autodoxygenfile:: view/render/worldspacewidget.hpp + :project: opencs + +tools +----- + .. autodoxygenfile:: view/tools/merge.hpp + :project: opencs + + .. autodoxygenfile:: view/tools/reportsubview.hpp + :project: opencs + + .. autodoxygenfile:: view/tools/reporttable.hpp + :project: opencs + + .. autodoxygenfile:: view/tools/searchbox.hpp + :project: opencs + + .. autodoxygenfile:: view/tools/searchsubview.hpp + :project: opencs + + .. autodoxygenfile:: view/tools/subviews.hpp + :project: opencs + +widget +------ + .. autodoxygenfile:: view/widget/coloreditor.hpp + :project: opencs + + .. autodoxygenfile:: view/widget/colorpickerpopup.hpp + :project: opencs + + .. autodoxygenfile:: view/widget/completerpopup.hpp + :project: opencs + + .. autodoxygenfile:: view/widget/droplineedit.hpp + :project: opencs + + .. autodoxygenfile:: view/widget/modebutton.hpp + :project: opencs + + .. autodoxygenfile:: view/widget/pushbutton.hpp + :project: opencs + + .. autodoxygenfile:: view/widget/scenetoolbar.hpp + :project: opencs + + .. autodoxygenfile:: view/widget/scenetool.hpp + :project: opencs + + .. autodoxygenfile:: view/widget/scenetoolmode.hpp + :project: opencs + + .. autodoxygenfile:: view/widget/scenetoolrun.hpp + :project: opencs + + .. autodoxygenfile:: view/widget/scenetooltoggle2.hpp + :project: opencs + + .. autodoxygenfile:: view/widget/scenetooltoggle.hpp + :project: opencs + +world +----- + .. autodoxygenfile:: view/world/cellcreator.hpp + :project: opencs + + .. autodoxygenfile:: view/world/colordelegate.hpp + :project: opencs + + .. autodoxygenfile:: view/world/creator.hpp + :project: opencs + + .. autodoxygenfile:: view/world/datadisplaydelegate.hpp + :project: opencs + + .. autodoxygenfile:: view/world/dialoguecreator.hpp + :project: opencs + + .. autodoxygenfile:: view/world/dialoguespinbox.hpp + :project: opencs + + .. autodoxygenfile:: view/world/dialoguesubview.hpp + :project: opencs + + .. autodoxygenfile:: view/world/dragdroputils.hpp + :project: opencs + + .. autodoxygenfile:: view/world/dragrecordtable.hpp + :project: opencs + + .. autodoxygenfile:: view/world/enumdelegate.hpp + :project: opencs + + .. autodoxygenfile:: view/world/extendedcommandconfigurator.hpp + :project: opencs + + .. autodoxygenfile:: view/world/genericcreator.hpp + :project: opencs + + .. autodoxygenfile:: view/world/globalcreator.hpp + :project: opencs + + .. autodoxygenfile:: view/world/idcompletiondelegate.hpp + :project: opencs + + .. autodoxygenfile:: view/world/idtypedelegate.hpp + :project: opencs + + .. autodoxygenfile:: view/world/idvalidator.hpp + :project: opencs + + .. autodoxygenfile:: view/world/infocreator.hpp + :project: opencs + + .. autodoxygenfile:: view/world/nestedtable.hpp + :project: opencs + + .. autodoxygenfile:: view/world/pathgridcreator.hpp + :project: opencs + + .. autodoxygenfile:: view/world/previewsubview.hpp + :project: opencs + + .. autodoxygenfile:: view/world/recordbuttonbar.hpp + :project: opencs + + .. autodoxygenfile:: view/world/recordstatusdelegate.hpp + :project: opencs + + .. autodoxygenfile:: view/world/referenceablecreator.hpp + :project: opencs + + .. autodoxygenfile:: view/world/referencecreator.hpp + :project: opencs + + .. autodoxygenfile:: view/world/regionmap.hpp + :project: opencs + + .. autodoxygenfile:: view/world/regionmapsubview.hpp + :project: opencs + + .. autodoxygenfile:: view/world/scenesubview.hpp + :project: opencs + + .. autodoxygenfile:: view/world/scriptedit.hpp + :project: opencs + + .. autodoxygenfile:: view/world/scripterrortable.hpp + :project: opencs + + .. autodoxygenfile:: view/world/scripthighlighter.hpp + :project: opencs + + .. autodoxygenfile:: view/world/scriptsubview.hpp + :project: opencs + + .. autodoxygenfile:: view/world/startscriptcreator.hpp + :project: opencs + + .. autodoxygenfile:: view/world/subviews.hpp + :project: opencs + + .. autodoxygenfile:: view/world/tablebottombox.hpp + :project: opencs + + .. autodoxygenfile:: view/world/tableeditidaction.hpp + :project: opencs + + .. autodoxygenfile:: view/world/table.hpp + :project: opencs + + .. autodoxygenfile:: view/world/tablesubview.hpp + :project: opencs + + .. autodoxygenfile:: view/world/util.hpp + :project: opencs + + .. autodoxygenfile:: view/world/vartypedelegate.hpp + :project: opencs