Fixed presentation editing with Google Drive

Author: car031

logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/util/Util.java

@@ -74,6 +74,8 @@ public abstract class Util {
 
 	private static final Set<String> spreadsheetExts = new HashSet<>(Arrays.asList(".xls", ".xlsm", ".xlsx", ".ods"));
 
+	private static final Set<String> presentationExts = new HashSet<>(Arrays.asList(".ppt", ".pptx", ".pptm", ".odp"));
+
 	private static final Set<String> imageExts = new HashSet<>(
 			Arrays.asList(".gif", ".jpg", ".jpeg", ".bmp", ".tif", ".tiff", ".png", ".jfif", ".webp"));
 
@@ -301,8 +303,8 @@ public static String fileNameIcon(String iconName, int size) {
 				long shortcutSize = Math.round(size * 0.625D);
 				long shortcutMarginTop = Math.round(size * 0.4375D);
 				long shortcutMarginLeft = Math.round(size * 0.6D);
-				sb.append(IMG_SRC + fileIconUrl("shortcut.svg") + WIDTH + shortcutSize + PX_HEIGHT
-						+ shortcutSize + "px' style='position:absolute; z-index:1; margin-top: " + shortcutMarginTop
+				sb.append(IMG_SRC + fileIconUrl("shortcut.svg") + WIDTH + shortcutSize + PX_HEIGHT + shortcutSize
+						+ "px' style='position:absolute; z-index:1; margin-top: " + shortcutMarginTop
 						+ "px; margin-left:" + shortcutMarginLeft + "px'/>");
 			}
 
@@ -318,8 +320,8 @@ public static String fileNameIcon(String iconName, int size) {
 			iconName = baseIconName;
 		}
 
-		sb.append("<img class='filenameIcon' src='" + fileIconUrl(iconName + ".svg") + WIDTH + size
-				+ PX_HEIGHT + size + "px' />");
+		sb.append("<img class='filenameIcon' src='" + fileIconUrl(iconName + ".svg") + WIDTH + size + PX_HEIGHT + size
+				+ "px' />");
 
 		sb.append(END_DIV);
 		return sb.toString();
@@ -452,6 +454,10 @@ public static boolean isSpreadsheetFile(String fileName) {
 		return spreadsheetExts.stream().anyMatch(ext -> fileName.toLowerCase().endsWith(ext));
 	}
 
+	public static boolean isPresentationFile(String fileName) {
+		return presentationExts.stream().anyMatch(ext -> fileName.toLowerCase().endsWith(ext));
+	}
+
 	public static boolean isDICOMFile(String fileName) {
 		return dicomExts.stream().anyMatch(ext -> fileName.toLowerCase().endsWith(ext));
 	}

logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/google/drive/DriveEditor.java

@@ -97,6 +97,9 @@ private void reloadBody() {
 		if (Util.isSpreadsheetFile(document.getFileName()))
 			url = "https://docs.google.com/spreadsheets/d/" + document.getExtResId() + "/edit?hl="
 					+ Session.get().getUser().getLanguage();
+		if (Util.isPresentationFile(document.getFileName()))
+			url = "https://docs.google.com/presentation/d/" + document.getExtResId() + "/edit?hl="
+					+ Session.get().getUser().getLanguage();
 
 		String iframe = "<iframe src='" + url + "' style='border: 0px solid white; width:" + (getWidth() - 18)
 				+ "px; height:" + (getHeight() - 68) + "px' scrolling='no'></iframe>";

logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/google/drive/DriveMenuItem.java

@@ -114,8 +114,7 @@ private MenuItem prepareGDriveEditMenuItem(GUIFolder folder, final GUIDocument d
 				checkoutAndUploadToGDrive(document);
 			} else {
 				if (document.getStatus() == 1 && document.getExtResId() != null) {
-					DriveEditor popup = new DriveEditor(document);
-					popup.show();
+					new DriveEditor(document).show();
 				} else {
 					SC.warn(I18N.message("event.locked"));
 				}