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

Fixed compiler warnings.

Browse Source 
Fixed tab order in config pages Directories and Server.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4972 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-02-20 00:24:40 +00:00
parent 3208fcaffe
commit 0538c45fef
3 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
retroshare-gui/src/gui/settings/DirectoriesPage.ui
View File

@ -730,8 +730,17 @@ you plug it in.</string>
</layout>
</widget>
<tabstops>
<tabstop>shareDownloadDirectoryCB</tabstop>
<tabstop>editShareButton</tabstop>
<tabstop>rememberHashesCB</tabstop>
<tabstop>rememberHashesSB</tabstop>
<tabstop>cleanHashCachePB</tabstop>
<tabstop>autoCheckDirectories_CB</tabstop>
<tabstop>autoCheckDirectoriesDelay_SB</tabstop>
<tabstop>incomingDir</tabstop>
<tabstop>incomingButton</tabstop>
<tabstop>partialsDir</tabstop>
<tabstop>partialButton</tabstop>
</tabstops>
<resources>
<include location="../images.qrc"/>

20
retroshare-gui/src/gui/settings/ServerPage.ui
View File

@ -842,10 +842,10 @@ behind a firewall or a VPN.</string>
<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;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:11pt; 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;span style=&quot; font-weight:600;&quot;&gt;Warning&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;&quot;&gt;&lt;/p&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;span style=&quot; font-weight:600;&quot;&gt; &lt;/span&gt;This tab contains hard-core parameters which are unlikely to need modification. Dont change them unless you really know what you're doing. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
&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;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;span style=&quot; font-family:'Ubuntu'; font-size:11pt; font-weight:600;&quot;&gt;Warning&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:11pt; font-weight:600;&quot;&gt;&lt;/p&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;span style=&quot; font-family:'Ubuntu'; font-size:11pt; font-weight:600;&quot;&gt; &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:11pt;&quot;&gt;This tab contains hard-core parameters which are unlikely to need modification. Dont change them unless you really know what you're doing. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
@ -905,10 +905,22 @@ The default value is 20.</string>
</layout>
</widget>
<tabstops>
<tabstop>netModeComboBox</tabstop>
<tabstop>discComboBox</tabstop>
<tabstop>tabWidget</tabstop>
<tabstop>localAddress</tabstop>
<tabstop>localPort</tabstop>
<tabstop>extAddress</tabstop>
<tabstop>extPort</tabstop>
<tabstop>dynDNS</tabstop>
<tabstop>allowTunnelConnectionCB</tabstop>
<tabstop>showDiscStatusBar</tabstop>
<tabstop>totalDownloadRate</tabstop>
<tabstop>totalUploadRate</tabstop>
<tabstop>allowIpDeterminationCB</tabstop>
<tabstop>IPServersLV</tabstop>
<tabstop>textBrowser</tabstop>
<tabstop>_max_tr_up_per_sec_SB</tabstop>
</tabstops>
<resources/>
<connections/>

4
retroshare-gui/src/retroshare-gui/configpage.h
View File

@ -29,7 +29,7 @@ class ConfigPage : public QWidget
{
public:
/** Default Constructor */
ConfigPage(QWidget *parent = 0, Qt::WFlags flags = 0) : loaded(false) {}
ConfigPage(QWidget *parent = 0, Qt::WFlags flags = 0) : QWidget(parent, flags), loaded(false) {}
/** Pure virtual method. Subclassed pages load their config settings here. */
virtual void load() = 0;
@ -50,7 +50,7 @@ class ConfigPage : public QWidget
virtual QString pageName() const = 0 ;
protected:
virtual void showEvent(QShowEvent * event)
virtual void showEvent(QShowEvent * /*event*/)
{
if(!loaded)
{