tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

get all icons out of .ui files to avoid qt4 startup messages

Browse Source
This commit is contained in:
dockes 2006-12-22 16:48:05 +00:00
parent d9a8d5adeb
commit 9d9348f472
4 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/qt4gui/recoll.qrc
View File

@ -3,9 +3,6 @@
<file>images/asearch.png</file>
<file>images/cancel.png</file>
<file>images/close.png</file>
<file>images/d_nextpage.png</file>
<file>images/d_prevpage.png</file>
<file>images/d_spell.png</file>
<file>images/history.png</file>
<file>images/nextpage.png</file>
<file>images/prevpage.png</file>

18
src/qtgui/rclmain.ui
View File

@ -194,9 +194,6 @@
<property name="name">
<cstring>toolsDoc_HistoryAction</cstring>
</property>
<property name="iconSet">
<iconset>history.png</iconset>
</property>
<property name="menuText">
<string>Document &amp;History</string>
</property>
@ -208,9 +205,6 @@
<property name="name">
<cstring>toolsAdvanced_SearchAction</cstring>
</property>
<property name="iconSet">
<iconset>asearch.png</iconset>
</property>
<property name="menuText">
<string>&amp;Advanced Search</string>
</property>
@ -222,9 +216,6 @@
<property name="name">
<cstring>toolsSort_parametersAction</cstring>
</property>
<property name="iconSet">
<iconset>sortparms.png</iconset>
</property>
<property name="menuText">
<string>&amp;Sort parameters</string>
</property>
@ -236,9 +227,6 @@
<property name="name">
<cstring>toolsSpellAction</cstring>
</property>
<property name="iconSet">
<iconset>spell.png</iconset>
</property>
<property name="menuText">
<string>Term &amp;explorer</string>
</property>
@ -253,9 +241,6 @@
<property name="enabled">
<bool>false</bool>
</property>
<property name="iconSet">
<iconset>nextpage.png</iconset>
</property>
<property name="text">
<string>Next page</string>
</property>
@ -270,9 +255,6 @@
<property name="enabled">
<bool>false</bool>
</property>
<property name="iconSet">
<iconset>prevpage.png</iconset>
</property>
<property name="text">
<string>Previous page</string>
</property>

5
src/qtgui/rclmain_w.cpp
View File

@ -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"));

4
src/qtgui/spell_w.cpp
View File

@ -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)