From f0da3d5679a64c320fffe6337205b988f9246426 Mon Sep 17 00:00:00 2001
From: Julien Wadel <julien.wadel@belledonne-communications.com>
Date: Fri, 28 Feb 2020 12:00:31 +0100
Subject: [PATCH] - Remove organization name for configuration - Remove Top Bar
 Menu for Windows and Linux - Set Log file name to executable name

---
 src/app/AppController.cpp        | 3 +--
 src/app/logger/Logger.cpp        | 1 +
 ui/views/App/Main/MainWindow.qml | 7 +++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/app/AppController.cpp b/src/app/AppController.cpp
index 1b5162294..9a3473047 100644
--- a/src/app/AppController.cpp
+++ b/src/app/AppController.cpp
@@ -57,8 +57,7 @@ AppController::AppController (int &argc, char *argv[]) {
   // Do not use APPLICATION_NAME here.
   // The EXECUTABLE_NAME will be used in qt standard paths. It's our goal.
   QCoreApplication::setApplicationName(EXECUTABLE_NAME);
-  QCoreApplication::setApplicationVersion(LINPHONE_QT_GIT_VERSION);
-  QApplication::setOrganizationName(QString(APPLICATION_VENDOR).replace(' ', '-'));
+  QCoreApplication::setApplicationVersion(LINPHONE_QT_GIT_VERSION);  
   QApplication::setOrganizationDomain(APPLICATION_ID);
 
   mApp = new App(argc, argv);
diff --git a/src/app/logger/Logger.cpp b/src/app/logger/Logger.cpp
index b0c138f3d..3b5544d37 100644
--- a/src/app/logger/Logger.cpp
+++ b/src/app/logger/Logger.cpp
@@ -204,6 +204,7 @@ void Logger::init (const shared_ptr<linphone::Config> &config) {
   }
 
   linphone::Core::setLogCollectionPath(Utils::appStringToCoreString(folder));
+  linphone::Core::setLogCollectionPrefix(EXECUTABLE_NAME);
   linphone::Core::setLogCollectionMaxFileSize(MaxLogsCollectionSize);
 
   mInstance->enable(SettingsModel::getLogsEnabled(config));
diff --git a/ui/views/App/Main/MainWindow.qml b/ui/views/App/Main/MainWindow.qml
index f0c062472..b92cbeb1e 100644
--- a/ui/views/App/Main/MainWindow.qml
+++ b/ui/views/App/Main/MainWindow.qml
@@ -200,7 +200,10 @@ ApplicationWindow {
           }
         }
       }
-      MainWindowTopMenuBar{}
+      Loader{
+        active:Qt.platform.os === 'osx'
+        sourceComponent:MainWindowTopMenuBar{}
+      }
       // -----------------------------------------------------------------------
       // Content.
       // -----------------------------------------------------------------------
@@ -271,7 +274,7 @@ ApplicationWindow {
           Layout.fillWidth: true
 
           source: 'Home.qml'
-        }
+        }		
       }
     }
   }