update update description and add people in thanks section of aboutpage

brvier · Apr 8, 2013 · c1c0b99 · c1c0b99
1 parent 5994315
commit c1c0b99
Show file tree

Hide file tree

Showing 4 changed files with 298 additions and 4 deletions.
diff --git a/bitpurse/__init__.py b/bitpurse/__init__.py
@@ -46,7 +46,8 @@
 1.8.0: Add watch only address (addr without priv key)
 1.9.0: Better splash screen and icon
 2.0.0: Improve password dialog
-       Add request btc feature'''
+       Add request btc feature
+       Add fiat convertion'''
 
 
 class BitPurse(QApplication):
@@ -119,4 +120,4 @@ def __init__(self):
         self.walletController.settings.numberOfLaunch += 1
 
 if __name__ == '__main__':
-    sys.exit(BitPurse().exec_()) 
+    sys.exit(BitPurse().exec_())
diff --git a/bitpurse/qml/AboutPage.qml b/bitpurse/qml/AboutPage.qml
@@ -175,10 +175,10 @@ Page {
             }
 
             Label {
-                text: qsTr('<b>Thanks to</b><br>M4rtinK on #NemoMobile on freenode for the name suggestion<br>Andrew Zhilin @andrewzhilin')
+                text: qsTr('<b>Thanks to</b><br>M4rtinK on #NemoMobile on freenode for the name suggestion<br>Andrew Zhilin @andrewzhilin for icon and splash screen<br>Timur Kristóf for some qml components from irc-chatter')
                 anchors {right: parent.right; left: parent.left}
                 wrapMode: Text.WordWrap
             }
         }
     }
-}       
+}       
diff --git a/bitpurse/qml/CommonDialog.qml b/bitpurse/qml/CommonDialog.qml
@@ -0,0 +1,164 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Components project.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.1
+import com.nokia.meego 1.0
+
+Dialog {
+    id: genericDialog
+
+    property string titleText: ""
+
+    property Style platformStyle: SelectionDialogStyle {}
+
+    //Deprecated, TODO Remove this on w13
+    property alias style: genericDialog.platformStyle
+
+    //private
+    property bool __drawFooterLine: false
+
+    title: Item {
+        id: header
+        height: genericDialog.platformStyle.titleBarHeight
+
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.top: parent.top
+        anchors.bottom: parent.bottom
+
+        Item {
+            id: labelField
+
+            anchors.fill:  parent
+
+            Item {
+                id: labelWrapper
+                anchors.left: labelField.left
+                anchors.right: closeButton.left
+
+                anchors.bottom:  parent.bottom
+                anchors.bottomMargin: genericDialog.platformStyle.titleBarLineMargin
+
+                //anchors.verticalCenter: labelField.verticalCenter
+
+                height: titleLabel.height
+
+                Label {
+                    id: titleLabel
+                    x: genericDialog.platformStyle.titleBarIndent
+                    width: parent.width - closeButton.width
+                    //anchors.baseline:  parent.bottom
+                    font: genericDialog.platformStyle.titleBarFont
+                    color: genericDialog.platformStyle.commonLabelColor
+                    elide: genericDialog.platformStyle.titleElideMode
+                    text: genericDialog.titleText
+                }
+
+            }
+
+            Image {
+                id: closeButton
+                anchors.bottom:  parent.bottom
+                anchors.bottomMargin: genericDialog.platformStyle.titleBarLineMargin-6
+                //anchors.verticalCenter: labelField.verticalCenter
+                anchors.right: labelField.right
+
+                opacity: closeButtonArea.pressed ? 0.5 : 1.0
+
+                source: "image://theme/icon-m-common-dialog-close"
+
+                MouseArea {
+                    id: closeButtonArea
+                    anchors.fill: parent
+                    onClicked:  {genericDialog.reject();}
+                }
+
+            }
+
+        }
+
+        Rectangle {
+            id: headerLine
+
+            anchors.left: parent.left
+            anchors.right: parent.right
+
+            anchors.bottom:  header.bottom
+
+            height: 1
+
+            color: "#4D4D4D"
+        }
+
+    }
+
+    content: Item {id: contentField}
+
+    buttons: Item {
+         id: footer
+
+         width: parent.width
+         height: childrenRect.height
+
+         //hack to make sure, we're evaluating the correct height
+         Item {
+             id: lineWrapper
+             width: parent.width
+             height: childrenRect.height
+             y: 10
+
+             Rectangle {
+                 id: footerLine
+
+                 anchors.left: parent.left
+                 anchors.right: parent.right
+                 anchors.top: parent.top
+                 height: genericDialog.__drawFooterLine ? 1 : 0
+
+                 color: "#4D4D4D"
+             }
+         }
+
+         //ugly hack to assure, that we're always evaluating the correct height
+         Item {id: dummy; anchors.fill:  parent}
+
+     }
+
+}
diff --git a/bitpurse/qml/WorkingSelectionDialog.qml b/bitpurse/qml/WorkingSelectionDialog.qml
@@ -0,0 +1,129 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Components project.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.1
+import com.nokia.meego 1.0
+
+CommonDialog {
+    id: selectorDialog
+    property int selectedIndex: -1
+    property alias model: selectorListView.model
+    property bool searchFieldVisible: false
+
+    onStatusChanged: {
+        if (status === DialogStatus.Closing) {
+            searchField.platformCloseSoftwareInputPanel();
+            searchField.text = "";
+        }
+        else if (status === DialogStatus.Opening) {
+            if (searchFieldVisible && inPortrait)
+                searchField.forceActiveFocus();
+        }
+    }
+
+    content: Column {
+        width: parent.width
+        anchors.top: parent.top
+        anchors.topMargin: 10
+        spacing: 5
+
+        TextField {
+            id: searchField
+            placeholderText: "Search"
+            width: parent.width
+            visible: selectorDialog.searchFieldVisible
+            inputMethodHints: Qt.ImhNoPredictiveText | Qt.ImhNoAutoUppercase
+        }
+
+        ListView {
+            id: selectorListView
+            height: (inputContext.softwareInputPanelVisible) ?
+                        ((!inPortrait) ? Math.min(selectorDialog.platformStyle.itemHeight * count, 100) : Math.min(selectorDialog.platformStyle.itemHeight * count, 300))
+                      : Math.min(selectorDialog.platformStyle.itemHeight * count, 300)
+            width: parent.width
+            interactive: true
+            clip: true
+
+            ScrollDecorator {
+                flickableItem: selectorListView
+            }
+
+            delegate: Component {
+                id: defaultDelegate
+
+                Item {
+                    id: delegateItem
+                    property bool selected: index == selectorDialog.selectedIndex;
+                    property string displayableText: model.modelData !== undefined ? model.modelData : (model.display !== undefined ? model.display : (model.edit !== undefined ? model.edit : model.name))
+
+                    anchors.left: parent.left
+                    anchors.right: parent.right
+                    visible: searchField.text.length === 0 || (searchFieldVisible && displayableText.toLowerCase().indexOf(searchField.text.toLowerCase()) > -1);
+                    height: visible ? selectorDialog.platformStyle.itemHeight : 0
+
+                    MouseArea {
+                        id: delegateMouseArea
+                        anchors.fill: parent;
+                        onPressed: selectorDialog.selectedIndex = index;
+                        onClicked: selectorDialog.accept();
+                    }
+                    Rectangle {
+                        id: backgroundRect
+                        anchors.fill: parent
+                        color: delegateItem.selected ? selectorDialog.platformStyle.itemSelectedBackgroundColor : selectorDialog.platformStyle.itemBackgroundColor
+                    }
+                    Text {
+                        id: itemText
+                        elide: Text.ElideRight
+                        color: delegateItem.selected ? selectorDialog.platformStyle.itemSelectedTextColor : selectorDialog.platformStyle.itemTextColor
+                        anchors.verticalCenter: delegateItem.verticalCenter
+                        anchors.left: parent.left
+                        anchors.right: parent.right
+                        anchors.leftMargin: selectorDialog.platformStyle.itemLeftMargin
+                        anchors.rightMargin: selectorDialog.platformStyle.itemRightMargin
+                        text: delegateItem.displayableText
+                        font: selectorDialog.platformStyle.itemFont
+                    }
+                }
+            }
+        }
+    }
+}
+