diff --git a/0001-Fixed-application-icon-dragging-problem.patch b/0001-Fixed-application-icon-dragging-problem.patch deleted file mode 100644 index a68e839..0000000 --- a/0001-Fixed-application-icon-dragging-problem.patch +++ /dev/null @@ -1,1038 +0,0 @@ -From e1ac89bb3883bef193b5544f9152096a11d17849 Mon Sep 17 00:00:00 2001 -From: liuhao-startmenu -Date: Fri, 3 Apr 2020 18:08:57 +0800 -Subject: [PATCH] Fixed application icon dragging problem - ---- - src/CommonUseWidget/commonusewidget.cpp | 61 +++++++++- - src/CommonUseWidget/commonusewidget.h | 14 ++- - src/CommonUseWidget/fullcommonusewidget.cpp | 58 +++++++++- - src/CommonUseWidget/fullcommonusewidget.h | 14 ++- - src/FunctionWidget/fullfunctionwidget.cpp | 17 +-- - src/FunctionWidget/fullfunctionwidget.h | 2 +- - src/FunctionWidget/functionwidget.cpp | 2 +- - src/FunctionWidget/functionwidget.h | 4 +- - src/LetterWidget/fullletterwidget.cpp | 6 +- - src/LetterWidget/fullletterwidget.h | 2 +- - src/LetterWidget/letterwidget.cpp | 2 +- - src/LetterWidget/letterwidget.h | 4 +- - src/MainViewWidget/mainviewwidget.cpp | 72 ++++++++---- - src/RightClickMenu/rightclickmenu.cpp | 29 ++--- - src/RightClickMenu/rightclickmenu.h | 108 +++++++++--------- - .../fullsearchresultwidget.cpp | 2 +- - .../fullsearchresultwidget.h | 3 +- - src/SearchResultWidget/searchresultwidget.cpp | 2 +- - src/SearchResultWidget/searchresultwidget.h | 2 +- - src/UtilityFunction/fulllistview.cpp | 18 +-- - src/UtilityFunction/fulllistview.h | 8 +- - src/UtilityFunction/listview.cpp | 15 ++- - src/UtilityFunction/listview.h | 10 +- - 23 files changed, 300 insertions(+), 155 deletions(-) - -diff --git a/src/CommonUseWidget/commonusewidget.cpp b/src/CommonUseWidget/commonusewidget.cpp -index b216247..d932ada 100644 ---- a/src/CommonUseWidget/commonusewidget.cpp -+++ b/src/CommonUseWidget/commonusewidget.cpp -@@ -69,9 +69,10 @@ void CommonUseWidget::initAppListWidget() - listview=new ListView(this,this->width()-4,this->height(),0); - mainLayout->addWidget(listview); - connect(listview,SIGNAL(sendItemClickedSignal(QStringList)),this,SLOT(execApplication(QStringList))); -- connect(listview,SIGNAL(sendUpdateAppListSignal()),this,SIGNAL(sendUpdateAppListSignal())); -+ connect(listview,SIGNAL(sendUpdateAppListSignal(QString,int)),this,SIGNAL(sendUpdateAppListSignal(QString,int))); -+ connect(listview,SIGNAL(removeListItemSignal(QString)),this,SIGNAL(removeListItemSignal(QString))); -+ connect(listview,SIGNAL(removeListAllItemSignal()),this,SIGNAL(removeListAllItemSignal())); - connect(listview,SIGNAL(sendHideMainWindowSignal()),this,SIGNAL(sendHideMainWindowSignal())); -- - } - - /** -@@ -103,17 +104,67 @@ void CommonUseWidget::execApplication(QStringList arg) - /** - * 更新应用列表槽函数 - */ --void CommonUseWidget::updateListViewSlot() -+void CommonUseWidget::updateListViewSlot(QString desktopfp, int type) -+{ -+ for(int i=0;imodel()->rowCount();i++) -+ { -+ QVariant var=listview->model()->index(i,0).data(Qt::DisplayRole); -+ QString path=var.value().at(0); -+ if(QString::compare(path,desktopfp)==0) -+ { -+ listview->model()->removeRow(i); -+ break; -+ } -+ } -+ setting->beginGroup("lockapplication"); -+ QStandardItem* item=new QStandardItem; -+ item->setData(QVariant::fromValue(QStringList()<(listview->model()); -+ if(type==0) -+ listmodel->insertRow(setting->allKeys().size()-1,item); -+ else -+ listmodel->insertRow(setting->allKeys().size(),item); -+ setting->endGroup(); -+} -+ -+void CommonUseWidget::updateListViewAllSlot() - { - getCommonUseAppList(); - listview->updateData(data); - } - -+void CommonUseWidget::removeListItemSlot(QString desktopfp) -+{ -+ for(int i=0;imodel()->rowCount();i++) -+ { -+ QVariant var=listview->model()->index(i,0).data(Qt::DisplayRole); -+ QString path=var.value().at(0); -+ if(QString::compare(path,desktopfp)==0) -+ { -+ listview->model()->removeRow(i); -+ break; -+ } -+ } -+} -+ -+void CommonUseWidget::removeListAllItemSlot() -+{ -+ setting->beginGroup("lockapplication"); -+ for(int i=listview->model()->rowCount()-1;i>=0;i--) -+ { -+ QVariant var=listview->model()->index(i,0).data(Qt::DisplayRole); -+ QString desktopfp=var.value().at(0); -+ QFileInfo fileInfo(desktopfp); -+ QString desktopfn=fileInfo.fileName(); -+ if(!setting->contains(desktopfn)) -+ listview->model()->removeRow(i); -+ } -+ setting->endGroup(); -+} -+ - void CommonUseWidget::getCommonUseAppList() - { --// QStringList lockdesktopfnList; - QStringList desktopfnList; --// lockdesktopfnList.clear(); - desktopfnList.clear(); - setting->beginGroup("lockapplication"); - QStringList lockdesktopfnList=setting->allKeys(); -diff --git a/src/CommonUseWidget/commonusewidget.h b/src/CommonUseWidget/commonusewidget.h -index 84dedcd..ae4a6f2 100644 ---- a/src/CommonUseWidget/commonusewidget.h -+++ b/src/CommonUseWidget/commonusewidget.h -@@ -68,12 +68,22 @@ protected: - void getCommonUseAppList();//获取常用应用列表 - - private Q_SLOTS: -- void updateListViewSlot();//更新应用列表槽函数 -+ /** -+ * @brief 更新单个item槽函数 -+ * @param desktopfp为desktop文件路径 -+ * @param type为0时表示固定，为1时表示取消固定 -+ */ -+ void updateListViewSlot(QString desktopfp,int type); - void execApplication(QStringList arg);//执行应用程序 -+ void removeListItemSlot(QString desktopfp);//删除单个item -+ void removeListAllItemSlot();//删除所有非固定item -+ void updateListViewAllSlot();//更新应用列表槽函数 - - Q_SIGNALS: - void sendHideMainWindowSignal();//向MainViewWidget发送隐藏主窗口信号 -- void sendUpdateAppListSignal();//向FullCommonUseWidget发送更新应用列表信号 -+ void sendUpdateAppListSignal(QString desktopfp,int type);//向FullCommonUseWidget发送更新应用列表信号 -+ void removeListItemSignal(QString desktopfp); -+ void removeListAllItemSignal(); - }; - - #endif // COMMONUSEWIDGET_H -diff --git a/src/CommonUseWidget/fullcommonusewidget.cpp b/src/CommonUseWidget/fullcommonusewidget.cpp -index d6bb171..a56316e 100644 ---- a/src/CommonUseWidget/fullcommonusewidget.cpp -+++ b/src/CommonUseWidget/fullcommonusewidget.cpp -@@ -63,7 +63,9 @@ void FullCommonUseWidget::initAppListWidget() - listview=new FullListView(this,0); - mainLayout->addWidget(listview); - connect(listview,SIGNAL(sendItemClickedSignal(QString)),this,SLOT(execApplication(QString))); -- connect(listview,SIGNAL(sendUpdateAppListSignal()),this,SIGNAL(sendUpdateAppListSignal())); -+ connect(listview,SIGNAL(sendUpdateAppListSignal(QString,int)),this,SIGNAL(sendUpdateAppListSignal(QString,int))); -+ connect(listview,SIGNAL(removeListItemSignal(QString)),this,SIGNAL(removeListItemSignal(QString))); -+ connect(listview,SIGNAL(removeListAllItemSignal()),this,SIGNAL(removeListAllItemSignal())); - connect(listview,SIGNAL(sendHideMainWindowSignal()),this,SIGNAL(sendHideMainWindowSignal())); - } - -@@ -92,12 +94,64 @@ void FullCommonUseWidget::execApplication(QString appname) - /** - * 更新应用列表 - */ --void FullCommonUseWidget::updateListViewSlot() -+void FullCommonUseWidget::updateListViewSlot(QString desktopfp, int type) -+{ -+ for(int i=0;imodel()->rowCount();i++) -+ { -+ QVariant var=listview->model()->index(i,0).data(Qt::DisplayRole); -+ QString path=var.value(); -+ if(QString::compare(path,desktopfp)==0) -+ { -+ listview->model()->removeRow(i); -+ break; -+ } -+ } -+ setting->beginGroup("lockapplication"); -+ QStandardItem* item=new QStandardItem; -+ item->setData(QVariant::fromValue(desktopfp),Qt::DisplayRole); -+ QStandardItemModel* listmodel=qobject_cast(listview->model()); -+ if(type==0) -+ listmodel->insertRow(setting->allKeys().size()-1,item); -+ else -+ listmodel->insertRow(setting->allKeys().size(),item); -+ setting->endGroup(); -+} -+ -+void FullCommonUseWidget::updateListViewAllSlot() - { - getCommonUseAppList(); - listview->updateData(data); - } - -+void FullCommonUseWidget::removeListItemSlot(QString desktopfp) -+{ -+ for(int i=0;imodel()->rowCount();i++) -+ { -+ QVariant var=listview->model()->index(i,0).data(Qt::DisplayRole); -+ QString path=var.value(); -+ if(QString::compare(path,desktopfp)==0) -+ { -+ listview->model()->removeRow(i); -+ break; -+ } -+ } -+} -+ -+void FullCommonUseWidget::removeListAllItemSlot() -+{ -+ setting->beginGroup("lockapplication"); -+ for(int i=listview->model()->rowCount()-1;i>=0;i--) -+ { -+ QVariant var=listview->model()->index(i,0).data(Qt::DisplayRole); -+ QString desktopfp=var.value(); -+ QFileInfo fileInfo(desktopfp); -+ QString desktopfn=fileInfo.fileName(); -+ if(!setting->contains(desktopfn)) -+ listview->model()->removeRow(i); -+ } -+ setting->endGroup(); -+} -+ - void FullCommonUseWidget::getCommonUseAppList() - { - QStringList desktopfnList; -diff --git a/src/CommonUseWidget/fullcommonusewidget.h b/src/CommonUseWidget/fullcommonusewidget.h -index c5a7d4e..9b7627c 100644 ---- a/src/CommonUseWidget/fullcommonusewidget.h -+++ b/src/CommonUseWidget/fullcommonusewidget.h -@@ -70,12 +70,22 @@ protected: - void getCommonUseAppList();//获取常用应用列表 - - private Q_SLOTS: -- void updateListViewSlot();//更新应用列表槽函数 -+ /** -+ * @brief 更新单个item槽函数 -+ * @param desktopfp为desktop文件路径 -+ * @param type为0时表示固定，为1时表示取消固定 -+ */ -+ void updateListViewSlot(QString desktopfp,int type); - void execApplication(QString appname);//执行应用程序 -+ void removeListItemSlot(QString desktopfp);//删除单个item -+ void removeListAllItemSlot();//删除所有非固定item -+ void updateListViewAllSlot();//更新应用列表槽函数 - - Q_SIGNALS: -- void sendUpdateAppListSignal();//向CommonUseWidget发送更新应用列表信号 -+ void sendUpdateAppListSignal(QString desktopfp,int type);//向CommonUseWidget发送更新应用列表信号 - void sendHideMainWindowSignal();//向MainViewWidget发送隐藏主窗口信号 -+ void removeListItemSignal(QString desktopfp); -+ void removeListAllItemSignal(); - }; - - #endif // FULLCOMMONUSEWIDGET_H -diff --git a/src/FunctionWidget/fullfunctionwidget.cpp b/src/FunctionWidget/fullfunctionwidget.cpp -index 8c0e29d..18f9c0f 100644 ---- a/src/FunctionWidget/fullfunctionwidget.cpp -+++ b/src/FunctionWidget/fullfunctionwidget.cpp -@@ -259,7 +259,7 @@ void FullFunctionWidget::insertAppList(QStringList appnamelist) - } - listview->addData(data); - connect(listview,SIGNAL(sendItemClickedSignal(QString)),this,SLOT(execApplication(QString))); -- connect(listview,SIGNAL(sendFixedOrUnfixedSignal()),this,SIGNAL(sendUpdateAppListSignal())); -+ connect(listview,SIGNAL(sendFixedOrUnfixedSignal(QString,int)),this,SIGNAL(sendUpdateAppListSignal(QString,int))); - connect(listview,SIGNAL(sendHideMainWindowSignal()),this,SIGNAL(sendHideMainWindowSignal())); - } - -@@ -307,18 +307,6 @@ void FullFunctionWidget::updateAppListView() - delete wid; - delete child; - } -- --// for(int i=iconlistscrollareawidLayout->count()-2;i>0;i--) --// { --// if((child = iconlistscrollareawidLayout->takeAt(i)) != 0) --// { --// QWidget* wid=child->widget(); --// iconlistscrollareawidLayout->removeWidget(wid); --// wid->setParent(nullptr); --// delete wid; --// delete child; --// } --// } - initIconListScrollArea(); - } - -@@ -444,8 +432,8 @@ void FullFunctionWidget::btnGroupClickedSlot(QAbstractButton *btn) - { - beforebtnPos=scrollarea->verticalScrollBar()->sliderPosition(); - endPos=classificationbtnrowlist.at(num).toInt(); -+ scrollarea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - timer->start(1); --// scrollarea->verticalScrollBar()->setSliderPosition(pos); - } - - QSvgRenderer* svgRender = new QSvgRenderer; -@@ -493,6 +481,7 @@ void FullFunctionWidget::timeOutSlot() - scrollarea->verticalScrollBar()->sliderPosition()>=scrollarea->verticalScrollBar()->maximum()) - { - timer->stop(); -+ scrollarea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn); - connect(scrollarea->verticalScrollBar(),SIGNAL(valueChanged(int)), - this,SLOT(valueChangedSlot(int))); - } -diff --git a/src/FunctionWidget/fullfunctionwidget.h b/src/FunctionWidget/fullfunctionwidget.h -index 1a1b7d6..224949c 100644 ---- a/src/FunctionWidget/fullfunctionwidget.h -+++ b/src/FunctionWidget/fullfunctionwidget.h -@@ -114,7 +114,7 @@ private Q_SLOTS: - void valueChangedSlot(int value);//滑动条滚动槽函数 - - Q_SIGNALS: -- void sendUpdateAppListSignal();//向常用软件模块发送更新应用列表信号 -+ void sendUpdateAppListSignal(QString desktopfp,int type);//向常用软件模块发送更新应用列表信号 - void sendHideMainWindowSignal();//向MainViewWidget发送隐藏主窗口信号 - }; - -diff --git a/src/FunctionWidget/functionwidget.cpp b/src/FunctionWidget/functionwidget.cpp -index a524b47..9d96dc6 100644 ---- a/src/FunctionWidget/functionwidget.cpp -+++ b/src/FunctionWidget/functionwidget.cpp -@@ -66,7 +66,7 @@ void FunctionWidget::initAppListWidget() - mainLayout->addWidget(applistview); - fillAppListView(); - connect(applistview,SIGNAL(sendItemClickedSignal(QStringList)),this,SLOT(recvItemClickedSlot(QStringList))); -- connect(applistview,SIGNAL(sendFixedOrUnfixedSignal()),this,SIGNAL(sendUpdateAppListSignal())); -+ connect(applistview,SIGNAL(sendFixedOrUnfixedSignal(QString,int)),this,SIGNAL(sendUpdateAppListSignal(QString,int))); - connect(applistview,SIGNAL(sendHideMainWindowSignal()),this,SIGNAL(sendHideMainWindowSignal())); - - } -diff --git a/src/FunctionWidget/functionwidget.h b/src/FunctionWidget/functionwidget.h -index 7b8d0f9..940aa30 100644 ---- a/src/FunctionWidget/functionwidget.h -+++ b/src/FunctionWidget/functionwidget.h -@@ -79,10 +79,8 @@ private Q_SLOTS: - - Q_SIGNALS: - void sendClassificationbtnList(QStringList list);//向FunctionButtonWidget界面发送分类按钮列表 -- void sendUpdateAppListSignal();//向常用软件模块发送更新应用列表信号 -+ void sendUpdateAppListSignal(QString desktopfp,int type);//向常用软件模块发送更新应用列表信号 - void sendHideMainWindowSignal();//向MainViewWidget发送隐藏主窗口信号 -- -- - }; - - #endif // FUNCTIONWIDGET_H -diff --git a/src/LetterWidget/fullletterwidget.cpp b/src/LetterWidget/fullletterwidget.cpp -index 9fc863c..254a6a5 100644 ---- a/src/LetterWidget/fullletterwidget.cpp -+++ b/src/LetterWidget/fullletterwidget.cpp -@@ -135,7 +135,7 @@ void FullLetterWidget::fillAppList() - listview->addData(data); - - connect(listview,SIGNAL(sendItemClickedSignal(QString)),this,SLOT(execApplication(QString))); -- connect(listview,SIGNAL(sendFixedOrUnfixedSignal()),this,SIGNAL(sendUpdateAppListSignal())); -+ connect(listview,SIGNAL(sendFixedOrUnfixedSignal(QString,int)),this,SIGNAL(sendUpdateAppListSignal(QString,int))); - connect(listview,SIGNAL(sendHideMainWindowSignal()),this,SIGNAL(sendHideMainWindowSignal())); - } - } -@@ -314,8 +314,8 @@ void FullLetterWidget::btnGroupClickedSlot(QAbstractButton *btn) - { - beginPos=scrollarea->verticalScrollBar()->sliderPosition(); - endPos=letterbtnrowlist.at(num).toInt(); -+ scrollarea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - timer->start(1); --// scrollarea->verticalScrollBar()->setSliderPosition(pos); - } - } - else{ -@@ -326,7 +326,6 @@ void FullLetterWidget::btnGroupClickedSlot(QAbstractButton *btn) - - void FullLetterWidget::timeOutSlot() - { -- - if(beginPosverticalScrollBar()->sliderPosition()<50) -@@ -345,6 +344,7 @@ void FullLetterWidget::timeOutSlot() - scrollarea->verticalScrollBar()->sliderPosition()>=scrollarea->verticalScrollBar()->maximum()) - { - timer->stop(); -+ scrollarea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn); - connect(scrollarea->verticalScrollBar(),SIGNAL(valueChanged(int)), - this,SLOT(valueChangedSlot(int))); - } -diff --git a/src/LetterWidget/fullletterwidget.h b/src/LetterWidget/fullletterwidget.h -index 503e7ca..3329822 100644 ---- a/src/LetterWidget/fullletterwidget.h -+++ b/src/LetterWidget/fullletterwidget.h -@@ -112,7 +112,7 @@ private Q_SLOTS: - void valueChangedSlot(int value);//滑动条滚动槽函数 - - Q_SIGNALS: -- void sendUpdateAppListSignal();//向常用软件模块发送更新应用列表信号 -+ void sendUpdateAppListSignal(QString desktopfp,int type);//向常用软件模块发送更新应用列表信号 - void sendHideMainWindowSignal();//向MainViewWidget发送隐藏主窗口信号 - }; - -diff --git a/src/LetterWidget/letterwidget.cpp b/src/LetterWidget/letterwidget.cpp -index c69cfc4..c515b66 100644 ---- a/src/LetterWidget/letterwidget.cpp -+++ b/src/LetterWidget/letterwidget.cpp -@@ -87,7 +87,7 @@ void LetterWidget::initAppListWidget() - mainLayout->addWidget(applistview); - fillAppListView(); - connect(applistview,SIGNAL(sendItemClickedSignal(QStringList)),this,SLOT(recvItemClickedSlot(QStringList))); -- connect(applistview,SIGNAL(sendFixedOrUnfixedSignal()),this,SIGNAL(sendUpdateAppListSignal())); -+ connect(applistview,SIGNAL(sendFixedOrUnfixedSignal(QString,int)),this,SIGNAL(sendUpdateAppListSignal(QString,int))); - connect(applistview,SIGNAL(sendHideMainWindowSignal()),this,SIGNAL(sendHideMainWindowSignal())); - - } -diff --git a/src/LetterWidget/letterwidget.h b/src/LetterWidget/letterwidget.h -index 4e323ad..c3ce86f 100644 ---- a/src/LetterWidget/letterwidget.h -+++ b/src/LetterWidget/letterwidget.h -@@ -74,10 +74,8 @@ private Q_SLOTS: - - Q_SIGNALS: - void sendLetterBtnList(QStringList list);//向LetterButtonWidget发送字母按钮列表 -- void sendUpdateAppListSignal();//向常用软件模块发送更新应用列表信号 -+ void sendUpdateAppListSignal(QString desktopfp,int type);//向常用软件模块发送更新应用列表信号 - void sendHideMainWindowSignal();//向MainViewWidget发送隐藏主窗口信号 -- -- - }; - - #endif // LETTERWIDGET_H -diff --git a/src/MainViewWidget/mainviewwidget.cpp b/src/MainViewWidget/mainviewwidget.cpp -index ed354fa..507a867 100644 ---- a/src/MainViewWidget/mainviewwidget.cpp -+++ b/src/MainViewWidget/mainviewwidget.cpp -@@ -81,24 +81,28 @@ void MainViewWidget::initWidget() - pUkuiMenuInterface=new UkuiMenuInterface; - - //进程开启，刷新常用软件界面 -- connect(this,SIGNAL(viewOpenedSignal()),fullcommonusewid,SLOT(updateListViewSlot())); -- connect(this,SIGNAL(viewOpenedSignal()),commonusewid,SLOT(updateListViewSlot())); -+ connect(this,SIGNAL(viewOpenedSignal()),fullcommonusewid,SLOT(updateListViewAllSlot())); -+ connect(this,SIGNAL(viewOpenedSignal()),commonusewid,SLOT(updateListViewAllSlot())); - - //常用软件界面删除操作，刷新界面 -- connect(commonusewid,SIGNAL(sendUpdateAppListSignal()),fullcommonusewid,SLOT(updateListViewSlot())); -- connect(fullcommonusewid,SIGNAL(sendUpdateAppListSignal()),commonusewid,SLOT(updateListViewSlot())); -+ connect(commonusewid,SIGNAL(sendUpdateAppListSignal(QString,int)),fullcommonusewid,SLOT(updateListViewSlot(QString,int))); -+ connect(fullcommonusewid,SIGNAL(sendUpdateAppListSignal(QString,int)),commonusewid,SLOT(updateListViewSlot(QString,int))); -+ connect(commonusewid,SIGNAL(removeListItemSignal(QString)),fullcommonusewid,SLOT(removeListItemSlot(QString))); -+ connect(fullcommonusewid,SIGNAL(removeListItemSignal(QString)),commonusewid,SLOT(removeListItemSlot(QString))); -+ connect(commonusewid,SIGNAL(removeListAllItemSignal()),fullcommonusewid,SLOT(removeListAllItemSlot())); -+ connect(fullcommonusewid,SIGNAL(removeListAllItemSignal()),commonusewid,SLOT(removeListAllItemSlot())); - - //字母排序、功能分类界面、搜索界面固定或取消固定到常用软件，刷新常用软件界面 -- connect(letterwid,SIGNAL(sendUpdateAppListSignal()),commonusewid,SLOT(updateListViewSlot())); -- connect(fullletterwid,SIGNAL(sendUpdateAppListSignal()),commonusewid,SLOT(updateListViewSlot())); -- connect(functionwid,SIGNAL(sendUpdateAppListSignal()),commonusewid,SLOT(updateListViewSlot())); -- connect(fullfunctionwid,SIGNAL(sendUpdateAppListSignal()),commonusewid,SLOT(updateListViewSlot())); -- connect(letterwid,SIGNAL(sendUpdateAppListSignal()),fullcommonusewid,SLOT(updateListViewSlot())); -- connect(fullletterwid,SIGNAL(sendUpdateAppListSignal()),fullcommonusewid,SLOT(updateListViewSlot())); -- connect(functionwid,SIGNAL(sendUpdateAppListSignal()),fullcommonusewid,SLOT(updateListViewSlot())); -- connect(fullfunctionwid,SIGNAL(sendUpdateAppListSignal()),fullcommonusewid,SLOT(updateListViewSlot())); -- connect(searchresultwid,SIGNAL(sendUpdateAppListSignal()),commonusewid,SLOT(updateListViewSlot())); -- connect(fullsearchresultwid,SIGNAL(sendUpdateAppListSignal()),fullcommonusewid,SLOT(updateListViewSlot())); -+ connect(letterwid,SIGNAL(sendUpdateAppListSignal(QString,int)),commonusewid,SLOT(updateListViewSlot(QString,int))); -+ connect(fullletterwid,SIGNAL(sendUpdateAppListSignal(QString,int)),commonusewid,SLOT(updateListViewSlot(QString,int))); -+ connect(functionwid,SIGNAL(sendUpdateAppListSignal(QString,int)),commonusewid,SLOT(updateListViewSlot(QString,int))); -+ connect(fullfunctionwid,SIGNAL(sendUpdateAppListSignal(QString,int)),commonusewid,SLOT(updateListViewSlot(QString,int))); -+ connect(letterwid,SIGNAL(sendUpdateAppListSignal(QString,int)),fullcommonusewid,SLOT(updateListViewSlot(QString,int))); -+ connect(fullletterwid,SIGNAL(sendUpdateAppListSignal(QString,int)),fullcommonusewid,SLOT(updateListViewSlot(QString,int))); -+ connect(functionwid,SIGNAL(sendUpdateAppListSignal(QString,int)),fullcommonusewid,SLOT(updateListViewSlot(QString,int))); -+ connect(fullfunctionwid,SIGNAL(sendUpdateAppListSignal(QString,int)),fullcommonusewid,SLOT(updateListViewSlot(QString,int))); -+ connect(searchresultwid,SIGNAL(sendUpdateAppListSignal(QString,int)),commonusewid,SLOT(updateListViewSlot(QString,int))); -+ connect(fullsearchresultwid,SIGNAL(sendUpdateAppListSignal(QString,int)),fullcommonusewid,SLOT(updateListViewSlot(QString,int))); - - //监控.desktop文件目录 - fileWatcher=new QFileSystemWatcher(this); -@@ -108,8 +112,8 @@ void MainViewWidget::initWidget() - connect(this,SIGNAL(directoryChangedSignal()),fullletterwid,SLOT(updateAppListView())); - connect(this,SIGNAL(directoryChangedSignal()),functionwid,SLOT(updateAppListView())); - connect(this,SIGNAL(directoryChangedSignal()),fullfunctionwid,SLOT(updateAppListView())); -- connect(this,SIGNAL(directoryChangedSignal()),commonusewid,SLOT(updateListViewSlot())); -- connect(this,SIGNAL(directoryChangedSignal()),fullcommonusewid,SLOT(updateListViewSlot())); -+ connect(this,SIGNAL(directoryChangedSignal()),commonusewid,SLOT(updateListViewAllSlot())); -+ connect(this,SIGNAL(directoryChangedSignal()),fullcommonusewid,SLOT(updateListViewAllSlot())); - - //发送隐藏主界面信号 - connect(commonusewid,SIGNAL(sendHideMainWindowSignal()),this,SIGNAL(sendHideMainWindowSignal())); -@@ -404,6 +408,11 @@ void MainViewWidget::loadMaxMainView() - */ - void MainViewWidget::loadCommonUseWidget() - { -+ fullcommonusewid->widgetMakeZero(); -+ letterwid->widgetMakeZero(); -+ fullletterwid->widgetMakeZero(); -+ functionwid->widgetMakeZero(); -+ fullfunctionwid->widgetMakeZero(); - QLayoutItem *child; - if((child = mainLayout->takeAt(1)) != nullptr) { - QWidget* childwid=child->widget(); -@@ -414,7 +423,6 @@ void MainViewWidget::loadCommonUseWidget() - } - - } -- commonusewid->widgetMakeZero(); - mainLayout->addWidget(commonusewid); - widgetState=1; - saveCurrentWidState=1; -@@ -425,6 +433,11 @@ void MainViewWidget::loadCommonUseWidget() - */ - void MainViewWidget::loadLetterWidget() - { -+ commonusewid->widgetMakeZero(); -+ fullcommonusewid->widgetMakeZero(); -+ fullletterwid->widgetMakeZero(); -+ functionwid->widgetMakeZero(); -+ fullfunctionwid->widgetMakeZero(); - QLayoutItem *child; - if((child = mainLayout->takeAt(1)) != nullptr) { - QWidget* childwid=child->widget(); -@@ -435,7 +448,6 @@ void MainViewWidget::loadLetterWidget() - } - - } -- letterwid->widgetMakeZero(); - mainLayout->addWidget(letterwid); - widgetState=2; - saveCurrentWidState=2; -@@ -446,6 +458,11 @@ void MainViewWidget::loadLetterWidget() - */ - void MainViewWidget::loadFunctionWidget() - { -+ commonusewid->widgetMakeZero(); -+ fullcommonusewid->widgetMakeZero(); -+ letterwid->widgetMakeZero(); -+ fullletterwid->widgetMakeZero(); -+ fullfunctionwid->widgetMakeZero(); - QLayoutItem *child; - if((child = mainLayout->takeAt(1)) != nullptr) { - QWidget* childwid=child->widget(); -@@ -456,7 +473,6 @@ void MainViewWidget::loadFunctionWidget() - } - - } -- functionwid->widgetMakeZero(); - mainLayout->addWidget(functionwid); - widgetState=3; - saveCurrentWidState=3; -@@ -468,6 +484,11 @@ void MainViewWidget::loadFunctionWidget() - */ - void MainViewWidget::loadFullCommonUseWidget() - { -+ commonusewid->widgetMakeZero(); -+ letterwid->widgetMakeZero(); -+ fullletterwid->widgetMakeZero(); -+ functionwid->widgetMakeZero(); -+ fullfunctionwid->widgetMakeZero(); - QLayoutItem *child; - if((child = mainLayout->takeAt(1)) != nullptr) { - QWidget* childwid=child->widget(); -@@ -478,7 +499,6 @@ void MainViewWidget::loadFullCommonUseWidget() - } - - } -- fullcommonusewid->widgetMakeZero(); - mainLayout->addWidget(fullcommonusewid); - widgetState=1; - saveCurrentWidState=1; -@@ -489,6 +509,11 @@ void MainViewWidget::loadFullCommonUseWidget() - */ - void MainViewWidget::loadFullLetterWidget() - { -+ commonusewid->widgetMakeZero(); -+ fullcommonusewid->widgetMakeZero(); -+ letterwid->widgetMakeZero(); -+ functionwid->widgetMakeZero(); -+ fullfunctionwid->widgetMakeZero(); - QLayoutItem *child; - if((child = mainLayout->takeAt(1)) != nullptr) { - QWidget* childwid=child->widget(); -@@ -498,7 +523,6 @@ void MainViewWidget::loadFullLetterWidget() - childwid->setParent(nullptr); - } - } -- fullletterwid->widgetMakeZero(); - mainLayout->addWidget(fullletterwid); - widgetState=2; - saveCurrentWidState=2; -@@ -509,6 +533,11 @@ void MainViewWidget::loadFullLetterWidget() - */ - void MainViewWidget::loadFullFunctionWidget() - { -+ commonusewid->widgetMakeZero(); -+ fullcommonusewid->widgetMakeZero(); -+ letterwid->widgetMakeZero(); -+ fullletterwid->widgetMakeZero(); -+ functionwid->widgetMakeZero(); - QLayoutItem *child; - if((child = mainLayout->takeAt(1)) != nullptr) { - QWidget* childwid=child->widget(); -@@ -519,7 +548,6 @@ void MainViewWidget::loadFullFunctionWidget() - } - - } -- fullfunctionwid->widgetMakeZero(); - mainLayout->addWidget(fullfunctionwid); - widgetState=3; - saveCurrentWidState=3; -diff --git a/src/RightClickMenu/rightclickmenu.cpp b/src/RightClickMenu/rightclickmenu.cpp -index f21459e..4ec4e71 100644 ---- a/src/RightClickMenu/rightclickmenu.cpp -+++ b/src/RightClickMenu/rightclickmenu.cpp -@@ -37,6 +37,21 @@ RightClickMenu::RightClickMenu(QWidget *parent): - OtherListAction=new QWidgetAction(othermenu); - OtherListWid=new QWidget(); - -+ //关机按钮右键菜单 -+ shutdownmenu=new QMenu(this); -+ shutdownmenu->setLayoutDirection(Qt::LeftToRight); -+ shutdownmenu->setFixedSize(250+2,36*5+12+2); -+ LockScreenAction=new QWidgetAction(shutdownmenu); -+ LockScreenWid=new QWidget(); -+ SwitchUserAction=new QWidgetAction(shutdownmenu); -+ SwitchUserWid=new QWidget(); -+ LogOutAction=new QWidgetAction(shutdownmenu); -+ LogOutWid=new QWidget(); -+ RebootAction=new QWidgetAction(shutdownmenu); -+ RebootWid=new QWidget(); -+ ShutDownAction=new QWidgetAction(shutdownmenu); -+ ShutDownWid=new QWidget(); -+ - //常用应用按钮右键菜单 - cuappbtnmenu=new QMenu(this); - cuappbtnmenu->setLayoutDirection(Qt::LeftToRight); -@@ -365,40 +380,26 @@ void RightClickMenu::addAppBtnAction() - //关机按钮右键菜单 - void RightClickMenu::addShutdownAction() - { -- shutdownmenu=new QMenu(this); -- shutdownmenu->setLayoutDirection(Qt::LeftToRight); -- shutdownmenu->setFixedSize(250+2,36*5+12+2); -- -- LockScreenAction=new QWidgetAction(shutdownmenu); -- LockScreenWid=new QWidget(); - initWidgetAction(LockScreenWid,":/data/img/sidebarwidget/lock.svg",tr("Lock")); - LockScreenAction->setDefaultWidget(LockScreenWid); - shutdownmenu->addAction(LockScreenAction); - connect(LockScreenAction,SIGNAL(triggered()),this,SLOT(lockScreenActionTriggerSlot())); - -- SwitchUserAction=new QWidgetAction(shutdownmenu); -- SwitchUserWid=new QWidget(); - initWidgetAction(SwitchUserWid,"",tr("Switch user")); - SwitchUserAction->setDefaultWidget(SwitchUserWid); - shutdownmenu->addAction(SwitchUserAction); - connect(SwitchUserAction,SIGNAL(triggered()),this,SLOT(switchUserActionTriggerSlot())); - -- LogOutAction=new QWidgetAction(shutdownmenu); -- LogOutWid=new QWidget(); - initWidgetAction(LogOutWid,"",tr("Sign out")); - LogOutAction->setDefaultWidget(LogOutWid); - shutdownmenu->addAction(LogOutAction); - connect(LogOutAction,SIGNAL(triggered()),this,SLOT(logoutActionTriggerSlot())); - -- RebootAction=new QWidgetAction(shutdownmenu); -- RebootWid=new QWidget(); - initWidgetAction(RebootWid,"",tr("Restart")); - RebootAction->setDefaultWidget(RebootWid); - shutdownmenu->addAction(RebootAction); - connect(RebootAction,SIGNAL(triggered()),this,SLOT(rebootActionTriggerSlot())); - -- ShutDownAction=new QWidgetAction(shutdownmenu); -- ShutDownWid=new QWidget(); - initWidgetAction(ShutDownWid,":/data/img/sidebarwidget/shutdown.svg",tr("Shut down")); - ShutDownAction->setDefaultWidget(ShutDownWid); - shutdownmenu->addAction(ShutDownAction); -diff --git a/src/RightClickMenu/rightclickmenu.h b/src/RightClickMenu/rightclickmenu.h -index 2fc790a..17f73fb 100644 ---- a/src/RightClickMenu/rightclickmenu.h -+++ b/src/RightClickMenu/rightclickmenu.h -@@ -66,61 +66,61 @@ private: - QWidgetAction* separatorAction_4=nullptr; - QWidgetAction* separatorAction_5=nullptr; - -- QMenu* cuappbtnmenu; -- QWidgetAction* CuFix2CommonUseAction; -- QWidget* CuFix2CommonUseWid; -- QWidgetAction* CuUnfixed4CommonUseAction; -- QWidget* CuUnfixed4CommonUseWid; -- QWidgetAction* CuFix2TaskBarAction; -- QWidget* CuFix2TaskBarWid; -- QWidgetAction* CuUnfixed4TaskBarAction; -- QWidget* CuUnfixed4TaskBarWid; -- QWidgetAction* CuAdd2DesktopAction; -- QWidget* CuAdd2DesktopWid; -- QWidgetAction* CuDeleteAction; -- QWidget* CuDeleteWid; -+ QMenu* cuappbtnmenu=nullptr; -+ QWidgetAction* CuFix2CommonUseAction=nullptr; -+ QWidget* CuFix2CommonUseWid=nullptr; -+ QWidgetAction* CuUnfixed4CommonUseAction=nullptr; -+ QWidget* CuUnfixed4CommonUseWid=nullptr; -+ QWidgetAction* CuFix2TaskBarAction=nullptr; -+ QWidget* CuFix2TaskBarWid=nullptr; -+ QWidgetAction* CuUnfixed4TaskBarAction=nullptr; -+ QWidget* CuUnfixed4TaskBarWid=nullptr; -+ QWidgetAction* CuAdd2DesktopAction=nullptr; -+ QWidget* CuAdd2DesktopWid=nullptr; -+ QWidgetAction* CuDeleteAction=nullptr; -+ QWidget* CuDeleteWid=nullptr; - QWidgetAction* CuDeleteAllAction; -- QWidget* CuDeleteAllWid; -- QWidgetAction* CuUninstallAction; -- QWidget* CuUninstallWid; -- QWidgetAction* CuAttributeAction; -- QWidget* CuAttributeWid; -- -- QMenu* appbtnmenu; -- QWidgetAction* Fix2CommonUseAction; -- QWidget* Fix2CommonUseWid; -- QWidgetAction* Unfixed4CommonUseAction; -- QWidget* Unfixed4CommonUseWid; -- QWidgetAction* Fix2TaskBarAction; -- QWidget* Fix2TaskBarWid; -- QWidgetAction* Unfixed4TaskBarAction; -- QWidget* Unfixed4TaskBarWid; -- QWidgetAction* Add2DesktopAction; -- QWidget* Add2DesktopWid; -- QWidgetAction* UninstallAction; -- QWidget* UninstallWid; -- QWidgetAction* AttributeAction; -- QWidget* AttributeWid; -- -- QMenu* shutdownmenu; -- QWidgetAction* LockScreenAction; -- QWidget* LockScreenWid; -- QWidgetAction* SwitchUserAction; -- QWidget* SwitchUserWid; -- QWidgetAction* LogOutAction; -- QWidget* LogOutWid; -- QWidgetAction* RebootAction; -- QWidget* RebootWid; -- QWidgetAction* ShutDownAction; -- QWidget* ShutDownWid; -- -- QMenu* othermenu; -- QWidgetAction* OtherFix2TaskBarAction; -- QWidget* OtherFix2TaskBarWid; -- QWidgetAction* OtherUnfix2TaskBarAction; -- QWidget* OtherUnfix2TaskBarWid; -- QWidgetAction* OtherListAction; -- QWidget* OtherListWid; -+ QWidget* CuDeleteAllWid=nullptr; -+ QWidgetAction* CuUninstallAction=nullptr; -+ QWidget* CuUninstallWid=nullptr; -+ QWidgetAction* CuAttributeAction=nullptr; -+ QWidget* CuAttributeWid=nullptr; -+ -+ QMenu* appbtnmenu=nullptr; -+ QWidgetAction* Fix2CommonUseAction=nullptr; -+ QWidget* Fix2CommonUseWid=nullptr; -+ QWidgetAction* Unfixed4CommonUseAction=nullptr; -+ QWidget* Unfixed4CommonUseWid=nullptr; -+ QWidgetAction* Fix2TaskBarAction=nullptr; -+ QWidget* Fix2TaskBarWid=nullptr; -+ QWidgetAction* Unfixed4TaskBarAction=nullptr; -+ QWidget* Unfixed4TaskBarWid=nullptr; -+ QWidgetAction* Add2DesktopAction=nullptr; -+ QWidget* Add2DesktopWid=nullptr; -+ QWidgetAction* UninstallAction=nullptr; -+ QWidget* UninstallWid=nullptr; -+ QWidgetAction* AttributeAction=nullptr; -+ QWidget* AttributeWid=nullptr; -+ -+ QMenu* shutdownmenu=nullptr; -+ QWidgetAction* LockScreenAction=nullptr; -+ QWidget* LockScreenWid=nullptr; -+ QWidgetAction* SwitchUserAction=nullptr; -+ QWidget* SwitchUserWid=nullptr; -+ QWidgetAction* LogOutAction=nullptr; -+ QWidget* LogOutWid=nullptr; -+ QWidgetAction* RebootAction=nullptr; -+ QWidget* RebootWid=nullptr; -+ QWidgetAction* ShutDownAction=nullptr; -+ QWidget* ShutDownWid=nullptr; -+ -+ QMenu* othermenu=nullptr; -+ QWidgetAction* OtherFix2TaskBarAction=nullptr; -+ QWidget* OtherFix2TaskBarWid=nullptr; -+ QWidgetAction* OtherUnfix2TaskBarAction=nullptr; -+ QWidget* OtherUnfix2TaskBarWid=nullptr; -+ QWidgetAction* OtherListAction=nullptr; -+ QWidget* OtherListWid=nullptr; - - UkuiMenuInterface* pUkuiMenuInterface=nullptr; - -diff --git a/src/SearchResultWidget/fullsearchresultwidget.cpp b/src/SearchResultWidget/fullsearchresultwidget.cpp -index b67572f..8259d4c 100644 ---- a/src/SearchResultWidget/fullsearchresultwidget.cpp -+++ b/src/SearchResultWidget/fullsearchresultwidget.cpp -@@ -56,7 +56,7 @@ void FullSearchResultWidget::initWidget() - pUkuiMenuInterface=new UkuiMenuInterface; - - connect(listview,SIGNAL(sendItemClickedSignal(QString)),this,SLOT(execApplication(QString))); -- connect(listview,SIGNAL(sendFixedOrUnfixedSignal()),this,SIGNAL(sendUpdateAppListSignal())); -+ connect(listview,SIGNAL(sendFixedOrUnfixedSignal(QString,int)),this,SIGNAL(sendUpdateAppListSignal(QString,int))); - connect(listview,SIGNAL(sendHideMainWindowSignal()),this,SIGNAL(sendHideMainWindowSignal())); - } - -diff --git a/src/SearchResultWidget/fullsearchresultwidget.h b/src/SearchResultWidget/fullsearchresultwidget.h -index 6d7f06a..756340f 100644 ---- a/src/SearchResultWidget/fullsearchresultwidget.h -+++ b/src/SearchResultWidget/fullsearchresultwidget.h -@@ -59,9 +59,8 @@ private Q_SLOTS: - void execApplication(QString appname);//执行应用程序 - - Q_SIGNALS: -- void sendUpdateAppListSignal();//向CommonUseWidget发送更新应用列表信号 -+ void sendUpdateAppListSignal(QString desktopfp,int type);//向CommonUseWidget发送更新应用列表信号 - void sendHideMainWindowSignal();//向MainViewWidget发送隐藏主窗口信号 -- - }; - - #endif // FULLSEARCHRESULTWIDGET_H -diff --git a/src/SearchResultWidget/searchresultwidget.cpp b/src/SearchResultWidget/searchresultwidget.cpp -index 2a8bc35..115e8e4 100644 ---- a/src/SearchResultWidget/searchresultwidget.cpp -+++ b/src/SearchResultWidget/searchresultwidget.cpp -@@ -54,7 +54,7 @@ void SearchResultWidget::initWidget() - pUkuiMenuInterface=new UkuiMenuInterface; - - connect(listview,SIGNAL(sendItemClickedSignal(QStringList)),this,SLOT(execApplication(QStringList))); -- connect(listview,SIGNAL(sendFixedOrUnfixedSignal()),this,SIGNAL(sendUpdateAppListSignal())); -+ connect(listview,SIGNAL(sendFixedOrUnfixedSignal(QString,int)),this,SIGNAL(sendUpdateAppListSignal(QString,int))); - connect(listview,SIGNAL(sendHideMainWindowSignal()),this,SIGNAL(sendHideMainWindowSignal())); - } - -diff --git a/src/SearchResultWidget/searchresultwidget.h b/src/SearchResultWidget/searchresultwidget.h -index 944391b..af43ebf 100644 ---- a/src/SearchResultWidget/searchresultwidget.h -+++ b/src/SearchResultWidget/searchresultwidget.h -@@ -61,7 +61,7 @@ private Q_SLOTS: - void execApplication(QStringList arg);//执行应用程序 - - Q_SIGNALS: -- void sendUpdateAppListSignal();//向常用软件模块发送更新应用列表信号 -+ void sendUpdateAppListSignal(QString desktopfp,int type);//向常用软件模块发送更新应用列表信号 - void sendHideMainWindowSignal();//向MainViewWidget发送隐藏主窗口信号 - }; - -diff --git a/src/UtilityFunction/fulllistview.cpp b/src/UtilityFunction/fulllistview.cpp -index 75845c7..76c6d18 100644 ---- a/src/UtilityFunction/fulllistview.cpp -+++ b/src/UtilityFunction/fulllistview.cpp -@@ -67,6 +67,8 @@ void FullListView::initWidget() - this->setTextElideMode(Qt::ElideRight); - this->setMouseTracking(true); - this->setFocusPolicy(Qt::NoFocus); -+// this->setAcceptDrops(false); -+ this->setMovement(QListView::Static); - // this->setUpdatesEnabled(true); - - // this->setSpacing(32); -@@ -123,10 +125,10 @@ void FullListView::rightClickedSlot() - if(module>0) - { - int ret=menu->showAppBtnMenu(desktopfp); -- if(ret==1 || ret==2) -- { -- Q_EMIT sendFixedOrUnfixedSignal(); -- } -+ if(ret==1) -+ Q_EMIT sendFixedOrUnfixedSignal(desktopfp,0); -+ if(ret==2) -+ Q_EMIT sendFixedOrUnfixedSignal(desktopfp,1); - if(ret==6) - Q_EMIT sendHideMainWindowSignal(); - if(ret==7) -@@ -143,7 +145,7 @@ void FullListView::rightClickedSlot() - item->setData(QVariant::fromValue(desktopfp),Qt::DisplayRole); - listmodel->insertRow(setting->childKeys().size()-1,item); - setting->endGroup(); -- Q_EMIT sendUpdateAppListSignal(); -+ Q_EMIT sendUpdateAppListSignal(desktopfp,0); - } - if(ret==2) - { -@@ -153,7 +155,7 @@ void FullListView::rightClickedSlot() - item->setData(QVariant::fromValue(desktopfp),Qt::DisplayRole); - listmodel->insertRow(setting->childKeys().size(),item); - setting->endGroup(); -- Q_EMIT sendUpdateAppListSignal(); -+ Q_EMIT sendUpdateAppListSignal(desktopfp,1); - } - - if(ret==7) -@@ -162,7 +164,7 @@ void FullListView::rightClickedSlot() - if(ret==8) - { - listmodel->removeRow(index.row()); -- Q_EMIT sendUpdateAppListSignal(); -+ Q_EMIT removeListItemSignal(desktopfp); - } - - if(ret==9) -@@ -178,7 +180,7 @@ void FullListView::rightClickedSlot() - listmodel->removeRow(i); - } - setting->endGroup(); -- Q_EMIT sendUpdateAppListSignal(); -+ Q_EMIT removeListAllItemSignal(); - } - if(ret==6) - Q_EMIT sendHideMainWindowSignal(); -diff --git a/src/UtilityFunction/fulllistview.h b/src/UtilityFunction/fulllistview.h -index 0739694..14a58e9 100644 ---- a/src/UtilityFunction/fulllistview.h -+++ b/src/UtilityFunction/fulllistview.h -@@ -49,7 +49,7 @@ private: - QStandardItemModel* listmodel=nullptr; - int module=0; - -- RightClickMenu* menu;//右键菜单 -+ RightClickMenu* menu=nullptr;//右键菜单 - QSettings *setting=nullptr; - QStringList data; - -@@ -61,8 +61,10 @@ private Q_SLOTS: - - Q_SIGNALS: - void sendItemClickedSignal(QString arg);//向字母排序或功能分类模块发送item点击信号 -- void sendFixedOrUnfixedSignal();//向字母排序、功能分类发送固定或者取消固定信号 -- void sendUpdateAppListSignal();//向FullCommonUseWidget发送更新应用列表信号 -+ void sendFixedOrUnfixedSignal(QString desktopfp,int type);//向字母排序、功能分类发送固定或者取消固定信号 -+ void sendUpdateAppListSignal(QString desktopfp,int type);//向FullCommonUseWidget发送更新应用列表信号 -+ void removeListItemSignal(QString desktopfp); -+ void removeListAllItemSignal(); - void sendHideMainWindowSignal(); - }; - -diff --git a/src/UtilityFunction/listview.cpp b/src/UtilityFunction/listview.cpp -index 2b1b58e..4c9ec08 100644 ---- a/src/UtilityFunction/listview.cpp -+++ b/src/UtilityFunction/listview.cpp -@@ -63,6 +63,7 @@ void ListView::initWidget() - this->setViewMode(QListView::ListMode); - this->setContextMenuPolicy(Qt::CustomContextMenu); - this->setFocusPolicy(Qt::NoFocus); -+ this->setMovement(QListView::Static); - connect(this,SIGNAL(customContextMenuRequested(QPoint)),this,SLOT(rightClickedSlot())); - connect(this,SIGNAL(clicked(QModelIndex)),this,SLOT(onClicked(QModelIndex))); - -@@ -118,8 +119,10 @@ void ListView::rightClickedSlot() - if(strlist.at(1).toInt()==1) - { - int ret=menu->showAppBtnMenu(strlist.at(0)); -- if(ret==1 || ret==2) -- Q_EMIT sendFixedOrUnfixedSignal(); -+ if(ret==1) -+ Q_EMIT sendFixedOrUnfixedSignal(strlist.at(0),0); -+ if(ret==2) -+ Q_EMIT sendFixedOrUnfixedSignal(strlist.at(0),1); - if(ret==6) - Q_EMIT sendHideMainWindowSignal(); - if(ret==7) -@@ -137,7 +140,7 @@ void ListView::rightClickedSlot() - item->setData(QVariant::fromValue(strlist),Qt::DisplayRole); - listmodel->insertRow(setting->allKeys().size()-1,item); - setting->endGroup(); -- Q_EMIT sendUpdateAppListSignal(); -+ Q_EMIT sendUpdateAppListSignal(strlist.at(0),0); - } - if(ret==2) - { -@@ -147,7 +150,7 @@ void ListView::rightClickedSlot() - item->setData(QVariant::fromValue(strlist),Qt::DisplayRole); - listmodel->insertRow(setting->allKeys().size(),item); - setting->endGroup(); -- Q_EMIT sendUpdateAppListSignal(); -+ Q_EMIT sendUpdateAppListSignal(strlist.at(0),1); - } - - if(ret==7) -@@ -156,7 +159,7 @@ void ListView::rightClickedSlot() - if(ret==8) - { - listmodel->removeRow(index.row()); -- Q_EMIT sendUpdateAppListSignal(); -+ Q_EMIT removeListItemSignal(strlist.at(0)); - } - if(ret==9) - { -@@ -171,7 +174,7 @@ void ListView::rightClickedSlot() - listmodel->removeRow(i); - } - setting->endGroup(); -- Q_EMIT sendUpdateAppListSignal(); -+ Q_EMIT removeListAllItemSignal(); - } - - if(ret==6) -diff --git a/src/UtilityFunction/listview.h b/src/UtilityFunction/listview.h -index d4b7813..07e8693 100644 ---- a/src/UtilityFunction/listview.h -+++ b/src/UtilityFunction/listview.h -@@ -45,15 +45,13 @@ protected: - void leaveEvent(QEvent* e) Q_DECL_OVERRIDE; - - private: --// ListModel* model=nullptr; - QStandardItemModel* listmodel=nullptr; - int w=0; - int h=0; - int module=0; - UkuiMenuInterface* pUkuiMenuInterface=nullptr; --// QStringList rowlist;//存放分类字母所在行 - -- RightClickMenu* menu;//右键菜单 -+ RightClickMenu* menu=nullptr;//右键菜单 - QSettings *setting=nullptr; - QVector data; - ItemDelegate* m_delegate=nullptr; -@@ -64,8 +62,10 @@ private Q_SLOTS: - - Q_SIGNALS: - void sendItemClickedSignal(QStringList arg);//向字母排序或功能分类模块发送item点击信号 -- void sendFixedOrUnfixedSignal();//向字母排序、功能分类发送固定或者取消固定信号 -- void sendUpdateAppListSignal();//向CommonUseWidget发送更新应用列表信号 -+ void sendFixedOrUnfixedSignal(QString desktopfp,int type);//向字母排序、功能分类发送固定或者取消固定信号 -+ void sendUpdateAppListSignal(QString desktopfp,int type);//向CommonUseWidget发送更新应用列表信号 -+ void removeListItemSignal(QString desktopfp); -+ void removeListAllItemSignal(); - void sendHideMainWindowSignal(); - }; - --- -2.33.0 - diff --git a/0001-Fixed-size-problem-with-multiple-screens.patch b/0001-Fixed-size-problem-with-multiple-screens.patch deleted file mode 100644 index e6c10b9..0000000 --- a/0001-Fixed-size-problem-with-multiple-screens.patch +++ /dev/null @@ -1,253 +0,0 @@ -From 58482ffe6e2752173739827989bbf1135bc8104a Mon Sep 17 00:00:00 2001 -From: liuhao-startmenu -Date: Thu, 26 Mar 2020 22:29:09 +0800 -Subject: [PATCH] Fixed size problem with multiple screens - ---- - src/FunctionWidget/fullfunctionwidget.cpp | 57 +++++++++---------- - src/MainWindow/mainwindow.cpp | 7 ++- - src/MainWindow/mainwindow.h | 2 +- - .../qtsingleapplication.cpp | 12 ++-- - src/Style/style.cpp | 14 ++--- - src/Style/style.h | 1 + - ukui-menu.desktop | 2 +- - 7 files changed, 45 insertions(+), 50 deletions(-) - -diff --git a/src/FunctionWidget/fullfunctionwidget.cpp b/src/FunctionWidget/fullfunctionwidget.cpp -index 0223db7..8c0e29d 100644 ---- a/src/FunctionWidget/fullfunctionwidget.cpp -+++ b/src/FunctionWidget/fullfunctionwidget.cpp -@@ -300,27 +300,25 @@ void FullFunctionWidget::updateAppListView() - pBtnGroup->removeButton(button); - } - buttonList.clear(); --// iconlistscrollareawidLayout->removeItem(pIconListTopSpacer); --// iconlistscrollareawidLayout->removeItem(pIconListBottomSpacer); --// while ((child = iconlistscrollareawidLayout->takeAt(0)) != 0) { --// QWidget* wid=child->widget(); --// iconlistscrollareawidLayout->removeWidget(wid); --// wid->setParent(nullptr); --// delete wid; --// delete child; --// } -+ while ((child = iconlistscrollareawidLayout->takeAt(0)) != 0) { -+ QWidget* wid=child->widget(); -+ iconlistscrollareawidLayout->removeWidget(wid); -+ wid->setParent(nullptr); -+ delete wid; -+ delete child; -+ } - -- for(int i=iconlistscrollareawidLayout->count()-2;i>0;i--) -- { -- if((child = iconlistscrollareawidLayout->takeAt(i)) != 0) -- { -- QWidget* wid=child->widget(); -- iconlistscrollareawidLayout->removeWidget(wid); -- wid->setParent(nullptr); -- delete wid; -- delete child; -- } -- } -+// for(int i=iconlistscrollareawidLayout->count()-2;i>0;i--) -+// { -+// if((child = iconlistscrollareawidLayout->takeAt(i)) != 0) -+// { -+// QWidget* wid=child->widget(); -+// iconlistscrollareawidLayout->removeWidget(wid); -+// wid->setParent(nullptr); -+// delete wid; -+// delete child; -+// } -+// } - initIconListScrollArea(); - } - -@@ -373,21 +371,20 @@ void FullFunctionWidget::initIconListWidget() - iconlistWid->setLayout(iconlistLayout); - - iconlistscrollarea=new ClassifyScrollArea(); -- iconlistscrollarea->setFixedSize(Style::LeftBtnWidth,iconlistWid->height()); -+// iconlistscrollarea->setFixedSize(Style::LeftBtnWidth,iconlistWid->height()); - iconlistscrollareaWid=new QWidget; - iconlistscrollareawidLayout=new QVBoxLayout; - iconlistscrollareawidLayout->setContentsMargins(0,0,0,0); - iconlistscrollareawidLayout->setSpacing(Style::LeftSpaceBetweenItem); - iconlistscrollareaWid->setLayout(iconlistscrollareawidLayout); - iconlistscrollarea->setWidget(iconlistscrollareaWid); -- iconlistLayout->addWidget(iconlistscrollarea); -- pBtnGroup=new QButtonGroup(iconlistscrollareaWid); --// iconlistscrollarea->setStyleSheet("border:1px solid #ff0000;"); --// iconlistscrollareaWid->setStyleSheet("border:1px solid #00ff00;"); -+ - pIconListTopSpacer=new QSpacerItem(20,40,QSizePolicy::Fixed,QSizePolicy::Expanding); - pIconListBottomSpacer=new QSpacerItem(20,40,QSizePolicy::Fixed,QSizePolicy::Expanding); -- iconlistscrollareawidLayout->addItem(pIconListTopSpacer); -- iconlistscrollareawidLayout->addItem(pIconListBottomSpacer); -+ iconlistLayout->addItem(pIconListTopSpacer); -+ iconlistLayout->addWidget(iconlistscrollarea); -+ iconlistLayout->addItem(pIconListBottomSpacer); -+ pBtnGroup=new QButtonGroup(iconlistscrollareaWid); - initIconListScrollArea(); - } - -@@ -396,6 +393,8 @@ void FullFunctionWidget::initIconListWidget() - */ - void FullFunctionWidget::initIconListScrollArea() - { -+ iconlistscrollarea->setFixedSize(Style::LeftBtnWidth, -+ classificationbtnlist.size()*Style::LeftBtnHeight+(classificationbtnlist.size()-1)*Style::LeftSpaceBetweenItem); - for(int i=0;iaddWidget(iconbtn); -- iconlistscrollareawidLayout->insertWidget(i+1,iconbtn); -+ iconlistscrollareawidLayout->addWidget(iconbtn); -+// iconlistscrollareawidLayout->insertWidget(i+1,iconbtn); - connect(iconbtn,SIGNAL(buttonClicked(QAbstractButton*)),pBtnGroup, SIGNAL(buttonClicked(QAbstractButton*))); - } - -diff --git a/src/MainWindow/mainwindow.cpp b/src/MainWindow/mainwindow.cpp -index 97c8daf..27dc2e9 100644 ---- a/src/MainWindow/mainwindow.cpp -+++ b/src/MainWindow/mainwindow.cpp -@@ -171,7 +171,8 @@ void MainWindow::initMainWindow() - connect(mainviewwid,SIGNAL(sendHideMainWindowSignal()),this,SLOT(recvHideMainWindowSlot())); - connect(sidebarwid,SIGNAL(sendHideMainWindowSignal()),this,SLOT(recvHideMainWindowSlot())); - -- connect(QApplication::desktop(),SIGNAL(resized(int)),this,SLOT(monitorResolutionChange(int))); -+ connect(QApplication::primaryScreen(),SIGNAL(geometryChanged(QRect)), -+ this,SLOT(monitorResolutionChange(QRect))); - } - - /** -@@ -392,9 +393,9 @@ void MainWindow::mainWindowMakeZero() - // pLeaveAnimation->start(); - //} - --void MainWindow::monitorResolutionChange(int screen) -+void MainWindow::monitorResolutionChange(QRect rect) - { -- Q_UNUSED(screen); -+ Q_UNUSED(rect); - qApp->quit(); - QProcess::startDetached(QString("/usr/bin/ukui-menu")); - } -diff --git a/src/MainWindow/mainwindow.h b/src/MainWindow/mainwindow.h -index 8ae3292..28f9997 100644 ---- a/src/MainWindow/mainwindow.h -+++ b/src/MainWindow/mainwindow.h -@@ -80,7 +80,7 @@ private Q_SLOTS: - void showDefaultWidget();//显示默认窗口 - void recvHideMainWindowSlot();//接收隐藏主窗口信号 - // void recv_hover_signal_slot(bool is_hover); -- void monitorResolutionChange(int screen);//监控屏幕分辨率 -+ void monitorResolutionChange(QRect rect);//监控屏幕分辨率 - }; - - #endif // MAINWINDOW_H -diff --git a/src/QtSingleApplication/qtsingleapplication.cpp b/src/QtSingleApplication/qtsingleapplication.cpp -index 7b14df0..4a9294d 100644 ---- a/src/QtSingleApplication/qtsingleapplication.cpp -+++ b/src/QtSingleApplication/qtsingleapplication.cpp -@@ -344,26 +344,26 @@ void QtSingleApplication::activateWindow() - if(ret) - { - if(position==0) -- actWin->setGeometry(QRect(0,0,this->desktop()->width(),this->desktop()->height()-panelSize)); -+ actWin->setGeometry(QRect(0,0,this->primaryScreen()->geometry().width(),this->primaryScreen()->geometry().height()-panelSize)); - else if(position==1) -- actWin->setGeometry(QRect(0,panelSize,this->desktop()->width(),this->desktop()->height()-panelSize)); -+ actWin->setGeometry(QRect(0,panelSize,this->primaryScreen()->geometry().width(),this->primaryScreen()->geometry().height()-panelSize)); - else if(position==2) -- actWin->setGeometry(QRect(panelSize,0,this->desktop()->width()-panelSize,this->desktop()->height())); -+ actWin->setGeometry(QRect(panelSize,0,this->primaryScreen()->geometry().width()-panelSize,this->primaryScreen()->geometry().height())); - else -- actWin->setGeometry(QRect(0,0,this->desktop()->width()-panelSize,this->desktop()->height())); -+ actWin->setGeometry(QRect(0,0,this->primaryScreen()->geometry().width()-panelSize,this->primaryScreen()->geometry().height())); - - } - else { - w->setFrameStyle(); - if(position==0) -- actWin->setGeometry(QRect(0,this->desktop()->height()-panelSize-actWin->height(), -+ actWin->setGeometry(QRect(0,this->primaryScreen()->geometry().height()-panelSize-actWin->height(), - actWin->width(),actWin->height())); - else if(position==1) - actWin->setGeometry(QRect(0,panelSize,actWin->width(),actWin->height())); - else if(position==2) - actWin->setGeometry(QRect(panelSize,0,actWin->width(),actWin->height())); - else -- actWin->setGeometry(QRect(this->desktop()->width()-panelSize-actWin->width(),0, -+ actWin->setGeometry(QRect(this->primaryScreen()->geometry().width()-panelSize-actWin->width(),0, - actWin->width(),actWin->height())); - } - actWin->setWindowState(actWin->windowState() & ~Qt::WindowMinimized); -diff --git a/src/Style/style.cpp b/src/Style/style.cpp -index b3bc629..4a8ae47 100644 ---- a/src/Style/style.cpp -+++ b/src/Style/style.cpp -@@ -82,7 +82,6 @@ void Style::initWidStyle() - QString value=setting->get("font-name").toString(); - QStringList valstr=value.split(" "); - int fontSize=valstr.at(valstr.count()-1).toInt(); --// int fontSize=14; - - QDBusInterface iface("com.ukui.panel.desktop", - "/", -@@ -91,22 +90,17 @@ void Style::initWidStyle() - - QDBusReply position=iface.call("GetPanelPosition",""); - QDBusReply panelSize=iface.call("GetPanelSize",""); --// int widthavailable=0; --// int heightavailable=0; - if(position==0 || position==1) - { -- widthavailable=QApplication::desktop()->width(); -- heightavailable=QApplication::desktop()->height()-panelSize; -+ widthavailable=QApplication::primaryScreen()->geometry().width(); -+ heightavailable=QApplication::primaryScreen()->geometry().height()-panelSize; - } - if(position==2 || position==3) - { -- widthavailable=QApplication::desktop()->width()-panelSize; -- heightavailable=QApplication::desktop()->height(); -+ widthavailable=QApplication::primaryScreen()->geometry().width()-panelSize; -+ heightavailable=QApplication::primaryScreen()->geometry().height(); - } - -- QApplication::desktop()->width(); --// int height=QApplication::desktop()->height(); --// int heightavailable=QApplication::desktop()->availableGeometry().height(); - if(widthavailable>=2000 && widthavailable<=4000) - { - MainViewWidWidth=widthavailable-round((widthavailable-1440)/2); -diff --git a/src/Style/style.h b/src/Style/style.h -index e6cac50..f20a79d 100644 ---- a/src/Style/style.h -+++ b/src/Style/style.h -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - - //颜色 - #define BORDERCOLOR "rgba(37,41,43)" //边框 -diff --git a/ukui-menu.desktop b/ukui-menu.desktop -index 39f263b..0fc2e77 100644 ---- a/ukui-menu.desktop -+++ b/ukui-menu.desktop -@@ -8,4 +8,4 @@ Type=Application - Icon=ukui-menu - X-UKUI-AutoRestart=true - OnlyShowIn=UKUI --X-UKUI-Autostart-Phase=Applications -+X-UKUI-Autostart-Phase=Application --- -2.33.0 - diff --git a/0002-Optimize-the-interaction-strategy-with-the-taskbar.patch b/0002-Optimize-the-interaction-strategy-with-the-taskbar.patch deleted file mode 100644 index 0de2d91..0000000 --- a/0002-Optimize-the-interaction-strategy-with-the-taskbar.patch +++ /dev/null @@ -1,1017 +0,0 @@ -From 98c95850ccc70d0a1547f07808073a735318c5a8 Mon Sep 17 00:00:00 2001 -From: liuhao-startmenu -Date: Wed, 1 Apr 2020 11:59:53 +0800 -Subject: [PATCH 2/2] Optimize the interaction strategy with the taskbar - ---- - main.cpp | 16 +- - src/Interface/ukuimenuinterface.cpp | 10 +- - src/LetterWidget/fullletterwidget.cpp | 6 +- - src/LetterWidget/letterbuttonwidget.cpp | 6 +- - src/MainViewWidget/mainviewwidget.cpp | 12 +- - src/MainWindow/mainwindow.cpp | 98 ++++-------- - src/MainWindow/mainwindow.h | 2 +- - .../qtsingleapplication.cpp | 10 +- - src/RightClickMenu/rightclickmenu.cpp | 29 ++-- - src/RightClickMenu/rightclickmenu.h | 8 +- - src/SideBarWidget/sidebarwidget.cpp | 142 +----------------- - src/Style/style.cpp | 19 +-- - src/UtilityFunction/fullitemdelegate.cpp | 6 +- - src/UtilityFunction/fulllistview.cpp | 5 +- - .../functionclassifybutton.cpp | 36 ++--- - src/UtilityFunction/itemdelegate.cpp | 6 +- - src/UtilityFunction/listview.cpp | 7 +- - src/UtilityFunction/pushbutton.cpp | 6 +- - 18 files changed, 117 insertions(+), 307 deletions(-) - -diff --git a/main.cpp b/main.cpp -index 4b9761d..0975c73 100644 ---- a/main.cpp -+++ b/main.cpp -@@ -40,6 +40,12 @@ int main(int argc, char *argv[]) - qss.open(QFile::ReadOnly); - qApp->setStyleSheet(qss.readAll()); - -+// QGSettings* setting=new QGSettings(QString("org.mate.interface").toLocal8Bit()); -+// QString value=setting->get("font-name").toString(); -+// QFont font; -+// font.setFamily(value); -+// qApp->setFont(font); -+ - QString locale = QLocale::system().name(); - QTranslator translator; - if (locale == "zh_CN"){ -@@ -57,13 +63,9 @@ int main(int argc, char *argv[]) - qApp->setStyleSheet(style); - - MainWindow w; -- QDBusInterface iface("com.ukui.panel.desktop", -- "/", -- "com.ukui.panel.desktop", -- QDBusConnection::sessionBus()); -- -- QDBusReply position=iface.call("GetPanelPosition",""); -- QDBusReply panelSize=iface.call("GetPanelSize",""); -+ QGSettings* gsetting=new QGSettings(QString("org.ukui.panel.settings").toLocal8Bit()); -+ int position=gsetting->get("panelposition").toInt(); -+ int panelSize=gsetting->get("panelsize").toInt(); - if(position==0) - w.setGeometry(QRect(0,Style::heightavailable-590,376,590)); - else if(position==1) -diff --git a/src/Interface/ukuimenuinterface.cpp b/src/Interface/ukuimenuinterface.cpp -index c31893d..577873b 100644 ---- a/src/Interface/ukuimenuinterface.cpp -+++ b/src/Interface/ukuimenuinterface.cpp -@@ -126,7 +126,6 @@ QStringList UkuiMenuInterface::getDesktopFilePath() - recursiveSearchFile("/usr/share/applications/"); - - filePathList.removeAll("/usr/share/applications/peony-folder-handler.desktop"); -- filePathList.removeAll("/usr/share/applications/peony.desktop"); - filePathList.removeAll("/usr/share/applications/gnome-software-local-file.desktop"); - filePathList.removeAll("/usr/share/applications/org.gnome.Software.Editor.desktop"); - filePathList.removeAll("/usr/share/applications/apport-gtk.desktop"); -@@ -159,7 +158,6 @@ QStringList UkuiMenuInterface::getDesktopFilePath() - filePathList.removeAll("/usr/share/applications/remmina-gnome.desktop"); - filePathList.removeAll("/usr/share/applications/ukwm.desktop"); - filePathList.removeAll("/usr/share/applications/nm-applet.desktop"); -- filePathList.removeAll("/usr/share/applications/peony-home.desktop"); - filePathList.removeAll("/usr/share/applications/mate-user-guide.desktop"); - filePathList.removeAll("/usr/share/applications/nm-connection-editor.desktop"); - filePathList.removeAll("/usr/share/applications/pavucontrol-qt.desktop"); -@@ -203,7 +201,13 @@ QStringList UkuiMenuInterface::getDesktopFilePath() - filePathList.removeAll("/usr/share/applications/vim.desktop"); - filePathList.removeAll("/usr/share/applications/kwalletmanager5-kwalletd.desktop"); - filePathList.removeAll("/usr/share/applications/org.gnome.DejaDup.desktop"); -- -+ filePathList.removeAll("/usr/share/applications/redshift.desktop"); -+ filePathList.removeAll("/usr/share/applications/python3.8.desktop"); -+ filePathList.removeAll("/usr/share/applications/yelp.desktop"); -+ filePathList.removeAll("/usr/share/applications/peony-computer.desktop"); -+ filePathList.removeAll("/usr/share/applications/peony-home.desktop"); -+ filePathList.removeAll("/usr/share/applications/peony-trash.desktop"); -+ filePathList.removeAll("/usr/share/applications/peony.desktop"); - return filePathList; - } - -diff --git a/src/LetterWidget/fullletterwidget.cpp b/src/LetterWidget/fullletterwidget.cpp -index 987b1e8..9fc863c 100644 ---- a/src/LetterWidget/fullletterwidget.cpp -+++ b/src/LetterWidget/fullletterwidget.cpp -@@ -271,8 +271,8 @@ void FullLetterWidget::initLetterListScrollArea() - QToolButton:checked{background:transparent;color:#ffffff;border-radius:2px;}", - ClassifyBtnHoverBackground,ClassifyBtnHoverBackground); - -- QFont font; -- font.setPixelSize(Style::LeftFontSize); -+// QFont font; -+// font.setPixelSize(Style::LeftFontSize); - - QStringList letterbtnlist=this->letterbtnlist; - if(letterbtnlist.contains("&")) -@@ -284,7 +284,7 @@ void FullLetterWidget::initLetterListScrollArea() - letterbtn->setStyleSheet(btnstyle); - letterbtn->setFixedSize(Style::LeftBtnHeight,Style::LeftBtnHeight); - letterbtn->setCheckable(true); -- letterbtn->setFont(font); -+// letterbtn->setFont(font); - buttonList.append(letterbtn); - letterlistscrollareawidLayout->addWidget(letterbtn); - // connect(letterbtn,SIGNAL(clicked()),this,SLOT(letterBtnClickedSlot())); -diff --git a/src/LetterWidget/letterbuttonwidget.cpp b/src/LetterWidget/letterbuttonwidget.cpp -index 69a33c2..b5d5096 100644 ---- a/src/LetterWidget/letterbuttonwidget.cpp -+++ b/src/LetterWidget/letterbuttonwidget.cpp -@@ -66,8 +66,8 @@ void LetterButtonWidget::initWidget() - letterlist.append("&&"); - letterlist.append("#"); - -- QFont font; -- font.setPixelSize(Style::LeftFontSize); -+// QFont font; -+// font.setPixelSize(Style::LeftFontSize); - for(int row=0;row<6;row++) - { - for(int col=0;col<5;col++) -@@ -77,7 +77,7 @@ void LetterButtonWidget::initWidget() - QToolButton* btn=new QToolButton(this); - btn->setFixedSize(55,48); - btn->setStyleSheet(QString::fromLocal8Bit(btncolor)); -- btn->setFont(font); -+// btn->setFont(font); - btn->setText(letterlist.at(row*5+col)); - gridLayout->addWidget(btn,row,col); - connect(btn, SIGNAL(clicked()), this, SLOT(letterBtnClickedSlot())); -diff --git a/src/MainViewWidget/mainviewwidget.cpp b/src/MainViewWidget/mainviewwidget.cpp -index 19121cb..8a4f434 100644 ---- a/src/MainViewWidget/mainviewwidget.cpp -+++ b/src/MainViewWidget/mainviewwidget.cpp -@@ -178,10 +178,10 @@ void MainViewWidget::initQueryLineEdit() - pQueryIcon->setStyleSheet("background:transparent"); - pQueryIcon->setFixedSize(pixmap->size()); - pQueryIcon->setPixmap(*pixmap); -- QFont font; -- font.setPixelSize(Style::QueryLineEditFontSize); -+// QFont font; -+// font.setPixelSize(Style::QueryLineEditFontSize); - pQueryText=new QLabel(pIconTextWid); -- pQueryText->setFont(font); -+// pQueryText->setFont(font); - pQueryText->setText(tr("Search")); - pQueryText->setStyleSheet("background:transparent;color:#626c6e;"); - pQueryText->adjustSize(); -@@ -203,8 +203,8 @@ void MainViewWidget::initQueryLineEdit() - - bool MainViewWidget::eventFilter(QObject *watched, QEvent *event) - { -- QFont font; -- font.setPixelSize(Style::QueryLineEditFontSize); -+// QFont font; -+// font.setPixelSize(Style::QueryLineEditFontSize); - if(watched==querylineEdit) - { - if(event->type()==QEvent::FocusIn) -@@ -219,7 +219,7 @@ bool MainViewWidget::eventFilter(QObject *watched, QEvent *event) - QueryLineEditClickedBorder,QueryLineEditClickedBackground); - querylineEdit->setStyleSheet(style); - querylineEdit->setTextMargins(20,1,0,1); -- querylineEdit->setFont(font); -+// querylineEdit->setFont(font); - if(!querylineEdit->text().isEmpty()) - searchAppSlot(querylineEdit->text()); - } -diff --git a/src/MainWindow/mainwindow.cpp b/src/MainWindow/mainwindow.cpp -index 27dc2e9..0db0ffa 100644 ---- a/src/MainWindow/mainwindow.cpp -+++ b/src/MainWindow/mainwindow.cpp -@@ -74,22 +74,6 @@ MainWindow::MainWindow(QWidget *parent) : - setting->endGroup(); - - initMainWindow(); -- --// pEnterAnimation=new QPropertyAnimation; --// pEnterAnimation->setTargetObject(this); --// pEnterAnimation->setPropertyName("size"); --// pEnterAnimation->setDuration(500); --// pEnterAnimation->setStartValue(QSize(390,532)); --// pEnterAnimation->setEndValue(QSize(490,532)); --// pEnterAnimation->setEasingCurve(QEasingCurve::Linear); -- --// pLeaveAnimation=new QPropertyAnimation; --// pLeaveAnimation->setTargetObject(this); --// pLeaveAnimation->setPropertyName("size"); --// pLeaveAnimation->setDuration(500); --// pLeaveAnimation->setStartValue(QSize(490,532)); --// pLeaveAnimation->setEndValue(QSize(390,532)); --// pLeaveAnimation->setEasingCurve(QEasingCurve::Linear); - } - - MainWindow::~MainWindow() -@@ -111,6 +95,12 @@ void MainWindow::initMainWindow() - this->setAutoFillBackground(false); - this->setFocusPolicy(Qt::StrongFocus); - -+// QPainterPath path; -+// auto rect = this->rect(); -+// rect.adjust(1, 1, -1, -1); -+// path.addRoundedRect(rect, 6, 6); -+// setProperty("blurRegion", QRegion(path.toFillPolygon().toPolygon())); -+ - ui->mainToolBar->hide(); - ui->menuBar->hide(); - ui->statusBar->hide(); -@@ -121,7 +111,7 @@ void MainWindow::initMainWindow() - this->setContentsMargins(0,0,0,0); - - frame=new QFrame(this); -- sidebarwid=new SideBarWidget(this); -+ sidebarwid=new SideBarWidget(); - mainviewwid=new MainViewWidget(this); - - this->setCentralWidget(frame); -@@ -141,11 +131,8 @@ void MainWindow::initMainWindow() - mainlayout->setContentsMargins(0,0,0,0); - mainlayout->setSpacing(0); - centralWidget()->setLayout(mainlayout); -- QDBusInterface iface("com.ukui.panel.desktop", -- "/", -- "com.ukui.panel.desktop", -- QDBusConnection::sessionBus()); -- QDBusReply position=iface.call("GetPanelPosition",""); -+ QGSettings* gsetting=new QGSettings(QString("org.ukui.panel.settings").toLocal8Bit()); -+ int position=gsetting->get("panelposition").toInt(); - char style[100]; - if(position==0) - sprintf(style, "border:0px;background-color:%s;border-top-right-radius:6px;",DefaultBackground); -@@ -173,6 +160,9 @@ void MainWindow::initMainWindow() - - connect(QApplication::primaryScreen(),SIGNAL(geometryChanged(QRect)), - this,SLOT(monitorResolutionChange(QRect))); -+ -+ connect(gsetting,SIGNAL(changed(QString)), -+ this,SLOT(panelShangedSlot(QString))); - } - - /** -@@ -250,25 +240,11 @@ void MainWindow::paintEvent(QPaintEvent *) - */ - void MainWindow::showFullScreenWidget() - { --//// this->showMaximized(); --// is_full=true; --// classification_widget=arg; --// sidebarwid->setVisible(false); --// mainviewwid->setVisible(false); --// char widgetcolor[100]; --// sprintf(widgetcolor, "border:0px;background-color:%s;",MAINVIEWWIDGETCOLOR); --// mainwidget->setStyleSheet(QString::fromLocal8Bit(widgetcolor)); --// pAnimation->start(); -- - is_fullscreen=true; - this->setContentsMargins(0,0,0,0); -- QDBusInterface iface("com.ukui.panel.desktop", -- "/", -- "com.ukui.panel.desktop", -- QDBusConnection::sessionBus()); -- -- QDBusReply position=iface.call("GetPanelPosition",""); -- QDBusReply panelSize=iface.call("GetPanelSize",""); -+ QGSettings* gsetting=new QGSettings(QString("org.ukui.panel.settings").toLocal8Bit()); -+ int position=gsetting->get("panelposition").toInt(); -+ int panelSize=gsetting->get("panelsize").toInt(); - if(position==0) - this->setGeometry(QRect(0,0,Style::widthavailable,Style::heightavailable)); - else if(position==1) -@@ -277,7 +253,6 @@ void MainWindow::showFullScreenWidget() - this->setGeometry(QRect(panelSize,0,Style::widthavailable,Style::heightavailable)); - else - this->setGeometry(QRect(0,0,Style::widthavailable,Style::heightavailable)); --// this->setGeometry(QApplication::desktop()->availableGeometry()); - sidebarwid->loadMaxSidebar(); - mainviewwid->loadMaxMainView(); - //移除分割线 -@@ -295,25 +270,11 @@ void MainWindow::showFullScreenWidget() - */ - void MainWindow::showDefaultWidget() - { --//// this->showNormal(); --// is_full=false; --// classification_widget=arg; --// sidebarwid->setVisible(false); --// mainviewwid->setVisible(false); --// char widgetcolor[100]; --// sprintf(widgetcolor, "border:0px;background-color:%s;",MAINVIEWWIDGETCOLOR); --// mainwidget->setStyleSheet(QString::fromLocal8Bit(widgetcolor)); --// pAnimation->start(); -- - is_fullscreen=false; - this->setContentsMargins(0,0,0,0); -- QDBusInterface iface("com.ukui.panel.desktop", -- "/", -- "com.ukui.panel.desktop", -- QDBusConnection::sessionBus()); -- -- QDBusReply position=iface.call("GetPanelPosition",""); -- QDBusReply panelSize=iface.call("GetPanelSize",""); -+ QGSettings* gsetting=new QGSettings(QString("org.ukui.panel.settings").toLocal8Bit()); -+ int position=gsetting->get("panelposition").toInt(); -+ int panelSize=gsetting->get("panelsize").toInt(); - char style[100]; - if(position==0) - { -@@ -385,14 +346,6 @@ void MainWindow::mainWindowMakeZero() - sidebarwid->widgetMakeZero(); - } - --//void MainWindow::recv_hover_signal_slot(bool is_hover) --//{ --// if(is_hover) --// pEnterAnimation->start(); --// else --// pLeaveAnimation->start(); --//} -- - void MainWindow::monitorResolutionChange(QRect rect) - { - Q_UNUSED(rect); -@@ -400,14 +353,17 @@ void MainWindow::monitorResolutionChange(QRect rect) - QProcess::startDetached(QString("/usr/bin/ukui-menu")); - } - --void MainWindow::setFrameStyle() -+void MainWindow::panelShangedSlot(QString key) - { -- QDBusInterface iface("com.ukui.panel.desktop", -- "/", -- "com.ukui.panel.desktop", -- QDBusConnection::sessionBus()); -+ Q_UNUSED(key); -+ qApp->quit(); -+ QProcess::startDetached(QString("/usr/bin/ukui-menu")); -+} - -- QDBusReply position=iface.call("GetPanelPosition",""); -+void MainWindow::setFrameStyle() -+{ -+ QGSettings* gsetting=new QGSettings(QString("org.ukui.panel.settings").toLocal8Bit()); -+ int position=gsetting->get("panelposition").toInt(); - char style[100]; - if(!is_fullscreen) - { -diff --git a/src/MainWindow/mainwindow.h b/src/MainWindow/mainwindow.h -index 28f9997..3c48c5b 100644 ---- a/src/MainWindow/mainwindow.h -+++ b/src/MainWindow/mainwindow.h -@@ -79,8 +79,8 @@ private Q_SLOTS: - void showFullScreenWidget();//加载全屏窗口 - void showDefaultWidget();//显示默认窗口 - void recvHideMainWindowSlot();//接收隐藏主窗口信号 --// void recv_hover_signal_slot(bool is_hover); - void monitorResolutionChange(QRect rect);//监控屏幕分辨率 -+ void panelShangedSlot(QString key); - }; - - #endif // MAINWINDOW_H -diff --git a/src/QtSingleApplication/qtsingleapplication.cpp b/src/QtSingleApplication/qtsingleapplication.cpp -index 4a9294d..ae9271d 100644 ---- a/src/QtSingleApplication/qtsingleapplication.cpp -+++ b/src/QtSingleApplication/qtsingleapplication.cpp -@@ -333,13 +333,9 @@ void QtSingleApplication::activateWindow() - MainWindow* w=qobject_cast(actWin); - w->mainWindowMakeZero(); - w->setFrameStyle(); -- QDBusInterface iface("com.ukui.panel.desktop", -- "/", -- "com.ukui.panel.desktop", -- QDBusConnection::sessionBus()); -- -- QDBusReply position=iface.call("GetPanelPosition",""); -- QDBusReply panelSize=iface.call("GetPanelSize",""); -+ QGSettings* gsetting=new QGSettings(QString("org.ukui.panel.settings").toLocal8Bit()); -+ int position=gsetting->get("panelposition").toInt(); -+ int panelSize=gsetting->get("panelsize").toInt(); - bool ret=w->checkIfFullScreen(); - if(ret) - { -diff --git a/src/RightClickMenu/rightclickmenu.cpp b/src/RightClickMenu/rightclickmenu.cpp -index 24ac63f..165a9d6 100644 ---- a/src/RightClickMenu/rightclickmenu.cpp -+++ b/src/RightClickMenu/rightclickmenu.cpp -@@ -172,7 +172,6 @@ RightClickMenu::~RightClickMenu() - void RightClickMenu::addCommonUseAppBtnAction() - { - setting->beginGroup("application"); -- QString desktopfp=pUkuiMenuInterface->getDesktopPathByAppName(appname); - QFileInfo fileInfo(desktopfp); - QString desktopfn=fileInfo.fileName(); - if(!setting->contains(desktopfn) || setting->value(desktopfn).toInt()>0) -@@ -290,7 +289,6 @@ void RightClickMenu::addAppBtnAction() - { - - setting->beginGroup("application"); -- QString desktopfp=pUkuiMenuInterface->getDesktopPathByAppName(appname); - QFileInfo fileInfo(desktopfp); - QString desktopfn=fileInfo.fileName(); - if(!setting->contains(desktopfn) || setting->value(desktopfn).toInt()>0) -@@ -413,13 +411,13 @@ void RightClickMenu::addShutdownAction() - //其它按钮右键菜单 - void RightClickMenu::addOtherAction() - { -- QString desktopfp=pUkuiMenuInterface->getDesktopPathByAppName(appname); -+// QString desktopfp=pUkuiMenuInterface->getDesktopPathByAppName(appname); - QDBusInterface iface("com.ukui.panel.desktop", - "/", - "com.ukui.panel.desktop", - QDBusConnection::sessionBus()); - -- QDBusReply ret=iface.call("CheckIfExist",desktopfp); -+ QDBusReply ret=iface.call("CheckIfExist",this->desktopfp); - if(!ret) - { - initWidgetAction(OtherFix2TaskBarWid,":/data/img/sidebarwidget/fixed.svg",tr("Pin to taskbar")); -@@ -499,7 +497,6 @@ void RightClickMenu::initWidgetAction(QWidget *wid, QString iconstr, QString tex - void RightClickMenu::fixToCommonUseActionTriggerSlot() - { - action_number=1; -- QString desktopfp=pUkuiMenuInterface->getDesktopPathByAppName(appname); - QFileInfo fileInfo(desktopfp); - QString desktopfn=fileInfo.fileName(); - setting->beginGroup("application"); -@@ -515,7 +512,6 @@ void RightClickMenu::fixToCommonUseActionTriggerSlot() - void RightClickMenu::unfixedFromCommonUseActionTriggerSlot() - { - action_number=2; -- QString desktopfp=pUkuiMenuInterface->getDesktopPathByAppName(appname); - QFileInfo fileInfo(desktopfp); - QString desktopfn=fileInfo.fileName(); - setting->beginGroup("application"); -@@ -532,7 +528,6 @@ void RightClickMenu::unfixedFromCommonUseActionTriggerSlot() - - void RightClickMenu::fixToTaskbarActionTriggerSlot() - { -- QString desktopfp=pUkuiMenuInterface->getDesktopPathByAppName(appname); - QDBusInterface iface("com.ukui.panel.desktop", - "/", - "com.ukui.panel.desktop", -@@ -544,7 +539,6 @@ void RightClickMenu::fixToTaskbarActionTriggerSlot() - - void RightClickMenu::unfixedFromTaskbarActionTriggerSlot() - { -- QString desktopfp=pUkuiMenuInterface->getDesktopPathByAppName(appname); - QDBusInterface iface("com.ukui.panel.desktop", - "/", - "com.ukui.panel.desktop", -@@ -555,7 +549,6 @@ void RightClickMenu::unfixedFromTaskbarActionTriggerSlot() - - void RightClickMenu::addToDesktopActionTriggerSlot() - { -- QString desktopfp=pUkuiMenuInterface->getDesktopPathByAppName(appname); - QString path=QStandardPaths::writableLocation(QStandardPaths::DesktopLocation); - QFileInfo fileInfo(desktopfp); - QString desktopfn=fileInfo.fileName(); -@@ -575,7 +568,6 @@ void RightClickMenu::addToDesktopActionTriggerSlot() - void RightClickMenu::uninstallActionTriggerSlot() - { - // QString exec=pUkuiMenuInterface->getAppExec(pUkuiMenuInterface->getDesktopPathByAppName(appname)); -- QString desktopfp=pUkuiMenuInterface->getDesktopPathByAppName(appname); - // QFileInfo fileInfo(exec.split(" ").at(0)); - // bool ret=fileInfo.isAbsolute(); - -@@ -618,7 +610,6 @@ void RightClickMenu::onReadOutput() - - void RightClickMenu::attributeActionTriggerSlot() - { -- QString desktopfp=pUkuiMenuInterface->getDesktopPathByAppName(appname); - char command[100]; - sprintf(command,"ukui-menu-attr %s",desktopfp.toLocal8Bit().data()); - QProcess::startDetached(command); -@@ -628,7 +619,6 @@ void RightClickMenu::attributeActionTriggerSlot() - void RightClickMenu::commonUseDeleteActionTriggerSlot() - { - action_number=8; -- QString desktopfp=pUkuiMenuInterface->getDesktopPathByAppName(appname); - QFileInfo fileInfo(desktopfp); - QString desktopfn=fileInfo.fileName(); - setting->beginGroup("application"); -@@ -700,17 +690,19 @@ void RightClickMenu::otherListActionTriggerSlot() - qDebug()<<"---2---"; - } - --int RightClickMenu::showCommonUseAppBtnMenu(QString appname) -+int RightClickMenu::showCommonUseAppBtnMenu(QString desktopfp) - { -- this->appname=appname; -+ this->desktopfp.clear(); -+ this->desktopfp=desktopfp; - addCommonUseAppBtnAction(); - cuappbtnmenu->exec(QCursor::pos()); - return action_number; - } - --int RightClickMenu::showAppBtnMenu(QString appname) -+int RightClickMenu::showAppBtnMenu(QString desktopfp) - { -- this->appname=appname; -+ this->desktopfp.clear(); -+ this->desktopfp=desktopfp; - addAppBtnAction(); - appbtnmenu->exec(QCursor::pos()); - return action_number; -@@ -723,9 +715,10 @@ int RightClickMenu::showShutdownMenu() - - } - --void RightClickMenu::showOtherMenu(QString appname) -+void RightClickMenu::showOtherMenu(QString desktopfp) - { -- this->appname=appname; -+ this->desktopfp.clear(); -+ this->desktopfp=desktopfp; - addOtherAction(); - othermenu->exec(QCursor::pos()); - } -diff --git a/src/RightClickMenu/rightclickmenu.h b/src/RightClickMenu/rightclickmenu.h -index 4b105a5..2e4c62b 100644 ---- a/src/RightClickMenu/rightclickmenu.h -+++ b/src/RightClickMenu/rightclickmenu.h -@@ -42,13 +42,13 @@ class RightClickMenu: public QWidget - public: - RightClickMenu(QWidget *parent); - virtual ~RightClickMenu(); -- int showCommonUseAppBtnMenu(QString appname); -- int showAppBtnMenu(QString appname); -+ int showCommonUseAppBtnMenu(QString desktopfp); -+ int showAppBtnMenu(QString desktopfp); - int showShutdownMenu(); -- void showOtherMenu(QString appname); -+ void showOtherMenu(QString desktopfp); - - private: -- QString appname; -+ QString desktopfp; - int action_number;//记录执行的action编号 - QSettings* setting=nullptr; - -diff --git a/src/SideBarWidget/sidebarwidget.cpp b/src/SideBarWidget/sidebarwidget.cpp -index 481b84d..ca69135 100644 ---- a/src/SideBarWidget/sidebarwidget.cpp -+++ b/src/SideBarWidget/sidebarwidget.cpp -@@ -360,16 +360,16 @@ void SideBarWidget::otherBtnRightClickSlot() - int index=otherButtonList.indexOf(btn); - QString desktopfp; - if(index==1) -- desktopfp=QString("/usr/share/applications/peony-qt.desktop"); -+ desktopfp=QString("/usr/share/applications/peony-computer.desktop"); - if(index==2) - desktopfp=QString("/usr/share/applications/ukui-control-center.desktop"); -- othermenu->showOtherMenu(pUkuiMenuInterface->getAppName(desktopfp)); -+ othermenu->showOtherMenu(desktopfp); - } - - void SideBarWidget::computerBtnClickedSlot() - { - Q_EMIT sendHideMainWindowSignal(); -- QProcess::startDetached(QString("peony computer:///")); -+ QProcess::startDetached(QString("/usr/bin/peony computer:///")); - } - - void SideBarWidget::controlBtnClickedSlot() -@@ -394,7 +394,7 @@ void SideBarWidget::shutdownBtnClickedSlot() - void SideBarWidget::userIconBtnClickedSlot() - { - Q_EMIT sendHideMainWindowSignal(); -- QProcess::startDetached(QString("ukui-control-center --u")); -+ QProcess::startDetached(QString("ukui-control-center -u")); - } - - void SideBarWidget::userAccountsChanged() -@@ -511,16 +511,6 @@ void SideBarWidget::setMinSidebarBtn(QPushButton* btn) - childwid->setParent(nullptr); - } - } -- -- --// btn->setFixedSize(160,48); --// QLayoutItem* item=btn->layout()->itemAt(1); --// QWidget* wid=item->widget(); --// QLabel* label=qobject_cast(wid); --// int len=label->text().length(); --//// btn->layout()->setContentsMargins(25,0,btn->width()-40-labelicon->width()-letterbtnname->width(),0); --// btn->layout()->setContentsMargins(25,0,btn->width()-40-labelicon->width()-len*14,0); --// btn->layout()->setSpacing(15); - } - - /** -@@ -587,137 +577,14 @@ void SideBarWidget::setMinBtn() - */ - void SideBarWidget::setMaxSidebarBtn(QPushButton *btn) - { --// btn->setFixedSize(60,48); --// btn->layout()->setContentsMargins(0,0,0,0); --// btn->layout()->setSpacing(10); -- - btn->setFixedSize(Style::SideBarBtnWidth,Style::SideBarBtnHeight); --// QLayoutItem* item=btn->layout()->itemAt(1); --// QWidget* wid=item->widget(); --// QLabel* label=qobject_cast(wid); --// int len=label->text().length(); --// qDebug()<layout()->setContentsMargins(15,0,btn->width()-40-labelicon->width()-letterbtnname->width(),0); - btn->layout()->setContentsMargins(Style::SideBarSpaceIconLeft, - 0, - 0, - 0); - btn->layout()->setSpacing(Style::SideBarSpaceIconText); --// btn->setStyleSheet("border:1px solid #ff0000;"); -- - } - --//void SideBarWidget::enterEvent(QEvent *e) --//{ --// this->is_hover=true; --// Q_UNUSED(e); --// if(!is_fullscreen) --// { --// } --// else --// { --//// pEnterAnimation->start(); --// } --//} -- --//void SideBarWidget::leaveEvent(QEvent *e) --//{ --// this->is_hover=false; --// Q_UNUSED(e); --// if(!is_fullscreen) --// { --// } --// else --// { --//// pLeaveAnimation->start(); --// } --//} -- --//void SideBarWidget::animation_finished_slot() --//{ --//} -- --/** -- * 按钮焦点事件过滤 -- */ --//bool SideBarWidget::eventFilter(QObject *watched, QEvent *event) --//{ --// char style[300]; --// sprintf(style,"QToolButton{background-color:%s;border:0px;padding-left:0;}\ --// QToolButton:hover{background-color:%s;}\ --// QToolButton:pressed{background-color:%s;}", SIDEBARWIDGETCOLOR,SIDEBARBTNHOVER,SIDEBARBTNPRESSED); -- --// char pressstyle[200]; --// sprintf(pressstyle,"QToolButton{background-color:%s;border:0px;padding-left:0;}",MAINVIEWWIDGETCOLOR); -- --// if(watched==commonusebtn) --// { --// if(event->type()==QEvent::FocusIn) --// { --// commonusebtn->setStyleSheet(QString::fromLocal8Bit(pressstyle)); --// } --// else if(event->type()==QEvent::FocusOut){ --// commonusebtn->setStyleSheet(QString::fromLocal8Bit(style)); -- --// } --// } --// else if(watched==letterbtn) --// { --// if(event->type()==QEvent::FocusIn) --// { --// letterbtn->setStyleSheet(QString::fromLocal8Bit(pressstyle)); --// } --// else if(event->type()==QEvent::FocusOut){ --// letterbtn->setStyleSheet(QString::fromLocal8Bit(style)); -- --// } --// } --// else if(watched==functionbtn) --// { --// if(event->type()==QEvent::FocusIn) --// { --// functionbtn->setStyleSheet(QString::fromLocal8Bit(pressstyle)); --// } --// else if(event->type()==QEvent::FocusOut){ --// functionbtn->setStyleSheet(QString::fromLocal8Bit(style)); -- --// } -- --// } --// //屏蔽按键 --// if(event->type()==QEvent::KeyPress) --// return true; -- --// return QWidget::eventFilter(watched,event); --//} -- --//void SideBarWidget::mousePressEvent(QMouseEvent *e) --//{ --// if(e->button()==Qt::RightButton) --// { --// if(commonusebtn->hasFocus()) --// { --// if(is_fullscreen) --// Q_EMIT send_fullscreen_commonusebtn_signal(); --// else Q_EMIT sendCommonUseBtnSignal(); -- --// } --// else if(letterbtn->hasFocus()) --// { --// if(is_fullscreen) --// Q_EMIT sendFullScreenLetterBtnSignal(); --// else Q_EMIT sendLetterBtnSignal(); --// } --// else if(functionbtn->hasFocus()) --// { --// if(is_fullscreen) --// Q_EMIT sendFullScreenFunctionBtnSignal(); --// else Q_EMIT sendFunctionBtnSignal(); --// } -- --// } --//} -- - void SideBarWidget::btnGroupClickedSlot(QAbstractButton *btn) - { - char btncolor[300]; -@@ -757,7 +624,6 @@ void SideBarWidget::btnGroupClickedSlot(QAbstractButton *btn) - } - } - else{ --// button->setStyleSheet(QString::fromLocal8Bit(btncolor)); - button->setStyleSheet("background:transparent;"); - } - } -diff --git a/src/Style/style.cpp b/src/Style/style.cpp -index 4a8ae47..3569990 100644 ---- a/src/Style/style.cpp -+++ b/src/Style/style.cpp -@@ -83,13 +83,10 @@ void Style::initWidStyle() - QStringList valstr=value.split(" "); - int fontSize=valstr.at(valstr.count()-1).toInt(); - -- QDBusInterface iface("com.ukui.panel.desktop", -- "/", -- "com.ukui.panel.desktop", -- QDBusConnection::sessionBus()); -+ QGSettings* gsetting=new QGSettings(QString("org.ukui.panel.settings").toLocal8Bit()); -+ int position=gsetting->get("panelposition").toInt(); -+ int panelSize=gsetting->get("panelsize").toInt(); - -- QDBusReply position=iface.call("GetPanelPosition",""); -- QDBusReply panelSize=iface.call("GetPanelSize",""); - if(position==0 || position==1) - { - widthavailable=QApplication::primaryScreen()->geometry().width(); -@@ -229,7 +226,7 @@ void Style::initWidStyle() - SideBarBtnWidth=110; - SideBarBtnHeight=43; - SideBarFontSize=fontSize; -- SideBarIconSize=16; -+ SideBarIconSize=19; - SideBarSpaceIconLeft=14; - SideBarSpaceIconText=6; - SideBarSpaceBetweenItem=16; -@@ -273,7 +270,7 @@ void Style::initWidStyle() - SideBarBtnWidth=110; - SideBarBtnHeight=43; - SideBarFontSize=fontSize; -- SideBarIconSize=16; -+ SideBarIconSize=19; - SideBarSpaceIconLeft=14; - SideBarSpaceIconText=6; - SideBarSpaceBetweenItem=16; -@@ -317,7 +314,7 @@ void Style::initWidStyle() - SideBarBtnWidth=110; - SideBarBtnHeight=43; - SideBarFontSize=fontSize; -- SideBarIconSize=16; -+ SideBarIconSize=19; - SideBarSpaceIconLeft=14; - SideBarSpaceIconText=6; - SideBarSpaceBetweenItem=16; -@@ -361,7 +358,7 @@ void Style::initWidStyle() - SideBarBtnWidth=110; - SideBarBtnHeight=43; - SideBarFontSize=fontSize; -- SideBarIconSize=16; -+ SideBarIconSize=19; - SideBarSpaceIconLeft=14; - SideBarSpaceIconText=6; - SideBarSpaceBetweenItem=16; -@@ -405,7 +402,7 @@ void Style::initWidStyle() - SideBarBtnWidth=110; - SideBarBtnHeight=43; - SideBarFontSize=fontSize; -- SideBarIconSize=16; -+ SideBarIconSize=19; - SideBarSpaceIconLeft=14; - SideBarSpaceIconText=6; - SideBarSpaceBetweenItem=16; -diff --git a/src/UtilityFunction/fullitemdelegate.cpp b/src/UtilityFunction/fullitemdelegate.cpp -index e118a93..29de925 100644 ---- a/src/UtilityFunction/fullitemdelegate.cpp -+++ b/src/UtilityFunction/fullitemdelegate.cpp -@@ -82,14 +82,14 @@ void FullItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opti - icon=QIcon::fromTheme(QString("application-x-desktop")); - QString appname=pUkuiMenuInterface->getAppName(desktopfp); - -- QFont font; -+// QFont font; - QRect iconRect; -- font.setPixelSize(Style::AppListFontSize); -+// font.setPixelSize(Style::AppListFontSize); - iconRect=QRect(rect.x()+Style::AppLeftSpace , - rect.y()+Style::AppTopSpace, - Style::AppListIconSize, - Style::AppListIconSize); -- painter->setFont(font); -+// painter->setFont(font); - icon.paint(painter,iconRect); - if(module==0) - { -diff --git a/src/UtilityFunction/fulllistview.cpp b/src/UtilityFunction/fulllistview.cpp -index acebac2..18b77c2 100644 ---- a/src/UtilityFunction/fulllistview.cpp -+++ b/src/UtilityFunction/fulllistview.cpp -@@ -120,11 +120,10 @@ void FullListView::rightClickedSlot() - QModelIndex index=this->currentIndex(); - QVariant var=listmodel->data(index, Qt::DisplayRole); - QString desktopfp=var.value(); -- QString appname=pUkuiMenuInterface->getAppName(desktopfp); - menu=new RightClickMenu(this); - if(module>0) - { -- int ret=menu->showAppBtnMenu(appname); -+ int ret=menu->showAppBtnMenu(desktopfp); - if(ret==1 || ret==2) - { - Q_EMIT sendFixedOrUnfixedSignal(); -@@ -135,7 +134,7 @@ void FullListView::rightClickedSlot() - Q_EMIT sendHideMainWindowSignal(); - } - else{ -- int ret=menu->showCommonUseAppBtnMenu(appname); -+ int ret=menu->showCommonUseAppBtnMenu(desktopfp); - if(ret==1 || ret==2) - { - this->setCurrentIndex(index); -diff --git a/src/UtilityFunction/functionclassifybutton.cpp b/src/UtilityFunction/functionclassifybutton.cpp -index 03090c1..0bec80a 100644 ---- a/src/UtilityFunction/functionclassifybutton.cpp -+++ b/src/UtilityFunction/functionclassifybutton.cpp -@@ -62,9 +62,9 @@ FunctionClassifyButton::FunctionClassifyButton(QWidget *parent, - - textlabel=new QLabel(this); - textlabel->setText(this->text); -- QFont font; -- font.setPixelSize(textSize); -- textlabel->setFont(font); -+// QFont font; -+// font.setPixelSize(textSize); -+// textlabel->setFont(font); - if(is_fullscreen) - textlabel->setStyleSheet("background:transparent; color:rgba(255, 255, 255, 50%);"); - else -@@ -105,9 +105,9 @@ void FunctionClassifyButton::enterEvent(QEvent *e) - svgRender->render(&p); - iconlabel->setPixmap(*pixmap); - iconlabel->setFixedSize(pixmap->size()); -- QFont font; -- font.setPixelSize(textSize); -- textlabel->setFont(font); -+// QFont font; -+// font.setPixelSize(textSize); -+// textlabel->setFont(font); - if(enabled) - textlabel->setStyleSheet("background:transparent;color:rgba(255, 255, 255);"); - textlabel->adjustSize(); -@@ -124,9 +124,9 @@ void FunctionClassifyButton::leaveEvent(QEvent *e) - this->setFixedSize(width,height); - svgRender->load(piconstr); - pixmap=new QPixmap(iconSize,iconSize); -- QFont font; -- font.setPixelSize(textSize); -- textlabel->setFont(font); -+// QFont font; -+// font.setPixelSize(textSize); -+// textlabel->setFont(font); - - } - else -@@ -134,9 +134,9 @@ void FunctionClassifyButton::leaveEvent(QEvent *e) - this->setFixedSize(width,height); - svgRender->load(iconstr); - pixmap=new QPixmap(iconSize,iconSize); -- QFont font; -- font.setPixelSize(textSize); -- textlabel->setFont(font); -+// QFont font; -+// font.setPixelSize(textSize); -+// textlabel->setFont(font); - - } - // pixmap=new QPixmap(iconSize,iconSize); -@@ -175,9 +175,9 @@ void FunctionClassifyButton::mousePressEvent(QMouseEvent *event) - svgRender->render(&p); - iconlabel->setPixmap(*pixmap); - iconlabel->setFixedSize(pixmap->size()); -- QFont font; -- font.setPixelSize(textSize); -- textlabel->setFont(font); -+// QFont font; -+// font.setPixelSize(textSize); -+// textlabel->setFont(font); - textlabel->setStyleSheet("background:transparent;color:#ffffff;"); - textlabel->adjustSize(); - is_pressed=true; -@@ -203,9 +203,9 @@ void FunctionClassifyButton::mouseReleaseEvent(QMouseEvent *event) - svgRender->render(&p); - iconlabel->setPixmap(*pixmap); - iconlabel->setFixedSize(pixmap->size()); -- QFont font; -- font.setPixelSize(textSize); -- textlabel->setFont(font); -+// QFont font; -+// font.setPixelSize(textSize); -+// textlabel->setFont(font); - textlabel->setStyleSheet("background:transparent;color:#ffffff;"); - textlabel->adjustSize(); - Q_EMIT buttonClicked(this); -diff --git a/src/UtilityFunction/itemdelegate.cpp b/src/UtilityFunction/itemdelegate.cpp -index 57d33b0..4f9f0d1 100644 ---- a/src/UtilityFunction/itemdelegate.cpp -+++ b/src/UtilityFunction/itemdelegate.cpp -@@ -59,11 +59,11 @@ void ItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, - path.quadTo(rect.topRight(), rect.topRight() + QPointF(-radius, -0)); - - -- QFont font; -+// QFont font; - // font.setFamily("Microsoft YaHei"); - -- font.setPixelSize(Style::AppListFontSize); -- painter->setFont(font); -+// font.setPixelSize(Style::AppListFontSize); -+// painter->setFont(font); - - // QIcon icon=index.model()->data(index,Qt::DecorationRole).value(); - QStringList strlist=index.model()->data(index,Qt::DisplayRole).toStringList(); -diff --git a/src/UtilityFunction/listview.cpp b/src/UtilityFunction/listview.cpp -index 0443d70..a0d4d1c 100644 ---- a/src/UtilityFunction/listview.cpp -+++ b/src/UtilityFunction/listview.cpp -@@ -117,8 +117,7 @@ void ListView::rightClickedSlot() - { - if(strlist.at(1).toInt()==1) - { -- QString appname=pUkuiMenuInterface->getAppName(strlist.at(0)); -- int ret=menu->showAppBtnMenu(appname); -+ int ret=menu->showAppBtnMenu(strlist.at(0)); - if(ret==1 || ret==2) - Q_EMIT sendFixedOrUnfixedSignal(); - if(ret==6) -@@ -128,8 +127,7 @@ void ListView::rightClickedSlot() - } - } - else{ -- QString appname=pUkuiMenuInterface->getAppName(strlist.at(0)); -- int ret=menu->showCommonUseAppBtnMenu(appname); -+ int ret=menu->showCommonUseAppBtnMenu(strlist.at(0)); - if(ret==1 || ret==2) - { - this->setCurrentIndex(index); -@@ -173,7 +171,6 @@ void ListView::rightClickedSlot() - - this->selectionModel()->clear(); - } -- - } - - void ListView::enterEvent(QEvent *e) -diff --git a/src/UtilityFunction/pushbutton.cpp b/src/UtilityFunction/pushbutton.cpp -index 3aff34b..464d729 100644 ---- a/src/UtilityFunction/pushbutton.cpp -+++ b/src/UtilityFunction/pushbutton.cpp -@@ -47,10 +47,10 @@ void PushButton::initAppBtn() - - char style[100]; - sprintf(style,"color:#ffffff;"); -- QFont font; -- font.setPixelSize(Style::LeftFontSize); -+// QFont font; -+// font.setPixelSize(Style::LeftFontSize); - QLabel* textlabel=new QLabel(this); -- textlabel->setFont(font); -+// textlabel->setFont(font); - textlabel->setAlignment(Qt::AlignCenter); - textlabel->setStyleSheet(style); - textlabel->setText(name); --- -2.33.0 - diff --git a/0003-Fixed-right-click-exception-popover-problem.patch b/0003-Fixed-right-click-exception-popover-problem.patch deleted file mode 100644 index 7850e22..0000000 --- a/0003-Fixed-right-click-exception-popover-problem.patch +++ /dev/null @@ -1,1011 +0,0 @@ -From b4ae3b3b79baab4d8b449d46ceb79ed84ac31a4b Mon Sep 17 00:00:00 2001 -From: liuhao-startmenu -Date: Thu, 2 Apr 2020 20:04:58 +0800 -Subject: [PATCH] Fixed right-click exception popover problem - ---- - data/img/mainviewwidget/lock-fs.svg | 35 +------- - data/img/mainviewwidget/lock.svg | 32 +------- - src/CommonUseWidget/commonusewidget.cpp | 77 +++++++++--------- - src/CommonUseWidget/commonusewidget.h | 2 +- - src/CommonUseWidget/fullcommonusewidget.cpp | 74 +++++++++-------- - src/CommonUseWidget/fullcommonusewidget.h | 1 + - src/Interface/ukuimenuinterface.cpp | 33 ++++---- - src/MainViewWidget/mainviewwidget.cpp | 4 + - src/MainWindow/mainwindow.cpp | 22 +++-- - src/MainWindow/mainwindow.h | 2 +- - src/MainWindow/mainwindow.ui | 28 ++----- - src/RightClickMenu/rightclickmenu.cpp | 44 ++++++---- - src/RightClickMenu/rightclickmenu.h | 1 + - src/SideBarWidget/sidebarwidget.cpp | 24 ------ - src/UtilityFunction/fullitemdelegate.cpp | 10 +-- - src/UtilityFunction/fulllistview.cpp | 89 ++++++++------------- - src/UtilityFunction/fulllistview.h | 6 -- - src/UtilityFunction/itemdelegate.cpp | 9 ++- - src/UtilityFunction/listview.cpp | 55 +++++++------ - 19 files changed, 218 insertions(+), 330 deletions(-) - -diff --git a/data/img/mainviewwidget/lock-fs.svg b/data/img/mainviewwidget/lock-fs.svg -index 9f1b445..71f3141 100644 ---- a/data/img/mainviewwidget/lock-fs.svg -+++ b/data/img/mainviewwidget/lock-fs.svg -@@ -1,34 +1 @@ -- -- -- -- --画板 1 -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+彩色 -\ No newline at end of file -diff --git a/data/img/mainviewwidget/lock.svg b/data/img/mainviewwidget/lock.svg -index 0ceb0d3..6b3d4bf 100644 ---- a/data/img/mainviewwidget/lock.svg -+++ b/data/img/mainviewwidget/lock.svg -@@ -1,31 +1 @@ -- -- -- -- --画板 1 -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+单色 -\ No newline at end of file -diff --git a/src/CommonUseWidget/commonusewidget.cpp b/src/CommonUseWidget/commonusewidget.cpp -index d276d82..b216247 100644 ---- a/src/CommonUseWidget/commonusewidget.cpp -+++ b/src/CommonUseWidget/commonusewidget.cpp -@@ -79,29 +79,8 @@ void CommonUseWidget::initAppListWidget() - */ - void CommonUseWidget::fillAppList() - { -- QStringList keys; -- keys.clear(); -- setting->beginGroup("application"); -- keys=setting->childKeys(); -- QStringList applist; -- applist.clear(); -- for(int i=0;ivalue(keys.at(i)).toInt(); -- if(val==2 || val==0) -- applist.append(keys.at(i)); -- } -- -- data.clear(); -- for(int i=0;igetDesktopPathByAppName(applist.at(i)); -- QString desktopfp=QString("/usr/share/applications/"+applist.at(i)); -- data.append(QStringList()<addData(data); -- setting->endGroup(); - } - - /** -@@ -126,30 +105,50 @@ void CommonUseWidget::execApplication(QStringList arg) - */ - void CommonUseWidget::updateListViewSlot() - { -- QStringList keys; -- keys.clear(); -+ getCommonUseAppList(); -+ listview->updateData(data); -+} -+ -+void CommonUseWidget::getCommonUseAppList() -+{ -+// QStringList lockdesktopfnList; -+ QStringList desktopfnList; -+// lockdesktopfnList.clear(); -+ desktopfnList.clear(); -+ setting->beginGroup("lockapplication"); -+ QStringList lockdesktopfnList=setting->allKeys(); -+ for(int i=0;ivalue(lockdesktopfnList.at(j)).toInt(); -+ int value_2=setting->value(lockdesktopfnList.at(j+1)).toInt(); -+ if(value_1 > value_2) -+ { -+ QString tmp=lockdesktopfnList.at(j); -+ lockdesktopfnList.replace(j,lockdesktopfnList.at(j+1)); -+ lockdesktopfnList.replace(j+1,tmp); -+ -+ } -+ } -+ setting->endGroup(); - setting->beginGroup("application"); -- keys=setting->childKeys(); -- QStringList applist; -- applist.clear(); -- for(int i=0;ichildKeys()) - { -- int val=setting->value(keys.at(i)).toInt(); -- if(val==2 || val==0) -- applist.append(keys.at(i)); -+ if(setting->value(desktopfn)==2) -+ desktopfnList.append(desktopfn); - } -- -+ setting->endGroup(); - data.clear(); -- for(int i=0;igetDesktopPathByAppName(applist.at(i)); -- QString desktopfp=QString("/usr/share/applications/"+applist.at(i)); -+ QString desktopfp=QString("/usr/share/applications/"+desktopfn); -+ data.append(QStringList()<updateData(data); -- setting->endGroup(); -- - } - - void CommonUseWidget::widgetMakeZero() -diff --git a/src/CommonUseWidget/commonusewidget.h b/src/CommonUseWidget/commonusewidget.h -index 3009327..84dedcd 100644 ---- a/src/CommonUseWidget/commonusewidget.h -+++ b/src/CommonUseWidget/commonusewidget.h -@@ -65,7 +65,7 @@ protected: - void initWidget(); - void initAppListWidget();//初始化应用列表界面 - void fillAppList();//填充应用列表 -- -+ void getCommonUseAppList();//获取常用应用列表 - - private Q_SLOTS: - void updateListViewSlot();//更新应用列表槽函数 -diff --git a/src/CommonUseWidget/fullcommonusewidget.cpp b/src/CommonUseWidget/fullcommonusewidget.cpp -index 3d91c6b..d6bb171 100644 ---- a/src/CommonUseWidget/fullcommonusewidget.cpp -+++ b/src/CommonUseWidget/fullcommonusewidget.cpp -@@ -69,29 +69,8 @@ void FullCommonUseWidget::initAppListWidget() - - void FullCommonUseWidget::fillAppList() - { -- QStringList keys; -- keys.clear(); -- setting->beginGroup("application"); -- keys=setting->childKeys(); -- QStringList applist; -- applist.clear(); -- for(int i=0;ivalue(keys.at(i)).toInt(); -- if(val==2 || val==0) -- applist.append(keys.at(i)); -- } -- -- data.clear(); -- for(int i=0;igetDesktopPathByAppName(applist.at(i)); -- QString desktopfp=QString("/usr/share/applications/"+applist.at(i)); -- data.append(desktopfp); -- } -- -+ getCommonUseAppList(); - listview->addData(data); -- setting->endGroup(); - } - - /** -@@ -115,29 +94,48 @@ void FullCommonUseWidget::execApplication(QString appname) - */ - void FullCommonUseWidget::updateListViewSlot() - { -- QStringList keys; -- keys.clear(); -+ getCommonUseAppList(); -+ listview->updateData(data); -+} -+ -+void FullCommonUseWidget::getCommonUseAppList() -+{ -+ QStringList desktopfnList; -+ desktopfnList.clear(); -+ setting->beginGroup("lockapplication"); -+ QStringList lockdesktopfnList=setting->allKeys(); -+ for(int i=0;ivalue(lockdesktopfnList.at(j)).toInt(); -+ int value_2=setting->value(lockdesktopfnList.at(j+1)).toInt(); -+ if(value_1 > value_2) -+ { -+ QString tmp=lockdesktopfnList.at(j); -+ lockdesktopfnList.replace(j,lockdesktopfnList.at(j+1)); -+ lockdesktopfnList.replace(j+1,tmp); -+ -+ } -+ } -+ setting->endGroup(); - setting->beginGroup("application"); -- keys=setting->childKeys(); -- QStringList applist; -- applist.clear(); -- for(int i=0;ichildKeys()) - { -- int val=setting->value(keys.at(i)).toInt(); -- if(val==2 || val==0) -- applist.append(keys.at(i)); -+ if(setting->value(desktopfn)==2) -+ desktopfnList.append(desktopfn); - } -- -+ setting->endGroup(); - data.clear(); -- for(int i=0;igetDesktopPathByAppName(applist.at(i)); -- QString desktopfp=QString("/usr/share/applications/"+applist.at(i)); -+ QString desktopfp=QString("/usr/share/applications/"+desktopfn); -+ data.append(desktopfp); -+ } -+ Q_FOREACH(QString desktopfn,desktopfnList) -+ { -+ QString desktopfp=QString("/usr/share/applications/"+desktopfn); - data.append(desktopfp); - } -- -- listview->updateData(data); -- setting->endGroup(); - } - - void FullCommonUseWidget::widgetMakeZero() -diff --git a/src/CommonUseWidget/fullcommonusewidget.h b/src/CommonUseWidget/fullcommonusewidget.h -index ae5eca4..c5a7d4e 100644 ---- a/src/CommonUseWidget/fullcommonusewidget.h -+++ b/src/CommonUseWidget/fullcommonusewidget.h -@@ -67,6 +67,7 @@ protected: - void initWidget(); - void initAppListWidget();//初始化应用列表界面 - void fillAppList();//填充应用列表 -+ void getCommonUseAppList();//获取常用应用列表 - - private Q_SLOTS: - void updateListViewSlot();//更新应用列表槽函数 -diff --git a/src/Interface/ukuimenuinterface.cpp b/src/Interface/ukuimenuinterface.cpp -index 577873b..3ebb8cf 100644 ---- a/src/Interface/ukuimenuinterface.cpp -+++ b/src/Interface/ukuimenuinterface.cpp -@@ -273,21 +273,24 @@ QString UkuiMenuInterface::getAppName(QString desktopfp) - char* filepath=fpbyte.data(); - g_key_file_load_from_file(keyfile,filepath,flags,error); - -- QString namestr; -- QLocale cn; -- QString language=cn.languageToString(cn.language()); -- if(QString::compare(language,"Chinese")==0) -- { -- char* name; -- name=g_key_file_get_locale_string(keyfile,"Desktop Entry","Name[zh_CN]", nullptr, nullptr); -- if(QString::fromLocal8Bit(name).isEmpty()) -- name=g_key_file_get_locale_string(keyfile,"Desktop Entry","Name", nullptr, nullptr); -- namestr=QString::fromLocal8Bit(name); -- } -- else { -- char* name=g_key_file_get_locale_string(keyfile,"Desktop Entry","Name", nullptr, nullptr); -- namestr=QString::fromLocal8Bit(name); -- } -+ char* name=g_key_file_get_locale_string(keyfile,"Desktop Entry","Name", nullptr, nullptr); -+ QString namestr=QString::fromLocal8Bit(name); -+ -+// QString namestr; -+// QLocale cn; -+// QString language=cn.languageToString(cn.language()); -+// if(QString::compare(language,"Chinese")==0) -+// { -+// char* name; -+// name=g_key_file_get_locale_string(keyfile,"Desktop Entry","Name[zh_CN]", nullptr, nullptr); -+// if(QString::fromLocal8Bit(name).isEmpty()) -+// name=g_key_file_get_locale_string(keyfile,"Desktop Entry","Name", nullptr, nullptr); -+// namestr=QString::fromLocal8Bit(name); -+// } -+// else { -+// char* name=g_key_file_get_locale_string(keyfile,"Desktop Entry","Name", nullptr, nullptr); -+// namestr=QString::fromLocal8Bit(name); -+// } - - g_key_file_free(keyfile); - return namestr; -diff --git a/src/MainViewWidget/mainviewwidget.cpp b/src/MainViewWidget/mainviewwidget.cpp -index 8a4f434..ed354fa 100644 ---- a/src/MainViewWidget/mainviewwidget.cpp -+++ b/src/MainViewWidget/mainviewwidget.cpp -@@ -613,6 +613,10 @@ void MainViewWidget::directoryChangedSlot() - QString desktopfp=UkuiMenuInterface::appInfoVector.at(i).at(0); - QFileInfo fileInfo(desktopfp); - QString desktopfn=fileInfo.fileName(); -+ setting->beginGroup("lockapplication"); -+ setting->remove(desktopfn); -+ setting->sync(); -+ setting->endGroup(); - setting->beginGroup("application"); - setting->remove(desktopfn); - setting->sync(); -diff --git a/src/MainWindow/mainwindow.cpp b/src/MainWindow/mainwindow.cpp -index 0db0ffa..e03ddcf 100644 ---- a/src/MainWindow/mainwindow.cpp -+++ b/src/MainWindow/mainwindow.cpp -@@ -101,9 +101,8 @@ void MainWindow::initMainWindow() - // path.addRoundedRect(rect, 6, 6); - // setProperty("blurRegion", QRegion(path.toFillPolygon().toPolygon())); - -- ui->mainToolBar->hide(); -- ui->menuBar->hide(); -- ui->statusBar->hide(); -+ ui->menubar->hide(); -+ ui->statusbar->hide(); - this->setSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum); - // this->setMinimumSize(390+20+2,532+20+2); - // this->setContentsMargins(1,21,21,1); -@@ -111,7 +110,7 @@ void MainWindow::initMainWindow() - this->setContentsMargins(0,0,0,0); - - frame=new QFrame(this); -- sidebarwid=new SideBarWidget(); -+ sidebarwid=new SideBarWidget(this); - mainviewwid=new MainViewWidget(this); - - this->setCentralWidget(frame); -@@ -168,10 +167,10 @@ void MainWindow::initMainWindow() - /** - * 添加阴影 - */ --void MainWindow::paintEvent(QPaintEvent *) --{ -- if(!is_fullscreen) -- { -+//void MainWindow::paintEvent(QPaintEvent *) -+//{ -+// if(!is_fullscreen) -+// { - // QPainter painter(this); - // const qreal radius =6; - -@@ -232,8 +231,8 @@ void MainWindow::paintEvent(QPaintEvent *) - // painter.setBrush(Qt::NoBrush); - // painter.drawPath(path); - // } -- } --} -+// } -+//} - - /** - * 显示全屏窗口 -@@ -300,7 +299,7 @@ void MainWindow::showDefaultWidget() - mainviewwid->loadMinMainView(); - //插入分割线 - mainlayout->insertWidget(1,line); -- this->repaint(); -+// this->repaint(); - frame->setStyleSheet(style); - } - -@@ -401,5 +400,4 @@ void MainWindow::keyPressEvent(QKeyEvent *e) - mainviewwid->setLineEditFocus(e->text()); - } - } -- - } -diff --git a/src/MainWindow/mainwindow.h b/src/MainWindow/mainwindow.h -index 3c48c5b..8e2902b 100644 ---- a/src/MainWindow/mainwindow.h -+++ b/src/MainWindow/mainwindow.h -@@ -72,7 +72,7 @@ private: - protected: - void initMainWindow(); - bool event(QEvent *event);//鼠标点击窗口外部事件 -- void paintEvent(QPaintEvent*);//添加阴影 -+// void paintEvent(QPaintEvent*);//添加阴影 - void keyPressEvent(QKeyEvent* e);//查询框响应键盘事件 - - private Q_SLOTS: -diff --git a/src/MainWindow/mainwindow.ui b/src/MainWindow/mainwindow.ui -index 8144409..b232854 100644 ---- a/src/MainWindow/mainwindow.ui -+++ b/src/MainWindow/mainwindow.ui -@@ -6,35 +6,17 @@ - - 0 - 0 -- 400 -- 300 -+ 800 -+ 600 - - - - MainWindow - -- -- -- -- -- 0 -- 0 -- 400 -- 29 -- -- -- -- -- -- TopToolBarArea -- -- -- false -- -- -- -+ -+ -+ - -- - - - -diff --git a/src/RightClickMenu/rightclickmenu.cpp b/src/RightClickMenu/rightclickmenu.cpp -index 165a9d6..f21459e 100644 ---- a/src/RightClickMenu/rightclickmenu.cpp -+++ b/src/RightClickMenu/rightclickmenu.cpp -@@ -171,24 +171,24 @@ RightClickMenu::~RightClickMenu() - //常用应用按钮右键菜单 - void RightClickMenu::addCommonUseAppBtnAction() - { -- setting->beginGroup("application"); -+ setting->beginGroup("lockapplication"); - QFileInfo fileInfo(desktopfp); - QString desktopfn=fileInfo.fileName(); -- if(!setting->contains(desktopfn) || setting->value(desktopfn).toInt()>0) -+ if(!setting->contains(desktopfn)) - { - initWidgetAction(CuFix2CommonUseWid,":/data/img/mainviewwidget/fixed.svg",tr("Pin to common")); - CuFix2CommonUseAction->setDefaultWidget(CuFix2CommonUseWid); - cuappbtnmenu->addAction(CuFix2CommonUseAction); - connect(CuFix2CommonUseAction, SIGNAL(triggered()),this,SLOT(fixToCommonUseActionTriggerSlot())); - } -- -- if(setting->contains(desktopfn) && setting->value(desktopfn).toInt()==0) -+ else - { - initWidgetAction(CuUnfixed4CommonUseWid,":/data/img/mainviewwidget/unfixed.svg",tr("Unpin from common")); - CuUnfixed4CommonUseAction->setDefaultWidget(CuUnfixed4CommonUseWid); - cuappbtnmenu->addAction(CuUnfixed4CommonUseAction); - connect(CuUnfixed4CommonUseAction, SIGNAL(triggered()),this,SLOT(unfixedFromCommonUseActionTriggerSlot())); - } -+ setting->endGroup(); - - cuappbtnmenu->addSeparator(); - -@@ -224,11 +224,13 @@ void RightClickMenu::addCommonUseAppBtnAction() - cuappbtnmenu->addAction(separatorAction_1); - // cuappbtnmenu->addSeparator(); - -+ - initWidgetAction(CuDeleteWid,"",tr("Remove from list")); - CuDeleteAction->setDefaultWidget(CuDeleteWid); - cuappbtnmenu->addAction(CuDeleteAction); - connect(CuDeleteAction,SIGNAL(triggered()),this,SLOT(commonUseDeleteActionTriggerSlot())); -- if(setting->contains(desktopfn) && setting->value(desktopfn).toInt()==0) -+ setting->beginGroup("lockapplication"); -+ if(setting->contains(desktopfn)) - { - QLayoutItem* item=CuDeleteWid->layout()->itemAt(0); - QWidget* wid=item->widget(); -@@ -236,6 +238,7 @@ void RightClickMenu::addCommonUseAppBtnAction() - label->setStyleSheet("QLabel{background:transparent;border:0px;color:#4Dffffff;font-size:14px;}"); - CuDeleteAction->setDisabled(true); - } -+ setting->endGroup(); - - cuappbtnmenu->addSeparator(); - -@@ -243,6 +246,7 @@ void RightClickMenu::addCommonUseAppBtnAction() - CuDeleteAllAction->setDefaultWidget(CuDeleteAllWid); - cuappbtnmenu->addAction(CuDeleteAllAction); - connect(CuDeleteAllAction,SIGNAL(triggered()),this,SLOT(commonUseDeleteAllActionTriggerSlot())); -+ setting->beginGroup("application"); - QStringList keys=setting->childKeys(); - int count; - for(count=0;countsetStyleSheet("QLabel{background:transparent;border:0px;color:#4Dffffff;font-size:14px;}"); - CuDeleteAllAction->setDisabled(true); - } -+ setting->endGroup(); - - // cuappbtnmenu->addSeparator(); - cuappbtnmenu->addAction(separatorAction_2); -@@ -280,26 +285,22 @@ void RightClickMenu::addCommonUseAppBtnAction() - cuappbtnmenu->setAttribute(Qt::WA_TranslucentBackground); - // cuappbtnmenu->setWindowOpacity(RightClickMenuOpacity); - cuappbtnmenu->setStyleSheet(style); -- -- setting->endGroup(); - } - - //普通应用按钮右键菜单 - void RightClickMenu::addAppBtnAction() - { -- -- setting->beginGroup("application"); -+ setting->beginGroup("lockapplication"); - QFileInfo fileInfo(desktopfp); - QString desktopfn=fileInfo.fileName(); -- if(!setting->contains(desktopfn) || setting->value(desktopfn).toInt()>0) -+ if(!setting->contains(desktopfn)) - { - initWidgetAction(Fix2CommonUseWid,":/data/img/mainviewwidget/fixed.svg",tr("Pin to common")); - Fix2CommonUseAction->setDefaultWidget(Fix2CommonUseWid); - appbtnmenu->addAction(Fix2CommonUseAction); - connect(Fix2CommonUseAction, SIGNAL(triggered()),this,SLOT(fixToCommonUseActionTriggerSlot())); - } -- -- if(setting->contains(desktopfn) && setting->value(desktopfn).toInt()==0) -+ else - { - initWidgetAction(Unfixed4CommonUseWid,":/data/img/mainviewwidget/unfixed.svg",tr("Unpin from common")); - Unfixed4CommonUseAction->setDefaultWidget(Unfixed4CommonUseWid); -@@ -499,8 +500,12 @@ void RightClickMenu::fixToCommonUseActionTriggerSlot() - action_number=1; - QFileInfo fileInfo(desktopfp); - QString desktopfn=fileInfo.fileName(); -+ setting->beginGroup("lockapplication"); -+ setting->setValue(desktopfn,setting->allKeys().size()); -+ setting->sync(); -+ setting->endGroup(); - setting->beginGroup("application"); -- setting->setValue(desktopfn,0); -+ setting->remove(desktopfn); - setting->sync(); - setting->endGroup(); - setting->beginGroup("datetime"); -@@ -514,6 +519,17 @@ void RightClickMenu::unfixedFromCommonUseActionTriggerSlot() - action_number=2; - QFileInfo fileInfo(desktopfp); - QString desktopfn=fileInfo.fileName(); -+ setting->beginGroup("lockapplication"); -+ Q_FOREACH(QString desktop,setting->allKeys()) -+ { -+ if(setting->value(desktop).toInt() > setting->value(desktopfn).toInt()) -+ { -+ setting->setValue(desktop,setting->value(desktop).toInt()-1); -+ } -+ } -+ setting->remove(desktopfn); -+ setting->sync(); -+ setting->endGroup(); - setting->beginGroup("application"); - setting->setValue(desktopfn,2); - setting->sync(); -@@ -722,5 +738,3 @@ void RightClickMenu::showOtherMenu(QString desktopfp) - addOtherAction(); - othermenu->exec(QCursor::pos()); - } -- -- -diff --git a/src/RightClickMenu/rightclickmenu.h b/src/RightClickMenu/rightclickmenu.h -index 2e4c62b..2fc790a 100644 ---- a/src/RightClickMenu/rightclickmenu.h -+++ b/src/RightClickMenu/rightclickmenu.h -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include - #include "src/Interface/ukuimenuinterface.h" - #include "src/Style/style.h" - -diff --git a/src/SideBarWidget/sidebarwidget.cpp b/src/SideBarWidget/sidebarwidget.cpp -index ca69135..c1e0e61 100644 ---- a/src/SideBarWidget/sidebarwidget.cpp -+++ b/src/SideBarWidget/sidebarwidget.cpp -@@ -54,30 +54,6 @@ void SideBarWidget::initWidget() - addSidebarBtn(); - loadMinSidebar(); - -- //全屏侧边栏悬浮动画 --// pEnterAnimation=new QPropertyAnimation; --// pEnterAnimation->setTargetObject(pMainWidget); --// pEnterAnimation->setPropertyName("pos"); --// pEnterAnimation->setDuration(500); --// pAnimation->setStartValue(QRect(390,QApplication::desktop()->availableGeometry().height()-532,390,532)); --// pAnimation->setEndValue(QRect(490,QApplication::desktop()->availableGeometry().height()-532,490,532)); --// pAnimation->setStartValue(QRect(100,0, --// 60,QApplication::desktop()->availableGeometry().height())); --// pAnimation->setEndValue(QRect(0,0, --// 160,QApplication::desktop()->availableGeometry().height())); --// pEnterAnimation->setStartValue(QPoint(100,0)); --// pEnterAnimation->setEndValue(QPoint(0,0)); --// pEnterAnimation->setEasingCurve(QEasingCurve::Linear); --// connect(pEnterAnimation,SIGNAL(finished()),this,SLOT(animation_finished_slot())); -- --// pLeaveAnimation=new QPropertyAnimation; --// pLeaveAnimation->setTargetObject(pMainWidget); --// pLeaveAnimation->setPropertyName("pos"); --// pLeaveAnimation->setDuration(500); --// pLeaveAnimation->setStartValue(QPoint(0,0)); --// pLeaveAnimation->setEndValue(QPoint(100,0)); --// pLeaveAnimation->setEasingCurve(QEasingCurve::Linear); -- - pUkuiMenuInterface=new UkuiMenuInterface; - - } -diff --git a/src/UtilityFunction/fullitemdelegate.cpp b/src/UtilityFunction/fullitemdelegate.cpp -index 29de925..ab8ae81 100644 ---- a/src/UtilityFunction/fullitemdelegate.cpp -+++ b/src/UtilityFunction/fullitemdelegate.cpp -@@ -93,18 +93,16 @@ void FullItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opti - icon.paint(painter,iconRect); - if(module==0) - { -- setting->beginGroup("application"); -+ setting->beginGroup("lockapplication"); - QFileInfo fileInfo(desktopfp); - QString desktopfn=fileInfo.fileName(); -- if(setting->value(desktopfn).toInt()==0) -+ if(setting->contains(desktopfn)) - { - QIcon icon(QString(":/data/img/mainviewwidget/lock-fs.svg")); - icon.paint(painter,QRect(iconRect.topRight().x()-14,iconRect.topRight().y()-2,16,16)); --// painter->drawImage(QRect(iconRect.topRight().x()-8,iconRect.topRight().y(),16,16), --// icon.pixmap(icon.actualSize(QSize(16, 16))).toImage()); -+// icon.paint(painter,QRect(rect.topRight().x()-18,rect.topRight().y()+6,12,12)); - } - setting->endGroup(); -- - } - - painter->setPen(QPen(Qt::white)); -@@ -116,10 +114,8 @@ void FullItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opti - rect.height()-iconRect.height()-Style::AppSpaceBetweenIconText); - QFontMetrics fm=painter->fontMetrics(); - QString appnameElidedText=fm.elidedText(appname,Qt::ElideRight,rect.width(),Qt::TextShowMnemonic); --// painter->drawText(textRect,Qt::TextWordWrap |Qt::AlignHCenter | Qt::AlignTop,appname); - painter->drawText(textRect,Qt::AlignHCenter |Qt::AlignTop,appnameElidedText); - --// painter->setRenderHint(QPainter::Antialiasing); - if(option.state & QStyle::State_MouseOver) - { - // painter->setPen(QPen(Qt::NoPen)); -diff --git a/src/UtilityFunction/fulllistview.cpp b/src/UtilityFunction/fulllistview.cpp -index 18b77c2..75845c7 100644 ---- a/src/UtilityFunction/fulllistview.cpp -+++ b/src/UtilityFunction/fulllistview.cpp -@@ -73,7 +73,6 @@ void FullListView::initWidget() - this->setGridSize(QSize(Style::AppListGridSizeWidth,Style::AppListGridSizeWidth)); - connect(this,SIGNAL(customContextMenuRequested(QPoint)),this,SLOT(rightClickedSlot())); - connect(this,SIGNAL(clicked(QModelIndex)),this,SLOT(onClicked(QModelIndex))); -- connect(this,SIGNAL(entered(QModelIndex)),this,SLOT(showToolTip(QModelIndex))); - } - - void FullListView::addData(QStringList data) -@@ -135,37 +134,49 @@ void FullListView::rightClickedSlot() - } - else{ - int ret=menu->showCommonUseAppBtnMenu(desktopfp); -- if(ret==1 || ret==2) -+ if(ret==1) - { - this->setCurrentIndex(index); -+ listmodel->removeRow(index.row()); -+ setting->beginGroup("lockapplication"); -+ QStandardItem* item=new QStandardItem; -+ item->setData(QVariant::fromValue(desktopfp),Qt::DisplayRole); -+ listmodel->insertRow(setting->childKeys().size()-1,item); -+ setting->endGroup(); -+ Q_EMIT sendUpdateAppListSignal(); -+ } -+ if(ret==2) -+ { -+ listmodel->removeRow(index.row()); -+ setting->beginGroup("lockapplication"); -+ QStandardItem* item=new QStandardItem; -+ item->setData(QVariant::fromValue(desktopfp),Qt::DisplayRole); -+ listmodel->insertRow(setting->childKeys().size(),item); -+ setting->endGroup(); -+ Q_EMIT sendUpdateAppListSignal(); - } - - if(ret==7) - Q_EMIT sendHideMainWindowSignal(); - -- if(ret==8 || ret==9) -+ if(ret==8) - { -- QStringList keys; -- keys.clear(); -- setting->beginGroup("application"); -- keys=setting->childKeys(); -- QStringList applist; -- applist.clear(); -- for(int i=0;ivalue(keys.at(i)).toInt(); -- if(val==2 || val==0) -- applist.append(keys.at(i)); -- } -+ listmodel->removeRow(index.row()); -+ Q_EMIT sendUpdateAppListSignal(); -+ } - -- data.clear(); -- for(int i=0;ibeginGroup("lockapplication"); -+ for(int i=listmodel->rowCount()-1;i>=0;i--) - { --// QString desktopfp=pUkuiMenuInterface->getDesktopPathByAppName(applist.at(i)); -- QString desktopfp=QString("/usr/share/applications/"+applist.at(i)); -- data.append(desktopfp); -+ QVariant var=listmodel->index(i,0).data(Qt::DisplayRole); -+ QString desktopfp=var.value(); -+ QFileInfo fileInfo(desktopfp); -+ QString desktopfn=fileInfo.fileName(); -+ if(!setting->contains(desktopfn)) -+ listmodel->removeRow(i); - } -- this->updateData(data); - setting->endGroup(); - Q_EMIT sendUpdateAppListSignal(); - } -@@ -188,39 +199,3 @@ void FullListView::leaveEvent(QEvent *e) - Q_UNUSED(e); - this->verticalScrollBar()->setVisible(false); - } -- --void FullListView::showToolTip(const QModelIndex &index) --{ --// qDebug()<y()<visualRect(index).y(); --// if(!index.isValid()) --// return; -- --// QVariant var=listmodel->data(index, Qt::DisplayRole); --// QString desktopfp=var.value(); --// QString appname=pUkuiMenuInterface->getAppName(desktopfp); -- --//// if(file_name.isEmpty()) --//// return; -- --// QToolTip::showText(QCursor::pos(), appname,this); --// QToolTip::hideText(); --} -- --//bool FullListView::event(QEvent* e) --//{ --// if (e->type() == QEvent::ToolTip) { --// QHelpEvent *helpEvent = static_cast(e); --// QModelIndex index=this->currentIndex(); --// QVariant var=listmodel->data(index, Qt::DisplayRole); --// QString desktopfp=var.value(); --// QString appname=pUkuiMenuInterface->getAppName(desktopfp); --// if (!appname.isEmpty()) { --// QToolTip::showText(helpEvent->globalPos(), appname); --// } else { --// QToolTip::hideText(); --// e->ignore(); --// } --// return true; --// } --// return QWidget::event(e); --//} -diff --git a/src/UtilityFunction/fulllistview.h b/src/UtilityFunction/fulllistview.h -index 29862a2..0739694 100644 ---- a/src/UtilityFunction/fulllistview.h -+++ b/src/UtilityFunction/fulllistview.h -@@ -38,19 +38,14 @@ public: - - void addData(QStringList data);//字母排序模块添加数据 - void updateData(QStringList data); --// void removeRow(QString desktopfp); --// void insertRow(QString desktopfp); - - protected: - void initWidget(); - void enterEvent(QEvent* e) Q_DECL_OVERRIDE; - void leaveEvent(QEvent* e) Q_DECL_OVERRIDE; --// bool event(QEvent* e) Q_DECL_OVERRIDE; - - private: - FullItemDelegate* m_delegate=nullptr; --// FullListModel* listmodel=nullptr; --// QStringListModel* listmodel=nullptr; - QStandardItemModel* listmodel=nullptr; - int module=0; - -@@ -63,7 +58,6 @@ private: - private Q_SLOTS: - void onClicked(QModelIndex index);//点击item - void rightClickedSlot();//右键菜单 -- void showToolTip(const QModelIndex &index); - - Q_SIGNALS: - void sendItemClickedSignal(QString arg);//向字母排序或功能分类模块发送item点击信号 -diff --git a/src/UtilityFunction/itemdelegate.cpp b/src/UtilityFunction/itemdelegate.cpp -index 4f9f0d1..51542b5 100644 ---- a/src/UtilityFunction/itemdelegate.cpp -+++ b/src/UtilityFunction/itemdelegate.cpp -@@ -104,7 +104,8 @@ void ItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, - else - { - painter->setPen(QPen(Qt::white)); -- QRect textRect=QRect(rect.x()+11,rect.y()+(rect.height()-14)/2,strlist.at(0).size()*14,14); -+// QRect textRect=QRect(rect.x()+11,rect.y()+(rect.height()-14)/2,strlist.at(0).size()*14,14); -+ QRect textRect=QRect(rect.x()+11,rect.y(),rect.width(),rect.height()); - painter->drawText(textRect,Qt::AlignVCenter,strlist.at(0)); - painter->setRenderHint(QPainter::Antialiasing, true); - painter->setPen(QPen(QColor("#FFFFFF"),1)); -@@ -115,7 +116,7 @@ void ItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, - } - else - { -- setting->beginGroup("application"); -+ setting->beginGroup("lockapplication"); - QRect iconRect=QRect(rect.left()+11,rect.y()+(rect.height()-32)/2,32,32); - QString iconstr=pUkuiMenuInterface->getAppIcon(strlist.at(0)); - iconstr.remove(".png"); -@@ -127,10 +128,10 @@ void ItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, - QString appname=pUkuiMenuInterface->getAppName(strlist.at(0)); - QFileInfo fileInfo(strlist.at(0)); - QString desktopfn=fileInfo.fileName(); -- if(setting->value(desktopfn).toInt()==0) -+ if(setting->contains(desktopfn)) - { - QIcon icon(QString(":/data/img/mainviewwidget/lock.svg")); -- icon.paint(painter,QRect(iconRect.topRight().x()-7,iconRect.topRight().y()-2,12,12)); -+ icon.paint(painter,QRect(rect.topRight().x()-22,rect.y()+(rect.height()-16)/2,16,16)); - } - painter->setOpacity(1); - painter->setPen(QPen(Qt::white)); -diff --git a/src/UtilityFunction/listview.cpp b/src/UtilityFunction/listview.cpp -index a0d4d1c..2b1b58e 100644 ---- a/src/UtilityFunction/listview.cpp -+++ b/src/UtilityFunction/listview.cpp -@@ -128,40 +128,49 @@ void ListView::rightClickedSlot() - } - else{ - int ret=menu->showCommonUseAppBtnMenu(strlist.at(0)); -- if(ret==1 || ret==2) -+ if(ret==1) - { - this->setCurrentIndex(index); -+ listmodel->removeRow(index.row()); -+ setting->beginGroup("lockapplication"); -+ QStandardItem* item=new QStandardItem; -+ item->setData(QVariant::fromValue(strlist),Qt::DisplayRole); -+ listmodel->insertRow(setting->allKeys().size()-1,item); -+ setting->endGroup(); -+ Q_EMIT sendUpdateAppListSignal(); -+ } -+ if(ret==2) -+ { -+ listmodel->removeRow(index.row()); -+ setting->beginGroup("lockapplication"); -+ QStandardItem* item=new QStandardItem; -+ item->setData(QVariant::fromValue(strlist),Qt::DisplayRole); -+ listmodel->insertRow(setting->allKeys().size(),item); -+ setting->endGroup(); -+ Q_EMIT sendUpdateAppListSignal(); - } - - if(ret==7) - Q_EMIT sendHideMainWindowSignal(); - -- if(ret==8 || ret==9) -+ if(ret==8) - { -- QStringList keys; -- keys.clear(); -- setting->beginGroup("application"); -- keys=setting->childKeys(); -- QStringList applist; -- applist.clear(); -- for(int i=0;ivalue(keys.at(i)).toInt(); -- if(val==2 || val==0) -- applist.append(keys.at(i)); -- } -- -- data.clear(); -- for(int i=0;iremoveRow(index.row()); -+ Q_EMIT sendUpdateAppListSignal(); -+ } -+ if(ret==9) -+ { -+ setting->beginGroup("lockapplication"); -+ for(int i=listmodel->rowCount()-1;i>=0;i--) - { --// QString desktopfp=pUkuiMenuInterface->getDesktopPathByAppName(applist.at(i)); -- QString desktopfp=QString("/usr/share/applications/"+applist.at(i)); -- data.append(QStringList()<index(i,0).data(Qt::DisplayRole); -+ QString desktopfp=var.value().at(0); -+ QFileInfo fileInfo(desktopfp); -+ QString desktopfn=fileInfo.fileName(); -+ if(!setting->contains(desktopfn)) -+ listmodel->removeRow(i); - } -- -- this->updateData(data); - setting->endGroup(); -- - Q_EMIT sendUpdateAppListSignal(); - } - --- -2.33.0 - diff --git a/ukui-menu-3.0.2.tar.gz b/ukui-menu-3.0.2.tar.gz deleted file mode 100644 index c3dcf5d..0000000 Binary files a/ukui-menu-3.0.2.tar.gz and /dev/null differ diff --git a/ukui-menu-3.1.1.tar.gz b/ukui-menu-3.1.1.tar.gz new file mode 100644 index 0000000..7ce7f36 Binary files /dev/null and b/ukui-menu-3.1.1.tar.gz differ diff --git a/ukui-menu.spec b/ukui-menu.spec index e47a256..fbd82ab 100644 --- a/ukui-menu.spec +++ b/ukui-menu.spec @@ -1,16 +1,12 @@ %define debug_package %{nil} Name: ukui-menu -Version: 3.0.2 -Release: 11 +Version: 3.1.1 +Release: 1 Summary: Advanced ukui menu License: GPL-3.0-or-later URL: http://www.ukui.org Source0: %{name}-%{version}.tar.gz -Patch0: 0001-Fixed-size-problem-with-multiple-screens.patch -Patch1: 0002-Optimize-the-interaction-strategy-with-the-taskbar.patch -Patch2: 0003-Fixed-right-click-exception-popover-problem.patch -Patch3: 0001-Fixed-application-icon-dragging-problem.patch BuildRequires: qt5-qtbase-devel BuildRequires: libqtxdg-devel @@ -23,13 +19,11 @@ BuildRequires: libXtst-devel BuildRequires: libX11-devel BuildRequires: qt5-qttools-devel BuildRequires: kf5-kwindowsystem-devel +BuildRequires: uchardet-devel ukui-interface peony libpeony-dev Requires: gsettings-qt Requires: qt5-qtx11extras Requires: bamf-daemon -Requires: libXrandr -Requires: libXtst -Requires: libX11 Requires: accountsservice @@ -43,10 +37,6 @@ Requires: accountsservice %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build mkdir build && cd build @@ -65,9 +55,12 @@ rm -rf $RPM_BUILD_ROOT %files %{_bindir}/ukui-menu %{_sysconfdir}/xdg/autostart/ukui-menu.desktop -##%{_datadir}/ukui-menu/translations/ +%{_datadir}/ukui-menu/translations/ %changelog +* Thu Dec 01 2022 tanyulong - 3.1.1-1 +- update upstream version 3.1.1 + * Wed Aug 8 2022 huayadong - 3.0.2-9 - Fixed application icon dragging problem