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

- Fixed crash when closing the main window without the setting "Minimize to Tray Icon"

Browse source 
- Renamed the setting "Do not Minimize to Tray Icon" to "Minimize to Tray Icon" and fixed wrong usage
  Please check your setting!
- Updated english translation


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6557 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2013-08-04 23:53:29 +00:00
parent e763f46aee
commit c4c5eb5399
6 changed files with 70 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

4
retroshare-gui/src/gui/settings/GeneralPage.cpp
View file

@ -69,7 +69,7 @@ bool GeneralPage::save(QString &/*errmsg*/)
{
Settings->setStartMinimized(ui.checkStartMinimized->isChecked());
Settings->setValue("doQuit", ui.checkQuit->isChecked());
Settings->setCloseToTray(ui.checkClosetoTray->isChecked());
Settings->setCloseToTray(ui.checkCloseToTray->isChecked());
#ifdef Q_WS_WIN
Settings->setRunRetroshareOnBoot(ui.chkRunRetroshareAtSystemStartup->isChecked(), ui.chkRunRetroshareAtSystemStartupMinimized->isChecked());
@ -117,7 +117,7 @@ void GeneralPage::load()
ui.checkStartMinimized->setChecked(Settings->getStartMinimized());
ui.checkQuit->setChecked(Settings->value("doQuit", false).toBool());
ui.checkClosetoTray->setChecked(Settings->getCloseToTray());
ui.checkCloseToTray->setChecked(Settings->getCloseToTray());
ui.spinBox->setValue(Settings->getMaxTimeBeforeIdle());

10
retroshare-gui/src/gui/settings/GeneralPage.ui
View file

@ -32,9 +32,6 @@
<property name="text">
<string>Start minimized</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="3" column="0">
@ -100,12 +97,9 @@
</widget>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="checkClosetoTray">
<widget class="QCheckBox" name="checkCloseToTray">
<property name="text">
<string>Do not Minimize to Tray Icon</string>
</property>
<property name="checked">
<bool>true</bool>
<string>Minimize to Tray Icon</string>
</property>
</widget>
</item>

4
retroshare-gui/src/gui/settings/rsharesettings.cpp
View file

@ -266,12 +266,12 @@ void RshareSettings::setStartMinimized(bool startMinimized)
bool RshareSettings::getCloseToTray()
{
return value("ClosetoTray", false).toBool();
return value("CloseToTray", true).toBool();
}
void RshareSettings::setCloseToTray(bool closeToTray)
{
setValue("ClosetoTray", closeToTray);
setValue("CloseToTray", closeToTray);
}
/** Setting for Notify / Chat and NewsFeeds **/