QT new functions:

 - Finished toolbar: the last icon opens an external window with the trackbars inside

modules/highgui/include/opencv2/highgui/highgui_c.h

@@ -75,7 +75,7 @@ enum {	CV_STYLE_NORMAL			= 0,//QFont::StyleNormal,
 //the first bit is for normal or autoresize
 //CV_WINDOW_NORMAL = 0x00000000 and CV_WINDOW_AUTOSIZE = 0x00000001
 //the secont bit is for the gui mode (normal or extended)
-enum {CV_GUI_EXTENDED = 0x00000000, CV_GUI_NORMAL = 0x00000010};
+enum {CV_GUI_EXPANDED = 0x00000000, CV_GUI_NORMAL = 0x00000010};
 
 //for color cvScalar(blue_component, green_component, red\_component[, alpha_component])
 //and alpha= 0 <-> 0xFF (not transparent <-> transparent)

modules/highgui/src/window_QT.h

@@ -158,6 +158,22 @@ private:
 };
 
 
+class CvWinProperties : public QWidget
+{
+    Q_OBJECT
+public:
+    CvWinProperties(QString name,QWidget* parent);
+    ~CvWinProperties();
+    QPointer<QBoxLayout> myLayout;
+
+private:
+    void closeEvent ( QCloseEvent * e );
+    void showEvent ( QShowEvent * event ) ;
+    void hideEvent ( QHideEvent * event ) ;
+};
+
+
+
 class CvWindow : public QWidget
 {
     Q_OBJECT
@@ -174,7 +190,7 @@ public:
     void setOpenGLCallback(CvOpenGLCallback arg1,void* userdata);
     ViewPort* getView();
 
-    QPointer<QBoxLayout> layout;
+    QPointer<QBoxLayout> myLayout;
     QPointer<QStatusBar> myStatusBar;
     QPointer<QToolBar> myToolBar;
     QPointer<QLabel> myStatusBar_msg;
@@ -189,6 +205,7 @@ protected:
     virtual void keyPressEvent(QKeyEvent *event);
 
 private:
+    QPointer<CvWinProperties> parameters_window ;
     QPointer<ViewPort> myview;
     QVector<QAction*> vect_QActions;
     QVector<QShortcut*> vect_QShortcuts;
@@ -201,6 +218,10 @@ private:
     void createView(int mode);
     void createStatusBar();
     void createLayout();
+    void createParameterWindow();
+
+private slots:
+    void displayPropertiesWin();
 };
 
 
@@ -256,7 +277,7 @@ public slots:
     void siftWindowOnDown();
     void resizeEvent ( QResizeEvent * );
     void saveView();
-    void displayPropertiesWin();
+
 
 private:
     QPoint mouseCoordinate;