Update qtcurve to latest upstream version

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kde-style-qtcurve@1182805 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 72 insertions, 5 deletions

diff --git a/config/qtcurveconfig.h b/config/qtcurveconfig.h
index 8e69510..04d34cb 100644
--- a/config/qtcurveconfig.h
+++ b/config/qtcurveconfig.h
@@ -2,7 +2,7 @@
 #define __QTCURVECONFIG_H__
 
 /*
-  QtCurve (C) Craig Drummond, 2003 - 2007 Craig.Drummond@lycos.co.uk
+  QtCurve (C) Craig Drummond, 2003 - 2010 craig.p.drummond@gmail.com
 
   ----
 
@@ -21,15 +21,46 @@
   Boston, MA 02110-1301, USA.
 */
 
-#define QTC_COMMON_ONLY_COVERTERS
-#define QTC_CONFIG_DIALOG
+#define COMMON_FUNCTIONS
+#define CONFIG_DIALOG
 
 #include <qtcurveconfigbase.h>
+#include <qcombobox.h>
 #include <qmap.h>
 #include "common.h"
 
 class QPopupMenu;
+class QListViewItem;
+class KDoubleNumInput;
+#ifdef QTC_STYLE_SUPPORT
 class CExportThemeDialog;
+#endif
+class CStackItem;
+class QtCurveConfig;
+
+class CGradientPreview : public QWidget
+{
+    Q_OBJECT
+
+    public:
+
+    CGradientPreview(QtCurveConfig *c, QWidget *p);
+
+    QSize sizeHint() const;
+    QSize minimumSizeHint() const;
+    void paintEvent(QPaintEvent *);
+    void setGrad(const GradientStopCont &s);
+
+    public slots:
+
+    void setColor(const QColor &col);
+
+    private:
+
+    QtCurveConfig    *cfg;
+    QColor           color;
+    GradientStopCont stops;
+};
 
 class QtCurveConfig : public QtCurveConfigBase
 {
@@ -40,6 +71,8 @@ class QtCurveConfig : public QtCurveConfigBase
     QtCurveConfig(QWidget *parent);
     virtual ~QtCurveConfig();
 
+    EShading currentShading() const { return (EShading)shading->currentItem(); }
+
     signals:
 
     void changed(bool);
@@ -57,25 +90,53 @@ class QtCurveConfig : public QtCurveConfigBase
 
     void setStyle(int s);
     void updateChanged();
+    void focusChanged();
+    void roundChanged();
     void importStyle();
     void exportStyle();
     void exportTheme();
     void emboldenToggled();
-    void dbiChanged();
+    void defBtnIndicatorChanged();
+    void buttonEffectChanged();
+    void coloredMouseOverChanged();
     void shadeSlidersChanged();
     void shadeMenubarsChanged();
     void shadeCheckRadioChanged();
     void customMenuTextColorChanged();
+    void menuStripeChanged();
+    void comboBtnChanged();
+    void sortedLvChanged();
     void stripedProgressChanged();
-    void tabAppearanceChanged();
+    void activeTabAppearanceChanged();
+    void tabMoChanged();
+    void shadingChanged();
     void passwordCharClicked();
+    void unifySpinBtnsToggled();
+    void unifySpinToggled();
+    void sliderThumbChanged();
+    void sliderWidthChanged();
+    void changeStack();
+    void gradChanged(int i);
+    void itemChanged(QListViewItem *i, int col);
+    void addGradStop();
+    void removeGradStop();
+    void updateGradStop();
+    void stopSelected();
 
     private:
 
+    void setupStack();
+    void setupGradientsTab();
+    void setupShadesTab();
+    void setupShade(KDoubleNumInput *w, int shade);
+    void populateShades(const Options &opts);
+    bool diffShades(const Options &opts);
     void setPasswordChar(int ch);
     void loadStyle(const QString &file);
     void setOptions(Options &opts);
     void setWidgetOptions(const Options &opts);
+    int  getSquareFlags();
+    int  getWindowBorderFlags();
     bool settingsChanged();
 
     private:
@@ -83,7 +144,13 @@ class QtCurveConfig : public QtCurveConfigBase
     Options            currentStyle,
                        defaultStyle;
     QMap<int, QString> styles;
+#ifdef QTC_STYLE_SUPPORT
     CExportThemeDialog *exportDialog;
+#endif
+    CGradientPreview   *gradPreview;
+    GradientCont       customGradient;
+    KDoubleNumInput    *shadeVals[NUM_STD_SHADES];
+    CStackItem         *lastCategory;
 };
 
 #endif