Cache some frequently created icons

Author: atrosinenko

OMEdit/OMEdit/OMEditGUI/Annotations/BitmapAnnotation.cpp

@@ -34,6 +34,7 @@
 
 #include "BitmapAnnotation.h"
 #include "Modeling/Commands.h"
+#include "Util/ResourceCache.h"
 
 #include <QMessageBox>
 
@@ -96,7 +97,7 @@ BitmapAnnotation::BitmapAnnotation(QString classFileName, GraphicsView *pGraphic
   if (!mFileName.isEmpty() && QFile::exists(mFileName)) {
     mImage.load(mFileName);
   } else {
-    mImage = QImage(":/Resources/icons/bitmap-shape.svg");
+    mImage = ResourceCache::getImage(":/Resources/icons/bitmap-shape.svg");
   }
 }
 
@@ -126,7 +127,7 @@ void BitmapAnnotation::parseShapeAnnotation(QString annotation)
   } else if (!mFileName.isEmpty() && QFile::exists(mFileName)) {
     mImage.load(mFileName);
   } else {
-    mImage = QImage(":/Resources/icons/bitmap-shape.svg");
+    mImage = ResourceCache::getImage(":/Resources/icons/bitmap-shape.svg");
   }
 }
 

OMEdit/OMEdit/OMEditGUI/Annotations/LineAnnotation.cpp

@@ -37,6 +37,7 @@
 #include "Modeling/ItemDelegate.h"
 #include "Modeling/Commands.h"
 #include "OMS/BusDialog.h"
+#include "Util/ResourceCache.h"
 
 #include <QMessageBox>
 
@@ -1389,10 +1390,10 @@ QVariant ExpandableConnectorTreeItem::data(int column, int role) const
         case Qt::DecorationRole:
           switch (mRestriction) {
             case StringHandler::ExpandableConnector:
-              return QIcon(":/Resources/icons/connect-mode.svg");
+              return ResourceCache::getIcon(":/Resources/icons/connect-mode.svg");
               break;
             case StringHandler::Connector:
-              return QIcon(":/Resources/icons/connector-icon.svg");
+              return ResourceCache::getIcon(":/Resources/icons/connector-icon.svg");
               break;
             default:
               return QVariant();

OMEdit/OMEdit/OMEditGUI/Annotations/ShapeAnnotation.cpp

@@ -41,6 +41,7 @@
 #include "Component/ComponentProperties.h"
 #include "TLM/FetchInterfaceDataDialog.h"
 #include "Plotting/VariablesWidget.h"
+#include "Util/ResourceCache.h"
 
 /*!
  * \brief GraphicItem::setDefaults
@@ -390,7 +391,7 @@ void ShapeAnnotation::setDefaults()
   mOriginalFileName = "";
   mFileName = "";
   mImageSource = "";
-  mImage = QImage(":/Resources/icons/bitmap-shape.svg");
+  mImage = ResourceCache::getImage(":/Resources/icons/bitmap-shape.svg");
   mDynamicTextString.clear();
 }
 
@@ -474,7 +475,7 @@ void ShapeAnnotation::createActions()
   mpShapePropertiesAction->setStatusTip(tr("Shows the shape properties"));
   connect(mpShapePropertiesAction, SIGNAL(triggered()), SLOT(showShapeProperties()));
   // shape attributes
-  mpAlignInterfacesAction = new QAction(QIcon(":/Resources/icons/align-interfaces.svg"), Helper::alignInterfaces, mpGraphicsView);
+  mpAlignInterfacesAction = new QAction(ResourceCache::getIcon(":/Resources/icons/align-interfaces.svg"), Helper::alignInterfaces, mpGraphicsView);
   mpAlignInterfacesAction->setStatusTip(Helper::alignInterfacesTip);
   connect(mpAlignInterfacesAction, SIGNAL(triggered()), SLOT(alignInterfaces()));
   // shape attributes

OMEdit/OMEdit/OMEditGUI/Annotations/ShapePropertiesDialog.cpp

@@ -39,6 +39,7 @@
 #include "Options/OptionsDialog.h"
 #include "Options/NotificationsDialog.h"
 #include "Modeling/Commands.h"
+#include "Util/ResourceCache.h"
 
 #include <QHeaderView>
 #include <QColorDialog>
@@ -408,23 +409,23 @@ ShapePropertiesDialog::ShapePropertiesDialog(ShapeAnnotation *pShapeAnnotation,
   // points navigation buttons
   mpMovePointUpButton = new QToolButton;
   mpMovePointUpButton->setObjectName("ShapePointsButton");
-  mpMovePointUpButton->setIcon(QIcon(":/Resources/icons/up.svg"));
+  mpMovePointUpButton->setIcon(ResourceCache::getIcon(":/Resources/icons/up.svg"));
   mpMovePointUpButton->setToolTip(tr("Move point up"));
   connect(mpMovePointUpButton, SIGNAL(clicked()), SLOT(movePointUp()));
   mpMovePointDownButton = new QToolButton;
   mpMovePointDownButton->setObjectName("ShapePointsButton");
-  mpMovePointDownButton->setIcon(QIcon(":/Resources/icons/down.svg"));
+  mpMovePointDownButton->setIcon(ResourceCache::getIcon(":/Resources/icons/down.svg"));
   mpMovePointDownButton->setToolTip(tr("Move point down"));
   connect(mpMovePointDownButton, SIGNAL(clicked()), SLOT(movePointDown()));
   // points manipulation buttons
   mpAddPointButton = new QToolButton;
   mpAddPointButton->setObjectName("ShapePointsButton");
-  mpAddPointButton->setIcon(QIcon(":/Resources/icons/add-icon.svg"));
+  mpAddPointButton->setIcon(ResourceCache::getIcon(":/Resources/icons/add-icon.svg"));
   mpAddPointButton->setToolTip(tr("Add new point"));
   connect(mpAddPointButton, SIGNAL(clicked()), SLOT(addPoint()));
   mpRemovePointButton = new QToolButton;
   mpRemovePointButton->setObjectName("ShapePointsButton");
-  mpRemovePointButton->setIcon(QIcon(":/Resources/icons/delete.svg"));
+  mpRemovePointButton->setIcon(ResourceCache::getIcon(":/Resources/icons/delete.svg"));
   mpRemovePointButton->setToolTip(tr("Remove point"));
   connect(mpRemovePointButton, SIGNAL(clicked()), SLOT(removePoint()));
   mpPointsButtonBox = new QDialogButtonBox(Qt::Vertical);

OMEdit/OMEdit/OMEditGUI/Component/Component.cpp

@@ -40,6 +40,7 @@
 #include "Modeling/DocumentationWidget.h"
 #include "Plotting/VariablesWidget.h"
 #include "OMS/BusDialog.h"
+#include "Util/ResourceCache.h"
 
 #include <QMessageBox>
 #include <QMenu>
@@ -1936,7 +1937,7 @@ void Component::createActions()
   mpParametersAction->setStatusTip(tr("Shows the component parameters"));
   connect(mpParametersAction, SIGNAL(triggered()), SLOT(showParameters()));
   // Fetch interfaces action
-  mpFetchInterfaceDataAction = new QAction(QIcon(":/Resources/icons/interface-data.svg"), Helper::fetchInterfaceData, mpGraphicsView);
+  mpFetchInterfaceDataAction = new QAction(ResourceCache::getIcon(":/Resources/icons/interface-data.svg"), Helper::fetchInterfaceData, mpGraphicsView);
   mpFetchInterfaceDataAction->setStatusTip(tr("Fetch interface data for this external model"));
   connect(mpFetchInterfaceDataAction, SIGNAL(triggered()), SLOT(fetchInterfaceData()));
   // Todo: Connect /robbr
@@ -1945,7 +1946,7 @@ void Component::createActions()
   mpAttributesAction->setStatusTip(tr("Shows the component attributes"));
   connect(mpAttributesAction, SIGNAL(triggered()), SLOT(showAttributes()));
   // Open Class Action
-  mpOpenClassAction = new QAction(QIcon(":/Resources/icons/model.svg"), Helper::openClass, mpGraphicsView);
+  mpOpenClassAction = new QAction(ResourceCache::getIcon(":/Resources/icons/model.svg"), Helper::openClass, mpGraphicsView);
   mpOpenClassAction->setStatusTip(Helper::openClassTip);
   connect(mpOpenClassAction, SIGNAL(triggered()), SLOT(openClass()));
   // SubModel attributes Action

OMEdit/OMEdit/OMEditGUI/Editors/BaseEditor.cpp

@@ -37,6 +37,7 @@
 #include "Modeling/ModelWidgetContainer.h"
 #include "Util/Helper.h"
 #include "Debugger/Breakpoints/BreakpointsWidget.h"
+#include "Util/ResourceCache.h"
 
 #include <QMenu>
 #include <QCompleter>
@@ -788,7 +789,7 @@ void PlainTextEdit::insertCompleterSymbols(QList<CompleterItem> symbols, const Q
 {
   for (int i = 0; i < symbols.size(); ++i) {
     QStandardItem *pStandardItem = new QStandardItem(symbols[i].mKey);
-    pStandardItem->setIcon(QIcon(iconResource));
+    pStandardItem->setIcon(ResourceCache::getIcon(iconResource));
     pStandardItem->setData(QVariant::fromValue(symbols[i]), Qt::UserRole);
     mpStandardItemModel->appendRow(pStandardItem);
   }
@@ -805,7 +806,7 @@ void PlainTextEdit::insertCompleterKeywords(QStringList keywords)
 {
   for (int i = 0; i < keywords.size(); ++i) {
     QStandardItem *pStandardItem = new QStandardItem(keywords[i]);
-    pStandardItem->setIcon(QIcon(":/Resources/icons/completerkeyword.svg"));
+    pStandardItem->setIcon(ResourceCache::getIcon(":/Resources/icons/completerkeyword.svg"));
     pStandardItem->setData(QVariant::fromValue(CompleterItem(keywords[i],keywords[i],"")),Qt::UserRole);
     mpStandardItemModel->appendRow(pStandardItem);
   }
@@ -822,7 +823,7 @@ void PlainTextEdit::insertCompleterTypes(QStringList types)
 {
   for (int k = 0; k < types.size(); ++k) {
     QStandardItem *pStandardItem = new QStandardItem(types[k]);
-    pStandardItem->setIcon(QIcon(":/Resources/icons/completerType.svg"));
+    pStandardItem->setIcon(ResourceCache::getIcon(":/Resources/icons/completerType.svg"));
     pStandardItem->setData(QVariant::fromValue(CompleterItem(types[k],types[k],"")),Qt::UserRole);
     mpStandardItemModel->appendRow(pStandardItem);
   }
@@ -839,7 +840,7 @@ void PlainTextEdit::insertCompleterCodeSnippets(QList<CompleterItem> items)
 {
   for (int var = 0; var < items.length(); ++var) {
     QStandardItem *pStandardItem = new QStandardItem(items[var].mKey);
-    pStandardItem->setIcon(QIcon(":/Resources/icons/completerCodeSnippets.svg"));
+    pStandardItem->setIcon(ResourceCache::getIcon(":/Resources/icons/completerCodeSnippets.svg"));
     pStandardItem->setData(QVariant::fromValue(items[var]),Qt::UserRole);
     mpStandardItemModel->appendRow(pStandardItem);
   }
@@ -2090,19 +2091,19 @@ void BaseEditor::createActions()
   // we only define the zooming actions if ModelWidget is NULL otherwise we use the zooming actions from toolbar.
   if (!mpModelWidget) {
     // reset zoom action
-    mpResetZoomAction = new QAction(QIcon(":/Resources/icons/zoomReset.svg"), Helper::resetZoom, this);
+    mpResetZoomAction = new QAction(ResourceCache::getIcon(":/Resources/icons/zoomReset.svg"), Helper::resetZoom, this);
     mpResetZoomAction->setStatusTip(Helper::resetZoom);
     mpResetZoomAction->setShortcut(QKeySequence("Ctrl+0"));
     connect(mpResetZoomAction, SIGNAL(triggered()), mpPlainTextEdit, SLOT(resetZoom()));
     mpPlainTextEdit->addAction(mpResetZoomAction);
     // zoom in action
-    mpZoomInAction = new QAction(QIcon(":/Resources/icons/zoomIn.svg"), Helper::zoomIn, this);
+    mpZoomInAction = new QAction(ResourceCache::getIcon(":/Resources/icons/zoomIn.svg"), Helper::zoomIn, this);
     mpZoomInAction->setStatusTip(Helper::zoomIn);
     mpZoomInAction->setShortcut(QKeySequence("Ctrl++"));
     connect(mpZoomInAction, SIGNAL(triggered()), mpPlainTextEdit, SLOT(zoomIn()));
     mpPlainTextEdit->addAction(mpZoomInAction);
     // zoom out action
-    mpZoomOutAction = new QAction(QIcon(":/Resources/icons/zoomOut.svg"), Helper::zoomOut, this);
+    mpZoomOutAction = new QAction(ResourceCache::getIcon(":/Resources/icons/zoomOut.svg"), Helper::zoomOut, this);
     mpZoomOutAction->setStatusTip(Helper::zoomOut);
     mpZoomOutAction->setShortcut(QKeySequence("Ctrl+-"));
     connect(mpZoomOutAction, SIGNAL(triggered()), mpPlainTextEdit, SLOT(zoomOut()));
@@ -2156,11 +2157,11 @@ QMenu* BaseEditor::createStandardContextMenu()
     pMenu->addAction(MainWindow::instance()->getRedoAction());
   } else {
     QAction *pUndoAction = pMenu->addAction(tr("Undo"), mpPlainTextEdit, SLOT(undo()));
-    pUndoAction->setIcon(QIcon(":/Resources/icons/undo.svg"));
+    pUndoAction->setIcon(ResourceCache::getIcon(":/Resources/icons/undo.svg"));
     pUndoAction->setShortcut(QKeySequence::Undo);
     pUndoAction->setEnabled(mpPlainTextEdit->isUndoAvailable());
     QAction *pRedoAction = pMenu->addAction(tr("Redo"), mpPlainTextEdit, SLOT(undo()));
-    pRedoAction->setIcon(QIcon(":/Resources/icons/redo.svg"));
+    pRedoAction->setIcon(ResourceCache::getIcon(":/Resources/icons/redo.svg"));
     pRedoAction->setShortcut(QKeySequence::Redo);
     pRedoAction->setEnabled(mpPlainTextEdit->isRedoAvailable());
   }
@@ -2763,7 +2764,7 @@ GotoLineDialog::GotoLineDialog(BaseEditor *pBaseEditor)
   : QDialog(pBaseEditor)
 {
   setWindowTitle(QString(Helper::applicationName).append(" - Go to Line"));
-  setWindowIcon(QIcon(":/Resources/icons/modeling.png"));
+  setWindowIcon(ResourceCache::getIcon(":/Resources/icons/modeling.png"));
   setAttribute(Qt::WA_DeleteOnClose);
   mpBaseEditor = pBaseEditor;
   mpLineNumberLabel = new Label;
@@ -2830,7 +2831,7 @@ InfoBar::InfoBar(QWidget *pParent)
   mpInfoLabel->setWordWrap(true);
   mpCloseButton = new QToolButton;
   mpCloseButton->setAutoRaise(true);
-  mpCloseButton->setIcon(QIcon(":/Resources/icons/delete.svg"));
+  mpCloseButton->setIcon(ResourceCache::getIcon(":/Resources/icons/delete.svg"));
   mpCloseButton->setToolTip(Helper::close);
   connect(mpCloseButton, SIGNAL(clicked()), SLOT(hide()));
   // set the layout

OMEdit/OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.cpp

@@ -47,6 +47,7 @@
 #include "ModelicaClassDialog.h"
 #include "Git/GitCommands.h"
 #include "Git/CommitChangesDialog.h"
+#include "Util/ResourceCache.h"
 
 /*!
  * \class LibraryTreeItem
@@ -419,54 +420,54 @@ QString LibraryTreeItem::getTooltip() const {
 QIcon LibraryTreeItem::getLibraryTreeItemIcon() const
 {
   if (mLibraryType == LibraryTreeItem::CompositeModel) {
-    return QIcon(":/Resources/icons/tlm-icon.svg");
+    return ResourceCache::getIcon(":/Resources/icons/tlm-icon.svg");
   } else if (mLibraryType == LibraryTreeItem::OMS) {
     if (isTopLevel()) {
-      return QIcon(":/Resources/icons/model-icon.svg");
+      return ResourceCache::getIcon(":/Resources/icons/model-icon.svg");
     } else if (isSystemElement()) {
       if (isTLMSystem()) {
-        return QIcon(":/Resources/icons/tlm-system-icon.svg");
+        return ResourceCache::getIcon(":/Resources/icons/tlm-system-icon.svg");
       } else if (isWCSystem()) {
-        return QIcon(":/Resources/icons/wc-system-icon.svg");
+        return ResourceCache::getIcon(":/Resources/icons/wc-system-icon.svg");
       } else {
-        return QIcon(":/Resources/icons/sc-system-icon.svg");
+        return ResourceCache::getIcon(":/Resources/icons/sc-system-icon.svg");
       }
     } else if (isFMUComponent()) {
-      return QIcon(":/Resources/icons/fmu-icon.svg");
+      return ResourceCache::getIcon(":/Resources/icons/fmu-icon.svg");
     } else if (isTableComponent()) {
       if (mSubModelPath.endsWith(".csv")) {
-        return QIcon(":/Resources/icons/csv.svg");
+        return ResourceCache::getIcon(":/Resources/icons/csv.svg");
       } else {
-        return QIcon(":/Resources/icons/mat.svg");
+        return ResourceCache::getIcon(":/Resources/icons/mat.svg");
       }
     } else if (mpOMSConnector) {
       switch (mpOMSConnector->type) {
         case oms_signal_type_real:
           switch (mpOMSConnector->causality) {
             case oms_causality_input:
-              return QIcon(":/Resources/icons/real-input-connector.svg");
+              return ResourceCache::getIcon(":/Resources/icons/real-input-connector.svg");
             case oms_causality_output:
-              return QIcon(":/Resources/icons/real-output-connector.svg");
+              return ResourceCache::getIcon(":/Resources/icons/real-output-connector.svg");
             default:
-              return QIcon(":/Resources/icons/package-icon.svg");
+              return ResourceCache::getIcon(":/Resources/icons/package-icon.svg");
           }
         case oms_signal_type_integer:
           switch (mpOMSConnector->causality) {
             case oms_causality_input:
-              return QIcon(":/Resources/icons/integer-input-connector.svg");
+              return ResourceCache::getIcon(":/Resources/icons/integer-input-connector.svg");
             case oms_causality_output:
-              return QIcon(":/Resources/icons/integer-output-connector.svg");
+              return ResourceCache::getIcon(":/Resources/icons/integer-output-connector.svg");
             default:
-              return QIcon(":/Resources/icons/package-icon.svg");
+              return ResourceCache::getIcon(":/Resources/icons/package-icon.svg");
           }
         case oms_signal_type_boolean:
           switch (mpOMSConnector->causality) {
             case oms_causality_input:
-              return QIcon(":/Resources/icons/boolean-input-connector.svg");
+              return ResourceCache::getIcon(":/Resources/icons/boolean-input-connector.svg");
             case oms_causality_output:
-              return QIcon(":/Resources/icons/boolean-output-connector.svg");
+              return ResourceCache::getIcon(":/Resources/icons/boolean-output-connector.svg");
             default:
-              return QIcon(":/Resources/icons/package-icon.svg");
+              return ResourceCache::getIcon(":/Resources/icons/package-icon.svg");
           }
         default:
           qDebug() << "Unhanled connector type" << mpOMSConnector->type;
@@ -477,47 +478,47 @@ QIcon LibraryTreeItem::getLibraryTreeItemIcon() const
     } else if (mpOMSTLMBusConnector) {
       switch (mpOMSTLMBusConnector->domain) {
         case oms_tlm_domain_input:
-          return QIcon(":/Resources/icons/tlm-input-bus-connector.svg");
+          return ResourceCache::getIcon(":/Resources/icons/tlm-input-bus-connector.svg");
         case oms_tlm_domain_output:
-          return QIcon(":/Resources/icons/tlm-output-bus-connector.svg");
+          return ResourceCache::getIcon(":/Resources/icons/tlm-output-bus-connector.svg");
         case oms_tlm_domain_rotational:
-          return QIcon(":/Resources/icons/tlm-rotational-bus-connector.svg");
+          return ResourceCache::getIcon(":/Resources/icons/tlm-rotational-bus-connector.svg");
         case oms_tlm_domain_hydraulic:
-          return QIcon(":/Resources/icons/tlm-hydraulic-bus-connector.svg");
+          return ResourceCache::getIcon(":/Resources/icons/tlm-hydraulic-bus-connector.svg");
         case oms_tlm_domain_electric:
-          return QIcon(":/Resources/icons/tlm-electric-bus-connector.svg");
+          return ResourceCache::getIcon(":/Resources/icons/tlm-electric-bus-connector.svg");
         case oms_tlm_domain_mechanical:
         default:
-          return QIcon(":/Resources/icons/tlm-mechanical-bus-connector.svg");
+          return ResourceCache::getIcon(":/Resources/icons/tlm-mechanical-bus-connector.svg");
       }
     }
   } else if (mLibraryType == LibraryTreeItem::Modelica) {
     switch (getRestriction()) {
       case StringHandler::Model:
-        return QIcon(":/Resources/icons/model-icon.svg");
+        return ResourceCache::getIcon(":/Resources/icons/model-icon.svg");
       case StringHandler::Class:
-        return QIcon(":/Resources/icons/class-icon.svg");
+        return ResourceCache::getIcon(":/Resources/icons/class-icon.svg");
       case StringHandler::Connector:
-        return QIcon(":/Resources/icons/connector-icon.svg");
+        return ResourceCache::getIcon(":/Resources/icons/connector-icon.svg");
       case StringHandler::ExpandableConnector:
-        return QIcon(":/Resources/icons/connect-mode.svg");
+        return ResourceCache::getIcon(":/Resources/icons/connect-mode.svg");
       case StringHandler::Record:
-        return QIcon(":/Resources/icons/record-icon.svg");
+        return ResourceCache::getIcon(":/Resources/icons/record-icon.svg");
       case StringHandler::Block:
-        return QIcon(":/Resources/icons/block-icon.svg");
+        return ResourceCache::getIcon(":/Resources/icons/block-icon.svg");
       case StringHandler::Function:
-        return QIcon(":/Resources/icons/function-icon.svg");
+        return ResourceCache::getIcon(":/Resources/icons/function-icon.svg");
       case StringHandler::Package:
-        return QIcon(":/Resources/icons/package-icon.svg");
+        return ResourceCache::getIcon(":/Resources/icons/package-icon.svg");
       case StringHandler::Type:
       case StringHandler::Operator:
       case StringHandler::OperatorRecord:
       case StringHandler::OperatorFunction:
-        return QIcon(":/Resources/icons/type-icon.svg");
+        return ResourceCache::getIcon(":/Resources/icons/type-icon.svg");
       case StringHandler::Optimization:
-        return QIcon(":/Resources/icons/optimization-icon.svg");
+        return ResourceCache::getIcon(":/Resources/icons/optimization-icon.svg");
       default:
-        return QIcon(":/Resources/icons/type-icon.svg");
+        return ResourceCache::getIcon(":/Resources/icons/type-icon.svg");
     }
   }
   return QIcon();