FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix weird crash when closing settings dialog

Browse Source
This commit is contained in:
Martin Rotter 2019-04-05 12:08:10 +02:00
parent ce3348313d
commit aae077243b
3 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/settings/settingsbrowsermail.h
View File

@ -12,15 +12,11 @@ class SettingsBrowserMail : public SettingsPanel {
Q_OBJECT
public:
explicit SettingsBrowserMail(Settings* settings, QWidget* parent = 0);
explicit SettingsBrowserMail(Settings* settings, QWidget* parent = nullptr);
virtual ~SettingsBrowserMail();
inline QString title() const {
return tr("Web browser & e-mail & proxy");
}
QString title() const;
void loadSettings();
void saveSettings();
private slots:
@ -40,4 +36,8 @@ class SettingsBrowserMail : public SettingsPanel {
Ui::SettingsBrowserMail* m_ui;
};
inline QString SettingsBrowserMail::title() const {
return tr("Web browser & e-mail & proxy");
}
#endif // SETTINGSBROWSERMAIL_H

22
src/gui/settings/settingsbrowsermail.ui
View File

@ -53,6 +53,9 @@
<property name="text">
<string>Web browser executable</string>
</property>
<property name="buddy">
<cstring>m_txtExternalBrowserExecutable</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
@ -81,6 +84,9 @@
<property name="text">
<string>Executable parameters</string>
</property>
<property name="buddy">
<cstring>m_txtExternalBrowserArguments</cstring>
</property>
</widget>
</item>
<item row="1" column="1">
@ -95,6 +101,9 @@
<property name="text">
<string>Use sample arguments for</string>
</property>
<property name="buddy">
<cstring>m_cmbExternalBrowserPreset</cstring>
</property>
</widget>
</item>
<item row="2" column="1">
@ -156,6 +165,9 @@
<property name="text">
<string>E-mail client executable</string>
</property>
<property name="buddy">
<cstring>m_txtExternalEmailExecutable</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
@ -184,6 +196,9 @@
<property name="text">
<string>Executable parameters</string>
</property>
<property name="buddy">
<cstring>m_txtExternalEmailArguments</cstring>
</property>
</widget>
</item>
<item row="1" column="1">
@ -198,6 +213,9 @@
<property name="text">
<string>Use sample arguments for</string>
</property>
<property name="buddy">
<cstring>m_cmbExternalEmailPreset</cstring>
</property>
</widget>
</item>
<item row="2" column="1">
@ -444,8 +462,6 @@
</layout>
</widget>
<tabstops>
<tabstop>m_txtProxyPassword</tabstop>
<tabstop>m_checkShowPassword</tabstop>
<tabstop>m_tabBrowserProxy</tabstop>
<tabstop>m_checkOpenLinksInExternal</tabstop>
<tabstop>m_grpCustomExternalBrowser</tabstop>
@ -465,6 +481,8 @@
<tabstop>m_txtProxyHost</tabstop>
<tabstop>m_spinProxyPort</tabstop>
<tabstop>m_txtProxyUsername</tabstop>
<tabstop>m_txtProxyPassword</tabstop>
<tabstop>m_checkShowPassword</tabstop>
</tabstops>
<resources/>
<connections/>

2
src/gui/settings/settingspanel.h
View File

@ -11,7 +11,7 @@ class SettingsPanel : public QWidget {
Q_OBJECT
public:
explicit SettingsPanel(Settings* settings, QWidget* parent = 0);
explicit SettingsPanel(Settings* settings, QWidget* parent = nullptr);
virtual QString title() const = 0;
virtual void loadSettings() = 0;