diff --git a/calendar-client/assets/builtin/dark/icons/dde_calendar_sidebar_32px.svg b/calendar-client/assets/builtin/dark/icons/dde_calendar_sidebar_32px.svg index b7c9b3d8f..38eec7d11 100644 --- a/calendar-client/assets/builtin/dark/icons/dde_calendar_sidebar_32px.svg +++ b/calendar-client/assets/builtin/dark/icons/dde_calendar_sidebar_32px.svg @@ -1,10 +1,14 @@ - - 视图切换 - - - - + + ICON + + + + + + + + diff --git a/calendar-client/assets/builtin/light/icons/dde_calendar_sidebar_32px.svg b/calendar-client/assets/builtin/light/icons/dde_calendar_sidebar_32px.svg index 879336b51..d965cfdb7 100644 --- a/calendar-client/assets/builtin/light/icons/dde_calendar_sidebar_32px.svg +++ b/calendar-client/assets/builtin/light/icons/dde_calendar_sidebar_32px.svg @@ -1,10 +1,14 @@ - - 视图切换 - - - - + + ICON + + + + + + + + diff --git a/calendar-client/src/customWidget/ctitlewidget.cpp b/calendar-client/src/customWidget/ctitlewidget.cpp index 63dab546b..86022f22d 100644 --- a/calendar-client/src/customWidget/ctitlewidget.cpp +++ b/calendar-client/src/customWidget/ctitlewidget.cpp @@ -118,6 +118,7 @@ CTitleWidget::CTitleWidget(QWidget *parent) { QHBoxLayout *layout = new QHBoxLayout; layout->setContentsMargins(0, 0, 0, 0); + layout->addSpacing(10); layout->addWidget(m_sidebarIcon, Qt::AlignLeft); layout->addSpacing(4); layout->addWidget(m_buttonBox, Qt::AlignLeft); diff --git a/calendar-client/src/dialog/myscheduleview.cpp b/calendar-client/src/dialog/myscheduleview.cpp index c985a6360..1de480248 100644 --- a/calendar-client/src/dialog/myscheduleview.cpp +++ b/calendar-client/src/dialog/myscheduleview.cpp @@ -146,7 +146,7 @@ void CMyScheduleView::slotAccountStateChange() return; } bool canSync = item->isCanSyncShedule(); - qCDebug(ClientLogger) << "Account sync state changed for schedule:" << m_scheduleInfo->summary() + qCDebug(ClientLogger) << "Account sync state changed for schedule:" << m_scheduleInfo->summary() << "can sync:" << canSync; //根据可同步状态设置删除按钮是否可用 getButtons()[0]->setEnabled(canSync); @@ -281,6 +281,7 @@ void CMyScheduleView::slotBtClick(int buttonIndex, const QString &buttonName) accept(); } else { qCDebug(ClientLogger) << "Schedule edit cancelled"; + close(); } return; } @@ -296,14 +297,14 @@ void CMyScheduleView::initUI() setOnButtonClickedClose(false); m_Title = new QLabel(this); - m_Title->setFixedSize(108, 51); + m_Title->setFixedSize(220, 51); m_Title->setAlignment(Qt::AlignCenter); DFontSizeManager::instance()->bind(m_Title, DFontSizeManager::T5, QFont::DemiBold); //设置日期图标 QIcon t_icon(CDynamicIcon::getInstance()->getPixmap()); setIcon(t_icon); m_Title->setText(tr("My Event")); - m_Title->move(137, 0); + m_Title->move(90, 0); // center x: (400-220)/2 QVBoxLayout *mainLayout = new QVBoxLayout; mainLayout->setContentsMargins(0, 0, 0, 0); diff --git a/translations/dde-calendar-service_lo.ts b/translations/dde-calendar-service_lo.ts index 02ba79105..9e6a5df48 100644 --- a/translations/dde-calendar-service_lo.ts +++ b/translations/dde-calendar-service_lo.ts @@ -854,7 +854,7 @@ Life - ຊີວ຿ດຕິດ + ຊີວິດ