summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/styles/liquid/liquid.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/noncore/styles/liquid/liquid.h b/noncore/styles/liquid/liquid.h
index 0582c9a..22331be 100644
--- a/noncore/styles/liquid/liquid.h
+++ b/noncore/styles/liquid/liquid.h
@@ -81,125 +81,124 @@ public:
81 const QBrush *fill = 0 ); 81 const QBrush *fill = 0 );
82 void drawButtonMask(QPainter *p, int x, int y, int w, int h); 82 void drawButtonMask(QPainter *p, int x, int y, int w, int h);
83 void drawComboButtonMask(QPainter *p, int x, int y, int w, int h); 83 void drawComboButtonMask(QPainter *p, int x, int y, int w, int h);
84 QRect buttonRect(int x, int y, int w, int h); 84 QRect buttonRect(int x, int y, int w, int h);
85 void drawBevelButton(QPainter *p, int x, int y, int w, int h, 85 void drawBevelButton(QPainter *p, int x, int y, int w, int h,
86 const QColorGroup &g, bool sunken = FALSE, 86 const QColorGroup &g, bool sunken = FALSE,
87 const QBrush *fill = 0 ); 87 const QBrush *fill = 0 );
88 void drawPushButton(QPushButton *btn, QPainter *p); 88 void drawPushButton(QPushButton *btn, QPainter *p);
89 virtual void drawPushButtonLabel (QPushButton *btn, QPainter *p); 89 virtual void drawPushButtonLabel (QPushButton *btn, QPainter *p);
90 void drawScrollBarControls(QPainter*, const QScrollBar*, int sliderStart, 90 void drawScrollBarControls(QPainter*, const QScrollBar*, int sliderStart,
91 uint controls, uint activeControl ); 91 uint controls, uint activeControl );
92 QStyle::ScrollControl scrollBarPointOver(const QScrollBar *sb, 92 QStyle::ScrollControl scrollBarPointOver(const QScrollBar *sb,
93 int sliderStart, const QPoint &p); 93 int sliderStart, const QPoint &p);
94 void scrollBarMetrics(const QScrollBar *sb, int &sliderMin, int &sliderMax, 94 void scrollBarMetrics(const QScrollBar *sb, int &sliderMin, int &sliderMax,
95 int &sliderLength, int &buttonDim); 95 int &sliderLength, int &buttonDim);
96 QSize indicatorSize() const; 96 QSize indicatorSize() const;
97 void drawIndicator(QPainter* p, int x, int y, int w, int h, 97 void drawIndicator(QPainter* p, int x, int y, int w, int h,
98 const QColorGroup &g, int state, bool down = FALSE, 98 const QColorGroup &g, int state, bool down = FALSE,
99 bool enabled = TRUE ); 99 bool enabled = TRUE );
100 void drawIndicatorMask(QPainter *p, int x, int y, int w, int h, int); 100 void drawIndicatorMask(QPainter *p, int x, int y, int w, int h, int);
101 QSize exclusiveIndicatorSize() const; 101 QSize exclusiveIndicatorSize() const;
102 void drawExclusiveIndicator(QPainter* p, int x, int y, int w, int h, 102 void drawExclusiveIndicator(QPainter* p, int x, int y, int w, int h,
103 const QColorGroup &g, bool on, 103 const QColorGroup &g, bool on,
104 bool down = FALSE, bool enabled = TRUE ); 104 bool down = FALSE, bool enabled = TRUE );
105 void drawExclusiveIndicatorMask(QPainter *p, int x, int y, int w, 105 void drawExclusiveIndicatorMask(QPainter *p, int x, int y, int w,
106 int h, bool); 106 int h, bool);
107 void drawComboButton(QPainter *p, int x, int y, int w, int h, 107 void drawComboButton(QPainter *p, int x, int y, int w, int h,
108 const QColorGroup &g, bool sunken = FALSE, 108 const QColorGroup &g, bool sunken = FALSE,
109 bool editable = FALSE, bool enabled = TRUE, 109 bool editable = FALSE, bool enabled = TRUE,
110 const QBrush *fill = 0 ); 110 const QBrush *fill = 0 );
111 QRect comboButtonRect(int x, int y, int w, int h); 111 QRect comboButtonRect(int x, int y, int w, int h);
112 QRect comboButtonFocusRect(int x, int y, int w, int h); 112 QRect comboButtonFocusRect(int x, int y, int w, int h);
113 int sliderLength() const; 113 int sliderLength() const;
114 void drawArrow(QPainter *p, Qt::ArrowType type, bool down, 114 void drawArrow(QPainter *p, Qt::ArrowType type, bool down,
115 int x, int y, int w, int h, const QColorGroup &g, 115 int x, int y, int w, int h, const QColorGroup &g,
116 bool enabled=true, const QBrush *fill = 0); 116 bool enabled=true, const QBrush *fill = 0);
117 void drawSlider(QPainter *p, int x, int y, int w, int h, 117 void drawSlider(QPainter *p, int x, int y, int w, int h,
118 const QColorGroup &g, Orientation orient, 118 const QColorGroup &g, Orientation orient,
119 bool tickAbove, bool tickBelow); 119 bool tickAbove, bool tickBelow);
120 void drawSliderMask(QPainter *p, int x, int y, int w, int h, 120 void drawSliderMask(QPainter *p, int x, int y, int w, int h,
121 Orientation orient, bool, bool); 121 Orientation orient, bool, bool);
122 void drawMenuBarItem(QPainter *p, int x, int y, int w, int h, 122 void drawMenuBarItem(QPainter *p, int x, int y, int w, int h,
123 QMenuItem *mi, QColorGroup &g, bool enabled, bool active ); 123 QMenuItem *mi, QColorGroup &g, bool enabled, bool active );
124 124
125 void drawPopupMenuItem(QPainter *p, bool checkable, int maxpmw, 125 void drawPopupMenuItem(QPainter *p, bool checkable, int maxpmw,
126 int tab, QMenuItem *mi, const QPalette &pal, 126 int tab, QMenuItem *mi, const QPalette &pal,
127 bool act, bool enabled, int x, int y, int w, 127 bool act, bool enabled, int x, int y, int w,
128 int h); 128 int h);
129 int popupMenuItemHeight(bool c, QMenuItem *mi, const QFontMetrics &fm); 129 int popupMenuItemHeight(bool c, QMenuItem *mi, const QFontMetrics &fm);
130 void drawFocusRect(QPainter *p, const QRect &r, const QColorGroup &g, 130 void drawFocusRect(QPainter *p, const QRect &r, const QColorGroup &g,
131 const QColor *pen, bool atBorder); 131 const QColor *pen, bool atBorder);
132 int defaultFrameWidth() const {return(2);} 132 int defaultFrameWidth() const {return(2);}
133 void polishPopupMenu(QPopupMenu *mnu); 133 void polishPopupMenu(QPopupMenu *mnu);
134 void drawTab(QPainter *p, const QTabBar *tabBar, QTab *tab, 134 void drawTab(QPainter *p, const QTabBar *tabBar, QTab *tab,
135 bool selected); 135 bool selected);
136 void drawTabMask( QPainter*, const QTabBar*, QTab*, bool selected ); 136 void drawTabMask( QPainter*, const QTabBar*, QTab*, bool selected );
137 void tabbarMetrics(const QTabBar *t, int &hFrame, int &vFrame, 137 void tabbarMetrics(const QTabBar *t, int &hFrame, int &vFrame,
138 int &overlap); 138 int &overlap);
139 139
140 void drawSplitter(QPainter *p, int x, int y, int w, int h, 140 void drawSplitter(QPainter *p, int x, int y, int w, int h,
141 const QColorGroup &g, Orientation orient); 141 const QColorGroup &g, Orientation orient);
142 int splitterWidth() const {return(6);} 142 int splitterWidth() const {return(6);}
143 void drawPanel(QPainter *p, int x, int y, int w, int h, 143 void drawPanel(QPainter *p, int x, int y, int w, int h,
144 const QColorGroup &g, bool sunken, int lineWidth, 144 const QColorGroup &g, bool sunken, int lineWidth,
145 const QBrush *fill); 145 const QBrush *fill);
146 void drawToolButton(QPainter *p, int x, int y, int w, 146 void drawToolButton(QPainter *p, int x, int y, int w,
147 int h, const QColorGroup &g, 147 int h, const QColorGroup &g,
148 bool sunken, const QBrush *fill); 148 bool sunken, const QBrush *fill);
149 // for repainting toolbuttons when the toolbar is resized 149 // for repainting toolbuttons when the toolbar is resized
150 bool eventFilter(QObject *obj, QEvent *ev); 150 bool eventFilter(QObject *obj, QEvent *ev);
151 void drawSliderGroove(QPainter * p, int x, int y, int w, int h, 151 void drawSliderGroove(QPainter * p, int x, int y, int w, int h,
152 const QColorGroup &g, QCOORD c, Orientation); 152 const QColorGroup &g, QCOORD c, Orientation);
153 void drawSliderGrooveMask(QPainter * p, int x, int y, int w, int h, 153 void drawSliderGrooveMask(QPainter * p, int x, int y, int w, int h,
154 QCOORD c, Orientation); 154 QCOORD c, Orientation);
155 int buttonDefaultIndicatorWidth() const {return(2);} 155 int buttonDefaultIndicatorWidth() const {return(2);}
156 void drawPopupPanel(QPainter *p, int x, int y, int w, int h, 156 void drawPopupPanel(QPainter *p, int x, int y, int w, int h,
157 const QColorGroup &g, int lineWidth, 157 const QColorGroup &g, int lineWidth,
158 const QBrush * fill); 158 const QBrush * fill);
159protected: 159protected:
160 void adjustHSV(QPixmap &pix, int h, int s, int v); 160 void adjustHSV(QPixmap &pix, int h, int s, int v);
161 void intensity(QPixmap &pix, float percent); 161 void intensity(QPixmap &pix, float percent);
162 162
163 void drawRoundButton(QPainter *p, const QColor &c, const QColor &bg, int x, 163 void drawRoundButton(QPainter *p, const QColor &c, const QColor &bg, int x,
164 int y, int w, int h, bool supportPushDown = false, 164 int y, int w, int h, bool supportPushDown = false,
165 bool pushedDown = false, bool autoDefault = false, 165 bool pushedDown = false, bool autoDefault = false,
166 bool isMasked = false); 166 bool isMasked = false);
167 void drawClearBevel(QPainter *p, int x, int y, int w, int h, 167 void drawClearBevel(QPainter *p, int x, int y, int w, int h,
168 const QColor &c, const QColor &bg); 168 const QColor &c, const QColor &bg);
169 void drawSBDeco(QPainter *p, const QRect &r, const QColorGroup &g, 169 void drawSBDeco(QPainter *p, const QRect &r, const QColorGroup &g,
170 bool horiz); 170 bool horiz);
171 void drawSBButton(QPainter *p, const QRect &r, const QColorGroup &g, 171 void drawSBButton(QPainter *p, const QRect &r, const QColorGroup &g,
172 bool down=false, bool fast = true); 172 bool down=false, bool fast = true);
173 void drawRoundRect(QPainter *p, int x, int y, int w, int h); 173 void drawRoundRect(QPainter *p, int x, int y, int w, int h);
174 QPixmap* getPixmap(BitmapData item); 174 QPixmap* getPixmap(BitmapData item);
175 QPixmap* processEmbedded(const char *label, int h, int s, int v, bool blend=false); 175 QPixmap* processEmbedded(const char *label, int h, int s, int v, bool blend=false);
176private: 176private:
177 bool oldqte;
178 bool flatTBButtons; 177 bool flatTBButtons;
179 QWidget *highlightWidget; 178 QWidget *highlightWidget;
180 QBitmap btnMaskBmp, htmlBtnMaskBmp; 179 QBitmap btnMaskBmp, htmlBtnMaskBmp;
181 QPixmap *btnBorderPix, *btnBlendPix, *bevelFillPix, *smallBevelFillPix, *menuPix; 180 QPixmap *btnBorderPix, *btnBlendPix, *bevelFillPix, *smallBevelFillPix, *menuPix;
182 QBrush bgBrush, menuBrush; 181 QBrush bgBrush, menuBrush;
183 bool menuAni, menuFade; 182 bool menuAni, menuFade;
184 183
185 QIntDict<QPixmap>btnDict; 184 QIntDict<QPixmap>btnDict;
186 QIntDict<QPixmap>btnBorderDict; 185 QIntDict<QPixmap>btnBorderDict;
187 QIntDict<QPixmap>bevelFillDict; 186 QIntDict<QPixmap>bevelFillDict;
188 QIntDict<QPixmap>smallBevelFillDict; 187 QIntDict<QPixmap>smallBevelFillDict;
189 188
190 QPixmap *vsbSliderFillPix; 189 QPixmap *vsbSliderFillPix;
191 TransMenuHandler *menuHandler; 190 TransMenuHandler *menuHandler;
192 QPixmap *pixmaps[BITMAP_ITEMS]; 191 QPixmap *pixmaps[BITMAP_ITEMS];
193 QPixmap sbBuffer; 192 QPixmap sbBuffer;
194 int oldSliderThickness; 193 int oldSliderThickness;
195 int lowLightVal; 194 int lowLightVal;
196 QHeader *currentHeader; 195 QHeader *currentHeader;
197 int headerHoverID; 196 int headerHoverID;
198 QWMatrix rMatrix; 197 QWMatrix rMatrix;
199 int bH, bS, bV; 198 int bH, bS, bV;
200 int bHoverH, bHoverS, bHoverV; 199 int bHoverH, bHoverS, bHoverV;
201 int btnH, btnS, btnV; 200 int btnH, btnS, btnV;
202 int btnHoverH, btnHoverS, btnHoverV; 201 int btnHoverH, btnHoverS, btnHoverV;
203}; 202};
204 203
205#endif 204#endif