author | sandman <sandman> | 2002-07-15 00:52:50 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-07-15 00:52:50 (UTC) |
commit | ecf2a873be3274bb30be0c659b7db6ef8a43be84 (patch) (side-by-side diff) | |
tree | 5c80fb0863966fffd245f6ed44c6bf524c11842b /noncore/styles/liquid | |
parent | 4feeec8b5b41cfd3d13274411f515524f687da09 (diff) | |
download | opie-ecf2a873be3274bb30be0c659b7db6ef8a43be84.zip opie-ecf2a873be3274bb30be0c659b7db6ef8a43be84.tar.gz opie-ecf2a873be3274bb30be0c659b7db6ef8a43be84.tar.bz2 |
Added an option to make toolbar buttons flat
-rw-r--r-- | noncore/styles/liquid/liquid.cpp | 28 | ||||
-rw-r--r-- | noncore/styles/liquid/liquid.h | 1 | ||||
-rw-r--r-- | noncore/styles/liquid/liquidset.cpp | 58 | ||||
-rw-r--r-- | noncore/styles/liquid/liquidset.h | 2 | ||||
-rw-r--r-- | noncore/styles/liquid/opie-liquid.diff | 350 |
5 files changed, 313 insertions, 126 deletions
diff --git a/noncore/styles/liquid/liquid.cpp b/noncore/styles/liquid/liquid.cpp index 87b5488..22bf8af 100644 --- a/noncore/styles/liquid/liquid.cpp +++ b/noncore/styles/liquid/liquid.cpp @@ -171,2 +171,4 @@ LiquidStyle::LiquidStyle() + flatTBButtons = false; + btnMaskBmp = QBitmap(37, 26, buttonmask_bits, true); @@ -833,2 +835,9 @@ void LiquidStyle::polish(QWidget *w) w->setBackgroundMode(QWidget::PaletteBackground); + w->setBackgroundOrigin(QWidget::ParentOrigin); + return; + } + if(w->inherits("QToolBar")){ + w->installEventFilter(this); + w->setBackgroundMode(QWidget::PaletteBackground); + w->setBackgroundOrigin(QWidget::WidgetOrigin); return; @@ -895,4 +904,6 @@ void LiquidStyle::polish(QWidget *w) } - if(w-> inherits("QToolButton")) { - ((QToolButton*)w)->setAutoRaise (false); + if(w-> inherits("QToolButton")&&w->parent()->inherits("QToolBar")) { + ((QToolButton*)w)->setAutoRaise (flatTBButtons); + if ( flatTBButtons ) + w->setBackgroundOrigin(QWidget::ParentOrigin); } @@ -914,7 +925,2 @@ void LiquidStyle::polish(QWidget *w) } - if(w->inherits("QToolBar")){ - w->installEventFilter(this); - w->setBackgroundMode(QWidget::PaletteBackground); - return; - } @@ -1003,2 +1009,4 @@ void LiquidStyle::polish(QApplication *app) QApplication::qwsSetDecoration ( new LiquidDecoration ( )); + + flatTBButtons = config. readBoolEntry ( "FlatToolButtons", false ); } @@ -2000,4 +2008,6 @@ void LiquidStyle::drawMenuBarItem(QPainter *p, int x, int y, int w, int h, } - - p-> fillRect ( x, y, w, h, g.brush(QColorGroup::Background)); + + QWidget *parent = (QWidget *)p->device(); + p->setBrushOrigin(parent->pos()); + parent->erase(x, y, w, h); diff --git a/noncore/styles/liquid/liquid.h b/noncore/styles/liquid/liquid.h index fb691ea..00cfb35 100644 --- a/noncore/styles/liquid/liquid.h +++ b/noncore/styles/liquid/liquid.h @@ -179,2 +179,3 @@ protected: private: + bool flatTBButtons; bool highcolor; diff --git a/noncore/styles/liquid/liquidset.cpp b/noncore/styles/liquid/liquidset.cpp index 5ae19ba..1b9526f 100644 --- a/noncore/styles/liquid/liquidset.cpp +++ b/noncore/styles/liquid/liquidset.cpp @@ -30,3 +30,3 @@ #include <qtoolbutton.h> -#include <qbuttongroup.h> +#include <qcombobox.h> #include <qradiobutton.h> @@ -74,2 +74,3 @@ LiquidSettings::LiquidSettings ( QWidget* parent, const char *name, WFlags fl ) int contrast = config. readNumEntry ( "StippleContrast", 5 ); + m_flat = config. readBoolEntry ( "FlatToolButtons", false ); @@ -77,35 +78,15 @@ LiquidSettings::LiquidSettings ( QWidget* parent, const char *name, WFlags fl ) vbox-> setSpacing ( 3 ); - vbox-> setMargin ( 6 ); + vbox-> setMargin ( 4 ); - QButtonGroup *btngrp = new QButtonGroup ( this ); - btngrp-> hide ( ); - - QRadioButton *rad; - - rad = new QRadioButton ( tr( "No translucency" ), this ); - btngrp-> insert ( rad, None ); - vbox-> addWidget ( rad ); - - rad = new QRadioButton ( tr( "Stippled, background color" ), this ); - btngrp-> insert ( rad, StippledBg ); - vbox-> addWidget ( rad ); - - rad = new QRadioButton ( tr( "Stippled, button color" ), this ); - btngrp-> insert ( rad, StippledBtn ); - vbox-> addWidget ( rad ); - - rad = new QRadioButton ( tr( "Translucent stippled, background color" ), this ); - btngrp-> insert ( rad, TransStippleBg ); - vbox-> addWidget ( rad ); - - rad = new QRadioButton ( tr( "Translucent stippled, button color" ), this ); - btngrp-> insert ( rad, TransStippleBtn ); - vbox-> addWidget ( rad ); + QComboBox *cb = new QComboBox ( this ); + cb-> insertItem ( tr( "No translucency" ), None ); + cb-> insertItem ( tr( "Stippled, background color" ), StippledBg ); + cb-> insertItem ( tr( "Stippled, button color" ), StippledBtn ); + cb-> insertItem ( tr( "Translucent stippled, background color" ), TransStippleBg ); + cb-> insertItem ( tr( "Translucent stippled, button color" ), TransStippleBtn ); + cb-> insertItem ( tr( "Custom translucency" ), Custom ); - rad = new QRadioButton ( tr( "Custom translucency" ), this ); - btngrp-> insert ( rad, Custom ); - vbox-> addWidget ( rad ); + cb-> setCurrentItem ( m_type ); + vbox-> addWidget ( cb ); - btngrp-> setExclusive ( true ); - btngrp-> setButton ( m_type ); @@ -159,2 +140,8 @@ LiquidSettings::LiquidSettings ( QWidget* parent, const char *name, WFlags fl ) + QCheckBox *flattb = new QCheckBox ( tr( "Make toolbar buttons appear flat" ), this ); + flattb-> setChecked ( m_flat ); + vbox-> addWidget ( flattb ); + + vbox-> addSpacing ( 4 ); + QHBoxLayout *hbox = new QHBoxLayout ( vbox ); @@ -173,5 +160,6 @@ LiquidSettings::LiquidSettings ( QWidget* parent, const char *name, WFlags fl ) - connect ( btngrp, SIGNAL( clicked ( int ) ), this, SLOT( changeType ( int ) ) ); + connect ( cb, SIGNAL( highlighted ( int ) ), this, SLOT( changeType ( int ) ) ); connect ( shadow, SIGNAL( toggled ( bool ) ), this, SLOT( changeShadow ( bool ) ) ); connect ( windeco, SIGNAL( toggled ( bool ) ), this, SLOT( changeDeco ( bool ) ) ); + connect ( flattb, SIGNAL( toggled ( bool ) ), this, SLOT( changeFlat ( bool ) ) ); } @@ -214,2 +202,7 @@ void LiquidSettings::changeDeco ( bool b ) +void LiquidSettings::changeFlat ( bool b ) +{ + m_flat = b; +} + @@ -227,2 +220,3 @@ bool LiquidSettings::writeConfig ( ) config. writeEntry ( "StippleContrast", m_contsld-> value ( )); + config. writeEntry ( "FlatToolButtons", m_flat ); config. write ( ); diff --git a/noncore/styles/liquid/liquidset.h b/noncore/styles/liquid/liquidset.h index 7843513..bb1846c 100644 --- a/noncore/styles/liquid/liquidset.h +++ b/noncore/styles/liquid/liquidset.h @@ -22,2 +22,3 @@ public slots: void changeDeco ( bool b ); + void changeFlat ( bool b ); @@ -31,2 +32,3 @@ private: bool m_deco; + bool m_flat; diff --git a/noncore/styles/liquid/opie-liquid.diff b/noncore/styles/liquid/opie-liquid.diff index bcbdc8d..7dfd868 100644 --- a/noncore/styles/liquid/opie-liquid.diff +++ b/noncore/styles/liquid/opie-liquid.diff @@ -5,4 +5,4 @@ Features: ---- - Mon Jul 1 11:38:05 2002 -+++ liquid.h Mon Jun 24 19:07:45 2002 +--- - Mon Jul 15 02:34:13 2002 ++++ liquid.h Mon Jul 15 01:51:12 2002 @@ -2,7 +2,7 @@ @@ -104,4 +104,12 @@ Features: void drawSliderGroove(QPainter * p, int x, int y, int w, int h, ---- - Mon Jul 1 11:38:05 2002 -+++ liquid.cpp Mon Jul 1 03:45:28 2002 +@@ -204,6 +177,7 @@ + QPixmap* getPixmap(BitmapData item); + QPixmap* processEmbedded(const char *label, int h, int s, int v, bool blend=false); + private: ++ bool flatTBButtons; + bool highcolor; + QColorGroup radioOnGrp; + QWidget *highlightWidget; +--- - Mon Jul 15 02:34:13 2002 ++++ liquid.cpp Mon Jul 15 02:31:59 2002 @@ -10,12 +10,10 @@ @@ -186,3 +194,3 @@ Features: + Config config ( "qpe" ); -+ config. setGroup ( "MosfetMenus" ); ++ config. setGroup ( "Liquid-Style" ); + @@ -223,3 +231,3 @@ Features: else{ // tear off menu -@@ -121,82 +122,54 @@ +@@ -121,82 +122,55 @@ stripePixmap(*pix, p->colorGroup().button()); @@ -231,5 +239,5 @@ Features: + -+ if (p->inherits("QPopupMenu")) pixDict.insert(p->winId(), pix); -+ else { ++ ++ if (!p->inherits("QPopupMenu")) { + p->setBackgroundPixmap(*pix); @@ -256,4 +264,3 @@ Features: -} -+// qWarning("Deleting menu pixmap, width %d", pixDict.find(p->winId())->width()); - +- -void TransMenuHandler::slotKIPCMessage(int id, int) @@ -262,3 +269,4 @@ Features: - bool oldShadow = shadowText; -- ++// qWarning("Deleting menu pixmap, width %d", pixDict.find(p->winId())->width()); + - KConfig *config = KGlobal::config(); @@ -278,6 +286,5 @@ Features: - } -+ if (p->inherits("QPopupMenu")) -+ pixDict.remove(p->winId()); -+ else { -+ p->setBackgroundMode(QWidget::PaletteBackground); ++ pixDict.remove(p->winId()); ++ if (!p->inherits("QPopupMenu")) { ++ p->setBackgroundMode(QWidget::PaletteBackground); @@ -297,3 +304,4 @@ Features: - } -- } ++ wid-> setBackgroundMode( QWidget::PaletteBackground ); + } - } @@ -309,4 +317,3 @@ Features: - ((LiquidStyle*)parent())->unapplyCustomAttributes((QPushButton *)w); -+ wid-> setBackgroundMode( QWidget::PaletteBackground ); - } +- } - } @@ -333,2 +340,4 @@ Features: + ++ flatTBButtons = false; ++ btnMaskBmp = QBitmap(37, 26, buttonmask_bits, true); @@ -336,3 +345,3 @@ Features: htmlBtnMaskBmp = QBitmap(37, 26, htmlbuttonmask_bits, true); -@@ -730,20 +703,19 @@ +@@ -730,20 +704,26 @@ } @@ -350,2 +359,9 @@ Features: + Config config ( "qpe" ); ++ config. setGroup ( "Liquid-Style" ); ++ int contrast = config. readNumEntry ( "StippleContrast", 5 ); ++ if ( contrast < 0 ) ++ contrast = 0; ++ else if ( contrast > 10 ) ++ contrast = 10; ++ QPalette pal = QApplication::palette(); @@ -362,3 +378,3 @@ Features: appPal.setBrush(QColorGroup::Button, btnBrush); -@@ -794,15 +766,7 @@ +@@ -794,15 +774,7 @@ pagerBrush.setPixmap(*pix); @@ -379,3 +395,13 @@ Features: -@@ -825,13 +789,10 @@ +@@ -817,21 +789,18 @@ + wallPaper.fill(c.rgb()); + painter.begin(&wallPaper); + for(i=0; i < 32; i+=4){ +- painter.setPen(c.dark(105)); ++ painter.setPen(c.dark(100 + contrast)); + painter.drawLine(0, i, 32, i); +- painter.setPen(c.dark(103)); ++ painter.setPen(c.dark(100 + 3 * contrast / 5 ) ); + painter.drawLine(0, i+1, 32, i+1); + }; painter.end(); @@ -394,3 +420,3 @@ Features: basePix.fill(c.rgb()); -@@ -857,51 +818,31 @@ +@@ -857,51 +826,39 @@ } @@ -408,2 +434,9 @@ Features: + w->setBackgroundMode(QWidget::PaletteBackground); ++ w->setBackgroundOrigin(QWidget::ParentOrigin); ++ return; ++ } ++ if(w->inherits("QToolBar")){ ++ w->installEventFilter(this); ++ w->setBackgroundMode(QWidget::PaletteBackground); ++ w->setBackgroundOrigin(QWidget::WidgetOrigin); return; @@ -444,3 +477,4 @@ Features: + -+ w-> setBackgroundOrigin ( QWidget::ParentOrigin ); ++ if ( !w-> inherits("QFrame") || (((QFrame*) w)-> frameShape () == QFrame::NoFrame )) ++ w-> setBackgroundOrigin ( QWidget::ParentOrigin ); @@ -455,3 +489,3 @@ Features: if(w->inherits("QLineEdit")){ -@@ -913,6 +854,9 @@ +@@ -913,6 +870,9 @@ applyCustomAttributes((QPushButton *)w); @@ -465,3 +499,3 @@ Features: qstrcmp(w->name(), "qt_clipped_viewport") == 0; -@@ -942,11 +886,12 @@ +@@ -942,11 +902,14 @@ w->setMouseTracking(true); @@ -469,4 +503,6 @@ Features: } -+ if(w-> inherits("QToolButton")) { -+ ((QToolButton*)w)->setAutoRaise (false); ++ if(w-> inherits("QToolButton")&&w->parent()->inherits("QToolBar")) { ++ ((QToolButton*)w)->setAutoRaise (flatTBButtons); ++ if ( flatTBButtons ) ++ w->setBackgroundOrigin(QWidget::ParentOrigin); + } @@ -480,3 +516,3 @@ Features: palette().active().brush(QColorGroup::Background).pixmap()){ -@@ -954,17 +899,18 @@ +@@ -954,17 +917,13 @@ return; @@ -492,8 +528,6 @@ Features: - if(w->inherits("KToolBar")){ -+ if(w->inherits("QToolBar")){ - w->installEventFilter(this); +- w->installEventFilter(this); - //w->setBackgroundMode(QWidget::NoBackground); -+ w->setBackgroundMode(QWidget::PaletteBackground); - return; - } +- return; +- } + @@ -502,3 +536,3 @@ Features: void LiquidStyle::unPolish(QWidget *w) -@@ -977,6 +923,9 @@ +@@ -977,6 +936,9 @@ @@ -512,3 +546,3 @@ Features: return; -@@ -1001,12 +950,14 @@ +@@ -1001,12 +963,14 @@ unapplyCustomAttributes((QPushButton *)w); @@ -531,3 +565,3 @@ Features: if(w->inherits("QButton") || w->inherits("QComboBox")){ -@@ -1014,9 +965,9 @@ +@@ -1014,9 +978,9 @@ w->setAutoMask(false); @@ -543,3 +577,3 @@ Features: if(w->inherits("QHeader")){ -@@ -1028,20 +979,28 @@ +@@ -1028,20 +992,34 @@ void LiquidStyle::polish(QApplication *app) @@ -558,3 +592,9 @@ Features: + -+ QApplication::qwsSetDecoration ( new LiquidDecoration ( )); ++ Config config ( "qpe" ); ++ config. setGroup ( "Liquid-Style" ); ++ ++ if ( config. readBoolEntry ( "WinDecoration", true )) ++ QApplication::qwsSetDecoration ( new LiquidDecoration ( )); ++ ++ flatTBButtons = config. readBoolEntry ( "FlatToolButtons", false ); } @@ -574,3 +614,3 @@ Features: /* -@@ -1063,7 +1022,7 @@ +@@ -1063,7 +1041,7 @@ */ @@ -583,3 +623,3 @@ Features: QObjectListIt it(*tbChildList); -@@ -1076,35 +1035,7 @@ +@@ -1076,35 +1054,7 @@ @@ -620,3 +660,3 @@ Features: if(btn->isEnabled()){ -@@ -1119,20 +1050,7 @@ +@@ -1119,20 +1069,7 @@ } @@ -642,3 +682,3 @@ Features: if(btn->isEnabled()){ -@@ -1340,11 +1258,6 @@ +@@ -1340,11 +1277,6 @@ QColorGroup g = btn->colorGroup(); @@ -654,3 +694,56 @@ Features: QColor c = btn->hasFocus() ? g.button().light(110) : g.background(); -@@ -1914,8 +1827,8 @@ +@@ -1596,7 +1528,7 @@ + if(sbBuffer.size() != sb->size()) + sbBuffer.resize(sb->size()); + } +- subB.setRect( subX,subY,buttonDim,buttonDim ); ++ subB.setRect( subX,subY,0,0); // buttonDim,buttonDim ); + addB.setRect( addX,addY,buttonDim,buttonDim ); + if(horiz) + subHC.setRect(addX-buttonDim,addY,buttonDim,buttonDim ); +@@ -1624,7 +1556,7 @@ + QPainter painter; + if(!horiz){ + painter.begin(&sbBuffer); +- QRect bgR(0, subB.bottom()+1, sb->width(), (len-(buttonDim*3))+1); ++ QRect bgR(0, subB.bottom()+1, sb->width(), (len-(buttonDim*2))+1); + if(sliderR.height() >= 8){ + painter.drawPixmap(bgR.x()+1, bgR.y(), *vsbSliderFillPix, 0, 0, + 13, 8); +@@ -1690,7 +1622,7 @@ + } + else{ + painter.begin(&sbBuffer); +- QRect bgR(subB.right()+1, 0, (len-(buttonDim*3))+1, sb->height()); ++ QRect bgR(subB.right()+1, 0, (len-(buttonDim*2))+1, sb->height()); + if(sliderR.width() >= 8){ + painter.drawPixmap(bgR.x(), bgR.y()+1, *vsbSliderFillPix, 0, 0, + 8, 13); +@@ -1761,10 +1693,10 @@ + addB.width()-8, addB.height()-8, g, !maxed); + } + if ( controls & SubLine ) { +- drawSBButton(p, subB, g, activeControl == SubLine); +- drawArrow( p, horiz ? LeftArrow : UpArrow, +- false, subB.x()+4, subB.y()+4, +- subB.width()-8, subB.height()-8, g, !maxed); ++ // drawSBButton(p, subB, g, activeControl == SubLine); ++ // drawArrow( p, horiz ? LeftArrow : UpArrow, ++ // false, subB.x()+4, subB.y()+4, ++ // subB.width()-8, subB.height()-8, g, !maxed); + drawSBButton(p, subHC, g, activeControl == SubLine); + drawArrow( p, horiz ? LeftArrow : UpArrow, + false, subHC.x()+4, subHC.y()+4, +@@ -1865,8 +1797,8 @@ + else + buttonDim = ( length - b*2 )/2 - 1; + +- sliderMin = b + buttonDim; +- maxLength = length - b*2 - buttonDim*3; ++ sliderMin = b + 0; // buttonDim; ++ maxLength = length - b*2 - buttonDim*2; // 3; + + if ( sb->maxValue() == sb->minValue() ) { + sliderLength = maxLength; +@@ -1914,8 +1846,8 @@ return(QSize(16, 16)); @@ -665,3 +758,3 @@ Features: bool isHover = highlightWidget == p->device(); -@@ -1957,8 +1870,8 @@ +@@ -1957,8 +1889,8 @@ return(QSize(20, 22)); @@ -676,3 +769,3 @@ Features: bool isMasked = p->device() && p->device()->devType() == QInternal::Widget -@@ -1996,8 +1909,8 @@ +@@ -1996,8 +1928,8 @@ } @@ -687,3 +780,3 @@ Features: p->drawPixmap(x, y, *getPixmap(HTMLCB)->mask()); -@@ -2005,18 +1918,17 @@ +@@ -2005,18 +1937,17 @@ } @@ -709,3 +802,3 @@ Features: p->drawPixmap(x, y, orient == Qt::Horizontal ? *getPixmap(HSlider)->mask() : -@@ -2065,203 +1977,24 @@ +@@ -2065,203 +1996,26 @@ p->drawLineSegments(a); @@ -780,7 +873,3 @@ Features: -} -+ x -= 2; // Bug in Qt/E -+ y -= 2; -+ w += 2; -+ h += 2; - +- -void LiquidStyle::drawKToolBarButton(QPainter *p, int x, int y, int w, int h, @@ -900,7 +989,11 @@ Features: - 0, 0, g, false); -- } ++ if(active){ ++ x -= 2; // Bug in Qt/E ++ y -= 2; ++ w += 2; ++ h += 2; + } -} -+ p-> fillRect ( x, y, w, h, g.brush(QColorGroup::Background)); - - + -void LiquidStyle::drawKMenuItem(QPainter *p, int x, int y, int w, int h, @@ -911,3 +1004,5 @@ Features: - p->setFont( KGlobalSettings::menuFont() ); -+ w -= 2; ++ QWidget *parent = (QWidget *)p->device(); ++ p->setBrushOrigin(parent->pos()); ++ parent->erase(x, y, w, h); @@ -923,3 +1018,3 @@ Features: else -@@ -2300,8 +2033,8 @@ +@@ -2300,8 +2054,8 @@ } @@ -934,3 +1029,3 @@ Features: switch(menuHandler->transType()){ -@@ -2336,8 +2069,6 @@ +@@ -2336,8 +2090,6 @@ @@ -943,3 +1038,3 @@ Features: QColorGroup itemg = dis ? pal.disabled() : pal.active(); -@@ -2363,7 +2094,7 @@ +@@ -2363,7 +2115,7 @@ p->fillRect(x, y, w, h, menuBrush); @@ -952,3 +1047,3 @@ Features: } -@@ -2508,25 +2239,6 @@ +@@ -2508,25 +2260,6 @@ return h; @@ -978,3 +1073,3 @@ Features: const QColorGroup &g, const QColor *c, -@@ -2540,25 +2252,25 @@ +@@ -2540,25 +2273,25 @@ return; @@ -1008,3 +1103,3 @@ Features: QPixmap tilePix; -@@ -2671,7 +2383,7 @@ +@@ -2671,7 +2404,7 @@ vFrame = 8; // was 10 @@ -1017,3 +1112,3 @@ Features: -@@ -2699,7 +2411,7 @@ +@@ -2699,7 +2432,7 @@ p->drawLine(x+1, y+1, x+1, y2-1); @@ -1026,3 +1121,3 @@ Features: int x2 = x+w-1; -@@ -2726,105 +2438,6 @@ +@@ -2726,105 +2459,6 @@ } @@ -1132,3 +1227,3 @@ Features: { -@@ -2998,22 +2611,22 @@ +@@ -2998,22 +2632,22 @@ customBtnIconList.clear(); @@ -1162,3 +1257,3 @@ Features: c->setNamedColor(QString(colorStr)); -@@ -3022,7 +2635,7 @@ +@@ -3022,7 +2656,7 @@ QString tmpStr(iconStr); @@ -1171,3 +1266,3 @@ Features: customBtnIconList.append(NULL); -@@ -3037,7 +2650,6 @@ +@@ -3037,7 +2671,6 @@ colorStr = colorList.next(); @@ -1179,3 +1274,3 @@ Features: void LiquidStyle::applyCustomAttributes(QPushButton *btn) -@@ -3087,7 +2699,7 @@ +@@ -3087,7 +2720,7 @@ } @@ -1188,10 +1283,11 @@ Features: ---- - Mon Jul 1 11:38:05 2002 -+++ plugin.cpp Fri Jun 28 13:25:25 2002 -@@ -1,29 +1,29 @@ +--- - Mon Jul 15 02:34:13 2002 ++++ plugin.cpp Fri Jul 12 00:41:40 2002 +@@ -1,29 +1,113 @@ #include "liquid.h" -#include <klocale.h> -+ ++#include "liquidset.h" ++#include "plugin.h" - extern "C" { +-extern "C" { - KStyle* allocate(); @@ -1200,6 +1296,20 @@ Features: - const char *description(); -+ QStyle* allocate ( ); -+ int minor_version ( ); -+ int major_version ( ); -+ const char *description ( ); ++ ++ ++LiquidInterface::LiquidInterface ( ) : ref ( 0 ) ++{ ++} ++ ++LiquidInterface::~LiquidInterface ( ) ++{ ++} ++ ++QStyle *LiquidInterface::create ( ) ++{ ++ return new LiquidStyle ( ); ++} ++ ++QString LiquidInterface::name ( ) ++{ ++ return QObject::tr( "Liquid", "name" ); } @@ -1207,6 +1317,6 @@ Features: -KStyle* allocate() -+QStyle* allocate ( ) ++QString LiquidInterface::description ( ) { - return(new LiquidStyle); -+ return new LiquidStyle ( ); ++ return QObject::tr( "High Performance Liquid style by Mosfet", "description" ); } @@ -1214,6 +1324,6 @@ Features: -int minor_version() -+int minor_version ( ) ++QCString LiquidInterface::key ( ) { - return(0); -+ return 0; ++ return QCString ( "liquid" ); } @@ -1221,6 +1331,6 @@ Features: -int major_version() -+int major_version ( ) ++unsigned int LiquidInterface::version ( ) { - return(1); -+ return 1; ++ return 100; // 1.0.0 (\d+.\d.\d) } @@ -1228,6 +1338,76 @@ Features: -const char *description() -+const char *description ( ) ++QRESULT LiquidInterface::queryInterface ( const QUuid &uuid, QUnknownInterface **iface ) ++{ ++ static LiquidSettingsInterface *setiface = 0; ++ ++ *iface = 0; ++ ++ if ( uuid == IID_QUnknown ) ++ *iface = this; ++ else if ( uuid == IID_Style ) ++ *iface = this; ++ else if ( uuid == IID_StyleSettings ) { ++ if ( !setiface ) ++ setiface = new LiquidSettingsInterface ( ); ++ *iface = setiface; ++ } ++ ++ if ( *iface ) ++ (*iface)-> addRef ( ); ++ ++ return QS_OK; ++} ++ ++Q_EXPORT_INTERFACE() ++{ ++ Q_CREATE_INSTANCE( LiquidInterface ) ++} ++ ++ ++LiquidSettingsInterface::LiquidSettingsInterface ( ) : ref ( 0 ) { - return(i18n("High performance liquid plugin").utf8()); -+ return "High Performance Liquid"; ++ m_widget = 0; } ++ ++LiquidSettingsInterface::~LiquidSettingsInterface ( ) ++{ ++} ++ ++QWidget *LiquidSettingsInterface::create ( QWidget *parent, const char *name ) ++{ ++ m_widget = new LiquidSettings ( parent, name ? name : "LIQUID-SETTINGS" ); ++ ++ return m_widget; ++} ++ ++bool LiquidSettingsInterface::accept ( ) ++{ ++ if ( !m_widget ) ++ return false; ++ ++ return m_widget-> writeConfig ( ); ++} ++ ++void LiquidSettingsInterface::reject ( ) ++{ ++} ++ ++QRESULT LiquidSettingsInterface::queryInterface ( const QUuid &uuid, QUnknownInterface **iface ) ++{ ++ *iface = 0; ++ ++ ++ if ( uuid == IID_QUnknown ) ++ *iface = this; ++ else if ( uuid == IID_StyleSettings ) ++ *iface = this; ++ ++ if ( *iface ) ++ (*iface)-> addRef ( ); ++ ++ return QS_OK; ++} ++ ++// Hack for Retail Z experiments ++extern "C" { QStyle *allocate ( ) { return new LiquidStyle ( ); } } |