Skip to content

Commit db8cd3b

Browse files
committed
Merge branch 'dev' of https://github.com/live-keys/livekeys into dev
2 parents 8d8defc + 39eb253 commit db8cd3b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+21039
-51
lines changed

application/qml/LogContainer.qml

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ Pane{
3434
}
3535
}
3636

37+
function reset(){
38+
lk.log.clearValues()
39+
}
40+
3741
paneClone: function(){
3842
return lk.layers.workspace.panes.createPane('log', paneState, [root.width, root.height])
3943
}
@@ -173,7 +177,7 @@ Pane{
173177
InputBox{
174178
id: tagSearchBox
175179
anchors.right: parent.right
176-
anchors.rightMargin: 90
180+
anchors.rightMargin: 120
177181
anchors.top: parent.top
178182
anchors.topMargin: 3
179183
anchors.fill: undefined
@@ -186,6 +190,24 @@ Pane{
186190
height: 24
187191
}
188192

193+
Rectangle{
194+
anchors.right: parent.right
195+
anchors.rightMargin: 90
196+
anchors.bottom: parent.bottom
197+
anchors.bottomMargin: 0
198+
height : clearLog.containsMouse ? parent.height : parent.height - 3
199+
width : 25
200+
color : "red"
201+
202+
MouseArea{
203+
id : clearLog
204+
anchors.fill: parent
205+
hoverEnabled: true
206+
onClicked: root.reset()
207+
}
208+
Behavior on height{ NumberAnimation{ duration: 100 } }
209+
}
210+
189211
Rectangle{
190212
anchors.right: parent.right
191213
anchors.rightMargin: 60

lib/lvbase/3rdparty/3rdparty.pri

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,10 @@ unix{
99

1010
INCLUDEPATH += $$PWD/rapidjson/include
1111

12+
# Add utf8proc
13+
14+
DEFINES += UTF8PROC_EXPORTS
15+
INCLUDEPATH += $$PWD/utf8proc
16+
17+
HEADERS += $$PWD/utf8proc/utf8proc.h
18+
SOURCES += $$PWD/utf8proc/utf8proc.c
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
*.tar.gz
2+
*.exe
3+
*.dll
4+
*.do
5+
*.o
6+
*.so*
7+
*.a
8+
*.dll
9+
*.dylib
10+
*.dSYM
11+
*.out
12+
*.new
13+
.vscode
14+
data/*.txt
15+
data/*.ttf
16+
data/*.sfd
17+
/docs/
18+
bench/bench
19+
bench/icu
20+
bench/unistring
21+
test/normtest
22+
test/graphemetest
23+
test/printproperty
24+
test/charwidth
25+
test/misc
26+
test/valid
27+
test/iterate
28+
test/case
29+
test/custom
30+
/tmp/
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
language: julia
2+
julia:
3+
- 1.1
4+
notifications:
5+
email: false
6+
include:
7+
- language: julia
8+
julia: 1.1
9+
script:
10+
- make manifest && diff MANIFEST.new MANIFEST
11+
- make check
12+
- make data && diff data/utf8proc_data.c.new utf8proc_data.c
13+
- make clean && git status --ignored --porcelain && test -z "$(git status --ignored --porcelain)"
14+
- (mkdir build_static && cd build_static && cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON && make)
15+
- (mkdir build_shared && cd build_shared && cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON -DBUILD_SHARED_LIBS=ON && make)
Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
cmake_minimum_required (VERSION 2.8.12)
2+
3+
include (utils.cmake)
4+
5+
disallow_intree_builds()
6+
7+
project (utf8proc C)
8+
9+
# This is the ABI version number, which may differ from the
10+
# API version number (defined in utf8proc.h).
11+
# Be sure to also update these in Makefile and MANIFEST!
12+
set(SO_MAJOR 2)
13+
set(SO_MINOR 3)
14+
set(SO_PATCH 1)
15+
16+
option(UTF8PROC_INSTALL "Enable installation of utf8proc" On)
17+
18+
add_library (utf8proc
19+
utf8proc.c
20+
utf8proc.h
21+
)
22+
23+
# expose header path, for when this is part of a larger cmake project
24+
target_include_directories(utf8proc PUBLIC ../utf8proc)
25+
26+
if (BUILD_SHARED_LIBS)
27+
# Building shared library
28+
else()
29+
# Building static library
30+
target_compile_definitions(utf8proc PUBLIC "UTF8PROC_STATIC")
31+
if (MSVC)
32+
set_target_properties(utf8proc PROPERTIES OUTPUT_NAME "utf8proc_static")
33+
endif()
34+
endif()
35+
36+
target_compile_definitions(utf8proc PRIVATE "UTF8PROC_EXPORTS")
37+
38+
if (NOT MSVC)
39+
set_target_properties(
40+
utf8proc PROPERTIES
41+
COMPILE_FLAGS "-O2 -std=c99 -pedantic -Wall"
42+
)
43+
endif ()
44+
45+
set_target_properties (utf8proc PROPERTIES
46+
POSITION_INDEPENDENT_CODE ON
47+
VERSION "${SO_MAJOR}.${SO_MINOR}.${SO_PATCH}"
48+
SOVERSION ${SO_MAJOR}
49+
)
50+
51+
if (UTF8PROC_INSTALL)
52+
install(TARGETS utf8proc
53+
RUNTIME DESTINATION bin
54+
LIBRARY DESTINATION lib
55+
ARCHIVE DESTINATION lib)
56+
57+
install(
58+
FILES
59+
"${PROJECT_SOURCE_DIR}/utf8proc.h"
60+
DESTINATION include)
61+
endif()

0 commit comments

Comments
 (0)