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

Merge

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2015-11-16 22:04:56 +02:00
commit e31a6eb841
5 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/status/dialog-warning.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

7
src/libs/vmisc/share/resources/icons/win.icon.theme/index.theme
View File

@ -5,13 +5,18 @@ Inherits=gnome,hicolor
Example=x-directory-normal
#Directories
Directories=16x16/actions,24x24/actions,32x32/actions,32x32/emblems
Directories=16x16/actions,16x16/status,24x24/actions,32x32/actions,32x32/emblems
[16x16/actions]
Size=16
Context=Actions
Type=Fixed
[16x16/status]
Size=16
Context=Status
Type=Fixed
[24x24/actions]
Size=24
Context=Actions

1
src/libs/vmisc/share/resources/theme.qrc
View File

@ -80,5 +80,6 @@
<file alias="16x16/actions/go-previous.png">icons/win.icon.theme/16x16/actions/go-previous.png</file>
<file alias="24x24/actions/go-previous.png">icons/win.icon.theme/24x24/actions/go-previous.png</file>
<file alias="32x32/actions/go-previous.png">icons/win.icon.theme/32x32/actions/go-previous.png</file>
<file alias="16x16/status/dialog-warning.png">icons/win.icon.theme/16x16/status/dialog-warning.png</file>
</qresource>
</RCC>

16
src/libs/vtools/dialogs/tools/dialogdetail.cpp
View File

@ -455,14 +455,27 @@ void DialogDetail::ScrollDown()
//---------------------------------------------------------------------------------------------------------------------
bool DialogDetail::DetailIsValid() const
{
const QIcon icon = QIcon::fromTheme("dialog-warning",
QIcon(":/icons/win.icon.theme/16x16/status/dialog-warning.png"));
const QPixmap pixmap = icon.pixmap(QSize(16, 16));
QByteArray byteArray;
QBuffer buffer(&byteArray);
pixmap.save(&buffer, "PNG");
QString url = QString("<img src=\"data:image/png;base64,") + byteArray.toBase64() + "\"/>";
if (ui.listWidget->count() < 3)
{
url += QString(" ") + tr("You need more points!");
ui.helpLabel->setText(url);
return false;
}
else
{
if (FirstPointEqualLast())
{
url += QString(" ") +tr("First point can not equal the last point!");
ui.helpLabel->setText(url);
return false;
}
else
@ -474,11 +487,14 @@ bool DialogDetail::DetailIsValid() const
if (QString::compare(previousRow, nextRow) == 0)
{
url += QString(" ") +tr("You have double points!");
ui.helpLabel->setText(url);
return false;
}
}
}
}
ui.helpLabel->setText(tr("Ready!"));
return true;
}

13
src/libs/vtools/dialogs/tools/dialogdetail.ui
View File

@ -390,6 +390,19 @@
</item>
</layout>
</item>
<item>
<widget class="QLabel" name="helpLabel">
<property name="text">
<string>Ready!</string>
</property>
<property name="textFormat">
<enum>Qt::RichText</enum>
</property>
<property name="scaledContents">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">