From b0200d06c5bd25a9d2fcaa42fc33b3544adac079 Mon Sep 17 00:00:00 2001 From: Radu Ursu Date: Sun, 7 Sep 2003 11:47:39 +0000 Subject: [PATCH] 2.69 (07 Sep 2003) - [rursu] demo use now the new Qt_help_window class instead of HelpWindow - [rursu] demo use new icon demoicon --- Packages/Generator/changes.txt | 6 +++++- Packages/Generator/demo/Generator/generator.C | 8 ++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Packages/Generator/changes.txt b/Packages/Generator/changes.txt index 98d28a72db9..be3f10f30ee 100644 --- a/Packages/Generator/changes.txt +++ b/Packages/Generator/changes.txt @@ -1,7 +1,11 @@ Generator Package: Release changes: --------------------------------------------------------------------- +2.69 (07 Sep 2003) + - [rursu] demo use now the new Qt_help_window class instead of HelpWindow + - [rursu] demo use new icon demoicon + 2.68 (12 Aug 2003) -- Removed unused variable name from parameter list to get rid of warning [af] + - Removed unused variable name from parameter list to get rid of warning[af] 2.67 (25 Jul 2003) - modified the Generator doc (rursu) diff --git a/Packages/Generator/demo/Generator/generator.C b/Packages/Generator/demo/Generator/generator.C index 81a5c11ac6b..59522d02cf5 100644 --- a/Packages/Generator/demo/Generator/generator.C +++ b/Packages/Generator/demo/Generator/generator.C @@ -33,8 +33,10 @@ int main(int, char*){ #include #include -#include +#include #include +#include + #include #include @@ -185,7 +187,7 @@ private slots: void howto(){ 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(); @@ -291,6 +293,8 @@ main(int argc, char **argv) app.setMainWidget(&widget); widget.setCaption(my_title_string); widget.setMouseTracking(TRUE); + QPixmap cgal_icon = QPixmap((const char**)demoicon_xpm); + widget.setIcon(cgal_icon); widget.show(); current_state = -1; return app.exec();