From bdc715ae1b179b1147e9bef9d8f2dbdeba160e1b Mon Sep 17 00:00:00 2001 From: Neophytos Date: Tue, 14 Feb 2012 15:43:43 +0000 Subject: [PATCH] kdeplasma-applets-daisy rebuild with fix for KDE 4.8 --- kdeplasma-applets-daisy/PKGBUILD | 27 +- .../daisy-compile-fix.patch | 21 - kdeplasma-applets-daisy/patch.diff | 1739 +++++++++++++++++ 3 files changed, 1755 insertions(+), 32 deletions(-) delete mode 100644 kdeplasma-applets-daisy/daisy-compile-fix.patch create mode 100644 kdeplasma-applets-daisy/patch.diff diff --git a/kdeplasma-applets-daisy/PKGBUILD b/kdeplasma-applets-daisy/PKGBUILD index a8f896f39..c98bf5a57 100644 --- a/kdeplasma-applets-daisy/PKGBUILD +++ b/kdeplasma-applets-daisy/PKGBUILD @@ -1,5 +1,5 @@ # -# KDEPlasma Packages for Chakra, part of chakra-project.org +# Apps Packages for Chakra, part of chakra-project.org # # maintainer (i686): Phil Miller # maintainer (x86_64): Manuel Tortosa @@ -9,28 +9,33 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf pkgname=kdeplasma-applets-daisy pkgver=0.0.4.25 -pkgrel=2 +pkgrel=4 pkgdesc="A simple application launcher for Plasma." arch=('i686' 'x86_64') url="http://lechio.freehostia.com/daisy.html" license=('GPL') -depends=('kdebase-workspace') +depends=('kde-workspace') makedepends=('gcc' 'cmake' 'automoc4') conflicts=('kde-extragear-plasmoids') replaces=('plasma-daisy-plasmoid') install=daisy.install -source=(""http://cdlszm.org/downloads/plasma-applet-daisy-$pkgver.tar.gz"") -md5sums=('269fd526453a16066cb704352505f7e9') +source=("http://cdlszm.org/downloads/plasma-applet-daisy-$pkgver.tar.gz" + 'patch.diff') +md5sums=('269fd526453a16066cb704352505f7e9' + '0a36cfe275cb2c981c26e8e467d0fd57') build() { cd $srcdir/plasma-applet-daisy-${pkgver} - - # Fix compile errors, introduced with GCC 4.5 - #patch -p1 < $srcdir/daisy-compile-fix.patch + #Patch to make daisy work with KDE>=4.8 + patch -Np1 -i "${srcdir}/patch.diff" mkdir build && cd build - cmake -DCMAKE_INSTALL_PREFIX=/usr .. || return 1 - make || return 1 - make DESTDIR="$pkgdir/" install || return 1 + cmake -DCMAKE_INSTALL_PREFIX=/usr .. + make +} + +package() { + cd $srcdir/plasma-applet-daisy-${pkgver}/build + make DESTDIR="$pkgdir/" install } diff --git a/kdeplasma-applets-daisy/daisy-compile-fix.patch b/kdeplasma-applets-daisy/daisy-compile-fix.patch deleted file mode 100644 index a74a3f46a..000000000 --- a/kdeplasma-applets-daisy/daisy-compile-fix.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ur plasma-applet-daisy-0.0.4.22.orig//applet/src/daisy.cpp plasma-applet-daisy-0.0.4.22/applet/src/daisy.cpp ---- plasma-applet-daisy-0.0.4.22.orig//applet/src/daisy.cpp 2009-12-21 02:18:08.000000000 +0100 -+++ plasma-applet-daisy-0.0.4.22/applet/src/daisy.cpp 2010-04-30 12:50:20.947897658 +0200 -@@ -870,7 +870,7 @@ - if (m_task) - { - TaskManager::BasicMenu *taskMenu;TaskManager::TaskItem *taskitem; -- taskitem = new TaskManager::TaskItem::TaskItem(this, m_task); -+ taskitem = new TaskManager::TaskItem(this, m_task); - taskMenu = new TaskManager::BasicMenu( qobject_cast(this), taskitem, m_groupManager ); - taskMenu->popup( event->screenPos() ); - } -@@ -896,7 +896,7 @@ - { - QList actionList;actionList << m_act_newinstance << m_act_editlauncher; - TaskManager::BasicMenu *taskMenu;TaskManager::TaskItem *taskitem; -- taskitem = new TaskManager::TaskItem::TaskItem(this, m_task); -+ taskitem = new TaskManager::TaskItem(this, m_task); - taskMenu = new TaskManager::BasicMenu( qobject_cast(this), taskitem, m_groupManager, actionList ); - taskMenu->popup( event->screenPos() ); - } diff --git a/kdeplasma-applets-daisy/patch.diff b/kdeplasma-applets-daisy/patch.diff new file mode 100644 index 000000000..ff72e5df5 --- /dev/null +++ b/kdeplasma-applets-daisy/patch.diff @@ -0,0 +1,1739 @@ +diff -Naur plasma-applet-daisy-0.0.4.25_OLD/applet/po/cs.po plasma-applet-daisy-0.0.4.25/applet/po/cs.po +--- plasma-applet-daisy-0.0.4.25_OLD/applet/po/cs.po 1970-01-01 01:00:00.000000000 +0100 ++++ plasma-applet-daisy-0.0.4.25/applet/po/cs.po 2012-02-10 10:23:31.271896488 +0100 +@@ -0,0 +1,772 @@ ++# Copyright (C) 2009,2010 Lechio ++# This file is distributed under the same license as the Daisy package. ++# ++# Lechio , 2009,2010. ++# Marek Walczak , 2009. ++msgid "" ++msgstr "" ++"Project-Id-Version: \n" ++"Report-Msgid-Bugs-To: Alessandros1pt@yahoo.com.br\n" ++"POT-Creation-Date: 2010-11-11 18:24+0000\n" ++"PO-Revision-Date: 2009-10-24 16:27+0200\n" ++"Last-Translator: Marek Walczak \n" ++"Language-Team: Polish \n" ++"Language: pl\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Generator: Lokalize 1.0\n" ++"Plural-Forms: nplurals=3; plural=((n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2);\n" ++"X-Language: cs_CZ\n" ++"X-Source-Language: en_US\n" ++ ++#. i18n: file: ui/advancedConfiguration.ui:14 ++#. i18n: ectx: property (windowTitle), widget (QWidget, advancedConfiguration) ++#. i18n: file: ui/advancedConfiguration.ui:188 ++#. i18n: ectx: attribute (title), widget (QWidget, Advanced) ++#. i18n: file: ui/advancedConfiguration.ui:14 ++#. i18n: ectx: property (windowTitle), widget (QWidget, advancedConfiguration) ++#. i18n: file: ui/advancedConfiguration.ui:188 ++#. i18n: ectx: attribute (title), widget (QWidget, Advanced) ++#: po/rc.cpp:3 po/rc.cpp:28 rc.cpp:3 rc.cpp:28 ++msgid "Advanced" ++msgstr "Pokročilé nastavení" ++ ++#. i18n: file: ui/advancedConfiguration.ui:33 ++#. i18n: ectx: attribute (title), widget (QWidget, Main) ++#. i18n: file: ui/mainConfiguration.ui:14 ++#. i18n: ectx: property (windowTitle), widget (QWidget, mainConfiguration) ++#. i18n: file: ui/advancedConfiguration.ui:33 ++#. i18n: ectx: attribute (title), widget (QWidget, Main) ++#. i18n: file: ui/mainConfiguration.ui:14 ++#. i18n: ectx: property (windowTitle), widget (QWidget, mainConfiguration) ++#: po/rc.cpp:6 po/rc.cpp:189 src/daisyDialogs.cpp:41 rc.cpp:6 rc.cpp:189 ++msgid "Main" ++msgstr "Hlavní" ++ ++#. i18n: file: ui/advancedConfiguration.ui:41 ++#. i18n: ectx: property (availableLabel), widget (KActionSelector, kactionselector_plugs) ++#: po/rc.cpp:9 rc.cpp:9 ++msgid "&Available plugins:" ++msgstr "&Dostupné pluginy:" ++ ++#. i18n: file: ui/advancedConfiguration.ui:44 ++#. i18n: ectx: property (selectedLabel), widget (KActionSelector, kactionselector_plugs) ++#: po/rc.cpp:12 rc.cpp:12 ++msgid "&Selected plugins:" ++msgstr "&Vybrané pluginy:" ++ ++#. i18n: file: ui/advancedConfiguration.ui:75 ++#. i18n: ectx: property (text), widget (QLabel, label_launchers) ++#: po/rc.cpp:15 rc.cpp:15 ++msgid "Total launchers:" ++msgstr "Všechny spouštěče:" ++ ++#. i18n: file: ui/advancedConfiguration.ui:116 ++#. i18n: ectx: property (text), widget (QCheckBox, checkBox_rep) ++#: po/rc.cpp:18 rc.cpp:18 ++msgid "" ++"Show taskbar representations only for applications\n" ++"that are not represented by a launcher" ++msgstr "" ++"Nezobrazovat ve správci úloh ikony aplikací, které mají vytvořený spouštěč " ++"na panelu" ++ ++#. i18n: file: ui/advancedConfiguration.ui:123 ++#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2) ++#: po/rc.cpp:22 rc.cpp:22 ++msgid "Drawers size:" ++msgstr "Velikost ikon panelu:" ++ ++#. i18n: file: ui/advancedConfiguration.ui:157 ++#. i18n: ectx: property (title), widget (QGroupBox, groupBox) ++#: po/rc.cpp:25 rc.cpp:25 ++msgid "Drawers rotation factor:" ++msgstr "Natočení ikon na panelu:" ++ ++#. i18n: file: ui/advancedConfiguration.ui:197 ++#. i18n: ectx: property (text), widget (QLabel, label) ++#: po/rc.cpp:31 rc.cpp:31 ++msgid "" ++"Middle mouse button\n" ++"click on launcher:" ++msgstr "Akce prostředního tlačítka myši:" ++ ++#. i18n: file: ui/advancedConfiguration.ui:211 ++#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_middleClick) ++#: po/rc.cpp:35 rc.cpp:35 ++#, fuzzy ++msgid "Shades task" ++msgstr "Shades task" ++ ++#. i18n: file: ui/advancedConfiguration.ui:216 ++#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_middleClick) ++#: po/rc.cpp:38 rc.cpp:38 ++msgid "Starts new application instance" ++msgstr "Start nové instance programu" ++ ++#. i18n: file: ui/advancedConfiguration.ui:243 ++#. i18n: ectx: property (text), widget (QCheckBox, checkBoxCloseTasks) ++#: po/rc.cpp:41 rc.cpp:41 ++msgid "" ++"Show close button on mouse over for \n" ++" taskbar representations" ++msgstr "" ++"Zobrazovat tlačítko 'Zavřít aplikaci' při přejetí myší přes ikony spravované " ++"správcem úloh" ++ ++#. i18n: file: ui/appearanceConfiguration.ui:14 ++#. i18n: ectx: property (windowTitle), widget (QWidget, appearanceConfiguration) ++#. i18n: file: ui/arrangementConfiguration.ui:14 ++#. i18n: ectx: property (windowTitle), widget (QWidget, arrangementConfiguration) ++#. i18n: file: ui/appearanceConfiguration.ui:14 ++#. i18n: ectx: property (windowTitle), widget (QWidget, appearanceConfiguration) ++#. i18n: file: ui/arrangementConfiguration.ui:14 ++#. i18n: ectx: property (windowTitle), widget (QWidget, arrangementConfiguration) ++#: po/rc.cpp:45 po/rc.cpp:75 src/daisyDialogs.cpp:57 rc.cpp:45 rc.cpp:75 ++msgid "Appearance" ++msgstr "Vzhled" ++ ++#. i18n: file: ui/appearanceConfiguration.ui:24 ++#. i18n: ectx: property (text), widget (QCheckBox, checkBoxIcoEffects) ++#: po/rc.cpp:48 rc.cpp:48 ++msgid "Enable mouseover effects" ++msgstr "Zapnout efekt přejetí myší" ++ ++#. i18n: file: ui/appearanceConfiguration.ui:45 ++#. i18n: ectx: property (text), widget (QCheckBox, checkBoxClickEffects) ++#: po/rc.cpp:51 rc.cpp:51 ++msgid "Enable on-click effects" ++msgstr "Zapnout efekty po kliknutí" ++ ++#. i18n: file: ui/appearanceConfiguration.ui:74 ++#. i18n: ectx: property (text), widget (QCheckBox, checkBoxTips_launchers) ++#: po/rc.cpp:54 rc.cpp:54 ++msgid "Show tooltips on launchers" ++msgstr "Zobrazovat nápovědu u spouštěčů" ++ ++#. i18n: file: ui/appearanceConfiguration.ui:86 ++#. i18n: ectx: property (text), widget (QCheckBox, checkBoxTips_inactive_launchers) ++#: po/rc.cpp:57 rc.cpp:57 ++msgid "Show tooltips on inactive launchers" ++msgstr "Zobrazovat nápovědu u neaktivních spouštěčů" ++ ++#. i18n: file: ui/appearanceConfiguration.ui:93 ++#. i18n: ectx: property (text), widget (QCheckBox, checkBoxTips) ++#: po/rc.cpp:60 rc.cpp:60 ++msgid "Show tooltips on plugins" ++msgstr "Zobrazovat nápovědu u pluginů" ++ ++#. i18n: file: ui/appearanceConfiguration.ui:100 ++#. i18n: ectx: property (text), widget (QCheckBox, checkBox_indicons) ++#: po/rc.cpp:63 rc.cpp:63 ++msgid "Show application activity indicators" ++msgstr "Zobrazovat indikátor spuštění aplikace" ++ ++#. i18n: file: ui/appearanceConfiguration.ui:107 ++#. i18n: ectx: property (text), widget (QCheckBox, checkBoxIcoMirror) ++#: po/rc.cpp:66 rc.cpp:66 ++msgid "Enable mirror effects" ++msgstr "Zapnout zrcadlení ikon" ++ ++#. i18n: file: ui/appearanceConfiguration.ui:135 ++#. i18n: ectx: property (text), widget (QLabel, label) ++#: po/rc.cpp:69 rc.cpp:69 ++msgid "Background:" ++msgstr "Pozadí:" ++ ++#. i18n: file: ui/appearanceConfiguration.ui:149 ++#. i18n: ectx: property (text), widget (QLabel, label_2) ++#: po/rc.cpp:72 rc.cpp:72 ++msgid "Background opacity:" ++msgstr "Neprůhlednost pozadí:" ++ ++#. i18n: file: ui/arrangementConfiguration.ui:20 ++#. i18n: ectx: property (title), widget (QGroupBox, groupBox_pos) ++#: po/rc.cpp:78 rc.cpp:78 ++msgid "Position" ++msgstr "Pozice" ++ ++#. i18n: file: ui/arrangementConfiguration.ui:61 ++#. i18n: ectx: property (toolTip), widget (QPushButton, pushButton_topLeft) ++#: po/rc.cpp:81 rc.cpp:81 ++msgid "top left" ++msgstr "nahoře vlevo" ++ ++#. i18n: file: ui/arrangementConfiguration.ui:92 ++#. i18n: ectx: property (toolTip), widget (QPushButton, pushButton_topCenter) ++#: po/rc.cpp:84 rc.cpp:84 ++msgid "top center" ++msgstr "nahoře uprostřed" ++ ++#. i18n: file: ui/arrangementConfiguration.ui:123 ++#. i18n: ectx: property (toolTip), widget (QPushButton, pushButton_topRight) ++#: po/rc.cpp:87 rc.cpp:87 ++msgid "top right" ++msgstr "nahoře vpravo" ++ ++#. i18n: file: ui/arrangementConfiguration.ui:158 ++#. i18n: ectx: property (toolTip), widget (QPushButton, pushButton_leftTop) ++#: po/rc.cpp:90 rc.cpp:90 ++msgid "left top" ++msgstr "vlevo nahoře " ++ ++#. i18n: file: ui/arrangementConfiguration.ui:189 ++#. i18n: ectx: property (toolTip), widget (QPushButton, pushButton_leftCenter) ++#: po/rc.cpp:93 rc.cpp:93 ++msgid "left center" ++msgstr "vlevo uprostřed" ++ ++#. i18n: file: ui/arrangementConfiguration.ui:220 ++#. i18n: ectx: property (toolTip), widget (QPushButton, pushButton_leftButtom) ++#: po/rc.cpp:96 rc.cpp:96 ++msgid "left bottom" ++msgstr "vlevo dole" ++ ++#. i18n: file: ui/arrangementConfiguration.ui:255 ++#. i18n: ectx: property (toolTip), widget (QPushButton, pushButton_rightTop) ++#: po/rc.cpp:99 rc.cpp:99 ++msgid "right top" ++msgstr "vpravo nahoře" ++ ++#. i18n: file: ui/arrangementConfiguration.ui:286 ++#. i18n: ectx: property (toolTip), widget (QPushButton, pushButton_rightCenter) ++#: po/rc.cpp:102 rc.cpp:102 ++msgid "right center" ++msgstr "vpravo uprostřed" ++ ++#. i18n: file: ui/arrangementConfiguration.ui:317 ++#. i18n: ectx: property (toolTip), widget (QPushButton, pushButton_rightButtom) ++#: po/rc.cpp:105 rc.cpp:105 ++msgid "right bottom" ++msgstr "vpravo dole" ++ ++#. i18n: file: ui/arrangementConfiguration.ui:352 ++#. i18n: ectx: property (toolTip), widget (QPushButton, pushButton_buttomLeft) ++#: po/rc.cpp:108 rc.cpp:108 ++msgid "bottom left" ++msgstr "dole vlevo" ++ ++#. i18n: file: ui/arrangementConfiguration.ui:383 ++#. i18n: ectx: property (toolTip), widget (QPushButton, pushButton_buttomCenter) ++#: po/rc.cpp:111 rc.cpp:111 ++msgid "bottom center" ++msgstr "dole uprostřed" ++ ++#. i18n: file: ui/arrangementConfiguration.ui:414 ++#. i18n: ectx: property (toolTip), widget (QPushButton, pushButton_buttomRight) ++#: po/rc.cpp:114 rc.cpp:114 ++msgid "bottom right" ++msgstr "dole vpravo" ++ ++#. i18n: file: ui/arrangementConfiguration.ui:460 ++#. i18n: ectx: property (text), widget (QCheckBox, checkBox_floating) ++#: po/rc.cpp:117 rc.cpp:117 ++msgid "Floating" ++msgstr "Plovoucí" ++ ++#. i18n: file: ui/arrangementConfiguration.ui:467 ++#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2) ++#: po/rc.cpp:120 rc.cpp:120 ++msgid "Size" ++msgstr "Velikost" ++ ++#. i18n: file: ui/arrangementConfiguration.ui:505 ++#. i18n: ectx: property (suffix), widget (QSpinBox, spinBox_icosize) ++#: po/rc.cpp:123 rc.cpp:123 ++msgid "pixels" ++msgstr "pixelů" ++ ++#. i18n: file: ui/arrangementConfiguration.ui:524 ++#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3) ++#: po/rc.cpp:126 rc.cpp:126 ++msgid "Spacing" ++msgstr "Rozestup" ++ ++#. i18n: file: ui/hidingConfiguration.ui:13 ++#. i18n: ectx: property (windowTitle), widget (QWidget, hidingConfiguration) ++#: po/rc.cpp:129 src/daisyDialogs.cpp:49 rc.cpp:129 ++msgid "Hiding" ++msgstr "Skrývat" ++ ++#. i18n: file: ui/hidingConfiguration.ui:19 ++#. i18n: ectx: property (title), widget (QGroupBox, groupBox) ++#: po/rc.cpp:132 rc.cpp:132 ++msgid "Hide Mode" ++msgstr "Režimy skrývání" ++ ++# Ukrýt panel pouze pokud je aktivováno tlačítko skrávání ++#. i18n: file: ui/hidingConfiguration.ui:27 ++#. i18n: ectx: property (text), widget (QRadioButton, button_allwaysShow) ++#: po/rc.cpp:135 rc.cpp:135 ++msgid "Hide only when a dock-hiding button is clicked" ++msgstr "Vždy navrchu" ++ ++#. i18n: file: ui/hidingConfiguration.ui:34 ++#. i18n: ectx: property (text), widget (QRadioButton, button_autoHide) ++#: po/rc.cpp:138 rc.cpp:138 ++msgid "Hide automatically" ++msgstr "Automatické skrývání" ++ ++#. i18n: file: ui/hidingConfiguration.ui:56 ++#. i18n: ectx: property (suffix), widget (QSpinBox, spinBox_secHide) ++#: po/rc.cpp:141 rc.cpp:141 ++msgid "secs" ++msgstr "sek" ++ ++#. i18n: file: ui/hidingConfiguration.ui:63 ++#. i18n: ectx: property (text), widget (QLabel, label_secHide) ++#: po/rc.cpp:144 rc.cpp:144 ++msgid "after the cursor leaves the dock" ++msgstr "od doby, co kurzor opustil plochu panelu" ++ ++#. i18n: file: ui/hidingConfiguration.ui:72 ++#. i18n: ectx: property (text), widget (QRadioButton, button_allowCover) ++#: po/rc.cpp:147 rc.cpp:147 ++msgid "Allow other windows to cover the dock" ++msgstr "Povolit ostatním oknům překrýt panel" ++ ++#. i18n: file: ui/hidingConfiguration.ui:94 ++#. i18n: ectx: property (text), widget (QCheckBox, button_showOnDesk) ++#: po/rc.cpp:150 rc.cpp:150 ++msgid "Show dock when switching desktops" ++msgstr "Zobrazovat panel během přepínání ploch" ++ ++#. i18n: file: ui/launcherConfiguration.ui:13 ++#. i18n: ectx: property (windowTitle), widget (QWidget, launcherConfiguration) ++#: po/rc.cpp:153 src/daisyDialogs.cpp:888 rc.cpp:153 ++msgid "Edit launcher" ++msgstr "Změnit spouštěč" ++ ++#. i18n: file: ui/launcherConfiguration.ui:30 ++#. i18n: ectx: property (toolTip), widget (KIconButton, pushButton_ico) ++#: po/rc.cpp:156 rc.cpp:156 ++msgid "Click to set icon" ++msgstr "Klikni pro změnu ikony" ++ ++#. i18n: file: ui/launcherConfiguration.ui:42 ++#. i18n: ectx: property (text), widget (QLabel, label_name) ++#. i18n: file: ui/launcherConfiguration.ui:139 ++#. i18n: ectx: property (text), widget (QLabel, label_2) ++#. i18n: file: ui/launcherConfiguration.ui:42 ++#. i18n: ectx: property (text), widget (QLabel, label_name) ++#. i18n: file: ui/launcherConfiguration.ui:139 ++#. i18n: ectx: property (text), widget (QLabel, label_2) ++#: po/rc.cpp:159 po/rc.cpp:183 rc.cpp:159 rc.cpp:183 ++msgid "Name:" ++msgstr "Název:" ++ ++#. i18n: file: ui/launcherConfiguration.ui:60 ++#. i18n: ectx: property (text), widget (QLabel, label_3) ++#: po/rc.cpp:162 rc.cpp:162 ++msgid "Alias:" ++msgstr "Alias:" ++ ++#. i18n: file: ui/launcherConfiguration.ui:73 ++#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_alias) ++#: po/rc.cpp:165 rc.cpp:165 ++msgid "" ++"\n" ++"\n" ++"

Example:

\n" ++"

Command: kfmclient openURL

\n" ++"

Alias: konqueror

" ++msgstr "" ++"\n" ++"\n" ++"

Příklad:

\n" ++"

Příklaz: kfmclient openURL

\n" ++"

Alias: konqueror

" ++ ++#. i18n: file: ui/launcherConfiguration.ui:84 ++#. i18n: ectx: property (text), widget (QLabel, label_command) ++#. i18n: file: ui/launcherConfiguration.ui:153 ++#. i18n: ectx: property (text), widget (QLabel, label) ++#. i18n: file: ui/launcherConfiguration.ui:84 ++#. i18n: ectx: property (text), widget (QLabel, label_command) ++#. i18n: file: ui/launcherConfiguration.ui:153 ++#. i18n: ectx: property (text), widget (QLabel, label) ++#: po/rc.cpp:174 po/rc.cpp:186 rc.cpp:174 rc.cpp:186 ++msgid "Command:" ++msgstr "Příkaz:" ++ ++#. i18n: file: ui/launcherConfiguration.ui:114 ++#. i18n: ectx: property (toolTip), widget (KIconButton, pushButton_action_ico) ++#: po/rc.cpp:177 rc.cpp:177 ++msgid "Click to set action icon" ++msgstr "Klikni pro změnu akční ikony" ++ ++#. i18n: file: ui/launcherConfiguration.ui:130 ++#. i18n: ectx: property (text), widget (QCheckBox, checkBox_action_launcher) ++#: po/rc.cpp:180 rc.cpp:180 ++msgid "Enable action launcher" ++msgstr "Zapnout akční spouštěč (aktivace dvojklikem)" ++ ++#. i18n: file: ui/mainConfiguration.ui:30 ++#. i18n: ectx: property (text), widget (QLabel, label_role) ++#: po/rc.cpp:192 rc.cpp:192 ++msgid "Role:" ++msgstr "Role panelu:" ++ ++#. i18n: file: ui/mainConfiguration.ui:38 ++#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_role) ++#: po/rc.cpp:195 src/daisy.cpp:945 src/daisy.cpp:964 rc.cpp:195 ++msgid "Circular dock" ++msgstr "Okrouhlý panel (circular)" ++ ++#. i18n: file: ui/mainConfiguration.ui:43 ++#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_role) ++#: po/rc.cpp:198 src/daisy.cpp:176 src/daisy.cpp:943 rc.cpp:198 ++msgid "Media controller" ++msgstr "Ovládání médií" ++ ++#. i18n: file: ui/mainConfiguration.ui:48 ++#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_role) ++#: po/rc.cpp:201 src/daisy.cpp:179 rc.cpp:201 ++msgid "Linear dock" ++msgstr "Přímý panel (linear)" ++ ++#. i18n: file: ui/mainConfiguration.ui:91 ++#. i18n: ectx: property (text), widget (QLabel, label_media) ++#: po/rc.cpp:204 rc.cpp:204 ++msgid "Media source:" ++msgstr "Přehrávač:" ++ ++#. i18n: file: ui/mainConfiguration.ui:111 ++#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_player) ++#: po/rc.cpp:207 rc.cpp:207 ++msgid "Amarok 1.x" ++msgstr "Amarok 1.x" ++ ++#. i18n: file: ui/mainConfiguration.ui:116 ++#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_player) ++#: po/rc.cpp:210 rc.cpp:210 ++msgid "Amarok 2.x" ++msgstr "Amarok 2.x" ++ ++#. i18n: file: ui/mainConfiguration.ui:121 ++#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_player) ++#: po/rc.cpp:213 rc.cpp:213 ++msgid "juK" ++msgstr "juK" ++ ++#. i18n: file: ui/mainConfiguration.ui:126 ++#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_player) ++#: po/rc.cpp:216 rc.cpp:216 ++msgid "VLC" ++msgstr "VLC" ++ ++#. i18n: file: ui/mainConfiguration.ui:131 ++#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_player) ++#: po/rc.cpp:219 rc.cpp:219 ++msgid "XMMS" ++msgstr "XMMS" ++ ++#. i18n: file: ui/mainConfiguration.ui:143 ++#. i18n: ectx: property (text), widget (QCheckBox, checkBox_drop) ++#: po/rc.cpp:222 rc.cpp:222 ++msgid "Allow drag and drop of objects" ++msgstr "Povolit přetahování objektů" ++ ++#: po/rc.cpp:223 rc.cpp:223 ++msgctxt "NAME OF TRANSLATORS" ++msgid "Your names" ++msgstr "Jan Tylich" ++ ++#: po/rc.cpp:224 rc.cpp:224 ++msgctxt "EMAIL OF TRANSLATORS" ++msgid "Your emails" ++msgstr "jan.tylich@gmail.com" ++ ++#: src/daisyConfig.cpp:110 ++msgid "Do you really want to remove this launcher from dock?" ++msgstr "Opravdu chcete odebrat spouštěč z panelu?" ++ ++#: src/daisyConfig.cpp:112 ++msgid "&Remove launcher" ++msgstr "&Odstranit spouštěč" ++ ++#: src/daisyConfig.cpp:113 src/daisyConfig.cpp:295 src/daisy.cpp:1581 ++#: src/daisyPlug_trash.cpp:133 ++msgid "&Cancel" ++msgstr "&Zrušit" ++ ++#: src/daisyConfig.cpp:292 ++msgid "Do you really want to remove this trash plugin?" ++msgstr "Opravdu chcete odebrat plugin pro odpadkový koš?" ++ ++#: src/daisyConfig.cpp:294 ++msgid "&Remove trash plugin" ++msgstr "&Odstranit plugin pro odpadkový koš" ++ ++#: src/daisyConfig.cpp:459 ++msgid "personal files" ++msgstr "Osobní dokumenty" ++ ++#: src/daisyConfig.cpp:460 ++msgid "konsole" ++msgstr "Konsole" ++ ++#: src/daisyConfig.cpp:461 ++msgid "opera" ++msgstr "Opera" ++ ++#: src/daisyConfig.cpp:462 ++msgid "kmail" ++msgstr "kmail" ++ ++#: src/daisyConfig.cpp:463 ++msgid "amarok" ++msgstr "Amarok" ++ ++#: src/daisyConfig.cpp:464 ++msgid "kate" ++msgstr "Kate" ++ ++#: src/daisyConfig.cpp:465 ++msgid "Document viewer" ++msgstr "Prohlížeč dokumentů" ++ ++#: src/daisyConfig.cpp:466 ++msgid "systemsettings" ++msgstr "Nastavení systému" ++ ++#: src/daisyConfig.cpp:481 src/daisyConfig.cpp:483 ++msgid "bookmarks" ++msgstr "Záložky" ++ ++#: src/daisyConfig.cpp:482 ++msgid "system" ++msgstr "Monitor systému" ++ ++#: src/daisyConfig.cpp:484 ++msgid "mail" ++msgstr "Napsat email" ++ ++#: src/daisyConfig.cpp:485 ++msgid "pause" ++msgstr "pauza" ++ ++#: src/daisyConfig.cpp:486 ++msgid "okular" ++msgstr "Okular" ++ ++#: src/daisyConfig.cpp:487 ++msgid "gwenview" ++msgstr "Gwenview" ++ ++#: src/daisyConfig.cpp:488 ++msgid "settings" ++msgstr "Nastavení" ++ ++#: src/daisyConfig.cpp:586 src/daisyConfig.cpp:587 src/daisyDialogs.cpp:271 ++#: src/daisyDialogs.cpp:459 src/daisyDialogs.cpp:472 src/daisyPlug_trash.cpp:52 ++#: src/daisyPlug_trash.cpp:71 ++msgid "Trash" ++msgstr "Odpadkový koš" ++ ++#: src/daisy.cpp:182 src/daisy.cpp:956 src/daisy.cpp:976 ++msgid "Lock Daisy" ++msgstr "Uzamkni 'Daisy'" ++ ++#: src/daisy.cpp:185 ++msgid "Remove this Daisy" ++msgstr "Odstranit 'Daisy'" ++ ++#: src/daisy.cpp:188 ++msgid "Open" ++msgstr "Otevřít" ++ ++#: src/daisy.cpp:191 ++msgid "Empty Trashcan" ++msgstr "Vysypat odpadkový koš" ++ ++#: src/daisy.cpp:194 ++msgid "Restore items" ++msgstr "Obnovit položky" ++ ++#: src/daisy.cpp:197 ++msgid "Edit launcher..." ++msgstr "Změnit spouštěč..." ++ ++#: src/daisy.cpp:200 ++msgid "Remove launcher" ++msgstr "Odstranit spouštěč" ++ ++#: src/daisy.cpp:203 ++msgid "Remove trash plugin" ++msgstr "Odstranit plugin pro odpadkový koš" ++ ++#: src/daisy.cpp:206 ++msgid "New instance" ++msgstr "Nová instance" ++ ++#: src/daisy.cpp:209 ++msgid "Close" ++msgstr "Zavřít" ++ ++#: src/daisy.cpp:950 src/daisy.cpp:971 ++msgid "Unlock Daisy" ++msgstr "Odemkni 'Daisy'" ++ ++#: src/daisy.cpp:1578 ++msgid "Do you really want to remove this Daisy?" ++msgstr "Opravdu chcete odstranit Daisy?" ++ ++#: src/daisy.cpp:1580 ++msgid "&Remove this Daisy" ++msgstr "&Odstranit 'Daisy'" ++ ++#: src/daisy.cpp:1588 ++msgid "Unlock Plasma Workspace Widgets first" ++msgstr "Nejprve odemkněte Plasma Workspace Widgets" ++ ++#: src/daisy.cpp:1588 ++msgid "Widgets locked" ++msgstr "Widgety jsou uzamknuté" ++ ++#: src/daisyDialogs.cpp:45 ++msgid "Arrangement" ++msgstr "Uspořádání" ++ ++#: src/daisyDialogs.cpp:53 ++msgid "Launchers" ++msgstr "Spouštěče" ++ ++#: src/daisyDialogs.cpp:272 src/daisyDialogs.cpp:462 src/daisyDialogs.cpp:475 ++msgid "Task manager" ++msgstr "Správce úloh" ++ ++#: src/daisyDialogs.cpp:297 src/daisyDialogs.cpp:325 src/daisyDialogs.cpp:330 ++msgid "default" ++msgstr "výchozí" ++ ++#: src/daisyDialogs.cpp:298 ++msgid "translucent" ++msgstr "průhledný" ++ ++#: src/daisyDialogs.cpp:299 ++msgid "opaque" ++msgstr "neprůsvitný" ++ ++#: src/daisyDialogs.cpp:300 ++msgid "alternative" ++msgstr "alternativní" ++ ++#: src/daisyDialogs.cpp:301 ++msgid "mach" ++msgstr "mach" ++ ++#: src/daisyDialogs.cpp:302 ++msgid "mach-2" ++msgstr "mach-2" ++ ++#: src/daisyDialogs.cpp:303 ++msgid "shiny-black" ++msgstr "leskle černý" ++ ++#: src/daisyDialogs.cpp:304 ++msgid "vidro" ++msgstr "skleněný" ++ ++#: src/daisyDialogs.cpp:326 ++msgid "simple" ++msgstr "prostý" ++ ++#: src/daisyDialogs.cpp:327 ++msgid "fruity" ++msgstr "ovocný" ++ ++#: src/daisyDialogs.cpp:328 ++msgid "framed" ++msgstr "orámovaný" ++ ++#: src/daisyDialogs.cpp:333 ++msgid "Application icon" ++msgstr "Ikona programu" ++ ++#: src/daisyDialogs.cpp:334 ++msgid "Text only" ++msgstr "Pouze text" ++ ++#: src/daisyDialogs.cpp:335 ++msgid "Window thumbnail" ++msgstr "Miniatura okna" ++ ++#: src/daisyPlug_trash.cpp:53 ++msgid "items" ++msgstr "položek" ++ ++#: src/daisyPlug_trash.cpp:54 ++msgid "One item" ++msgstr "Jedna položka" ++ ++#: src/daisyPlug_trash.cpp:72 ++msgid "Empty" ++msgstr "Prázdný" ++ ++#: src/daisyPlug_trash.cpp:114 src/daisyPlug_trash.cpp:165 ++msgid "trash" ++msgstr "Koš" ++ ++#: src/daisyPlug_trash.cpp:130 ++msgid "Do you really want to empty the trash? All items will be deleted." ++msgstr "Opravdu si přejete vyprázdnit koš? Všechny položky budou smazány." ++ ++#: src/daisyPlug_trash.cpp:132 ++msgid "&Empty Trash" ++msgstr "&Vyprázdnit koš" ++ ++#: src/daisyTasks.cpp:245 src/daisyTasks.cpp:424 src/daisyTasks.cpp:508 ++msgid "On " ++msgstr "Na " ++ ++#: src/daisyTasks.cpp:246 src/daisyTasks.cpp:425 src/daisyTasks.cpp:509 ++msgid "On all desktops" ++msgstr "Zobrazit na všechny plochy" ++ ++#: src/daisyTasks.cpp:252 src/daisyTasks.cpp:431 ++msgid " instances" ++msgstr " instance" ++ ++#~ msgid "applications" ++#~ msgstr "programy" ++ ++#~ msgid "cavalino-red" ++#~ msgstr "czerwone" ++ ++#~ msgid "blueish" ++#~ msgstr "niebieskie" ++ ++#~ msgid "reddish" ++#~ msgstr "czerwony-proste" ++ ++#~ msgid "rubber-black" ++#~ msgstr "rubinowo-czarne" ++ ++#~ msgid "kiwi" ++#~ msgstr "kiwi" +diff -Naur plasma-applet-daisy-0.0.4.25_OLD/applet/src/daisy.h plasma-applet-daisy-0.0.4.25/applet/src/daisy.h +--- plasma-applet-daisy-0.0.4.25_OLD/applet/src/daisy.h 2010-06-29 15:11:50.000000000 +0200 ++++ plasma-applet-daisy-0.0.4.25/applet/src/daisy.h 2012-02-10 10:13:04.571626835 +0100 +@@ -102,8 +102,8 @@ + #include + #include + #include +-using TaskManager::TaskPtr; +-using TaskManager::StartupPtr; ++using TaskManager::Task; ++using TaskManager::Startup; + using TaskManager::GroupManager; + + +@@ -169,22 +169,22 @@ + // Define our Plasma Containment + class daisy : public Plasma::Containment + { +- ++ + Q_OBJECT + //----------------------------------------------------------------------------- + // Publics + public: +- ++ + // Basic Create/Destroy + daisy(QObject *parent, const QVariantList &args); +- ++ + void init(); + void paintInterface(QPainter *painter,const QStyleOptionGraphicsItem *option, const QRect& contentsRect); + QPainterPath shape() const; +- ++ + void createConfigurationInterface(KConfigDialog *parent); + virtual QList contextualActions(); +- ++ + void constraintsEvent(Plasma::Constraints constraints); + void mousePressEvent(QGraphicsSceneMouseEvent *event); + void mouseMoveEvent(QGraphicsSceneMouseEvent *event); +@@ -198,7 +198,7 @@ + void dragEnterEvent(QGraphicsSceneDragDropEvent *event); + void dragMoveEvent(QGraphicsSceneDragDropEvent *event); + void dragLeaveEvent(QGraphicsSceneDragDropEvent *event); +- ++ + ~daisy(); + + +@@ -208,7 +208,7 @@ + //----------------------------------------------------------------------------- + // Public slots + public slots: +- ++ + void paintLaunchers(void); + void configLauncher(void); + void spaceReserver(bool startup); +@@ -254,11 +254,11 @@ + + + +- ++ + //----------------------------------------------------------------------------- + // Protected + protected: +- ++ + void uncheckPosButtons(); + void insertBacks(); + void insertPlugs(); +@@ -273,7 +273,7 @@ + //----------------------------------------------------------------------------- + // Protected slots + protected slots: +- ++ + void configAccepted(); + void configRejected(); + void configLauncherAccepted(); +@@ -287,14 +287,14 @@ + void spinBoxSize_Clicked(int value); + void destroyLauncher(void); + void toggleEffectsCombo(); +- ++ + void posButton_Clicked(); + void floating_Clicked(); +- ++ + void drawerSizeChange(int value); + void drawerRotationChange(int value); +- +- ++ ++ + + + +@@ -303,7 +303,7 @@ + //----------------------------------------------------------------------------- + // Privates + private: +- ++ + void paintDesktop(QPainter *p, const QRect &contentsRect); + void paintPanel(QPainter *p, const QRect &contentsRect); + void createLaunchers(QString &m_type); +@@ -320,7 +320,7 @@ + void moveToTrash( QList &payload ); + int getContextLauncher( QPointF &p_click ); + int getContextTask( QPointF &p_click ); +- ++ + QStringList getPlayerComs(); + void circleAround(int &delta); + void resizeRepos( bool m_resetpos ); +@@ -335,14 +335,14 @@ + void setElements(); + void startDrag(QGraphicsSceneMouseEvent *event); + bool checkLock(); +- ++ + void checkAttention( KWindowInfo taskInfo, QString widclass_tmp ); +- void createTaskThumbnail( TaskPtr task_tmp, int j ); ++ void createTaskThumbnail( Task *task_tmp, int j ); + void scrollTasks(int delta); +- +- +- +- ++ ++ ++ ++ + bool m_showtooltips; + bool m_showtooltips_l; + bool m_showtooltips_i; +@@ -375,21 +375,21 @@ + qreal m_hidingdelay; + qreal m_drawersize; + qreal m_drawerrotation; +- ++ + bool m_show_trash; + bool m_accept_drops; +- +- ++ ++ + QList m_zoomszdiff; + QList m_zoomposdiff; +- ++ + QList last_icopos; + int total_taskpreviews; + int m_max_taskpreviews; +- +- +- +- ++ ++ ++ ++ + int m_to_paint; + int m_dexval; + int m_launtoedit; +@@ -405,39 +405,39 @@ + int m_startingwindow; + int m_closingwindow; + QList m_attentionwindow; +- ++ + int drawerpopspot_x; + int drawerpopspot_y; +- ++ + QPointF m_circpos; + QPointF startPos; +- ++ + QPointF m_clickpos; +- ++ + QPointF m_hoverpz; + QSizeF m_hoversz; +- +- +- TaskPtr m_task; ++ ++ ++ Task *m_task; + GroupManager *m_groupManager; +- +- ++ ++ + Plasma::FrameSvg m_backframe; + Plasma::FrameSvg m_backframe_t; + Plasma::FrameSvg m_hoverimage; +- +- ++ ++ + QList m_indicons; + QList m_widgets; + QList m_drawericons; +- ++ + QList m_taskicons; +- +- ++ ++ + Plasma::Dialog m_drawdial; +- +- +- ++ ++ ++ + QAction *m_act_1; + QAction *m_act_editlauncher; + QAction *m_act_remlauncher; +@@ -451,34 +451,34 @@ + QAction *m_act_lock; + QAction *m_act_close; + QAction *m_act_closetask; +- ++ + QList m_acta; + QList m_values; + QList m_avalues; + QStringList m_alias; +- ++ + QList taskDrawers; + QList showedTasks; +- +- ++ ++ + WId m_actwin_save; + WId m_reactwin_save; + WId m_workwid; + WId m_toupwid; + WId m_focusedWindow; +- ++ + QObject *m_objclick; + QObject *m_reobjclick; +- ++ + KMenu *m_launcher_menu; + KMenu *m_launcher_menu_t; + KMenu *m_task_menu; + KMenu *m_trash_menu; + KMenu *m_trash_menu_t; +- ++ + KDirWatch *m_watch_trash; +- +- ++ ++ + QTimer *m_paint_tmr; + QTimer *m_up_tmr; + QTimer *m_rz_tmr; +@@ -486,23 +486,23 @@ + QTimer *m_dlx_tmr; + QTimer *m_dlt_tmr; + QTimer *m_uti_tmr; +- ++ + QList m_url_drag; +- ++ + QWidget *m_reserver; +- ++ + // Config dialog + KDialog *m_dialogLauncher; +- +- ++ ++ + Ui::mainConfiguration m_mainConfigurationUi; + Ui::arrangementConfiguration m_arrangementConfigurationUi; + Ui::hidingConfiguration m_hidingConfigurationUi; + Ui::appearanceConfiguration m_appearanceConfigurationUi; + Ui::advancedConfiguration m_advancedConfigurationUi; + Ui::launcherConfiguration m_launcherConfiguration; +- +- ++ ++ + + + +@@ -510,19 +510,19 @@ + //----------------------------------------------------------------------------- + // Private slots + private slots: +- +- +- void startupAdded(StartupPtr startupItem); +- void startupRemoved(StartupPtr startupItem); +- +- ++ ++ ++ void startupAdded(Startup *startupItem); ++ void startupRemoved(Startup *startupItem); ++ ++ + void windowAdded(WId id); + void windowRemoved(WId id); + void activeWindowChanged(WId id); + void currentDesktopChanged(int desktop); + void windowChanged(WId id, const unsigned long* properties ); + void workAreaChanged(); +- ++ + + + +@@ -549,10 +549,10 @@ + */ + class MyIcon : public Plasma::IconWidget + { +- ++ + Q_OBJECT +- +- ++ ++ + public: + void init(); + /** +@@ -573,8 +573,8 @@ + addIconAction(action); + } + } +- +- ++ ++ + + + +diff -Naur plasma-applet-daisy-0.0.4.25_OLD/applet/src/daisyTasks.cpp plasma-applet-daisy-0.0.4.25/applet/src/daisyTasks.cpp +--- plasma-applet-daisy-0.0.4.25_OLD/applet/src/daisyTasks.cpp 2010-11-10 01:29:47.000000000 +0100 ++++ plasma-applet-daisy-0.0.4.25/applet/src/daisyTasks.cpp 2012-02-10 10:13:04.571626835 +0100 +@@ -32,7 +32,7 @@ + { + if (!m_drawerscleared)clearDrawers(); + KWindowInfo taskInfo = KWindowSystem::windowInfo( id, NET::WMName | NET::WMVisibleName , NET::WM2WindowClass ); +- ++ + if ( m_alias.indexOf( taskInfo.windowClassName() ) != -1 ) + { + m_activetasks << m_alias.indexOf( taskInfo.windowClassName() ); +@@ -48,7 +48,7 @@ + m_activetasks << m_alias.indexOf( taskInfo.name() ); + if ( m_showindicons )emit update(); + } +- ++ + } + + +@@ -61,7 +61,7 @@ + { + if (!m_drawerscleared)clearDrawers(); + m_closingwindow = -1; +- ++ + KWindowInfo taskInfo = KWindowSystem::windowInfo( id, NET::WMName | NET::WMVisibleName , NET::WM2WindowClass ); + if ( m_alias.indexOf( taskInfo.windowClassName() ) != -1 ) + { +@@ -83,15 +83,15 @@ + m_closingwindow = m_alias.indexOf( taskInfo.visibleName() ); + if ( m_showindicons )m_up_tmr->setInterval(1500);m_up_tmr->start(); + } +- ++ + else + { + getAllTasks(); + } +- +- ++ ++ + if ( m_showindicons )emit update(); +- ++ + } + + +@@ -104,11 +104,11 @@ + void daisy::activeWindowChanged(WId id) + { + Q_UNUSED(id); +- ++ + getAllTasks(); + if (!m_drawerscleared)clearDrawers(); + if (m_showindicons)emit update(); +- ++ + } + + +@@ -125,16 +125,16 @@ + void daisy::currentDesktopChanged(int desktop) + { + Q_UNUSED(desktop); +- ++ + if (!m_drawerscleared)clearDrawers(); +- ++ + if ( m_autohide && m_type == QString("standard_dock") && !m_inpanel && !m_floating && m_showondesk ) + { + m_tracker_tmr->stop(); + if ( !isVisible() ){setVisible(true);} + m_tracker_tmr->setInterval(m_hidingdelay);m_tracker_tmr->start(); + } +- ++ + } + + +@@ -159,31 +159,31 @@ + //----------------------------------------------------------------------------- + // Startup added + //FIXME +-void daisy::startupAdded(StartupPtr startupItem) ++void daisy::startupAdded(Startup *startupItem) + { +- ++ + m_startingwindow = -1; + if ( startupItem ) + { +- ++ + if ( m_alias.indexOf( startupItem->text() ) != -1 ) + { + m_startingwindow = m_alias.indexOf( startupItem->text() ); + } +- ++ + else if ( m_alias.indexOf( startupItem->bin() ) != -1 ) + { + m_startingwindow = m_alias.indexOf( startupItem->bin() ); + } +- ++ + else + { + KStartupInfoId taskid = startupItem->id(); + } +- +- ++ ++ + if ( m_showindicons )emit update(); +- ++ + } + + } +@@ -195,11 +195,11 @@ + //----------------------------------------------------------------------------- + // Startup removed + //FIXME +-void daisy::startupRemoved(StartupPtr startupItem) ++void daisy::startupRemoved(Startup *startupItem) + { +- ++ + Q_UNUSED(startupItem); +- ++ + } + + +@@ -215,37 +215,37 @@ + { + QString widclass_tmp; + Plasma::ToolTipContent toolTipData;toolTipData.setAutohide(false); +- ++ + KWindowInfo taskInfo = KWindowSystem::windowInfo( id, NET::WMName | NET::WMVisibleName | NET::WMVisibleIconName | NET::WMState | NET::XAWMState | NET::WMDesktop, NET::WM2WindowClass ); +- +- TaskPtr task_tmp = TaskManager::TaskManager::self()->findTask( id ); +- +- ++ ++ Task *task_tmp = TaskManager::TaskManager::self()->findTask( id ); ++ ++ + if ( m_alias.indexOf( taskInfo.windowClassName() ) != -1 || m_alias.indexOf( QString(taskInfo.windowClassClass().toLower()) ) != -1 ) + { +- ++ + if ( m_alias.indexOf( taskInfo.windowClassName() ) != -1 ) + {widclass_tmp = QString( taskInfo.windowClassName() );} + else + {widclass_tmp = QString(taskInfo.windowClassClass().toLower());} +- +- ++ ++ + //ATTENTION + checkAttention( taskInfo, widclass_tmp ); +- ++ + if (m_showtooltips_l) + { +- ++ + int win_count = m_activetasks.count( m_alias.indexOf( widclass_tmp ) ); + QString str;QString desk_name = KWindowSystem::desktopName( taskInfo.desktop() ); +- ++ + if ( win_count == 1 ) + { + if (taskInfo.desktop() != -1) + {str.append( desk_name );str.insert( 0, i18n("On ") );} + else str.insert( 0, i18n("On all desktops") ); + toolTipData.setMainText( taskInfo.visibleIconNameWithState() ); +- toolTipData.setSubText( str ); ++ toolTipData.setSubText( str ); + } + else + { +@@ -253,7 +253,7 @@ + toolTipData.setMainText( widclass_tmp ); + toolTipData.setSubText( str ); + } +- ++ + if ( m_tiptype == "thumbnail" ) + { + #if (KDE_VERSION_MINOR < 3) +@@ -263,19 +263,19 @@ + toolTipData.setClickable(true); + #endif + } +- ++ + //We need to check task_tmp actually exists before accessing its icon... + if ( (m_tiptype == "thumbnail" || m_tiptype == "icon") && task_tmp) + toolTipData.setImage( task_tmp->icon(32, 32, true) ); + Plasma::ToolTipManager::self()->setContent(m_widgets[m_alias.indexOf( widclass_tmp )], toolTipData); + } +- +- ++ ++ + if ( m_taskpreviews && m_type == QString("standard_dock") && showedTasks.indexOf( id )!=-1 ) + { + if (m_showtooltips_l && task_tmp) + {Plasma::ToolTipManager::self()->setContent(m_taskicons[showedTasks.indexOf( id )], toolTipData);} +- ++ + if(properties[ NETWinInfo::PROTOCOLS ] & NET::WMIcon) + { + m_uti_tmr->stop(); +@@ -283,12 +283,12 @@ + m_uti_tmr->start(); + } + } +- +- +- ++ ++ ++ + } + +- ++ + } + + +@@ -300,8 +300,8 @@ + //FIXME + void daisy::workAreaChanged() + { +- +- ++ ++ + } + + +@@ -321,18 +321,18 @@ + // ATTENTION + void daisy::checkAttention( KWindowInfo taskInfo, QString widclass_tmp ) + { +- ++ + if ( taskInfo.hasState( NET::DemandsAttention ) && !m_attentionwindow.contains( m_alias.indexOf( widclass_tmp )) ) + { + m_attentionwindow << m_alias.indexOf( widclass_tmp ); + } +- ++ + else if ( m_attentionwindow.contains( m_alias.indexOf( widclass_tmp )) ) + { + m_attentionwindow.removeAt(m_attentionwindow.indexOf( m_alias.indexOf( widclass_tmp )) ); + } +- +- ++ ++ + } + + +@@ -353,36 +353,36 @@ + m_activewindow = -1;m_startingwindow = -1;m_closingwindow = -1; + Plasma::ToolTipContent toolTipData;toolTipData.setAutohide(false); + QString str;QString widclass_tmp;total_taskpreviews=0; +- +- ++ ++ + //THUMBNAILS + if ( m_taskpreviews && m_type == QString("standard_dock") ) + { + for (int i = 0; i < m_max_taskpreviews; ++i) + {m_taskicons[i]->setGeometry( QRect(-10000, -10000, 0, 0) );} + } +- +- ++ ++ + if (m_showtooltips_l)clearToolTipContent(); +- +- ++ ++ + QList::ConstIterator it; + for (it = taskDict.begin(); it != taskDict.end(); ++it ) + { + KWindowInfo taskInfo = KWindowSystem::windowInfo( *it, NET::WMName | NET::WMVisibleName | NET::WMVisibleIconName | NET::WMState | NET::XAWMState | NET::WMDesktop | NET::WMWindowType, NET::WM2WindowClass ); +- +- +- TaskPtr task_tmp = TaskManager::TaskManager::self()->findTask( *it ); ++ ++ ++ Task *task_tmp = TaskManager::TaskManager::self()->findTask( *it ); + if ( task_tmp && *it == KWindowSystem::activeWindow() ) + {m_focusedWindow = *it;} +- +- ++ ++ + //THUMBNAILS + if ( m_taskpreviews && m_type == QString("standard_dock") && task_tmp ) + { + if ( !m_showtaskoflauncher && ( m_alias.indexOf( taskInfo.windowClassName() ) != -1 || m_alias.indexOf( QString(taskInfo.windowClassClass().toLower()) ) != -1 ) ) + {} +- ++ + else if ( total_taskpreviewssetContent(m_widgets[m_alias.indexOf( widclass_tmp )], toolTipData); +- ++ + } +- +- ++ ++ + } +- ++ + } +- +- ++ ++ + //THUMBNAILS + if ( m_taskpreviews && m_type == QString("standard_dock") ) + { + resizeRepos( true ); + } +- +- ++ ++ + return taskDict; + } + +@@ -478,14 +478,14 @@ + //----------------------------------------------------------------------------- + // Create task thumbnail + //FIXME +-void daisy::createTaskThumbnail( TaskPtr task_tmp, int j ) ++void daisy::createTaskThumbnail( Task *task_tmp, int j ) + { + QIcon thumbnail; + //thumbnail = QIcon( QPixmap::grabWindow ( task_tmp->win(), 0, 0, -1, -1 ) );//This would suck + thumbnail = KIcon( task_tmp->icon( m_icodimension, m_icodimension, true ) ); +- ++ + m_taskicons[j]->setIcon(thumbnail); +- ++ + if ( m_orientation== QString("horizontal") ) + { + m_taskicons[j]->setGeometry( QRect( last_icopos[0]+( ( j* (m_icodimension+(m_icodimension*m_icospacing)) ) ), last_icopos[1], m_icodimension, m_icodimension) ); +@@ -494,35 +494,38 @@ + { + m_taskicons[j]->setGeometry( QRect( last_icopos[0], last_icopos[1]+( ( j* (m_icodimension+(m_icodimension*m_icospacing)) ) ), m_icodimension, m_icodimension) ); + } +- +- +- +- +- ++ ++ ++ ++ ++ + if (m_showtooltips_l) + { + Plasma::ToolTipContent toolTipData;toolTipData.setAutohide(false); + QString str;QString desk_name = KWindowSystem::desktopName( task_tmp->desktop() ); +- ++ + if (task_tmp->desktop() != -1) + {str.append( desk_name );str.insert( 0, i18n("On ") );} + else str.insert( 0, i18n("On all desktops") ); + toolTipData.setMainText( task_tmp->visibleNameWithState() ); + toolTipData.setSubText( str ); +- ++ + if ( m_tiptype == "thumbnail" ) + { ++ //KDE_DEPRECATED void setWindowToPreview(WId id); ++ //KDE_DEPRECATED WId windowToPreview() const; ++ + toolTipData.setWindowToPreview( task_tmp->window() ); + toolTipData.setClickable(true); + } +- ++ + if ( m_tiptype == "thumbnail" || m_tiptype == "icon" ) + toolTipData.setImage( task_tmp->icon(32, 32, true) ); +- ++ + Plasma::ToolTipManager::self()->setContent(m_taskicons[j], toolTipData); + } + +- ++ + } + + +@@ -543,7 +546,7 @@ + //FIXME + WId daisy::matchTask(QString name) + { +- ++ + QList taskDict = KWindowSystem::windows(); + QList::ConstIterator it; + for (it = taskDict.begin(); it != taskDict.end(); ++it ) +@@ -554,7 +557,7 @@ + return *it; + } + } +- ++ + return 0; + } + +@@ -570,12 +573,12 @@ + { + QList ret_taskDict; + QList taskDict = KWindowSystem::windows(); +- ++ + QList::ConstIterator it; + for (it = taskDict.begin(); it != taskDict.end(); ++it ) + { + KWindowInfo taskInfo = KWindowSystem::windowInfo( *it, NET::WMName | NET::WMVisibleName , NET::WM2WindowClass ); +- ++ + if ( name == QString(taskInfo.windowClassName()) || name == QString(taskInfo.windowClassClass().toLower()) ) + { + if ( maxtasks > ret_taskDict.size() || maxtasks == -1 ) +@@ -583,11 +586,11 @@ + else + break; + } +- ++ + } +- ++ + return ret_taskDict; +- ++ + } + + +@@ -600,13 +603,13 @@ + // Get task + bool daisy::getTaskPtr( QString name ) + { +- ++ + QList taskDict = KWindowSystem::windows(); + QList::ConstIterator it; + for (it = taskDict.begin(); it != taskDict.end(); ++it ) + { + KWindowInfo taskInfo = KWindowSystem::windowInfo( *it, NET::WMName | NET::WMVisibleName, NET::WM2WindowClass ); +- ++ + if ( taskInfo.windowClassName() == name || taskInfo.visibleName() == name || taskInfo.name() == name || QString(taskInfo.windowClassClass().toLower()) == name ) + { + m_task = TaskManager::TaskManager::self()->findTask( *it ); +@@ -614,7 +617,7 @@ + } + } + return false; +- ++ + } + + +@@ -636,9 +639,9 @@ + //FIXME + void daisy::toggTask(WId id) + { +- ++ + KWindowInfo taskInfo = KWindowSystem::windowInfo( id, NET::WMState, NET::WM2WindowClass ); +- ++ + if ( taskInfo.valid() ) + { + //HACK widget gains focus on click FIXME +@@ -650,9 +653,9 @@ + KWindowSystem::activateWindow( id ); + } + m_up_tmr->stop();m_up_tmr->setInterval(10);m_up_tmr->start(); +- ++ + } +- ++ + } + + +@@ -666,9 +669,9 @@ + //FIXME + void daisy::toggShadeTask(WId id) + { +- ++ + KWindowInfo taskInfo = KWindowSystem::windowInfo( id, NET::WMState, NET::WM2WindowClass ); +- ++ + if ( taskInfo.valid() ) + { + if ( taskInfo.hasState( NET::Shaded ) ) +@@ -714,7 +717,7 @@ + KWindowInfo taskInfo = KWindowSystem::windowInfo( m_focusedWindow, NET::WMState, NET::WM2WindowClass ); + for (it = taskDict.begin(); it != taskDict.end(); ++it ) + { +- TaskPtr task_tmp = TaskManager::TaskManager::self()->findTask( *it ); ++ Task *task_tmp = TaskManager::TaskManager::self()->findTask( *it ); + if ( task_tmp ){real_taskDict << *it;} + } + if (real_taskDict.size() > 0) +@@ -768,7 +771,7 @@ + void daisy::delayTaskIcoChange(void) + { + m_uti_tmr->stop(); +- TaskPtr task_tmp = TaskManager::TaskManager::self()->findTask( m_toupwid ); ++ Task *task_tmp = TaskManager::TaskManager::self()->findTask( m_toupwid ); + if ( task_tmp ) + { + // QIcon thumbnail;