rpms/kbibtex/FC-5 kbibtex-0.1.5-filteredselection.patch, NONE, 1.1 kbibtex-0.1.5-gcc4.2.patch, NONE, 1.1 kbibtex-0.1.5-viewdocument.patch, NONE, 1.1
Christian Nolte (noltec)
fedora-extras-commits at redhat.com
Sun Oct 29 14:43:08 UTC 2006
Author: noltec
Update of /cvs/extras/rpms/kbibtex/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10012
Added Files:
kbibtex-0.1.5-filteredselection.patch
kbibtex-0.1.5-gcc4.2.patch kbibtex-0.1.5-viewdocument.patch
Log Message:
- forgotten .patch files
kbibtex-0.1.5-filteredselection.patch:
--- NEW FILE kbibtex-0.1.5-filteredselection.patch ---
Index: src/documentlistview.cpp
===================================================================
--- src/documentlistview.cpp (Revision 301)
+++ src/documentlistview.cpp (Revision 302)
@@ -221,10 +221,13 @@
while ( it.current() )
{
DocumentListViewItem * kblvi = dynamic_cast<DocumentListViewItem*>( it.current() );
- m_bibtexFile->deleteElement( kblvi->element() );
- it++;
- takeItem( kblvi );
- delete ( kblvi );
+ if ( kblvi->isVisible() )
+ {
+ m_bibtexFile->deleteElement( kblvi->element() );
+ it++;
+ takeItem( kblvi );
+ delete ( kblvi );
+ }
}
if ( above )
@@ -246,7 +249,7 @@
{
DocumentListViewItem * kblvi = dynamic_cast<DocumentListViewItem*>( it.current() );
BibTeX::Entry *entry = dynamic_cast<BibTeX::Entry*>( kblvi->element() );
- if ( entry != NULL )
+ if ( entry != NULL && kblvi->isVisible() )
{
if ( !refs.isEmpty() )
refs.append( "," );
@@ -621,7 +624,8 @@
while ( it.current() )
{
DocumentListViewItem * kblvi = dynamic_cast<DocumentListViewItem*>( it.current() );
- exporter->save( &buffer, kblvi->element() );
+ if ( kblvi->isVisible() )
+ exporter->save( &buffer, kblvi->element() );
it++;
}
delete exporter;
kbibtex-0.1.5-gcc4.2.patch:
--- NEW FILE kbibtex-0.1.5-gcc4.2.patch ---
Index: src/fileimporter.h
===================================================================
--- src/fileimporter.h (Revision 307)
+++ src/fileimporter.h (Arbeitskopie)
@@ -39,7 +39,7 @@
~FileImporter();
File* load ( const QString& text );
- virtual File* load( QIODevice *iodevice ) = NULL;
+ virtual File* load( QIODevice *iodevice ) = 0;
static bool guessCanDecode( const QString & ) { return FALSE; };
kbibtex-0.1.5-viewdocument.patch:
--- NEW FILE kbibtex-0.1.5-viewdocument.patch ---
Index: src/documentwidget.h
===================================================================
--- src/documentwidget.h (Revision 308)
+++ src/documentwidget.h (Revision 310)
@@ -106,6 +106,7 @@
int m_newElementCounter;
EditMode m_editMode;
KActionMenu *m_viewDocumentActionMenu;
+ QStringList m_viewDocumentActionMenuURLs;
KActionMenu *m_searchWebsitesActionMenu;
KAction *m_find;
KAction *m_findNext;
Index: src/documentwidget.cpp
===================================================================
--- src/documentwidget.cpp (Revision 308)
+++ src/documentwidget.cpp (Revision 310)
@@ -471,13 +471,13 @@
m_listViewElements->setFactory( factory, client );
m_sourceView->setFactory( factory, client );
+ m_viewDocumentActionMenu = dynamic_cast<KActionMenu*>( client->action( "view_document" ) );
if ( m_viewDocumentActionMenu != NULL )
connect( m_viewDocumentActionMenu->popupMenu(), SIGNAL( activated( int ) ), this, SLOT( slotViewDocument( int ) ) );
m_copyReference = client->action( "edit_copyref" );
m_find = client->action( "edit_find" );
m_findNext = client->action( "edit_find_next" );
- m_viewDocumentActionMenu = dynamic_cast<KActionMenu*>( client->action( "view_document" ) );
m_listViewElements->setViewShowColumnsMenu( dynamic_cast<KActionMenu*>( client->action( "view_showcolumns" ) ) );
m_searchWebsitesActionMenu = dynamic_cast<KActionMenu*>( client->action( "search_document_online" ) );
}
@@ -486,6 +486,7 @@
{
KPopupMenu * popup = m_viewDocumentActionMenu->popupMenu();
popup->clear();
+ m_viewDocumentActionMenuURLs.clear();
BibTeX::Element * currentElement = NULL;
@@ -517,6 +518,7 @@
popup->insertItem( SmallIcon( "html" ), prettyURL );
else
popup->insertItem( prettyURL );
+ m_viewDocumentActionMenuURLs.append( prettyURL );
}
m_viewDocumentActionMenu->setEnabled( TRUE );
}
@@ -908,7 +910,7 @@
void DocumentWidget::slotViewDocument( int id )
{
- kapp->invokeBrowser( m_viewDocumentActionMenu->popupMenu() ->text( id ) );
+ kapp->invokeBrowser( m_viewDocumentActionMenuURLs[ m_viewDocumentActionMenu->popupMenu() ->indexOf( id ) ] );
}
}
More information about the scm-commits
mailing list