Browse Source

Two way name application.

cl-refactor
Gav Wood 11 years ago
parent
commit
1fc9c01932
  1. 55
      alethzero/Main.ui
  2. 21
      alethzero/MainWin.cpp

55
alethzero/Main.ui

@ -382,21 +382,21 @@
</attribute> </attribute>
<widget class="QWidget" name="dockWidgetContents_5"> <widget class="QWidget" name="dockWidgetContents_5">
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="4" column="3"> <item row="5" column="3">
<widget class="QPushButton" name="send"> <widget class="QPushButton" name="send">
<property name="text"> <property name="text">
<string>Send</string> <string>Send</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="2" column="0">
<widget class="QLabel" name="label5_2"> <widget class="QLabel" name="label5_2">
<property name="text"> <property name="text">
<string>Amount</string> <string>Amount</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="2" column="1">
<widget class="QSpinBox" name="value"> <widget class="QSpinBox" name="value">
<property name="suffix"> <property name="suffix">
<string/> <string/>
@ -409,10 +409,10 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="2" colspan="2"> <item row="2" column="2" colspan="2">
<widget class="QComboBox" name="valueUnits"/> <widget class="QComboBox" name="valueUnits"/>
</item> </item>
<item row="3" column="0" colspan="4"> <item row="4" column="0" colspan="4">
<widget class="QSplitter" name="splitter_5"> <widget class="QSplitter" name="splitter_5">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
@ -425,26 +425,13 @@
</widget> </widget>
</widget> </widget>
</item> </item>
<item row="4" column="0"> <item row="5" column="0">
<widget class="QLabel" name="total"> <widget class="QLabel" name="total">
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0">
<widget class="QLabel" name="label5">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>To</string>
</property>
</widget>
</item>
<item row="0" column="1" colspan="3"> <item row="0" column="1" colspan="3">
<widget class="QLineEdit" name="destination"> <widget class="QLineEdit" name="destination">
<property name="sizePolicy"> <property name="sizePolicy">
@ -458,7 +445,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1" colspan="3"> <item row="3" column="1" colspan="3">
<widget class="QLabel" name="fee"> <widget class="QLabel" name="fee">
<property name="text"> <property name="text">
<string/> <string/>
@ -468,7 +455,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="3" column="0">
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum"> <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
@ -484,6 +471,32 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1" colspan="3">
<widget class="QLineEdit" name="calculatedName">
<property name="enabled">
<bool>false</bool>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
<property name="placeholderText">
<string/>
</property>
</widget>
</item>
<item row="0" column="0" rowspan="2">
<widget class="QLabel" name="label5">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>To</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</widget> </widget>

21
alethzero/MainWin.cpp

@ -79,7 +79,19 @@ QString Main::render(eth::Address _a) const
Address Main::fromString(QString const& _a) const Address Main::fromString(QString const& _a) const
{ {
return _a.size() ? Address(fromUserHex(_a.toStdString())) : Address(); static const Address c_nameContract(fromUserHex("f28e4d396cfc7bae483e464221b0d2bd3c27f21f"));
string sn = _a.toStdString();
if (sn.size() > 32)
sn.resize(32);
h256 n;
memcpy(n.data(), sn.data(), sn.size());
memset(n.data() + sn.size(), 0, 32 - sn.size());
if (h256 a = m_client->state().contractMemory(c_nameContract, n))
return right160(a);
if (_a.size() == 32)
return Address(fromUserHex(_a.toStdString()));
else
return Address();
} }
void Main::on_about_triggered() void Main::on_about_triggered()
@ -383,6 +395,13 @@ void Main::on_accounts_doubleClicked()
void Main::on_destination_textChanged() void Main::on_destination_textChanged()
{ {
if (ui->destination->text().size())
if (Address a = fromString(ui->destination->text()))
ui->calculatedName->setText(render(a));
else
ui->calculatedName->setText("Unknown Address");
else
ui->calculatedName->setText("Create Contract");
updateFee(); updateFee();
} }

Loading…
Cancel
Save