Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Utilities
Konsole
Commits
fbe57423
Commit
fbe57423
authored
Jul 29, 2020
by
Tomaz Canabrava
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add new static lib: konsolecolorscheme
parent
7adfa6fb
Changes
19
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
56 additions
and
30 deletions
+56
-30
src/CMakeLists.txt
src/CMakeLists.txt
+17
-19
src/HTMLDecoder.cpp
src/HTMLDecoder.cpp
+1
-1
src/ViewManager.cpp
src/ViewManager.cpp
+8
-5
src/colorscheme/CMakeLists.txt
src/colorscheme/CMakeLists.txt
+22
-0
src/colorscheme/ColorScheme.cpp
src/colorscheme/ColorScheme.cpp
+0
-0
src/colorscheme/ColorScheme.h
src/colorscheme/ColorScheme.h
+0
-0
src/colorscheme/ColorSchemeEditor.cpp
src/colorscheme/ColorSchemeEditor.cpp
+0
-0
src/colorscheme/ColorSchemeEditor.h
src/colorscheme/ColorSchemeEditor.h
+0
-0
src/colorscheme/ColorSchemeEditor.ui
src/colorscheme/ColorSchemeEditor.ui
+0
-0
src/colorscheme/ColorSchemeManager.cpp
src/colorscheme/ColorSchemeManager.cpp
+0
-0
src/colorscheme/ColorSchemeManager.h
src/colorscheme/ColorSchemeManager.h
+0
-0
src/colorscheme/ColorSchemeViewDelegate.cpp
src/colorscheme/ColorSchemeViewDelegate.cpp
+0
-0
src/colorscheme/ColorSchemeViewDelegate.h
src/colorscheme/ColorSchemeViewDelegate.h
+0
-0
src/colorscheme/ColorSchemeWallpaper.cpp
src/colorscheme/ColorSchemeWallpaper.cpp
+0
-0
src/colorscheme/ColorSchemeWallpaper.h
src/colorscheme/ColorSchemeWallpaper.h
+0
-0
src/profile/CMakeLists.txt
src/profile/CMakeLists.txt
+1
-0
src/profile/EditProfileDialog.cpp
src/profile/EditProfileDialog.cpp
+2
-1
src/profile/EditProfileDialog.h
src/profile/EditProfileDialog.h
+4
-3
src/widgets/TerminalDisplay.h
src/widgets/TerminalDisplay.h
+1
-1
No files found.
src/CMakeLists.txt
View file @
fbe57423
...
...
@@ -81,6 +81,7 @@ add_library(konsoleprivate_core STATIC ${konsoleprivate_core_SRCS})
target_link_libraries
(
konsoleprivate_core
${
konsole_LIBS
}
)
add_subdirectory
(
colorscheme
)
add_subdirectory
(
profile
)
set
(
konsoleprivate_SRCS
${
sessionadaptors_SRCS
}
...
...
@@ -88,13 +89,8 @@ set(konsoleprivate_SRCS ${sessionadaptors_SRCS}
hsluv.c
BookmarkHandler.cpp
BookmarkMenu.cpp
ColorScheme.cpp
ColorSchemeWallpaper.cpp
ColorSchemeManager.cpp
ColorSchemeEditor.cpp
CopyInputDialog.cpp
CheckableSessionModel.cpp
ColorSchemeViewDelegate.cpp
LabelsAligner.cpp
FontDialog.cpp
Emulation.cpp
...
...
@@ -179,20 +175,21 @@ kconfig_add_kcfg_files(konsoleprivate_SRCS settings/KonsoleSettings.kcfgc)
### Konsole Application
ki18n_wrap_ui
(
konsoleprivate_SRCS ColorSchemeEditor.ui
CopyInputDialog.ui
KeyBindingEditor.ui
RenameTabDialog.ui
widgets/RenameTabWidget.ui
HistorySizeDialog.ui
widgets/HistorySizeWidget.ui
PrintOptions.ui
settings/TemporaryFilesSettings.ui
settings/GeneralSettings.ui
settings/PartInfo.ui
settings/ProfileSettings.ui
settings/TabBarSettings.ui
settings/ThumbnailsSettings.ui
)
ki18n_wrap_ui
(
konsoleprivate_SRCS
CopyInputDialog.ui
KeyBindingEditor.ui
RenameTabDialog.ui
widgets/RenameTabWidget.ui
HistorySizeDialog.ui
widgets/HistorySizeWidget.ui
PrintOptions.ui
settings/TemporaryFilesSettings.ui
settings/GeneralSettings.ui
settings/PartInfo.ui
settings/ProfileSettings.ui
settings/TabBarSettings.ui
settings/ThumbnailsSettings.ui
)
# add the resource files for the ui files
qt5_add_resources
(
konsoleprivate_SRCS ../desktop/konsole.qrc
)
...
...
@@ -203,6 +200,7 @@ generate_export_header(konsoleprivate BASE_NAME konsoleprivate)
target_link_libraries
(
konsoleprivate
PUBLIC
konsoleprivate_core
konsolecolorscheme
konsoleprofile
${
konsole_LIBS
}
)
...
...
src/HTMLDecoder.cpp
View file @
fbe57423
...
...
@@ -23,7 +23,7 @@
#include "HTMLDecoder.h"
// Konsole
#include "ColorSchemeManager.h"
#include "
colorscheme/
ColorSchemeManager.h"
#include "ExtendedCharTable.h"
// Qt
...
...
src/ViewManager.cpp
View file @
fbe57423
...
...
@@ -34,15 +34,18 @@
// Konsole
#include <windowadaptor.h>
#include "ColorScheme.h"
#include "ColorSchemeManager.h"
#include "colorscheme/ColorScheme.h"
#include "colorscheme/ColorSchemeManager.h"
#include "profile/ProfileManager.h"
#include "session/Session.h"
#include "widgets/TerminalDisplay.h"
#include "session/SessionController.h"
#include "session/SessionManager.h"
#include "profile/ProfileManager.h"
#include "widgets/
ViewSplitter
.h"
#include "widgets/
TerminalDisplay
.h"
#include "widgets/ViewContainer.h"
#include "widgets/ViewSplitter.h"
using
namespace
Konsole
;
...
...
src/colorscheme/CMakeLists.txt
0 → 100644
View file @
fbe57423
set
(
konsole_colorscheme_SRCS
ColorScheme.cpp
ColorSchemeManager.cpp
ColorSchemeWallpaper.cpp
ColorSchemeEditor.cpp
ColorSchemeViewDelegate.cpp
)
ki18n_wrap_ui
(
konsoleprofile_SRCS
ColorSchemeEditor.ui
)
add_library
(
konsolecolorscheme
STATIC
${
konsole_colorscheme_SRCS
}
)
target_link_libraries
(
konsolecolorscheme
${
konsole_LIBS
}
konsoleprivate_core
)
src/ColorScheme.cpp
→
src/
colorscheme/
ColorScheme.cpp
View file @
fbe57423
File moved
src/ColorScheme.h
→
src/
colorscheme/
ColorScheme.h
View file @
fbe57423
File moved
src/ColorSchemeEditor.cpp
→
src/
colorscheme/
ColorSchemeEditor.cpp
View file @
fbe57423
File moved
src/ColorSchemeEditor.h
→
src/
colorscheme/
ColorSchemeEditor.h
View file @
fbe57423
File moved
src/ColorSchemeEditor.ui
→
src/
colorscheme/
ColorSchemeEditor.ui
View file @
fbe57423
File moved
src/ColorSchemeManager.cpp
→
src/
colorscheme/
ColorSchemeManager.cpp
View file @
fbe57423
File moved
src/ColorSchemeManager.h
→
src/
colorscheme/
ColorSchemeManager.h
View file @
fbe57423
File moved
src/ColorSchemeViewDelegate.cpp
→
src/
colorscheme/
ColorSchemeViewDelegate.cpp
View file @
fbe57423
File moved
src/ColorSchemeViewDelegate.h
→
src/
colorscheme/
ColorSchemeViewDelegate.h
View file @
fbe57423
File moved
src/ColorSchemeWallpaper.cpp
→
src/
colorscheme/
ColorSchemeWallpaper.cpp
View file @
fbe57423
File moved
src/ColorSchemeWallpaper.h
→
src/
colorscheme/
ColorSchemeWallpaper.h
View file @
fbe57423
File moved
src/profile/CMakeLists.txt
View file @
fbe57423
...
...
@@ -25,4 +25,5 @@ target_link_libraries(
konsoleprofile
${
konsole_LIBS
}
konsoleprivate_core
konsolecolorscheme
)
src/profile/EditProfileDialog.cpp
View file @
fbe57423
...
...
@@ -51,7 +51,8 @@
#include "ui_EditProfileKeyboardPage.h"
#include "ui_EditProfileMousePage.h"
#include "ui_EditProfileAdvancedPage.h"
#include "ColorSchemeManager.h"
#include "colorscheme/ColorSchemeManager.h"
#include "KeyBindingEditor.h"
#include "KeyboardTranslator.h"
#include "KeyboardTranslatorManager.h"
...
...
src/profile/EditProfileDialog.h
View file @
fbe57423
...
...
@@ -26,14 +26,15 @@
#include <KNS3/Entry>
// Konsole
#include "colorscheme/ColorScheme.h"
#include "colorscheme/ColorSchemeEditor.h"
#include "colorscheme/ColorSchemeViewDelegate.h"
#include "Profile.h"
#include "ProfileGroup.h"
#include "Enumeration.h"
#include "ColorScheme.h"
#include "ColorSchemeEditor.h"
#include "KeyboardTranslatorManager.h"
#include "FontDialog.h"
#include "ColorSchemeViewDelegate.h"
#include "LabelsAligner.h"
class
KPluralHandlingSpinBox
;
...
...
src/widgets/TerminalDisplay.h
View file @
fbe57423
...
...
@@ -30,7 +30,7 @@
#include "Character.h"
#include "konsoleprivate_export.h"
#include "ScreenWindow.h"
#include "ColorScheme.h"
#include "
colorscheme/
ColorScheme.h"
#include "Enumeration.h"
#include "ScrollState.h"
#include "TerminalHeaderBar.h"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment