diff options
| -rw-r--r-- | LICENSE.md | 3 | ||||
| -rw-r--r-- | README.md | 14 | ||||
| -rw-r--r-- | doc/Development.asciidoc | 15 | ||||
| -rw-r--r-- | linux/makepkg/PKGBUILD | 9 | ||||
| -rw-r--r-- | src/webengine/webpage.cpp | 4 |
5 files changed, 30 insertions, 15 deletions
@@ -29,3 +29,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. - url: https://github.com/itay-grudev/SingleApplication - license: MIT +## breakpad +- url: https://chromium.googlesource.com/breakpad/breakpad +- license: BSD-3-Clause @@ -2,12 +2,11 @@ _It's yet another no-frills browser, poi!_ ### What is this and why should I care? -smolbote is a [keep-it-simple][kiss-principle] free software web browser based -on Qt and QtWebEngine. +smolbote is a [keep-it-simple][kiss-principle] free software web browser. This program is free software. You can use it as you see fit, study and modify -it, and share the program with or without modification, but providing the same -terms. +the source code, and share the program with or without modification, while +providing the same terms. For more information, and a list of dependancies, see [LICENSE.md][repo-license]. @@ -16,13 +15,10 @@ This should be a simple browser that only does its browsing job with as little fuss as possible. This is not a platform. #### Customizability -This browser should be usable with minimal configuration necessary. At the same -time, all functionality should be user-customizable. It is the user's +This browser should be usable out of the box, with minimal if any configuration +necessary. All functionality should be user-customizable, and it is the user's responsibility to ensure a stable working state when changing settings. -This browser should be kept as platform-agnostic as possible, while learning -from and implementing the UNIX philosophy as applicable. - #### Pragmatic Freedom Free software should serve the user, not impose unbreakable barriers for ideological reasons. diff --git a/doc/Development.asciidoc b/doc/Development.asciidoc index c6c49fb..c849d67 100644 --- a/doc/Development.asciidoc +++ b/doc/Development.asciidoc @@ -1,10 +1,19 @@ == Guidelines +smolbote is written under the C++17 standard, without any compiler-specific +extensions. Source code should be kept as platform-agnostic as possible. + +=== General +* All behaviour, where possible, should be configurable. +* Configuration is stored in plaintext files, and option names should be as + self-descriptive as possible. +* Use sane defaults. Normally, the program should "just work". + === Qt * Check pointers with Q_CHECK_PTR. -* Avoid using connect SIGNAL and SLOT. Instead use &Class::method. This way - connects are checked during the compile, not at runtime. -* Where possible, prefer QVector over QList: http://lists.qt-project.org/pipermail/development/2017-March/029040.html +* Use the Qt5 signal/slot syntax (&Class::method) over the old string-based + syntax (SIGNAL/SLOT). This enables compile-time connect checks. +* Prefer QVector over QList: http://lists.qt-project.org/pipermail/development/2017-March/029040.html === clazy You can use https://github.com/KDE/clazy[clazy] to check Qt semantics. diff --git a/linux/makepkg/PKGBUILD b/linux/makepkg/PKGBUILD index 22c56b3..cac761b 100644 --- a/linux/makepkg/PKGBUILD +++ b/linux/makepkg/PKGBUILD @@ -8,7 +8,7 @@ pkgrel=1 _tag="" _describe="" _commit="" -_branch="" +_branch="master" url="https://neueland.iserlohn-fortress.net/smolbote" install="smolbote.install" @@ -21,7 +21,7 @@ optdepends=('firejail: launch a sandboxed instance') makedepends=('git' 'cmake' 'pkg-config' 'asciidoctor') # this is the central repository -source=("git+https://neueland.iserlohn-fortress.net/gitea/aqua/smolbote.git" +source=("git+https://neueland.iserlohn-fortress.net/gitea/aqua/smolbote.git#branch=master" "git+https://github.com/itay-grudev/SingleApplication.git") sha512sums=('SKIP' @@ -40,7 +40,10 @@ prepare() { _tag="r$(git rev-list --count HEAD)" _describe="r$(git rev-list --count HEAD)-$(git rev-parse --short HEAD)" _commit=$(git rev-parse HEAD) - _branch=$(git rev-parse --abbrev-ref HEAD) + # makepkg branches off the cloned repository into makepkg + #_branch=$(git rev-parse --abbrev-ref HEAD) + + msg2 "[$(pwd)]: build $_branch:$_commit" } pkgver() { diff --git a/src/webengine/webpage.cpp b/src/webengine/webpage.cpp index b2fe790..1c5e659 100644 --- a/src/webengine/webpage.cpp +++ b/src/webengine/webpage.cpp @@ -24,6 +24,8 @@ QString tr_terminationStatus(QWebEnginePage::RenderProcessTerminationStatus stat case QWebEnginePage::KilledTerminationStatus: return QObject::tr("The render process was killed, for example by SIGKILL or task manager kill."); } + + return QObject::tr("The render process was terminated with an unknown status."); } QString feature_toString(QWebEnginePage::Feature feature) @@ -46,6 +48,8 @@ QString feature_toString(QWebEnginePage::Feature feature) case QWebEnginePage::DesktopAudioVideoCapture: return QObject::tr("Desktop Audio and Video Capture"); } + + return QObject::tr("Unknown feature"); } WebPage::WebPage(QWebEngineProfile *profile, QObject *parent) |