Change progran name to keepassx1

share/CMakeLists.txt

@@ -1,13 +1,13 @@
 # CMake is still experimental, use qmake instead
 
-INSTALL(DIRECTORY keepassx/i18n keepassx/icons
+INSTALL(DIRECTORY keepassx1/i18n keepassx/icons
 	DESTINATION ${SHAREDIR}
 	PATTERN *.qm EXCLUDE
 	PATTERN *~ EXCLUDE
 	PATTERN .svn EXCLUDE
 )
 
-INSTALL(FILES keepassx/license.html DESTINATION ${SHAREDIR})
+INSTALL(FILES keepassx1/license.html DESTINATION ${SHAREDIR})
 
 IF (NOT MINGW AND NOT APPLE)
 	INSTALL(DIRECTORY applications

share/applications/keepassx1.desktop

@@ -4,7 +4,7 @@ GenericName=Cross Platform Password Manager
 GenericName[de]=Passwortverwaltung
 GenericName[es]=Gestor de contraseñas multiplataforma
 GenericName[fr]=Gestionnaire de mot de passe
-Exec=keepassx %f
+Exec=keepassx1 %f
 Icon=keepassx
 Comment=Cross Platform Password Manager
 Comment[de]=Passwortverwaltung

src/src.pro

@@ -44,13 +44,13 @@ unix : !macx : !isEqual(QMAKE_WIN32,1){
 			DEFINES += GLOBAL_AUTOTYPE
 		}
 	}
-	TARGET = ../bin/keepassx
+	TARGET = ../bin/keepassx1
 	target.path = $${PREFIX}/bin
-	datai18n.files = ../share/keepassx/i18n/*.qm
-	datai18n.path = $${PREFIX}/share/keepassx/i18n
-	dataicons.files = ../share/keepassx/icons/*.png
-	dataicons.path = $${PREFIX}/share/keepassx/icons
-	datalicense.files = ../share/keepassx/license.html
+	datai18n.files = ../share/keepassx1/i18n/*.qm
+	datai18n.path = $${PREFIX}/share/keepassx1/i18n
+	dataicons.files = ../share/keepassx1/icons/*.png
+	dataicons.path = $${PREFIX}/share/keepassx1/icons
+	datalicense.files = ../share/keepassx1/license.html
 	datalicense.path = $${PREFIX}/share/keepassx
 	
 	shareapp.files = ../share/applications/*.desktop
@@ -90,7 +90,7 @@ macx {
 	}
 	TARGET = ../bin/KeePassX
 	target.path = $${PREFIX}
-	data.files += ../share/keepassx
+	data.files += ../share/keepassx1
 	data.path = Contents/Resources
 	INSTALLS += data
 	LIBS += -framework CoreFoundation
@@ -134,7 +134,7 @@ isEqual(QMAKE_WIN32,1){
 	isEmpty(PREFIX): PREFIX = "C:/Program\ files/KeePassX"
 	TARGET = ../bin/KeePassX
 	target.path = $${PREFIX}
-	data.files += ../share/keepassx/*
+	data.files += ../share/keepassx1/*
 	data.path = $${PREFIX}/share
 	INSTALLS += data
 	win32-msvc*: LIBS += advapi32.lib
@@ -143,7 +143,7 @@ isEqual(QMAKE_WIN32,1){
 		qt_libs.path = $${PREFIX}
 		INSTALLS += qt_libs
 	}
-	RC_FILE = ../share/win_ico/keepassx.rc
+	RC_FILE = ../share/win_ico/keepassx1.rc
 	QMAKE_LINK_OBJECT_SCRIPT = $${OBJECTS_DIR}/$${QMAKE_LINK_OBJECT_SCRIPT}
 #	SOURCES += main_win32.cpp
 }
@@ -177,27 +177,27 @@ FORMS += forms/AboutDlg.ui \
 #         forms/TrashCanDlg.ui \
          forms/WorkspaceLockedWidget.ui
 
-TRANSLATIONS_KX = translations/keepassx-de_DE.ts \
-                  translations/keepassx-es_ES.ts \
-                  translations/keepassx-fi_FI.ts \
-                  translations/keepassx-fr_FR.ts \
-                  translations/keepassx-gl_ES.ts \
-                  translations/keepassx-hu_HU.ts \
-                  translations/keepassx-it_IT.ts \
-                  translations/keepassx-ja_JP.ts \
-                  translations/keepassx-nb_NO.ts \
-                  translations/keepassx-nl_NL.ts \
-                  translations/keepassx-pl_PL.ts \
-                  translations/keepassx-pt_PT.ts \
-                  translations/keepassx-ru_RU.ts \
-                  translations/keepassx-sk_SK.ts \
-                  translations/keepassx-sr_RS.ts \
-                  translations/keepassx-tr_TR.ts \
-                  translations/keepassx-uk_UA.ts \
-                  translations/keepassx-zh_CN.ts
+TRANSLATIONS_KX = translations/keepassx1-de_DE.ts \
+                  translations/keepassx1-es_ES.ts \
+                  translations/keepassx1-fi_FI.ts \
+                  translations/keepassx1-fr_FR.ts \
+                  translations/keepassx1-gl_ES.ts \
+                  translations/keepassx1-hu_HU.ts \
+                  translations/keepassx1-it_IT.ts \
+                  translations/keepassx1-ja_JP.ts \
+                  translations/keepassx1-nb_NO.ts \
+                  translations/keepassx1-nl_NL.ts \
+                  translations/keepassx1-pl_PL.ts \
+                  translations/keepassx1-pt_PT.ts \
+                  translations/keepassx1-ru_RU.ts \
+                  translations/keepassx1-sk_SK.ts \
+                  translations/keepassx1-sr_RS.ts \
+                  translations/keepassx1-tr_TR.ts \
+                  translations/keepassx1-uk_UA.ts \
+                  translations/keepassx1-zh_CN.ts
 
 # also update in translations_release.sh
-TRANSLATIONS_DISABLED = translations/keepassx-cs_CZ.ts
+TRANSLATIONS_DISABLED = translations/keepassx1-cs_CZ.ts
 
 TRANSLATIONS_QT = translations/qt_fi.ts \
                   translations/qt_gl_ES.ts \
@@ -209,8 +209,8 @@ TRANSLATIONS_QT = translations/qt_fi.ts \
 
 # missing Qt translation: nb_NO
 
-TRANSLATIONS = $$TRANSLATIONS_KX $$TRANSLATIONS_DISABLED translations/keepassx-xx_XX.ts
-#TRANSLATIONS_UPDATE = $$TRANSLATIONS_KX $$TRANSLATIONS_DISABLED translations/keepassx-xx_XX.ts
+TRANSLATIONS = $$TRANSLATIONS_KX $$TRANSLATIONS_DISABLED translations/keepassx1-xx_XX.ts
+#TRANSLATIONS_UPDATE = $$TRANSLATIONS_KX $$TRANSLATIONS_DISABLED translations/keepassx1-xx_XX.ts
 #TRANSLATIONS_COMPILE = $$TRANSLATIONS_KX $$TRANSLATIONS_QT
 
 HEADERS += main.h \
@@ -333,11 +333,11 @@ SOURCES += main.cpp \
            export/Export_Txt.cpp
 
 isEqual(PRECOMPILED,0) {
-	QMAKE_CXXFLAGS += -include keepassx.h
+	QMAKE_CXXFLAGS += -include keepassx1.h
 }
 else {
 	CONFIG += precompile_header
-	PRECOMPILED_HEADER = keepassx.h
+	PRECOMPILED_HEADER = keepassx1.h
 }
 
 RESOURCES += res/resources.qrc
@@ -354,8 +354,8 @@ RESOURCES += res/resources.qrc
 
 #exists($$QMAKE_LRELEASE) {
 #	updateqm.input = TRANSLATIONS_COMPILE
-#	updateqm.output = ../share/keepassx/i18n/${QMAKE_FILE_BASE}.qm
-#	updateqm.commands = $$QMAKE_LRELEASE ${QMAKE_FILE_IN} -qm ../share/keepassx/i18n/${QMAKE_FILE_BASE}.qm
+#	updateqm.output = ../share/keepassx1/i18n/${QMAKE_FILE_BASE}.qm
+#	updateqm.commands = $$QMAKE_LRELEASE ${QMAKE_FILE_IN} -qm ../share/keepassx1/i18n/${QMAKE_FILE_BASE}.qm
 #	updateqm.CONFIG += no_link
 #	
 #	QMAKE_EXTRA_COMPILERS += updateqm