[SCM] GeoGebra: Dynamic mathematics software for education branch, patch/applet_export, updated. upstream/3.2.47.0+dfsg1-164-gb779191

[Giovanni Mascellani]

The following commit has been merged in the patch/applet_export branch:
commit b7791915d46a21811b688ab2b2d50670f2cda0b7
Merge: 9c883e1f681db445aaea27ff9fd922a2b27e6562 4896c42db17a526df4a8fa382826c3f16231acab
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Wed Jan 11 12:06:47 2012 +0100

    Merge commit 'refs/top-bases/patch/applet_export' into patch/applet_export

diff --combined geogebra/export/WorksheetExportDialog.java
index bb7a89c,ba4ba36..37d3c5f
--- a/geogebra/export/WorksheetExportDialog.java
+++ b/geogebra/export/WorksheetExportDialog.java
@@@ -104,10 -104,10 +104,10 @@@ public class WorksheetExportDialog exte
  	private Application app;
  	private Kernel kernel;
  	private InputPanel textAbove, textBelow, textAboveUpload, textBelowUpload;
- 	private JCheckBox cbShowFrame, cbEnableRightClick, cbEnableLabelDrags,
+ 	private JCheckBox cbEnableRightClick, cbEnableLabelDrags,
  			cbShowResetIcon, cbShowMenuBar, cbSavePrint, cbShowToolBar,
  			cbShowToolBarHelp, cbShowInputField, cbUseBrowserForJavaScript,
- 			cbAllowRescaling, cbRemoveLinebreaks, cbOpenButton, cbOfflineJars,
+ 			cbAllowRescaling, cbRemoveLinebreaks, cbOfflineJars,
  			cbIncludeHTML5;
  	private JComboBox cbFileType, cbAllWorksheets;
  	private JButton exportButton, uploadButton, helpButton;
@@@ -348,12 -348,12 +348,12 @@@
  			cbShowResetIcon.setSelected(Boolean.valueOf(
  					ggbPref.loadPreference(GeoGebraPreferences.EXPORT_WS_RESET_ICON,
  							"false")).booleanValue());
- 			cbShowFrame.setSelected(Boolean.valueOf(
- 					ggbPref.loadPreference(GeoGebraPreferences.EXPORT_WS_FRAME_POSSIBLE,
- 							"false")).booleanValue());
- 			cbOpenButton.setSelected(Boolean.valueOf(
- 					ggbPref.loadPreference(GeoGebraPreferences.EXPORT_WS_BUTTON_TO_OPEN,
- 							"false")).booleanValue());
+ 			//cbShowFrame.setSelected(Boolean.valueOf(
+ 			//		ggbPref.loadPreference(GeoGebraPreferences.EXPORT_WS_FRAME_POSSIBLE,
+ 			//				"false")).booleanValue());
+ 			//cbOpenButton.setSelected(Boolean.valueOf(
+ 			//		ggbPref.loadPreference(GeoGebraPreferences.EXPORT_WS_BUTTON_TO_OPEN,
+ 			//				"false")).booleanValue());
  
  			cbShowMenuBar.setSelected(Boolean.valueOf(
  					ggbPref.loadPreference(GeoGebraPreferences.EXPORT_WS_SHOW_MENUBAR,
@@@ -426,8 -426,8 +426,8 @@@
  				Boolean.toString(cbEnableLabelDrags.isSelected()));
  		ggbPref.savePreference(GeoGebraPreferences.EXPORT_WS_RESET_ICON,
  				Boolean.toString(cbShowResetIcon.isSelected()));
- 		ggbPref.savePreference(GeoGebraPreferences.EXPORT_WS_FRAME_POSSIBLE,
- 				Boolean.toString(cbShowFrame.isSelected()));
+ 		//ggbPref.savePreference(GeoGebraPreferences.EXPORT_WS_FRAME_POSSIBLE,
+ 		//		Boolean.toString(cbShowFrame.isSelected()));
  		ggbPref.savePreference(GeoGebraPreferences.EXPORT_WS_SHOW_MENUBAR,
  				Boolean.toString(cbShowMenuBar.isSelected()));
  		ggbPref.savePreference(GeoGebraPreferences.EXPORT_WS_SHOW_TOOLBAR,
@@@ -449,8 -449,8 +449,8 @@@
  				Boolean.toString(cbAllowRescaling.isSelected()));
  		ggbPref.savePreference(GeoGebraPreferences.EXPORT_WS_REMOVE_LINEBREAKS,
  				Boolean.toString(cbRemoveLinebreaks.isSelected()));
- 		ggbPref.savePreference(GeoGebraPreferences.EXPORT_WS_BUTTON_TO_OPEN,
- 				Boolean.toString(cbOpenButton.isSelected()));
+ 		//ggbPref.savePreference(GeoGebraPreferences.EXPORT_WS_BUTTON_TO_OPEN,
+ 		//		Boolean.toString(cbOpenButton.isSelected()));
  		ggbPref.savePreference(GeoGebraPreferences.EXPORT_WS_OFFLINE_ARCHIVE,
  				Boolean.toString(cbOfflineJars.isSelected()));
  	}
@@@ -577,12 -577,12 +577,12 @@@
  		funcPanel.add(cbShowResetIcon);
  
  		// framPossible
- 		cbShowFrame = new JCheckBox(app.getPlain("DoubleClickToOpen"));
- 		funcPanel.add(cbShowFrame);
+ 		//cbShowFrame = new JCheckBox(app.getPlain("DoubleClickToOpen"));
+ 		//funcPanel.add(cbShowFrame);
  
  		// button to open applet
- 		cbOpenButton = new JCheckBox(app.getPlain("OpenButton"));
- 		funcPanel.add(cbOpenButton);
+ 		//cbOpenButton = new JCheckBox(app.getPlain("OpenButton"));
+ 		//funcPanel.add(cbOpenButton);
  
  		funcPanel.add(Box.createVerticalGlue());
  
@@@ -814,11 -814,12 +814,12 @@@
  		case TYPE_MOODLE:
  			int appletWidth,
  			appletHeight;
- 			if (cbOpenButton.isSelected()) { // change width and height for open
- 																				// button
- 				appletWidth = BUTTON_WIDTH;
- 				appletHeight = BUTTON_HEIGHT;
- 			} else {
+ 			//if (cbOpenButton.isSelected()) { // change width and height for open
+ 			//																	// button
+ 			//	appletWidth = BUTTON_WIDTH;
+ 			//	appletHeight = BUTTON_HEIGHT;
+ 			//} else
+ 			{
  				appletWidth = sizePanel.getSelectedWidth();
  				appletHeight = sizePanel.getSelectedHeight();
  			}
@@@ -1109,15 -1110,10 +1110,15 @@@
  	 * unsigned applet is needed for the options set.
  	 */
  	private URL getAppletCodebase() {
 -		URL codebase = Application.getCodeBase();
 +		URL codebase = null;
 +		try {
 +			codebase = new URL("http://www.geogebra.org/webstart/");
 +		} catch (Exception e) {
 +			e.printStackTrace();
 +		}
  		if (!cbSavePrint.isSelected()) {
  			try {
 -				codebase = new URL(Application.getCodeBase(), "unsigned/");
 +				codebase = new URL(codebase, "unsigned/");
  			} catch (Exception e) {
  				e.printStackTrace();
  			}
@@@ -1394,10 -1390,11 +1395,11 @@@
  
  		// applet width
  		int appletWidth, appletHeight;
- 		if (cbOpenButton.isSelected()) { // change width and height for open button
- 			appletWidth = BUTTON_WIDTH;
- 			appletHeight = BUTTON_HEIGHT;
- 		} else {
+ 		//if (cbOpenButton.isSelected()) { // change width and height for open button
+ 		//	appletWidth = BUTTON_WIDTH;
+ 		//	appletHeight = BUTTON_HEIGHT;
+ 		//} else
+ 		{
  			appletWidth = sizePanel.getSelectedWidth();
  			appletHeight = sizePanel.getSelectedHeight();
  		}
@@@ -1661,13 -1658,13 +1663,13 @@@
  					"\t<param name=\"centerimage\" value=\"true\" />");
  		}
  
- 		if (!cbOpenButton.isSelected()) {
+ 		//if (!cbOpenButton.isSelected()) {
  			appendAllAppletParameters(sb, TYPE_HTMLFILE);
- 		} else {// button type
- 			appendWithLineBreak(sb, "\t<param name=\"type\" value=\"button\" />");
- 			// white background
- 			appendWithLineBreak(sb, "\t<param name=\"bgcolor\" value=\"#FFFFFF\" />");
- 		}
+ 		//} else {// button type
+ 		//	appendWithLineBreak(sb, "\t<param name=\"type\" value=\"button\" />");
+ 		//	// white background
+ 		//	appendWithLineBreak(sb, "\t<param name=\"bgcolor\" value=\"#FFFFFF\" />");
+ 		//}
  
  		// problem with Moodle 1.9.5 mangling this
  		if (includeNoJavaMessage)
@@@ -1719,7 -1716,7 +1721,7 @@@
  	private void appendGgbAppletParameters(StringBuilder sb, int type) {
  
  		// framePossible (double click opens GeoGebra window)
- 		appletParam(sb, "framePossible", cbShowFrame.isSelected(), type);
+ 		// appletParam(sb, "framePossible", cbShowFrame.isSelected(), type);
  
  		// showResetIcon
  		appletParam(sb, "showResetIcon", cbShowResetIcon.isSelected(), type);

-- 
GeoGebra: Dynamic mathematics software for education