← Back to branch summary

~ubuntu-branches/ubuntu/natty/merkaartor/natty

« back to all changes in this revision

Viewing changes to src/Preferences/MerkaartorPreferences.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Bernd Zeimetz
  • Date: 2011-02-11 14:28:38 UTC
  • mfrom: (1.2.12 upstream) (3.1.15 sid)
  • Revision ID: james.westby@ubuntu.com-20110211142838-tjrsw2ffarnvzmvl
Tags: 0.17.2-1
* New upstream release - 0.17.2
* [b3dc89d4] Merge branch 'upstream'

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Preferences/MerkaartorPreferences.cpp
614
614
    parentDashes << 1 << 5;
615
615
 
616
616
    //Ensure we have a CacheDir value in QSettings
617
 
    Sets->setValue("backgroundImage/CacheDir", Sets->value("backgroundImage/CacheDir", HOMEDIR + "/BackgroundCache"));
 
617
    if (!g_Merk_Ignore_Preferences)
 
618
        Sets->setValue("backgroundImage/CacheDir", Sets->value("backgroundImage/CacheDir", HOMEDIR + "/BackgroundCache"));
618
619
}
619
620
 
620
621
const QVector<qreal> MerkaartorPreferences::getParentDashes() const
1713
1714
QString getDefaultLanguage(bool returnDefault)
1714
1715
{
1715
1716
    if (!g_Merk_Ignore_Preferences && !g_Merk_Reset_Preferences) {
1716
 
        QSettings Sets;
1717
 
        QString lang = Sets.value("locale/language").toString();
 
1717
        QSettings* Sets;
 
1718
        if (!g_Merk_Portable) {
 
1719
            Sets = new QSettings();
 
1720
        } else {
 
1721
            Sets = new QSettings(qApp->applicationDirPath() + "/merkaartor.ini", QSettings::IniFormat);
 
1722
        }
 
1723
        QString lang = Sets->value("locale/language").toString();
1718
1724
        if (lang == "")
1719
1725
            if (returnDefault)
1720
1726
                lang = QLocale::system().name().split("_")[0];
1730
1736
void setDefaultLanguage(const QString& theValue)
1731
1737
{
1732
1738
    if (!g_Merk_Ignore_Preferences) {
1733
 
        QSettings Sets;
1734
 
        Sets.setValue("locale/language", theValue);
 
1739
        QSettings* Sets;
 
1740
        if (!g_Merk_Portable) {
 
1741
            Sets = new QSettings();
 
1742
        } else {
 
1743
            Sets = new QSettings(qApp->applicationDirPath() + "/merkaartor.ini", QSettings::IniFormat);
 
1744
        }
 
1745
        Sets->setValue("locale/language", theValue);
1735
1746
    }
1736
1747
}