diff --git a/src/about.ui b/src/about.ui index 407302238..90029a5be 100644 --- a/src/about.ui +++ b/src/about.ui @@ -105,10 +105,10 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:10pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'DejaVu Sans';">An advanced BitTorrent client programmed in C++, based on Qt4 toolkit and libtorrent-rasterbar. <br /><br />Copyright ©2006-2011 Christophe Dumez<br /><br /></span><span style=" font-family:'DejaVu Sans'; text-decoration: underline;">Home Page:</span><span style=" font-family:'DejaVu Sans';"> </span><a href="http://www.qbittorrent.org"><span style=" font-family:'Sans'; text-decoration: underline; color:#0057ae;">http://www.qbittorrent.org</span></a></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'DejaVu Sans'; text-decoration: underline;">Bug Tracker:</span><span style=" font-family:'DejaVu Sans';"> </span><a href="http://bugs.qbittorrent.org"><span style=" text-decoration: underline; color:#0057ae;">http://bugs.qbittorrent.org</span></a><span style=" font-family:'DejaVu Sans';"><br /></span><span style=" font-family:'DejaVu Sans'; text-decoration: underline;">Forum:</span><span style=" font-family:'DejaVu Sans';"> </span><a href="http://forum.qbittorrent.org"><span style=" font-family:'Sans'; text-decoration: underline; color:#0057ae;">http://forum.qbittorrent.org</span></a></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'DejaVu Sans'; text-decoration: underline;">IRC:</span><span style=" font-family:'DejaVu Sans';"> #qbittorrent on Freenode</span></p></body></html> +</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">An advanced BitTorrent client programmed in C++, based on Qt4 toolkit and libtorrent-rasterbar. <br /><br />Copyright ©2006-2012 Christophe Dumez<br /><br />Home Page: <a href="http://www.qbittorrent.org"><span style=" text-decoration: underline; color:#0000ff;">http://www.qbittorrent.org</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Bug Tracker: <a href="http://bugs.qbittorrent.org"><span style=" text-decoration: underline; color:#0000ff;">http://bugs.qbittorrent.org</span></a><br />Forum: <a href="http://forum.qbittorrent.org"><span style=" text-decoration: underline; color:#0000ff;">http://forum.qbittorrent.org</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">IRC: #qbittorrent on Freenode</p></body></html> Qt::RichText @@ -144,13 +144,7 @@ p, li { white-space: pre-wrap; } - Sans Serif - 9 - 50 - false - false true - false @@ -182,13 +176,7 @@ p, li { white-space: pre-wrap; } - Sans Serif - 9 - 50 - false - false true - false @@ -207,13 +195,7 @@ p, li { white-space: pre-wrap; } - Sans Serif - 9 - 50 - false - false true - false diff --git a/src/downloadfromurldlg.ui b/src/downloadfromurldlg.ui index 0c253ee29..bb706a0ba 100644 --- a/src/downloadfromurldlg.ui +++ b/src/downloadfromurldlg.ui @@ -14,31 +14,14 @@ Download from urls - - 6 - - - 9 - - - 6 - - - 0 - - Sans Serif - 12 75 - false true - false - false @@ -65,13 +48,7 @@ - Sans Serif - 9 - 50 true - false - false - false @@ -81,12 +58,6 @@ - - 6 - - - 0 - diff --git a/src/login.ui b/src/login.ui index 21387387f..63a9125d2 100644 --- a/src/login.ui +++ b/src/login.ui @@ -1,10 +1,8 @@ - - - - + + authentication - - + + 0 0 @@ -12,57 +10,40 @@ 231 - + Tracker authentication - - - 9 - - - 6 - + - - - 0 - - - 6 - + - - + + 39 39 - + - - + + 16777215 39 - + - Sans Serif - 13 75 - false true - false - false - + Tracker authentication @@ -70,51 +51,29 @@ - - - 0 - - - 6 - + - - + + - Sans Serif - 9 75 - false true - false - false - + Tracker: - - + + 220 0 - - - Sans Serif - 9 - 75 - false - true - false - false - - - + @@ -122,67 +81,49 @@ - - + + Login - - - 9 - - - 6 - + - - - 0 - - - 6 - + - - + + Username: - + lineUsername - + - - - 0 - - - 6 - + - - + + 68 0 - + Password: - + linePasswd - - + + QLineEdit::Password @@ -193,19 +134,13 @@ - - - 0 - - - 6 - + - + Qt::Horizontal - + 40 20 @@ -214,25 +149,25 @@ - - + + Log in - - + + Cancel - + Qt::Horizontal - + 40 20 @@ -244,7 +179,6 @@ - @@ -253,11 +187,11 @@ authentication reject() - + 245 195 - + 179 230 @@ -269,11 +203,11 @@ loginButton click() - + 139 158 - + 122 199 @@ -285,11 +219,11 @@ linePasswd setFocus() - + 199 130 - + 198 157 diff --git a/src/preferences/options.ui b/src/preferences/options.ui index b858fab57..b8b145cbc 100644 --- a/src/preferences/options.ui +++ b/src/preferences/options.ui @@ -177,8 +177,8 @@ 0 0 - 494 - 649 + 486 + 626 @@ -217,7 +217,6 @@ - 8 true @@ -516,8 +515,8 @@ 0 0 - 507 - 930 + 482 + 952 @@ -976,8 +975,8 @@ 0 0 - 494 - 520 + 474 + 577 @@ -1419,9 +1418,9 @@ 0 - -40 - 494 - 454 + 0 + 395 + 480 @@ -1832,8 +1831,8 @@ 0 0 - 556 - 516 + 557 + 555 @@ -2243,8 +2242,8 @@ 0 0 - 453 - 549 + 426 + 611 diff --git a/src/preview.ui b/src/preview.ui index 92bca6266..fa0d015ff 100644 --- a/src/preview.ui +++ b/src/preview.ui @@ -1,10 +1,8 @@ - - - - + + preview - - + + 0 0 @@ -12,82 +10,65 @@ 256 - + Preview selection - - - 9 - - - 6 - + - - + + 0 37 - + 16777215 37 - + - Sans Serif - 14 75 - false true - false - false - + File preview - + Qt::AlignHCenter|Qt::AlignTop - - + + 16777215 42 - - The following files support previewing, <br>please select one of them: + + The following files support previewing, <br>please select one of them: - + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - + - - - 0 - - - 6 - + - + Qt::Horizontal - + 40 20 @@ -96,25 +77,25 @@ - - + + Preview - - + + Cancel - + Qt::Horizontal - + 40 20 @@ -126,7 +107,6 @@ - @@ -135,11 +115,11 @@ preview reject() - + 296 245 - + 179 282 diff --git a/src/properties/propertieswidget.ui b/src/properties/propertieswidget.ui index 600ca4224..73cb212bc 100644 --- a/src/properties/propertieswidget.ui +++ b/src/properties/propertieswidget.ui @@ -10,11 +10,6 @@ 274 - - - 8 - - Form @@ -28,7 +23,7 @@ - 1 + 0 @@ -54,8 +49,8 @@ 0 0 - 531 - 395 + 534 + 451 @@ -557,10 +552,11 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Cantarell'; font-size:8pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'Lucida Grande'; font-size:8pt; font-weight:400; font-style:normal;"> <table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> <tr> <td style="border: none;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Cantarell';"></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans';"></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans';"></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu';"></p> @@ -681,12 +677,6 @@ p, li { white-space: pre-wrap; } - - 6 - - - 0 - diff --git a/src/properties/proptabbar.cpp b/src/properties/proptabbar.cpp index 189cab852..65aa5af39 100644 --- a/src/properties/proptabbar.cpp +++ b/src/properties/proptabbar.cpp @@ -36,50 +36,29 @@ #include "proptabbar.h" #include "iconprovider.h" -#ifdef Q_WS_MAC -#define DEFAULT_BUTTON_CSS "QPushButton {border: 1px solid #888;border-radius: 2px; padding: 4px; margin-left: 0px; margin-right: 8px;}" -#define SELECTED_BUTTON_CSS "QPushButton {border: 1px solid #888;border-radius: 2px; padding: 4px;background-color: palette(highlight); color: palette(highlighted-text); margin-left: 0px; margin-right: 8px;}" -#else -#define DEFAULT_BUTTON_CSS "QPushButton {border: 1px solid #888;border-radius: 2px; padding: 4px; margin-left: 0px; margin-right: 3px;}" -#define SELECTED_BUTTON_CSS "QPushButton {border: 1px solid #888;border-radius: 2px; padding: 4px;background-color: palette(highlight); color: palette(highlighted-text); margin-left: 0px; margin-right: 3px;}" -#endif - -const int BTN_ICON_SIZE = 16; - PropTabBar::PropTabBar(QWidget *parent) : QHBoxLayout(parent), m_currentIndex(-1) { m_btnGroup = new QButtonGroup(this); - setContentsMargins(0, 4, 0, 4); // General tab QPushButton *main_infos_button = new QPushButton(IconProvider::instance()->getIcon("document-properties"), tr("General"), parent); main_infos_button->setShortcut(QKeySequence(QString::fromUtf8("Alt+P"))); - main_infos_button->setStyleSheet(DEFAULT_BUTTON_CSS); - main_infos_button->setIconSize(QSize(BTN_ICON_SIZE, BTN_ICON_SIZE)); addWidget(main_infos_button); m_btnGroup->addButton(main_infos_button, MAIN_TAB); // Trackers tab QPushButton *trackers_button = new QPushButton(IconProvider::instance()->getIcon("network-server"), tr("Trackers"), parent); - trackers_button->setStyleSheet(DEFAULT_BUTTON_CSS); - trackers_button->setIconSize(QSize(BTN_ICON_SIZE, BTN_ICON_SIZE)); addWidget(trackers_button); m_btnGroup->addButton(trackers_button, TRACKERS_TAB); // Peers tab QPushButton *peers_button = new QPushButton(IconProvider::instance()->getIcon("edit-find-user"), tr("Peers"), parent); - peers_button->setStyleSheet(DEFAULT_BUTTON_CSS); - peers_button->setIconSize(QSize(BTN_ICON_SIZE, BTN_ICON_SIZE)); addWidget(peers_button); m_btnGroup->addButton(peers_button, PEERS_TAB); // URL seeds tab QPushButton *urlseeds_button = new QPushButton(IconProvider::instance()->getIcon("network-server"), tr("HTTP Sources"), parent); - urlseeds_button->setStyleSheet(DEFAULT_BUTTON_CSS); - urlseeds_button->setIconSize(QSize(BTN_ICON_SIZE, BTN_ICON_SIZE)); addWidget(urlseeds_button); m_btnGroup->addButton(urlseeds_button, URLSEEDS_TAB); // Files tab QPushButton *files_button = new QPushButton(IconProvider::instance()->getIcon("inode-directory"), tr("Content"), parent); - files_button->setStyleSheet(DEFAULT_BUTTON_CSS); - files_button->setIconSize(QSize(BTN_ICON_SIZE, BTN_ICON_SIZE)); addWidget(files_button); m_btnGroup->addButton(files_button, FILES_TAB); // Spacer @@ -108,7 +87,7 @@ void PropTabBar::setCurrentIndex(int index) // If asked to hide or if the currently selected tab is clicked if (index < 0 || m_currentIndex == index) { if (m_currentIndex >= 0) { - m_btnGroup->button(m_currentIndex)->setStyleSheet(DEFAULT_BUTTON_CSS); + m_btnGroup->button(m_currentIndex)->setDown(false); m_currentIndex = -1; emit visibilityToggled(false); } @@ -116,13 +95,13 @@ void PropTabBar::setCurrentIndex(int index) } // Unselect previous tab if (m_currentIndex >= 0) { - m_btnGroup->button(m_currentIndex)->setStyleSheet(DEFAULT_BUTTON_CSS); + m_btnGroup->button(m_currentIndex)->setDown(false); } else { // Nothing was selected, show! emit visibilityToggled(true); } // Select the new button - m_btnGroup->button(index)->setStyleSheet(SELECTED_BUTTON_CSS); + m_btnGroup->button(index)->setDown(true); m_currentIndex = index; // Emit the signal emit tabChanged(index); diff --git a/src/torrentcreator/createtorrent.ui b/src/torrentcreator/createtorrent.ui index d68ecaffb..7d13dff05 100644 --- a/src/torrentcreator/createtorrent.ui +++ b/src/torrentcreator/createtorrent.ui @@ -30,13 +30,8 @@ - Sans Serif - 14 75 - false true - false - false @@ -259,12 +254,6 @@ - - 6 - - - 0 -