[QGIS Commit] r9380 - in trunk/external_plugins/cdp2/src: gui ui
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Mon Sep 22 18:51:54 EDT 2008
Author: timlinux
Date: 2008-09-22 18:51:54 -0400 (Mon, 22 Sep 2008)
New Revision: 9380
Modified:
trunk/external_plugins/cdp2/src/gui/climatedataprocessorgui.cpp
trunk/external_plugins/cdp2/src/ui/climatedataprocessorguibase.ui
Log:
Remove old qt3 stuff off ui
Modified: trunk/external_plugins/cdp2/src/gui/climatedataprocessorgui.cpp
===================================================================
--- trunk/external_plugins/cdp2/src/gui/climatedataprocessorgui.cpp 2008-09-22 22:23:24 UTC (rev 9379)
+++ trunk/external_plugins/cdp2/src/gui/climatedataprocessorgui.cpp 2008-09-22 22:51:54 UTC (rev 9380)
@@ -31,10 +31,10 @@
ClimateDataProcessorGui::ClimateDataProcessorGui(QWidget* parent, Qt::WFlags fl)
: QDialog(parent,fl)
{
- /**
//required by Qt4 to initialise the ui
setupUi(this);
readSettings();
+ /*
connect(mpClimateImporter, SIGNAL(error(QString)), this, SLOT(error(QString)));
connect(mpClimateImporter, SIGNAL(message(QString)), this, SLOT(message(QString)));
connect(mpClimateImporter, SIGNAL(updateProgress(int, int )), this, SLOT(updateProgress(int, int )));
Modified: trunk/external_plugins/cdp2/src/ui/climatedataprocessorguibase.ui
===================================================================
--- trunk/external_plugins/cdp2/src/ui/climatedataprocessorguibase.ui 2008-09-22 22:23:24 UTC (rev 9379)
+++ trunk/external_plugins/cdp2/src/ui/climatedataprocessorguibase.ui 2008-09-22 22:51:54 UTC (rev 9380)
@@ -5,8 +5,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>585</width>
- <height>680</height>
+ <width>583</width>
+ <height>695</height>
</rect>
</property>
<property name="windowTitle" >
@@ -17,16 +17,10 @@
</property>
<layout class="QGridLayout" >
<item row="0" column="0" >
- <widget class="Q3GroupBox" name="grpInput" >
- <property name="toolTip" >
- <string>Browse for the raw data files that are required to create the variables that you have selected. Each month of data should be in a separate file. The files should be numbered e.g. meantemp01.asc, meantemp02.asc ... meantemp12.asc</string>
- </property>
+ <widget class="QGroupBox" name="grpInput" >
<property name="title" >
<string>Select raw data files</string>
</property>
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QLabel" name="lblMeanTemp" >
@@ -272,20 +266,13 @@
</widget>
</item>
<item row="1" column="0" >
- <widget class="Q3GroupBox" name="grpVars" >
+ <widget class="QGroupBox" name="grpVars" >
<property name="title" >
<string>Select variables to calculate</string>
</property>
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
<layout class="QGridLayout" >
<item row="0" column="0" colspan="2" >
- <widget class="Q3ListBox" name="lstVariablesToCalc" >
- <property name="selectionMode" >
- <enum>Q3ListBox::Multi</enum>
- </property>
- </widget>
+ <widget class="QListWidget" name="lstVariablesToCalc" />
</item>
<item row="1" column="0" >
<widget class="QCheckBox" name="cbxSelectAllVars" >
@@ -305,13 +292,10 @@
</widget>
</item>
<item row="2" column="0" >
- <widget class="Q3GroupBox" name="grpOutput" >
+ <widget class="QGroupBox" name="grpOutput" >
<property name="title" >
<string>Output Options</string>
</property>
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QLabel" name="lblFormat" >
@@ -401,25 +385,10 @@
</widget>
</item>
<item row="4" column="0" >
- <widget class="Q3ProgressBar" name="progressTotalJob" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Minimum" hsizetype="Expanding" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ <widget class="QProgressBar" name="progressTotalJob" >
+ <property name="value" >
+ <number>24</number>
</property>
- <property name="minimumSize" >
- <size>
- <width>399</width>
- <height>0</height>
- </size>
- </property>
- <property name="maximumSize" >
- <size>
- <width>32767</width>
- <height>32767</height>
- </size>
- </property>
</widget>
</item>
<item row="5" column="0" >
@@ -432,24 +401,6 @@
</layout>
</widget>
<layoutdefault spacing="6" margin="11" />
- <customwidgets>
- <customwidget>
- <class>Q3GroupBox</class>
- <extends>QGroupBox</extends>
- <header>Qt3Support/Q3GroupBox</header>
- <container>1</container>
- </customwidget>
- <customwidget>
- <class>Q3ListBox</class>
- <extends>Q3Frame</extends>
- <header>q3listbox.h</header>
- </customwidget>
- <customwidget>
- <class>Q3ProgressBar</class>
- <extends>QFrame</extends>
- <header>Qt3Support/Q3ProgressBar</header>
- </customwidget>
- </customwidgets>
<tabstops>
<tabstop>leMeanTemp</tabstop>
<tabstop>pbtnMeanTemp</tabstop>
@@ -465,7 +416,6 @@
<tabstop>pbtnFrostDays</tabstop>
<tabstop>leTotalSolarRadiation</tabstop>
<tabstop>pbtnTotalSolarRad</tabstop>
- <tabstop>lstVariablesToCalc</tabstop>
<tabstop>cbxSelectAllVars</tabstop>
<tabstop>cboOutputFormat</tabstop>
<tabstop>leOutputPath</tabstop>
More information about the QGIS-commit
mailing list