Branch: master

c22bede4 2014-10-12 17:48:01 Timothy Pearson
Bring stop, lock, exit, and run icons into XDG compliance
M src/documentwidget.cpp
diff --git a/src/documentwidget.cpp b/src/documentwidget.cpp
index 2f47be5..9a8ff7b 100644
--- a/src/documentwidget.cpp
+++ b/src/documentwidget.cpp
@@ -1711,7 +1711,7 @@
 
         if ( entryToNewId.isEmpty() )
             KMessageBox::information( this, i18n( "No entries were selected." ) );
-        else if ( KMessageBox::questionYesNoList( this, i18n( "The following changes will be applied to the currently selected elements.\nConflicts with duplicate entry ids will be resolved when applying the new ids." ), msgList, i18n( "Normalize Entry Ids" ), KGuiItem( i18n( "Replace Entry Ids" ), "run" ), KGuiItem( i18n( "Cancel" ), "cancel" ) ) == KMessageBox::Yes )
+        else if ( KMessageBox::questionYesNoList( this, i18n( "The following changes will be applied to the currently selected elements.\nConflicts with duplicate entry ids will be resolved when applying the new ids." ), msgList, i18n( "Normalize Entry Ids" ), KGuiItem( i18n( "Replace Entry Ids" ), "system-run" ), KGuiItem( i18n( "Cancel" ), "cancel" ) ) == KMessageBox::Yes )
         {
             TQApplication::setOverrideCursor( TQt::waitCursor );
             TQMap<BibTeX::Entry*, DocumentListViewItem*>::Iterator itItem = entryToItem.begin();
c141e781 2014-10-12 17:53:06 Timothy Pearson
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/kbibtex
M cmake
diff --git a/cmake b/cmake
index 0d5ca8b..08c6f54 160000
--- a/cmake
+++ b/cmake
-Subproject commit 0d5ca8bebbb638b05f1d11537ce41fcf73d10ac9
+Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c