Use icon from theme. Move icons to internal theme for Windows systems.
--HG-- branch : DialogTools
|
@ -79,14 +79,14 @@ void DialogEndLine::DeployFormulaTextEdit()
|
||||||
if (ui->plainTextEditFormula->height() < DIALOGENDLINE_MAX_FORMULA_HEIGHT)
|
if (ui->plainTextEditFormula->height() < DIALOGENDLINE_MAX_FORMULA_HEIGHT)
|
||||||
{
|
{
|
||||||
ui->plainTextEditFormula->setFixedHeight(DIALOGENDLINE_MAX_FORMULA_HEIGHT);
|
ui->plainTextEditFormula->setFixedHeight(DIALOGENDLINE_MAX_FORMULA_HEIGHT);
|
||||||
QIcon icon(":/icon/16x16/go-next.png");
|
//Set icon from theme (internal for Windows system)
|
||||||
ui->pushButtonGrowLength->setIcon(icon);
|
ui->pushButtonGrowLength->setIcon(QIcon::fromTheme("go-next"));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
ui->plainTextEditFormula->setFixedHeight(this->formulaBaseHeight);
|
ui->plainTextEditFormula->setFixedHeight(this->formulaBaseHeight);
|
||||||
QIcon icon(":/icon/16x16/go-down.png");
|
//Set icon from theme (internal for Windows system)
|
||||||
ui->pushButtonGrowLength->setIcon(icon);
|
ui->pushButtonGrowLength->setIcon(QIcon::fromTheme("go-down"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>486</width>
|
<width>486</width>
|
||||||
<height>522</height>
|
<height>586</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="sizePolicy">
|
<property name="sizePolicy">
|
||||||
|
@ -186,9 +186,7 @@
|
||||||
<string/>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<property name="icon">
|
<property name="icon">
|
||||||
<iconset resource="../../share/resources/icon.qrc">
|
<iconset theme="go-down"/>
|
||||||
<normaloff>:/icon/16x16/go-down.png</normaloff>
|
|
||||||
<activeoff>:/icon/16x16/go-next.png</activeoff>:/icon/16x16/go-down.png</iconset>
|
|
||||||
</property>
|
</property>
|
||||||
<property name="iconSize">
|
<property name="iconSize">
|
||||||
<size>
|
<size>
|
||||||
|
|
|
@ -52,7 +52,5 @@
|
||||||
<file>icon/flags/uk.png</file>
|
<file>icon/flags/uk.png</file>
|
||||||
<file>icon/Graduation.png</file>
|
<file>icon/Graduation.png</file>
|
||||||
<file>icon/individual.png</file>
|
<file>icon/individual.png</file>
|
||||||
<file>icon/16x16/go-down.png</file>
|
|
||||||
<file>icon/16x16/go-next.png</file>
|
|
||||||
</qresource>
|
</qresource>
|
||||||
</RCC>
|
</RCC>
|
||||||
|
|
Before Width: | Height: | Size: 829 B |
Before Width: | Height: | Size: 756 B After Width: | Height: | Size: 756 B |
BIN
src/app/share/resources/icons/win.icon.theme/24x24/actions/go-down.png
Executable file
After Width: | Height: | Size: 1.4 KiB |
BIN
src/app/share/resources/icons/win.icon.theme/24x24/actions/go-next.png
Normal file → Executable file
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.4 KiB |
BIN
src/app/share/resources/icons/win.icon.theme/24x24/actions/process-stop.png
Normal file → Executable file
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.4 KiB |
BIN
src/app/share/resources/icons/win.icon.theme/32x32/actions/go-down.png
Executable file
After Width: | Height: | Size: 2.2 KiB |
|
@ -34,5 +34,8 @@
|
||||||
<file alias="24x24/actions/list-add.png">icons/win.icon.theme/24x24/actions/list-add.png</file>
|
<file alias="24x24/actions/list-add.png">icons/win.icon.theme/24x24/actions/list-add.png</file>
|
||||||
<file alias="32x32/actions/list-remove.png">icons/win.icon.theme/32x32/actions/list-remove.png</file>
|
<file alias="32x32/actions/list-remove.png">icons/win.icon.theme/32x32/actions/list-remove.png</file>
|
||||||
<file alias="32x32/actions/list-add.png">icons/win.icon.theme/32x32/actions/list-add.png</file>
|
<file alias="32x32/actions/list-add.png">icons/win.icon.theme/32x32/actions/list-add.png</file>
|
||||||
|
<file>icons/win.icon.theme/16x16/actions/go-down.png</file>
|
||||||
|
<file>icons/win.icon.theme/24x24/actions/go-down.png</file>
|
||||||
|
<file>icons/win.icon.theme/32x32/actions/go-down.png</file>
|
||||||
</qresource>
|
</qresource>
|
||||||
</RCC>
|
</RCC>
|
||||||
|
|