~scribus/scribus/trunk

« back to all changes in this revision

Viewing changes to scribus/iconmanager.cpp

  • Committer: craig
  • Date: 2023-11-15 20:34:23 UTC
  • Revision ID: svn-v4:11d20701-8431-0410-a711-e3c959e3b870:trunk/Scribus:25831
Only show warnings about missing icons if both options are not found

Show diffs side-by-side

added added

removed removed

Lines of Context:
644
644
        if (QFile::exists(iconFilePath))
645
645
                return iconFilePath;
646
646
 
647
 
        qWarning("pathForIcon: Unable to load icon %s: File not found", iconFilePath.toLatin1().constData());
648
 
        iconFilePath = QString("%1%2%3").arg(ScPaths::instance().iconDir(), primaryIconSubdir, name);
649
 
 
650
 
        if (QFile::exists(iconFilePath))
651
 
        {
652
 
                //qDebug()<<iconFilePath;
653
 
                return iconFilePath;
654
 
        }
655
 
#ifdef WANT_DEBUG
656
 
        qWarning("pathForIcon: Unable to load icon %s: File not found", iconFilePath.toLatin1().constData());
657
 
#endif
 
647
        QString iconFilePath2(QString("%1%2%3").arg(ScPaths::instance().iconDir(), primaryIconSubdir, name));
 
648
        if (QFile::exists(iconFilePath2))
 
649
                return iconFilePath2;
 
650
 
 
651
        qWarning("pathForIcon: Unable to load icon %s: File not found", iconFilePath.toLatin1().constData());
 
652
        qWarning("pathForIcon: Unable to load icon %s: File not found", iconFilePath2.toLatin1().constData());
 
653
 
658
654
        return QString();
659
655
}
660
656