Skip to content

Commit 8cd3cb9

Browse files
author
kyngchaos
committed
grass update (r12475)
context help update (r12478) theme icon updates (r12479, r12484, r12485) git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12488 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 358674c commit 8cd3cb9

File tree

1 file changed

+60
-2
lines changed

1 file changed

+60
-2
lines changed

‎mac/xcode/Qgis.xcodeproj/project.pbxproj

+60-2
Original file line numberDiff line numberDiff line change
@@ -633,6 +633,7 @@
633633
7238DB6810AA191E00963E09 /* qgstininterpolator.h in Headers */ = {isa = PBXBuildFile; fileRef = 721597D11052B2B0003D1610 /* qgstininterpolator.h */; settings = {ATTRIBUTES = (Public, ); }; };
634634
7238DB6B10AA198C00963E09 /* qgsrasterviewport.h in Headers */ = {isa = PBXBuildFile; fileRef = 7209E6F40F39E57A003DC336 /* qgsrasterviewport.h */; settings = {ATTRIBUTES = (Public, ); }; };
635635
723FD05F0FBCB87900EFA55D /* qgspalgeometry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 723FD05D0FBCB85D00EFA55D /* qgspalgeometry.cpp */; };
636+
72411D4510D883CB00DA6DBB /* QgsPluginInstallerDialog-en_US in Copy - context_help */ = {isa = PBXBuildFile; fileRef = 72411D4410D883B900DA6DBB /* QgsPluginInstallerDialog-en_US */; };
636637
72442AEB1095DD4C00B54796 /* qgsavoidintersectionsdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72442AE91095DCFC00B54796 /* qgsavoidintersectionsdialog.cpp */; };
637638
72442AEC1095DD4C00B54796 /* qgsavoidintersectionsdialog.h in Sources */ = {isa = PBXBuildFile; fileRef = 72442AEA1095DCFC00B54796 /* qgsavoidintersectionsdialog.h */; };
638639
724D05C610A910F200F9680A /* north-arrow_10_with_map_layers.svg in Copy - svg-n_arrow */ = {isa = PBXBuildFile; fileRef = 724D05BE10A910B400F9680A /* north-arrow_10_with_map_layers.svg */; };
@@ -2743,6 +2744,7 @@
27432744
729FA37A10D74974005E7C15 /* QgsNewOgrConnection-de_DE in Copy - context_help */,
27442745
729FA37C10D749C8005E7C15 /* QgsNorthArrowPluginGui-en_US in Copy - context_help */,
27452746
729FA37E10D74A9C005E7C15 /* QgsCopyrightLabelPluginGui-pl_PL in Copy - context_help */,
2747+
72411D4510D883CB00DA6DBB /* QgsPluginInstallerDialog-en_US in Copy - context_help */,
27462748
);
27472749
name = "Copy - context_help";
27482750
runOnlyForDeploymentPostprocessing = 0;
@@ -5050,6 +5052,34 @@
50505052
723FD05E0FBCB85D00EFA55D /* qgspalgeometry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgspalgeometry.h; path = ../../src/core/qgspalgeometry.h; sourceTree = SOURCE_ROOT; };
50515053
723FD0660FBCB94600EFA55D /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CMakeLists.txt; path = ../../src/plugins/grass/scripts/CMakeLists.txt; sourceTree = SOURCE_ROOT; };
50525054
723FD0670FBCB94600EFA55D /* db.connect-login.pg.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = "db.connect-login.pg.py"; path = "../../src/plugins/grass/scripts/db.connect-login.pg.py"; sourceTree = SOURCE_ROOT; };
5055+
72411D4110D8835A00DA6DBB /* v.in.ogr.qgis.where.1.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = v.in.ogr.qgis.where.1.svg; path = "../../src/plugins/grass/modules-common/v.in.ogr.qgis.where.1.svg"; sourceTree = SOURCE_ROOT; };
5056+
72411D4210D8835A00DA6DBB /* v.in.ogr.qgis.where.2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = v.in.ogr.qgis.where.2.png; path = "../../src/plugins/grass/modules-common/v.in.ogr.qgis.where.2.png"; sourceTree = SOURCE_ROOT; };
5057+
72411D4310D8835A00DA6DBB /* v.in.ogr.qgis.where.qgm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = v.in.ogr.qgis.where.qgm; path = "../../src/plugins/grass/modules-common/v.in.ogr.qgis.where.qgm"; sourceTree = SOURCE_ROOT; };
5058+
72411D4410D883B900DA6DBB /* QgsPluginInstallerDialog-en_US */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = "QgsPluginInstallerDialog-en_US"; path = "../../resources/context_help/QgsPluginInstallerDialog-en_US"; sourceTree = SOURCE_ROOT; };
5059+
72411D4710D8841F00DA6DBB /* mActionComposerManager.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionComposerManager.png; path = ../../images/themes/default/mActionComposerManager.png; sourceTree = SOURCE_ROOT; };
5060+
72411D4810D8843300DA6DBB /* mActionComposerManager.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionComposerManager.png; path = ../../images/themes/gis/mActionComposerManager.png; sourceTree = SOURCE_ROOT; };
5061+
72411D4910D8844600DA6DBB /* mActionComposerManager.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionComposerManager.png; path = ../../images/themes/newgis/mActionComposerManager.png; sourceTree = SOURCE_ROOT; };
5062+
72411D4A10D884A400DA6DBB /* mActionAddArrow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionAddArrow.png; path = ../../images/themes/gis/mActionAddArrow.png; sourceTree = SOURCE_ROOT; };
5063+
72411D4B10D884A400DA6DBB /* mActionAddBasicShape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionAddBasicShape.png; path = ../../images/themes/gis/mActionAddBasicShape.png; sourceTree = SOURCE_ROOT; };
5064+
72411D4C10D884A400DA6DBB /* mActionAlignBottom.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionAlignBottom.png; path = ../../images/themes/gis/mActionAlignBottom.png; sourceTree = SOURCE_ROOT; };
5065+
72411D4D10D884A400DA6DBB /* mActionAlignHCenter.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionAlignHCenter.png; path = ../../images/themes/gis/mActionAlignHCenter.png; sourceTree = SOURCE_ROOT; };
5066+
72411D4E10D884A400DA6DBB /* mActionAlignLeft.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionAlignLeft.png; path = ../../images/themes/gis/mActionAlignLeft.png; sourceTree = SOURCE_ROOT; };
5067+
72411D4F10D884A400DA6DBB /* mActionAlignRight.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionAlignRight.png; path = ../../images/themes/gis/mActionAlignRight.png; sourceTree = SOURCE_ROOT; };
5068+
72411D5010D884A400DA6DBB /* mActionAlignTop.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionAlignTop.png; path = ../../images/themes/gis/mActionAlignTop.png; sourceTree = SOURCE_ROOT; };
5069+
72411D5110D884A400DA6DBB /* mActionAlignVCenter.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionAlignVCenter.png; path = ../../images/themes/gis/mActionAlignVCenter.png; sourceTree = SOURCE_ROOT; };
5070+
72411D5210D884A400DA6DBB /* mActionCopySelected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionCopySelected.png; path = ../../images/themes/gis/mActionCopySelected.png; sourceTree = SOURCE_ROOT; };
5071+
72411D5310D884A400DA6DBB /* mActionDeselectAll.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionDeselectAll.png; path = ../../images/themes/gis/mActionDeselectAll.png; sourceTree = SOURCE_ROOT; };
5072+
72411D5410D884A400DA6DBB /* mActionInvertSelection.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionInvertSelection.png; path = ../../images/themes/gis/mActionInvertSelection.png; sourceTree = SOURCE_ROOT; };
5073+
72411D5510D884A400DA6DBB /* mActionLowerItems.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionLowerItems.png; path = ../../images/themes/gis/mActionLowerItems.png; sourceTree = SOURCE_ROOT; };
5074+
72411D5610D884A400DA6DBB /* mActionMoveItemsToBottom.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionMoveItemsToBottom.png; path = ../../images/themes/gis/mActionMoveItemsToBottom.png; sourceTree = SOURCE_ROOT; };
5075+
72411D5710D884A400DA6DBB /* mActionMoveItemsToTop.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionMoveItemsToTop.png; path = ../../images/themes/gis/mActionMoveItemsToTop.png; sourceTree = SOURCE_ROOT; };
5076+
72411D5810D884A400DA6DBB /* mActionNewComposer.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionNewComposer.png; path = ../../images/themes/gis/mActionNewComposer.png; sourceTree = SOURCE_ROOT; };
5077+
72411D5910D884A400DA6DBB /* mActionPrintComposers.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionPrintComposers.png; path = ../../images/themes/gis/mActionPrintComposers.png; sourceTree = SOURCE_ROOT; };
5078+
72411D5A10D884A400DA6DBB /* mActionRaiseItems.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionRaiseItems.png; path = ../../images/themes/gis/mActionRaiseItems.png; sourceTree = SOURCE_ROOT; };
5079+
72411D5B10D884A400DA6DBB /* mActionReshape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionReshape.png; path = ../../images/themes/gis/mActionReshape.png; sourceTree = SOURCE_ROOT; };
5080+
72411D5C10D884A400DA6DBB /* mActionSelectedToTop.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionSelectedToTop.png; path = ../../images/themes/gis/mActionSelectedToTop.png; sourceTree = SOURCE_ROOT; };
5081+
72411D5D10D884CB00DA6DBB /* mActionDeleteAttribute.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionDeleteAttribute.png; path = ../../images/themes/gis/mActionDeleteAttribute.png; sourceTree = SOURCE_ROOT; };
5082+
72411D5E10D884CB00DA6DBB /* mActionNewAttribute.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionNewAttribute.png; path = ../../images/themes/gis/mActionNewAttribute.png; sourceTree = SOURCE_ROOT; };
50535083
72442AE71095DCAF00B54796 /* testqgspoint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testqgspoint.cpp; path = ../../tests/src/core/testqgspoint.cpp; sourceTree = SOURCE_ROOT; };
50545084
72442AE81095DCD800B54796 /* qgsavoidintersectionsdialogbase.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = qgsavoidintersectionsdialogbase.ui; path = ../../src/ui/qgsavoidintersectionsdialogbase.ui; sourceTree = SOURCE_ROOT; };
50555085
72442AE91095DCFC00B54796 /* qgsavoidintersectionsdialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsavoidintersectionsdialog.cpp; path = ../../src/app/qgsavoidintersectionsdialog.cpp; sourceTree = SOURCE_ROOT; };
@@ -9067,6 +9097,7 @@
90679097
724FFB5310B47263006E3698 /* QgsOpenVectorLayerDialog-en_US */,
90689098
729FA30110D746A4005E7C15 /* QgsOptions-en_US */,
90699099
724FFB2310B47263006E3698 /* QgsPgSourceSelect-en_US */,
9100+
72411D4410D883B900DA6DBB /* QgsPluginInstallerDialog-en_US */,
90709101
724FFB5610B47263006E3698 /* QgsProjectProperties-en_US */,
90719102
729FA30310D74737005E7C15 /* QgsScaleBarPluginGui-en_US */,
90729103
724FFB5D10B47263006E3698 /* QgsServerSourceSelect-en_US */,
@@ -9743,6 +9774,7 @@
97439774
7209EEFD0F39E5D9003DC336 /* mActionCapturePolygon.png */,
97449775
7209EEFE0F39E5D9003DC336 /* mActionCheckQgisVersion.png */,
97459776
7209EEFF0F39E5D9003DC336 /* mActionCollapseTree.png */,
9777+
72411D4710D8841F00DA6DBB /* mActionComposerManager.png */,
97469778
7209EF000F39E5D9003DC336 /* mActionContextHelp.png */,
97479779
7209EF010F39E5D9003DC336 /* mActionCopySelected.png */,
97489780
7209EF020F39E5D9003DC336 /* mActionCustomProjection.png */,
@@ -9902,6 +9934,7 @@
99029934
7209EF6F0F39E5D9003DC336 /* mActionCaptureLine.png */,
99039935
7209EF700F39E5D9003DC336 /* mActionCapturePoint.png */,
99049936
7209EF710F39E5D9003DC336 /* mActionCapturePolygon.png */,
9937+
72411D4810D8843300DA6DBB /* mActionComposerManager.png */,
99059938
7209EF720F39E5D9003DC336 /* mActionDeleteSelected.png */,
99069939
7209EF730F39E5D9003DC336 /* mActionDeleteVertex.png */,
99079940
7209EF740F39E5D9003DC336 /* mActionDraw.png */,
@@ -9958,6 +9991,27 @@
99589991
72C4242D103DE718005CD18E /* mActionRedo.png */,
99599992
72C4242E103DE718005CD18E /* mActionMergeFeatures.png */,
99609993
72C4242F103DE718005CD18E /* mActionAddImage.png */,
9994+
72411D4A10D884A400DA6DBB /* mActionAddArrow.png */,
9995+
72411D4B10D884A400DA6DBB /* mActionAddBasicShape.png */,
9996+
72411D4C10D884A400DA6DBB /* mActionAlignBottom.png */,
9997+
72411D4D10D884A400DA6DBB /* mActionAlignHCenter.png */,
9998+
72411D4E10D884A400DA6DBB /* mActionAlignLeft.png */,
9999+
72411D4F10D884A400DA6DBB /* mActionAlignRight.png */,
10000+
72411D5010D884A400DA6DBB /* mActionAlignTop.png */,
10001+
72411D5110D884A400DA6DBB /* mActionAlignVCenter.png */,
10002+
72411D5210D884A400DA6DBB /* mActionCopySelected.png */,
10003+
72411D5310D884A400DA6DBB /* mActionDeselectAll.png */,
10004+
72411D5410D884A400DA6DBB /* mActionInvertSelection.png */,
10005+
72411D5510D884A400DA6DBB /* mActionLowerItems.png */,
10006+
72411D5610D884A400DA6DBB /* mActionMoveItemsToBottom.png */,
10007+
72411D5710D884A400DA6DBB /* mActionMoveItemsToTop.png */,
10008+
72411D5810D884A400DA6DBB /* mActionNewComposer.png */,
10009+
72411D5910D884A400DA6DBB /* mActionPrintComposers.png */,
10010+
72411D5A10D884A400DA6DBB /* mActionRaiseItems.png */,
10011+
72411D5B10D884A400DA6DBB /* mActionReshape.png */,
10012+
72411D5C10D884A400DA6DBB /* mActionSelectedToTop.png */,
10013+
72411D5D10D884CB00DA6DBB /* mActionDeleteAttribute.png */,
10014+
72411D5E10D884CB00DA6DBB /* mActionNewAttribute.png */,
996110015
727459F40F770252007F4218 /* plugins */,
996210016
);
996310017
name = gis;
@@ -10517,6 +10571,7 @@
1051710571
724D05FF10A9112D00F9680A /* mActionCaptureLine.png */,
1051810572
724D060010A9112D00F9680A /* mActionCapturePoint.png */,
1051910573
724D060110A9112D00F9680A /* mActionCapturePolygon.png */,
10574+
72411D4910D8844600DA6DBB /* mActionComposerManager.png */,
1052010575
724D060210A9112D00F9680A /* mActionDeletePart.png */,
1052110576
724D060310A9112D00F9680A /* mActionDeleteRing.png */,
1052210577
724D060410A9112D00F9680A /* mActionDeleteSelected.png */,
@@ -11409,6 +11464,9 @@
1140911464
72993BDB0FE3037800244D1A /* v.in.ogr.qgis.loc.2.png */,
1141011465
72993BDC0FE3037800244D1A /* v.in.ogr.qgis.loc.qgm */,
1141111466
72993BDD0FE3037800244D1A /* v.in.ogr.qgis.qgm */,
11467+
72411D4110D8835A00DA6DBB /* v.in.ogr.qgis.where.1.svg */,
11468+
72411D4210D8835A00DA6DBB /* v.in.ogr.qgis.where.2.png */,
11469+
72411D4310D8835A00DA6DBB /* v.in.ogr.qgis.where.qgm */,
1141211470
72993BDE0FE3037800244D1A /* v.in.ogr.qgm */,
1141311471
72993BDF0FE3037800244D1A /* v.in.region.1.svg */,
1141411472
72993BE00FE3037800244D1A /* v.in.region.qgm */,
@@ -17690,7 +17748,7 @@
1769017748
COPY_PHASE_STRIP = NO;
1769117749
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
1769217750
GCC_OPTIMIZATION_LEVEL = 0;
17693-
QGIS_VERSION_BUILD = 12467;
17751+
QGIS_VERSION_BUILD = 12487;
1769417752
STRIP_INSTALLED_PRODUCT = NO;
1769517753
};
1769617754
name = Debug;
@@ -17701,7 +17759,7 @@
1770117759
buildSettings = {
1770217760
COPY_PHASE_STRIP = YES;
1770317761
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
17704-
QGIS_VERSION_BUILD = 12467;
17762+
QGIS_VERSION_BUILD = 12487;
1770517763
STRIP_INSTALLED_PRODUCT = YES;
1770617764
};
1770717765
name = Release;

0 commit comments

Comments
 (0)