Changeset View
Changeset View
Standalone View
Standalone View
kcms/fonts/fonts.h
Show All 40 Lines | 38 | { | |||
---|---|---|---|---|---|
41 | Q_PROPERTY(QAbstractItemModel *subPixelOptionsModel READ subPixelOptionsModel CONSTANT) | 41 | Q_PROPERTY(QAbstractItemModel *subPixelOptionsModel READ subPixelOptionsModel CONSTANT) | ||
42 | Q_PROPERTY(int subPixelCurrentIndex READ subPixelCurrentIndex WRITE setSubPixelCurrentIndex NOTIFY subPixelCurrentIndexChanged) | 42 | Q_PROPERTY(int subPixelCurrentIndex READ subPixelCurrentIndex WRITE setSubPixelCurrentIndex NOTIFY subPixelCurrentIndexChanged) | ||
43 | Q_PROPERTY(QAbstractItemModel *hintingOptionsModel READ hintingOptionsModel CONSTANT) | 43 | Q_PROPERTY(QAbstractItemModel *hintingOptionsModel READ hintingOptionsModel CONSTANT) | ||
44 | Q_PROPERTY(int hintingCurrentIndex READ hintingCurrentIndex WRITE setHintingCurrentIndex NOTIFY hintingCurrentIndexChanged) | 44 | Q_PROPERTY(int hintingCurrentIndex READ hintingCurrentIndex WRITE setHintingCurrentIndex NOTIFY hintingCurrentIndexChanged) | ||
45 | 45 | | |||
46 | Q_PROPERTY(bool exclude READ exclude WRITE setExclude NOTIFY excludeChanged) | 46 | Q_PROPERTY(bool exclude READ exclude WRITE setExclude NOTIFY excludeChanged) | ||
47 | Q_PROPERTY(int excludeTo READ excludeTo WRITE setExcludeTo NOTIFY excludeToChanged) | 47 | Q_PROPERTY(int excludeTo READ excludeTo WRITE setExcludeTo NOTIFY excludeToChanged) | ||
48 | Q_PROPERTY(int excludeFrom READ excludeFrom WRITE setExcludeFrom NOTIFY excludeFromChanged) | 48 | Q_PROPERTY(int excludeFrom READ excludeFrom WRITE setExcludeFrom NOTIFY excludeFromChanged) | ||
49 | Q_PROPERTY(int antiAliasing READ antiAliasing WRITE setAntiAliasing NOTIFY aliasingChanged) | 49 | Q_PROPERTY(bool antiAliasing READ antiAliasing WRITE setAntiAliasing NOTIFY aliasingChanged) | ||
50 | Q_PROPERTY(int dpi READ dpi WRITE setDpi NOTIFY dpiChanged) | 50 | Q_PROPERTY(int dpi READ dpi WRITE setDpi NOTIFY dpiChanged) | ||
51 | 51 | | |||
52 | struct State | ||||
53 | { | ||||
54 | bool exclude; | ||||
mart: even if not 100% needed, could those be initialized before config load? | |||||
55 | int excludeFrom; | ||||
56 | int excludeTo; | ||||
57 | int antiAliasing; | ||||
58 | bool antiAliasingHasLocalConfig; | ||||
59 | bool subPixelHasLocalConfig; | ||||
60 | bool hintingHasLocalConfig; | ||||
61 | int dpi; | ||||
62 | int subPixel; | ||||
63 | int hinting; | ||||
64 | | ||||
65 | bool operator==(const State& other) const; | ||||
66 | bool operator!=(const State& other) const; | ||||
67 | }; | ||||
68 | | ||||
52 | public: | 69 | public: | ||
53 | enum AASetting { AAEnabled, AASystem, AADisabled }; | 70 | enum AASetting { AAEnabled, AASystem, AADisabled }; | ||
54 | #if defined(HAVE_FONTCONFIG) && HAVE_X11 | 71 | #if defined(HAVE_FONTCONFIG) && HAVE_X11 | ||
55 | FontAASettings(QObject *parent); | 72 | FontAASettings(QObject *parent); | ||
56 | 73 | | |||
57 | bool save(KXftConfig::AntiAliasing::State aaState); | 74 | bool save(KXftConfig::AntiAliasing::State aaState); | ||
58 | void load(); | 75 | void load(); | ||
59 | void defaults(); | 76 | void defaults(); | ||
60 | void setAntiAliasingState(KXftConfig::AntiAliasing::State aaState); | 77 | void setAntiAliasingState(KXftConfig::AntiAliasing::State aaState); | ||
61 | QAbstractItemModel* subPixelOptionsModel() { return m_subPixelOptionsModel; } | 78 | QAbstractItemModel* subPixelOptionsModel() { return m_subPixelOptionsModel; } | ||
62 | QAbstractItemModel* hintingOptionsModel() { return m_hintingOptionsModel; } | 79 | QAbstractItemModel* hintingOptionsModel() { return m_hintingOptionsModel; } | ||
63 | 80 | | |||
64 | void setExclude(bool exclude); | 81 | void setExclude(bool exclude); | ||
65 | bool exclude() const; | 82 | bool exclude() const; | ||
66 | 83 | | |||
67 | void setExcludeTo(const int &excludeTo); | 84 | void setExcludeTo(const int &excludeTo); | ||
68 | int excludeTo() const; | 85 | int excludeTo() const; | ||
69 | 86 | | |||
70 | void setExcludeFrom(const int &excludeTo); | 87 | void setExcludeFrom(const int &excludeTo); | ||
71 | int excludeFrom() const; | 88 | int excludeFrom() const; | ||
72 | 89 | | |||
73 | void setAntiAliasing(const int& antiAliasing); | 90 | void setAntiAliasing(bool antiAliasing); | ||
74 | int antiAliasing() const; | 91 | bool antiAliasing() const; | ||
92 | | ||||
93 | bool antiAliasingNeedsSave() const; | ||||
94 | bool subPixelNeedsSave() const; | ||||
95 | bool hintingNeedsSave() const; | ||||
75 | 96 | | |||
76 | void setDpi(const int &dpi); | 97 | void setDpi(const int &dpi); | ||
77 | int dpi() const; | 98 | int dpi() const; | ||
78 | 99 | | |||
79 | int subPixelCurrentIndex(); | 100 | int subPixelCurrentIndex(); | ||
80 | void setSubPixelCurrentIndex(int idx); | 101 | void setSubPixelCurrentIndex(int idx); | ||
102 | void setSubPixel(int idx); | ||||
81 | int hintingCurrentIndex(); | 103 | int hintingCurrentIndex(); | ||
82 | void setHintingCurrentIndex(int idx); | 104 | void setHintingCurrentIndex(int idx); | ||
105 | void setHinting(int idx); | ||||
83 | 106 | | |||
84 | bool needsSave() const; | 107 | bool needsSave() const; | ||
85 | 108 | | |||
86 | #endif | 109 | #endif | ||
87 | 110 | | |||
88 | Q_SIGNALS: | 111 | Q_SIGNALS: | ||
89 | void excludeChanged(); | 112 | void excludeChanged(); | ||
90 | void excludeToChanged(); | 113 | void excludeToChanged(); | ||
91 | void excludeFromChanged(); | 114 | void excludeFromChanged(); | ||
92 | void antiAliasingChanged(); | 115 | void antiAliasingChanged(); | ||
93 | void aliasingChanged(); | 116 | void aliasingChanged(); | ||
94 | void dpiChanged(); | 117 | void dpiChanged(); | ||
95 | void subPixelCurrentIndexChanged(); | 118 | void subPixelCurrentIndexChanged(); | ||
96 | void hintingCurrentIndexChanged(); | 119 | void hintingCurrentIndexChanged(); | ||
97 | 120 | | |||
98 | #if defined(HAVE_FONTCONFIG) && HAVE_X11 | 121 | #if defined(HAVE_FONTCONFIG) && HAVE_X11 | ||
99 | private: | 122 | private: | ||
100 | int m_excludeTo; | 123 | State m_state; | ||
101 | int m_excludeToOriginal; | 124 | State m_originalState; | ||
102 | int m_excludeFrom; | | |||
103 | int m_excludeFromOriginal; | | |||
104 | int m_antiAliasing; | | |||
105 | int m_antiAliasingOriginal; | | |||
106 | int m_dpi; | | |||
107 | int m_dpiOriginal; | | |||
108 | int m_subPixelCurrentIndex = 0; | | |||
109 | int m_subPixelCurrentIndexOriginal; | | |||
110 | int m_hintingCurrentIndex = 0; | | |||
111 | int m_hintingCurrentIndexOriginal; | | |||
112 | QStandardItemModel *m_subPixelOptionsModel; | 125 | QStandardItemModel *m_subPixelOptionsModel; | ||
113 | QStandardItemModel *m_hintingOptionsModel; | 126 | QStandardItemModel *m_hintingOptionsModel; | ||
114 | bool m_exclude = false; | | |||
115 | #endif | 127 | #endif | ||
116 | }; | 128 | }; | ||
117 | 129 | | |||
118 | /** | 130 | /** | ||
119 | * The Desktop/fonts tab in kcontrol. | 131 | * The Desktop/fonts tab in kcontrol. | ||
120 | */ | 132 | */ | ||
121 | class KFonts : public KQuickAddons::ConfigModule | 133 | class KFonts : public KQuickAddons::ConfigModule | ||
122 | { | 134 | { | ||
▲ Show 20 Lines • Show All 74 Lines • Show Last 20 Lines |
even if not 100% needed, could those be initialized before config load?