[qet] [1527] Various improvements for RTL languages.

[subversion@xxxxxxxxxxxxx]

Revision: 1527
Author:   xavier
Date:     2012-02-24 22:26:24 +0100 (Fri, 24 Feb 2012)
Log Message:
-----------
Various improvements for RTL languages.

Modified Paths:
--------------
    branches/0.3/sources/editor/styleeditor.cpp
    branches/0.3/sources/titleblock/templatelogomanager.cpp
    branches/0.3/sources/titleblock/templateview.cpp

Modified: branches/0.3/sources/editor/styleeditor.cpp
===================================================================
--- branches/0.3/sources/editor/styleeditor.cpp	2012-02-24 11:54:13 UTC (rev 1526)
+++ branches/0.3/sources/editor/styleeditor.cpp	2012-02-24 21:26:24 UTC (rev 1527)
@@ -67,7 +67,7 @@
 	color_layout -> addWidget(black_color);
 	color_layout -> addWidget(white_color);
 	color_layout -> addStretch();
-	main_layout -> addItem(color_layout);
+	main_layout -> addLayout(color_layout);
 	
 	QHBoxLayout *style_layout = new QHBoxLayout();
 	style_layout -> addWidget(new QLabel(tr("Style : ")));
@@ -75,7 +75,7 @@
 	style_layout -> addWidget(dashed_style);
 	style_layout -> addWidget(dotted_style);
 	style_layout -> addStretch();
-	main_layout -> addItem(style_layout);
+	main_layout -> addLayout(style_layout);
 	
 	QHBoxLayout *weight_layout = new QHBoxLayout();
 	weight_layout -> addWidget(new QLabel(tr("\311paisseur : ")));
@@ -83,7 +83,7 @@
 	weight_layout -> addWidget(thin_weight);
 	weight_layout -> addWidget(normal_weight);
 	weight_layout -> addStretch();
-	main_layout -> addItem(weight_layout);
+	main_layout -> addLayout(weight_layout);
 	
 	main_layout -> addWidget(new QLabel("<u>" + tr("Remplissage :") + "</u> "));
 	
@@ -92,7 +92,7 @@
 	filling_layout -> addWidget(black_filling);
 	filling_layout -> addWidget(white_filling);
 	filling_layout -> addStretch();
-	main_layout -> addItem(filling_layout);
+	main_layout -> addLayout(filling_layout);
 	
 	main_layout -> addStretch();
 	

Modified: branches/0.3/sources/titleblock/templatelogomanager.cpp
===================================================================
--- branches/0.3/sources/titleblock/templatelogomanager.cpp	2012-02-24 11:54:13 UTC (rev 1526)
+++ branches/0.3/sources/titleblock/templatelogomanager.cpp	2012-02-24 21:26:24 UTC (rev 1527)
@@ -79,7 +79,6 @@
 	logos_view_ -> setMinimumSize(iconsize() * 2.9);
 	logos_view_ -> setIconSize(iconsize());
 	logos_view_ -> setWrapping(true);
-	logos_view_ -> setFlow(QListView::LeftToRight);
 	logos_view_ -> setMovement(QListView::Static);
 	logos_view_ -> setResizeMode(QListView::Adjust);
 	add_button_ = new QPushButton(tr("Ajouter un logo"));

Modified: branches/0.3/sources/titleblock/templateview.cpp
===================================================================
--- branches/0.3/sources/titleblock/templateview.cpp	2012-02-24 11:54:13 UTC (rev 1526)
+++ branches/0.3/sources/titleblock/templateview.cpp	2012-02-24 21:26:24 UTC (rev 1527)
@@ -689,6 +689,8 @@
 	
 	// assign the layout to a basic QGraphicsWidget
 	form_ = new QGraphicsWidget();
+	// enforce the layout direction to avoid reversing the template rendering
+	form_ -> setLayoutDirection(Qt::LeftToRight);
 	form_ -> setLayout(tbgrid_);
 	scene() -> addItem(form_);
 	adjustSceneRect();