Browse Source

Added an icon for the new encryption option

adaptive-webui-19844
Christophe Dumez 18 years ago
parent
commit
8755ebba01
  1. 3
      TODO
  2. 22
      qBittorrent.kdevelop
  3. 1
      src/GUI.cpp
  4. BIN
      src/Icons/password.png
  5. 1
      src/icons.qrc
  6. 1064
      src/lang/qbittorrent_pl.ts
  7. 746
      src/options.ui
  8. 1
      src/options_imp.cpp

3
TODO

@ -45,5 +45,4 @@
- Allow the user to see when peers were blocked thanks to IPFilter. Maybe in a file in order not to spam the GUI. - Allow the user to see when peers were blocked thanks to IPFilter. Maybe in a file in order not to spam the GUI.
- Allow to scan multiple directories - Allow to scan multiple directories
- Fix all (or almost all) opened bugs in bug tracker - Fix all (or almost all) opened bugs in bug tracker
- Add an icon for encryption in program preferences - Fix sorting with Qt 4.3 - Reported to Trolltech, waiting for fix
- Fix sorting with Qt 4.3 - Trolltech!!! :'(

22
qBittorrent.kdevelop

@ -13,8 +13,8 @@
<ignoreparts/> <ignoreparts/>
<projectdirectory>.</projectdirectory> <projectdirectory>.</projectdirectory>
<absoluteprojectpath>false</absoluteprojectpath> <absoluteprojectpath>false</absoluteprojectpath>
<description/> <description></description>
<defaultencoding/> <defaultencoding></defaultencoding>
<versioncontrol>kdevsubversion</versioncontrol> <versioncontrol>kdevsubversion</versioncontrol>
</general> </general>
<kdevfileview> <kdevfileview>
@ -72,11 +72,11 @@
</kdevdoctreeview> </kdevdoctreeview>
<kdevdebugger> <kdevdebugger>
<general> <general>
<dbgshell/> <dbgshell></dbgshell>
<gdbpath/> <gdbpath></gdbpath>
<configGdbScript/> <configGdbScript></configGdbScript>
<runShellScript/> <runShellScript></runShellScript>
<runGdbScript/> <runGdbScript></runGdbScript>
<breakonloadinglibs>true</breakonloadinglibs> <breakonloadinglibs>true</breakonloadinglibs>
<separatetty>false</separatetty> <separatetty>false</separatetty>
<floatingtoolbar>false</floatingtoolbar> <floatingtoolbar>false</floatingtoolbar>
@ -154,8 +154,8 @@
<run> <run>
<directoryradio>executable</directoryradio> <directoryradio>executable</directoryradio>
<mainprogram>/home/chris/qbittorrent_svn/trunk/src/qbittorrent</mainprogram> <mainprogram>/home/chris/qbittorrent_svn/trunk/src/qbittorrent</mainprogram>
<programargs/> <programargs></programargs>
<globaldebugarguments/> <globaldebugarguments></globaldebugarguments>
<globalcwd>/home/chris/qbittorrent_svn/trunk</globalcwd> <globalcwd>/home/chris/qbittorrent_svn/trunk</globalcwd>
<useglobalprogram>true</useglobalprogram> <useglobalprogram>true</useglobalprogram>
<terminal>false</terminal> <terminal>false</terminal>
@ -169,7 +169,7 @@
<runmultiplejobs>false</runmultiplejobs> <runmultiplejobs>false</runmultiplejobs>
<numberofjobs>1</numberofjobs> <numberofjobs>1</numberofjobs>
<dontact>false</dontact> <dontact>false</dontact>
<makebin/> <makebin></makebin>
<prio>0</prio> <prio>0</prio>
<envvars/> <envvars/>
</make> </make>
@ -186,7 +186,7 @@
</filetemplates> </filetemplates>
</cppsupportpart> </cppsupportpart>
<ctagspart> <ctagspart>
<customArguments/> <customArguments></customArguments>
<customTagfilePath>/home/chris/qbittorrent_svn/trunk/tags</customTagfilePath> <customTagfilePath>/home/chris/qbittorrent_svn/trunk/tags</customTagfilePath>
<activeTagsFiles/> <activeTagsFiles/>
</ctagspart> </ctagspart>

1
src/GUI.cpp

@ -623,6 +623,7 @@ void GUI::sortDownloadListString(int index, Qt::SortOrder sortOrder){
} }
void GUI::sortDownloadList(int index, Qt::SortOrder startSortOrder, bool fromLoadColWidth){ void GUI::sortDownloadList(int index, Qt::SortOrder startSortOrder, bool fromLoadColWidth){
qDebug("Called sort download list");
static Qt::SortOrder sortOrder = startSortOrder; static Qt::SortOrder sortOrder = startSortOrder;
if(!fromLoadColWidth && downloadList->header()->sortIndicatorSection() == index){ if(!fromLoadColWidth && downloadList->header()->sortIndicatorSection() == index){
if(sortOrder == Qt::AscendingOrder){ if(sortOrder == Qt::AscendingOrder){

BIN
src/Icons/password.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.9 KiB

1
src/icons.qrc

@ -33,6 +33,7 @@
<file>Icons/description.png</file> <file>Icons/description.png</file>
<file>Icons/sphere.png</file> <file>Icons/sphere.png</file>
<file>Icons/sphere2.png</file> <file>Icons/sphere2.png</file>
<file>Icons/password.png</file>
<file>Icons/flags/portugal.png</file> <file>Icons/flags/portugal.png</file>
<file>Icons/flags/france.png</file> <file>Icons/flags/france.png</file>
<file>Icons/flags/ukraine.png</file> <file>Icons/flags/ukraine.png</file>

1064
src/lang/qbittorrent_pl.ts

File diff suppressed because it is too large Load Diff

746
src/options.ui

File diff suppressed because it is too large Load Diff

1
src/options_imp.cpp

@ -64,6 +64,7 @@ options_imp::options_imp(QWidget *parent):QDialog(parent){
tabOptions->setTabIcon(4, QIcon(QString::fromUtf8(":/Icons/proxy.png"))); tabOptions->setTabIcon(4, QIcon(QString::fromUtf8(":/Icons/proxy.png")));
tabOptions->setTabIcon(5, QIcon(QString::fromUtf8(":/Icons/wizard.png"))); tabOptions->setTabIcon(5, QIcon(QString::fromUtf8(":/Icons/wizard.png")));
lbl_icon_i18n->setPixmap(QPixmap(QString::fromUtf8(":/Icons/locale.png"))); lbl_icon_i18n->setPixmap(QPixmap(QString::fromUtf8(":/Icons/locale.png")));
lblencryption_icon->setPixmap(QPixmap(QString::fromUtf8(":/Icons/password.png")));
addFilterRange->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/add.png"))); addFilterRange->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/add.png")));
delFilterRange->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/remove.png"))); delFilterRange->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/remove.png")));
enableProxyAuth_checkBox->setIcon(QIcon(QString::fromUtf8(":/Icons/encrypted.png"))); enableProxyAuth_checkBox->setIcon(QIcon(QString::fromUtf8(":/Icons/encrypted.png")));

Loading…
Cancel
Save