Show a warning message instead of asserting if no projectM presets could be loaded.

This commit is contained in:
David Sansome 2010-07-10 17:21:23 +00:00
parent d620779696
commit 4760210b2f
28 changed files with 231 additions and 12 deletions

View File

@ -321,6 +321,11 @@ msgstr ""
msgid "Clementine can show a message when the track changes." msgid "Clementine can show a message when the track changes."
msgstr "" msgstr ""
msgid ""
"Clementine could not load any projectM visualisations. Check that you have "
"installed Clementine properly."
msgstr ""
msgid "Click here to add some music" msgid "Click here to add some music"
msgstr "اضغط هنا لإضافة بعض الموسيقى" msgstr "اضغط هنا لإضافة بعض الموسيقى"
@ -943,6 +948,9 @@ msgstr ""
msgid "Membership type" msgid "Membership type"
msgstr "" msgstr ""
msgid "Missing projectM presets"
msgstr ""
msgid "Model" msgid "Model"
msgstr "" msgstr ""

View File

@ -322,6 +322,11 @@ msgstr ""
msgid "Clementine can show a message when the track changes." msgid "Clementine can show a message when the track changes."
msgstr "Clementine může při změně skladby zobrazit zprávu." msgstr "Clementine může při změně skladby zobrazit zprávu."
msgid ""
"Clementine could not load any projectM visualisations. Check that you have "
"installed Clementine properly."
msgstr ""
msgid "Click here to add some music" msgid "Click here to add some music"
msgstr "Zde klikněte pro řidání hudby" msgstr "Zde klikněte pro řidání hudby"
@ -947,6 +952,9 @@ msgstr ""
msgid "Membership type" msgid "Membership type"
msgstr "" msgstr ""
msgid "Missing projectM presets"
msgstr ""
msgid "Model" msgid "Model"
msgstr "" msgstr ""

View File

@ -322,6 +322,11 @@ msgstr ""
msgid "Clementine can show a message when the track changes." msgid "Clementine can show a message when the track changes."
msgstr "Clementine kan vise en besked når sporet skiftes." msgstr "Clementine kan vise en besked når sporet skiftes."
msgid ""
"Clementine could not load any projectM visualisations. Check that you have "
"installed Clementine properly."
msgstr ""
msgid "Click here to add some music" msgid "Click here to add some music"
msgstr "Klik her for at tilføje musik" msgstr "Klik her for at tilføje musik"
@ -948,6 +953,9 @@ msgstr ""
msgid "Membership type" msgid "Membership type"
msgstr "" msgstr ""
msgid "Missing projectM presets"
msgstr ""
msgid "Model" msgid "Model"
msgstr "" msgstr ""

View File

@ -321,6 +321,11 @@ msgstr "Clementine Visualisierung"
msgid "Clementine can show a message when the track changes." msgid "Clementine can show a message when the track changes."
msgstr "Clementine kann beim Stückwechsel Benachrichtigungen anzeigen" msgstr "Clementine kann beim Stückwechsel Benachrichtigungen anzeigen"
msgid ""
"Clementine could not load any projectM visualisations. Check that you have "
"installed Clementine properly."
msgstr ""
msgid "Click here to add some music" msgid "Click here to add some music"
msgstr "Klicken Sie hier um das zu ändern" msgstr "Klicken Sie hier um das zu ändern"
@ -950,6 +955,9 @@ msgstr "Mittel (512x512)"
msgid "Membership type" msgid "Membership type"
msgstr "Art der Mitgliedschaft" msgstr "Art der Mitgliedschaft"
msgid "Missing projectM presets"
msgstr ""
msgid "Model" msgid "Model"
msgstr "" msgstr ""

View File

@ -328,6 +328,11 @@ msgstr "Οπτικά εφέ Clementine"
msgid "Clementine can show a message when the track changes." msgid "Clementine can show a message when the track changes."
msgstr "Το Clementine μπορεί να δείχνει ένα μήνυμα όταν το κομμάτι αλλάζει." msgstr "Το Clementine μπορεί να δείχνει ένα μήνυμα όταν το κομμάτι αλλάζει."
msgid ""
"Clementine could not load any projectM visualisations. Check that you have "
"installed Clementine properly."
msgstr ""
msgid "Click here to add some music" msgid "Click here to add some music"
msgstr "Κλικ εδώ για να προσθέσετε μουσική" msgstr "Κλικ εδώ για να προσθέσετε μουσική"
@ -956,6 +961,9 @@ msgstr "Μέση (512x512)"
msgid "Membership type" msgid "Membership type"
msgstr "Τύπος συνδρομής" msgstr "Τύπος συνδρομής"
msgid "Missing projectM presets"
msgstr ""
msgid "Model" msgid "Model"
msgstr "" msgstr ""

View File

@ -321,6 +321,11 @@ msgstr "Clementine Visualisation"
msgid "Clementine can show a message when the track changes." msgid "Clementine can show a message when the track changes."
msgstr "Clementine can show a message when the track changes." msgstr "Clementine can show a message when the track changes."
msgid ""
"Clementine could not load any projectM visualisations. Check that you have "
"installed Clementine properly."
msgstr ""
msgid "Click here to add some music" msgid "Click here to add some music"
msgstr "Click here to add some music" msgstr "Click here to add some music"
@ -947,6 +952,9 @@ msgstr ""
msgid "Membership type" msgid "Membership type"
msgstr "" msgstr ""
msgid "Missing projectM presets"
msgstr ""
msgid "Model" msgid "Model"
msgstr "" msgstr ""

View File

@ -321,6 +321,11 @@ msgstr "Clementine Visualisation"
msgid "Clementine can show a message when the track changes." msgid "Clementine can show a message when the track changes."
msgstr "Clementine can show a message when the track changes." msgstr "Clementine can show a message when the track changes."
msgid ""
"Clementine could not load any projectM visualisations. Check that you have "
"installed Clementine properly."
msgstr ""
msgid "Click here to add some music" msgid "Click here to add some music"
msgstr "Click here to add some music" msgstr "Click here to add some music"
@ -945,6 +950,9 @@ msgstr ""
msgid "Membership type" msgid "Membership type"
msgstr "" msgstr ""
msgid "Missing projectM presets"
msgstr ""
msgid "Model" msgid "Model"
msgstr "" msgstr ""

View File

@ -323,6 +323,11 @@ msgstr "Visualización de Clementine"
msgid "Clementine can show a message when the track changes." msgid "Clementine can show a message when the track changes."
msgstr "Clementine puede mostrar un mensaje cuando la pista cambie." msgstr "Clementine puede mostrar un mensaje cuando la pista cambie."
msgid ""
"Clementine could not load any projectM visualisations. Check that you have "
"installed Clementine properly."
msgstr ""
msgid "Click here to add some music" msgid "Click here to add some music"
msgstr "Haz clic aquí para añadir música" msgstr "Haz clic aquí para añadir música"
@ -954,6 +959,9 @@ msgstr "Mediana (512x512)"
msgid "Membership type" msgid "Membership type"
msgstr "" msgstr ""
msgid "Missing projectM presets"
msgstr ""
msgid "Model" msgid "Model"
msgstr "" msgstr ""

View File

@ -321,6 +321,11 @@ msgstr ""
msgid "Clementine can show a message when the track changes." msgid "Clementine can show a message when the track changes."
msgstr "" msgstr ""
msgid ""
"Clementine could not load any projectM visualisations. Check that you have "
"installed Clementine properly."
msgstr ""
msgid "Click here to add some music" msgid "Click here to add some music"
msgstr "Napsauta tästä lisätäksesi musiikkia" msgstr "Napsauta tästä lisätäksesi musiikkia"
@ -944,6 +949,9 @@ msgstr ""
msgid "Membership type" msgid "Membership type"
msgstr "" msgstr ""
msgid "Missing projectM presets"
msgstr ""
msgid "Model" msgid "Model"
msgstr "" msgstr ""

View File

@ -322,6 +322,11 @@ msgstr ""
msgid "Clementine can show a message when the track changes." msgid "Clementine can show a message when the track changes."
msgstr "Clementine peut afficher un message lors des changements de pistes." msgstr "Clementine peut afficher un message lors des changements de pistes."
msgid ""
"Clementine could not load any projectM visualisations. Check that you have "
"installed Clementine properly."
msgstr ""
msgid "Click here to add some music" msgid "Click here to add some music"
msgstr "Cliquez ici pour créer votre bibliothèque musicale" msgstr "Cliquez ici pour créer votre bibliothèque musicale"
@ -951,6 +956,9 @@ msgstr ""
msgid "Membership type" msgid "Membership type"
msgstr "" msgstr ""
msgid "Missing projectM presets"
msgstr ""
msgid "Model" msgid "Model"
msgstr "" msgstr ""

View File

@ -321,6 +321,11 @@ msgstr ""
msgid "Clementine can show a message when the track changes." msgid "Clementine can show a message when the track changes."
msgstr "" msgstr ""
msgid ""
"Clementine could not load any projectM visualisations. Check that you have "
"installed Clementine properly."
msgstr ""
msgid "Click here to add some music" msgid "Click here to add some music"
msgstr "Clique aqui para adicionar música" msgstr "Clique aqui para adicionar música"
@ -945,6 +950,9 @@ msgstr ""
msgid "Membership type" msgid "Membership type"
msgstr "" msgstr ""
msgid "Missing projectM presets"
msgstr ""
msgid "Model" msgid "Model"
msgstr "" msgstr ""

View File

@ -322,6 +322,11 @@ msgstr "Visualizzazioni di Clementine"
msgid "Clementine can show a message when the track changes." msgid "Clementine can show a message when the track changes."
msgstr "Clementine può mostrare un messaggio al cambiamento di traccia." msgstr "Clementine può mostrare un messaggio al cambiamento di traccia."
msgid ""
"Clementine could not load any projectM visualisations. Check that you have "
"installed Clementine properly."
msgstr ""
msgid "Click here to add some music" msgid "Click here to add some music"
msgstr "Fai clic qui per aggiungere della musica" msgstr "Fai clic qui per aggiungere della musica"
@ -952,6 +957,9 @@ msgstr "Media (512x512)"
msgid "Membership type" msgid "Membership type"
msgstr "Tipo d'iscrizione" msgstr "Tipo d'iscrizione"
msgid "Missing projectM presets"
msgstr ""
msgid "Model" msgid "Model"
msgstr "" msgstr ""

View File

@ -321,6 +321,11 @@ msgstr ""
msgid "Clementine can show a message when the track changes." msgid "Clementine can show a message when the track changes."
msgstr "" msgstr ""
msgid ""
"Clementine could not load any projectM visualisations. Check that you have "
"installed Clementine properly."
msgstr ""
msgid "Click here to add some music" msgid "Click here to add some music"
msgstr "" msgstr ""
@ -945,6 +950,9 @@ msgstr ""
msgid "Membership type" msgid "Membership type"
msgstr "" msgstr ""
msgid "Missing projectM presets"
msgstr ""
msgid "Model" msgid "Model"
msgstr "" msgstr ""

View File

@ -321,6 +321,11 @@ msgstr ""
msgid "Clementine can show a message when the track changes." msgid "Clementine can show a message when the track changes."
msgstr "Clementine kan vise en melding ved sporendring" msgstr "Clementine kan vise en melding ved sporendring"
msgid ""
"Clementine could not load any projectM visualisations. Check that you have "
"installed Clementine properly."
msgstr ""
msgid "Click here to add some music" msgid "Click here to add some music"
msgstr "Klikk her for å legge til litt musikk" msgstr "Klikk her for å legge til litt musikk"
@ -946,6 +951,9 @@ msgstr ""
msgid "Membership type" msgid "Membership type"
msgstr "" msgstr ""
msgid "Missing projectM presets"
msgstr ""
msgid "Model" msgid "Model"
msgstr "" msgstr ""

View File

@ -321,6 +321,11 @@ msgstr ""
msgid "Clementine can show a message when the track changes." msgid "Clementine can show a message when the track changes."
msgstr "" msgstr ""
msgid ""
"Clementine could not load any projectM visualisations. Check that you have "
"installed Clementine properly."
msgstr ""
msgid "Click here to add some music" msgid "Click here to add some music"
msgstr "" msgstr ""
@ -943,6 +948,9 @@ msgstr ""
msgid "Membership type" msgid "Membership type"
msgstr "" msgstr ""
msgid "Missing projectM presets"
msgstr ""
msgid "Model" msgid "Model"
msgstr "" msgstr ""

View File

@ -322,6 +322,11 @@ msgstr ""
msgid "Clementine can show a message when the track changes." msgid "Clementine can show a message when the track changes."
msgstr "Clementine może pokazywać powiadomienia gdy zmienia się utwór." msgstr "Clementine może pokazywać powiadomienia gdy zmienia się utwór."
msgid ""
"Clementine could not load any projectM visualisations. Check that you have "
"installed Clementine properly."
msgstr ""
msgid "Click here to add some music" msgid "Click here to add some music"
msgstr "Kliknij aby dodać jakąś muzykę" msgstr "Kliknij aby dodać jakąś muzykę"
@ -945,6 +950,9 @@ msgstr ""
msgid "Membership type" msgid "Membership type"
msgstr "" msgstr ""
msgid "Missing projectM presets"
msgstr ""
msgid "Model" msgid "Model"
msgstr "" msgstr ""

View File

@ -326,6 +326,11 @@ msgstr "Visualização Clementine"
msgid "Clementine can show a message when the track changes." msgid "Clementine can show a message when the track changes."
msgstr "O Clementine pode mostrar uma mensagem ao mudar de faixa." msgstr "O Clementine pode mostrar uma mensagem ao mudar de faixa."
msgid ""
"Clementine could not load any projectM visualisations. Check that you have "
"installed Clementine properly."
msgstr ""
msgid "Click here to add some music" msgid "Click here to add some music"
msgstr "Clique aqui para adicionar música" msgstr "Clique aqui para adicionar música"
@ -953,6 +958,9 @@ msgstr "Média (512x512)"
msgid "Membership type" msgid "Membership type"
msgstr "Tipo de adesão" msgstr "Tipo de adesão"
msgid "Missing projectM presets"
msgstr ""
msgid "Model" msgid "Model"
msgstr "" msgstr ""

View File

@ -324,6 +324,11 @@ msgstr "Visualização Clementine"
msgid "Clementine can show a message when the track changes." msgid "Clementine can show a message when the track changes."
msgstr "Clementine pode exibir uma mensagem quando a faixa mudar." msgstr "Clementine pode exibir uma mensagem quando a faixa mudar."
msgid ""
"Clementine could not load any projectM visualisations. Check that you have "
"installed Clementine properly."
msgstr ""
msgid "Click here to add some music" msgid "Click here to add some music"
msgstr "Clique aqui para adicionar algumas músicas" msgstr "Clique aqui para adicionar algumas músicas"
@ -953,6 +958,9 @@ msgstr "Média (512x512)"
msgid "Membership type" msgid "Membership type"
msgstr "Tipo de membro" msgstr "Tipo de membro"
msgid "Missing projectM presets"
msgstr ""
msgid "Model" msgid "Model"
msgstr "" msgstr ""

View File

@ -321,6 +321,11 @@ msgstr ""
msgid "Clementine can show a message when the track changes." msgid "Clementine can show a message when the track changes."
msgstr "" msgstr ""
msgid ""
"Clementine could not load any projectM visualisations. Check that you have "
"installed Clementine properly."
msgstr ""
msgid "Click here to add some music" msgid "Click here to add some music"
msgstr "Clic aici pentru a adăuga muzică" msgstr "Clic aici pentru a adăuga muzică"
@ -944,6 +949,9 @@ msgstr ""
msgid "Membership type" msgid "Membership type"
msgstr "" msgstr ""
msgid "Missing projectM presets"
msgstr ""
msgid "Model" msgid "Model"
msgstr "" msgstr ""

View File

@ -320,6 +320,11 @@ msgstr "Визуализация Clementine"
msgid "Clementine can show a message when the track changes." msgid "Clementine can show a message when the track changes."
msgstr "Clementine может показывать сообщения при смене дорожки." msgstr "Clementine может показывать сообщения при смене дорожки."
msgid ""
"Clementine could not load any projectM visualisations. Check that you have "
"installed Clementine properly."
msgstr ""
msgid "Click here to add some music" msgid "Click here to add some music"
msgstr "Щелкните здесь, чтобы добавить музыку" msgstr "Щелкните здесь, чтобы добавить музыку"
@ -947,6 +952,9 @@ msgstr "Среднее (512x512)"
msgid "Membership type" msgid "Membership type"
msgstr "" msgstr ""
msgid "Missing projectM presets"
msgstr ""
msgid "Model" msgid "Model"
msgstr "" msgstr ""

View File

@ -326,6 +326,11 @@ msgstr "Clementine vizualizácia"
msgid "Clementine can show a message when the track changes." msgid "Clementine can show a message when the track changes."
msgstr "Clementine môže zobraziť správu keď sa zmení skladba." msgstr "Clementine môže zobraziť správu keď sa zmení skladba."
msgid ""
"Clementine could not load any projectM visualisations. Check that you have "
"installed Clementine properly."
msgstr ""
msgid "Click here to add some music" msgid "Click here to add some music"
msgstr "Kliknite sem aby ste pridali nejakú hudbu" msgstr "Kliknite sem aby ste pridali nejakú hudbu"
@ -953,6 +958,9 @@ msgstr "Stredná (512x512)"
msgid "Membership type" msgid "Membership type"
msgstr "Typ členstva" msgstr "Typ členstva"
msgid "Missing projectM presets"
msgstr ""
msgid "Model" msgid "Model"
msgstr "" msgstr ""

View File

@ -321,6 +321,11 @@ msgstr ""
msgid "Clementine can show a message when the track changes." msgid "Clementine can show a message when the track changes."
msgstr "Clementine kan visa ett meddelande vid byta av spår." msgstr "Clementine kan visa ett meddelande vid byta av spår."
msgid ""
"Clementine could not load any projectM visualisations. Check that you have "
"installed Clementine properly."
msgstr ""
msgid "Click here to add some music" msgid "Click here to add some music"
msgstr "Klicka här för att lägga till musik" msgstr "Klicka här för att lägga till musik"
@ -948,6 +953,9 @@ msgstr "Mellan (512x512)"
msgid "Membership type" msgid "Membership type"
msgstr "" msgstr ""
msgid "Missing projectM presets"
msgstr ""
msgid "Model" msgid "Model"
msgstr "" msgstr ""

View File

@ -321,6 +321,11 @@ msgstr ""
msgid "Clementine can show a message when the track changes." msgid "Clementine can show a message when the track changes."
msgstr "" msgstr ""
msgid ""
"Clementine could not load any projectM visualisations. Check that you have "
"installed Clementine properly."
msgstr ""
msgid "Click here to add some music" msgid "Click here to add some music"
msgstr "Parça eklemek için buraya tıkla" msgstr "Parça eklemek için buraya tıkla"
@ -943,6 +948,9 @@ msgstr ""
msgid "Membership type" msgid "Membership type"
msgstr "" msgstr ""
msgid "Missing projectM presets"
msgstr ""
msgid "Model" msgid "Model"
msgstr "" msgstr ""

View File

@ -312,6 +312,11 @@ msgstr ""
msgid "Clementine can show a message when the track changes." msgid "Clementine can show a message when the track changes."
msgstr "" msgstr ""
msgid ""
"Clementine could not load any projectM visualisations. Check that you have "
"installed Clementine properly."
msgstr ""
msgid "Click here to add some music" msgid "Click here to add some music"
msgstr "" msgstr ""
@ -934,6 +939,9 @@ msgstr ""
msgid "Membership type" msgid "Membership type"
msgstr "" msgstr ""
msgid "Missing projectM presets"
msgstr ""
msgid "Model" msgid "Model"
msgstr "" msgstr ""

View File

@ -325,6 +325,11 @@ msgstr "Візуалізація Clementine"
msgid "Clementine can show a message when the track changes." msgid "Clementine can show a message when the track changes."
msgstr "Clementine може показувати повідомлення під час зміни доріжки." msgstr "Clementine може показувати повідомлення під час зміни доріжки."
msgid ""
"Clementine could not load any projectM visualisations. Check that you have "
"installed Clementine properly."
msgstr ""
msgid "Click here to add some music" msgid "Click here to add some music"
msgstr "Клацніть тут, щоб додати музику" msgstr "Клацніть тут, щоб додати музику"
@ -952,6 +957,9 @@ msgstr "Середня (512x512)"
msgid "Membership type" msgid "Membership type"
msgstr "Тип членства" msgstr "Тип членства"
msgid "Missing projectM presets"
msgstr ""
msgid "Model" msgid "Model"
msgstr "" msgstr ""

View File

@ -321,6 +321,11 @@ msgstr ""
msgid "Clementine can show a message when the track changes." msgid "Clementine can show a message when the track changes."
msgstr "" msgstr ""
msgid ""
"Clementine could not load any projectM visualisations. Check that you have "
"installed Clementine properly."
msgstr ""
msgid "Click here to add some music" msgid "Click here to add some music"
msgstr "" msgstr ""
@ -943,6 +948,9 @@ msgstr ""
msgid "Membership type" msgid "Membership type"
msgstr "" msgstr ""
msgid "Missing projectM presets"
msgstr ""
msgid "Model" msgid "Model"
msgstr "" msgstr ""

View File

@ -321,6 +321,11 @@ msgstr ""
msgid "Clementine can show a message when the track changes." msgid "Clementine can show a message when the track changes."
msgstr "" msgstr ""
msgid ""
"Clementine could not load any projectM visualisations. Check that you have "
"installed Clementine properly."
msgstr ""
msgid "Click here to add some music" msgid "Click here to add some music"
msgstr "" msgstr ""
@ -943,6 +948,9 @@ msgstr ""
msgid "Membership type" msgid "Membership type"
msgstr "" msgstr ""
msgid "Missing projectM presets"
msgstr ""
msgid "Model" msgid "Model"
msgstr "" msgstr ""

View File

@ -19,16 +19,17 @@
#include "projectmvisualisation.h" #include "projectmvisualisation.h"
#include "visualisationcontainer.h" #include "visualisationcontainer.h"
#include <QTimerEvent> #include <QCoreApplication>
#include <QPainter> #include <QDir>
#include <QPaintEngine> #include <QFile>
#include <QtDebug>
#include <QGLWidget> #include <QGLWidget>
#include <QGraphicsView> #include <QGraphicsView>
#include <QMessageBox>
#include <QPaintEngine>
#include <QPainter>
#include <QSettings> #include <QSettings>
#include <QCoreApplication> #include <QtDebug>
#include <QFile> #include <QTimerEvent>
#include <QDir>
#include <projectM.hpp> #include <projectM.hpp>
@ -87,11 +88,6 @@ void ProjectMVisualisation::InitProjectM() {
break; break;
} }
if (preset_path.isNull()) {
qFatal("ProjectM presets could not be found, search path was:\n %s",
paths.join("\n ").toLocal8Bit().constData());
}
// Create projectM settings // Create projectM settings
projectM::Settings s; projectM::Settings s;
s.meshX = 32; s.meshX = 32;
@ -110,6 +106,13 @@ void ProjectMVisualisation::InitProjectM() {
projectm_.reset(new projectM(s)); projectm_.reset(new projectM(s));
preset_model_ = new ProjectMPresetModel(this, this); preset_model_ = new ProjectMPresetModel(this, this);
Load(); Load();
if (preset_path.isNull()) {
qWarning("ProjectM presets could not be found, search path was:\n %s",
paths.join("\n ").toLocal8Bit().constData());
QMessageBox::warning(NULL, tr("Missing projectM presets"),
tr("Clementine could not load any projectM visualisations. Check that you have installed Clementine properly."));
}
} }
void ProjectMVisualisation::drawBackground(QPainter* p, const QRectF&) { void ProjectMVisualisation::drawBackground(QPainter* p, const QRectF&) {