From: <jb...@us...> - 2008-01-27 21:44:37
|
Revision: 2679 http://krusader.svn.sourceforge.net/krusader/?rev=2679&view=rev Author: jbaehr Date: 2008-01-27 13:44:41 -0800 (Sun, 27 Jan 2008) Log Message: ----------- K3Process -> KProcess: KrViewer Modified Paths: -------------- trunk/krusader_kde4/krusader/KViewer/krviewer.cpp Modified: trunk/krusader_kde4/krusader/KViewer/krviewer.cpp =================================================================== --- trunk/krusader_kde4/krusader/KViewer/krviewer.cpp 2008-01-27 19:20:28 UTC (rev 2678) +++ trunk/krusader_kde4/krusader/KViewer/krviewer.cpp 2008-01-27 21:44:41 UTC (rev 2679) @@ -37,7 +37,7 @@ #include <kdebug.h> #include <kde_file.h> #include <khtml_part.h> -#include <k3process.h> +#include <kprocess.h> #include <kfileitem.h> #include <ktoolbar.h> // Krusader includes @@ -279,13 +279,14 @@ new_window = group.readEntry( "View In Separate Window",_ViewInSeparateWindow ); if ( edit != "internal editor" ) { - K3Process proc; + KProcess proc; // if the file is local, pass a normal path and not a url. this solves // the problem for editors that aren't url-aware if ( url.isLocalFile() ) proc << QStringList::split( ' ', edit ) << url.path(); - else proc << QStringList::split( ' ', edit ) << url.prettyUrl(); - if ( !proc.start( K3Process::DontCare ) ) + else + proc << QStringList::split( ' ', edit ) << url.prettyUrl(); + if ( !proc.startDetached() ) KMessageBox::sorry( krApp, i18n( "Can't open " ) + "\"" + edit + "\"" ); return ; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ck...@us...> - 2008-05-05 21:55:15
|
Revision: 2809 http://krusader.svn.sourceforge.net/krusader/?rev=2809&view=rev Author: ckarai Date: 2008-05-05 14:55:20 -0700 (Mon, 05 May 2008) Log Message: ----------- Fixed: viewer crash with the newest KDE Modified Paths: -------------- trunk/krusader_kde4/krusader/KViewer/krviewer.cpp Modified: trunk/krusader_kde4/krusader/KViewer/krviewer.cpp =================================================================== --- trunk/krusader_kde4/krusader/KViewer/krviewer.cpp 2008-05-05 18:34:30 UTC (rev 2808) +++ trunk/krusader_kde4/krusader/KViewer/krviewer.cpp 2008-05-05 21:55:20 UTC (rev 2809) @@ -344,6 +344,9 @@ } void KrViewer::tabChanged(QWidget* w){ + if( w == 0 ) + return; + manager.setActivePart( static_cast<PanelViewerBase*>(w)->part() ); if( static_cast<PanelViewerBase*>(w) != returnFocusTab ) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ck...@us...> - 2008-05-26 01:46:31
|
Revision: 6013 http://krusader.svn.sourceforge.net/krusader/?rev=6013&view=rev Author: ckarai Date: 2008-05-25 18:46:40 -0700 (Sun, 25 May 2008) Log Message: ----------- FIXED: viewer crash Modified Paths: -------------- trunk/krusader_kde4/krusader/KViewer/krviewer.cpp Modified: trunk/krusader_kde4/krusader/KViewer/krviewer.cpp =================================================================== --- trunk/krusader_kde4/krusader/KViewer/krviewer.cpp 2008-05-25 12:30:41 UTC (rev 6012) +++ trunk/krusader_kde4/krusader/KViewer/krviewer.cpp 2008-05-26 01:46:40 UTC (rev 6013) @@ -96,9 +96,7 @@ detachAction->setEnabled(false); viewerMenu->addSeparator(); viewerMenu->addAction( printAction->icon(), printAction->text(), this, SLOT( print() ))->setShortcut( printAction->shortcut().primary() ); - toolBar()->addAction( printAction->icon(), printAction->text(), this, SLOT( print() )); viewerMenu->addAction( copyAction->icon(), copyAction->text(), this, SLOT( copy() ))->setShortcut( copyAction->shortcut().primary() ); - toolBar()->addAction( copyAction->icon(), copyAction->text(), this, SLOT( copy() ) ); viewerMenu->addSeparator(); ( tabClose = viewerMenu->addAction( i18n( "&Close current tab" ), this, SLOT( tabCloseRequest() )))->setShortcut( Qt::Key_Escape ); ( closeAct = viewerMenu->addAction( i18n( "&Quit" ), this, SLOT( close() )))->setShortcut( Qt::CTRL + Qt::Key_Q ); @@ -384,7 +382,7 @@ krApp->raise(); krApp->activateWindow(); } - delete this; + this->deleteLater(); return; } else if( tabBar.count() == 1 ){ //no point in detaching only one tab.. @@ -558,16 +556,18 @@ } void KrViewer::updateActions( PanelViewerBase * pvb ) { - if( pvb->isEditor() ) { - printAction->setVisible(false); - copyAction->setVisible(false); + QList<QAction *> actList = toolBar()->actions(); + bool hasPrint = false, hasCopy = false; + foreach( QAction *a, actList ) { + if( a->text() == printAction->text() ) + hasPrint = true; + if( a->text() == copyAction->text() ) + hasCopy = true; } - else { - if( !printAction->isVisible() ) - printAction->setVisible( true ); - if( !copyAction->isVisible() ) - copyAction->setVisible( true ); - } + if( !hasPrint ) + toolBar()->addAction( printAction->icon(), printAction->text(), this, SLOT( print() )); + if( !hasCopy ) + toolBar()->addAction( copyAction->icon(), copyAction->text(), this, SLOT( copy() ) ); } #if 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |