aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden
diff options
context:
space:
mode:
authorAimee Trescothick2008-09-22 02:01:57 -0500
committerJacek Antonelli2008-09-22 02:12:59 -0500
commit997fb0cbf21cc6b2f2ff8c8381de488eafff4c8d (patch)
tree2b0e069ec0d2d68740f6fcc3100f63e3322bf3f5 /linden
parentVWR-2331: Terraform tool variable "strength". (diff)
downloadmeta-impy-997fb0cbf21cc6b2f2ff8c8381de488eafff4c8d.zip
meta-impy-997fb0cbf21cc6b2f2ff8c8381de488eafff4c8d.tar.gz
meta-impy-997fb0cbf21cc6b2f2ff8c8381de488eafff4c8d.tar.bz2
meta-impy-997fb0cbf21cc6b2f2ff8c8381de488eafff4c8d.tar.xz
VWR-8430: Usability improvements to the land tools floater.
Diffstat (limited to '')
-rw-r--r--linden/doc/contributions.txt1
-rw-r--r--linden/indra/newview/app_settings/settings.xml2
-rw-r--r--linden/indra/newview/llfloatertools.cpp44
-rw-r--r--linden/indra/newview/llfloatertools.h3
-rw-r--r--linden/indra/newview/llpanelland.cpp26
-rw-r--r--linden/indra/newview/llpanelland.h3
-rw-r--r--linden/indra/newview/lltoolbrush.cpp4
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/alerts.xml13
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_tools.xml149
9 files changed, 152 insertions, 93 deletions
diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt
index 9efcd03..de87457 100644
--- a/linden/doc/contributions.txt
+++ b/linden/doc/contributions.txt
@@ -14,6 +14,7 @@ Adam Marker
14Aimee Trescothick 14Aimee Trescothick
15 VWR-3903 15 VWR-3903
16 VWR-4083 16 VWR-4083
17 VWR-8430
17Alejandro Rosenthal 18Alejandro Rosenthal
18 VWR-1184 19 VWR-1184
19Alissa Sabre 20Alissa Sabre
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index fa0d21e..cdf9fb4 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -5569,7 +5569,7 @@
5569 <key>Value</key> 5569 <key>Value</key>
5570 <integer>0</integer> 5570 <integer>0</integer>
5571 </map> 5571 </map>
5572 <key>RadioLandBrushSize</key> 5572 <key>LandBrushSize</key>
5573 <map> 5573 <map>
5574 <key>Comment</key> 5574 <key>Comment</key>
5575 <string>Size of land modification brush (0 = small, 1 = medium, 2 = large)</string> 5575 <string>Size of land modification brush (0 = small, 1 = medium, 2 = large)</string>
diff --git a/linden/indra/newview/llfloatertools.cpp b/linden/indra/newview/llfloatertools.cpp
index 8d4d6e2..9ce5d35 100644
--- a/linden/indra/newview/llfloatertools.cpp
+++ b/linden/indra/newview/llfloatertools.cpp
@@ -106,9 +106,8 @@ void click_popup_rotate_left(void*);
106void click_popup_rotate_reset(void*); 106void click_popup_rotate_reset(void*);
107void click_popup_rotate_right(void*); 107void click_popup_rotate_right(void*);
108void click_popup_dozer_mode(LLUICtrl *, void *user); 108void click_popup_dozer_mode(LLUICtrl *, void *user);
109void click_popup_dozer_size(LLUICtrl *, void *user); 109void commit_slider_dozer_size(LLUICtrl *, void*);
110void commit_slider_dozer_force(LLUICtrl *, void*); 110void commit_slider_dozer_force(LLUICtrl *, void*);
111void click_dozer_size(LLUICtrl *, void*);
112void click_apply_to_selection(void*); 111void click_apply_to_selection(void*);
113void commit_radio_zoom(LLUICtrl *, void*); 112void commit_radio_zoom(LLUICtrl *, void*);
114void commit_radio_orbit(LLUICtrl *, void*); 113void commit_radio_orbit(LLUICtrl *, void*);
@@ -303,14 +302,13 @@ BOOL LLFloaterTools::postBuild()
303 childSetCommitCallback("radio noise",click_popup_dozer_mode, (void*)4); 302 childSetCommitCallback("radio noise",click_popup_dozer_mode, (void*)4);
304 mRadioDozerRevert = getChild<LLCheckBoxCtrl>("radio revert"); 303 mRadioDozerRevert = getChild<LLCheckBoxCtrl>("radio revert");
305 childSetCommitCallback("radio revert",click_popup_dozer_mode, (void*)5); 304 childSetCommitCallback("radio revert",click_popup_dozer_mode, (void*)5);
306 mComboDozerSize = getChild<LLComboBox>("combobox brush size");
307 childSetCommitCallback("combobox brush size",click_dozer_size, (void*)0);
308 if(mComboDozerSize) mComboDozerSize->setCurrentByIndex(0);
309 mBtnApplyToSelection = getChild<LLButton>("button apply to selection"); 305 mBtnApplyToSelection = getChild<LLButton>("button apply to selection");
310 childSetAction("button apply to selection",click_apply_to_selection, (void*)0); 306 childSetAction("button apply to selection",click_apply_to_selection, (void*)0);
311 mCheckShowOwners = getChild<LLCheckBoxCtrl>("checkbox show owners");
312 childSetValue("checkbox show owners",gSavedSettings.getBOOL("ShowParcelOwners"));
313 307
308 mSliderDozerSize = getChild<LLSlider>("slider brush size");
309 childSetCommitCallback("slider brush size", commit_slider_dozer_size, (void*)0);
310 childSetValue( "slider brush size", gSavedSettings.getS32("LandBrushSize"));
311
314 mSliderDozerForce = getChild<LLSlider>("slider force"); 312 mSliderDozerForce = getChild<LLSlider>("slider force");
315 childSetCommitCallback("slider force",commit_slider_dozer_force, (void*)0); 313 childSetCommitCallback("slider force",commit_slider_dozer_force, (void*)0);
316 // the setting stores the actual force multiplier, but the slider is logarithmic, so we convert here 314 // the setting stores the actual force multiplier, but the slider is logarithmic, so we convert here
@@ -391,10 +389,9 @@ LLFloaterTools::LLFloaterTools()
391 mRadioDozerSmooth(NULL), 389 mRadioDozerSmooth(NULL),
392 mRadioDozerNoise(NULL), 390 mRadioDozerNoise(NULL),
393 mRadioDozerRevert(NULL), 391 mRadioDozerRevert(NULL),
394 mComboDozerSize(NULL), 392 mSliderDozerSize(NULL),
393 mSliderDozerForce(NULL),
395 mBtnApplyToSelection(NULL), 394 mBtnApplyToSelection(NULL),
396 mCheckShowOwners(NULL),
397
398 395
399 mTab(NULL), 396 mTab(NULL),
400 mPanelPermissions(NULL), 397 mPanelPermissions(NULL),
@@ -702,7 +699,6 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
702 if (mRadioSelectLand) mRadioSelectLand->setVisible( land_visible ); 699 if (mRadioSelectLand) mRadioSelectLand->setVisible( land_visible );
703 700
704 S32 dozer_mode = gSavedSettings.getS32("RadioLandBrushAction"); 701 S32 dozer_mode = gSavedSettings.getS32("RadioLandBrushAction");
705 S32 dozer_size = gSavedSettings.getS32("RadioLandBrushSize");
706 702
707 if (mRadioDozerFlatten) 703 if (mRadioDozerFlatten)
708 { 704 {
@@ -734,20 +730,16 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
734 mRadioDozerRevert ->set( tool == LLToolBrushLand::getInstance() && dozer_mode == 5); 730 mRadioDozerRevert ->set( tool == LLToolBrushLand::getInstance() && dozer_mode == 5);
735 mRadioDozerRevert ->setVisible( land_visible ); 731 mRadioDozerRevert ->setVisible( land_visible );
736 } 732 }
737 if (mComboDozerSize)
738 {
739 mComboDozerSize ->setCurrentByIndex(dozer_size);
740 mComboDozerSize ->setVisible( land_visible );
741 mComboDozerSize ->setEnabled( tool == LLToolBrushLand::getInstance() );
742 }
743 if (mBtnApplyToSelection) 733 if (mBtnApplyToSelection)
744 { 734 {
745 mBtnApplyToSelection->setVisible( land_visible ); 735 mBtnApplyToSelection->setVisible( land_visible );
746 mBtnApplyToSelection->setEnabled( land_visible && !LLViewerParcelMgr::getInstance()->selectionEmpty() && tool != LLToolSelectLand::getInstance()); 736 mBtnApplyToSelection->setEnabled( land_visible && !LLViewerParcelMgr::getInstance()->selectionEmpty() && tool != LLToolSelectLand::getInstance());
747 } 737 }
748 if (mCheckShowOwners) 738 if (mSliderDozerSize)
749 { 739 {
750 mCheckShowOwners ->setVisible( land_visible ); 740 mSliderDozerSize ->setVisible( land_visible );
741 childSetVisible("Brush:", land_visible);
742 childSetVisible("Brush Size:", land_visible);
751 } 743 }
752 if (mSliderDozerForce) 744 if (mSliderDozerForce)
753 { 745 {
@@ -933,23 +925,15 @@ void click_popup_rotate_right(void*)
933 925
934void click_popup_dozer_mode(LLUICtrl *, void *user) 926void click_popup_dozer_mode(LLUICtrl *, void *user)
935{ 927{
936 S32 show_owners = gSavedSettings.getBOOL("ShowParcelOwners");
937 S32 mode = (S32)(intptr_t) user; 928 S32 mode = (S32)(intptr_t) user;
938 gFloaterTools->setEditTool( LLToolBrushLand::getInstance() ); 929 gFloaterTools->setEditTool( LLToolBrushLand::getInstance() );
939 gSavedSettings.setS32("RadioLandBrushAction", mode); 930 gSavedSettings.setS32("RadioLandBrushAction", mode);
940 gSavedSettings.setBOOL("ShowParcelOwners", show_owners);
941}
942
943void click_popup_dozer_size(LLUICtrl *, void *user)
944{
945 S32 size = (S32)(intptr_t) user;
946 gSavedSettings.setS32("RadioLandBrushSize", size);
947} 931}
948 932
949void click_dozer_size(LLUICtrl *ctrl, void *user) 933void commit_slider_dozer_size(LLUICtrl *ctrl, void*)
950{ 934{
951 S32 size = ((LLComboBox*) ctrl)->getCurrentIndex(); 935 S32 size = (S32)ctrl->getValue().asInteger();
952 gSavedSettings.setS32("RadioLandBrushSize", size); 936 gSavedSettings.setS32("LandBrushSize", size);
953} 937}
954 938
955void commit_slider_dozer_force(LLUICtrl *ctrl, void*) 939void commit_slider_dozer_force(LLUICtrl *ctrl, void*)
diff --git a/linden/indra/newview/llfloatertools.h b/linden/indra/newview/llfloatertools.h
index a75aa87..3d8a144 100644
--- a/linden/indra/newview/llfloatertools.h
+++ b/linden/indra/newview/llfloatertools.h
@@ -168,11 +168,10 @@ public:
168 LLCheckBoxCtrl *mRadioDozerSmooth; 168 LLCheckBoxCtrl *mRadioDozerSmooth;
169 LLCheckBoxCtrl *mRadioDozerNoise; 169 LLCheckBoxCtrl *mRadioDozerNoise;
170 LLCheckBoxCtrl *mRadioDozerRevert; 170 LLCheckBoxCtrl *mRadioDozerRevert;
171 LLSlider *mSliderDozerSize;
171 LLSlider *mSliderDozerForce; 172 LLSlider *mSliderDozerForce;
172 173
173 LLComboBox *mComboDozerSize;
174 LLButton *mBtnApplyToSelection; 174 LLButton *mBtnApplyToSelection;
175 LLCheckBoxCtrl *mCheckShowOwners;
176 175
177 std::vector<LLButton*> mButtons;//[ 15 ]; 176 std::vector<LLButton*> mButtons;//[ 15 ];
178 177
diff --git a/linden/indra/newview/llpanelland.cpp b/linden/indra/newview/llpanelland.cpp
index be05703..1a7892d 100644
--- a/linden/indra/newview/llpanelland.cpp
+++ b/linden/indra/newview/llpanelland.cpp
@@ -37,10 +37,13 @@
37 37
38#include "llagent.h" 38#include "llagent.h"
39#include "llbutton.h" 39#include "llbutton.h"
40#include "llcheckboxctrl.h"
40#include "llfloaterland.h" 41#include "llfloaterland.h"
41#include "lltextbox.h" 42#include "lltextbox.h"
43#include "llviewercontrol.h"
42#include "llviewerparcelmgr.h" 44#include "llviewerparcelmgr.h"
43#include "llviewerregion.h" 45#include "llviewerregion.h"
46#include "llviewerwindow.h"
44#include "roles_constants.h" 47#include "roles_constants.h"
45 48
46#include "lluictrlfactory.h" 49#include "lluictrlfactory.h"
@@ -65,6 +68,10 @@ BOOL LLPanelLandInfo::postBuild()
65 childSetAction("button subdivide land",onClickDivide,this); 68 childSetAction("button subdivide land",onClickDivide,this);
66 childSetAction("button join land",onClickJoin,this); 69 childSetAction("button join land",onClickJoin,this);
67 childSetAction("button about land",onClickAbout,this); 70 childSetAction("button about land",onClickAbout,this);
71 childSetAction("button show owners help", onShowOwnersHelp, this);
72
73 mCheckShowOwners = getChild<LLCheckBoxCtrl>("checkbox show owners");
74 childSetValue("checkbox show owners", gSavedSettings.getBOOL("ShowParcelOwners"));
68 75
69 return TRUE; 76 return TRUE;
70} 77}
@@ -72,7 +79,8 @@ BOOL LLPanelLandInfo::postBuild()
72// Methods 79// Methods
73// 80//
74LLPanelLandInfo::LLPanelLandInfo(const std::string& name) 81LLPanelLandInfo::LLPanelLandInfo(const std::string& name)
75: LLPanel(name) 82: LLPanel(name),
83 mCheckShowOwners(NULL)
76{ 84{
77 if (!sInstance) 85 if (!sInstance)
78 { 86 {
@@ -255,3 +263,19 @@ void LLPanelLandInfo::onClickAbout(void*)
255 263
256 LLFloaterLand::showInstance(); 264 LLFloaterLand::showInstance();
257} 265}
266
267void LLPanelLandInfo::onShowOwnersHelp(void* user_data)
268{
269 LLPanelLandInfo* self = static_cast<LLPanelLandInfo*>(user_data);
270
271 const char* xml_alert = "ShowOwnersHelp";
272 LLAlertDialog* dialogp = gViewerWindow->alertXml(xml_alert);
273 if (dialogp)
274 {
275 LLFloater* root_floater = gFloaterView->getParentFloater(self);
276 if (root_floater)
277 {
278 root_floater->addDependentFloater(dialogp);
279 }
280 }
281}
diff --git a/linden/indra/newview/llpanelland.h b/linden/indra/newview/llpanelland.h
index c83bf2c..c44cb9d 100644
--- a/linden/indra/newview/llpanelland.h
+++ b/linden/indra/newview/llpanelland.h
@@ -50,6 +50,8 @@ public:
50 50
51 void refresh(); 51 void refresh();
52 static void refreshAll(); 52 static void refreshAll();
53
54 LLCheckBoxCtrl *mCheckShowOwners;
53 55
54protected: 56protected:
55 static void onClickClaim(void*); 57 static void onClickClaim(void*);
@@ -57,6 +59,7 @@ protected:
57 static void onClickDivide(void*); 59 static void onClickDivide(void*);
58 static void onClickJoin(void*); 60 static void onClickJoin(void*);
59 static void onClickAbout(void*); 61 static void onClickAbout(void*);
62 static void onShowOwnersHelp(void*);
60 63
61protected: 64protected:
62 //LLTextBox* mTextPriceLabel; 65 //LLTextBox* mTextPriceLabel;
diff --git a/linden/indra/newview/lltoolbrush.cpp b/linden/indra/newview/lltoolbrush.cpp
index fdd7b66..0291eab 100644
--- a/linden/indra/newview/lltoolbrush.cpp
+++ b/linden/indra/newview/lltoolbrush.cpp
@@ -96,7 +96,7 @@ LLToolBrushLand::LLToolBrushLand()
96 mGotHover(FALSE), 96 mGotHover(FALSE),
97 mBrushSelected(FALSE) 97 mBrushSelected(FALSE)
98{ 98{
99 mBrushIndex = gSavedSettings.getS32("RadioLandBrushSize"); 99 mBrushIndex = gSavedSettings.getS32("LandBrushSize");
100} 100}
101 101
102void LLToolBrushLand::modifyLandAtPointGlobal(const LLVector3d &pos_global, 102void LLToolBrushLand::modifyLandAtPointGlobal(const LLVector3d &pos_global,
@@ -447,7 +447,7 @@ void LLToolBrushLand::render()
447 spot.mdV[VX] = floor( spot.mdV[VX] + 0.5 ); 447 spot.mdV[VX] = floor( spot.mdV[VX] + 0.5 );
448 spot.mdV[VY] = floor( spot.mdV[VY] + 0.5 ); 448 spot.mdV[VY] = floor( spot.mdV[VY] + 0.5 );
449 449
450 mBrushIndex = gSavedSettings.getS32("RadioLandBrushSize"); 450 mBrushIndex = gSavedSettings.getS32("LandBrushSize");
451 region_list_t regions; 451 region_list_t regions;
452 determineAffectedRegions(regions, spot); 452 determineAffectedRegions(regions, spot);
453 453
diff --git a/linden/indra/newview/skins/default/xui/en-us/alerts.xml b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
index c7ec62f..4bf5ff1 100644
--- a/linden/indra/newview/skins/default/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
@@ -1996,6 +1996,19 @@ Join land?
1996 Cancel 1996 Cancel
1997 </option> 1997 </option>
1998 </alert> 1998 </alert>
1999 <alert name="ShowOwnersHelp">
2000 <message name="message">
2001 If this box is checked, land parcels will be
2002overlaid with a color indicating their status.
2003
2004Red: Land owned by others.
2005Green: Your land.
2006Aqua: Land owned by a group that you are a member of.
2007Yellow: For sale.
2008Purple: Land in the auction system.
2009Grey: Rare public land.
2010 </message>
2011 </alert>
1999 <alert modal="true" name="ConfirmNotecardSave"> 2012 <alert modal="true" name="ConfirmNotecardSave">
2000 <message name="message"> 2013 <message name="message">
2001 This notecard needs to be saved before the item can be copied or viewed. Save notecard? 2014 This notecard needs to be saved before the item can be copied or viewed. Save notecard?
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
index 3ae37ea..1817d8c 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
@@ -245,55 +245,65 @@
245 245
246<!-- Land panel --> 246<!-- Land panel -->
247 247
248 <check_box bottom="-70" follows="left|top" font="SansSerifSmall" height="16" 248 <check_box bottom="-69" follows="left|top" font="SansSerifSmall" height="16"
249 initial_value="false" label="Select Land" left="4" mouse_opaque="true" 249 initial_value="false" label="Select Land" left="4" mouse_opaque="true"
250 name="radio select land" radio_style="true" width="114" /> 250 name="radio select land" radio_style="true" width="114" />
251 <check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16" 251 <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
252 initial_value="false" label="Flatten Land" left="4" mouse_opaque="true" 252 initial_value="false" label="Flatten" left="4" mouse_opaque="true"
253 name="radio flatten" radio_style="true" width="114" /> 253 name="radio flatten" radio_style="true" width="114" />
254 <check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16" 254 <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
255 initial_value="false" label="Raise Land" left="4" mouse_opaque="true" 255 initial_value="false" label="Raise" left="4" mouse_opaque="true"
256 name="radio raise" radio_style="true" width="114" /> 256 name="radio raise" radio_style="true" width="114" />
257 <check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16" 257 <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
258 initial_value="false" label="Lower Land" left="4" mouse_opaque="true" 258 initial_value="false" label="Lower" left="4" mouse_opaque="true"
259 name="radio lower" radio_style="true" width="114" /> 259 name="radio lower" radio_style="true" width="114" />
260 <check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16" 260 <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
261 initial_value="false" label="Smooth Land" left="4" mouse_opaque="true" 261 initial_value="false" label="Smooth" left="4" mouse_opaque="true"
262 name="radio smooth" radio_style="true" width="114" /> 262 name="radio smooth" radio_style="true" width="114" />
263 <check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16" 263 <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
264 initial_value="false" label="Roughen Land" left="4" mouse_opaque="true" 264 initial_value="false" label="Roughen" left="4" mouse_opaque="true"
265 name="radio noise" radio_style="true" width="114" /> 265 name="radio noise" radio_style="true" width="114" />
266 <check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16" 266 <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
267 initial_value="false" label="Revert Land" left="4" mouse_opaque="true" 267 initial_value="false" label="Revert" left="4" mouse_opaque="true"
268 name="radio revert" radio_style="true" width="114" /> 268 name="radio revert" radio_style="true" width="114" />
269 <combo_box allow_text_entry="false" bottom="-85" follows="left|top" height="18" left="118" 269
270 max_chars="20" mouse_opaque="true" name="combobox brush size" width="134"> 270
271 <combo_item name="Small" value="Small"> 271 <button bottom="-74" follows="left|top" font="SansSerifSmall" halign="center"
272 Small 272 height="20" label="Apply to selection" label_selected="Apply to selection"
273 </combo_item>
274 <combo_item name="Medium" value="Medium">
275 Medium
276 </combo_item>
277 <combo_item name="Large" value="Large">
278 Large
279 </combo_item>
280 </combo_box>
281 <volume_slider bottom_delta="-19" follows="left|top" height="16" hidden="false" increment="0.1"
282 initial_val="0.00" left="155" max_val="2.0" min_val="-1.0"
283 mouse_opaque="true" name="slider force" width="70" />
284 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
285 bottom_delta="4" drop_shadow_visible="true" enabled="true" follows="left|top"
286 font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
287 left="118" mouse_opaque="true" name="Force:" v_pad="0" width="128">
288 Force:
289 </text>
290 <button bottom_delta="-22" follows="left|top" font="SansSerifSmall" halign="center"
291 height="16" label="Apply to selection" label_selected="Apply to selection"
292 left="118" mouse_opaque="true" name="button apply to selection" 273 left="118" mouse_opaque="true" name="button apply to selection"
293 scale_image="TRUE" tool_tip="Modify Selected Land" width="134" /> 274 scale_image="TRUE" tool_tip="Modify Selected Land" width="134" />
294 <check_box bottom_delta="-20" control_name="ShowParcelOwners" follows="left|top" 275
295 font="SansSerifSmall" height="16" initial_value="false" label="Show Owners" 276
296 left="118" mouse_opaque="true" name="checkbox show owners" width="134" /> 277
278 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false"
279 border_visible="false" bottom_delta="-16" drop_shadow_visible="true" enabled="true"
280 follows="left|top" font="SansSerifSmall" h_pad="0" halign="left" height="12" left="118"
281 hidden="false" mouse_opaque="true" name="Brush:" v_pad="0" width="100">
282 Brush:
283 </text>
284
285 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false"
286 border_visible="false" bottom_delta="-18" drop_shadow_visible="true" enabled="true"
287 follows="left|top" font="SansSerifSmall" h_pad="0" halign="left" height="12" left="132"
288 hidden="false" mouse_opaque="true" name="Brush Size:" v_pad="0" width="100">
289 Size
290 </text>
291 <volume_slider bottom_delta="-4" follows="left|top" height="16" hidden="false"
292 increment="1.0" initial_val="0.0" left="178" max_val="2.0" min_val="0.0"
293 mouse_opaque="true" name="slider brush size" width="80" />
294
295
296 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false"
297 border_visible="false" bottom_delta="-18" drop_shadow_visible="true" enabled="true"
298 follows="left|top" font="SansSerifSmall" h_pad="0" halign="left" height="12" left="132"
299 hidden="false" mouse_opaque="true" name="Strength:" v_pad="0" width="100">
300 Strength
301 </text>
302 <volume_slider bottom_delta="-4" follows="left|top" height="16" hidden="false"
303 increment="0.1" initial_val="0.00" left="178" max_val="2.0" min_val="-1.0"
304 mouse_opaque="true" name="slider force" width="80" />
305
306
297 <button bottom="-163" follows="left|top" font="SansSerifSmall" halign="center" 307 <button bottom="-163" follows="left|top" font="SansSerifSmall" halign="center"
298 height="20" label="More &gt;&gt;" left="186" mouse_opaque="true" 308 height="20" label="More &gt;&gt;" left="186" mouse_opaque="true"
299 name="button more" scale_image="TRUE" tool_tip="Advanced Options" 309 name="button more" scale_image="TRUE" tool_tip="Advanced Options"
@@ -1179,34 +1189,59 @@
1179 <panel bottom="-550" follows="left|top" height="384" left="0" mouse_opaque="true" 1189 <panel bottom="-550" follows="left|top" height="384" left="0" mouse_opaque="true"
1180 name="land info panel" width="272"> 1190 name="land info panel" width="272">
1181 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 1191 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
1182 bottom="-18" drop_shadow_visible="true" follows="left|top" 1192 bottom="-40" drop_shadow_visible="true" follows="left|top"
1183 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4" 1193 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="40"
1194 mouse_opaque="true" name="label_parcel_modify" v_pad="0" width="150">
1195 Modify Parcel
1196 </text>
1197 <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
1198 height="20" label="Subdivide..." label_selected="Subdivide..." left="48"
1199 mouse_opaque="true" name="button subdivide land" scale_image="TRUE"
1200 width="112" />
1201 <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
1202 height="20" label="Join..." label_selected="Join..." left="48"
1203 mouse_opaque="true" name="button join land" scale_image="TRUE" width="112" />
1204 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
1205 bottom_delta="-56" drop_shadow_visible="true" follows="left|top"
1206 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="40"
1207 mouse_opaque="true" name="label_parcel_info" v_pad="0" width="150">
1208 Parcel Information
1209 </text>
1210 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
1211 bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
1212 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="48"
1184 mouse_opaque="true" name="label_area_price" v_pad="0" width="150"> 1213 mouse_opaque="true" name="label_area_price" v_pad="0" width="150">
1185 Price: L$[PRICE] for [AREA] sq. m. 1214 Price: L$[PRICE] for [AREA] sq. m.
1186 </text> 1215 </text>
1187 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 1216 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
1188 bottom_delta="0" drop_shadow_visible="true" follows="left|top" 1217 bottom_delta="0" drop_shadow_visible="true" follows="left|top"
1189 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4" 1218 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="48"
1190 mouse_opaque="true" name="label_area" v_pad="0" width="128"> 1219 mouse_opaque="true" name="label_area" v_pad="0" width="150">
1191 Area: [AREA] sq. m. 1220 Area: [AREA] sq. m.
1192 </text> 1221 </text>
1193 <button bottom_delta="-38" follows="left|top" font="SansSerif" halign="center"
1194 height="20" label="Buy Land..." label_selected="Buy Land..." left="76"
1195 mouse_opaque="true" name="button buy land" scale_image="TRUE" width="102" />
1196 <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center" 1222 <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
1197 height="20" label="Abandon Land..." label_selected="Abandon Land..." 1223 height="20" label="About Land..." label_selected="About Land..." left="48"
1198 left="76" mouse_opaque="true" name="button abandon land" scale_image="TRUE" 1224 mouse_opaque="true" name="button about land" scale_image="TRUE" width="112" />
1199 width="102" /> 1225 <check_box bottom_delta="-24" control_name="ShowParcelOwners" follows="left|top"
1226 tool_tip="Colour parcels according to their status" font="SansSerifSmall"
1227 height="16" initial_value="false" label="Show Status" left="48"
1228 mouse_opaque="true" name="checkbox show owners" width="100" />
1229 <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
1230 height="18" label="?" label_selected="?" left_delta="94"
1231 mouse_opaque="true" name="button show owners help" width="18" />
1232 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
1233 bottom_delta="-56" drop_shadow_visible="true" follows="left|top"
1234 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="40"
1235 mouse_opaque="true" name="label_parcel_trans" v_pad="0" width="150">
1236 Land Transactions
1237 </text>
1200 <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center" 1238 <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
1201 height="20" label="Subdivide..." label_selected="Subdivide..." left="76" 1239 height="20" label="Buy Land..." label_selected="Buy Land..." left="48"
1202 mouse_opaque="true" name="button subdivide land" scale_image="TRUE" 1240 mouse_opaque="true" name="button buy land" scale_image="TRUE" width="112" />
1203 width="102" />
1204 <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center" 1241 <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
1205 height="20" label="Join..." label_selected="Join..." left="76" 1242 height="20" label="Abandon Land..." label_selected="Abandon Land..."
1206 mouse_opaque="true" name="button join land" scale_image="TRUE" width="102" /> 1243 left="48" mouse_opaque="true" name="button abandon land" scale_image="TRUE"
1207 <button bottom_delta="-40" follows="left|top" font="SansSerif" halign="center" 1244 width="112" />
1208 height="20" label="About Land..." label_selected="About Land..." left="76"
1209 mouse_opaque="true" name="button about land" scale_image="TRUE" width="102" />
1210 </panel> 1245 </panel>
1211 <string name="status_rotate"> 1246 <string name="status_rotate">
1212 Drag colored bands to rotate object 1247 Drag colored bands to rotate object