[utilities/kteatime] /: Replace Anonymous with Custom
Nicolas Fella
null at kde.org
Sat Jan 16 15:32:08 GMT 2021
Git commit 7a637350c1aa334236d4f4683f360a27bcb532ae by Nicolas Fella, on behalf of Marco Parillo.
Committed on 16/01/2021 at 15:32.
Pushed by nicolasfella into branch 'master'.
Replace Anonymous with Custom
M +4 -0 ChangeLog
M +1 -1 doc/index.docbook
M +1 -1 src/main.cpp
M +1 -1 src/tea.cpp
M +3 -3 src/timeedit.cpp
M +1 -1 src/timeedit.ui
M +5 -5 src/toplevel.cpp
https://invent.kde.org/utilities/kteatime/commit/7a637350c1aa334236d4f4683f360a27bcb532ae
diff --git a/ChangeLog b/ChangeLog
index 5457683..e390bfc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2021-01-14: Marco Parillo <maparillo at gmail.com>
+ - Changed Anonomous to Custom for custom-timed steeping (like
+ requested in #431663
+
2007-09-29 Stefan Böhmann <kde at hilefoks.org>
- added/improved command-line arguments to start a tea (like requested in #144708).
diff --git a/doc/index.docbook b/doc/index.docbook
index b86992d..d9c4ca1 100644
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -81,7 +81,7 @@
<sect1 id="select-your-tea">
<title>Select Your Tea</title>
-<para>Clicking on the icon with the &RMB; will bring up a menu. At the top of the menu there are four menu items. Here, you can select what kind of tea you are preparing to drink. There are: <guimenuitem>Black Tea</guimenuitem>, <guimenuitem>Earl Grey</guimenuitem>, <guimenuitem>Fruit Tea</guimenuitem>, and <guimenuitem>Green Tea</guimenuitem>. These teas are preconfigured with a default time. Many people have complained that the times are not correct. Please be aware that the amount of time it takes to steep a cup of tea is based on personal preference. The times chosen are approximations. If you read on, you will learn how to change or delete these predefined times and to set your own time. A quick-and-easy way to set a custom time is to choose <guimenuitem>Anonymous...</guimenuitem> from the menu.</para>
+<para>Clicking on the icon with the &RMB; will bring up a menu. At the top of the menu there are four menu items. Here, you can select what kind of tea you are preparing to drink. There are: <guimenuitem>Black Tea</guimenuitem>, <guimenuitem>Earl Grey</guimenuitem>, <guimenuitem>Fruit Tea</guimenuitem>, and <guimenuitem>Green Tea</guimenuitem>. These teas are preconfigured with a default time. Many people have complained that the times are not correct. Please be aware that the amount of time it takes to steep a cup of tea is based on personal preference. The times chosen are approximations. If you read on, you will learn how to change or delete these predefined times and to set your own time. A quick-and-easy way to set a custom time is to choose <guimenuitem>Custom...</guimenuitem> from the menu.</para>
<para>Clicking <guimenuitem>Configure Notifications...</guimenuitem> brings up the &kde; Notification Settings for &kteatime;.</para>
diff --git a/src/main.cpp b/src/main.cpp
index 148cbab..13f62c4 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -95,7 +95,7 @@ int main (int argc, char *argv[])
const int time=parser.value(timeOption).toInt();
if( time > 0 ) {
const QString name = parser.value(nameOption);
- const Tea tea( name.isEmpty() ? i18n( "Anonymous Tea" ) : name, time );
+ const Tea tea( name.isEmpty() ? i18n( "Custom Tea" ) : name, time );
toplevel->runTea( tea );
}
diff --git a/src/tea.cpp b/src/tea.cpp
index 106805d..c12870e 100644
--- a/src/tea.cpp
+++ b/src/tea.cpp
@@ -36,7 +36,7 @@ QString Tea::name() const
void Tea::setName(const QString &name)
{
if( name.isEmpty() ) {
- m_name = i18n( "Anonymous Tea" );
+ m_name = i18n( "Custom Tea" );
}
else {
m_name = name;
diff --git a/src/timeedit.cpp b/src/timeedit.cpp
index 8f45231..913eccf 100644
--- a/src/timeedit.cpp
+++ b/src/timeedit.cpp
@@ -45,10 +45,10 @@ TimeEditDialog::TimeEditDialog(TopLevel *toplevel)
: QDialog(),
m_toplevel( toplevel )
{
- setWindowTitle( i18n( "Anonymous Tea" ) );
+ setWindowTitle( i18n( "Custom Tea" ) );
buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel);
- buttonBox->button(QDialogButtonBox::Ok)->setWhatsThis(i18n( "Start a new anonymous tea with the time configured in this dialog." ));
+ buttonBox->button(QDialogButtonBox::Ok)->setWhatsThis(i18n( "Start a new custom tea with the time configured in this dialog." ));
buttonBox->button(QDialogButtonBox::Ok)->setDefault(true);
buttonBox->button(QDialogButtonBox::Ok)->setShortcut(Qt::CTRL | Qt::Key_Return);
buttonBox->button(QDialogButtonBox::Cancel)->setWhatsThis(i18n( "Close this dialog without starting a new tea." ));
@@ -117,7 +117,7 @@ void TimeEditDialog::accept()
group.writeEntry( "AnonymousTeaDialogXPos", x() );
group.writeEntry( "AnonymousTeaDialogYPos", y() );
- m_toplevel->runTea( Tea( i18n( "Anonymous Tea" ), time ) );
+ m_toplevel->runTea( Tea( i18n( "Custom Tea" ), time ) );
}
diff --git a/src/timeedit.ui b/src/timeedit.ui
index f33dbbf..5832bf5 100644
--- a/src/timeedit.ui
+++ b/src/timeedit.ui
@@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle" >
- <string>Anonymous Tea</string>
+ <string>Custom Tea</string>
</property>
<layout class="QGridLayout" >
<property name="leftMargin" >
diff --git a/src/toplevel.cpp b/src/toplevel.cpp
index 2f4dcf5..1a6a621 100644
--- a/src/toplevel.cpp
+++ b/src/toplevel.cpp
@@ -105,8 +105,8 @@ TopLevel::TopLevel(const KAboutData *aboutData, const QString &icon, QWidget *pa
action = KStandardAction::quit(qApp, &QCoreApplication::quit, m_actionCollection);
action->setShortcut(0);
- action = m_actionCollection->addAction( QStringLiteral( "anonymous" ));
- action->setText(i18n( "&Anonymous..." ) );
+ action = m_actionCollection->addAction( QStringLiteral( "custom" ));
+ action->setText(i18n( "&Custom..." ) );
connect(action, &QAction::triggered, this, &TopLevel::showTimeEditDialog);
m_helpMenu = new KHelpMenu( nullptr, *aboutData, false );
@@ -119,7 +119,7 @@ TopLevel::TopLevel(const KAboutData *aboutData, const QString &icon, QWidget *pa
contextMenu()->addAction( m_actionCollection->action(QStringLiteral("pause")) );
contextMenu()->addAction( m_actionCollection->action(QStringLiteral("stop")) );
contextMenu()->addSeparator();
- contextMenu()->addAction( m_actionCollection->action(QStringLiteral("anonymous")) );
+ contextMenu()->addAction( m_actionCollection->action(QStringLiteral("custom")) );
contextMenu()->addSeparator();
contextMenu()->addAction( m_actionCollection->action(QStringLiteral("configure")) );
contextMenu()->addAction( m_actionCollection->action(QLatin1String(KStandardAction::name(KStandardAction::ConfigureNotifications))) );
@@ -152,7 +152,7 @@ void TopLevel::checkState() {
m_teaActionGroup->setEnabled( !state );
m_actionCollection->action(QStringLiteral("stop"))->setEnabled( state );
- m_actionCollection->action(QStringLiteral("anonymous"))->setEnabled( !state );
+ m_actionCollection->action(QStringLiteral("custom"))->setEnabled( !state );
m_actionCollection->action(QStringLiteral("resume"))->setEnabled( false );
m_actionCollection->action(QStringLiteral("pause"))->setEnabled( state && m_runningTeaTime > 0 );
@@ -196,7 +196,7 @@ void TopLevel::setTeaList(const QList<Tea> &tealist) {
contextMenu()->addAction( m_actionCollection->action(QStringLiteral("resume")) );
contextMenu()->addAction( m_actionCollection->action(QStringLiteral("pause")) );
contextMenu()->addAction( m_actionCollection->action(QStringLiteral("stop")) );
- contextMenu()->addAction( m_actionCollection->action(QStringLiteral("anonymous")) );
+ contextMenu()->addAction( m_actionCollection->action(QStringLiteral("custom")) );
contextMenu()->addSeparator();
contextMenu()->addAction( m_actionCollection->action(QStringLiteral("configure")) );
contextMenu()->addAction( m_actionCollection->action(QLatin1String(KStandardAction::name(KStandardAction::ConfigureNotifications))) );
More information about the kde-doc-english
mailing list