update tablet code

Signed-off-by: zhoudisi <zhoudisi@kylinos.cn>
This commit is contained in:
zhoudisi 2023-04-08 20:52:23 +08:00
parent 3a436921b0
commit e4c36fce2e
48 changed files with 2211 additions and 4968 deletions

1326
clock.cpp

File diff suppressed because it is too large Load Diff

51
clock.h
View File

@ -106,10 +106,12 @@
#include "gui_g.h"
#include "verticalscrollapm.h"
#include <QPointer>
#include <QStackedWidget>
#include <QSystemTrayIcon>
#include <kpushbutton.h>
#include "noticealarmpoolutil.h"
#include "customcombox.h"
#include "countdownAnimation.h"
class QDialog;
class QSpinBox;
@ -136,6 +138,8 @@ public:
explicit Clock(QWidget *parent = nullptr);
~Clock();
void iniframe(bool tablet,bool rotations);
void inidata();
void paintEvent(QPaintEvent *event) override;
void keyPressEvent(QKeyEvent * event) override;
@ -176,6 +180,8 @@ public:
void selectRemindLate();
void countdownMusicSellect();
void alarmRepeat();
QLabel *timeFormatOnTimeWheel;
protected:
void paintEvent1(QPaintEvent *);
void closeEvent(QCloseEvent *event) override;
@ -333,6 +339,42 @@ private slots:
signals:
void timeJump(qint64 timeValue);
private:
private:
QWidget *switchWidget;
KPushButton *switchClock;
KPushButton *switchCountdown;
KPushButton *switchStopwatch;
QStackedWidget *mainWidget;
QWidget *countdownPage;
QStackedWidget *countdownStackedW;
QWidget *countdownSetPage;
Countdown_Animation *countdownRunPage;
QWidget *tinyWidget;
QPushButton *tinyWindowBtn;
QWidget *timeWidget;
QLabel *remainTime;
QWidget *alarmWidget;
QLabel *countdownAlarmIcon;
QLabel *countdownAlarmTime;
QWidget *btnWidget;
QPushButton *startCountdownBtn;
QPushButton *suspendCountdownBtn;
QWidget *alarmPage;
QPushButton *addAlarmBtn;
QListWidget *alarmListWidget;
QLabel *noAlarmIcon;
QLabel *noAlarm;
QWidget *stopwatchPage;
QPushButton *startStopwatch;
QLabel *timeShowSmall;
QLabel *timeShowBig;
QPushButton *ringBtn;
QListWidget *timeListWidget;
QWidget *addAlarmPage;
QWidget *editAlarmPage;
QPushButton *cancelbtnOnEditAlarm;
QPushButton *saveBtnOnEditAlarm;
bool comboxclickedflag; //多选下拉框是否点击过
QPoint m_startPoint;
QTimer *timer = nullptr;
@ -346,6 +388,7 @@ private:
int alarmMinute;
int cPauseTime;
bool isStarted;
bool runorsuspend;//记录倒计时页面0初始状态或复位1运行页面
QPushButton* muteBtn;
QPushButton* closeTitleBtn;
QPushButton* minmizeBtn;
@ -431,6 +474,10 @@ private:
VerticalScroll_24 *timer_alarm_start24;
VerticalScroll_60 *timer_alarm_start60;
VerticalScroll_APM *timer_alarm_startAPM;
QLabel * h_in_m;
QLabel * m_in_s;
QLabel * after_s;
CustomComBox *dialog_repeat = nullptr;
QComboBox *dialog_remind_late = nullptr;
@ -517,6 +564,9 @@ private:
void updateCountdownSelectBtnStyle(Btn_new * temp,int moveWidth,int moveHeight);
void updateClockSelectBtnLabel(QLabel * temp,int moveHeight,QString text);
void updateClockTimeRing(int ringWidthOffset,int ringHeightOffset);
void updateClockEditPageLabel(int selectHeight,int selectGap,int labelHeightOffset);
void updateClockEditPageBtn(int selectMoveWidth,int selectMoveHeight,int selectGap,int btnHeight);
void widgetListWhiteStyle(QListWidget * listWidget);
void widgetListBlackStyle(QListWidget * listWidget);
QMediaPlayer * hisPlayer = nullptr;
@ -551,6 +601,7 @@ private:
QObject *m_obj;
void publishDbusNoticeShowAgain();
bool closeflag = false;
bool iniRotationFlag = false;
};
#endif // CLOCK_H

628
clock.ui
View File

@ -37,623 +37,6 @@
<height>0</height>
</size>
</property>
<widget class="QStackedWidget" name="mainWidget">
<property name="geometry">
<rect>
<x>0</x>
<y>106</y>
<width>398</width>
<height>465</height>
</rect>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="currentIndex">
<number>3</number>
</property>
<widget class="QWidget" name="countdownPage">
<widget class="QStackedWidget" name="countdownStackedW">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>390</width>
<height>477</height>
</rect>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="currentIndex">
<number>1</number>
</property>
<widget class="QWidget" name="countdownSetPage"/>
<widget class="Countdown_Animation" name="countdownRunPage">
<widget class="QWidget" name="tinyWidget" native="true">
<property name="geometry">
<rect>
<x>9</x>
<y>174</y>
<width>371</width>
<height>40</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_6">
<item>
<widget class="QPushButton" name="tinyWindowBtn">
<property name="minimumSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string/>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="timeWidget" native="true">
<property name="geometry">
<rect>
<x>14</x>
<y>100</y>
<width>361</width>
<height>77</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item alignment="Qt::AlignHCenter|Qt::AlignVCenter">
<widget class="QLabel" name="remainTime">
<property name="styleSheet">
<string notr="true">font-size:40px;</string>
</property>
<property name="text">
<string>00:00:00</string>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="alarmWidget" native="true">
<property name="geometry">
<rect>
<x>16</x>
<y>60</y>
<width>361</width>
<height>70</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_7">
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="countdownAlarmIcon">
<property name="minimumSize">
<size>
<width>13</width>
<height>16</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>26</width>
<height>26</height>
</size>
</property>
<property name="text">
<string>icon</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="countdownAlarmTime">
<property name="font">
<font>
<pointsize>-1</pointsize>
</font>
</property>
<property name="styleSheet">
<string notr="true">color: rgb(176, 176, 176);
font-size:18px;
</string>
</property>
<property name="text">
<string>PM</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<widget class="QWidget" name="btnWidget" native="true">
<property name="geometry">
<rect>
<x>9</x>
<y>386</y>
<width>361</width>
<height>48</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_8">
<item>
<widget class="QPushButton" name="startCountdownBtn">
<property name="minimumSize">
<size>
<width>120</width>
<height>34</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>120</width>
<height>16777215</height>
</size>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string>start</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="suspendCountdownBtn">
<property name="minimumSize">
<size>
<width>120</width>
<height>34</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>120</width>
<height>16777215</height>
</size>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string>suspend</string>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
</widget>
</widget>
<widget class="QWidget" name="alarmPage">
<widget class="QPushButton" name="addAlarmBtn">
<property name="geometry">
<rect>
<x>135</x>
<y>401</y>
<width>120</width>
<height>34</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>120</width>
<height>0</height>
</size>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string>add</string>
</property>
</widget>
<widget class="QListWidget" name="alarmListWidget">
<property name="geometry">
<rect>
<x>25</x>
<y>0</y>
<width>356</width>
<height>354</height>
</rect>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
</widget>
<widget class="QLabel" name="noAlarmIcon">
<property name="geometry">
<rect>
<x>116</x>
<y>76</y>
<width>149</width>
<height>170</height>
</rect>
</property>
<property name="text">
<string/>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
<widget class="QLabel" name="noAlarm">
<property name="geometry">
<rect>
<x>122</x>
<y>262</y>
<width>140</width>
<height>31</height>
</rect>
</property>
<property name="styleSheet">
<string notr="true">color: rgba(49, 66, 89, 0.6);
font-size:16px;</string>
</property>
<property name="text">
<string>no alarm</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</widget>
<widget class="QWidget" name="stopwatchPage">
<widget class="QPushButton" name="startStopwatch">
<property name="geometry">
<rect>
<x>210</x>
<y>401</y>
<width>120</width>
<height>34</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>120</width>
<height>0</height>
</size>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string>start</string>
</property>
</widget>
<widget class="QLabel" name="timeShowSmall">
<property name="geometry">
<rect>
<x>90</x>
<y>55</y>
<width>210</width>
<height>41</height>
</rect>
</property>
<property name="styleSheet">
<string notr="true">color: rgb(176, 176, 176);
font: 19pt
</string>
</property>
<property name="text">
<string>00:00:00</string>
</property>
</widget>
<widget class="QLabel" name="timeShowBig">
<property name="geometry">
<rect>
<x>90</x>
<y>0</y>
<width>210</width>
<height>70</height>
</rect>
</property>
<property name="styleSheet">
<string notr="true">font: 30pt </string>
</property>
<property name="text">
<string>00:00:00</string>
</property>
</widget>
<widget class="QPushButton" name="ringBtn">
<property name="geometry">
<rect>
<x>65</x>
<y>401</y>
<width>120</width>
<height>34</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>120</width>
<height>0</height>
</size>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string>count</string>
</property>
</widget>
<widget class="QListWidget" name="timeListWidget">
<property name="geometry">
<rect>
<x>25</x>
<y>109</y>
<width>356</width>
<height>277</height>
</rect>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
</widget>
</widget>
<widget class="QWidget" name="addAlarmPage">
<widget class="QWidget" name="editAlarmPage" native="true">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>390</width>
<height>477</height>
</rect>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<widget class="QPushButton" name="cancelbtnOnEditAlarm">
<property name="geometry">
<rect>
<x>65</x>
<y>412</y>
<width>120</width>
<height>34</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>120</width>
<height>0</height>
</size>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string>cancel</string>
</property>
</widget>
<widget class="QPushButton" name="saveBtnOnEditAlarm">
<property name="geometry">
<rect>
<x>210</x>
<y>412</y>
<width>120</width>
<height>34</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>120</width>
<height>0</height>
</size>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string>save</string>
</property>
</widget>
<widget class="QLabel" name="timeFormatOnTimeWheel">
<property name="geometry">
<rect>
<x>60</x>
<y>80</y>
<width>41</width>
<height>22</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
</widget>
</widget>
</widget>
</widget>
<widget class="QWidget" name="switchWidget" native="true">
<property name="geometry">
<rect>
<x>0</x>
<y>48</y>
<width>398</width>
<height>58</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_9">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>9</number>
</property>
<item>
<spacer name="horizontalSpacer_6">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="KPushButton" name="switchClock">
<property name="minimumSize">
<size>
<width>40</width>
<height>40</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>40</width>
<height>40</height>
</size>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>26</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="KPushButton" name="switchCountdown">
<property name="minimumSize">
<size>
<width>40</width>
<height>40</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>40</width>
<height>40</height>
</size>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>26</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="KPushButton" name="switchStopwatch">
<property name="minimumSize">
<size>
<width>40</width>
<height>40</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>40</width>
<height>40</height>
</size>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_5">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
@ -672,23 +55,12 @@ font: 19pt
</widget>
<layoutdefault spacing="6" margin="11"/>
<customwidgets>
<customwidget>
<class>Countdown_Animation</class>
<extends>QWidget</extends>
<header>countdownAnimation.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>KWidget</class>
<extends>QWidget</extends>
<header location="global">kwidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>KPushButton</class>
<extends>QPushButton</extends>
<header location="global">kpushbutton.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>

View File

@ -1,2 +1,2 @@
[common]
version=3.2.2.0.0k0-0k0.2
version=4.0.0.0-ok1

View File

@ -16,7 +16,7 @@
*
*/
#include "closeOrHide.h"
#include "ui_closeOrHide.h"
//#include "ui_closeOrHide.h"
#include "QDebug"
#include <X11/Xlib.h>
#include "xatom-helper.h"
@ -27,79 +27,242 @@
extern void qt_blurImage(QImage &blurImage, qreal radius, bool quality, int transposed);
close_or_hide::close_or_hide(QWidget *parent) :
QDialog(parent),
ui(new Ui::close_or_hide)
QDialog(parent)
{
ui->setupUi(this);
ui->surebtn->setText("");
ui->cancelbtn->setText("");
// ui->setupUi(this);
setupUi(this);
iniframe();
// ui->surebtn->setText("");
// ui->cancelbtn->setText("");
// this->setProperty("blurRegion", QRegion(QRect(1, 1, 1, 1)));
// setAttribute(Qt::WA_TranslucentBackground);
// this->setWindowFlags(Qt::FramelessWindowHint | Qt::Dialog);
ui->backrunRadio->setChecked(1);
backrunRadio->setChecked(1);
// 添加窗管协议
// 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);
ui->closeInfoLabel->setAlignment(Qt::AlignTop);
closeInfoLabel->setText(tr("Please select the state after closing:"));
closeInfoLabel->setWordWrap(true);
closeInfoLabel->setAlignment(Qt::AlignTop);
//调色板
QPalette palette = ui->surebtn->palette();
QPalette palette = surebtn->palette();
palette.setColor(QPalette::Button,QColor(61,107,229,255));
palette.setBrush(QPalette::ButtonText, QBrush(Qt::white));
//保留按钮
ui->surebtn->setPalette(palette);
surebtn->setPalette(palette);
//退出按钮
QPalette palette1 = ui->closebtn->palette();
QPalette palette1 = closebtn->palette();
QColor ColorPlaceholderText1(255,255,255,0);
QBrush brush;
brush.setColor(ColorPlaceholderText1);
palette.setBrush(QPalette::Button, brush);
ui->closebtn->setPalette(palette1);
closebtn->setPalette(palette1);
closebtn->setIcon(QIcon::fromTheme("window-close-symbolic"));
closebtn->setProperty("isWindowButton", 0x2);
closebtn->setProperty("useIconHighlightEffect", 0x8);
closebtn->setFlat(true);
ui->closebtn->setIcon(QIcon::fromTheme("window-close-symbolic"));
ui->closebtn->setProperty("isWindowButton", 0x2);
ui->closebtn->setProperty("useIconHighlightEffect", 0x8);
ui->closebtn->setFlat(true);
// 主题框架1.0.6-5kylin2
//配置重要按钮
ui->surebtn->setProperty("isImportant", true);
ui->cancelbtn->setProperty("useButtonPalette", true);
surebtn->setProperty("isImportant", true);
cancelbtn->setProperty("useButtonPalette", true);
//关闭按钮去掉聚焦状态
ui->closebtn->setFocusPolicy(Qt::NoFocus);
closebtn->setFocusPolicy(Qt::NoFocus);
//按钮文本居中显示避免使用stylesheet添加label于pushbutton上
QLabel *sureLabel = new QLabel();
sureLabel->setText(tr("sure"));
sureLabel->adjustSize();
QHBoxLayout *myLayout = new QHBoxLayout(ui->surebtn);
QHBoxLayout *myLayout = new QHBoxLayout(surebtn);
myLayout->addWidget(sureLabel);
myLayout->setContentsMargins(0,2,0,4);
myLayout->setAlignment(Qt::AlignHCenter);
ui->surebtn->setLayout(myLayout);
surebtn->setLayout(myLayout);
QLabel *cancelLabel = new QLabel();
cancelLabel->setText(tr("cancel"));
cancelLabel->adjustSize();
QHBoxLayout *myLayout1 = new QHBoxLayout(ui->cancelbtn);
QHBoxLayout *myLayout1 = new QHBoxLayout(cancelbtn);
myLayout1->addWidget(cancelLabel);
myLayout1->setContentsMargins(0,2,0,4);
myLayout1->setAlignment(Qt::AlignHCenter);
ui->cancelbtn->setLayout(myLayout1);
cancelbtn->setLayout(myLayout1);
ui->questionIconLabel->setPixmap(QIcon::fromTheme("dialog-question").pixmap(24,24));
questionIconLabel->setPixmap(QIcon::fromTheme("dialog-question").pixmap(24,24));
connect(closebtn,SIGNAL(clicked()),this,SLOT(on_closebtn_clicked()));
connect(surebtn,SIGNAL(clicked()),this,SLOT(on_surebtn_clicked()));
connect(cancelbtn,SIGNAL(clicked()),this,SLOT(on_cancelbtn_clicked()));
settingsStyle();
bool onTablet = GsettingSubject::getInstance()->getOnTablet();
updatePosition(onTablet);
}
close_or_hide::~close_or_hide()
{
delete ui;
// delete ui;
}
void close_or_hide::setupUi(QDialog *close_or_hide)
{
if (close_or_hide->objectName().isEmpty())
close_or_hide->setObjectName(QString::fromUtf8("close_or_hide"));
close_or_hide->resize(350, 174);
retranslateUi(close_or_hide);
QMetaObject::connectSlotsByName(close_or_hide);
} // setupUi
void close_or_hide::retranslateUi(QDialog *close_or_hide)
{
close_or_hide->setWindowTitle(QApplication::translate("close_or_hide", "Dialog", nullptr));
} // retranslateUi
void close_or_hide::iniframe()
{
widget = new QWidget(this);
QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
sizePolicy.setHorizontalStretch(0);
sizePolicy.setVerticalStretch(0);
sizePolicy.setHeightForWidth(widget->sizePolicy().hasHeightForWidth());
widget->setSizePolicy(sizePolicy);
verticalLayoutWidget = new QWidget(widget);
horizontalLayout = new QHBoxLayout(verticalLayoutWidget);
closebtn = new QPushButton(verticalLayoutWidget);
horizontalLayout->addWidget(closebtn);
verticalLayoutWidget_2 = new QWidget(widget);
horizontalLayout_2 = new QHBoxLayout(verticalLayoutWidget_2);
horizontalLayout_2->setSpacing(0);
horizontalLayout_2->setContentsMargins(0, 0, 0, 0);
horizontalSpacer = new QSpacerItem(57, 20, QSizePolicy::Fixed, QSizePolicy::Minimum);
horizontalLayout_2->addItem(horizontalSpacer);
backrunRadio = new QRadioButton(verticalLayoutWidget_2);
QSizePolicy sizePolicy1(QSizePolicy::Maximum, QSizePolicy::Fixed);
sizePolicy1.setHorizontalStretch(0);
sizePolicy1.setVerticalStretch(0);
sizePolicy1.setHeightForWidth(backrunRadio->sizePolicy().hasHeightForWidth());
backrunRadio->setSizePolicy(sizePolicy1);
QFont font;
font.setPointSize(11);
backrunRadio->setFont(font);
backrunRadio->setText(tr(" backstage"));
horizontalLayout_2->addWidget(backrunRadio);
horizontalSpacer_3 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
horizontalLayout_2->addItem(horizontalSpacer_3);
exitRadio = new QRadioButton(verticalLayoutWidget_2);
sizePolicy1.setHeightForWidth(exitRadio->sizePolicy().hasHeightForWidth());
exitRadio->setSizePolicy(sizePolicy1);
exitRadio->setMinimumSize(QSize(120, 0));
exitRadio->setMaximumSize(QSize(120, 16777215));
exitRadio->setFont(font);
exitRadio->setText(tr(" Exit program"));
horizontalLayout_2->addWidget(exitRadio);
horizontalSpacer_2 = new QSpacerItem(80, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
horizontalLayout_2->addItem(horizontalSpacer_2);
widget_2 = new QWidget(widget);
QSizePolicy sizePolicy2(QSizePolicy::Minimum, QSizePolicy::Minimum);
sizePolicy2.setHorizontalStretch(0);
sizePolicy2.setVerticalStretch(0);
sizePolicy2.setHeightForWidth(widget_2->sizePolicy().hasHeightForWidth());
widget_2->setSizePolicy(sizePolicy2);
horizontalLayout_3 = new QHBoxLayout(widget_2);
horizontalLayout_3->setSpacing(0);
horizontalLayout_3->setContentsMargins(0, 0, 0, 0);
horizontalSpacer_4 = new QSpacerItem(156, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
horizontalLayout_3->addItem(horizontalSpacer_4);
cancelbtn = new QPushButton(widget_2);
cancelbtn->setFont(font);
horizontalLayout_3->addWidget(cancelbtn);
horizontalSpacer_5 = new QSpacerItem(10, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
horizontalLayout_3->addItem(horizontalSpacer_5);
surebtn = new QPushButton(widget_2);
surebtn->setFont(font);
horizontalLayout_3->addWidget(surebtn);
horizontalSpacer_6 = new QSpacerItem(24, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
horizontalLayout_3->addItem(horizontalSpacer_6);
widget_3 = new QWidget(widget);
horizontalLayout_4 = new QHBoxLayout(widget_3);
horizontalLayout_4->setSpacing(0);
horizontalLayout_4->setContentsMargins(0, 0, 0, 0);
horizontalSpacer_7 = new QSpacerItem(24, 20, QSizePolicy::Fixed, QSizePolicy::Minimum);
horizontalLayout_4->addItem(horizontalSpacer_7);
questionIconLabel = new QLabel(widget_3);
questionIconLabel->setFixedSize(24,24);
horizontalLayout_4->addWidget(questionIconLabel, 0, Qt::AlignVCenter);
closeInfoLabel = new QLabel(widget_3);
closeInfoLabel->setFont(font);
closeInfoLabel->setMargin(0);
horizontalLayout_4->addWidget(closeInfoLabel, 0, Qt::AlignVCenter);
}
void close_or_hide::updatePosition(bool onTablet)
{
if(onTablet){
this->setFixedSize(350,214);
widget->setGeometry(QRect(0, 0, 350, 214));
verticalLayoutWidget->setGeometry(QRect(290, 0, 61, 57));
horizontalLayout->setContentsMargins(5, 8, 8, 0);
closebtn->setFixedSize(48,48);
verticalLayoutWidget_2->setGeometry(QRect(0, 90, 351, 40));
backrunRadio->setIconSize(QSize(16, 16));
exitRadio->setIconSize(QSize(16, 16));
widget_2->setGeometry(QRect(0, 138, 351, 60));
horizontalSpacer_4->changeSize(150,20);
cancelbtn->setFixedSize(80,48);
surebtn->setFixedSize(80,48);
widget_3->setGeometry(QRect(0, 50, 351, 41));
}else{
this->setFixedSize(350,174);
widget->setGeometry(QRect(0, 0, 350, 174));
verticalLayoutWidget->setGeometry(QRect(310, 0, 40, 36));
horizontalLayout->setContentsMargins(5, 5, 5, 0);
closebtn->setFixedSize(30,30);
verticalLayoutWidget_2->setGeometry(QRect(0, 60, 351, 40));
backrunRadio->setIconSize(QSize(14, 14));
exitRadio->setIconSize(QSize(14, 14));
widget_2->setGeometry(QRect(0, 120, 351, 31));
horizontalSpacer_4->changeSize(156,20);
cancelbtn->setFixedSize(80,30);
surebtn->setFixedSize(80,30);
widget_3->setGeometry(QRect(0, 20, 351, 41));
}
}
void close_or_hide::on_closebtn_clicked()
@ -110,7 +273,7 @@ void close_or_hide::on_closebtn_clicked()
void close_or_hide::on_surebtn_clicked()
{
if(ui->backrunRadio->isChecked()==true){
if(backrunRadio->isChecked()==true){
this->hide();
close_flag = 1;
}else{
@ -128,8 +291,12 @@ void close_or_hide::settingsStyle()
{
GsettingSubject * subject = GsettingSubject::getInstance();
connect(subject,&GsettingSubject::iconChnaged, this,[=](){
ui->questionIconLabel->setPixmap(QIcon::fromTheme("dialog-question").pixmap(24,24));
questionIconLabel->setPixmap(QIcon::fromTheme("dialog-question").pixmap(24,24));
});
connect(subject,&GsettingSubject::tabletModeChange, this,[=](bool currentTablet){
updatePosition(currentTablet);
});
subject->iniTabletMode();
}
void close_or_hide::paintEvent(QPaintEvent *event)

View File

@ -24,7 +24,9 @@
#include <QPainterPath>
#include <QMouseEvent>
#include <QGSettings/qgsettings.h>
#include <QBoxLayout>
#include <QLabel>
#include <QRadioButton>
namespace Ui {
class close_or_hide;
@ -37,6 +39,34 @@ class close_or_hide : public QDialog
public:
explicit close_or_hide(QWidget *parent = nullptr);
~close_or_hide();
void setupUi(QDialog *close_or_hide);
void retranslateUi(QDialog *close_or_hide);
void iniframe();
QWidget *widget;
QWidget *verticalLayoutWidget;
QHBoxLayout *horizontalLayout;
QPushButton *closebtn;
QWidget *verticalLayoutWidget_2;
QHBoxLayout *horizontalLayout_2;
QSpacerItem *horizontalSpacer;
QRadioButton *backrunRadio;
QSpacerItem *horizontalSpacer_3;
QRadioButton *exitRadio;
QSpacerItem *horizontalSpacer_2;
QWidget *widget_2;
QHBoxLayout *horizontalLayout_3;
QSpacerItem *horizontalSpacer_4;
QPushButton *cancelbtn;
QSpacerItem *horizontalSpacer_5;
QPushButton *surebtn;
QSpacerItem *horizontalSpacer_6;
QWidget *widget_3;
QHBoxLayout *horizontalLayout_4;
QSpacerItem *horizontalSpacer_7;
QLabel *questionIconLabel;
QLabel *closeInfoLabel;
void updatePosition(bool onTablet);
//绘制底部阴影
// Draw bottom shadow

View File

@ -24,7 +24,7 @@
CommonToolTip::CommonToolTip(QWidget *parent) : QDialog(parent)
{
this->setFixedSize(155,50);
// this->setFixedSize(155,50);
this->setAttribute(Qt::WA_TranslucentBackground);//设置窗口背景透明
this->setWindowFlags(Qt::FramelessWindowHint|Qt::ToolTip); //设置无边框窗口
setRoundStyle();

View File

@ -114,6 +114,20 @@ void MMediaPlayer::pause()
}
}
void MMediaPlayer::pauseOnly()
{
// 获得mpv播放器的"暂停"状态
QString pasued = getProperty("pause");
KyInfo() << "pauseStated = " << pasued;
// 根据"暂停"状态来选择暂停还是播放
if(pasued == "no") {
KyInfo() << "begin pause.";
setProperty("pause", "yes");
changeState(PausedState);
}
}
void MMediaPlayer::stop()
{
setProperty("pause", "no");

View File

@ -35,6 +35,7 @@ public:
void setPlaylist(MMediaPlaylist *playlist); //设置播放列表
void pause(); //暂停或继续
void pauseOnly(); // 暂停
State state() const; //获取状态
qint64 position() const; //获取当前播放点

16
debian/changelog vendored
View File

@ -1,3 +1,19 @@
ukui-clock (4.0.0.0-ok1) v101; urgency=medium
[ BUG 号 ]
* Closes: #
-
[ 任务号]
-
[ 需求号]
-
[ 其他改动说明 ]
- 同步tablet代码,打4.0tag
[ 影响域 ]
* 应用本身
-- zhoudisi <zhoudisi@kylinos.cn> Sat, 08 Apr 2023 20:15:03 +0800
ukui-clock (3.2.2.0.0k0-0k0.2) v101; urgency=medium
[ BUG 号 ]

View File

@ -77,8 +77,11 @@ void GsettingSubject::iniConnection()
if (m_statusManagerInterface->isValid()){
QObject::connect(m_statusManagerInterface, SIGNAL(mode_change_signal(bool)),
this, SLOT(emitTabletModeChange(bool)));
QObject::connect(m_statusManagerInterface, SIGNAL(rotations_change_signal(QString)),
this, SLOT(emitTabletRotationChange(QString)));
QObject::connect(m_statusManagerInterface, SIGNAL(modemonitor_change_signal(bool)),
this, SLOT(emitTabletAutoRotationChange(bool)));
}
}
void GsettingSubject::iniData()
@ -123,6 +126,22 @@ bool GsettingSubject::getOnTablet() const
return onTablet;
}
bool GsettingSubject::getRotations() const
{
return m_rotations;
}
bool GsettingSubject::getAutoRotations() const
{
return m_autoRotation;
}
void GsettingSubject::setRotations(bool rotations)
{
m_rotations = rotations;
}
/**
* @brief
*/
@ -165,7 +184,7 @@ void GsettingSubject::iniFontSize()
void GsettingSubject::iniTabletMode()
{
if(m_statusManagerInterface==nullptr){
qDebug()<<"dbq-空指针";
qDebug()<<"zds-空指针";
}else{
if(m_statusManagerInterface->isValid()){
QDBusReply<bool> reply = m_statusManagerInterface->call("get_current_tabletmode");
@ -179,6 +198,40 @@ void GsettingSubject::iniTabletMode()
}
}
void GsettingSubject::iniRotations()
{
if(m_statusManagerInterface==nullptr){
qDebug()<<"zds-空指针";
}else{
if(m_statusManagerInterface->isValid()){
QDBusReply<QString> rotationReply = m_statusManagerInterface->call("get_current_rotation");
if (rotationReply.isValid()){
QString value = rotationReply.value();
emitTabletRotationChange(value);
}else{
qCritical() << "get_current_rotation called failed! 获取模式失败";
}
}
}
}
void GsettingSubject::iniAutoRotations()
{
if(m_statusManagerInterface==nullptr){
qDebug()<<"zds-空指针";
}else{
if(m_statusManagerInterface->isValid()){
QDBusReply<bool> autoRotationReply = m_statusManagerInterface->call("get_auto_rotation");
if (autoRotationReply.isValid()){
bool value = autoRotationReply.value();
emitTabletAutoRotationChange(value);
}else{
qCritical() << "get_auto_rotation called failed! 获取模式失败";
}
}
}
}
void GsettingSubject::iniMouseWheel()
{
if(m_mouseSettings!=nullptr){
@ -226,9 +279,25 @@ void GsettingSubject::emitScreenSaveUnlock()
void GsettingSubject::emitTabletModeChange(bool currentTablet)
{
qDebug()<<"zds-emitTabletModeChange";
onTablet = currentTablet;
emit tabletModeChange(currentTablet);
if(onTablet!=currentTablet){
onTablet = currentTablet;
emit tabletModeChange(currentTablet);
}
}
void GsettingSubject::emitTabletRotationChange(QString currentRotation)
{
if(currentRotation == "left" ||currentRotation == "right"){
m_rotations = true;
}else{
m_rotations = false;
}
emit tabletRotationChange(m_rotations);
}
void GsettingSubject::emitTabletAutoRotationChange(bool autoRotaiton)
{
m_autoRotation = autoRotaiton;
}
GsettingSubject::~GsettingSubject()

View File

@ -34,6 +34,8 @@ public:
void iniTimeZone();
void iniFontSize();
void iniTabletMode();
void iniRotations();
void iniAutoRotations();
~GsettingSubject();
GsettingSubject(const GsettingSubject&)=delete;
GsettingSubject& operator=(const GsettingSubject&)=delete;
@ -45,6 +47,9 @@ public:
void iniScreenSaveState();
bool getScreenSaveOn() const;
bool getOnTablet() const;
bool getRotations() const;
bool getAutoRotations() const;
void setRotations(bool rotations);
signals:
void blackStyle();
void whiteStyle();
@ -61,6 +66,8 @@ private slots:
void emitScreenSaveLock();
void emitScreenSaveUnlock();
void emitTabletModeChange(bool currentTablet);
void emitTabletRotationChange(QString currentRotation);
void emitTabletAutoRotationChange(bool autoRotaiton);
private:
static void iniConnect();
void iniConnection();
@ -73,6 +80,8 @@ private:
QDBusInterface *m_screenSaveIface = nullptr;
QDBusInterface *m_statusManagerInterface = nullptr;
bool onTablet = false;
bool m_rotations = false;
bool m_autoRotation = false;
bool m_screenSaveOn = false;
explicit GsettingSubject(QObject *parent = nullptr);
void getWheelSpeed();

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 719 B

BIN
guide/en_US/image/main.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 235 B

BIN
guide/en_US/image/menu.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
guide/en_US/image/mini.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 432 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 546 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

View File

@ -10,11 +10,44 @@
![](image/1.png)
In the alarm clock interface, click **"add"** to add an alarm clock and set the time, alarm name, repeating day, ring tone and later reminder time.
![](image/2.png)
Click ![](image/mute.png) You can set alarm mute.
Click ![](image/menu.png) You can open the alarm menu bar. After selecting "setting" in the menu bar, a setting window will pop up. In the alarm menu bar, select **"help"** to automatically jump to the user's manual and view the operating instructions of the tool. Select **"about"** to view the current version information, and **"exit"** to close the application.
## Alarm
In the alarm clock interface, click **"add"** to add an alarm clock and set the time, alarm name, repeating day, ring tone and later reminder time.
![](image/2.png)
Double-click the alarm clock to enter the editing alarm interface. Or right-click the alarm and select **"edit"** or **"delete"** the alarm.
## Count Down
In the countdown setting screen, you can set the time and bell. Time settings can scroll through the dial settings or double-click to enter the number settings.
![](image/countdown_set.png)
Click **"start"** to enter the countdown running interface, and the large scroll dial shows the estimated ringing time and remaining time.
Click the mini window button ![](image/mini.png)to hide the alarm clock and show the mini window.
In the mini window, click the Main Window button ![](image/main.png) to return to the alarm clock countdown running interface.
Click **"suspend"** to pause the timer.
Click **"End"** to end the timer and return to the countdown setting interface.
## Watch
The stopwatch can be timed and counted.
![](image/stopwatch.png)
Click **"start"** to start the timer.
Click **"count"** to record the counting and counting interval time, and the timing will not be interrupted. Labels ![](image/longest.png)![](image/shortest.png)indicate the longest and shortest interval records, respectively.
Click **"suspend"** to record the final time.
Click **"reset"** to clear the stopwatch.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 962 B

BIN
guide/zh_CN/image/main.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 235 B

BIN
guide/zh_CN/image/menu.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
guide/zh_CN/image/mini.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 432 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 952 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

View File

@ -10,12 +10,46 @@
![](image/1.png)
在闹钟界面中,点击**“添加”**可添加闹钟,并设定时间、闹钟名、重复日、铃声及稍后提醒时间。
![](image/2.png)
点击导航栏中的![](image/mute.png)(静音按钮),可以设置静音。
点击导航栏中的![](image/menu.png)可打开闹钟菜单栏,选择**“帮助”**将自动跳转至用户手册中,可查看该工具的操作说明。选择**“关于”**可查看当前版本信息,选择**“退出”**可关闭应用。
## 闹钟
在闹钟界面中,点击**“添加”**可添加闹钟,并设定时间、闹钟名、重复日、铃声及稍后提醒时间。
![](image/2.png)
双击闹钟,可进入编辑闹钟界面。或者右键点击闹钟,可选择**“编辑”**或者**“删除”**该闹钟。
## 倒计时
在倒计时设置界面中,可设定时间和铃声。时间设定可滚动数字盘设置,也可以双击输入数字设定。
![](image/countdown_set.png)
点击**“开始”**进入倒计时运行界面,大滚动盘中显示预计响铃时间和剩余时间。
点击迷你窗口按钮![](image/mini.png),隐藏闹钟应用,显示迷你窗口。
在迷你窗口中,点击主窗口按钮![](image/main.png),可回到闹钟倒计时运行界面。
点击**“暂停”**,计时暂停。
点击**“结束”**,计时结束并回到倒计时设置界面。
## 秒表
秒表可以计时和计次。
![](image/stopwatch.png)
点击**“开始”**即开始计时。
点击**“计次”**可记录计次、计次间隔时间,计时不中断。标签![](image/longest.png) ![](image/shortest.png)分别表示最长和最短的间隔时间记录。
点击**“暂停”**可记录最终时间。
点击**“复位”**,清除秒表。

View File

@ -26,22 +26,19 @@ item_new::item_new(QWidget *parent) :
QWidget(parent)
{
setupUi(this);
this->setFixedSize(340, 108);
// this->setFixedSize(340, 108);
m_selectBtnUtil = new SelectBtnUtil();
alarmLabel_w0 = new QLabel(this);//闹钟用途//Alarm function
alarmLabel_w0->move(27 ,6);
alarmLabel_w0->setFixedSize(200, 25);
alarmLabel_w0->setText("闹钟");
alarmLabel_s0 = new QLabel( this);//闹钟重复//Repetition of alarm clock
alarmLabel_s0->move(27, 74);
alarmLabel_s0->setFixedSize(270, 23);
alarmLabel_s0->setText("工作日");
alarmLabel_s0->setVisible(true);
alarmLabel0 = new QLabel(this);//闹钟//Alarm clock
// alarmLabel0->move(25,24);
alarmLabel0->setFixedSize(125, 56);
alarmLabel0->setText("00:00");
alarmLabel0->setVisible(true);
@ -49,11 +46,10 @@ item_new::item_new(QWidget *parent) :
alarmLabel1 = new QLabel(this);//上下午//Last afternoon
// alarmLabel1->move(155,22);
alarmLabel1->setFixedSize(36, 56);
// alarmLabel1->setFixedSize(36, 56);
QFont f;
f.setPixelSize(18);
alarmLabel1->setFont(f);
// alarmLabel1->setStyleSheet("font: 10pt;background-color: rgb();");
alarmLabel1->setText("上午");
alarmLabel1->setVisible(true);
@ -61,11 +57,13 @@ item_new::item_new(QWidget *parent) :
updateLabelStyle();
alarm_on_off0 = new KSwitchButton(this);//闹钟开关// Alarm switch
alarm_on_off0->move(263,43);
alarm_on_off0->setFixedSize(50,24);
alarm_on_off0->setFlat(true);
alarm_on_off0->setVisible(true);
settingsStyle();
bool onTablet = GsettingSubject::getInstance()->getOnTablet();
updatePosition(onTablet);
}
item_new::~item_new()
@ -101,7 +99,11 @@ void item_new::settingsStyle()
connect(subject,&GsettingSubject::whiteStyle, this,[=](){
this->whiteStyle();
});
connect(subject,&GsettingSubject::tabletModeChange, this,[=](bool currentTablet){
updatePosition(currentTablet);
});
subject->iniWidgetStyle();
subject->iniTabletMode();
}
@ -169,15 +171,35 @@ void item_new::updateLabelStyle()
QByteArray output = process.readAllStandardOutput();
QString str_output = output;
if (str_output.compare("'24'\n") == 0) {
alarmLabel0->move(28,24);
alarmLabel0->move(25,50);
alarmLabel1->move(134,30);
} else {
if(localeNum==1||localeNum==2){
alarmLabel0->move(70,24);
alarmLabel1->move(28,30);
alarmLabel0->move(70,50);
alarmLabel1->move(28,56);
}else{
alarmLabel0->move(28,24);
alarmLabel1->move(134,30);
alarmLabel0->move(25,50);
alarmLabel1->move(134,56);
}
}
}
void item_new::updatePosition(bool onTbalet)
{
if(onTbalet){
this->setFixedSize(340, 160);
alarmLabel_w0->move(27 ,16);
alarmLabel_s0->move(27, 118);
alarmLabel_s0->move(27, 118);
alarmLabel0->move(25,52);
alarmLabel1->setFixedSize(36, 56);
alarm_on_off0->move(277,43);
}else{
this->setFixedSize(340, 108);
alarmLabel_w0->move(27 ,6);
alarmLabel_s0->move(27, 74);
alarmLabel0->move(25,24);
alarmLabel1->move(155,22);
alarm_on_off0->move(263,43);
}
}

View File

@ -84,6 +84,7 @@ private:
bool m_itemClose = false;
SelectBtnUtil * m_selectBtnUtil = nullptr;
void updateLabelStyle();
void updatePosition(bool onTbalet);
};
#endif // ITEM_NEW_H

View File

@ -139,7 +139,7 @@ void Natice_alarm::callNotice()
m_noticeInfo = m_timeEndInfo+" "+m_autoCloseTime;
qDebug()<<"dbq-m_noticeInfo"<<m_noticeInfo<<m_noticeId;
QMap<QString, QVariant> hints;
args<<"Alarm"+m_clockId //应用名
args<<QString(tr("Alarm")) //应用名
<<(unsigned int)m_noticeId //替换通知ID,不替换通知的话填0。 例如该字段是5如果通知中存在ID = 5的弹窗则ID=5的通知内容将替换成这条通知的内容。
<<QString("kylin-alarm-clock") //图标
<<QString(tr("Alarm")) //主题
@ -158,12 +158,25 @@ void Natice_alarm::callNotice()
QDBusConnection::sessionBus().connect("org.freedesktop.Notifications","/org/freedesktop/Notifications",
"org.freedesktop.Notifications","NotificationClosed",
this,SLOT(StopSendnotify(uint,uint)));
QDBusConnection::sessionBus().connect("org.freedesktop.Notifications","/org/freedesktop/Notifications",
"org.freedesktop.Notifications","ActionInvoked",
this,SLOT(showAgainnotify(uint,QString)));
model_setup->select();
int muteOn = model_setup->index(0, 0).data().toInt();
if(m_noticeId == 0){
if(m_musicPlayer->state()!= MMediaPlayer::State::PausedState){
m_musicPlayer->pause();
if(m_musicPlayer->state() != MMediaPlayer::State::StoppedState){
m_musicPlayer->stop();
}
}else{
m_musicPlayer->pause();
if(muteOn){
if(m_musicPlayer->state() == MMediaPlayer::State::PlayingState){
m_musicPlayer->pause();
}
}else{
if(m_musicPlayer->state() != MMediaPlayer::State::PlayingState){
m_musicPlayer->play();
}
}
}
}
void Natice_alarm::StopSendnotify(uint id, uint closeReson)
@ -175,6 +188,15 @@ void Natice_alarm::StopSendnotify(uint id, uint closeReson)
}
}
void Natice_alarm::showAgainnotify(uint id, QString actionKey)
{
qDebug()<<"zds-id"<<id<<"actionKey"<<actionKey;
if(id==m_noticeId&&actionKey == "noticeShowAgain"){
qDebug()<<"通知稍后提醒"<<id;
show_again();
}
}
//关闭某条通知
void Natice_alarm::closeNotice()
{
@ -216,8 +238,12 @@ void Natice_alarm::refreshMusic()
m_musicPlayer->play();
m_musicPlayer->pause();
}else{
m_musicPlayer->setVolume( 100 );
m_musicPlayer->play();
if(m_noticeId == 0){
m_musicPlayer->stop();
}else{
m_musicPlayer->setVolume( 100 );
m_musicPlayer->play();
}
}
}
}

View File

@ -72,6 +72,7 @@ public:
};
void closeNotice();
uint m_noticeId = 0;
protected:
private slots:
@ -82,6 +83,7 @@ private slots:
//响铃 Ring a bell
void ring();
void StopSendnotify(uint id, uint closeReson);
void showAgainnotify(uint id, QString actionKey);
private:
void natice_init();
@ -95,7 +97,7 @@ private:
QSqlTableModel *model_clock;
SelectBtnUtil * m_selectBtnUtil = nullptr;
int getRemindStatusByName(QString name);
uint m_noticeId = 0;
// uint m_noticeId = 0;
QString m_timeEndInfo;
QString m_autoCloseTime;
QString m_noticeInfo;

View File

@ -164,14 +164,27 @@ void QRoundProgressBar::paintEvent(QPaintEvent* /*event*/)
painter.setBrush(mainColor);
//在指定的boundingRectangle中创建一个椭圆并将其作为封闭的子路径添加到painter路径。
QPainterPath bigCircle;
bigCircle.addEllipse(65, 13, 266, 266);
int px = 0;
int py = 0;
int ra = 266;
bool onTablet = GsettingSubject::getInstance()->getOnTablet();
if(onTablet){
px = 147;
py = 147;
ra = 560;
}else{
px = 0;
py = 0;
ra = 266;
}
bigCircle.addEllipse(65, 13, ra, ra);
QPainterPath path = bigCircle ;
painter.drawPath(path);
//保存当前的画家状态(将状态推送到堆栈上)。 在save之后必须有一个相应的restore end函数展开堆栈。
painter.restore();
double outerRadius = 133;
QRectF baseRect(198 - outerRadius, 146 - outerRadius, outerRadius * 2, outerRadius * 2);
double outerRadius = ra/2;
QRectF baseRect(198+px - outerRadius, 146+py - outerRadius, outerRadius * 2, outerRadius * 2);
QPainter p(this);
//表示引擎应尽可能对图元的边缘进行抗锯齿。
p.setRenderHint(QPainter::Antialiasing);
@ -179,9 +192,8 @@ void QRoundProgressBar::paintEvent(QPaintEvent* /*event*/)
rebuildDataBrushIfNeeded();
// background
drawBackground(p, rect());
double innerRadius = 133;
QRectF innerRect = QRectF((198 - outerRadius) + 5, (146 - outerRadius) + 5, (outerRadius - 5) * 2 , (outerRadius - 5) * 2 );
double innerRadius = ra/2;
QRectF innerRect = QRectF((198+px - outerRadius) + 5, (146+py - outerRadius) + 5, (outerRadius - 5) * 2 , (outerRadius - 5) * 2 );
//calculateInnerRect(baseRect, outerRadius, innerRect, innerRadius);
double arcStep = 360.0 / (m_max - m_min) * m_value;
// base circle

View File

@ -23,21 +23,18 @@ stopwatch_item::stopwatch_item(QWidget *parent) :
QWidget(parent)
{
setupUi(this);
this->setFixedSize(356, 58);
// this->setFixedSize(356, 58);
stopwatch1 = new QLabel(this);//计次
stopwatch1->move(13, 11);
stopwatch1->setFixedSize(100, 17);
stopwatch1->setText("计次");
stopwatch2 = new QLabel( this);//间隔
stopwatch2->move(13, 32);
stopwatch2->setFixedSize(138, 19);
stopwatch2->setText("工作日");
stopwatch2->setVisible(true);
stopwatch3 = new QLabel(this);//记次时间
stopwatch3->move(183,13);
stopwatch3->setFixedSize(145, 54);
stopwatch3->setStyleSheet("font-size:24px;");
stopwatch3->setAlignment(Qt::AlignRight);
@ -45,13 +42,14 @@ stopwatch_item::stopwatch_item(QWidget *parent) :
stopwatch3->setVisible(true);
tipLabel = new QLabel(this);//最长最短标记
tipLabel->move(150,30);
tipLabel->setFixedSize(32, 20);
tipLabel->setAlignment(Qt::AlignCenter);
tipLabel->setText(tr("max"));
tipLabel->hide();
settingsStyle();
bool onTablet = GsettingSubject::getInstance()->getOnTablet();
updatePosition(onTablet);
}
stopwatch_item::~stopwatch_item()
@ -86,7 +84,11 @@ void stopwatch_item::settingsStyle()
connect(subject,&GsettingSubject::whiteStyle, this,[=](){
this->whiteStyle();
});
connect(subject,&GsettingSubject::tabletModeChange, this,[=](bool currentTablet){
updatePosition(currentTablet);
});
subject->iniWidgetStyle();
subject->iniTabletMode();
}
//黑色主题
@ -125,4 +127,21 @@ void stopwatch_item::updateTipShortestStyle()
tipLabel->show();
}
void stopwatch_item::updatePosition(bool onTbalet)
{
if(onTbalet){
this->setFixedSize(640, 58);
stopwatch1->move(13, 17);
stopwatch2->move(100, 17);
stopwatch3->move(463,13);
tipLabel->move(214,30);
}else{
this->setFixedSize(356, 58);
stopwatch1->move(13, 11);
stopwatch2->move(13, 32);
stopwatch3->move(183,13);
tipLabel->move(150,30);
}
}

View File

@ -54,6 +54,7 @@ public:
private:
Ui::stopwatch_item *ui;
void updatePosition(bool onTbalet);
};
#endif // STOPWATCH_ITEM_H

View File

@ -16,34 +16,51 @@
*
*/
#include "tinycountdown.h"
#include "ui_tinycountdown.h"
//#include "ui_tinycountdown.h"
#include "theme.h"
#include <QBitmap>
#include "utils.h"
extern void qt_blurImage(QImage &blurImage, qreal radius, bool quality, int transposed);
tinyCountdown::tinyCountdown(QWidget *parent) :
QWidget(parent),
ui(new Ui::tinyCountdown)
QWidget(parent)
{
ui->setupUi(this);
setupUi(this);
clockIcon = new QLabel(this);
clockIcon->setFixedSize(24,24);
timeLabel = new QLabel(this);
timeLabel->setAlignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter);
suspendRunBtn = new RoundBtn(this);
suspendRunBtn->setEnabled(true);
finishBtn = new RoundBtn(this);
finishBtn->setEnabled(true);
mainBtn = new QPushButton(this);
mainBtn->setEnabled(true);
closeBtn = new QPushButton(this);
//右上角关闭
closeStyle();
switchStyle();
suspendRunBtnStyle();
finishBtnStyle();
connect(ui->closeBtn, SIGNAL(clicked()), this, SLOT(set_dialog_close()) );
connect(closeBtn, SIGNAL(clicked()), this, SLOT(set_dialog_close()) );
//左上闹钟图标
ui->clockIcon->setPixmap(QIcon::fromTheme("kylin-alarm-clock").pixmap(24,24));
clockIcon->setPixmap(QIcon::fromTheme("kylin-alarm-clock").pixmap(24,24));
//闹钟时间字体改为灰色
QPalette pa;
pa.setColor(QPalette::WindowText,Qt::gray);
//主窗口connect
connect(ui->mainBtn, SIGNAL(clicked()), this, SLOT(showMainWindow()) );
connect(mainBtn, SIGNAL(clicked()), this, SLOT(showMainWindow()) );
//显示,但不可移动
settingsStyle();
updateWidgetRadius();
updateWidgetRadius();
bool onTablet = GsettingSubject::getInstance()->getOnTablet();
updatePosition(onTablet);
}
@ -84,15 +101,32 @@ void tinyCountdown::showThisWindow()
tinyCountdown::~tinyCountdown()
{
delete ui;
// delete ui;
}
void tinyCountdown::setupUi(QWidget *tinyCountdown)
{
if (tinyCountdown->objectName().isEmpty())
tinyCountdown->setObjectName(QString::fromUtf8("tinyCountdown"));
tinyCountdown->resize(320, 50);
retranslateUi(tinyCountdown);
QMetaObject::connectSlotsByName(tinyCountdown);
}// setupUi
void tinyCountdown::retranslateUi(QWidget *tinyCountdown)
{
tinyCountdown->setWindowTitle(QApplication::translate("tinyCountdown", "Form", nullptr));
} // retranslateUi
/**
* @brief
*/
void tinyCountdown::updateTimeInfo(QString str)
{
ui->timeLabel->setText(str);
ui->timeLabel->setAlignment(Qt::AlignVCenter);
timeLabel->setText(str);
timeLabel->setAlignment(Qt::AlignVCenter);
}
@ -209,7 +243,7 @@ void tinyCountdown::paintEvent(QPaintEvent * event)
*/
void tinyCountdown::clearData()
{
ui->timeLabel->setText("00:00:00");
timeLabel->setText("00:00:00");
this->set_dialog_close();
updateOnRunState(true);
}
@ -258,73 +292,78 @@ void tinyCountdown::settingsStyle()
this->whiteStyle();
});
connect(subject,&GsettingSubject::iconChnaged, this,[=](){
ui->clockIcon->setPixmap(QIcon::fromTheme("kylin-alarm-clock").pixmap(24,24));
clockIcon->setPixmap(QIcon::fromTheme("kylin-alarm-clock").pixmap(24,24));
});
connect(subject,&GsettingSubject::tabletModeChange, this,[=](bool currentTablet){
updatePosition(currentTablet);
});
subject->iniWidgetStyle();
subject->iniTabletMode();
}
void tinyCountdown::whiteStyle()
{
ui->mainBtn->setIcon(QIcon(":image/miniIcon/restore_active-w.png"));
mainBtn->setIcon(QIcon(":image/miniIcon/restore_active-w.png"));
finishBtnIcon(0);
suspendRunBtnIcon(0);
}
void tinyCountdown::blackStyle()
{
ui->mainBtn->setIcon(QIcon(":image/miniIcon/restore-active-b.png"));
mainBtn->setIcon(QIcon(":image/miniIcon/restore-active-b.png"));
finishBtnIcon(1);
suspendRunBtnIcon(1);
}
void tinyCountdown::closeStyle()
{
ui->closeBtn->setToolTip(tr("close"));
ui->closeBtn->setIcon(QIcon::fromTheme("window-close-symbolic"));
ui->closeBtn->setProperty("isWindowButton", 0x2);
ui->closeBtn->setProperty("useIconHighlightEffect", 0x8);
ui->closeBtn->setFlat(true);
closeBtn->setToolTip(tr("close"));
closeBtn->setIcon(QIcon::fromTheme("window-close-symbolic"));
closeBtn->setProperty("isWindowButton", 0x2);
closeBtn->setProperty("useIconHighlightEffect", 0x8);
closeBtn->setFlat(true);
}
void tinyCountdown::switchStyle()
{
ui->mainBtn->setToolTip(tr("main window"));
ui->mainBtn->setProperty("useButtonPalette", true);
ui->mainBtn->setIcon(QIcon(":image/miniIcon/restore_active-w.png"));
ui->mainBtn->setIconSize(QSize(24,24));
mainBtn->setToolTip(tr("main window"));
mainBtn->setProperty("useButtonPalette", true);
mainBtn->setIcon(QIcon(":image/miniIcon/restore_active-w.png"));
// mainBtn->setIconSize(QSize(24,24));
//手动改成透明色
Utils::setBtnBackgroundColorTransparent(ui->mainBtn);
Utils::setBtnBackgroundColorTransparent(mainBtn);
}
/**
* @brief
*/
void tinyCountdown::suspendRunBtnStyle()
{
ui->suspendRunBtn->setToolTip(tr("suspend"));
ui->suspendRunBtn->setRadius(14);
ui->suspendRunBtn->setFlag(RoundBtn::ICON_FLAG);
ui->suspendRunBtn->setIconSize(QSize(32,32));
suspendRunBtn->setToolTip(tr("suspend"));
// suspendRunBtn->setRadius(14);
suspendRunBtn->setRadius(28);
suspendRunBtn->setFlag(RoundBtn::ICON_FLAG);
// suspendRunBtn->setIconSize(QSize(32,32));
QColor defaultColor = QColor(0, 0, 0, 0);
ui->suspendRunBtn->setBtnColor(defaultColor,defaultColor,defaultColor);
suspendRunBtn->setBtnColor(defaultColor,defaultColor,defaultColor);
//初始化是运行中
m_onRun = true;
suspendRunBtnIcon(theme::themetype);
connect(ui->suspendRunBtn,&QPushButton::clicked,this,[=](){
connect(suspendRunBtn,&QPushButton::clicked,this,[=](){
m_onRun = !m_onRun;
suspendRunBtnIcon(theme::themetype);
emit suspendClick(m_onRun);
});
}
void tinyCountdown::finishBtnStyle()
{
ui->finishBtn->setToolTip(tr("finish"));
ui->finishBtn->setRadius(12);
ui->finishBtn->setFlag(RoundBtn::ICON_FLAG);
ui->finishBtn->setIconSize(QSize(28,28));
finishBtn->setToolTip(tr("finish"));
// finishBtn->setRadius(12);
finishBtn->setRadius(24);
finishBtn->setFlag(RoundBtn::ICON_FLAG);
// finishBtn->setIconSize(QSize(28,28));
QColor defaultColor = QColor(0, 0, 0, 0);
ui->finishBtn->setBtnColor(defaultColor,defaultColor,defaultColor);
finishBtn->setBtnColor(defaultColor,defaultColor,defaultColor);
finishBtnIcon(theme::themetype);
connect(ui->finishBtn,&QPushButton::clicked,this,[=](){
connect(finishBtn,&QPushButton::clicked,this,[=](){
emit finishClick();
});
@ -333,11 +372,11 @@ void tinyCountdown::finishBtnStyle()
void tinyCountdown::finishBtnIcon(int themeStatus)
{
if(themeStatus==0){
ui->finishBtn->setAllIconPatn(":image/miniIcon/finish-light-normal.png"
finishBtn->setAllIconPatn(":image/miniIcon/finish-light-normal.png"
,":image/miniIcon/finish-light-hover.png"
,":image/miniIcon/finish-light-click.png");
}else{
ui->finishBtn->setAllIconPatn(":image/miniIcon/finish-dark-normal.png"
finishBtn->setAllIconPatn(":image/miniIcon/finish-dark-normal.png"
,":image/miniIcon/finish-dark-hover.png"
,":image/miniIcon/finish-dark-click.png");
}
@ -348,27 +387,72 @@ void tinyCountdown::suspendRunBtnIcon(int themeStatus)
qDebug()<<"dbq-m_onRun"<<m_onRun;
if(m_onRun){
if(themeStatus==0){
ui->suspendRunBtn->setAllIconPatn(":image/miniIcon/suspend-normal-light.png"
suspendRunBtn->setAllIconPatn(":image/miniIcon/suspend-normal-light.png"
,":image/miniIcon/suspend-hover-light.png"
,":image/miniIcon/suspend-click-light.png");
}else{
ui->suspendRunBtn->setAllIconPatn(":image/miniIcon/suspend-normal-dark.png"
suspendRunBtn->setAllIconPatn(":image/miniIcon/suspend-normal-dark.png"
,":image/miniIcon/suspend-hover-dark.png"
,":image/miniIcon/suspend-click-dark.png");
}
}else{
if(themeStatus==0){
ui->suspendRunBtn->setAllIconPatn(":image/miniIcon/start-normal-light.png"
suspendRunBtn->setAllIconPatn(":image/miniIcon/start-normal-light.png"
,":image/miniIcon/start-hover-light.png"
,":image/miniIcon/start-hover-light.png");
}else{
ui->suspendRunBtn->setAllIconPatn(":image/miniIcon/start-normal-dark.png"
suspendRunBtn->setAllIconPatn(":image/miniIcon/start-normal-dark.png"
,":image/miniIcon/start-hover-dark.png"
,":image/miniIcon/start-hover-dark.png");
}
}
}
void tinyCountdown::updatePosition(bool onTbalet)
{
if(onTbalet){
this->setFixedSize(498,80);
clockIcon->move(16,28);
timeLabel->move(52,24);
QFont font;
font.setPointSize(36);
timeLabel->setFont(font);
timeLabel->setFixedSize(200,36);
suspendRunBtn->move(262,12);
suspendRunBtn->setFixedSize(56,56);
suspendRunBtn->setIconSize(QSize(56, 56));
finishBtn->move(331,16);
finishBtn->setFixedSize(48,48);
finishBtn->setIconSize(QSize(48, 48));
mainBtn->move(396,16);
mainBtn->setFixedSize(48,48);
mainBtn->setIconSize(QSize(48, 48));
closeBtn->move(444,16);
closeBtn->setFixedSize(48,48);
closeBtn->setIconSize(QSize(48, 48));
}else{
this->setFixedSize(320,50);
clockIcon->move(20,13);
timeLabel->move(52,9);
QFont font;
font.setPointSize(18);
timeLabel->setFont(font);
timeLabel->setFixedSize(94,32);
suspendRunBtn->move(154,9);
suspendRunBtn->setFixedSize(32,32);
suspendRunBtn->setIconSize(QSize(32, 32));
finishBtn->move(194,11);
finishBtn->setFixedSize(28,28);
finishBtn->setIconSize(QSize(28, 28));
mainBtn->move(248,13);
mainBtn->setFixedSize(24,24);
mainBtn->setIconSize(QSize(16, 16));
closeBtn->move(280,13);
closeBtn->setFixedSize(24,24);
closeBtn->setIconSize(QSize(16, 16));
}
}

View File

@ -31,6 +31,7 @@
#include "gsettingsubject.h"
#include "xatom-helper.h"
#include "commontooltip.h"
#include "roundbtn.h"
namespace Ui {
class tinyCountdown;
}
@ -42,6 +43,15 @@ class tinyCountdown : public QWidget
public:
explicit tinyCountdown(QWidget *parent = nullptr);
~tinyCountdown();
void setupUi(QWidget *tinyCountdown);
void retranslateUi(QWidget *tinyCountdown);
QLabel *clockIcon;
QPushButton *closeBtn;
RoundBtn *finishBtn;
QPushButton *mainBtn;
RoundBtn *suspendRunBtn;
QLabel *timeLabel;
void updateTimeInfo(QString str);
#ifdef onTooltip
void mousePressEvent(QMouseEvent *event) override;
@ -90,6 +100,7 @@ private:
void finishBtnIcon(int themeStatus);
void suspendRunBtnIcon(int themeStatus);
bool m_onRun = false;
void updatePosition(bool onTbalet);
};
#endif // TINYCOUNTDOWN_H

Binary file not shown.

View File

@ -79,12 +79,12 @@
<translation type="vanished"></translation>
</message>
<message>
<location filename="../clock.ui" line="239"/>
<location filename="../clock.ui" line="363"/>
<location filename="../clock.cpp" line="1060"/>
<location filename="../clock.cpp" line="1165"/>
<location filename="../clock.cpp" line="2954"/>
<location filename="../clock.cpp" line="3310"/>
<location filename="../clock.cpp" line="495"/>
<location filename="../clock.cpp" line="502"/>
<location filename="../clock.cpp" line="524"/>
<location filename="../clock.cpp" line="1534"/>
<location filename="../clock.cpp" line="1640"/>
<location filename="../clock.cpp" line="3556"/>
<source>start</source>
<translatorcomment></translatorcomment>
<translation></translation>
@ -113,10 +113,10 @@
<translation type="vanished">60</translation>
</message>
<message>
<location filename="../clock.ui" line="261"/>
<location filename="../clock.cpp" line="939"/>
<location filename="../clock.cpp" line="2959"/>
<location filename="../clock.cpp" line="3209"/>
<location filename="../clock.cpp" line="503"/>
<location filename="../clock.cpp" line="1373"/>
<location filename="../clock.cpp" line="3561"/>
<location filename="../clock.cpp" line="3820"/>
<source>suspend</source>
<translation></translation>
</message>
@ -125,16 +125,15 @@
<translation type="vanished"></translation>
</message>
<message>
<location filename="../clock.ui" line="290"/>
<location filename="../clock.cpp" line="510"/>
<source>add</source>
<translatorcomment></translatorcomment>
<translation></translation>
</message>
<message>
<location filename="../clock.ui" line="336"/>
<source>no alarm</source>
<translatorcomment></translatorcomment>
<translation></translation>
<translation type="vanished"></translation>
</message>
<message>
<source>delete</source>
@ -142,7 +141,7 @@
<translation type="vanished"></translation>
</message>
<message>
<location filename="../clock.ui" line="496"/>
<location filename="../clock.cpp" line="528"/>
<source>save</source>
<translatorcomment></translatorcomment>
<translation></translation>
@ -152,10 +151,9 @@
<translation type="vanished"></translation>
</message>
<message>
<location filename="../clock.ui" line="192"/>
<location filename="../clock.cpp" line="1879"/>
<location filename="../clock.cpp" line="3081"/>
<location filename="../clock.cpp" line="3183"/>
<location filename="../clock.cpp" line="2446"/>
<location filename="../clock.cpp" line="3692"/>
<location filename="../clock.cpp" line="3794"/>
<source>PM</source>
<translation></translation>
</message>
@ -169,21 +167,21 @@
<translation type="vanished"></translation>
</message>
<message>
<location filename="../clock.cpp" line="983"/>
<location filename="../clock.cpp" line="1418"/>
<source>reset</source>
<translation></translation>
</message>
<message>
<location filename="../clock.ui" line="419"/>
<location filename="../clock.cpp" line="961"/>
<location filename="../clock.cpp" line="1092"/>
<location filename="../clock.cpp" line="523"/>
<location filename="../clock.cpp" line="1395"/>
<location filename="../clock.cpp" line="1567"/>
<source>count</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="135"/>
<location filename="../clock.cpp" line="2795"/>
<location filename="../clock.cpp" line="2872"/>
<location filename="../clock.cpp" line="192"/>
<location filename="../clock.cpp" line="3382"/>
<location filename="../clock.cpp" line="3464"/>
<source>Count down</source>
<translation></translation>
</message>
@ -208,7 +206,7 @@
<translation type="vanished">1243</translation>
</message>
<message>
<location filename="../clock.ui" line="474"/>
<location filename="../clock.cpp" line="527"/>
<source>cancel</source>
<translation></translation>
</message>
@ -221,9 +219,8 @@
<translation type="vanished"> </translation>
</message>
<message>
<location filename="../clock.cpp" line="497"/>
<source> repeat</source>
<translation> </translation>
<translation type="vanished"> </translation>
</message>
<message>
<source> Remind</source>
@ -242,13 +239,6 @@
<translatorcomment>start</translatorcomment>
<translation type="vanished">start</translation>
</message>
<message>
<location filename="../clock.ui" line="129"/>
<location filename="../clock.ui" line="381"/>
<location filename="../clock.ui" line="397"/>
<source>00:00:00</source>
<translation></translation>
</message>
<message>
<source>5</source>
<translatorcomment>5min</translatorcomment>
@ -299,80 +289,91 @@
<translation type="vanished"></translation>
</message>
<message>
<location filename="../clock.cpp" line="1093"/>
<location filename="../clock.cpp" line="1568"/>
<source>interval </source>
<translation> </translation>
</message>
<message>
<location filename="../clock.cpp" line="1584"/>
<location filename="../clock.cpp" line="2093"/>
<source>Version</source>
<translation> </translation>
</message>
<message>
<location filename="../clock.cpp" line="1782"/>
<location filename="../clock.cpp" line="2344"/>
<source>recent alarm</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="1886"/>
<location filename="../clock.cpp" line="3083"/>
<location filename="../clock.cpp" line="3190"/>
<location filename="../clock.cpp" line="529"/>
<location filename="../clock.cpp" line="2453"/>
<location filename="../clock.cpp" line="3694"/>
<location filename="../clock.cpp" line="3801"/>
<source>AM</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="1921"/>
<location filename="../clock.cpp" line="2392"/>
<location filename="../clock.cpp" line="2639"/>
<location filename="../clock.cpp" line="3608"/>
<location filename="../clock.cpp" line="516"/>
<source>no Alarm</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../clock.cpp" line="2064"/>
<source>Option</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="2488"/>
<location filename="../clock.cpp" line="2976"/>
<location filename="../clock.cpp" line="3223"/>
<location filename="../clock.cpp" line="4225"/>
<source>Mon</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="1923"/>
<location filename="../clock.cpp" line="2394"/>
<location filename="../clock.cpp" line="2640"/>
<location filename="../clock.cpp" line="3609"/>
<location filename="../clock.cpp" line="2490"/>
<location filename="../clock.cpp" line="2978"/>
<location filename="../clock.cpp" line="3224"/>
<location filename="../clock.cpp" line="4226"/>
<source>Tue</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="1925"/>
<location filename="../clock.cpp" line="2396"/>
<location filename="../clock.cpp" line="2641"/>
<location filename="../clock.cpp" line="3610"/>
<location filename="../clock.cpp" line="2492"/>
<location filename="../clock.cpp" line="2980"/>
<location filename="../clock.cpp" line="3225"/>
<location filename="../clock.cpp" line="4227"/>
<source>Wed</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="1927"/>
<location filename="../clock.cpp" line="2398"/>
<location filename="../clock.cpp" line="2642"/>
<location filename="../clock.cpp" line="3611"/>
<location filename="../clock.cpp" line="2494"/>
<location filename="../clock.cpp" line="2982"/>
<location filename="../clock.cpp" line="3226"/>
<location filename="../clock.cpp" line="4228"/>
<source>Thu</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="1929"/>
<location filename="../clock.cpp" line="2400"/>
<location filename="../clock.cpp" line="2643"/>
<location filename="../clock.cpp" line="3612"/>
<location filename="../clock.cpp" line="2496"/>
<location filename="../clock.cpp" line="2984"/>
<location filename="../clock.cpp" line="3227"/>
<location filename="../clock.cpp" line="4229"/>
<source>Fri</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="1931"/>
<location filename="../clock.cpp" line="2402"/>
<location filename="../clock.cpp" line="2644"/>
<location filename="../clock.cpp" line="3613"/>
<location filename="../clock.cpp" line="2498"/>
<location filename="../clock.cpp" line="2986"/>
<location filename="../clock.cpp" line="3228"/>
<location filename="../clock.cpp" line="4230"/>
<source>Sat</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="1933"/>
<location filename="../clock.cpp" line="2404"/>
<location filename="../clock.cpp" line="2645"/>
<location filename="../clock.cpp" line="3614"/>
<location filename="../clock.cpp" line="2500"/>
<location filename="../clock.cpp" line="2988"/>
<location filename="../clock.cpp" line="3229"/>
<location filename="../clock.cpp" line="4231"/>
<source>Sun</source>
<translation></translation>
</message>
@ -381,42 +382,42 @@
<translation type="vanished">60</translation>
</message>
<message>
<location filename="../clock.cpp" line="3139"/>
<location filename="../clock.cpp" line="3826"/>
<location filename="../clock.cpp" line="3750"/>
<location filename="../clock.cpp" line="4443"/>
<source>five mins late</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="3140"/>
<location filename="../clock.cpp" line="3829"/>
<location filename="../clock.cpp" line="3751"/>
<location filename="../clock.cpp" line="4446"/>
<source>ten mins late</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="3141"/>
<location filename="../clock.cpp" line="3832"/>
<location filename="../clock.cpp" line="3752"/>
<location filename="../clock.cpp" line="4449"/>
<source>twenty mins late</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="3142"/>
<location filename="../clock.cpp" line="3835"/>
<location filename="../clock.cpp" line="3753"/>
<location filename="../clock.cpp" line="4452"/>
<source>thirsty mins late</source>
<translation>30</translation>
</message>
<message>
<location filename="../clock.cpp" line="3143"/>
<location filename="../clock.cpp" line="3838"/>
<location filename="../clock.cpp" line="3754"/>
<location filename="../clock.cpp" line="4455"/>
<source>one hour late</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="3981"/>
<location filename="../clock.cpp" line="4634"/>
<source>mini window</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="1749"/>
<location filename="../clock.cpp" line="2311"/>
<source>2min</source>
<translation>2</translation>
</message>
@ -430,49 +431,49 @@
<translation type="vanished"></translation>
</message>
<message>
<location filename="../clock.cpp" line="139"/>
<location filename="../clock.cpp" line="194"/>
<source>Watch</source>
<translation></translation>
</message>
<message>
<location filename="../clock.ui" line="173"/>
<source>icon</source>
<translation></translation>
<translation type="vanished"></translation>
</message>
<message>
<location filename="../clock.cpp" line="486"/>
<location filename="../clock.cpp" line="487"/>
<location filename="../clock.cpp" line="501"/>
<location filename="../clock.cpp" line="916"/>
<location filename="../clock.cpp" line="919"/>
<location filename="../clock.cpp" line="933"/>
<location filename="../clock.cpp" line="934"/>
<location filename="../clock.cpp" line="2176"/>
<source> bell</source>
<translation> </translation>
</message>
<message>
<location filename="../clock.cpp" line="1534"/>
<location filename="../clock.cpp" line="2042"/>
<source>Minimize</source>
<translatorcomment></translatorcomment>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="268"/>
<location filename="../clock.cpp" line="1544"/>
<location filename="../clock.cpp" line="566"/>
<location filename="../clock.cpp" line="2078"/>
<source>Quit</source>
<translatorcomment>退</translatorcomment>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="1556"/>
<source>Menu</source>
<translatorcomment></translatorcomment>
<translation></translation>
<translation type="vanished"></translation>
</message>
<message>
<location filename="../clock.cpp" line="648"/>
<location filename="../clock.cpp" line="1079"/>
<source>Delete</source>
<translatorcomment></translatorcomment>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="649"/>
<location filename="../clock.cpp" line="1080"/>
<source>ClearAll</source>
<translatorcomment></translatorcomment>
<translation></translation>
@ -488,35 +489,36 @@
<translation type="vanished"></translation>
</message>
<message>
<location filename="../clock.cpp" line="1568"/>
<location filename="../clock.cpp" line="2076"/>
<source>Help</source>
<translatorcomment></translatorcomment>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="1569"/>
<location filename="../clock.cpp" line="2077"/>
<source>About</source>
<translatorcomment></translatorcomment>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="1570"/>
<location filename="../clock.cpp" line="2052"/>
<source>Close</source>
<translatorcomment>退</translatorcomment>
<translatorcomment></translatorcomment>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="1118"/>
<location filename="../clock.cpp" line="1593"/>
<source>up to 100 times</source>
<translation>100</translation>
</message>
<message>
<location filename="../clock.cpp" line="505"/>
<location filename="../clock.cpp" line="2179"/>
<source> remind</source>
<translation> </translation>
</message>
<message>
<location filename="../clock.cpp" line="492"/>
<location filename="../clock.cpp" line="2170"/>
<location filename="../clock.cpp" line="2173"/>
<source> name</source>
<translation> </translation>
</message>
@ -525,44 +527,44 @@
<translation type="vanished">退</translation>
</message>
<message>
<location filename="../clock.cpp" line="650"/>
<location filename="../clock.cpp" line="1081"/>
<source>edit</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="1508"/>
<location filename="../clock.cpp" line="2016"/>
<source>mute</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="1512"/>
<location filename="../clock.cpp" line="2020"/>
<source>All bells are off</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="1751"/>
<location filename="../clock.cpp" line="2313"/>
<source>3min</source>
<translation>3</translation>
</message>
<message>
<location filename="../clock.cpp" line="1753"/>
<location filename="../clock.cpp" line="2315"/>
<source>4min</source>
<translation>4</translation>
</message>
<message>
<location filename="../clock.cpp" line="1755"/>
<location filename="../clock.cpp" line="2317"/>
<source>6min</source>
<translation>6</translation>
</message>
<message>
<location filename="../clock.cpp" line="1762"/>
<location filename="../clock.cpp" line="1948"/>
<location filename="../clock.cpp" line="2311"/>
<location filename="../clock.cpp" line="2418"/>
<location filename="../clock.cpp" line="2419"/>
<location filename="../clock.cpp" line="2637"/>
<location filename="../clock.cpp" line="3619"/>
<location filename="../clock.cpp" line="3620"/>
<location filename="../clock.cpp" line="2324"/>
<location filename="../clock.cpp" line="2515"/>
<location filename="../clock.cpp" line="2894"/>
<location filename="../clock.cpp" line="3002"/>
<location filename="../clock.cpp" line="3003"/>
<location filename="../clock.cpp" line="3221"/>
<location filename="../clock.cpp" line="4236"/>
<location filename="../clock.cpp" line="4237"/>
<source>No repetition</source>
<translation></translation>
</message>
@ -571,31 +573,31 @@
<translation type="vanished"> </translation>
</message>
<message>
<location filename="../clock.cpp" line="1946"/>
<location filename="../clock.cpp" line="2017"/>
<location filename="../clock.cpp" line="2638"/>
<location filename="../clock.cpp" line="3633"/>
<location filename="../clock.cpp" line="3634"/>
<location filename="../clock.cpp" line="2513"/>
<location filename="../clock.cpp" line="2585"/>
<location filename="../clock.cpp" line="3222"/>
<location filename="../clock.cpp" line="4250"/>
<location filename="../clock.cpp" line="4251"/>
<source>Workingday</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="2019"/>
<location filename="../clock.cpp" line="2598"/>
<source>(default)</source>
<translation>()</translation>
</message>
<message>
<location filename="../clock.cpp" line="2024"/>
<location filename="../clock.cpp" line="3138"/>
<location filename="../clock.cpp" line="3819"/>
<location filename="../clock.cpp" line="3823"/>
<location filename="../clock.cpp" line="3841"/>
<location filename="../clock.cpp" line="2607"/>
<location filename="../clock.cpp" line="3749"/>
<location filename="../clock.cpp" line="4436"/>
<location filename="../clock.cpp" line="4440"/>
<location filename="../clock.cpp" line="4458"/>
<source>none</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="2087"/>
<location filename="../clock.cpp" line="2134"/>
<location filename="../clock.cpp" line="2670"/>
<location filename="../clock.cpp" line="2717"/>
<source>Please set alarm name!</source>
<translatorcomment>!</translatorcomment>
<translation></translation>
@ -626,7 +628,7 @@
<translation type="vanished"> </translation>
</message>
<message>
<location filename="../clock.cpp" line="2308"/>
<location filename="../clock.cpp" line="2891"/>
<source>glass</source>
<translation></translation>
</message>
@ -658,34 +660,34 @@
<translation type="vanished"></translation>
</message>
<message>
<location filename="../clock.cpp" line="971"/>
<location filename="../clock.cpp" line="3229"/>
<location filename="../clock.cpp" line="1406"/>
<location filename="../clock.cpp" line="3840"/>
<source>continue</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="2147"/>
<location filename="../clock.cpp" line="2730"/>
<source>warning</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="2147"/>
<location filename="../clock.cpp" line="2730"/>
<source>the number of alarms reaches limit!</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="2147"/>
<location filename="../clock.cpp" line="2730"/>
<source>yes</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="2415"/>
<location filename="../clock.cpp" line="2416"/>
<location filename="../clock.cpp" line="2999"/>
<location filename="../clock.cpp" line="3000"/>
<source> work</source>
<translation> </translation>
</message>
<message>
<location filename="../clock.cpp" line="2415"/>
<location filename="../clock.cpp" line="2999"/>
<source> </source>
<translation> </translation>
</message>
@ -698,40 +700,40 @@
<translation type="vanished"></translation>
</message>
<message>
<location filename="../clock.cpp" line="2933"/>
<location filename="../clock.cpp" line="3525"/>
<source>End</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="3066"/>
<location filename="../clock.cpp" line="3677"/>
<source>after tomorrow</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="3069"/>
<location filename="../clock.cpp" line="3680"/>
<source>Tomorrow</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="3560"/>
<location filename="../clock.cpp" line="4177"/>
<source>hour</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="3563"/>
<location filename="../clock.cpp" line="4180"/>
<source>min</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="3286"/>
<location filename="../clock.cpp" line="3897"/>
<source>sec</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="1943"/>
<location filename="../clock.cpp" line="1944"/>
<location filename="../clock.cpp" line="2413"/>
<location filename="../clock.cpp" line="3756"/>
<location filename="../clock.cpp" line="2510"/>
<location filename="../clock.cpp" line="2511"/>
<location filename="../clock.cpp" line="2997"/>
<location filename="../clock.cpp" line="4373"/>
<source>Every day</source>
<translation></translation>
</message>
@ -837,7 +839,7 @@
<translation type="vanished"> ring time</translation>
</message>
<message>
<location filename="../clock.ui" line="669"/>
<location filename="../clock.ui" line="52"/>
<source>On</source>
<translation></translation>
</message>
@ -1060,7 +1062,7 @@
<translation type="vanished">sec</translation>
</message>
<message>
<location filename="../clock.cpp" line="2418"/>
<location filename="../clock.cpp" line="3002"/>
<source></source>
<translatorcomment>No repetition </translatorcomment>
<translation></translation>
@ -1176,6 +1178,7 @@
<translation></translation>
</message>
<message>
<location filename="../noticeAlarm.cpp" line="142"/>
<location filename="../noticeAlarm.cpp" line="145"/>
<source>Alarm</source>
<translation type="unfinished"></translation>
@ -1198,7 +1201,7 @@
</message>
<message>
<location filename="../noticeAlarm.cpp" line="122"/>
<location filename="../noticeAlarm.cpp" line="282"/>
<location filename="../noticeAlarm.cpp" line="308"/>
<source> Seconds to close</source>
<translation> </translation>
</message>
@ -1245,22 +1248,22 @@
<context>
<name>QObject</name>
<message>
<location filename="../clock.cpp" line="2493"/>
<location filename="../clock.cpp" line="3077"/>
<source>Hint</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="2494"/>
<location filename="../clock.cpp" line="3078"/>
<source>Are you sure to delete</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="2495"/>
<location filename="../clock.cpp" line="3079"/>
<source>sure</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="2496"/>
<location filename="../clock.cpp" line="3080"/>
<source>cancel</source>
<translation></translation>
</message>
@ -1372,6 +1375,7 @@
<name>close_or_hide</name>
<message>
<location filename="../closeOrHide.ui" line="26"/>
<location filename="../closeOrHide.cpp" line="122"/>
<source>Dialog</source>
<translation></translation>
</message>
@ -1394,6 +1398,7 @@
</message>
<message>
<location filename="../closeOrHide.ui" line="138"/>
<location filename="../closeOrHide.cpp" line="161"/>
<source> backstage</source>
<translation> </translation>
</message>
@ -1407,10 +1412,15 @@
<translation> </translation>
</message>
<message>
<location filename="../closeOrHide.cpp" line="46"/>
<location filename="../closeOrHide.cpp" line="47"/>
<source>Please select the state after closing:</source>
<translation></translation>
</message>
<message>
<location filename="../closeOrHide.cpp" line="175"/>
<source> Exit program</source>
<translation> </translation>
</message>
</context>
<context>
<name>delete_msg</name>
@ -1438,7 +1448,7 @@
<context>
<name>item_new</name>
<message>
<location filename="../itemNew.cpp" line="89"/>
<location filename="../itemNew.cpp" line="87"/>
<source>Form</source>
<translation></translation>
</message>
@ -1624,18 +1634,18 @@
<translation type="vanished"></translation>
</message>
<message>
<location filename="../stopwatchItem.cpp" line="74"/>
<location filename="../stopwatchItem.cpp" line="72"/>
<source>Form</source>
<translation></translation>
</message>
<message>
<location filename="../stopwatchItem.cpp" line="51"/>
<location filename="../stopwatchItem.cpp" line="114"/>
<location filename="../stopwatchItem.cpp" line="47"/>
<location filename="../stopwatchItem.cpp" line="116"/>
<source>max</source>
<translation></translation>
</message>
<message>
<location filename="../stopwatchItem.cpp" line="122"/>
<location filename="../stopwatchItem.cpp" line="124"/>
<source>min</source>
<translation></translation>
</message>
@ -1648,6 +1658,7 @@
<name>tinyCountdown</name>
<message>
<location filename="../tinycountdown.ui" line="26"/>
<location filename="../tinycountdown.cpp" line="120"/>
<source>Form</source>
<translation></translation>
</message>
@ -1665,22 +1676,22 @@
<translation type="vanished"></translation>
</message>
<message>
<location filename="../tinycountdown.cpp" line="281"/>
<location filename="../tinycountdown.cpp" line="319"/>
<source>close</source>
<translation></translation>
</message>
<message>
<location filename="../tinycountdown.cpp" line="289"/>
<location filename="../tinycountdown.cpp" line="327"/>
<source>main window</source>
<translation></translation>
</message>
<message>
<location filename="../tinycountdown.cpp" line="301"/>
<location filename="../tinycountdown.cpp" line="339"/>
<source>suspend</source>
<translation></translation>
</message>
<message>
<location filename="../tinycountdown.cpp" line="320"/>
<location filename="../tinycountdown.cpp" line="358"/>
<source>finish</source>
<translation></translation>
</message>

Binary file not shown.

View File

@ -71,22 +71,15 @@
<translation type="vanished">Saat</translation>
</message>
<message>
<location filename="../clock.ui" line="239"/>
<location filename="../clock.ui" line="363"/>
<location filename="../clock.cpp" line="1060"/>
<location filename="../clock.cpp" line="1165"/>
<location filename="../clock.cpp" line="2954"/>
<location filename="../clock.cpp" line="3310"/>
<location filename="../clock.cpp" line="495"/>
<location filename="../clock.cpp" line="502"/>
<location filename="../clock.cpp" line="524"/>
<location filename="../clock.cpp" line="1534"/>
<location filename="../clock.cpp" line="1640"/>
<location filename="../clock.cpp" line="3556"/>
<source>start</source>
<translation>Başlat</translation>
</message>
<message>
<location filename="../clock.ui" line="129"/>
<location filename="../clock.ui" line="381"/>
<location filename="../clock.ui" line="397"/>
<source>00:00:00</source>
<translation></translation>
</message>
<message>
<source>5min</source>
<translation type="vanished">5 dk</translation>
@ -108,34 +101,28 @@
<translation type="vanished">60 dk</translation>
</message>
<message>
<location filename="../clock.ui" line="261"/>
<location filename="../clock.cpp" line="939"/>
<location filename="../clock.cpp" line="2959"/>
<location filename="../clock.cpp" line="3209"/>
<location filename="../clock.cpp" line="503"/>
<location filename="../clock.cpp" line="1373"/>
<location filename="../clock.cpp" line="3561"/>
<location filename="../clock.cpp" line="3820"/>
<source>suspend</source>
<translation>Askıya Al</translation>
</message>
<message>
<location filename="../clock.ui" line="173"/>
<source>icon</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../clock.ui" line="290"/>
<location filename="../clock.cpp" line="510"/>
<source>add</source>
<translation>Ekle</translation>
</message>
<message>
<location filename="../clock.ui" line="336"/>
<source>no alarm</source>
<translation>no Alarm</translation>
<translation type="vanished">no Alarm</translation>
</message>
<message>
<source>delete</source>
<translation type="vanished">Sil</translation>
</message>
<message>
<location filename="../clock.ui" line="496"/>
<location filename="../clock.cpp" line="528"/>
<source>save</source>
<translation>Cts</translation>
</message>
@ -144,10 +131,9 @@
<translation type="vanished">Hatırlat</translation>
</message>
<message>
<location filename="../clock.ui" line="192"/>
<location filename="../clock.cpp" line="1879"/>
<location filename="../clock.cpp" line="3081"/>
<location filename="../clock.cpp" line="3183"/>
<location filename="../clock.cpp" line="2446"/>
<location filename="../clock.cpp" line="3692"/>
<location filename="../clock.cpp" line="3794"/>
<source>PM</source>
<translation>ÖS</translation>
</message>
@ -160,21 +146,21 @@
<translation type="vanished">Kalan süre</translation>
</message>
<message>
<location filename="../clock.cpp" line="983"/>
<location filename="../clock.cpp" line="1418"/>
<source>reset</source>
<translation>Sıfırla</translation>
</message>
<message>
<location filename="../clock.ui" line="419"/>
<location filename="../clock.cpp" line="961"/>
<location filename="../clock.cpp" line="1092"/>
<location filename="../clock.cpp" line="523"/>
<location filename="../clock.cpp" line="1395"/>
<location filename="../clock.cpp" line="1567"/>
<source>count</source>
<translation>İşaret</translation>
</message>
<message>
<location filename="../clock.cpp" line="135"/>
<location filename="../clock.cpp" line="2795"/>
<location filename="../clock.cpp" line="2872"/>
<location filename="../clock.cpp" line="192"/>
<location filename="../clock.cpp" line="3382"/>
<location filename="../clock.cpp" line="3464"/>
<source>Count down</source>
<translation>Geri Sayım</translation>
</message>
@ -200,7 +186,7 @@
<translation type="vanished">12 saat 43 dk zil çalıyor</translation>
</message>
<message>
<location filename="../clock.ui" line="474"/>
<location filename="../clock.cpp" line="527"/>
<source>cancel</source>
<translation>İptal</translation>
</message>
@ -213,9 +199,8 @@
<translation type="vanished"> İsim</translation>
</message>
<message>
<location filename="../clock.cpp" line="497"/>
<source> repeat</source>
<translation> Tekrarla</translation>
<translation type="vanished"> Tekrarla</translation>
</message>
<message>
<source> Remind</source>
@ -230,7 +215,7 @@
<translation type="vanished"> Çalma Zamanı</translation>
</message>
<message>
<location filename="../clock.ui" line="669"/>
<location filename="../clock.ui" line="52"/>
<source>On</source>
<translation>ık</translation>
</message>
@ -239,51 +224,52 @@
<translation type="vanished">Devam Et</translation>
</message>
<message>
<location filename="../clock.cpp" line="1093"/>
<location filename="../clock.cpp" line="1568"/>
<source>interval </source>
<translation>Aralık </translation>
</message>
<message>
<location filename="../clock.cpp" line="1886"/>
<location filename="../clock.cpp" line="3083"/>
<location filename="../clock.cpp" line="3190"/>
<location filename="../clock.cpp" line="529"/>
<location filename="../clock.cpp" line="2453"/>
<location filename="../clock.cpp" line="3694"/>
<location filename="../clock.cpp" line="3801"/>
<source>AM</source>
<translation>ÖÖ</translation>
</message>
<message>
<location filename="../clock.cpp" line="1749"/>
<location filename="../clock.cpp" line="2311"/>
<source>2min</source>
<translation>2 dk</translation>
</message>
<message>
<location filename="../clock.cpp" line="505"/>
<location filename="../clock.cpp" line="2179"/>
<source> remind</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../clock.cpp" line="1751"/>
<location filename="../clock.cpp" line="2313"/>
<source>3min</source>
<translation>3 dk</translation>
</message>
<message>
<location filename="../clock.cpp" line="1753"/>
<location filename="../clock.cpp" line="2315"/>
<source>4min</source>
<translation>4 dk</translation>
</message>
<message>
<location filename="../clock.cpp" line="1755"/>
<location filename="../clock.cpp" line="2317"/>
<source>6min</source>
<translation>6 dk</translation>
</message>
<message>
<location filename="../clock.cpp" line="1762"/>
<location filename="../clock.cpp" line="1948"/>
<location filename="../clock.cpp" line="2311"/>
<location filename="../clock.cpp" line="2418"/>
<location filename="../clock.cpp" line="2419"/>
<location filename="../clock.cpp" line="2637"/>
<location filename="../clock.cpp" line="3619"/>
<location filename="../clock.cpp" line="3620"/>
<location filename="../clock.cpp" line="2324"/>
<location filename="../clock.cpp" line="2515"/>
<location filename="../clock.cpp" line="2894"/>
<location filename="../clock.cpp" line="3002"/>
<location filename="../clock.cpp" line="3003"/>
<location filename="../clock.cpp" line="3221"/>
<location filename="../clock.cpp" line="4236"/>
<location filename="../clock.cpp" line="4237"/>
<source>No repetition</source>
<translation>Tekrar yok</translation>
</message>
@ -292,22 +278,22 @@
<translation type="vanished"> saniye sonra kapanacak</translation>
</message>
<message>
<location filename="../clock.cpp" line="1946"/>
<location filename="../clock.cpp" line="2017"/>
<location filename="../clock.cpp" line="2638"/>
<location filename="../clock.cpp" line="3633"/>
<location filename="../clock.cpp" line="3634"/>
<location filename="../clock.cpp" line="2513"/>
<location filename="../clock.cpp" line="2585"/>
<location filename="../clock.cpp" line="3222"/>
<location filename="../clock.cpp" line="4250"/>
<location filename="../clock.cpp" line="4251"/>
<source>Workingday</source>
<translation>İş günü</translation>
</message>
<message>
<location filename="../clock.cpp" line="2019"/>
<location filename="../clock.cpp" line="2598"/>
<source>(default)</source>
<translation>(varsayılan)</translation>
</message>
<message>
<location filename="../clock.cpp" line="2087"/>
<location filename="../clock.cpp" line="2134"/>
<location filename="../clock.cpp" line="2670"/>
<location filename="../clock.cpp" line="2717"/>
<source>Please set alarm name!</source>
<translation>Lütfen alarm adını ayarlayın!</translation>
</message>
@ -332,7 +318,7 @@
<translation type="vanished">Geri Sayım</translation>
</message>
<message>
<location filename="../clock.cpp" line="139"/>
<location filename="../clock.cpp" line="194"/>
<source>Watch</source>
<translation>Kronometre</translation>
</message>
@ -345,35 +331,36 @@
<translation type="vanished"> Saat </translation>
</message>
<message>
<location filename="../clock.cpp" line="2308"/>
<location filename="../clock.cpp" line="2891"/>
<source>glass</source>
<translation>Bardak</translation>
</message>
<message>
<location filename="../clock.cpp" line="486"/>
<location filename="../clock.cpp" line="487"/>
<location filename="../clock.cpp" line="501"/>
<location filename="../clock.cpp" line="916"/>
<location filename="../clock.cpp" line="919"/>
<location filename="../clock.cpp" line="933"/>
<location filename="../clock.cpp" line="934"/>
<location filename="../clock.cpp" line="2176"/>
<source> bell</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../clock.cpp" line="1534"/>
<location filename="../clock.cpp" line="2042"/>
<source>Minimize</source>
<translation>küçültmek</translation>
</message>
<message>
<location filename="../clock.cpp" line="268"/>
<location filename="../clock.cpp" line="1544"/>
<location filename="../clock.cpp" line="566"/>
<location filename="../clock.cpp" line="2078"/>
<source>Quit</source>
<translation>Çık</translation>
</message>
<message>
<location filename="../clock.cpp" line="1556"/>
<source>Menu</source>
<translation>Menü</translation>
<translation type="vanished">Menü</translation>
</message>
<message>
<location filename="../clock.cpp" line="1568"/>
<location filename="../clock.cpp" line="2076"/>
<source>Help</source>
<translation>Yardım</translation>
</message>
@ -382,12 +369,13 @@
<translation type="vanished">Havlama</translation>
</message>
<message>
<location filename="../clock.cpp" line="492"/>
<location filename="../clock.cpp" line="2170"/>
<location filename="../clock.cpp" line="2173"/>
<source> name</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../clock.cpp" line="650"/>
<location filename="../clock.cpp" line="1081"/>
<source>edit</source>
<translation type="unfinished"></translation>
</message>
@ -400,17 +388,17 @@
<translation type="vanished">Damla</translation>
</message>
<message>
<location filename="../clock.cpp" line="1118"/>
<location filename="../clock.cpp" line="1593"/>
<source>up to 100 times</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="1508"/>
<location filename="../clock.cpp" line="2016"/>
<source>mute</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../clock.cpp" line="1512"/>
<location filename="../clock.cpp" line="2020"/>
<source>All bells are off</source>
<translation type="unfinished"></translation>
</message>
@ -423,40 +411,40 @@
<translation type="vanished">Zaman doldu</translation>
</message>
<message>
<location filename="../clock.cpp" line="2933"/>
<location filename="../clock.cpp" line="3525"/>
<source>End</source>
<translation>Son</translation>
</message>
<message>
<location filename="../clock.cpp" line="3066"/>
<location filename="../clock.cpp" line="3677"/>
<source>after tomorrow</source>
<translation>Yarından sonra</translation>
</message>
<message>
<location filename="../clock.cpp" line="3069"/>
<location filename="../clock.cpp" line="3680"/>
<source>Tomorrow</source>
<translation>Yarın</translation>
</message>
<message>
<location filename="../clock.cpp" line="3560"/>
<location filename="../clock.cpp" line="4177"/>
<source>hour</source>
<translation>Saat</translation>
</message>
<message>
<location filename="../clock.cpp" line="3563"/>
<location filename="../clock.cpp" line="4180"/>
<source>min</source>
<translation>Dk</translation>
</message>
<message>
<location filename="../clock.cpp" line="3286"/>
<location filename="../clock.cpp" line="3897"/>
<source>sec</source>
<translation>Sn</translation>
</message>
<message>
<location filename="../clock.cpp" line="1921"/>
<location filename="../clock.cpp" line="2392"/>
<location filename="../clock.cpp" line="2639"/>
<location filename="../clock.cpp" line="3608"/>
<location filename="../clock.cpp" line="2488"/>
<location filename="../clock.cpp" line="2976"/>
<location filename="../clock.cpp" line="3223"/>
<location filename="../clock.cpp" line="4225"/>
<source>Mon</source>
<translation>Pzt</translation>
</message>
@ -465,18 +453,18 @@
<translation type="obsolete">Kapat</translation>
</message>
<message>
<location filename="../clock.cpp" line="648"/>
<location filename="../clock.cpp" line="1079"/>
<source>Delete</source>
<translation>Sil</translation>
</message>
<message>
<location filename="../clock.cpp" line="649"/>
<location filename="../clock.cpp" line="1080"/>
<source>ClearAll</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="971"/>
<location filename="../clock.cpp" line="3229"/>
<location filename="../clock.cpp" line="1406"/>
<location filename="../clock.cpp" line="3840"/>
<source>continue</source>
<translation type="unfinished"></translation>
</message>
@ -485,118 +473,128 @@
<translation type="vanished">ayarlandır</translation>
</message>
<message>
<location filename="../clock.cpp" line="1569"/>
<location filename="../clock.cpp" line="2077"/>
<source>About</source>
<translation>hakkında</translation>
</message>
<message>
<location filename="../clock.cpp" line="1570"/>
<location filename="../clock.cpp" line="2052"/>
<source>Close</source>
<translation>kapat</translation>
</message>
<message>
<location filename="../clock.cpp" line="1584"/>
<location filename="../clock.cpp" line="516"/>
<source>no Alarm</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../clock.cpp" line="2064"/>
<source>Option</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../clock.cpp" line="2093"/>
<source>Version</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../clock.cpp" line="1782"/>
<location filename="../clock.cpp" line="2344"/>
<source>recent alarm</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../clock.cpp" line="1923"/>
<location filename="../clock.cpp" line="2394"/>
<location filename="../clock.cpp" line="2640"/>
<location filename="../clock.cpp" line="3609"/>
<location filename="../clock.cpp" line="2490"/>
<location filename="../clock.cpp" line="2978"/>
<location filename="../clock.cpp" line="3224"/>
<location filename="../clock.cpp" line="4226"/>
<source>Tue</source>
<translation>Sal</translation>
</message>
<message>
<location filename="../clock.cpp" line="1925"/>
<location filename="../clock.cpp" line="2396"/>
<location filename="../clock.cpp" line="2641"/>
<location filename="../clock.cpp" line="3610"/>
<location filename="../clock.cpp" line="2492"/>
<location filename="../clock.cpp" line="2980"/>
<location filename="../clock.cpp" line="3225"/>
<location filename="../clock.cpp" line="4227"/>
<source>Wed</source>
<translation>Çar</translation>
</message>
<message>
<location filename="../clock.cpp" line="1927"/>
<location filename="../clock.cpp" line="2398"/>
<location filename="../clock.cpp" line="2642"/>
<location filename="../clock.cpp" line="3611"/>
<location filename="../clock.cpp" line="2494"/>
<location filename="../clock.cpp" line="2982"/>
<location filename="../clock.cpp" line="3226"/>
<location filename="../clock.cpp" line="4228"/>
<source>Thu</source>
<translation>Per</translation>
</message>
<message>
<location filename="../clock.cpp" line="1929"/>
<location filename="../clock.cpp" line="2400"/>
<location filename="../clock.cpp" line="2643"/>
<location filename="../clock.cpp" line="3612"/>
<location filename="../clock.cpp" line="2496"/>
<location filename="../clock.cpp" line="2984"/>
<location filename="../clock.cpp" line="3227"/>
<location filename="../clock.cpp" line="4229"/>
<source>Fri</source>
<translation>Cum</translation>
</message>
<message>
<location filename="../clock.cpp" line="1931"/>
<location filename="../clock.cpp" line="2402"/>
<location filename="../clock.cpp" line="2644"/>
<location filename="../clock.cpp" line="3613"/>
<location filename="../clock.cpp" line="2498"/>
<location filename="../clock.cpp" line="2986"/>
<location filename="../clock.cpp" line="3228"/>
<location filename="../clock.cpp" line="4230"/>
<source>Sat</source>
<translation>Cts</translation>
</message>
<message>
<location filename="../clock.cpp" line="1933"/>
<location filename="../clock.cpp" line="2404"/>
<location filename="../clock.cpp" line="2645"/>
<location filename="../clock.cpp" line="3614"/>
<location filename="../clock.cpp" line="2500"/>
<location filename="../clock.cpp" line="2988"/>
<location filename="../clock.cpp" line="3229"/>
<location filename="../clock.cpp" line="4231"/>
<source>Sun</source>
<translation>Paz</translation>
</message>
<message>
<location filename="../clock.cpp" line="1943"/>
<location filename="../clock.cpp" line="1944"/>
<location filename="../clock.cpp" line="2413"/>
<location filename="../clock.cpp" line="3756"/>
<location filename="../clock.cpp" line="2510"/>
<location filename="../clock.cpp" line="2511"/>
<location filename="../clock.cpp" line="2997"/>
<location filename="../clock.cpp" line="4373"/>
<source>Every day</source>
<translation>Her gün</translation>
</message>
<message>
<location filename="../clock.cpp" line="2024"/>
<location filename="../clock.cpp" line="3138"/>
<location filename="../clock.cpp" line="3819"/>
<location filename="../clock.cpp" line="3823"/>
<location filename="../clock.cpp" line="3841"/>
<location filename="../clock.cpp" line="2607"/>
<location filename="../clock.cpp" line="3749"/>
<location filename="../clock.cpp" line="4436"/>
<location filename="../clock.cpp" line="4440"/>
<location filename="../clock.cpp" line="4458"/>
<source>none</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../clock.cpp" line="2147"/>
<location filename="../clock.cpp" line="2730"/>
<source>warning</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../clock.cpp" line="2147"/>
<location filename="../clock.cpp" line="2730"/>
<source>the number of alarms reaches limit!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../clock.cpp" line="2147"/>
<location filename="../clock.cpp" line="2730"/>
<source>yes</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../clock.cpp" line="2415"/>
<location filename="../clock.cpp" line="2416"/>
<location filename="../clock.cpp" line="2999"/>
<location filename="../clock.cpp" line="3000"/>
<source> work</source>
<translation> İş</translation>
</message>
<message>
<location filename="../clock.cpp" line="2415"/>
<location filename="../clock.cpp" line="2999"/>
<source> </source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="2418"/>
<location filename="../clock.cpp" line="3002"/>
<source></source>
<translation></translation>
</message>
@ -605,37 +603,37 @@
<translation type="obsolete">Kapatmak için 360 Saniye {60 ?}</translation>
</message>
<message>
<location filename="../clock.cpp" line="3139"/>
<location filename="../clock.cpp" line="3826"/>
<location filename="../clock.cpp" line="3750"/>
<location filename="../clock.cpp" line="4443"/>
<source>five mins late</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../clock.cpp" line="3140"/>
<location filename="../clock.cpp" line="3829"/>
<location filename="../clock.cpp" line="3751"/>
<location filename="../clock.cpp" line="4446"/>
<source>ten mins late</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../clock.cpp" line="3141"/>
<location filename="../clock.cpp" line="3832"/>
<location filename="../clock.cpp" line="3752"/>
<location filename="../clock.cpp" line="4449"/>
<source>twenty mins late</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../clock.cpp" line="3142"/>
<location filename="../clock.cpp" line="3835"/>
<location filename="../clock.cpp" line="3753"/>
<location filename="../clock.cpp" line="4452"/>
<source>thirsty mins late</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../clock.cpp" line="3143"/>
<location filename="../clock.cpp" line="3838"/>
<location filename="../clock.cpp" line="3754"/>
<location filename="../clock.cpp" line="4455"/>
<source>one hour late</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../clock.cpp" line="3981"/>
<location filename="../clock.cpp" line="4634"/>
<source>mini window</source>
<translation type="unfinished"></translation>
</message>
@ -722,6 +720,7 @@
<translation type="unfinished">Zaman doldu</translation>
</message>
<message>
<location filename="../noticeAlarm.cpp" line="142"/>
<location filename="../noticeAlarm.cpp" line="145"/>
<source>Alarm</source>
<translation type="unfinished"></translation>
@ -744,7 +743,7 @@
</message>
<message>
<location filename="../noticeAlarm.cpp" line="122"/>
<location filename="../noticeAlarm.cpp" line="282"/>
<location filename="../noticeAlarm.cpp" line="308"/>
<source> Seconds to close</source>
<translation> dakika sonra kapanacak</translation>
</message>
@ -791,22 +790,22 @@
<context>
<name>QObject</name>
<message>
<location filename="../clock.cpp" line="2493"/>
<location filename="../clock.cpp" line="3077"/>
<source>Hint</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../clock.cpp" line="2494"/>
<location filename="../clock.cpp" line="3078"/>
<source>Are you sure to delete</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../clock.cpp" line="2495"/>
<location filename="../clock.cpp" line="3079"/>
<source>sure</source>
<translation type="unfinished">Tamam</translation>
</message>
<message>
<location filename="../clock.cpp" line="2496"/>
<location filename="../clock.cpp" line="3080"/>
<source>cancel</source>
<translation type="unfinished">İptal</translation>
</message>
@ -906,6 +905,7 @@
<name>close_or_hide</name>
<message>
<location filename="../closeOrHide.ui" line="26"/>
<location filename="../closeOrHide.cpp" line="122"/>
<source>Dialog</source>
<translation></translation>
</message>
@ -928,6 +928,7 @@
</message>
<message>
<location filename="../closeOrHide.ui" line="138"/>
<location filename="../closeOrHide.cpp" line="161"/>
<source> backstage</source>
<translation> Arka Çalış</translation>
</message>
@ -941,10 +942,15 @@
<translation> Kapat </translation>
</message>
<message>
<location filename="../closeOrHide.cpp" line="46"/>
<location filename="../closeOrHide.cpp" line="47"/>
<source>Please select the state after closing:</source>
<translation></translation>
</message>
<message>
<location filename="../closeOrHide.cpp" line="175"/>
<source> Exit program</source>
<translation> Kapat </translation>
</message>
</context>
<context>
<name>delete_msg</name>
@ -972,7 +978,7 @@
<context>
<name>item_new</name>
<message>
<location filename="../itemNew.cpp" line="89"/>
<location filename="../itemNew.cpp" line="87"/>
<source>Form</source>
<translation></translation>
</message>
@ -1148,18 +1154,18 @@
<context>
<name>stopwatch_item</name>
<message>
<location filename="../stopwatchItem.cpp" line="74"/>
<location filename="../stopwatchItem.cpp" line="72"/>
<source>Form</source>
<translation></translation>
</message>
<message>
<location filename="../stopwatchItem.cpp" line="51"/>
<location filename="../stopwatchItem.cpp" line="114"/>
<location filename="../stopwatchItem.cpp" line="47"/>
<location filename="../stopwatchItem.cpp" line="116"/>
<source>max</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../stopwatchItem.cpp" line="122"/>
<location filename="../stopwatchItem.cpp" line="124"/>
<source>min</source>
<translation type="unfinished">Dk</translation>
</message>
@ -1168,6 +1174,7 @@
<name>tinyCountdown</name>
<message>
<location filename="../tinycountdown.ui" line="26"/>
<location filename="../tinycountdown.cpp" line="120"/>
<source>Form</source>
<translation type="unfinished"></translation>
</message>
@ -1177,22 +1184,22 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../tinycountdown.cpp" line="281"/>
<location filename="../tinycountdown.cpp" line="319"/>
<source>close</source>
<translation type="unfinished">Kapat</translation>
</message>
<message>
<location filename="../tinycountdown.cpp" line="289"/>
<location filename="../tinycountdown.cpp" line="327"/>
<source>main window</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../tinycountdown.cpp" line="301"/>
<location filename="../tinycountdown.cpp" line="339"/>
<source>suspend</source>
<translation type="unfinished">Askıya Al</translation>
</message>
<message>
<location filename="../tinycountdown.cpp" line="320"/>
<location filename="../tinycountdown.cpp" line="358"/>
<source>finish</source>
<translation type="unfinished"></translation>
</message>

Binary file not shown.

View File

@ -79,12 +79,12 @@
<translation type="vanished"></translation>
</message>
<message>
<location filename="../clock.ui" line="239"/>
<location filename="../clock.ui" line="363"/>
<location filename="../clock.cpp" line="1060"/>
<location filename="../clock.cpp" line="1165"/>
<location filename="../clock.cpp" line="2954"/>
<location filename="../clock.cpp" line="3310"/>
<location filename="../clock.cpp" line="495"/>
<location filename="../clock.cpp" line="502"/>
<location filename="../clock.cpp" line="524"/>
<location filename="../clock.cpp" line="1534"/>
<location filename="../clock.cpp" line="1640"/>
<location filename="../clock.cpp" line="3556"/>
<source>start</source>
<translatorcomment></translatorcomment>
<translation></translation>
@ -113,10 +113,10 @@
<translation type="vanished">60</translation>
</message>
<message>
<location filename="../clock.ui" line="261"/>
<location filename="../clock.cpp" line="939"/>
<location filename="../clock.cpp" line="2959"/>
<location filename="../clock.cpp" line="3209"/>
<location filename="../clock.cpp" line="503"/>
<location filename="../clock.cpp" line="1373"/>
<location filename="../clock.cpp" line="3561"/>
<location filename="../clock.cpp" line="3820"/>
<source>suspend</source>
<translation></translation>
</message>
@ -125,16 +125,15 @@
<translation type="vanished"></translation>
</message>
<message>
<location filename="../clock.ui" line="290"/>
<location filename="../clock.cpp" line="510"/>
<source>add</source>
<translatorcomment></translatorcomment>
<translation></translation>
</message>
<message>
<location filename="../clock.ui" line="336"/>
<source>no alarm</source>
<translatorcomment></translatorcomment>
<translation></translation>
<translation type="vanished"></translation>
</message>
<message>
<source>delete</source>
@ -142,7 +141,7 @@
<translation type="vanished"></translation>
</message>
<message>
<location filename="../clock.ui" line="496"/>
<location filename="../clock.cpp" line="528"/>
<source>save</source>
<translatorcomment></translatorcomment>
<translation></translation>
@ -152,10 +151,9 @@
<translation type="vanished"></translation>
</message>
<message>
<location filename="../clock.ui" line="192"/>
<location filename="../clock.cpp" line="1879"/>
<location filename="../clock.cpp" line="3081"/>
<location filename="../clock.cpp" line="3183"/>
<location filename="../clock.cpp" line="2446"/>
<location filename="../clock.cpp" line="3692"/>
<location filename="../clock.cpp" line="3794"/>
<source>PM</source>
<translation></translation>
</message>
@ -169,21 +167,21 @@
<translation type="vanished"></translation>
</message>
<message>
<location filename="../clock.cpp" line="983"/>
<location filename="../clock.cpp" line="1418"/>
<source>reset</source>
<translation></translation>
</message>
<message>
<location filename="../clock.ui" line="419"/>
<location filename="../clock.cpp" line="961"/>
<location filename="../clock.cpp" line="1092"/>
<location filename="../clock.cpp" line="523"/>
<location filename="../clock.cpp" line="1395"/>
<location filename="../clock.cpp" line="1567"/>
<source>count</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="135"/>
<location filename="../clock.cpp" line="2795"/>
<location filename="../clock.cpp" line="2872"/>
<location filename="../clock.cpp" line="192"/>
<location filename="../clock.cpp" line="3382"/>
<location filename="../clock.cpp" line="3464"/>
<source>Count down</source>
<translation></translation>
</message>
@ -208,7 +206,7 @@
<translation type="vanished">1243</translation>
</message>
<message>
<location filename="../clock.ui" line="474"/>
<location filename="../clock.cpp" line="527"/>
<source>cancel</source>
<translation></translation>
</message>
@ -221,9 +219,8 @@
<translation type="vanished"> </translation>
</message>
<message>
<location filename="../clock.cpp" line="497"/>
<source> repeat</source>
<translation> </translation>
<translation type="vanished"> </translation>
</message>
<message>
<source> Remind</source>
@ -242,13 +239,6 @@
<translatorcomment>start</translatorcomment>
<translation type="vanished">start</translation>
</message>
<message>
<location filename="../clock.ui" line="129"/>
<location filename="../clock.ui" line="381"/>
<location filename="../clock.ui" line="397"/>
<source>00:00:00</source>
<translation></translation>
</message>
<message>
<source>5</source>
<translatorcomment>5min</translatorcomment>
@ -299,80 +289,91 @@
<translation type="vanished"></translation>
</message>
<message>
<location filename="../clock.cpp" line="1093"/>
<location filename="../clock.cpp" line="1568"/>
<source>interval </source>
<translation> </translation>
</message>
<message>
<location filename="../clock.cpp" line="1584"/>
<location filename="../clock.cpp" line="2093"/>
<source>Version</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="1782"/>
<location filename="../clock.cpp" line="2344"/>
<source>recent alarm</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="1886"/>
<location filename="../clock.cpp" line="3083"/>
<location filename="../clock.cpp" line="3190"/>
<location filename="../clock.cpp" line="529"/>
<location filename="../clock.cpp" line="2453"/>
<location filename="../clock.cpp" line="3694"/>
<location filename="../clock.cpp" line="3801"/>
<source>AM</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="1921"/>
<location filename="../clock.cpp" line="2392"/>
<location filename="../clock.cpp" line="2639"/>
<location filename="../clock.cpp" line="3608"/>
<location filename="../clock.cpp" line="516"/>
<source>no Alarm</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../clock.cpp" line="2064"/>
<source>Option</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="2488"/>
<location filename="../clock.cpp" line="2976"/>
<location filename="../clock.cpp" line="3223"/>
<location filename="../clock.cpp" line="4225"/>
<source>Mon</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="1923"/>
<location filename="../clock.cpp" line="2394"/>
<location filename="../clock.cpp" line="2640"/>
<location filename="../clock.cpp" line="3609"/>
<location filename="../clock.cpp" line="2490"/>
<location filename="../clock.cpp" line="2978"/>
<location filename="../clock.cpp" line="3224"/>
<location filename="../clock.cpp" line="4226"/>
<source>Tue</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="1925"/>
<location filename="../clock.cpp" line="2396"/>
<location filename="../clock.cpp" line="2641"/>
<location filename="../clock.cpp" line="3610"/>
<location filename="../clock.cpp" line="2492"/>
<location filename="../clock.cpp" line="2980"/>
<location filename="../clock.cpp" line="3225"/>
<location filename="../clock.cpp" line="4227"/>
<source>Wed</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="1927"/>
<location filename="../clock.cpp" line="2398"/>
<location filename="../clock.cpp" line="2642"/>
<location filename="../clock.cpp" line="3611"/>
<location filename="../clock.cpp" line="2494"/>
<location filename="../clock.cpp" line="2982"/>
<location filename="../clock.cpp" line="3226"/>
<location filename="../clock.cpp" line="4228"/>
<source>Thu</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="1929"/>
<location filename="../clock.cpp" line="2400"/>
<location filename="../clock.cpp" line="2643"/>
<location filename="../clock.cpp" line="3612"/>
<location filename="../clock.cpp" line="2496"/>
<location filename="../clock.cpp" line="2984"/>
<location filename="../clock.cpp" line="3227"/>
<location filename="../clock.cpp" line="4229"/>
<source>Fri</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="1931"/>
<location filename="../clock.cpp" line="2402"/>
<location filename="../clock.cpp" line="2644"/>
<location filename="../clock.cpp" line="3613"/>
<location filename="../clock.cpp" line="2498"/>
<location filename="../clock.cpp" line="2986"/>
<location filename="../clock.cpp" line="3228"/>
<location filename="../clock.cpp" line="4230"/>
<source>Sat</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="1933"/>
<location filename="../clock.cpp" line="2404"/>
<location filename="../clock.cpp" line="2645"/>
<location filename="../clock.cpp" line="3614"/>
<location filename="../clock.cpp" line="2500"/>
<location filename="../clock.cpp" line="2988"/>
<location filename="../clock.cpp" line="3229"/>
<location filename="../clock.cpp" line="4231"/>
<source>Sun</source>
<translation></translation>
</message>
@ -381,42 +382,42 @@
<translation type="vanished">60</translation>
</message>
<message>
<location filename="../clock.cpp" line="3139"/>
<location filename="../clock.cpp" line="3826"/>
<location filename="../clock.cpp" line="3750"/>
<location filename="../clock.cpp" line="4443"/>
<source>five mins late</source>
<translation>5</translation>
</message>
<message>
<location filename="../clock.cpp" line="3140"/>
<location filename="../clock.cpp" line="3829"/>
<location filename="../clock.cpp" line="3751"/>
<location filename="../clock.cpp" line="4446"/>
<source>ten mins late</source>
<translation>10</translation>
</message>
<message>
<location filename="../clock.cpp" line="3141"/>
<location filename="../clock.cpp" line="3832"/>
<location filename="../clock.cpp" line="3752"/>
<location filename="../clock.cpp" line="4449"/>
<source>twenty mins late</source>
<translation>20</translation>
</message>
<message>
<location filename="../clock.cpp" line="3142"/>
<location filename="../clock.cpp" line="3835"/>
<location filename="../clock.cpp" line="3753"/>
<location filename="../clock.cpp" line="4452"/>
<source>thirsty mins late</source>
<translation>30</translation>
</message>
<message>
<location filename="../clock.cpp" line="3143"/>
<location filename="../clock.cpp" line="3838"/>
<location filename="../clock.cpp" line="3754"/>
<location filename="../clock.cpp" line="4455"/>
<source>one hour late</source>
<translation>1</translation>
</message>
<message>
<location filename="../clock.cpp" line="3981"/>
<location filename="../clock.cpp" line="4634"/>
<source>mini window</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="1749"/>
<location filename="../clock.cpp" line="2311"/>
<source>2min</source>
<translation>2</translation>
</message>
@ -430,49 +431,45 @@
<translation type="vanished"></translation>
</message>
<message>
<location filename="../clock.cpp" line="139"/>
<location filename="../clock.cpp" line="194"/>
<source>Watch</source>
<translation></translation>
</message>
<message>
<location filename="../clock.ui" line="173"/>
<source>icon</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="486"/>
<location filename="../clock.cpp" line="487"/>
<location filename="../clock.cpp" line="501"/>
<location filename="../clock.cpp" line="916"/>
<location filename="../clock.cpp" line="919"/>
<location filename="../clock.cpp" line="933"/>
<location filename="../clock.cpp" line="934"/>
<location filename="../clock.cpp" line="2176"/>
<source> bell</source>
<translation> </translation>
</message>
<message>
<location filename="../clock.cpp" line="1534"/>
<location filename="../clock.cpp" line="2042"/>
<source>Minimize</source>
<translatorcomment></translatorcomment>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="268"/>
<location filename="../clock.cpp" line="1544"/>
<location filename="../clock.cpp" line="566"/>
<location filename="../clock.cpp" line="2078"/>
<source>Quit</source>
<translatorcomment>退</translatorcomment>
<translation>退</translation>
</message>
<message>
<location filename="../clock.cpp" line="1556"/>
<source>Menu</source>
<translatorcomment></translatorcomment>
<translation></translation>
<translation type="vanished"></translation>
</message>
<message>
<location filename="../clock.cpp" line="648"/>
<location filename="../clock.cpp" line="1079"/>
<source>Delete</source>
<translatorcomment></translatorcomment>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="649"/>
<location filename="../clock.cpp" line="1080"/>
<source>ClearAll</source>
<translatorcomment></translatorcomment>
<translation></translation>
@ -488,35 +485,36 @@
<translation type="vanished"></translation>
</message>
<message>
<location filename="../clock.cpp" line="1568"/>
<location filename="../clock.cpp" line="2076"/>
<source>Help</source>
<translatorcomment></translatorcomment>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="1569"/>
<location filename="../clock.cpp" line="2077"/>
<source>About</source>
<translatorcomment></translatorcomment>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="1570"/>
<location filename="../clock.cpp" line="2052"/>
<source>Close</source>
<translatorcomment>退</translatorcomment>
<translation>退</translation>
<translatorcomment></translatorcomment>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="1118"/>
<location filename="../clock.cpp" line="1593"/>
<source>up to 100 times</source>
<translation>100</translation>
</message>
<message>
<location filename="../clock.cpp" line="505"/>
<location filename="../clock.cpp" line="2179"/>
<source> remind</source>
<translation> </translation>
</message>
<message>
<location filename="../clock.cpp" line="492"/>
<location filename="../clock.cpp" line="2170"/>
<location filename="../clock.cpp" line="2173"/>
<source> name</source>
<translation> </translation>
</message>
@ -525,44 +523,44 @@
<translation type="vanished">退</translation>
</message>
<message>
<location filename="../clock.cpp" line="650"/>
<location filename="../clock.cpp" line="1081"/>
<source>edit</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="1508"/>
<location filename="../clock.cpp" line="2016"/>
<source>mute</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="1512"/>
<location filename="../clock.cpp" line="2020"/>
<source>All bells are off</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="1751"/>
<location filename="../clock.cpp" line="2313"/>
<source>3min</source>
<translation>3</translation>
</message>
<message>
<location filename="../clock.cpp" line="1753"/>
<location filename="../clock.cpp" line="2315"/>
<source>4min</source>
<translation>4</translation>
</message>
<message>
<location filename="../clock.cpp" line="1755"/>
<location filename="../clock.cpp" line="2317"/>
<source>6min</source>
<translation>6</translation>
</message>
<message>
<location filename="../clock.cpp" line="1762"/>
<location filename="../clock.cpp" line="1948"/>
<location filename="../clock.cpp" line="2311"/>
<location filename="../clock.cpp" line="2418"/>
<location filename="../clock.cpp" line="2419"/>
<location filename="../clock.cpp" line="2637"/>
<location filename="../clock.cpp" line="3619"/>
<location filename="../clock.cpp" line="3620"/>
<location filename="../clock.cpp" line="2324"/>
<location filename="../clock.cpp" line="2515"/>
<location filename="../clock.cpp" line="2894"/>
<location filename="../clock.cpp" line="3002"/>
<location filename="../clock.cpp" line="3003"/>
<location filename="../clock.cpp" line="3221"/>
<location filename="../clock.cpp" line="4236"/>
<location filename="../clock.cpp" line="4237"/>
<source>No repetition</source>
<translation></translation>
</message>
@ -571,31 +569,31 @@
<translation type="vanished"> </translation>
</message>
<message>
<location filename="../clock.cpp" line="1946"/>
<location filename="../clock.cpp" line="2017"/>
<location filename="../clock.cpp" line="2638"/>
<location filename="../clock.cpp" line="3633"/>
<location filename="../clock.cpp" line="3634"/>
<location filename="../clock.cpp" line="2513"/>
<location filename="../clock.cpp" line="2585"/>
<location filename="../clock.cpp" line="3222"/>
<location filename="../clock.cpp" line="4250"/>
<location filename="../clock.cpp" line="4251"/>
<source>Workingday</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="2019"/>
<location filename="../clock.cpp" line="2598"/>
<source>(default)</source>
<translation>()</translation>
</message>
<message>
<location filename="../clock.cpp" line="2024"/>
<location filename="../clock.cpp" line="3138"/>
<location filename="../clock.cpp" line="3819"/>
<location filename="../clock.cpp" line="3823"/>
<location filename="../clock.cpp" line="3841"/>
<location filename="../clock.cpp" line="2607"/>
<location filename="../clock.cpp" line="3749"/>
<location filename="../clock.cpp" line="4436"/>
<location filename="../clock.cpp" line="4440"/>
<location filename="../clock.cpp" line="4458"/>
<source>none</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="2087"/>
<location filename="../clock.cpp" line="2134"/>
<location filename="../clock.cpp" line="2670"/>
<location filename="../clock.cpp" line="2717"/>
<source>Please set alarm name!</source>
<translatorcomment>!</translatorcomment>
<translation>!</translation>
@ -626,7 +624,7 @@
<translation type="vanished"> </translation>
</message>
<message>
<location filename="../clock.cpp" line="2308"/>
<location filename="../clock.cpp" line="2891"/>
<source>glass</source>
<translation></translation>
</message>
@ -658,34 +656,34 @@
<translation type="vanished"></translation>
</message>
<message>
<location filename="../clock.cpp" line="971"/>
<location filename="../clock.cpp" line="3229"/>
<location filename="../clock.cpp" line="1406"/>
<location filename="../clock.cpp" line="3840"/>
<source>continue</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="2147"/>
<location filename="../clock.cpp" line="2730"/>
<source>warning</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="2147"/>
<location filename="../clock.cpp" line="2730"/>
<source>the number of alarms reaches limit!</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="2147"/>
<location filename="../clock.cpp" line="2730"/>
<source>yes</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="2415"/>
<location filename="../clock.cpp" line="2416"/>
<location filename="../clock.cpp" line="2999"/>
<location filename="../clock.cpp" line="3000"/>
<source> work</source>
<translation> </translation>
</message>
<message>
<location filename="../clock.cpp" line="2415"/>
<location filename="../clock.cpp" line="2999"/>
<source> </source>
<translation></translation>
</message>
@ -698,40 +696,40 @@
<translation type="vanished"></translation>
</message>
<message>
<location filename="../clock.cpp" line="2933"/>
<location filename="../clock.cpp" line="3525"/>
<source>End</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="3066"/>
<location filename="../clock.cpp" line="3677"/>
<source>after tomorrow</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="3069"/>
<location filename="../clock.cpp" line="3680"/>
<source>Tomorrow</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="3560"/>
<location filename="../clock.cpp" line="4177"/>
<source>hour</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="3563"/>
<location filename="../clock.cpp" line="4180"/>
<source>min</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="3286"/>
<location filename="../clock.cpp" line="3897"/>
<source>sec</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="1943"/>
<location filename="../clock.cpp" line="1944"/>
<location filename="../clock.cpp" line="2413"/>
<location filename="../clock.cpp" line="3756"/>
<location filename="../clock.cpp" line="2510"/>
<location filename="../clock.cpp" line="2511"/>
<location filename="../clock.cpp" line="2997"/>
<location filename="../clock.cpp" line="4373"/>
<source>Every day</source>
<translation></translation>
</message>
@ -837,7 +835,7 @@
<translation type="vanished"> ring time</translation>
</message>
<message>
<location filename="../clock.ui" line="669"/>
<location filename="../clock.ui" line="52"/>
<source>On</source>
<translation>on</translation>
</message>
@ -1060,7 +1058,7 @@
<translation type="vanished">sec</translation>
</message>
<message>
<location filename="../clock.cpp" line="2418"/>
<location filename="../clock.cpp" line="3002"/>
<source></source>
<translatorcomment>No repetition </translatorcomment>
<translation>No repetition</translation>
@ -1176,6 +1174,7 @@
<translation></translation>
</message>
<message>
<location filename="../noticeAlarm.cpp" line="142"/>
<location filename="../noticeAlarm.cpp" line="145"/>
<source>Alarm</source>
<translation type="unfinished"></translation>
@ -1198,7 +1197,7 @@
</message>
<message>
<location filename="../noticeAlarm.cpp" line="122"/>
<location filename="../noticeAlarm.cpp" line="282"/>
<location filename="../noticeAlarm.cpp" line="308"/>
<source> Seconds to close</source>
<translation> </translation>
</message>
@ -1245,22 +1244,22 @@
<context>
<name>QObject</name>
<message>
<location filename="../clock.cpp" line="2493"/>
<location filename="../clock.cpp" line="3077"/>
<source>Hint</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="2494"/>
<location filename="../clock.cpp" line="3078"/>
<source>Are you sure to delete</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="2495"/>
<location filename="../clock.cpp" line="3079"/>
<source>sure</source>
<translation></translation>
</message>
<message>
<location filename="../clock.cpp" line="2496"/>
<location filename="../clock.cpp" line="3080"/>
<source>cancel</source>
<translation></translation>
</message>
@ -1372,6 +1371,7 @@
<name>close_or_hide</name>
<message>
<location filename="../closeOrHide.ui" line="26"/>
<location filename="../closeOrHide.cpp" line="122"/>
<source>Dialog</source>
<translation></translation>
</message>
@ -1394,6 +1394,7 @@
</message>
<message>
<location filename="../closeOrHide.ui" line="138"/>
<location filename="../closeOrHide.cpp" line="161"/>
<source> backstage</source>
<translation> </translation>
</message>
@ -1407,10 +1408,15 @@
<translation> 退 </translation>
</message>
<message>
<location filename="../closeOrHide.cpp" line="46"/>
<location filename="../closeOrHide.cpp" line="47"/>
<source>Please select the state after closing:</source>
<translation></translation>
</message>
<message>
<location filename="../closeOrHide.cpp" line="175"/>
<source> Exit program</source>
<translation> 退 </translation>
</message>
</context>
<context>
<name>delete_msg</name>
@ -1438,7 +1444,7 @@
<context>
<name>item_new</name>
<message>
<location filename="../itemNew.cpp" line="89"/>
<location filename="../itemNew.cpp" line="87"/>
<source>Form</source>
<translation></translation>
</message>
@ -1624,18 +1630,18 @@
<translation type="vanished"></translation>
</message>
<message>
<location filename="../stopwatchItem.cpp" line="74"/>
<location filename="../stopwatchItem.cpp" line="72"/>
<source>Form</source>
<translation></translation>
</message>
<message>
<location filename="../stopwatchItem.cpp" line="51"/>
<location filename="../stopwatchItem.cpp" line="114"/>
<location filename="../stopwatchItem.cpp" line="47"/>
<location filename="../stopwatchItem.cpp" line="116"/>
<source>max</source>
<translation></translation>
</message>
<message>
<location filename="../stopwatchItem.cpp" line="122"/>
<location filename="../stopwatchItem.cpp" line="124"/>
<source>min</source>
<translation></translation>
</message>
@ -1648,6 +1654,7 @@
<name>tinyCountdown</name>
<message>
<location filename="../tinycountdown.ui" line="26"/>
<location filename="../tinycountdown.cpp" line="120"/>
<source>Form</source>
<translation></translation>
</message>
@ -1665,22 +1672,22 @@
<translation type="vanished"></translation>
</message>
<message>
<location filename="../tinycountdown.cpp" line="281"/>
<location filename="../tinycountdown.cpp" line="319"/>
<source>close</source>
<translation></translation>
</message>
<message>
<location filename="../tinycountdown.cpp" line="289"/>
<location filename="../tinycountdown.cpp" line="327"/>
<source>main window</source>
<translation></translation>
</message>
<message>
<location filename="../tinycountdown.cpp" line="301"/>
<location filename="../tinycountdown.cpp" line="339"/>
<source>suspend</source>
<translation></translation>
</message>
<message>
<location filename="../tinycountdown.cpp" line="320"/>
<location filename="../tinycountdown.cpp" line="358"/>
<source>finish</source>
<translation></translation>
</message>

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -163,7 +163,7 @@ void VerticalScroll_24::paintNum_24(QPainter &painter, int Height)
} else {
paintNum(painter, m_minRange, m_deviation + Height / devide);
}
m_Pclock->ui->timeFormatOnTimeWheel->hide();
m_Pclock->timeFormatOnTimeWheel->hide();
}
void VerticalScroll_24::paintNum_12(QPainter &painter, int Height)
@ -202,7 +202,7 @@ void VerticalScroll_24::paintNum_12(QPainter &painter, int Height)
} else {
paintNum(painter, m_minRange, m_deviation + Height / devide);
}
m_Pclock->ui->timeFormatOnTimeWheel->hide();
m_Pclock->timeFormatOnTimeWheel->hide();
//换用上下午滚轮
// if (m_currentValue>=12) {
// m_Pclock->ui->timeFormatOnTimeWheel->setText(tr("PM"));