Skip to content

Commit

Permalink
Changes for Qt4.
Browse files Browse the repository at this point in the history 
Work in progress... More to come later.



git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4473 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
g_j_m committed Jan 5, 2006
1 parent 432d7f9 commit a3527ad
Show file tree
Hide file tree
Showing 6 changed files with 150 additions and 182 deletions.
23 changes: 12 additions & 11 deletions plugins/gps_importer/qgsgpsdevicedialog.cpp
View file
Expand Up @@ -14,25 +14,21 @@

#include <iostream>

#include <q3listbox.h>
#include <qlineedit.h>
#include <qmessagebox.h>
#include <qsettings.h>
#include <QMessageBox>
#include <QSettings>


QgsGPSDeviceDialog::QgsGPSDeviceDialog(std::map<QString, QgsGPSDevice*>&
devices) :
//QgsGPSDeviceDialogBase(0, 0, true ), //ensure dialog is openened modal
//params disabled during qt4 port by Tim FIXME
QgsGPSDeviceDialogBase(),
mDevices(devices)
QDialog(0, 0, true), mDevices(devices)

{
setupUi(this);
slotUpdateDeviceList();
}


void QgsGPSDeviceDialog::slotNewDevice() {
void QgsGPSDeviceDialog::on_pbnNewDevice_clicked() {
std::map<QString, QgsGPSDevice*>::const_iterator iter = mDevices.begin();
QString deviceName = "New device %1";
int i;
Expand All @@ -46,7 +42,7 @@ void QgsGPSDeviceDialog::slotNewDevice() {
}


void QgsGPSDeviceDialog::slotDeleteDevice() {
void QgsGPSDeviceDialog::on_pbnDeleteDevice_clicked() {
if (QMessageBox::warning(this, "Are you sure?",
"Are you sure that you want to delete this device?",
QMessageBox::Ok, QMessageBox::Cancel) ==
Expand All @@ -62,7 +58,7 @@ void QgsGPSDeviceDialog::slotDeleteDevice() {
}


void QgsGPSDeviceDialog::slotUpdateDevice() {
void QgsGPSDeviceDialog::on_pbnUpdateDevice_clicked() {
std::map<QString, QgsGPSDevice*>::iterator iter =
mDevices.find(lbDeviceList->selectedItem()->text());
delete iter->second;
Expand Down Expand Up @@ -150,3 +146,8 @@ void QgsGPSDeviceDialog::writeDeviceSettings() {
}
settings.writeEntry("/Plugin-GPS/devicelist", deviceNames);
}

void QgsGPSDeviceDialog::on_pbnClose_clicked()
{
close(1);
}
8 changes: 4 additions & 4 deletions plugins/gps_importer/qgsgpsdevicedialog.h
View file
Expand Up @@ -13,7 +13,6 @@
#define QGSGPSDEVICEDIALOG_H

#include "ui_qgsgpsdevicedialogbase.h"
#include <QDialog>
#include "qgsgpsdevice.h"

#include <qstring.h>
Expand All @@ -26,9 +25,10 @@ class QgsGPSDeviceDialog : public QDialog, private Ui::QgsGPSDeviceDialogBase
QgsGPSDeviceDialog(std::map<QString, QgsGPSDevice*>& devices);

public slots:
void slotNewDevice();
void slotDeleteDevice();
void slotUpdateDevice();
void on_pbnNewDevice_clicked();
void on_pbnDeleteDevice_clicked();
void on_pbnUpdateDevice_clicked();
void on_pbnClose_clicked();
void slotUpdateDeviceList(const QString& selection = "");
void slotSelectionChanged();

Expand Down
210 changes: 97 additions & 113 deletions plugins/gps_importer/qgsgpsdevicedialogbase.ui
View file
Expand Up @@ -28,64 +28,42 @@
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>10</number>
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item rowspan="6" row="0" column="1" >
<widget class="Line" name="line2" >
<property name="frameShape" >
<enum>QFrame::VLine</enum>
</property>
<property name="frameShadow" >
<enum>QFrame::Sunken</enum>
</property>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
</widget>
</item>
<item row="5" column="0" >
<widget class="QPushButton" name="pbUpdateDevice" >
<property name="text" >
<string>Update device</string>
</property>
</widget>
</item>
<item row="4" column="0" >
<widget class="QPushButton" name="pbDeleteDevice" >
<property name="text" >
<string>Delete device</string>
<item rowspan="3" row="0" column="0" >
<widget class="Q3ListBox" name="lbDeviceList" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>5</hsizetype>
<vsizetype>7</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="3" column="0" >
<widget class="QPushButton" name="pbNewDevice" >
<widget class="QPushButton" name="pbnNewDevice" >
<property name="text" >
<string>New device</string>
</property>
</widget>
</item>
<item rowspan="3" row="0" column="0" >
<widget class="Q3ListBox" name="lbDeviceList" >
<item row="0" column="2" >
<widget class="QLabel" name="textLabel3" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>5</hsizetype>
<vsizetype>7</vsizetype>
<hsizetype>1</hsizetype>
<vsizetype>5</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="6" column="4" >
<widget class="QPushButton" name="pbClose" >
<property name="text" >
<string>Close</string>
</property>
<property name="default" >
<bool>true</bool>
<string>Device name:</string>
</property>
</widget>
</item>
Expand All @@ -105,69 +83,43 @@
</property>
</spacer>
</item>
<item rowspan="4" row="2" column="2" colspan="3" >
<widget class="QLabel" name="textLabel1" >
<item row="6" column="4" >
<widget class="QPushButton" name="pbnClose" >
<property name="text" >
<string>&lt;p>In the download and upload commands there can be special words that will be replaced by QGIS when the commands are used. These words are:&lt;/p>
&lt;i>%babel&lt;/i> - the path to GPSBabel&lt;br>
&lt;i>%in&lt;/i> - the GPX filename when uploading or the port when downloading&lt;br>
&lt;i>%out&lt;/i> - the port when uploading or the GPX filename when downloading</string>
<string>Close</string>
</property>
<property name="textFormat" >
<enum>Qt::RichText</enum>
<property name="default" >
<bool>true</bool>
</property>
<property name="alignment" >
<set>Qt::AlignVCenter</set>
</widget>
</item>
<item row="0" column="3" colspan="2" >
<widget class="QLineEdit" name="leDeviceName" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>2</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip" >
<string>This is the name of the device as it will appear in the lists</string>
</property>
</widget>
</item>
<item row="1" column="2" colspan="3" >
<widget class="Q3GroupBox" name="groupBox1" >
<widget class="QGroupBox" name="groupBox" >
<property name="title" >
<string>Commands</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>10</number>
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="0" column="0" >
<widget class="QLabel" name="textLabel1_2" >
<property name="text" >
<string>Waypoint download:</string>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="textLabel1_2_2" >
<property name="text" >
<string>Waypoint upload:</string>
</property>
</widget>
</item>
<item row="2" column="0" >
<widget class="QLabel" name="textLabel1_2_3" >
<property name="text" >
<string>Route download:</string>
</property>
</widget>
</item>
<item row="3" column="0" >
<widget class="QLabel" name="textLabel1_2_4" >
<property name="text" >
<string>Route upload:</string>
</property>
</widget>
</item>
<item row="4" column="0" >
<widget class="QLabel" name="textLabel1_2_5" >
<property name="text" >
<string>Track download:</string>
</property>
</widget>
</item>
<item row="5" column="1" >
<widget class="QLineEdit" name="leTrkUp" >
<property name="toolTip" >
Expand All @@ -189,13 +141,34 @@
</property>
</widget>
</item>
<item row="4" column="0" >
<widget class="QLabel" name="textLabel1_2_5" >
<property name="text" >
<string>Track download:</string>
</property>
</widget>
</item>
<item row="3" column="1" >
<widget class="QLineEdit" name="leRteUp" >
<property name="toolTip" >
<string>The command that is used to upload routes to the device</string>
</property>
</widget>
</item>
<item row="3" column="0" >
<widget class="QLabel" name="textLabel1_2_4" >
<property name="text" >
<string>Route upload:</string>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="textLabel1_2_2" >
<property name="text" >
<string>Waypoint upload:</string>
</property>
</widget>
</item>
<item row="2" column="1" >
<widget class="QLineEdit" name="leRteDown" >
<property name="toolTip" >
Expand All @@ -217,36 +190,54 @@
</property>
</widget>
</item>
<item row="2" column="0" >
<widget class="QLabel" name="textLabel1_2_3" >
<property name="text" >
<string>Route download:</string>
</property>
</widget>
</item>
<item row="0" column="0" >
<widget class="QLabel" name="textLabel1_2" >
<property name="text" >
<string>Waypoint download:</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="0" column="2" >
<widget class="QLabel" name="textLabel3" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>1</hsizetype>
<vsizetype>5</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
<item rowspan="4" row="2" column="2" colspan="3" >
<widget class="QTextEdit" name="textEdit" >
<property name="html" >
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;/head>&lt;body style=" white-space: pre-wrap; font-family:Sans Serif; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">&lt;p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">In the download and upload commands there can be special words that will be replaced by QGIS when the commands are used. These words are:&lt;span style=" font-style:italic;">%babel&lt;/span> - the path to GPSBabel&lt;br />&lt;span style=" font-style:italic;">%in&lt;/span> - the GPX filename when uploading or the port when downloading&lt;br />&lt;span style=" font-style:italic;">%out&lt;/span> - the port when uploading or the GPX filename when downloading&lt;/p>&lt;/body>&lt;/html></string>
</property>
</widget>
</item>
<item row="5" column="0" >
<widget class="QPushButton" name="pbnUpdateDevice" >
<property name="text" >
<string>Device name:</string>
<string>Update device</string>
</property>
</widget>
</item>
<item row="0" column="3" colspan="2" >
<widget class="QLineEdit" name="leDeviceName" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>2</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
<item row="4" column="0" >
<widget class="QPushButton" name="pbnDeleteDevice" >
<property name="text" >
<string>Delete device</string>
</property>
<property name="toolTip" >
<string>This is the name of the device as it will appear in the lists</string>
</widget>
</item>
<item rowspan="6" row="0" column="1" >
<widget class="Line" name="line2" >
<property name="frameShape" >
<enum>QFrame::VLine</enum>
</property>
<property name="frameShadow" >
<enum>QFrame::Sunken</enum>
</property>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
</widget>
</item>
Expand All @@ -255,13 +246,6 @@
<layoutdefault spacing="6" margin="11" />
<pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
<customwidgets>
<customwidget>
<class>Q3GroupBox</class>
<extends></extends>
<header>Qt3Support/Q3GroupBox</header>
<container>1</container>
<pixmap></pixmap>
</customwidget>
<customwidget>
<class>Q3ListBox</class>
<extends></extends>
Expand Down

0 comments on commit a3527ad

Please sign in to comment.