author | sandman <sandman> | 2002-11-21 19:49:00 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-11-21 19:49:00 (UTC) |
commit | 440f1d4d439c83368a855355cdceda43660137f2 (patch) (unidiff) | |
tree | 1b7ffd5157d2c141b9f978d08e47699ea2d013ff /noncore | |
parent | 0b0ebb03a1fc0a316b52ce147d87fa89d3b5af16 (diff) | |
download | opie-440f1d4d439c83368a855355cdceda43660137f2.zip opie-440f1d4d439c83368a855355cdceda43660137f2.tar.gz opie-440f1d4d439c83368a855355cdceda43660137f2.tar.bz2 |
- pixmaps in in menubars are now drawn (this is uncommon, but resulted in
blank icons in nethack for example)
- small size optimization
- updated the QPL diff
-rw-r--r-- | noncore/styles/liquid/embeddata.h | 2 | ||||
-rw-r--r-- | noncore/styles/liquid/liquid.cpp | 20 | ||||
-rw-r--r-- | noncore/styles/liquid/opie-liquid.diff | 141 |
3 files changed, 112 insertions, 51 deletions
diff --git a/noncore/styles/liquid/embeddata.h b/noncore/styles/liquid/embeddata.h index e4ccc27..5207fb1 100644 --- a/noncore/styles/liquid/embeddata.h +++ b/noncore/styles/liquid/embeddata.h | |||
@@ -974,5 +974,5 @@ static int cmpEmbedImage(const void *a, const void *b) | |||
974 | return strcmp(ea->name,eb->name); | 974 | return strcmp(ea->name,eb->name); |
975 | } | 975 | } |
976 | inline const QImage& qembed_findImage(const char* name) | 976 | static const QImage& qembed_findImage(const char* name) |
977 | { | 977 | { |
978 | EmbedImage key; key.name = name; | 978 | EmbedImage key; key.name = name; |
diff --git a/noncore/styles/liquid/liquid.cpp b/noncore/styles/liquid/liquid.cpp index ba732aa..c8f8d20 100644 --- a/noncore/styles/liquid/liquid.cpp +++ b/noncore/styles/liquid/liquid.cpp | |||
@@ -2006,13 +2006,22 @@ void LiquidStyle::drawMenuBarItem(QPainter *p, int x, int y, int w, int h, | |||
2006 | shadow = g.background().dark(130); | 2006 | shadow = g.background().dark(130); |
2007 | 2007 | ||
2008 | QPixmap *dummy = 0; | ||
2009 | |||
2010 | if ( mi-> pixmap ( ) && !mi-> pixmap ( )-> isNull ( )) { | ||
2011 | dummy = new QPixmap ( mi-> pixmap ( )-> size ( )); | ||
2012 | QBitmap dummy_mask ( dummy-> size ( )); | ||
2013 | dummy_mask. fill ( color1 ); | ||
2014 | dummy-> setMask ( dummy_mask ); | ||
2015 | } | ||
2016 | |||
2008 | if(active){ | 2017 | if(active){ |
2009 | drawClearBevel(p, x+1, y+1, w-1, h-1, g.button(), g.background()); | 2018 | drawClearBevel(p, x+1, y+1, w-1, h-1, g.button(), g.background()); |
2010 | QApplication::style().drawItem(p, x+1, y+1, w, h, | 2019 | QApplication::style().drawItem(p, x+1, y+1, w, h, |
2011 | AlignCenter|ShowPrefix|DontClip|SingleLine, | 2020 | AlignCenter|ShowPrefix|DontClip|SingleLine, |
2012 | g, mi->isEnabled(), NULL, mi->text(), | 2021 | g, mi->isEnabled(), dummy, mi->text(), |
2013 | -1, &shadow); | 2022 | -1, &shadow); |
2014 | QApplication::style().drawItem(p, x, y, w, h, | 2023 | QApplication::style().drawItem(p, x, y, w, h, |
2015 | AlignCenter|ShowPrefix|DontClip|SingleLine, | 2024 | AlignCenter|ShowPrefix|DontClip|SingleLine, |
2016 | g, mi->isEnabled(), NULL, mi->text(), | 2025 | g, mi->isEnabled(), mi-> pixmap ( ), mi->text(), |
2017 | -1, &g.text()); | 2026 | -1, &g.text()); |
2018 | } | 2027 | } |
@@ -2020,11 +2029,12 @@ void LiquidStyle::drawMenuBarItem(QPainter *p, int x, int y, int w, int h, | |||
2020 | QApplication::style().drawItem(p, x+1, y+1, w, h, | 2029 | QApplication::style().drawItem(p, x+1, y+1, w, h, |
2021 | AlignCenter|ShowPrefix|DontClip|SingleLine, | 2030 | AlignCenter|ShowPrefix|DontClip|SingleLine, |
2022 | g, mi->isEnabled(), NULL, mi->text(), | 2031 | g, mi->isEnabled(), dummy, mi->text(), |
2023 | -1, &shadow); | 2032 | -1, &shadow); |
2024 | QApplication::style().drawItem(p, x, y, w, h, | 2033 | QApplication::style().drawItem(p, x, y, w, h, |
2025 | AlignCenter|ShowPrefix|DontClip|SingleLine, | 2034 | AlignCenter|ShowPrefix|DontClip|SingleLine, |
2026 | g, mi->isEnabled(), NULL, mi->text(), | 2035 | g, mi->isEnabled(), mi-> pixmap ( ), mi->text(), |
2027 | -1, &g.text()); | 2036 | -1, &g.text()); |
2028 | } | 2037 | } |
2038 | delete dummy; | ||
2029 | } | 2039 | } |
2030 | else{ | 2040 | else{ |
@@ -2033,5 +2043,5 @@ void LiquidStyle::drawMenuBarItem(QPainter *p, int x, int y, int w, int h, | |||
2033 | QApplication::style().drawItem(p, x, y, w, h, | 2043 | QApplication::style().drawItem(p, x, y, w, h, |
2034 | AlignCenter|ShowPrefix|DontClip|SingleLine, | 2044 | AlignCenter|ShowPrefix|DontClip|SingleLine, |
2035 | g, mi->isEnabled(), NULL, mi->text(), | 2045 | g, mi->isEnabled(), mi-> pixmap ( ), mi->text(), |
2036 | -1, &g.text()); | 2046 | -1, &g.text()); |
2037 | } | 2047 | } |
diff --git a/noncore/styles/liquid/opie-liquid.diff b/noncore/styles/liquid/opie-liquid.diff index 29ae6f3..d90433c 100644 --- a/noncore/styles/liquid/opie-liquid.diff +++ b/noncore/styles/liquid/opie-liquid.diff | |||
@@ -4,5 +4,5 @@ Features: | |||
4 | - works with Qt/E on QPE/OPIE | 4 | - works with Qt/E on QPE/OPIE |
5 | 5 | ||
6 | --- -2002-11-18 04:47:41.000000000 +0100 | 6 | --- -2002-11-21 20:45:47.000000000 +0100 |
7 | +++ liquid.h2002-11-18 03:32:40.000000000 +0100 | 7 | +++ liquid.h2002-11-18 03:32:40.000000000 +0100 |
8 | @@ -2,7 +2,7 @@ | 8 | @@ -2,7 +2,7 @@ |
@@ -142,6 +142,6 @@ Features: | |||
142 | TransMenuHandler *menuHandler; | 142 | TransMenuHandler *menuHandler; |
143 | QPixmap *pixmaps[BITMAP_ITEMS]; | 143 | QPixmap *pixmaps[BITMAP_ITEMS]; |
144 | --- -2002-11-18 04:47:41.000000000 +0100 | 144 | --- -2002-11-21 20:45:47.000000000 +0100 |
145 | +++ liquid.cpp2002-11-18 04:46:13.000000000 +0100 | 145 | +++ liquid.cpp2002-11-21 20:27:48.000000000 +0100 |
146 | @@ -2,6 +2,9 @@ | 146 | @@ -2,6 +2,9 @@ |
147 | * Copyright (C)QPL 2001 Daniel M. Duley. All rights reserved. | 147 | * Copyright (C)QPL 2001 Daniel M. Duley. All rights reserved. |
@@ -342,7 +342,8 @@ Features: | |||
342 | - if(w->inherits("QMenuBar")){ | 342 | - if(w->inherits("QMenuBar")){ |
343 | - w->repaint(); | 343 | - w->repaint(); |
344 | - } | ||
345 | - } | ||
346 | + wid-> setBackgroundMode( QWidget::PaletteBackground ); | 344 | + wid-> setBackgroundMode( QWidget::PaletteBackground ); |
345 | } | ||
346 | + delete ol; | ||
347 | } | ||
347 | } | 348 | } |
348 | - } | 349 | - } |
@@ -365,7 +366,6 @@ Features: | |||
365 | - if(w->inherits("QPushButton")){ | 366 | - if(w->inherits("QPushButton")){ |
366 | - ((LiquidStyle*)parent())->applyCustomAttributes((QPushButton *)w); | 367 | - ((LiquidStyle*)parent())->applyCustomAttributes((QPushButton *)w); |
367 | + delete ol; | 368 | - } |
368 | } | 369 | - } |
369 | } | ||
370 | + return(false); | 370 | + return(false); |
371 | +} | 371 | +} |
@@ -495,8 +495,8 @@ Features: | |||
495 | + case CBDown: | 495 | + case CBDown: |
496 | + pixmaps[CBDown] = processEmbedded("checkboxdown", btnH, btnS, btnV /*, true*/); | 496 | + pixmaps[CBDown] = processEmbedded("checkboxdown", btnH, btnS, btnV /*, true*/); |
497 | break; | 497 | + break; |
498 | + case CBDownHover: | 498 | + case CBDownHover: |
499 | + pixmaps[CBDownHover] = processEmbedded("checkboxdown", btnHoverH, btnHoverS, btnHoverV /*, true*/); | 499 | + pixmaps[CBDownHover] = processEmbedded("checkboxdown", btnHoverH, btnHoverS, btnHoverV /*, true*/); |
500 | + break; | 500 | break; |
501 | + | 501 | + |
502 | case VSlider: | 502 | case VSlider: |
@@ -1573,5 +1573,5 @@ Features: | |||
1573 | { | 1573 | { |
1574 | p->drawPixmap(x, y, orient == Qt::Horizontal ? *getPixmap(HSlider)->mask() : | 1574 | p->drawPixmap(x, y, orient == Qt::Horizontal ? *getPixmap(HSlider)->mask() : |
1575 | @@ -2065,203 +1980,26 @@ | 1575 | @@ -2065,243 +1980,76 @@ |
1576 | p->drawLineSegments(a); | 1576 | p->drawLineSegments(a); |
1577 | } | 1577 | } |
@@ -1634,7 +1634,7 @@ Features: | |||
1634 | - &g.brush(QColorGroup::Background)); | 1634 | - &g.brush(QColorGroup::Background)); |
1635 | - } | 1635 | - } |
1636 | - | ||
1637 | -} | ||
1638 | 1636 | ||
1637 | -} | ||
1638 | - | ||
1639 | -void LiquidStyle::drawKToolBar(QPainter *p, int x, int y, int w, int h, | 1639 | -void LiquidStyle::drawKToolBar(QPainter *p, int x, int y, int w, int h, |
1640 | - const QColorGroup &g, KToolBarPos, QBrush *) | 1640 | - const QColorGroup &g, KToolBarPos, QBrush *) |
@@ -1789,5 +1789,51 @@ Features: | |||
1789 | } | 1789 | } |
1790 | else | 1790 | else |
1791 | @@ -2300,8 +2038,8 @@ | 1791 | shadow = g.background().dark(130); |
1792 | |||
1793 | + QPixmap *dummy = 0; | ||
1794 | + | ||
1795 | + if ( mi-> pixmap ( ) && !mi-> pixmap ( )-> isNull ( )) { | ||
1796 | + dummy = new QPixmap ( mi-> pixmap ( )-> size ( )); | ||
1797 | + QBitmap dummy_mask ( dummy-> size ( )); | ||
1798 | + dummy_mask. fill ( color1 ); | ||
1799 | + dummy-> setMask ( dummy_mask ); | ||
1800 | + } | ||
1801 | + | ||
1802 | if(active){ | ||
1803 | drawClearBevel(p, x+1, y+1, w-1, h-1, g.button(), g.background()); | ||
1804 | QApplication::style().drawItem(p, x+1, y+1, w, h, | ||
1805 | AlignCenter|ShowPrefix|DontClip|SingleLine, | ||
1806 | - g, mi->isEnabled(), NULL, mi->text(), | ||
1807 | + g, mi->isEnabled(), dummy, mi->text(), | ||
1808 | -1, &shadow); | ||
1809 | QApplication::style().drawItem(p, x, y, w, h, | ||
1810 | AlignCenter|ShowPrefix|DontClip|SingleLine, | ||
1811 | - g, mi->isEnabled(), NULL, mi->text(), | ||
1812 | + g, mi->isEnabled(), mi-> pixmap ( ), mi->text(), | ||
1813 | -1, &g.text()); | ||
1814 | } | ||
1815 | else{ | ||
1816 | QApplication::style().drawItem(p, x+1, y+1, w, h, | ||
1817 | AlignCenter|ShowPrefix|DontClip|SingleLine, | ||
1818 | - g, mi->isEnabled(), NULL, mi->text(), | ||
1819 | + g, mi->isEnabled(), dummy, mi->text(), | ||
1820 | -1, &shadow); | ||
1821 | QApplication::style().drawItem(p, x, y, w, h, | ||
1822 | AlignCenter|ShowPrefix|DontClip|SingleLine, | ||
1823 | - g, mi->isEnabled(), NULL, mi->text(), | ||
1824 | + g, mi->isEnabled(), mi-> pixmap ( ), mi->text(), | ||
1825 | -1, &g.text()); | ||
1826 | } | ||
1827 | + delete dummy; | ||
1828 | } | ||
1829 | else{ | ||
1830 | if(active) | ||
1831 | drawClearBevel(p, x+1, y+1, w-1, h-1, g.button(), g.background()); | ||
1832 | QApplication::style().drawItem(p, x, y, w, h, | ||
1833 | AlignCenter|ShowPrefix|DontClip|SingleLine, | ||
1834 | - g, mi->isEnabled(), NULL, mi->text(), | ||
1835 | + g, mi->isEnabled(), mi-> pixmap ( ), mi->text(), | ||
1836 | -1, &g.text()); | ||
1837 | } | ||
1792 | } | 1838 | } |
1793 | 1839 | ||
@@ -1800,5 +1846,5 @@ Features: | |||
1800 | QColor c; | 1846 | QColor c; |
1801 | switch(menuHandler->transType()){ | 1847 | switch(menuHandler->transType()){ |
1802 | @@ -2336,8 +2074,6 @@ | 1848 | @@ -2336,8 +2084,6 @@ |
1803 | 1849 | ||
1804 | maxpmw = QMAX( maxpmw, 20 ); | 1850 | maxpmw = QMAX( maxpmw, 20 ); |
@@ -1809,5 +1855,5 @@ Features: | |||
1809 | bool dis = !enabled; | 1855 | bool dis = !enabled; |
1810 | QColorGroup itemg = dis ? pal.disabled() : pal.active(); | 1856 | QColorGroup itemg = dis ? pal.disabled() : pal.active(); |
1811 | @@ -2363,7 +2099,7 @@ | 1857 | @@ -2363,7 +2109,7 @@ |
1812 | p->fillRect(x, y, w, h, menuBrush); | 1858 | p->fillRect(x, y, w, h, menuBrush); |
1813 | } | 1859 | } |
@@ -1818,5 +1864,5 @@ Features: | |||
1818 | p->drawPixmap(x, y, *pix, x, y, w, h); | 1864 | p->drawPixmap(x, y, *pix, x, y, w, h); |
1819 | } | 1865 | } |
1820 | @@ -2508,25 +2244,6 @@ | 1866 | @@ -2508,25 +2254,6 @@ |
1821 | return h; | 1867 | return h; |
1822 | } | 1868 | } |
@@ -1844,5 +1890,5 @@ Features: | |||
1844 | void LiquidStyle::drawFocusRect(QPainter *p, const QRect &r, | 1890 | void LiquidStyle::drawFocusRect(QPainter *p, const QRect &r, |
1845 | const QColorGroup &g, const QColor *c, | 1891 | const QColorGroup &g, const QColor *c, |
1846 | @@ -2536,29 +2253,29 @@ | 1892 | @@ -2536,29 +2263,29 @@ |
1847 | if(p->device()->devType() == QInternal::Widget){ | 1893 | if(p->device()->devType() == QInternal::Widget){ |
1848 | // if so does it use a special focus rectangle? | 1894 | // if so does it use a special focus rectangle? |
@@ -1879,5 +1925,5 @@ Features: | |||
1879 | } | 1925 | } |
1880 | QPixmap tilePix; | 1926 | QPixmap tilePix; |
1881 | @@ -2671,7 +2388,7 @@ | 1927 | @@ -2671,7 +2398,7 @@ |
1882 | vFrame = 8; // was 10 | 1928 | vFrame = 8; // was 10 |
1883 | } | 1929 | } |
@@ -1888,5 +1934,5 @@ Features: | |||
1888 | 1934 | ||
1889 | 1935 | ||
1890 | @@ -2699,7 +2416,7 @@ | 1936 | @@ -2699,7 +2426,7 @@ |
1891 | p->drawLine(x+1, y+1, x+1, y2-1); | 1937 | p->drawLine(x+1, y+1, x+1, y2-1); |
1892 | } | 1938 | } |
@@ -1897,5 +1943,5 @@ Features: | |||
1897 | QPen oldPen = p->pen(); | 1943 | QPen oldPen = p->pen(); |
1898 | int x2 = x+w-1; | 1944 | int x2 = x+w-1; |
1899 | @@ -2726,105 +2443,6 @@ | 1945 | @@ -2726,105 +2453,6 @@ |
1900 | } | 1946 | } |
1901 | } | 1947 | } |
@@ -2003,5 +2049,5 @@ Features: | |||
2003 | void LiquidStyle::adjustHSV(QPixmap &pix, int h, int s, int v) | 2049 | void LiquidStyle::adjustHSV(QPixmap &pix, int h, int s, int v) |
2004 | { | 2050 | { |
2005 | @@ -2988,110 +2606,5 @@ | 2051 | @@ -2988,110 +2616,5 @@ |
2006 | } | 2052 | } |
2007 | } | 2053 | } |
@@ -2114,7 +2160,7 @@ Features: | |||
2114 | 2160 | ||
2115 | /* vim: set noet sw=8 ts=8: */ | 2161 | /* vim: set noet sw=8 ts=8: */ |
2116 | --- -2002-11-18 04:47:41.000000000 +0100 | 2162 | --- -2002-11-21 20:45:47.000000000 +0100 |
2117 | +++ plugin.cpp2002-11-18 03:54:56.000000000 +0100 | 2163 | +++ plugin.cpp2002-11-18 18:11:41.000000000 +0100 |
2118 | @@ -1,29 +1,79 @@ | 2164 | @@ -1,29 +1,84 @@ |
2119 | +#include <qapplication.h> | 2165 | +#include <qapplication.h> |
2120 | + | 2166 | + |
@@ -2130,4 +2176,13 @@ Features: | |||
2130 | +m_widget = 0; | 2176 | +m_widget = 0; |
2131 | +} | 2177 | +} |
2178 | + | ||
2179 | +LiquidInterface::~LiquidInterface ( ) | ||
2180 | +{ | ||
2181 | +} | ||
2182 | + | ||
2183 | +QStyle *LiquidInterface::style ( ) | ||
2184 | +{ | ||
2185 | +return new LiquidStyle ( ); | ||
2186 | +} | ||
2132 | 2187 | ||
2133 | -extern "C" { | 2188 | -extern "C" { |
@@ -2136,45 +2191,36 @@ Features: | |||
2136 | - int major_version(); | 2191 | - int major_version(); |
2137 | - const char *description(); | 2192 | - const char *description(); |
2138 | +LiquidInterface::~LiquidInterface ( ) | 2193 | +QString LiquidInterface::name ( ) const |
2139 | +{ | 2194 | +{ |
2195 | +return qApp-> translate ( "Styles", "Liquid" ); | ||
2140 | } | 2196 | } |
2141 | 2197 | ||
2142 | -KStyle* allocate() | 2198 | -KStyle* allocate() |
2143 | +QStyle *LiquidInterface::style ( ) | 2199 | +QString LiquidInterface::description ( ) const |
2144 | { | 2200 | { |
2145 | - return(new LiquidStyle); | 2201 | - return(new LiquidStyle); |
2146 | +return new LiquidStyle ( ); | 2202 | +return qApp-> translate ( "Styles", "High Performance Liquid style by Mosfet" ); |
2147 | } | 2203 | } |
2148 | 2204 | ||
2149 | -int minor_version() | 2205 | -int minor_version() |
2150 | +QString LiquidInterface::name ( ) const | 2206 | +bool LiquidInterface::hasSettings ( ) const |
2151 | { | 2207 | { |
2152 | - return(0); | 2208 | - return(0); |
2153 | +return qApp-> translate ( "Styles", "Liquid" ); | 2209 | +return true; |
2154 | } | 2210 | } |
2155 | 2211 | ||
2156 | -int major_version() | 2212 | -int major_version() |
2157 | +QString LiquidInterface::description ( ) const | 2213 | +QWidget *LiquidInterface::create ( QWidget *parent, const char *name ) |
2158 | { | 2214 | { |
2159 | - return(1); | 2215 | - return(1); |
2160 | +return qApp-> translate ( "Styles", "High Performance Liquid style by Mosfet" ); | 2216 | +m_widget = new LiquidSettings ( parent, name ? name : "LIQUID-SETTINGS" ); |
2217 | + | ||
2218 | +return m_widget; | ||
2161 | } | 2219 | } |
2162 | 2220 | ||
2163 | -const char *description() | 2221 | -const char *description() |
2164 | +bool LiquidInterface::hasSettings ( ) const | 2222 | +bool LiquidInterface::accept ( ) |
2165 | { | 2223 | { |
2166 | - return(i18n("High performance liquid plugin").utf8()); | 2224 | - return(i18n("High performance liquid plugin").utf8()); |
2167 | +return true; | ||
2168 | +} | ||
2169 | + | ||
2170 | +QWidget *LiquidInterface::create ( QWidget *parent, const char *name ) | ||
2171 | +{ | ||
2172 | +m_widget = new LiquidSettings ( parent, name ? name : "LIQUID-SETTINGS" ); | ||
2173 | + | ||
2174 | +return m_widget; | ||
2175 | +} | ||
2176 | + | ||
2177 | +bool LiquidInterface::accept ( ) | ||
2178 | +{ | ||
2179 | +if ( !m_widget ) | 2225 | +if ( !m_widget ) |
2180 | + return false; | 2226 | + return false; |
@@ -2210,2 +2256,7 @@ Features: | |||
2210 | +} | 2256 | +} |
2211 | + | 2257 | + |
2258 | + | ||
2259 | +// For Sharp ROM | ||
2260 | + | ||
2261 | +extern "C" { QStyle *allocate ( ) { return new LiquidStyle ( ); } } | ||
2262 | +extern "C" { void drawmenubaritem ( QStyle *sty, QPainter *p, int x, int y, int w, int h, QMenuItem *mi, QColorGroup &g, bool enabled, bool active ) { return ((LiquidStyle *) sty )-> drawMenuBarItem ( p, x, y, w, h, mi, g, enabled, active ); } } | ||