Menu
▾
▴
[Qgis-cvs-commits] qgis/src qgsabout.ui,1.25,1.26 qgsbookmarksbase.ui,1.3,1.4 qgscomposerbase.ui,1.7,1.8 qgsdlgvectorlayerpropertiesbase.ui,1.28,1.29
|
From: <tim...@us...> - 2005-11-10 00:18:52
|
Update of /cvsroot/qgis/qgis/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5284/src Modified Files: qgsabout.ui qgsbookmarksbase.ui qgscomposerbase.ui qgsdlgvectorlayerpropertiesbase.ui Log Message: Final (hopefully) parts of merge from 0.7 Index: qgsabout.ui =================================================================== RCS file: /cvsroot/qgis/qgis/src/qgsabout.ui,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** qgsabout.ui 20 Dec 2004 07:12:34 -0000 1.25 --- qgsabout.ui 10 Nov 2005 00:18:40 -0000 1.26 *************** *** 219,223 **** </property> <attribute name="title"> ! <string>Contributors</string> </attribute> <grid> --- 219,223 ---- </property> <attribute name="title"> ! <string>Developers</string> </attribute> <grid> *************** *** 230,234 **** </property> <property name="text"> ! <string><h2>QGIS Contributors</h2></string> </property> </widget> --- 230,234 ---- </property> <property name="text"> ! <string><h2>QGIS Developers</h2></string> </property> </widget> Index: qgsbookmarksbase.ui =================================================================== RCS file: /cvsroot/qgis/qgis/src/qgsbookmarksbase.ui,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** qgsbookmarksbase.ui 16 May 2005 04:53:28 -0000 1.3 --- qgsbookmarksbase.ui 10 Nov 2005 00:18:41 -0000 1.4 *************** *** 10,14 **** <y>0</y> <width>344</width> ! <height>257</height> </rect> </property> --- 10,14 ---- <y>0</y> <width>344</width> ! <height>263</height> </rect> </property> *************** *** 71,75 **** <widget class="QLayoutWidget" row="0" column="1"> <property name="name"> ! <cstring>layout2</cstring> </property> <vbox> --- 71,75 ---- <widget class="QLayoutWidget" row="0" column="1"> <property name="name"> ! <cstring>layout3</cstring> </property> <vbox> *************** *** 110,113 **** --- 110,141 ---- </property> </widget> + <widget class="QPushButton"> + <property name="name"> + <cstring>btnHelp</cstring> + </property> + <property name="text"> + <string>Help</string> + </property> + <property name="toolTip" stdset="0"> + <string>Close the dialog</string> + </property> + </widget> + <spacer> + <property name="name"> + <cstring>spacer1</cstring> + </property> + <property name="orientation"> + <enum>Vertical</enum> + </property> + <property name="sizeType"> + <enum>Expanding</enum> + </property> + <property name="sizeHint"> + <size> + <width>20</width> + <height>100</height> + </size> + </property> + </spacer> </vbox> </widget> *************** *** 133,140 **** --- 161,182 ---- <slot>zoomToBookmark()</slot> </connection> + <connection> + <sender>btnHelp</sender> + <signal>clicked()</signal> + <receiver>QgsBookmarksBase</receiver> + <slot>showHelp()</slot> + </connection> + <connection> + <sender>lstBookmarks</sender> + <signal>doubleClicked(QListViewItem*)</signal> + <receiver>QgsBookmarksBase</receiver> + <slot>zoomViaDoubleClick(QListViewItem*)</slot> + </connection> </connections> <slots> <slot>deleteBookmark()</slot> <slot>zoomToBookmark()</slot> + <slot>showHelp()</slot> + <slot>zoomViaDoubleClick(QListViewItem*)</slot> </slots> <layoutdefaults spacing="6" margin="11"/> Index: qgscomposerbase.ui =================================================================== RCS file: /cvsroot/qgis/qgis/src/qgscomposerbase.ui,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** qgscomposerbase.ui 13 Sep 2005 09:04:48 -0000 1.7 --- qgscomposerbase.ui 10 Nov 2005 00:18:41 -0000 1.8 *************** *** 316,320 **** </property> <property name="text"> ! <string>Action</string> </property> <property name="menuText"> --- 316,320 ---- </property> <property name="text"> ! <string>Zoom to full extent</string> </property> <property name="menuText"> *************** *** 330,334 **** </property> <property name="text"> ! <string>Action</string> </property> <property name="menuText"> --- 330,334 ---- </property> <property name="text"> ! <string>Zoom in</string> </property> <property name="menuText"> *************** *** 344,348 **** </property> <property name="text"> ! <string>Action</string> </property> <property name="menuText"> --- 344,348 ---- </property> <property name="text"> ! <string>Zoom out</string> </property> <property name="menuText"> Index: qgsdlgvectorlayerpropertiesbase.ui =================================================================== RCS file: /cvsroot/qgis/qgis/src/qgsdlgvectorlayerpropertiesbase.ui,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** qgsdlgvectorlayerpropertiesbase.ui 22 May 2005 16:21:28 -0000 1.28 --- qgsdlgvectorlayerpropertiesbase.ui 10 Nov 2005 00:18:41 -0000 1.29 *************** *** 22,25 **** --- 22,28 ---- <string>Layer Properties</string> </property> + <property name="icon"> + <pixmap>image0</pixmap> + </property> <grid> <property name="name"> *************** *** 566,569 **** --- 569,577 ---- </grid> </widget> + <images> + <image name="image0"> + <data format="XPM.GZ" length="2878">789c6d55cb521d390cddf315b7a25d6a4a69b7dbaf9a9a45c893100810122053b370b76dde90f04880a9f9f7e93e32a9dc9ee1b2b8e74a96649d23f9d9d3c5fed6c6e2e9b395eb9b78733c2c86a378b5789a6ecfcfeffffceb8fbf579e28bb98fe3bb5689ffcb6f264fb66312c362f2ff204786b04d4e06fc2743ec36f80bbb6625e9fd971de3bef4c98703c5eb6f3eb7a5e557f3d3bbf0d1c8caef8c7ecbc99e15733fc79c2bde98ded811f96ed314d58e74ea9047c3ab39f006be56afeb3597dc30c235edff6adf1c87734e11c728862ef66f57d9d618997dc633fdccc6e11afc98d8db0bf9f709bb55206b899b00a2a3605fe84f3d9d5fa19f666b0b1e2c359fce7132ebae83000f7959faedadf013b651b8d7cabf57c5bfb1581cdf88198a29c8fa6e6a3b7c0c5f5150bff65fc38c4ff86fcaeb888fbf0ed844db1a615fda09fca8ff7133e6f80956a1be9b7473f54eb1ae897ee261c4a0c5d07fb17d85d1b95423ce9b7d58ffcb61376c9954ef243af259410a49fdbb59fa6fac39ebbdc39e9cf279c57ce6bb1bfa87c696b81515faffba193fe424f21f7b6c37d6803f96cb14efaf101fa4ca33e856fe0515e59a1bfa4e0ef8b0f72df9dcaafadf559e14be7ca1ff49dda64ace487be87929493fe24e9a77fe407fd36ca0e2df2c78cfb656fb5e8cd547e2bfff41dfeda8456f401fd79eba3c67c71acf1875a0ff45bfad27ba9e765e5dbb6c2e7fd323f8cf9f1231d5afc83e8c73fea0f7ab6bd6b5be4a322fdb351813fc23ef0c6678dfed2de84a38fa5f6ff02fdf1d91ae937f468a20dadd84f7f9e97fad690afb8d4cabe94fd3898a1117d21bf4fc16a89077db4d15825fdc27c8410b596faf6915f2767456fd8af6d18f990fb5e227e6f2a9ff471996fbeabf8711f5d416f653006fcd29af437e8167a8ce027763118f1c7fc9be09a56f480f3651488977e72d5ffe33ec63c45d32b99175aaffb2f77b82f5f57ec253e63beb4735a493dd8d7a18fb6137b99cd17ce97ae84aa4fe85d35ded7fbae56fd248ffbf05edd1f83cc0f6d22bfea5327fb03f5e7528c033f9cab1e53cdb75bfbf7b8efa0e7c1a4dec8bcc13f0fc55960be58ee07efd478a162ec3be55c6ea47ebc5f2a8ef9e4fed0abe96214bd32f8b49def44ff84f7c177c16b996fecdfc12523f530decba14f4ef8e503e09c46c281719fd4a46c64ff609e52975b23fb65b3622def1561df2693bb8aa1b714b2aff380794b7d8e153ffcc4b28f45bf43ee2bc6fe4b252723fa39a8fb301be899b0bfb3cac5c8fd30ff5997a6e228fb75c4321fd857d994f10142fc8d8a5b2b7ce2bd1c9f1367c1f7f6cdff7d9838723f7dfb7f1f1e3871e6c287fff5e1233ee6133ee5333ee70bbee4af731ffec6577ccd377ccbdff907dff13d3f2cfbf0735ee517fc925ff16b7ec36f798ddff1facce73d6ff0267fe02ddee61dfec8bbfc89b77ef5e1cfbcc7fb7cc05fb861c52deb11756c967c2c3bf8780ec44414799f7a1a7ef5a14479f4d9a542877444c77432fa9cd2d992cf395d8cbf5ed257fa4657744d37744bdfe9c772cd7447f7f440cf69955ed0cbf1db2b7a2d969f71ded05b5aa377b44eef6963f4d9a40f6ce8977bd136edd047daa54ff499f6689f0ee80b35a4a85d8aa3a92343961fc891a7402172a418e75cc43ee2ae31c51c4b3c8c47f178ee43e7f1a47a1fd3593c952e8f3efffcbef22fa916821c</data> + </image> + </images> <connections> <connection> |