From 821c370447dd823020fb3e9e27e3f7cb2f4c6496 Mon Sep 17 00:00:00 2001 From: Don Rowe Date: Sat, 4 Jul 2020 21:28:06 -0700 Subject: Add focus on URL bar when new tab opens --- src/mainwindow.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src') diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index bf77974..ba80651 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -99,6 +99,8 @@ BrowserTab * MainWindow::addEmptyTab(bool focus_new, bool load_default) tab->navigateTo(QUrl("about:blank"), BrowserTab::DontPush); } + tab->focusUrlBar(); + return tab; } -- cgit v1.2.3 From 95afe80c3b8a26c6eeba0e494851d9f46f69bb4a Mon Sep 17 00:00:00 2001 From: Jagger De Leo Date: Sun, 5 Jul 2020 23:36:48 -0400 Subject: Add Homebrew lib and include paths to build script Add macOS app icon --- Makefile | 8 +++++++- src/icons/AppIcon.icns | Bin 0 -> 69936 bytes src/icons/mac-icon.sh | 15 +++++++++++++++ src/kristall.pro | 11 +++++++++++ 4 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 src/icons/AppIcon.icns create mode 100755 src/icons/mac-icon.sh (limited to 'src') diff --git a/Makefile b/Makefile index e20d29f..f2cdc80 100644 --- a/Makefile +++ b/Makefile @@ -18,12 +18,18 @@ QMAKE_COMMAND := qmake # For Fedora 32 and similar distributions, use the next line instead of the above. # QMAKE_COMMAND := /usr/bin/qmake-qt5 +UNAME := $(shell uname) +# Homebrew on macOS does not link Qt5 into the system path. +ifeq ($(UNAME),Darwin) + HOMEBREW_PATH=export PATH="$(PATH):/usr/local/opt/qt/bin" +endif + kristall: build/kristall cp build/kristall $@ build/kristall: src/* mkdir -p build - cd build && $(QMAKE_COMMAND) ../src/kristall.pro && $(MAKE) $(MAKEFLAGS) + cd build; $(HOMEBREW_PATH); $(QMAKE_COMMAND) ../src/kristall.pro && $(MAKE) $(MAKEFLAGS) install: kristall # Install icons diff --git a/src/icons/AppIcon.icns b/src/icons/AppIcon.icns new file mode 100644 index 0000000..b2df08c Binary files /dev/null and b/src/icons/AppIcon.icns differ diff --git a/src/icons/mac-icon.sh b/src/icons/mac-icon.sh new file mode 100755 index 0000000..cd6e4e9 --- /dev/null +++ b/src/icons/mac-icon.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +mkdir AppIcon.iconset +rsvg-convert kristall.svg -h 1024 > AppIcon.iconset/icon_512x512@2.png +rsvg-convert kristall.svg -h 512 > AppIcon.iconset/icon_512x512.png +rsvg-convert kristall.svg -h 512 > AppIcon.iconset/icon_256x256@2.png +rsvg-convert kristall.svg -h 256 > AppIcon.iconset/icon_256x256.png +rsvg-convert kristall.svg -h 256 > AppIcon.iconset/icon_128x128@2.png +rsvg-convert kristall.svg -h 128 > AppIcon.iconset/icon_128x128.png +rsvg-convert kristall.svg -h 64 > AppIcon.iconset/icon_32x32@2.png +rsvg-convert kristall.svg -h 32 > AppIcon.iconset/icon_32x32.png +rsvg-convert kristall.svg -h 32 > AppIcon.iconset/icon_16x16@2.png +rsvg-convert kristall.svg -h 16 > AppIcon.iconset/icon_16x16.png +iconutil -c icns AppIcon.iconset +rm -rf AppIcon.iconset diff --git a/src/kristall.pro b/src/kristall.pro index 917c212..eca386e 100644 --- a/src/kristall.pro +++ b/src/kristall.pro @@ -47,6 +47,17 @@ win32-g++ { LIBS += -llibcrypto } +macx { + # Homebrew include paths + INCLUDEPATH += /usr/local/opt/qt/include + LIBS += -L/usr/local/opt/qt/lib + + INCLUDEPATH += /usr/local/opt/openssl/include + LIBS += -L/usr/local/opt/openssl/lib + + ICON = icons/AppIcon.icns +} + android: include(/home/felix/projects/android-hass/android-sdk/android_openssl/openssl.pri) # android { -- cgit v1.2.3