Changeset 6166

Timestamp:

04/22/08 04:18:22 (7 months ago)

Author:

flynd

Message:

Reduce height of view event dialog and hide buttons when non of them are enabled.

Location:

trunk/qt4-gui/src

Files:

• userevents/userviewevent.cpp (modified) (4 diffs)
• userevents/userviewevent.h (modified) (2 diffs)
• widgets/mlview.cpp (modified) (3 diffs)
• widgets/mlview.h (modified) (2 diffs)

trunk/qt4-gui/src/userevents/userviewevent.cpp

@@ -82 +82 @@
 
   myMessageView = new MLView();
+  myMessageView->setSizeHintLines(5);
   myReadSplitter->addWidget(myMessageView);
 
@@ -92 +93 @@
       SLOT(sentEvent(ICQEvent*)));
 
-  QGroupBox* h_action = new QGroupBox();
+  myActionsBox = new QGroupBox();
   myMainWidget->addSpacing(10);
-  myMainWidget->addWidget(h_action);
-
-  QHBoxLayout* h_action_lay = new QHBoxLayout(h_action);
+  myMainWidget->addWidget(myActionsBox);
+
+  QHBoxLayout* h_action_lay = new QHBoxLayout(myActionsBox);
 
   myRead1Button = new QPushButton();
@@ -637 +638 @@
   myRead3Button->setText("");
   myRead4Button->setText("");
-  myRead1Button->setEnabled(false);
-  myRead2Button->setEnabled(false);
-  myRead3Button->setEnabled(false);
-  myRead4Button->setEnabled(false);
   myEncoding->setEnabled(true);
 
@@ -763 +760 @@
   }  // if
 
-  if (!myRead1Button->text().isEmpty())
-    myRead1Button->setEnabled(true);
-  if (!myRead2Button->text().isEmpty())
-    myRead2Button->setEnabled(true);
-  if (!myRead3Button->text().isEmpty())
-    myRead3Button->setEnabled(true);
-  if (!myRead4Button->text().isEmpty())
-    myRead4Button->setEnabled(true);
+  myRead1Button->setEnabled(!myRead1Button->text().isEmpty());
+  myRead2Button->setEnabled(!myRead2Button->text().isEmpty());
+  myRead3Button->setEnabled(!myRead3Button->text().isEmpty());
+  myRead4Button->setEnabled(!myRead4Button->text().isEmpty());
+
+  myActionsBox->setVisible(
+      myRead1Button->isEnabled() || myRead2Button->isEnabled() ||
+      myRead3Button->isEnabled() || myRead4Button->isEnabled());
 
   myRead1Button->setFocus();

trunk/qt4-gui/src/userevents/userviewevent.h

@@ -25 +25 @@
 
 class QCheckBox;
+class QGroupBox;
 class QPushButton;
 class QSplitter;
@@ -54 +55 @@
   CUserEvent* myCurrentEvent;
   QCheckBox* myAutoCloseCheck;
+  QGroupBox* myActionsBox;
   QPushButton* myRead1Button;
   QPushButton* myRead2Button;

trunk/qt4-gui/src/widgets/mlview.cpp

@@ -34 +34 @@
 
 #include "config/emoticons.h"
+#include "config/general.h"
 #include "core/licqgui.h"
 
@@ -46 +47 @@
   setWordWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere);
   connect(this, SIGNAL(selectionChanged()), SLOT(slotCopy()));
+
+  updateFont();
+  connect(Config::General::instance(), SIGNAL(fontChanged()), SLOT(updateFont()));
 }
 
@@ -358 +362 @@
   return textCursor().selectedText();
 }
+
+void MLView::updateFont()
+{
+  setFont(Config::General::instance()->editFont());
+
+  // Get height of current font
+  myFontHeight = fontMetrics().height();
+
+  // Set minimum height of text area to one line of text.
+  setMinimumHeight(heightForLines(1));
+}
+
+int MLView::heightForLines(int lines) const
+{
+  // We need to add frame width and the added height of the scroll area as
+  // we're calculating height for the widget, not the viewport.
+  return lines*myFontHeight + height() - viewport()->height() + 2 * frameWidth();
+}
+
+void MLView::setSizeHintLines(int lines)
+{
+  myLinesHint = lines;
+}
+
+QSize MLView::sizeHint() const
+{
+  QSize s = QTextBrowser::sizeHint();
+  if (myLinesHint > 0)
+    s.setHeight(heightForLines(myLinesHint));
+  return s;
+}

trunk/qt4-gui/src/widgets/mlview.h

@@ -46 +46 @@
   static QString toRichText(const QString& s, bool highlightURLs = false, bool useHTML = false, QRegExp highlight = QRegExp());
 
+  /**
+   * Caclulate height for widget to fit a specified number of lines with
+   * current font
+   *
+   * @param lines Number of text lines to calculate for
+   * @return Widget height in pixels
+   */
+  int heightForLines(int lines) const;
+
+  /**
+   * Set size hint as number of lines of text
+   *
+   * @param lines Lines of text that should be visible
+   */
+  void setSizeHintLines(int lines);
+
+  /**
+   * Get recommended widget size
+   *
+   * @return Recommended size
+   */
+  QSize sizeHint() const;
+
 protected:
   virtual void contextMenuEvent(QContextMenuEvent* event);
@@ -56 +79 @@
   void slotCopyUrl();
   void makeQuote();
+  void updateFont();
 
 private:
   bool m_handleLinks;
   QString m_url;
+  int myFontHeight;
+  int myLinesHint;
 
 signals: