Skip to content
Permalink
Browse files
Merge UI conversion branch to HEAD. UI branch is now deprecated.
git-svn-id: http://svn.osgeo.org/qgis/trunk@4409 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
gsherman committed Dec 30, 2005
1 parent 1ac2e2e commit 4b6a5a9d9d1fd008ce408023e1aedfcba2ece259
Showing 380 changed files with 29,828 additions and 36,043 deletions.
@@ -1,6 +1,8 @@
/* ChangeLog,v 1.214 2004/11/12 00:42:21 gsherman Exp */
------------------------------------------------------------------------------
Version 0.8 'Joesephine' .... development version
2005-12-29 [gsherman] 0.7.9.3
** Merged Ui branch into HEAD
2005-11-10 [timlinux] 0.7.9.2
** Ported codebase to qt4 - still many issues to sort out but it builds
2005-11-10 [timlinux] 0.7.9.1
@@ -237,9 +237,14 @@ if test $QT_MAJOR = "4" ; then
AC_MSG_ERROR([*** moc must be in path])
fi
# uic3 is the Qt user interface compiler in Qt3 legacy mode
AC_PATH_PROG(UIC, uic3, , [$PATH:$QTDIR/bin])
AC_PATH_PROG(UIC, uic, , [$PATH:$QTDIR/bin])
if test x$UIC = x ; then
AC_MSG_ERROR([*** uic3 must be in path])
AC_MSG_ERROR([*** uic must be in path])
fi
# check for rcc
AC_PATH_PROG(RCC, rcc, , [$PATH:$QTDIR/bin])
if test x$RCC = x ; then
AC_MSG_ERROR([*** rcc must be in path])
fi
fi
@@ -29,7 +29,7 @@ dnl ---------------------------------------------------------------------------
MAJOR_VERSION=0
MINOR_VERSION=7
MICRO_VERSION=9
EXTRA_VERSION=2
EXTRA_VERSION=3
if test $EXTRA_VERSION -eq 0; then
VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}
else
@@ -17,27 +17,16 @@ PKGDATAPATH=-DPKGDATAPATH=\"$(pkgdatadir)\"


%.moc.cpp: %.h
$(MOC) -o $@ $<

%.h: %.ui
$(UIC) -o $@ $<
if HAVE_QT4
../tools/qgis-qt3to4.pl -uic $@
endif

if !NO_UIC_IMPLEMENTATIONS
%.cpp: %.ui
$(UIC) -o $@ -impl $*.h $<
endif
$(MOC) -o $@ $<

ui_%.h: %.ui
$(UIC) -o $@ $<


qgis_help_MOC = qgshelpserver.moc.cpp \
qgshelpviewer.moc.cpp \
qgshelpviewerbase.moc.cpp
qgshelpviewer.moc.cpp

qgis_help_UI = qgshelpviewerbase.h \
qgshelpviewerbase.cpp
qgis_help_UI = ui_qgshelpviewerbase.h

qgis_help_UIC = qgshelpviewerbase.ui

@@ -1,9 +1,9 @@
#ifndef QGSHELPVIEWER_H
#define QGSHELPVIEWER_H
# include "qgshelpviewerbase.h"
# include "ui_qgshelpviewerbase.h"
class QString;
class sqlite3;
class QgsHelpViewer : public QgsHelpViewerBase
class QgsHelpViewer : public QDialog, private Ui::QgsHelpViewerBase
{
Q_OBJECT
public:
@@ -1,93 +1,88 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>QgsHelpViewerBase</class>
<widget class="QDialog">
<property name="name">
<cstring>QgsHelpViewerBase</cstring>
</property>
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>514</width>
<height>417</height>
</rect>
</property>
<property name="caption">
<string>QGIS Help</string>
</property>
<property name="icon">
<pixmap>image0</pixmap>
</property>
<property name="sizeGripEnabled">
<ui version="4.0" >
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<class>QgsHelpViewerBase</class>
<widget class="QDialog" name="QgsHelpViewerBase" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>514</width>
<height>417</height>
</rect>
</property>
<property name="windowTitle" >
<string>QGIS Help</string>
</property>
<property name="windowIcon" >
<iconset/>
</property>
<property name="sizeGripEnabled" >
<bool>true</bool>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>6</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="0" column="0" >
<widget class="Q3TextBrowser" name="txtBrowser" />
</item>
<item row="1" column="0" >
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" >
<size>
<width>390</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="buttonCancel" >
<property name="text" >
<string>&amp;Close</string>
</property>
<property name="shortcut" >
<string>Alt+C</string>
</property>
<property name="autoDefault" >
<bool>true</bool>
</property>
<grid>
<property name="name">
<cstring>unnamed</cstring>
</property>
<property name="margin">
<number>6</number>
</property>
<widget class="QTextBrowser" row="0" column="0">
<property name="name">
<cstring>txtBrowser</cstring>
</property>
</widget>
<widget class="QLayoutWidget" row="1" column="0">
<property name="name">
<cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
<spacer>
<property name="name">
<cstring>Qt::Horizontal Spacing2</cstring>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<size>
<width>390</width>
<height>20</height>
</size>
</property>
</spacer>
<widget class="QPushButton">
<property name="name">
<cstring>buttonCancel</cstring>
</property>
<property name="text">
<string>&amp;Close</string>
</property>
<property name="accel">
<string>Alt+C</string>
</property>
<property name="autoDefault">
<bool>true</bool>
</property>
</widget>
</hbox>
</widget>
</grid>
</widget>
<images>
<image name="image0">
<data format="XPM.GZ" length="15262">789cb599c792e4469286ef7c8a36c66d6c0d93d080adeda16497d67a6d0fa191a5b51adb77df28ff7f24c9650fa7ab8764f2f27500e1dac303f5f7bf7d39d9d9fcf2b7bffff4f0a81fa7f68b1df4fd97bfb9a7ababb7fffe9ffffac74f3f57dd97f47f53e75f8a9fffe3a79f771fbfd82f5b37d7fe03fc6602359914f564f2c1ea98acc1769b6cc07a5cb77c7e4a0ee0ac0297133eff4c2ec1668ddcf0fd9edc715d93b97ff648f6d467dc6f94b702ae72f225b920d3be8af2f5f87cc5f55d32ed3739b9e57a49eeb9fe40a67ef18aec68cf1199fa0e5be07af407d7eb51df481ef5dd2153bf2190a99f7e22d37ff1844cffa98e4c7dd53c99f1cb461efd4b7b6aea9f6d9047ffce811beaaf461ef57d27d3bf5941a6fee69e4c7db39147ff5e90a9af66bc1be69f51e451bf37f2a8df1db8a57e19e3d7523f33218ff9373e4f7ffa56382fc6f84cc9633e3e92a9dfe0c0637e0f9e3cc6cb92477b6b32dfcfbe82c7fc090d78e6bf5732edd787e4d1de73f0689fdd228ff6c1ff45d23f177d905f4559930d99fb69c4bf98f9f796cc75358047ffc645f228df93295f1d92a9bfc77e657a5ce4eb5532e33fa0fecbb1fe87f71943df09d992b7672ccd2ca21f95637e05f8bb1af335db26539f2c90e97f037daa993d2599f9615f84eba46f29f62d903b70bc06a7f88b7ebe21f760037f374585e707f4a366ac7f9d09b74581758bfa6ec7fa325c1feb295e92e93f8ff8f7e9fd5af647fdebd4bfe06fe49b1eeb5b21df75cb7838e4bbee18bfb8246c527f6f65ff1b615b1ada0ff936f557f1bf45bff7859f74e2df65e150d13f19f60fb37eb0fec1f9a470132deb37e0593f10ffe579e9b8df043ceb5f2f64e66710ffe745d94e2ab15f8353ff15f941eccdcb949f60c8abd2f986f36f039cfabbbc1fb6c1e3f31af2eab19ee3117816bf81cc7867eb64c3fc5c008ff9a80f849b741e219fcfc8cc0f434ef92ceb53c9d754ded44749fde75d2a28d15f5d91eda411f97b643fb1b2df2db866bd64864cff59ecdf97458e786e826bd65f90fcca4d3a5f915fd27f735769c4672af59ffb628c17fce1abe420b157cea73ca4fa10ff66f27cf171bec15f12bf224ffb897c37801bd69b3b07778c4f26f616a97fe5c2f154b82a5d6e842fc029ff653ff50eeec7fa177b8a3ae9877a93f3b668ca3e0f629fe443d1952df45727645ba03fc9fc51f4654d96fc284c992a5cf249eaaf48f502cea49e0b57b5d8dfcbf953f8f43cf20bf68514ff5e9e977e54a6f902cf1b79bf2caaa2907a34d29fcab20c85d89b497e9555e5b0df54fc57d6a37e4aeab16caa3c97fd5543ee73c453ce9bb2ad4aee67c1b5a3fdd23fcabe2af9fc13b92d44bfec199cc4a1fe20df541aebea025c2703249e57e0545f4efc0ff9a99f9492bf5339afca90f6473ec9bc58a5fc2844ffa9f4c32a05b090fccf96c806f9a0649eabca2a794878916c4b91e72ec01dfb55d801f706fdc88afcaaaaea0afdf112dce7884f907a4aab1dd695d46b95fc5742becc9769356590f0d28c459f20feacfaf4c3f33be4d4b185afc9ae94fa5592df69d556a26fbc01d7a961cbfa01b8ebd84ff7856df297bcef16c98ef9b94df6903795fe5ca57a863cadc0750efd02fce12b5f4afce332b82e2af8ab2657e0e1914cfba2d85ba7f9b712ffeb386389df30477615cec71cdc4ce82fa9bfa44d9fcbf36e135ca790c9f38a6c91df99d85ba7eb0cec0fc7e40af5e16ec93dd888ff523be8b05f94f9b8ae6bc6d76c904d8d7adf013725fce7a4feeaa6ae618f5d223788973f1db916ff65676483fc7687645b4a7d84e591e10f770d6e5ad487967cacbbda60dd40df3ef95be4eb3570aa2fe4979c07497b53239f0f662cfbd963b2adc45ff69aec102fdb809b09eacd5872c5fcaac1ad467f5088af49fd5a9e0f1db8af71be283c6fd30ffd7a8deca04f843f5c1d6ac4d3819b09f5bf9931fa09fced3a9bc33f324fa6b7432dfe353733167d87d319c3be37703341bcacf4af26e51febc38d5c231fdfc84589782fcf58d6ed2eb9aa10cf25f0c78027f649bf6f8a3a54e8c71538fd8b3cafef672cfa668a5ca2fffb19235e51fa4d533625f41b1e466e307f34e406f5a84bb2453cfd35b82bd13fb5f48fa66a2af83faecf58f69f2a7253cbf3a622f7f05f26f3561a5f4ae4abd3e416f188ab23433fbf43eee1cf20f59d567bc65f9335fc19e7c02dfbc300797dfa613eda9e31f27f93ac511fa1225bd6ab22b3ffc433701a27a59f79a9ef46a71ffad30979ac976c64e4f354eaa3b18d837d21cc18f1bb2707f6c3713d20ff95cc27e9694b79eb64877c0dafe48075f73c63f4770f6e27f07776402e703ee9f791594fc80f97c63df1a7463e87f4bee863241fda747f6e30bfaf906bbcaf2fc8294144df797287787ae9c76dd1d6ec675be406e757f064c3f342f44bd22cf6b305b8ad69df0bb963ffd803777989794efa755bb70dfced2259f379e93f1fd727cc03ba2037ec078f648df707896fdbb5ba157d82f48fb41a508f0acfeba43fd6a19fee6a9c270efe33ad67bd3f81bb1cf9959d926bc4c7bd903b9cb70efe745d8efea0f6672ccf4fa53e5adfa52b83e87b4f2e11bf704436b037dc917d21f2b57037e93af43b734dee919f6183ece1df4cfa73972e1838afcc26b967bf9d82fb1cf3a4967aedca641fe6c52372c779f384ecb19fabc09af3aa5b06278761be95fb4b57772982e28f6732eb5195645f62be5b9931fc2ffdb16b923e386f1ec901e77dbc1d19fecb8ec13dcf3b2ff1e8ba3e477e6b39dfba7e64b541e63ceb6bb0b6b9e833c879d77dc417e7019e377d857e1f1fc89c3fa39c279d4de64b3ef80bb2e1f97706ee994f4341aee08ff04e0e05f4917ce97c5f603e8f4f23c33f769d6c301ff95572bae189bdaf605d637e7732af75a1f3a85f3b72c079670670b20fcf6f9035edbb273bd48f16fdfabc0b8dd8e39ec03de7d36197ecd82fee668cf944f2a12f7a8d7e157bb283bfe201d9a37eec03581705fc8bf7ab71bf7045f6986f82d893923da05ea3e47bdf761dee9f7a0ffc318089be0d58e738bfcc1cb9403fb0325ff49dee319f3b390f7a9ddc23fef207e486f3a621f7ec0ff27da4377ddb223e5b609de3bea437c915e6d74cf2b577493ff4d37372403e8412ac0de2e7a5fff5be0fccef17b0ee38dff6e480fa88321ff5a11dbfaf5c827b0f7fd84570f2b7f8cb9f916bc4d39c82cd84f79513728179d92ccc18fe592737a82f2ff1d4453aae71bf3e2577d0c75e917bcc3ff6881cc04e8d8cf7cd1ed8e425e22be795ae12e3fceac9bec0f73f89a7aeb585bec33199fbb9166c2aac87437283fc7605b9c37d39887f74d38ff1086033f61ba91fdde91af56da04f6a0f3c4fe6c81afe09bb601bd88f247f75ff31d08b7d123f6d4ccff3f484ccfb64847cdbf2fb5594f355bbf1fb7d7c25f37ba30787e41fd4e757b02d719f8b322fa5cb37bfafe82570b21ff92bfdc4e486f38b3b253b9c077e0d9cae4f90b74fae915fae24f7b037caf962527ee4b0a705db12f5141cb9e1bc2ef56eaaaec1f7a43005eb3e87fd069cec433dae836d05f94afc95ae573c2f754566bf88fb23f33eff46f6b82fb9af64c62b4afe994e3bf4230f7d527c596f57648ff373b82307de770fc176cc7fbcdf1bc77eb002b67c3f487f31ba1fbfeff560d360feb1ef6407ff0df0b7b6ac67f54a6ef9fd40faab49f985f84547f6c807bf0bb60efe0c7cdee5e8874ace07e3927fd12f6a72cf7ecc7557a01e0699678c3723df90398f58f8d7a7fd707ed6e496df8b905fde9588573820579897a3f443137a7eef757b605be7b29f3264ce5bee08ecd8cf62466e50ef56deb713eb902fbe04bb02f1d7125f9bdb16f7a3b048e6f73c13c90efdc86c81933ce4fb845ce2fb94ff4aae795f5f277739e22bfeb2a5ede03ff50b631e7a223b7eaf74e48078b915708a1feed79a5cf2fbc72ab9667f9a2337b0272a32e7112bf5faf1398bf3b79d31e4dd916bc80f90573b7edf8d72dfb48d9df07b8422b7ecdf3938c51bf3cb1559b35e374766bf5d265bd6dfe1c8e81f4eeac5b6291ea86f0f4ee308e6d57532bf1f875532fb837921539e96f9d376a93e71ffadc08edf23fc845c32fe17e48079cd4b7fb5bd35e8af2a23f3fbb1de06a7f441ffebc896e7f11cd9213fcc3939703e82ff523de3ef470efba5f6c079be2377a8777342e6f766bd4ef6f4673532bfefd4609f335f21dfda16df67bdccf3366dc7ef51773346ff70649e67c3c2c8bc1fdf922df3a120fb09be27cf18eb16f99796a1ff80f8f9548f12bf01f5ec1de71ff70a4eaf4b3f088a5cc29fe19e5c9311bf600dbf3f5f921dfebea337c03e473ed87b7281f3c9bc934bc81bc43e97bb09f55f037bc65bb764ea632ec91decb7925fae7015fd5f9035d6fd1e385d48713e1d937bd45bd89b31beaf487f7465ca079cef9edcf37ef1084efaa1de96c8e3f7c56c64fe7d42ead5d5d6f0ef17ab603f61ff7d278fef5bb2e13c21f5ec9a144fcc6b96dc32bf0dd9d03e990f5caa4feca777c996fd05fe6ed37ee8476b64ea6716c916f687fd1923de4f6487fda2d493eb5ccbbf9f9c82c7f885797289f8bb1332e3e7dfc886f178207b3c6fa51edc477de3be027bfaf43cfaf32399f38995feeeb49f70bebe24f3ef89c311b941ffb287e4d1df5c0fac1f2df3ae33e37e7a3232f55d20d35e9791e9bf01fad8747e48fec6123ccbc77772e0fe0d384ce01f733432f597f3d1b974de637edb017be6bf5e1c99febb256bc617f99fda23d84aff741ff58ffbe739b964beed92791eeb859121dfc719a37e2cb9413ea835b2c37c6b3a32efaf16fe0d63ff748e4c7bdc0eb965bdaf920dd64d1899e7c3d68c61cf3ed993efc0a3fdee8d3cf61b919f9abde779790f1ef3c16c93477f893de9f0637c4c3363ccdf0fe4d1df863ce6cbf18cd1efb15ef8a247fce6c915dfbf2077d4c79359dfc33938e49857ed0199f26c4f1ee789577205f9e68d5cb35f8bff7d1918ef98cf18f1957af0b5ef1ae90fa60507e6672cc8bc0f0fd2cf7c33e6ff20f5e9bbc0f340e564fe7d56dfcc18df9ff7678cf7a57e7d1f0aae2f9239bf6a99b77daa677caf18e00f136acc0fc30599e7ff20fddcdbc0bf8f6bc9e7300935becfec3efeb5bf3f5b46a632fdd7cac84c6633f7d7c9c87c16b2980dbf5ff97364643a9b66e7d94576995dfd1532b2ebec26bbcdeeb2fbec217bcc9efe6c19d973f692bd666fc982f76c2e9b4f3216fe5c19d962b6942d675fd3de73f29bcf56b2d53fdf57d95ab69e6da4fd37d26f3edbccb6fe5d1929b6bffaf1dfb653243e6cd849bfdd6cefdf919176ddcf0eb2c3ec283bce4eb2d3ec4c244db23c2b52b4cbaccaea148fe64765a4bddaaccb7a9529a5b432ca2aa7bc0a2aaa21c57b2edb515375ae2ed4a5ba52d73f22e3435f75a36ed59dba570fea513da967f5a25ed59b7acfeed49c4ab1560b6a512da965f555ad7c5e864858556b6a5d6da84db5a5b6d58eda557b6a5f1da8c3148b0d75a48ed5893afd88903afb7cbf12091395ab4295aa52f52f2baa51ed879f54a7fa8f877ebff7f7c9c874facf68abd3a0a8838ebf5ed3c3186d3dd5e7fae24765e84b7da5aff58dbed577fafeffad3de8c76c4e3fe967fda25ff59b7eff1119c98a393daf17f4a25ed2cbbfd5537f4d1dea3d9bd72b7a55afe975bda137ff9925ff42c696ded63b7a57efe9fddf4838d0126d7da48ff5893ed5677aa2735d7c56469250ea4ad7bad1adee74ffeb1593199572b633da18932ee9261dec269ae1db96fc910c3335e7e6c25c9a2b736d6e7e5931b7e6ce242bcc8379344fe6d9bc9857f366decd9c99ffb48c05b36896ccb2f96a567ed130fdfbaa511fd1366b66dd6c984db365b6cd8ed9357b66ff7332cc81393447e6d89c98d35ffbc09c99c947ce7e7cc73665925899da34a6359de96df6391956596d8eadb1d6ba5f5b61fdd8a16cb0a962ec60a7f6dc5ed84b7b657fd7abfe95afec8dbdb577f6de3ed85ffeede92367d5bc7db62ff6f543b67db3ef76cecedb05bb68973e69c7b2fd6a57ecaa5db3eb76831236ed163a94ddb63bb0ceeeda3dbb6f0feca13db2c79fb6e3c49eda333bb1b92df82f653abbdf53ff58b19565effaf8fe673bdbbbcca5bbe867653893ee9be9cae7828bc2839bba7377e12edd95bb76cc6677ebeedcbd7b708feec93d7f5ac68b7b756feeddcdb979b7e016dd925b765fdd8a5b756b6edd6db84d91b1e5b6dd8edb757b6edf1d7c4e467afbd01db96377e24edd999bb8dc15ae7495ab5de35ad7a53b7fe6d5eea34f77776feda94f97cacfd6f987253ef8e8073ff5e7fec25ffa2b7fed6ffcadbff3f7fec13ffa27ffec5ffcab7ff3ef7ececffb85cfcb483a2efa25bfecbffa15bfead7fcbadff09b7ecb6f27e93b7ed7eff97d7fe00ffd913ff6272efad36feff2afce287f96eead79ba0b96be4a37b2c6b7be83b6e93e9405157430c18674190ee1477afbc72fc4308469380f17e1325c85eb70136eb97217eec343780c4fe139bc84d71f3d073f2c096fe13dcc85f9b01016c352580e5f296325ac86b524633d6c84cd7fe6a7ef9191f6da0adb6127ec86bdb01f0ec261380ac7e1249c86b374db4bf7f15086eab727fd0fd8511b159ad0862ef4318b2aea68a28d29c431c41887388de77face51fe76ebc8897d95b3a8f1ee255bc8e37f136dec5fbf8a0bbf8189fe2737c89aff12d725a887371fe5b51f9a33a8f0b7131f5a702378bb81497e3d7b81257e39a3b88eb71236ec6adb81d77e2eec7ce712feec78378f8fd32e2513c96a9e04975c98a13b3164f7fab633c8b9398c72296b18a756c621bbbd80fdf38a5be2d6350831ecc600737f8ec523f0d6188c3ef6e93c374381f2e86cbe16ab81e6e86dbe16eb81f1ebedf8ee171781a9e8797e175784bf78a38bc0f73bf7b667e58181687a56179f83aac0cabc3dab0feb978cc76da183687ad617bd8f9c6daeeb037ec0f07c3e170341c0f27c337abe47bee06c39979182643fecdb56228876aa88746bf0fedb7dfffbefbc7d00dfdf49b33c7eee3544df5d44cedf477df173e2323ede3a761fa87b5fc47bfefbd0f4e87e9f4af96f1effc7efedffffce9ff0092c18c42</data>
</image>
</images>
<connections>
<connection>
<sender>buttonCancel</sender>
<signal>clicked()</signal>
<receiver>QgsHelpViewerBase</receiver>
<slot>reject()</slot>
</connection>
</connections>
<layoutdefaults spacing="6" margin="11"/>
</UI>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11" />
<pixmapfunction></pixmapfunction>
<customwidgets>
<customwidget>
<class>Q3TextBrowser</class>
<extends>QWidget</extends>
<header>q3textbrowser.h</header>
<container>1</container>
<pixmap></pixmap>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>
@@ -17,39 +17,32 @@ plugin_LTLIBRARIES = copyrightlabelplugin.la
%.moc.cpp: %.h
$(MOC) -o $@ $<

%.h: %.ui
ui_%.h: %.ui
$(UIC) -o $@ $<
if HAVE_QT4
../../tools/qgis-qt3to4.pl -uic $@
endif

if !NO_UIC_IMPLEMENTATIONS
%.cpp: %.ui
$(UIC) -o $@ -impl $*.h $<
endif

# %.h: %.ui
# $(UIC) -o $@ $<
#
# %.cpp: %.ui
# $(UIC) -o $@ -impl $*.h $<
%.qrc.cpp: %.qrc
$(RCC) -o $@ $<

copyrightlabelplugin_la_SOURCES = plugin.cpp \
plugin.h \
plugingui.cpp \
plugingui.h \
$(plugin_UI)\
$(plugin_MOC)
plugin.h \
plugingui.cpp \
plugingui.h \
$(plugin_UI)\
$(plugin_MOC) \
$(plugin_QRC) \
$(plugin_RES)

plugin_MOC = plugin.moc.cpp \
plugingui.moc.cpp \
pluginguibase.moc.cpp
plugingui.moc.cpp

plugin_UI = pluginguibase.h \
pluginguibase.cpp
plugin_UI = ui_pluginguibase.h

plugin_UIC = pluginguibase.ui

plugin_RES = copyright_plugin.qrc.cpp

plugin_QRC = copyright_plugin.qrc

# UI dependencies
pluginguibase.cpp: pluginguibase.h pluginguibase.ui

@@ -63,4 +56,4 @@ copyrightlabelplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS)
CLEANFILES = $(BUILT_SOURCES)

EXTRA_DIST = $(plugin_UIC) icon.xpm \
pluginguibase.ui.h
ui_pluginguibase.h
Binary file not shown.
@@ -0,0 +1,5 @@
<RCC>
<qresource prefix="/" >
<file>copyright.png</file>
</qresource>
</RCC>
@@ -20,16 +20,18 @@

//standard includes

QgsCopyrightLabelPluginGui::QgsCopyrightLabelPluginGui() : QgsCopyrightLabelPluginGuiBase()
QgsCopyrightLabelPluginGui::QgsCopyrightLabelPluginGui() : QDialog()
{
setupUi(this);
//programmatically hide orientation selection for now
cboOrientation->hide();
textLabel15->hide();
}

QgsCopyrightLabelPluginGui::QgsCopyrightLabelPluginGui( QWidget* parent , const char* name , bool modal , Qt::WFlags fl )
: QgsCopyrightLabelPluginGuiBase( parent, name, modal, fl )
: QDialog(parent, name, modal, fl )
{
setupUi(this);
//programmatically hide orientation selection for now
cboOrientation->hide();
textLabel15->hide();
@@ -38,7 +40,7 @@ QgsCopyrightLabelPluginGui::~QgsCopyrightLabelPluginGui()
{
}

void QgsCopyrightLabelPluginGui::pbnOK_clicked()
void QgsCopyrightLabelPluginGui::on_pbnOK_clicked()
{
//hide the dialog before we send all our signals
hide();
@@ -51,7 +53,7 @@ void QgsCopyrightLabelPluginGui::pbnOK_clicked()

done(1);
}
void QgsCopyrightLabelPluginGui::pbnCancel_clicked()
void QgsCopyrightLabelPluginGui::on_pbnCancel_clicked()
{
close(1);
}

0 comments on commit 4b6a5a9

Please sign in to comment.