office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-08-27 11:40:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

in the remote case the shell cannot determine the mimetypes the okularpart can read, just filter any file instead of exiting with an error

Browse source 
svn path=/trunk/KDE/kdegraphics/okular/; revision=694038
This commit is contained in:
Pino Toscano 2007-07-29 21:36:02 +00:00
parent 1c9b4bae68
commit 9bbcbace43
2 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
shell/shell.cpp
View file

@ -60,6 +60,7 @@ void Shell::init()
// set the shell's ui resource file
setXMLFile("shell.rc");
m_doc=0L;
m_fileformatsscanned = false;
// this routine will find and load our Part. it finds the Part by
// name which is a bad idea usually.. but it's alright in this
// case since our Part is made for this Shell
@ -228,35 +229,32 @@ void Shell::fileOpen()
// this slot is called whenever the File->Open menu is selected,
// the Open shortcut is pressed (usually CTRL+O) or the Open toolbar
// button is clicked
if (m_fileformats.isEmpty())
if ( !m_fileformatsscanned )
{
if ( m_doc )
m_fileformats = m_doc->supportedMimeTypes();
if ( m_fileformats.isEmpty() )
m_fileformats = fileFormats();
m_fileformatsscanned = true;
}
if (!m_fileformats.isEmpty())
{
QString startDir;
if ( m_openUrl.isLocalFile() )
startDir = m_openUrl.path();
KFileDialog dlg( startDir, QString(), this );
dlg.setOperationMode( KFileDialog::Opening );
dlg.setMimeFilter( m_fileformats );
dlg.setCaption( i18n( "Open a document" ) );
if (!dlg.exec())
return;
KUrl url = dlg.selectedUrl();
if (!url.isEmpty())
openUrl(url);
}
QString startDir;
if ( m_openUrl.isLocalFile() )
startDir = m_openUrl.path();
KFileDialog dlg( startDir, QString(), this );
dlg.setOperationMode( KFileDialog::Opening );
if ( m_fileformatsscanned && m_fileformats.isEmpty() )
dlg.setFilter( i18n( "*|All the Files" ) );
else
{
KMessageBox::error(this, i18n("No okular plugins were found."));
slotQuit();
}
dlg.setMimeFilter( m_fileformats );
dlg.setCaption( i18n( "Open a document" ) );
if ( !dlg.exec() )
return;
KUrl url = dlg.selectedUrl();
if ( !url.isEmpty() )
openUrl( url );
}
void

1
shell/shell.h
View file

@ -94,6 +94,7 @@ private:
KDocumentViewer* m_doc;
KRecentFilesAction* m_recent;
QStringList m_fileformats;
bool m_fileformatsscanned;
KAction* m_printAction;
KToggleAction* m_fullScreenAction;
KToggleAction* m_showMenuBarAction;