| @@ -0,0 +1,142 @@
+diff --git a/qml/base/SettingsPage.qml b/qml/base/SettingsPage.qml
+index 5872f2f..96f0c65 100644
+--- a/qml/base/SettingsPage.qml
++++ b/qml/base/SettingsPage.qml
+@@ -14,7 +14,7 @@
+ */
+
+ import QtQuick 2.0
+-import com.nokia.meego 1.1
++import Sailfish.Silica 1.0
+ import EmuMaster 1.0
+
+ Page {
+@@ -25,12 +25,14 @@ Page {
+ property alias miscContent: miscColumn.children
+ property string initiatedAction
+
++/*
+ tools: ToolBarLayout {
+ ToolIcon {
+ iconId: "toolbar-back"
+ onClicked: emuView.showEmulationView()
+ }
+ }
++*/
+
+ function yesNoDialogMessage(action) {
+ switch (action) {
+@@ -80,7 +82,7 @@ Page {
+ }
+ }
+
+- Flickable {
++ SilicaFlickable {
+ id: flickable
+ anchors.fill: parent
+ flickableDirection: Flickable.VerticalFlick
+@@ -93,7 +95,7 @@ Page {
+ spacing: 20
+
+ SectionSeperator { text: qsTr("STATE") }
+- ListView {
++ SilicaListView {
+ property int selectedSlot: -3
+
+ id: stateListView
+@@ -126,21 +128,9 @@ Page {
+ }
+ }
+ }
+- ButtonColumn {
+- exclusive: false
+- spacing: 5
+- anchors.horizontalCenter: parent.horizontalCenter
+- visible: appWindow.inPortrait
+-
+- Button { text: qsTr("Save in New Slot"); onClicked: settingsPage.initAction("saveState") }
+- Button { text: qsTr("Restart"); onClicked: settingsPage.initAction("emuReset") }
+- Button { text: qsTr("Delete All"); onClicked: settingsPage.initAction("deleteAllStates") }
+- }
+- ButtonRow {
+- exclusive: false
++ Column {
+ spacing: 5
+ anchors.horizontalCenter: parent.horizontalCenter
+- visible: !appWindow.inPortrait
+
+ Button { text: qsTr("Save in New Slot"); onClicked: settingsPage.initAction("saveState") }
+ Button { text: qsTr("Restart"); onClicked: settingsPage.initAction("emuReset") }
+@@ -228,7 +218,6 @@ Page {
+ }
+
+ }
+- ScrollDecorator { flickableItem: flickable }
+
+ Connections {
+ target: emuView
+@@ -238,19 +227,25 @@ Page {
+ }
+ }
+
+- QueryDialog {
++ Dialog {
+ id: yesNoDialog
+- titleText: qsTr("Really?")
+- acceptButtonText: qsTr("Yes")
+- rejectButtonText: qsTr("No")
++
++ property alias message: yesNoDialogMessage.text
++
+ onAccepted: settingsPage.executeAction(settingsPage.initiatedAction)
++
++ Label {
++ id: yesNoDialogMessage
++ anchors.centerIn: parent
++ }
+ }
+
+- QueryDialog {
++ Dialog {
+ id: emuFaultDialog
+ titleText: qsTr("Oops")
+- rejectButtonText: qsTr("Close")
+ }
++
++ /*
+ StringListProxy {
+ id: inputDeviceFunctionModel
+ }
+@@ -261,4 +256,5 @@ Page {
+ titleText: qsTr("Select Configuration")
+ onAccepted: inputDevice.emuFunction = selectedIndex
+ }
++ */
+ }
+diff --git a/src/base/emuview.cpp b/src/base/emuview.cpp
+index dc46602..736ac4c 100644
+--- a/src/base/emuview.cpp
++++ b/src/base/emuview.cpp
+@@ -151,7 +151,7 @@ void EmuView::setupSettingsView()
+ m_settingsView = new QQuickView();
+ // m_settingsView->setViewport(new QGLWidget());
+ // m_settingsView->resize(QApplication::desktop()->width(), QApplication::desktop()->height());
+- QObject::connect(m_settingsView->engine(), SIGNAL(quit()), SLOT(close()));
++ QObject::connect(m_settingsView->engine(), SIGNAL(quit()), SLOT(showEmulationView()));
+
+ m_settingsView->engine()->addImageProvider("state", new StateImageProvider(m_stateListModel));
+ QQmlContext *context = m_settingsView->rootContext();
+diff --git a/src/base/hostinput.cpp b/src/base/hostinput.cpp
+index ab824d5..6300b3d 100644
+--- a/src/base/hostinput.cpp
++++ b/src/base/hostinput.cpp
+@@ -89,8 +89,7 @@ void HostInput::processTouch(QEvent *e)
+ int y = point.pos().y();
+ if (y < 64) {
+ if (x < 80)
+- qDebug("Pausing this way is temporarily disabled.");
+-// emit pause();
++ emit pause();
+ else if (x > 900) //FIXME: 900 is a hardcoded value.
+ emit quit();
+ }
|
