ModelTweaker was renamed to "3D Asset Viewer"

Change-Id: Ib34723c2bbb0171b15edec0db798bc7e01bbdbc8
Reviewed-by: Danny Pope <daniel.pope@nokia.com>

43 files changed, 21 insertions, 20 deletions

diff --git a/util/qt3d/modeltweak/modeltweak.desktop b/util/qt3d/assetviewer/assetviewer.desktop
index a66676766..1d682515c 100644
--- a/util/qt3d/modeltweak/modeltweak.desktop
+++ b/util/qt3d/assetviewer/assetviewer.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
-Name=Model Tweaker
+Name=3D Asset Viewer
 Icon=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png
 Exec=/usr/bin/invoker --type=e -s /usr/bin/modeltweak -fullscreen
 OnlyShowIn=X-MeeGo;
-X-MeeGo-Logical-Id=qtn_comm_appname_modeltweak
+X-MeeGo-Logical-Id=qtn_comm_appname_assetviewer
diff --git a/util/qt3d/modeltweak/modeltweak.pro b/util/qt3d/assetviewer/assetviewer.pro
index 285927aa5..ee4737d3b 100644
--- a/util/qt3d/modeltweak/modeltweak.pro
+++ b/util/qt3d/assetviewer/assetviewer.pro
@@ -1,5 +1,5 @@
 TEMPLATE = app
-TARGET = modeltweak
+TARGET = assetviewer
 CONFIG += qt warn_on
 
 INSTALL_DIRS = qml
@@ -17,9 +17,9 @@ symbian {
 }
 
 OTHER_FILES += \
-    modeltweak.rc
+    assetviewer.rc
 
-RC_FILE = modeltweak.rc
+RC_FILE = assetviewer.rc
 
 HEADERS += \
     quickfile.h
diff --git a/util/qt3d/modeltweak/modeltweak.rc b/util/qt3d/assetviewer/assetviewer.rc
index 1b6228c97..1b6228c97 100644
--- a/util/qt3d/modeltweak/modeltweak.rc
+++ b/util/qt3d/assetviewer/assetviewer.rc
diff --git a/util/qt3d/modeltweak/main.cpp b/util/qt3d/assetviewer/main.cpp
index 619bc6c3e..954ed4c68 100644
--- a/util/qt3d/modeltweak/main.cpp
+++ b/util/qt3d/assetviewer/main.cpp
@@ -52,13 +52,14 @@ QString filename;
 
 int main(int argc, char *argv[])
 {
-    qmlRegisterType<QuickFile>("ModelTweak", 1, 0, "QuickFile");
+    qmlRegisterType<QuickFile>("AssetViewer", 1, 0, "QuickFile");
 
     QApplication app(argc, argv);
     QDeclarativeView3D view;
 
-    QString qml = q_get_qmldir(QLatin1String("qml/ModelTweak.qml"));
+    QString qml = q_get_qmldir(QLatin1String("qml/AssetViewer.qml"));
     view.setSource(QUrl::fromLocalFile(qml));
+    view.setWindowTitle(QString("3D Asset Viewer"));
 
     //disable close button
    // view.setWindowFlags(Qt::CustomizeWindowHint | Qt::WindowMaximizeButtonHint | Qt::WindowMinimizeButtonHint);
diff --git a/util/qt3d/modeltweak/qml/ModelTweak.qml b/util/qt3d/assetviewer/qml/AssetViewer.qml
index 3efc3b631..af5b4b961 100644
--- a/util/qt3d/modeltweak/qml/ModelTweak.qml
+++ b/util/qt3d/assetviewer/qml/AssetViewer.qml
@@ -40,7 +40,7 @@
 
 import QtQuick 1.0
 import Qt3D 1.0
-import ModelTweak 1.0
+import AssetViewer 1.0
 import "fileHandling.js" as FileHandler
 import "Widgets"
 import "ColorUtils.js" as ColorUtils
diff --git a/util/qt3d/modeltweak/qml/BlenderValueSlider.qml b/util/qt3d/assetviewer/qml/BlenderValueSlider.qml
index e5709c5fc..2f223380a 100644
--- a/util/qt3d/modeltweak/qml/BlenderValueSlider.qml
+++ b/util/qt3d/assetviewer/qml/BlenderValueSlider.qml
@@ -1,6 +1,6 @@
 import QtQuick 1.0
 import Qt3D 1.0
-import ModelTweak 1.0
+import AssetViewer 1.0
 
 Item {
     id: valueSlider
diff --git a/util/qt3d/modeltweak/qml/ButtonBarPane.qml b/util/qt3d/assetviewer/qml/ButtonBarPane.qml
index c21f16bb4..bd85d5c8e 100644
--- a/util/qt3d/modeltweak/qml/ButtonBarPane.qml
+++ b/util/qt3d/assetviewer/qml/ButtonBarPane.qml
@@ -1,6 +1,6 @@
 import QtQuick 1.0
 import Qt3D 1.0
-import ModelTweak 1.0
+import AssetViewer 1.0
 import "fileHandling.js" as FileHandler
 import "Widgets"
 
diff --git a/util/qt3d/modeltweak/qml/CheckBox.qml b/util/qt3d/assetviewer/qml/CheckBox.qml
index efadd5396..efadd5396 100644
--- a/util/qt3d/modeltweak/qml/CheckBox.qml
+++ b/util/qt3d/assetviewer/qml/CheckBox.qml
diff --git a/util/qt3d/modeltweak/qml/ColorPicker.qml b/util/qt3d/assetviewer/qml/ColorPicker.qml
index 641a6acc2..641a6acc2 100644
--- a/util/qt3d/modeltweak/qml/ColorPicker.qml
+++ b/util/qt3d/assetviewer/qml/ColorPicker.qml
diff --git a/util/qt3d/modeltweak/qml/ColorUtils.js b/util/qt3d/assetviewer/qml/ColorUtils.js
index 5addf3948..5addf3948 100644
--- a/util/qt3d/modeltweak/qml/ColorUtils.js
+++ b/util/qt3d/assetviewer/qml/ColorUtils.js
diff --git a/util/qt3d/modeltweak/qml/HelpOverlay.qml b/util/qt3d/assetviewer/qml/HelpOverlay.qml
index 88c526616..7b233e6f9 100644
--- a/util/qt3d/modeltweak/qml/HelpOverlay.qml
+++ b/util/qt3d/assetviewer/qml/HelpOverlay.qml
@@ -1,6 +1,6 @@
 import QtQuick 1.0
 import Qt3D 1.0
-import ModelTweak 1.0
+import AssetViewer 1.0
 
 Rectangle {
     anchors.fill: parent
@@ -20,7 +20,7 @@ Rectangle {
         Text {
             id: header
             font { pixelSize: 32; italic: true }
-            text: "ModelTweaker Help"
+            text: "3D Asset Viewer Help"
             anchors.top: parent.top
             anchors.topMargin: 16
             anchors.horizontalCenter: parent.horizontalCenter
diff --git a/util/qt3d/modeltweak/qml/ModelPropertiesPane.qml b/util/qt3d/assetviewer/qml/ModelPropertiesPane.qml
index 2b0e4dee9..384a8b6ed 100644
--- a/util/qt3d/modeltweak/qml/ModelPropertiesPane.qml
+++ b/util/qt3d/assetviewer/qml/ModelPropertiesPane.qml
@@ -1,6 +1,6 @@
 import QtQuick 1.0
 import Qt3D 1.0
-import ModelTweak 1.0
+import AssetViewer 1.0
 import "Widgets"
 import "ColorUtils.js" as ColorUtils
 
diff --git a/util/qt3d/modeltweak/qml/ModelViewport.qml b/util/qt3d/assetviewer/qml/ModelViewport.qml
index ed3118375..541c147ad 100644
--- a/util/qt3d/modeltweak/qml/ModelViewport.qml
+++ b/util/qt3d/assetviewer/qml/ModelViewport.qml
@@ -1,7 +1,7 @@
 import QtQuick 1.0
 import Qt3D 1.0
 import Qt3D.Shapes 1.0
-import ModelTweak 1.0
+import AssetViewer 1.0
 import "Widgets"
 
 Rectangle {
diff --git a/util/qt3d/modeltweak/qml/SaveButton.qml b/util/qt3d/assetviewer/qml/SaveButton.qml
index ea52f0fee..7cf788b19 100644
--- a/util/qt3d/modeltweak/qml/SaveButton.qml
+++ b/util/qt3d/assetviewer/qml/SaveButton.qml
@@ -1,6 +1,6 @@
 import QtQuick 1.0
 import Qt3D 1.0
-import ModelTweak 1.0
+import AssetViewer 1.0
 import "Widgets"
 import "fileHandling.js" as FileHandler
 
diff --git a/util/qt3d/modeltweak/qml/Widgets/BlenderToggle.qml b/util/qt3d/assetviewer/qml/Widgets/BlenderToggle.qml
index aa220c366..a9258fc88 100644
--- a/util/qt3d/modeltweak/qml/Widgets/BlenderToggle.qml
+++ b/util/qt3d/assetviewer/qml/Widgets/BlenderToggle.qml
@@ -1,6 +1,6 @@
 import QtQuick 1.0
 import Qt3D 1.0
-import ModelTweak 1.0
+import AssetViewer 1.0
 
 Rectangle {
     anchors.topMargin: 15
diff --git a/util/qt3d/modeltweak/qml/Widgets/Checkered.qml b/util/qt3d/assetviewer/qml/Widgets/Checkered.qml
index 49bf1d822..49bf1d822 100644
--- a/util/qt3d/modeltweak/qml/Widgets/Checkered.qml
+++ b/util/qt3d/assetviewer/qml/Widgets/Checkered.qml
diff --git a/util/qt3d/modeltweak/qml/Widgets/ColorSelector.qml b/util/qt3d/assetviewer/qml/Widgets/ColorSelector.qml
index a55a743fb..a55a743fb 100644
--- a/util/qt3d/modeltweak/qml/Widgets/ColorSelector.qml
+++ b/util/qt3d/assetviewer/qml/Widgets/ColorSelector.qml
diff --git a/util/qt3d/modeltweak/qml/Widgets/ColorWidget.qml b/util/qt3d/assetviewer/qml/Widgets/ColorWidget.qml
index f60ff1b06..f60ff1b06 100644
--- a/util/qt3d/modeltweak/qml/Widgets/ColorWidget.qml
+++ b/util/qt3d/assetviewer/qml/Widgets/ColorWidget.qml
diff --git a/util/qt3d/modeltweak/qml/Widgets/HSVColor.qml b/util/qt3d/assetviewer/qml/Widgets/HSVColor.qml
index 9e137428c..9e137428c 100644
--- a/util/qt3d/modeltweak/qml/Widgets/HSVColor.qml
+++ b/util/qt3d/assetviewer/qml/Widgets/HSVColor.qml
diff --git a/util/qt3d/modeltweak/qml/Widgets/InputBox.qml b/util/qt3d/assetviewer/qml/Widgets/InputBox.qml
index d3d318378..d3d318378 100644
--- a/util/qt3d/modeltweak/qml/Widgets/InputBox.qml
+++ b/util/qt3d/assetviewer/qml/Widgets/InputBox.qml
diff --git a/util/qt3d/modeltweak/qml/Widgets/ModelViewportResize.qml b/util/qt3d/assetviewer/qml/Widgets/ModelViewportResize.qml
index c1f5cd63d..96e8a2d64 100644
--- a/util/qt3d/modeltweak/qml/Widgets/ModelViewportResize.qml
+++ b/util/qt3d/assetviewer/qml/Widgets/ModelViewportResize.qml
@@ -1,6 +1,6 @@
 import QtQuick 1.0
 import Qt3D 1.0
-import ModelTweak 1.0
+import AssetViewer 1.0
 
 Rectangle {
     radius: 4
diff --git a/util/qt3d/modeltweak/qml/Widgets/SliderHandle.qml b/util/qt3d/assetviewer/qml/Widgets/SliderHandle.qml
index 9f72cabcb..9f72cabcb 100644
--- a/util/qt3d/modeltweak/qml/Widgets/SliderHandle.qml
+++ b/util/qt3d/assetviewer/qml/Widgets/SliderHandle.qml
diff --git a/util/qt3d/modeltweak/qml/Widgets/ZoomControls.qml b/util/qt3d/assetviewer/qml/Widgets/ZoomControls.qml
index accdb54b5..7ad01ce01 100644
--- a/util/qt3d/modeltweak/qml/Widgets/ZoomControls.qml
+++ b/util/qt3d/assetviewer/qml/Widgets/ZoomControls.qml
@@ -1,6 +1,6 @@
 import QtQuick 1.0
 import Qt3D 1.0
-import ModelTweak 1.0
+import AssetViewer 1.0
 
 Rectangle {
     radius: 4
diff --git a/util/qt3d/modeltweak/qml/Widgets/images/grow.png b/util/qt3d/assetviewer/qml/Widgets/images/grow.png
index df1540100..df1540100 100644
--- a/util/qt3d/modeltweak/qml/Widgets/images/grow.png
+++ b/util/qt3d/assetviewer/qml/Widgets/images/grow.png
diff --git a/util/qt3d/modeltweak/qml/Widgets/images/shrink.png b/util/qt3d/assetviewer/qml/Widgets/images/shrink.png
index 285d3a9d6..285d3a9d6 100644
--- a/util/qt3d/modeltweak/qml/Widgets/images/shrink.png
+++ b/util/qt3d/assetviewer/qml/Widgets/images/shrink.png
diff --git a/util/qt3d/modeltweak/qml/Widgets/images/zoomin.png b/util/qt3d/assetviewer/qml/Widgets/images/zoomin.png
index e4434a075..e4434a075 100644
--- a/util/qt3d/modeltweak/qml/Widgets/images/zoomin.png
+++ b/util/qt3d/assetviewer/qml/Widgets/images/zoomin.png
diff --git a/util/qt3d/modeltweak/qml/Widgets/images/zoomout.png b/util/qt3d/assetviewer/qml/Widgets/images/zoomout.png
index 4c853bc6b..4c853bc6b 100644
--- a/util/qt3d/modeltweak/qml/Widgets/images/zoomout.png
+++ b/util/qt3d/assetviewer/qml/Widgets/images/zoomout.png
diff --git a/util/qt3d/modeltweak/qml/fileHandling.js b/util/qt3d/assetviewer/qml/fileHandling.js
index 822350a8d..6ccfb1a1a 100644
--- a/util/qt3d/modeltweak/qml/fileHandling.js
+++ b/util/qt3d/assetviewer/qml/fileHandling.js
@@ -28,7 +28,7 @@ function save_qml(closePrompt) {
     var saveData =
         "//                 --------|  WARNING  |--------!!\n" +
         "// This is a generated file.  Modifying the text or layout of \n" +
-        "// this file will mean that the Model-Tweaker application will no \n" +
+        "// this file will mean that the 3D Asset Viewer application will no \n" +
         "// longer be able to read it. \n\n" +
         "// Changing numeric values is allowable, though care should be taken\n" +
         "// not to inadvertantly change the file structure.\n\n" +
diff --git a/util/qt3d/modeltweak/qml/images/help.png b/util/qt3d/assetviewer/qml/images/help.png
index 452ac5252..452ac5252 100644
--- a/util/qt3d/modeltweak/qml/images/help.png
+++ b/util/qt3d/assetviewer/qml/images/help.png
diff --git a/util/qt3d/modeltweak/qml/images/lock.png b/util/qt3d/assetviewer/qml/images/lock.png
index cafd8fc5d..cafd8fc5d 100644
--- a/util/qt3d/modeltweak/qml/images/lock.png
+++ b/util/qt3d/assetviewer/qml/images/lock.png
diff --git a/util/qt3d/modeltweak/qml/images/minus.png b/util/qt3d/assetviewer/qml/images/minus.png
index a93156ea6..a93156ea6 100644
--- a/util/qt3d/modeltweak/qml/images/minus.png
+++ b/util/qt3d/assetviewer/qml/images/minus.png
diff --git a/util/qt3d/modeltweak/qml/images/model.png b/util/qt3d/assetviewer/qml/images/model.png
index 62054e3c1..62054e3c1 100644
--- a/util/qt3d/modeltweak/qml/images/model.png
+++ b/util/qt3d/assetviewer/qml/images/model.png
diff --git a/util/qt3d/modeltweak/qml/images/open.png b/util/qt3d/assetviewer/qml/images/open.png
index 5db00d522..5db00d522 100644
--- a/util/qt3d/modeltweak/qml/images/open.png
+++ b/util/qt3d/assetviewer/qml/images/open.png
diff --git a/util/qt3d/modeltweak/qml/images/plus.png b/util/qt3d/assetviewer/qml/images/plus.png
index b1ba37740..b1ba37740 100644
--- a/util/qt3d/modeltweak/qml/images/plus.png
+++ b/util/qt3d/assetviewer/qml/images/plus.png
diff --git a/util/qt3d/modeltweak/qml/images/save.png b/util/qt3d/assetviewer/qml/images/save.png
index e1db44980..e1db44980 100644
--- a/util/qt3d/modeltweak/qml/images/save.png
+++ b/util/qt3d/assetviewer/qml/images/save.png
diff --git a/util/qt3d/modeltweak/qml/images/unlock.png b/util/qt3d/assetviewer/qml/images/unlock.png
index 80c3f9452..80c3f9452 100644
--- a/util/qt3d/modeltweak/qml/images/unlock.png
+++ b/util/qt3d/assetviewer/qml/images/unlock.png
diff --git a/util/qt3d/modeltweak/qml/meshes/monkey.3ds b/util/qt3d/assetviewer/qml/meshes/monkey.3ds
index e9a007b20..e9a007b20 100644
--- a/util/qt3d/modeltweak/qml/meshes/monkey.3ds
+++ b/util/qt3d/assetviewer/qml/meshes/monkey.3ds
diff --git a/util/qt3d/modeltweak/qml/meshes/penguin.3ds b/util/qt3d/assetviewer/qml/meshes/penguin.3ds
index 26c09ac07..26c09ac07 100644
--- a/util/qt3d/modeltweak/qml/meshes/penguin.3ds
+++ b/util/qt3d/assetviewer/qml/meshes/penguin.3ds
diff --git a/util/qt3d/modeltweak/qtquick3d.ico b/util/qt3d/assetviewer/qtquick3d.ico
index c695ac72b..c695ac72b 100644
--- a/util/qt3d/modeltweak/qtquick3d.ico
+++ b/util/qt3d/assetviewer/qtquick3d.ico
diff --git a/util/qt3d/modeltweak/qtquick3d.png b/util/qt3d/assetviewer/qtquick3d.png
index 8351083ed..8351083ed 100644
--- a/util/qt3d/modeltweak/qtquick3d.png
+++ b/util/qt3d/assetviewer/qtquick3d.png
diff --git a/util/qt3d/modeltweak/quickfile.cpp b/util/qt3d/assetviewer/quickfile.cpp
index 3fead1704..3fead1704 100644
--- a/util/qt3d/modeltweak/quickfile.cpp
+++ b/util/qt3d/assetviewer/quickfile.cpp
diff --git a/util/qt3d/modeltweak/quickfile.h b/util/qt3d/assetviewer/quickfile.h
index 1c66c60bb..1c66c60bb 100644
--- a/util/qt3d/modeltweak/quickfile.h
+++ b/util/qt3d/assetviewer/quickfile.h
diff --git a/util/qt3d/qt3d.pro b/util/qt3d/qt3d.pro
index b0afb1398..4539ef6f7 100644
--- a/util/qt3d/qt3d.pro
+++ b/util/qt3d/qt3d.pro
@@ -1,2 +1,2 @@
 TEMPLATE = subdirs
-SUBDIRS = qglinfo modeltweak
+SUBDIRS = qglinfo assetviewer