comparison main/MainWindow.cpp @ 1264:65b8c009a9f2 msvc2015_64

MSVC build fixes, and show 32/64-bit in About
author Chris Cannam
date Tue, 18 Oct 2016 15:59:42 +0100
parents cc434d37a126
children 7293bc5ee7f8
comparison
equal deleted inserted replaced
1254:852a3c16dcf3 1264:65b8c009a9f2
1178 bool mono = true; 1178 bool mono = true;
1179 1179
1180 // Avoid warnings/errors with -Wextra because we aren't explicitly 1180 // Avoid warnings/errors with -Wextra because we aren't explicitly
1181 // handling all layer types (-Wall is OK with this because of the 1181 // handling all layer types (-Wall is OK with this because of the
1182 // default but the stricter level insists) 1182 // default but the stricter level insists)
1183 #ifdef __GNUC__
1183 #pragma GCC diagnostic ignored "-Wswitch-enum" 1184 #pragma GCC diagnostic ignored "-Wswitch-enum"
1185 #endif
1184 1186
1185 switch (type) { 1187 switch (type) {
1186 1188
1187 case LayerFactory::Waveform: 1189 case LayerFactory::Waveform:
1188 icon = il.load("waveform"); 1190 icon = il.load("waveform");
4576 4578
4577 QString aboutText; 4579 QString aboutText;
4578 4580
4579 aboutText += tr("<h3>About Sonic Visualiser</h3>"); 4581 aboutText += tr("<h3>About Sonic Visualiser</h3>");
4580 aboutText += tr("<p>Sonic Visualiser is a program for viewing and exploring audio data for semantic music analysis and annotation.<br><a href=\"http://www.sonicvisualiser.org/\">http://www.sonicvisualiser.org/</a></p>"); 4582 aboutText += tr("<p>Sonic Visualiser is a program for viewing and exploring audio data for semantic music analysis and annotation.<br><a href=\"http://www.sonicvisualiser.org/\">http://www.sonicvisualiser.org/</a></p>");
4581 aboutText += tr("<p><small>%1 : %2 configuration</small></p>") 4583 aboutText += tr("<p><small>%1 : %2 configuration, %3-bit build</small></p>")
4582 .arg(version) 4584 .arg(version)
4583 .arg(debug ? tr("Debug") : tr("Release")); 4585 .arg(debug ? tr("Debug") : tr("Release"))
4586 .arg(sizeof(void *) * 8);
4584 4587
4585 aboutText += "<small>"; 4588 aboutText += "<small>";
4586 4589
4587 aboutText += tr("With Qt v%1 &copy; The Qt Company").arg(QT_VERSION_STR); 4590 aboutText += tr("With Qt v%1 &copy; The Qt Company").arg(QT_VERSION_STR);
4588 4591
4677 #ifndef BUILD_STATIC 4680 #ifndef BUILD_STATIC
4678 aboutText.replace(tr("With "), tr("Using ")); 4681 aboutText.replace(tr("With "), tr("Using "));
4679 #endif 4682 #endif
4680 4683
4681 aboutText += 4684 aboutText +=
4682 "<p><small>Sonic Visualiser Copyright &copy; 2005&ndash;2015 Chris Cannam and " 4685 "<p><small>Sonic Visualiser Copyright &copy; 2005&ndash;2016 Chris Cannam and "
4683 "Queen Mary, University of London.</small></p>" 4686 "Queen Mary, University of London.</small></p>"
4684 "<p><small>This program is free software; you can redistribute it and/or " 4687 "<p><small>This program is free software; you can redistribute it and/or "
4685 "modify it under the terms of the GNU General Public License as " 4688 "modify it under the terms of the GNU General Public License as "
4686 "published by the Free Software Foundation; either version 2 of the " 4689 "published by the Free Software Foundation; either version 2 of the "
4687 "License, or (at your option) any later version.<br>See the file " 4690 "License, or (at your option) any later version.<br>See the file "