diff --git a/3rdparty/libarchive/readwritelibarchiveplugin/readwritelibarchiveplugin.cpp b/3rdparty/libarchive/readwritelibarchiveplugin/readwritelibarchiveplugin.cpp index 3ff43c81..619859f4 100644 --- a/3rdparty/libarchive/readwritelibarchiveplugin/readwritelibarchiveplugin.cpp +++ b/3rdparty/libarchive/readwritelibarchiveplugin/readwritelibarchiveplugin.cpp @@ -394,7 +394,7 @@ bool ReadWriteLibarchivePlugin::writeFileTodestination(const QString &sourceFile absoluteDestinationPath = extractTempDir->path() + QDir::separator() + destination; QDir dir; dir.mkpath(absoluteDestinationPath); - QString strFilePath = absoluteDestinationPath + sourceFileInfo.fileName(); + QString strFilePath = absoluteDestinationPath + sourceFileInfo.fileName().left(TRUNCATION_FILE_LONG); if (QFile::link(sourceFileFullPath, strFilePath)) { // qInfo() << "Symlink's created:" << destination << sourceFileFullPath; } else { @@ -477,7 +477,7 @@ bool ReadWriteLibarchivePlugin::writeFileFromEntry(const QString &relativeName, absoluteDestinationPath = extractTempDir->path() + QDir::separator() + destination; QDir dir; dir.mkpath(absoluteDestinationPath);//创建临时文件夹 - QString newFilePath = absoluteDestinationPath + relativeFileInfo.fileName(); + QString newFilePath = absoluteDestinationPath + relativeFileInfo.fileName().left(TRUNCATION_FILE_LONG); if (QFile::link(relativeName, newFilePath)) { // qInfo() << "Symlink's created:" << destination << relativeName; } else { diff --git a/src/source/page/compresspage.cpp b/src/source/page/compresspage.cpp index ed0d3464..17369eb1 100644 --- a/src/source/page/compresspage.cpp +++ b/src/source/page/compresspage.cpp @@ -78,7 +78,7 @@ void CompressPage::initUI() pMainLayout->addLayout(pBtnLayout); pMainLayout->setStretchFactor(m_pCompressView, 10); pMainLayout->setStretchFactor(pBtnLayout, 1); - pMainLayout->setContentsMargins(20, 1, 20, 20); + pMainLayout->setContentsMargins(10, 1, 10, 20); // 设置快捷键 auto openkey = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_O), this); diff --git a/src/source/page/compresssettingpage.cpp b/src/source/page/compresssettingpage.cpp index 28dcdd82..d2993a3e 100644 --- a/src/source/page/compresssettingpage.cpp +++ b/src/source/page/compresssettingpage.cpp @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -213,6 +214,11 @@ void CompressSettingPage::initUI() DStyle style; // 设置菜单箭头 QPixmap pixmap = style.standardIcon(DStyle::StandardPixmap::SP_ReduceElement).pixmap(QSize(10, 10)); pArrowPixmapLbl->setPixmap(pixmap); + connect(DGuiApplicationHelper::instance(), &DGuiApplicationHelper::themeTypeChanged, this, [=]() { + DStyle style; // 设置菜单箭头 + QPixmap pixmap = style.standardIcon(DStyle::StandardPixmap::SP_ReduceElement).pixmap(QSize(10, 10)); + pArrowPixmapLbl->setPixmap(pixmap); + }); DFontSizeManager::instance()->bind(m_pCompressTypeLbl, DFontSizeManager::T5, QFont::DemiBold); @@ -798,6 +804,9 @@ void CompressSettingPage::slotAdvancedEnabled(bool bEnabled) void CompressSettingPage::slotSplitEdtEnabled() { + if(m_pSplitValueEdt->hasFocus() || m_pCommentEdt->hasFocus()) { + parentWidget()->setFocus(); + } // 设置分卷输入框是否可用 m_pSplitValueEdt->setEnabled(m_pSplitCkb->isChecked()); diff --git a/src/source/page/uncompresspage.cpp b/src/source/page/uncompresspage.cpp index 2b7273b0..8da0d7da 100644 --- a/src/source/page/uncompresspage.cpp +++ b/src/source/page/uncompresspage.cpp @@ -131,7 +131,7 @@ void UnCompressPage::initUI() pMainLayout->setStretchFactor(m_pUnCompressView, 9); pMainLayout->setStretchFactor(pPathLayout, 1); pMainLayout->setStretchFactor(pBtnLayout, 1); - pMainLayout->setContentsMargins(20, 1, 20, 20); + pMainLayout->setContentsMargins(10, 1, 10, 20); // 设置快捷键 diff --git a/src/source/tree/datatreeview.cpp b/src/source/tree/datatreeview.cpp index d13e709f..f16a52a9 100644 --- a/src/source/tree/datatreeview.cpp +++ b/src/source/tree/datatreeview.cpp @@ -262,8 +262,13 @@ void DataTreeView::drawRow(QPainter *painter, const QStyleOptionViewItem &option //根据实际情况设置颜色,奇数行为灰色 auto palette = options.palette; QBrush background; - if (!(index.row() & 1)) { - background = palette.color(cg, DPalette::AlternateBase); + bool bVis = m_pHeaderView->getpreLbl()->isVisible(); + if (bVis ? (index.row() & 1) : !(index.row() & 1)) { + if(DGuiApplicationHelper::DarkType == DGuiApplicationHelper::instance()->themeType()) { + background = QColor(255, 255, 255, 12); + } else { + background = palette.color(cg, DPalette::AlternateBase); + } } else { background = palette.color(cg, DPalette::Base); } diff --git a/src/source/tree/treeheaderview.cpp b/src/source/tree/treeheaderview.cpp index ffb24cc7..e9d69c02 100644 --- a/src/source/tree/treeheaderview.cpp +++ b/src/source/tree/treeheaderview.cpp @@ -67,7 +67,11 @@ void PreviousLabel::paintEvent(QPaintEvent *e) if (focusIn_) { bgColor = QColor(44, 44, 44); } else { - bgColor = QColor(38, 38, 38); + if(DGuiApplicationHelper::DarkType == DGuiApplicationHelper::instance()->themeType()) { + bgColor = QColor(255, 255, 255, 12); + } else { + bgColor = QColor(38, 38, 38); + } } }