Changeset View
Changeset View
Standalone View
Standalone View
kcms/fonts/package/contents/ui/main.qml
| Show All 13 Lines | 1 | /* | |||
|---|---|---|---|---|---|
| 14 | You should have received a copy of the GNU Library General Public License | 14 | You should have received a copy of the GNU Library General Public License | ||
| 15 | along with this library; see the file COPYING.LIB. If not, write to | 15 | along with this library; see the file COPYING.LIB. If not, write to | ||
| 16 | the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 16 | the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | ||
| 17 | Boston, MA 02110-1301, USA. | 17 | Boston, MA 02110-1301, USA. | ||
| 18 | */ | 18 | */ | ||
| 19 | 19 | | |||
| 20 | import QtQuick 2.1 | 20 | import QtQuick 2.1 | ||
| 21 | import QtQuick.Layouts 1.1 | 21 | import QtQuick.Layouts 1.1 | ||
| 22 | import QtQuick.Controls 2.0 as QtControls | 22 | import QtQuick.Controls 2.0 as QtControls | ||
broulik: Is `2.2` also sufficient (Qt 5.9)? | |||||
Seems like even 2.0 is okay. progwolff: Seems like even `2.0` is okay.
I misinterpreted the docs where it says `import QtQuick.Controls… | |||||
| 23 | import QtQuick.Dialogs 1.2 as QtDialogs | 23 | import QtQuick.Dialogs 1.2 as QtDialogs | ||
| 24 | import org.kde.kirigami 2.3 as Kirigami | 24 | import org.kde.kirigami 2.3 as Kirigami | ||
| 25 | import org.kde.kcm 1.1 as KCM | 25 | import org.kde.kcm 1.1 as KCM | ||
| 26 | 26 | | |||
| 27 | KCM.SimpleKCM { | 27 | KCM.SimpleKCM { | ||
| 28 | id: root | 28 | id: root | ||
| 29 | 29 | | |||
| 30 | KCM.ConfigModule.quickHelp: i18n("Fonts") | 30 | KCM.ConfigModule.quickHelp: i18n("Fonts") | ||
| ▲ Show 20 Lines • Show All 102 Lines • ▼ Show 20 Line(s) | 132 | QtControls.ComboBox { | |||
| 133 | id: subPixelCombo | 133 | id: subPixelCombo | ||
| 134 | Layout.preferredWidth: formLayout.maxImplicitWidth | 134 | Layout.preferredWidth: formLayout.maxImplicitWidth | ||
| 135 | Kirigami.FormData.label: i18n("Sub-pixel rendering type:") | 135 | Kirigami.FormData.label: i18n("Sub-pixel rendering type:") | ||
| 136 | currentIndex: kcm.fontAASettings.subPixelCurrentIndex | 136 | currentIndex: kcm.fontAASettings.subPixelCurrentIndex | ||
| 137 | onCurrentIndexChanged: kcm.fontAASettings.subPixelCurrentIndex = currentIndex; | 137 | onCurrentIndexChanged: kcm.fontAASettings.subPixelCurrentIndex = currentIndex; | ||
| 138 | model: kcm.fontAASettings.subPixelOptionsModel | 138 | model: kcm.fontAASettings.subPixelOptionsModel | ||
| 139 | textRole: "display" | 139 | textRole: "display" | ||
| 140 | enabled: antiAliasingComboBox.currentIndex == 0 | 140 | enabled: antiAliasingComboBox.currentIndex == 0 | ||
| 141 | popup.height: popup.implicitHeight | ||||
| 142 | delegate: QtControls.ItemDelegate { | ||||
| 143 | id: subPixelDelegate | ||||
The popup width is too small, the text cut off. Either make it larger or at least elide the text on the right broulik: The popup width is too small, the text cut off. Either make it larger or at least elide the… | |||||
| 144 | onWidthChanged: { | ||||
| 145 | subPixelCombo.popup.width = Math.max(subPixelCombo.popup.width, width) | ||||
| 146 | } | ||||
| 147 | contentItem: ColumnLayout { | ||||
Use QtQuick Controls Label instead of plain Text for proper rendering and text color broulik: Use QtQuick Controls `Label` instead of plain `Text` for proper rendering and text color | |||||
| 148 | id: subPixelLayout | ||||
| 149 | Kirigami.Heading { | ||||
| 150 | id: subPixelComboText | ||||
| 151 | text: model.display | ||||
| 152 | level: 5 | ||||
| 153 | } | ||||
broulik: This is the default, no need to explicitly specify | |||||
| 154 | Image { | ||||
broulik: Also not needed | |||||
| 155 | id: subPixelComboImage | ||||
Coding style, add spaces between: source: "image://preview/" + model.index + "_" + kcm.fontAASettings.hintCurrentIndex + ".png" broulik: Coding style, add spaces between:
```
source: "image://preview/" + model.index + "_" + kcm. | |||||
| 156 | source: "image://preview/" + model.index + "_" + kcm.fontAASettings.hintingCurrentIndex + ".png" | ||||
| 157 | // Setting sourceSize here is necessary as a workaround for QTBUG-38127 | ||||
| 158 | // | ||||
| 159 | // With this bug, images requested from a QQuickImageProvider have an incorrect scale with devicePixelRatio != 1 when sourceSize is not set. | ||||
| 160 | // | ||||
| 161 | // TODO: Check if QTBUG-38127 is fixed and remove the next two lines. | ||||
| 162 | sourceSize.width: 1 | ||||
| 163 | sourceSize.height: 1 | ||||
| 164 | } | ||||
| 165 | } | ||||
| 166 | } | ||||
| 141 | } | 167 | } | ||
| 142 | 168 | | |||
| 143 | QtControls.ComboBox { | 169 | QtControls.ComboBox { | ||
| 144 | id: hintingCombo | 170 | id: hintingCombo | ||
| 145 | Layout.preferredWidth: formLayout.maxImplicitWidth | 171 | Layout.preferredWidth: formLayout.maxImplicitWidth | ||
| 146 | Kirigami.FormData.label: i18n("Hinting style:") | 172 | Kirigami.FormData.label: i18n("Hinting style:") | ||
| 147 | currentIndex: kcm.fontAASettings.hintingCurrentIndex | 173 | currentIndex: kcm.fontAASettings.hintingCurrentIndex | ||
| 148 | onCurrentTextChanged: kcm.fontAASettings.hintingCurrentIndex = currentIndex; | 174 | onCurrentTextChanged: kcm.fontAASettings.hintingCurrentIndex = currentIndex; | ||
| 149 | model: kcm.fontAASettings.hintingOptionsModel | 175 | model: kcm.fontAASettings.hintingOptionsModel | ||
| 150 | textRole: "display" | 176 | textRole: "display" | ||
| 151 | enabled: antiAliasingComboBox.currentIndex == 0 | 177 | enabled: antiAliasingComboBox.currentIndex == 0 | ||
| 178 | popup.height: popup.implicitHeight | ||||
| 179 | delegate: QtControls.ItemDelegate { | ||||
| 180 | id: hintingDelegate | ||||
| 181 | onWidthChanged: { | ||||
| 182 | hintingCombo.popup.width = Math.max(hintingCombo.popup.width, width) | ||||
| 183 | } | ||||
| 184 | contentItem: ColumnLayout { | ||||
| 185 | id: hintingLayout | ||||
| 186 | Kirigami.Heading { | ||||
| 187 | id: hintingComboText | ||||
| 188 | text: model.display | ||||
| 189 | level: 5 | ||||
| 190 | } | ||||
| 191 | Image { | ||||
| 192 | id: hintingComboImage | ||||
We dont' need these transforms. davidedmundson: We dont' need these transforms.
There shouldn't be any high DPI specicfic code in QML. | |||||
| 193 | source: "image://preview/" + kcm.fontAASettings.subPixelCurrentIndex + "_" + model.index + ".png" | ||||
| 194 | // Setting sourceSize here is necessary as a workaround for QTBUG-38127 | ||||
| 195 | // | ||||
| 196 | // With this bug, images requested from a QQuickImageProvider have an incorrect scale with devicePixelRatio != 1 when sourceSize is not set. | ||||
| 197 | // | ||||
| 198 | // TODO: Check if QTBUG-38127 is fixed and remove the next two lines. | ||||
| 199 | sourceSize.width: 1 | ||||
| 200 | sourceSize.height: 1 | ||||
| 201 | } | ||||
| 202 | } | ||||
| 203 | } | ||||
| 152 | } | 204 | } | ||
| 153 | 205 | | |||
| 154 | RowLayout { | 206 | RowLayout { | ||
| 155 | QtControls.CheckBox { | 207 | QtControls.CheckBox { | ||
| 156 | id: dpiCheckBox | 208 | id: dpiCheckBox | ||
| 157 | checked: dpiSpinBox.value != 96 | 209 | checked: dpiSpinBox.value != 96 | ||
| 158 | text: i18n("Force Fonts DPI:") | 210 | text: i18n("Force Fonts DPI:") | ||
| 159 | onCheckedChanged: { | 211 | onCheckedChanged: { | ||
| Show All 37 Lines | |||||
Is 2.2 also sufficient (Qt 5.9)?