Hello community,
here is the log from the commit of package kdebase4 for openSUSE:Factory
checked in at Fri Sep 3 14:21:26 CEST 2010.
--------
--- KDE/kdebase4/kdebase4.changes 2010-08-04 11:10:14.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdebase4/kdebase4.changes 2010-08-27 13:53:39.000000000 +0200
@@ -1,0 +2,11 @@
+Fri Aug 27 13:53:32 CEST 2010 - dmueller@suse.de
+
+- update to 4.5.1
+ * see http://kde.org/announcements/changelogs/changelog4_5_0to4_5_1.php for details
+
+-------------------------------------------------------------------
+Sun Aug 22 18:32:37 UTC 2010 - ctrippe@gmx.net
+
+- Change installation directory of konsole - Super User Icon (bnc#633082)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
kdebase-4.5.0.tar.bz2
New:
----
kdebase-4.5.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase4.spec ++++++
--- /var/tmp/diff_new_pack.3tcGny/_old 2010-09-03 14:20:46.000000000 +0200
+++ /var/tmp/diff_new_pack.3tcGny/_new 2010-09-03 14:20:46.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kdebase4 (Version 4.5.0)
+# spec file for package kdebase4 (Version 4.5.1)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -33,7 +33,7 @@
Group: System/GUI/KDE
Summary: The Base KDE Apps
Url: http://www.kde.org/
-Version: 4.5.0
+Version: 4.5.1
Release: 1
Source0: kdebase-%version.tar.bz2
Source1: baselibs.conf
@@ -107,12 +107,12 @@
sed -ri s,.*/usr/share/kde4/apps/konsole/Shell.profile,, filelists/konsole
%create_exclude_filelist
install -D -m 0644 %SOURCE4 %SOURCE5 $RPM_BUILD_ROOT/usr/share/applications/kde4/
- install -D -m 0644 %SOURCE21 $RPM_BUILD_ROOT/usr/share/icons/hicolor/16x16/utilities-terminal-su.png
- install -D -m 0644 %SOURCE22 $RPM_BUILD_ROOT/usr/share/icons/hicolor/22x22/utilities-terminal-su.png
- install -D -m 0644 %SOURCE23 $RPM_BUILD_ROOT/usr/share/icons/hicolor/32x32/utilities-terminal-su.png
- install -D -m 0644 %SOURCE24 $RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/utilities-terminal-su.png
- install -D -m 0644 %SOURCE25 $RPM_BUILD_ROOT/usr/share/icons/hicolor/64x64/utilities-terminal-su.png
- install -D -m 0644 %SOURCE26 $RPM_BUILD_ROOT/usr/share/icons/hicolor/128x128/utilities-terminal-su.png
+ install -D -m 0644 %SOURCE21 $RPM_BUILD_ROOT/usr/share/icons/hicolor/16x16/apps/utilities-terminal_su.png
+ install -D -m 0644 %SOURCE22 $RPM_BUILD_ROOT/usr/share/icons/hicolor/22x22/apps/utilities-terminal_su.png
+ install -D -m 0644 %SOURCE23 $RPM_BUILD_ROOT/usr/share/icons/hicolor/32x32/apps/utilities-terminal_su.png
+ install -D -m 0644 %SOURCE24 $RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/apps/utilities-terminal_su.png
+ install -D -m 0644 %SOURCE25 $RPM_BUILD_ROOT/usr/share/icons/hicolor/64x64/apps/utilities-terminal_su.png
+ install -D -m 0644 %SOURCE26 $RPM_BUILD_ROOT/usr/share/icons/hicolor/128x128/apps/utilities-terminal_su.png
%suse_update_desktop_file konqbrowser WebBrowser
%suse_update_desktop_file konquerorsu System FileManager
%suse_update_desktop_file dolphin System FileManager
@@ -162,7 +162,7 @@
%defattr(-,root,root)
%doc COPYING COPYING.DOC README
%_kde4_applicationsdir/konsolesu.desktop
-%_kde4_iconsdir/hicolor/*/utilities-terminal-su.png
+%_kde4_iconsdir/hicolor/*/apps/utilities-terminal_su.png
%package -n dolphin
License: GPLv2+
++++++ kdebase-4.5.0.tar.bz2 -> kdebase-4.5.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/CMakeLists.txt new/kdebase-4.5.1/apps/CMakeLists.txt
--- old/kdebase-4.5.0/apps/CMakeLists.txt 2010-07-28 23:04:48.000000000 +0200
+++ new/kdebase-4.5.1/apps/CMakeLists.txt 2010-08-27 10:10:18.000000000 +0200
@@ -4,8 +4,8 @@
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules )
#search packages used by KDE
-set(KDE_MIN_VERSION "4.5.0")
-find_package(KDE4 4.5.0 REQUIRED)
+set(KDE_MIN_VERSION "4.5.1")
+find_package(KDE4 4.5.1 REQUIRED)
find_package(Strigi REQUIRED)
find_package(ZLIB REQUIRED)
include (KDE4Defaults)
Files old/kdebase-4.5.0/apps/doc/dolphin/index.cache.bz2 and new/kdebase-4.5.1/apps/doc/dolphin/index.cache.bz2 differ
Files old/kdebase-4.5.0/apps/doc/kdepasswd/index.cache.bz2 and new/kdebase-4.5.1/apps/doc/kdepasswd/index.cache.bz2 differ
Files old/kdebase-4.5.0/apps/doc/kfind/index.cache.bz2 and new/kdebase-4.5.1/apps/doc/kfind/index.cache.bz2 differ
Files old/kdebase-4.5.0/apps/doc/konqueror/index.cache.bz2 and new/kdebase-4.5.1/apps/doc/konqueror/index.cache.bz2 differ
Files old/kdebase-4.5.0/apps/doc/konsole/index.cache.bz2 and new/kdebase-4.5.1/apps/doc/konsole/index.cache.bz2 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/doc/konsole/index.docbook new/kdebase-4.5.1/apps/doc/konsole/index.docbook
--- old/kdebase-4.5.0/apps/doc/konsole/index.docbook 2010-08-04 21:13:56.000000000 +0200
+++ new/kdebase-4.5.1/apps/doc/konsole/index.docbook 2010-08-27 10:10:17.000000000 +0200
@@ -510,7 +510,7 @@
<varlistentry>
<term><menuchoice>
<shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>[</keycap></keycombo></shortcut>
-<guimenu>View</guimenu><guisubmenu>Shrink View</guisubmenu><guimenuitem>Shrink View</guimenuitem></menuchoice>
+<guimenu>View</guimenu><guisubmenu>Split View</guisubmenu><guimenuitem>Shrink View</guimenuitem></menuchoice>
</term>
<listitem><para><action>Makes the current view smaller</action>
</para></listitem>
Files old/kdebase-4.5.0/apps/doc/kwrite/index.cache.bz2 and new/kdebase-4.5.1/apps/doc/kwrite/index.cache.bz2 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/dolphin/src/dolphincolumnviewcontainer.cpp new/kdebase-4.5.1/apps/dolphin/src/dolphincolumnviewcontainer.cpp
--- old/kdebase-4.5.0/apps/dolphin/src/dolphincolumnviewcontainer.cpp 2010-06-01 20:10:27.000000000 +0200
+++ new/kdebase-4.5.1/apps/dolphin/src/dolphincolumnviewcontainer.cpp 2010-08-27 10:10:17.000000000 +0200
@@ -108,7 +108,7 @@
int columnIndex = 0;
foreach (DolphinColumnView* column, m_columns) {
- if (column->url() == url) {
+ if (column->url().equals(url, KUrl::CompareWithoutTrailingSlash)) {
// the column represents already the requested URL, hence activate it
requestActivation(column);
layoutColumns();
@@ -411,6 +411,8 @@
} else {
column->deleteLater();
}
+
+ layoutColumns();
}
#include "dolphincolumnviewcontainer.moc"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/dolphin/src/dolphinview.cpp new/kdebase-4.5.1/apps/dolphin/src/dolphinview.cpp
--- old/kdebase-4.5.0/apps/dolphin/src/dolphinview.cpp 2010-07-06 08:54:19.000000000 +0200
+++ new/kdebase-4.5.1/apps/dolphin/src/dolphinview.cpp 2010-08-27 10:10:17.000000000 +0200
@@ -93,7 +93,6 @@
m_dolphinViewController(0),
m_viewModeController(0),
m_viewAccessor(proxyModel),
- m_selectionModel(0),
m_selectionChangedTimer(0),
m_rootUrl(),
m_activeItemUrl(),
@@ -540,30 +539,33 @@
void DolphinView::setUrl(const KUrl& url)
{
- if (m_viewModeController->url() != url) {
- m_newFileNames.clear();
+ if (m_viewModeController->url() == url) {
+ return;
+ }
- m_viewModeController->setUrl(url); // emits urlChanged, which we forward
- m_viewAccessor.prepareUrlChange(url);
- applyViewProperties();
- loadDirectory(url);
+ // The selection model might change in the case of the column view. Disconnect
+ // from the current selection model and reconnect later after the URL switch.
+ QAbstractItemView* view = m_viewAccessor.itemView();
+ disconnect(view->selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)),
+ this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection)));
- // When changing the URL there is no need to keep the version
- // data of the previous URL.
- m_viewAccessor.dirModel()->clearVersionData();
+ m_newFileNames.clear();
- emit startedPathLoading(url);
- }
+ m_viewModeController->setUrl(url); // emits urlChanged, which we forward
+ m_viewAccessor.prepareUrlChange(url);
+ applyViewProperties();
+ loadDirectory(url);
- // the selection model might have changed in the case of a column view
- QItemSelectionModel* selectionModel = m_viewAccessor.itemView()->selectionModel();
- if (m_selectionModel != selectionModel) {
- disconnect(m_selectionModel, SIGNAL(selectionChanged(QItemSelection, QItemSelection)),
- this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection)));
- m_selectionModel = selectionModel;
- connect(m_selectionModel, SIGNAL(selectionChanged(QItemSelection, QItemSelection)),
- this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection)));
- }
+ // When changing the URL there is no need to keep the version
+ // data of the previous URL.
+ m_viewAccessor.dirModel()->clearVersionData();
+
+ emit startedPathLoading(url);
+
+ // Reconnect to the (probably) new selection model
+ view = m_viewAccessor.itemView();
+ connect(view->selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)),
+ this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection)));
}
void DolphinView::selectAll()
@@ -1271,28 +1273,28 @@
void DolphinView::createView()
{
+ QAbstractItemView* view = m_viewAccessor.itemView();
+ if ((view != 0) && (view->selectionModel() != 0)) {
+ disconnect(view->selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)),
+ this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection)));
+ }
+
deleteView();
Q_ASSERT(m_viewAccessor.itemView() == 0);
m_viewAccessor.createView(this, m_dolphinViewController, m_viewModeController, m_mode);
- QAbstractItemView* view = m_viewAccessor.itemView();
+ view = m_viewAccessor.itemView();
Q_ASSERT(view != 0);
view->installEventFilter(this);
view->viewport()->installEventFilter(this);
m_dolphinViewController->setItemView(view);
- // When changing the view mode, the selection is lost due to reinstantiating
- // a new item view with a custom selection model. Pass the ownership of the
- // selection model to DolphinView, so that it can be shared by all item views.
- if (m_selectionModel != 0) {
- view->setSelectionModel(m_selectionModel);
- } else {
- m_selectionModel = view->selectionModel();
- }
- m_selectionModel->setParent(this);
- connect(m_selectionModel, SIGNAL(selectionChanged(QItemSelection, QItemSelection)),
+ const int zoomLevel = ZoomLevelInfo::zoomLevelForIconSize(view->iconSize());
+ m_viewModeController->setZoomLevel(zoomLevel);
+
+ connect(view->selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)),
this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection)));
setFocusProxy(m_viewAccessor.layoutTarget());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/dolphin/src/dolphinview.h new/kdebase-4.5.1/apps/dolphin/src/dolphinview.h
--- old/kdebase-4.5.0/apps/dolphin/src/dolphinview.h 2010-05-16 12:04:03.000000000 +0200
+++ new/kdebase-4.5.1/apps/dolphin/src/dolphinview.h 2010-08-27 10:10:17.000000000 +0200
@@ -796,7 +796,6 @@
ViewModeController* m_viewModeController;
ViewAccessor m_viewAccessor;
- QItemSelectionModel* m_selectionModel; // allow to switch views without losing the selection
QTimer* m_selectionChangedTimer;
KUrl m_rootUrl;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/dolphin/src/tooltips/filemetadatatooltip.cpp new/kdebase-4.5.1/apps/dolphin/src/tooltips/filemetadatatooltip.cpp
--- old/kdebase-4.5.0/apps/dolphin/src/tooltips/filemetadatatooltip.cpp 2010-07-12 23:08:16.000000000 +0200
+++ new/kdebase-4.5.1/apps/dolphin/src/tooltips/filemetadatatooltip.cpp 2010-08-27 10:10:17.000000000 +0200
@@ -20,10 +20,10 @@
#include "filemetadatatooltip.h"
-#include
+#include <KColorScheme>
#include
-#include
-#include
+#include <KSeparator>
+#include <KWindowSystem>
#include <QLabel>
#include <QPainter>
@@ -34,7 +34,6 @@
m_preview(0),
m_name(0),
m_fileMetaDataWidget(0)
-
{
setAttribute(Qt::WA_TranslucentBackground);
setWindowFlags(Qt::ToolTip | Qt::FramelessWindowHint);
@@ -47,30 +46,25 @@
QFont font = m_name->font();
font.setBold(true);
m_name->setFont(font);
- m_name->setAlignment(Qt::AlignHCenter);
// Create widget for the meta data
m_fileMetaDataWidget = new KFileMetaDataWidget();
m_fileMetaDataWidget->setForegroundRole(QPalette::ToolTipText);
m_fileMetaDataWidget->setReadOnly(true);
+ connect(m_fileMetaDataWidget, SIGNAL(metaDataRequestFinished(KFileItemList)),
+ this, SIGNAL(metaDataRequestFinished(KFileItemList)));
- // The stretchwidget allows the metadata widget to be top aligned and fills
- // the remaining vertical space
- QWidget* stretchWidget = new QWidget(this);
- stretchWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding);
-
- QWidget* textContainer = new QWidget(this);
- QVBoxLayout* textLayout = new QVBoxLayout(textContainer);
+ QVBoxLayout* textLayout = new QVBoxLayout();
+ textLayout->setAlignment(Qt::AlignTop);
textLayout->addWidget(m_name);
textLayout->addWidget(new KSeparator());
textLayout->addWidget(m_fileMetaDataWidget);
- textLayout->addWidget(stretchWidget);
+ textLayout->setAlignment(m_name, Qt::AlignCenter);
+ textLayout->setAlignment(m_fileMetaDataWidget, Qt::AlignLeft);
QHBoxLayout* tipLayout = new QHBoxLayout(this);
tipLayout->addWidget(m_preview);
- tipLayout->addWidget(textContainer);
-
- tipLayout->setSizeConstraint(QLayout::SetFixedSize);
+ tipLayout->addLayout(textLayout);
}
FileMetaDataToolTip::~FileMetaDataToolTip()
@@ -82,9 +76,12 @@
m_preview->setPixmap(pixmap);
}
-const QPixmap* FileMetaDataToolTip::preview() const
+QPixmap FileMetaDataToolTip::preview() const
{
- return m_preview->pixmap();
+ if (m_preview->pixmap() != 0) {
+ return *m_preview->pixmap();
+ }
+ return QPixmap();
}
void FileMetaDataToolTip::setName(const QString& name)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/dolphin/src/tooltips/filemetadatatooltip.h new/kdebase-4.5.1/apps/dolphin/src/tooltips/filemetadatatooltip.h
--- old/kdebase-4.5.0/apps/dolphin/src/tooltips/filemetadatatooltip.h 2010-03-30 10:28:06.000000000 +0200
+++ new/kdebase-4.5.1/apps/dolphin/src/tooltips/filemetadatatooltip.h 2010-08-27 10:10:17.000000000 +0200
@@ -18,8 +18,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
-#ifndef DOLPHINCONTROLLER_H
-#define DOLPHINCONTROLLER_H
+#ifndef FILEMETADATATOOLTIP_H
+#define FILEMETADATATOOLTIP_H
#include <QWidget>
@@ -40,14 +40,26 @@
virtual ~FileMetaDataToolTip();
void setPreview(const QPixmap& pixmap);
- const QPixmap* preview() const;
+ QPixmap preview() const;
void setName(const QString& name);
QString name() const;
+ /**
+ * Sets the items for which the meta data should be shown.
+ * The signal metaDataRequestFinished() will be emitted,
+ * as soon as the meta data for the items has been received.
+ */
void setItems(const KFileItemList& items);
KFileItemList items() const;
+signals:
+ /**
+ * Is emitted after the meta data has been received for the items
+ * set by FileMetaDataToolTip::setItems().
+ */
+ void metaDataRequestFinished(const KFileItemList& items);
+
protected:
virtual void paintEvent(QPaintEvent* event);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/dolphin/src/tooltips/tooltipmanager.cpp new/kdebase-4.5.1/apps/dolphin/src/tooltips/tooltipmanager.cpp
--- old/kdebase-4.5.0/apps/dolphin/src/tooltips/tooltipmanager.cpp 2010-07-23 23:12:06.000000000 +0200
+++ new/kdebase-4.5.1/apps/dolphin/src/tooltips/tooltipmanager.cpp 2010-08-27 10:10:17.000000000 +0200
@@ -19,13 +19,9 @@
#include "tooltipmanager.h"
-#include "dolphinmodel.h"
-#include "dolphinsortfilterproxymodel.h"
-
#include "filemetadatatooltip.h"
-#include
-#include
-#include
+#include <KIcon>
+#include
#include <QApplication>
#include <QDesktopWidget>
@@ -33,22 +29,22 @@
#include <QScrollBar>
#include <QTimer>
+#include
+#include
+
ToolTipManager::ToolTipManager(QAbstractItemView* parent,
DolphinSortFilterProxyModel* model) :
QObject(parent),
m_view(parent),
m_dolphinModel(0),
m_proxyModel(model),
- m_prepareToolTipTimer(0),
- m_startPreviewJobTimer(0),
- m_waitOnPreviewTimer(0),
- m_showToolTipDelayedTimer(0),
+ m_showToolTipTimer(0),
+ m_contentRetrievalTimer(0),
m_fileMetaDataToolTip(0),
+ m_toolTipRequested(false),
+ m_metaDataRequested(false),
m_item(),
- m_itemRect(),
- m_generatingPreview(false),
- m_hasDefaultIcon(false),
- m_previewPixmap()
+ m_itemRect()
{
static FileMetaDataToolTip* sharedToolTip = 0;
if (sharedToolTip == 0) {
@@ -58,7 +54,9 @@
// not work.
}
m_fileMetaDataToolTip = sharedToolTip;
-
+ connect(m_fileMetaDataToolTip, SIGNAL(metaDataRequestFinished(KFileItemList)),
+ this, SLOT(slotMetaDataRequestFinished()));
+
m_dolphinModel = static_cast(m_proxyModel->sourceModel());
connect(parent, SIGNAL(entered(const QModelIndex&)),
this, SLOT(requestToolTip(const QModelIndex&)));
@@ -66,33 +64,25 @@
this, SLOT(hideToolTip()));
// Initialize timers
- m_prepareToolTipTimer = new QTimer(this);
- m_prepareToolTipTimer->setSingleShot(true);
- m_prepareToolTipTimer->setInterval(500);
- connect(m_prepareToolTipTimer, SIGNAL(timeout()), this, SLOT(prepareToolTip()));
-
- m_startPreviewJobTimer = new QTimer(this);
- m_startPreviewJobTimer->setSingleShot(true);
- m_startPreviewJobTimer->setInterval(200);
- connect(m_startPreviewJobTimer, SIGNAL(timeout()), this, SLOT(startPreviewJob()));
-
- m_waitOnPreviewTimer = new QTimer(this);
- m_waitOnPreviewTimer->setSingleShot(true);
- m_waitOnPreviewTimer->setInterval(250);
- connect(m_waitOnPreviewTimer, SIGNAL(timeout()), this, SLOT(prepareToolTip()));
-
- m_showToolTipDelayedTimer = new QTimer(this);
- m_showToolTipDelayedTimer->setSingleShot(true);
- m_showToolTipDelayedTimer->setInterval(100);
- connect(m_showToolTipDelayedTimer, SIGNAL(timeout()), this, SLOT(showToolTip()));
-
+ m_showToolTipTimer = new QTimer(this);
+ m_showToolTipTimer->setSingleShot(true);
+ m_showToolTipTimer->setInterval(500);
+ connect(m_showToolTipTimer, SIGNAL(timeout()), this, SLOT(showToolTip()));
+
+ m_contentRetrievalTimer = new QTimer(this);
+ m_contentRetrievalTimer->setSingleShot(true);
+ m_contentRetrievalTimer->setInterval(200);
+ connect(m_contentRetrievalTimer, SIGNAL(timeout()), this, SLOT(startContentRetrieval()));
+
+ Q_ASSERT(m_contentRetrievalTimer->interval() < m_showToolTipTimer->interval());
+
// When the mousewheel is used, the items don't get a hovered indication
// (Qt-issue #200665). To assure that the tooltip still gets hidden,
// the scrollbars are observed.
connect(parent->horizontalScrollBar(), SIGNAL(valueChanged(int)),
- this, SLOT(hideTip()));
+ this, SLOT(hideToolTip()));
connect(parent->verticalScrollBar(), SIGNAL(valueChanged(int)),
- this, SLOT(hideTip()));
+ this, SLOT(hideToolTip()));
m_view->viewport()->installEventFilter(this);
m_view->installEventFilter(this);
@@ -102,9 +92,17 @@
{
}
-void ToolTipManager::hideTip()
+void ToolTipManager::hideToolTip()
{
- hideToolTip();
+ QApplication::restoreOverrideCursor();
+
+ m_toolTipRequested = false;
+ m_metaDataRequested = false;
+ m_showToolTipTimer->stop();
+ m_contentRetrievalTimer->stop();
+
+ m_fileMetaDataToolTip->setItems(KFileItemList());
+ m_fileMetaDataToolTip->hide();
}
bool ToolTipManager::eventFilter(QObject* watched, QEvent* event)
@@ -128,7 +126,7 @@
void ToolTipManager::requestToolTip(const QModelIndex& index)
{
hideToolTip();
-
+
// Only request a tooltip for the name column and when no selection or
// drag & drop operation is done (indicated by the left mouse button)
if ((index.column() == DolphinModel::Name) && !(QApplication::mouseButtons() & Qt::LeftButton)) {
@@ -139,44 +137,27 @@
const QModelIndex dirIndex = m_proxyModel->mapToSource(index);
m_item = m_dolphinModel->itemForIndex(dirIndex);
- // Only start the previewJob when the mouse has been over this item for 200 milliseconds.
- // This prevents a lot of useless preview jobs when passing rapidly over a lot of items.
- m_startPreviewJobTimer->start();
- m_previewPixmap = QPixmap();
- m_hasDefaultIcon = false;
-
- m_prepareToolTipTimer->start();
+ // Only start the retrieving of the content, when the mouse has been over this
+ // item for 200 milliseconds. This prevents a lot of useless preview jobs and
+ // meta data retrieval, when passing rapidly over a lot of items.
+ m_contentRetrievalTimer->start();
+ m_showToolTipTimer->start();
+ m_toolTipRequested = true;
+ Q_ASSERT(!m_metaDataRequested);
}
}
-void ToolTipManager::hideToolTip()
-{
- m_prepareToolTipTimer->stop();
- m_startPreviewJobTimer->stop();
- m_waitOnPreviewTimer->stop();
- m_showToolTipDelayedTimer->stop();
-
- m_fileMetaDataToolTip->hide();
-}
-
-void ToolTipManager::prepareToolTip()
+void ToolTipManager::startContentRetrieval()
{
- if (m_generatingPreview) {
- m_waitOnPreviewTimer->start();
+ if (!m_toolTipRequested) {
+ return;
}
- if (!m_previewPixmap.isNull()) {
- showToolTipDelayed(m_previewPixmap);
- } else if (!m_hasDefaultIcon) {
- const QPixmap image(KIcon(m_item.iconName()).pixmap(128, 128));
- showToolTipDelayed(image);
- m_hasDefaultIcon = true;
- }
-}
+ m_fileMetaDataToolTip->setName(m_item.text());
+
+ m_metaDataRequested = true;
+ m_fileMetaDataToolTip->setItems(KFileItemList() << m_item);
-void ToolTipManager::startPreviewJob()
-{
- m_generatingPreview = true;
KIO::PreviewJob* job = KIO::filePreview(KFileItemList() << m_item, 256, 256);
connect(job, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)),
@@ -189,44 +170,98 @@
void ToolTipManager::setPreviewPix(const KFileItem& item,
const QPixmap& pixmap)
{
- if ((m_item.url() != item.url()) || pixmap.isNull()) {
- // An old preview or an invalid preview has been received
+ if (!m_toolTipRequested || (m_item.url() != item.url())) {
+ // No tooltip is requested anymore or an old preview has been received
+ return;
+ }
+
+ if (pixmap.isNull()) {
previewFailed();
} else {
- m_previewPixmap = pixmap;
- m_generatingPreview = false;
+ m_fileMetaDataToolTip->setPreview(pixmap);
+ if (!m_showToolTipTimer->isActive()) {
+ showToolTip();
+ }
}
}
void ToolTipManager::previewFailed()
{
- m_generatingPreview = false;
+ if (!m_toolTipRequested) {
+ return;
+ }
+
+ const QPixmap pixmap = KIcon(m_item.iconName()).pixmap(128, 128);
+ m_fileMetaDataToolTip->setPreview(pixmap);
+ if (!m_showToolTipTimer->isActive()) {
+ showToolTip();
+ }
+}
+
+void ToolTipManager::slotMetaDataRequestFinished()
+{
+ if (!m_toolTipRequested) {
+ return;
+ }
+
+ m_metaDataRequested = false;
+ if (!m_showToolTipTimer->isActive()) {
+ showToolTip();
+ }
}
void ToolTipManager::showToolTip()
{
- const QRect desktop = QApplication::desktop()->screenGeometry(m_itemRect.bottomRight());
- const QSize size = m_fileMetaDataToolTip->sizeHint();
-
+ Q_ASSERT(m_toolTipRequested);
+ QApplication::restoreOverrideCursor();
+
+ if (QApplication::mouseButtons() & Qt::LeftButton) {
+ return;
+ }
+
+ if (m_fileMetaDataToolTip->preview().isNull() || m_metaDataRequested) {
+ QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
+ return;
+ }
+
+ const QRect screen = QApplication::desktop()->screenGeometry(QCursor::pos());
+
+ // Restrict tooltip size to current screen size when needed.
+ // Because layout controlling widget doesn't respect widget's maximumSize property
+ // (correct me if I'm wrong), we need to let layout do its work, then manually change
+ // geometry if resulting widget doesn't fit the screen.
+
+ // Step #1 - make sizeHint return calculated tooltip size
+ m_fileMetaDataToolTip->layout()->setSizeConstraint(QLayout::SetFixedSize);
+ m_fileMetaDataToolTip->adjustSize();
+ QSize size = m_fileMetaDataToolTip->sizeHint();
+
+ // Step #2 - correct tooltip size when needed
+ if (size.width() > screen.width()) {
+ size.setWidth(screen.width());
+ }
+ if (size.height() > screen.height()) {
+ size.setHeight(screen.height());
+ }
+
// m_itemRect defines the area of the item, where the tooltip should be
// shown. Per default the tooltip is shown in the bottom right corner.
- // If the tooltip content exceeds the desktop borders, it must be assured that:
+ // It must be assured that:
// - the content is fully visible
// - the content is not drawn inside m_itemRect
- const bool hasRoomToLeft = (m_itemRect.left() - size.width() >= desktop.left());
- const bool hasRoomToRight = (m_itemRect.right() + size.width() <= desktop.right());
- const bool hasRoomAbove = (m_itemRect.top() - size.height() >= desktop.top());
- const bool hasRoomBelow = (m_itemRect.bottom() + size.height() <= desktop.bottom());
+ const bool hasRoomToLeft = (m_itemRect.left() - size.width() >= screen.left());
+ const bool hasRoomToRight = (m_itemRect.right() + size.width() <= screen.right());
+ const bool hasRoomAbove = (m_itemRect.top() - size.height() >= screen.top());
+ const bool hasRoomBelow = (m_itemRect.bottom() + size.height() <= screen.bottom());
if (!hasRoomAbove && !hasRoomBelow && !hasRoomToLeft && !hasRoomToRight) {
return;
}
-
- int x = 0;
- int y = 0;
+
+ int x, y;
if (hasRoomBelow || hasRoomAbove) {
x = QCursor::pos().x() + 16; // TODO: use mouse pointer width instead of the magic value of 16
- if (x + size.width() >= desktop.right()) {
- x = desktop.right() - size.width();
+ if (x + size.width() >= screen.right()) {
+ x = screen.right() - size.width() + 1;
}
if (hasRoomBelow) {
y = m_itemRect.bottom() + 1;
@@ -240,38 +275,18 @@
} else {
x = m_itemRect.left() - size.width();
}
-
// Put the tooltip at the bottom of the screen. The x-coordinate has already
// been adjusted, so that no overlapping with m_itemRect occurs.
- y = desktop.bottom() - size.height();
+ y = screen.bottom() - size.height() + 1;
}
-
- m_fileMetaDataToolTip->move(qMax(x, 0), qMax(y, 0));
- m_fileMetaDataToolTip->show();
-}
-void ToolTipManager::showToolTipDelayed(const QPixmap& pixmap)
-{
- if (QApplication::mouseButtons() & Qt::LeftButton) {
- return;
- }
-
- m_fileMetaDataToolTip->setPreview(pixmap);
- m_fileMetaDataToolTip->setName(m_item.text());
- m_fileMetaDataToolTip->setItems(KFileItemList() << m_item);
+ // Step #3 - Alter tooltip geometry
+ m_fileMetaDataToolTip->setFixedSize(size);
+ m_fileMetaDataToolTip->layout()->setSizeConstraint(QLayout::SetNoConstraint);
+ m_fileMetaDataToolTip->setGeometry(x, y, size.width(), size.height());
+ m_fileMetaDataToolTip->show();
- // Because one tooltip instance is reused, the size hint always depends on the previous
- // content (QWidgets don't update their layout geometry if they are invisible). To
- // assure having a consistent size without relayout flickering, the tooltip is opened
- // on an invisible position first. This gives the layout system some time to asynchronously
- // update the content. Sadly this only works with compositing enabled.
- if (KWindowSystem::compositingActive()) {
- const QRect desktop = QApplication::desktop()->screenGeometry(m_itemRect.bottomRight());
- m_fileMetaDataToolTip->move(desktop.bottomRight());
- m_fileMetaDataToolTip->show();
- }
-
- m_showToolTipDelayedTimer->start(); // Calls ToolTipManager::showToolTip()
+ m_toolTipRequested = false;
}
#include "tooltipmanager.moc"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/dolphin/src/tooltips/tooltipmanager.h new/kdebase-4.5.1/apps/dolphin/src/tooltips/tooltipmanager.h
--- old/kdebase-4.5.0/apps/dolphin/src/tooltips/tooltipmanager.h 2010-07-12 23:08:16.000000000 +0200
+++ new/kdebase-4.5.1/apps/dolphin/src/tooltips/tooltipmanager.h 2010-08-27 10:10:17.000000000 +0200
@@ -23,7 +23,7 @@
#include <QObject>
#include <QRect>
-#include
+#include <KFileItem>
class DolphinModel;
class DolphinSortFilterProxyModel;
@@ -54,53 +54,38 @@
* only needed when the tooltip should be hidden although
* an item is hovered.
*/
- void hideTip();
+ void hideToolTip();
protected:
virtual bool eventFilter(QObject* watched, QEvent* event);
private slots:
void requestToolTip(const QModelIndex& index);
- void hideToolTip();
- void prepareToolTip();
- void startPreviewJob();
+ void startContentRetrieval();
void setPreviewPix(const KFileItem& item, const QPixmap& pix);
void previewFailed();
+ void slotMetaDataRequestFinished();
void showToolTip();
-
-private:
- void showToolTipDelayed(const QPixmap& pixmap);
private:
QAbstractItemView* m_view;
DolphinModel* m_dolphinModel;
DolphinSortFilterProxyModel* m_proxyModel;
- /// Timeout from requesting a tooltip until the tooltip is shown
- QTimer* m_prepareToolTipTimer;
-
- /// Timeout from requesting a tooltip until starting a job to
- /// create a preview pixmap. The preview job is started before
- /// m_prepareToolTipTimer has been exceeded, to have the preview
- /// pixmap ideally before the tooltip will be shown.
- QTimer* m_startPreviewJobTimer;
-
- /// Don't show the tooltip, before the preview has been received. The
- /// time indicates the interval, when the check for a received
- /// is done.
- QTimer* m_waitOnPreviewTimer;
-
- /// The tooltip is shown slightly delayed to prevent a flickering
- /// because of layouting the content.
- QTimer* m_showToolTipDelayedTimer;
+ /// Timeout from requesting a tooltip until the tooltip
+ /// should be shown
+ QTimer* m_showToolTipTimer;
+
+ /// Timeout from requesting a tooltip until the retrieving of
+ /// the tooltip content like preview and meta data gets started.
+ QTimer* m_contentRetrievalTimer;
FileMetaDataToolTip* m_fileMetaDataToolTip;
+ bool m_toolTipRequested;
+ bool m_metaDataRequested;
KFileItem m_item;
QRect m_itemRect;
- bool m_generatingPreview;
- bool m_hasDefaultIcon;
- QPixmap m_previewPixmap;
};
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/dolphin/src/viewextensionsfactory.cpp new/kdebase-4.5.1/apps/dolphin/src/viewextensionsfactory.cpp
--- old/kdebase-4.5.0/apps/dolphin/src/viewextensionsfactory.cpp 2010-04-07 13:23:19.000000000 +0200
+++ new/kdebase-4.5.1/apps/dolphin/src/viewextensionsfactory.cpp 2010-08-27 10:10:17.000000000 +0200
@@ -61,7 +61,7 @@
m_toolTipManager = new ToolTipManager(view, proxyModel);
connect(dolphinViewController, SIGNAL(hideToolTip()),
- m_toolTipManager, SLOT(hideTip()));
+ m_toolTipManager, SLOT(hideToolTip()));
}
// initialize preview generator
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/keditbookmarks/bookmarklistview.cpp new/kdebase-4.5.1/apps/keditbookmarks/bookmarklistview.cpp
--- old/kdebase-4.5.0/apps/keditbookmarks/bookmarklistview.cpp 2010-05-05 11:37:43.000000000 +0200
+++ new/kdebase-4.5.1/apps/keditbookmarks/bookmarklistview.cpp 2010-08-27 10:10:18.000000000 +0200
@@ -200,8 +200,6 @@
return (source_column == 0);
}
-Q_DECLARE_METATYPE(KBookmark)
-
bool BookmarkFolderViewFilterModel::filterAcceptsRow ( int source_row, const QModelIndex & source_parent ) const
{
QModelIndex index = sourceModel()->index(source_row, 0, source_parent);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/keditbookmarks/kbookmarkmodel/model.cpp new/kdebase-4.5.1/apps/keditbookmarks/kbookmarkmodel/model.cpp
--- old/kdebase-4.5.0/apps/keditbookmarks/kbookmarkmodel/model.cpp 2010-05-05 11:37:43.000000000 +0200
+++ new/kdebase-4.5.1/apps/keditbookmarks/kbookmarkmodel/model.cpp 2010-08-27 10:10:17.000000000 +0200
@@ -33,8 +33,6 @@
#include
#include
-Q_DECLARE_METATYPE(KBookmark)
-
class KBookmarkModel::Private
{
public:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/keditbookmarks/keditbookmarks.desktop new/kdebase-4.5.1/apps/keditbookmarks/keditbookmarks.desktop
--- old/kdebase-4.5.0/apps/keditbookmarks/keditbookmarks.desktop 2010-08-04 21:13:57.000000000 +0200
+++ new/kdebase-4.5.1/apps/keditbookmarks/keditbookmarks.desktop 2010-08-27 10:10:18.000000000 +0200
@@ -16,6 +16,7 @@
Name[en_GB]=Bookmark Editor
Name[es]=Editor de marcadores
Name[et]=Järjehoidjate redaktor
+Name[eu]=Laster-marka editorea
Name[fi]=Kirjanmerkkimuokkain
Name[fr]=Éditeur de signets
Name[fy]=Blêdwizerbewurker
@@ -24,6 +25,7 @@
Name[he]=עורך הסימניות
Name[hi]=पसंदीदा संपादक
Name[hr]=Uređivač oznaka
+Name[hu]=Könyvjelzőszerkesztő
Name[ia]=Editor de marcator de libros
Name[id]=Penyunting Penanda
Name[is]=Bókamerkjastjóri
@@ -38,6 +40,7 @@
Name[nb]=Bokmerkeredigerer
Name[nds]=Leesteken-Editor
Name[nl]=Bladwijzerbewerker
+Name[nn]=Bokmerkeredigering
Name[pa]=ਬੁੱਕਮਾਰਕ ਐਡੀਟਰ
Name[pl]=Edytor zakładek
Name[pt]=Editor de Favoritos
@@ -71,6 +74,7 @@
Comment[en_GB]=Bookmark Organiser and Editor
Comment[es]=Organizador y editor de marcadores
Comment[et]=Järjehoidjate korraldaja ja redaktor
+Comment[eu]=Laster-marka antolatzaile eta editorea
Comment[fi]=Kirjanmerkkimuokkain ja -järjestelijä
Comment[fr]=Éditeur et organisateur de signets
Comment[fy]=Blêdwizers organisearje en bewurker
@@ -78,6 +82,7 @@
Comment[he]=מארגן ועורך סימניות
Comment[hi]=पसंदीदा व्यवस्था और संपादक
Comment[hr]=Organizator i uređivač oznaka
+Comment[hu]=Könyvjelzőszervező és -szerkesztő
Comment[ia]=Editor e organisator de Marcator de libros
Comment[id]=Pengorganisir dan Penyunting Penanda
Comment[is]=Bókamerkjaskipuleggjari
@@ -92,6 +97,7 @@
Comment[nb]=Bokmerkeordner og redigerer
Comment[nds]=Leestekenpleger un -editor
Comment[nl]=Bladwijzers organiseren en bewerken
+Comment[nn]=Bokmerkeordnar og redigering
Comment[pa]=ਬੁੱਕਮਾਰਕ ਪਰਬੰਧਕ ਤੇ ਐਡੀਟਰ
Comment[pl]=Organizacja i modyfikacja zakładek
Comment[pt]=Organizador e Editor de Favoritos
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/konqueror/preloader/konqy_preloader.desktop new/kdebase-4.5.1/apps/konqueror/preloader/konqy_preloader.desktop
--- old/kdebase-4.5.0/apps/konqueror/preloader/konqy_preloader.desktop 2010-08-04 21:13:56.000000000 +0200
+++ new/kdebase-4.5.1/apps/konqueror/preloader/konqy_preloader.desktop 2010-08-27 10:10:17.000000000 +0200
@@ -12,6 +12,7 @@
Name[en_GB]=Konqueror Browser Preloader
Name[es]=Módulo de precarga del navegador Konqueror
Name[et]=Konquerori brauseri eellaadimise moodul
+Name[eu]=Konqueror arakatzailearen aurrezamatzailea
Name[fi]=Konqueror-selaimen esilataaja
Name[fr]=Module de préchargement du navigateur Konqueror
Name[fy]=Konqueror Blêder foarlader
@@ -20,6 +21,7 @@
Name[he]=טעינה מקדימה של Konqueror
Name[hi]=कॉन्क्वेरर ब्राउसर प्रीलोडर
Name[hr]=Predučitavanje pretraživača Konqueror
+Name[hu]=Előbetöltő a Konqueror böngészőhöz
Name[ia]=Precargator del Navigator de Konqueror
Name[id]=Prapemuatan Peramban Konqueror
Name[is]=Konqueror forræsingareining
@@ -35,6 +37,7 @@
Name[nb]=Forhåndslaster for Konqueror nettleser
Name[nds]=Konqueror vörladen
Name[nl]=Konqueror browser preloader-module
+Name[nn]=Førehandslastar for nettlesaren Konqueror
Name[pa]=ਕੋਨਕਿਉਰੋਰ ਬਰਾਊਜ਼ਰ ਪਹਿਲਾਂ ਲੋਡ ਮੋਡੀਊਲ
Name[pl]=Wstępne wczytywanie dla Konquerora
Name[pt]=Pré-Carregamento do Navegador Konqueror
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/konqueror/settings/kio/cache.desktop new/kdebase-4.5.1/apps/konqueror/settings/kio/cache.desktop
--- old/kdebase-4.5.0/apps/konqueror/settings/kio/cache.desktop 2010-07-07 19:10:00.000000000 +0200
+++ new/kdebase-4.5.1/apps/konqueror/settings/kio/cache.desktop 2010-08-27 10:10:17.000000000 +0200
@@ -75,7 +75,7 @@
Name[pt]=Cache
Name[pt_BR]=Cache
Name[ro]=Cache
-Name[ru]=Кеш
+Name[ru]=Кэш
Name[se]=Gaskarájus
Name[si]=කැච්
Name[sk]=Vyrovnávacia pamäť
@@ -165,7 +165,7 @@
Comment[pt]=Configuração das opções da 'cache' da Web
Comment[pt_BR]=Configurar as opções de cache da Internet
Comment[ro]=Configurează setările cache-ului web
-Comment[ru]=Настройка кеша
+Comment[ru]=Настройка кэша
Comment[se]=Heivet fierpmádatgaskarádjusa
Comment[si]=ජාල කැච් සැකසුම් සකසන්න
Comment[sk]=Nastavenie vyrovnávacej pamäte pre WWW
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/konqueror/settings/kio/kcookiespolicies.cpp new/kdebase-4.5.1/apps/konqueror/settings/kio/kcookiespolicies.cpp
--- old/kdebase-4.5.0/apps/konqueror/settings/kio/kcookiespolicies.cpp 2009-10-06 23:37:09.000000000 +0200
+++ new/kdebase-4.5.1/apps/konqueror/settings/kio/kcookiespolicies.cpp 2010-08-27 10:10:17.000000000 +0200
@@ -191,9 +191,9 @@
if ( !handleDuplicate(domain, advice) )
{
const char* strAdvice = KCookieAdvice::adviceToStr(advice);
- QTreeWidgetItem* index = new QTreeWidgetItem (dlg->lvDomainPolicy,
- QStringList()<< domain << i18n(strAdvice));
- m_pDomainPolicy.insert (index, strAdvice);
+ QTreeWidgetItem* item = new QTreeWidgetItem (dlg->lvDomainPolicy,
+ QStringList()<< domain << i18n(strAdvice));
+ m_pDomainPolicy.insert (item, strAdvice);
configChanged();
}
}
@@ -395,12 +395,14 @@
group.writeEntry("CookieGlobalAdvice", advice);
QStringList domainConfig;
- QTreeWidgetItem *at = dlg->lvDomainPolicy->topLevelItem(0);
-
- while( at )
- {
- domainConfig.append(QString::fromLatin1("%1:%2").arg(QString(tolerantToAce(at->text(0)))).arg(m_pDomainPolicy[at]));
- at = dlg->lvDomainPolicy->itemBelow(at);
+ QMapIterator it (m_pDomainPolicy);
+ while (it.hasNext()) {
+ it.next();
+ QTreeWidgetItem *item = it.key();
+ QString policy = tolerantToAce(item->text(0));
+ policy += QLatin1Char(':');
+ policy += QLatin1String(it.value());
+ domainConfig << policy;
}
group.writeEntry("CookieDomainAdvice", domainConfig);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/konqueror/settings/kio/uasproviders/chrome50oncurrent.desktop new/kdebase-4.5.1/apps/konqueror/settings/kio/uasproviders/chrome50oncurrent.desktop
--- old/kdebase-4.5.0/apps/konqueror/settings/kio/uasproviders/chrome50oncurrent.desktop 2010-08-04 21:13:56.000000000 +0200
+++ new/kdebase-4.5.1/apps/konqueror/settings/kio/uasproviders/chrome50oncurrent.desktop 2010-08-27 10:10:17.000000000 +0200
@@ -12,6 +12,7 @@
Name[en_GB]=UADescription (Google Chrome 5.0)
Name[es]=UADescription (Google Chrome 5.0)
Name[et]=UADescription (Google Chrome 5.0)
+Name[eu]=UA azalpena (Google Chrome 5.0)
Name[fr]=UADescription (Google Chrome 5.0)
Name[fy]=UADescription (Google Chrome 5.0)
Name[ga]=UADescription (Google Chrome 5.0)
@@ -19,6 +20,7 @@
Name[he]=UADescription (Google Chrome 5.0)
Name[hi]=यूए-डिस्क्रिप्शन (गूगल क्रोम 5.0्सपी पर)
Name[hr]=UADescription (Google Chrome 5.0)
+Name[hu]=Böngészőtípus (Google Chrome 5.0)
Name[ia]=UADescription (Google Chrome 5.0)
Name[id]=UADescription (Google Chrome 5.0)
Name[is]=UADescription (Google Chrome 5.0)
@@ -34,6 +36,7 @@
Name[nb]=Brukeragent (Google Chrome 5.0)
Name[nds]=UA-Beschrieven (Google Chrome 5.0)
Name[nl]=GA-beschrijving (Google Chrome 5.0)
+Name[nn]=Brukaragent (Google Chrome 5.0)
Name[pa]=UADescription (ਗੂਗਲ ਕਰੋਮ ੫.੦)
Name[pl]=UADescription (Google Chrome 5.0)
Name[pt]=UADescription (Google Chrome 5.0)
@@ -41,6 +44,7 @@
Name[ro]=Descriere AU (Google Chrome 5.0)
Name[ru]=UADescription (Google Chrome 5.0)
Name[sk]=Popis agenta (Google Chrome 5.0)
+Name[sl]=UAOpis (Google Chrome 5.0)
Name[sr]=УА‑опис (Гуглов Кроум 5.0)
Name[sr@ijekavian]=УА‑опис (Гуглов Кроум 5.0)
Name[sr@ijekavianlatin]=UA-opis (Googleov Chrome 5.0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/konqueror/settings/kio/uasproviders/firefox30oncurrent.desktop new/kdebase-4.5.1/apps/konqueror/settings/kio/uasproviders/firefox30oncurrent.desktop
--- old/kdebase-4.5.0/apps/konqueror/settings/kio/uasproviders/firefox30oncurrent.desktop 2010-07-12 23:08:16.000000000 +0200
+++ new/kdebase-4.5.1/apps/konqueror/settings/kio/uasproviders/firefox30oncurrent.desktop 2010-08-27 10:10:17.000000000 +0200
@@ -14,7 +14,7 @@
Name[eo]=UA-Priskribo (Fajrovulpo 3.0 sub nuna)
Name[es]=UADescription (Firefox 3.0 en actual)
Name[et]=UADescription (Selles masinas töötav Firefox 3.0)
-Name[eu]=UADescription (Firefox 3.0 unekoan)
+Name[eu]=UA azalpena (Firefox 3.0 unekoan)
Name[fi]=Käyttäjäagenttikuvaus (Firefox 3.0 nykyisellä)
Name[fr]=UADescription (Firefox 3.0 sous le système actuel)
Name[fy]=UA-beskriuwing (Firefox 3.0 op aktive)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/konqueror/settings/kio/uasproviders/firefox36oncurrent.desktop new/kdebase-4.5.1/apps/konqueror/settings/kio/uasproviders/firefox36oncurrent.desktop
--- old/kdebase-4.5.0/apps/konqueror/settings/kio/uasproviders/firefox36oncurrent.desktop 2010-08-04 21:13:56.000000000 +0200
+++ new/kdebase-4.5.1/apps/konqueror/settings/kio/uasproviders/firefox36oncurrent.desktop 2010-08-27 10:10:17.000000000 +0200
@@ -12,6 +12,7 @@
Name[en_GB]=UADescription (Firefox 3.6 on current)
Name[es]=UADescription (Firefox 3.6 en actual)
Name[et]=UADescription (Selles masinas töötav Firefox 3.6)
+Name[eu]=UA azalpena (Firefox 3.6 unekoan)
Name[fr]=UADescription (Firefox 3.6 sous le système actuel)
Name[fy]=UADescription (Firefox 3.6 op aktive)
Name[ga]=UADescription (Firefox 3.6 ar an gcóras reatha)
@@ -19,6 +20,7 @@
Name[he]=UADescription (Firefox 3.6 on current)
Name[hi]=यूए-डिस्क्रिप्शन (फ़ॉयरफ़ॉक्स 3.6 हालिया पर)
Name[hr]=UADescription (Firefox 3.6 on current)
+Name[hu]=Böngészőtípus (Firefox 3.6)
Name[ia]=UADescription (Firefox 3.6 super le currente)
Name[id]=UADescription (Firefox 3.6 pada saat ini)
Name[is]=UADescription (Firefox 3.6 á núverandi)
@@ -34,6 +36,7 @@
Name[nb]=Brukeragent (Firefox 3.6 herifra)
Name[nds]=UA-Beschrieven (Firefox 3.6 op dit Systeem)
Name[nl]=UADescription (Firefox 3.6 op huidige)
+Name[nn]=Brukaragent (Firefox 3.6 herifrå)
Name[pa]=UADescription (ਮੌਜੂਦਾ ਉੱਤੇ ਫਾਇਰਫਾਕਸ ੩.੬)
Name[pl]=UADescription (Firefox 3.6, bieżący)
Name[pt]=UADescription (Firefox 3.6 no sistema actual)
@@ -41,6 +44,7 @@
Name[ro]=Descriere AU (Firefox 3.6 pe sistemul curent)
Name[ru]=UADescription (Firefox 3.6 на текущей системе)
Name[sk]=Popis agenta (Firefox 3.6 na aktuálnom)
+Name[sl]=UAOpis (Firefox 3.6 na trenutnem)
Name[sr]=УА‑опис (Фајерфокс 3.6 на текућем)
Name[sr@ijekavian]=УА‑опис (Фајерфокс 3.6 на текућем)
Name[sr@ijekavianlatin]=UA-opis (Firefox 3.6 na tekućem)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/konqueror/settings/kio/uasproviders/safari40.desktop new/kdebase-4.5.1/apps/konqueror/settings/kio/uasproviders/safari40.desktop
--- old/kdebase-4.5.0/apps/konqueror/settings/kio/uasproviders/safari40.desktop 2010-08-04 21:13:56.000000000 +0200
+++ new/kdebase-4.5.1/apps/konqueror/settings/kio/uasproviders/safari40.desktop 2010-08-27 10:10:17.000000000 +0200
@@ -12,6 +12,7 @@
Name[en_GB]=UADescription (Safari 4.0 on MacOS X)
Name[es]=UADescription (Safari 4.0 en MacOS X)
Name[et]=UADescription (Safari 4.0 MacOS X platvormil)
+Name[eu]=UA azalpena (Safari 4.0 MacOS X-en)
Name[fr]=UADescription (Safari 4.0 sous MacOS X)
Name[fy]=UADescription (Safari 4.0 op MacOS X)
Name[ga]=UADescription (Safari 4.0 ar MacOS X)
@@ -19,6 +20,7 @@
Name[he]=UADescription (Safari 4.0 on MacOS X)
Name[hi]=यूए-डिस्क्रिप्शन (मॅक-ओएस X में सफारी 2.0)
Name[hr]=UADescription (Safari 4.0 on MacOS X)
+Name[hu]=Böngészőtípus (Safari 4.0, MacOS X)
Name[ia]=UADescription (Safari 4.0 super MacOS X)
Name[id]=UADescription (Safari 4.0 di MacOS X)
Name[is]=UADescription (Safari 4.0 á MacOS X)
@@ -34,6 +36,7 @@
Name[nb]=Brukeragent (Safari 4.0 på MacOS X)
Name[nds]=UA-Beschrieven (Safari 4.0 op MacOS X)
Name[nl]=GA-beschrijving (Safari 4.0 op MacOS X)
+Name[nn]=Brukaragent (Safari 4.0 på MacOS X)
Name[pa]=UADescription (MacOS X ਉੱਤੇ ਸਫ਼ਾਰੀ ੪.੦)
Name[pl]=UADescription (Safari 4.0 w MacOS X)
Name[pt]=UADescription (Safari 4.0 no MacOS X)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/konqueror/sidebar/default_entries/places.desktop new/kdebase-4.5.1/apps/konqueror/sidebar/default_entries/places.desktop
--- old/kdebase-4.5.0/apps/konqueror/sidebar/default_entries/places.desktop 2010-08-04 21:13:56.000000000 +0200
+++ new/kdebase-4.5.1/apps/konqueror/sidebar/default_entries/places.desktop 2010-08-27 10:10:17.000000000 +0200
@@ -83,6 +83,7 @@
Comment[en_GB]=This is the list of places.
Comment[es]=Esta es la lista de lugares.
Comment[et]=Asukohtade loend.
+Comment[eu]=Hau da lekuen zerrenda.
Comment[fi]=Tämä on sijaintien luettelo.
Comment[fr]=Ceci est la liste des emplacements.
Comment[fy]=Dit is de opsomming fan places.
@@ -90,6 +91,7 @@
Comment[he]=זוהי רשימת המקומות.
Comment[hi]=यह स्थानों की सूची है
Comment[hr]=Ovo je lista mjesta.
+Comment[hu]=Ez a helyek listája.
Comment[ia]=Isto es le lista de placias
Comment[id]=Ini adalah senarai tempat.
Comment[is]=Þetta er listi yfir staði á skráarkerfisinu.
@@ -105,6 +107,7 @@
Comment[nb]=Dette er lista over steder.
Comment[nds]=Dit is de List mit Steden.
Comment[nl]=Dit is de lijst met plaatsen.
+Comment[nn]=Dette er lista over stader.
Comment[pa]=ਇਹ ਥਾਵਾਂ ਦੀ ਲਿਸਟ ਹੈ।
Comment[pl]=To jest lista miejsc.
Comment[pt]=Esta é a lista de locais.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/konqueror/sidebar/places_module/konqsidebar_places.desktop new/kdebase-4.5.1/apps/konqueror/sidebar/places_module/konqsidebar_places.desktop
--- old/kdebase-4.5.0/apps/konqueror/sidebar/places_module/konqsidebar_places.desktop 2010-08-04 21:13:56.000000000 +0200
+++ new/kdebase-4.5.1/apps/konqueror/sidebar/places_module/konqsidebar_places.desktop 2010-08-27 10:10:17.000000000 +0200
@@ -13,12 +13,15 @@
Name[en_GB]=Places SideBar Module
Name[es]=Módulo de la barra lateral de lugares
Name[et]=Asukohtade külgriba moodul
+Name[eu]=Lekuen alboko barraren modulua
Name[fi]=Sijainnit sivupalkki-moduuli
Name[fr]=Placer le module de barre de navigation
Name[fy]=Places sydbalke module
Name[ga]=Modúl Barra Taoibh Áiteanna
Name[he]=מודול סרגל צד מקומות
Name[hi]= बाज़ूपट्टी मॉड्यू लगाता हैल
+Name[hr]=Postavlja modul bočne trake
+Name[hu]=Helyek oldalsáv-modul
Name[ia]=Modulo de Barra Lateral de Placias
Name[id]=Tempat Modul Batang Sisi
Name[is]=Staðahliðarsláreining
@@ -34,6 +37,7 @@
Name[nb]=Modul for steder-sidestolpe
Name[nds]=Steden-Sietpaneelmoduul
Name[nl]=Plaatst module voor zijbalk
+Name[nn]=Modul for stad-sidestolpe
Name[pa]=ਥਾਵਾਂ ਬਾਹਰੀ ਮੋਡੀਊਲ
Name[pl]=Moduł paska bocznego miejsc
Name[pt]=Módulo da Barra Lateral dos Locais
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/konqueror/src/konqcombo.cpp new/kdebase-4.5.1/apps/konqueror/src/konqcombo.cpp
--- old/kdebase-4.5.0/apps/konqueror/src/konqcombo.cpp 2010-05-27 19:22:54.000000000 +0200
+++ new/kdebase-4.5.1/apps/konqueror/src/konqcombo.cpp 2010-08-27 10:10:17.000000000 +0200
@@ -869,6 +869,8 @@
const bool blocked = completionbox->blockSignals(true);
completionbox->setCurrentItem(matchedItem);
completionbox->blockSignals(blocked);
+ } else {
+ completionbox->setCurrentRow(-1);
}
}
else { // completion box not visible yet -> show it
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/konqueror/src/konqtabs.cpp new/kdebase-4.5.1/apps/konqueror/src/konqtabs.cpp
--- old/kdebase-4.5.0/apps/konqueror/src/konqtabs.cpp 2010-05-16 12:04:02.000000000 +0200
+++ new/kdebase-4.5.1/apps/konqueror/src/konqtabs.cpp 2010-08-27 10:10:17.000000000 +0200
@@ -74,8 +74,6 @@
m_pActiveChild = 0L;
m_pViewManager = viewManager;
- m_MouseMiddleClickClosesTab = KonqSettings::mouseMiddleClickClosesTab();
-
m_permanentCloseButtons = KonqSettings::permanentCloseButton();
if (m_permanentCloseButtons) {
setTabsClosable( true );
@@ -379,7 +377,7 @@
void KonqFrameTabs::slotMouseMiddleClick(QWidget *w)
{
- if (m_MouseMiddleClickClosesTab) {
+ if (KonqSettings::mouseMiddleClickClosesTab()) {
slotCloseRequest(w);
} else {
KUrl filteredURL(KonqMisc::konqFilteredURL(this, QApplication::clipboard()->text(QClipboard::Selection)));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/konqueror/src/konqtabs.h new/kdebase-4.5.1/apps/konqueror/src/konqtabs.h
--- old/kdebase-4.5.0/apps/konqueror/src/konqtabs.h 2010-04-07 13:23:17.000000000 +0200
+++ new/kdebase-4.5.1/apps/konqueror/src/konqtabs.h 2010-08-27 10:10:17.000000000 +0200
@@ -143,7 +143,6 @@
NewTabToolButton* m_leftWidget;
bool m_permanentCloseButtons;
bool m_alwaysTabBar;
- bool m_MouseMiddleClickClosesTab;
QMap m_popupActions;
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/lib/konq/favicons/favicons.desktop new/kdebase-4.5.1/apps/lib/konq/favicons/favicons.desktop
--- old/kdebase-4.5.0/apps/lib/konq/favicons/favicons.desktop 2010-08-04 21:13:56.000000000 +0200
+++ new/kdebase-4.5.1/apps/lib/konq/favicons/favicons.desktop 2010-08-27 10:10:17.000000000 +0200
@@ -82,6 +82,7 @@
Comment[en_GB]=Stores website icons
Comment[es]=Almacena iconos de sitios web
Comment[et]=Veebilehekülgede ikoonide salvestamine
+Comment[eu]=Webguneen ikonoak gordetzen ditu
Comment[fi]=Säilyttää nettisivujen kuvakkeita
Comment[fr]=Stocker les icônes des site Internet
Comment[fy]=Bewarret website byldkaikes
@@ -89,6 +90,7 @@
Comment[he]=מאחסן צלמיות אתרים
Comment[hi]=वेबसाइट प्रतीक सहेजता है
Comment[hr]=Sprema ikone web stranica
+Comment[hu]=Weboldalak ikonjainak tárolása
Comment[ia]=Il immagazina icones del sito web
Comment[id]=Simpan ikon situs web
Comment[is]=Geymir táknmyndir vefsvæða
@@ -103,6 +105,7 @@
Comment[nb]=Lagrer nettstedsikoner
Comment[nds]=Wohrt Nettsiedenlüttbiller
Comment[nl]=Slaat website pictogrammen op
+Comment[nn]=Lagrar nettstadikon
Comment[pa]=ਵੈੱਬਸਾਈਟ ਆਈਕਾਨ ਸਟੋਰ ਕਰਦਾ ਹੈ
Comment[pl]=Przechowuje ikony stron WWW
Comment[pt]=Guarda os ícones das páginas Web
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/lib/konq/Templates/Floppy.desktop new/kdebase-4.5.1/apps/lib/konq/Templates/Floppy.desktop
--- old/kdebase-4.5.0/apps/lib/konq/Templates/Floppy.desktop 2010-08-04 21:13:56.000000000 +0200
+++ new/kdebase-4.5.1/apps/lib/konq/Templates/Floppy.desktop 2010-08-27 10:10:17.000000000 +0200
@@ -13,11 +13,14 @@
Name[en_GB]=Format
Name[es]=Formato
Name[et]=Vormindamine
+Name[eu]=Formatua
Name[fi]=Alusta
Name[fr]=Format
Name[fy]=Opmaak
Name[ga]=Formáidigh
Name[hi]=फॉर्मेट
+Name[hr]=Formatiranje
+Name[hu]=Formátum
Name[ia]=Format
Name[id]=Format
Name[is]=Forsníða
@@ -33,6 +36,7 @@
Name[nb]=Format
Name[nds]=Formateren
Name[nl]=Formatteren
+Name[nn]=Formater
Name[pa]=ਫਾਰਮੈਟ
Name[pl]=Format
Name[pt]=Formatar
@@ -40,6 +44,7 @@
Name[ro]=Formatare
Name[ru]=Форматировать
Name[sk]=Formát
+Name[sl]=Formatiraj
Name[sr]=Форматирање
Name[sr@ijekavian]=Форматирање
Name[sr@ijekavianlatin]=Formatiranje
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/lib/konq/Templates/linkNFS.desktop new/kdebase-4.5.1/apps/lib/konq/Templates/linkNFS.desktop
--- old/kdebase-4.5.0/apps/lib/konq/Templates/linkNFS.desktop 2010-04-15 10:58:32.000000000 +0200
+++ new/kdebase-4.5.1/apps/lib/konq/Templates/linkNFS.desktop 2010-08-27 10:10:17.000000000 +0200
@@ -33,7 +33,7 @@
Name[hne]=एनएफएस...
Name[hr]=NFS…
Name[hsb]=NFS...
-Name[hu]=NFS...
+Name[hu]=NFS…
Name[ia]=NFS...
Name[id]=NFS...
Name[is]=NFS...
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/lib/konq/Templates/linkPath.desktop new/kdebase-4.5.1/apps/lib/konq/Templates/linkPath.desktop
--- old/kdebase-4.5.0/apps/lib/konq/Templates/linkPath.desktop 2010-08-04 21:13:56.000000000 +0200
+++ new/kdebase-4.5.1/apps/lib/konq/Templates/linkPath.desktop 2010-08-27 10:10:17.000000000 +0200
@@ -21,6 +21,7 @@
Name[he]=קישור בסיסי לקובץ או ספריה...
Name[hi]=फ़ाइल या डॉयरेक्ट्री को मूल कडी...
Name[hr]=Osnovni link do datoteke ili direktorija…
+Name[hu]=Egyszerű link fájlhoz vagy könyvtárhoz…
Name[ia]=Ligamine basic a file o directorio
Name[id]=Tautan dasar ke berkas atau direktori...
Name[is]=Grunntengill við skrá eða möppu...
@@ -81,6 +82,7 @@
Comment[he]=הכנס נתיב קובץ או תיקיה:
Comment[hi]=फ़ाइल या डॉयरेक्ट्री का पथ दें:
Comment[hr]=Unesite putanju datoteke ili direktorija:
+Comment[hu]=Adja meg a fájl vagy könyvtár elérési útját:
Comment[ia]=Tu entra le percurso del file o directorio
Comment[id]=Masukkan alamat berkas atau direktori:
Comment[is]=Settu inn slóð á skrá eða möppu:
++++++ konsolesu.desktop ++++++
--- /var/tmp/diff_new_pack.3tcGny/_old 2010-09-03 14:20:46.000000000 +0200
+++ /var/tmp/diff_new_pack.3tcGny/_new 2010-09-03 14:20:46.000000000 +0200
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Application
Exec=konsole --profile Root_Shell
-Icon=utilities-terminal-su
+Icon=utilities-terminal_su
X-DocPath=konsole/index.html
Terminal=false
X-KDE-StartupNotify=true
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org