summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/kappfinder/CMakeLists.txt6
-rw-r--r--doc/khelpcenter/releasenotes/r14.0.13.docbook127
-rw-r--r--kcontrol/dnssd/configdialog.ui12
-rw-r--r--kcontrol/taskbar/kcmtaskbar.cpp135
-rw-r--r--kcontrol/taskbar/kcmtaskbar.h3
-rw-r--r--kcontrol/taskbar/kcmtaskbarui.ui1562
-rw-r--r--khotkeys/kcontrol/CMakeLists.txt2
-rw-r--r--khotkeys/kcontrol/Makefile.am2
-rw-r--r--khotkeys/kcontrol/action_list_widget.cpp84
-rw-r--r--khotkeys/kcontrol/action_list_widget.h40
-rw-r--r--khotkeys/kcontrol/actions_listview_widget.cpp10
-rw-r--r--khotkeys/kcontrol/actions_listview_widget.h16
-rw-r--r--khotkeys/kcontrol/condition_list_widget.cpp58
-rw-r--r--khotkeys/kcontrol/condition_list_widget.h18
-rw-r--r--khotkeys/kcontrol/ui/CMakeLists.txt2
-rw-r--r--khotkeys/kcontrol/ui/Makefile.am2
-rw-r--r--khotkeys/kcontrol/ui/action_list_widget_ui.ui30
-rw-r--r--khotkeys/kcontrol/ui/condition_list_widget_ui.ui32
-rw-r--r--khotkeys/kcontrol/ui/waiting_widget_ui.ui72
-rw-r--r--khotkeys/kcontrol/waiting_widget.cpp56
-rw-r--r--khotkeys/kcontrol/waiting_widget.h36
-rw-r--r--khotkeys/shared/actions.cpp34
-rw-r--r--khotkeys/shared/actions.h29
-rw-r--r--khotkeys/shared/settings.cpp6
-rw-r--r--khotkeys/shared/triggers.cpp2
-rw-r--r--kicker/taskbar/taskbar.cpp94
-rw-r--r--kicker/taskbar/taskbar.h43
-rw-r--r--kicker/taskbar/taskbar.kcfg25
-rw-r--r--kicker/taskbar/taskcontainer.cpp176
-rw-r--r--kicker/taskbar/taskcontainer.h3
-rw-r--r--kicker/taskmanager/taskrmbmenu.cpp77
-rw-r--r--konsole/konsole/TEWidget.cpp24
-rw-r--r--konsole/konsole/TEWidget.h4
-rw-r--r--konsole/konsole/konsole.cpp11
-rw-r--r--konsole/konsole/konsole_part.cpp11
-rw-r--r--ktip/tips6
-rw-r--r--libkonq/PLUGINS.md (renamed from libkonq/PLUGINS)17
-rw-r--r--libkonq/SERVICEMENUS52
-rw-r--r--libkonq/SERVICEMENUS.md55
-rw-r--r--translations/desktop_files/applnk-compat/es.po15
-rw-r--r--translations/desktop_files/applnk-directories/es.po25
-rw-r--r--translations/desktop_files/kappfinder-data/pl.po34
-rw-r--r--translations/desktop_files/kate-desktops/pl.po18
-rw-r--r--translations/desktop_files/kcontrol-desktops/pl.po10
-rw-r--r--translations/desktop_files/kdesktop-desktops/pl.po30
-rw-r--r--translations/desktop_files/kdesktop-desktops/uk.po24
-rw-r--r--translations/desktop_files/khelpcenter-desktops/pl.po17
-rw-r--r--translations/desktop_files/khotkeys-data/pl.po9
-rw-r--r--translations/desktop_files/kicker-desktops/el.po19
-rw-r--r--translations/desktop_files/kmenuedit.desktop/pl.po17
-rw-r--r--translations/desktop_files/knetattach.desktop/es.po15
-rw-r--r--translations/desktop_files/knetattach.desktop/pl.po16
-rw-r--r--translations/desktop_files/konsole-eventsrc/pl.po16
-rw-r--r--translations/desktop_files/ksplash-themes/el.po101
-rw-r--r--translations/desktop_files/ksplash-themes/es.po45
-rw-r--r--translations/desktop_files/ktip.desktop/es.po15
-rw-r--r--translations/desktop_files/l10n-desktops/pl.po23
-rw-r--r--translations/desktop_files/tdeprint-desktops/pl.po10
-rw-r--r--translations/desktop_files/twin-desktops/pt.po16
-rw-r--r--twin/clients/plastik/config/configdialog.ui3
-rw-r--r--twin/kcmtwin/twinrules/ruleslistbase.ui3
-rw-r--r--twin/kcmtwin/twinrules/ruleswidgetbase.ui21
62 files changed, 2374 insertions, 1102 deletions
diff --git a/doc/kappfinder/CMakeLists.txt b/doc/kappfinder/CMakeLists.txt
new file mode 100644
index 000000000..54e4d7175
--- /dev/null
+++ b/doc/kappfinder/CMakeLists.txt
@@ -0,0 +1,6 @@
+#################################################
+#
+# Empty CMake rules to avoid unwanted automatic
+# installation of man-kappfinder.1.docbook
+#
+#################################################
diff --git a/doc/khelpcenter/releasenotes/r14.0.13.docbook b/doc/khelpcenter/releasenotes/r14.0.13.docbook
index 3308fd79f..5f3c2a9ed 100644
--- a/doc/khelpcenter/releasenotes/r14.0.13.docbook
+++ b/doc/khelpcenter/releasenotes/r14.0.13.docbook
@@ -1,12 +1,127 @@
<sect1 id="release-notes-r14.0.13">
-<title>R14.0.13 Release Notes (draft)</title>
+<title>R14.0.13 Release Notes</title>
<para>R14.0.13 is the thirteenth maintenance release of the R14.0 series,
-and is built on and improves the previous versions.</para>
-<para>Maintenance releases are intended to promptly bring bug fixes and
-new features to users, while preserving overall stability through the
-avoidance of both major API or feature changes and major codebase re-factoring.</para>
+and is built on and improves the previous maintenance versions.</para>
+<para>Maintenance releases are intended to promptly bring bug fixes and new
+features to users, while preserving overall stability through the avoidance
+of both major API or feature changes and major codebase re-factoring. </para>
+<para>Below is a summary of some of the most important changes introduced by
+this release.</para>
-<para>The ongoing temporary list of changes introduced by this release can be found <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/83">here</ulink>.</para>
+
+<sect2 id="release-notes-r14.0.13-new-applications">
+<title>New applications</title>
+<itemizedlist>
+ <listitem><para>tdeio-appinfo: a TDEIO slave (appinfo:/) that combines an application's configuration, data, manual and temp files and folders into a single view (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdeio-appinfo">TDE/tdeio-appinfo</ulink>)</para></listitem>
+ <listitem><para>twin-style-machbunt: a KDE window decoration theme from SuSE 9.1/9.2 (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/twin-style-machbunt">TDE/twin-style-machbunt</ulink>)</para></listitem>
+</itemizedlist>
+</sect2>
+
+
+<sect2 id="release-notes-r14.0.13-enhancements">
+<title>Enhancements</title>
+ <itemizedlist>
+ <listitem><para>Ctrl + mouse wheel can now be used to increase/decrease the font size in the following applications:</para>
+ <itemizedlist>
+ <listitem><para>Konsole (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/297">TDE/tdebase#297</ulink>)</para></listitem>
+ <listitem><para>Kate, KWrite, TDevelop and other applications using the Kate part editor (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdelibs/pulls/180">TDE/tdelibs#180</ulink>)</para></listitem>
+ </itemizedlist>
+ </listitem>
+ <listitem><para>Kate: added syntax highlighting for Markdown files (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdelibs/pulls/170">TDE/tdelibs#170</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdelibs/pulls/174">TDE/tdelibs#174</ulink>)</para></listitem>
+ <listitem><para>Improved user experience when setting a wallpaper (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/280">TDE/tdebase#280</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/285">TDE/tdebase#285</ulink>)</para></listitem>
+ <listitem><para>Offer all available options to set an image as background from Konqueror's action menu (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/281">TDE/tdebase#281</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/285">TDE/tdebase#285</ulink>)</para></listitem>
+ <listitem><para>Taskbar: <interface>Move Task</interface> and drag-n-drop are now available also for grouped task buttons (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/295">TDE/tdebase#295</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/98">TDE/tde#98</ulink>)</para></listitem>
+ <listitem><para>Improvements to khotkeys <interface>Input Actions</interface>:</para>
+ <itemizedlist>
+ <listitem><para>New <interface>move up</interface>/<interface>move down</interface> buttons (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/commit/5e4ca4df9bb34e10a897e32e7e0ca8645b97f293">commit 5e4ca4df</ulink>)</para></listitem>
+ <listitem><para>Fixes to GUI for creating/editing actions (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/commit/0c22a14875913dc185e029d0078a8d15c9ffe102">commit 0c22a148</ulink>)</para></listitem>
+ <listitem><para>New `waiting` action component to introduce a delay between steps (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/267">TDE/tdebase#267</ulink>)</para></listitem>
+ </itemizedlist>
+ </listitem>
+ <listitem><para>New SFTP tdeioslave based on libssh (KDE backport) (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/279">TDE/tdebase#279</ulink>)</para></listitem>
+ <listitem><para>Added support for ffmpeg 5.0 (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/akode/pulls/9">TDE/akode#9</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/akode/pulls/10">TDE/akode#10</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/k3b/pulls/14">TDE/k3b#14</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/k3b/pulls/16">TDE/k3b#16</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/k9copy/pulls/5">TDE/k9copy#5</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/k9copy/pulls/6">TDE/k9copy#6</ulink>)</para></listitem>
+ <listitem><para>Added support for Jasper 3.x (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdelibs/pulls/162">TDE/tdelibs#162</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/digikam/pulls/5">TDE/digikam#5</ulink>)</para></listitem>
+ <listitem><para>Added support for Poppler >= 22.04 (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdegraphics/pulls/45">TDE/tdegraphics#45</ulink>)</para></listitem>
+ <listitem><para>Improvements to Python3 Support (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/sip4-tqt/pulls/7">TDE/sip4-tqt#7</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/sip4-tqt/pulls/8">TDE/sip4-tqt#8</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/python-tqt/pulls/7">TDE/python-tqt#7</ulink>)</para></listitem>
+ <listitem><para>Added man pages for several TDE applications (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/abakus/pulls/6">TDE/abakus#6</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/amarok/pulls/34">TDE/amarok#34</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/arts/pulls/8">TDE/arts#8</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/k3b/pulls/18">TDE/k3b#18</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/k9copy/pulls/7">TDE/k9copy#7</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/kile/pulls/3">TDE/kile#3</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/koffice/pulls/28">TDE/koffice#28</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/krecipes/pulls/1">TDE/krecipes#1</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/ktorrent/pulls/4">TDE/ktorrent#4</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/libksquirrel/pulls/3">TDE/libksquirrel#3</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/rosegarden/pulls/4">TDE/rosegarden#4</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tellico/pulls/4">TDE/tellico#4</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdeaddons/pulls/13">TDE/tdeaddons#13</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdeartwork/pulls/21">TDE/tdeartwork#21</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdebase/pulls/275">TDE/tdebase#275</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdebindings/pulls/11">TDE/tdebindings#11</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdegraphics/pulls/47">TDE/tdegraphics#47</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdemultimedia/pulls/36">TDE/tdemultimedia#36</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdenetwork/pulls/45">TDE/tdenetwork#45</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdesdk/pulls/13">TDE/tdesdk#13</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdeutils/pulls/41">TDE/tdeutils#41</ulink>)</para></listitem>
+ <listitem><para>Improved API visualization (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdelibs/pulls/167">TDE/tdelibs#167</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdelibs/pulls/169">TDE/tdelibs#169</ulink>)</para></listitem>
+ <listitem><para>Use gender-neutral language (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdebase/pulls/286">TDE/tdebase#286</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdepim/pulls/69">TDE/tdepim#69</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdemultimedia/pulls/37">TDE/tdemultimedia#37</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdegames/pulls/16">TDE/tdegames#16</ulink>)</para></listitem>
+ </itemizedlist>
+</sect2>
+
+<sect2 id="release-notes-r14.0.13-bug-fixes">
+<title>Bug fixes</title>
+ <itemizedlist>
+ <listitem><para>Fixed opening of media:/ and system:/media/ URLs from non-TDE applications (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdelibs/pulls/157">TDE/tdelibs#157</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdebase/issues/224">TDE/tdebase#224</ulink>)</para></listitem>
+ <listitem><para>Fixed compatibility with openSSL 3.0 API (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdelibs/pulls/175">TDE/tdelibs#175</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdelibs/pulls/177">TDE/tdelibs#177</ulink>)</para></listitem>
+ <listitem><para>Fixed display of TQMap/TQValueList in dcopclient (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdelibs/pulls/168">TDE/tdelibs#168</ulink>)</para></listitem>
+ <listitem><para>tdebindings: fixed FTBFS when tdehw is not present (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdebindings/pulls/10">TDE/tdebindings#10</ulink>)</para></listitem>
+ <listitem><para>tqt3: fixed rendering of listviews with SGI widget style (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tqt3/pulls/64">TDE/tqt3#64</ulink>)</para></listitem>
+ <listitem><para>Fixed various FTBFS when building with clang</para></listitem>
+ <listitem><para>Fixed font styles detection in TDE font dialogs (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdelibs/pulls/164">TDE/tdelibs#164</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/koffice/pulls/24">TDE/koffice#24</ulink>)</para></listitem>
+ <listitem><para>tdeio-man: fixed visualization of man pages for TDE applications (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdebase/pulls/274">TDE/tdebase#274</ulink>)</para></listitem>
+ <listitem><para>basket: fixed SEGV crash when moving new empty notes (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/basket/pulls/12">TDE/basket#12</ulink>)</para></listitem>
+ <listitem><para>kgtk-qt3: added support for gtk2 with glibc 2.34 (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/kgtk-qt3/pulls/4">TDE/kgtk-qt3#4</ulink>)</para></listitem>
+ </itemizedlist>
+</sect2>
+
+
+<sect2 id="release-notes-r14.0.13-security">
+<title>Security</title>
+ <itemizedlist>
+ <listitem><para>FISH protocol: security fix for CVE-2020-12755 (backport from KDE) (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdebase/pulls/282">TDE/tdebase#282</ulink>)</para></listitem>
+ <listitem><para>KMail: fixed vulnerability to EFAIL (backport from KDE) (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdepim/pulls/22">TDE/tdepim#22</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdepim/pulls/70">TDE/tdepim#70</ulink>)</para></listitem>
+ </itemizedlist>
+</sect2>
+
+
+<sect2 id="release-notes-r14.0.13-distro-support">
+<title>Distro support</title>
+ <itemizedlist>
+ <listitem><para>Gentoo: several improvements and addition to supported ebuilds</para></listitem>
+ <listitem><para>Ubuntu: dropped Groovy (20.10), added Kinetic (22.10)</para></listitem>
+ <listitem><para>Fedora: added support for <ulink url="http://mirror.ppa.trinitydesktop.org/trinity/rpm/f36">v36</ulink> and <ulink url="http://mirror.ppa.trinitydesktop.org/trinity/rpm/f37">37</ulink></para></listitem>
+ <listitem><para>Arch: added builds for arm64 and armhf</para></listitem>
+ <listitem><para>OpenSuSE: added support for <ulink url="http://mirror.ppa.trinitydesktop.org/trinity/rpm/opensuse15.4">15.4</ulink></para></listitem>
+ </itemizedlist>
+</sect2>
+
+
+<sect2 id="release-notes-r14.0.13-additional-info">
+<title>Additional info</title>
+ <itemizedlist>
+ <listitem><para><ulink url="https://wiki.trinitydesktop.org/Release_Notes_For_R14.0.13">Full release notes on TDE wiki</ulink></para></listitem>
+ <listitem><para><ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/82">TGW issue list</ulink></para></listitem>
+ <listitem><para><ulink url="https://wiki.trinitydesktop.org/Changelog_For_R14.0.13">Detailed commit change log</ulink></para></listitem>
+ </itemizedlist>
+</sect2>
+
+
+<sect2 id="release-notes-r14.0.13-developers-info">
+<title>Additional info for developers/packagers</title>
+ <itemizedlist>
+ <listitem><para>Module version is now automatically added to tarball and detected by cmake at build time (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/scripts/pulls/4">TDE/scripts#4</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tde-common-cmake/pulls/84">TDE/tde-common-cmake#84</ulink>)</para></listitem>
+ <listitem><para>CMake Trinity's macros can now be used with pure TQt applications which require parsing of .ui files (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tde-common-cmake/pulls/85">TDE/tde-common-cmake#85</ulink>)</para></listitem>
+ <listitem><para>Modules converted to cmake:</para>
+ <itemizedlist>
+ <listitem><para>gtk3-tqt-engine (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/gtk3-tqt-engine/pulls/2">TDE/gtk3-tqt-engine#2</ulink>)</para></listitem>
+ <listitem><para>tderadio (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tderadio/pulls/4">TDE/tderadio#4</ulink>)</para></listitem>
+ <listitem><para>koffice-i18n (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/koffice-i18n/pulls/1">TDE/koffice-i18n#1</ulink>)</para></listitem>
+ </itemizedlist>
+ </listitem>
+ <listitem><para>Dropped autotools support for the following modules:</para>
+ <itemizedlist>
+ <listitem><para>rosegarden (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/rosegarden/pulls/5">TDE/rosegarden#5</ulink>)</para></listitem>
+ <listitem><para>tdeio-locate (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdeio-locate/pulls/2">TDE/tdeio-locate#2</ulink>)</para></listitem>
+ <listitem><para>k3b (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/k3b/pulls/19">TDE/k3b#19</ulink>)</para></listitem>
+ <listitem><para>tdepowersave (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdepowersave/pulls/10">TDE/tdepowersave#10</ulink>)</para></listitem>
+ <listitem><para>tastymenu (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tastymenu/pulls/3">TDE/tastymenu#3</ulink>)</para></listitem>
+ <listitem><para>gtk-qt-engine (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/gtk-qt-engine/pulls/9">TDE/gtk-qt-engine#9</ulink>)</para></listitem>
+ </itemizedlist>
+ </listitem>
+ </itemizedlist>
+</sect2>
</sect1>
+
diff --git a/kcontrol/dnssd/configdialog.ui b/kcontrol/dnssd/configdialog.ui
index 4a2ac2809..b2d9eb8b0 100644
--- a/kcontrol/dnssd/configdialog.ui
+++ b/kcontrol/dnssd/configdialog.ui
@@ -84,9 +84,6 @@
<property name="text">
<string>&amp;Wide area network</string>
</property>
- <property name="accel">
- <string>Alt+W</string>
- </property>
<property name="whatsThis" stdset="0">
<string>Advertise services on Internet domain using public IP. To have this option working you need to configure wide area operation in using administrator mode</string>
</property>
@@ -106,9 +103,6 @@
<property name="text">
<string>Loc&amp;al network</string>
</property>
- <property name="accel">
- <string>Alt+A</string>
- </property>
<property name="checked">
<bool>false</bool>
</property>
@@ -124,9 +118,6 @@
<property name="text">
<string>Browse local networ&amp;k</string>
</property>
- <property name="accel">
- <string>Alt+K</string>
- </property>
<property name="whatsThis" stdset="0">
<string>Browse local network (domain .local) using multicast DNS.</string>
</property>
@@ -138,9 +129,6 @@
<property name="text">
<string>Enable &amp;Zeroconf network browsing</string>
</property>
- <property name="accel">
- <string>Alt+Z</string>
- </property>
<property name="whatsThis" stdset="0">
<string>Browse local network (domain .local) using multicast DNS.</string>
</property>
diff --git a/kcontrol/taskbar/kcmtaskbar.cpp b/kcontrol/taskbar/kcmtaskbar.cpp
index 941c8b986..570544a72 100644
--- a/kcontrol/taskbar/kcmtaskbar.cpp
+++ b/kcontrol/taskbar/kcmtaskbar.cpp
@@ -24,6 +24,7 @@
#include <tqfile.h>
#include <tqlabel.h>
#include <tqbuttongroup.h>
+#include <tqtabwidget.h>
#include <dcopclient.h>
@@ -35,6 +36,7 @@
#include <twin.h>
#include <kcolorbutton.h>
#include <kstandarddirs.h>
+#include <kiconloader.h>
#define protected public
#include "kcmtaskbarui.h"
@@ -218,9 +220,12 @@ TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringL
{
m_widget->appearance->insertItem((*it).name());
}
+ m_widget->appearance->insertItem(i18n("Custom"));
connect(m_widget->appearance, TQT_SIGNAL(activated(int)),
this, TQT_SLOT(appearanceChanged(int)));
+ connect(m_widget->kcfg_DisplayIconsNText, TQT_SIGNAL(activated(int)),
+ this, TQT_SLOT(displayIconsNTextChanged(int)));
addConfig(m_settingsObject, m_widget);
setQuickHelp(i18n("<h1>Taskbar</h1> You can configure the taskbar here."
@@ -247,7 +252,6 @@ TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringL
{
m_widget->kcfg_ShowAllWindows->hide();
m_widget->kcfg_SortByDesktop->hide();
- m_widget->spacer2->changeSize(0, 0);
}
if (!TQApplication::desktop()->isVirtualDesktop() ||
@@ -260,6 +264,7 @@ TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringL
m_widget->showAllScreens->show();
}
connect( m_widget->showAllScreens, TQT_SIGNAL( stateChanged( int )), TQT_SLOT( changed()));
+ connect( m_widget->smallIcons, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()) );
TDEAboutData *about = new TDEAboutData(I18N_NOOP("kcmtaskbar"),
I18N_NOOP("TDE Taskbar Control Module"),
@@ -286,43 +291,44 @@ TaskbarConfig::~TaskbarConfig()
}
void TaskbarConfig::slotEditGlobalConfiguration() {
- TQByteArray data;
- kapp->dcopClient()->send("kicker", "kicker", "reshowTaskBarConfig()", data);
+ TQByteArray data;
+ kapp->dcopClient()->send("kicker", "kicker", "reshowTaskBarConfig()", data);
}
void TaskbarConfig::processLockouts()
{
- m_configFileName = GLOBAL_TASKBAR_CONFIG_FILE_NAME;
- if (m_isGlobalConfig)
- {
- m_widget->globalConfigWarning->show();
- m_widget->localConfigWarning->hide();
- m_widget->globalConfigReload->hide();
- m_widget->globalConfigEdit->hide();
- m_widget->kcfg_UseGlobalSettings->hide();
- }
- else {
- m_widget->globalConfigWarning->hide();
- m_widget->localConfigWarning->show();
- m_widget->kcfg_UseGlobalSettings->show();
- if (m_widget->kcfg_UseGlobalSettings->isChecked()) {
- m_widget->taskbarGroup->hide();
- m_widget->actionsGroup->hide();
- m_widget->globalConfigReload->hide();
- m_widget->globalConfigEdit->show();
- }
- else {
- m_widget->taskbarGroup->show();
- m_widget->actionsGroup->show();
- // FIXME
- // Disable this feature until a method can be found to force the TDECModule to reload its settings from disk after the global settings have been copied!
- //m_widget->globalConfigReload->show();
- m_widget->globalConfigReload->hide();
- m_widget->globalConfigEdit->hide();
- }
- }
-
- m_widget->kcfg_AllowDragAndDropReArrange->setEnabled(!m_widget->kcfg_SortByApp->isChecked());
+ m_configFileName = GLOBAL_TASKBAR_CONFIG_FILE_NAME;
+ if (m_isGlobalConfig)
+ {
+ m_widget->globalConfigWarning->show();
+ m_widget->localConfigWarning->hide();
+ m_widget->globalConfigReload->hide();
+ m_widget->globalConfigEdit->hide();
+ m_widget->kcfg_UseGlobalSettings->hide();
+ m_widget->localLikeGlobalSpacer->changeSize(0, 0, TQSizePolicy::Fixed, TQSizePolicy::Maximum);
+ }
+ else {
+ m_widget->globalConfigWarning->hide();
+ m_widget->localConfigWarning->show();
+ m_widget->kcfg_UseGlobalSettings->show();
+ if (m_widget->kcfg_UseGlobalSettings->isChecked()) {
+ m_widget->tabs->hide();
+ m_widget->globalConfigReload->hide();
+ m_widget->globalConfigEdit->show();
+ m_widget->localLikeGlobalSpacer->changeSize(0, 0, TQSizePolicy::Fixed, TQSizePolicy::MinimumExpanding);
+ }
+ else {
+ m_widget->tabs->show();
+ // FIXME
+ // Disable this feature until a method can be found to force the TDECModule to reload its settings from disk after the global settings have been copied!
+ //m_widget->globalConfigReload->show();
+ m_widget->globalConfigReload->hide();
+ m_widget->globalConfigEdit->hide();
+ m_widget->localLikeGlobalSpacer->changeSize(0, 0, TQSizePolicy::Fixed, TQSizePolicy::Maximum);
+ }
+ }
+
+ m_widget->kcfg_AllowDragAndDropReArrange->setEnabled(!m_widget->kcfg_SortByApp->isChecked());
}
void TaskbarConfig::slotReloadConfigurationFromGlobals()
@@ -384,23 +390,50 @@ void TaskbarConfig::updateAppearanceCombo()
if (i < m_appearances.count())
{
m_widget->appearance->setCurrentItem(i);
+ m_widget->customAppearance->setEnabled(false);
return;
}
- if (m_widget->appearance->count() == (int)m_appearances.count())
+ m_widget->appearance->setCurrentItem(m_appearances.count());
+ m_widget->customAppearance->setEnabled(true);
+}
+
+void TaskbarConfig::updateCustomAppearance()
+{
+ m_widget->kcfg_DrawButtons ->setChecked(m_settingsObject->drawButtons());
+ m_widget->kcfg_HaloText ->setChecked(m_settingsObject->haloText());
+ m_widget->kcfg_ShowButtonOnHover->setChecked(m_settingsObject->showButtonOnHover());
+}
+
+void TaskbarConfig::updateIconsTextCombo()
+{
+ if (m_widget->kcfg_DisplayIconsNText->currentText() == "Text only")
{
- m_widget->appearance->insertItem(i18n("Custom"));
+ m_widget->useIconsFrame->setEnabled(false);
+ }
+ else
+ {
+ m_widget->useIconsFrame->setEnabled(true);
}
-
- m_widget->appearance->setCurrentItem(m_appearances.count());
}
void TaskbarConfig::appearanceChanged(int selected)
{
- if (selected < (int)m_appearances.count())
+ if (selected < m_appearances.count())
+ {
+ m_widget->customAppearance->setEnabled(false);
+ }
+ else if(selected == m_appearances.count())
{
- unmanagedWidgetChangeState(!m_appearances[selected].matchesSettings());
+ m_widget->customAppearance->setEnabled(true);
+ updateCustomAppearance();
}
+ unmanagedWidgetChangeState(true);
+}
+
+void TaskbarConfig::displayIconsNTextChanged(int selected)
+{
+ m_widget->useIconsFrame->setEnabled(selected != 1); // 1 == Text only
}
void TaskbarConfig::load()
@@ -408,20 +441,37 @@ void TaskbarConfig::load()
TDECModule::load();
slotUpdateComboBox();
updateAppearanceCombo();
+ updateIconsTextCombo();
m_widget->showAllScreens->setChecked(!m_settingsObject->showCurrentScreenOnly());
+
+ int iconSize = m_settingsObject->iconSize();
+ if(kapp->iconLoader()->currentSize(TDEIcon::Small) != iconSize)
+ {
+ m_widget->smallIcons->setChecked(false);
+ }
}
void TaskbarConfig::save()
{
+ TDECModule::save();
+
+ if(m_widget->smallIcons->isChecked())
+ {
+ m_settingsObject->setIconSize(kapp->iconLoader()->currentSize(TDEIcon::Small));
+ }
+ else
+ {
+ m_settingsObject->setIconSize(kapp->iconLoader()->currentSize(TDEIcon::Panel));
+ }
+
m_settingsObject->setShowCurrentScreenOnly(!m_widget->showAllScreens->isChecked());
int selectedAppearance = m_widget->appearance->currentItem();
if (selectedAppearance < (int)m_appearances.count())
{
m_appearances[selectedAppearance].alterSettings();
- m_settingsObject->writeConfig();
}
- TDECModule::save();
+ m_settingsObject->writeConfig();
TQByteArray data;
kapp->dcopClient()->emitDCOPSignal("kdeTaskBarConfigChanged()", data);
@@ -432,6 +482,7 @@ void TaskbarConfig::defaults()
TDECModule::defaults();
slotUpdateComboBox();
updateAppearanceCombo();
+ updateIconsTextCombo();
}
void TaskbarConfig::notChanged()
diff --git a/kcontrol/taskbar/kcmtaskbar.h b/kcontrol/taskbar/kcmtaskbar.h
index 4d644bd0f..1a0860c69 100644
--- a/kcontrol/taskbar/kcmtaskbar.h
+++ b/kcontrol/taskbar/kcmtaskbar.h
@@ -67,6 +67,7 @@ public slots:
protected slots:
void slotUpdateComboBox();
void appearanceChanged(int);
+ void displayIconsNTextChanged(int);
void notChanged();
void slotUpdateCustomColors();
@@ -78,6 +79,8 @@ private slots:
private:
TaskbarAppearance::List m_appearances;
void updateAppearanceCombo();
+ void updateIconsTextCombo();
+ void updateCustomAppearance();
static const TQStringList& actionList();
static TQStringList i18nActionList();
static const TQStringList& groupModeList();
diff --git a/kcontrol/taskbar/kcmtaskbarui.ui b/kcontrol/taskbar/kcmtaskbarui.ui
index f5c36e2b2..385991e55 100644
--- a/kcontrol/taskbar/kcmtaskbarui.ui
+++ b/kcontrol/taskbar/kcmtaskbarui.ui
@@ -8,8 +8,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>358</width>
- <height>351</height>
+ <width>817</width>
+ <height>828</height>
</rect>
</property>
<property name="caption">
@@ -22,581 +22,1139 @@
<cstring>unnamed</cstring>
</property>
<property name="margin">
- <number>0</number>
+ <number>5</number>
</property>
- <widget class="TQGroupBox">
- <property name="name">
- <cstring>GroupBox2</cstring>
- </property>
- <property name="title">
- <string>Settings</string>
- </property>
- <grid>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
- <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
- <property name="name">
- <cstring>globalConfigWarning</cstring>
- </property>
- <property name="text">
- <string>&lt;b&gt;NOTE: Currently you are editing the global taskbar configuration.&lt;/b&gt;&lt;br&gt;To change the configuration of a specific taskbar (when using multiple taskbars), use the corresponding Configure Taskbar menu option, located in the taskbar handle popup menu.</string>
- </property>
- </widget>
- <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
- <property name="name">
- <cstring>localConfigWarning</cstring>
- </property>
- <property name="text">
- <string>&lt;b&gt;NOTE:&lt;/b&gt; Currently you are editing the taskbar configuration for &lt;b&gt;only&lt;/b&gt; this taskbar.</string>
- </property>
- </widget>
- <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2">
- <property name="name">
- <cstring>kcfg_UseGlobalSettings</cstring>
- </property>
- <property name="text">
- <string>Use global floating taskbar configuration</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- <property name="whatsThis" stdset="0">
- <string>Selecting this option causes the taskbar to use the global taskbar configuration.</string>
- </property>
- </widget>
- <widget class="TQPushButton" row="2" column="0" rowspan="1" colspan="2">
- <property name="name">
- <cstring>globalConfigReload</cstring>
- </property>
- <property name="text">
- <string>Overwrite current configuration with the current global floating taskbar configuration</string>
- </property>
- </widget>
- <widget class="TQPushButton" row="3" column="0" rowspan="1" colspan="2">
- <property name="name">
- <cstring>globalConfigEdit</cstring>
- </property>
- <property name="text">
- <string>Edit global floating taskbar configuration</string>
- </property>
- </widget>
- </grid>
- </widget>
- <widget class="TQButtonGroup">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>taskbarGroup</cstring>
+ <cstring>layout3</cstring>
</property>
- <property name="title">
- <string>Taskbar</string>
- </property>
- <property name="layoutMargin" stdset="0">
- </property>
- <property name="layoutSpacing" stdset="0">
- </property>
- <grid>
+ <vbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="3">
- <property name="name">
- <cstring>kcfg_ShowAllWindows</cstring>
- </property>
- <property name="text">
- <string>&amp;Show windows from all desktops</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- <property name="whatsThis" stdset="0">
- <string>Turning this option off will cause the taskbar to display &lt;b&gt;only&lt;/b&gt; the windows on the current desktop.
-
-By default, this option is selected and all windows are shown.</string>
- </property>
- </widget>
- <widget class="TQCheckBox" row="1" column="1" rowspan="1" colspan="2">
- <property name="name">
- <cstring>kcfg_SortByDesktop</cstring>
- </property>
- <property name="text">
- <string>Sort windows by desk&amp;top</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- <property name="whatsThis" stdset="0">
- <string>Selecting this option causes the taskbar to show windows in order of the desktop they appear on.
-
-By default this option is selected.</string>
- </property>
- </widget>
- <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="3">
+ <widget class="TQLabel">
<property name="name">
- <cstring>showAllScreens</cstring>
+ <cstring>localConfigWarning</cstring>
</property>
<property name="text">
- <string>Show windows from all sc&amp;reens</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- <property name="whatsThis" stdset="0">
- <string>Turning this option off will cause the taskbar to display &lt;b&gt;only&lt;/b&gt; windows which are on the same Xinerama screen as the taskbar.
-
-By default, this option is selected and all windows are shown.</string>
+ <string>&lt;b&gt;NOTE:&lt;/b&gt; Currently you are editing the taskbar configuration for &lt;b&gt;only&lt;/b&gt; this taskbar.</string>
</property>
</widget>
- <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="3">
+ <widget class="TQLabel">
<property name="name">
- <cstring>kcfg_SortByApp</cstring>
+ <cstring>globalConfigWarning</cstring>
</property>
<property name="text">
- <string>Sort alphabeticall&amp;y by application name</string>
- </property>
- <property name="checked">
- <bool>true</bool>
+ <string>&lt;b&gt;NOTE: Currently you are editing the global taskbar configuration.&lt;/b&gt;&lt;br&gt;To change the configuration of a specific taskbar (when using multiple taskbars), use the corresponding Configure Taskbar menu option, located in the taskbar handle popup menu.</string>
</property>
</widget>
- <widget class="TQCheckBox" row="4" column="1" rowspan="1" colspan="2">
+ <widget class="TQCheckBox">
<property name="name">
- <cstring>kcfg_AllowDragAndDropReArrange</cstring>
+ <cstring>kcfg_UseGlobalSettings</cstring>
</property>
<property name="text">
- <string>&amp;Allow taskbar items to be rearranged using drag and drop</string>
+ <string>Use global floating taskbar configuration</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
<property name="whatsThis" stdset="0">
- <string>Turning this option on will allow tasks on the taskbar to be manually rearranged using drag and drop.</string>
- </property>
- </widget>
- <widget class="TQCheckBox" row="5" column="0" rowspan="1" colspan="3">
- <property name="name">
- <cstring>kcfg_CycleWheel</cstring>
- </property>
- <property name="text">
- <string>Cycle through windows with mouse wheel</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
- <widget class="TQCheckBox" row="6" column="0" rowspan="1" colspan="3">
- <property name="name">
- <cstring>kcfg_ShowOnlyIconified</cstring>
- </property>
- <property name="text">
- <string>Show o&amp;nly minimized windows</string>
- </property>
- <property name="whatsThis" stdset="0">
- <string>Select this option if you want the taskbar to display &lt;b&gt;only&lt;/b&gt; minimized windows.
-
-By default, this option is not selected and the taskbar will show all windows.</string>
- </property>
- </widget>
- <widget class="TQCheckBox" row="7" column="0" rowspan="1" colspan="3">
- <property name="name">
- <cstring>kcfg_ShowWindowListBtn</cstring>
- </property>
- <property name="text">
- <string>Show window list &amp;button</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- <property name="whatsThis" stdset="0">
- <string>Selecting this option causes the taskbar to display a button that, when clicked, shows a list of all windows in a popup menu.</string>
- </property>
- </widget>
- <widget class="TQLabel" row="8" column="0" rowspan="1" colspan="2">
- <property name="name">
- <cstring>displayIconsNText</cstring>
- </property>
- <property name="text">
- <string>Dis&amp;play:</string>
- </property>
- <property name="buddy" stdset="0">
- <cstring>kcfg_DisplayIconsNText</cstring>
- </property>
- </widget>
- <widget class="TQComboBox" row="8" column="2">
- <property name="name">
- <cstring>kcfg_DisplayIconsNText</cstring>
- </property>
- <property name="sizePolicy">
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>0</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="whatsThis" stdset="0">
- <string>Choose taskbar display mode among &lt;strong&gt;Icons and text&lt;/strong&gt;, &lt;strong&gt;Text only&lt;/strong&gt; and &lt;strong&gt;Icons only&lt;/strong&gt;.</string>
- </property>
- </widget>
- <widget class="TQComboBox" row="9" column="2">
- <property name="name">
- <cstring>kcfg_GroupTasks</cstring>
- </property>
- <property name="sizePolicy">
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>0</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="whatsThis" stdset="0">
- <string>The taskbar can group similar windows into single buttons. When one of these window group buttons are clicked on a menu appears showing all the windows in that group. This can be especially useful with the &lt;em&gt;Show all windows&lt;/em&gt; option.
-
-You can set the taskbar to &lt;strong&gt;Never&lt;/strong&gt; group windows, to &lt;strong&gt;Always&lt;/strong&gt; group windows or to group windows only &lt;strong&gt;When the Taskbar is Full&lt;/strong&gt;.
-
-By default the taskbar groups windows when it is full.</string>
- </property>
- </widget>
- <widget class="TQLabel" row="9" column="0" rowspan="1" colspan="2">
- <property name="name">
- <cstring>groupTasksLabel</cstring>
- </property>
- <property name="text">
- <string>&amp;Group similar tasks:</string>
- </property>
- <property name="buddy" stdset="0">
- <cstring>kcfg_GroupTasks</cstring>
- </property>
- </widget>
- <widget class="TQComboBox" row="10" column="2">
- <property name="name">
- <cstring>kcfg_ShowTaskStates</cstring>
- </property>
- <property name="sizePolicy">
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>0</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="whatsThis" stdset="0">
- <string>The taskbar can show and/or hide tasks based on their current process state. Select &lt;em&gt;Any&lt;/em&gt; to show all tasks regardless of current state.</string>
+ <string>Selecting this option causes the taskbar to use the global taskbar configuration.</string>
</property>
</widget>
- <widget class="TQLabel" row="10" column="0" rowspan="1" colspan="2">
+ <widget class="TQPushButton">
<property name="name">
- <cstring>showTaskStatesLabel</cstring>
+ <cstring>globalConfigReload</cstring>
</property>
<property name="text">
- <string>&amp;Show tasks with state:</string>
- </property>
- <property name="buddy" stdset="0">
- <cstring>kcfg_ShowTaskStates</cstring>
- </property>
- </widget>
- <widget class="TQComboBox" row="11" column="2">
- <property name="name">
- <cstring>appearance</cstring>
+ <string>Overwrite current configuration with the current global floating taskbar configuration</string>
</property>
</widget>
- <widget class="TQLabel" row="11" column="0" rowspan="1" colspan="2">
+ <widget class="TQPushButton">
<property name="name">
- <cstring>textLabel1</cstring>
+ <cstring>globalConfigEdit</cstring>
</property>
<property name="text">
- <string>A&amp;ppearance:</string>
- </property>
- <property name="buddy" stdset="0">
- <cstring>appearance</cstring>
+ <string>Edit global floating taskbar configuration</string>
</property>
</widget>
- <widget class="TQCheckBox" row="12" column="0" rowspan="1" colspan="2">
+ <spacer>
<property name="name">
- <cstring>kcfg_UseCustomColors</cstring>
+ <cstring>localLikeGlobalSpacer</cstring>
</property>
- <property name="enabled">
- <bool>true</bool>
+ <property name="orientation">
+ <enum>Vertical</enum>
</property>
- <property name="text">
- <string>Use &amp;custom colors</string>
+ <property name="sizeType">
+ <enum>Maximum</enum>
</property>
- <property name="checked">
- <bool>true</bool>
+ <property name="sizeHint">
+ <size>
+ <width>20</width>
+ <height>1</height>
+ </size>
</property>
- </widget>
- <widget class="TQLayoutWidget" row="13" column="0" rowspan="1" colspan="3">
+ </spacer>
+ </vbox>
+ </widget>
+ <widget class="TQTabWidget">
+ <property name="name">
+ <cstring>tabs</cstring>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>5</hsizetype>
+ <vsizetype>3</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <widget class="TQWidget">
+ <property name="name">
+ <cstring>tab</cstring>
+ </property>
+ <attribute name="title">
+ <string>&amp;Tasks</string>
+ </attribute>
+ <vbox>
<property name="name">
- <cstring>layout9</cstring>
+ <cstring>unnamed</cstring>
</property>
- <grid>
+ <widget class="TQButtonGroup">
<property name="name">
- <cstring>unnamed</cstring>
+ <cstring>grpDisplay</cstring>
</property>
- <widget class="TQLabel" row="0" column="0">
- <property name="name">
- <cstring>inactiveTaskTextColorLabel</cstring>
- </property>
- <property name="text">
- <string>Inacti&amp;ve task text color:</string>
- </property>
- <property name="buddy" stdset="0">
- <cstring>kcfg_InactiveTaskTextColor</cstring>
- </property>
- </widget>
- <widget class="KColorButton" row="0" column="1">
- <property name="name">
- <cstring>kcfg_InactiveTaskTextColor</cstring>
- </property>
- <property name="text">
- <string></string>
- </property>
- </widget>
- <spacer row="0" column="2">
- <property name="name">
- <cstring>spacer11</cstring>
- </property>
- <property name="orientation">
- <enum>Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
- <property name="sizeHint">
- <size>
- <width>191</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- <widget class="TQLabel" row="0" column="3">
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>5</hsizetype>
+ <vsizetype>4</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="title">
+ <string>Display</string>
+ </property>
+ <grid>
<property name="name">
- <cstring>activeTaskTextColorLabel</cstring>
- </property>
- <property name="text">
- <string>Active task te&amp;xt color:</string>
+ <cstring>unnamed</cstring>
</property>
- <property name="buddy" stdset="0">
- <cstring>kcfg_ActiveTaskTextColor</cstring>
- </property>
- </widget>
- <widget class="KColorButton" row="0" column="4">
+ <widget class="TQCheckBox" row="0" column="0" colspan="4">
+ <property name="name">
+ <cstring>kcfg_ShowAllWindows</cstring>
+ </property>
+ <property name="text">
+ <string>&amp;Show windows from all desktops</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ <property name="whatsThis" stdset="0">
+ <string>Turning this option off will cause the taskbar to display &lt;b&gt;only&lt;/b&gt; the windows on the current desktop. By default, this option is selected and all windows are shown.</string>
+ </property>
+ </widget>
+ <spacer row="1" column="0">
+ <property name="name">
+ <cstring>spacer2_2_3</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Fixed</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ <widget class="TQCheckBox" row="1" column="1" colspan="3">
+ <property name="name">
+ <cstring>kcfg_SortByDesktop</cstring>
+ </property>
+ <property name="text">
+ <string>Sort windows by desk&amp;top</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ <property name="whatsThis" stdset="0">
+ <string>Selecting this option causes the taskbar to show windows in order of the desktop they appear on. By default this option is selected.</string>
+ </property>
+ </widget>
+ <widget class="TQCheckBox" row="2" column="0" colspan="4">
+ <property name="name">
+ <cstring>showAllScreens</cstring>
+ </property>
+ <property name="text">
+ <string>Show windows from all sc&amp;reens</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ <property name="whatsThis" stdset="0">
+ <string>Turning this option off will cause the taskbar to display &lt;b&gt;only&lt;/b&gt; windows which are on the same Xinerama screen as the taskbar. By default, this option is selected and all windows are shown.</string>
+ </property>
+ </widget>
+ <widget class="TQCheckBox" row="3" column="0" colspan="4">
+ <property name="name">
+ <cstring>kcfg_ShowOnlyIconified</cstring>
+ </property>
+ <property name="text">
+ <string>Show o&amp;nly minimized windows</string>
+ </property>
+ <property name="whatsThis" stdset="0">
+ <string>Select this option if you want the taskbar to display &lt;b&gt;only&lt;/b&gt; minimized windows. By default, this option is not selected and the taskbar will show all windows.</string>
+ </property>
+ </widget>
+ <widget class="KSeparator" row="4" column="0" colspan="4">
+ <property name="name">
+ <cstring>kSeparator5</cstring>
+ </property>
+ </widget>
+ <widget class="TQLabel" row="5" column="0" rowspan="2" colspan="2">
+ <property name="name">
+ <cstring>showTaskStatesLabel</cstring>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>250</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>&amp;Show tasks with state:</string>
+ </property>
+ <property name="buddy" stdset="0">
+ <cstring>kcfg_ShowTaskStates</cstring>
+ </property>
+ </widget>
+ <widget class="TQComboBox" row="5" column="2" rowspan="2">
+ <property name="name">
+ <cstring>kcfg_ShowTaskStates</cstring>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>250</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="whatsThis" stdset="0">
+ <string>The taskbar can show and/or hide tasks based on their current process state. Select &lt;em&gt;Any&lt;/em&gt; to show all tasks regardless of current state.</string>
+ </property>
+ </widget>
+ <spacer row="6" column="3">
+ <property name="name">
+ <cstring>spacer23</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Expanding</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>31</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </grid>
+ </widget>
+ <widget class="TQButtonGroup">
+ <property name="name">
+ <cstring>grpSortGroup</cstring>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>5</hsizetype>
+ <vsizetype>4</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="title">
+ <string>Sorting and grouping</string>
+ </property>
+ <grid>
<property name="name">
- <cstring>kcfg_ActiveTaskTextColor</cstring>
- </property>
- <property name="text">
- <string></string>
+ <cstring>unnamed</cstring>
</property>
- </widget>
- <spacer row="0" column="5">
+ <spacer row="1" column="0">
+ <property name="name">
+ <cstring>spacer2_2</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Fixed</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ <widget class="TQCheckBox" row="1" column="1" colspan="3">
+ <property name="name">
+ <cstring>kcfg_AllowDragAndDropReArrange</cstring>
+ </property>
+ <property name="text">
+ <string>&amp;Allow taskbar items to be rearranged using drag and drop</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ <property name="whatsThis" stdset="0">
+ <string>Turning this option on will allow tasks on the taskbar to be manually rearranged using drag and drop.</string>
+ </property>
+ </widget>
+ <widget class="TQCheckBox" row="0" column="0" colspan="4">
+ <property name="name">
+ <cstring>kcfg_SortByApp</cstring>
+ </property>
+ <property name="text">
+ <string>Sort alphabeticall&amp;y by application name</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ <widget class="KSeparator" row="3" column="0" colspan="4">
+ <property name="name">
+ <cstring>kSeparator6</cstring>
+ </property>
+ </widget>
+ <widget class="TQLabel" row="4" column="0" colspan="2">
+ <property name="name">
+ <cstring>groupTasksLabel</cstring>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>250</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>&amp;Group similar tasks:</string>
+ </property>
+ <property name="buddy" stdset="0">
+ <cstring>kcfg_GroupTasks</cstring>
+ </property>
+ </widget>
+ <widget class="TQComboBox" row="4" column="2">
+ <property name="name">
+ <cstring>kcfg_GroupTasks</cstring>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>300</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="whatsThis" stdset="0">
+ <string>The taskbar can group similar windows into single buttons. When one of these window group buttons are clicked on a menu appears showing all the windows in that group. This can be especially useful with the &lt;em&gt;Show all windows&lt;/em&gt; option. You can set the taskbar to &lt;strong&gt;Never&lt;/strong&gt; group windows, to &lt;strong&gt;Always&lt;/strong&gt; group windows or to group windows only &lt;strong&gt;When the Taskbar is Full&lt;/strong&gt;. By default the taskbar groups windows when it is full.</string>
+ </property>
+ </widget>
+ <spacer row="4" column="3">
+ <property name="name">
+ <cstring>spacer23_2</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Expanding</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>31</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </grid>
+ </widget>
+ <spacer>
+ <property name="name">
+ <cstring>spacer16</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Minimum</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </vbox>
+ </widget>
+ <widget class="TQWidget">
+ <property name="name">
+ <cstring>TabPage</cstring>
+ </property>
+ <attribute name="title">
+ <string>&amp;Appearance</string>
+ </attribute>
+ <grid>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <spacer row="2" column="1">
+ <property name="name">
+ <cstring>spacer21</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Minimum</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ <widget class="TQButtonGroup" row="0" column="1">
+ <property name="name">
+ <cstring>grpTaskbarColors</cstring>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>3</hsizetype>
+ <vsizetype>5</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="title">
+ <string>Colors</string>
+ </property>
+ <grid>
<property name="name">
- <cstring>spacer11_2</cstring>
- </property>
- <property name="orientation">
- <enum>Horizontal</enum>
+ <cstring>unnamed</cstring>
</property>
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
- <property name="sizeHint">
- <size>
- <width>191</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- <widget class="TQLabel" row="0" column="6">
+ <spacer row="2" column="0">
+ <property name="name">
+ <cstring>spacer2_2_2</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Fixed</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ <widget class="TQCheckBox" row="1" column="0" colspan="3">
+ <property name="name">
+ <cstring>kcfg_UseCustomColors</cstring>
+ </property>
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="text">
+ <string>Use &amp;custom colors</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ <widget class="TQLayoutWidget" row="2" column="1" colspan="2">
+ <property name="name">
+ <cstring>layout19</cstring>
+ </property>
+ <grid>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="TQLabel" row="1" column="0">
+ <property name="name">
+ <cstring>activeTaskTextColorLabel</cstring>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>1</hsizetype>
+ <vsizetype>5</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Active task te&amp;xt color:</string>
+ </property>
+ <property name="buddy" stdset="0">
+ <cstring>kcfg_ActiveTaskTextColor</cstring>
+ </property>
+ </widget>
+ <widget class="TQLabel" row="2" column="0">
+ <property name="name">
+ <cstring>taskBackgroundColorLabel</cstring>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>1</hsizetype>
+ <vsizetype>5</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>&amp;Background color:</string>
+ </property>
+ <property name="buddy" stdset="0">
+ <cstring>kcfg_TaskBackgroundColor</cstring>
+ </property>
+ </widget>
+ <widget class="KColorButton" row="0" column="1">
+ <property name="name">
+ <cstring>kcfg_InactiveTaskTextColor</cstring>
+ </property>
+ </widget>
+ <widget class="KColorButton" row="1" column="1">
+ <property name="name">
+ <cstring>kcfg_ActiveTaskTextColor</cstring>
+ </property>
+ </widget>
+ <widget class="KColorButton" row="2" column="1">
+ <property name="name">
+ <cstring>kcfg_TaskBackgroundColor</cstring>
+ </property>
+ </widget>
+ <widget class="TQLabel" row="0" column="0">
+ <property name="name">
+ <cstring>inactiveTaskTextColorLabel</cstring>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>1</hsizetype>
+ <vsizetype>5</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Inacti&amp;ve task text color:</string>
+ </property>
+ <property name="buddy" stdset="0">
+ <cstring>kcfg_InactiveTaskTextColor</cstring>
+ </property>
+ </widget>
+ </grid>
+ </widget>
+ </grid>
+ </widget>
+ <widget class="TQButtonGroup" row="1" column="1">
+ <property name="name">
+ <cstring>grpAppearanceMisc</cstring>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>1</hsizetype>
+ <vsizetype>5</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="title">
+ <string>Miscellaneous</string>
+ </property>
+ <grid>
<property name="name">
- <cstring>taskBackgroundColorLabel</cstring>
- </property>
- <property name="text">
- <string>&amp;Background color:</string>
- </property>
- <property name="buddy" stdset="0">
- <cstring>kcfg_TaskBackgroundColor</cstring>
+ <cstring>unnamed</cstring>
</property>
- </widget>
- <widget class="KColorButton" row="0" column="7">
+ <widget class="TQCheckBox" row="0" column="0" colspan="2">
+ <property name="name">
+ <cstring>kcfg_ShowWindowListBtn</cstring>
+ </property>
+ <property name="text">
+ <string>Show window list &amp;button</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ <property name="whatsThis" stdset="0">
+ <string>Selecting this option causes the taskbar to display a button that, when clicked, shows a list of all windows in a popup menu.</string>
+ </property>
+ </widget>
+ <widget class="KSeparator" row="1" column="0" colspan="2">
+ <property name="name">
+ <cstring>kSeparator7</cstring>
+ </property>
+ </widget>
+ <widget class="TQLabel" row="2" column="0">
+ <property name="name">
+ <cstring>maxButtonWidthLabel</cstring>
+ </property>
+ <property name="text">
+ <string>Max width for buttons:</string>
+ </property>
+ <property name="whatsThis" stdset="0">
+ <string>This option allows to set the maximum width for taskbar buttons.</string>
+ </property>
+ </widget>
+ <widget class="TQSpinBox" row="2" column="1">
+ <property name="name">
+ <cstring>kcfg_MaximumButtonWidth</cstring>
+ </property>
+ <property name="suffix">
+ <string> px</string>
+ </property>
+ <property name="maxValue">
+ <number>500</number>
+ </property>
+ <property name="minValue">
+ <number>10</number>
+ </property>
+ <property name="value">
+ <number>200</number>
+ </property>
+ </widget>
+ </grid>
+ </widget>
+ <widget class="TQButtonGroup" row="1" column="0">
+ <property name="name">
+ <cstring>grpIconsNText</cstring>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>5</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="title">
+ <string>Icons</string>
+ </property>
+ <grid>
<property name="name">
- <cstring>kcfg_TaskBackgroundColor</cstring>
+ <cstring>unnamed</cstring>
</property>
- <property name="text">
- <string></string>
- </property>
- </widget>
- <spacer row="0" column="8">
+ <widget class="TQLabel" row="0" column="0">
+ <property name="name">
+ <cstring>displayIconsNTextLabel</cstring>
+ </property>
+ <property name="text">
+ <string>Dis&amp;play:</string>
+ </property>
+ <property name="buddy" stdset="0">
+ <cstring>kcfg_DisplayIconsNText</cstring>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>130</width>
+ <height>0</height>
+ </size>
+ </property>
+ </widget>
+ <spacer row="0" column="1">
+ <property name="name">
+ <cstring>spacer2_2_2_3_3</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Fixed</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ <widget class="TQComboBox" row="0" column="2" colspan="2">
+ <property name="name">
+ <cstring>kcfg_DisplayIconsNText</cstring>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>5</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="whatsThis" stdset="0">
+ <string>Choose taskbar display mode among &lt;strong&gt;Icons and text&lt;/strong&gt;, &lt;strong&gt;Text only&lt;/strong&gt; and &lt;strong&gt;Icons only&lt;/strong&gt;.</string>
+ </property>
+ </widget>
+ <widget class="TQFrame" row="1" column="0" colspan="4">
+ <property name="name">
+ <cstring>useIconsFrame</cstring>
+ </property>
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="frameShape">
+ <enum>StyledPanel</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>Raised</enum>
+ </property>
+ <grid>
+ <widget class="TQCheckBox" row="0" column="0" colspan="3">
+ <property name="name">
+ <cstring>smallIcons</cstring>
+ </property>
+ <property name="text">
+ <string>Small icons</string>
+ </property>
+ <property name="whatsThis" stdset="0">
+ <string>Selecting this option makes the taskbar use small icons.</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ <widget class="TQCheckBox" row="1" column="0" colspan="3">
+ <property name="name">
+ <cstring>kcfg_ShowThumbnails</cstring>
+ </property>
+ <property name="text">
+ <string>Show thumbnails on hover</string>
+ </property>
+ </widget>
+ <spacer row="2" column="0">
+ <property name="name">
+ <cstring>spacer2_2_2_3</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Fixed</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ <widget class="TQLabel" row="2" column="1">
+ <property name="name">
+ <cstring>thumbMaxDimensionLabel</cstring>
+ </property>
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Maximum dimension:</string>
+ </property>
+ </widget>
+ <widget class="TQSpinBox" row="2" column="2">
+ <property name="name">
+ <cstring>kcfg_ThumbnailMaxDimension</cstring>
+ </property>
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="suffix">
+ <string> px</string>
+ </property>
+ <property name="maxValue">
+ <number>500</number>
+ </property>
+ <property name="minValue">
+ <number>50</number>
+ </property>
+ <property name="value">
+ <number>100</number>
+ </property>
+ </widget>
+ </grid>
+ </widget>
+ </grid>
+ </widget>
+ <widget class="TQButtonGroup" row="0" column="0">
+ <property name="name">
+ <cstring>grpTaskbarStyle</cstring>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>4</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="title">
+ <string>Button style</string>
+ </property>
+ <grid>
<property name="name">
- <cstring>spacer12</cstring>
- </property>
- <property name="orientation">
- <enum>Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
- <property name="sizeHint">
- <size>
- <width>191</width>
- <height>20</height>
- </size>
+ <cstring>unnamed</cstring>
</property>
- </spacer>
- </grid>
- </widget>
- <spacer row="1" column="0">
- <property name="name">
- <cstring>spacer2</cstring>
- </property>
- <property name="orientation">
- <enum>Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>Fixed</enum>
- </property>
- <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </grid>
- </widget>
- <widget class="TQGroupBox">
- <property name="name">
- <cstring>actionsGroup</cstring>
- </property>
- <property name="title">
- <string>Actions</string>
- </property>
- <grid>
+ <widget class="TQLabel" row="0" column="0">
+ <property name="name">
+ <cstring>textLabel1</cstring>
+ </property>
+ <property name="text">
+ <string>Taskbar style:</string>
+ </property>
+ <property name="buddy" stdset="0">
+ <cstring>appearance</cstring>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>130</width>
+ <height>0</height>
+ </size>
+ </property>
+ </widget>
+ <spacer row="0" column="1">
+ <property name="name">
+ <cstring>spacer2_2_2_3_3</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Fixed</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ <widget class="TQComboBox" row="0" column="2" colspan="2">
+ <property name="name">
+ <cstring>appearance</cstring>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>5</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ <widget class="TQFrame" row="1" column="0" colspan="4">
+ <property name="name">
+ <cstring>customAppearance</cstring>
+ </property>
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="frameShape">
+ <enum>StyledPanel</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>Raised</enum>
+ </property>
+ <grid>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="TQCheckBox" row="0" column="0" colspan="3">
+ <property name="name">
+ <cstring>kcfg_DrawButtons</cstring>
+ </property>
+ <property name="text">
+ <string>Always draw items as buttons</string>
+ </property>
+ </widget>
+ <spacer row="1" column="0">
+ <property name="name">
+ <cstring>spacer2_2_2_3_3</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Fixed</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ <widget class="TQCheckBox" row="1" column="1" colspan="2">
+ <property name="name">
+ <cstring>kcfg_ShowButtonOnHover</cstring>
+ </property>
+ <property name="text">
+ <string>Draw items as buttons on hover</string>
+ </property>
+ </widget>
+ <widget class="TQCheckBox" row="2" column="0" colspan="3">
+ <property name="name">
+ <cstring>kcfg_HaloText</cstring>
+ </property>
+ <property name="text">
+ <string>Draw halo around text</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </grid>
+ </widget>
+ </grid>
+ </widget>
+ </grid>
+ </widget>
+ <widget class="TQWidget">
<property name="name">
- <cstring>unnamed</cstring>
+ <cstring>tab</cstring>
</property>
- <widget class="TQLabel" row="0" column="0">
- <property name="name">
- <cstring>leftButtonLabel</cstring>
- </property>
- <property name="text">
- <string>&amp;Left button:</string>
- </property>
- <property name="buddy" stdset="0">
- <cstring>kcfg_LeftButtonAction</cstring>
- </property>
- </widget>
- <widget class="TQLabel" row="1" column="0">
- <property name="name">
- <cstring>middleButtonLabel</cstring>
- </property>
- <property name="text">
- <string>&amp;Middle button:</string>
- </property>
- <property name="buddy" stdset="0">
- <cstring>kcfg_MiddleButtonAction</cstring>
- </property>
- </widget>
- <widget class="TQLabel" row="2" column="0">
- <property name="name">
- <cstring>rightButtonLabel</cstring>
- </property>
- <property name="text">
- <string>Right b&amp;utton:</string>
- </property>
- <property name="buddy" stdset="0">
- <cstring>kcfg_RightButtonAction</cstring>
- </property>
- </widget>
- <widget class="TQComboBox" row="0" column="1">
- <property name="name">
- <cstring>kcfg_LeftButtonAction</cstring>
- </property>
- <property name="sizePolicy">
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>0</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- <widget class="TQComboBox" row="1" column="1">
- <property name="name">
- <cstring>kcfg_MiddleButtonAction</cstring>
- </property>
- <property name="sizePolicy">
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>0</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- <widget class="TQComboBox" row="2" column="1">
+ <attribute name="title">
+ <string>A&amp;ctions</string>
+ </attribute>
+ <vbox>
<property name="name">
- <cstring>kcfg_RightButtonAction</cstring>
- </property>
- <property name="sizePolicy">
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>0</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ <cstring>unnamed</cstring>
</property>
- </widget>
- </grid>
+ <widget class="TQGroupBox">
+ <property name="name">
+ <cstring>actionsGroup</cstring>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>5</hsizetype>
+ <vsizetype>1</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="title">
+ <string>Mouse Actions</string>
+ </property>
+ <grid>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="TQLabel" row="0" column="0">
+ <property name="name">
+ <cstring>leftButtonLabel</cstring>
+ </property>
+ <property name="text">
+ <string>&amp;Left button:</string>
+ </property>
+ <property name="buddy" stdset="0">
+ <cstring>kcfg_LeftButtonAction</cstring>
+ </property>
+ </widget>
+ <widget class="TQComboBox" row="0" column="1">
+ <property name="name">
+ <cstring>kcfg_LeftButtonAction</cstring>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ <widget class="TQLabel" row="1" column="0">
+ <property name="name">
+ <cstring>middleButtonLabel</cstring>
+ </property>
+ <property name="text">
+ <string>&amp;Middle button:</string>
+ </property>
+ <property name="buddy" stdset="0">
+ <cstring>kcfg_MiddleButtonAction</cstring>
+ </property>
+ </widget>
+ <widget class="TQComboBox" row="1" column="1">
+ <property name="name">
+ <cstring>kcfg_MiddleButtonAction</cstring>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ <widget class="TQComboBox" row="2" column="1">
+ <property name="name">
+ <cstring>kcfg_RightButtonAction</cstring>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ <widget class="TQLabel" row="2" column="0">
+ <property name="name">
+ <cstring>rightButtonLabel</cstring>
+ </property>
+ <property name="text">
+ <string>Right b&amp;utton:</string>
+ </property>
+ <property name="buddy" stdset="0">
+ <cstring>kcfg_RightButtonAction</cstring>
+ </property>
+ </widget>
+ <widget class="TQCheckBox" row="4" column="0" colspan="2">
+ <property name="name">
+ <cstring>kcfg_CycleWheel</cstring>
+ </property>
+ <property name="text">
+ <string>Cycle through windows with mouse wheel</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ <spacer row="3" column="0">
+ <property name="name">
+ <cstring>spacer11</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Fixed</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>20</width>
+ <height>21</height>
+ </size>
+ </property>
+ </spacer>
+ </grid>
+ </widget>
+ <spacer>
+ <property name="name">
+ <cstring>spacer35</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Minimum</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </vbox>
+ </widget>
</widget>
- <spacer>
- <property name="name">
- <cstring>Spacer1</cstring>
- </property>
- <property name="orientation">
- <enum>Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
- <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
</vbox>
</widget>
+<customwidgets>
+</customwidgets>
<connections>
<connection>
+ <sender>kcfg_ShowThumbnails</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>kcfg_ThumbnailMaxDimension</receiver>
+ <slot>setEnabled(bool)</slot>
+ </connection>
+ <connection>
+ <sender>kcfg_UseCustomColors</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>kcfg_InactiveTaskTextColor</receiver>
+ <slot>setEnabled(bool)</slot>
+ </connection>
+ <connection>
+ <sender>kcfg_UseCustomColors</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>kcfg_ActiveTaskTextColor</receiver>
+ <slot>setEnabled(bool)</slot>
+ </connection>
+ <connection>
+ <sender>kcfg_UseCustomColors</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>kcfg_TaskBackgroundColor</receiver>
+ <slot>setEnabled(bool)</slot>
+ </connection>
+ <connection>
+ <sender>kcfg_ShowThumbnails</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>thumbMaxDimensionLabel</receiver>
+ <slot>setEnabled(bool)</slot>
+ </connection>
+ <connection>
+ <sender>kcfg_SortByApp</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>kcfg_AllowDragAndDropReArrange</receiver>
+ <slot>setDisabled(bool)</slot>
+ </connection>
+ <connection>
+ <sender>kcfg_DrawButtons</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>kcfg_ShowButtonOnHover</receiver>
+ <slot>setDisabled(bool)</slot>
+ </connection>
+ <connection>
+ <sender>kcfg_HaloText</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>kcfg_ShowButtonOnHover</receiver>
+ <slot>setDisabled(bool)</slot>
+ </connection>
+ <connection>
<sender>kcfg_ShowAllWindows</sender>
<signal>toggled(bool)</signal>
<receiver>kcfg_SortByDesktop</receiver>
<slot>setEnabled(bool)</slot>
</connection>
</connections>
-<tabstops>
- <tabstop>kcfg_ShowAllWindows</tabstop>
- <tabstop>kcfg_SortByDesktop</tabstop>
- <tabstop>showAllScreens</tabstop>
- <tabstop>kcfg_SortByApp</tabstop>
- <tabstop>kcfg_AllowDragAndDropReArrange</tabstop>
- <tabstop>kcfg_CycleWheel</tabstop>
- <tabstop>kcfg_ShowOnlyIconified</tabstop>
- <tabstop>kcfg_ShowWindowListBtn</tabstop>
- <tabstop>kcfg_DisplayIconsNText</tabstop>
- <tabstop>kcfg_GroupTasks</tabstop>
- <tabstop>kcfg_ShowTaskStates</tabstop>
- <tabstop>appearance</tabstop>
- <tabstop>kcfg_UseCustomColors</tabstop>
- <tabstop>kcfg_InactiveTaskTextColor</tabstop>
- <tabstop>kcfg_ActiveTaskTextColor</tabstop>
- <tabstop>kcfg_TaskBackgroundColor</tabstop>
- <tabstop>kcfg_LeftButtonAction</tabstop>
- <tabstop>kcfg_MiddleButtonAction</tabstop>
- <tabstop>kcfg_RightButtonAction</tabstop>
-</tabstops>
<includes>
<include location="global" impldecl="in implementation">kcolorbutton.h</include>
<include location="global" impldecl="in implementation">kdialog.h</include>
+ <include location="global" impldecl="in implementation">kseparator.h</include>
+ <include location="global" impldecl="in implementation">tdefontcombo.h</include>
+ <include location="global" impldecl="in implementation">klineedit.h</include>
+ <include location="global" impldecl="in implementation">tdefontrequester.h</include>
+ <include location="global" impldecl="in implementation">tqtabwidget.h</include>
</includes>
<layoutdefaults spacing="3" margin="6"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
diff --git a/khotkeys/kcontrol/CMakeLists.txt b/khotkeys/kcontrol/CMakeLists.txt
index 5028763ce..902c5a0e6 100644
--- a/khotkeys/kcontrol/CMakeLists.txt
+++ b/khotkeys/kcontrol/CMakeLists.txt
@@ -37,7 +37,7 @@ tde_create_translated_desktop( khotkeys.desktop )
tde_add_kpart( kcm_khotkeys AUTOMOC
SOURCES
menuedit.cpp window_trigger_widget.cpp tab_widget.cpp main_buttons_widget.cpp
- actions_listview_widget.cpp menuentry_widget.cpp general_tab.cpp
+ actions_listview_widget.cpp menuentry_widget.cpp general_tab.cpp waiting_widget.cpp
action_group_tab.cpp kcmkhotkeys.cpp command_url_widget.cpp windowdef_list_widget.cpp
windowdef_simple_widget.cpp triggers_tab.cpp dcop_widget.cpp info_tab.cpp
action_list_widget.cpp keyboard_input_widget.cpp condition_list_widget.cpp
diff --git a/khotkeys/kcontrol/Makefile.am b/khotkeys/kcontrol/Makefile.am
index 7eb3f2f6d..03a728ae3 100644
--- a/khotkeys/kcontrol/Makefile.am
+++ b/khotkeys/kcontrol/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kcm_khotkeys.la kcm_khotkeys_init.la
kcm_khotkeys_la_SOURCES = \
menuedit.cpp window_trigger_widget.cpp tab_widget.cpp main_buttons_widget.cpp \
- actions_listview_widget.cpp menuentry_widget.cpp general_tab.cpp \
+ actions_listview_widget.cpp menuentry_widget.cpp general_tab.cpp waiting_widget.cpp \
action_group_tab.cpp kcmkhotkeys.cpp command_url_widget.cpp windowdef_list_widget.cpp \
windowdef_simple_widget.cpp triggers_tab.cpp dcop_widget.cpp info_tab.cpp \
action_list_widget.cpp keyboard_input_widget.cpp condition_list_widget.cpp \
diff --git a/khotkeys/kcontrol/action_list_widget.cpp b/khotkeys/kcontrol/action_list_widget.cpp
index ffa71bce0..d007ab5f5 100644
--- a/khotkeys/kcontrol/action_list_widget.cpp
+++ b/khotkeys/kcontrol/action_list_widget.cpp
@@ -32,6 +32,7 @@
#include "dcop_widget.h"
#include "keyboard_input_widget.h"
#include "activate_window_widget.h"
+#include "waiting_widget.h"
#include "kcmkhotkeys.h"
namespace KHotKeys
@@ -48,6 +49,7 @@ Action_list_widget::Action_list_widget( TQWidget* parent_P, const char* name_P )
popup->insertItem( i18n( "DCOP Call..." ), TYPE_DCOP_ACTION );
popup->insertItem( i18n( "Keyboard Input..." ), TYPE_KEYBOARD_INPUT_ACTION );
popup->insertItem( i18n( "Activate Window..." ), TYPE_ACTIVATE_WINDOW_ACTION );
+ popup->insertItem( i18n( "Waiting..." ), TYPE_WAITING_ACTION );
connect( popup, TQT_SIGNAL( activated( int )), TQT_SLOT( new_selected( int )));
new_button->setPopup( popup );
actions_listview->header()->hide();
@@ -62,16 +64,13 @@ Action_list_widget::Action_list_widget( TQWidget* parent_P, const char* name_P )
this, TQT_SLOT( modify_pressed() ) );
// KHotKeys::Module::changed()
- connect( new_button, TQT_SIGNAL( clicked()),
- module, TQT_SLOT( changed()));
- connect( copy_button, TQT_SIGNAL( clicked()),
- module, TQT_SLOT( changed()));
- connect( modify_button, TQT_SIGNAL( clicked()),
- module, TQT_SLOT( changed()));
- connect( delete_button, TQT_SIGNAL( clicked()),
- module, TQT_SLOT( changed()));
- connect( comment_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
- module, TQT_SLOT( changed()));
+ connect(new_button, TQT_SIGNAL(clicked()), module, TQT_SLOT(changed()));
+ connect(copy_button, TQT_SIGNAL(clicked()), module, TQT_SLOT(changed()));
+ connect(modify_button, TQT_SIGNAL(clicked()), module, TQT_SLOT(changed()));
+ connect(delete_button, TQT_SIGNAL(clicked()), module, TQT_SLOT(changed()));
+ connect(move_up_button, TQT_SIGNAL(clicked()), module, TQT_SLOT(changed()));
+ connect(move_down_button, TQT_SIGNAL(clicked()), module, TQT_SLOT(changed()));
+ connect(comment_lineedit, TQT_SIGNAL(textChanged(const TQString&)), module, TQT_SLOT(changed()));
}
Action_list_widget::~Action_list_widget()
@@ -132,6 +131,9 @@ void Action_list_widget::new_selected( int type_P )
case TYPE_ACTIVATE_WINDOW_ACTION: // Activate_window_action_dialog
dlg = new Activate_window_action_dialog( NULL );
break;
+ case TYPE_WAITING_ACTION: // Waiting_action_dialog
+ dlg = new Waiting_action_dialog( NULL );
+ break;
default:
assert( false );
}
@@ -189,6 +191,42 @@ void Action_list_widget::modify_pressed()
edit_listview_item( selected_item );
}
+void Action_list_widget::move_up_pressed()
+ {
+ if ( !selected_item )
+ {
+ return;
+ }
+
+ Action_list_item *prevItem = nullptr;
+ TQListViewItem *currItem = actions_listview->firstChild();
+ while (currItem != selected_item)
+ {
+ prevItem = static_cast< Action_list_item* >(currItem);
+ currItem = currItem->nextSibling();
+ }
+ if (prevItem)
+ {
+ prevItem->moveItem(selected_item);
+ current_changed(selected_item);
+ }
+ }
+
+void Action_list_widget::move_down_pressed()
+ {
+ if ( !selected_item )
+ {
+ return;
+ }
+
+ Action_list_item *nextItem = static_cast< Action_list_item* >(selected_item->nextSibling());
+ if (nextItem)
+ {
+ selected_item->moveItem(nextItem);
+ current_changed(selected_item);
+ }
+ }
+
void Action_list_widget::current_changed( TQListViewItem* item_P )
{
// if( item_P == selected_item )
@@ -198,6 +236,8 @@ void Action_list_widget::current_changed( TQListViewItem* item_P )
copy_button->setEnabled( item_P != NULL );
modify_button->setEnabled( item_P != NULL );
delete_button->setEnabled( item_P != NULL );
+ move_up_button->setEnabled(selected_item != actions_listview->firstChild());
+ move_down_button->setEnabled(selected_item != actions_listview->lastChild());
}
Action_list_item* Action_list_widget::create_listview_item( Action* action_P,
@@ -236,6 +276,8 @@ void Action_list_widget::edit_listview_item( Action_list_item* item_P )
else if( Activate_window_action* action
= dynamic_cast< Activate_window_action* >( item_P->action()))
dlg = new Activate_window_action_dialog( action );
+ else if( Waiting_action* action = dynamic_cast< Waiting_action* >( item_P->action()))
+ dlg = new Waiting_action_dialog( action );
else // CHECKME TODO pridat dalsi
assert( false );
Action* new_action = dlg->edit_action();
@@ -370,6 +412,28 @@ void Activate_window_action_dialog::accept()
action = new Activate_window_action( NULL, widget->get_data()); // CHECKME NULL ?
}
+// Waiting_action_dialog
+
+Waiting_action_dialog::Waiting_action_dialog( Waiting_action* action_P )
+ : KDialogBase( NULL, NULL, true, "", Ok | Cancel ), action( NULL )
+ {
+ widget = new Waiting_widget( this );
+ widget->set_data( action_P );
+ setMainWidget( widget );
+ }
+
+Action* Waiting_action_dialog::edit_action()
+ {
+ exec();
+ return action;
+ }
+
+void Waiting_action_dialog::accept()
+ {
+ KDialogBase::accept();
+ action = widget->get_data( NULL );
+ }
+
} // namespace KHotKeys
#include "action_list_widget.moc"
diff --git a/khotkeys/kcontrol/action_list_widget.h b/khotkeys/kcontrol/action_list_widget.h
index c2f32477e..91bee9417 100644
--- a/khotkeys/kcontrol/action_list_widget.h
+++ b/khotkeys/kcontrol/action_list_widget.h
@@ -1,11 +1,11 @@
/****************************************************************************
KHotKeys
-
+
Copyright (C) 1999-2001 Lubos Lunak <l.lunak@kde.org>
Distributed under the terms of the GNU General Public License version 2.
-
+
****************************************************************************/
#ifndef _ACTION_LIST_WIDGET_H_
@@ -28,6 +28,7 @@ class Command_url_widget;
class Menuentry_widget;
class Dcop_widget;
class Keyboard_input_widget;
+class Waiting_widget;
class Action_list_item;
@@ -47,12 +48,14 @@ class Action_list_widget
TQListViewItem* parent2_P, TQListViewItem* after_P, bool copy_P );
void edit_listview_item( Action_list_item* item_P );
enum type_t { TYPE_COMMAND_URL_ACTION, TYPE_MENUENTRY_ACTION, TYPE_DCOP_ACTION,
- TYPE_KEYBOARD_INPUT_ACTION, TYPE_ACTIVATE_WINDOW_ACTION };
+ TYPE_KEYBOARD_INPUT_ACTION, TYPE_ACTIVATE_WINDOW_ACTION, TYPE_WAITING_ACTION };
protected slots:
void new_selected( int type_P );
virtual void copy_pressed();
virtual void delete_pressed();
virtual void modify_pressed();
+ virtual void move_up_pressed();
+ virtual void move_down_pressed();
virtual void current_changed( TQListViewItem* item_P );
protected:
Action_list_item* selected_item;
@@ -75,14 +78,14 @@ class Action_list_item
protected:
Action* _action; // owns it
};
-
+
class Action_dialog
{
public:
virtual Action* edit_action() = 0;
virtual ~Action_dialog();
};
-
+
class Command_url_action_dialog
: public KDialogBase, public Action_dialog
{
@@ -95,7 +98,7 @@ class Command_url_action_dialog
Command_url_widget* widget;
Command_url_action* action;
};
-
+
class Menuentry_action_dialog
: public KDialogBase, public Action_dialog
{
@@ -108,7 +111,7 @@ class Menuentry_action_dialog
Menuentry_widget* widget;
Menuentry_action* action;
};
-
+
class Dcop_action_dialog
: public KDialogBase, public Action_dialog
{
@@ -121,7 +124,7 @@ class Dcop_action_dialog
Dcop_widget* widget;
Dcop_action* action;
};
-
+
class Keyboard_input_action_dialog
: public KDialogBase, public Action_dialog
{
@@ -134,7 +137,7 @@ class Keyboard_input_action_dialog
Keyboard_input_widget* widget;
Keyboard_input_action* action;
};
-
+
class Activate_window_action_dialog
: public KDialogBase, public Action_dialog
{
@@ -147,7 +150,20 @@ class Activate_window_action_dialog
Activate_window_widget* widget;
Activate_window_action* action;
};
-
+
+class Waiting_action_dialog
+ : public KDialogBase, public Action_dialog
+ {
+ Q_OBJECT
+ public:
+ Waiting_action_dialog( Waiting_action* action_P );
+ virtual Action* edit_action();
+ protected:
+ virtual void accept();
+ Waiting_widget* widget;
+ Waiting_action* action;
+ };
+
//***************************************************************************
// Inline
//***************************************************************************
@@ -159,7 +175,7 @@ Action_list_item::Action_list_item( TQListView* parent_P, Action* action_P )
: TQListViewItem( parent_P ), _action( action_P )
{
}
-
+
inline
Action_list_item::Action_list_item( TQListViewItem* parent_P, Action* action_P )
: TQListViewItem( parent_P ), _action( action_P )
@@ -185,7 +201,7 @@ Action* Action_list_item::action() const
{
return _action;
}
-
+
inline
void Action_list_item::set_action( Action* action_P )
{
diff --git a/khotkeys/kcontrol/actions_listview_widget.cpp b/khotkeys/kcontrol/actions_listview_widget.cpp
index e528005ed..1b6c7a743 100644
--- a/khotkeys/kcontrol/actions_listview_widget.cpp
+++ b/khotkeys/kcontrol/actions_listview_widget.cpp
@@ -1,11 +1,11 @@
/****************************************************************************
KHotKeys
-
+
Copyright (C) 1999-2001 Lubos Lunak <l.lunak@kde.org>
Distributed under the terms of the GNU General Public License version 2.
-
+
****************************************************************************/
#define _ACTIONS_LISTVIEW_WIDGET_CPP_
@@ -138,7 +138,7 @@ void Actions_listview_widget::build_up()
{
build_up_recursively( module->actions_root(), NULL );
}
-
+
void Actions_listview_widget::build_up_recursively( Action_data_group* parent_P,
Action_listview_item* item_parent_P )
{
@@ -147,13 +147,13 @@ void Actions_listview_widget::build_up_recursively( Action_data_group* parent_P,
it;
++it )
{
- prev = create_item( item_parent_P, prev, ( *it ));
+ prev = create_item( item_parent_P, prev, ( *it ));
Action_data_group* grp = dynamic_cast< Action_data_group* >( *it );
if( grp != NULL )
build_up_recursively( grp, prev );
}
}
-
+
Action_listview_item* Actions_listview_widget::create_item( TQListViewItem* parent_P,
TQListViewItem* after_P, Action_data_base* data_P )
{
diff --git a/khotkeys/kcontrol/actions_listview_widget.h b/khotkeys/kcontrol/actions_listview_widget.h
index 0f3a632f4..e380791ee 100644
--- a/khotkeys/kcontrol/actions_listview_widget.h
+++ b/khotkeys/kcontrol/actions_listview_widget.h
@@ -1,11 +1,11 @@
/****************************************************************************
KHotKeys
-
+
Copyright (C) 1999-2001 Lubos Lunak <l.lunak@kde.org>
Distributed under the terms of the GNU General Public License version 2.
-
+
****************************************************************************/
#ifndef _ACTIONS_LISTVIEW_WIDGET_H_
@@ -27,13 +27,13 @@ class Action_data_base;
class Actions_listview_widget
: public Actions_listview_widget_ui
- {
+ {
Q_OBJECT
public:
Actions_listview_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
Action_listview_item* current_action() const;
void set_current_action( Action_listview_item* item );
- Action_data_base* current_action_data() const;
+ Action_data_base* current_action_data() const;
void set_action_data( Action_data_base* data_P, bool recent_action_P = false );
void action_name_changed( const TQString& name_P );
void clear();
@@ -54,7 +54,7 @@ class Actions_listview_widget
};
class Actions_listview
- : public KHListView
+ : public KHListView
{
Q_OBJECT
public:
@@ -78,7 +78,7 @@ class Action_listview_item
Action_data_base* data_P );
protected:
Action_data_base* _data; // CHECKME doesn't own !!!
- };
+ };
//***************************************************************************
// Inline
@@ -113,7 +113,7 @@ Actions_listview_widget* Actions_listview::widget()
{
return _widget;
}
-
+
// Action_listview_item
inline
@@ -139,7 +139,7 @@ Action_data_base* Action_listview_item::data() const
{
return _data;
}
-
+
inline
void Action_listview_item::set_data( Action_data_base* data_P )
{
diff --git a/khotkeys/kcontrol/condition_list_widget.cpp b/khotkeys/kcontrol/condition_list_widget.cpp
index 864c2d4a5..817602a12 100644
--- a/khotkeys/kcontrol/condition_list_widget.cpp
+++ b/khotkeys/kcontrol/condition_list_widget.cpp
@@ -62,18 +62,18 @@ Condition_list_widget::Condition_list_widget( TQWidget* parent_P, const char* na
copy_button->setEnabled( false );
modify_button->setEnabled( false );
delete_button->setEnabled( false );
+ move_up_button->setEnabled( false );
+ move_down_button->setEnabled( false );
clear_data();
// KHotKeys::Module::changed()
- connect( new_button, TQT_SIGNAL( clicked()),
- module, TQT_SLOT( changed()));
- connect( copy_button, TQT_SIGNAL( clicked()),
- module, TQT_SLOT( changed()));
- connect( modify_button, TQT_SIGNAL( clicked()),
- module, TQT_SLOT( changed()));
- connect( delete_button, TQT_SIGNAL( clicked()),
- module, TQT_SLOT( changed()));
- connect( comment_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
- module, TQT_SLOT( changed()));
+ connect(new_button, TQT_SIGNAL(clicked()), module, TQT_SLOT(changed()));
+ connect(copy_button, TQT_SIGNAL(clicked()), module, TQT_SLOT(changed()));
+ connect(modify_button, TQT_SIGNAL(clicked()), module, TQT_SLOT( changed()));
+ connect(delete_button, TQT_SIGNAL(clicked()), module, TQT_SLOT( changed()));
+ connect(move_up_button, TQT_SIGNAL(clicked()), module, TQT_SLOT(changed()));
+ connect(move_down_button, TQT_SIGNAL(clicked()), module, TQT_SLOT(changed()));
+ connect(comment_lineedit, TQT_SIGNAL(textChanged(const TQString&)),
+ module, TQT_SLOT(changed()));
}
Condition_list_widget::~Condition_list_widget()
@@ -256,6 +256,42 @@ void Condition_list_widget::modify_pressed()
edit_listview_item( selected_item );
}
+void Condition_list_widget::move_up_pressed()
+ {
+ if ( !selected_item )
+ {
+ return;
+ }
+
+ Condition_list_item *prevItem = nullptr;
+ TQListViewItem *currItem = conditions_listview->firstChild();
+ while (currItem != selected_item)
+ {
+ prevItem = static_cast< Condition_list_item* >(currItem);
+ currItem = currItem->nextSibling();
+ }
+ if (prevItem)
+ {
+ prevItem->moveItem(selected_item);
+ current_changed(selected_item);
+ }
+ }
+
+void Condition_list_widget::move_down_pressed()
+ {
+ if ( !selected_item )
+ {
+ return;
+ }
+
+ Condition_list_item *nextItem = static_cast< Condition_list_item* >(selected_item->nextSibling());
+ if (nextItem)
+ {
+ selected_item->moveItem(nextItem);
+ current_changed(selected_item);
+ }
+ }
+
void Condition_list_widget::current_changed( TQListViewItem* item_P )
{
// if( item_P == selected_item )
@@ -277,6 +313,8 @@ void Condition_list_widget::current_changed( TQListViewItem* item_P )
}
else
modify_button->setEnabled( false );
+ move_up_button->setEnabled(selected_item != conditions_listview->firstChild());
+ move_down_button->setEnabled(selected_item != conditions_listview->lastChild());
}
Condition_list_item* Condition_list_widget::create_listview_item( Condition* condition_P,
diff --git a/khotkeys/kcontrol/condition_list_widget.h b/khotkeys/kcontrol/condition_list_widget.h
index 0c99fd46c..04c9d3deb 100644
--- a/khotkeys/kcontrol/condition_list_widget.h
+++ b/khotkeys/kcontrol/condition_list_widget.h
@@ -1,11 +1,11 @@
/****************************************************************************
KHotKeys
-
+
Copyright (C) 1999-2001 Lubos Lunak <l.lunak@kde.org>
Distributed under the terms of the GNU General Public License version 2.
-
+
****************************************************************************/
#ifndef _CONDITIONS_LIST_WIDGET_H_
@@ -48,6 +48,8 @@ class Condition_list_widget
virtual void copy_pressed();
virtual void delete_pressed();
virtual void modify_pressed();
+ virtual void move_up_pressed();
+ virtual void move_down_pressed();
virtual void current_changed( TQListViewItem* item_P );
private:
void insert_listview_items( const Condition_list_base* parent_P,
@@ -74,14 +76,14 @@ class Condition_list_item
protected:
Condition* _condition; // owns it
};
-
+
class Condition_dialog
{
public:
virtual Condition* edit_condition() = 0;
virtual ~Condition_dialog();
};
-
+
class Active_window_condition_dialog
: public KDialogBase, public Condition_dialog
{
@@ -94,7 +96,7 @@ class Active_window_condition_dialog
Windowdef_list_widget* widget;
Active_window_condition* condition;
};
-
+
class Existing_window_condition_dialog
: public KDialogBase, public Condition_dialog
{
@@ -107,7 +109,7 @@ class Existing_window_condition_dialog
Windowdef_list_widget* widget;
Existing_window_condition* condition;
};
-
+
//***************************************************************************
// Inline
@@ -120,7 +122,7 @@ Condition_list_item::Condition_list_item( TQListView* parent_P, Condition* condi
: TQListViewItem( parent_P ), _condition( condition_P )
{
}
-
+
inline
Condition_list_item::Condition_list_item( TQListViewItem* parent_P, Condition* condition_P )
: TQListViewItem( parent_P ), _condition( condition_P )
@@ -146,7 +148,7 @@ Condition* Condition_list_item::condition() const
{
return _condition;
}
-
+
inline
void Condition_list_item::set_condition( Condition* condition_P )
{
diff --git a/khotkeys/kcontrol/ui/CMakeLists.txt b/khotkeys/kcontrol/ui/CMakeLists.txt
index 85212affb..ab8db9e78 100644
--- a/khotkeys/kcontrol/ui/CMakeLists.txt
+++ b/khotkeys/kcontrol/ui/CMakeLists.txt
@@ -28,7 +28,7 @@ link_directories(
tde_add_library( ui STATIC_PIC AUTOMOC
SOURCES
windowdef_simple_widget_ui.ui windowdef_list_widget_ui.ui
- command_url_widget_ui.ui menuentry_widget_ui.ui
+ command_url_widget_ui.ui menuentry_widget_ui.ui waiting_widget_ui.ui
triggers_tab_ui.ui general_tab_ui.ui action_group_tab_ui.ui
dcop_widget_ui.ui main_buttons_widget_ui.ui voice_settings_tab_ui.ui
info_tab_ui.ui window_trigger_widget_ui.ui action_list_widget_ui.ui
diff --git a/khotkeys/kcontrol/ui/Makefile.am b/khotkeys/kcontrol/ui/Makefile.am
index 14ea5c44d..ee63c6871 100644
--- a/khotkeys/kcontrol/ui/Makefile.am
+++ b/khotkeys/kcontrol/ui/Makefile.am
@@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libui.la
libui_la_SOURCES = dummy.cpp windowdef_simple_widget_ui.ui windowdef_list_widget_ui.ui \
- command_url_widget_ui.ui menuentry_widget_ui.ui triggers_tab_ui.ui general_tab_ui.ui \
+ command_url_widget_ui.ui menuentry_widget_ui.ui triggers_tab_ui.ui general_tab_ui.ui waiting_widget_ui.ui \
action_group_tab_ui.ui dcop_widget_ui.ui main_buttons_widget_ui.ui \
actions_listview_widget_ui.ui info_tab_ui.ui window_trigger_widget_ui.ui \
action_list_widget_ui.ui keyboard_input_widget_ui.ui condition_list_widget_ui.ui \
diff --git a/khotkeys/kcontrol/ui/action_list_widget_ui.ui b/khotkeys/kcontrol/ui/action_list_widget_ui.ui
index d78c6b5f1..2895e5752 100644
--- a/khotkeys/kcontrol/ui/action_list_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/action_list_widget_ui.ui
@@ -97,6 +97,22 @@
<string>Delete</string>
</property>
</widget>
+ <widget class="TQPushButton">
+ <property name="name">
+ <cstring>move_up_button</cstring>
+ </property>
+ <property name="text">
+ <string>Move &amp;up</string>
+ </property>
+ </widget>
+ <widget class="TQPushButton">
+ <property name="name">
+ <cstring>move_down_button</cstring>
+ </property>
+ <property name="text">
+ <string>Move &amp;down</string>
+ </property>
+ </widget>
</vbox>
</widget>
</hbox>
@@ -148,6 +164,18 @@
<slot>delete_pressed()</slot>
</connection>
<connection>
+ <sender>move_up_button</sender>
+ <signal>clicked()</signal>
+ <receiver>Action_list_widget_ui</receiver>
+ <slot>move_up_pressed()</slot>
+ </connection>
+ <connection>
+ <sender>move_down_button</sender>
+ <signal>clicked()</signal>
+ <receiver>Action_list_widget_ui</receiver>
+ <slot>move_down_pressed()</slot>
+ </connection>
+ <connection>
<sender>actions_listview</sender>
<signal>current_changed(TQListViewItem*)</signal>
<receiver>Action_list_widget_ui</receiver>
@@ -162,6 +190,8 @@
<slot access="protected" specifier="pure virtual">current_changed(TQListViewItem*)</slot>
<slot access="protected" specifier="pure virtual">delete_pressed()</slot>
<slot access="protected" specifier="pure virtual">modify_pressed()</slot>
+ <slot access="protected" specifier="pure virtual">move_up_pressed()</slot>
+ <slot access="protected" specifier="pure virtual">move_down_pressed()</slot>
</Q_SLOTS>
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
diff --git a/khotkeys/kcontrol/ui/condition_list_widget_ui.ui b/khotkeys/kcontrol/ui/condition_list_widget_ui.ui
index 9b3727ffd..269b889ce 100644
--- a/khotkeys/kcontrol/ui/condition_list_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/condition_list_widget_ui.ui
@@ -94,7 +94,23 @@
<cstring>delete_button</cstring>
</property>
<property name="text">
- <string>Delete</string>
+ <string>D&amp;elete</string>
+ </property>
+ </widget>
+ <widget class="TQPushButton">
+ <property name="name">
+ <cstring>move_up_button</cstring>
+ </property>
+ <property name="text">
+ <string>Move &amp;up</string>
+ </property>
+ </widget>
+ <widget class="TQPushButton">
+ <property name="name">
+ <cstring>move_down_button</cstring>
+ </property>
+ <property name="text">
+ <string>Move &amp;down</string>
</property>
</widget>
</vbox>
@@ -147,6 +163,18 @@
<slot>delete_pressed()</slot>
</connection>
<connection>
+ <sender>move_up_button</sender>
+ <signal>clicked()</signal>
+ <receiver>Condition_list_widget_ui</receiver>
+ <slot>move_up_pressed()</slot>
+ </connection>
+ <connection>
+ <sender>move_down_button</sender>
+ <signal>clicked()</signal>
+ <receiver>Condition_list_widget_ui</receiver>
+ <slot>move_down_pressed()</slot>
+ </connection>
+ <connection>
<sender>conditions_listview</sender>
<signal>current_changed(TQListViewItem*)</signal>
<receiver>Condition_list_widget_ui</receiver>
@@ -161,6 +189,8 @@
<slot access="protected" specifier="pure virtual">current_changed(TQListViewItem*)</slot>
<slot access="protected" specifier="pure virtual">delete_pressed()</slot>
<slot access="protected" specifier="pure virtual">modify_pressed()</slot>
+ <slot access="protected" specifier="pure virtual">move_up_pressed()</slot>
+ <slot access="protected" specifier="pure virtual">move_down_pressed()</slot>
</Q_SLOTS>
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
diff --git a/khotkeys/kcontrol/ui/waiting_widget_ui.ui b/khotkeys/kcontrol/ui/waiting_widget_ui.ui
new file mode 100644
index 000000000..5942a34ba
--- /dev/null
+++ b/khotkeys/kcontrol/ui/waiting_widget_ui.ui
@@ -0,0 +1,72 @@
+<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
+<class>KHotKeys::Waiting_widget_ui</class>
+<widget class="TQWidget">
+ <property name="name">
+ <cstring>Waiting_widget_ui</cstring>
+ </property>
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>580</width>
+ <height>480</height>
+ </rect>
+ </property>
+ <hbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <property name="margin">
+ <number>11</number>
+ </property>
+ <property name="spacing">
+ <number>6</number>
+ </property>
+ <widget class="TQLabel">
+ <property name="name">
+ <cstring>waiting_label</cstring>
+ </property>
+ <property name="text">
+ <string>Waiting time (ms): </string>
+ </property>
+ <property name="buddy" stdset="0">
+ <cstring>waiting_spinbox</cstring>
+ </property>
+ </widget>
+ <widget class="KIntSpinBox">
+ <property name="name">
+ <cstring>waiting_spinbox</cstring>
+ </property>
+ <property name="minValue">
+ <number>0</number>
+ </property>
+ <property name="maxValue">
+ <number>20000</number>
+ </property>
+ </widget>
+ <spacer>
+ <property name="name">
+ <cstring>Spacer16</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Expanding</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>0</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </hbox>
+</widget>
+<includes>
+ <include location="global" impldecl="in implementation">kdialog.h</include>
+ <include location="global" impldecl="in implementation">knuminput.h</include>
+</includes>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</UI>
diff --git a/khotkeys/kcontrol/waiting_widget.cpp b/khotkeys/kcontrol/waiting_widget.cpp
new file mode 100644
index 000000000..6f1c0c657
--- /dev/null
+++ b/khotkeys/kcontrol/waiting_widget.cpp
@@ -0,0 +1,56 @@
+/****************************************************************************
+
+ KHotKeys
+
+ Copyright (C) 1999-2001 Lubos Lunak <l.lunak@kde.org>
+
+ Distributed under the terms of the GNU General Public License version 2.
+
+****************************************************************************/
+
+#define _WAITING_WIDGET_CPP_
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "waiting_widget.h"
+
+#include <knuminput.h>
+
+#include <kdebug.h>
+
+#include <actions.h>
+#include <action_data.h>
+
+#include "windowdef_list_widget.h"
+#include "kcmkhotkeys.h"
+
+namespace KHotKeys
+{
+
+Waiting_widget::Waiting_widget( TQWidget* parent_P, const char* name_P )
+ : Waiting_widget_ui( parent_P, name_P )
+ {
+ // KHotKeys::Module::changed()
+ connect(waiting_spinbox, TQT_SIGNAL(valueChanged(int)),
+ module, TQT_SLOT(changed()));
+ }
+
+void Waiting_widget::set_data( const Waiting_action* data_P )
+ {
+ if( data_P == NULL )
+ {
+ return;
+ }
+ waiting_spinbox->setValue(data_P->_waiting_time);
+ }
+
+Waiting_action* Waiting_widget::get_data( Action_data* data_P ) const
+ {
+ return new Waiting_action( data_P, waiting_spinbox->value());
+ }
+
+} // namespace KHotKeys
+
+#include "waiting_widget.moc"
diff --git a/khotkeys/kcontrol/waiting_widget.h b/khotkeys/kcontrol/waiting_widget.h
new file mode 100644
index 000000000..520e7742e
--- /dev/null
+++ b/khotkeys/kcontrol/waiting_widget.h
@@ -0,0 +1,36 @@
+/****************************************************************************
+
+ KHotKeys
+
+ Copyright (C) 1999-2001 Lubos Lunak <l.lunak@kde.org>
+
+ Distributed under the terms of the GNU General Public License version 2.
+
+****************************************************************************/
+
+#ifndef _WAITING_WIDGET_H_
+#define _WAITING_WIDGET_H_
+
+#include <waiting_widget_ui.h>
+
+namespace KHotKeys
+{
+
+class Waiting_action;
+class Action_data;
+
+class Waiting_widget
+ : public Waiting_widget_ui
+ {
+ Q_OBJECT
+ public:
+ Waiting_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
+ void set_data( const Waiting_action* data_P );
+ Waiting_action* get_data( Action_data* data_P ) const;
+ };
+
+typedef Waiting_widget Waiting_tab;
+
+} // namespace KHotKeys
+
+#endif
diff --git a/khotkeys/shared/actions.cpp b/khotkeys/shared/actions.cpp
index c8590789a..69c853fed 100644
--- a/khotkeys/shared/actions.cpp
+++ b/khotkeys/shared/actions.cpp
@@ -54,7 +54,9 @@ Action* Action::create_cfg_read( TDEConfig& cfg_P, Action_data* data_P )
return new Keyboard_input_action( cfg_P, data_P );
if( type == "ACTIVATE_WINDOW" )
return new Activate_window_action( cfg_P, data_P );
- kdWarning( 1217 ) << "Unknown Action type read from cfg file\n";
+ if( type == "WAITING" )
+ return new Waiting_action( cfg_P, data_P );
+ kdWarning( 1217 ) << "Unknown Action type read from cfg file: " << type << endl;
return NULL;
}
@@ -452,4 +454,34 @@ Action* Activate_window_action::copy( Action_data* data_P ) const
return new Activate_window_action( data_P, window()->copy());
}
+// Waiting_action
+
+Waiting_action::Waiting_action( TDEConfig& cfg_P, Action_data* data_P )
+ : Action( cfg_P, data_P )
+ {
+ _waiting_time = cfg_P.readNumEntry("Time");
+ }
+
+void Waiting_action::cfg_write( TDEConfig& cfg_P ) const
+ {
+ base::cfg_write( cfg_P );
+ cfg_P.writeEntry( "Type", "WAITING" ); // overwrites value set in base::cfg_write()
+ cfg_P.writeEntry( "Time", _waiting_time);
+ }
+
+void Waiting_action::execute()
+ {
+ usleep(_waiting_time * 1000);
+ }
+
+TQString Waiting_action::description() const
+ {
+ return i18n( "Waiting %1 ms" ).arg(_waiting_time);
+ }
+
+Action* Waiting_action::copy( Action_data* data_P ) const
+ {
+ return new Waiting_action( data_P, _waiting_time);
+ }
+
} // namespace KHotKeys
diff --git a/khotkeys/shared/actions.h b/khotkeys/shared/actions.h
index f381683e1..c7cabf0fc 100644
--- a/khotkeys/shared/actions.h
+++ b/khotkeys/shared/actions.h
@@ -50,7 +50,7 @@ class KDE_EXPORT Action_list
: public TQPtrList< Action >
{
public:
- Action_list( const TQString& comment_P ); // CHECKME nebo i data ?
+ Action_list( const TQString& comment_P );
Action_list( TDEConfig& cfg_P, Action_data* data_P );
void cfg_write( TDEConfig& cfg_P ) const;
typedef TQPtrListIterator< Action > Iterator;
@@ -111,7 +111,7 @@ class KDE_EXPORT Dcop_action
virtual TQString description() const;
virtual Action* copy( Action_data* data_P ) const;
private:
- TQString app; // CHECKME TQCString ?
+ TQString app;
TQString obj;
TQString call;
TQString args;
@@ -159,6 +159,21 @@ class KDE_EXPORT Activate_window_action
const Windowdef_list* _window;
};
+class KDE_EXPORT Waiting_action
+ : public Action
+ {
+ typedef Action base;
+ public:
+ Waiting_action( Action_data* data_P, const int waiting_time );
+ Waiting_action( TDEConfig& cfg_P, Action_data* data_P );
+ virtual void cfg_write( TDEConfig& cfg_P ) const;
+ virtual void execute();
+ virtual TQString description() const;
+ virtual Action* copy( Action_data* data_P ) const;
+
+ int _waiting_time;
+ };
+
//***************************************************************************
// Inline
//***************************************************************************
@@ -300,6 +315,14 @@ const Windowdef_list* Activate_window_action::window() const
return _window;
}
+// Waiting_action
+
+inline
+Waiting_action::Waiting_action( Action_data* data_P, const int waiting_time)
+ : Action( data_P ), _waiting_time(waiting_time)
+ {
+ }
+
} // namespace KHotKeys
-
+
#endif
diff --git a/khotkeys/shared/settings.cpp b/khotkeys/shared/settings.cpp
index 76adac6b9..becacd5d1 100644
--- a/khotkeys/shared/settings.cpp
+++ b/khotkeys/shared/settings.cpp
@@ -145,9 +145,11 @@ void Settings::write_settings()
gestures_exclude->cfg_write( cfg );
}
else
+ {
cfg.deleteGroup( "GesturesExclude" );
- cfg.setGroup( "Voice" );
- cfg.writeEntry("Shortcut" , voice_shortcut.toStringInternal() );
+ }
+ cfg.setGroup( "Voice" );
+ cfg.writeEntry("Shortcut" , voice_shortcut.toStringInternal() );
}
diff --git a/khotkeys/shared/triggers.cpp b/khotkeys/shared/triggers.cpp
index 115bc6687..5bd8dbe3e 100644
--- a/khotkeys/shared/triggers.cpp
+++ b/khotkeys/shared/triggers.cpp
@@ -277,6 +277,7 @@ void Window_trigger::window_changed( WId window_P, unsigned int dirty_P )
bool matches = windows()->match( Window_data( window_P ));
existing_windows[ window_P ] = matches;
if( active && matches && !was_match )
+ {
if( window_actions & WINDOW_APPEARS )
{
windows_handler->set_action_window( window_P );
@@ -287,6 +288,7 @@ void Window_trigger::window_changed( WId window_P, unsigned int dirty_P )
windows_handler->set_action_window( window_P );
data->execute();
}
+ }
kdDebug( 1217 ) << "Window_trigger::w_changed() : " << was_match << "|" << matches << endl;
}
diff --git a/kicker/taskbar/taskbar.cpp b/kicker/taskbar/taskbar.cpp
index 29c06da89..d4e04f6b5 100644
--- a/kicker/taskbar/taskbar.cpp
+++ b/kicker/taskbar/taskbar.cpp
@@ -49,7 +49,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "taskbar.h"
#include "taskbar.moc"
-#define READ_MERGED_TASBKAR_SETTING(x) ((m_settingsObject->useGlobalSettings())?m_globalSettingsObject->x():m_settingsObject->x())
+#define READ_MERGED_TASKBAR_SETTING(x) ((m_settingsObject->useGlobalSettings())?m_globalSettingsObject->x():m_settingsObject->x())
TaskBar::TaskBar( TaskBarSettings* settingsObject, TaskBarSettings* globalSettingsObject, TQWidget *parent, const char *name )
: Panner( parent, name ),
@@ -81,7 +81,7 @@ TaskBar::TaskBar( TaskBarSettings* settingsObject, TaskBarSettings* globalSettin
// init
setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
- m_sortByAppPrev = READ_MERGED_TASBKAR_SETTING(sortByApp);
+ m_sortByAppPrev = READ_MERGED_TASKBAR_SETTING(sortByApp);
// setup animation frames
for (int i = 1; i < 11; i++)
@@ -174,31 +174,40 @@ KTextShadowEngine *TaskBar::textShadowEngine()
return m_textShadowEngine;
}
-
-TQSize TaskBar::sizeHint() const
+int TaskBar::buttonHeight() const
{
- // get our minimum height based on the minimum button height or the
- // height of the font in use, which is largest
TQFontMetrics fm(TDEGlobalSettings::taskbarFont());
- int minButtonHeight = fm.height() > READ_MERGED_TASBKAR_SETTING(minimumButtonHeight) ?
- fm.height() : READ_MERGED_TASBKAR_SETTING(minimumButtonHeight);
+ int bh = TQMAX(fm.height(), READ_MERGED_TASKBAR_SETTING(minimumButtonHeight));
+
+ if(showIcons())
+ {
+ bh = TQMAX(bh, READ_MERGED_TASKBAR_SETTING(iconSize));
+ }
+
+ return bh + 2;
+}
+
+int TaskBar::buttonWidth() const
+{
+ return TQMAX(BUTTON_MIN_WIDTH, READ_MERGED_TASKBAR_SETTING(iconSize)) + 2;
+}
- return TQSize(BUTTON_MIN_WIDTH, minButtonHeight);
+
+TQSize TaskBar::sizeHint() const
+{
+ return TQSize(buttonWidth(), buttonHeight());
}
TQSize TaskBar::sizeHint( KPanelExtension::Position p, TQSize maxSize) const
{
- // get our minimum height based on the minimum button height or the
- // height of the font in use, which is largest
- TQFontMetrics fm(TDEGlobalSettings::taskbarFont());
- int minButtonHeight = fm.height() > READ_MERGED_TASBKAR_SETTING(minimumButtonHeight) ?
- fm.height() : READ_MERGED_TASBKAR_SETTING(minimumButtonHeight);
+ // get our minimum height based on the minimum button height, the icon size or the
+ // height of the font in use, whichever is largest
if ( p == KPanelExtension::Left || p == KPanelExtension::Right )
{
// Vertical layout
// Minimum space allows for one icon, the window list button and the up/down scrollers
- int minHeight = minButtonHeight*3;
+ int minHeight = buttonHeight()*3;
if (minHeight > maxSize.height())
return maxSize;
return TQSize(maxSize.width(), minHeight);
@@ -207,7 +216,7 @@ TQSize TaskBar::sizeHint( KPanelExtension::Position p, TQSize maxSize) const
{
// Horizontal layout
// Minimum space allows for one column of icons, the window list button and the left/right scrollers
- int min_width=BUTTON_MIN_WIDTH*3;
+ int min_width=buttonWidth()*3;
if (min_width > maxSize.width())
return maxSize;
return TQSize(min_width, maxSize.height());
@@ -233,16 +242,18 @@ void TaskBar::configure()
bool wasDisplayIconsNText = m_displayIconsNText;
bool wasShowOnlyIconified = m_showOnlyIconified;
int wasShowTaskStates = m_showTaskStates;
+ int wasIconSize = m_iconSize;
- m_showAllWindows = READ_MERGED_TASBKAR_SETTING(showAllWindows);
- m_sortByDesktop = m_showAllWindows && READ_MERGED_TASBKAR_SETTING(sortByDesktop);
- m_displayIconsNText = READ_MERGED_TASBKAR_SETTING(displayIconsNText);
- m_showOnlyIconified = READ_MERGED_TASBKAR_SETTING(showOnlyIconified);
- m_cycleWheel = READ_MERGED_TASBKAR_SETTING(cycleWheel);
- m_showTaskStates = READ_MERGED_TASBKAR_SETTING(showTaskStates);
+ m_showAllWindows = READ_MERGED_TASKBAR_SETTING(showAllWindows);
+ m_sortByDesktop = m_showAllWindows && READ_MERGED_TASKBAR_SETTING(sortByDesktop);
+ m_displayIconsNText = READ_MERGED_TASKBAR_SETTING(displayIconsNText);
+ m_showOnlyIconified = READ_MERGED_TASKBAR_SETTING(showOnlyIconified);
+ m_cycleWheel = READ_MERGED_TASKBAR_SETTING(cycleWheel);
+ m_showTaskStates = READ_MERGED_TASKBAR_SETTING(showTaskStates);
+ m_iconSize = READ_MERGED_TASKBAR_SETTING(iconSize);
m_currentScreen = -1; // Show all screens or re-get our screen
- m_showOnlyCurrentScreen = (READ_MERGED_TASBKAR_SETTING(showCurrentScreenOnly) &&
+ m_showOnlyCurrentScreen = (READ_MERGED_TASKBAR_SETTING(showCurrentScreenOnly) &&
TQApplication::desktop()->isVirtualDesktop() &&
TQApplication::desktop()->numScreens() > 1);
@@ -264,7 +275,8 @@ void TaskBar::configure()
wasDisplayIconsNText != m_displayIconsNText ||
wasCycleWheel != m_cycleWheel ||
wasShowOnlyIconified != m_showOnlyIconified ||
- wasShowTaskStates != m_showTaskStates)
+ wasShowTaskStates != m_showTaskStates ||
+ wasIconSize != m_iconSize)
{
// relevant settings changed, update our task containers
for (TaskContainer::Iterator it = containers.begin();
@@ -275,12 +287,12 @@ void TaskBar::configure()
}
}
- if (m_sortByAppPrev != READ_MERGED_TASBKAR_SETTING(sortByApp)) {
- m_sortByAppPrev = READ_MERGED_TASBKAR_SETTING(sortByApp);
+ if (m_sortByAppPrev != READ_MERGED_TASKBAR_SETTING(sortByApp)) {
+ m_sortByAppPrev = READ_MERGED_TASKBAR_SETTING(sortByApp);
reSort();
}
- TaskManager::the()->setXCompositeEnabled(READ_MERGED_TASBKAR_SETTING(showThumbnails));
+ TaskManager::the()->setXCompositeEnabled(READ_MERGED_TASKBAR_SETTING(showThumbnails));
reLayoutEventually();
}
@@ -409,7 +421,7 @@ void TaskBar::showTaskContainer(TaskContainer* container)
}
// try to place the container after one of the same app
- if (READ_MERGED_TASBKAR_SETTING(sortByApp))
+ if (READ_MERGED_TASKBAR_SETTING(sortByApp))
{
TaskContainer::Iterator it = containers.begin();
for (; it != containers.end(); ++it)
@@ -731,14 +743,12 @@ void TaskBar::reLayout()
// number of rows simply depends on our height which is either the
// minimum button height or the height of the font in use, whichever is
// largest
- TQFontMetrics fm(TDEGlobalSettings::taskbarFont());
- int minButtonHeight = fm.height() > READ_MERGED_TASBKAR_SETTING(minimumButtonHeight) ?
- fm.height() : READ_MERGED_TASBKAR_SETTING(minimumButtonHeight);
+ int minButtonHeight = buttonHeight();
// horizontal layout
if (orientation() == Qt::Horizontal)
{
- int bwidth=BUTTON_MIN_WIDTH;
+ int bwidth=buttonWidth();
int rows = contentsRect().height() / minButtonHeight;
if (rows<1)
rows=1;
@@ -752,20 +762,20 @@ void TaskBar::reLayout()
int bpr = static_cast<int>(ceil(static_cast<double>(list.count()) / rows));
// adjust content size
- if ( contentsRect().width() < bpr * BUTTON_MIN_WIDTH )
+ if ( contentsRect().width() < bpr * bwidth )
{
- resizeContents( bpr * BUTTON_MIN_WIDTH, contentsRect().height() );
+ resizeContents( bpr * bwidth, contentsRect().height() );
}
// maximum number of buttons per row
- int mbpr = contentsRect().width() / BUTTON_MIN_WIDTH;
+ int mbpr = contentsRect().width() / bwidth;
// expand button width if space permits and the taskbar is not in 'icons only' mode
if (mbpr > bpr)
{
if (!showIcons() || showText())
bwidth = contentsRect().width() / bpr;
- int maxWidth = READ_MERGED_TASBKAR_SETTING(maximumButtonWidth);
+ int maxWidth = READ_MERGED_TASKBAR_SETTING(maximumButtonWidth);
if (maxWidth > 0 && bwidth > maxWidth)
{
bwidth = maxWidth;
@@ -987,9 +997,7 @@ int TaskBar::taskCount() const
int TaskBar::maximumButtonsWithoutShrinking() const
{
- TQFontMetrics fm(TDEGlobalSettings::taskbarFont());
- int minButtonHeight = fm.height() > READ_MERGED_TASBKAR_SETTING(minimumButtonHeight) ?
- fm.height() : READ_MERGED_TASBKAR_SETTING(minimumButtonHeight);
+ int minButtonHeight = buttonHeight();
int rows = contentsRect().height() / minButtonHeight;
if (rows < 1)
@@ -999,7 +1007,7 @@ int TaskBar::maximumButtonsWithoutShrinking() const
if ( orientation() == Qt::Horizontal ) {
// maxWidth of 0 means no max width, drop back to default
- int maxWidth = READ_MERGED_TASBKAR_SETTING(maximumButtonWidth);
+ int maxWidth = READ_MERGED_TASKBAR_SETTING(maximumButtonWidth);
if (maxWidth == 0)
{
maxWidth = BUTTON_MAX_WIDTH;
@@ -1017,8 +1025,8 @@ int TaskBar::maximumButtonsWithoutShrinking() const
bool TaskBar::shouldGroup() const
{
- return READ_MERGED_TASBKAR_SETTING(groupTasks) == m_settingsObject->GroupAlways ||
- ((READ_MERGED_TASBKAR_SETTING(groupTasks) == m_settingsObject->GroupWhenFull &&
+ return READ_MERGED_TASKBAR_SETTING(groupTasks) == m_settingsObject->GroupAlways ||
+ ((READ_MERGED_TASKBAR_SETTING(groupTasks) == m_settingsObject->GroupWhenFull &&
taskCount() > maximumButtonsWithoutShrinking()));
}
@@ -1166,7 +1174,7 @@ void TaskBar::activateNextTask(bool forward)
void TaskBar::wheelEvent(TQWheelEvent* e)
{
- if(READ_MERGED_TASBKAR_SETTING(cycleWheel)) {
+ if(READ_MERGED_TASKBAR_SETTING(cycleWheel)) {
if (e->delta() > 0)
{
diff --git a/kicker/taskbar/taskbar.h b/kicker/taskbar/taskbar.h
index 0ab614a61..917e9e2de 100644
--- a/kicker/taskbar/taskbar.h
+++ b/kicker/taskbar/taskbar.h
@@ -137,37 +137,40 @@ protected:
void moveEvent( TQMoveEvent* );
bool idMatch( const TQString& id1, const TQString& id2 );
TaskContainer::List filteredContainers();
+ int buttonHeight() const;
+ int buttonWidth() const;
private:
void sortContainersByDesktop(TaskContainer::List& list);
void setViewportBackground();
- bool blocklayout;
- bool m_showAllWindows;
- bool m_cycleWheel;
- int m_currentScreen; // The screen to show, -1 for all screens
- bool m_showOnlyCurrentScreen;
- bool m_sortByDesktop;
+ bool blocklayout;
+ bool m_showAllWindows;
+ bool m_cycleWheel;
+ int m_currentScreen; // The screen to show, -1 for all screens
+ bool m_showOnlyCurrentScreen;
+ bool m_sortByDesktop;
int m_displayIconsNText;
- bool m_showOnlyIconified;
- int m_showTaskStates;
- ArrowType arrowType;
- TaskContainer::List containers;
- TaskContainer::List m_hiddenContainers;
- TaskContainer::List m_deletableContainers;
- PixmapList frames;
+ bool m_showOnlyIconified;
+ int m_showTaskStates;
+ int m_iconSize;
+ ArrowType arrowType;
+ TaskContainer::List containers;
+ TaskContainer::List m_hiddenContainers;
+ TaskContainer::List m_deletableContainers;
+ PixmapList frames;
int maximumButtonsWithoutShrinking() const;
bool shouldGroup() const;
bool isGrouping;
void reGroup();
TDEGlobalAccel* keys;
- KTextShadowEngine* m_textShadowEngine;
- bool m_ignoreUpdates;
- bool m_sortByAppPrev;
- TQTimer m_relayoutTimer;
- TQImage m_blendGradient;
- TaskBarSettings* m_settingsObject;
- TaskBarSettings* m_globalSettingsObject;
+ KTextShadowEngine* m_textShadowEngine;
+ bool m_ignoreUpdates;
+ bool m_sortByAppPrev;
+ TQTimer m_relayoutTimer;
+ TQImage m_blendGradient;
+ TaskBarSettings* m_settingsObject;
+ TaskBarSettings* m_globalSettingsObject;
};
#endif
diff --git a/kicker/taskbar/taskbar.kcfg b/kicker/taskbar/taskbar.kcfg
index 95596ad34..7436f2e8e 100644
--- a/kicker/taskbar/taskbar.kcfg
+++ b/kicker/taskbar/taskbar.kcfg
@@ -75,9 +75,9 @@
<label>Only Running</label>
</choice>
</choices>
- <default>ShowAll</default>
+ <default>ShowAll</default>
<label>Show tasks with state:</label>
- <whatsthis>The taskbar can show and/or hide tasks based on their current process state. Select <em>Any</em> to show all tasks regardless of current state.</whatsthis>
+ <whatsthis>The taskbar can show and/or hide tasks based on their current process state. Select <em>Any</em> to show all tasks regardless of current state.</whatsthis>
</entry>
<entry key="SortByDesktop" type="Bool" >
<default>true</default>
@@ -91,9 +91,10 @@
</entry>
<entry key="MaximumButtonWidth" type="Int" >
<default>200</default>
- <min>0</min>
- <label></label>
- <whatsthis></whatsthis>
+ <min>50</min>
+ <max>500</max>
+ <label>Maximum button width</label>
+ <whatsthis>The maximum width to which a taskbar item can expand.</whatsthis>
</entry>
<entry key="MinimumButtonHeight" type="Int" >
<default>18</default>
@@ -172,19 +173,20 @@
<label>Draw taskbar entries "flat" and not as a button</label>
<whatsthis>Turning this option on will cause the taskbar to draw visible button frames for each entry in the taskbar. By default, this option is off.</whatsthis>
</entry>
+ <entry key="ShowButtonOnHover" type="Bool" >
+ <default>true</default>
+ <label>Show a visible button frame on the task the cursor is positioned over</label>
+ <whatsthis>Turning this option on will cause the taskbar to draw a visible button frame around the item currently under the mouse. By default, this option is on.</whatsthis>
+ </entry>
<entry key="HaloText" type="Bool" >
<default>false</default>
<label>Draw taskbar text with a halo around it</label>
<whatsthis>Turning this option on will cause the taskbar to draw fancier text that has an outline around it. While this is useful for transparent panels or particularly dark panel backgrounds, it is slower.</whatsthis>
</entry>
- <entry key="ShowButtonOnHover" type="Bool" >
- <default>true</default>
- <label>Show a visible button frame on the task the cursor is positioned over</label>
- </entry>
<entry key="ShowThumbnails" type="Bool" >
<default>false</default>
<label>Show thumbnails instead of icons in the mouse-over effects</label>
- <whatsthis>Enabling this option will draw a thumbnail of the window in its mouse-over effect.<p>If a window is minimized or resides on a different desktop while the taskbar is starting, an icon is shown until the window is restored or the appropriate desktop is activated, respectively.</p></whatsthis>
+ <whatsthis>Enabling this option will draw a thumbnail of the window in its mouse-over effect.<p>If a window is minimized or resides on a different desktop while the taskbar is starting, an icon is shown until the window is restored or the appropriate desktop is activated, respectively. This options needs a TWin compositor in order to work.</p></whatsthis>
</entry>
<entry key="ThumbnailMaxDimension" type="UInt" >
<default>100</default>
@@ -211,5 +213,8 @@
<default code="true">QColor()</default>
<whatsthis>This color is used for displaying background of taskbar buttons.</whatsthis>
</entry>
+ <entry name="IconSize" type="UInt" >
+ <default>16</default>
+ </entry>
</group>
</kcfg>
diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp
index cc533f0b9..6ffd688d3 100644
--- a/kicker/taskbar/taskcontainer.cpp
+++ b/kicker/taskbar/taskcontainer.cpp
@@ -62,8 +62,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "taskcontainer.h"
#include "taskcontainer.moc"
-#define READ_MERGED_TASBKAR_SETTING(x) ((m_settingsObject->useGlobalSettings())?m_globalSettingsObject->x():m_settingsObject->x())
-#define READ_MERGED_TASBKAR_ACTION(x) ((m_settingsObject->useGlobalSettings())?m_globalSettingsObject->action(x):m_settingsObject->action(x))
+#define READ_MERGED_TASKBAR_SETTING(x) ((m_settingsObject->useGlobalSettings())?m_globalSettingsObject->x():m_settingsObject->x())
+#define READ_MERGED_TASKBAR_ACTION(x) ((m_settingsObject->useGlobalSettings())?m_globalSettingsObject->action(x):m_settingsObject->action(x))
static Bool netwm_atoms_created = False;
static Atom net_wm_pid = 0;
@@ -192,9 +192,11 @@ void TaskContainer::init()
if (!netwm_atoms_created) create_atoms(TQPaintDevice::x11AppDisplay());
+ int iconSize = READ_MERGED_TASKBAR_SETTING(iconSize);
+
setWFlags(TQt::WNoAutoErase);
setBackgroundMode(NoBackground);
- animBg = TQPixmap(16, 16);
+ animBg = TQPixmap(iconSize, iconSize);
installEventFilter(KickerTip::the());
@@ -366,11 +368,11 @@ void TaskContainer::checkAttention(const Task::Ptr t)
void TaskContainer::attentionTimerFired()
{
assert( attentionState != -1 );
- if (attentionState < READ_MERGED_TASBKAR_SETTING(attentionBlinkIterations)*2)
+ if (attentionState < READ_MERGED_TASKBAR_SETTING(attentionBlinkIterations)*2)
{
++attentionState;
}
- else if (READ_MERGED_TASBKAR_SETTING(attentionBlinkIterations) < 1000)
+ else if (READ_MERGED_TASKBAR_SETTING(attentionBlinkIterations) < 1000)
{
attentionTimer.stop();
}
@@ -390,9 +392,22 @@ TQSizePolicy TaskContainer::sizePolicy() const
void TaskContainer::resizeEvent( TQResizeEvent * )
{
- // calculate the icon rect
- TQRect br( style().subRect( TQStyle::SR_PushButtonContents, this ) );
- iconRect = TQStyle::visualRect( TQRect(br.x() + 2, (height() - 16) / 2, 16, 16), this );
+ recalculateIconRect();
+}
+
+void TaskContainer::recalculateIconRect()
+{
+ iconSize = READ_MERGED_TASKBAR_SETTING(iconSize);
+
+ if(taskBar->showText())
+ {
+ TQRect br( style().subRect( TQStyle::SR_PushButtonContents, this ) );
+ iconRect = TQStyle::visualRect( TQRect(br.x() + 2, (height() - iconSize) / 2, iconSize, iconSize), this );
+ }
+ else
+ {
+ iconRect = TQStyle::visualRect( TQRect((width() - iconSize) / 2, (height() - iconSize) / 2, iconSize, iconSize), this );
+ }
}
void TaskContainer::add(Task::Ptr task)
@@ -581,13 +596,14 @@ void TaskContainer::drawButton(TQPainter *p)
TQPixmap *pm((TQPixmap*)p->device());
TQPixmap pixmap; // icon
Task::Ptr task = 0;
- bool iconified = !READ_MERGED_TASBKAR_SETTING(showOnlyIconified);
- bool halo = READ_MERGED_TASBKAR_SETTING(haloText);
- bool alwaysDrawButtons = READ_MERGED_TASBKAR_SETTING(drawButtons);
+ bool iconified = !READ_MERGED_TASKBAR_SETTING(showOnlyIconified);
+ bool halo = READ_MERGED_TASKBAR_SETTING(haloText);
+ bool alwaysDrawButtons = READ_MERGED_TASKBAR_SETTING(drawButtons);
bool drawButton = alwaysDrawButtons ||
(m_mouseOver && !halo && isEnabled() &&
- READ_MERGED_TASBKAR_SETTING(showButtonOnHover));
+ READ_MERGED_TASKBAR_SETTING(showButtonOnHover));
TQFont font(TDEGlobalSettings::taskbarFont());
+ recalculateIconRect();
// draw sunken if we contain the active task
bool active = false;
@@ -608,7 +624,7 @@ void TaskContainer::drawButton(TQPainter *p)
if (task->demandsAttention())
{
- demandsAttention = attentionState == READ_MERGED_TASBKAR_SETTING(attentionBlinkIterations) ||
+ demandsAttention = attentionState == READ_MERGED_TASKBAR_SETTING(attentionBlinkIterations) ||
attentionState % 2 == 0;
}
}
@@ -616,15 +632,15 @@ void TaskContainer::drawButton(TQPainter *p)
font.setBold(active);
TQColorGroup colors = palette().active();
-
- if (READ_MERGED_TASBKAR_SETTING(useCustomColors))
+
+ if (READ_MERGED_TASKBAR_SETTING(useCustomColors))
{
- colors.setColor( TQColorGroup::Button, READ_MERGED_TASBKAR_SETTING(taskBackgroundColor));
- colors.setColor( TQColorGroup::Background, READ_MERGED_TASBKAR_SETTING(taskBackgroundColor) );
- colors.setColor( TQColorGroup::ButtonText, READ_MERGED_TASBKAR_SETTING(inactiveTaskTextColor) );
- colors.setColor( TQColorGroup::Text, READ_MERGED_TASBKAR_SETTING(inactiveTaskTextColor) );
+ colors.setColor( TQColorGroup::Button, READ_MERGED_TASKBAR_SETTING(taskBackgroundColor));
+ colors.setColor( TQColorGroup::Background, READ_MERGED_TASKBAR_SETTING(taskBackgroundColor) );
+ colors.setColor( TQColorGroup::ButtonText, READ_MERGED_TASKBAR_SETTING(inactiveTaskTextColor) );
+ colors.setColor( TQColorGroup::Text, READ_MERGED_TASKBAR_SETTING(inactiveTaskTextColor) );
}
-
+
if (demandsAttention)
{
if (!drawButton)
@@ -659,7 +675,7 @@ void TaskContainer::drawButton(TQPainter *p)
// get the task icon
if (task)
{
- pixmap = task->pixmap();
+ pixmap = task->icon(iconSize, iconSize, true);
}
bool sunken = isDown() || (alwaysDrawButtons && (active || aboutToActivate));
@@ -671,7 +687,7 @@ void TaskContainer::drawButton(TQPainter *p)
// draw button background
if (drawButton)
{
- if (READ_MERGED_TASBKAR_SETTING(drawButtons) && KickerSettings::showDeepButtons()) {
+ if (READ_MERGED_TASKBAR_SETTING(drawButtons) && KickerSettings::showDeepButtons()) {
style().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p,
TQRect(1, 1, width()-3, height()-2),
colors, sunken ? TQStyle::Style_On : TQStyle::Style_Raised);
@@ -690,21 +706,21 @@ void TaskContainer::drawButton(TQPainter *p)
}
TQString text = name(); // find text
- int textPos = ( taskBar->showIcons() && (!pixmap.isNull() || m_startup)) ? 2 + 16 + 2 : 0;
+ int textPos = ( taskBar->showIcons() && (!pixmap.isNull() || m_startup)) ? 2 + iconSize + 2 : 0;
// show icons
if (taskBar->showIcons())
{
if (pixmap.isNull() && m_startup)
- pixmap = SmallIcon(m_startup->icon());
+ pixmap = kapp->iconLoader()->loadIcon(m_startup->icon(), TDEIcon::Panel, iconSize);
if ( !pixmap.isNull() )
{
- // make sure it is no larger than 16x16
- if ( pixmap.width() > 16 || pixmap.height() > 16 )
+ // make sure it is no larger than icon size
+ if ( pixmap.width() > iconSize || pixmap.height() > iconSize )
{
TQImage tmp = pixmap.convertToImage();
- pixmap.convertFromImage( tmp.smoothScale( 16, 16 ) );
+ pixmap.convertFromImage( tmp.smoothScale( iconSize, iconSize ) );
}
// fade out the icon when minimized
@@ -718,28 +734,36 @@ void TaskContainer::drawButton(TQPainter *p)
}
// modified overlay icon
- if (taskBar->showText())
+ static TQString modStr = "[" + i18n( "modified" ) + "]";
+ int modStrPos = text.find( modStr );
+ if (modStrPos >= 0)
{
- static TQString modStr = "[" + i18n( "modified" ) + "]";
- int modStrPos = text.find( modStr );
- if (modStrPos >= 0)
+ TQRect r;
+ TQPixmap modPixmap = SmallIcon("modified");
+ if (iconified)
{
- // +1 because we include a space after the closing brace.
- text.remove(modStrPos, modStr.length() + 1);
- TQPixmap modPixmap = SmallIcon("modified");
+ TDEIconEffect::semiTransparent(modPixmap);
+ }
- // draw modified overlay
- if (!modPixmap.isNull())
- {
- TQRect r = TQStyle::visualRect(TQRect(br.x() + textPos,(height() - 16) / 2, 16, 16), this);
- if (iconified)
+ if (taskBar->showText()) // has text
+ {
+ // +1 because we include a space after the closing brace.
+ text.remove(modStrPos, modStr.length() + 1);
+
+ // draw modified overlay
+ if (!modPixmap.isNull())
{
- TDEIconEffect::semiTransparent(modPixmap);
+ r = TQStyle::visualRect(TQRect(br.x() + textPos,(height() - iconSize) / 2, iconSize, iconSize), this);
+ textPos += iconSize + 2;
}
- p->drawPixmap(r, modPixmap);
- textPos += 16 + 2;
- }
- }
+ }
+ else if (taskBar->showIcons()) // has only icon
+ {
+ r = TQRect(0, 0, iconSize / 2, iconSize / 2);
+ r.moveBottomRight(iconRect.bottomRight());
+ }
+
+ p->drawPixmap(r, modPixmap);
}
}
@@ -765,9 +789,9 @@ void TaskContainer::drawButton(TQPainter *p)
}
else // hack for the dotNET style and others
{
- if (READ_MERGED_TASBKAR_SETTING(useCustomColors))
+ if (READ_MERGED_TASKBAR_SETTING(useCustomColors))
{
- textPen = TQPen(READ_MERGED_TASBKAR_SETTING(activeTaskTextColor));
+ textPen = TQPen(READ_MERGED_TASKBAR_SETTING(activeTaskTextColor));
}
else
{
@@ -775,7 +799,7 @@ void TaskContainer::drawButton(TQPainter *p)
}
}
- int availableWidth = width() - (br.x() * 2) - textPos - 2 - (READ_MERGED_TASBKAR_SETTING(drawButtons) && KickerSettings::showDeepButtons())?2:0;
+ int availableWidth = width() - (br.x() * 2) - textPos - 2 - (READ_MERGED_TASKBAR_SETTING(drawButtons) && KickerSettings::showDeepButtons())?2:0;
if (m_filteredTasks.count() > 1)
{
availableWidth -= 8;
@@ -852,7 +876,7 @@ void TaskContainer::drawButton(TQPainter *p)
}
// draw popup arrow
- if ((m_filteredTasks.count() > 1) && (!(READ_MERGED_TASBKAR_SETTING(drawButtons) && KickerSettings::showDeepButtons())))
+ if ((m_filteredTasks.count() > 1) && (!(READ_MERGED_TASKBAR_SETTING(drawButtons) && KickerSettings::showDeepButtons())))
{
TQStyle::PrimitiveElement e = TQStyle::PE_ArrowLeft;
@@ -995,14 +1019,14 @@ void TaskContainer::mousePressEvent( TQMouseEvent* e )
switch (e->button())
{
case Qt::LeftButton:
- buttonAction = READ_MERGED_TASBKAR_ACTION(m_settingsObject->LeftButton);
+ buttonAction = READ_MERGED_TASKBAR_ACTION(m_settingsObject->LeftButton);
break;
case Qt::MidButton:
- buttonAction = READ_MERGED_TASBKAR_ACTION(m_settingsObject->MiddleButton);
+ buttonAction = READ_MERGED_TASKBAR_ACTION(m_settingsObject->MiddleButton);
break;
case Qt::RightButton:
default:
- buttonAction = READ_MERGED_TASBKAR_ACTION(m_settingsObject->RightButton);
+ buttonAction = READ_MERGED_TASKBAR_ACTION(m_settingsObject->RightButton);
break;
}
@@ -1018,7 +1042,7 @@ void TaskContainer::mouseReleaseEvent(TQMouseEvent *e)
{
m_dragStartPos = TQPoint();
- if (!READ_MERGED_TASBKAR_SETTING(drawButtons))
+ if (!READ_MERGED_TASKBAR_SETTING(drawButtons))
{
setDown(false);
}
@@ -1036,14 +1060,14 @@ void TaskContainer::mouseReleaseEvent(TQMouseEvent *e)
switch (e->button())
{
case Qt::LeftButton:
- buttonAction = READ_MERGED_TASBKAR_ACTION(m_settingsObject->LeftButton);
+ buttonAction = READ_MERGED_TASKBAR_ACTION(m_settingsObject->LeftButton);
break;
case Qt::MidButton:
- buttonAction = READ_MERGED_TASBKAR_ACTION(m_settingsObject->MiddleButton);
+ buttonAction = READ_MERGED_TASKBAR_ACTION(m_settingsObject->MiddleButton);
break;
case Qt::RightButton:
default:
- buttonAction = READ_MERGED_TASBKAR_ACTION(m_settingsObject->RightButton);
+ buttonAction = READ_MERGED_TASKBAR_ACTION(m_settingsObject->RightButton);
break;
}
@@ -1223,7 +1247,7 @@ void TaskContainer::popupMenu(int action)
return;
}
- m_menu = new TaskRMBMenu(m_filteredTasks, taskBar->showAllWindows(), (READ_MERGED_TASBKAR_SETTING(allowDragAndDropReArrange))?makeTaskMoveMenu():NULL);
+ m_menu = new TaskRMBMenu(m_filteredTasks, taskBar->showAllWindows(), (READ_MERGED_TASKBAR_SETTING(allowDragAndDropReArrange))?makeTaskMoveMenu():NULL);
}
else
{
@@ -1328,11 +1352,6 @@ void TaskContainer::mouseMoveEvent( TQMouseEvent* e )
bool TaskContainer::startDrag(const TQPoint& pos)
{
- if (m_filteredTasks.count() != 1)
- {
- return false;
- }
-
int delay = TDEGlobalSettings::dndEventDelay();
if ((m_dragStartPos - pos).manhattanLength() > delay)
@@ -1452,7 +1471,7 @@ void TaskContainer::dragEnterEvent( TQDragEnterEvent* e )
return;
}
- if (e->source() && (e->source()->parent() == this->parent()) && TaskDrag::canDecode(e) && READ_MERGED_TASBKAR_SETTING(allowDragAndDropReArrange) && (!READ_MERGED_TASBKAR_SETTING(sortByApp)))
+ if (e->source() && (e->source()->parent() == this->parent()) && TaskDrag::canDecode(e) && READ_MERGED_TASKBAR_SETTING(allowDragAndDropReArrange) && (!READ_MERGED_TASKBAR_SETTING(sortByApp)))
{
e->accept();
}
@@ -1480,7 +1499,7 @@ void TaskContainer::dropEvent( TQDropEvent* e )
return;
}
- if ((e->source()->parent() == this->parent()) && TaskDrag::canDecode(e) && READ_MERGED_TASBKAR_SETTING(allowDragAndDropReArrange) && (!READ_MERGED_TASBKAR_SETTING(sortByApp)))
+ if ((e->source()->parent() == this->parent()) && TaskDrag::canDecode(e) && READ_MERGED_TASKBAR_SETTING(allowDragAndDropReArrange) && (!READ_MERGED_TASKBAR_SETTING(sortByApp)))
{
if (taskBar->taskMoveHandler(TaskMoveDestination::Position, TaskDrag::decode(e), TQWidget::mapTo(taskBar, e->pos()))) {
e->accept();
@@ -1631,7 +1650,7 @@ void TaskContainer::updateFilteredTaskList()
{
Task::Ptr t = *it;
if ((taskBar->showAllWindows() || t->isOnCurrentDesktop()) &&
- (!READ_MERGED_TASBKAR_SETTING(showOnlyIconified) || t->isIconified()))
+ (!READ_MERGED_TASKBAR_SETTING(showOnlyIconified) || t->isIconified()))
{
pid_t pid = 0;
#ifdef Q_WS_X11
@@ -1652,15 +1671,15 @@ void TaskContainer::updateFilteredTaskList()
if (pid < 0) {
m_filteredTasks.append(t);
}
- else if (READ_MERGED_TASBKAR_SETTING(showTaskStates) != m_settingsObject->ShowAll) {
+ else if (READ_MERGED_TASKBAR_SETTING(showTaskStates) != m_settingsObject->ShowAll) {
if (is_process_resumable(pid)) {
- if (READ_MERGED_TASBKAR_SETTING(showTaskStates) == m_settingsObject->ShowAll) {
+ if (READ_MERGED_TASKBAR_SETTING(showTaskStates) == m_settingsObject->ShowAll) {
m_filteredTasks.append(t);
}
- else if (READ_MERGED_TASBKAR_SETTING(showTaskStates) == m_settingsObject->ShowStopped) {
+ else if (READ_MERGED_TASKBAR_SETTING(showTaskStates) == m_settingsObject->ShowStopped) {
m_filteredTasks.append(t);
}
- else if (READ_MERGED_TASBKAR_SETTING(showTaskStates) == m_settingsObject->ShowRunning) {
+ else if (READ_MERGED_TASKBAR_SETTING(showTaskStates) == m_settingsObject->ShowRunning) {
t->publishIconGeometry( TQRect());
}
else {
@@ -1668,13 +1687,13 @@ void TaskContainer::updateFilteredTaskList()
}
}
else {
- if (READ_MERGED_TASBKAR_SETTING(showTaskStates) == m_settingsObject->ShowAll) {
+ if (READ_MERGED_TASKBAR_SETTING(showTaskStates) == m_settingsObject->ShowAll) {
m_filteredTasks.append(t);
}
- else if (READ_MERGED_TASBKAR_SETTING(showTaskStates) == m_settingsObject->ShowStopped) {
+ else if (READ_MERGED_TASKBAR_SETTING(showTaskStates) == m_settingsObject->ShowStopped) {
t->publishIconGeometry( TQRect());
}
- else if (READ_MERGED_TASBKAR_SETTING(showTaskStates) == m_settingsObject->ShowRunning) {
+ else if (READ_MERGED_TASKBAR_SETTING(showTaskStates) == m_settingsObject->ShowRunning) {
m_filteredTasks.append(t);
}
else {
@@ -1742,6 +1761,8 @@ void TaskContainer::settingsChanged()
void TaskContainer::updateKickerTip(KickerTip::Data& data)
{
+ int iconSize = READ_MERGED_TASKBAR_SETTING(iconSize);
+
if (m_startup)
{
data.message = m_startup->text();
@@ -1749,7 +1770,7 @@ void TaskContainer::updateKickerTip(KickerTip::Data& data)
data.subtext = i18n("Loading application ...");
data.icon = TDEGlobal::iconLoader()->loadIcon(m_startup->icon(),
TDEIcon::Small,
- TDEIcon::SizeMedium,
+ iconSize,
TDEIcon::DefaultState,
0, true);
return;
@@ -1761,21 +1782,18 @@ void TaskContainer::updateKickerTip(KickerTip::Data& data)
if (m_filteredTasks.count() > 0)
{
- if (READ_MERGED_TASBKAR_SETTING(showThumbnails) &&
+ if (READ_MERGED_TASKBAR_SETTING(showThumbnails) &&
m_filteredTasks.count() == 1)
{
Task::Ptr t = m_filteredTasks.first();
- pixmap = t->thumbnail(READ_MERGED_TASBKAR_SETTING(thumbnailMaxDimension));
+ pixmap = t->thumbnail(READ_MERGED_TASKBAR_SETTING(thumbnailMaxDimension));
}
if (pixmap.isNull() && tasks.count())
{
// try to load icon via net_wm
- pixmap = KWin::icon(tasks.last()->window(),
- TDEIcon::SizeMedium,
- TDEIcon::SizeMedium,
- true);
+ pixmap = KWin::icon(tasks.last()->window(), iconSize, iconSize, true);
}
// Collect all desktops the tasks are on. Sort naturally.
@@ -1809,7 +1827,7 @@ void TaskContainer::updateKickerTip(KickerTip::Data& data)
}
}
- if (READ_MERGED_TASBKAR_SETTING(showAllWindows) && KWin::numberOfDesktops() > 1)
+ if (READ_MERGED_TASKBAR_SETTING(showAllWindows) && KWin::numberOfDesktops() > 1)
{
if (desktopMap.isEmpty())
{
diff --git a/kicker/taskbar/taskcontainer.h b/kicker/taskbar/taskcontainer.h
index edaf337b4..cc95b5f8c 100644
--- a/kicker/taskbar/taskcontainer.h
+++ b/kicker/taskbar/taskcontainer.h
@@ -117,6 +117,8 @@ protected:
void popupMenu(int);
void updateFilteredTaskList();
+ void updateIconSize();
+ void recalculateIconRect();
protected slots:
void animationTimerFired();
@@ -144,6 +146,7 @@ private:
PixmapList frames;
int attentionState;
TQRect iconRect;
+ int iconSize;
TQPixmap animBg;
Task::List tasks;
Task::List m_filteredTasks;
diff --git a/kicker/taskmanager/taskrmbmenu.cpp b/kicker/taskmanager/taskrmbmenu.cpp
index 58682196b..cdc6e4532 100644
--- a/kicker/taskmanager/taskrmbmenu.cpp
+++ b/kicker/taskmanager/taskrmbmenu.cpp
@@ -121,22 +121,22 @@ void TaskRMBMenu::fillMenu(Task::Ptr t)
void TaskRMBMenu::fillMenu()
{
- int id;
- setCheckable( true );
+ int id;
+ setCheckable( true );
Task::List::iterator itEnd = tasks.end();
for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it)
{
- Task::Ptr t = (*it);
+ Task::Ptr t = (*it);
- id = insertItem( TQIconSet( t->pixmap() ),
- t->visibleNameWithState(),
- new TaskRMBMenu(t, this) );
- setItemChecked( id, t->isActive() );
- connectItem( id, t, TQT_SLOT( activateRaiseOrIconify() ) );
- }
+ id = insertItem( TQIconSet( t->pixmap() ),
+ t->visibleNameWithState(),
+ new TaskRMBMenu(t, this) );
+ setItemChecked( id, t->isActive() );
+ connectItem( id, t, TQT_SLOT( activateRaiseOrIconify() ) );
+ }
- insertSeparator();
+ insertSeparator();
bool enable = false;
@@ -159,48 +159,55 @@ void TaskRMBMenu::fillMenu()
enable = false;
- id = insertItem( i18n( "Mi&nimize All" ), this, TQT_SLOT( slotMinimizeAll() ) );
+ id = insertItem( i18n( "Mi&nimize All" ), this, TQT_SLOT( slotMinimizeAll() ) );
itEnd = tasks.end();
for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it)
{
- if( !(*it)->isIconified() ) {
- enable = true;
- break;
- }
- }
- setItemEnabled( id, enable );
+ if( !(*it)->isIconified() ) {
+ enable = true;
+ break;
+ }
+ }
+ setItemEnabled( id, enable );
- enable = false;
+ enable = false;
- id = insertItem( i18n( "Ma&ximize All" ), this, TQT_SLOT( slotMaximizeAll() ) );
+ id = insertItem( i18n( "Ma&ximize All" ), this, TQT_SLOT( slotMaximizeAll() ) );
itEnd = tasks.end();
for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it)
{
if( !(*it)->isMaximized() ) {
- enable = true;
- break;
- }
- }
- setItemEnabled( id, enable );
+ enable = true;
+ break;
+ }
+ }
+ setItemEnabled( id, enable );
- enable = false;
+ enable = false;
- id = insertItem( i18n( "&Restore All" ), this, TQT_SLOT( slotRestoreAll() ) );
+ id = insertItem( i18n( "&Restore All" ), this, TQT_SLOT( slotRestoreAll() ) );
itEnd = tasks.end();
for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it)
{
- if( (*it)->isIconified() || (*it)->isMaximized() ) {
- enable = true;
- break;
- }
- }
- setItemEnabled( id, enable );
+ if( (*it)->isIconified() || (*it)->isMaximized() ) {
+ enable = true;
+ break;
+ }
+ }
+ setItemEnabled( id, enable );
+
+ insertSeparator();
+
+ enable = false;
- insertSeparator();
+ if (taskMoveMenu) {
+ taskMoveMenu->reparent(this, taskMoveMenu->getWFlags(), taskMoveMenu->geometry().topLeft(), FALSE);
+ insertItem(i18n("Move Task Button"), taskMoveMenu);
- enable = false;
+ insertSeparator();
+ }
- insertItem( SmallIcon( "remove" ), i18n( "&Close All" ), this, TQT_SLOT( slotCloseAll() ) );
+ insertItem( SmallIcon( "window-close" ), i18n( "&Close All" ), this, TQT_SLOT( slotCloseAll() ) );
}
TQPopupMenu* TaskRMBMenu::makeAdvancedMenu(Task::Ptr t)
diff --git a/konsole/konsole/TEWidget.cpp b/konsole/konsole/TEWidget.cpp
index 52cd1236b..026ee2df8 100644
--- a/konsole/konsole/TEWidget.cpp
+++ b/konsole/konsole/TEWidget.cpp
@@ -308,6 +308,19 @@ void TEWidget::fontChange(const TQFont &)
update();
}
+void TEWidget::biggerFont(void) {
+ TQFont f = getVTFont();
+ f.setPointSize( f.pointSize() + 1 );
+ setVTFont( f );
+}
+
+void TEWidget::smallerFont(void) {
+ TQFont f = getVTFont();
+ if ( f.pointSize() < 6 ) return; // A minimum size
+ f.setPointSize( f.pointSize() - 1 );
+ setVTFont( f );
+}
+
void TEWidget::setVTFont(const TQFont& f)
{
TQFont font = f;
@@ -1695,6 +1708,17 @@ void TEWidget::wheelEvent( TQWheelEvent* ev )
if (ev->orientation() != Qt::Vertical)
return;
+ if (ev->state() & ControlButton) {
+ if (ev->delta() > 0) {
+ biggerFont();
+ }
+ else {
+ smallerFont();
+ }
+ ev->accept();
+ return;
+ }
+
if ( mouse_marks )
{
if (!screen || screen->hasScroll() || (scrollbar->maxValue() == 0 && screen_num == 0))
diff --git a/konsole/konsole/TEWidget.h b/konsole/konsole/TEWidget.h
index 967896082..32c1ce9d5 100644
--- a/konsole/konsole/TEWidget.h
+++ b/konsole/konsole/TEWidget.h
@@ -126,6 +126,10 @@ public:
*/
void setVTFont(const TQFont& font);
+ /** Changes font size by 1 point */
+ void biggerFont();
+ void smallerFont();
+
void setMouseMarks(bool on);
static void setAntialias( bool enable ) { s_antialias = enable; }
static bool antialias() { return s_antialias; }
diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp
index 4faef5239..11fae96d1 100644
--- a/konsole/konsole/konsole.cpp
+++ b/konsole/konsole/konsole.cpp
@@ -4387,20 +4387,13 @@ void Konsole::slotFontChanged()
void Konsole::biggerFont(void) {
if ( !se ) return;
-
- TQFont f = te->getVTFont();
- f.setPointSize( f.pointSize() + 1 );
- te->setVTFont( f );
+ te->biggerFont();
activateSession();
}
void Konsole::smallerFont(void) {
if ( !se ) return;
-
- TQFont f = te->getVTFont();
- if ( f.pointSize() < 6 ) return; // A minimum size
- f.setPointSize( f.pointSize() - 1 );
- te->setVTFont( f );
+ te->smallerFont();
activateSession();
}
diff --git a/konsole/konsole/konsole_part.cpp b/konsole/konsole/konsole_part.cpp
index 64fdfb700..5e1379a4e 100644
--- a/konsole/konsole/konsole_part.cpp
+++ b/konsole/konsole/konsole_part.cpp
@@ -705,19 +705,12 @@ void konsolePart::slotSelectFont() {
void konsolePart::biggerFont(void) {
if ( !se ) return;
-
- TQFont f = te->getVTFont();
- f.setPointSize( f.pointSize() + 1 );
- te->setVTFont( f );
+ te->biggerFont();
}
void konsolePart::smallerFont(void) {
if ( !se ) return;
-
- TQFont f = te->getVTFont();
- if ( f.pointSize() < 6 ) return; // A minimum size
- f.setPointSize( f.pointSize() - 1 );
- te->setVTFont( f );
+ te->smallerFont();
}
void konsolePart::updateKeytabMenu()
diff --git a/ktip/tips b/ktip/tips
index d33dbf314..292441f76 100644
--- a/ktip/tips
+++ b/ktip/tips
@@ -1006,6 +1006,8 @@ or in Konqueror file manager to change icon size.</li>
<li>Shift+Mouse-Wheel for fast scrolling in all TDE applications.</li>
+<li>Mouse-Wheel on the speaker icon on the TDE system tray for quick adjustment of sound volume.</li>
+
<li>Mouse-Wheel over the taskbar in Kicker to quickly alternate between
different windows.</li>
@@ -1117,11 +1119,13 @@ Open the Control Center, select Peripherals->Keyboard and make your
<p>Do you already know the <i>TDE IRC channel</i>?</p>
<p>
-<b>network:</b> chat.freenode.net
+<b>network:</b> irc.libera.chat
<br />
<b>channel:</b> #trinity-desktop
<p>
+<p>Important to note that we have moved from Freenode to Libera Chat as of <b>May 9th, 2021</b>, so be sure to update any outdated links.</p>
+
<p>You can join if you have some questions or want to meet some other people from the TDE community.</p>
<p>There is a small but friendly group of people always there. Sometimes you can also meet the developers there and give them your feedback or ask other users for help. It is also the place where you can ask about ways to start contributing to TDE.</p>
diff --git a/libkonq/PLUGINS b/libkonq/PLUGINS.md
index 4eb535a59..f89ca70ef 100644
--- a/libkonq/PLUGINS
+++ b/libkonq/PLUGINS.md
@@ -1,13 +1,20 @@
+Menu Plugins
+============
+
Thus file explains how to add plugins into the konqpopupmenu
used by konqueror and kdesktop.
-Why?
+Why
+---
+
Why do we need this kind of functionality? We do have SERVICEMENUS.
A plugin can be much more dynamic. If you want to add features that
are runtime specific or need some interaction with different things
-a plugin comes in handy
+a plugin comes in handy.
+
+How
+---
-How?
-Please look at ?no_location? to get the latest plugin template
+Please look at *no_location* to get the latest plugin template.
-Holger Freyther 30th October 2001 \ No newline at end of file
+Holger Freyther 30th October 2001
diff --git a/libkonq/SERVICEMENUS b/libkonq/SERVICEMENUS
deleted file mode 100644
index 12035388c..000000000
--- a/libkonq/SERVICEMENUS
+++ /dev/null
@@ -1,52 +0,0 @@
-This file explains how to add an item in the popupmenu (for both
-konqueror and kdesktop), without using the file associations.
-
-Why
-===
-One reason for doing this is being able to associate
-some action with all files without this action becoming a default handler
-(called on left click).
-Another is that for text-based programs and tools (e.g. gzip) it's faster
-than defining a desktop file for the application, making it hidden, and
-associate it with the relevant file types.
-
-How
-===
-Create a file ~/.trinity/share/apps/konqueror/servicemenus/something.desktop
-and write into it something like (without the comments) :
-
-[Desktop Entry]
-ServiceTypes=text/html,text/plain # use all/all for all entries
- # all/allfiles for files only
- # and use inode/directory for dirs only
- # you can also do things like image/* for all
- # image mimetypes
-Actions=gzip;mail # those are ';' separated, per the standard !
-X-TDE-Submenu=Menuname # this optional entry allows grouping the
- # entries in this servicemenu file into a
- # common submenu, in this case "Menuname"
-TryExec=gzip # Find if executable exist, if it doesn't exist
- # menu entry is not displaying
-ExcludeServiceTypes=application/x-zip # This entry is used to avoid to display menu
- # when it's a specific servicetype
- # for exemple when we use all/allfiles and zip
- # them, we don't want to zip a zip file
-
-
-[Desktop Action gzip] # One "Desktop Action <name>" group per Action
-Name=GZip this file
-Name[fr]=...
-Icon=tgz
-Exec=gzip %f
-
-[Desktop Action mail]
-Name=Mail this file
-Name[fr]=...
-Icon=kmail
-Exec=kmail --there-is-no-such-option-yet %f
-
-
-See also the "desktop entry standard", which defines more formally the same
-concept of actions but for desktop files (e.g. eject on a device desktop file,
-etc.)
-
diff --git a/libkonq/SERVICEMENUS.md b/libkonq/SERVICEMENUS.md
new file mode 100644
index 000000000..bcd7ae1f7
--- /dev/null
+++ b/libkonq/SERVICEMENUS.md
@@ -0,0 +1,55 @@
+Service Menus
+=============
+
+This file explains how to add an item in the popupmenu (for both
+konqueror and kdesktop), without using the file associations.
+
+Why
+---
+
+One reason for doing this is being able to associate
+some action with all files without this action becoming a default handler
+(called on left click).
+
+Another is that for text-based programs and tools (e.g. gzip) it's faster
+than defining a desktop file for the application, making it hidden, and
+associate it with the relevant file types.
+
+How
+---
+
+Create a file `~/.trinity/share/apps/konqueror/servicemenus/something.desktop`
+and write into it something like (without the comments):
+
+ [Desktop Entry]
+ ServiceTypes=text/html,text/plain # use all/all for all entries
+ # all/allfiles for files only
+ # and use inode/directory for dirs only
+ # you can also do things like image/* for all
+ # image mimetypes
+ Actions=gzip;mail # those are ';' separated, per the standard !
+ X-TDE-Submenu=Menuname # this optional entry allows grouping the
+ # entries in this servicemenu file into a
+ # common submenu, in this case "Menuname"
+ TryExec=gzip # Find if executable exist, if it doesn't exist
+ # menu entry is not displaying
+ ExcludeServiceTypes=application/x-zip # This entry is used to avoid to display menu
+ # when it's a specific servicetype
+ # for exemple when we use all/allfiles and zip
+ # them, we don't want to zip a zip file
+
+ [Desktop Action gzip] # One "Desktop Action <name>" group per Action
+ Name=GZip this file
+ Name[fr]=...
+ Icon=tgz
+ Exec=gzip %f
+
+ [Desktop Action mail]
+ Name=Mail this file
+ Name[fr]=...
+ Icon=kmail
+ Exec=kmail --there-is-no-such-option-yet %f
+
+See also the *desktop entry standard*, which defines more formally the same
+concept of actions but for desktop files (e.g. eject on a device desktop file,
+etc.).
diff --git a/translations/desktop_files/applnk-compat/es.po b/translations/desktop_files/applnk-compat/es.po
index eadea9f43..581b22a09 100644
--- a/translations/desktop_files/applnk-compat/es.po
+++ b/translations/desktop_files/applnk-compat/es.po
@@ -1,20 +1,21 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Real name <sbdc1wdfzk@crossmailjet.com>, 2022.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-07-07 18:16+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2022-08-29 21:55+0000\n"
+"Last-Translator: Real name <sbdc1wdfzk@crossmailjet.com>\n"
+"Language-Team: Spanish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/applnk-compat/es/>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.13.1\n"
#. Name
#: battery.desktop:2 bwarning.desktop:2 cwarning.desktop:2 power.desktop:2
@@ -81,7 +82,7 @@ msgstr ""
#. Name
#: socks.desktop:2
msgid "Socks"
-msgstr ""
+msgstr "SOCKS"
#. Name
#: userinfo.desktop:13
diff --git a/translations/desktop_files/applnk-directories/es.po b/translations/desktop_files/applnk-directories/es.po
index 6a33c09e7..54614ad6d 100644
--- a/translations/desktop_files/applnk-directories/es.po
+++ b/translations/desktop_files/applnk-directories/es.po
@@ -1,20 +1,21 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Real name <sbdc1wdfzk@crossmailjet.com>, 2022.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-07-07 18:16+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2022-08-29 21:56+0000\n"
+"Last-Translator: Real name <sbdc1wdfzk@crossmailjet.com>\n"
+"Language-Team: Spanish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/applnk-directories/es/>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.13.1\n"
#. Name
#: .directory:2
@@ -38,7 +39,7 @@ msgstr "Desarrollo web"
#: kde-science.directory:5 kde-settingsmenu.directory:4 kde-system.directory:4
#: kde-utilities.directory:4
msgid "KDE"
-msgstr ""
+msgstr "KDE"
#. Name
#: kde-editors.directory:4 tde-editors.directory:4
@@ -48,17 +49,17 @@ msgstr "Editores"
#. Name
#: kde-edu-languages.directory:4
msgid "Languages"
-msgstr ""
+msgstr "Lenguajes"
#. Name
#: kde-edu-mathematics.directory:4
msgid "Mathematics"
-msgstr ""
+msgstr "Matematicas"
#. Name
#: kde-edu-miscellaneous.directory:4
msgid "Miscellaneous"
-msgstr ""
+msgstr "Miscelaneo"
#. Name
#: kde-edu-science.directory:4 tde-science.directory:5
@@ -68,7 +69,7 @@ msgstr "Ciencia"
#. Name
#: kde-games-arcade.directory:4 tde-games-arcade.directory:4
msgid "Arcade"
-msgstr ""
+msgstr "Arcade"
#. Name
#: kde-games-board.directory:4 tde-games-board.directory:4
@@ -115,7 +116,7 @@ msgstr "Escritorio"
#: kde-utilities-pim.directory:4 tde-utilities-pim.directory:4
#: tde-utilities-pim.directory:6
msgid "PIM"
-msgstr ""
+msgstr "PIM"
#. Name
#: tde-development-translation.directory:4
diff --git a/translations/desktop_files/kappfinder-data/pl.po b/translations/desktop_files/kappfinder-data/pl.po
index 8030321b9..cdb3bb475 100644
--- a/translations/desktop_files/kappfinder-data/pl.po
+++ b/translations/desktop_files/kappfinder-data/pl.po
@@ -1,20 +1,22 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Marek W <coronzon88@gmail.com>, 2022.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-07-07 18:16+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2022-10-25 18:06+0000\n"
+"Last-Translator: Marek W <coronzon88@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kappfinder-data/pl/>\n"
"Language: pl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.13.1\n"
#. Name
#: Development/Forte.desktop:2
@@ -29,7 +31,7 @@ msgstr "Środowisko Javy"
#. Name
#: Development/assistant.desktop:2
msgid "Qt Assistant"
-msgstr ""
+msgstr "Qt Assistant"
#. GenericName
#: Development/assistant.desktop:3
@@ -39,7 +41,7 @@ msgstr "Przeglądarka dokumentów"
#. Name
#: Development/ddd.desktop:2
msgid "DDD"
-msgstr ""
+msgstr "DDD"
#. GenericName
#: Development/ddd.desktop:3
@@ -48,9 +50,8 @@ msgstr "Debuger danych"
#. Name
#: Development/designer.desktop:2
-#, fuzzy
msgid "Qt Designer"
-msgstr "Projektant okien"
+msgstr "Qt designer"
#. GenericName
#: Development/designer.desktop:3
@@ -69,9 +70,8 @@ msgstr "Edytor okien dialogowych"
#. Name
#: Development/eclipse.desktop:3
-#, fuzzy
msgid "Eclipse"
-msgstr "Środowisko programowania Eclipse"
+msgstr "Eclipse"
#. GenericName
#: Development/eclipse.desktop:4
@@ -86,7 +86,7 @@ msgstr "Projektant okien"
#. Name
#: Development/j2mewtk.desktop:2
msgid "J2ME"
-msgstr ""
+msgstr "J2ME"
#. GenericName
#: Development/j2mewtk.desktop:3
@@ -920,9 +920,8 @@ msgstr "Interfejs graficzny do BitTorrent używający wxGTK"
#. Name
#: Internet/coolmail.desktop:2
-#, fuzzy
msgid "Coolmail"
-msgstr "coolmail"
+msgstr "Coolmail"
#. Name
#: Internet/dc_gui.desktop:2
@@ -1493,7 +1492,7 @@ msgstr ""
#: System/Terminal/aterm.desktop:2
#, fuzzy
msgid "Terminal"
-msgstr "Oryginał"
+msgstr "Terminal"
#. GenericName
#: System/Terminal/aterm.desktop:3 Utilities/XUtilities/xterm.desktop:3
@@ -1755,9 +1754,8 @@ msgstr "Powiększenie pulpitu"
#. Name
#: Utilities/XUtilities/xterm.desktop:2
-#, fuzzy
msgid "X Terminal"
-msgstr "Oryginał"
+msgstr "Terminal X"
#. Name
#: Utilities/calctool.desktop:2
diff --git a/translations/desktop_files/kate-desktops/pl.po b/translations/desktop_files/kate-desktops/pl.po
index 2c9859c6e..594e501a6 100644
--- a/translations/desktop_files/kate-desktops/pl.po
+++ b/translations/desktop_files/kate-desktops/pl.po
@@ -1,20 +1,22 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Marek W <coronzon88@gmail.com>, 2022.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-18 03:49+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2022-10-24 17:57+0000\n"
+"Last-Translator: Marek W <coronzon88@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kate-desktop-files/pl/>\n"
"Language: pl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.13.1\n"
#. GenericName
#: data/kate.desktop:2
@@ -24,7 +26,7 @@ msgstr "Zaawansowany edytor tekstu"
#. Name
#: data/kate.desktop:3
msgid "Kate"
-msgstr ""
+msgstr "Kate"
#. Comment
#: data/kateplugin.desktop:5
@@ -39,4 +41,4 @@ msgstr "Edytor tekstu"
#. Name
#: data/kwrite.desktop:3
msgid "KWrite"
-msgstr ""
+msgstr "KWrite"
diff --git a/translations/desktop_files/kcontrol-desktops/pl.po b/translations/desktop_files/kcontrol-desktops/pl.po
index 6ed1bb749..f6401a148 100644
--- a/translations/desktop_files/kcontrol-desktops/pl.po
+++ b/translations/desktop_files/kcontrol-desktops/pl.po
@@ -1,13 +1,14 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
# Jan Stolarek <jwstolarek@gmail.com>, 2020.
+# Marek W <coronzon88@gmail.com>, 2022.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-07-07 18:17+0000\n"
-"PO-Revision-Date: 2020-08-07 18:36+0000\n"
-"Last-Translator: Jan Stolarek <jwstolarek@gmail.com>\n"
+"PO-Revision-Date: 2022-10-25 18:06+0000\n"
+"Last-Translator: Marek W <coronzon88@gmail.com>\n"
"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
"projects/tdebase/kcontrol-desktop-files/pl/>\n"
"Language: pl\n"
@@ -16,7 +17,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.1.1\n"
+"X-Generator: Weblate 4.13.1\n"
#. Name
#: access/kaccess.desktop:3
@@ -1116,9 +1117,8 @@ msgstr ""
#. Name
#: ebrowsing/plugins/ikws/searchproviders/technorati.desktop:3
-#, fuzzy
msgid "Technorati"
-msgstr "Znaczniki Technorati"
+msgstr "Technorati"
#. Query
#: ebrowsing/plugins/ikws/searchproviders/technorati.desktop:6
diff --git a/translations/desktop_files/kdesktop-desktops/pl.po b/translations/desktop_files/kdesktop-desktops/pl.po
index bde3d394a..0eef8d8cd 100644
--- a/translations/desktop_files/kdesktop-desktops/pl.po
+++ b/translations/desktop_files/kdesktop-desktops/pl.po
@@ -1,20 +1,22 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Marek W <coronzon88@gmail.com>, 2022.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-07-17 18:15+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2022-10-25 18:06+0000\n"
+"Last-Translator: Marek W <coronzon88@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kdesktop-desktop-files/pl/>\n"
"Language: pl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.13.1\n"
#. Name
#: kdesktop.desktop.cmake:10
@@ -38,39 +40,33 @@ msgstr "Kafelkowane"
#. Name
#: kdesktopSetAsBackground.desktop:17
-#, fuzzy
-#| msgid "Centered"
msgid "Center Tiled"
msgstr "Wyśrodkowane"
#. Name
#: kdesktopSetAsBackground.desktop:22
-#, fuzzy
-#| msgid "Centered"
msgid "Centered Maxpect"
-msgstr "Wyśrodkowane"
+msgstr "Wyśrodkowane zmaksymalizowane"
#. Name
#: kdesktopSetAsBackground.desktop:27
msgid "Tiled Maxpect"
-msgstr ""
+msgstr "Kafelkowanie zmaksymalizowane"
#. Name
#: kdesktopSetAsBackground.desktop:32
msgid "Scaled"
-msgstr ""
+msgstr "Skalowanie"
#. Name
#: kdesktopSetAsBackground.desktop:37
-#, fuzzy
-#| msgid "Centered"
msgid "Centered Auto Fit"
-msgstr "Wyśrodkowane"
+msgstr "Wyśrodkowane, automatyczne dopasowanie"
#. Name
#: kdesktopSetAsBackground.desktop:42
msgid "Scale & Crop"
-msgstr ""
+msgstr "Skalowanie z przycięciem"
#. Comment
#: kwebdesktop/kwebdesktop.desktop:2
diff --git a/translations/desktop_files/kdesktop-desktops/uk.po b/translations/desktop_files/kdesktop-desktops/uk.po
index 7d9ecec4a..b289cf396 100644
--- a/translations/desktop_files/kdesktop-desktops/uk.po
+++ b/translations/desktop_files/kdesktop-desktops/uk.po
@@ -1,12 +1,12 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# Roman Savochenko <roman@oscada.org>, 2020.
+# Roman Savochenko <roman@oscada.org>, 2020, 2022.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-07-17 18:15+0000\n"
-"PO-Revision-Date: 2020-07-21 05:23+0000\n"
+"PO-Revision-Date: 2022-10-18 19:56+0000\n"
"Last-Translator: Roman Savochenko <roman@oscada.org>\n"
"Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/"
"projects/tdebase/kdesktop-desktop-files/uk/>\n"
@@ -16,7 +16,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.1.1\n"
+"X-Generator: Weblate 4.13.1\n"
#. Name
#: kdesktop.desktop.cmake:10
@@ -40,39 +40,33 @@ msgstr "Плиткою"
#. Name
#: kdesktopSetAsBackground.desktop:17
-#, fuzzy
-#| msgid "Centered"
msgid "Center Tiled"
-msgstr "По центру"
+msgstr "По центру Плиткою"
#. Name
#: kdesktopSetAsBackground.desktop:22
-#, fuzzy
-#| msgid "Centered"
msgid "Centered Maxpect"
-msgstr "По центру"
+msgstr "По центру Maxpect"
#. Name
#: kdesktopSetAsBackground.desktop:27
msgid "Tiled Maxpect"
-msgstr ""
+msgstr "Плиткою Maxpect"
#. Name
#: kdesktopSetAsBackground.desktop:32
msgid "Scaled"
-msgstr ""
+msgstr "Масштабовано"
#. Name
#: kdesktopSetAsBackground.desktop:37
-#, fuzzy
-#| msgid "Centered"
msgid "Centered Auto Fit"
-msgstr "По центру"
+msgstr "По центру Авто Підлашт."
#. Name
#: kdesktopSetAsBackground.desktop:42
msgid "Scale & Crop"
-msgstr ""
+msgstr "Масштаб & Кадрування"
#. Comment
#: kwebdesktop/kwebdesktop.desktop:2
diff --git a/translations/desktop_files/khelpcenter-desktops/pl.po b/translations/desktop_files/khelpcenter-desktops/pl.po
index 5d3742163..6a5db20f8 100644
--- a/translations/desktop_files/khelpcenter-desktops/pl.po
+++ b/translations/desktop_files/khelpcenter-desktops/pl.po
@@ -1,20 +1,22 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Marek W <coronzon88@gmail.com>, 2022.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-19 09:37+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2022-10-25 18:06+0000\n"
+"Last-Translator: Marek W <coronzon88@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/khelpcenter-desktop-files/pl/>\n"
"Language: pl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.13.1\n"
#. Name
#: Help.desktop:10
@@ -113,9 +115,8 @@ msgstr "(n) nowe"
#. Name
#: plugins/adminguide.desktop:6
-#, fuzzy
msgid "TDE Admininstrator Guide"
-msgstr "Podręcznik użytkownika TDE"
+msgstr "Podręcznik administratora TDE"
#. Name
#: plugins/applets.desktop:6
diff --git a/translations/desktop_files/khotkeys-data/pl.po b/translations/desktop_files/khotkeys-data/pl.po
index 919074c76..caa7a323b 100644
--- a/translations/desktop_files/khotkeys-data/pl.po
+++ b/translations/desktop_files/khotkeys-data/pl.po
@@ -1,12 +1,12 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# Marek W <coronzon88@gmail.com>, 2021.
+# Marek W <coronzon88@gmail.com>, 2021, 2022.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-07-07 18:17+0000\n"
-"PO-Revision-Date: 2021-10-18 20:31+0000\n"
+"PO-Revision-Date: 2022-10-24 17:57+0000\n"
"Last-Translator: Marek W <coronzon88@gmail.com>\n"
"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
"projects/tdebase/khotkeys-data/pl/>\n"
@@ -16,7 +16,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.8.1\n"
+"X-Generator: Weblate 4.13.1\n"
#. Comment
#: konqueror_gestures_trinity21.khotkeys:5
@@ -37,9 +37,8 @@ msgstr "Okno Konquerora"
#: konqueror_gestures_trinity21.khotkeys:20
#: konqueror_gestures_trinity21.khotkeys:26 trinity2b1.khotkeys:226
#: trinity2b1.khotkeys:232
-#, fuzzy
msgid "Konqueror"
-msgstr "Okno Konquerora"
+msgstr "Konqueror"
#. Comment
#: konqueror_gestures_trinity21.khotkeys:35
diff --git a/translations/desktop_files/kicker-desktops/el.po b/translations/desktop_files/kicker-desktops/el.po
index 0e7454a98..142182300 100644
--- a/translations/desktop_files/kicker-desktops/el.po
+++ b/translations/desktop_files/kicker-desktops/el.po
@@ -1,20 +1,21 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# blu.256 <mavridisf@gmail.com>, 2022.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-19 16:24+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2022-09-18 17:59+0000\n"
+"Last-Translator: blu.256 <mavridisf@gmail.com>\n"
+"Language-Team: Greek <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/kicker-desktop-files/el/>\n"
"Language: el\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.13.1\n"
#. Name
#: applets/clock/clockapplet.desktop:4
@@ -155,7 +156,7 @@ msgstr "Επέκταση γραμμής προσαρτημένων εφαρμο
#. Name
#: extensions/kasbar/kasbarextension.desktop:2
msgid "KasBar"
-msgstr ""
+msgstr "KasBar"
#. Comment
#: extensions/kasbar/kasbarextension.desktop:4
@@ -256,7 +257,7 @@ msgstr "Επέκταση θυγατρικού πίνακα."
#. Comment
#: kicker/interfaces/kickoffsearchplugin.desktop:5
msgid "A search plugin for Kickoff"
-msgstr ""
+msgstr "Ένα πρόσθετο αναζήτησης για το Kickoff"
#. Name
#: kicker/kcmkicker.desktop:10
@@ -375,7 +376,7 @@ msgstr "Μενού για το σύστημα εκτύπωσης"
#. Name
#: menuext/tom/tom.desktop:2
msgid "TOM"
-msgstr ""
+msgstr "TOM"
#. Comment
#: menuext/tom/tom.desktop:4
diff --git a/translations/desktop_files/kmenuedit.desktop/pl.po b/translations/desktop_files/kmenuedit.desktop/pl.po
index c290d73f1..d172a6d92 100644
--- a/translations/desktop_files/kmenuedit.desktop/pl.po
+++ b/translations/desktop_files/kmenuedit.desktop/pl.po
@@ -1,26 +1,27 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Marek W <coronzon88@gmail.com>, 2022.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-21 14:56+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2022-10-24 17:57+0000\n"
+"Last-Translator: Marek W <coronzon88@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kmenuedit-kmenueditdesktop/pl/>\n"
"Language: pl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.13.1\n"
#. Name
#: kmenuedit.desktop:2
-#, fuzzy
msgid "KMenuEdit"
-msgstr "Edytor menu"
+msgstr "KMenuEdit"
#. GenericName
#: kmenuedit.desktop:4
diff --git a/translations/desktop_files/knetattach.desktop/es.po b/translations/desktop_files/knetattach.desktop/es.po
index a8082f6db..50cf4453b 100644
--- a/translations/desktop_files/knetattach.desktop/es.po
+++ b/translations/desktop_files/knetattach.desktop/es.po
@@ -1,25 +1,26 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Real name <sbdc1wdfzk@crossmailjet.com>, 2022.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-21 14:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2022-08-29 21:56+0000\n"
+"Last-Translator: Real name <sbdc1wdfzk@crossmailjet.com>\n"
+"Language-Team: Spanish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/knetattach-knetattachdesktop/es/>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.13.1\n"
#. Name
#: knetattach.desktop:2
msgid "KNetAttach"
-msgstr ""
+msgstr "KNetAttach"
#. GenericName
#: knetattach.desktop:4
diff --git a/translations/desktop_files/knetattach.desktop/pl.po b/translations/desktop_files/knetattach.desktop/pl.po
index e7de56850..bfc57ce1a 100644
--- a/translations/desktop_files/knetattach.desktop/pl.po
+++ b/translations/desktop_files/knetattach.desktop/pl.po
@@ -1,25 +1,27 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Marek W <coronzon88@gmail.com>, 2022.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-21 14:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2022-10-24 17:57+0000\n"
+"Last-Translator: Marek W <coronzon88@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/knetattach-knetattachdesktop/pl/>\n"
"Language: pl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.13.1\n"
#. Name
#: knetattach.desktop:2
msgid "KNetAttach"
-msgstr ""
+msgstr "KNetAttach"
#. GenericName
#: knetattach.desktop:4
diff --git a/translations/desktop_files/konsole-eventsrc/pl.po b/translations/desktop_files/konsole-eventsrc/pl.po
index 6abcdf343..a2db92a6c 100644
--- a/translations/desktop_files/konsole-eventsrc/pl.po
+++ b/translations/desktop_files/konsole-eventsrc/pl.po
@@ -1,25 +1,27 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Marek W <coronzon88@gmail.com>, 2022.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-21 15:54+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2022-10-24 17:57+0000\n"
+"Last-Translator: Marek W <coronzon88@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/konsole-events/pl/>\n"
"Language: pl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.13.1\n"
#. Comment
#: eventsrc:3
msgid "Konsole"
-msgstr ""
+msgstr "Konsola"
#. Name
#: eventsrc:6
diff --git a/translations/desktop_files/ksplash-themes/el.po b/translations/desktop_files/ksplash-themes/el.po
new file mode 100644
index 000000000..b986ce7d3
--- /dev/null
+++ b/translations/desktop_files/ksplash-themes/el.po
@@ -0,0 +1,101 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# blu.256 <mavridisf@gmail.com>, 2022.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-01-24 18:26+0100\n"
+"PO-Revision-Date: 2022-09-18 17:59+0000\n"
+"Last-Translator: blu.256 <mavridisf@gmail.com>\n"
+"Language-Team: Greek <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/ksplash-themes/el/>\n"
+"Language: el\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.13.1\n"
+
+#. Name
+#: pics/themes/TDE-Classic/Theme.rc:4
+#: pics/themes/TDE-Classic/locolor/Theme.rc:4
+msgid "TDE 3.5 Splash Screen"
+msgstr "Θέμα KSplash TDE"
+
+#. Description
+#: pics/themes/TDE-Classic/Theme.rc:5
+#: pics/themes/TDE-Classic/locolor/Theme.rc:5
+msgid "Waves of change"
+msgstr "Τα κύματα της αλλαγής"
+
+#. Name
+#: pics/themes/blue-bend/Theme.rc:6
+msgid "Blue-Bend KDE Splash Theme"
+msgstr "Blue Bend KDE"
+
+#. Description
+#: pics/themes/blue-bend/Theme.rc:7
+msgid "Load Blue-Bend KDE KSplash theme."
+msgstr "Χρήση θέματος Blue Bend KDE."
+
+#. Name
+#: pics/themes/default/Theme.rc:6
+#, fuzzy
+msgid "Refresh TDE Splash Theme"
+msgstr "KSplash Ανανέωαη"
+
+#. Description
+#: pics/themes/default/Theme.rc:7
+msgid "Load Refresh TDE KSplash theme."
+msgstr "Χρήση θέματος"
+
+#. Name
+#: pics/themes/none/Theme.rc:4
+msgid "No Splash Screen"
+msgstr ""
+
+#. Description
+#: pics/themes/none/Theme.rc:5
+msgid "Splash Screen Turned Off"
+msgstr ""
+
+#. Name
+#: pics/themes/simple/Theme.rc:4
+msgid "Simple Splash Screen"
+msgstr ""
+
+#. Description
+#: pics/themes/simple/Theme.rc:5
+msgid "Very Simple Optimized Splash Screen"
+msgstr ""
+
+#. Name
+#: pics/themes/unified/Theme.rc:4
+msgid "Trinity Unified Splash Screen"
+msgstr ""
+
+#. Description
+#: pics/themes/unified/Theme.rc:5
+msgid "Unified system startup screen"
+msgstr ""
+
+#. Name
+#: themeengine/redmond/Theme.rc:2
+msgid "Redmond Splash Screen"
+msgstr ""
+
+#. Description
+#: themeengine/redmond/Theme.rc:3
+msgid "KSplash theme inspired by the Microsoft Windows startup screen."
+msgstr ""
+
+#. Name
+#: themeengine/standard/Theme.rc:2
+msgid "Standard Splash Screen"
+msgstr ""
+
+#. Description
+#: themeengine/standard/Theme.rc:3
+msgid "Standard TDE KSplash theme."
+msgstr ""
diff --git a/translations/desktop_files/ksplash-themes/es.po b/translations/desktop_files/ksplash-themes/es.po
index 72aa6e916..d1713d986 100644
--- a/translations/desktop_files/ksplash-themes/es.po
+++ b/translations/desktop_files/ksplash-themes/es.po
@@ -1,99 +1,100 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Real name <sbdc1wdfzk@crossmailjet.com>, 2022.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-01-24 18:26+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2022-08-29 21:56+0000\n"
+"Last-Translator: Real name <sbdc1wdfzk@crossmailjet.com>\n"
+"Language-Team: Spanish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/ksplash-themes/es/>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.13.1\n"
#. Name
#: pics/themes/TDE-Classic/Theme.rc:4
#: pics/themes/TDE-Classic/locolor/Theme.rc:4
msgid "TDE 3.5 Splash Screen"
-msgstr ""
+msgstr "Pantalla Anunciadora de TDE 3.5"
#. Description
#: pics/themes/TDE-Classic/Theme.rc:5
#: pics/themes/TDE-Classic/locolor/Theme.rc:5
msgid "Waves of change"
-msgstr ""
+msgstr "Olas del cambio"
#. Name
#: pics/themes/blue-bend/Theme.rc:6
msgid "Blue-Bend KDE Splash Theme"
-msgstr ""
+msgstr "Tema de Anunciador KDE Azul-curvado"
#. Description
#: pics/themes/blue-bend/Theme.rc:7
msgid "Load Blue-Bend KDE KSplash theme."
-msgstr ""
+msgstr "Carga el Tema KDE Azul-curvado."
#. Name
#: pics/themes/default/Theme.rc:6
msgid "Refresh TDE Splash Theme"
-msgstr ""
+msgstr "Tema de Anunciador TDE Refrescado"
#. Description
#: pics/themes/default/Theme.rc:7
msgid "Load Refresh TDE KSplash theme."
-msgstr ""
+msgstr "Carga el tema KSplash TDE Refrescado."
#. Name
#: pics/themes/none/Theme.rc:4
msgid "No Splash Screen"
-msgstr ""
+msgstr "Sin Pantalla Anunciadora"
#. Description
#: pics/themes/none/Theme.rc:5
msgid "Splash Screen Turned Off"
-msgstr ""
+msgstr "Pantalla Anunciadora Apagada"
#. Name
#: pics/themes/simple/Theme.rc:4
msgid "Simple Splash Screen"
-msgstr ""
+msgstr "Pantalla Anunciadora Simple"
#. Description
#: pics/themes/simple/Theme.rc:5
msgid "Very Simple Optimized Splash Screen"
-msgstr ""
+msgstr "Pantalla Anunciadora Optimizada y Simple"
#. Name
#: pics/themes/unified/Theme.rc:4
msgid "Trinity Unified Splash Screen"
-msgstr ""
+msgstr "Pantalla Anunciadora Unificada de Trinity"
#. Description
#: pics/themes/unified/Theme.rc:5
msgid "Unified system startup screen"
-msgstr ""
+msgstr "Pantalla unificada de inicio del sistema"
#. Name
#: themeengine/redmond/Theme.rc:2
msgid "Redmond Splash Screen"
-msgstr ""
+msgstr "Pantalla Anunciadora de Redmond"
#. Description
#: themeengine/redmond/Theme.rc:3
msgid "KSplash theme inspired by the Microsoft Windows startup screen."
-msgstr ""
+msgstr "Tema KSplash inspirado por la pantalla de inicio de Microsoft Windows."
#. Name
#: themeengine/standard/Theme.rc:2
msgid "Standard Splash Screen"
-msgstr ""
+msgstr "Pantalla Anunciadora Estandar"
#. Description
#: themeengine/standard/Theme.rc:3
msgid "Standard TDE KSplash theme."
-msgstr ""
+msgstr "Tema KSplash Estandar de TDE."
diff --git a/translations/desktop_files/ktip.desktop/es.po b/translations/desktop_files/ktip.desktop/es.po
index 59b640cc8..fcd687cb6 100644
--- a/translations/desktop_files/ktip.desktop/es.po
+++ b/translations/desktop_files/ktip.desktop/es.po
@@ -1,25 +1,26 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Real name <sbdc1wdfzk@crossmailjet.com>, 2022.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-21 20:16+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2022-08-29 21:56+0000\n"
+"Last-Translator: Real name <sbdc1wdfzk@crossmailjet.com>\n"
+"Language-Team: Spanish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/ktip-ktipdesktop/es/>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.13.1\n"
#. Name
#: ktip.desktop:2
msgid "KTip"
-msgstr ""
+msgstr "KTip"
#. GenericName
#: ktip.desktop:4
diff --git a/translations/desktop_files/l10n-desktops/pl.po b/translations/desktop_files/l10n-desktops/pl.po
index 06f1c10ea..7666e1f11 100644
--- a/translations/desktop_files/l10n-desktops/pl.po
+++ b/translations/desktop_files/l10n-desktops/pl.po
@@ -1,13 +1,14 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
# Jan Stolarek <jwstolarek@gmail.com>, 2020.
+# Marek W <coronzon88@gmail.com>, 2022.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-05-16 18:21+0000\n"
-"PO-Revision-Date: 2020-08-12 23:04+0000\n"
-"Last-Translator: Jan Stolarek <jwstolarek@gmail.com>\n"
+"PO-Revision-Date: 2022-10-25 18:06+0000\n"
+"Last-Translator: Marek W <coronzon88@gmail.com>\n"
"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
"projects/tdebase/l10n-desktop-files/pl/>\n"
"Language: pl\n"
@@ -16,7 +17,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.1.1\n"
+"X-Generator: Weblate 4.13.1\n"
#. Name
#: caribbean.desktop:2
@@ -497,7 +498,7 @@ msgstr "Wielka Brytania"
#: gd/entry.desktop:2
#, fuzzy
msgid "Grenada"
-msgstr "Kanada"
+msgstr "Grenada"
#. Name
#: ge/entry.desktop:2
@@ -800,7 +801,7 @@ msgstr "Nowa Zelandia"
#: mk/entry.desktop:3
#, fuzzy
msgid "Macedonia"
-msgstr "Nowa Kaledonia"
+msgstr "Macedonia"
#. Name
#: ml/entry.desktop:2
@@ -816,7 +817,7 @@ msgstr ""
#: mn/entry.desktop:2
#, fuzzy
msgid "Mongolia"
-msgstr "Kongo"
+msgstr "Mongolia"
#. Name
#: mo/entry.desktop:2
@@ -900,7 +901,7 @@ msgstr "Wyspy Norfolk"
#: ng/entry.desktop:2
#, fuzzy
msgid "Nigeria"
-msgstr "Algieria"
+msgstr "Nigeria"
#. Name
#: ni/entry.desktop:2
@@ -966,7 +967,7 @@ msgstr "Filipiny"
#: pk/entry.desktop:2
#, fuzzy
msgid "Pakistan"
-msgstr "Tadżykistan"
+msgstr "Pakistan"
#. Name
#: pl/entry.desktop:2
@@ -1152,7 +1153,7 @@ msgstr ""
#: tm/entry.desktop:2
#, fuzzy
msgid "Turkmenistan"
-msgstr "Tadżykistan"
+msgstr "Turkmenistan"
#. Name
#: tn/entry.desktop:2
@@ -1203,7 +1204,7 @@ msgstr "Ukraina"
#: ug/entry.desktop:2
#, fuzzy
msgid "Uganda"
-msgstr "Ruanda"
+msgstr "Uganda"
#. Name
#: us/entry.desktop:2
@@ -1219,7 +1220,7 @@ msgstr "Urugwaj"
#: uz/entry.desktop:2
#, fuzzy
msgid "Uzbekistan"
-msgstr "Tadżykistan"
+msgstr "Uzbekistan"
#. Name
#: va/entry.desktop:2
diff --git a/translations/desktop_files/tdeprint-desktops/pl.po b/translations/desktop_files/tdeprint-desktops/pl.po
index dd0b18f99..0b45d7cf6 100644
--- a/translations/desktop_files/tdeprint-desktops/pl.po
+++ b/translations/desktop_files/tdeprint-desktops/pl.po
@@ -1,13 +1,14 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
# Jan Stolarek <jwstolarek@gmail.com>, 2020.
+# Marek W <coronzon88@gmail.com>, 2022.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-07-07 18:17+0000\n"
-"PO-Revision-Date: 2020-08-12 23:04+0000\n"
-"Last-Translator: Jan Stolarek <jwstolarek@gmail.com>\n"
+"PO-Revision-Date: 2022-10-24 17:57+0000\n"
+"Last-Translator: Marek W <coronzon88@gmail.com>\n"
"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
"projects/tdebase/tdeprint-desktop-files/pl/>\n"
"Language: pl\n"
@@ -16,7 +17,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.1.1\n"
+"X-Generator: Weblate 4.13.1\n"
#. Name
#: kjobviewer/kjobviewer-autostart.desktop:7 kjobviewer/kjobviewer.desktop:8
@@ -32,9 +33,8 @@ msgstr "Zadania drukowania"
#. Name
#: kprinter/kprinter.desktop:9
-#, fuzzy
msgid "KPrinter"
-msgstr "Drukarka"
+msgstr "KPrinter"
#. GenericName
#: kprinter/kprinter.desktop:11
diff --git a/translations/desktop_files/twin-desktops/pt.po b/translations/desktop_files/twin-desktops/pt.po
index 4ebcc87f3..f26d5e5f9 100644
--- a/translations/desktop_files/twin-desktops/pt.po
+++ b/translations/desktop_files/twin-desktops/pt.po
@@ -1,20 +1,21 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Hugo Carvalho <hugokarvalho@hotmail.com>, 2022.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-25 21:32+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2022-10-31 21:56+0000\n"
+"Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n"
+"Language-Team: Portuguese <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/twin-desktop-files/pt/>\n"
"Language: pt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 4.13.1\n"
#. Name
#: kcmtwin/showdesktop.desktop:4
@@ -174,9 +175,8 @@ msgstr "(Predefinido) Desactivar a prevenção de roubo do primeiro plano do XV"
#. Description
#: data/fsp_workarounds_1.twinrules:10
-#, fuzzy
msgid "(Default) Allow focus stealing by the screen locker"
-msgstr "(Predefinido) Desactivar a prevenção de roubo do primeiro plano do XV"
+msgstr "(Predefinido) Permitir o roubo do foco pelo bloqueador de ecrã"
#. Description
#: data/fsp_workarounds_1.twinrules:21
diff --git a/twin/clients/plastik/config/configdialog.ui b/twin/clients/plastik/config/configdialog.ui
index f751d8024..505d91b06 100644
--- a/twin/clients/plastik/config/configdialog.ui
+++ b/twin/clients/plastik/config/configdialog.ui
@@ -66,9 +66,6 @@
<property name="text">
<string>Colored window border</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="whatsThis" stdset="0">
<string>Check this option if the window border should be painted in the titlebar color. Otherwise it will be painted in the background color.</string>
</property>
diff --git a/twin/kcmtwin/twinrules/ruleslistbase.ui b/twin/kcmtwin/twinrules/ruleslistbase.ui
index f079dcda3..c3baa9a3d 100644
--- a/twin/kcmtwin/twinrules/ruleslistbase.ui
+++ b/twin/kcmtwin/twinrules/ruleslistbase.ui
@@ -47,9 +47,6 @@
<property name="text">
<string>Delete</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</widget>
<widget class="KPushButton" row="3" column="1">
<property name="name">
diff --git a/twin/kcmtwin/twinrules/ruleswidgetbase.ui b/twin/kcmtwin/twinrules/ruleswidgetbase.ui
index 352a26762..dd175e533 100644
--- a/twin/kcmtwin/twinrules/ruleswidgetbase.ui
+++ b/twin/kcmtwin/twinrules/ruleswidgetbase.ui
@@ -216,9 +216,6 @@
<property name="text">
<string>Edit</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</widget>
<spacer row="4" column="3" rowspan="1" colspan="2">
<property name="name">
@@ -487,9 +484,6 @@
<property name="text">
<string>Edit</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</widget>
<spacer row="4" column="3">
<property name="name">
@@ -560,9 +554,6 @@
<property name="text">
<string>Edit</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</widget>
<spacer row="7" column="3">
<property name="name">
@@ -633,9 +624,6 @@
<property name="text">
<string>Edit</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</widget>
<spacer row="10" column="3">
<property name="name">
@@ -1869,9 +1857,6 @@
<property name="text">
<string>Shortcut</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</widget>
<widget class="KComboBox" row="9" column="1">
<item>
@@ -2292,9 +2277,6 @@
<property name="text">
<string>Strictly obey geometry</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</widget>
<widget class="KComboBox" row="6" column="1">
<item>
@@ -2348,9 +2330,6 @@
<property name="text">
<string>Block global shortcuts</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</widget>
<widget class="KComboBox" row="7" column="1">
<item>