Mercurial > hg > bitcoin
changeset 2501:693e64d4233e draft
add the client startup time to the debug window / rename Version label to Client, which is better suiting now / add IBeamCursor for selectable text on the information page / make ">" sign on RPC page untranslatable / re-order XML-file tags to match real GUI element order
| author | Philip Kaufmann <phil.kaufmann@t-online.de> |
|---|---|
| date | Sat, 12 May 2012 00:28:58 +0200 |
| parents | 343e76e622f9 |
| children | 2d179d8c8793 |
| files | src/qt/clientmodel.cpp src/qt/clientmodel.h src/qt/forms/rpcconsole.ui src/qt/rpcconsole.cpp |
| diffstat | 4 files changed, 113 insertions(+), 55 deletions(-) [+] |
line wrap: on
line diff
--- a/src/qt/clientmodel.cpp +++ b/src/qt/clientmodel.cpp @@ -5,6 +5,7 @@ #include "transactiontablemodel.h" #include "main.h" +static const int64 nClientStartupTime = GetTime(); #include <QDateTime> @@ -98,3 +99,8 @@ { return QString::fromStdString(CLIENT_NAME); } + +QDateTime ClientModel::formatClientStartupTime() const +{ + return QDateTime::fromTime_t(nClientStartupTime); +}
--- a/src/qt/clientmodel.h +++ b/src/qt/clientmodel.h @@ -39,6 +39,7 @@ QString formatFullVersion() const; QString formatBuildDate() const; QString clientName() const; + QDateTime formatClientStartupTime() const; private: OptionsModel *optionsModel;
--- a/src/qt/forms/rpcconsole.ui +++ b/src/qt/forms/rpcconsole.ui @@ -27,6 +27,19 @@ <property name="horizontalSpacing"> <number>12</number> </property> + <item row="0" column="0"> + <widget class="QLabel" name="label_9"> + <property name="font"> + <font> + <weight>75</weight> + <bold>true</bold> + </font> + </property> + <property name="text"> + <string>Client</string> + </property> + </widget> + </item> <item row="1" column="0"> <widget class="QLabel" name="label_5"> <property name="text"> @@ -36,6 +49,9 @@ </item> <item row="1" column="1"> <widget class="QLabel" name="clientName"> + <property name="cursor"> + <cursorShape>IBeamCursor</cursorShape> + </property> <property name="text"> <string>N/A</string> </property> @@ -56,6 +72,9 @@ </item> <item row="2" column="1"> <widget class="QLabel" name="clientVersion"> + <property name="cursor"> + <cursorShape>IBeamCursor</cursorShape> + </property> <property name="text"> <string>N/A</string> </property> @@ -67,20 +86,53 @@ </property> </widget> </item> - <item row="0" column="0"> - <widget class="QLabel" name="label_9"> - <property name="font"> - <font> - <weight>75</weight> - <bold>true</bold> - </font> + <item row="3" column="0"> + <widget class="QLabel" name="label_12"> + <property name="text"> + <string>Build date</string> + </property> + </widget> + </item> + <item row="3" column="1"> + <widget class="QLabel" name="buildDate"> + <property name="cursor"> + <cursorShape>IBeamCursor</cursorShape> </property> <property name="text"> - <string>Version</string> + <string>N/A</string> + </property> + <property name="textFormat"> + <enum>Qt::PlainText</enum> + </property> + <property name="textInteractionFlags"> + <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set> </property> </widget> </item> <item row="4" column="0"> + <widget class="QLabel" name="label_13"> + <property name="text"> + <string>Startup time</string> + </property> + </widget> + </item> + <item row="4" column="1"> + <widget class="QLabel" name="startupTime"> + <property name="cursor"> + <cursorShape>IBeamCursor</cursorShape> + </property> + <property name="text"> + <string>N/A</string> + </property> + <property name="textFormat"> + <enum>Qt::PlainText</enum> + </property> + <property name="textInteractionFlags"> + <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set> + </property> + </widget> + </item> + <item row="5" column="0"> <widget class="QLabel" name="label_11"> <property name="font"> <font> @@ -93,15 +145,18 @@ </property> </widget> </item> - <item row="5" column="0"> + <item row="6" column="0"> <widget class="QLabel" name="label_7"> <property name="text"> <string>Number of connections</string> </property> </widget> </item> - <item row="5" column="1"> + <item row="6" column="1"> <widget class="QLabel" name="numberOfConnections"> + <property name="cursor"> + <cursorShape>IBeamCursor</cursorShape> + </property> <property name="text"> <string>N/A</string> </property> @@ -113,14 +168,14 @@ </property> </widget> </item> - <item row="6" column="0"> + <item row="7" column="0"> <widget class="QLabel" name="label_8"> <property name="text"> <string>On testnet</string> </property> </widget> </item> - <item row="6" column="1"> + <item row="7" column="1"> <widget class="QCheckBox" name="isTestNet"> <property name="enabled"> <bool>false</bool> @@ -130,7 +185,7 @@ </property> </widget> </item> - <item row="7" column="0"> + <item row="8" column="0"> <widget class="QLabel" name="label_10"> <property name="font"> <font> @@ -143,35 +198,18 @@ </property> </widget> </item> - <item row="8" column="0"> + <item row="9" column="0"> <widget class="QLabel" name="label_3"> <property name="text"> <string>Current number of blocks</string> </property> </widget> </item> - <item row="8" column="1"> + <item row="9" column="1"> <widget class="QLabel" name="numberOfBlocks"> - <property name="text"> - <string>N/A</string> - </property> - <property name="textFormat"> - <enum>Qt::PlainText</enum> - </property> - <property name="textInteractionFlags"> - <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set> + <property name="cursor"> + <cursorShape>IBeamCursor</cursorShape> </property> - </widget> - </item> - <item row="9" column="0"> - <widget class="QLabel" name="label_4"> - <property name="text"> - <string>Estimated total blocks</string> - </property> - </widget> - </item> - <item row="9" column="1"> - <widget class="QLabel" name="totalBlocks"> <property name="text"> <string>N/A</string> </property> @@ -184,14 +222,17 @@ </widget> </item> <item row="10" column="0"> - <widget class="QLabel" name="label_2"> + <widget class="QLabel" name="label_4"> <property name="text"> - <string>Last block time</string> + <string>Estimated total blocks</string> </property> </widget> </item> <item row="10" column="1"> - <widget class="QLabel" name="lastBlockTime"> + <widget class="QLabel" name="totalBlocks"> + <property name="cursor"> + <cursorShape>IBeamCursor</cursorShape> + </property> <property name="text"> <string>N/A</string> </property> @@ -204,6 +245,29 @@ </widget> </item> <item row="11" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>Last block time</string> + </property> + </widget> + </item> + <item row="11" column="1"> + <widget class="QLabel" name="lastBlockTime"> + <property name="cursor"> + <cursorShape>IBeamCursor</cursorShape> + </property> + <property name="text"> + <string>N/A</string> + </property> + <property name="textFormat"> + <enum>Qt::PlainText</enum> + </property> + <property name="textInteractionFlags"> + <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set> + </property> + </widget> + </item> + <item row="12" column="0"> <spacer name="verticalSpacer_2"> <property name="orientation"> <enum>Qt::Vertical</enum> @@ -216,7 +280,7 @@ </property> </spacer> </item> - <item row="12" column="0"> + <item row="13" column="0"> <widget class="QLabel" name="labelDebugLogfile"> <property name="font"> <font> @@ -229,7 +293,7 @@ </property> </widget> </item> - <item row="13" column="0"> + <item row="14" column="0"> <widget class="QPushButton" name="openDebugLogfileButton"> <property name="toolTip"> <string>Open the Bitcoin debug logfile from the current data directory. This can take a few seconds for large logfiles.</string> @@ -239,7 +303,7 @@ </property> </widget> </item> - <item row="14" column="0"> + <item row="15" column="0"> <spacer name="verticalSpacer"> <property name="orientation"> <enum>Qt::Vertical</enum> @@ -252,20 +316,6 @@ </property> </spacer> </item> - <item row="3" column="0"> - <widget class="QLabel" name="label_12"> - <property name="text"> - <string>Build date</string> - </property> - </widget> - </item> - <item row="3" column="1"> - <widget class="QLabel" name="buildDate"> - <property name="text"> - <string>N/A</string> - </property> - </widget> - </item> </layout> </widget> <widget class="QWidget" name="tab_console"> @@ -311,7 +361,7 @@ <item> <widget class="QLabel" name="label"> <property name="text"> - <string>></string> + <string notr="true">></string> </property> </widget> </item>
--- a/src/qt/rpcconsole.cpp +++ b/src/qt/rpcconsole.cpp @@ -150,6 +150,7 @@ ui->clientVersion->setText(model->formatFullVersion()); ui->clientName->setText(model->clientName()); ui->buildDate->setText(model->formatBuildDate()); + ui->startupTime->setText(model->formatClientStartupTime().toString()); setNumConnections(model->getNumConnections()); ui->isTestNet->setChecked(model->isTestNet());