Changeset 8704 in vbox for trunk/src/VBox/Frontends

Timestamp:

May 8, 2008 12:49:35 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

30642

Message:

FE/Qt4: SharedFolderSettings:

• fixed last Qt3 support warnings
• added QDialogButtonBox
• some simplifications
• added copyright notice

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/VBoxSharedFoldersSettings.h (added)
• src/VBoxConsoleWnd.cpp (modified) (2 diffs)
• src/VBoxSharedFoldersSettings.cpp (added)
• ui/VBoxSharedFoldersSettings.ui (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxConsoleWnd.cpp

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2008 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -3495 +3495 @@
 
     /* Setup button's layout */
-    QHBoxLayout *buttonLayout = new QHBoxLayout();
-    buttonLayout->setSpacing (10);
-    mainLayout->addLayout (buttonLayout);
-    QPushButton *pbHelp = new QPushButton (tr ("Help"));
-    QSpacerItem *spacer = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum);
-    QPushButton *pbOk = new QPushButton (tr ("&OK"));
-    QPushButton *pbCancel = new QPushButton (tr ("Cancel"));
-    connect (pbHelp, SIGNAL (clicked()), &vboxProblem(), SLOT (showHelpHelpDialog()));
-    connect (pbOk, SIGNAL (clicked()), this, SLOT (accept()));
-    connect (pbCancel, SIGNAL (clicked()), this, SLOT (reject()));
-    pbHelp->setShortcut (Qt::Key_F1);
-    buttonLayout->addWidget (pbHelp);
-    buttonLayout->addItem (spacer);
-    buttonLayout->addWidget (pbOk);
-    buttonLayout->addWidget (pbCancel);
-
-    /* Setup the default push button */
-    pbOk->setAutoDefault (true);
-    pbOk->setDefault (true);
+    QDialogButtonBox *buttonBox = new QDialogButtonBox (QDialogButtonBox::Ok | QDialogButtonBox::Cancel | QDialogButtonBox::Help);
+    QPushButton *btnHelp = buttonBox->button (QDialogButtonBox::Help);
+    btnHelp->setText (tr ("Help"));
+    btnHelp->setShortcut (QKeySequence (tr ("F1"))); 
+
+    connect (buttonBox, SIGNAL (helpRequested()), &vboxProblem(), SLOT (showHelpHelpDialog()));
+    connect (buttonBox, SIGNAL (accepted()), this, SLOT (accept()));
+    connect (buttonBox, SIGNAL (rejected()), this, SLOT (reject()));
+    mainLayout->addWidget (buttonBox);
 }
 

trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxSharedFoldersSettings.ui

@@ -1 +1 @@
 <ui version="4.0" >
+ <comment>
+ VBox frontends: Qt4 GUI ("VirtualBox"):
+
+ Copyright (C) 2008 Sun Microsystems, Inc.
+
+ This file is part of VirtualBox Open Source Edition (OSE), as
+ available from http://www.virtualbox.org. This file is free software;
+ you can redistribute it and/or modify it under the terms of the GNU
+ General Public License (GPL) as published by the Free Software
+ Foundation, in version 2 as it comes in the "COPYING" file of the
+ VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+ hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+
+ Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa
+ Clara, CA 95054 USA or visit http://www.sun.com if you need
+ additional information or have any questions.
+ </comment>
  <class>VBoxSharedFoldersSettings</class>
  <widget class="QWidget" name="VBoxSharedFoldersSettings" >