pogmommy/rssguard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some tweaks.

Browse source
This commit is contained in:
Martin Rotter 2015-06-03 07:55:40 +02:00
parent 71996f27de
commit cee624ac0d
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/gui/formsettings.ui
View file

@ -88,7 +88,7 @@
<item row="0" column="1"> <item row="0" column="1">
<widget class="QStackedWidget" name="m_stackedSettings"> <widget class="QStackedWidget" name="m_stackedSettings">
<property name="currentIndex"> <property name="currentIndex">
<number>4</number> <number>6</number>
</property> </property>
<widget class="QWidget" name="m_pageGeneral"> <widget class="QWidget" name="m_pageGeneral">
<layout class="QFormLayout" name="formLayout_5"> <layout class="QFormLayout" name="formLayout_5">
@ -414,8 +414,8 @@ MySQL backend will automatically use database with name &quot;rssguard&quot;. Do
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>740</width> <width>100</width>
<height>451</height> <height>30</height>
</rect> </rect>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout_4"> <layout class="QHBoxLayout" name="horizontalLayout_4">
@ -492,8 +492,8 @@ MySQL backend will automatically use database with name &quot;rssguard&quot;. Do
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>734</width> <width>167</width>
<height>425</height> <height>219</height>
</rect> </rect>
</property> </property>
<layout class="QFormLayout" name="formLayout"> <layout class="QFormLayout" name="formLayout">
@ -1332,7 +1332,7 @@ MySQL backend will automatically use database with name &quot;rssguard&quot;. Do
<string> ms</string> <string> ms</string>
</property> </property>
<property name="minimum"> <property name="minimum">
<number>1000</number> <number>100</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>15000</number> <number>15000</number>

8
src/network-web/networkfactory.cpp
View file

@ -62,16 +62,22 @@ QString NetworkFactory::networkErrorText(QNetworkReply::NetworkError error_code)
//: Network status. //: Network status.
return tr("protocol error"); return tr("protocol error");
case QNetworkReply::ContentAccessDenied:
return tr("access to content was denied");
case QNetworkReply::HostNotFoundError: case QNetworkReply::HostNotFoundError:
//: Network status. //: Network status.
return tr("host not found"); return tr("host not found");
case QNetworkReply::OperationCanceledError:
case QNetworkReply::TimeoutError:
return tr("connection timed out or was cancelled");
case QNetworkReply::RemoteHostClosedError: case QNetworkReply::RemoteHostClosedError:
case QNetworkReply::ConnectionRefusedError: case QNetworkReply::ConnectionRefusedError:
//: Network status. //: Network status.
return tr("connection refused"); return tr("connection refused");
case QNetworkReply::TimeoutError:
case QNetworkReply::ProxyTimeoutError: case QNetworkReply::ProxyTimeoutError:
//: Network status. //: Network status.
return tr("connection timed out"); return tr("connection timed out");