summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ConfigureChecks.cmake8
-rw-r--r--konqueror/konq_mainwindow.cpp16
-rw-r--r--konqueror/konq_view.cpp21
-rw-r--r--konsole/other/CMakeLists.txt3
-rw-r--r--konsole/other/LICENSE.Solarized-themes20
-rw-r--r--konsole/other/Solarized.schema40
-rw-r--r--konsole/other/SolarizedLight.schema40
-rw-r--r--krootbacking/krootbacking.h2
-rw-r--r--l10n/bn/entry.desktop2
-rw-r--r--libkonq/konq_popupmenu.h4
-rw-r--r--tdeioslave/man/man2html.cpp2
-rw-r--r--tdeioslave/thumbnail/imagethumbnail.desktop2
-rw-r--r--tdekbdledsync/CMakeLists.txt2
-rw-r--r--tdeprint/kjobviewer/kjobviewer-autostart.desktop2
-rw-r--r--tsak/CMakeLists.txt2
15 files changed, 147 insertions, 19 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index b72d866df..45c0be953 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -159,11 +159,11 @@ if( WITH_TDEHWLIB )
endif( )
-# udev (tsak)
-if( BUILD_TSAK )
- pkg_search_module( UDEV udev )
+# udev (tsak, tdekbdledsync)
+if( BUILD_TSAK OR BUILD_TDEKBDLEDSYNC )
+ pkg_search_module( UDEV libudev )
if( NOT UDEV_FOUND )
- tde_message_fatal( "udev is required, but was not found on your system" )
+ tde_message_fatal( "udev library is required, but was not found on your system" )
endif( )
endif( )
diff --git a/konqueror/konq_mainwindow.cpp b/konqueror/konq_mainwindow.cpp
index 01cbf5a52..1905f5771 100644
--- a/konqueror/konq_mainwindow.cpp
+++ b/konqueror/konq_mainwindow.cpp
@@ -3580,6 +3580,22 @@ bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev)
}
}
}
+
+ else if (ev->type() == TQEvent::MouseButtonRelease)
+ {
+ TQMouseEvent *mouseEv = static_cast<TQMouseEvent*>(ev);
+ switch (mouseEv->button())
+ {
+ case TQMouseEvent::HistoryBackButton:
+ slotBack();
+ return true;
+
+ case TQMouseEvent::HistoryForwardButton:
+ slotForward();
+ return true;
+ }
+ }
+
return KParts::MainWindow::eventFilter( obj, ev );
}
diff --git a/konqueror/konq_view.cpp b/konqueror/konq_view.cpp
index 0f809ccd1..c65537382 100644
--- a/konqueror/konq_view.cpp
+++ b/konqueror/konq_view.cpp
@@ -472,7 +472,7 @@ void KonqView::connectPart( )
m_pPart->widget()->installEventFilter( this );
- if (m_bBackRightClick && m_pPart->widget()->inherits("TQScrollView") )
+ if (m_pPart->widget()->inherits("TQScrollView"))
{
(static_cast<TQScrollView *>(m_pPart->widget()))->viewport()->installEventFilter( this );
}
@@ -1220,10 +1220,6 @@ void KonqView::reparseConfiguration()
bool b = KonqSettings::backRightClick();
if ( m_bBackRightClick != b )
{
- if (m_bBackRightClick && m_pPart->widget()->inherits("TQScrollView") )
- {
- (static_cast<TQScrollView *>(m_pPart->widget()))->viewport()->installEventFilter( this );
- }
enableBackRightClick( b );
}
}
@@ -1289,6 +1285,21 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e )
emit ext->openURLRequest( lstDragURLs.first() ); // this will call m_pMainWindow::slotOpenURLRequest delayed
}
+ else if (e->type() == TQEvent::MouseButtonRelease)
+ {
+ TQMouseEvent *mouseEvent = static_cast<TQMouseEvent*>(e);
+ switch (mouseEvent->button())
+ {
+ case TQMouseEvent::HistoryBackButton:
+ go(-1);
+ return true;
+
+ case TQMouseEvent::HistoryForwardButton:
+ go(1);
+ return true;
+ }
+ }
+
if ( m_bBackRightClick )
{
if ( e->type() == TQEvent::ContextMenu )
diff --git a/konsole/other/CMakeLists.txt b/konsole/other/CMakeLists.txt
index 564bf3504..39992673e 100644
--- a/konsole/other/CMakeLists.txt
+++ b/konsole/other/CMakeLists.txt
@@ -28,7 +28,8 @@ install(
Linux.schema XTerm.schema vim.schema DarkPicture.schema
LightPicture.schema Transparent.schema GreenTint.schema
Transparent_MC.schema GreenTint_MC.schema Transparent_lightbg.schema
- Transparent_darkbg.schema LightPaper.schema
+ Transparent_darkbg.schema LightPaper.schema Solarized.schema
+ SolarizedLight.schema
linux.keytab vt100.keytab vt420pc.keytab x11r5.keytab
solaris.keytab README.Schema README.KeyTab README.default.Keytab
DESTINATION ${DATA_INSTALL_DIR}/konsole
diff --git a/konsole/other/LICENSE.Solarized-themes b/konsole/other/LICENSE.Solarized-themes
new file mode 100644
index 000000000..ee08d7e44
--- /dev/null
+++ b/konsole/other/LICENSE.Solarized-themes
@@ -0,0 +1,20 @@
+Copyright (c) 2011 Ethan Schoonover
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
diff --git a/konsole/other/Solarized.schema b/konsole/other/Solarized.schema
new file mode 100644
index 000000000..ab98e4f06
--- /dev/null
+++ b/konsole/other/Solarized.schema
@@ -0,0 +1,40 @@
+# Solarized color scheme by Ethan Schoonover
+#
+# https://ethanschoonover.com/solarized/
+
+title Solarized
+
+# foreground colors
+
+# note that the default background color is flagged
+# to become transparent when an image is present.
+
+# slot transparent bold
+# | | |
+# V V--color--V V V
+
+color 0 131 148 150 0 0 # regular foreground color
+color 1 0 43 54 1 0 # regular background color
+
+color 2 7 54 66 0 0 # regular color 0 Black
+color 3 220 50 47 0 0 # regular color 1 Red
+color 4 133 153 0 0 0 # regular color 2 Green
+color 5 181 137 0 0 0 # regular color 3 Yellow
+color 6 38 139 210 0 0 # regular color 4 Blue
+color 7 211 54 130 0 0 # regular color 5 Magenta
+color 8 42 161 152 0 0 # regular color 6 Cyan
+color 9 238 232 213 0 0 # regular color 7 White
+
+# intensive colors
+
+color 10 147 161 161 0 0 # intensive foreground color
+color 11 7 54 66 1 0 # intensive background color
+
+color 12 0 43 54 0 0 # intensive color 0
+color 13 203 75 22 0 0 # intensive color 1
+color 14 88 110 117 0 0 # intensive color 2
+color 15 101 123 131 0 0 # intensive color 3
+color 16 131 148 150 0 0 # intensive color 4
+color 17 108 113 196 0 0 # intensive color 5
+color 18 147 161 161 0 0 # intensive color 6
+color 19 253 246 227 0 0 # intensive color 7
diff --git a/konsole/other/SolarizedLight.schema b/konsole/other/SolarizedLight.schema
new file mode 100644
index 000000000..61905f535
--- /dev/null
+++ b/konsole/other/SolarizedLight.schema
@@ -0,0 +1,40 @@
+# Solarized Light color scheme by Ethan Schoonover
+#
+# https://ethanschoonover.com/solarized/
+
+title Solarized Light
+
+# foreground colors
+
+# note that the default background color is flagged
+# to become transparent when an image is present.
+
+# slot transparent bold
+# | | |
+# V V--color--V V V
+
+color 0 101 123 131 0 0 # regular foreground color
+color 1 253 246 227 1 0 # regular background color
+
+color 2 7 54 66 0 0 # regular color 0 Black
+color 3 220 50 47 0 0 # regular color 1 Red
+color 4 133 153 0 0 0 # regular color 2 Green
+color 5 181 137 0 0 0 # regular color 3 Yellow
+color 6 38 139 210 0 0 # regular color 4 Blue
+color 7 211 54 130 0 0 # regular color 5 Magenta
+color 8 42 161 152 0 0 # regular color 6 Cyan
+color 9 238 232 213 0 0 # regular color 7 White
+
+# intensive colors
+
+color 10 88 110 117 0 0 # intensive foreground color
+color 11 238 232 213 1 0 # intensive background color
+
+color 12 0 43 54 0 0 # intensive color 0
+color 13 203 75 22 0 0 # intensive color 1
+color 14 88 110 117 0 0 # intensive color 2
+color 15 101 123 131 0 0 # intensive color 3
+color 16 131 148 150 0 0 # intensive color 4
+color 17 108 113 196 0 0 # intensive color 5
+color 18 147 161 161 0 0 # intensive color 6
+color 19 253 246 227 0 0 # intensive color 7
diff --git a/krootbacking/krootbacking.h b/krootbacking/krootbacking.h
index a430d3c45..212290905 100644
--- a/krootbacking/krootbacking.h
+++ b/krootbacking/krootbacking.h
@@ -76,7 +76,7 @@ public:
* Deprecated, use isAvailable() instead.
* @deprecated
*/
- KDE_DEPRECATED bool checkAvailable(bool) { return isAvailable(); }
+ TDE_DEPRECATED bool checkAvailable(bool) { return isAvailable(); }
#endif
/** @since 3.2
diff --git a/l10n/bn/entry.desktop b/l10n/bn/entry.desktop
index 906046657..7f6da1a25 100644
--- a/l10n/bn/entry.desktop
+++ b/l10n/bn/entry.desktop
@@ -2,7 +2,7 @@
# FIXME Which Chinese??
Name=Brunei Darussalam
Region=southeastasia
-Languages=ms,zn_CN
+Languages=ms,zh_CN
#DecimalSymbol=,
#ThousandsSeparator=
CurrencySymbol=B$
diff --git a/libkonq/konq_popupmenu.h b/libkonq/konq_popupmenu.h
index d50142c2f..d4c956029 100644
--- a/libkonq/konq_popupmenu.h
+++ b/libkonq/konq_popupmenu.h
@@ -79,7 +79,7 @@ public:
KURL viewURL,
TDEActionCollection & actions,
KNewMenu * newMenu,
- bool showPropertiesAndFileType = true ) KDE_DEPRECATED;
+ bool showPropertiesAndFileType = true ) TDE_DEPRECATED;
/**
* @deprecated uses bool instead of KonqPopupFlags enum,
@@ -91,7 +91,7 @@ public:
TDEActionCollection & actions,
KNewMenu * newMenu,
TQWidget * parentWidget,
- bool showPropertiesAndFileType = true ) KDE_DEPRECATED;
+ bool showPropertiesAndFileType = true ) TDE_DEPRECATED;
/**
* Constructor
diff --git a/tdeioslave/man/man2html.cpp b/tdeioslave/man/man2html.cpp
index 3f27feb68..69c0e25c5 100644
--- a/tdeioslave/man/man2html.cpp
+++ b/tdeioslave/man/man2html.cpp
@@ -1075,7 +1075,7 @@ static TQCString set_font( const TQCString& name )
/// \deprecated
static TQCString set_font( const char ch )
#ifndef SIMPLE_MAN2HTML
- KDE_DEPRECATED;
+ TDE_DEPRECATED;
static TQCString set_font( const char ch )
#endif
diff --git a/tdeioslave/thumbnail/imagethumbnail.desktop b/tdeioslave/thumbnail/imagethumbnail.desktop
index d9b43e91b..a7ebf4a0b 100644
--- a/tdeioslave/thumbnail/imagethumbnail.desktop
+++ b/tdeioslave/thumbnail/imagethumbnail.desktop
@@ -4,6 +4,6 @@ Type=Service
Name=Images
X-TDE-ServiceTypes=ThumbCreator
-MimeTypes=image/cgm,image/fax-g3,image/gif,image/jp2,image/jpeg,image/pjpeg,image/png,image/tiff,image/x-bmp,image/x-dds,image/x-ico,image/x-jng,image/x-pcx,image/x-photo-cd,image/x-portable-bitmap,image/x-portable-greymap,image/x-portable-pixmap,image/x-rgb,image/x-targa,image/x-wmf,image/x-xbm,image/x-xcf-gimp,image/x-xfig,image/x-xpm
+MimeTypes=image/cgm,image/fax-g3,image/gif,image/jp2,image/jpeg,image/pjpeg,image/png,image/tiff,image/webp,image/x-bmp,image/x-dds,image/x-ico,image/x-jng,image/x-pcx,image/x-photo-cd,image/x-portable-bitmap,image/x-portable-greymap,image/x-portable-pixmap,image/x-rgb,image/x-targa,image/x-wmf,image/x-xbm,image/x-xcf-gimp,image/x-xfig,image/x-xpm
X-TDE-Library=imagethumbnail
CacheThumbnail=true
diff --git a/tdekbdledsync/CMakeLists.txt b/tdekbdledsync/CMakeLists.txt
index a7ba5c621..78d95187f 100644
--- a/tdekbdledsync/CMakeLists.txt
+++ b/tdekbdledsync/CMakeLists.txt
@@ -23,7 +23,7 @@ link_directories(
tde_add_executable( tdekbdledsync
SOURCES getfd.c main.cpp
- LINK udev X11
+ LINK ${UDEV_LIBRARIES} X11
DESTINATION ${BIN_INSTALL_DIR}
SETUID
)
diff --git a/tdeprint/kjobviewer/kjobviewer-autostart.desktop b/tdeprint/kjobviewer/kjobviewer-autostart.desktop
index cc7b52114..4188f3eb2 100644
--- a/tdeprint/kjobviewer/kjobviewer-autostart.desktop
+++ b/tdeprint/kjobviewer/kjobviewer-autostart.desktop
@@ -14,4 +14,4 @@ X-TDE-autostart-condition=tdeprintrc:Jobs:KeepWindow:false
X-TDE-autostart-phase=1
X-TDE-StartupNotify=false
Categories=Qt;TDE;Utility;Printing;HardwareSettings;TrayIcon;
-ShowOnlyIn=TDE;
+OnlyShowIn=TDE;
diff --git a/tsak/CMakeLists.txt b/tsak/CMakeLists.txt
index 4490636db..185816b94 100644
--- a/tsak/CMakeLists.txt
+++ b/tsak/CMakeLists.txt
@@ -23,6 +23,6 @@ link_directories(
tde_add_executable( tsak
SOURCES main.cpp
- LINK udev
+ LINK ${UDEV_LIBRARIES}
DESTINATION ${BIN_INSTALL_DIR}
)
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 08:11:51 +0000