benkyd/flameshot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Maintain config compatibility until 1.0

Browse Source
This commit is contained in:
lupoDharkael
2018-01-24 01:27:25 +01:00
parent addc3dfd8c
commit 71b63dcd6a
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main.cpp
View File

@@ -36,7 +36,8 @@
int main(int argc, char *argv[]) {
// required for the button serialization
qRegisterMetaTypeStreamOperators<QVector<int> >("QVector<int>");
// TODO: change to QVector in v1.0
qRegisterMetaTypeStreamOperators<QList<int> >("QList<int>");
qApp->setApplicationVersion(static_cast<QString>(APP_VERSION));
QTranslator translator;

12
src/utils/confighandler.cpp
View File

@@ -28,10 +28,12 @@ ConfigHandler::ConfigHandler(){
QVector<CaptureButton::ButtonType> ConfigHandler::getButtons() {
QVector<CaptureButton::ButtonType> buttons;
if (m_settings.contains("buttons")) {
QVector<int> buttonsInt = m_settings.value("buttons").value<QVector<int> >();
// TODO: remove toList in v1.0
QVector<int> buttonsInt =
m_settings.value("buttons").value<QList<int> >().toVector();
bool modified = normalizeButtons(buttonsInt);
if (modified) {
m_settings.setValue("buttons", QVariant::fromValue(buttonsInt));
m_settings.setValue("buttons", QVariant::fromValue(buttonsInt.toList()));
}
buttons = fromIntToButton(buttonsInt);
} else {
@@ -43,7 +45,8 @@ QVector<CaptureButton::ButtonType> ConfigHandler::getButtons() {
void ConfigHandler::setButtons(const QVector<CaptureButton::ButtonType> &buttons) {
QVector<int> l = fromButtonToInt(buttons);
normalizeButtons(l);
m_settings.setValue("buttons", QVariant::fromValue(l));
// TODO: remove toList in v1.0
m_settings.setValue("buttons", QVariant::fromValue(l.toList()));
}
QVector<QColor> ConfigHandler::getUserColors() {
@@ -241,7 +244,8 @@ void ConfigHandler::setAllTheButtons() {
for (const CaptureButton::ButtonType t: listTypes) {
buttons << static_cast<int>(t);
}
m_settings.setValue("buttons", QVariant::fromValue(buttons));
// TODO: remove toList in v1.0
m_settings.setValue("buttons", QVariant::fromValue(buttons.toList()));
}
QString ConfigHandler::configFilePath() const {