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

fixed a few GUI items in the TODO list

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8143 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2015-04-19 15:34:14 +00:00
parent e232dcb0a3
commit 2c687928d6
3 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
TODO.txt
View File

@ -39,13 +39,12 @@ E [X] "Friends details" should show both PGP key and RS certs in differen
It should specify clearly which one should be used to make friends. It should specify clearly which one should be used to make friends.
E [X] addFriend does not work when the cert contains signatures. E [X] addFriend does not work when the cert contains signatures.
E [X] PGP signatures are not transmited by discovery2. E [X] PGP signatures are not transmited by discovery2.
[ ] Default appearance style on Ubuntu should be GTK (to allow correct tooltips) [X] Default appearance style on Ubuntu should be GTK (to allow correct tooltips)
[ ] Default layout should use toolbars. The "menu" look is inneficient [X] Default layout should use toolbars. The "menu" look is inneficient
Messages Messages
[ ] right-click + send message on location from friendlist does not set the proper destination H [X] distant messages should be made async-ed
H [ ] distant messages should be made async-ed M [X] distant messages are not re-sent when the peer is offline the first time
M [ ] distant messages are not re-sent when the peer is offline the first time
M [X] sent messages to direct peers in the Sent box have inconsistent To field. M [X] sent messages to direct peers in the Sent box have inconsistent To field.
Raises an error if you click on it. Raises an error if you click on it.
H [ ] Merge the new messaging format? (or keep this for > 0.6) H [ ] Merge the new messaging format? (or keep this for > 0.6)

7
retroshare-gui/src/gui/StartDialog.cpp
View File

@ -119,13 +119,14 @@ void StartDialog::notSecureWarning()
{ {
/* some error msg */ /* some error msg */
if (ui.autologin_checkbox->isChecked()) if (ui.autologin_checkbox->isChecked())
#ifdef UBUNTU #ifdef WINDOWS_SYS
QMessageBox::warning ( this, tr("Warning"), tr("The password to your SSL certificate (your node) will be stored encrypted in your Gnome Keyring. \n\n Your PGP passwd will not be stored.\n\nThis choice can be reverted in settings."), QMessageBox::Ok); QMessageBox::warning ( this, tr("Warning"), tr("The password to your SSL certificate (your node) will be stored encrypted in the keys/help.dta file. This is not secure. \n\n Your PGP password will not be stored.\n\nThis choice can be reverted in settings."), QMessageBox::Ok);
#else #else
#ifdef __APPLE__ #ifdef __APPLE__
QMessageBox::warning ( this, tr("Warning"), tr("The password to your SSL certificate (your node) will be stored encrypted in your Keychain. \n\n Your PGP passwd will not be stored.\n\nThis choice can be reverted in settings."), QMessageBox::Ok); QMessageBox::warning ( this, tr("Warning"), tr("The password to your SSL certificate (your node) will be stored encrypted in your Keychain. \n\n Your PGP passwd will not be stored.\n\nThis choice can be reverted in settings."), QMessageBox::Ok);
#else #else
QMessageBox::warning ( this, tr("Warning"), tr("The password to your SSL certificate (your node) will be stored encrypted in the keys/help.dta file. This is not secure. \n\n Your PGP password will not be stored.\n\nThis choice can be reverted in settings."), QMessageBox::Ok); // this handles all linux systems at once.
QMessageBox::warning ( this, tr("Warning"), tr("The password to your SSL certificate (your node) will be stored encrypted in your Gnome Keyring. \n\n Your PGP passwd will not be stored.\n\nThis choice can be reverted in settings."), QMessageBox::Ok);
#endif #endif
#endif #endif
} }

29
retroshare-gui/src/gui/settings/rsharesettings.cpp
View File

@ -157,7 +157,12 @@ void RshareSettings::setLanguageCode(QString languageCode)
/** Gets the interface style key (e.g., "windows", "motif", etc.) */ /** Gets the interface style key (e.g., "windows", "motif", etc.) */
QString RshareSettings::getInterfaceStyle() QString RshareSettings::getInterfaceStyle()
{ {
return value(SETTING_STYLE).toString(); // use GTK as default style on ubuntu
#ifdef UBUNTU
return value(SETTING_STYLE,QString("GTK+")).toString();
#else
return value(SETTING_STYLE,QString("Cleanlooks")).toString();
#endif
} }
/** Sets the interface style key. */ /** Sets the interface style key. */
@ -180,7 +185,7 @@ void RshareSettings::setSheetName(QString sheet)
/** Gets the page button Location.*/ /** Gets the page button Location.*/
bool RshareSettings::getPageButtonLoc() bool RshareSettings::getPageButtonLoc()
{ {
return value(SETTING_PAGEBUTTONLOC, false).toBool(); return value(SETTING_PAGEBUTTONLOC, true).toBool();
} }
/** Sets the page button Location.*/ /** Sets the page button Location.*/
void RshareSettings::setPageButtonLoc(bool onToolBar) void RshareSettings::setPageButtonLoc(bool onToolBar)
@ -496,16 +501,16 @@ void RshareSettings::setChatSendMessageWithCtrlReturn(bool bValue)
setValueToGroup("Chat", "SendMessageWithCtrlReturn", bValue); setValueToGroup("Chat", "SendMessageWithCtrlReturn", bValue);
} }
bool RshareSettings::getChatSearchShowBarByDefault() bool RshareSettings::getChatSearchShowBarByDefault()
{ {
return valueFromGroup("Chat", "SearchShowBarByDefault", false).toBool(); return valueFromGroup("Chat", "SearchShowBarByDefault", false).toBool();
} }
void RshareSettings::setChatSearchShowBarByDefault(bool bValue) void RshareSettings::setChatSearchShowBarByDefault(bool bValue)
{ {
setValueToGroup("Chat", "SearchShowBarByDefault", bValue); setValueToGroup("Chat", "SearchShowBarByDefault", bValue);
} }
void RshareSettings::setChatSearchCharToStartSearch(int iValue) void RshareSettings::setChatSearchCharToStartSearch(int iValue)
{ {
setValueToGroup("Chat", "SearchCharToStartSearch", iValue); setValueToGroup("Chat", "SearchCharToStartSearch", iValue);