aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Test combobox that show colors.

Browse Source 
--HG--
branch : feature
This commit is contained in:
Roman Telezhynskyi 2015-02-02 12:28:09 +02:00
parent de1c9d8a77
commit e2fab3345a
6 changed files with 86 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/dialogs/tools/dialogendline.cpp
View File

@ -64,6 +64,7 @@ DialogEndLine::DialogEndLine(const VContainer *data, const quint32 &toolId, QWid
FillComboBoxPoints(ui->comboBoxBasePoint);
FillComboBoxTypeLine(ui->comboBoxLineType, VAbstractTool::LineStylesPics());
FillComboBoxLineColors(ui->comboBoxLineColor);
connect(ui->toolButtonPutHereLength, &QPushButton::clicked, this, &DialogEndLine::PutHere);
connect(ui->toolButtonPutHereAngle, &QPushButton::clicked, this, &DialogEndLine::PutAngle);

13
src/app/dialogs/tools/dialogendline.ui
View File

@ -409,6 +409,9 @@
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<layout class="QFormLayout" name="formLayout">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label_3">
<property name="sizePolicy">
@ -477,6 +480,16 @@
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Line color</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QComboBox" name="comboBoxLineColor"/>
</item>
</layout>
</item>
<item>

56
src/app/dialogs/tools/dialogtool.cpp
View File

@ -301,6 +301,50 @@ void DialogTool::FillComboBoxTypeLine(QComboBox *box, const QMap<QString, QIcon>
box->setCurrentIndex(1);
}
//---------------------------------------------------------------------------------------------------------------------
void DialogTool::FillComboBoxLineColors(QComboBox *box) const
{
SCASSERT(box != nullptr);
const QStringList colorNames = VAbstractTool::Colors();
for (int i = 0; i < colorNames.size(); ++i)
{
QString name;
switch (i)
{
case 0: // ColorBlack
name = tr("black");
break;
case 1: // ColorGreen
name = tr("green");
break;
case 2: // ColorBlue
name = tr("blue");
break;
case 3: // ColorDarkRed
name = tr("dark red");
break;
case 4: // ColorDarkGreen
name = tr("dark green");
break;
case 5: // ColorDarkBlue
name = tr("dark blue");
break;
case 6: // ColorYellow
name = tr("yellow");
break;
default:
name = tr("black");
break;
}
QPixmap pix(16, 16);
pix.fill(QColor(colorNames.at(i)));
box->insertItem(i, QIcon(pix), name, QVariant(colorNames.at(i)));
}
}
//---------------------------------------------------------------------------------------------------------------------
/**
* @brief getTypeLine return type of line
@ -318,6 +362,18 @@ QString DialogTool::GetTypeLine(const QComboBox *box) const
return value;
}
//---------------------------------------------------------------------------------------------------------------------
QString DialogTool::GetLineColor(const QComboBox *box) const
{
SCASSERT(box != nullptr)
QString value = box->currentData().toString();
if (value.isEmpty())
{
value = VAbstractTool::ColorBlack;
}
return value;
}
//---------------------------------------------------------------------------------------------------------------------
/**
* @brief SetupTypeLine setupe type of line

1
src/app/dialogs/tools/dialogtool.h
View File

@ -216,6 +216,7 @@ protected:
ComboBoxCutSpline cut = ComboBoxCutSpline::NoCutSpline)const;
void FillComboBoxCurves(QComboBox *box)const;
void FillComboBoxTypeLine(QComboBox *box, const QMap<QString, QIcon> &stylesPics) const;
void FillComboBoxLineColors(QComboBox *box)const;
virtual void CheckState();
QString GetTypeLine(const QComboBox *box)const;
template <class key, class val>

4
src/app/tools/vabstracttool.cpp
View File

@ -85,8 +85,8 @@ const QString VAbstractTool::ColorGreen = QStringLiteral("green");
const QString VAbstractTool::ColorBlue = QStringLiteral("blue");
const QString VAbstractTool::ColorDarkRed = QStringLiteral("darkRed");
const QString VAbstractTool::ColorDarkGreen = QStringLiteral("darkGreen");
const QString VAbstractTool::ColorDarkBlue = QStringLiteral("DarkBlue");
const QString VAbstractTool::ColorYellow = QStringLiteral("Yellow");
const QString VAbstractTool::ColorDarkBlue = QStringLiteral("darkBlue");
const QString VAbstractTool::ColorYellow = QStringLiteral("yellow");
//---------------------------------------------------------------------------------------------------------------------
/**

13
src/app/tools/vabstracttool.h
View File

@ -86,6 +86,9 @@ public:
static const QString AttrAxisP1;
static const QString AttrAxisP2;
static const QString AttrCurve;
static const QString AttrLineColor;
static const QString AttrColor;
static const QString TypeLineNone;
static const QString TypeLineLine;
static const QString TypeLineDashLine;
@ -93,10 +96,20 @@ public:
static const QString TypeLineDashDotLine;
static const QString TypeLineDashDotDotLine;
static const QString ColorBlack;
static const QString ColorGreen;
static const QString ColorBlue;
static const QString ColorDarkRed;
static const QString ColorDarkGreen;
static const QString ColorDarkBlue;
static const QString ColorYellow;
static const QStringList StylesList();
static Qt::PenStyle LineStyleToPenStyle(const QString &typeLine);
static QMap<QString, QIcon> LineStylesPics();
static const QStringList Colors();
static void AddRecord(const quint32 id, const Tool &toolType, VPattern *doc);
const VContainer *getData() const;