From d4e9af71823d845eb0e82fa3bcfd3328bfcf4b9c Mon Sep 17 00:00:00 2001 From: gsherman Date: Sat, 10 Aug 2002 15:55:43 +0000 Subject: [PATCH] added about dialog git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@92 c8812cc2-4d05-0410-92ff-de0c093fc19c --- src/Makefile | 36 +++++-- src/qgisapp.cpp | 19 ++++ src/qgisapp.h | 2 + src/qgsabout.ui | 256 ++++++++++++++++++++++++++++++++++++++++++++++ src/qgsabout.ui.h | 16 +++ src/src.pro | 6 +- 6 files changed, 326 insertions(+), 9 deletions(-) create mode 100644 src/qgsabout.ui create mode 100644 src/qgsabout.ui.h diff --git a/src/Makefile b/src/Makefile index f0f1c61e518..c9abedf228b 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: qgis -# Generated by qmake (1.03a) on: Fri Aug 9 07:30:20 2002 +# Generated by qmake (1.03a) on: Sat Aug 10 07:25:33 2002 # Project: src.pro # Template: app # Command: $(QMAKE) src.pro @@ -95,19 +95,23 @@ OBJECTS = main.o \ qgsdbsourceselectbase.o \ qgisappbase.o \ qgsnewconnectionbase.o \ - qgslegenditembase.o + qgslegenditembase.o \ + qgsabout.o FORMS = qgsdbsourceselectbase.ui \ qgisappbase.ui \ qgsnewconnectionbase.ui \ - qgslegenditembase.ui + qgslegenditembase.ui \ + qgsabout.ui UICDECLS = qgsdbsourceselectbase.h \ qgisappbase.h \ qgsnewconnectionbase.h \ - qgslegenditembase.h + qgslegenditembase.h \ + qgsabout.h UICIMPLS = qgsdbsourceselectbase.cpp \ qgisappbase.cpp \ qgsnewconnectionbase.cpp \ - qgslegenditembase.cpp + qgslegenditembase.cpp \ + qgsabout.cpp SRCMOC = moc_qgisapp.cpp \ moc_qgsdatabaselayer.cpp \ moc_qgsmapcanvas.cpp \ @@ -118,7 +122,8 @@ SRCMOC = moc_qgisapp.cpp \ moc_qgsdbsourceselectbase.cpp \ moc_qgisappbase.cpp \ moc_qgsnewconnectionbase.cpp \ - moc_qgslegenditembase.cpp + moc_qgslegenditembase.cpp \ + moc_qgsabout.cpp OBJMOC = moc_qgisapp.o \ moc_qgsdatabaselayer.o \ moc_qgsmapcanvas.o \ @@ -129,7 +134,8 @@ OBJMOC = moc_qgisapp.o \ moc_qgsdbsourceselectbase.o \ moc_qgisappbase.o \ moc_qgsnewconnectionbase.o \ - moc_qgslegenditembase.o + moc_qgslegenditembase.o \ + moc_qgsabout.o DIST = src.pro QMAKE_TARGET = qgis DESTDIR = @@ -173,7 +179,7 @@ qmake: @$(QMAKE) src.pro dist: - @mkdir -p .tmp/qgis && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) .tmp/qgis/ && $(COPY_FILE) --parents qgsdbsourceselectbase.ui.h qgisappbase.ui.h .tmp/qgis/ && ( cd `dirname .tmp/qgis` && $(TAR) qgis.tar qgis && $(GZIP) qgis.tar ) && $(MOVE) `dirname .tmp/qgis`/qgis.tar.gz . && $(DEL_DIR) .tmp/qgis + @mkdir -p .tmp/qgis && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) .tmp/qgis/ && $(COPY_FILE) --parents qgsdbsourceselectbase.ui.h qgisappbase.ui.h qgsabout.ui.h .tmp/qgis/ && ( cd `dirname .tmp/qgis` && $(TAR) qgis.tar qgis && $(GZIP) qgis.tar ) && $(MOVE) `dirname .tmp/qgis`/qgis.tar.gz . && $(DEL_DIR) .tmp/qgis mocclean: -$(DEL_FILE) $(OBJMOC) @@ -317,6 +323,12 @@ qgslegenditembase.h: qgslegenditembase.ui qgslegenditembase.cpp: qgslegenditembase.h qgslegenditembase.ui $(UIC) qgslegenditembase.ui -i qgslegenditembase.h -o qgslegenditembase.cpp +qgsabout.h: qgsabout.ui + $(UIC) qgsabout.ui -o qgsabout.h + +qgsabout.cpp: qgsabout.h qgsabout.ui + $(UIC) qgsabout.ui -i qgsabout.h -o qgsabout.cpp + qgsdbsourceselectbase.o: qgsdbsourceselectbase.cpp qgsdbsourceselectbase.ui.h \ qgsdbsourceselectbase.h @@ -327,6 +339,9 @@ qgsnewconnectionbase.o: qgsnewconnectionbase.cpp qgsnewconnectionbase.h qgslegenditembase.o: qgslegenditembase.cpp qgslegenditembase.h +qgsabout.o: qgsabout.cpp qgsabout.ui.h \ + qgsabout.h + moc_qgisapp.o: moc_qgisapp.cpp qgisapp.h qgisappbase.h moc_qgsdatabaselayer.o: moc_qgsdatabaselayer.cpp qgsdatabaselayer.h qgsmaplayer.h \ @@ -365,6 +380,8 @@ moc_qgsnewconnectionbase.o: moc_qgsnewconnectionbase.cpp qgsnewconnectionbase.h moc_qgslegenditembase.o: moc_qgslegenditembase.cpp qgslegenditembase.h +moc_qgsabout.o: moc_qgsabout.cpp qgsabout.h + moc_qgisapp.cpp: $(MOC) qgisapp.h $(MOC) qgisapp.h -o moc_qgisapp.cpp @@ -398,6 +415,9 @@ moc_qgsnewconnectionbase.cpp: $(MOC) qgsnewconnectionbase.h moc_qgslegenditembase.cpp: $(MOC) qgslegenditembase.h $(MOC) qgslegenditembase.h -o moc_qgslegenditembase.cpp +moc_qgsabout.cpp: $(MOC) qgsabout.h + $(MOC) qgsabout.h -o moc_qgsabout.cpp + ####### Install install: all diff --git a/src/qgisapp.cpp b/src/qgisapp.cpp index 01af6b34593..76306aeea36 100644 --- a/src/qgisapp.cpp +++ b/src/qgisapp.cpp @@ -44,6 +44,7 @@ #include "qgsdbsourceselect.h" #include "qgsdatabaselayer.h" #include "qgsshapefilelayer.h" +#include "qgsabout.h" #include "qgis.h" #include "qgisapp.h" #include "xpm/qgis.xpm" @@ -86,6 +87,24 @@ QgisApp::QgisApp (QWidget * parent, const char *name, QgisApp::~QgisApp () { +} +void QgisApp::about(){ + QgsAbout *abt = new QgsAbout(); + QString versionString = "Version "; + versionString += QGis::qgisVersion; + abt->setVersion(versionString); + QString urls = "Web Page: http://qgis.sourceforge.net\nSourceforge Project Page: http://sourceforge.net/projects/qgis"; + abt->setURLs(urls); + QString watsNew = "Version "; + watsNew += QGis::qgisVersion; + watsNew += "\n* Support for shapefiles and other vector formats\n" + "* Improved handling of extents when adding layers\n" + "* Primitive legend that allows control of layer visibility\n" + "* About Quantum GIS implemented\n" + "* Other internal changes"; + abt->setWhatsNew(watsNew); + abt->exec(); + } void QgisApp::addLayer () { diff --git a/src/qgisapp.h b/src/qgisapp.h index baaf25c1c19..f7d35420ba5 100644 --- a/src/qgisapp.h +++ b/src/qgisapp.h @@ -61,6 +61,8 @@ public: void drawLayers(); //! test function void testButton(); + //! About QGis + void about(); public slots: void showMouseCoordinate(QgsPoint &); private: diff --git a/src/qgsabout.ui b/src/qgsabout.ui new file mode 100644 index 00000000000..62a19fcf88b --- /dev/null +++ b/src/qgsabout.ui @@ -0,0 +1,256 @@ + +QgsAbout + + + QgsAbout + + + + 0 + 0 + 384 + 224 + + + + About Quantum GIS + + + true + + + + unnamed + + + 7 + + + 6 + + + + Layout1 + + + + unnamed + + + 0 + + + 6 + + + + Horizontal Spacing2 + + + Horizontal + + + Expanding + + + + 20 + 0 + + + + + + buttonCancel + + + Ok + + + 0 + + + true + + + + + + + tabWidget + + + + Widget2 + + + About + + + + lblVersion + + + + 35 + 40 + 286 + 21 + + + + Version + + + AlignCenter + + + + + TextLabel4 + + + + 20 + 10 + 325 + 21 + + + + Quantum GIS (qgis) + + + AlignCenter + + + + + lblUrls + + + true + + + + 15 + 75 + 330 + 70 + + + + + 32767 + 70 + + + + + 192 + 192 + 192 + + + + WidgetOrigin + + + Panel + + + Raised + + + true + + + + + + Widget3 + + + What's New + + + + txtWhatsNew + + + + 8 + 8 + 336 + 131 + + + + true + + + + + + tabLicense + + + License + + + + TextLabel1 + + + + 30 + 20 + 293 + 20 + + + + Quantum GIS is licensed under the GNU General Public License + + + + + TextLabel2 + + + + 70 + 50 + 194 + 21 + + + + http://www.gnu.org/licenses + + + AlignCenter + + + + + + + + + buttonCancel + clicked() + QgsAbout + reject() + + + + qgsabout.ui.h + + + setVersion( QString v ) + setURLs( QString urls ) + setWhatsNew( QString txt ) + + + diff --git a/src/qgsabout.ui.h b/src/qgsabout.ui.h new file mode 100644 index 00000000000..d09c94764fb --- /dev/null +++ b/src/qgsabout.ui.h @@ -0,0 +1,16 @@ +/**************************************************************************** +** ui.h extension file, included from the uic-generated form implementation. +** +** If you wish to add, delete or rename slots use Qt Designer which will +** update this file, preserving your code. Create an init() slot in place of +** a constructor, and a destroy() slot in place of a destructor. +*****************************************************************************/ +void QgsAbout::setVersion(QString v){ + lblVersion->setText(v) ; +} +void QgsAbout::setURLs(QString urls){ + lblUrls->setText(urls); +} +void QgsAbout::setWhatsNew(QString txt){ + txtWhatsNew->setText(txt); +} diff --git a/src/src.pro b/src/src.pro index 925191e5699..53d5ce57258 100644 --- a/src/src.pro +++ b/src/src.pro @@ -30,7 +30,11 @@ HEADERS += qgsdbsourceselectbase.ui.h \ qgslegend.h \ qgslegenditem.h -INTERFACES += qgsdbsourceselectbase.ui qgisappbase.ui qgsnewconnectionbase.ui qgslegenditembase.ui +INTERFACES += qgsdbsourceselectbase.ui \ + qgisappbase.ui \ + qgsnewconnectionbase.ui \ + qgslegenditembase.ui \ + qgsabout.ui SOURCES += main.cpp \ qgisapp.cpp \ qgsdatabaselayer.cpp \