diff --git a/src/GUI.cpp b/src/GUI.cpp
index fe4b0ec40..bef4e3b84 100644
--- a/src/GUI.cpp
+++ b/src/GUI.cpp
@@ -63,6 +63,7 @@
#include "httpserver.h"
#include "torrentPersistentData.h"
#include "TransferListFiltersWidget.h"
+#include "propertieswidget.h"
using namespace libtorrent;
@@ -137,13 +138,16 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), dis
qDebug("create tabWidget");
tabs = new QTabWidget();
vSplitter = new QSplitter(Qt::Horizontal);
+ hSplitter = new QSplitter(Qt::Vertical, vSplitter);
// Transfer List tab
+ properties = new PropertiesWidget(hSplitter);
transferList = new TransferListWidget(vSplitter, BTSession);
transferListFilters = new TransferListFiltersWidget(vSplitter, transferList);
-
+ hSplitter->addWidget(transferList);
+ hSplitter->addWidget(properties);
vSplitter->addWidget(transferListFilters);
- vSplitter->addWidget(transferList);
+ vSplitter->addWidget(hSplitter);
tabs->addTab(vSplitter, QIcon(QString::fromUtf8(":/Icons/oxygen/folder-remote.png")), tr("Transfers"));
vboxLayout->addWidget(tabs);
@@ -274,6 +278,8 @@ GUI::~GUI() {
delete searchEngine;
delete transferListFilters;
delete transferList;
+ delete properties;
+ delete hSplitter;
delete vSplitter;
delete checkConnect;
qDebug("1");
diff --git a/src/GUI.h b/src/GUI.h
index 1cc7dee8d..effe8dfc6 100644
--- a/src/GUI.h
+++ b/src/GUI.h
@@ -58,6 +58,7 @@ class QFrame;
class TransferListWidget;
class TransferListFiltersWidget;
class QSplitter;
+class PropertiesWidget;
class GUI : public QMainWindow, private Ui::MainWindow{
Q_OBJECT
@@ -76,7 +77,9 @@ class GUI : public QMainWindow, private Ui::MainWindow{
QMenu *myTrayIconMenu;
TransferListWidget *transferList;
TransferListFiltersWidget *transferListFilters;
+ PropertiesWidget *properties;
QSplitter *vSplitter;
+ QSplitter *hSplitter;
QLabel *connecStatusLblIcon;
bool systrayIntegration;
bool displaySpeedInTitle;
diff --git a/src/Icons/oxygen/help-about.png b/src/Icons/oxygen/help-about.png
new file mode 100644
index 000000000..e1eb7972d
Binary files /dev/null and b/src/Icons/oxygen/help-about.png differ
diff --git a/src/Icons/oxygen/network-server.png b/src/Icons/oxygen/network-server.png
new file mode 100644
index 000000000..d2a954d44
Binary files /dev/null and b/src/Icons/oxygen/network-server.png differ
diff --git a/src/Icons/oxygen/peer.png b/src/Icons/oxygen/peer.png
new file mode 100644
index 000000000..c974107d2
Binary files /dev/null and b/src/Icons/oxygen/peer.png differ
diff --git a/src/Icons/oxygen/urlseed.png b/src/Icons/oxygen/urlseed.png
new file mode 100644
index 000000000..d0746f663
Binary files /dev/null and b/src/Icons/oxygen/urlseed.png differ
diff --git a/src/icons.qrc b/src/icons.qrc
index e014c332b..e70126d52 100644
--- a/src/icons.qrc
+++ b/src/icons.qrc
@@ -91,6 +91,7 @@
Icons/oxygen/gear.png
Icons/oxygen/draw-triangle2.png
Icons/oxygen/remove.png
+ Icons/oxygen/peer.png
Icons/oxygen/browse.png
Icons/oxygen/unsubscribe16.png
Icons/oxygen/subscribe.png
@@ -104,9 +105,12 @@
Icons/oxygen/list-remove.png
Icons/oxygen/connection.png
Icons/oxygen/bug.png
+ Icons/oxygen/help-about.png
Icons/oxygen/list-add.png
+ Icons/oxygen/network-server.png
Icons/oxygen/application-x-kgetlist.png
Icons/oxygen/folder.png
+ Icons/oxygen/urlseed.png
Icons/oxygen/edit-cut.png
Icons/oxygen/unsubscribe.png
Icons/oxygen/draw-rectangle.png
diff --git a/src/propertiesWidget.ui b/src/propertiesWidget.ui
new file mode 100644
index 000000000..759207441
--- /dev/null
+++ b/src/propertiesWidget.ui
@@ -0,0 +1,487 @@
+
+
+ PropertiesWidget
+
+
+
+ 0
+ 0
+ 756
+ 300
+
+
+
+ Form
+
+
+ -
+
+
+ 0
+
+
+
+
-
+
+
-
+
+
+
+ 75
+ true
+
+
+
+ Torrent information
+
+
+
-
+
+
-
+
+
+
+ 50
+ false
+
+
+
+ Save path:
+
+
+
+ -
+
+
+
+ 50
+ false
+
+
+
+ Creator:
+
+
+
+ -
+
+
+
+ 50
+ false
+
+
+
+ Torrent hash:
+
+
+
+ -
+
+
+
+ 50
+ false
+
+
+
+ Comment:
+
+
+
+
+
+ -
+
+
-
+
+
-
+
+
+
+
+
+
+ -
+
+
+
+ 27
+ 16777215
+
+
+
+
+ 50
+ false
+
+
+
+ ...
+
+
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+ 50
+ false
+
+
+
+
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 185
+ 20
+
+
+
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 115
+
+
+
+
+ Sans Serif
+ 9
+ 75
+ false
+ true
+ false
+ false
+
+
+
+ Current session
+
+
+
+ 6
+
+
+ 9
+
+
-
+
+
+ 6
+
+
+ 0
+
+
-
+
+
+ 6
+
+
+ 0
+
+
-
+
+
+
+ Sans Serif
+ 9
+ 50
+ false
+ false
+ false
+ false
+
+
+
+ Total uploaded:
+
+
+
+ -
+
+
+
+ Sans Serif
+ 9
+ 50
+ false
+ false
+ false
+ false
+
+
+
+ Total downloaded:
+
+
+
+ -
+
+
+
+ Sans Serif
+ 9
+ 50
+ false
+ false
+ false
+ false
+
+
+
+ Share ratio:
+
+
+
+ -
+
+
+
+ Sans Serif
+ 9
+ 50
+ false
+ false
+ false
+ false
+
+
+
+ Total failed:
+
+
+
+
+
+ -
+
+
+ 6
+
+
+ 0
+
+
-
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 181
+ 20
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+ 0
+ 50
+
+
+
+
+ 75
+ true
+
+
+
+ Downloaded pieces
+
+
+
+ -
+
+
+
+ Sans Serif
+ 9
+ 50
+ false
+ false
+ false
+ false
+
+
+
+ Download in correct order (slower but good for previewing)
+
+
+
+
+
+
+
+
+ -
+
+
-
+
+
+ General
+
+
+
+ :/Icons/oxygen/help-about.png:/Icons/oxygen/help-about.png
+
+
+
+ 16
+ 16
+
+
+
+
+ -
+
+
+ Trackers
+
+
+
+ :/Icons/oxygen/network-server.png:/Icons/oxygen/network-server.png
+
+
+
+ 16
+ 16
+
+
+
+
+ -
+
+
+ URL seeds
+
+
+
+ :/Icons/oxygen/urlseed.png:/Icons/oxygen/urlseed.png
+
+
+
+ 16
+ 16
+
+
+
+
+ -
+
+
+ Files
+
+
+
+ :/Icons/oxygen/folder.png:/Icons/oxygen/folder.png
+
+
+
+ 16
+ 16
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/propertieswidget.cpp b/src/propertieswidget.cpp
new file mode 100644
index 000000000..4a1b573f3
--- /dev/null
+++ b/src/propertieswidget.cpp
@@ -0,0 +1,39 @@
+/*
+ * Bittorrent Client using Qt4 and libtorrent.
+ * Copyright (C) 2006 Christophe Dumez
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * In addition, as a special exception, the copyright holders give permission to
+ * link this program with the OpenSSL project's "OpenSSL" library (or with
+ * modified versions of it that use the same license as the "OpenSSL" library),
+ * and distribute the linked executables. You must obey the GNU General Public
+ * License in all respects for all of the code used other than "OpenSSL". If you
+ * modify file(s), you may extend this exception to your version of the file(s),
+ * but you are not obligated to do so. If you do not wish to do so, delete this
+ * exception statement from your version.
+ *
+ * Contact : chris@qbittorrent.org
+ */
+
+#include "propertieswidget.h"
+
+PropertiesWidget::PropertiesWidget(QWidget *parent): QWidget(parent) {
+ setupUi(this);
+}
+
+PropertiesWidget::~PropertiesWidget() {
+
+}
diff --git a/src/propertieswidget.h b/src/propertieswidget.h
new file mode 100644
index 000000000..f439a93d2
--- /dev/null
+++ b/src/propertieswidget.h
@@ -0,0 +1,44 @@
+/*
+ * Bittorrent Client using Qt4 and libtorrent.
+ * Copyright (C) 2006 Christophe Dumez
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * In addition, as a special exception, the copyright holders give permission to
+ * link this program with the OpenSSL project's "OpenSSL" library (or with
+ * modified versions of it that use the same license as the "OpenSSL" library),
+ * and distribute the linked executables. You must obey the GNU General Public
+ * License in all respects for all of the code used other than "OpenSSL". If you
+ * modify file(s), you may extend this exception to your version of the file(s),
+ * but you are not obligated to do so. If you do not wish to do so, delete this
+ * exception statement from your version.
+ *
+ * Contact : chris@qbittorrent.org
+ */
+
+#ifndef PROPERTIESWIDGET_H
+#define PROPERTIESWIDGET_H
+
+#include
+#include "ui_propertiesWidget.h"
+
+class PropertiesWidget : public QWidget, private Ui::PropertiesWidget {
+ Q_OBJECT
+public:
+ PropertiesWidget(QWidget *parent);
+ ~PropertiesWidget();
+};
+
+#endif // PROPERTIESWIDGET_H
diff --git a/src/src.pro b/src/src.pro
index c8b9dbd86..46288d5da 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -184,7 +184,8 @@ HEADERS += GUI.h \
supportedEngines.h \
TransferListWidget.h \
TransferListDelegate.h \
- TransferListFiltersWidget.h
+ TransferListFiltersWidget.h \
+ propertieswidget.h
FORMS += MainWindow.ui \
options.ui \
about.ui \
@@ -202,7 +203,8 @@ FORMS += MainWindow.ui \
pluginSource.ui \
trackersAdd.ui \
console.ui \
- FeedDownloader.ui
+ FeedDownloader.ui \
+ propertiesWidget.ui
SOURCES += GUI.cpp \
main.cpp \
options_imp.cpp \
@@ -225,5 +227,6 @@ SOURCES += GUI.cpp \
SearchTab.cpp \
ico.cpp \
rss.cpp \
- TransferListWidget.cpp
+ TransferListWidget.cpp \
+ propertieswidget.cpp
DESTDIR = .