git.iko.soy/unity8
on xenial help sign in
filtering based on language
afff8a8Lukáš Tinkl
plugins/Wizard/keyboardLayoutsModel.cpp+11−24
compare with xenial
unifiedsplit
@@ -25,8 +25,7 @@ Q_DECLARE_METATYPE(StringMapList)
25struct KeyboardLayoutInfo {
25struct KeyboardLayoutInfo {
26 QString id;
26 QString id;
27 QString displayName;
27 QString displayName;
28− QString shortName; // language
28+ QString language;
29− QString layoutAndVariant;
30};
29};
31
30
32KeyboardLayoutsModel::KeyboardLayoutsModel(QObject *parent)
31KeyboardLayoutsModel::KeyboardLayoutsModel(QObject *parent)
@@ -35,8 +34,7 @@ KeyboardLayoutsModel::KeyboardLayoutsModel(QObject *parent)
35 m_roleNames = {
34 m_roleNames = {
36 {LayoutIdRole, "layoutId"},
35 {LayoutIdRole, "layoutId"},
37 {DisplayNameRole, "displayName"},
36 {DisplayNameRole, "displayName"},
38− {ShortNameRole, "shortName"},
37+ {LanguageRole, "language"}
39− {LayoutAndVariantRole, "layoutAndVariant"}
40 };
38 };
41
39
42 qDBusRegisterMetaType<StringMapList>();
40 qDBusRegisterMetaType<StringMapList>();
@@ -73,8 +71,8 @@ static bool compareLayouts(const KeyboardLayoutInfo &layout0, const KeyboardLayo
73 QString name1(layout1.displayName);
71 QString name1(layout1.displayName);
74
72
75 if (name0 == name1) {
73 if (name0 == name1) {
76− name0 = layout0.shortName;
74+ name0 = layout0.language;
77− name1 = layout1.shortName;
75+ name1 = layout1.language;
78
76
79 if (name0 == name1) {
77 if (name0 == name1) {
80 name0 = layout0.id;
78 name0 = layout0.id;
@@ -89,23 +87,15 @@ void KeyboardLayoutsModel::buildModel()
89{
87{
90 beginResetModel();
88 beginResetModel();
91
89
92−
93 GList *sources, *tmp;
90 GList *sources, *tmp;
94 const gchar *display_name;
91 const gchar *display_name;
95 const gchar *short_name;
92 const gchar *short_name;
96 const gchar *xkb_layout;
93 const gchar *xkb_layout;
97 const gchar *xkb_variant;
94 const gchar *xkb_variant;
98
95
99− if (m_language.isEmpty()) {
100− sources = gnome_xkb_info_get_all_layouts(m_xkbInfo);
96+ sources = gnome_xkb_info_get_all_layouts(m_xkbInfo);
101− } else {
102− sources = gnome_xkb_info_get_layouts_for_language(m_xkbInfo, m_language.toUtf8().constData());
103− }
104
97
105 m_layouts.clear();
98 m_layouts.clear();
106− m_layouts.reserve(g_list_length(sources));
107−
108− qDebug() << "!!! Got" << m_layouts.count() << "layouts";
109
99
110 for (tmp = sources; tmp != NULL; tmp = tmp->next) {
100 for (tmp = sources; tmp != NULL; tmp = tmp->next) {
111 gboolean result = gnome_xkb_info_get_layout_info(m_xkbInfo, (const gchar *)tmp->data,
101 gboolean result = gnome_xkb_info_get_layout_info(m_xkbInfo, (const gchar *)tmp->data,
@@ -117,17 +107,16 @@ void KeyboardLayoutsModel::buildModel()
117
107
118 KeyboardLayoutInfo layout;
108 KeyboardLayoutInfo layout;
119 layout.id = QString::fromUtf8((const gchar *)tmp->data);
109 layout.id = QString::fromUtf8((const gchar *)tmp->data);
120− layout.shortName = QString::fromUtf8(short_name);
110+ layout.language = QString::fromUtf8(short_name);
121 layout.displayName = QString::fromUtf8(display_name);
111 layout.displayName = QString::fromUtf8(display_name);
122− layout.layoutAndVariant = QString::fromUtf8(g_strconcat(xkb_layout, "+", xkb_variant, NULL));
123
112
124− if (!layout.shortName.isEmpty()) {
113+ if (layout.language.isEmpty() || layout.language == m_language) {
125− qDebug() << "!!! Appending layout with id:" << layout.id;
126 m_layouts.append(layout);
114 m_layouts.append(layout);
115+ qDebug() << "Inserted layout:" << layout.id << ", language:" << layout.language;
127 }
116 }
128−
129 }
117 }
130 g_list_free(sources);
118 g_list_free(sources);
119+
131 std::sort(m_layouts.begin(), m_layouts.end(), compareLayouts);
120 std::sort(m_layouts.begin(), m_layouts.end(), compareLayouts);
132
121
133 endResetModel();
122 endResetModel();
@@ -156,10 +145,8 @@ QVariant KeyboardLayoutsModel::data(const QModelIndex &index, int role) const
156 return layout.displayName;
145 return layout.displayName;
157 case LayoutIdRole:
146 case LayoutIdRole:
158 return layout.id;
147 return layout.id;
159− case ShortNameRole:
148+ case LanguageRole:
160− return layout.shortName;
149+ return layout.language;
161− case LayoutAndVariantRole:
162− return layout.layoutAndVariant;
163 default: {
150 default: {
164 qWarning() << Q_FUNC_INFO << "unsupported data role";
151 qWarning() << Q_FUNC_INFO << "unsupported data role";
165 return QVariant();
152 return QVariant();
plugins/Wizard/keyboardLayoutsModel.h+1−2
@@ -37,8 +37,7 @@ public:
37 enum Roles {
37 enum Roles {
38 LayoutIdRole = Qt::UserRole + 1,
38 LayoutIdRole = Qt::UserRole + 1,
39 DisplayNameRole,
39 DisplayNameRole,
40− ShortNameRole,
40+ LanguageRole
41− LayoutAndVariantRole,
42 };
41 };
43
42
44 QString language() const;
43 QString language() const;
qml/Wizard/Pages/10-welcome.qml+1
@@ -160,6 +160,7 @@ LocalComponents.Page {
160 var locale = plugin.languageCodes[languagesListView.currentIndex];
160 var locale = plugin.languageCodes[languagesListView.currentIndex];
161 var language = locale.split("_")[0].split(".")[0];
161 var language = locale.split("_")[0].split(".")[0];
162 plugin.currentLanguage = languagesListView.currentIndex;
162 plugin.currentLanguage = languagesListView.currentIndex;
163+ print("Setting current language to:", plugin.currentLanguage)
163 oskPlugin.setCurrentLayout(language);
164 oskPlugin.setCurrentLayout(language);
164 System.updateSessionLocale(locale);
165 System.updateSessionLocale(locale);
165 }
166 }
qml/Wizard/Pages/20-keyboard.qml+72−16
@@ -15,8 +15,10 @@
15 */
15 */
16
16
17import QtQuick 2.4
17import QtQuick 2.4
18+import QtQuick.Layouts 1.1
18import Ubuntu.Components 1.3
19import Ubuntu.Components 1.3
19import Ubuntu.Components.ListItems 1.3
20import Ubuntu.Components.ListItems 1.3
21+import Ubuntu.SystemSettings.LanguagePlugin 1.0
20import Wizard 0.1
22import Wizard 0.1
21import ".." as LocalComponents
23import ".." as LocalComponents
22
24
@@ -26,42 +28,96 @@ LocalComponents.Page {
26 title: i18n.tr("Hardware Keyboard")
28 title: i18n.tr("Hardware Keyboard")
27 forwardButtonSourceComponent: forwardButton
29 forwardButtonSourceComponent: forwardButton
28
30
31+ UbuntuLanguagePlugin {
32+ id: langPlugin
33+ }
34+
29 KeyboardLayoutsModel {
35 KeyboardLayoutsModel {
30− id: allLayoutsModel
36+ id: layoutsModel
37+ language: selectedLanguage
38+ }
39+
40+ Component.onCompleted: print("Initial language:", i18n.language)
41+
42+ readonly property string selectedLanguage: langPlugin.languageCodes[langSelector.selectedIndex].split("_")[0].split(".")[0]
43+
44+ onSelectedLanguageChanged: {
45+ print("Selected language:", selectedLanguage)
31 }
46 }
32
47
33− ListView {
48+ ColumnLayout {
34− id: keyboardListView
49+ id: column
35− clip: true
50+ spacing: units.gu(2)
36− snapMode: ListView.SnapToItem
37
51
38 anchors {
52 anchors {
39 fill: content
53 fill: content
40 leftMargin: wideMode ? parent.leftMargin : 0
54 leftMargin: wideMode ? parent.leftMargin : 0
41 rightMargin: wideMode ? parent.rightMargin : 0
55 rightMargin: wideMode ? parent.rightMargin : 0
42 topMargin: wideMode ? parent.customMargin : 0
56 topMargin: wideMode ? parent.customMargin : 0
57+ bottomMargin: units.gu(2)
43 }
58 }
44
59
45− model: allLayoutsModel
60+ ItemSelector {
61+ id: langSelector
62+ anchors.left: parent.left
63+ anchors.right: parent.right
64+ text: i18n.tr("Keyboard Language")
65+ model: langPlugin.languageNames
66+ selectedIndex: langPlugin.languageCodes.indexOf(i18n.language)
67+ onSelectedIndexChanged: keyboardListView.currentIndex = -1
68+ }
69+
70+ ListView {
71+ Layout.fillHeight: true
72+ id: keyboardListView
73+ clip: true
74+ anchors.left: parent.left
75+ anchors.right: parent.right
76+ snapMode: ListView.SnapToItem
77+ model: layoutsModel
78+ currentIndex: -1
79+
80+ delegate: ListItem {
81+ id: itemDelegate
82+ objectName: "kbdDelegate" + index
83+ height: layout.height + (divider.visible ? divider.height : 0)
84+ readonly property bool isCurrent: index === ListView.view.currentIndex
46
85
47− delegate: ListItem {
86+ ListItemLayout {
48− objectName: "kbdDelegate" + index
87+ id: layout
49− height: layout.height + (divider.visible ? divider.height : 0)
88+ title.text: displayName
89+ subtitle.text: layoutId
90+ Image {
91+ SlotsLayout.position: SlotsLayout.Trailing
92+ SlotsLayout.overrideVerticalPositioning: true
93+ fillMode: Image.PreserveAspectFit
94+ anchors.verticalCenter: parent.verticalCenter
95+ height: units.gu(1.5)
96+ source: "data/Tick@30.png"
97+ visible: itemDelegate.isCurrent
98+ }
99+ }
50
100
51− ListItemLayout {
101+ onClicked: {
52− id: layout
102+ keyboardListView.currentIndex = index;
53− title.text: displayName
103+ }
54− subtitle.text: layoutId
55− CheckBox { SlotsLayout.position: SlotsLayout.Leading }
56 }
104 }
57 }
105 }
106+
107+ TextField {
108+ id: tester
109+ anchors.left: parent.left
110+ anchors.leftMargin: column.anchors.leftMargin == 0 ? units.gu(2) : 0
111+ anchors.right: parent.right
112+ anchors.rightMargin: column.anchors.rightMargin == 0 ? units.gu(2) : 0
113+ placeholderText: i18n.tr("Type here to test your keyboard")
114+ }
58 }
115 }
59
116
60 Component {
117 Component {
61 id: forwardButton
118 id: forwardButton
62 LocalComponents.StackButton {
119 LocalComponents.StackButton {
63− text: i18n.tr("Next")
120+ text: keyboardListView.currentIndex != -1 ? i18n.tr("Next") : i18n.tr("Skip")
64− enabled: true
65 onClicked: pageStack.next();
121 onClicked: pageStack.next();
66 }
122 }
67 }
123 }
tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/MockLanguagePlugin.qml+3−2
@@ -17,7 +17,8 @@
17import QtQuick 2.4
17import QtQuick 2.4
18
18
19Item {
19Item {
20− property var languageNames: ["English (United States)", "French (France)", "Spanish (Spain)"]
20+ property var languageNames: ["English (United States)", "French (France)", "Spanish (Spain)", "Spanish (Mexico)",
21+ "German (Switzerland)", "Czech (Czechia)"]
21− property var languageCodes: ["en_US", "fr_FR", "es_ES"]
22+ property var languageCodes: ["en_US", "fr_FR", "es_ES", "es_MX", "de_CH", "cs_CZ"]
22 property int currentLanguage: 0
23 property int currentLanguage: 0
23}
24}