Enhance Branding

src/Gui/Application.cpp

@@ -1545,8 +1545,16 @@ void Application::runApplication(void)
     int argc = App::Application::GetARGC();
     GUIApplication mainApp(argc, App::Application::GetARGV());
     // set application icon and window title
+    const std::map<std::string,std::string>& cfg = App::Application::Config();
+    std::map<std::string,std::string>::const_iterator it;
+    it = cfg.find("Application");
+    if (it != cfg.end()) {
+        mainApp.setApplicationName(QString::fromUtf8(it->second.c_str()));
+    }
+    else {
+        mainApp.setApplicationName(QString::fromUtf8(App::GetApplication().getExecutableName()));
+    }
     mainApp.setWindowIcon(Gui::BitmapFactory().pixmap(App::Application::Config()["AppIcon"].c_str()));
-    mainApp.setApplicationName(QString::fromAscii(App::GetApplication().getExecutableName()));
     QString plugin;
     plugin = QString::fromUtf8(App::GetApplication().GetHomePath());
     plugin += QLatin1String("/plugins");
@@ -1606,8 +1614,6 @@ void Application::runApplication(void)
 
     QString home = QString::fromUtf8(App::GetApplication().GetHomePath());
 
-    const std::map<std::string,std::string>& cfg = App::Application::Config();
-    std::map<std::string,std::string>::const_iterator it;
     it = cfg.find("WindowTitle");
     if (it != cfg.end()) {
         QString title = QString::fromUtf8(it->second.c_str());

src/Gui/CommandDoc.cpp

@@ -292,7 +292,7 @@ StdCmdMergeProjects::StdCmdMergeProjects()
 
 void StdCmdMergeProjects::activated(int iMsg)
 {
-    QString exe = QString::fromUtf8(App::GetApplication().getExecutableName());
+    QString exe = qApp->applicationName();
     QString project = QFileDialog::getOpenFileName(Gui::getMainWindow(),
         QString::fromUtf8(QT_TR_NOOP("Merge project")), QDir::homePath(),
         QString::fromUtf8(QT_TR_NOOP("%1 document (*.fcstd)")).arg(exe));

src/Gui/CommandStd.cpp

@@ -193,13 +193,7 @@ Action * StdCmdAbout::createAction(void)
 {
     Action *pcAction;
 
-    QString exe;
+    QString exe = qApp->applicationName();
-    std::map<std::string,std::string>& cfg = App::Application::Config();
-    std::map<std::string,std::string>::iterator it = cfg.find("Application");
-    if (it != cfg.end())
-        exe = QString::fromUtf8(it->second.c_str());
-    else
-        exe = QString::fromUtf8(App::GetApplication().getExecutableName());
     pcAction = new Action(this,getMainWindow());
     pcAction->setText(QCoreApplication::translate(
         this->className(), sMenuText, 0,
@@ -235,13 +229,7 @@ void StdCmdAbout::activated(int iMsg)
 void StdCmdAbout::languageChange()
 {
     if (_pcAction) {
-        QString exe;
+        QString exe = qApp->applicationName();
-        std::map<std::string,std::string>& cfg = App::Application::Config();
-        std::map<std::string,std::string>::iterator it = cfg.find("Application");
-        if (it != cfg.end())
-            exe = QString::fromUtf8(it->second.c_str());
-        else
-            exe = QString::fromUtf8(App::GetApplication().getExecutableName());
         _pcAction->setText(QCoreApplication::translate(
             this->className(), sMenuText, 0,
             QCoreApplication::CodecForTr).arg(exe));

src/Gui/Document.cpp

@@ -504,7 +504,7 @@ bool Document::saveAs(void)
 {
     getMainWindow()->statusBar()->showMessage(QObject::tr("Save document under new filename..."));
 
-    QString exe = QString::fromUtf8(App::GetApplication().getExecutableName());
+    QString exe = qApp->applicationName();
     QString fn = QFileDialog::getSaveFileName(getMainWindow(), QObject::tr("Save %1 Document").arg(exe), 
                  FileDialog::getWorkingDirectory(), QObject::tr("%1 document (*.FCStd)").arg(exe));
     if (!fn.isEmpty()) {

src/Gui/MainWindow.cpp

@@ -1318,10 +1318,7 @@ QPixmap MainWindow::splashImage() const
     // include application name and version number
     std::map<std::string,std::string>::const_iterator tc = App::Application::Config().find("SplashInfoColor");
     if (tc != App::Application::Config().end()) {
-        QString title   = QString::fromAscii(App::Application::Config()["ExeName"].c_str());
+        QString title = qApp->applicationName();
-        std::map<std::string,std::string>::iterator it = App::Application::Config().find("Application");
-        if (it != App::Application::Config().end())
-            title = QString::fromUtf8(it->second.c_str());
         QString major   = QString::fromAscii(App::Application::Config()["BuildVersionMajor"].c_str());
         QString minor   = QString::fromAscii(App::Application::Config()["BuildVersionMinor"].c_str());
         QString version = QString::fromAscii("%1.%2").arg(major).arg(minor);

src/Gui/Splashscreen.cpp

@@ -267,11 +267,9 @@ static QString getPlatform()
 
 void AboutDialog::setupLabels()
 {
+    QString exeName = qApp->applicationName();
     std::map<std::string, std::string>& config = App::Application::Config();
-    QString exeName = QString::fromAscii(config["ExeName"].c_str());
+    std::map<std::string,std::string>::iterator it;
-    std::map<std::string,std::string>::iterator it = config.find("WindowTitle");
-    if (it != config.end())
-        exeName = QString::fromUtf8(it->second.c_str());
     QString banner  = QString::fromUtf8(config["CopyrightInfo"].c_str());
     banner = banner.left( banner.indexOf(QLatin1Char('\n')) );
     QString major  = QString::fromAscii(config["BuildVersionMajor"].c_str());

src/Gui/Thumbnail.cpp

@@ -97,7 +97,7 @@ void Thumbnail::SaveDocFile (Base::Writer &writer) const
     // according to specification add some meta-information to the image
     uint mt = QDateTime::currentDateTime().toTime_t();
     QString mtime = QString::fromAscii("%1").arg(mt);
-    img.setText(QLatin1String("Software"), QString::fromUtf8(App::GetApplication().getExecutableName()));
+    img.setText(QLatin1String("Software"), qApp->applicationName());
     img.setText(QLatin1String("Thumb::Mimetype"), QLatin1String("application/x-extension-fcstd"));
     img.setText(QLatin1String("Thumb::MTime"), mtime);
     img.setText(QLatin1String("Thumb::URI"), this->uri.toString());