GUI changes

src/qt/bitcoin.qrc

@@ -58,6 +58,7 @@
         <file>res/icons/GUI20_mainToolBar_info_hover.png</file>
         <file>res/icons/GUI20_mainToolBar_contacts.png</file>
         <file>res/icons/GUI20_mainToolBar_contacts_hover.png</file>
+        <file>res/icons/prypto.png</file>
     </qresource>
     <qresource prefix="/images">
         <file alias="about">res/images/about.png</file>

src/qt/forms/infopage.ui

@@ -31,15 +31,11 @@
    </property>
    <item row="1" column="1">
     <widget class="QFrame" name="casinoInfoBox">
-     <property name="font">
-      <font>
-       <pointsize>10</pointsize>
-       <weight>75</weight>
-       <bold>true</bold>
-      </font>
+     <property name="frameShape">
+      <enum>QFrame::StyledPanel</enum>
      </property>
-     <property name="styleSheet">
-      <string notr="true">color: rgb(166, 27, 31); background-color: rgb(255,255,255);</string>
+     <property name="frameShadow">
+      <enum>QFrame::Sunken</enum>
      </property>
      <widget class="QLabel" name="lblCasinosHeader">
       <property name="geometry">
@@ -68,15 +64,11 @@
    </item>
    <item row="0" column="1">
     <widget class="QFrame" name="newsItemsBox">
-     <property name="font">
-      <font>
-       <pointsize>10</pointsize>
-       <weight>75</weight>
-       <bold>true</bold>
-      </font>
+     <property name="frameShape">
+      <enum>QFrame::StyledPanel</enum>
      </property>
-     <property name="styleSheet">
-      <string notr="true">color: rgb(166, 27, 31); background-color: rgb(255,255,255);</string>
+     <property name="frameShadow">
+      <enum>QFrame::Sunken</enum>
      </property>
      <widget class="QLabel" name="lblNewsHeader">
       <property name="geometry">
@@ -105,15 +97,11 @@
    </item>
    <item row="1" column="0">
     <widget class="QFrame" name="exchangeInfoBox">
-     <property name="font">
-      <font>
-       <pointsize>10</pointsize>
-       <weight>75</weight>
-       <bold>true</bold>
-      </font>
+     <property name="frameShape">
+      <enum>QFrame::StyledPanel</enum>
      </property>
-     <property name="styleSheet">
-      <string notr="true">color: rgb(166, 27, 31); background-color: rgb(255,255,255);</string>
+     <property name="frameShadow">
+      <enum>QFrame::Sunken</enum>
      </property>
      <widget class="QLabel" name="lblExchangesHeader">
       <property name="geometry">
@@ -142,18 +130,14 @@
    </item>
    <item row="0" column="0">
     <widget class="QFrame" name="coinInfoBox">
-     <property name="font">
-      <font>
-       <pointsize>10</pointsize>
-       <weight>75</weight>
-       <bold>true</bold>
-      </font>
-     </property>
      <property name="autoFillBackground">
       <bool>false</bool>
      </property>
-     <property name="styleSheet">
-      <string notr="true">color: rgb(166, 27, 31); background-color: rgb(255,255,255);</string>
+     <property name="frameShape">
+      <enum>QFrame::StyledPanel</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Sunken</enum>
      </property>
      <widget class="QWidget" name="formLayoutWidget">
       <property name="geometry">

src/qt/forms/overviewpage.ui

@@ -255,11 +255,11 @@
               </property>
              </spacer>
             </item>
-            <item row="6" column="0" colspan="2">
-             <layout class="QVBoxLayout" name="verticalLayoutAdvertWidget"/>
-            </item>
            </layout>
           </item>
+		  <item>
+			<layout class="QVBoxLayout" name="verticalLayoutAdvertWidget"/>
+		  </item>
          </layout>
         </widget>
        </item>

src/qt/forms/pryptopage.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>516</width>
-    <height>300</height>
+    <width>507</width>
+    <height>282</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -18,8 +18,8 @@
     <rect>
      <x>10</x>
      <y>10</y>
-     <width>381</width>
-     <height>191</height>
+     <width>481</width>
+     <height>261</height>
     </rect>
    </property>
    <property name="frameShape">
@@ -28,8 +28,14 @@
    <property name="frameShadow">
     <enum>QFrame::Sunken</enum>
    </property>
-   <layout class="QGridLayout" name="gridLayout">
-    <item row="0" column="0">
+   <layout class="QFormLayout" name="formLayout">
+    <property name="leftMargin">
+     <number>50</number>
+    </property>
+    <property name="rightMargin">
+     <number>50</number>
+    </property>
+    <item row="0" column="0" colspan="2">
      <widget class="QLabel" name="lblHelp">
       <property name="minimumSize">
        <size>
@@ -52,45 +58,48 @@
      </widget>
     </item>
     <item row="1" column="0">
-     <layout class="QGridLayout" name="gridLayout_2">
-      <item row="0" column="0">
-       <widget class="QLabel" name="lblPryptoCode">
-        <property name="text">
-         <string>Prypto Code</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QLineEdit" name="txtPryptoCode"/>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="lblSecurityCode">
-        <property name="text">
-         <string>Security Code</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QLineEdit" name="txtSecurityCode">
-        <property name="inputMethodHints">
-         <set>Qt::ImhDigitsOnly</set>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1">
-       <widget class="QPushButton" name="butRedeem">
-        <property name="text">
-         <string>Redeem</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
+     <widget class="QLabel" name="lblPryptoCode">
+      <property name="text">
+       <string>Prypto Code</string>
+      </property>
+     </widget>
+    </item>
+    <item row="1" column="1">
+     <widget class="QLineEdit" name="txtPryptoCode"/>
+    </item>
+    <item row="2" column="0">
+     <widget class="QLabel" name="lblSecurityCode">
+      <property name="text">
+       <string>Security Code</string>
+      </property>
+     </widget>
+    </item>
+    <item row="2" column="1">
+     <widget class="QLineEdit" name="txtSecurityCode">
+      <property name="inputMethodHints">
+       <set>Qt::ImhDigitsOnly</set>
+      </property>
+     </widget>
+    </item>
+    <item row="4" column="1">
+     <widget class="QPushButton" name="butRedeem">
+      <property name="text">
+       <string>Redeem</string>
+      </property>
+      <property name="icon">
+       <iconset resource="../bitcoin.qrc">
+        <normaloff>:/icons/res/icons/prypto.png</normaloff>:/icons/res/icons/prypto.png</iconset>
+      </property>
+      <property name="autoDefault">
+       <bool>false</bool>
+      </property>
+     </widget>
     </item>
    </layout>
   </widget>
-  <zorder>frame</zorder>
-  <zorder>formLayoutWidget</zorder>
  </widget>
- <resources/>
+ <resources>
+  <include location="../bitcoin.qrc"/>
+ </resources>
  <connections/>
 </ui>

src/qt/qtquick_controls/cpp/guimenutoolbarcontrol.cpp

@@ -24,7 +24,7 @@ GUIMenuToolbarControl::~GUIMenuToolbarControl()
 }
 
 
-void GUIMenuToolbarControl::InitializeMenuToolbarView( GUIMenuToolbarListView* a_pView )
+void GUIMenuToolbarControl::initializeMenuToolbarView( GUIMenuToolbarListView* a_pView )
 {
 	if ( a_pView )
 	{
@@ -47,13 +47,13 @@ void GUIMenuToolbarControl::InitializeMenuToolbarView( GUIMenuToolbarListView* a
 				pStandardMenuModel->append( new QmlMenuToolbarItem( tr( "Info" ),				tr( "Info description" ),				"qrc:/icons/res/icons/GUI20_mainToolBar_info_hover.png",					"qrc:/icons/res/icons/GUI20_mainToolBar_info.png"				, INFO			) );
 				pStandardMenuModel->SetCurrentItemIndex( 0 );
 				m_pMenuToolbarView->SetModel( pStandardMenuModel );
-				ConnectListViewSignals();
+                connectListViewSignals();
 			}
 		}
 	}
 }
 
-void GUIMenuToolbarControl::SetVisitWebsiteText( QString a_strNewText )
+void GUIMenuToolbarControl::setVisitWebsiteText( QString a_strNewText )
 {
 	if ( m_strVisitWebsiteText != a_strNewText )
 	{
@@ -62,7 +62,7 @@ void GUIMenuToolbarControl::SetVisitWebsiteText( QString a_strNewText )
 	}
 }
 
-void GUIMenuToolbarControl::SetWebsiteURL( QString a_strNewText )
+void GUIMenuToolbarControl::setWebsiteURL( QString a_strNewText )
 {
 	if ( m_strWebsiteURL != a_strNewText )
 	{
@@ -71,7 +71,7 @@ void GUIMenuToolbarControl::SetWebsiteURL( QString a_strNewText )
 	}
 }
 
-void GUIMenuToolbarControl::ConnectListViewSignals()
+void GUIMenuToolbarControl::connectListViewSignals()
 {
 	if ( m_pMenuToolbarView )
 	{

src/qt/qtquick_controls/cpp/guimenutoolbarcontrol.h

@@ -28,11 +28,11 @@ public:
 	GUIMenuToolbarControl( QQuickItem* a_pParent = 0 );
 	virtual ~GUIMenuToolbarControl();
 
-	Q_INVOKABLE void InitializeMenuToolbarView( GUIMenuToolbarListView* a_pView );
+	Q_INVOKABLE void initializeMenuToolbarView( GUIMenuToolbarListView* a_pView );
 	GUIMenuToolbarListView* GetMenuToolbarView() const { return m_pMenuToolbarView; }
 
-	void SetVisitWebsiteText( QString a_strNewText );
-	void SetWebsiteURL( QString a_strNewText );
+	void setVisitWebsiteText( QString a_strNewText );
+	void setWebsiteURL( QString a_strNewText );
 
 	QString GetVisitWebsiteText() const { return m_strVisitWebsiteText; }
 	QString GetWebsiteURL() const { return m_strWebsiteURL; }
@@ -50,7 +50,7 @@ private:
 	QString m_strVisitWebsiteText;
 	QString m_strWebsiteURL;
 
-	void ConnectListViewSignals();
+	void connectListViewSignals();
 
 private slots:
 	void slotCurrentItemIndexChanged();

src/qt/qtquick_controls/qml/QmlGUIMenuToolbarControl.qml

@@ -28,7 +28,7 @@ GUIMenuToolbarControl
 
 			Component.onCompleted:
 			{
-				id_toolbarControl.InitializeMenuToolbarView( id_menuToolbarListView )
+                id_toolbarControl.initializeMenuToolbarView( id_menuToolbarListView )
 			}
 			z: 2
 		}

src/qt/transactiontablemodel.cpp

@@ -551,6 +551,10 @@ QVariant TransactionTableModel::data(const QModelIndex &index, int role) const
         {
             return COLOR_NEGATIVE;
         }
+        if(index.column() == Amount && (rec->credit+rec->debit) > 0)
+        {
+            return COLOR_POSITIVE;
+        }
         if(index.column() == ToAddress)
         {
             return addressColor(rec);