added some tooltips. Removed warning for creating new profile, as it would let the user think that the current profile will be deleted

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4030 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2011-02-10 22:11:53 +00:00
parent 4ff7e52f91
commit f2f2f37c5d
4 changed files with 27 additions and 11 deletions

View File

@ -965,6 +965,9 @@ background: white;}</string>
</item> </item>
<item> <item>
<widget class="QTextEdit" name="lineEdit"> <widget class="QTextEdit" name="lineEdit">
<property name="toolTip">
<string>Messages entered here are sent to all collected friends</string>
</property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>30</horstretch> <horstretch>30</horstretch>

View File

@ -181,13 +181,13 @@ void StartDialog::loadCertificates()
void StartDialog::on_labelProfile_linkActivated(QString link) void StartDialog::on_labelProfile_linkActivated(QString link)
{ {
if ((QMessageBox::question(this, tr("Create a New Profile"),tr("This will generate a new Profile\n Are you sure you want to continue?"),QMessageBox::Yes|QMessageBox::No, QMessageBox::Yes))== QMessageBox::Yes) // if ((QMessageBox::question(this, tr("Create a New Profile"),tr("This will generate a new Profile\n Are you sure you want to continue?"),QMessageBox::Yes|QMessageBox::No, QMessageBox::Yes))== QMessageBox::Yes)
{ // {
reqNewCert = true; reqNewCert = true;
close(); close();
} // }
else // else
return; // return;
} }

View File

@ -435,7 +435,7 @@
<string>RetroShare</string> <string>RetroShare</string>
</property> </property>
<property name="windowIcon"> <property name="windowIcon">
<iconset resource="../../../../retroshare-v0.5.0/retroshare-gui/src/gui/images.qrc"> <iconset>
<normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset> <normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
@ -498,7 +498,7 @@ border-image: url(:/images/avatar_background.png);
<string/> <string/>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../../../../retroshare-v0.5.0/retroshare-gui/src/gui/images.qrc"> <iconset>
<normaloff>:/images/user/personal64.png</normaloff>:/images/user/personal64.png</iconset> <normaloff>:/images/user/personal64.png</normaloff>:/images/user/personal64.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@ -610,12 +610,17 @@ p, li { white-space: pre-wrap; }
</item> </item>
<item row="6" column="1"> <item row="6" column="1">
<widget class="QLabel" name="labelProfile"> <widget class="QLabel" name="labelProfile">
<property name="toolTip">
<string>Opens a dialog for creating a new profile or
adding locations to an existing profile.
The current identities/locations will not be affected.</string>
</property>
<property name="text"> <property name="text">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt; &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;Create new Profile...&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Create new Profile...&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;Create new Profile...&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt; text-decoration: underline; color:#0000ff;&quot;&gt;Manage profiles and locations...&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
</widget> </widget>
</item> </item>

View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>573</width> <width>573</width>
<height>394</height> <height>400</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -550,7 +550,15 @@
</size> </size>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Should be disabled if you don't want to share connection information between peers.</string> <string>The DHT allows you to answer connection
requests from your friends using BitTorrent's DHT.
It greatly improves the connectivity.
The Discovery service sends locations and GPG
identities of your trusted contacts to connected
peers, to help them choose new friends.
The friendship is never automatic however, and both
peers still need to trust each other to allow connection. </string>
</property> </property>
<item> <item>
<property name="text"> <property name="text">