Clean a bit the menu (combine about & help) and remove log out useles…

…s feature)
brvier · Apr 8, 2013 · a7613a5 · a7613a5
1 parent eb50895
commit a7613a5
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 17 deletions.
diff --git a/bitpurse/qml/AboutPage.qml b/bitpurse/qml/AboutPage.qml
@@ -100,6 +100,19 @@ Page {
                     anchors.horizontalCenter: parent.horizontalCenter
                 }
 
+                Button {
+                    id: helpButton
+                    width: 350; height: 50
+                    text: qsTr("Help")
+                    onClicked: {
+                        pageStack.push(
+                               Qt.createComponent(
+                                   Qt.resolvedUrl("HelpPage.qml")));
+
+                     }
+                    anchors.horizontalCenter: parent.horizontalCenter
+                }
+
             /*BusyIndicator {
                 id: busyindicatorSending
                 platformStyle: BusyIndicatorStyle { size: "large"; spinnerFrames: "image://theme/spinner"}
@@ -168,4 +181,4 @@ Page {
             }
         }
     }
-}      
+}       
diff --git a/bitpurse/qml/RequestPage.qml b/bitpurse/qml/RequestPage.qml
@@ -51,10 +51,11 @@ Page {
                 source: WalletController.currentAddress ?
                             Qt.resolvedUrl('https://blockchain.info/qr?data='
                                            + WalletController.currentAddress
-                                           + '&size=512') : undefined
-                anchors.right: parent.right
-                anchors.left: parent.left
-               // anchors.verticalCenter: parent.verticalCenter
+                                           + '&size=384') : undefined
+                width: 384
+                height: 384
+
+                anchors.horizontalCenter: parent.horizontalCenter
             }
 
             Label {
@@ -91,4 +92,4 @@ Page {
             }
         }
     }
-}   
+}    
diff --git a/bitpurse/qml/SettingsPage.qml b/bitpurse/qml/SettingsPage.qml
@@ -26,7 +26,7 @@ Page {
 
         Column {
             id: settingsColumn
-            spacing: 10
+            spacing: 15
             width: parent.width - 40
             anchors.horizontalCenter: parent.horizontalCenter
             anchors.top: parent.top
@@ -263,4 +263,4 @@ Page {
         platformStyle: ScrollDecoratorStyle {
         }}
 
-}                
+}                   
diff --git a/bitpurse/qml/TitleLabel.qml b/bitpurse/qml/TitleLabel.qml
@@ -40,4 +40,4 @@ Row {
         font.bold: true
         font.pixelSize: 20
     }
-}
+}  
diff --git a/bitpurse/qml/main.qml b/bitpurse/qml/main.qml
@@ -127,17 +127,17 @@ PageStackWindow {
         id: mainMenu
         visualParent: pageStack
         MenuLayout {
-            MenuItem { text: qsTr("About");
+            MenuItem { text: qsTr("About & Help");
                 onClicked: pageStack.push(
                                Qt.createComponent(
                                    Qt.resolvedUrl("AboutPage.qml")));
             }
 
-            MenuItem { text: qsTr("Help");
+            /*MenuItem { text: qsTr("Help");
                 onClicked: pageStack.push(
                                Qt.createComponent(
                                    Qt.resolvedUrl("HelpPage.qml")));
-            }
+            }*/
 
 
             MenuItem { text: qsTr("Settings");
@@ -152,11 +152,11 @@ PageStackWindow {
                     Qt.openUrlExternally('https://github.com/khertan/BitPurse/issues/new');
                 }
             }
-            MenuItem { text: qsTr('LogOut'); onClicked: {
+            /*MenuItem { text: qsTr('LogOut'); onClicked: {
                     WalletController.currentPassKey = '';
                     changePage(loginPage);
                 }
-            }
+            }*/
         }
     }
 
@@ -192,4 +192,4 @@ PageStackWindow {
             }
         }
     ]
-}                 
+}                  
diff --git a/bitpurse/wallet.py b/bitpurse/wallet.py
@@ -381,7 +381,7 @@ def load_txs_from_blockchain(self,):
                '|'.join(self.getArchivedAddrAddresses())))
 
         data = getDataFromChainblock(req)
-
+        print data
         try:
             self.balance = data['wallet']['final_balance']
         except KeyError:
@@ -886,4 +886,4 @@ def putAddrInClipboard(self, addr):
     currentPassKey = Property(unicode,
                               getCurrentPassKey,
                               setCurrentPassKey,
-                              notify=onCurrentPassKey)     
+                              notify=onCurrentPassKey)