diff -r 21379539d952 -r f94317a94db1 exportoofiledialog.cpp --- a/exportoofiledialog.cpp Wed Jul 05 10:29:54 2006 +0000 +++ b/exportoofiledialog.cpp Thu Jul 06 14:47:01 2006 +0000 @@ -2,12 +2,12 @@ #include "exportoofiledialog.h" -ExportOOFileDialog::ExportOOFileDialog():Q3FileDialog() +ExportOOFileDialog::ExportOOFileDialog():QFileDialog() { init(); } -ExportOOFileDialog::ExportOOFileDialog (QWidget * parent, const char* name, bool modal):Q3FileDialog(parent, name,modal) +ExportOOFileDialog::ExportOOFileDialog (QWidget * parent, const QString &caption ):QFileDialog(parent, caption) { init(); } @@ -18,7 +18,7 @@ QStringList::Iterator itf=filters.begin(); while (itf != filters.end()) { - if (*itf==lastFilter) return *itpath; + if (*itf==selectedFilter()) return *itpath; itpath++; itf++; } @@ -33,31 +33,36 @@ QString ExportOOFileDialog::selectedFile() { - return Q3FileDialog::selectedFile(); + return QFileDialog::selectedFile(); } +void ExportOOFileDialog::show() +{ + setFilters (filters); + QFileDialog::show(); +} + +void ExportOOFileDialog::init() +{ + setMode( QFileDialog::AnyFile ); + QDir d; + d.setPath ("/usr/share/vym/exports"); + scanExportConfigs(d); + d.setPath (d.homeDirPath()+"/.vym/exports"); + scanExportConfigs(d); + d.setPath (d.currentPath()+"/exports"); + scanExportConfigs(d); + + connect ( + this,SIGNAL (filterSelected(const QString&)), + this, SLOT( newConfigPath(const QString &))); +} + void ExportOOFileDialog::addFilter(const QString &f) { lastFilter=f; filters.append (f); - Q3FileDialog::addFilter (f); -} - -void ExportOOFileDialog::init() -{ - setMode( Q3FileDialog::AnyFile ); - QDir d; - d.setPath ("/usr/share/vym/exports"); - scanExportConfigs(d); - d.setPath (d.homeDirPath()+"/.vym/exports"); - scanExportConfigs(d); - d.setPath ("exports"); - scanExportConfigs(d); - - connect ( - this,SIGNAL (filterSelected(const QString&)), - this, SLOT( newConfigPath(const QString &))); } void ExportOOFileDialog::scanExportConfigs(QDir dir) @@ -68,7 +73,6 @@ if (dir.exists()) { // Traverse files - QDir dir; dir.setFilter(QDir::Files | QDir::Hidden | QDir::NoSymLinks); QFileInfoList list = dir.entryInfoList();