diff options
Diffstat (limited to 'kbstateapplet')
| -rw-r--r-- | kbstateapplet/CMakeL10n.txt | 6 | ||||
| -rw-r--r-- | kbstateapplet/CMakeLists.txt | 39 | ||||
| -rw-r--r-- | kbstateapplet/images/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | kbstateapplet/kbstate.cpp | 38 | ||||
| -rw-r--r-- | kbstateapplet/kbstate.h | 10 | ||||
| -rw-r--r-- | kbstateapplet/kbstateapplet.desktop | 99 | ||||
| -rw-r--r-- | kbstateapplet/kdeexportfix.h | 8 |
7 files changed, 79 insertions, 124 deletions
diff --git a/kbstateapplet/CMakeL10n.txt b/kbstateapplet/CMakeL10n.txt index bc9000b..6c34e3f 100644 --- a/kbstateapplet/CMakeL10n.txt +++ b/kbstateapplet/CMakeL10n.txt @@ -1,3 +1,9 @@ ##### create translation templates ############## tde_l10n_create_template( "kbstateapplet" ) + +tde_l10n_create_template( + CATALOG "desktop_files/kbstateapplet-desktops/" + SOURCES *.desktop + DESTINATION "${CMAKE_SOURCE_DIR}/translations" +) diff --git a/kbstateapplet/CMakeLists.txt b/kbstateapplet/CMakeLists.txt new file mode 100644 index 0000000..a0ba809 --- /dev/null +++ b/kbstateapplet/CMakeLists.txt @@ -0,0 +1,39 @@ +add_subdirectory( images ) + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${X11_INCLUDE_DIR} + ${X11_Xkb_INCLUDE_PATH} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### kbstate_panelapplet (kpart) + +tde_add_kpart( kbstate_panelapplet MODULE AUTOMOC + + SOURCES + kbstate.cpp + LINK + tdeui-shared + tdecore-shared + + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### other data + +tde_create_translated_desktop( + SOURCE kbstateapplet.desktop + DESTINATION ${DATA_INSTALL_DIR}/kicker/applets + PO_DIR kbstateapplet-desktops +) diff --git a/kbstateapplet/images/CMakeLists.txt b/kbstateapplet/images/CMakeLists.txt new file mode 100644 index 0000000..4564c0c --- /dev/null +++ b/kbstateapplet/images/CMakeLists.txt @@ -0,0 +1,3 @@ +##### icons + +tde_install_icons( DESTINATION ${DATA_INSTALL_DIR}/kbstateapplet/icons ) diff --git a/kbstateapplet/kbstate.cpp b/kbstateapplet/kbstate.cpp index e0bf552..9de6931 100644 --- a/kbstateapplet/kbstate.cpp +++ b/kbstateapplet/kbstate.cpp @@ -50,7 +50,7 @@ extern "C" #include <X11/keysymdef.h> #include <X11/extensions/XKB.h> - KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) + TDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { TDEGlobal::locale()->insertCatalogue("kbstateapplet"); KbStateApplet *applet = new KbStateApplet(configFile, KPanelApplet::Normal, KPanelApplet::About, parent, "kbstateapplet"); @@ -113,7 +113,7 @@ KbStateApplet::KbStateApplet(const TQString& configFile, Type t, int actions, accessxFeatures = 0; //startTimer(100); // ten times a second - connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(paletteChanged())); + connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(paletteChanged())); kapp->installX11EventFilter (this); int opcode_rtn, error_rtn; @@ -139,27 +139,27 @@ void KbStateApplet::buildPopupMenu() sizePopup->insertItem(i18n("Small"), 13); sizePopup->insertItem(i18n("Medium"), 20); sizePopup->insertItem(i18n("Large"), 26); - connect(sizePopup,TQT_SIGNAL(activated(int)), this, TQT_SLOT(setIconDim(int))); + connect(sizePopup,TQ_SIGNAL(activated(int)), this, TQ_SLOT(setIconDim(int))); showPopup=new TDEPopupMenu(this); showPopup->setCheckable( true ); - modifierItem=showPopup->insertItem(i18n("Modifier Keys"), this, TQT_SLOT(toggleModifier())); - lockkeysItem=showPopup->insertItem(i18n("Lock Keys"), this, TQT_SLOT(toggleLockkeys())); - mouseItem=showPopup->insertItem(i18n("Mouse Status"), this, TQT_SLOT(toggleMouse())); - accessxItem=showPopup->insertItem(i18n("AccessX Status"), this, TQT_SLOT(toggleAccessX())); + modifierItem=showPopup->insertItem(i18n("Modifier Keys"), this, TQ_SLOT(toggleModifier())); + lockkeysItem=showPopup->insertItem(i18n("Lock Keys"), this, TQ_SLOT(toggleLockkeys())); + mouseItem=showPopup->insertItem(i18n("Mouse Status"), this, TQ_SLOT(toggleMouse())); + accessxItem=showPopup->insertItem(i18n("AccessX Status"), this, TQ_SLOT(toggleAccessX())); popup = new TDEPopupMenu(this); popup->setCheckable( true ); popup->insertTitle(0, i18n("Keyboard Status Applet")); popup->insertItem(i18n("Set Icon Size"),sizePopup); fillSpaceItem = popup->insertItem(i18n("Fill Available Space"), - this, TQT_SLOT(toggleFillSpace())); + this, TQ_SLOT(toggleFillSpace())); popup->insertItem(i18n("Show"),showPopup); - popup->insertItem(i18n("Configure AccessX Features..."), this, TQT_SLOT(configureAccessX())); - popup->insertItem(i18n("Configure Keyboard..."), this, TQT_SLOT(configureKeyboard())); - popup->insertItem(i18n("Configure Mouse..."), this, TQT_SLOT(configureMouse())); + popup->insertItem(i18n("Configure AccessX Features..."), this, TQ_SLOT(configureAccessX())); + popup->insertItem(i18n("Configure Keyboard..."), this, TQ_SLOT(configureKeyboard())); + popup->insertItem(i18n("Configure Mouse..."), this, TQ_SLOT(configureMouse())); popup->insertSeparator(); - popup->insertItem(i18n("About"), this, TQT_SLOT(about())); + popup->insertItem(i18n("About"), this, TQ_SLOT(about())); setCustomMenu(popup); updateMenu(); } @@ -264,7 +264,7 @@ int KbStateApplet::heightForWidth(int w) const { } void KbStateApplet::mousePressEvent(TQMouseEvent *e) { - if (e->button() == Qt::RightButton) + if (e->button() == TQt::RightButton) popup->popup(e->globalPos()); } @@ -308,7 +308,7 @@ void KbStateApplet::layout() { accessxCount++; } - if (orientation() ==Qt::Vertical) { + if (orientation() ==TQt::Vertical) { calculateSizes (width(), modifierCount, lockkeyCount, accessxCount, showMouse, lines, length, size); @@ -547,8 +547,8 @@ void KbStateApplet::initMasks() { if ((map <= 7) && !(icons[map])) { icons[map] = new KeyIcon (i, instance, this, modifierKeys[i].name); TQToolTip::add (icons[map], i18n (modifierKeys[i].name)); - connect (icons[map], TQT_SIGNAL(stateChangeRequest (KeyIcon*,bool,bool)), - TQT_SLOT(stateChangeRequest (KeyIcon*,bool,bool))); + connect (icons[map], TQ_SIGNAL(stateChangeRequest (KeyIcon*,bool,bool)), + TQ_SLOT(stateChangeRequest (KeyIcon*,bool,bool))); if (modifierKeys[i].isModifier) modifiers.append(icons[map]); else @@ -755,7 +755,7 @@ KeyIcon::KeyIcon (int keyId, TDEInstance *instance, isLocked = false; isLatched = false; updateImages (); - connect (this, TQT_SIGNAL(clicked()), TQT_SLOT(clickedSlot())); + connect (this, TQ_SIGNAL(clicked()), TQ_SLOT(clickedSlot())); } KeyIcon::~KeyIcon () { @@ -862,7 +862,7 @@ MouseIcon::MouseIcon (TDEInstance *instance, TQWidget *parent, const char *name) state = 0; activekey = 0; updateImages (); - connect (this, TQT_SIGNAL(clicked()), TQT_SLOT(clickedSlot())); + connect (this, TQ_SIGNAL(clicked()), TQ_SLOT(clickedSlot())); } MouseIcon::~MouseIcon () { @@ -964,7 +964,7 @@ TimeoutIcon::TimeoutIcon (TDEInstance *instance, const TQString &text, this->featurename = featurename; glyth = " "; setImage (featurename); - connect (&timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout())); + connect (&timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeout())); } TimeoutIcon::~TimeoutIcon () { diff --git a/kbstateapplet/kbstate.h b/kbstateapplet/kbstate.h index da09d48..854d61c 100644 --- a/kbstateapplet/kbstate.h +++ b/kbstateapplet/kbstate.h @@ -34,7 +34,7 @@ class TQGridLayout; class TDEPopupMenu; class StatusIcon : public TQPushButton { - Q_OBJECT + TQ_OBJECT public: StatusIcon (const TQString &text, TQWidget *parent, const char *name=0); @@ -45,7 +45,7 @@ public: typedef TQPtrList<StatusIcon> IconList; class TimeoutIcon : public StatusIcon { - Q_OBJECT + TQ_OBJECT public: TimeoutIcon (TDEInstance *instance, const TQString &text, @@ -73,7 +73,7 @@ private slots: }; class KeyIcon : public StatusIcon { - Q_OBJECT + TQ_OBJECT public: KeyIcon (int keyId, TDEInstance *instance, @@ -104,7 +104,7 @@ private: }; class MouseIcon : public StatusIcon { - Q_OBJECT + TQ_OBJECT public: MouseIcon (TDEInstance *instance, TQWidget *parent, const char *name=0); @@ -133,7 +133,7 @@ class MouseIcon : public StatusIcon { }; class KbStateApplet : public KPanelApplet { - Q_OBJECT + TQ_OBJECT public: diff --git a/kbstateapplet/kbstateapplet.desktop b/kbstateapplet/kbstateapplet.desktop index 70f60cb..5ae9f86 100644 --- a/kbstateapplet/kbstateapplet.desktop +++ b/kbstateapplet/kbstateapplet.desktop @@ -1,101 +1,8 @@ [Desktop Entry] -Type=Plugin Name=Keyboard Status Applet -Name[bg]=Състояние на клавиатурата -Name[br]=Arloadig stad ar stokellaoueg -Name[ca]=Applet d'estat del teclat -Name[cs]=Applet ukazují stav klávesnice -Name[da]=Tastaturstatus-applet -Name[de]=Tastaturstatus -Name[el]=Μικροεφαρμογή κατάστασης πληκτρολογίου -Name[es]=Aplicación integrada en el panel con el estado del teclado -Name[et]=Klaviatuuristaatuse aplett -Name[eu]=Teklatuaren egoeraren applet-a -Name[fa]=برنامک وضعیت صفحه کلید -Name[fi]=Näppäimistötilan sovelma -Name[fr]=Applet d'état du clavier -Name[ga]=Feidhmchláirín Stádais an Mhéarchláir -Name[gl]=Applet de Estado do Teclado -Name[he]=יישומון מצב המקלדת -Name[hi]=कुंजीपट स्थिति ऐप्लेट -Name[hu]=Billentyűállapot-jelző -Name[is]=Lyklaborðsstöðu smáforrit -Name[it]=Applet per lo stato della tastiera -Name[ja]=キーボード状態アプレット -Name[ka]=კლავიატურის სტატუსის აპლეტი -Name[km]= អាប់ភ្លេតស្ថានភាពក្ដារចុច -Name[lt]=Klaviatūros būklės įskiepis -Name[mk]=Аплет за статус на тастатурата -Name[ms]=Aplet Status Papan Kekunci -Name[nb]=Miniprogram for tastaturstatus -Name[nds]=Tastatuurstatus-Lüttprogramm -Name[ne]=कुञ्जीपाटी वस्तुस्थिति एप्लेट -Name[nl]=Toetsenbordstatus-applet -Name[pa]=ਕੀ-ਬੋਰਡ ਸਥਿਤੀ ਐਪਲਿਟ -Name[pl]=Aplet stanu klawiatury -Name[pt]='Applet' de estado do teclado -Name[pt_BR]=Mini-aplicativo de status do teclado -Name[ru]=Аплет состояния клавиатуры -Name[sk]=Applet Stav klávesnice -Name[sl]=Vstavek za stanje tipkovnice -Name[sr]=Аплет за статус тастатуре -Name[sr@Latn]=Aplet za status tastature -Name[sv]=Miniprogram för tangentbordsstatus -Name[ta]=விசைப்பலகை நிலை குறுநிரல் -Name[tg]=Апплети ҳолати радифи ҳарфҳо -Name[th]=แอพเพล็ตสถานะแป้นพิมพ์ -Name[tr]=Klavye Durum Uygulaması -Name[uk]=Аплет стану клавіатури -Name[vi]=Tiểu dụng Trạng thái Bàn phím -Name[zh_CN]=键盘状态小程序 -Name[zh_TW]=鍵盤狀態小程式 + Comment=Panel applet that shows the state of the modifier keys -Comment[bg]=Аплет за системния панел, които показва състоянието на клавишите модификатори -Comment[bs]=Panel applet koji pokazuje stanje modifikatorskih tipaka -Comment[ca]=Applet del plafó que mostra l'estat de les tecles modificadores -Comment[cs]=Applet, který zobrazuje stav klávesnice -Comment[da]=Panelprogram der viser tilstanden for ændringstaster -Comment[de]=Ein Miniprogramm für die Kontrollleiste, das den Status der Sondertasten anzeigt -Comment[el]=Μικροεφαρμογή του πίνακα που εμφανίζει την κατάσταση των πλήκτρων τροποποίησης -Comment[es]=Aplicación integrada en el panel que muestra el estado de las teclas modificadoras -Comment[et]=Paneeliaplett, mis näitab muuteklahvide olekut -Comment[eu]=Panelaren applet-ak tekla aldatzaileen egoera erakusten du -Comment[fa]=برنامک تابلو که وضعیت کلیدهای تغییردهنده را نمایش میدهد -Comment[fi]=Muunnosnäppäinten tilan näyttävä paneelisovelma -Comment[fr]=Applet du tableau de bord affichant l'état des touches de modifications -Comment[ga]=Feidhmchláirín painéil a thaispeánann staid na n-eochracha mionathraithe -Comment[gl]=Applet do painel que mostra o estado das teclas modificadoras -Comment[hi]=फलक ऐप्लेट जो कि परिवर्धक कुंजियों की स्थिति दिखाता है -Comment[hu]=Panel-kisalkalmazás a módosítóbillentyűk állapotának kiírásához -Comment[is]=Spjaldforrit sem sýnir stöðu breytilykla -Comment[it]=Applet del pannello che mostra lo stato dei tasti modificatori -Comment[ja]=修飾キーの状態を表示するパネルアプレット -Comment[ka]=პანელის აპლეტი, რომელიც მოდიფიკატორ კლავიშთა მდგომარეობას ასახავს -Comment[km]=អាប់ភ្លេតបន្ទះដែលបង្ហាញស្ថានភាពរបស់គ្រាប់ចុចកែប្រែ -Comment[lt]=Pulto įskiepis rodantis klaviatūros modifikuojančiųjų klavišų būseną -Comment[mk]=Аплет на панелот што ја покажува состојбата на копчињата за менување -Comment[ms]=Panel aplet yang menayangkan keadaan kekunci pengubah suai -Comment[nb]=Panel-miniprogram som viser tilstanden for valgtastene -Comment[nds]=Paneel-Lüttprogramm, dat den Tostand vun de Sünnertasten wiest -Comment[ne]=परिमार्जक कुञ्जीको वस्तुस्थिति देखाउने प्यानल ऐप्लेट -Comment[nl]=Een paneelapplet dat de status van de modificatietoetsen weergeeft -Comment[pa]=ਸੋਧਕ ਸਵਿੱਚਾਂ ਦੀ ਹਾਲਤ ਵੇਖਾਉਣ ਨਾਲ ਤੁਸੀਂ ਪੈਨਲ ਐਪਲਿਟ ਵੇਖ ਸਕਦੇ ਹੋ -Comment[pl]=Apleta panelu, który pokazuje stan klawiszy modyfikujących -Comment[pt]='Applet' do painel que mostra o estado das teclas modificadoras -Comment[pt_BR]=Ícone de painel que mostra o estado das teclas modificadoras -Comment[ru]=Аплет, показывающий состояния специальных клавиш -Comment[sk]=Applet panelu, ktorý zobrazí stav modifikačných kláves -Comment[sl]=Pultni vstavek, ki prikazuje stanje modifikatorskih tipk (modifikatorjev) -Comment[sr]=Панелни аплет који приказује стање модификаторских тастера -Comment[sr@Latn]=Panelni aplet koji prikazuje stanje modifikatorskih tastera -Comment[sv]=Panelminiprogram som visar tillståndet hos väljartangenter -Comment[ta]=மாற்றி விசைகளின் நிலையைக் காட்டும் ஒரு பலக குறுநிரல் -Comment[tg]=Апплети нишонмедодаи ҳолати махсуси тугмаҳо -Comment[th]=ถาดแอพเพล็ตสำหรับแสดงสถานะของปุ่มพิมพ์ร่วม -Comment[tr]=Değiştirici tuş alanını gösteren bir panel eklentisi -Comment[uk]=Аплет панелі, який показує стан клавіш-модифікаторів -Comment[vi]=Tiểu dụng bảng điều khiển hiển thị trạng thái phím bổ trợ -Comment[zh_CN]=显示修饰键状态的面板小程序 -Comment[zh_TW]=一個顯示鍵盤狀態的面板小程式 + +Type=Plugin Icon=key_enter X-TDE-Library=kbstate_panelapplet diff --git a/kbstateapplet/kdeexportfix.h b/kbstateapplet/kdeexportfix.h index a30f3d5..8ec6f7b 100644 --- a/kbstateapplet/kdeexportfix.h +++ b/kbstateapplet/kdeexportfix.h @@ -1,5 +1,5 @@ -/***************************************************** vim:set ts=4 sw=4 sts=4: - tdelibs < 3.3.2 had a bug in the KDE_EXPORT macro. This file fixes this +/* + tdelibs < 3.3.2 had a bug in the TDE_EXPORT macro. This file fixes this by undefining it. ------------------- Copyright : (C) 2005 by Gary Cramblitt <garycramblitt@comcast.net> @@ -17,6 +17,6 @@ #include <tdeversion.h> #if TDE_VERSION < TDE_MAKE_VERSION (3,3,2) -#undef KDE_EXPORT -#define KDE_EXPORT +#undef TDE_EXPORT +#define TDE_EXPORT #endif |