fix : for mac os

Author: bas524

CMakeLists.txt

@@ -13,13 +13,21 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 find_package(Qt5 COMPONENTS Widgets REQUIRED)
 
-add_executable(Qldd
+if (APPLE)
+  set(MACOSX_BUNDLE_BUNDLE_NAME Qldd)
+  set(BUNDLE_VAL MACOSX_BUNDLE)
+  add_executable(Qldd MACOSX_BUNDLE)
+else()
+  add_executable(Qldd)
+endif()
+
+set(SOURCES
   main.cpp
   mainwindow.cpp
   mainwindow.h
   mainwindow.ui
   qldd.cpp
   qldd.h
 )
-
+target_sources(Qldd PRIVATE ${SOURCES})
 target_link_libraries(Qldd PRIVATE Qt5::Widgets)

Qldd.pro

@@ -6,7 +6,12 @@
 #include <QFileDialog>
 #include <QShortcut>
 #include <QMessageBox>
-#include <QFontDatabase>
+
+#ifdef __APPLE__
+#define FIXED_FONT "Menlo"
+#else
+#define FIXED_FONT "Monospace"
+#endif
 
 MainWindow::MainWindow(const QString &fileName, QWidget *parent)
     : QMainWindow(parent),
@@ -21,10 +26,12 @@ MainWindow::MainWindow(const QString &fileName, QWidget *parent)
       exitAct(nullptr) {
   ui->setupUi(this);
 
-  QFont fixedFont = QFontDatabase::systemFont(QFontDatabase::FixedFont);
-  QString fixedFontName = fixedFont.toString();
+  QFont fixedFont(FIXED_FONT);
+  fixedFont.setPixelSize(ui->lineEditFileName->font().pixelSize());
+  fixedFont.setStyleHint(QFont::Monospace);
 
   ui->listWidgetExportTable->setFont(fixedFont);
+  ui->treeWidget->setFont(fixedFont);
 
   shortcutClose = new QShortcut(QKeySequence(Qt::Key_Escape), this);
   connect(shortcutClose, SIGNAL(activated()), this, SLOT(close()));

mainwindow.cpp

@@ -72,11 +72,6 @@
            <enum>Qt::Horizontal</enum>
           </property>
           <widget class="QTreeWidget" name="treeWidget">
-           <property name="font">
-            <font>
-             <family>Menlo</family>
-            </font>
-           </property>
            <column>
             <property name="text">
              <string notr="true">1</string>
@@ -646,7 +641,7 @@
      <x>0</x>
      <y>0</y>
      <width>725</width>
-     <height>21</height>
+     <height>22</height>
     </rect>
    </property>
   </widget>

mainwindow.ui

@@ -32,7 +32,6 @@ void execAndDoOnEveryLine(const std::string &execString, const Action &action) {
 
   QTextStream nmOutStream(stream.get());
   QString line;
-  int status = 0;
   do {
     line = nmOutStream.readLine().trimmed();
     if (line.isNull()) {
@@ -80,7 +79,7 @@ QLdd::QLdd(QString fileName, QString lddDirPath)
 
 QLdd::~QLdd() {}
 
-uint64_t QLdd::getFileSize() const { return _fileInfo.size(); }
+int64_t QLdd::getFileSize() const { return _fileInfo.size(); }
 
 const QString &QLdd::getStringFileSize() const { return _fileSize; }
 
@@ -188,7 +187,6 @@ const QString &QLdd::getStatusTime() { return _tmStatus; }
 const QString &QLdd::getModifyTime() { return _tmModify; }
 
 QString QLdd::getInfo() {
-  char buffer[MAXBUFFER] = {0};
   std::stringstream ss;
   ss << "file " << _fileName.toStdString();
   QString buf;

qldd.cpp

@@ -16,7 +16,7 @@ class QLdd {
  public:
   QLdd(QString fileName, QString lddDirPath);
   virtual ~QLdd();
-  uint64_t getFileSize() const;
+  int64_t getFileSize() const;
   const QString &getStringFileSize() const;
   void fillDependency(QTreeWidget &treeWidget);
   void fillExportTable(QListWidget &listWidget);