Browse Source

Initial TDE conversion

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Slávek Banko 3 years ago
parent
commit
ba407974cb
31 changed files with 251 additions and 251 deletions
  1. 3
    3
      doc/en/index.docbook
  2. 8
    8
      po/de.po
  3. 8
    8
      po/es.po
  4. 8
    8
      po/fi.po
  5. 8
    8
      po/fr.po
  6. 8
    8
      po/it.po
  7. 8
    8
      po/pl.po
  8. 8
    8
      po/pt_BR.po
  9. 8
    8
      po/ru.po
  10. 5
    5
      po/sl.po
  11. 4
    4
      po/tastymenu.pot
  12. 8
    8
      po/uk.po
  13. 1
    1
      src/Makefile.am
  14. 2
    2
      src/appearance.ui
  15. 1
    1
      src/behaviour.ui
  16. 15
    15
      src/dmctl.cpp
  17. 5
    5
      src/dmctl.h
  18. 2
    2
      src/menu.ui
  19. 39
    39
      src/menuhandler.cpp
  20. 8
    8
      src/menuhandler.h
  21. 1
    1
      src/prefs.kcfgc
  22. 3
    3
      src/tastybutton.cpp
  23. 1
    1
      src/tastybutton.h
  24. 23
    23
      src/tastylistview.cpp
  25. 10
    10
      src/tastylistview.h
  26. 36
    36
      src/tastymenu.cpp
  27. 3
    3
      src/tastymenu.desktop
  28. 6
    6
      src/tastymenu.h
  29. 2
    2
      src/tastymenu.lsm
  30. 5
    5
      src/tastytooltip.cpp
  31. 4
    4
      tastymenu.spec

+ 3
- 3
doc/en/index.docbook View File

@@ -65,7 +65,7 @@ Do NOT change these in the translation. -->
65 65
 
66 66
 <abstract>
67 67
 <para>
68
-&tastymenu; is a KMenu replacement
68
+&tastymenu; is a TMenu replacement
69 69
 </para>
70 70
 </abstract>
71 71
 
@@ -100,7 +100,7 @@ problems. Basically a long version of the abstract.  Don't include a
100 100
 revision history. (see installation appendix comment) -->
101 101
 
102 102
 <para>
103
-&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.
103
+&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.
104 104
 </para>
105 105
 </chapter>
106 106
 
@@ -135,7 +135,7 @@ patent issues. -->
135 135
  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.
136 136
 </para>
137 137
 <para>
138
-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.
138
+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.
139 139
 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.
140 140
 </para>
141 141
 <para>

+ 8
- 8
po/de.po View File

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

+ 8
- 8
po/es.po View File

@@ -137,12 +137,12 @@ msgstr ""
137 137
 #: appearance.cpp:293 rc.cpp:226
138 138
 #, no-c-format
139 139
 msgid ""
140
-"What icon should be displayed in the kicker button instead of the KMenu "
140
+"What icon should be displayed in the kicker button instead of the TMenu "
141 141
 "one.\n"
142 142
 "Empty means default."
143 143
 msgstr ""
144 144
 "Icono que debe de ser mostrado en Kicker en lugar del botón por defecto de "
145
-"KMenu.<br>Vacio pone el botón por defecto."
145
+"TMenu.<br>Vacio pone el botón por defecto."
146 146
 
147 147
 #. i18n: file ./appearance.ui line 262
148 148
 #: appearance.cpp:295 rc.cpp:230
@@ -275,10 +275,10 @@ msgstr "&Capturar el acceso rápido Alt+F1 (necesita reiniciar kicker)"
275 275
 #: behaviour.cpp:118 rc.cpp:99
276 276
 #, no-c-format
277 277
 msgid ""
278
-"Pops up Tasty Menu instead of KMenu when the shortcut sequence Alt+F1 is "
278
+"Pops up Tasty Menu instead of TMenu when the shortcut sequence Alt+F1 is "
279 279
 "pressed"
280 280
 msgstr ""
281
-"Muestra Tasty Menu en lugar del KMenu cuando el acceso rápido Alt+F1 es "
281
+"Muestra Tasty Menu en lugar del TMenu cuando el acceso rápido Alt+F1 es "
282 282
 "pulsada"
283 283
 
284 284
 #. i18n: file ./behaviour.ui line 91
@@ -690,8 +690,8 @@ msgid "Menu"
690 690
 msgstr "Menú"
691 691
 
692 692
 #: tastymenu.cpp:186
693
-msgid "KMenu replacement"
694
-msgstr "Reemplazo del KMenu"
693
+msgid "TMenu replacement"
694
+msgstr "Reemplazo del TMenu"
695 695
 
696 696
 #: tastymenu.cpp:191
697 697
 msgid "Maintainer"
@@ -745,8 +745,8 @@ msgid "For the Polish translation"
745 745
 msgstr "Por la traducción al Ruso"
746 746
 
747 747
 #: tastymenu.cpp:225
748
-msgid "For the Switch user code from KDM"
749
-msgstr "Por el código de cambiar usuario del KDM"
748
+msgid "For the Switch user code from TDM"
749
+msgstr "Por el código de cambiar usuario del TDM"
750 750
 
751 751
 #: tastymenu.cpp:229
752 752
 msgid "For some inspirations here and there."

+ 8
- 8
po/fi.po View File

@@ -132,11 +132,11 @@ msgstr "Alt-I"
132 132
 #: appearance.cpp:293 rc.cpp:226
133 133
 #, no-c-format
134 134
 msgid ""
135
-"What icon should be displayed in the kicker button instead of the KMenu "
135
+"What icon should be displayed in the kicker button instead of the TMenu "
136 136
 "one.\n"
137 137
 "Empty means default."
138 138
 msgstr ""
139
-"Mikä kuvake näytetään Kicker-painikkeessa KMenun sijaan.\n"
139
+"Mikä kuvake näytetään Kicker-painikkeessa TMenun sijaan.\n"
140 140
 "Tyhjä tarkoittaa käytä oletusta."
141 141
 
142 142
 #. i18n: file ./appearance.ui line 262
@@ -270,10 +270,10 @@ msgstr "&Ohita Alt-F1-pikanäppäin (vaatii Kickerin uudelleenkäynnistystä)"
270 270
 #: behaviour.cpp:118 rc.cpp:99
271 271
 #, no-c-format
272 272
 msgid ""
273
-"Pops up Tasty Menu instead of KMenu when the shortcut sequence Alt+F1 is "
273
+"Pops up Tasty Menu instead of TMenu when the shortcut sequence Alt+F1 is "
274 274
 "pressed"
275 275
 msgstr ""
276
-"Näyttää Tasty Menun KMenun sijaan Alt-F1-pikanäppäintä painettaessa"
276
+"Näyttää Tasty Menun TMenun sijaan Alt-F1-pikanäppäintä painettaessa"
277 277
 
278 278
 #. i18n: file ./behaviour.ui line 91
279 279
 #: behaviour.cpp:119 rc.cpp:102
@@ -679,8 +679,8 @@ msgid "Menu"
679 679
 msgstr "Valikko"
680 680
 
681 681
 #: tastymenu.cpp:186
682
-msgid "KMenu replacement"
683
-msgstr "KMenun korvaaja"
682
+msgid "TMenu replacement"
683
+msgstr "TMenun korvaaja"
684 684
 
685 685
 #: tastymenu.cpp:191
686 686
 msgid "Maintainer"
@@ -732,8 +732,8 @@ msgid "For the Polish translation"
732 732
 msgstr "Espanjannoksesta"
733 733
 
734 734
 #: tastymenu.cpp:225
735
-msgid "For the Switch user code from KDM"
736
-msgstr "KDM:n käyttäjänvaihtokoodista"
735
+msgid "For the Switch user code from TDM"
736
+msgstr "TDM:n käyttäjänvaihtokoodista"
737 737
 
738 738
 #: tastymenu.cpp:229
739 739
 msgid "For some inspirations here and there."

+ 8
- 8
po/fr.po View File

@@ -137,12 +137,12 @@ msgstr "Alt+I"
137 137
 #: appearance.cpp:293 rc.cpp:226
138 138
 #, no-c-format
139 139
 msgid ""
140
-"What icon should be displayed in the kicker button instead of the KMenu "
140
+"What icon should be displayed in the kicker button instead of the TMenu "
141 141
 "one.\n"
142 142
 "Empty means default."
143 143
 msgstr ""
144 144
 "Icône Kicker qui doit être montrée au lieu du bouton par défaut "
145
-"deKMenu.<br>Vide met le bouton par défaut."
145
+"de TMenu.<br>Vide met le bouton par défaut."
146 146
 
147 147
 #. i18n: file ./appearance.ui line 262
148 148
 #: appearance.cpp:295 rc.cpp:230
@@ -276,10 +276,10 @@ msgstr ""
276 276
 #: behaviour.cpp:118 rc.cpp:99
277 277
 #, no-c-format
278 278
 msgid ""
279
-"Pops up Tasty Menu instead of KMenu when the shortcut sequence Alt+F1 is "
279
+"Pops up Tasty Menu instead of TMenu when the shortcut sequence Alt+F1 is "
280 280
 "pressed"
281 281
 msgstr ""
282
-"Afficher le menu contextuel de Tasty Menu au lieu de KMenu lorsque Alt+F1 "
282
+"Afficher le menu contextuel de Tasty Menu au lieu de TMenu lorsque Alt+F1 "
283 283
 "est pressé "
284 284
 
285 285
 #. i18n: file ./behaviour.ui line 91
@@ -693,8 +693,8 @@ msgid "Menu"
693 693
 msgstr "Menu"
694 694
 
695 695
 #: tastymenu.cpp:186
696
-msgid "KMenu replacement"
697
-msgstr "Remplacement de KMenu"
696
+msgid "TMenu replacement"
697
+msgstr "Remplacement de TMenu"
698 698
 
699 699
 #: tastymenu.cpp:191
700 700
 msgid "Maintainer"
@@ -746,8 +746,8 @@ msgid "For the Polish translation"
746 746
 msgstr "Pour la traduction espagnole"
747 747
 
748 748
 #: tastymenu.cpp:225
749
-msgid "For the Switch user code from KDM"
750
-msgstr "Pour la codage du changement d'utilisateur via KDM"
749
+msgid "For the Switch user code from TDM"
750
+msgstr "Pour la codage du changement d'utilisateur via TDM"
751 751
 
752 752
 #: tastymenu.cpp:229
753 753
 msgid "For some inspirations here and there."

+ 8
- 8
po/it.po View File

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

+ 8
- 8
po/pl.po View File

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

+ 8
- 8
po/pt_BR.po View File

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

+ 8
- 8
po/ru.po View File

@@ -135,12 +135,12 @@ msgstr "Alt+I"
135 135
 #: appearance.cpp:293 rc.cpp:226
136 136
 #, no-c-format
137 137
 msgid ""
138
-"What icon should be displayed in the kicker button instead of the KMenu "
138
+"What icon should be displayed in the kicker button instead of the TMenu "
139 139
 "one.\n"
140 140
 "Empty means default."
141 141
 msgstr ""
142 142
 "Эта пиктограмма будет отображаться "
143
-"вместо KMenu.\n"
143
+"вместо TMenu.\n"
144 144
 "В другом случае - стандартная пиктограмма."
145 145
 
146 146
 #. i18n: file ./appearance.ui line 262
@@ -276,10 +276,10 @@ msgstr ""
276 276
 #: behaviour.cpp:118 rc.cpp:99
277 277
 #, no-c-format
278 278
 msgid ""
279
-"Pops up Tasty Menu instead of KMenu when the shortcut sequence Alt+F1 is "
279
+"Pops up Tasty Menu instead of TMenu when the shortcut sequence Alt+F1 is "
280 280
 "pressed"
281 281
 msgstr ""
282
-"Показывать Tasty Menu вместо KMenu при нажатии "
282
+"Показывать Tasty Menu вместо TMenu при нажатии "
283 283
 "Alt+F1"
284 284
 
285 285
 #. i18n: file ./behaviour.ui line 91
@@ -710,8 +710,8 @@ msgid "Menu"
710 710
 msgstr "Меню"
711 711
 
712 712
 #: tastymenu.cpp:186
713
-msgid "KMenu replacement"
714
-msgstr "Замена KMenu"
713
+msgid "TMenu replacement"
714
+msgstr "Замена TMenu"
715 715
 
716 716
 #: tastymenu.cpp:191
717 717
 msgid "Maintainer"
@@ -765,9 +765,9 @@ msgid "For the Polish translation"
765 765
 msgstr "Для русского перевода"
766 766
 
767 767
 #: tastymenu.cpp:225
768
-msgid "For the Switch user code from KDM"
768
+msgid "For the Switch user code from TDM"
769 769
 msgstr ""
770
-"За код из KDM, отвечающий за переключение "
770
+"За код из TDM, отвечающий за переключение "
771 771
 "пользователей"
772 772
 
773 773
 #: tastymenu.cpp:229

+ 5
- 5
po/sl.po View File

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

+ 4
- 4
po/tastymenu.pot View File

@@ -128,7 +128,7 @@ msgstr ""
128 128
 #: appearance.cpp:293 rc.cpp:226
129 129
 #, no-c-format
130 130
 msgid ""
131
-"What icon should be displayed in the kicker button instead of the KMenu "
131
+"What icon should be displayed in the kicker button instead of the TMenu "
132 132
 "one.\n"
133 133
 "Empty means default."
134 134
 msgstr ""
@@ -262,7 +262,7 @@ msgstr ""
262 262
 #: behaviour.cpp:118 rc.cpp:99
263 263
 #, no-c-format
264 264
 msgid ""
265
-"Pops up Tasty Menu instead of KMenu when the shortcut sequence Alt+F1 is "
265
+"Pops up Tasty Menu instead of TMenu when the shortcut sequence Alt+F1 is "
266 266
 "pressed"
267 267
 msgstr ""
268 268
 
@@ -647,7 +647,7 @@ msgid "Menu"
647 647
 msgstr ""
648 648
 
649 649
 #: tastymenu.cpp:186
650
-msgid "KMenu replacement"
650
+msgid "TMenu replacement"
651 651
 msgstr ""
652 652
 
653 653
 #: tastymenu.cpp:191
@@ -695,7 +695,7 @@ msgid "For the Polish translation"
695 695
 msgstr ""
696 696
 
697 697
 #: tastymenu.cpp:225
698
-msgid "For the Switch user code from KDM"
698
+msgid "For the Switch user code from TDM"
699 699
 msgstr ""
700 700
 
701 701
 #: tastymenu.cpp:229

+ 8
- 8
po/uk.po View File

@@ -133,12 +133,12 @@ msgstr "Alt+I"
133 133
 #: appearance.cpp:293 rc.cpp:226
134 134
 #, no-c-format
135 135
 msgid ""
136
-"What icon should be displayed in the kicker button instead of the KMenu "
136
+"What icon should be displayed in the kicker button instead of the TMenu "
137 137
 "one.\n"
138 138
 "Empty means default."
139 139
 msgstr ""
140 140
 "Ця піктограма буде відображатися замість "
141
-"KMenu.\n"
141
+"TMenu.\n"
142 142
 "В іншому випадку - стандартна іконка."
143 143
 
144 144
 #. i18n: file ./appearance.ui line 262
@@ -274,10 +274,10 @@ msgstr ""
274 274
 #: behaviour.cpp:118 rc.cpp:99
275 275
 #, no-c-format
276 276
 msgid ""
277
-"Pops up Tasty Menu instead of KMenu when the shortcut sequence Alt+F1 is "
277
+"Pops up Tasty Menu instead of TMenu when the shortcut sequence Alt+F1 is "
278 278
 "pressed"
279 279
 msgstr ""
280
-"Показувати Tasty Menu замість KMenu при "
280
+"Показувати Tasty Menu замість TMenu при "
281 281
 "натисненні Alt+F1"
282 282
 
283 283
 #. i18n: file ./behaviour.ui line 91
@@ -703,8 +703,8 @@ msgid "Menu"
703 703
 msgstr "Меню"
704 704
 
705 705
 #: tastymenu.cpp:186
706
-msgid "KMenu replacement"
707
-msgstr "Заміна KMenu"
706
+msgid "TMenu replacement"
707
+msgstr "Заміна TMenu"
708 708
 
709 709
 #: tastymenu.cpp:191
710 710
 msgid "Maintainer"
@@ -756,9 +756,9 @@ msgid "For the Polish translation"
756 756
 msgstr "Для Іспанського перекладу"
757 757
 
758 758
 #: tastymenu.cpp:225
759
-msgid "For the Switch user code from KDM"
759
+msgid "For the Switch user code from TDM"
760 760
 msgstr ""
761
-"За код із KDM, відповідальний за "
761
+"За код із TDM, відповідальний за "
762 762
 "переключення користувачів"
763 763
 
764 764
 #: tastymenu.cpp:229

+ 1
- 1
src/Makefile.am View File

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

+ 2
- 2
src/appearance.ui View File

@@ -226,7 +226,7 @@ Empty means default.</string>
226 226
                         <bool>true</bool>
227 227
                     </property>
228 228
                 </widget>
229
-                <widget class="KIconButton">
229
+                <widget class="TDEIconButton">
230 230
                     <property name="name">
231 231
                         <cstring>MenuButtonIcon</cstring>
232 232
                     </property>
@@ -242,7 +242,7 @@ Empty means default.</string>
242 242
                         <string></string>
243 243
                     </property>
244 244
                     <property name="whatsThis" stdset="0">
245
-                        <string>What icon should be displayed in the kicker button instead of the KMenu one.
245
+                        <string>What icon should be displayed in the kicker button instead of the TMenu one.
246 246
 Empty means default.</string>
247 247
                     </property>
248 248
                 </widget>

+ 1
- 1
src/behaviour.ui View File

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

+ 15
- 15
src/dmctl.cpp View File

@@ -21,7 +21,7 @@
21 21
 
22 22
 #ifdef Q_WS_X11
23 23
 
24
-#include <klocale.h>
24
+#include <tdelocale.h>
25 25
 #include <dcopclient.h>
26 26
 
27 27
 #include <tqregexp.h>
@@ -106,16 +106,16 @@ DM::exec( const char *cmd )
106 106
 }
107 107
 
108 108
 /**
109
- * Execute a KDM/GDM remote control command.
109
+ * Execute a TDM/GDM remote control command.
110 110
  * @param cmd the command to execute. FIXME: undocumented yet.
111 111
  * @param buf the result buffer.
112 112
  * @return result:
113 113
  *  @li If true, the command was successfully executed.
114 114
  *   @p ret might contain addional results.
115 115
  *  @li If false and @p ret is empty, a communication error occurred
116
- *   (most probably KDM is not running).
116
+ *   (most probably TDM is not running).
117 117
  *  @li If false and @p ret is non-empty, it contains the error message
118
- *   from KDM.
118
+ *   from TDM.
119 119
  */
120 120
 bool
121 121
 DM::exec( const char *cmd, TQCString &buf )
@@ -176,11 +176,11 @@ DM::canShutdown()
176 176
 }
177 177
 
178 178
 void
179
-DM::shutdown( KApplication::ShutdownType shutdownType,
180
-              KApplication::ShutdownMode shutdownMode, /* NOT Default */
179
+DM::shutdown( TDEApplication::ShutdownType shutdownType,
180
+              TDEApplication::ShutdownMode shutdownMode, /* NOT Default */
181 181
               const TQString &bootOption )
182 182
 {
183
-	if (shutdownType == KApplication::ShutdownTypeNone)
183
+	if (shutdownType == TDEApplication::ShutdownTypeNone)
184 184
 		return;
185 185
 
186 186
 	bool cap_ask;
@@ -192,26 +192,26 @@ DM::shutdown( KApplication::ShutdownType shutdownType,
192 192
 			return;
193 193
 		cap_ask = false;
194 194
 	}
195
-	if (!cap_ask && shutdownMode == KApplication::ShutdownModeInteractive)
196
-		shutdownMode = KApplication::ShutdownModeForceNow;
195
+	if (!cap_ask && shutdownMode == TDEApplication::ShutdownModeInteractive)
196
+		shutdownMode = TDEApplication::ShutdownModeForceNow;
197 197
 
198 198
 	TQCString cmd;
199 199
 	if (DMType == GDM) {
200
-		cmd.append( shutdownMode == KApplication::ShutdownModeForceNow ?
200
+		cmd.append( shutdownMode == TDEApplication::ShutdownModeForceNow ?
201 201
 		            "SET_LOGOUT_ACTION " : "SET_SAFE_LOGOUT_ACTION " );
202
-		cmd.append( shutdownType == KApplication::ShutdownTypeReboot ?
202
+		cmd.append( shutdownType == TDEApplication::ShutdownTypeReboot ?
203 203
 		            "REBOOT\n" : "HALT\n" );
204 204
 	} else {
205 205
 		cmd.append( "shutdown\t" );
206
-		cmd.append( shutdownType == KApplication::ShutdownTypeReboot ?
206
+		cmd.append( shutdownType == TDEApplication::ShutdownTypeReboot ?
207 207
 		            "reboot\t" : "halt\t" );
208 208
 		if (!bootOption.isNull())
209 209
 			cmd.append( "=" ).append( bootOption.local8Bit() ).append( "\t" );
210
-		cmd.append( shutdownMode == KApplication::ShutdownModeInteractive ?
210
+		cmd.append( shutdownMode == TDEApplication::ShutdownModeInteractive ?
211 211
 		            "ask\n" :
212
-		            shutdownMode == KApplication::ShutdownModeForceNow ?
212
+		            shutdownMode == TDEApplication::ShutdownModeForceNow ?
213 213
 		            "forcenow\n" :
214
-		            shutdownMode == KApplication::ShutdownModeTryNow ?
214
+		            shutdownMode == TDEApplication::ShutdownModeTryNow ?
215 215
 		            "trynow\n" : "schedule\n" );
216 216
 	}
217 217
 	exec( cmd.data() );

+ 5
- 5
src/dmctl.h View File

@@ -21,7 +21,7 @@
21 21
 #ifndef DMCTL_H
22 22
 #define DMCTL_H
23 23
 
24
-#include <kapplication.h>
24
+#include <tdeapplication.h>
25 25
 
26 26
 struct SessEnt {
27 27
 	TQString display, from, user, session;
@@ -40,8 +40,8 @@ public:
40 40
 	~DM();
41 41
 
42 42
 	bool canShutdown();
43
-	void shutdown( KApplication::ShutdownType shutdownType,
44
-	               KApplication::ShutdownMode shutdownMode,
43
+	void shutdown( TDEApplication::ShutdownType shutdownType,
44
+	               TDEApplication::ShutdownMode shutdownMode,
45 45
 	               const TQString &bootOption = TQString::null );
46 46
 
47 47
 	void setLock( bool on );
@@ -72,8 +72,8 @@ public:
72 72
 	DM() {}
73 73
 
74 74
 	bool canShutdown() { return false; }
75
-	void shutdown( KApplication::ShutdownType shutdownType,
76
-	               KApplication::ShutdownMode shutdownMode,
75
+	void shutdown( TDEApplication::ShutdownType shutdownType,
76
+	               TDEApplication::ShutdownMode shutdownMode,
77 77
 	               const TQString &bootOption = TQString::null ) {}
78 78
 
79 79
 	void setLock( bool ) {}

+ 2
- 2
src/menu.ui View File

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

+ 39
- 39
src/menuhandler.cpp View File

@@ -20,8 +20,8 @@
20 20
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
21 21
  ***************************************************************************/
22 22
 
23
-#include <klocale.h>
24
-#include <kmessagebox.h>
23
+#include <tdelocale.h>
24
+#include <tdemessagebox.h>
25 25
 #include <kuser.h>
26 26
 #include <kstandarddirs.h>
27 27
 #include <kmimetype.h>
@@ -29,7 +29,7 @@
29 29
 #include <tqstyle.h>
30 30
 #include <tqfile.h>
31 31
 #include <tqcursor.h>
32
-#include <kpopupmenu.h>
32
+#include <tdepopupmenu.h>
33 33
 #include <kdebug.h>
34 34
 
35 35
 
@@ -47,7 +47,7 @@ MenuHandler::MenuHandler( TQWidget *parent, Prefs *prefs, char *name, WFlags fl)
47 47
 
48 48
   //Kicker config
49 49
   TQString kickerConfPath = locate("config", "kickerrc");
50
-  kickerConf = new KConfig(kickerConfPath);
50
+  kickerConf = new TDEConfig(kickerConfPath);
51 51
 
52 52
   kickerConfWatch = new KDirWatch( this );
53 53
   kickerConfWatch->addFile(kickerConfPath);
@@ -83,12 +83,12 @@ MenuHandler::MenuHandler( TQWidget *parent, Prefs *prefs, char *name, WFlags fl)
83 83
   setupColumns();
84 84
 
85 85
   //Searchline...
86
-  iconLoader = KGlobal::iconLoader();
86
+  iconLoader = TDEGlobal::iconLoader();
87 87
   TQPixmap icon;
88 88
   if( TQApplication::reverseLayout() )
89
-    icon = iconLoader->loadIcon("locationbar_erase", KIcon::Small);
89
+    icon = iconLoader->loadIcon("locationbar_erase", TDEIcon::Small);
90 90
   else
91
-    icon = iconLoader->loadIcon("clear_left", KIcon::Small);
91
+    icon = iconLoader->loadIcon("clear_left", TDEIcon::Small);
92 92
   menu->clearButton->setIconSet(icon);
93 93
 
94 94
   connect(menu->clearButton, SIGNAL(clicked()), menu->searchLine, SLOT (clear()) );
@@ -108,20 +108,20 @@ MenuHandler::MenuHandler( TQWidget *parent, Prefs *prefs, char *name, WFlags fl)
108 108
   menu->logoutButton->installEventFilter(this);
109 109
 
110 110
   //action buttons
111
-  icon = iconLoader->loadIcon("exit", KIcon::Toolbar);
111
+  icon = iconLoader->loadIcon("system-log-out", TDEIcon::Toolbar);
112 112
   menu->logoutButton->setIconSet(icon);
113 113
 
114
-  icon = iconLoader->loadIcon("lock", KIcon::Toolbar);
114
+  icon = iconLoader->loadIcon("system-lock-screen", TDEIcon::Toolbar);
115 115
   menu->lockButton->setIconSet(icon);
116 116
 
117
-  icon = iconLoader->loadIcon("run", KIcon::Toolbar);
117
+  icon = iconLoader->loadIcon("system-run", TDEIcon::Toolbar);
118 118
   menu->runButton->setIconSet(icon);
119 119
 
120
-  icon = iconLoader->loadIcon("locationbar_erase", KIcon::Toolbar);
120
+  icon = iconLoader->loadIcon("locationbar_erase", TDEIcon::Toolbar);
121 121
   menu->clearRecentButton->setIconSet(icon);
122 122
 
123 123
   setCaption("Tasty Menu");
124
-  setIcon(iconLoader->loadIcon("kmenu", KIcon::Panel));
124
+  setIcon(iconLoader->loadIcon("kmenu", TDEIcon::Panel));
125 125
 
126 126
   //user icon and login
127 127
   KUser *user = new KUser ();
@@ -131,7 +131,7 @@ MenuHandler::MenuHandler( TQWidget *parent, Prefs *prefs, char *name, WFlags fl)
131 131
                ("data", "/home/" + loginName + "/.face.icon"));
132 132
   if( !userImage.isNull() )
133 133
   {
134
-    userImage = userImage.smoothScale (KIcon::SizeSmallMedium, KIcon::SizeSmallMedium);
134
+    userImage = userImage.smoothScale (TDEIcon::SizeSmallMedium, TDEIcon::SizeSmallMedium);
135 135
     menu->switchButton->setIconSet(TQPixmap(userImage));
136 136
   }
137 137
   menu->switchButton->setText(loginName);
@@ -190,18 +190,18 @@ void MenuHandler::loadNewInstalledApps()
190 190
 {
191 191
   //Notification for newly installed apps
192 192
   xdgMenuLister =  new KDirLister( );
193
-  KStandardDirs *standardDir=new KStandardDirs();
193
+  TDEStandardDirs *standardDir=new TDEStandardDirs();
194 194
   TQStringList appDirs = standardDir->findDirs("xdgdata-apps", ".");
195 195
   firstListing = 0;
196 196
   for(TQStringList::Iterator it = appDirs.begin(); it != appDirs.end(); ++it)
197 197
   {
198 198
     xdgMenuLister->openURL(*it, true);
199 199
     /*HACK: links to kde programs are often installed in a kde subdirectory
200
-    of one of these, so i duplicate all the entries with entry+"kde/"*/
201
-    TQString appDirWithKde = (*it)+"kde/";
202
-    if( TQFile::exists(appDirWithKde) )
200
+    of one of these, so i duplicate all the entries with entry+"tde/"*/
201
+    TQString appDirWithTde = (*it)+"tde/";
202
+    if( TQFile::exists(appDirWithTde) )
203 203
     {
204
-      xdgMenuLister->openURL(appDirWithKde, true);
204
+      xdgMenuLister->openURL(appDirWithTde, true);
205 205
       firstListing++;
206 206
     }
207 207
   }
@@ -327,13 +327,13 @@ bool MenuHandler::eventFilter( TQObject *o, TQEvent * e )
327 327
         break;
328 328
 
329 329
       case TQt::Key_Right:
330
-        if( dynamic_cast<KListViewSearchLine *>(o) )
330
+        if( dynamic_cast<TDEListViewSearchLine *>(o) )
331 331
           return false;
332 332
         fData->next()->setFocus();
333 333
         break;
334 334
 
335 335
       case TQt::Key_Left:
336
-        if( dynamic_cast<KListViewSearchLine *>(o) )
336
+        if( dynamic_cast<TDEListViewSearchLine *>(o) )
337 337
           return false;
338 338
         fData->prev()->setFocus();
339 339
         break;
@@ -416,9 +416,9 @@ void MenuHandler::readConfig()
416 416
   favouriteList = prefSkel->favouriteApps();
417 417
   if( favouriteList.isEmpty() )
418 418
   {
419
-    favouriteList.append(locate("xdgdata-apps","kde/konqbrowser.desktop"));
420
-    favouriteList.append(locate("xdgdata-apps","kde/KMail.desktop"));
421
-    favouriteList.append(locate("xdgdata-apps","kde/Help.desktop"));
419
+    favouriteList.append(locate("xdgdata-apps","tde/konqbrowser.desktop"));
420
+    favouriteList.append(locate("xdgdata-apps","tde/KMail.desktop"));
421
+    favouriteList.append(locate("xdgdata-apps","tde/Help.desktop"));
422 422
   }
423 423
 
424 424
   _showExpander = prefSkel->showExpander();
@@ -466,7 +466,7 @@ void MenuHandler::readConfig()
466 466
  // disconnect(menu->searchLine, 0, 0, 0);
467 467
   if( !_kerryIntegration && !_strigiIntegration )
468 468
   {
469
-    //menu->searchLine->setListView((KListView *)(menu->dynamicList));
469
+    //menu->searchLine->setListView((TDEListView *)(menu->dynamicList));
470 470
     disconnect(menu->searchLine, SIGNAL(returnPressed( const TQString &)),
471 471
             this, SLOT (kerrySearch( const TQString &)) );
472 472
     disconnect(menu->searchLine, SIGNAL(returnPressed( const TQString &)),
@@ -749,7 +749,7 @@ void MenuHandler::populateList( KServiceGroup *serviceGroup, TastyListView *list
749 749
          if(numChilds == 0)
750 750
            continue;
751 751
 
752
-         TQPixmap iconPix = iconLoader->loadIcon(g->icon(), KIcon::Toolbar,iconSize);
752
+         TQPixmap iconPix = iconLoader->loadIcon(g->icon(), TDEIcon::Toolbar,iconSize);
753 753
 
754 754
          if ( iconPix.height () != iconSize)
755 755
          {
@@ -899,7 +899,7 @@ void MenuHandler::populateList( KServiceGroup *serviceGroup, TastyListView *list
899 899
 
900 900
         prevListItem = listItem;
901 901
 
902
-        TQPixmap iconPix = s->pixmap( KIcon::Toolbar, iconSize );
902
+        TQPixmap iconPix = s->pixmap( TDEIcon::Toolbar, iconSize );
903 903
         if ( iconPix.height () != iconSize)
904 904
         {
905 905
           TQImage img = iconPix.convertToImage();
@@ -973,7 +973,7 @@ void MenuHandler::fillRecentDocuments( )
973 973
     menu->dynamicList->clear();
974 974
     setupDynList( RecentDocuments );
975 975
 
976
-    TQStringList recentDocsList = KRecentDocument::recentDocuments();
976
+    TQStringList recentDocsList = TDERecentDocument::recentDocuments();
977 977
 
978 978
     TastyListViewItem *listItem = NULL;
979 979
 
@@ -994,7 +994,7 @@ void MenuHandler::fillRecentDocuments( )
994 994
         listItem->setDeskopEntryPath(*it);
995 995
         listItem->setType( TastyListViewItem::DesktopFile );
996 996
 
997
-        TQPixmap iconPix = iconLoader->loadIcon(f->readIcon(), KIcon::Panel, _iconSize1);
997
+        TQPixmap iconPix = iconLoader->loadIcon(f->readIcon(), TDEIcon::Panel, _iconSize1);
998 998
         if ( iconPix.height () > _iconSize1)
999 999
         {
1000 1000
           TQImage img = iconPix.convertToImage();
@@ -1041,7 +1041,7 @@ void MenuHandler::fillMoreUsed( )
1041 1041
         listItem->setDisplaySubText(_displaySubText);
1042 1042
 
1043 1043
 
1044
-        TQPixmap iconPix = s->pixmap( KIcon::Toolbar, _iconSize1 );
1044
+        TQPixmap iconPix = s->pixmap( TDEIcon::Toolbar, _iconSize1 );
1045 1045
         if( !iconPix.isNull() )
1046 1046
         {
1047 1047
           if ( iconPix.height () != _iconSize1)
@@ -1090,7 +1090,7 @@ void MenuHandler::fillRecentlyUsed( )
1090 1090
         listItem->setDisplaySubText(_displaySubText);
1091 1091
 
1092 1092
 
1093
-        TQPixmap iconPix = s->pixmap( KIcon::Toolbar, _iconSize1 );
1093
+        TQPixmap iconPix = s->pixmap( TDEIcon::Toolbar, _iconSize1 );
1094 1094
         if( !iconPix.isNull() )
1095 1095
         {
1096 1096
           if ( iconPix.height () != _iconSize1)
@@ -1135,7 +1135,7 @@ void MenuHandler::fillFavourites( )
1135 1135
         listItem->setDisplaySubText(_displaySubText);
1136 1136
 
1137 1137
 
1138
-        TQPixmap iconPix = s->pixmap( KIcon::Toolbar, _iconSize1 );
1138
+        TQPixmap iconPix = s->pixmap( TDEIcon::Toolbar, _iconSize1 );
1139 1139
         if ( iconPix.height () > _iconSize1)
1140 1140
         {
1141 1141
           TQImage img = iconPix.convertToImage();
@@ -1214,7 +1214,7 @@ void MenuHandler::slotApplicationRemoved()
1214 1214
 
1215 1215
 void MenuHandler::slotUpdateApplications()
1216 1216
 {
1217
-  KRun::runCommand ("kbuildsycoca");
1217
+  KRun::runCommand ("tdebuildsycoca");
1218 1218
   prefSkel->writeConfig();
1219 1219
   menu->rootList->clear();
1220 1220
   KServiceGroup::Ptr service = KServiceGroup::root();
@@ -1286,7 +1286,7 @@ void MenuHandler::listClicked( TastyListViewItem * listItem, const TQPoint & coo
1286 1286
         slotUpdateApplications();
1287 1287
       }
1288 1288
 
1289
-      int started = KApplication::startServiceByDesktopPath( servicePath );
1289
+      int started = TDEApplication::startServiceByDesktopPath( servicePath );
1290 1290
       if( !started )
1291 1291
       {
1292 1292
        DCOPRef kickerKMenuIface ("kicker", "KMenu");
@@ -1417,7 +1417,7 @@ void MenuHandler::slotContextMenu(TQListViewItem *listItem, const TQPoint &coord
1417 1417
   if( !tastyListItem )
1418 1418
     return;
1419 1419
 
1420
-  KPopupMenu menu(this);
1420
+  TDEPopupMenu menu(this);
1421 1421
 
1422 1422
   menu.insertTitle(tastyListItem->text(c));
1423 1423
   if( tastyListItem->getPath() != "" )
@@ -1489,7 +1489,7 @@ void MenuHandler::runDialog()
1489 1489
   kdesktopKDesktopIface.call ("popupExecuteCommand()");
1490 1490
 }
1491 1491
 
1492
-/*Following functions are from official KDE Kmenu, Copyright 1996-2006 the kicker authors*/
1492
+/*Following functions are from official KDE KMenu, Copyright 1996-2006 the kicker authors*/
1493 1493
 
1494 1494
 void MenuHandler::slotPopulateSessions()
1495 1495
 {
@@ -1498,7 +1498,7 @@ void MenuHandler::slotPopulateSessions()
1498 1498
 
1499 1499
     sessionsMenu->clear();
1500 1500
 
1501
-    sessionsMenu->insertItem(SmallIconSet("personal"), i18n("Edit user profile..."), 100 );
1501
+    sessionsMenu->insertItem(SmallIconSet("preferences-desktop-personal"), i18n("Edit user profile..."), 100 );
1502 1502
     sessionsMenu->insertSeparator();
1503 1503
 
1504 1504
     //optional save/restore session entries
@@ -1538,7 +1538,7 @@ void MenuHandler::slotSessionActivated( int ent )
1538 1538
     {
1539 1539
       case 100:
1540 1540
         close();
1541
-        KRun::runCommand ("kcmshell kcm_useraccount");
1541
+        KRun::runCommand ("tdecmshell kcm_useraccount");
1542 1542
         break;
1543 1543
       case 101:
1544 1544
       {
@@ -1595,7 +1595,7 @@ void MenuHandler::initializeSearch( const TQString & query )
1595 1595
   if( !searchMode && query.length() > 2 )
1596 1596
    {
1597 1597
       if( !menu->searchLine->listView() )
1598
-        menu->searchLine->setListView((KListView *)(menu->dynamicList));
1598
+        menu->searchLine->setListView((TDEListView *)(menu->dynamicList));
1599 1599
       searchMode = true;
1600 1600
       menu->menuModes->setEnabled(false);
1601 1601
       KServiceGroup::Ptr service = KServiceGroup::root();
@@ -1647,7 +1647,7 @@ void MenuHandler::clearDynList( )
1647 1647
       break;
1648 1648
     }
1649 1649
     case RecentDocuments:
1650
-      KRecentDocument::clear();
1650
+      TDERecentDocument::clear();
1651 1651
       break;
1652 1652
     default:
1653 1653
       break;

+ 8
- 8
src/menuhandler.h View File

@@ -23,13 +23,13 @@
23 23
 
24 24
 #include <kservicegroup.h>
25 25
 #include <kservice.h>
26
-#include <klistbox.h>
27
-#include <klistview.h>
28
-#include <klistviewsearchline.h>
29
-#include <kapplication.h>
26
+#include <tdelistbox.h>
27
+#include <tdelistview.h>
28
+#include <tdelistviewsearchline.h>
29
+#include <tdeapplication.h>
30 30
 #include <kiconloader.h>
31 31
 #include <kpushbutton.h>
32
-#include <krecentdocument.h>
32
+#include <tderecentdocument.h>
33 33
 #include <krun.h>
34 34
 #include <dcopref.h>
35 35
 #include <tqheader.h>
@@ -40,7 +40,7 @@
40 40
 #include <kdirwatch.h>
41 41
 #include <kdirlister.h>
42 42
 #include <tqlayout.h>
43
-#include <kfileitem.h>
43
+#include <tdefileitem.h>
44 44
 
45 45
 #include "dmctl.h"
46 46
 #include "menu.h"
@@ -97,11 +97,11 @@ private:
97 97
 
98 98
     Menu * menu;
99 99
     MenuMode currentMenuMode;
100
-    KIconLoader *iconLoader;
100
+    TDEIconLoader *iconLoader;
101 101
     TQPopupMenu *sessionsMenu;
102 102
     bool searchMode;
103 103
     Prefs *prefSkel;
104
-    KConfig *kickerConf;
104
+    TDEConfig *kickerConf;
105 105
     KDirWatch *kickerConfWatch;
106 106
     //xdgMenuWatch for applications-kmenuedit.menu xdgMenuLister for all the desktop files
107 107
     KDirWatch *xdgMenuWatch;

+ 1
- 1
src/prefs.kcfgc View File

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

+ 3
- 3
src/tastybutton.cpp View File

@@ -28,7 +28,7 @@
28 28
 TastyButton::TastyButton(TQWidget *parent)
29 29
  : TQToolButton(parent)
30 30
 {
31
-  iconEffect = new KIconEffect();
31
+  iconEffect = new TDEIconEffect();
32 32
   iconEffect->init();
33 33
 }
34 34
 
@@ -106,8 +106,8 @@ void TastyButton::drawButton( TQPainter * p )
106 106
 void TastyButton::setIconSet(  TQIconSet is )
107 107
 {
108 108
    is.setPixmap(iconEffect->apply(is.pixmap(),
109
-                                  (int)KIcon::Panel,
110
-                                  (int)KIcon::ActiveState),
109
+                                  (int)TDEIcon::Panel,
110
+                                  (int)TDEIcon::ActiveState),
111 111
                                   TQIconSet::Automatic,
112 112
                                   TQIconSet::Active);
113 113
 

+ 1
- 1
src/tastybutton.h View File

@@ -42,7 +42,7 @@ protected:
42 42
 
43 43
   private:
44 44
     TQPixmap highLightedIcon;
45
-    KIconEffect *iconEffect;
45
+    TDEIconEffect *iconEffect;
46 46
 
47 47
 };
48 48
 

+ 23
- 23
src/tastylistview.cpp View File

@@ -22,18 +22,18 @@
22 22
 #include "tastylistview.h"
23 23
 #include "misc.h"
24 24
 
25
-#include <kdeversion.h>
25
+#include <tdeversion.h>
26 26
 #include <kstringhandler.h>
27 27
 #include <tqimage.h>
28 28
 #include <tqpainter.h>
29 29
 #include <tqheader.h>
30
-#include <klocale.h>
30
+#include <tdelocale.h>
31 31
 #include <kurldrag.h>
32 32
 #include <tqapplication.h>
33 33
 
34 34
 
35 35
 TastyListView::TastyListView( TQWidget * parent, const char * name)
36
-  : KListView(parent, name), highLightGroups(true), easyOpen(true)
36
+  : TDEListView(parent, name), highLightGroups(true), easyOpen(true)
37 37
 {
38 38
 
39 39
   onItemTimer = new TQTimer(this, "onItemTimer");
@@ -101,12 +101,12 @@ void TastyListView::contentsMouseReleaseEvent( TQMouseEvent * e  )
101 101
 
102 102
     oldOpenItem->repaint();
103 103
   }
104
-  KListView::contentsMouseReleaseEvent(e);
104
+  TDEListView::contentsMouseReleaseEvent(e);
105 105
 }
106 106
 
107 107
 void TastyListView::contentsMouseMoveEvent( TQMouseEvent * e  )
108 108
 {
109
-  KListView::contentsMouseMoveEvent(e);
109
+  TDEListView::contentsMouseMoveEvent(e);
110 110
   mouseDown = (e->state() & TQt::LeftButton);
111 111
 
112 112
   if( itemAt(  contentsToViewport(TQPoint(e->x(), e->y()))) == 0 )
@@ -115,7 +115,7 @@ void TastyListView::contentsMouseMoveEvent( TQMouseEvent * e  )
115 115
 
116 116
 void TastyListView::leaveEvent( TQEvent * e  )
117 117
 {
118
-  KListView::leaveEvent( e );
118
+  TDEListView::leaveEvent( e );
119 119
   onItemTimer->stop();
120 120
   if( openItem )
121 121
     setCurrentItem( openItem );
@@ -154,7 +154,7 @@ void TastyListView::keyPressEvent( TQKeyEvent * e )
154 154
 
155 155
     case TQt::Key_Up:
156 156
     case TQt::Key_Down:
157
-      KListView::keyPressEvent( e );
157
+      TDEListView::keyPressEvent( e );
158 158
       break;
159 159
 
160 160
     case TQt::Key_Right:
@@ -204,7 +204,7 @@ void TastyListView::keyPressEvent( TQKeyEvent * e )
204 204
       break;
205 205
     }
206 206
     case TQt::Key_Tab:
207
-      KListView::keyPressEvent( e );
207
+      TDEListView::keyPressEvent( e );
208 208
       break;
209 209
 
210 210
     default:
@@ -323,27 +323,27 @@ void TastyListViewToolTip::maybeTip( const TQPoint &pos )
323 323
 ///////////TASTYLISTVIEWITEM
324 324
 
325 325
 TastyListViewItem::TastyListViewItem( TastyListView * parent )
326
- : KListViewItem(parent)
326
+ : TDEListViewItem(parent)
327 327
 {commonConstructor();}
328 328
 
329 329
 TastyListViewItem::TastyListViewItem( TastyListViewItem * parent )
330
- : KListViewItem(parent)
330
+ : TDEListViewItem(parent)
331 331
 {commonConstructor();}
332 332
 
333 333
 TastyListViewItem::TastyListViewItem( TastyListView * parent, TastyListViewItem * after, TQString label1 )
334
- : KListViewItem(parent, after, label1)
334
+ : TDEListViewItem(parent, after, label1)
335 335
 {commonConstructor();cellText = label1;}
336 336
 
337 337
 TastyListViewItem::TastyListViewItem( TastyListViewItem * parent, TastyListViewItem * after, TQString label1 )
338
- : KListViewItem(parent, after, label1)
338
+ : TDEListViewItem(parent, after, label1)
339 339
 {commonConstructor();cellText = label1;}
340 340
 
341 341
 TastyListViewItem::TastyListViewItem( TastyListView * parent, TQString label1 )
342
- : KListViewItem(parent, label1)
342
+ : TDEListViewItem(parent, label1)
343 343
 {commonConstructor();cellText = label1;}
344 344
 
345 345
 TastyListViewItem::TastyListViewItem( TastyListViewItem * parent, TQString label1 )
346
- : KListViewItem(parent, label1)
346
+ : TDEListViewItem(parent, label1)
347 347
 {commonConstructor();cellText = label1;}
348 348
 
349 349
 TastyListViewItem::~TastyListViewItem()
@@ -372,7 +372,7 @@ void TastyListViewItem::commonConstructor()
372 372
 void TastyListViewItem::loadPixmap()
373 373
 {
374 374
   TQString iconFile = "";
375
-  iconLoader = KGlobal::iconLoader();
375
+  iconLoader = TDEGlobal::iconLoader();
376 376
 
377 377
   if( !listView() )
378 378
     return;
@@ -384,26 +384,26 @@ void TastyListViewItem::loadPixmap()
384 384
   switch( actionType )
385 385
   {
386 386
     case AddBookMark:
387
-      actionPix = iconLoader->loadIcon("bookmark_add", KIcon::Small, lv->getActionIconSize());
387
+      actionPix = iconLoader->loadIcon("bookmark_add", TDEIcon::Small, lv->getActionIconSize());
388 388
     break;
389 389
 
390 390
     case RemoveBookMark:
391
-      actionPix = iconLoader->loadIcon("remove", KIcon::Small, lv->getActionIconSize());
391
+      actionPix = iconLoader->loadIcon("remove", TDEIcon::Small, lv->getActionIconSize());
392 392
     break;
393 393
 
394 394
     case OpenGroup:
395 395
       if( TQApplication::reverseLayout() )
396
-        actionPix = iconLoader->loadIcon("1leftarrow", KIcon::Small, lv->getActionIconSize());
396
+        actionPix = iconLoader->loadIcon("1leftarrow", TDEIcon::Small, lv->getActionIconSize());
397 397
       else
398
-        actionPix = iconLoader->loadIcon("1rightarrow", KIcon::Small, lv->getActionIconSize());
398
+        actionPix = iconLoader->loadIcon("1rightarrow", TDEIcon::Small, lv->getActionIconSize());
399 399
     break;
400 400
 
401 401
     case Expand:
402
-      actionPix = iconLoader->loadIcon("1downarrow", KIcon::Small, lv->getActionIconSize());
402
+      actionPix = iconLoader->loadIcon("1downarrow", TDEIcon::Small, lv->getActionIconSize());
403 403
     break;
404 404
 
405 405
     case Collapse:
406
-      actionPix = iconLoader->loadIcon("1uparrow", KIcon::Small, lv->getActionIconSize());
406
+      actionPix = iconLoader->loadIcon("1uparrow", TDEIcon::Small, lv->getActionIconSize());
407 407
     break;
408 408
 
409 409
     default:
@@ -437,7 +437,7 @@ TQString TastyListViewItem::key( int column, bool ascending ) const
437 437
 
438 438
 void TastyListViewItem::setup ( )
439 439
 {
440
-  //KListViewItem::setup();
440
+  //TDEListViewItem::setup();
441 441
 
442 442
   //calculate listitem height
443 443
   TQFontMetrics fm( listView()->font() );
@@ -466,7 +466,7 @@ void TastyListViewItem::paintCell ( TQPainter * p, const TQColorGroup & cg, int
466 466
 
467 467
   TQColor fillColor, textColor;
468 468
 
469
-# if KDE_VERSION < KDE_MAKE_VERSION(3,3,91)
469
+# if TDE_VERSION < TDE_MAKE_VERSION(3,3,91)
470 470
 #   define BackgroundColor  backgroundColor()
471 471
 # else
472 472
 #   define BackgroundColor  backgroundColor(0)

+ 10
- 10
src/tastylistview.h View File

@@ -22,7 +22,7 @@
22 22
 #ifndef TASTYLISTVIEW_H
23 23
 #define TASTYLISTVIEW_H
24 24
 
25
-#include <klistview.h>
25
+#include <tdelistview.h>
26 26
 #include <kiconloader.h>
27 27
 #include <kservice.h>
28 28
 #include <kservicegroup.h>
@@ -53,7 +53,7 @@ class TastyListViewToolTip: public TQToolTip
53 53
 /**
54 54
 	@author Marco Martin <notmart@gmail.com>
55 55
 */
56
-class TastyListView : public KListView
56
+class TastyListView : public TDEListView
57 57
 {
58 58
     Q_OBJECT
59 59
 private:
@@ -88,7 +88,7 @@ public:
88 88
     void setOpenItem( TQListViewItem * listItem ){openItem = listItem;}
89 89
 
90 90
 public slots:
91
-  virtual void clear(){openItem = underCursorItem = NULL; KListView::clear();}
91
+  virtual void clear(){openItem = underCursorItem = NULL; TDEListView::clear();}
92 92
 
93 93
 
94 94
 protected:
@@ -112,7 +112,7 @@ signals:
112 112
 /**
113 113
 	@author Marco Martin <notmart@gmail.com>
114 114
 */
115
-class TastyListViewItem : public KListViewItem
115
+class TastyListViewItem : public TDEListViewItem
116 116
 {
117 117
     //Q_OBJECT
118 118
 friend class TastyListView;
@@ -174,10 +174,10 @@ friend class TastyListView;
174 174
                 x < lv->header()->sectionPos( lv->header()->mapToIndex( 0 ) ) );}
175 175
 
176 176
     void setSubText(TQString text) //FIXME: add the column
177
-       {if(cellText.isEmpty())cellText=KListViewItem::text(0);
178
-        KListViewItem::setText(0,cellText+text);subText = TQString(text);}
177
+       {if(cellText.isEmpty())cellText=TDEListViewItem::text(0);
178
+        TDEListViewItem::setText(0,cellText+text);subText = TQString(text);}
179 179
     void setText(int column, const TQString & text )
180
-       {KListViewItem::setText(column, cellText+text); cellText = text;}
180
+       {TDEListViewItem::setText(column, cellText+text); cellText = text;}
181 181
     void setDisplaySubText( bool display ){ displaySubText = display; }
182 182
 
183 183
     bool hasEllipsis(){return ellipsis;}
@@ -192,9 +192,9 @@ friend class TastyListView;
192 192
     int width( const TQFontMetrics & fm, const TQListView * lv, int c )
193 193
     {  TastyListView *tlv = dynamic_cast<TastyListView *>( listView() );
194 194
        if( tlv )
195
-         return KListViewItem::width(fm, lv, c) + tlv->getActionIconSpace();
195
+         return TDEListViewItem::width(fm, lv, c) + tlv->getActionIconSpace();
196 196
        else
197
-         return KListViewItem::width(fm, lv, c);
197
+         return TDEListViewItem::width(fm, lv, c);
198 198
     }
199 199
 
200 200
 protected:
@@ -214,7 +214,7 @@ private:
214 214
     bool highLight;
215 215
     bool displaySubText;
216 216
     TQPixmap actionPix;
217
-    KIconLoader *iconLoader;
217
+    TDEIconLoader *iconLoader;
218 218
 
219 219
     void commonConstructor();
220 220
     //a tiny reimplementation of max...

+ 36
- 36
src/tastymenu.cpp View File

@@ -20,15 +20,15 @@
20 20
  ***************************************************************************/
21 21
 
22 22
 
23
-#include <kglobal.h>
24
-#include <klocale.h>
25
-#include <kconfig.h>
26
-#include <kapplication.h>
27
-#include <kmessagebox.h>
28
-#include <kconfigdialog.h>
29
-#include <kaboutdata.h>
30
-#include <kaboutapplication.h>
31
-#include <kpopupmenu.h>
23
+#include <tdeglobal.h>
24
+#include <tdelocale.h>
25
+#include <tdeconfig.h>
26
+#include <tdeapplication.h>
27
+#include <tdemessagebox.h>
28
+#include <tdeconfigdialog.h>
29
+#include <tdeaboutdata.h>
30
+#include <tdeaboutapplication.h>
31
+#include <tdepopupmenu.h>
32 32
 #include <kkeydialog.h>
33 33
 #include <kuser.h>
34 34
 #include <kstandarddirs.h>
@@ -51,7 +51,7 @@ TastyMenu::TastyMenu(const TQString& configFile, Type type, int actions, TQWidge
51 51
     prefSkel = new Prefs(kConfig);
52 52
     prefSkel->readConfig();
53 53
 
54
-    kickerConf = KGlobal::config();
54
+    kickerConf = TDEGlobal::config();
55 55
     kickerConf->setGroup("buttons");
56 56
     _showBigToolTip = kickerConf->readBoolEntry("EnableIconZoom", true);
57 57
 
@@ -80,12 +80,12 @@ TastyMenu::TastyMenu(const TQString& configFile, Type type, int actions, TQWidge
80 80
     if( !_toolTipTitle.isEmpty() )
81 81
       menuTip->setTitle(_toolTipTitle);
82 82
 
83
-    if( height() >= KIcon::SizeMedium )
83
+    if( height() >= TDEIcon::SizeMedium )
84 84
       button->setUsesBigPixmap(true);
85 85
     else
86 86
       button->setUsesBigPixmap(false);
87 87
 
88
-    iconLoader = KGlobal::iconLoader();
88
+    iconLoader = TDEGlobal::iconLoader();
89 89
 
90 90
     loadMenuButtonIcon();
91 91
 
@@ -108,7 +108,7 @@ TastyMenu::TastyMenu(const TQString& configFile, Type type, int actions, TQWidge
108 108
 TastyMenu::~TastyMenu()
109 109
 {
110 110
   //delete prefSkel;
111
-  KGlobal::locale()->removeCatalogue("tastymenu");
111
+  TDEGlobal::locale()->removeCatalogue("tastymenu");
112 112
 }
113 113
 
114 114
 void TastyMenu::loadMenuButtonIcon()
@@ -129,13 +129,13 @@ void TastyMenu::loadMenuButtonIcon()
129 129
   else if(position() == pLeft || position() == pRight)
130 130
     _iconsize = width();
131 131
 
132
-  TQPixmap btnPixmap(iconLoader->loadIcon(_menuButtonIcon, KIcon::Panel, _iconsize));
132
+  TQPixmap btnPixmap(iconLoader->loadIcon(_menuButtonIcon, TDEIcon::Panel, _iconsize));
133 133
   if( !btnPixmap.isNull() )
134 134
     button->setIconSet(btnPixmap);
135 135
   else
136 136
   {
137 137
     kdDebug() << "Failed to load custom icon" << endl;
138
-    button->setIconSet(iconLoader->loadIcon("kmenu", KIcon::Panel, height()));
138
+    button->setIconSet(iconLoader->loadIcon("kmenu", TDEIcon::Panel, height()));
139 139
   }
140 140
 }
141 141
 
@@ -180,11 +180,11 @@ void TastyMenu::clickSlot()
180 180
 
181 181
 void TastyMenu::about()
182 182
 {
183
-  KAboutData data("tastymenu",
183
+  TDEAboutData data("tastymenu",
184 184
                   I18N_NOOP("Tasty Menu"),
185 185
                   "1.0.6",
186
-                  I18N_NOOP("KMenu replacement"),
187
-                  KAboutData::License_LGPL_V2,
186
+                  I18N_NOOP("TMenu replacement"),
187
+                  TDEAboutData::License_LGPL_V2,
188 188
                   "(c) 2006-2007, Marco Martin",0,0,"mart@notmart.org");
189 189
 
190 190
   data.addAuthor("Marco Martin",
@@ -225,7 +225,7 @@ void TastyMenu::about()
225 225
 
226 226
 
227 227
   data.addCredit("Oswald Buddenhagen and Stephan Kulow",
228
-                  I18N_NOOP("For the Switch user code from KDM"),
228
+                  I18N_NOOP("For the Switch user code from TDM"),
229 229
                   "ossi@kde.org and coolo@kde.org");
230 230
 
231 231
   data.addCredit("The whole KBFX team",
@@ -236,34 +236,34 @@ void TastyMenu::about()
236 236
                  I18N_NOOP("For some code taken from Amarok's statistics list view"),
237 237
                  "me@sebruiz.net");
238 238
 
239
-  KIconLoader *iconLoader = KGlobal::iconLoader();
240
-  data.setProgramLogo(iconLoader->loadIcon("kmenu", KIcon::Panel).convertToImage());
239
+  TDEIconLoader *iconLoader = TDEGlobal::iconLoader();
240
+  data.setProgramLogo(iconLoader->loadIcon("kmenu", TDEIcon::Panel).convertToImage());
241 241
 
242
-  KAboutApplication dialog(&data);
242
+  TDEAboutApplication dialog(&data);
243 243
   dialog.exec();
244 244
 }
245 245
 
246 246
 
247 247
 void TastyMenu::help()
248 248
 {
249
-  KApplication::kdeinitExec("khelpcenter", "help:/tastymenu");
249
+  TDEApplication::tdeinitExec("khelpcenter", "help:/tastymenu");
250 250
 }
251 251
 
252 252
 
253 253
 void TastyMenu::preferences()
254 254
 {
255
-  if(KConfigDialog::showDialog("settings"))
255
+  if(TDEConfigDialog::showDialog("settings"))
256 256
     return;
257 257
 
258 258
   Appearance *appearanceDialog = new Appearance(0, "appearance" );
259 259
   Behaviour *behaviourDialog = new Behaviour(0, "behaviour" );
260 260
 
261
-  KConfigDialog *dialog = new KConfigDialog(this, "settings", prefSkel,
261
+  TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", prefSkel,
262 262
                                             KDialogBase::Tabbed,
263
-                                            KConfigDialog::Default|
264
-                                            KConfigDialog::Ok|
265
-                                            KConfigDialog::Apply|
266
-                                            KConfigDialog::Cancel );
263
+                                            TDEConfigDialog::Default|
264
+                                            TDEConfigDialog::Ok|
265
+                                            TDEConfigDialog::Apply|
266
+                                            TDEConfigDialog::Cancel );
267 267
   dialog->addPage(appearanceDialog, i18n("Appearance"), "appearance" );
268 268
   dialog->addPage(behaviourDialog, i18n("Behaviour"), "behaviour" );
269 269
   connect( dialog, SIGNAL(settingsChanged()),
@@ -273,7 +273,7 @@ void TastyMenu::preferences()
273 273
 
274 274
 void TastyMenu::setGlobalAccel( bool global )
275 275
 {
276
-  globalAccel = new KGlobalAccel(this);
276
+  globalAccel = new TDEGlobalAccel(this);
277 277
   globalAccel->insert("Toggle Tasty Menu", i18n("Toggle Tasty Menu"),
278 278
                       i18n("Toggle Tasty Menu"),
279 279
                       0, 0, this, SLOT(clickSlot()));
@@ -284,14 +284,14 @@ void TastyMenu::setGlobalAccel( bool global )
284 284
   if( global )
285 285
   {
286 286
     if( !kickerConf )
287
-      kickerConf = KGlobal::config();
287
+      kickerConf = TDEGlobal::config();
288 288
 
289 289
     kickerConf->setGroup("Global Shortcuts");
290 290
     TQString kmenuShortcut = kickerConf->readEntry("Popup Launch Menu", "default(Alt+F1)");
291 291
     if( kmenuShortcut=="none" )
292 292
       return;
293 293
     TQString tastyMenuShortcut = kickerConf->readEntry("Toggle Tasty Menu", "");
294
-    KShortcut shortCutKey(tastyMenuShortcut);
294
+    TDEShortcut shortCutKey(tastyMenuShortcut);
295 295
     kickerConf->writeEntry("Popup Launch Menu", "none");
296 296
     kickerConf->writeEntry("Toggle Tasty Menu", kmenuShortcut);
297 297
     kickerConf->sync();
@@ -300,7 +300,7 @@ void TastyMenu::setGlobalAccel( bool global )
300 300
   else
301 301
   {
302 302
     if( !kickerConf )
303
-      kickerConf = KGlobal::config();
303
+      kickerConf = TDEGlobal::config();
304 304
     kickerConf->setGroup("Global Shortcuts");
305 305
     kickerConf->deleteEntry("Popup Launch Menu");
306 306
     kickerConf->sync();
@@ -396,7 +396,7 @@ void TastyMenu::resizeEvent(TQResizeEvent *e)
396 396
   button->setFixedHeight(newHeight);
397 397
   button->setFixedWidth(e->size().width());
398 398
 
399
-  if( newHeight >= KIcon::SizeMedium )
399
+  if( newHeight >= TDEIcon::SizeMedium )
400 400
     button->setUsesBigPixmap(true);
401 401
   else
402 402
     button->setUsesBigPixmap(false);
@@ -411,7 +411,7 @@ void TastyMenu::mousePressEvent(TQMouseEvent *e)
411 411
 
412 412
   if(e->button()==RightButton)
413 413
   {
414
-    KPopupMenu menu(this);
414
+    TDEPopupMenu menu(this);
415 415
 
416 416
     menu.insertTitle("Tasty Menu");
417 417
     menu.insertItem(SmallIcon("kmenu"), i18n("&About"), 1);
@@ -484,7 +484,7 @@ extern "C"
484 484
 {
485 485
     KPanelApplet* init( TQWidget *parent, const TQString& configFile)
486 486
     {
487
-        KGlobal::locale()->insertCatalogue("tastymenu");
487
+        TDEGlobal::locale()->insertCatalogue("tastymenu");
488 488
         return new TastyMenu(configFile, KPanelApplet::Normal,
489 489
                              KPanelApplet::About | KPanelApplet::Help | KPanelApplet::Preferences,
490 490
                              parent, "tastymenu");

+ 3
- 3
src/tastymenu.desktop View File

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

+ 6
- 6
src/tastymenu.h View File

@@ -30,9 +30,9 @@
30 30
 #include <kpanelapplet.h>
31 31
 #include <kiconloader.h>
32 32
 #include <tqstring.h>
33
-#include <kconfig.h>
33
+#include <tdeconfig.h>
34 34
 #include <tqpopupmenu.h>
35
-#include <kconfigskeleton.h>
35
+#include <tdeconfigskeleton.h>
36 36
 #include <kglobalaccel.h>
37 37
 #include <tqpainter.h>
38 38
 
@@ -132,15 +132,15 @@ protected:
132 132
     virtual void leaveEvent( TQEvent * e );
133 133
 
134 134
 private:
135
-    KSharedConfig *kConfig;
135
+    TDESharedConfig *kConfig;
136 136
     Prefs *prefSkel;
137
-    KConfig *kickerConf;
137
+    TDEConfig *kickerConf;
138 138
     MenuHandler *menuHandler;
139 139
     TastyButton *button;
140 140
     TastyToolTip *menuTip;
141 141
     TQPoint menupos(TQWidget *widget);
142
-    KGlobalAccel *globalAccel;
143
-    KIconLoader *iconLoader;
142
+    TDEGlobalAccel *globalAccel;
143
+    TDEIconLoader *iconLoader;
144 144
     int numNewApplications;
145 145
 
146 146
 

+ 2
- 2
src/tastymenu.lsm View File

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

+ 5
- 5
src/tastytooltip.cpp View File

@@ -39,15 +39,15 @@ TastyToolTip::TastyToolTip( TQWidget * parent,const char * name, WFlags fl)
39 39
 void TastyToolTip::loadIcon( TQString icon )
40 40
 {
41 41
   iconName = icon;
42
-  KIconLoader *iconLoader = KGlobal::iconLoader();
43
-  TQPixmap btnPixmap(iconLoader->loadIcon(icon, KIcon::Panel, KIcon::SizeHuge));
42
+  TDEIconLoader *iconLoader = TDEGlobal::iconLoader();
43
+  TQPixmap btnPixmap(iconLoader->loadIcon(icon, TDEIcon::Panel, TDEIcon::SizeHuge));
44 44
 
45 45
   if( !btnPixmap.isNull() )
46 46
     toolTipWidget->iconPixmap->setPixmap(btnPixmap);
47 47
   else
48 48
   {
49 49
     kdDebug() << "Failed to load custom icon" << endl;
50
-    toolTipWidget->iconPixmap->setPixmap(iconLoader->loadIcon("kmenu", KIcon::Panel, KIcon::SizeHuge));
50
+    toolTipWidget->iconPixmap->setPixmap(iconLoader->loadIcon("kmenu", TDEIcon::Panel, TDEIcon::SizeHuge));
51 51
   }
52 52
 }
53 53
 
@@ -83,11 +83,11 @@ void TastyToolTip::notify(const TQPoint & point )
83 83
 
84 84
 void TastyToolTip::setMessage( TQString message )
85 85
 {
86
-  KIconLoader *iconLoader = KGlobal::iconLoader();
86
+  TDEIconLoader *iconLoader = TDEGlobal::iconLoader();
87 87
   toolTipWidget->MessageLabel->setText(message);
88 88
 
89 89
   if( message.length() > 0 )
90
-    toolTipWidget->iconPixmap->setPixmap(iconLoader->loadIcon("messagebox_info", KIcon::Panel, KIcon::SizeHuge));
90
+    toolTipWidget->iconPixmap->setPixmap(iconLoader->loadIcon("messagebox_info", TDEIcon::Panel, TDEIcon::SizeHuge));
91 91
   else
92 92
     loadIcon(iconName);
93 93
 }

+ 4
- 4
tastymenu.spec View File

@@ -1,6 +1,6 @@
1 1
 %define version	1.0.7
2 2
 %define name	tastymenu
3
-%define prefix	%(kde-config --prefix)
3
+%define prefix	%(tde-config --prefix)
4 4
 
5 5
 Name: %{name}
6 6
 Version: %{version}
@@ -8,14 +8,14 @@ Release: 1
8 8
 Vendor: notmart@gmail.com
9 9
 Url: http://kdelook.org/content/show.php?content=27968
10 10
 License: GPL
11
-Summary: A Kmenu replacement
12
-Group: System/GUI/KDE
11
+Summary: A TMenu replacement
12
+Group: System/GUI/TDE
13 13
 Packager: Marco Martin <notmart@gmail.com>
14 14
 BuildRoot:  %{_tmppath}/%{name}-root 
15 15
 Source: %{name}-%{version}.tar.bz2
16 16
 
17 17
 %description
18
-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.
18
+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.
19 19
 
20 20
 %prep
21 21
 %setup

Loading…
Cancel
Save