Merge remote-tracking branch 'graffy76/recordStatusDelegate'

Gaming / Game Engines / OpenMW - Marc Zinnschlag [zpages.de] - 26 June 2013 02:48 UTC

12cfe1f Merge remote-tracking branch 'graffy76/recordStatusDelegate'

CMakeLists.txt | 6 +
apps/launcher/settings/gamesettings.cpp | 2 -
apps/launcher/settings/settingsbase.hpp | 2 -
apps/opencs/CMakeLists.txt | 4 +-
apps/opencs/editor.cpp | 12 +-
apps/opencs/model/doc/document.cpp | 2 -
apps/opencs/model/settings/settingcontainer.hpp | 18 +-
apps/opencs/model/settings/settingsitem.cpp | 16 +-
apps/opencs/model/settings/settingsitem.hpp | 26 +-
apps/opencs/model/settings/usersettings.cpp | 262 +--
apps/opencs/model/settings/usersettings.hpp | 54 +-
apps/opencs/model/world/columnbase.hpp | 3 +-
apps/opencs/model/world/columns.hpp | 4 +-
apps/opencs/model/world/refidcollection.cpp | 4 +-
apps/opencs/view/doc/subview.cpp | 5 +
apps/opencs/view/doc/subview.hpp | 3 +-
apps/opencs/view/doc/view.cpp | 41 +-
apps/opencs/view/doc/view.hpp | 13 +-
apps/opencs/view/doc/viewmanager.cpp | 19 +-
apps/opencs/view/doc/viewmanager.hpp | 3 +
apps/opencs/view/settings/abstractblock.cpp | 12 +-
apps/opencs/view/settings/abstractblock.hpp | 27 +-
apps/opencs/view/settings/abstractpage.cpp | 5 +
apps/opencs/view/settings/abstractpage.hpp | 19 +-
apps/opencs/view/settings/abstractwidget.hpp | 23 +-
apps/opencs/view/settings/blankpage.cpp | 12 +-
apps/opencs/view/settings/blankpage.hpp | 5 +-
apps/opencs/view/settings/customblock.cpp | 13 +-
apps/opencs/view/settings/customblock.hpp | 15 +-
apps/opencs/view/settings/editorpage.cpp | 152 +-
apps/opencs/view/settings/editorpage.hpp | 31 +-
apps/opencs/view/settings/groupblock.cpp | 14 +-
apps/opencs/view/settings/groupblock.hpp | 13 +-
apps/opencs/view/settings/groupbox.hpp | 1 +
apps/opencs/view/settings/itemblock.hpp | 10 +
apps/opencs/view/settings/proxyblock.cpp | 7 +-
apps/opencs/view/settings/proxyblock.hpp | 16 +-
apps/opencs/view/settings/settingwidget.hpp | 8 +-
apps/opencs/view/settings/support.hpp | 129 +-
apps/opencs/view/settings/toggleblock.cpp | 24 +-
apps/opencs/view/settings/toggleblock.hpp | 6 +-
apps/opencs/view/settings/usersettingsdialog.cpp | 84 +-
apps/opencs/view/settings/usersettingsdialog.hpp | 34 +-
apps/opencs/view/settings/windowpage.cpp | 108 +-
apps/opencs/view/settings/windowpage.hpp | 6 +
apps/opencs/view/world/recordstatusdelegate.cpp | 122 ++
apps/opencs/view/world/recordstatusdelegate.hpp | 53 +
apps/opencs/view/world/table.cpp | 15 +-
apps/opencs/view/world/table.hpp | 3 +
apps/opencs/view/world/tablesubview.cpp | 9 +-
apps/opencs/view/world/tablesubview.hpp | 4 +-
apps/opencs/view/world/util.hpp | 6 +
components/fileorderlist/model/datafilesmodel.cpp | 3 +-
files/opencs.cfg | 5 +
files/opencs/added.png | Bin 0 -> 862 bytes
files/opencs/base.png | Bin 0 -> 460 bytes
files/opencs/modified.png | Bin 0 -> 2149 bytes
files/opencs/raster/activator.png | Bin 0 -> 2297 bytes
files/opencs/raster/added.png | Bin 0 -> 615 bytes
files/opencs/raster/apparatus.png | Bin 0 -> 1440 bytes
files/opencs/raster/armor.png | Bin 0 -> 1641 bytes
files/opencs/raster/base.png | Bin 0 -> 460 bytes
files/opencs/raster/body-part.png | Bin 0 -> 1359 bytes
files/opencs/raster/book.png | Bin 0 -> 1336 bytes
files/opencs/raster/clothing.png | Bin 0 -> 1377 bytes
files/opencs/raster/container.png | Bin 0 -> 1526 bytes
files/opencs/raster/creature.png | Bin 0 -> 2297 bytes
files/opencs/raster/dialogoue-info.png | Bin 0 -> 1851 bytes
files/opencs/raster/dialogoue-journal.png | Bin 0 -> 1991 bytes
files/opencs/raster/dialogoue-regular.png | Bin 0 -> 1486 bytes
files/opencs/raster/dialogue-greeting.png | Bin 0 -> 1948 bytes
files/opencs/raster/dialogue-persuasion.png | Bin 0 -> 1987 bytes
files/opencs/raster/dialogue-speech.png | Bin 0 -> 1987 bytes
files/opencs/raster/door.png | Bin 0 -> 1627 bytes
files/opencs/raster/ingredient.png | Bin 0 -> 1444 bytes
files/opencs/raster/leveled-creature.png | Bin 0 -> 2150 bytes
files/opencs/raster/light.png | Bin 0 -> 747 bytes
files/opencs/raster/lockpick.png | Bin 0 -> 671 bytes
files/opencs/raster/miscellaneous.png | Bin 0 -> 1716 bytes
files/opencs/raster/modified.png | Bin 0 -> 1320 bytes
files/opencs/raster/npc.png | Bin 0 -> 2143 bytes
files/opencs/raster/potion.png | Bin 0 -> 1582 bytes
files/opencs/raster/probe.png | Bin 0 -> 587 bytes
files/opencs/raster/random-item.png | Bin 0 -> 1698 bytes
files/opencs/raster/removed.png | Bin 0 -> 1251 bytes
files/opencs/raster/repair.png | Bin 0 -> 1115 bytes
files/opencs/raster/sound.png | Bin 0 -> 1144 bytes
files/opencs/raster/soundgen.png | Bin 0 -> 2041 bytes
files/opencs/raster/static.png | Bin 0 -> 1518 bytes
files/opencs/raster/weapon.png | Bin 0 -> 1003 bytes
files/opencs/removed.png | Bin 0 -> 1772 bytes
files/opencs/resources.qrc | 4 +
files/opencs/scalable/Palette.svg | 569 ++++++
.../scalable/referenceable-record/.directory | 5 +
.../scalable/referenceable-record/activator.svg | 1088 +++++++++++
.../scalable/referenceable-record/apparatus.svg | 1058 +++++++++++
.../opencs/scalable/referenceable-record/book.svg | 687 +++++++
.../scalable/referenceable-record/container.svg | 1899 ++++++++++++++++++++
.../scalable/referenceable-record/ingredient.svg | 1107 ++++++++++++
.../opencs/scalable/referenceable-record/light.svg | 1508 ++++++++++++++++
.../referenceable-record/miscellaneous.svg | 965 ++++++++++
.../scalable/referenceable-record/potion.svg | 1161 ++++++++++++
.../scalable/referenceable-record/random-item.svg | 156 ++
.../scalable/referenceable-record/repair.svg | 1280 +++++++++++++
.../scalable/referenceable-record/static.svg | 1141 ++++++++++++
.../scalable/referenceable-record/weapon.svg | 1206 +++++++++++++
files/opencs/scalable/status/.directory | 5 +
files/opencs/scalable/status/added.svg | 932 ++++++++++
files/opencs/scalable/status/base.svg | 942 ++++++++++
files/opencs/scalable/status/modified.svg | 1155 ++++++++++++
files/opencs/scalable/status/removed.svg | 935 ++++++++++
files/opencs/scalable/top-level/gmst.svg | 1047 +++++++++++
files/opencs/scalable/top-level/topic-regular.svg | 1045 +++++++++++
113 files changed, 20841 insertions(+), 547 deletions(-)

Upstream: github.com

  • Share