[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r3133: Switch to a simpler About dialog and move the license inform (in vidalia/trunk/src/vidalia: . about res)
Author: edmanm
Date: 2008-09-21 22:55:25 -0400 (Sun, 21 Sep 2008)
New Revision: 3133
Added:
vidalia/trunk/src/vidalia/about/licensedialog.cpp
vidalia/trunk/src/vidalia/about/licensedialog.h
vidalia/trunk/src/vidalia/about/licensedialog.ui
vidalia/trunk/src/vidalia/res/credits.html
vidalia/trunk/src/vidalia/res/license.html
Removed:
vidalia/trunk/src/vidalia/res/short_license.txt
Modified:
vidalia/trunk/src/vidalia/CMakeLists.txt
vidalia/trunk/src/vidalia/about/aboutdialog.cpp
vidalia/trunk/src/vidalia/about/aboutdialog.h
vidalia/trunk/src/vidalia/about/aboutdialog.ui
vidalia/trunk/src/vidalia/res/vidalia.qrc
Log:
Switch to a simpler About dialog and move the license information to a
separate HTML-formatted display.
Modified: vidalia/trunk/src/vidalia/CMakeLists.txt
===================================================================
--- vidalia/trunk/src/vidalia/CMakeLists.txt 2008-09-22 02:51:43 UTC (rev 3132)
+++ vidalia/trunk/src/vidalia/CMakeLists.txt 2008-09-22 02:55:25 UTC (rev 3133)
@@ -32,9 +32,11 @@
## About dialog sources
set(vidalia_SRCS
about/aboutdialog.cpp
+ about/licensedialog.cpp
)
qt4_wrap_cpp(vidalia_SRCS
about/aboutdialog.h
+ about/licensedialog.h
)
## Bandwidth graph sources
@@ -200,6 +202,7 @@
controlpasswordinputdialog.ui
mainwindow.ui
about/aboutdialog.ui
+ about/licensedialog.ui
bwgraph/bwgraph.ui
config/advancedpage.ui
config/appearancepage.ui
Modified: vidalia/trunk/src/vidalia/about/aboutdialog.cpp
===================================================================
--- vidalia/trunk/src/vidalia/about/aboutdialog.cpp 2008-09-22 02:51:43 UTC (rev 3132)
+++ vidalia/trunk/src/vidalia/about/aboutdialog.cpp 2008-09-22 02:55:25 UTC (rev 3133)
@@ -15,57 +15,49 @@
*/
#include <QFile>
+#include <QDialog>
#include <vidalia.h>
+
#include "aboutdialog.h"
+#include "licensedialog.h"
-/** Default Constructor **/
-AboutDialog::AboutDialog(QWidget *parent, Qt::WFlags flags)
-: VidaliaWindow("AboutDialog", parent, flags)
+/** Default Constructor. */
+AboutDialog::AboutDialog(QWidget *parent, Qt::WindowFlags flags)
+: QDialog(parent, Qt::CustomizeWindowHint | Qt::WindowSystemMenuHint)
{
ui.setupUi(this);
- /* Pressing 'Esc' or 'Ctrl+W' will close the window */
- setShortcut("Esc", SLOT(close()));
- setShortcut("Ctrl+W", SLOT(close()));
-
- /* Save the TorControl object to use later */
- _torControl = Vidalia::torControl();
-
/* Get Vidalia's version number */
ui.lblVidaliaVersion->setText(Vidalia::version());
/* Get Qt's version number */
ui.lblQtVersion->setText(QT_VERSION_STR);
- /* Load the brief licensing information and hide it initally */
- loadLicense();
+ /* Display the license information dialog when the "License" button
+ * is clicked. */
+ connect(ui.btnShowLicense, SIGNAL(clicked()),
+ new LicenseDialog(this), SLOT(exec()));
}
-/** Loads the license information */
-void
-AboutDialog::loadLicense()
-{
- QFile licenseFile(":/docs/short_license.txt");
- licenseFile.open(QFile::ReadOnly);
- ui.txtLicense->setPlainText(licenseFile.readAll());
- licenseFile.close();
-}
-
/** Displays the About dialog window **/
void
-AboutDialog::showWindow()
+AboutDialog::setVisible(bool visible)
{
- /* Access the TorControl object to retrieve version */
- if (_torControl->isRunning()) {
- QString version = _torControl->getTorVersionString();
- if (version.isEmpty()) {
- version = tr("<Unavailable>");
+ 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"));
}
- ui.lblTorVersion->setText(version);
- } else {
- ui.lblTorVersion->setText(tr("<Not Running>"));
}
- VidaliaWindow::showWindow();
+ adjustSize();
+ QDialog::setVisible(visible);
}
Modified: vidalia/trunk/src/vidalia/about/aboutdialog.h
===================================================================
--- vidalia/trunk/src/vidalia/about/aboutdialog.h 2008-09-22 02:51:43 UTC (rev 3132)
+++ vidalia/trunk/src/vidalia/about/aboutdialog.h 2008-09-22 02:55:25 UTC (rev 3133)
@@ -17,31 +17,22 @@
#ifndef _ABOUTDIALOG_H
#define _ABOUTDIALOG_H
-#include <torcontrol.h>
-#include <vidaliawindow.h>
+#include "licensedialog.h"
#include "ui_aboutdialog.h"
-class AboutDialog : public VidaliaWindow
+class AboutDialog : public QDialog
{
Q_OBJECT
public:
- /** Default constructor **/
- AboutDialog(QWidget *parent = 0, Qt::WFlags flags = 0);
+ /** Default constructor */
+ AboutDialog(QWidget *parent = 0, Qt::WindowFlags flags = 0);
-public slots:
- /** Overriden VidaliaWindow::showWindow() */
- void showWindow();
+ virtual void setVisible(bool visible);
private:
- /** Loads the license file */
- void loadLicense();
-
- /** Qt Designer generated QObject **/
- Ui::AboutDialog ui;
- /** TorControl for access to Tor version info **/
- TorControl *_torControl;
+ Ui::AboutDialog ui; /**< Qt Designer generated QObject **/
};
#endif
Modified: vidalia/trunk/src/vidalia/about/aboutdialog.ui
===================================================================
--- vidalia/trunk/src/vidalia/about/aboutdialog.ui 2008-09-22 02:51:43 UTC (rev 3132)
+++ vidalia/trunk/src/vidalia/about/aboutdialog.ui 2008-09-22 02:55:25 UTC (rev 3133)
@@ -1,311 +1,180 @@
<ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
<class>AboutDialog</class>
- <widget class="QMainWindow" name="AboutDialog" >
+ <widget class="QDialog" name="AboutDialog" >
+ <property name="windowModality" >
+ <enum>Qt::NonModal</enum>
+ </property>
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
- <width>500</width>
- <height>420</height>
+ <width>408</width>
+ <height>156</height>
</rect>
</property>
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="minimumSize" >
<size>
- <width>500</width>
- <height>420</height>
+ <width>0</width>
+ <height>0</height>
</size>
</property>
- <property name="contextMenuPolicy" >
- <enum>Qt::NoContextMenu</enum>
- </property>
<property name="windowTitle" >
<string>About Vidalia</string>
</property>
- <property name="windowIcon" >
- <iconset resource="../res/vidalia_common.qrc" >:/images/32x32/help-about.png</iconset>
+ <property name="modal" >
+ <bool>false</bool>
</property>
- <widget class="QWidget" name="centralwidget" >
- <layout class="QGridLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item row="0" column="0" >
- <layout class="QVBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <widget class="QLabel" name="lblVidaliaLogo" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>5</hsizetype>
- <vsizetype>0</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="contextMenuPolicy" >
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="text" >
- <string/>
- </property>
- <property name="pixmap" >
- <pixmap resource="../res/vidalia_common.qrc" >:/images/128x128/tor-on.png</pixmap>
- </property>
- <property name="alignment" >
- <set>Qt::AlignCenter</set>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="lblVidalia" >
- <property name="font" >
- <font>
- <bold>true</bold>
- </font>
- </property>
- <property name="text" >
- <string>Vidalia</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignCenter</set>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="lblVidaliaVersion" >
- <property name="text" >
- <string>Vidalia Version</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignCenter</set>
- </property>
- <property name="wordWrap" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <spacer>
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Preferred</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- <item row="0" column="2" >
- <layout class="QVBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <widget class="QLabel" name="lblQtLogo" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>5</hsizetype>
- <vsizetype>0</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="contextMenuPolicy" >
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="text" >
- <string/>
- </property>
- <property name="pixmap" >
- <pixmap resource="../res/vidalia_common.qrc" >:/images/128x128/qt-logo.png</pixmap>
- </property>
- <property name="alignment" >
- <set>Qt::AlignCenter</set>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="lblQt" >
- <property name="font" >
- <font>
- <bold>true</bold>
- </font>
- </property>
- <property name="text" >
- <string>Qt</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignCenter</set>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="lblQtVersion" >
- <property name="text" >
- <string>Qt Version</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignCenter</set>
- </property>
- <property name="wordWrap" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <spacer>
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Preferred</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- <item row="0" column="1" >
- <layout class="QVBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <widget class="QLabel" name="lblTorLogo" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>5</hsizetype>
- <vsizetype>0</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="contextMenuPolicy" >
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="text" >
- <string/>
- </property>
- <property name="pixmap" >
- <pixmap resource="../res/vidalia_common.qrc" >:/images/128x128/tor-logo.png</pixmap>
- </property>
- <property name="alignment" >
- <set>Qt::AlignCenter</set>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="lblTor" >
- <property name="font" >
- <font>
- <bold>true</bold>
- </font>
- </property>
- <property name="text" >
- <string>Tor</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignCenter</set>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="lblTorVersion" >
- <property name="text" >
- <string>Tor Version</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignCenter</set>
- </property>
- <property name="wordWrap" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <spacer>
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Preferred</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>20</width>
- <height>41</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- <item row="1" column="0" colspan="3" >
- <widget class="QTextEdit" name="txtLicense" >
- <property name="font" >
- <font>
- <pointsize>10</pointsize>
- </font>
- </property>
- <property name="contextMenuPolicy" >
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="lineWrapMode" >
- <enum>QTextEdit::FixedColumnWidth</enum>
- </property>
- <property name="lineWrapColumnOrWidth" >
- <number>78</number>
- </property>
- <property name="readOnly" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- <widget class="QStatusBar" name="statusbar" >
- <property name="geometry" >
- <rect>
- <x>0</x>
- <y>398</y>
- <width>500</width>
- <height>22</height>
- </rect>
- </property>
- </widget>
+ <layout class="QGridLayout" name="gridLayout_2" >
+ <item row="0" column="0" >
+ <widget class="QLabel" name="lblVidaliaLogo" >
+ <property name="minimumSize" >
+ <size>
+ <width>0</width>
+ <height>132</height>
+ </size>
+ </property>
+ <property name="text" >
+ <string/>
+ </property>
+ <property name="pixmap" >
+ <pixmap resource="../res/vidalia.qrc" >:/images/128x128/vidalia-logo.png</pixmap>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignCenter</set>
+ </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>
+ </layout>
</widget>
- <pixmapfunction></pixmapfunction>
<resources>
- <include location="../res/vidalia_common.qrc" />
+ <include location="../res/vidalia.qrc" />
</resources>
<connections/>
</ui>
Added: vidalia/trunk/src/vidalia/about/licensedialog.cpp
===================================================================
--- vidalia/trunk/src/vidalia/about/licensedialog.cpp (rev 0)
+++ vidalia/trunk/src/vidalia/about/licensedialog.cpp 2008-09-22 02:55:25 UTC (rev 3133)
@@ -0,0 +1,41 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not receive the LICENSE file with this file, you may obtain it from the
+** Vidalia source package distributed by the Vidalia Project at
+** http://www.vidalia-project.net/. No part of Vidalia, including this file,
+** may be copied, modified, propagated, or distributed except according to the
+** terms described in the LICENSE file.
+*/
+
+/*
+** \file licensedialog.cpp
+** \version $Id$
+** \brief Displays HTML-formatted license information for Vidalia and related
+** software.
+*/
+
+#include <QFile>
+#include <QString>
+
+#include "licensedialog.h"
+
+
+LicenseDialog::LicenseDialog(QWidget *parent)
+ : QDialog(parent)
+{
+ ui.setupUi(this);
+
+ ui.txtLicense->setHtml(loadHtml(":/docs/license.html"));
+ ui.txtCredits->setHtml(loadHtml(":/docs/credits.html"));
+}
+
+QString
+LicenseDialog::loadHtml(const QString &source) const
+{
+ QFile file(source);
+ if (! file.open(QIODevice::ReadOnly | QIODevice::Text))
+ return QString();
+ return QString(file.readAll());
+}
+
Property changes on: vidalia/trunk/src/vidalia/about/licensedialog.cpp
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: vidalia/trunk/src/vidalia/about/licensedialog.h
===================================================================
--- vidalia/trunk/src/vidalia/about/licensedialog.h (rev 0)
+++ vidalia/trunk/src/vidalia/about/licensedialog.h 2008-09-22 02:55:25 UTC (rev 3133)
@@ -0,0 +1,43 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not receive the LICENSE file with this file, you may obtain it from the
+** Vidalia source package distributed by the Vidalia Project at
+** http://www.vidalia-project.net/. No part of Vidalia, including this file,
+** may be copied, modified, propagated, or distributed except according to the
+** terms described in the LICENSE file.
+*/
+
+/*
+** \file licensedialog.h
+** \version $Id$
+** \brief Displays HTML-formatted license information for Vidalia and related
+** software.
+*/
+
+#ifndef _LICENSEDIALOG_H
+#define _LICENSEDIALOG_H
+
+#include "ui_licensedialog.h"
+
+
+class LicenseDialog : public QDialog
+{
+ Q_OBJECT
+
+public:
+ /** Default constructor.
+ */
+ LicenseDialog(QWidget *parent = 0);
+
+protected:
+ /** Reads and returns all HTML-formatted text from <b>source</b>.
+ */
+ virtual QString loadHtml(const QString &source) const;
+
+private:
+ Ui::LicenseDialog ui;
+};
+
+#endif
+
Property changes on: vidalia/trunk/src/vidalia/about/licensedialog.h
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: vidalia/trunk/src/vidalia/about/licensedialog.ui
===================================================================
--- vidalia/trunk/src/vidalia/about/licensedialog.ui (rev 0)
+++ vidalia/trunk/src/vidalia/about/licensedialog.ui 2008-09-22 02:55:25 UTC (rev 3133)
@@ -0,0 +1,152 @@
+<ui version="4.0" >
+ <class>LicenseDialog</class>
+ <widget class="QDialog" name="LicenseDialog" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>701</width>
+ <height>584</height>
+ </rect>
+ </property>
+ <property name="windowTitle" >
+ <string>License Information</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <item row="0" column="0" >
+ <layout class="QVBoxLayout" name="verticalLayout" >
+ <property name="sizeConstraint" >
+ <enum>QLayout::SetDefaultConstraint</enum>
+ </property>
+ <property name="margin" >
+ <number>12</number>
+ </property>
+ <item>
+ <widget class="QTabWidget" name="tabWidget" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="tabShape" >
+ <enum>QTabWidget::Rounded</enum>
+ </property>
+ <property name="currentIndex" >
+ <number>0</number>
+ </property>
+ <widget class="QWidget" name="tabLicense" >
+ <attribute name="title" >
+ <string>License</string>
+ </attribute>
+ <layout class="QGridLayout" name="gridLayout_2" >
+ <item row="0" column="0" >
+ <layout class="QVBoxLayout" name="verticalLayout_2" >
+ <property name="leftMargin" >
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QTextEdit" name="txtLicense" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="acceptDrops" >
+ <bool>false</bool>
+ </property>
+ <property name="undoRedoEnabled" >
+ <bool>false</bool>
+ </property>
+ <property name="readOnly" >
+ <bool>true</bool>
+ </property>
+ <property name="textInteractionFlags" >
+ <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="tabCredits" >
+ <attribute name="title" >
+ <string>Credits</string>
+ </attribute>
+ <layout class="QGridLayout" name="gridLayout_3" >
+ <item row="0" column="0" >
+ <layout class="QVBoxLayout" name="verticalLayout_3" >
+ <item>
+ <widget class="QTextEdit" name="txtCredits" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="textInteractionFlags" >
+ <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </widget>
+ </item>
+ <item>
+ <widget class="QDialogButtonBox" name="buttonBox" >
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="standardButtons" >
+ <set>QDialogButtonBox::Close</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ <resources/>
+ <connections>
+ <connection>
+ <sender>buttonBox</sender>
+ <signal>accepted()</signal>
+ <receiver>LicenseDialog</receiver>
+ <slot>accept()</slot>
+ <hints>
+ <hint type="sourcelabel" >
+ <x>248</x>
+ <y>254</y>
+ </hint>
+ <hint type="destinationlabel" >
+ <x>157</x>
+ <y>274</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>buttonBox</sender>
+ <signal>rejected()</signal>
+ <receiver>LicenseDialog</receiver>
+ <slot>reject()</slot>
+ <hints>
+ <hint type="sourcelabel" >
+ <x>316</x>
+ <y>260</y>
+ </hint>
+ <hint type="destinationlabel" >
+ <x>286</x>
+ <y>274</y>
+ </hint>
+ </hints>
+ </connection>
+ </connections>
+</ui>
Added: vidalia/trunk/src/vidalia/res/credits.html
===================================================================
--- vidalia/trunk/src/vidalia/res/credits.html (rev 0)
+++ vidalia/trunk/src/vidalia/res/credits.html 2008-09-22 02:55:25 UTC (rev 3133)
@@ -0,0 +1,69 @@
+<html>
+<body>
+<h3>Lead Developers</h3>
+<ul>
+ <li>Matt Edman</li>
+ <li>Justin Hipple (<i>retired</i>)</li>
+</ul>
+
+<h3>Contributors</h3>
+<ul>
+ <li>Domenik Bork</li>
+ <li>Ren Bucholz</li>
+ <li>Dan Christensen</li>
+ <li>DJHasis</li>
+ <li>dr|z3d</li>
+ <li>Geoff Goodell</li>
+ <li>Corinna Habets</li>
+ <li>Matt Hanson</li>
+ <li>Andrew Lewman</li>
+ <li>Steven J. Murdoch</li>
+ <li>Brandon Nase</li>
+ <li>Christoph Sieghart</li>
+ <li>Adam Tomjack</li>
+ <li>Michael Zuercher</li>
+</ul>
+
+<h3>Translators</h3>
+<table>
+ <tr><td>Amin Amini</td><td>Swedish</td></tr>
+ <tr><td>Anonymous</td><td>Hebrew</td></tr>
+ <tr><td>Ater Atrocitas</td><td>Albanian</td></tr>
+ <tr><td>Daniel Berthereau</td><td>French</td></tr>
+ <tr><td>Domenik Bork</td><td>German</td></tr>
+ <tr><td>Michel Burkhardt</td><td>French</td></tr>
+ <tr><td>Steffen Dabbert</td><td>German</td></tr>
+ <tr><td>Benessa Defend</td><td>Japanese</td></tr>
+ <tr><td>Dererk</td><td>Spanish</td></tr>
+ <tr><td>Desolator</td><td>Spanish</td></tr>
+ <tr><td>DJHasis</td><td>Finnish, Swedish</td></tr>
+ <tr><td>eight118</td><td>French</td></tr>
+ <tr><td>Tibor Fekete</td><td>Hungarian</td></tr>
+ <tr><td>Ahmad Gharbeia</td><td>Arabic</td></tr>
+ <tr><td>Mabat Haram</td><td>Portuguese</td></tr>
+ <tr><td>Hossein</td><td>Farsi</td></tr>
+ <tr><td>Yunus Kaba</td><td>Turkish</td></tr>
+ <tr><td>kutia0001</td><td>Bulgarian</td></tr>
+ <tr><td>LinHongJun</td><td>Simplified Chinese, Traditional Chinese</td></tr>
+ <tr><td>Karsten Loesing</td><td>German</td></tr>
+ <tr><td>el Mar</td><td>Czech</td></tr>
+ <tr><td>Alex Mazzariol</td><td>Italian</td></tr>
+ <tr><td>Micromus</td><td>Norwegian</td></tr>
+ <tr><td>Nardog</td><td>Japanese</td></tr>
+ <tr><td>Frederik Nosi</td><td>Albanian</td></tr>
+ <tr><td>persepolis</td><td>Farsi</td></tr>
+ <tr><td>Christoph Sieghart</td><td>German</td></tr>
+ <tr><td>Wu Xiaoguang</td><td>Simplified Chinese</td></tr>
+ <tr><td>Xiando</td><td>Norwegian</td></tr>
+ <tr><td>Ygrek</td><td>Russian</td></tr>
+ <tr><td>ZeeWolf</td><td>Polish</td></tr>
+</table>
+
+<p>
+Visit<a href="https://translation.torproject.org/";>
+https://translation.torproject.org</a> if you would like to contribute to
+Vidalia's translations.
+</p>
+
+</body>
+</html>
Property changes on: vidalia/trunk/src/vidalia/res/credits.html
___________________________________________________________________
Name: svn:eol-style
+ native
Added: vidalia/trunk/src/vidalia/res/license.html
===================================================================
--- vidalia/trunk/src/vidalia/res/license.html (rev 0)
+++ vidalia/trunk/src/vidalia/res/license.html 2008-09-22 02:55:25 UTC (rev 3133)
@@ -0,0 +1,379 @@
+<html>
+<body>
+
+<h2>Vidalia</h2>
+<p>Vidalia is distributed under the following license:</p>
+<pre>
+ Copyright (c) 2006-2007, Matt Edman, Justin Hipple
+ Copyright (c) 2007-2008, Matt Edman
+</pre>
+
+<p>
+This program 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; either version 2 of the License, or (at
+your option) any later version. The full text of versions 2 and 3 of
+the GPL can be found respectively in the files LICENSE-GPLV2 and
+LICENSE-GPLV3.
+</p>
+
+<p>
+EXCEPTION: This distribution of Vidalia may be linked against OpenSSL
+according to the terms of the section below entitled "OpenSSL Exception."
+</p>
+
+<p>
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+Public License for more details.
+</p>
+
+<p>
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+</p>
+
+<p>
+<i>OpenSSL Exception</i>
+</p>
+
+<p>0. Definitions</p>
+
+<p>
+"Vidalia" means Vidalia software licensed under version 2 or any later
+version of the GNU General Public License (collectively, "GPL"), or a
+work based on such software and licensed under the GPL.
+</p>
+<p>
+"OpenSSL" means OpenSSL toolkit software distributed by the OpenSSL
+Project and licensed under the OpenSSL Licenses, or a work based on such
+software and licensed under the OpenSSL Licenses.
+</p>
+<p>
+"OpenSSL Licenses" means the OpenSSL License and Original SSLeay License
+under which the OpenSSL Project distributes the OpenSSL toolkit software,
+as those licenses appear in the file LICENSE-OPENSSL.
+</p>
+
+<p>1. Exception</p>
+
+<p>
+You have permission to copy, modify, propagate, and distribute a work
+formed by combining OpenSSL with Vidalia, or a work derivative of such a
+combination, even if such copying, modification, propagation, or
+distribution would otherwise violate the terms of the GPL. You must
+comply with the GPL in all respects for all of the code used other than
+OpenSSL.
+</p>
+
+<p>
+You may include this OpenSSL Exception and its grant of permissions when
+you distribute Vidalia. Inclusion of this notice with such a
+distribution constitutes a grant of such permission. If you do not wish
+to grant these permissions, remove this section entitled "OpenSSL
+Exception" from your distribution.
+</p>
+
+<hr>
+
+<h3>KDE Oxygen Icon Theme</h3>
+
+<p>
+Vidalia incorporates icons from KDE's Oxygen icon theme. It is
+licensed as follows:
+</p>
+
+<pre>
+ Copyright (c) 2007 David Vignoni <david@xxxxxxxxxxxxx>
+ Copyright (c) 2007 Johann Ollivier Lapeyre <johann@xxxxxxxxxxxxxxxx>
+ Copyright (c) 2007 Kenneth Wimer <kwwii@xxxxxxxxxxxxxx>
+ Copyright (c) 2007 Nuno Fernades Pinheiro <nf.pinheiro@xxxxxxxxx>
+ Copyright (c) 2007 Riccardo Iaconelli <riccardo@xxxxxxxxxxxxxxxx>
+ Copyright (c) 2007 David Miller <miller@xxxxxxxxxxxxxxxx>
+ and others.
+</pre>
+
+<p>
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 3 of the License, or (at your option) any later version.
+</p>
+
+<p>
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Library General Public License for more details.
+</p>
+<p>
+You should have received a copy of the GNU Library General Public
+License along with this library. If not, see
+<a href="http://www.gnu.org/licenses/";>http://www.gnu.org/licenses/</a>.
+</p>
+
+<hr>
+
+<h3>MiniUPnPc</h3>
+
+<p>
+Vidalia uses the MiniUPnPc library for UPnP support. It is licensed as
+follows:
+</p>
+
+<pre>
+ Copyright (c) 2005-2007, Thomas BERNARD
+</pre>
+
+<p>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+</p>
+
+<ul>
+ <li>Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.</li>
+
+ <li>Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials
+ provided with the distribution.</li>
+
+ <li>Neither the names of the copyright owners nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.</li>
+</ul>
+
+<p>
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+</p>
+
+<hr>
+
+<h3>GeoLite City Database</h3>
+
+<p>
+Vidalia uses GeoIP data created by MaxMind, available from
+<a href="http://maxmind.com/";>http://www.maxmind.com</a>. It is licensed as
+follows:
+</p>
+
+<pre>
+ Copyright (c) 2007 MaxMind LLC. All Rights Reserved.
+</pre>
+
+<p>
+All advertising materials and documentation mentioning features or use of
+this database must display the following acknowledgment:
+"This product includes GeoLite data created by MaxMind, available from
+http://maxmind.com/";
+</p>
+
+<p>
+Redistribution and use with or without modification, are permitted provided
+that the following conditions are met:
+</p>
+<ul>
+ <li>Redistributions must retain the above copyright notice, this list of
+ conditions and the following disclaimer in the documentation and/or other
+ materials provided with the distribution.</li>
+
+ <li>All advertising materials and documentation mentioning features or use
+ of this database must display the following acknowledgement:
+ "This product includes GeoLite data created by MaxMind, available from
+ http://maxmind.com/";</li>
+
+ <li>"MaxMind" may not be used to endorse or promote products derived from
+ this database without specific prior written permission.</li>
+</ul>
+
+<p>
+THIS DATABASE IS PROVIDED BY MAXMIND.COM ``AS IS'' AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL MAXMIND.COM BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+DATABASE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+</p>
+
+<hr>
+
+<h3>Qt</h3>
+
+<p>
+Vidalia is built using the Open Source Edition of the Qt GUI toolkit from
+Trolltech. See the <a href="http://doc.trolltech.com/4.4/licenses.html";>Qt
+documentation</a> for full information on Qt's licensing terms.
+</p>
+
+<hr>
+
+<h3>Tor</h3>
+<p>The Tor software is distributed under the following license:</p>
+<pre>
+ Copyright (c) 2001-2004, Roger Dingledine
+ Copyright (c) 2004-2007, Roger Dingledine, Nick Mathewson
+ Copyright (c) 2007-2008, The Tor Project, Inc.
+</pre>
+
+<p>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+</p>
+
+<ul>
+ <li>Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.</li>
+
+ <li>Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following disclaimer
+ in the documentation and/or other materials provided with the
+ distribution.</li>
+
+ <li>Neither the names of the copyright owners nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.</li>
+</ul>
+
+<p>
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+</p>
+
+<p>
+src/common/strlcat.c and src/common/strlcpy.c by Todd C. Miller are licensed
+under the following license:
+</p>
+
+<pre>
+ Copyright (c) 1998 Todd C. Miller <Todd.Miller@xxxxxxxxxxxxx>
+ All rights reserved.
+</pre>
+
+<p>Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:</p>
+
+<ul>
+ <li>Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.</li>
+
+ <li>Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.</li>
+
+ <li>The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.</li>
+</ul>
+
+<p>
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+</p>
+
+<p>
+<i>If you got Tor as a static binary with OpenSSL included, then you should
+know: "This product includes software developed by the OpenSSL Project
+for use in the OpenSSL Toolkit (<a
+href="http://www.openssl.org/";>http://www.openssl.org/</a>)"</i>
+</p>
+
+<p>
+<i>This program uses the IP-to-Country Database provided by
+WebHosting.Info (http://www.webhosting.info), available from
+<a href="http://ip-to-country.webhosting.info";>
+http://ip-to-country.webhosting.info</a>. See the src/config/geoip file in
+particular.</i>
+</p>
+
+<hr>
+
+<h3>Tor Documentation</h3>
+
+<p>
+Some of the help documentation text used in Vidalia is derived from the TorFAQ
+Wiki <http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ>. It is licensed
+under the MIT license as follows:
+</p>
+
+<pre>
+ Copyright (c) 2003-2008 Roger Dingledine
+ Copyright (c) 2004-2005 Nick Mathewson
+ Copyright (c) 2004 Douglas F. Calvert
+</pre>
+
+<p>
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+</p>
+
+<p>
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+</p>
+
+<p>
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+</p>
+
+<hr>
+
+<p>
+ <i>This product is produced independently from the Tor anonymity
+ software and carries no guarantee from The Tor Project about
+ quality, suitability or anything else.</i>
+</p>
+<p>
+ <i>The Tor(TM) trademark and Tor Onion Logo are trademarks of
+ The Tor Project. More information about the Tor project can be
+ found at the Tor website,
+ <a href="https://www.torproject.org/";>https://www.torproject.org</a>.</i>
+</p>
+
+</body>
+</html>
Property changes on: vidalia/trunk/src/vidalia/res/license.html
___________________________________________________________________
Name: svn:eol-style
+ native
Deleted: vidalia/trunk/src/vidalia/res/short_license.txt
Modified: vidalia/trunk/src/vidalia/res/vidalia.qrc
===================================================================
--- vidalia/trunk/src/vidalia/res/vidalia.qrc 2008-09-22 02:51:43 UTC (rev 3132)
+++ vidalia/trunk/src/vidalia/res/vidalia.qrc 2008-09-22 02:55:25 UTC (rev 3133)
@@ -1,6 +1,7 @@
<RCC>
<qresource prefix="/docs">
- <file>short_license.txt</file>
+ <file>credits.html</file>
+ <file>license.html</file>
</qresource>
<qresource prefix="/images">
<file>16x16/application-exit.png</file>
@@ -99,9 +100,7 @@
<file>48x48/view-media-artist.png</file>
</qresource>
<qresource prefix="/images">
- <file>128x128/qt-logo.png</file>
- <file>128x128/tor-logo.png</file>
- <file>128x128/tor-on.png</file>
+ <file>128x128/vidalia-logo.png</file>
</qresource>
<qresource prefix="/images">
<file>icons/node-unresponsive.png</file>