1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
This commit has several touch ups that only effect the OS X clients.

`info.plist` and `qt.pro` are now configured to create an automatic
short version to help distinguish between clients clearly and include a
referenced file not put into the build when compiled.
`./img/icon/qtox_profile.icns’

`info.plist` also had it’s bundle version to be  updated to the 1.2.2
tag and supported languages added and fixed referenced file.

The default save location has also been moved to comply with the Tox
Client Standard. (Previous location was ~/Library/Prefrences/tox )

A basic bash profile mover has also been included to show I did think
of that.
This commit is contained in:
Rowen Stipe 2016-01-18 14:36:35 -05:00
parent b804544408
commit f7c262fb07
4 changed files with 55 additions and 19 deletions

15
OSX-Migrater.sh Executable file
View File

@ -0,0 +1,15 @@
#!/usr/bin/env bash
# A qTox profile migrater for OSX
echo "Figuring out if action is required ..."
if [ -d ~/Library/Prefrences/tox]
echo "Moving profile(s) ..."
cp -r ~/Library/Preferences/tox ~/Library/Application\ Support/
mv ~/Library/Application\ Support/tox/ ~/Library/Application\ Support/Tox
mv ~/Library/Preferences/tox ~/.Tox-Backup
echo "Done! You profile(s) have been moved! A back up coppy still exists at:"
echo "~/.Tox-Backup"
else
echo "Cannot locate old profile directory, profile migration not performed"
fi
exit 0

View File

@ -9,7 +9,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleSignature</key>
<string>????</string>
<string>toxq</string>
<key>CFBundleExecutable</key>
<string>qtox</string>
<key>CFBundleDisplayName</key>
@ -17,9 +17,9 @@
<key>CFBundleName</key>
<string>qTox</string>
<key>CFBundleVersion</key>
<string>1.0.0</string>
<string>1.2.2</string>
<key>CFBundleShortVersionString</key>
<string>1.0.0-EXPERIMENTIAL</string>
<string>@SHORT_VERSION@</string>
<key>CFBundleIdentifier</key>
<string>chat.tox.qtox</string>
<key>CFBundleURLTypes</key>
@ -34,7 +34,7 @@
<string>tox</string>
</array>
<key>CFBundleURLIconFile</key>
<string>qtox_profile.icns</string>
<string>qtox_profile</string>
</dict>
</array>
<key>CFBundleDocumentTypes</key>
@ -49,7 +49,7 @@
<key>CFBundleTypeRole</key>
<string>Editor</string>
<key>CFBundleTypeIconFile</key>
<string>qtox_profile.icns</string>
<string>qtox_profile</string>
<key>CFBundleTypeMIMETypes</key>
<array>
<string>application/x-tox.profile</string>
@ -84,19 +84,30 @@
</dict>
</dict>
</array>
<key>CFBundleLocalizations</key>
<array>
<string>en_US</string>
<string>en</string>
<string>bg_BG</string>
<string>de_DE</string>
<string>fi_FI</string>
<string>fr_FR</string>
<string>it_IT</string>
<string>pl_PL</string>
<string>ru_RU</string>
<string>uk_UA</string>
<string>sv</string>
</array>
<key>CFBundleLocalizations</key>
<array>
<string>en_US</string>
<string>bg_BG</string>
<string>cs</string>
<string>de_DE</string>
<string>el</string>
<string>es_MX</string>
<string>fi_FI</string>
<string>fr_FR</string>
<string>hr_HR</string>
<string>hu_HU</string>
<string>it_IT</string>
<string>lt_LT</string>
<string>nl_NL</string>
<string>nb_NO</string>
<string>pl_PL</string>
<string>pt_BR</string>
<string>ru_RU</string>
<string>sl</string>
<string>sv</string>
<string>tr_TR</string>
<string>uk_UA</string>
<string>zh_CH</string>
</array>
</dict>
</plist>

View File

@ -164,6 +164,13 @@ win32 {
LIBS += -lqrencode -lsqlcipher
contains(DEFINES, QTOX_PLATFORM_EXT) { LIBS += -framework IOKit -framework CoreFoundation }
contains(DEFINES, QTOX_FILTER_AUDIO) { LIBS += -lfilteraudio }
#Files to be includes into the qTox.app/Contents/Resources folder
APP_RESOURCE.files = img/icons/qtox_profile.icns
APP_RESOURCE.path = Contents/Resources
QMAKE_BUNDLE_DATA += APP_RESOURCE
#Dynamic versioning for Info.plist
INFO_PLIST_PATH = $$shell_quote($${OUT_PWD}/$${TARGET}.app/Contents/Info.plist)
QMAKE_POST_LINK += /usr/libexec/PlistBuddy -c \"Set :CFBundleShortVersionString $${GIT_DESCRIBE}\" $${INFO_PLIST_PATH}
} else {
android {
LIBS += -ltoxcore -ltoxav -ltoxencryptsave -ltoxdns

View File

@ -537,6 +537,9 @@ QString Settings::getSettingsDirPath()
#ifdef Q_OS_WIN
return QDir::cleanPath(QStandardPaths::writableLocation(QStandardPaths::HomeLocation) + QDir::separator()
+ "AppData" + QDir::separator() + "Roaming" + QDir::separator() + "tox")+QDir::separator();
#elif defined(Q_OS_OSX)
return QDir::cleanPath(QStandardPaths::writableLocation(QStandardPaths::HomeLocation) + QDir::separator()
+ "Library" + QDir::separator() + "Application Support" + QDir::separator() + "Tox")+QDir::separator();
#else
return QDir::cleanPath(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation)
+ QDir::separator() + "tox")+QDir::separator();