Lamoot's new icon set

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 },
 

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"
             "<ul><li>Use {scene-edit-primary} to rotate instances freely</li>"
             "<li>Use {scene-edit-secondary} to rotate instances within the grid</li>"
             "<li>The center of the view acts as the axis of rotation</li>"
             "</ul>"
             "<font color=Red>Grid rotate not implemented yet</font color>");
-        mSubMode->addButton (":placeholder", "scale",
+        mSubMode->addButton (":scenetoolbar/transform-scale", "scale",
             "Scale selected instances"
             "<ul><li>Use {scene-edit-primary} to scale instances freely</li>"
             "<li>Use {scene-edit-secondary} to scale instances along the grid</li>"

apps/opencs/view/render/instancemovemode.cpp

@@ -2,7 +2,7 @@
 #include "instancemovemode.hpp"
 
 CSVRender::InstanceMoveMode::InstanceMoveMode (QWidget *parent)
-: ModeButton (QIcon (QPixmap (":placeholder")),
+: ModeButton (QIcon (QPixmap (":scenetoolbar/transform-move")),
   "Move selected instances"
   "<ul><li>Use {scene-edit-primary} to move instances around freely</li>"
   "<li>Use {scene-edit-secondary} to move instances around within the grid</li>"

apps/opencs/view/render/selectionmode.cpp

@@ -13,7 +13,7 @@ namespace CSVRender
         , mWorldspaceWidget(worldspaceWidget)
         , mInteractionMask(interactionMask)
     {
-        addButton(":placeholder", "cube-centre",
+        addButton(":scenetoolbar/selection-mode-cube", "cube-centre",
             "Centred cube"
             "<ul><li>Drag with {scene-select-primary} (make instances the selection) or {scene-select-secondary} "
                 "(invert selection state) from the centre of the selection cube outwards</li>"
@@ -22,7 +22,7 @@ namespace CSVRender
                 "starting on an instance will have the same effect</li>"
             "</ul>"
             "<font color=Red>Not implemented yet</font color>");
-        addButton(":placeholder", "cube-corner",
+        addButton(":scenetoolbar/selection-mode-cube-corner", "cube-corner",
             "Cube corner to corner"
             "<ul><li>Drag with {scene-select-primary} (make instances the selection) or {scene-select-secondary} "
                 "(invert selection state) from one corner of the selection cube to the opposite corner</li>"
@@ -31,7 +31,7 @@ namespace CSVRender
                 "starting on an instance will have the same effect</li>"
             "</ul>"
             "<font color=Red>Not implemented yet</font color>");
-        addButton(":placeholder", "sphere",
+        addButton(":scenetoolbar/selection-mode-cube-sphere", "sphere",
             "Centred sphere"
             "<ul><li>Drag with {scene-select-primary} (make instances the selection) or {scene-select-secondary} "
                 "(invert selection state) from the centre of the selection sphere outwards</li>"

apps/opencs/view/world/recordbuttonbar.cpp

@@ -57,12 +57,12 @@ CSVWorld::RecordButtonBar::RecordButtonBar (const CSMWorld::UniversalId& id,
 
     // left section
     mPrevButton = new QToolButton (this);
-    mPrevButton->setIcon(QIcon(":/go-previous.png"));
+    mPrevButton->setIcon(QIcon(":record-previous"));
     mPrevButton->setToolTip ("Switch to previous record");
     buttonsLayout->addWidget (mPrevButton, 0);
 
     mNextButton = new QToolButton (this);
-    mNextButton->setIcon(QIcon(":/go-next.png"));
+    mNextButton->setIcon(QIcon(":/record-next"));
     mNextButton->setToolTip ("Switch to next record");
     buttonsLayout->addWidget (mNextButton, 1);
 
@@ -72,7 +72,7 @@ CSVWorld::RecordButtonBar::RecordButtonBar (const CSMWorld::UniversalId& id,
     if (mTable.getFeatures() & CSMWorld::IdTable::Feature_Preview)
     {
         QToolButton* previewButton = new QToolButton (this);
-        previewButton->setIcon(QIcon(":/edit-preview.png"));
+        previewButton->setIcon(QIcon(":edit-preview"));
         previewButton->setToolTip ("Open a preview of this record");
         buttonsLayout->addWidget(previewButton);
         connect (previewButton, SIGNAL(clicked()), this, SIGNAL (showPreview()));
@@ -89,22 +89,22 @@ CSVWorld::RecordButtonBar::RecordButtonBar (const CSMWorld::UniversalId& id,
 
     // right section
     mCloneButton = new QToolButton (this);
-    mCloneButton->setIcon(QIcon(":/edit-clone.png"));
+    mCloneButton->setIcon(QIcon(":edit-clone"));
     mCloneButton->setToolTip ("Clone record");
     buttonsLayout->addWidget(mCloneButton);
 
     mAddButton = new QToolButton (this);
-    mAddButton->setIcon(QIcon(":/add.png"));
+    mAddButton->setIcon(QIcon(":edit-add"));
     mAddButton->setToolTip ("Add new record");
     buttonsLayout->addWidget(mAddButton);
 
     mDeleteButton = new QToolButton (this);
-    mDeleteButton->setIcon(QIcon(":/edit-delete.png"));
+    mDeleteButton->setIcon(QIcon(":edit-delete"));
     mDeleteButton->setToolTip ("Delete record");
     buttonsLayout->addWidget(mDeleteButton);
 
     mRevertButton = new QToolButton (this);
-    mRevertButton->setIcon(QIcon(":/edit-undo.png"));
+    mRevertButton->setIcon(QIcon(":edit-undo"));
     mRevertButton->setToolTip ("Revert record");
     buttonsLayout->addWidget(mRevertButton);
 

apps/opencs/view/world/recordstatusdelegate.cpp

@@ -27,7 +27,7 @@ CSVWorld::RecordStatusDelegateFactory::RecordStatusDelegateFactory()
 
     static const char *sIcons[] =
     {
-        ":./base.png", ":./modified.png", ":./added.png", ":./removed.png", ":./removed.png", 0
+        ":list-base", ":list-modified", ":list-added", ":list-removed", ":list-removed", 0
     };
 
     for (int i=0; sIcons[i]; ++i)