fix: 修复元数据可视化问题以及再次编辑空颜色为黑色问题;
This commit is contained in:
parent
fecbcf821e
commit
5a83a68465
|
@ -1993,27 +1993,27 @@
|
|||
<context>
|
||||
<name>MetaDataModel</name>
|
||||
<message>
|
||||
<location filename="../../src/model/metadatamodel.cpp" line="99"/>
|
||||
<location filename="../../src/model/metadatamodel.cpp" line="102"/>
|
||||
<source>Begin</source>
|
||||
<translation>开始</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../src/model/metadatamodel.cpp" line="101"/>
|
||||
<location filename="../../src/model/metadatamodel.cpp" line="104"/>
|
||||
<source>End</source>
|
||||
<translation>结束</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../src/model/metadatamodel.cpp" line="103"/>
|
||||
<location filename="../../src/model/metadatamodel.cpp" line="106"/>
|
||||
<source>Foreground</source>
|
||||
<translation>前景色</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../src/model/metadatamodel.cpp" line="105"/>
|
||||
<location filename="../../src/model/metadatamodel.cpp" line="108"/>
|
||||
<source>Background</source>
|
||||
<translation>背景色</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../src/model/metadatamodel.cpp" line="107"/>
|
||||
<location filename="../../src/model/metadatamodel.cpp" line="110"/>
|
||||
<source>Comment</source>
|
||||
<translation>批注</translation>
|
||||
</message>
|
||||
|
|
|
@ -1993,27 +1993,27 @@
|
|||
<context>
|
||||
<name>MetaDataModel</name>
|
||||
<message>
|
||||
<location filename="../../src/model/metadatamodel.cpp" line="99"/>
|
||||
<location filename="../../src/model/metadatamodel.cpp" line="102"/>
|
||||
<source>Begin</source>
|
||||
<translation>開始</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../src/model/metadatamodel.cpp" line="101"/>
|
||||
<location filename="../../src/model/metadatamodel.cpp" line="104"/>
|
||||
<source>End</source>
|
||||
<translation>結束</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../src/model/metadatamodel.cpp" line="103"/>
|
||||
<location filename="../../src/model/metadatamodel.cpp" line="106"/>
|
||||
<source>Foreground</source>
|
||||
<translation>前景色</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../src/model/metadatamodel.cpp" line="105"/>
|
||||
<location filename="../../src/model/metadatamodel.cpp" line="108"/>
|
||||
<source>Background</source>
|
||||
<translation>背景色</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../src/model/metadatamodel.cpp" line="107"/>
|
||||
<location filename="../../src/model/metadatamodel.cpp" line="110"/>
|
||||
<source>Comment</source>
|
||||
<translation>批註</translation>
|
||||
</message>
|
||||
|
|
|
@ -39,7 +39,6 @@ void CrashHandler::init() {
|
|||
std::signal(SIGABRT, signalHandler);
|
||||
std::signal(SIGSEGV, signalHandler);
|
||||
std::signal(SIGILL, signalHandler);
|
||||
std::signal(SIGABRT, signalHandler);
|
||||
std::signal(SIGFPE, signalHandler);
|
||||
#else
|
||||
::signal(SIGSEGV, signalHandler);
|
||||
|
|
|
@ -142,7 +142,7 @@ void MetaDialog::setComment(QString comment) {
|
|||
}
|
||||
|
||||
void MetaDialog::setBackGroundColor(QColor color) {
|
||||
if (color.rgba()) {
|
||||
if (color.isValid()) {
|
||||
cbackground->setChecked(true);
|
||||
emit cbackground->clicked(true);
|
||||
_background = color;
|
||||
|
@ -151,7 +151,7 @@ void MetaDialog::setBackGroundColor(QColor color) {
|
|||
}
|
||||
|
||||
void MetaDialog::setForeGroundColor(QColor color) {
|
||||
if (color.rgba()) {
|
||||
if (color.isValid()) {
|
||||
cforeground->setChecked(true);
|
||||
emit cforeground->clicked(true);
|
||||
_foreground = color;
|
||||
|
|
|
@ -58,7 +58,7 @@ QVariant MetaDataModel::data(const QModelIndex &index, int role) const {
|
|||
case 4:
|
||||
return d.comment;
|
||||
}
|
||||
}
|
||||
} break;
|
||||
case Qt::DecorationRole: {
|
||||
auto r = index.row();
|
||||
const auto &b = _doc->metadata()->getAllMetadata();
|
||||
|
@ -67,9 +67,11 @@ QVariant MetaDataModel::data(const QModelIndex &index, int role) const {
|
|||
case 2:
|
||||
if (d.foreground.isValid())
|
||||
return d.foreground;
|
||||
break;
|
||||
case 3:
|
||||
if (d.background.isValid())
|
||||
return d.background;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
@ -86,6 +88,7 @@ QVariant MetaDataModel::data(const QModelIndex &index, int role) const {
|
|||
case 1: // end
|
||||
return d.end;
|
||||
}
|
||||
break;
|
||||
}
|
||||
return QVariant();
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue