Merge 07c53ae into 1f2f91d

das-labor · Aug 22, 2017 · 21945b3 · 21945b3
2 parents 1f2f91d + 07c53ae
commit 21945b3
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 5 deletions.
diff --git a/qml/Panopticon/CommentOverlay.qml b/qml/Panopticon/CommentOverlay.qml
@@ -131,7 +131,7 @@ MouseArea {
 				Layout.fillWidth: true
 
 				Keys.onReturnPressed: {
-					if(event.modifiers & Qt.ShiftModifier) {
+					if(event.modifiers & Qt.ControlModifier) {
 						overlay.accepted()
 					} else {
 						event.accepted = false
@@ -152,7 +152,15 @@ MouseArea {
 				Layout.row: 2
 				Layout.alignment: Qt.AlignRight
 
-				text: "Comment (Shift+Return)"
+				function getPlatformCommentShortcut() {
+					if (Qt.platform.os == "osx") {
+						return "Comment (⌘+Return)";
+					} else {
+						return "Comment (Ctrl+Return)";
+					}
+				}
+
+				text: getPlatformCommentShortcut()
 				horizontalAlignment: Text.AlignRight
 				font {
 					family: "Source Sans Pro"

diff --git a/qml/Panopticon/Welcome.qml b/qml/Panopticon/Welcome.qml
@@ -33,7 +33,9 @@ Rectangle {
 			Image {
 				id: logo
 				x: 68; y: 70
-				source: "../icons/logo.png"
+				source: "../icons/logo.svg"
+				sourceSize.width: 500
+				sourceSize.height: 44
 			}
 
 			Component {

diff --git a/qml/Panopticon/Window.qml b/qml/Panopticon/Window.qml
@@ -16,6 +16,7 @@ Ctrl.ApplicationWindow {
 		Ctrl.Menu {
 			title: "File"
 			Ctrl.MenuItem {
+				text: "Open"
 				action: Ctrl.Action {
 					text: "Open"
 					shortcut: StandardKey.Open
@@ -27,6 +28,7 @@ Ctrl.ApplicationWindow {
 				}
 			}
 			Ctrl.MenuItem {
+				text: "Save"
 				action: Ctrl.Action {
 					text: "Save"
 					shortcut: StandardKey.Save
@@ -35,8 +37,9 @@ Ctrl.ApplicationWindow {
 				}
 			}
 			Ctrl.MenuItem {
+				text: "Save as..."
 				action: Ctrl.Action {
-					text: "Save As..."
+					text: "Save as..."
 					shortcut: StandardKey.SaveAs
 					enabled: Panopticon.currentSession != ""
 					onTriggered: {
@@ -46,6 +49,7 @@ Ctrl.ApplicationWindow {
 				}
 			}
 			Ctrl.MenuItem {
+				text: "Quit"
 				action: Ctrl.Action {
 					text: "Quit"
 					shortcut: StandardKey.Quit
@@ -57,6 +61,7 @@ Ctrl.ApplicationWindow {
 		Ctrl.Menu {
 			title: "Edit"
 			Ctrl.MenuItem {
+				text: "Undo"
 				action: Ctrl.Action {
 					text: "Undo"
 					shortcut: StandardKey.Undo
@@ -65,6 +70,7 @@ Ctrl.ApplicationWindow {
 				}
 			}
 			Ctrl.MenuItem {
+				text: "Redo"
 				action: Ctrl.Action {
 					text: "Redo"
 					shortcut: StandardKey.Redo
@@ -93,6 +99,7 @@ Ctrl.ApplicationWindow {
 			title: "Help"
 			//Ctrl.MenuItem { text: "Documentation" }
 			Ctrl.MenuItem {
+				text: "About"
 				action: Ctrl.Action {
 					text: "About"
 					onTriggered: { workspace.state = "welcomeState" }
@@ -146,7 +153,7 @@ Ctrl.ApplicationWindow {
 			id: bar
 			anchors.top: parent.top
 			anchors.bottom: parent.bottom
-			width: 250
+			width: Math.min(parent.width * 0.3, 400)
 			z: 2
 
 			onShowControlFlowGraph: {