Changeset 769 for trunk/examples/widgets

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• examples/widgets/softkeys/softkeys.cpp (modified) (4 diffs)
• examples/widgets/softkeys/softkeys.h (modified) (2 diffs)
• examples/widgets/stylesheet/mainwindow.ui (modified) (1 diff)
• examples/widgets/wiggly/dialog.cpp (modified) (1 diff)
• examples/widgets/windowflags/controllerwindow.cpp (modified) (1 diff)

trunk/examples/widgets/softkeys/softkeys.cpp

@@ -71 +71 @@
     toggleButton->setCheckable(true);
 
+
+
+
+
+
+
     pushButton = new QPushButton(tr("File Dialog"), this);
     pushButton->setContextMenuPolicy(Qt::NoContextMenu);
@@ -88 +94 @@
     layout->addWidget(pushButton, 2, 1);
     layout->addWidget(comboBox, 3, 0, 1, 2);
+
+
     central->setLayout(layout);
 
@@ -98 +106 @@
     connect(exit, SIGNAL(triggered()), this, SLOT(exitApplication()));
     connect(toggleButton, SIGNAL(clicked()), this, SLOT(setCustomSoftKeys()));
+
     pushButton->setFocus();
 }
@@ -134 +143 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 void MainWindow::exitApplication()
 {

trunk/examples/widgets/softkeys/softkeys.h

@@ -58 +58 @@
     void cancelPressed();
     void setCustomSoftKeys();
+
 public:
     MainWindow(QWidget *parent = 0);
@@ -64 +65 @@
     QGridLayout *layout;
     QWidget *central;
-    QTextEdit* textEditor;
+    QTextEdittextEditor;
     QLabel *infoLabel;
-    QPushButton* toggleButton;
-    QPushButton* pushButton;
-    QMenu* fileMenu;
-    QAction* addSoftKeysAct;
-    QAction* exit;
-    QAction* ok;
-    QAction* cancel;
+    QPushButton *toggleButton;
+    QPushButton *pushButton;
+    QPushButton *modeButton;
+    QLabel *modeLabel;
+    QMenu *fileMenu;
+    QAction *addSoftKeysAct;
+    QAction *exit;
+    QAction *ok;
+    QAction *cancel;
 };
 

trunk/examples/widgets/stylesheet/mainwindow.ui

@@ -197 +197 @@
        <item row="1" column="2" colspan="2" >
         <widget class="QRadioButton" name="femaleRadioButton" >
-         <property name="styleSheet" >
+         <property name=">
           <string>Check this if you are female</string>
          </property>

trunk/examples/widgets/wiggly/dialog.cpp

@@ -57 +57 @@
     setLayout(layout);
 
+
+
+
+
+
+
+
+
+
+
+
     connect(lineEdit, SIGNAL(textChanged(QString)),
             wigglyWidget, SLOT(setText(QString)));

trunk/examples/widgets/windowflags/controllerwindow.cpp

@@ -59 +59 @@
     bottomLayout->addWidget(quitButton);
 
-    QVBoxLayout *mainLayout = new QVBoxLayout;
+    QBoxLayout;
     mainLayout->addWidget(typeGroupBox);
     mainLayout->addWidget(hintsGroupBox);