Revision 7740

View differences:

trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/preferencespage/ViewPage.java
43 43
*
44 44
* $Id$
45 45
* $Log$
46
* Revision 1.14  2006-10-02 13:52:34  jaume
46
* Revision 1.15  2006-10-02 15:30:29  jaume
47
* *** empty log message ***
48
*
49
* Revision 1.14  2006/10/02 13:52:34  jaume
47 50
* organize impots
48 51
*
49 52
* Revision 1.13  2006/10/02 13:38:23  jaume
......
167 170
	private static final String ADD_NEW_LAYERS_IN_INVISIBLE_MODE_KEY_NAME = "NewLayersInInvisibleMode";
168 171
	private static final String KEEP_SCALE_ON_RESIZING_KEY_NAME = "KeepScaleOnResizing";
169 172
	private static final String DEFAULT_SELECTION_COLOR_KEY_NAME = "DefaultSelectionColor";
173
	private static final String DEFAULT_VIEW_BACK_COLOR_KEY_NAME = "DefaultViewBackColor";
174
	/*
175
	 * Locator's background color, for when we let it be possible
176
	 * private static final String DEFAULT_MAP_OVERVIEW_BACK_COLOR_KEY_NAME = "DefaultMapOverViewBackColor";
177
	 */
170 178
	private static final double DEFAULT_ZOOM_IN_FACTOR = 2.0;
171 179
	private static final double DEFAULT_ZOOM_OUT_FACTOR = 0.5;
172
	private static final Color FACTORY_DEFAULT_SELECTION_COLOR = new Color(255, 255, 0);
180
	private static final Color FACTORY_DEFAULT_SELECTION_COLOR = Color.YELLOW;
181
	private static final Color FACTORY_DEFAULT_VIEW_BACK_COLOR = Color.WHITE;
182
	/*
183
	 * Locator's background color, for when we let it be possible
184
	 * private static final Color FACTORY_DEFAULT_MAP_OVERVIEW_BACK_COLOR = Color.WHITE;
185
	 */
173 186

  
174

  
175 187
	private JTextField txtZoomInFactor;
176 188
	private JTextField txtZoomOutFactor;
177 189
	protected String id;
......
182 194
	private JCheckBox chkInvisibleNewLayers;
183 195
	private JCheckBox chkKeepScaleOnResizing;
184 196
	private ColorChooserPanel jccDefaultSelectionColor;
185
	private ColorChooserPanel jccDefaultBackgroundColor;
197
	private ColorChooserPanel jccDefaultViewBackColor;
198
	private ColorChooserPanel jccDefaultMapOverViewBackColor;
186 199

  
187 200
	{
188 201
		Enumeration keys = UIManager.getDefaults().keys();
......
253 266
		// just a separator
254 267
		addComponent(new JLabel(" "));
255 268

  
256
		// default background color chooser
257
		jccDefaultBackgroundColor = new ColorChooserPanel();
258
		addComponent(PluginServices.getText(this, "options.view.default_background_color"), jccDefaultBackgroundColor);
269
		// default back color chooser
270
		jccDefaultViewBackColor = new ColorChooserPanel();
271
		addComponent(PluginServices.getText(this, "options.view.default_view_back_color"), jccDefaultViewBackColor);
259 272

  
273
		/*
274
		 * Locator's background color, for when we let it be possible
275
		 * // default back color chooser
276
		 * jccDefaultMapOverViewBackColor = new ColorChooserPanel();
277
		 * addComponent(PluginServices.getText(this, "options.view.default_map_overview_back_color"), jccDefaultMapOverViewBackColor);
278
		 */
279

  
260 280
		// default selection color chooser
261 281
		jccDefaultSelectionColor = new ColorChooserPanel();
262 282
		addComponent(PluginServices.getText(this, "options.view.default_selection_color"), jccDefaultSelectionColor);
......
309 329
		}
310 330
		MapContext.ZOOMOUTFACTOR = Double.parseDouble(txtZoomOutFactor.getText());;
311 331

  
312
		// Default selection color
313
		jccDefaultBackgroundColor.setColor(Project.getDefaultColor());
314
		jccDefaultBackgroundColor.setAlpha(255);
332
		// Default back color
333
		jccDefaultViewBackColor.setColor(Project.getDefaultViewBackColor());
334
		jccDefaultViewBackColor.setAlpha(255);
335
		/*
336
		 * Locator's background color, for when we let it be possible
337
		 * // Default map overview back color
338
		 * jccDefaultMapOverViewBackColor.setColor(Project.getDefaultMapOverViewBackColor());
339
		 * jccDefaultMapOverViewBackColor.setAlpha(255);
340
		 */
315 341

  
316 342
		// Default selection color
317
		jccDefaultSelectionColor.setColor(Project.getDefaultColor());
343
		jccDefaultSelectionColor.setColor(Project.getDefaultSelectionColor());
318 344
		jccDefaultSelectionColor.setAlpha(255);
319 345

  
320 346
	}
......
336 362
		double zif;
337 363
		double zof;
338 364
		boolean invisibleNewLayers, keepScaleOnResize;
339
		Color color;
365
		Color selectionColor, viewBackColor;
366
		/*
367
		 * Locator's background color, for when we let it be possible
368
		 * Color mapOverViewBackColor;
369
		 */
370

  
340 371
		try {
341 372
			zif=Double.parseDouble(txtZoomInFactor.getText());
342 373
			zof=Double.parseDouble(txtZoomOutFactor.getText());
343
			color = jccDefaultSelectionColor.getColor();
374

  
344 375
			Project.setDefaultProjection( CRSFactory.getCRS(projName));
345
			Project.setDefaultSelectionColor( color );
376

  
377
			selectionColor = jccDefaultSelectionColor.getColor();
378
			Project.setDefaultSelectionColor( selectionColor );
379

  
380
			viewBackColor = jccDefaultViewBackColor.getColor();
381
			Project.setDefaultViewBackColor( viewBackColor );
382
			/*
383
			 * Locator's background color, for when we let it be possible
384
			 * mapOverViewBackColor = jccDefaultMapOverViewBackColor.getColor();
385
			 * Project.setDefaultMapOverViewBackColor( mapOverViewBackColor );
386
			 */
387

  
346 388
			invisibleNewLayers = chkInvisibleNewLayers.isSelected();
347 389
			keepScaleOnResize = chkKeepScaleOnResizing.isSelected();
348 390
		} catch (Exception e) {
......
359 401
		xml.putProperty(ZOOM_OUT_FACTOR_KEY_NAME, zof);
360 402
		xml.putProperty(ADD_NEW_LAYERS_IN_INVISIBLE_MODE_KEY_NAME, invisibleNewLayers);
361 403
		xml.putProperty(KEEP_SCALE_ON_RESIZING_KEY_NAME, keepScaleOnResize);
362
		xml.putProperty(DEFAULT_SELECTION_COLOR_KEY_NAME, StringUtilities.color2String(color));
404
		xml.putProperty(DEFAULT_VIEW_BACK_COLOR_KEY_NAME, StringUtilities.color2String(viewBackColor));
405
		/*
406
		 * Locator's background color, for when we let it be possible
407
		 * xml.putProperty(DEFAULT_MAP_OVERVIEW_BACK_COLOR_KEY_NAME, StringUtilities.color2String(mapOverViewBackColor));
408
		 */
409
		xml.putProperty(DEFAULT_SELECTION_COLOR_KEY_NAME, StringUtilities.color2String(selectionColor));
363 410
	}
364 411

  
365 412

  
......
370 417
		chkInvisibleNewLayers.setSelected(false);
371 418
		chkKeepScaleOnResizing.setSelected(false);
372 419
		jccDefaultSelectionColor.setColor(FACTORY_DEFAULT_SELECTION_COLOR);
373

  
420
		/*
421
		 * Locator's background color, for when we let it be possible
422
		 * jccDefaultViewBackColor.setColor(FACTORY_DEFAULT_VIEW_BACK_COLOR);
423
		 */
374 424
	}
375 425

  
376 426
	public ImageIcon getIcon() {

Also available in: Unified diff