Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3

1 files changed, 76 insertions, 1 deletions

diff --git a/src/styles/qcommonstyle.cpp b/src/styles/qcommonstyle.cpp
index 402354c62..a303a805d 100644
--- a/src/styles/qcommonstyle.cpp
+++ b/src/styles/qcommonstyle.cpp
@@ -66,6 +66,7 @@
 #include "ntqradiobutton.h"
 #include "ntqbitmap.h"
 #include "ntqprogressbar.h"
+#include "ntqlistbox.h"
 #include "private/qdialogbuttons_p.h"
 #include <limits.h>
 #include <ntqpixmap.h>
@@ -158,7 +159,7 @@ TQStringList getObjectTypeListForObject(const TQObject* object) {
 }
 
 TQStyle::ControlElementFlags getControlElementFlagsForObject(const TQObject* object, TQStringList objectTypeList, const TQStyleOption& opt, bool populateReliantFields) {
-	TQStyle::ControlElementFlags cef = (TQStyle::ControlElementFlags)0;
+	TQStyle::ControlElementFlags cef = TQStyle::CEF_None;
 
 	if (object) {
 		if (objectTypeList.contains("TQPushButton")) {
@@ -195,6 +196,12 @@ TQStyle::ControlElementFlags getControlElementFlagsForObject(const TQObject* obj
 				if (t->identifier() == tb->currentTab())	cef = cef | TQStyle::CEF_IsActive;
 			}
 		}
+		if (objectTypeList.contains("TQTitleBar")) {
+			const TQTitleBar *tb = dynamic_cast<const TQTitleBar*>(object);
+			if (tb) {
+				if (tb->isActive())				cef = cef | TQStyle::CEF_IsActive;
+			}
+		}
 		if (objectTypeList.contains("TQToolBox")) {
 			const TQToolBox *tb = dynamic_cast<const TQToolBox*>(object);
 			if (tb) {
@@ -232,6 +239,7 @@ TQStyle::ControlElementFlags getControlElementFlagsForObject(const TQObject* obj
 				if (widget->isActiveWindow())			cef = cef | TQStyle::CEF_IsActiveWindow;
 				if (widget->isTopLevel())			cef = cef | TQStyle::CEF_IsTopLevel;
 				if (widget->isVisible())			cef = cef | TQStyle::CEF_IsVisible;
+				if (widget->isShown())				cef = cef | TQStyle::CEF_IsShown;
 			}
 		}
 	}
@@ -265,6 +273,7 @@ TQStyleControlElementData populateControlElementDataFromWidget(const TQWidget* w
 		if (populateReliantFields) {
 			ceData.fgColor = widget->foregroundColor();
 			ceData.colorGroup = widget->colorGroup();
+			ceData.paletteBgColor = widget->paletteBackgroundColor();
 		}
 		ceData.geometry = widget->geometry();
 		ceData.rect = widget->rect();
@@ -275,6 +284,8 @@ TQStyleControlElementData populateControlElementDataFromWidget(const TQWidget* w
 		}
 		ceData.palette = widget->palette();
 		ceData.font = widget->font();
+		ceData.name = widget->name();
+		ceData.caption = widget->caption();
 		if (ceData.widgetObjectTypes.contains("TQPushButton")) {
 			const TQPushButton *button = dynamic_cast<const TQPushButton*>(widget);
 			if (button) {
@@ -394,6 +405,7 @@ TQStyleControlElementData populateControlElementDataFromWidget(const TQWidget* w
 				ceData.totalSteps = pb->totalSteps();
 				ceData.progressText = pb->progressString();
 				ceData.percentageVisible = pb->percentageVisible();
+				ceData.orientation = pb->orientation();
 			}
 		}
 		if (ceData.widgetObjectTypes.contains("TQHeader")) {
@@ -504,6 +516,7 @@ TQStyleControlElementData populateControlElementDataFromWidget(const TQWidget* w
 					if (populateReliantFields) {
 						ceData.viewportData.fgColor = viewport->foregroundColor();
 						ceData.viewportData.colorGroup = viewport->colorGroup();
+						ceData.viewportData.paletteBgColor = viewport->paletteBackgroundColor();
 					}
 					ceData.viewportData.geometry = viewport->geometry();
 					ceData.viewportData.rect = viewport->rect();
@@ -514,6 +527,8 @@ TQStyleControlElementData populateControlElementDataFromWidget(const TQWidget* w
 					}
 					ceData.viewportData.palette = viewport->palette();
 					ceData.viewportData.font = viewport->font();
+					ceData.viewportData.name = viewport->name();
+					ceData.viewportData.caption = viewport->caption();
 				}
 			}
 		}
@@ -524,6 +539,10 @@ TQStyleControlElementData populateControlElementDataFromWidget(const TQWidget* w
 				if (lineEdit) {
 					ceData.comboBoxLineEditFlags = getControlElementFlagsForObject(lineEdit, ceData.widgetObjectTypes, TQStyleOption::Default);
 				}
+				const TQListBox* listBox = cb->listBox();
+				if (listBox) {
+					ceData.comboBoxListBoxFlags = getControlElementFlagsForObject(listBox, ceData.widgetObjectTypes, TQStyleOption::Default);
+				}
 			}
 		}
 		if (ceData.widgetObjectTypes.contains("TQFrame")) {
@@ -554,6 +573,7 @@ TQStyleControlElementData populateControlElementDataFromWidget(const TQWidget* w
 			if (populateReliantFields) {
 				ceData.parentWidgetData.fgColor = parentWidget->foregroundColor();
 				ceData.parentWidgetData.colorGroup = parentWidget->colorGroup();
+				ceData.parentWidgetData.paletteBgColor = parentWidget->paletteBackgroundColor();
 			}
 			ceData.parentWidgetData.geometry = parentWidget->geometry();
 			ceData.parentWidgetData.rect = parentWidget->rect();
@@ -564,6 +584,8 @@ TQStyleControlElementData populateControlElementDataFromWidget(const TQWidget* w
 			}
 			ceData.parentWidgetData.palette = parentWidget->palette();
 			ceData.parentWidgetData.font = parentWidget->font();
+			ceData.parentWidgetData.name = parentWidget->name();
+			ceData.parentWidgetData.caption = parentWidget->caption();
 
 			const TQDockWindow * dw = dynamic_cast<const TQDockWindow*>(parentWidget);
 			if (dw) {
@@ -580,6 +602,59 @@ TQStyleControlElementData populateControlElementDataFromWidget(const TQWidget* w
 			if (toolbar) {
 				ceData.toolBarData.orientation = toolbar->orientation();
 			}
+			ceData.parentWidgetFlags = getControlElementFlagsForObject(parentWidget, ceData.parentWidgetData.widgetObjectTypes, TQStyleOption::Default, populateReliantFields);
+		}
+		const TQWidget* topLevelWidget = widget->topLevelWidget();
+		if (topLevelWidget) {
+			ceData.topLevelWidgetData.widgetObjectTypes = getObjectTypeListForObject(topLevelWidget);
+			ceData.topLevelWidgetData.allDataPopulated = populateReliantFields;
+			const TQPixmap* erasePixmap = topLevelWidget->backgroundPixmap();
+			if (erasePixmap) {
+				ceData.topLevelWidgetData.bgPixmap = *erasePixmap;
+			}
+			if (populateReliantFields) {
+				ceData.topLevelWidgetData.bgBrush = topLevelWidget->backgroundBrush();
+			}
+			ceData.topLevelWidgetData.wflags = topLevelWidget->getWFlags();
+			if (populateReliantFields) {
+				ceData.topLevelWidgetData.windowState = (TQt::WindowState)(widget->windowState());
+			}
+			ceData.topLevelWidgetData.bgColor = topLevelWidget->eraseColor();
+			ceData.topLevelWidgetData.bgOffset = topLevelWidget->backgroundOffset();
+			ceData.topLevelWidgetData.backgroundMode = topLevelWidget->backgroundMode();
+			if (populateReliantFields) {
+				ceData.topLevelWidgetData.fgColor = topLevelWidget->foregroundColor();
+				ceData.topLevelWidgetData.colorGroup = topLevelWidget->colorGroup();
+				ceData.topLevelWidgetData.paletteBgColor = topLevelWidget->paletteBackgroundColor();
+			}
+			ceData.topLevelWidgetData.geometry = topLevelWidget->geometry();
+			ceData.topLevelWidgetData.rect = topLevelWidget->rect();
+			ceData.topLevelWidgetData.pos = topLevelWidget->pos();
+			const TQPixmap* icon = topLevelWidget->icon();
+			if (icon) {
+				ceData.topLevelWidgetData.icon = *icon;
+			}
+			ceData.topLevelWidgetData.palette = topLevelWidget->palette();
+			ceData.topLevelWidgetData.font = topLevelWidget->font();
+			ceData.topLevelWidgetData.name = topLevelWidget->name();
+			ceData.topLevelWidgetData.caption = topLevelWidget->caption();
+
+			const TQDockWindow * dw = dynamic_cast<const TQDockWindow*>(topLevelWidget);
+			if (dw) {
+				if (dw->area()) {
+					ceData.dwData.hasDockArea = true;
+					ceData.dwData.areaOrientation = dw->area()->orientation();
+				}
+				else {
+					ceData.dwData.hasDockArea = false;
+				}
+				ceData.dwData.closeEnabled = dw->isCloseEnabled();
+			}
+			const TQToolBar * toolbar = dynamic_cast<const TQToolBar*>(topLevelWidget);
+			if (toolbar) {
+				ceData.toolBarData.orientation = toolbar->orientation();
+			}
+			ceData.topLevelWidgetFlags = getControlElementFlagsForObject(topLevelWidget, ceData.topLevelWidgetData.widgetObjectTypes, TQStyleOption::Default, populateReliantFields);
 		}
 
 		TQCheckListItem *item = opt.checkListItem();