diff --git a/src/Icons/add_file.png b/src/Icons/add_file.png
deleted file mode 100644
index a5f69ca61..000000000
Binary files a/src/Icons/add_file.png and /dev/null differ
diff --git a/src/Icons/add_folder.png b/src/Icons/add_folder.png
deleted file mode 100644
index 8a8919fa6..000000000
Binary files a/src/Icons/add_folder.png and /dev/null differ
diff --git a/src/Icons/oxygen/document-new.png b/src/Icons/oxygen/document-new.png
new file mode 100644
index 000000000..fbb4ce058
Binary files /dev/null and b/src/Icons/oxygen/document-new.png differ
diff --git a/src/Icons/oxygen/folder-new.png b/src/Icons/oxygen/folder-new.png
new file mode 100644
index 000000000..bd34174a3
Binary files /dev/null and b/src/Icons/oxygen/folder-new.png differ
diff --git a/src/Icons/oxygen/remove.png b/src/Icons/oxygen/remove.png
new file mode 100755
index 000000000..e3a4422e7
Binary files /dev/null and b/src/Icons/oxygen/remove.png differ
diff --git a/src/createtorrent.ui b/src/createtorrent.ui
index 15fd310c2..8be9532a3 100644
--- a/src/createtorrent.ui
+++ b/src/createtorrent.ui
@@ -62,22 +62,22 @@
-
- Add a file
+ Add file
- :/Icons/add_file.png:/Icons/add_file.png
+ :/Icons/oxygen/document-new.png:/Icons/oxygen/document-new.png
-
- Add a folder
+ Add folder
- :/Icons/add_folder.png:/Icons/add_folder.png
+ :/Icons/oxygen/folder-new.png:/Icons/oxygen/folder-new.png
diff --git a/src/icons.qrc b/src/icons.qrc
index 358f61c1e..1459dab54 100644
--- a/src/icons.qrc
+++ b/src/icons.qrc
@@ -6,10 +6,8 @@
Icons/sphere2.png
Icons/downarrow.png
Icons/url.png
- Icons/add_folder.png
Icons/locale.png
Icons/loading.png
- Icons/add_file.png
Icons/magnet.png
Icons/sphere.png
Icons/uparrow.png
@@ -76,6 +74,7 @@
Icons/oxygen/view-refresh.png
Icons/oxygen/file.png
Icons/oxygen/time.png
+ Icons/oxygen/folder-new.png
Icons/oxygen/edit-paste.png
Icons/oxygen/proxy.png
Icons/oxygen/log.png
@@ -88,11 +87,13 @@
Icons/oxygen/edit_clear.png
Icons/oxygen/download.png
Icons/oxygen/gear.png
+ Icons/oxygen/remove.png
Icons/oxygen/browse.png
Icons/oxygen/unsubscribe16.png
Icons/oxygen/subscribe.png
Icons/oxygen/edit-copy.png
Icons/oxygen/bt_settings.png
+ Icons/oxygen/document-new.png
Icons/oxygen/webui.png
Icons/oxygen/list-remove.png
Icons/oxygen/connection.png
diff --git a/src/rss.ui b/src/rss.ui
index a970117a8..f7528abd2 100644
--- a/src/rss.ui
+++ b/src/rss.ui
@@ -159,31 +159,40 @@ p, li { white-space: pre-wrap; }
-
+
- :/Icons/oxygen/unsubscribe16.png:/Icons/oxygen/unsubscribe16.png
+ :/Icons/oxygen/remove.png:/Icons/oxygen/remove.png
- Delete feed
+ Delete
+
+
+ Delete
-
+
:/Icons/oxygen/edit_clear.png:/Icons/oxygen/edit_clear.png
- Rename feed
+ Rename
+
+
+ Rename
-
+
:/Icons/oxygen/view-refresh.png:/Icons/oxygen/view-refresh.png
- Update feed
+ Update
+
+
+ Update
@@ -255,7 +264,23 @@ p, li { white-space: pre-wrap; }
RSS feed downloader
+
+
+
+ :/Icons/oxygen/folder-new.png:/Icons/oxygen/folder-new.png
+
+
+ New folder
+
+
+
+
+ QWebView
+ QWidget
+
+
+
diff --git a/src/rss_imp.cpp b/src/rss_imp.cpp
index b29ca18cd..235668db9 100644
--- a/src/rss_imp.cpp
+++ b/src/rss_imp.cpp
@@ -46,28 +46,30 @@ void RSSImp::displayRSSListMenu(const QPoint& pos){
// No item under the mouse, clear selection
listStreams->clearSelection();
}
- QMenu myFinishedListMenu(this);
+ QMenu myRSSListMenu(this);
QList selectedItems = listStreams->selectedItems();
if(selectedItems.size() > 0) {
- myFinishedListMenu.addAction(actionUpdate_feed);
- myFinishedListMenu.addAction(actionMark_items_read);
- myFinishedListMenu.addSeparator();
+ myRSSListMenu.addAction(actionUpdate);
+ myRSSListMenu.addAction(actionMark_items_read);
+ myRSSListMenu.addSeparator();
if(selectedItems.size() == 1) {
- myFinishedListMenu.addAction(actionRename_feed);
+ myRSSListMenu.addAction(actionRename);
}
- myFinishedListMenu.addAction(actionDelete_feed);
- myFinishedListMenu.addSeparator();
- myFinishedListMenu.addAction(actionCopy_feed_URL);
+ myRSSListMenu.addAction(actionDelete);
+ myRSSListMenu.addSeparator();
+ myRSSListMenu.addAction(actionCopy_feed_URL);
if(selectedItems.size() == 1) {
- myFinishedListMenu.addSeparator();
- myFinishedListMenu.addAction(actionRSS_feed_downloader);
+ myRSSListMenu.addSeparator();
+ myRSSListMenu.addAction(actionRSS_feed_downloader);
}
}else{
- myFinishedListMenu.addAction(actionNew_subscription);
- myFinishedListMenu.addAction(actionUpdate_all_feeds);
+ myRSSListMenu.addAction(actionNew_subscription);
+ myRSSListMenu.addAction(actionNew_folder);
+ myRSSListMenu.addSeparator();
+ myRSSListMenu.addAction(actionUpdate_all_feeds);
}
- myFinishedListMenu.exec(QCursor::pos());
+ myRSSListMenu.exec(QCursor::pos());
}
void RSSImp::displayItemsListMenu(const QPoint&){
@@ -389,9 +391,9 @@ RSSImp::RSSImp(bittorrent *BTSession) : QWidget(), BTSession(BTSession){
connect(listNews, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(displayItemsListMenu(const QPoint&)));
// Feeds list actions
- connect(actionDelete_feed, SIGNAL(triggered()), this, SLOT(deleteSelectedItems()));
- connect(actionRename_feed, SIGNAL(triggered()), this, SLOT(renameFiles()));
- connect(actionUpdate_feed, SIGNAL(triggered()), this, SLOT(refreshSelectedStreams()));
+ connect(actionDelete, SIGNAL(triggered()), this, SLOT(deleteSelectedItems()));
+ connect(actionRename, SIGNAL(triggered()), this, SLOT(renameFiles()));
+ connect(actionUpdate, SIGNAL(triggered()), this, SLOT(refreshSelectedStreams()));
connect(actionNew_subscription, SIGNAL(triggered()), this, SLOT(on_newFeedButton_clicked()));
connect(actionUpdate_all_feeds, SIGNAL(triggered()), this, SLOT(on_updateAllButton_clicked()));
connect(actionCopy_feed_URL, SIGNAL(triggered()), this, SLOT(copySelectedFeedsURL()));