1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
|
diff -ruN scidavis.1.D9.orig/libscidavis/src/ColorMapEditor.cpp scidavis.1.D9/libscidavis/src/ColorMapEditor.cpp
--- scidavis.1.D9.orig/libscidavis/src/ColorMapEditor.cpp 2016-05-31 17:42:49.661018699 +0300
+++ scidavis.1.D9/libscidavis/src/ColorMapEditor.cpp 2016-05-31 17:44:58.232963857 +0300
@@ -124,7 +124,7 @@
QColor c = QColor(map.rgb(QwtDoubleInterval(0, 1), colors[i]));
it = new QTableWidgetItem(c.name());
- it->setFlags(!Qt::ItemIsEditable);
+ it->setFlags(it->flags()&~Qt::ItemIsEditable);
it->setBackground(QBrush(c));
it->setForeground(QBrush(c));
table->setItem(i, 1, it);
@@ -156,7 +156,7 @@
table->setItem(row, 0, it);
it = new QTableWidgetItem(c.name());
-it->setFlags(!Qt::ItemIsEditable);
+it->setFlags(it->flags()&~Qt::ItemIsEditable);
it->setBackground(QBrush(c));
it->setForeground(QBrush(c));
table->setItem(row, 1, it);
diff -ruN scidavis.1.D9.orig/libscidavis/src/FitDialog.cpp scidavis.1.D9/libscidavis/src/FitDialog.cpp
--- scidavis.1.D9.orig/libscidavis/src/FitDialog.cpp 2016-05-31 17:42:49.664351910 +0300
+++ scidavis.1.D9/libscidavis/src/FitDialog.cpp 2016-05-31 17:44:51.333217278 +0300
@@ -655,7 +655,7 @@
for (int i = param_table_rows; i<paramList.count(); i++)
{
QTableWidgetItem *it = new QTableWidgetItem(paramList[i]);
- it->setFlags(!Qt::ItemIsEditable);
+ it->setFlags(it->flags()&~Qt::ItemIsEditable);
it->setBackground(QBrush(Qt::lightGray));
it->setForeground(QBrush(Qt::darkRed));
QFont font = it->font();
@@ -679,7 +679,7 @@
for (int i = 0; i<boxParams->rowCount(); i++ )
{
QTableWidgetItem *it = new QTableWidgetItem();
- it->setFlags(!Qt::ItemIsEditable);
+ it->setFlags(it->flags()&~Qt::ItemIsEditable);
it->setBackground(QBrush(Qt::lightGray));
boxParams->setItem(i, 2, it);
|