[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/apps/kfind
From:       Darío Andrés Rodríguez <andresbajotierra () gmail ! co
Date:       2010-02-18 20:39:56
Message-ID: 1266525596.182345.2567.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1092380 by darioandres:

- Show the "filelist saved to X file" message in the statusbar instead of a new messagebox
  - Fixed Statusbar to be able to show long messages

Can't be backported as it needs to modify a string

BUG: 195687


 M  +2 -2      kfinddlg.cpp  
 M  +6 -5      kfindtreeview.cpp  
 M  +4 -1      kfindtreeview.h  


--- trunk/KDE/kdebase/apps/kfind/kfinddlg.cpp #1092379:1092380
@@ -64,10 +64,10 @@
   tabWidget->setURL( url );
 
   // prepare window for find results
-  win = new KFindTreeView(frame );
+  win = new KFindTreeView(frame, this);
 
   mStatusBar = new KStatusBar(frame);
-  mStatusBar->insertFixedItem("AMiddleLengthText...", 0);
+  mStatusBar->insertItem("AMiddleLengthText...", 0);
   setStatusMsg( i18nc("the application is currently idle, there is no active search", "Idle.") );
   mStatusBar->setItemAlignment(0, Qt::AlignLeft | Qt::AlignVCenter);
   mStatusBar->insertPermanentItem(QString(), 1, 1);
--- trunk/KDE/kdebase/apps/kfind/kfindtreeview.cpp #1092379:1092380
@@ -19,6 +19,8 @@
 
 #include "kfindtreeview.h"
 
+#include "kfinddlg.h"
+
 #include <QtCore/QTextStream>
 #include <QtCore/QTextCodec>
 #include <QtCore/QFileInfo>
@@ -309,9 +311,10 @@
 
 //BEGIN KFindTreeView
 
-KFindTreeView::KFindTreeView( QWidget *parent )
+KFindTreeView::KFindTreeView( QWidget *parent,  KfindDlg * findDialog )
     : QTreeView( parent ) ,
-    m_contextMenu(0)
+    m_contextMenu(0),
+    m_kfindDialog(findDialog)
 {
     //Configure model and proxy model
     m_model = new KFindItemModel( this );
@@ -495,9 +498,7 @@
         }
 
         file.close();
-        KMessageBox::information(parentWidget(),
-                    i18n("Results were saved to file\n")+
-                    filename);
+        m_kfindDialog->setStatusMsg(i18nc("%1=filename", "Results were saved to: %1", filename));
     }
 }
 
--- trunk/KDE/kdebase/apps/kfind/kfindtreeview.h #1092379:1092380
@@ -33,6 +33,7 @@
 
 class KFindTreeView;
 class KActionCollection;
+class KfindDlg;
 
 class KFindItem
 {
@@ -100,7 +101,7 @@
 {
   Q_OBJECT
     public:
-        KFindTreeView( QWidget * parent = 0 );
+        KFindTreeView( QWidget * parent, KfindDlg * findDialog);
         ~KFindTreeView();
 
         void beginSearch(const KUrl& baseUrl);
@@ -151,6 +152,8 @@
         KonqPopupMenu *             m_contextMenu;
         
         Qt::MouseButtons            m_mouseButtons;
+
+        KfindDlg *                  m_kfindDialog;
 };
 
 #endif
[prev in list] [next in list] [prev in thread] [next in thread]