[QGIS Commit] r13371 - trunk/qgis/src/gui/symbology-ng

svn_qgis at osgeo.org svn_qgis at osgeo.org
Sat Apr 24 14:49:03 EDT 2010


Author: jef
Date: 2010-04-24 14:49:03 -0400 (Sat, 24 Apr 2010)
New Revision: 13371

Modified:
   trunk/qgis/src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp
Log:
remove Qt 4.5 dependency

Modified: trunk/qgis/src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp
===================================================================
--- trunk/qgis/src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp	2010-04-24 18:23:16 UTC (rev 13370)
+++ trunk/qgis/src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp	2010-04-24 18:49:03 UTC (rev 13371)
@@ -126,9 +126,19 @@
     bool ok;
     double key = item->data( 0, StopOffsetRole ).toDouble();
     int val = ( int )( key * 100 );
+#if QT_VERSION >= 0x40500
     val = QInputDialog::getInt( this, tr( "Offset of the stop" ),
                                 tr( "Please enter offset in percents (%) of the new stop" ),
                                 val, 0, 100, 1, &ok );
+#else
+    QString res = QInputDialog::getText( this, tr( "Offset of the stop" ),
+                                         tr( "Please enter offset in percents (%) of the new stop" ),
+                                         QLineEdit::Normal, QString::number( val ), &ok );
+    if ( ok )
+      val = res.toInt( &ok );
+    if ( ok )
+      ok = val >= 0 && val <= 100;
+#endif
     if ( !ok )
       return;
 
@@ -149,9 +159,19 @@
 
   bool ok;
   int val = 50;
+#if QT_VERSION >= 0x40500
   val = QInputDialog::getInt( this, tr( "Offset of the stop" ),
                               tr( "Please enter offset in percents (%) of the new stop" ),
                               val, 0, 100, 1, &ok );
+#else
+  QString res = QInputDialog::getText( this, tr( "Offset of the stop" ),
+                                       tr( "Please enter offset in percents (%) of the new stop" ),
+                                       QLineEdit::Normal, QString::number( val ), &ok );
+  if ( ok )
+    val = res.toInt( &ok );
+  if ( ok )
+    ok = val >= 0 && val <= 100;
+#endif
   if ( !ok )
     return;
 



More information about the QGIS-commit mailing list