[Kde-cygwin-cvs] CVS: qt-3/tools/assistant LICENSE.GPL,1.1.1.3,1.2 config.cpp,1.1.1.6,1.2 config.h,1
Status: Inactive
Brought to you by:
habacker
Menu
▾
▴
[Kde-cygwin-cvs] CVS: qt-3/tools/assistant LICENSE.GPL,1.1.1.3,1.2 config.cpp,1.1.1.6,1.2 config.h,1.1.1.3,1.2 docuparser.cpp,1.1.1.4,1.2 docuparser.h,1.1.1.3,1.2 finddialog.ui.h,1.1.1.5,1.2 helpdialogimpl.cpp,1.1.1.7,1.2 helpdialogimpl.h,1.1.1.6,1.2 helpwindow.cpp,1.1.1.7,1.2 helpwindow.h,1.1.1.7,1.2 index.cpp,1.1.1.8,1.2 index.h,1.1.1.4,1.2 mainwindow.ui,1.1.1.7,1.2 profile.cpp,1.1.1.2,1.2 profile.h,1.1.1.2,1.2 settingsdialogimpl.cpp,1.1.1.5,1.2 settingsdialogimpl.h,1.1.1.4,1.2 tabbedbrowser.ui.h,1.1.1.3,1.2 topicchooserimpl.cpp,1.1.1.4,1.2 topicchooserimpl.h,1.1.1.4,1.2
Update of /cvsroot/kde-cygwin/qt-3/tools/assistant In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26950/tools/assistant Modified Files: LICENSE.GPL config.cpp config.h docuparser.cpp docuparser.h finddialog.ui.h helpdialogimpl.cpp helpdialogimpl.h helpwindow.cpp helpwindow.h index.cpp index.h mainwindow.ui profile.cpp profile.h settingsdialogimpl.cpp settingsdialogimpl.h tabbedbrowser.ui.h topicchooserimpl.cpp topicchooserimpl.h Log Message: st qt3.3.5 patch - I made the smae mistake like 3.3.4 but don't know what is going wrong there. Seems like our cvs is messed up :( ttt: ---------------------------------------------------------------------- Index: LICENSE.GPL =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/assistant/LICENSE.GPL,v retrieving revision 1.1.1.3 retrieving revision 1.2 diff -u -r1.1.1.3 -r1.2 --- LICENSE.GPL 22 Sep 2005 12:57:46 -0000 1.1.1.3 +++ LICENSE.GPL 23 Sep 2005 09:40:30 -0000 1.2 @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA + 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. Index: config.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/assistant/config.cpp,v retrieving revision 1.1.1.6 retrieving revision 1.2 diff -u -r1.1.1.6 -r1.2 --- config.cpp 22 Sep 2005 12:57:45 -0000 1.1.1.6 +++ config.cpp 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2003 Trolltech AS. All rights reserved. ** ** This file is part of the Qt Assistant. ** @@ -230,7 +230,7 @@ void Config::saveProfile( Profile *profile ) { - if (profil && profil->profileType() == Profile::UserProfile) + if (profil->profileType() == Profile::UserProfile) return; QSettings settings; settings.insertSearchPath( QSettings::Windows, "/Trolltech" ); Index: config.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/assistant/config.h,v retrieving revision 1.1.1.3 retrieving revision 1.2 diff -u -r1.1.1.3 -r1.2 --- config.h 22 Sep 2005 12:57:46 -0000 1.1.1.3 +++ config.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2003 Trolltech AS. All rights reserved. ** ** This file is part of the Qt Assistant. ** Index: docuparser.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/assistant/docuparser.cpp,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- docuparser.cpp 22 Sep 2005 12:57:45 -0000 1.1.1.4 +++ docuparser.cpp 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** ** This file is part of the Qt Assistant. ** Index: docuparser.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/assistant/docuparser.h,v retrieving revision 1.1.1.3 retrieving revision 1.2 diff -u -r1.1.1.3 -r1.2 --- docuparser.h 22 Sep 2005 12:57:46 -0000 1.1.1.3 +++ docuparser.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** ** This file is part of the Qt Assistant. ** Index: finddialog.ui.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/assistant/finddialog.ui.h,v retrieving revision 1.1.1.5 retrieving revision 1.2 diff -u -r1.1.1.5 -r1.2 --- finddialog.ui.h 22 Sep 2005 12:57:44 -0000 1.1.1.5 +++ finddialog.ui.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** ** This file is part of the Qt Assistant. ** Index: helpdialogimpl.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/assistant/helpdialogimpl.cpp,v retrieving revision 1.1.1.7 retrieving revision 1.2 diff -u -r1.1.1.7 -r1.2 --- helpdialogimpl.cpp 22 Sep 2005 12:57:44 -0000 1.1.1.7 +++ helpdialogimpl.cpp 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2003 Trolltech AS. All rights reserved. ** ** This file is part of Qt Assistant. ** @@ -304,7 +304,7 @@ bar->setTotalSteps( 100 ); bar->setProgress( 0 ); - keywordDocuments.clear(); + QValueList<IndexKeyword> lst; QFile indexFile( cacheFilesPath + "indexdb." + Config::configuration()->profileName() ); @@ -351,17 +351,10 @@ QString lastKeyword = QString::null; QValueList<IndexKeyword>::ConstIterator it = lst.begin(); for ( ; it != lst.end(); ++it ) { - if ( lastKeyword.lower() != (*it).keyword.lower() ) - lastItem = new HelpNavigationListItem( listIndex, (*it).keyword ); - lastItem->addLink( (*it).link ); - lastKeyword = (*it).keyword; - - QString lnk = (*it).link; - int i = lnk.findRev('#'); - if ( i > -1 ) - lnk = lnk.left( i ); - if (!keywordDocuments.contains(lnk)) - keywordDocuments.append(lnk); + if ( lastKeyword.lower() != (*it).keyword.lower() ) + lastItem = new HelpNavigationListItem( listIndex, (*it).keyword ); + lastItem->addLink( (*it).link ); + lastKeyword = (*it).keyword; } framePrepare->hide(); showInitDoneMessage(); @@ -912,14 +905,18 @@ if ( fullTextIndex ) return; - QStringList documentList; + QMap<QString, QString>::ConstIterator it = titleMap.begin(); + QStringList documentList; + for ( ; it != titleMap.end(); ++it ) + documentList << it.key(); + QString pname = Config::configuration()->profileName(); fullTextIndex = new Index( documentList, QDir::homeDirPath() ); // ### Is this correct ? if (!verifyDirectory(cacheFilesPath)) { - QMessageBox::warning(help, tr("Qt Assistant"), - tr("Failed to save fulltext search index\n" - "Assistant will not work!")); - return; + QMessageBox::warning(help, tr("Qt Assistant"), + tr("Failed to save fulltext search index\n" + "Assistant will not work!")); + return; } searchButton->setEnabled(FALSE); helpButton->setEnabled(FALSE); @@ -930,50 +927,31 @@ processEvents(); connect( fullTextIndex, SIGNAL( indexingProgress( int ) ), - this, SLOT( setIndexingProgress( int ) ) ); + this, SLOT( setIndexingProgress( int ) ) ); QFile f( cacheFilesPath + "indexdb.dict." + pname ); if ( !f.exists() ) { - QMap<QString, QString>::ConstIterator it = titleMap.begin(); - QString documentName; - for ( ; it != titleMap.end(); ++it ) { - documentName = it.key(); - int i = documentName.findRev('#'); - if ( i > -1 ) - documentName = documentName.left( i ); - - if (!documentList.contains(documentName)) - documentList << documentName; - } - loadIndexFile(); - for (QStringList::Iterator it2 = keywordDocuments.begin(); it2 != keywordDocuments.end(); ++it2) { - if (!documentList.contains(*it2)) - documentList << *it2; - } - fullTextIndex->setDocList( documentList ); - - help->statusBar()->clear(); - setCursor( waitCursor ); - labelPrepare->setText( tr( "Indexing files..." ) ); - progressPrepare->setTotalSteps( 100 ); - progressPrepare->reset(); - progressPrepare->show(); - framePrepare->show(); - processEvents(); - if ( fullTextIndex->makeIndex() != -1 ) { - fullTextIndex->writeDict(); - progressPrepare->setProgress( 100 ); - framePrepare->hide(); - setCursor( arrowCursor ); - showInitDoneMessage(); - keywordDocuments.clear(); - } + help->statusBar()->clear(); + setCursor( waitCursor ); + labelPrepare->setText( tr( "Indexing files..." ) ); + progressPrepare->setTotalSteps( 100 ); + progressPrepare->reset(); + progressPrepare->show(); + framePrepare->show(); + processEvents(); + if ( fullTextIndex->makeIndex() != -1 ) { + fullTextIndex->writeDict(); + progressPrepare->setProgress( 100 ); + framePrepare->hide(); + setCursor( arrowCursor ); + showInitDoneMessage(); + } } else { - setCursor( waitCursor ); - help->statusBar()->message( tr( "Reading dictionary..." ) ); - processEvents(); - fullTextIndex->readDict(); - help->statusBar()->message( tr( "Done" ), 3000 ); - setCursor( arrowCursor ); + setCursor( waitCursor ); + help->statusBar()->message( tr( "Reading dictionary..." ) ); + processEvents(); + fullTextIndex->readDict(); + help->statusBar()->message( tr( "Done" ), 3000 ); + setCursor( arrowCursor ); } searchButton->setEnabled(TRUE); termsEdit->setEnabled(TRUE); Index: helpdialogimpl.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/assistant/helpdialogimpl.h,v retrieving revision 1.1.1.6 retrieving revision 1.2 diff -u -r1.1.1.6 -r1.2 --- helpdialogimpl.h 22 Sep 2005 12:57:43 -0000 1.1.1.6 +++ helpdialogimpl.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** ** This file is part of Qt Assistant. ** @@ -158,7 +158,6 @@ QDict<ContentList> contentList; QPopupMenu *itemPopup; QString cacheFilesPath; - QStringList keywordDocuments; }; #endif Index: helpwindow.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/assistant/helpwindow.cpp,v retrieving revision 1.1.1.7 retrieving revision 1.2 diff -u -r1.1.1.7 -r1.2 --- helpwindow.cpp 22 Sep 2005 12:57:47 -0000 1.1.1.7 +++ helpwindow.cpp 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** ** This file is part of the Qt Assistant. ** @@ -52,8 +52,7 @@ : QTextBrowser( parent, name ), mw( w ), blockScroll( FALSE ), shiftPressed( FALSE ), newWindow( FALSE ) { - connect(this, SIGNAL(forwardAvailable(bool)), this, SLOT(updateForward(bool))); - connect(this, SIGNAL(backwardAvailable(bool)), this, SLOT(updateBackward(bool))); + } void HelpWindow::setSource( const QString &name ) @@ -73,14 +72,14 @@ if( linkInfo.isRelative() ) target = currentInfo.dirPath( TRUE ) + "/" + name; - nmw->setup(); + nmw->setup(); + nmw->showLink( target ); nmw->move( mw->geometry().topLeft() ); if ( mw->isMaximized() ) nmw->showMaximized(); else nmw->show(); - nmw->showLink( target ); - return; + return; } if ( name.left( 7 ) == "http://" || name.left( 6 ) == "ftp://" ) { @@ -264,12 +263,3 @@ } } -void HelpWindow::updateForward(bool fwd) -{ - fwdAvail = fwd; -} - -void HelpWindow::updateBackward(bool back) -{ - backAvail = back; -} Index: helpwindow.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/assistant/helpwindow.h,v retrieving revision 1.1.1.7 retrieving revision 1.2 diff -u -r1.1.1.7 -r1.2 --- helpwindow.h 22 Sep 2005 12:57:46 -0000 1.1.1.7 +++ helpwindow.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** ** This file is part of the Qt Assistant. ** @@ -49,9 +49,6 @@ void contentsMousePressEvent(QMouseEvent *e); void keyPressEvent(QKeyEvent *); - bool isBackwardAvailable() const { return backAvail; } - bool isForwardAvailable() const { return fwdAvail; } - signals: void chooseWebBrowser(); @@ -63,8 +60,6 @@ private slots: void openLinkInNewWindow(); void openLinkInNewPage(); - void updateForward(bool); - void updateBackward(bool); private: MainWindow *mw; @@ -73,8 +68,7 @@ bool shiftPressed; bool newWindow; QMimeSourceFactory *mimeSourceFactory; - bool fwdAvail; - bool backAvail; + }; #endif Index: index.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/assistant/index.cpp,v retrieving revision 1.1.1.8 retrieving revision 1.2 diff -u -r1.1.1.8 -r1.2 --- index.cpp 22 Sep 2005 12:57:46 -0000 1.1.1.8 +++ index.cpp 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2003 Trolltech AS. All rights reserved. ** ** This file is part of the Qt Assistant. ** @@ -91,11 +91,6 @@ docListFile = f; } -void Index::setDocList( const QStringList &lst ) -{ - docList = lst; -} - int Index::makeIndex() { if ( !alreadyHaveDocList ) Index: index.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/assistant/index.h,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- index.h 22 Sep 2005 12:57:47 -0000 1.1.1.4 +++ index.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2003 Trolltech AS. All rights reserved. ** ** This file is part of the Qt Assistant. ** @@ -77,7 +77,6 @@ QString getDocumentTitle( const QString& ); void setDictionaryFile( const QString& ); void setDocListFile( const QString& ); - void setDocList( const QStringList & ); signals: void indexingProgress( int ); Index: mainwindow.ui =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/assistant/mainwindow.ui,v retrieving revision 1.1.1.7 retrieving revision 1.2 diff -u -r1.1.1.7 -r1.2 --- mainwindow.ui 22 Sep 2005 12:57:46 -0000 1.1.1.7 +++ mainwindow.ui 23 Sep 2005 09:40:30 -0000 1.2 @@ -648,7 +648,6 @@ <slot>updateProfileSettings()</slot> <slot>backwardAvailable(bool)</slot> <slot>forwardAvailable(bool)</slot> - <slot>browserTabChanged()</slot> </slots> <functions> <function access="private">setupGoActions()</function> Index: profile.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/assistant/profile.cpp,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -u -r1.1.1.2 -r1.2 --- profile.cpp 22 Sep 2005 12:57:46 -0000 1.1.1.2 +++ profile.cpp 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2003 Trolltech AS. All rights reserved. ** ** This file is part of the Qt Assistant. ** @@ -36,12 +36,9 @@ #define LINGUIST_TITLE "Guide to the Qt Translation Tools" #define QMAKE_TITLE "qmake User Guide" -Profile *Profile::createDefaultProfile( const QString &docPath ) +Profile *Profile::createDefaultProfile() { - QString path = qInstallPathDocs(); - if ( !docPath.isEmpty() ) - path = docPath; - path = path + "/html/"; + QString path = QString( qInstallPathDocs() ) + "/html/"; Profile *profile = new Profile; profile->valid = TRUE; profile->type = DefaultProfile; Index: profile.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/assistant/profile.h,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -u -r1.1.1.2 -r1.2 --- profile.h 22 Sep 2005 12:57:47 -0000 1.1.1.2 +++ profile.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** ** This file is part of the Qt Assistant. ** @@ -57,7 +57,7 @@ inline DocuParser *docuParser() const { return dparser; } inline void setDocuParser( DocuParser *dp ) { dparser = dp; } - static Profile* createDefaultProfile( const QString &docPath = QString::null ); + static Profile* createDefaultProfile(); static QString makeRelativePath( const QString &base, const QString &path ); int valid:1; Index: settingsdialogimpl.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/assistant/settingsdialogimpl.cpp,v retrieving revision 1.1.1.5 retrieving revision 1.2 diff -u -r1.1.1.5 -r1.2 --- settingsdialogimpl.cpp 22 Sep 2005 12:57:47 -0000 1.1.1.5 +++ settingsdialogimpl.cpp 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** ** This file is part of Qt Assistant. ** Index: settingsdialogimpl.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/assistant/settingsdialogimpl.h,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- settingsdialogimpl.h 22 Sep 2005 12:57:44 -0000 1.1.1.4 +++ settingsdialogimpl.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** ** This file is part of Qt Assistant. ** Index: tabbedbrowser.ui.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/assistant/tabbedbrowser.ui.h,v retrieving revision 1.1.1.3 retrieving revision 1.2 diff -u -r1.1.1.3 -r1.2 --- tabbedbrowser.ui.h 22 Sep 2005 12:57:47 -0000 1.1.1.3 +++ tabbedbrowser.ui.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -143,8 +143,6 @@ connect( tab, SIGNAL( currentChanged( QWidget* ) ), this, SLOT( transferFocus() ) ); - connect( tab, SIGNAL( currentChanged( QWidget* ) ), - mainWindow(), SLOT( browserTabChanged() ) ); QTabBar *tabBar = (QTabBar*)tab->child( 0, "QTabBar", FALSE ); int m = ( tabBar ? style().pixelMetric( QStyle::PM_TabBarTabVSpace, (QWidget*)tabBar ) Index: topicchooserimpl.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/assistant/topicchooserimpl.cpp,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- topicchooserimpl.cpp 22 Sep 2005 12:57:47 -0000 1.1.1.4 +++ topicchooserimpl.cpp 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** ** This file is part of Qt Assistant. ** Index: topicchooserimpl.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/assistant/topicchooserimpl.h,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- topicchooserimpl.h 22 Sep 2005 12:57:44 -0000 1.1.1.4 +++ topicchooserimpl.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** ** This file is part of Qt Assistant. ** |
