git.iko.soy/unity8
on xenial help sign in
Extend fallback names
a9fd349Daniel d'Andrada
plugins/Cursor/CursorImageProvider.cpp+46−13
compare with xenial
unifiedsplit
@@ -113,34 +113,67 @@ CursorImageProvider::CursorImageProvider()
113 }
113 }
114 m_instance = this;
114 m_instance = this;
115
115
116− m_fallbackNames[QLatin1String("ibeam")].append(QLatin1String("xterm"));
116+ m_fallbackNames[QLatin1String("closedhand")].append(QLatin1String("grabbing"));
117− m_fallbackNames[QLatin1String("xterm")].append(QLatin1String("ibeam"));
117+ m_fallbackNames[QLatin1String("closedhand")].append(QLatin1String("dnd-none"));
118+
118 m_fallbackNames[QLatin1String("dnd-copy")].append(QLatin1String("dnd-none"));
119 m_fallbackNames[QLatin1String("dnd-copy")].append(QLatin1String("dnd-none"));
119 m_fallbackNames[QLatin1String("dnd-copy")].append(QLatin1String("grabbing"));
120 m_fallbackNames[QLatin1String("dnd-copy")].append(QLatin1String("grabbing"));
120 m_fallbackNames[QLatin1String("dnd-copy")].append(QLatin1String("closedhand"));
121 m_fallbackNames[QLatin1String("dnd-copy")].append(QLatin1String("closedhand"));
122+
121 m_fallbackNames[QLatin1String("dnd-move")].append(QLatin1String("dnd-none"));
123 m_fallbackNames[QLatin1String("dnd-move")].append(QLatin1String("dnd-none"));
122 m_fallbackNames[QLatin1String("dnd-move")].append(QLatin1String("grabbing"));
124 m_fallbackNames[QLatin1String("dnd-move")].append(QLatin1String("grabbing"));
123 m_fallbackNames[QLatin1String("dnd-move")].append(QLatin1String("closedhand"));
125 m_fallbackNames[QLatin1String("dnd-move")].append(QLatin1String("closedhand"));
126+
124 m_fallbackNames[QLatin1String("dnd-link")].append(QLatin1String("dnd-none"));
127 m_fallbackNames[QLatin1String("dnd-link")].append(QLatin1String("dnd-none"));
125 m_fallbackNames[QLatin1String("dnd-link")].append(QLatin1String("grabbing"));
128 m_fallbackNames[QLatin1String("dnd-link")].append(QLatin1String("grabbing"));
126 m_fallbackNames[QLatin1String("dnd-link")].append(QLatin1String("closedhand"));
129 m_fallbackNames[QLatin1String("dnd-link")].append(QLatin1String("closedhand"));
127− m_fallbackNames[QLatin1String("closedhand")].append(QLatin1String("grabbing"));
128− m_fallbackNames[QLatin1String("closedhand")].append(QLatin1String("dnd-none"));
129
130
130− // Needed for DMZ-White and DMZ-Black xcursor themes at least.
131+ m_fallbackNames[QLatin1String("forbidden")].append(QLatin1String("crossed_circle")); // DMZ-White and DMZ-Black themes
131− // Ideally those themes would have symbolic links to achieve the same, but that's not the case.
132+ m_fallbackNames[QLatin1String("forbidden")].append(QLatin1String("not-allowed"));
133+ m_fallbackNames[QLatin1String("forbidden")].append(QLatin1String("circle"));
134+
135+ m_fallbackNames[QLatin1String("hand")].append(QLatin1String("pointing_hand"));
136+ m_fallbackNames[QLatin1String("hand")].append(QLatin1String("pointer"));
137+
138+ m_fallbackNames[QLatin1String("ibeam")].append(QLatin1String("xterm"));
139+ m_fallbackNames[QLatin1String("ibeam")].append(QLatin1String("text"));
140+
132− m_fallbackNames[QLatin1String("up_arrow")].append(QLatin1String("sb_up_arrow"));
141+ m_fallbackNames[QLatin1String("left_ptr")].append(QLatin1String("default"));
133− m_fallbackNames[QLatin1String("size_ver")].append(QLatin1String("sb_v_double_arrow"));
142+ m_fallbackNames[QLatin1String("left_ptr")].append(QLatin1String("top_left_arrow"));
134− m_fallbackNames[QLatin1String("size_hor")].append(QLatin1String("sb_h_double_arrow"));
143+ m_fallbackNames[QLatin1String("left_ptr")].append(QLatin1String("left_arrow"));
144+
145+ m_fallbackNames[QLatin1String("left_ptr_watch")].append(QLatin1String("half-busy"));
146+ m_fallbackNames[QLatin1String("left_ptr_watch")].append(QLatin1String("progress"));
147+
135 m_fallbackNames[QLatin1String("size_bdiag")].append(QLatin1String("fd_double_arrow"));
148 m_fallbackNames[QLatin1String("size_bdiag")].append(QLatin1String("fd_double_arrow"));
149+ m_fallbackNames[QLatin1String("size_bdiag")].append(QLatin1String("nesw-resize"));
150+
136− m_fallbackNames[QLatin1String("size_fdiag")].append(QLatin1String("bd_double_arrow"));
151+ m_fallbackNames[QLatin1String("size_fdiag")].append(QLatin1String("bd_double_arrow")); // DMZ-White and DMZ-Black themes
152+ m_fallbackNames[QLatin1String("size_fdiag")].append(QLatin1String("nwse-resize"));
153+
154+ m_fallbackNames[QLatin1String("size_hor")].append(QLatin1String("sb_h_double_arrow")); // DMZ-White and DMZ-Black themes
137− m_fallbackNames[QLatin1String("split_v")].append(QLatin1String("sb_v_double_arrow"));
155+ m_fallbackNames[QLatin1String("size_hor")].append(QLatin1String("ew-resize"));
156+ m_fallbackNames[QLatin1String("size_hor")].append(QLatin1String("h_double_arrow"));
157+
158+ m_fallbackNames[QLatin1String("size_ver")].append(QLatin1String("sb_v_double_arrow")); // DMZ-White and DMZ-Black themes
159+ m_fallbackNames[QLatin1String("size_ver")].append(QLatin1String("ns-resize"));
160+ m_fallbackNames[QLatin1String("size_ver")].append(QLatin1String("v_double_arrow"));
161+
138− m_fallbackNames[QLatin1String("split_h")].append(QLatin1String("sb_h_double_arrow"));
162+ m_fallbackNames[QLatin1String("split_h")].append(QLatin1String("sb_h_double_arrow")); // DMZ-White and DMZ-Black themes
163+ m_fallbackNames[QLatin1String("split_h")].append(QLatin1String("col-resize"));
164+
139− m_fallbackNames[QLatin1String("forbidden")].append(QLatin1String("crossed_circle"));
165+ m_fallbackNames[QLatin1String("split_v")].append(QLatin1String("sb_v_double_arrow")); // DMZ-White and DMZ-Black themes
166+ m_fallbackNames[QLatin1String("split_v")].append(QLatin1String("row-resize"));
167+
168+ m_fallbackNames[QLatin1String("up_arrow")].append(QLatin1String("sb_up_arrow")); // DMZ-White and DMZ-Black themes
169+
170+ m_fallbackNames[QLatin1String("watch")].append(QLatin1String("wait"));
140
171
141 m_fallbackNames[QLatin1String("whats_this")].append(QLatin1String("left_ptr_help"));
172 m_fallbackNames[QLatin1String("whats_this")].append(QLatin1String("left_ptr_help"));
142 m_fallbackNames[QLatin1String("whats_this")].append(QLatin1String("help"));
173 m_fallbackNames[QLatin1String("whats_this")].append(QLatin1String("help"));
143 m_fallbackNames[QLatin1String("whats_this")].append(QLatin1String("question_arrow"));
174 m_fallbackNames[QLatin1String("whats_this")].append(QLatin1String("question_arrow"));
175+
176+ m_fallbackNames[QLatin1String("xterm")].append(QLatin1String("ibeam"));
144}
177}
145
178
146CursorImageProvider::~CursorImageProvider()
179CursorImageProvider::~CursorImageProvider()