TDE
/
tastymenu
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tastymenu
0
0
Fork 0
Code Issues Releases Wiki Activity

Initial TDE conversion

Browse Source 
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/1/head
Slávek Banko 9 years ago
parent 7fdc8b30e8
commit ba407974cb
31 changed files with 251 additions and 251 deletions
Show Stats Download Patch File Download Diff File

6
doc/en/index.docbook
Unescape View File

@ -65,7 +65,7 @@ Do NOT change these in the translation. -->
<abstract> <abstract>
<para> <para>
&tastymenu; is a KMenu replacement &tastymenu; is a TMenu replacement
</para> </para>
</abstract> </abstract>
@ -100,7 +100,7 @@ problems. Basically a long version of the abstract. Don't include a
revision history. (see installation appendix comment) --> revision history. (see installation appendix comment) -->
<para> <para>
&tastymenu; is a KMenu replacement aiming to provide the maximum usability, or at least to be a testbed for usability concepts and ideas for a future kmenu replacement. &tastymenu; is a TMenu replacement aiming to provide the maximum usability, or at least to be a testbed for usability concepts and ideas for a future TMenu replacement.
</para> </para>
</chapter> </chapter>
@ -135,7 +135,7 @@ patent issues. -->
The left part of the menu is very similar to the Novell idea(<ulink url="http://www.novell.com/products/desktop/preview.html">http://www.novell.com/products/desktop/preview.html</ulink>): you have a search box that is always selected when the menu is opened (the search result are displayed in the leftmost listview), followed by a combobox that decides what the following listview: favourite applications (default), most used applications, recently used applications and recent documents. The left part of the menu is very similar to the Novell idea(<ulink url="http://www.novell.com/products/desktop/preview.html">http://www.novell.com/products/desktop/preview.html</ulink>): you have a search box that is always selected when the menu is opened (the search result are displayed in the leftmost listview), followed by a combobox that decides what the following listview: favourite applications (default), most used applications, recently used applications and recent documents.
</para> </para>
<para> <para>
The right part contains the whole kmenu and takes the aspect from <ulink url="http://www.kbfx.org">KBFX</ulink>, the middle column contains the top level categorization (plus in the current kmenu arrangment there are also the control center, home folder and find files, but i think there should be present only categories). in the left-most listview there is the content of the category currently selected in the middle column. I think in this way even if it has the same number of items it <emphasis>appears</emphasis> less huge than with a popup menu/submenu structure. The right part contains the whole TMenu and takes the aspect from <ulink url="http://www.kbfx.org">KBFX</ulink>, the middle column contains the top level categorization (plus in the current TMenu arrangment there are also the control center, home folder and find files, but i think there should be present only categories). in the left-most listview there is the content of the category currently selected in the middle column. I think in this way even if it has the same number of items it <emphasis>appears</emphasis> less huge than with a popup menu/submenu structure.
Every items have two row, for the name and for the description, in order to make a more it more informative. On each selected item appears an action icon on the right, at the moment they are "add bookmark" on application icons and &amp;remove bookmark &amp;on favourite apps list. Every items have two row, for the name and for the description, in order to make a more it more informative. On each selected item appears an action icon on the right, at the moment they are "add bookmark" on application icons and &amp;remove bookmark &amp;on favourite apps list.
</para> </para>
<para> <para>

16
po/de.po
Unescape View File

@ -135,11 +135,11 @@ msgstr "Alt+S"
#: appearance.cpp:293 rc.cpp:226 #: appearance.cpp:293 rc.cpp:226
#, no-c-format #, no-c-format
msgid "" msgid ""
"What icon should be displayed in the kicker button instead of the KMenu " "What icon should be displayed in the kicker button instead of the TMenu "
"one.\n" "one.\n"
"Empty means default." "Empty means default."
msgstr "" msgstr ""
"Welches Symbol soll als Kicker-Knopf anstelle des KMenu-Symbols angezeigt " "Welches Symbol soll als Kicker-Knopf anstelle des TMenu-Symbols angezeigt "
"werden?\n" "werden?\n"
"Kein Eintrag bedeutet Standard." "Kein Eintrag bedeutet Standard."
@ -275,10 +275,10 @@ msgstr "Alt + F1 Tastenkürzel &überschreiben (erfordert Kicker-Neustart)"
#: behaviour.cpp:118 rc.cpp:99 #: behaviour.cpp:118 rc.cpp:99
#, no-c-format #, no-c-format
msgid "" msgid ""
"Pops up Tasty Menu instead of KMenu when the shortcut sequence Alt+F1 is " "Pops up Tasty Menu instead of TMenu when the shortcut sequence Alt+F1 is "
"pressed" "pressed"
msgstr "" msgstr ""
"Öffnet das Tasty-Menü anstelle des K-Menüs, wenn das Tastenkürzel Alt + " "Öffnet das Tasty-Menü anstelle des T-Menüs, wenn das Tastenkürzel Alt + "
"F1 gedrückt wird" "F1 gedrückt wird"
#. i18n: file ./behaviour.ui line 91 #. i18n: file ./behaviour.ui line 91
@ -696,8 +696,8 @@ msgid "Menu"
msgstr "Menü" msgstr "Menü"
#: tastymenu.cpp:186 #: tastymenu.cpp:186
msgid "KMenu replacement" msgid "TMenu replacement"
msgstr "Alternative zu KMenü" msgstr "Alternative zu TMenü"
#: tastymenu.cpp:191 #: tastymenu.cpp:191
msgid "Maintainer" msgid "Maintainer"
@ -749,8 +749,8 @@ msgid "For the Polish translation"
msgstr "Für die spanische Übersetzung" msgstr "Für die spanische Übersetzung"
#: tastymenu.cpp:225 #: tastymenu.cpp:225
msgid "For the Switch user code from KDM" msgid "For the Switch user code from TDM"
msgstr "Für den \"Benutzer wechseln-\"Code aus KDM" msgstr "Für den \"Benutzer wechseln-\"Code aus TDM"
#: tastymenu.cpp:229 #: tastymenu.cpp:229
msgid "For some inspirations here and there." msgid "For some inspirations here and there."

16
po/es.po
Unescape View File

@ -137,12 +137,12 @@ msgstr ""
#: appearance.cpp:293 rc.cpp:226 #: appearance.cpp:293 rc.cpp:226
#, no-c-format #, no-c-format
msgid "" msgid ""
"What icon should be displayed in the kicker button instead of the KMenu " "What icon should be displayed in the kicker button instead of the TMenu "
"one.\n" "one.\n"
"Empty means default." "Empty means default."
msgstr "" msgstr ""
"Icono que debe de ser mostrado en Kicker en lugar del botón por defecto de " "Icono que debe de ser mostrado en Kicker en lugar del botón por defecto de "
"KMenu.<br>Vacio pone el botón por defecto." "TMenu.<br>Vacio pone el botón por defecto."
#. i18n: file ./appearance.ui line 262 #. i18n: file ./appearance.ui line 262
#: appearance.cpp:295 rc.cpp:230 #: appearance.cpp:295 rc.cpp:230
@ -275,10 +275,10 @@ msgstr "&Capturar el acceso rápido Alt+F1 (necesita reiniciar kicker)"
#: behaviour.cpp:118 rc.cpp:99 #: behaviour.cpp:118 rc.cpp:99
#, no-c-format #, no-c-format
msgid "" msgid ""
"Pops up Tasty Menu instead of KMenu when the shortcut sequence Alt+F1 is " "Pops up Tasty Menu instead of TMenu when the shortcut sequence Alt+F1 is "
"pressed" "pressed"
msgstr "" msgstr ""
"Muestra Tasty Menu en lugar del KMenu cuando el acceso rápido Alt+F1 es " "Muestra Tasty Menu en lugar del TMenu cuando el acceso rápido Alt+F1 es "
"pulsada" "pulsada"
#. i18n: file ./behaviour.ui line 91 #. i18n: file ./behaviour.ui line 91
@ -690,8 +690,8 @@ msgid "Menu"
msgstr "Menú" msgstr "Menú"
#: tastymenu.cpp:186 #: tastymenu.cpp:186
msgid "KMenu replacement" msgid "TMenu replacement"
msgstr "Reemplazo del KMenu" msgstr "Reemplazo del TMenu"
#: tastymenu.cpp:191 #: tastymenu.cpp:191
msgid "Maintainer" msgid "Maintainer"
@ -745,8 +745,8 @@ msgid "For the Polish translation"
msgstr "Por la traducción al Ruso" msgstr "Por la traducción al Ruso"
#: tastymenu.cpp:225 #: tastymenu.cpp:225
msgid "For the Switch user code from KDM" msgid "For the Switch user code from TDM"
msgstr "Por el código de cambiar usuario del KDM" msgstr "Por el código de cambiar usuario del TDM"
#: tastymenu.cpp:229 #: tastymenu.cpp:229
msgid "For some inspirations here and there." msgid "For some inspirations here and there."

16
po/fi.po
Unescape View File

@ -132,11 +132,11 @@ msgstr "Alt-I"
#: appearance.cpp:293 rc.cpp:226 #: appearance.cpp:293 rc.cpp:226
#, no-c-format #, no-c-format
msgid "" msgid ""
"What icon should be displayed in the kicker button instead of the KMenu " "What icon should be displayed in the kicker button instead of the TMenu "
"one.\n" "one.\n"
"Empty means default." "Empty means default."
msgstr "" msgstr ""
"Mikä kuvake näytetään Kicker-painikkeessa KMenun sijaan.\n" "Mikä kuvake näytetään Kicker-painikkeessa TMenun sijaan.\n"
"Tyhjä tarkoittaa käytä oletusta." "Tyhjä tarkoittaa käytä oletusta."
#. i18n: file ./appearance.ui line 262 #. i18n: file ./appearance.ui line 262
@ -270,10 +270,10 @@ msgstr "&Ohita Alt-F1-pikanäppäin (vaatii Kickerin uudelleenkäynnistystä)"
#: behaviour.cpp:118 rc.cpp:99 #: behaviour.cpp:118 rc.cpp:99
#, no-c-format #, no-c-format
msgid "" msgid ""
"Pops up Tasty Menu instead of KMenu when the shortcut sequence Alt+F1 is " "Pops up Tasty Menu instead of TMenu when the shortcut sequence Alt+F1 is "
"pressed" "pressed"
msgstr "" msgstr ""
"Näyttää Tasty Menun KMenun sijaan Alt-F1-pikanäppäintä painettaessa" "Näyttää Tasty Menun TMenun sijaan Alt-F1-pikanäppäintä painettaessa"
#. i18n: file ./behaviour.ui line 91 #. i18n: file ./behaviour.ui line 91
#: behaviour.cpp:119 rc.cpp:102 #: behaviour.cpp:119 rc.cpp:102
@ -679,8 +679,8 @@ msgid "Menu"
msgstr "Valikko" msgstr "Valikko"
#: tastymenu.cpp:186 #: tastymenu.cpp:186
msgid "KMenu replacement" msgid "TMenu replacement"
msgstr "KMenun korvaaja" msgstr "TMenun korvaaja"
#: tastymenu.cpp:191 #: tastymenu.cpp:191
msgid "Maintainer" msgid "Maintainer"
@ -732,8 +732,8 @@ msgid "For the Polish translation"
msgstr "Espanjannoksesta" msgstr "Espanjannoksesta"
#: tastymenu.cpp:225 #: tastymenu.cpp:225
msgid "For the Switch user code from KDM" msgid "For the Switch user code from TDM"
msgstr "KDM:n käyttäjänvaihtokoodista" msgstr "TDM:n käyttäjänvaihtokoodista"
#: tastymenu.cpp:229 #: tastymenu.cpp:229
msgid "For some inspirations here and there." msgid "For some inspirations here and there."

16
po/fr.po
Unescape View File

@ -137,12 +137,12 @@ msgstr "Alt+I"
#: appearance.cpp:293 rc.cpp:226 #: appearance.cpp:293 rc.cpp:226
#, no-c-format #, no-c-format
msgid "" msgid ""
"What icon should be displayed in the kicker button instead of the KMenu " "What icon should be displayed in the kicker button instead of the TMenu "
"one.\n" "one.\n"
"Empty means default." "Empty means default."
msgstr "" msgstr ""
"Icône Kicker qui doit être montrée au lieu du bouton par défaut " "Icône Kicker qui doit être montrée au lieu du bouton par défaut "
"deKMenu.<br>Vide met le bouton par défaut." "de TMenu.<br>Vide met le bouton par défaut."
#. i18n: file ./appearance.ui line 262 #. i18n: file ./appearance.ui line 262
#: appearance.cpp:295 rc.cpp:230 #: appearance.cpp:295 rc.cpp:230
@ -276,10 +276,10 @@ msgstr ""
#: behaviour.cpp:118 rc.cpp:99 #: behaviour.cpp:118 rc.cpp:99
#, no-c-format #, no-c-format
msgid "" msgid ""
"Pops up Tasty Menu instead of KMenu when the shortcut sequence Alt+F1 is " "Pops up Tasty Menu instead of TMenu when the shortcut sequence Alt+F1 is "
"pressed" "pressed"
msgstr "" msgstr ""
"Afficher le menu contextuel de Tasty Menu au lieu de KMenu lorsque Alt+F1 " "Afficher le menu contextuel de Tasty Menu au lieu de TMenu lorsque Alt+F1 "
"est pressé " "est pressé "
#. i18n: file ./behaviour.ui line 91 #. i18n: file ./behaviour.ui line 91
@ -693,8 +693,8 @@ msgid "Menu"
msgstr "Menu" msgstr "Menu"
#: tastymenu.cpp:186 #: tastymenu.cpp:186
msgid "KMenu replacement" msgid "TMenu replacement"
msgstr "Remplacement de KMenu" msgstr "Remplacement de TMenu"
#: tastymenu.cpp:191 #: tastymenu.cpp:191
msgid "Maintainer" msgid "Maintainer"
@ -746,8 +746,8 @@ msgid "For the Polish translation"
msgstr "Pour la traduction espagnole" msgstr "Pour la traduction espagnole"
#: tastymenu.cpp:225 #: tastymenu.cpp:225
msgid "For the Switch user code from KDM" msgid "For the Switch user code from TDM"
msgstr "Pour la codage du changement d'utilisateur via KDM" msgstr "Pour la codage du changement d'utilisateur via TDM"
#: tastymenu.cpp:229 #: tastymenu.cpp:229
msgid "For some inspirations here and there." msgid "For some inspirations here and there."

16
po/it.po
Unescape View File

@ -131,12 +131,12 @@ msgstr "Alt+I"
#: appearance.cpp:293 rc.cpp:226 #: appearance.cpp:293 rc.cpp:226
#, no-c-format #, no-c-format
msgid "" msgid ""
"What icon should be displayed in the kicker button instead of the KMenu " "What icon should be displayed in the kicker button instead of the TMenu "
"one.\n" "one.\n"
"Empty means default." "Empty means default."
msgstr "" msgstr ""
"Quale icona dovrebbe essere mostrata nel pulsante di Kicker invece che " "Quale icona dovrebbe essere mostrata nel pulsante di Kicker invece che "
"quella di Kmenu. Vuoto significa quella predefinita" "quella di TMenu. Vuoto significa quella predefinita"
#. i18n: file ./appearance.ui line 262 #. i18n: file ./appearance.ui line 262
#: appearance.cpp:295 rc.cpp:230 #: appearance.cpp:295 rc.cpp:230
@ -268,9 +268,9 @@ msgstr "&Riassegna la scorciatoia alt+F1 (richiede il riavvio di kicker)"
#: behaviour.cpp:118 rc.cpp:99 #: behaviour.cpp:118 rc.cpp:99
#, no-c-format #, no-c-format
msgid "" msgid ""
"Pops up Tasty Menu instead of KMenu when the shortcut sequence Alt+F1 is " "Pops up Tasty Menu instead of TMenu when the shortcut sequence Alt+F1 is "
"pressed" "pressed"
msgstr "Mostra Tasty Menu invece di KMenu quando si preme Alt+F1" msgstr "Mostra Tasty Menu invece di TMenu quando si preme Alt+F1"
#. i18n: file ./behaviour.ui line 91 #. i18n: file ./behaviour.ui line 91
#: behaviour.cpp:119 rc.cpp:102 #: behaviour.cpp:119 rc.cpp:102
@ -677,8 +677,8 @@ msgid "Menu"
msgstr "Menu" msgstr "Menu"
#: tastymenu.cpp:186 #: tastymenu.cpp:186
msgid "KMenu replacement" msgid "TMenu replacement"
msgstr "Sostituto di KMenu" msgstr "Sostituto di TMenu"
#: tastymenu.cpp:191 #: tastymenu.cpp:191
msgid "Maintainer" msgid "Maintainer"
@ -730,8 +730,8 @@ msgid "For the Polish translation"
msgstr "Per la traduzione in Spagnolo" msgstr "Per la traduzione in Spagnolo"
#: tastymenu.cpp:225 #: tastymenu.cpp:225
msgid "For the Switch user code from KDM" msgid "For the Switch user code from TDM"
msgstr "Per il codice che realizza lo switch fra utenti del KDM" msgstr "Per il codice che realizza lo switch fra utenti del TDM"
#: tastymenu.cpp:229 #: tastymenu.cpp:229
msgid "For some inspirations here and there." msgid "For some inspirations here and there."

16
po/pl.po
Unescape View File

@ -133,11 +133,11 @@ msgstr "Alt+I"
#: po/extractedrc.cpp:57 src/appearance.cpp:292 extractedrc.cpp:57 #: po/extractedrc.cpp:57 src/appearance.cpp:292 extractedrc.cpp:57
#, no-c-format #, no-c-format
msgid "" msgid ""
"What icon should be displayed in the kicker button instead of the KMenu " "What icon should be displayed in the kicker button instead of the TMenu "
"one.\n" "one.\n"
"Empty means default." "Empty means default."
msgstr "" msgstr ""
"Ikona, która powinna być wyświetlana, zamiast ikony KMenu, na pasku Kicker.\n" "Ikona, która powinna być wyświetlana, zamiast ikony TMenu, na pasku Kicker.\n"
"Puste oznacza domyślna." "Puste oznacza domyślna."
#. i18n: file ./src/appearance.ui line 262 #. i18n: file ./src/appearance.ui line 262
@ -297,9 +297,9 @@ msgstr "&Zastąp skrót klawiaturowy Alt+F1 (wymaga ponownego uruchomienia Kicke
#: po/extractedrc.cpp:142 src/behaviour.cpp:118 extractedrc.cpp:142 #: po/extractedrc.cpp:142 src/behaviour.cpp:118 extractedrc.cpp:142
#, no-c-format #, no-c-format
msgid "" msgid ""
"Pops up Tasty Menu instead of KMenu when the shortcut sequence Alt+F1 is " "Pops up Tasty Menu instead of TMenu when the shortcut sequence Alt+F1 is "
"pressed" "pressed"
msgstr "Pokazuj Tasty Menu zamiast Kmenu po naciśnięciu kombinacji klawiszy Alt+F1." msgstr "Pokazuj Tasty Menu zamiast TMenu po naciśnięciu kombinacji klawiszy Alt+F1."
#. i18n: file ./src/behaviour.ui line 91 #. i18n: file ./src/behaviour.ui line 91
#: po/extractedrc.cpp:145 src/behaviour.cpp:119 extractedrc.cpp:145 #: po/extractedrc.cpp:145 src/behaviour.cpp:119 extractedrc.cpp:145
@ -727,8 +727,8 @@ msgid "Menu"
msgstr "Menu" msgstr "Menu"
#: src/tastymenu.cpp:186 #: src/tastymenu.cpp:186
msgid "KMenu replacement" msgid "TMenu replacement"
msgstr "Program zastępujący Kmenu" msgstr "Program zastępujący TMenu"
#: src/tastymenu.cpp:191 #: src/tastymenu.cpp:191
msgid "Maintainer" msgid "Maintainer"
@ -775,8 +775,8 @@ msgid "For the Polish translation"
msgstr "za tłumaczenie na język polski" msgstr "za tłumaczenie na język polski"
#: src/tastymenu.cpp:225 #: src/tastymenu.cpp:225
msgid "For the Switch user code from KDM" msgid "For the Switch user code from TDM"
msgstr "za kod przełączania użytkownika z KDM" msgstr "za kod przełączania użytkownika z TDM"
#: src/tastymenu.cpp:229 #: src/tastymenu.cpp:229
msgid "For some inspirations here and there." msgid "For some inspirations here and there."

16
po/pt_BR.po
Unescape View File

@ -135,11 +135,11 @@ msgstr "Alt+I"
#: appearance.cpp:293 rc.cpp:226 #: appearance.cpp:293 rc.cpp:226
#, no-c-format #, no-c-format
msgid "" msgid ""
"What icon should be displayed in the kicker button instead of the KMenu " "What icon should be displayed in the kicker button instead of the TMenu "
"one.\n" "one.\n"
"Empty means default." "Empty means default."
msgstr "" msgstr ""
"Icone que deve ser mostrado no botão Kicker no lugar de KMenu " "Icone que deve ser mostrado no botão Kicker no lugar de TMenu "
"one.\n" "one.\n"
"Vazio por padrão." "Vazio por padrão."
@ -274,9 +274,9 @@ msgstr "&Capturar o accesso rápido Alt+F1 (necessita reiniciar o kicker)"
#: behaviour.cpp:118 rc.cpp:99 #: behaviour.cpp:118 rc.cpp:99
#, no-c-format #, no-c-format
msgid "" msgid ""
"Pops up Tasty Menu instead of KMenu when the shortcut sequence Alt+F1 is " "Pops up Tasty Menu instead of TMenu when the shortcut sequence Alt+F1 is "
"pressed" "pressed"
msgstr "Mostra o Tasty Menu no lugar do KMenu quando o acesso rápido ALT+F1 é pressionado" msgstr "Mostra o Tasty Menu no lugar do TMenu quando o acesso rápido ALT+F1 é pressionado"
#. i18n: file ./behaviour.ui line 91 #. i18n: file ./behaviour.ui line 91
#: behaviour.cpp:119 rc.cpp:102 #: behaviour.cpp:119 rc.cpp:102
@ -680,8 +680,8 @@ msgid "Menu"
msgstr "Menu" msgstr "Menu"
#: tastymenu.cpp:186 #: tastymenu.cpp:186
msgid "KMenu replacement" msgid "TMenu replacement"
msgstr "Substituir o KMenu" msgstr "Substituir o TMenu"
#: tastymenu.cpp:191 #: tastymenu.cpp:191
msgid "Maintainer" msgid "Maintainer"
@ -728,8 +728,8 @@ msgid "For the Polish translation"
msgstr "Pela tradução para o Polonês" msgstr "Pela tradução para o Polonês"
#: tastymenu.cpp:225 #: tastymenu.cpp:225
msgid "For the Switch user code from KDM" msgid "For the Switch user code from TDM"
msgstr "Pelo código para trocar usuários KDM" msgstr "Pelo código para trocar usuários TDM"
#: tastymenu.cpp:229 #: tastymenu.cpp:229
msgid "For some inspirations here and there." msgid "For some inspirations here and there."

16
po/ru.po
Unescape View File

@ -135,12 +135,12 @@ msgstr "Alt+I"
#: appearance.cpp:293 rc.cpp:226 #: appearance.cpp:293 rc.cpp:226
#, no-c-format #, no-c-format
msgid "" msgid ""
"What icon should be displayed in the kicker button instead of the KMenu " "What icon should be displayed in the kicker button instead of the TMenu "
"one.\n" "one.\n"
"Empty means default." "Empty means default."
msgstr "" msgstr ""
"Эта пиктограмма будет отображаться " "Эта пиктограмма будет отображаться "
"вместо KMenu.\n" "вместо TMenu.\n"
"В другом случае - стандартная пиктограмма." "В другом случае - стандартная пиктограмма."
#. i18n: file ./appearance.ui line 262 #. i18n: file ./appearance.ui line 262
@ -276,10 +276,10 @@ msgstr ""
#: behaviour.cpp:118 rc.cpp:99 #: behaviour.cpp:118 rc.cpp:99
#, no-c-format #, no-c-format
msgid "" msgid ""
"Pops up Tasty Menu instead of KMenu when the shortcut sequence Alt+F1 is " "Pops up Tasty Menu instead of TMenu when the shortcut sequence Alt+F1 is "
"pressed" "pressed"
msgstr "" msgstr ""
"Показывать Tasty Menu вместо KMenu при нажатии " "Показывать Tasty Menu вместо TMenu при нажатии "
"Alt+F1" "Alt+F1"
#. i18n: file ./behaviour.ui line 91 #. i18n: file ./behaviour.ui line 91
@ -710,8 +710,8 @@ msgid "Menu"
msgstr "Меню" msgstr "Меню"
#: tastymenu.cpp:186 #: tastymenu.cpp:186
msgid "KMenu replacement" msgid "TMenu replacement"
msgstr "Замена KMenu" msgstr "Замена TMenu"
#: tastymenu.cpp:191 #: tastymenu.cpp:191
msgid "Maintainer" msgid "Maintainer"
@ -765,9 +765,9 @@ msgid "For the Polish translation"
msgstr "Для русского перевода" msgstr "Для русского перевода"
#: tastymenu.cpp:225 #: tastymenu.cpp:225
msgid "For the Switch user code from KDM" msgid "For the Switch user code from TDM"
msgstr "" msgstr ""
"За код из KDM, отвечающий за переключение " "За код из TDM, отвечающий за переключение "
"пользователей" "пользователей"
#: tastymenu.cpp:229 #: tastymenu.cpp:229

10
po/sl.po
Unescape View File

@ -132,7 +132,7 @@ msgstr "Alt+I"
#: appearance.cpp:293 rc.cpp:226 #: appearance.cpp:293 rc.cpp:226
#, no-c-format #, no-c-format
msgid "" msgid ""
"What icon should be displayed in the kicker button instead of the KMenu " "What icon should be displayed in the kicker button instead of the TMenu "
"one.\n" "one.\n"
"Empty means default." "Empty means default."
msgstr "" msgstr ""
@ -270,7 +270,7 @@ msgstr "Povo&zi Alt+F1 bližnjico (zahteva ponovni zagon kickerja)"
#: behaviour.cpp:118 rc.cpp:99 #: behaviour.cpp:118 rc.cpp:99
#, no-c-format #, no-c-format
msgid "" msgid ""
"Pops up Tasty Menu instead of KMenu when the shortcut sequence Alt+F1 is " "Pops up Tasty Menu instead of TMenu when the shortcut sequence Alt+F1 is "
"pressed" "pressed"
msgstr "" msgstr ""
"Prikaže Tasty Menu namesto Menija K, ko je pritisnjena kombinacija tipk " "Prikaže Tasty Menu namesto Menija K, ko je pritisnjena kombinacija tipk "
@ -685,7 +685,7 @@ msgid "Menu"
msgstr "Meni" msgstr "Meni"
#: tastymenu.cpp:186 #: tastymenu.cpp:186
msgid "KMenu replacement" msgid "TMenu replacement"
msgstr "Zamenjava za Meni K" msgstr "Zamenjava za Meni K"
#: tastymenu.cpp:191 #: tastymenu.cpp:191
@ -735,8 +735,8 @@ msgid "For the Polish translation"
msgstr "Za španski prevod" msgstr "Za španski prevod"
#: tastymenu.cpp:225 #: tastymenu.cpp:225
msgid "For the Switch user code from KDM" msgid "For the Switch user code from TDM"
msgstr "Za kodo iz KDM za Zamenjaj uporabnika" msgstr "Za kodo iz TDM za Zamenjaj uporabnika"
#: tastymenu.cpp:229 #: tastymenu.cpp:229
msgid "For some inspirations here and there." msgid "For some inspirations here and there."

8
po/tastymenu.pot
Unescape View File

@ -128,7 +128,7 @@ msgstr ""
#: appearance.cpp:293 rc.cpp:226 #: appearance.cpp:293 rc.cpp:226
#, no-c-format #, no-c-format
msgid "" msgid ""
"What icon should be displayed in the kicker button instead of the KMenu " "What icon should be displayed in the kicker button instead of the TMenu "
"one.\n" "one.\n"
"Empty means default." "Empty means default."
msgstr "" msgstr ""
@ -262,7 +262,7 @@ msgstr ""
#: behaviour.cpp:118 rc.cpp:99 #: behaviour.cpp:118 rc.cpp:99
#, no-c-format #, no-c-format
msgid "" msgid ""
"Pops up Tasty Menu instead of KMenu when the shortcut sequence Alt+F1 is " "Pops up Tasty Menu instead of TMenu when the shortcut sequence Alt+F1 is "
"pressed" "pressed"
msgstr "" msgstr ""
@ -647,7 +647,7 @@ msgid "Menu"
msgstr "" msgstr ""
#: tastymenu.cpp:186 #: tastymenu.cpp:186
msgid "KMenu replacement" msgid "TMenu replacement"
msgstr "" msgstr ""
#: tastymenu.cpp:191 #: tastymenu.cpp:191
@ -695,7 +695,7 @@ msgid "For the Polish translation"
msgstr "" msgstr ""
#: tastymenu.cpp:225 #: tastymenu.cpp:225
msgid "For the Switch user code from KDM" msgid "For the Switch user code from TDM"
msgstr "" msgstr ""
#: tastymenu.cpp:229 #: tastymenu.cpp:229

16
po/uk.po
Unescape View File

@ -133,12 +133,12 @@ msgstr "Alt+I"
#: appearance.cpp:293 rc.cpp:226 #: appearance.cpp:293 rc.cpp:226
#, no-c-format #, no-c-format
msgid "" msgid ""
"What icon should be displayed in the kicker button instead of the KMenu " "What icon should be displayed in the kicker button instead of the TMenu "
"one.\n" "one.\n"
"Empty means default." "Empty means default."
msgstr "" msgstr ""
"Ця піктограма буде відображатися замість " "Ця піктограма буде відображатися замість "
"KMenu.\n" "TMenu.\n"
"В іншому випадку - стандартна іконка." "В іншому випадку - стандартна іконка."
#. i18n: file ./appearance.ui line 262 #. i18n: file ./appearance.ui line 262
@ -274,10 +274,10 @@ msgstr ""
#: behaviour.cpp:118 rc.cpp:99 #: behaviour.cpp:118 rc.cpp:99
#, no-c-format #, no-c-format
msgid "" msgid ""
"Pops up Tasty Menu instead of KMenu when the shortcut sequence Alt+F1 is " "Pops up Tasty Menu instead of TMenu when the shortcut sequence Alt+F1 is "
"pressed" "pressed"
msgstr "" msgstr ""
"Показувати Tasty Menu замість KMenu при " "Показувати Tasty Menu замість TMenu при "
"натисненні Alt+F1" "натисненні Alt+F1"
#. i18n: file ./behaviour.ui line 91 #. i18n: file ./behaviour.ui line 91
@ -703,8 +703,8 @@ msgid "Menu"
msgstr "Меню" msgstr "Меню"
#: tastymenu.cpp:186 #: tastymenu.cpp:186
msgid "KMenu replacement" msgid "TMenu replacement"
msgstr "Заміна KMenu" msgstr "Заміна TMenu"
#: tastymenu.cpp:191 #: tastymenu.cpp:191
msgid "Maintainer" msgid "Maintainer"
@ -756,9 +756,9 @@ msgid "For the Polish translation"
msgstr "Для Іспанського перекладу" msgstr "Для Іспанського перекладу"
#: tastymenu.cpp:225 #: tastymenu.cpp:225
msgid "For the Switch user code from KDM" msgid "For the Switch user code from TDM"
msgstr "" msgstr ""
"За код із KDM, відповідальний за " "За код із TDM, відповідальний за "
"переключення користувачів" "переключення користувачів"
#: tastymenu.cpp:229 #: tastymenu.cpp:229

2
src/Makefile.am
Unescape View File

@ -7,7 +7,7 @@ tastymenu_panelapplet_la_SOURCES = tastymenu.cpp menu.ui menuhandler.cpp \
dmctl.cpp dmctl.h tastylistview.cpp misc.cpp misc.h appearance.ui prefs.kcfgc \ dmctl.cpp dmctl.h tastylistview.cpp misc.cpp misc.h appearance.ui prefs.kcfgc \
behaviour.ui tastytooltip.cpp tastytooltipwidget.ui tastybutton.cpp behaviour.ui tastytooltip.cpp tastytooltipwidget.ui tastybutton.cpp
tastymenu_panelapplet_la_LDFLAGS = -version-info 0:0:0 -module $(KDE_PLUGIN) $(all_libraries) tastymenu_panelapplet_la_LDFLAGS = -version-info 0:0:0 -module $(KDE_PLUGIN) $(all_libraries)
tastymenu_panelapplet_la_LIBADD = $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) -lkdefx -lXau tastymenu_panelapplet_la_LIBADD = $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) -ltdefx -lXau
tastymenu_DATA = tastymenu.desktop tastymenu_DATA = tastymenu.desktop
tastymenudir = $(kde_datadir)/kicker/applets tastymenudir = $(kde_datadir)/kicker/applets

4
src/appearance.ui
Unescape View File

@ -226,7 +226,7 @@ Empty means default.</string>
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
<widget class="KIconButton"> <widget class="TDEIconButton">
<property name="name"> <property name="name">
<cstring>MenuButtonIcon</cstring> <cstring>MenuButtonIcon</cstring>
</property> </property>
@ -242,7 +242,7 @@ Empty means default.</string>
<string></string> <string></string>
</property> </property>
<property name="whatsThis" stdset="0"> <property name="whatsThis" stdset="0">
<string>What icon should be displayed in the kicker button instead of the KMenu one. <string>What icon should be displayed in the kicker button instead of the TMenu one.
Empty means default.</string> Empty means default.</string>
</property> </property>
</widget> </widget>

2
src/behaviour.ui
Unescape View File

@ -63,7 +63,7 @@
<string>Alt+O</string> <string>Alt+O</string>
</property> </property>
<property name="whatsThis" stdset="0"> <property name="whatsThis" stdset="0">
<string>Pops up Tasty Menu instead of KMenu when the shortcut sequence Alt+F1 is pressed</string> <string>Pops up Tasty Menu instead of TMenu when the shortcut sequence Alt+F1 is pressed</string>
</property> </property>
</widget> </widget>
<spacer row="1" column="0"> <spacer row="1" column="0">

30
src/dmctl.cpp
Unescape View File

@ -21,7 +21,7 @@
#ifdef Q_WS_X11 #ifdef Q_WS_X11
#include <klocale.h> #include <tdelocale.h>
#include <dcopclient.h> #include <dcopclient.h>
#include <tqregexp.h> #include <tqregexp.h>
@ -106,16 +106,16 @@ DM::exec( const char *cmd )
} }
/** /**
* Execute a KDM/GDM remote control command. * Execute a TDM/GDM remote control command.
* @param cmd the command to execute. FIXME: undocumented yet. * @param cmd the command to execute. FIXME: undocumented yet.
* @param buf the result buffer. * @param buf the result buffer.
* @return result: * @return result:
* @li If true, the command was successfully executed. * @li If true, the command was successfully executed.
* @p ret might contain addional results. * @p ret might contain addional results.
* @li If false and @p ret is empty, a communication error occurred * @li If false and @p ret is empty, a communication error occurred
* (most probably KDM is not running). * (most probably TDM is not running).
* @li If false and @p ret is non-empty, it contains the error message * @li If false and @p ret is non-empty, it contains the error message
* from KDM. * from TDM.
*/ */
bool bool
DM::exec( const char *cmd, TQCString &buf ) DM::exec( const char *cmd, TQCString &buf )
@ -176,11 +176,11 @@ DM::canShutdown()
} }
void void
DM::shutdown( KApplication::ShutdownType shutdownType, DM::shutdown( TDEApplication::ShutdownType shutdownType,
KApplication::ShutdownMode shutdownMode, /* NOT Default */ TDEApplication::ShutdownMode shutdownMode, /* NOT Default */
const TQString &bootOption ) const TQString &bootOption )
{ {
if (shutdownType == KApplication::ShutdownTypeNone) if (shutdownType == TDEApplication::ShutdownTypeNone)
return; return;
bool cap_ask; bool cap_ask;
@ -192,26 +192,26 @@ DM::shutdown( KApplication::ShutdownType shutdownType,
return; return;
cap_ask = false; cap_ask = false;
} }
if (!cap_ask && shutdownMode == KApplication::ShutdownModeInteractive) if (!cap_ask && shutdownMode == TDEApplication::ShutdownModeInteractive)
shutdownMode = KApplication::ShutdownModeForceNow; shutdownMode = TDEApplication::ShutdownModeForceNow;
TQCString cmd; TQCString cmd;
if (DMType == GDM) { if (DMType == GDM) {
cmd.append( shutdownMode == KApplication::ShutdownModeForceNow ? cmd.append( shutdownMode == TDEApplication::ShutdownModeForceNow ?
"SET_LOGOUT_ACTION " : "SET_SAFE_LOGOUT_ACTION " ); "SET_LOGOUT_ACTION " : "SET_SAFE_LOGOUT_ACTION " );
cmd.append( shutdownType == KApplication::ShutdownTypeReboot ? cmd.append( shutdownType == TDEApplication::ShutdownTypeReboot ?
"REBOOT\n" : "HALT\n" ); "REBOOT\n" : "HALT\n" );
} else { } else {
cmd.append( "shutdown\t" ); cmd.append( "shutdown\t" );
cmd.append( shutdownType == KApplication::ShutdownTypeReboot ? cmd.append( shutdownType == TDEApplication::ShutdownTypeReboot ?
"reboot\t" : "halt\t" ); "reboot\t" : "halt\t" );
if (!bootOption.isNull()) if (!bootOption.isNull())
cmd.append( "=" ).append( bootOption.local8Bit() ).append( "\t" ); cmd.append( "=" ).append( bootOption.local8Bit() ).append( "\t" );
cmd.append( shutdownMode == KApplication::ShutdownModeInteractive ? cmd.append( shutdownMode == TDEApplication::ShutdownModeInteractive ?
"ask\n" : "ask\n" :
shutdownMode == KApplication::ShutdownModeForceNow ? shutdownMode == TDEApplication::ShutdownModeForceNow ?
"forcenow\n" : "forcenow\n" :
shutdownMode == KApplication::ShutdownModeTryNow ? shutdownMode == TDEApplication::ShutdownModeTryNow ?
"trynow\n" : "schedule\n" ); "trynow\n" : "schedule\n" );
} }
exec( cmd.data() ); exec( cmd.data() );

10
src/dmctl.h
Unescape View File

@ -21,7 +21,7 @@
#ifndef DMCTL_H #ifndef DMCTL_H
#define DMCTL_H #define DMCTL_H
#include <kapplication.h> #include <tdeapplication.h>
struct SessEnt { struct SessEnt {
TQString display, from, user, session; TQString display, from, user, session;
@ -40,8 +40,8 @@ public:
~DM(); ~DM();
bool canShutdown(); bool canShutdown();
void shutdown( KApplication::ShutdownType shutdownType, void shutdown( TDEApplication::ShutdownType shutdownType,
KApplication::ShutdownMode shutdownMode, TDEApplication::ShutdownMode shutdownMode,
const TQString &bootOption = TQString::null ); const TQString &bootOption = TQString::null );
void setLock( bool on ); void setLock( bool on );
@ -72,8 +72,8 @@ public:
DM() {} DM() {}
bool canShutdown() { return false; } bool canShutdown() { return false; }
void shutdown( KApplication::ShutdownType shutdownType, void shutdown( TDEApplication::ShutdownType shutdownType,
KApplication::ShutdownMode shutdownMode, TDEApplication::ShutdownMode shutdownMode,
const TQString &bootOption = TQString::null ) {} const TQString &bootOption = TQString::null ) {}
void setLock( bool ) {} void setLock( bool ) {}

4
src/menu.ui
Unescape View File

@ -137,7 +137,7 @@
<string>Use this dropdown menu to change the behaviour of the list below</string> <string>Use this dropdown menu to change the behaviour of the list below</string>
</property> </property>
</widget> </widget>
<widget class="KListViewSearchLine" row="0" column="1"> <widget class="TDEListViewSearchLine" row="0" column="1">
<property name="name"> <property name="name">
<cstring>searchLine</cstring> <cstring>searchLine</cstring>
</property> </property>
@ -368,7 +368,7 @@
<layoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>tastylistview.h</includehint> <includehint>tastylistview.h</includehint>
<includehint>klistviewsearchline.h</includehint> <includehint>tdelistviewsearchline.h</includehint>
<includehint>tastylistview.h</includehint> <includehint>tastylistview.h</includehint>
<includehint>tastylistview.h</includehint> <includehint>tastylistview.h</includehint>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>

78
src/menuhandler.cpp
Unescape View File

@ -20,8 +20,8 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#include <klocale.h> #include <tdelocale.h>
#include <kmessagebox.h> #include <tdemessagebox.h>
#include <kuser.h> #include <kuser.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kmimetype.h> #include <kmimetype.h>
@ -29,7 +29,7 @@
#include <tqstyle.h> #include <tqstyle.h>
#include <tqfile.h> #include <tqfile.h>
#include <tqcursor.h> #include <tqcursor.h>
#include <kpopupmenu.h> #include <tdepopupmenu.h>
#include <kdebug.h> #include <kdebug.h>
@ -47,7 +47,7 @@ MenuHandler::MenuHandler( TQWidget *parent, Prefs *prefs, char *name, WFlags fl)
//Kicker config //Kicker config
TQString kickerConfPath = locate("config", "kickerrc"); TQString kickerConfPath = locate("config", "kickerrc");
kickerConf = new KConfig(kickerConfPath); kickerConf = new TDEConfig(kickerConfPath);
kickerConfWatch = new KDirWatch( this ); kickerConfWatch = new KDirWatch( this );
kickerConfWatch->addFile(kickerConfPath); kickerConfWatch->addFile(kickerConfPath);
@ -83,12 +83,12 @@ MenuHandler::MenuHandler( TQWidget *parent, Prefs *prefs, char *name, WFlags fl)
setupColumns(); setupColumns();
//Searchline... //Searchline...
iconLoader = KGlobal::iconLoader(); iconLoader = TDEGlobal::iconLoader();
TQPixmap icon; TQPixmap icon;
if( TQApplication::reverseLayout() ) if( TQApplication::reverseLayout() )
icon = iconLoader->loadIcon("locationbar_erase", KIcon::Small); icon = iconLoader->loadIcon("locationbar_erase", TDEIcon::Small);
else else
icon = iconLoader->loadIcon("clear_left", KIcon::Small); icon = iconLoader->loadIcon("clear_left", TDEIcon::Small);
menu->clearButton->setIconSet(icon); menu->clearButton->setIconSet(icon);
connect(menu->clearButton, SIGNAL(clicked()), menu->searchLine, SLOT (clear()) ); connect(menu->clearButton, SIGNAL(clicked()), menu->searchLine, SLOT (clear()) );
@ -108,20 +108,20 @@ MenuHandler::MenuHandler( TQWidget *parent, Prefs *prefs, char *name, WFlags fl)
menu->logoutButton->installEventFilter(this); menu->logoutButton->installEventFilter(this);
//action buttons //action buttons
icon = iconLoader->loadIcon("exit", KIcon::Toolbar); icon = iconLoader->loadIcon("system-log-out", TDEIcon::Toolbar);
menu->logoutButton->setIconSet(icon); menu->logoutButton->setIconSet(icon);
icon = iconLoader->loadIcon("lock", KIcon::Toolbar); icon = iconLoader->loadIcon("system-lock-screen", TDEIcon::Toolbar);
menu->lockButton->setIconSet(icon); menu->lockButton->setIconSet(icon);
icon = iconLoader->loadIcon("run", KIcon::Toolbar); icon = iconLoader->loadIcon("system-run", TDEIcon::Toolbar);
menu->runButton->setIconSet(icon); menu->runButton->setIconSet(icon);
icon = iconLoader->loadIcon("locationbar_erase", KIcon::Toolbar); icon = iconLoader->loadIcon("locationbar_erase", TDEIcon::Toolbar);
menu->clearRecentButton->setIconSet(icon); menu->clearRecentButton->setIconSet(icon);
setCaption("Tasty Menu"); setCaption("Tasty Menu");
setIcon(iconLoader->loadIcon("kmenu", KIcon::Panel)); setIcon(iconLoader->loadIcon("kmenu", TDEIcon::Panel));
//user icon and login //user icon and login
KUser *user = new KUser (); KUser *user = new KUser ();
@ -131,7 +131,7 @@ MenuHandler::MenuHandler( TQWidget *parent, Prefs *prefs, char *name, WFlags fl)
("data", "/home/" + loginName + "/.face.icon")); ("data", "/home/" + loginName + "/.face.icon"));
if( !userImage.isNull() ) if( !userImage.isNull() )
{ {
userImage = userImage.smoothScale (KIcon::SizeSmallMedium, KIcon::SizeSmallMedium); userImage = userImage.smoothScale (TDEIcon::SizeSmallMedium, TDEIcon::SizeSmallMedium);
menu->switchButton->setIconSet(TQPixmap(userImage)); menu->switchButton->setIconSet(TQPixmap(userImage));
} }
menu->switchButton->setText(loginName); menu->switchButton->setText(loginName);
@ -190,18 +190,18 @@ void MenuHandler::loadNewInstalledApps()
{ {
//Notification for newly installed apps //Notification for newly installed apps
xdgMenuLister = new KDirLister( ); xdgMenuLister = new KDirLister( );
KStandardDirs *standardDir=new KStandardDirs(); TDEStandardDirs *standardDir=new TDEStandardDirs();
TQStringList appDirs = standardDir->findDirs("xdgdata-apps", "."); TQStringList appDirs = standardDir->findDirs("xdgdata-apps", ".");
firstListing = 0; firstListing = 0;
for(TQStringList::Iterator it = appDirs.begin(); it != appDirs.end(); ++it) for(TQStringList::Iterator it = appDirs.begin(); it != appDirs.end(); ++it)
{ {
xdgMenuLister->openURL(*it, true); xdgMenuLister->openURL(*it, true);
/*HACK: links to kde programs are often installed in a kde subdirectory /*HACK: links to kde programs are often installed in a kde subdirectory
of one of these, so i duplicate all the entries with entry+"kde/"*/ of one of these, so i duplicate all the entries with entry+"tde/"*/
TQString appDirWithKde = (*it)+"kde/"; TQString appDirWithTde = (*it)+"tde/";
if( TQFile::exists(appDirWithKde) ) if( TQFile::exists(appDirWithTde) )
{ {
xdgMenuLister->openURL(appDirWithKde, true); xdgMenuLister->openURL(appDirWithTde, true);
firstListing++; firstListing++;
} }
} }
@ -327,13 +327,13 @@ bool MenuHandler::eventFilter( TQObject *o, TQEvent * e )
break; break;
case TQt::Key_Right: case TQt::Key_Right:
if( dynamic_cast<KListViewSearchLine *>(o) ) if( dynamic_cast<TDEListViewSearchLine *>(o) )
return false; return false;
fData->next()->setFocus(); fData->next()->setFocus();
break; break;
case TQt::Key_Left: case TQt::Key_Left:
if( dynamic_cast<KListViewSearchLine *>(o) ) if( dynamic_cast<TDEListViewSearchLine *>(o) )
return false; return false;
fData->prev()->setFocus(); fData->prev()->setFocus();
break; break;
@ -416,9 +416,9 @@ void MenuHandler::readConfig()
favouriteList = prefSkel->favouriteApps(); favouriteList = prefSkel->favouriteApps();
if( favouriteList.isEmpty() ) if( favouriteList.isEmpty() )
{ {
favouriteList.append(locate("xdgdata-apps","kde/konqbrowser.desktop")); favouriteList.append(locate("xdgdata-apps","tde/konqbrowser.desktop"));
favouriteList.append(locate("xdgdata-apps","kde/KMail.desktop")); favouriteList.append(locate("xdgdata-apps","tde/KMail.desktop"));
favouriteList.append(locate("xdgdata-apps","kde/Help.desktop")); favouriteList.append(locate("xdgdata-apps","tde/Help.desktop"));
} }
_showExpander = prefSkel->showExpander(); _showExpander = prefSkel->showExpander();
@ -466,7 +466,7 @@ void MenuHandler::readConfig()
// disconnect(menu->searchLine, 0, 0, 0); // disconnect(menu->searchLine, 0, 0, 0);
if( !_kerryIntegration && !_strigiIntegration ) if( !_kerryIntegration && !_strigiIntegration )
{ {
//menu->searchLine->setListView((KListView *)(menu->dynamicList)); //menu->searchLine->setListView((TDEListView *)(menu->dynamicList));
disconnect(menu->searchLine, SIGNAL(returnPressed( const TQString &)), disconnect(menu->searchLine, SIGNAL(returnPressed( const TQString &)),
this, SLOT (kerrySearch( const TQString &)) ); this, SLOT (kerrySearch( const TQString &)) );
disconnect(menu->searchLine, SIGNAL(returnPressed( const TQString &)), disconnect(menu->searchLine, SIGNAL(returnPressed( const TQString &)),
@ -749,7 +749,7 @@ void MenuHandler::populateList( KServiceGroup *serviceGroup, TastyListView *list
if(numChilds == 0) if(numChilds == 0)
continue; continue;
TQPixmap iconPix = iconLoader->loadIcon(g->icon(), KIcon::Toolbar,iconSize); TQPixmap iconPix = iconLoader->loadIcon(g->icon(), TDEIcon::Toolbar,iconSize);
if ( iconPix.height () != iconSize) if ( iconPix.height () != iconSize)
{ {
@ -899,7 +899,7 @@ void MenuHandler::populateList( KServiceGroup *serviceGroup, TastyListView *list
prevListItem = listItem; prevListItem = listItem;
TQPixmap iconPix = s->pixmap( KIcon::Toolbar, iconSize ); TQPixmap iconPix = s->pixmap( TDEIcon::Toolbar, iconSize );
if ( iconPix.height () != iconSize) if ( iconPix.height () != iconSize)
{ {
TQImage img = iconPix.convertToImage(); TQImage img = iconPix.convertToImage();
@ -973,7 +973,7 @@ void MenuHandler::fillRecentDocuments( )
menu->dynamicList->clear(); menu->dynamicList->clear();
setupDynList( RecentDocuments ); setupDynList( RecentDocuments );
TQStringList recentDocsList = KRecentDocument::recentDocuments(); TQStringList recentDocsList = TDERecentDocument::recentDocuments();
TastyListViewItem *listItem = NULL; TastyListViewItem *listItem = NULL;
@ -994,7 +994,7 @@ void MenuHandler::fillRecentDocuments( )
listItem->setDeskopEntryPath(*it); listItem->setDeskopEntryPath(*it);
listItem->setType( TastyListViewItem::DesktopFile ); listItem->setType( TastyListViewItem::DesktopFile );
TQPixmap iconPix = iconLoader->loadIcon(f->readIcon(), KIcon::Panel, _iconSize1); TQPixmap iconPix = iconLoader->loadIcon(f->readIcon(), TDEIcon::Panel, _iconSize1);
if ( iconPix.height () > _iconSize1) if ( iconPix.height () > _iconSize1)
{ {
TQImage img = iconPix.convertToImage(); TQImage img = iconPix.convertToImage();
@ -1041,7 +1041,7 @@ void MenuHandler::fillMoreUsed( )
listItem->setDisplaySubText(_displaySubText); listItem->setDisplaySubText(_displaySubText);
TQPixmap iconPix = s->pixmap( KIcon::Toolbar, _iconSize1 ); TQPixmap iconPix = s->pixmap( TDEIcon::Toolbar, _iconSize1 );
if( !iconPix.isNull() ) if( !iconPix.isNull() )
{ {
if ( iconPix.height () != _iconSize1) if ( iconPix.height () != _iconSize1)
@ -1090,7 +1090,7 @@ void MenuHandler::fillRecentlyUsed( )
listItem->setDisplaySubText(_displaySubText); listItem->setDisplaySubText(_displaySubText);
TQPixmap iconPix = s->pixmap( KIcon::Toolbar, _iconSize1 ); TQPixmap iconPix = s->pixmap( TDEIcon::Toolbar, _iconSize1 );
if( !iconPix.isNull() ) if( !iconPix.isNull() )
{ {
if ( iconPix.height () != _iconSize1) if ( iconPix.height () != _iconSize1)
@ -1135,7 +1135,7 @@ void MenuHandler::fillFavourites( )
listItem->setDisplaySubText(_displaySubText); listItem->setDisplaySubText(_displaySubText);
TQPixmap iconPix = s->pixmap( KIcon::Toolbar, _iconSize1 ); TQPixmap iconPix = s->pixmap( TDEIcon::Toolbar, _iconSize1 );
if ( iconPix.height () > _iconSize1) if ( iconPix.height () > _iconSize1)
{ {
TQImage img = iconPix.convertToImage(); TQImage img = iconPix.convertToImage();
@ -1214,7 +1214,7 @@ void MenuHandler::slotApplicationRemoved()
void MenuHandler::slotUpdateApplications() void MenuHandler::slotUpdateApplications()
{ {
KRun::runCommand ("kbuildsycoca"); KRun::runCommand ("tdebuildsycoca");
prefSkel->writeConfig(); prefSkel->writeConfig();
menu->rootList->clear(); menu->rootList->clear();
KServiceGroup::Ptr service = KServiceGroup::root(); KServiceGroup::Ptr service = KServiceGroup::root();
@ -1286,7 +1286,7 @@ void MenuHandler::listClicked( TastyListViewItem * listItem, const TQPoint & coo
slotUpdateApplications(); slotUpdateApplications();
} }
int started = KApplication::startServiceByDesktopPath( servicePath ); int started = TDEApplication::startServiceByDesktopPath( servicePath );
if( !started ) if( !started )
{ {
DCOPRef kickerKMenuIface ("kicker", "KMenu"); DCOPRef kickerKMenuIface ("kicker", "KMenu");
@ -1417,7 +1417,7 @@ void MenuHandler::slotContextMenu(TQListViewItem *listItem, const TQPoint &coord
if( !tastyListItem ) if( !tastyListItem )
return; return;
KPopupMenu menu(this); TDEPopupMenu menu(this);
menu.insertTitle(tastyListItem->text(c)); menu.insertTitle(tastyListItem->text(c));
if( tastyListItem->getPath() != "" ) if( tastyListItem->getPath() != "" )
@ -1489,7 +1489,7 @@ void MenuHandler::runDialog()
kdesktopKDesktopIface.call ("popupExecuteCommand()"); kdesktopKDesktopIface.call ("popupExecuteCommand()");
} }
/*Following functions are from official KDE Kmenu, Copyright 1996-2006 the kicker authors*/ /*Following functions are from official KDE KMenu, Copyright 1996-2006 the kicker authors*/
void MenuHandler::slotPopulateSessions() void MenuHandler::slotPopulateSessions()
{ {
@ -1498,7 +1498,7 @@ void MenuHandler::slotPopulateSessions()
sessionsMenu->clear(); sessionsMenu->clear();
sessionsMenu->insertItem(SmallIconSet("personal"), i18n("Edit user profile..."), 100 ); sessionsMenu->insertItem(SmallIconSet("preferences-desktop-personal"), i18n("Edit user profile..."), 100 );
sessionsMenu->insertSeparator(); sessionsMenu->insertSeparator();
//optional save/restore session entries //optional save/restore session entries
@ -1538,7 +1538,7 @@ void MenuHandler::slotSessionActivated( int ent )
{ {
case 100: case 100:
close(); close();
KRun::runCommand ("kcmshell kcm_useraccount"); KRun::runCommand ("tdecmshell kcm_useraccount");
break; break;
case 101: case 101:
{ {
@ -1595,7 +1595,7 @@ void MenuHandler::initializeSearch( const TQString & query )
if( !searchMode && query.length() > 2 ) if( !searchMode && query.length() > 2 )
{ {
if( !menu->searchLine->listView() ) if( !menu->searchLine->listView() )
menu->searchLine->setListView((KListView *)(menu->dynamicList)); menu->searchLine->setListView((TDEListView *)(menu->dynamicList));
searchMode = true; searchMode = true;
menu->menuModes->setEnabled(false); menu->menuModes->setEnabled(false);
KServiceGroup::Ptr service = KServiceGroup::root(); KServiceGroup::Ptr service = KServiceGroup::root();
@ -1647,7 +1647,7 @@ void MenuHandler::clearDynList( )
break; break;
} }
case RecentDocuments: case RecentDocuments:
KRecentDocument::clear(); TDERecentDocument::clear();
break; break;
default: default:
break; break;

16
src/menuhandler.h
Unescape View File

@ -23,13 +23,13 @@
#include <kservicegroup.h> #include <kservicegroup.h>
#include <kservice.h> #include <kservice.h>
#include <klistbox.h> #include <tdelistbox.h>
#include <klistview.h> #include <tdelistview.h>
#include <klistviewsearchline.h> #include <tdelistviewsearchline.h>
#include <kapplication.h> #include <tdeapplication.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kpushbutton.h> #include <kpushbutton.h>
#include <krecentdocument.h> #include <tderecentdocument.h>
#include <krun.h> #include <krun.h>
#include <dcopref.h> #include <dcopref.h>
#include <tqheader.h> #include <tqheader.h>
@ -40,7 +40,7 @@
#include <kdirwatch.h> #include <kdirwatch.h>
#include <kdirlister.h> #include <kdirlister.h>
#include <tqlayout.h> #include <tqlayout.h>
#include <kfileitem.h> #include <tdefileitem.h>
#include "dmctl.h" #include "dmctl.h"
#include "menu.h" #include "menu.h"
@ -97,11 +97,11 @@ private:
Menu * menu; Menu * menu;
MenuMode currentMenuMode; MenuMode currentMenuMode;
KIconLoader *iconLoader; TDEIconLoader *iconLoader;
TQPopupMenu *sessionsMenu; TQPopupMenu *sessionsMenu;
bool searchMode; bool searchMode;
Prefs *prefSkel; Prefs *prefSkel;
KConfig *kickerConf; TDEConfig *kickerConf;
KDirWatch *kickerConfWatch; KDirWatch *kickerConfWatch;
//xdgMenuWatch for applications-kmenuedit.menu xdgMenuLister for all the desktop files //xdgMenuWatch for applications-kmenuedit.menu xdgMenuLister for all the desktop files
KDirWatch *xdgMenuWatch; KDirWatch *xdgMenuWatch;

2
src/prefs.kcfgc
Unescape View File

@ -1,4 +1,4 @@
# Code generation options for kconfig_compiler # Code generation options for tdeconfig_compiler
File=tastymenu.kcfg File=tastymenu.kcfg
ClassName=Prefs ClassName=Prefs
Singleton=false Singleton=false

6
src/tastybutton.cpp
Unescape View File

@ -28,7 +28,7 @@
TastyButton::TastyButton(TQWidget *parent) TastyButton::TastyButton(TQWidget *parent)
: TQToolButton(parent) : TQToolButton(parent)
{ {
iconEffect = new KIconEffect(); iconEffect = new TDEIconEffect();
iconEffect->init(); iconEffect->init();
} }
@ -106,8 +106,8 @@ void TastyButton::drawButton( TQPainter * p )
void TastyButton::setIconSet( TQIconSet is ) void TastyButton::setIconSet( TQIconSet is )
{ {
is.setPixmap(iconEffect->apply(is.pixmap(), is.setPixmap(iconEffect->apply(is.pixmap(),
(int)KIcon::Panel, (int)TDEIcon::Panel,
(int)KIcon::ActiveState), (int)TDEIcon::ActiveState),
TQIconSet::Automatic, TQIconSet::Automatic,
TQIconSet::Active); TQIconSet::Active);

2
src/tastybutton.h
Unescape View File

@ -42,7 +42,7 @@ protected:
private: private:
TQPixmap highLightedIcon; TQPixmap highLightedIcon;
KIconEffect *iconEffect; TDEIconEffect *iconEffect;
}; };

46
src/tastylistview.cpp
Unescape View File

@ -22,18 +22,18 @@
#include "tastylistview.h" #include "tastylistview.h"
#include "misc.h" #include "misc.h"
#include <kdeversion.h> #include <tdeversion.h>
#include <kstringhandler.h> #include <kstringhandler.h>
#include <tqimage.h> #include <tqimage.h>
#include <tqpainter.h> #include <tqpainter.h>
#include <tqheader.h> #include <tqheader.h>
#include <klocale.h> #include <tdelocale.h>
#include <kurldrag.h> #include <kurldrag.h>
#include <tqapplication.h> #include <tqapplication.h>
TastyListView::TastyListView( TQWidget * parent, const char * name) TastyListView::TastyListView( TQWidget * parent, const char * name)
: KListView(parent, name), highLightGroups(true), easyOpen(true) : TDEListView(parent, name), highLightGroups(true), easyOpen(true)
{ {
onItemTimer = new TQTimer(this, "onItemTimer"); onItemTimer = new TQTimer(this, "onItemTimer");
@ -101,12 +101,12 @@ void TastyListView::contentsMouseReleaseEvent( TQMouseEvent * e )
oldOpenItem->repaint(); oldOpenItem->repaint();
} }
KListView::contentsMouseReleaseEvent(e); TDEListView::contentsMouseReleaseEvent(e);
} }
void TastyListView::contentsMouseMoveEvent( TQMouseEvent * e ) void TastyListView::contentsMouseMoveEvent( TQMouseEvent * e )
{ {
KListView::contentsMouseMoveEvent(e); TDEListView::contentsMouseMoveEvent(e);
mouseDown = (e->state() & TQt::LeftButton); mouseDown = (e->state() & TQt::LeftButton);
if( itemAt( contentsToViewport(TQPoint(e->x(), e->y()))) == 0 ) if( itemAt( contentsToViewport(TQPoint(e->x(), e->y()))) == 0 )
@ -115,7 +115,7 @@ void TastyListView::contentsMouseMoveEvent( TQMouseEvent * e )
void TastyListView::leaveEvent( TQEvent * e ) void TastyListView::leaveEvent( TQEvent * e )
{ {
KListView::leaveEvent( e ); TDEListView::leaveEvent( e );
onItemTimer->stop(); onItemTimer->stop();
if( openItem ) if( openItem )
setCurrentItem( openItem ); setCurrentItem( openItem );
@ -154,7 +154,7 @@ void TastyListView::keyPressEvent( TQKeyEvent * e )
case TQt::Key_Up: case TQt::Key_Up:
case TQt::Key_Down: case TQt::Key_Down:
KListView::keyPressEvent( e ); TDEListView::keyPressEvent( e );
break; break;
case TQt::Key_Right: case TQt::Key_Right:
@ -204,7 +204,7 @@ void TastyListView::keyPressEvent( TQKeyEvent * e )
break; break;
} }
case TQt::Key_Tab: case TQt::Key_Tab:
KListView::keyPressEvent( e ); TDEListView::keyPressEvent( e );
break; break;
default: default:
@ -323,27 +323,27 @@ void TastyListViewToolTip::maybeTip( const TQPoint &pos )
///////////TASTYLISTVIEWITEM ///////////TASTYLISTVIEWITEM
TastyListViewItem::TastyListViewItem( TastyListView * parent ) TastyListViewItem::TastyListViewItem( TastyListView * parent )
: KListViewItem(parent) : TDEListViewItem(parent)
{commonConstructor();} {commonConstructor();}
TastyListViewItem::TastyListViewItem( TastyListViewItem * parent ) TastyListViewItem::TastyListViewItem( TastyListViewItem * parent )
: KListViewItem(parent) : TDEListViewItem(parent)
{commonConstructor();} {commonConstructor();}
TastyListViewItem::TastyListViewItem( TastyListView * parent, TastyListViewItem * after, TQString label1 ) TastyListViewItem::TastyListViewItem( TastyListView * parent, TastyListViewItem * after, TQString label1 )
: KListViewItem(parent, after, label1) : TDEListViewItem(parent, after, label1)
{commonConstructor();cellText = label1;} {commonConstructor();cellText = label1;}
TastyListViewItem::TastyListViewItem( TastyListViewItem * parent, TastyListViewItem * after, TQString label1 ) TastyListViewItem::TastyListViewItem( TastyListViewItem * parent, TastyListViewItem * after, TQString label1 )
: KListViewItem(parent, after, label1) : TDEListViewItem(parent, after, label1)
{commonConstructor();cellText = label1;} {commonConstructor();cellText = label1;}
TastyListViewItem::TastyListViewItem( TastyListView * parent, TQString label1 ) TastyListViewItem::TastyListViewItem( TastyListView * parent, TQString label1 )
: KListViewItem(parent, label1) : TDEListViewItem(parent, label1)
{commonConstructor();cellText = label1;} {commonConstructor();cellText = label1;}
TastyListViewItem::TastyListViewItem( TastyListViewItem * parent, TQString label1 ) TastyListViewItem::TastyListViewItem( TastyListViewItem * parent, TQString label1 )
: KListViewItem(parent, label1) : TDEListViewItem(parent, label1)
{commonConstructor();cellText = label1;} {commonConstructor();cellText = label1;}
TastyListViewItem::~TastyListViewItem() TastyListViewItem::~TastyListViewItem()
@ -372,7 +372,7 @@ void TastyListViewItem::commonConstructor()
void TastyListViewItem::loadPixmap() void TastyListViewItem::loadPixmap()
{ {
TQString iconFile = ""; TQString iconFile = "";
iconLoader = KGlobal::iconLoader(); iconLoader = TDEGlobal::iconLoader();
if( !listView() ) if( !listView() )
return; return;
@ -384,26 +384,26 @@ void TastyListViewItem::loadPixmap()
switch( actionType ) switch( actionType )
{ {
case AddBookMark: case AddBookMark:
actionPix = iconLoader->loadIcon("bookmark_add", KIcon::Small, lv->getActionIconSize()); actionPix = iconLoader->loadIcon("bookmark_add", TDEIcon::Small, lv->getActionIconSize());
break; break;
case RemoveBookMark: case RemoveBookMark:
actionPix = iconLoader->loadIcon("remove", KIcon::Small, lv->getActionIconSize()); actionPix = iconLoader->loadIcon("remove", TDEIcon::Small, lv->getActionIconSize());
break; break;
case OpenGroup: case OpenGroup:
if( TQApplication::reverseLayout() ) if( TQApplication::reverseLayout() )
actionPix = iconLoader->loadIcon("1leftarrow", KIcon::Small, lv->getActionIconSize()); actionPix = iconLoader->loadIcon("1leftarrow", TDEIcon::Small, lv->getActionIconSize());
else else
actionPix = iconLoader->loadIcon("1rightarrow", KIcon::Small, lv->getActionIconSize()); actionPix = iconLoader->loadIcon("1rightarrow", TDEIcon::Small, lv->getActionIconSize());
break; break;
case Expand: case Expand:
actionPix = iconLoader->loadIcon("1downarrow", KIcon::Small, lv->getActionIconSize()); actionPix = iconLoader->loadIcon("1downarrow", TDEIcon::Small, lv->getActionIconSize());
break; break;
case Collapse: case Collapse:
actionPix = iconLoader->loadIcon("1uparrow", KIcon::Small, lv->getActionIconSize()); actionPix = iconLoader->loadIcon("1uparrow", TDEIcon::Small, lv->getActionIconSize());
break; break;
default: default:
@ -437,7 +437,7 @@ TQString TastyListViewItem::key( int column, bool ascending ) const
void TastyListViewItem::setup ( ) void TastyListViewItem::setup ( )
{ {
//KListViewItem::setup(); //TDEListViewItem::setup();
//calculate listitem height //calculate listitem height
TQFontMetrics fm( listView()->font() ); TQFontMetrics fm( listView()->font() );
@ -466,7 +466,7 @@ void TastyListViewItem::paintCell ( TQPainter * p, const TQColorGroup & cg, int
TQColor fillColor, textColor; TQColor fillColor, textColor;
# if KDE_VERSION < KDE_MAKE_VERSION(3,3,91) # if TDE_VERSION < TDE_MAKE_VERSION(3,3,91)
# define BackgroundColor backgroundColor() # define BackgroundColor backgroundColor()
# else # else
# define BackgroundColor backgroundColor(0) # define BackgroundColor backgroundColor(0)

20
src/tastylistview.h
Unescape View File

@ -22,7 +22,7 @@
#ifndef TASTYLISTVIEW_H #ifndef TASTYLISTVIEW_H
#define TASTYLISTVIEW_H #define TASTYLISTVIEW_H
#include <klistview.h> #include <tdelistview.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kservice.h> #include <kservice.h>
#include <kservicegroup.h> #include <kservicegroup.h>
@ -53,7 +53,7 @@ class TastyListViewToolTip: public TQToolTip
/** /**
@author Marco Martin <notmart@gmail.com> @author Marco Martin <notmart@gmail.com>
*/ */
class TastyListView : public KListView class TastyListView : public TDEListView
{ {
Q_OBJECT Q_OBJECT
private: private:
@ -88,7 +88,7 @@ public:
void setOpenItem( TQListViewItem * listItem ){openItem = listItem;} void setOpenItem( TQListViewItem * listItem ){openItem = listItem;}
public slots: public slots:
virtual void clear(){openItem = underCursorItem = NULL; KListView::clear();} virtual void clear(){openItem = underCursorItem = NULL; TDEListView::clear();}
protected: protected:
@ -112,7 +112,7 @@ signals:
/** /**
@author Marco Martin <notmart@gmail.com> @author Marco Martin <notmart@gmail.com>
*/ */
class TastyListViewItem : public KListViewItem class TastyListViewItem : public TDEListViewItem
{ {
//Q_OBJECT //Q_OBJECT
friend class TastyListView; friend class TastyListView;
@ -174,10 +174,10 @@ friend class TastyListView;
x < lv->header()->sectionPos( lv->header()->mapToIndex( 0 ) ) );} x < lv->header()->sectionPos( lv->header()->mapToIndex( 0 ) ) );}
void setSubText(TQString text) //FIXME: add the column void setSubText(TQString text) //FIXME: add the column
{if(cellText.isEmpty())cellText=KListViewItem::text(0); {if(cellText.isEmpty())cellText=TDEListViewItem::text(0);
KListViewItem::setText(0,cellText+text);subText = TQString(text);} TDEListViewItem::setText(0,cellText+text);subText = TQString(text);}
void setText(int column, const TQString & text ) void setText(int column, const TQString & text )
{KListViewItem::setText(column, cellText+text); cellText = text;} {TDEListViewItem::setText(column, cellText+text); cellText = text;}
void setDisplaySubText( bool display ){ displaySubText = display; } void setDisplaySubText( bool display ){ displaySubText = display; }
bool hasEllipsis(){return ellipsis;} bool hasEllipsis(){return ellipsis;}
@ -192,9 +192,9 @@ friend class TastyListView;
int width( const TQFontMetrics & fm, const TQListView * lv, int c ) int width( const TQFontMetrics & fm, const TQListView * lv, int c )
{ TastyListView *tlv = dynamic_cast<TastyListView *>( listView() ); { TastyListView *tlv = dynamic_cast<TastyListView *>( listView() );
if( tlv ) if( tlv )
return KListViewItem::width(fm, lv, c) + tlv->getActionIconSpace(); return TDEListViewItem::width(fm, lv, c) + tlv->getActionIconSpace();
else else
return KListViewItem::width(fm, lv, c); return TDEListViewItem::width(fm, lv, c);
} }
protected: protected:
@ -214,7 +214,7 @@ private:
bool highLight; bool highLight;
bool displaySubText; bool displaySubText;
TQPixmap actionPix; TQPixmap actionPix;
KIconLoader *iconLoader; TDEIconLoader *iconLoader;
void commonConstructor(); void commonConstructor();
//a tiny reimplementation of max... //a tiny reimplementation of max...

72
src/tastymenu.cpp
Unescape View File

@ -20,15 +20,15 @@
***************************************************************************/ ***************************************************************************/
#include <kglobal.h> #include <tdeglobal.h>
#include <klocale.h> #include <tdelocale.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kapplication.h> #include <tdeapplication.h>
#include <kmessagebox.h> #include <tdemessagebox.h>
#include <kconfigdialog.h> #include <tdeconfigdialog.h>
#include <kaboutdata.h> #include <tdeaboutdata.h>
#include <kaboutapplication.h> #include <tdeaboutapplication.h>
#include <kpopupmenu.h> #include <tdepopupmenu.h>
#include <kkeydialog.h> #include <kkeydialog.h>
#include <kuser.h> #include <kuser.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
@ -51,7 +51,7 @@ TastyMenu::TastyMenu(const TQString& configFile, Type type, int actions, TQWidge
prefSkel = new Prefs(kConfig); prefSkel = new Prefs(kConfig);
prefSkel->readConfig(); prefSkel->readConfig();
kickerConf = KGlobal::config(); kickerConf = TDEGlobal::config();
kickerConf->setGroup("buttons"); kickerConf->setGroup("buttons");
_showBigToolTip = kickerConf->readBoolEntry("EnableIconZoom", true); _showBigToolTip = kickerConf->readBoolEntry("EnableIconZoom", true);
@ -80,12 +80,12 @@ TastyMenu::TastyMenu(const TQString& configFile, Type type, int actions, TQWidge
if( !_toolTipTitle.isEmpty() ) if( !_toolTipTitle.isEmpty() )
menuTip->setTitle(_toolTipTitle); menuTip->setTitle(_toolTipTitle);
if( height() >= KIcon::SizeMedium ) if( height() >= TDEIcon::SizeMedium )
button->setUsesBigPixmap(true); button->setUsesBigPixmap(true);
else else
button->setUsesBigPixmap(false); button->setUsesBigPixmap(false);
iconLoader = KGlobal::iconLoader(); iconLoader = TDEGlobal::iconLoader();
loadMenuButtonIcon(); loadMenuButtonIcon();
@ -108,7 +108,7 @@ TastyMenu::TastyMenu(const TQString& configFile, Type type, int actions, TQWidge
TastyMenu::~TastyMenu() TastyMenu::~TastyMenu()
{ {
//delete prefSkel; //delete prefSkel;
KGlobal::locale()->removeCatalogue("tastymenu"); TDEGlobal::locale()->removeCatalogue("tastymenu");
} }
void TastyMenu::loadMenuButtonIcon() void TastyMenu::loadMenuButtonIcon()
@ -129,13 +129,13 @@ void TastyMenu::loadMenuButtonIcon()
else if(position() == pLeft || position() == pRight) else if(position() == pLeft || position() == pRight)
_iconsize = width(); _iconsize = width();
TQPixmap btnPixmap(iconLoader->loadIcon(_menuButtonIcon, KIcon::Panel, _iconsize)); TQPixmap btnPixmap(iconLoader->loadIcon(_menuButtonIcon, TDEIcon::Panel, _iconsize));
if( !btnPixmap.isNull() ) if( !btnPixmap.isNull() )
button->setIconSet(btnPixmap); button->setIconSet(btnPixmap);
else else
{ {
kdDebug() << "Failed to load custom icon" << endl; kdDebug() << "Failed to load custom icon" << endl;
button->setIconSet(iconLoader->loadIcon("kmenu", KIcon::Panel, height())); button->setIconSet(iconLoader->loadIcon("kmenu", TDEIcon::Panel, height()));
} }
} }
@ -180,11 +180,11 @@ void TastyMenu::clickSlot()
void TastyMenu::about() void TastyMenu::about()
{ {
KAboutData data("tastymenu", TDEAboutData data("tastymenu",
I18N_NOOP("Tasty Menu"), I18N_NOOP("Tasty Menu"),
"1.0.6", "1.0.6",
I18N_NOOP("KMenu replacement"), I18N_NOOP("TMenu replacement"),
KAboutData::License_LGPL_V2, TDEAboutData::License_LGPL_V2,
"(c) 2006-2007, Marco Martin",0,0,"mart@notmart.org"); "(c) 2006-2007, Marco Martin",0,0,"mart@notmart.org");
data.addAuthor("Marco Martin", data.addAuthor("Marco Martin",
@ -225,7 +225,7 @@ void TastyMenu::about()
data.addCredit("Oswald Buddenhagen and Stephan Kulow", data.addCredit("Oswald Buddenhagen and Stephan Kulow",
I18N_NOOP("For the Switch user code from KDM"), I18N_NOOP("For the Switch user code from TDM"),
"ossi@kde.org and coolo@kde.org"); "ossi@kde.org and coolo@kde.org");
data.addCredit("The whole KBFX team", data.addCredit("The whole KBFX team",
@ -236,34 +236,34 @@ void TastyMenu::about()
I18N_NOOP("For some code taken from Amarok's statistics list view"), I18N_NOOP("For some code taken from Amarok's statistics list view"),
"me@sebruiz.net"); "me@sebruiz.net");
KIconLoader *iconLoader = KGlobal::iconLoader(); TDEIconLoader *iconLoader = TDEGlobal::iconLoader();
data.setProgramLogo(iconLoader->loadIcon("kmenu", KIcon::Panel).convertToImage()); data.setProgramLogo(iconLoader->loadIcon("kmenu", TDEIcon::Panel).convertToImage());
KAboutApplication dialog(&data); TDEAboutApplication dialog(&data);
dialog.exec(); dialog.exec();
} }
void TastyMenu::help() void TastyMenu::help()
{ {
KApplication::kdeinitExec("khelpcenter", "help:/tastymenu"); TDEApplication::tdeinitExec("khelpcenter", "help:/tastymenu");
} }
void TastyMenu::preferences() void TastyMenu::preferences()
{ {
if(KConfigDialog::showDialog("settings")) if(TDEConfigDialog::showDialog("settings"))
return; return;
Appearance *appearanceDialog = new Appearance(0, "appearance" ); Appearance *appearanceDialog = new Appearance(0, "appearance" );
Behaviour *behaviourDialog = new Behaviour(0, "behaviour" ); Behaviour *behaviourDialog = new Behaviour(0, "behaviour" );
KConfigDialog *dialog = new KConfigDialog(this, "settings", prefSkel, TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", prefSkel,
KDialogBase::Tabbed, KDialogBase::Tabbed,
KConfigDialog::Default| TDEConfigDialog::Default|
KConfigDialog::Ok| TDEConfigDialog::Ok|
KConfigDialog::Apply| TDEConfigDialog::Apply|
KConfigDialog::Cancel ); TDEConfigDialog::Cancel );
dialog->addPage(appearanceDialog, i18n("Appearance"), "appearance" ); dialog->addPage(appearanceDialog, i18n("Appearance"), "appearance" );
dialog->addPage(behaviourDialog, i18n("Behaviour"), "behaviour" ); dialog->addPage(behaviourDialog, i18n("Behaviour"), "behaviour" );
connect( dialog, SIGNAL(settingsChanged()), connect( dialog, SIGNAL(settingsChanged()),
@ -273,7 +273,7 @@ void TastyMenu::preferences()
void TastyMenu::setGlobalAccel( bool global ) void TastyMenu::setGlobalAccel( bool global )
{ {
globalAccel = new KGlobalAccel(this); globalAccel = new TDEGlobalAccel(this);
globalAccel->insert("Toggle Tasty Menu", i18n("Toggle Tasty Menu"), globalAccel->insert("Toggle Tasty Menu", i18n("Toggle Tasty Menu"),
i18n("Toggle Tasty Menu"), i18n("Toggle Tasty Menu"),
0, 0, this, SLOT(clickSlot())); 0, 0, this, SLOT(clickSlot()));
@ -284,14 +284,14 @@ void TastyMenu::setGlobalAccel( bool global )
if( global ) if( global )
{ {
if( !kickerConf ) if( !kickerConf )
kickerConf = KGlobal::config(); kickerConf = TDEGlobal::config();
kickerConf->setGroup("Global Shortcuts"); kickerConf->setGroup("Global Shortcuts");
TQString kmenuShortcut = kickerConf->readEntry("Popup Launch Menu", "default(Alt+F1)"); TQString kmenuShortcut = kickerConf->readEntry("Popup Launch Menu", "default(Alt+F1)");
if( kmenuShortcut=="none" ) if( kmenuShortcut=="none" )
return; return;
TQString tastyMenuShortcut = kickerConf->readEntry("Toggle Tasty Menu", ""); TQString tastyMenuShortcut = kickerConf->readEntry("Toggle Tasty Menu", "");
KShortcut shortCutKey(tastyMenuShortcut); TDEShortcut shortCutKey(tastyMenuShortcut);
kickerConf->writeEntry("Popup Launch Menu", "none"); kickerConf->writeEntry("Popup Launch Menu", "none");
kickerConf->writeEntry("Toggle Tasty Menu", kmenuShortcut); kickerConf->writeEntry("Toggle Tasty Menu", kmenuShortcut);
kickerConf->sync(); kickerConf->sync();
@ -300,7 +300,7 @@ void TastyMenu::setGlobalAccel( bool global )
else else
{ {
if( !kickerConf ) if( !kickerConf )
kickerConf = KGlobal::config(); kickerConf = TDEGlobal::config();
kickerConf->setGroup("Global Shortcuts"); kickerConf->setGroup("Global Shortcuts");
kickerConf->deleteEntry("Popup Launch Menu"); kickerConf->deleteEntry("Popup Launch Menu");
kickerConf->sync(); kickerConf->sync();
@ -396,7 +396,7 @@ void TastyMenu::resizeEvent(TQResizeEvent *e)
button->setFixedHeight(newHeight); button->setFixedHeight(newHeight);
button->setFixedWidth(e->size().width()); button->setFixedWidth(e->size().width());
if( newHeight >= KIcon::SizeMedium ) if( newHeight >= TDEIcon::SizeMedium )
button->setUsesBigPixmap(true); button->setUsesBigPixmap(true);
else else
button->setUsesBigPixmap(false); button->setUsesBigPixmap(false);
@ -411,7 +411,7 @@ void TastyMenu::mousePressEvent(TQMouseEvent *e)
if(e->button()==RightButton) if(e->button()==RightButton)
{ {
KPopupMenu menu(this); TDEPopupMenu menu(this);
menu.insertTitle("Tasty Menu"); menu.insertTitle("Tasty Menu");
menu.insertItem(SmallIcon("kmenu"), i18n("&About"), 1); menu.insertItem(SmallIcon("kmenu"), i18n("&About"), 1);
@ -484,7 +484,7 @@ extern "C"
{ {
KPanelApplet* init( TQWidget *parent, const TQString& configFile) KPanelApplet* init( TQWidget *parent, const TQString& configFile)
{ {
KGlobal::locale()->insertCatalogue("tastymenu"); TDEGlobal::locale()->insertCatalogue("tastymenu");
return new TastyMenu(configFile, KPanelApplet::Normal, return new TastyMenu(configFile, KPanelApplet::Normal,
KPanelApplet::About | KPanelApplet::Help | KPanelApplet::Preferences, KPanelApplet::About | KPanelApplet::Help | KPanelApplet::Preferences,
parent, "tastymenu"); parent, "tastymenu");

6
src/tastymenu.desktop
Unescape View File

@ -1,10 +1,10 @@
[Desktop Entry] [Desktop Entry]
Type=Plugin Type=Plugin
Encoding=UTF-8 Encoding=UTF-8
Comment=A KMenu replacement Comment=A TMenu replacement
Name=Tasty Menu Name=Tasty Menu
Icon=kmenu Icon=kmenu
X-KDE-Library=tastymenu_panelapplet X-TDE-Library=tastymenu_panelapplet
X-KDE-UniqueApplet = false X-TDE-UniqueApplet = false

12
src/tastymenu.h
Unescape View File

@ -30,9 +30,9 @@
#include <kpanelapplet.h> #include <kpanelapplet.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <tqstring.h> #include <tqstring.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <tqpopupmenu.h> #include <tqpopupmenu.h>
#include <kconfigskeleton.h> #include <tdeconfigskeleton.h>
#include <kglobalaccel.h> #include <kglobalaccel.h>
#include <tqpainter.h> #include <tqpainter.h>
@ -132,15 +132,15 @@ protected:
virtual void leaveEvent( TQEvent * e ); virtual void leaveEvent( TQEvent * e );
private: private:
KSharedConfig *kConfig; TDESharedConfig *kConfig;
Prefs *prefSkel; Prefs *prefSkel;
KConfig *kickerConf; TDEConfig *kickerConf;
MenuHandler *menuHandler; MenuHandler *menuHandler;
TastyButton *button; TastyButton *button;
TastyToolTip *menuTip; TastyToolTip *menuTip;
TQPoint menupos(TQWidget *widget); TQPoint menupos(TQWidget *widget);
KGlobalAccel *globalAccel; TDEGlobalAccel *globalAccel;
KIconLoader *iconLoader; TDEIconLoader *iconLoader;
int numNewApplications; int numNewApplications;

4
src/tastymenu.lsm
Unescape View File

@ -3,7 +3,7 @@ Title: TastyMenu -- Some description
Version: 0.1 Version: 0.1
Entered-date: Entered-date:
Description: Description:
Keywords: KDE Qt Keywords: TDE TQt
Author: Marco Martin <notmart@gmail.com> Author: Marco Martin <notmart@gmail.com>
Maintained-by: Marco Martin <notmart@gmail.com> Maintained-by: Marco Martin <notmart@gmail.com>
Home-page: Home-page:
@ -11,6 +11,6 @@ Alternate-site:
Primary-site: ftp://ftp.kde.org/pub/kde/unstable/apps/utils Primary-site: ftp://ftp.kde.org/pub/kde/unstable/apps/utils
xxxxxx tastymenu-0.1.tar.gz xxxxxx tastymenu-0.1.tar.gz
xxx tastymenu-0.1.lsm xxx tastymenu-0.1.lsm
Platform: Linux. Needs KDE Platform: Linux. Needs TDE
Copying-policy: GPL Copying-policy: GPL
End End

10
src/tastytooltip.cpp
Unescape View File

@ -39,15 +39,15 @@ TastyToolTip::TastyToolTip( TQWidget * parent,const char * name, WFlags fl)
void TastyToolTip::loadIcon( TQString icon ) void TastyToolTip::loadIcon( TQString icon )
{ {
iconName = icon; iconName = icon;
KIconLoader *iconLoader = KGlobal::iconLoader(); TDEIconLoader *iconLoader = TDEGlobal::iconLoader();
TQPixmap btnPixmap(iconLoader->loadIcon(icon, KIcon::Panel, KIcon::SizeHuge)); TQPixmap btnPixmap(iconLoader->loadIcon(icon, TDEIcon::Panel, TDEIcon::SizeHuge));
if( !btnPixmap.isNull() ) if( !btnPixmap.isNull() )
toolTipWidget->iconPixmap->setPixmap(btnPixmap); toolTipWidget->iconPixmap->setPixmap(btnPixmap);
else else
{ {
kdDebug() << "Failed to load custom icon" << endl; kdDebug() << "Failed to load custom icon" << endl;
toolTipWidget->iconPixmap->setPixmap(iconLoader->loadIcon("kmenu", KIcon::Panel, KIcon::SizeHuge)); toolTipWidget->iconPixmap->setPixmap(iconLoader->loadIcon("kmenu", TDEIcon::Panel, TDEIcon::SizeHuge));
} }
} }
@ -83,11 +83,11 @@ void TastyToolTip::notify(const TQPoint & point )
void TastyToolTip::setMessage( TQString message ) void TastyToolTip::setMessage( TQString message )
{ {
KIconLoader *iconLoader = KGlobal::iconLoader(); TDEIconLoader *iconLoader = TDEGlobal::iconLoader();
toolTipWidget->MessageLabel->setText(message); toolTipWidget->MessageLabel->setText(message);
if( message.length() > 0 ) if( message.length() > 0 )
toolTipWidget->iconPixmap->setPixmap(iconLoader->loadIcon("messagebox_info", KIcon::Panel, KIcon::SizeHuge)); toolTipWidget->iconPixmap->setPixmap(iconLoader->loadIcon("messagebox_info", TDEIcon::Panel, TDEIcon::SizeHuge));
else else
loadIcon(iconName); loadIcon(iconName);
} }

8
tastymenu.spec
Unescape View File

@ -1,6 +1,6 @@
%define version 1.0.7 %define version 1.0.7
%define name tastymenu %define name tastymenu
%define prefix %(kde-config --prefix) %define prefix %(tde-config --prefix)
Name: %{name} Name: %{name}
Version: %{version} Version: %{version}
@ -8,14 +8,14 @@ Release: 1
Vendor: notmart@gmail.com Vendor: notmart@gmail.com
Url: http://kdelook.org/content/show.php?content=27968 Url: http://kdelook.org/content/show.php?content=27968
License: GPL License: GPL
Summary: A Kmenu replacement Summary: A TMenu replacement
Group: System/GUI/KDE Group: System/GUI/TDE
Packager: Marco Martin <notmart@gmail.com> Packager: Marco Martin <notmart@gmail.com>
BuildRoot: %{_tmppath}/%{name}-root BuildRoot: %{_tmppath}/%{name}-root
Source: %{name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.bz2
%description %description
Tasty Menu is a KMenu replacement aiming to provide the maximum usability, or at least to be a testbed for usability concepts and ideas for a future KDE menu. Tasty Menu is a TMenu replacement aiming to provide the maximum usability, or at least to be a testbed for usability concepts and ideas for a future KDE menu.
%prep %prep
%setup %setup

Write Preview
Loading…
Cancel
Save