From f5902d0e08e0b10321c555e8846a8a8ce2087d30 Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Sat, 05 Feb 2005 12:03:42 +0000
Subject: file selector fix

---
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 9ba4f3e..4421e61 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -19,7 +19,10 @@ Shift/Control + coursorkeys.
 
 Fixed bug that the todo view flat mode was reset after first view update.
 
-If a todo is displayed closed in the todo view, it is now displayed in overdue/due today color depending on the subtodos overdue/due today properties.
+If a todo is displayed closed in the todo view, 
+it is now displayed in overdue/due today color depending on the subtodos overdue/due today properties.
+
+Added info about the numbers of years to the caption (title) information about a birthday event.
 
 ********** VERSION 2.0.2 ************
 
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index d0dbb47..acd9265 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -520,7 +520,7 @@ void KOListView::beamDone( Ir *ir )
 void KOListView::saveDescriptionToFile()
 {
 
-    int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),
+    int result = QMessageBox::warning( this, i18n("KO/Pi: Information!"),
                                        i18n("This saves the text/details of selected\nJournals and Events/Todos\nto a text file."),
                                        i18n("Continue"), i18n("Cancel"), 0,
                                        0, 1 );
diff --git a/microkde/kfiledialog.cpp b/microkde/kfiledialog.cpp
index 977499e..309f8dc 100644
--- a/microkde/kfiledialog.cpp
+++ b/microkde/kfiledialog.cpp
@@ -22,6 +22,7 @@ QString KFileDialog::getSaveFileName( const QString & fn,
         file = QDir::homeDirPath()+"/*";
     QFileInfo fi ( file );
     OFileSelector o ( &dia,OFileSelector::FileSelector, OFileSelector::Save, fi.dirPath(true), fi.fileName() );
+    QObject::connect (  &o, SIGNAL( ok() ), &dia, SLOT ( accept () ) );
     lay.addWidget( &o);
     // o.setNewVisible( true );
     // o.setNameVisible( true );
@@ -47,6 +48,7 @@ QString KFileDialog::getOpenFileName( const QString & fn,
         file = QDir::homeDirPath()+"/*";;
     QFileInfo fi ( file );
     OFileSelector o ( &dia,OFileSelector::FileSelector, OFileSelector::Open, fi.dirPath(true), fi.fileName() );
+    QObject::connect (  &o, SIGNAL( ok() ), &dia, SLOT ( accept () ) );
     lay.addWidget( &o);
     dia.showMaximized();
     int res = dia.exec();
diff --git a/microkde/ofileselector_p.cpp b/microkde/ofileselector_p.cpp
index fd5f965..f85f8f4 100644
--- a/microkde/ofileselector_p.cpp
+++ b/microkde/ofileselector_p.cpp
@@ -385,6 +385,7 @@ OFileSelector* OFileViewFileListView::selector() {
 }
 
 bool OFileViewFileListView::eventFilter (QObject *o, QEvent *e) {
+#if 0
     if ( e->type() == QEvent::KeyPress ) {
         QKeyEvent *k = (QKeyEvent *)e;
         if ( (k->key()==Key_Enter) || (k->key()==Key_Return)) {
@@ -392,6 +393,7 @@ bool OFileViewFileListView::eventFilter (QObject *o, QEvent *e) {
             return true;
         }
     }
+#endif
     return false;
 }
 
@@ -401,6 +403,10 @@ void OFileViewFileListView::connectSlots() {
             this, SLOT(slotCurrentChanged(QListViewItem*) ) );
     connect(m_view, SIGNAL(mouseButtonClicked(int, QListViewItem*, const QPoint&, int ) ),
             this, SLOT(slotClicked(int, QListViewItem*, const QPoint&, int ) ) );
+    connect(m_view, SIGNAL(doubleClicked( QListViewItem* )),
+            this, SLOT(slotDoubleClicked(QListViewItem* ) ) );
+    connect(m_view, SIGNAL(returnPressed( QListViewItem* )),
+            this, SLOT(slotDoubleClicked(QListViewItem* ) ) );
 }
 void OFileViewFileListView::slotCurrentChanged( QListViewItem* item) {
     if (!item)
@@ -423,6 +429,26 @@ void OFileViewFileListView::slotCurrentChanged( QListViewItem* item) {
     }
 #endif
 }
+void OFileViewFileListView::slotDoubleClicked(QListViewItem* item ) {
+    if (!item ) return;
+    OFileSelectorItem *sel = static_cast<OFileSelectorItem*>(item);
+    if (!sel->isLocked() ) {
+        QStringList str = QStringList::split("->", sel->text(1) );
+        if (sel->isDir() ) {
+            m_currentDir = sel->directory() + "/" + str[0].stripWhiteSpace();
+            emit selector()->dirSelected( m_currentDir );
+            reread( m_all );
+        }else { // file
+            //qWarning("slot Clicked");
+            selector()->m_lneEdit->setText( str[0].stripWhiteSpace() );
+            QString path = sel->directory() + "/" + str[0].stripWhiteSpace();
+            emit selector()->fileSelected( path );
+            DocLnk lnk( path );
+            emit selector()->fileSelected( lnk );
+            emit selector()->ok();
+        }
+    } // not locked
+}
 void OFileViewFileListView::slotClicked(int button , QListViewItem* item, const QPoint&, int ) {
     if (!item || ( button != Qt::LeftButton) )
         return;
@@ -435,7 +461,7 @@ void OFileViewFileListView::slotClicked(int button , QListViewItem* item, const
             emit selector()->dirSelected( m_currentDir );
             reread( m_all );
         }else { // file
-            qWarning("slot Clicked");
+            //qWarning("slot Clicked");
             selector()->m_lneEdit->setText( str[0].stripWhiteSpace() );
             QString path = sel->directory() + "/" + str[0].stripWhiteSpace();
             emit selector()->fileSelected( path );
diff --git a/microkde/ofileselector_p.h b/microkde/ofileselector_p.h
index b371806..834fd70 100644
--- a/microkde/ofileselector_p.h
+++ b/microkde/ofileselector_p.h
@@ -126,6 +126,7 @@ private slots:
     void changeDir( const QString& );
     void slotCurrentChanged( QListViewItem* );
     void slotClicked(int, QListViewItem*, const QPoint&, int );
+    void slotDoubleClicked(QListViewItem*);
     void slotFSActivated(int);
 
 protected:
--
cgit v0.9.0.2