Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package deepin-calendar for openSUSE:Factory
checked in at 2022-09-01 22:10:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/deepin-calendar (Old)
and /work/SRC/openSUSE:Factory/.deepin-calendar.new.2083 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-calendar"
Thu Sep 1 22:10:00 2022 rev:7 rq:999753 version:5.8.30
Changes:
--------
--- /work/SRC/openSUSE:Factory/deepin-calendar/deepin-calendar.changes
2022-04-22 21:54:27.870820371 +0200
+++
/work/SRC/openSUSE:Factory/.deepin-calendar.new.2083/deepin-calendar.changes
2022-09-01 22:10:50.580190323 +0200
@@ -1,0 +2,8 @@
+Sat Jul 2 14:38:17 UTC 2022 - Hillwood Yang <[email protected]>
+
+- Update version to 5.8.30
+ * Optimmze ui
+ * Fix bugs
+ * Update translations
+
+-------------------------------------------------------------------
@@ -6 +14 @@
- * Optmize ui
+ * Optimize ui
Old:
----
dde-calendar-5.8.29.tar.gz
New:
----
dde-calendar-5.8.30.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ deepin-calendar.spec ++++++
--- /var/tmp/diff_new_pack.pARvCo/_old 2022-09-01 22:10:51.112191777 +0200
+++ /var/tmp/diff_new_pack.pARvCo/_new 2022-09-01 22:10:51.112191777 +0200
@@ -25,7 +25,7 @@
%endif
Name: deepin-calendar
-Version: 5.8.29
+Version: 5.8.30
Release: 0
Summary: A calendar application for Deepin Desktop
License: GPL-3.0-or-later
++++++ dde-calendar-5.8.29.tar.gz -> dde-calendar-5.8.30.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dde-calendar-5.8.29/CMakeLists.txt
new/dde-calendar-5.8.30/CMakeLists.txt
--- old/dde-calendar-5.8.29/CMakeLists.txt 2022-03-09 03:08:24.000000000
+0100
+++ new/dde-calendar-5.8.30/CMakeLists.txt 2022-04-21 07:13:09.000000000
+0200
@@ -15,6 +15,12 @@
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -O2 -Wl,--gc-sections")
endif()
+#?????????????????????
+if(CMAKE_COVERAGE_ARG STREQUAL "CMAKE_COVERAGE_ARG_ON")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall -fprofile-arcs -ftest-coverage")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -fprofile-arcs
-ftest-coverage")
+endif()
+
macro(SUBDIRLIST result curdir)
file(GLOB children RELATIVE ${curdir} ${curdir}/*)
set(dirlist "")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dde-calendar-5.8.29/calendar-client/CMakeLists.txt
new/dde-calendar-5.8.30/calendar-client/CMakeLists.txt
--- old/dde-calendar-5.8.29/calendar-client/CMakeLists.txt 2022-03-09
03:08:24.000000000 +0100
+++ new/dde-calendar-5.8.30/calendar-client/CMakeLists.txt 2022-04-21
07:13:09.000000000 +0200
@@ -18,7 +18,7 @@
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
-set(CMAKE_CXX_FLAGS "-Wl,--as-needed -fPIE")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--as-needed -fPIE")
set(CMAKE_EXE_LINKER_FLAGS "-pie")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-calendar-5.8.29/calendar-client/src/customWidget/ctitlewidget.cpp
new/dde-calendar-5.8.30/calendar-client/src/customWidget/ctitlewidget.cpp
--- old/dde-calendar-5.8.29/calendar-client/src/customWidget/ctitlewidget.cpp
2022-03-09 03:08:24.000000000 +0100
+++ new/dde-calendar-5.8.30/calendar-client/src/customWidget/ctitlewidget.cpp
2022-04-21 07:13:09.000000000 +0200
@@ -97,10 +97,18 @@
m_searchEdit->setAccessibleName("SearchEdit");
DFontSizeManager::instance()->bind(m_searchEdit, DFontSizeManager::T6);
m_searchEdit->setFixedHeight(36);
- // m_searchEdit->setMinimumWidth(240);
- // m_searchEdit->setMaximumWidth(354);
m_searchEdit->setFont(viewfont);
m_searchEdit->lineEdit()->installEventFilter(this);
+ connect(m_searchEdit, &DSearchEdit::searchAborted, [&] {
+ //????????????????????????????????????
+ slotSearchEditFocusChanged(false);
+ });
+
+
//??????????????????????????????????????????????????????????????????????????????
+ m_searchPush = new DIconButton(this);
+ m_searchPush->setFixedSize(36, 36);
+ m_searchPush->setIcon(QIcon::fromTheme("search"));
+ connect(m_searchPush, &DIconButton::clicked, this,
&CTitleWidget::slotShowSearchEdit);
//????????????????????????
m_newScheduleBtn = new DIconButton(this);
@@ -109,18 +117,34 @@
//??????+
m_newScheduleBtn->setIcon(style.standardIcon(DStyle::SP_IncreaseElement));
+
//?????????????????????????????????????????????widget?????????????????????????????????????????????????????????????????????
+ QWidget *leftWidget = new QWidget(this);
+ {
+ QHBoxLayout *layout = new QHBoxLayout;
+ layout->setContentsMargins(0, 0, 0, 0);
+ layout->addWidget(m_buttonBox, Qt::AlignLeft);
+ layout->addStretch();
+ layout->addWidget(m_searchEdit, Qt::AlignCenter);
+ layout->addStretch();
+ layout->addWidget(m_searchPush, Qt::AlignRight);
+ leftWidget->setLayout(layout);
+ }
+
QHBoxLayout *layout = new QHBoxLayout;
layout->setContentsMargins(0, 0, 0, 0);
- layout->addWidget(m_buttonBox, Qt::AlignLeft);
- layout->addStretch();
- layout->addWidget(m_searchEdit, Qt::AlignCenter);
- layout->addStretch();
+ layout->addWidget(leftWidget);
layout->addWidget(m_newScheduleBtn, Qt::AlignRight);
this->setLayout(layout);
//?????????????????????buttonBox
setFocusProxy(m_buttonBox);
}
+void CTitleWidget::setShowState(CTitleWidget::Title_State state)
+{
+ m_showState = state;
+ stateUpdate();
+}
+
DButtonBox *CTitleWidget::buttonBox() const
{
return m_buttonBox;
@@ -136,9 +160,43 @@
return m_newScheduleBtn;
}
-void CTitleWidget::resizeEvent(QResizeEvent *event)
+void CTitleWidget::stateUpdate()
+{
+ switch (m_showState) {
+ case Title_State_Mini: {
+
//????????????????????????????????????????????????????????????????????????????????????????????????
+ if (m_searchEdit->text().isEmpty() &&
!m_searchEdit->lineEdit()->hasFocus()) {
+ m_searchPush->show();
+ m_searchEdit->hide();
+ } else {
+ miniStateShowSearchEdit();
+ }
+ } break;
+ default: {
+ m_searchEdit->show();
+ if (m_searchPush->hasFocus()) {
+ m_searchEdit->setFocus();
+ }
+ m_buttonBox->show();
+ m_searchPush->hide();
+ normalStateUpdateSearchEditWidth();
+ setFocusProxy(m_buttonBox);
+ } break;
+ }
+}
+
+void CTitleWidget::miniStateShowSearchEdit()
+{
+ m_buttonBox->hide();
+ m_searchPush->hide();
+ m_searchEdit->setMaximumWidth(width());
+ m_searchEdit->show();
+ //??????????????????
+ setFocusProxy(nullptr);
+}
+
+void CTitleWidget::normalStateUpdateSearchEditWidth()
{
- QWidget::resizeEvent(event);
int padding = qMax(m_buttonBox->width(), m_newScheduleBtn->width());
//??????widget???????????????????????????
int searchWidth = width() - 2 * padding;
@@ -148,7 +206,15 @@
} else if (searchWidth > 354) {
searchWidth = 354;
}
- m_searchEdit->setFixedWidth(searchWidth);
+ m_searchEdit->setMaximumWidth(searchWidth);
+}
+
+void CTitleWidget::resizeEvent(QResizeEvent *event)
+{
+ QWidget::resizeEvent(event);
+ if (m_showState == Title_State_Normal) {
+ normalStateUpdateSearchEditWidth();
+ }
}
bool CTitleWidget::eventFilter(QObject *o, QEvent *e)
@@ -168,7 +234,33 @@
if (focusOutEvent->reason() == Qt::TabFocusReason) {
emit signalSearchFocusSwitch();
}
+ //??????????????????????????????????????????????????????
+ if (focusOutEvent->reason() == Qt::TabFocusReason
+ || focusOutEvent->reason() == Qt::MouseFocusReason) {
+ slotSearchEditFocusChanged(false);
+ }
}
}
return QWidget::eventFilter(o, e);
}
+
+void CTitleWidget::slotShowSearchEdit()
+{
+ miniStateShowSearchEdit();
+ m_searchEdit->setFocus();
+}
+
+void CTitleWidget::slotSearchEditFocusChanged(bool onFocus)
+{
+ //?????????????????????????????????????????????????????????????????????
+ if (onFocus || !m_searchEdit->text().isEmpty()) {
+ return;
+ }
+ //?????????????????????????????????????????????
+ if (m_showState == Title_State_Mini) {
+ m_buttonBox->show();
+ m_searchEdit->hide();
+ m_searchPush->show();
+ setFocusProxy(m_buttonBox);
+ }
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-calendar-5.8.29/calendar-client/src/customWidget/ctitlewidget.h
new/dde-calendar-5.8.30/calendar-client/src/customWidget/ctitlewidget.h
--- old/dde-calendar-5.8.29/calendar-client/src/customWidget/ctitlewidget.h
2022-03-09 03:08:24.000000000 +0100
+++ new/dde-calendar-5.8.30/calendar-client/src/customWidget/ctitlewidget.h
2022-04-21 07:13:09.000000000 +0200
@@ -33,7 +33,17 @@
{
Q_OBJECT
public:
+ enum Title_State {
+ Title_State_Mini, //??????????????????
+ Title_State_Normal //??????????????????
+ };
+
explicit CTitleWidget(QWidget *parent = nullptr);
+ /**
+ * @brief setShowState ??????????????????
+ * @param state
+ */
+ void setShowState(Title_State state);
DButtonBox *buttonBox() const;
@@ -41,6 +51,22 @@
DIconButton *newScheduleBtn() const;
+private:
+ /**
+ * @brief stateUpdate ??????????????????
+ */
+ void stateUpdate();
+
+ /**
+ * @brief miniStateShowSearchEdit ??????????????????????????????
+ */
+ void miniStateShowSearchEdit();
+
+ /**
+ * @brief normalStateUpdateSearchEditWidth ???????????????????????????
+ */
+ void normalStateUpdateSearchEditWidth();
+
protected:
void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE;
bool eventFilter(QObject *o, QEvent *e) override;
@@ -48,10 +74,22 @@
void signalSetButtonFocus();
void signalSearchFocusSwitch();
public slots:
+ /**
+ * @brief slotShowSearchEdit ????????????????????????????????????
+ */
+ void slotShowSearchEdit();
+ /**
+ * @brief slotSearchEditFocusChanged
???????????????????????????????????????????????????????????????????????????
+ * @param onFocus ????????????????????????
+ */
+ void slotSearchEditFocusChanged(bool onFocus);
+
private:
- CButtonBox *m_buttonBox {};
- DSearchEdit *m_searchEdit {};
- DIconButton *m_newScheduleBtn {}; //???????????????????????????
+ CButtonBox *m_buttonBox {nullptr};
+ DSearchEdit *m_searchEdit {nullptr};
+ DIconButton *m_newScheduleBtn {nullptr}; //???????????????????????????
+ DIconButton *m_searchPush {nullptr};
+ Title_State m_showState {Title_State_Normal};
};
#endif // CTITLEWIDGET_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-calendar-5.8.29/calendar-client/src/customWidget/scheduleview.cpp
new/dde-calendar-5.8.30/calendar-client/src/customWidget/scheduleview.cpp
--- old/dde-calendar-5.8.29/calendar-client/src/customWidget/scheduleview.cpp
2022-03-09 03:08:24.000000000 +0100
+++ new/dde-calendar-5.8.30/calendar-client/src/customWidget/scheduleview.cpp
2022-04-21 07:13:09.000000000 +0200
@@ -435,10 +435,6 @@
connect(m_graphicsView, &CGraphicsView::signalGotoDayView, this,
&CScheduleView::slotCurrentScheduleDate);
- connect(m_alldaylist, &CAllDayEventWeekView::signalViewtransparentFrame,
this,
- &CScheduleView::signalViewtransparentFrame);
- connect(m_graphicsView, &CGraphicsView::signalViewtransparentFrame, this,
- &CScheduleView::signalViewtransparentFrame);
//??????????????????????????????
connect(m_graphicsView, &CAllDayEventWeekView::signalAngleDelta, this,
&CScheduleView::signalAngleDelta);
connect(m_alldaylist, &CAllDayEventWeekView::signalAngleDelta, this,
&CScheduleView::signalAngleDelta);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-calendar-5.8.29/calendar-client/src/customWidget/scheduleview.h
new/dde-calendar-5.8.30/calendar-client/src/customWidget/scheduleview.h
--- old/dde-calendar-5.8.29/calendar-client/src/customWidget/scheduleview.h
2022-03-09 03:08:24.000000000 +0100
+++ new/dde-calendar-5.8.30/calendar-client/src/customWidget/scheduleview.h
2022-04-21 07:13:09.000000000 +0200
@@ -52,7 +52,6 @@
void setTimeFormat(QString timeformat);
signals:
void signalsCurrentScheduleDate(QDate date);
- void signalViewtransparentFrame(int type);
/**
* @brief signalAngleDelta ?????????????????????????????????
* @param delta ???????????????
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-calendar-5.8.29/calendar-client/src/dialog/myscheduleview.cpp
new/dde-calendar-5.8.30/calendar-client/src/dialog/myscheduleview.cpp
--- old/dde-calendar-5.8.29/calendar-client/src/dialog/myscheduleview.cpp
2022-03-09 03:08:24.000000000 +0100
+++ new/dde-calendar-5.8.30/calendar-client/src/dialog/myscheduleview.cpp
2022-04-21 07:13:09.000000000 +0200
@@ -55,11 +55,6 @@
focusNextPrevChild(false);
}
-CMyScheduleView::~CMyScheduleView()
-{
- emit signalViewtransparentFrame(0);
-}
-
/**
* @brief CMyScheduleView::AutoFeed ??????????????????????????????
* @param text
@@ -157,12 +152,6 @@
widget->setPalette(palette);
}
-void CMyScheduleView::showEvent(QShowEvent *event)
-{
- Q_UNUSED(event);
- emit signalViewtransparentFrame(1);
-}
-
bool CMyScheduleView::eventFilter(QObject *o, QEvent *e)
{
if (e->type() == QEvent::FontChange) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-calendar-5.8.29/calendar-client/src/dialog/myscheduleview.h
new/dde-calendar-5.8.30/calendar-client/src/dialog/myscheduleview.h
--- old/dde-calendar-5.8.29/calendar-client/src/dialog/myscheduleview.h
2022-03-09 03:08:24.000000000 +0100
+++ new/dde-calendar-5.8.30/calendar-client/src/dialog/myscheduleview.h
2022-04-21 07:13:09.000000000 +0200
@@ -40,14 +40,12 @@
Q_OBJECT
public:
explicit CMyScheduleView(const ScheduleDataInfo &schduleInfo, QWidget
*parent = nullptr);
- ~CMyScheduleView() override;
ScheduleDataInfo getSchedules()
{
return m_scheduleInfo;
}
signals:
void signalsEditorDelete(int type = 0);
- void signalViewtransparentFrame(int type);
public slots:
//??????????????????
void slotBtClick(int buttonIndex, const QString &buttonName);
@@ -62,7 +60,6 @@
//?????????????????????
void setPaletteTextColor(QWidget *widget, QColor textColor);
protected:
- void showEvent(QShowEvent *event) override;
bool eventFilter(QObject *o, QEvent *e) override;
void updateDateTimeFormat() override;
private:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-calendar-5.8.29/calendar-client/src/dialog/scheduledlg.cpp
new/dde-calendar-5.8.30/calendar-client/src/dialog/scheduledlg.cpp
--- old/dde-calendar-5.8.29/calendar-client/src/dialog/scheduledlg.cpp
2022-03-09 03:08:24.000000000 +0100
+++ new/dde-calendar-5.8.30/calendar-client/src/dialog/scheduledlg.cpp
2022-04-21 07:13:09.000000000 +0200
@@ -521,12 +521,6 @@
return DCalendarDDialog::eventFilter(obj, pEvent);
}
-void CScheduleDlg::showEvent(QShowEvent *event)
-{
- Q_UNUSED(event);
- emit signalViewtransparentFrame(1);
-}
-
void CScheduleDlg::closeEvent(QCloseEvent *event)
{
DDialog::closeEvent(event);
@@ -536,7 +530,6 @@
} else {
reject();
}
- emit signalViewtransparentFrame(0);
}
void CScheduleDlg::changeEvent(QEvent *event)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-calendar-5.8.29/calendar-client/src/dialog/scheduledlg.h
new/dde-calendar-5.8.30/calendar-client/src/dialog/scheduledlg.h
--- old/dde-calendar-5.8.29/calendar-client/src/dialog/scheduledlg.h
2022-03-09 03:08:24.000000000 +0100
+++ new/dde-calendar-5.8.30/calendar-client/src/dialog/scheduledlg.h
2022-04-21 07:13:09.000000000 +0200
@@ -51,33 +51,32 @@
* @param begin ???????????????DateTime???
* @param end ???????????? (DateTime???
*/
- void updateEndTimeListAndTimeDiff(const QDateTime &begin ,const QDateTime
&end);
+ void updateEndTimeListAndTimeDiff(const QDateTime &begin, const QDateTime
&end);
/**
* @brief updateEndTimeList ??????????????????????????????
* @param begin ????????????(time)
* @param isShowTimeInterval ????????????????????????
*/
- void updateEndTimeList(const QTime &begin,bool isShowTimeInterval);
+ void updateEndTimeList(const QTime &begin, bool isShowTimeInterval);
signals:
- void signalViewtransparentFrame(int type);
void signalScheduleUpdate(int id = 0);
public slots:
/**
* @brief ??????????????????
- *
+ *
*/
void slotBeginTimeChange();
/**
* @brief ??????????????????
- *
+ *
*/
void slotEndTimeChange();
/**
* @brief ??????????????????
- *
+ *
*/
void slotEndDateChange(const QDate &date);
//???????????????????????????
@@ -90,7 +89,6 @@
void sloteRpeatactivated(int index);
protected:
bool eventFilter(QObject *obj, QEvent *pEvent) override;
- void showEvent(QShowEvent *event) override;
void closeEvent(QCloseEvent *event) override;
void changeEvent(QEvent *event) override;
void updateDateTimeFormat() override;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dde-calendar-5.8.29/calendar-client/src/main.cpp
new/dde-calendar-5.8.30/calendar-client/src/main.cpp
--- old/dde-calendar-5.8.29/calendar-client/src/main.cpp 2022-03-09
03:08:24.000000000 +0100
+++ new/dde-calendar-5.8.30/calendar-client/src/main.cpp 2022-04-21
07:13:09.000000000 +0200
@@ -27,7 +27,7 @@
#include <DApplication>
#include <DLog>
-#include <DApplicationHelper>
+#include <DGuiApplicationHelper>
#include <DApplicationSettings>
#include <QDBusConnection>
@@ -101,7 +101,7 @@
if (!dbus.registerObject("/com/deepin/Calendar", &ww)) {
qWarning() << "registerObject Error:" << dbus.lastError();
}
- ww.slotTheme(DApplicationHelper::instance()->themeType());
+ ww.slotTheme(DGuiApplicationHelper::instance()->themeType());
ww.show();
PERF_PRINT_END("POINT-01");
return app->exec();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-calendar-5.8.29/calendar-client/src/scheduleTask/cscheduleoperation.cpp
new/dde-calendar-5.8.30/calendar-client/src/scheduleTask/cscheduleoperation.cpp
---
old/dde-calendar-5.8.29/calendar-client/src/scheduleTask/cscheduleoperation.cpp
2022-03-09 03:08:24.000000000 +0100
+++
new/dde-calendar-5.8.30/calendar-client/src/scheduleTask/cscheduleoperation.cpp
2022-04-21 07:13:09.000000000 +0200
@@ -54,7 +54,6 @@
} else {
//??????????????????????????????????????????????????????
if (newInfo.getAllDay() != oldInfo.getAllDay()) {
- emit signalViewtransparentFrame(1);
CScheduleCtrlDlg msgBox(m_widget);
msgBox.setText(
tr("All occurrences of a repeating event must have the same
all-day status."));
@@ -62,7 +61,6 @@
msgBox.addPushButton(tr("Cancel", "button"), true);
msgBox.addWaringButton(tr("Change All"), true);
msgBox.exec();
- emit signalViewtransparentFrame(0);
if (msgBox.clickButton() == 0) {
_result = false;
@@ -72,14 +70,12 @@
}
} else if (oldInfo.getRepetitionRule().getRuleId() !=
newInfo.getRepetitionRule().getRuleId()) {
//??????????????????
- emit signalViewtransparentFrame(1);
CScheduleCtrlDlg msgBox(m_widget);
msgBox.setText(tr("You are changing the repeating rule of this
event."));
msgBox.setInformativeText(tr("Do you want to change all
occurrences?"));
msgBox.addPushButton(tr("Cancel", "button"), true);
msgBox.addWaringButton(tr("Change All"), true);
msgBox.exec();
- emit signalViewtransparentFrame(0);
if (msgBox.clickButton() == 0) {
_result = false;
} else if (msgBox.clickButton() == 1) {
@@ -102,14 +98,12 @@
bool _restuleBool {false};
//?????????????????????
if (scheduleInfo.getRepetitionRule().getRuleId() == 0) {
- emit signalViewtransparentFrame(1);
CScheduleCtrlDlg msgBox(m_widget);
msgBox.setText(tr("You are deleting an event."));
msgBox.setInformativeText(tr("Are you sure you want to delete this
event?"));
msgBox.addPushButton(tr("Cancel", "button"), true);
msgBox.addWaringButton(tr("Delete", "button"), true);
msgBox.exec();
- emit signalViewtransparentFrame(0);
if (msgBox.clickButton() == 0) {
return false;
} else if (msgBox.clickButton() == 1) {
@@ -119,7 +113,6 @@
} else {
//?????????????????????????????????
if (scheduleInfo.getRecurID() == 0) {
- emit signalViewtransparentFrame(1);
CScheduleCtrlDlg msgBox(m_widget);
msgBox.setText(tr("You are deleting an event."));
msgBox.setInformativeText(tr("Do you want to delete all
occurrences of this event, or only the selected occurrence?"));
@@ -127,7 +120,6 @@
msgBox.addPushButton(tr("Delete All"));
msgBox.addWaringButton(tr("Delete Only This Event"));
msgBox.exec();
- emit signalViewtransparentFrame(0);
if (msgBox.clickButton() == 0) {
return false;
} else if (msgBox.clickButton() == 1) {
@@ -143,7 +135,6 @@
_restuleBool = true;
}
} else {
- emit signalViewtransparentFrame(1);
CScheduleCtrlDlg msgBox(m_widget);
msgBox.setText(tr("You are deleting an event."));
msgBox.setInformativeText(tr("Do you want to delete this and all
future occurrences of this event, or only the selected occurrence?"));
@@ -151,7 +142,6 @@
msgBox.addPushButton(tr("Delete All Future Events"));
msgBox.addWaringButton(tr("Delete Only This Event"));
msgBox.exec();
- emit signalViewtransparentFrame(0);
if (msgBox.clickButton() == 0) {
return false;
@@ -227,7 +217,6 @@
bool _result{false};
//??????????????????????????????
if (newinfo.getRecurID() == 0) {
- emit signalViewtransparentFrame(1);
CScheduleCtrlDlg msgBox(m_widget);
msgBox.setText(tr("You are changing a repeating event."));
msgBox.setInformativeText(
@@ -237,7 +226,6 @@
msgBox.addPushButton(tr("All"));
msgBox.addsuggestButton(tr("Only This Event"));
msgBox.exec();
- emit signalViewtransparentFrame(0);
if (msgBox.clickButton() == 0) {
_result = false;
@@ -261,7 +249,6 @@
_result = changeOnlyInfo(newinfo, oldinfo);
}
} else {
- emit signalViewtransparentFrame(1);
CScheduleCtrlDlg msgBox(m_widget);
msgBox.setText(tr("You are changing a repeating event."));
msgBox.setInformativeText(
@@ -271,7 +258,6 @@
msgBox.addPushButton(tr("All Future Events"));
msgBox.addsuggestButton(tr("Only This Event"));
msgBox.exec();
- emit signalViewtransparentFrame(0);
if (msgBox.clickButton() == 0) {
_result = false;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-calendar-5.8.29/calendar-client/src/scheduleTask/cscheduleoperation.h
new/dde-calendar-5.8.30/calendar-client/src/scheduleTask/cscheduleoperation.h
---
old/dde-calendar-5.8.29/calendar-client/src/scheduleTask/cscheduleoperation.h
2022-03-09 03:08:24.000000000 +0100
+++
new/dde-calendar-5.8.30/calendar-client/src/scheduleTask/cscheduleoperation.h
2022-04-21 07:13:09.000000000 +0200
@@ -56,7 +56,6 @@
//??????????????????
void changeRepetitionRule(ScheduleDataInfo &newinfo, const
ScheduleDataInfo &oldinfo);
signals:
- void signalViewtransparentFrame(const int id = 0);
public slots:
private:
CScheduleDBus *m_DBusManager = nullptr;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-calendar-5.8.29/calendar-client/src/view/alldayeventview.cpp
new/dde-calendar-5.8.30/calendar-client/src/view/alldayeventview.cpp
--- old/dde-calendar-5.8.29/calendar-client/src/view/alldayeventview.cpp
2022-03-09 03:08:24.000000000 +0100
+++ new/dde-calendar-5.8.30/calendar-client/src/view/alldayeventview.cpp
2022-04-21 07:13:09.000000000 +0200
@@ -64,14 +64,12 @@
void CAllDayEventWeekView::slotCreate(const QDateTime &date)
{
- emit signalViewtransparentFrame(1);
CScheduleDlg dlg(1, this);
dlg.setDate(date);
dlg.setAllDay(true);
if (dlg.exec() == DDialog::Accepted) {
emit signalsUpdateSchedule();
}
- emit signalViewtransparentFrame(0);
}
bool CAllDayEventWeekView::IsEqualtime(const QDateTime &timeFirst, const
QDateTime &timeSecond)
@@ -326,12 +324,10 @@
m_createDate.setTime(QTime::currentTime());
slotCreate(m_createDate);
} else {
- emit signalViewtransparentFrame(1);
m_updateDflag = false;
CMyScheduleView dlg(item->getData(), this);
connect(&dlg, &CMyScheduleView::signalsEditorDelete, this,
&CAllDayEventWeekView::slotDoubleEvent);
dlg.exec();
- emit signalViewtransparentFrame(0);
disconnect(&dlg, &CMyScheduleView::signalsEditorDelete, this,
&CAllDayEventWeekView::slotDoubleEvent);
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-calendar-5.8.29/calendar-client/src/view/draginfographicsview.cpp
new/dde-calendar-5.8.30/calendar-client/src/view/draginfographicsview.cpp
--- old/dde-calendar-5.8.29/calendar-client/src/view/draginfographicsview.cpp
2022-03-09 03:08:24.000000000 +0100
+++ new/dde-calendar-5.8.30/calendar-client/src/view/draginfographicsview.cpp
2022-04-21 07:13:09.000000000 +0200
@@ -333,21 +333,17 @@
QAction *action_t = m_rightMenu->exec(QCursor::pos());
if (action_t == m_editAction) {
- emit signalViewtransparentFrame(1);
CScheduleDlg dlg(0, this);
dlg.setData(infoitem->getData());
if (dlg.exec() == DDialog::Accepted) {
emit signalsUpdateSchedule();
}
- emit signalViewtransparentFrame(0);
} else if (action_t == m_deleteAction) {
DeleteItem(infoitem->getData());
}
} else {
- emit signalViewtransparentFrame(1);
CMyScheduleView dlg(infoitem->getData(), this);
dlg.exec();
- emit signalViewtransparentFrame(0);
}
} else {
RightClickToCreate(listItem, event->pos());
@@ -493,8 +489,6 @@
void DragInfoGraphicsView::updateScheduleInfo(const ScheduleDataInfo &info)
{
CScheduleOperation _scheduleOperation(this);
- //??????????????????????????????????????????
- connect(&_scheduleOperation,
&CScheduleOperation::signalViewtransparentFrame, this,
&DragInfoGraphicsView::signalViewtransparentFrame);
if (_scheduleOperation.changeSchedule(info, m_PressScheduleInfo)) {
//?????????????????????????????????????????????
m_hasUpdateMark = true;
@@ -575,7 +569,6 @@
if (MeetCreationConditions(m_MoveDate)) {
//????????????????????????leaveEvent??????????????????
m_DragStatus = NONE;
- emit signalViewtransparentFrame(1);
CScheduleDlg dlg(1, this);
dlg.setData(m_DragScheduleInfo);
//?????????????????????????????????????????????
@@ -586,7 +579,6 @@
}
//?????????????????????????????????
setPressSelectInfo(ScheduleDataInfo());
- emit signalViewtransparentFrame(0);
}
break;
case ChangeBegin:
@@ -653,11 +645,9 @@
*/
void DragInfoGraphicsView::DeleteItem(const ScheduleDataInfo &info)
{
- emit signalViewtransparentFrame(1);
//????????????
CScheduleOperation _scheduleOperation(this);
_scheduleOperation.deleteSchedule(info);
- emit signalViewtransparentFrame(0);
}
/**
@@ -682,7 +672,6 @@
void DragInfoGraphicsView::slotCreate(const QDateTime &date)
{
- emit signalViewtransparentFrame(1);
CScheduleDlg dlg(1, this);
QDateTime tDatatime;
tDatatime.setDate(date.date());
@@ -698,7 +687,6 @@
if (dlg.exec() == DDialog::Accepted) {
emit signalsUpdateSchedule();
}
- emit signalViewtransparentFrame(0);
}
ScheduleDataInfo DragInfoGraphicsView::getScheduleInfo(const QDateTime
&beginDate, const QDateTime &endDate)
@@ -870,13 +858,11 @@
QAction *action_t = m_rightMenu->exec(screen_pos);
if (action_t == m_editAction) {
- emit signalViewtransparentFrame(1);
CScheduleDlg dlg(0, this);
dlg.setData(infoitem->getData());
if (dlg.exec() == DDialog::Accepted) {
emit signalsUpdateSchedule();
}
- emit signalViewtransparentFrame(0);
} else if (action_t == m_deleteAction) {
DeleteItem(infoitem->getData());
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-calendar-5.8.29/calendar-client/src/view/draginfographicsview.h
new/dde-calendar-5.8.30/calendar-client/src/view/draginfographicsview.h
--- old/dde-calendar-5.8.29/calendar-client/src/view/draginfographicsview.h
2022-03-09 03:08:24.000000000 +0100
+++ new/dde-calendar-5.8.30/calendar-client/src/view/draginfographicsview.h
2022-04-21 07:13:09.000000000 +0200
@@ -162,7 +162,6 @@
void signalAngleDelta(int delta);
//????????????????????????
void signalsUpdateSchedule();
- void signalViewtransparentFrame(const int id = 0);
/**
* @brief signalScheduleShow ???????????????????????????
* @param isShow ????????????
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-calendar-5.8.29/calendar-client/src/view/graphicsview.cpp
new/dde-calendar-5.8.30/calendar-client/src/view/graphicsview.cpp
--- old/dde-calendar-5.8.29/calendar-client/src/view/graphicsview.cpp
2022-03-09 03:08:24.000000000 +0100
+++ new/dde-calendar-5.8.30/calendar-client/src/view/graphicsview.cpp
2022-04-21 07:13:09.000000000 +0200
@@ -113,14 +113,12 @@
void CGraphicsView::slotCreate(const QDateTime &date)
{
- emit signalViewtransparentFrame(1);
CScheduleDlg dlg(1, this);
dlg.setDate(date);
if (dlg.exec() == DDialog::Accepted) {
emit signalsUpdateSchedule();
}
- emit signalViewtransparentFrame(0);
}
bool CGraphicsView::MeetCreationConditions(const QDateTime &date)
@@ -390,26 +388,22 @@
if (item == nullptr) {
QPointF scenePoss = mapToScene(event->pos());
- emit signalViewtransparentFrame(1);
CScheduleDlg dlg(1, this);
QDateTime tDatatime = m_coorManage->getDate(scenePoss);
dlg.setDate(tDatatime);
if (dlg.exec() == DDialog::Accepted) {
emit signalsUpdateSchedule();
}
- emit signalViewtransparentFrame(0);
return;
}
if (item->getType() == 1) {
emit signalsCurrentScheduleDate(item->getDate());
return;
}
- emit signalViewtransparentFrame(1);
m_updateDflag = false;
CMyScheduleView dlg(item->getData(), this);
connect(&dlg, &CMyScheduleView::signalsEditorDelete, this,
&CGraphicsView::slotDoubleEvent);
dlg.exec();
- emit signalViewtransparentFrame(0);
disconnect(&dlg, &CMyScheduleView::signalsEditorDelete, this,
&CGraphicsView::slotDoubleEvent);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-calendar-5.8.29/calendar-client/src/view/monthgraphiview.cpp
new/dde-calendar-5.8.30/calendar-client/src/view/monthgraphiview.cpp
--- old/dde-calendar-5.8.29/calendar-client/src/view/monthgraphiview.cpp
2022-03-09 03:08:24.000000000 +0100
+++ new/dde-calendar-5.8.30/calendar-client/src/view/monthgraphiview.cpp
2022-04-21 07:13:09.000000000 +0200
@@ -211,7 +211,12 @@
info = m_lunarCache.value(date);
if (info.mLunarDayName == "??????") {
- info.mLunarDayName = info.mLunarMonthName + info.mLunarDayName;
+ //??????????????????????????????????????????
+ if (info.mLunarMonthName.contains("???")) {
+ info.mLunarDayName = info.mLunarMonthName;
+ } else {
+ info.mLunarDayName = info.mLunarMonthName +
info.mLunarDayName;
+ }
}
if (info.mTerm.isEmpty()) {
@@ -383,8 +388,6 @@
if (infoitem != nullptr) {
CMyScheduleView dlg(infoitem->getData(), this);
connect(&dlg, &CMyScheduleView::signalsEditorDelete, this,
&CMonthGraphicsview::signalsUpdateSchedule);
- connect(&dlg, &CMyScheduleView::signalViewtransparentFrame,
- this, &CMonthGraphicsview::signalViewtransparentFrame);
dlg.exec();
return;
}
@@ -535,7 +538,6 @@
void CMonthGraphicsview::slotCreate(const QDateTime &date)
{
- emit signalViewtransparentFrame(1);
CScheduleDlg dlg(1, this);
QDateTime tDatatime;
tDatatime.setDate(date.date());
@@ -553,5 +555,4 @@
emit signalsUpdateSchedule();
emit signalsScheduleUpdate(0);
}
- emit signalViewtransparentFrame(0);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-calendar-5.8.29/calendar-client/src/widget/calendarmainwindow.cpp
new/dde-calendar-5.8.30/calendar-client/src/widget/calendarmainwindow.cpp
--- old/dde-calendar-5.8.29/calendar-client/src/widget/calendarmainwindow.cpp
2022-03-09 03:08:24.000000000 +0100
+++ new/dde-calendar-5.8.30/calendar-client/src/widget/calendarmainwindow.cpp
2022-04-21 07:13:09.000000000 +0200
@@ -55,8 +55,13 @@
DGUI_USE_NAMESPACE
DWIDGET_USE_NAMESPACE
-static const int CalendarMWidth = 860;
+static const int CalendarMWidth = 646;
static const int CalendarMHeight = 634;
+const int CalendarSwitchWidth = 647;
//??????????????????????????????????????????????????????????????????
+const int CalendarViewSwitchWidth = 804;
//?????????????????????????????????????????????????????????????????????
+
+const int Calendar_Default_Width = 860; //????????????
+const int Calendar_Default_Height = 634; //????????????
Calendarmainwindow::Calendarmainwindow(int index, QWidget *w)
: DMainWindow(w)
@@ -106,11 +111,14 @@
int width =
CConfigSettings::getInstance()->value("base.windowWidth").toInt();
int height =
CConfigSettings::getInstance()->value("base.windowHeight").toInt();
QRect rect(0, 0, width, height);
- rect.moveCenter(desktopwidget->geometry().center());
this->setGeometry(rect);
} else {
- Dtk::Widget::moveToCenter(this);
+ //????????????????????????????????????????????????
+ QRect rect(0, 0, Calendar_Default_Width, Calendar_Default_Height);
+ this->setGeometry(rect);
}
+ //?????????????????????
+ Dtk::Widget::moveToCenter(this);
//??????????????????
CalendarGlobalEnv::getGlobalEnv()->registerKey(DDECalendar::CursorPointKey,
QPoint());
@@ -319,22 +327,22 @@
CDynamicIcon::getInstance()->setTitlebar(this->titlebar());
CDynamicIcon::getInstance()->setIcon();
- CTitleWidget *titleWidget = new CTitleWidget(this);
- titleWidget->setFocusPolicy(Qt::TabFocus);
- this->titlebar()->setCustomWidget(titleWidget);
- setTabOrder(this->titlebar(), titleWidget);
+ m_titleWidget = new CTitleWidget(this);
+ m_titleWidget->setFocusPolicy(Qt::TabFocus);
+ this->titlebar()->setCustomWidget(m_titleWidget);
+ setTabOrder(this->titlebar(), m_titleWidget);
//??????????????????????????????????????????
- this->titlebar()->setFocusProxy(titleWidget);
+ this->titlebar()->setFocusProxy(m_titleWidget);
//????????????????????????
- connect(titleWidget, &CTitleWidget::signalSetButtonFocus, [ = ] {
+ connect(m_titleWidget, &CTitleWidget::signalSetButtonFocus, [=] {
m_setButtonFocus = true;
});
- connect(titleWidget, &CTitleWidget::signalSearchFocusSwitch, this,
+ connect(m_titleWidget, &CTitleWidget::signalSearchFocusSwitch, this,
&Calendarmainwindow::slotSearchFocusSwitch);
- m_searchEdit = titleWidget->searchEdit();
- m_buttonBox = titleWidget->buttonBox();
- m_newScheduleBtn = titleWidget->newScheduleBtn();
+ m_searchEdit = m_titleWidget->searchEdit();
+ m_buttonBox = m_titleWidget->buttonBox();
+ m_newScheduleBtn = m_titleWidget->newScheduleBtn();
m_stackWidget = new AnimationStackedWidget();
m_stackWidget->setObjectName("StackedWidget");
@@ -405,19 +413,10 @@
&Calendarmainwindow::slotSearchSelectSchedule);
connect(m_scheduleSearchView, &CScheduleSearchView::signalScheduleHide,
this,
&Calendarmainwindow::setScheduleHide);
- //???????????????????????????????????????
- connect(m_scheduleSearchView,
&CScheduleSearchView::signalViewtransparentFrame, this,
- &Calendarmainwindow::slotViewtransparentFrame);
+
connect(m_scheduleSearchView,
&CScheduleSearchView::signalSelectCurrentItem, this,
&Calendarmainwindow::slotSetSearchFocus);
- connect(m_yearwindow, &CYearWindow::signalViewtransparentFrame, this,
- &Calendarmainwindow::slotViewtransparentFrame);
- connect(m_monthWindow, &CMonthWindow::signalViewtransparentFrame, this,
- &Calendarmainwindow::slotViewtransparentFrame);
- connect(m_weekWindow, &CWeekWindow::signalViewtransparentFrame, this,
- &Calendarmainwindow::slotViewtransparentFrame);
- connect(m_DayWindow, &CDayWindow::signalViewtransparentFrame, this,
- &Calendarmainwindow::slotViewtransparentFrame);
+
//??????????????????
connect(m_currentDateUpdateTimer, &QTimer::timeout, this,
&Calendarmainwindow::slotCurrentDateUpdate);
@@ -479,12 +478,29 @@
void Calendarmainwindow::resizeEvent(QResizeEvent *event)
{
+ DMainWindow::resizeEvent(event);
m_transparentFrame->resize(width(), height() - 50);
- m_scheduleSearchViewMaxWidth = qRound(0.2325 * width() + 0.5);
+
+ if (width() < CalendarSwitchWidth) {
+ m_titleWidget->setShowState(CTitleWidget::Title_State_Mini);
+ } else {
+ m_titleWidget->setShowState(CTitleWidget::Title_State_Normal);
+ }
+
+ if (width() < CalendarViewSwitchWidth) {
+ m_isNormalStateShow = false;
+ m_stackWidget->setVisible(!m_contentBackground->isVisible());
+ m_scheduleSearchViewMaxWidth = this->width();
+ } else {
+ m_scheduleSearchViewMaxWidth = qRound(0.2325 * width() + 0.5);
+ m_isNormalStateShow = true;
+ m_stackWidget->setVisible(true);
+ m_contentBackground->setVisible(m_opensearchflag);
+ }
m_scheduleSearchView->setMaxWidth(m_scheduleSearchViewMaxWidth);
setSearchWidth(m_scheduleSearchViewMaxWidth);
setScheduleHide();
- DMainWindow::resizeEvent(event);
+
//??????????????????
CConfigSettings::getInstance()->setOption("base.windowWidth",
event->size().width());
CConfigSettings::getInstance()->setOption("base.windowHeight",
event->size().height());
@@ -515,6 +531,13 @@
{
if (!m_opensearchflag && !m_searchEdit->text().isEmpty()) {
m_opensearchflag = true;
+ }
+ //?????????????????????
+ if (m_opensearchflag) {
+ //?????????????????????????????????????????????????????????
+ if (!m_isNormalStateShow) {
+ m_stackWidget->setVisible(false);
+ }
m_contentBackground->setVisible(true);
}
m_scheduleSearchView->slotsetSearch(m_searchEdit->text());
@@ -535,6 +558,7 @@
m_weekWindow->setSearchWFlag(false);
m_DayWindow->setSearchWFlag(false);
m_contentBackground->setVisible(false);
+ m_stackWidget->setVisible(true);
m_opensearchflag = false;
}
updateHeight();
@@ -562,6 +586,20 @@
*/
void Calendarmainwindow::slotSearchSelectSchedule(const ScheduleDataInfo
&scheduleInfo)
{
+
//???????????????????????????????????????????????????????????????????????????????????????
+ //????????????????????????????????????????????????????????????????????????
+ if (!m_isNormalStateShow) {
+ //
CalendarGlobalEnv::getGlobalEnv()->registerKey("SearchItemEvent", "Keyboard");
+
+ QVariant variant;
+ CalendarGlobalEnv::getGlobalEnv()->getValueByKey("SearchItemEvent",
variant);
+ QString searchItemEvent = variant.toString();
+ //???????????????????????????
+ if (searchItemEvent == "MousePress") {
+ m_stackWidget->setVisible(true);
+ m_contentBackground->setVisible(false);
+ }
+ }
//????????????????????????
CScheduleBaseWidget *_showWidget = dynamic_cast<CScheduleBaseWidget *>
(m_stackWidget->currentWidget());
@@ -593,16 +631,12 @@
*/
void Calendarmainwindow::slotViewtransparentFrame(const bool isShow)
{
- static int showFrameCount = 0;
if (isShow) {
m_transparentFrame->resize(width(), height() - 50);
m_transparentFrame->move(0, 50);
m_transparentFrame->show();
- ++showFrameCount;
} else {
- if (showFrameCount == 1)
- m_transparentFrame->hide();
- --showFrameCount;
+ m_transparentFrame->hide();
}
}
@@ -662,9 +696,7 @@
CScheduleDlg _scheduleDig(1, this, false);
//??????????????????
_scheduleDig.setDate(_beginTime);
- slotViewtransparentFrame(true);
_scheduleDig.exec();
- slotViewtransparentFrame(false);
}
void Calendarmainwindow::slotDeleteitem()
@@ -736,5 +768,14 @@
if (event->type() == QEvent::Move) {
setScheduleHide();
}
+
+ //??????????????????????????????????????????
+ if (event->type() == QEvent::WindowActivate) {
+ slotViewtransparentFrame(false);
+ }
+ //?????????????????????????????????????????????
+ if (event->type() == QEvent::WindowDeactivate) {
+ slotViewtransparentFrame(true);
+ }
return DMainWindow::event(event);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-calendar-5.8.29/calendar-client/src/widget/calendarmainwindow.h
new/dde-calendar-5.8.30/calendar-client/src/widget/calendarmainwindow.h
--- old/dde-calendar-5.8.29/calendar-client/src/widget/calendarmainwindow.h
2022-03-09 03:08:24.000000000 +0100
+++ new/dde-calendar-5.8.30/calendar-client/src/widget/calendarmainwindow.h
2022-04-21 07:13:09.000000000 +0200
@@ -43,6 +43,8 @@
class CScheduleSearchView;
class AnimationStackedWidget;
class CScheduleDataManage;
+class CTitleWidget;
+
class Calendarmainwindow : public DMainWindow
{
Q_OBJECT
@@ -106,6 +108,7 @@
CMonthWindow *m_monthWindow = nullptr;
CWeekWindow *m_weekWindow = nullptr;
CDayWindow *m_DayWindow = nullptr;
+ CTitleWidget *m_titleWidget = nullptr;
bool m_searchflag = false;
CScheduleSearchView *m_scheduleSearchView = nullptr;
DFrame *m_contentBackground = nullptr;
@@ -119,6 +122,7 @@
//??????????????????????????????
int m_defaultIndex;
bool m_setButtonFocus {false};
+ bool m_isNormalStateShow {true}; //???????????????????????????
};
#endif // CALENDARMAINWINDOW_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-calendar-5.8.29/calendar-client/src/widget/cschedulebasewidget.h
new/dde-calendar-5.8.30/calendar-client/src/widget/cschedulebasewidget.h
--- old/dde-calendar-5.8.29/calendar-client/src/widget/cschedulebasewidget.h
2022-03-09 03:08:24.000000000 +0100
+++ new/dde-calendar-5.8.30/calendar-client/src/widget/cschedulebasewidget.h
2022-04-21 07:13:09.000000000 +0200
@@ -65,8 +65,6 @@
signals:
//?????????????????? 0:????????????????????? 1????????????
2???????????? 3:?????????
void signalSwitchView(const int viewIndex = 0);
- //?????????????????????????????????
- void signalViewtransparentFrame(int type);
protected:
static CalendarManager *m_calendarManager;
QString m_lunarYear;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-calendar-5.8.29/calendar-client/src/widget/dayWidget/daywindow.cpp
new/dde-calendar-5.8.30/calendar-client/src/widget/dayWidget/daywindow.cpp
--- old/dde-calendar-5.8.29/calendar-client/src/widget/dayWidget/daywindow.cpp
2022-03-09 03:08:24.000000000 +0100
+++ new/dde-calendar-5.8.30/calendar-client/src/widget/dayWidget/daywindow.cpp
2022-04-21 07:13:09.000000000 +0200
@@ -301,7 +301,6 @@
{
connect(m_daymonthView, &CDayMonthView::signalIsDragging, this,
&CDayWindow::slotIsDragging);
connect(m_daymonthView, &CDayMonthView::signalChangeSelectDate, this,
&CDayWindow::slotChangeSelectDate);
- connect(m_scheduleView, &CScheduleView::signalViewtransparentFrame, this,
&CDayWindow::signalViewtransparentFrame);
connect(m_scheduleView, &CScheduleView::signalSwitchPrePage, this,
&CDayWindow::slotSwitchPrePage);
connect(m_scheduleView, &CScheduleView::signalSwitchNextPage, this,
&CDayWindow::slotSwitchNextPage);
}
@@ -368,7 +367,7 @@
void CDayWindow::resizeEvent(QResizeEvent *event)
{
Q_UNUSED(event);
- qreal dw = 0.4046 * width();
+ qreal dw = 0.4 * width();
int dh = height() - 20;
if (m_searchFlag) {
@@ -376,8 +375,6 @@
} else {
m_mainLayout->setContentsMargins(10, 10, 10, 10);
}
- if (dw < 350)
- dw = 350;
m_daymonthView->setFixedSize(qRound(dw), dh);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-calendar-5.8.29/calendar-client/src/widget/monthWidget/monthscheduleview.h
new/dde-calendar-5.8.30/calendar-client/src/widget/monthWidget/monthscheduleview.h
---
old/dde-calendar-5.8.29/calendar-client/src/widget/monthWidget/monthscheduleview.h
2022-03-09 03:08:24.000000000 +0100
+++
new/dde-calendar-5.8.30/calendar-client/src/widget/monthWidget/monthscheduleview.h
2022-04-21 07:13:09.000000000 +0200
@@ -52,7 +52,6 @@
signals:
void signalsUpdateSchedule(int id = 0);
void signalsCurrentScheduleDate(QDate date);
- void signalViewtransparentFrame(int type);
void signalUpdateUI(int type);
void signalPressScheduleShow(const bool isShow, const ScheduleDataInfo
&out = ScheduleDataInfo());
public slots:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-calendar-5.8.29/calendar-client/src/widget/monthWidget/monthview.cpp
new/dde-calendar-5.8.30/calendar-client/src/widget/monthWidget/monthview.cpp
---
old/dde-calendar-5.8.29/calendar-client/src/widget/monthWidget/monthview.cpp
2022-03-09 03:08:24.000000000 +0100
+++
new/dde-calendar-5.8.30/calendar-client/src/widget/monthWidget/monthview.cpp
2022-04-21 07:13:09.000000000 +0200
@@ -49,7 +49,6 @@
m_monthGraphicsView = new CMonthGraphicsview(this);
connect(m_monthGraphicsView, &CMonthGraphicsview::signalsViewSelectDate,
this, &CMonthView::signalsViewSelectDate);
- connect(m_monthGraphicsView,
&CMonthGraphicsview::signalViewtransparentFrame, this,
&CMonthView::signalViewtransparentFrame);
connect(m_monthGraphicsView, &CMonthGraphicsview::signalScheduleShow,
this, &CMonthView::slotScheduleRemindWidget);
connect(m_monthGraphicsView, &CMonthGraphicsview::signalAngleDelta, this,
&CMonthView::signalAngleDelta);
connect(m_monthGraphicsView, &CMonthGraphicsview::signalSwitchPrePage,
this, &CMonthView::signalSwitchPrePage);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-calendar-5.8.29/calendar-client/src/widget/monthWidget/monthview.h
new/dde-calendar-5.8.30/calendar-client/src/widget/monthWidget/monthview.h
--- old/dde-calendar-5.8.29/calendar-client/src/widget/monthWidget/monthview.h
2022-03-09 03:08:24.000000000 +0100
+++ new/dde-calendar-5.8.30/calendar-client/src/widget/monthWidget/monthview.h
2022-04-21 07:13:09.000000000 +0200
@@ -67,11 +67,6 @@
void deleteSelectSchedule();
signals:
/**
- * @brief signalViewtransparentFrame ?????????????????????
- * @param type
- */
- void signalViewtransparentFrame(int type);
- /**
* @brief signalsViewSelectDate ????????????
* @param date ??????
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-calendar-5.8.29/calendar-client/src/widget/monthWidget/monthwindow.cpp
new/dde-calendar-5.8.30/calendar-client/src/widget/monthWidget/monthwindow.cpp
---
old/dde-calendar-5.8.29/calendar-client/src/widget/monthWidget/monthwindow.cpp
2022-03-09 03:08:24.000000000 +0100
+++
new/dde-calendar-5.8.30/calendar-client/src/widget/monthWidget/monthwindow.cpp
2022-04-21 07:13:09.000000000 +0200
@@ -357,7 +357,6 @@
{
connect(m_today, &DPushButton::clicked, this, &CMonthWindow::slottoday);
connect(m_monthDayView, &CMonthDayView::signalsSelectDate, this,
&CMonthWindow::slotSetSelectDate);
- connect(m_monthView, &CMonthView::signalViewtransparentFrame, this,
&CMonthWindow::signalViewtransparentFrame);
//???????????????????????????????????????????????????
connect(m_monthView, &CMonthView::signalsViewSelectDate, this,
&CMonthWindow::slotViewSelectDate);
connect(m_monthView, &CMonthView::signalAngleDelta, this,
&CMonthWindow::slotAngleDelta);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-calendar-5.8.29/calendar-client/src/widget/schedulesearchview.cpp
new/dde-calendar-5.8.30/calendar-client/src/widget/schedulesearchview.cpp
--- old/dde-calendar-5.8.29/calendar-client/src/widget/schedulesearchview.cpp
2022-03-09 03:08:24.000000000 +0100
+++ new/dde-calendar-5.8.30/calendar-client/src/widget/schedulesearchview.cpp
2022-04-21 07:13:09.000000000 +0200
@@ -25,6 +25,7 @@
#include "cscheduleoperation.h"
#include "scheduledaterangeinfo.h"
#include "calendarmanage.h"
+#include "calendarglobalenv.h"
#include <DHiDPIHelper>
#include <DPalette>
@@ -150,20 +151,16 @@
}
void CScheduleSearchItem::slotEdit()
{
- emit signalViewtransparentFrame(1);
CScheduleDlg dlg(0, this);
dlg.setData(m_ScheduleInfo);
dlg.exec();
- emit signalViewtransparentFrame(0);
}
void CScheduleSearchItem::slotDelete()
{
- emit signalViewtransparentFrame(1);
//????????????
CScheduleOperation _scheduleOperation(this);
bool _isDelete = _scheduleOperation.deleteSchedule(m_ScheduleInfo);
- emit signalViewtransparentFrame(0);
//??????????????????????????????????????????
if (_isDelete) {
parentWidget()->setFocus(Qt::TabFocusReason);
@@ -351,10 +348,8 @@
void CScheduleSearchItem::mouseDoubleClickEvent(QMouseEvent *event)
{
Q_UNUSED(event);
- emit signalViewtransparentFrame(1);
CMyScheduleView dlg(m_ScheduleInfo, this);
dlg.exec();
- emit signalViewtransparentFrame(0);
}
void CScheduleSearchItem::mousePressEvent(QMouseEvent *event)
@@ -362,6 +357,10 @@
//??????????????????????????????
m_tabFocus = false;
if (event->button() == Qt::LeftButton) {
+ //?????????????????????
+ if (!CalendarGlobalEnv::getGlobalEnv()->registerKey("SearchItemEvent",
"MousePress")) {
+ CalendarGlobalEnv::getGlobalEnv()->reviseValue("SearchItemEvent",
"MousePress");
+ }
emit signalSelectSchedule(m_ScheduleInfo);
}
DLabel::mousePressEvent(event);
@@ -407,6 +406,10 @@
void CScheduleSearchItem::focusInEvent(QFocusEvent *e)
{
if (e->reason() == Qt::TabFocusReason) {
+ //?????????????????????
+ if (!CalendarGlobalEnv::getGlobalEnv()->registerKey("SearchItemEvent",
"Keyboard")) {
+ CalendarGlobalEnv::getGlobalEnv()->reviseValue("SearchItemEvent",
"Keyboard");
+ }
emit signalSelectSchedule(m_ScheduleInfo);
emit signalSelectCurrentItem(this, false);
m_tabFocus = true;
@@ -691,7 +694,6 @@
//????????????????????????????????????
m_scheduleSearchItem.append(gwi);
connect(gwi, &CScheduleSearchItem::signalSelectSchedule, this,
&CScheduleSearchView::slotSelectSchedule);
- connect(gwi, &CScheduleSearchItem::signalViewtransparentFrame, this,
&CScheduleSearchView::signalViewtransparentFrame);
connect(gwi, &CScheduleSearchItem::signalSelectCurrentItem, this,
&CScheduleSearchView::slotSelectCurrentItem);
QListWidgetItem *listItem = new QListWidgetItem;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-calendar-5.8.29/calendar-client/src/widget/schedulesearchview.h
new/dde-calendar-5.8.30/calendar-client/src/widget/schedulesearchview.h
--- old/dde-calendar-5.8.29/calendar-client/src/widget/schedulesearchview.h
2022-03-09 03:08:24.000000000 +0100
+++ new/dde-calendar-5.8.30/calendar-client/src/widget/schedulesearchview.h
2022-04-21 07:13:09.000000000 +0200
@@ -49,7 +49,6 @@
void deleteSchedule();
signals:
void signalSelectSchedule(const ScheduleDataInfo &scheduleInfo);
- void signalViewtransparentFrame(int type);
void signalScheduleHide();
void signalSelectCurrentItem();
void signalSchotCutClicked();
@@ -134,7 +133,6 @@
void signalsDelete(CScheduleSearchItem *item);
void signalsEdit(CScheduleSearchItem *item);
void signalSelectSchedule(const ScheduleDataInfo &scheduleInfo);
- void signalViewtransparentFrame(int type);
void signalSelectCurrentItem(CScheduleSearchItem *item, bool
focusOutStatus);
public slots:
void slotEdit();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-calendar-5.8.29/calendar-client/src/widget/weekWidget/weekview.cpp
new/dde-calendar-5.8.30/calendar-client/src/widget/weekWidget/weekview.cpp
--- old/dde-calendar-5.8.29/calendar-client/src/widget/weekWidget/weekview.cpp
2022-03-09 03:08:24.000000000 +0100
+++ new/dde-calendar-5.8.30/calendar-client/src/widget/weekWidget/weekview.cpp
2022-04-21 07:13:09.000000000 +0200
@@ -61,7 +61,6 @@
hBoxLayout->addWidget(m_nextButton);
//????????????
setLayout(hBoxLayout);
- setMinimumWidth(150);
connect(m_weekNumWidget, &CWeekNumWidget::signalsSelectDate, this,
&CWeekView::signalsSelectDate);
connect(m_weekNumWidget, &CWeekNumWidget::signalBtnPrev, this,
&CWeekView::signalBtnPrev);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-calendar-5.8.29/calendar-client/src/widget/weekWidget/weekwindow.cpp
new/dde-calendar-5.8.30/calendar-client/src/widget/weekWidget/weekwindow.cpp
---
old/dde-calendar-5.8.29/calendar-client/src/widget/weekWidget/weekwindow.cpp
2022-03-09 03:08:24.000000000 +0100
+++
new/dde-calendar-5.8.30/calendar-client/src/widget/weekWidget/weekwindow.cpp
2022-04-21 07:13:09.000000000 +0200
@@ -198,7 +198,6 @@
//????????????????????????????????????????????????????????????
connect(m_weekview, &CWeekView::signalBtnNext, this,
&CWeekWindow::slotnext);
connect(m_weekview, &CWeekView::signalsSelectDate, this,
&CWeekWindow::slotSelectDate);
- connect(m_scheduleView, &CScheduleView::signalViewtransparentFrame, this,
&CWeekWindow::signalViewtransparentFrame);
connect(m_weekHeadView, &CWeekHeadView::signalsViewSelectDate, this,
&CWeekWindow::slotViewSelectDate);
connect(m_weekview, &CWeekView::signalIsDragging, this,
&CWeekWindow::slotIsDragging);
//????????????????????????????????????
@@ -521,11 +520,11 @@
m_tMainLayout->setContentsMargins(0, 0, 10, 0);
}
- //??????2?????????????????? 36+36?????????m_weekview ?????????????????????
+ //??????1?????????????????? 36?????????m_weekview
?????????????????????(??????2?????????????????????????????????????????????????????????????????????)
if (!m_searchFlag) {
- m_weekview->setFixedSize(qRound(dw + 72), dh);
+ m_weekview->setFixedSize(qRound(dw + 36), dh);
} else {
- m_weekview->setFixedSize(qRound(dw - 100 + 72), dh);
+ m_weekview->setFixedSize(qRound(dw - 100 + 36), dh);
}
m_weekHeadView->setFixedSize(width() - winframe, qRound(headH));
QWidget::resizeEvent(event);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-calendar-5.8.29/calendar-client/src/widget/yearWidget/yearscheduleview.cpp
new/dde-calendar-5.8.30/calendar-client/src/widget/yearWidget/yearscheduleview.cpp
---
old/dde-calendar-5.8.29/calendar-client/src/widget/yearWidget/yearscheduleview.cpp
2022-03-09 03:08:24.000000000 +0100
+++
new/dde-calendar-5.8.30/calendar-client/src/widget/yearWidget/yearscheduleview.cpp
2022-04-21 07:13:09.000000000 +0200
@@ -368,12 +368,10 @@
} else {
//???????????????????????????????????????????????????????????????
if (scheduleinfoList.at(currentIndex).getType() !=
DDECalendar::FestivalTypeID) {
- emit signalViewtransparentFrame(1);
//???????????????????????????????????????CScheduleDlg?????????????????????
CScheduleDlg dlg(0, qobject_cast<QWidget *>(this->parent()));
dlg.setData(scheduleinfoList.at(currentIndex));
dlg.exec();
- emit signalViewtransparentFrame(0);
}
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-calendar-5.8.29/calendar-client/src/widget/yearWidget/yearscheduleview.h
new/dde-calendar-5.8.30/calendar-client/src/widget/yearWidget/yearscheduleview.h
---
old/dde-calendar-5.8.29/calendar-client/src/widget/yearWidget/yearscheduleview.h
2022-03-09 03:08:24.000000000 +0100
+++
new/dde-calendar-5.8.30/calendar-client/src/widget/yearWidget/yearscheduleview.h
2022-04-21 07:13:09.000000000 +0200
@@ -154,8 +154,6 @@
* @brief signalupdateschedule ???????????????????????????
*/
void signalupdateschedule();
- //?????????????????????????????????
- void signalViewtransparentFrame(int type);
private:
CYearScheduleView *yearscheduleview = nullptr;
QVector<ScheduleDataInfo> scheduleinfoList;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-calendar-5.8.29/calendar-client/src/widget/yearWidget/yearwindow.cpp
new/dde-calendar-5.8.30/calendar-client/src/widget/yearWidget/yearwindow.cpp
---
old/dde-calendar-5.8.29/calendar-client/src/widget/yearWidget/yearwindow.cpp
2022-03-09 03:08:24.000000000 +0100
+++
new/dde-calendar-5.8.30/calendar-client/src/widget/yearWidget/yearwindow.cpp
2022-04-21 07:13:09.000000000 +0200
@@ -408,7 +408,6 @@
connect(m_firstYearWidget, &YearFrame::signalMousePress, this,
&CYearWindow::slotMousePress);
connect(m_secondYearWidget, &YearFrame::signalMousePress, this,
&CYearWindow::slotMousePress);
connect(m_scheduleView, &CYearScheduleOutView::signalsViewSelectDate,
this, &CYearWindow::slotMousePress);
- connect(m_scheduleView, &CYearScheduleOutView::signalViewtransparentFrame,
this, &CYearWindow::signalViewtransparentFrame);
}
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dde-calendar-5.8.29/tests/cmake/asan.cmake
new/dde-calendar-5.8.30/tests/cmake/asan.cmake
--- old/dde-calendar-5.8.29/tests/cmake/asan.cmake 2022-03-09
03:08:24.000000000 +0100
+++ new/dde-calendar-5.8.30/tests/cmake/asan.cmake 2022-04-21
07:13:09.000000000 +0200
@@ -15,8 +15,5 @@
#??????????????????
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-strong
-D_FORTITY_SOURCE=1 -z noexecstack -pie -fPIC -z lazy")
-#?????????????????????
-if(CMAKE_COVERAGE_ARG STREQUAL "CMAKE_COVERAGE_ARG_ON")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall -fprofile-arcs -ftest-coverage")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -fprofile-arcs
-ftest-coverage")
-endif()
\ No newline at end of file
+# ????????????gocv?????????????????????
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fprofile-arcs -ftest-coverage")
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-calendar-5.8.29/tests/dde-calendar-client-test/CMakeLists.txt
new/dde-calendar-5.8.30/tests/dde-calendar-client-test/CMakeLists.txt
--- old/dde-calendar-5.8.29/tests/dde-calendar-client-test/CMakeLists.txt
2022-03-09 03:08:24.000000000 +0100
+++ new/dde-calendar-5.8.30/tests/dde-calendar-client-test/CMakeLists.txt
2022-04-21 07:13:09.000000000 +0200
@@ -26,7 +26,7 @@
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
-set(CMAKE_CXX_FLAGS "-Wl,--as-needed -fPIE")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--as-needed -fPIE")
set(CMAKE_EXE_LINKER_FLAGS "-pie")
include_directories(${APP_CLIENT_DIR}/src)
@@ -72,4 +72,4 @@
Qt5::Test
pthread
basestruct
-)
\ No newline at end of file
+)
