From 52761f04ceeb57b64305740e0270db6bc10eb5de Mon Sep 17 00:00:00 2001 From: Patrick Proy Date: Sun, 8 Jun 2014 15:46:04 +0200 Subject: [PATCH] Changed Icon path --HG-- branch : DialogTools --- src/app/dialogs/tools/dialogalongline.cpp | 9 +++++++-- src/app/dialogs/tools/dialogalongline.ui | 16 +++++++++++----- src/app/dialogs/tools/dialogendline.cpp | 11 ++++++++--- 3 files changed, 26 insertions(+), 10 deletions(-) diff --git a/src/app/dialogs/tools/dialogalongline.cpp b/src/app/dialogs/tools/dialogalongline.cpp index d5e87e17e..90412de76 100644 --- a/src/app/dialogs/tools/dialogalongline.cpp +++ b/src/app/dialogs/tools/dialogalongline.cpp @@ -61,6 +61,9 @@ DialogAlongLine::DialogAlongLine(const VContainer *data, QWidget *parent) connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogAlongLine::DeployFormulaTextEdit); InitVariables(ui); connect(listWidget, &QListWidget::itemDoubleClicked, this, &DialogTool::PutVal); + + ui->pushButtonGrowLength->setIcon(QIcon::fromTheme("go-down", + QIcon(":/icons/win.icon.theme/icons/win.icon.theme/16x16/actions/go-down.png"))); } //--------------------------------------------------------------------------------------------------------------------- @@ -78,13 +81,15 @@ void DialogAlongLine::DeployFormulaTextEdit() { ui->plainTextEditFormula->setFixedHeight(DIALOGALONLINE_MAX_FORMULA_HEIGHT); //Set icon from theme (internal for Windows system) - ui->pushButtonGrowLength->setIcon(QIcon::fromTheme("go-next")); + ui->pushButtonGrowLength->setIcon(QIcon::fromTheme("go-next", + QIcon(":/icons/win.icon.theme/icons/win.icon.theme/16x16/actions/go-next.png"))); } else { ui->plainTextEditFormula->setFixedHeight(this->formulaBaseHeight); //Set icon from theme (internal for Windows system) - ui->pushButtonGrowLength->setIcon(QIcon::fromTheme("go-down")); + ui->pushButtonGrowLength->setIcon(QIcon::fromTheme("go-down", + QIcon(":/icons/win.icon.theme/icons/win.icon.theme/16x16/actions/go-down.png"))); } } diff --git a/src/app/dialogs/tools/dialogalongline.ui b/src/app/dialogs/tools/dialogalongline.ui index c935b0f11..5bf4d8691 100644 --- a/src/app/dialogs/tools/dialogalongline.ui +++ b/src/app/dialogs/tools/dialogalongline.ui @@ -172,8 +172,14 @@ - 16 - 16 + 18 + 18 + + + + + 0 + 0 @@ -183,9 +189,8 @@ - - - + + :/icons/win.icon.theme/icons/win.icon.theme/16x16/actions/go-down.png:/icons/win.icon.theme/icons/win.icon.theme/16x16/actions/go-down.png @@ -463,6 +468,7 @@ + diff --git a/src/app/dialogs/tools/dialogendline.cpp b/src/app/dialogs/tools/dialogendline.cpp index 573e1a921..580db8ebe 100644 --- a/src/app/dialogs/tools/dialogendline.cpp +++ b/src/app/dialogs/tools/dialogendline.cpp @@ -62,7 +62,10 @@ DialogEndLine::DialogEndLine(const VContainer *data, QWidget *parent) connect(ui->lineEditNamePoint, &QLineEdit::textChanged, this, &DialogEndLine::NamePointChanged); connect(ui->plainTextEditFormula, &QPlainTextEdit::textChanged, this, &DialogEndLine::FormulaTextChanged); connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogEndLine::DeployFormulaTextEdit); - //ui-> + + ui->pushButtonGrowLength->setIcon(QIcon::fromTheme("go-down", + QIcon(":/icons/win.icon.theme/icons/win.icon.theme/16x16/actions/go-down.png"))); + } //--------------------------------------------------------------------------------------------------------------------- @@ -80,13 +83,15 @@ void DialogEndLine::DeployFormulaTextEdit() { ui->plainTextEditFormula->setFixedHeight(DIALOGENDLINE_MAX_FORMULA_HEIGHT); //Set icon from theme (internal for Windows system) - ui->pushButtonGrowLength->setIcon(QIcon::fromTheme("go-next")); + ui->pushButtonGrowLength->setIcon(QIcon::fromTheme("go-next", + QIcon(":/icons/win.icon.theme/icons/win.icon.theme/16x16/actions/go-next.png"))); } else { ui->plainTextEditFormula->setFixedHeight(this->formulaBaseHeight); //Set icon from theme (internal for Windows system) - ui->pushButtonGrowLength->setIcon(QIcon::fromTheme("go-down")); + ui->pushButtonGrowLength->setIcon(QIcon::fromTheme("go-down", + QIcon(":/icons/win.icon.theme/icons/win.icon.theme/16x16/actions/go-down.png"))); } }