move project to subdir

amakaseev · Dec 25, 2015 · 669fd07 · 669fd07
1 parent 929232d
commit 669fd07
Show file tree

Hide file tree

Showing 61 changed files with 93 additions and 91 deletions.
diff --git a/AboutDialog.cpp → SpriteSheetPacker/AboutDialog.cpp b/AboutDialog.cpp → SpriteSheetPacker/AboutDialog.cpp
diff --git a/AboutDialog.h → SpriteSheetPacker/AboutDialog.h b/AboutDialog.h → SpriteSheetPacker/AboutDialog.h
diff --git a/AboutDialog.ui → SpriteSheetPacker/AboutDialog.ui b/AboutDialog.ui → SpriteSheetPacker/AboutDialog.ui
diff --git a/GenericObjectFactory.h → SpriteSheetPacker/GenericObjectFactory.h b/GenericObjectFactory.h → SpriteSheetPacker/GenericObjectFactory.h
diff --git a/ImageRotate.h → SpriteSheetPacker/ImageRotate.h b/ImageRotate.h → SpriteSheetPacker/ImageRotate.h
diff --git a/MainWindow.cpp → SpriteSheetPacker/MainWindow.cpp b/MainWindow.cpp → SpriteSheetPacker/MainWindow.cpp
diff --git a/MainWindow.h → SpriteSheetPacker/MainWindow.h b/MainWindow.h → SpriteSheetPacker/MainWindow.h
diff --git a/MainWindow.ui → SpriteSheetPacker/MainWindow.ui b/MainWindow.ui → SpriteSheetPacker/MainWindow.ui
diff --git a/PreferencesDialog.cpp → SpriteSheetPacker/PreferencesDialog.cpp b/PreferencesDialog.cpp → SpriteSheetPacker/PreferencesDialog.cpp
diff --git a/PreferencesDialog.h → SpriteSheetPacker/PreferencesDialog.h b/PreferencesDialog.h → SpriteSheetPacker/PreferencesDialog.h
diff --git a/PreferencesDialog.ui → SpriteSheetPacker/PreferencesDialog.ui b/PreferencesDialog.ui → SpriteSheetPacker/PreferencesDialog.ui
diff --git a/PublishSpriteSheet.cpp → SpriteSheetPacker/PublishSpriteSheet.cpp b/PublishSpriteSheet.cpp → SpriteSheetPacker/PublishSpriteSheet.cpp
diff --git a/PublishSpriteSheet.h → SpriteSheetPacker/PublishSpriteSheet.h b/PublishSpriteSheet.h → SpriteSheetPacker/PublishSpriteSheet.h
diff --git a/PublishStatusDialog.cpp → SpriteSheetPacker/PublishStatusDialog.cpp b/PublishStatusDialog.cpp → SpriteSheetPacker/PublishStatusDialog.cpp
diff --git a/PublishStatusDialog.h → SpriteSheetPacker/PublishStatusDialog.h b/PublishStatusDialog.h → SpriteSheetPacker/PublishStatusDialog.h
diff --git a/PublishStatusDialog.ui → SpriteSheetPacker/PublishStatusDialog.ui b/PublishStatusDialog.ui → SpriteSheetPacker/PublishStatusDialog.ui
diff --git a/ScalingVariantWidget.cpp → SpriteSheetPacker/ScalingVariantWidget.cpp b/ScalingVariantWidget.cpp → SpriteSheetPacker/ScalingVariantWidget.cpp
diff --git a/ScalingVariantWidget.h → SpriteSheetPacker/ScalingVariantWidget.h b/ScalingVariantWidget.h → SpriteSheetPacker/ScalingVariantWidget.h
diff --git a/ScalingVariantWidget.ui → SpriteSheetPacker/ScalingVariantWidget.ui b/ScalingVariantWidget.ui → SpriteSheetPacker/ScalingVariantWidget.ui
diff --git a/SpriteAtlas.cpp → SpriteSheetPacker/SpriteAtlas.cpp b/SpriteAtlas.cpp → SpriteSheetPacker/SpriteAtlas.cpp
diff --git a/SpriteAtlas.h → SpriteSheetPacker/SpriteAtlas.h b/SpriteAtlas.h → SpriteSheetPacker/SpriteAtlas.h
diff --git a/SpritePacker.icns → SpriteSheetPacker/SpritePacker.icns b/SpritePacker.icns → SpriteSheetPacker/SpritePacker.icns
diff --git a/SpritePacker.ico → SpriteSheetPacker/SpritePacker.ico b/SpritePacker.ico → SpriteSheetPacker/SpritePacker.ico
diff --git a/SpritePackerProjectFile.cpp → ...teSheetPacker/SpritePackerProjectFile.cpp b/SpritePackerProjectFile.cpp → ...teSheetPacker/SpritePackerProjectFile.cpp
diff --git a/SpritePackerProjectFile.h → SpriteSheetPacker/SpritePackerProjectFile.h b/SpritePackerProjectFile.h → SpriteSheetPacker/SpritePackerProjectFile.h
diff --git a/SpriteSheetPacker/SpriteSheetPacker.pro b/SpriteSheetPacker/SpriteSheetPacker.pro
@@ -0,0 +1,91 @@
+#-------------------------------------------------
+#
+# Project created by QtCreator 2014-01-04T16:27:31
+#
+#-------------------------------------------------
+
+QT += core widgets xml qml
+
+TARGET = SpriteSheetPacker
+TEMPLATE = app
+
+CONFIG += c++11
+#QMAKE_CXXFLAGS +=-std=c++11 -stdlib=libc++
+
+SOURCES += main.cpp\
+    MainWindow.cpp \
+    SpriteAtlas.cpp \
+    ScalingVariantWidget.cpp \
+    SpritePackerProjectFile.cpp \
+    PublishSpriteSheet.cpp \
+    PreferencesDialog.cpp \
+    PublishStatusDialog.cpp \
+    AboutDialog.cpp \
+    comman-line.cpp
+
+HEADERS += MainWindow.h \
+    ImageRotate.h \
+    SpriteAtlas.h \
+    binpack2d.hpp \
+    ScalingVariantWidget.h \
+    SpritePackerProjectFile.h \
+    PublishSpriteSheet.h \
+    PreferencesDialog.h \
+    PublishStatusDialog.h \
+    AboutDialog.h
+
+FORMS += MainWindow.ui \
+    ScalingVariantWidget.ui \
+    PreferencesDialog.ui \
+    PublishStatusDialog.ui \
+    AboutDialog.ui
+
+RESOURCES += resources.qrc
+
+include(qtplist-master/qtplist-master.pri)
+
+OTHER_FILES += \
+    defaultFormats/cocos2d.js \
+    defaultFormats/json.js \
+
+macx {
+    ICON = SpritePacker.icns
+    exportData.files += defaultFormats/cocos2d.js defaultFormats/cocos2d.png
+    exportData.files += defaultFormats/json.js defaultFormats/json.png
+    exportData.path = Contents/MacOS/defaultFormats
+    QMAKE_BUNDLE_DATA += exportData
+}
+
+win32 {
+    RC_ICONS = SpritePacker.ico
+    exportData.files = defaultFormats/*.*
+    exportData.path = defaultFormats
+    DEPLOYMENT += exportData
+}
+
+
+isEmpty(TARGET_EXT) {
+    win32 {
+        TARGET_CUSTOM_EXT = .exe
+    }
+    macx {
+        TARGET_CUSTOM_EXT = .app
+    }
+} else {
+    TARGET_CUSTOM_EXT = $${TARGET_EXT}
+}
+
+win32 {
+    DEPLOY_COMMAND = windeployqt
+}
+macx {
+    DEPLOY_COMMAND = macdeployqt
+}
+
+CONFIG(release,debug|release) {
+    # release
+    DEPLOY_TARGET = $$shell_quote($$shell_path($${OUT_PWD}/$${TARGET}$${TARGET_CUSTOM_EXT}))
+
+    warning($${DEPLOY_COMMAND} $${DEPLOY_TARGET})
+    QMAKE_POST_LINK = $${DEPLOY_COMMAND} $${DEPLOY_TARGET}
+}
diff --git a/binpack2d.hpp → SpriteSheetPacker/binpack2d.hpp b/binpack2d.hpp → SpriteSheetPacker/binpack2d.hpp
diff --git a/comman-line.cpp → SpriteSheetPacker/comman-line.cpp b/comman-line.cpp → SpriteSheetPacker/comman-line.cpp
diff --git a/defaultFormats/cocos2d.js → SpriteSheetPacker/defaultFormats/cocos2d.js b/defaultFormats/cocos2d.js → SpriteSheetPacker/defaultFormats/cocos2d.js
diff --git a/defaultFormats/cocos2d.png → SpriteSheetPacker/defaultFormats/cocos2d.png b/defaultFormats/cocos2d.png → SpriteSheetPacker/defaultFormats/cocos2d.png
diff --git a/defaultFormats/json.js → SpriteSheetPacker/defaultFormats/json.js b/defaultFormats/json.js → SpriteSheetPacker/defaultFormats/json.js
diff --git a/defaultFormats/json.png → SpriteSheetPacker/defaultFormats/json.png b/defaultFormats/json.png → SpriteSheetPacker/defaultFormats/json.png
diff --git a/main.cpp → SpriteSheetPacker/main.cpp b/main.cpp → SpriteSheetPacker/main.cpp
diff --git a/qtplist-master/LICENSE → SpriteSheetPacker/qtplist-master/LICENSE b/qtplist-master/LICENSE → SpriteSheetPacker/qtplist-master/LICENSE
diff --git a/qtplist-master/PListParser.cpp → ...heetPacker/qtplist-master/PListParser.cpp b/qtplist-master/PListParser.cpp → ...heetPacker/qtplist-master/PListParser.cpp
diff --git a/qtplist-master/PListParser.h → ...eSheetPacker/qtplist-master/PListParser.h b/qtplist-master/PListParser.h → ...eSheetPacker/qtplist-master/PListParser.h
diff --git a/qtplist-master/PListSerializer.cpp → ...Packer/qtplist-master/PListSerializer.cpp b/qtplist-master/PListSerializer.cpp → ...Packer/qtplist-master/PListSerializer.cpp
diff --git a/qtplist-master/PListSerializer.h → ...etPacker/qtplist-master/PListSerializer.h b/qtplist-master/PListSerializer.h → ...etPacker/qtplist-master/PListSerializer.h
diff --git a/qtplist-master/README → SpriteSheetPacker/qtplist-master/README b/qtplist-master/README → SpriteSheetPacker/qtplist-master/README
diff --git a/qtplist-master/qtplist-master.pri → ...tPacker/qtplist-master/qtplist-master.pri b/qtplist-master/qtplist-master.pri → ...tPacker/qtplist-master/qtplist-master.pri
diff --git a/res/Delete.png → SpriteSheetPacker/res/Delete.png b/res/Delete.png → SpriteSheetPacker/res/Delete.png
diff --git a/res/add_folder.png → SpriteSheetPacker/res/add_folder.png b/res/add_folder.png → SpriteSheetPacker/res/add_folder.png
diff --git a/res/add_sprite.png → SpriteSheetPacker/res/add_sprite.png b/res/add_sprite.png → SpriteSheetPacker/res/add_sprite.png
diff --git a/res/atlas.png → SpriteSheetPacker/res/atlas.png b/res/atlas.png → SpriteSheetPacker/res/atlas.png
diff --git a/res/background_tran.png → SpriteSheetPacker/res/background_tran.png b/res/background_tran.png → SpriteSheetPacker/res/background_tran.png
diff --git a/res/designer-property-editor-configure.png → ...es/designer-property-editor-configure.png b/res/designer-property-editor-configure.png → ...es/designer-property-editor-configure.png
diff --git a/res/designer-reload-resources-button.png → .../res/designer-reload-resources-button.png b/res/designer-reload-resources-button.png → .../res/designer-reload-resources-button.png
diff --git a/res/document-open.png → SpriteSheetPacker/res/document-open.png b/res/document-open.png → SpriteSheetPacker/res/document-open.png
diff --git a/res/document-save-as.png → SpriteSheetPacker/res/document-save-as.png b/res/document-save-as.png → SpriteSheetPacker/res/document-save-as.png
diff --git a/res/document-save.png → SpriteSheetPacker/res/document-save.png b/res/document-save.png → SpriteSheetPacker/res/document-save.png
diff --git a/res/filenew.png → SpriteSheetPacker/res/filenew.png b/res/filenew.png → SpriteSheetPacker/res/filenew.png
diff --git a/res/iPhone.png → SpriteSheetPacker/res/iPhone.png b/res/iPhone.png → SpriteSheetPacker/res/iPhone.png
diff --git a/res/icon.png → SpriteSheetPacker/res/icon.png b/res/icon.png → SpriteSheetPacker/res/icon.png
diff --git a/res/preferences-system.png → SpriteSheetPacker/res/preferences-system.png b/res/preferences-system.png → SpriteSheetPacker/res/preferences-system.png
diff --git a/res/refresh-32.png → SpriteSheetPacker/res/refresh-32.png b/res/refresh-32.png → SpriteSheetPacker/res/refresh-32.png
diff --git a/res/settings.png → SpriteSheetPacker/res/settings.png b/res/settings.png → SpriteSheetPacker/res/settings.png
diff --git a/res/standardbutton-delete-128.png → ...tPacker/res/standardbutton-delete-128.png b/res/standardbutton-delete-128.png → ...tPacker/res/standardbutton-delete-128.png
diff --git a/res/zoomin.png → SpriteSheetPacker/res/zoomin.png b/res/zoomin.png → SpriteSheetPacker/res/zoomin.png
diff --git a/res/zoomout.png → SpriteSheetPacker/res/zoomout.png b/res/zoomout.png → SpriteSheetPacker/res/zoomout.png
diff --git a/resources.qrc → SpriteSheetPacker/resources.qrc b/resources.qrc → SpriteSheetPacker/resources.qrc
diff --git a/sprite-sheet-packer.pro b/sprite-sheet-packer.pro
@@ -1,91 +1,2 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2014-01-04T16:27:31
-#
-#-------------------------------------------------
-
-QT += core widgets xml qml
-
-TARGET = SpriteSheetPacker
-TEMPLATE = app
-
-CONFIG += c++11
-#QMAKE_CXXFLAGS +=-std=c++11 -stdlib=libc++
-
-SOURCES += main.cpp\
-    MainWindow.cpp \
-    SpriteAtlas.cpp \
-    ScalingVariantWidget.cpp \
-    SpritePackerProjectFile.cpp \
-    PublishSpriteSheet.cpp \
-    PreferencesDialog.cpp \
-    PublishStatusDialog.cpp \
-    AboutDialog.cpp \
-    comman-line.cpp
-
-HEADERS += MainWindow.h \
-    ImageRotate.h \
-    SpriteAtlas.h \
-    binpack2d.hpp \
-    ScalingVariantWidget.h \
-    SpritePackerProjectFile.h \
-    PublishSpriteSheet.h \
-    PreferencesDialog.h \
-    PublishStatusDialog.h \
-    AboutDialog.h
-
-FORMS += MainWindow.ui \
-    ScalingVariantWidget.ui \
-    PreferencesDialog.ui \
-    PublishStatusDialog.ui \
-    AboutDialog.ui
-
-RESOURCES += resources.qrc
-
-include(qtplist-master/qtplist-master.pri)
-
-OTHER_FILES += \
-    defaultFormats/cocos2d.js \
-    defaultFormats/json.js \
-
-macx {
-    ICON = SpritePacker.icns
-    exportData.files += defaultFormats/cocos2d.js defaultFormats/cocos2d.png
-    exportData.files += defaultFormats/json.js defaultFormats/json.png
-    exportData.path = Contents/MacOS/defaultFormats
-    QMAKE_BUNDLE_DATA += exportData
-}
-
-win32 {
-    RC_ICONS = SpritePacker.ico
-    exportData.files = defaultFormats/*.*
-    exportData.path = defaultFormats
-    DEPLOYMENT += exportData
-}
-
-
-isEmpty(TARGET_EXT) {
-    win32 {
-        TARGET_CUSTOM_EXT = .exe
-    }
-    macx {
-        TARGET_CUSTOM_EXT = .app
-    }
-} else {
-    TARGET_CUSTOM_EXT = $${TARGET_EXT}
-}
-
-win32 {
-    DEPLOY_COMMAND = windeployqt
-}
-macx {
-    DEPLOY_COMMAND = macdeployqt
-}
-
-CONFIG(release,debug|release) {
-    # release
-    DEPLOY_TARGET = $$shell_quote($$shell_path($${OUT_PWD}/$${TARGET}$${TARGET_CUSTOM_EXT}))
-
-    warning($${DEPLOY_COMMAND} $${DEPLOY_TARGET})
-    QMAKE_POST_LINK = $${DEPLOY_COMMAND} $${DEPLOY_TARGET}
-}
+TEMPLATE = subdirs
+SUBDIRS = SpriteSheetPacker