Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| cb1a149441 | |||
| 37b6343506 | |||
| cee8f57ab7 | |||
| 04c5212d54 | |||
| 7264b68f11 | |||
| a1b59ff051 | |||
| bd40a583cb | |||
| 53608725aa | |||
| aefa627e42 |
1
.gitignore
vendored
@@ -1,2 +1,3 @@
|
||||
{src/
|
||||
build/
|
||||
BareCodeAUR
|
||||
|
||||
@@ -1,47 +0,0 @@
|
||||
# Maintainer: Dany Thinnes <deine@email.de>
|
||||
|
||||
pkgname=barecode-git
|
||||
pkgver=r5.cb66172
|
||||
pkgrel=1
|
||||
pkgdesc="Modularer Code-Editor, entwickelt von Projekt Hirnfrei (git)"
|
||||
arch=('x86_64' 'aarch64')
|
||||
url="https://git.projekt-hirnfrei.de/diabolus/BareCode"
|
||||
license=('MIT')
|
||||
depends=('qt6-base')
|
||||
makedepends=('cmake' 'ninja' 'git')
|
||||
provides=('barecode')
|
||||
conflicts=('barecode')
|
||||
|
||||
source=("$pkgname::git+$url.git")
|
||||
sha256sums=('SKIP')
|
||||
|
||||
pkgver()
|
||||
{
|
||||
cd "$pkgname"
|
||||
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
|
||||
}
|
||||
|
||||
build()
|
||||
{
|
||||
cmake \
|
||||
-B build \
|
||||
-S "$pkgname" \
|
||||
-G Ninja \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr
|
||||
cmake --build build
|
||||
}
|
||||
|
||||
package()
|
||||
{
|
||||
DESTDIR="$pkgdir" cmake --install build
|
||||
|
||||
install -Dm644 "$pkgname/barecode.desktop" \
|
||||
"$pkgdir/usr/share/applications/barecode.desktop"
|
||||
|
||||
# install -Dm644 "$pkgname/resources/barecode.png" \
|
||||
# "$pkgdir/usr/share/pixmaps/barecode.png"
|
||||
|
||||
install -Dm644 "$pkgname/LICENSE" \
|
||||
"$pkgdir/usr/share/licenses/$pkgname/LICENSE"
|
||||
}
|
||||
@@ -1,47 +0,0 @@
|
||||
# Maintainer: Dany Thinnes <deine@email.de>
|
||||
|
||||
pkgname=barecode-git
|
||||
pkgver=r1.0.0
|
||||
pkgrel=1
|
||||
pkgdesc="Modularer Code-Editor, entwickelt von Projekt Hirnfrei (git)"
|
||||
arch=('x86_64' 'aarch64')
|
||||
url="https://git.projekt-hirnfrei.de/diabolus/BareCode"
|
||||
license=('MIT')
|
||||
depends=('qt6-base')
|
||||
makedepends=('cmake' 'ninja' 'git')
|
||||
provides=('barecode')
|
||||
conflicts=('barecode')
|
||||
|
||||
source=("$pkgname::git+$url.git")
|
||||
sha256sums=('SKIP')
|
||||
|
||||
pkgver()
|
||||
{
|
||||
cd "$pkgname"
|
||||
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
|
||||
}
|
||||
|
||||
build()
|
||||
{
|
||||
cmake \
|
||||
-B build \
|
||||
-S "$pkgname" \
|
||||
-G Ninja \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr
|
||||
cmake --build build
|
||||
}
|
||||
|
||||
package()
|
||||
{
|
||||
DESTDIR="$pkgdir" cmake --install build
|
||||
|
||||
install -Dm644 "$pkgname/barecode.desktop" \
|
||||
"$pkgdir/usr/share/applications/barecode.desktop"
|
||||
|
||||
# install -Dm644 "$pkgname/resources/barecode.png" \
|
||||
# "$pkgdir/usr/share/pixmaps/barecode.png"
|
||||
|
||||
install -Dm644 "$pkgname/LICENSE" \
|
||||
"$pkgdir/usr/share/licenses/$pkgname/LICENSE"
|
||||
}
|
||||
@@ -1,41 +0,0 @@
|
||||
# Maintainer: Dany Thinnes <deine@email.de>
|
||||
|
||||
pkgname=barecode
|
||||
pkgver=1.0.0
|
||||
pkgrel=1
|
||||
pkgdesc="Modularer Code-Editor, entwickelt von Projekt Hirnfrei"
|
||||
arch=('x86_64' 'aarch64')
|
||||
url="https://git.projekt-hirnfrei.de/diabolus/BareCode"
|
||||
license=('MIT')
|
||||
depends=('qt6-base')
|
||||
makedepends=('cmake' 'ninja' 'git')
|
||||
|
||||
# Gitea erzeugt automatisch Tarballs unter:
|
||||
# https://DEIN-GITEA-SERVER/DEINNAME/BareCode/archive/v1.0.0.tar.gz
|
||||
#
|
||||
# sha256sum nach dem Taggen ermitteln:
|
||||
# curl -L https://DEIN-GITEA-SERVER/DEINNAME/BareCode/archive/v1.0.0.tar.gz | sha256sum
|
||||
source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz")
|
||||
sha256sums=('SKIP') # Ersetzen nach erstem Tag
|
||||
|
||||
build()
|
||||
{
|
||||
cmake \
|
||||
-B build \
|
||||
-S "BareCode-$pkgver" \
|
||||
-G Ninja \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr
|
||||
cmake --build build
|
||||
}
|
||||
|
||||
package()
|
||||
{
|
||||
DESTDIR="$pkgdir" cmake --install build
|
||||
|
||||
install -Dm644 "BareCode-$pkgver/barecode.desktop" \
|
||||
"$pkgdir/usr/share/applications/barecode.desktop"
|
||||
|
||||
install -Dm644 "BareCode-$pkgver/LICENSE" \
|
||||
"$pkgdir/usr/share/licenses/$pkgname/LICENSE"
|
||||
}
|
||||
@@ -1 +0,0 @@
|
||||
ref: refs/heads/main
|
||||
@@ -1,9 +0,0 @@
|
||||
[core]
|
||||
repositoryformatversion = 0
|
||||
filemode = true
|
||||
bare = true
|
||||
[remote "origin"]
|
||||
url = https://git.projekt-hirnfrei.de/diabolus/BareCode.git
|
||||
tagOpt = --no-tags
|
||||
fetch = +refs/*:refs/*
|
||||
mirror = true
|
||||
@@ -1 +0,0 @@
|
||||
Unnamed repository; edit this file 'description' to name the repository.
|
||||
@@ -1,15 +0,0 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# An example hook script to check the commit log message taken by
|
||||
# applypatch from an e-mail message.
|
||||
#
|
||||
# The hook should exit with non-zero status after issuing an
|
||||
# appropriate message if it wants to stop the commit. The hook is
|
||||
# allowed to edit the commit message file.
|
||||
#
|
||||
# To enable this hook, rename this file to "applypatch-msg".
|
||||
|
||||
. git-sh-setup
|
||||
commitmsg="$(git rev-parse --git-path hooks/commit-msg)"
|
||||
test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"}
|
||||
:
|
||||
@@ -1,74 +0,0 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# An example hook script to check the commit log message.
|
||||
# Called by "git commit" with one argument, the name of the file
|
||||
# that has the commit message. The hook should exit with non-zero
|
||||
# status after issuing an appropriate message if it wants to stop the
|
||||
# commit. The hook is allowed to edit the commit message file.
|
||||
#
|
||||
# To enable this hook, rename this file to "commit-msg".
|
||||
|
||||
# Uncomment the below to add a Signed-off-by line to the message.
|
||||
# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
|
||||
# hook is more suited to it.
|
||||
#
|
||||
# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
|
||||
# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
|
||||
|
||||
# This example catches duplicate Signed-off-by lines and messages that
|
||||
# would confuse 'git am'.
|
||||
|
||||
ret=0
|
||||
|
||||
test "" = "$(grep '^Signed-off-by: ' "$1" |
|
||||
sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || {
|
||||
echo >&2 Duplicate Signed-off-by lines.
|
||||
ret=1
|
||||
}
|
||||
|
||||
comment_re="$(
|
||||
{
|
||||
git config --get-regexp "^core\.comment(char|string)\$" ||
|
||||
echo '#'
|
||||
} | sed -n -e '
|
||||
${
|
||||
s/^[^ ]* //
|
||||
s|[][*./\]|\\&|g
|
||||
s/^auto$/[#;@!$%^&|:]/
|
||||
p
|
||||
}'
|
||||
)"
|
||||
scissors_line="^${comment_re} -\{8,\} >8 -\{8,\}\$"
|
||||
comment_line="^${comment_re}.*"
|
||||
blank_line='^[ ]*$'
|
||||
# Disallow lines starting with "diff -" or "Index: " in the body of the
|
||||
# message. Stop looking if we see a scissors line.
|
||||
line="$(sed -n -e "
|
||||
# Skip comments and blank lines at the start of the file.
|
||||
/${scissors_line}/q
|
||||
/${comment_line}/d
|
||||
/${blank_line}/d
|
||||
# The first paragraph will become the subject header so
|
||||
# does not need to be checked.
|
||||
: subject
|
||||
n
|
||||
/${scissors_line}/q
|
||||
/${blank_line}/!b subject
|
||||
# Check the body of the message for problematic
|
||||
# prefixes.
|
||||
: body
|
||||
n
|
||||
/${scissors_line}/q
|
||||
/${comment_line}/b body
|
||||
/^diff -/{p;q;}
|
||||
/^Index: /{p;q;}
|
||||
b body
|
||||
" "$1")"
|
||||
if test -n "$line"
|
||||
then
|
||||
echo >&2 "Message contains a diff that will confuse 'git am'."
|
||||
echo >&2 "To fix this indent the diff."
|
||||
ret=1
|
||||
fi
|
||||
|
||||
exit $ret
|
||||
@@ -1,168 +0,0 @@
|
||||
#!/usr/bin/perl
|
||||
|
||||
use strict;
|
||||
use warnings;
|
||||
use IPC::Open2;
|
||||
|
||||
# An example hook script to integrate Watchman
|
||||
# (https://facebook.github.io/watchman/) with git to speed up detecting
|
||||
# new and modified files.
|
||||
#
|
||||
# The hook is passed a version (currently 2) and last update token
|
||||
# formatted as a string and outputs to stdout a new update token and
|
||||
# all files that have been modified since the update token. Paths must
|
||||
# be relative to the root of the working tree and separated by a single NUL.
|
||||
#
|
||||
# To enable this hook, rename this file to "query-watchman" and set
|
||||
# 'git config core.fsmonitor .git/hooks/query-watchman'
|
||||
#
|
||||
my ($version, $last_update_token) = @ARGV;
|
||||
|
||||
# Uncomment for debugging
|
||||
# print STDERR "$0 $version $last_update_token\n";
|
||||
|
||||
# Check the hook interface version
|
||||
if ($version ne 2) {
|
||||
die "Unsupported query-fsmonitor hook version '$version'.\n" .
|
||||
"Falling back to scanning...\n";
|
||||
}
|
||||
|
||||
my $git_work_tree = get_working_dir();
|
||||
|
||||
my $json_pkg;
|
||||
eval {
|
||||
require JSON::XS;
|
||||
$json_pkg = "JSON::XS";
|
||||
1;
|
||||
} or do {
|
||||
require JSON::PP;
|
||||
$json_pkg = "JSON::PP";
|
||||
};
|
||||
|
||||
launch_watchman();
|
||||
|
||||
sub launch_watchman {
|
||||
my $o = watchman_query();
|
||||
if (is_work_tree_watched($o)) {
|
||||
output_result($o->{clock}, @{$o->{files}});
|
||||
}
|
||||
}
|
||||
|
||||
sub output_result {
|
||||
my ($clockid, @files) = @_;
|
||||
|
||||
# Uncomment for debugging watchman output
|
||||
# open (my $fh, ">", ".git/watchman-output.out");
|
||||
# binmode $fh, ":utf8";
|
||||
# print $fh "$clockid\n@files\n";
|
||||
# close $fh;
|
||||
|
||||
binmode STDOUT, ":utf8";
|
||||
print $clockid;
|
||||
print "\0";
|
||||
local $, = "\0";
|
||||
print @files;
|
||||
}
|
||||
|
||||
sub watchman_clock {
|
||||
my $response = qx/watchman clock "$git_work_tree"/;
|
||||
die "Failed to get clock id on '$git_work_tree'.\n" .
|
||||
"Falling back to scanning...\n" if $? != 0;
|
||||
|
||||
return $json_pkg->new->utf8->decode($response);
|
||||
}
|
||||
|
||||
sub watchman_query {
|
||||
my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty')
|
||||
or die "open2() failed: $!\n" .
|
||||
"Falling back to scanning...\n";
|
||||
|
||||
# In the query expression below we're asking for names of files that
|
||||
# changed since $last_update_token but not from the .git folder.
|
||||
#
|
||||
# To accomplish this, we're using the "since" generator to use the
|
||||
# recency index to select candidate nodes and "fields" to limit the
|
||||
# output to file names only. Then we're using the "expression" term to
|
||||
# further constrain the results.
|
||||
my $last_update_line = "";
|
||||
if (substr($last_update_token, 0, 1) eq "c") {
|
||||
$last_update_token = "\"$last_update_token\"";
|
||||
$last_update_line = qq[\n"since": $last_update_token,];
|
||||
}
|
||||
my $query = <<" END";
|
||||
["query", "$git_work_tree", {$last_update_line
|
||||
"fields": ["name"],
|
||||
"expression": ["not", ["dirname", ".git"]]
|
||||
}]
|
||||
END
|
||||
|
||||
# Uncomment for debugging the watchman query
|
||||
# open (my $fh, ">", ".git/watchman-query.json");
|
||||
# print $fh $query;
|
||||
# close $fh;
|
||||
|
||||
print CHLD_IN $query;
|
||||
close CHLD_IN;
|
||||
my $response = do {local $/; <CHLD_OUT>};
|
||||
|
||||
# Uncomment for debugging the watch response
|
||||
# open ($fh, ">", ".git/watchman-response.json");
|
||||
# print $fh $response;
|
||||
# close $fh;
|
||||
|
||||
die "Watchman: command returned no output.\n" .
|
||||
"Falling back to scanning...\n" if $response eq "";
|
||||
die "Watchman: command returned invalid output: $response\n" .
|
||||
"Falling back to scanning...\n" unless $response =~ /^\{/;
|
||||
|
||||
return $json_pkg->new->utf8->decode($response);
|
||||
}
|
||||
|
||||
sub is_work_tree_watched {
|
||||
my ($output) = @_;
|
||||
my $error = $output->{error};
|
||||
if ($error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) {
|
||||
my $response = qx/watchman watch "$git_work_tree"/;
|
||||
die "Failed to make watchman watch '$git_work_tree'.\n" .
|
||||
"Falling back to scanning...\n" if $? != 0;
|
||||
$output = $json_pkg->new->utf8->decode($response);
|
||||
$error = $output->{error};
|
||||
die "Watchman: $error.\n" .
|
||||
"Falling back to scanning...\n" if $error;
|
||||
|
||||
# Uncomment for debugging watchman output
|
||||
# open (my $fh, ">", ".git/watchman-output.out");
|
||||
# close $fh;
|
||||
|
||||
# Watchman will always return all files on the first query so
|
||||
# return the fast "everything is dirty" flag to git and do the
|
||||
# Watchman query just to get it over with now so we won't pay
|
||||
# the cost in git to look up each individual file.
|
||||
my $o = watchman_clock();
|
||||
$error = $o->{error};
|
||||
|
||||
die "Watchman: $error.\n" .
|
||||
"Falling back to scanning...\n" if $error;
|
||||
|
||||
output_result($o->{clock}, ("/"));
|
||||
return 0;
|
||||
}
|
||||
|
||||
die "Watchman: $error.\n" .
|
||||
"Falling back to scanning...\n" if $error;
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
sub get_working_dir {
|
||||
my $working_dir;
|
||||
if ($^O =~ 'msys' || $^O =~ 'cygwin') {
|
||||
$working_dir = Win32::GetCwd();
|
||||
$working_dir =~ tr/\\/\//;
|
||||
} else {
|
||||
require Cwd;
|
||||
$working_dir = Cwd::cwd();
|
||||
}
|
||||
|
||||
return $working_dir;
|
||||
}
|
||||
@@ -1,8 +0,0 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# An example hook script to prepare a packed repository for use over
|
||||
# dumb transports.
|
||||
#
|
||||
# To enable this hook, rename this file to "post-update".
|
||||
|
||||
exec git update-server-info
|
||||
@@ -1,14 +0,0 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# An example hook script to verify what is about to be committed
|
||||
# by applypatch from an e-mail message.
|
||||
#
|
||||
# The hook should exit with non-zero status after issuing an
|
||||
# appropriate message if it wants to stop the commit.
|
||||
#
|
||||
# To enable this hook, rename this file to "pre-applypatch".
|
||||
|
||||
. git-sh-setup
|
||||
precommit="$(git rev-parse --git-path hooks/pre-commit)"
|
||||
test -x "$precommit" && exec "$precommit" ${1+"$@"}
|
||||
:
|
||||
@@ -1,49 +0,0 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# An example hook script to verify what is about to be committed.
|
||||
# Called by "git commit" with no arguments. The hook should
|
||||
# exit with non-zero status after issuing an appropriate message if
|
||||
# it wants to stop the commit.
|
||||
#
|
||||
# To enable this hook, rename this file to "pre-commit".
|
||||
|
||||
if git rev-parse --verify HEAD >/dev/null 2>&1
|
||||
then
|
||||
against=HEAD
|
||||
else
|
||||
# Initial commit: diff against an empty tree object
|
||||
against=$(git hash-object -t tree /dev/null)
|
||||
fi
|
||||
|
||||
# If you want to allow non-ASCII filenames set this variable to true.
|
||||
allownonascii=$(git config --type=bool hooks.allownonascii)
|
||||
|
||||
# Redirect output to stderr.
|
||||
exec 1>&2
|
||||
|
||||
# Cross platform projects tend to avoid non-ASCII filenames; prevent
|
||||
# them from being added to the repository. We exploit the fact that the
|
||||
# printable range starts at the space character and ends with tilde.
|
||||
if [ "$allownonascii" != "true" ] &&
|
||||
# Note that the use of brackets around a tr range is ok here, (it's
|
||||
# even required, for portability to Solaris 10's /usr/bin/tr), since
|
||||
# the square bracket bytes happen to fall in the designated range.
|
||||
test $(git diff-index --cached --name-only --diff-filter=A -z $against |
|
||||
LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
|
||||
then
|
||||
cat <<\EOF
|
||||
Error: Attempt to add a non-ASCII file name.
|
||||
|
||||
This can cause problems if you want to work with people on other platforms.
|
||||
|
||||
To be portable it is advisable to rename the file.
|
||||
|
||||
If you know what you are doing you can disable this check using:
|
||||
|
||||
git config hooks.allownonascii true
|
||||
EOF
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# If there are whitespace errors, print the offending file names and fail.
|
||||
exec git diff-index --check --cached $against --
|
||||
@@ -1,13 +0,0 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# An example hook script to verify what is about to be committed.
|
||||
# Called by "git merge" with no arguments. The hook should
|
||||
# exit with non-zero status after issuing an appropriate message to
|
||||
# stderr if it wants to stop the merge commit.
|
||||
#
|
||||
# To enable this hook, rename this file to "pre-merge-commit".
|
||||
|
||||
. git-sh-setup
|
||||
test -x "$GIT_DIR/hooks/pre-commit" &&
|
||||
exec "$GIT_DIR/hooks/pre-commit"
|
||||
:
|
||||
@@ -1,53 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
# An example hook script to verify what is about to be pushed. Called by "git
|
||||
# push" after it has checked the remote status, but before anything has been
|
||||
# pushed. If this script exits with a non-zero status nothing will be pushed.
|
||||
#
|
||||
# This hook is called with the following parameters:
|
||||
#
|
||||
# $1 -- Name of the remote to which the push is being done
|
||||
# $2 -- URL to which the push is being done
|
||||
#
|
||||
# If pushing without using a named remote those arguments will be equal.
|
||||
#
|
||||
# Information about the commits which are being pushed is supplied as lines to
|
||||
# the standard input in the form:
|
||||
#
|
||||
# <local ref> <local oid> <remote ref> <remote oid>
|
||||
#
|
||||
# This sample shows how to prevent push of commits where the log message starts
|
||||
# with "WIP" (work in progress).
|
||||
|
||||
remote="$1"
|
||||
url="$2"
|
||||
|
||||
zero=$(git hash-object --stdin </dev/null | tr '[0-9a-f]' '0')
|
||||
|
||||
while read local_ref local_oid remote_ref remote_oid
|
||||
do
|
||||
if test "$local_oid" = "$zero"
|
||||
then
|
||||
# Handle delete
|
||||
:
|
||||
else
|
||||
if test "$remote_oid" = "$zero"
|
||||
then
|
||||
# New branch, examine all commits
|
||||
range="$local_oid"
|
||||
else
|
||||
# Update to existing branch, examine new commits
|
||||
range="$remote_oid..$local_oid"
|
||||
fi
|
||||
|
||||
# Check for WIP commit
|
||||
commit=$(git rev-list -n 1 --grep '^WIP' "$range")
|
||||
if test -n "$commit"
|
||||
then
|
||||
echo >&2 "Found WIP commit in $local_ref, not pushing"
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
||||
exit 0
|
||||
@@ -1,169 +0,0 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# Copyright (c) 2006, 2008 Junio C Hamano
|
||||
#
|
||||
# The "pre-rebase" hook is run just before "git rebase" starts doing
|
||||
# its job, and can prevent the command from running by exiting with
|
||||
# non-zero status.
|
||||
#
|
||||
# The hook is called with the following parameters:
|
||||
#
|
||||
# $1 -- the upstream the series was forked from.
|
||||
# $2 -- the branch being rebased (or empty when rebasing the current branch).
|
||||
#
|
||||
# This sample shows how to prevent topic branches that are already
|
||||
# merged to 'next' branch from getting rebased, because allowing it
|
||||
# would result in rebasing already published history.
|
||||
|
||||
publish=next
|
||||
basebranch="$1"
|
||||
if test "$#" = 2
|
||||
then
|
||||
topic="refs/heads/$2"
|
||||
else
|
||||
topic=`git symbolic-ref HEAD` ||
|
||||
exit 0 ;# we do not interrupt rebasing detached HEAD
|
||||
fi
|
||||
|
||||
case "$topic" in
|
||||
refs/heads/??/*)
|
||||
;;
|
||||
*)
|
||||
exit 0 ;# we do not interrupt others.
|
||||
;;
|
||||
esac
|
||||
|
||||
# Now we are dealing with a topic branch being rebased
|
||||
# on top of master. Is it OK to rebase it?
|
||||
|
||||
# Does the topic really exist?
|
||||
git show-ref -q "$topic" || {
|
||||
echo >&2 "No such branch $topic"
|
||||
exit 1
|
||||
}
|
||||
|
||||
# Is topic fully merged to master?
|
||||
not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
|
||||
if test -z "$not_in_master"
|
||||
then
|
||||
echo >&2 "$topic is fully merged to master; better remove it."
|
||||
exit 1 ;# we could allow it, but there is no point.
|
||||
fi
|
||||
|
||||
# Is topic ever merged to next? If so you should not be rebasing it.
|
||||
only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
|
||||
only_next_2=`git rev-list ^master ${publish} | sort`
|
||||
if test "$only_next_1" = "$only_next_2"
|
||||
then
|
||||
not_in_topic=`git rev-list "^$topic" master`
|
||||
if test -z "$not_in_topic"
|
||||
then
|
||||
echo >&2 "$topic is already up to date with master"
|
||||
exit 1 ;# we could allow it, but there is no point.
|
||||
else
|
||||
exit 0
|
||||
fi
|
||||
else
|
||||
not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
|
||||
/usr/bin/perl -e '
|
||||
my $topic = $ARGV[0];
|
||||
my $msg = "* $topic has commits already merged to public branch:\n";
|
||||
my (%not_in_next) = map {
|
||||
/^([0-9a-f]+) /;
|
||||
($1 => 1);
|
||||
} split(/\n/, $ARGV[1]);
|
||||
for my $elem (map {
|
||||
/^([0-9a-f]+) (.*)$/;
|
||||
[$1 => $2];
|
||||
} split(/\n/, $ARGV[2])) {
|
||||
if (!exists $not_in_next{$elem->[0]}) {
|
||||
if ($msg) {
|
||||
print STDERR $msg;
|
||||
undef $msg;
|
||||
}
|
||||
print STDERR " $elem->[1]\n";
|
||||
}
|
||||
}
|
||||
' "$topic" "$not_in_next" "$not_in_master"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
<<\DOC_END
|
||||
|
||||
This sample hook safeguards topic branches that have been
|
||||
published from being rewound.
|
||||
|
||||
The workflow assumed here is:
|
||||
|
||||
* Once a topic branch forks from "master", "master" is never
|
||||
merged into it again (either directly or indirectly).
|
||||
|
||||
* Once a topic branch is fully cooked and merged into "master",
|
||||
it is deleted. If you need to build on top of it to correct
|
||||
earlier mistakes, a new topic branch is created by forking at
|
||||
the tip of the "master". This is not strictly necessary, but
|
||||
it makes it easier to keep your history simple.
|
||||
|
||||
* Whenever you need to test or publish your changes to topic
|
||||
branches, merge them into "next" branch.
|
||||
|
||||
The script, being an example, hardcodes the publish branch name
|
||||
to be "next", but it is trivial to make it configurable via
|
||||
$GIT_DIR/config mechanism.
|
||||
|
||||
With this workflow, you would want to know:
|
||||
|
||||
(1) ... if a topic branch has ever been merged to "next". Young
|
||||
topic branches can have stupid mistakes you would rather
|
||||
clean up before publishing, and things that have not been
|
||||
merged into other branches can be easily rebased without
|
||||
affecting other people. But once it is published, you would
|
||||
not want to rewind it.
|
||||
|
||||
(2) ... if a topic branch has been fully merged to "master".
|
||||
Then you can delete it. More importantly, you should not
|
||||
build on top of it -- other people may already want to
|
||||
change things related to the topic as patches against your
|
||||
"master", so if you need further changes, it is better to
|
||||
fork the topic (perhaps with the same name) afresh from the
|
||||
tip of "master".
|
||||
|
||||
Let's look at this example:
|
||||
|
||||
o---o---o---o---o---o---o---o---o---o "next"
|
||||
/ / / /
|
||||
/ a---a---b A / /
|
||||
/ / / /
|
||||
/ / c---c---c---c B /
|
||||
/ / / \ /
|
||||
/ / / b---b C \ /
|
||||
/ / / / \ /
|
||||
---o---o---o---o---o---o---o---o---o---o---o "master"
|
||||
|
||||
|
||||
A, B and C are topic branches.
|
||||
|
||||
* A has one fix since it was merged up to "next".
|
||||
|
||||
* B has finished. It has been fully merged up to "master" and "next",
|
||||
and is ready to be deleted.
|
||||
|
||||
* C has not merged to "next" at all.
|
||||
|
||||
We would want to allow C to be rebased, refuse A, and encourage
|
||||
B to be deleted.
|
||||
|
||||
To compute (1):
|
||||
|
||||
git rev-list ^master ^topic next
|
||||
git rev-list ^master next
|
||||
|
||||
if these match, topic has not merged in next at all.
|
||||
|
||||
To compute (2):
|
||||
|
||||
git rev-list master..topic
|
||||
|
||||
if this is empty, it is fully merged to "master".
|
||||
|
||||
DOC_END
|
||||
@@ -1,24 +0,0 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# An example hook script to make use of push options.
|
||||
# The example simply echoes all push options that start with 'echoback='
|
||||
# and rejects all pushes when the "reject" push option is used.
|
||||
#
|
||||
# To enable this hook, rename this file to "pre-receive".
|
||||
|
||||
if test -n "$GIT_PUSH_OPTION_COUNT"
|
||||
then
|
||||
i=0
|
||||
while test "$i" -lt "$GIT_PUSH_OPTION_COUNT"
|
||||
do
|
||||
eval "value=\$GIT_PUSH_OPTION_$i"
|
||||
case "$value" in
|
||||
echoback=*)
|
||||
echo "echo from the pre-receive-hook: ${value#*=}" >&2
|
||||
;;
|
||||
reject)
|
||||
exit 1
|
||||
esac
|
||||
i=$((i + 1))
|
||||
done
|
||||
fi
|
||||
@@ -1,42 +0,0 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# An example hook script to prepare the commit log message.
|
||||
# Called by "git commit" with the name of the file that has the
|
||||
# commit message, followed by the description of the commit
|
||||
# message's source. The hook's purpose is to edit the commit
|
||||
# message file. If the hook fails with a non-zero status,
|
||||
# the commit is aborted.
|
||||
#
|
||||
# To enable this hook, rename this file to "prepare-commit-msg".
|
||||
|
||||
# This hook includes three examples. The first one removes the
|
||||
# "# Please enter the commit message..." help message.
|
||||
#
|
||||
# The second includes the output of "git diff --name-status -r"
|
||||
# into the message, just before the "git status" output. It is
|
||||
# commented because it doesn't cope with --amend or with squashed
|
||||
# commits.
|
||||
#
|
||||
# The third example adds a Signed-off-by line to the message, that can
|
||||
# still be edited. This is rarely a good idea.
|
||||
|
||||
COMMIT_MSG_FILE=$1
|
||||
COMMIT_SOURCE=$2
|
||||
SHA1=$3
|
||||
|
||||
/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE"
|
||||
|
||||
# case "$COMMIT_SOURCE,$SHA1" in
|
||||
# ,|template,)
|
||||
# /usr/bin/perl -i.bak -pe '
|
||||
# print "\n" . `git diff --cached --name-status -r`
|
||||
# if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;;
|
||||
# *) ;;
|
||||
# esac
|
||||
|
||||
# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
|
||||
# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE"
|
||||
# if test -z "$COMMIT_SOURCE"
|
||||
# then
|
||||
# /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE"
|
||||
# fi
|
||||
@@ -1,78 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
# An example hook script to update a checked-out tree on a git push.
|
||||
#
|
||||
# This hook is invoked by git-receive-pack(1) when it reacts to git
|
||||
# push and updates reference(s) in its repository, and when the push
|
||||
# tries to update the branch that is currently checked out and the
|
||||
# receive.denyCurrentBranch configuration variable is set to
|
||||
# updateInstead.
|
||||
#
|
||||
# By default, such a push is refused if the working tree and the index
|
||||
# of the remote repository has any difference from the currently
|
||||
# checked out commit; when both the working tree and the index match
|
||||
# the current commit, they are updated to match the newly pushed tip
|
||||
# of the branch. This hook is to be used to override the default
|
||||
# behaviour; however the code below reimplements the default behaviour
|
||||
# as a starting point for convenient modification.
|
||||
#
|
||||
# The hook receives the commit with which the tip of the current
|
||||
# branch is going to be updated:
|
||||
commit=$1
|
||||
|
||||
# It can exit with a non-zero status to refuse the push (when it does
|
||||
# so, it must not modify the index or the working tree).
|
||||
die () {
|
||||
echo >&2 "$*"
|
||||
exit 1
|
||||
}
|
||||
|
||||
# Or it can make any necessary changes to the working tree and to the
|
||||
# index to bring them to the desired state when the tip of the current
|
||||
# branch is updated to the new commit, and exit with a zero status.
|
||||
#
|
||||
# For example, the hook can simply run git read-tree -u -m HEAD "$1"
|
||||
# in order to emulate git fetch that is run in the reverse direction
|
||||
# with git push, as the two-tree form of git read-tree -u -m is
|
||||
# essentially the same as git switch or git checkout that switches
|
||||
# branches while keeping the local changes in the working tree that do
|
||||
# not interfere with the difference between the branches.
|
||||
|
||||
# The below is a more-or-less exact translation to shell of the C code
|
||||
# for the default behaviour for git's push-to-checkout hook defined in
|
||||
# the push_to_deploy() function in builtin/receive-pack.c.
|
||||
#
|
||||
# Note that the hook will be executed from the repository directory,
|
||||
# not from the working tree, so if you want to perform operations on
|
||||
# the working tree, you will have to adapt your code accordingly, e.g.
|
||||
# by adding "cd .." or using relative paths.
|
||||
|
||||
if ! git update-index -q --ignore-submodules --refresh
|
||||
then
|
||||
die "Up-to-date check failed"
|
||||
fi
|
||||
|
||||
if ! git diff-files --quiet --ignore-submodules --
|
||||
then
|
||||
die "Working directory has unstaged changes"
|
||||
fi
|
||||
|
||||
# This is a rough translation of:
|
||||
#
|
||||
# head_has_history() ? "HEAD" : EMPTY_TREE_SHA1_HEX
|
||||
if git cat-file -e HEAD 2>/dev/null
|
||||
then
|
||||
head=HEAD
|
||||
else
|
||||
head=$(git hash-object -t tree --stdin </dev/null)
|
||||
fi
|
||||
|
||||
if ! git diff-index --quiet --cached --ignore-submodules $head --
|
||||
then
|
||||
die "Working directory has staged changes"
|
||||
fi
|
||||
|
||||
if ! git read-tree -u -m "$commit"
|
||||
then
|
||||
die "Could not update working tree to new HEAD"
|
||||
fi
|
||||
@@ -1,77 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
# An example hook script to validate a patch (and/or patch series) before
|
||||
# sending it via email.
|
||||
#
|
||||
# The hook should exit with non-zero status after issuing an appropriate
|
||||
# message if it wants to prevent the email(s) from being sent.
|
||||
#
|
||||
# To enable this hook, rename this file to "sendemail-validate".
|
||||
#
|
||||
# By default, it will only check that the patch(es) can be applied on top of
|
||||
# the default upstream branch without conflicts in a secondary worktree. After
|
||||
# validation (successful or not) of the last patch of a series, the worktree
|
||||
# will be deleted.
|
||||
#
|
||||
# The following config variables can be set to change the default remote and
|
||||
# remote ref that are used to apply the patches against:
|
||||
#
|
||||
# sendemail.validateRemote (default: origin)
|
||||
# sendemail.validateRemoteRef (default: HEAD)
|
||||
#
|
||||
# Replace the TODO placeholders with appropriate checks according to your
|
||||
# needs.
|
||||
|
||||
validate_cover_letter () {
|
||||
file="$1"
|
||||
# TODO: Replace with appropriate checks (e.g. spell checking).
|
||||
true
|
||||
}
|
||||
|
||||
validate_patch () {
|
||||
file="$1"
|
||||
# Ensure that the patch applies without conflicts.
|
||||
git am -3 "$file" || return
|
||||
# TODO: Replace with appropriate checks for this patch
|
||||
# (e.g. checkpatch.pl).
|
||||
true
|
||||
}
|
||||
|
||||
validate_series () {
|
||||
# TODO: Replace with appropriate checks for the whole series
|
||||
# (e.g. quick build, coding style checks, etc.).
|
||||
true
|
||||
}
|
||||
|
||||
# main -------------------------------------------------------------------------
|
||||
|
||||
if test "$GIT_SENDEMAIL_FILE_COUNTER" = 1
|
||||
then
|
||||
remote=$(git config --default origin --get sendemail.validateRemote) &&
|
||||
ref=$(git config --default HEAD --get sendemail.validateRemoteRef) &&
|
||||
worktree=$(mktemp --tmpdir -d sendemail-validate.XXXXXXX) &&
|
||||
git worktree add -fd --checkout "$worktree" "refs/remotes/$remote/$ref" &&
|
||||
git config --replace-all sendemail.validateWorktree "$worktree"
|
||||
else
|
||||
worktree=$(git config --get sendemail.validateWorktree)
|
||||
fi || {
|
||||
echo "sendemail-validate: error: failed to prepare worktree" >&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
unset GIT_DIR GIT_WORK_TREE
|
||||
cd "$worktree" &&
|
||||
|
||||
if grep -q "^diff --git " "$1"
|
||||
then
|
||||
validate_patch "$1"
|
||||
else
|
||||
validate_cover_letter "$1"
|
||||
fi &&
|
||||
|
||||
if test "$GIT_SENDEMAIL_FILE_COUNTER" = "$GIT_SENDEMAIL_FILE_TOTAL"
|
||||
then
|
||||
git config --unset-all sendemail.validateWorktree &&
|
||||
trap 'git worktree remove -ff "$worktree"' EXIT &&
|
||||
validate_series
|
||||
fi
|
||||
@@ -1,128 +0,0 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# An example hook script to block unannotated tags from entering.
|
||||
# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
|
||||
#
|
||||
# To enable this hook, rename this file to "update".
|
||||
#
|
||||
# Config
|
||||
# ------
|
||||
# hooks.allowunannotated
|
||||
# This boolean sets whether unannotated tags will be allowed into the
|
||||
# repository. By default they won't be.
|
||||
# hooks.allowdeletetag
|
||||
# This boolean sets whether deleting tags will be allowed in the
|
||||
# repository. By default they won't be.
|
||||
# hooks.allowmodifytag
|
||||
# This boolean sets whether a tag may be modified after creation. By default
|
||||
# it won't be.
|
||||
# hooks.allowdeletebranch
|
||||
# This boolean sets whether deleting branches will be allowed in the
|
||||
# repository. By default they won't be.
|
||||
# hooks.denycreatebranch
|
||||
# This boolean sets whether remotely creating branches will be denied
|
||||
# in the repository. By default this is allowed.
|
||||
#
|
||||
|
||||
# --- Command line
|
||||
refname="$1"
|
||||
oldrev="$2"
|
||||
newrev="$3"
|
||||
|
||||
# --- Safety check
|
||||
if [ -z "$GIT_DIR" ]; then
|
||||
echo "Don't run this script from the command line." >&2
|
||||
echo " (if you want, you could supply GIT_DIR then run" >&2
|
||||
echo " $0 <ref> <oldrev> <newrev>)" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
|
||||
echo "usage: $0 <ref> <oldrev> <newrev>" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# --- Config
|
||||
allowunannotated=$(git config --type=bool hooks.allowunannotated)
|
||||
allowdeletebranch=$(git config --type=bool hooks.allowdeletebranch)
|
||||
denycreatebranch=$(git config --type=bool hooks.denycreatebranch)
|
||||
allowdeletetag=$(git config --type=bool hooks.allowdeletetag)
|
||||
allowmodifytag=$(git config --type=bool hooks.allowmodifytag)
|
||||
|
||||
# check for no description
|
||||
projectdesc=$(sed -e '1q' "$GIT_DIR/description")
|
||||
case "$projectdesc" in
|
||||
"Unnamed repository"* | "")
|
||||
echo "*** Project description file hasn't been set" >&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
# --- Check types
|
||||
# if $newrev is 0000...0000, it's a commit to delete a ref.
|
||||
zero=$(git hash-object --stdin </dev/null | tr '[0-9a-f]' '0')
|
||||
if [ "$newrev" = "$zero" ]; then
|
||||
newrev_type=delete
|
||||
else
|
||||
newrev_type=$(git cat-file -t $newrev)
|
||||
fi
|
||||
|
||||
case "$refname","$newrev_type" in
|
||||
refs/tags/*,commit)
|
||||
# un-annotated tag
|
||||
short_refname=${refname##refs/tags/}
|
||||
if [ "$allowunannotated" != "true" ]; then
|
||||
echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
|
||||
echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
|
||||
exit 1
|
||||
fi
|
||||
;;
|
||||
refs/tags/*,delete)
|
||||
# delete tag
|
||||
if [ "$allowdeletetag" != "true" ]; then
|
||||
echo "*** Deleting a tag is not allowed in this repository" >&2
|
||||
exit 1
|
||||
fi
|
||||
;;
|
||||
refs/tags/*,tag)
|
||||
# annotated tag
|
||||
if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1
|
||||
then
|
||||
echo "*** Tag '$refname' already exists." >&2
|
||||
echo "*** Modifying a tag is not allowed in this repository." >&2
|
||||
exit 1
|
||||
fi
|
||||
;;
|
||||
refs/heads/*,commit)
|
||||
# branch
|
||||
if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
|
||||
echo "*** Creating a branch is not allowed in this repository" >&2
|
||||
exit 1
|
||||
fi
|
||||
;;
|
||||
refs/heads/*,delete)
|
||||
# delete branch
|
||||
if [ "$allowdeletebranch" != "true" ]; then
|
||||
echo "*** Deleting a branch is not allowed in this repository" >&2
|
||||
exit 1
|
||||
fi
|
||||
;;
|
||||
refs/remotes/*,commit)
|
||||
# tracking branch
|
||||
;;
|
||||
refs/remotes/*,delete)
|
||||
# delete tracking branch
|
||||
if [ "$allowdeletebranch" != "true" ]; then
|
||||
echo "*** Deleting a tracking branch is not allowed in this repository" >&2
|
||||
exit 1
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
# Anything else (is there anything else?)
|
||||
echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
# --- Finished
|
||||
exit 0
|
||||
@@ -1 +0,0 @@
|
||||
* -export-subst -export-ignore
|
||||
@@ -1,6 +0,0 @@
|
||||
# git ls-files --others --exclude-from=.git/info/exclude
|
||||
# Lines that start with '#' are comments.
|
||||
# For a project mostly in C, the following would be a good set of
|
||||
# exclude patterns (uncomment them if you want to use them):
|
||||
# *.[oa]
|
||||
# *~
|
||||
@@ -1,4 +0,0 @@
|
||||
# pack-refs with: peeled fully-peeled sorted
|
||||
cb6617222dbcac30aaf15bf336b150fed440cc7f refs/heads/main
|
||||
ca573209e715409e5989324aaeaa4efbd4da5642 refs/tags/v1.0.0
|
||||
^36e074f43d5b76d940d953956b0ed80899e71848
|
||||
@@ -1,19 +0,0 @@
|
||||
# Generated by makepkg 7.1.0
|
||||
# using fakeroot version 1.37.2
|
||||
pkgname = barecode-git
|
||||
pkgbase = barecode-git
|
||||
xdata = pkgtype=pkg
|
||||
pkgver = r5.cb66172-1
|
||||
pkgdesc = Modularer Code-Editor, entwickelt von Projekt Hirnfrei (git)
|
||||
url = https://git.projekt-hirnfrei.de/diabolus/BareCode
|
||||
builddate = 1781069213
|
||||
packager = Unknown Packager
|
||||
size = 1191503
|
||||
arch = x86_64
|
||||
license = MIT
|
||||
conflict = barecode
|
||||
provides = barecode
|
||||
depend = qt6-base
|
||||
makedepend = cmake
|
||||
makedepend = ninja
|
||||
makedepend = git
|
||||
|
Before Width: | Height: | Size: 25 KiB |
|
Before Width: | Height: | Size: 824 B |
|
Before Width: | Height: | Size: 90 KiB |
|
Before Width: | Height: | Size: 2.4 KiB |
|
Before Width: | Height: | Size: 4.7 KiB |
|
Before Width: | Height: | Size: 303 KiB |
|
Before Width: | Height: | Size: 7.6 KiB |
@@ -1,21 +0,0 @@
|
||||
MIT License
|
||||
|
||||
Copyright (c) 2025 Dany Thinnes – Projekt Hirnfrei
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
@@ -1,7 +1,7 @@
|
||||
cmake_minimum_required(VERSION 3.16)
|
||||
|
||||
project(BareCode
|
||||
VERSION 1.1.0
|
||||
VERSION 1.3.2
|
||||
DESCRIPTION "A modular code editor built with Qt6"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
@@ -16,8 +16,6 @@ set(CMAKE_AUTOUIC ON)
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Plattform-Erkennung
|
||||
# Haiku definiert kein eigenes CMake-Flag — wir erkennen es über den
|
||||
# Systemnamen. CMAKE_SYSTEM_NAME ist "Haiku" auf Haiku OS.
|
||||
# ---------------------------------------------------------------------------
|
||||
if(WIN32)
|
||||
set(PLATFORM_WINDOWS TRUE)
|
||||
@@ -37,41 +35,63 @@ endif()
|
||||
# ---------------------------------------------------------------------------
|
||||
# Qt6
|
||||
# ---------------------------------------------------------------------------
|
||||
find_package(Qt6 REQUIRED COMPONENTS
|
||||
Core
|
||||
Gui
|
||||
Widgets
|
||||
Concurrent
|
||||
)
|
||||
|
||||
find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets Concurrent LinguistTools)
|
||||
qt_standard_project_setup()
|
||||
|
||||
# Include cmake modules
|
||||
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
|
||||
|
||||
# Collect sources
|
||||
add_subdirectory(src)
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Übersetzungen — lrelease → .qm → ins Build-Verzeichnis
|
||||
#
|
||||
# Qt6::lrelease kommt aus der Komponente "LinguistTools" (siehe find_package
|
||||
# oben) und funktioniert plattformunabhängig, unabhängig davon, wo lrelease
|
||||
# tatsächlich installiert ist. Ein manuelles find_program() mit fest
|
||||
# verdrahteten Pfaden ist NICHT portabel: einige Distributionen installieren
|
||||
# Qt6 nicht unter /usr, sondern in einen eigenen Unterbaum (z. B. Void Linux
|
||||
# unter /usr/lib/qt6/...), wodurch ein relativer Pfad wie
|
||||
# "${Qt6_DIR}/../../../bin" ins Leere zeigt.
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
set(TS_FILES
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/translations/barecode_de.ts
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/translations/barecode_en.ts
|
||||
)
|
||||
|
||||
set(QM_FILES)
|
||||
foreach(TS_FILE ${TS_FILES})
|
||||
get_filename_component(TS_NAME ${TS_FILE} NAME_WE)
|
||||
set(QM_FILE "${CMAKE_CURRENT_BINARY_DIR}/translations/${TS_NAME}.qm")
|
||||
add_custom_command(
|
||||
OUTPUT "${QM_FILE}"
|
||||
COMMAND ${CMAKE_COMMAND} -E make_directory
|
||||
"${CMAKE_CURRENT_BINARY_DIR}/translations"
|
||||
COMMAND Qt6::lrelease "${TS_FILE}" -qm "${QM_FILE}"
|
||||
DEPENDS "${TS_FILE}"
|
||||
COMMENT "lrelease: ${TS_NAME}.qm"
|
||||
VERBATIM
|
||||
)
|
||||
list(APPEND QM_FILES "${QM_FILE}")
|
||||
endforeach()
|
||||
|
||||
add_custom_target(BareCode_translations ALL DEPENDS ${QM_FILES})
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Resources
|
||||
# ---------------------------------------------------------------------------
|
||||
qt_add_resources(BARECODE_RESOURCES resources/resources.qrc)
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Executable
|
||||
# Unter Windows: .rc-Datei für EXE-Icon einbinden
|
||||
# ---------------------------------------------------------------------------
|
||||
if(PLATFORM_WINDOWS)
|
||||
qt_add_executable(BareCode
|
||||
main.cpp
|
||||
BareCode.rc
|
||||
${BARECODE_RESOURCES}
|
||||
)
|
||||
qt_add_executable(BareCode main.cpp BareCode.rc ${BARECODE_RESOURCES})
|
||||
else()
|
||||
qt_add_executable(BareCode
|
||||
main.cpp
|
||||
${BARECODE_RESOURCES}
|
||||
)
|
||||
qt_add_executable(BareCode main.cpp ${BARECODE_RESOURCES})
|
||||
endif()
|
||||
|
||||
add_dependencies(BareCode BareCode_translations)
|
||||
|
||||
target_link_libraries(BareCode PRIVATE
|
||||
BareCode_Core
|
||||
BareCode_Editor
|
||||
@@ -99,7 +119,11 @@ install(FILES LICENSE
|
||||
DESTINATION ${CMAKE_INSTALL_DATADIR}/licenses/barecode
|
||||
)
|
||||
|
||||
# ---- Linux (FreeDesktop) --------------------------------------------------
|
||||
# .qm-Dateien installieren
|
||||
install(FILES ${QM_FILES}
|
||||
DESTINATION ${CMAKE_INSTALL_DATADIR}/BareCode/translations
|
||||
)
|
||||
|
||||
if(PLATFORM_LINUX)
|
||||
foreach(SIZE 16 32 48 64 128 256 512)
|
||||
install(FILES resources/icon_${SIZE}.png
|
||||
@@ -107,35 +131,27 @@ if(PLATFORM_LINUX)
|
||||
RENAME barecode.png
|
||||
)
|
||||
endforeach()
|
||||
|
||||
install(FILES BareCode.desktop
|
||||
DESTINATION ${CMAKE_INSTALL_DATADIR}/applications
|
||||
)
|
||||
endif()
|
||||
|
||||
# ---- Haiku ----------------------------------------------------------------
|
||||
# Haiku verwendet kein FreeDesktop-System. Icons und MIME-Typen werden
|
||||
# nativ über 'mimeset' gesetzt. Die PNG-Icons legen wir in den
|
||||
# Haiku-typischen Pfad, ein post-install Skript ruft mimeset auf.
|
||||
if(PLATFORM_HAIKU)
|
||||
install(FILES resources/icon_256.png
|
||||
DESTINATION ${CMAKE_INSTALL_DATADIR}/BareCode
|
||||
RENAME BareCode.png
|
||||
)
|
||||
|
||||
# mimeset nach der Installation ausführen um MIME-Typ zu registrieren
|
||||
install(CODE "
|
||||
execute_process(
|
||||
COMMAND mimeset -f \"\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_BINDIR}/BareCode\"
|
||||
RESULT_VARIABLE _mimeset_result
|
||||
)
|
||||
if(NOT _mimeset_result EQUAL 0)
|
||||
message(WARNING \"mimeset konnte nicht ausgeführt werden – MIME-Typ muss manuell gesetzt werden.\")
|
||||
message(WARNING \"mimeset konnte nicht ausgeführt werden.\")
|
||||
endif()
|
||||
")
|
||||
endif()
|
||||
|
||||
# ---- macOS ----------------------------------------------------------------
|
||||
if(PLATFORM_MACOS)
|
||||
set_target_properties(BareCode PROPERTIES
|
||||
MACOSX_BUNDLE TRUE
|
||||
@@ -144,4 +160,3 @@ if(PLATFORM_MACOS)
|
||||
MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION}
|
||||
)
|
||||
endif()
|
||||
|
||||
|
||||
2
PKGBUILD
@@ -2,7 +2,7 @@
|
||||
# Projekt Hirnfrei - https://www.projekt-hirnfrei.de
|
||||
|
||||
pkgname=barecode
|
||||
pkgver=1.1.0
|
||||
pkgver=1.2.0
|
||||
pkgrel=1
|
||||
pkgdesc="Schlanker modularer Code-Editor für HTML, PHP, CSS und C++"
|
||||
arch=('x86_64' 'aarch64')
|
||||
|
||||
27
README.md
@@ -1,7 +1,7 @@
|
||||
# BareCode
|
||||
|
||||
**Schlanker, modularer Code-Editor für Web-Entwickler**
|
||||
Version 1.1.0 — von **Dany Thinnes** | [Projekt Hirnfrei](https://www.projekt-hirnfrei.de) | [Discord](https://discord.projekt-hirnfrei.de)
|
||||
Version 1.3.2 — von **Dany Thinnes** | [Projekt Hirnfrei](https://www.projekt-hirnfrei.de) | [Discord](https://discord.projekt-hirnfrei.de)
|
||||
|
||||
Entwickelt mit **C++17**, **Qt6** und **CMake**.
|
||||
Kompiliert auf **Linux**, **Windows** und **Haiku**.
|
||||
@@ -34,17 +34,19 @@ Siehe Abschnitt **Bauen** weiter unten.
|
||||
### Editor
|
||||
| Feature | Details |
|
||||
|---|---|
|
||||
| Syntax-Highlighting | HTML, PHP, CSS, C/C++ — inkl. mehrzeiliger Kommentare |
|
||||
| Syntax-Highlighting | HTML, PHP, CSS, C/C++ — inkl. mehrzeiliger Kommentare über Leerzeilen |
|
||||
| Tabs | Mehrere Dateien gleichzeitig, verschiebbar und schließbar |
|
||||
| Änderungsindikator | ● im Tab-Titel bei ungespeicherten Änderungen |
|
||||
| Zeilennummern | Eigener Gutter, aktuelle Zeile hervorgehoben |
|
||||
| Einrück-Führungslinien | Vertikale Linien wie in VS Code |
|
||||
| Klammerzugehörigkeit | Zusammengehörige Klammern werden grün hervorgehoben, fehlende rot |
|
||||
| Auto-Indent | Einrückungstiefe wird bei Enter übernommen |
|
||||
| Tab / Shift+Tab | Ein- und Ausrücken, auch für mehrere Zeilen gleichzeitig |
|
||||
| Tab / Shift+Tab | Ein- und Ausrücken für einzelne Zeilen und Selektionen |
|
||||
| Smart Backspace | Springt zur vorherigen Tab-Stop-Position |
|
||||
| Farbvorschau | CSS-Farbwerte (#hex, rgb, hsl) werden inline angezeigt |
|
||||
| Farbauswahl | Klick auf das Farbquadrat öffnet einen Farbauswahl-Dialog |
|
||||
| Funktionssignatur | Tooltip mit Parametern beim Tippen von PHP-Funktionen |
|
||||
| Variablen-Popup | Vorschläge für $variablen beim Tippen (nur Anzeige, kein Autocomplete) |
|
||||
|
||||
### Navigation
|
||||
| Feature | Details |
|
||||
@@ -109,14 +111,15 @@ BareCode/
|
||||
├── editor/ # EditorPanel, EditorTab, CodeEditor,
|
||||
│ # SearchPanel, FileSearchPanel,
|
||||
│ # ColorIndicator, SignatureHelper,
|
||||
│ # FunctionScanner, FunctionIndex,
|
||||
│ # FunctionListPanel, FunctionListDialog,
|
||||
│ # DeadCodeAnalyzer, DeadCodeDialog
|
||||
│ # VariableCompleter, FunctionScanner,
|
||||
│ # FunctionIndex, FunctionListPanel,
|
||||
│ # FunctionListDialog, DeadCodeAnalyzer,
|
||||
│ # DeadCodeDialog
|
||||
├── filetree/ # FileTreePanel
|
||||
└── highlighter/ # SyntaxHighlighter, HighlighterFactory
|
||||
```
|
||||
|
||||
Jedes Unterverzeichnis kompiliert als eigene statische Bibliothek — Komponenten lassen sich unabhängig austauschen und erweitern.
|
||||
Jedes Unterverzeichnis kompiliert als eigene statische Bibliothek.
|
||||
|
||||
---
|
||||
|
||||
@@ -160,11 +163,6 @@ cmake -B build -G "Visual Studio 17 2022" -A x64
|
||||
cmake --build build --config Release
|
||||
```
|
||||
|
||||
**Installer erstellen** (mit [Inno Setup](https://jrsoftware.org/isinfo.php)):
|
||||
```bat
|
||||
windeployqt --release build\Release\BareCode.exe
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Haiku
|
||||
@@ -176,8 +174,7 @@ cmake --build build -j$(nproc)
|
||||
./build/BareCode
|
||||
```
|
||||
|
||||
> Getestet auf Haiku R1/beta5. `qt6_base_devel` enthält auf Haiku
|
||||
> sowohl die Header als auch die Build-Tools.
|
||||
> Getestet auf Haiku R1/beta5.
|
||||
|
||||
---
|
||||
|
||||
@@ -187,8 +184,6 @@ cmake --build build -j$(nproc)
|
||||
2. `m_rules` im Konstruktor befüllen (siehe `CppHighlighter` als Vorlage)
|
||||
3. Dateiendung in `HighlighterFactory.cpp` registrieren
|
||||
|
||||
Keine weiteren Dateien müssen geändert werden.
|
||||
|
||||
---
|
||||
|
||||
## Lizenz
|
||||
|
||||
@@ -1,2 +1,3 @@
|
||||
{src/
|
||||
build/
|
||||
BareCodeAUR
|
||||
@@ -1,7 +1,7 @@
|
||||
cmake_minimum_required(VERSION 3.16)
|
||||
|
||||
project(BareCode
|
||||
VERSION 1.1.0
|
||||
VERSION 1.2.0
|
||||
DESCRIPTION "A modular code editor built with Qt6"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
@@ -16,8 +16,6 @@ set(CMAKE_AUTOUIC ON)
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Plattform-Erkennung
|
||||
# Haiku definiert kein eigenes CMake-Flag — wir erkennen es über den
|
||||
# Systemnamen. CMAKE_SYSTEM_NAME ist "Haiku" auf Haiku OS.
|
||||
# ---------------------------------------------------------------------------
|
||||
if(WIN32)
|
||||
set(PLATFORM_WINDOWS TRUE)
|
||||
@@ -37,41 +35,60 @@ endif()
|
||||
# ---------------------------------------------------------------------------
|
||||
# Qt6
|
||||
# ---------------------------------------------------------------------------
|
||||
find_package(Qt6 REQUIRED COMPONENTS
|
||||
Core
|
||||
Gui
|
||||
Widgets
|
||||
Concurrent
|
||||
)
|
||||
|
||||
find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets Concurrent)
|
||||
qt_standard_project_setup()
|
||||
|
||||
# Include cmake modules
|
||||
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
|
||||
|
||||
# Collect sources
|
||||
add_subdirectory(src)
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Übersetzungen — lrelease → .qm → ins Build-Verzeichnis
|
||||
# ---------------------------------------------------------------------------
|
||||
find_program(LRELEASE_EXECUTABLE
|
||||
NAMES lrelease lrelease-qt6
|
||||
HINTS "${Qt6_DIR}/../../../bin"
|
||||
REQUIRED
|
||||
)
|
||||
|
||||
set(TS_FILES
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/translations/barecode_de.ts
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/translations/barecode_en.ts
|
||||
)
|
||||
|
||||
set(QM_FILES)
|
||||
foreach(TS_FILE ${TS_FILES})
|
||||
get_filename_component(TS_NAME ${TS_FILE} NAME_WE)
|
||||
set(QM_FILE "${CMAKE_CURRENT_BINARY_DIR}/translations/${TS_NAME}.qm")
|
||||
add_custom_command(
|
||||
OUTPUT "${QM_FILE}"
|
||||
COMMAND ${CMAKE_COMMAND} -E make_directory
|
||||
"${CMAKE_CURRENT_BINARY_DIR}/translations"
|
||||
COMMAND ${LRELEASE_EXECUTABLE} "${TS_FILE}" -qm "${QM_FILE}"
|
||||
DEPENDS "${TS_FILE}"
|
||||
COMMENT "lrelease: ${TS_NAME}.qm"
|
||||
VERBATIM
|
||||
)
|
||||
list(APPEND QM_FILES "${QM_FILE}")
|
||||
endforeach()
|
||||
|
||||
add_custom_target(BareCode_translations ALL DEPENDS ${QM_FILES})
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Resources
|
||||
# ---------------------------------------------------------------------------
|
||||
qt_add_resources(BARECODE_RESOURCES resources/resources.qrc)
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Executable
|
||||
# Unter Windows: .rc-Datei für EXE-Icon einbinden
|
||||
# ---------------------------------------------------------------------------
|
||||
if(PLATFORM_WINDOWS)
|
||||
qt_add_executable(BareCode
|
||||
main.cpp
|
||||
BareCode.rc
|
||||
${BARECODE_RESOURCES}
|
||||
)
|
||||
qt_add_executable(BareCode main.cpp BareCode.rc ${BARECODE_RESOURCES})
|
||||
else()
|
||||
qt_add_executable(BareCode
|
||||
main.cpp
|
||||
${BARECODE_RESOURCES}
|
||||
)
|
||||
qt_add_executable(BareCode main.cpp ${BARECODE_RESOURCES})
|
||||
endif()
|
||||
|
||||
add_dependencies(BareCode BareCode_translations)
|
||||
|
||||
target_link_libraries(BareCode PRIVATE
|
||||
BareCode_Core
|
||||
BareCode_Editor
|
||||
@@ -95,7 +112,15 @@ install(TARGETS BareCode
|
||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
||||
)
|
||||
|
||||
# ---- Linux (FreeDesktop) --------------------------------------------------
|
||||
install(FILES LICENSE
|
||||
DESTINATION ${CMAKE_INSTALL_DATADIR}/licenses/barecode
|
||||
)
|
||||
|
||||
# .qm-Dateien installieren
|
||||
install(FILES ${QM_FILES}
|
||||
DESTINATION ${CMAKE_INSTALL_DATADIR}/BareCode/translations
|
||||
)
|
||||
|
||||
if(PLATFORM_LINUX)
|
||||
foreach(SIZE 16 32 48 64 128 256 512)
|
||||
install(FILES resources/icon_${SIZE}.png
|
||||
@@ -103,35 +128,27 @@ if(PLATFORM_LINUX)
|
||||
RENAME barecode.png
|
||||
)
|
||||
endforeach()
|
||||
|
||||
install(FILES BareCode.desktop
|
||||
DESTINATION ${CMAKE_INSTALL_DATADIR}/applications
|
||||
)
|
||||
endif()
|
||||
|
||||
# ---- Haiku ----------------------------------------------------------------
|
||||
# Haiku verwendet kein FreeDesktop-System. Icons und MIME-Typen werden
|
||||
# nativ über 'mimeset' gesetzt. Die PNG-Icons legen wir in den
|
||||
# Haiku-typischen Pfad, ein post-install Skript ruft mimeset auf.
|
||||
if(PLATFORM_HAIKU)
|
||||
install(FILES resources/icon_256.png
|
||||
DESTINATION ${CMAKE_INSTALL_DATADIR}/BareCode
|
||||
RENAME BareCode.png
|
||||
)
|
||||
|
||||
# mimeset nach der Installation ausführen um MIME-Typ zu registrieren
|
||||
install(CODE "
|
||||
execute_process(
|
||||
COMMAND mimeset -f \"\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_BINDIR}/BareCode\"
|
||||
RESULT_VARIABLE _mimeset_result
|
||||
)
|
||||
if(NOT _mimeset_result EQUAL 0)
|
||||
message(WARNING \"mimeset konnte nicht ausgeführt werden – MIME-Typ muss manuell gesetzt werden.\")
|
||||
message(WARNING \"mimeset konnte nicht ausgeführt werden.\")
|
||||
endif()
|
||||
")
|
||||
endif()
|
||||
|
||||
# ---- macOS ----------------------------------------------------------------
|
||||
if(PLATFORM_MACOS)
|
||||
set_target_properties(BareCode PROPERTIES
|
||||
MACOSX_BUNDLE TRUE
|
||||
@@ -140,4 +157,3 @@ if(PLATFORM_MACOS)
|
||||
MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION}
|
||||
)
|
||||
endif()
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
MIT License
|
||||
|
||||
Copyright (c) 2025 Dany Thinnes – Projekt Hirnfrei
|
||||
Copyright (c) 2025 Dany Thinnes / Projekt Hirnfrei
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
36
barecode/PKGBUILD
Normal file
@@ -0,0 +1,36 @@
|
||||
# Maintainer: Dany Thinnes <dany@projekt-hirnfrei.de>
|
||||
# Projekt Hirnfrei - https://www.projekt-hirnfrei.de
|
||||
|
||||
pkgname=barecode
|
||||
pkgver=1.2.0
|
||||
pkgrel=1
|
||||
pkgdesc="Schlanker modularer Code-Editor für HTML, PHP, CSS und C++"
|
||||
arch=('x86_64' 'aarch64')
|
||||
url="https://www.projekt-hirnfrei.de"
|
||||
license=('MIT')
|
||||
depends=('qt6-base')
|
||||
makedepends=('cmake' 'ninja')
|
||||
provides=('barecode')
|
||||
conflicts=('barecode-git')
|
||||
source=("$pkgname-$pkgver.tar.gz::https://git.projekt-hirnfrei.de/diabolus/BareCode/archive/v$pkgver.tar.gz")
|
||||
sha256sums=('SKIP') # Nach erstem Download ersetzen: sha256sum barecode-1.1.0.tar.gz
|
||||
|
||||
build() {
|
||||
cd "BareCode"
|
||||
cmake -B build \
|
||||
-G Ninja \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||
-DCMAKE_SKIP_RPATH=ON
|
||||
cmake --build build
|
||||
}
|
||||
|
||||
check() {
|
||||
:
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "BareCode"
|
||||
DESTDIR="$pkgdir" cmake --install build
|
||||
install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
|
||||
}
|
||||
43
barecode/PKGBUILD-git
Normal file
@@ -0,0 +1,43 @@
|
||||
# Maintainer: Dany Thinnes <dany@projekt-hirnfrei.de>
|
||||
# Projekt Hirnfrei - https://www.projekt-hirnfrei.de
|
||||
|
||||
pkgname=barecode-git
|
||||
pkgver=1.1.0.r0.g0000000
|
||||
pkgrel=1
|
||||
pkgdesc="Schlanker modularer Code-Editor für HTML, PHP, CSS und C++ (Git-Version)"
|
||||
arch=('x86_64' 'aarch64')
|
||||
url="https://www.projekt-hirnfrei.de"
|
||||
license=('MIT')
|
||||
depends=('qt6-base')
|
||||
makedepends=('cmake' 'ninja' 'git')
|
||||
provides=('barecode')
|
||||
conflicts=('barecode')
|
||||
source=("$pkgname::git+https://git.projekt-hirnfrei.de/diabolus/BareCode.git")
|
||||
sha256sums=('SKIP')
|
||||
|
||||
pkgver() {
|
||||
cd "$pkgname"
|
||||
git describe --long --tags 2>/dev/null \
|
||||
| sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' \
|
||||
|| printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
|
||||
}
|
||||
|
||||
build() {
|
||||
cd "$pkgname"
|
||||
cmake -B build \
|
||||
-G Ninja \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||
-DCMAKE_SKIP_RPATH=ON
|
||||
cmake --build build
|
||||
}
|
||||
|
||||
check() {
|
||||
:
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "$pkgname"
|
||||
DESTDIR="$pkgdir" cmake --install build
|
||||
install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
|
||||
}
|
||||
200
barecode/README.md
Normal file
@@ -0,0 +1,200 @@
|
||||
# BareCode
|
||||
|
||||
**Schlanker, modularer Code-Editor für Web-Entwickler**
|
||||
Version 1.2.0 — von **Dany Thinnes** | [Projekt Hirnfrei](https://www.projekt-hirnfrei.de) | [Discord](https://discord.projekt-hirnfrei.de)
|
||||
|
||||
Entwickelt mit **C++17**, **Qt6** und **CMake**.
|
||||
Kompiliert auf **Linux**, **Windows** und **Haiku**.
|
||||
|
||||
---
|
||||
|
||||
## Installation
|
||||
|
||||
### Arch Linux / Manjaro (AUR)
|
||||
|
||||
```bash
|
||||
# Mit yay
|
||||
yay -S barecode
|
||||
|
||||
# Mit paru
|
||||
paru -S barecode
|
||||
|
||||
# Immer aktuellster Git-Stand
|
||||
yay -S barecode-git
|
||||
```
|
||||
|
||||
### Aus dem Quellcode bauen
|
||||
|
||||
Siehe Abschnitt **Bauen** weiter unten.
|
||||
|
||||
---
|
||||
|
||||
## Features
|
||||
|
||||
### Editor
|
||||
| Feature | Details |
|
||||
|---|---|
|
||||
| Syntax-Highlighting | HTML, PHP, CSS, C/C++ — inkl. mehrzeiliger Kommentare über Leerzeilen |
|
||||
| Tabs | Mehrere Dateien gleichzeitig, verschiebbar und schließbar |
|
||||
| Änderungsindikator | ● im Tab-Titel bei ungespeicherten Änderungen |
|
||||
| Zeilennummern | Eigener Gutter, aktuelle Zeile hervorgehoben |
|
||||
| Einrück-Führungslinien | Vertikale Linien wie in VS Code |
|
||||
| Klammerzugehörigkeit | Zusammengehörige Klammern werden grün hervorgehoben, fehlende rot |
|
||||
| Auto-Indent | Einrückungstiefe wird bei Enter übernommen |
|
||||
| Tab / Shift+Tab | Ein- und Ausrücken für einzelne Zeilen und Selektionen |
|
||||
| Smart Backspace | Springt zur vorherigen Tab-Stop-Position |
|
||||
| Farbvorschau | CSS-Farbwerte (#hex, rgb, hsl) werden inline angezeigt |
|
||||
| Farbauswahl | Klick auf das Farbquadrat öffnet einen Farbauswahl-Dialog |
|
||||
| Funktionssignatur | Tooltip mit Parametern beim Tippen von PHP-Funktionen |
|
||||
| Variablen-Popup | Vorschläge für $variablen beim Tippen (nur Anzeige, kein Autocomplete) |
|
||||
|
||||
### Navigation
|
||||
| Feature | Details |
|
||||
|---|---|
|
||||
| Projektbaum | Linkes Panel — zeigt nur das gewählte Projektverzeichnis |
|
||||
| Neue Datei / Ordner | Rechtsklick im Dateibaum |
|
||||
| Doppelklick-Navigation | Doppelklick auf einen Funktionsnamen springt zur Definition |
|
||||
| Suchen & Ersetzen | Einzeln, Alle, In Auswahl, Regex, Live-Hervorhebung (Strg+F) |
|
||||
| In Dateien suchen | Rekursive Projektsuche mit Ergebnisliste (Strg+Shift+F) |
|
||||
|
||||
### Projektanalyse
|
||||
| Feature | Details |
|
||||
|---|---|
|
||||
| Projektfunktionen | Alle definierten Funktionen als durchsuchbare Liste (Strg+Shift+P) |
|
||||
| Tote Funktionen | Analyse ungenutzter Funktionen mit Exclude-Verzeichnissen (Strg+Shift+T) |
|
||||
| Export | Analyseergebnisse als TXT exportieren |
|
||||
|
||||
### Allgemein
|
||||
| Feature | Details |
|
||||
|---|---|
|
||||
| Speichern | Speichern, Speichern unter, Alles speichern |
|
||||
| Dark / Light Mode | Umschaltbar (Strg+Shift+D), wird gespeichert |
|
||||
| Session | Geöffnete Dateien und aktiver Tab werden wiederhergestellt |
|
||||
|
||||
---
|
||||
|
||||
## Tastaturkürzel
|
||||
|
||||
| Aktion | Kürzel |
|
||||
|---|---|
|
||||
| Datei öffnen | Strg+O |
|
||||
| Neue Datei | Strg+N |
|
||||
| Projekt öffnen | Strg+Shift+O |
|
||||
| Speichern | Strg+S |
|
||||
| Speichern unter | Strg+Shift+A |
|
||||
| Alles speichern | Strg+Shift+S |
|
||||
| Suchen / Ersetzen | Strg+F |
|
||||
| In Dateien suchen | Strg+Shift+F |
|
||||
| Projektfunktionen | Strg+Shift+P |
|
||||
| Tote Funktionen | Strg+Shift+T |
|
||||
| Dark Mode | Strg+Shift+D |
|
||||
|
||||
---
|
||||
|
||||
## Projektstruktur
|
||||
|
||||
```
|
||||
BareCode/
|
||||
├── CMakeLists.txt
|
||||
├── main.cpp
|
||||
├── LICENSE
|
||||
├── PKGBUILD # Stabiles AUR-Paket
|
||||
├── PKGBUILD-git # AUR-Paket (Git-Stand)
|
||||
├── BareCode.desktop # Linux-Anwendungsmenü
|
||||
├── resources/
|
||||
│ ├── resources.qrc
|
||||
│ ├── icon_*.png
|
||||
│ └── php_functions.json
|
||||
└── src/
|
||||
├── core/ # MainWindow, ProjectManager, Settings,
|
||||
│ # ThemeManager, AboutDialog, IPlugin
|
||||
├── editor/ # EditorPanel, EditorTab, CodeEditor,
|
||||
│ # SearchPanel, FileSearchPanel,
|
||||
│ # ColorIndicator, SignatureHelper,
|
||||
│ # VariableCompleter, FunctionScanner,
|
||||
│ # FunctionIndex, FunctionListPanel,
|
||||
│ # FunctionListDialog, DeadCodeAnalyzer,
|
||||
│ # DeadCodeDialog
|
||||
├── filetree/ # FileTreePanel
|
||||
└── highlighter/ # SyntaxHighlighter, HighlighterFactory
|
||||
```
|
||||
|
||||
Jedes Unterverzeichnis kompiliert als eigene statische Bibliothek.
|
||||
|
||||
---
|
||||
|
||||
## Abhängigkeiten & Bauen
|
||||
|
||||
### Linux
|
||||
|
||||
**Ubuntu / Debian:**
|
||||
```bash
|
||||
sudo apt install cmake ninja-build qt6-base-dev qt6-base-dev-tools
|
||||
```
|
||||
|
||||
**Arch / Manjaro:**
|
||||
```bash
|
||||
sudo pacman -S cmake ninja qt6-base
|
||||
```
|
||||
|
||||
**Bauen:**
|
||||
```bash
|
||||
cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Release
|
||||
cmake --build build
|
||||
./build/BareCode
|
||||
```
|
||||
|
||||
**Installieren:**
|
||||
```bash
|
||||
sudo cmake --install build
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Windows
|
||||
|
||||
**Abhängigkeiten:**
|
||||
- [Qt6](https://www.qt.io/download) — Komponenten: Qt6 Base, Qt6 Concurrent
|
||||
- CMake ≥ 3.16
|
||||
- Visual Studio 2019 oder neuer
|
||||
|
||||
```bat
|
||||
cmake -B build -G "Visual Studio 17 2022" -A x64
|
||||
cmake --build build --config Release
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Haiku
|
||||
|
||||
```bash
|
||||
pkgman install qt6_base qt6_base_devel
|
||||
cmake -B build -DCMAKE_BUILD_TYPE=Release
|
||||
cmake --build build -j$(nproc)
|
||||
./build/BareCode
|
||||
```
|
||||
|
||||
> Getestet auf Haiku R1/beta5.
|
||||
|
||||
---
|
||||
|
||||
## Neue Sprache hinzufügen
|
||||
|
||||
1. Subklasse von `SyntaxHighlighter` in `src/highlighter/` erstellen
|
||||
2. `m_rules` im Konstruktor befüllen (siehe `CppHighlighter` als Vorlage)
|
||||
3. Dateiendung in `HighlighterFactory.cpp` registrieren
|
||||
|
||||
---
|
||||
|
||||
## Lizenz
|
||||
|
||||
MIT License — Copyright (c) 2025 Dany Thinnes / Projekt Hirnfrei
|
||||
|
||||
---
|
||||
|
||||
## Links
|
||||
|
||||
- Website: [www.projekt-hirnfrei.de](https://www.projekt-hirnfrei.de)
|
||||
- Discord: [discord.projekt-hirnfrei.de](https://discord.projekt-hirnfrei.de)
|
||||
- Quellcode: [git.projekt-hirnfrei.de/diabolus/BareCode](https://git.projekt-hirnfrei.de/diabolus/BareCode)
|
||||
- AUR: [aur.archlinux.org/packages/barecode](https://aur.archlinux.org/packages/barecode)
|
||||
133
barecode/bauen.sh
Executable file
@@ -0,0 +1,133 @@
|
||||
#!/bin/bash
|
||||
# ---------------------------------------------------------------------------
|
||||
# BareCode – Build-Skript
|
||||
# Verwendung: ./bauen.sh [release|debug|clean|install]
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
set -e
|
||||
|
||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
cd "$SCRIPT_DIR"
|
||||
|
||||
BUILD_TYPE="${1:-release}"
|
||||
BUILD_DIR="build"
|
||||
|
||||
# Farben
|
||||
RED='\033[0;31m'
|
||||
GREEN='\033[0;32m'
|
||||
YELLOW='\033[1;33m'
|
||||
BLUE='\033[0;34m'
|
||||
NC='\033[0m'
|
||||
|
||||
info() { echo -e "${BLUE}==>${NC} $1"; }
|
||||
success() { echo -e "${GREEN}==>${NC} $1"; }
|
||||
warn() { echo -e "${YELLOW}==>${NC} $1"; }
|
||||
error() { echo -e "${RED}==>${NC} $1"; exit 1; }
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# clean
|
||||
# ---------------------------------------------------------------------------
|
||||
if [ "$BUILD_TYPE" = "clean" ]; then
|
||||
info "Build-Verzeichnis wird gelöscht…"
|
||||
rm -rf "$BUILD_DIR"
|
||||
success "Fertig."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Abhängigkeiten prüfen
|
||||
# ---------------------------------------------------------------------------
|
||||
info "Prüfe Abhängigkeiten…"
|
||||
|
||||
command -v cmake &>/dev/null || error "cmake nicht gefunden. Installation: sudo pacman -S cmake"
|
||||
command -v ninja &>/dev/null || error "ninja nicht gefunden. Installation: sudo pacman -S ninja"
|
||||
command -v lrelease &>/dev/null || \
|
||||
command -v lrelease-qt6 &>/dev/null || \
|
||||
error "lrelease nicht gefunden. Installation: sudo pacman -S qt6-tools"
|
||||
|
||||
# Qt6 prüfen
|
||||
if ! pkg-config --exists Qt6Core 2>/dev/null; then
|
||||
if ! cmake --find-package -DNAME=Qt6 -DCOMPILER_ID=GNU \
|
||||
-DLANGUAGE=CXX -DMODE=EXIST &>/dev/null 2>&1; then
|
||||
warn "Qt6 konnte nicht automatisch geprüft werden — cmake wird es versuchen."
|
||||
fi
|
||||
fi
|
||||
|
||||
success "Abhängigkeiten OK."
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# CMake-Build-Typ
|
||||
# ---------------------------------------------------------------------------
|
||||
case "$BUILD_TYPE" in
|
||||
release|Release)
|
||||
CMAKE_BUILD_TYPE="Release"
|
||||
;;
|
||||
debug|Debug)
|
||||
CMAKE_BUILD_TYPE="Debug"
|
||||
;;
|
||||
install)
|
||||
CMAKE_BUILD_TYPE="Release"
|
||||
;;
|
||||
*)
|
||||
error "Unbekannter Build-Typ: '$BUILD_TYPE'. Erlaubt: release, debug, clean, install"
|
||||
;;
|
||||
esac
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Konfigurieren
|
||||
# ---------------------------------------------------------------------------
|
||||
info "Konfiguriere mit CMake (${CMAKE_BUILD_TYPE})…"
|
||||
|
||||
cmake -B "$BUILD_DIR" \
|
||||
-G Ninja \
|
||||
-DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE" \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
|
||||
2>&1 || error "CMake-Konfiguration fehlgeschlagen."
|
||||
|
||||
success "Konfiguration OK."
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Bauen
|
||||
# ---------------------------------------------------------------------------
|
||||
JOBS=$(nproc 2>/dev/null || sysctl -n hw.logicalcpu 2>/dev/null || echo 4)
|
||||
info "Baue mit $JOBS parallelen Jobs…"
|
||||
|
||||
cmake --build "$BUILD_DIR" -j"$JOBS" 2>&1 || error "Build fehlgeschlagen."
|
||||
|
||||
success "Build erfolgreich!"
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Installieren (optional)
|
||||
# ---------------------------------------------------------------------------
|
||||
if [ "$BUILD_TYPE" = "install" ]; then
|
||||
info "Installiere nach /usr (sudo erforderlich)…"
|
||||
sudo cmake --install "$BUILD_DIR" || error "Installation fehlgeschlagen."
|
||||
success "BareCode wurde installiert."
|
||||
echo ""
|
||||
echo " Starten: BareCode"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Fertig
|
||||
# ---------------------------------------------------------------------------
|
||||
BINARY="$BUILD_DIR/BareCode"
|
||||
if [ -f "$BINARY" ]; then
|
||||
# .qm-Dateien neben die Binary kopieren damit sie gefunden werden
|
||||
mkdir -p "$BUILD_DIR/translations"
|
||||
if compgen -G "$BUILD_DIR/translations/barecode_*.qm" > /dev/null 2>&1; then
|
||||
success "Übersetzungen bereits vorhanden."
|
||||
else
|
||||
# Aus dem cmake-Zwischenverzeichnis holen
|
||||
find "$BUILD_DIR" -name "barecode_*.qm" -not -path "$BUILD_DIR/translations/*" \
|
||||
-exec cp {} "$BUILD_DIR/translations/" \; 2>/dev/null || true
|
||||
fi
|
||||
|
||||
echo ""
|
||||
success "BareCode ist bereit:"
|
||||
echo " Starten: ./$BINARY"
|
||||
echo " Installieren: ./bauen.sh install"
|
||||
echo " Debug-Build: ./bauen.sh debug"
|
||||
echo " Aufräumen: ./bauen.sh clean"
|
||||
fi
|
||||
106
barecode/main.cpp
Normal file
@@ -0,0 +1,106 @@
|
||||
#include <QApplication>
|
||||
#include <QIcon>
|
||||
#include <QTranslator>
|
||||
#include <QLocale>
|
||||
#include <QLibraryInfo>
|
||||
#include <QSettings>
|
||||
#include <QDir>
|
||||
#include <QCoreApplication>
|
||||
#include "core/MainWindow.h"
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
QApplication app(argc, argv);
|
||||
|
||||
app.setApplicationName("BareCode");
|
||||
app.setApplicationVersion("1.2.0");
|
||||
app.setOrganizationName("BareCode");
|
||||
|
||||
// Icon
|
||||
QIcon appIcon;
|
||||
appIcon.addFile(":/icon_16.png", QSize(16, 16));
|
||||
appIcon.addFile(":/icon_32.png", QSize(32, 32));
|
||||
appIcon.addFile(":/icon_48.png", QSize(48, 48));
|
||||
appIcon.addFile(":/icon_64.png", QSize(64, 64));
|
||||
appIcon.addFile(":/icon_128.png", QSize(128, 128));
|
||||
appIcon.addFile(":/icon_256.png", QSize(256, 256));
|
||||
appIcon.addFile(":/icon_512.png", QSize(512, 512));
|
||||
app.setWindowIcon(appIcon);
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Übersetzung laden
|
||||
// .qm-Dateien liegen im Unterverzeichnis "translations" neben der Binary
|
||||
// oder unter /usr/share/BareCode/translations nach Installation
|
||||
// ---------------------------------------------------------------------------
|
||||
QSettings settings(QSettings::IniFormat, QSettings::UserScope,
|
||||
"BareCode", "BareCode");
|
||||
QString locale = settings.value("language/locale", QString()).toString();
|
||||
|
||||
if (locale.isEmpty())
|
||||
{
|
||||
locale = QLocale::system().name(); // z.B. "de_DE", "en_US"
|
||||
}
|
||||
|
||||
const QString shortLocale = locale.left(2); // "de", "en"
|
||||
|
||||
// Suchpfade für .qm-Dateien
|
||||
QStringList searchPaths;
|
||||
searchPaths << QCoreApplication::applicationDirPath() + "/translations"
|
||||
<< QDir::homePath() + "/.local/share/BareCode/translations"
|
||||
<< "/usr/share/BareCode/translations"
|
||||
<< "/usr/local/share/BareCode/translations";
|
||||
|
||||
// Qt-eigene Übersetzungen (Dialoge, Standard-Buttons)
|
||||
QTranslator qtTranslator;
|
||||
if (qtTranslator.load("qt_" + locale,
|
||||
QLibraryInfo::path(QLibraryInfo::TranslationsPath)))
|
||||
{
|
||||
app.installTranslator(&qtTranslator);
|
||||
}
|
||||
|
||||
// BareCode-Übersetzung — in allen Suchpfaden versuchen
|
||||
QTranslator appTranslator;
|
||||
bool loaded = false;
|
||||
|
||||
for (const QString &path : searchPaths)
|
||||
{
|
||||
if (appTranslator.load(QString("barecode_%1").arg(locale), path) ||
|
||||
appTranslator.load(QString("barecode_%1").arg(shortLocale), path))
|
||||
{
|
||||
app.installTranslator(&appTranslator);
|
||||
loaded = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
// Fallback: Englisch
|
||||
if (!loaded && shortLocale != "de")
|
||||
{
|
||||
for (const QString &path : searchPaths)
|
||||
{
|
||||
if (appTranslator.load("barecode_en", path))
|
||||
{
|
||||
app.installTranslator(&appTranslator);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
MainWindow window;
|
||||
window.show();
|
||||
|
||||
// Datei(en) öffnen, die beim Start per Kommandozeile übergeben wurden
|
||||
// (z. B. Doppelklick auf eine Datei im Dateibrowser → "Öffnen mit BareCode").
|
||||
// Das erste Argument ist der Programmname selbst und wird übersprungen.
|
||||
QStringList cliFiles = app.arguments();
|
||||
if (!cliFiles.isEmpty())
|
||||
{
|
||||
cliFiles.removeFirst();
|
||||
}
|
||||
if (!cliFiles.isEmpty())
|
||||
{
|
||||
window.openFilesFromArguments(cliFiles);
|
||||
}
|
||||
|
||||
return app.exec();
|
||||
}
|
||||
|
Before Width: | Height: | Size: 846 B After Width: | Height: | Size: 846 B |
|
Before Width: | Height: | Size: 25 KiB After Width: | Height: | Size: 25 KiB |
|
Before Width: | Height: | Size: 824 B After Width: | Height: | Size: 824 B |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 90 KiB After Width: | Height: | Size: 90 KiB |
|
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.4 KiB |
|
Before Width: | Height: | Size: 4.7 KiB After Width: | Height: | Size: 4.7 KiB |
|
Before Width: | Height: | Size: 303 KiB After Width: | Height: | Size: 303 KiB |
|
Before Width: | Height: | Size: 7.6 KiB After Width: | Height: | Size: 7.6 KiB |
@@ -74,7 +74,7 @@ AboutDialog::AboutDialog(QWidget *parent)
|
||||
info->addLayout(row);
|
||||
};
|
||||
|
||||
makeRow(tr("Version"), "1.1.0");
|
||||
makeRow(tr("Version"), "1.2.0");
|
||||
makeRow(tr("Entwickler"), "Dany Thinnes");
|
||||
makeRow(tr("Projekt"), "Projekt Hirnfrei");
|
||||
makeRow(tr("Framework"), QString("Qt %1").arg(qVersion()));
|
||||
@@ -5,6 +5,7 @@
|
||||
#include <QMessageBox>
|
||||
#include <QCloseEvent>
|
||||
#include <QSettings>
|
||||
#include <QFileInfo>
|
||||
|
||||
#include "AboutDialog.h"
|
||||
#include "filetree/FileTreePanel.h"
|
||||
@@ -45,6 +46,21 @@ MainWindow::MainWindow(QWidget *parent)
|
||||
|
||||
MainWindow::~MainWindow() = default;
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Datei(en) von der Kommandozeile öffnen
|
||||
// ---------------------------------------------------------------------------
|
||||
void MainWindow::openFilesFromArguments(const QStringList &filePaths)
|
||||
{
|
||||
for (const QString &path : filePaths)
|
||||
{
|
||||
const QFileInfo info(path);
|
||||
if (info.exists() && info.isFile())
|
||||
{
|
||||
m_editor->openFile(info.absoluteFilePath());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// UI aufbauen
|
||||
// ---------------------------------------------------------------------------
|
||||
@@ -119,6 +135,14 @@ void MainWindow::setupMenuBar()
|
||||
m_actFileSearch = mBearbeiten->addAction(tr("In &Dateien suchen…"), this, &MainWindow::onShowFileSearch);
|
||||
m_actFileSearch->setShortcut(Qt::CTRL | Qt::SHIFT | Qt::Key_F);
|
||||
|
||||
mBearbeiten->addSeparator();
|
||||
|
||||
m_actFuncList = mBearbeiten->addAction(tr("&Projektfunktionen…"), this, &MainWindow::onShowFunctionList);
|
||||
m_actFuncList->setShortcut(Qt::CTRL | Qt::SHIFT | Qt::Key_P);
|
||||
|
||||
m_actDeadCode = mBearbeiten->addAction(tr("&Tote Funktionen suchen…"), this, &MainWindow::onShowDeadCode);
|
||||
m_actDeadCode->setShortcut(Qt::CTRL | Qt::SHIFT | Qt::Key_T);
|
||||
|
||||
// ---- Ansicht ----
|
||||
QMenu *mAnsicht = menuBar()->addMenu(tr("&Ansicht"));
|
||||
|
||||
@@ -127,6 +151,37 @@ void MainWindow::setupMenuBar()
|
||||
m_actDarkMode->setShortcut(Qt::CTRL | Qt::SHIFT | Qt::Key_D);
|
||||
connect(m_actDarkMode, &QAction::toggled, this, &MainWindow::onToggleDarkMode);
|
||||
|
||||
mAnsicht->addSeparator();
|
||||
|
||||
// Sprachauswahl
|
||||
QMenu *mSprache = mAnsicht->addMenu(tr("Sprache"));
|
||||
m_langGroup = new QActionGroup(this);
|
||||
m_langGroup->setExclusive(true);
|
||||
|
||||
const QSettings langSettings(QSettings::IniFormat, QSettings::UserScope,
|
||||
"BareCode", "BareCode");
|
||||
const QString currentLocale = langSettings.value("language/locale",
|
||||
QLocale::system().name()).toString();
|
||||
|
||||
struct LangEntry { QString locale; QString label; };
|
||||
const QList<LangEntry> languages = {
|
||||
{ "de", "Deutsch" },
|
||||
{ "en", "English" },
|
||||
};
|
||||
|
||||
for (const LangEntry &lang : languages)
|
||||
{
|
||||
QAction *act = mSprache->addAction(lang.label);
|
||||
act->setCheckable(true);
|
||||
act->setData(lang.locale);
|
||||
act->setChecked(currentLocale.startsWith(lang.locale));
|
||||
m_langGroup->addAction(act);
|
||||
connect(act, &QAction::triggered, this, [this, lang]()
|
||||
{
|
||||
onLanguageChanged(lang.locale);
|
||||
});
|
||||
}
|
||||
|
||||
// ---- Hilfe ----
|
||||
QMenu *mHilfe = menuBar()->addMenu(tr("&Hilfe"));
|
||||
m_actAbout = mHilfe->addAction(tr("&Über BareCode…"), this, &MainWindow::onAbout);
|
||||
@@ -269,6 +324,17 @@ void MainWindow::onToggleDarkMode(bool checked)
|
||||
m_settings->setDarkMode(checked);
|
||||
}
|
||||
|
||||
void MainWindow::onLanguageChanged(const QString &locale)
|
||||
{
|
||||
QSettings s(QSettings::IniFormat, QSettings::UserScope, "BareCode", "BareCode");
|
||||
s.setValue("language/locale", locale);
|
||||
|
||||
QMessageBox::information(this,
|
||||
tr("Sprache geändert"),
|
||||
tr("Die Sprache wird beim nächsten Start von BareCode aktiv.")
|
||||
);
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Slots – Hilfe
|
||||
// ---------------------------------------------------------------------------
|
||||
@@ -281,6 +347,16 @@ void MainWindow::onAbout()
|
||||
// ---------------------------------------------------------------------------
|
||||
// Slots – Projekt
|
||||
// ---------------------------------------------------------------------------
|
||||
void MainWindow::onShowDeadCode()
|
||||
{
|
||||
m_editor->showDeadCode();
|
||||
}
|
||||
|
||||
void MainWindow::onShowFunctionList()
|
||||
{
|
||||
m_editor->showFunctionList();
|
||||
}
|
||||
|
||||
void MainWindow::onShowFileSearch()
|
||||
{
|
||||
m_editor->showFileSearchPanel();
|
||||
@@ -5,6 +5,7 @@
|
||||
#include <QMenuBar>
|
||||
#include <QStatusBar>
|
||||
#include <QAction>
|
||||
#include <QActionGroup>
|
||||
#include <memory>
|
||||
|
||||
#include "ProjectManager.h"
|
||||
@@ -25,6 +26,11 @@ public:
|
||||
explicit MainWindow(QWidget *parent = nullptr);
|
||||
~MainWindow() override;
|
||||
|
||||
// Datei(en) öffnen, die beim Programmstart per Kommandozeile übergeben
|
||||
// wurden — z. B. durch Doppelklick auf eine Datei im Dateibrowser
|
||||
// ("Öffnen mit BareCode").
|
||||
void openFilesFromArguments(const QStringList &filePaths);
|
||||
|
||||
protected:
|
||||
void closeEvent(QCloseEvent *event) override;
|
||||
|
||||
@@ -42,8 +48,11 @@ private slots:
|
||||
void onRedo();
|
||||
void onShowSearch();
|
||||
void onShowFileSearch();
|
||||
void onShowFunctionList();
|
||||
void onShowDeadCode();
|
||||
// Ansicht
|
||||
void onToggleDarkMode(bool checked);
|
||||
void onLanguageChanged(const QString &locale);
|
||||
// Hilfe
|
||||
void onAbout();
|
||||
// Intern
|
||||
@@ -82,6 +91,9 @@ private:
|
||||
QAction *m_actRedo = nullptr;
|
||||
QAction *m_actSearch = nullptr;
|
||||
QAction *m_actFileSearch = nullptr;
|
||||
QAction *m_actFuncList = nullptr;
|
||||
QAction *m_actDeadCode = nullptr;
|
||||
QAction *m_actDarkMode = nullptr;
|
||||
QActionGroup *m_langGroup = nullptr;
|
||||
QAction *m_actAbout = nullptr;
|
||||
};
|
||||
@@ -17,6 +17,20 @@ set(EDITOR_SOURCES
|
||||
SignatureHelper.h
|
||||
SignatureTooltip.cpp
|
||||
SignatureTooltip.h
|
||||
FunctionScanner.cpp
|
||||
FunctionScanner.h
|
||||
FunctionIndex.cpp
|
||||
FunctionIndex.h
|
||||
FunctionListPanel.cpp
|
||||
FunctionListPanel.h
|
||||
FunctionListDialog.cpp
|
||||
FunctionListDialog.h
|
||||
DeadCodeAnalyzer.cpp
|
||||
DeadCodeAnalyzer.h
|
||||
DeadCodeDialog.cpp
|
||||
DeadCodeDialog.h
|
||||
VariableCompleter.cpp
|
||||
VariableCompleter.h
|
||||
)
|
||||
|
||||
add_library(BareCode_Editor STATIC ${EDITOR_SOURCES})
|
||||
@@ -2,6 +2,8 @@
|
||||
#include "LineNumberArea.h"
|
||||
#include "ColorIndicator.h"
|
||||
#include "SignatureHelper.h"
|
||||
#include "FunctionIndex.h"
|
||||
#include "VariableCompleter.h"
|
||||
|
||||
#include "core/Settings.h"
|
||||
#include "highlighter/HighlighterFactory.h"
|
||||
@@ -12,6 +14,7 @@
|
||||
#include <QResizeEvent>
|
||||
#include <QKeyEvent>
|
||||
#include <QMouseEvent>
|
||||
#include <QFocusEvent>
|
||||
#include <QScrollBar>
|
||||
#include <QFile>
|
||||
#include <QTextStream>
|
||||
@@ -26,6 +29,7 @@ CodeEditor::CodeEditor(Settings *settings, QWidget *parent)
|
||||
m_lineNumberArea = new LineNumberArea(this);
|
||||
m_colorIndicator = new ColorIndicator(this);
|
||||
m_signatureHelper = new SignatureHelper(this);
|
||||
m_varCompleter = new VariableCompleter(this);
|
||||
setupEditor();
|
||||
|
||||
connect(this, &CodeEditor::blockCountChanged,
|
||||
@@ -289,6 +293,44 @@ void CodeEditor::paintEvent(QPaintEvent *event)
|
||||
}
|
||||
}
|
||||
|
||||
void CodeEditor::setFunctionIndex(FunctionIndex *index)
|
||||
{
|
||||
m_functionIndex = index;
|
||||
}
|
||||
|
||||
void CodeEditor::mouseDoubleClickEvent(QMouseEvent *event)
|
||||
{
|
||||
// Zuerst normales Verhalten — markiert das Wort unter dem Cursor
|
||||
QPlainTextEdit::mouseDoubleClickEvent(event);
|
||||
|
||||
if (!m_functionIndex || !m_functionIndex->isReady())
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// Markiertes Wort auslesen
|
||||
const QString word = textCursor().selectedText().trimmed();
|
||||
if (word.isEmpty() || word.contains(' '))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// Im Funktionsindex nachschlagen
|
||||
const FunctionScanner::FunctionInfo info = m_functionIndex->lookup(word);
|
||||
if (info.filePath.isEmpty())
|
||||
{
|
||||
return; // Nicht gefunden — normales Verhalten bleibt
|
||||
}
|
||||
|
||||
// Nicht zur eigenen Definition springen wenn wir bereits dort sind
|
||||
if (info.filePath == m_filePath && info.line == textCursor().blockNumber() + 1)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
emit navigateToRequested(info.filePath, info.line);
|
||||
}
|
||||
|
||||
void CodeEditor::mousePressEvent(QMouseEvent *event)
|
||||
{
|
||||
// Zuerst prüfen ob ein Farbquadrat geklickt wurde
|
||||
@@ -351,7 +393,7 @@ void CodeEditor::lineNumberAreaPaintEvent(QPaintEvent *event)
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Current line highlight
|
||||
// Current line highlight + Klammerzugehörigkeit
|
||||
// ---------------------------------------------------------------------------
|
||||
void CodeEditor::highlightCurrentLine()
|
||||
{
|
||||
@@ -359,20 +401,161 @@ void CodeEditor::highlightCurrentLine()
|
||||
|
||||
if (!isReadOnly())
|
||||
{
|
||||
QTextEdit::ExtraSelection selection;
|
||||
// Aktuelle Zeile hervorheben
|
||||
QTextEdit::ExtraSelection lineSelection;
|
||||
lineSelection.format.setBackground(palette().color(QPalette::AlternateBase));
|
||||
lineSelection.format.setProperty(QTextFormat::FullWidthSelection, true);
|
||||
lineSelection.cursor = textCursor();
|
||||
lineSelection.cursor.clearSelection();
|
||||
extraSelections.append(lineSelection);
|
||||
|
||||
const QColor lineColor = palette().color(QPalette::AlternateBase);
|
||||
selection.format.setBackground(lineColor);
|
||||
selection.format.setProperty(QTextFormat::FullWidthSelection, true);
|
||||
selection.cursor = textCursor();
|
||||
selection.cursor.clearSelection();
|
||||
|
||||
extraSelections.append(selection);
|
||||
// Klammerzugehörigkeit
|
||||
matchBrackets(extraSelections);
|
||||
}
|
||||
|
||||
setExtraSelections(extraSelections);
|
||||
}
|
||||
|
||||
void CodeEditor::matchBrackets(QList<QTextEdit::ExtraSelection> &selections)
|
||||
{
|
||||
static const QString openBrackets = "({[";
|
||||
static const QString closeBrackets = ")}]";
|
||||
|
||||
QTextCursor cursor = textCursor();
|
||||
const QString blockText = cursor.block().text();
|
||||
const int col = cursor.columnNumber();
|
||||
|
||||
// Zeichen unter oder links vom Cursor prüfen
|
||||
QChar ch;
|
||||
int charPos = -1;
|
||||
|
||||
// Zuerst Zeichen unter dem Cursor
|
||||
if (col < blockText.length())
|
||||
{
|
||||
ch = blockText[col];
|
||||
if (openBrackets.contains(ch) || closeBrackets.contains(ch))
|
||||
{
|
||||
charPos = col;
|
||||
}
|
||||
}
|
||||
|
||||
// Dann Zeichen links vom Cursor
|
||||
if (charPos == -1 && col > 0)
|
||||
{
|
||||
ch = blockText[col - 1];
|
||||
if (openBrackets.contains(ch) || closeBrackets.contains(ch))
|
||||
{
|
||||
charPos = col - 1;
|
||||
}
|
||||
}
|
||||
|
||||
if (charPos == -1)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// Passende Klammer suchen
|
||||
const bool isOpen = openBrackets.contains(ch);
|
||||
const int bracketIndex = isOpen
|
||||
? openBrackets.indexOf(ch)
|
||||
: closeBrackets.indexOf(ch);
|
||||
const QChar matchChar = isOpen
|
||||
? closeBrackets[bracketIndex]
|
||||
: openBrackets[bracketIndex];
|
||||
|
||||
// Dokumentposition der gefundenen Klammer
|
||||
const int startPos = cursor.block().position() + charPos;
|
||||
|
||||
// Passende Klammer suchen — vorwärts oder rückwärts
|
||||
int depth = 0;
|
||||
int matchPos = -1;
|
||||
|
||||
if (isOpen)
|
||||
{
|
||||
// Vorwärts suchen
|
||||
QTextCursor search(document());
|
||||
search.setPosition(startPos);
|
||||
|
||||
while (!search.atEnd())
|
||||
{
|
||||
search.movePosition(QTextCursor::NextCharacter, QTextCursor::KeepAnchor);
|
||||
const QChar c = search.selectedText()[0];
|
||||
search.clearSelection();
|
||||
|
||||
if (c == ch) { ++depth; }
|
||||
else if (c == matchChar)
|
||||
{
|
||||
--depth;
|
||||
if (depth == 0)
|
||||
{
|
||||
matchPos = search.position() - 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// Rückwärts suchen
|
||||
QTextCursor search(document());
|
||||
search.setPosition(startPos + 1);
|
||||
|
||||
while (search.position() > 0)
|
||||
{
|
||||
search.movePosition(QTextCursor::PreviousCharacter, QTextCursor::KeepAnchor);
|
||||
const QChar c = search.selectedText()[0];
|
||||
search.clearSelection();
|
||||
|
||||
if (c == ch) { ++depth; }
|
||||
else if (c == matchChar)
|
||||
{
|
||||
--depth;
|
||||
if (depth == 0)
|
||||
{
|
||||
matchPos = search.position();
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Formatierung
|
||||
QTextCharFormat matchFormat;
|
||||
if (matchPos >= 0)
|
||||
{
|
||||
// Gefunden — beide Klammern grün hervorheben
|
||||
matchFormat.setBackground(QColor("#1a5a1a"));
|
||||
matchFormat.setForeground(QColor("#88ff88"));
|
||||
matchFormat.setFontWeight(QFont::Bold);
|
||||
}
|
||||
else
|
||||
{
|
||||
// Kein Match — rot markieren
|
||||
matchFormat.setBackground(QColor("#5a1a1a"));
|
||||
matchFormat.setForeground(QColor("#ff8888"));
|
||||
matchFormat.setFontWeight(QFont::Bold);
|
||||
}
|
||||
|
||||
// Öffnende / schließende Klammer markieren
|
||||
QTextEdit::ExtraSelection sel1;
|
||||
sel1.cursor = QTextCursor(document());
|
||||
sel1.cursor.setPosition(startPos);
|
||||
sel1.cursor.movePosition(QTextCursor::NextCharacter, QTextCursor::KeepAnchor);
|
||||
sel1.format = matchFormat;
|
||||
selections.append(sel1);
|
||||
|
||||
// Passende Klammer markieren (nur wenn gefunden)
|
||||
if (matchPos >= 0)
|
||||
{
|
||||
QTextEdit::ExtraSelection sel2;
|
||||
sel2.cursor = QTextCursor(document());
|
||||
sel2.cursor.setPosition(matchPos);
|
||||
sel2.cursor.movePosition(QTextCursor::NextCharacter, QTextCursor::KeepAnchor);
|
||||
sel2.format = matchFormat;
|
||||
selections.append(sel2);
|
||||
}
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Key handling – Tab/Shift+Tab, Smart-Backspace, Auto-Indent
|
||||
// ---------------------------------------------------------------------------
|
||||
@@ -391,6 +574,16 @@ void CodeEditor::keyPressEvent(QKeyEvent *event)
|
||||
QTextBlock startBlock = document()->findBlock(cursor.selectionStart());
|
||||
QTextBlock endBlock = document()->findBlock(cursor.selectionEnd());
|
||||
|
||||
// Wenn die Selektion genau am Anfang des letzten Blocks endet,
|
||||
// diesen Block nicht mit einbeziehen — der Cursor steht dort nur
|
||||
// mit Position 0, der Nutzer hat die Zeile nicht markiert
|
||||
if (cursor.hasSelection() &&
|
||||
cursor.selectionEnd() == endBlock.position() &&
|
||||
endBlock != startBlock)
|
||||
{
|
||||
endBlock = endBlock.previous();
|
||||
}
|
||||
|
||||
cursor.beginEditBlock();
|
||||
for (QTextBlock b = startBlock; b != endBlock.next(); b = b.next())
|
||||
{
|
||||
@@ -399,22 +592,14 @@ void CodeEditor::keyPressEvent(QKeyEvent *event)
|
||||
|
||||
if (m_settings->useSpacesForTabs())
|
||||
{
|
||||
// Bis zu tabSize führende Leerzeichen entfernen
|
||||
for (int i = 0; i < tabSize && i < lineText.length(); ++i)
|
||||
{
|
||||
if (lineText[i] == ' ')
|
||||
{
|
||||
++toRemove;
|
||||
}
|
||||
else
|
||||
{
|
||||
break;
|
||||
}
|
||||
if (lineText[i] == ' ') { ++toRemove; }
|
||||
else { break; }
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// Einen führenden Tab entfernen
|
||||
if (!lineText.isEmpty() && lineText[0] == '\t')
|
||||
{
|
||||
toRemove = 1;
|
||||
@@ -444,10 +629,16 @@ void CodeEditor::keyPressEvent(QKeyEvent *event)
|
||||
|
||||
if (cursor.hasSelection())
|
||||
{
|
||||
// Mehrere Zeilen einrücken
|
||||
QTextBlock startBlock = document()->findBlock(cursor.selectionStart());
|
||||
QTextBlock endBlock = document()->findBlock(cursor.selectionEnd());
|
||||
|
||||
// Gleiche Korrektur: Cursor am Zeilenanfang → Zeile nicht einrücken
|
||||
if (cursor.selectionEnd() == endBlock.position() &&
|
||||
endBlock != startBlock)
|
||||
{
|
||||
endBlock = endBlock.previous();
|
||||
}
|
||||
|
||||
cursor.beginEditBlock();
|
||||
for (QTextBlock b = startBlock; b != endBlock.next(); b = b.next())
|
||||
{
|
||||
@@ -552,5 +743,20 @@ void CodeEditor::keyPressEvent(QKeyEvent *event)
|
||||
}
|
||||
|
||||
QPlainTextEdit::keyPressEvent(event);
|
||||
|
||||
// Variablen-Popup nach jedem Tastendruck aktualisieren
|
||||
m_varCompleter->handleKeyPress(event);
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Fokus verloren — z. B. beim Wechsel zu einem anderen Tab.
|
||||
// Ein noch offenes Variablen-Popup muss hier geschlossen werden, sonst
|
||||
// bleibt es als verwaistes Fenster stehen und kann bei mehreren offenen
|
||||
// Dateien den Fokus blockieren.
|
||||
// ---------------------------------------------------------------------------
|
||||
void CodeEditor::focusOutEvent(QFocusEvent *event)
|
||||
{
|
||||
QPlainTextEdit::focusOutEvent(event);
|
||||
m_varCompleter->notifyFocusLost();
|
||||
}
|
||||
|
||||
@@ -10,6 +10,8 @@ class Settings;
|
||||
class SyntaxHighlighter;
|
||||
class ColorIndicator;
|
||||
class SignatureHelper;
|
||||
class FunctionIndex;
|
||||
class VariableCompleter;
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// CodeEditor – Core editing widget.
|
||||
@@ -48,14 +50,19 @@ public:
|
||||
QRectF blockBoundingGeometryPublic(const QTextBlock &b) const { return blockBoundingGeometry(b); }
|
||||
QPointF contentOffsetPublic() const { return contentOffset(); }
|
||||
|
||||
void setFunctionIndex(FunctionIndex *index);
|
||||
|
||||
signals:
|
||||
void fileSaved(const QString &filePath);
|
||||
void navigateToRequested(const QString &filePath, int line);
|
||||
|
||||
protected:
|
||||
void resizeEvent(QResizeEvent *event) override;
|
||||
void keyPressEvent(QKeyEvent *event) override;
|
||||
void paintEvent(QPaintEvent *event) override;
|
||||
void mousePressEvent(QMouseEvent *event) override;
|
||||
void mouseDoubleClickEvent(QMouseEvent *event) override;
|
||||
void focusOutEvent(QFocusEvent *event) override;
|
||||
|
||||
private slots:
|
||||
void updateLineNumberAreaWidth(int newBlockCount);
|
||||
@@ -66,11 +73,14 @@ private:
|
||||
void setupEditor();
|
||||
void installHighlighter(const QString &filePath);
|
||||
bool writeToFile(const QString &filePath);
|
||||
void matchBrackets(QList<QTextEdit::ExtraSelection> &selections);
|
||||
|
||||
Settings *m_settings = nullptr;
|
||||
LineNumberArea *m_lineNumberArea = nullptr;
|
||||
SyntaxHighlighter *m_highlighter = nullptr;
|
||||
ColorIndicator *m_colorIndicator = nullptr;
|
||||
SignatureHelper *m_signatureHelper = nullptr;
|
||||
FunctionIndex *m_functionIndex = nullptr;
|
||||
VariableCompleter *m_varCompleter = nullptr;
|
||||
QString m_filePath;
|
||||
};
|
||||
181
barecode/src/editor/DeadCodeAnalyzer.cpp
Normal file
@@ -0,0 +1,181 @@
|
||||
#include "DeadCodeAnalyzer.h"
|
||||
|
||||
#include <QDir>
|
||||
#include <QDirIterator>
|
||||
#include <QFile>
|
||||
#include <QTextStream>
|
||||
#include <QRegularExpression>
|
||||
#include <QSet>
|
||||
#include <QFileInfo>
|
||||
|
||||
DeadCodeAnalyzer::DeadCodeAnalyzer(QObject *parent)
|
||||
: QObject(parent)
|
||||
{
|
||||
m_scanner = new FunctionScanner(this);
|
||||
}
|
||||
|
||||
QList<DeadCodeAnalyzer::DeadFunction> DeadCodeAnalyzer::analyze(
|
||||
const QString &projectRoot,
|
||||
const QStringList &extensions,
|
||||
const QStringList &excludeDirs) const
|
||||
{
|
||||
// -----------------------------------------------------------------------
|
||||
// Schritt 1: Alle Dateien sammeln (mit Exclude-Filter)
|
||||
// -----------------------------------------------------------------------
|
||||
QStringList allFiles;
|
||||
QDirIterator it(projectRoot, extensions, QDir::Files,
|
||||
QDirIterator::Subdirectories);
|
||||
|
||||
while (it.hasNext())
|
||||
{
|
||||
const QString path = it.next();
|
||||
|
||||
// Exclude-Verzeichnisse prüfen
|
||||
bool excluded = false;
|
||||
if (!excludeDirs.isEmpty())
|
||||
{
|
||||
const QStringList parts = path.split('/');
|
||||
for (const QString &excl : excludeDirs)
|
||||
{
|
||||
if (parts.contains(excl.trimmed(), Qt::CaseInsensitive))
|
||||
{
|
||||
excluded = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!excluded)
|
||||
{
|
||||
allFiles.append(path);
|
||||
}
|
||||
}
|
||||
|
||||
const int totalFiles = allFiles.size();
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
// Schritt 2: Alle Funktionsdefinitionen aus nicht-excluded Dateien
|
||||
// -----------------------------------------------------------------------
|
||||
QHash<QString, FunctionScanner::FunctionInfo> definitions;
|
||||
|
||||
for (const QString &path : allFiles)
|
||||
{
|
||||
const QList<FunctionScanner::FunctionInfo> funcs = m_scanner->scanFile(path);
|
||||
for (const FunctionScanner::FunctionInfo &func : funcs)
|
||||
{
|
||||
if (func.name.startsWith("__"))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
const QString key = func.name.toLower();
|
||||
if (!definitions.contains(key))
|
||||
{
|
||||
definitions.insert(key, func);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (definitions.isEmpty())
|
||||
{
|
||||
return {};
|
||||
}
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
// Schritt 3: Alle Dateien EINMAL lesen, alle Aufrufe sammeln
|
||||
// -----------------------------------------------------------------------
|
||||
QSet<QString> calledFunctions;
|
||||
|
||||
static const QRegularExpression identifierRegex(
|
||||
R"((?:->|::|\b)([a-zA-Z_\x80-\xff][a-zA-Z0-9_\x80-\xff]*)\s*\()"
|
||||
R"(|['"]([a-zA-Z_\x80-\xff][a-zA-Z0-9_\x80-\xff]*)['"])"
|
||||
);
|
||||
|
||||
static const QRegularExpression defLineRegex(
|
||||
R"(\bfunction\s+([a-zA-Z_\x80-\xff][a-zA-Z0-9_\x80-\xff]*))"
|
||||
);
|
||||
|
||||
int filesScanned = 0;
|
||||
|
||||
for (const QString &filePath : allFiles)
|
||||
{
|
||||
++filesScanned;
|
||||
|
||||
// Fortschritt signalisieren
|
||||
emit progressUpdate(filesScanned, totalFiles,
|
||||
QFileInfo(filePath).fileName());
|
||||
|
||||
QFile file(filePath);
|
||||
if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
QTextStream stream(&file);
|
||||
stream.setEncoding(QStringConverter::Utf8);
|
||||
|
||||
while (!stream.atEnd())
|
||||
{
|
||||
const QString line = stream.readLine();
|
||||
const QString trimmed = line.trimmed();
|
||||
|
||||
if (trimmed.startsWith("//") ||
|
||||
trimmed.startsWith("*") ||
|
||||
trimmed.startsWith("#") ||
|
||||
trimmed.startsWith("/*"))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
// Definitionen auf dieser Zeile nicht als Aufruf werten
|
||||
QSet<QString> definedOnThisLine;
|
||||
{
|
||||
QRegularExpressionMatchIterator dit = defLineRegex.globalMatch(line);
|
||||
while (dit.hasNext())
|
||||
{
|
||||
definedOnThisLine.insert(dit.next().captured(1).toLower());
|
||||
}
|
||||
}
|
||||
|
||||
QRegularExpressionMatchIterator mit = identifierRegex.globalMatch(line);
|
||||
while (mit.hasNext())
|
||||
{
|
||||
const QRegularExpressionMatch match = mit.next();
|
||||
const QString name = match.captured(1).isEmpty()
|
||||
? match.captured(2).toLower()
|
||||
: match.captured(1).toLower();
|
||||
|
||||
if (name.isEmpty() || definedOnThisLine.contains(name))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if (definitions.contains(name))
|
||||
{
|
||||
calledFunctions.insert(name);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
// Schritt 4: Nicht aufgerufene Funktionen zurückgeben
|
||||
// -----------------------------------------------------------------------
|
||||
QList<DeadFunction> dead;
|
||||
|
||||
for (auto it2 = definitions.begin(); it2 != definitions.end(); ++it2)
|
||||
{
|
||||
if (!calledFunctions.contains(it2.key()))
|
||||
{
|
||||
const FunctionScanner::FunctionInfo &func = it2.value();
|
||||
DeadFunction d;
|
||||
d.info = func;
|
||||
d.reason = func.className.isEmpty()
|
||||
? QObject::tr("Globale Funktion — kein Aufruf gefunden")
|
||||
: QObject::tr("Methode von %1 — kein Aufruf gefunden")
|
||||
.arg(func.className);
|
||||
dead.append(d);
|
||||
}
|
||||
}
|
||||
|
||||
return dead;
|
||||
}
|
||||
39
barecode/src/editor/DeadCodeAnalyzer.h
Normal file
@@ -0,0 +1,39 @@
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QString>
|
||||
#include <QStringList>
|
||||
#include <QList>
|
||||
|
||||
#include "FunctionScanner.h"
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// DeadCodeAnalyzer – Findet Funktionen die definiert aber nie aufgerufen werden.
|
||||
// ---------------------------------------------------------------------------
|
||||
class DeadCodeAnalyzer : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
struct DeadFunction
|
||||
{
|
||||
FunctionScanner::FunctionInfo info;
|
||||
QString reason;
|
||||
};
|
||||
|
||||
explicit DeadCodeAnalyzer(QObject *parent = nullptr);
|
||||
|
||||
// excludeDirs: Verzeichnisnamen die komplett übersprungen werden
|
||||
// z.B. {"vendor", "lib", "node_modules"}
|
||||
QList<DeadFunction> analyze(const QString &projectRoot,
|
||||
const QStringList &extensions = {"*.php"},
|
||||
const QStringList &excludeDirs = {}) const;
|
||||
|
||||
signals:
|
||||
// Fortschritt während der Analyse (läuft im Thread)
|
||||
void progressUpdate(int filesScanned, int filesTotal,
|
||||
const QString ¤tFile) const;
|
||||
|
||||
private:
|
||||
FunctionScanner *m_scanner = nullptr;
|
||||
};
|
||||
461
barecode/src/editor/DeadCodeDialog.cpp
Normal file
@@ -0,0 +1,461 @@
|
||||
#include "DeadCodeDialog.h"
|
||||
|
||||
#include <QtConcurrent/QtConcurrent>
|
||||
#include <QFileInfo>
|
||||
#include <QDir>
|
||||
#include <QFont>
|
||||
#include <QSettings>
|
||||
#include <QCloseEvent>
|
||||
#include <QFileDialog>
|
||||
#include <QTextStream>
|
||||
#include <QMessageBox>
|
||||
#include <QHeaderView>
|
||||
#include <QDateTime>
|
||||
#include <QMetaObject>
|
||||
|
||||
DeadCodeDialog::DeadCodeDialog(QWidget *parent)
|
||||
: QDialog(parent, Qt::Window)
|
||||
{
|
||||
setWindowTitle(tr("Tote Funktionen – BareCode"));
|
||||
setMinimumSize(650, 500);
|
||||
|
||||
QSettings s(QSettings::IniFormat, QSettings::UserScope, "BareCode", "BareCode");
|
||||
if (s.contains("deadcode/geometry"))
|
||||
{
|
||||
restoreGeometry(s.value("deadcode/geometry").toByteArray());
|
||||
}
|
||||
else
|
||||
{
|
||||
resize(780, 620);
|
||||
}
|
||||
|
||||
m_analyzer = new DeadCodeAnalyzer(this);
|
||||
m_watcher = new QFutureWatcher<QList<DeadCodeAnalyzer::DeadFunction>>(this);
|
||||
|
||||
connect(m_watcher, &QFutureWatcher<QList<DeadCodeAnalyzer::DeadFunction>>::finished,
|
||||
this, &DeadCodeDialog::onAnalysisFinished);
|
||||
|
||||
// Fortschritts-Signal aus dem Analyzer-Thread sicher in den UI-Thread leiten
|
||||
connect(m_analyzer, &DeadCodeAnalyzer::progressUpdate,
|
||||
this, &DeadCodeDialog::onProgressUpdate,
|
||||
Qt::QueuedConnection);
|
||||
|
||||
setupUi();
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// UI
|
||||
// ---------------------------------------------------------------------------
|
||||
void DeadCodeDialog::setupUi()
|
||||
{
|
||||
QVBoxLayout *root = new QVBoxLayout(this);
|
||||
root->setSpacing(8);
|
||||
root->setContentsMargins(12, 12, 12, 12);
|
||||
|
||||
// ---- Warnbox ----
|
||||
QFrame *warningBox = new QFrame(this);
|
||||
warningBox->setStyleSheet(
|
||||
"QFrame {"
|
||||
" background: #3a2a00;"
|
||||
" border: 1px solid #7a5a00;"
|
||||
" border-radius: 4px;"
|
||||
"}"
|
||||
);
|
||||
QHBoxLayout *warnLayout = new QHBoxLayout(warningBox);
|
||||
warnLayout->setContentsMargins(8, 6, 8, 6);
|
||||
|
||||
QLabel *warnIcon = new QLabel(warningBox);
|
||||
warnIcon->setFixedSize(20, 20);
|
||||
warnIcon->setStyleSheet(
|
||||
"background: #ffcc00;"
|
||||
"color: #1a1a00;"
|
||||
"font-weight: bold;"
|
||||
"font-size: 13px;"
|
||||
"border-radius: 10px;"
|
||||
);
|
||||
warnIcon->setText("!");
|
||||
warnIcon->setAlignment(Qt::AlignCenter);
|
||||
warnLayout->addWidget(warnIcon);
|
||||
|
||||
QLabel *warnText = new QLabel(
|
||||
tr("Kandidatenliste — kein Aufruf per Regex gefunden. "
|
||||
"Dynamische Aufrufe (call_user_func, Strings, Hooks) werden nicht erkannt. "
|
||||
"Bitte vor dem Löschen manuell prüfen."),
|
||||
warningBox
|
||||
);
|
||||
warnText->setWordWrap(true);
|
||||
warnText->setStyleSheet("color: #ffcc88;");
|
||||
warnLayout->addWidget(warnText, 1);
|
||||
root->addWidget(warningBox);
|
||||
|
||||
// ---- Exclude-Verzeichnisse ----
|
||||
QHBoxLayout *excludeRow = new QHBoxLayout();
|
||||
excludeRow->addWidget(new QLabel(tr("Ausschließen:"), this));
|
||||
|
||||
m_excludeEdit = new QLineEdit(this);
|
||||
m_excludeEdit->setPlaceholderText(tr("vendor lib node_modules (leerzeichen-getrennt)"));
|
||||
m_excludeEdit->setToolTip(tr(
|
||||
"Verzeichnisnamen die bei der Analyse übersprungen werden.\n"
|
||||
"Leerzeichen-getrennt, z.B.: vendor lib node_modules cache"
|
||||
));
|
||||
|
||||
// Letzte Einstellung wiederherstellen
|
||||
QSettings s(QSettings::IniFormat, QSettings::UserScope, "BareCode", "BareCode");
|
||||
m_excludeEdit->setText(s.value("deadcode/excludeDirs", "vendor lib node_modules").toString());
|
||||
|
||||
excludeRow->addWidget(m_excludeEdit, 1);
|
||||
|
||||
// Verzeichnis-Auswahl Button
|
||||
QPushButton *btnBrowse = new QPushButton(tr("+ Verzeichnis"), this);
|
||||
btnBrowse->setToolTip(tr("Verzeichnis aus dem Projekt auswählen und zur Ausschlussliste hinzufügen"));
|
||||
connect(btnBrowse, &QPushButton::clicked, this, [this]()
|
||||
{
|
||||
const QString startPath = m_projectRoot.isEmpty()
|
||||
? QDir::homePath()
|
||||
: m_projectRoot;
|
||||
|
||||
const QString dir = QFileDialog::getExistingDirectory(
|
||||
this,
|
||||
tr("Verzeichnis ausschließen"),
|
||||
startPath,
|
||||
QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks
|
||||
);
|
||||
|
||||
if (dir.isEmpty())
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// Nur den letzten Verzeichnisnamen verwenden, nicht den vollen Pfad
|
||||
// So funktioniert der Exclude auch für gleichnamige Unterverzeichnisse
|
||||
const QString dirName = QFileInfo(dir).fileName();
|
||||
|
||||
// Prüfen ob bereits in der Liste
|
||||
const QStringList current = m_excludeEdit->text()
|
||||
.simplified()
|
||||
.split(' ', Qt::SkipEmptyParts);
|
||||
if (current.contains(dirName, Qt::CaseInsensitive))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// Anhängen
|
||||
QString newText = m_excludeEdit->text().trimmed();
|
||||
if (!newText.isEmpty())
|
||||
{
|
||||
newText += ' ';
|
||||
}
|
||||
newText += dirName;
|
||||
m_excludeEdit->setText(newText);
|
||||
});
|
||||
excludeRow->addWidget(btnBrowse);
|
||||
|
||||
// Löschen-Button — ganzes Feld leeren
|
||||
QPushButton *btnClear = new QPushButton(tr("✕"), this);
|
||||
btnClear->setFixedWidth(28);
|
||||
btnClear->setFlat(true);
|
||||
btnClear->setToolTip(tr("Ausschlussliste leeren"));
|
||||
connect(btnClear, &QPushButton::clicked, this, [this]()
|
||||
{
|
||||
m_excludeEdit->clear();
|
||||
});
|
||||
excludeRow->addWidget(btnClear);
|
||||
|
||||
root->addLayout(excludeRow);
|
||||
|
||||
// ---- Steuerleiste ----
|
||||
QHBoxLayout *ctrlRow = new QHBoxLayout();
|
||||
|
||||
m_btnAnalyze = new QPushButton(tr("Analyse starten"), this);
|
||||
ctrlRow->addWidget(m_btnAnalyze);
|
||||
|
||||
m_btnExport = new QPushButton(tr("Als TXT exportieren"), this);
|
||||
m_btnExport->setEnabled(false);
|
||||
ctrlRow->addWidget(m_btnExport);
|
||||
|
||||
ctrlRow->addStretch();
|
||||
|
||||
m_statusLabel = new QLabel(this);
|
||||
m_statusLabel->setStyleSheet("color: palette(mid);");
|
||||
ctrlRow->addWidget(m_statusLabel);
|
||||
|
||||
root->addLayout(ctrlRow);
|
||||
|
||||
// ---- Fortschrittsbereich ----
|
||||
m_progress = new QProgressBar(this);
|
||||
m_progress->setRange(0, 100);
|
||||
m_progress->setTextVisible(true);
|
||||
m_progress->setFormat("%v / %m Dateien");
|
||||
m_progress->hide();
|
||||
root->addWidget(m_progress);
|
||||
|
||||
m_progressLabel = new QLabel(this);
|
||||
m_progressLabel->setStyleSheet("color: palette(mid); font-size: 11px;");
|
||||
m_progressLabel->hide();
|
||||
root->addWidget(m_progressLabel);
|
||||
|
||||
// ---- Ergebnistabelle ----
|
||||
m_results = new QTreeWidget(this);
|
||||
m_results->setColumnCount(4);
|
||||
m_results->setHeaderLabels({
|
||||
tr("Funktion"),
|
||||
tr("Klasse"),
|
||||
tr("Datei"),
|
||||
tr("Zeile")
|
||||
});
|
||||
m_results->setRootIsDecorated(false);
|
||||
m_results->setAlternatingRowColors(true);
|
||||
m_results->setSortingEnabled(true);
|
||||
m_results->sortByColumn(0, Qt::AscendingOrder);
|
||||
m_results->setSelectionMode(QAbstractItemView::SingleSelection);
|
||||
|
||||
m_results->header()->setSectionResizeMode(0, QHeaderView::Interactive);
|
||||
m_results->header()->setSectionResizeMode(1, QHeaderView::Interactive);
|
||||
m_results->header()->setSectionResizeMode(2, QHeaderView::Stretch);
|
||||
m_results->header()->setSectionResizeMode(3, QHeaderView::Fixed);
|
||||
m_results->header()->resizeSection(0, 200);
|
||||
m_results->header()->resizeSection(1, 120);
|
||||
m_results->header()->resizeSection(3, 60);
|
||||
|
||||
QFont mono("Monospace");
|
||||
mono.setStyleHint(QFont::Monospace);
|
||||
m_results->setFont(mono);
|
||||
|
||||
root->addWidget(m_results, 1);
|
||||
|
||||
// ---- Verbindungen ----
|
||||
connect(m_btnAnalyze, &QPushButton::clicked, this, &DeadCodeDialog::onAnalyze);
|
||||
connect(m_btnExport, &QPushButton::clicked, this, &DeadCodeDialog::onExportClicked);
|
||||
connect(m_results, &QTreeWidget::itemActivated,
|
||||
this, &DeadCodeDialog::onItemActivated);
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Öffentliche Schnittstelle
|
||||
// ---------------------------------------------------------------------------
|
||||
void DeadCodeDialog::setProjectRoot(const QString &path)
|
||||
{
|
||||
// Alte Exclude-Liste für das vorherige Projekt speichern
|
||||
if (!m_projectRoot.isEmpty())
|
||||
{
|
||||
QSettings s(QSettings::IniFormat, QSettings::UserScope, "BareCode", "BareCode");
|
||||
const QString oldKey = "deadcode/exclude/" +
|
||||
QString(m_projectRoot).replace('/', '_').replace('\\', '_');
|
||||
s.setValue(oldKey, m_excludeEdit->text());
|
||||
}
|
||||
|
||||
m_projectRoot = path;
|
||||
m_results->clear();
|
||||
m_statusLabel->setText(QString());
|
||||
m_btnExport->setEnabled(false);
|
||||
|
||||
// Exclude-Liste für das neue Projekt laden
|
||||
if (!path.isEmpty())
|
||||
{
|
||||
QSettings s(QSettings::IniFormat, QSettings::UserScope, "BareCode", "BareCode");
|
||||
const QString key = "deadcode/exclude/" +
|
||||
QString(path).replace('/', '_').replace('\\', '_');
|
||||
|
||||
// Projektspezifisch vorhanden? Sonst globalen Fallback nehmen
|
||||
const QString saved = s.value(key,
|
||||
s.value("deadcode/excludeDirs", "vendor lib node_modules").toString()
|
||||
).toString();
|
||||
|
||||
m_excludeEdit->setText(saved);
|
||||
}
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Analyse starten
|
||||
// ---------------------------------------------------------------------------
|
||||
void DeadCodeDialog::onAnalyze()
|
||||
{
|
||||
if (m_projectRoot.isEmpty())
|
||||
{
|
||||
QMessageBox::information(this, tr("Analyse"),
|
||||
tr("Bitte zuerst ein Projekt öffnen."));
|
||||
return;
|
||||
}
|
||||
|
||||
if (m_watcher->isRunning())
|
||||
{
|
||||
m_watcher->cancel();
|
||||
m_watcher->waitForFinished();
|
||||
}
|
||||
|
||||
// Exclude-Liste projektspezifisch speichern
|
||||
QSettings s(QSettings::IniFormat, QSettings::UserScope, "BareCode", "BareCode");
|
||||
const QString key = "deadcode/exclude/" +
|
||||
QString(m_projectRoot).replace('/', '_').replace('\\', '_');
|
||||
s.setValue(key, m_excludeEdit->text());
|
||||
s.setValue("deadcode/excludeDirs", m_excludeEdit->text()); // globaler Fallback
|
||||
|
||||
const QStringList excludeDirs = m_excludeEdit->text()
|
||||
.simplified()
|
||||
.split(' ', Qt::SkipEmptyParts);
|
||||
|
||||
m_results->clear();
|
||||
m_btnAnalyze->setEnabled(false);
|
||||
m_btnExport->setEnabled(false);
|
||||
m_progress->setValue(0);
|
||||
m_progress->setMaximum(0); // Unbestimmter Modus bis wir die Dateizahl kennen
|
||||
m_progress->show();
|
||||
m_progressLabel->setText(tr("Dateien werden gezählt…"));
|
||||
m_progressLabel->show();
|
||||
m_statusLabel->setText(tr("Analysiere…"));
|
||||
|
||||
const QString root = m_projectRoot;
|
||||
DeadCodeAnalyzer *analyzer = m_analyzer;
|
||||
|
||||
QFuture<QList<DeadCodeAnalyzer::DeadFunction>> future =
|
||||
QtConcurrent::run([analyzer, root, excludeDirs]()
|
||||
{
|
||||
return analyzer->analyze(root, {"*.php"}, excludeDirs);
|
||||
});
|
||||
|
||||
m_watcher->setFuture(future);
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Fortschritt aktualisieren (QueuedConnection — Thread-sicher)
|
||||
// ---------------------------------------------------------------------------
|
||||
void DeadCodeDialog::onProgressUpdate(int filesScanned, int filesTotal,
|
||||
const QString ¤tFile)
|
||||
{
|
||||
if (m_progress->maximum() != filesTotal)
|
||||
{
|
||||
m_progress->setMaximum(filesTotal);
|
||||
}
|
||||
m_progress->setValue(filesScanned);
|
||||
m_progressLabel->setText(tr("(%1 / %2) %3")
|
||||
.arg(filesScanned)
|
||||
.arg(filesTotal)
|
||||
.arg(currentFile));
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Analyse abgeschlossen
|
||||
// ---------------------------------------------------------------------------
|
||||
void DeadCodeDialog::onAnalysisFinished()
|
||||
{
|
||||
m_progress->hide();
|
||||
m_progressLabel->hide();
|
||||
m_btnAnalyze->setEnabled(true);
|
||||
|
||||
if (m_watcher->isCanceled())
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
const QList<DeadCodeAnalyzer::DeadFunction> dead = m_watcher->result();
|
||||
|
||||
m_results->setSortingEnabled(false);
|
||||
|
||||
for (const DeadCodeAnalyzer::DeadFunction &d : dead)
|
||||
{
|
||||
QTreeWidgetItem *item = new QTreeWidgetItem(m_results);
|
||||
item->setText(0, d.info.signature);
|
||||
item->setText(1, d.info.className.isEmpty() ? tr("(global)") : d.info.className);
|
||||
item->setText(2, QFileInfo(d.info.filePath).fileName());
|
||||
item->setText(3, QString::number(d.info.line));
|
||||
item->setToolTip(0, d.reason);
|
||||
item->setToolTip(2, d.info.filePath);
|
||||
item->setData(0, Qt::UserRole, d.info.filePath);
|
||||
item->setData(0, Qt::UserRole + 1, d.info.line);
|
||||
|
||||
if (d.info.className.isEmpty())
|
||||
{
|
||||
item->setForeground(1, QColor("#888888"));
|
||||
}
|
||||
}
|
||||
|
||||
m_results->setSortingEnabled(true);
|
||||
m_results->sortByColumn(0, Qt::AscendingOrder);
|
||||
|
||||
if (dead.isEmpty())
|
||||
{
|
||||
m_statusLabel->setText(tr("✓ Keine ungenutzten Funktionen gefunden."));
|
||||
m_statusLabel->setStyleSheet("color: #44bb44;");
|
||||
}
|
||||
else
|
||||
{
|
||||
m_statusLabel->setText(tr("%1 Kandidaten gefunden").arg(dead.size()));
|
||||
m_statusLabel->setStyleSheet("color: palette(mid);");
|
||||
m_btnExport->setEnabled(true);
|
||||
}
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Klick auf Treffer
|
||||
// ---------------------------------------------------------------------------
|
||||
void DeadCodeDialog::onItemActivated(QTreeWidgetItem *item, int /*column*/)
|
||||
{
|
||||
const QString path = item->data(0, Qt::UserRole).toString();
|
||||
const int line = item->data(0, Qt::UserRole + 1).toInt();
|
||||
if (!path.isEmpty() && line > 0)
|
||||
{
|
||||
emit fileLineRequested(path, line);
|
||||
}
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Export
|
||||
// ---------------------------------------------------------------------------
|
||||
void DeadCodeDialog::onExportClicked()
|
||||
{
|
||||
const QString path = QFileDialog::getSaveFileName(
|
||||
this,
|
||||
tr("Ergebnis exportieren"),
|
||||
QString("barecode_deadcode_%1.txt")
|
||||
.arg(QDateTime::currentDateTime().toString("yyyyMMdd_HHmm")),
|
||||
tr("Textdateien (*.txt)")
|
||||
);
|
||||
if (path.isEmpty()) { return; }
|
||||
|
||||
QFile file(path);
|
||||
if (!file.open(QIODevice::WriteOnly | QIODevice::Text))
|
||||
{
|
||||
QMessageBox::warning(this, tr("Export"),
|
||||
tr("Datei konnte nicht geschrieben werden:\n%1").arg(path));
|
||||
return;
|
||||
}
|
||||
|
||||
QTextStream out(&file);
|
||||
out.setEncoding(QStringConverter::Utf8);
|
||||
|
||||
out << "BareCode – Analyse ungenutzter Funktionen\n";
|
||||
out << "Projekt: " << m_projectRoot << "\n";
|
||||
out << "Ausgeschlossen: " << m_excludeEdit->text() << "\n";
|
||||
out << "Datum: " << QDateTime::currentDateTime().toString("dd.MM.yyyy HH:mm") << "\n";
|
||||
out << QString("─").repeated(70) << "\n\n";
|
||||
|
||||
for (int i = 0; i < m_results->topLevelItemCount(); ++i)
|
||||
{
|
||||
QTreeWidgetItem *item = m_results->topLevelItem(i);
|
||||
out << item->text(0) << "\n";
|
||||
out << " Klasse: " << item->text(1) << "\n";
|
||||
out << " Datei: " << item->toolTip(2) << "\n";
|
||||
out << " Zeile: " << item->text(3) << "\n\n";
|
||||
}
|
||||
|
||||
out << QString("─").repeated(70) << "\n";
|
||||
out << m_results->topLevelItemCount() << " Kandidaten\n";
|
||||
out << "Hinweis: Dynamische Aufrufe werden nicht erkannt.\n";
|
||||
|
||||
QMessageBox::information(this, tr("Export"),
|
||||
tr("Exportiert nach:\n%1").arg(path));
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Fenstergeometrie speichern
|
||||
// ---------------------------------------------------------------------------
|
||||
void DeadCodeDialog::closeEvent(QCloseEvent *event)
|
||||
{
|
||||
if (m_watcher->isRunning())
|
||||
{
|
||||
m_watcher->cancel();
|
||||
}
|
||||
QSettings s(QSettings::IniFormat, QSettings::UserScope, "BareCode", "BareCode");
|
||||
s.setValue("deadcode/geometry", saveGeometry());
|
||||
event->accept();
|
||||
}
|
||||
62
barecode/src/editor/DeadCodeDialog.h
Normal file
@@ -0,0 +1,62 @@
|
||||
#pragma once
|
||||
|
||||
#include <QDialog>
|
||||
#include <QTreeWidget>
|
||||
#include <QTreeWidgetItem>
|
||||
#include <QLabel>
|
||||
#include <QPushButton>
|
||||
#include <QProgressBar>
|
||||
#include <QLineEdit>
|
||||
#include <QVBoxLayout>
|
||||
#include <QHBoxLayout>
|
||||
#include <QFutureWatcher>
|
||||
#include <QString>
|
||||
|
||||
#include "DeadCodeAnalyzer.h"
|
||||
|
||||
class DeadCodeDialog : public QDialog
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit DeadCodeDialog(QWidget *parent = nullptr);
|
||||
|
||||
void setProjectRoot(const QString &path);
|
||||
|
||||
signals:
|
||||
void fileLineRequested(const QString &filePath, int line);
|
||||
|
||||
private slots:
|
||||
void onAnalyze();
|
||||
void onAnalysisFinished();
|
||||
void onProgressUpdate(int filesScanned, int filesTotal,
|
||||
const QString ¤tFile);
|
||||
void onItemActivated(QTreeWidgetItem *item, int column);
|
||||
void onExportClicked();
|
||||
|
||||
protected:
|
||||
void closeEvent(QCloseEvent *event) override;
|
||||
|
||||
private:
|
||||
void setupUi();
|
||||
|
||||
QString m_projectRoot;
|
||||
|
||||
// Einstellungen
|
||||
QLineEdit *m_excludeEdit = nullptr;
|
||||
|
||||
// Steuerung
|
||||
QPushButton *m_btnAnalyze = nullptr;
|
||||
QPushButton *m_btnExport = nullptr;
|
||||
|
||||
// Fortschritt
|
||||
QProgressBar *m_progress = nullptr;
|
||||
QLabel *m_progressLabel = nullptr;
|
||||
|
||||
// Status + Ergebnisse
|
||||
QLabel *m_statusLabel = nullptr;
|
||||
QTreeWidget *m_results = nullptr;
|
||||
|
||||
DeadCodeAnalyzer *m_analyzer = nullptr;
|
||||
QFutureWatcher<QList<DeadCodeAnalyzer::DeadFunction>> *m_watcher = nullptr;
|
||||
};
|
||||
@@ -3,6 +3,9 @@
|
||||
#include "CodeEditor.h"
|
||||
#include "SearchPanel.h"
|
||||
#include "FileSearchPanel.h"
|
||||
#include "FunctionListDialog.h"
|
||||
#include "DeadCodeDialog.h"
|
||||
#include "FunctionIndex.h"
|
||||
|
||||
#include <QFileInfo>
|
||||
#include <QFile>
|
||||
@@ -32,6 +35,9 @@ void EditorPanel::setupUi()
|
||||
|
||||
m_searchPanel = new SearchPanel(this);
|
||||
m_fileSearch = new FileSearchPanel(this);
|
||||
m_funcDialog = new FunctionListDialog(window());
|
||||
m_deadCode = new DeadCodeDialog(window());
|
||||
m_funcIndex = new FunctionIndex(this);
|
||||
|
||||
m_layout->addWidget(m_tabWidget, 1);
|
||||
m_layout->addWidget(m_searchPanel, 0);
|
||||
@@ -45,6 +51,12 @@ void EditorPanel::setupUi()
|
||||
|
||||
connect(m_fileSearch, &FileSearchPanel::fileLineRequested,
|
||||
this, &EditorPanel::goToLine);
|
||||
|
||||
connect(m_funcDialog, &FunctionListDialog::fileLineRequested,
|
||||
this, &EditorPanel::goToLine);
|
||||
|
||||
connect(m_deadCode, &DeadCodeDialog::fileLineRequested,
|
||||
this, &EditorPanel::goToLine);
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
@@ -79,6 +91,13 @@ void EditorPanel::openFile(const QString &filePath)
|
||||
m_tabWidget->setTabToolTip(index, filePath);
|
||||
m_openTabs.insert(filePath, tab);
|
||||
|
||||
// FunctionIndex dem Editor mitgeben für Doppelklick-Navigation
|
||||
tab->editor()->setFunctionIndex(m_funcIndex);
|
||||
|
||||
// Doppelklick auf Funktion → zur Definition springen
|
||||
connect(tab->editor(), &CodeEditor::navigateToRequested,
|
||||
this, &EditorPanel::goToLine);
|
||||
|
||||
// Änderungsindikator im Tab-Titel (● = ungespeichert)
|
||||
connect(tab->editor()->document(), &QTextDocument::modificationChanged,
|
||||
this, [this, tab](bool modified)
|
||||
@@ -102,6 +121,13 @@ void EditorPanel::openFile(const QString &filePath)
|
||||
m_tabWidget->setTabToolTip(idx, savedPath);
|
||||
}
|
||||
emit currentFileSaved(savedPath);
|
||||
|
||||
// Index und Funktionsliste aktualisieren
|
||||
m_funcIndex->refresh();
|
||||
if (m_funcDialog->isVisible())
|
||||
{
|
||||
m_funcDialog->refresh();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -145,9 +171,26 @@ void EditorPanel::showFileSearchPanel()
|
||||
m_fileSearch->activate();
|
||||
}
|
||||
|
||||
void EditorPanel::showFunctionList()
|
||||
{
|
||||
m_funcDialog->show();
|
||||
m_funcDialog->raise();
|
||||
m_funcDialog->activateWindow();
|
||||
}
|
||||
|
||||
void EditorPanel::showDeadCode()
|
||||
{
|
||||
m_deadCode->show();
|
||||
m_deadCode->raise();
|
||||
m_deadCode->activateWindow();
|
||||
}
|
||||
|
||||
void EditorPanel::setSearchRoot(const QString &path)
|
||||
{
|
||||
m_fileSearch->setSearchRoot(path);
|
||||
m_funcDialog->setProjectRoot(path);
|
||||
m_deadCode->setProjectRoot(path);
|
||||
m_funcIndex->setProjectRoot(path);
|
||||
}
|
||||
|
||||
void EditorPanel::goToLine(const QString &filePath, int line)
|
||||
@@ -10,6 +10,9 @@ class EditorTab;
|
||||
class Settings;
|
||||
class SearchPanel;
|
||||
class FileSearchPanel;
|
||||
class FunctionListDialog;
|
||||
class DeadCodeDialog;
|
||||
class FunctionIndex;
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// EditorPanel – Rechtes Panel: Tab-Leiste + Editoren + Such/Ersetzen-Panel.
|
||||
@@ -29,6 +32,8 @@ public slots:
|
||||
void setSearchRoot(const QString &path);
|
||||
void showSearchPanel();
|
||||
void showFileSearchPanel();
|
||||
void showFunctionList();
|
||||
void showDeadCode();
|
||||
void goToLine(const QString &filePath, int line);
|
||||
|
||||
// Session
|
||||
@@ -50,11 +55,14 @@ private:
|
||||
int findTabForFile(const QString &filePath) const;
|
||||
EditorTab *currentTab() const;
|
||||
|
||||
Settings *m_settings = nullptr;
|
||||
QVBoxLayout *m_layout = nullptr;
|
||||
QTabWidget *m_tabWidget = nullptr;
|
||||
SearchPanel *m_searchPanel = nullptr;
|
||||
FileSearchPanel *m_fileSearch = nullptr;
|
||||
Settings *m_settings = nullptr;
|
||||
QVBoxLayout *m_layout = nullptr;
|
||||
QTabWidget *m_tabWidget = nullptr;
|
||||
SearchPanel *m_searchPanel = nullptr;
|
||||
FileSearchPanel *m_fileSearch = nullptr;
|
||||
FunctionListDialog *m_funcDialog = nullptr;
|
||||
DeadCodeDialog *m_deadCode = nullptr;
|
||||
FunctionIndex *m_funcIndex = nullptr;
|
||||
|
||||
QHash<QString, EditorTab *> m_openTabs;
|
||||
};
|
||||
83
barecode/src/editor/FunctionIndex.cpp
Normal file
@@ -0,0 +1,83 @@
|
||||
#include "FunctionIndex.h"
|
||||
|
||||
#include <QtConcurrent/QtConcurrent>
|
||||
|
||||
FunctionIndex::FunctionIndex(QObject *parent)
|
||||
: QObject(parent)
|
||||
{
|
||||
m_scanner = new FunctionScanner(this);
|
||||
m_watcher = new QFutureWatcher<QList<FunctionScanner::FunctionInfo>>(this);
|
||||
|
||||
connect(m_watcher, &QFutureWatcher<QList<FunctionScanner::FunctionInfo>>::finished,
|
||||
this, &FunctionIndex::onScanFinished);
|
||||
}
|
||||
|
||||
void FunctionIndex::setProjectRoot(const QString &path)
|
||||
{
|
||||
m_projectRoot = path;
|
||||
m_ready = false;
|
||||
m_index.clear();
|
||||
|
||||
if (!path.isEmpty())
|
||||
{
|
||||
refresh();
|
||||
}
|
||||
}
|
||||
|
||||
void FunctionIndex::refresh()
|
||||
{
|
||||
if (m_projectRoot.isEmpty())
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (m_watcher->isRunning())
|
||||
{
|
||||
m_watcher->cancel();
|
||||
m_watcher->waitForFinished();
|
||||
}
|
||||
|
||||
FunctionScanner *scanner = m_scanner;
|
||||
const QString root = m_projectRoot;
|
||||
|
||||
m_watcher->setFuture(
|
||||
QtConcurrent::run([scanner, root]()
|
||||
{
|
||||
return scanner->scanDirectory(root);
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
void FunctionIndex::onScanFinished()
|
||||
{
|
||||
if (m_watcher->isCanceled())
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
m_index.clear();
|
||||
const QList<FunctionScanner::FunctionInfo> all = m_watcher->result();
|
||||
|
||||
for (const FunctionScanner::FunctionInfo &func : all)
|
||||
{
|
||||
const QString key = func.name.toLower();
|
||||
// Ersten Eintrag bevorzugen (globale Funktionen vor Methoden)
|
||||
if (!m_index.contains(key) || func.className.isEmpty())
|
||||
{
|
||||
m_index.insert(key, func);
|
||||
}
|
||||
}
|
||||
|
||||
m_ready = true;
|
||||
emit indexReady();
|
||||
}
|
||||
|
||||
FunctionScanner::FunctionInfo FunctionIndex::lookup(const QString &name) const
|
||||
{
|
||||
return m_index.value(name.toLower(), FunctionScanner::FunctionInfo{});
|
||||
}
|
||||
|
||||
bool FunctionIndex::isReady() const
|
||||
{
|
||||
return m_ready;
|
||||
}
|
||||
47
barecode/src/editor/FunctionIndex.h
Normal file
@@ -0,0 +1,47 @@
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QHash>
|
||||
#include <QString>
|
||||
#include <QStringList>
|
||||
#include <QFutureWatcher>
|
||||
|
||||
#include "FunctionScanner.h"
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// FunctionIndex – Singleton-artiger Index aller Projektfunktionen.
|
||||
// Wird von CodeEditor (Doppelklick-Navigation) und SignatureHelper genutzt.
|
||||
// Aktualisiert sich asynchron wenn setProjectRoot() aufgerufen wird.
|
||||
// ---------------------------------------------------------------------------
|
||||
class FunctionIndex : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit FunctionIndex(QObject *parent = nullptr);
|
||||
|
||||
void setProjectRoot(const QString &path);
|
||||
void refresh();
|
||||
|
||||
// Sucht eine Funktion nach Name (Groß-/Kleinschreibung ignoriert)
|
||||
// Gibt ungültige FunctionInfo zurück wenn nicht gefunden (filePath ist leer)
|
||||
FunctionScanner::FunctionInfo lookup(const QString &name) const;
|
||||
|
||||
bool isReady() const;
|
||||
|
||||
signals:
|
||||
void indexReady();
|
||||
|
||||
private slots:
|
||||
void onScanFinished();
|
||||
|
||||
private:
|
||||
QString m_projectRoot;
|
||||
FunctionScanner *m_scanner = nullptr;
|
||||
|
||||
QFutureWatcher<QList<FunctionScanner::FunctionInfo>> *m_watcher = nullptr;
|
||||
|
||||
// name.toLower() → FunctionInfo
|
||||
QHash<QString, FunctionScanner::FunctionInfo> m_index;
|
||||
bool m_ready = false;
|
||||
};
|
||||
52
barecode/src/editor/FunctionListDialog.cpp
Normal file
@@ -0,0 +1,52 @@
|
||||
#include "FunctionListDialog.h"
|
||||
#include "FunctionListPanel.h"
|
||||
|
||||
#include <QVBoxLayout>
|
||||
#include <QSettings>
|
||||
#include <QCloseEvent>
|
||||
|
||||
FunctionListDialog::FunctionListDialog(QWidget *parent)
|
||||
: QDialog(parent, Qt::Window)
|
||||
{
|
||||
setWindowTitle(tr("Projektfunktionen – BareCode"));
|
||||
setMinimumSize(500, 400);
|
||||
|
||||
// Fenstergröße und -position wiederherstellen
|
||||
QSettings s(QSettings::IniFormat, QSettings::UserScope, "BareCode", "BareCode");
|
||||
if (s.contains("funclist/geometry"))
|
||||
{
|
||||
restoreGeometry(s.value("funclist/geometry").toByteArray());
|
||||
}
|
||||
else
|
||||
{
|
||||
resize(600, 700);
|
||||
}
|
||||
|
||||
QVBoxLayout *layout = new QVBoxLayout(this);
|
||||
layout->setContentsMargins(0, 0, 0, 0);
|
||||
layout->setSpacing(0);
|
||||
|
||||
m_panel = new FunctionListPanel(this);
|
||||
m_panel->show(); // Immer sichtbar — Panel ist jetzt der gesamte Dialog-Inhalt
|
||||
layout->addWidget(m_panel);
|
||||
|
||||
connect(m_panel, &FunctionListPanel::fileLineRequested,
|
||||
this, &FunctionListDialog::fileLineRequested);
|
||||
}
|
||||
|
||||
void FunctionListDialog::setProjectRoot(const QString &path)
|
||||
{
|
||||
m_panel->setProjectRoot(path);
|
||||
}
|
||||
|
||||
void FunctionListDialog::refresh()
|
||||
{
|
||||
m_panel->refresh();
|
||||
}
|
||||
|
||||
void FunctionListDialog::closeEvent(QCloseEvent *event)
|
||||
{
|
||||
QSettings s(QSettings::IniFormat, QSettings::UserScope, "BareCode", "BareCode");
|
||||
s.setValue("funclist/geometry", saveGeometry());
|
||||
event->accept();
|
||||
}
|
||||
30
barecode/src/editor/FunctionListDialog.h
Normal file
@@ -0,0 +1,30 @@
|
||||
#pragma once
|
||||
|
||||
#include <QDialog>
|
||||
#include <QString>
|
||||
|
||||
class FunctionListPanel;
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// FunctionListDialog – Eigenständiges Fenster für die Projektfunktionen.
|
||||
// Bleibt offen während man im Editor arbeitet (non-modal).
|
||||
// ---------------------------------------------------------------------------
|
||||
class FunctionListDialog : public QDialog
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit FunctionListDialog(QWidget *parent = nullptr);
|
||||
|
||||
void setProjectRoot(const QString &path);
|
||||
void refresh();
|
||||
|
||||
protected:
|
||||
void closeEvent(QCloseEvent *event) override;
|
||||
|
||||
signals:
|
||||
void fileLineRequested(const QString &filePath, int line);
|
||||
|
||||
private:
|
||||
FunctionListPanel *m_panel = nullptr;
|
||||
};
|
||||
332
barecode/src/editor/FunctionListPanel.cpp
Normal file
@@ -0,0 +1,332 @@
|
||||
#include "FunctionListPanel.h"
|
||||
|
||||
#include <QtConcurrent/QtConcurrent>
|
||||
#include <QFileInfo>
|
||||
#include <QFont>
|
||||
#include <QProgressBar>
|
||||
|
||||
FunctionListPanel::FunctionListPanel(QWidget *parent)
|
||||
: QWidget(parent)
|
||||
{
|
||||
m_scanner = new FunctionScanner(this);
|
||||
m_watcher = new QFutureWatcher<QList<FunctionScanner::FunctionInfo>>(this);
|
||||
|
||||
connect(m_watcher, &QFutureWatcher<QList<FunctionScanner::FunctionInfo>>::finished,
|
||||
this, &FunctionListPanel::onScanFinished);
|
||||
|
||||
setupUi();
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// UI
|
||||
// ---------------------------------------------------------------------------
|
||||
void FunctionListPanel::setupUi()
|
||||
{
|
||||
QVBoxLayout *root = new QVBoxLayout(this);
|
||||
root->setContentsMargins(0, 0, 0, 0);
|
||||
root->setSpacing(0);
|
||||
|
||||
// ---- Kopfzeile ----
|
||||
QWidget *header = new QWidget(this);
|
||||
header->setStyleSheet("background: palette(mid);");
|
||||
QHBoxLayout *headerLayout = new QHBoxLayout(header);
|
||||
headerLayout->setContentsMargins(6, 4, 6, 4);
|
||||
headerLayout->setSpacing(4);
|
||||
|
||||
QLabel *title = new QLabel(tr("Projektfunktionen"), header);
|
||||
QFont boldFont = title->font();
|
||||
boldFont.setBold(true);
|
||||
title->setFont(boldFont);
|
||||
headerLayout->addWidget(title);
|
||||
headerLayout->addStretch();
|
||||
|
||||
m_btnRefresh = new QPushButton(tr("↻"), header);
|
||||
m_btnRefresh->setFixedSize(24, 24);
|
||||
m_btnRefresh->setFlat(true);
|
||||
m_btnRefresh->setToolTip(tr("Neu scannen"));
|
||||
headerLayout->addWidget(m_btnRefresh);
|
||||
|
||||
root->addWidget(header);
|
||||
|
||||
// ---- Filter + Gruppierung ----
|
||||
QHBoxLayout *toolRow = new QHBoxLayout();
|
||||
toolRow->setContentsMargins(6, 4, 6, 4);
|
||||
toolRow->setSpacing(4);
|
||||
|
||||
m_filterEdit = new QLineEdit(this);
|
||||
m_filterEdit->setPlaceholderText(tr("Funktion suchen…"));
|
||||
m_filterEdit->setClearButtonEnabled(true);
|
||||
toolRow->addWidget(m_filterEdit, 1);
|
||||
|
||||
m_groupCombo = new QComboBox(this);
|
||||
m_groupCombo->addItem(tr("Nach Datei"), "file");
|
||||
m_groupCombo->addItem(tr("Nach Klasse"), "class");
|
||||
m_groupCombo->addItem(tr("Alphabetisch"), "alpha");
|
||||
m_groupCombo->setFixedWidth(120);
|
||||
toolRow->addWidget(m_groupCombo);
|
||||
|
||||
root->addLayout(toolRow);
|
||||
|
||||
// ---- Status ----
|
||||
m_statusLabel = new QLabel(this);
|
||||
m_statusLabel->setContentsMargins(6, 0, 6, 2);
|
||||
m_statusLabel->setStyleSheet("color: palette(mid); font-size: 11px;");
|
||||
root->addWidget(m_statusLabel);
|
||||
|
||||
// ---- Ergebnisbaum ----
|
||||
m_tree = new QTreeWidget(this);
|
||||
m_tree->setHeaderHidden(true);
|
||||
m_tree->setRootIsDecorated(true);
|
||||
m_tree->setIndentation(14);
|
||||
m_tree->setAlternatingRowColors(false);
|
||||
m_tree->setAnimated(true);
|
||||
|
||||
// Monospace-Font für Parameter
|
||||
QFont monoFont("Monospace", m_tree->font().pointSize());
|
||||
monoFont.setStyleHint(QFont::Monospace);
|
||||
m_tree->setFont(monoFont);
|
||||
|
||||
root->addWidget(m_tree, 1);
|
||||
|
||||
// ---- Verbindungen ----
|
||||
connect(m_btnRefresh, &QPushButton::clicked,
|
||||
this, &FunctionListPanel::refresh);
|
||||
|
||||
connect(m_filterEdit, &QLineEdit::textChanged,
|
||||
this, &FunctionListPanel::onFilterChanged);
|
||||
|
||||
connect(m_groupCombo, QOverload<int>::of(&QComboBox::currentIndexChanged),
|
||||
this, &FunctionListPanel::onGroupingChanged);
|
||||
|
||||
connect(m_tree, &QTreeWidget::itemActivated,
|
||||
this, &FunctionListPanel::onItemActivated);
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Öffentliche Schnittstelle
|
||||
// ---------------------------------------------------------------------------
|
||||
void FunctionListPanel::setProjectRoot(const QString &path)
|
||||
{
|
||||
m_projectRoot = path;
|
||||
if (!path.isEmpty())
|
||||
{
|
||||
refresh();
|
||||
}
|
||||
else
|
||||
{
|
||||
m_tree->clear();
|
||||
m_statusLabel->setText(QString());
|
||||
m_lastResult.clear();
|
||||
}
|
||||
}
|
||||
|
||||
void FunctionListPanel::activate()
|
||||
{
|
||||
m_filterEdit->setFocus();
|
||||
m_filterEdit->selectAll();
|
||||
if (m_lastResult.isEmpty() && !m_projectRoot.isEmpty())
|
||||
{
|
||||
refresh();
|
||||
}
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Scan starten
|
||||
// ---------------------------------------------------------------------------
|
||||
void FunctionListPanel::refresh()
|
||||
{
|
||||
if (m_projectRoot.isEmpty())
|
||||
{
|
||||
m_statusLabel->setText(tr("Kein Projekt geöffnet."));
|
||||
return;
|
||||
}
|
||||
|
||||
if (m_watcher->isRunning())
|
||||
{
|
||||
m_watcher->cancel();
|
||||
m_watcher->waitForFinished();
|
||||
}
|
||||
|
||||
m_statusLabel->setText(tr("Scanne…"));
|
||||
m_btnRefresh->setEnabled(false);
|
||||
|
||||
const QString root = m_projectRoot;
|
||||
FunctionScanner *scanner = m_scanner;
|
||||
|
||||
QFuture<QList<FunctionScanner::FunctionInfo>> future =
|
||||
QtConcurrent::run([scanner, root]()
|
||||
{
|
||||
return scanner->scanDirectory(root);
|
||||
});
|
||||
|
||||
m_watcher->setFuture(future);
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Scan abgeschlossen
|
||||
// ---------------------------------------------------------------------------
|
||||
void FunctionListPanel::onScanFinished()
|
||||
{
|
||||
m_btnRefresh->setEnabled(true);
|
||||
|
||||
if (m_watcher->isCanceled())
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
m_lastResult = m_watcher->result();
|
||||
populateTree(m_lastResult);
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Baum befüllen
|
||||
// ---------------------------------------------------------------------------
|
||||
void FunctionListPanel::populateTree(const QList<FunctionScanner::FunctionInfo> &functions)
|
||||
{
|
||||
m_tree->clear();
|
||||
|
||||
const QString groupBy = m_groupCombo->currentData().toString();
|
||||
const QString filter = m_filterEdit->text().trimmed().toLower();
|
||||
|
||||
// Funktionen filtern
|
||||
QList<FunctionScanner::FunctionInfo> filtered;
|
||||
for (const auto &f : functions)
|
||||
{
|
||||
if (filter.isEmpty() ||
|
||||
f.name.toLower().contains(filter) ||
|
||||
f.parameters.toLower().contains(filter) ||
|
||||
f.className.toLower().contains(filter))
|
||||
{
|
||||
filtered.append(f);
|
||||
}
|
||||
}
|
||||
|
||||
if (groupBy == "alpha")
|
||||
{
|
||||
// Alphabetisch — keine Gruppen
|
||||
std::sort(filtered.begin(), filtered.end(),
|
||||
[](const FunctionScanner::FunctionInfo &a,
|
||||
const FunctionScanner::FunctionInfo &b)
|
||||
{
|
||||
return a.name.toLower() < b.name.toLower();
|
||||
});
|
||||
|
||||
for (const auto &f : filtered)
|
||||
{
|
||||
QTreeWidgetItem *item = new QTreeWidgetItem(m_tree);
|
||||
formatFunctionItem(item, f);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// Gruppiert nach Datei oder Klasse
|
||||
QMap<QString, QList<FunctionScanner::FunctionInfo>> groups;
|
||||
|
||||
for (const auto &f : filtered)
|
||||
{
|
||||
QString key;
|
||||
if (groupBy == "class")
|
||||
{
|
||||
key = f.className.isEmpty() ? tr("(global)") : f.className;
|
||||
}
|
||||
else
|
||||
{
|
||||
key = QFileInfo(f.filePath).fileName();
|
||||
}
|
||||
groups[key].append(f);
|
||||
}
|
||||
|
||||
for (auto it = groups.begin(); it != groups.end(); ++it)
|
||||
{
|
||||
QTreeWidgetItem *groupItem = new QTreeWidgetItem(m_tree);
|
||||
groupItem->setText(0, QString("%1 (%2)")
|
||||
.arg(it.key())
|
||||
.arg(it.value().size()));
|
||||
groupItem->setData(0, Qt::UserRole, QString());
|
||||
groupItem->setData(0, Qt::UserRole + 1, -1);
|
||||
|
||||
QFont boldFont = groupItem->font(0);
|
||||
boldFont.setBold(true);
|
||||
groupItem->setFont(0, boldFont);
|
||||
groupItem->setExpanded(true);
|
||||
|
||||
// Funktionen innerhalb der Gruppe alphabetisch
|
||||
auto &list = it.value();
|
||||
std::sort(list.begin(), list.end(),
|
||||
[](const FunctionScanner::FunctionInfo &a,
|
||||
const FunctionScanner::FunctionInfo &b)
|
||||
{
|
||||
return a.name.toLower() < b.name.toLower();
|
||||
});
|
||||
|
||||
for (const auto &f : list)
|
||||
{
|
||||
QTreeWidgetItem *item = new QTreeWidgetItem(groupItem);
|
||||
formatFunctionItem(item, f);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Statuszeile
|
||||
const int total = functions.size();
|
||||
const int shown = filtered.size();
|
||||
if (filter.isEmpty())
|
||||
{
|
||||
m_statusLabel->setText(tr("%1 Funktionen gefunden").arg(total));
|
||||
}
|
||||
else
|
||||
{
|
||||
m_statusLabel->setText(tr("%1 von %2 Funktionen").arg(shown).arg(total));
|
||||
}
|
||||
}
|
||||
|
||||
void FunctionListPanel::formatFunctionItem(QTreeWidgetItem *item,
|
||||
const FunctionScanner::FunctionInfo &f)
|
||||
{
|
||||
// Anzeige: name(parameter) — Zeilennummer klein dahinter
|
||||
const QString display = QString("%1(%2)")
|
||||
.arg(f.name)
|
||||
.arg(f.parameters);
|
||||
|
||||
item->setText(0, display);
|
||||
item->setToolTip(0, QString("%1\nZeile %2").arg(f.filePath).arg(f.line));
|
||||
item->setData(0, Qt::UserRole, f.filePath);
|
||||
item->setData(0, Qt::UserRole + 1, f.line);
|
||||
|
||||
// Zeilennummer in gedimmter Farbe als zweite Spalte simulieren
|
||||
// (über ToolTip gelöst da wir nur eine Spalte haben)
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Slots
|
||||
// ---------------------------------------------------------------------------
|
||||
void FunctionListPanel::onItemActivated(QTreeWidgetItem *item, int /*column*/)
|
||||
{
|
||||
const QString path = item->data(0, Qt::UserRole).toString();
|
||||
const int line = item->data(0, Qt::UserRole + 1).toInt();
|
||||
|
||||
if (path.isEmpty() || line < 0)
|
||||
{
|
||||
item->setExpanded(!item->isExpanded());
|
||||
return;
|
||||
}
|
||||
|
||||
emit fileLineRequested(path, line);
|
||||
}
|
||||
|
||||
void FunctionListPanel::onFilterChanged(const QString &text)
|
||||
{
|
||||
Q_UNUSED(text)
|
||||
if (!m_lastResult.isEmpty())
|
||||
{
|
||||
populateTree(m_lastResult);
|
||||
}
|
||||
}
|
||||
|
||||
void FunctionListPanel::onGroupingChanged(int /*index*/)
|
||||
{
|
||||
if (!m_lastResult.isEmpty())
|
||||
{
|
||||
populateTree(m_lastResult);
|
||||
}
|
||||
}
|
||||