AskDavis/Casinotest
1
0
Fork 0
mirror of https://github.com/AskDavis/Casinotest.git synced 2026-01-01 05:05:57 -08:00
Code Issues Packages Projects Releases Wiki Activity

just a few icons updated

Browse Source
This commit is contained in:
felixrojauro
2015-11-24 01:32:40 +01:00
parent 93b1e17402
commit e796796afd
33 changed files with 203 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
casinocoin-qt.pro
View File

@@ -280,7 +280,9 @@ HEADERS += src/qt/bitcoingui.h \
src/qt/qtquick_controls/cpp/guimenutoolbarcontrol.h \
src/qt/gui20_skin.h \
src/qt/cscfusionstyle.h \
src/qt/pryptopage.h
src/qt/pryptopage.h \
src/qt/currencies.h \
src/qt/CSCPublicAPI/jsoncoininfoparser.h
SOURCES += src/qt/bitcoin.cpp \
src/qt/bitcoingui.cpp \
@@ -371,7 +373,9 @@ SOURCES += src/qt/bitcoin.cpp \
src/qt/qtquick_controls/cpp/guimenutoolbarcontrol.cpp \
src/qt/gui20_skin.cpp \
src/qt/cscfusionstyle.cpp \
src/qt/pryptopage.cpp
src/qt/pryptopage.cpp \
src/qt/currencies.cpp \
src/qt/CSCPublicAPI/jsoncoininfoparser.cpp
RESOURCES += src/qt/bitcoin.qrc

15
src/qt/addressbookpage.cpp
View File

@@ -8,6 +8,8 @@
#include "csvmodelwriter.h"
#include "guiutil.h"
#include "gui20_skin.h"
#ifdef USE_QRCODE
#include "qrcodedialog.h"
#endif
@@ -26,7 +28,18 @@ AddressBookPage::AddressBookPage(Mode mode, Tabs tab, QWidget *parent) :
tab(tab)
{
ui->setupUi(this);
GUI20Skin& gui20Skin = GUI20Skin::Instance();
ui->exportButton->setStyleSheet("background-color: rgb (" + QString::number( gui20Skin.GetColorToolbarMainGradientBegin().red() ) +
", " + QString::number( gui20Skin.GetColorToolbarMainGradientBegin().green() ) +
", " + QString::number( gui20Skin.GetColorToolbarMainGradientBegin().blue() ) +
");" \
"color: rgb(255, 255, 255);" \
"pressed" \
"{" \
"background-color: rgb(170, 28, 33);" \
"}"
);
qDebug() << ui->exportButton->styleSheet();
#ifdef Q_OS_MAC // Icons on push buttons are very uncommon on Mac
ui->newAddress->setIcon(QIcon());
ui->copyAddress->setIcon(QIcon());

8
src/qt/bitcoin.qrc
View File

@@ -40,10 +40,10 @@
<file alias="filesave">res/icons/filesave.png</file>
<file alias="qrcode">res/icons/qrcode.png</file>
<file alias="debugwindow">res/icons/debugwindow.png</file>
<file>res/icons/adverts_arrow_left.png</file>
<file>res/icons/adverts_arrow_left_hover.png</file>
<file>res/icons/adverts_arrow_right.png</file>
<file>res/icons/adverts_arrow_right_hover.png</file>
<file alias="advertsArrowLeft">res/icons/adverts_arrow_left.png</file>
<file alias="advertsArrowLeftHover">res/icons/adverts_arrow_left_hover.png</file>
<file alias="advertsArrowRight">res/icons/adverts_arrow_right.png</file>
<file alias="advertsArrowRightHover">res/icons/adverts_arrow_right_hover.png</file>
<file>res/icons/GUI20_mainToolBar_transactions.png</file>
<file>res/icons/GUI20_mainToolBar_transactions_hover.png</file>
<file>res/icons/GUI20_mainToolBar_send.png</file>

4
src/qt/cscfusionstyle.cpp
View File

@@ -168,6 +168,10 @@ int CSCFusionStyle::styleHint(StyleHint hint, const QStyleOption *option,
{
return int(true);
}
case SH_ComboBox_Popup:
{
qDebug() << "yep, there are some comboboxes!";
}
default:
{
return QProxyStyle::styleHint(hint, option, widget, returnData);

12
src/qt/forms/addressbookpage.ui
View File

@@ -115,6 +115,12 @@
<property name="toolTip">
<string>Export the data in the current tab to a file</string>
</property>
<property name="autoFillBackground">
<bool>false</bool>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string>&amp;Export</string>
</property>
@@ -122,6 +128,12 @@
<iconset resource="../bitcoin.qrc">
<normaloff>:/icons/export</normaloff>:/icons/export</iconset>
</property>
<property name="autoDefault">
<bool>true</bool>
</property>
<property name="default">
<bool>true</bool>
</property>
</widget>
</item>
<item>

19
src/qt/forms/optionsdialog.ui
View File

@@ -23,7 +23,7 @@
<enum>QTabWidget::North</enum>
</property>
<property name="currentIndex">
<number>3</number>
<number>0</number>
</property>
<widget class="QWidget" name="tabMain">
<attribute name="title">
@@ -342,7 +342,7 @@
<x>10</x>
<y>70</y>
<width>491</width>
<height>24</height>
<height>29</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_display_Currency">
@@ -374,7 +374,7 @@
<x>11</x>
<y>11</y>
<width>491</width>
<height>24</height>
<height>29</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_display_Language">
@@ -409,7 +409,7 @@
<x>11</x>
<y>42</y>
<width>491</width>
<height>24</height>
<height>29</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_display_Units">
@@ -533,21 +533,22 @@
</layout>
</widget>
<customwidgets>
<customwidget>
<class>QValidatedLineEdit</class>
<extends>QLineEdit</extends>
<header>qvalidatedlineedit.h</header>
</customwidget>
<customwidget>
<class>BitcoinAmountField</class>
<extends>QSpinBox</extends>
<header>bitcoinamountfield.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QValueComboBox</class>
<extends>QComboBox</extends>
<header>qvaluecombobox.h</header>
</customwidget>
<customwidget>
<class>QValidatedLineEdit</class>
<extends>QLineEdit</extends>
<header>qvalidatedlineedit.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>

130
src/qt/forms/pryptopage.ui
View File

@@ -18,8 +18,8 @@
<rect>
<x>10</x>
<y>10</y>
<width>501</width>
<height>281</height>
<width>381</width>
<height>191</height>
</rect>
</property>
<property name="frameShape">
@@ -28,72 +28,68 @@
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
<widget class="QLabel" name="lblHelp">
<property name="geometry">
<rect>
<x>10</x>
<y>10</y>
<width>461</width>
<height>21</height>
</rect>
</property>
<property name="text">
<string>Enter your Prypto Code and Security Code to redeem your Prypto card.</string>
</property>
<property name="textFormat">
<enum>Qt::AutoText</enum>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
<widget class="QWidget" name="formLayoutWidget">
<property name="geometry">
<rect>
<x>10</x>
<y>40</y>
<width>361</width>
<height>112</height>
</rect>
</property>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0">
<widget class="QLabel" name="lblPryptoCode">
<property name="text">
<string>Prypto Code</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="lblSecurityCode">
<property name="text">
<string>Security Code</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="txtPryptoCode"/>
</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>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="lblHelp">
<property name="minimumSize">
<size>
<width>0</width>
<height>80</height>
</size>
</property>
<property name="text">
<string>Enter your Prypto Code and Security Code to redeem your Prypto card.</string>
</property>
<property name="textFormat">
<enum>Qt::AutoText</enum>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</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>
</item>
</layout>
</widget>
<zorder>frame</zorder>
<zorder>formLayoutWidget</zorder>
</widget>
<resources/>
<connections/>

4
src/qt/forms/rpcconsole.ui
View File

@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>740</width>
<height>450</height>
<height>468</height>
</rect>
</property>
<property name="windowTitle">
@@ -17,7 +17,7 @@
<item>
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
<number>0</number>
<number>1</number>
</property>
<widget class="QWidget" name="tab_info">
<attribute name="title">

117
src/qt/forms/sendcoinsdialog.ui
View File

@@ -13,7 +13,7 @@
<property name="windowTitle">
<string>Send Coins</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout" stretch="0,1,0">
<layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,1">
<property name="bottomMargin">
<number>8</number>
</property>
@@ -624,62 +624,6 @@
</layout>
</widget>
</item>
<item>
<widget class="QScrollArea" name="scrollArea">
<property name="widgetResizable">
<bool>true</bool>
</property>
<widget class="QWidget" name="scrollAreaWidgetContents">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>830</width>
<height>167</height>
</rect>
</property>
<property name="styleSheet">
<string notr="true">background-color: rgb(255, 255, 255);</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QFrame" name="entries_2">
<layout class="QVBoxLayout" name="entries">
<property name="spacing">
<number>6</number>
</property>
</layout>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
@@ -782,6 +726,9 @@
<property name="toolTip">
<string>Confirm the send action</string>
</property>
<property name="autoFillBackground">
<bool>false</bool>
</property>
<property name="styleSheet">
<string notr="true">background-color: rgb(170, 28, 33);
color: rgb(255, 255, 255);
@@ -804,6 +751,62 @@ background-color: rgb(170, 28, 33);
</item>
</layout>
</item>
<item>
<widget class="QScrollArea" name="scrollArea">
<property name="widgetResizable">
<bool>true</bool>
</property>
<widget class="QWidget" name="scrollAreaWidgetContents">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>830</width>
<height>152</height>
</rect>
</property>
<property name="styleSheet">
<string notr="true">background-color: rgb(255, 255, 255);</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QFrame" name="entries_2">
<layout class="QVBoxLayout" name="entries">
<property name="spacing">
<number>6</number>
</property>
</layout>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
</widget>
<resources>

34
src/qt/forms/sendcoinsentry.ui
View File

@@ -92,7 +92,7 @@
<item row="3" column="2">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QToolButton" name="deleteButton">
<widget class="QPushButton" name="deleteButton">
<property name="toolTip">
<string>Remove this recipient</string>
</property>
@@ -109,10 +109,16 @@
<height>20</height>
</size>
</property>
<property name="autoDefault">
<bool>true</bool>
</property>
<property name="default">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="addressBookButton">
<widget class="QPushButton" name="addressBookButton">
<property name="toolTip">
<string>Choose address from address book</string>
</property>
@@ -132,10 +138,16 @@
<property name="shortcut">
<string>Alt+A</string>
</property>
<property name="autoDefault">
<bool>true</bool>
</property>
<property name="default">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="pasteButton">
<widget class="QPushButton" name="pasteButton">
<property name="toolTip">
<string>Paste address from clipboard</string>
</property>
@@ -155,6 +167,12 @@
<property name="shortcut">
<string>Alt+P</string>
</property>
<property name="autoDefault">
<bool>true</bool>
</property>
<property name="default">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
@@ -162,17 +180,17 @@
</layout>
</widget>
<customwidgets>
<customwidget>
<class>QValidatedLineEdit</class>
<extends>QLineEdit</extends>
<header>qvalidatedlineedit.h</header>
</customwidget>
<customwidget>
<class>BitcoinAmountField</class>
<extends>QSpinBox</extends>
<header>bitcoinamountfield.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QValidatedLineEdit</class>
<extends>QLineEdit</extends>
<header>qvalidatedlineedit.h</header>
</customwidget>
</customwidgets>
<resources>
<include location="../bitcoin.qrc"/>

4
src/qt/qtquick_controls/qml/QmlGUIMenuToolbarWindow.qml
View File

@@ -3,8 +3,8 @@ import QtQuick 2.0
Rectangle
{
id: id_toolbarRoot
width: parent.width
height: parent.height
width: parent ? parent.width : 0
height: parent ? parent.height : 0
color: GUI20Skin.colorWindowBackground
QmlGUIMenuToolbarControl
{

BIN
src/qt/res/icons/configure.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 477 B

BIN
src/qt/res/icons/connect1_16.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 754 B

After

Width:  |  Height:  |  Size: 286 B

BIN
src/qt/res/icons/connect2_16.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 765 B

After

Width:  |  Height:  |  Size: 295 B

BIN
src/qt/res/icons/connect3_16.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 767 B

After

Width:  |  Height:  |  Size: 231 B

BIN
src/qt/res/icons/debugwindow.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 383 B

BIN
src/qt/res/icons/edit.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 538 B

BIN
src/qt/res/icons/export-red.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 313 B

BIN
src/qt/res/icons/filesave.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 267 B

BIN
src/qt/res/icons/history.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 856 B

BIN
src/qt/res/icons/key.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 542 B

BIN
src/qt/res/icons/lock_closed.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 510 B

BIN
src/qt/res/icons/lock_open.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 493 B

BIN
src/qt/res/icons/mining.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 16 KiB

BIN
src/qt/res/icons/mining_active.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 390 B

After

Width:  |  Height:  |  Size: 463 B

BIN
src/qt/res/icons/mining_inactive.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 439 B

After

Width:  |  Height:  |  Size: 501 B

BIN
src/qt/res/icons/notsynced.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 608 B

BIN
src/qt/res/icons/quit.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 48 KiB

BIN
src/qt/res/icons/receive.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 216 B

BIN
src/qt/res/icons/send.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 216 B

BIN
src/qt/res/icons/synced.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 945 B

After

Width:  |  Height:  |  Size: 547 B

BIN
src/qt/res/icons/transaction0.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 540 B

After

Width:  |  Height:  |  Size: 328 B

BIN
src/qt/res/icons/tx_input.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 553 B

After

Width:  |  Height:  |  Size: 625 B