[sdk/gitklient] /: Rename app to kommit
Hamed Masafi
null at kde.org
Fri Mar 24 08:09:23 GMT 2023
Git commit b1178bf41ca3d299fb5f185d87991bcf3d94ac56 by Hamed Masafi.
Committed on 24/03/2023 at 08:57.
Pushed by hamedmasafi into branch 'master'.
Rename app to kommit
M +10 -10 CMakeLists.txt
M +1 -1 Messages.sh
M +1 -1 README.md
M +1 -1 doc/CMakeLists.txt
M +2 -2 doc/index.docbook
M +10 -10 dolphinplugins/CMakeLists.txt
M +30 -7 dolphinplugins/actionmanager.cpp
M +1 -1 dolphinplugins/actions.h
M +1 -1 dolphinplugins/autotests/CMakeLists.txt
M +2 -2 dolphinplugins/autotests/gittestmanager.cpp
M +1 -1 dolphinplugins/autotests/gittestmanager.h
D +0 -35 dolphinplugins/gitklientitemaction.json
D +0 -25 dolphinplugins/gitklientoverlayplugin.json
M +2 -2 dolphinplugins/overlayplugin.cpp
M +1 -1 dolphinplugins/overlayplugin.h
R +- -- icons/16-apps-kommit.png [from: icons/16-apps-gitklient.png - 100% similarity]
R +- -- icons/22-apps-kommit.png [from: icons/22-apps-gitklient.png - 100% similarity]
R +- -- icons/32-apps-kommit.png [from: icons/32-apps-gitklient.png - 100% similarity]
R +- -- icons/48-apps-kommit.png [from: icons/48-apps-gitklient.png - 100% similarity]
M +8 -8 icons/CMakeLists.txt
R +0 -0 icons/sc-actions-kommit-changedfiles.svg [from: icons/sc-actions-gitklient-changedfiles.svg - 100% similarity]
R +1 -1 icons/sc-apps-kommit.svg [from: icons/sc-apps-gitklient.svg - 098% similarity]
M +2 -2 src/CMakeLists.txt
M +6 -6 src/apps/CMakeLists.txt
M +5 -5 src/apps/main.cpp
M +6 -6 src/data/CMakeLists.txt
D +0 -2 src/data/gitklientdiff.sh
D +0 -2 src/data/gitklientmerge.sh
A +2 -0 src/data/kommitdiff.sh
A +2 -0 src/data/kommitmerge.sh
R +6 -6 src/data/org.kde.kommit.appdata.xml [from: src/data/org.kde.gitklient.appdata.xml - 095% similarity]
R +7 -7 src/data/org.kde.kommit.desktop [from: src/data/org.kde.gitklient.desktop - 088% similarity]
R +8 -8 src/data/org.kde.kommit.diff.desktop [from: src/data/org.kde.gitklient.diff.desktop - 085% similarity]
R +8 -8 src/data/org.kde.kommit.merge.desktop [from: src/data/org.kde.gitklient.merge.desktop - 085% similarity]
M +20 -20 src/gui/CMakeLists.txt
M +2 -2 src/gui/actions/branchactions.cpp
M +2 -2 src/gui/actions/remotesactions.cpp
M +4 -4 src/gui/actions/submoduleactions.cpp
M +6 -6 src/gui/appconfig.cpp
M +4 -4 src/gui/appwindow.cpp
M +2 -2 src/gui/appwindow.h
M +5 -5 src/gui/autotests/CMakeLists.txt
M +9 -9 src/gui/commandargsparser.cpp
M +2 -2 src/gui/commandargsparser.h
M +2 -2 src/gui/core/appdialog.h
M +3 -3 src/gui/core/appmainwindow.cpp
M +1 -1 src/gui/dialogs/cleanupdialog.ui
M +2 -2 src/gui/dialogs/clonedialog.h
M +1 -1 src/gui/dialogs/clonedialog.ui
M +1 -1 src/gui/dialogs/diffopendialog.ui
M +1 -1 src/gui/dialogs/fetchdialog.ui
M +1 -1 src/gui/dialogs/filestreedialog.ui
M +8 -8 src/gui/dialogs/fileviewerdialog.cpp
M +2 -2 src/gui/dialogs/ignorefiledialog.cpp
M +1 -1 src/gui/dialogs/ignorefiledialog.ui
M +2 -2 src/gui/dialogs/initdialog.h
M +1 -1 src/gui/dialogs/initdialog.ui
M +1 -1 src/gui/dialogs/mergeopenfilesdialog.ui
M +1 -1 src/gui/dialogs/notedialog.ui
M +1 -1 src/gui/dialogs/reposettingsdialog.ui
M +1 -1 src/gui/dialogs/runnerdialog.cpp
M +1 -1 src/gui/dialogs/runnerdialog.ui
M +1 -1 src/gui/dialogs/searchdialog.ui
M +1 -1 src/gui/dialogs/selectbranchestodiffdialog.ui
M +2 -2 src/gui/dialogs/switchbranchdialog.cpp
M +1 -1 src/gui/dialogs/switchbranchdialog.ui
M +3 -3 src/gui/diffwindow.cpp
D +0 -8 src/gui/gitklient.qrc
A +8 -0 src/gui/kommit.qrc
R +1 -1 src/gui/kommitdiffui.rc [from: src/gui/gitklientdiffui.rc - 097% similarity]
R +1 -1 src/gui/kommitfileviewerui.rc [from: src/gui/gitklientfileviewerui.rc - 093% similarity]
R +1 -1 src/gui/kommitmergeui.rc [from: src/gui/gitklientmergeui.rc - 098% similarity]
R +0 -0 src/gui/kommitmergeview.ui [from: src/gui/gitklientmergeview.ui - 100% similarity]
R +1 -1 src/gui/kommitui.rc [from: src/gui/gitklientui.rc - 098% similarity]
R +4 -4 src/gui/libkommitgui_private_export.h [from: src/gui/libgitklientgui_private_export.h - 063% similarity]
M +2 -2 src/gui/mainwidget.cpp
M +4 -4 src/gui/merge/CMakeLists.txt
M +3 -3 src/gui/mergewindow.cpp
M +1 -1 src/gui/mergewindow.h
M +1 -1 src/gui/models/changedfilesmodel.cpp
M +7 -7 src/gui/models/difftreemodel.cpp
M +2 -2 src/gui/models/treemodel.cpp
R +1 -1 src/gui/settings/KommitSettings.kcfg [from: src/gui/settings/GitKlientSettings.kcfg - 097% similarity]
R +2 -2 src/gui/settings/KommitSettings.kcfgc [from: src/gui/settings/GitKlientSettings.kcfgc - 073% similarity]
M +14 -14 src/gui/settings/settingsmanager.cpp
M +2 -2 src/gui/settings/settingspagegit.ui
M +2 -2 src/gui/widgets/authorswidget.h
M +8 -8 src/gui/widgets/codeeditor.cpp
M +3 -3 src/gui/widgets/commitswidget.cpp
M +2 -2 src/gui/widgets/filesstatuseslist.h
M +8 -8 src/gui/widgets/logdetailswidget.cpp
M +1 -1 src/gui/widgets/remoteinfodialog.ui
M +4 -4 src/gui/widgets/segmentconnector.cpp
M +4 -4 src/gui/widgets/segmentsscrollbar.cpp
D +0 -35 src/libgitklient/gitglobal.h
D +0 -49 src/libgitklientdiff/CMakeLists.txt
D +0 -33 src/libgitklientdiff/diff.h
R +11 -11 src/libkommit/CMakeLists.txt [from: src/libgitklient/CMakeLists.txt - 074% similarity]
R +7 -7 src/libkommit/autotests/CMakeLists.txt [from: src/libgitklient/autotests/CMakeLists.txt - 051% similarity]
R +0 -0 src/libkommit/autotests/addsubmodulecommandtest.cpp [from: src/libgitklient/autotests/addsubmodulecommandtest.cpp - 100% similarity]
R +0 -0 src/libkommit/autotests/addsubmodulecommandtest.h [from: src/libgitklient/autotests/addsubmodulecommandtest.h - 100% similarity]
R +0 -0 src/libkommit/autotests/clonecommandtest.cpp [from: src/libgitklient/autotests/clonecommandtest.cpp - 100% similarity]
R +0 -0 src/libkommit/autotests/clonecommandtest.h [from: src/libgitklient/autotests/clonecommandtest.h - 100% similarity]
R +0 -0 src/libkommit/autotests/commandcleantest.cpp [from: src/libgitklient/autotests/commandcleantest.cpp - 100% similarity]
R +0 -0 src/libkommit/autotests/commandcleantest.h [from: src/libgitklient/autotests/commandcleantest.h - 100% similarity]
R +0 -0 src/libkommit/autotests/commandpushtest.cpp [from: src/libgitklient/autotests/commandpushtest.cpp - 100% similarity]
R +0 -0 src/libkommit/autotests/commandpushtest.h [from: src/libgitklient/autotests/commandpushtest.h - 100% similarity]
R +0 -0 src/libkommit/autotests/tagtest.cpp [from: src/libgitklient/autotests/tagtest.cpp - 100% similarity]
R +0 -0 src/libkommit/autotests/tagtest.h [from: src/libgitklient/autotests/tagtest.h - 100% similarity]
R +1 -1 src/libkommit/blamedata.cpp [from: src/libgitklient/blamedata.cpp - 090% similarity]
R +2 -2 src/libkommit/blamedata.h [from: src/libgitklient/blamedata.h - 083% similarity]
R +0 -0 src/libkommit/commands/CMakeLists.txt [from: src/libgitklient/commands/CMakeLists.txt - 100% similarity]
R +0 -0 src/libkommit/commands/abstractcommand.cpp [from: src/libgitklient/commands/abstractcommand.cpp - 100% similarity]
R +3 -3 src/libkommit/commands/abstractcommand.h [from: src/libgitklient/commands/abstractcommand.h - 091% similarity]
R +0 -0 src/libkommit/commands/addsubmodulecommand.cpp [from: src/libgitklient/commands/addsubmodulecommand.cpp - 100% similarity]
R +2 -2 src/libkommit/commands/addsubmodulecommand.h [from: src/libgitklient/commands/addsubmodulecommand.h - 088% similarity]
R +0 -0 src/libkommit/commands/commandaddremote.cpp [from: src/libgitklient/commands/commandaddremote.cpp - 100% similarity]
R +2 -2 src/libkommit/commands/commandaddremote.h [from: src/libgitklient/commands/commandaddremote.h - 091% similarity]
R +0 -0 src/libkommit/commands/commandchangedfiles.cpp [from: src/libgitklient/commands/commandchangedfiles.cpp - 100% similarity]
R +0 -0 src/libkommit/commands/commandchangedfiles.h [from: src/libgitklient/commands/commandchangedfiles.h - 100% similarity]
R +0 -0 src/libkommit/commands/commandclean.cpp [from: src/libgitklient/commands/commandclean.cpp - 100% similarity]
R +1 -1 src/libkommit/commands/commandclean.h [from: src/libgitklient/commands/commandclean.h - 092% similarity]
R +0 -0 src/libkommit/commands/commandclone.cpp [from: src/libgitklient/commands/commandclone.cpp - 100% similarity]
R +2 -2 src/libkommit/commands/commandclone.h [from: src/libgitklient/commands/commandclone.h - 092% similarity]
R +0 -0 src/libkommit/commands/commandcommit.cpp [from: src/libgitklient/commands/commandcommit.cpp - 100% similarity]
R +2 -2 src/libkommit/commands/commandcommit.h [from: src/libgitklient/commands/commandcommit.h - 088% similarity]
R +0 -0 src/libkommit/commands/commandfetch.cpp [from: src/libgitklient/commands/commandfetch.cpp - 100% similarity]
R +2 -2 src/libkommit/commands/commandfetch.h [from: src/libgitklient/commands/commandfetch.h - 092% similarity]
R +0 -0 src/libkommit/commands/commandmerge.cpp [from: src/libgitklient/commands/commandmerge.cpp - 100% similarity]
R +2 -2 src/libkommit/commands/commandmerge.h [from: src/libgitklient/commands/commandmerge.h - 096% similarity]
R +0 -0 src/libkommit/commands/commandpull.cpp [from: src/libgitklient/commands/commandpull.cpp - 100% similarity]
R +2 -2 src/libkommit/commands/commandpull.h [from: src/libgitklient/commands/commandpull.h - 094% similarity]
R +0 -0 src/libkommit/commands/commandpush.cpp [from: src/libgitklient/commands/commandpush.cpp - 100% similarity]
R +2 -2 src/libkommit/commands/commandpush.h [from: src/libgitklient/commands/commandpush.h - 089% similarity]
R +3 -3 src/libkommit/commands/commandswitchbranch.cpp [from: src/libgitklient/commands/commandswitchbranch.cpp - 093% similarity]
R +2 -2 src/libkommit/commands/commandswitchbranch.h [from: src/libgitklient/commands/commandswitchbranch.h - 090% similarity]
R +0 -0 src/libkommit/commands/parameterescommand.cpp [from: src/libgitklient/commands/parameterescommand.cpp - 100% similarity]
R +0 -0 src/libkommit/commands/parameterescommand.h [from: src/libgitklient/commands/parameterescommand.h - 100% similarity]
R +1 -1 src/libkommit/filestatus.cpp [from: src/libgitklient/filestatus.cpp - 095% similarity]
R +3 -3 src/libkommit/filestatus.h [from: src/libgitklient/filestatus.h - 088% similarity]
R +0 -0 src/libkommit/gitfile.cpp [from: src/libgitklient/gitfile.cpp - 100% similarity]
R +2 -2 src/libkommit/gitfile.h [from: src/libgitklient/gitfile.h - 094% similarity]
R +1 -1 src/libkommit/gitglobal.cpp [from: src/libgitklient/gitglobal.cpp - 096% similarity]
A +35 -0 src/libkommit/gitglobal.h [License: GPL(v3.0+)]
R +0 -0 src/libkommit/gitgraphlane.cpp [from: src/libgitklient/gitgraphlane.cpp - 100% similarity]
R +2 -2 src/libkommit/gitgraphlane.h [from: src/libgitklient/gitgraphlane.h - 091% similarity]
R +0 -0 src/libkommit/gitlog.cpp [from: src/libgitklient/gitlog.cpp - 100% similarity]
R +2 -2 src/libkommit/gitlog.h [from: src/libgitklient/gitlog.h - 097% similarity]
R +0 -0 src/libkommit/gitloglist.cpp [from: src/libgitklient/gitloglist.cpp - 100% similarity]
R +2 -2 src/libkommit/gitloglist.h [from: src/libgitklient/gitloglist.h - 088% similarity]
R +7 -7 src/libkommit/gitmanager.cpp [from: src/libgitklient/gitmanager.cpp - 097% similarity]
R +2 -2 src/libkommit/gitmanager.h [from: src/libgitklient/gitmanager.h - 098% similarity]
R +3 -3 src/libkommit/gitremote.cpp [from: src/libgitklient/gitremote.cpp - 096% similarity]
R +2 -2 src/libkommit/gitremote.h [from: src/libgitklient/gitremote.h - 091% similarity]
R +0 -0 src/libkommit/gitsubmodule.cpp [from: src/libgitklient/gitsubmodule.cpp - 100% similarity]
R +2 -2 src/libkommit/gitsubmodule.h [from: src/libgitklient/gitsubmodule.h - 091% similarity]
R +0 -0 src/libkommit/gittag.cpp [from: src/libgitklient/gittag.cpp - 100% similarity]
R +2 -2 src/libkommit/gittag.h [from: src/libgitklient/gittag.h - 094% similarity]
R +3 -3 src/libkommit/libkommit_private_export.h [from: src/libgitklient/libgitklient_private_export.h - 072% similarity]
R +0 -0 src/libkommit/models/CMakeLists.txt [from: src/libgitklient/models/CMakeLists.txt - 100% similarity]
R +0 -0 src/libkommit/models/abstractgititemsmodel.cpp [from: src/libgitklient/models/abstractgititemsmodel.cpp - 100% similarity]
R +2 -2 src/libkommit/models/abstractgititemsmodel.h [from: src/libgitklient/models/abstractgititemsmodel.h - 088% similarity]
R +0 -0 src/libkommit/models/authorsmodel.cpp [from: src/libgitklient/models/authorsmodel.cpp - 100% similarity]
R +0 -0 src/libkommit/models/authorsmodel.h [from: src/libgitklient/models/authorsmodel.h - 100% similarity]
R +0 -0 src/libkommit/models/branchesmodel.cpp [from: src/libgitklient/models/branchesmodel.cpp - 100% similarity]
R +2 -2 src/libkommit/models/branchesmodel.h [from: src/libgitklient/models/branchesmodel.h - 091% similarity]
R +0 -0 src/libkommit/models/logsmodel.cpp [from: src/libgitklient/models/logsmodel.cpp - 100% similarity]
R +2 -2 src/libkommit/models/logsmodel.h [from: src/libgitklient/models/logsmodel.h - 094% similarity]
R +0 -0 src/libkommit/models/remotesmodel.cpp [from: src/libgitklient/models/remotesmodel.cpp - 100% similarity]
R +2 -2 src/libkommit/models/remotesmodel.h [from: src/libgitklient/models/remotesmodel.h - 089% similarity]
R +0 -0 src/libkommit/models/stashesmodel.cpp [from: src/libgitklient/models/stashesmodel.cpp - 100% similarity]
R +2 -2 src/libkommit/models/stashesmodel.h [from: src/libgitklient/models/stashesmodel.h - 089% similarity]
R +0 -0 src/libkommit/models/submodulesmodel.cpp [from: src/libgitklient/models/submodulesmodel.cpp - 100% similarity]
R +2 -2 src/libkommit/models/submodulesmodel.h [from: src/libgitklient/models/submodulesmodel.h - 087% similarity]
R +0 -0 src/libkommit/models/tagsmodel.cpp [from: src/libgitklient/models/tagsmodel.cpp - 100% similarity]
R +2 -2 src/libkommit/models/tagsmodel.h [from: src/libgitklient/models/tagsmodel.h - 090% similarity]
R +0 -0 src/libkommit/stash.cpp [from: src/libgitklient/stash.cpp - 100% similarity]
R +2 -2 src/libkommit/stash.h [from: src/libgitklient/stash.h - 093% similarity]
A +49 -0 src/libkommitdiff/CMakeLists.txt
R +0 -0 src/libkommitdiff/array.cpp [from: src/libgitklientdiff/array.cpp - 100% similarity]
R +0 -0 src/libkommitdiff/array.h [from: src/libgitklientdiff/array.h - 100% similarity]
R +3 -3 src/libkommitdiff/autotests/CMakeLists.txt [from: src/libgitklientdiff/autotests/CMakeLists.txt - 069% similarity]
R +0 -0 src/libkommitdiff/autotests/difftest.cpp [from: src/libgitklientdiff/autotests/difftest.cpp - 100% similarity]
R +0 -0 src/libkommitdiff/autotests/difftest.h [from: src/libgitklientdiff/autotests/difftest.h - 100% similarity]
R +0 -0 src/libkommitdiff/diff.cpp [from: src/libgitklientdiff/diff.cpp - 100% similarity]
A +33 -0 src/libkommitdiff/diff.h [License: GPL(v3.0+)]
R +0 -0 src/libkommitdiff/lcs.cpp [from: src/libgitklientdiff/lcs.cpp - 100% similarity]
R +0 -0 src/libkommitdiff/lcs.h [from: src/libgitklientdiff/lcs.h - 100% similarity]
R +0 -0 src/libkommitdiff/pair.cpp [from: src/libgitklientdiff/pair.cpp - 100% similarity]
R +0 -0 src/libkommitdiff/pair.h [from: src/libgitklientdiff/pair.h - 100% similarity]
R +0 -0 src/libkommitdiff/results.cpp [from: src/libgitklientdiff/results.cpp - 100% similarity]
R +3 -3 src/libkommitdiff/results.h [from: src/libgitklientdiff/results.h - 078% similarity]
R +0 -0 src/libkommitdiff/segments.cpp [from: src/libgitklientdiff/segments.cpp - 100% similarity]
R +4 -4 src/libkommitdiff/segments.h [from: src/libgitklientdiff/segments.h - 080% similarity]
R +0 -0 src/libkommitdiff/solution.cpp [from: src/libgitklientdiff/solution.cpp - 100% similarity]
R +0 -0 src/libkommitdiff/solution.h [from: src/libgitklientdiff/solution.h - 100% similarity]
R +0 -0 src/libkommitdiff/text.cpp [from: src/libgitklientdiff/text.cpp - 100% similarity]
R +0 -0 src/libkommitdiff/text.h [from: src/libgitklientdiff/text.h - 100% similarity]
R +0 -0 src/libkommitdiff/types.h [from: src/libgitklientdiff/types.h - 100% similarity]
https://invent.kde.org/sdk/gitklient/commit/b1178bf41ca3d299fb5f185d87991bcf3d94ac56
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e3f73e3..55ca901 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.16)
-project(gitklient)
+project(kommit)
set(PROJECT_VERSION 5)
set(PROJECT_VERSION_MAJOR 0)
set(PROJECT_VERSION_MINOR 4)
@@ -8,8 +8,8 @@ set(PROJECT_VERSION_PATCH 0)
set (RELEASE_SERVICE_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
-set(LIBGITKLIENT_LIB_VERSION "${RELEASE_SERVICE_VERSION}")
-set(LIBGITKLIENT_LIB_SOVERSION "0")
+set(LIBKOMMIT_LIB_VERSION "${RELEASE_SERVICE_VERSION}")
+set(LIBKOMMIT_LIB_SOVERSION "0")
add_definitions(-DGK_VERSION="${RELEASE_SERVICE_VERSION}")
@@ -108,14 +108,14 @@ endif (UNIX)
ecm_qt_install_logging_categories(
- EXPORT GITKLIENT
- FILE gitklient.categories
+ EXPORT KOMMIT
+ FILE kommit.categories
DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}
)
-if (GITKLIENT_BUILD_DIR)
- file(WRITE ${GITKLIENT_BUILD_DIR}/version "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
- message("-- Version in file ${GITKLIENT_BUILD_DIR}/version saved")
+if (KOMMIT_BUILD_DIR)
+ file(WRITE ${KOMMIT_BUILD_DIR}/version "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
+ message("-- Version in file ${KOMMIT_BUILD_DIR}/version saved")
endif()
kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT)
@@ -147,8 +147,8 @@ set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Hamed Masafi")
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
#set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
-if (GITKLIENT_BUILD_DIR)
- set(CPACK_PACKAGE_FILE_NAME "gitklient")
+if (KOMMIT_BUILD_DIR)
+ set(CPACK_PACKAGE_FILE_NAME "kommit")
else()
set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)
endif()
diff --git a/Messages.sh b/Messages.sh
index fe25644..7b86945 100644
--- a/Messages.sh
+++ b/Messages.sh
@@ -1,4 +1,4 @@
#! /usr/bin/env bash
$EXTRACTRC `find . -name \*.ui -o -name \*.rc -o -name \*.kcfg` >> rc.cpp
-$XGETTEXT `find . -name \*.cpp` -o $podir/gitklient.pot
+$XGETTEXT `find . -name \*.cpp` -o $podir/kommit.pot
rm -f rc.cpp
diff --git a/README.md b/README.md
index 78fcc9a..412c5bf 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
[](https://invent.kde.org/sdk/gitklient/-/pipelines)
-# GitKlient
+# Kommit
Git gui client for KDE
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index a8152cc..14b1dcc 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,5 +1,5 @@
kdoctools_create_handbook(
index.docbook
INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en
- SUBDIR gitklient
+ SUBDIR kommit
)
diff --git a/doc/index.docbook b/doc/index.docbook
index ef06221..a1872c9 100644
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -2,7 +2,7 @@
<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
<!-- Define an entity for your application if it is not part of KDE
Git -->
- <!ENTITY kmyapplication "<application>gitklient</application>">
+ <!ENTITY kmyapplication "<application>kommit</application>">
<!ENTITY i18n-translatable-entity "<application>Translatable Entity</application>">
<!ENTITY % addindex "IGNORE">
<!ENTITY % English "INCLUDE">
@@ -131,7 +131,7 @@ as Authors, publish date, the abstract, and Keywords -->
$applicationname xx.yy for applications with independent release schedule (extragear/playground)
-->
<releaseinfo>
- gitklient 0.1
+ kommit 0.1
</releaseinfo>
<!-- Abstract about this handbook -->
diff --git a/dolphinplugins/CMakeLists.txt b/dolphinplugins/CMakeLists.txt
index 4f3bf0b..5e8a532 100644
--- a/dolphinplugins/CMakeLists.txt
+++ b/dolphinplugins/CMakeLists.txt
@@ -3,14 +3,14 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS KIO)
set(GIT_EXTRA_SOURCE
)
-ecm_qt_declare_logging_category(GIT_EXTRA_SOURCE HEADER gitklient_dolphinplugins_debug.h
- IDENTIFIER GIKLIENT_DOLPHIN_PLUGINS_LOG CATEGORY_NAME org.kde.gitklient.dolphinplugins DESCRIPTION "gitklient dolphin plugins" EXPORT GITKLIENT)
+ecm_qt_declare_logging_category(GIT_EXTRA_SOURCE HEADER kommit_dolphinplugins_debug.h
+ IDENTIFIER KOMMIT_DOLPHIN_PLUGINS_LOG CATEGORY_NAME org.kde.kommit.dolphinplugins DESCRIPTION "kommit dolphin plugins" EXPORT kommit)
#---ACTION PLUGIN---
-kcoreaddons_add_plugin(gitklientitemaction
+kcoreaddons_add_plugin(kommititemaction
INSTALL_NAMESPACE kf${QT_MAJOR_VERSION}/kfileitemaction
)
-target_sources(gitklientitemaction PRIVATE
+target_sources(kommititemaction PRIVATE
actionmanager.cpp
statuscache.cpp
manager.cpp
@@ -22,20 +22,20 @@ target_sources(gitklientitemaction PRIVATE
)
target_link_libraries(
- gitklientitemaction
+ kommititemaction
KF5::I18n
KF5::WidgetsAddons
KF5::KIOCore
KF5::KIOWidgets
- libgitklient
+ libkommit
)
#---OVERLAY PLUGIN---
-kcoreaddons_add_plugin(gitklientoverlayplugin
+kcoreaddons_add_plugin(kommitoverlayplugin
INSTALL_NAMESPACE kf${QT_MAJOR_VERSION}/overlayicon
)
-target_sources(gitklientoverlayplugin PRIVATE
+target_sources(kommitoverlayplugin PRIVATE
overlayplugin.cpp
statuscache.cpp
manager.cpp
@@ -47,11 +47,11 @@ target_sources(gitklientoverlayplugin PRIVATE
target_link_libraries(
- gitklientoverlayplugin
+ kommitoverlayplugin
KF5::CoreAddons
KF5::KIOCore
KF5::KIOWidgets
- libgitklient
+ libkommit
)
if (BUILD_TESTING)
diff --git a/dolphinplugins/actionmanager.cpp b/dolphinplugins/actionmanager.cpp
index b040385..86ab407 100644
--- a/dolphinplugins/actionmanager.cpp
+++ b/dolphinplugins/actionmanager.cpp
@@ -18,8 +18,6 @@ ActionManager::ActionManager(QObject *parent, const QList<QVariant> &)
: KAbstractFileItemActionPlugin(parent)
{
mMainAction = new QAction;
- mMainAction->setText(i18n("Git Klient"));
- mMainAction->setIcon(QIcon::fromTheme(QStringLiteral("gitklient")));
auto menu = new QMenu;
@@ -37,8 +35,7 @@ ActionManager::ActionManager(QObject *parent, const QList<QVariant> &)
#define f(name, text, args, icon) \
void ActionManager::name##Clicked() \
- { \
- KProcess::startDetached(QStringLiteral("gitklient"), args); \
+ {
}
ACTIONS_FOR_EACH(f)
@@ -50,7 +47,7 @@ void ActionManager::addMenu(QMenu *menu, const QString &title, const QStringList
if (!icon.isEmpty())
action->setIcon(QIcon::fromTheme(icon));
connect(action, &QAction::triggered, [args]() {
- KProcess::startDetached(QStringLiteral("gitklient"), args);
+
});
}
@@ -106,5 +103,31 @@ QList<QAction *> ActionManager::actions(const KFileItemListProperties &fileItemI
return QList<QAction *>() << mMainAction;
}
-K_PLUGIN_CLASS_WITH_JSON(ActionManager, "gitklientitemaction.json")
-#include "actionmanager.moc"
+QString ActionManager::getCommonPart(const KFileItemList &fileItems)
+{
+ if (!fileItems.size())
+ return {};
+
+ QStringList list;
+ for (auto const &i : fileItems)
+ list.append(i.url().toLocalFile());
+
+ QString root = list.front();
+ for (QStringList::const_iterator it = list.cbegin(); it != list.cend(); ++it) {
+ if (root.length() > it->length()) {
+ root.truncate(it->length());
+ }
+
+ for (int i = 0; i < root.length(); ++i) {
+ if (root.at(i) != it->at(i)) {
+ root.truncate(i);
+ break;
+ }
+ }
+ }
+
+ return root;
+}
+
+K_PLUGIN_CLASS_WITH_JSON(ActionManager, "kommititemaction.json")
+#include "actionmanager.moc"
\ No newline at end of file
diff --git a/dolphinplugins/actions.h b/dolphinplugins/actions.h
index d03db9a..f8e52a4 100644
--- a/dolphinplugins/actions.h
+++ b/dolphinplugins/actions.h
@@ -20,7 +20,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
f(actionPush, "Push", PACK(QStringLiteral("push"), mPath), QStringLiteral("git-push")); \
f(actionMerge, "Merge", PACK(QStringLiteral("merge"), mPath), QStringLiteral("git-merge")); \
f(actionSwitchCheckout, "Switch/Checkout", PACK(QStringLiteral("switch-checkout"), mPath), QLatin1String()); \
- f(actionModifications, "Modifications", PACK(QStringLiteral("changes"), mPath), QStringLiteral("gitklient-changedfiles")); \
+ f(actionModifications, "Modifications", PACK(QStringLiteral("changes"), mPath), QStringLiteral("kommit-changedfiles")); \
f(actionDiff, "Diff", PACK(QStringLiteral("diff"), mPath), QLatin1String()); \
f(actionIgnoreFile, "Ignore file", PACK(QStringLiteral("ignore"), mPath), QStringLiteral("git-ignore")); \
f(actionHistory, "History", PACK(QStringLiteral("history"), mPath), QLatin1String()); \
diff --git a/dolphinplugins/autotests/CMakeLists.txt b/dolphinplugins/autotests/CMakeLists.txt
index 17cc40d..51598ba 100644
--- a/dolphinplugins/autotests/CMakeLists.txt
+++ b/dolphinplugins/autotests/CMakeLists.txt
@@ -7,7 +7,7 @@ macro(add_dolphinplugins_test _source)
add_executable( ${_name} ${_test} ${ARGN} ${_name}.h)
add_test(NAME ${_name} COMMAND ${_name} )
ecm_mark_as_test(${_name})
- target_link_libraries( ${_name} Qt::Test libgitklientgui)
+ target_link_libraries( ${_name} Qt::Test libkommitgui)
endmacro()
add_dolphinplugins_test(overlaytest.cpp)
diff --git a/dolphinplugins/autotests/gittestmanager.cpp b/dolphinplugins/autotests/gittestmanager.cpp
index 3cac536..ce6095d 100644
--- a/dolphinplugins/autotests/gittestmanager.cpp
+++ b/dolphinplugins/autotests/gittestmanager.cpp
@@ -87,7 +87,7 @@ QString GitTestManager::runGit(const QStringList &args)
return out; // + err;
}
-namespace GitKlientTest
+namespace KommitTest
{
bool touch(const QString &fileName)
{
@@ -106,4 +106,4 @@ QString getTempPath()
d.mkpath(path);
return path;
}
-} // namespace GitKlientTest
+} // namespace KommitTest
diff --git a/dolphinplugins/autotests/gittestmanager.h b/dolphinplugins/autotests/gittestmanager.h
index 387a228..092b67f 100644
--- a/dolphinplugins/autotests/gittestmanager.h
+++ b/dolphinplugins/autotests/gittestmanager.h
@@ -8,7 +8,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
#include <QString>
-namespace GitKlientTest
+namespace KommitTest
{
bool touch(const QString &fileName);
QString getTempPath();
diff --git a/dolphinplugins/gitklientitemaction.json b/dolphinplugins/gitklientitemaction.json
deleted file mode 100644
index a94be5d..0000000
--- a/dolphinplugins/gitklientitemaction.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
- "KPlugin": {
- "MimeTypes": [
- "application/octet-stream",
- "inode/directory"
- ],
- "Name": "Git Klient",
- "Name[ca at valencia]": "Git Klient",
- "Name[ca]": "Git Klient",
- "Name[cs]": "Klient pro Git",
- "Name[de]": "Git Klient",
- "Name[en_GB]": "Git Klient",
- "Name[es]": "Git Klient",
- "Name[eu]": "Git Klient",
- "Name[fi]": "Git Klient",
- "Name[fr]": "GitKlient",
- "Name[it]": "Git Klient",
- "Name[ka]": "Git Klient",
- "Name[nl]": "Git Klient",
- "Name[pl]": "Git Klient",
- "Name[pt]": "Git Klient",
- "Name[sk]": "Git Klient",
- "Name[sl]": "Odjemalec Git",
- "Name[tr]": "Git Klient",
- "Name[uk]": "Git Klient",
- "Name[x-test]": "xxGit Klientxx",
- "Name[zh_CN]": "Git Klient",
- "Name[zh_TW]": "Git Klient",
- "ServiceTypes": [
- "KFileItemAction/Plugin"
- ]
- },
- "MimeType": "application/octet-stream;inode/directory;",
- "X-KDE-Submenu": "Git Klient"
-}
diff --git a/dolphinplugins/gitklientoverlayplugin.json b/dolphinplugins/gitklientoverlayplugin.json
deleted file mode 100644
index ee42144..0000000
--- a/dolphinplugins/gitklientoverlayplugin.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "KPlugin": {
- "Description": "Overlay icon for GitKlient",
- "Description[ca at valencia]": "Icona de substitució per a GitKlient",
- "Description[ca]": "Icona de substitució per al GitKlient",
- "Description[en_GB]": "Overlay icon for GitKlient",
- "Description[es]": "Icono superpuesto para GitKlient",
- "Description[eu]": "«GitKlient»erako ikono gainjarria",
- "Description[fi]": "Peittokuvake GitKlientille",
- "Description[fr]": "Icône superposée pour « GitKlient »",
- "Description[it]": "Icona in sovrapposizione per GitKlient",
- "Description[ka]": "GitKlient-ს ხატულა",
- "Description[nl]": "Overlay pictogram voor GitKlient",
- "Description[pl]": "Nakładka na ikonę dla GitKlienta",
- "Description[pt]": "Ícone sobreposto para o GitKlient",
- "Description[sl]": "Prekrivna ikona za GitKlient",
- "Description[tr]": "GitKlient için Owncloud Simgesi",
- "Description[uk]": "Піктограма-накладка для GitKlient",
- "Description[x-test]": "xxOverlay icon for GitKlientxx",
- "Description[zh_TW]": "GitKlient 的覆蓋圖示",
- "ServiceTypes": [
- "KOverlayIconPlugin"
- ]
- }
-}
diff --git a/dolphinplugins/overlayplugin.cpp b/dolphinplugins/overlayplugin.cpp
index 1ffae69..3c03a05 100644
--- a/dolphinplugins/overlayplugin.cpp
+++ b/dolphinplugins/overlayplugin.cpp
@@ -5,7 +5,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
*/
#include "overlayplugin.h"
-#include "gitklient_dolphinplugins_debug.h"
+#include "kommit_dolphinplugins_debug.h"
#include <QFileInfo>
#include <QUrl>
@@ -39,7 +39,7 @@ QString icon(const Git::FileStatus::Status &status)
case Git::FileStatus::NoGit:
return {};
default:
- qCWarning(GIKLIENT_DOLPHIN_PLUGINS_LOG) << "Unknown icon" << status;
+ qCWarning(KOMMIT_DOLPHIN_PLUGINS_LOG) << "Unknown icon" << status;
}
return QStringLiteral("git-status-update");
}
diff --git a/dolphinplugins/overlayplugin.h b/dolphinplugins/overlayplugin.h
index 0c09512..3c0ca47 100644
--- a/dolphinplugins/overlayplugin.h
+++ b/dolphinplugins/overlayplugin.h
@@ -13,7 +13,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
class OverlayPlugin : public KOverlayIconPlugin
{
Q_OBJECT
- Q_PLUGIN_METADATA(IID "org.kfe.gitklient.ovarlayiconplugin" FILE "gitklientoverlayplugin.json")
+ Q_PLUGIN_METADATA(IID "org.kfe.kommit.ovarlayiconplugin" FILE "kommitoverlayplugin.json")
public:
explicit OverlayPlugin(QObject *parent = nullptr);
QStringList getOverlays(const QUrl &url) override;
diff --git a/icons/16-apps-gitklient.png b/icons/16-apps-kommit.png
similarity index 100%
rename from icons/16-apps-gitklient.png
rename to icons/16-apps-kommit.png
diff --git a/icons/22-apps-gitklient.png b/icons/22-apps-kommit.png
similarity index 100%
rename from icons/22-apps-gitklient.png
rename to icons/22-apps-kommit.png
diff --git a/icons/32-apps-gitklient.png b/icons/32-apps-kommit.png
similarity index 100%
rename from icons/32-apps-gitklient.png
rename to icons/32-apps-kommit.png
diff --git a/icons/48-apps-gitklient.png b/icons/48-apps-kommit.png
similarity index 100%
rename from icons/48-apps-gitklient.png
rename to icons/48-apps-kommit.png
diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
index 005c740..a5fbd20 100644
--- a/icons/CMakeLists.txt
+++ b/icons/CMakeLists.txt
@@ -1,9 +1,9 @@
-set(GIT_KLIENT_ICONS
- 16-apps-gitklient.png
- 22-apps-gitklient.png
- 32-apps-gitklient.png
- 48-apps-gitklient.png
- sc-apps-gitklient.svg
+set(KOMMIT_ICONS
+ 16-apps-kommit.png
+ 22-apps-kommit.png
+ 32-apps-kommit.png
+ 48-apps-kommit.png
+ sc-apps-kommit.svg
sc-actions-diff-keep-their.svg
sc-actions-diff-keep-mine.svg
@@ -37,7 +37,7 @@ set(GIT_KLIENT_ICONS
sc-actions-git-ignore.svg
sc-actions-git-merge.svg
- sc-actions-gitklient-changedfiles.svg
+ sc-actions-kommit-changedfiles.svg
)
-ecm_install_icons(ICONS ${GIT_KLIENT_ICONS} DESTINATION ${KDE_INSTALL_ICONDIR} THEME hicolor)
+ecm_install_icons(ICONS ${KOMMIT_ICONS} DESTINATION ${KDE_INSTALL_ICONDIR} THEME hicolor)
diff --git a/icons/sc-actions-gitklient-changedfiles.svg b/icons/sc-actions-kommit-changedfiles.svg
similarity index 100%
rename from icons/sc-actions-gitklient-changedfiles.svg
rename to icons/sc-actions-kommit-changedfiles.svg
diff --git a/icons/sc-apps-gitklient.svg b/icons/sc-apps-kommit.svg
similarity index 98%
rename from icons/sc-apps-gitklient.svg
rename to icons/sc-apps-kommit.svg
index 1d884ce..a67aa28 100644
--- a/icons/sc-apps-gitklient.svg
+++ b/icons/sc-apps-kommit.svg
@@ -11,7 +11,7 @@
viewBox="0 0 97 97"
enable-background="new 0 0 97 97"
xml:space="preserve"
- sodipodi:docname="sc-apps-gitklient.svg"
+ sodipodi:docname="sc-apps-kommit.svg"
inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
inkscape:export-filename="/home/hamed/dev/kde-git/icons/48-apps-kde_actions.png"
inkscape:export-xdpi="50.150002"
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index aaedbf7..f398067 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_subdirectory(libgitklient)
-add_subdirectory(libgitklientdiff)
+add_subdirectory(libkommit)
+add_subdirectory(libkommitdiff)
add_subdirectory(data)
add_subdirectory(gui)
add_subdirectory(apps)
diff --git a/src/apps/CMakeLists.txt b/src/apps/CMakeLists.txt
index add3218..f2d7701 100644
--- a/src/apps/CMakeLists.txt
+++ b/src/apps/CMakeLists.txt
@@ -1,11 +1,11 @@
# SPDX-FileCopyrightText: 2022 Laurent Montel <montel at kde.org>
# SPDX-License-Identifier: BSD-3-Clause
-add_executable(gitklient main.cpp)
+add_executable(kommit main.cpp)
-target_link_libraries(gitklient
- libgitklient
- libgitklientdiff
- libgitklientgui
+target_link_libraries(kommit
+ libkommit
+ libkommitdiff
+ libkommitgui
)
-install(TARGETS gitklient ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kommit ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/src/apps/main.cpp b/src/apps/main.cpp
index 765860a..51cf393 100644
--- a/src/apps/main.cpp
+++ b/src/apps/main.cpp
@@ -27,11 +27,11 @@ int main(int argc, char **argv)
#endif
QApplication application(argc, argv);
- KLocalizedString::setApplicationDomain("gitklient");
+ KLocalizedString::setApplicationDomain("kommit");
KCrash::initialize();
- KAboutData aboutData(QStringLiteral("gitklient"),
- i18n("GitKlient"),
+ KAboutData aboutData(QStringLiteral("kommit"),
+ i18n("Kommit"),
QStringLiteral(GK_VERSION),
i18n("Git client gui for KDE"),
KAboutLicense::GPL_V3,
@@ -39,10 +39,10 @@ int main(int argc, char **argv)
aboutData.addAuthor(i18n("Hamed Masafi"), i18n("Author"), QStringLiteral("hamed.masafi at gmail.com"));
aboutData.addCredit(i18n("Laurent Montel"), i18n("Bug fixing"), QStringLiteral("montel at kde.org"));
- aboutData.setDesktopFileName(QStringLiteral("org.kde.gitklient"));
+ aboutData.setDesktopFileName(QStringLiteral("org.kde.kommit"));
KAboutData::setApplicationData(aboutData);
- application.setWindowIcon(QIcon::fromTheme(QStringLiteral("gitklient")));
+ application.setWindowIcon(QIcon::fromTheme(QStringLiteral("kommit")));
QCommandLineParser parser;
aboutData.setupCommandLine(&parser);
diff --git a/src/data/CMakeLists.txt b/src/data/CMakeLists.txt
index 8a1d53a..58e3c22 100644
--- a/src/data/CMakeLists.txt
+++ b/src/data/CMakeLists.txt
@@ -1,7 +1,7 @@
-install(PROGRAMS gitklientdiff.sh DESTINATION bin RENAME gitklientdiff)
-install(PROGRAMS gitklientmerge.sh DESTINATION bin RENAME gitklientmerge)
-install(PROGRAMS org.kde.gitklient.desktop DESTINATION ${KDE_INSTALL_APPDIR})
-install(PROGRAMS org.kde.gitklient.diff.desktop DESTINATION ${KDE_INSTALL_APPDIR})
-install(PROGRAMS org.kde.gitklient.merge.desktop DESTINATION ${KDE_INSTALL_APPDIR})
-install(FILES org.kde.gitklient.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
+install(PROGRAMS kommitdiff.sh DESTINATION bin RENAME kommitdiff)
+install(PROGRAMS kommitmerge.sh DESTINATION bin RENAME kommitmerge)
+install(PROGRAMS org.kde.kommit.desktop DESTINATION ${KDE_INSTALL_APPDIR})
+install(PROGRAMS org.kde.kommit.diff.desktop DESTINATION ${KDE_INSTALL_APPDIR})
+install(PROGRAMS org.kde.kommit.merge.desktop DESTINATION ${KDE_INSTALL_APPDIR})
+install(FILES org.kde.kommit.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
diff --git a/src/data/gitklientdiff.sh b/src/data/gitklientdiff.sh
deleted file mode 100644
index aec5374..0000000
--- a/src/data/gitklientdiff.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-gitklient diff "$@"
diff --git a/src/data/gitklientmerge.sh b/src/data/gitklientmerge.sh
deleted file mode 100644
index 3691b46..0000000
--- a/src/data/gitklientmerge.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-gitklient merge "$@"
diff --git a/src/data/kommitdiff.sh b/src/data/kommitdiff.sh
new file mode 100644
index 0000000..656c9cf
--- /dev/null
+++ b/src/data/kommitdiff.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+kommit diff "$@"
diff --git a/src/data/kommitmerge.sh b/src/data/kommitmerge.sh
new file mode 100644
index 0000000..07ec523
--- /dev/null
+++ b/src/data/kommitmerge.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+kommit merge "$@"
diff --git a/src/data/org.kde.gitklient.appdata.xml b/src/data/org.kde.kommit.appdata.xml
similarity index 95%
rename from src/data/org.kde.gitklient.appdata.xml
rename to src/data/org.kde.kommit.appdata.xml
index e5b3f5a..61344c8 100644
--- a/src/data/org.kde.gitklient.appdata.xml
+++ b/src/data/org.kde.kommit.appdata.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<component type="desktop-application">
- <id>org.kde.gitklient.desktop</id>
+ <id>org.kde.kommit.desktop</id>
<metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-3.0</project_license>
- <name>Git Klient</name>
- <name xml:lang="ca">Git Klient</name>
+ <name>Kommit</name>
+ <name xml:lang="ca">Kommit</name>
<name xml:lang="ca-valencia">Git Klient</name>
<name xml:lang="cs">Klient pro Git</name>
<name xml:lang="de">Git Klient</name>
@@ -82,9 +82,9 @@
</screenshot>
</screenshots>
<provides>
- <binary>gitklient</binary>
- <binary>gitklientdiff</binary>
- <binary>gitklientmerge</binary>
+ <binary>kommit</binary>
+ <binary>kommitdiff</binary>
+ <binary>kommitmerge</binary>
</provides>
<project_group>KDE</project_group>
</component>
diff --git a/src/data/org.kde.gitklient.desktop b/src/data/org.kde.kommit.desktop
similarity index 88%
rename from src/data/org.kde.gitklient.desktop
rename to src/data/org.kde.kommit.desktop
index c171867..d88bdcd 100755
--- a/src/data/org.kde.gitklient.desktop
+++ b/src/data/org.kde.kommit.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Name=Git Klient
+Name=Kommit
Name[ca]=Git Klient
Name[ca at valencia]=Git Klient
Name[cs]=Klient pro Git
@@ -20,11 +20,11 @@ Name[tr]=Git Klient
Name[uk]=Git Klient
Name[x-test]=xxGit Klientxx
Name[zh_CN]=Git Klient
-Name[zh_TW]=Git Klient
-Exec=gitklient
-Icon=gitklient
+Exec=kommit
+Icon=kommit
+
Type=Application
-X-DocPath=gitklient/index.html
+X-DocPath=kommit/index.html
GenericName=Git client gui for KDE
GenericName[ca]=Client gràfic del Git per al KDE
GenericName[ca at valencia]=Client gràfic de Git per a KDE
@@ -33,7 +33,7 @@ GenericName[en_GB]=Git client GUI for KDE
GenericName[es]=Interfaz gráfica de cliente git para KDE
GenericName[eu]=KDEren Git GUI bezeroa
GenericName[fi]=KDE:n Git-asiakaskäyttöliittymä
-GenericName[fr]=Client « Git » avec interface utilisateur pour KDE
+GenericName[fr]=Client « Git » avec interface utilisateur pour KDE
GenericName[it]=Interfaccia client Git per KDE
GenericName[ka]=Git-ის კლიენტი KDE-სთვის
GenericName[nl]=Git-client-gui voor KDE
@@ -46,4 +46,4 @@ GenericName[uk]=Клієнтська графічна оболонка до git
GenericName[x-test]=xxGit client gui for KDExx
GenericName[zh_CN]=KDE Git 图形客户端
GenericName[zh_TW]=KDE 的 Git 用戶端介面
-Categories=Development
+Categories=Development
\ No newline at end of file
diff --git a/src/data/org.kde.gitklient.diff.desktop b/src/data/org.kde.kommit.diff.desktop
similarity index 85%
rename from src/data/org.kde.gitklient.diff.desktop
rename to src/data/org.kde.kommit.diff.desktop
index a6f3ddc..d9c5ddc 100755
--- a/src/data/org.kde.gitklient.diff.desktop
+++ b/src/data/org.kde.kommit.diff.desktop
@@ -1,12 +1,12 @@
[Desktop Entry]
-Name=Git Klient Diff
+Name=Kommit Diff
Name[ca]=Git Klient Diff
Name[ca at valencia]=Git Klient Diff
Name[en_GB]=Git Klient Diff
Name[es]=Diferencias de Git Klient
Name[eu]=Git Klient Diferentzia
Name[fi]=Git Klient -vertailu
-Name[fr]=Comparateur pour le Klient « Git »
+Name[fr]=Comparateur pour le Klient « Git »
Name[it]=Git Klient Diff
Name[ka]=Git Klient Diff
Name[nl]=Git Klient Diff
@@ -17,11 +17,11 @@ Name[tr]=Git Klient Diff
Name[uk]=Різниця git Klient
Name[x-test]=xxGit Klient Diffxx
Name[zh_CN]=Git Klient 差异
-Name[zh_TW]=Git Klient 差異
-Exec=gitklient diff
-Icon=gitklient
+Exec=kommit diff
+Icon=kommit
+
Type=Application
-X-DocPath=gitklient/index.html
+X-DocPath=kommit/index.html
GenericName=Git client gui for KDE
GenericName[ca]=Client gràfic del Git per al KDE
GenericName[ca at valencia]=Client gràfic de Git per a KDE
@@ -30,7 +30,7 @@ GenericName[en_GB]=Git client GUI for KDE
GenericName[es]=Interfaz gráfica de cliente git para KDE
GenericName[eu]=KDEren Git GUI bezeroa
GenericName[fi]=KDE:n Git-asiakaskäyttöliittymä
-GenericName[fr]=Client « Git » avec interface utilisateur pour KDE
+GenericName[fr]=Client « Git » avec interface utilisateur pour KDE
GenericName[it]=Interfaccia client Git per KDE
GenericName[ka]=Git-ის კლიენტი KDE-სთვის
GenericName[nl]=Git-client-gui voor KDE
@@ -43,4 +43,4 @@ GenericName[uk]=Клієнтська графічна оболонка до git
GenericName[x-test]=xxGit client gui for KDExx
GenericName[zh_CN]=KDE Git 图形客户端
GenericName[zh_TW]=KDE 的 Git 用戶端介面
-Categories=Development
+Categories=Development
\ No newline at end of file
diff --git a/src/data/org.kde.gitklient.merge.desktop b/src/data/org.kde.kommit.merge.desktop
similarity index 85%
rename from src/data/org.kde.gitklient.merge.desktop
rename to src/data/org.kde.kommit.merge.desktop
index 5dbeedd..cae6cf1 100755
--- a/src/data/org.kde.gitklient.merge.desktop
+++ b/src/data/org.kde.kommit.merge.desktop
@@ -1,12 +1,12 @@
[Desktop Entry]
-Name=Git Klient Merge
+Name=Kommit Merge
Name[ca]=Git Klient Merge
Name[ca at valencia]=Git Klient Merge
Name[en_GB]=Git Klient Merge
Name[es]=Fusión de Git Klient
Name[eu]=Git Klient Bateratzea
Name[fi]=Git Klient -yhdistäminen
-Name[fr]=Fusion pour le Klient « Git »
+Name[fr]=Fusion pour le Klient « Git »
Name[it]=Git Klient Merge
Name[ka]=Git Klient Merge
Name[nl]=Git Klient Merge
@@ -17,11 +17,11 @@ Name[tr]=Git Klient Birleştir
Name[uk]=Об'єднання git Klient
Name[x-test]=xxGit Klient Mergexx
Name[zh_CN]=Git Klient 合并
-Name[zh_TW]=Git Klient 合併
-Exec=gitklient merge
-Icon=gitklient
+Exec=kommit merge
+Icon=kommit
+
Type=Application
-X-DocPath=gitklient/index.html
+X-DocPath=kommit/index.html
GenericName=Git client gui for KDE
GenericName[ca]=Client gràfic del Git per al KDE
GenericName[ca at valencia]=Client gràfic de Git per a KDE
@@ -30,7 +30,7 @@ GenericName[en_GB]=Git client GUI for KDE
GenericName[es]=Interfaz gráfica de cliente git para KDE
GenericName[eu]=KDEren Git GUI bezeroa
GenericName[fi]=KDE:n Git-asiakaskäyttöliittymä
-GenericName[fr]=Client « Git » avec interface utilisateur pour KDE
+GenericName[fr]=Client « Git » avec interface utilisateur pour KDE
GenericName[it]=Interfaccia client Git per KDE
GenericName[ka]=Git-ის კლიენტი KDE-სთვის
GenericName[nl]=Git-client-gui voor KDE
@@ -43,4 +43,4 @@ GenericName[uk]=Клієнтська графічна оболонка до git
GenericName[x-test]=xxGit client gui for KDExx
GenericName[zh_CN]=KDE Git 图形客户端
GenericName[zh_TW]=KDE 的 Git 用戶端介面
-Categories=Development
+Categories=Development
\ No newline at end of file
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 83ae1be..a9641ba 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -1,9 +1,9 @@
include_directories(${CMAKE_SOURCE_DIR}/core)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
-add_library(libgitklientgui SHARED)
-generate_export_header(libgitklientgui BASE_NAME libgitklientgui)
-target_sources(libgitklientgui PRIVATE
+add_library(libkommitgui SHARED)
+generate_export_header(libkommitgui BASE_NAME libkommitgui)
+target_sources(libkommitgui PRIVATE
core/appdialog.cpp
core/appdialog.h
core/appmainwindow.cpp
@@ -155,34 +155,34 @@ target_sources(libgitklientgui PRIVATE
commandargsparser.h
appconfig.h
settings/settingsmanager.h
- gitklient.qrc
+ kommit.qrc
)
-set_target_properties(libgitklientgui
- PROPERTIES OUTPUT_NAME gitklientgui VERSION ${LIBGITKLIENT_LIB_VERSION} SOVERSION ${LIBGITKLIENT_LIB_SOVERSION}
+set_target_properties(libkommitgui
+ PROPERTIES OUTPUT_NAME kommitgui VERSION ${LIBKOMMIT_LIB_VERSION} SOVERSION ${LIBKOMMIT_LIB_SOVERSION}
)
-install(TARGETS libgitklientgui ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
+install(TARGETS libkommitgui ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
-ecm_qt_declare_logging_category(libgitklientgui
- HEADER gitklient_appdebug.h
- IDENTIFIER GITKLIENT_LOG
- CATEGORY_NAME "org.kde.gitklient" DESCRIPTION "gitklient" EXPORT GITKLIENT
+ecm_qt_declare_logging_category(libkommitgui
+ HEADER kommit_appdebug.h
+ IDENTIFIER KOMMIT_LOG
+ CATEGORY_NAME "org.kde.kommit" DESCRIPTION "kommit" EXPORT KOMMIT
)
-kconfig_add_kcfg_files(libgitklientgui settings/GitKlientSettings.kcfgc)
+kconfig_add_kcfg_files(libkommitgui settings/KommitSettings.kcfgc)
add_compile_definitions(GIT_GUI)
ki18n_wrap_ui(
- libgitklientgui
+ libkommitgui
settings/settingspagebase.ui
settings/settingspagediff.ui
settings/settingspagegit.ui
multipagewidget.ui
- gitklientmergeview.ui
+ kommitmergeview.ui
commandpullwidget.ui
widgets/branchesstatuswidget.ui
@@ -223,13 +223,13 @@ ki18n_wrap_ui(
dialogs/cleanupdialog.ui
)
-target_link_libraries(libgitklientgui
+target_link_libraries(libkommitgui
Qt::Core
Qt::Widgets
Qt::Concurrent
- libgitklient
- libgitklientdiff
+ libkommit
+ libkommitdiff
KF5::CoreAddons
KF5::I18n
@@ -248,13 +248,13 @@ target_link_libraries(libgitklientgui
)
if (COMPILE_WITH_UNITY_CMAKE_SUPPORT)
- set_target_properties(libgitklientgui PROPERTIES UNITY_BUILD ON)
+ set_target_properties(libkommitgui PROPERTIES UNITY_BUILD ON)
endif()
set_target_properties(
- libgitklientgui PROPERTIES
- MACOSX_BUNDLE_GUI_IDENTIFIER org.kde.gitklient
+ libkommitgui PROPERTIES
+ MACOSX_BUNDLE_GUI_IDENTIFIER org.kde.kommit
MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
MACOSX_BUNDLE TRUE
diff --git a/src/gui/actions/branchactions.cpp b/src/gui/actions/branchactions.cpp
index 7ceea75..81bc54f 100644
--- a/src/gui/actions/branchactions.cpp
+++ b/src/gui/actions/branchactions.cpp
@@ -9,7 +9,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
#include <KLocalizedString>
#include <KMessageBox>
-#include "gitklient_appdebug.h"
+#include "kommit_appdebug.h"
#include <QDebug>
#include <QInputDialog>
@@ -114,7 +114,7 @@ void BranchActions::diff()
branchToDiff = QStringLiteral("main");
}
if (branchToDiff.isEmpty()) {
- qCWarning(GITKLIENT_LOG) << "Main branch is not set to diff";
+ qCWarning(KOMMIT_LOG) << "Main branch is not set to diff";
return;
}
}
diff --git a/src/gui/actions/remotesactions.cpp b/src/gui/actions/remotesactions.cpp
index 25d8e72..92d3f70 100644
--- a/src/gui/actions/remotesactions.cpp
+++ b/src/gui/actions/remotesactions.cpp
@@ -5,7 +5,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
*/
#include "remotesactions.h"
-#include "gitklient_appdebug.h"
+#include "kommit_appdebug.h"
#include <KLocalizedString>
#include <KMessageBox>
@@ -93,5 +93,5 @@ void RemotesActions::rename()
void RemotesActions::update()
{
// TODO implement it.
- qCWarning(GITKLIENT_LOG) << "RemotesActions::update not implemented";
+ qCWarning(KOMMIT_LOG) << "RemotesActions::update not implemented";
}
diff --git a/src/gui/actions/submoduleactions.cpp b/src/gui/actions/submoduleactions.cpp
index 877b242..d360166 100644
--- a/src/gui/actions/submoduleactions.cpp
+++ b/src/gui/actions/submoduleactions.cpp
@@ -12,7 +12,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
#include "gitmanager.h"
#include "models/submodulesmodel.h"
-#include "gitklient_appdebug.h"
+#include "kommit_appdebug.h"
#include <QAction>
#include <KLocalizedString>
@@ -74,16 +74,16 @@ void SubmoduleActions::create()
void SubmoduleActions::deinit()
{
if (KMessageBoxHelper::removeQuestion(mParent, i18n("Are you sure to remove the selected submodule?"), i18n("Remove Submodule"))) {
- qCDebug(GITKLIENT_LOG) << mGit->runGit(
+ qCDebug(KOMMIT_LOG) << mGit->runGit(
{QStringLiteral("submodule"), QStringLiteral("deinit"), QStringLiteral("-f"), QStringLiteral("--"), mSubModuleName});
- qCDebug(GITKLIENT_LOG) << mGit->runGit({QStringLiteral("rm"), mSubModuleName});
+ qCDebug(KOMMIT_LOG) << mGit->runGit({QStringLiteral("rm"), mSubModuleName});
QDir d(mGit->path() + QStringLiteral("/.git/modules/") + mSubModuleName);
if (!d.removeRecursively()) {
KMessageBox::error(mParent, i18n("Unable to remove the module directory"));
return;
}
- qCDebug(GITKLIENT_LOG) << d.path();
+ qCDebug(KOMMIT_LOG) << d.path();
mGit->runGit({QStringLiteral("config"), QStringLiteral("--remove-section"), QStringLiteral("submodule.") + mSubModuleName});
mGit->submodulesModel()->load();
diff --git a/src/gui/appconfig.cpp b/src/gui/appconfig.cpp
index c461bfd..d1f4a60 100644
--- a/src/gui/appconfig.cpp
+++ b/src/gui/appconfig.cpp
@@ -14,13 +14,13 @@ AppConfig::AppConfig(Git::Manager *git)
void AppConfig::apply()
{
- mGit->setConfig(QStringLiteral("alias.klient"), QStringLiteral("!gitklient"), Git::Manager::ConfigGlobal);
- mGit->setConfig(QStringLiteral("alias.gkdiff"), QStringLiteral("'difftool --dir-diff --tool=gitklientdiff'"), Git::Manager::ConfigGlobal);
+ mGit->setConfig(QStringLiteral("alias.klient"), QStringLiteral("!kommit"), Git::Manager::ConfigGlobal);
+ mGit->setConfig(QStringLiteral("alias.gkdiff"), QStringLiteral("'difftool --dir-diff --tool=kommitdiff'"), Git::Manager::ConfigGlobal);
- mGit->setConfig(QStringLiteral("mergetool.gitklientmerge.cmd"),
- QStringLiteral(R"(gitklientmerge "$BASE" "$LOCAL" "$REMOTE" "$MERGED")"),
+ mGit->setConfig(QStringLiteral("mergetool.kommitmerge.cmd"),
+ QStringLiteral(R"(kommitmerge "$BASE" "$LOCAL" "$REMOTE" "$MERGED")"),
Git::Manager::ConfigGlobal);
- mGit->setConfig(QStringLiteral("mergetool.gitklientmerge.trustExitCode"), QStringLiteral("true"), Git::Manager::ConfigGlobal);
+ mGit->setConfig(QStringLiteral("mergetool.kommitmerge.trustExitCode"), QStringLiteral("true"), Git::Manager::ConfigGlobal);
- mGit->setConfig(QStringLiteral("difftool.gitklientdiff.cmd"), QStringLiteral(R"(gitklientdiff "$LOCAL" "$REMOTE")"), Git::Manager::ConfigGlobal);
+ mGit->setConfig(QStringLiteral("difftool.kommitdiff.cmd"), QStringLiteral(R"(kommitdiff "$LOCAL" "$REMOTE")"), Git::Manager::ConfigGlobal);
}
diff --git a/src/gui/appwindow.cpp b/src/gui/appwindow.cpp
index ecd4c77..26207f2 100644
--- a/src/gui/appwindow.cpp
+++ b/src/gui/appwindow.cpp
@@ -64,7 +64,7 @@ void AppWindow::init()
addPage<TagsWidget>(QStringLiteral("view_tags"));
addPage<AuthorsWidget>(QStringLiteral("view_tags"));
- setupGUI(StandardWindowOption::Default, QStringLiteral("gitklientui.rc"));
+ setupGUI(StandardWindowOption::Default, QStringLiteral("kommitui.rc"));
mMainWidget->setCurrentIndex(0);
setCentralWidget(mMainWidget);
@@ -81,7 +81,7 @@ AppWindow::AppWindow()
{
init();
- if (GitKlientSettings::openLastRepo()) {
+ if (KommitSettings::openLastRepo()) {
QSettings s;
auto p = s.value(QStringLiteral("last_repo")).toString();
mGit->setPath(p);
@@ -136,7 +136,7 @@ void AppWindow::settingsUpdated()
{
for (auto &w : mBaseWidgets)
w->settingsUpdated();
- mGit->logsModel()->setCalendarType(GitKlientSettings::calendarType());
+ mGit->logsModel()->setCalendarType(KommitSettings::calendarType());
}
void AppWindow::initActions()
@@ -156,7 +156,7 @@ void AppWindow::initActions()
auto repoStatusAction = actionCollection->addAction(QStringLiteral("repo_status"), this, &AppWindow::repoStatus);
repoStatusAction->setText(i18n("Changed files..."));
- repoStatusAction->setIcon(QIcon::fromTheme(QStringLiteral("gitklient-changedfiles")));
+ repoStatusAction->setIcon(QIcon::fromTheme(QStringLiteral("kommit-changedfiles")));
actionCollection->setDefaultShortcut(repoStatusAction, QKeySequence(Qt::CTRL | Qt::Key_S));
{
diff --git a/src/gui/appwindow.h b/src/gui/appwindow.h
index e4e1133..40a98a3 100644
--- a/src/gui/appwindow.h
+++ b/src/gui/appwindow.h
@@ -8,7 +8,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
#include "core/appmainwindow.h"
-#include "GitKlientSettings.h"
+#include "KommitSettings.h"
class MultiPageWidget;
class WidgetBase;
@@ -19,7 +19,7 @@ namespace Git
class Manager;
}
/**
- * This class serves as the main window for gitklient. It handles the
+ * This class serves as the main window for kommit. It handles the
* menus, toolbars and status bars.
*
* @short Main window class
diff --git a/src/gui/autotests/CMakeLists.txt b/src/gui/autotests/CMakeLists.txt
index 9b7e745..8f744f6 100644
--- a/src/gui/autotests/CMakeLists.txt
+++ b/src/gui/autotests/CMakeLists.txt
@@ -1,13 +1,13 @@
# SPDX-FileCopyrightText: 2022 Laurent Montel <montel at kde.org>
# SPDX-License-Identifier: BSD-3-Clause
-macro(add_libgitklientgui_test _source)
+macro(add_libkommitgui_test _source)
set( _test ${_source})
get_filename_component( _name ${_source} NAME_WE )
add_executable( ${_name} ${_test} ${ARGN} ${_name}.h)
add_test(NAME ${_name} COMMAND ${_name} )
ecm_mark_as_test(${_name})
- target_link_libraries( ${_name} Qt::Test libgitklientgui)
+ target_link_libraries( ${_name} Qt::Test libkommitgui)
endmacro()
-add_libgitklientgui_test(initdialogtest.cpp)
-add_libgitklientgui_test(clonedialogtest.cpp)
-add_libgitklientgui_test(filesstatuseslisttest.cpp)
+add_libkommitgui_test(initdialogtest.cpp)
+add_libkommitgui_test(clonedialogtest.cpp)
+add_libkommitgui_test(filesstatuseslisttest.cpp)
diff --git a/src/gui/commandargsparser.cpp b/src/gui/commandargsparser.cpp
index a6b733b..ec10766 100644
--- a/src/gui/commandargsparser.cpp
+++ b/src/gui/commandargsparser.cpp
@@ -31,7 +31,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
#include "gitmanager.h"
#include "mergewindow.h"
-#include "gitklient_appdebug.h"
+#include "kommit_appdebug.h"
#include <QApplication>
#include <QDir>
#include <QFileInfo>
@@ -132,7 +132,7 @@ ArgParserReturn CommandArgsParser::run(const QStringList &args)
return main();
const auto name = QString(args.at(1)).replace(QLatin1String("-"), QLatin1String("_")).toLocal8Bit();
const auto c = metaObject()->methodCount();
- qCDebug(GITKLIENT_LOG) << "Running" << args;
+ qCDebug(KOMMIT_LOG) << "Running" << args;
for (int i = 0; i < c; i++) {
const auto method = metaObject()->method(i);
@@ -140,7 +140,7 @@ ArgParserReturn CommandArgsParser::run(const QStringList &args)
if (method.parameterCount() != args.size() - 1) {
auto params = args.mid(2);
ArgParserReturn r;
- qCDebug(GITKLIENT_LOG) << "Running:" << method.name();
+ qCDebug(KOMMIT_LOG) << "Running:" << method.name();
auto b = metaObject()->invokeMethod(this,
method.name().constData(),
Q_RETURN_ARG(ArgParserReturn, r),
@@ -156,7 +156,7 @@ ArgParserReturn CommandArgsParser::run(const QStringList &args)
GET_OP(9));
if (!b) {
- qCDebug(GITKLIENT_LOG) << args.size() << method.parameterCount();
+ qCDebug(KOMMIT_LOG) << args.size() << method.parameterCount();
}
return r;
@@ -185,11 +185,11 @@ ArgParserReturn CommandArgsParser::help()
mHelpTexts.insert(name, value);
}
- qCDebug(GITKLIENT_LOG) << "Git Klient command line interface help:";
+ qCDebug(KOMMIT_LOG) << "Git Klient command line interface help:";
for (int i = metaObject()->methodOffset(); i < c; i++) {
auto method = metaObject()->method(i);
- qCDebug(GITKLIENT_LOG).noquote() << " " << method.name() << method.parameterNames().join(" ");
- qCDebug(GITKLIENT_LOG).noquote() << mHelpTexts.value(method.name());
+ qCDebug(KOMMIT_LOG).noquote() << " " << method.name() << method.parameterNames().join(" ");
+ qCDebug(KOMMIT_LOG).noquote() << mHelpTexts.value(method.name());
}
return 0;
}
@@ -348,12 +348,12 @@ ArgParserReturn CommandArgsParser::diff(const QString &file)
ArgParserReturn CommandArgsParser::diff(const QString &file1, const QString &file2)
{
- qCDebug(GITKLIENT_LOG) << file1 << file2;
+ qCDebug(KOMMIT_LOG) << file1 << file2;
QFileInfo fi1(file1);
QFileInfo fi2(file2);
if (fi1.isFile() && fi2.isFile()) {
- qCDebug(GITKLIENT_LOG) << fi1.absoluteFilePath() << fi2.absoluteFilePath();
+ qCDebug(KOMMIT_LOG) << fi1.absoluteFilePath() << fi2.absoluteFilePath();
const Git::File fileLeft(fi1.absoluteFilePath());
const Git::File fileRight(fi2.absoluteFilePath());
auto d = new DiffWindow(fileLeft, fileRight);
diff --git a/src/gui/commandargsparser.h b/src/gui/commandargsparser.h
index f01a5f2..836058d 100644
--- a/src/gui/commandargsparser.h
+++ b/src/gui/commandargsparser.h
@@ -6,7 +6,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
#pragma once
-#include "libgitklientgui_export.h"
+#include "libkommitgui_export.h"
#include <QMap>
#include <QObject>
#include <QString>
@@ -46,7 +46,7 @@ class Manager;
using CommandList = QList<Command>;
#define HelpText(name, text) Q_CLASSINFO("help." #name, text);
-class LIBGITKLIENTGUI_EXPORT CommandArgsParser : public QObject
+class LIBKOMMITGUI_EXPORT CommandArgsParser : public QObject
{
Q_OBJECT
diff --git a/src/gui/core/appdialog.h b/src/gui/core/appdialog.h
index c2cab65..97665d7 100644
--- a/src/gui/core/appdialog.h
+++ b/src/gui/core/appdialog.h
@@ -6,7 +6,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
#pragma once
-#include "libgitklientgui_private_export.h"
+#include "libkommitgui_private_export.h"
#include <QComboBox>
#include <QDialog>
#include <QMetaEnum>
@@ -16,7 +16,7 @@ namespace Git
class Manager;
}
-class LIBGITKLIENTGUI_TESTS_EXPORT AppDialog : public QDialog
+class LIBKOMMITGUI_TESTS_EXPORT AppDialog : public QDialog
{
Q_OBJECT
public:
diff --git a/src/gui/core/appmainwindow.cpp b/src/gui/core/appmainwindow.cpp
index 79cbc22..7429250 100644
--- a/src/gui/core/appmainwindow.cpp
+++ b/src/gui/core/appmainwindow.cpp
@@ -5,7 +5,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
*/
#include "appmainwindow.h"
-#include "gitklient_appdebug.h"
+#include "kommit_appdebug.h"
#include <QCloseEvent>
#include <QEventLoop>
@@ -25,7 +25,7 @@ int AppMainWindow::exec()
showModal();
(void)eventLoop.exec(QEventLoop::DialogExec);
mLoop = nullptr;
- qCDebug(GITKLIENT_LOG) << "returnCode=" << mReturnCode;
+ qCDebug(KOMMIT_LOG) << "returnCode=" << mReturnCode;
return mReturnCode;
}
@@ -63,7 +63,7 @@ void AppMainWindow::setVisible(bool visible)
// void AppMainWindow::closeEvent(QCloseEvent *event)
//{
-// qCDebug(GITKLIENT_LOG) << Q_FUNC_INFO;
+// qCDebug(KOMMIT_LOG) << Q_FUNC_INFO;
// Q_UNUSED(event)
// if (_loop && _loop->isRunning())
// _loop->quit();
diff --git a/src/gui/dialogs/cleanupdialog.ui b/src/gui/dialogs/cleanupdialog.ui
index 585202d..013841d 100644
--- a/src/gui/dialogs/cleanupdialog.ui
+++ b/src/gui/dialogs/cleanupdialog.ui
@@ -14,7 +14,7 @@
<string>Cleanup repo</string>
</property>
<property name="windowIcon">
- <iconset theme="gitklient"/>
+ <iconset theme="kommit"/>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
diff --git a/src/gui/dialogs/clonedialog.h b/src/gui/dialogs/clonedialog.h
index 86af950..d8f5d38 100644
--- a/src/gui/dialogs/clonedialog.h
+++ b/src/gui/dialogs/clonedialog.h
@@ -7,12 +7,12 @@ SPDX-License-Identifier: GPL-3.0-or-later
#pragma once
#include "core/appdialog.h"
-#include "libgitklientgui_private_export.h"
+#include "libkommitgui_private_export.h"
#include "ui_clonedialog.h"
#include "commands/commandclone.h"
-class LIBGITKLIENTGUI_TESTS_EXPORT CloneDialog : public AppDialog, private Ui::CloneDialog
+class LIBKOMMITGUI_TESTS_EXPORT CloneDialog : public AppDialog, private Ui::CloneDialog
{
Q_OBJECT
diff --git a/src/gui/dialogs/clonedialog.ui b/src/gui/dialogs/clonedialog.ui
index 6a0b37c..2d93260 100644
--- a/src/gui/dialogs/clonedialog.ui
+++ b/src/gui/dialogs/clonedialog.ui
@@ -14,7 +14,7 @@
<string>Clone a repository</string>
</property>
<property name="windowIcon">
- <iconset theme="gitklient">
+ <iconset theme="kommit">
<normaloff>.</normaloff>.</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
diff --git a/src/gui/dialogs/diffopendialog.ui b/src/gui/dialogs/diffopendialog.ui
index 93a5a69..f4ab068 100644
--- a/src/gui/dialogs/diffopendialog.ui
+++ b/src/gui/dialogs/diffopendialog.ui
@@ -14,7 +14,7 @@
<string>Select files/folders</string>
</property>
<property name="windowIcon">
- <iconset theme="gitklient">
+ <iconset theme="kommit">
<normaloff>.</normaloff>.</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
diff --git a/src/gui/dialogs/fetchdialog.ui b/src/gui/dialogs/fetchdialog.ui
index b71fa30..15b232c 100644
--- a/src/gui/dialogs/fetchdialog.ui
+++ b/src/gui/dialogs/fetchdialog.ui
@@ -14,7 +14,7 @@
<string>Fetch from origin</string>
</property>
<property name="windowIcon">
- <iconset theme="gitklient"/>
+ <iconset theme="kommit"/>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
diff --git a/src/gui/dialogs/filestreedialog.ui b/src/gui/dialogs/filestreedialog.ui
index 84a7b57..01e9fd5 100644
--- a/src/gui/dialogs/filestreedialog.ui
+++ b/src/gui/dialogs/filestreedialog.ui
@@ -14,7 +14,7 @@
<string>Dialog</string>
</property>
<property name="windowIcon">
- <iconset theme="gitklient">
+ <iconset theme="kommit">
<normaloff>.</normaloff>.</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
diff --git a/src/gui/dialogs/fileviewerdialog.cpp b/src/gui/dialogs/fileviewerdialog.cpp
index ca4ef65..92a9278 100644
--- a/src/gui/dialogs/fileviewerdialog.cpp
+++ b/src/gui/dialogs/fileviewerdialog.cpp
@@ -13,7 +13,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
#include <KStandardAction>
#include <KXMLGUIFactory>
-#include "gitklient_appdebug.h"
+#include "kommit_appdebug.h"
#include <QFile>
#include <QMimeData>
#include <QMimeDatabase>
@@ -38,7 +38,7 @@ FileViewerDialog::FileViewerDialog(Git::Manager *git, const Git::File &file, QWi
restoreGeometry(s.value(QStringLiteral("FileViewerDialog_Geometry")).toByteArray());
KStandardAction::close(this, &QMainWindow::close, actionCollection());
- setupGUI(ToolBar, QStringLiteral("gitklientfileviewerui.rc"));
+ setupGUI(ToolBar, QStringLiteral("kommitfileviewerui.rc"));
}
FileViewerDialog::~FileViewerDialog()
@@ -103,14 +103,14 @@ void FileViewerDialog::showFile(const Git::File &file)
else {
if (!ptr || !ptr->isValid()) {
showInEditor(file);
- qCDebug(GITKLIENT_LOG) << "fallback to text mode";
+ qCDebug(KOMMIT_LOG) << "fallback to text mode";
} else {
file.save(mFilePath);
if (!viewInInternalViewer(ptr, mFilePath, mime))
showInEditor(file);
}
}
- qCDebug(GITKLIENT_LOG) << "mime is" << mime.name() << fn << mimeDatabase.suffixForFileName(fn) << stackedWidget->currentIndex();
+ qCDebug(KOMMIT_LOG) << "mime is" << mime.name() << fn << mimeDatabase.suffixForFileName(fn) << stackedWidget->currentIndex();
}
void FileViewerDialog::showInEditor(const Git::File &file)
@@ -140,9 +140,9 @@ KService::Ptr FileViewerDialog::getInternalViewer(const QString &mimeType)
// Try to get a read-only kpart for the internal viewer
KService::List offers = KMimeTypeTrader::self()->query(mimeType, QStringLiteral("KParts/ReadOnlyPart"));
- qCDebug(GITKLIENT_LOG) << offers.size() << "offer(s) found for" << mimeType;
+ qCDebug(KOMMIT_LOG) << offers.size() << "offer(s) found for" << mimeType;
for (const auto &offer : std::as_const(offers))
- qCDebug(GITKLIENT_LOG) << " *" << offer->name() << offer->genericName();
+ qCDebug(KOMMIT_LOG) << " *" << offer->name() << offer->genericName();
/*auto arkPartIt = std::find_if(offers.begin(), offers.end(), [](KService::Ptr service) {
return service->storageId() == QLatin1String("ark_part.desktop");
});
@@ -189,7 +189,7 @@ void FileViewerDialog::keyPressEvent(QKeyEvent *event)
KService::Ptr FileViewerDialog::getExternalViewer(const QString &mimeType)
{
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
- qCDebug(GITKLIENT_LOG) << mimeType;
+ qCDebug(KOMMIT_LOG) << mimeType;
const KService::List offers = KMimeTypeTrader::self()->query(mimeType);
if (!offers.isEmpty()) {
@@ -216,7 +216,7 @@ bool FileViewerDialog::viewInInternalViewer(const KService::Ptr &viewer, const Q
m_part = viewer->createInstance<KParts::ReadOnlyPart>(widgetContainer, widgetContainer, QVariantList(), &error);
if (!m_part.data()) {
- qCDebug(GITKLIENT_LOG) << "m_part is null" << error;
+ qCDebug(KOMMIT_LOG) << "m_part is null" << error;
return false;
}
diff --git a/src/gui/dialogs/ignorefiledialog.cpp b/src/gui/dialogs/ignorefiledialog.cpp
index 957b115..7b1954a 100644
--- a/src/gui/dialogs/ignorefiledialog.cpp
+++ b/src/gui/dialogs/ignorefiledialog.cpp
@@ -8,7 +8,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
#include "gitmanager.h"
-#include "gitklient_appdebug.h"
+#include "kommit_appdebug.h"
#include <QFileInfo>
#include <QPushButton>
@@ -66,7 +66,7 @@ void IgnoreFileDialog::generateIgnorePattern()
s = mPath + s;
lineEdit->setText(s);
- qCDebug(GITKLIENT_LOG) << getIgnoreFile();
+ qCDebug(KOMMIT_LOG) << getIgnoreFile();
}
void IgnoreFileDialog::slotAccept()
diff --git a/src/gui/dialogs/ignorefiledialog.ui b/src/gui/dialogs/ignorefiledialog.ui
index aaa17b7..707c0a6 100644
--- a/src/gui/dialogs/ignorefiledialog.ui
+++ b/src/gui/dialogs/ignorefiledialog.ui
@@ -14,7 +14,7 @@
<string>Ignore file</string>
</property>
<property name="windowIcon">
- <iconset theme="gitklient"/>
+ <iconset theme="kommit"/>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
diff --git a/src/gui/dialogs/initdialog.h b/src/gui/dialogs/initdialog.h
index c663d5d..01b890f 100644
--- a/src/gui/dialogs/initdialog.h
+++ b/src/gui/dialogs/initdialog.h
@@ -7,10 +7,10 @@ SPDX-License-Identifier: GPL-3.0-or-later
#pragma once
#include "core/appdialog.h"
-#include "libgitklientgui_private_export.h"
+#include "libkommitgui_private_export.h"
#include "ui_initdialog.h"
-class LIBGITKLIENTGUI_TESTS_EXPORT InitDialog : public AppDialog, private Ui::InitDialog
+class LIBKOMMITGUI_TESTS_EXPORT InitDialog : public AppDialog, private Ui::InitDialog
{
Q_OBJECT
diff --git a/src/gui/dialogs/initdialog.ui b/src/gui/dialogs/initdialog.ui
index 0eed7ec..184dbed 100644
--- a/src/gui/dialogs/initdialog.ui
+++ b/src/gui/dialogs/initdialog.ui
@@ -14,7 +14,7 @@
<string>Init git repo</string>
</property>
<property name="windowIcon">
- <iconset theme="gitklient">
+ <iconset theme="kommit">
<normaloff>.</normaloff>.</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
diff --git a/src/gui/dialogs/mergeopenfilesdialog.ui b/src/gui/dialogs/mergeopenfilesdialog.ui
index 90cc2f0..e00519c 100644
--- a/src/gui/dialogs/mergeopenfilesdialog.ui
+++ b/src/gui/dialogs/mergeopenfilesdialog.ui
@@ -14,7 +14,7 @@
<string>Select files to merge</string>
</property>
<property name="windowIcon">
- <iconset theme="gitklient">
+ <iconset theme="kommit">
<normaloff>.</normaloff>.</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
diff --git a/src/gui/dialogs/notedialog.ui b/src/gui/dialogs/notedialog.ui
index 8a00ec9..314897d 100644
--- a/src/gui/dialogs/notedialog.ui
+++ b/src/gui/dialogs/notedialog.ui
@@ -14,7 +14,7 @@
<string>Note</string>
</property>
<property name="windowIcon">
- <iconset theme="gitklient"/>
+ <iconset theme="kommit"/>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
diff --git a/src/gui/dialogs/reposettingsdialog.ui b/src/gui/dialogs/reposettingsdialog.ui
index 3e69805..00ce5b5 100644
--- a/src/gui/dialogs/reposettingsdialog.ui
+++ b/src/gui/dialogs/reposettingsdialog.ui
@@ -14,7 +14,7 @@
<string>Repo settings</string>
</property>
<property name="windowIcon">
- <iconset theme="gitklient">
+ <iconset theme="kommit">
<normaloff>.</normaloff>.</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
diff --git a/src/gui/dialogs/runnerdialog.cpp b/src/gui/dialogs/runnerdialog.cpp
index e101809..dfb99e6 100644
--- a/src/gui/dialogs/runnerdialog.cpp
+++ b/src/gui/dialogs/runnerdialog.cpp
@@ -11,7 +11,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
#include <KLocalizedString>
#include <KMessageBox>
-#include "gitklient_appdebug.h"
+#include "kommit_appdebug.h"
RunnerDialog::RunnerDialog(Git::Manager *git, QWidget *parent)
: AppDialog(parent)
diff --git a/src/gui/dialogs/runnerdialog.ui b/src/gui/dialogs/runnerdialog.ui
index 1f4297a..4185b30 100644
--- a/src/gui/dialogs/runnerdialog.ui
+++ b/src/gui/dialogs/runnerdialog.ui
@@ -14,7 +14,7 @@
<string>Run command</string>
</property>
<property name="windowIcon">
- <iconset theme="gitklient">
+ <iconset theme="kommit">
<normaloff>.</normaloff>.</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
diff --git a/src/gui/dialogs/searchdialog.ui b/src/gui/dialogs/searchdialog.ui
index e491804..4908263 100644
--- a/src/gui/dialogs/searchdialog.ui
+++ b/src/gui/dialogs/searchdialog.ui
@@ -14,7 +14,7 @@
<string>Search in repo</string>
</property>
<property name="windowIcon">
- <iconset theme="gitklient"/>
+ <iconset theme="kommit"/>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
diff --git a/src/gui/dialogs/selectbranchestodiffdialog.ui b/src/gui/dialogs/selectbranchestodiffdialog.ui
index 3dd7f48..17bd3f6 100644
--- a/src/gui/dialogs/selectbranchestodiffdialog.ui
+++ b/src/gui/dialogs/selectbranchestodiffdialog.ui
@@ -14,7 +14,7 @@
<string>Select branches</string>
</property>
<property name="windowIcon">
- <iconset theme="gitklient">
+ <iconset theme="kommit">
<normaloff>.</normaloff>.</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
diff --git a/src/gui/dialogs/switchbranchdialog.cpp b/src/gui/dialogs/switchbranchdialog.cpp
index 35f3050..b2ce069 100644
--- a/src/gui/dialogs/switchbranchdialog.cpp
+++ b/src/gui/dialogs/switchbranchdialog.cpp
@@ -6,8 +6,8 @@ SPDX-License-Identifier: GPL-3.0-or-later
#include "switchbranchdialog.h"
#include "commands/commandswitchbranch.h"
-#include "gitklient_appdebug.h"
#include "gitmanager.h"
+#include "kommit_appdebug.h"
#include "models/tagsmodel.h"
#include <QDebug>
@@ -43,7 +43,7 @@ Git::CommandSwitchBranch *SwitchBranchDialog::command() const
} else {
auto n = comboBoxBranchSelect->currentText().indexOf("/");
if (n == -1) {
- qCWarning(GITKLIENT_LOG, "The branch name %s is invalid", qPrintable(comboBoxBranchSelect->currentText()));
+ qCWarning(KOMMIT_LOG, "The branch name %s is invalid", qPrintable(comboBoxBranchSelect->currentText()));
return nullptr;
}
diff --git a/src/gui/dialogs/switchbranchdialog.ui b/src/gui/dialogs/switchbranchdialog.ui
index 9bf3309..91dc4e7 100644
--- a/src/gui/dialogs/switchbranchdialog.ui
+++ b/src/gui/dialogs/switchbranchdialog.ui
@@ -14,7 +14,7 @@
<string>Switch/Checkout</string>
</property>
<property name="windowIcon">
- <iconset theme="gitklient">
+ <iconset theme="kommit">
<normaloff>.</normaloff>.</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
diff --git a/src/gui/diffwindow.cpp b/src/gui/diffwindow.cpp
index 6c3bcec..0a9726a 100644
--- a/src/gui/diffwindow.cpp
+++ b/src/gui/diffwindow.cpp
@@ -73,7 +73,7 @@ DiffWindow::DiffWindow(Git::Manager *git, const QString &oldBranch, const QStrin
for (auto &f : diffs) {
mDiffModel->addFile(f);
- // qCDebug(GITKLIENT_LOG) << f.name() << f.status();
+ // qCDebug(KOMMIT_LOG) << f.name() << f.status();
mFilesModel->append(f.name());
}
mLeftStorage = mRightStorage = Git;
@@ -103,7 +103,7 @@ void DiffWindow::init(bool showSideBar)
mapper->addTextEdit(mDiffWidget->oldCodeEditor());
mapper->addTextEdit(mDiffWidget->newCodeEditor());
- setWindowTitle(i18nc("@title:window", "GitKlient Diff[*]"));
+ setWindowTitle(i18nc("@title:window", "Kommit Diff[*]"));
mDock = new QDockWidget(this);
mDock->setWindowTitle(i18nc("@title:window", "Tree"));
@@ -121,7 +121,7 @@ void DiffWindow::init(bool showSideBar)
//_treeView->setDiffModel(_diffModel, _filesModel);
initActions();
- setupGUI(StandardWindowOption::Default, QStringLiteral("gitklientdiffui.rc"));
+ setupGUI(StandardWindowOption::Default, QStringLiteral("kommitdiffui.rc"));
mDock->setVisible(showSideBar);
diff --git a/src/gui/gitklient.qrc b/src/gui/gitklient.qrc
deleted file mode 100644
index ebeca35..0000000
--- a/src/gui/gitklient.qrc
+++ /dev/null
@@ -1,8 +0,0 @@
-<RCC>
- <qresource prefix="/kxmlgui5/gitklient">
- <file>gitklientdiffui.rc</file>
- <file>gitklientfileviewerui.rc</file>
- <file>gitklientmergeui.rc</file>
- <file>gitklientui.rc</file>
- </qresource>
-</RCC>
diff --git a/src/gui/kommit.qrc b/src/gui/kommit.qrc
new file mode 100644
index 0000000..49746b6
--- /dev/null
+++ b/src/gui/kommit.qrc
@@ -0,0 +1,8 @@
+<RCC>
+ <qresource prefix="/kxmlgui5/kommit">
+ <file>kommitdiffui.rc</file>
+ <file>kommitfileviewerui.rc</file>
+ <file>kommitmergeui.rc</file>
+ <file>kommitui.rc</file>
+ </qresource>
+</RCC>
diff --git a/src/gui/gitklientdiffui.rc b/src/gui/kommitdiffui.rc
similarity index 97%
rename from src/gui/gitklientdiffui.rc
rename to src/gui/kommitdiffui.rc
index f1beac4..1986849 100644
--- a/src/gui/gitklientdiffui.rc
+++ b/src/gui/kommitdiffui.rc
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<gui name="gitklient"
+<gui name="kommitdiff"
version="1"
xmlns="http://www.kde.org/standards/kxmlgui/1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/src/gui/gitklientfileviewerui.rc b/src/gui/kommitfileviewerui.rc
similarity index 93%
rename from src/gui/gitklientfileviewerui.rc
rename to src/gui/kommitfileviewerui.rc
index fdcc981..b2d5f3e 100644
--- a/src/gui/gitklientfileviewerui.rc
+++ b/src/gui/kommitfileviewerui.rc
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<gui name="gitklient"
+<gui name="kommitfileviewer"
version="1"
xmlns="http://www.kde.org/standards/kxmlgui/1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/src/gui/gitklientmergeui.rc b/src/gui/kommitmergeui.rc
similarity index 98%
rename from src/gui/gitklientmergeui.rc
rename to src/gui/kommitmergeui.rc
index 662bf8d..b49109e 100644
--- a/src/gui/gitklientmergeui.rc
+++ b/src/gui/kommitmergeui.rc
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<gui name="gitklient"
+<gui name="kommitmerge"
version="2"
xmlns="http://www.kde.org/standards/kxmlgui/1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/src/gui/gitklientmergeview.ui b/src/gui/kommitmergeview.ui
similarity index 100%
rename from src/gui/gitklientmergeview.ui
rename to src/gui/kommitmergeview.ui
diff --git a/src/gui/gitklientui.rc b/src/gui/kommitui.rc
similarity index 98%
rename from src/gui/gitklientui.rc
rename to src/gui/kommitui.rc
index e338895..e2e743a 100644
--- a/src/gui/gitklientui.rc
+++ b/src/gui/kommitui.rc
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<gui name="gitklient"
+<gui name="kommit"
version="2"
xmlns="http://www.kde.org/standards/kxmlgui/1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/src/gui/libgitklientgui_private_export.h b/src/gui/libkommitgui_private_export.h
similarity index 63%
rename from src/gui/libgitklientgui_private_export.h
rename to src/gui/libkommitgui_private_export.h
index 43d6196..c2d90f9 100644
--- a/src/gui/libgitklientgui_private_export.h
+++ b/src/gui/libkommitgui_private_export.h
@@ -6,13 +6,13 @@
#pragma once
-#include "libgitklientgui_export.h"
+#include "libkommitgui_export.h"
/* Classes which are exported only for unit tests */
#ifdef BUILD_TESTING
-#ifndef LIBGITKLIENTGUI_TESTS_EXPORT
-#define LIBGITKLIENTGUI_TESTS_EXPORT LIBGITKLIENTGUI_EXPORT
+#ifndef LIBKOMMITGUI_TESTS_EXPORT
+#define LIBKOMMITGUI_TESTS_EXPORT LIBKOMMITGUI_EXPORT
#endif
#else /* not compiling tests */
-#define LIBGITKLIENTGUI_TESTS_EXPORT
+#define LIBKOMMITGUI_TESTS_EXPORT
#endif
diff --git a/src/gui/mainwidget.cpp b/src/gui/mainwidget.cpp
index 776040b..f94ed5b 100644
--- a/src/gui/mainwidget.cpp
+++ b/src/gui/mainwidget.cpp
@@ -10,7 +10,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
#include "diffwindow.h"
#include "models/treemodel.h"
-#include "gitklient_appdebug.h"
+#include "kommit_appdebug.h"
#include <QMenu>
#include <QToolButton>
@@ -118,7 +118,7 @@ void MainWidget::listButton_clicked()
return;
int index = btn->property("listIndex").toInt();
- qCDebug(GITKLIENT_LOG) << index << "clicked";
+ qCDebug(KOMMIT_LOG) << index << "clicked";
btn->setChecked(true);
stackedWidget->setCurrentIndex(index);
}
diff --git a/src/gui/merge/CMakeLists.txt b/src/gui/merge/CMakeLists.txt
index b137125..02baaa4 100644
--- a/src/gui/merge/CMakeLists.txt
+++ b/src/gui/merge/CMakeLists.txt
@@ -1,13 +1,13 @@
-set(gitklient_SRCS
- ${gitklient_SRCS}
- ${CMAKE_CURRENT_SOURCE_DIR}/gitklientmergewindow.cpp
+set(kommit_SRCS
+ ${kommit_SRCS}
+ ${CMAKE_CURRENT_SOURCE_DIR}/kommitmergewindow.cpp
${CMAKE_CURRENT_SOURCE_DIR}/closeeventdialog.cpp
${CMAKE_CURRENT_SOURCE_DIR}/openfilesdialog.cpp
PARENT_SCOPE
)
ki18n_wrap_ui(
- ${CMAKE_CURRENT_SOURCE_DIR}/gitklientmergeview.ui
+ ${CMAKE_CURRENT_SOURCE_DIR}/kommitmergeview.ui
${CMAKE_CURRENT_SOURCE_DIR}/closeeventdialog.ui
${CMAKE_CURRENT_SOURCE_DIR}/openfilesdialog.ui
)
diff --git a/src/gui/mergewindow.cpp b/src/gui/mergewindow.cpp
index 1396bfb..7b8752e 100644
--- a/src/gui/mergewindow.cpp
+++ b/src/gui/mergewindow.cpp
@@ -16,7 +16,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
#include <KLocalizedString>
#include <KMessageBox>
-#include "gitklient_appdebug.h"
+#include "kommit_appdebug.h"
#include <QFile>
#include <QFileInfo>
#include <QLabel>
@@ -119,7 +119,7 @@ void MergeWindow::init()
actionViewBlocks_clicked();
- setupGUI(Default, QStringLiteral("gitklientmergeui.rc"));
+ setupGUI(Default, QStringLiteral("kommitmergeui.rc"));
}
void MergeWindow::fillSegments()
@@ -543,7 +543,7 @@ void MergeWindow::setFilePathLocal(const QString &newFilePathLocal)
void MergeWindow::slotPlainTextEditResultTextChanged()
{
- qCDebug(GITKLIENT_LOG) << "**********************";
+ qCDebug(KOMMIT_LOG) << "**********************";
// auto segment = static_cast<Diff::MergeSegment *>(_mapper->currentSegment());
// if (segment) {
// segment->mergeType = Diff::MergeCustom;
diff --git a/src/gui/mergewindow.h b/src/gui/mergewindow.h
index d47a788..d59645d 100644
--- a/src/gui/mergewindow.h
+++ b/src/gui/mergewindow.h
@@ -6,7 +6,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
#pragma once
#include "core/appmainwindow.h"
-#include "ui_gitklientmergeview.h"
+#include "ui_kommitmergeview.h"
#include <diff.h>
namespace Git
diff --git a/src/gui/models/changedfilesmodel.cpp b/src/gui/models/changedfilesmodel.cpp
index 4b501fd..9dd8d10 100644
--- a/src/gui/models/changedfilesmodel.cpp
+++ b/src/gui/models/changedfilesmodel.cpp
@@ -8,7 +8,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
#include "gitmanager.h"
-#include <GitKlientSettings.h>
+#include <KommitSettings.h>
#include <QIcon>
#include <QPainter>
#include <QPixmap>
diff --git a/src/gui/models/difftreemodel.cpp b/src/gui/models/difftreemodel.cpp
index 9fca7ca..c8e199f 100644
--- a/src/gui/models/difftreemodel.cpp
+++ b/src/gui/models/difftreemodel.cpp
@@ -6,7 +6,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
#include "difftreemodel.h"
-#include <GitKlientSettings.h>
+#include <KommitSettings.h>
DiffTreeModel::DiffTreeModel(QObject *parent)
: TreeModel(parent)
@@ -69,11 +69,11 @@ QColor textColor(Diff::DiffType status)
{
switch (status) {
case Diff::DiffType::Added:
- return GitKlientSettings::self()->diffAddedColor();
+ return KommitSettings::self()->diffAddedColor();
case Diff::DiffType::Modified:
- return GitKlientSettings::self()->diffModifiedColor();
+ return KommitSettings::self()->diffModifiedColor();
case Diff::DiffType::Removed:
- return GitKlientSettings::self()->diffRemovedColor();
+ return KommitSettings::self()->diffRemovedColor();
case Diff::DiffType::Unchanged:
return {};
}
@@ -86,11 +86,11 @@ QColor DiffTreeModel::statusColor(Diff::DiffType status) const
case Diff::DiffType::Unchanged:
return Qt::black;
case Diff::DiffType::Added:
- return GitKlientSettings::diffAddedColor();
+ return KommitSettings::diffAddedColor();
case Diff::DiffType::Removed:
- return GitKlientSettings::diffRemovedColor();
+ return KommitSettings::diffRemovedColor();
case Diff::DiffType::Modified:
- return GitKlientSettings::diffModifiedColor();
+ return KommitSettings::diffModifiedColor();
}
return {};
}
diff --git a/src/gui/models/treemodel.cpp b/src/gui/models/treemodel.cpp
index 88676c1..60c3d72 100644
--- a/src/gui/models/treemodel.cpp
+++ b/src/gui/models/treemodel.cpp
@@ -6,7 +6,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
#include "treemodel.h"
-#include "gitklient_appdebug.h"
+#include "kommit_appdebug.h"
#include <QModelIndex>
#include <KLocalizedString>
@@ -282,7 +282,7 @@ void TreeModel::getFullPath(QString &path, Node *node) const
void TreeModel::sortNode(Node *node)
{
- qCDebug(GITKLIENT_LOG) << "Sorting" << node->title;
+ qCDebug(KOMMIT_LOG) << "Sorting" << node->title;
std::sort(node->childs.begin(), node->childs.end(), [](Node *l, Node *r) {
if (l->childs.empty() && !r->childs.empty())
return false;
diff --git a/src/gui/settings/GitKlientSettings.kcfg b/src/gui/settings/KommitSettings.kcfg
similarity index 97%
rename from src/gui/settings/GitKlientSettings.kcfg
rename to src/gui/settings/KommitSettings.kcfg
index 1043121..9cc98e0 100644
--- a/src/gui/settings/GitKlientSettings.kcfg
+++ b/src/gui/settings/KommitSettings.kcfg
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
- <kcfgfile name="GitKlientSettings"/>
+ <kcfgfile name="KommitSettings"/>
<group name="Preferences">
<entry name="diffAddedColor" type="Color">
<label>Added color</label>
diff --git a/src/gui/settings/GitKlientSettings.kcfgc b/src/gui/settings/KommitSettings.kcfgc
similarity index 73%
rename from src/gui/settings/GitKlientSettings.kcfgc
rename to src/gui/settings/KommitSettings.kcfgc
index 3b821bb..3ffa8ae 100644
--- a/src/gui/settings/GitKlientSettings.kcfgc
+++ b/src/gui/settings/KommitSettings.kcfgc
@@ -1,6 +1,6 @@
# Code generation options for kconfig_compiler
-File=GitKlientSettings.kcfg
-ClassName=GitKlientSettings
+File=KommitSettings.kcfg
+ClassName=KommitSettings
Singleton=true
# will create the necessary code for setting those variables
Mutators=calendarType,openLastRepo
diff --git a/src/gui/settings/settingsmanager.cpp b/src/gui/settings/settingsmanager.cpp
index 7f60f14..c1a6038 100644
--- a/src/gui/settings/settingsmanager.cpp
+++ b/src/gui/settings/settingsmanager.cpp
@@ -6,7 +6,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
#include "settingsmanager.h"
-#include "GitKlientSettings.h"
+#include "KommitSettings.h"
#include "gitmanager.h"
#include <QCalendar>
@@ -24,24 +24,24 @@ SettingsManager::SettingsManager(Git::Manager *git, QWidget *parentWidget)
void SettingsManager::settingsChanged()
{
- GitKlientSettings::setCalendarType(pageBase.kcfg_calendarTypeIndex->currentText());
- GitKlientSettings::self()->save();
+ KommitSettings::setCalendarType(pageBase.kcfg_calendarTypeIndex->currentText());
+ KommitSettings::self()->save();
mGit->setConfig(QStringLiteral("http.proxy"), pageGit.lineEditGitProxy->text(), Git::Manager::ConfigGlobal);
- if (GitKlientSettings::registerDiffTool()) {
- mGit->setConfig(QStringLiteral("difftool.gitklientdiff.cmd"), QStringLiteral("gitklientdiff \"$LOCAL\" \"$REMOTE\""), Git::Manager::ConfigGlobal);
+ if (KommitSettings::registerDiffTool()) {
+ mGit->setConfig(QStringLiteral("difftool.kommitdiff.cmd"), QStringLiteral("kommitdiff \"$LOCAL\" \"$REMOTE\""), Git::Manager::ConfigGlobal);
} else {
- mGit->unsetConfig(QStringLiteral("difftool.gitklientdiff.cmd"), Git::Manager::ConfigGlobal);
+ mGit->unsetConfig(QStringLiteral("difftool.kommitdiff.cmd"), Git::Manager::ConfigGlobal);
}
- if (GitKlientSettings::registerMergeTool()) {
- mGit->setConfig(QStringLiteral("mergetool.gitklientmerge.cmd"),
- QStringLiteral("gitklientmerge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\""),
+ if (KommitSettings::registerMergeTool()) {
+ mGit->setConfig(QStringLiteral("mergetool.kommitmerge.cmd"),
+ QStringLiteral("kommitmerge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\""),
Git::Manager::ConfigGlobal);
- mGit->setConfig(QStringLiteral("mergetool.gitklientmerge.trustExitCode"), QStringLiteral("true"), Git::Manager::ConfigGlobal);
+ mGit->setConfig(QStringLiteral("mergetool.kommitmerge.trustExitCode"), QStringLiteral("true"), Git::Manager::ConfigGlobal);
} else {
- mGit->unsetConfig(QStringLiteral("mergetool.gitklientmerge.cmd"), Git::Manager::ConfigGlobal);
- mGit->unsetConfig(QStringLiteral("mergetool.gitklientmerge.trustExitCode"), Git::Manager::ConfigGlobal);
+ mGit->unsetConfig(QStringLiteral("mergetool.kommitmerge.cmd"), Git::Manager::ConfigGlobal);
+ mGit->unsetConfig(QStringLiteral("mergetool.kommitmerge.trustExitCode"), Git::Manager::ConfigGlobal);
}
Q_EMIT settingsUpdated();
@@ -60,7 +60,7 @@ QWidget *SettingsManager::createBasePage()
auto availableCalendars = QCalendar::availableCalendars();
std::sort(availableCalendars.begin(), availableCalendars.end());
pageBase.kcfg_calendarTypeIndex->addItems(availableCalendars);
- pageBase.kcfg_calendarTypeIndex->setCurrentText(GitKlientSettings::calendarType());
+ pageBase.kcfg_calendarTypeIndex->setCurrentText(KommitSettings::calendarType());
return w;
}
QWidget *SettingsManager::createDiffPage()
@@ -88,7 +88,7 @@ void SettingsManager::exec(QWidget *parentWidget)
return;
}
- dialog = new KConfigDialog(parentWidget, name, GitKlientSettings::self());
+ dialog = new KConfigDialog(parentWidget, name, KommitSettings::self());
dialog->addPage(createBasePage(), i18n("General"), QStringLiteral("package_setting"));
dialog->addPage(createDiffPage(), i18n("Diff"), QStringLiteral("package_setting"));
diff --git a/src/gui/settings/settingspagegit.ui b/src/gui/settings/settingspagegit.ui
index 8f681dd..f55fc7a 100644
--- a/src/gui/settings/settingspagegit.ui
+++ b/src/gui/settings/settingspagegit.ui
@@ -16,14 +16,14 @@
<item>
<widget class="QCheckBox" name="kcfg_registerDiffTool">
<property name="text">
- <string>Register GitKlient diff tool</string>
+ <string>Register kommit diff tool</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="kcfg_registerMergeTool">
<property name="text">
- <string>Register GitKlient merge tool</string>
+ <string>Register kommit merge tool</string>
</property>
</widget>
</item>
diff --git a/src/gui/widgets/authorswidget.h b/src/gui/widgets/authorswidget.h
index 99f7b5a..43681a0 100644
--- a/src/gui/widgets/authorswidget.h
+++ b/src/gui/widgets/authorswidget.h
@@ -5,11 +5,11 @@ SPDX-License-Identifier: GPL-3.0-or-later
*/
#pragma once
-#include "libgitklientgui_private_export.h"
+#include "libkommitgui_private_export.h"
#include "ui_authorswidget.h"
#include "widgetbase.h"
-class LIBGITKLIENTGUI_TESTS_EXPORT AuthorsWidget : public WidgetBase, private Ui::AuthorsWidget
+class LIBKOMMITGUI_TESTS_EXPORT AuthorsWidget : public WidgetBase, private Ui::AuthorsWidget
{
Q_OBJECT
diff --git a/src/gui/widgets/codeeditor.cpp b/src/gui/widgets/codeeditor.cpp
index 9013d1c..e9bbc94 100644
--- a/src/gui/widgets/codeeditor.cpp
+++ b/src/gui/widgets/codeeditor.cpp
@@ -5,9 +5,9 @@ SPDX-License-Identifier: GPL-3.0-or-later
*/
#include "codeeditor.h"
-#include "GitKlientSettings.h"
+#include "KommitSettings.h"
#include "codeeditorsidebar.h"
-#include "gitklient_appdebug.h"
+#include "kommit_appdebug.h"
#include <KSyntaxHighlighting/Definition>
#include <KSyntaxHighlighting/FoldingRegion>
@@ -73,9 +73,9 @@ CodeEditor::CodeEditor(QWidget *parent)
QTextBlockFormat normalFormat, addedFormat, removedFormat, changedFormat, highlightFormat, emptyFormat, oddFormat, evenFormat;
- addedFormat.setBackground(GitKlientSettings::diffAddedColor());
- removedFormat.setBackground(GitKlientSettings::diffRemovedColor());
- changedFormat.setBackground(GitKlientSettings::diffModifiedColor());
+ addedFormat.setBackground(KommitSettings::diffAddedColor());
+ removedFormat.setBackground(KommitSettings::diffRemovedColor());
+ changedFormat.setBackground(KommitSettings::diffModifiedColor());
highlightFormat.setBackground(Qt::yellow);
emptyFormat.setBackground(Qt::gray);
oddFormat.setBackground(QColor(200, 150, 150, 100));
@@ -449,7 +449,7 @@ QPair<int, int> CodeEditor::blockArea(int from, int to)
{
auto firstBlock = document()->findBlockByLineNumber(from);
auto secondBlock = document()->findBlockByLineNumber(to);
- // qCDebug(GITKLIENT_LOG) << from << " to " << to << firstBlock.text() << secondBlock.text();
+ // qCDebug(KOMMIT_LOG) << from << " to " << to << firstBlock.text() << secondBlock.text();
int top = qRound(blockBoundingGeometry(firstBlock).translated(contentOffset()).top());
int bottom;
@@ -536,9 +536,9 @@ void CodeEditor::highlightSegment(Diff::Segment *segment)
}
// _currentSegment = segment;
mSideBar->update();
- qCDebug(GITKLIENT_LOG) << mCurrentSegment;
+ qCDebug(KOMMIT_LOG) << mCurrentSegment;
return;
- qCDebug(GITKLIENT_LOG) << "Segment not found";
+ qCDebug(KOMMIT_LOG) << "Segment not found";
}
void CodeEditor::clearAll()
diff --git a/src/gui/widgets/commitswidget.cpp b/src/gui/widgets/commitswidget.cpp
index 4d0e277..260f48c 100644
--- a/src/gui/widgets/commitswidget.cpp
+++ b/src/gui/widgets/commitswidget.cpp
@@ -15,7 +15,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
#include "models/logsmodel.h"
#include "models/treemodel.h"
-#include <GitKlientSettings.h>
+#include <KommitSettings.h>
CommitsWidget::CommitsWidget(Git::Manager *git, AppWindow *parent)
: WidgetBase(git, parent)
@@ -56,7 +56,7 @@ void CommitsWidget::restoreState(QSettings &settings)
void CommitsWidget::settingsUpdated()
{
- mHistoryModel->setCalendarType(GitKlientSettings::calendarType());
+ mHistoryModel->setCalendarType(KommitSettings::calendarType());
}
void CommitsWidget::slotTreeViewRepoItemActivated(const QModelIndex &index)
@@ -77,7 +77,7 @@ void CommitsWidget::slotTreeViewRepoCustomContextMenuRequested(const QPoint &pos
void CommitsWidget::init()
{
mHistoryModel = new Git::LogsModel(mGit, nullptr, this);
- mHistoryModel->setCalendarType(GitKlientSettings::calendarType());
+ mHistoryModel->setCalendarType(KommitSettings::calendarType());
mHistoryModel->setFullDetails(true);
mFilterModel = new CommitsFilterModel(mHistoryModel, this);
diff --git a/src/gui/widgets/filesstatuseslist.h b/src/gui/widgets/filesstatuseslist.h
index 48568c0..ef044b2 100644
--- a/src/gui/widgets/filesstatuseslist.h
+++ b/src/gui/widgets/filesstatuseslist.h
@@ -7,10 +7,10 @@ SPDX-License-Identifier: GPL-3.0-or-later
#pragma once
#include "filestatus.h"
-#include "libgitklientgui_private_export.h"
+#include "libkommitgui_private_export.h"
#include <QTreeWidget>
-class LIBGITKLIENTGUI_TESTS_EXPORT FilesStatusesList : public QTreeWidget
+class LIBKOMMITGUI_TESTS_EXPORT FilesStatusesList : public QTreeWidget
{
Q_OBJECT
public:
diff --git a/src/gui/widgets/logdetailswidget.cpp b/src/gui/widgets/logdetailswidget.cpp
index e4ac036..c75509f 100644
--- a/src/gui/widgets/logdetailswidget.cpp
+++ b/src/gui/widgets/logdetailswidget.cpp
@@ -5,10 +5,10 @@ SPDX-License-Identifier: GPL-3.0-or-later
*/
#include "logdetailswidget.h"
-#include "GitKlientSettings.h"
-#include "gitklient_appdebug.h"
+#include "KommitSettings.h"
#include "gitlog.h"
#include "gitmanager.h"
+#include "kommit_appdebug.h"
#include "models/logsmodel.h"
#include <KLocalizedString>
@@ -50,13 +50,13 @@ void LogDetailsWidget::createText()
QString color;
switch (i.value()) {
case Git::ChangeStatus::Modified:
- color = GitKlientSettings::diffModifiedColor().name();
+ color = KommitSettings::diffModifiedColor().name();
break;
case Git::ChangeStatus::Added:
- color = GitKlientSettings::diffAddedColor().name();
+ color = KommitSettings::diffAddedColor().name();
break;
case Git::ChangeStatus::Removed:
- color = GitKlientSettings::diffRemovedColor().name();
+ color = KommitSettings::diffRemovedColor().name();
break;
case Git::ChangeStatus::Unknown:
@@ -82,9 +82,9 @@ void LogDetailsWidget::createText()
childsHashHtml.append(createHashLink(child));
QString date;
- qCDebug(GITKLIENT_LOG) << "cal=" << GitKlientSettings::calendarType();
- QCalendar cal(GitKlientSettings::calendarType());
- /*switch (GitKlientSettings::calendarType()) {
+ qCDebug(KOMMIT_LOG) << "cal=" << KommitSettings::calendarType();
+ QCalendar cal(KommitSettings::calendarType());
+ /*switch (KommitSettings::calendarType()) {
case SettingsHelper::CalendarType::Gregorian:
cal = QCalendar(QCalendar::System::Gregorian);
break;
diff --git a/src/gui/widgets/remoteinfodialog.ui b/src/gui/widgets/remoteinfodialog.ui
index dd1b324..c90d1b9 100644
--- a/src/gui/widgets/remoteinfodialog.ui
+++ b/src/gui/widgets/remoteinfodialog.ui
@@ -14,7 +14,7 @@
<string>New remote</string>
</property>
<property name="windowIcon">
- <iconset theme="gitklient"/>
+ <iconset theme="kommit"/>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
diff --git a/src/gui/widgets/segmentconnector.cpp b/src/gui/widgets/segmentconnector.cpp
index ca42a7a..4e169ac 100644
--- a/src/gui/widgets/segmentconnector.cpp
+++ b/src/gui/widgets/segmentconnector.cpp
@@ -5,7 +5,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
*/
#include "segmentconnector.h"
-#include "GitKlientSettings.h"
+#include "KommitSettings.h"
#include "widgets/codeeditor.h"
#include <QPainter>
@@ -135,13 +135,13 @@ void SegmentConnector::paintEvent(QPaintEvent *event)
// painter.setBrush(Qt::magenta);
continue;
case Diff::SegmentType::OnlyOnRight:
- painter.setBrush(GitKlientSettings::diffAddedColor());
+ painter.setBrush(KommitSettings::diffAddedColor());
break;
case Diff::SegmentType::OnlyOnLeft:
- painter.setBrush(GitKlientSettings::diffRemovedColor());
+ painter.setBrush(KommitSettings::diffRemovedColor());
break;
case Diff::SegmentType::DifferentOnBoth:
- painter.setBrush(GitKlientSettings::diffModifiedColor());
+ painter.setBrush(KommitSettings::diffModifiedColor());
break;
}
diff --git a/src/gui/widgets/segmentsscrollbar.cpp b/src/gui/widgets/segmentsscrollbar.cpp
index 595d3d0..7c5bea8 100644
--- a/src/gui/widgets/segmentsscrollbar.cpp
+++ b/src/gui/widgets/segmentsscrollbar.cpp
@@ -6,7 +6,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
#include "segmentsscrollbar.h"
-#include "GitKlientSettings.h"
+#include "KommitSettings.h"
#include "segmentconnector.h"
#include "widgets/codeeditor.h"
@@ -51,16 +51,16 @@ void SegmentsScrollBar::paintEvent(QPaintEvent *event)
QBrush brush;
switch (segment->type) {
case Diff::SegmentType::OnlyOnLeft:
- brush = GitKlientSettings::diffRemovedColor();
+ brush = KommitSettings::diffRemovedColor();
break;
case Diff::SegmentType::OnlyOnRight:
- brush = GitKlientSettings::diffAddedColor();
+ brush = KommitSettings::diffAddedColor();
break;
case Diff::SegmentType::SameOnBoth:
brush = Qt::white;
break;
case Diff::SegmentType::DifferentOnBoth:
- brush = GitKlientSettings::diffModifiedColor();
+ brush = KommitSettings::diffModifiedColor();
break;
default:
break;
diff --git a/src/libgitklient/gitglobal.h b/src/libgitklient/gitglobal.h
deleted file mode 100644
index 8020c60..0000000
--- a/src/libgitklient/gitglobal.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-SPDX-FileCopyrightText: 2021 Hamed Masafi <hamed.masfi at gmail.com>
-
-SPDX-License-Identifier: GPL-3.0-or-later
-*/
-
-#pragma once
-#include "commands/abstractcommand.h"
-#include "libgitklient_export.h"
-
-#include <QStringList>
-
-namespace Git
-{
-enum class ChangeStatus {
- Unknown,
- Unmodified,
- Modified,
- Added,
- Removed,
- Renamed,
- Copied,
- UpdatedButInmerged,
- Ignored,
- Untracked,
-};
-
-LIBGITKLIENT_EXPORT void run(const QString &workingDir, const QStringList &args);
-LIBGITKLIENT_EXPORT void run(const QString &workingDir, const AbstractCommand &cmd);
-
-LIBGITKLIENT_EXPORT QIcon statusIcon(ChangeStatus status);
-
-LIBGITKLIENT_EXPORT QByteArray runGit(const QString &workingDir, const QStringList &args);
-LIBGITKLIENT_EXPORT QStringList readAllNonEmptyOutput(const QString &workingDir, const QStringList &cmd, bool trim = true);
-} // namespace Git
diff --git a/src/libgitklientdiff/CMakeLists.txt b/src/libgitklientdiff/CMakeLists.txt
deleted file mode 100644
index eb73b60..0000000
--- a/src/libgitklientdiff/CMakeLists.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-add_library(libgitklientdiff SHARED)
-
-target_sources(
- libgitklientdiff
- PRIVATE
- diff.cpp
- diff.h
- results.cpp
- results.h
- types.h
- segments.h
- segments.cpp
- text.h
- text.cpp
- array.h
- array.cpp
- pair.h
- pair.cpp
- solution.h
- solution.cpp
- lcs.h
- lcs.cpp
-)
-
-generate_export_header(libgitklientdiff BASE_NAME libgitklientdiff)
-
-ecm_qt_declare_logging_category(libgitklientdiff
- HEADER libgitklientdiff_debug.h
- IDENTIFIER GITKLIENTDIFFLIB_LOG
- CATEGORY_NAME "org.kde.gitklient.libgitklientdiff" DESCRIPTION "libgitklientdiff" EXPORT GITKLIENT
-)
-
-set_target_properties(libgitklientdiff
- PROPERTIES OUTPUT_NAME gitklientdiff VERSION ${LIBGITKLIENT_LIB_VERSION} SOVERSION ${LIBGITKLIENT_LIB_SOVERSION}
-)
-
-target_link_libraries(libgitklientdiff
- Qt::Core
- Qt::Gui
-)
-
-install(
- TARGETS libgitklientdiff ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
- LIBRARY NAMELINK_SKIP
-)
-
-if (BUILD_TESTING)
- add_subdirectory(autotests)
-endif()
diff --git a/src/libgitklientdiff/diff.h b/src/libgitklientdiff/diff.h
deleted file mode 100644
index 0ba9092..0000000
--- a/src/libgitklientdiff/diff.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-SPDX-FileCopyrightText: 2021 Hamed Masafi <hamed.masfi at gmail.com>
-
-SPDX-License-Identifier: GPL-3.0-or-later
-*/
-
-#pragma once
-
-#include "libgitklientdiff_export.h"
-#include "results.h"
-#include "segments.h"
-#include "types.h"
-
-#include <QStringList>
-
-namespace Diff
-{
-
-int matchesCount(const QStringList &base, const QStringList &local, const QStringList &remote);
-QStringList take(QStringList &list, int count);
-int remove(QStringList &list, int count);
-
-Q_REQUIRED_RESULT QList<DiffSegment *> LIBGITKLIENTDIFF_EXPORT diff(const QString &oldText, const QString &newText);
-Q_REQUIRED_RESULT QList<DiffSegment *> LIBGITKLIENTDIFF_EXPORT diff(const QStringList &oldText, const QStringList &newText);
-
-Q_REQUIRED_RESULT Diff2Result LIBGITKLIENTDIFF_EXPORT diff2(const QString &oldText, const QString &newText);
-
-Q_REQUIRED_RESULT Diff3Result LIBGITKLIENTDIFF_EXPORT diff3(const QString &base, const QString &local, const QString &remote);
-Q_REQUIRED_RESULT QList<MergeSegment *> LIBGITKLIENTDIFF_EXPORT diff3(const QStringList &base, const QStringList &local, const QStringList &remote);
-
-Q_REQUIRED_RESULT QMap<QString, DiffType> LIBGITKLIENTDIFF_EXPORT diffDirs(const QString &dir1, const QString &dir2);
-
-} // namespace Diff
diff --git a/src/libgitklient/CMakeLists.txt b/src/libkommit/CMakeLists.txt
similarity index 74%
rename from src/libgitklient/CMakeLists.txt
rename to src/libkommit/CMakeLists.txt
index 6214a64..50ccd2f 100644
--- a/src/libgitklient/CMakeLists.txt
+++ b/src/libkommit/CMakeLists.txt
@@ -1,6 +1,6 @@
-add_library(libgitklient SHARED)
+add_library(libkommit SHARED)
-target_sources(libgitklient PRIVATE
+target_sources(libkommit PRIVATE
gitglobal.cpp
gitloglist.cpp
gitsubmodule.cpp
@@ -74,19 +74,19 @@ target_sources(libgitklient PRIVATE
commands/commandclean.h
)
-generate_export_header(libgitklient BASE_NAME libgitklient)
+generate_export_header(libkommit BASE_NAME libkommit)
-ecm_qt_declare_logging_category(libgitklient
- HEADER libgitklient_debug.h
- IDENTIFIER GITKLIENTLIB_LOG
- CATEGORY_NAME "org.kde.gitklient.libgitklient" DESCRIPTION "libgitklient" EXPORT GITKLIENT
+ecm_qt_declare_logging_category(libkommit
+ HEADER libkommit_debug.h
+ IDENTIFIER KOMMITLIB_LOG
+ CATEGORY_NAME "org.kde.kommit.libkommit" DESCRIPTION "libkommit" EXPORT KOMMIT
)
-set_target_properties(libgitklient
- PROPERTIES OUTPUT_NAME gitklient VERSION ${LIBGITKLIENT_LIB_VERSION} SOVERSION ${LIBGITKLIENT_LIB_SOVERSION}
+set_target_properties(libkommit
+ PROPERTIES OUTPUT_NAME kommit VERSION ${LIBKOMMIT_LIB_VERSION} SOVERSION ${LIBKOMMIT_LIB_SOVERSION}
)
-target_link_libraries(libgitklient
+target_link_libraries(libkommit
Qt::Core
Qt::Widgets
Qt::Concurrent
@@ -97,4 +97,4 @@ if (BUILD_TESTING)
add_subdirectory(autotests)
endif()
-install(TARGETS libgitklient ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
+install(TARGETS libkommit ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
diff --git a/src/libgitklient/autotests/CMakeLists.txt b/src/libkommit/autotests/CMakeLists.txt
similarity index 51%
rename from src/libgitklient/autotests/CMakeLists.txt
rename to src/libkommit/autotests/CMakeLists.txt
index 9ee6b47..a13576d 100644
--- a/src/libgitklient/autotests/CMakeLists.txt
+++ b/src/libkommit/autotests/CMakeLists.txt
@@ -1,16 +1,16 @@
# SPDX-FileCopyrightText: 2022 Laurent Montel <montel at kde.org>
# SPDX-License-Identifier: BSD-3-Clause
-macro(add_libgitklient_test _source)
+macro(add_LIBKOMMIT_test _source)
set( _test ${_source})
get_filename_component( _name ${_source} NAME_WE )
add_executable( ${_name} ${_test} ${ARGN} ${_name}.h)
add_test(NAME ${_name} COMMAND ${_name} )
ecm_mark_as_test(${_name})
- target_link_libraries( ${_name} Qt::Test libgitklient)
+ target_link_libraries( ${_name} Qt::Test libkommit)
endmacro()
-add_libgitklient_test(tagtest.cpp)
-add_libgitklient_test(clonecommandtest.cpp)
-add_libgitklient_test(commandcleantest.cpp)
-add_libgitklient_test(commandpushtest.cpp)
-add_libgitklient_test(addsubmodulecommandtest.cpp)
+add_LIBKOMMIT_test(tagtest.cpp)
+add_LIBKOMMIT_test(clonecommandtest.cpp)
+add_LIBKOMMIT_test(commandcleantest.cpp)
+add_LIBKOMMIT_test(commandpushtest.cpp)
+add_LIBKOMMIT_test(addsubmodulecommandtest.cpp)
diff --git a/src/libgitklient/autotests/addsubmodulecommandtest.cpp b/src/libkommit/autotests/addsubmodulecommandtest.cpp
similarity index 100%
rename from src/libgitklient/autotests/addsubmodulecommandtest.cpp
rename to src/libkommit/autotests/addsubmodulecommandtest.cpp
diff --git a/src/libgitklient/autotests/addsubmodulecommandtest.h b/src/libkommit/autotests/addsubmodulecommandtest.h
similarity index 100%
rename from src/libgitklient/autotests/addsubmodulecommandtest.h
rename to src/libkommit/autotests/addsubmodulecommandtest.h
diff --git a/src/libgitklient/autotests/clonecommandtest.cpp b/src/libkommit/autotests/clonecommandtest.cpp
similarity index 100%
rename from src/libgitklient/autotests/clonecommandtest.cpp
rename to src/libkommit/autotests/clonecommandtest.cpp
diff --git a/src/libgitklient/autotests/clonecommandtest.h b/src/libkommit/autotests/clonecommandtest.h
similarity index 100%
rename from src/libgitklient/autotests/clonecommandtest.h
rename to src/libkommit/autotests/clonecommandtest.h
diff --git a/src/libgitklient/autotests/commandcleantest.cpp b/src/libkommit/autotests/commandcleantest.cpp
similarity index 100%
rename from src/libgitklient/autotests/commandcleantest.cpp
rename to src/libkommit/autotests/commandcleantest.cpp
diff --git a/src/libgitklient/autotests/commandcleantest.h b/src/libkommit/autotests/commandcleantest.h
similarity index 100%
rename from src/libgitklient/autotests/commandcleantest.h
rename to src/libkommit/autotests/commandcleantest.h
diff --git a/src/libgitklient/autotests/commandpushtest.cpp b/src/libkommit/autotests/commandpushtest.cpp
similarity index 100%
rename from src/libgitklient/autotests/commandpushtest.cpp
rename to src/libkommit/autotests/commandpushtest.cpp
diff --git a/src/libgitklient/autotests/commandpushtest.h b/src/libkommit/autotests/commandpushtest.h
similarity index 100%
rename from src/libgitklient/autotests/commandpushtest.h
rename to src/libkommit/autotests/commandpushtest.h
diff --git a/src/libgitklient/autotests/tagtest.cpp b/src/libkommit/autotests/tagtest.cpp
similarity index 100%
rename from src/libgitklient/autotests/tagtest.cpp
rename to src/libkommit/autotests/tagtest.cpp
diff --git a/src/libgitklient/autotests/tagtest.h b/src/libkommit/autotests/tagtest.h
similarity index 100%
rename from src/libgitklient/autotests/tagtest.h
rename to src/libkommit/autotests/tagtest.h
diff --git a/src/libgitklient/blamedata.cpp b/src/libkommit/blamedata.cpp
similarity index 90%
rename from src/libgitklient/blamedata.cpp
rename to src/libkommit/blamedata.cpp
index 051dad6..87fa1df 100644
--- a/src/libgitklient/blamedata.cpp
+++ b/src/libkommit/blamedata.cpp
@@ -17,7 +17,7 @@ void BlameData::initCommits(const LogList &logs)
// for (auto &l: *this) {
// l.log = logs.findByHash(l.commitHash);
// if (!l.log ) {
- // qCDebug(GITKLIENTLIB_LOG) << "No log found";
+ // qCDebug(KOMMITLIB_LOG) << "No log found";
// }
// }
}
diff --git a/src/libgitklient/blamedata.h b/src/libkommit/blamedata.h
similarity index 83%
rename from src/libgitklient/blamedata.h
rename to src/libkommit/blamedata.h
index 3bfaa9b..18ca335 100644
--- a/src/libgitklient/blamedata.h
+++ b/src/libkommit/blamedata.h
@@ -6,7 +6,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
#pragma once
#include "gitloglist.h"
-#include "libgitklient_export.h"
+#include "libkommit_export.h"
#include <QString>
namespace Git
@@ -21,7 +21,7 @@ struct BlameDataRow {
bool operator==(const BlameDataRow &l, const BlameDataRow &r);
bool operator!=(const BlameDataRow &l, const BlameDataRow &r);
-class LIBGITKLIENT_EXPORT BlameData : public QList<BlameDataRow>
+class LIBKOMMIT_EXPORT BlameData : public QList<BlameDataRow>
{
public:
BlameData();
diff --git a/src/libgitklient/commands/CMakeLists.txt b/src/libkommit/commands/CMakeLists.txt
similarity index 100%
rename from src/libgitklient/commands/CMakeLists.txt
rename to src/libkommit/commands/CMakeLists.txt
diff --git a/src/libgitklient/commands/abstractcommand.cpp b/src/libkommit/commands/abstractcommand.cpp
similarity index 100%
rename from src/libgitklient/commands/abstractcommand.cpp
rename to src/libkommit/commands/abstractcommand.cpp
diff --git a/src/libgitklient/commands/abstractcommand.h b/src/libkommit/commands/abstractcommand.h
similarity index 91%
rename from src/libgitklient/commands/abstractcommand.h
rename to src/libkommit/commands/abstractcommand.h
index a002957..848463e 100644
--- a/src/libgitklient/commands/abstractcommand.h
+++ b/src/libkommit/commands/abstractcommand.h
@@ -5,7 +5,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
*/
#pragma once
-#include "libgitklient_export.h"
+#include "libkommit_export.h"
#include <QByteArray>
#include <QObject>
#include <QStringList>
@@ -23,10 +23,10 @@ enum class OptionalBool {
enum class FastForwardType { Unset, Yes, No, OnlyFastForward };
-LIBGITKLIENT_EXPORT OptionalBool checkStateToOptionalBool(Qt::CheckState checkState);
+LIBKOMMIT_EXPORT OptionalBool checkStateToOptionalBool(Qt::CheckState checkState);
class Manager;
-class LIBGITKLIENT_EXPORT AbstractCommand : public QObject
+class LIBKOMMIT_EXPORT AbstractCommand : public QObject
{
Q_OBJECT
Q_PROPERTY(int progress READ progress WRITE setProgress NOTIFY progressChanged)
diff --git a/src/libgitklient/commands/addsubmodulecommand.cpp b/src/libkommit/commands/addsubmodulecommand.cpp
similarity index 100%
rename from src/libgitklient/commands/addsubmodulecommand.cpp
rename to src/libkommit/commands/addsubmodulecommand.cpp
diff --git a/src/libgitklient/commands/addsubmodulecommand.h b/src/libkommit/commands/addsubmodulecommand.h
similarity index 88%
rename from src/libgitklient/commands/addsubmodulecommand.h
rename to src/libkommit/commands/addsubmodulecommand.h
index 8f1c3ce..a7d9a07 100644
--- a/src/libgitklient/commands/addsubmodulecommand.h
+++ b/src/libkommit/commands/addsubmodulecommand.h
@@ -6,12 +6,12 @@ SPDX-License-Identifier: GPL-3.0-or-later
#pragma once
#include "abstractcommand.h"
-#include "libgitklient_export.h"
+#include "libkommit_export.h"
namespace Git
{
-class LIBGITKLIENT_EXPORT AddSubmoduleCommand : public AbstractCommand
+class LIBKOMMIT_EXPORT AddSubmoduleCommand : public AbstractCommand
{
Q_OBJECT
diff --git a/src/libgitklient/commands/commandaddremote.cpp b/src/libkommit/commands/commandaddremote.cpp
similarity index 100%
rename from src/libgitklient/commands/commandaddremote.cpp
rename to src/libkommit/commands/commandaddremote.cpp
diff --git a/src/libgitklient/commands/commandaddremote.h b/src/libkommit/commands/commandaddremote.h
similarity index 91%
rename from src/libgitklient/commands/commandaddremote.h
rename to src/libkommit/commands/commandaddremote.h
index e9fee4b..590e8b5 100644
--- a/src/libgitklient/commands/commandaddremote.h
+++ b/src/libkommit/commands/commandaddremote.h
@@ -6,12 +6,12 @@ SPDX-License-Identifier: GPL-3.0-or-later
#pragma once
#include "abstractcommand.h"
-#include "libgitklient_export.h"
+#include "libkommit_export.h"
namespace Git
{
-class LIBGITKLIENT_EXPORT CommandAddRemote : public AbstractCommand
+class LIBKOMMIT_EXPORT CommandAddRemote : public AbstractCommand
{
public:
explicit CommandAddRemote(QObject *parent = nullptr);
diff --git a/src/libgitklient/commands/commandchangedfiles.cpp b/src/libkommit/commands/commandchangedfiles.cpp
similarity index 100%
rename from src/libgitklient/commands/commandchangedfiles.cpp
rename to src/libkommit/commands/commandchangedfiles.cpp
diff --git a/src/libgitklient/commands/commandchangedfiles.h b/src/libkommit/commands/commandchangedfiles.h
similarity index 100%
rename from src/libgitklient/commands/commandchangedfiles.h
rename to src/libkommit/commands/commandchangedfiles.h
diff --git a/src/libgitklient/commands/commandclean.cpp b/src/libkommit/commands/commandclean.cpp
similarity index 100%
rename from src/libgitklient/commands/commandclean.cpp
rename to src/libkommit/commands/commandclean.cpp
diff --git a/src/libgitklient/commands/commandclean.h b/src/libkommit/commands/commandclean.h
similarity index 92%
rename from src/libgitklient/commands/commandclean.h
rename to src/libkommit/commands/commandclean.h
index 6da4653..2916334 100644
--- a/src/libgitklient/commands/commandclean.h
+++ b/src/libkommit/commands/commandclean.h
@@ -11,7 +11,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
namespace Git
{
-class LIBGITKLIENT_EXPORT CommandClean : public AbstractCommand
+class LIBKOMMIT_EXPORT CommandClean : public AbstractCommand
{
Q_OBJECT
diff --git a/src/libgitklient/commands/commandclone.cpp b/src/libkommit/commands/commandclone.cpp
similarity index 100%
rename from src/libgitklient/commands/commandclone.cpp
rename to src/libkommit/commands/commandclone.cpp
diff --git a/src/libgitklient/commands/commandclone.h b/src/libkommit/commands/commandclone.h
similarity index 92%
rename from src/libgitklient/commands/commandclone.h
rename to src/libkommit/commands/commandclone.h
index e6c92b9..a0e8e25 100644
--- a/src/libgitklient/commands/commandclone.h
+++ b/src/libkommit/commands/commandclone.h
@@ -7,11 +7,11 @@ SPDX-License-Identifier: GPL-3.0-or-later
#pragma once
#include "abstractcommand.h"
-#include "libgitklient_export.h"
+#include "libkommit_export.h"
namespace Git
{
-class LIBGITKLIENT_EXPORT CloneCommand : public AbstractCommand
+class LIBKOMMIT_EXPORT CloneCommand : public AbstractCommand
{
Q_OBJECT
diff --git a/src/libgitklient/commands/commandcommit.cpp b/src/libkommit/commands/commandcommit.cpp
similarity index 100%
rename from src/libgitklient/commands/commandcommit.cpp
rename to src/libkommit/commands/commandcommit.cpp
diff --git a/src/libgitklient/commands/commandcommit.h b/src/libkommit/commands/commandcommit.h
similarity index 88%
rename from src/libgitklient/commands/commandcommit.h
rename to src/libkommit/commands/commandcommit.h
index f2313d3..2e43d29 100644
--- a/src/libgitklient/commands/commandcommit.h
+++ b/src/libkommit/commands/commandcommit.h
@@ -7,11 +7,11 @@ SPDX-License-Identifier: GPL-3.0-or-later
#pragma once
#include "abstractcommand.h"
-#include "libgitklient_export.h"
+#include "libkommit_export.h"
namespace Git
{
-class LIBGITKLIENT_EXPORT CommandCommit : public AbstractCommand
+class LIBKOMMIT_EXPORT CommandCommit : public AbstractCommand
{
public:
CommandCommit();
diff --git a/src/libgitklient/commands/commandfetch.cpp b/src/libkommit/commands/commandfetch.cpp
similarity index 100%
rename from src/libgitklient/commands/commandfetch.cpp
rename to src/libkommit/commands/commandfetch.cpp
diff --git a/src/libgitklient/commands/commandfetch.h b/src/libkommit/commands/commandfetch.h
similarity index 92%
rename from src/libgitklient/commands/commandfetch.h
rename to src/libkommit/commands/commandfetch.h
index 8ac69d9..32f0d78 100644
--- a/src/libgitklient/commands/commandfetch.h
+++ b/src/libkommit/commands/commandfetch.h
@@ -7,11 +7,11 @@ SPDX-License-Identifier: GPL-3.0-or-later
#pragma once
#include "abstractcommand.h"
-#include "libgitklient_export.h"
+#include "libkommit_export.h"
namespace Git
{
-class LIBGITKLIENT_EXPORT CommandFetch : public AbstractCommand
+class LIBKOMMIT_EXPORT CommandFetch : public AbstractCommand
{
public:
CommandFetch();
diff --git a/src/libgitklient/commands/commandmerge.cpp b/src/libkommit/commands/commandmerge.cpp
similarity index 100%
rename from src/libgitklient/commands/commandmerge.cpp
rename to src/libkommit/commands/commandmerge.cpp
diff --git a/src/libgitklient/commands/commandmerge.h b/src/libkommit/commands/commandmerge.h
similarity index 96%
rename from src/libgitklient/commands/commandmerge.h
rename to src/libkommit/commands/commandmerge.h
index a46476c..1f121c5 100644
--- a/src/libgitklient/commands/commandmerge.h
+++ b/src/libkommit/commands/commandmerge.h
@@ -7,12 +7,12 @@ SPDX-License-Identifier: GPL-3.0-or-later
#pragma once
#include "abstractcommand.h"
-#include "libgitklient_export.h"
+#include "libkommit_export.h"
namespace Git
{
-class LIBGITKLIENT_EXPORT CommandMerge : public AbstractCommand
+class LIBKOMMIT_EXPORT CommandMerge : public AbstractCommand
{
Q_OBJECT
diff --git a/src/libgitklient/commands/commandpull.cpp b/src/libkommit/commands/commandpull.cpp
similarity index 100%
rename from src/libgitklient/commands/commandpull.cpp
rename to src/libkommit/commands/commandpull.cpp
diff --git a/src/libgitklient/commands/commandpull.h b/src/libkommit/commands/commandpull.h
similarity index 94%
rename from src/libgitklient/commands/commandpull.h
rename to src/libkommit/commands/commandpull.h
index 91d1c56..7309d25 100644
--- a/src/libgitklient/commands/commandpull.h
+++ b/src/libkommit/commands/commandpull.h
@@ -6,7 +6,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
#pragma once
#include "abstractcommand.h"
-#include "libgitklient_export.h"
+#include "libkommit_export.h"
#ifdef GIT_GUI
namespace Ui
@@ -18,7 +18,7 @@ class CommandPullWidget;
namespace Git
{
-class LIBGITKLIENT_EXPORT CommandPull : public AbstractCommand
+class LIBKOMMIT_EXPORT CommandPull : public AbstractCommand
{
Q_OBJECT
diff --git a/src/libgitklient/commands/commandpush.cpp b/src/libkommit/commands/commandpush.cpp
similarity index 100%
rename from src/libgitklient/commands/commandpush.cpp
rename to src/libkommit/commands/commandpush.cpp
diff --git a/src/libgitklient/commands/commandpush.h b/src/libkommit/commands/commandpush.h
similarity index 89%
rename from src/libgitklient/commands/commandpush.h
rename to src/libkommit/commands/commandpush.h
index 6445292..174e28f 100644
--- a/src/libgitklient/commands/commandpush.h
+++ b/src/libkommit/commands/commandpush.h
@@ -6,12 +6,12 @@ SPDX-License-Identifier: GPL-3.0-or-later
#pragma once
#include "abstractcommand.h"
-#include "libgitklient_export.h"
+#include "libkommit_export.h"
namespace Git
{
-class LIBGITKLIENT_EXPORT CommandPush : public AbstractCommand
+class LIBKOMMIT_EXPORT CommandPush : public AbstractCommand
{
public:
CommandPush();
diff --git a/src/libgitklient/commands/commandswitchbranch.cpp b/src/libkommit/commands/commandswitchbranch.cpp
similarity index 93%
rename from src/libgitklient/commands/commandswitchbranch.cpp
rename to src/libkommit/commands/commandswitchbranch.cpp
index f33b8f3..fb9c22d 100644
--- a/src/libgitklient/commands/commandswitchbranch.cpp
+++ b/src/libkommit/commands/commandswitchbranch.cpp
@@ -6,7 +6,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
#include "commandswitchbranch.h"
-#include "libgitklient_debug.h"
+#include "libkommit_debug.h"
#include <KLocalizedString>
@@ -26,8 +26,8 @@ void CommandSwitchBranch::parseOutputSection(const QByteArray &output, const QBy
i18n("Your local changes to the following files would be overwritten by checkout. "
"Please commit your changes or stash them before you switch branches."));
}
- qCDebug(GITKLIENTLIB_LOG) << "Error" << errorOutput;
- qCDebug(GITKLIENTLIB_LOG) << "out" << output;
+ qCDebug(KOMMITLIB_LOG) << "Error" << errorOutput;
+ qCDebug(KOMMITLIB_LOG) << "out" << output;
}
const QString &CommandSwitchBranch::target() const
diff --git a/src/libgitklient/commands/commandswitchbranch.h b/src/libkommit/commands/commandswitchbranch.h
similarity index 90%
rename from src/libgitklient/commands/commandswitchbranch.h
rename to src/libkommit/commands/commandswitchbranch.h
index 6ee4b15..c088870 100644
--- a/src/libgitklient/commands/commandswitchbranch.h
+++ b/src/libkommit/commands/commandswitchbranch.h
@@ -6,12 +6,12 @@ SPDX-License-Identifier: GPL-3.0-or-later
#pragma once
#include "abstractcommand.h"
-#include "libgitklient_export.h"
+#include "libkommit_export.h"
namespace Git
{
-class LIBGITKLIENT_EXPORT CommandSwitchBranch : public AbstractCommand
+class LIBKOMMIT_EXPORT CommandSwitchBranch : public AbstractCommand
{
Q_OBJECT
diff --git a/src/libgitklient/commands/parameterescommand.cpp b/src/libkommit/commands/parameterescommand.cpp
similarity index 100%
rename from src/libgitklient/commands/parameterescommand.cpp
rename to src/libkommit/commands/parameterescommand.cpp
diff --git a/src/libgitklient/commands/parameterescommand.h b/src/libkommit/commands/parameterescommand.h
similarity index 100%
rename from src/libgitklient/commands/parameterescommand.h
rename to src/libkommit/commands/parameterescommand.h
diff --git a/src/libgitklient/filestatus.cpp b/src/libkommit/filestatus.cpp
similarity index 95%
rename from src/libgitklient/filestatus.cpp
rename to src/libkommit/filestatus.cpp
index 5fa8a37..38dda1c 100644
--- a/src/libgitklient/filestatus.cpp
+++ b/src/libkommit/filestatus.cpp
@@ -37,7 +37,7 @@ void FileStatus::parseStatusLine(const QString &line)
setStatus(statusX, statusY);
- // qCDebug(GITKLIENTLIB_LOG) << "***=" << line << _status << statusX << statusY;
+ // qCDebug(KOMMITLIB_LOG) << "***=" << line << _status << statusX << statusY;
}
const QString &FileStatus::fullPath() const
diff --git a/src/libgitklient/filestatus.h b/src/libkommit/filestatus.h
similarity index 88%
rename from src/libgitklient/filestatus.h
rename to src/libkommit/filestatus.h
index bedbcce..62f61ef 100644
--- a/src/libgitklient/filestatus.h
+++ b/src/libkommit/filestatus.h
@@ -6,14 +6,14 @@ SPDX-License-Identifier: GPL-3.0-or-later
#pragma once
-#include "libgitklient_export.h"
+#include "libkommit_export.h"
#include <QObject>
#include <QString>
namespace Git
{
-class LIBGITKLIENT_EXPORT FileStatus
+class LIBKOMMIT_EXPORT FileStatus
{
public:
enum Status {
@@ -54,7 +54,7 @@ private:
friend class Manager;
};
-LIBGITKLIENT_EXPORT bool operator==(const FileStatus &f1, const FileStatus &f2);
+LIBKOMMIT_EXPORT bool operator==(const FileStatus &f1, const FileStatus &f2);
}
Q_DECLARE_METATYPE(Git::FileStatus)
diff --git a/src/libgitklient/gitfile.cpp b/src/libkommit/gitfile.cpp
similarity index 100%
rename from src/libgitklient/gitfile.cpp
rename to src/libkommit/gitfile.cpp
diff --git a/src/libgitklient/gitfile.h b/src/libkommit/gitfile.h
similarity index 94%
rename from src/libgitklient/gitfile.h
rename to src/libkommit/gitfile.h
index 6d804b0..9cf2e55 100644
--- a/src/libgitklient/gitfile.h
+++ b/src/libkommit/gitfile.h
@@ -6,14 +6,14 @@ SPDX-License-Identifier: GPL-3.0-or-later
#pragma once
-#include "libgitklient_export.h"
+#include "libkommit_export.h"
#include <QString>
namespace Git
{
class Manager;
-class LIBGITKLIENT_EXPORT File
+class LIBKOMMIT_EXPORT File
{
public:
enum StorageType { InValid, Git, Local };
diff --git a/src/libgitklient/gitglobal.cpp b/src/libkommit/gitglobal.cpp
similarity index 96%
rename from src/libgitklient/gitglobal.cpp
rename to src/libkommit/gitglobal.cpp
index ac1a308..6c3af01 100644
--- a/src/libgitklient/gitglobal.cpp
+++ b/src/libkommit/gitglobal.cpp
@@ -34,7 +34,7 @@ void run(const QString &workingDir, const AbstractCommand &cmd)
QByteArray runGit(const QString &workingDir, const QStringList &args)
{
- // qCDebug(GITKLIENTLIB_LOG).noquote() << "Running: git " << args.join(" ");
+ // qCDebug(KOMMITLIB_LOG).noquote() << "Running: git " << args.join(" ");
QProcess p;
p.setProgram(QStringLiteral("git"));
diff --git a/src/libkommit/gitglobal.h b/src/libkommit/gitglobal.h
new file mode 100644
index 0000000..57aac73
--- /dev/null
+++ b/src/libkommit/gitglobal.h
@@ -0,0 +1,35 @@
+/*
+SPDX-FileCopyrightText: 2021 Hamed Masafi <hamed.masfi at gmail.com>
+
+SPDX-License-Identifier: GPL-3.0-or-later
+*/
+
+#pragma once
+#include "commands/abstractcommand.h"
+#include "libkommit_export.h"
+
+#include <QStringList>
+
+namespace Git
+{
+enum class ChangeStatus {
+ Unknown,
+ Unmodified,
+ Modified,
+ Added,
+ Removed,
+ Renamed,
+ Copied,
+ UpdatedButInmerged,
+ Ignored,
+ Untracked,
+};
+
+LIBKOMMIT_EXPORT void run(const QString &workingDir, const QStringList &args);
+LIBKOMMIT_EXPORT void run(const QString &workingDir, const AbstractCommand &cmd);
+
+LIBKOMMIT_EXPORT QIcon statusIcon(ChangeStatus status);
+
+LIBKOMMIT_EXPORT QByteArray runGit(const QString &workingDir, const QStringList &args);
+LIBKOMMIT_EXPORT QStringList readAllNonEmptyOutput(const QString &workingDir, const QStringList &cmd, bool trim = true);
+} // namespace Git
diff --git a/src/libgitklient/gitgraphlane.cpp b/src/libkommit/gitgraphlane.cpp
similarity index 100%
rename from src/libgitklient/gitgraphlane.cpp
rename to src/libkommit/gitgraphlane.cpp
diff --git a/src/libgitklient/gitgraphlane.h b/src/libkommit/gitgraphlane.h
similarity index 91%
rename from src/libgitklient/gitgraphlane.h
rename to src/libkommit/gitgraphlane.h
index d5b1721..6e257f0 100644
--- a/src/libgitklient/gitgraphlane.h
+++ b/src/libkommit/gitgraphlane.h
@@ -5,7 +5,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
*/
#pragma once
-#include "libgitklient_export.h"
+#include "libkommit_export.h"
#include <QList>
namespace Git
@@ -16,7 +16,7 @@ namespace Impl
struct LanesFactory;
}
-class LIBGITKLIENT_EXPORT GraphLane
+class LIBKOMMIT_EXPORT GraphLane
{
public:
enum Type { None, Start, Pipe, Node, End, Transparent, Test };
diff --git a/src/libgitklient/gitlog.cpp b/src/libkommit/gitlog.cpp
similarity index 100%
rename from src/libgitklient/gitlog.cpp
rename to src/libkommit/gitlog.cpp
diff --git a/src/libgitklient/gitlog.h b/src/libkommit/gitlog.h
similarity index 97%
rename from src/libgitklient/gitlog.h
rename to src/libkommit/gitlog.h
index d34916a..c8b5921 100644
--- a/src/libgitklient/gitlog.h
+++ b/src/libkommit/gitlog.h
@@ -6,7 +6,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
#pragma once
#include "gitgraphlane.h"
-#include "libgitklient_export.h"
+#include "libkommit_export.h"
#include <QDateTime>
#include <QString>
#include <QVector>
@@ -14,7 +14,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
namespace Git
{
-class LIBGITKLIENT_EXPORT Log
+class LIBKOMMIT_EXPORT Log
{
public:
enum CommitType { NormalCommit, InitialCommit, ForkCommit, MergeCommit };
diff --git a/src/libgitklient/gitloglist.cpp b/src/libkommit/gitloglist.cpp
similarity index 100%
rename from src/libgitklient/gitloglist.cpp
rename to src/libkommit/gitloglist.cpp
diff --git a/src/libgitklient/gitloglist.h b/src/libkommit/gitloglist.h
similarity index 88%
rename from src/libgitklient/gitloglist.h
rename to src/libkommit/gitloglist.h
index 521751c..05cec08 100644
--- a/src/libgitklient/gitloglist.h
+++ b/src/libkommit/gitloglist.h
@@ -5,7 +5,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
*/
#pragma once
-#include "libgitklient_export.h"
+#include "libkommit_export.h"
#include <QList>
#include <QMap>
@@ -14,7 +14,7 @@ namespace Git
class Manager;
class Log;
-class LIBGITKLIENT_EXPORT LogList : public QList<Log *>
+class LIBKOMMIT_EXPORT LogList : public QList<Log *>
{
public:
LogList();
diff --git a/src/libgitklient/gitmanager.cpp b/src/libkommit/gitmanager.cpp
similarity index 97%
rename from src/libgitklient/gitmanager.cpp
rename to src/libkommit/gitmanager.cpp
index 989966d..2cc7852 100644
--- a/src/libgitklient/gitmanager.cpp
+++ b/src/libkommit/gitmanager.cpp
@@ -11,7 +11,7 @@
#include "models/submodulesmodel.h"
#include "models/tagsmodel.h"
-#include "libgitklient_debug.h"
+#include "libkommit_debug.h"
#include <QFile>
#include <QProcess>
#include <QSortFilterProxyModel>
@@ -74,7 +74,7 @@ QMap<QString, ChangeStatus> Manager::changedFiles(const QString &hash) const
else if (partFirst == QLatin1Char('D'))
statuses.insert(parts.at(1), ChangeStatus::Removed);
else
- qCDebug(GITKLIENTLIB_LOG) << "Unknown file status" << partFirst;
+ qCDebug(KOMMITLIB_LOG) << "Unknown file status" << partFirst;
}
return statuses;
}
@@ -99,7 +99,7 @@ QList<FileStatus> Manager::repoFilesStatus() const
continue;
FileStatus fs;
fs.parseStatusLine(item);
- qCDebug(GITKLIENTLIB_LOG) << "[STATUS]" << fs.name() << fs.status();
+ qCDebug(KOMMITLIB_LOG) << "[STATUS]" << fs.name() << fs.status();
fs.setFullPath(mPath + QLatin1Char('/') + fs.name());
files.append(fs);
}
@@ -132,7 +132,7 @@ bool Manager::renameRemote(const QString &name, const QString &newName) const
bool Manager::isIgnored(const QString &path)
{
auto tmp = readAllNonEmptyOutput({QStringLiteral("check-ignore"), path});
- qCDebug(GITKLIENTLIB_LOG) << Q_FUNC_INFO << tmp;
+ qCDebug(KOMMITLIB_LOG) << Q_FUNC_INFO << tmp;
return !tmp.empty();
}
@@ -410,7 +410,7 @@ void Manager::init(const QString &path)
QByteArray Manager::runGit(const QStringList &args) const
{
- // qCDebug(GITKLIENTLIB_LOG).noquote() << "Running: git " << args.join(" ");
+ // qCDebug(KOMMITLIB_LOG).noquote() << "Running: git " << args.join(" ");
QProcess p;
p.setProgram(QStringLiteral("git"));
@@ -526,7 +526,7 @@ QList<Stash> Manager::stashes()
stash.mAuthorName = parts.at(1);
stash.mAuthorEmail = parts.at(2);
stash.mPushTime = QDateTime::fromString(parts.at(3), Qt::RFC2822Date);
- qCDebug(GITKLIENTLIB_LOG) << item << subject << stash.mPushTime;
+ qCDebug(KOMMITLIB_LOG) << item << subject << stash.mPushTime;
ret.append(stash);
id++;
@@ -542,7 +542,7 @@ void Manager::createStash(const QString &name) const
args.append({QStringLiteral("--message"), name});
const auto ret = runGit(args);
- qCDebug(GITKLIENTLIB_LOG) << ret;
+ qCDebug(KOMMITLIB_LOG) << ret;
}
bool Manager::removeStash(const QString &name) const
diff --git a/src/libgitklient/gitmanager.h b/src/libkommit/gitmanager.h
similarity index 98%
rename from src/libgitklient/gitmanager.h
rename to src/libkommit/gitmanager.h
index 7d1bdd3..1462625 100644
--- a/src/libgitklient/gitmanager.h
+++ b/src/libkommit/gitmanager.h
@@ -9,7 +9,7 @@
#include "gitfile.h"
#include "gitglobal.h"
#include "gitremote.h"
-#include "libgitklient_export.h"
+#include "libkommit_export.h"
#include "stash.h"
#include <QObject>
@@ -39,7 +39,7 @@ enum LoadFlag {
Q_DECLARE_FLAGS(LoadFlags, LoadFlag)
Q_DECLARE_OPERATORS_FOR_FLAGS(LoadFlags)
-class LIBGITKLIENT_EXPORT Manager : public QObject
+class LIBKOMMIT_EXPORT Manager : public QObject
{
Q_OBJECT
diff --git a/src/libgitklient/gitremote.cpp b/src/libkommit/gitremote.cpp
similarity index 96%
rename from src/libgitklient/gitremote.cpp
rename to src/libkommit/gitremote.cpp
index db3ecc5..41e7be5 100644
--- a/src/libgitklient/gitremote.cpp
+++ b/src/libkommit/gitremote.cpp
@@ -5,7 +5,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
*/
#include "gitremote.h"
-#include "libgitklient_debug.h"
+#include "libkommit_debug.h"
#include <KLocalizedString>
#include <QRegularExpression>
@@ -84,7 +84,7 @@ void Remote::parse(const QString &output)
else if (match.captured(3) == QStringLiteral("local out of date"))
branch.status = RemoteBranch::Status::LocalOutOfDate;
else
- qCDebug(GITKLIENTLIB_LOG) << "Unknown status" << match.captured(3);
+ qCDebug(KOMMITLIB_LOG) << "Unknown status" << match.captured(3);
branch.remotePushBranch = match.captured(2);
@@ -110,7 +110,7 @@ void Remote::parse(const QString &output)
continue;
}
}
- qCDebug(GITKLIENTLIB_LOG) << branches.size();
+ qCDebug(KOMMITLIB_LOG) << branches.size();
}
QString RemoteBranch::statusText() const
diff --git a/src/libgitklient/gitremote.h b/src/libkommit/gitremote.h
similarity index 91%
rename from src/libgitklient/gitremote.h
rename to src/libkommit/gitremote.h
index a6600f9..55e2302 100644
--- a/src/libgitklient/gitremote.h
+++ b/src/libkommit/gitremote.h
@@ -5,14 +5,14 @@ SPDX-License-Identifier: GPL-3.0-or-later
*/
#pragma once
-#include "libgitklient_export.h"
+#include "libkommit_export.h"
#include <QList>
#include <QString>
namespace Git
{
-class LIBGITKLIENT_EXPORT RemoteBranch
+class LIBKOMMIT_EXPORT RemoteBranch
{
public:
bool configuredPull{false};
diff --git a/src/libgitklient/gitsubmodule.cpp b/src/libkommit/gitsubmodule.cpp
similarity index 100%
rename from src/libgitklient/gitsubmodule.cpp
rename to src/libkommit/gitsubmodule.cpp
diff --git a/src/libgitklient/gitsubmodule.h b/src/libkommit/gitsubmodule.h
similarity index 91%
rename from src/libgitklient/gitsubmodule.h
rename to src/libkommit/gitsubmodule.h
index fc88c91..5f68535 100644
--- a/src/libgitklient/gitsubmodule.h
+++ b/src/libkommit/gitsubmodule.h
@@ -5,13 +5,13 @@ SPDX-License-Identifier: GPL-3.0-or-later
*/
#pragma once
-#include "libgitklient_export.h"
+#include "libkommit_export.h"
#include <QString>
namespace Git
{
-class LIBGITKLIENT_EXPORT Submodule
+class LIBKOMMIT_EXPORT Submodule
{
public:
Submodule();
diff --git a/src/libgitklient/gittag.cpp b/src/libkommit/gittag.cpp
similarity index 100%
rename from src/libgitklient/gittag.cpp
rename to src/libkommit/gittag.cpp
diff --git a/src/libgitklient/gittag.h b/src/libkommit/gittag.h
similarity index 94%
rename from src/libgitklient/gittag.h
rename to src/libkommit/gittag.h
index ede37cb..daa01b7 100644
--- a/src/libgitklient/gittag.h
+++ b/src/libkommit/gittag.h
@@ -5,13 +5,13 @@ SPDX-License-Identifier: GPL-3.0-or-later
*/
#pragma once
-#include "libgitklient_export.h"
+#include "libkommit_export.h"
#include <QString>
namespace Git
{
-class LIBGITKLIENT_EXPORT Tag
+class LIBKOMMIT_EXPORT Tag
{
public:
Tag();
diff --git a/src/libgitklient/libgitklient_private_export.h b/src/libkommit/libkommit_private_export.h
similarity index 72%
rename from src/libgitklient/libgitklient_private_export.h
rename to src/libkommit/libkommit_private_export.h
index cf6cc9d..9031758 100644
--- a/src/libgitklient/libgitklient_private_export.h
+++ b/src/libkommit/libkommit_private_export.h
@@ -6,12 +6,12 @@
#pragma once
-#include "libgitklient_export.h"
+#include "libkommit_export.h"
/* Classes which are exported only for unit tests */
#ifdef BUILD_TESTING
-#ifndef LIBGITKLIENT_TESTS_EXPORT
-#define LIBGITKLIENT_TESTS_EXPORT LIBGITKLIENT_EXPORT
+#ifndef LIBKOMMIT_TESTS_EXPORT
+#define LIBKOMMIT_TESTS_EXPORT LIBKOMMIT_EXPORT
#endif
#else /* not compiling tests */
#define LIBGITKLIENT_TESTS_EXPORT
diff --git a/src/libgitklient/models/CMakeLists.txt b/src/libkommit/models/CMakeLists.txt
similarity index 100%
rename from src/libgitklient/models/CMakeLists.txt
rename to src/libkommit/models/CMakeLists.txt
diff --git a/src/libgitklient/models/abstractgititemsmodel.cpp b/src/libkommit/models/abstractgititemsmodel.cpp
similarity index 100%
rename from src/libgitklient/models/abstractgititemsmodel.cpp
rename to src/libkommit/models/abstractgititemsmodel.cpp
diff --git a/src/libgitklient/models/abstractgititemsmodel.h b/src/libkommit/models/abstractgititemsmodel.h
similarity index 88%
rename from src/libgitklient/models/abstractgititemsmodel.h
rename to src/libkommit/models/abstractgititemsmodel.h
index d609460..3cac571 100644
--- a/src/libgitklient/models/abstractgititemsmodel.h
+++ b/src/libkommit/models/abstractgititemsmodel.h
@@ -9,14 +9,14 @@ SPDX-License-Identifier: GPL-3.0-or-later
//
#pragma once
-#include "libgitklient_export.h"
+#include "libkommit_export.h"
#include <QAbstractListModel>
namespace Git
{
class Manager;
-class LIBGITKLIENT_EXPORT AbstractGitItemsModel : public QAbstractListModel
+class LIBKOMMIT_EXPORT AbstractGitItemsModel : public QAbstractListModel
{
Q_OBJECT
Q_PROPERTY(Status status READ status WRITE setStatus NOTIFY statusChanged)
diff --git a/src/libgitklient/models/authorsmodel.cpp b/src/libkommit/models/authorsmodel.cpp
similarity index 100%
rename from src/libgitklient/models/authorsmodel.cpp
rename to src/libkommit/models/authorsmodel.cpp
diff --git a/src/libgitklient/models/authorsmodel.h b/src/libkommit/models/authorsmodel.h
similarity index 100%
rename from src/libgitklient/models/authorsmodel.h
rename to src/libkommit/models/authorsmodel.h
diff --git a/src/libgitklient/models/branchesmodel.cpp b/src/libkommit/models/branchesmodel.cpp
similarity index 100%
rename from src/libgitklient/models/branchesmodel.cpp
rename to src/libkommit/models/branchesmodel.cpp
diff --git a/src/libgitklient/models/branchesmodel.h b/src/libkommit/models/branchesmodel.h
similarity index 91%
rename from src/libgitklient/models/branchesmodel.h
rename to src/libkommit/models/branchesmodel.h
index 00558ac..fb82e53 100644
--- a/src/libgitklient/models/branchesmodel.h
+++ b/src/libkommit/models/branchesmodel.h
@@ -7,12 +7,12 @@ SPDX-License-Identifier: GPL-3.0-or-later
#pragma once
#include "abstractgititemsmodel.h"
-#include "libgitklient_export.h"
+#include "libkommit_export.h"
namespace Git
{
class Manager;
-class LIBGITKLIENT_EXPORT BranchesModel : public AbstractGitItemsModel
+class LIBKOMMIT_EXPORT BranchesModel : public AbstractGitItemsModel
{
Q_OBJECT
diff --git a/src/libgitklient/models/logsmodel.cpp b/src/libkommit/models/logsmodel.cpp
similarity index 100%
rename from src/libgitklient/models/logsmodel.cpp
rename to src/libkommit/models/logsmodel.cpp
diff --git a/src/libgitklient/models/logsmodel.h b/src/libkommit/models/logsmodel.h
similarity index 94%
rename from src/libgitklient/models/logsmodel.h
rename to src/libkommit/models/logsmodel.h
index 5ac9193..4fba327 100644
--- a/src/libgitklient/models/logsmodel.h
+++ b/src/libkommit/models/logsmodel.h
@@ -10,7 +10,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
#pragma once
#include "abstractgititemsmodel.h"
-#include "libgitklient_export.h"
+#include "libkommit_export.h"
#include <QCalendar>
@@ -20,7 +20,7 @@ namespace Git
class Log;
class Manager;
class AuthorsModel;
-class LIBGITKLIENT_EXPORT LogsModel : public AbstractGitItemsModel
+class LIBKOMMIT_EXPORT LogsModel : public AbstractGitItemsModel
{
Q_OBJECT
diff --git a/src/libgitklient/models/remotesmodel.cpp b/src/libkommit/models/remotesmodel.cpp
similarity index 100%
rename from src/libgitklient/models/remotesmodel.cpp
rename to src/libkommit/models/remotesmodel.cpp
diff --git a/src/libgitklient/models/remotesmodel.h b/src/libkommit/models/remotesmodel.h
similarity index 89%
rename from src/libgitklient/models/remotesmodel.h
rename to src/libkommit/models/remotesmodel.h
index 9bb6f4c..eff1936 100644
--- a/src/libgitklient/models/remotesmodel.h
+++ b/src/libkommit/models/remotesmodel.h
@@ -10,13 +10,13 @@ SPDX-License-Identifier: GPL-3.0-or-later
#pragma once
#include "abstractgititemsmodel.h"
-#include "libgitklient_export.h"
+#include "libkommit_export.h"
namespace Git
{
class Remote;
-class LIBGITKLIENT_EXPORT RemotesModel : public AbstractGitItemsModel
+class LIBKOMMIT_EXPORT RemotesModel : public AbstractGitItemsModel
{
Q_OBJECT
diff --git a/src/libgitklient/models/stashesmodel.cpp b/src/libkommit/models/stashesmodel.cpp
similarity index 100%
rename from src/libgitklient/models/stashesmodel.cpp
rename to src/libkommit/models/stashesmodel.cpp
diff --git a/src/libgitklient/models/stashesmodel.h b/src/libkommit/models/stashesmodel.h
similarity index 89%
rename from src/libgitklient/models/stashesmodel.h
rename to src/libkommit/models/stashesmodel.h
index 7000d2b..558d7da 100644
--- a/src/libgitklient/models/stashesmodel.h
+++ b/src/libkommit/models/stashesmodel.h
@@ -6,14 +6,14 @@ SPDX-License-Identifier: GPL-3.0-or-later
#pragma once
#include "abstractgititemsmodel.h"
-#include "libgitklient_export.h"
+#include "libkommit_export.h"
namespace Git
{
class Manager;
class Stash;
-class LIBGITKLIENT_EXPORT StashesModel : public AbstractGitItemsModel
+class LIBKOMMIT_EXPORT StashesModel : public AbstractGitItemsModel
{
Q_OBJECT
diff --git a/src/libgitklient/models/submodulesmodel.cpp b/src/libkommit/models/submodulesmodel.cpp
similarity index 100%
rename from src/libgitklient/models/submodulesmodel.cpp
rename to src/libkommit/models/submodulesmodel.cpp
diff --git a/src/libgitklient/models/submodulesmodel.h b/src/libkommit/models/submodulesmodel.h
similarity index 87%
rename from src/libgitklient/models/submodulesmodel.h
rename to src/libkommit/models/submodulesmodel.h
index 6f68f3d..9c6dc58 100644
--- a/src/libgitklient/models/submodulesmodel.h
+++ b/src/libkommit/models/submodulesmodel.h
@@ -6,13 +6,13 @@ SPDX-License-Identifier: GPL-3.0-or-later
#pragma once
#include "abstractgititemsmodel.h"
-#include "libgitklient_export.h"
+#include "libkommit_export.h"
namespace Git
{
class Submodule;
-class LIBGITKLIENT_EXPORT SubmodulesModel : public AbstractGitItemsModel
+class LIBKOMMIT_EXPORT SubmodulesModel : public AbstractGitItemsModel
{
Q_OBJECT
diff --git a/src/libgitklient/models/tagsmodel.cpp b/src/libkommit/models/tagsmodel.cpp
similarity index 100%
rename from src/libgitklient/models/tagsmodel.cpp
rename to src/libkommit/models/tagsmodel.cpp
diff --git a/src/libgitklient/models/tagsmodel.h b/src/libkommit/models/tagsmodel.h
similarity index 90%
rename from src/libgitklient/models/tagsmodel.h
rename to src/libkommit/models/tagsmodel.h
index 1aa3805..5b9fd1f 100644
--- a/src/libgitklient/models/tagsmodel.h
+++ b/src/libkommit/models/tagsmodel.h
@@ -6,13 +6,13 @@ SPDX-License-Identifier: GPL-3.0-or-later
#pragma once
#include "abstractgititemsmodel.h"
-#include "libgitklient_export.h"
+#include "libkommit_export.h"
namespace Git
{
class Tag;
-class LIBGITKLIENT_EXPORT TagsModel : public AbstractGitItemsModel
+class LIBKOMMIT_EXPORT TagsModel : public AbstractGitItemsModel
{
Q_OBJECT
diff --git a/src/libgitklient/stash.cpp b/src/libkommit/stash.cpp
similarity index 100%
rename from src/libgitklient/stash.cpp
rename to src/libkommit/stash.cpp
diff --git a/src/libgitklient/stash.h b/src/libkommit/stash.h
similarity index 93%
rename from src/libgitklient/stash.h
rename to src/libkommit/stash.h
index a212c2d..eb36b6c 100644
--- a/src/libgitklient/stash.h
+++ b/src/libkommit/stash.h
@@ -5,7 +5,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
*/
#pragma once
-#include "libgitklient_export.h"
+#include "libkommit_export.h"
#include <QDateTime>
#include <QString>
@@ -13,7 +13,7 @@ namespace Git
{
class Manager;
-class LIBGITKLIENT_EXPORT Stash
+class LIBKOMMIT_EXPORT Stash
{
public:
explicit Stash(Git::Manager *git, QString name);
diff --git a/src/libkommitdiff/CMakeLists.txt b/src/libkommitdiff/CMakeLists.txt
new file mode 100644
index 0000000..8823535
--- /dev/null
+++ b/src/libkommitdiff/CMakeLists.txt
@@ -0,0 +1,49 @@
+add_library(libkommitdiff SHARED)
+
+target_sources(
+ libkommitdiff
+ PRIVATE
+ diff.cpp
+ diff.h
+ results.cpp
+ results.h
+ types.h
+ segments.h
+ segments.cpp
+ text.h
+ text.cpp
+ array.h
+ array.cpp
+ pair.h
+ pair.cpp
+ solution.h
+ solution.cpp
+ lcs.h
+ lcs.cpp
+)
+
+generate_export_header(libkommitdiff BASE_NAME libkommitdiff)
+
+ecm_qt_declare_logging_category(libkommitdiff
+ HEADER libkommitdiff_debug.h
+ IDENTIFIER KOMMITDIFFLIB_LOG
+ CATEGORY_NAME "org.kde.kommit.libkommitdiff" DESCRIPTION "libkommitdiff" EXPORT KOMMIT
+)
+
+set_target_properties(libkommitdiff
+ PROPERTIES OUTPUT_NAME kommitdiff VERSION ${LIBKOMMIT_LIB_VERSION} SOVERSION ${LIBKOMMIT_LIB_SOVERSION}
+)
+
+target_link_libraries(libkommitdiff
+ Qt::Core
+ Qt::Gui
+)
+
+install(
+ TARGETS libkommitdiff ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
+ LIBRARY NAMELINK_SKIP
+)
+
+if (BUILD_TESTING)
+ add_subdirectory(autotests)
+endif()
diff --git a/src/libgitklientdiff/array.cpp b/src/libkommitdiff/array.cpp
similarity index 100%
rename from src/libgitklientdiff/array.cpp
rename to src/libkommitdiff/array.cpp
diff --git a/src/libgitklientdiff/array.h b/src/libkommitdiff/array.h
similarity index 100%
rename from src/libgitklientdiff/array.h
rename to src/libkommitdiff/array.h
diff --git a/src/libgitklientdiff/autotests/CMakeLists.txt b/src/libkommitdiff/autotests/CMakeLists.txt
similarity index 69%
rename from src/libgitklientdiff/autotests/CMakeLists.txt
rename to src/libkommitdiff/autotests/CMakeLists.txt
index 16fe3fa..7505457 100644
--- a/src/libgitklientdiff/autotests/CMakeLists.txt
+++ b/src/libkommitdiff/autotests/CMakeLists.txt
@@ -1,12 +1,12 @@
# SPDX-FileCopyrightText: 2022 Laurent Montel <montel at kde.org>
# SPDX-License-Identifier: BSD-3-Clause
-macro(add_libgitklientdiff_test _source)
+macro(add_libkommitdiff_test _source)
set( _test ${_source})
get_filename_component( _name ${_source} NAME_WE )
add_executable( ${_name} ${_test} ${ARGN} ${_name}.h)
add_test(NAME ${_name} COMMAND ${_name} )
ecm_mark_as_test(${_name})
- target_link_libraries( ${_name} Qt::Test libgitklientdiff)
+ target_link_libraries( ${_name} Qt::Test libkommitdiff)
endmacro()
-add_libgitklientdiff_test(difftest.cpp)
+add_libkommitdiff_test(difftest.cpp)
diff --git a/src/libgitklientdiff/autotests/difftest.cpp b/src/libkommitdiff/autotests/difftest.cpp
similarity index 100%
rename from src/libgitklientdiff/autotests/difftest.cpp
rename to src/libkommitdiff/autotests/difftest.cpp
diff --git a/src/libgitklientdiff/autotests/difftest.h b/src/libkommitdiff/autotests/difftest.h
similarity index 100%
rename from src/libgitklientdiff/autotests/difftest.h
rename to src/libkommitdiff/autotests/difftest.h
diff --git a/src/libgitklientdiff/diff.cpp b/src/libkommitdiff/diff.cpp
similarity index 100%
rename from src/libgitklientdiff/diff.cpp
rename to src/libkommitdiff/diff.cpp
diff --git a/src/libkommitdiff/diff.h b/src/libkommitdiff/diff.h
new file mode 100644
index 0000000..adf7ab1
--- /dev/null
+++ b/src/libkommitdiff/diff.h
@@ -0,0 +1,33 @@
+/*
+SPDX-FileCopyrightText: 2021 Hamed Masafi <hamed.masfi at gmail.com>
+
+SPDX-License-Identifier: GPL-3.0-or-later
+*/
+
+#pragma once
+
+#include "libkommitdiff_export.h"
+#include "results.h"
+#include "segments.h"
+#include "types.h"
+
+#include <QStringList>
+
+namespace Diff
+{
+
+int matchesCount(const QStringList &base, const QStringList &local, const QStringList &remote);
+QStringList take(QStringList &list, int count);
+int remove(QStringList &list, int count);
+
+Q_REQUIRED_RESULT QList<DiffSegment *> LIBKOMMITDIFF_EXPORT diff(const QString &oldText, const QString &newText);
+Q_REQUIRED_RESULT QList<DiffSegment *> LIBKOMMITDIFF_EXPORT diff(const QStringList &oldText, const QStringList &newText);
+
+Q_REQUIRED_RESULT Diff2Result LIBKOMMITDIFF_EXPORT diff2(const QString &oldText, const QString &newText);
+
+Q_REQUIRED_RESULT Diff3Result LIBKOMMITDIFF_EXPORT diff3(const QString &base, const QString &local, const QString &remote);
+Q_REQUIRED_RESULT QList<MergeSegment *> LIBKOMMITDIFF_EXPORT diff3(const QStringList &base, const QStringList &local, const QStringList &remote);
+
+Q_REQUIRED_RESULT QMap<QString, DiffType> LIBKOMMITDIFF_EXPORT diffDirs(const QString &dir1, const QString &dir2);
+
+} // namespace Diff
diff --git a/src/libgitklientdiff/lcs.cpp b/src/libkommitdiff/lcs.cpp
similarity index 100%
rename from src/libgitklientdiff/lcs.cpp
rename to src/libkommitdiff/lcs.cpp
diff --git a/src/libgitklientdiff/lcs.h b/src/libkommitdiff/lcs.h
similarity index 100%
rename from src/libgitklientdiff/lcs.h
rename to src/libkommitdiff/lcs.h
diff --git a/src/libgitklientdiff/pair.cpp b/src/libkommitdiff/pair.cpp
similarity index 100%
rename from src/libgitklientdiff/pair.cpp
rename to src/libkommitdiff/pair.cpp
diff --git a/src/libgitklientdiff/pair.h b/src/libkommitdiff/pair.h
similarity index 100%
rename from src/libgitklientdiff/pair.h
rename to src/libkommitdiff/pair.h
diff --git a/src/libgitklientdiff/results.cpp b/src/libkommitdiff/results.cpp
similarity index 100%
rename from src/libgitklientdiff/results.cpp
rename to src/libkommitdiff/results.cpp
diff --git a/src/libgitklientdiff/results.h b/src/libkommitdiff/results.h
similarity index 78%
rename from src/libgitklientdiff/results.h
rename to src/libkommitdiff/results.h
index f2cf180..d123c60 100644
--- a/src/libgitklientdiff/results.h
+++ b/src/libkommitdiff/results.h
@@ -6,7 +6,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
#pragma once
-#include "libgitklientdiff_export.h"
+#include "libkommitdiff_export.h"
#include "segments.h"
#include "types.h"
@@ -14,13 +14,13 @@ SPDX-License-Identifier: GPL-3.0-or-later
namespace Diff
{
-struct LIBGITKLIENTDIFF_EXPORT Diff2Result {
+struct LIBKOMMITDIFF_EXPORT Diff2Result {
LineEnding oldTextLineEnding;
LineEnding newTextLineEnding;
QList<DiffSegment *> segments;
};
-struct LIBGITKLIENTDIFF_EXPORT Diff3Result {
+struct LIBKOMMITDIFF_EXPORT Diff3Result {
LineEnding baseTextLineEnding;
LineEnding localTextLineEnding;
LineEnding remoteTextLineEnding;
diff --git a/src/libgitklientdiff/segments.cpp b/src/libkommitdiff/segments.cpp
similarity index 100%
rename from src/libgitklientdiff/segments.cpp
rename to src/libkommitdiff/segments.cpp
diff --git a/src/libgitklientdiff/segments.h b/src/libkommitdiff/segments.h
similarity index 80%
rename from src/libgitklientdiff/segments.h
rename to src/libkommitdiff/segments.h
index a38141a..3559555 100644
--- a/src/libgitklientdiff/segments.h
+++ b/src/libkommitdiff/segments.h
@@ -6,14 +6,14 @@ SPDX-License-Identifier: GPL-3.0-or-later
#pragma once
-#include "libgitklientdiff_export.h"
+#include "libkommitdiff_export.h"
#include "types.h"
#include <QStringList>
namespace Diff
{
-struct LIBGITKLIENTDIFF_EXPORT Segment {
+struct LIBKOMMITDIFF_EXPORT Segment {
virtual ~Segment() = default;
QStringList oldText;
@@ -23,13 +23,13 @@ struct LIBGITKLIENTDIFF_EXPORT Segment {
virtual QStringList get(int index);
};
-struct LIBGITKLIENTDIFF_EXPORT DiffSegment : Segment {
+struct LIBKOMMITDIFF_EXPORT DiffSegment : Segment {
~DiffSegment() override = default;
Q_REQUIRED_RESULT QStringList get(int index) override;
};
-struct LIBGITKLIENTDIFF_EXPORT MergeSegment : Segment {
+struct LIBKOMMITDIFF_EXPORT MergeSegment : Segment {
~MergeSegment() override = default;
QStringList base;
QStringList local;
diff --git a/src/libgitklientdiff/solution.cpp b/src/libkommitdiff/solution.cpp
similarity index 100%
rename from src/libgitklientdiff/solution.cpp
rename to src/libkommitdiff/solution.cpp
diff --git a/src/libgitklientdiff/solution.h b/src/libkommitdiff/solution.h
similarity index 100%
rename from src/libgitklientdiff/solution.h
rename to src/libkommitdiff/solution.h
diff --git a/src/libgitklientdiff/text.cpp b/src/libkommitdiff/text.cpp
similarity index 100%
rename from src/libgitklientdiff/text.cpp
rename to src/libkommitdiff/text.cpp
diff --git a/src/libgitklientdiff/text.h b/src/libkommitdiff/text.h
similarity index 100%
rename from src/libgitklientdiff/text.h
rename to src/libkommitdiff/text.h
diff --git a/src/libgitklientdiff/types.h b/src/libkommitdiff/types.h
similarity index 100%
rename from src/libgitklientdiff/types.h
rename to src/libkommitdiff/types.h
More information about the kde-doc-english
mailing list