diff --git a/src/qt4gui/recoll.qrc b/src/qt4gui/recoll.qrc index 2568c46e..99efe744 100644 --- a/src/qt4gui/recoll.qrc +++ b/src/qt4gui/recoll.qrc @@ -3,9 +3,6 @@ images/asearch.png images/cancel.png images/close.png - images/d_nextpage.png - images/d_prevpage.png - images/d_spell.png images/history.png images/nextpage.png images/prevpage.png diff --git a/src/qtgui/rclmain.ui b/src/qtgui/rclmain.ui index 00bae12e..e3cc36cb 100644 --- a/src/qtgui/rclmain.ui +++ b/src/qtgui/rclmain.ui @@ -194,9 +194,6 @@ toolsDoc_HistoryAction - - history.png - Document &History @@ -208,9 +205,6 @@ toolsAdvanced_SearchAction - - asearch.png - &Advanced Search @@ -222,9 +216,6 @@ toolsSort_parametersAction - - sortparms.png - &Sort parameters @@ -236,9 +227,6 @@ toolsSpellAction - - spell.png - Term &explorer @@ -253,9 +241,6 @@ false - - nextpage.png - Next page @@ -270,9 +255,6 @@ false - - prevpage.png - Previous page diff --git a/src/qtgui/rclmain_w.cpp b/src/qtgui/rclmain_w.cpp index 32bb1a27..136a91b0 100644 --- a/src/qtgui/rclmain_w.cpp +++ b/src/qtgui/rclmain_w.cpp @@ -1,5 +1,5 @@ #ifndef lint -static char rcsid[] = "@(#$Id: rclmain_w.cpp,v 1.17 2006-12-20 13:55:46 dockes Exp $ (C) 2005 J.F.Dockes"; +static char rcsid[] = "@(#$Id: rclmain_w.cpp,v 1.18 2006-12-22 16:48:05 dockes Exp $ (C) 2005 J.F.Dockes"; #endif /* * This program is free software; you can redistribute it and/or modify @@ -155,6 +155,9 @@ void RclMain::init() toolsSpellAction->setIconSet(createIconSet("spell.png")); nextPageAction->setIconSet(createIconSet("nextpage.png")); prevPageAction->setIconSet(createIconSet("prevpage.png")); + toolsDoc_HistoryAction->setIconSet(createIconSet("history.png")); + toolsAdvanced_SearchAction->setIconSet(createIconSet("asearch.png")); + toolsSort_parametersAction->setIconSet(createIconSet("sortparms.png")); #else toolsSpellAction->setIcon(QIcon(":/images/spell.png")); nextPageAction->setIcon(QIcon(":/images/nextpage.png")); diff --git a/src/qtgui/spell_w.cpp b/src/qtgui/spell_w.cpp index 0cba11ea..2f0f056f 100644 --- a/src/qtgui/spell_w.cpp +++ b/src/qtgui/spell_w.cpp @@ -1,5 +1,5 @@ #ifndef lint -static char rcsid[] = "@(#$Id: spell_w.cpp,v 1.9 2006-12-19 12:38:18 dockes Exp $ (C) 2005 J.F.Dockes"; +static char rcsid[] = "@(#$Id: spell_w.cpp,v 1.10 2006-12-22 16:48:05 dockes Exp $ (C) 2005 J.F.Dockes"; #endif /* * This program is free software; you can redistribute it and/or modify @@ -113,7 +113,7 @@ public: : QListViewItem(listView, s1, s2) { } - int compare(QListViewItem * i, int col, bool ascending) const { + int compare(QListViewItem * i, int col, bool) const { if (col == 0) return i->text(0).compare(text(0)); if (col == 1)