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

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

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

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

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

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