From 1b416bdbf85cc31f4053ff4debc20678a71d90c9 Mon Sep 17 00:00:00 2001 From: feiyangqingyun Date: Sun, 7 Jun 2020 10:35:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9B=E5=86=9C=E5=8E=86=E7=AE=97?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lunarcalendarwidget/lunarcalendaritem.cpp | 8 +++----- lunarcalendarwidget/lunarcalendaritem.h | 1 + 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/lunarcalendarwidget/lunarcalendaritem.cpp b/lunarcalendarwidget/lunarcalendaritem.cpp index af877f8..52a0828 100644 --- a/lunarcalendarwidget/lunarcalendaritem.cpp +++ b/lunarcalendarwidget/lunarcalendaritem.cpp @@ -10,6 +10,9 @@ LunarCalendarItem::LunarCalendarItem(QWidget *parent) : QWidget(parent) { hover = false; pressed = false; + listDayName << "*" << "初一" << "初二" << "初三" << "初四" << "初五" << "初六" << "初七" << "初八" << "初九" << "初十" + << "十一" << "十二" << "十三" << "十四" << "十五" << "十六" << "十七" << "十八" << "十九" << "二十" + << "廿一" << "廿二" << "廿三" << "廿四" << "廿五" << "廿六" << "廿七" << "廿八" << "廿九" << "三十"; select = false; showLunar = true; @@ -200,11 +203,6 @@ void LunarCalendarItem::drawLunar(QPainter *painter) painter->save(); - QStringList listDayName; - listDayName << "*" << "初一" << "初二" << "初三" << "初四" << "初五" << "初六" << "初七" << "初八" << "初九" << "初十" - << "十一" << "十二" << "十三" << "十四" << "十五" << "十六" << "十七" << "十八" << "十九" << "二十" - << "廿一" << "廿二" << "廿三" << "廿四" << "廿五" << "廿六" << "廿七" << "廿八" << "廿九" << "三十"; - //判断当前农历文字是否节日,是节日且是当月则用农历节日颜色显示 bool exist = (!listDayName.contains(lunar) && dayType != DayType_MonthPre && dayType != DayType_MonthNext); diff --git a/lunarcalendarwidget/lunarcalendaritem.h b/lunarcalendarwidget/lunarcalendaritem.h index aaae3c3..4060bee 100644 --- a/lunarcalendarwidget/lunarcalendaritem.h +++ b/lunarcalendarwidget/lunarcalendaritem.h @@ -81,6 +81,7 @@ protected: private: bool hover; //鼠标是否悬停 bool pressed; //鼠标是否按下 + QStringList listDayName; //农历日期 bool select; //是否选中 bool showLunar; //显示农历