comparison widgets/WindowTypeSelector.h @ 946:36cddc3de023 alignment_view

Merge from default branch
author Chris Cannam
date Mon, 20 Apr 2015 09:19:52 +0100
parents 4a578a360011
children 05d614f6e46d
comparison
equal deleted inserted replaced
897:499b637f2a26 946:36cddc3de023
26 class WindowTypeSelector : public QFrame 26 class WindowTypeSelector : public QFrame
27 { 27 {
28 Q_OBJECT 28 Q_OBJECT
29 29
30 public: 30 public:
31 WindowTypeSelector(WindowType defaultType = WindowType(999), // 999 -> get from preferences 31 WindowTypeSelector(WindowType defaultType);
32 QWidget *parent = 0); 32 WindowTypeSelector(); // get window type from preferences
33 virtual ~WindowTypeSelector(); 33 virtual ~WindowTypeSelector();
34 34
35 WindowType getWindowType() const; 35 WindowType getWindowType() const;
36 36
37 signals: 37 signals:
46 protected: 46 protected:
47 QComboBox *m_windowCombo; 47 QComboBox *m_windowCombo;
48 WindowShapePreview *m_windowShape; 48 WindowShapePreview *m_windowShape;
49 WindowType *m_windows; 49 WindowType *m_windows;
50 WindowType m_windowType; 50 WindowType m_windowType;
51
52 void init(WindowType type);
51 }; 53 };
52 54
53 #endif 55 #endif