|
1 | 1 | --- opencv/modules/highgui/src/window_QT.h 2018-06-28 13:13:55.119434000 +0300 |
2 | | -+++ opencv/modules/highgui/src/window_QT_patched.h 2018-06-30 01:10:16.135894200 +0300 |
3 | | -@@ -46,43 +46,48 @@ |
| 2 | ++++ opencv/modules/highgui/src/window_QT_patched.h 2018-06-30 16:11:10.233722700 +0300 |
| 3 | +@@ -46,58 +46,64 @@ |
4 | 4 | #define QT_NO_DEBUG_OUTPUT |
5 | 5 | #endif |
6 | 6 |
|
7 | | -+#include <QApplication> |
8 | | -+ |
9 | | - #if defined( HAVE_QT_OPENGL ) |
10 | | - #include <QtOpenGL> |
11 | | - #include <QGLWidget> |
12 | | - #endif |
13 | | - |
| 7 | +-#if defined( HAVE_QT_OPENGL ) |
| 8 | +-#include <QtOpenGL> |
| 9 | +-#include <QGLWidget> |
| 10 | +-#endif |
| 11 | +- |
14 | 12 | -#include <QAbstractEventDispatcher> |
15 | | --#include <QApplication> |
| 13 | + #include <QApplication> |
16 | 14 | -#include <QFile> |
17 | | --#include <QPushButton> |
| 15 | + #include <QPushButton> |
18 | 16 | -#include <QGraphicsView> |
19 | 17 | -#include <QSizePolicy> |
20 | 18 | -#include <QInputDialog> |
|
25 | 23 | -#include <QWaitCondition> |
26 | 24 | -#include <QKeyEvent> |
27 | 25 | -#include <QMetaObject> |
28 | | --#include <QPointer> |
| 26 | + #include <QPointer> |
29 | 27 | -#include <QSlider> |
30 | 28 | -#include <QLabel> |
31 | 29 | -#include <QIODevice> |
|
38 | 36 | -#include <QToolBar> |
39 | 37 | - |
40 | 38 | -#include <QAction> |
41 | | --#include <QCheckBox> |
42 | | --#include <QRadioButton> |
| 39 | + #include <QCheckBox> |
| 40 | ++#include <QSlider> |
| 41 | + #include <QRadioButton> |
43 | 42 | -#include <QButtonGroup> |
44 | 43 | -#include <QMenu> |
45 | | --#include <QTest> |
| 44 | ++#include <QWidget> |
| 45 | ++#include <QGraphicsView> |
| 46 | + #include <QTest> |
| 47 | ++#include <QVarLengthArray> |
| 48 | ++ |
| 49 | ++#if defined( HAVE_QT_OPENGL ) |
| 50 | ++#include <QtOpenGL> |
| 51 | ++#include <QGLWidget> |
| 52 | ++#endif |
| 53 | ++ |
46 | 54 | +QT_BEGIN_NAMESPACE |
47 | 55 | + |
48 | 56 | +class QAbstractEventDispatcher; |
49 | 57 | +class QFile; |
50 | | -+class QPushButton; |
51 | | -+class QGraphicsView; |
52 | 58 | +class QSizePolicy; |
53 | 59 | +class QInputDialog; |
54 | 60 | +class QBoxLayout; |
|
58 | 64 | +class QWaitCondition; |
59 | 65 | +class QKeyEvent; |
60 | 66 | +class QMetaObject; |
61 | | -+class QPointer; |
62 | | -+class QSlider; |
63 | 67 | +class QLabel; |
64 | 68 | +class QIODevice; |
65 | 69 | +class QShortcut; |
66 | 70 | +class QStatusBar; |
67 | | -+class QVarLengthArray; |
68 | 71 | +class QFileInfo; |
69 | 72 | +class QDate; |
70 | 73 | +class QFileDialog; |
71 | 74 | +class QToolBar; |
72 | 75 | + |
73 | 76 | +class QAction; |
74 | | -+class QCheckBox; |
75 | | -+class QRadioButton; |
76 | 77 | +class QButtonGroup; |
77 | 78 | +class QMenu; |
78 | | -+class QTest; |
79 | 79 | + |
80 | 80 | +QT_END_NAMESPACE |
81 | 81 |
|
82 | 82 | //start private enum |
83 | 83 | enum { CV_MODE_NORMAL = 0, CV_MODE_OPENGL = 1 }; |
| 84 | + |
| 85 | + //we can change the keyboard shortcuts from here ! |
| 86 | +-enum { shortcut_zoom_normal = Qt::CTRL + Qt::Key_Z, |
| 87 | +- shortcut_zoom_imgRegion = Qt::CTRL + Qt::Key_X, |
| 88 | +- shortcut_save_img = Qt::CTRL + Qt::Key_S, |
| 89 | +- shortcut_properties_win = Qt::CTRL + Qt::Key_P, |
| 90 | +- shortcut_zoom_in = Qt::CTRL + Qt::Key_Plus,//QKeySequence(QKeySequence::ZoomIn), |
| 91 | +- shortcut_zoom_out = Qt::CTRL + Qt::Key_Minus,//QKeySequence(QKeySequence::ZoomOut), |
| 92 | +- shortcut_panning_left = Qt::CTRL + Qt::Key_Left, |
| 93 | +- shortcut_panning_right = Qt::CTRL + Qt::Key_Right, |
| 94 | +- shortcut_panning_up = Qt::CTRL + Qt::Key_Up, |
| 95 | +- shortcut_panning_down = Qt::CTRL + Qt::Key_Down |
| 96 | ++enum { shortcut_zoom_normal = QT_NAMESPACE::CTRL + QT_NAMESPACE::Key_Z, |
| 97 | ++ shortcut_zoom_imgRegion = QT_NAMESPACE::CTRL + QT_NAMESPACE::Key_X, |
| 98 | ++ shortcut_save_img = QT_NAMESPACE::CTRL + QT_NAMESPACE::Key_S, |
| 99 | ++ shortcut_properties_win = QT_NAMESPACE::CTRL + QT_NAMESPACE::Key_P, |
| 100 | ++ shortcut_zoom_in = QT_NAMESPACE::CTRL + QT_NAMESPACE::Key_Plus,//QKeySequence(QKeySequence::ZoomIn), |
| 101 | ++ shortcut_zoom_out = QT_NAMESPACE::CTRL + QT_NAMESPACE::Key_Minus,//QKeySequence(QKeySequence::ZoomOut), |
| 102 | ++ shortcut_panning_left = QT_NAMESPACE::CTRL + QT_NAMESPACE::Key_Left, |
| 103 | ++ shortcut_panning_right = QT_NAMESPACE::CTRL + QT_NAMESPACE::Key_Right, |
| 104 | ++ shortcut_panning_up = QT_NAMESPACE::CTRL + QT_NAMESPACE::Key_Up, |
| 105 | ++ shortcut_panning_down = QT_NAMESPACE::CTRL + QT_NAMESPACE::Key_Down |
| 106 | + }; |
| 107 | + //end enum |
| 108 | + |
0 commit comments