diff --git a/src/Gui/CommandDoc.cpp b/src/Gui/CommandDoc.cpp
index 5aa1e6368..68fd0bef8 100644
--- a/src/Gui/CommandDoc.cpp
+++ b/src/Gui/CommandDoc.cpp
@@ -484,11 +484,12 @@ DEF_STD_CMD_A(StdCmdRevert);
StdCmdRevert::StdCmdRevert()
:Command("Std_Revert")
{
- sGroup = QT_TR_NOOP("File");
- sMenuText = QT_TR_NOOP("Revert");
- sToolTipText = QT_TR_NOOP("Reverts to the saved version of this file");
- sWhatsThis = "Std_Revert";
- sStatusTip = QT_TR_NOOP("Reverts to the saved version of this file");
+ sGroup = QT_TR_NOOP("File");
+ sMenuText = QT_TR_NOOP("Revert");
+ sToolTipText = QT_TR_NOOP("Reverts to the saved version of this file");
+ sWhatsThis = "Std_Revert";
+ sStatusTip = QT_TR_NOOP("Reverts to the saved version of this file");
+ //sPixmap = "document-revert";
}
void StdCmdRevert::activated(int iMsg)
@@ -611,6 +612,7 @@ StdCmdPrintPreview::StdCmdPrintPreview()
sToolTipText = QT_TR_NOOP("Print the document");
sWhatsThis = "Std_PrintPreview";
sStatusTip = QT_TR_NOOP("Print preview");
+ sPixmap = "document-print-preview";
}
void StdCmdPrintPreview::activated(int iMsg)
@@ -668,7 +670,7 @@ StdCmdQuit::StdCmdQuit()
sWhatsThis = "Std_Quit";
sStatusTip = QT_TR_NOOP("Quits the application");
#if QT_VERSION >= 0x040200
- sPixmap = "system-log-out";
+ sPixmap = "application-exit";
#endif
sAccel = "Alt+F4";
}
diff --git a/src/Gui/CommandMacro.cpp b/src/Gui/CommandMacro.cpp
index 50e09f842..c9995c46c 100644
--- a/src/Gui/CommandMacro.cpp
+++ b/src/Gui/CommandMacro.cpp
@@ -49,7 +49,7 @@ StdCmdDlgMacroRecord::StdCmdDlgMacroRecord()
sToolTipText = QT_TR_NOOP("Opens a dialog to record a macro");
sWhatsThis = "Std_DlgMacroRecord";
sStatusTip = QT_TR_NOOP("Opens a dialog to record a macro");
- sPixmap = "macro-record";
+ sPixmap = "media-record";
eType = 0;
}
@@ -77,7 +77,7 @@ StdCmdMacroStopRecord::StdCmdMacroStopRecord()
sToolTipText = QT_TR_NOOP("Stop the macro recording session");
sWhatsThis = "Std_MacroStopRecord";
sStatusTip = QT_TR_NOOP("Stop the macro recording session");
- sPixmap = "macro-stop";
+ sPixmap = "media-playback-stop";
eType = 0;
}
@@ -132,7 +132,7 @@ StdCmdDlgMacroExecuteDirect::StdCmdDlgMacroExecuteDirect()
sToolTipText = QT_TR_NOOP("Execute the macro in the editor");
sWhatsThis = "Std_DlgMacroExecuteDirect";
sStatusTip = QT_TR_NOOP("Execute the macro in the editor");
- sPixmap = "macro-execute";
+ sPixmap = "media-playback-start";
sAccel = "Ctrl+F6";
eType = 0;
}
diff --git a/src/Gui/CommandStd.cpp b/src/Gui/CommandStd.cpp
index 11473373f..5f178bfaf 100644
--- a/src/Gui/CommandStd.cpp
+++ b/src/Gui/CommandStd.cpp
@@ -678,7 +678,7 @@ StdCmdUnitsCalculator::StdCmdUnitsCalculator()
sToolTipText = QT_TR_NOOP("Start the units calculator");
sWhatsThis = QT_TR_NOOP("Start the units calculator");
sStatusTip = QT_TR_NOOP("Start the units calculator");
- //sPixmap = "";
+ sPixmap = "accessories-calculator";
eType = 0;
}
diff --git a/src/Gui/CommandView.cpp b/src/Gui/CommandView.cpp
index a72bebd9f..311323e15 100644
--- a/src/Gui/CommandView.cpp
+++ b/src/Gui/CommandView.cpp
@@ -1250,25 +1250,25 @@ DEF_STD_CMD_A(StdCmdViewFitAll);
StdCmdViewFitAll::StdCmdViewFitAll()
: Command("Std_ViewFitAll")
{
- sGroup = QT_TR_NOOP("Standard-View");
- sMenuText = QT_TR_NOOP("Fit all");
- sToolTipText = QT_TR_NOOP("Fits the whole content on the screen");
- sWhatsThis = "Std_ViewFitAll";
- sStatusTip = QT_TR_NOOP("Fits the whole content on the screen");
- sPixmap = "view-zoom-all";
- eType = Alter3DView;
+ sGroup = QT_TR_NOOP("Standard-View");
+ sMenuText = QT_TR_NOOP("Fit all");
+ sToolTipText = QT_TR_NOOP("Fits the whole content on the screen");
+ sWhatsThis = "Std_ViewFitAll";
+ sStatusTip = QT_TR_NOOP("Fits the whole content on the screen");
+ sPixmap = "zoom-all";
+ eType = Alter3DView;
}
void StdCmdViewFitAll::activated(int iMsg)
{
- //doCommand(Command::Gui,"Gui.activeDocument().activeView().fitAll()");
- doCommand(Command::Gui,"Gui.SendMsgToActiveView(\"ViewFit\")");
+ //doCommand(Command::Gui,"Gui.activeDocument().activeView().fitAll()");
+ doCommand(Command::Gui,"Gui.SendMsgToActiveView(\"ViewFit\")");
}
bool StdCmdViewFitAll::isActive(void)
{
- //return isViewOfType(Gui::View3DInventor::getClassTypeId());
- return getGuiApplication()->sendHasMsgToActiveView("ViewFit");
+ //return isViewOfType(Gui::View3DInventor::getClassTypeId());
+ return getGuiApplication()->sendHasMsgToActiveView("ViewFit");
}
//===========================================================================
@@ -1285,7 +1285,7 @@ StdCmdViewFitSelection::StdCmdViewFitSelection()
sWhatsThis = "Std_ViewFitSelection";
sStatusTip = QT_TR_NOOP("Fits the selected content on the screen");
#if QT_VERSION >= 0x040200
- sPixmap = "view-zoom-selection";
+ sPixmap = "zoom-selection";
#endif
eType = Alter3DView;
}
@@ -1417,13 +1417,12 @@ DEF_STD_CMD_A(StdCmdViewVR);
StdCmdViewVR::StdCmdViewVR()
: Command("Std_ViewVR")
{
- sGroup = QT_TR_NOOP("Standard-View");
- sMenuText = QT_TR_NOOP("FreeCAD-VR");
- sToolTipText = QT_TR_NOOP("Extend the FreeCAD 3D Window to a Oculus Rift");
- sWhatsThis = "Std_ViewVR";
- sStatusTip = QT_TR_NOOP("Extend the FreeCAD 3D Window to a Oculus Rift");
- sPixmap = "view-zoom-all";
- eType = Alter3DView;
+ sGroup = QT_TR_NOOP("Standard-View");
+ sMenuText = QT_TR_NOOP("FreeCAD-VR");
+ sToolTipText = QT_TR_NOOP("Extend the FreeCAD 3D Window to a Oculus Rift");
+ sWhatsThis = "Std_ViewVR";
+ sStatusTip = QT_TR_NOOP("Extend the FreeCAD 3D Window to a Oculus Rift");
+ eType = Alter3DView;
}
void StdCmdViewVR::activated(int iMsg)
@@ -2039,7 +2038,7 @@ StdViewZoomIn::StdViewZoomIn()
sWhatsThis = "Std_ViewZoom";
sStatusTip = QT_TR_NOOP("Zoom In");
#if QT_VERSION >= 0x040200
- sPixmap = "view-zoom-in";
+ sPixmap = "zoom-in";
#endif
sAccel = keySequenceToAccel(QKeySequence::ZoomIn);
eType = Alter3DView;
@@ -2073,7 +2072,7 @@ StdViewZoomOut::StdViewZoomOut()
sWhatsThis = "Std_ViewZoom";
sStatusTip = QT_TR_NOOP("Zoom Out");
#if QT_VERSION >= 0x040200
- sPixmap = "view-zoom-out";
+ sPixmap = "zoom-out";
#endif
sAccel = keySequenceToAccel(QKeySequence::ZoomOut);
eType = Alter3DView;
@@ -2107,7 +2106,7 @@ StdViewBoxZoom::StdViewBoxZoom()
sWhatsThis = "Std_ViewBoxZoom";
sStatusTip = QT_TR_NOOP("Box zoom");
#if QT_VERSION >= 0x040200
- sPixmap = "view-zoom-border";
+ sPixmap = "zoom-border";
#endif
sAccel = "Ctrl+B";
eType = Alter3DView;
diff --git a/src/Gui/DlgActionsImp.cpp b/src/Gui/DlgActionsImp.cpp
index b439672a2..1f88759b6 100644
--- a/src/Gui/DlgActionsImp.cpp
+++ b/src/Gui/DlgActionsImp.cpp
@@ -559,7 +559,7 @@ IconFolders::IconFolders(const QStringList& paths, QWidget* parent)
edit->setReadOnly(true);
gridLayout->addWidget(edit, row, 0, 1, 1);
QPushButton* removeButton = new QPushButton(this);
- removeButton->setIcon(BitmapFactory().pixmap("edit_remove"));
+ removeButton->setIcon(BitmapFactory().iconFromTheme("list-remove"));
gridLayout->addWidget(removeButton, row, 1, 1, 1);
if (row < numPaths) {
@@ -578,7 +578,7 @@ IconFolders::IconFolders(const QStringList& paths, QWidget* parent)
textLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum);
textLabel->setText(tr("Add or remove custom icon folders"));
addButton = new QPushButton(this);
- addButton->setIcon(BitmapFactory().pixmap("add"));
+ addButton->setIcon(BitmapFactory().iconFromTheme("list-add"));
gridLayout->addWidget(textLabel, maxRow, 0, 1, 1);
gridLayout->addWidget(addButton, maxRow, 1, 1, 1);
diff --git a/src/Gui/Icons/accessories-calculator.svg b/src/Gui/Icons/accessories-calculator.svg
new file mode 100644
index 000000000..88cf76a93
--- /dev/null
+++ b/src/Gui/Icons/accessories-calculator.svg
@@ -0,0 +1,636 @@
+
+
+
diff --git a/src/Gui/Icons/system-log-out.svg b/src/Gui/Icons/application-exit.svg
similarity index 100%
rename from src/Gui/Icons/system-log-out.svg
rename to src/Gui/Icons/application-exit.svg
diff --git a/src/Gui/Icons/document-print-preview.svg b/src/Gui/Icons/document-print-preview.svg
new file mode 100644
index 000000000..d3501ac15
--- /dev/null
+++ b/src/Gui/Icons/document-print-preview.svg
@@ -0,0 +1,703 @@
+
+
+
diff --git a/src/Gui/Icons/add.png b/src/Gui/Icons/list-add.png
similarity index 100%
rename from src/Gui/Icons/add.png
rename to src/Gui/Icons/list-add.png
diff --git a/src/Gui/Icons/add.svg b/src/Gui/Icons/list-add.svg
similarity index 100%
rename from src/Gui/Icons/add.svg
rename to src/Gui/Icons/list-add.svg
diff --git a/src/Gui/Icons/edit_remove.png b/src/Gui/Icons/list-remove.png
similarity index 100%
rename from src/Gui/Icons/edit_remove.png
rename to src/Gui/Icons/list-remove.png
diff --git a/src/Gui/Icons/edit_remove.svg b/src/Gui/Icons/list-remove.svg
similarity index 100%
rename from src/Gui/Icons/edit_remove.svg
rename to src/Gui/Icons/list-remove.svg
diff --git a/src/Gui/Icons/macro-execute.svg b/src/Gui/Icons/media-playback-start.svg
similarity index 100%
rename from src/Gui/Icons/macro-execute.svg
rename to src/Gui/Icons/media-playback-start.svg
diff --git a/src/Gui/Icons/macro-stop.svg b/src/Gui/Icons/media-playback-stop.svg
similarity index 100%
rename from src/Gui/Icons/macro-stop.svg
rename to src/Gui/Icons/media-playback-stop.svg
diff --git a/src/Gui/Icons/macro-record.svg b/src/Gui/Icons/media-record.svg
similarity index 100%
rename from src/Gui/Icons/macro-record.svg
rename to src/Gui/Icons/media-record.svg
diff --git a/src/Gui/Icons/resource.qrc b/src/Gui/Icons/resource.qrc
index fa2240ce5..d96d77153 100644
--- a/src/Gui/Icons/resource.qrc
+++ b/src/Gui/Icons/resource.qrc
@@ -6,8 +6,8 @@
Document.svg
Feature.svg
delete.svg
- edit_remove.svg
- add.svg
+ list-remove.svg
+ list-add.svg
freecad.svg
freecad-doc.png
bulb.svg
@@ -19,9 +19,9 @@
button_add_all.svg
button_valid.svg
button_invalid.svg
- macro-execute.svg
- macro-record.svg
- macro-stop.svg
+ media-playback-start.svg
+ media-record.svg
+ media-playback-stop.svg
preferences-display.svg
preferences-general.svg
preferences-import-export.svg
@@ -50,8 +50,9 @@
document-save.svg
document-save-as.svg
document-print.svg
+ document-print-preview.svg
document-properties.svg
- system-log-out.svg
+ application-exit.svg
edit_OK.svg
edit_Cancel.svg
edit-copy.svg
@@ -72,6 +73,7 @@
applications-accessories.svg
applications-python.svg
accessories-text-editor.svg
+ accessories-calculator.svg
internet-web-browser.svg
view-select.svg
view-unselectable.svg
@@ -86,15 +88,15 @@
view-rear.svg
view-right.svg
view-top.svg
- view-zoom-all.svg
- view-zoom-border.svg
- view-zoom-fit.svg
- view-zoom-in.svg
- view-zoom-out.svg
+ zoom-all.svg
+ zoom-border.svg
+ zoom-fit-best.svg
+ zoom-in.svg
+ zoom-out.svg
+ zoom-selection.svg
view-rotate-left.svg
view-rotate-right.svg
view-measurement.svg
- view-zoom-selection.svg
Tree_Annotation.svg
Tree_Dimension.svg
Tree_Python.svg
diff --git a/src/Gui/Icons/view-zoom-all.svg b/src/Gui/Icons/zoom-all.svg
similarity index 100%
rename from src/Gui/Icons/view-zoom-all.svg
rename to src/Gui/Icons/zoom-all.svg
diff --git a/src/Gui/Icons/view-zoom-border.svg b/src/Gui/Icons/zoom-border.svg
similarity index 100%
rename from src/Gui/Icons/view-zoom-border.svg
rename to src/Gui/Icons/zoom-border.svg
diff --git a/src/Gui/Icons/view-zoom-fit.svg b/src/Gui/Icons/zoom-fit-best.svg
similarity index 100%
rename from src/Gui/Icons/view-zoom-fit.svg
rename to src/Gui/Icons/zoom-fit-best.svg
diff --git a/src/Gui/Icons/view-zoom-in.svg b/src/Gui/Icons/zoom-in.svg
similarity index 100%
rename from src/Gui/Icons/view-zoom-in.svg
rename to src/Gui/Icons/zoom-in.svg
diff --git a/src/Gui/Icons/view-zoom-out.svg b/src/Gui/Icons/zoom-out.svg
similarity index 100%
rename from src/Gui/Icons/view-zoom-out.svg
rename to src/Gui/Icons/zoom-out.svg
diff --git a/src/Gui/Icons/view-zoom-selection.svg b/src/Gui/Icons/zoom-selection.svg
similarity index 100%
rename from src/Gui/Icons/view-zoom-selection.svg
rename to src/Gui/Icons/zoom-selection.svg
diff --git a/src/Gui/SelectionView.cpp b/src/Gui/SelectionView.cpp
index aa4ec2dc2..05b1b8675 100644
--- a/src/Gui/SelectionView.cpp
+++ b/src/Gui/SelectionView.cpp
@@ -260,7 +260,7 @@ void SelectionView::onItemContextMenu(const QPoint& point)
deselectAction->setIcon(QIcon(QString::fromAscii(":/icons/view-unselectable.svg")));
deselectAction->setToolTip(tr("Deselects this object"));
QAction *zoomAction = menu.addAction(tr("Zoom fit"),this,SLOT(zoom()));
- zoomAction->setIcon(QIcon(QString::fromAscii(":/icons/view-zoom-fit.svg")));
+ zoomAction->setIcon(QIcon::fromTheme(QString::fromAscii("zoom-fit-best")));
zoomAction->setToolTip(tr("Selects and fits this object in the 3D window"));
QAction *gotoAction = menu.addAction(tr("Go to selection"),this,SLOT(treeSelect()));
gotoAction->setToolTip(tr("Selects and locates this object in the tree view"));
diff --git a/src/Gui/TaskPanelView.cpp b/src/Gui/TaskPanelView.cpp
index f637f623f..bdec98fc4 100644
--- a/src/Gui/TaskPanelView.cpp
+++ b/src/Gui/TaskPanelView.cpp
@@ -56,31 +56,31 @@ TaskPanelView::TaskPanelView(Gui::Document* pcDocument, QWidget *parent)
gridLayout->addWidget(taskPanel, 0, 0, 2, 1);
iisIconLabel *i1 = new iisIconLabel(
- Gui::BitmapFactory().pixmap("view-zoom-in"), QLatin1String("Do Task 1"), tb1);
+ Gui::BitmapFactory().iconFromTheme("zoom-in"), QLatin1String("Do Task 1"), tb1);
tb1->addIconLabel(i1);
//connect(i1, SIGNAL(activated()), this, SLOT(task1()));
iisIconLabel *i2 = new iisIconLabel(
- Gui::BitmapFactory().pixmap("view-zoom-out"), QLatin1String("Do Task 2"), tb1);
+ Gui::BitmapFactory().iconFromTheme("zoom-out"), QLatin1String("Do Task 2"), tb1);
tb1->addIconLabel(i2);
QHBoxLayout *hbl = new QHBoxLayout();
tb1->groupLayout()->addLayout(hbl);
iisIconLabel *i3 = new iisIconLabel(
- Gui::BitmapFactory().pixmap("edit-copy"), QLatin1String("Do Task 3"), tb1);
+ Gui::BitmapFactory().iconFromTheme("edit-copy"), QLatin1String("Do Task 3"), tb1);
tb1->addIconLabel(i3, false);
hbl->addWidget(i3);
iisIconLabel *i4 = new iisIconLabel(
- Gui::BitmapFactory().pixmap("edit-cut"), QLatin1String("Do Task 4"), tb1);
+ Gui::BitmapFactory().iconFromTheme("edit-cut"), QLatin1String("Do Task 4"), tb1);
tb1->addIconLabel(i4, false);
hbl->addWidget(i4);
i4->setColors(Qt::red, Qt::green, Qt::gray);
i4->setFocusPen(QPen());
iisIconLabel *i5 = new iisIconLabel(
- Gui::BitmapFactory().pixmap("edit-paste"), QLatin1String("Do Task 5"), tb1);
+ Gui::BitmapFactory().iconFromTheme("edit-paste"), QLatin1String("Do Task 5"), tb1);
tb1->addIconLabel(i5);
iisTaskBox *tb2 = new iisTaskBox(
@@ -88,16 +88,16 @@ TaskPanelView::TaskPanelView(Gui::Document* pcDocument, QWidget *parent)
taskPanel->addWidget(tb2);
iisIconLabel *i21 = new iisIconLabel(
- Gui::BitmapFactory().pixmap("document-new"), QLatin1String("Do Task 2.1"), tb2);
+ Gui::BitmapFactory().iconFromTheme("document-new"), QLatin1String("Do Task 2.1"), tb2);
tb2->addIconLabel(i21);
iisIconLabel *i22 = new iisIconLabel(
- Gui::BitmapFactory().pixmap("document-open"), QLatin1String("Do Task 2.2"), tb2);
+ Gui::BitmapFactory().iconFromTheme("document-open"), QLatin1String("Do Task 2.2"), tb2);
tb2->addIconLabel(i22);
i22->setEnabled(false);
iisIconLabel *i23 = new iisIconLabel(
- Gui::BitmapFactory().pixmap("document-save"), QLatin1String("Do Task 2.3"), tb2);
+ Gui::BitmapFactory().iconFromTheme("document-save"), QLatin1String("Do Task 2.3"), tb2);
tb2->addIconLabel(i23);
iisTaskBox *tb3 = new iisTaskBox(QPixmap(), QLatin1String("Group without Icons"), true, this);
@@ -121,7 +121,7 @@ TaskPanelView::TaskPanelView(Gui::Document* pcDocument, QWidget *parent)
taskPanel->addWidget(tb4);
iisIconLabel *i41 = new iisIconLabel(
- Gui::BitmapFactory().pixmap("system-log-out"), QLatin1String("Do Task 4.1"), tb4);
+ Gui::BitmapFactory().iconFromTheme("application-exit"), QLatin1String("Do Task 4.1"), tb4);
tb4->addIconLabel(i41);
iisIconLabel *i42 = new iisIconLabel(QPixmap(), QLatin1String("Do Task 4.2"), tb4);
diff --git a/src/Gui/TaskView/TaskSelectLinkProperty.cpp b/src/Gui/TaskView/TaskSelectLinkProperty.cpp
index 38b252c3f..d144cf42a 100644
--- a/src/Gui/TaskView/TaskSelectLinkProperty.cpp
+++ b/src/Gui/TaskView/TaskSelectLinkProperty.cpp
@@ -56,10 +56,10 @@ TaskSelectLinkProperty::TaskSelectLinkProperty(const char *sFilter,App::Property
this->groupLayout()->addWidget(proxy);
Gui::Selection().Attach(this);
- ui->Remove->setIcon(Gui::BitmapFactory().pixmap("delete"));
- ui->Add->setIcon(Gui::BitmapFactory().pixmap("add"));
- ui->Invert->setIcon(Gui::BitmapFactory().pixmap("edit_remove"));
- ui->Help->setIcon(Gui::BitmapFactory().pixmap("help-browser"));
+ ui->Remove->setIcon(Gui::BitmapFactory().iconFromTheme("delete"));
+ ui->Add->setIcon(Gui::BitmapFactory().iconFromTheme("list-add"));
+ ui->Invert->setIcon(Gui::BitmapFactory().iconFromTheme("list-remove"));
+ ui->Help->setIcon(Gui::BitmapFactory().iconFromTheme("help-browser"));
// deactivate not implemented stuff
ui->Remove->setDisabled(true);
diff --git a/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetStyleBold.svg b/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetStyleBold.svg
index d519c2f76..9268d4ea6 100644
--- a/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetStyleBold.svg
+++ b/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetStyleBold.svg
@@ -1,6 +1,5 @@
-
diff --git a/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetStyleItalic.svg b/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetStyleItalic.svg
index d1b0ff6f3..3a4bc363a 100644
--- a/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetStyleItalic.svg
+++ b/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetStyleItalic.svg
@@ -1,6 +1,5 @@
-
diff --git a/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetStyleUnderline.svg b/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetStyleUnderline.svg
index 7a3bb97bf..22131f6c2 100644
--- a/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetStyleUnderline.svg
+++ b/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetStyleUnderline.svg
@@ -1,6 +1,5 @@
-