diff -Nru chinese-calendar-0.8.2/aboutdialog.cpp chinese-calendar-0.7.8/aboutdialog.cpp --- chinese-calendar-0.8.2/aboutdialog.cpp 2013-09-17 15:53:43.000000000 +0000 +++ chinese-calendar-0.7.8/aboutdialog.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,44 +0,0 @@ -/*! - * Copyright(C) 2013 mutse - * - * @file aboutdialog.cpp - * @brief about Chinese Calendar - * @author mutse - * @date Aug 6th, 2013 - */ -#include "aboutdialog.h" -#include "ui_aboutdialog.h" -#include - -AboutDialog::AboutDialog(QWidget *parent) : - QDialog(parent), - ui(new Ui::AboutDialog) -{ - ui->setupUi(this); - connect(ui->closeBtn, SIGNAL(clicked()), this, SLOT(hide())); - connect(ui->lbHomepage, SIGNAL(linkActivated(QString)), this, SLOT(openUrl(QString))); - -#ifdef DEBUG - QFile file(QCoreApplication::applicationDirPath() + "/qss/aboutus.qss"); -#else - QFile file(":/qss/aboutus.qss"); -#endif - file.open(QFile::ReadOnly); - QString stylesheet = QObject::tr(file.readAll()); - this->setStyleSheet(stylesheet); -} - -AboutDialog::~AboutDialog() -{ - delete ui; -} - -void AboutDialog::accept() -{ - hide(); -} - -void AboutDialog::openUrl(QString url) -{ - QDesktopServices::openUrl(QUrl(url)); -} diff -Nru chinese-calendar-0.8.2/aboutdialog.h chinese-calendar-0.7.8/aboutdialog.h --- chinese-calendar-0.8.2/aboutdialog.h 2013-09-17 15:53:43.000000000 +0000 +++ chinese-calendar-0.7.8/aboutdialog.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -/*! - * Copyright(C) 2013 mutse - * - * @file aboutdialog.h - * @brief about Chinese Calendar - * @author mutse - * @date Aug 6th, 2013 - */ -#ifndef ABOUTDIALOG_H -#define ABOUTDIALOG_H - -#include - -namespace Ui { -class AboutDialog; -} - -class AboutDialog : public QDialog -{ - Q_OBJECT - -public: - explicit AboutDialog(QWidget *parent = 0); - ~AboutDialog(); - -public slots: - void accept(); - void openUrl(QString url); - -private: - Ui::AboutDialog *ui; -}; - -#endif // ABOUTDIALOG_H diff -Nru chinese-calendar-0.8.2/aboutdialog.ui chinese-calendar-0.7.8/aboutdialog.ui --- chinese-calendar-0.8.2/aboutdialog.ui 2014-03-24 15:29:29.000000000 +0000 +++ chinese-calendar-0.7.8/aboutdialog.ui 1970-01-01 00:00:00.000000000 +0000 @@ -1,212 +0,0 @@ - - - AboutDialog - - - - 0 - 0 - 400 - 300 - - - - - 400 - 300 - - - - - 400 - 300 - - - - 关于软件 - - - - - 10 - 10 - 381 - 241 - - - - 1 - - - - 关于软件 - - - - - 50 - 30 - 61 - 71 - - - - - - - :/img/chinesecalendar.svg - - - - - - 20 - 120 - 321 - 71 - - - - Chinese Calendar 是 Ubuntu Kylin 团队开发的一款中国农历软件。为中国用户提供方便的传统节日和节气查询，并提供便签等实用功能。 - - - true - - - - - - 170 - 30 - 121 - 17 - - - - Chinese Calendar - - - - - - 200 - 60 - 51 - 17 - - - - V0.8.1 - - - - - - 190 - 90 - 61 - 20 - - - - <a href=https://launchpad.net/chinese-calendar>项目主页</a> - - - - - - 贡献者 - - - - - 3 - 10 - 371 - 181 - - - - false - - - true - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -作者： - Abel Liu <<a href="guiltyritter@gmail.com">kanliu@ubuntukylin.com</a>> - Shine Huang <<a href="hostc@163.com">shenghuang@ubuntukylin.com</a>> - -贡献者： - Zhengpeng Hou - <<a href="zhengpeng-hou@ubuntu.com">zhengpeng-hou@ubuntu.com</a>> - Mutse <<a href="yyhoo2.young@gmail.com">yyhoo2.young@gmail.com</a>> - -美工： - Shine Huang <<a href="hostc@163.com">shenghuang@ubuntukylin.com</a>> - </body></html> - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse - - - - - - 版权 - - - - - 10 - 10 - 331 - 181 - - - - true - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -Copyright(C) 2013 Ubuntu Kylin Team - -License: GPL-3 - -This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License. - -This package is distributed in the hope that it will be useful,but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/> - -On Debian systems, the complete text of the GNU General Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".</body></html> - - - - - - - - 287 - 260 - 81 - 31 - - - - 关闭 - - - - - - - - diff -Nru chinese-calendar-0.8.2/calendar.ui chinese-calendar-0.7.8/calendar.ui --- chinese-calendar-0.8.2/calendar.ui 2013-09-17 15:53:43.000000000 +0000 +++ chinese-calendar-0.7.8/calendar.ui 2014-10-06 08:24:24.000000000 +0000 @@ -188,16 +188,11 @@ 400 - 45 + 40 110 20 - - - 12 - - @@ -1352,7 +1347,7 @@ - + TextLabel Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop diff -Nru chinese-calendar-0.8.2/ccbo.cpp chinese-calendar-0.7.8/ccbo.cpp --- chinese-calendar-0.8.2/ccbo.cpp 2014-03-24 15:29:29.000000000 +0000 +++ chinese-calendar-0.7.8/ccbo.cpp 2014-10-06 08:24:24.000000000 +0000 @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * This project is developed by "Ubuntu Kylin Members" team, + * This project is developed by "UbuntuKylin Members" team, * see * Authors: Abel Liu * Shine Huang diff -Nru chinese-calendar-0.8.2/ccbo.h chinese-calendar-0.7.8/ccbo.h --- chinese-calendar-0.8.2/ccbo.h 2014-03-24 15:29:29.000000000 +0000 +++ chinese-calendar-0.7.8/ccbo.h 2014-10-06 08:24:24.000000000 +0000 @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * This project is developed by "Ubuntu Kylin Members" team, + * This project is developed by "UbuntuKylin Members" team, * see * Authors: Abel Liu * Shine Huang diff -Nru chinese-calendar-0.8.2/chinese-calendar-autostart chinese-calendar-0.7.8/chinese-calendar-autostart --- chinese-calendar-0.8.2/chinese-calendar-autostart 2013-09-17 15:53:43.000000000 +0000 +++ chinese-calendar-0.7.8/chinese-calendar-autostart 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -#! /bin/bash -startFilePath="$HOME/.local/share/chinese-calendar/chinese-calendar.desktop" -if [ ! -f "$startFilePath" ]; then - echo "yes" - /usr/bin/chinese-calendar & -else - echo "no" -fi diff -Nru chinese-calendar-0.8.2/chinese-calendar-autostart.desktop chinese-calendar-0.7.8/chinese-calendar-autostart.desktop --- chinese-calendar-0.8.2/chinese-calendar-autostart.desktop 2013-09-17 15:53:43.000000000 +0000 +++ chinese-calendar-0.7.8/chinese-calendar-autostart.desktop 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=chinese-calendar-autostart -Name[zh_CN]=中国农历开机启动 -Comment=Chinese lunar calendar auto start -Exec=/usr/bin/chinese-calendar-autostart -Icon=chinesecalendar-64.png -StartupNotify=true -Terminal=false -Type=Application -Categories=GNOME;GTK;Graphics;RasterGraphics;Viewer; diff -Nru chinese-calendar-0.8.2/chinesecalendar.cpp chinese-calendar-0.7.8/chinesecalendar.cpp --- chinese-calendar-0.8.2/chinesecalendar.cpp 2014-03-24 15:29:29.000000000 +0000 +++ chinese-calendar-0.7.8/chinesecalendar.cpp 2014-10-06 08:24:24.000000000 +0000 @@ -14,14 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * This project is developed by "Ubuntu Kylin Members" team, + * This project is developed by "UbuntuKylin Members" team, * see * Authors: Abel Liu * Shine Huang */ #include "chinesecalendar.h" -#include + ChineseCalendar::ChineseCalendar(QWidget *parent) : QWidget(parent) @@ -165,18 +165,14 @@ pa.setColor(QPalette::WindowText,Qt::black); this->label_18->setPalette(pa); + this->label_19->setPalette(pa); - pa.setColor(QPalette::WindowText,QColor(235,74,20)); + pa.setColor(QPalette::WindowText,Qt::red); this->label_10->setPalette(pa); + this->label_11->setPalette(pa); this->label_12->setPalette(pa); this->label_13->setPalette(pa); this->label_14->setPalette(pa); - - pa.setColor(QPalette::WindowText,Qt::white); - this->label_19->setPalette(pa); - - pa.setColor(QPalette::WindowText,Qt::red); - this->label_11->setPalette(pa); this->label_17->setPalette(pa); map = new QMap(); @@ -185,259 +181,222 @@ map->insert(QString("1-1"), dateitem00 ); connect(dateitem00, SIGNAL(clicked(QString)), this, SLOT(resetcalendardate(QString))); connect(dateitem00, SIGNAL(day(QString)), this, SLOT(setclickday(QString))); - connect(dateitem00, SIGNAL(resetColor()), this, SLOT(resetDateItemColor())); DateItem *dateitem01 = new DateItem(this); dateitem01->show(); map->insert(QString("1-2"), dateitem01 ); connect(dateitem01, SIGNAL(clicked(QString)), this, SLOT(resetcalendardate(QString))); connect(dateitem01, SIGNAL(day(QString)), this, SLOT(setclickday(QString))); - connect(dateitem01, SIGNAL(resetColor()), this, SLOT(resetDateItemColor())); DateItem *dateitem02 = new DateItem(this); dateitem02->show(); map->insert(QString("1-3"), dateitem02 ); connect(dateitem02, SIGNAL(clicked(QString)), this, SLOT(resetcalendardate(QString))); connect(dateitem02, SIGNAL(day(QString)), this, SLOT(setclickday(QString))); - connect(dateitem02, SIGNAL(resetColor()), this, SLOT(resetDateItemColor())); DateItem *dateitem03 = new DateItem(this); dateitem03->show(); map->insert(QString("1-4"), dateitem03 ); connect(dateitem03, SIGNAL(clicked(QString)), this, SLOT(resetcalendardate(QString))); connect(dateitem03, SIGNAL(day(QString)), this, SLOT(setclickday(QString))); - connect(dateitem03, SIGNAL(resetColor()), this, SLOT(resetDateItemColor())); DateItem *dateitem04 = new DateItem(this); dateitem04->show(); map->insert(QString("1-5"), dateitem04 ); connect(dateitem04, SIGNAL(clicked(QString)), this, SLOT(resetcalendardate(QString))); connect(dateitem04, SIGNAL(day(QString)), this, SLOT(setclickday(QString))); - connect(dateitem04, SIGNAL(resetColor()), this, SLOT(resetDateItemColor())); DateItem *dateitem05 = new DateItem(this); dateitem05->show(); map->insert(QString("1-6"), dateitem05 ); connect(dateitem05, SIGNAL(clicked(QString)), this, SLOT(resetcalendardate(QString))); connect(dateitem05, SIGNAL(day(QString)), this, SLOT(setclickday(QString))); - connect(dateitem05, SIGNAL(resetColor()), this, SLOT(resetDateItemColor())); DateItem *dateitem06 = new DateItem(this); dateitem06->show(); map->insert(QString("1-7"), dateitem06 ); connect(dateitem06, SIGNAL(clicked(QString)), this, SLOT(resetcalendardate(QString))); connect(dateitem06, SIGNAL(day(QString)), this, SLOT(setclickday(QString))); - connect(dateitem06, SIGNAL(resetColor()), this, SLOT(resetDateItemColor())); DateItem *dateitem10 = new DateItem(this); dateitem10->show(); map->insert(QString("2-1"), dateitem10 ); connect(dateitem10, SIGNAL(clicked(QString)), this, SLOT(resetcalendardate(QString))); connect(dateitem10, SIGNAL(day(QString)), this, SLOT(setclickday(QString))); - connect(dateitem10, SIGNAL(resetColor()), this, SLOT(resetDateItemColor())); DateItem *dateitem11 = new DateItem(this); dateitem11->show(); map->insert(QString("2-2"), dateitem11 ); connect(dateitem11, SIGNAL(clicked(QString)), this, SLOT(resetcalendardate(QString))); connect(dateitem11, SIGNAL(day(QString)), this, SLOT(setclickday(QString))); - connect(dateitem11, SIGNAL(resetColor()), this, SLOT(resetDateItemColor())); DateItem *dateitem12 = new DateItem(this); dateitem12->show(); map->insert(QString("2-3"), dateitem12 ); connect(dateitem12, SIGNAL(clicked(QString)), this, SLOT(resetcalendardate(QString))); connect(dateitem12, SIGNAL(day(QString)), this, SLOT(setclickday(QString))); - connect(dateitem12, SIGNAL(resetColor()), this, SLOT(resetDateItemColor())); DateItem *dateitem13 = new DateItem(this); dateitem13->show(); map->insert(QString("2-4"), dateitem13 ); connect(dateitem13, SIGNAL(clicked(QString)), this, SLOT(resetcalendardate(QString))); connect(dateitem13, SIGNAL(day(QString)), this, SLOT(setclickday(QString))); - connect(dateitem13, SIGNAL(resetColor()), this, SLOT(resetDateItemColor())); DateItem *dateitem14 = new DateItem(this); dateitem14->show(); map->insert(QString("2-5"), dateitem14 ); connect(dateitem14, SIGNAL(clicked(QString)), this, SLOT(resetcalendardate(QString))); connect(dateitem14, SIGNAL(day(QString)), this, SLOT(setclickday(QString))); - connect(dateitem14, SIGNAL(resetColor()), this, SLOT(resetDateItemColor())); DateItem *dateitem15 = new DateItem(this); dateitem15->show(); map->insert(QString("2-6"), dateitem15 ); connect(dateitem15, SIGNAL(clicked(QString)), this, SLOT(resetcalendardate(QString))); connect(dateitem15, SIGNAL(day(QString)), this, SLOT(setclickday(QString))); - connect(dateitem15, SIGNAL(resetColor()), this, SLOT(resetDateItemColor())); DateItem *dateitem16 = new DateItem(this); dateitem16->show(); map->insert(QString("2-7"), dateitem16 ); connect(dateitem16, SIGNAL(clicked(QString)), this, SLOT(resetcalendardate(QString))); connect(dateitem16, SIGNAL(day(QString)), this, SLOT(setclickday(QString))); - connect(dateitem16, SIGNAL(resetColor()), this, SLOT(resetDateItemColor())); DateItem *dateitem20 = new DateItem(this); dateitem20->show(); map->insert(QString("3-1"), dateitem20 ); connect(dateitem20, SIGNAL(clicked(QString)), this, SLOT(resetcalendardate(QString))); connect(dateitem20, SIGNAL(day(QString)), this, SLOT(setclickday(QString))); - connect(dateitem20, SIGNAL(resetColor()), this, SLOT(resetDateItemColor())); DateItem *dateitem21 = new DateItem(this); dateitem21->show(); map->insert(QString("3-2"), dateitem21 ); connect(dateitem21, SIGNAL(clicked(QString)), this, SLOT(resetcalendardate(QString))); connect(dateitem21, SIGNAL(day(QString)), this, SLOT(setclickday(QString))); - connect(dateitem21, SIGNAL(resetColor()), this, SLOT(resetDateItemColor())); DateItem *dateitem22 = new DateItem(this); dateitem22->show(); map->insert(QString("3-3"), dateitem22 ); connect(dateitem22, SIGNAL(clicked(QString)), this, SLOT(resetcalendardate(QString))); connect(dateitem22, SIGNAL(day(QString)), this, SLOT(setclickday(QString))); - connect(dateitem22, SIGNAL(resetColor()), this, SLOT(resetDateItemColor())); DateItem *dateitem23 = new DateItem(this); dateitem23->show(); map->insert(QString("3-4"), dateitem23 ); connect(dateitem23, SIGNAL(clicked(QString)), this, SLOT(resetcalendardate(QString))); connect(dateitem23, SIGNAL(day(QString)), this, SLOT(setclickday(QString))); - connect(dateitem23, SIGNAL(resetColor()), this, SLOT(resetDateItemColor())); DateItem *dateitem24 = new DateItem(this); dateitem24->show(); map->insert(QString("3-5"), dateitem24 ); connect(dateitem24, SIGNAL(clicked(QString)), this, SLOT(resetcalendardate(QString))); connect(dateitem24, SIGNAL(day(QString)), this, SLOT(setclickday(QString))); - connect(dateitem24, SIGNAL(resetColor()), this, SLOT(resetDateItemColor())); DateItem *dateitem25 = new DateItem(this); dateitem25->show(); map->insert(QString("3-6"), dateitem25 ); connect(dateitem25, SIGNAL(clicked(QString)), this, SLOT(resetcalendardate(QString))); connect(dateitem25, SIGNAL(day(QString)), this, SLOT(setclickday(QString))); - connect(dateitem25, SIGNAL(resetColor()), this, SLOT(resetDateItemColor())); DateItem *dateitem26 = new DateItem(this); dateitem26->show(); map->insert(QString("3-7"), dateitem26 ); connect(dateitem26, SIGNAL(clicked(QString)), this, SLOT(resetcalendardate(QString))); connect(dateitem26, SIGNAL(day(QString)), this, SLOT(setclickday(QString))); - connect(dateitem26, SIGNAL(resetColor()), this, SLOT(resetDateItemColor())); DateItem *dateitem30 = new DateItem(this); dateitem30->show(); map->insert(QString("4-1"), dateitem30 ); connect(dateitem30, SIGNAL(clicked(QString)), this, SLOT(resetcalendardate(QString))); connect(dateitem30, SIGNAL(day(QString)), this, SLOT(setclickday(QString))); - connect(dateitem30, SIGNAL(resetColor()), this, SLOT(resetDateItemColor())); DateItem *dateitem31 = new DateItem(this); dateitem31->show(); map->insert(QString("4-2"), dateitem31 ); connect(dateitem31, SIGNAL(clicked(QString)), this, SLOT(resetcalendardate(QString))); connect(dateitem31, SIGNAL(day(QString)), this, SLOT(setclickday(QString))); - connect(dateitem31, SIGNAL(resetColor()), this, SLOT(resetDateItemColor())); DateItem *dateitem32 = new DateItem(this); dateitem32->show(); map->insert(QString("4-3"), dateitem32 ); connect(dateitem32, SIGNAL(clicked(QString)), this, SLOT(resetcalendardate(QString))); connect(dateitem32, SIGNAL(day(QString)), this, SLOT(setclickday(QString))); - connect(dateitem32, SIGNAL(resetColor()), this, SLOT(resetDateItemColor())); DateItem *dateitem33 = new DateItem(this); dateitem33->show(); map->insert(QString("4-4"), dateitem33 ); connect(dateitem33, SIGNAL(clicked(QString)), this, SLOT(resetcalendardate(QString))); connect(dateitem33, SIGNAL(day(QString)), this, SLOT(setclickday(QString))); - connect(dateitem33, SIGNAL(resetColor()), this, SLOT(resetDateItemColor())); DateItem *dateitem34 = new DateItem(this); dateitem34->show(); map->insert(QString("4-5"), dateitem34 ); connect(dateitem34, SIGNAL(clicked(QString)), this, SLOT(resetcalendardate(QString))); connect(dateitem34, SIGNAL(day(QString)), this, SLOT(setclickday(QString))); - connect(dateitem34, SIGNAL(resetColor()), this, SLOT(resetDateItemColor())); DateItem *dateitem35 = new DateItem(this); dateitem35->show(); map->insert(QString("4-6"), dateitem35 ); connect(dateitem35, SIGNAL(clicked(QString)), this, SLOT(resetcalendardate(QString))); connect(dateitem35, SIGNAL(day(QString)), this, SLOT(setclickday(QString))); - connect(dateitem35, SIGNAL(resetColor()), this, SLOT(resetDateItemColor())); DateItem *dateitem36 = new DateItem(this); dateitem36->show(); map->insert(QString("4-7"), dateitem36 ); connect(dateitem36, SIGNAL(clicked(QString)), this, SLOT(resetcalendardate(QString))); connect(dateitem36, SIGNAL(day(QString)), this, SLOT(setclickday(QString))); - connect(dateitem36, SIGNAL(resetColor()), this, SLOT(resetDateItemColor())); DateItem *dateitem40 = new DateItem(this); dateitem40->show(); map->insert(QString("5-1"), dateitem40 ); connect(dateitem40, SIGNAL(clicked(QString)), this, SLOT(resetcalendardate(QString))); connect(dateitem40, SIGNAL(day(QString)), this, SLOT(setclickday(QString))); - connect(dateitem40, SIGNAL(resetColor()), this, SLOT(resetDateItemColor())); DateItem *dateitem41 = new DateItem(this); dateitem41->show(); map->insert(QString("5-2"), dateitem41 ); connect(dateitem41, SIGNAL(clicked(QString)), this, SLOT(resetcalendardate(QString))); connect(dateitem41, SIGNAL(day(QString)), this, SLOT(setclickday(QString))); - connect(dateitem41, SIGNAL(resetColor()), this, SLOT(resetDateItemColor())); DateItem *dateitem42 = new DateItem(this); dateitem42->show(); map->insert(QString("5-3"), dateitem42 ); connect(dateitem42, SIGNAL(clicked(QString)), this, SLOT(resetcalendardate(QString))); connect(dateitem42, SIGNAL(day(QString)), this, SLOT(setclickday(QString))); - connect(dateitem42, SIGNAL(resetColor()), this, SLOT(resetDateItemColor())); DateItem *dateitem43 = new DateItem(this); dateitem43->show(); map->insert(QString("5-4"), dateitem43 ); connect(dateitem43, SIGNAL(clicked(QString)), this, SLOT(resetcalendardate(QString))); connect(dateitem43, SIGNAL(day(QString)), this, SLOT(setclickday(QString))); - connect(dateitem43, SIGNAL(resetColor()), this, SLOT(resetDateItemColor())); DateItem *dateitem44 = new DateItem(this); dateitem44->show(); map->insert(QString("5-5"), dateitem44 ); connect(dateitem44, SIGNAL(clicked(QString)), this, SLOT(resetcalendardate(QString))); connect(dateitem44, SIGNAL(day(QString)), this, SLOT(setclickday(QString))); - connect(dateitem44, SIGNAL(resetColor()), this, SLOT(resetDateItemColor())); DateItem *dateitem45 = new DateItem(this); dateitem45->show(); map->insert(QString("5-6"), dateitem45 ); connect(dateitem45, SIGNAL(clicked(QString)), this, SLOT(resetcalendardate(QString))); connect(dateitem45, SIGNAL(day(QString)), this, SLOT(setclickday(QString))); - connect(dateitem45, SIGNAL(resetColor()), this, SLOT(resetDateItemColor())); DateItem *dateitem46 = new DateItem(this); dateitem46->show(); map->insert(QString("5-7"), dateitem46 ); connect(dateitem46, SIGNAL(clicked(QString)), this, SLOT(resetcalendardate(QString))); connect(dateitem46, SIGNAL(day(QString)), this, SLOT(setclickday(QString))); - connect(dateitem46, SIGNAL(resetColor()), this, SLOT(resetDateItemColor())); DateItem *dateitem50 = new DateItem(this); dateitem50->hide(); map->insert(QString("6-1"), dateitem50 ); connect(dateitem50, SIGNAL(clicked(QString)), this, SLOT(resetcalendardate(QString))); connect(dateitem50, SIGNAL(day(QString)), this, SLOT(setclickday(QString))); - connect(dateitem50, SIGNAL(resetColor()), this, SLOT(resetDateItemColor())); DateItem *dateitem51 = new DateItem(this); dateitem51->hide(); map->insert(QString("6-2"), dateitem51 ); connect(dateitem51, SIGNAL(clicked(QString)), this, SLOT(resetcalendardate(QString))); connect(dateitem51, SIGNAL(day(QString)), this, SLOT(setclickday(QString))); - connect(dateitem51, SIGNAL(resetColor()), this, SLOT(resetDateItemColor())); DateItem *dateitem52 = new DateItem(this); dateitem52->hide(); @@ -474,17 +433,17 @@ painter.drawRoundedRect(this->rect(),10,10); setMask(objBitmap); - aboutDlg = new AboutDialog(); - aboutDlg->hide(); this->createTray(); + note = new Cnote; QDesktopWidget desktop; int width = desktop.screenGeometry().width(); - note->setGeometry(QRect(width-400,80,224,252)); + note->setGeometry(QRect(width-400,80,224,280)); connect(note,SIGNAL(save(QString)),this,SLOT(savedata(QString))); note->hide(); + } ChineseCalendar::~ChineseCalendar() @@ -498,7 +457,6 @@ int year = this->YearSelect->currentText().toInt(); int month = this->monthCombo->currentText().toInt(); int today = clickday; - selectedDate = QDate(year, month, today); QString dateplan = QString("%1月%2日计划安排").arg(this->monthCombo->currentText()).arg(day); QString data; data=mycalendat->ctcl_displaydata(year,month,today); @@ -522,35 +480,28 @@ { this->actionShow = new QAction(tr("隐藏/显示"), this); connect(actionShow, SIGNAL(triggered()), this, SLOT(showOrHide())); - QShortcut *shortcut = new QShortcut(QKeySequence("Ctrl+H"), this); - connect(shortcut, SIGNAL(activated()), this, SLOT(showOrHide())); - - this->actionAutoStart = new QAction(tr("AutoStart"), this); - this->actionAutoStart->setCheckable(true); - connect(actionAutoStart, SIGNAL(triggered(bool)), this, SLOT(setAutoStart(bool))); this->actionStaysOnTop = new QAction(tr("总在最前"), this); this->actionStaysOnTop->setCheckable(true); - connect(actionStaysOnTop, SIGNAL(triggered()), this, SLOT(slotChangeMode())); + connect(actionStaysOnTop, SIGNAL(triggered()), this, SLOT(setMode())); this->actionStaysOnBottom = new QAction(tr("总在最后"), this); this->actionStaysOnBottom->setCheckable(true); - connect(actionStaysOnBottom, SIGNAL(triggered()), this, SLOT(slotChangeMode())); + connect(actionStaysOnBottom, SIGNAL(triggered()), this, SLOT(setMode())); this->actionStaysNormal = new QAction(tr("普通模式"), this); this->actionStaysNormal->setCheckable(true); this->actionStaysNormal->setChecked(true); - connect(actionStaysNormal, SIGNAL(triggered()), this, SLOT(slotChangeMode())); + connect(actionStaysNormal, SIGNAL(triggered()), this, SLOT(setMode())); // default skin this->actionDefault = new QAction(tr("Default"), this); actionDefault->setCheckable(true); actionDefault->setChecked(true); - m_skinName = QString("default"); connect(actionDefault, SIGNAL(triggered()), this, SLOT(slotChangeSkin())); - // blue skin - this->actionSkin = new QAction(tr("Blue"), this); + // black skin + this->actionSkin = new QAction(tr("Black"), this); actionSkin->setCheckable(true); connect(actionSkin, SIGNAL(triggered()), this, SLOT(slotChangeSkin())); @@ -562,10 +513,6 @@ actSkinGrp->addAction(actionDefault); actSkinGrp->addAction(actionSkin); - readSetting(); - actionDefault->setChecked(m_skinName == "default"); - actionSkin->setChecked(m_skinName == "blue"); - // read user customizated skin files readSkinFiles(); @@ -573,7 +520,6 @@ { QAction *actionNew = new QAction(strSkin, this); actionNew->setCheckable(true); - actionNew->setChecked(m_skinName == strSkin); actSkinGrp->addAction(actionNew); this->skinMenu->addAction(actionNew); connect(actionNew, SIGNAL(triggered()), this, SLOT(slotChangeSkin())); @@ -584,35 +530,23 @@ this->ag->addAction(actionStaysOnBottom); this->ag->addAction(actionStaysNormal); - this->stayMenu = new QMenu(tr("Stay Mode"), this); - this->stayMenu->addAction(actionStaysOnTop); - this->stayMenu->addAction(actionStaysOnBottom); - this->stayMenu->addAction(actionStaysNormal); - - this->actionAbout = new QAction(tr("关于本软件"), this); - connect(actionAbout, SIGNAL(triggered()), this, SLOT(showAbout())); - - this->actionQuit = new QAction(tr("E&xit"), this); - this->actionQuit->setShortcut(tr("Ctrl+Q")); + this->actionQuit = new QAction(tr("退出程序"), this); connect(actionQuit, SIGNAL(triggered()), qApp, SLOT(quit())); this->trayMenu = new QMenu(this); this->trayMenu->addAction(actionShow); this->trayMenu->addSeparator(); - this->trayMenu->addAction(actionAutoStart); - this->trayMenu->addSeparator(); - this->trayMenu->addMenu(stayMenu); + this->trayMenu->addAction(actionStaysOnTop); + this->trayMenu->addAction(actionStaysOnBottom); + this->trayMenu->addAction(actionStaysNormal); this->trayMenu->addSeparator(); this->trayMenu->addMenu(skinMenu); this->trayMenu->addSeparator(); - this->trayMenu->addAction(actionAbout); - this->trayMenu->addSeparator(); this->trayMenu->addAction(actionQuit); this->trayIcon = new QSystemTrayIcon(this); this->trayIcon->setIcon(icon); this->trayIcon->setContextMenu(trayMenu); - connect(this->trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(handle_trayIcon_activated(QSystemTrayIcon::ActivationReason))); this->trayIcon->show(); } @@ -846,7 +780,6 @@ { QDate date(this->YearSelect->currentText().toInt(),this->monthCombo->currentText().toInt(),day.toInt()); clearbackground(); - selectedDate = date; QString weekday; if(date.toString("ddd") == "Mon") weekday = "星期一"; @@ -953,12 +886,11 @@ QDate today = QDate::currentDate(); YearSelect->setCurrentIndex(today.year() - 1900); monthCombo->setCurrentIndex(today.month() - 1); - selectedDate = today; setCalendar(); } -void ChineseCalendar::setCalendar(bool flag) +void ChineseCalendar::setCalendar() { struct CCalendar c; cleardate(); @@ -1004,12 +936,17 @@ } QDate today = QDate::currentDate(); - if(today.year() == selectedDate.year() && today.month() == selectedDate.month() && today.day() == selectedDate.day()) + if(today.year() == selectedDate.year() && today.month() == selectedDate.month()) { - setDayFocus(today); + int d = today.day(); + int w = today.dayOfWeek(); + if (w == 7) + w = 0; + int r = (d + (6 - w) + 7 -1)/7; + QString add = QString("%1-%2").arg(r).arg(w+1); + resetcalendardate(QString::number(today.day())); + map->value(add)->setToday(); } - - setDayFocus(selectedDate, false); // set the selected date in focus } void ChineseCalendar::clearbackground() @@ -1243,18 +1180,6 @@ YearSelect->setCurrentIndex(YearSelect->currentIndex()+1); } -void ChineseCalendar::handle_trayIcon_activated(QSystemTrayIcon::ActivationReason reason) -{ - switch(reason) - { - case QSystemTrayIcon::Trigger: - this->showOrHide(); - break; - default: - ; - } -} - void ChineseCalendar::showOrHide() { if(this->isHidden()) @@ -1264,25 +1189,21 @@ this->hide(); } -void ChineseCalendar::setMode(int nMode, bool bFlag) +void ChineseCalendar::setMode() { - switch (nMode) + if(this->actionStaysOnTop->isChecked()) { - case 1: // stays on top this->setWindowFlags(Qt::ToolTip | Qt::FramelessWindowHint); - break; - case 2: // stays on bottom + this->show(); + } else if(this->actionStaysOnBottom->isChecked()) + { this->setWindowFlags(Qt::WindowStaysOnBottomHint | Qt::FramelessWindowHint); - break; - case 3: // stays normal + this->show(); + } else + { this->setWindowFlags(Qt::FramelessWindowHint); - break; - default: - break; - } - - if (bFlag) this->show(); + } } void ChineseCalendar::slotChangeSkin() @@ -1292,37 +1213,15 @@ if (!strSkin.isEmpty()) { - if (strSkin.toLower() == "default" || strSkin.toLower() == "blue") + if (strSkin.toLower() == "default" || strSkin.toLower() == "black") { - strSkin = strSkin.toLower(); - changeSkin(strSkin); + changeSkin(strSkin.toLower()); } else { changeSkin(strSkin, false); } } - - m_skinName = strSkin; - - setCalendar(); - - writeSetting(); -} - -void ChineseCalendar::slotChangeMode() -{ - m_nMode = 0; - if (actionStaysOnTop->isChecked()) - m_nMode = 1; - if (actionStaysOnBottom->isChecked()) - m_nMode = 2; - if (actionStaysNormal->isChecked()) - m_nMode = 3; - - setMode(m_nMode); - - writeSetting(); } void ChineseCalendar::changeSkin(const QString &skin, bool bFlag) @@ -1339,7 +1238,7 @@ } else { - strFilename = QDir::homePath() + QString("/.local/share/chinese-calendar/skin/%1.qss").arg(skin); + strFilename = QDir::homePath() + QString("/.local/share/chinese-calendar/skins/%1.qss").arg(skin); } QFile qss(strFilename); @@ -1353,7 +1252,7 @@ void ChineseCalendar::readSkinFiles() { QString systemdirectory; - systemdirectory = QDir::homePath() + "/.local/share/chinese-calendar/skin/"; + systemdirectory = QDir::homePath() + "/.local/share/chinese-calendar/skins/"; QDir dir(systemdirectory); foreach(QFileInfo info, dir.entryInfoList()) @@ -1364,137 +1263,3 @@ } } } - -void ChineseCalendar::resetDateItemColor() -{ - setCalendar(true); -} - -void ChineseCalendar::setDayFocus(QDate &date, bool bFlag) -{ - int d = date.day(); - int w = date.dayOfWeek(); - if (w == 7) - w = 0; - int r = (d + (6 - w) + 7 -1)/7; - - QString add = QString("%1-%2").arg(r).arg(w+1); - if (bFlag) - { - resetcalendardate(QString::number(date.day())); - } - - map->value(add)->setToday(); -} - -void ChineseCalendar::showAbout() -{ - aboutDlg->show(); -} - -void ChineseCalendar::setAutoStart(bool bFlag) -{ - /* 设置是否开机自启动 - * 当该目录下没有desktop文件时开机启动,有则不开机启动 - * 因为系统安装时没有该用户目录,所以第一次是默认开机启动 - */ - if (!bFlag) - { - // 需要将desktop文件拷贝至~/.config/autostart目录下 - QString strDesktop = "/usr/share/applications/chinese-calendar.desktop"; - QString strCmd = "cp " + strDesktop + " ~/.local/share/chinese-calendar"; - const char *cmd = strCmd.toUtf8().constData(); - system(cmd); - } - else - { - QString filename = QDir::homePath() + "/.local/share/chinese-calendar/chinese-calendar.desktop"; - QFile file(filename); - - // if chinese-calendar.desktop is exist, then remove it. - if (file.exists()) - { - file.remove(); - } - } - -// writeSetting(); -} - -bool ChineseCalendar::checkAutoStart() -{ - QString filename = QDir::homePath() + "/.local/share/chinese-calendar/chinese-calendar.desktop"; - QFile file(filename); - if (file.exists()) - { - return false; - }else{ - return true; - } -} - -void ChineseCalendar::readSetting() -{ - QSettings settings("chinese-calendar", "chinese-calendar"); - - settings.beginGroup("Config"); - - // 读取自启动标志 - bool bAutoStart = this->checkAutoStart(); -// bool bAutoStart = settings.value("autostart", false).toBool(); - - // 读取显示模式 - m_nMode = settings.value("mode", 3).toInt(); - - // 读取皮肤名 - m_skinName = settings.value("skin", "default").toString(); - - settings.endGroup(); - - actionAutoStart->setChecked(bAutoStart); - - switch (m_nMode) - { - case 1: - actionStaysOnTop->setChecked(true); - actionStaysOnBottom->setChecked(false); - actionStaysNormal->setChecked(false); - break; - case 2: - actionStaysOnTop->setChecked(false); - actionStaysOnBottom->setChecked(true); - actionStaysNormal->setChecked(false); - break; - case 3: - actionStaysOnTop->setChecked(false); - actionStaysOnBottom->setChecked(false); - actionStaysNormal->setChecked(true); - break; - default: - ; - } - - setMode(m_nMode, false); - - if (m_skinName == "default" || m_skinName == "blue") - { - changeSkin(m_skinName); - } - else - { - changeSkin(m_skinName, false); - } - setCalendar(); -} - -void ChineseCalendar::writeSetting() -{ - QSettings settings("chinese-calendar", "chinese-calendar"); - - settings.beginGroup("Config"); - settings.setValue("autostart", actionAutoStart->isChecked()); - settings.setValue("mode", m_nMode); - settings.setValue("skin", m_skinName); - - settings.endGroup(); -} diff -Nru chinese-calendar-0.8.2/chinesecalendar.h chinese-calendar-0.7.8/chinesecalendar.h --- chinese-calendar-0.8.2/chinesecalendar.h 2014-03-24 15:29:29.000000000 +0000 +++ chinese-calendar-0.7.8/chinesecalendar.h 2014-10-06 08:24:24.000000000 +0000 @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * This project is developed by "Ubuntu Kylin Members" team, + * This project is developed by "UbuntuKylin Members" team, * see * Authors: Abel Liu * Shine Huang @@ -40,8 +40,6 @@ #include "ccbo.h" #include "dateitem.h" #include "cnote.h" -#include "aboutdialog.h" - class CCBO; class ChineseCalendar: public QWidget, private Ui::Calendar { @@ -53,7 +51,7 @@ int clickday; private: - void setCalendar(bool flag = true); + void setCalendar(); void cleardate(); void clearbackground(); void createTray(); @@ -78,10 +76,7 @@ QAction *actionShow, *actionStaysOnTop, *actionStaysOnBottom, *actionStaysNormal, *actionQuit; QAction *actionDefault; QAction *actionSkin; - QAction *actionAbout; - QAction *actionAutoStart; QMenu *skinMenu; - QMenu *stayMenu; public slots: void setMonth(int month); @@ -89,13 +84,11 @@ void setTime(); void resetcalendardate(QString); void backtoday(); - void handle_trayIcon_activated(QSystemTrayIcon::ActivationReason reason); void showOrHide(); + void setMode(); void savedata(QString); void setclickday(QString); - void resetDateItemColor(); - void showAbout(); - void setAutoStart(bool bFlag); + protected: void mousePressEvent(QMouseEvent *event); @@ -108,21 +101,11 @@ void on_TbpreviousMonth_clicked(); void on_TbpreviousYear_clicked(); void slotChangeSkin(); - void slotChangeMode(); private: - void setMode(int nMode, bool bFlag = true); void changeSkin(const QString &, bool bFlag = true); void readSkinFiles(); - void setDayFocus(QDate &date, bool bFlag = true); - - bool checkAutoStart(); - void readSetting(); - void writeSetting(); QStringList m_strFileList; - AboutDialog *aboutDlg; - int m_nMode; - QString m_skinName; }; #endif diff -Nru chinese-calendar-0.8.2/chinese-calendar.pro chinese-calendar-0.7.8/chinese-calendar.pro --- chinese-calendar-0.8.2/chinese-calendar.pro 2014-03-24 15:29:29.000000000 +0000 +++ chinese-calendar-0.7.8/chinese-calendar.pro 2014-10-06 08:24:24.000000000 +0000 @@ -9,20 +9,13 @@ inst1.path = /usr/share/pixmaps inst2.files += chinese-calendar.desktop inst2.path = /usr/share/applications -inst3.files += chinese-calendar-autostart.desktop +inst3.files += chinese-calendar.desktop inst3.path = /etc/xdg/autostart -inst4.files += chinese-calendar-autostart -inst4.path = /usr/bin default_skin.files += skin/default/chinesecalendarBGyellow.png \ skin/default/no.png \ skin/default/note.png \ skin/default/ok.png default_skin.path = /usr/share/chinese-calendar/skin/default -blue_skin.files += skin/blue/chinesecalendarBGblue.png \ - skin/blue/no.png \ - skin/blue/note.png \ - skin/blue/ok.png -blue_skin.path = /usr/share/chinese-calendar/skin/blue black_skin.files += skin/black/chinesecalendar.png \ skin/black/no.png \ skin/black/no-hover.png \ @@ -34,11 +27,8 @@ skin/black/arrow-down.png black_skin.path = /usr/share/chinese-calendar/skin/black qss.files += skin/default-skin.qss \ - skin/blue-skin.qss \ - skin/black.qss + skin/black-skin.qss qss.path = /usr/share/chinese-calendar/skin -readme.files += skin/README.md -readme.path = /usr/share/chinese-calendar/skin target.source += $$TARGET target.path = /usr/bin @@ -46,15 +36,11 @@ inst1 \ inst2 \ inst3 \ - inst4 \ default_skin \ - blue_skin \ black_skin \ qss \ - readme \ target - -include(qtsingleapplication/src/qtsingleapplication.pri) + QT += core gui\ sql \ @@ -65,18 +51,15 @@ datemaskwidget.h \ chinesecalendar.h \ ccbo.h \ - cnote.h \ - aboutdialog.h + cnote.h FORMS += calendar.ui \ - dateitem.ui \ - aboutdialog.ui + dateitem.ui SOURCES += main.cpp \ dateitem.cpp \ datemaskwidget.cpp \ chinesecalendar.cpp \ ccbo.cpp \ - cnote.cpp \ - aboutdialog.cpp + cnote.cpp RESOURCES += \ chinese-calendar.qrc TRANSLATIONS += translate/i18_zh_CN.ts diff -Nru chinese-calendar-0.8.2/chinese-calendar.qrc chinese-calendar-0.7.8/chinese-calendar.qrc --- chinese-calendar-0.8.2/chinese-calendar.qrc 2013-09-17 15:53:43.000000000 +0000 +++ chinese-calendar-0.7.8/chinese-calendar.qrc 2014-10-06 08:24:24.000000000 +0000 @@ -6,6 +6,5 @@ img/icon-64.png translate/i18_zh_CN.qm translate/i18_zh_CN.ts - qss/aboutus.qss diff -Nru chinese-calendar-0.8.2/cnote.cpp chinese-calendar-0.7.8/cnote.cpp --- chinese-calendar-0.8.2/cnote.cpp 2014-03-24 15:29:29.000000000 +0000 +++ chinese-calendar-0.7.8/cnote.cpp 2014-10-06 08:24:24.000000000 +0000 @@ -8,7 +8,7 @@ setWindowFlags(Qt::FramelessWindowHint); setAttribute(Qt::WA_TranslucentBackground); //pix.load(":/img/note.png",0,Qt::AvoidDither|Qt::ThresholdDither|Qt::ThresholdAlphaDither); - resize(224,252); + resize(224,280); textedit = new QTextEdit(this); textedit->setObjectName("textedit"); ok = new QPushButton(this); ok->setObjectName("ok"); cancel = new QPushButton(this);cancel->setObjectName("cancel"); diff -Nru chinese-calendar-0.8.2/cnote.h chinese-calendar-0.7.8/cnote.h --- chinese-calendar-0.8.2/cnote.h 2013-09-17 15:53:43.000000000 +0000 +++ chinese-calendar-0.7.8/cnote.h 2014-10-06 08:24:24.000000000 +0000 @@ -31,7 +31,9 @@ signals: void save(QString); - void setPlan(bool bFlag); + + + }; #endif // CNOTE_H diff -Nru chinese-calendar-0.8.2/COPYING chinese-calendar-0.7.8/COPYING --- chinese-calendar-0.8.2/COPYING 2013-09-17 15:53:43.000000000 +0000 +++ chinese-calendar-0.7.8/COPYING 1970-01-01 00:00:00.000000000 +0000 @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff -Nru chinese-calendar-0.8.2/dateitem.cpp chinese-calendar-0.7.8/dateitem.cpp --- chinese-calendar-0.8.2/dateitem.cpp 2014-03-24 15:29:29.000000000 +0000 +++ chinese-calendar-0.7.8/dateitem.cpp 2014-10-06 08:24:24.000000000 +0000 @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * This project is developed by "Ubuntu Kylin Members" team, + * This project is developed by "UbuntuKylin Members" team, * see * Authors: Abel Liu * Shine Huang @@ -111,7 +111,6 @@ ui->label->setStyleSheet(this->oriDayStyle); ui->label_2->setStyleSheet(this->oriCDayStyle); } - emit resetColor(); } @@ -124,7 +123,6 @@ ui->label->setStyleSheet(this->clickDayStyle); ui->label_2->setStyleSheet(this->clickCDayStyle); this->isFocus = true; - emit resetColor(); } } @@ -187,3 +185,11 @@ ui->label_2->setStyleSheet(this->clickCDayStyle); this->isFocus = true; } + +void DateItem::paintEvent(QPaintEvent *) +{ + QPainter painter(this); + QStyleOption opt; + opt.init(this); + style()->drawPrimitive(QStyle::PE_Widget, &opt, &painter, this); +} diff -Nru chinese-calendar-0.8.2/dateitem.h chinese-calendar-0.7.8/dateitem.h --- chinese-calendar-0.8.2/dateitem.h 2014-03-24 15:29:29.000000000 +0000 +++ chinese-calendar-0.7.8/dateitem.h 2014-10-06 08:24:24.000000000 +0000 @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * This project is developed by "Ubuntu Kylin Members" team, + * This project is developed by "UbuntuKylin Members" team, * see * Authors: Abel Liu * Shine Huang @@ -52,6 +52,7 @@ void resizeItem(int x,int y); protected: + void paintEvent(QPaintEvent *); bool eventFilter(QObject *o, QEvent *ev); void enter(); void leave(); @@ -63,7 +64,6 @@ signals: void clicked(QString); void day(QString); - void resetColor(); private: Ui::DateItem *ui; diff -Nru chinese-calendar-0.8.2/datemaskwidget.cpp chinese-calendar-0.7.8/datemaskwidget.cpp --- chinese-calendar-0.8.2/datemaskwidget.cpp 2014-03-24 15:29:29.000000000 +0000 +++ chinese-calendar-0.7.8/datemaskwidget.cpp 2014-10-06 08:24:24.000000000 +0000 @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * This project is developed by "Ubuntu Kylin Members" team, + * This project is developed by "UbuntuKylin Members" team, * see * Authors: Abel Liu * Shine Huang diff -Nru chinese-calendar-0.8.2/datemaskwidget.h chinese-calendar-0.7.8/datemaskwidget.h --- chinese-calendar-0.8.2/datemaskwidget.h 2014-03-24 15:29:29.000000000 +0000 +++ chinese-calendar-0.7.8/datemaskwidget.h 2014-10-06 08:24:24.000000000 +0000 @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * This project is developed by "Ubuntu Kylin Members" team, + * This project is developed by "UbuntuKylin Members" team, * see * Authors: Abel Liu * Shine Huang diff -Nru chinese-calendar-0.8.2/debian/bzr-builder.manifest chinese-calendar-0.7.8/debian/bzr-builder.manifest --- chinese-calendar-0.8.2/debian/bzr-builder.manifest 1970-01-01 00:00:00.000000000 +0000 +++ chinese-calendar-0.7.8/debian/bzr-builder.manifest 2014-10-06 08:24:24.000000000 +0000 @@ -0,0 +1,2 @@ +# bzr-builder format 0.3 deb-version {debupstream}-0~33 +lp:~mutse-young/chinese-calendar/trunk revid:yyhoo2.young@gmail.com-20130506144225-y4vlipruzrsvvkb8 diff -Nru chinese-calendar-0.8.2/debian/changelog chinese-calendar-0.7.8/debian/changelog --- chinese-calendar-0.8.2/debian/changelog 2014-03-24 15:38:01.000000000 +0000 +++ chinese-calendar-0.7.8/debian/changelog 2014-10-06 08:24:24.000000000 +0000 @@ -1,80 +1,13 @@ -chinese-calendar (0.8.2-0ubuntu1) trusty; urgency=medium +chinese-calendar (0.7.8-0~33~ubuntu14.04.1) trusty; urgency=low - * Replace UbuntuKylin with "Ubuntu Kylin" + * Auto build. - -- Anthony Wong Tue, 18 Mar 2014 21:28:58 +0800 + -- mutse Mon, 06 Oct 2014 08:24:24 +0000 -chinese-calendar (0.8.1-0ubuntu1) saucy; urgency=low +chinese-calendar (0.7.8-1) raring; urgency=low - * New upstream release: - - Fix: LP #1227147, LP #1233937 + * add skins changing function code + * add default and black skin qss files - -- Shine Huang Wed, 12 Feb 2014 10:36:40 +0800 + -- mutse Wed, 01 May 2013 19:11:07 +0800 -chinese-calendar (0.8.0-0ubuntu1) saucy; urgency=low - - * New upstream release: - - Add skin changing function code - - Add default and blue skin qss files - - Add about software info - - Add shotcut to hide chinese-calendar when it shows - - Fix: LP #1205242, LP #1206026 - * Update compat to 9, std-ver to 3.9.4. - * Slightly update description in d/control. - * Update d/copyright to reflect debian directory copyright. - - -- Aron Xu Wed, 18 Sep 2013 02:45:08 +0800 - -chinese-calendar (0.7.8-0ubuntu1) saucy; urgency=low - - * New upstream release. - (LP: #1190936, #1192501, #1160698, #1164859, #1161756, #1155491, #1160800) - * Drop all patches, which were merged back to upstreap. - - -- Zhengpeng Hou Wed, 26 Jun 2013 08:55:14 +0800 - -chinese-calendar (0.7.6-0ubuntu4) raring; urgency=low - - * add 03-save-data-per-user.diff (LP: #1160149) - * remove debian/postinst, since db will be saved under - user's home. - - -- Zhengpeng Hou Tue, 26 Mar 2013 22:49:47 +0800 - -chinese-calendar (0.7.6-0ubuntu3) raring; urgency=low - - * add 02-fix-write-permission.diff. (LP: #1159732) - - -- Zhengpeng Hou Mon, 25 Mar 2013 20:12:01 +0800 - -chinese-calendar (0.7.6-0ubuntu2) raring; urgency=low - - * Add 01-fix-crash.diff to fix the crash on startup. - - -- Zhengpeng Hou Thu, 14 Mar 2013 21:41:07 +0800 - -chinese-calendar (0.7.6-0ubuntu1) raring; urgency=high - - * Fix bug #1154063, bug #1154075, bug #1154079, bug #1154050. - * Modify note function. - - -- abelsaber (Yes,it's true) Wed, 13 Mar 2013 10:12:21 +0800 - -chinese-calendar (0.7.5) raring; urgency=high - - * Fix bug #1124849, bug #1124747, bug #1124831, bug #1131516, bug #1124825, bug #1129925. - * Add note function. - - -- abelsaber (Yes,it's true) Tue, 12 Mar 2013 14:25:51 +0800 - -chinese-calendar (0.7.4) raring; urgency=low - - * Optimize the display of dateitem, add systemtray. - - -- abelsaber (Yes,it's true) Tue, 29 Jan 2013 14:33:08 +0800 - -chinese-calendar (0.6.2-1) raring; urgency=low - - * Initial release. - - -- abelsaber (Yes,it's true) Tue, 22 Jan 2013 14:10:26 +0800 diff -Nru chinese-calendar-0.8.2/debian/compat chinese-calendar-0.7.8/debian/compat --- chinese-calendar-0.8.2/debian/compat 2013-09-17 18:47:24.000000000 +0000 +++ chinese-calendar-0.7.8/debian/compat 2014-10-06 08:24:24.000000000 +0000 @@ -1 +1 @@ -9 +8 diff -Nru chinese-calendar-0.8.2/debian/control chinese-calendar-0.7.8/debian/control --- chinese-calendar-0.8.2/debian/control 2014-03-24 15:38:44.000000000 +0000 +++ chinese-calendar-0.7.8/debian/control 2014-10-06 08:24:24.000000000 +0000 @@ -1,22 +1,17 @@ Source: chinese-calendar Section: utils Priority: extra -Maintainer: Ubuntu Kylin Members -Uploaders: Abel Liu , - Shine Huang -Build-Depends: debhelper (>= 9), - libqt4-dev (>= 4.8.1), - libqt4-sql-sqlite, - ttf-wqy-microhei -Standards-Version: 3.9.5 +Maintainer: abel +Build-Depends: debhelper (>= 8.0.0), libqt4-dev (>=4.8.1), libqt4-sql-sqlite, ttf-wqy-microhei +Standards-Version: 3.9.2 Homepage: https://launchpad.net/chinese-calendar Package: chinese-calendar Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Description: Chinese lunar calendar This indicator is used to show a Chinese lunar calendar which is tailored for Chinese users. The calendar can show festivals and the 24 solar terms, year and month is also selectable. . - This calendar is a default application in the Ubuntu Kylin flavour. + This calendar is the default application in the UbuntuKylin flavour. diff -Nru chinese-calendar-0.8.2/debian/copyright chinese-calendar-0.7.8/debian/copyright --- chinese-calendar-0.8.2/debian/copyright 2013-09-17 19:23:13.000000000 +0000 +++ chinese-calendar-0.7.8/debian/copyright 2014-10-06 08:24:24.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: http://dep.debian.net/deps/dep5 Upstream-Name: chinese-calendar Upstream-Contact: abel Source: https://launchpad.net/chinese-calendar @@ -6,13 +6,6 @@ Files: * Copyright: Copyright (C) 2013 National University of Defense Technology(NUDT) & Kylin Lt License: GPL-3 - -Files: debian/* -Copyright: 2013, Zhengpeng Hou - 2013, Aron Xu -License: GPL-3 - -License: GPL-3 This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License version 3 as published by the Free Software Foundation. diff -Nru chinese-calendar-0.8.2/debian/rules chinese-calendar-0.7.8/debian/rules --- chinese-calendar-0.8.2/debian/rules 2013-09-17 19:15:16.000000000 +0000 +++ chinese-calendar-0.7.8/debian/rules 2014-10-06 08:24:24.000000000 +0000 @@ -2,4 +2,4 @@ # -*- makefile -*- %: - dh $@ --parallel + dh $@ diff -Nru chinese-calendar-0.8.2/debian/source/format chinese-calendar-0.7.8/debian/source/format --- chinese-calendar-0.8.2/debian/source/format 2013-09-17 18:41:10.000000000 +0000 +++ chinese-calendar-0.7.8/debian/source/format 2014-10-06 08:24:24.000000000 +0000 @@ -1 +1 @@ -3.0 (quilt) +3.0 (native) diff -Nru chinese-calendar-0.8.2/main.cpp chinese-calendar-0.7.8/main.cpp --- chinese-calendar-0.8.2/main.cpp 2014-03-24 15:29:29.000000000 +0000 +++ chinese-calendar-0.7.8/main.cpp 2014-10-06 08:24:24.000000000 +0000 @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * This project is developed by "Ubuntu Kylin Members" team, + * This project is developed by "UbuntuKylin Members" team, * see * Authors: Abel Liu * Shine Huang @@ -25,19 +25,13 @@ #include #include #include -#include #include "chinesecalendar.h" int main(int argc, char *argv[]) { - //单程序运行处理 - QtSingleApplication app(argc, argv); - if (app.isRunning()) - return 0; - QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8")); QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8")); -// QApplication app(argc, argv); + QApplication app(argc, argv); QTranslator translator; translator.load(":/translate/i18_zh_CN.qm"); @@ -53,12 +47,9 @@ QString stylesheet = QObject::tr(file.readAll()); app.setStyleSheet(stylesheet); - app.setQuitOnLastWindowClosed(false); - ChineseCalendar *window = new ChineseCalendar; app.setWindowIcon(window->icon64); window->setWindowFlags(Qt::FramelessWindowHint); - window->resetDateItemColor(); QDesktopWidget desktop; int width = desktop.screenGeometry().width(); diff -Nru chinese-calendar-0.8.2/qss/aboutus.qss chinese-calendar-0.7.8/qss/aboutus.qss --- chinese-calendar-0.8.2/qss/aboutus.qss 2013-09-17 15:53:43.000000000 +0000 +++ chinese-calendar-0.7.8/qss/aboutus.qss 1970-01-01 00:00:00.000000000 +0000 @@ -1,62 +0,0 @@ -QTabWidget::pane { /* The tab widget frame */ - border-top: 2px solid #C2C7CB; - position: absolute; - top: -0.5em; -} - -QTabWidget::tab-bar { - alignment: center; -} - -/* Style the tab using the tab sub-control. Note that - it reads QTabBar _not_ QTabWidget */ -QTabBar::tab { - background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #E1E1E1, stop: 0.4 #DDDDDD, - stop: 0.5 #D8D8D8, stop: 1.0 #D3D3D3); - border: 2px solid #C4C4C3; - border-bottom-color: #C2C7CB; /* same as the pane color */ - border-top-left-radius: 4px; - border-top-right-radius: 4px; - min-width: 8ex; - padding: 2px; -} - -QTabBar::tab:selected, QTabBar::tab:hover { - background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #fafafa, stop: 0.4 #f4f4f4, - stop: 0.5 #e7e7e7, stop: 1.0 #fafafa); -} - -QTabBar::tab:selected { - border-color: #9B9B9B; - border-bottom-color: #C2C7CB; /* same as pane color */ -} - -QTextEdit[readOnly="true"]{ - background-color: white; - background-attachment: scroll; -} - -QPushButton[objectName="closeBtn"]{ - color: #333; - border: 2px solid #555; - border-radius: 11px; - padding: 5px; - background: qradialgradient(cx: 0.3, cy: -0.4, - fx: 0.3, fy: -0.4, - radius: 1.35, stop: 0 #fff, stop: 1 #888); - min-width: 80px; -} - -QPushButton[objectName="closeBtn"]:hover { - background: qradialgradient(cx: 0.3, cy: -0.4, - fx: 0.3, fy: -0.4, - radius: 1.35, stop: 0 #fff, stop: 1 #bbb); -} - -QPushButton[objectName="closeBtn"]:pressed { - background: qradialgradient(cx: 0.4, cy: -0.1, - fx: 0.4, fy: -0.1, - radius: 1.35, stop: 0 #fff, stop: 1 #ddd); -} diff -Nru chinese-calendar-0.8.2/qtsingleapplication/common.pri chinese-calendar-0.7.8/qtsingleapplication/common.pri --- chinese-calendar-0.8.2/qtsingleapplication/common.pri 2014-03-24 15:29:29.000000000 +0000 +++ chinese-calendar-0.7.8/qtsingleapplication/common.pri 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -exists(config.pri):infile(config.pri, SOLUTIONS_LIBRARY, yes): CONFIG += qtsingleapplication-uselib -TEMPLATE += fakelib -QTSINGLEAPPLICATION_LIBNAME = $$qtLibraryTarget(QtSolutions_SingleApplication-head) -TEMPLATE -= fakelib -QTSINGLEAPPLICATION_LIBDIR = $$PWD/lib -unix:qtsingleapplication-uselib:!qtsingleapplication-buildlib:QMAKE_RPATHDIR += $$QTSINGLEAPPLICATION_LIBDIR diff -Nru chinese-calendar-0.8.2/qtsingleapplication/README.TXT chinese-calendar-0.7.8/qtsingleapplication/README.TXT --- chinese-calendar-0.8.2/qtsingleapplication/README.TXT 2014-03-24 15:29:29.000000000 +0000 +++ chinese-calendar-0.7.8/qtsingleapplication/README.TXT 1970-01-01 00:00:00.000000000 +0000 @@ -1,33 +0,0 @@ -Qt Solutions Component: Single Application - -The QtSingleApplication component provides support for -applications that can be only started once per user. - - - -Version history: - -2.0: - Version 1.3 ported to Qt 4. - -2.1: - Fix compilation problem on Mac. - -2.2: - Really fix the Mac compilation problem. - - Mac: fix crash due to wrong object releasing. - - Mac: Fix memory leak. - -2.3: - Windows: Force creation of internal widget to make it work - with Qt 4.2. - -2.4: - Fix the system for automatic window raising on message - reception. NOTE: minor API change. - -2.5: - Mac: Fix isRunning() to work and report correctly. - -2.6: - - initialize() is now obsolete, no longer necessary to call - it - - - Fixed race condition where multiple instances migth be started - - - QtSingleCoreApplication variant provided for non-GUI (console) - usage - - Complete reimplementation. Visible changes: - - LGPL release. - diff -Nru chinese-calendar-0.8.2/qtsingleapplication/src/qtlocalpeer.cpp chinese-calendar-0.7.8/qtsingleapplication/src/qtlocalpeer.cpp --- chinese-calendar-0.8.2/qtsingleapplication/src/qtlocalpeer.cpp 2014-03-24 15:29:29.000000000 +0000 +++ chinese-calendar-0.7.8/qtsingleapplication/src/qtlocalpeer.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,203 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt Solutions component. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#include "qtlocalpeer.h" -#include -#include - -#if defined(Q_OS_WIN) -#include -#include -typedef BOOL(WINAPI*PProcessIdToSessionId)(DWORD,DWORD*); -static PProcessIdToSessionId pProcessIdToSessionId = 0; -#endif -#if defined(Q_OS_UNIX) -#include -#include -#include -#endif - -namespace QtLP_Private { -#include "qtlockedfile.cpp" -#if defined(Q_OS_WIN) -#include "qtlockedfile_win.cpp" -#else -#include "qtlockedfile_unix.cpp" -#endif -} - -const char* QtLocalPeer::ack = "ack"; - -QtLocalPeer::QtLocalPeer(QObject* parent, const QString &appId) - : QObject(parent), id(appId) -{ - QString prefix = id; - if (id.isEmpty()) { - id = QCoreApplication::applicationFilePath(); -#if defined(Q_OS_WIN) - id = id.toLower(); -#endif - prefix = id.section(QLatin1Char('/'), -1); - } - prefix.remove(QRegExp("[^a-zA-Z]")); - prefix.truncate(6); - - QByteArray idc = id.toUtf8(); - quint16 idNum = qChecksum(idc.constData(), idc.size()); - socketName = QLatin1String("qtsingleapp-") + prefix - + QLatin1Char('-') + QString::number(idNum, 16); - -#if defined(Q_OS_WIN) - if (!pProcessIdToSessionId) { - QLibrary lib("kernel32"); - pProcessIdToSessionId = (PProcessIdToSessionId)lib.resolve("ProcessIdToSessionId"); - } - if (pProcessIdToSessionId) { - DWORD sessionId = 0; - pProcessIdToSessionId(GetCurrentProcessId(), &sessionId); - socketName += QLatin1Char('-') + QString::number(sessionId, 16); - } -#else - socketName += QLatin1Char('-') + QString::number(::getuid(), 16); -#endif - - server = new QLocalServer(this); - QString lockName = QDir(QDir::tempPath()).absolutePath() - + QLatin1Char('/') + socketName - + QLatin1String("-lockfile"); - lockFile.setFileName(lockName); - lockFile.open(QIODevice::ReadWrite); -} - - - -bool QtLocalPeer::isClient() -{ - if (lockFile.isLocked()) - return false; - - if (!lockFile.lock(QtLP_Private::QtLockedFile::WriteLock, false)) - return true; - - bool res = server->listen(socketName); -#if defined(Q_OS_UNIX) && (QT_VERSION >= QT_VERSION_CHECK(4,5,0)) - // ### Workaround - if (!res && server->serverError() == QAbstractSocket::AddressInUseError) { - QFile::remove(QDir::cleanPath(QDir::tempPath())+QLatin1Char('/')+socketName); - res = server->listen(socketName); - } -#endif - if (!res) - qWarning("QtSingleCoreApplication: listen on local socket failed, %s", qPrintable(server->errorString())); - QObject::connect(server, SIGNAL(newConnection()), SLOT(receiveConnection())); - return false; -} - - -bool QtLocalPeer::sendMessage(const QString &message, int timeout) -{ - if (!isClient()) - return false; - - QLocalSocket socket; - bool connOk = false; - for(int i = 0; i < 2; i++) { - // Try twice, in case the other instance is just starting up - socket.connectToServer(socketName); - connOk = socket.waitForConnected(timeout/2); - if (connOk || i) - break; - int ms = 250; -#if defined(Q_OS_WIN) - Sleep(DWORD(ms)); -#else - struct timespec ts = { ms / 1000, (ms % 1000) * 1000 * 1000 }; - nanosleep(&ts, NULL); -#endif - } - if (!connOk) - return false; - - QByteArray uMsg(message.toUtf8()); - QDataStream ds(&socket); - ds.writeBytes(uMsg.constData(), uMsg.size()); - bool res = socket.waitForBytesWritten(timeout); - if (res) { - res &= socket.waitForReadyRead(timeout); // wait for ack - if (res) - res &= (socket.read(qstrlen(ack)) == ack); - } - return res; -} - - -void QtLocalPeer::receiveConnection() -{ - QLocalSocket* socket = server->nextPendingConnection(); - if (!socket) - return; - - while (socket->bytesAvailable() < (int)sizeof(quint32)) - socket->waitForReadyRead(); - QDataStream ds(socket); - QByteArray uMsg; - quint32 remaining; - ds >> remaining; - uMsg.resize(remaining); - int got = 0; - char* uMsgBuf = uMsg.data(); - do { - got = ds.readRawData(uMsgBuf, remaining); - remaining -= got; - uMsgBuf += got; - } while (remaining && got >= 0 && socket->waitForReadyRead(2000)); - if (got < 0) { - qWarning("QtLocalPeer: Message reception failed %s", socket->errorString().toLatin1().constData()); - delete socket; - return; - } - QString message(QString::fromUtf8(uMsg)); - socket->write(ack, qstrlen(ack)); - socket->waitForBytesWritten(1000); - socket->waitForDisconnected(1000); // make sure client reads ack - delete socket; - emit messageReceived(message); //### (might take a long time to return) -} diff -Nru chinese-calendar-0.8.2/qtsingleapplication/src/qtlocalpeer.h chinese-calendar-0.7.8/qtsingleapplication/src/qtlocalpeer.h --- chinese-calendar-0.8.2/qtsingleapplication/src/qtlocalpeer.h 2014-03-24 15:29:29.000000000 +0000 +++ chinese-calendar-0.7.8/qtsingleapplication/src/qtlocalpeer.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,77 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt Solutions component. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QTLOCALPEER_H -#define QTLOCALPEER_H - -#include -#include -#include - -#include "qtlockedfile.h" - -class QtLocalPeer : public QObject -{ - Q_OBJECT - -public: - QtLocalPeer(QObject *parent = 0, const QString &appId = QString()); - bool isClient(); - bool sendMessage(const QString &message, int timeout); - QString applicationId() const - { return id; } - -Q_SIGNALS: - void messageReceived(const QString &message); - -protected Q_SLOTS: - void receiveConnection(); - -protected: - QString id; - QString socketName; - QLocalServer* server; - QtLP_Private::QtLockedFile lockFile; - -private: - static const char* ack; -}; - -#endif // QTLOCALPEER_H diff -Nru chinese-calendar-0.8.2/qtsingleapplication/src/QtLockedFile chinese-calendar-0.7.8/qtsingleapplication/src/QtLockedFile --- chinese-calendar-0.8.2/qtsingleapplication/src/QtLockedFile 2014-03-24 15:29:29.000000000 +0000 +++ chinese-calendar-0.7.8/qtsingleapplication/src/QtLockedFile 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "qtlockedfile.h" diff -Nru chinese-calendar-0.8.2/qtsingleapplication/src/qtlockedfile.cpp chinese-calendar-0.7.8/qtsingleapplication/src/qtlockedfile.cpp --- chinese-calendar-0.8.2/qtsingleapplication/src/qtlockedfile.cpp 2014-03-24 15:29:29.000000000 +0000 +++ chinese-calendar-0.7.8/qtsingleapplication/src/qtlockedfile.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,193 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt Solutions component. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qtlockedfile.h" - -/*! - \class QtLockedFile - - \brief The QtLockedFile class extends QFile with advisory locking - functions. - - A file may be locked in read or write mode. Multiple instances of - \e QtLockedFile, created in multiple processes running on the same - machine, may have a file locked in read mode. Exactly one instance - may have it locked in write mode. A read and a write lock cannot - exist simultaneously on the same file. - - The file locks are advisory. This means that nothing prevents - another process from manipulating a locked file using QFile or - file system functions offered by the OS. Serialization is only - guaranteed if all processes that access the file use - QLockedFile. Also, while holding a lock on a file, a process - must not open the same file again (through any API), or locks - can be unexpectedly lost. - - The lock provided by an instance of \e QtLockedFile is released - whenever the program terminates. This is true even when the - program crashes and no destructors are called. -*/ - -/*! \enum QtLockedFile::LockMode - - This enum describes the available lock modes. - - \value ReadLock A read lock. - \value WriteLock A write lock. - \value NoLock Neither a read lock nor a write lock. -*/ - -/*! - Constructs an unlocked \e QtLockedFile object. This constructor - behaves in the same way as \e QFile::QFile(). - - \sa QFile::QFile() -*/ -QtLockedFile::QtLockedFile() - : QFile() -{ -#ifdef Q_OS_WIN - wmutex = 0; - rmutex = 0; -#endif - m_lock_mode = NoLock; -} - -/*! - Constructs an unlocked QtLockedFile object with file \a name. This - constructor behaves in the same way as \e QFile::QFile(const - QString&). - - \sa QFile::QFile() -*/ -QtLockedFile::QtLockedFile(const QString &name) - : QFile(name) -{ -#ifdef Q_OS_WIN - wmutex = 0; - rmutex = 0; -#endif - m_lock_mode = NoLock; -} - -/*! - Opens the file in OpenMode \a mode. - - This is identical to QFile::open(), with the one exception that the - Truncate mode flag is disallowed. Truncation would conflict with the - advisory file locking, since the file would be modified before the - write lock is obtained. If truncation is required, use resize(0) - after obtaining the write lock. - - Returns true if successful; otherwise false. - - \sa QFile::open(), QFile::resize() -*/ -bool QtLockedFile::open(OpenMode mode) -{ - if (mode & QIODevice::Truncate) { - qWarning("QtLockedFile::open(): Truncate mode not allowed."); - return false; - } - return QFile::open(mode); -} - -/*! - Returns \e true if this object has a in read or write lock; - otherwise returns \e false. - - \sa lockMode() -*/ -bool QtLockedFile::isLocked() const -{ - return m_lock_mode != NoLock; -} - -/*! - Returns the type of lock currently held by this object, or \e - QtLockedFile::NoLock. - - \sa isLocked() -*/ -QtLockedFile::LockMode QtLockedFile::lockMode() const -{ - return m_lock_mode; -} - -/*! - \fn bool QtLockedFile::lock(LockMode mode, bool block = true) - - Obtains a lock of type \a mode. The file must be opened before it - can be locked. - - If \a block is true, this function will block until the lock is - aquired. If \a block is false, this function returns \e false - immediately if the lock cannot be aquired. - - If this object already has a lock of type \a mode, this function - returns \e true immediately. If this object has a lock of a - different type than \a mode, the lock is first released and then a - new lock is obtained. - - This function returns \e true if, after it executes, the file is - locked by this object, and \e false otherwise. - - \sa unlock(), isLocked(), lockMode() -*/ - -/*! - \fn bool QtLockedFile::unlock() - - Releases a lock. - - If the object has no lock, this function returns immediately. - - This function returns \e true if, after it executes, the file is - not locked by this object, and \e false otherwise. - - \sa lock(), isLocked(), lockMode() -*/ - -/*! - \fn QtLockedFile::~QtLockedFile() - - Destroys the \e QtLockedFile object. If any locks were held, they - are released. -*/ diff -Nru chinese-calendar-0.8.2/qtsingleapplication/src/qtlockedfile.h chinese-calendar-0.7.8/qtsingleapplication/src/qtlockedfile.h --- chinese-calendar-0.8.2/qtsingleapplication/src/qtlockedfile.h 2014-03-24 15:29:29.000000000 +0000 +++ chinese-calendar-0.7.8/qtsingleapplication/src/qtlockedfile.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,97 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt Solutions component. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QTLOCKEDFILE_H -#define QTLOCKEDFILE_H - -#include -#ifdef Q_OS_WIN -#include -#endif - -#if defined(Q_OS_WIN) -# if !defined(QT_QTLOCKEDFILE_EXPORT) && !defined(QT_QTLOCKEDFILE_IMPORT) -# define QT_QTLOCKEDFILE_EXPORT -# elif defined(QT_QTLOCKEDFILE_IMPORT) -# if defined(QT_QTLOCKEDFILE_EXPORT) -# undef QT_QTLOCKEDFILE_EXPORT -# endif -# define QT_QTLOCKEDFILE_EXPORT __declspec(dllimport) -# elif defined(QT_QTLOCKEDFILE_EXPORT) -# undef QT_QTLOCKEDFILE_EXPORT -# define QT_QTLOCKEDFILE_EXPORT __declspec(dllexport) -# endif -#else -# define QT_QTLOCKEDFILE_EXPORT -#endif - -namespace QtLP_Private { - -class QT_QTLOCKEDFILE_EXPORT QtLockedFile : public QFile -{ -public: - enum LockMode { NoLock = 0, ReadLock, WriteLock }; - - QtLockedFile(); - QtLockedFile(const QString &name); - ~QtLockedFile(); - - bool open(OpenMode mode); - - bool lock(LockMode mode, bool block = true); - bool unlock(); - bool isLocked() const; - LockMode lockMode() const; - -private: -#ifdef Q_OS_WIN - Qt::HANDLE wmutex; - Qt::HANDLE rmutex; - QVector rmutexes; - QString mutexname; - - Qt::HANDLE getMutexHandle(int idx, bool doCreate); - bool waitMutex(Qt::HANDLE mutex, bool doBlock); - -#endif - LockMode m_lock_mode; -}; -} -#endif diff -Nru chinese-calendar-0.8.2/qtsingleapplication/src/qtlockedfile_unix.cpp chinese-calendar-0.7.8/qtsingleapplication/src/qtlockedfile_unix.cpp --- chinese-calendar-0.8.2/qtsingleapplication/src/qtlockedfile_unix.cpp 2014-03-24 15:29:29.000000000 +0000 +++ chinese-calendar-0.7.8/qtsingleapplication/src/qtlockedfile_unix.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,115 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt Solutions component. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include -#include -#include - -#include "qtlockedfile.h" - -bool QtLockedFile::lock(LockMode mode, bool block) -{ - if (!isOpen()) { - qWarning("QtLockedFile::lock(): file is not opened"); - return false; - } - - if (mode == NoLock) - return unlock(); - - if (mode == m_lock_mode) - return true; - - if (m_lock_mode != NoLock) - unlock(); - - struct flock fl; - fl.l_whence = SEEK_SET; - fl.l_start = 0; - fl.l_len = 0; - fl.l_type = (mode == ReadLock) ? F_RDLCK : F_WRLCK; - int cmd = block ? F_SETLKW : F_SETLK; - int ret = fcntl(handle(), cmd, &fl); - - if (ret == -1) { - if (errno != EINTR && errno != EAGAIN) - qWarning("QtLockedFile::lock(): fcntl: %s", strerror(errno)); - return false; - } - - - m_lock_mode = mode; - return true; -} - - -bool QtLockedFile::unlock() -{ - if (!isOpen()) { - qWarning("QtLockedFile::unlock(): file is not opened"); - return false; - } - - if (!isLocked()) - return true; - - struct flock fl; - fl.l_whence = SEEK_SET; - fl.l_start = 0; - fl.l_len = 0; - fl.l_type = F_UNLCK; - int ret = fcntl(handle(), F_SETLKW, &fl); - - if (ret == -1) { - qWarning("QtLockedFile::lock(): fcntl: %s", strerror(errno)); - return false; - } - - m_lock_mode = NoLock; - return true; -} - -QtLockedFile::~QtLockedFile() -{ - if (isOpen()) - unlock(); -} - diff -Nru chinese-calendar-0.8.2/qtsingleapplication/src/qtlockedfile_win.cpp chinese-calendar-0.7.8/qtsingleapplication/src/qtlockedfile_win.cpp --- chinese-calendar-0.8.2/qtsingleapplication/src/qtlockedfile_win.cpp 2014-03-24 15:29:29.000000000 +0000 +++ chinese-calendar-0.7.8/qtsingleapplication/src/qtlockedfile_win.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,211 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt Solutions component. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qtlockedfile.h" -#include -#include - -#define MUTEX_PREFIX "QtLockedFile mutex " -// Maximum number of concurrent read locks. Must not be greater than MAXIMUM_WAIT_OBJECTS -#define MAX_READERS MAXIMUM_WAIT_OBJECTS - -#if QT_VERSION >= 0x050000 -#define QT_WA(unicode, ansi) unicode -#endif - -Qt::HANDLE QtLockedFile::getMutexHandle(int idx, bool doCreate) -{ - if (mutexname.isEmpty()) { - QFileInfo fi(*this); - mutexname = QString::fromLatin1(MUTEX_PREFIX) - + fi.absoluteFilePath().toLower(); - } - QString mname(mutexname); - if (idx >= 0) - mname += QString::number(idx); - - Qt::HANDLE mutex; - if (doCreate) { - QT_WA( { mutex = CreateMutexW(NULL, FALSE, (TCHAR*)mname.utf16()); }, - { mutex = CreateMutexA(NULL, FALSE, mname.toLocal8Bit().constData()); } ); - if (!mutex) { - qErrnoWarning("QtLockedFile::lock(): CreateMutex failed"); - return 0; - } - } - else { - QT_WA( { mutex = OpenMutexW(SYNCHRONIZE | MUTEX_MODIFY_STATE, FALSE, (TCHAR*)mname.utf16()); }, - { mutex = OpenMutexA(SYNCHRONIZE | MUTEX_MODIFY_STATE, FALSE, mname.toLocal8Bit().constData()); } ); - if (!mutex) { - if (GetLastError() != ERROR_FILE_NOT_FOUND) - qErrnoWarning("QtLockedFile::lock(): OpenMutex failed"); - return 0; - } - } - return mutex; -} - -bool QtLockedFile::waitMutex(Qt::HANDLE mutex, bool doBlock) -{ - Q_ASSERT(mutex); - DWORD res = WaitForSingleObject(mutex, doBlock ? INFINITE : 0); - switch (res) { - case WAIT_OBJECT_0: - case WAIT_ABANDONED: - return true; - break; - case WAIT_TIMEOUT: - break; - default: - qErrnoWarning("QtLockedFile::lock(): WaitForSingleObject failed"); - } - return false; -} - - - -bool QtLockedFile::lock(LockMode mode, bool block) -{ - if (!isOpen()) { - qWarning("QtLockedFile::lock(): file is not opened"); - return false; - } - - if (mode == NoLock) - return unlock(); - - if (mode == m_lock_mode) - return true; - - if (m_lock_mode != NoLock) - unlock(); - - if (!wmutex && !(wmutex = getMutexHandle(-1, true))) - return false; - - if (!waitMutex(wmutex, block)) - return false; - - if (mode == ReadLock) { - int idx = 0; - for (; idx < MAX_READERS; idx++) { - rmutex = getMutexHandle(idx, false); - if (!rmutex || waitMutex(rmutex, false)) - break; - CloseHandle(rmutex); - } - bool ok = true; - if (idx >= MAX_READERS) { - qWarning("QtLockedFile::lock(): too many readers"); - rmutex = 0; - ok = false; - } - else if (!rmutex) { - rmutex = getMutexHandle(idx, true); - if (!rmutex || !waitMutex(rmutex, false)) - ok = false; - } - if (!ok && rmutex) { - CloseHandle(rmutex); - rmutex = 0; - } - ReleaseMutex(wmutex); - if (!ok) - return false; - } - else { - Q_ASSERT(rmutexes.isEmpty()); - for (int i = 0; i < MAX_READERS; i++) { - Qt::HANDLE mutex = getMutexHandle(i, false); - if (mutex) - rmutexes.append(mutex); - } - if (rmutexes.size()) { - DWORD res = WaitForMultipleObjects(rmutexes.size(), rmutexes.constData(), - TRUE, block ? INFINITE : 0); - if (res != WAIT_OBJECT_0 && res != WAIT_ABANDONED) { - if (res != WAIT_TIMEOUT) - qErrnoWarning("QtLockedFile::lock(): WaitForMultipleObjects failed"); - m_lock_mode = WriteLock; // trick unlock() to clean up - semiyucky - unlock(); - return false; - } - } - } - - m_lock_mode = mode; - return true; -} - -bool QtLockedFile::unlock() -{ - if (!isOpen()) { - qWarning("QtLockedFile::unlock(): file is not opened"); - return false; - } - - if (!isLocked()) - return true; - - if (m_lock_mode == ReadLock) { - ReleaseMutex(rmutex); - CloseHandle(rmutex); - rmutex = 0; - } - else { - foreach(Qt::HANDLE mutex, rmutexes) { - ReleaseMutex(mutex); - CloseHandle(mutex); - } - rmutexes.clear(); - ReleaseMutex(wmutex); - } - - m_lock_mode = QtLockedFile::NoLock; - return true; -} - -QtLockedFile::~QtLockedFile() -{ - if (isOpen()) - unlock(); - if (wmutex) - CloseHandle(wmutex); -} diff -Nru chinese-calendar-0.8.2/qtsingleapplication/src/QtSingleApplication chinese-calendar-0.7.8/qtsingleapplication/src/QtSingleApplication --- chinese-calendar-0.8.2/qtsingleapplication/src/QtSingleApplication 2014-03-24 15:29:29.000000000 +0000 +++ chinese-calendar-0.7.8/qtsingleapplication/src/QtSingleApplication 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "qtsingleapplication.h" diff -Nru chinese-calendar-0.8.2/qtsingleapplication/src/qtsingleapplication.cpp chinese-calendar-0.7.8/qtsingleapplication/src/qtsingleapplication.cpp --- chinese-calendar-0.8.2/qtsingleapplication/src/qtsingleapplication.cpp 2014-03-24 15:29:29.000000000 +0000 +++ chinese-calendar-0.7.8/qtsingleapplication/src/qtsingleapplication.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,347 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt Solutions component. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#include "qtsingleapplication.h" -#include "qtlocalpeer.h" -#include - - -/*! - \class QtSingleApplication qtsingleapplication.h - \brief The QtSingleApplication class provides an API to detect and - communicate with running instances of an application. - - This class allows you to create applications where only one - instance should be running at a time. I.e., if the user tries to - launch another instance, the already running instance will be - activated instead. Another usecase is a client-server system, - where the first started instance will assume the role of server, - and the later instances will act as clients of that server. - - By default, the full path of the executable file is used to - determine whether two processes are instances of the same - application. You can also provide an explicit identifier string - that will be compared instead. - - The application should create the QtSingleApplication object early - in the startup phase, and call isRunning() to find out if another - instance of this application is already running. If isRunning() - returns false, it means that no other instance is running, and - this instance has assumed the role as the running instance. In - this case, the application should continue with the initialization - of the application user interface before entering the event loop - with exec(), as normal. - - The messageReceived() signal will be emitted when the running - application receives messages from another instance of the same - application. When a message is received it might be helpful to the - user to raise the application so that it becomes visible. To - facilitate this, QtSingleApplication provides the - setActivationWindow() function and the activateWindow() slot. - - If isRunning() returns true, another instance is already - running. It may be alerted to the fact that another instance has - started by using the sendMessage() function. Also data such as - startup parameters (e.g. the name of the file the user wanted this - new instance to open) can be passed to the running instance with - this function. Then, the application should terminate (or enter - client mode). - - If isRunning() returns true, but sendMessage() fails, that is an - indication that the running instance is frozen. - - Here's an example that shows how to convert an existing - application to use QtSingleApplication. It is very simple and does - not make use of all QtSingleApplication's functionality (see the - examples for that). - - \code - // Original - int main(int argc, char **argv) - { - QApplication app(argc, argv); - - MyMainWidget mmw; - mmw.show(); - return app.exec(); - } - - // Single instance - int main(int argc, char **argv) - { - QtSingleApplication app(argc, argv); - - if (app.isRunning()) - return !app.sendMessage(someDataString); - - MyMainWidget mmw; - app.setActivationWindow(&mmw); - mmw.show(); - return app.exec(); - } - \endcode - - Once this QtSingleApplication instance is destroyed (normally when - the process exits or crashes), when the user next attempts to run the - application this instance will not, of course, be encountered. The - next instance to call isRunning() or sendMessage() will assume the - role as the new running instance. - - For console (non-GUI) applications, QtSingleCoreApplication may be - used instead of this class, to avoid the dependency on the QtGui - library. - - \sa QtSingleCoreApplication -*/ - - -void QtSingleApplication::sysInit(const QString &appId) -{ - actWin = 0; - peer = new QtLocalPeer(this, appId); - connect(peer, SIGNAL(messageReceived(const QString&)), SIGNAL(messageReceived(const QString&))); -} - - -/*! - Creates a QtSingleApplication object. The application identifier - will be QCoreApplication::applicationFilePath(). \a argc, \a - argv, and \a GUIenabled are passed on to the QAppliation constructor. - - If you are creating a console application (i.e. setting \a - GUIenabled to false), you may consider using - QtSingleCoreApplication instead. -*/ - -QtSingleApplication::QtSingleApplication(int &argc, char **argv, bool GUIenabled) - : QApplication(argc, argv, GUIenabled) -{ - sysInit(); -} - - -/*! - Creates a QtSingleApplication object with the application - identifier \a appId. \a argc and \a argv are passed on to the - QAppliation constructor. -*/ - -QtSingleApplication::QtSingleApplication(const QString &appId, int &argc, char **argv) - : QApplication(argc, argv) -{ - sysInit(appId); -} - -#if QT_VERSION < 0x050000 - -/*! - Creates a QtSingleApplication object. The application identifier - will be QCoreApplication::applicationFilePath(). \a argc, \a - argv, and \a type are passed on to the QAppliation constructor. -*/ -QtSingleApplication::QtSingleApplication(int &argc, char **argv, Type type) - : QApplication(argc, argv, type) -{ - sysInit(); -} - - -# if defined(Q_WS_X11) -/*! - Special constructor for X11, ref. the documentation of - QApplication's corresponding constructor. The application identifier - will be QCoreApplication::applicationFilePath(). \a dpy, \a visual, - and \a cmap are passed on to the QApplication constructor. -*/ -QtSingleApplication::QtSingleApplication(Display* dpy, Qt::HANDLE visual, Qt::HANDLE cmap) - : QApplication(dpy, visual, cmap) -{ - sysInit(); -} - -/*! - Special constructor for X11, ref. the documentation of - QApplication's corresponding constructor. The application identifier - will be QCoreApplication::applicationFilePath(). \a dpy, \a argc, \a - argv, \a visual, and \a cmap are passed on to the QApplication - constructor. -*/ -QtSingleApplication::QtSingleApplication(Display *dpy, int &argc, char **argv, Qt::HANDLE visual, Qt::HANDLE cmap) - : QApplication(dpy, argc, argv, visual, cmap) -{ - sysInit(); -} - -/*! - Special constructor for X11, ref. the documentation of - QApplication's corresponding constructor. The application identifier - will be \a appId. \a dpy, \a argc, \a - argv, \a visual, and \a cmap are passed on to the QApplication - constructor. -*/ -QtSingleApplication::QtSingleApplication(Display* dpy, const QString &appId, int argc, char **argv, Qt::HANDLE visual, Qt::HANDLE cmap) - : QApplication(dpy, argc, argv, visual, cmap) -{ - sysInit(appId); -} -# endif // Q_WS_X11 -#endif // QT_VERSION < 0x050000 - - -/*! - Returns true if another instance of this application is running; - otherwise false. - - This function does not find instances of this application that are - being run by a different user (on Windows: that are running in - another session). - - \sa sendMessage() -*/ - -bool QtSingleApplication::isRunning() -{ - return peer->isClient(); -} - - -/*! - Tries to send the text \a message to the currently running - instance. The QtSingleApplication object in the running instance - will emit the messageReceived() signal when it receives the - message. - - This function returns true if the message has been sent to, and - processed by, the current instance. If there is no instance - currently running, or if the running instance fails to process the - message within \a timeout milliseconds, this function return false. - - \sa isRunning(), messageReceived() -*/ -bool QtSingleApplication::sendMessage(const QString &message, int timeout) -{ - return peer->sendMessage(message, timeout); -} - - -/*! - Returns the application identifier. Two processes with the same - identifier will be regarded as instances of the same application. -*/ -QString QtSingleApplication::id() const -{ - return peer->applicationId(); -} - - -/*! - Sets the activation window of this application to \a aw. The - activation window is the widget that will be activated by - activateWindow(). This is typically the application's main window. - - If \a activateOnMessage is true (the default), the window will be - activated automatically every time a message is received, just prior - to the messageReceived() signal being emitted. - - \sa activateWindow(), messageReceived() -*/ - -void QtSingleApplication::setActivationWindow(QWidget* aw, bool activateOnMessage) -{ - actWin = aw; - if (activateOnMessage) - connect(peer, SIGNAL(messageReceived(const QString&)), this, SLOT(activateWindow())); - else - disconnect(peer, SIGNAL(messageReceived(const QString&)), this, SLOT(activateWindow())); -} - - -/*! - Returns the applications activation window if one has been set by - calling setActivationWindow(), otherwise returns 0. - - \sa setActivationWindow() -*/ -QWidget* QtSingleApplication::activationWindow() const -{ - return actWin; -} - - -/*! - De-minimizes, raises, and activates this application's activation window. - This function does nothing if no activation window has been set. - - This is a convenience function to show the user that this - application instance has been activated when he has tried to start - another instance. - - This function should typically be called in response to the - messageReceived() signal. By default, that will happen - automatically, if an activation window has been set. - - \sa setActivationWindow(), messageReceived(), initialize() -*/ -void QtSingleApplication::activateWindow() -{ - if (actWin) { - actWin->setWindowState(actWin->windowState() & ~Qt::WindowMinimized); - actWin->raise(); - actWin->activateWindow(); - } -} - - -/*! - \fn void QtSingleApplication::messageReceived(const QString& message) - - This signal is emitted when the current instance receives a \a - message from another instance of this application. - - \sa sendMessage(), setActivationWindow(), activateWindow() -*/ - - -/*! - \fn void QtSingleApplication::initialize(bool dummy = true) - - \obsolete -*/ diff -Nru chinese-calendar-0.8.2/qtsingleapplication/src/qtsingleapplication.h chinese-calendar-0.7.8/qtsingleapplication/src/qtsingleapplication.h --- chinese-calendar-0.8.2/qtsingleapplication/src/qtsingleapplication.h 2014-03-24 15:29:29.000000000 +0000 +++ chinese-calendar-0.7.8/qtsingleapplication/src/qtsingleapplication.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,105 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt Solutions component. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QTSINGLEAPPLICATION_H -#define QTSINGLEAPPLICATION_H - -#include - -class QtLocalPeer; - -#if defined(Q_OS_WIN) -# if !defined(QT_QTSINGLEAPPLICATION_EXPORT) && !defined(QT_QTSINGLEAPPLICATION_IMPORT) -# define QT_QTSINGLEAPPLICATION_EXPORT -# elif defined(QT_QTSINGLEAPPLICATION_IMPORT) -# if defined(QT_QTSINGLEAPPLICATION_EXPORT) -# undef QT_QTSINGLEAPPLICATION_EXPORT -# endif -# define QT_QTSINGLEAPPLICATION_EXPORT __declspec(dllimport) -# elif defined(QT_QTSINGLEAPPLICATION_EXPORT) -# undef QT_QTSINGLEAPPLICATION_EXPORT -# define QT_QTSINGLEAPPLICATION_EXPORT __declspec(dllexport) -# endif -#else -# define QT_QTSINGLEAPPLICATION_EXPORT -#endif - -class QT_QTSINGLEAPPLICATION_EXPORT QtSingleApplication : public QApplication -{ - Q_OBJECT - -public: - QtSingleApplication(int &argc, char **argv, bool GUIenabled = true); - QtSingleApplication(const QString &id, int &argc, char **argv); -#if QT_VERSION < 0x050000 - QtSingleApplication(int &argc, char **argv, Type type); -# if defined(Q_WS_X11) - QtSingleApplication(Display* dpy, Qt::HANDLE visual = 0, Qt::HANDLE colormap = 0); - QtSingleApplication(Display *dpy, int &argc, char **argv, Qt::HANDLE visual = 0, Qt::HANDLE cmap= 0); - QtSingleApplication(Display* dpy, const QString &appId, int argc, char **argv, Qt::HANDLE visual = 0, Qt::HANDLE colormap = 0); -# endif // Q_WS_X11 -#endif // QT_VERSION < 0x050000 - - bool isRunning(); - QString id() const; - - void setActivationWindow(QWidget* aw, bool activateOnMessage = true); - QWidget* activationWindow() const; - - // Obsolete: - void initialize(bool dummy = true) - { isRunning(); Q_UNUSED(dummy) } - -public Q_SLOTS: - bool sendMessage(const QString &message, int timeout = 5000); - void activateWindow(); - - -Q_SIGNALS: - void messageReceived(const QString &message); - - -private: - void sysInit(const QString &appId = QString()); - QtLocalPeer *peer; - QWidget *actWin; -}; - -#endif // QTSINGLEAPPLICATION_H diff -Nru chinese-calendar-0.8.2/qtsingleapplication/src/qtsingleapplication.pri chinese-calendar-0.7.8/qtsingleapplication/src/qtsingleapplication.pri --- chinese-calendar-0.8.2/qtsingleapplication/src/qtsingleapplication.pri 2014-03-24 15:29:29.000000000 +0000 +++ chinese-calendar-0.7.8/qtsingleapplication/src/qtsingleapplication.pri 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -include(../common.pri) -INCLUDEPATH += $$PWD -DEPENDPATH += $$PWD -QT *= network -greaterThan(QT_MAJOR_VERSION, 4): QT *= widgets - -qtsingleapplication-uselib:!qtsingleapplication-buildlib { - LIBS += -L$$QTSINGLEAPPLICATION_LIBDIR -l$$QTSINGLEAPPLICATION_LIBNAME -} else { - SOURCES += $$PWD/qtsingleapplication.cpp $$PWD/qtlocalpeer.cpp - HEADERS += $$PWD/qtsingleapplication.h $$PWD/qtlocalpeer.h -} - -win32 { - contains(TEMPLATE, lib):contains(CONFIG, shared):DEFINES += QT_QTSINGLEAPPLICATION_EXPORT - else:qtsingleapplication-uselib:DEFINES += QT_QTSINGLEAPPLICATION_IMPORT -} diff -Nru chinese-calendar-0.8.2/qtsingleapplication/src/qtsinglecoreapplication.cpp chinese-calendar-0.7.8/qtsingleapplication/src/qtsinglecoreapplication.cpp --- chinese-calendar-0.8.2/qtsingleapplication/src/qtsinglecoreapplication.cpp 2014-03-24 15:29:29.000000000 +0000 +++ chinese-calendar-0.7.8/qtsingleapplication/src/qtsinglecoreapplication.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,149 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt Solutions component. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#include "qtsinglecoreapplication.h" -#include "qtlocalpeer.h" - -/*! - \class QtSingleCoreApplication qtsinglecoreapplication.h - \brief A variant of the QtSingleApplication class for non-GUI applications. - - This class is a variant of QtSingleApplication suited for use in - console (non-GUI) applications. It is an extension of - QCoreApplication (instead of QApplication). It does not require - the QtGui library. - - The API and usage is identical to QtSingleApplication, except that - functions relating to the "activation window" are not present, for - obvious reasons. Please refer to the QtSingleApplication - documentation for explanation of the usage. - - A QtSingleCoreApplication instance can communicate to a - QtSingleApplication instance if they share the same application - id. Hence, this class can be used to create a light-weight - command-line tool that sends commands to a GUI application. - - \sa QtSingleApplication -*/ - -/*! - Creates a QtSingleCoreApplication object. The application identifier - will be QCoreApplication::applicationFilePath(). \a argc and \a - argv are passed on to the QCoreAppliation constructor. -*/ - -QtSingleCoreApplication::QtSingleCoreApplication(int &argc, char **argv) - : QCoreApplication(argc, argv) -{ - peer = new QtLocalPeer(this); - connect(peer, SIGNAL(messageReceived(const QString&)), SIGNAL(messageReceived(const QString&))); -} - - -/*! - Creates a QtSingleCoreApplication object with the application - identifier \a appId. \a argc and \a argv are passed on to the - QCoreAppliation constructor. -*/ -QtSingleCoreApplication::QtSingleCoreApplication(const QString &appId, int &argc, char **argv) - : QCoreApplication(argc, argv) -{ - peer = new QtLocalPeer(this, appId); - connect(peer, SIGNAL(messageReceived(const QString&)), SIGNAL(messageReceived(const QString&))); -} - - -/*! - Returns true if another instance of this application is running; - otherwise false. - - This function does not find instances of this application that are - being run by a different user (on Windows: that are running in - another session). - - \sa sendMessage() -*/ - -bool QtSingleCoreApplication::isRunning() -{ - return peer->isClient(); -} - - -/*! - Tries to send the text \a message to the currently running - instance. The QtSingleCoreApplication object in the running instance - will emit the messageReceived() signal when it receives the - message. - - This function returns true if the message has been sent to, and - processed by, the current instance. If there is no instance - currently running, or if the running instance fails to process the - message within \a timeout milliseconds, this function return false. - - \sa isRunning(), messageReceived() -*/ - -bool QtSingleCoreApplication::sendMessage(const QString &message, int timeout) -{ - return peer->sendMessage(message, timeout); -} - - -/*! - Returns the application identifier. Two processes with the same - identifier will be regarded as instances of the same application. -*/ - -QString QtSingleCoreApplication::id() const -{ - return peer->applicationId(); -} - - -/*! - \fn void QtSingleCoreApplication::messageReceived(const QString& message) - - This signal is emitted when the current instance receives a \a - message from another instance of this application. - - \sa sendMessage() -*/ diff -Nru chinese-calendar-0.8.2/qtsingleapplication/src/qtsinglecoreapplication.h chinese-calendar-0.7.8/qtsingleapplication/src/qtsinglecoreapplication.h --- chinese-calendar-0.8.2/qtsingleapplication/src/qtsinglecoreapplication.h 2014-03-24 15:29:29.000000000 +0000 +++ chinese-calendar-0.7.8/qtsingleapplication/src/qtsinglecoreapplication.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,71 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt Solutions component. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QTSINGLECOREAPPLICATION_H -#define QTSINGLECOREAPPLICATION_H - -#include - -class QtLocalPeer; - -class QtSingleCoreApplication : public QCoreApplication -{ - Q_OBJECT - -public: - QtSingleCoreApplication(int &argc, char **argv); - QtSingleCoreApplication(const QString &id, int &argc, char **argv); - - bool isRunning(); - QString id() const; - -public Q_SLOTS: - bool sendMessage(const QString &message, int timeout = 5000); - - -Q_SIGNALS: - void messageReceived(const QString &message); - - -private: - QtLocalPeer* peer; -}; - -#endif // QTSINGLECOREAPPLICATION_H diff -Nru chinese-calendar-0.8.2/qtsingleapplication/src/qtsinglecoreapplication.pri chinese-calendar-0.7.8/qtsingleapplication/src/qtsinglecoreapplication.pri --- chinese-calendar-0.8.2/qtsingleapplication/src/qtsinglecoreapplication.pri 2014-03-24 15:29:29.000000000 +0000 +++ chinese-calendar-0.7.8/qtsingleapplication/src/qtsinglecoreapplication.pri 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -INCLUDEPATH += $$PWD -DEPENDPATH += $$PWD -HEADERS += $$PWD/qtsinglecoreapplication.h $$PWD/qtlocalpeer.h -SOURCES += $$PWD/qtsinglecoreapplication.cpp $$PWD/qtlocalpeer.cpp - -QT *= network - -win32:contains(TEMPLATE, lib):contains(CONFIG, shared) { - DEFINES += QT_QTSINGLECOREAPPLICATION_EXPORT=__declspec(dllexport) -} Binary files /tmp/MZs4Dz4WlG/chinese-calendar-0.8.2/skin/black/bg.png and /tmp/oSOvufbTZG/chinese-calendar-0.7.8/skin/black/bg.png differ Binary files /tmp/MZs4Dz4WlG/chinese-calendar-0.8.2/skin/black/no-hover.png and /tmp/oSOvufbTZG/chinese-calendar-0.7.8/skin/black/no-hover.png differ Binary files /tmp/MZs4Dz4WlG/chinese-calendar-0.8.2/skin/black/ok-hover.png and /tmp/oSOvufbTZG/chinese-calendar-0.7.8/skin/black/ok-hover.png differ diff -Nru chinese-calendar-0.8.2/skin/black.qss chinese-calendar-0.7.8/skin/black.qss --- chinese-calendar-0.8.2/skin/black.qss 2014-03-24 15:29:29.000000000 +0000 +++ chinese-calendar-0.7.8/skin/black.qss 1970-01-01 00:00:00.000000000 +0000 @@ -1,189 +0,0 @@ -/* - * This file is part of the chinese-calendar project - * Copyright (C) 2013 Mutse & Ubuntu Kylin Members - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 3 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - * This project is developed by "Ubuntu Kylin Members" team, - * see - * Author: Mutse - */ - -ChineseCalendar{ - background: url(/usr/share/chinese-calendar/skin/black/chinesecalendar.png); -} - -ChineseCalendar QPushButton#TbnextMonth{ - background-color:transparent; - image: url(/usr/share/chinese-calendar/skin/black/arrow-right.png); - color:rgb(200,200,150); -} - -ChineseCalendar QPushButton#TbnextMonth:hover{ - color:rgb(255,255,255); -} - -ChineseCalendar QPushButton#TbnextYear{ - background-color:transparent; - image: url(/usr/share/chinese-calendar/skin/black/arrow-right.png); - color:rgb(200,200,150); -} - -ChineseCalendar QPushButton#TbnextYear:hover{ - color:rgb(255,255,255); -} - -ChineseCalendar QPushButton#TbpreviousMonth{ - background-color:transparent; - image: url(/usr/share/chinese-calendar/skin/black/arrow-left.png); - color:rgb(200,200,150); -} - -ChineseCalendar QPushButton#TbpreviousMonth:hover{ - color:rgb(255,255,255); -} - -ChineseCalendar QPushButton#TbpreviousYear{ - background-color:transparent; - image: url(/usr/share/chinese-calendar/skin/black/arrow-left.png); - color:rgb(200,200,150); -} - -ChineseCalendar QPushButton#TbpreviousYear:hover{ - color:rgb(255,255,255); -} - -ChineseCalendar QPushButton#backtotoday{ - background-color:transparent; - color:rgb(200,200,150); -} - -ChineseCalendar QPushButton#backtotoday:hover{ - color:rgb(255,255,255); -} - -ChineseCalendar QComboBox#YearSelect{ - border: 2px solid lightgray; - border-radius: 5px; - font:12pt; -} - -ChineseCalendar QComboBox#monthCombo{ - border: 2px solid lightgray; - border-radius: 5px; - font:12pt; -} - -ChineseCalendar QComboBox::down-arrow { - image: url(/usr/share/chinese-calendar/skin/black/arrow-down.png); - background-color: transparent; -} - -ChineseCalendar QLabel#label{ - font:12pt; -} - -ChineseCalendar QLabel#label_2{ - font:12pt; -} - -ChineseCalendar QLabel#label_3, QLabel#label_9{ - color: rgb(112, 121, 138); -} - -ChineseCalendar QLabel#label_4, - QLabel#label_5, - QLabel#label_6, - QLabel#label_7, - QLabel#label_8{ - color: rgb(248,128,35); -} - -ChineseCalendar QLabel#label_10{ - color: rgb(248,128,35); -} - -ChineseCalendar QLabel#label_11{ - color: rgb(238,124,35); -} - -ChineseCalendar QLabel#label_12, - QLabel#label_13, QLabel#label_14, - QLabel#label_15, QLabel#label_17{ - color: rgb(112, 121, 138); -} - -ChineseCalendar QLabel#label_16{ - color: black; -} - -Cnote{ - background: url(/usr/share/chinese-calendar/skin/black/note.png); -} - -Cnote QPushButton#ok{ - image: url(/usr/share/chinese-calendar/skin/black/ok.png); - background-color:transparent; -} - -Cnote QPushButton#ok:hover{ - image: url(/usr/share/chinese-calendar/skin/black/ok-hover.png); -} - -Cnote QPushButton#cancel{ - image: url(/usr/share/chinese-calendar/skin/black/no.png); - background-color:transparent; - - border:0 solid; -} - -Cnote QPushButton#cancel:hover{ - image: url(/usr/share/chinese-calendar/skin/black/no-hover.png); -} - -Cnote QLabel#datelabel{ - background-color: transparent; - color: rgb(133,143,162); - border:0 solid; -} - -Cnote QPushButton#clearplan{ - background-color: transparent; - color: rgb(133,143,162); -} - -Cnote QTextEdit#textedit{ - background-color: transparent; - color: rgb(133,143,162); - border:0 solid; -} - -DateItem:focus{ - background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(238, 93, 0, 255), stop:1 rgba(255, 121, 2, 200)); -} - -DateItem QWidget:hover{ - background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(238, 93, 0, 155), stop:1 rgba(255, 121, 2, 100)); -} - -DateItem QLabel#label{ - color:rgb(112,121,138); -} - -DateItem QLabel#labe:pressed{ - color:rgb(255, 255, 0); -} - -DateItem QLabel#label_2{ - color:rgb(112, 121, 138); -} diff -Nru chinese-calendar-0.8.2/skin/black-skin.qss chinese-calendar-0.7.8/skin/black-skin.qss --- chinese-calendar-0.8.2/skin/black-skin.qss 1970-01-01 00:00:00.000000000 +0000 +++ chinese-calendar-0.7.8/skin/black-skin.qss 2014-10-06 08:24:24.000000000 +0000 @@ -0,0 +1,189 @@ +/* + * This file is part of the chinese-calendar project + * Copyright (C) 2013 Mutse & UbuntuKylin Members + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 3 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * This project is developed by "UbuntuKylin Members" team, + * see + * Author: Mutse + */ + +ChineseCalendar{ + background: url(/usr/share/chinese-calendar/skin/black/chinesecalendar.png); +} + +ChineseCalendar QPushButton#TbnextMonth{ + background-color:transparent; + image: url(/usr/share/chinese-calendar/skin/black/arrow-right.png); + color:rgb(200,200,150); +} + +ChineseCalendar QPushButton#TbnextMonth:hover{ + color:rgb(255,255,255); +} + +ChineseCalendar QPushButton#TbnextYear{ + background-color:transparent; + image: url(/usr/share/chinese-calendar/skin/black/arrow-right.png); + color:rgb(200,200,150); +} + +ChineseCalendar QPushButton#TbnextYear:hover{ + color:rgb(255,255,255); +} + +ChineseCalendar QPushButton#TbpreviousMonth{ + background-color:transparent; + image: url(/usr/share/chinese-calendar/skin/black/arrow-left.png); + color:rgb(200,200,150); +} + +ChineseCalendar QPushButton#TbpreviousMonth:hover{ + color:rgb(255,255,255); +} + +ChineseCalendar QPushButton#TbpreviousYear{ + background-color:transparent; + image: url(/usr/share/chinese-calendar/skin/black/arrow-left.png); + color:rgb(200,200,150); +} + +ChineseCalendar QPushButton#TbpreviousYear:hover{ + color:rgb(255,255,255); +} + +ChineseCalendar QPushButton#backtotoday{ + background-color:transparent; + color:rgb(200,200,150); +} + +ChineseCalendar QPushButton#backtotoday:hover{ + color:rgb(255,255,255); +} + +ChineseCalendar QComboBox#YearSelect{ + border: 2px solid lightgray; + border-radius: 5px; + font:12pt; +} + +ChineseCalendar QComboBox#monthCombo{ + border: 2px solid lightgray; + border-radius: 5px; + font:12pt; +} + +ChineseCalendar QComboBox::down-arrow { + image: url(/usr/share/chinese-calendar/skin/black/arrow-down.png); + background-color: transparent; +} + +ChineseCalendar QLabel#label{ + font:12pt; +} + +ChineseCalendar QLabel#label_2{ + font:12pt; +} + +ChineseCalendar QLabel#label_3, QLabel#label_9{ + color: rgb(112, 121, 138); +} + +ChineseCalendar QLabel#label_4, + QLabel#label_5, + QLabel#label_6, + QLabel#label_7, + QLabel#label_8{ + color: rgb(248,128,35); +} + +ChineseCalendar QLabel#label_10{ + color: rgb(248,128,35); +} + +ChineseCalendar QLabel#label_11{ + color: rgb(238,124,35); +} + +ChineseCalendar QLabel#label_12, + QLabel#label_13, QLabel#label_14, + QLabel#label_15, QLabel#label_17{ + color: rgb(112, 121, 138); +} + +ChineseCalendar QLabel#label_16{ + color: black; +} + +Cnote{ + background: url(/usr/share/chinese-calendar/skin/black/note.png); +} + +Cnote QPushButton#ok{ + image: url(/usr/share/chinese-calendar/skin/black/ok.png); + background-color:transparent; +} + +Cnote QPushButton#ok:hover{ + image: url(/usr/share/chinese-calendar/skin/black/ok-hover.png); +} + +Cnote QPushButton#cancel{ + image: url(/usr/share/chinese-calendar/skin/black/no.png); + background-color:transparent; + + border:0 solid; +} + +Cnote QPushButton#cancel:hover{ + image: url(/usr/share/chinese-calendar/skin/black/no-hover.png); +} + +Cnote QLabel#datelabel{ + background-color: transparent; + color: rgb(133,143,162); + border:0 solid; +} + +Cnote QPushButton#clearplan{ + background-color: transparent; + color: rgb(133,143,162); +} + +Cnote QTextEdit#textedit{ + background-color: transparent; + color: rgb(133,143,162); + border:0 solid; +} + +DateItem:focus{ + background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(238, 93, 0, 255), stop:1 rgba(255, 121, 2, 200)); +} + +DateItem QWidget:hover{ + background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(238, 93, 0, 155), stop:1 rgba(255, 121, 2, 100)); +} + +DateItem QLabel#label{ + color:rgb(112,121,138); +} + +DateItem QLabel#labe:pressed{ + color:rgb(255, 255, 0); +} + +DateItem QLabel#label_2{ + color:rgb(112, 121, 138); +} Binary files /tmp/MZs4Dz4WlG/chinese-calendar-0.8.2/skin/blue/chinesecalendarBGblue.png and /tmp/oSOvufbTZG/chinese-calendar-0.7.8/skin/blue/chinesecalendarBGblue.png differ Binary files /tmp/MZs4Dz4WlG/chinese-calendar-0.8.2/skin/blue/no.png and /tmp/oSOvufbTZG/chinese-calendar-0.7.8/skin/blue/no.png differ Binary files /tmp/MZs4Dz4WlG/chinese-calendar-0.8.2/skin/blue/note.png and /tmp/oSOvufbTZG/chinese-calendar-0.7.8/skin/blue/note.png differ Binary files /tmp/MZs4Dz4WlG/chinese-calendar-0.8.2/skin/blue/ok.png and /tmp/oSOvufbTZG/chinese-calendar-0.7.8/skin/blue/ok.png differ diff -Nru chinese-calendar-0.8.2/skin/blue-skin.qss chinese-calendar-0.7.8/skin/blue-skin.qss --- chinese-calendar-0.8.2/skin/blue-skin.qss 2014-03-24 15:29:29.000000000 +0000 +++ chinese-calendar-0.7.8/skin/blue-skin.qss 1970-01-01 00:00:00.000000000 +0000 @@ -1,120 +0,0 @@ -/* - * This file is part of the chinese-calendar project - * Copyright (C) 2013 Mutse & Ubuntu Kylin Members - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 3 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - * This project is developed by "Ubuntu Kylin Members" team, - * see - * Author: Mutse - */ - -ChineseCalendar{ - background: url(/usr/share/chinese-calendar/skin/blue/chinesecalendarBGblue.png); -} - -ChineseCalendar QPushButton#TbnextMonth{ - background-color:transparent; - color:rgb(200,200,150); -} - -ChineseCalendar QPushButton#TbnextMonth:hover{ - color:rgb(255,255,255); -} - -ChineseCalendar QPushButton#TbnextYear{ - background-color:transparent; - color:rgb(200,200,150); -} - -ChineseCalendar QPushButton#TbnextYear:hover{ - color:rgb(255,255,255); -} - -ChineseCalendar QPushButton#TbpreviousMonth{ - background-color:transparent; - color:rgb(200,200,150); -} - -ChineseCalendar QPushButton#TbpreviousMonth:hover{ - color:rgb(255,255,255); -} - -ChineseCalendar QPushButton#TbpreviousYear{ - background-color:transparent; - color:rgb(200,200,150); -} - -ChineseCalendar QPushButton#TbpreviousYear:hover{ - color:rgb(255,255,255); -} - -ChineseCalendar QPushButton#backtotoday{ - background-color:transparent; - color:rgb(200,200,150); -} - -ChineseCalendar QPushButton#backtotoday:hover{ - color:rgb(255,255,255); -} - -ChineseCalendar QComboBox#YearSelect{ - border: 2px solid lightgray; - border-radius: 5px; - font:12pt; -} - -ChineseCalendar QComboBox#monthCombo{ - border: 2px solid lightgray; - border-radius: 5px; - font:12pt; -} - -ChineseCalendar QLabel#label{ - font:12pt; -} - -ChineseCalendar QLabel#label_2{ - font:12pt; -} - -Cnote{ - background: url(/usr/share/chinese-calendar/skin/default/note.png); -} - -Cnote QPushButton#ok{ - image: url(/usr/share/chinese-calendar/skin/default/ok.png); - background-color:transparent; -} - -Cnote QPushButton#cancel{ - image: url(/usr/share/chinese-calendar/skin/default/no.png); - background-color:transparent; - border:0 solid; -} - -Cnote QLabel#datelabel{ - background-color:transparent; - border:0 solid; -} - -Cnote QPushButton#clearplan{ - background-color:transparent; -} - -Cnote QTextEdit#textedit{ - background-color:transparent; - border:0 solid; -} - - diff -Nru chinese-calendar-0.8.2/skin/default-skin.qss chinese-calendar-0.7.8/skin/default-skin.qss --- chinese-calendar-0.8.2/skin/default-skin.qss 2014-03-24 15:29:29.000000000 +0000 +++ chinese-calendar-0.7.8/skin/default-skin.qss 2014-10-06 08:24:24.000000000 +0000 @@ -1,6 +1,6 @@ /* * This file is part of the chinese-calendar project - * Copyright (C) 2013 Mutse & Ubuntu Kylin Members + * Copyright (C) 2013 Mutse & UbuntuKylin Members * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 3 as @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * This project is developed by "Ubuntu Kylin Members" team, + * This project is developed by "UbuntuKylin Members" team, * see * Author: Mutse */ @@ -117,4 +117,22 @@ border:0 solid; } +DateItem:focus{ + background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(238, 93, 0, 255), stop:1 rgba(255, 121, 2, 200)); +} + +DateItem QWidget:hover{ + background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(238, 93, 0, 155), stop:1 rgba(255, 121, 2, 100)); +} + +DateItem QLabel#label{ + color:rgb(0,0,255); +} + +DateItem QLabel#labe:pressed{ + color:rgb(255,0,0); +} +DateItem QLabel#label_2{ + color:rgb(0,0,0); +} diff -Nru chinese-calendar-0.8.2/skin/README.md chinese-calendar-0.7.8/skin/README.md --- chinese-calendar-0.8.2/skin/README.md 2013-09-17 15:53:43.000000000 +0000 +++ chinese-calendar-0.7.8/skin/README.md 2014-10-06 08:24:24.000000000 +0000 @@ -1,40 +1,27 @@ 皮肤说明文档 ============ -### 版本 - -文档版本：V0.1 - -### 目录结构 - 目录结构如下： skin/ | |-black/ - |-black.qss + |-black-skin.qss | |-blue/ - |-blue-skin.qss + |-blue.qss | |-default/ |-default-skin.qss -其中，blue-skin.qss default-skin.qss为系统皮肤文件，black.qss为用户自己定义皮肤文件。 +其中，black-skin.qss default-skin.qss为系统皮肤文件，blue.qss为用户自己定义皮肤文件。 -### 自定义皮肤 +### 用户自定义皮肤 -若用户想制作自己的个性皮肤，可参考black.qss。运行程序前，将自制皮肤文件复制到 ~/.local/share/chinese-calendar/skin 目录（若无此目录，请使用 mkdir -p ~/.local/share/chinese-calendar/skin 来新建）下即可换肤。 - -操作如下： - -$ mkdir -p ~/.local/share/chinese-calendar/skin -$ cd ~/.local/share/chinese-calendar/skin -$ cp -r /usr/share/chinese-calendar/skin/black . -$ cp /usr/share/chinese-calendar/skin/black.qss . -$ sed -i "s:%HOME%:`echo $HOME`:" black.qss +若用户想制作自己的个性皮肤，可参考blue.qss。运行程序前，将自制皮肤文件复制到 ~/.local/share/chinese-calendar/skins 目录（若无此目录，请使用 mkdir -p ~/.local/share/chinese-calendar/skins 来新建）下即可换肤。 ### 问题与反馈 -mutse(默之) +mutse(墨汁) + Binary files /tmp/MZs4Dz4WlG/chinese-calendar-0.8.2/translate/i18_zh_CN.qm and /tmp/oSOvufbTZG/chinese-calendar-0.7.8/translate/i18_zh_CN.qm differ diff -Nru chinese-calendar-0.8.2/translate/i18_zh_CN.ts chinese-calendar-0.7.8/translate/i18_zh_CN.ts --- chinese-calendar-0.8.2/translate/i18_zh_CN.ts 2014-03-24 15:29:29.000000000 +0000 +++ chinese-calendar-0.7.8/translate/i18_zh_CN.ts 2014-10-06 08:24:24.000000000 +0000 @@ -2,88 +2,6 @@ - AboutDialog - - 关于软件 - - - - Chinese Calendar 是 Ubuntu Kylin 团队开发的一款中国农历软件。为中国用户提供方便的传统节日和节气查询，并提供便签等实用功能。 - - - - Chinese Calendar - - - - V0.8.1 - - - - <a href=https://launchpad.net/chinese-calendar>项目主页</a> - - - - 贡献者 - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;"> -作者： - Abel Liu <<a href="guiltyritter@gmail.com">guiltyritter@gmail.com</a>> - Shine Huang <<a href="hostc@163.com">hostc@163.com</a>> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Courier New,courier'; font-size:11pt; color:#008000;"> -贡献者： - Zhengpeng Hou <<a href="zhengpeng-hou@ubuntu.com">zhengpeng-hou@ubuntu.com</a>> - Mutse <<a href="yyhoo2.young@gmail.com">yyhoo2.young@gmail.com</a>> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Courier New,courier'; font-size:11pt; color:#000000;"> -美工： - Shine Huang <<a href="hostc@163.com">hostc@163.com</a>> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Courier New,courier'; font-size:11pt; color:#000000;"> </body></html> - - - - 版权 - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;"> -Copyright(C) 2013 Ubuntu Kylin Team - -License: GPL-3 - -This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License. - -This package is distributed in the hope that it will be useful,but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/> - -On Debian systems, the complete text of the GNU General Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".</body></html> - - - - 关闭 - - - - - CCBO - - unknown - 未知 - - - no data - 无数据 - - - Calendar Calendar @@ -95,7 +13,7 @@ previousYear - 前年 + 前年 Previous Month @@ -103,11 +21,11 @@ previousMonth - 前一月 + 前一月 yyyy - yyyy + yyyy Next Month @@ -115,7 +33,7 @@ nextMonth - 后一月 + 后一月 Next Year @@ -123,781 +41,7 @@ nextYear - 后年 - - - 星期日 - - - - 星期一 - - - - 星期二 - - - - 星期三 - - - - 星期四 - - - - 星期五 - - - - 星期六 - - - - < - - - - 年 - - - - > - - - - 1 - - - - 2 - - - - 3 - - - - 4 - - - - 5 - - - - 6 - - - - 7 - - - - 8 - - - - 9 - - - - 10 - - - - 11 - - - - 12 - - - - 月 - - - - 今日 - - - - 宜 - - - - 忌 - - - - 1900 - - - - 1901 - - - - 1902 - - - - 1903 - - - - 1904 - - - - 1905 - - - - 1906 - - - - 1907 - - - - 1908 - - - - 1909 - - - - 1910 - - - - 1911 - - - - 1912 - - - - 1913 - - - - 1914 - - - - 1915 - - - - 1916 - - - - 1917 - - - - 1918 - - - - 1919 - - - - 1920 - - - - 1921 - - - - 1922 - - - - 1923 - - - - 1924 - - - - 1925 - - - - 1926 - - - - 1927 - - - - 1928 - - - - 1929 - - - - 1930 - - - - 1931 - - - - 1932 - - - - 1933 - - - - 1934 - - - - 1935 - - - - 1936 - - - - 1937 - - - - 1938 - - - - 1939 - - - - 1940 - - - - 1941 - - - - 1942 - - - - 1943 - - - - 1944 - - - - 1945 - - - - 1946 - - - - 1947 - - - - 1948 - - - - 1949 - - - - 1950 - - - - 1951 - - - - 1952 - - - - 1953 - - - - 1954 - - - - 1955 - - - - 1956 - - - - 1957 - - - - 1958 - - - - 1959 - - - - 1960 - - - - 1961 - - - - 1962 - - - - 1963 - - - - 1964 - - - - 1965 - - - - 1966 - - - - 1967 - - - - 1968 - - - - 1969 - - - - 1970 - - - - 1971 - - - - 1972 - - - - 1973 - - - - 1974 - - - - 1975 - - - - 1976 - - - - 1977 - - - - 1978 - - - - 1979 - - - - 1980 - - - - 1981 - - - - 1982 - - - - 1983 - - - - 1984 - - - - 1985 - - - - 1986 - - - - 1987 - - - - 1988 - - - - 1989 - - - - 1990 - - - - 1991 - - - - 1992 - - - - 1993 - - - - 1994 - - - - 1995 - - - - 1996 - - - - 1997 - - - - 1998 - - - - 1999 - - - - 2000 - - - - 2001 - - - - 2002 - - - - 2003 - - - - 2004 - - - - 2005 - - - - 2006 - - - - 2007 - - - - 2008 - - - - 2009 - - - - 2010 - - - - 2011 - - - - 2012 - - - - 2013 - - - - 2014 - - - - 2015 - - - - 2016 - - - - 2017 - - - - 2018 - - - - 2019 - - - - 2020 - - - - 2021 - - - - 2022 - - - - 2023 - - - - 2024 - - - - 2025 - - - - 2026 - - - - 2027 - - - - 2028 - - - - 2029 - - - - 2030 - - - - 2031 - - - - 2032 - - - - 2033 - - - - 2034 - - - - 2035 - - - - 2036 - - - - 2037 - - - - 2038 - - - - 2039 - - - - 2040 - - - - 2041 - - - - 2042 - - - - 2043 - - - - 2044 - - - - 2045 - - - - 2046 - - - - 2047 - - - - 2048 - - - - 2049 - - - - 2050 - - - - - ChineseCalendar - - éè/æ¾ç¤º - - - - AutoStart - 开机自启动 - - - æ»å¨æå - - - - æ»å¨æå - - - - æ®éæ¨¡å¼ - - - - Default - - - - Blue - - - - æ¢è¤ - - - - Stay Mode - 显示模式 - - - å³äºæ¬è½¯ä»¶ - - - - E&xit - 退出 - - - Ctrl+Q - - - - - DateItem - - Form - - - - 17 - - - - 端午节 - + 后年 @@ -908,11 +52,11 @@ unknown - 未知 + 未知 no data - 无数据 + 无数据 first @@ -963,31 +107,31 @@ Mycalendar NongLi year - 农历年: + 农历年: year( - 年( + 年( NongLi Day: - 农历日: + 农历日: today constellation: - 当日星座： + 当日星座： forthcoming sterm: - 即将到来的节气: + 即将到来的节气: holiday: - 公历节日: + 公历节日: choliday: - 农历节日: + 农历节日: softwarename