some fix

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2444 17fca916-40b9-46aa-a4ea-0a15b648b75c

7 files changed, 45 insertions, 12 deletions

diff --git a/src/kvilib/tal/kvi_tal_hbox.cpp b/src/kvilib/tal/kvi_tal_hbox.cpp
index 0c0ea5e13..cf20edabb 100644
--- a/src/kvilib/tal/kvi_tal_hbox.cpp
+++ b/src/kvilib/tal/kvi_tal_hbox.cpp
@@ -25,6 +25,32 @@
 #include "kvi_tal_hbox.h"
 
 #include <QChildEvent>
+// Tables used in $setAlignment & $alignment
+const char * const align_tbl[] = {
+			"Left", 
+			"Right",
+			"HCenter",
+			"VCenter",
+			"Center",
+			"Top",
+			"Bottom",
+			"WordBreak"
+			   };
+
+
+
+const int align_cod[] = {
+		Qt::AlignLeft,
+		Qt::AlignRight,
+	    Qt::AlignHCenter,
+	    Qt::AlignVCenter,
+	    Qt::AlignCenter,
+	 	Qt::AlignTop,
+	    Qt::AlignBottom,
+	    Qt::AlignJustify,
+	};
+
+#define align_num	(sizeof(align_tbl) / sizeof(align_tbl[0]))
 
 KviTalHBox::KviTalHBox(QWidget * pParent,char* name)
 : QWidget(pParent)
@@ -76,7 +102,10 @@ void KviTalHBox::setAlignment(Qt::Alignment alignment)
 {
 	m_pLayout->setAlignment(this,alignment);
 }
-
+void KviTalHBox::setAlignment(QWidget * child,Qt::Alignment alignment)
+{
+	m_pLayout->setAlignment(child,alignment);
+}
 void KviTalHBox::addStretch(int stretch)
 {
 	m_pLayout->addStretch(stretch);
diff --git a/src/kvilib/tal/kvi_tal_hbox.h b/src/kvilib/tal/kvi_tal_hbox.h
index 1aed2c961..1d066e56f 100644
--- a/src/kvilib/tal/kvi_tal_hbox.h
+++ b/src/kvilib/tal/kvi_tal_hbox.h
@@ -40,7 +40,8 @@ public:
 	void setSpacing(int);
 	void setMargin(int);
 	void setAlignment(Qt::Alignment);
-	void addStretch(int stretch=0);
+	void setAlignment(QWidget * child,Qt::Alignment alignment);
+	void addStretch(int stretch);
 protected:
 	virtual void childEvent(QChildEvent * e);
 private:
diff --git a/src/kvilib/tal/kvi_tal_vbox.cpp b/src/kvilib/tal/kvi_tal_vbox.cpp
index 25595896b..e2fd14b34 100644
--- a/src/kvilib/tal/kvi_tal_vbox.cpp
+++ b/src/kvilib/tal/kvi_tal_vbox.cpp
@@ -66,6 +66,10 @@ void KviTalVBox::setSpacing(int spacing)
 {
 	m_pLayout->setSpacing(spacing);
 }
+void KviTalVBox::addStretch(int stretch)
+{
+	m_pLayout->addStretch(stretch);
+}
 
 void KviTalVBox::setMargin(int margin)
 {
@@ -76,12 +80,10 @@ void KviTalVBox::setAlignment(Qt::Alignment alignment)
 {
 	m_pLayout->setAlignment(alignment);
 }
-
-void KviTalVBox::addStretch(int stretch)
+void KviTalVBox::setAlignment(QWidget * child,Qt::Alignment alignment)
 {
-	m_pLayout->addStretch(stretch);
+	m_pLayout->setAlignment(child,alignment);
 }
-
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
 	#include "kvi_tal_vbox.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/kvilib/tal/kvi_tal_vbox.h b/src/kvilib/tal/kvi_tal_vbox.h
index 888c5bb05..716a85e12 100644
--- a/src/kvilib/tal/kvi_tal_vbox.h
+++ b/src/kvilib/tal/kvi_tal_vbox.h
@@ -40,7 +40,8 @@ public:
 	void setSpacing(int spacing);
 	void setMargin(int margin);
 	void setAlignment(Qt::Alignment);
-	void addStretch(int stretch=0);
+	void addStretch(int stretch);
+	void setAlignment(QWidget * child,Qt::Alignment alignment);
 protected:
 	virtual void childEvent(QChildEvent * e);
 private:
diff --git a/src/modules/objects/class_hbox.cpp b/src/modules/objects/class_hbox.cpp
index a44f703e8..da9b31cdd 100644
--- a/src/modules/objects/class_hbox.cpp
+++ b/src/modules/objects/class_hbox.cpp
@@ -218,6 +218,6 @@ bool KviKvsObject_hbox::functionsetAlignment(KviKvsObjectFunctionCall *c)
 				c->warning(__tr2qs("Unknown alignment: '%Q'"),&(*it));
 			
 		}
-	if (widget()) ((KviTalHBox *)widget())->setAlignment((Qt::Alignment)sum);
+	if (widget()) ((KviTalHBox *)widget())->setAlignment(((QWidget *)(pObject->object())),(Qt::Alignment)sum);
 	return true;
-}
+}
\ No newline at end of file
diff --git a/src/modules/objects/class_layout.cpp b/src/modules/objects/class_layout.cpp
index 1107b6d55..a73f6da8b 100644
--- a/src/modules/objects/class_layout.cpp
+++ b/src/modules/objects/class_layout.cpp
@@ -346,4 +346,4 @@ bool KviKvsObject_layout::functionsetAlignment(KviKvsObjectFunctionCall *c)
 		}
 	if (widget()) ((QGridLayout *)widget())->setAlignment(((QWidget *)(pObject->object())),(Qt::Alignment)sum);
 	return true;
-}
+}
\ No newline at end of file
diff --git a/src/modules/objects/class_vbox.cpp b/src/modules/objects/class_vbox.cpp
index 8e5d49339..9a9cc8cc0 100644
--- a/src/modules/objects/class_vbox.cpp
+++ b/src/modules/objects/class_vbox.cpp
@@ -223,6 +223,6 @@ bool KviKvsObject_vbox::functionsetAlignment(KviKvsObjectFunctionCall *c)
 				c->warning(__tr2qs("Unknown alignment: '%Q'"),&(*it));
 			
 		}
-	if (widget()) ((KviTalHBox *)widget())->setAlignment((Qt::Alignment)sum);
+	if (widget()) ((KviTalHBox *)widget())->setAlignment(((QWidget *)(pObject->object())),(Qt::Alignment)sum);
 	return true;
-}
+}
\ No newline at end of file