chore: More logs for application

Add more logs for application. 86.21%

Log: More logs for application.

Author: re2zero

application/common.cpp

@@ -8,12 +8,13 @@
 
 QIcon Common::getIcon(const QString &iconName)
 {
+    // qDebug() << "Common::getIcon called with iconName:" << iconName;
     return QIcon::fromTheme("dm_" + iconName);
 }
 
 int Common::getLabelAdjustHeight(const int &width, const QString &text, const QFont &font)
 {
-    qDebug() << "Calculating label height for text:" << text.left(20) << "...";
+    // qDebug() << "Calculating label height for text:" << text.left(20) << "...";
     DLabel label;
     label.setFont(font);
     label.setWordWrap(true);
@@ -22,6 +23,6 @@ int Common::getLabelAdjustHeight(const int &width, const QString &text, const QF
     label.adjustSize();
 
     int height = label.height();
-    qDebug() << "Calculated label height:" << height;
+    // qDebug() << "Calculated label height:" << height;
     return height;
 }

application/main.cpp

@@ -40,17 +40,27 @@ DWIDGET_USE_NAMESPACE
 // 接口工厂
 QAccessibleInterface *accessibleFactory(const QString &classname, QObject *object)
 {
+    qDebug() << "accessibleFactory called for classname:" << classname;
     QAccessibleInterface *interface = nullptr;
 
     if (object && object->isWidgetType()) {
-        if (classname == "QLabel")
+        qDebug() << "Object is a widget type, classname:" << classname;
+        if (classname == "QLabel") {
+            qDebug() << "Creating AccessibleLabel for QLabel";
             interface = new AccessibleLabel(qobject_cast<QLabel *>(object));
+        }
 
-        if (classname == "QPushButton")
+        if (classname == "QPushButton") {
+            qDebug() << "Creating AccessibleButton for QPushButton";
             interface = new AccessibleButton(qobject_cast<QPushButton *>(object));
+        }
 
-        if (classname == "QComboBox")
+        if (classname == "QComboBox") {
+            qDebug() << "Creating AccessibleComboBox for QComboBox";
             interface = new AccessibleComboBox(qobject_cast<QComboBox *>(object));
+        }
+    } else {
+        qDebug() << "Object is not a widget type or is null.";
     }
 
     return interface;
@@ -65,20 +75,23 @@ QAccessibleInterface *accessibleFactory(const QString &classname, QObject *objec
  */
 int executCmd(const QString &strCmd, QString &outPut, QString &error)
 {
+    qDebug() << "executCmd called with command:" << strCmd;
     QProcess proc;
 #if QT_VERSION_MAJOR > 5
+    qDebug() << "QT_VERSION_MAJOR > 5, using split command start.";
     QStringList list = strCmd.split(" ");
     proc.start(list.at(0), QStringList() << list.at(1));
 #else
+    qDebug() << "QT_VERSION_MAJOR <= 5, using direct command start.";
     proc.start(strCmd);
 #endif
     proc.waitForFinished(-1);
     outPut = proc.readAllStandardOutput();
     error = proc.readAllStandardError();
     error = proc.errorString();
     int exitcode = proc.exitCode();
+    qDebug() << "executCmd finished. Exit code:" << exitcode << ", Output size:" << outPut.size() << ", Error size:" << error.size();
     return exitcode;
-
 }
 
 int main(int argc, char *argv[])
@@ -87,13 +100,15 @@ int main(int argc, char *argv[])
     // signal(SIGKILL, SIG_IGN);
 
     if (qEnvironmentVariableIsEmpty("XDG_CURRENT_DESKTOP")){
+        qDebug() << "XDG_CURRENT_DESKTOP is empty, setting to Deepin.";
         qputenv("XDG_CURRENT_DESKTOP", "Deepin");
     }
 
     auto e = QProcessEnvironment::systemEnvironment();
 #if QT_VERSION_MAJOR <= 5
     QString XDG_SESSION_TYPE = e.value(QStringLiteral("XDG_SESSION_TYPE"));
     if (XDG_SESSION_TYPE == QLatin1String("x11")) {
+        qDebug() << "XDG_SESSION_TYPE is x11, loading DXcbPlugin.";
         CusApplication::loadDXcbPlugin();
     }
 #endif
@@ -115,52 +130,58 @@ int main(int argc, char *argv[])
     a.setApplicationDescription(QObject::tr("Disk Utility is a disk management tool for creating, reorganizing and formatting partitions."));
 #if QT_VERSION_MAJOR <= 5
     DApplicationSettings savetheme;
+    qDebug() << "DApplicationSettings initialized for QT_VERSION_MAJOR <= 5.";
 #endif
     Dtk::Core::DLogManager::registerConsoleAppender();
     Dtk::Core::DLogManager::registerFileAppender();
+    qDebug() << "Console and file appenders registered.";
 
     // 安装工厂
     QAccessible::installFactory(accessibleFactory);
+    qDebug() << "Accessible factory installed.";
 
-//    MainWindow w;
-//    if (a.setSingleInstance(appName)) {
-//        QObject::connect(&a, &DApplication::newInstanceStarted, &w, [&] {qDebug() << "======"; w.activateWindow(); });
-//    } else {
-//        exit(0);
-//    }
     if (a.setSingleInstance(appName)) {
+        qDebug() << "Application is single instance, proceeding with service check.";
         QProcess proc;
         QString cmd, oldPid, newPid, error;
         //先判断后台服务进程是否存在,如果存在可能是强制退出导致,应先退出后台程序再重新启动磁盘管理器
         cmd = QString("pidof deepin-diskmanager-service");
+        qDebug() << "Checking for deepin-diskmanager-service PID with command:" << cmd;
 
         if (!executCmd(cmd, oldPid, error)) {
+            qDebug() << "deepin-diskmanager-service found, sending Quit signal.";
             proc.startDetached("/usr/bin/dbus-send --system --type=method_call --dest=com.deepin.diskmanager /com/deepin/diskmanager com.deepin.diskmanager.Quit");
         }
 
         QStringList argList;
         argList << QString::number(QCoreApplication::applicationPid()) << QDBusConnection::systemBus().baseService();
+        qDebug() << "Starting deepin-diskmanager-authenticateProxy with args:" << argList;
         proc.startDetached("/usr/bin/deepin-diskmanager-authenticateProxy", argList);
 
         //正常启动程序后,循环查询后台服务是否已经启动,如果后台服务启动说明鉴权成功,启动前端界面
         while (1) {
             cmd = QString("pidof deepin-diskmanager-service");
 
             if (!executCmd(cmd, newPid, error) && oldPid != newPid) {
+                qDebug() << "New deepin-diskmanager-service PID found, breaking loop.";
                 break;
             }
             QThread::msleep(300);
         }
 
         proc.close();
+        qDebug() << "Process closed after service check.";
 
     } else {
+        qDebug() << "Application is another instance which is already running, sending message to it and exiting.";
+        // The message is sent automatically by DApplication framework.
         exit(0);
     }
 
     MainWindow w;
     QObject::connect(&a, &DApplication::newInstanceStarted, &w, [&] {qDebug() << "======"; w.activateWindow(); });
     QObject::connect(&a, &CusApplication::handleQuitActionChanged, &w, &MainWindow::onHandleQuitAction);
+    qDebug() << "MainWindow signals connected.";
 
 //    DMDbusHandler::instance()->startService(static_cast<qint64>(getpid()));
 //    QObject::connect(DMDbusHandler::instance(), &DMDbusHandler::rootLogin, &w, [&] {
@@ -175,6 +196,7 @@ int main(int argc, char *argv[])
 
     Dtk::Widget::moveToCenter(&w);
     w.show();
+    qDebug() << "MainWindow shown.";
 
     return a.exec();
 }