apoorva/greenhouse
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Windows package : Removed version in the install directory path

Browse Source 
Windows : Object save figure in homePath

git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@17 620bd6b2-0a58-f614-fd9a-1bd335dccda9
This commit is contained in:
matlabbe 2011-11-09 21:17:52 +00:00
parent ca47c87b67
commit 8cd2d70954
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -89,7 +89,7 @@ IF(WIN32)
SET(CPACK_GENERATOR "NSIS;ZIP") SET(CPACK_GENERATOR "NSIS;ZIP")
SET(CPACK_SOURCE_GENERATOR "ZIP") SET(CPACK_SOURCE_GENERATOR "ZIP")
SET(CPACK_NSIS_PACKAGE_NAME "${PROJECT_NAME} ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") SET(CPACK_NSIS_PACKAGE_NAME "${PROJECT_NAME}")
#SET(ICON_PATH "${PROJECT_SOURCE_DIR}/app/src/${PROJECT_NAME}.ico") #SET(ICON_PATH "${PROJECT_SOURCE_DIR}/app/src/${PROJECT_NAME}.ico")
#SET(CPACK_NSIS_MUI_ICON ${ICON_PATH}) #SET(CPACK_NSIS_MUI_ICON ${ICON_PATH})
#SET(CPACK_NSIS_MUI_UNIICON ${ICON_PATH}) #SET(CPACK_NSIS_MUI_UNIICON ${ICON_PATH})
@ -99,6 +99,7 @@ IF(WIN32)
#SET(CPACK_NSIS_INSTALLED_ICON_NAME bin\\\\${PROJECT_NAME}.exe) #SET(CPACK_NSIS_INSTALLED_ICON_NAME bin\\\\${PROJECT_NAME}.exe)
SET(CPACK_PACKAGE_EXECUTABLES "${PROJECT_NAME}" "${PROJECT_NAME}" ${CPACK_PACKAGE_EXECUTABLES}) SET(CPACK_PACKAGE_EXECUTABLES "${PROJECT_NAME}" "${PROJECT_NAME}" ${CPACK_PACKAGE_EXECUTABLES})
SET(CPACK_CREATE_DESKTOP_LINKS "${PROJECT_NAME}" ${CPACK_CREATE_DESKTOP_LINKS}) SET(CPACK_CREATE_DESKTOP_LINKS "${PROJECT_NAME}" ${CPACK_CREATE_DESKTOP_LINKS})
SET(CPACK_PACKAGE_INSTALL_DIRECTORY "${PROJECT_NAME}")
ELSEIF(APPLE) ELSEIF(APPLE)
IF(BUILD_AS_BUNDLE) IF(BUILD_AS_BUNDLE)
# On APPLE and if BUILD_AS_BUNDLE=ON, the project is created as a bundle # On APPLE and if BUILD_AS_BUNDLE=ON, the project is created as a bundle

5
src/Object.cpp
View File

@ -383,10 +383,7 @@ void Object::contextMenuEvent(QContextMenuEvent * event)
QString text; QString text;
if(_savedFileName.isEmpty()) if(_savedFileName.isEmpty())
{ {
#ifndef WIN32 _savedFileName=QDir::homePath()+"/figure.png";
_savedFileName = QDir::homePath();
#endif
_savedFileName+="/figure.png";
} }
text = QFileDialog::getSaveFileName(this, tr("Save figure to ..."), _savedFileName, "*.png *.xpm *.jpg *.pdf"); text = QFileDialog::getSaveFileName(this, tr("Save figure to ..."), _savedFileName, "*.png *.xpm *.jpg *.pdf");
if(!text.isEmpty()) if(!text.isEmpty())