kindred/create
1
1
Fork 0
Code Issues 31 Pull Requests 1 Actions 4 Packages Projects 9 Releases 2 Wiki Activity

[Gui] New Icons for HiddenLine and NoShading

Browse Source 
Just an experiment, didn't try to compile
Gui: Changed icons in Draw Style menu

And also saved old icons in pure svg.
This commit is contained in:
carlopav
2020-03-01 22:09:33 +01:00
committed by Yorik van Havre
parent 7a622e7021
commit a3dfd14c2a
8 changed files with 860 additions and 1117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
src/Gui/CommandView.cpp
View File

@@ -597,33 +597,33 @@ Gui::Action * StdCmdDrawStyle::createAction(void)
a0->setShortcut(QKeySequence(QString::fromUtf8("V,1")));
QAction* a1 = pcAction->addAction(QString());
a1->setCheckable(true);
a1->setIcon(BitmapFactory().iconFromTheme("DrawStyleFlatLines"));
a1->setObjectName(QString::fromLatin1("Std_DrawStyleFlatLines"));
a1->setShortcut(QKeySequence(QString::fromUtf8("V,2")));
a1->setIcon(BitmapFactory().iconFromTheme("DrawStylePoints"));
a1->setObjectName(QString::fromLatin1("Std_DrawStylePoints"));
a1->setShortcut(QKeySequence(QString::fromUtf8("V,2")));
QAction* a2 = pcAction->addAction(QString());
a2->setCheckable(true);
a2->setIcon(BitmapFactory().iconFromTheme("DrawStyleShaded"));
a2->setObjectName(QString::fromLatin1("Std_DrawStyleShaded"));
a2->setIcon(BitmapFactory().iconFromTheme("DrawStyleWireFrame"));
a2->setObjectName(QString::fromLatin1("Std_DrawStyleWireframe"));
a2->setShortcut(QKeySequence(QString::fromUtf8("V,3")));
QAction* a3 = pcAction->addAction(QString());
a3->setCheckable(true);
a3->setIcon(BitmapFactory().iconFromTheme("DrawStyleWireFrame"));
a3->setObjectName(QString::fromLatin1("Std_DrawStyleWireframe"));
a3->setIcon(BitmapFactory().iconFromTheme("DrawStyleHiddenLine"));
a3->setObjectName(QString::fromLatin1("Std_DrawStyleHiddenLine"));
a3->setShortcut(QKeySequence(QString::fromUtf8("V,4")));
QAction* a4 = pcAction->addAction(QString());
a4->setCheckable(true);
a4->setIcon(BitmapFactory().iconFromTheme("DrawStylePoints"));
a4->setObjectName(QString::fromLatin1("Std_DrawStylePoints"));
a4->setIcon(BitmapFactory().iconFromTheme("DrawStyleNoShading"));
a4->setObjectName(QString::fromLatin1("Std_DrawStyleNoShading"));
a4->setShortcut(QKeySequence(QString::fromUtf8("V,5")));
QAction* a5 = pcAction->addAction(QString());
a5->setCheckable(true);
a5->setIcon(BitmapFactory().iconFromTheme("DrawStyleWireFrame"));
a5->setObjectName(QString::fromLatin1("Std_DrawStyleHiddenLine"));
a5->setIcon(BitmapFactory().iconFromTheme("DrawStyleShaded"));
a5->setObjectName(QString::fromLatin1("Std_DrawStyleShaded"));
a5->setShortcut(QKeySequence(QString::fromUtf8("V,6")));
QAction* a6 = pcAction->addAction(QString());
a6->setCheckable(true);
a6->setIcon(BitmapFactory().iconFromTheme("DrawStyleWireFrame"));
a6->setObjectName(QString::fromLatin1("Std_DrawStyleNoShading"));
a1->setCheckable(true);
a6->setIcon(BitmapFactory().iconFromTheme("DrawStyleFlatLines"));
a6->setObjectName(QString::fromLatin1("Std_DrawStyleFlatLines"));
a6->setShortcut(QKeySequence(QString::fromUtf8("V,7")));
@@ -649,34 +649,34 @@ void StdCmdDrawStyle::languageChange()
"Std_DrawStyle", "Normal mode"));
a[1]->setText(QCoreApplication::translate(
"Std_DrawStyle", "Flat lines"));
a[1]->setToolTip(QCoreApplication::translate(
"Std_DrawStyle", "Flat lines mode"));
a[2]->setText(QCoreApplication::translate(
"Std_DrawStyle", "Shaded"));
a[2]->setToolTip(QCoreApplication::translate(
"Std_DrawStyle", "Shaded mode"));
a[3]->setText(QCoreApplication::translate(
"Std_DrawStyle", "Wireframe"));
a[3]->setToolTip(QCoreApplication::translate(
"Std_DrawStyle", "Wireframe mode"));
a[4]->setText(QCoreApplication::translate(
"Std_DrawStyle", "Points"));
a[4]->setToolTip(QCoreApplication::translate(
a[1]->setToolTip(QCoreApplication::translate(
"Std_DrawStyle", "Points mode"));
a[5]->setText(QCoreApplication::translate(
a[2]->setText(QCoreApplication::translate(
"Std_DrawStyle", "Wireframe"));
a[2]->setToolTip(QCoreApplication::translate(
"Std_DrawStyle", "Wireframe mode"));
a[3]->setText(QCoreApplication::translate(
"Std_DrawStyle", "Hidden line"));
a[5]->setToolTip(QCoreApplication::translate(
a[3]->setToolTip(QCoreApplication::translate(
"Std_DrawStyle", "Hidden line mode"));
a[6]->setText(QCoreApplication::translate(
a[4]->setText(QCoreApplication::translate(
"Std_DrawStyle", "No shading"));
a[6]->setToolTip(QCoreApplication::translate(
a[4]->setToolTip(QCoreApplication::translate(
"Std_DrawStyle", "No shading mode"));
a[5]->setText(QCoreApplication::translate(
"Std_DrawStyle", "Shaded"));
a[5]->setToolTip(QCoreApplication::translate(
"Std_DrawStyle", "Shaded mode"));
a[6]->setText(QCoreApplication::translate(
"Std_DrawStyle", "Flat lines"));
a[6]->setToolTip(QCoreApplication::translate(
"Std_DrawStyle", "Flat lines mode"));
}
void StdCmdDrawStyle::updateIcon(const MDIView *view)
@@ -692,32 +692,32 @@ void StdCmdDrawStyle::updateIcon(const MDIView *view)
if (!actionGroup)
return;
if (mode == "Flat Lines")
if (mode == "Point")
{
actionGroup->setCheckedAction(1);
return;
}
if (mode == "Shaded")
if (mode == "Wireframe")
{
actionGroup->setCheckedAction(2);
return;
}
if (mode == "Wireframe")
if (mode == "Hidden Line")
{
actionGroup->setCheckedAction(3);
return;
}
if (mode == "Point")
if (mode == "No shading")
{
actionGroup->setCheckedAction(4);
return;
}
if (mode == "Hidden Line")
if (mode == "Shaded")
{
actionGroup->setCheckedAction(5);
return;
}
if (mode == "No shading")
}
if (mode == "Flat Lines")
{
actionGroup->setCheckedAction(6);
return;
@@ -743,23 +743,23 @@ void StdCmdDrawStyle::activated(int iMsg)
switch (iMsg)
{
case 1:
(oneChangedSignal) ? viewer->updateOverrideMode("Flat Lines") : viewer->setOverrideMode("Flat Lines");
break;
case 2:
(oneChangedSignal) ? viewer->updateOverrideMode("Shaded") : viewer->setOverrideMode("Shaded");
break;
case 3:
(oneChangedSignal) ? viewer->updateOverrideMode("Wireframe") : viewer->setOverrideMode("Wireframe");
break;
case 4:
(oneChangedSignal) ? viewer->updateOverrideMode("Point") : viewer->setOverrideMode("Point");
break;
case 5:
case 2:
(oneChangedSignal) ? viewer->updateOverrideMode("Wireframe") : viewer->setOverrideMode("Wireframe");
break;
case 3:
(oneChangedSignal) ? viewer->updateOverrideMode("Hidden Line") : viewer->setOverrideMode("Hidden Line");
break;
case 6:
case 4:
(oneChangedSignal) ? viewer->updateOverrideMode("No Shading") : viewer->setOverrideMode("No Shading");
break;
case 5:
(oneChangedSignal) ? viewer->updateOverrideMode("Shaded") : viewer->setOverrideMode("Shaded");
break;
case 6:
(oneChangedSignal) ? viewer->updateOverrideMode("Flat Lines") : viewer->setOverrideMode("Flat Lines");
break;
default:
(oneChangedSignal) ? viewer->updateOverrideMode("As Is") : viewer->setOverrideMode("As Is");
break;