Compare commits

..

1 Commits

Author SHA1 Message Date
Marius P
52527b8b55 project file allow installation in another dir than "/usr"
E.g. this way I can build and install in "~/.local", or "/usr/local".
2024-10-11 10:57:26 +02:00
9 changed files with 29 additions and 30 deletions

3
.gitignore vendored
View File

@ -48,6 +48,3 @@ cool-retro-term
.DS_Store .DS_Store
*.app *.app
# IntelliJ
.idea

View File

@ -19,20 +19,26 @@ RESOURCES += qml/resources.qrc
## INSTALLS ## INSTALLS
######################################### #########################################
target.path += /usr/bin/ PREFIX = $$(PREFIX) # Pass the make install PREFIX via environment variable. E.g. "PREFIX=/path/to/my/dir qmake".
isEmpty(PREFIX) {
message(No prefix given. Using /usr.)
PREFIX=/usr
}
target.path = $$PREFIX/bin
INSTALLS += target INSTALLS += target
# Install icons # Install icons
unix { unix {
icon32.files = icons/32x32/cool-retro-term.png icon32.files = icons/32x32/cool-retro-term.png
icon32.path = /usr/share/icons/hicolor/32x32/apps icon32.path = $$PREFIX/share/icons/hicolor/32x32/apps
icon64.files = icons/64x64/cool-retro-term.png icon64.files = icons/64x64/cool-retro-term.png
icon64.path = /usr/share/icons/hicolor/64x64/apps icon64.path = $$PREFIX/share/icons/hicolor/64x64/apps
icon128.files = icons/128x128/cool-retro-term.png icon128.files = icons/128x128/cool-retro-term.png
icon128.path = /usr/share/icons/hicolor/128x128/apps icon128.path = $$PREFIX/share/icons/hicolor/128x128/apps
icon256.files = icons/256x256/cool-retro-term.png icon256.files = icons/256x256/cool-retro-term.png
icon256.path = /usr/share/icons/hicolor/256x256/apps icon256.path = $$PREFIX/share/icons/hicolor/256x256/apps
INSTALLS += icon32 icon64 icon128 icon256 INSTALLS += icon32 icon64 icon128 icon256
} }

View File

@ -58,7 +58,6 @@ int main(int argc, char *argv[])
cout << " -p|--profile <prof> Run cool-retro-term with the given profile." << '\n'; cout << " -p|--profile <prof> Run cool-retro-term with the given profile." << '\n';
cout << " -h|--help Print this help." << '\n'; cout << " -h|--help Print this help." << '\n';
cout << " --verbose Print additional information such as profiles and settings." << '\n'; cout << " --verbose Print additional information such as profiles and settings." << '\n';
cout << " -v|--version Print the program name and version." << '\n';
return 0; return 0;
} }

View File

@ -32,7 +32,7 @@ QtObject {
readonly property real maximumFontScaling: 2.50 readonly property real maximumFontScaling: 2.50
readonly property real minBurnInFadeTime: 160 readonly property real minBurnInFadeTime: 160
readonly property real maxBurnInFadeTime: 1600 readonly property real maxBurnInFadeTime: 160000
property bool isMacOS: Qt.platform.os === "osx" property bool isMacOS: Qt.platform.os === "osx"

View File

@ -29,8 +29,8 @@ Loader {
property real lastUpdate: 0 property real lastUpdate: 0
property real prevLastUpdate: 0 property real prevLastUpdate: 0
property real burnIn: appSettings.burnIn property real burnIn: appSettings.burnIn;
property real burnInFadeTime: 1 / Utils.lint(_minBurnInFadeTime, _maxBurnInFadeTime, burnIn) property real burnInFadeTime: (1 / Utils.lint(_minBurnInFadeTime, _maxBurnInFadeTime, burnIn))*64
property real _minBurnInFadeTime: appSettings.minBurnInFadeTime property real _minBurnInFadeTime: appSettings.minBurnInFadeTime
property real _maxBurnInFadeTime: appSettings.maxBurnInFadeTime property real _maxBurnInFadeTime: appSettings.maxBurnInFadeTime
@ -146,9 +146,8 @@ Loader {
float prevMask = accColor.a; float prevMask = accColor.a;
float currMask = rgb2grey(txtColor); float currMask = rgb2grey(txtColor);
highp float blurDecay = clamp((lastUpdate - prevLastUpdate) * burnInTime, 0.0, 1.0); highp float blurDecay = clamp(pow(0.5, burnInTime * (lastUpdate - prevLastUpdate)), 0.0, 1.0);
blurDecay = max(0.0, blurDecay - prevMask); vec3 blurColor = accColor.rgb * vec3(blurDecay);
vec3 blurColor = accColor.rgb - vec3(blurDecay);
vec3 color = max(blurColor, txtColor); vec3 color = max(blurColor, txtColor);
gl_FragColor = vec4(color, currMask); gl_FragColor = vec4(color, currMask);

View File

@ -58,13 +58,6 @@ Item{
kterminal.pasteClipboard() kterminal.pasteClipboard()
} }
} }
Connections {
target: pasteActionAlt
onTriggered: {
kterminal.pasteSelection()
}
}
//When settings are updated sources need to be redrawn. //When settings are updated sources need to be redrawn.
Connections { Connections {

View File

@ -321,8 +321,8 @@ Item {
(burnIn !== 0 ? " (burnIn !== 0 ? "
vec4 txt_blur = texture2D(burnInSource, staticCoords); vec4 txt_blur = texture2D(burnInSource, staticCoords);
float blurDecay = clamp((time - burnInLastUpdate) * burnInTime, 0.0, 1.0); float blurDecay = clamp(pow(0.5, burnInTime * (time - burnInLastUpdate)), 0.0, 1.0);
vec3 burnInColor = 0.65 * (txt_blur.rgb - vec3(blurDecay)); vec3 burnInColor = txt_blur.rgb * vec3(blurDecay);
txt_color = max(txt_color, convertWithChroma(burnInColor));" txt_color = max(txt_color, convertWithChroma(burnInColor));"
: "") + : "") +

View File

@ -116,11 +116,6 @@ ApplicationWindow {
text: qsTr("Paste") text: qsTr("Paste")
shortcut: "Ctrl+Shift+V" shortcut: "Ctrl+Shift+V"
} }
Action {
id: pasteActionAlt
text: qsTr("Paste selection")
shortcut: "Shift+Insert"
}
Action { Action {
id: zoomIn id: zoomIn
text: qsTr("Zoom In") text: qsTr("Zoom In")

View File

@ -5,7 +5,17 @@ CONFIG += ordered
SUBDIRS += qmltermwidget SUBDIRS += qmltermwidget
SUBDIRS += app SUBDIRS += app
#########################################
## INSTALLS
#########################################
PREFIX = $$(PREFIX) # Pass the make install PREFIX via environment variable. E.g. "PREFIX=/path/to/my/dir qmake".
isEmpty(PREFIX) {
message(No prefix given. Using /usr.)
PREFIX=/usr
}
desktop.files += cool-retro-term.desktop desktop.files += cool-retro-term.desktop
desktop.path += /usr/share/applications desktop.path += $$PREFIX/share/applications
INSTALLS += desktop INSTALLS += desktop