Changeset 8 for trunk/examples

Timestamp:

Nov 16, 2005, 8:36:46 PM (20 years ago)

Author:

dmik

Message:

Transferred Qt for OS/2 version 3.3.1-rc5 sources from the CVS

Location:

trunk/examples

Files:

• action/application.cpp (modified) (9 diffs)
• application/application.cpp (modified) (9 diffs)
• examples.pro (modified) (1 diff)
• menu/menu.cpp (modified) (1 diff)

trunk/examples/action/application.cpp

@@ -34 +34 @@
 #include "filesave.xpm"
 #include "fileopen.xpm"
+#ifndef QT_NO_PRINTER
 #include "fileprint.xpm"
+#endif
 
 
@@ -40 +42 @@
     : QMainWindow( 0, "example application main window", WDestructiveClose )
 {
+#ifndef QT_NO_PRINTER
     printer = new QPrinter( QPrinter::HighResolution );
+#endif
 
     QAction * fileNewAction;
@@ -79 +83 @@
     fileSaveAsAction->setWhatsThis( fileSaveText );
 
+#ifndef QT_NO_PRINTER
     filePrintAction = new QAction( "Print File", QPixmap( fileprint ),
                                    "&Print...", CTRL+Key_P, this, "print" );
@@ -88 +93 @@
                      "command from the File menu.";
     filePrintAction->setWhatsThis( filePrintText );
+#else
+    Q_UNUSED( filePrintAction )
+#endif
 
     fileCloseAction = new QAction( "Close", "&Close", CTRL+Key_W, this,
@@ -105 +113 @@
     fileOpenAction->addTo( fileTools );
     fileSaveAction->addTo( fileTools );
+#ifndef QT_NO_PRINTER
     filePrintAction->addTo( fileTools );
+#endif
     (void)QWhatsThis::whatsThisButton( fileTools );
 
@@ -117 +127 @@
     fileSaveAction->addTo( file );
     fileSaveAsAction->addTo( file );
+#ifndef QT_NO_PRINTER
     file->insertSeparator();
     filePrintAction->addTo( file );
+#endif
     file->insertSeparator();
     fileCloseAction->addTo( file );
@@ -150 +162 @@
 ApplicationWindow::~ApplicationWindow()
 {
+#ifndef QT_NO_PRINTER
     delete printer;
+#endif
 }
 
@@ -228 +242 @@
 void ApplicationWindow::print()
 {
+#ifndef QT_NO_PRINTER
     printer->setFullPage( TRUE );
     if ( printer->setup(this) ) {               // printer dialog
@@ -266 +281 @@
         statusBar()->message( "Printing aborted", 2000 );
     }
+#endif
 }
 

trunk/examples/application/application.cpp

@@ -33 +33 @@
 #include "filesave.xpm"
 #include "fileopen.xpm"
+#ifndef QT_NO_PRINTER
 #include "fileprint.xpm"
+#endif
 
 ApplicationWindow::ApplicationWindow()
     : QMainWindow( 0, "example application main window", WDestructiveClose | WGroupLeader )
 {
+#ifndef QT_NO_PRINTER
     printer = new QPrinter( QPrinter::HighResolution );
+#endif
     QPixmap openIcon, saveIcon, printIcon;
 
@@ -54 +58 @@
                            this, SLOT(save()), fileTools, "save file" );
 
+#ifndef QT_NO_PRINTER
     printIcon = QPixmap( fileprint );
     QToolButton * filePrint
         = new QToolButton( printIcon, "Print File", QString::null,
                            this, SLOT(print()), fileTools, "print file" );
+#else
+    Q_UNUSED( printIcon )
+#endif
 
 
@@ -78 +86 @@
     QWhatsThis::add( fileSave, fileSaveText );
 
+#ifndef QT_NO_PRINTER
     const char * filePrintText = "Click this button to print the file you "
                  "are editing.\n"
@@ -84 +93 @@
 
     QWhatsThis::add( filePrint, filePrintText );
+#endif
 
 
@@ -104 +114 @@
     file->setWhatsThis( id, fileSaveText );
 
+#ifndef QT_NO_PRINTER
     file->insertSeparator();
 
@@ -109 +120 @@
                            this, SLOT(print()), CTRL+Key_P );
     file->setWhatsThis( id, filePrintText );
+#endif
 
     file->insertSeparator();
@@ -137 +149 @@
 ApplicationWindow::~ApplicationWindow()
 {
+#ifndef QT_NO_PRINTER
     delete printer;
+#endif
 }
 
@@ -216 +230 @@
 void ApplicationWindow::print()
 {
+#ifndef QT_NO_PRINTER
     printer->setFullPage( TRUE );
     if ( printer->setup(this) ) {               // printer dialog
@@ -254 +269 @@
         statusBar()->message( "Printing aborted", 2000 );
     }
+#endif
 }
 

trunk/examples/examples.pro

@@ -122 +122 @@
 x11:SUBDIRS     += biff \
                    desktop
+
+## @todo (dmik): examples below are substracted until implemented
+
+os2:SUBDIRS -= \
+                demo \
+                dirview \
+                distributor \
+                dragdrop \
+                drawdemo \
+                extension \
+                helpdemo \
+                movies \
+                process \
+                qdir \
+                tetrix \
+                tux \
+                widgets

trunk/examples/menu/menu.cpp

@@ -152 +152 @@
     options->insertTearOffHandle();
     options->setCaption("Options");
-    options->insertItem( "&Normal Font", this, SLOT(normal()) );
+
+    options->polish(); // adjust system settings
+    QFont of( options->font().family(), options->font().pointSize() );
+    int normID = options->insertItem( new MyMenuItem( "&Normal Font", of ) );
+    options->connectItem( normID, this, SLOT(normal()) );
     options->insertSeparator();
-
-    options->polish(); // adjust system settings
-    QFont f = options->font();
+    QFont f = QFont( of );
     f.setBold( TRUE );
     boldID = options->insertItem( new MyMenuItem( "Bold", f ) );
     options->setAccel( CTRL+Key_B, boldID );
     options->connectItem( boldID, this, SLOT(bold()) );
-    f = font();
+    f = QFont( of );
     f.setUnderline( TRUE );
     underlineID = options->insertItem( new MyMenuItem( "Underline", f ) );