Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package deepin-compressor for
openSUSE:Factory checked in at 2022-04-22 21:53:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/deepin-compressor (Old)
and /work/SRC/openSUSE:Factory/.deepin-compressor.new.1538 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-compressor"
Fri Apr 22 21:53:40 2022 rev:6 rq:971774 version:5.12.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/deepin-compressor/deepin-compressor.changes
2022-03-23 20:20:15.790526740 +0100
+++
/work/SRC/openSUSE:Factory/.deepin-compressor.new.1538/deepin-compressor.changes
2022-04-22 21:54:28.870821511 +0200
@@ -1,0 +2,6 @@
+Thu Apr 21 08:37:15 UTC 2022 - Hillwood Yang <[email protected]>
+
+- Update version to 5.12.5
+ * Fix bugs
+
+-------------------------------------------------------------------
Old:
----
deepin-compressor-5.12.2.tar.gz
New:
----
deepin-compressor-5.12.5.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ deepin-compressor.spec ++++++
--- /var/tmp/diff_new_pack.vjGcQ9/_old 2022-04-22 21:54:29.442822163 +0200
+++ /var/tmp/diff_new_pack.vjGcQ9/_new 2022-04-22 21:54:29.446822167 +0200
@@ -23,7 +23,7 @@
%endif
Name: deepin-compressor
-Version: 5.12.2
+Version: 5.12.5
Release: 0
License: GPL-3.0+
Summary: Archive Manager for Deepin Desktop
++++++ deepin-compressor-5.12.2.tar.gz -> deepin-compressor-5.12.5.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/deepin-compressor-5.12.2/3rdparty/interface/archiveinterface/archiveinterface.cpp
new/deepin-compressor-5.12.5/3rdparty/interface/archiveinterface/archiveinterface.cpp
---
old/deepin-compressor-5.12.2/3rdparty/interface/archiveinterface/archiveinterface.cpp
2022-03-14 07:56:51.000000000 +0100
+++
new/deepin-compressor-5.12.5/3rdparty/interface/archiveinterface/archiveinterface.cpp
2022-04-01 11:47:59.000000000 +0200
@@ -94,7 +94,9 @@
{
QFileDevice::Permissions pers = QFileDevice::Permissions();
- if (perm == 0) {
+ // bug 118731 zip_file_get_external_attributes????????????????????????
+ // 644 ???0 ????????????????????????
+ if (0 == perm || 644 == perm) {
pers |= (QFileDevice::ReadUser | QFileDevice::WriteUser |
QFileDevice::ReadGroup | QFileDevice::ReadOther);
return pers;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/deepin-compressor-5.12.2/src/source/tree/compressview.cpp
new/deepin-compressor-5.12.5/src/source/tree/compressview.cpp
--- old/deepin-compressor-5.12.2/src/source/tree/compressview.cpp
2022-03-14 07:56:51.000000000 +0100
+++ new/deepin-compressor-5.12.5/src/source/tree/compressview.cpp
2022-04-01 11:47:59.000000000 +0200
@@ -39,6 +39,7 @@
#include <QDateTime>
#include <QFileSystemWatcher>
+
CompressView::CompressView(QWidget *parent)
: DataTreeView(parent)
{
@@ -201,11 +202,17 @@
sortByColumn(DC_Name);
m_vPre.push_back(entry.strFileName);
- // ?????????????????????
- QModelIndex tmpindex = model()->index(0, 0, index);
- if (tmpindex.isValid()) {
- setCurrentIndex(tmpindex);
+ // ??????????????????????????????????????????Label bug122305
+ if (model()->rowCount() == 0 && m_pHeaderView->isVisiable()) {
+ m_pHeaderView->setLabelFocus(true);
+ } else {
+ // ?????????????????????
+ QModelIndex tmpindex = model()->index(0, 0, index);
+ if (tmpindex.isValid()) {
+ setCurrentIndex(tmpindex);
+ }
}
+
} else { // ??????????????????????????????????????????
OpenWithDialog::openWithProgram(entry.strFullPath);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/deepin-compressor-5.12.2/src/source/tree/datatreeview.cpp
new/deepin-compressor-5.12.5/src/source/tree/datatreeview.cpp
--- old/deepin-compressor-5.12.2/src/source/tree/datatreeview.cpp
2022-03-14 07:56:51.000000000 +0100
+++ new/deepin-compressor-5.12.5/src/source/tree/datatreeview.cpp
2022-04-01 11:47:59.000000000 +0200
@@ -430,6 +430,25 @@
void DataTreeView::keyPressEvent(QKeyEvent *event)
{
+ //
???????????????????????????????????????Key_Up,???????????????????????????
+ if (Qt::Key_Up == event->key()) {
+ //
????????????0????????????????????????????????????????????????????????????
+ if (this->currentIndex().row() == 0 || model()->rowCount() == 0) {
+ if (m_pHeaderView->isVisiable()) {
+ m_pHeaderView->setLabelFocus(true);
+ m_selectionModel->clearSelection();
+ }
+ }
+ }
+
+ //
?????????????????????????????????????????????Key_Down,?????????????????????
+ if (Qt::Key_Down == event->key()) {
+ if (m_pHeaderView->isVisiable() && m_pHeaderView->isLabelFocus() &&
model()->rowCount() > 0) {
+ m_pHeaderView->setLabelFocus(false);
+ m_selectionModel->setCurrentIndex(m_pModel->index(-1, -1),
QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows);
+ }
+ }
+
if (Qt::Key_Delete == event->key() &&
m_selectionModel->selectedRows().count() > 0) { //?????????
slotDeleteFile();
} else if (Qt::Key_M == event->key() && Qt::AltModifier ==
event->modifiers()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/deepin-compressor-5.12.2/src/source/tree/treeheaderview.cpp
new/deepin-compressor-5.12.5/src/source/tree/treeheaderview.cpp
--- old/deepin-compressor-5.12.2/src/source/tree/treeheaderview.cpp
2022-03-14 07:56:51.000000000 +0100
+++ new/deepin-compressor-5.12.5/src/source/tree/treeheaderview.cpp
2022-04-01 11:47:59.000000000 +0200
@@ -189,6 +189,16 @@
setFixedHeight(38);
}
}
+
+void TreeHeaderView::setLabelFocus(bool focus)
+{
+ if (focus) {
+ m_pPreLbl->setFocus();
+
+ } else {
+ m_pPreLbl->clearFocus();
+ }
+}
/*
void TreeHeaderView::paintEvent(QPaintEvent *e)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/deepin-compressor-5.12.2/src/source/tree/treeheaderview.h
new/deepin-compressor-5.12.5/src/source/tree/treeheaderview.h
--- old/deepin-compressor-5.12.2/src/source/tree/treeheaderview.h
2022-03-14 07:56:51.000000000 +0100
+++ new/deepin-compressor-5.12.5/src/source/tree/treeheaderview.h
2022-04-01 11:47:59.000000000 +0200
@@ -43,6 +43,12 @@
*/
void setPrePath(const QString &strPath);
+ /**
+ * @brief isFocus Label??????focus
+ * @return
+ */
+ bool isFocus() {return focusIn_;}
+
protected:
void paintEvent(QPaintEvent *e) override;
void mouseDoubleClickEvent(QMouseEvent *event) override;
@@ -94,6 +100,24 @@
*/
void setPreLblVisible(bool bVisible);
+ /**
+ * @brief isVisiable ????????????????????????
+ * @return bool
+ */
+ bool isVisiable() {return m_pPreLbl->isVisible();}
+
+ /**
+ * @brief setLabelFocus ??????Label????????????
+ * @param focus bool
+ */
+ void setLabelFocus(bool focus);
+
+ /**
+ * @brief isLabelFocus Label????????????
+ * @return bool
+ */
+ bool isLabelFocus() {return m_pPreLbl->isFocus();}
+
protected:
//void paintEvent(QPaintEvent *e) override;
virtual void paintSection(QPainter *painter, const QRect &rect, int
logicalIndex) const override;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/deepin-compressor-5.12.2/src/source/tree/uncompressview.cpp
new/deepin-compressor-5.12.5/src/source/tree/uncompressview.cpp
--- old/deepin-compressor-5.12.2/src/source/tree/uncompressview.cpp
2022-03-14 07:56:51.000000000 +0100
+++ new/deepin-compressor-5.12.5/src/source/tree/uncompressview.cpp
2022-04-01 11:47:59.000000000 +0200
@@ -276,11 +276,18 @@
sortByColumn(DC_Name);
m_vPre.push_back(entry.strFileName); // ???????????????????????????
- // ?????????????????????
- QModelIndex tmpindex = model()->index(0, 0, index);
- if (tmpindex.isValid()) {
- setCurrentIndex(tmpindex);
+
+ // ??????????????????????????????????????????Label bug122305
+ if (model()->rowCount() == 0 && m_pHeaderView->isVisiable()) {
+ m_pHeaderView->setLabelFocus(true);
+ } else {
+ // ?????????????????????
+ QModelIndex tmpindex = model()->index(0, 0, index);
+ if (tmpindex.isValid()) {
+ setCurrentIndex(tmpindex);
+ }
}
+
} else { // ??????????????????????????????????????????
slotOpen();
}
