Skip to content

fix: Update sidebar icon and polish UI layout #271

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepin-bot merged 1 commit into from
Sep 11, 2025
Merged

fix: Update sidebar icon and polish UI layout #271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions calendar-client/assets/builtin/dark/icons/dde_calendar_sidebar_32px.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 10 additions & 6 deletions calendar-client/assets/builtin/light/icons/dde_calendar_sidebar_32px.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions calendar-client/src/customWidget/ctitlewidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
7 changes: 4 additions & 3 deletions calendar-client/src/dialog/myscheduleview.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -281,6 +281,7 @@ void CMyScheduleView::slotBtClick(int buttonIndex, const QString &buttonName)
accept();
} else {
qCDebug(ClientLogger) << "Schedule edit cancelled";
close();
}
return;
}
Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion translations/dde-calendar-service_lo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -854,7 +854,7 @@
<message>
<location filename="../calendar-service/src/dbmanager/daccountdatabase.cpp" line="1157"/>
<source>Life</source>
<translation>ຊີວ຿ດຕິດ</translation>
<translation>ຊີວິດ</translation>
</message>
<message>
<location filename="../calendar-service/src/dbmanager/daccountdatabase.cpp" line="1159"/>
Expand Down
Loading