CSCFusionStyle (WIP)

This commit is contained in:
felixrojauro
2015-11-16 18:47:14 +01:00
parent 53f2e7d8b7
commit b2e93c6ef4
5 changed files with 154 additions and 59 deletions

View File

@@ -190,6 +190,20 @@ void CSCFusionStyle::drawPrimitive(PrimitiveElement element,
{ {
return; return;
} }
case PE_PanelItemViewRow:
{
int x, y, width, height;
option->rect.getRect(&x, &y, &width, &height);
QPainterPath roundRect = roundRectPath(option->rect, 0);
QBrush brush = option->palette.base();
painter->save();
painter->setRenderHint(QPainter::Antialiasing, true);
painter->fillPath(roundRect, brush);
painter->restore();
break;
}
case PE_FrameGroupBox: case PE_FrameGroupBox:
case PE_FrameWindow: case PE_FrameWindow:
case PE_Frame: case PE_Frame:
@@ -206,6 +220,7 @@ void CSCFusionStyle::drawPrimitive(PrimitiveElement element,
painter->restore(); painter->restore();
break; break;
} }
case PE_PanelButtonTool:
case PE_PanelButtonCommand: case PE_PanelButtonCommand:
{ {
GUI20Skin& skin = GUI20Skin::Instance(); GUI20Skin& skin = GUI20Skin::Instance();

View File

@@ -13,18 +13,8 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Address Book</string> <string>Address Book</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QGridLayout" name="gridLayout">
<item> <item row="1" column="0">
<widget class="QLabel" name="labelExplanation">
<property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
<widget class="QPushButton" name="newAddress"> <widget class="QPushButton" name="newAddress">
@@ -149,7 +139,7 @@
</item> </item>
</layout> </layout>
</item> </item>
<item> <item row="3" column="0">
<widget class="QTableView" name="tableView"> <widget class="QTableView" name="tableView">
<property name="contextMenuPolicy"> <property name="contextMenuPolicy">
<enum>Qt::CustomContextMenu</enum> <enum>Qt::CustomContextMenu</enum>
@@ -177,6 +167,31 @@
</attribute> </attribute>
</widget> </widget>
</item> </item>
<item row="2" column="0">
<widget class="QFrame" name="frame">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<widget class="QLabel" name="labelExplanation">
<property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<resources> <resources>

View File

@@ -17,7 +17,7 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>20</x> <x>20</x>
<y>50</y> <y>70</y>
<width>361</width> <width>361</width>
<height>112</height> <height>112</height>
</rect> </rect>
@@ -62,7 +62,7 @@
<x>20</x> <x>20</x>
<y>10</y> <y>10</y>
<width>361</width> <width>361</width>
<height>31</height> <height>51</height>
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
@@ -71,6 +71,12 @@
<property name="textFormat"> <property name="textFormat">
<enum>Qt::AutoText</enum> <enum>Qt::AutoText</enum>
</property> </property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget> </widget>
</widget> </widget>
<resources/> <resources/>

View File

@@ -39,7 +39,7 @@
</property> </property>
<layout class="QVBoxLayout" name="verticalLayoutCoinControl2"> <layout class="QVBoxLayout" name="verticalLayoutCoinControl2">
<property name="spacing"> <property name="spacing">
<number>-1</number> <number>6</number>
</property> </property>
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>0</number>
@@ -173,7 +173,16 @@
<string notr="true"/> <string notr="true"/>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayoutCoinControl5"> <layout class="QHBoxLayout" name="horizontalLayoutCoinControl5">
<property name="margin"> <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> <number>0</number>
</property> </property>
<item> <item>
@@ -626,19 +635,33 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>830</width> <width>830</width>
<height>165</height> <height>167</height>
</rect> </rect>
</property> </property>
<property name="styleSheet">
<string notr="true">background-color: rgb(255, 255, 255);</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
<property name="margin"> <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> <number>0</number>
</property> </property>
<item> <item>
<layout class="QVBoxLayout" name="entries"> <widget class="QFrame" name="entries_2">
<property name="spacing"> <layout class="QVBoxLayout" name="entries">
<number>6</number> <property name="spacing">
</property> <number>6</number>
</layout> </property>
</layout>
</widget>
</item> </item>
<item> <item>
<spacer name="verticalSpacer"> <spacer name="verticalSpacer">
@@ -702,6 +725,19 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="spacing"> <property name="spacing">
@@ -716,6 +752,12 @@
</item> </item>
<item> <item>
<widget class="QLabel" name="labelBalance"> <widget class="QLabel" name="labelBalance">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="cursor"> <property name="cursor">
<cursorShape>IBeamCursor</cursorShape> <cursorShape>IBeamCursor</cursorShape>
</property> </property>
@@ -729,19 +771,6 @@
</item> </item>
</layout> </layout>
</item> </item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item> <item>
<widget class="QPushButton" name="sendButton"> <widget class="QPushButton" name="sendButton">
<property name="minimumSize"> <property name="minimumSize">
@@ -753,6 +782,14 @@
<property name="toolTip"> <property name="toolTip">
<string>Confirm the send action</string> <string>Confirm the send action</string>
</property> </property>
<property name="styleSheet">
<string notr="true">background-color: rgb(170, 28, 33);
color: rgb(255, 255, 255);
pressed
{
background-color: rgb(170, 28, 33);
}</string>
</property>
<property name="text"> <property name="text">
<string>S&amp;end</string> <string>S&amp;end</string>
</property> </property>

View File

@@ -80,6 +80,37 @@
</property> </property>
</widget> </widget>
</item> </item>
</layout>
</item>
<item row="4" column="1">
<widget class="QValidatedLineEdit" name="addAsLabel">
<property name="toolTip">
<string>Enter a label for this address to add it to your address book</string>
</property>
</widget>
</item>
<item row="3" column="2">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QToolButton" name="deleteButton">
<property name="toolTip">
<string>Remove this recipient</string>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../bitcoin.qrc">
<normaloff>:/icons/remove</normaloff>:/icons/remove</iconset>
</property>
<property name="iconSize">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</widget>
</item>
<item> <item>
<widget class="QToolButton" name="addressBookButton"> <widget class="QToolButton" name="addressBookButton">
<property name="toolTip"> <property name="toolTip">
@@ -92,6 +123,12 @@
<iconset resource="../bitcoin.qrc"> <iconset resource="../bitcoin.qrc">
<normaloff>:/icons/address-book</normaloff>:/icons/address-book</iconset> <normaloff>:/icons/address-book</normaloff>:/icons/address-book</iconset>
</property> </property>
<property name="iconSize">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
<property name="shortcut"> <property name="shortcut">
<string>Alt+A</string> <string>Alt+A</string>
</property> </property>
@@ -109,40 +146,25 @@
<iconset resource="../bitcoin.qrc"> <iconset resource="../bitcoin.qrc">
<normaloff>:/icons/editpaste</normaloff>:/icons/editpaste</iconset> <normaloff>:/icons/editpaste</normaloff>:/icons/editpaste</iconset>
</property> </property>
<property name="iconSize">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
<property name="shortcut"> <property name="shortcut">
<string>Alt+P</string> <string>Alt+P</string>
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QToolButton" name="deleteButton">
<property name="toolTip">
<string>Remove this recipient</string>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../bitcoin.qrc">
<normaloff>:/icons/remove</normaloff>:/icons/remove</iconset>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
<item row="4" column="1">
<widget class="QValidatedLineEdit" name="addAsLabel">
<property name="toolTip">
<string>Enter a label for this address to add it to your address book</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget> <customwidget>
<class>BitcoinAmountField</class> <class>BitcoinAmountField</class>
<extends>QLineEdit</extends> <extends>QSpinBox</extends>
<header>bitcoinamountfield.h</header> <header>bitcoinamountfield.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>