aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix (xq) Queißner <git@mq32.de>2020-06-30 21:54:42 +0200
committerFelix (xq) Queißner <git@mq32.de>2020-06-30 21:54:42 +0200
commit27ef08f627b14ebe553a106911cb07ff9feea85e (patch)
tree6a38903c1f621150133ce6d8c6683f56a151ed2f
parentef6e2f513cde84fcd86795259830df364d5994b2 (diff)
downloadkristall-27ef08f627b14ebe553a106911cb07ff9feea85e.tar.gz
Small changes, adds updated windows build instructions.
-rw-r--r--BUILDING.md22
-rw-r--r--ROADMAP.md3
-rw-r--r--src/mainwindow.ui10
3 files changed, 32 insertions, 3 deletions
diff --git a/BUILDING.md b/BUILDING.md
index b093f44..6b9290a 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -57,7 +57,27 @@ These notes are probably also correct for Debian (someone please verify)
#### Notes on void linux
- set env variable `QT_SELECT=5`
-#### Windows
+#### Windows (MinGW)
+Install Qt via the Qt installer. Install the following components:
+
+**Required:**
+- `Qt/Qt 5.15.0/MinGW 8.1.0 64-bit`
+- `Qt/Developer and Designer Tools/MinGW 8.1.0 64 bit`
+- `Qt/Developer and Designer Tools/OpenSSL 64-bit binaries`
+**Optional:**
+- `Qt/Developer and Designer Tools/Qt Creator 4.12.3 CDB Debugger Support`
+- `Qt/Developer and Designer Tools/Debugging Tools for Windows`
+- `Qt/Developer and Designer Tools/Qt Creator 4.12.3 CDB Debugger Support`
+- `Qt/Developer and Designer Tools/OpenSSL source code`
+
+If you didn't istall Qt to `C:\Qt`, you have to adjust the paths in `src/kristall.pro` for the `win32-g++` adjustments to the path you used.
+
+Then open `src/kristall.pro` with Qt creator to compile the project. Alternativly you can use `ci\build-and-deploy.bat`, but note that this script tries to deploy the file to `random-projects.net`, so this will fail in the end.
+
+**Troubleshouting:**
+If you get an error message that `MSVCR100.dll` is missing, you may need to install the [Microsoft C++ Runtime](https://www.microsoft.com/en-us/download/details.aspx?id=14632).
+
+#### Windows MSVC (not up to date)
Compile OpenSSL with the following steps:
- Install [Perl](https://www.perl.org/get.html) (either ActiveState or Strawberry)
diff --git a/ROADMAP.md b/ROADMAP.md
index 9a778f0..37c758d 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -54,6 +54,9 @@ This document contains TODO items for planned Kristall releases as well as some
- [x] Migrate settings-based color schemes to folder
- [x] Define human-readable color scheme file format
- [ ] Add per-site scheming
+- [ ] Setup sane default fonts
+ - [ ] `Segoe UI`, `Consolas` for Windows
+ - [ ]
## Unspecced
- [ ] Add option: "Transient certificates survive an application reboot and are stored on disk"
diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index 2904969..7c792a5 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -274,7 +274,10 @@
<normaloff>.</normaloff>.</iconset>
</property>
<property name="text">
- <string>Backward</string>
+ <string>Back</string>
+ </property>
+ <property name="toolTip">
+ <string>Back</string>
</property>
<property name="shortcut">
<string>Alt+Left</string>
@@ -286,7 +289,10 @@
<normaloff>.</normaloff>.</iconset>
</property>
<property name="text">
- <string>Foreward</string>
+ <string>Forward</string>
+ </property>
+ <property name="toolTip">
+ <string>Forward</string>
</property>
<property name="shortcut">
<string>Alt+Right</string>