1
|
Index: src/app/qgsuniquevaluedialog.h
|
2
|
===================================================================
|
3
|
--- src/app/qgsuniquevaluedialog.h (revision: 11107)
|
4
|
+++ src/app/qgsuniquevaluedialog.h (copia de trabajo)
|
5
|
@@ -46,6 +46,9 @@
|
6
|
QMap<QString, QgsSymbol*> mValues;
|
7
|
QgsSingleSymbolDialog sydialog;
|
8
|
|
9
|
+ // Reimplements dialog keyPress event so we can ignore it
|
10
|
+ void keyPressEvent( QKeyEvent * event );
|
11
|
+
|
12
|
protected slots:
|
13
|
/**Set new attribut for classification*/
|
14
|
void changeClassificationAttribute();
|
15
|
Index: src/app/qgssinglesymboldialog.h
|
16
|
===================================================================
|
17
|
--- src/app/qgssinglesymboldialog.h (revision: 11107)
|
18
|
+++ src/app/qgssinglesymboldialog.h (copia de trabajo)
|
19
|
@@ -49,6 +49,9 @@
|
20
|
protected:
|
21
|
QgsVectorLayer* mVectorLayer;
|
22
|
|
23
|
+ // Reimplements dialog keyPress event so we can ignore it
|
24
|
+ void keyPressEvent( QKeyEvent * event );
|
25
|
+
|
26
|
public slots:
|
27
|
/* arrange the widgets on this dialog to reflect the current state of QgsSymbol */
|
28
|
void unset();
|
29
|
Index: src/app/qgsgraduatedsymboldialog.h
|
30
|
===================================================================
|
31
|
--- src/app/qgsgraduatedsymboldialog.h (revision: 11107)
|
32
|
+++ src/app/qgsgraduatedsymboldialog.h (copia de trabajo)
|
33
|
@@ -70,6 +70,9 @@
|
34
|
/**Gets the color value along a specified ramp**/
|
35
|
QColor getColorFromRamp( QString ramp, int step, int totalSteps );
|
36
|
|
37
|
+ // Reimplements dialog keyPress event so we can ignore it
|
38
|
+ void keyPressEvent( QKeyEvent * event );
|
39
|
+
|
40
|
protected slots:
|
41
|
/**Removes a class from the classification*/
|
42
|
void deleteCurrentClass();
|
43
|
Index: src/app/qgscontinuouscolordialog.h
|
44
|
===================================================================
|
45
|
--- src/app/qgscontinuouscolordialog.h (revision: 11107)
|
46
|
+++ src/app/qgscontinuouscolordialog.h (copia de trabajo)
|
47
|
@@ -45,6 +45,9 @@
|
48
|
protected:
|
49
|
QgsVectorLayer* mVectorLayer;
|
50
|
|
51
|
+ // Reimplements dialog keyPress event so we can ignore it
|
52
|
+ void keyPressEvent( QKeyEvent * event );
|
53
|
+
|
54
|
private:
|
55
|
/** Default constructor is private, do not use this */
|
56
|
QgsContinuousColorDialog();
|
57
|
Index: src/app/qgscontinuouscolordialog.cpp
|
58
|
===================================================================
|
59
|
--- src/app/qgscontinuouscolordialog.cpp (revision: 11107)
|
60
|
+++ src/app/qgscontinuouscolordialog.cpp (copia de trabajo)
|
61
|
@@ -27,8 +27,8 @@
|
62
|
#include "qgslogger.h"
|
63
|
|
64
|
#include <QColorDialog>
|
65
|
+#include <QKeyEvent>
|
66
|
|
67
|
-
|
68
|
QgsContinuousColorDialog::QgsContinuousColorDialog( QgsVectorLayer * layer )
|
69
|
: QDialog(), mVectorLayer( layer )
|
70
|
{
|
71
|
@@ -203,3 +203,12 @@
|
72
|
else
|
73
|
outlinewidthspinbox->setEnabled( false );
|
74
|
}
|
75
|
+
|
76
|
+void QgsContinuousColorDialog::keyPressEvent( QKeyEvent * e )
|
77
|
+{
|
78
|
+ // Ignore the ESC key to avoid close the dialog without the properties window
|
79
|
+ if ( e->key() == Qt::Key_Escape )
|
80
|
+ {
|
81
|
+ e->ignore();
|
82
|
+ }
|
83
|
+}
|
84
|
Index: src/app/qgsgraduatedsymboldialog.cpp
|
85
|
===================================================================
|
86
|
--- src/app/qgsgraduatedsymboldialog.cpp (revision: 11107)
|
87
|
+++ src/app/qgsgraduatedsymboldialog.cpp (copia de trabajo)
|
88
|
@@ -28,6 +28,8 @@
|
89
|
#include "qgsvectorlayer.h"
|
90
|
#include "qgslogger.h"
|
91
|
|
92
|
+#include <QKeyEvent>
|
93
|
+
|
94
|
QgsGraduatedSymbolDialog::QgsGraduatedSymbolDialog( QgsVectorLayer * layer ): QDialog(), mVectorLayer( layer ), sydialog( layer )
|
95
|
{
|
96
|
setupUi( this );
|
97
|
@@ -598,3 +600,12 @@
|
98
|
;
|
99
|
}
|
100
|
}
|
101
|
+
|
102
|
+void QgsGraduatedSymbolDialog::keyPressEvent( QKeyEvent * e )
|
103
|
+{
|
104
|
+ // Ignore the ESC key to avoid close the dialog without the properties window
|
105
|
+ if ( e->key() == Qt::Key_Escape )
|
106
|
+ {
|
107
|
+ e->ignore();
|
108
|
+ }
|
109
|
+}
|
110
|
Index: src/app/qgsuniquevaluedialog.cpp
|
111
|
===================================================================
|
112
|
--- src/app/qgsuniquevaluedialog.cpp (revision: 11107)
|
113
|
+++ src/app/qgsuniquevaluedialog.cpp (copia de trabajo)
|
114
|
@@ -27,6 +27,7 @@
|
115
|
#include "qgslogger.h"
|
116
|
|
117
|
#include <QMessageBox>
|
118
|
+#include <QKeyEvent>
|
119
|
|
120
|
QgsUniqueValueDialog::QgsUniqueValueDialog( QgsVectorLayer* vl ): QDialog(), mVectorLayer( vl ), sydialog( vl, true )
|
121
|
{
|
122
|
@@ -456,3 +457,12 @@
|
123
|
//do nothing
|
124
|
}
|
125
|
}
|
126
|
+
|
127
|
+void QgsUniqueValueDialog::keyPressEvent( QKeyEvent * e )
|
128
|
+{
|
129
|
+ // Ignore the ESC key to avoid close the dialog without the properties window
|
130
|
+ if ( e->key() == Qt::Key_Escape )
|
131
|
+ {
|
132
|
+ e->ignore();
|
133
|
+ }
|
134
|
+}
|
135
|
Index: src/app/qgssinglesymboldialog.cpp
|
136
|
===================================================================
|
137
|
--- src/app/qgssinglesymboldialog.cpp (revision: 11107)
|
138
|
+++ src/app/qgssinglesymboldialog.cpp (copia de trabajo)
|
139
|
@@ -31,6 +31,7 @@
|
140
|
#include <QImage>
|
141
|
#include <QFileDialog>
|
142
|
#include <QListWidgetItem>
|
143
|
+#include <QKeyEvent>
|
144
|
|
145
|
#define DO_NOT_USE_STR "<off>"
|
146
|
|
147
|
@@ -591,3 +592,11 @@
|
148
|
|
149
|
}
|
150
|
|
151
|
+void QgsSingleSymbolDialog::keyPressEvent( QKeyEvent * e )
|
152
|
+{
|
153
|
+ // Ignore the ESC key to avoid close the dialog without the properties window
|
154
|
+ if ( e->key() == Qt::Key_Escape )
|
155
|
+ {
|
156
|
+ e->ignore();
|
157
|
+ }
|
158
|
+}
|
159
|
\ No newline at end of file
|