diff --git a/assets/icons/download.svg b/assets/icons/download.svg
index e6ca668..03716d3 100644
--- a/assets/icons/download.svg
+++ b/assets/icons/download.svg
@@ -1,54 +1,67 @@
+
+
+ id="defs21" />
+
+
+
+
+
+
+
+
+
+
diff --git a/assets/icons/export.svg b/assets/icons/export.svg
index f63e483..2344445 100644
--- a/assets/icons/export.svg
+++ b/assets/icons/export.svg
@@ -1 +1,66 @@
-
\ No newline at end of file
+
+
+
+
diff --git a/source/website/featureset.js b/source/website/featureset.js
index f70b5ac..1590268 100644
--- a/source/website/featureset.js
+++ b/source/website/featureset.js
@@ -1,4 +1,4 @@
export const FeatureSet =
{
- DownloadModel : false
+
};
diff --git a/source/website/openurldialog.js b/source/website/openurldialog.js
index 765f28a..ca5aa2c 100644
--- a/source/website/openurldialog.js
+++ b/source/website/openurldialog.js
@@ -6,7 +6,7 @@ export function ShowOpenUrlDialog (onOk)
{
let dialog = new ButtonDialog ();
let urlsTextArea = CreateDomElement ('textarea', 'ov_dialog_textarea');
- let contentDiv = dialog.Init ('Open Model from Url', [
+ let contentDiv = dialog.Init ('Open from url', [
{
name : 'Cancel',
subClass : 'outline',
diff --git a/source/website/website.js b/source/website/website.js
index 7fe2a36..996046f 100644
--- a/source/website/website.js
+++ b/source/website/website.js
@@ -23,7 +23,6 @@ import { CookieGetBoolVal, CookieSetBoolVal } from './cookiehandler.js';
import { MeasureTool } from './measuretool.js';
import { CloseAllDialogs } from './dialog.js';
import { EnumeratePlugins, PluginType } from './pluginregistry.js';
-import { FeatureSet } from './featureset.js';
import * as THREE from 'three';
@@ -533,10 +532,10 @@ export class Website
let importer = this.modelLoaderUI.GetImporter ();
- AddButton (this.toolbar, 'open', 'Open model from your device', [], () => {
+ AddButton (this.toolbar, 'open', 'Open from your device', [], () => {
this.OpenFileBrowserDialog ();
});
- AddButton (this.toolbar, 'open_url', 'Open model from a url', [], () => {
+ AddButton (this.toolbar, 'open_url', 'Open from url', [], () => {
ShowOpenUrlDialog ((urls) => {
if (urls.length > 0) {
this.hashHandler.SetModelFilesToHash (urls);
@@ -581,26 +580,25 @@ export class Website
});
this.measureTool.SetButton (measureToolButton);
AddSeparator (this.toolbar, ['only_full_width', 'only_on_model']);
- AddButton (this.toolbar, 'snapshot', 'Create snapshot', ['only_full_width', 'only_on_model'], () => {
- ShowSnapshotDialog (this.viewer);
+ AddButton (this.toolbar, 'download', 'Download', ['only_full_width', 'only_on_model'], () => {
+ HandleEvent ('model_downloaded', '');
+ let importer = this.modelLoaderUI.GetImporter ();
+ DownloadModel (importer);
});
- if (FeatureSet.DownloadModel) {
- AddButton (this.toolbar, 'download', 'Download model', ['only_full_width', 'only_on_model'], () => {
- HandleEvent ('model_downloaded', '');
- let importer = this.modelLoaderUI.GetImporter ();
- DownloadModel (importer);
- });
- }
- AddButton (this.toolbar, 'export', 'Export model', ['only_full_width', 'only_on_model'], () => {
+ AddButton (this.toolbar, 'export', 'Export', ['only_full_width', 'only_on_model'], () => {
ShowExportDialog (this.model, this.viewer, {
isMeshVisible : (meshInstanceId) => {
return this.navigator.IsMeshVisible (meshInstanceId);
}
});
});
- AddButton (this.toolbar, 'share', 'Share model', ['only_full_width', 'only_on_model'], () => {
+ AddButton (this.toolbar, 'share', 'Share', ['only_full_width', 'only_on_model'], () => {
ShowSharingDialog (importer.GetFileList (), this.settings, this.viewer);
});
+ AddSeparator (this.toolbar, ['only_full_width', 'only_on_model']);
+ AddButton (this.toolbar, 'snapshot', 'Create snapshot', ['only_full_width', 'only_on_model'], () => {
+ ShowSnapshotDialog (this.viewer);
+ });
EnumeratePlugins (PluginType.Toolbar, (plugin) => {
plugin.registerButtons ({
diff --git a/website/css/O3DVIcons/O3DVIcons.woff b/website/css/O3DVIcons/O3DVIcons.woff
index c97af57..ed02e9a 100644
Binary files a/website/css/O3DVIcons/O3DVIcons.woff and b/website/css/O3DVIcons/O3DVIcons.woff differ
diff --git a/website/css/icons.css b/website/css/icons.css
index 4689010..f5e5367 100644
--- a/website/css/icons.css
+++ b/website/css/icons.css
@@ -1,6 +1,6 @@
@font-face {
font-family: "O3DVIcons";
- src: url("O3DVIcons/O3DVIcons.woff?c0e5a84e0c3367514518abbacd6417d6") format("woff");
+ src: url("O3DVIcons/O3DVIcons.woff?5b9efabdc2c1ef6b3990e38a69a1fb39") format("woff");
}
i[class^="icon-"]:before, i[class*=" icon-"]:before {
diff --git a/website/info/css/O3DVIcons.woff b/website/info/css/O3DVIcons.woff
index c97af57..ed02e9a 100644
Binary files a/website/info/css/O3DVIcons.woff and b/website/info/css/O3DVIcons.woff differ
diff --git a/website/info/css/icons.css b/website/info/css/icons.css
index 10d2cea..de1454a 100644
--- a/website/info/css/icons.css
+++ b/website/info/css/icons.css
@@ -1,6 +1,6 @@
@font-face {
font-family: "O3DVIcons";
- src: url("./O3DVIcons.woff?c0e5a84e0c3367514518abbacd6417d6") format("woff");
+ src: url("./O3DVIcons.woff?5b9efabdc2c1ef6b3990e38a69a1fb39") format("woff");
}
i[class^="icon-"]:before, i[class*=" icon-"]:before {