Bitcoin-Qt: remove " - " on empty title in BitcoinGUI::message() #2492

pull Diapolo wants to merge 1 commits into bitcoin:master from Diapolo:Qt_message changing 1 files +9 −6

Diapolo commented at 7:56 AM on April 9, 2013: none
- don't display "Bitcoin - " when no title was supplied but just "Bitcoin"

in src/qt/bitcoingui.cpp:None in 518b979a7a outdated

 618 | @@ -619,16 +619,17 @@ void BitcoinGUI::message(const QString &title, const QString &message, unsigned
 619 |      // Check for usage of predefined title
 620 |      switch (style) {
 621 |      case CClientUIInterface::MSG_ERROR:
 622 | -        strTitle += tr("Error");
 623 | +        strTitle += " - " + tr("Error");

laanwj commented at 5:05 AM on April 11, 2013:

I don't really like the duplication here...

What you are really doing is:

    /* Override title based on style */
    QString msgType;
    switch(style) {
        case MSG_ERROR: msgType="Error"; break;
        case MSG_WARNING: msgType="Warning"; break;
        case MSG_INFORMATION: msgType="Information"; break;
        default: msgType = title; // Use supplied title
    }
    if(!msgType.isEmpty())
    {
        strTitle += " - " + msgType;
    }

Diapolo commented at 6:16 AM on April 11, 2013:

Yeah, will change that :).

Diapolo commented at 6:31 AM on April 11, 2013: none

Updated to reflect @laanwj suggestions.

Bitcoin-Qt: remove " - " on empty title in BitcoinGUI::message()

- don't display "Bitcoin - " when no title was supplied but just "Bitcoin"

8d643c90a6

BitcoinPullTester commented at 3:36 PM on April 11, 2013: none

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/8d643c90a6e0f1b69f23738701cb7a090870669c for binaries and test log. This test script verifies pulls every time they are updated. It, however, dies sometimes and fails to test properly. If you are waiting on a test, please check timestamps to verify that the test.log is moving at http://jenkins.bluematt.me/pull-tester/current/ Contact BlueMatt on freenode if something looks broken.
sipa commented at 8:59 PM on April 12, 2013: member

ACK
laanwj referenced this in commit ac89a1ebe7 on Apr 13, 2013
laanwj merged this on Apr 13, 2013
laanwj closed this on Apr 13, 2013
laudney referenced this in commit d80fabe50c on Mar 19, 2014
DrahtBot locked this on Sep 8, 2021

Contributors