mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-11-24 10:16:00 +03:00
Code Issues Projects Releases Packages Wiki Activity

- Updated some icons to oxygen theme

Browse source 
- Prepared actions for rss grouping
This commit is contained in:
Christophe Dumez 2009-08-22 15:01:53 +00:00
parent 05569a5011
commit b2af40c95b
9 changed files with 57 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
src/Icons/add_file.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1,005 B

BIN
src/Icons/add_folder.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.3 KiB

BIN
src/Icons/oxygen/document-new.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 873 B

BIN
src/Icons/oxygen/folder-new.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 923 B

BIN
src/Icons/oxygen/remove.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.2 KiB

8
src/createtorrent.ui
View file

@ -62,22 +62,22 @@
<item>
<widget class="QPushButton" name="addFile_button">
<property name="text">
<string>Add a file</string>
<string>Add file</string>
</property>
<property name="icon">
<iconset resource="icons.qrc">
<normaloff>:/Icons/add_file.png</normaloff>:/Icons/add_file.png</iconset>
<normaloff>:/Icons/oxygen/document-new.png</normaloff>:/Icons/oxygen/document-new.png</iconset>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="addFolder_button">
<property name="text">
<string>Add a folder</string>
<string>Add folder</string>
</property>
<property name="icon">
<iconset resource="icons.qrc">
<normaloff>:/Icons/add_folder.png</normaloff>:/Icons/add_folder.png</iconset>
<normaloff>:/Icons/oxygen/folder-new.png</normaloff>:/Icons/oxygen/folder-new.png</iconset>
</property>
</widget>
</item>

5
src/icons.qrc
View file

@ -6,10 +6,8 @@
<file>Icons/sphere2.png</file>
<file>Icons/downarrow.png</file>
<file>Icons/url.png</file>
<file>Icons/add_folder.png</file>
<file>Icons/locale.png</file>
<file>Icons/loading.png</file>
<file>Icons/add_file.png</file>
<file>Icons/magnet.png</file>
<file>Icons/sphere.png</file>
<file>Icons/uparrow.png</file>
@ -76,6 +74,7 @@
<file>Icons/oxygen/view-refresh.png</file>
<file>Icons/oxygen/file.png</file>
<file>Icons/oxygen/time.png</file>
<file>Icons/oxygen/folder-new.png</file>
<file>Icons/oxygen/edit-paste.png</file>
<file>Icons/oxygen/proxy.png</file>
<file>Icons/oxygen/log.png</file>
@ -88,11 +87,13 @@
<file>Icons/oxygen/edit_clear.png</file>
<file>Icons/oxygen/download.png</file>
<file>Icons/oxygen/gear.png</file>
<file>Icons/oxygen/remove.png</file>
<file>Icons/oxygen/browse.png</file>
<file>Icons/oxygen/unsubscribe16.png</file>
<file>Icons/oxygen/subscribe.png</file>
<file>Icons/oxygen/edit-copy.png</file>
<file>Icons/oxygen/bt_settings.png</file>
<file>Icons/oxygen/document-new.png</file>
<file>Icons/oxygen/webui.png</file>
<file>Icons/oxygen/list-remove.png</file>
<file>Icons/oxygen/connection.png</file>

39
src/rss.ui
View file

@ -159,31 +159,40 @@ p, li { white-space: pre-wrap; }
</widget>
</item>
</layout>
<action name="actionDelete_feed">
<action name="actionDelete">
<property name="icon">
<iconset resource="icons.qrc">
<normaloff>:/Icons/oxygen/unsubscribe16.png</normaloff>:/Icons/oxygen/unsubscribe16.png</iconset>
<normaloff>:/Icons/oxygen/remove.png</normaloff>:/Icons/oxygen/remove.png</iconset>
</property>
<property name="text">
<string>Delete feed</string>
<string>Delete</string>
</property>
<property name="toolTip">
<string>Delete</string>
</property>
</action>
<action name="actionRename_feed">
<action name="actionRename">
<property name="icon">
<iconset resource="icons.qrc">
<normaloff>:/Icons/oxygen/edit_clear.png</normaloff>:/Icons/oxygen/edit_clear.png</iconset>
</property>
<property name="text">
<string>Rename feed</string>
<string>Rename</string>
</property>
<property name="toolTip">
<string>Rename</string>
</property>
</action>
<action name="actionUpdate_feed">
<action name="actionUpdate">
<property name="icon">
<iconset resource="icons.qrc">
<normaloff>:/Icons/oxygen/view-refresh.png</normaloff>:/Icons/oxygen/view-refresh.png</iconset>
</property>
<property name="text">
<string>Update feed</string>
<string>Update</string>
</property>
<property name="toolTip">
<string>Update</string>
</property>
</action>
<action name="actionNew_subscription">
@ -255,7 +264,23 @@ p, li { white-space: pre-wrap; }
<string>RSS feed downloader</string>
</property>
</action>
<action name="actionNew_folder">
<property name="icon">
<iconset resource="icons.qrc">
<normaloff>:/Icons/oxygen/folder-new.png</normaloff>:/Icons/oxygen/folder-new.png</iconset>
</property>
<property name="text">
<string>New folder</string>
</property>
</action>
</widget>
<customwidgets>
<customwidget>
<class>QWebView</class>
<extends>QWidget</extends>
<header>QtWebKit/QWebView</header>
</customwidget>
</customwidgets>
<resources>
<include location="icons.qrc"/>
</resources>

34
src/rss_imp.cpp
View file

@ -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<QTreeWidgetItem*> 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()));