Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-04 23:25:32 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed resizing of the MainWindow when hashing files with long names.

Browse source 
Moved the hash strings of notifyHashingInfo from the librs to the GUI for translating.
Fixed german translation.

Recompile of GUI needed.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3659 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2010-10-09 18:35:34 +00:00
parent 4a286f751b
commit 0be24268f7
18 changed files with 188 additions and 212 deletions
Download patch file Download diff file Expand all files Collapse all files

32
retroshare-gui/src/gui/MainWindow.cpp
View file

@ -62,6 +62,7 @@
#include "statusbar/peerstatus.h"
#include "statusbar/natstatus.h"
#include "statusbar/ratesstatus.h"
#include "statusbar/hashingstatus.h"
#include <retroshare/rsstatus.h>
#include <retroshare/rsiface.h>
@ -273,24 +274,8 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
natstatus = new NATStatus();
statusBar()->addWidget(natstatus);
widget = new QWidget();
QSizePolicy sizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred);
sizePolicy.setHorizontalStretch(0);
sizePolicy.setVerticalStretch(0);
sizePolicy.setHeightForWidth(widget->sizePolicy().hasHeightForWidth());
widget->setSizePolicy(sizePolicy);
QHBoxLayout *horizontalLayout = new QHBoxLayout(widget);
horizontalLayout->setContentsMargins(0, 0, 0, 0);
horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout"));
_hashing_info_label = new QLabel(widget) ;
_hashing_info_label->setObjectName(QString::fromUtf8("label"));
horizontalLayout->addWidget(_hashing_info_label);
QSpacerItem *horizontalSpacer = new QSpacerItem(1000, 0, QSizePolicy::Expanding, QSizePolicy::Minimum);
horizontalLayout->addItem(horizontalSpacer);
statusBar()->addPermanentWidget(widget);
_hashing_info_label->hide() ;
hashingstatus = new HashingStatus();
statusBar()->addPermanentWidget(hashingstatus);
ratesstatus = new RatesStatus();
statusBar()->addPermanentWidget(ratesstatus);
@ -560,17 +545,6 @@ void MainWindow::privateChatChanged(int list, int type)
}
}
void MainWindow::updateHashingInfo(const QString& s)
{
if(s == "")
_hashing_info_label->hide() ;
else
{
_hashing_info_label->setText(s) ;
_hashing_info_label->show() ;
}
}
void MainWindow::postModDirectories(bool update_local)
{
RSettingsWin::postModDirectories(update_local);