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

Merge pull request #3410 from ngosang/preview

Browse source 
Minor changes in the GUI (Preview file & Forece Resume)
This commit is contained in:
sledgehammer999 2015-07-20 02:46:40 +03:00
commit f21cafb605
8 changed files with 35 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/gui/preview.ui
View file

@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>414</width>
<width>462</width>
<height>256</height>
</rect>
</property>
@ -14,34 +14,6 @@
<string>Preview selection</string>
</property>
<layout class="QVBoxLayout">
<item>
<widget class="QLabel" name="lbl_title">
<property name="minimumSize">
<size>
<width>0</width>
<height>37</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>37</height>
</size>
</property>
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>File preview</string>
</property>
<property name="alignment">
<set>Qt::AlignHCenter|Qt::AlignTop</set>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label">
<property name="maximumSize">

24
src/gui/transferlistwidget.cpp
View file

@ -621,10 +621,10 @@ void TransferListWidget::displayListMenu(const QPoint&)
// Create actions
QAction actionStart(GuiIconProvider::instance()->getIcon("media-playback-start"), tr("Resume", "Resume/start the torrent"), 0);
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);
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);
connect(&actionDelete, SIGNAL(triggered()), this, SLOT(deleteSelectedTorrents()));
QAction actionPreview_file(GuiIconProvider::instance()->getIcon("view-preview"), tr("Preview file..."), 0);
@ -723,24 +723,18 @@ void TransferListWidget::displayListMenu(const QPoint&)
}
}
else {
if (!forced) {
if (!has_force) {
listMenu.addAction(&actionForceStart);
has_force = true;
}
if (forced && !has_start) {
listMenu.addAction(&actionStart);
has_start = true;
}
else {
if (!has_start) {
listMenu.addAction(&actionStart);
has_start = true;
}
}
if (!has_pause) {
listMenu.addAction(&actionPause);
has_pause = true;
}
if (!forced && !has_force) {
listMenu.addAction(&actionForceStart);
has_force = true;
}
}
if (torrent->hasMetadata() && !has_preview)
has_preview = true;

1
src/icons.qrc
View file

@ -292,6 +292,7 @@
<file>icons/oxygen/mail-mark-read.png</file>
<file>icons/oxygen/media-playback-pause.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-wired.png</file>
<file>icons/oxygen/object-locked.png</file>

BIN
src/icons/oxygen/media-seek-forward.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.2 KiB

2
src/webui/www/private/index.html
View file

@ -102,8 +102,8 @@
</div>
<ul id="contextmenu">
<li><a href="#Start"><img src="theme/media-playback-start" alt="QBT_TR(Resume)QBT_TR"/> QBT_TR(Resume)QBT_TR</a></li>
<li><a href="#ForceStart"><img src="theme/checked" alt="QBT_TR(Force Resume)QBT_TR"/> QBT_TR(Force Resume)QBT_TR</a></li>
<li><a href="#Pause"><img src="theme/media-playback-pause" alt="QBT_TR(Pause)QBT_TR"/> QBT_TR(Pause)QBT_TR</a></li>
<li><a href="#ForceStart"><img src="theme/media-seek-forward" alt="QBT_TR(Force Resume)QBT_TR"/> QBT_TR(Force Resume)QBT_TR</a></li>
<li class="separator"><a href="#Delete"><img src="theme/list-remove" alt="QBT_TR(Delete)QBT_TR"/> QBT_TR(Delete)QBT_TR</a></li>
<li id="queueingMenuItems" class="separator">
<a href="#priority" class="arrow-right"><span style="display: inline-block; width:16px"></span> QBT_TR(Priority)QBT_TR</a>

38
src/webui/www/public/scripts/contextmenu.js
View file

@ -136,8 +136,9 @@ var ContextMenu = new Class({
all_are_downloaded = true;
all_are_paused = true;
there_are_paused = false;
all_are_super_seeding = true;
all_are_force_start = true;
there_are_force_start = false;
all_are_super_seeding = true;
var h = myTable.selectedIds();
h.each(function(item, index){
@ -153,19 +154,20 @@ var ContextMenu = new Class({
else
there_are_f_l_piece_prio = true;
if (data['force_start'] != true)
all_are_force_start = false;
if (data['progress'] != 1.0) // not downloaded
all_are_downloaded = false;
else if (data['super_seeding'] != true)
all_are_super_seeding = false;
state = data['state'];
if ((state != 'pausedUP') && (state != 'pausedDL'))
if (data['state'] != 'pausedUP' && data['state'] != 'pausedDL')
all_are_paused = false;
else
there_are_paused = true;
if (data['force_start'] != true)
all_are_force_start = false;
else
there_are_force_start = true;
});
show_seq_dl = true;
@ -178,8 +180,6 @@ var ContextMenu = new Class({
if (!all_are_f_l_piece_prio && there_are_f_l_piece_prio)
show_f_l_piece_prio = false;
this.setItemChecked('ForceStart', all_are_force_start);
if (all_are_downloaded) {
this.hideItem('SequentialDownload');
this.hideItem('FirstLastPiecePrio');
@ -207,18 +207,16 @@ var ContextMenu = new Class({
this.hideItem('SuperSeeding');
}
if (all_are_paused) {
this.showItem('Start');
this.showItem('Start');
this.showItem('Pause');
this.showItem('ForceStart');
if (all_are_paused)
this.hideItem('Pause');
} else {
if (there_are_paused) {
this.showItem('Start');
this.showItem('Pause');
} else {
this.hideItem('Start');
this.showItem('Pause');
}
}
else if (all_are_force_start)
this.hideItem('ForceStart');
else if (!there_are_paused && !there_are_force_start)
this.hideItem('Start');
},
//show menu
@ -283,4 +281,4 @@ var ContextMenu = new Class({
return this;
}
});
});

4
src/webui/www/public/scripts/mocha-init.js
View file

@ -181,14 +181,14 @@ initializeWindows = function() {
}
};
setForceStartFN = function(val) {
setForceStartFN = function() {
var h = myTable.selectedIds();
if (h.length) {
new Request({
url: 'command/setForceStart',
method: 'post',
data: {
value: val,
value: 'true',
hashes: h.join("|")
}
}).send();

6
src/webui/www/public/transferlist.html
View file

@ -25,6 +25,9 @@
Pause : function (element, ref) {
pauseFN();
},
ForceStart : function (element, ref) {
setForceStartFN();
},
prioTop : function (element, ref) {
setPriorityFN('topPrio');
},
@ -54,9 +57,6 @@
},
SuperSeeding : function (element, ref) {
setSuperSeedingFN(!ref.getItemChecked('SuperSeeding'));
},
ForceStart : function (element, ref) {
setForceStartFN(!ref.getItemChecked('ForceStart'));
}
},
offsets : {