Skip to content

Commit 130eacc

Browse files
committed
feat: rename project from Clipit to GrabInk
1 parent 1cb3799 commit 130eacc

30 files changed

Lines changed: 189 additions & 187 deletions

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ body:
2323
- type: input
2424
id: version
2525
attributes:
26-
label: Clipit 版本或提交
26+
label: GrabInk 版本或提交
2727
placeholder: 0.1.0 或 Git commit
2828
validations:
2929
required: true

.github/pull_request_template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010

1111
- [ ] 已完成本地构建
1212
- [ ] `ctest` 通过
13-
- [ ] `appClipit_qmllint` 通过
13+
- [ ] `grabink_qmllint` 通过
1414
- [ ] 已说明无法自动测试的行为和手动验证环境
1515
- [ ] 行为或依赖变化已更新文档

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,4 @@ jobs:
6161
run: ctest --preset release
6262

6363
- name: Lint QML
64-
run: cmake --build build/release --target appClipit_qmllint
64+
run: cmake --build build/release --target grabink_qmllint

CMakeLists.txt

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
cmake_minimum_required(VERSION 3.21)
22

3-
project(Clipit VERSION 0.1.0 LANGUAGES CXX)
3+
project(GrabInk VERSION 0.1.0 LANGUAGES CXX)
44

55
set(CMAKE_CXX_STANDARD 17)
66
set(CMAKE_CXX_STANDARD_REQUIRED ON)
77
set(CMAKE_CXX_EXTENSIONS OFF)
88

9-
function(clipit_enable_warnings target)
9+
function(grabink_enable_warnings target)
1010
if(MSVC)
1111
target_compile_options(${target} PRIVATE /W4)
1212
else()
@@ -21,35 +21,35 @@ endif()
2121

2222
qt_standard_project_setup(REQUIRES 6.8)
2323

24-
add_library(clipit_capture_platform INTERFACE)
24+
add_library(grabink_capture_platform INTERFACE)
2525
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
2626
find_package(X11 QUIET)
2727
if(TARGET X11::X11)
28-
target_link_libraries(clipit_capture_platform INTERFACE X11::X11)
29-
target_compile_definitions(clipit_capture_platform INTERFACE CLIPIT_HAS_X11)
28+
target_link_libraries(grabink_capture_platform INTERFACE X11::X11)
29+
target_compile_definitions(grabink_capture_platform INTERFACE GRABINK_HAS_X11)
3030
endif()
3131
elseif(WIN32)
32-
target_link_libraries(clipit_capture_platform INTERFACE user32)
32+
target_link_libraries(grabink_capture_platform INTERFACE user32)
3333
elseif(APPLE)
3434
find_library(APPLICATION_SERVICES_FRAMEWORK ApplicationServices REQUIRED)
35-
target_link_libraries(clipit_capture_platform
35+
target_link_libraries(grabink_capture_platform
3636
INTERFACE ${APPLICATION_SERVICES_FRAMEWORK}
3737
)
3838
endif()
3939

40-
qt_add_library(clipit_core STATIC
40+
qt_add_library(grabink_core STATIC
4141
src/core/annotation.cpp
4242
src/core/annotation.h
4343
src/core/annotationrenderer.cpp
4444
src/core/annotationrenderer.h
4545
src/core/screenshotstorage.cpp
4646
src/core/screenshotstorage.h
4747
)
48-
target_include_directories(clipit_core PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
49-
target_link_libraries(clipit_core PUBLIC Qt6::Core Qt6::Gui)
50-
clipit_enable_warnings(clipit_core)
48+
target_include_directories(grabink_core PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
49+
target_link_libraries(grabink_core PUBLIC Qt6::Core Qt6::Gui)
50+
grabink_enable_warnings(grabink_core)
5151

52-
set(CLIPIT_APP_SOURCES
52+
set(GRABINK_APP_SOURCES
5353
src/app/applicationoptions.cpp
5454
src/app/applicationoptions.h
5555
src/app/main.cpp
@@ -62,16 +62,16 @@ set(CLIPIT_APP_SOURCES
6262
src/platform/screencapturebackend.h
6363
)
6464
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
65-
list(APPEND CLIPIT_APP_SOURCES
65+
list(APPEND GRABINK_APP_SOURCES
6666
src/platform/portalscreencapturebackend.cpp
6767
src/platform/portalscreencapturebackend.h
6868
)
6969
endif()
7070

71-
qt_add_executable(appClipit ${CLIPIT_APP_SOURCES})
71+
qt_add_executable(grabink ${GRABINK_APP_SOURCES})
7272

73-
qt_add_qml_module(appClipit
74-
URI Clipit
73+
qt_add_qml_module(grabink
74+
URI GrabInk
7575
VERSION 1.0
7676
QML_FILES
7777
Main.qml
@@ -83,38 +83,38 @@ qt_add_qml_module(appClipit
8383
components/Toast.qml
8484
)
8585

86-
set_target_properties(appClipit PROPERTIES
87-
MACOSX_BUNDLE_GUI_IDENTIFIER io.clipit.app
86+
set_target_properties(grabink PROPERTIES
87+
MACOSX_BUNDLE_GUI_IDENTIFIER io.github.DrizzleTime.GrabInk
8888
MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
8989
MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
9090
MACOSX_BUNDLE TRUE
9191
WIN32_EXECUTABLE TRUE
9292
)
9393

94-
target_include_directories(appClipit PRIVATE
94+
target_include_directories(grabink PRIVATE
9595
${CMAKE_CURRENT_SOURCE_DIR}
9696
${CMAKE_CURRENT_SOURCE_DIR}/src/app
9797
)
98-
target_link_libraries(appClipit PRIVATE
99-
clipit_core
100-
clipit_capture_platform
98+
target_link_libraries(grabink PRIVATE
99+
grabink_core
100+
grabink_capture_platform
101101
Qt6::Quick
102102
)
103-
clipit_enable_warnings(appClipit)
104-
target_compile_definitions(appClipit PRIVATE CLIPIT_VERSION="${PROJECT_VERSION}")
103+
grabink_enable_warnings(grabink)
104+
target_compile_definitions(grabink PRIVATE GRABINK_VERSION="${PROJECT_VERSION}")
105105
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
106-
target_link_libraries(appClipit PRIVATE Qt6::DBus)
107-
target_compile_definitions(appClipit PRIVATE CLIPIT_HAS_DBUS_PORTAL)
106+
target_link_libraries(grabink PRIVATE Qt6::DBus)
107+
target_compile_definitions(grabink PRIVATE GRABINK_HAS_DBUS_PORTAL)
108108
endif()
109109

110110
include(GNUInstallDirs)
111-
install(TARGETS appClipit
111+
install(TARGETS grabink
112112
BUNDLE DESTINATION .
113113
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
114114
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
115115
)
116116
install(FILES LICENSE
117-
DESTINATION ${CMAKE_INSTALL_DATADIR}/licenses/Clipit
117+
DESTINATION ${CMAKE_INSTALL_DATADIR}/licenses/GrabInk
118118
)
119119

120120
include(CTest)
@@ -123,7 +123,7 @@ if(BUILD_TESTING)
123123
NAME cli_help_without_display
124124
COMMAND ${CMAKE_COMMAND} -E env --unset=DISPLAY --unset=WAYLAND_DISPLAY
125125
--unset=QT_QPA_PLATFORM
126-
$<TARGET_FILE:appClipit> --help
126+
$<TARGET_FILE:grabink> --help
127127
)
128128
set_tests_properties(cli_help_without_display PROPERTIES
129129
PASS_REGULAR_EXPRESSION "--window"
@@ -132,10 +132,10 @@ if(BUILD_TESTING)
132132
NAME cli_version_without_display
133133
COMMAND ${CMAKE_COMMAND} -E env --unset=DISPLAY --unset=WAYLAND_DISPLAY
134134
--unset=QT_QPA_PLATFORM
135-
$<TARGET_FILE:appClipit> --version
135+
$<TARGET_FILE:grabink> --version
136136
)
137137
set_tests_properties(cli_version_without_display PROPERTIES
138-
PASS_REGULAR_EXPRESSION "Clipit ${PROJECT_VERSION}"
138+
PASS_REGULAR_EXPRESSION "GrabInk ${PROJECT_VERSION}"
139139
)
140140

141141
find_package(Qt6 6.8 QUIET COMPONENTS Test)
@@ -154,13 +154,13 @@ if(BUILD_TESTING)
154154
qt_add_executable(tst_annotationrenderer
155155
tests/tst_annotationrenderer.cpp
156156
)
157-
target_link_libraries(tst_annotationrenderer PRIVATE clipit_core Qt6::Test)
157+
target_link_libraries(tst_annotationrenderer PRIVATE grabink_core Qt6::Test)
158158
add_test(NAME annotationrenderer COMMAND tst_annotationrenderer)
159159

160160
qt_add_executable(tst_screenshotstorage
161161
tests/tst_screenshotstorage.cpp
162162
)
163-
target_link_libraries(tst_screenshotstorage PRIVATE clipit_core Qt6::Test)
163+
target_link_libraries(tst_screenshotstorage PRIVATE grabink_core Qt6::Test)
164164
add_test(NAME screenshotstorage COMMAND tst_screenshotstorage)
165165

166166
qt_add_executable(tst_screenshotservice
@@ -178,7 +178,7 @@ if(BUILD_TESTING)
178178
${CMAKE_CURRENT_SOURCE_DIR}/src/app
179179
)
180180
target_link_libraries(tst_screenshotservice
181-
PRIVATE clipit_core clipit_capture_platform Qt6::Quick Qt6::Test
181+
PRIVATE grabink_core grabink_capture_platform Qt6::Quick Qt6::Test
182182
)
183183
add_test(NAME screenshotservice COMMAND tst_screenshotservice)
184184
set_tests_properties(screenshotservice PROPERTIES

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# 参与 Clipit 开发
1+
# 参与 GrabInk 开发
22

33
## 开始之前
44

@@ -20,7 +20,7 @@
2020
cmake --preset debug
2121
cmake --build --preset debug
2222
ctest --preset debug
23-
cmake --build build/debug --target appClipit_qmllint
23+
cmake --build build/debug --target grabink_qmllint
2424
```
2525

2626
如果 Qt 安装在自定义目录,在配置时传入路径:
@@ -56,7 +56,7 @@ QML 保持四空格缩进。组件只有在拥有独立职责、状态或复用
5656
- 一个 PR 只解决一个问题。
5757
- 说明问题、实现方式和受影响的平台。
5858
- 行为变化需要测试;无法自动测试时,写明手动验证环境和步骤。
59-
- 提交前确保构建、`ctest``appClipit_qmllint` 通过。
59+
- 提交前确保构建、`ctest``grabink_qmllint` 通过。
6060
- 不提交构建目录、IDE 用户配置或本机 Qt 路径。
6161

6262
除非另有明确说明,向本项目提交的代码将按项目的 `GPL-3.0-or-later` 许可证发布。提交者必须有权按该许可证提供相关代码。

CaptureOverlay.qml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
pragma ComponentBehavior: Bound
44

55
import QtQuick
6-
import Clipit
6+
import GrabInk
77

88
Window {
99
id: overlay

Main.qml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ pragma ComponentBehavior: Bound
55
import QtQuick
66
import QtQuick.Controls.Basic
77
import QtQuick.Dialogs
8-
import Clipit
8+
import GrabInk
99

1010
ApplicationWindow {
1111
id: window
@@ -17,7 +17,7 @@ ApplicationWindow {
1717
minimumWidth: 520
1818
minimumHeight: 420
1919
visible: true
20-
title: qsTr("Clipit · 截图")
20+
title: qsTr("GrabInk · 截图")
2121
color: darkMode ? "#17191F" : "#F5F6F8"
2222

2323
readonly property bool darkMode: Application.styleHints.colorScheme === Qt.Dark
@@ -238,7 +238,7 @@ ApplicationWindow {
238238
Text {
239239
width: parent.width - 92
240240
anchors.verticalCenter: parent.verticalCenter
241-
text: "Clipit"
241+
text: "GrabInk"
242242
color: window.textPrimary
243243
font.pixelSize: 18
244244
font.weight: Font.DemiBold
@@ -279,7 +279,7 @@ ApplicationWindow {
279279
}
280280
Text {
281281
text: window.screenshotService.wayland
282-
? qsTr("安全读取画面后,由 Clipit 完成框选与标注")
282+
? qsTr("安全读取画面后,由 GrabInk 完成框选与标注")
283283
: qsTr("拖动框选区域,松开后即可保存")
284284
color: window.textSecondary
285285
font.pixelSize: 13
@@ -417,7 +417,7 @@ ApplicationWindow {
417417
anchors.verticalCenter: parent.verticalCenter
418418
spacing: 2
419419
Text { text: window.screenshotService.portalAvailable ? qsTr("Wayland 安全捕获已就绪") : qsTr("Wayland 截图门户不可用"); color: window.textPrimary; font.pixelSize: 12; font.weight: Font.Medium }
420-
Text { text: qsTr("系统负责安全交付画面,框选和标注由 Clipit 完成"); color: window.textSecondary; font.pixelSize: 10 }
420+
Text { text: qsTr("系统负责安全交付画面,框选和标注由 GrabInk 完成"); color: window.textSecondary; font.pixelSize: 10 }
421421
}
422422
}
423423
}

0 commit comments

Comments
 (0)