From: <su...@us...> - 2008-07-28 09:34:51
|
Revision: 2912 http://tora.svn.sourceforge.net/tora/?rev=2912&view=rev Author: subik Date: 2008-07-28 09:34:59 +0000 (Mon, 28 Jul 2008) Log Message: ----------- fixed crash on quickly repeated docs search; progressBar is placed correctly in GUI. Modified Paths: -------------- trunk/tora/src/tohelp.cpp trunk/tora/src/tohelp.h trunk/tora/src/tohelpui.ui Modified: trunk/tora/src/tohelp.cpp =================================================================== --- trunk/tora/src/tohelp.cpp 2008-07-28 08:45:01 UTC (rev 2911) +++ trunk/tora/src/tohelp.cpp 2008-07-28 09:34:59 UTC (rev 2912) @@ -375,7 +375,7 @@ for (int i = 0; i < Sections->topLevelItemCount(); ++i) Manuals->addItem(Sections->topLevelItem(i)->text(0)); - Progress = new QProgressBar(tabs); +// Progress = new QProgressBar(tabs); Progress->setMaximum(Dsc.size()); Progress->hide(); Searching = false; @@ -470,6 +470,8 @@ { if (Searching) return ; + + Searching = true; Result->clear(); QStringList words = SearchLine->text().toLower().split(QRegExp(QString::fromLatin1("\\s+"))); if (words.count() == 0) @@ -478,8 +480,7 @@ QRegExp stripend(QString::fromLatin1(",$")); int steps = 1; Progress->setValue(0); - Progress->show(); - Searching = true; + qApp->processEvents(); QTreeWidgetItem * parent; @@ -583,6 +584,8 @@ } Progress->setValue(steps); ++steps; + if (steps > 10) + Progress->show(); qApp->processEvents(); } Progress->hide(); Modified: trunk/tora/src/tohelp.h =================================================================== --- trunk/tora/src/tohelp.h 2008-07-28 08:45:01 UTC (rev 2911) +++ trunk/tora/src/tohelp.h 2008-07-28 09:34:59 UTC (rev 2912) @@ -161,29 +161,6 @@ bool Searching; /** - * List containing the manuals and their sections, compiled from the toc.htm files. - * @see toHelp - */ -// toListView *Sections; - /** - * List containing the search result of the latest search. Search reads the index.htm files. - */ -// toListView *Result; - /** - * The line containing the search text. - */ -// QLineEdit *SearchLine; - /** - * Manuals to include in search. - */ -// QComboBox *Manuals; -// Q3TextBrowser *Help; - /** - * Display progress of current search. - */ - QProgressBar *Progress; - - /** * Set selection and also update selected item in list if any item matches the * selected location. * @param lst Listview to update selected item in. Modified: trunk/tora/src/tohelpui.ui =================================================================== --- trunk/tora/src/tohelpui.ui 2008-07-28 08:45:01 UTC (rev 2911) +++ trunk/tora/src/tohelpui.ui 2008-07-28 09:34:59 UTC (rev 2912) @@ -44,7 +44,7 @@ <property name="orientation" > <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > + <property name="sizeHint" stdset="0" > <size> <width>271</width> <height>20</height> @@ -62,6 +62,14 @@ <number>0</number> </property> <widget class="QWidget" name="tab" > + <property name="geometry" > + <rect> + <x>0</x> + <y>0</y> + <width>332</width> + <height>375</height> + </rect> + </property> <attribute name="title" > <string>Contents</string> </attribute> @@ -81,10 +89,18 @@ </layout> </widget> <widget class="QWidget" name="tab_2" > + <property name="geometry" > + <rect> + <x>0</x> + <y>0</y> + <width>332</width> + <height>375</height> + </rect> + </property> <attribute name="title" > <string>Search</string> </attribute> - <layout class="QGridLayout" > + <layout class="QGridLayout" name="gridLayout" > <item row="0" column="0" > <widget class="QLabel" name="label" > <property name="text" > @@ -112,6 +128,13 @@ </widget> </item> <item row="2" column="0" colspan="2" > + <widget class="QProgressBar" name="Progress" > + <property name="value" > + <number>24</number> + </property> + </widget> + </item> + <item row="3" column="0" colspan="2" > <widget class="QTreeWidget" name="Result" > <property name="alternatingRowColors" > <bool>true</bool> @@ -135,6 +158,9 @@ </widget> </item> </layout> + <zorder>backButton</zorder> + <zorder>forwardButton</zorder> + <zorder>splitter</zorder> </widget> <tabstops> <tabstop>tabs</tabstop> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |