Browse Source

- Improved about dialog a lot. (broke compatibility with Qt4.2, arnaud will fix this soon)

- Added a missing file for brazilian translation
adaptive-webui-19844
Christophe Dumez 18 years ago
parent
commit
6d7c15aa33
  1. BIN
      src/Icons/mascot.png
  2. 257
      src/about.ui
  3. 1
      src/about_imp.h
  4. 2
      src/icons.qrc
  5. 1
      src/lang.qrc
  6. BIN
      src/lang/qbittorrent_pt_BR.qm

BIN
src/Icons/mascot.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

257
src/about.ui

@ -1,7 +1,5 @@
<ui version="4.0" > <ui version="4.0" >
<author>Christophe Dumez</author> <author>Christophe Dumez</author>
<comment></comment>
<exportmacro></exportmacro>
<class>AboutDlg</class> <class>AboutDlg</class>
<widget class="QDialog" name="AboutDlg" > <widget class="QDialog" name="AboutDlg" >
<property name="geometry" > <property name="geometry" >
@ -12,24 +10,54 @@
<height>320</height> <height>320</height>
</rect> </rect>
</property> </property>
<property name="minimumSize" >
<size>
<width>504</width>
<height>320</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>504</width>
<height>320</height>
</size>
</property>
<property name="windowTitle" > <property name="windowTitle" >
<string>About qBittorrent</string> <string>About qBittorrent</string>
</property> </property>
<layout class="QVBoxLayout" > <layout class="QVBoxLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" > <property name="spacing" >
<number>6</number> <number>6</number>
</property> </property>
<property name="leftMargin" >
<number>9</number>
</property>
<property name="topMargin" >
<number>9</number>
</property>
<property name="rightMargin" >
<number>9</number>
</property>
<property name="bottomMargin" >
<number>9</number>
</property>
<item> <item>
<layout class="QHBoxLayout" > <layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" > <property name="spacing" >
<number>6</number> <number>6</number>
</property> </property>
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<item> <item>
<widget class="QLabel" name="logo" > <widget class="QLabel" name="logo" >
<property name="text" > <property name="text" >
@ -40,9 +68,7 @@
<item> <item>
<widget class="QLabel" name="lb_name" > <widget class="QLabel" name="lb_name" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy> <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
<hsizetype>7</hsizetype>
<vsizetype>5</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -66,44 +92,30 @@
<attribute name="title" > <attribute name="title" >
<string>About</string> <string>About</string>
</attribute> </attribute>
<layout class="QVBoxLayout" > <widget class="QLabel" name="mascot_lbl" >
<property name="margin" > <property name="geometry" >
<number>9</number> <rect>
</property> <x>380</x>
<property name="spacing" > <y>70</y>
<number>6</number> <width>94</width>
</property> <height>162</height>
<item> </rect>
<widget class="QWidget" name="widget1" >
<layout class="QVBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Expanding</enum>
</property> </property>
<property name="sizeHint" > <property name="text" >
<size> <string/>
<width>20</width>
<height>40</height>
</size>
</property> </property>
</spacer> </widget>
</item>
<item>
<widget class="QLabel" name="lb_about" > <widget class="QLabel" name="lb_about" >
<property name="geometry" >
<rect>
<x>0</x>
<y>50</y>
<width>481</width>
<height>102</height>
</rect>
</property>
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy> <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
<hsizetype>7</hsizetype>
<vsizetype>7</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -121,69 +133,63 @@ Copyright © 2006 by Christophe Dumez&lt;br>
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
</property> </property>
</widget> </widget>
</item>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
</layout>
</widget> </widget>
<widget class="QWidget" name="tab3" > <widget class="QWidget" name="tab3" >
<attribute name="title" > <attribute name="title" >
<string>Author</string> <string>Author</string>
</attribute> </attribute>
<layout class="QVBoxLayout" > <layout class="QVBoxLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" > <property name="spacing" >
<number>6</number> <number>6</number>
</property> </property>
<item> <property name="leftMargin" >
<widget class="QFrame" name="te_authors" >
<layout class="QHBoxLayout" >
<property name="margin" >
<number>9</number> <number>9</number>
</property> </property>
<property name="spacing" > <property name="topMargin" >
<number>6</number> <number>9</number>
</property>
<property name="rightMargin" >
<number>9</number>
</property> </property>
<property name="bottomMargin" >
<number>9</number>
</property>
<item>
<widget class="QFrame" name="te_authors" >
<layout class="QHBoxLayout" >
<item> <item>
<widget class="QSplitter" name="splitter" > <spacer>
<property name="orientation" > <property name="orientation" >
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<widget class="QWidget" name="widget" > <property name="sizeType" >
<layout class="QHBoxLayout" > <enum>QSizePolicy::Preferred</enum>
<property name="margin" >
<number>0</number>
</property> </property>
<property name="spacing" > <property name="sizeHint" >
<number>6</number> <size>
<width>20</width>
<height>20</height>
</size>
</property> </property>
</spacer>
</item>
<item> <item>
<layout class="QVBoxLayout" > <layout class="QVBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" > <property name="spacing" >
<number>6</number> <number>6</number>
</property> </property>
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<item> <item>
<widget class="QLabel" name="label_3" > <widget class="QLabel" name="label_3" >
<property name="font" > <property name="font" >
@ -295,13 +301,38 @@ Copyright © 2006 by Christophe Dumez&lt;br>
</layout> </layout>
</item> </item>
<item> <item>
<layout class="QVBoxLayout" > <spacer>
<property name="margin" > <property name="orientation" >
<number>0</number> <enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Preferred</enum>
</property> </property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QVBoxLayout" >
<property name="spacing" > <property name="spacing" >
<number>6</number> <number>6</number>
</property> </property>
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<item> <item>
<widget class="QLabel" name="label_2" > <widget class="QLabel" name="label_2" >
<property name="text" > <property name="text" >
@ -346,10 +377,6 @@ Copyright © 2006 by Christophe Dumez&lt;br>
</item> </item>
</layout> </layout>
</item> </item>
</layout>
</widget>
</widget>
</item>
<item> <item>
<spacer> <spacer>
<property name="orientation" > <property name="orientation" >
@ -373,12 +400,21 @@ Copyright © 2006 by Christophe Dumez&lt;br>
<string>Thanks To</string> <string>Thanks To</string>
</attribute> </attribute>
<layout class="QVBoxLayout" > <layout class="QVBoxLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" > <property name="spacing" >
<number>6</number> <number>6</number>
</property> </property>
<property name="leftMargin" >
<number>9</number>
</property>
<property name="topMargin" >
<number>9</number>
</property>
<property name="rightMargin" >
<number>9</number>
</property>
<property name="bottomMargin" >
<number>9</number>
</property>
<item> <item>
<widget class="QTextBrowser" name="te_thanks" /> <widget class="QTextBrowser" name="te_thanks" />
</item> </item>
@ -389,12 +425,21 @@ Copyright © 2006 by Christophe Dumez&lt;br>
<string>Translation</string> <string>Translation</string>
</attribute> </attribute>
<layout class="QVBoxLayout" > <layout class="QVBoxLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" > <property name="spacing" >
<number>6</number> <number>6</number>
</property> </property>
<property name="leftMargin" >
<number>9</number>
</property>
<property name="topMargin" >
<number>9</number>
</property>
<property name="rightMargin" >
<number>9</number>
</property>
<property name="bottomMargin" >
<number>9</number>
</property>
<item> <item>
<widget class="QTextBrowser" name="te_translation" > <widget class="QTextBrowser" name="te_translation" >
<property name="lineWrapMode" > <property name="lineWrapMode" >
@ -409,12 +454,21 @@ Copyright © 2006 by Christophe Dumez&lt;br>
<string>License</string> <string>License</string>
</attribute> </attribute>
<layout class="QVBoxLayout" > <layout class="QVBoxLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" > <property name="spacing" >
<number>6</number> <number>6</number>
</property> </property>
<property name="leftMargin" >
<number>9</number>
</property>
<property name="topMargin" >
<number>9</number>
</property>
<property name="rightMargin" >
<number>9</number>
</property>
<property name="bottomMargin" >
<number>9</number>
</property>
<item> <item>
<widget class="QTextBrowser" name="te_license" /> <widget class="QTextBrowser" name="te_license" />
</item> </item>
@ -425,7 +479,6 @@ Copyright © 2006 by Christophe Dumez&lt;br>
</layout> </layout>
</widget> </widget>
<layoutdefault spacing="6" margin="11" /> <layoutdefault spacing="6" margin="11" />
<pixmapfunction></pixmapfunction>
<resources/> <resources/>
<connections/> <connections/>
</ui> </ui>

1
src/about_imp.h

@ -34,6 +34,7 @@ class about : public QDialog, private Ui::AboutDlg{
setAttribute(Qt::WA_DeleteOnClose); setAttribute(Qt::WA_DeleteOnClose);
// Set icons // Set icons
logo->setPixmap(QPixmap(QString::fromUtf8(":/Icons/qbittorrent32.png"))); logo->setPixmap(QPixmap(QString::fromUtf8(":/Icons/qbittorrent32.png")));
mascot_lbl->setPixmap(QPixmap(QString::fromUtf8(":/Icons/mascot.png")));
//Title //Title
lb_name->setText("<b><h1>"+tr("qBittorrent")+" "VERSION"</h1></b>"); lb_name->setText("<b><h1>"+tr("qBittorrent")+" "VERSION"</h1></b>");
// Thanks // Thanks

2
src/icons.qrc

@ -34,6 +34,7 @@
<file>Icons/sphere.png</file> <file>Icons/sphere.png</file>
<file>Icons/sphere2.png</file> <file>Icons/sphere2.png</file>
<file>Icons/password.png</file> <file>Icons/password.png</file>
<file>Icons/mascot.png</file>
<file>Icons/unavailable.png</file> <file>Icons/unavailable.png</file>
<file>Icons/flags/portugal.png</file> <file>Icons/flags/portugal.png</file>
<file>Icons/flags/france.png</file> <file>Icons/flags/france.png</file>
@ -60,6 +61,7 @@
<file>Icons/flags/denmark.png</file> <file>Icons/flags/denmark.png</file>
<file>Icons/flags/japan.png</file> <file>Icons/flags/japan.png</file>
<file>Icons/flags/hungary.png</file> <file>Icons/flags/hungary.png</file>
<file>Icons/flags/brazil.png</file>
<file>Icons/skin/properties.png</file> <file>Icons/skin/properties.png</file>
<file>Icons/skin/play_all.png</file> <file>Icons/skin/play_all.png</file>
<file>Icons/skin/remove.png</file> <file>Icons/skin/remove.png</file>

1
src/lang.qrc

@ -25,5 +25,6 @@
<file>lang/qbittorrent_da.qm</file> <file>lang/qbittorrent_da.qm</file>
<file>lang/qbittorrent_ja.qm</file> <file>lang/qbittorrent_ja.qm</file>
<file>lang/qbittorrent_hu.qm</file> <file>lang/qbittorrent_hu.qm</file>
<file>lang/qbittorrent_pt_BR.qm</file>
</qresource> </qresource>
</RCC> </RCC>

BIN
src/lang/qbittorrent_pt_BR.qm

Binary file not shown.
Loading…
Cancel
Save