openkylin
/
kylin-connectivity
mirror of https://gitee.com/openkylin/kylin-connectivity.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'table' into 'table' 

fix(UI模块): 解决数据项蓝色背景的问题

See merge request kylinos-src/kylin-connectivity!10
This commit is contained in:
刘珈麟 2022-10-09 09:56:58 +00:00
parent cf2b397d35 0731b4fbb7
commit c2ee39cbd4
9 changed files with 122 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ui/classificationlist/mobilefilewidget.cpp
View File

@ -1,7 +1,6 @@
#include "mobilefilewidget.h"
#include <QCheckBox>
#include <QScrollArea>
#include <QScrollBar>
#include <QDebug>
@ -214,18 +213,18 @@ void MobileFileWidget::initUI()
QWidget *listWidget = new QWidget();
QScrollArea *scrollArea = new QScrollArea();
m_scrollArea = new QScrollArea(this);
QVBoxLayout *scrollVLayout = new QVBoxLayout();
QWidget *scrollWin = new QWidget(this);
scrollWin->setLayout(scrollVLayout);
scrollVLayout->addWidget(scrollArea);
scrollVLayout->addWidget(m_scrollArea);
scrollArea->setWidgetResizable(true);
m_scrollArea->setWidgetResizable(true);
scrollArea->setBackgroundRole(QPalette::Base);
scrollArea->setFrameShape(QFrame::NoFrame);
scrollArea->setWidget(listWidget);
m_scrollArea->setBackgroundRole(QPalette::Base);
m_scrollArea->setFrameShape(QFrame::NoFrame);
m_scrollArea->setWidget(listWidget);
scrollVLayout->setContentsMargins(68, 0, 68, 30);
@ -436,3 +435,22 @@ void MobileFileWidget::setViewHeight()
moveCopyToComputerWidget();
}
}
void MobileFileWidget::setTheme(PublicAttributes::Theme theme)
{
if (theme == PublicAttributes::Theme::Light) {
QPalette scrollPalette = m_scrollArea->palette();
scrollPalette.setColor(QPalette::Base, QColor("#FFFEFD"));
m_scrollArea->setPalette(scrollPalette);
if (m_timeLineView != nullptr) {
m_timeLineView->setTheme(theme);
}
} else if (theme == PublicAttributes::Theme::Dark) {
QPalette scrollPalette = m_scrollArea->palette();
scrollPalette.setColor(QPalette::Base, QColor("#1D1D1D"));
m_scrollArea->setPalette(scrollPalette);
if (m_timeLineView != nullptr) {
m_timeLineView->setTheme(theme);
}
}
}

5
ui/classificationlist/mobilefilewidget.h
View File

@ -8,11 +8,13 @@
#include <QPushButton>
#include <QStackedWidget>
#include <QThread>
#include <QScrollArea>
#include "loadanimation.h"
#include "timelineview.h"
#include "copytocomputerbuttonwidget.h"
#include "searchedit.h"
#include "publicattributes.hpp"
class MobileFileWidget : public QWidget
{
@ -52,6 +54,8 @@ public:
void setViewHeight();
void setTheme(PublicAttributes::Theme theme);
private Q_SLOTS:
void slotModeButtonClicked();
void slotHideCopyToComputerWidget();
@ -82,6 +86,7 @@ private:
QListView::ViewMode m_mode = QListView::IconMode;
int m_text;
CopyToComputerButtonWidget *m_copyButtonMobileFileWidget = nullptr;
QScrollArea *m_scrollArea = nullptr;
private:
void initUI();

25
ui/classificationlist/timelineview.cpp
View File

@ -73,6 +73,31 @@ void TimeLineView::initTimeLineViewWidget()
connect(m_pictureListWidget->verticalScrollBar(), &QScrollBar::valueChanged, this, &TimeLineView::slotValueChanged);
}
void TimeLineView::setTheme(PublicAttributes::Theme theme)
{
if (theme == PublicAttributes::Theme::Light) {
if (m_pictureListWidget != nullptr) {
QPalette listWidgetPalette = this->palette();
listWidgetPalette.setColor(QPalette::Base, QColor("#FFFEFD"));
this->setPalette(listWidgetPalette);
} else {
QPalette listWidgetPalette = this->palette();
listWidgetPalette.setColor(QPalette::Base, QColor("#FFFEFD"));
this->setPalette(listWidgetPalette);
}
} else if (theme == PublicAttributes::Theme::Dark) {
if (m_pictureListWidget != nullptr) {
QPalette listWidgetPalette = this->palette();
listWidgetPalette.setColor(QPalette::Base, QColor("#1D1D1D"));
this->setPalette(listWidgetPalette);
} else {
QPalette listWidgetPalette = this->palette();
listWidgetPalette.setColor(QPalette::Base, QColor("#1D1D1D"));
this->setPalette(listWidgetPalette);
}
}
}
void TimeLineView::initViewWidget()
{

2
ui/classificationlist/timelineview.h
View File

@ -16,6 +16,7 @@
#include "timelinelistwidget.h"
#include "arrowlinebutton.h"
#include "fileinfo.h"
#include "publicattributes.hpp"
//所有时间线标题和图片
class TimeLineView : public QWidget
@ -43,6 +44,7 @@ public:
void setThumbnail(QString fileName);
//初始或界面大小发送改变会调用此函数
void setViewHeight();
void setTheme(PublicAttributes::Theme theme);
public Q_SLOTS:
Q_SIGNALS:

6
ui/mainwindow.cpp
View File

@ -435,6 +435,7 @@ void MainWindow::updateResult()
m_mobileFileList = new MobileFileList();
connectMobileFileList();
m_mobileFileList->setItemCount(fileNumMap);
m_mobileFileList->setTheme(m_theme);
m_stackedMobileFileListWin->addWidget(m_mobileFileList);
m_stackedMobileFileListWin->setCurrentIndex(0);
}
@ -471,6 +472,7 @@ void MainWindow::updateResult()
}
QMap<QString, FileInfo> filelist;
m_mobileStorageWidget = new MobileStorageWidget(filelist, m_currentPath, TYPE::Pctopc);
m_mobileStorageWidget->setTheme(m_theme);
connect(m_mobileStorageWidget, &MobileStorageWidget::sigModeChange, this, [=](QListView::ViewMode mode) {
m_storageMode = mode;
});
@ -522,6 +524,7 @@ void MainWindow::initMobileListWidget(int tag)
int index = m_stackedMobileFileListWin->currentIndex();
m_listItemWidget = new MobileFileWidget(tag);
m_listItemWidget->setTheme(m_theme);
connectMobileFileWidget();
m_stackedMobileFileListWin->addWidget(m_listItemWidget);
m_stackedMobileFileListWin->setCurrentIndex(index + 1);
@ -827,6 +830,7 @@ void MainWindow::slotCurrentDirectoryList(const QMap<QString, FileInfo> &filelis
}
if (m_connectInfo.deviceType == ConnectionService::DeviceType::ANDROID) {
m_mobileStorageWidget = new MobileStorageWidget(filelist, deviceName, TYPE::Mobile);
m_mobileStorageWidget->setTheme(m_theme);
connect(m_mobileStorageWidget, &MobileStorageWidget::sigModeChange, this, [=](QListView::ViewMode mode) {
m_storageMode = mode;
});
@ -840,6 +844,7 @@ void MainWindow::slotCurrentDirectoryList(const QMap<QString, FileInfo> &filelis
m_mobileFileList = nullptr;
}
m_mobileStorageWidget = new MobileStorageWidget(filelist, deviceName, TYPE::Pctopc);
m_mobileStorageWidget->setTheme(m_theme);
connect(m_mobileStorageWidget, &MobileStorageWidget::sigModeChange, this, [=](QListView::ViewMode mode) {
m_storageMode = mode;
});
@ -1106,6 +1111,7 @@ void MainWindow::onRecvSearchResult(QMap<QString, FileInfo> searchResult)
qInfo() << "search by keyword";
deleteMobileListWidget();
m_mobileStorageWidget = new MobileStorageWidget(searchResult, "Search", TYPE::Search);
m_mobileStorageWidget->setTheme(m_theme);
connect(m_mobileStorageWidget, &MobileStorageWidget::sigModeChange, this, [=](QListView::ViewMode mode) {
m_storageMode = mode;
});

45
ui/storagelist/mobilestoragewidget.cpp
View File

@ -169,16 +169,16 @@ void MobileStorageWidget::initUI()
layout->setSpacing(0);
layout->setContentsMargins(0, 0, 0, 0);
QScrollArea *scrollArea = new QScrollArea();
scrollArea->setWidgetResizable(true);
m_scrollArea = new QScrollArea(this);
m_scrollArea->setWidgetResizable(true);
// scrollArea->setBackgroundRole(QPalette::Dark);
scrollArea->setFrameShape(QFrame::NoFrame);
scrollArea->setWidget(listWidget);
// m_scrollArea->setBackgroundRole(QPalette::Dark);
m_scrollArea->setFrameShape(QFrame::NoFrame);
m_scrollArea->setWidget(listWidget);
listWidget->setLayout(layout);
scrollVLayout->addWidget(scrollArea);
scrollVLayout->addWidget(m_scrollArea);
scrollVLayout->setContentsMargins(68, 0, 68, 10);
mainVLayout->addLayout(fileListHLayout);
@ -349,16 +349,16 @@ void MobileStorageWidget::initPcUI()
layout->setSpacing(0);
layout->setContentsMargins(0, 0, 0, 0);
QScrollArea *scrollArea = new QScrollArea();
scrollArea->setWidgetResizable(true);
m_scrollArea = new QScrollArea(this);
m_scrollArea->setWidgetResizable(true);
// scrollArea->setBackgroundRole(QPalette::Dark);
scrollArea->setFrameShape(QFrame::NoFrame);
scrollArea->setWidget(listWidget);
m_scrollArea->setFrameShape(QFrame::NoFrame);
m_scrollArea->setWidget(listWidget);
listWidget->setLayout(layout);
scrollVLayout->addWidget(scrollArea);
scrollVLayout->addWidget(m_scrollArea);
scrollVLayout->setContentsMargins(68, 0, 68, 10);
mainVLayout->addLayout(fileListHLayout);
@ -586,15 +586,15 @@ void MobileStorageWidget::initSearchUI()
layout->setSpacing(0);
layout->setMargin(0);
QScrollArea *scrollArea = new QScrollArea();
scrollArea->setWidgetResizable(true);
m_scrollArea = new QScrollArea(this);
m_scrollArea->setWidgetResizable(true);
scrollArea->setFrameShape(QFrame::NoFrame);
scrollArea->setWidget(listWidget);
m_scrollArea->setFrameShape(QFrame::NoFrame);
m_scrollArea->setWidget(listWidget);
listWidget->setLayout(layout);
scrollVLayout->addWidget(scrollArea);
scrollVLayout->addWidget(m_scrollArea);
scrollVLayout->setContentsMargins(68, 0, 68, 10);
mainVLayout->addLayout(fileListHLayout);
@ -623,3 +623,16 @@ void MobileStorageWidget::setViewHeight()
moveCopyToComputerWidget();
}
}
void MobileStorageWidget::setTheme(PublicAttributes::Theme theme)
{
if (theme == PublicAttributes::Theme::Light) {
QPalette scrollPalette = m_scrollArea->palette();
scrollPalette.setColor(QPalette::Base, QColor("#FFFEFD"));
m_scrollArea->setPalette(scrollPalette);
} else if (theme == PublicAttributes::Theme::Dark) {
QPalette scrollPalette = m_scrollArea->palette();
scrollPalette.setColor(QPalette::Base, QColor("#1D1D1D"));
m_scrollArea->setPalette(scrollPalette);
}
}

5
ui/storagelist/mobilestoragewidget.h
View File

@ -6,10 +6,12 @@
#include <QHBoxLayout>
#include <QLabel>
#include <QPushButton>
#include <QScrollArea>
#include "fileinfo.h"
#include "mobilestorageviewwidget.h"
#include "searchedit.h"
#include "publicattributes.hpp"
class MobileStorageWidget : public QWidget
{
@ -29,6 +31,8 @@ public:
void setViewHeight();
void setTheme(PublicAttributes::Theme theme);
public:
private Q_SLOTS:
void slotModeButtonClicked();
@ -63,6 +67,7 @@ private:
QString m_currentIndexPath;
CopyToComputerButtonWidget *m_copyButtonMobileStrorageWidget = nullptr;
int m_index = FILE_TYPE::None;
QScrollArea *m_scrollArea = nullptr;
private:
void initUI();

27
ui/view/mobilefilelist.cpp
View File

@ -55,7 +55,7 @@ void MobileFileList::initWidget()
mobileFileListLabel->setText(tr("Mobile file list")); // Mobile file list手机文件列表
mobileFileListHLayout->addWidget(mobileFileListLabel);
mobileFileListHLayout->setContentsMargins(88, 0, 0, 0);
mobileFileListHLayout->setContentsMargins(34, 0, 0, 0);
mobileFileListHLayout->addStretch();
//手机存储
@ -65,7 +65,7 @@ void MobileFileList::initWidget()
mobileStorageHLayout->setMargin(0);
mobileStorageHLayout->addWidget(mobileStorageLabel);
mobileStorageHLayout->setContentsMargins(88, 0, 0, 0);
mobileStorageHLayout->setContentsMargins(34, 0, 0, 0);
mobileStorageHLayout->addStretch();
//手机文件列表widget
@ -115,7 +115,7 @@ void MobileFileList::initWidget()
//设置边距
m_storageWidget->setSpacing(16);
mainVLayout->setMargin(0);
mainVLayout->setContentsMargins(56, 0, 56, 0);
mainVLayout->setSpacing(0);
mainVLayout->addLayout(mobileFileListHLayout);
mainVLayout->addSpacing(28);
@ -125,7 +125,6 @@ void MobileFileList::initWidget()
mainVLayout->addSpacing(28);
mainVLayout->addWidget(storageWidget);
mainVLayout->addStretch();
mainVLayout->setContentsMargins(67, 0, 0, 0);
this->setLayout(mainVLayout);
}
@ -215,3 +214,23 @@ void MobileFileList::slotMobileButtonClicked()
{
Q_EMIT sigMobileStorageClicked("/");
}
void MobileFileList::setTheme(PublicAttributes::Theme theme)
{
if (theme == PublicAttributes::Theme::Light) {
QPalette paletteListWid = m_fileListWidget->palette();
paletteListWid.setColor(QPalette::Base, QColor("#FFFEFD"));
m_fileListWidget->setPalette(paletteListWid);
QPalette paletteStorageWid = m_storageWidget->palette();
paletteStorageWid.setColor(QPalette::Base, QColor("#FFFEFD"));
m_storageWidget->setPalette(paletteStorageWid);
} else if (theme == PublicAttributes::Theme::Dark) {
QPalette paletteListWid = m_fileListWidget->palette();
paletteListWid.setColor(QPalette::Base, QColor("#1D1D1D"));
m_fileListWidget->setPalette(paletteListWid);
QPalette palette = m_storageWidget->palette();
palette.setColor(QPalette::Base, QColor("#1D1D1D"));
m_storageWidget->setPalette(palette);
}
}

2
ui/view/mobilefilelist.h
View File

@ -9,6 +9,7 @@
#include <QPushButton>
#include <QAbstractItemModel>
#include "mobilefilelistitem.h"
#include "publicattributes.hpp"
class MobileFileList : public QWidget
{
@ -22,6 +23,7 @@ public:
void setItemCount(const QMap<QString, int> &map);
void setTheme(PublicAttributes::Theme theme);
private Q_SLOTS:
//图片项点击
void slotPictureButtonClicked();