[Qt] misc small Mac related changes/cleanups #3297

pull Diapolo wants to merge 1 commits into bitcoin:master from Diapolo:Mac_HighDPI_misc changing 3 files +31 −9

Diapolo commented at 5:04 PM on November 21, 2013: none
- cleanup Info.plist.in and specify high DPI mode enable command as per http://blog.qt.digia.com/blog/2013/04/25/retina-display-support-for-mac-os-ios-and-x11/
- move setting of QApplication::setAttribute() to bitcoin.cpp and add attribute for enabling use of high DPI pixmaps for Qt >= 5.1
- add missing setWindowTitle() on Mac
- cleanup Mac / non-Mac setup in bitcoingui.cpp
in share/qt/Info.plist.in:None in aa0f23f387 outdated
```
  75 | @@ -69,7 +76,8 @@
  76 |        <string>Owner</string>
  77 |      </dict>
  78 |    </array>
  79 | +
```
fanquake commented at 9:22 PM on November 21, 2013:

Shouldn't we also be adding <key>NSPrincipalClass</key> <string>NSApplication</string>

here as well?

Diapolo commented at 7:37 AM on November 22, 2013:

I added this aswell :), see rebased version.
laanwj commented at 7:17 AM on November 22, 2013: member

Can someone with a mac test this?

in src/qt/bitcoin.cpp:None in 332ebbe0f1 outdated

 200 | @@ -201,6 +201,13 @@ int main(int argc, char *argv[])
 201 |  
 202 |      Q_INIT_RESOURCE(bitcoin);
 203 |      QApplication app(argc, argv);
 204 | +#if QT_VERSION > 0x050100
 205 | +    // Generate high-dpi pixmaps
 206 | +    QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
 207 | +#endif
 208 | +#if Q_OS_MAC

fanquake commented at 6:43 AM on November 23, 2013:

This should be an #ifdef

Diapolo commented at 2:21 PM on November 24, 2013:

Fixed, thanks!

Diapolo commented at 4:47 PM on November 26, 2013: none

Did any Mac user test this?
laanwj commented at 5:39 PM on November 26, 2013: member

Is that even possible as long as we don't have Qt5 support?
fanquake commented at 1:49 AM on November 27, 2013: member

@Diapolo Somewhat. The missing menu title is now set correctly. I'll see if I can get some screens of the before/after for the retina changes
BitcoinPullTester commented at 10:09 AM on December 9, 2013: none

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/e37f82b8aa1d0f149855a35e2cd3d98fd6181586 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.

[Qt] misc small Mac related changes/cleanups

- cleanup Info.plist.in and specify high DPI mode enable command as per
  http://blog.qt.digia.com/blog/2013/04/25/retina-display-support-for-mac-os-ios-and-x11/
- move setting of QApplication::setAttribute() to bitcoin.cpp and add
  attribute for enabling use of high DPI pixmaps for Qt >= 5.1
- add missing setWindowTitle() on Mac
- cleanup Mac / non-Mac setup in bitcoingui.cpp

84f8551f3a

in src/qt/bitcoingui.cpp:None in e37f82b8aa outdated

  96 | -    else
  97 |          MacDockIconHandler::instance()->setIcon(QIcon(":icons/bitcoin_testnet"));
  98 |  #endif
  99 | +    }
 100 | +
 101 | +#ifdef Q_OS_MAC

laanwj commented at 1:59 PM on December 9, 2013:

You can combine these into

#if defined(Q_OS_MAC) && QT_VERSION < 0x050000

Diapolo commented at 2:31 PM on December 9, 2013:

Updated...

laanwj referenced this in commit 6694f4a7a2 on Dec 9, 2013
laanwj merged this on Dec 9, 2013
laanwj closed this on Dec 9, 2013
Diapolo deleted the branch on Dec 9, 2013
Bushstar referenced this in commit 6b5d3edae3 on Apr 8, 2020
Bushstar referenced this in commit b7a89d3492 on Apr 8, 2020
DrahtBot locked this on Sep 8, 2021

Contributors