git.iko.soy/unity8
on xenial help sign in
fix botched merge
f8c77beLukáš Tinkl
qml/Components/KeyboardShortcutsOverlay.qml−282
compare with xenial
unifiedsplit
@@ -283,286 +283,4 @@ Rectangle {
283 Item { Layout.fillHeight: true; Layout.columnSpan: 2 } // spacer
283 Item { Layout.fillHeight: true; Layout.columnSpan: 2 } // spacer
284 }
284 }
285}
285}
286− * Copyright (C) 2016 Canonical, Ltd.
287− *
288− * This program is free software; you can redistribute it and/or modify
289− * it under the terms of the GNU General Public License as published by
290− * the Free Software Foundation; version 3.
291− *
292− * This program is distributed in the hope that it will be useful,
293− * but WITHOUT ANY WARRANTY; without even the implied warranty of
294− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
295− * GNU General Public License for more details.
296− *
297− * You should have received a copy of the GNU General Public License
298− * along with this program. If not, see <http://www.gnu.org/licenses/>.
299− */
300−
301−import QtQuick 2.4
302−import QtQuick.Layouts 1.1
303−import Ubuntu.Components 1.3
304−
305−Rectangle {
306− width: parent.width * 2/3
307− height: parent.height * 2/3
308− color: theme.palette.normal.background
309− radius: units.gu(.5)
310−
311− GridLayout {
312− anchors.fill: parent
313− anchors.margins: units.gu(4)
314− columns: 2
315− columnSpacing: units.gu(4)
316−
317− Label {
318− Layout.columnSpan: 2
319− text: i18n.tr("Keyboard Shortcuts")
320− fontSize: "large"
321− font.weight: Font.Light
322− lineHeight: 1.6
323− }
324−
325− GridLayout {
326− columns: 2
327− rows: 10
328− columnSpacing: units.gu(4)
329− Layout.alignment: Qt.AlignTop
330−
331− // Unity 8 section
332− Label {
333− Layout.columnSpan: 2
334− text: i18n.tr("Unity 8")
335− font.weight: Font.Light
336− color: theme.palette.normal.baseText
337− lineHeight: 1.3
338− }
339−
340− Label {
341− text: i18n.tr("PrtScr")
342− fontSize: "small"
343− font.weight: Font.Medium
344− }
345− Label {
346− text: i18n.tr("Takes a screenshot.")
347− fontSize: "small"
348− font.weight: Font.Light
349− }
350−
351− Label {
352− text: i18n.tr("Super + Space")
353− fontSize: "small"
354− font.weight: Font.Medium
355− }
356− Label {
357− text: i18n.tr("Switches to next keyboard layout.")
358− fontSize: "small"
359− font.weight: Font.Light
360− }
361−
362− Label {
363− text: i18n.tr("Super + Shift + Space")
364− fontSize: "small"
365− font.weight: Font.Medium
366− }
367− Label {
368− text: i18n.tr("Switches to previous keyboard layout.")
369− fontSize: "small"
370− font.weight: Font.Light
371− }
372−
373−
374− // Launcher section
375− Item { Layout.columnSpan: 2; height: units.gu(2) }
376− Label {
377− Layout.columnSpan: 2
378− text: i18n.tr("Launcher")
379− font.weight: Font.Light
380− color: theme.palette.normal.baseText
381− lineHeight: 1.3
382− }
383−
384− Label {
385− text: i18n.tr("Super (Hold)")
386− fontSize: "small"
387− font.weight: Font.Medium
388− }
389− Label {
390− text: i18n.tr("Opens the launcher, displays shortcuts.")
391− fontSize: "small"
392− font.weight: Font.Light
393− }
394−
395− Label {
396− text: i18n.tr("Alt+F1")
397− fontSize: "small"
398− font.weight: Font.Medium
399− }
400− Label {
401− text: i18n.tr("Opens launcher keyboard navigation mode.")
402− fontSize: "small"
403− font.weight: Font.Light
404− }
405−
406− Label {
407− text: i18n.tr("Super + Tab")
408− fontSize: "small"
409− font.weight: Font.Medium
410− }
411− Label {
412− text: i18n.tr("Switches applications via the launcher.")
413− fontSize: "small"
414− font.weight: Font.Light
415− }
416−
417− Label {
418− text: i18n.tr("Super + 0 to 9")
419− fontSize: "small"
420− font.weight: Font.Medium
421− }
422− Label {
423− text: i18n.tr("Same as clicking on a launcher icon.")
424− fontSize: "small"
425− font.weight: Font.Light
426− }
427
286
428−
429− // Scopes section
430− Item { Layout.columnSpan: 2; height: units.gu(2) }
431− Label {
432− Layout.columnSpan: 2
433− text: i18n.tr("Scopes")
434− font.weight: Font.Light
435− color: theme.palette.normal.baseText
436− lineHeight: 1.3
437− }
438−
439− Label {
440− text: i18n.tr("Super (Tap)")
441− fontSize: "small"
442− font.weight: Font.Medium
443− }
444− Label {
445− text: i18n.tr("Opens the Scopes home.")
446− fontSize: "small"
447− font.weight: Font.Light
448− }
449− }
450−
451− GridLayout {
452− columns: 2
453− rows: 10
454− columnSpacing: units.gu(4)
455− Layout.alignment: Qt.AlignTop
456−
457− // Switching section
458− Label {
459− Layout.columnSpan: 2
460− text: i18n.tr("Switching")
461− font.weight: Font.Light
462− color: theme.palette.normal.baseText
463− lineHeight: 1.3
464− }
465−
466− Label {
467− text: i18n.tr("Alt + Tab")
468− fontSize: "small"
469− font.weight: Font.Medium
470− }
471− Label {
472− text: i18n.tr("Switches between applications.")
473− fontSize: "small"
474− font.weight: Font.Light
475− }
476−
477− Label {
478− text: i18n.tr("Super + W")
479− fontSize: "small"
480− font.weight: Font.Medium
481− }
482− Label {
483− text: i18n.tr("Opens the desktop spread.")
484− fontSize: "small"
485− font.weight: Font.Light
486− }
487−
488− Label {
489− text: i18n.tr("Cursor Left or Right")
490− fontSize: "small"
491− font.weight: Font.Medium
492− }
493− Label {
494− text: i18n.tr("Moves the focus.")
495− fontSize: "small"
496− font.weight: Font.Light
497− }
498−
499−
500− // Windows section
501− Item { Layout.columnSpan: 2; height: units.gu(2) }
502− Label {
503− Layout.columnSpan: 2
504− text: i18n.tr("Windows")
505− font.weight: Font.Light
506− color: theme.palette.normal.baseText
507− lineHeight: 1.3
508− }
509−
510− Label {
511− text: i18n.tr("Ctrl + Super + D")
512− fontSize: "small"
513− font.weight: Font.Medium
514− }
515− Label {
516− text: i18n.tr("Minimizes all windows.")
517− fontSize: "small"
518− font.weight: Font.Light
519− }
520−
521− Label {
522− text: i18n.tr("Ctrl + Super + Up")
523− fontSize: "small"
524− font.weight: Font.Medium
525− }
526− Label {
527− text: i18n.tr("Maximizes the current window.")
528− fontSize: "small"
529− font.weight: Font.Light
530− }
531−
532− Label {
533− text: i18n.tr("Ctrl + Super + Down")
534− fontSize: "small"
535− font.weight: Font.Medium
536− }
537− Label {
538− text: i18n.tr("Minimizes or restores the current window.")
539− fontSize: "small"
540− font.weight: Font.Light
541− }
542−
543− Label {
544− text: i18n.tr("Ctrl + Super + Left or Right")
545− fontSize: "small"
546− font.weight: Font.Medium
547− }
548− Label {
549− text: i18n.tr("Semi-maximizes the current window.")
550− fontSize: "small"
551− font.weight: Font.Light
552− }
553−
554− Label {
555− text: i18n.tr("Alt + F4")
556− fontSize: "small"
557− font.weight: Font.Medium
558− }
559− Label {
560− text: i18n.tr("Closes the current window.")
561− fontSize: "small"
562− font.weight: Font.Light
563− }
564− }
565−
566− Item { Layout.fillHeight: true; Layout.columnSpan: 2 } // spacer
567− }
568−}