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

- bump to rc1

Browse source 
- Updated TODO
- Fix for toolBar spacing
- A little code cleanup
This commit is contained in:
Christophe Dumez 2008-12-24 14:41:16 +00:00
parent e497789ec7
commit 3678aa4d23
4 changed files with 22 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog
View file

@ -13,6 +13,7 @@
- FEATURE: Updated Web interface to MochaUI v0.9.5 - FEATURE: Updated Web interface to MochaUI v0.9.5
- BUGFIX: Fixed several memory leaks - BUGFIX: Fixed several memory leaks
- BUGFIX: WebUI is now working with IE7 - BUGFIX: WebUI is now working with IE7
- BUGFIX: Fixed spacing problem in toolbar when toggling its visibility
* Unknown - Christophe Dumez <chris@qbittorrent.org> - v1.2.1 * Unknown - Christophe Dumez <chris@qbittorrent.org> - v1.2.1
- BUGFIX: Fixed possible crash when deleting a torrent permanently - BUGFIX: Fixed possible crash when deleting a torrent permanently

2
TODO
View file

@ -1,7 +1,5 @@
See https://blueprints.launchpad.net/qbittorrent/ See https://blueprints.launchpad.net/qbittorrent/
- Test new MochaUI on IE7
// translations done // translations done
- Romanian - Romanian
- Russian - Russian

42
src/GUI.cpp
View file

@ -904,10 +904,13 @@ void GUI::configureSession(bool deleteOptions) {
setWindowTitle(tr("qBittorrent %1", "e.g: qBittorrent v0.x").arg(QString::fromUtf8(VERSION))); setWindowTitle(tr("qBittorrent %1", "e.g: qBittorrent v0.x").arg(QString::fromUtf8(VERSION)));
} }
displaySpeedInTitle = new_displaySpeedInTitle; displaySpeedInTitle = new_displaySpeedInTitle;
if(options->isToolbarDisplayed()) { if(options->isToolbarDisplayed() != toolBar->isVisible()) {
toolBar->setVisible(true); if(options->isToolbarDisplayed()) {
} else { toolBar->setVisible(true);
toolBar->setVisible(false); toolBar->layout()->setSpacing(7);
} else {
toolBar->setVisible(false);
}
} }
unsigned int new_refreshInterval = options->getRefreshInterval(); unsigned int new_refreshInterval = options->getRefreshInterval();
if(refreshInterval != new_refreshInterval) { if(refreshInterval != new_refreshInterval) {
@ -1502,38 +1505,33 @@ void GUI::on_actionOptions_triggered() {
void GUI::OptionsSaved(bool deleteOptions) { void GUI::OptionsSaved(bool deleteOptions) {
BTSession->addConsoleMessage(tr("Options were saved successfully.")); BTSession->addConsoleMessage(tr("Options were saved successfully."));
bool newSystrayIntegration = options->systrayIntegration(); bool newSystrayIntegration = options->systrayIntegration();
if(newSystrayIntegration && !systrayIntegration) { if(newSystrayIntegration != systrayIntegration) {
// create the trayicon if(newSystrayIntegration) {
createTrayIcon(); // create the trayicon
createTrayIcon();
} else {
// Destroy trayicon
delete myTrayIcon;
delete myTrayIconMenu;
}
systrayIntegration = newSystrayIntegration;
} }
if(!newSystrayIntegration && systrayIntegration) {
// Destroy trayicon
delete myTrayIcon;
delete myTrayIconMenu;
}
systrayIntegration = newSystrayIntegration;
// Update Web UI // Update Web UI
if (options->isWebUiEnabled()) if (options->isWebUiEnabled()) {
{
quint16 port = options->webUiPort(); quint16 port = options->webUiPort();
QString username = options->webUiUsername(); QString username = options->webUiUsername();
QString password = options->webUiPassword(); QString password = options->webUiPassword();
initWebUi(username, password, port); initWebUi(username, password, port);
} } else if(httpServer) {
else if(httpServer)
{
delete httpServer; delete httpServer;
} }
// Update session // Update session
configureSession(deleteOptions); configureSession(deleteOptions);
} }
bool GUI::initWebUi(QString username, QString password, int port) bool GUI::initWebUi(QString username, QString password, int port) {
{
if(httpServer) if(httpServer)
{
httpServer->close(); httpServer->close();
}
else else
httpServer = new HttpServer(BTSession, 3000, this); httpServer = new HttpServer(BTSession, 3000, this);
httpServer->setAuthorization(username, password); httpServer->setAuthorization(username, password);

2
src/src.pro
View file

@ -14,7 +14,7 @@ CONFIG += qt \
network network
# Update this VERSION for each release # Update this VERSION for each release
DEFINES += VERSION=\\\"v1.3.0beta1\\\" DEFINES += VERSION=\\\"v1.3.0rc1\\\"
DEFINES += VERSION_MAJOR=1 DEFINES += VERSION_MAJOR=1
DEFINES += VERSION_MINOR=3 DEFINES += VERSION_MINOR=3
DEFINES += VERSION_BUGFIX=0 DEFINES += VERSION_BUGFIX=0