projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
client: Deprecate local highlight, migrate cleanup
[quassel.git]
/
src
/
qtui
/
settingspages
/
appearancesettingspage.h
diff --git
a/src/qtui/settingspages/appearancesettingspage.h
b/src/qtui/settingspages/appearancesettingspage.h
index
c026a8f
..
85cdeba
100644
(file)
--- a/
src/qtui/settingspages/appearancesettingspage.h
+++ b/
src/qtui/settingspages/appearancesettingspage.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-20
13
by the Quassel Project *
+ * Copyright (C) 2005-20
20
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-28,6
+28,7
@@
#include "settings.h"
#include "settingspage.h"
#include "settings.h"
#include "settingspage.h"
+
#include "ui_appearancesettingspage.h"
class AppearanceSettingsPage : public SettingsPage
#include "ui_appearancesettingspage.h"
class AppearanceSettingsPage : public SettingsPage
@@
-35,14
+36,14
@@
class AppearanceSettingsPage : public SettingsPage
Q_OBJECT
public:
Q_OBJECT
public:
- AppearanceSettingsPage(QWidget
*parent = 0
);
+ AppearanceSettingsPage(QWidget
* parent = nullptr
);
- inline bool hasDefaults() const { return true; }
+ inline bool hasDefaults() const
override
{ return true; }
public slots:
public slots:
- void save();
- void load();
- void defaults();
+ void save()
override
;
+ void load()
override
;
+ void defaults()
override
;
private slots:
void widgetHasChanged();
private slots:
void widgetHasChanged();
@@
-53,14
+54,15
@@
private:
bool testHasChanged();
void initStyleComboBox();
void initLanguageComboBox();
bool testHasChanged();
void initStyleComboBox();
void initLanguageComboBox();
+ void initIconThemeComboBox();
QLocale selectedLocale() const;
QLocale selectedLocale() const;
+ QString selectedIconTheme() const;
Ui::AppearanceSettingsPage ui;
QHash<QString, QVariant> settings;
QMap<QString, QLocale> _locales;
Ui::AppearanceSettingsPage ui;
QHash<QString, QVariant> settings;
QMap<QString, QLocale> _locales;
- inline QString settingsKey() const { return QString("QtUi"); }
+ inline QString settingsKey() const
override
{ return QString("QtUi"); }
};
};
-
#endif
#endif