1.3.51 - 06/09/2003 (rursu)

- changed class name from HelpWindow to Qt_help_window - the file name was modified in Qt_help_window.C/.h - updated the doc too
2003-09-06 10:29:57 +00:00 · 2003-09-06 10:29:57 +00:00 · c9a9c36a40
parent 6b02d17f4c
commit c9a9c36a40
14 changed files with 64 additions and 60 deletions
--- a/Packages/Qt_widget/changes.txt
+++ b/Packages/Qt_widget/changes.txt
@ -1,3 +1,9 @@
+1.3.51 - 06/09/2003 (rursu)
+       - changed class name from HelpWindow to Qt_help_window
+       - the file name was modified in Qt_help_window.C/.h
+       - updated the doc too
+
+
 1.3.50 - 03/09/2003 (rursu)
       - added demoicon_xpm definition in Qt_widget_xpm_icons.C and the 
         declaration in pixmaps/demoicon.xpm. I want all the demos to use
--- a/Packages/Qt_widget/doc_tex/Qt_widget/qt_widget.tex
+++ b/Packages/Qt_widget/doc_tex/Qt_widget/qt_widget.tex
@ -535,23 +535,23 @@ This example generates 100 points and inserts them in a Delaunay
 triangulation. Using the standard toolbar you can zoom in, zoom out,
 translate.

-\section{The HelpWindow}
-\label{The HelpWindow}
+\section{The Help Window}
+\label{The Help Window}

 We provide a class in the \ccc{Qt_widget} library that was taken from
 an example of \ccc{Qt} and adapted to our needs. This class has the
 functionality of a rich text browser with hypertext navigation. You
 can also PRINT, GO BACK, GO FORWARD or GO HOME. This class is called
-\ccStyle{HelpWindow} and you can use it to display hypertext support
+\ccStyle{Qt_help_window} and you can use it to display hypertext support
 in your application. It is used in a lot of demos provided in the
 distribution.

 \ccExample
 \begin{ccExampleCode}
-    #include <CGAL/IO/Qt_widget_helpwindow.h>
+    #include <CGAL/IO/Qt_help_window.h>
        ....
    QString home = "help/index.html";
-    HelpWindow *help = new HelpWindow(home, ".", 0, "help viewer");
+    Qt_help_window *help = new Qt_help_window(home, ".", 0, "help viewer");
    help->resize(400, 400);
    help->setCaption("Demo HowTo");
    help->show();
--- a/Packages/Qt_widget/doc_tex/Qt_widget_ref/Qt_widget_helpwindow.tex
+++ b/Packages/Qt_widget/doc_tex/Qt_widget_ref/Qt_widget_helpwindow.tex
@ -9,14 +9,14 @@
 % +------------------------------------------------------------------------+

 % +-----------------------------------------------------+
-\begin{ccRefClass}{HelpWindow}
+\begin{ccRefClass}{Qt_help_window}

 \ccDefinition
 This class is a specialization of the \ccc{QTextBrowser} class, that
 provides a rich text browser with hypertext navigation. It has couple
 more functionalities as navigation support and printing.

-\ccInclude{CGAL/IO/Qt_widget_helpwindow.h}
+\ccInclude{CGAL/IO/Qt_help_window.h}
 \ccGlue

 \ccInheritsFrom
@ -24,8 +24,8 @@ more functionalities as navigation support and printing.

 \ccCreation
 \ccCreationVariable{hw}
-\ccSetTwoColumns{HelpWindow}{}
-\ccConstructor{HelpWindow( const QString& home_,  const QString& path, 
+\ccSetTwoColumns{Qt_help_window}{}
+\ccConstructor{Qt_help_window( const QString& home_,  const QString& path, 
                QWidget* parent = 0, const char *name=0 );}
 {\ccc{home_} is the name of the file considered as home, \ccc{path} is 
 the path to this file, \ccc{parent} is the parent widget, and
@ -39,11 +39,11 @@ printer device of your choice.}

 \ccExample
 \begin{ccExampleCode}
-  #include <CGAL/IO/Qt_widget_helpwindow.h>
+  #include <CGAL/IO/Qt_help_window.h>
  //...
  QString home;
  home = "help/index.html";
-  HelpWindow *help = new HelpWindow(home, ".", 0, "help viewer");
+  Qt_help_window *help = new Qt_help_window(home, ".", 0, "help viewer");
  help->resize(400, 400);
  help->setCaption("Demo HowTo");
  help->show();
--- a/Packages/Qt_widget/doc_tex/Qt_widget_ref/intro.tex
+++ b/Packages/Qt_widget/doc_tex/Qt_widget_ref/intro.tex
@ -20,7 +20,7 @@
 \ccRefIdfierPage{CGAL::Qt_widget_layer}\\
 \ccRefIdfierPage{CGAL::Qt_widget_standard_toolbar}\\
 \ccRefIdfierPage{CGAL::Qt_widget_history}\\
-\ccRefIdfierPage{CGAL::HelpWindow}\\
+\ccRefIdfierPage{CGAL::Qt_help_window}\\
 \ccRefIdfierPage{CGAL::Qt_widget_get_point<T>}\\
 \ccRefIdfierPage{CGAL::Qt_widget_get_segment<T>}\\
 \ccRefIdfierPage{CGAL::Qt_widget_get_line<T>}\\
--- a/Packages/Qt_widget/doc_tex/Qt_widget_ref/main.tex
+++ b/Packages/Qt_widget/doc_tex/Qt_widget_ref/main.tex
@ -23,6 +23,6 @@
 \input{Qt_widget_ref/Qt_widget_get_simple_polygon.tex}
 \input{Qt_widget_ref/Standard_toolbar.tex}
 \input{Qt_widget_ref/Qt_widget_history.tex}
-\input{Qt_widget_ref/Qt_widget_helpwindow.tex}
+\input{Qt_widget_ref/Qt_help_window.tex}

 %% EOF
--- a/Packages/Qt_widget/doc_tex/support/Qt_widget/qt_widget.tex
+++ b/Packages/Qt_widget/doc_tex/support/Qt_widget/qt_widget.tex
@ -535,23 +535,23 @@ This example generates 100 points and inserts them in a Delaunay
 triangulation. Using the standard toolbar you can zoom in, zoom out,
 translate.

-\section{The HelpWindow}
-\label{The HelpWindow}
+\section{The Help Window}
+\label{The Help Window}

 We provide a class in the \ccc{Qt_widget} library that was taken from
 an example of \ccc{Qt} and adapted to our needs. This class has the
 functionality of a rich text browser with hypertext navigation. You
 can also PRINT, GO BACK, GO FORWARD or GO HOME. This class is called
-\ccStyle{HelpWindow} and you can use it to display hypertext support
+\ccStyle{Qt_help_window} and you can use it to display hypertext support
 in your application. It is used in a lot of demos provided in the
 distribution.

 \ccExample
 \begin{ccExampleCode}
-    #include <CGAL/IO/Qt_widget_helpwindow.h>
+    #include <CGAL/IO/Qt_help_window.h>
        ....
    QString home = "help/index.html";
-    HelpWindow *help = new HelpWindow(home, ".", 0, "help viewer");
+    Qt_help_window *help = new Qt_help_window(home, ".", 0, "help viewer");
    help->resize(400, 400);
    help->setCaption("Demo HowTo");
    help->show();
--- a/Packages/Qt_widget/doc_tex/support/Qt_widget_ref/Qt_widget_helpwindow.tex
+++ b/Packages/Qt_widget/doc_tex/support/Qt_widget_ref/Qt_widget_helpwindow.tex
@ -9,14 +9,14 @@
 % +------------------------------------------------------------------------+

 % +-----------------------------------------------------+
-\begin{ccRefClass}{HelpWindow}
+\begin{ccRefClass}{Qt_help_window}

 \ccDefinition
 This class is a specialization of the \ccc{QTextBrowser} class, that
 provides a rich text browser with hypertext navigation. It has couple
 more functionalities as navigation support and printing.

-\ccInclude{CGAL/IO/Qt_widget_helpwindow.h}
+\ccInclude{CGAL/IO/Qt_help_window.h}
 \ccGlue

 \ccInheritsFrom
@ -24,8 +24,8 @@ more functionalities as navigation support and printing.

 \ccCreation
 \ccCreationVariable{hw}
-\ccSetTwoColumns{HelpWindow}{}
-\ccConstructor{HelpWindow( const QString& home_,  const QString& path, 
+\ccSetTwoColumns{Qt_help_window}{}
+\ccConstructor{Qt_help_window( const QString& home_,  const QString& path, 
                QWidget* parent = 0, const char *name=0 );}
 {\ccc{home_} is the name of the file considered as home, \ccc{path} is 
 the path to this file, \ccc{parent} is the parent widget, and
@ -39,11 +39,11 @@ printer device of your choice.}

 \ccExample
 \begin{ccExampleCode}
-  #include <CGAL/IO/Qt_widget_helpwindow.h>
+  #include <CGAL/IO/Qt_help_window.h>
  //...
  QString home;
  home = "help/index.html";
-  HelpWindow *help = new HelpWindow(home, ".", 0, "help viewer");
+  Qt_help_window *help = new Qt_help_window(home, ".", 0, "help viewer");
  help->resize(400, 400);
  help->setCaption("Demo HowTo");
  help->show();
--- a/Packages/Qt_widget/doc_tex/support/Qt_widget_ref/intro.tex
+++ b/Packages/Qt_widget/doc_tex/support/Qt_widget_ref/intro.tex
@ -20,7 +20,7 @@
 \ccRefIdfierPage{CGAL::Qt_widget_layer}\\
 \ccRefIdfierPage{CGAL::Qt_widget_standard_toolbar}\\
 \ccRefIdfierPage{CGAL::Qt_widget_history}\\
-\ccRefIdfierPage{CGAL::HelpWindow}\\
+\ccRefIdfierPage{CGAL::Qt_help_window}\\
 \ccRefIdfierPage{CGAL::Qt_widget_get_point<T>}\\
 \ccRefIdfierPage{CGAL::Qt_widget_get_segment<T>}\\
 \ccRefIdfierPage{CGAL::Qt_widget_get_line<T>}\\
--- a/Packages/Qt_widget/doc_tex/support/Qt_widget_ref/main.tex
+++ b/Packages/Qt_widget/doc_tex/support/Qt_widget_ref/main.tex
@ -23,6 +23,6 @@
 \input{Qt_widget_ref/Qt_widget_get_simple_polygon.tex}
 \input{Qt_widget_ref/Standard_toolbar.tex}
 \input{Qt_widget_ref/Qt_widget_history.tex}
-\input{Qt_widget_ref/Qt_widget_helpwindow.tex}
+\input{Qt_widget_ref/Qt_help_window.tex}

 %% EOF
--- a/Packages/Qt_widget/include/CGAL/IO/Qt_widget_helpwindow.h
+++ b/Packages/Qt_widget/include/CGAL/IO/Qt_widget_helpwindow.h
@ -8,7 +8,7 @@
 //
 // ----------------------------------------------------------------------
 //
-// file          : include/CGAL/IO/Qt_widget_helpwindow.h
+// file          : include/CGAL/IO/Qt_help_window.h
 // package       : Qt_widget (1.2.46)
 // author(s)     : Radu Ursu
 // release       : $CGAL_Revision: CGAL-2.5-I-60 $
@ -18,8 +18,8 @@
 //
 // ======================================================================

-#ifndef CGAL_QT_WIDGET_HELPWINDOW_H
-#define CGAL_QT_WIDGET_HELPWINDOW_H
+#ifndef CGAL_QT_HELP_WINDOW_H
+#define CGAL_QT_HELP_WINDOW_H

 #include <qmainwindow.h>
 #include <qtextbrowser.h>
@ -51,18 +51,16 @@
 #include <qpaintdevicemetrics.h>


-
-
 class QComboBox;
 class QPopupMenu;

-class HelpWindow : public QMainWindow
+class Qt_help_window : public QMainWindow
 {
    Q_OBJECT
 public:
-    HelpWindow( const QString& home_,  const QString& path, 
+    Qt_help_window( const QString& home_,  const QString& path, 
                QWidget* parent = 0, const char *name=0 );
-    ~HelpWindow();
+    ~Qt_help_window();
 public slots:
    void print();

--- a/Packages/Qt_widget/src/CGALQt/CGALQt.vcproj
+++ b/Packages/Qt_widget/src/CGALQt/CGALQt.vcproj
@ -105,7 +105,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="Qt_widget_helpwindow.C">
+				RelativePath="Qt_help_window.C">
 			</File>
 			<File
 				RelativePath="Qt_widget_history.C">
@ -167,22 +167,22 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\include\CGAL\IO\Qt_widget_helpwindow.h">
+				RelativePath="..\..\include\CGAL\IO\Qt_help_window.h">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="$(QTDIR)/bin/moc.exe -o Qt_widget_helpwindow.moc $(CGALROOT)/include/CGAL/IO/Qt_widget_helpwindow.h
+						CommandLine="$(QTDIR)/bin/moc.exe -o Qt_help_window.moc $(CGALROOT)/include/CGAL/IO/Qt_help_window.h
 "
-						Outputs="Qt_widget_helpwindow.moc"/>
+						Outputs="Qt_help_window.moc"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="$(QTDIR)/bin/moc.exe -o Qt_widget_helpwindow.moc $(CGALROOT)/include/CGAL/IO/Qt_widget_helpwindow.h
+						CommandLine="$(QTDIR)/bin/moc.exe -o Qt_help_window.moc $(CGALROOT)/include/CGAL/IO/Qt_help_window.h
 "
-						Outputs="Qt_widget_helpwindow.moc"/>
+						Outputs="Qt_help_window.moc"/>
 				</FileConfiguration>
 			</File>
 			<File
--- a/Packages/Qt_widget/src/CGALQt/Makefile
+++ b/Packages/Qt_widget/src/CGALQt/Makefile
@ -23,7 +23,7 @@ CGAL_OBJECTS = \
 Qt_widget$(OBJ_EXT) \
 Qt_widget_layer$(OBJ_EXT) \
 Qt_widget_standard_toolbar$(OBJ_EXT) \
-Qt_widget_helpwindow$(OBJ_EXT) \
+Qt_help_window$(OBJ_EXT) \
 Qt_widget_history$(OBJ_EXT)

 #---------------------------------------------------------------------#
@ -65,10 +65,10 @@ Qt_widget_history$(OBJ_EXT): Qt_widget_history.C \
 	$(QT_MOC) ../../include/CGAL/IO/Qt_widget_history.h -o Qt_widget_history.moc
 	$(CGAL_CXX) $(CXXFLAGS) -c Qt_widget_history.C

-Qt_widget_helpwindow$(OBJ_EXT): Qt_widget_helpwindow.C \
-			../../include/CGAL/IO/Qt_widget_helpwindow.h
-	$(QT_MOC) ../../include/CGAL/IO/Qt_widget_helpwindow.h -o Qt_widget_helpwindow.moc
-	$(CGAL_CXX) $(CXXFLAGS) -c Qt_widget_helpwindow.C
+Qt_help_window$(OBJ_EXT): Qt_help_window.C \
+			../../include/CGAL/IO/Qt_help_window.h
+	$(QT_MOC) ../../include/CGAL/IO/Qt_help_window.h -o Qt_help_window.moc
+	$(CGAL_CXX) $(CXXFLAGS) -c Qt_help_window.C

 .C$(OBJ_EXT):
 	$(CGAL_CXX)  $(CXXFLAGS) -c $<
--- a/Packages/Qt_widget/src/CGALQt/Qt_widget_helpwindow.C
+++ b/Packages/Qt_widget/src/CGALQt/Qt_widget_helpwindow.C
@ -8,7 +8,7 @@
 //
 // ----------------------------------------------------------------------------
 //
-// file          : src/Qt_widget_helpwindow.C
+// file          : src/Qt_help_window.C
 // package       : Qt_widget
 // author(s)     : Radu Ursu <rursu@sophia.inria.fr
 // release       : 
@ -18,7 +18,7 @@
 //
 // ============================================================================

-#include <CGAL/IO/Qt_widget_helpwindow.h>
+#include <CGAL/IO/Qt_help_window.h>

 /* XPM */
 /* Drawn  by Mark Donohoe for the K Desktop Environment */
@ -102,7 +102,7 @@ static char*homeb[]={
 "..#####.######..",
 "................"};

-HelpWindow::HelpWindow( const QString& home_, const QString& _path,
+Qt_help_window::Qt_help_window( const QString& home_, const QString& _path,
 			QWidget* parent, const char *name )
  : QMainWindow( parent, name, WDestructiveClose ),
            pathCombo( 0 )
@ -168,21 +168,21 @@ HelpWindow::HelpWindow( const QString& home_, const QString& _path,
  pathCombo->insertItem( home_ );
 }

-HelpWindow::~HelpWindow(){}
+Qt_help_window::~Qt_help_window(){}

-void HelpWindow::setBackwardAvailable( bool b)
+void Qt_help_window::setBackwardAvailable( bool b)
 {
    menuBar()->setItemEnabled( backwardId, b);
 }

-void HelpWindow::setForwardAvailable( bool b)
+void Qt_help_window::setForwardAvailable( bool b)
 {
    menuBar()->setItemEnabled( forwardId, b);
 }



-void HelpWindow::print()
+void Qt_help_window::print()
 {
 #ifndef QT_NO_PRINTER
    QPrinter printer;
@ -216,19 +216,19 @@ void HelpWindow::print()
    #endif
 }

-void HelpWindow::pathSelected( const QString &_path )
+void Qt_help_window::pathSelected( const QString &_path )
 {
    browser->setSource( _path );
    //    if ( mHistory.values().contains(_path) )
    //	mHistory[ hist->insertItem( _path ) ] = _path;
 }
-void HelpWindow::histChosen( int i )
+void Qt_help_window::histChosen( int i )
 {
  if ( mHistory.contains( i ) )
    browser->setSource( mHistory[ i ] );
 }

-void HelpWindow::readHistory()
+void Qt_help_window::readHistory()
 {
    if ( QFile::exists( QDir::currentDirPath() + "/.history" ) ) {
 	QFile f( QDir::currentDirPath() + "/.history" );
@ -242,4 +242,4 @@ void HelpWindow::readHistory()
 }


-#include "Qt_widget_helpwindow.moc"
+#include "Qt_help_window.moc"
--- a/Packages/Qt_widget/src/CGALQt/makefile_Qt
+++ b/Packages/Qt_widget/src/CGALQt/makefile_Qt
@ -23,7 +23,7 @@ CGAL_OBJECTS = \
 Qt_widget$(OBJ_EXT) \
 Qt_widget_layer$(OBJ_EXT) \
 Qt_widget_standard_toolbar$(OBJ_EXT) \
-Qt_widget_helpwindow$(OBJ_EXT) \
+Qt_help_window$(OBJ_EXT) \
 Qt_widget_history$(OBJ_EXT) \
 Qt_widget_xpm_icons$(OBJ_EXT)

@ -58,9 +58,9 @@ Qt_widget_standard_toolbar$(OBJ_EXT):
 	$(QT_MOC) ../../include/CGAL/IO/Qt_widget_standard_toolbar.h -o Qt_widget_standard_toolbar.moc
 	$(CGAL_CXX) $(CXXFLAGS) -c Qt_widget_standard_toolbar.C

-Qt_widget_helpwindow$(OBJ_EXT):
-	$(QT_MOC) ../../include/CGAL/IO/Qt_widget_helpwindow.h -o Qt_widget_helpwindow.moc
-	$(CGAL_CXX) $(CXXFLAGS) -c Qt_widget_helpwindow.C
+Qt_help_window$(OBJ_EXT):
+	$(QT_MOC) ../../include/CGAL/IO/Qt_help_window.h -o Qt_help_window.moc
+	$(CGAL_CXX) $(CXXFLAGS) -c Qt_help_window.C

 Qt_widget_history$(OBJ_EXT):
 	$(QT_MOC) ../../include/CGAL/IO/Qt_widget_history.h -o Qt_widget_history.moc