Hello community,
here is the log from the commit of package kwidgetsaddons for openSUSE:Factory checked in at 2014-04-02 17:22:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kwidgetsaddons (Old)
and /work/SRC/openSUSE:Factory/.kwidgetsaddons.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kwidgetsaddons"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kwidgetsaddons/kwidgetsaddons.changes 2014-03-10 12:17:34.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kwidgetsaddons.new/kwidgetsaddons.changes 2014-04-02 17:22:42.000000000 +0200
@@ -1,0 +2,9 @@
+Sat Mar 29 19:47:53 UTC 2014 - hrvoje.senjan@gmail.com
+
+- Update to 4.98.0
+ * API improvements and cleanups
+ * Buildsystem fixes
+ * For more details please see:
+ http://www.kde.org/announcements/announce-frameworks5-beta1.php
+
+-------------------------------------------------------------------
Old:
----
kwidgetsaddons-4.97.0.tar.xz
New:
----
kwidgetsaddons-4.98.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kwidgetsaddons.spec ++++++
--- /var/tmp/diff_new_pack.PQVf86/_old 2014-04-02 17:22:43.000000000 +0200
+++ /var/tmp/diff_new_pack.PQVf86/_new 2014-04-02 17:22:43.000000000 +0200
@@ -18,10 +18,10 @@
%define lname libKF5WidgetsAddons5
Name: kwidgetsaddons
-Version: 4.97.0
+Version: 4.98.0
Release: 0
BuildRequires: cmake >= 2.8.12
-BuildRequires: extra-cmake-modules >= 0.0.11
+BuildRequires: extra-cmake-modules >= 0.0.12
BuildRequires: fdupes
BuildRequires: kf5-filesystem
BuildRequires: pkgconfig(Qt5Test) >= 5.2.0
++++++ kwidgetsaddons-4.97.0.tar.xz -> kwidgetsaddons-4.98.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-4.97.0/CMakeLists.txt new/kwidgetsaddons-4.98.0/CMakeLists.txt
--- old/kwidgetsaddons-4.97.0/CMakeLists.txt 2014-03-01 12:51:46.000000000 +0100
+++ new/kwidgetsaddons-4.98.0/CMakeLists.txt 2014-03-29 08:00:08.000000000 +0100
@@ -2,7 +2,7 @@
project(KWidgetsAddons)
-find_package(ECM 0.0.11 REQUIRED NO_MODULE)
+find_package(ECM 0.0.12 REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
@@ -18,7 +18,7 @@
include(ECMSetupVersion)
include(ECMGenerateHeaders)
-set(KF5_VERSION "4.97.0")
+set(KF5_VERSION "4.98.0")
ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KWIDGETSADDONS
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kwidgetsaddons_version.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-4.97.0/README.md new/kwidgetsaddons-4.98.0/README.md
--- old/kwidgetsaddons-4.97.0/README.md 2014-03-01 12:51:46.000000000 +0100
+++ new/kwidgetsaddons-4.98.0/README.md 2014-03-29 08:00:08.000000000 +0100
@@ -18,7 +18,7 @@
## Links
-- Home page: https://projects.kde.org/projects/frameworks/kwidgetsaddon
+- Home page: https://projects.kde.org/projects/frameworks/kwidgetsaddons
- Mailing list: https://mail.kde.org/mailman/listinfo/kde-frameworks-devel
- IRC channel: #kde-devel on Freenode
- Git repository: https://projects.kde.org/projects/frameworks/kwidgetsaddons/repository
Files old/kwidgetsaddons-4.97.0/docs/pics/kled.png and new/kwidgetsaddons-4.98.0/docs/pics/kled.png differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-4.97.0/src/Messages.sh new/kwidgetsaddons-4.98.0/src/Messages.sh
--- old/kwidgetsaddons-4.97.0/src/Messages.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/kwidgetsaddons-4.98.0/src/Messages.sh 2014-03-29 08:00:08.000000000 +0100
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+# Invoke the extractrc script on all .ui, .rc, and .kcfg files in the sources.
+# The results are stored in a pseudo .cpp file to be picked up by xgettext.
+lst=`find . -name \*.rc -o -name \*.ui -o -name \*.kcfg`
+if [ -n "$lst" ] ; then
+ $EXTRACTRC $lst >> rc.cpp
+fi
+
+# If your framework contains tips-of-the-day, call preparetips as well.
+if [ -f "data/tips" ] ; then
+ ( cd data && $PREPARETIPS > ../tips.cpp )
+fi
+
+# Extract strings from all source files.
+# If your framework depends on KI18n, use $XGETTEXT. If it uses Qt translation
+# system, use $EXTRACT_TR_STRINGS.
+$EXTRACT_TR_STRINGS `find . -name \*.cpp -o -name \*.h -name \*.qml` -o $podir/kwidgetsaddons5.pot
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-4.97.0/src/kassistantdialog.cpp new/kwidgetsaddons-4.98.0/src/kassistantdialog.cpp
--- old/kwidgetsaddons-4.97.0/src/kassistantdialog.cpp 2014-03-01 12:51:46.000000000 +0100
+++ new/kwidgetsaddons-4.98.0/src/kassistantdialog.cpp 2014-03-29 08:00:08.000000000 +0100
@@ -188,4 +188,19 @@
return d->appropriate.value(page, true);
}
+QPushButton* KAssistantDialog::backButton() const
+{
+ return d->backButton;
+}
+
+QPushButton* KAssistantDialog::nextButton() const
+{
+ return d->nextButton;
+}
+
+QPushButton* KAssistantDialog::finishButton() const
+{
+ return d->finishButton;
+}
+
#include "moc_kassistantdialog.cpp"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-4.97.0/src/kassistantdialog.h new/kwidgetsaddons-4.98.0/src/kassistantdialog.h
--- old/kwidgetsaddons-4.97.0/src/kassistantdialog.h 2014-03-01 12:51:46.000000000 +0100
+++ new/kwidgetsaddons-4.98.0/src/kassistantdialog.h 2014-03-29 08:00:08.000000000 +0100
@@ -26,22 +26,12 @@
/**
* This class provides a framework for assistant dialogs.
*
- * The use of this class is the same as KWizard in KDE3.
- * You should use the word "assistant" instead of "wizard" both in the source
- * and translatable strings.
- *
* An assistant dialog consists of a sequence of pages.
* Its purpose is to guide the user (assist) through a process step by step.
* Assistant dialogs are useful for complex or infrequently occurring tasks
* that people may find difficult to learn or do.
* Sometimes a task requires too many input fields to fit them on a single dialog.
*
- * KAssistantDialog provides page titles and displays Next, Back, Finish, Cancel,
- * and Help push buttons, as appropriate to the current position in the page sequence.
- * The Finish Button has the code KDialog::User1, The Next button is KDialog::User2
- * and the Back button is KDialog::User3.
- * The help button may be hidden using showButton(KDialog::Help, false)
- *
* Create and populate dialog pages that inherit from QWidget and add them
* to the assistant dialog using addPage().
*
@@ -106,6 +96,21 @@
*/
bool isAppropriate(KPageWidgetItem *page) const;
+ /**
+ * @returns the next button
+ */
+ QPushButton* nextButton() const;
+
+ /**
+ * @returns the finish button
+ */
+ QPushButton* backButton() const;
+
+ /**
+ * @returns the finish button
+ */
+ QPushButton* finishButton() const;
+
public Q_SLOTS:
/**
* Called when the user clicks the Back button.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-4.97.0/src/kcharselectdata.cpp new/kwidgetsaddons-4.98.0/src/kcharselectdata.cpp
--- old/kwidgetsaddons-4.97.0/src/kcharselectdata.cpp 2014-03-01 12:51:46.000000000 +0100
+++ new/kwidgetsaddons-4.98.0/src/kcharselectdata.cpp 2014-03-29 08:00:08.000000000 +0100
@@ -71,11 +71,6 @@
QByteArray m_dataFile;
};
-inline QString tr(const char *s, const char *c = 0, int n = -1)
-{
- return QCoreApplication::translate("KCharSelectData", s, c, n);
-}
-
static const char JAMO_L_TABLE[][4] = {
"G", "GG", "N", "D", "DD", "R", "M", "B", "BB",
"S", "SS", "", "J", "JJ", "C", "K", "T", "P", "H"
@@ -232,7 +227,11 @@
QStringList list;
quint32 i = stringBegin;
while (i < stringEnd) {
- list.append(tr(data + 1, "KCharSelect section name"));
+ // FIXME: Is the content of data already marked as translatable,
+ // using "KCharSelectData" as context and "KCharSelct section name" as
+ // disambiguation string?
+ // If it is not then QCoreApplication::translate() will return it as is.
+ list.append(QCoreApplication::translate("KCharSelectData", data + 1, "KCharSelect section name"));
i += strlen(data + i) + 1;
}
@@ -276,13 +275,13 @@
return QLatin1String("HANGUL SYLLABLE ") + QLatin1String(JAMO_L_TABLE[LIndex])
+ QLatin1String(JAMO_V_TABLE[VIndex]) + QLatin1String(JAMO_T_TABLE[TIndex]);
} else if (unicode >= 0xD800 && unicode <= 0xDB7F) {
- return tr("<Non Private Use High Surrogate>");
+ return QCoreApplication::translate("KCharSelectData", "<Non Private Use High Surrogate>");
} else if (unicode >= 0xDB80 && unicode <= 0xDBFF) {
- return tr("<Private Use High Surrogate>");
+ return QCoreApplication::translate("KCharSelectData", "<Private Use High Surrogate>");
} else if (unicode >= 0xDC00 && unicode <= 0xDFFF) {
- return tr("<Low Surrogate>");
+ return QCoreApplication::translate("KCharSelectData", "<Low Surrogate>");
} else if (unicode >= 0xE000 && unicode <= 0xF8FF) {
- return tr("<Private Use>");
+ return QCoreApplication::translate("KCharSelectData", "<Private Use>");
}
// else if (unicode >= 0xF0000 && unicode <= 0xFFFFD) // 16 bit!
// return tr("");
@@ -313,7 +312,7 @@
}
if (s.isNull()) {
- return tr("<not assigned>");
+ return QCoreApplication::translate("KCharSelectData", "<not assigned>");
} else {
return s;
}
@@ -382,7 +381,7 @@
currIndex++;
}
- return tr(data + i, "KCharselect unicode block name");
+ return QCoreApplication::translate("KCharSelectData", data + i, "KCharselect unicode block name");
}
QString KCharSelectData::sectionName(int index)
@@ -404,7 +403,7 @@
currIndex++;
}
- return tr(data + i, "KCharselect unicode section name");
+ return QCoreApplication::translate("KCharSelectData", data + i, "KCharselect unicode section name");
}
QStringList KCharSelectData::aliases(const QChar &c)
@@ -649,7 +648,7 @@
bool KCharSelectData::isCombining(const QChar &c)
{
- return section(c) == tr("Combining Diacritical Marks", "KCharSelect section name");
+ return section(c) == QCoreApplication::translate("KCharSelectData", "Combining Diacritical Marks", "KCharSelect section name");
//FIXME: this is an imperfect test. There are many combining characters
// that are outside of this section. See Grapheme_Extend in
// http://www.unicode.org/Public/UNIDATA/DerivedCoreProperties.txt
@@ -658,7 +657,7 @@
QString KCharSelectData::display(const QChar &c, const QFont &font)
{
if (!isDisplayable(c)) {
- return QStringLiteral("<b>") + tr("Non-printable") + QStringLiteral("</b>");
+ return QStringLiteral("<b>") + QCoreApplication::translate("KCharSelectData", "Non-printable") + QStringLiteral("</b>");
} else {
QString s = QStringLiteral("");
if (isCombining(c)) {
@@ -691,37 +690,37 @@
QString KCharSelectData::categoryText(QChar::Category category)
{
switch (category) {
- case QChar::Other_Control: return tr("Other, Control");
- case QChar::Other_Format: return tr("Other, Format");
- case QChar::Other_NotAssigned: return tr("Other, Not Assigned");
- case QChar::Other_PrivateUse: return tr("Other, Private Use");
- case QChar::Other_Surrogate: return tr("Other, Surrogate");
- case QChar::Letter_Lowercase: return tr("Letter, Lowercase");
- case QChar::Letter_Modifier: return tr("Letter, Modifier");
- case QChar::Letter_Other: return tr("Letter, Other");
- case QChar::Letter_Titlecase: return tr("Letter, Titlecase");
- case QChar::Letter_Uppercase: return tr("Letter, Uppercase");
- case QChar::Mark_SpacingCombining: return tr("Mark, Spacing Combining");
- case QChar::Mark_Enclosing: return tr("Mark, Enclosing");
- case QChar::Mark_NonSpacing: return tr("Mark, Non-Spacing");
- case QChar::Number_DecimalDigit: return tr("Number, Decimal Digit");
- case QChar::Number_Letter: return tr("Number, Letter");
- case QChar::Number_Other: return tr("Number, Other");
- case QChar::Punctuation_Connector: return tr("Punctuation, Connector");
- case QChar::Punctuation_Dash: return tr("Punctuation, Dash");
- case QChar::Punctuation_Close: return tr("Punctuation, Close");
- case QChar::Punctuation_FinalQuote: return tr("Punctuation, Final Quote");
- case QChar::Punctuation_InitialQuote: return tr("Punctuation, Initial Quote");
- case QChar::Punctuation_Other: return tr("Punctuation, Other");
- case QChar::Punctuation_Open: return tr("Punctuation, Open");
- case QChar::Symbol_Currency: return tr("Symbol, Currency");
- case QChar::Symbol_Modifier: return tr("Symbol, Modifier");
- case QChar::Symbol_Math: return tr("Symbol, Math");
- case QChar::Symbol_Other: return tr("Symbol, Other");
- case QChar::Separator_Line: return tr("Separator, Line");
- case QChar::Separator_Paragraph: return tr("Separator, Paragraph");
- case QChar::Separator_Space: return tr("Separator, Space");
- default: return tr("Unknown");
+ case QChar::Other_Control: return QCoreApplication::translate("KCharSelectData", "Other, Control");
+ case QChar::Other_Format: return QCoreApplication::translate("KCharSelectData", "Other, Format");
+ case QChar::Other_NotAssigned: return QCoreApplication::translate("KCharSelectData", "Other, Not Assigned");
+ case QChar::Other_PrivateUse: return QCoreApplication::translate("KCharSelectData", "Other, Private Use");
+ case QChar::Other_Surrogate: return QCoreApplication::translate("KCharSelectData", "Other, Surrogate");
+ case QChar::Letter_Lowercase: return QCoreApplication::translate("KCharSelectData", "Letter, Lowercase");
+ case QChar::Letter_Modifier: return QCoreApplication::translate("KCharSelectData", "Letter, Modifier");
+ case QChar::Letter_Other: return QCoreApplication::translate("KCharSelectData", "Letter, Other");
+ case QChar::Letter_Titlecase: return QCoreApplication::translate("KCharSelectData", "Letter, Titlecase");
+ case QChar::Letter_Uppercase: return QCoreApplication::translate("KCharSelectData", "Letter, Uppercase");
+ case QChar::Mark_SpacingCombining: return QCoreApplication::translate("KCharSelectData", "Mark, Spacing Combining");
+ case QChar::Mark_Enclosing: return QCoreApplication::translate("KCharSelectData", "Mark, Enclosing");
+ case QChar::Mark_NonSpacing: return QCoreApplication::translate("KCharSelectData", "Mark, Non-Spacing");
+ case QChar::Number_DecimalDigit: return QCoreApplication::translate("KCharSelectData", "Number, Decimal Digit");
+ case QChar::Number_Letter: return QCoreApplication::translate("KCharSelectData", "Number, Letter");
+ case QChar::Number_Other: return QCoreApplication::translate("KCharSelectData", "Number, Other");
+ case QChar::Punctuation_Connector: return QCoreApplication::translate("KCharSelectData", "Punctuation, Connector");
+ case QChar::Punctuation_Dash: return QCoreApplication::translate("KCharSelectData", "Punctuation, Dash");
+ case QChar::Punctuation_Close: return QCoreApplication::translate("KCharSelectData", "Punctuation, Close");
+ case QChar::Punctuation_FinalQuote: return QCoreApplication::translate("KCharSelectData", "Punctuation, Final Quote");
+ case QChar::Punctuation_InitialQuote: return QCoreApplication::translate("KCharSelectData", "Punctuation, Initial Quote");
+ case QChar::Punctuation_Other: return QCoreApplication::translate("KCharSelectData", "Punctuation, Other");
+ case QChar::Punctuation_Open: return QCoreApplication::translate("KCharSelectData", "Punctuation, Open");
+ case QChar::Symbol_Currency: return QCoreApplication::translate("KCharSelectData", "Symbol, Currency");
+ case QChar::Symbol_Modifier: return QCoreApplication::translate("KCharSelectData", "Symbol, Modifier");
+ case QChar::Symbol_Math: return QCoreApplication::translate("KCharSelectData", "Symbol, Math");
+ case QChar::Symbol_Other: return QCoreApplication::translate("KCharSelectData", "Symbol, Other");
+ case QChar::Separator_Line: return QCoreApplication::translate("KCharSelectData", "Separator, Line");
+ case QChar::Separator_Paragraph: return QCoreApplication::translate("KCharSelectData", "Separator, Paragraph");
+ case QChar::Separator_Space: return QCoreApplication::translate("KCharSelectData", "Separator, Space");
+ default: return QCoreApplication::translate("KCharSelectData", "Unknown");
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-4.97.0/src/kcolorcombo.cpp new/kwidgetsaddons-4.98.0/src/kcolorcombo.cpp
--- old/kwidgetsaddons-4.97.0/src/kcolorcombo.cpp 2014-03-01 12:51:46.000000000 +0100
+++ new/kwidgetsaddons-4.98.0/src/kcolorcombo.cpp 2014-03-29 08:00:08.000000000 +0100
@@ -336,7 +336,7 @@
void KColorComboPrivate::addColors()
{
- q->addItem(q->tr("Custom...", "Custom color"));
+ q->addItem(KColorCombo::tr("Custom...", "Custom color"));
if (colorList.isEmpty()) {
for (int i = 0; i < STANDARD_PALETTE_SIZE; ++i) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-4.97.0/src/kdatecombobox.cpp new/kwidgetsaddons-4.98.0/src/kdatecombobox.cpp
--- old/kwidgetsaddons-4.97.0/src/kdatecombobox.cpp 2014-03-01 12:51:46.000000000 +0100
+++ new/kwidgetsaddons-4.98.0/src/kdatecombobox.cpp 2014-03-29 08:00:08.000000000 +0100
@@ -161,17 +161,18 @@
if ((m_options & KDateComboBox::DateKeywords) == KDateComboBox::DateKeywords) {
if (m_dateMap.isEmpty()) {
- addMenuAction(q->tr("Next Year", "@option next year"), m_date.addYears(1));
- addMenuAction(q->tr("Next Month", "@option next month"), m_date.addMonths(1));
- addMenuAction(q->tr("Next Week", "@option next week"), m_date.addDays(7));
- addMenuAction(q->tr("Tomorrow", "@option tomorrow"), m_date.addDays(1));
- addMenuAction(q->tr("Today", "@option today"), m_date);
- addMenuAction(q->tr("Yesterday", "@option yesterday"), m_date.addDays(-1));
- addMenuAction(q->tr("Last Week", "@option last week"), m_date.addDays(-7));
- addMenuAction(q->tr("Last Month", "@option last month"), m_date.addMonths(-1));
- addMenuAction(q->tr("Last Year", "@option last year"), m_date.addYears(-1));
+ addMenuAction(KDateComboBox::tr("Next Year", "@option next year"), m_date.addYears(1));
+ addMenuAction(KDateComboBox::tr("Next Month", "@option next month"), m_date.addMonths(1));
+ addMenuAction(KDateComboBox::tr("Next Week", "@option next week"), m_date.addDays(7));
+ addMenuAction(KDateComboBox::tr("Tomorrow", "@option tomorrow"), m_date.addDays(1));
+ addMenuAction(KDateComboBox::tr("Today", "@option today"), m_date);
+ addMenuAction(KDateComboBox::tr("Yesterday", "@option yesterday"), m_date.addDays(-1));
+ addMenuAction(KDateComboBox::tr("Last Week", "@option last week"), m_date.addDays(-7));
+ addMenuAction(KDateComboBox::tr("Last Month", "@option last month"), m_date.addMonths(-1));
+ addMenuAction(KDateComboBox::tr("Last Year", "@option last year"), m_date.addYears(-1));
m_dateMenu->addSeparator();
- addMenuAction(q->tr("No Date", "@option do not specify a date"), QDate());
+ addMenuAction(KDateComboBox::tr("No Date", "@option do not specify a date"), QDate());
+
} else {
QMapIterator i(m_dateMap);
while (i.hasNext()) {
@@ -268,17 +269,17 @@
(m_options & KDateComboBox::WarnOnInvalid) == KDateComboBox::WarnOnInvalid) {
QString warnMsg;
if (!m_date.isValid()) {
- warnMsg = q->tr("The date you entered is invalid", "@info");
+ warnMsg = KDateComboBox::tr("The date you entered is invalid", "@info");
} else if (m_minDate.isValid() && m_date < m_minDate) {
if (m_minWarnMsg.isEmpty()) {
- warnMsg = q->tr("Date cannot be earlier than %1", "@info").arg(formatDate(m_minDate));
+ warnMsg = KDateComboBox::tr("Date cannot be earlier than %1", "@info").arg(formatDate(m_minDate));
} else {
warnMsg = m_minWarnMsg;
warnMsg.replace(QStringLiteral("%1"), formatDate(m_minDate));
}
} else if (m_maxDate.isValid() && m_date > m_maxDate) {
if (m_maxWarnMsg.isEmpty()) {
- warnMsg = q->tr("Date cannot be later than %1", "@info").arg(formatDate(m_maxDate));
+ warnMsg = KDateComboBox::tr("Date cannot be later than %1", "@info").arg(formatDate(m_maxDate));
} else {
warnMsg = m_maxWarnMsg;
warnMsg.replace(QStringLiteral("%1"), formatDate(m_maxDate));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-4.97.0/src/kdatetimeedit.cpp new/kwidgetsaddons-4.98.0/src/kdatetimeedit.cpp
--- old/kwidgetsaddons-4.97.0/src/kdatetimeedit.cpp 2014-03-01 12:51:46.000000000 +0100
+++ new/kwidgetsaddons-4.98.0/src/kdatetimeedit.cpp 2014-03-29 08:00:08.000000000 +0100
@@ -186,8 +186,8 @@
{
ui.m_timeZoneCombo->blockSignals(true);
ui.m_timeZoneCombo->clear();
- ui.m_timeZoneCombo->addItem(q->tr("UTC", "UTC time zone"), QByteArray("UTC"));
- ui.m_timeZoneCombo->addItem(q->tr("Floating", "No specific time zone"), QByteArray());
+ ui.m_timeZoneCombo->addItem(KDateTimeEdit::tr("UTC", "UTC time zone"), QByteArray("UTC"));
+ ui.m_timeZoneCombo->addItem(KDateTimeEdit::tr("Floating", "No specific time zone"), QByteArray());
foreach (const QTimeZone &zone, m_zones) {
ui.m_timeZoneCombo->addItem(QString::fromUtf8(zone.id()), zone.id());
}
@@ -227,7 +227,7 @@
if (m_minWarnMsg.isEmpty()) {
//TODO Add datetime to string
//warnMsg = q->tr("Date and time cannot be earlier than %1", "@info").arg(formatDate(m_minDate));
- warnMsg = q->tr("The entered date and time is before the minimum allowed date and time.", "@info");
+ warnMsg = KDateTimeEdit::tr("The entered date and time is before the minimum allowed date and time.", "@info");
} else {
warnMsg = m_minWarnMsg;
//TODO localize properly
@@ -237,7 +237,7 @@
if (m_maxWarnMsg.isEmpty()) {
//TODO Add datetime to string
//warnMsg = q->tr("Date cannot be later than %1", "@info").arg(formatDate(m_maxDate));
- warnMsg = q->tr("The entered date and time is after the maximum allowed date and time.", "@info");
+ warnMsg = KDateTimeEdit::tr("The entered date and time is after the maximum allowed date and time.", "@info");
} else {
warnMsg = m_maxWarnMsg;
warnMsg.replace(QStringLiteral("%1"), q->locale().toString(m_maxDateTime));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-4.97.0/src/kfontchooser.cpp new/kwidgetsaddons-4.98.0/src/kfontchooser.cpp
--- old/kwidgetsaddons-4.97.0/src/kfontchooser.cpp 2014-03-01 12:51:46.000000000 +0100
+++ new/kwidgetsaddons-4.98.0/src/kfontchooser.cpp 2014-03-29 08:00:08.000000000 +0100
@@ -156,7 +156,7 @@
d(new KFontChooser::Private(this))
{
d->usingFixed = flags & FixedFontsOnly;
- setWhatsThis(tr("Here you can choose the font to be used.", "@info:whatsthis"));
+ setWhatsThis(KFontChooser::tr("Here you can choose the font to be used.", "@info:whatsthis"));
// The top layout is divided vertically into a splitter with font
// attribute widgets and preview on the top, and XLFD data at the bottom.
@@ -178,7 +178,7 @@
QGridLayout *gridLayout;
int row = 0;
if (flags & DisplayFrame) {
- page = new QGroupBox(tr("Requested Font"), this);
+ page = new QGroupBox(KFontChooser::tr("Requested Font"), this);
splitter->addWidget(page);
gridLayout = new QGridLayout(page);
row = 1;
@@ -195,32 +195,32 @@
QHBoxLayout *familyLayout = new QHBoxLayout();
familyLayout->addSpacing(checkBoxGap);
if (flags & ShowDifferences) {
- d->familyCheckbox = new QCheckBox(tr("Font", "@option:check"), page);
+ d->familyCheckbox = new QCheckBox(KFontChooser::tr("Font", "@option:check"), page);
connect(d->familyCheckbox, SIGNAL(toggled(bool)),
this, SLOT(_k_toggled_checkbox()));
familyLayout->addWidget(d->familyCheckbox, 0, Qt::AlignLeft);
- d->familyCheckbox->setWhatsThis(tr("Enable this checkbox to change the font family settings.", "@info:whatsthis"));
- d->familyCheckbox->setToolTip(tr("Change font family?", "@info:tooltip"));
+ d->familyCheckbox->setWhatsThis(KFontChooser::tr("Enable this checkbox to change the font family settings.", "@info:whatsthis"));
+ d->familyCheckbox->setToolTip(KFontChooser::tr("Change font family?", "@info:tooltip"));
d->familyLabel = 0;
} else {
d->familyCheckbox = 0;
- d->familyLabel = new QLabel(tr("Font:", "@label"), page);
+ d->familyLabel = new QLabel(KFontChooser::tr("Font:", "@label"), page);
familyLayout->addWidget(d->familyLabel, 1, Qt::AlignLeft);
}
gridLayout->addLayout(familyLayout, row, 0);
QHBoxLayout *styleLayout = new QHBoxLayout();
if (flags & ShowDifferences) {
- d->styleCheckbox = new QCheckBox(tr("Font style", "@option:check"), page);
+ d->styleCheckbox = new QCheckBox(KFontChooser::tr("Font style", "@option:check"), page);
connect(d->styleCheckbox, SIGNAL(toggled(bool)),
this, SLOT(_k_toggled_checkbox()));
styleLayout->addWidget(d->styleCheckbox, 0, Qt::AlignLeft);
- d->styleCheckbox->setWhatsThis(tr("Enable this checkbox to change the font style settings.", "@info:whatsthis"));
- d->styleCheckbox->setToolTip(tr("Change font style?", "@info:tooltip"));
+ d->styleCheckbox->setWhatsThis(KFontChooser::tr("Enable this checkbox to change the font style settings.", "@info:whatsthis"));
+ d->styleCheckbox->setToolTip(KFontChooser::tr("Change font style?", "@info:tooltip"));
d->styleLabel = 0;
} else {
d->styleCheckbox = 0;
- d->styleLabel = new QLabel(tr("Font style:"), page);
+ d->styleLabel = new QLabel(KFontChooser::tr("Font style:"), page);
styleLayout->addWidget(d->styleLabel, 1, Qt::AlignLeft);
}
styleLayout->addSpacing(checkBoxGap);
@@ -228,16 +228,16 @@
QHBoxLayout *sizeLayout = new QHBoxLayout();
if (flags & ShowDifferences) {
- d->sizeCheckbox = new QCheckBox(tr("Size", "@option:check"), page);
+ d->sizeCheckbox = new QCheckBox(KFontChooser::tr("Size", "@option:check"), page);
connect(d->sizeCheckbox, SIGNAL(toggled(bool)),
this, SLOT(_k_toggled_checkbox()));
sizeLayout->addWidget(d->sizeCheckbox, 0, Qt::AlignLeft);
- d->sizeCheckbox->setWhatsThis(tr("Enable this checkbox to change the font size settings.", "@info:whatsthis"));
- d->sizeCheckbox->setToolTip(tr("Change font size?", "@info:tooltip"));
+ d->sizeCheckbox->setWhatsThis(KFontChooser::tr("Enable this checkbox to change the font size settings.", "@info:whatsthis"));
+ d->sizeCheckbox->setToolTip(KFontChooser::tr("Change font size?", "@info:tooltip"));
d->sizeLabel = 0;
} else {
d->sizeCheckbox = 0;
- d->sizeLabel = new QLabel(tr("Size:", "@label:listbox Font size"), page);
+ d->sizeLabel = new QLabel(KFontChooser::tr("Size:", "@label:listbox Font size"), page);
sizeLayout->addWidget(d->sizeLabel, 1, Qt::AlignLeft);
}
sizeLayout->addSpacing(checkBoxGap);
@@ -253,7 +253,7 @@
d->familyListBox->setEnabled(flags ^ ShowDifferences);
gridLayout->addWidget(d->familyListBox, row, 0);
QString fontFamilyWhatsThisText(
- tr("Here you can choose the font family to be used.", "@info:whatsthis"));
+ KFontChooser::tr("Here you can choose the font family to be used.", "@info:whatsthis"));
d->familyListBox->setWhatsThis(fontFamilyWhatsThisText);
if (flags & ShowDifferences) {
@@ -277,7 +277,7 @@
d->styleListBox = new QListWidget(page);
d->styleListBox->setEnabled(flags ^ ShowDifferences);
gridLayout->addWidget(d->styleListBox, row, 1);
- d->styleListBox->setWhatsThis(tr("Here you can choose the font style to be used.", "@info:whatsthis"));
+ d->styleListBox->setWhatsThis(KFontChooser::tr("Here you can choose the font style to be used.", "@info:whatsthis"));
if (flags & ShowDifferences) {
((QWidget *)d->styleCheckbox)->setWhatsThis(fontFamilyWhatsThisText);
} else {
@@ -285,11 +285,11 @@
}
// Populate usual styles, to determine minimum list width;
// will be replaced later with correct styles.
- d->styleListBox->addItem(TR_NOX("Normal", "QFontDatabase"));
- d->styleListBox->addItem(tr("Italic", "@item font"));
- d->styleListBox->addItem(tr("Oblique", "@item font"));
- d->styleListBox->addItem(tr("Bold", "@item font"));
- d->styleListBox->addItem(tr("Bold Italic", "@item font"));
+ d->styleListBox->addItem(KFontChooser::tr("Normal", "QFontDatabase"));
+ d->styleListBox->addItem(KFontChooser::tr("Italic", "@item font"));
+ d->styleListBox->addItem(KFontChooser::tr("Oblique", "@item font"));
+ d->styleListBox->addItem(KFontChooser::tr("Bold", "@item font"));
+ d->styleListBox->addItem(KFontChooser::tr("Bold Italic", "@item font"));
d->styleListBox->setMinimumWidth(minimumListWidth(d->styleListBox));
d->styleListBox->setMinimumHeight(
minimumListHeight(d->styleListBox, visibleListSize));
@@ -308,11 +308,11 @@
d->sizeOfFont->setEnabled(flags ^ ShowDifferences);
if (sizeIsRelativeState) {
QString sizeIsRelativeCBText =
- tr("Relative", "@item font size");
+ KFontChooser::tr("Relative", "@item font size");
QString sizeIsRelativeCBToolTipText =
- tr("Font size<br /><i>fixed</i> or <i>relative</i><br />to environment");
+ KFontChooser::tr("Font size<br /><i>fixed</i> or <i>relative</i><br />to environment");
QString sizeIsRelativeCBWhatsThisText =
- tr("Here you can switch between fixed font size and font size "
+ KFontChooser::tr("Here you can switch between fixed font size and font size "
"to be calculated dynamically and adjusted to changing "
"environment (e.g. widget dimensions, paper size).");
d->sizeIsRelativeCheckBox = new QCheckBox(sizeIsRelativeCBText,
@@ -336,7 +336,7 @@
sizeLayout2->addWidget(d->sizeListBox, 1, 0);
}
QString fontSizeWhatsThisText =
- tr("Here you can choose the font size to be used.");
+ KFontChooser::tr("Here you can choose the font size to be used.");
d->sizeListBox->setWhatsThis(fontSizeWhatsThisText);
if (flags & ShowDifferences) {
@@ -374,10 +374,10 @@
// Replace it with a sample text in your language, such that it is
// representative of language's writing system.
// If you wish, you can input several lines of text separated by \n.
- setSampleText(tr("The Quick Brown Fox Jumps Over The Lazy Dog"));
+ setSampleText(KFontChooser::tr("The Quick Brown Fox Jumps Over The Lazy Dog"));
d->sampleEdit->setTextCursor(QTextCursor(d->sampleEdit->document()));
QString sampleEditWhatsThisText =
- tr("This sample text illustrates the current settings. "
+ KFontChooser::tr("This sample text illustrates the current settings. "
"You may edit it to test special characters.");
d->sampleEdit->setWhatsThis(sampleEditWhatsThisText);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-4.97.0/src/kled.cpp new/kwidgetsaddons-4.98.0/src/kled.cpp
--- old/kwidgetsaddons-4.97.0/src/kled.cpp 2014-03-01 12:51:46.000000000 +0100
+++ new/kwidgetsaddons-4.98.0/src/kled.cpp 2014-03-29 08:00:08.000000000 +0100
@@ -41,8 +41,6 @@
Shape shape;
QPixmap cachedPixmap[2]; // for both states
- QStyle::ControlElement ce_indicatorLedCircular;
- QStyle::ControlElement ce_indicatorLedRectangular;
};
KLed::KLed(QWidget *parent)
@@ -76,84 +74,6 @@
delete d;
}
-void KLed::paintEvent(QPaintEvent *)
-{
- switch (d->shape) {
- case Rectangular:
- switch (d->look) {
- case Sunken:
- paintRectFrame(false);
- break;
- case Raised:
- paintRectFrame(true);
- break;
- case Flat:
- paintRect();
- break;
- }
- break;
- case Circular:
- switch (d->look) {
- case Flat:
- paintFlat();
- break;
- case Raised:
- paintRaised();
- break;
- case Sunken:
- paintSunken();
- break;
- }
- break;
- }
-}
-
-int KLed::ledWidth() const
-{
- // Make sure the LED is round!
- int size = qMin(width(), height());
-
- // leave one pixel border
- size -= 2;
-
- return qMax(0, size);
-}
-
-bool KLed::paintCachedPixmap()
-{
- if (d->cachedPixmap[d->state].isNull()) {
- return false;
- }
- QPainter painter(this);
- painter.drawPixmap(1, 1, d->cachedPixmap[d->state]);
- return true;
-}
-
-void KLed::paintFlat()
-{
- paintLed(Circular, Flat);
-}
-
-void KLed::paintRaised()
-{
- paintLed(Circular, Raised);
-}
-
-void KLed::paintSunken()
-{
- paintLed(Circular, Sunken);
-}
-
-void KLed::paintRect()
-{
- paintLed(Rectangular, Flat);
-}
-
-void KLed::paintRectFrame(bool raised)
-{
- paintLed(Rectangular, raised ? Raised : Sunken);
-}
-
KLed::State KLed::state() const
{
return d->state;
@@ -270,16 +190,19 @@
update();
}
-void KLed::paintLed(Shape shape, Look look)
+void KLed::paintEvent(QPaintEvent *)
{
- if (paintCachedPixmap()) {
+ if (!d->cachedPixmap[d->state].isNull()) {
+ QPainter painter(this);
+ painter.drawPixmap(1, 1, d->cachedPixmap[d->state]);
return;
}
QSize size(width() - 2, height() - 2);
- if (shape == Circular) {
- const int width = ledWidth();
- size = QSize(width, width);
+ if (d->shape == Circular) {
+ // Make sure the LED is round
+ const int dim = qMin(width(), height()) - 2;
+ size = QSize(dim, dim);
}
QPointF center(size.width() / 2.0, size.height() / 2.0);
const int smallestSize = qMin(size.width(), size.height());
@@ -294,7 +217,7 @@
fillGradient.setColorAt(0.5, fillColor.light(130));
fillGradient.setColorAt(1.0, fillColor);
- QConicalGradient borderGradient(center, look == Sunken ? 90 : -90);
+ QConicalGradient borderGradient(center, d->look == Sunken ? 90 : -90);
QColor borderColor = palette().color(QPalette::Dark);
if (d->state == On) {
QColor glowOverlay = fillColor;
@@ -319,12 +242,12 @@
painter.begin(&image);
painter.setRenderHint(QPainter::Antialiasing);
- painter.setBrush(look == Flat ? QBrush(fillColor) : QBrush(fillGradient));
- const QBrush penBrush = (look == Flat) ? QBrush(borderColor) : QBrush(borderGradient);
+ painter.setBrush(d->look == Flat ? QBrush(fillColor) : QBrush(fillGradient));
+ const QBrush penBrush = (d->look == Flat) ? QBrush(borderColor) : QBrush(borderGradient);
const qreal penWidth = smallestSize / 8.0;
painter.setPen(QPen(penBrush, penWidth));
QRectF r(penWidth / 2.0, penWidth / 2.0, size.width() - penWidth, size.height() - penWidth);
- if (shape == Rectangular) {
+ if (d->shape == Rectangular) {
painter.drawRect(r);
} else {
painter.drawEllipse(r);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-4.97.0/src/kled.h new/kwidgetsaddons-4.98.0/src/kled.h
--- old/kwidgetsaddons-4.97.0/src/kled.h 2014-03-01 12:51:46.000000000 +0100
+++ new/kwidgetsaddons-4.98.0/src/kled.h 2014-03-29 08:00:08.000000000 +0100
@@ -261,57 +261,15 @@
void off();
protected:
- /**
- * Returns the width of the led.
- */
- virtual int ledWidth() const;
-
- /**
- * Paints a circular, flat LED.
- */
- virtual void paintFlat();
-
- /**
- * Paints a circular, raised LED.
- */
- virtual void paintRaised();
-
- /**
- * Paints a circular, sunken LED.
- */
- virtual void paintSunken();
-
- /**
- * Paints a rectangular, flat LED.
- */
- virtual void paintRect();
-
- /**
- * Paints a rectangular LED, either raised or
- * sunken, depending on its argument.
- */
- virtual void paintRectFrame(bool raised);
-
void paintEvent(QPaintEvent *);
void resizeEvent(QResizeEvent *);
/**
- * Paint the cached antialiased pixmap corresponding to the state if any
- * @return true if the pixmap was painted, false if it hasn't been created yet
- */
- bool paintCachedPixmap();
-
- /**
* @internal
* invalidates caches after property changes and calls update()
*/
void updateCachedPixmap();
- /**
- * @internal
- */
- void paintLed(Shape shape, Look look);
-
private:
class Private;
Private *const d;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-4.97.0/src/kmessagebox.h new/kwidgetsaddons-4.98.0/src/kmessagebox.h
--- old/kwidgetsaddons-4.97.0/src/kmessagebox.h 2014-03-01 12:51:46.000000000 +0100
+++ new/kwidgetsaddons-4.98.0/src/kmessagebox.h 2014-03-29 08:00:08.000000000 +0100
@@ -48,19 +48,6 @@
* be plaintext or richtext. If the text is plaintext, a newline-character
* may be used to indicate the end of a paragraph.
*
- * @port4 Where applicable, the functions now take an additional
- * argument to specify the cancel button. Since a default argument is
- * provided, this will affect your code only, if you specified
- * dontAskAgainName and/or options. In those cases, adding an additional
- * parameter KStandardGuiItem::cancel() leads to the old behavior. The
- * following functions are affected (omitting function arguments in the
- * list): questionYesNoCancel(), questionYesNoCancelWId(),
- * warningContinueCancel(), warningContinueCancelWId(),
- * warningContinueCancelList(), warningContinueCancelListWId(),
- * warningYesNoCancel(), warningYesNoCancelWId(),
- * warningYesNoCancelList(), warningYesNoCancelListWId(), messageBox(),
- * messageBoxWId().
- *
* \image html kmessagebox.png "KDE Message Box (using questionYesNo())"
*
* @author Waldo Bastian (bastian@kde.org)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-4.97.0/src/kmessagewidget.cpp new/kwidgetsaddons-4.98.0/src/kmessagewidget.cpp
--- old/kwidgetsaddons-4.97.0/src/kmessagewidget.cpp 2014-03-01 12:51:46.000000000 +0100
+++ new/kwidgetsaddons-4.98.0/src/kmessagewidget.cpp 2014-03-29 08:00:08.000000000 +0100
@@ -87,8 +87,8 @@
QObject::connect(textLabel, SIGNAL(linkHovered(QString)), q, SIGNAL(linkHovered(QString)));
QAction *closeAction = new QAction(q);
- closeAction->setText(q->tr("&Close"));
- closeAction->setToolTip(q->tr("Close message"));
+ closeAction->setText(KMessageWidget::tr("&Close"));
+ closeAction->setToolTip(KMessageWidget::tr("Close message"));
closeAction->setIcon(q->style()->standardIcon(QStyle::SP_DialogCloseButton));
QObject::connect(closeAction, SIGNAL(triggered(bool)), q, SLOT(animatedHide()));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-4.97.0/src/knewpassworddialog.cpp new/kwidgetsaddons-4.98.0/src/knewpassworddialog.cpp
--- old/kwidgetsaddons-4.97.0/src/knewpassworddialog.cpp 2014-03-01 12:51:46.000000000 +0100
+++ new/kwidgetsaddons-4.98.0/src/knewpassworddialog.cpp 2014-03-29 08:00:08.000000000 +0100
@@ -158,7 +158,7 @@
} else {
if (ui.linePassword->text().length() < minPasswordLength) {
ui.labelMatch->setPixmap(QIcon::fromTheme(QStringLiteral("dialog-error")));
- ui.labelMatch->setText(tr("Password must be at least %1 character(s) long").arg(minimumPasswordLength));
+ ui.labelMatch->setText(tr("Password must be at least %n character(s) long", "", minimumPasswordLength));
} else {
ui.labelMatch->setPixmap(match ? QIcon::fromTheme(QStringLiteral("dialog-ok")) : QIcon::fromTheme(QStringLiteral("dialog-error")));
ui.labelMatch->setText(match ? tr("Passwords match")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-4.97.0/src/kpassworddialog.cpp new/kwidgetsaddons-4.98.0/src/kpassworddialog.cpp
--- old/kwidgetsaddons-4.97.0/src/kpassworddialog.cpp 2014-03-01 12:51:46.000000000 +0100
+++ new/kwidgetsaddons-4.98.0/src/kpassworddialog.cpp 2014-03-29 08:00:08.000000000 +0100
@@ -401,4 +401,9 @@
return true;
}
+QDialogButtonBox *KPasswordDialog::buttonBox() const
+{
+ return d->ui.buttonBox;
+}
+
#include "moc_kpassworddialog.cpp"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-4.97.0/src/kpassworddialog.h new/kwidgetsaddons-4.98.0/src/kpassworddialog.h
--- old/kwidgetsaddons-4.97.0/src/kpassworddialog.h 2014-03-01 12:51:46.000000000 +0100
+++ new/kwidgetsaddons-4.98.0/src/kpassworddialog.h 2014-03-29 08:00:08.000000000 +0100
@@ -267,6 +267,16 @@
*/
void accept();
+ /**
+ * Returns the button box used in the dialog.
+ * This can be used to add new buttons.
+ *
+ * @return the button box
+ *
+ * @since 5.0
+ */
+ QDialogButtonBox *buttonBox() const;
+
Q_SIGNALS:
/**
* emitted when the dialog has been accepted
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-4.97.0/src/kpopupframe.cpp new/kwidgetsaddons-4.98.0/src/kpopupframe.cpp
--- old/kwidgetsaddons-4.97.0/src/kpopupframe.cpp 2014-03-01 12:51:46.000000000 +0100
+++ new/kwidgetsaddons-4.98.0/src/kpopupframe.cpp 2014-03-29 08:00:08.000000000 +0100
@@ -115,6 +115,11 @@
}
}
+void KPopupFrame::hideEvent(QHideEvent *e)
+{
+ QFrame::hideEvent(e);
+}
+
void KPopupFrame::close(int r)
{
d->result = r;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-4.97.0/src/kpopupframe.h new/kwidgetsaddons-4.98.0/src/kpopupframe.h
--- old/kwidgetsaddons-4.97.0/src/kpopupframe.h 2014-03-01 12:51:46.000000000 +0100
+++ new/kwidgetsaddons-4.98.0/src/kpopupframe.h 2014-03-29 08:00:08.000000000 +0100
@@ -39,6 +39,11 @@
*/
virtual void keyPressEvent(QKeyEvent *e);
+ /**
+ * Catch hide events.
+ */
+ virtual void hideEvent(QHideEvent *e);
+
public Q_SLOTS:
/**
* Close the popup window. This is called from the main widget, usually.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-4.97.0/src/kselectaction.h new/kwidgetsaddons-4.98.0/src/kselectaction.h
--- old/kwidgetsaddons-4.97.0/src/kselectaction.h 2014-03-01 12:51:46.000000000 +0100
+++ new/kwidgetsaddons-4.98.0/src/kselectaction.h 2014-03-29 08:00:08.000000000 +0100
@@ -296,12 +296,19 @@
void setMaxComboViewCount(int n);
/**
- * Clears up all the items in this action.
- * \warning The actions will be deleted for backwards compatibility with KDE3.
- * If you just want to remove all actions, use removeAllActions()
+ * Remove and delete all the items in this action.
+ *
+ * @see removeAllActions()
*/
void clear();
+ /**
+ * Remove all the items in this action.
+ *
+ * Unlike clear(), this will not delete the actions.
+ *
+ * @see clear()
+ */
void removeAllActions();
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-4.97.0/src/ktimecombobox.cpp new/kwidgetsaddons-4.98.0/src/ktimecombobox.cpp
--- old/kwidgetsaddons-4.97.0/src/ktimecombobox.cpp 2014-03-01 12:51:46.000000000 +0100
+++ new/kwidgetsaddons-4.98.0/src/ktimecombobox.cpp 2014-03-29 08:00:08.000000000 +0100
@@ -249,17 +249,17 @@
(m_options & KTimeComboBox::WarnOnInvalid) == KTimeComboBox::WarnOnInvalid) {
QString warnMsg;
if (!m_time.isValid()) {
- warnMsg = q->tr("The time you entered is invalid", "@info");
+ warnMsg = KTimeComboBox::tr("The time you entered is invalid", "@info");
} else if (m_time < m_minTime) {
if (m_minWarnMsg.isEmpty()) {
- warnMsg = q->tr("Time cannot be earlier than %1", "@info").arg(formatTime(m_minTime));
+ warnMsg = KTimeComboBox::tr("Time cannot be earlier than %1", "@info").arg(formatTime(m_minTime));
} else {
warnMsg = m_minWarnMsg;
warnMsg.replace(QStringLiteral("%1"), formatTime(m_minTime));
}
} else if (m_time > m_maxTime) {
if (m_maxWarnMsg.isEmpty()) {
- warnMsg = q->tr("Time cannot be later than %1", "@info").arg(formatTime(m_maxTime));
+ warnMsg = KTimeComboBox::tr("Time cannot be later than %1", "@info").arg(formatTime(m_maxTime));
} else {
warnMsg = m_maxWarnMsg;
warnMsg.replace(QStringLiteral("%1"), formatTime(m_maxTime));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-4.97.0/src/ktoolbarlabelaction.h new/kwidgetsaddons-4.98.0/src/ktoolbarlabelaction.h
--- old/kwidgetsaddons-4.97.0/src/ktoolbarlabelaction.h 2014-03-01 12:51:46.000000000 +0100
+++ new/kwidgetsaddons-4.98.0/src/ktoolbarlabelaction.h 2014-03-29 08:00:08.000000000 +0100
@@ -34,15 +34,15 @@
*
* \code
*
- * KHistoryCombo* findCombo = new KHistoryCombo( true, this );
+ * KHistoryComboBox *findCombo = new KHistoryComboBox(true, this);
*
- * KWidgetAction* action = new KWidgetAction( findCombo, i18n("Find Combo"),
- * Qt::Key_F6, this, SLOT( slotFocus() ),
+ * KWidgetAction *action = new KWidgetAction(findCombo, i18n("Find Combo"),
+ * Qt::Key_F6, this, SLOT( slotFocus()),
* actionCollection(), "find_combo");
*
- * QAction *action = new KToolBarLabelAction( action, i18n( "Find "), "find_label" );
- * action->setShortcut( Qt::Key_F6 );
- * connect( action, SIGNAL( triggered() ), this, SLOT( slotFocus() ) );
+ * QAction *action = new KToolBarLabelAction(action, i18n("Find "), "find_label");
+ * action->setShortcut(Qt::Key_F6);
+ * connect(action, SIGNAL(triggered()), this, SLOT(slotFocus()));
*
* \endcode
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-4.97.0/src/lineediturldropeventfilter.cpp new/kwidgetsaddons-4.98.0/src/lineediturldropeventfilter.cpp
--- old/kwidgetsaddons-4.97.0/src/lineediturldropeventfilter.cpp 2014-03-01 12:51:46.000000000 +0100
+++ new/kwidgetsaddons-4.98.0/src/lineediturldropeventfilter.cpp 2014-03-29 08:00:08.000000000 +0100
@@ -25,7 +25,7 @@
#include
#include <QDropEvent>
-static const char s_kdeUriListMime[] = "application/x-kde4-urilist";
+static const char s_kdeUriListMime[] = "application/x-kde4-urilist"; // keep this name "kde4" for compat.
LineEditUrlDropEventFilter::LineEditUrlDropEventFilter(QObject *parent)
: QObject(parent)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org