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

Added Phenom's new Compact Mode Changes:

Browse source 
A new compact mode remove useless text on status bar so the main windows not growing.
It is selectable on Appearance option page, with check to hide Sound and Toaster disable buttons.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7392 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2014-05-29 16:15:26 +00:00
parent c9ef2a77b5
commit 3cf9d9b955
17 changed files with 245 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -194,7 +194,8 @@
MainWindow::MainWindow(QWidget* parent, Qt::WindowFlags flags)
: RWindow("MainWindow", parent, flags)
{
ui = new Ui::MainWindow ;
ui = new Ui::MainWindow;
trayIcon = NULL;
/* Invoke the Qt Designer generated QObject setup routine */
ui->setupUi(this);
@ -276,11 +277,19 @@ MainWindow::MainWindow(QWidget* parent, Qt::WindowFlags flags)
ratesstatus = new RatesStatus();
statusBar()->addPermanentWidget(ratesstatus);
statusBar()->addPermanentWidget(new OpModeStatus());
opModeStatus = new OpModeStatus();
statusBar()->addPermanentWidget(opModeStatus);
statusBar()->addPermanentWidget(new SoundStatus());
soundStatus = new SoundStatus();
soundStatus->setHidden(Settings->valueFromGroup("StatusBar", "HideSound", QVariant(false)).toBool());
statusBar()->addPermanentWidget(soundStatus);
toasterDisable = new ToasterDisable();
toasterDisable->setHidden(Settings->valueFromGroup("StatusBar", "HideToaster", QVariant(false)).toBool());
statusBar()->addPermanentWidget(toasterDisable);
setCompactStatusMode(Settings->valueFromGroup("StatusBar", "CompactMode", QVariant(false)).toBool());
statusBar()->addPermanentWidget(new ToasterDisable());
/** Status Bar end ******/
/* Creates a tray icon with a context menu and adds it to the system's * notification area. */
@ -320,8 +329,12 @@ MainWindow::~MainWindow()
delete peerstatus;
delete natstatus;
delete dhtstatus;
delete ratesstatus;
delete hashingstatus;
delete discstatus;
delete ratesstatus;
delete opModeStatus;
delete soundStatus;
delete toasterDisable;
MessengerWindow::releaseInstance();
#ifdef UNFINISHED
delete applicationWindow;
@ -482,7 +495,7 @@ void MainWindow::initStackedPage()
/** Add icon on Action bar */
addAction(new QAction(QIcon(IMAGE_ADDFRIEND), tr("Add"), ui->toolBarAction), &MainWindow::addFriend, SLOT(addFriend()));
addAction(new QAction(QIcon(IMAGE_NEWRSCOLLECTION), tr("New"), ui->toolBarAction), &MainWindow::newRsCollection, SLOT(newRsCollection()));
//addAction(new QAction(QIcon(IMAGE_NEWRSCOLLECTION), tr("New"), ui->toolBarAction), &MainWindow::newRsCollection, SLOT(newRsCollection()));
addAction(new QAction(QIcon(IMAGE_PREFERENCES), tr("Options"), ui->toolBarAction), &MainWindow::showSettings, SLOT(showSettings()));
addAction(new QAction(QIcon(IMAGE_ABOUT), tr("About"), ui->toolBarAction), &MainWindow::showabout, SLOT(showabout()));
addAction(new QAction(QIcon(IMAGE_QUIT), tr("Quit"), ui->toolBarAction), &MainWindow::doQuit, SLOT(doQuit()));
@ -801,7 +814,7 @@ void MainWindow::updateFriends()
icon = QIcon(trayIconResource);
}
trayIcon->setIcon(icon);
if (trayIcon) trayIcon->setIcon(icon);
}
void MainWindow::postModDirectories(bool update_local)
@ -1309,7 +1322,7 @@ void MainWindow::initializeStatusObject(QObject *pObject, bool bConnect)
m_apStatusObjects.insert(m_apStatusObjects.end(), pObject);
std::string statusString;
//std::string statusString;
QMenu *pMenu = dynamic_cast<QMenu*>(pObject);
if (pMenu) {
@ -1481,3 +1494,27 @@ void MainWindow::servicePermission()
{
ServicePermissionDialog::showYourself();
}
SoundStatus *MainWindow::soundStatusInstance()
{
return soundStatus;
}
ToasterDisable *MainWindow::toasterDisableInstance()
{
return toasterDisable;
}
void MainWindow::setCompactStatusMode(bool compact)
{
//statusComboBox: TODO Show only icon
peerstatus->setCompactMode(compact);
updateFriends();
natstatus->setCompactMode(compact);
natstatus->getNATStatus();
dhtstatus->setCompactMode(compact);
dhtstatus->getDHTStatus();
hashingstatus->setCompactMode(compact);
ratesstatus->setCompactMode(compact);
//opModeStatus: TODO Show only ???
}