Skip to content

Commit

Permalink
- Updated more icons from PNGs to SVGs.
Browse files Browse the repository at this point in the history
- Removed some unused PSDs.

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@22983 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
adeas31 committed Oct 27, 2014
1 parent 45e3c96 commit 78dc30a
Show file tree
Hide file tree
Showing 53 changed files with 3,303 additions and 70 deletions.
2 changes: 1 addition & 1 deletion OMEdit/OMEditGUI/Component/Component.cpp
Expand Up @@ -412,7 +412,7 @@ void Component::createActions()
mpViewClassAction->setStatusTip(Helper::viewClassTip);
connect(mpViewClassAction, SIGNAL(triggered()), SLOT(viewClass()));
// View Documentation Action
mpViewDocumentationAction = new QAction(QIcon(":/Resources/icons/info-icon.png"), Helper::viewDocumentation, mpGraphicsView);
mpViewDocumentationAction = new QAction(QIcon(":/Resources/icons/info-icon.svg"), Helper::viewDocumentation, mpGraphicsView);
mpViewDocumentationAction->setStatusTip(Helper::viewDocumentationTip);
connect(mpViewDocumentationAction, SIGNAL(triggered()), SLOT(viewDocumentation()));
}
Expand Down
30 changes: 15 additions & 15 deletions OMEdit/OMEditGUI/MainWindow.cpp
Expand Up @@ -1892,7 +1892,7 @@ void MainWindow::createActions()
//mpNewTLMFileAction->setShortcut(QKeySequence("Ctrl+x"));
connect(mpNewTLMFileAction, SIGNAL(triggered()), SLOT(createNewTLMFile()));
// open Modelica file action
mpOpenModelicaFileAction = new QAction(QIcon(":/Resources/icons/open.png"), Helper::openModelicaFiles, this);
mpOpenModelicaFileAction = new QAction(QIcon(":/Resources/icons/open.svg"), Helper::openModelicaFiles, this);
mpOpenModelicaFileAction->setShortcut(QKeySequence("Ctrl+o"));
mpOpenModelicaFileAction->setStatusTip(tr("Opens the Modelica file(s)"));
connect(mpOpenModelicaFileAction, SIGNAL(triggered()), SLOT(openModelicaFile()));
Expand All @@ -1914,16 +1914,16 @@ void MainWindow::createActions()
mpOpenTransformationFileAction->setStatusTip(tr("Opens the class transformations file"));
connect(mpOpenTransformationFileAction, SIGNAL(triggered()), SLOT(showOpenTransformationFileDialog()));
// save file action
mpSaveAction = new QAction(QIcon(":/Resources/icons/save.png"), tr("Save"), this);
mpSaveAction = new QAction(QIcon(":/Resources/icons/save.svg"), tr("Save"), this);
mpSaveAction->setShortcut(QKeySequence("Ctrl+s"));
mpSaveAction->setStatusTip(tr("Save a file"));
mpSaveAction->setEnabled(false);
// save as file action
mpSaveAsAction = new QAction(QIcon(":/Resources/icons/saveas.png"), tr("Save As"), this);
mpSaveAsAction = new QAction(QIcon(":/Resources/icons/saveas.svg"), tr("Save As"), this);
mpSaveAsAction->setStatusTip(tr("Save As a File"));
mpSaveAsAction->setEnabled(false);
// save all file action
mpSaveAllAction = new QAction(QIcon(":/Resources/icons/saveall.png"), tr("Save All"), this);
mpSaveAllAction = new QAction(QIcon(":/Resources/icons/saveall.svg"), tr("Save All"), this);
mpSaveAllAction->setStatusTip(tr("Save All Files"));
mpSaveAllAction->setEnabled(false);
// Dump Total Model action
Expand Down Expand Up @@ -1985,19 +1985,19 @@ void MainWindow::createActions()
mpShowGridLinesAction->setEnabled(false);
connect(mpShowGridLinesAction, SIGNAL(toggled(bool)), SLOT(setShowGridLines(bool)));
// reset zoom action
mpResetZoomAction = new QAction(QIcon(":/Resources/icons/zoomReset.png"), tr("Reset Zoom"), this);
mpResetZoomAction = new QAction(QIcon(":/Resources/icons/zoomReset.svg"), tr("Reset Zoom"), this);
mpResetZoomAction->setStatusTip(tr("Resets the zoom"));
mpResetZoomAction->setShortcut(QKeySequence("Ctrl+0"));
mpResetZoomAction->setEnabled(false);
connect(mpResetZoomAction, SIGNAL(triggered()), SLOT(resetZoom()));
// zoom in action
mpZoomInAction = new QAction(QIcon(":/Resources/icons/zoomIn.png"), tr("Zoom In"), this);
mpZoomInAction = new QAction(QIcon(":/Resources/icons/zoomIn.svg"), tr("Zoom In"), this);
mpZoomInAction->setStatusTip(tr("Zoom in"));
mpZoomInAction->setShortcut(QKeySequence("Ctrl++"));
mpZoomInAction->setEnabled(false);
connect(mpZoomInAction, SIGNAL(triggered()), SLOT(zoomIn()));
// zoom out action
mpZoomOutAction = new QAction(QIcon(":/Resources/icons/zoomOut.png"), tr("Zoom Out"), this);
mpZoomOutAction = new QAction(QIcon(":/Resources/icons/zoomOut.svg"), tr("Zoom Out"), this);
mpZoomOutAction->setStatusTip(tr("Zoom out"));
mpZoomOutAction->setShortcut(QKeySequence("Ctrl+-"));
mpZoomOutAction->setEnabled(false);
Expand All @@ -2009,7 +2009,7 @@ void MainWindow::createActions()
connect(mpShowAlgorithmicDebuggerAction, SIGNAL(triggered()), SLOT(showAlgorithmicDebugger()));
// Simulation Menu
// instantiate model action
mpInstantiateModelAction = new QAction(QIcon(":/Resources/icons/flatmodel.png"), tr("Instantiate Model"), this);
mpInstantiateModelAction = new QAction(QIcon(":/Resources/icons/flatmodel.svg"), tr("Instantiate Model"), this);
mpInstantiateModelAction->setStatusTip(tr("Instantiates the modelica model"));
mpInstantiateModelAction->setEnabled(false);
connect(mpInstantiateModelAction, SIGNAL(triggered()), SLOT(instantiatesModel()));
Expand Down Expand Up @@ -2123,32 +2123,32 @@ void MainWindow::createActions()
mpShapesActionGroup = new QActionGroup(this);
mpShapesActionGroup->setExclusive(false);
// line creation action
mpLineShapeAction = new QAction(QIcon(":/Resources/icons/line-shape.png"), Helper::line, mpShapesActionGroup);
mpLineShapeAction = new QAction(QIcon(":/Resources/icons/line-shape.svg"), Helper::line, mpShapesActionGroup);
mpLineShapeAction->setStatusTip(tr("Draws a line shape"));
mpLineShapeAction->setCheckable(true);
connect(mpLineShapeAction, SIGNAL(triggered()), SLOT(toggleShapesButton()));
// polygon creation action
mpPolygonShapeAction = new QAction(QIcon(":/Resources/icons/polygon-shape.png"), tr("Polygon"), mpShapesActionGroup);
mpPolygonShapeAction = new QAction(QIcon(":/Resources/icons/polygon-shape.svg"), tr("Polygon"), mpShapesActionGroup);
mpPolygonShapeAction->setStatusTip(tr("Draws a polygon shape"));
mpPolygonShapeAction->setCheckable(true);
connect(mpPolygonShapeAction, SIGNAL(triggered()), SLOT(toggleShapesButton()));
// rectangle creation action
mpRectangleShapeAction = new QAction(QIcon(":/Resources/icons/rectangle-shape.png"), tr("Rectangle"), mpShapesActionGroup);
mpRectangleShapeAction = new QAction(QIcon(":/Resources/icons/rectangle-shape.svg"), tr("Rectangle"), mpShapesActionGroup);
mpRectangleShapeAction->setStatusTip(tr("Draws a rectangle shape"));
mpRectangleShapeAction->setCheckable(true);
connect(mpRectangleShapeAction, SIGNAL(triggered()), SLOT(toggleShapesButton()));
// ellipse creation action
mpEllipseShapeAction = new QAction(QIcon(":/Resources/icons/ellipse-shape.png"), tr("Ellipse"), mpShapesActionGroup);
mpEllipseShapeAction = new QAction(QIcon(":/Resources/icons/ellipse-shape.svg"), tr("Ellipse"), mpShapesActionGroup);
mpEllipseShapeAction->setStatusTip(tr("Draws an ellipse shape"));
mpEllipseShapeAction->setCheckable(true);
connect(mpEllipseShapeAction, SIGNAL(triggered()), SLOT(toggleShapesButton()));
// text creation action
mpTextShapeAction = new QAction(QIcon(":/Resources/icons/text-shape.png"), tr("Text"), mpShapesActionGroup);
mpTextShapeAction = new QAction(QIcon(":/Resources/icons/text-shape.svg"), tr("Text"), mpShapesActionGroup);
mpTextShapeAction->setStatusTip(tr("Draws a text shape"));
mpTextShapeAction->setCheckable(true);
connect(mpTextShapeAction, SIGNAL(triggered()), SLOT(toggleShapesButton()));
// bitmap creation action
mpBitmapShapeAction = new QAction(QIcon(":/Resources/icons/bitmap-shape.png"), tr("Bitmap"), mpShapesActionGroup);
mpBitmapShapeAction = new QAction(QIcon(":/Resources/icons/bitmap-shape.svg"), tr("Bitmap"), mpShapesActionGroup);
mpBitmapShapeAction->setStatusTip(tr("Inserts a bitmap"));
mpBitmapShapeAction->setCheckable(true);
connect(mpBitmapShapeAction, SIGNAL(triggered()), SLOT(toggleShapesButton()));
Expand Down Expand Up @@ -2183,7 +2183,7 @@ void MainWindow::createActions()
connect(mpClearPlotWindowAction, SIGNAL(triggered()), SLOT(clearPlotWindow()));
// Other Actions
// export as image action
mpExportAsImageAction = new QAction(QIcon(":/Resources/icons/bitmap-shape.png"), Helper::exportAsImage, this);
mpExportAsImageAction = new QAction(QIcon(":/Resources/icons/bitmap-shape.svg"), Helper::exportAsImage, this);
mpExportAsImageAction->setStatusTip(Helper::exportAsImageTip);
mpExportAsImageAction->setEnabled(false);
connect(mpExportAsImageAction, SIGNAL(triggered()), SLOT(exportModelAsImage()));
Expand Down
6 changes: 3 additions & 3 deletions OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.cpp
Expand Up @@ -550,15 +550,15 @@ void LibraryTreeWidget::createActions()
mpViewClassAction->setStatusTip(Helper::viewClassTip);
connect(mpViewClassAction, SIGNAL(triggered()), SLOT(showModelWidget()));
// view documentation Action
mpViewDocumentationAction = new QAction(QIcon(":/Resources/icons/info-icon.png"), Helper::viewDocumentation, this);
mpViewDocumentationAction = new QAction(QIcon(":/Resources/icons/info-icon.svg"), Helper::viewDocumentation, this);
mpViewDocumentationAction->setStatusTip(Helper::viewDocumentationTip);
connect(mpViewDocumentationAction, SIGNAL(triggered()), SLOT(viewDocumentation()));
// new Modelica Class Action
mpNewModelicaClassAction = new QAction(QIcon(":/Resources/icons/new.svg"), Helper::newModelicaClass, this);
mpNewModelicaClassAction->setStatusTip(Helper::createNewModelicaClass);
connect(mpNewModelicaClassAction, SIGNAL(triggered()), SLOT(createNewModelicaClass()));
// instantiate Model Action
mpInstantiateModelAction = new QAction(QIcon(":/Resources/icons/flatmodel.png"), Helper::instantiateModel, this);
mpInstantiateModelAction = new QAction(QIcon(":/Resources/icons/flatmodel.svg"), Helper::instantiateModel, this);
mpInstantiateModelAction->setStatusTip(Helper::instantiateModelTip);
connect(mpInstantiateModelAction, SIGNAL(triggered()), SLOT(instantiateModel()));
// check Model Action
Expand Down Expand Up @@ -1930,7 +1930,7 @@ void LibraryTreeWidget::loadLibraryComponent(LibraryTreeNode *pLibraryTreeNode)
pixmap = libComponent->getComponentPixmap(Helper::iconSize);
// if still the pixmap is null for some unknown reasons then used the pre defined image
if (pixmap.isNull())
pLibraryTreeNode->setIcon(0, QIcon(":/Resources/icons/info-icon.png"));
pLibraryTreeNode->setIcon(0, QIcon(":/Resources/icons/info-icon.svg"));
else
pLibraryTreeNode->setIcon(0, QIcon(pixmap));
}
Expand Down
18 changes: 9 additions & 9 deletions OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp
Expand Up @@ -852,21 +852,21 @@ void GraphicsView::createActions()
mpDuplicateAction->setShortcut(QKeySequence("Ctrl+d"));
mpDuplicateAction->setDisabled(isSystemLibrary);
// Rotate ClockWise Action
mpRotateClockwiseAction = new QAction(QIcon(":/Resources/icons/rotateclockwise.png"), tr("Rotate Clockwise"), this);
mpRotateClockwiseAction = new QAction(QIcon(":/Resources/icons/rotateclockwise.svg"), tr("Rotate Clockwise"), this);
mpRotateClockwiseAction->setStatusTip(tr("Rotates the item clockwise"));
mpRotateClockwiseAction->setShortcut(QKeySequence("Ctrl+r"));
mpRotateClockwiseAction->setDisabled(isSystemLibrary);
// Rotate Anti-ClockWise Action
mpRotateAntiClockwiseAction = new QAction(QIcon(":/Resources/icons/rotateanticlockwise.png"), tr("Rotate Anticlockwise"), this);
mpRotateAntiClockwiseAction = new QAction(QIcon(":/Resources/icons/rotateanticlockwise.svg"), tr("Rotate Anticlockwise"), this);
mpRotateAntiClockwiseAction->setStatusTip(tr("Rotates the item anticlockwise"));
mpRotateAntiClockwiseAction->setShortcut(QKeySequence("Ctrl+Shift+r"));
mpRotateAntiClockwiseAction->setDisabled(isSystemLibrary);
// Flip Horizontal Action
mpFlipHorizontalAction = new QAction(QIcon(":/Resources/icons/flip-horizontal.png"), tr("Flip Horizontal"), this);
mpFlipHorizontalAction = new QAction(QIcon(":/Resources/icons/flip-horizontal.svg"), tr("Flip Horizontal"), this);
mpFlipHorizontalAction->setStatusTip(tr("Flips the item horizontally"));
mpFlipHorizontalAction->setDisabled(isSystemLibrary);
// Flip Vertical Action
mpFlipVerticalAction = new QAction(QIcon(":/Resources/icons/flip-vertical.png"), tr("Flip Vertical"), this);
mpFlipVerticalAction = new QAction(QIcon(":/Resources/icons/flip-vertical.svg"), tr("Flip Vertical"), this);
mpFlipVerticalAction->setStatusTip(tr("Flips the item vertically"));
mpFlipVerticalAction->setDisabled(isSystemLibrary);
}
Expand Down Expand Up @@ -1956,7 +1956,7 @@ ModelWidget::ModelWidget(bool newClass, bool extendsClass, LibraryTreeNode *pLib
// modelica text view tool button
mpTextViewToolButton = new QToolButton;
mpTextViewToolButton->setText(Helper::textView);
mpTextViewToolButton->setIcon(QIcon(":/Resources/icons/modeltext.png"));
mpTextViewToolButton->setIcon(QIcon(":/Resources/icons/modeltext.svg"));
mpTextViewToolButton->setIconSize(Helper::buttonIconSize);
mpTextViewToolButton->setToolTip(Helper::textView);
mpTextViewToolButton->setAutoRaise(true);
Expand All @@ -1966,7 +1966,7 @@ ModelWidget::ModelWidget(bool newClass, bool extendsClass, LibraryTreeNode *pLib
// documentation view tool button
mpDocumentationViewToolButton = new QToolButton;
mpDocumentationViewToolButton->setText(Helper::documentationView);
mpDocumentationViewToolButton->setIcon(QIcon(":/Resources/icons/info-icon.png"));
mpDocumentationViewToolButton->setIcon(QIcon(":/Resources/icons/info-icon.svg"));
mpDocumentationViewToolButton->setIconSize(Helper::buttonIconSize);
mpDocumentationViewToolButton->setToolTip(Helper::documentationView);
mpDocumentationViewToolButton->setAutoRaise(true);
Expand Down Expand Up @@ -2056,7 +2056,7 @@ ModelWidget::ModelWidget(QString text, LibraryTreeNode *pLibraryTreeNode, ModelW
// text view tool button
mpTextViewToolButton = new QToolButton;
mpTextViewToolButton->setText(Helper::textView);
mpTextViewToolButton->setIcon(QIcon(":/Resources/icons/modeltext.png"));
mpTextViewToolButton->setIcon(QIcon(":/Resources/icons/modeltext.svg"));
mpTextViewToolButton->setIconSize(Helper::buttonIconSize);
mpTextViewToolButton->setToolTip(Helper::textView);
mpTextViewToolButton->setAutoRaise(true);
Expand Down Expand Up @@ -2141,7 +2141,7 @@ ModelWidget::ModelWidget(QString text, QString Xml, LibraryTreeNode *pLibraryTre
// xml view tool button
mpTextViewToolButton = new QToolButton;
mpTextViewToolButton->setText(Helper::textView);
mpTextViewToolButton->setIcon(QIcon(":/Resources/icons/modeltext.png"));
mpTextViewToolButton->setIcon(QIcon(":/Resources/icons/modeltext.svg"));
mpTextViewToolButton->setIconSize(Helper::buttonIconSize);
mpTextViewToolButton->setToolTip(Helper::textView);
mpTextViewToolButton->setAutoRaise(true);
Expand Down Expand Up @@ -2677,7 +2677,7 @@ void ModelWidget::showModelicaTextView(bool checked)
{
QMdiSubWindow *pSubWindow = mpModelWidgetContainer->getCurrentMdiSubWindow();
if (pSubWindow)
pSubWindow->setWindowIcon(QIcon(":/Resources/icons/modeltext.png"));
pSubWindow->setWindowIcon(QIcon(":/Resources/icons/modeltext.svg"));
if (!checked or (checked and mpModelicaTextEditor->isVisible()))
return;
mpViewTypeLabel->setText(StringHandler::getViewType(StringHandler::ModelicaText));
Expand Down
2 changes: 1 addition & 1 deletion OMEdit/OMEditGUI/Options/OptionsDialog.cpp
Expand Up @@ -674,7 +674,7 @@ void OptionsDialog::addListItems()
pLibrariesItem->setText(Helper::libraries);
// Modelica Text Item
QListWidgetItem *pModelicaTextEditorItem = new QListWidgetItem(mpOptionsList);
pModelicaTextEditorItem->setIcon(QIcon(":/Resources/icons/modeltextoptions.png"));
pModelicaTextEditorItem->setIcon(QIcon(":/Resources/icons/modeltext.svg"));
pModelicaTextEditorItem->setText(tr("Modelica Text Editor"));
// Graphical Views Item
QListWidgetItem *pGraphicalViewsItem = new QListWidgetItem(mpOptionsList);
Expand Down
Binary file modified OMEdit/OMEditGUI/Resources/icons/bitmap-shape.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
133 changes: 133 additions & 0 deletions OMEdit/OMEditGUI/Resources/icons/bitmap-shape.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed OMEdit/OMEditGUI/Resources/icons/ellipse-shape.png
Binary file not shown.

0 comments on commit 78dc30a

Please sign in to comment.