#include "qtuiapplication.h"
-#include <QIcon>
#include <QDir>
+#include <QFile>
#include <QStringList>
#ifdef HAVE_KDE4
# include <KStandardDirs>
#endif
+#include "chatviewsettings.h"
#include "client.h"
#include "cliparser.h"
#include "mainwin.h"
Quassel::setRunMode(Quassel::ClientOnly);
-#if QT_VERSION < 0x050000
- qInstallMsgHandler(Client::logMessage);
-#else
- qInstallMessageHandler(Client::logMessage);
+#if QT_VERSION >= 0x050000
connect(this, &QGuiApplication::commitDataRequest, this, &QtUiApplication::commitData, Qt::DirectConnection);
connect(this, &QGuiApplication::saveStateRequest, this, &QtUiApplication::saveState, Qt::DirectConnection);
#endif
bool QtUiApplication::init()
{
if (Quassel::init()) {
- // FIXME: MIGRATION 0.3 -> 0.4: Move database and core config to new location
- // Move settings, note this does not delete the old files
-#ifdef Q_OS_MAC
- QSettings newSettings("quassel-irc.org", "quasselclient");
-#else
-
-# ifdef Q_OS_WIN
- QSettings::Format format = QSettings::IniFormat;
-# else
- QSettings::Format format = QSettings::NativeFormat;
-# endif
-
- QString newFilePath = Quassel::configDirPath() + "quasselclient"
- + ((format == QSettings::NativeFormat) ? QLatin1String(".conf") : QLatin1String(".ini"));
- QSettings newSettings(newFilePath, format);
-#endif /* Q_OS_MAC */
-
- if (newSettings.value("Config/Version").toUInt() == 0) {
-# ifdef Q_OS_MAC
- QString org = "quassel-irc.org";
-# else
- QString org = "Quassel Project";
-# endif
- QSettings oldSettings(org, "Quassel Client");
- if (oldSettings.allKeys().count()) {
- qWarning() << "\n\n*** IMPORTANT: Config and data file locations have changed. Attempting to auto-migrate your client settings...";
- foreach(QString key, oldSettings.allKeys())
- newSettings.setValue(key, oldSettings.value(key));
- newSettings.setValue("Config/Version", 1);
- qWarning() << "* Your client settings have been migrated to" << newSettings.fileName();
- qWarning() << "*** Migration completed.\n\n";
- }
- }
-
- // MIGRATION end
-
// Settings upgrade/downgrade handling
if (!migrateSettings()) {
qCritical() << "Could not load or upgrade client settings, terminating!";
return false;
}
- // Checking if settings Icon Theme is valid
- QString savedIcontheme = QtUiSettings().value("IconTheme", QVariant("")).toString();
-#ifndef WITH_OXYGEN
- if (savedIcontheme == "oxygen")
- QtUiSettings().remove("IconTheme");
-#endif
-#ifndef WITH_BREEZE
- if (savedIcontheme == "breeze")
- QtUiSettings().remove("IconTheme");
-#endif
-#ifndef WITH_BREEZE_DARK
- if (savedIcontheme == "breezedark")
- QtUiSettings().remove("IconTheme");
-#endif
-
- // Set the icon theme
- if (Quassel::isOptionSet("icontheme"))
- QIcon::setThemeName(Quassel::optionValue("icontheme"));
- else if (QtUiSettings().value("IconTheme", QVariant("")).toString() != "")
- QIcon::setThemeName(QtUiSettings().value("IconTheme").toString());
- else if (QIcon::themeName().isEmpty())
- // Some platforms don't set a default icon theme; chances are we can find our bundled theme though
- QIcon::setThemeName("breeze");
-
Client::init(new QtUi());
// Init UI only after the event loop has started
QtUi::mainWindow()->quit();
});
-
return true;
}
return false;
//
// NOTE: If you increase the minor version, you MUST ALSO add new version upgrade logic in
// applySettingsMigration()! Otherwise, settings upgrades will fail.
- const uint VERSION_MINOR_CURRENT = 7;
+ const uint VERSION_MINOR_CURRENT = 9;
// Stored minor version
uint versionMinor = s.versionMinor();
// saved. Exceptions will be noted below.
// NOTE: If you add new upgrade logic here, you MUST ALSO increase VERSION_MINOR_CURRENT in
// migrateSettings()! Otherwise, your upgrade logic won't ever be called.
+ case 9:
+ {
+ // New default changes: show highest sender prefix mode, if available
+
+ // --------
+ // ChatView settings
+ ChatViewSettings chatViewSettings;
+ const QString senderPrefixModeId = "SenderPrefixMode";
+ if (!chatViewSettings.valueExists(senderPrefixModeId)) {
+ // New default is HighestMode, preserve previous behavior by setting to NoModes
+ chatViewSettings.setValue(senderPrefixModeId,
+ static_cast<int>(UiStyle::SenderPrefixMode::NoModes));
+ }
+ // --------
+
+ // Migration complete!
+ return true;
+ }
+
+ case 8:
+ {
+ // New default changes: RegEx checkbox now toggles Channel regular expressions, too
+ //
+ // This only affects local highlights. Core-side highlights weren't released in stable when
+ // this change was made, so no need to migrate those.
+
+ // --------
+ // NotificationSettings
+ NotificationSettings notificationSettings;
+
+ // Check each highlight rule for a "Channel" field. If one exists, convert to RegEx mode.
+ // This might be more efficient with std::transform() or such. It /is/ only run once...
+ auto highlightList = notificationSettings.highlightList();
+ bool changesMade = false;
+ for (int index = 0; index < highlightList.count(); ++index)
+ {
+ // Load the highlight rule...
+ auto highlightRule = highlightList[index].toMap();
+
+ // Check if "Channel" has anything set and RegEx is disabled
+ if (!highlightRule["Channel"].toString().isEmpty()
+ && highlightRule["RegEx"].toBool() == false) {
+ // We have a rule to convert
+
+ // Mark as a regular expression, allowing the Channel filtering to work the same as
+ // before the upgrade
+ highlightRule["RegEx"] = true;
+
+ // Convert the main rule to regular expression, mirroring the conversion to wildcard
+ // format from QtUiMessageProcessor::checkForHighlight()
+ highlightRule["Name"] =
+ "(^|\\W)" + QRegExp::escape(highlightRule["Name"].toString()) + "(\\W|$)";
+
+ // Save the rule back
+ highlightList[index] = highlightRule;
+ changesMade = true;
+ }
+ }
+
+ // Save the modified rules if any changes were made
+ if (changesMade) {
+ notificationSettings.setHighlightList(highlightList);
+ }
+ // --------
+
+ // Migration complete!
+ return true;
+ }
case 7:
{
// New default changes: UseProxy is no longer used in CoreAccountSettings
projects / quassel.git / blobdiff