Author: jghali
Date: Sun Jan 30 15:53:47 2022
New Revision: 24863
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24863
Log:
Move prefs files to 170 numbering and fix a bug where we could try to copy a
file over itself
Modified:
trunk/Scribus/scribus/prefsmanager.cpp
trunk/Scribus/scribus/prefsmanager.h
trunk/Scribus/scribus/scfonts.cpp
trunk/Scribus/scribus/scribusapp.cpp
Modified: trunk/Scribus/scribus/prefsmanager.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24863&path=/trunk/Scribus/scribus/prefsmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/prefsmanager.cpp (original)
+++ trunk/Scribus/scribus/prefsmanager.cpp Sun Jan 30 15:53:47 2022
@@ -102,20 +102,13 @@
return prefsFile;
}
-bool PrefsManager::importingFrom12x()
-{
- return m_importingFrom12;
-}
-
-
void PrefsManager::setup()
{
setupPreferencesLocation();
- m_importingFrom12=copyOldAppConfigAndData();
- prefsFile = new PrefsFile( m_prefsLocation + "prefs150.xml" );
- if (m_importingFrom12)
- convert12Preferences();
+ copyOldAppConfigAndData();
+ prefsFile = new PrefsFile( m_prefsLocation + "prefs170.xml" );
+
//<<CB TODO Reset keyboard shortcuts of all 1.3 users as too many
// have conflicts if they don't nuke their settings.
// - Remove for 1.3.0 release: importingFrom12=true;
@@ -770,106 +763,116 @@
bool PrefsManager::copyOldAppConfigAndData()
{
- if (QFile::exists(m_prefsLocation + "scribus150.rc") &&
QFile::exists(m_prefsLocation + "prefs150.xml"))
+ if (QFile::exists(m_prefsLocation + "scribus170.rc") &&
QFile::exists(m_prefsLocation + "prefs170.xml"))
return false;
//Move to using the ScPaths default prefs location/scribus.* from
~/.scribus.*
QString oldPR = QDir::toNativeSeparators(QDir::homePath() +
"/.scribus.rc");
+ QString newPR = QDir::toNativeSeparators(m_prefsLocation +
"/scribus.rc");
QFileInfo oldPi(oldPR);
- if (oldPi.exists())
+ if (oldPi.exists() && !QFile::exists(newPR))
moveFile(oldPR, m_prefsLocation + "scribus.rc");
QString oldPR2 = QDir::toNativeSeparators(QDir::homePath() +
"/.scribusfont.rc");
+ QString newPR2 = QDir::toNativeSeparators(m_prefsLocation +
"/scribusfont.rc");
QFileInfo oldPi2(oldPR2);
- if (oldPi2.exists())
+ if (oldPi2.exists() && !QFile::exists(newPR2))
moveFile(oldPR2, m_prefsLocation + "scribusfont.rc");
QString oldPR3 = QDir::toNativeSeparators(QDir::homePath() +
"/.scribusscrap.scs");
+ QString newPR3 = QDir::toNativeSeparators(m_prefsLocation +
"/scrap.scs");
QFileInfo oldPi3(oldPR3);
- if (oldPi3.exists())
+ if (oldPi3.exists() && !QFile::exists(newPR3))
moveFile(oldPR3, m_prefsLocation + "scrap.scs");
QString oldPrefsLocation(ScPaths::oldApplicationDataDir());
QString oldPR4 = QDir::toNativeSeparators(oldPrefsLocation +
"scribus150.rc");
+ QString newPR4 = QDir::toNativeSeparators(m_prefsLocation +
"scribus150.rc");
QFileInfo oldPi4(oldPR4);
- if (oldPi4.exists())
+ if (oldPi4.exists() && !QFile::exists(newPR4))
moveFile(oldPR4, m_prefsLocation + "scribus150.rc");
QString oldPR5 = QDir::toNativeSeparators(oldPrefsLocation +
"scrap150.scs");
+ QString newPR5 = QDir::toNativeSeparators(m_prefsLocation +
"scrap150.scs");
QFileInfo oldPi5(oldPR5);
- if (oldPi5.exists())
+ if (oldPi5.exists() && !QFile::exists(newPR5))
moveFile(oldPR5, m_prefsLocation + "scrap150.scs");
QString oldPR6 = QDir::toNativeSeparators(oldPrefsLocation +
"prefs150.xml");
+ QString newPR6 = QDir::toNativeSeparators(m_prefsLocation +
"prefs150.xml");
QFileInfo oldPi6(oldPR6);
- if (oldPi6.exists())
+ if (oldPi6.exists() && !QFile::exists(newPR6))
moveFile(oldPR6, m_prefsLocation + "prefs150.xml");
QString oldPR7 = QDir::toNativeSeparators(oldPrefsLocation +
"scripter150.rc");
+ QString newPR7 = QDir::toNativeSeparators(m_prefsLocation +
"scripter150.rc");
QFileInfo oldPi7(oldPR7);
- if (oldPi7.exists())
+ if (oldPi7.exists() && !QFile::exists(newPR7))
moveFile(oldPR7, m_prefsLocation + "scripter150.rc");
QString oldPR8 = QDir::toNativeSeparators(oldPrefsLocation +
"checkfonts.xml");
+ QString newPR8 = QDir::toNativeSeparators(m_prefsLocation +
"checkfonts150.xml");
QFileInfo oldPi8(oldPR8);
- if (oldPi8.exists())
+ if (oldPi8.exists() && !QFile::exists(newPR8))
moveFile(oldPR8, m_prefsLocation + "checkfonts150.xml");
-
//Move plugin data files to new plugin data file directory
QDir oldPluginData(ScPaths::preferencesDir() + "/plugins");
const QFileInfoList filPluginData(oldPluginData.entryInfoList());
- for (const QFileInfo &fiP : filPluginData)
+ for (const QFileInfo& fiP : filPluginData)
moveFile(fiP.absoluteFilePath(), ScPaths::pluginDataDir(true) +
fiP.fileName());
//Move scrapbook files to new scrapbook directory
QDir oldScrapData(ScPaths::preferencesDir() + "/scrapbook");
const QFileInfoList filScrapData(oldScrapData.entryInfoList());
- for (const QFileInfo &fiS : filScrapData)
+ for (const QFileInfo& fiS : filScrapData)
moveFile(fiS.absoluteFilePath(), ScPaths::scrapbookDir(true) +
fiS.fileName());
//Move swatch files to new palette directory
QDir oldPaletteData(ScPaths::preferencesDir() + "/swatches");
const QFileInfoList filPaletteData(oldPaletteData.entryInfoList());
- for (const QFileInfo &fiPal : filPaletteData)
+ for (const QFileInfo& fiPal : filPaletteData)
moveFile(fiPal.absoluteFilePath(),
ScPaths::userPaletteFilesDir(true) + fiPal.fileName());
QDir oldPaletteData2 = ScPaths::preferencesDir() + "/palettes";
const QFileInfoList filPaletteData2(oldPaletteData2.entryInfoList());
- for (const QFileInfo &fiPal : filPaletteData2)
+ for (const QFileInfo& fiPal : filPaletteData2)
moveFile(fiPal.absoluteFilePath(),
ScPaths::userPaletteFilesDir(true) + fiPal.fileName());
- //Now make copies for 1.3 use and leave the old ones alone for <1.3.0
usage
- QString prefs135[5], prefs140[5], prefs150[5];
-
- prefs135[0] = QDir::toNativeSeparators(m_prefsLocation +
"scribus135.rc");
- prefs135[1] = QDir::toNativeSeparators(m_prefsLocation +
"scrap135.scs");
- prefs135[2] = QDir::toNativeSeparators(m_prefsLocation +
"prefs135.xml");
- prefs135[3] = QDir::toNativeSeparators(m_prefsLocation +
"scripter135.rc");
- prefs135[4] = QDir::toNativeSeparators(m_prefsLocation +
"checkfonts.xml");
- prefs140[0] = QDir::toNativeSeparators(m_prefsLocation +
"scribus140.rc");
- prefs140[1] = QDir::toNativeSeparators(m_prefsLocation +
"scrap140.scs");
- prefs140[2] = QDir::toNativeSeparators(m_prefsLocation +
"prefs140.xml");
- prefs140[3] = QDir::toNativeSeparators(m_prefsLocation +
"scripter140.rc");
- prefs140[4] = QDir::toNativeSeparators(m_prefsLocation +
"checkfonts.xml");
+ //Now make copies for 1.7.0 use and leave the old ones alone for <1.7.0
usage
+ QString prefs150[5], prefs160[5], prefs170[5];
+
prefs150[0] = QDir::toNativeSeparators(m_prefsLocation +
"scribus150.rc");
prefs150[1] = QDir::toNativeSeparators(m_prefsLocation +
"scrap150.scs");
prefs150[2] = QDir::toNativeSeparators(m_prefsLocation +
"prefs150.xml");
prefs150[3] = QDir::toNativeSeparators(m_prefsLocation +
"scripter150.rc");
prefs150[4] = QDir::toNativeSeparators(m_prefsLocation +
"checkfonts150.xml");
- bool existsPrefs135[5], existsPrefs140[5], existsPrefs150[5];
+ prefs160[0] = QDir::toNativeSeparators(m_prefsLocation +
"scribus160.rc");
+ prefs160[1] = QDir::toNativeSeparators(m_prefsLocation +
"scrap160.scs");
+ prefs160[2] = QDir::toNativeSeparators(m_prefsLocation +
"prefs160.xml");
+ prefs160[3] = QDir::toNativeSeparators(m_prefsLocation +
"scripter160.rc");
+ prefs160[4] = QDir::toNativeSeparators(m_prefsLocation +
"checkfonts160.xml");
+
+ prefs170[0] = QDir::toNativeSeparators(m_prefsLocation +
"scribus170.rc");
+ prefs170[1] = QDir::toNativeSeparators(m_prefsLocation +
"scrap170.scs");
+ prefs170[2] = QDir::toNativeSeparators(m_prefsLocation +
"prefs170.xml");
+ prefs170[3] = QDir::toNativeSeparators(m_prefsLocation +
"scripter170.rc");
+ prefs170[4] = QDir::toNativeSeparators(m_prefsLocation +
"checkfonts170.xml");
+
+ bool existsPrefs150[5], existsPrefs160[5], existsPrefs170[5];
for (uint i = 0; i < 5; ++i)
{
- existsPrefs135[i] = QFile::exists(prefs135[i]);
- existsPrefs140[i] = QFile::exists(prefs140[i]);
existsPrefs150[i] = QFile::exists(prefs150[i]);
- }
-
- bool retVal=false;
- if (existsPrefs150[0] && existsPrefs150[2])
+ existsPrefs160[i] = QFile::exists(prefs160[i]);
+ existsPrefs170[i] = QFile::exists(prefs170[i]);
+ }
+
+ bool retVal = false;
+ if (existsPrefs170[0] && existsPrefs170[2])
return retVal;
+
//Only check for these three as they will be autocreated if they don't
exist.
- if ((existsPrefs135[0] && !existsPrefs140[0]) || (existsPrefs135[2] &&
!existsPrefs140[2]))
+ if ((existsPrefs160[0] && !existsPrefs170[0]) || (existsPrefs160[2] &&
!existsPrefs170[2]))
{
// Now always return false
// retVal=true; // converting from 1.2 prefs
@@ -878,63 +881,38 @@
bool splashShown = ScCore->splashShowing();
if (splashShown)
ScCore->showSplash(false);
- if ( ScMessageBox::question(
ScCore->primaryMainWindow(), tr("Migrate Old Scribus Settings?"),
- tr("Scribus has detected existing
Scribus 1.3.5 preferences files.\n"
+ if (ScMessageBox::question(ScCore->primaryMainWindow(),
tr("Migrate Old Scribus Settings?"),
+ tr("Scribus has detected existing Scribus 1.6.0
preferences files.\n"
"Do you want to migrate them to the new
Scribus version?"),
- QMessageBox::Yes | QMessageBox::No,
- QMessageBox::NoButton, // GUI default
- QMessageBox::Yes // batch default
- )==QMessageBox::Yes )
+ QMessageBox::Yes | QMessageBox::No,
+ QMessageBox::NoButton, // GUI default
+ QMessageBox::Yes // batch default
+ ) == QMessageBox::Yes)
{
- for (uint i=0;i<5;++i)
+ for (uint i = 0; i < 5; ++i)
{
- if (existsPrefs135[i] &&
!existsPrefs150[i])
- copyFile(prefs135[i],
prefs150[i]);
+ if (existsPrefs160[i] &&
!existsPrefs170[i])
+ copyFile(prefs160[i],
prefs170[i]);
}
}
if (splashShown)
ScCore->showSplash(true);
}
}
- else if (existsPrefs140[0])
+ else if (existsPrefs150[0])
{
for (uint i = 0; i < 5; ++i)
{
- if (existsPrefs140[i] && !existsPrefs150[i])
- copyFile(prefs140[i], prefs150[i]);
- }
- }
- else if (existsPrefs135[0])
- {
- for (uint i = 0; i < 5; ++i)
- {
- if (existsPrefs135[i] && !existsPrefs150[i])
- copyFile(prefs135[i], prefs150[i]);
+ if (existsPrefs150[i] && !existsPrefs170[i])
+ copyFile(prefs150[i], prefs170[i]);
}
}
return retVal;
}
-void PrefsManager::convert12Preferences()
-{
- // Import 1.2 font search path prefs
- QFile fontPrefsFile12(QDir::toNativeSeparators(m_prefsLocation +
"/scribusfont.rc"));
- if (fontPrefsFile12.exists() &&
fontPrefsFile12.open(QIODevice::ReadOnly))
- {
- PrefsContext *pc = prefsFile->getContext("Fonts");
- PrefsTable *fontPrefs = pc->getTable("ExtraFontDirs");
- QTextStream tsx(&fontPrefsFile12);
- QString extraPath = tsx.readAll();
- fontPrefsFile12.close();
- QStringList extraFonts = extraPath.split("\n",
Qt::SkipEmptyParts);
- for (int i = 0; i < extraFonts.count(); ++i)
- fontPrefs->set(i, 0, extraFonts[i]);
- }
-}
-
void PrefsManager::readPrefs()
{
- QString prefsFile(m_prefsLocation + "scribus150.rc");
+ QString prefsFile(m_prefsLocation + "scribus170.rc");
if (QFile::exists(prefsFile))
{
if (!readPref(prefsFile))
@@ -1028,7 +1006,7 @@
}
ScCore->primaryMainWindow()->getDefaultPrinter(appPrefs.printerPrefs.PrinterName,
appPrefs.printerPrefs.PrinterFile, appPrefs.printerPrefs.PrinterCommand);
savePrefsXML();
- if (!writePref(m_prefsLocation + "scribus150.rc"))
+ if (!writePref(m_prefsLocation + "scribus170.rc"))
alertSavePrefsFailed();
emit prefsChanged();
}
@@ -2423,7 +2401,7 @@
appPrefs.colorPrefs.DCMSset.DefaultIntentColors =
(eRenderIntent) dc.attribute("DefaultIntentColors", "1").toInt();
appPrefs.colorPrefs.DCMSset.DefaultIntentImages =
(eRenderIntent) dc.attribute("DefaultIntentImages", "0").toInt();
}
- if (!m_importingFrom12 && dc.tagName() == "Shortcut")
+ if (dc.tagName() == "Shortcut")
{
appPrefs.keyShortcutPrefs.KeyActions[dc.attribute("Action")].actionName =
dc.attribute("Action");
QKeySequence
newKeySequence(dc.attribute("KeySequence"));
Modified: trunk/Scribus/scribus/prefsmanager.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24863&path=/trunk/Scribus/scribus/prefsmanager.h
==============================================================================
--- trunk/Scribus/scribus/prefsmanager.h (original)
+++ trunk/Scribus/scribus/prefsmanager.h Sun Jan 30 15:53:47 2022
@@ -84,13 +84,6 @@
\retval bool true if prefs were imported
*/
bool copyOldAppConfigAndData();
- /*!
- \author Craig Ringer
- \date Sun 26 June 2005
- \brief Move and convert 1.2 style preferences to new XML format
- \retval None
- */
- void convert12Preferences();
/*!
\brief Get the prefs location property
\retval QString Location of the user's preferences
@@ -213,7 +206,6 @@
~PrefsManager();
QString m_prefsLocation;
- bool m_importingFrom12 {false};
bool m_firstTimeIgnoreOldPrefs {false};
/*! \brief The last error message generated by a method of this class.
Modified: trunk/Scribus/scribus/scfonts.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24863&path=/trunk/Scribus/scribus/scfonts.cpp
==============================================================================
--- trunk/Scribus/scribus/scfonts.cpp (original)
+++ trunk/Scribus/scribus/scfonts.cpp Sun Jan 30 15:53:47 2022
@@ -1222,7 +1222,7 @@
m_checkedFonts.clear();
struct testCache foCache;
QDomDocument docu("fontcacherc");
- QFile f(pf + "/checkfonts150.xml");
+ QFile f(pf + "/checkfonts170.xml");
if (!f.open(QIODevice::ReadOnly))
return;
ScCore->setSplashStatus( QObject::tr("Reading Font Cache") );
@@ -1286,7 +1286,7 @@
ScCore->setSplashStatus( QObject::tr("Writing updated Font Cache") );
- QFile file(pf + "/checkfonts150.xml");
+ QFile file(pf + "/checkfonts170.xml");
if (!file.open(QIODevice::WriteOnly))
return;
QTextStream s(&file);
Modified: trunk/Scribus/scribus/scribusapp.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24863&path=/trunk/Scribus/scribus/scribusapp.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusapp.cpp (original)
+++ trunk/Scribus/scribus/scribusapp.cpp Sun Jan 30 15:53:47 2022
@@ -389,7 +389,7 @@
PrefsPfad = Pff;
else
PrefsPfad = ScPaths::preferencesDir();
- QString prefsXMLFile = QDir::toNativeSeparators(PrefsPfad +
"prefs150.xml");
+ QString prefsXMLFile = QDir::toNativeSeparators(PrefsPfad +
"prefs170.xml");
QFileInfo infoPrefsFile(prefsXMLFile);
if (infoPrefsFile.exists())
{
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
