Browse Source

UI & LLL fixes.

cl-refactor
Gav Wood 11 years ago
parent
commit
8e3dc081f8
  1. 12
      alethzero/Main.ui
  2. 13
      alethzero/MainWin.cpp

12
alethzero/Main.ui

@ -54,6 +54,9 @@
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::NoFrame</enum> <enum>QFrame::NoFrame</enum>
</property> </property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget> </widget>
</widget> </widget>
<widget class="QSplitter" name="splitter_3"> <widget class="QSplitter" name="splitter_3">
@ -81,6 +84,9 @@
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::NoFrame</enum> <enum>QFrame::NoFrame</enum>
</property> </property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget> </widget>
</widget> </widget>
</widget> </widget>
@ -412,7 +418,11 @@
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<widget class="QPlainTextEdit" name="data"/> <widget class="QPlainTextEdit" name="data"/>
<widget class="QPlainTextEdit" name="code"/> <widget class="QPlainTextEdit" name="code">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</widget> </widget>
</item> </item>
<item row="4" column="0"> <item row="4" column="0">

13
alethzero/MainWin.cpp

@ -280,6 +280,8 @@ void Main::on_blocks_currentItemChanged()
// s << "0x<b>" << hex << i << "</b>&emsp;"; // s << "0x<b>" << hex << i << "</b>&emsp;";
s << "</br>" << disassemble(tx.data); s << "</br>" << disassemble(tx.data);
} }
cnote << block;
cnote << asHex(blockData);
} }
@ -308,9 +310,10 @@ void Main::on_contracts_currentItemChanged()
{ {
unsigned j; unsigned j;
for (j = 0; j <= numerics && next + j < i.first; ++j) for (j = 0; j <= numerics && next + j < i.first; ++j)
s << (j < numerics ? " 0" : " STOP"); s << (j < numerics ? " 0" : " <b>STOP</b>");
numerics -= (j - 1); numerics -= min(numerics, j);
s << " ...<br/>@" << showbase << hex << i.first << "&nbsp;&nbsp;&nbsp;&nbsp;"; if (next + j < i.first)
s << " ...<br/>@" << showbase << hex << i.first << "&nbsp;&nbsp;&nbsp;&nbsp;";
} }
else if (!next) else if (!next)
{ {
@ -321,12 +324,12 @@ void Main::on_contracts_currentItemChanged()
{ {
if (numerics) if (numerics)
numerics--; numerics--;
s << " 0x" << hex << i.second; s << " " << showbase << hex << i.second;
} }
else else
{ {
auto const& ii = iit->second; auto const& ii = iit->second;
s << " " << ii.name; s << " <b>" << ii.name << "</b>";
numerics = ii.additional; numerics = ii.additional;
} }
next = i.first + 1; next = i.first + 1;

Loading…
Cancel
Save