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

Ported patch from thunder2 (http://sourceforge.net/tracker/index.php?func=detail&aid=2991827&group_id=178712&atid=886241)

Browse source 
- Bug fix: Checkbox for automatic share of the incoming directory doesn't correctly set with setDown, use setChecked
- ShareManager and RSettingsWin doesn't need to be created all the time
- RSettingsWin: Save the last active page for the current runtime
- ShareManager and DirectoryPage: Show changed shared directories direct after the change




git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2777 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2010-04-24 22:09:47 +00:00
parent 900ae2332f
commit 0773e92f85
9 changed files with 136 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -402,6 +402,14 @@ void MainWindow::updateHashingInfo(const QString& s)
}
}
void MainWindow::postModDirectories(bool update_local)
{
RSettingsWin::postModDirectories(update_local);
ShareManager::postModDirectories(update_local);
QCoreApplication::flush();
}
/** Creates a new action associated with a config page. */
QAction* MainWindow::createPageAction(QIcon img, QString text, QActionGroup *group)
{
@ -451,7 +459,7 @@ void MainWindow::addFriend()
/** Shows Share Manager */
void MainWindow::openShareManager()
{
ShareManager::showYourself();
ShareManager::showYourself();
}
@ -466,11 +474,7 @@ MainWindow::showMess(MainWindow::Page page)
/** Shows Options */
void MainWindow::showSettings()
{
static RSettingsWin *win = new RSettingsWin(this);
if (win->isHidden())
win->setNewPage(0);
win->show();
win->activateWindow();
RSettingsWin::showYourself(this);
}
/** Shows Messenger window */
@ -624,8 +628,8 @@ void MainWindow::loadStyleSheet(const QString &sheetName)
void MainWindow::showabout()
{
static AboutDialog *adlg = new AboutDialog(this);
adlg->exec();
AboutDialog adlg(this);
adlg.exec();
}
/** Displays the help browser and displays the most recently viewed help
@ -647,8 +651,8 @@ void MainWindow::showHelpDialog(const QString &topic)
void MainWindow::on_actionQuick_Start_Wizard_activated()
{
QuickStartWizard *qstartwizard = new QuickStartWizard(this);
qstartwizard->exec();
QuickStartWizard qstartwizard(this);
qstartwizard.exec();
}
/** Called when the user changes the UI translation. */