Commit 67e6fe1a authored by Till Adam's avatar Till Adam
Browse files

Merged revisions 856059-871529 via svnmerge from

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

........
  r856059 | scripty | 2008-09-02 07:55:38 +0200 (Tue, 02 Sep 2008) | 1 line
  
  SVN_SILENT made messages (.desktop file)
........
  r856414 | ppenz | 2008-09-02 22:03:28 +0200 (Tue, 02 Sep 2008) | 3 lines
  
  Backport of 856411: don't clear the filterbar when switching between tabs
  
  CCBUG: 169878
........
  r856508 | scripty | 2008-09-03 08:34:23 +0200 (Wed, 03 Sep 2008) | 1 line
  
  SVN_SILENT made messages (.desktop file)
........
  r856687 | aseigo | 2008-09-03 17:09:59 +0200 (Wed, 03 Sep 2008) | 2 lines
  
  read the entry untranslated; otherwise we lose the setting when switching locales and this is not local dependant
........
  r856707 | aseigo | 2008-09-03 18:03:18 +0200 (Wed, 03 Sep 2008) | 2 lines
  
  backport; create the menu earlier
........
  r856901 | scripty | 2008-09-04 08:08:10 +0200 (Thu, 04 Sep 2008) | 1 line
  
  SVN_SILENT made messages (.desktop file)
........
  r856991 | mlaurent | 2008-09-04 13:27:19 +0200 (Thu, 04 Sep 2008) | 3 lines
  
  Backport:
  fix extract messages
........
  r857260 | scripty | 2008-09-05 08:08:13 +0200 (Fri, 05 Sep 2008) | 1 line
  
  SVN_SILENT made messages (.desktop file)
........
  r857427 | dfaure | 2008-09-05 13:35:05 +0200 (Fri, 05 Sep 2008) | 3 lines
  
  Fix optimization for "don't load the aboutpage if not necessary" so that we don't have the opposite
  problem of loading+deleting khtml before showing about:, oops.
........
  r857430 | dfaure | 2008-09-05 13:41:39 +0200 (Fri, 05 Sep 2008) | 2 lines
  
  SVN_SILENT less debug output; coding style fixes; unit test crash fix
........
  r857610 | dfaure | 2008-09-05 22:18:41 +0200 (Fri, 05 Sep 2008) | 3 lines
  
  Backports from trunk: r854525:854653
  Includes profile loading fixes and xmlgui unification.
........
  r858387 | menard | 2008-09-08 01:15:54 +0200 (Mon, 08 Sep 2008) | 2 lines
  
  backport of 858381 : Fix crash when a battery is removed
........
  r859351 | scripty | 2008-09-10 08:46:55 +0200 (Wed, 10 Sep 2008) | 1 line
  
  SVN_SILENT made messages (.desktop file)
........
  r859625 | craig | 2008-09-10 22:26:21 +0200 (Wed, 10 Sep 2008) | 2 lines
  
  Fix crash due to QTreeWidgetItem::setExpanded.
........
  r859743 | osterfeld | 2008-09-11 10:58:55 +0200 (Thu, 11 Sep 2008) | 1 line
  
  use _libs
........
  r860412 | dfaure | 2008-09-13 01:24:08 +0200 (Sat, 13 Sep 2008) | 2 lines
  
  backport r860411, obvious fix
........
  r860601 | lueck | 2008-09-13 15:38:38 +0200 (Sat, 13 Sep 2008) | 1 line
  
  remove duplicated para, this does not break doc freeze
........
  r861040 | tyrerj | 2008-09-15 01:58:30 +0200 (Mon, 15 Sep 2008) | 1 line
  
  Backporting 861039
........
  r861047 | tyrerj | 2008-09-15 03:18:05 +0200 (Mon, 15 Sep 2008) | 1 line
  
  correcting error
........
  r861092 | scripty | 2008-09-15 08:08:05 +0200 (Mon, 15 Sep 2008) | 1 line
  
  SVN_SILENT made messages (.desktop file)
........
  r861426 | scripty | 2008-09-16 08:09:44 +0200 (Tue, 16 Sep 2008) | 1 line
  
  SVN_SILENT made messages (.desktop file)
........
  r861486 | lueck | 2008-09-16 11:43:51 +0200 (Tue, 16 Sep 2008) | 1 line
  
  adjust X-DocPath to documentation backport Revision 854912 
........
  r861676 | sebas | 2008-09-16 22:02:34 +0200 (Tue, 16 Sep 2008) | 1 line
  
  An applet this big doesn't fit in most panels
........
  r861764 | scripty | 2008-09-17 08:52:36 +0200 (Wed, 17 Sep 2008) | 1 line
  
  SVN_SILENT made messages (.desktop file)
........
  r862119 | scripty | 2008-09-18 08:21:13 +0200 (Thu, 18 Sep 2008) | 1 line
  
  SVN_SILENT made messages (.desktop file)
........
  r862160 | ereslibre | 2008-09-18 11:24:26 +0200 (Thu, 18 Sep 2008) | 2 lines
  
  Backport(If you are running in a SSL secured connection, and click on the dropdown arrow of the combo, do not show the SSL information.)
........
  r862313 | lunakl | 2008-09-18 17:28:13 +0200 (Thu, 18 Sep 2008) | 5 lines
  
  Disable shadow with effects that transform windows, such as wobbly,
  since shadow currently can't handle that.
  (bug 161330)
........
  r862455 | lueck | 2008-09-18 23:27:56 +0200 (Thu, 18 Sep 2008) | 3 lines
  
  mouse kcm code is in workspace, moving doc to be coherent said annma for trunk
  do it for stable in coordination with aacid too
  CCMAIL:annma@kde.org
........
  r862859 | scripty | 2008-09-20 08:50:17 +0200 (Sat, 20 Sep 2008) | 1 line
  
  SVN_SILENT made messages (.desktop file)
........
  r863180 | uwolfer | 2008-09-21 13:25:05 +0200 (Sun, 21 Sep 2008) | 5 lines
  
  Backport:
  SVN commit 863178 by uwolfer:
  
  Fix crash if you delete all associations and then add a new one.
  #BUG:171395
........
  r863218 | gberg | 2008-09-21 15:17:49 +0200 (Sun, 21 Sep 2008) | 1 line
  
  Backport of commit 863215
........
  r863580 | thanngo | 2008-09-22 16:42:46 +0200 (Mon, 22 Sep 2008) | 2 lines
  
  silent
........
  r863974 | dfaure | 2008-09-23 18:50:17 +0200 (Tue, 23 Sep 2008) | 4 lines
  
  Backport SVN commit 863973:
  Fix "invalid url" error message when splitting a view [another regression due to part activation being immediate now]
  Cleaned up "immediate" bool, and setActivePart overloading in KonqViewManager.
........
  r864023 | dfaure | 2008-09-23 21:02:49 +0200 (Tue, 23 Sep 2008) | 5 lines
  
  Backport SVN commit 863998:
  Fix split+link+lock for html pages, as reported by wstephenson. With unit test.
  
  Couldn't find a bug report for it on bugs.kde.org, strange.
........
  r864183 | scripty | 2008-09-24 09:02:38 +0200 (Wed, 24 Sep 2008) | 1 line
  
  SVN_SILENT made messages (.desktop file)
........
  r864228 | graesslin | 2008-09-24 10:49:18 +0200 (Wed, 24 Sep 2008) | 1 line
  
  Fix possible crash when using alt+tab again while coverswitch is closing. Backporting patch from rev. 864225. Fixes bug 170860.
........
  r864234 | graesslin | 2008-09-24 11:06:18 +0200 (Wed, 24 Sep 2008) | 1 line
  
  Ensure that full screen input window is always destroyed when using alt+tab again while flip switch closes. So mouse cursor is shown again. Backport rev 864231.
........
  r864460 | lueck | 2008-09-24 22:17:36 +0200 (Wed, 24 Sep 2008) | 1 line
  
  fix wrong docpath and CMakeList.txt
........
  r864588 | scripty | 2008-09-25 08:51:40 +0200 (Thu, 25 Sep 2008) | 1 line
  
  SVN_SILENT made messages (.desktop file)
........
  r864939 | scripty | 2008-09-26 08:16:33 +0200 (Fri, 26 Sep 2008) | 1 line
  
  SVN_SILENT made messages (.desktop file)
........
  r865039 | dfaure | 2008-09-26 15:08:56 +0200 (Fri, 26 Sep 2008) | 4 lines
  
  Backport r865038
  Check that the path is actually "/", not just "of length 0 or 1", otherwise trash:z is interpreted as trash:/ here (but not in KDirModel)
  Fixes bug 160070
........
  r865120 | lueck | 2008-09-26 21:14:54 +0200 (Fri, 26 Sep 2008) | 1 line
  
  move the docs to workspace where the code is
........
  r865451 | lueck | 2008-09-27 18:05:11 +0200 (Sat, 27 Sep 2008) | 13 lines
  
  documentation backport for 4.1.3 from trunk
  CCMAIL:kde-i18n-doc@kde.org
  Thanks to all translators reporting typos and errors
  see also doc backports:
  kdeadmin #865441
  kdeutils #865442
  kdewebdev #865443
  kdeedu #865444
  kdegames #865445
  kdenetwork #865446
  kdepim #865447
  kdemultimedia #865448
  kdesdk #865446
........
  r865457 | wstephens | 2008-09-27 18:37:27 +0200 (Sat, 27 Sep 2008) | 1 line
  
  Backport r836199 - use canonical mimetype name for ms word icon
........
  r865821 | scripty | 2008-09-29 08:38:09 +0200 (Mon, 29 Sep 2008) | 1 line
  
  SVN_SILENT made messages (.desktop file)
........
  r865953 | dfaure | 2008-09-29 17:12:27 +0200 (Mon, 29 Sep 2008) | 2 lines
  
  Backport r861259 (creates empty tab, bug 171029) and r860346 (old code removal to fix jumping to anchors, bug 166389)
........
  r866034 | lueck | 2008-09-29 22:26:52 +0200 (Mon, 29 Sep 2008) | 1 line
  
  backport of url fix
........
  r866043 | dfaure | 2008-09-29 22:50:16 +0200 (Mon, 29 Sep 2008) | 4 lines
  
  Fix error message (konqueror cannot handle text/html) when clicking on a url which uses Content-Disposition,
  due to some things only being done for the first openView call and not for the second one. Backport.
  BUG 171869
........
  r866120 | scripty | 2008-09-30 08:09:47 +0200 (Tue, 30 Sep 2008) | 1 line
  
  SVN_SILENT made messages (.desktop file)
........
  r866296 | lunakl | 2008-09-30 14:06:25 +0200 (Tue, 30 Sep 2008) | 6 lines
  
  r866294
  Workaround for kwin<->kglobalaccel deadlock, when KWin has X grab and the kded
  kglobalaccel module tries to create the key grab. KWin should preferably grab
  they keys itself anyway :(.
........
  r866351 | lunakl | 2008-09-30 18:46:14 +0200 (Tue, 30 Sep 2008) | 6 lines
  
  r866350
  When window shape changes, also cause a workspace repaint, just in case
  the change removes part of a window. Also, window repaint is enough,
  no need to damage the window contents.
........
  r866510 | scripty | 2008-10-01 09:11:02 +0200 (Wed, 01 Oct 2008) | 1 line
  
  SVN_SILENT made messages (.desktop file)
........
  r866589 | lunakl | 2008-10-01 13:55:44 +0200 (Wed, 01 Oct 2008) | 5 lines
  
  r866586
  Avoid drawing corruptions caused by window geometry and shape
  being out of sync (bnc#430472).
........
  r866832 | dfaure | 2008-10-02 02:10:38 +0200 (Thu, 02 Oct 2008) | 2 lines
  
  Backport window.opener fix (r866830, bug 171729)
........
  r866866 | scripty | 2008-10-02 08:18:03 +0200 (Thu, 02 Oct 2008) | 1 line
  
  SVN_SILENT made messages (.desktop file)
........
  r866940 | dfaure | 2008-10-02 13:45:58 +0200 (Thu, 02 Oct 2008) | 2 lines
  
  Backport: Don't exit the whole KDE session just because of a messagebox during startup. BUG 169486
........
  r867630 | sitter | 2008-10-04 03:14:51 +0200 (Sat, 04 Oct 2008) | 3 lines
  
  Don't load mimetype icons at startup, they decrease the startup time by 6-10x
  OPTIMIZE
........
  r867682 | mlaurent | 2008-10-04 10:36:47 +0200 (Sat, 04 Oct 2008) | 3 lines
  
  Backport: fix bug #166816
  don't call load() it's already called by kcmshell4
........
  r867697 | mlaurent | 2008-10-04 11:04:23 +0200 (Sat, 04 Oct 2008) | 2 lines
  
  Backport: fix bug #162022
........
  r867710 | mlaurent | 2008-10-04 11:56:29 +0200 (Sat, 04 Oct 2008) | 2 lines
  
  Backport: Fix bug #170048
........
  r867979 | scripty | 2008-10-05 07:50:38 +0200 (Sun, 05 Oct 2008) | 1 line
  
  SVN_SILENT made messages (.desktop file)
........
  r868130 | mecir | 2008-10-05 16:25:48 +0200 (Sun, 05 Oct 2008) | 2 lines
  
  Backporting fix for bug 172014.
........
  r868726 | mueller | 2008-10-07 01:17:32 +0200 (Tue, 07 Oct 2008) | 1 line
  
  backport 868725
........
  r868784 | scripty | 2008-10-07 08:13:46 +0200 (Tue, 07 Oct 2008) | 1 line
  
  SVN_SILENT made messages (.desktop file)
........
  r868958 | dfaure | 2008-10-07 20:54:01 +0200 (Tue, 07 Oct 2008) | 3 lines
  
  Pass the file type to findByUrl so that it doesn't treat a directory called "core" as a coredump.
  Reported and tested by Urs Wolfer.
........
  r869150 | mlaurent | 2008-10-08 13:10:17 +0200 (Wed, 08 Oct 2008) | 3 lines
  
  Backport:
  Don't insert comment
........
  r869805 | scripty | 2008-10-10 08:05:04 +0200 (Fri, 10 Oct 2008) | 1 line
  
  SVN_SILENT made messages (.desktop file)
........
  r869889 | gladhorn | 2008-10-11 13:40:57 +0200 (Sat, 11 Oct 2008) | 2 lines
  
  backport r869888 crash when adding new web shortcut
........
  r870246 | scripty | 2008-10-12 08:11:38 +0200 (Sun, 12 Oct 2008) | 1 line
  
  SVN_SILENT made messages (.desktop file)
........
  r870407 | gladhorn | 2008-10-12 15:41:34 +0200 (Sun, 12 Oct 2008) | 1 line
  
  backport 870406
........
  r870681 | tyrerj | 2008-10-13 05:11:38 +0200 (Mon, 13 Oct 2008) | 1 line
  
  Adding icon for DNG MIME Type
........
  r870701 | scripty | 2008-10-13 08:10:00 +0200 (Mon, 13 Oct 2008) | 1 line
  
  SVN_SILENT made messages (.desktop file)
........
  r870760 | dfaure | 2008-10-13 11:13:49 +0200 (Mon, 13 Oct 2008) | 2 lines
  
  Looks like QApp::exit before QApp::exec has no effect. So we better not call exec when we want to exit already, otherwise kioexec will keep running forever. Bug #172197.
........
  r870789 | dfaure | 2008-10-13 12:13:23 +0200 (Mon, 13 Oct 2008) | 2 lines
  
  backporting 870787, fix for 167667 crash
........
  r870999 | dfaure | 2008-10-13 20:07:12 +0200 (Mon, 13 Oct 2008) | 2 lines
  
  Backport fix for double connect
........
  r871063 | hasso | 2008-10-13 22:40:15 +0200 (Mon, 13 Oct 2008) | 2 lines
  
  Search in /usr/pkg (used by pkgsrc package system).
........
  r871101 | dfaure | 2008-10-13 23:43:02 +0200 (Mon, 13 Oct 2008) | 2 lines
  
  Backport Nicolas' fix for 171861  (kde4 porting bug)
........
  r871138 | dfaure | 2008-10-14 02:27:16 +0200 (Tue, 14 Oct 2008) | 2 lines
  
  Don't show an empty error dlg box when aborting deletion.
........
  r871429 | craig | 2008-10-14 23:37:28 +0200 (Tue, 14 Oct 2008) | 3 lines
  
  Only construct QPainter when it is required.
  Fixes incorrectly resized fon thumbnails.
........
  r871494 | tyrerj | 2008-10-15 03:58:25 +0200 (Wed, 15 Oct 2008) | 1 line
  
  updating temporary DNG icon
........
  r871529 | ppenz | 2008-10-15 08:09:08 +0200 (Wed, 15 Oct 2008) | 8 lines
  
  Backport of SVN commit 71525:
  
  Assure that the docks get informed about an URL change before the GUI is setup
  (thanks to Frank Reininghaus for the patch!). This prevents that slots from the
  docks are called with invalid URLs.
  
  CCBUG: 169103
  CCMAIL: frankreininghaus@web.de
........

svn path=/branches/kdepim/enterprise4/kdebase-4.1-branch/apps/; revision=871597
parent c323647e
......@@ -832,7 +832,8 @@ void DolphinMainWindow::init()
setCentralWidget(centralWidget);
setupDockWidgets();
emit urlChanged(homeUrl);
setupGUI(Keys | Save | Create | ToolBar);
stateChanged("new_file");
......@@ -852,8 +853,6 @@ void DolphinMainWindow::init()
// assure a proper default size if Dolphin runs the first time
resize(750, 500);
}
emit urlChanged(homeUrl);
}
void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* viewContainer)
......
......@@ -27,6 +27,7 @@ Name[hu]=Dolphin-nézet
Name[is]=Dolphin sýn
Name[it]=Vista Dolphin
Name[ja]=Dolphin ビュー
Name[kk]=Dolphin көрінісі
Name[km]=ទិដ្ឋភាព Dolphin
Name[ko]=Dolphin 보기
Name[lt]=Dolphin žiūryklė
......@@ -180,6 +181,7 @@ Name[hu]=Részletek
Name[is]=Smáatriði
Name[it]=Dettagli
Name[ja]=詳細
Name[kk]=Егжей-тегжейі
Name[km]=សេចក្ដី​លម្អិត
Name[ko]=자세히
Name[ku]=Kitekit
......@@ -244,6 +246,7 @@ Name[hu]=Oszlopok
Name[is]=Dálkar
Name[it]=Colonne
Name[ja]=カラム
Name[kk]=Бағандар
Name[km]=ជួរឈរ
Name[ko]=열
Name[ku]=Stûn
......
......@@ -957,7 +957,7 @@ void DolphinView::slotDeleteFileFinished(KJob* job)
{
if (job->error() == 0) {
emit operationCompletedMessage(i18nc("@info:status", "Delete operation completed."));
} else {
} else if (job->error() != KIO::ERR_USER_CANCELED) {
emit errorMessage(job->errorString());
}
}
......
......@@ -278,6 +278,7 @@ void DolphinViewContainer::showOperationCompletedMessage(const QString& msg)
void DolphinViewContainer::closeFilterBar()
{
m_filterBar->hide();
m_filterBar->clear();
emit showFilterBarChanged(false);
}
......
......@@ -45,6 +45,7 @@ FilterBar::FilterBar(QWidget* parent) :
hLayout->addSpacing(KDialog::spacingHint());
m_filterInput = new KLineEdit(this);
m_filterInput->setLayoutDirection(Qt::LeftToRight);
m_filterInput->setClearButtonShown(true);
m_filter->setBuddy(m_filterInput);
hLayout->addWidget(m_filterInput);
......@@ -65,12 +66,9 @@ FilterBar::~FilterBar()
{
}
void FilterBar::hideEvent(QHideEvent* event)
void FilterBar::clear()
{
if (!event->spontaneous()) {
m_filterInput->clear();
m_filterInput->clearFocus();
}
m_filterInput->clear();
}
void FilterBar::showEvent(QShowEvent* event)
......
......@@ -39,7 +39,10 @@ class FilterBar : public QWidget
public:
FilterBar(QWidget* parent = 0);
virtual ~FilterBar();
/** Clears the the input field. */
void clear();
signals:
/**
* Signal that reports the name filter has been
......@@ -53,7 +56,6 @@ signals:
void closeRequest();
protected:
virtual void hideEvent(QHideEvent* event);
virtual void showEvent(QShowEvent* event);
virtual void keyReleaseEvent(QKeyEvent* event);
......
......@@ -38,6 +38,7 @@ 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[it]=Questo servizio permette di configurare le viste di Dolphin.
Comment[ja]=このサービスで Dolphin のビューを設定できます。
Comment[kk]=Бұл Dolphin көрінісін баптауға мүмкіндік беретін қызмет.
Comment[km]=សេវា​នេះ​អនុញ្ញាត​ឲ្យ​កំណត់​រចនាសម្ព័ន្ធ​ទិដ្ឋភាព​ Dolphin ។
Comment[ko]=이 서비스는 Dolphin의 보기를 설정합니다.
Comment[ku]=Ev servîs destûrê dide veavakirina xuyakirina Dolphinê.
......@@ -106,6 +107,7 @@ Name[hu]=Nézetek
Name[is]=Sjónarhorn
Name[it]=Viste
Name[ja]=ビュー
Name[kk]=Көріністер
Name[km]=មើល
Name[ko]=보기
Name[lt]=Profiliai
......@@ -164,6 +166,7 @@ Comment[hr]=Konfiguriranje postavki upravitelja datotekama
Comment[hu]=A fájlkezelő beállításai
Comment[it]=Configura le impostazioni del gestore dei file
Comment[ja]=ファイルマネージャの設定
Comment[kk]=Файл менеджер параметрлерін баптау
Comment[km]=កំណត់​រចនាសម្ព័ន្ធ​ការ​កំណត់​កម្មវិធី​គ្រប់គ្រង​ឯកសារ
Comment[ko]=파일 관리자 설정
Comment[lt]=Konfigūruokite failų tvarkyklės nustatymus
......
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