Skip to content

Commit 94551d2

Browse files
RealChuanRealChuan
committed
[UI优化]：调整多个组件的界面样式、颜色主题和绘制逻辑
-**BatteryQuick**：修改窗口标题文字，从"Battery Widget Example"改为"Battery Quick Example" -**BubbleWindow**：移除状态标签的内嵌样式表，包括背景色、内边距和边框样式 -**Clock**：优化绘制性能，调整经典主题配色方案，修复主题切换时颜色按钮更新逻辑 -**DashBoard**：修复圆弧绘制时的画笔状态管理，改进主题颜色配置一致性，修复颜色按钮更新逻辑
1 parent 581ecad commit 94551d2

6 files changed

Lines changed: 51 additions & 51 deletions

File tree

‎src/BatteryQuick/Main.qml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ApplicationWindow {
1010
width: 650
1111
height: 400
1212
visible: true
13-
title: qsTr("Battery Widget Example")
13+
title: qsTr("Battery Quick Example")
1414

1515
// 颜色对话框
1616
ColorDialog {

‎src/BubbleWindow/mainwindow.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,6 @@ MainWindow::MainWindow(QWidget *parent)
8686
// 状态显示
8787
auto *statusLabel = new QLabel(tr("Ready"), this);
8888
statusLabel->setAlignment(Qt::AlignCenter);
89-
statusLabel->setStyleSheet(
90-
"QLabel { background: #f0f0f0; padding: 8px; border: 1px solid #ccc; }");
9189

9290
// ========== 创建标签用于显示数值 ==========
9391

‎src/Clock/clockwidget.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,7 @@ void ClockWidget::paintEvent(QPaintEvent *event)
262262
QWidget::paintEvent(event);
263263

264264
QPainter painter(this);
265-
painter.setRenderHints(QPainter::Antialiasing | QPainter::TextAntialiasing
266-
| QPainter::SmoothPixmapTransform);
265+
painter.setRenderHints(QPainter::Antialiasing | QPainter::TextAntialiasing);
267266

268267
// 更新几何计算
269268
updateGeometry();

‎src/Clock/mainwindow.cpp‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -219,20 +219,20 @@ MainWindow::MainWindow(QWidget *parent)
219219
secondColorButton,
220220
textColorButton]() {
221221
// 设置经典主题颜色
222-
clock->setBorderColor(Qt::black);
223-
clock->setBackgroundColor(Qt::white);
224-
clock->setHourColor(Qt::black);
225-
clock->setMinuteColor(Qt::darkGray);
226-
clock->setSecondColor(Qt::red);
227-
clock->setTextColor(Qt::black);
222+
clock->setBorderColor(QColor(80, 80, 80));
223+
clock->setBackgroundColor(QColor(50, 50, 50));
224+
clock->setHourColor(QColor(240, 240, 240));
225+
clock->setMinuteColor(QColor(220, 220, 220));
226+
clock->setSecondColor(QColor(255, 80, 80));
227+
clock->setTextColor(QColor(240, 240, 240));
228228

229229
// 更新按钮颜色
230-
updateColorButton(borderColorButton, Qt::black);
231-
updateColorButton(backgroundColorButton, Qt::white);
232-
updateColorButton(hourColorButton, Qt::black);
233-
updateColorButton(minuteColorButton, Qt::darkGray);
234-
updateColorButton(secondColorButton, Qt::red);
235-
updateColorButton(textColorButton, Qt::black);
230+
updateColorButton(borderColorButton, clock->borderColor());
231+
updateColorButton(backgroundColorButton, clock->backgroundColor());
232+
updateColorButton(hourColorButton, clock->hourColor());
233+
updateColorButton(minuteColorButton, clock->minuteColor());
234+
updateColorButton(secondColorButton, clock->secondColor());
235+
updateColorButton(textColorButton, clock->textColor());
236236
});
237237

238238
connect(darkThemeButton,
@@ -255,12 +255,12 @@ MainWindow::MainWindow(QWidget *parent)
255255
clock->setTextColor(Qt::white);
256256

257257
// 更新按钮颜色
258-
updateColorButton(borderColorButton, Qt::white);
259-
updateColorButton(backgroundColorButton, Qt::darkGray);
260-
updateColorButton(hourColorButton, Qt::white);
261-
updateColorButton(minuteColorButton, Qt::lightGray);
262-
updateColorButton(secondColorButton, Qt::yellow);
263-
updateColorButton(textColorButton, Qt::white);
258+
updateColorButton(borderColorButton, clock->borderColor());
259+
updateColorButton(backgroundColorButton, clock->backgroundColor());
260+
updateColorButton(hourColorButton, clock->hourColor());
261+
updateColorButton(minuteColorButton, clock->minuteColor());
262+
updateColorButton(secondColorButton, clock->secondColor());
263+
updateColorButton(textColorButton, clock->textColor());
264264
});
265265

266266
connect(modernThemeButton,
@@ -283,12 +283,12 @@ MainWindow::MainWindow(QWidget *parent)
283283
clock->setTextColor(QColor(47, 79, 79)); // Dark Slate Gray
284284

285285
// 更新按钮颜色
286-
updateColorButton(borderColorButton, QColor(70, 130, 180));
287-
updateColorButton(backgroundColorButton, QColor(240, 248, 255));
288-
updateColorButton(hourColorButton, QColor(25, 25, 112));
289-
updateColorButton(minuteColorButton, QColor(65, 105, 225));
290-
updateColorButton(secondColorButton, QColor(220, 20, 60));
291-
updateColorButton(textColorButton, QColor(47, 79, 79));
286+
updateColorButton(borderColorButton, clock->borderColor());
287+
updateColorButton(backgroundColorButton, clock->backgroundColor());
288+
updateColorButton(hourColorButton, clock->hourColor());
289+
updateColorButton(minuteColorButton, clock->minuteColor());
290+
updateColorButton(secondColorButton, clock->secondColor());
291+
updateColorButton(textColorButton, clock->textColor());
292292
});
293293

294294
// 重置颜色

‎src/DashBoard/dashboardwidget.cpp‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -498,12 +498,15 @@ void DashBoardWidget::drawArc(QPainter *painter, double minSize)
498498
QPen pen;
499499
pen.setWidthF(arcWidth);
500500
pen.setCapStyle(Qt::FlatCap);
501+
pen.setColor(d_ptr->arcColor);
501502

502503
// 圆弧背景
503504
const double angle = d_ptr->endAngle - d_ptr->startAngle;
504-
pen.setColor(d_ptr->arcColor);
505+
506+
painter->save();
505507
painter->setPen(pen);
506508
painter->drawArc(rect, d_ptr->startAngle * 16, angle * 16);
509+
painter->restore();
507510
}
508511

509512
void DashBoardWidget::drawScale(QPainter *painter, double minSize)

‎src/DashBoard/mainwindow.cpp‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -382,13 +382,13 @@ MainWindow::MainWindow(QWidget *parent)
382382
dashboard->setTitleColor(QColor(144, 133, 116));
383383

384384
// 更新按钮颜色
385-
updateColorButton(arcColorButton, QColor(56, 61, 74));
386-
updateColorButton(scaleColorButton, QColor(4, 168, 173));
387-
updateColorButton(pointerColorButton, QColor(4, 181, 200));
388-
updateColorButton(textColorButton, QColor(144, 133, 116));
389-
updateColorButton(backgroundColorButton, Qt::transparent);
390-
updateColorButton(valueColorButton, QColor(144, 133, 116));
391-
updateColorButton(titleColorButton, QColor(144, 133, 116));
385+
updateColorButton(arcColorButton, dashboard->arcColor());
386+
updateColorButton(scaleColorButton, dashboard->scaleColor());
387+
updateColorButton(pointerColorButton, dashboard->pointerColor());
388+
updateColorButton(textColorButton, dashboard->textColor());
389+
updateColorButton(backgroundColorButton, dashboard->backgroundColor());
390+
updateColorButton(valueColorButton, dashboard->valueColor());
391+
updateColorButton(titleColorButton, dashboard->titleColor());
392392
});
393393

394394
connect(darkThemeButton,
@@ -413,13 +413,13 @@ MainWindow::MainWindow(QWidget *parent)
413413
dashboard->setTitleColor(QColor(224, 108, 117));
414414

415415
// 更新按钮颜色
416-
updateColorButton(arcColorButton, QColor(40, 44, 52));
417-
updateColorButton(scaleColorButton, QColor(97, 175, 239));
418-
updateColorButton(pointerColorButton, QColor(198, 120, 221));
419-
updateColorButton(textColorButton, QColor(171, 178, 191));
420-
updateColorButton(backgroundColorButton, QColor(33, 37, 43));
421-
updateColorButton(valueColorButton, QColor(152, 195, 121));
422-
updateColorButton(titleColorButton, QColor(224, 108, 117));
416+
updateColorButton(arcColorButton, dashboard->arcColor());
417+
updateColorButton(scaleColorButton, dashboard->scaleColor());
418+
updateColorButton(pointerColorButton, dashboard->pointerColor());
419+
updateColorButton(textColorButton, dashboard->textColor());
420+
updateColorButton(backgroundColorButton, dashboard->backgroundColor());
421+
updateColorButton(valueColorButton, dashboard->valueColor());
422+
updateColorButton(titleColorButton, dashboard->titleColor());
423423
});
424424

425425
connect(modernThemeButton,
@@ -444,13 +444,13 @@ MainWindow::MainWindow(QWidget *parent)
444444
dashboard->setTitleColor(QColor(65, 105, 225));
445445

446446
// 更新按钮颜色
447-
updateColorButton(arcColorButton, QColor(70, 130, 180));
448-
updateColorButton(scaleColorButton, QColor(100, 149, 237));
449-
updateColorButton(pointerColorButton, QColor(220, 20, 60));
450-
updateColorButton(textColorButton, QColor(47, 79, 79));
451-
updateColorButton(backgroundColorButton, QColor(240, 248, 255));
452-
updateColorButton(valueColorButton, QColor(25, 25, 112));
453-
updateColorButton(titleColorButton, QColor(65, 105, 225));
447+
updateColorButton(arcColorButton, dashboard->arcColor());
448+
updateColorButton(scaleColorButton, dashboard->scaleColor());
449+
updateColorButton(pointerColorButton, dashboard->pointerColor());
450+
updateColorButton(textColorButton, dashboard->textColor());
451+
updateColorButton(backgroundColorButton, dashboard->backgroundColor());
452+
updateColorButton(valueColorButton, dashboard->valueColor());
453+
updateColorButton(titleColorButton, dashboard->titleColor());
454454
});
455455

456456
// 仪表盘信号连接

0 commit comments

Comments
 (0)