diff --git a/debian/changelog b/debian/changelog index 642baff..baea031 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,22 @@ +ukui-clock (3.1.4.0.0k0-0k0.1) v101; urgency=medium + + [ BUG 号 ] + * Closes: # + - 128359 【wayland】【闹钟】闹钟时间到，弹出的闹铃弹窗不在页面右上方 + - 129998 【闹钟】闹钟title栏重复 + 130486 【wayland】【闹钟】【窗管】闹钟多一个标题栏 + + [ 任务号] + - + [ 需求号] + - + [ 其他改动说明 ] + - 统一copyright + [ 影响域 ] + * 应用本身 + + -- daiboqi Wed, 03 Aug 2022 16:12:41 +0800 + ukui-clock (3.1.4.0.0k0-0k0) v101; urgency=medium * 修改为quilt格式 diff --git a/debian/control b/debian/control index a669d63..bf13a60 100644 --- a/debian/control +++ b/debian/control @@ -24,6 +24,7 @@ Build-Depends: debhelper (>=11~), qtbase5-dev, qtmultimedia5-dev, qtscript5-dev, + libkysdk-waylandhelper-dev, qttools5-dev-tools Standards-Version: 4.1.4 Homepage: https://github.com/ukui/ukui-clock diff --git a/debian/patches/0002-copyright.patch b/debian/patches/0002-copyright.patch new file mode 100644 index 0000000..a4d8b95 --- /dev/null +++ b/debian/patches/0002-copyright.patch @@ -0,0 +1,6510 @@ +From: daiboqi +Date: Wed, 3 Aug 2022 16:17:16 +0800 +Subject: =?utf-8?b?5Y+M5qCH6aKY5qCP77yMY29weXJpZ2h057uf5LiA?= + +--- + CJsonObject.cpp | 52 +++++++++++++------ + ClockInterface.h | 53 ++++++++++++++------ + CustomButton.cpp | 38 ++++++++++++++ + CustomButton.h | 53 ++++++++++++++------ + about.cpp | 58 +++++++++++++++------- + about.h | 53 ++++++++++++++------ + adaptscreeninfo.cpp | 41 +++++++++++---- + adaptscreeninfo.h | 41 +++++++++++---- + baseverticalscroll.cpp | 53 ++++++++++++++------ + baseverticalscroll.h | 53 ++++++++++++++------ + btnNew.cpp | 53 ++++++++++++++------ + btnNew.h | 53 ++++++++++++++------ + cJSON.h | 52 +++++++++++++------ + clickableLabel.cpp | 53 ++++++++++++++------ + clickableLabel.h | 52 +++++++++++++------ + clock.cpp | 110 ++++++++++++++++++++++++++++------------- + clock.h | 53 ++++++++++++++------ + clock_conf.ini | 2 +- + clockdbusadaptor.cpp | 53 ++++++++++++++------ + clockdbusadaptor.h | 53 ++++++++++++++------ + clockentitydao.cpp | 53 ++++++++++++++------ + clockentitydao.h | 53 ++++++++++++++------ + closeOrHide.cpp | 61 ++++++++++++++++------- + closeOrHide.h | 53 ++++++++++++++------ + commontooltip.cpp | 53 ++++++++++++++------ + commontooltip.h | 53 ++++++++++++++------ + configutil.cpp | 53 ++++++++++++++------ + configutil.h | 53 ++++++++++++++------ + connection.h | 53 ++++++++++++++------ + constant_class.h | 53 ++++++++++++++------ + coreplayer/mmediaplayer.cpp | 53 ++++++++++++++------ + coreplayer/mmediaplayer.h | 53 ++++++++++++++------ + coreplayer/mmediaplaylist.cpp | 53 ++++++++++++++------ + coreplayer/mmediaplaylist.h | 53 ++++++++++++++------ + coreplayer/playcontroller.cpp | 53 ++++++++++++++------ + coreplayer/playcontroller.h | 53 ++++++++++++++------ + countdownAnimation.cpp | 53 ++++++++++++++------ + countdownAnimation.h | 53 ++++++++++++++------ + dbusdeleteclockbyidadaptor.cpp | 53 ++++++++++++++------ + dbusdeleteclockbyidadaptor.h | 53 ++++++++++++++------ + dbusselectclockbyidadaptor.cpp | 53 ++++++++++++++------ + dbusselectclockbyidadaptor.h | 53 ++++++++++++++------ + dbusupdateclockadaptor.cpp | 53 ++++++++++++++------ + dbusupdateclockadaptor.h | 53 ++++++++++++++------ + debug.h | 53 ++++++++++++++------ + deleteMsg.cpp | 58 +++++++++++++++------- + deleteMsg.h | 53 ++++++++++++++------ + dotlineDemo.cpp | 53 ++++++++++++++------ + dotlineDemo.h | 53 ++++++++++++++------ + fieldvalidutil.cpp | 53 ++++++++++++++------ + fieldvalidutil.h | 53 ++++++++++++++------ + gsettingsubject.cpp | 53 ++++++++++++++------ + gsettingsubject.h | 53 ++++++++++++++------ + integer.cpp | 53 ++++++++++++++------ + integer.h | 53 ++++++++++++++------ + itemNew.cpp | 53 ++++++++++++++------ + itemNew.h | 53 ++++++++++++++------ + kylinqfiledialog.cpp | 53 ++++++++++++++------ + kylinqfiledialog.h | 53 ++++++++++++++------ + main.cpp | 62 ++++++++++++++++------- + mediaplayerpool.cpp | 53 ++++++++++++++------ + mediaplayerpool.h | 53 ++++++++++++++------ + mediaplayerthread.cpp | 53 ++++++++++++++------ + mediaplayerthread.h | 53 ++++++++++++++------ + noticeAlarm.cpp | 58 +++++++++++++++------- + noticeAlarm.h | 53 ++++++++++++++------ + object_pool.h | 53 ++++++++++++++------ + primarymanager.cpp | 38 ++++++++++++++ + primarymanager.h | 53 ++++++++++++++------ + qroundProgressBar.cpp | 45 ++++++++++++----- + qroundProgressBar.h | 44 ++++++++++++----- + roundbtn.cpp | 53 ++++++++++++++------ + roundbtn.h | 53 ++++++++++++++------ + selectbtn.cpp | 53 ++++++++++++++------ + selectbtn.h | 53 ++++++++++++++------ + selectbtnutil.cpp | 53 ++++++++++++++------ + selectbtnutil.h | 53 ++++++++++++++------ + setAlarmRepeatDialog.cpp | 53 ++++++++++++++------ + setAlarmRepeatDialog.h | 53 ++++++++++++++------ + setupPage.cpp | 53 ++++++++++++++------ + singleApplication.cpp | 53 ++++++++++++++------ + singleApplication.h | 53 ++++++++++++++------ + stopwatchItem.cpp | 53 ++++++++++++++------ + stopwatchItem.h | 53 ++++++++++++++------ + theme.cpp | 53 ++++++++++++++------ + theme.h | 53 ++++++++++++++------ + tinycountdown.cpp | 62 ++++++++++++++++------- + tinycountdown.h | 53 ++++++++++++++------ + ukui-clock.pro | 1 + + ukui-clock.pro.user | 18 +++---- + utils.cpp | 77 +++++++++++++++++++++++------ + utils.h | 54 ++++++++++++++------ + verticalScroll24.cpp | 53 ++++++++++++++------ + verticalScroll24.h | 53 ++++++++++++++------ + verticalScroll60.cpp | 53 ++++++++++++++------ + verticalScroll60.h | 53 ++++++++++++++------ + verticalScroll99.cpp | 54 +++++++++++++------- + verticalScroll99.h | 53 ++++++++++++++------ + xatom-helper.cpp | 46 +++++++++++------ + xatom-helper.h | 46 +++++++++++------ + 100 files changed, 3663 insertions(+), 1535 deletions(-) + +diff --git a/CJsonObject.cpp b/CJsonObject.cpp +index 40ce708..e15643d 100644 +--- a/CJsonObject.cpp ++++ b/CJsonObject.cpp +@@ -1,20 +1,40 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ + + #include "CJsonObject.hpp" + +diff --git a/ClockInterface.h b/ClockInterface.h +index d4e4f93..a80daa7 100644 +--- a/ClockInterface.h ++++ b/ClockInterface.h +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #ifndef CLOCKINTERFACE_H + #define CLOCKINTERFACE_H + #include +diff --git a/CustomButton.cpp b/CustomButton.cpp +index 2f06bdf..c90b0e0 100644 +--- a/CustomButton.cpp ++++ b/CustomButton.cpp +@@ -1,3 +1,41 @@ ++/* ++ ++ ++ * Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. ++ ++ ++ * Copyright 2022 KylinSoft Co., Ltd. ++ ++ ++ ++ * ++ ++ * 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 . ++ ++ ++ ++ */ ++ + #include "CustomButton.h" + #include + #include "theme.h" +diff --git a/CustomButton.h b/CustomButton.h +index 99cc087..63a462f 100644 +--- a/CustomButton.h ++++ b/CustomButton.h +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #ifndef CUSTOMBUTTON_H + #define CUSTOMBUTTON_H + +diff --git a/about.cpp b/about.cpp +index b3c13fb..f8ce412 100644 +--- a/about.cpp ++++ b/about.cpp +@@ -1,25 +1,48 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #include "about.h" + #include "ui_about.h" + #include + #include "xatom-helper.h" + #include "configutil.h" ++#include "ukuistylehelper/ukuistylehelper.h" ++#include "windowmanager/windowmanager.h" + + extern void qt_blurImage(QImage &blurImage, qreal radius, bool quality, int transposed); + +@@ -30,7 +53,8 @@ About::About(QWidget *parent) : + ui->setupUi(this); + + // 添加窗管协议 +- XAtomHelper::setStandardWindowHint(this->winId()); ++// XAtomHelper::setStandardWindowHint(this->winId()); ++ kdk::UkuiStyleHelper::self()->removeHeader(this); + + setWindowTitle(tr("About")); + //当小部件接受了关闭事件时，使Qt删除此小部件（请参阅QWidget :: closeEvent（））。 +diff --git a/about.h b/about.h +index 41de607..9406729 100644 +--- a/about.h ++++ b/about.h +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #ifndef ABOUT_H + #define ABOUT_H + +diff --git a/adaptscreeninfo.cpp b/adaptscreeninfo.cpp +index 5969fc9..743ad61 100644 +--- a/adaptscreeninfo.cpp ++++ b/adaptscreeninfo.cpp +@@ -1,18 +1,39 @@ + /* ++ ++ + * Copyright (C) 2020, KylinSoft Co., Ltd. ++ ++ ++ * Copyright 2022 KylinSoft Co., Ltd. ++ ++ ++ + * +- * 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 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. ++ ++ * 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 . ++ ++ * You should have received a copy of the GNU General Public License along with ++ ++ * this program. If not, see . ++ ++ ++ + */ + + #include "adaptscreeninfo.h" +diff --git a/adaptscreeninfo.h b/adaptscreeninfo.h +index a74ecc6..1fcd7a8 100644 +--- a/adaptscreeninfo.h ++++ b/adaptscreeninfo.h +@@ -1,18 +1,39 @@ + /* ++ ++ + * Copyright (C) 2020, KylinSoft Co., Ltd. ++ ++ ++ * Copyright 2022 KylinSoft Co., Ltd. ++ ++ ++ + * +- * 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 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. ++ ++ * 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 . ++ ++ * You should have received a copy of the GNU General Public License along with ++ ++ * this program. If not, see . ++ ++ ++ + */ + + #ifndef ADAPTSCREENINFO_H +diff --git a/baseverticalscroll.cpp b/baseverticalscroll.cpp +index 25f9973..b04f974 100644 +--- a/baseverticalscroll.cpp ++++ b/baseverticalscroll.cpp +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #include "baseverticalscroll.h" + #include + #include +diff --git a/baseverticalscroll.h b/baseverticalscroll.h +index 259346f..44afbab 100644 +--- a/baseverticalscroll.h ++++ b/baseverticalscroll.h +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #ifndef BASEVERTICALSCROLL_H + #define BASEVERTICALSCROLL_H + +diff --git a/btnNew.cpp b/btnNew.cpp +index 110da43..ed3be18 100644 +--- a/btnNew.cpp ++++ b/btnNew.cpp +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #include "btnNew.h" + #include + #include +diff --git a/btnNew.h b/btnNew.h +index 220f668..6f846a2 100644 +--- a/btnNew.h ++++ b/btnNew.h +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #ifndef BTN_NEW_H + #define BTN_NEW_H + +diff --git a/cJSON.h b/cJSON.h +index beb922c..59968cf 100644 +--- a/cJSON.h ++++ b/cJSON.h +@@ -1,20 +1,40 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ + + #ifndef cJSON__h + #define cJSON__h +diff --git a/clickableLabel.cpp b/clickableLabel.cpp +index d669403..b66db2e 100644 +--- a/clickableLabel.cpp ++++ b/clickableLabel.cpp +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2019 Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #include "clickableLabel.h" + #include + +diff --git a/clickableLabel.h b/clickableLabel.h +index 8d416a4..abde499 100644 +--- a/clickableLabel.h ++++ b/clickableLabel.h +@@ -1,21 +1,41 @@ + /* + +-* Copyright (C) 2019 Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + //避免重复加载，循环引用 + #ifndef CLICKABLELABEL_H + #define CLICKABLELABEL_H +diff --git a/clock.cpp b/clock.cpp +index c1342d0..306242b 100644 +--- a/clock.cpp ++++ b/clock.cpp +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2019 Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #include "clock.h" + #include "ui_clock.h" + #include +@@ -23,6 +44,8 @@ + #include "mediaplayerpool.h" + #include + #include "coreplayer/playcontroller.h" ++#include "ukuistylehelper/ukuistylehelper.h" ++#include "windowmanager/windowmanager.h" + + using std::string; + using clockInterface::ReturnMsg; +@@ -113,8 +136,8 @@ Clock::Clock(QWidget *parent) : + primaryManager = new PrimaryManager(); + //闹钟居中 + //move((m_pSreenInfo->m_screenWidth - this->width() + m_pSreenInfo->m_nScreen_x )/2, (m_pSreenInfo->m_screenHeight - this->height())/2); +- utils = new Utils(); +- utils->centerToScreen(this); ++// utils = new Utils(); ++// utils->centerToScreen(this); + ui->switchClock->setFixedSize(40,40); + navigationBtnStyle(ui->switchClock); + ui->switchClock->setToolTip(tr(CLOCK_TITLE_NAME)); +@@ -230,7 +253,8 @@ void Clock::closeEvent(QCloseEvent *event) + void Clock::closeHandel() + { + QPointF position = this->pos(); +- XAtomHelper::setStandardWindowHint(close_or_hide_page->winId()); ++ kdk::UkuiStyleHelper::self()->removeHeader(close_or_hide_page); ++// XAtomHelper::setStandardWindowHint(close_or_hide_page->winId()); + close_or_hide_page->move(position.x()+20,position.y()+200); + close_or_hide_page->exec(); + } +@@ -402,6 +426,7 @@ void Clock::CountdownInit() + ui->startCountdownBtn->raise(); + //初始化倒计时弹窗 + countdownNoticeDialog = new Natice_alarm(60,-1); ++ kdk::UkuiStyleHelper::self()->removeHeader(countdownNoticeDialog); + countdownNoticeDialog->timer->stop(); + countdownNoticeDialog->timer_xumhuan->stop(); + countdownNoticeDialog->m_musicPlayer->stop(); +@@ -1010,6 +1035,7 @@ void Clock::windowClosingClicked() + */ + void Clock::windowMinimizingClicked() + { ++// kdk::WindowManager::minimizeWindow(this->winId()); + this->showNormal(); + this->showMinimized(); + } +@@ -1053,7 +1079,7 @@ void Clock:: CountdownPageSwitch () + void Clock::setBtnIcon(QPushButton *btn, QString imgUrl, QString localUrl) + { + QIcon icon=Utils::getQIcon(imgUrl,localUrl); +- btn->setIcon(QIcon::fromTheme(imgUrl)); ++ btn->setIcon(icon); + btn->setIconSize(QSize(18, 18)); + QPainter p(btn); + // 表示引擎应尽可能对图元的边缘进行抗锯齿。 +@@ -1066,7 +1092,7 @@ void Clock::setDefaultIcon(QPushButton *btn) + }else if(btn==ui->switchCountdown){ + setBtnIcon(ui->switchCountdown,"ukui-countselect-symbolic",":/image/count.png"); + }else if(btn==ui->switchStopwatch){ +- setBtnIcon(ui->switchStopwatch,"ukui-stopwatch-symbolic",":/image/stopwatch.png"); ++ setBtnIcon(ui->switchStopwatch,"stopwatch-symbolic",":/image/stopwatch.png"); + } + if(theme::themetype==1){ + changeIconHeight(btn); +@@ -1319,8 +1345,10 @@ void Clock::menuBtnStyle() + connect(m_aboutAction, &QAction::triggered, this, [=](){ + About *dialog = new About(); + QPointF position = this->pos(); +- XAtomHelper::setStandardWindowHint(dialog->winId()); +- dialog->move(position.x()-15,position.y()+130); ++ kdk::UkuiStyleHelper::self()->removeHeader(dialog); ++// XAtomHelper::setStandardWindowHint(dialog->winId()); ++ kdk::WindowManager::setGeometry(dialog->windowHandle(),QRect(position.x()-15,position.y()+130,dialog->width(),dialog->height())); ++// dialog->move(position.x()-15,position.y()+130); + dialog->exec(); + }); + connect(m_closeAction, SIGNAL(triggered()), this, SLOT(windowClosingClicked())); +@@ -1519,6 +1547,7 @@ void Clock::noticeDialogShow(int close_time, int alarm_num, QString id) + } + else + moveUnderMultiScreen(UP_RIGHT,alarmNoticeDialog,1); ++ kdk::UkuiStyleHelper::self()->removeHeader(alarmNoticeDialog); + alarmNoticeDialog->playMusic(); + } + +@@ -2563,6 +2592,7 @@ void Clock::countdownNoticeDialogShow() + moveUnderMultiScreen(UP_RIGHT,countdownNoticeDialog,0); + } else + moveUnderMultiScreen(UP_RIGHT,countdownNoticeDialog,1); ++ kdk::UkuiStyleHelper::self()->removeHeader(countdownNoticeDialog); + countdownNoticeDialog->playMusic(); + } + +@@ -2766,12 +2796,14 @@ void Clock::onTinyClicked() + this->m_selectTinyCountdown=true; + //主窗体最小化 + setWindowState(Qt::WindowMinimized); ++// kdk::WindowManager::minimizeWindow(this->winId()); + moveUnderMultiScreen(UP_RIGHT,tinycountdownDia,0); + tinycountdownDia->showTop(); + } + + void Clock::activeWindow() + { ++// kdk::WindowManager::activateWindow(this->winId()); + setWindowState(Qt::WindowActive); + } + //刷新时间格式 +@@ -3542,6 +3574,7 @@ void Clock::showPaint7() + */ + void Clock::moveUnderMultiScreen(Clock::ScreenPosition spostion,QWidget * tempDialog,int hiddenFlag) + { ++ tempDialog->show(); + QScreen *screen=QGuiApplication::primaryScreen (); + int screen_width = screen->geometry().width(); + int screen_height = screen->geometry().height(); +@@ -3549,47 +3582,58 @@ void Clock::moveUnderMultiScreen(Clock::ScreenPosition spostion,QWidget * tempDi + int y = primaryManager->getNScreen_y(); + int heightRadio = 20; + int widthRadio = 14; +- ++ int diaWidth = tempDialog->width(); ++ int diaHeight = tempDialog->height(); + switch (spostion) { + case SP_LEFT: + { + int moveWidth = x+round(tempDialog->width()+round(1.0/heightRadio*screen_width)); + int moveHeight = y+round(screen_height-tempDialog->height()-round(1.0/widthRadio*screen_height)); +- tempDialog->move(moveWidth,moveHeight); ++// tempDialog->move(moveWidth,moveHeight); ++ kdk::WindowManager::setGeometry(tempDialog->windowHandle(),QRect(moveWidth,moveHeight,diaWidth,diaHeight)); + }break; + case SP_RIGHT: + { + int moveWidth = x+round(screen_width-tempDialog->width()); + int moveHeight = y+round(screen_height-tempDialog->height()-50); + tempDialog->move(moveWidth,moveHeight); +- if (hiddenFlag == 1) +- tempDialog->move(moveWidth,moveHeight); +- else +- tempDialog->move(moveWidth,moveHeight-tempDialog->height()); ++ if (hiddenFlag == 1){ ++// tempDialog->move(moveWidth,moveHeight); ++ kdk::WindowManager::setGeometry(tempDialog->windowHandle(),QRect(moveWidth,moveHeight,diaWidth,diaHeight)); ++ } ++ else{ ++// tempDialog->move(moveWidth,moveHeight-tempDialog->height()); ++ kdk::WindowManager::setGeometry(tempDialog->windowHandle(),QRect(moveWidth,moveHeight-tempDialog->height(),diaWidth,diaHeight)); ++ } ++ + }break; + case SP_CENTER: + { + int moveWidth = x+round((screen_width-tempDialog->width())*1.0/2); + int moveHeight = y+round((screen_height-tempDialog->height())*1.0/2); +- tempDialog->move(moveWidth,moveHeight); ++// tempDialog->move(moveWidth,moveHeight); ++ kdk::WindowManager::setGeometry(tempDialog->windowHandle(),QRect(moveWidth,moveHeight,diaWidth,diaHeight)); + }break; + case UP_LEFT: + { + int moveWidth = x+round(tempDialog->width()+round(1.0/heightRadio*screen_width)); + int moveHeight = y+round(tempDialog->height()+round(1.0/widthRadio*screen_height)); +- tempDialog->move(moveWidth,moveHeight); ++// tempDialog->move(moveWidth,moveHeight); ++ kdk::WindowManager::setGeometry(tempDialog->windowHandle(),QRect(moveWidth,moveHeight,diaWidth,diaHeight)); + }break; + case UP_RIGHT: + { + int moveWidth = x+round(screen_width-tempDialog->width()-round(1.0/heightRadio*screen_width)); + int moveHeight = y+round(1.0/20*screen_height); +- tempDialog->move(moveWidth,moveHeight); ++// tempDialog->move(moveWidth,moveHeight); ++ kdk::WindowManager::setGeometry(tempDialog->windowHandle(),QRect(moveWidth,moveHeight,diaWidth,diaHeight)); + }break; + case UP_CENTER: + { + int moveWidth = x+round((screen_width-tempDialog->width())*1.0/2); + int moveHeight = y+round((screen_height-tempDialog->height())*1.0/2); +- tempDialog->move(moveWidth,moveHeight); ++ kdk::WindowManager::setGeometry(tempDialog->windowHandle(),QRect(moveWidth,moveHeight,diaWidth,diaHeight)); ++// tempDialog->move(moveWidth,moveHeight); + }break; + default: + {} +diff --git a/clock.h b/clock.h +index 154c315..7f0713f 100644 +--- a/clock.h ++++ b/clock.h +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2019 Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #ifndef CLOCK_H + #define CLOCK_H + #include +diff --git a/clock_conf.ini b/clock_conf.ini +index 79c0352..82be70d 100644 +--- a/clock_conf.ini ++++ b/clock_conf.ini +@@ -1,2 +1,2 @@ + [common] +-version=3.1.4.0-0k0 ++version=3.1.4.0.0k0-0k0.1 +diff --git a/clockdbusadaptor.cpp b/clockdbusadaptor.cpp +index f6d107a..59e250f 100644 +--- a/clockdbusadaptor.cpp ++++ b/clockdbusadaptor.cpp +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #include "clockdbusadaptor.h" + #include + +diff --git a/clockdbusadaptor.h b/clockdbusadaptor.h +index f1138d2..f39eaf8 100644 +--- a/clockdbusadaptor.h ++++ b/clockdbusadaptor.h +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #ifndef CLOCKDBUSADAPTOR_H + #define CLOCKDBUSADAPTOR_H + +diff --git a/clockentitydao.cpp b/clockentitydao.cpp +index 2063110..a09b411 100644 +--- a/clockentitydao.cpp ++++ b/clockentitydao.cpp +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #include "clockentitydao.h" + #include "fieldvalidutil.h" + +diff --git a/clockentitydao.h b/clockentitydao.h +index 37ba98b..57ebd0b 100644 +--- a/clockentitydao.h ++++ b/clockentitydao.h +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #ifndef CLOCKENTITYDAO_H + #define CLOCKENTITYDAO_H + +diff --git a/closeOrHide.cpp b/closeOrHide.cpp +index 5d65626..bf317fe 100644 +--- a/closeOrHide.cpp ++++ b/closeOrHide.cpp +@@ -1,27 +1,49 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #include "closeOrHide.h" + #include "ui_closeOrHide.h" + #include "QDebug" + #include + #include "xatom-helper.h" + #include "constant_class.h" +- ++#include "ukuistylehelper/ukuistylehelper.h" ++#include "windowmanager/windowmanager.h" + extern void qt_blurImage(QImage &blurImage, qreal radius, bool quality, int transposed); + + close_or_hide::close_or_hide(QWidget *parent) : +@@ -35,8 +57,9 @@ close_or_hide::close_or_hide(QWidget *parent) : + ui->backrunRadio->setChecked(1); + + // 添加窗管协议 +- XAtomHelper::setStandardWindowHint(this->winId()); +- XAtomHelper::setStandardWindowRadius(this->winId(),WINDOWN_RADIUS); ++// XAtomHelper::setStandardWindowHint(this->winId()); ++// XAtomHelper::setStandardWindowRadius(this->winId(),WINDOWN_RADIUS); ++ kdk::UkuiStyleHelper::self()->removeHeader(this); + + ui->closeInfoLabel->setText(tr("Please select the state after closing:")); + ui->closeInfoLabel->setWordWrap(true); +diff --git a/closeOrHide.h b/closeOrHide.h +index 1116999..34e8217 100644 +--- a/closeOrHide.h ++++ b/closeOrHide.h +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #ifndef CLOSE_OR_HIDE_H + #define CLOSE_OR_HIDE_H + +diff --git a/commontooltip.cpp b/commontooltip.cpp +index c30d2a6..06c65cf 100644 +--- a/commontooltip.cpp ++++ b/commontooltip.cpp +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #include "commontooltip.h" + #include + #include +diff --git a/commontooltip.h b/commontooltip.h +index db9fa8a..2d867c9 100644 +--- a/commontooltip.h ++++ b/commontooltip.h +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #ifndef COMMONTOOLTIP_H + #define COMMONTOOLTIP_H + +diff --git a/configutil.cpp b/configutil.cpp +index 9e9d48b..0fa3c5e 100644 +--- a/configutil.cpp ++++ b/configutil.cpp +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #include "configutil.h" + #include + #include +diff --git a/configutil.h b/configutil.h +index 9346817..a8a82b8 100644 +--- a/configutil.h ++++ b/configutil.h +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #ifndef CONFIGUTIL_H + #define CONFIGUTIL_H + +diff --git a/connection.h b/connection.h +index 5622478..059b3a7 100644 +--- a/connection.h ++++ b/connection.h +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2019 Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #ifndef CONNECTION_H + #define CONNECTION_H + +diff --git a/constant_class.h b/constant_class.h +index 7fef46a..3d8724d 100644 +--- a/constant_class.h ++++ b/constant_class.h +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #ifndef CONSTANTCLASS_H + #define CONSTANTCLASS_H + +diff --git a/coreplayer/mmediaplayer.cpp b/coreplayer/mmediaplayer.cpp +index f2367bc..8a704be 100644 +--- a/coreplayer/mmediaplayer.cpp ++++ b/coreplayer/mmediaplayer.cpp +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2022 Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #include "mmediaplayer.h" + #include + #include +diff --git a/coreplayer/mmediaplayer.h b/coreplayer/mmediaplayer.h +index 6d404e4..9618eea 100644 +--- a/coreplayer/mmediaplayer.h ++++ b/coreplayer/mmediaplayer.h +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #ifndef MMEDIAPLAYER_H + #define MMEDIAPLAYER_H + +diff --git a/coreplayer/mmediaplaylist.cpp b/coreplayer/mmediaplaylist.cpp +index 1d6365c..094b706 100644 +--- a/coreplayer/mmediaplaylist.cpp ++++ b/coreplayer/mmediaplaylist.cpp +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2022 Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #include "mmediaplaylist.h" + + MMediaPlaylist::MMediaPlaylist(QObject *parent) +diff --git a/coreplayer/mmediaplaylist.h b/coreplayer/mmediaplaylist.h +index a7232f0..bb26ceb 100644 +--- a/coreplayer/mmediaplaylist.h ++++ b/coreplayer/mmediaplaylist.h +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #ifndef MMediaPlaylist_H + #define MMediaPlaylist_H + +diff --git a/coreplayer/playcontroller.cpp b/coreplayer/playcontroller.cpp +index 7e72c12..e327072 100644 +--- a/coreplayer/playcontroller.cpp ++++ b/coreplayer/playcontroller.cpp +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #include + #include + #include "playcontroller.h" +diff --git a/coreplayer/playcontroller.h b/coreplayer/playcontroller.h +index 5f85a3a..c813820 100644 +--- a/coreplayer/playcontroller.h ++++ b/coreplayer/playcontroller.h +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #ifndef PLAYCONTROLLER_H + #define PLAYCONTROLLER_H + +diff --git a/countdownAnimation.cpp b/countdownAnimation.cpp +index d800859..c32d087 100644 +--- a/countdownAnimation.cpp ++++ b/countdownAnimation.cpp +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2019 Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #include "countdownAnimation.h" + #include + #include +diff --git a/countdownAnimation.h b/countdownAnimation.h +index b053744..a30d8d3 100644 +--- a/countdownAnimation.h ++++ b/countdownAnimation.h +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2019 Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #ifndef TESTWIDGET_H + #define TESTWIDGET_H + +diff --git a/dbusdeleteclockbyidadaptor.cpp b/dbusdeleteclockbyidadaptor.cpp +index cc5dd68..38e6429 100644 +--- a/dbusdeleteclockbyidadaptor.cpp ++++ b/dbusdeleteclockbyidadaptor.cpp +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #include "dbusdeleteclockbyidadaptor.h" + + DbusDeleteClockByIdAdaptor::DbusDeleteClockByIdAdaptor(QObject *parent, Clock *currentClock) : QDBusAbstractAdaptor(parent), +diff --git a/dbusdeleteclockbyidadaptor.h b/dbusdeleteclockbyidadaptor.h +index af96e02..4c38dd1 100644 +--- a/dbusdeleteclockbyidadaptor.h ++++ b/dbusdeleteclockbyidadaptor.h +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #ifndef DBUSDELETECLOCKBYIDADAPTOR_H + #define DBUSDELETECLOCKBYIDADAPTOR_H + +diff --git a/dbusselectclockbyidadaptor.cpp b/dbusselectclockbyidadaptor.cpp +index 73524d4..01f01b1 100644 +--- a/dbusselectclockbyidadaptor.cpp ++++ b/dbusselectclockbyidadaptor.cpp +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #include "dbusselectclockbyidadaptor.h" + + DbusSelectClockByIdAdaptor::DbusSelectClockByIdAdaptor(QObject *parent,Clock * currentClock) : QDBusAbstractAdaptor(parent), +diff --git a/dbusselectclockbyidadaptor.h b/dbusselectclockbyidadaptor.h +index 8ed5603..fec54ba 100644 +--- a/dbusselectclockbyidadaptor.h ++++ b/dbusselectclockbyidadaptor.h +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #ifndef DBUSSELECTCLOCKBYIDADAPTOR_H + #define DBUSSELECTCLOCKBYIDADAPTOR_H + +diff --git a/dbusupdateclockadaptor.cpp b/dbusupdateclockadaptor.cpp +index b7bce47..09d90e7 100644 +--- a/dbusupdateclockadaptor.cpp ++++ b/dbusupdateclockadaptor.cpp +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #include "dbusupdateclockadaptor.h" + + DbusUpdateClockAdaptor::DbusUpdateClockAdaptor(QObject *parent,Clock * currentClock) : QDBusAbstractAdaptor(parent), +diff --git a/dbusupdateclockadaptor.h b/dbusupdateclockadaptor.h +index 227a34f..0677764 100644 +--- a/dbusupdateclockadaptor.h ++++ b/dbusupdateclockadaptor.h +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #ifndef DBUSUPDATECLOCKADAPTOR_H + #define DBUSUPDATECLOCKADAPTOR_H + +diff --git a/debug.h b/debug.h +index 1abde60..a4d3fad 100644 +--- a/debug.h ++++ b/debug.h +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2019 Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #ifndef DEBUG_H + #define DEBUG_H + +diff --git a/deleteMsg.cpp b/deleteMsg.cpp +index d0eb83b..5eca7f1 100644 +--- a/deleteMsg.cpp ++++ b/deleteMsg.cpp +@@ -1,24 +1,47 @@ + /* +-* Copyright (C) 2019 Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #include "deleteMsg.h" + #include "ui_deleteMsg.h" + #include + #include "xatom-helper.h" ++#include "ukuistylehelper/ukuistylehelper.h" ++#include "windowmanager/windowmanager.h" + + extern void qt_blurImage(QImage &blurImage, qreal radius, bool quality, int transposed); + +@@ -29,7 +52,8 @@ delete_msg::delete_msg(QWidget *parent) : + ui->setupUi(this); + + // 添加窗管协议 +- XAtomHelper::setStandardWindowHint(this->winId()); ++// XAtomHelper::setStandardWindowHint(this->winId()); ++ kdk::UkuiStyleHelper::self()->removeHeader(this); + // this->setProperty("blurRegion", QRegion(QRect(1, 1, 1, 1))); + // setAttribute(Qt::WA_TranslucentBackground); + // this->setWindowFlags(Qt::FramelessWindowHint | Qt::Dialog); +diff --git a/deleteMsg.h b/deleteMsg.h +index 02eae3b..91d0aee 100644 +--- a/deleteMsg.h ++++ b/deleteMsg.h +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2019 Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #ifndef DELETE_MSG_H + #define DELETE_MSG_H + +diff --git a/dotlineDemo.cpp b/dotlineDemo.cpp +index 3e994af..a4049ed 100644 +--- a/dotlineDemo.cpp ++++ b/dotlineDemo.cpp +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2019 Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #include "dotlineDemo.h" + #include + #include +diff --git a/dotlineDemo.h b/dotlineDemo.h +index 5e31dd7..652afc3 100644 +--- a/dotlineDemo.h ++++ b/dotlineDemo.h +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2019 Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #ifndef DOTLINEDEMO_H + #define DOTLINEDEMO_H + +diff --git a/fieldvalidutil.cpp b/fieldvalidutil.cpp +index 3b9ca6a..0d19c91 100644 +--- a/fieldvalidutil.cpp ++++ b/fieldvalidutil.cpp +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #include "fieldvalidutil.h" + + FieldValidUtil::FieldValidUtil(QObject *parent) : QObject(parent) +diff --git a/fieldvalidutil.h b/fieldvalidutil.h +index f192e4a..1aa3115 100644 +--- a/fieldvalidutil.h ++++ b/fieldvalidutil.h +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #ifndef FIELDVALIDUTIL_H + #define FIELDVALIDUTIL_H + +diff --git a/gsettingsubject.cpp b/gsettingsubject.cpp +index 8b4fa29..dd1ca61 100644 +--- a/gsettingsubject.cpp ++++ b/gsettingsubject.cpp +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #include "gsettingsubject.h" + #include "theme.h" + +diff --git a/gsettingsubject.h b/gsettingsubject.h +index fc5faef..373b168 100644 +--- a/gsettingsubject.h ++++ b/gsettingsubject.h +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #ifndef GSETTINGSUBJECT_H + #define GSETTINGSUBJECT_H + +diff --git a/integer.cpp b/integer.cpp +index c1576d8..6cc7776 100644 +--- a/integer.cpp ++++ b/integer.cpp +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #include "integer.h" + + Integer::Integer() +diff --git a/integer.h b/integer.h +index acee9f0..2c60478 100644 +--- a/integer.h ++++ b/integer.h +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #ifndef INTEGER_H + #define INTEGER_H + +diff --git a/itemNew.cpp b/itemNew.cpp +index 93dde64..6a38d67 100644 +--- a/itemNew.cpp ++++ b/itemNew.cpp +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2019 Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #include "itemNew.h" + #include + #include +diff --git a/itemNew.h b/itemNew.h +index 314e032..6abf29d 100644 +--- a/itemNew.h ++++ b/itemNew.h +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2019 Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #ifndef ITEM_NEW_H + #define ITEM_NEW_H + +diff --git a/kylinqfiledialog.cpp b/kylinqfiledialog.cpp +index eaf47cf..56e632c 100644 +--- a/kylinqfiledialog.cpp ++++ b/kylinqfiledialog.cpp +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #include "kylinqfiledialog.h" + #include + #include +diff --git a/kylinqfiledialog.h b/kylinqfiledialog.h +index 9109531..34a303e 100644 +--- a/kylinqfiledialog.h ++++ b/kylinqfiledialog.h +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #ifndef KYLINQFILEDIALOG_H + #define KYLINQFILEDIALOG_H + +diff --git a/main.cpp b/main.cpp +index fc36352..7a501dd 100644 +--- a/main.cpp ++++ b/main.cpp +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2019 Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #include "clock.h" + #include "singleApplication.h" + #include +@@ -29,6 +50,9 @@ + #include "dbusselectclockbyidadaptor.h" + #include "ClockInterface.h" + #include ++#include "ukuistylehelper/ukuistylehelper.h" ++#include "windowmanager/windowmanager.h" ++#include "utils.h" + /*! + * \brief myMessageOutput + * 日志打印输出 +@@ -168,8 +192,12 @@ int main(int argc, char *argv[]) + QObject selectObj; + publishDbusSelectClock(&w,&selectObj); + // 添加窗管协议。显示的位置 +- XAtomHelper::setStandardWindowHint(w.winId()); ++// XAtomHelper::setStandardWindowHint(w.winId()); ++ kdk::UkuiStyleHelper::self()->removeHeader(&w); + w.show(); ++ Utils * utils = new Utils(); ++ QRect rect = utils->centerToScreenQRect(&w); ++ kdk::WindowManager::setGeometry(w.windowHandle(),rect); + return a.exec(); + } + return 0; +diff --git a/mediaplayerpool.cpp b/mediaplayerpool.cpp +index 19f4a50..4d03b62 100644 +--- a/mediaplayerpool.cpp ++++ b/mediaplayerpool.cpp +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #include "mediaplayerpool.h" + #include + #include +diff --git a/mediaplayerpool.h b/mediaplayerpool.h +index bedefca..aa19ae7 100644 +--- a/mediaplayerpool.h ++++ b/mediaplayerpool.h +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #ifndef MEDIAPLAYERPOOL_H + #define MEDIAPLAYERPOOL_H + +diff --git a/mediaplayerthread.cpp b/mediaplayerthread.cpp +index 3777ab7..88ac5c7 100644 +--- a/mediaplayerthread.cpp ++++ b/mediaplayerthread.cpp +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #include "mediaplayerthread.h" + #include + +diff --git a/mediaplayerthread.h b/mediaplayerthread.h +index 315a05b..24ebf27 100644 +--- a/mediaplayerthread.h ++++ b/mediaplayerthread.h +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #ifndef MEDIAPLAYERTHREAD_H + #define MEDIAPLAYERTHREAD_H + +diff --git a/noticeAlarm.cpp b/noticeAlarm.cpp +index e2f3d0f..3fd2445 100644 +--- a/noticeAlarm.cpp ++++ b/noticeAlarm.cpp +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2019 Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #include "noticeAlarm.h" + #include "ui_noticeAlarm.h" + #include +@@ -30,6 +51,8 @@ + #include "gsettingsubject.h" + #include + #include ++#include "ukuistylehelper/ukuistylehelper.h" ++#include "windowmanager/windowmanager.h" + + extern void qt_blurImage(QImage &blurImage, qreal radius, bool quality, int transposed); + /** +@@ -54,7 +77,8 @@ Natice_alarm::Natice_alarm(int close_time, int num, QWidget *parent , QString cl + this->setWindowFlags(m_flags | Qt::WindowStaysOnTopHint); + + // 添加窗管协议 +- XAtomHelper::setStandardWindowHint(this->winId()); ++// XAtomHelper::setStandardWindowHint(this->winId()); ++ kdk::UkuiStyleHelper::self()->removeHeader(this); + m_selectBtnUtil = new SelectBtnUtil(); + //响铃提示 + this->setWindowTitle(tr("Ring prompt")); +diff --git a/noticeAlarm.h b/noticeAlarm.h +index 8c6bd55..25dcb79 100644 +--- a/noticeAlarm.h ++++ b/noticeAlarm.h +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2019 Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #ifndef NATICE_ALARM_H + #define NATICE_ALARM_H + +diff --git a/object_pool.h b/object_pool.h +index f18749f..ebf029f 100644 +--- a/object_pool.h ++++ b/object_pool.h +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #ifndef OBJECT_POOL_H + #define OBJECT_POOL_H + #include +diff --git a/primarymanager.cpp b/primarymanager.cpp +index afa65c7..c2d5fbb 100644 +--- a/primarymanager.cpp ++++ b/primarymanager.cpp +@@ -1,3 +1,41 @@ ++/* ++ ++ ++ * Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. ++ ++ ++ * Copyright 2022 KylinSoft Co., Ltd. ++ ++ ++ ++ * ++ ++ * 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 . ++ ++ ++ ++ */ ++ + #include "primarymanager.h" + + +diff --git a/primarymanager.h b/primarymanager.h +index ffff36f..41c65df 100644 +--- a/primarymanager.h ++++ b/primarymanager.h +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #ifndef PRIMARYMANAGER_H + #define PRIMARYMANAGER_H + #include +diff --git a/qroundProgressBar.cpp b/qroundProgressBar.cpp +index 42a09f4..8a054e8 100644 +--- a/qroundProgressBar.cpp ++++ b/qroundProgressBar.cpp +@@ -1,21 +1,40 @@ + /* +- * QRoundProgressBar - a circular progress bar Qt widget. +- * +- * Sintegrial Technologies (c) 2015-now +- * +- * The software is freeware and is distributed "as is" with the complete source codes. +- * Anybody is free to use it in any software projects, either commercial or non-commercial. +- * Please do not remove this copyright message and remain the name of the author unchanged. +- * +- * It is very appreciated if you produce some feedback to us case you are going to use +- * the software. ++ ++ ++ * Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. ++ ++ ++ * Copyright 2022 KylinSoft Co., Ltd. ++ ++ ++ + * +- * Please send your questions, suggestions, and information about found issues to the ++ ++ * 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. ++ + * +- * sintegrial@gmail.com ++ ++ * 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 . ++ ++ ++ ++ */ + + #include "qroundProgressBar.h" + +diff --git a/qroundProgressBar.h b/qroundProgressBar.h +index 65a7936..c1cadf0 100644 +--- a/qroundProgressBar.h ++++ b/qroundProgressBar.h +@@ -1,19 +1,39 @@ + /* +- * QRoundProgressBar - a circular progress bar Qt widget. +- * +- * Sintegrial Technologies (c) 2015-now +- * +- * The software is freeware and is distributed "as is" with the complete source codes. +- * Anybody is free to use it in any software projects, either commercial or non-commercial. +- * Please do not remove this copyright message and remain the name of the author unchanged. +- * +- * It is very appreciated if you produce some feedback to us case you are going to use +- * the software. ++ ++ ++ * Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. ++ ++ ++ * Copyright 2022 KylinSoft Co., Ltd. ++ ++ ++ + * +- * Please send your questions, suggestions, and information about found issues to the ++ ++ * 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. ++ + * +- * sintegrial@gmail.com ++ ++ * 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 . ++ ++ ++ + */ + + #ifndef QROUNDPROGRESSBAR_H +diff --git a/roundbtn.cpp b/roundbtn.cpp +index da368ca..eb1f4a3 100644 +--- a/roundbtn.cpp ++++ b/roundbtn.cpp +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #include "roundbtn.h" + #include + #include +diff --git a/roundbtn.h b/roundbtn.h +index 5855c29..4181e1d 100644 +--- a/roundbtn.h ++++ b/roundbtn.h +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #ifndef ROUNDBTN_H + #define ROUNDBTN_H + +diff --git a/selectbtn.cpp b/selectbtn.cpp +index c9e81fd..62844f1 100644 +--- a/selectbtn.cpp ++++ b/selectbtn.cpp +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #include "selectbtn.h" + #include + #include +diff --git a/selectbtn.h b/selectbtn.h +index 3832d50..425660a 100644 +--- a/selectbtn.h ++++ b/selectbtn.h +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #ifndef SELECTBTN_H + #define SELECTBTN_H + +diff --git a/selectbtnutil.cpp b/selectbtnutil.cpp +index a263d8b..4fd31c0 100644 +--- a/selectbtnutil.cpp ++++ b/selectbtnutil.cpp +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #include "selectbtnutil.h" + #include "connection.h" + #include +diff --git a/selectbtnutil.h b/selectbtnutil.h +index d2b28f8..9e41cbc 100644 +--- a/selectbtnutil.h ++++ b/selectbtnutil.h +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #ifndef SELECTBTNUTIL_H + #define SELECTBTNUTIL_H + +diff --git a/setAlarmRepeatDialog.cpp b/setAlarmRepeatDialog.cpp +index 63c4fb6..d01a553 100644 +--- a/setAlarmRepeatDialog.cpp ++++ b/setAlarmRepeatDialog.cpp +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2019 Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #include "setAlarmRepeatDialog.h" + #include + #include +diff --git a/setAlarmRepeatDialog.h b/setAlarmRepeatDialog.h +index 609feb9..787a5bb 100644 +--- a/setAlarmRepeatDialog.h ++++ b/setAlarmRepeatDialog.h +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2019 Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #ifndef SET_ALARM_REPEAT_DIALOG_H + #define SET_ALARM_REPEAT_DIALOG_H + +diff --git a/setupPage.cpp b/setupPage.cpp +index c8d436e..912fcfa 100644 +--- a/setupPage.cpp ++++ b/setupPage.cpp +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2019 Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #include "setupPage.h" + #include "ui_setupPage.h" + #include "QSlider" +diff --git a/singleApplication.cpp b/singleApplication.cpp +index 070cb3e..48a734f 100644 +--- a/singleApplication.cpp ++++ b/singleApplication.cpp +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2019 Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #include "singleApplication.h" + #include + #include +diff --git a/singleApplication.h b/singleApplication.h +index 416927e..ae2f5ff 100644 +--- a/singleApplication.h ++++ b/singleApplication.h +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2019 Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #ifndef SINGLEAPPLICATION_H + #define SINGLEAPPLICATION_H + +diff --git a/stopwatchItem.cpp b/stopwatchItem.cpp +index bb7970f..ff3467b 100644 +--- a/stopwatchItem.cpp ++++ b/stopwatchItem.cpp +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2019 Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #include "stopwatchItem.h" + #include + #include +diff --git a/stopwatchItem.h b/stopwatchItem.h +index 1c41a35..bf1c80c 100644 +--- a/stopwatchItem.h ++++ b/stopwatchItem.h +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2019 Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #ifndef STOPWATCH_ITEM_H + #define STOPWATCH_ITEM_H + +diff --git a/theme.cpp b/theme.cpp +index af287bc..d903079 100644 +--- a/theme.cpp ++++ b/theme.cpp +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #include "theme.h" + #include + #include +diff --git a/theme.h b/theme.h +index 911670c..a28b8a0 100644 +--- a/theme.h ++++ b/theme.h +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #ifndef THEME_H + #define THEME_H + #include +diff --git a/tinycountdown.cpp b/tinycountdown.cpp +index 32949ad..72aba59 100644 +--- a/tinycountdown.cpp ++++ b/tinycountdown.cpp +@@ -1,25 +1,49 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #include "tinycountdown.h" + #include "ui_tinycountdown.h" + #include "theme.h" + #include + #include "utils.h" ++#include "ukuistylehelper/ukuistylehelper.h" ++#include "windowmanager/windowmanager.h" ++ + extern void qt_blurImage(QImage &blurImage, qreal radius, bool quality, int transposed); + tinyCountdown::tinyCountdown(QWidget *parent) : + QWidget(parent), +@@ -57,7 +81,8 @@ void tinyCountdown::updateWidgetRadius() + // this->setWindowFlags(m_flags | Qt::WindowStaysOnTopHint); + + // 添加窗管协议 +- XAtomHelper::setStandardWindowHint(this->winId()); ++// XAtomHelper::setStandardWindowHint(this->winId()); ++ kdk::UkuiStyleHelper::self()->removeHeader(this); + //圆角 + QBitmap bmp(this->size()); + bmp.fill(); +@@ -99,6 +124,7 @@ void tinyCountdown::mousePressEvent(QMouseEvent *event) + { + if (event->button() == Qt::LeftButton) { + this->dragPosition = event->globalPos() - frameGeometry().topLeft(); ++ qWarning()<<"dbq-mousePressEvent"<dragPosition; + this->mousePressed = true; + } + QWidget::mousePressEvent(event); +@@ -109,6 +135,7 @@ void tinyCountdown::mouseReleaseEvent(QMouseEvent *event) + + if (event->button() == Qt::LeftButton) { + this->mousePressed = false; ++ qWarning()<<"dbq-mouseReleaseEvent"; + } + + QWidget::mouseReleaseEvent(event); +@@ -121,6 +148,7 @@ void tinyCountdown::mouseMoveEvent(QMouseEvent *event) + + if (this->mousePressed) { + move(event->globalPos() - this->dragPosition); ++ qWarning()<<"dbq-mouseMoveEvent"<globalPos() - this->dragPosition; + this->setCursor(Qt::ClosedHandCursor); + } + +diff --git a/tinycountdown.h b/tinycountdown.h +index 25a21aa..72bd305 100644 +--- a/tinycountdown.h ++++ b/tinycountdown.h +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #ifndef TINYCOUNTDOWN_H + #define TINYCOUNTDOWN_H + +diff --git a/ukui-clock.pro b/ukui-clock.pro +index 9700d1d..28230ae 100644 +--- a/ukui-clock.pro ++++ b/ukui-clock.pro +@@ -16,6 +16,7 @@ LIBS += -lukui-log4qt + # 配置gsettings + CONFIG += link_pkgconfig + PKGCONFIG += gsettings-qt ++PKGCONFIG += kysdk-waylandhelper + + greaterThan(QT_MAJOR_VERSION, 4): QT += widgets + +diff --git a/ukui-clock.pro.user b/ukui-clock.pro.user +index b4d8fc8..db5dab8 100644 +--- a/ukui-clock.pro.user ++++ b/ukui-clock.pro.user +@@ -1,10 +1,10 @@ + + +- ++ + + + EnvironmentId +- {a59d6fe1-ce4c-4f9e-af0a-b3f85c417b40} ++ {41ea402d-7bdf-4d00-aa19-b60b8c37eabf} + + + ProjectExplorer.Project.ActiveTarget +@@ -64,12 +64,12 @@ + + 桌面 + 桌面 +- {873ec1cd-e92f-4e4b-865a-d0944351c717} ++ {5868f9f2-cd4b-4271-af01-86dbdafa97ac} + 0 + 0 + 0 + +- /home/dbq/workspace/git_re/workspace/sp2/build-ukui-clock-unknown-Debug ++ /home/dbq/workspace/git_re/workspace/openkylin/k-src-fork/build-ukui-clock-unknown-Debug + + + true +@@ -117,7 +117,7 @@ + 2 + + +- /home/dbq/workspace/git_re/workspace/sp2/build-ukui-clock-unknown-Release ++ /home/dbq/workspace/git_re/workspace/openkylin/k-src-fork/build-ukui-clock-unknown-Release + + + true +@@ -165,7 +165,7 @@ + 0 + + +- /home/dbq/workspace/git_re/workspace/sp2/build-ukui-clock-unknown-Profile ++ /home/dbq/workspace/git_re/workspace/openkylin/k-src-fork/build-ukui-clock-unknown-Profile + + + true +@@ -285,8 +285,8 @@ + + 2 + +- Qt4ProjectManager.Qt4RunConfiguration:/home/dbq/workspace/git_re/workspace/sp2/ukui-clock/ukui-clock.pro +- /home/dbq/workspace/git_re/workspace/sp2/ukui-clock/ukui-clock.pro ++ Qt4ProjectManager.Qt4RunConfiguration:/home/dbq/workspace/git_re/workspace/openkylin/k-src-fork/ukui-clock/ukui-clock.pro ++ /home/dbq/workspace/git_re/workspace/openkylin/k-src-fork/ukui-clock/ukui-clock.pro + + false + +@@ -297,7 +297,7 @@ + false + true + +- /home/dbq/workspace/git_re/workspace/sp2/build-ukui-clock-unknown-Debug ++ /home/dbq/workspace/git_re/workspace/openkylin/k-src-fork/build-ukui-clock-unknown-Debug + + 1 + +diff --git a/utils.cpp b/utils.cpp +index 9382b53..70daeba 100644 +--- a/utils.cpp ++++ b/utils.cpp +@@ -1,22 +1,45 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #include "utils.h" + #include ++#include "ukuistylehelper/ukuistylehelper.h" ++#include "windowmanager/windowmanager.h" + + + /** +@@ -46,6 +69,28 @@ void Utils::centerToScreen(QWidget *widget) + int y = widget->height(); + + widget->move(desk_x / 2 - x / 2 + desk_rect.left(), desk_y / 2 - y / 2 + desk_rect.top()); ++ ++} ++ ++QRect Utils::centerToScreenQRect(QWidget *widget) ++{ ++ if (!widget) ++ ++ return QRect(); ++ ++ QDesktopWidget* m = QApplication::desktop(); ++ ++ QRect desk_rect = m->screenGeometry(m->screenNumber(QCursor::pos())); ++ ++ int desk_x = desk_rect.width(); ++ ++ int desk_y = desk_rect.height(); ++ ++ int x = widget->width(); ++ ++ int y = widget->height(); ++ QRect result = QRect(desk_x / 2 - x / 2 + desk_rect.left(), desk_y / 2 - y / 2 + desk_rect.top(),x,y); ++ return result; + } + + QString Utils::loadFontFamilyFromTTF() +diff --git a/utils.h b/utils.h +index faeaf7c..86b86e4 100644 +--- a/utils.h ++++ b/utils.h +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2020, Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #ifndef UTILS_H + #define UTILS_H + #include +@@ -34,6 +55,7 @@ class Utils :public QObject + public: + explicit Utils(QObject *parent = nullptr); + void centerToScreen(QWidget* widget); ++ QRect centerToScreenQRect(QWidget* widget); + static QString loadFontFamilyFromTTF(); + static QString loadFontHuaKangJinGangHeiRegularTTF(); + static QString getRandomId(); +diff --git a/verticalScroll24.cpp b/verticalScroll24.cpp +index f793a0b..1a8a470 100644 +--- a/verticalScroll24.cpp ++++ b/verticalScroll24.cpp +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2019 Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #include "verticalScroll24.h" + #include + #include +diff --git a/verticalScroll24.h b/verticalScroll24.h +index 0d0d695..59cf2ee 100644 +--- a/verticalScroll24.h ++++ b/verticalScroll24.h +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2019 Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #ifndef VERTICALSCROLL_24_H + #define VERTICALSCROLL_24_H + +diff --git a/verticalScroll60.cpp b/verticalScroll60.cpp +index 65698c6..12a1f2f 100644 +--- a/verticalScroll60.cpp ++++ b/verticalScroll60.cpp +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2019 Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #include "verticalScroll60.h" + #include + #include +diff --git a/verticalScroll60.h b/verticalScroll60.h +index c21668f..38aa3c4 100644 +--- a/verticalScroll60.h ++++ b/verticalScroll60.h +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2019 Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #ifndef VERTICALSCROLL_60_H + #define VERTICALSCROLL_60_H + +diff --git a/verticalScroll99.cpp b/verticalScroll99.cpp +index 91d118e..a717bdb 100644 +--- a/verticalScroll99.cpp ++++ b/verticalScroll99.cpp +@@ -1,20 +1,40 @@ +-/* +-* Copyright (C) 2019 Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ + #include "verticalScroll99.h" + #include + #include +diff --git a/verticalScroll99.h b/verticalScroll99.h +index 22c90ac..c11fabf 100644 +--- a/verticalScroll99.h ++++ b/verticalScroll99.h +@@ -1,20 +1,41 @@ + /* +-* Copyright (C) 2019 Tianjin KYLIN Information Technology Co., Ltd. +-* +-* 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, 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 . ++ ++ ++ ++ */ ++ + #ifndef VERTICALSCROLL_99_H + #define VERTICALSCROLL_99_H + +diff --git a/xatom-helper.cpp b/xatom-helper.cpp +index cd827ae..070a5fe 100644 +--- a/xatom-helper.cpp ++++ b/xatom-helper.cpp +@@ -1,23 +1,39 @@ + /* +- * KWin Style UKUI +- * ++ ++ + * Copyright (C) 2020, KylinSoft Co., Ltd. ++ ++ ++ * Copyright 2022 KylinSoft Co., Ltd. ++ ++ ++ + * +- * 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 . ++ ++ * 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. ++ + * +- * Authors: Yue Lan ++ ++ * 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 . ++ ++ ++ + */ + + #include "xatom-helper.h" +diff --git a/xatom-helper.h b/xatom-helper.h +index 3b4d0de..266f5b4 100644 +--- a/xatom-helper.h ++++ b/xatom-helper.h +@@ -1,23 +1,39 @@ + /* +- * KWin Style UKUI +- * ++ ++ + * Copyright (C) 2020, KylinSoft Co., Ltd. ++ ++ ++ * Copyright 2022 KylinSoft Co., Ltd. ++ ++ ++ + * +- * 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 . ++ ++ * 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. ++ + * +- * Authors: Yue Lan ++ ++ * 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 . ++ ++ ++ + */ + + #ifndef XATOMHELPER_H diff --git a/debian/patches/series b/debian/patches/series index 72bad78..821eccf 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 0001-Delet-.deb-file.patch +0002-copyright.patch