Changes in Force Resume icon and menu order

This commit is contained in:
ngosang 2015-07-12 16:40:25 +02:00
parent 808f07250e
commit 9dbb2720b0
3 changed files with 10 additions and 15 deletions

View File

@ -621,10 +621,10 @@ void TransferListWidget::displayListMenu(const QPoint&)
// Create actions // Create actions
QAction actionStart(GuiIconProvider::instance()->getIcon("media-playback-start"), tr("Resume", "Resume/start the torrent"), 0); QAction actionStart(GuiIconProvider::instance()->getIcon("media-playback-start"), tr("Resume", "Resume/start the torrent"), 0);
connect(&actionStart, SIGNAL(triggered()), this, SLOT(startSelectedTorrents())); connect(&actionStart, SIGNAL(triggered()), this, SLOT(startSelectedTorrents()));
QAction actionForceStart(tr("Force Resume", "Force Resume/start the torrent"), 0);
connect(&actionForceStart, SIGNAL(triggered()), this, SLOT(forceStartSelectedTorrents()));
QAction actionPause(GuiIconProvider::instance()->getIcon("media-playback-pause"), tr("Pause", "Pause the torrent"), 0); QAction actionPause(GuiIconProvider::instance()->getIcon("media-playback-pause"), tr("Pause", "Pause the torrent"), 0);
connect(&actionPause, SIGNAL(triggered()), this, SLOT(pauseSelectedTorrents())); connect(&actionPause, SIGNAL(triggered()), this, SLOT(pauseSelectedTorrents()));
QAction actionForceStart(GuiIconProvider::instance()->getIcon("media-seek-forward"), tr("Force Resume", "Force Resume/start the torrent"), 0);
connect(&actionForceStart, SIGNAL(triggered()), this, SLOT(forceStartSelectedTorrents()));
QAction actionDelete(GuiIconProvider::instance()->getIcon("edit-delete"), tr("Delete", "Delete the torrent"), 0); QAction actionDelete(GuiIconProvider::instance()->getIcon("edit-delete"), tr("Delete", "Delete the torrent"), 0);
connect(&actionDelete, SIGNAL(triggered()), this, SLOT(deleteSelectedTorrents())); connect(&actionDelete, SIGNAL(triggered()), this, SLOT(deleteSelectedTorrents()));
QAction actionPreview_file(GuiIconProvider::instance()->getIcon("view-preview"), tr("Preview file..."), 0); QAction actionPreview_file(GuiIconProvider::instance()->getIcon("view-preview"), tr("Preview file..."), 0);
@ -723,24 +723,18 @@ void TransferListWidget::displayListMenu(const QPoint&)
} }
} }
else { else {
if (forced && !has_start) {
if (!forced) {
if (!has_force) {
listMenu.addAction(&actionForceStart);
has_force = true;
}
}
else {
if (!has_start) {
listMenu.addAction(&actionStart); listMenu.addAction(&actionStart);
has_start = true; has_start = true;
} }
}
if (!has_pause) { if (!has_pause) {
listMenu.addAction(&actionPause); listMenu.addAction(&actionPause);
has_pause = true; has_pause = true;
} }
if (!forced && !has_force) {
listMenu.addAction(&actionForceStart);
has_force = true;
}
} }
if (torrent->hasMetadata() && !has_preview) if (torrent->hasMetadata() && !has_preview)
has_preview = true; has_preview = true;

View File

@ -292,6 +292,7 @@
<file>icons/oxygen/mail-mark-read.png</file> <file>icons/oxygen/mail-mark-read.png</file>
<file>icons/oxygen/media-playback-pause.png</file> <file>icons/oxygen/media-playback-pause.png</file>
<file>icons/oxygen/media-playback-start.png</file> <file>icons/oxygen/media-playback-start.png</file>
<file>icons/oxygen/media-seek-forward.png</file>
<file>icons/oxygen/network-server.png</file> <file>icons/oxygen/network-server.png</file>
<file>icons/oxygen/network-wired.png</file> <file>icons/oxygen/network-wired.png</file>
<file>icons/oxygen/object-locked.png</file> <file>icons/oxygen/object-locked.png</file>

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB