r19002 by craig - QML tool now in a tool window with better qml

scribus-commit scribus-commit at lists.scribus.net
Fri Apr 4 14:55:00 UTC 2014


Author: craig
Date: Fri Apr  4 14:54:59 2014
New Revision: 19002

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19002
Log:
QML tool now in a tool window with better qml

Modified:
    trunk/Scribus/scribus/scribus.cpp
    trunk/Scribus/scribus/ui/qml/qtq_test1.qml

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19002&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Fri Apr  4 14:54:59 2014
@@ -10884,6 +10884,7 @@
 	//container->deleteLater();
 	//layout->deleteLater();
 
+	qqview->setFlags(Qt::Tool);
 	qqview->show();
 
 //	qDebug() << "Property value:" << QQmlProperty::read(object, "someNumber").toInt();

Modified: trunk/Scribus/scribus/ui/qml/qtq_test1.qml
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19002&path=/trunk/Scribus/scribus/ui/qml/qtq_test1.qml
==============================================================================
--- trunk/Scribus/scribus/ui/qml/qtq_test1.qml (original)
+++ trunk/Scribus/scribus/ui/qml/qtq_test1.qml Fri Apr  4 14:54:59 2014
@@ -97,15 +97,15 @@
 
         Label {
             id: label1
-            x: 20
-            y: 20
+            x: 5
+            y: 5
             text: qsTr("X:")
             font.pixelSize: 10
         }
         SpinBox {
             id: xSpinBox
-            x: 40
-            y: 18
+            x: 25
+            y: 3
             font.pixelSize: 10
             decimals:2
             style: SpinBoxStyle{
@@ -120,15 +120,15 @@
 
         Label {
             id: label2
-            x: 20
-            y: 40
+            x: 5
+            y: 25
             text: qsTr("Y:")
             font.pixelSize: 10
         }
         SpinBox {
             id: ySpinBox
-            x: 40
-            y: 38
+            x: 25
+            y: 23
             font.pixelSize: 10
             decimals:2
             style: SpinBoxStyle{
@@ -143,15 +143,15 @@
 
         Label {
             id: labelW
-            x: 120
-            y: 40
+            x: 105
+            y: 5
             text: qsTr("W:")
             font.pixelSize: 10
         }
         SpinBox {
             id: wSpinBox
-            x: 140
-            y: 38
+            x: 125
+            y: 3
             font.pixelSize: 10
             decimals:2
             style: SpinBoxStyle{
@@ -166,15 +166,15 @@
 
         Label {
             id: labelH
-            x: 120
-            y: 20
+            x: 105
+            y: 25
             text: qsTr("H:")
             font.pixelSize: 10
         }
         SpinBox {
             id: hSpinBox
-            x: 140
-            y: 18
+            x: 125
+            y: 23
             font.pixelSize: 10
             decimals:2
             style: SpinBoxStyle{




More information about the scribus-commit mailing list