[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r3498: Add a "Close" button to the About dialog since that seems to (vidalia/trunk/src/vidalia/about)
Author: edmanm
Date: 2009-01-31 21:28:32 -0500 (Sat, 31 Jan 2009)
New Revision: 3498
Modified:
vidalia/trunk/src/vidalia/about/aboutdialog.cpp
vidalia/trunk/src/vidalia/about/aboutdialog.h
vidalia/trunk/src/vidalia/about/aboutdialog.ui
Log:
Add a "Close" button to the About dialog since that seems to be a common
request. Also reorganize it a bit, remove the Tor version since you can
get that in the message log whenever you start Tor and it makes the dialog
look wonky, and move the buttons into a QDialogButtonBox so we can get
platform-appropriate button ordering and button pixmaps.
Modified: vidalia/trunk/src/vidalia/about/aboutdialog.cpp
===================================================================
--- vidalia/trunk/src/vidalia/about/aboutdialog.cpp 2009-02-01 01:15:55 UTC (rev 3497)
+++ vidalia/trunk/src/vidalia/about/aboutdialog.cpp 2009-02-01 02:28:32 UTC (rev 3498)
@@ -16,6 +16,7 @@
#include <QFile>
#include <QDialog>
+#include <QPushButton>
#include <vidalia.h>
#include "aboutdialog.h"
@@ -24,40 +25,27 @@
/** Default Constructor. */
AboutDialog::AboutDialog(QWidget *parent, Qt::WindowFlags flags)
-: QDialog(parent, Qt::CustomizeWindowHint | Qt::WindowSystemMenuHint)
+ : QDialog(parent, Qt::CustomizeWindowHint | Qt::WindowSystemMenuHint)
{
ui.setupUi(this);
+ /* Add a "License" button to the button box at the bottom */
+ QPushButton *licenseButton;
+ licenseButton = ui.buttonBox->addButton(tr("License"),
+ QDialogButtonBox::ActionRole);
+
/* Get Vidalia's version number */
- ui.lblVidaliaVersion->setText(Vidalia::version());
+ ui.lblVidaliaVersion->setText(QString("Vidalia %1").arg(Vidalia::version()));
/* Get Qt's version number */
- ui.lblQtVersion->setText(QT_VERSION_STR);
+ ui.lblQtVersion->setText(QString("Qt %1").arg(QT_VERSION_STR));
/* Display the license information dialog when the "License" button
* is clicked. */
- connect(ui.btnShowLicense, SIGNAL(clicked()),
+ connect(licenseButton, SIGNAL(clicked()),
new LicenseDialog(this), SLOT(exec()));
-}
-/** Displays the About dialog window **/
-void
-AboutDialog::setVisible(bool visible)
-{
- if (visible) {
- /* Access the TorControl object to retrieve version */
- TorControl *tc = Vidalia::torControl();
- if (tc->isRunning()) {
- QString version = tc->getTorVersionString();
- if (version.isEmpty()) {
- version = tr("Unavailable");
- }
- ui.lblTorVersion->setText(version);
- } else {
- ui.lblTorVersion->setText(tr("Not Running"));
- }
- }
- adjustSize();
- QDialog::setVisible(visible);
+ /* Close this dialog when the "Close" button is clicked */
+ connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
}
Modified: vidalia/trunk/src/vidalia/about/aboutdialog.h
===================================================================
--- vidalia/trunk/src/vidalia/about/aboutdialog.h 2009-02-01 01:15:55 UTC (rev 3497)
+++ vidalia/trunk/src/vidalia/about/aboutdialog.h 2009-02-01 02:28:32 UTC (rev 3498)
@@ -29,8 +29,6 @@
/** Default constructor */
AboutDialog(QWidget *parent = 0, Qt::WindowFlags flags = 0);
- virtual void setVisible(bool visible);
-
private:
Ui::AboutDialog ui; /**< Qt Designer generated QObject **/
};
Modified: vidalia/trunk/src/vidalia/about/aboutdialog.ui
===================================================================
--- vidalia/trunk/src/vidalia/about/aboutdialog.ui 2009-02-01 01:15:55 UTC (rev 3497)
+++ vidalia/trunk/src/vidalia/about/aboutdialog.ui 2009-02-01 02:28:32 UTC (rev 3498)
@@ -8,8 +8,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>408</width>
- <height>156</height>
+ <width>192</width>
+ <height>220</height>
</rect>
</property>
<property name="sizePolicy" >
@@ -30,8 +30,8 @@
<property name="modal" >
<bool>false</bool>
</property>
- <layout class="QGridLayout" name="gridLayout_2" >
- <item row="0" column="0" >
+ <layout class="QVBoxLayout" name="verticalLayout" >
+ <item>
<widget class="QLabel" name="lblVidaliaLogo" >
<property name="minimumSize" >
<size>
@@ -50,127 +50,45 @@
</property>
</widget>
</item>
- <item row="0" column="1" >
- <layout class="QGridLayout" name="gridLayout" >
- <item row="1" column="0" >
- <widget class="QLabel" name="lblVidalia" >
- <property name="font" >
- <font>
- <weight>75</weight>
- <bold>true</bold>
- </font>
- </property>
- <property name="text" >
- <string>Vidalia</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- </widget>
- </item>
- <item row="1" column="1" >
- <widget class="QLabel" name="lblVidaliaVersion" >
- <property name="font" >
- <font>
- <weight>75</weight>
- <italic>false</italic>
- <bold>true</bold>
- </font>
- </property>
- <property name="text" >
- <string>0.2.0</string>
- </property>
- </widget>
- </item>
- <item row="2" column="0" >
- <widget class="QLabel" name="lblTor" >
- <property name="text" >
- <string>Tor</string>
- </property>
- <property name="textFormat" >
- <enum>Qt::PlainText</enum>
- </property>
- <property name="alignment" >
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- </widget>
- </item>
- <item row="2" column="1" >
- <widget class="QLabel" name="lblTorVersion" >
- <property name="font" >
- <font>
- <italic>false</italic>
- </font>
- </property>
- <property name="text" >
- <string>0.2.0.31-alpha-dev (r123456)</string>
- </property>
- </widget>
- </item>
- <item row="3" column="0" >
- <widget class="QLabel" name="lblQt" >
- <property name="text" >
- <string>Qt</string>
- </property>
- <property name="textFormat" >
- <enum>Qt::PlainText</enum>
- </property>
- <property name="alignment" >
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- </widget>
- </item>
- <item row="3" column="1" >
- <widget class="QLabel" name="lblQtVersion" >
- <property name="font" >
- <font>
- <italic>false</italic>
- </font>
- </property>
- <property name="text" >
- <string>4.4.2</string>
- </property>
- </widget>
- </item>
- <item row="4" column="0" colspan="2" >
- <layout class="QHBoxLayout" name="horizontalLayout" >
- <item>
- <widget class="QPushButton" name="btnShowLicense" >
- <property name="text" >
- <string>License</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer" >
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0" >
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- <item row="0" column="0" >
- <spacer name="verticalSpacer" >
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0" >
- <size>
- <width>20</width>
- <height>5</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
+ <item>
+ <widget class="QLabel" name="lblVidaliaVersion" >
+ <property name="font" >
+ <font>
+ <weight>75</weight>
+ <italic>false</italic>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="text" >
+ <string>Vidalia 0.2.0</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
</item>
+ <item>
+ <widget class="QLabel" name="lblQtVersion" >
+ <property name="font" >
+ <font>
+ <italic>false</italic>
+ </font>
+ </property>
+ <property name="text" >
+ <string>Qt 4.4.2</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QDialogButtonBox" name="buttonBox" >
+ <property name="standardButtons" >
+ <set>QDialogButtonBox::Close</set>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
<resources>