Skip to content

Commit 037c888

Browse files
committed
fix: Update sidebar icon and polish UI layout
- Center “My Event” dialog title and widen its label - Ensure schedule-edit cancel button actually closes the dialog - Refresh Lao translation for “Life” event type Log: Fix some UI issues. Bug: https://pms.uniontech.com/bug-view-332585.html https://pms.uniontech.com/bug-view-332379.html https://pms.uniontech.com/bug-view-332065.html https://pms.uniontech.com/bug-view-332057.html
1 parent 8aee6c9 commit 037c888

7 files changed

Lines changed: 469 additions & 591 deletions

File tree

calendar-client/assets/builtin/dark/icons/dde_calendar_sidebar_32px.svg

Lines changed: 10 additions & 6 deletions
Loading

calendar-client/assets/builtin/light/icons/dde_calendar_sidebar_32px.svg

Lines changed: 10 additions & 6 deletions
Loading

calendar-client/src/customWidget/ctitlewidget.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ CTitleWidget::CTitleWidget(QWidget *parent)
118118
{
119119
QHBoxLayout *layout = new QHBoxLayout;
120120
layout->setContentsMargins(0, 0, 0, 0);
121+
layout->addSpacing(10);
121122
layout->addWidget(m_sidebarIcon, Qt::AlignLeft);
122123
layout->addSpacing(4);
123124
layout->addWidget(m_buttonBox, Qt::AlignLeft);

calendar-client/src/dialog/myscheduleview.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ void CMyScheduleView::slotAccountStateChange()
146146
return;
147147
}
148148
bool canSync = item->isCanSyncShedule();
149-
qCDebug(ClientLogger) << "Account sync state changed for schedule:" << m_scheduleInfo->summary()
149+
qCDebug(ClientLogger) << "Account sync state changed for schedule:" << m_scheduleInfo->summary()
150150
<< "can sync:" << canSync;
151151
//根据可同步状态设置删除按钮是否可用
152152
getButtons()[0]->setEnabled(canSync);
@@ -281,6 +281,7 @@ void CMyScheduleView::slotBtClick(int buttonIndex, const QString &buttonName)
281281
accept();
282282
} else {
283283
qCDebug(ClientLogger) << "Schedule edit cancelled";
284+
close();
284285
}
285286
return;
286287
}
@@ -296,14 +297,14 @@ void CMyScheduleView::initUI()
296297
setOnButtonClickedClose(false);
297298

298299
m_Title = new QLabel(this);
299-
m_Title->setFixedSize(108, 51);
300+
m_Title->setFixedSize(220, 51);
300301
m_Title->setAlignment(Qt::AlignCenter);
301302
DFontSizeManager::instance()->bind(m_Title, DFontSizeManager::T5, QFont::DemiBold);
302303
//设置日期图标
303304
QIcon t_icon(CDynamicIcon::getInstance()->getPixmap());
304305
setIcon(t_icon);
305306
m_Title->setText(tr("My Event"));
306-
m_Title->move(137, 0);
307+
m_Title->move(90, 0); // center x: (400-220)/2
307308

308309
QVBoxLayout *mainLayout = new QVBoxLayout;
309310
mainLayout->setContentsMargins(0, 0, 0, 0);

0 commit comments

Comments
 (0)