Hello community, here is the log from the commit of package kdebase4 for openSUSE:Factory checked in at 2013-12-19 13:15:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase4 (Old) and /work/SRC/openSUSE:Factory/.kdebase4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase4" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase4/kdebase4.changes 2013-12-11 14:32:44.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdebase4.new/kdebase4.changes 2013-12-19 13:15:13.000000000 +0100 @@ -1,0 +2,7 @@ +Sat Dec 14 18:01:15 UTC 2013 - [email protected] + +- Update to 4.12.0 + * KDE 4.12.0 release + * See http://www.kde.org/announcements/4.12.php + +------------------------------------------------------------------- Old: ---- kde-baseapps-4.11.97.tar.xz New: ---- kde-baseapps-4.12.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.6joakA/_old 2013-12-19 13:15:14.000000000 +0100 +++ /var/tmp/diff_new_pack.6joakA/_new 2013-12-19 13:15:14.000000000 +0100 @@ -17,7 +17,7 @@ Name: kdebase4 -Version: 4.11.97 +Version: 4.12.0 Release: 0 Summary: The Base KDE Apps License: GPL-2.0+ ++++++ kde-baseapps-4.11.97.tar.xz -> kde-baseapps-4.12.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.11.97/dolphin/src/kitemviews/kstandarditemlistwidget.cpp new/kde-baseapps-4.12.0/dolphin/src/kitemviews/kstandarditemlistwidget.cpp --- old/kde-baseapps-4.11.97/dolphin/src/kitemviews/kstandarditemlistwidget.cpp 2013-11-21 00:51:08.000000000 +0100 +++ new/kde-baseapps-4.12.0/dolphin/src/kitemviews/kstandarditemlistwidget.cpp 2013-12-06 00:56:34.000000000 +0100 @@ -99,11 +99,18 @@ // to show all roles without horizontal clipping. qreal maximumRequiredWidth = 0.0; - const QHash<QByteArray, QVariant> values = view->model()->data(index); - foreach (const QByteArray& role, view->visibleRoles()) { - const QString text = roleText(role, values); - const qreal requiredWidth = option.fontMetrics.width(text); - maximumRequiredWidth = qMax(maximumRequiredWidth, requiredWidth); + const QList<QByteArray>& visibleRoles = view->visibleRoles(); + const bool showOnlyTextRole = (visibleRoles.count() == 1) && (visibleRoles.first() == "text"); + + if (showOnlyTextRole) { + maximumRequiredWidth = option.fontMetrics.width(itemText(index, view)); + } else { + const QHash<QByteArray, QVariant> values = view->model()->data(index); + foreach (const QByteArray& role, view->visibleRoles()) { + const QString text = roleText(role, values); + const qreal requiredWidth = option.fontMetrics.width(text); + maximumRequiredWidth = qMax(maximumRequiredWidth, requiredWidth); + } } qreal width = option.padding * 4 + option.iconSize + maximumRequiredWidth; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.11.97/dolphin/src/views/dolphinview.cpp new/kde-baseapps-4.12.0/dolphin/src/views/dolphinview.cpp --- old/kde-baseapps-4.11.97/dolphin/src/views/dolphinview.cpp 2013-11-21 00:51:08.000000000 +0100 +++ new/kde-baseapps-4.12.0/dolphin/src/views/dolphinview.cpp 2013-12-06 00:56:34.000000000 +0100 @@ -1486,7 +1486,9 @@ } KonqOperations* op = KonqOperations::renameV2(this, oldUrl, newName); - if (op) { + if (op && !newNameExistsAlready) { + // Only connect the renamingFailed signal if there is no item with the new name + // in the model yet, see bug 328262. connect(op, SIGNAL(renamingFailed(KUrl,KUrl)), SLOT(slotRenamingFailed(KUrl,KUrl))); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.11.97/konqueror/settings/kio/kproxydlg.cpp new/kde-baseapps-4.12.0/konqueror/settings/kio/kproxydlg.cpp --- old/kde-baseapps-4.11.97/konqueror/settings/kio/kproxydlg.cpp 2013-11-21 00:51:08.000000000 +0100 +++ new/kde-baseapps-4.12.0/konqueror/settings/kio/kproxydlg.cpp 2013-12-06 00:56:34.000000000 +0100 @@ -31,7 +31,6 @@ #include <klocale.h> #include <kmessagebox.h> #include <kurifilter.h> -#include <kdebug.h> // Qt #include <QLabel> @@ -104,19 +103,6 @@ edit->setText(QString::fromUtf8(qgetenv(envVar.constData()))); } -static bool autoDetectSystemProxy(QLineEdit* edit, const QString& envVarStr) -{ - const QStringList envVars = envVarStr.split(QL1S(","), QString::SkipEmptyParts); - Q_FOREACH (const QString & envVar, envVars) { - const QByteArray envVarUtf8(envVar.toUtf8()); - if (!qgetenv(envVarUtf8.constData()).isEmpty()) { - edit->setText(envVar); - return true; - } - } - return false; -} - static QString proxyUrlFromInput(KProxyDialog::DisplayUrlFlags* flags, const QLineEdit* edit, const QSpinBox* spinBox, KProxyDialog::DisplayUrlFlag flag = KProxyDialog::HideNone) @@ -165,7 +151,6 @@ QSpinBox* spinBox , KProxyDialog::DisplayUrlFlag flag) { - kDebug() << value << "type=" << proxyType << manEdit << sysEdit << spinBox; const bool isSysProxy = (!value.contains(QL1C(' ')) && !value.contains(QL1C('.')) && !value.contains(QL1C(',')) && @@ -192,7 +177,7 @@ portNum = -1; } urlStr = value.left(index).trimmed(); - } else { + } else { urlStr = value.trimmed(); } @@ -292,7 +277,7 @@ mProxyMap[QL1S("FtpProxy")] = KProtocolManager::proxyFor(QL1S("ftp")); mProxyMap[QL1S("SocksProxy")] = KProtocolManager::proxyFor(QL1S("socks")); mProxyMap[QL1S("ProxyScript")] = KProtocolManager::proxyConfigScript(); - mProxyMap[QL1S("NoProxy")] = KProtocolManager::noProxyFor(); + mProxyMap[QL1S("NoProxy")] = KSaveIOConfig::noProxyFor(); const int proxyType = KProtocolManager::proxyType(); @@ -379,11 +364,11 @@ mProxyMap[QL1S("NoProxy")] = mUi.systemNoProxyEdit->text(); } else { - mProxyMap[QL1S("HttpProxy")] = mProxyMap.take(QL1S("EnvVarProxyHttp")); - mProxyMap[QL1S("HttpsProxy")] = mProxyMap.take(QL1S("EnvVarProxyHttps")); - mProxyMap[QL1S("FtpProxy")] = mProxyMap.take(QL1S("EnvVarProxyFtp")); - mProxyMap[QL1S("SocksProxy")] = mProxyMap.take(QL1S("EnvVarProxySocks")); - mProxyMap[QL1S("NoProxy")] = mProxyMap.take(QL1S("EnvVarNoProxy")); + mProxyMap[QL1S("HttpProxy")] = mProxyMap.take(mUi.systemProxyHttpEdit->objectName()); + mProxyMap[QL1S("HttpsProxy")] = mProxyMap.take(mUi.systemProxyHttpsEdit->objectName()); + mProxyMap[QL1S("FtpProxy")] = mProxyMap.take(mUi.systemProxyFtpEdit->objectName()); + mProxyMap[QL1S("SocksProxy")] = mProxyMap.take(mUi.systemProxySocksEdit->objectName()); + mProxyMap[QL1S("NoProxy")] = mProxyMap.take(mUi.systemNoProxyEdit->objectName()); } } else if (mUi.autoScriptProxyRadioButton->isChecked()) { proxyType = KProtocolManager::PACProxy; @@ -437,16 +422,38 @@ emit changed (true); } +bool KProxyDialog::autoDetectSystemProxy(QLineEdit* edit, const QString& envVarStr, bool showValue) +{ + const QStringList envVars = envVarStr.split(QL1S(","), QString::SkipEmptyParts); + Q_FOREACH (const QString & envVar, envVars) { + const QByteArray envVarUtf8(envVar.toUtf8()); + const QByteArray envVarValue = qgetenv(envVarUtf8.constData()); + if (!envVarValue.isEmpty()) { + if (showValue) { + mProxyMap[edit->objectName()] = envVar; + edit->setText(envVarValue); + } else { + edit->setText(envVar); + } + edit->setEnabled(!showValue); + return true; + } + } + return false; +} + void KProxyDialog::on_autoDetectButton_clicked() { - quint8 count = 0; - count += (autoDetectSystemProxy(mUi.systemProxyHttpEdit, ENV_HTTP_PROXY) ? 1 : 0); - count += (autoDetectSystemProxy(mUi.systemProxyHttpsEdit, ENV_HTTPS_PROXY) ? 1 : 0); - count += (autoDetectSystemProxy(mUi.systemProxyFtpEdit, ENV_FTP_PROXY) ? 1 : 0); - count += (autoDetectSystemProxy(mUi.systemProxySocksEdit, ENV_SOCKS_PROXY) ? 1 : 0); - count += (autoDetectSystemProxy(mUi.systemNoProxyEdit, ENV_NO_PROXY) ? 1 : 0); + const bool showValue = mUi.showEnvValueCheckBox->isChecked(); + bool wasChanged = false; + + wasChanged |= autoDetectSystemProxy(mUi.systemProxyHttpEdit, ENV_HTTP_PROXY, showValue); + wasChanged |= autoDetectSystemProxy(mUi.systemProxyHttpsEdit, ENV_HTTPS_PROXY, showValue); + wasChanged |= autoDetectSystemProxy(mUi.systemProxyFtpEdit, ENV_FTP_PROXY, showValue); + wasChanged |= autoDetectSystemProxy(mUi.systemProxySocksEdit, ENV_SOCKS_PROXY, showValue); + wasChanged |= autoDetectSystemProxy(mUi.systemNoProxyEdit, ENV_NO_PROXY, showValue); - if (count) + if (wasChanged) emit changed (true); } @@ -485,23 +492,23 @@ void KProxyDialog::on_showEnvValueCheckBox_toggled (bool on) { if (on) { - showSystemProxyUrl(mUi.systemProxyHttpEdit, &mProxyMap[QL1S("EnvVarProxyHttp")]); - showSystemProxyUrl(mUi.systemProxyHttpsEdit, &mProxyMap[QL1S("EnvVarProxyHttps")]); - showSystemProxyUrl(mUi.systemProxyFtpEdit, &mProxyMap[QL1S("EnvVarProxyFtp")]); - showSystemProxyUrl(mUi.systemProxySocksEdit, &mProxyMap[QL1S("EnvVarProxySocks")]); - showSystemProxyUrl(mUi.systemNoProxyEdit, &mProxyMap[QL1S("EnvVarNoProxy")]); + showSystemProxyUrl(mUi.systemProxyHttpEdit, &mProxyMap[mUi.systemProxyHttpEdit->objectName()]); + showSystemProxyUrl(mUi.systemProxyHttpsEdit, &mProxyMap[mUi.systemProxyHttpsEdit->objectName()]); + showSystemProxyUrl(mUi.systemProxyFtpEdit, &mProxyMap[mUi.systemProxyFtpEdit->objectName()]); + showSystemProxyUrl(mUi.systemProxySocksEdit, &mProxyMap[mUi.systemProxySocksEdit->objectName()]); + showSystemProxyUrl(mUi.systemNoProxyEdit, &mProxyMap[mUi.systemNoProxyEdit->objectName()]); return; } - mUi.systemProxyHttpEdit->setText(mProxyMap.take (QL1S("EnvVarProxyHttp"))); + mUi.systemProxyHttpEdit->setText(mProxyMap.take(mUi.systemProxyHttpEdit->objectName())); mUi.systemProxyHttpEdit->setEnabled(true); - mUi.systemProxyHttpsEdit->setText(mProxyMap.take (QL1S("EnvVarProxyHttps"))); + mUi.systemProxyHttpsEdit->setText(mProxyMap.take(mUi.systemProxyHttpsEdit->objectName())); mUi.systemProxyHttpsEdit->setEnabled(true); - mUi.systemProxyFtpEdit->setText(mProxyMap.take (QL1S("EnvVarProxyFtp"))); + mUi.systemProxyFtpEdit->setText(mProxyMap.take(mUi.systemProxyFtpEdit->objectName())); mUi.systemProxyFtpEdit->setEnabled(true); - mUi.systemProxySocksEdit->setText(mProxyMap.take (QL1S("EnvVarProxySocks"))); + mUi.systemProxySocksEdit->setText(mProxyMap.take(mUi.systemProxySocksEdit->objectName())); mUi.systemProxySocksEdit->setEnabled(true); - mUi.systemNoProxyEdit->setText(mProxyMap.take (QL1S("EnvVarNoProxy"))); + mUi.systemNoProxyEdit->setText(mProxyMap.take(mUi.systemNoProxyEdit->objectName())); mUi.systemNoProxyEdit->setEnabled(true); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.11.97/konqueror/settings/kio/kproxydlg.h new/kde-baseapps-4.12.0/konqueror/settings/kio/kproxydlg.h --- old/kde-baseapps-4.11.97/konqueror/settings/kio/kproxydlg.h 2013-11-21 00:51:08.000000000 +0100 +++ new/kde-baseapps-4.12.0/konqueror/settings/kio/kproxydlg.h 2013-12-06 00:56:34.000000000 +0100 @@ -60,6 +60,8 @@ void slotChanged(); private: + bool autoDetectSystemProxy(QLineEdit* edit, const QString& envVarStr, bool showValue); + Ui::ProxyDialogUI mUi; QStringList mNoProxyForList; QMap<QString, QString> mProxyMap; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.11.97/konqueror/settings/kio/ksaveioconfig.cpp new/kde-baseapps-4.12.0/konqueror/settings/kio/ksaveioconfig.cpp --- old/kde-baseapps-4.11.97/konqueror/settings/kio/ksaveioconfig.cpp 2013-11-21 00:51:08.000000000 +0100 +++ new/kde-baseapps-4.12.0/konqueror/settings/kio/ksaveioconfig.cpp 2013-12-06 00:56:34.000000000 +0100 @@ -184,6 +184,12 @@ cfg.sync(); } +QString KSaveIOConfig::noProxyFor() +{ + KConfigGroup cfg(config(), "Proxy Settings"); + return cfg.readEntry("NoProxyFor"); +} + void KSaveIOConfig::setNoProxyFor( const QString& _noproxy ) { KConfigGroup cfg (config(), "Proxy Settings"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.11.97/konqueror/settings/kio/ksaveioconfig.h new/kde-baseapps-4.12.0/konqueror/settings/kio/ksaveioconfig.h --- old/kde-baseapps-4.11.97/konqueror/settings/kio/ksaveioconfig.h 2013-11-21 00:51:08.000000000 +0100 +++ new/kde-baseapps-4.12.0/konqueror/settings/kio/ksaveioconfig.h 2013-12-06 00:56:34.000000000 +0100 @@ -61,6 +61,7 @@ void setProxyFor (const QString&, const QString&); +QString noProxyFor(); void setNoProxyFor (const QString&); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.11.97/lib/konq/konq_operations.cpp new/kde-baseapps-4.12.0/lib/konq/konq_operations.cpp --- old/kde-baseapps-4.11.97/lib/konq/konq_operations.cpp 2013-11-21 00:51:08.000000000 +0100 +++ new/kde-baseapps-4.12.0/lib/konq/konq_operations.cpp 2013-12-06 00:56:34.000000000 +0100 @@ -74,6 +74,8 @@ #include <unistd.h> #include <kconfiggroup.h> +static const KCatalogLoader loader("libkonq"); + KonqOperations::KonqOperations( QWidget *parent ) : QObject( parent ), m_method( UNKNOWN ), m_info(0), m_pasteInfo(0) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
