just a few icons updated

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

View File

@@ -280,7 +280,9 @@ HEADERS += src/qt/bitcoingui.h \
src/qt/qtquick_controls/cpp/guimenutoolbarcontrol.h \ src/qt/qtquick_controls/cpp/guimenutoolbarcontrol.h \
src/qt/gui20_skin.h \ src/qt/gui20_skin.h \
src/qt/cscfusionstyle.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 \ SOURCES += src/qt/bitcoin.cpp \
src/qt/bitcoingui.cpp \ src/qt/bitcoingui.cpp \
@@ -371,7 +373,9 @@ SOURCES += src/qt/bitcoin.cpp \
src/qt/qtquick_controls/cpp/guimenutoolbarcontrol.cpp \ src/qt/qtquick_controls/cpp/guimenutoolbarcontrol.cpp \
src/qt/gui20_skin.cpp \ src/qt/gui20_skin.cpp \
src/qt/cscfusionstyle.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 RESOURCES += src/qt/bitcoin.qrc

View File

@@ -8,6 +8,8 @@
#include "csvmodelwriter.h" #include "csvmodelwriter.h"
#include "guiutil.h" #include "guiutil.h"
#include "gui20_skin.h"
#ifdef USE_QRCODE #ifdef USE_QRCODE
#include "qrcodedialog.h" #include "qrcodedialog.h"
#endif #endif
@@ -26,7 +28,18 @@ AddressBookPage::AddressBookPage(Mode mode, Tabs tab, QWidget *parent) :
tab(tab) tab(tab)
{ {
ui->setupUi(this); 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 #ifdef Q_OS_MAC // Icons on push buttons are very uncommon on Mac
ui->newAddress->setIcon(QIcon()); ui->newAddress->setIcon(QIcon());
ui->copyAddress->setIcon(QIcon()); ui->copyAddress->setIcon(QIcon());

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -13,7 +13,7 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Send Coins</string> <string>Send Coins</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout" stretch="0,1,0"> <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,1">
<property name="bottomMargin"> <property name="bottomMargin">
<number>8</number> <number>8</number>
</property> </property>
@@ -624,62 +624,6 @@
</layout> </layout>
</widget> </widget>
</item> </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> <item>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
@@ -782,6 +726,9 @@
<property name="toolTip"> <property name="toolTip">
<string>Confirm the send action</string> <string>Confirm the send action</string>
</property> </property>
<property name="autoFillBackground">
<bool>false</bool>
</property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">background-color: rgb(170, 28, 33); <string notr="true">background-color: rgb(170, 28, 33);
color: rgb(255, 255, 255); color: rgb(255, 255, 255);
@@ -804,6 +751,62 @@ background-color: rgb(170, 28, 33);
</item> </item>
</layout> </layout>
</item> </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> </layout>
</widget> </widget>
<resources> <resources>

View File

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

View File

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 477 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 754 B

After

Width:  |  Height:  |  Size: 286 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 765 B

After

Width:  |  Height:  |  Size: 295 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 767 B

After

Width:  |  Height:  |  Size: 231 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 383 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 538 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 313 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 267 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 856 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 542 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 510 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 493 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 390 B

After

Width:  |  Height:  |  Size: 463 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 439 B

After

Width:  |  Height:  |  Size: 501 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 608 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 216 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 216 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 945 B

After

Width:  |  Height:  |  Size: 547 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 540 B

After

Width:  |  Height:  |  Size: 328 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 553 B

After

Width:  |  Height:  |  Size: 625 B