Modify Package/Flatpak/io.github.KangLin.RabbitRemoteControl.yml

Author: KangLin

Package/Flatpak/io.github.KangLin.RabbitRemoteControl.yml

@@ -7,9 +7,15 @@ runtime-version: "6.8"
 sdk: "org.kde.Sdk"
 command: RabbitRemoteControlApp
 
+base: io.qt.qtwebengine.BaseApp
+base-version: '6.8'
+cleanup-commands:
+  - /app/cleanup-BaseApp.sh
+
 build-options:
   env:
     V: "1"
+    QTWEBENGINE_DISABLE_SANDBOX: '1'
 
 cleanup:
   - "*.la"
@@ -36,6 +42,10 @@ finish-args:
   # https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=15507
   - --filesystem=xdg-public-share
   - --filesystem=home:ro
+  # https://github.com/flathub/io.qt.qtwebengine.BaseApp
+  - --device=dri
+  - --env=QTWEBENGINEPROCESS_PATH=/app/bin/QtWebEngineProcess
+  - --socket=pulse
 
 modules:
   - shared-modules/libusb/libusb.json

Plugins/FileTransfer/FrmFileTransfer.cpp

@@ -112,24 +112,24 @@ CFrmFileTransfer::~CFrmFileTransfer()
     delete ui;
 }
 
-void CFrmFileTransfer::SetRemoteConnecter(CRemoteFileSystemModel *p)
+void CFrmFileTransfer::SetRemoteConnecter(CRemoteFileSystemModel *pRfs)
 {
-    bool check = connect(p, SIGNAL(sigGetDir(CRemoteFileSystem*)),
+    bool check = connect(pRfs, SIGNAL(sigGetDir(CRemoteFileSystem*)),
                     this, SIGNAL(sigGetDir(CRemoteFileSystem*)));
     Q_ASSERT(check);
     check = connect(this, SIGNAL(sigGetDir(CRemoteFileSystem*, QVector<QSharedPointer<CRemoteFileSystem> > , bool)),
-                    p, SLOT(slotGetDir(CRemoteFileSystem*, QVector<QSharedPointer<CRemoteFileSystem> > , bool)));
+                    pRfs, SLOT(slotGetDir(CRemoteFileSystem*, QVector<QSharedPointer<CRemoteFileSystem> > , bool)));
     Q_ASSERT(check);
-    check = connect(p, SIGNAL(sigRemoveDir(const QString&)),
+    check = connect(pRfs, SIGNAL(sigRemoveDir(const QString&)),
                     this, SIGNAL(sigRemoveDir(const QString&)));
     Q_ASSERT(check);
-    check = connect(p, SIGNAL(sigRemoveFile(const QString&)),
+    check = connect(pRfs, SIGNAL(sigRemoveFile(const QString&)),
                     this, SIGNAL(sigRemoveFile(const QString&)));
     Q_ASSERT(check);
-    check = connect(p, SIGNAL(sigRename(const QString&, const QString&)),
+    check = connect(pRfs, SIGNAL(sigRename(const QString&, const QString&)),
                     this, SIGNAL(sigRename(const QString&, const QString&)));
     Q_ASSERT(check);
-    check = connect(p, SIGNAL(sigMakeDir(const QString&)),
+    check = connect(pRfs, SIGNAL(sigMakeDir(const QString&)),
                     this, SIGNAL(sigMakeDir(const QString&)));
     Q_ASSERT(check);
 }
@@ -309,6 +309,7 @@ void CFrmFileTransfer::on_tabLocal_customContextMenuRequested(const QPoint &pos)
 
 void CFrmFileTransfer::slotTabLocalCopyToClipboard()
 {
+    if(!m_pModelLocalDir) return;
     auto idx = ui->tabLocal->currentIndex();
     if(!idx.isValid()) return;
     QString szPath = m_pModelLocalDir->filePath(idx);
@@ -319,9 +320,11 @@ void CFrmFileTransfer::slotTabLocalCopyToClipboard()
 
 void CFrmFileTransfer::slotTabLocalUpload()
 {
+    if(!m_pModelLocalDir) return;
     auto idx = ui->tabLocal->currentIndex();
     if(!idx.isValid()) return;
-    QString szPath = m_pModelLocalDir->filePath(idx);
+    QString szPath;
+    szPath = m_pModelLocalDir->filePath(idx);
     if(szPath.isEmpty()) return;
 }
 
@@ -476,7 +479,7 @@ void CFrmFileTransfer::slotTreeRemoteDownload()
 {
 }
 
-int CFrmFileTransfer::EnumRemoteDirectory(CRemoteFileSystem *p, const QString &szLocal)
+int CFrmFileTransfer::EnumRemoteDirectory(CRemoteFileSystem *pRfs, const QString &szLocal)
 {
     int nRet = 0;
 

Plugins/FileTransfer/FrmFileTransfer.h

@@ -28,8 +28,8 @@ class CFrmFileTransfer : public QWidget
     void sigUpload(const QString& source, const QString& destination);
     void sigCopyUrlToClipboard(const QString& szPath);
 
-    void sigGetDir(CRemoteFileSystem*);
-    void sigGetDir(CRemoteFileSystem*,
+    void sigGetDir(CRemoteFileSystem* pRfs);
+    void sigGetDir(CRemoteFileSystem* pRfs,
                    QVector<QSharedPointer<CRemoteFileSystem> > contents,
                    bool bEnd);
 
@@ -46,10 +46,10 @@ class CFrmFileTransfer : public QWidget
     int SetLocalRoot(const QString &root);
     //! Get local root path
     [[nodiscard]] QString GetLocalRoot() const;
-    void SetRemoteConnecter(CRemoteFileSystemModel* p);
+    void SetRemoteConnecter(CRemoteFileSystemModel* pRfs);
 
     int EnumLocalDirectory(QDir d, const QString& szRemote);
-    int EnumRemoteDirectory(CRemoteFileSystem* p, const QString& szLocal);
+    int EnumRemoteDirectory(CRemoteFileSystem* pRfs, const QString& szLocal);
 
 private Q_SLOTS:
     void on_cbLocal_editTextChanged(const QString &szPath);

docs/Compile/Linux_zh_CN.md

@@ -978,6 +978,8 @@ PcapPlusPlus 依赖此库。
         sudo Xvfb :99 -ac -screen 0 1200x900x24 &
         export DISPLAY=:99.0
 
+  - QtWebEngine: https://github.com/flathub/io.qt.qtwebengine.BaseApp
+
 - 文档
   - [flatpak 清单文件](https://docs.flatpak.org/en/latest/flatpak-builder-command-reference.html#flatpak-manifest)
   - [Sandbox 权限](https://docs.flatpak.org/en/latest/sandbox-permissions.html)