Skip to content

Commit

Permalink
update merchantlist
Browse files Browse the repository at this point in the history
  • Loading branch information
@cqtenq
cqtenq committed Nov 25, 2014
1 parent ed07f1d commit 61959ab
Show file tree
Hide file tree
Showing 9 changed files with 1,054 additions and 1,074 deletions.
2 changes: 2 additions & 0 deletions src/qt/feathercoin.qrc
View file
Expand Up @@ -66,6 +66,8 @@
<file alias="merchant_bitbooks">res/images/bitbooks.png</file>
<file alias="merchant_coinverted">res/images/coinverted.png</file>
<file alias="merchant_bit">res/images/bittrex.png</file>
<file alias="merchant_bittylicious">res/images/bittylicious.png</file>
<file alias="merchant_vircurex">res/images/vircurex.png</file>
</qresource>
<qresource prefix="/movies">
<file alias="spinner-000">res/movies/spinner-000.png</file>
Expand Down
77 changes: 73 additions & 4 deletions src/qt/forms/aboutdialog.ui
View file
Expand Up @@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>525</width>
<width>555</width>
<height>317</height>
</rect>
</property>
Expand Down Expand Up @@ -101,22 +101,92 @@
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_11">
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_2">
<property name="cursor">
<cursorShape>IBeamCursor</cursorShape>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;This is not experiment,This is our real life and great history.Our goal is to let you have a good time.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php.&lt;/p&gt;&lt;p&gt;This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>This is not experiment,This is our real life and great history.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
<bool>false</bool>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_8">
<property name="text">
<string>Our goal is to let you have a good time.</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_12">
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_3">
<property name="text">
<string>Distributed under the MIT/X11 software license, see the accompanying file</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_6">
<property name="text">
<string>COPYING or http://www.opensource.org/licenses/mit-license.php.</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_13">
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_5">
<property name="text">
<string>This product includes software developed by the OpenSSL Project for use</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_7">
<property name="text">
<string>in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_9">
<property name="text">
<string>software written by Eric Young (eay@cryptsoft.com) and UPnP software</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_10">
<property name="text">
<string>written by Thomas Bernard.</string>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
Expand Down Expand Up @@ -146,7 +216,6 @@
</widget>
<resources>
<include location="../feathercoin.qrc"/>
<include location="C:/Users/lizhi.lizhi-PC/.designer/feathercoin.qrc"/>
</resources>
<connections>
<connection>
Expand Down
65 changes: 63 additions & 2 deletions src/qt/forms/merchantlist.ui
View file
Expand Up @@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>790</width>
<width>805</width>
<height>461</height>
</rect>
</property>
Expand Down Expand Up @@ -73,11 +73,33 @@
</item>
<item>
<widget class="QLabel" name="label_left_6">
<property name="cursor">
<cursorShape>PointingHandCursor</cursorShape>
</property>
<property name="toolTip">
<string>a altcoin currency exchange</string>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="../feathercoin.qrc">:/images/merchant_vircurex</pixmap>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
Expand Down Expand Up @@ -320,10 +342,36 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="../feathercoin.qrc">:/images/merchant_mc</pixmap>
<pixmap resource="../feathercoin.qrc">:/images/merchant_bittylicious</pixmap>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_5">
<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>
<spacer name="horizontalSpacer_7">
<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>
<spacer name="horizontalSpacer">
<property name="orientation">
Expand Down Expand Up @@ -354,6 +402,19 @@
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_6">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
Expand Down

0 comments on commit 61959ab

Please sign in to comment.