Changeset 1017 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Feb 21, 2007 10:08:04 PM (18 years ago)

Author:

vboxsync

Message:

1758: Implement Shared Folders UI

Fixed buttons disappearing during scaling whats-this label in VMSharedFolders Settings.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/QIRichLabel.h (modified) (5 diffs)
• src/QIRichLabel.cpp (modified) (6 diffs)
• ui/VBoxDiskImageManagerDlg.ui.h (modified) (1 diff)
• ui/VBoxVMSettingsDlg.ui (modified) (5 diffs)
• ui/VBoxVMSettingsDlg.ui.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/QIRichLabel.h

@@ -78 +78 @@
 
    void setFont( const QFont &f );
+   void setFixedHeight (int);
 
 public slots:
@@ -88 +89 @@
    void         clear();
 
+protected slots:
+   void         putToClipBoard();
+
 protected:
    void         drawContents ( QPainter * );
@@ -96 +100 @@
    void         contextMenuEvent (QContextMenuEvent*);
 
-protected slots:
-   void         putToClipBoard();
+signals:
+   void         textChanged();
 
 private slots:
@@ -116 +120 @@
    QPicture   *lpicture;
    QMovie     *lmovie;
-   QAction    *copyAction;
    QPopupMenu *popupMenu;
    QWidget    *lbuddy;
@@ -123 +126 @@
    uint        autoresize:1;
    uint        scaledcontents :1;
+   uint        baseheight;
    TextFormat  textformat;
    QAccel     *accel;

trunk/src/VBox/Frontends/VirtualBox/src/QIRichLabel.cpp

@@ -92 +92 @@
 void QIRichLabel::init()
 {
+   baseheight = 0;
    lpixmap = 0;
    lmovie = 0;
@@ -107 +108 @@
    d = new QLabelPrivate;
 
-   copyAction = new QAction (this, "copyAction");
+   QAction *copyAction = new QAction (this, "copyAction");
    connect (copyAction, SIGNAL (activated()),
       this, SLOT (putToClipBoard()));
@@ -114 +115 @@
    popupMenu = new QPopupMenu (this, "contextMenu");
    copyAction->addTo (popupMenu);
+}
+
+
+void QIRichLabel::setFixedHeight (int aHeight)
+{
+    baseheight = aHeight;
+    QFrame::setFixedHeight (baseheight);
 }
 
@@ -156 +164 @@
    }
 
-  // If there is QSimpleRichText:
-  if (useRichText)
-      setFocusPolicy (doc ? QWidget::StrongFocus : QWidget::NoFocus);
-
    updateLabel (osh);
+
+   if (baseheight == 0)
+       baseheight = heightForWidth (width());
+   if ((int)baseheight < heightForWidth (width()))
+       QFrame::setFixedHeight (heightForWidth (width()));
+   else
+       QFrame::setFixedHeight (baseheight);
+   emit textChanged();
 }
 
@@ -441 +453 @@
 void QIRichLabel::contextMenuEvent (QContextMenuEvent *aEvent)
 {
-   popupMenu->popup(aEvent->globalPos());
+   if (hasFocus())
+      popupMenu->popup(aEvent->globalPos());
 }
 
@@ -548 +561 @@
          QString filteredText = compressText();
          doc = new QSimpleRichText (filteredText, font());
-         doc->setWidth (p, cr.width());
+         /* focus indent */
+         int xo = 3;
+         doc->setWidth (p, cr.width() - 2*xo);
          int rh = doc->height();
          int yo = 0;
-         int xo = 3;
          if (align & AlignVCenter)
             yo = (cr.height()-rh)/2;

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxDiskImageManagerDlg.ui.h

@@ -399 +399 @@
     QIRichLabel *infoLabel = new QIRichLabel (root, "infoPane");
 
+    /* Setup focus policy <strong> default for info pane */
+    infoLabel->setFocusPolicy (QWidget::StrongFocus);
+
     /* prevent the name columns from being expanded */
     nameLabel->setSizePolicy (QSizePolicy::Fixed, QSizePolicy::Fixed);

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMSettingsDlg.ui

@@ -2467 +2467 @@
                 </widget>
             </hbox>
-        </widget>
-        <widget class="QLabel" row="2" column="1">
-            <property name="name">
-                <cstring>whatsThisLabel</cstring>
-            </property>
-            <property name="sizePolicy">
-                <sizepolicy>
-                    <hsizetype>7</hsizetype>
-                    <vsizetype>0</vsizetype>
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                </sizepolicy>
-            </property>
-            <property name="minimumSize">
-                <size>
-                    <width>0</width>
-                    <height>0</height>
-                </size>
-            </property>
-            <property name="backgroundMode">
-                <enum>PaletteMidlight</enum>
-            </property>
-            <property name="paletteForegroundColor">
-                <color>
-                    <red>75</red>
-                    <green>75</green>
-                    <blue>75</blue>
-                </color>
-            </property>
-            <property name="frameShape">
-                <enum>Box</enum>
-            </property>
-            <property name="frameShadow">
-                <enum>Sunken</enum>
-            </property>
-            <property name="margin">
-                <number>7</number>
-            </property>
-            <property name="scaledContents">
-                <bool>false</bool>
-            </property>
-            <property name="alignment">
-                <set>WordBreak|AlignJustify|AlignTop</set>
-            </property>
         </widget>
     </grid>
@@ -2686 +2642 @@
     <include location="local" impldecl="in implementation">VBoxDiskImageManagerDlg.h</include>
     <include location="local" impldecl="in implementation">VBoxMediaComboBox.h</include>
+    <include location="local" impldecl="in implementation">QIRichLabel.h</include>
 </includes>
 <forwards>
@@ -2692 +2649 @@
     <forward>class VBoxUSBMenu</forward>
     <forward>class VBoxSharedFoldersSettings</forward>
+    <forward>class QIRichLabel</forward>
 </forwards>
 <variables>
@@ -2724 +2682 @@
     <variable access="private">VBoxMediaComboBox *cbISOFloppy;</variable>
     <variable access="private">VBoxUSBMenu *usbDevicesMenu;</variable>
+    <variable access="private">QIRichLabel *whatsThisLabel;</variable>
 </variables>
 <slots>
@@ -2759 +2718 @@
     <slot>cdMediaChanged()</slot>
     <slot>fdMediaChanged()</slot>
+    <slot>processAdjustSize()</slot>
 </slots>
 <functions>

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMSettingsDlg.ui.h

@@ -265 +265 @@
     connect (whatsThisTimer, SIGNAL (timeout()), this, SLOT (updateWhatsThis()));
     whatsThisCandidate = NULL;
+
+    whatsThisLabel = new QIRichLabel (this, "whatsThisLabel");
+    VBoxVMSettingsDlgLayout->addWidget (whatsThisLabel, 2, 1);
+
+    whatsThisLabel->setFocusPolicy (QWidget::NoFocus);
+    whatsThisLabel->setSizePolicy (QSizePolicy::Expanding, QSizePolicy::Fixed);
+    whatsThisLabel->setBackgroundMode (QLabel::PaletteMidlight);
+    whatsThisLabel->setFrameShape (QLabel::Box);
+    whatsThisLabel->setFrameShadow (QLabel::Sunken);
+    whatsThisLabel->setMargin (7);
+    whatsThisLabel->setScaledContents (FALSE);
+    whatsThisLabel->setAlignment (int (QLabel::WordBreak |
+                                       QLabel::AlignJustify |
+                                       QLabel::AlignTop));
+
     whatsThisLabel->setTextFormat (Qt::RichText);
-    whatsThisLabel->setMinimumHeight (whatsThisLabel->frameWidth() * 2 +
-                                      6 /* seems that RichText adds some margin */ +
-                                      whatsThisLabel->fontMetrics().lineSpacing() * 3);
+    whatsThisLabel->setFixedHeight (whatsThisLabel->frameWidth() * 2 +
+                                    6 /* seems that RichText adds some margin */ +
+                                    whatsThisLabel->fontMetrics().lineSpacing() * 3);
     whatsThisLabel->setMinimumWidth (whatsThisLabel->frameWidth() * 2 +
                                      6 /* seems that RichText adds some margin */ +
                                      whatsThisLabel->fontMetrics().width ('m') * 40);
+    connect (whatsThisLabel, SIGNAL (textChanged()), this, SLOT (processAdjustSize()));
 
     /*
@@ -655 +671 @@
 
     VBoxGlobal::centerWidget (this, parentWidget());
+}
+
+void VBoxVMSettingsDlg::processAdjustSize()
+{
+    int newHeight = minimumSize().height();
+    int oldHeight = height();
+    if (newHeight > oldHeight)
+        resize (minimumSize());
 }