Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package deepin-session-ui for
openSUSE:Factory checked in at 2022-09-01 22:10:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/deepin-session-ui (Old)
and /work/SRC/openSUSE:Factory/.deepin-session-ui.new.2083 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-session-ui"
Thu Sep 1 22:10:03 2022 rev:8 rq:999756 version:5.5.24
Changes:
--------
--- /work/SRC/openSUSE:Factory/deepin-session-ui/deepin-session-ui.changes
2022-04-22 21:55:22.894883070 +0200
+++
/work/SRC/openSUSE:Factory/.deepin-session-ui.new.2083/deepin-session-ui.changes
2022-09-01 22:10:54.432200857 +0200
@@ -1,0 +2,12 @@
+Tue Jun 28 12:36:17 UTC 2022 - Hillwood Yang <[email protected]>
+
+- Update version to 5.5.24
+ * Fix a crash bug on wayland
+
+-------------------------------------------------------------------
+Sat May 7 08:12:18 UTC 2022 - Hillwood Yang <[email protected]>
+
+- Update version to 5.5.23
+ * Fix bugs
+
+-------------------------------------------------------------------
Old:
----
dde-session-ui-5.5.10.tar.gz
New:
----
dde-session-ui-5.5.24.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ deepin-session-ui.spec ++++++
--- /var/tmp/diff_new_pack.XNXfKO/_old 2022-09-01 22:10:55.324203297 +0200
+++ /var/tmp/diff_new_pack.XNXfKO/_new 2022-09-01 22:10:55.324203297 +0200
@@ -19,7 +19,7 @@
%define _name dde-session-ui
Name: deepin-session-ui
-Version: 5.5.10
+Version: 5.5.24
Release: 0
Summary: Deepin desktop-environment - Session UI module
License: GPL-3.0-or-later
++++++ dde-session-ui-5.5.10.tar.gz -> dde-session-ui-5.5.24.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dde-session-ui-5.5.10/CMakeLists.txt
new/dde-session-ui-5.5.24/CMakeLists.txt
--- old/dde-session-ui-5.5.10/CMakeLists.txt 2022-02-14 02:42:24.000000000
+0100
+++ new/dde-session-ui-5.5.24/CMakeLists.txt 2022-05-12 10:37:06.000000000
+0200
@@ -10,7 +10,9 @@
set(CMAKE_CXX_FLAGS "-g -Wall")
# ????????????????????????
-ADD_DEFINITIONS("-fstack-protector-strong -D_FORTITY_SOURCE=1 -z noexecstack
-pie -fPIC -z lazy")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-all -fPIC")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector-all -fPIC")
+set(CMAKE_EXE_LINKER_FLAGS "-z relro -z now -z noexecstack -pie")
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -fsanitize=address -O2")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dde-session-ui-5.5.10/dde-osd/container.cpp
new/dde-session-ui-5.5.24/dde-osd/container.cpp
--- old/dde-session-ui-5.5.10/dde-osd/container.cpp 2022-02-14
02:42:24.000000000 +0100
+++ new/dde-session-ui-5.5.24/dde-osd/container.cpp 2022-05-12
10:37:06.000000000 +0200
@@ -34,12 +34,13 @@
#include <QScreen>
#include <DPlatformWindowHandle>
+#include <com_deepin_dde_daemon_dock.h>
#include <com_deepin_daemon_display.h>
#include <com_deepin_daemon_display_monitor.h>
-#include "notification/dbusdockinterface.h"
using DisplayInter = com::deepin::daemon::Display;
using MonitorInter = com::deepin::daemon::display::Monitor;
+using DockInter = com::deepin::dde::daemon::Dock;
DGUI_USE_NAMESPACE
@@ -92,18 +93,17 @@
void Container::moveToCenter()
{
QRect displayRect;
- qreal ratio = qApp->primaryScreen()->devicePixelRatio();
DisplayInter displayInter("com.deepin.daemon.Display",
"/com/deepin/daemon/Display", QDBusConnection::sessionBus());
QList<QDBusObjectPath> screenList = displayInter.monitors();
- for (const auto &screen : screenList) {
- MonitorInter monitor("com.deepin.daemon.Display", screen.path(),
QDBusConnection::sessionBus());
- QRect monitorRect(monitor.x(), monitor.y(), monitor.width(),
monitor.height());
- DBusDockInterface dockInter;
- if (monitor.enabled() && monitorRect.contains(dockInter.geometry())) {
- qDebug() << " screen display : " << screen.path();
- displayRect = QRect(monitorRect.x(), monitorRect.y(),
- monitorRect.width() / ratio,
monitorRect.height() / ratio);
+ DockInter dockInter("com.deepin.dde.daemon.Dock",
"/com/deepin/dde/daemon/Dock", QDBusConnection::sessionBus(), this);
+ QRect dockRect = dockInter.frontendWindowRect();
+ for (auto *screen : qApp->screens()) {
+ const QRect &screenRect = screen->geometry();
+ const QRect &rect = QRect(screenRect.topLeft(), screenRect.size());
+
+ if (rect.contains(dockRect.topLeft())) {
+ displayRect = rect;
break;
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dde-session-ui-5.5.10/dde-osd/manager.cpp
new/dde-session-ui-5.5.24/dde-osd/manager.cpp
--- old/dde-session-ui-5.5.10/dde-osd/manager.cpp 2022-02-14
02:42:24.000000000 +0100
+++ new/dde-session-ui-5.5.24/dde-osd/manager.cpp 2022-05-12
10:37:06.000000000 +0200
@@ -173,29 +173,25 @@
void Manager::updateUI()
{
- if (!m_currentProvider) return;
+ if (!m_currentProvider)
+ return;
- if (m_model->provider() != m_currentProvider) {
- m_model->setProvider(m_currentProvider);
- m_delegate->setProvider(m_currentProvider);
- m_listview->setFlow(m_currentProvider->flow());
-
m_listview->setCurrentIndex(m_listview->model()->index(m_currentProvider->currentRow(),
0));
- m_container->setContentsMargins(m_currentProvider->contentMargins());
- m_container->setFixedSize(m_currentProvider->contentSize());
- m_container->moveToCenter();
- }
- if (!m_container->isVisible()) { //
??????????????????osd???????????????????????????OSD??????????????????????????????????????????????????????????????????
- m_model->setProvider(m_currentProvider);
-
m_listview->setCurrentIndex(m_listview->model()->index(m_currentProvider->currentRow(),
0));
- m_container->setFixedSize(m_currentProvider->contentSize());
- m_container->moveToCenter();
- }
+ m_model->setProvider(m_currentProvider);
+ m_delegate->setProvider(m_currentProvider);
+ m_listview->setFlow(m_currentProvider->flow());
+
m_listview->setCurrentIndex(m_listview->model()->index(m_currentProvider->currentRow(),
0));
+ m_container->setContentsMargins(m_currentProvider->contentMargins());
+ m_container->setFixedSize(m_currentProvider->contentSize());
+ m_container->moveToCenter();
}
void Manager::doneSetting()
{
- if (qApp->queryKeyboardModifiers().testFlag(Qt::MetaModifier)) {
- return m_timer->start();
+ //
wayland???meta??????MetaModifier????????????????????????????????????????????????????????????????????????Modifier???????????????????????????
+ if (!QGuiApplication::platformName().startsWith("wayland",
Qt::CaseInsensitive)) {
+ if (qApp->queryKeyboardModifiers().testFlag(Qt::MetaModifier)) {
+ return m_timer->start();
+ }
}
m_container->hide();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-session-ui-5.5.10/dde-osd/notification/bubblemanager.cpp
new/dde-session-ui-5.5.24/dde-osd/notification/bubblemanager.cpp
--- old/dde-session-ui-5.5.10/dde-osd/notification/bubblemanager.cpp
2022-02-14 02:42:24.000000000 +0100
+++ new/dde-session-ui-5.5.24/dde-osd/notification/bubblemanager.cpp
2022-05-12 10:37:06.000000000 +0200
@@ -70,7 +70,6 @@
, "/com/deepin/daemon/Gesture"
, QDBusConnection::systemBus()
, this))
- , m_dockInter(new DBusDockInterface(this))
, m_trickTimer(new QTimer(this))
{
m_trickTimer->setInterval(300);
@@ -461,8 +460,7 @@
for (const auto &screen : screenList) {
MonitorInter monitor("com.deepin.daemon.Display", screen.path(),
QDBusConnection::sessionBus());
QRect monitorRect(monitor.x(), monitor.y(), monitor.width(),
monitor.height());
- QRect dockRect(m_dockInter->geometry());
- if (monitor.enabled() && monitorRect.contains(dockRect.center())) {
+ if (monitor.enabled() &&
monitorRect.contains(m_currentDockRect.center())) {
displayRect = QRect(monitorRect.x(), monitorRect.y(),
monitorRect.width() / ratio,
monitorRect.height() / ratio);
break;
@@ -674,7 +672,7 @@
this, SLOT(onPrepareForSleep(bool)));
connect(m_displayInter, &DisplayInter::PrimaryRectChanged, this,
&BubbleManager::geometryChanged, Qt::QueuedConnection);
- connect(m_dockInter, &DBusDockInterface::geometryChanged, this,
&BubbleManager::geometryChanged, Qt::UniqueConnection);
+ connect(m_dockDeamonInter, &DockInter::FrontendWindowRectChanged, this,
&BubbleManager::geometryChanged, Qt::UniqueConnection);
connect(m_dockDeamonInter, &DockInter::serviceValidChanged, this,
&BubbleManager::geometryChanged, Qt::UniqueConnection);
connect(qApp, &QApplication::primaryScreenChanged, this, [ = ] {
@@ -722,11 +720,8 @@
void BubbleManager::geometryChanged()
{
+ m_currentDockRect = m_dockDeamonInter->frontendWindowRect();
m_currentDisplayRect = calcDisplayRect();
- //
dock??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????
- if (m_dockInter->isValid()) {
- m_currentDockRect = m_dockInter->geometry();
- }
m_dockPos = static_cast<OSD::DockPosition>(m_dockDeamonInter->position());
m_dockMode = m_dockDeamonInter->displayMode();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-session-ui-5.5.10/dde-osd/notification/bubblemanager.h
new/dde-session-ui-5.5.24/dde-osd/notification/bubblemanager.h
--- old/dde-session-ui-5.5.10/dde-osd/notification/bubblemanager.h
2022-02-14 02:42:24.000000000 +0100
+++ new/dde-session-ui-5.5.24/dde-osd/notification/bubblemanager.h
2022-05-12 10:37:06.000000000 +0200
@@ -294,7 +294,6 @@
//
???????????????????????????????????????????????????????????????????????????100?????????????????????????????????0??????
int m_slideWidth;
GestureInter *m_gestureInter;
- DBusDockInterface *m_dockInter;
QTimer* m_trickTimer; // ??????300ms???????????????
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-session-ui-5.5.10/dde-osd/notification-center/notifycenterwidget.cpp
new/dde-session-ui-5.5.24/dde-osd/notification-center/notifycenterwidget.cpp
---
old/dde-session-ui-5.5.10/dde-osd/notification-center/notifycenterwidget.cpp
2022-02-14 02:42:24.000000000 +0100
+++
new/dde-session-ui-5.5.24/dde-osd/notification-center/notifycenterwidget.cpp
2022-05-12 10:37:06.000000000 +0200
@@ -70,7 +70,7 @@
void NotifyCenterWidget::initUI()
{
m_notifyWidget->setAccessibleName("NotifyWidget");
- setWindowFlags(Qt::FramelessWindowHint | Qt::Tool |
Qt::MSWindowsFixedSizeDialogHint | Qt::WindowStaysOnTopHint |
Qt::X11BypassWindowManagerHint);
+ setWindowFlags(Qt::FramelessWindowHint | Qt::Tool |
Qt::MSWindowsFixedSizeDialogHint | Qt::WindowStaysOnTopHint);
setAttribute(Qt::WA_TranslucentBackground);
setContentsMargins(0, 0, 0, 0);
@@ -171,33 +171,33 @@
int height = screen.height() - Notify::CenterMargin * 2;
if (pos == OSD::DockPosition::Top || pos == OSD::DockPosition::Bottom) {
if(mode == OSD::DockModel::Fashion) {
- height = screen.height() - Notify::CenterMargin * 2 -
dock.height();
+ height = screen.height() - Notify::CenterMargin * 2 -
dock.height() / m_scale;
if (dock.height() != 0) {
height -= OSD::DockMargin * 2;
}
} else {
- height = screen.height() - Notify::CenterMargin * 2 -
dock.height();
+ height = screen.height() - Notify::CenterMargin * 2 -
dock.height() / m_scale;
}
}
int x = screen.x() + screen.width() - Notify::CenterWidth -
Notify::CenterMargin;
if (pos == OSD::DockPosition::Right) {
if(mode == OSD::DockModel::Fashion) {
- x = screen.x() + screen.width() - (Notify::CenterWidth +
dock.width() + OSD::DockMargin * 2 + Notify::CenterMargin);
+ x = screen.x() + screen.width() - (Notify::CenterWidth +
dock.width() / m_scale + OSD::DockMargin * 2 + Notify::CenterMargin);
if (dock.width() == 0) {
x += OSD::DockMargin * 2;
}
} else {
- x = screen.x() + screen.width() - (Notify::CenterWidth +
dock.width() + Notify::CenterMargin);
+ x = screen.x() + screen.width() - (Notify::CenterWidth +
dock.width() / m_scale + Notify::CenterMargin);
}
}
int y = screen.y() + Notify::CenterMargin;
if (pos == OSD::DockPosition::Top) {
if(mode == OSD::DockModel::Fashion) {
- y = screen.y() + Notify::CenterMargin + dock.height() +
OSD::DockMargin * 2;
+ y = screen.y() + Notify::CenterMargin + dock.height() / m_scale +
OSD::DockMargin * 2;
} else {
- y = screen.y() + Notify::CenterMargin + dock.height();
+ y = screen.y() + Notify::CenterMargin + dock.height() / m_scale;
}
}
@@ -217,7 +217,7 @@
void NotifyCenterWidget::mouseMoveEvent(QMouseEvent *event)
{
Q_UNUSED(event);
- return;
+ return;
}
void NotifyCenterWidget::hideEvent(QHideEvent *event)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-session-ui-5.5.10/dde-touchscreen-dialog/main.cpp
new/dde-session-ui-5.5.24/dde-touchscreen-dialog/main.cpp
--- old/dde-session-ui-5.5.10/dde-touchscreen-dialog/main.cpp 2022-02-14
02:42:24.000000000 +0100
+++ new/dde-session-ui-5.5.24/dde-touchscreen-dialog/main.cpp 2022-05-12
10:37:06.000000000 +0200
@@ -4,6 +4,7 @@
#endif
#include <DApplication>
+#include <DLog>
#include <QCommandLineParser>
#include <QDebug>
@@ -12,6 +13,7 @@
#include <com_deepin_daemon_display.h>
DWIDGET_USE_NAMESPACE
+DCORE_USE_NAMESPACE
using namespace com::deepin::daemon;
int main(int argc, char *argv[])
@@ -20,6 +22,10 @@
app.setQuitOnLastWindowClosed(false);
app.setAttribute(Qt::AA_UseHighDpiPixmaps);
app.setQuitOnLastWindowClosed(true);
+ app.setApplicationName("dde-touchscreen-dialog");
+
+ DLogManager::registerConsoleAppender();
+ DLogManager::registerFileAppender();
QTranslator translator;
translator.load("/usr/share/dde-session-ui/translations/dde-session-ui_" +
@@ -35,8 +41,9 @@
const QStringList &posArguments = parser.positionalArguments();
+ qInfo() << posArguments;
if (posArguments.isEmpty()) {
- qDebug() << "empty touchscreen serial number";
+ qDebug() << "empty touchscreen UUID";
return -1;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-session-ui-5.5.10/dde-touchscreen-dialog/monitorindicator.cpp
new/dde-session-ui-5.5.24/dde-touchscreen-dialog/monitorindicator.cpp
--- old/dde-session-ui-5.5.10/dde-touchscreen-dialog/monitorindicator.cpp
2022-02-14 02:42:24.000000000 +0100
+++ new/dde-session-ui-5.5.24/dde-touchscreen-dialog/monitorindicator.cpp
2022-05-12 10:37:06.000000000 +0200
@@ -26,38 +26,64 @@
#include "monitorindicator.h"
#include <QPainter>
-#include <QPainterPath>
-#include <QResizeEvent>
-#include <QX11Info>
+#include <QApplication>
+#include <QDebug>
-#include <X11/extensions/shape.h>
-#include <X11/Xregion.h>
+#define LINE_WIDTH 10
MonitorIndicator::MonitorIndicator(QWidget *parent)
- : QFrame(parent)
+ : QFrame(nullptr)
+ , m_topLine(new QFrame(nullptr))
+ , m_bottomLine(new QFrame(nullptr))
+ , m_leftLine(new QFrame(nullptr))
+ , m_rightLine(new QFrame(nullptr))
{
- setAccessibleName("MonitorIndicator");
- setWindowFlags(Qt::SplashScreen | Qt::X11BypassWindowManagerHint);
- setStyleSheet("background-color: #2ca7f8;");
+ Q_UNUSED(parent)
+ QFrame::setVisible(false);
+
+ QPalette pal = QPalette();
+ pal.setColor(QPalette::Window, QColor("#2ca7f8"));
+
+ m_topLine->setWindowFlags(Qt::CoverWindow | Qt::WindowStaysOnTopHint |
Qt::SplashScreen | Qt::FramelessWindowHint | Qt::X11BypassWindowManagerHint);
+ m_topLine->setAutoFillBackground(true);
+ m_topLine->setPalette(pal);
+
+ m_bottomLine->setWindowFlags(Qt::CoverWindow | Qt::WindowStaysOnTopHint |
Qt::SplashScreen | Qt::FramelessWindowHint | Qt::X11BypassWindowManagerHint);
+ m_bottomLine->setAutoFillBackground(true);
+ m_bottomLine->setPalette(pal);
+
+ m_leftLine->setWindowFlags(Qt::CoverWindow | Qt::WindowStaysOnTopHint |
Qt::SplashScreen | Qt::FramelessWindowHint | Qt::X11BypassWindowManagerHint);
+ m_leftLine->setAutoFillBackground(true);
+ m_leftLine->setPalette(pal);
+
+ m_rightLine->setWindowFlags(Qt::CoverWindow | Qt::WindowStaysOnTopHint |
Qt::SplashScreen | Qt::FramelessWindowHint | Qt::X11BypassWindowManagerHint);
+ m_rightLine->setAutoFillBackground(true);
+ m_rightLine->setPalette(pal);
}
-void MonitorIndicator::resizeEvent(QResizeEvent *e)
+MonitorIndicator::~MonitorIndicator()
{
- QFrame::resizeEvent(e);
+ delete m_topLine;
+ delete m_bottomLine;
+ delete m_leftLine;
+ delete m_rightLine;
+}
- XRectangle rectangle;
- rectangle.x = 0;
- rectangle.y = 0;
- rectangle.width = static_cast<ushort>(e->size().width());
- rectangle.height = static_cast<ushort>(e->size().height());
-
- // need to restore the cut area, if not,cut out will be repeated.
- XShapeCombineRectangles(QX11Info::display(), winId(), ShapeBounding, 0, 0,
&rectangle, 1, ShapeSet, YXBanded);
-
- rectangle.x = 10;
- rectangle.y = 10;
- rectangle.width = static_cast<ushort>(e->size().width()) - 20;
- rectangle.height = static_cast<ushort>(e->size().height()) - 20;
+void MonitorIndicator::setVisible(bool visible)
+{
+ updateGeometry();
+ m_topLine->setVisible(visible);
+ m_bottomLine->setVisible(visible);
+ m_leftLine->setVisible(visible);
+ m_rightLine->setVisible(visible);
+}
- XShapeCombineRectangles(QX11Info::display(), winId(), ShapeBounding, 0, 0,
&rectangle, 1, ShapeSubtract, YXBanded);
+void MonitorIndicator::updateGeometry()
+{
+ QPoint topLeft = mapToGlobal(QPoint(0,0));
+ int lineWidth = static_cast<int>(LINE_WIDTH / qApp->devicePixelRatio());
+ m_topLine->setGeometry(topLeft.x(), topLeft.y(), width(), lineWidth);
+ m_bottomLine->setGeometry(topLeft.x(), topLeft.y() + height() - lineWidth,
width(), lineWidth);
+ m_rightLine->setGeometry(topLeft.x() + width() - lineWidth, topLeft.y(),
lineWidth, height());
+ m_leftLine->setGeometry(topLeft.x(), topLeft.y(), lineWidth, height());
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-session-ui-5.5.10/dde-touchscreen-dialog/monitorindicator.h
new/dde-session-ui-5.5.24/dde-touchscreen-dialog/monitorindicator.h
--- old/dde-session-ui-5.5.10/dde-touchscreen-dialog/monitorindicator.h
2022-02-14 02:42:24.000000000 +0100
+++ new/dde-session-ui-5.5.24/dde-touchscreen-dialog/monitorindicator.h
2022-05-12 10:37:06.000000000 +0200
@@ -27,7 +27,6 @@
#define MONITORFULLWIDGET_H
#include <DPlatformWindowHandle>
-#include <DWindowManagerHelper>
#include <QFrame>
DWIDGET_USE_NAMESPACE
@@ -38,9 +37,20 @@
public:
explicit MonitorIndicator(QWidget *parent = 0);
+ ~MonitorIndicator() override;
-protected:
- void resizeEvent(QResizeEvent *e);
+public Q_SLOTS:
+
+ virtual void setVisible(bool visible);
+
+private:
+ void updateGeometry();
+
+private:
+ QFrame *m_topLine;
+ QFrame *m_bottomLine;
+ QFrame *m_leftLine;
+ QFrame *m_rightLine;
};
#endif // MONITORFULLWIDGET_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-session-ui-5.5.10/dde-touchscreen-dialog/touchscreensetting.cpp
new/dde-session-ui-5.5.24/dde-touchscreen-dialog/touchscreensetting.cpp
--- old/dde-session-ui-5.5.10/dde-touchscreen-dialog/touchscreensetting.cpp
2022-02-14 02:42:24.000000000 +0100
+++ new/dde-session-ui-5.5.24/dde-touchscreen-dialog/touchscreensetting.cpp
2022-05-12 10:37:06.000000000 +0200
@@ -57,7 +57,7 @@
connect(m_displayInter, &Display::MonitorsChanged, this,
&TouchscreenSetting::onMonitorChanged);
connect(this, &DDialog::buttonClicked, this,
&TouchscreenSetting::onButtonClicked);
- connect(this, &TouchscreenSetting::requestAssociateTouch, m_displayInter,
&Display::AssociateTouch);
+ connect(this, &TouchscreenSetting::requestAssociateTouch, m_displayInter,
&Display::AssociateTouchByUUID);
connect(m_listCombo, SIGNAL(currentIndexChanged(int)), this,
SLOT(markDisplay(int)));
onMonitorChanged();
@@ -132,9 +132,15 @@
void TouchscreenSetting::markDisplay(int index)
{
- m_monitorIndicator->setGeometry(QRect(m_monitors[index]->x(),
m_monitors[index]->y(), m_monitors[index]->width(), m_monitors[0]->height()));
- m_monitorIndicator->show();
+ Monitor *currentMonitor = m_monitors[index];
+ if (!currentMonitor) {
+ qWarning() << "current monitor is null: " << index;
+ return;
+ }
+
+ m_monitorIndicator->setGeometry(QRect(currentMonitor->x(),
currentMonitor->y(), currentMonitor->width(), currentMonitor->height()));
+ m_monitorIndicator->setVisible(true);
QTimer::singleShot(300, this, [ = ] {
- m_monitorIndicator->hide();
+ m_monitorIndicator->setVisible(false);
});
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-session-ui-5.5.10/dnetwork-secret-dialog/networksecretdialog.cpp
new/dde-session-ui-5.5.24/dnetwork-secret-dialog/networksecretdialog.cpp
--- old/dde-session-ui-5.5.10/dnetwork-secret-dialog/networksecretdialog.cpp
2022-02-14 02:42:24.000000000 +0100
+++ new/dde-session-ui-5.5.24/dnetwork-secret-dialog/networksecretdialog.cpp
2022-05-12 10:37:06.000000000 +0200
@@ -39,30 +39,28 @@
{"pppoe", "network-wired"},
};
-const QMap<QString, QString> SECRET_KEY_STR_MAP = {
- {"psk", QObject::tr("Password")},
- {"wep-key0", QObject::tr("Key")},
- {"wep-key1", QObject::tr("Key")},
- {"wep-key2", QObject::tr("Key")},
- {"wep-key3", QObject::tr("key")},
- {"leap-password", "unknown"},
- {"password", QObject::tr("Password")},
- {"password-raw", "unknown"},
- {"ca-cert-password", "unknown"},
- {"client-cert-password", "unknown"},
- {"phase2-ca-cert-password", "unknown"},
- {"phase2-client-cert-password", "unknown"},
- {"private-key-password", QObject::tr("Private Pwd")},
- {"phase2-private-key-password", "unknown"},
- {"pin", "unknown"},
- {"proxy-password", QObject::tr("Proxy Password")},
- {"IPSec secret", QObject::tr("Password")},
- {"Xauth password", QObject::tr("Group Password")},
-};
-
NetworkSecretDialog::NetworkSecretDialog(QJsonDocument jsonDoc, QWidget
*parent)
: DDialog(parent)
- , m_secretKeyStrMap(SECRET_KEY_STR_MAP)
+ , m_secretKeyStrMap({
+ { "psk", tr("Password") },
+ { "wep-key0", tr("Key") },
+ { "wep-key1", tr("Key") },
+ { "wep-key2", tr("Key") },
+ { "wep-key3", tr("key") },
+ { "leap-password", "unknown" },
+ { "password", tr("Password") },
+ { "password-raw", "unknown" },
+ { "ca-cert-password", "unknown" },
+ { "client-cert-password", "unknown" },
+ { "phase2-ca-cert-password", "unknown" },
+ { "phase2-client-cert-password", "unknown" },
+ { "private-key-password", tr("Private Pwd") },
+ { "phase2-private-key-password", "unknown" },
+ { "pin", "unknown" },
+ { "proxy-password", tr("Proxy Password") },
+ { "IPSec secret", tr("Password") },
+ { "Xauth password", tr("Group Password") },
+ })
{
m_allInputValid = false;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-session-ui-5.5.10/dnetwork-secret-dialog/networksecretdialog.h
new/dde-session-ui-5.5.24/dnetwork-secret-dialog/networksecretdialog.h
--- old/dde-session-ui-5.5.10/dnetwork-secret-dialog/networksecretdialog.h
2022-02-14 02:42:24.000000000 +0100
+++ new/dde-session-ui-5.5.24/dnetwork-secret-dialog/networksecretdialog.h
2022-05-12 10:37:06.000000000 +0200
@@ -53,7 +53,7 @@
private:
QJsonObject m_jsonObj;
- QMap<QString, QString> m_secretKeyStrMap;
+ const QMap<QString, QString> m_secretKeyStrMap;
QString m_connName;
QString m_connType;
QString m_connSettingName;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dde-session-ui-5.5.10/rpm/dde-session-ui.spec
new/dde-session-ui-5.5.24/rpm/dde-session-ui.spec
--- old/dde-session-ui-5.5.10/rpm/dde-session-ui.spec 2022-02-14
02:42:24.000000000 +0100
+++ new/dde-session-ui-5.5.24/rpm/dde-session-ui.spec 2022-05-12
10:37:06.000000000 +0200
@@ -6,6 +6,7 @@
URL: https://github.com/linuxdeepin/%{name}
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
+BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: deepin-gettext-tools
BuildRequires: pkgconfig(dtkwidget) >= 5.1
@@ -66,7 +67,7 @@
%build
export PATH=%{_qt5_bindir}:$PATH
-%qmake_qt5 PREFIX=%{_prefix} PKGTYPE=rpm
+%cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCHITECTURE=%{_arch} .
%make_build
%install
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dde-session-ui-5.5.10/tests/test-recoverage.sh
new/dde-session-ui-5.5.24/tests/test-recoverage.sh
--- old/dde-session-ui-5.5.10/tests/test-recoverage.sh 2022-02-14
02:42:24.000000000 +0100
+++ new/dde-session-ui-5.5.24/tests/test-recoverage.sh 2022-05-12
10:37:06.000000000 +0200
@@ -1,6 +1,7 @@
#!/bin/bash
-BUILD_DIR=build
+BUILD_DIR=build-ut
+HTML_DIR=html
REPORT_DIR=report
# ????????????
@@ -30,7 +31,7 @@
for target in ${targets[*]}; do
# ????????????????????????
- ./ut-${target} --gtest_output=xml:test_report_${target}.xml
+ ./ut-${target} --gtest_output=xml:./$REPORT_DIR/ut-report_${target}.xml
mv asan_${target}.log* asan_${target}.log
done
@@ -39,5 +40,6 @@
lcov --remove ./coverage.info "*/tests/*" "*/usr/include*" "*build/src*"
"*persistence.cpp*" "*notifications_dbus_adaptor.cpp*" "*notifysettings.cpp*"
"*dbuslogin1manager.cpp*" "*persistence.h*" "*notifysettings.h*"
"*dbuslogin1manager.h*" "*dbusdockinterface.h*" "*dbus_daemon_interface.h*"
"*dbus_daemon_interface.cpp*" "*/global_util/dbus/*" "*/global_util/xkbparser*"
"*icondata.h*" "*icondata.cpp*" "*kblayoutindicator.h*"
"*kblayoutindicator.cpp*" -o ./coverage.info
# ??????html
-cd .. || return
-genhtml -o tests/$REPORT_DIR $BUILD_DIR/coverage.info
+genhtml -o ./$HTML_DIR ./coverage.info
+
+mv ./$HTML_DIR/index.html $HTML_DIR/cov_dde-session-ui.html
\ No newline at end of file
++++++ fix-library-path.patch ++++++
--- /var/tmp/diff_new_pack.XNXfKO/_old 2022-09-01 22:10:55.512203810 +0200
+++ /var/tmp/diff_new_pack.XNXfKO/_new 2022-09-01 22:10:55.516203821 +0200
@@ -1,6 +1,6 @@
-diff -Nur dde-session-ui-5.5.10/CMakeLists.txt
dde-session-ui-5.5.10-new/CMakeLists.txt
---- dde-session-ui-5.5.10/CMakeLists.txt 2022-02-14 09:42:24.000000000
+0800
-+++ dde-session-ui-5.5.10-new/CMakeLists.txt 2022-04-06 20:35:26.242567752
+0800
+diff -Nur dde-session-ui-5.5.23/CMakeLists.txt
dde-session-ui-5.5.23-new/CMakeLists.txt
+--- dde-session-ui-5.5.23/CMakeLists.txt 2022-04-22 18:40:04.000000000
+0800
++++ dde-session-ui-5.5.23-new/CMakeLists.txt 2022-05-07 09:43:31.098553885
+0800
@@ -9,6 +9,8 @@
set(CMAKE_AUTORCC ON)
set(CMAKE_CXX_FLAGS "-g -Wall")
@@ -8,9 +8,9 @@
+link_directories(${LIBRARY_OUTPUT_PATH})
+
# ????????????????????????
- ADD_DEFINITIONS("-fstack-protector-strong -D_FORTITY_SOURCE=1 -z noexecstack
-pie -fPIC -z lazy")
-
-@@ -329,7 +331,7 @@
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-all -fPIC")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector-all -fPIC")
+@@ -331,7 +333,7 @@
)
## bin
