[tor-commits] [vidalia/master] make main window show up properly in ratpoison with proper maximum size hint, and add pixmap + text properties properly for Qt 4.7.3+

[chiiph at torproject.org]

commit 28f6950f4ccba794c8d95ad7aaeba81c52151380
Author: mike warren <meejah at gmail.com>
Date:   Fri Jan 20 17:54:34 2012 -0700

    make main window show up properly in ratpoison with proper maximum size hint, and add pixmap + text properties properly for Qt 4.7.3+
---
 src/vidalia/MainWindow.ui |    2 +-
 src/vidalia/VClickLabel.h |    6 ++++++
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/src/vidalia/MainWindow.ui b/src/vidalia/MainWindow.ui
index 5668cdc..586af36 100644
--- a/src/vidalia/MainWindow.ui
+++ b/src/vidalia/MainWindow.ui
@@ -12,7 +12,7 @@
   <property name="maximumSize" >
    <size>
      <width>16777215</width>
-     <height>1</height>
+     <height>16777215</height>
    </size>
   </property>
   <property name="windowTitle" >
diff --git a/src/vidalia/VClickLabel.h b/src/vidalia/VClickLabel.h
index daa7559..2f3e677 100644
--- a/src/vidalia/VClickLabel.h
+++ b/src/vidalia/VClickLabel.h
@@ -40,6 +40,12 @@ public:
   /** Sets the widget's image to <b>img</b>. */
   void setPixmap(const QPixmap &img);
 
+  const QString& text() const { return _text; }
+  const QPixmap& pixmap() const { return _pixmap; }
+  
+  Q_PROPERTY(QString text READ text WRITE setText USER true);
+  Q_PROPERTY(QPixmap pixmap READ pixmap WRITE setPixmap USER true);
+
 signals:
   /** Emitted when the widget is left-clicked. */
   void clicked();