diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/aboutdialog.cpp | 40 | ||||
| -rw-r--r-- | src/aboutdialog.h | 14 | ||||
| -rw-r--r-- | src/aboutdialog.ui | 78 | ||||
| -rw-r--r-- | src/mainwindow.cpp | 15 | ||||
| -rw-r--r-- | src/transfersavesdialog.cpp | 30 |
5 files changed, 115 insertions, 62 deletions
diff --git a/src/aboutdialog.cpp b/src/aboutdialog.cpp index ed57a217..5ac05df7 100644 --- a/src/aboutdialog.cpp +++ b/src/aboutdialog.cpp @@ -29,7 +29,7 @@ along with Mod Organizer. If not, see <http://www.gnu.org/licenses/>. #include <QTextBrowser>
#include <QVariant>
#include <Qt>
-
+#include <QFontDatabase>
AboutDialog::AboutDialog(const QString &version, QWidget *parent)
: QDialog(parent)
@@ -37,24 +37,42 @@ AboutDialog::AboutDialog(const QString &version, QWidget *parent) {
ui->setupUi(this);
- m_LicenseFiles[LICENSE_LGPL3] = "lgpl-3.0.txt";
- m_LicenseFiles[LICENSE_GPL3] = "gpl-3.0.txt";
- m_LicenseFiles[LICENSE_BSD3] = "bsd3.txt";
+ m_LicenseFiles[LICENSE_LGPL3] = "LGPL-v3.0.txt";
+ m_LicenseFiles[LICENSE_LGPL21] = "GNU-LGPL-v2.1.txt";
+ m_LicenseFiles[LICENSE_GPL3] = "GPL-v3.0.txt";
+ m_LicenseFiles[LICENSE_GPL2] = "GPL-v2.0.txt";
m_LicenseFiles[LICENSE_BOOST] = "boost.txt";
- m_LicenseFiles[LICENSE_CCBY3] = "by-sa3.txt";
+ m_LicenseFiles[LICENSE_7ZIP] = "7zip.txt";
+ m_LicenseFiles[LICENSE_CCBY3] = "BY-SA-v3.0.txt";
m_LicenseFiles[LICENSE_ZLIB] = "zlib.txt";
- m_LicenseFiles[LICENSE_APACHE2] = "apache-license-2.0.txt";
+ m_LicenseFiles[LICENSE_PYTHON] = "python.txt";
+ m_LicenseFiles[LICENSE_SSL] = "openssl.txt";
+ m_LicenseFiles[LICENSE_CPPTOML] = "cpptoml.txt";
+ m_LicenseFiles[LICENSE_UDIS] = "udis86.txt";
+ m_LicenseFiles[LICENSE_SPDLOG] = "spdlog.txt";
+ m_LicenseFiles[LICENSE_FMT] = "fmt.txt";
+ m_LicenseFiles[LICENSE_SIP] = "sip.txt";
+ m_LicenseFiles[LICENSE_CASTLE] = "Castle.txt";
+ m_LicenseFiles[LICENSE_ANTLR] = "AntlrBuildTask.txt";
addLicense("Qt", LICENSE_LGPL3);
addLicense("Qt Json", LICENSE_GPL3);
addLicense("Boost Library", LICENSE_BOOST);
- addLicense("7-zip", LICENSE_LGPL3);
- addLicense("ZLib", LICENSE_ZLIB);
+ addLicense("7-zip", LICENSE_7ZIP);
+ addLicense("ZLib", LICENSE_NONE);
addLicense("Tango Icon Theme", LICENSE_NONE);
addLicense("RRZE Icon Set", LICENSE_CCBY3);
addLicense("Icons by Lorc, Delapouite and sbed available on http://game-icons.net", LICENSE_CCBY3);
- addLicense("Castle Core", LICENSE_APACHE2);
+ addLicense("Castle Core", LICENSE_CASTLE);
+ addLicense("ANTLR", LICENSE_ANTLR);
addLicense("LOOT", LICENSE_GPL3);
+ addLicense("Python", LICENSE_PYTHON);
+ addLicense("OpenSSL", LICENSE_SSL);
+ addLicense("cpptoml", LICENSE_CPPTOML);
+ addLicense("Udis86", LICENSE_UDIS);
+ addLicense("spdlog", LICENSE_SPDLOG);
+ addLicense("{fmt}", LICENSE_FMT);
+ addLicense("SIP", LICENSE_SIP);
ui->nameLabel->setText(QString("<span style=\"font-size:12pt; font-weight:600;\">%1 %2</span>").arg(ui->nameLabel->text()).arg(version));
#if defined(HGID)
@@ -64,6 +82,8 @@ AboutDialog::AboutDialog(const QString &version, QWidget *parent) #else
ui->revisionLabel->setText(ui->revisionLabel->text() + " unknown");
#endif
+
+ ui->licenseText->setFont(QFontDatabase::systemFont(QFontDatabase::FixedFont));
}
@@ -85,7 +105,7 @@ void AboutDialog::on_creditsList_currentItemChanged(QListWidgetItem *current, QL {
auto iter = m_LicenseFiles.find(current->data(Qt::UserRole).toInt());
if (iter != m_LicenseFiles.end()) {
- QString filePath = qApp->applicationDirPath() + "/license/" + iter->second;
+ QString filePath = qApp->applicationDirPath() + "/licenses/" + iter->second;
QString text = MOBase::readFileText(filePath);
ui->licenseText->setText(text);
} else {
diff --git a/src/aboutdialog.h b/src/aboutdialog.h index 103a0d2f..a67c9c73 100644 --- a/src/aboutdialog.h +++ b/src/aboutdialog.h @@ -45,12 +45,22 @@ private: enum Licenses {
LICENSE_NONE,
LICENSE_LGPL3,
+ LICENSE_LGPL21,
LICENSE_GPL3,
- LICENSE_BSD3,
+ LICENSE_GPL2,
LICENSE_BOOST,
LICENSE_CCBY3,
+ LICENSE_PYTHON,
+ LICENSE_SSL,
+ LICENSE_CPPTOML,
+ LICENSE_7ZIP,
LICENSE_ZLIB,
- LICENSE_APACHE2
+ LICENSE_UDIS,
+ LICENSE_SPDLOG,
+ LICENSE_FMT,
+ LICENSE_SIP,
+ LICENSE_CASTLE,
+ LICENSE_ANTLR
};
private:
diff --git a/src/aboutdialog.ui b/src/aboutdialog.ui index 50a9de5f..348a33b0 100644 --- a/src/aboutdialog.ui +++ b/src/aboutdialog.ui @@ -120,14 +120,14 @@ <item>
<widget class="QLabel" name="label_3">
<property name="text">
- <string notr="true">Copyright 2011-2016 Sebastian Herbord</string>
+ <string notr="true"><html><head/><body><p>Copyright 2011-2016 Sebastian Herbord</p><p>Copyright 2016-2018 Mod Organizer 2 contributors</p></body></html></string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_2">
<property name="text">
- <string notr="true"><html><head/><body><p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.</p><p>See the GNU General Public License for more details.</p><p>Source code can be found at <a href="https://github.com/TanninOne/modorganizer"><span style=" text-decoration: underline; color:#007af4;">GitHub</span></a>.</p></body></html></string>
+ <string notr="true"><html><head/><body><p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.</p><p>See the GNU General Public License for more details.</p><p>Source code can be found at <a href="https://github.com/Modorganizer2/modorganizer"><span style=" text-decoration: underline; color:#007af4;">GitHub</span></a>.</p></body></html></string>
</property>
<property name="wordWrap">
<bool>true</bool>
@@ -154,7 +154,7 @@ <string>Thanks</string>
</attribute>
<layout class="QHBoxLayout" name="horizontalLayout_3">
- <item>
+ <item>
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Current Maintainers</string>
@@ -167,12 +167,17 @@ </property>
<item>
<property name="text">
- <string notr="true">LePresidente</string>
+ <string notr="true">LePresidente (Project Lead)</string>
</property>
</item>
<item>
<property name="text">
- <string notr="true">Silarn</string>
+ <string>AL12</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string notr="true">Diana</string>
</property>
</item>
<item>
@@ -182,7 +187,7 @@ </item>
<item>
<property name="text">
- <string notr="true">Diana</string>
+ <string notr="true">Silarn</string>
</property>
</item>
</widget>
@@ -203,17 +208,22 @@ </property>
<item>
<property name="text">
- <string notr="true">pndrev (German)</string>
+ <string notr="true">Scythe1912 (Chinese)</string>
</property>
</item>
<item>
<property name="text">
- <string notr="true">DaWul (Spanish)</string>
+ <string notr="true">yc0620shen (Chinese)</string>
</property>
</item>
<item>
<property name="text">
- <string notr="true">Fiama (Spanish)</string>
+ <string notr="true">miraclefreak (Czech)</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Cyb3r (Dutch)</string>
</property>
</item>
<item>
@@ -233,17 +243,35 @@ </item>
<item>
<property name="text">
- <string notr="true">Scythe1912 (Chinese)</string>
+ <string>Faron (German)</string>
</property>
</item>
<item>
<property name="text">
- <string notr="true">yc0620shen (Chinese)</string>
+ <string notr="true">pndrev (German)</string>
</property>
</item>
<item>
<property name="text">
- <string notr="true">miraclefreak (Czech)</string>
+ <string>Mordan (Greek)</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string notr="true">Ren (Korean)</string>
+ </property>
+ <property name="toolTip">
+ <string/>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Yoosk (Polish)</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Brgodfx (Portuguese)</string>
</property>
</item>
<item>
@@ -253,15 +281,22 @@ </item>
<item>
<property name="text">
- <string notr="true">Ren (Korean)</string>
+ <string notr="true">DaWul (Spanish)</string>
</property>
- <property name="toolTip">
- <string/>
+ </item>
+ <item>
+ <property name="text">
+ <string notr="true">Fiama (Spanish)</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Jax (Swedish)</string>
</property>
</item>
<item>
<property name="text">
- <string>... more (Can't track)</string>
+ <string>...and all other Transifex contributors!</string>
</property>
<property name="toolTip">
<string/>
@@ -275,7 +310,7 @@ <item>
<widget class="QGroupBox" name="groupBox_3">
<property name="title">
- <string>Other Supporter</string>
+ <string>Other Supporters && Contributors</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_7">
<item>
@@ -283,9 +318,14 @@ <property name="selectionMode">
<enum>QAbstractItemView::NoSelection</enum>
</property>
- <item>
+ <item>
+ <property name="text">
+ <string>SuperSandro2000</string>
+ </property>
+ </item>
+ <item>
<property name="text">
- <string notr="true">Al12 (Discord) </string>
+ <string>AnyOldName3</string>
</property>
</item>
<item>
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index f38ddf15..e5eacc41 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -4669,9 +4669,9 @@ void MainWindow::on_bossButton_clicked() QStringList parameters;
parameters << "--game" << m_OrganizerCore.managedGame()->gameShortName()
- << "--gamePath" << QString("\"%1\"").arg(m_OrganizerCore.managedGame()->gameDirectory().absolutePath())
- << "--pluginListPath" << QString("\"%1/loadorder.txt\"").arg(m_OrganizerCore.profilePath())
- << "--out" << QString("\"%1\"").arg(outPath);
+ << "--gamePath" << QString("\"%1\"").arg(m_OrganizerCore.managedGame()->gameDirectory().absolutePath())
+ << "--pluginListPath" << QString("\"%1/loadorder.txt\"").arg(m_OrganizerCore.profilePath())
+ << "--out" << QString("\"%1\"").arg(outPath);
if (m_DidUpdateMasterList) {
parameters << "--skipUpdateMasterlist";
@@ -4791,7 +4791,7 @@ void MainWindow::on_bossButton_clicked() if (success) {
m_DidUpdateMasterList = true;
- /*if (reportURL.length() > 0) {
+ if (reportURL.length() > 0) {
m_IntegratedBrowser.setWindowTitle("LOOT Report");
QString report(reportURL.c_str());
QStringList temp = report.split("?");
@@ -4800,13 +4800,6 @@ void MainWindow::on_bossButton_clicked() url.setQuery(temp.at(1).toUtf8());
}
m_IntegratedBrowser.openUrl(url);
- }*/
-
- // if the game specifies load order by file time, our own load order file needs to be removed because it's outdated.
- // refreshESPList will then use the file time as the load order.
- if (m_OrganizerCore.managedGame()->loadOrderMechanism() == IPluginGame::LoadOrderMechanism::FileTime) {
- qDebug("removing loadorder.txt");
- QFile::remove(m_OrganizerCore.currentProfile()->getLoadOrderFileName());
}
m_OrganizerCore.refreshESPList();
m_OrganizerCore.savePluginList();
diff --git a/src/transfersavesdialog.cpp b/src/transfersavesdialog.cpp index b8dda056..61dab6e5 100644 --- a/src/transfersavesdialog.cpp +++ b/src/transfersavesdialog.cpp @@ -74,6 +74,11 @@ public: return { m_File };
}
+ virtual bool hasScriptExtenderFile() const override
+ {
+ return false;
+ }
+
private:
QString m_File;
};
@@ -95,6 +100,11 @@ public: {
return nullptr;
}
+
+ virtual bool hasScriptExtenderSave(QString const &file) const override
+ {
+ return false;
+ }
};
} //end anonymous namespace
@@ -334,26 +344,6 @@ bool TransferSavesDialog::transferCharacters( sourceFile.absoluteFilePath().toUtf8().constData(),
destinationFile.toUtf8().constData());
}
-
- QFileInfo sourceFileSE(sourceFile.absolutePath() + "/" + sourceFile.completeBaseName() + "." + m_GamePlugin->savegameSEExtension());
- if (sourceFileSE.exists()) {
- QString destinationFileSE(destination.absoluteFilePath(sourceFileSE.fileName()));
-
- //If the file is already there, let them skip (or not).
- if (QFile::exists(destinationFileSE)) {
- if (!testOverwrite(overwriteMode, destinationFileSE)) {
- continue;
- }
- //OK, they want to remove it.
- QFile::remove(destinationFileSE);
- }
-
- if (!method(sourceFileSE.absoluteFilePath(), destinationFileSE)) {
- qCritical(errmsg,
- sourceFileSE.absoluteFilePath().toUtf8().constData(),
- destinationFileSE.toUtf8().constData());
- }
- }
}
}
return true;
|