1 diff -urN qt-x11-free-3.0.4.orig/doc/html/designer-manual-8.html qt-x11-free-3.0.4/doc/html/designer-manual-8.html
2 --- qt-x11-free-3.0.4.orig/doc/html/designer-manual-8.html Fri Apr 26 10:33:15 2002
3 +++ qt-x11-free-3.0.4/doc/html/designer-manual-8.html Sun May 5 14:37:17 2002
5 <ol type=1><li><p>Click <b>File|New</b> to invoke the <em>New File</em> dialog. Click the Dialog template then click <b>OK</b>.</p>
6 <li><p>Click the <b>Text Label</b> toolbar button, then click near the top left of the form. Change the font Point Size property to 16 and change the <em>text</em> property to your or your company's name. Click the <b>Line</b> toolbar button, then click the form below the label; click Horizontal on the pop-up menu.</p>
7 <li><p>Select the label and the line. (<b>Ctrl+Click</b> the form, then drag the rubber band so that it touches or includes the line and the label.) Press <b>Ctrl+L</b> to lay them out vertically.</p>
8 -<li><p>Click the <b>Save</b> toolbar button. In the <em>Save As</em> dialog, navigate to <em>Qt Designer</em>'s templates directory, e.g. (<tt>qt/tools/designer/templates</tt>. Type in the name 'Simple_Dialog.ui' and click <b>Save</b>.</p>
9 +<li><p>Click the <b>Save</b> toolbar button. In the <em>Save As</em> dialog, navigate to <em>Qt Designer</em>'s templates directory, e.g. (<tt>/usr/X11R6/share/qt/designer/templates</tt>. Type in the name 'Simple_Dialog.ui' and click <b>Save</b>.</p>
10 <li><p>Right click the form in the Forms list, then click Remove form from project.</p>
11 </ol><p>Now that we have the simple template we are ready to use it. Click <b>File|New</b> to invoke the <em>New File</em> dialog. One of the templates that will appear is 'Simple Dialog'. Click the simple dialog, then click <b>OK</b>. A new form will appear with the same widgets and layout as the template. Add any other widgets and functionality. When you attempt to save the form you will be prompted for a new form name.</p>
12 <h4><a name="2-2"></a>Base-class Templates</h4>
13 diff -urN qt-x11-free-3.0.4.orig/src/kernel/qapplication.cpp qt-x11-free-3.0.4/src/kernel/qapplication.cpp
14 --- qt-x11-free-3.0.4.orig/src/kernel/qapplication.cpp Fri Apr 26 09:48:13 2002
15 +++ qt-x11-free-3.0.4/src/kernel/qapplication.cpp Sun May 5 14:40:12 2002
16 @@ -1494,16 +1494,8 @@
17 if ( !app_libpaths ) {
18 app_libpaths = new QStringList;
20 - char *qtdir = getenv("QTDIR");
21 - if ( qtdir && QFile::exists( QString(qtdir) + "/plugins" ) )
22 - app_libpaths->append( QString(qtdir) + "/plugins" );
23 -#ifdef QT_INSTALL_PREFIX
24 - else if ( QFile::exists( QString(QT_INSTALL_PREFIX) + "/plugins" ) )
25 - app_libpaths->append( QString(QT_INSTALL_PREFIX) + "/plugins" );
26 -#endif // QT_INSTALL_PREFIX
27 #ifdef QT_INSTALL_PLUGINS
28 - else if ( QFile::exists( QString(QT_INSTALL_PLUGINS) ) )
29 - app_libpaths->append( QString(QT_INSTALL_PLUGINS) );
30 + app_libpaths->append( QString(QT_INSTALL_PLUGINS) );
34 diff -urN qt-x11-free-3.0.4.orig/tools/designer/designer/designer.pro qt-x11-free-3.0.4/tools/designer/designer/designer.pro
35 --- qt-x11-free-3.0.4.orig/tools/designer/designer/designer.pro Thu Apr 18 13:35:11 2002
36 +++ qt-x11-free-3.0.4/tools/designer/designer/designer.pro Sun May 5 14:37:17 2002
40 isEmpty(data.path):data.path=$$QT_PREFIX
41 -templates.path=$$data.path/templates
42 +templates.path=$$data.path/designer/templates
43 templates.files = ../templates/*
45 diff -urN qt-x11-free-3.0.4.orig/tools/designer/designer/mainwindowactions.cpp qt-x11-free-3.0.4/tools/designer/designer/mainwindowactions.cpp
46 --- qt-x11-free-3.0.4.orig/tools/designer/designer/mainwindowactions.cpp Mon Mar 18 15:22:45 2002
47 +++ qt-x11-free-3.0.4/tools/designer/designer/mainwindowactions.cpp Sun May 5 14:37:17 2002
49 QMessageBox::information( this, tr( "Create Template" ), tr( "Couldn't create the template" ) );
52 - fn.prepend( QString( getenv( "QTDIR" ) ) + "/tools/designer/templates/" );
53 + fn.prepend( QString( getenv( "QTDIR" ) ) + "share/qt/designer/templates/" );
56 if ( !f.open( IO_WriteOnly ) ) {
57 diff -urN qt-x11-free-3.0.4.orig/tools/designer/designer/newformimpl.cpp qt-x11-free-3.0.4/tools/designer/designer/newformimpl.cpp
58 --- qt-x11-free-3.0.4.orig/tools/designer/designer/newformimpl.cpp Thu Feb 21 02:11:16 2002
59 +++ qt-x11-free-3.0.4/tools/designer/designer/newformimpl.cpp Sun May 5 14:37:17 2002
61 templRoots << QT_INSTALL_DATA;
63 for ( QStringList::Iterator it = templRoots.begin(); it != templRoots.end(); ++it ) {
64 - QString path = (*it) + "/tools/designer/templates";
65 + QString path = (*it) + "/share/qt/designer/templates";
66 if ( QFile::exists( path )) {
69 diff -urN qt-x11-free-3.0.4.orig/tools/qtconfig/mainwindow.cpp qt-x11-free-3.0.4/tools/qtconfig/mainwindow.cpp
70 --- qt-x11-free-3.0.4.orig/tools/qtconfig/mainwindow.cpp Fri Apr 26 07:09:27 2002
71 +++ qt-x11-free-3.0.4/tools/qtconfig/mainwindow.cpp Sun May 5 14:37:17 2002
73 QStringList libpath = QApplication::libraryPaths();
74 QString QTDIRpath = getenv("QTDIR");
75 if ( ! QTDIRpath.isEmpty() ) {
76 - QTDIRpath += "/plugins";
77 + QTDIRpath += "/lib/qt/plugins";
78 libpath.remove(QTDIRpath);
80 settings.writeEntry("/qt/libraryPath", libpath, ':');