From 69aacdff176f13a2dea8f5280734e4b9a9ed2fdb Mon Sep 17 00:00:00 2001 From: Nelsson Huotari Date: Sun, 15 Apr 2018 12:35:45 +0300 Subject: [PATCH] Lamoot's new icon set --- apps/opencs/model/world/universalid.cpp | 26 +++---- apps/opencs/view/render/instancemode.cpp | 6 +- apps/opencs/view/render/instancemovemode.cpp | 2 +- apps/opencs/view/render/selectionmode.cpp | 6 +- apps/opencs/view/world/recordbuttonbar.cpp | 14 ++-- .../view/world/recordstatusdelegate.cpp | 2 +- files/opencs/GMST.png | Bin 820 -> 0 bytes files/opencs/LandTexture.png | Bin 2662 -> 0 bytes files/opencs/Lightbulb-48.png | Bin 8092 -> 0 bytes files/opencs/Moon-48.png | Bin 7186 -> 0 bytes files/opencs/PathGrid.png | Bin 1297 -> 0 bytes files/opencs/Sun-48.png | Bin 8364 -> 0 bytes files/opencs/activator.png | Bin 1913 -> 562 bytes files/opencs/add.png | Bin 520 -> 0 bytes files/opencs/added.png | Bin 615 -> 0 bytes files/opencs/apparatus.png | Bin 1440 -> 364 bytes files/opencs/armor.png | Bin 1641 -> 473 bytes files/opencs/attribute.png | Bin 1788 -> 326 bytes files/opencs/base.png | Bin 460 -> 0 bytes files/opencs/birthsign.png | Bin 2454 -> 444 bytes files/opencs/body-part.png | Bin 1248 -> 418 bytes files/opencs/book.png | Bin 1599 -> 323 bytes files/opencs/brush-circle.png | Bin 0 -> 1540 bytes files/opencs/brush-custom.png | Bin 0 -> 2475 bytes files/opencs/brush-point.png | Bin 0 -> 787 bytes files/opencs/brush-square.png | Bin 0 -> 761 bytes files/opencs/camera-first-person.png | Bin 0 -> 750 bytes files/opencs/camera-free.png | Bin 0 -> 783 bytes files/opencs/camera-orbit.png | Bin 0 -> 1096 bytes files/opencs/cell.png | Bin 1403 -> 223 bytes files/opencs/class.png | Bin 2283 -> 588 bytes files/opencs/clothing.png | Bin 1377 -> 369 bytes files/opencs/container.png | Bin 1526 -> 421 bytes files/opencs/creature.png | Bin 2297 -> 463 bytes files/opencs/dialogoue-info.png | Bin 1851 -> 0 bytes files/opencs/dialogoue-journal.png | Bin 1991 -> 0 bytes files/opencs/dialogoue-regular.png | Bin 1486 -> 0 bytes files/opencs/dialogue-greeting.png | Bin 1948 -> 386 bytes files/opencs/dialogue-info.png | Bin 0 -> 306 bytes files/opencs/dialogue-journal.png | Bin 0 -> 288 bytes files/opencs/dialogue-persuasion.png | Bin 1987 -> 362 bytes files/opencs/dialogue-regular.png | Bin 0 -> 221 bytes files/opencs/dialogue-speech.png | Bin 1987 -> 0 bytes files/opencs/dialogue-voice.png | Bin 0 -> 294 bytes files/opencs/door.png | Bin 1627 -> 381 bytes files/opencs/editing-instance.png | Bin 0 -> 986 bytes files/opencs/editing-pathgrid.png | Bin 0 -> 2297 bytes files/opencs/editing-terrain-movement.png | Bin 0 -> 1745 bytes files/opencs/editing-terrain-shape.png | Bin 0 -> 1399 bytes files/opencs/editing-terrain-texture.png | Bin 0 -> 2100 bytes files/opencs/editing-terrain-vertex-paint.png | Bin 0 -> 2545 bytes files/opencs/enchantment.png | Bin 1812 -> 422 bytes files/opencs/eyeballdude.png | Bin 7350 -> 0 bytes files/opencs/faction.png | Bin 1858 -> 389 bytes files/opencs/filter.png | Bin 1375 -> 299 bytes files/opencs/flying-eye.png | Bin 8123 -> 0 bytes files/opencs/global-variable.png | Bin 0 -> 282 bytes files/opencs/globvar.png | Bin 2394 -> 0 bytes files/opencs/gmst.png | Bin 0 -> 338 bytes files/opencs/go-next.png | Bin 676 -> 0 bytes files/opencs/go-previous.png | Bin 655 -> 0 bytes files/opencs/ingredient.png | Bin 1384 -> 490 bytes files/opencs/land-heightmap.png | Bin 0 -> 193 bytes files/opencs/land-texture.png | Bin 0 -> 288 bytes files/opencs/land.png | Bin 1220 -> 0 bytes files/opencs/landpaint.png | Bin 1361 -> 0 bytes files/opencs/leveled-creature.png | Bin 2150 -> 521 bytes files/opencs/leveled-item.png | Bin 1698 -> 516 bytes files/opencs/light.png | Bin 1199 -> 384 bytes files/opencs/lighting-lamp.png | Bin 0 -> 953 bytes files/opencs/lighting-moon.png | Bin 0 -> 1590 bytes files/opencs/lighting-sun.png | Bin 0 -> 1804 bytes files/opencs/list-added.png | Bin 0 -> 166 bytes files/opencs/list-base.png | Bin 0 -> 184 bytes files/opencs/list-modified.png | Bin 0 -> 457 bytes files/opencs/list-removed.png | Bin 0 -> 134 bytes files/opencs/lockpick.png | Bin 671 -> 317 bytes files/opencs/magic-effect.png | Bin 1702 -> 325 bytes files/opencs/miscellaneous.png | Bin 1716 -> 466 bytes files/opencs/modified.png | Bin 1320 -> 0 bytes files/opencs/npc.png | Bin 2143 -> 465 bytes files/opencs/orbit2.png | Bin 8016 -> 0 bytes files/opencs/pathgrid.png | Bin 0 -> 407 bytes files/opencs/potion.png | Bin 1582 -> 442 bytes files/opencs/probe.png | Bin 587 -> 304 bytes files/opencs/race.png | Bin 1834 -> 451 bytes files/opencs/record-add.png | Bin 0 -> 238 bytes files/opencs/record-clone.png | Bin 0 -> 275 bytes files/opencs/record-delete.png | Bin 0 -> 151 bytes files/opencs/record-next.png | Bin 0 -> 248 bytes files/opencs/record-preview.png | Bin 0 -> 334 bytes files/opencs/record-previous.png | Bin 0 -> 265 bytes files/opencs/record-revert.png | Bin 0 -> 323 bytes files/opencs/region.png | Bin 0 -> 320 bytes files/opencs/removed.png | Bin 1251 -> 0 bytes files/opencs/repair.png | Bin 1115 -> 367 bytes files/opencs/resources-icon.png | Bin 0 -> 194 bytes files/opencs/resources-mesh.png | Bin 0 -> 586 bytes files/opencs/resources-music.png | Bin 0 -> 354 bytes files/opencs/resources-sound.png | Bin 0 -> 222 bytes files/opencs/resources-texture.png | Bin 0 -> 288 bytes files/opencs/resources-video.png | Bin 0 -> 277 bytes files/opencs/resources.qrc | 72 ++++++++++-------- files/opencs/scene-exterior-arrows.png | Bin 1251 -> 511 bytes files/opencs/scene-exterior-borders.png | Bin 1246 -> 429 bytes files/opencs/scene-exterior-marker.png | Bin 808 -> 0 bytes files/opencs/scene-exterior-markers.png | Bin 808 -> 497 bytes files/opencs/scene-exterior-status-0.png | Bin 3289 -> 1932 bytes files/opencs/scene-exterior-status-1.png | Bin 3576 -> 1912 bytes files/opencs/scene-exterior-status-2.png | Bin 3601 -> 1969 bytes files/opencs/scene-exterior-status-3.png | Bin 3894 -> 1946 bytes files/opencs/scene-exterior-status-4.png | Bin 3619 -> 1943 bytes files/opencs/scene-exterior-status-5.png | Bin 3901 -> 1924 bytes files/opencs/scene-exterior-status-6.png | Bin 3940 -> 1980 bytes files/opencs/scene-exterior-status-7.png | Bin 3932 -> 1957 bytes files/opencs/scene-view-fog.png | Bin 962 -> 298 bytes files/opencs/scene-view-instance.png | Bin 0 -> 1774 bytes files/opencs/scene-view-pathgrid.png | Bin 640 -> 569 bytes files/opencs/scene-view-references.png | Bin 1785 -> 0 bytes files/opencs/scene-view-status-0.png | Bin 2170 -> 3547 bytes files/opencs/scene-view-status-1.png | Bin 2861 -> 1774 bytes files/opencs/scene-view-status-10.png | Bin 2719 -> 777 bytes files/opencs/scene-view-status-11.png | Bin 3215 -> 2424 bytes files/opencs/scene-view-status-12.png | Bin 2907 -> 923 bytes files/opencs/scene-view-status-13.png | Bin 3327 -> 2287 bytes files/opencs/scene-view-status-14.png | Bin 3077 -> 1302 bytes files/opencs/scene-view-status-15.png | Bin 3416 -> 2701 bytes files/opencs/scene-view-status-16.png | Bin 3206 -> 2580 bytes files/opencs/scene-view-status-17.png | Bin 3340 -> 3077 bytes files/opencs/scene-view-status-18.png | Bin 3334 -> 2947 bytes files/opencs/scene-view-status-19.png | Bin 3438 -> 3470 bytes files/opencs/scene-view-status-2.png | Bin 2425 -> 569 bytes files/opencs/scene-view-status-20.png | Bin 3329 -> 2491 bytes files/opencs/scene-view-status-21.png | Bin 3444 -> 3009 bytes files/opencs/scene-view-status-22.png | Bin 3452 -> 2872 bytes files/opencs/scene-view-status-23.png | Bin 3536 -> 3394 bytes files/opencs/scene-view-status-24.png | Bin 3345 -> 2731 bytes files/opencs/scene-view-status-25.png | Bin 3446 -> 3200 bytes files/opencs/scene-view-status-26.png | Bin 3447 -> 3125 bytes files/opencs/scene-view-status-27.png | Bin 3522 -> 3627 bytes files/opencs/scene-view-status-28.png | Bin 3461 -> 2695 bytes files/opencs/scene-view-status-29.png | Bin 3550 -> 3125 bytes files/opencs/scene-view-status-3.png | Bin 2996 -> 2169 bytes files/opencs/scene-view-status-30.png | Bin 3563 -> 3096 bytes files/opencs/scene-view-status-31.png | Bin 3441 -> 3547 bytes files/opencs/scene-view-status-4.png | Bin 2517 -> 753 bytes files/opencs/scene-view-status-5.png | Bin 3071 -> 2097 bytes files/opencs/scene-view-status-6.png | Bin 2771 -> 1104 bytes files/opencs/scene-view-status-7.png | Bin 3199 -> 2462 bytes files/opencs/scene-view-status-8.png | Bin 2557 -> 298 bytes files/opencs/scene-view-status-9.png | Bin 3126 -> 1990 bytes files/opencs/scene-view-terrain.png | Bin 2490 -> 2580 bytes files/opencs/scene-view-water.png | Bin 1066 -> 753 bytes files/opencs/script.png | Bin 952 -> 256 bytes files/opencs/selection-mode-cube-corner.png | Bin 0 -> 1422 bytes files/opencs/selection-mode-cube-sphere.png | Bin 0 -> 1428 bytes files/opencs/selection-mode-cube.png | Bin 0 -> 1391 bytes files/opencs/skill.png | Bin 1676 -> 318 bytes files/opencs/sound-generator.png | Bin 0 -> 429 bytes files/opencs/sound.png | Bin 1144 -> 222 bytes files/opencs/soundgen.png | Bin 2149 -> 0 bytes files/opencs/spell.png | Bin 2071 -> 319 bytes files/opencs/static.png | Bin 1297 -> 208 bytes files/opencs/transform-move.png | Bin 0 -> 879 bytes files/opencs/transform-rotate.png | Bin 0 -> 1391 bytes files/opencs/transform-scale.png | Bin 0 -> 436 bytes files/opencs/weapon.png | Bin 1003 -> 394 bytes 167 files changed, 70 insertions(+), 58 deletions(-) delete mode 100644 files/opencs/GMST.png delete mode 100644 files/opencs/LandTexture.png delete mode 100644 files/opencs/Lightbulb-48.png delete mode 100644 files/opencs/Moon-48.png delete mode 100644 files/opencs/PathGrid.png delete mode 100644 files/opencs/Sun-48.png delete mode 100644 files/opencs/add.png delete mode 100644 files/opencs/added.png delete mode 100644 files/opencs/base.png create mode 100644 files/opencs/brush-circle.png create mode 100644 files/opencs/brush-custom.png create mode 100644 files/opencs/brush-point.png create mode 100644 files/opencs/brush-square.png create mode 100644 files/opencs/camera-first-person.png create mode 100644 files/opencs/camera-free.png create mode 100644 files/opencs/camera-orbit.png delete mode 100644 files/opencs/dialogoue-info.png delete mode 100644 files/opencs/dialogoue-journal.png delete mode 100644 files/opencs/dialogoue-regular.png create mode 100644 files/opencs/dialogue-info.png create mode 100644 files/opencs/dialogue-journal.png create mode 100644 files/opencs/dialogue-regular.png delete mode 100644 files/opencs/dialogue-speech.png create mode 100644 files/opencs/dialogue-voice.png create mode 100644 files/opencs/editing-instance.png create mode 100644 files/opencs/editing-pathgrid.png create mode 100644 files/opencs/editing-terrain-movement.png create mode 100644 files/opencs/editing-terrain-shape.png create mode 100644 files/opencs/editing-terrain-texture.png create mode 100644 files/opencs/editing-terrain-vertex-paint.png delete mode 100644 files/opencs/eyeballdude.png delete mode 100644 files/opencs/flying-eye.png create mode 100644 files/opencs/global-variable.png delete mode 100644 files/opencs/globvar.png create mode 100644 files/opencs/gmst.png delete mode 100644 files/opencs/go-next.png delete mode 100644 files/opencs/go-previous.png create mode 100644 files/opencs/land-heightmap.png create mode 100644 files/opencs/land-texture.png delete mode 100644 files/opencs/land.png delete mode 100644 files/opencs/landpaint.png mode change 100755 => 100644 files/opencs/leveled-item.png create mode 100644 files/opencs/lighting-lamp.png create mode 100644 files/opencs/lighting-moon.png create mode 100644 files/opencs/lighting-sun.png create mode 100644 files/opencs/list-added.png create mode 100644 files/opencs/list-base.png create mode 100644 files/opencs/list-modified.png create mode 100644 files/opencs/list-removed.png delete mode 100644 files/opencs/modified.png delete mode 100644 files/opencs/orbit2.png create mode 100644 files/opencs/pathgrid.png create mode 100644 files/opencs/record-add.png create mode 100644 files/opencs/record-clone.png create mode 100644 files/opencs/record-delete.png create mode 100644 files/opencs/record-next.png create mode 100644 files/opencs/record-preview.png create mode 100644 files/opencs/record-previous.png create mode 100644 files/opencs/record-revert.png create mode 100644 files/opencs/region.png delete mode 100644 files/opencs/removed.png create mode 100644 files/opencs/resources-icon.png create mode 100644 files/opencs/resources-mesh.png create mode 100644 files/opencs/resources-music.png create mode 100644 files/opencs/resources-sound.png create mode 100644 files/opencs/resources-texture.png create mode 100644 files/opencs/resources-video.png delete mode 100644 files/opencs/scene-exterior-marker.png create mode 100644 files/opencs/scene-view-instance.png delete mode 100644 files/opencs/scene-view-references.png create mode 100644 files/opencs/selection-mode-cube-corner.png create mode 100644 files/opencs/selection-mode-cube-sphere.png create mode 100644 files/opencs/selection-mode-cube.png create mode 100644 files/opencs/sound-generator.png delete mode 100644 files/opencs/soundgen.png create mode 100644 files/opencs/transform-move.png create mode 100644 files/opencs/transform-rotate.png create mode 100644 files/opencs/transform-scale.png diff --git a/apps/opencs/model/world/universalid.cpp b/apps/opencs/model/world/universalid.cpp index 38386f6da..f9a2887e1 100644 --- a/apps/opencs/model/world/universalid.cpp +++ b/apps/opencs/model/world/universalid.cpp @@ -64,15 +64,15 @@ namespace static const TypeData sIdArg[] = { - { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Global, "Global Variable", ":./globvar.png" }, - { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Gmst, "Game Setting", ":./GMST.png" }, + { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Global, "Global Variable", ":./global-variable.png" }, + { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Gmst, "Game Setting", ":./gmst.png" }, { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Skill, "Skill", ":./skill.png" }, { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Class, "Class", ":./class.png" }, { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Faction, "Faction", ":./faction.png" }, { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Race, "Race", ":./race.png" }, { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Sound, "Sound", ":./sound.png" }, { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Script, "Script", ":./script.png" }, - { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Region, "Region", ":./land.png" }, + { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Region, "Region", ":./region.png" }, { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Birthsign, "Birthsign", ":./birthsign.png" }, { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Spell, "Spell", ":./spell.png" }, { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Topic, "Topic", 0 }, @@ -93,7 +93,7 @@ namespace { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Door, "Door", ":./door.png" }, { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Ingredient, "Ingredient", ":./ingredient.png" }, { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_CreatureLevelledList, - "Creature Levelled List", ":./creature.png" }, + "Creature Levelled List", ":./leveled-creature.png" }, { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_ItemLevelledList, "Item Levelled List", ":./leveled-item.png" }, { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Light, "Light", ":./light.png" }, @@ -109,20 +109,20 @@ namespace { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Filter, "Filter", ":./filter.png" }, { CSMWorld::UniversalId::Class_Collection, CSMWorld::UniversalId::Type_Scene, "Scene", 0 }, { CSMWorld::UniversalId::Class_Collection, CSMWorld::UniversalId::Type_Preview, "Preview", 0 }, - { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Enchantment, "Enchantment", 0 }, - { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_BodyPart, "Body Part", 0 }, + { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Enchantment, "Enchantment", ":./enchantment.png" }, + { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_BodyPart, "Body Part", ":./body-part.png" }, { CSMWorld::UniversalId::Class_Resource, CSMWorld::UniversalId::Type_Mesh, "Mesh", 0 }, { CSMWorld::UniversalId::Class_Resource, CSMWorld::UniversalId::Type_Icon, "Icon", 0 }, - { CSMWorld::UniversalId::Class_Resource, CSMWorld::UniversalId::Type_Music, "Music", 0 }, - { CSMWorld::UniversalId::Class_Resource, CSMWorld::UniversalId::Type_SoundRes, "Sound File", 0 }, + { CSMWorld::UniversalId::Class_Resource, CSMWorld::UniversalId::Type_Music, "Music", ":./sound.png" }, + { CSMWorld::UniversalId::Class_Resource, CSMWorld::UniversalId::Type_SoundRes, "Sound File", ":./sound.png" }, { CSMWorld::UniversalId::Class_Resource, CSMWorld::UniversalId::Type_Texture, "Texture", 0 }, { CSMWorld::UniversalId::Class_Resource, CSMWorld::UniversalId::Type_Video, "Video", 0 }, { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_DebugProfile, "Debug Profile", 0 }, - { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_SoundGen, "Sound Generator", 0 }, - { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_MagicEffect, "Magic Effect", 0 }, - { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Land, "Land", 0 }, - { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_LandTexture, "LandTexture", 0 }, - { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Pathgrid, "Pathgrid", 0 }, + { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_SoundGen, "Sound Generator", ":./sound-generator.png" }, + { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_MagicEffect, "Magic Effect", ":./magic-effect.png" }, + { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Land, "Land", ":./land-heightmap.png" }, + { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_LandTexture, "LandTexture", ":./land-texture.png" }, + { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Pathgrid, "Pathgrid", ":./pathgrid.png" }, { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_StartScript, "Start Script", 0 }, { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_MetaData, "Meta Data", 0 }, diff --git a/apps/opencs/view/render/instancemode.cpp b/apps/opencs/view/render/instancemode.cpp index fae609af5..ee3e18d71 100644 --- a/apps/opencs/view/render/instancemode.cpp +++ b/apps/opencs/view/render/instancemode.cpp @@ -92,7 +92,7 @@ osg::Vec3f CSVRender::InstanceMode::getScreenCoords(const osg::Vec3f& pos) } CSVRender::InstanceMode::InstanceMode (WorldspaceWidget *worldspaceWidget, QWidget *parent) -: EditMode (worldspaceWidget, QIcon (":placeholder"), Mask_Reference | Mask_Terrain, "Instance editing", +: EditMode (worldspaceWidget, QIcon (":scenetoolbar/editing-instance"), Mask_Reference | Mask_Terrain, "Instance editing", parent), mSubMode (0), mSubModeId ("move"), mSelectionMode (0), mDragMode (DragMode_None), mDragAxis (-1), mLocked (false), mUnitScaleDist(1) { @@ -104,14 +104,14 @@ void CSVRender::InstanceMode::activate (CSVWidget::SceneToolbar *toolbar) { mSubMode = new CSVWidget::SceneToolMode (toolbar, "Edit Sub-Mode"); mSubMode->addButton (new InstanceMoveMode (this), "move"); - mSubMode->addButton (":placeholder", "rotate", + mSubMode->addButton (":scenetoolbar/transform-rotate", "rotate", "Rotate selected instances" "" "Grid rotate not implemented yet"); - mSubMode->addButton (":placeholder", "scale", + mSubMode->addButton (":scenetoolbar/transform-scale", "scale", "Scale selected instances" "