Commit c17bad17 authored by Till Adam's avatar Till Adam
Browse files

Merged revisions 871813-885597 via svnmerge from

svn+ssh://tilladam@svn.kde.org/home/kde//branches/KDE/4.1/kdebase

........
  r871813 | ppenz | 2008-10-15 20:02:45 +0200 (Wed, 15 Oct 2008) | 3 lines
  
  Workaround for a crash when converting valid QPixmaps having a huge width to a QIcon (-> QIcon::isNull() will return true). I did not have the time for a more detailed analyzes, but this issue does not occur on trunk with a recent Qt/KDE version; so no forward port to trunk is done.
  
  BUG: 170547
........
  r871936 | scripty | 2008-10-16 08:30:52 +0200 (Thu, 16 Oct 2008) | 1 line
  
  SVN_SILENT made messages (.desktop file)
........
  r872391 | scripty | 2008-10-17 08:07:31 +0200 (Fri, 17 Oct 2008) | 1 line
  
  SVN_SILENT made messages (.desktop file)
........
  r872748 | dfaure | 2008-10-18 03:08:06 +0200 (Sat, 18 Oct 2008) | 2 lines
  
  Backport fix for tab text messup, r872737, bug 170470.
........
  r872763 | tyrerj | 2008-10-18 05:37:56 +0200 (Sat, 18 Oct 2008) | 1 line
  
  updating temporary DNG icon again
........
  r873009 | uwolfer | 2008-10-18 16:13:29 +0200 (Sat, 18 Oct 2008) | 7 lines
  
  Backport:
  SVN commit 873005 by uwolfer:
  
  Fix and optimization:
  * only load icons when they are actually required (and cache the pixmap of the icon then)
  * use existing icons (fixes really annoying issue that there was always a broken icon in statusbar)
  * do not use a 'hack' width for the icon label; instead set a fixed size with is exactly the same size as the icons will be
........
  r873188 | huynhhuu | 2008-10-19 02:39:37 +0200 (Sun, 19 Oct 2008) | 4 lines
  
  Backport of r835483 redraw buttons when redrawing the whole decoration
  BUG: 167886
........
  r873554 | ervin | 2008-10-19 19:11:00 +0200 (Sun, 19 Oct 2008) | 2 lines
  
  Backporting the typo fix from revision 845237.
........
  r873641 | osterfeld | 2008-10-19 23:13:17 +0200 (Sun, 19 Oct 2008) | 3 lines
  
  backport 169915: don't crash on desktop switch when UserAgentSelectorDlg is open
  CCBUG: 169915
........
  r874015 | pino | 2008-10-20 18:00:07 +0200 (Mon, 20 Oct 2008) | 2 lines
  
  bring back the kde gear that goes clockwise (see r466908)
........
  r874212 | orlovich | 2008-10-21 01:23:15 +0200 (Tue, 21 Oct 2008) | 3 lines
  
  Do not display an error page that's an image as favicon; fixes scary favicon on acid3.
  Patch by dfaure...
........
  r874284 | scripty | 2008-10-21 08:50:36 +0200 (Tue, 21 Oct 2008) | 1 line
  
  SVN_SILENT made messages (.desktop file)
........
  r874457 | orlovich | 2008-10-21 18:43:34 +0200 (Tue, 21 Oct 2008) | 3 lines
  
  Really fix the favicon. Freaking implicit conversions --- but why did I think it worked before?
........
  r874649 | scripty | 2008-10-22 09:09:05 +0200 (Wed, 22 Oct 2008) | 1 line
  
  SVN_SILENT made messages (.desktop file)
........
  r875064 | quique | 2008-10-23 09:55:00 +0200 (Thu, 23 Oct 2008) | 1 line
  
  SVN_SILENT Fix Ecuador's name in KDE 4.1
........
  r875236 | craig | 2008-10-23 21:15:33 +0200 (Thu, 23 Oct 2008) | 2 lines
  
  Fix foundry list.
........
  r875284 | aacid | 2008-10-24 00:09:31 +0200 (Fri, 24 Oct 2008) | 9 lines
  
  Backport r875283 | aacid | 2008-10-24 00:06:48 +0200 (Fri, 24 Oct 2008) | 12 lines
  
  sigaction somehow was playing tricks with other Qt/KDE code, so let's remove it and use waitpid directly after kill
  
  This fixes protocol died errors when logging in to fish urls when no user is specified, that is, part of bug 155591 and only works when using konqueror
  
  When using dolphin it still triggers an assert on KDirLister::Private::redirect so i'm not sure it's a problem of the slave, of dolphins code or what
........
  r875341 | scripty | 2008-10-24 08:12:28 +0200 (Fri, 24 Oct 2008) | 1 line
  
  SVN_SILENT made messages (.desktop file)
........
  r875564 | ppenz | 2008-10-24 22:32:45 +0200 (Fri, 24 Oct 2008) | 5 lines
  
  Backport of SVN commit 875554:
  
  Assure that no reloading is done if KDirLister emits a redirection, only change the the URL. Thanks to David Faure and Albert Alstals Cid for the detailed analysis!
  
  CCBUG: 155591
........
  r875670 | scripty | 2008-10-25 08:37:48 +0200 (Sat, 25 Oct 2008) | 1 line
  
  SVN_SILENT made messages (.desktop file)
........
  r875964 | scripty | 2008-10-26 07:36:23 +0100 (Sun, 26 Oct 2008) | 1 line
  
  SVN_SILENT made messages (.desktop file)
........
  r876250 | sebsauer | 2008-10-26 22:47:06 +0100 (Sun, 26 Oct 2008) | 5 lines
  
  backport r876249
  Fix web-sidebar makes konqueror crash
  BUG:163106
........
  r876335 | scripty | 2008-10-27 08:39:55 +0100 (Mon, 27 Oct 2008) | 1 line
  
  SVN_SILENT made messages (.desktop file)
........
  r876494 | dfaure | 2008-10-27 14:01:33 +0100 (Mon, 27 Oct 2008) | 2 lines
  
  Repair applications:/
........
  r876585 | sebsauer | 2008-10-27 16:19:21 +0100 (Mon, 27 Oct 2008) | 3 lines
  
  backport r876130
  Fix flash9 crash
........
  r876597 | sebsauer | 2008-10-27 16:54:15 +0100 (Mon, 27 Oct 2008) | 4 lines
  
  backport r874142
  fix case that Konqi's Bookmarks=>Edit Bookmarks did not show all options cause keditbookmarks-genui.rc was used rather then keditbookmarksui.rc.
........
  r876804 | scripty | 2008-10-28 08:17:13 +0100 (Tue, 28 Oct 2008) | 1 line
  
  SVN_SILENT made messages (.desktop file)
........
  r877148 | rdieter | 2008-10-28 20:14:10 +0100 (Tue, 28 Oct 2008) | 5 lines
  
  Fix: "Gtk+ apps emit warnings on the console when Oxygen is selected"
  
  CCBUS: 173688
........
  r877313 | scripty | 2008-10-29 09:02:28 +0100 (Wed, 29 Oct 2008) | 1 line
  
  SVN_SILENT made messages (.desktop file)
........
  r877317 | lueck | 2008-10-29 09:05:24 +0100 (Wed, 29 Oct 2008) | 1 line
  
  fix wrong/missing X-DocPath
........
  r877439 | lueck | 2008-10-29 15:24:03 +0100 (Wed, 29 Oct 2008) | 1 line
  
  add X-KDE-ParentApp=kcontrol so it is picked up by kcmshell4 --list
........
  r877489 | woebbe | 2008-10-29 18:15:09 +0100 (Wed, 29 Oct 2008) | 1 line
  
  icons are nice
........
  r877560 | dfaure | 2008-10-29 20:53:22 +0100 (Wed, 29 Oct 2008) | 2 lines
  
  backport fix for --service
........
  r877717 | scripty | 2008-10-30 08:38:31 +0100 (Thu, 30 Oct 2008) | 1 line
  
  SVN_SILENT made messages (.desktop file)
........
  r877950 | woebbe | 2008-10-30 20:08:14 +0100 (Thu, 30 Oct 2008) | 3 lines
  
  set application icon so that sub windows like "KRunner Settings" dialog have an icon.
  
  this make the window icon in Interface superfluous.
........
  r878037 | scripty | 2008-10-31 08:17:36 +0100 (Fri, 31 Oct 2008) | 1 line
  
  SVN_SILENT made messages (.desktop file)
........
  r878485 | woebbe | 2008-11-01 13:00:07 +0100 (Sat, 01 Nov 2008) | 1 line
  
  also an icon for the configure dialog (and its windows) is nice
........
  r878487 | woebbe | 2008-11-01 13:02:36 +0100 (Sat, 01 Nov 2008) | 1 line
  
  draw focus rect for old style listviews (e.g. in KMail)
........
  r878674 | woebbe | 2008-11-01 17:06:04 +0100 (Sat, 01 Nov 2008) | 1 line
  
  OK, draw focus rect ONLY for Q3ListView
........
  r878695 | pino | 2008-11-01 17:52:12 +0100 (Sat, 01 Nov 2008) | 3 lines
  
  backport:
  fix a typo, making the SSE3 capability outputted in the correct case (and not being mistaken as SSE2)
........
  r878756 | woebbe | 2008-11-01 19:51:42 +0100 (Sat, 01 Nov 2008) | 1 line
  
  third try, widget can be 0
........
  r878776 | woebbe | 2008-11-01 20:20:52 +0100 (Sat, 01 Nov 2008) | 1 line
  
  better solution, don't change configModules()
........
  r878939 | scripty | 2008-11-02 08:27:43 +0100 (Sun, 02 Nov 2008) | 1 line
  
  SVN_SILENT made messages (.desktop file)
........
  r879159 | alexmerry | 2008-11-02 15:56:40 +0100 (Sun, 02 Nov 2008) | 7 lines
  
  Fix Amarok support.  The old Amarok D-Bus interface is no longer supported by Amarok, but org.kde.Amarok still exists when Amarok is running, confusing the engine and making the applet ignore the working org.mpris.amarok interface.
  
  Unfortunately missed 4.1.3 by two days.  C'est la vie.
  
  BUG: 174044
........
  r879383 | scripty | 2008-11-03 08:25:27 +0100 (Mon, 03 Nov 2008) | 1 line
  
  SVN_SILENT made messages (.desktop file)
........
  r879707 | lunakl | 2008-11-03 22:09:24 +0100 (Mon, 03 Nov 2008) | 5 lines
  
  r873188
  Backport of r835483 redraw buttons when redrawing the whole decoration
  (BUG: 167886)
........
  r879750 | gladhorn | 2008-11-03 23:49:40 +0100 (Mon, 03 Nov 2008) | 2 lines
  
  add kvtml icons for 4.1. nini.
........
  r880331 | scripty | 2008-11-05 09:11:02 +0100 (Wed, 05 Nov 2008) | 1 line
  
  SVN_SILENT made messages (.desktop file)
........
  r880850 | lunakl | 2008-11-06 18:11:47 +0100 (Thu, 06 Nov 2008) | 7 lines
  
  Use the '_k_session' shortcuts feature for the per-window shortcuts,
  as those are definitely not to be handled by kdedglobalaccel besides
  delivering the event, only KWin can keep track of those. Also add
  a kconf_update script to dump all the possibly previously created
  shortcuts that'd block actually using them.
........
  r880871 | lunakl | 2008-11-06 19:18:05 +0100 (Thu, 06 Nov 2008) | 4 lines
  
  Use the '_k_session:' shortcut trick to prevent kdedglobalaccel
  from doing more than just delivering events for shortcuts.
........
  r880872 | lunakl | 2008-11-06 19:18:41 +0100 (Thu, 06 Nov 2008) | 4 lines
  
  The KDE4.1 version takes org.kde.khotkeys/KHotKeys on DBUS, so use
  it consistently.
........
  r881004 | scripty | 2008-11-07 08:35:59 +0100 (Fri, 07 Nov 2008) | 1 line
  
  SVN_SILENT made messages (.desktop file)
........
  r881249 | lunakl | 2008-11-07 16:11:42 +0100 (Fri, 07 Nov 2008) | 3 lines
  
  Avoid a deadlock during first kde start.
........
  r881256 | lunakl | 2008-11-07 16:44:56 +0100 (Fri, 07 Nov 2008) | 3 lines
  
  Fix porting error.
........
  r881353 | dfaure | 2008-11-07 22:03:48 +0100 (Fri, 07 Nov 2008) | 2 lines
  
  backport 881350: remove useless configuration widgets for tooltips in konq
........
  r881363 | huftis | 2008-11-07 22:21:56 +0100 (Fri, 07 Nov 2008) | 1 line
  
  Fixed locale-specific formatting for Norway (Norwegian Nynorsk and Norwegian Bokm?\195?\165l).
........
  r881465 | bando | 2008-11-08 11:03:48 +0100 (Sat, 08 Nov 2008) | 1 line
  
  Fix default date formats
........
  r881981 | huftis | 2008-11-09 14:54:45 +0100 (Sun, 09 Nov 2008) | 1 line
  
  Added default DateFormat for Norway.
........
  r882038 | jferrer | 2008-11-09 17:27:37 +0100 (Sun, 09 Nov 2008) | 2 lines
  
  Added catalan default date format
........
  r882240 | scripty | 2008-11-10 08:34:56 +0100 (Mon, 10 Nov 2008) | 1 line
  
  SVN_SILENT made messages (.desktop file)
........
  r882293 | mkretz | 2008-11-10 11:14:17 +0100 (Mon, 10 Nov 2008) | 11 lines
  
  backport r880932:
  
  This was quite a porting mess. The old code would fill up qt/4.4/libraryPath in Trolltech.conf with all kinds of paths, most of them duplicates. This hurt startup time and made applications load plugins from incorrect plugin dirs.
  
  I've rewritten the code to do what it was intended to do:
  - look at libraryPath
  - remove all entries that KDE added last time
  - add all the paths KStandardDirs returns for the qtplugins resource
  - store what we added to the list
  - store the new list
........
  r882355 | dfaure | 2008-11-10 16:48:03 +0100 (Mon, 10 Nov 2008) | 2 lines
  
  Fix kioexec not asking to upload anymore, after making changes (the eventloop of the messagebox exited immediately...)
........
  r882363 | mkretz | 2008-11-10 17:24:02 +0100 (Mon, 10 Nov 2008) | 1 line
  
  add kconf_update application to do a one-time cleanup of the libraryPath in Trolltech.conf
........
  r882881 | lunakl | 2008-11-11 16:07:14 +0100 (Tue, 11 Nov 2008) | 7 lines
  
  Make sure the GLX context is destroyed before the window it's been
  made current with. Even though it should be allowed to do it afterwards
  it seems this can crash AIGLX.
  http://lists.freedesktop.org/archives/xorg/2008-November/040168.html
  BUG: 174782
........
  r882916 | lunakl | 2008-11-11 17:31:38 +0100 (Tue, 11 Nov 2008) | 4 lines
  
  Mark hide() explicitly as a slot, since it's not virtual with Qt4.
  Patch by "qiang zhang" <liubingzhq@gmail.com>.
........
  r883104 | scripty | 2008-11-12 09:13:46 +0100 (Wed, 12 Nov 2008) | 1 line
  
  SVN_SILENT made messages (.desktop file)
........
  r884073 | scripty | 2008-11-14 08:29:22 +0100 (Fri, 14 Nov 2008) | 1 line
  
  SVN_SILENT made messages (.desktop file)
........
  r884300 | sengels | 2008-11-14 16:48:44 +0100 (Fri, 14 Nov 2008) | 2 lines
  
  add desktop kioslave
  needed for plasma - backport r838873
........
  r885597 | bando | 2008-11-17 15:09:26 +0100 (Mon, 17 Nov 2008) | 1 line
  
  Set default WeekDayOfPray to None
........

svn path=/branches/kdepim/enterprise4/kdebase-4.1-branch/apps/; revision=885973
parent 67e6fe1a
[Desktop Entry]
Name=Dolphin
Name[ar]=الدولفين
Name[ar]=دولفين
Name[bn]=ডলফিন
Name[fy]=Dolfyn
Name[gu]=ડોલ્ફિન
......
......@@ -123,7 +123,7 @@ DolphinView::DolphinView(QWidget* parent,
this, SLOT(clearHoverInformation()));
connect(m_dirLister, SIGNAL(redirection(KUrl, KUrl)),
this, SLOT(slotRedirection(KUrl, KUrl)));
this, SIGNAL(redirection(KUrl, KUrl)));
connect(m_dirLister, SIGNAL(completed()),
this, SLOT(restoreCurrentItem()));
......@@ -1214,11 +1214,4 @@ void DolphinView::slotRequestUrlChange(const KUrl& url)
m_controller->setUrl(url);
}
void DolphinView::slotRedirection(const KUrl& oldUrl, const KUrl& newUrl)
{
if (oldUrl == m_controller->url()) {
m_controller->setUrl(newUrl);
}
}
#include "dolphinview.moc"
......@@ -507,6 +507,12 @@ signals:
* Used for feedback in the mainwindow.
*/
void doingOperation(KIO::FileUndoManager::CommandType type);
/**
* Emitted when KDirLister emits redirection.
* Testcase: fish://localhost
*/
void slotRedirection(const KUrl& oldUrl, const KUrl& newUrl);
protected:
/** @see QWidget::mouseReleaseEvent */
......@@ -590,12 +596,6 @@ private slots:
*/
void slotDeleteFileFinished(KJob* job);
/**
* Called when KDirLister emits redirection.
* Testcase: fish://localhost
*/
void slotRedirection(const KUrl& oldUrl, const KUrl& newUrl);
/**
* Is emitted if the controller requests a changing of the current
* URL to \a url
......
......@@ -138,7 +138,8 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,
this, SLOT(slotItemTriggered(KFileItem)));
connect(m_view, SIGNAL(startedPathLoading(const KUrl&)),
this, SLOT(saveRootUrl(const KUrl&)));
connect(m_view, SIGNAL(redirection(KUrl, KUrl)),
this, SLOT(redirect(KUrl, KUrl)));
connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)),
this, SLOT(restoreView(const KUrl&)));
......@@ -405,6 +406,15 @@ void DolphinViewContainer::saveRootUrl(const KUrl& url)
m_urlNavigator->saveRootUrl(m_view->rootUrl());
}
void DolphinViewContainer::redirect(const KUrl& oldUrl, const KUrl& newUrl)
{
Q_UNUSED(oldUrl);
const bool block = m_urlNavigator->signalsBlocked();
m_urlNavigator->blockSignals(true);
m_urlNavigator->setUrl(newUrl);
m_urlNavigator->blockSignals(block);
}
void DolphinViewContainer::slotItemTriggered(const KFileItem& item)
{
KUrl url = item.targetUrl();
......
......@@ -202,6 +202,13 @@ private slots:
*/
void saveRootUrl(const KUrl& url);
/**
* Is invoked when a redirection is done and changes the
* URL of the URL navigator to \a newUrl without triggering
* a reloading of the directory.
*/
void redirect(const KUrl& oldUrl, const KUrl& newUrl);
private:
/**
* Returns the default text of the status bar, if no item is
......
......@@ -314,7 +314,10 @@ void IconManager::dispatchPreviewQueue()
const QModelIndex idx = m_dolphinModel->indexForUrl(preview.url);
if (idx.isValid() && (idx.column() == 0)) {
m_dolphinModel->setData(idx, QIcon(preview.pixmap), Qt::DecorationRole);
const QIcon icon(preview.pixmap);
if (!icon.isNull()) {
m_dolphinModel->setData(idx, icon, Qt::DecorationRole);
}
}
m_previews.pop_front();
......
Name=Dolphin
Name[ar]=الدولفين
Name[ar]=دولفين
Name[bn]=ডলফিন
Name[fy]=Dolfyn
Name[gu]=ડોલ્ફિન
......@@ -36,6 +36,7 @@ Comment[gl]=Este servizo permite configurar as vistas de Dolphin.
Comment[gu]=આ સેવા ડોલ્ફિન દેખાવોનું રૂપરેખાંકન કરવા દેશે.
Comment[hr]=Konfiguriranje prikaza upravitelja datotekama Dolphin.
Comment[hu]=Ez a szolgáltatás a Dolphin nézeteinek beállítását teszi lehetővé.
Comment[is]=Þessi þjónusta leyfir stillingar á sýnum Dolphin.
Comment[it]=Questo servizio permette di configurare le viste di Dolphin.
Comment[ja]=このサービスで Dolphin のビューを設定できます。
Comment[kk]=Бұл Dolphin көрінісін баптауға мүмкіндік беретін қызмет.
......@@ -164,6 +165,7 @@ Comment[gl]=Configura as opcións do xestor de ficheiros
Comment[gu]=ફાઇલ વ્યવસ્થાપક ગોઠવણીઓ રૂપરેખાંકિત કરો
Comment[hr]=Konfiguriranje postavki upravitelja datotekama
Comment[hu]=A fájlkezelő beállításai
Comment[is]=Stilla skráastjóra
Comment[it]=Configura le impostazioni del gestore dei file
Comment[ja]=ファイルマネージャの設定
Comment[kk]=Файл менеджер параметрлерін баптау
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment