mirror of
https://github.com/overte-org/overte.git
synced 2025-04-14 15:47:02 +02:00
Merge pull request #8431 from imgntn/assetbutton
Open Asset Browser with Button from Edit.js Toolbar
This commit is contained in:
Brad Davis
GitHub
commit
5b09748c00
7 changed files with 199 additions and 4 deletions
interface/src
scripts/system
|
|
@ -4890,7 +4890,7 @@ bool Application::acceptURL(const QString& urlString, bool defaultUpload) {
|
|||
}
|
||||
|
||||
if (defaultUpload) {
|
||||
toggleAssetServerWidget(urlString);
|
||||
showAssetServerWidget(urlString);
|
||||
}
|
||||
return defaultUpload;
|
||||
}
|
||||
|
|
@ -5078,7 +5078,7 @@ void Application::toggleRunningScriptsWidget() const {
|
|||
//}
|
||||
}
|
||||
|
||||
void Application::toggleAssetServerWidget(QString filePath) {
|
||||
void Application::showAssetServerWidget(QString filePath) {
|
||||
if (!DependencyManager::get<NodeList>()->getThisNodeCanWriteAssets()) {
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -277,7 +277,7 @@ public slots:
|
|||
Q_INVOKABLE void loadScriptURLDialog() const;
|
||||
void toggleLogDialog();
|
||||
void toggleRunningScriptsWidget() const;
|
||||
void toggleAssetServerWidget(QString filePath = "");
|
||||
Q_INVOKABLE void showAssetServerWidget(QString filePath = "");
|
||||
|
||||
void handleLocalServerConnection() const;
|
||||
void readArgumentsFromLocalSocket() const;
|
||||
|
|
|
|||
|
|
@ -134,7 +134,7 @@ Menu::Menu() {
|
|||
// Edit > My Asset Server
|
||||
auto assetServerAction = addActionToQMenuAndActionHash(editMenu, MenuOption::AssetServer,
|
||||
Qt::CTRL | Qt::SHIFT | Qt::Key_A,
|
||||
qApp, SLOT(toggleAssetServerWidget()));
|
||||
qApp, SLOT(showAssetServerWidget()));
|
||||
auto nodeList = DependencyManager::get<NodeList>();
|
||||
QObject::connect(nodeList.data(), &NodeList::canWriteAssetsChanged, assetServerAction, &QAction::setEnabled);
|
||||
assetServerAction->setEnabled(nodeList->getThisNodeCanWriteAssets());
|
||||
|
|
|
|||
|
|
@ -179,6 +179,10 @@ QScriptValue WindowScriptingInterface::save(const QString& title, const QString&
|
|||
return result.isEmpty() ? QScriptValue::NullValue : QScriptValue(result);
|
||||
}
|
||||
|
||||
void WindowScriptingInterface::showAssetServer(const QString& upload) {
|
||||
QMetaObject::invokeMethod(qApp, "showAssetServerWidget", Qt::QueuedConnection, Q_ARG(QString, upload));
|
||||
}
|
||||
|
||||
int WindowScriptingInterface::getInnerWidth() {
|
||||
return qApp->getWindow()->geometry().width();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -53,6 +53,7 @@ public slots:
|
|||
CustomPromptResult customPrompt(const QVariant& config);
|
||||
QScriptValue browse(const QString& title = "", const QString& directory = "", const QString& nameFilter = "");
|
||||
QScriptValue save(const QString& title = "", const QString& directory = "", const QString& nameFilter = "");
|
||||
void showAssetServer(const QString& upload = "");
|
||||
void copyToClipboard(const QString& text);
|
||||
|
||||
signals:
|
||||
|
|
|
|||
186
scripts/system/assets/images/tools/assets-01.svg
Normal file
186
scripts/system/assets/images/tools/assets-01.svg
Normal file
|
|
@ -0,0 +1,186 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 19.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
viewBox="0 0 50 150" style="enable-background:new 0 0 50 150;" xml:space="preserve">
|
||||
<style type="text/css">
|
||||
.st0{opacity:0.9;}
|
||||
.st1{fill:#FFFFFF;}
|
||||
.st2{fill:#1E1E1E;}
|
||||
.st3{fill:#EAEAEA;}
|
||||
.st4{opacity:0.49;}
|
||||
</style>
|
||||
<g>
|
||||
<g class="st0">
|
||||
<path class="st1" d="M50,46.3c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V46.3z"/>
|
||||
</g>
|
||||
</g>
|
||||
<g>
|
||||
<g class="st0">
|
||||
<path class="st2" d="M50,96.3c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V96.3z"/>
|
||||
</g>
|
||||
</g>
|
||||
<g>
|
||||
<path class="st3" d="M7.84,92.63l2.52-6.39h1.01l2.51,6.39h-1.31l-0.58-1.59H9.74l-0.58,1.59H7.84z M10.86,87.58l-0.92,2.58h1.81
|
||||
L10.86,87.58z"/>
|
||||
<path class="st3" d="M18.53,87.91c-0.04-0.04-0.12-0.1-0.23-0.17c-0.11-0.07-0.25-0.14-0.41-0.21c-0.16-0.07-0.33-0.13-0.52-0.18
|
||||
c-0.19-0.05-0.38-0.07-0.57-0.07c-0.34,0-0.6,0.06-0.76,0.19c-0.17,0.13-0.25,0.3-0.25,0.53c0,0.13,0.03,0.24,0.09,0.33
|
||||
c0.06,0.09,0.15,0.16,0.27,0.23s0.27,0.13,0.45,0.18c0.18,0.05,0.39,0.11,0.63,0.17c0.31,0.08,0.6,0.17,0.85,0.27
|
||||
c0.25,0.1,0.47,0.22,0.65,0.36c0.18,0.14,0.31,0.32,0.41,0.52c0.1,0.2,0.14,0.45,0.14,0.74c0,0.34-0.06,0.63-0.19,0.88
|
||||
c-0.13,0.24-0.3,0.44-0.52,0.59s-0.47,0.26-0.76,0.33c-0.29,0.07-0.59,0.1-0.9,0.1c-0.48,0-0.95-0.07-1.42-0.22
|
||||
s-0.89-0.35-1.26-0.61l0.55-1.07c0.05,0.05,0.15,0.12,0.29,0.21c0.14,0.09,0.31,0.17,0.5,0.26s0.41,0.16,0.64,0.22
|
||||
c0.23,0.06,0.47,0.09,0.72,0.09c0.68,0,1.03-0.22,1.03-0.66c0-0.14-0.04-0.26-0.12-0.36c-0.08-0.1-0.19-0.18-0.33-0.25
|
||||
c-0.14-0.07-0.32-0.14-0.52-0.2c-0.2-0.06-0.43-0.12-0.68-0.19c-0.31-0.08-0.57-0.18-0.8-0.27s-0.41-0.21-0.56-0.35
|
||||
c-0.15-0.13-0.26-0.29-0.34-0.47c-0.07-0.18-0.11-0.39-0.11-0.64c0-0.32,0.06-0.61,0.18-0.86c0.12-0.25,0.29-0.46,0.5-0.63
|
||||
s0.46-0.3,0.74-0.38c0.28-0.09,0.58-0.13,0.91-0.13c0.45,0,0.86,0.07,1.24,0.21c0.38,0.14,0.71,0.31,0.99,0.5L18.53,87.91z"/>
|
||||
<path class="st3" d="M24.29,87.91c-0.04-0.04-0.12-0.1-0.23-0.17c-0.11-0.07-0.25-0.14-0.41-0.21c-0.16-0.07-0.33-0.13-0.52-0.18
|
||||
c-0.19-0.05-0.38-0.07-0.57-0.07c-0.34,0-0.6,0.06-0.76,0.19c-0.17,0.13-0.25,0.3-0.25,0.53c0,0.13,0.03,0.24,0.09,0.33
|
||||
c0.06,0.09,0.15,0.16,0.27,0.23s0.27,0.13,0.45,0.18c0.18,0.05,0.39,0.11,0.63,0.17c0.31,0.08,0.6,0.17,0.85,0.27
|
||||
c0.25,0.1,0.47,0.22,0.65,0.36c0.18,0.14,0.31,0.32,0.41,0.52c0.1,0.2,0.14,0.45,0.14,0.74c0,0.34-0.06,0.63-0.19,0.88
|
||||
c-0.13,0.24-0.3,0.44-0.52,0.59s-0.47,0.26-0.76,0.33c-0.29,0.07-0.59,0.1-0.9,0.1c-0.48,0-0.95-0.07-1.42-0.22
|
||||
s-0.89-0.35-1.26-0.61l0.55-1.07c0.05,0.05,0.15,0.12,0.29,0.21c0.14,0.09,0.31,0.17,0.5,0.26s0.41,0.16,0.64,0.22
|
||||
c0.23,0.06,0.47,0.09,0.72,0.09c0.68,0,1.03-0.22,1.03-0.66c0-0.14-0.04-0.26-0.12-0.36c-0.08-0.1-0.19-0.18-0.33-0.25
|
||||
c-0.14-0.07-0.32-0.14-0.52-0.2c-0.2-0.06-0.43-0.12-0.68-0.19c-0.31-0.08-0.57-0.18-0.8-0.27s-0.41-0.21-0.56-0.35
|
||||
c-0.15-0.13-0.26-0.29-0.34-0.47c-0.07-0.18-0.11-0.39-0.11-0.64c0-0.32,0.06-0.61,0.18-0.86c0.12-0.25,0.29-0.46,0.5-0.63
|
||||
s0.46-0.3,0.74-0.38c0.28-0.09,0.58-0.13,0.91-0.13c0.45,0,0.86,0.07,1.24,0.21c0.38,0.14,0.71,0.31,0.99,0.5L24.29,87.91z"/>
|
||||
<path class="st3" d="M30.67,91.54v1.09h-4.44v-6.39h4.36v1.09h-3.11v1.54h2.69v1.01h-2.69v1.67H30.67z"/>
|
||||
<path class="st3" d="M36.67,87.33h-2.03v5.3H33.4v-5.3h-2.04v-1.09h5.32V87.33z"/>
|
||||
<path class="st3" d="M41.45,87.91c-0.04-0.04-0.12-0.1-0.23-0.17c-0.11-0.07-0.25-0.14-0.41-0.21c-0.16-0.07-0.33-0.13-0.52-0.18
|
||||
c-0.19-0.05-0.38-0.07-0.57-0.07c-0.34,0-0.6,0.06-0.76,0.19c-0.17,0.13-0.25,0.3-0.25,0.53c0,0.13,0.03,0.24,0.09,0.33
|
||||
c0.06,0.09,0.15,0.16,0.27,0.23s0.27,0.13,0.45,0.18c0.18,0.05,0.39,0.11,0.63,0.17c0.31,0.08,0.6,0.17,0.85,0.27
|
||||
c0.25,0.1,0.47,0.22,0.65,0.36c0.18,0.14,0.31,0.32,0.41,0.52c0.1,0.2,0.14,0.45,0.14,0.74c0,0.34-0.06,0.63-0.19,0.88
|
||||
c-0.13,0.24-0.3,0.44-0.52,0.59s-0.47,0.26-0.76,0.33c-0.29,0.07-0.59,0.1-0.9,0.1c-0.48,0-0.95-0.07-1.42-0.22
|
||||
s-0.89-0.35-1.26-0.61l0.55-1.07c0.05,0.05,0.15,0.12,0.29,0.21c0.14,0.09,0.31,0.17,0.5,0.26s0.41,0.16,0.64,0.22
|
||||
c0.23,0.06,0.47,0.09,0.72,0.09c0.68,0,1.03-0.22,1.03-0.66c0-0.14-0.04-0.26-0.12-0.36c-0.08-0.1-0.19-0.18-0.33-0.25
|
||||
c-0.14-0.07-0.32-0.14-0.52-0.2c-0.2-0.06-0.43-0.12-0.68-0.19c-0.31-0.08-0.57-0.18-0.8-0.27s-0.41-0.21-0.56-0.35
|
||||
c-0.15-0.13-0.26-0.29-0.34-0.47c-0.07-0.18-0.11-0.39-0.11-0.64c0-0.32,0.06-0.61,0.18-0.86c0.12-0.25,0.29-0.46,0.5-0.63
|
||||
s0.46-0.3,0.74-0.38c0.28-0.09,0.58-0.13,0.91-0.13c0.45,0,0.86,0.07,1.24,0.21c0.38,0.14,0.71,0.31,0.99,0.5L41.45,87.91z"/>
|
||||
</g>
|
||||
<g>
|
||||
<path class="st3" d="M30.54,67.32h-9.3c-0.48,0-0.88-0.39-0.88-0.88s0.39-0.88,0.88-0.88h9.3c0.48,0,0.88,0.39,0.88,0.88
|
||||
S31.02,67.32,30.54,67.32z"/>
|
||||
<path class="st3" d="M17.93,67.32L17.93,67.32c-0.49,0-0.88-0.39-0.88-0.88s0.39-0.88,0.88-0.88c0.48,0,0.88,0.39,0.88,0.88
|
||||
S18.42,67.32,17.93,67.32z"/>
|
||||
<path class="st3" d="M30.54,71.53h-9.3c-0.48,0-0.88-0.39-0.88-0.88s0.39-0.88,0.88-0.88h9.3c0.48,0,0.88,0.39,0.88,0.88
|
||||
S31.02,71.53,30.54,71.53z"/>
|
||||
<path class="st3" d="M17.93,71.53L17.93,71.53c-0.49,0-0.88-0.39-0.88-0.88s0.39-0.88,0.88-0.88c0.48,0,0.88,0.39,0.88,0.88
|
||||
S18.42,71.53,17.93,71.53z"/>
|
||||
<path class="st3" d="M30.54,75.73h-9.3c-0.48,0-0.88-0.39-0.88-0.88s0.39-0.88,0.88-0.88h9.3c0.48,0,0.88,0.39,0.88,0.88
|
||||
S31.02,75.73,30.54,75.73z"/>
|
||||
<path class="st3" d="M17.93,75.73L17.93,75.73c-0.49,0-0.88-0.39-0.88-0.88s0.39-0.88,0.88-0.88c0.48,0,0.88,0.39,0.88,0.88
|
||||
S18.42,75.73,17.93,75.73z"/>
|
||||
<path class="st3" d="M32.21,80.42H16.85c-2.15,0-3.89-1.75-3.89-3.89V65.16c0-2.15,1.75-3.89,3.89-3.89h15.35
|
||||
c2.15,0,3.89,1.75,3.89,3.89v11.36C36.1,78.68,34.35,80.42,32.21,80.42z M16.85,63.02c-1.18,0-2.14,0.96-2.14,2.14v11.36
|
||||
c0,1.18,0.96,2.14,2.14,2.14h15.35c1.18,0,2.14-0.96,2.14-2.14V65.16c0-1.18-0.96-2.14-2.14-2.14H16.85z"/>
|
||||
</g>
|
||||
<g class="st4">
|
||||
<g class="st0">
|
||||
<path class="st2" d="M50,146.3c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V146.3z"/>
|
||||
</g>
|
||||
</g>
|
||||
<g>
|
||||
<path class="st3" d="M7.84,142.63l2.52-6.39h1.01l2.51,6.39h-1.31l-0.58-1.59H9.74l-0.58,1.59H7.84z M10.86,137.58l-0.92,2.58h1.81
|
||||
L10.86,137.58z"/>
|
||||
<path class="st3" d="M18.53,137.91c-0.04-0.04-0.12-0.1-0.23-0.17c-0.11-0.07-0.25-0.14-0.41-0.21c-0.16-0.07-0.33-0.13-0.52-0.18
|
||||
c-0.19-0.05-0.38-0.07-0.57-0.07c-0.34,0-0.6,0.06-0.76,0.19c-0.17,0.13-0.25,0.3-0.25,0.53c0,0.13,0.03,0.24,0.09,0.33
|
||||
c0.06,0.09,0.15,0.16,0.27,0.23s0.27,0.13,0.45,0.18c0.18,0.05,0.39,0.11,0.63,0.17c0.31,0.08,0.6,0.17,0.85,0.27
|
||||
c0.25,0.1,0.47,0.22,0.65,0.36c0.18,0.14,0.31,0.32,0.41,0.52c0.1,0.2,0.14,0.45,0.14,0.74c0,0.34-0.06,0.63-0.19,0.88
|
||||
c-0.13,0.24-0.3,0.44-0.52,0.59s-0.47,0.26-0.76,0.33c-0.29,0.07-0.59,0.1-0.9,0.1c-0.48,0-0.95-0.07-1.42-0.22
|
||||
s-0.89-0.35-1.26-0.61l0.55-1.07c0.05,0.05,0.15,0.12,0.29,0.21c0.14,0.09,0.31,0.17,0.5,0.26s0.41,0.16,0.64,0.22
|
||||
c0.23,0.06,0.47,0.09,0.72,0.09c0.68,0,1.03-0.22,1.03-0.66c0-0.14-0.04-0.26-0.12-0.36c-0.08-0.1-0.19-0.18-0.33-0.25
|
||||
c-0.14-0.07-0.32-0.14-0.52-0.2c-0.2-0.06-0.43-0.12-0.68-0.19c-0.31-0.08-0.57-0.18-0.8-0.27s-0.41-0.21-0.56-0.35
|
||||
c-0.15-0.13-0.26-0.29-0.34-0.47c-0.07-0.18-0.11-0.39-0.11-0.64c0-0.32,0.06-0.61,0.18-0.86c0.12-0.25,0.29-0.46,0.5-0.63
|
||||
s0.46-0.3,0.74-0.38c0.28-0.09,0.58-0.13,0.91-0.13c0.45,0,0.86,0.07,1.24,0.21c0.38,0.14,0.71,0.31,0.99,0.5L18.53,137.91z"/>
|
||||
<path class="st3" d="M24.29,137.91c-0.04-0.04-0.12-0.1-0.23-0.17c-0.11-0.07-0.25-0.14-0.41-0.21c-0.16-0.07-0.33-0.13-0.52-0.18
|
||||
c-0.19-0.05-0.38-0.07-0.57-0.07c-0.34,0-0.6,0.06-0.76,0.19c-0.17,0.13-0.25,0.3-0.25,0.53c0,0.13,0.03,0.24,0.09,0.33
|
||||
c0.06,0.09,0.15,0.16,0.27,0.23s0.27,0.13,0.45,0.18c0.18,0.05,0.39,0.11,0.63,0.17c0.31,0.08,0.6,0.17,0.85,0.27
|
||||
c0.25,0.1,0.47,0.22,0.65,0.36c0.18,0.14,0.31,0.32,0.41,0.52c0.1,0.2,0.14,0.45,0.14,0.74c0,0.34-0.06,0.63-0.19,0.88
|
||||
c-0.13,0.24-0.3,0.44-0.52,0.59s-0.47,0.26-0.76,0.33c-0.29,0.07-0.59,0.1-0.9,0.1c-0.48,0-0.95-0.07-1.42-0.22
|
||||
s-0.89-0.35-1.26-0.61l0.55-1.07c0.05,0.05,0.15,0.12,0.29,0.21c0.14,0.09,0.31,0.17,0.5,0.26s0.41,0.16,0.64,0.22
|
||||
c0.23,0.06,0.47,0.09,0.72,0.09c0.68,0,1.03-0.22,1.03-0.66c0-0.14-0.04-0.26-0.12-0.36c-0.08-0.1-0.19-0.18-0.33-0.25
|
||||
c-0.14-0.07-0.32-0.14-0.52-0.2c-0.2-0.06-0.43-0.12-0.68-0.19c-0.31-0.08-0.57-0.18-0.8-0.27s-0.41-0.21-0.56-0.35
|
||||
c-0.15-0.13-0.26-0.29-0.34-0.47c-0.07-0.18-0.11-0.39-0.11-0.64c0-0.32,0.06-0.61,0.18-0.86c0.12-0.25,0.29-0.46,0.5-0.63
|
||||
s0.46-0.3,0.74-0.38c0.28-0.09,0.58-0.13,0.91-0.13c0.45,0,0.86,0.07,1.24,0.21c0.38,0.14,0.71,0.31,0.99,0.5L24.29,137.91z"/>
|
||||
<path class="st3" d="M30.67,141.54v1.09h-4.44v-6.39h4.36v1.09h-3.11v1.54h2.69v1.01h-2.69v1.67H30.67z"/>
|
||||
<path class="st3" d="M36.67,137.33h-2.03v5.3H33.4v-5.3h-2.04v-1.09h5.32V137.33z"/>
|
||||
<path class="st3" d="M41.45,137.91c-0.04-0.04-0.12-0.1-0.23-0.17c-0.11-0.07-0.25-0.14-0.41-0.21c-0.16-0.07-0.33-0.13-0.52-0.18
|
||||
c-0.19-0.05-0.38-0.07-0.57-0.07c-0.34,0-0.6,0.06-0.76,0.19c-0.17,0.13-0.25,0.3-0.25,0.53c0,0.13,0.03,0.24,0.09,0.33
|
||||
c0.06,0.09,0.15,0.16,0.27,0.23s0.27,0.13,0.45,0.18c0.18,0.05,0.39,0.11,0.63,0.17c0.31,0.08,0.6,0.17,0.85,0.27
|
||||
c0.25,0.1,0.47,0.22,0.65,0.36c0.18,0.14,0.31,0.32,0.41,0.52c0.1,0.2,0.14,0.45,0.14,0.74c0,0.34-0.06,0.63-0.19,0.88
|
||||
c-0.13,0.24-0.3,0.44-0.52,0.59s-0.47,0.26-0.76,0.33c-0.29,0.07-0.59,0.1-0.9,0.1c-0.48,0-0.95-0.07-1.42-0.22
|
||||
s-0.89-0.35-1.26-0.61l0.55-1.07c0.05,0.05,0.15,0.12,0.29,0.21c0.14,0.09,0.31,0.17,0.5,0.26s0.41,0.16,0.64,0.22
|
||||
c0.23,0.06,0.47,0.09,0.72,0.09c0.68,0,1.03-0.22,1.03-0.66c0-0.14-0.04-0.26-0.12-0.36c-0.08-0.1-0.19-0.18-0.33-0.25
|
||||
c-0.14-0.07-0.32-0.14-0.52-0.2c-0.2-0.06-0.43-0.12-0.68-0.19c-0.31-0.08-0.57-0.18-0.8-0.27s-0.41-0.21-0.56-0.35
|
||||
c-0.15-0.13-0.26-0.29-0.34-0.47c-0.07-0.18-0.11-0.39-0.11-0.64c0-0.32,0.06-0.61,0.18-0.86c0.12-0.25,0.29-0.46,0.5-0.63
|
||||
s0.46-0.3,0.74-0.38c0.28-0.09,0.58-0.13,0.91-0.13c0.45,0,0.86,0.07,1.24,0.21c0.38,0.14,0.71,0.31,0.99,0.5L41.45,137.91z"/>
|
||||
</g>
|
||||
<g>
|
||||
<path class="st3" d="M30.54,117.32h-9.3c-0.48,0-0.88-0.39-0.88-0.88s0.39-0.88,0.88-0.88h9.3c0.48,0,0.88,0.39,0.88,0.88
|
||||
S31.02,117.32,30.54,117.32z"/>
|
||||
<path class="st3" d="M17.93,117.32L17.93,117.32c-0.49,0-0.88-0.39-0.88-0.88s0.39-0.88,0.88-0.88c0.48,0,0.88,0.39,0.88,0.88
|
||||
S18.42,117.32,17.93,117.32z"/>
|
||||
<path class="st3" d="M30.54,121.53h-9.3c-0.48,0-0.88-0.39-0.88-0.88s0.39-0.88,0.88-0.88h9.3c0.48,0,0.88,0.39,0.88,0.88
|
||||
S31.02,121.53,30.54,121.53z"/>
|
||||
<path class="st3" d="M17.93,121.53L17.93,121.53c-0.49,0-0.88-0.39-0.88-0.88s0.39-0.88,0.88-0.88c0.48,0,0.88,0.39,0.88,0.88
|
||||
S18.42,121.53,17.93,121.53z"/>
|
||||
<path class="st3" d="M30.54,125.73h-9.3c-0.48,0-0.88-0.39-0.88-0.88s0.39-0.88,0.88-0.88h9.3c0.48,0,0.88,0.39,0.88,0.88
|
||||
S31.02,125.73,30.54,125.73z"/>
|
||||
<path class="st3" d="M17.93,125.73L17.93,125.73c-0.49,0-0.88-0.39-0.88-0.88s0.39-0.88,0.88-0.88c0.48,0,0.88,0.39,0.88,0.88
|
||||
S18.42,125.73,17.93,125.73z"/>
|
||||
<path class="st3" d="M32.21,130.42H16.85c-2.15,0-3.89-1.75-3.89-3.89v-11.36c0-2.15,1.75-3.89,3.89-3.89h15.35
|
||||
c2.15,0,3.89,1.75,3.89,3.89v11.36C36.1,128.68,34.35,130.42,32.21,130.42z M16.85,113.02c-1.18,0-2.14,0.96-2.14,2.14v11.36
|
||||
c0,1.18,0.96,2.14,2.14,2.14h15.35c1.18,0,2.14-0.96,2.14-2.14v-11.36c0-1.18-0.96-2.14-2.14-2.14H16.85z"/>
|
||||
</g>
|
||||
<g>
|
||||
<path d="M7.81,42.73l2.52-6.39h1.01l2.51,6.39h-1.31l-0.58-1.59H9.7l-0.58,1.59H7.81z M10.83,37.68l-0.92,2.58h1.81L10.83,37.68z"
|
||||
/>
|
||||
<path d="M18.5,38.02c-0.04-0.04-0.12-0.1-0.23-0.17c-0.11-0.07-0.25-0.14-0.41-0.21c-0.16-0.07-0.33-0.13-0.52-0.18
|
||||
c-0.19-0.05-0.38-0.07-0.57-0.07c-0.34,0-0.6,0.06-0.76,0.19c-0.17,0.13-0.25,0.3-0.25,0.53c0,0.13,0.03,0.24,0.09,0.33
|
||||
c0.06,0.09,0.15,0.16,0.27,0.23s0.27,0.13,0.45,0.18c0.18,0.05,0.39,0.11,0.63,0.17c0.31,0.08,0.6,0.17,0.85,0.27
|
||||
c0.25,0.1,0.47,0.22,0.65,0.36c0.18,0.14,0.31,0.32,0.41,0.52c0.1,0.2,0.14,0.45,0.14,0.74c0,0.34-0.06,0.63-0.19,0.88
|
||||
c-0.13,0.24-0.3,0.44-0.52,0.59s-0.47,0.26-0.76,0.33c-0.29,0.07-0.59,0.1-0.9,0.1c-0.48,0-0.95-0.07-1.42-0.22
|
||||
s-0.89-0.35-1.26-0.61l0.55-1.07c0.05,0.05,0.15,0.12,0.29,0.21c0.14,0.09,0.31,0.17,0.5,0.26s0.41,0.16,0.64,0.22
|
||||
c0.23,0.06,0.47,0.09,0.72,0.09c0.68,0,1.03-0.22,1.03-0.66c0-0.14-0.04-0.26-0.12-0.36c-0.08-0.1-0.19-0.18-0.33-0.25
|
||||
c-0.14-0.07-0.32-0.14-0.52-0.2c-0.2-0.06-0.43-0.12-0.68-0.19c-0.31-0.08-0.57-0.18-0.8-0.27s-0.41-0.21-0.56-0.35
|
||||
c-0.15-0.13-0.26-0.29-0.34-0.47c-0.07-0.18-0.11-0.39-0.11-0.64c0-0.32,0.06-0.61,0.18-0.86c0.12-0.25,0.29-0.46,0.5-0.63
|
||||
s0.46-0.3,0.74-0.38c0.28-0.09,0.58-0.13,0.91-0.13c0.45,0,0.86,0.07,1.24,0.21c0.38,0.14,0.71,0.31,0.99,0.5L18.5,38.02z"/>
|
||||
<path d="M24.26,38.02c-0.04-0.04-0.12-0.1-0.23-0.17c-0.11-0.07-0.25-0.14-0.41-0.21c-0.16-0.07-0.33-0.13-0.52-0.18
|
||||
c-0.19-0.05-0.38-0.07-0.57-0.07c-0.34,0-0.6,0.06-0.76,0.19c-0.17,0.13-0.25,0.3-0.25,0.53c0,0.13,0.03,0.24,0.09,0.33
|
||||
c0.06,0.09,0.15,0.16,0.27,0.23s0.27,0.13,0.45,0.18c0.18,0.05,0.39,0.11,0.63,0.17c0.31,0.08,0.6,0.17,0.85,0.27
|
||||
c0.25,0.1,0.47,0.22,0.65,0.36c0.18,0.14,0.31,0.32,0.41,0.52c0.1,0.2,0.14,0.45,0.14,0.74c0,0.34-0.06,0.63-0.19,0.88
|
||||
c-0.13,0.24-0.3,0.44-0.52,0.59s-0.47,0.26-0.76,0.33c-0.29,0.07-0.59,0.1-0.9,0.1c-0.48,0-0.95-0.07-1.42-0.22
|
||||
s-0.89-0.35-1.26-0.61l0.55-1.07c0.05,0.05,0.15,0.12,0.29,0.21c0.14,0.09,0.31,0.17,0.5,0.26s0.41,0.16,0.64,0.22
|
||||
c0.23,0.06,0.47,0.09,0.72,0.09c0.68,0,1.03-0.22,1.03-0.66c0-0.14-0.04-0.26-0.12-0.36c-0.08-0.1-0.19-0.18-0.33-0.25
|
||||
c-0.14-0.07-0.32-0.14-0.52-0.2c-0.2-0.06-0.43-0.12-0.68-0.19c-0.31-0.08-0.57-0.18-0.8-0.27s-0.41-0.21-0.56-0.35
|
||||
c-0.15-0.13-0.26-0.29-0.34-0.47c-0.07-0.18-0.11-0.39-0.11-0.64c0-0.32,0.06-0.61,0.18-0.86c0.12-0.25,0.29-0.46,0.5-0.63
|
||||
s0.46-0.3,0.74-0.38c0.28-0.09,0.58-0.13,0.91-0.13c0.45,0,0.86,0.07,1.24,0.21c0.38,0.14,0.71,0.31,0.99,0.5L24.26,38.02z"/>
|
||||
<path d="M30.64,41.64v1.09H26.2v-6.39h4.36v1.09h-3.11v1.54h2.69v1.01h-2.69v1.67H30.64z"/>
|
||||
<path d="M36.64,37.43h-2.03v5.3h-1.24v-5.3h-2.04v-1.09h5.32V37.43z"/>
|
||||
<path d="M41.42,38.02c-0.04-0.04-0.12-0.1-0.23-0.17c-0.11-0.07-0.25-0.14-0.41-0.21c-0.16-0.07-0.33-0.13-0.52-0.18
|
||||
c-0.19-0.05-0.38-0.07-0.57-0.07c-0.34,0-0.6,0.06-0.76,0.19c-0.17,0.13-0.25,0.3-0.25,0.53c0,0.13,0.03,0.24,0.09,0.33
|
||||
c0.06,0.09,0.15,0.16,0.27,0.23s0.27,0.13,0.45,0.18c0.18,0.05,0.39,0.11,0.63,0.17c0.31,0.08,0.6,0.17,0.85,0.27
|
||||
c0.25,0.1,0.47,0.22,0.65,0.36c0.18,0.14,0.31,0.32,0.41,0.52c0.1,0.2,0.14,0.45,0.14,0.74c0,0.34-0.06,0.63-0.19,0.88
|
||||
c-0.13,0.24-0.3,0.44-0.52,0.59s-0.47,0.26-0.76,0.33c-0.29,0.07-0.59,0.1-0.9,0.1c-0.48,0-0.95-0.07-1.42-0.22
|
||||
s-0.89-0.35-1.26-0.61l0.55-1.07c0.05,0.05,0.15,0.12,0.29,0.21c0.14,0.09,0.31,0.17,0.5,0.26s0.41,0.16,0.64,0.22
|
||||
c0.23,0.06,0.47,0.09,0.72,0.09c0.68,0,1.03-0.22,1.03-0.66c0-0.14-0.04-0.26-0.12-0.36c-0.08-0.1-0.19-0.18-0.33-0.25
|
||||
c-0.14-0.07-0.32-0.14-0.52-0.2c-0.2-0.06-0.43-0.12-0.68-0.19c-0.31-0.08-0.57-0.18-0.8-0.27s-0.41-0.21-0.56-0.35
|
||||
c-0.15-0.13-0.26-0.29-0.34-0.47c-0.07-0.18-0.11-0.39-0.11-0.64c0-0.32,0.06-0.61,0.18-0.86c0.12-0.25,0.29-0.46,0.5-0.63
|
||||
s0.46-0.3,0.74-0.38c0.28-0.09,0.58-0.13,0.91-0.13c0.45,0,0.86,0.07,1.24,0.21c0.38,0.14,0.71,0.31,0.99,0.5L41.42,38.02z"/>
|
||||
</g>
|
||||
<g>
|
||||
<path d="M30.51,17.43h-9.3c-0.48,0-0.88-0.39-0.88-0.88c0-0.48,0.39-0.88,0.88-0.88h9.3c0.48,0,0.88,0.39,0.88,0.88
|
||||
C31.38,17.03,30.99,17.43,30.51,17.43z"/>
|
||||
<path d="M17.9,17.43L17.9,17.43c-0.49,0-0.88-0.39-0.88-0.88c0-0.48,0.39-0.88,0.88-0.88c0.48,0,0.88,0.39,0.88,0.88
|
||||
C18.77,17.03,18.39,17.43,17.9,17.43z"/>
|
||||
<path d="M30.51,21.63h-9.3c-0.48,0-0.88-0.39-0.88-0.88c0-0.48,0.39-0.88,0.88-0.88h9.3c0.48,0,0.88,0.39,0.88,0.88
|
||||
C31.38,21.24,30.99,21.63,30.51,21.63z"/>
|
||||
<path d="M17.9,21.63L17.9,21.63c-0.49,0-0.88-0.39-0.88-0.88c0-0.48,0.39-0.88,0.88-0.88c0.48,0,0.88,0.39,0.88,0.88
|
||||
C18.77,21.24,18.39,21.63,17.9,21.63z"/>
|
||||
<path d="M30.51,25.83h-9.3c-0.48,0-0.88-0.39-0.88-0.88c0-0.48,0.39-0.88,0.88-0.88h9.3c0.48,0,0.88,0.39,0.88,0.88
|
||||
C31.38,25.44,30.99,25.83,30.51,25.83z"/>
|
||||
<path d="M17.9,25.83L17.9,25.83c-0.49,0-0.88-0.39-0.88-0.88c0-0.48,0.39-0.88,0.88-0.88c0.48,0,0.88,0.39,0.88,0.88
|
||||
C18.77,25.44,18.39,25.83,17.9,25.83z"/>
|
||||
<path d="M32.18,30.52H16.82c-2.15,0-3.89-1.75-3.89-3.89V15.27c0-2.15,1.75-3.89,3.89-3.89h15.35c2.15,0,3.89,1.75,3.89,3.89v11.36
|
||||
C36.07,28.78,34.32,30.52,32.18,30.52z M16.82,13.13c-1.18,0-2.14,0.96-2.14,2.14v11.36c0,1.18,0.96,2.14,2.14,2.14h15.35
|
||||
c1.18,0,2.14-0.96,2.14-2.14V15.27c0-1.18-0.96-2.14-2.14-2.14H16.82z"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
After 
(image error) Size: 16 KiB |
|
|
@ -249,6 +249,9 @@ var toolBar = (function () {
|
|||
|
||||
toolBar = Toolbars.getToolbar(EDIT_TOOLBAR);
|
||||
toolBar.writeProperty("shown", false);
|
||||
addButton("openAssetBrowserButton","assets-01.svg",function(){
|
||||
Window.showAssetServer();
|
||||
})
|
||||
|
||||
addButton("newModelButton", "model-01.svg", function () {
|
||||
var SHAPE_TYPE_NONE = 0;
|
||||
|
|
@ -429,6 +432,7 @@ var toolBar = (function () {
|
|||
});
|
||||
});
|
||||
|
||||
|
||||
that.setActive(false);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue