AxioDL/amuse
2
0
Fork 0
mirror of https://github.com/AxioDL/amuse.git synced 2025-12-16 00:17:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update fmtlib

Browse Source
This commit is contained in:
Jack Andersen
2020-04-11 12:49:30 -10:00
parent 40efdcc38c
commit 5112228abd
17 changed files with 176 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Editor/MainWindow.cpp
View File

@@ -198,7 +198,7 @@ MainWindow::MainWindow(QWidget* parent)
MainWindow::~MainWindow() {
m_backgroundThread.quit();
m_backgroundThread.wait();
fmt::print(fmt("IM DYING\n"));
fmt::print(FMT_STRING("IM DYING\n"));
}
void MainWindow::connectMessenger(UIMessenger* messenger, Qt::ConnectionType type) {

3
Editor/ProjectModel.cpp
View File

@@ -655,7 +655,7 @@ void ProjectModel::saveSongsIndex() {
QFileInfo songsFile(m_dir, QStringLiteral("!songs.yaml"));
athena::io::YAMLDocWriter dw("amuse::Songs");
for (auto& p : amuse::SortUnorderedMap(m_midiFiles))
dw.writeString(fmt::format(fmt("{}"), p.first), p.second.get().m_path.toUtf8().data());
dw.writeString(fmt::format(FMT_STRING("{}"), p.first), p.second.get().m_path.toUtf8().data());
athena::io::FileWriter w(QStringToSysString(songsFile.filePath()));
if (!w.hasError())
dw.finish(&w);
@@ -2102,6 +2102,7 @@ void ProjectModel::deallocateSongId(amuse::SongId oldId) {
amuse::SongId ProjectModel::exchangeSongId(amuse::SongId oldId, std::string_view newName) {
m_projectDatabase.setIdDatabases();
amuse::SongId newId;
// TODO: Heterogeneous lookup when C++20 available
auto search = amuse::SongId::CurNameDB->m_stringToId.find(newName.data());
if (search == amuse::SongId::CurNameDB->m_stringToId.cend()) {
newId = amuse::SongId::CurNameDB->generateId(amuse::NameDB::Type::Song);

1
Editor/SongGroupEditor.cpp
View File

@@ -875,6 +875,7 @@ bool SetupListModel::setData(const QModelIndex& index, const QVariant& value, in
g_MainWindow->projectModel()->setIdDatabases(m_node.get());
auto utf8key = value.toString().toUtf8();
std::unordered_map<std::string, amuse::ObjectId>::iterator idIt;
// TODO: Heterogeneous lookup when C++20 available
if ((idIt = amuse::SongId::CurNameDB->m_stringToId.find(utf8key.data())) !=
amuse::SongId::CurNameDB->m_stringToId.cend()) {
if (idIt->second == entry->first)

1
Editor/SoundGroupEditor.cpp
View File

@@ -272,6 +272,7 @@ bool SFXModel::setData(const QModelIndex& index, const QVariant& value, int role
g_MainWindow->projectModel()->setIdDatabases(m_node.get());
auto utf8key = value.toString().toUtf8();
std::unordered_map<std::string, amuse::ObjectId>::iterator idIt;
// TODO: Heterogeneous lookup when C++20 available
if ((idIt = amuse::SFXId::CurNameDB->m_stringToId.find(utf8key.data())) !=
amuse::SFXId::CurNameDB->m_stringToId.cend()) {
if (idIt->second == entry->first)

92
Editor/resources/lang_de.ts
View File

@@ -427,23 +427,23 @@
<context>
<name>MIDIPlayerWidget</name>
<message>
<location filename="../SongGroupEditor.cpp" line="1330"/>
<location filename="../SongGroupEditor.cpp" line="1331"/>
<source>Stop</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../SongGroupEditor.cpp" line="1334"/>
<location filename="../SongGroupEditor.cpp" line="1335"/>
<source>Bad Song Data</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../SongGroupEditor.cpp" line="1334"/>
<location filename="../SongGroupEditor.cpp" line="1335"/>
<source>Unable to load song data at %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../SongGroupEditor.cpp" line="1344"/>
<location filename="../SongGroupEditor.cpp" line="1375"/>
<location filename="../SongGroupEditor.cpp" line="1345"/>
<location filename="../SongGroupEditor.cpp" line="1376"/>
<source>Play</source>
<translation type="unfinished"></translation>
</message>
@@ -1202,12 +1202,12 @@
<context>
<name>PageTableView</name>
<message>
<location filename="../SongGroupEditor.cpp" line="1181"/>
<location filename="../SongGroupEditor.cpp" line="1182"/>
<source>Delete Page Entries</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../SongGroupEditor.cpp" line="1181"/>
<location filename="../SongGroupEditor.cpp" line="1182"/>
<source>Delete Page Entry</source>
<translation type="unfinished"></translation>
</message>
@@ -1594,57 +1594,57 @@
<context>
<name>SFXModel</name>
<message>
<location filename="../SoundGroupEditor.cpp" line="279"/>
<location filename="../SoundGroupEditor.cpp" line="280"/>
<source>SFX Conflict</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../SoundGroupEditor.cpp" line="280"/>
<location filename="../SoundGroupEditor.cpp" line="281"/>
<source>SFX %1 is already defined in project</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../SoundGroupEditor.cpp" line="286"/>
<location filename="../SoundGroupEditor.cpp" line="287"/>
<source>Change SFX Name</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../SoundGroupEditor.cpp" line="319"/>
<location filename="../SoundGroupEditor.cpp" line="320"/>
<source>Change %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../SoundGroupEditor.cpp" line="330"/>
<location filename="../SoundGroupEditor.cpp" line="331"/>
<source>SFX</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../SoundGroupEditor.cpp" line="332"/>
<location filename="../SoundGroupEditor.cpp" line="333"/>
<source>Object</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../SoundGroupEditor.cpp" line="334"/>
<location filename="../SoundGroupEditor.cpp" line="335"/>
<source>Priority</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../SoundGroupEditor.cpp" line="336"/>
<location filename="../SoundGroupEditor.cpp" line="337"/>
<source>Max Voices</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../SoundGroupEditor.cpp" line="338"/>
<location filename="../SoundGroupEditor.cpp" line="339"/>
<source>Velocity</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../SoundGroupEditor.cpp" line="340"/>
<location filename="../SoundGroupEditor.cpp" line="341"/>
<source>Panning</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../SoundGroupEditor.cpp" line="342"/>
<location filename="../SoundGroupEditor.cpp" line="343"/>
<source>Key</source>
<translation type="unfinished"></translation>
</message>
@@ -1660,13 +1660,13 @@
<context>
<name>SFXPlayerWidget</name>
<message>
<location filename="../SoundGroupEditor.cpp" line="520"/>
<location filename="../SoundGroupEditor.cpp" line="521"/>
<source>Stop</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../SoundGroupEditor.cpp" line="531"/>
<location filename="../SoundGroupEditor.cpp" line="560"/>
<location filename="../SoundGroupEditor.cpp" line="532"/>
<location filename="../SoundGroupEditor.cpp" line="561"/>
<source>Play</source>
<translation type="unfinished"></translation>
</message>
@@ -1674,12 +1674,12 @@
<context>
<name>SFXTableView</name>
<message>
<location filename="../SoundGroupEditor.cpp" line="478"/>
<location filename="../SoundGroupEditor.cpp" line="479"/>
<source>Delete SFX Entries</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../SoundGroupEditor.cpp" line="478"/>
<location filename="../SoundGroupEditor.cpp" line="479"/>
<source>Delete SFX Entry</source>
<translation type="unfinished"></translation>
</message>
@@ -1763,27 +1763,27 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../SongGroupEditor.cpp" line="882"/>
<location filename="../SongGroupEditor.cpp" line="883"/>
<source>Song Conflict</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../SongGroupEditor.cpp" line="883"/>
<location filename="../SongGroupEditor.cpp" line="884"/>
<source>Song %1 is already defined in project</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../SongGroupEditor.cpp" line="889"/>
<location filename="../SongGroupEditor.cpp" line="890"/>
<source>Change Song Name</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../SongGroupEditor.cpp" line="903"/>
<location filename="../SongGroupEditor.cpp" line="904"/>
<source>Song</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../SongGroupEditor.cpp" line="905"/>
<location filename="../SongGroupEditor.cpp" line="906"/>
<source>MIDI File</source>
<translation type="unfinished"></translation>
</message>
@@ -1791,32 +1791,32 @@
<context>
<name>SetupModel</name>
<message>
<location filename="../SongGroupEditor.cpp" line="1124"/>
<location filename="../SongGroupEditor.cpp" line="1125"/>
<source>Change %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../SongGroupEditor.cpp" line="1137"/>
<location filename="../SongGroupEditor.cpp" line="1138"/>
<source>Program</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../SongGroupEditor.cpp" line="1139"/>
<location filename="../SongGroupEditor.cpp" line="1140"/>
<source>Volume</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../SongGroupEditor.cpp" line="1141"/>
<location filename="../SongGroupEditor.cpp" line="1142"/>
<source>Panning</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../SongGroupEditor.cpp" line="1143"/>
<location filename="../SongGroupEditor.cpp" line="1144"/>
<source>Reverb</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../SongGroupEditor.cpp" line="1145"/>
<location filename="../SongGroupEditor.cpp" line="1146"/>
<source>Chorus</source>
<translation type="unfinished"></translation>
</message>
@@ -1824,12 +1824,12 @@
<context>
<name>SetupTableView</name>
<message>
<location filename="../SongGroupEditor.cpp" line="1241"/>
<location filename="../SongGroupEditor.cpp" line="1242"/>
<source>Delete Setup Entries</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../SongGroupEditor.cpp" line="1241"/>
<location filename="../SongGroupEditor.cpp" line="1242"/>
<source>Delete Setup Entry</source>
<translation type="unfinished"></translation>
</message>
@@ -1837,37 +1837,37 @@
<context>
<name>SongGroupEditor</name>
<message>
<location filename="../SongGroupEditor.cpp" line="1438"/>
<location filename="../SongGroupEditor.cpp" line="1439"/>
<source>Add Page Entry</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../SongGroupEditor.cpp" line="1448"/>
<location filename="../SongGroupEditor.cpp" line="1449"/>
<source>Add Setup Entry</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../SongGroupEditor.cpp" line="1572"/>
<location filename="../SongGroupEditor.cpp" line="1573"/>
<source>Normal Pages</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../SongGroupEditor.cpp" line="1573"/>
<location filename="../SongGroupEditor.cpp" line="1574"/>
<source>Drum Pages</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../SongGroupEditor.cpp" line="1574"/>
<location filename="../SongGroupEditor.cpp" line="1575"/>
<source>MIDI Setups</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../SongGroupEditor.cpp" line="1603"/>
<location filename="../SongGroupEditor.cpp" line="1604"/>
<source>Add new page entry</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../SongGroupEditor.cpp" line="1605"/>
<location filename="../SongGroupEditor.cpp" line="1606"/>
<source>Remove selected page entries</source>
<translation type="unfinished"></translation>
</message>
@@ -1875,17 +1875,17 @@
<context>
<name>SoundGroupEditor</name>
<message>
<location filename="../SoundGroupEditor.cpp" line="592"/>
<location filename="../SoundGroupEditor.cpp" line="593"/>
<source>Add SFX Entry</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../SoundGroupEditor.cpp" line="638"/>
<location filename="../SoundGroupEditor.cpp" line="639"/>
<source>Add new SFX entry</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../SoundGroupEditor.cpp" line="640"/>
<location filename="../SoundGroupEditor.cpp" line="641"/>
<source>Remove selected SFX entries</source>
<translation type="unfinished"></translation>
</message>