diff options
Diffstat (limited to 'kicker/applets')
76 files changed, 622 insertions, 2095 deletions
diff --git a/kicker/applets/clock/CMakeLists.txt b/kicker/applets/clock/CMakeLists.txt index 0caa47d67..43923b68c 100644 --- a/kicker/applets/clock/CMakeLists.txt +++ b/kicker/applets/clock/CMakeLists.txt @@ -26,7 +26,11 @@ link_directories( ##### other data ################################ -install( FILES clockapplet.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/applets ) +tde_create_translated_desktop( + SOURCE clockapplet.desktop + DESTINATION ${DATA_INSTALL_DIR}/kicker/applets + PO_DIR kicker-desktops +) install( FILES lcd.png DESTINATION ${DATA_INSTALL_DIR}/clockapplet/pics ) diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp index 86ee8b059..f8ddf0d38 100644 --- a/kicker/applets/clock/clock.cpp +++ b/kicker/applets/clock/clock.cpp @@ -41,9 +41,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kdebug.h> #include <kcolorbutton.h> #include <kiconloader.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdelocale.h> #include <tdepopupmenu.h> #include <kstringhandler.h> @@ -84,7 +84,7 @@ TDEConfigDialogSingle::TDEConfigDialogSingle(Zone *zone, TQWidget *parent, setIcon(SmallIcon("date")); settings = new SettingsWidgetImp(prefs, zone, 0, "General"); - connect(TQT_TQOBJECT(settings->kcfg_Type), TQT_SIGNAL(activated(int)), TQT_SLOT(selectPage(int))); + connect(settings->kcfg_Type, TQ_SIGNAL(activated(int)), TQ_SLOT(selectPage(int))); settings->kcfg_PlainBackgroundColor->setDefaultColor(TDEApplication::palette().active().background()); settings->kcfg_DateBackgroundColor->setDefaultColor(TDEApplication::palette().active().background()); @@ -104,24 +104,24 @@ TDEConfigDialogSingle::TDEConfigDialogSingle(Zone *zone, TQWidget *parent, settings->widgetStack->addWidget(fuzzyPage, 3); fuzzyPage->kcfg_FuzzyBackgroundColor->setDefaultColor(TDEApplication::palette().active().background()); - connect(TQT_TQOBJECT(settings->kcfg_PlainShowDate), TQT_SIGNAL(toggled(bool)), - TQT_SLOT(dateToggled())); - connect(TQT_TQOBJECT(settings->kcfg_PlainShowDayOfWeek), TQT_SIGNAL(toggled(bool)), - TQT_SLOT(dateToggled())); - connect(TQT_TQOBJECT(digitalPage->kcfg_DigitalShowDate), TQT_SIGNAL(toggled(bool)), - TQT_SLOT(dateToggled())); - connect(TQT_TQOBJECT(digitalPage->kcfg_DigitalShowDayOfWeek), TQT_SIGNAL(toggled(bool)), - TQT_SLOT(dateToggled())); - connect(TQT_TQOBJECT(digitalPage->kcfg_DigitalShowDate), TQT_SIGNAL(toggled(bool)), - TQT_SLOT(dateToggled())); - connect(TQT_TQOBJECT(analogPage->kcfg_AnalogShowDate), TQT_SIGNAL(toggled(bool)), - TQT_SLOT(dateToggled())); - connect(TQT_TQOBJECT(analogPage->kcfg_AnalogShowDayOfWeek), TQT_SIGNAL(toggled(bool)), - TQT_SLOT(dateToggled())); - connect(TQT_TQOBJECT(fuzzyPage->kcfg_FuzzyShowDate), TQT_SIGNAL(toggled(bool)), - TQT_SLOT(dateToggled())); - connect(TQT_TQOBJECT(fuzzyPage->kcfg_FuzzyShowDayOfWeek), TQT_SIGNAL(toggled(bool)), - TQT_SLOT(dateToggled())); + connect(settings->kcfg_PlainShowDate, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(dateToggled())); + connect(settings->kcfg_PlainShowDayOfWeek, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(dateToggled())); + connect(digitalPage->kcfg_DigitalShowDate, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(dateToggled())); + connect(digitalPage->kcfg_DigitalShowDayOfWeek, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(dateToggled())); + connect(digitalPage->kcfg_DigitalShowDate, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(dateToggled())); + connect(analogPage->kcfg_AnalogShowDate, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(dateToggled())); + connect(analogPage->kcfg_AnalogShowDayOfWeek, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(dateToggled())); + connect(fuzzyPage->kcfg_FuzzyShowDate, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(dateToggled())); + connect(fuzzyPage->kcfg_FuzzyShowDayOfWeek, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(dateToggled())); addPage(settings, i18n("General"), TQString::fromLatin1("package_settings")); } @@ -144,7 +144,7 @@ void TDEConfigDialogSingle::updateWidgetsDefault() item->swapDefault(); // This is ugly, but kcfg_Type does not have its correct setting // at this point in time. - TQTimer::singleShot(0, this, TQT_SLOT(dateToggled())); + TQTimer::singleShot(0, this, TQ_SLOT(dateToggled())); } void TDEConfigDialogSingle::selectPage(int p) @@ -353,9 +353,9 @@ void DigitalClock::updateClock() if (_force || newStr != _timeStr) { _timeStr = newStr; - setUpdatesEnabled( FALSE ); + setUpdatesEnabled( false ); display(_timeStr); - setUpdatesEnabled( TRUE ); + setUpdatesEnabled( true ); update(); } @@ -415,7 +415,7 @@ void DigitalClock::paintEvent(TQPaintEvent*) // but other colors would break the lcd-lock anyway void DigitalClock::drawContents( TQPainter * p) { - setUpdatesEnabled( FALSE ); + setUpdatesEnabled( false ); TQPalette pal = palette(); if (_prefs->digitalLCDStyle()) pal.setColor( TQColorGroup::Foreground, TQColor(128,128,128)); @@ -425,12 +425,12 @@ void DigitalClock::drawContents( TQPainter * p) p->translate( +1, +1 ); TQLCDNumber::drawContents( p ); if (_prefs->digitalLCDStyle()) - pal.setColor( TQColorGroup::Foreground, Qt::black); + pal.setColor( TQColorGroup::Foreground, TQt::black); else pal.setColor( TQColorGroup::Foreground, _prefs->digitalForegroundColor()); setPalette( pal ); p->translate( -2, -2 ); - setUpdatesEnabled( TRUE ); + setUpdatesEnabled( true ); TQLCDNumber::drawContents( p ); p->translate( +1, +1 ); } @@ -633,8 +633,8 @@ void AnalogClock::paintEvent( TQPaintEvent * ) } if (_prefs->analogLCDStyle()) { - paint.setPen( TQPen(Qt::black, aaFactor) ); - paint.setBrush( Qt::black ); + paint.setPen( TQPen(TQt::black, aaFactor) ); + paint.setBrush( TQt::black ); } else { paint.setPen( TQPen(_prefs->analogForegroundColor(), aaFactor) ); paint.setBrush( _prefs->analogForegroundColor() ); @@ -743,7 +743,7 @@ FuzzyClock::FuzzyClock(ClockApplet *applet, Prefs *prefs, TQWidget *parent, cons void FuzzyClock::deleteMyself() { if(alreadyDrawing) // try again later - TQTimer::singleShot(1000, this, TQT_SLOT(deleteMyself())); + TQTimer::singleShot(1000, this, TQ_SLOT(deleteMyself())); else delete this; } @@ -854,7 +854,7 @@ void FuzzyClock::drawContents(TQPainter *p) TQRect tr; - if (_applet->getOrientation() == Qt::Vertical) + if (_applet->getOrientation() == TQt::Vertical) { p->rotate(90); tr = TQRect(4, -2, height() - 8, -(width()) + 2); @@ -917,18 +917,18 @@ ClockApplet::ClockApplet(const TQString& configFile, Type t, int actions, _date->setBackgroundOrigin(AncestorOrigin); _date->installEventFilter(this); // catch mouse clicks - connect(m_layoutTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(fixupLayout())); - connect(_timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotUpdate())); - connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(globalPaletteChange())); + connect(m_layoutTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(fixupLayout())); + connect(_timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotUpdate())); + connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(globalPaletteChange())); reconfigure(); // initialize clock widget slotUpdate(); - if (kapp->authorizeTDEAction("kicker_rmb")) + if (tdeApp->authorizeTDEAction("kicker_rmb")) { menu = new TDEPopupMenu(); - connect(menu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(aboutToShowContextMenu())); - connect(menu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int))); + connect(menu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(aboutToShowContextMenu())); + connect(menu, TQ_SIGNAL(activated(int)), TQ_SLOT(contextMenuActivated(int))); setCustomMenu(menu); } @@ -970,7 +970,7 @@ KTextShadowEngine *ClockApplet::shadowEngine() int ClockApplet::widthForHeight(int h) const { - if (orientation() == Qt::Vertical) + if (orientation() == TQt::Vertical) { return width(); } @@ -1081,7 +1081,7 @@ int ClockApplet::widthForHeight(int h) const int ClockApplet::heightForWidth(int w) const { - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { return height(); } @@ -1156,7 +1156,7 @@ void ClockApplet::preferences(bool timezone) if (!dialog) { dialog = new TDEConfigDialogSingle(zone, this, configFileName, _prefs, KDialogBase::Swallow); - connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(slotReconfigure())); + connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(slotReconfigure())); } if (timezone) @@ -1242,7 +1242,7 @@ void ClockApplet::reconfigure() m_updateOnTheMinute = updateInterval != shortInterval; if (m_updateOnTheMinute) { - connect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(setTimerTo60())); + connect(_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(setTimerTo60())); updateInterval = ((60 - clockGetTime().second()) * 1000) + 500; } else @@ -1250,7 +1250,7 @@ void ClockApplet::reconfigure() // in case we reconfigure to show seconds but setTimerTo60 is going to be called // we need to make sure to disconnect this so we don't end up updating only once // a minute ;) - disconnect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(setTimerTo60())); + disconnect(_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(setTimerTo60())); } _timer->start(updateInterval); @@ -1300,7 +1300,7 @@ void ClockApplet::reconfigure() void ClockApplet::setTimerTo60() { // kdDebug() << "setTimerTo60" << endl; - disconnect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(setTimerTo60())); + disconnect(_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(setTimerTo60())); _timer->changeInterval(60000); } @@ -1417,7 +1417,7 @@ void ClockApplet::slotUpdate() if (seconds > 2) { - connect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(setTimerTo60())); + connect(_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(setTimerTo60())); _timer->changeInterval(((60 - seconds) * 1000) + 500); } } @@ -1430,7 +1430,7 @@ void ClockApplet::slotCalendarDeleted() _calendar = 0L; // don't reopen the calendar immediately ... _disableCalendar = true; - TQTimer::singleShot(100, this, TQT_SLOT(slotEnableCalendar())); + TQTimer::singleShot(100, this, TQ_SLOT(slotEnableCalendar())); // we are free to show a tip know :) installEventFilter(KickerTip::the()); @@ -1460,7 +1460,7 @@ void ClockApplet::toggleCalendar() removeEventFilter(KickerTip::the()); _calendar = new DatePicker(this, _lastDate, _prefs); - connect(_calendar, TQT_SIGNAL(destroyed()), TQT_SLOT(slotCalendarDeleted())); + connect(_calendar, TQ_SIGNAL(destroyed()), TQ_SLOT(slotCalendarDeleted())); TQSize size = _prefs->calendarSize(); @@ -1485,7 +1485,7 @@ void ClockApplet::toggleCalendar() void ClockApplet::openContextMenu() { - if (!menu || !kapp->authorizeTDEAction("kicker_rmb")) + if (!menu || !tdeApp->authorizeTDEAction("kicker_rmb")) return; menu->exec( TQCursor::pos() ); @@ -1542,24 +1542,24 @@ void ClockApplet::aboutToShowContextMenu() TDELocale *loc = TDEGlobal::locale(); TQDateTime dt = TQDateTime::currentDateTime(); - dt = TQT_TQDATETIME_OBJECT(dt.addSecs(TZoffset)); + dt = dt.addSecs(TZoffset); TDEPopupMenu *copyMenu = new TDEPopupMenu( menu ); copyMenu->insertItem(loc->formatDateTime(dt), 201); - copyMenu->insertItem(loc->formatDate(TQT_TQDATE_OBJECT(dt.date())), 202); - copyMenu->insertItem(loc->formatDate(TQT_TQDATE_OBJECT(dt.date()), true), 203); - copyMenu->insertItem(loc->formatTime(TQT_TQTIME_OBJECT(dt.time())), 204); - copyMenu->insertItem(loc->formatTime(TQT_TQTIME_OBJECT(dt.time()), true), 205); + copyMenu->insertItem(loc->formatDate(dt.date()), 202); + copyMenu->insertItem(loc->formatDate(dt.date(), true), 203); + copyMenu->insertItem(loc->formatTime(dt.time()), 204); + copyMenu->insertItem(loc->formatTime(dt.time(), true), 205); copyMenu->insertItem(dt.date().toString(), 206); copyMenu->insertItem(dt.time().toString(), 207); copyMenu->insertItem(dt.toString(), 208); copyMenu->insertItem(dt.toString("yyyy-MM-dd hh:mm:ss"), 209); - connect( copyMenu, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( slotCopyMenuActivated(int) ) ); + connect( copyMenu, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( slotCopyMenuActivated(int) ) ); if (!bImmutable) { TDEPopupMenu *zoneMenu = new TDEPopupMenu( menu ); - connect(zoneMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int))); + connect(zoneMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(contextMenuActivated(int))); for (int i = 0; i <= zone->remoteZoneCount(); i++) { if (i == 0) @@ -1576,7 +1576,7 @@ void ClockApplet::aboutToShowContextMenu() zoneMenu->insertItem(SmallIcon("configure"), i18n("&Configure Timezones..."), 110); TDEPopupMenu *type_menu = new TDEPopupMenu(menu); - connect(type_menu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int))); + connect(type_menu, TQ_SIGNAL(activated(int)), TQ_SLOT(contextMenuActivated(int))); type_menu->insertItem(i18n("&Plain"), Prefs::EnumType::Plain, 1); type_menu->insertItem(i18n("&Digital"), Prefs::EnumType::Digital, 2); type_menu->insertItem(i18n("&Analog"), Prefs::EnumType::Analog, 3); @@ -1585,7 +1585,7 @@ void ClockApplet::aboutToShowContextMenu() menu->insertItem(i18n("&Type"), type_menu, 101, 1); menu->insertItem(i18n("Show Time&zone"), zoneMenu, 110, 2); - if (kapp->authorize("user/root")) + if (tdeApp->authorize("user/root")) { menu->insertItem(SmallIcon("date"), i18n("&Adjust Date && Time..."), 103, 4); } @@ -1610,12 +1610,12 @@ void ClockApplet::slotCopyMenuActivated( int id ) TQTime ClockApplet::clockGetTime() { - return TQT_TQTIME_OBJECT(TQTime::currentTime().addSecs(TZoffset)); + return TQTime::currentTime().addSecs(TZoffset); } TQDate ClockApplet::clockGetDate() { - return TQT_TQDATE_OBJECT(TQDateTime::currentDateTime().addSecs(TZoffset).date()); + return TQDateTime::currentDateTime().addSecs(TZoffset).date(); } void ClockApplet::showZone(int z) @@ -1642,13 +1642,13 @@ void ClockApplet::mousePressEvent(TQMouseEvent *ev) { switch (ev->button()) { - case Qt::LeftButton: + case TQt::LeftButton: toggleCalendar(); break; - case Qt::RightButton: + case TQt::RightButton: openContextMenu(); break; - case Qt::MidButton: + case TQt::MidButton: nextZone(); TQToolTip::remove(_clock->widget()); break; @@ -1675,10 +1675,10 @@ void ClockApplet::wheelEvent(TQWheelEvent* e) // catch the mouse clicks of our child widgets bool ClockApplet::eventFilter( TQObject *o, TQEvent *e ) { - if (( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(_clock->widget()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(_date) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(_dayOfWeek)) && + if (( o == _clock->widget() || o == _date || o == _dayOfWeek) && e->type() == TQEvent::MouseButtonPress ) { - mousePressEvent(TQT_TQMOUSEEVENT(e) ); + mousePressEvent(static_cast<TQMouseEvent*>(e) ); return true; } @@ -1794,7 +1794,7 @@ void ClockApplet::fixupLayout() // this fixes problems triggered by having the date first // because of the date format (e.g. YY/MM/DD) and then hiding // the date - if (orientation() == Qt::Horizontal && height() < 32) + if (orientation() == TQt::Horizontal && height() < 32) { bool mustShowDate = showDate || (zone->zoneIndex() != 0); @@ -1840,7 +1840,7 @@ void ClockAppletToolTip::maybeTip( const TQPoint & /*point*/ ) (m_clock->type() == Prefs::EnumType::Analog) ) { // show full time (incl. hour) as tooltip for Fuzzy clock - tipText = TDEGlobal::locale()->formatDateTime(TQT_TQDATETIME_OBJECT(TQDateTime::currentDateTime().addSecs(m_clock->TZoffset))); + tipText = TDEGlobal::locale()->formatDateTime(TQDateTime::currentDateTime().addSecs(m_clock->TZoffset)); } else { diff --git a/kicker/applets/clock/clock.h b/kicker/applets/clock/clock.h index 36e5f00bf..9f4031539 100644 --- a/kicker/applets/clock/clock.h +++ b/kicker/applets/clock/clock.h @@ -66,7 +66,7 @@ class SettingsWidgetImp; class SettingsWidgetImp : public SettingsWidget { - Q_OBJECT + TQ_OBJECT public: SettingsWidgetImp(Prefs *p=0, @@ -84,7 +84,7 @@ class SettingsWidgetImp : public SettingsWidget class TDEConfigDialogSingle : public TDEConfigDialog { - Q_OBJECT + TQ_OBJECT public: TDEConfigDialogSingle(Zone *zone, @@ -139,7 +139,7 @@ class ClockWidget class PlainClock : public TQLabel, public ClockWidget { - Q_OBJECT + TQ_OBJECT public: PlainClock(ClockApplet *applet, Prefs *prefs, TQWidget *parent=0, const char *name=0); @@ -162,7 +162,7 @@ class PlainClock : public TQLabel, public ClockWidget class DigitalClock : public TQLCDNumber, public ClockWidget { - Q_OBJECT + TQ_OBJECT public: DigitalClock(ClockApplet *applet, Prefs *prefs, TQWidget *parent=0, const char *name=0); @@ -189,7 +189,7 @@ class DigitalClock : public TQLCDNumber, public ClockWidget class AnalogClock : public TQFrame, public ClockWidget { - Q_OBJECT + TQ_OBJECT public: AnalogClock(ClockApplet *applet, Prefs *prefs, TQWidget *parent=0, const char *name=0); @@ -216,7 +216,7 @@ class AnalogClock : public TQFrame, public ClockWidget class FuzzyClock : public TQFrame, public ClockWidget { - Q_OBJECT + TQ_OBJECT public: FuzzyClock(ClockApplet *applet, Prefs* prefs, TQWidget *parent=0, const char *name=0); @@ -260,7 +260,7 @@ class ClockAppletToolTip : public TQToolTip class ClockApplet : public KPanelApplet, public KickerTip::Client, public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP friend class ClockAppletToolTip; diff --git a/kicker/applets/clock/clockapplet.desktop b/kicker/applets/clock/clockapplet.desktop index a699fe4c6..69bd2988d 100644 --- a/kicker/applets/clock/clockapplet.desktop +++ b/kicker/applets/clock/clockapplet.desktop @@ -2,150 +2,8 @@ Type=Plugin Icon=clock Name=Clock -Name[af]=Horlosie -Name[ar]=الساعة -Name[az]=Saat -Name[be]=Гадзіннік -Name[bg]=Часовник -Name[bn]=ঘড়ি -Name[br]=Eurier -Name[bs]=Sat -Name[ca]=Rellotge -Name[cs]=Hodiny -Name[csb]=Zédżer -Name[cy]=Cloc -Name[da]=Ur -Name[de]=Uhr -Name[el]=Ρολόι -Name[eo]=Horloĝo -Name[es]=Reloj -Name[et]=Kell -Name[eu]=Erlojua -Name[fa]=ساعت -Name[fi]=Kello -Name[fr]=Horloge -Name[fy]=Klok -Name[ga]=Clog -Name[gl]=Reloxo -Name[he]=שעון -Name[hi]=घड़ी -Name[hr]=Sat -Name[hu]=Óra -Name[id]=Jam -Name[is]=Klukka -Name[it]=Orologio -Name[ja]=時計 -Name[ka]=საათი -Name[kk]=Сағат -Name[km]=នាឡិកា -Name[ko]=시계 -Name[lo]=ໂມງ -Name[lt]=Laikrodis -Name[lv]=Pulkstenis -Name[mk]=Часовник -Name[mn]=Цаг -Name[ms]=Jam -Name[mt]=Arloġġ -Name[nb]=Klokke -Name[nds]=Klock -Name[ne]=घडी -Name[nl]=Klok -Name[nn]=Klokke -Name[nso]=Sesupanako -Name[oc]=Rellotge -Name[pa]=ਘੜੀ -Name[pl]=Zegar -Name[pt]=Relógio -Name[pt_BR]=Relógio -Name[ro]=Ceas -Name[ru]=Часы -Name[rw]=Isaha -Name[se]=Diibmu -Name[sk]=Hodiny -Name[sl]=Ura -Name[sr]=Часовник -Name[sr@Latn]=Časovnik -Name[ss]=Liwashi -Name[sv]=Klocka -Name[ta]=கடிகாரம் -Name[te]=గడియారం -Name[tg]=Соат -Name[th]=นาฬิกา -Name[tr]=Saat -Name[tt]=Säğät -Name[uk]=Годинник -Name[uz]=Soat -Name[uz@cyrillic]=Соат -Name[ven]=Tshifhinga -Name[vi]=Đồng hồ -Name[wa]=Ôrlodje -Name[xh]=Ikloko -Name[zh_CN]=时钟 -Name[zh_TW]=時鐘 -Name[zu]=Iwashi Comment=An analog and digital clock -Comment[af]='n Analoog en digitale horlosie -Comment[ar]= ساعة رقمية و عادية -Comment[be]=Аналагавы і лічбавы гадзіннік -Comment[bg]=Системен аплет за показване на датата и часа -Comment[bn]=একটি অ্যানালগ এবং ডিজিটাল ঘড়ি -Comment[bs]=Analogni i digitalni sat -Comment[ca]=Un rellotge digital i analògic -Comment[cs]=Applet s analogovými a digitálními hodinami -Comment[csb]=Analogòwi ë cyfrowi zédżer -Comment[da]=Et analogt og digitalt ur -Comment[de]=Eine analoge und digitale Uhr -Comment[el]=Ένα αναλογικό και ψηφιακό ρολόι -Comment[en_GB]=An analogue and digital clock -Comment[eo]=Analoga kaj cifereca horloĝo -Comment[es]=Reloj analógico/digital -Comment[et]=Analoog- ja digitaalkell -Comment[eu]=Erloju analogiko eta digitala -Comment[fa]=ساعت قیاسی و رقمی -Comment[fi]=Analoginen ja digitaalinen kello -Comment[fr]=Une horloge numérique et analogique -Comment[fy]=In analoge en digitale klok -Comment[ga]=Clog analógach agus digiteach -Comment[gl]=Unha applet cun reloxo analóxico e dixital. -Comment[he]=שעון אנלוגי ודיגיטלי -Comment[hr]=Analogni i digitalni sat -Comment[hu]=Egy analóg/digitális óra kisalkalmazásként -Comment[is]=Forrit sem birtir stafræna klukku eða skífuklukku -Comment[it]=Un orologio digitale o analogico -Comment[ja]=アナログ時計とデジタル時計 -Comment[ka]=ანალოგური და ციფრული საათი -Comment[kk]=Тілді немесе цифрлық сағат -Comment[km]=នាឡិកាអាណាឡូក និងឌីជីថល -Comment[lt]=Analoginis ir skaitmeninis laikrodis -Comment[mk]=Аналоген и дигитален часовник -Comment[nb]=En analog og digital klokke for panelet. -Comment[nds]=En analoog oder digitaal Klock -Comment[ne]=एनालग र डिजिटल घडी -Comment[nl]=Een analoge en digitale klok -Comment[nn]=Ei analog og digital klokke -Comment[pa]=ਇੱਕ ਐਨਾਲਾਗ ਤੇ ਡਿਜ਼ੀਟਲ ਘੜੀ ਹੈ। -Comment[pl]=Zegar analogowy i cyfrowy -Comment[pt]=Um relógio analógico e digital -Comment[pt_BR]=Um relógio analógico e digital -Comment[ro]=Un ceas analogic și digital -Comment[ru]=Аплет аналоговых и цифровых часов -Comment[se]=Analogálaš ja digitalálaš diibmo -Comment[sk]=Analógové a digitálne hodiny. -Comment[sl]=Analogna in digitalna ura -Comment[sr]=Аналогни и дигитални часовник -Comment[sr@Latn]=Analogni i digitalni časovnik -Comment[sv]=En analog och digital klocka -Comment[te]=ఎనాలాగ్ మరయూ డిజిటల్ గడియారం -Comment[th]=นาฬิกาแบบเข็มและแบบตัวเลข -Comment[tr]=Bir sayısal ve analog saat programcığı -Comment[uk]=Аналоговий або цифровий годинник -Comment[uz]=Analog va raqamli soat -Comment[uz@cyrillic]=Аналог ва рақамли соат -Comment[vi]=Đồng hồ thường và đồng hồ điện tử -Comment[wa]=Ene analodjike ou didjitåle ôrlodje. -Comment[zh_CN]=模拟和数字时钟面板小程序 -Comment[zh_TW]=一個小的類比或數字時鐘 X-TDE-Library=clock_panelapplet X-TDE-UniqueApplet=false diff --git a/kicker/applets/clock/datepicker.cpp b/kicker/applets/clock/datepicker.cpp index d6165306e..99b9fe33e 100644 --- a/kicker/applets/clock/datepicker.cpp +++ b/kicker/applets/clock/datepicker.cpp @@ -69,7 +69,7 @@ void DatePicker::keyPressEvent(TQKeyEvent *e) { TQVBox::keyPressEvent(e); - if (e->key() == Qt::Key_Escape) + if (e->key() == TQt::Key_Escape) { close(); } diff --git a/kicker/applets/clock/digital.ui b/kicker/applets/clock/digital.ui index e8ced7f2d..c63eb7d32 100644 --- a/kicker/applets/clock/digital.ui +++ b/kicker/applets/clock/digital.ui @@ -293,9 +293,9 @@ <include location="global" impldecl="in implementation">kdialog.h</include> <include location="global" impldecl="in implementation">tdefontrequester.h</include> </includes> -<Q_SLOTS> +<slots> <slot>kcfg_DigitalLCDStyle_stateChanged( int )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="3" margin="6"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kicker/applets/clock/init.cpp b/kicker/applets/clock/init.cpp index 55ee382fd..253f8656c 100644 --- a/kicker/applets/clock/init.cpp +++ b/kicker/applets/clock/init.cpp @@ -41,9 +41,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kdebug.h> #include <kcolorbutton.h> #include <kiconloader.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdelocale.h> #include <tdepopupmenu.h> #include <kstringhandler.h> @@ -68,7 +68,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. extern "C" { - KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) + TDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { TDEGlobal::locale()->insertCatalogue("clockapplet"); TDEGlobal::locale()->insertCatalogue("timezones"); // For time zone translations diff --git a/kicker/applets/clock/settings.ui b/kicker/applets/clock/settings.ui index 81e126560..bd33473cd 100644 --- a/kicker/applets/clock/settings.ui +++ b/kicker/applets/clock/settings.ui @@ -509,9 +509,9 @@ <include location="global" impldecl="in implementation">tdefontrequester.h</include> <include location="global" impldecl="in implementation">tdelistview.h</include> </includes> -<Q_SLOTS> +<slots> <slot>configureType()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="3" margin="6"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kicker/applets/clock/zone.cpp b/kicker/applets/clock/zone.cpp index aa9126b8c..d33af74b3 100644 --- a/kicker/applets/clock/zone.cpp +++ b/kicker/applets/clock/zone.cpp @@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kcolorbutton.h> #include <tdeconfig.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstringhandler.h> #include <tdelocale.h> @@ -85,7 +85,7 @@ int Zone::calc_TZ_offset(const TQString& zone, bool /* reset */) if (z) { - return -z->offset(Qt::LocalTime); + return -z->offset(TQt::LocalTime); } return 0; diff --git a/kicker/applets/launcher/CMakeLists.txt b/kicker/applets/launcher/CMakeLists.txt index 15bb0b12a..a3ce81691 100644 --- a/kicker/applets/launcher/CMakeLists.txt +++ b/kicker/applets/launcher/CMakeLists.txt @@ -27,7 +27,11 @@ link_directories( ##### other data ################################ -install( FILES quicklauncher.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/applets ) +tde_create_translated_desktop( + SOURCE quicklauncher.desktop + DESTINATION ${DATA_INSTALL_DIR}/kicker/applets + PO_DIR kicker-desktops +) install( FILES launcherapplet.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) diff --git a/kicker/applets/launcher/configdlg.cpp b/kicker/applets/launcher/configdlg.cpp index d542d2593..88301b7cf 100644 --- a/kicker/applets/launcher/configdlg.cpp +++ b/kicker/applets/launcher/configdlg.cpp @@ -47,8 +47,8 @@ ConfigDlg::ConfigDlg(TQWidget *parent, const char *name, Prefs *config, m_ui->iconDim->insertItem(TQString::number( m_settings->iconDimChoices()[n])); } - connect(m_ui->iconDim, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(updateButtons())); + connect(m_ui->iconDim, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(updateButtons())); updateWidgets(); m_oldIconDimText = m_ui->iconDim->currentText(); updateButtons(); diff --git a/kicker/applets/launcher/configdlg.h b/kicker/applets/launcher/configdlg.h index b96caf459..14fda2cac 100644 --- a/kicker/applets/launcher/configdlg.h +++ b/kicker/applets/launcher/configdlg.h @@ -31,7 +31,7 @@ class Prefs; class ConfigDlg : public TDEConfigDialog { - Q_OBJECT + TQ_OBJECT public: ConfigDlg(TQWidget *parent, const char *name, Prefs *config, int autoSize, diff --git a/kicker/applets/launcher/flowgridmanager.cpp b/kicker/applets/launcher/flowgridmanager.cpp index 46c79a857..5172b4eee 100644 --- a/kicker/applets/launcher/flowgridmanager.cpp +++ b/kicker/applets/launcher/flowgridmanager.cpp @@ -17,7 +17,7 @@ FlowGridManager::FlowGridManager(TQSize p_item_size, TQSize p_space_size, TQSize p_border_size, TQSize p_frame_size, - Qt::Orientation orient, + TQt::Orientation orient, int num_items, Slack slack_x,Slack slack_y) { @@ -65,15 +65,15 @@ void FlowGridManager::setFrameSize(TQSize p_frame_size) return; _pFrameSize=p_frame_size; if (_pFrameSize.width()<=0) { - _orientation=Qt::Vertical; + _orientation=TQt::Vertical; } if (_pFrameSize.height()<=0) { - _orientation=Qt::Horizontal; + _orientation=TQt::Horizontal; } _dirty=true; } -void FlowGridManager::setOrientation(Qt::Orientation orient) +void FlowGridManager::setOrientation(TQt::Orientation orient) { if (orient==_orientation) return; _orientation=orient; _dirty=true; @@ -114,7 +114,7 @@ TQSize FlowGridManager::frameSize() const TQPoint FlowGridManager::origin() const { _checkReconfigure(); return _origin;} -Qt::Orientation FlowGridManager::orientation() const +TQt::Orientation FlowGridManager::orientation() const { _checkReconfigure(); return _orientation;} /*Slack FlowGridManager::slackX() const @@ -154,7 +154,7 @@ TQPoint FlowGridManager::cell(int index) const // return height if orientation is Horizontal // return width if orientation is Vertical int FlowGridManager::_getHH(TQSize size) const -{ if (_orientation==Qt::Horizontal) +{ if (_orientation==TQt::Horizontal) return size.height(); return size.width(); } @@ -162,14 +162,14 @@ int FlowGridManager::_getHH(TQSize size) const // return height if orientation is Vertical // return width if orientation is Horizontal int FlowGridManager::_getWH(TQSize size) const -{ if (_orientation==Qt::Horizontal) +{ if (_orientation==TQt::Horizontal) return size.width(); return size.height(); } // swap horizontal and vertical if orientation is Vertical, otherwise return arg TQSize FlowGridManager::_swapHV(TQSize hv) const -{ if (_orientation==Qt::Horizontal) +{ if (_orientation==TQt::Horizontal) return hv; TQSize temp=hv; temp.transpose(); diff --git a/kicker/applets/launcher/flowgridmanager.h b/kicker/applets/launcher/flowgridmanager.h index c801431b4..228210884 100644 --- a/kicker/applets/launcher/flowgridmanager.h +++ b/kicker/applets/launcher/flowgridmanager.h @@ -26,7 +26,7 @@ public: TQSize p_space_size=TQSize(0,0), TQSize p_border_size=TQSize(0,0), TQSize frame_size=TQSize(0,0), - Qt::Orientation orient=Qt::Horizontal, + TQt::Orientation orient=TQt::Horizontal, int num_items=0, Slack slack_x=ItemSlack, Slack slack_y=ItemSlack); @@ -36,7 +36,7 @@ public: void setItemSize(TQSize item_size); void setSpaceSize(TQSize space_size); void setBorderSize(TQSize border_size); - void setOrientation(Qt::Orientation orient); + void setOrientation(TQt::Orientation orient); void setFrameSize(TQSize frame_size); void setSlack(Slack slack_x, Slack slack_y); void setConserveSpace(bool conserve); @@ -49,7 +49,7 @@ public: TQSize gridSpacing() const; TQSize frameSize() const; TQPoint origin() const; - Qt::Orientation orientation() const; + TQt::Orientation orientation() const; bool conserveSpace() const; // Slack slackX() const; @@ -76,7 +76,7 @@ protected: TQSize _pItemSize,_pSpaceSize,_pBorderSize,_pFrameSize; Slack _slackX, _slackY; bool _conserveSpace; - Qt::Orientation _orientation; + TQt::Orientation _orientation; int _numItems; // results diff --git a/kicker/applets/launcher/quickaddappsmenu.cpp b/kicker/applets/launcher/quickaddappsmenu.cpp index cdbc94dd5..40957c44f 100644 --- a/kicker/applets/launcher/quickaddappsmenu.cpp +++ b/kicker/applets/launcher/quickaddappsmenu.cpp @@ -23,8 +23,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <kstandarddirs.h> -#include <kdesktopfile.h> +#include <tdestandarddirs.h> +#include <tdedesktopfile.h> #include <tdeglobalsettings.h> #include <tdesycocaentry.h> #include <kservice.h> @@ -38,8 +38,8 @@ QuickAddAppsMenu::QuickAddAppsMenu(const TQString &label, const TQString &relPat { _targetObject = target; _sender = sender; - connect(this, TQT_SIGNAL(addAppBefore(TQString,TQString)), - target, TQT_SLOT(addAppBeforeManually(TQString,TQString))); + connect(this, TQ_SIGNAL(addAppBefore(TQString,TQString)), + target, TQ_SLOT(addAppBeforeManually(TQString,TQString))); } QuickAddAppsMenu::QuickAddAppsMenu(TQWidget *target, TQWidget *parent, const TQString &sender, const char *name) @@ -47,8 +47,8 @@ QuickAddAppsMenu::QuickAddAppsMenu(TQWidget *target, TQWidget *parent, const TQS { _targetObject = target; _sender = sender; - connect(this, TQT_SIGNAL(addAppBefore(TQString,TQString)), - target, TQT_SLOT(addAppBeforeManually(TQString,TQString))); + connect(this, TQ_SIGNAL(addAppBefore(TQString,TQString)), + target, TQ_SLOT(addAppBeforeManually(TQString,TQString))); } void QuickAddAppsMenu::slotExec(int id) diff --git a/kicker/applets/launcher/quickaddappsmenu.h b/kicker/applets/launcher/quickaddappsmenu.h index 01c185181..b5bab8bfc 100644 --- a/kicker/applets/launcher/quickaddappsmenu.h +++ b/kicker/applets/launcher/quickaddappsmenu.h @@ -29,7 +29,7 @@ s #include "service_mnu.h" class QuickAddAppsMenu: public PanelServiceMenu { - Q_OBJECT + TQ_OBJECT public: QuickAddAppsMenu(const TQString &label, const TQString &relPath, TQWidget *target, TQWidget *parent=0, const char *name=0, const TQString &sender=TQString("")); QuickAddAppsMenu(TQWidget *target, TQWidget *parent=0, const TQString &sender=TQString(""), const char *name=0); diff --git a/kicker/applets/launcher/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp index 19377c1b4..e7226c8a4 100644 --- a/kicker/applets/launcher/quickbutton.cpp +++ b/kicker/applets/launcher/quickbutton.cpp @@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tdeactionclasses.h> #include <kickertip.h> #include <tdelocale.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <krun.h> #include <kiconeffect.h> #include <tdeglobalsettings.h> @@ -41,7 +41,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kipc.h> #include <kiconloader.h> #include <kurldrag.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <math.h> #include <algorithm> @@ -118,7 +118,7 @@ QuickURL::QuickURL(const TQString &u) } void QuickURL::run() const -{ kapp->propagateSessionManager(); // is this needed? +{ tdeApp->propagateSessionManager(); // is this needed? if (_service) KRun::run(*(_service), KURL::List()); else @@ -138,7 +138,7 @@ TQPixmap QuickURL::pixmap( mode_t _mode, TDEIcon::Group _group, pxmap = KMimeType::pixmapForURL(_kurl, _mode, _group, _force_size, _state); } // Resize to fit button - pxmap.convertFromImage(pxmap.convertToImage().smoothScale(_force_size,_force_size, TQ_ScaleMin)); + pxmap.convertFromImage(pxmap.convertToImage().smoothScale(_force_size,_force_size, TQImage::ScaleMin)); return pxmap; } @@ -158,7 +158,7 @@ QuickButton::QuickButton(const TQString &u, TDEAction* configAction, if (_qurl->url() == "SPECIAL_BUTTON__SHOW_DESKTOP") { setToggleButton(true); setOn( ShowDesktop::the()->desktopShowing() ); - connect( ShowDesktop::the(), TQT_SIGNAL(desktopShown(bool)), this, TQT_SLOT(toggle(bool)) ); + connect( ShowDesktop::the(), TQ_SIGNAL(desktopShown(bool)), this, TQ_SLOT(toggle(bool)) ); } TQToolTip::add(this, _qurl->name()); @@ -172,18 +172,18 @@ QuickButton::QuickButton(const TQString &u, TDEAction* configAction, configAction->plug(_popup); _popup->insertSeparator(); _popup->insertItem(SmallIcon("remove"), i18n("Remove Application"), - this, TQT_SLOT(removeApp())); + this, TQ_SLOT(removeApp())); m_stickyAction = new TDEToggleAction(i18n("Never Remove Automatically"), - TDEShortcut(), TQT_TQOBJECT(this)); - connect(m_stickyAction, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotStickyToggled(bool))); + TDEShortcut(), this); + connect(m_stickyAction, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotStickyToggled(bool))); m_stickyAction->plug(_popup, 2); m_stickyId = _popup->idAt(2); - connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(launch())); - connect(this, TQT_SIGNAL(removeApp(QuickButton *)), parent, - TQT_SLOT(removeAppManually(QuickButton *))); + connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(launch())); + connect(this, TQ_SIGNAL(removeApp(QuickButton *)), parent, + TQ_SLOT(removeAppManually(QuickButton *))); } QuickButton::~QuickButton() @@ -219,9 +219,9 @@ void QuickButton::resizeEvent(TQResizeEvent *e) void QuickButton::mousePressEvent(TQMouseEvent *e) { - if (e->button() == Qt::RightButton) + if (e->button() == TQt::RightButton) _popup->popup(e->globalPos()); - else if (e->button() == Qt::LeftButton) { + else if (e->button() == TQt::LeftButton) { _dragPos = e->pos(); TQButton::mousePressEvent(e); } @@ -229,7 +229,7 @@ void QuickButton::mousePressEvent(TQMouseEvent *e) void QuickButton::mouseMoveEvent(TQMouseEvent *e) { - if ((e->state() & Qt::LeftButton) == 0) return; + if ((e->state() & TQt::LeftButton) == 0) return; TQPoint p(e->pos() - _dragPos); if (p.manhattanLength() <= TDEGlobalSettings::dndEventDelay()) return; @@ -246,7 +246,7 @@ void QuickButton::mouseMoveEvent(TQMouseEvent *e) dd->drag(); releaseKeyboard(); } else { - setCursor(Qt::ForbiddenCursor); + setCursor(TQt::ForbiddenCursor); } } @@ -266,10 +266,10 @@ void QuickButton::launch() } if (_qurl->kurl().url() == "SPECIAL_BUTTON__SHOW_DESKTOP") { if (isOn()) { - ShowDesktop::the()->showDesktop(TRUE); + ShowDesktop::the()->showDesktop(true); } else { - ShowDesktop::the()->showDesktop(FALSE); + ShowDesktop::the()->showDesktop(false); } } else { @@ -303,7 +303,7 @@ void QuickButton::removeApp() void QuickButton::flash() { m_flashCounter = 2000; - TQTimer::singleShot(0, this, TQT_SLOT(slotFlash())); + TQTimer::singleShot(0, this, TQ_SLOT(slotFlash())); } void QuickButton::slotFlash() @@ -314,7 +314,7 @@ void QuickButton::slotFlash() m_flashCounter -= timeout; if (m_flashCounter < 0) m_flashCounter = 0; update(); - TQTimer::singleShot(timeout, this, TQT_SLOT(slotFlash())); + TQTimer::singleShot(timeout, this, TQ_SLOT(slotFlash())); } } diff --git a/kicker/applets/launcher/quickbutton.h b/kicker/applets/launcher/quickbutton.h index ea5ed21aa..ebb967def 100644 --- a/kicker/applets/launcher/quickbutton.h +++ b/kicker/applets/launcher/quickbutton.h @@ -66,7 +66,7 @@ private: class QuickButton: public SimpleButton, public KickerTip::Client { - Q_OBJECT + TQ_OBJECT public: enum { DEFAULT_ICON_DIM = 16 }; diff --git a/kicker/applets/launcher/quickbuttongroup.h b/kicker/applets/launcher/quickbuttongroup.h index 1c153d85c..d45480542 100644 --- a/kicker/applets/launcher/quickbuttongroup.h +++ b/kicker/applets/launcher/quickbuttongroup.h @@ -28,7 +28,7 @@ public: }; QuickButtonGroup::Index QuickButtonGroup::findDescriptor(const TQString &desc) -{ return findProperty(desc, std::mem_fun(&QuickButton::url));} +{ return findProperty(desc, std::mem_fn(&QuickButton::url));} inline void QuickButtonGroup::setUpdatesEnabled(bool enable) { for (QuickButtonGroup::iterator i=begin();i!=end();++i) { @@ -38,16 +38,16 @@ inline void QuickButtonGroup::setUpdatesEnabled(bool enable) } inline void QuickButtonGroup::show() -{ std::for_each(begin(),end(),std::mem_fun(&TQWidget::show));} +{ std::for_each(begin(),end(),std::mem_fn(&TQWidget::show));} inline void QuickButtonGroup::hide() -{ std::for_each(begin(),end(),std::mem_fun(&TQWidget::hide));} +{ std::for_each(begin(),end(),std::mem_fn(&TQWidget::hide));} inline void QuickButtonGroup::setDragging(bool drag) -{ std::for_each(begin(),end(),std::bind2nd(std::mem_fun(&QuickButton::setDragging),drag));} +{ std::for_each(begin(),end(),std::bind(std::mem_fn(&QuickButton::setDragging),std::placeholders::_1,drag));} inline void QuickButtonGroup::setEnableDrag(bool enable) -{ std::for_each(begin(),end(),std::bind2nd(std::mem_fun(&QuickButton::setEnableDrag),enable));} +{ std::for_each(begin(),end(),std::bind(std::mem_fn(&QuickButton::setEnableDrag),std::placeholders::_1,enable));} inline void QuickButtonGroup::deleteContents() { for (QuickButtonGroup::iterator i=begin();i!=end();++i) { diff --git a/kicker/applets/launcher/quicklauncher.cpp b/kicker/applets/launcher/quicklauncher.cpp index 1ee251b36..3f703348f 100644 --- a/kicker/applets/launcher/quicklauncher.cpp +++ b/kicker/applets/launcher/quicklauncher.cpp @@ -39,7 +39,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tdemessagebox.h> #include <knuminput.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurldrag.h> #include <kdebug.h> @@ -69,7 +69,7 @@ const ButtonGroup::Index Append=ButtonGroup::Append; extern "C" { - KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) + TDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { TDEGlobal::locale()->insertCatalogue("quicklauncher"); return new QuickLauncher(configFile, KPanelApplet::Normal, @@ -108,10 +108,10 @@ QuickLauncher::QuickLauncher(const TQString& configFile, Type type, int actions, m_dragButtons = 0; m_configAction = new TDEAction(i18n("Configure Quicklauncher..."), "configure", TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), TQT_TQOBJECT(this)); + this, TQ_SLOT(slotConfigure()), this); m_saveTimer = new TQTimer(this, "m_saveTimer"); - connect(m_saveTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(saveConfig())); + connect(m_saveTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(saveConfig())); m_popularity = new PopularityStatistics(); @@ -168,15 +168,15 @@ void QuickLauncher::buildPopupMenu() m_appletPopup = new TQPopupMenu(this); m_appletPopup->insertItem(i18n("Add Application"), addAppsMenu); m_removeAppsMenu = new TQPopupMenu(this); - connect(m_removeAppsMenu, TQT_SIGNAL(aboutToShow()), - TQT_SLOT(fillRemoveAppsMenu())); - connect(m_removeAppsMenu, TQT_SIGNAL(activated(int)), - TQT_SLOT(removeAppManually(int))); + connect(m_removeAppsMenu, TQ_SIGNAL(aboutToShow()), + TQ_SLOT(fillRemoveAppsMenu())); + connect(m_removeAppsMenu, TQ_SIGNAL(activated(int)), + TQ_SLOT(removeAppManually(int))); m_appletPopup->insertItem(i18n("Remove Application"), m_removeAppsMenu); m_appletPopup->insertSeparator(); m_appletPopup->setCheckable( true ); - m_appletPopup->insertItem(i18n("About"), this, TQT_SLOT(about())); + m_appletPopup->insertItem(i18n("About"), this, TQ_SLOT(about())); setCustomMenu(m_appletPopup); } @@ -235,8 +235,8 @@ void QuickLauncher::slotConfigure() m_configDialog = new ConfigDlg(this, "configdialog", m_settings, SIZE_AUTO, KDialogBase::Plain, KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Apply | KDialogBase::Default); - connect(m_configDialog, TQT_SIGNAL(settingsChanged()), - this, TQT_SLOT(slotSettingsDialogChanged())); + connect(m_configDialog, TQ_SIGNAL(settingsChanged()), + this, TQ_SLOT(slotSettingsDialogChanged())); } m_configDialog->show(); @@ -338,7 +338,7 @@ int QuickLauncher::widthForHeight(int h) const { FlowGridManager temp_manager = *m_manager; temp_manager.setFrameSize(TQSize(h,h)); - temp_manager.setOrientation(Qt::Horizontal); // ??? probably not necessary + temp_manager.setOrientation(TQt::Horizontal); // ??? probably not necessary if (temp_manager.isValid()) { return temp_manager.frameSize().width(); @@ -351,7 +351,7 @@ int QuickLauncher::heightForWidth(int w) const { FlowGridManager temp_manager=*m_manager; temp_manager.setFrameSize(TQSize(w,w)); - temp_manager.setOrientation(Qt::Vertical); // ??? probably not necessary + temp_manager.setOrientation(TQt::Vertical); // ??? probably not necessary if (temp_manager.isValid()) { return temp_manager.frameSize().height(); @@ -362,7 +362,7 @@ int QuickLauncher::heightForWidth(int w) const int QuickLauncher::dimension() const { - if (orientation()==Qt::Vertical) + if (orientation()==TQt::Vertical) { return size().width(); } @@ -392,10 +392,10 @@ void QuickLauncher::addApp(TQString url, bool manuallyAdded) QuickButton* QuickLauncher::createButton(TQString url) { QuickButton* newButton=new QuickButton(url, m_configAction, this); - connect(newButton, TQT_SIGNAL(executed(TQString)), - this, TQT_SLOT(slotOwnServiceExecuted(TQString))); - connect(newButton, TQT_SIGNAL(stickyToggled(bool)), - this, TQT_SLOT(slotStickyToggled())); + connect(newButton, TQ_SIGNAL(executed(TQString)), + this, TQ_SLOT(slotOwnServiceExecuted(TQString))); + connect(newButton, TQ_SIGNAL(stickyToggled(bool)), + this, TQ_SLOT(slotStickyToggled())); newButton->setPopupDirection(popupDirection()); return newButton; } @@ -507,7 +507,7 @@ void QuickLauncher::about() void QuickLauncher::mousePressEvent(TQMouseEvent *e) { - if (e->button() == Qt::RightButton) + if (e->button() == TQt::RightButton) { m_popup->popup(e->globalPos()); } @@ -856,7 +856,7 @@ void QuickLauncher::loadConfig() int n = 0; while (iter != urls.end()) { TQString url = *iter; - addApp(url, n, false); + if(!url.isEmpty()) addApp(url, n, false); ++iter; ++n; } @@ -973,7 +973,7 @@ void QuickLauncher::serviceStartedByStorageId(TQString /*starter*/, TQString sto if (m_settings->autoAdjustEnabled()) { - TQTimer::singleShot(0, this, TQT_SLOT(slotAdjustToCurrentPopularity())); + TQTimer::singleShot(0, this, TQ_SLOT(slotAdjustToCurrentPopularity())); } } @@ -1047,7 +1047,7 @@ void QuickLauncher::slotOwnServiceExecuted(TQString serviceMenuId) m_popularity->useService(serviceMenuId); if (m_settings->autoAdjustEnabled()) { - TQTimer::singleShot(0, this, TQT_SLOT(slotAdjustToCurrentPopularity())); + TQTimer::singleShot(0, this, TQ_SLOT(slotAdjustToCurrentPopularity())); } } @@ -1077,7 +1077,7 @@ void QuickLauncher::updateStickyHighlightLayer() m_stickyHighlightLayer = TQImage(width(), height(), 32); m_stickyHighlightLayer.setAlphaBuffer(true); int pix, tlPix, brPix, w(width()), h(height()); - QRgb transparent(tqRgba(0, 0, 0, 0)); + TQRgb transparent(tqRgba(0, 0, 0, 0)); for (int y = h-1; y >= 0; --y) { for (int x = w-1; x >= 0; --x) diff --git a/kicker/applets/launcher/quicklauncher.desktop b/kicker/applets/launcher/quicklauncher.desktop index 771dc687e..ce13cbc3f 100644 --- a/kicker/applets/launcher/quicklauncher.desktop +++ b/kicker/applets/launcher/quicklauncher.desktop @@ -1,140 +1,8 @@ [Desktop Entry] Type=Plugin Name=Quick Launcher -Name[af]=Vinnige Lanseerder -Name[ar]=الإنطلاق السريع -Name[az]=Sür'ətli Başladıcı -Name[be]=Хуткі запускальнік -Name[bg]=Бързо стартиране -Name[bn]=কুইক লঞ্চার -Name[br]=Loc'her prim -Name[bs]=Brzo pokretanje -Name[ca]=Engegador ràpid -Name[cs]=Rychlé spouštění aplikací -Name[csb]=Chùtczé zrëszenié -Name[cy]=Cychwynydd Cyflym -Name[da]=Hurtigstarter -Name[de]=Schnellstarter -Name[el]=Γρήγορη φόρτωση -Name[eo]=Rapidlanĉilo -Name[es]=Lanzador rápido -Name[et]=Kiirkäivitaja -Name[eu]=Abiarazle bizkorra -Name[fa]=راهانداز سریع -Name[fi]=Sovellusten pikakäynnistin -Name[fr]=Lanceur d'applications -Name[fy]=Snel útfierder -Name[ga]=Tosaitheoir Tapa -Name[gl]=Lanzador Rápido -Name[he]=הפעלה מהירה -Name[hi]=द्रुत लांचर -Name[hr]=Brzo pokretanje -Name[hu]=Gyorsindító -Name[id]=Launcher Cepat -Name[is]=Flýtiræsir -Name[it]=Esecuzione rapida -Name[ja]=クイックランチャー -Name[ka]=სწრაფი დაწყება -Name[kk]=Жедел жегуші -Name[km]=អ្នកចាប់ផ្ដើមរហ័ស -Name[lo]=ຮງກທຳງານດ່ວນ -Name[lt]=Greitasis paleidimas -Name[lv]=Ātrais Palaidējs -Name[mk]=Брз стартувач -Name[mn]=Түргэн ажилуулагч -Name[ms]=Pelancar Pantas -Name[mt]=Ħaddem Malajr -Name[nb]=Hurtigstarter -Name[nds]=Fixstarter -Name[ne]=द्रुत सुरुआत -Name[nl]=Snelstarter -Name[nn]=Snøggstartar -Name[nso]=Ngwadisoleswa ya Kapela -Name[oc]=Engegador rapid -Name[pa]=ਚੁਸਤ ਸ਼ੁਰੂਆਤੀ -Name[pl]=Szybkie uruchamianie -Name[pt]=Execução de Aplicações -Name[pt_BR]=Lançador rápido -Name[ro]=Executor rapid -Name[ru]=Быстрый запуск -Name[rw]=Mutangiza Yihuta -Name[se]=Jođánisálggaheaddji -Name[sk]=Rýchly spúšťač -Name[sl]=Hitri zaganjalnik -Name[sr]=Брзи покретач -Name[sr@Latn]=Brzi pokretač -Name[sv]=Snabbstartare -Name[ta]=உடனடியாக திரையில் தெரிதல் -Name[te]=త్వరగా మొదలుపెట్టెది -Name[tg]=Сар додани тез -Name[th]=เรียกทำงานด่วน -Name[tr]=Hızlı Başlatıcı -Name[tt]=Tiz Cibärgeç -Name[uk]=Швидкий запуск -Name[uz]=Tez ishga tushirgich -Name[uz@cyrillic]=Тез ишга туширгич -Name[ven]=Tavhanya -Name[vi]=Khởi động nhanh -Name[wa]=Enondeu al vole di programes -Name[zh_CN]=快速启动 -Name[zh_TW]=快速起動 -Name[zu]=Umqalisi osheshayo + Comment=Directly access your frequently used applications -Comment[af]=Kry direkte toegang tot die programme wat jy gereeld gebruik -Comment[ar]=للوصول المباشر إلى تطبيقاتك الأكثر إستعمالاً -Comment[be]=Наўпрост запускае праграму -Comment[bg]=Бърз достъп до често използваните програми -Comment[bn]=আপনার সবচেয়ে ঘনঘন ব্যবহৃত অ্যাপলিকেশনগুলি সরাসরি চালু করুন -Comment[bs]=Direktno pristupite vašim često korištenim programima -Comment[ca]=Accedeix directament a les aplicacions més usades -Comment[cs]=Přímý přístup k nejčastěji používaným aplikacím -Comment[csb]=Prosti przistãp do nôczãstczi brëkòwónëch programów -Comment[da]=Direkte adgang til programmer du ofte bruger -Comment[de]=Schneller Zugriff auf häufig verwendete Programme -Comment[el]=Απευθείας πρόσβαση στις συχνά χρησιμοποιούμενες εφαρμογές σας -Comment[eo]=Rekte atingi viajn preferatajn aplikaĵojn -Comment[es]=Acceso directo a las aplicaciones usadas más frecuentemente -Comment[et]=Ligipääs sagedamini kasutatud rakendustele -Comment[eu]=Sarbide zuzena zure ohiko aplikazioei -Comment[fa]=دستیابی مستقیم به کاربردهای مکرر استفادهشدۀ شما -Comment[fi]=Siirry suoraan useimmin käyttämiisi sovelluksiin -Comment[fr]=Accès direct aux applications les plus utilisées -Comment[fy]=Direkte tagong ta jo faak brûkte programma's -Comment[gl]=Aceda directamenta ás aplicacións que use mais amiudo -Comment[he]=גישה מהירה ליישומים שאתה משתמש בהם הכי הרבה -Comment[hr]=Izravni pristup najčešće upotrebljavanim aplikacijama -Comment[hu]=A gyakran használt alkalmazások közvetlen elérése -Comment[is]=Beinn aðgangur að mest notuðu forritunum þínum -Comment[it]=Accesso diretto alle applicazioni usate più frequentemente -Comment[ja]=よく用いるアプリケーションに直接アクセス -Comment[kk]=Жиі пайдаланатын қолданбаларды тез жегу -Comment[km]=ដំណើរការកម្មវិធីដែលបានប្រើជារឿយៗរបស់អ្នកដោយផ្ទាល់ -Comment[lt]=Tiesiogiai pasiekite dažniausiai naudojamas programas -Comment[mk]=Пристапете директно на вашите често користени апликации -Comment[nb]=Få direkte tilgang til ofte brukte programmer -Comment[nds]=Direktemang Dien meist bruukte Programmen opropen -Comment[ne]=बारम्बार प्रयोग भएका अनुप्रयोगमा तपाईँको प्रत्यक्ष पहुँच -Comment[nl]=Directe toegang tot uw veelgebruikte programma's -Comment[nn]=Direkte tilgang til program du brukar ofte -Comment[pa]=ਅਕਸਰ ਵਰਤੇ ਜਾਂਦੇ ਕਾਰਜਾਂ ਲਈ ਸਿੱਧੀ ਪਹੁੰਚ -Comment[pl]=Bezpośredni dostęp do najczęściej używanych programów -Comment[pt]=Aceder directamente às aplicações usadas com mais frequência por si -Comment[pt_BR]=Acesso direito à seus aplicativos mais freqüentemente usados -Comment[ro]=Accesează direct aplicațiile folosite frecvent -Comment[ru]=Быстрый вызов часто используемых приложений -Comment[sk]=Priamo zprístupní najčastejšie používané programy. -Comment[sl]=Neposreden dostop do vaših najbolj uporabljanih programov -Comment[sr]=Директно приступите својим често коришћеним програмима -Comment[sr@Latn]=Direktno pristupite svojim često korišćenim programima -Comment[sv]=Direkt åtkomst av program du ofta använder -Comment[th]=เรียกใช้งานแอพพลิเคชั่นที่คุณใช้บ่อยๆ ได้โดยตรง -Comment[tr]=Sıkça kullanılan programlara erişim sağlar -Comment[uk]=Безпосередній доступ до програм, які часто вживаються -Comment[uz]=Eng koʻp ishlatilgan dasturlarga qisqa yoʻl -Comment[uz@cyrillic]=Энг кўп ишлатилган дастурларга қисқа йўл -Comment[vi]=Chạy ngay các trình bạn thường xuyên dùng -Comment[wa]=Accès direk ås programes sovint eployîs -Comment[zh_CN]=直接访问您最经常使用的应用程序 -Comment[zh_TW]=直接存取您最常使用的應用程式 + Icon=launch X-TDE-Library=launcher_panelapplet diff --git a/kicker/applets/launcher/quicklauncher.h b/kicker/applets/launcher/quicklauncher.h index 2c47b602a..b6211f054 100644 --- a/kicker/applets/launcher/quicklauncher.h +++ b/kicker/applets/launcher/quicklauncher.h @@ -45,7 +45,7 @@ typedef QuickButtonGroup ButtonGroup; class QuickLauncher: public KPanelApplet, public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP k_dcop: diff --git a/kicker/applets/lockout/CMakeLists.txt b/kicker/applets/lockout/CMakeLists.txt index 406f5998b..5310bab79 100644 --- a/kicker/applets/lockout/CMakeLists.txt +++ b/kicker/applets/lockout/CMakeLists.txt @@ -22,7 +22,11 @@ link_directories( ##### other data ################################ -install( FILES lockout.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/applets ) +tde_create_translated_desktop( + SOURCE lockout.desktop + DESTINATION ${DATA_INSTALL_DIR}/kicker/applets + PO_DIR kicker-desktops +) ##### lockout_panelapplet (module) ############## diff --git a/kicker/applets/lockout/lockout.cpp b/kicker/applets/lockout/lockout.cpp index d4c14c9db..770a8431f 100644 --- a/kicker/applets/lockout/lockout.cpp +++ b/kicker/applets/lockout/lockout.cpp @@ -46,7 +46,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. extern "C" { - KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) + TDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { TDEGlobal::locale()->insertCatalogue("lockout"); return new Lockout(configFile, parent, "lockout"); @@ -62,7 +62,7 @@ Lockout::Lockout( const TQString& configFile, TQWidget *parent, const char *name //setFrameStyle(Panel | Sunken); setBackgroundOrigin( AncestorOrigin ); - if ( orientation() == Qt::Horizontal ) + if ( orientation() == TQt::Horizontal ) layout = new TQBoxLayout( this, TQBoxLayout::TopToBottom ); else layout = new TQBoxLayout( this, TQBoxLayout::LeftToRight ); @@ -82,25 +82,25 @@ Lockout::Lockout( const TQString& configFile, TQWidget *parent, const char *name bTransparent = conf->readBoolEntry( "Transparent", bTransparent ); - connect( lockButton, TQT_SIGNAL( clicked() ), TQT_SLOT( lock() )); - connect( logoutButton, TQT_SIGNAL( clicked() ), TQT_SLOT( logout() )); + connect( lockButton, TQ_SIGNAL( clicked() ), TQ_SLOT( lock() )); + connect( logoutButton, TQ_SIGNAL( clicked() ), TQ_SLOT( logout() )); lockButton->installEventFilter( this ); logoutButton->installEventFilter( this ); - if (!kapp->authorize("lock_screen")) + if (!tdeApp->authorize("lock_screen")) lockButton->hide(); - if (!kapp->authorize("logout")) + if (!tdeApp->authorize("logout")) logoutButton->hide(); lockButton->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding)); logoutButton->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding)); - if ( !kapp->dcopClient()->isAttached() ) - kapp->dcopClient()->attach(); + if ( !tdeApp->dcopClient()->isAttached() ) + tdeApp->dcopClient()->attach(); - connect( kapp, TQT_SIGNAL( iconChanged(int) ), TQT_SLOT( slotIconChanged() )); + connect( tdeApp, TQ_SIGNAL( iconChanged(int) ), TQ_SLOT( slotIconChanged() )); } Lockout::~Lockout() @@ -117,13 +117,13 @@ void Lockout::checkLayout( int height ) const TQBoxLayout::Direction direction = layout->direction(); if ( direction == TQBoxLayout::LeftToRight && - ( ( orientation() == Qt::Vertical && s.width() - 2 >= height ) || - ( orientation() == Qt::Horizontal && s.width() - 2 < height ) ) ) { + ( ( orientation() == TQt::Vertical && s.width() - 2 >= height ) || + ( orientation() == TQt::Horizontal && s.width() - 2 < height ) ) ) { layout->setDirection( TQBoxLayout::TopToBottom ); } else if ( direction == TQBoxLayout::TopToBottom && - ( ( orientation() == Qt::Vertical && s.height() - 2 < height ) || - ( orientation() == Qt::Horizontal && s.height() - 2 >= height ) ) ) { + ( ( orientation() == TQt::Vertical && s.height() - 2 < height ) || + ( orientation() == TQt::Horizontal && s.height() - 2 >= height ) ) ) { layout->setDirection( TQBoxLayout::LeftToRight ); } } @@ -146,12 +146,12 @@ void Lockout::lock() int kicker_screen_number = tqt_xscreen(); if ( kicker_screen_number ) appname.sprintf("kdesktop-screen-%d", kicker_screen_number); - kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString("")); + tdeApp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString("")); } void Lockout::logout() { - kapp->requestShutDown(); + tdeApp->requestShutDown(); } void Lockout::mousePressEvent(TQMouseEvent* e) @@ -185,7 +185,7 @@ void Lockout::propagateMouseEvent(TQMouseEvent* e) bool Lockout::eventFilter( TQObject *o, TQEvent *e ) { - if (!kapp->authorizeTDEAction("kicker_rmb")) + if (!tdeApp->authorizeTDEAction("kicker_rmb")) return false; // Process event normally: if( e->type() == TQEvent::MouseButtonPress ) @@ -193,25 +193,25 @@ bool Lockout::eventFilter( TQObject *o, TQEvent *e ) TDEConfig *conf = config(); conf->setGroup("lockout"); - TQMouseEvent *me = TQT_TQMOUSEEVENT( e ); - if( me->button() == Qt::RightButton ) + TQMouseEvent *me = static_cast<TQMouseEvent*>( e ); + if( me->button() == TQt::RightButton ) { - if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(lockButton) ) + if( o == lockButton ) { TQPopupMenu *popup = new TQPopupMenu(); popup->insertItem( SmallIcon( "system-lock-screen" ), i18n("Lock Session"), - this, TQT_SLOT( lock() ) ); + this, TQ_SLOT( lock() ) ); popup->insertSeparator(); i18n("&Transparent"); //popup->insertItem( i18n( "&Transparent" ), 100 ); popup->insertItem( SmallIcon( "configure" ), i18n( "&Configure Screen Saver..." ), - this, TQT_SLOT( slotLockPrefs() ) ); + this, TQ_SLOT( slotLockPrefs() ) ); //popup->setItemChecked( 100, bTransparent ); - //popup->connectItem(100, this, TQT_SLOT( slotTransparent() ) ); + //popup->connectItem(100, this, TQ_SLOT( slotTransparent() ) ); //if (conf->entryIsImmutable( "Transparent" )) // popup->setItemEnabled( 100, false ); popup->exec( me->globalPos() ); @@ -219,20 +219,20 @@ bool Lockout::eventFilter( TQObject *o, TQEvent *e ) return true; } - else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(logoutButton) ) + else if ( o == logoutButton ) { TQPopupMenu *popup = new TQPopupMenu(); popup->insertItem( SmallIcon( "system-log-out" ), i18n("&Log Out..."), - this, TQT_SLOT( logout() ) ); + this, TQ_SLOT( logout() ) ); popup->insertSeparator(); //popup->insertItem( i18n( "&Transparent" ), 100 ); popup->insertItem( SmallIcon( "configure" ), i18n( "&Configure Session Manager..." ), - this, TQT_SLOT( slotLogoutPrefs() ) ); + this, TQ_SLOT( slotLogoutPrefs() ) ); //popup->setItemChecked( 100, bTransparent ); - //popup->connectItem(100, this, TQT_SLOT( slotTransparent() ) ); + //popup->connectItem(100, this, TQ_SLOT( slotTransparent() ) ); //if (conf->entryIsImmutable( "Transparent" )) // popup->setItemEnabled( 100, false ); popup->exec( me->globalPos() ); diff --git a/kicker/applets/lockout/lockout.desktop b/kicker/applets/lockout/lockout.desktop index 50b239e0f..98f53208e 100644 --- a/kicker/applets/lockout/lockout.desktop +++ b/kicker/applets/lockout/lockout.desktop @@ -1,125 +1,8 @@ [Desktop Entry] Type=Plugin Name=Lock/Logout Buttons -Name[af]=Sluit/Teken af Knoppies -Name[ar]=أزرار الإقفال/الخروج -Name[be]=Кнопкі блакавання/выхаду -Name[bg]=Заключване и изход -Name[bn]=লক/লগ-আউট বাটন -Name[bs]=Dugmad za zaključavanje/odjavu -Name[ca]=Botons bloqueja/surt -Name[cs]=Tlačítka odhlášení/uzamčení -Name[csb]=Knąpë blokòwaniô ekranu/wëlogòwaniô -Name[da]=Lås/Logaf-knapper -Name[de]=Bildschirmsperre und Abmeldung aus TDE -Name[el]=Κουμπιά κλειδώματος/αποσύνδεσης -Name[eo]=Ŝloso- kaj adiaŭo-butonoj -Name[es]=Botones de bloqueo/salida -Name[et]=Lukustamise/väljalogimise nupud -Name[eu]=Blokeatu/Irteteko botoiak -Name[fa]=دکمههای قفل/خروج -Name[fi]=Lukitus/Uloskirjautumispainikkeet -Name[fr]=Boutons de verrouillage et déconnexion -Name[fy]=Beskoattelje/ôfmeldknoppen -Name[ga]=Cnaipí Glasála/Logála Amach -Name[gl]=Botóns de Bloqueo/Saída -Name[he]=כפתורי נעילה\יציאה -Name[hr]=Gumb za zaključavanje/odjavljivanje -Name[hu]=Zároló/kijelentkező gombok -Name[is]=Læsa/stimpla út hnappar -Name[it]=Pulsanti di uscita e bloccaggio schermo -Name[ja]=ロック/ログアウトボタン -Name[ka]=დაბლოკვის/გამოსვლის ღილაკები -Name[kk]=Шығу не экранды бұғаттау батырмалары -Name[km]=ប៊ូតុង ចាក់សោ/ចេញ -Name[ko]=잠금/로그아웃 -Name[lt]=Užrakinimo/išsiregistravimo mygtukai -Name[mk]=Копчиња „Заклучи/Одјави се“ -Name[nb]=Panelprogram for skjermlås/utlogging -Name[nds]=Knööp för dat Afsluten oder Afmellen -Name[ne]=ताल्चा लगाउने/लगआउट गर्ने बटन -Name[nl]=Vergrendel/afmeldknoppen -Name[nn]=Knappar for skjermlås/utlogging -Name[pa]=ਤਾਲਾ/ਬਾਹਰੀ ਦਰ ਬਟਨ -Name[pl]=Przyciski blokowania ekranu/wylogowania -Name[pt]=Botões de Bloqueio/Saída -Name[pt_BR]=Botões de Travar/Sair -Name[ro]=Butoane de blocare/ieșire -Name[ru]=Кнопки выхода и запирания экрана -Name[se]=Lohkadan/olggosčálihan boalut -Name[sk]=Tlačidlá na ohlásenie/zamknutie -Name[sl]=Gumba za zaklep in odjavo -Name[sr]=Дугмад за закључавање/одјављивање -Name[sr@Latn]=Dugmad za zaključavanje/odjavljivanje -Name[sv]=Lås/Logga ut-knappar -Name[te]=తాళం వెయి/లాగౌట్ బటన్లు -Name[tg]=Тугмаҳои Қулф/Баромадан -Name[th]=ปุ่มล็อค/ล็อกเอาท์ -Name[tr]=Kilitle/Çık Düğmeleri -Name[uk]=Кнопки Замикання/Виходу з системи -Name[uz]=Qulflash/chiqish tugmalari -Name[uz@cyrillic]=Қулфлаш/чиқиш тугмалари -Name[vi]=Tiểu ứng dụng Khoá/Đăng xuất -Name[wa]=Boton po serer a clé ou dislodjî -Name[zh_CN]=锁定/注销按钮 -Name[zh_TW]=「螢幕鎖定/登出」按鈕 + Comment=Adds buttons for locking screen and session logout -Comment[af]=Voeg skerm sluit en afteken knoppies by -Comment[ar]=يضيف أزرار لإقفال الشاشة و الخروج من الجلسة -Comment[be]=Дадае кнопкі для блакіроўкі экрана і заканчэння сесіі -Comment[bg]=Добавяне на бутоните за заключване на екрана и изход -Comment[bn]=স্ক্রীণ লক এবং লগ-আউট করার জন্য বাটন যোগ করে -Comment[bs]=Dodaje na panel dugmad za zaključavanje ekrana i odjavu sa sistema -Comment[ca]=Afegeix botons per bloquejar la pantalla i sortir de la sessió -Comment[cs]=Přidá tlačítka pro uzamčení obrazovky a odhlášení z relace -Comment[csb]=Dodôwô knapë blokòwaniô ekranu ë wëlogòwaniô -Comment[da]=Tilføjer knapper for at låse skærmen og logge ud fra sessionen -Comment[de]=Fügt Knöpfe zur Bildschirmsperre und Abmeldung aus TDE hinzu -Comment[el]=Προσθέτει κουμπιά για το κλείδωμα της οθόνης και την αποσύνδεση συνεδρίας -Comment[eo]=Aldonu butonojn por ŝlosi ekranon kaj seanco-eliron -Comment[es]=Añade botones para bloquear la sesión y para salirse de esta -Comment[et]=Lisab nupud ekraani lukustamiseks ning seansi lõpetamiseks -Comment[eu]=Pantaila blokeatu eta saiotik irteteko botoiak gehitzen ditu -Comment[fa]=دکمهها را برای قفل پرده و خروج نشست اضافه میکند -Comment[fi]=Lisää painikkeet ruudun lukitsemiseen ja uloskirjautumiseen -Comment[fr]=Ajoute des boutons permettant de verrouiller l'écran et de déconnecter la session en cours -Comment[fy]=Heakket knoppen ta foar it beskoattelje fan it skerm en it sluten fan de sesje -Comment[gl]=Engade botóns para bloquear a pantalla e sair da sesión -Comment[he]=מוסיף כפתורים לנעילת המסך ויציאה מהמערכת -Comment[hr]=Dodavanje gumba za zaključavanje zaslona i odjavljivanja sesije -Comment[hu]=Nyomógombok a képernyő zárolásához és kijelentkezéshez -Comment[is]=Bætir við hnöppum til að læsa skjánum og stimpla sig út -Comment[it]=Aggiunge i pulsanti per bloccare lo schermo o uscire dalla sessione -Comment[ja]=スクリーンロックとセッションログアウト用ボタンを追加 -Comment[kk]=Экранды бұғаттау және сеанстан шығу батырмаларды қосу -Comment[km]=បន្ថែមប៊ូតុងសម្រាប់ចាក់សោអេក្រង់ និងចេញពីសម័យ -Comment[ko]=세션을 잠그거나 끝내기 -Comment[lt]=Prideda mygtukus ekrano užrakinimui ir sesijos užbaigimui -Comment[mk]=Додава копчиња за заклучување на екранот и одјавување од сесијата -Comment[nb]=Legger til knapper for å låse skjermen og logge ut av økta. -Comment[nds]=Föögt Knööp för dat Afsluten vun den Schirm oder dat Afmellen ut TDE to -Comment[ne]=पर्दा ताल्चा लगाउन र सत्र लग आउट गर्नका लागि बटनहरू थप्छ -Comment[nl]=Voegt knoppen toe voor het vergrendelen van het scherm en het afsluiten van de sessie -Comment[nn]=Legg til knappar for å låsa skjermen og logga ut av økta. -Comment[pa]=ਪਰਦੇ ਨੂੰ ਤਾਲਾਬੰਦ ਕਰਨ ਅਤੇ ਅਜਲਾਸ ਬੰਦ ਕਰਨ ਲਈ ਬਟਨ ਜੋੜਦਾ ਹੈ -Comment[pl]=Dodaje przyciski zablokowania ekranu i wylogowania -Comment[pt]=Adiciona botões para bloquear o ecrã e encerrar a sessão -Comment[pt_BR]=Adiciona os botões para bloquear a tela e finalizar a sessão -Comment[ro]=Adaugă butoane pentru blocarea ecranului și sesiunea de ieșire -Comment[ru]=Добавление кнопок выхода из TDE и запирания экрана -Comment[se]=Lasit boaluid mat sáhttet lohkadit šearpma ja heaittihit bargovuoru -Comment[sk]=Pridá tlačidlá na zamknutie obrazovky a ukončenie relácie -Comment[sl]=Doda gumba za zaklep zaslona in odjavo iz seje -Comment[sr]=Додаје дугмад за закључавање екрана и одјављивање из сесије -Comment[sr@Latn]=Dodaje dugmad za zaključavanje ekrana i odjavljivanje iz sesije -Comment[sv]=Lägger till knappar för att låsa skärmen och logga ut från sessionen -Comment[th]=เพิ่มปุ่มสำหรับล็อคหน้าจอและล็อกเอาท์ออกจากวาระที่กำลังใช้งานอยู่ -Comment[uk]=Додає кнопки для замикання екрана та виходу з сеансу -Comment[uz]=Ekranni qulflash va seansdan chiqish uchun tugmalar -Comment[uz@cyrillic]=Экранни қулфлаш ва сеансдан чиқиш учун тугмалар -Comment[vi]=Thêm nút khoá màn hình và đăng xuất khỏi phiên làm việc -Comment[wa]=Radjout des botons po serer l' waitroûle a clé et dislodjî del session -Comment[zh_CN]=添加锁定屏幕和注销会话的按钮 -Comment[zh_TW]=加入用來鎖定螢幕與登出作業階段的按鈕 + Icon=system-log-out X-TDE-Library=lockout_panelapplet diff --git a/kicker/applets/lockout/lockout.h b/kicker/applets/lockout/lockout.h index 6be995790..dd6428628 100644 --- a/kicker/applets/lockout/lockout.h +++ b/kicker/applets/lockout/lockout.h @@ -12,7 +12,7 @@ class TQToolButton; class Lockout : public KPanelApplet { - Q_OBJECT + TQ_OBJECT public: Lockout( const TQString& configFile, diff --git a/kicker/applets/media/CMakeLists.txt b/kicker/applets/media/CMakeLists.txt index c246bb6b8..04ddebbc8 100644 --- a/kicker/applets/media/CMakeLists.txt +++ b/kicker/applets/media/CMakeLists.txt @@ -28,7 +28,11 @@ link_directories( ##### other data ################################ -install( FILES mediaapplet.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/applets ) +tde_create_translated_desktop( + SOURCE mediaapplet.desktop + DESTINATION ${DATA_INSTALL_DIR}/kicker/applets + PO_DIR kicker-desktops +) ##### media_panelapplet (module) ################ diff --git a/kicker/applets/media/mediaapplet.cpp b/kicker/applets/media/mediaapplet.cpp index c3b964ce1..f1d6c6e2a 100644 --- a/kicker/applets/media/mediaapplet.cpp +++ b/kicker/applets/media/mediaapplet.cpp @@ -33,7 +33,7 @@ extern "C" { - KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString configFile) + TDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString configFile) { TDEGlobal::locale()->insertCatalogue("mediaapplet"); return new MediaApplet(configFile, KPanelApplet::Normal, @@ -57,18 +57,18 @@ MediaApplet::MediaApplet(const TQString& configFile, Type type, int actions, TQW mpDirLister = new KDirLister(); - connect( mpDirLister, TQT_SIGNAL( clear() ), - this, TQT_SLOT( slotClear() ) ); - connect( mpDirLister, TQT_SIGNAL( started(const KURL&) ), - this, TQT_SLOT( slotStarted(const KURL&) ) ); - connect( mpDirLister, TQT_SIGNAL( completed() ), - this, TQT_SLOT( slotCompleted() ) ); - connect( mpDirLister, TQT_SIGNAL( newItems( const KFileItemList & ) ), - this, TQT_SLOT( slotNewItems( const KFileItemList & ) ) ); - connect( mpDirLister, TQT_SIGNAL( deleteItem( KFileItem * ) ), - this, TQT_SLOT( slotDeleteItem( KFileItem * ) ) ); - connect( mpDirLister, TQT_SIGNAL( refreshItems( const KFileItemList & ) ), - this, TQT_SLOT( slotRefreshItems( const KFileItemList & ) ) ); + connect( mpDirLister, TQ_SIGNAL( clear() ), + this, TQ_SLOT( slotClear() ) ); + connect( mpDirLister, TQ_SIGNAL( started(const KURL&) ), + this, TQ_SLOT( slotStarted(const KURL&) ) ); + connect( mpDirLister, TQ_SIGNAL( completed() ), + this, TQ_SLOT( slotCompleted() ) ); + connect( mpDirLister, TQ_SIGNAL( newItems( const KFileItemList & ) ), + this, TQ_SLOT( slotNewItems( const KFileItemList & ) ) ); + connect( mpDirLister, TQ_SIGNAL( deleteItem( KFileItem * ) ), + this, TQ_SLOT( slotDeleteItem( KFileItem * ) ) ); + connect( mpDirLister, TQ_SIGNAL( refreshItems( const KFileItemList & ) ), + this, TQ_SLOT( slotRefreshItems( const KFileItemList & ) ) ); reloadList(); } @@ -154,7 +154,7 @@ void MediaApplet::arrangeButtons() MediumButton *button = *it; button_size = std::max(button_size, - orientation() == Qt::Vertical ? + orientation() == TQt::Vertical ? button->heightForWidth(width()) : button->widthForHeight(height()) ); // button->widthForHeight(height()) : @@ -162,7 +162,7 @@ void MediaApplet::arrangeButtons() } int kicker_size; - if (orientation() == Qt::Vertical) + if (orientation() == TQt::Vertical) { kicker_size = width(); } @@ -200,7 +200,7 @@ void MediaApplet::arrangeButtons() ++pack_count; - if(orientation() == Qt::Vertical) + if(orientation() == TQt::Vertical) { if (pack_count < max_packed_buttons) { @@ -425,7 +425,7 @@ void MediaApplet::reloadList() void MediaApplet::mousePressEvent(TQMouseEvent *e) { - if(e->button()==Qt::RightButton) + if(e->button()==TQt::RightButton) { TDEPopupMenu menu(this); diff --git a/kicker/applets/media/mediaapplet.desktop b/kicker/applets/media/mediaapplet.desktop index ad36a8de1..2cbba03cd 100644 --- a/kicker/applets/media/mediaapplet.desktop +++ b/kicker/applets/media/mediaapplet.desktop @@ -1,130 +1,8 @@ [Desktop Entry] Type=Plugin -Comment=Directly access your storage media -Comment[af]=Kry direkte toegang tot jou stoor media -Comment[ar]=الوصول مباشرة إلى وسائطك للتخزين -Comment[be]=Наўпрост дае доступ да носьбітаў інфармацыі -Comment[bg]=Директен достъп до съхраняващите устройства -Comment[bn]=আপনার স্টোরেজ মিডিয়া সরাসরি খুলুন -Comment[bs]=Direktno pristupite vašim uređajima -Comment[ca]=Accedeix directament als suports d'emmagatzematge -Comment[cs]=Přímý přístup k úložným zařízením -Comment[csb]=Prosti przistãp do Twòjëch zôpisownëch mediów -Comment[da]=Direkte adgang til opbevaringsmedie -Comment[de]=Direkter Zugriff auf Ihre Speichermedien -Comment[el]=Απευθείας πρόσβαση στις συσκευές αποθήκευσής σας -Comment[eo]=Rekte atingi vian konservejon -Comment[es]= Acceso directo a sus dispositivos de almacenamiento -Comment[et]=Ligipääs andmekandjatele -Comment[eu]=Atzitu zure biltegiratze-euskarriak -Comment[fa]=دستیابی مستقیم رسانۀ ذخیرهگاه شما -Comment[fi]=Tallennuslaitteet näyttävä paneelisovelma -Comment[fr]=Accès direct aux périphériques de stockage -Comment[fy]=Direkte tagong ta jo opslachmedia -Comment[gl]=Unha applet que mostra os seus dispositivos -Comment[he]=גישה ישירה אל ההתקנים שלך -Comment[hr]=Izravni pristup medijima za pohranjivanje -Comment[hu]=A tárolóeszközök közvetlen elérése -Comment[is]=Beinn aðgangur að geymslumiðlum -Comment[it]=Accesso diretto ai dispositivi di archiviazione -Comment[ja]=記憶メディアに直接アクセス -Comment[ka]=თქვენი შენახვის მედიის პირდაპირი წვდომა -Comment[kk]=Жинақтаушыларыңызды тез ашу -Comment[km]=ចូលដំណើរការឧបករណ៍ផ្ទុករបស់អ្នកដោយផ្ទាល់ -Comment[lt]=Tiesiogiai pasiekite savo saugojimo įrenginius -Comment[mk]=Пристапете директно на вашите медиуми за податоци -Comment[nb]=Direkte tilgang til lagringsenheter -Comment[nds]=Direktemang op Dien Spiekermedien togriepen -Comment[ne]=भण्डारण मिडियामा तपाईँको प्रत्यक्ष पहुँच -Comment[nl]=Directe toegang tot uw opslagmedia -Comment[nn]=Direkte tilgang til lagringseiningar -Comment[pa]=ਜੋ ਕਿ ਤੁਹਾਡਾ ਸਟੋਰੇਜ਼ ਮਾਧਿਅਮ ਵੇਖਾਉਦਾ ਹੈ। -Comment[pl]=Bezpośredni dostęp do Twoich urządzeń przechowywania danych -Comment[pt]=Aceder directamente aos seus suportes de armazenamento -Comment[pt_BR]=Acesso direto às suas mídias de armazenamento -Comment[ro]=Accesează direct dispozitivele de stocare -Comment[ru]=Аплет панели, показывающий устройства хранения -Comment[se]=Njuolggoluotta vurkenmediaide -Comment[sk]=Priamy prístup na zálohovacie médiá -Comment[sl]=Neposreden dostop do nosilcev za shranjevanje -Comment[sr]=Директно приступите складишним медијима -Comment[sr@Latn]=Direktno pristupite skladišnim medijima -Comment[sv]=Direkt åtkomst av lagringsmedia -Comment[th]=เข้าใช้งานสื่อที่เก็บข้อมูลของคุณโดยตรง -Comment[tr]=Depolama aygıtlarına doğrudan erişim -Comment[uk]=Безпосередній доступ до пристроїв зберігання інформації -Comment[uz]=Saqlash usunalariga qisqa yoʻl -Comment[uz@cyrillic]=Сақлаш усуналарига қисқа йўл -Comment[vi]=Truy cập ngay vào các ổ chứa dữ liệu của bạn -Comment[wa]=Accès direk a vos sopoirts di wårdaedje -Comment[zh_CN]=直接访问您的存储介质 -Comment[zh_TW]=直接存取您的儲存媒體 Name=Storage Media -Name[af]=Stoor Media -Name[ar]=وسائط التخزين -Name[be]=Носьбіты -Name[bg]=Съхраняващи устройства -Name[bn]=স্টোরেজ মিডিয়া -Name[bs]=Uređaji za smještaj podataka -Name[ca]=Suports d'emmagatzematge -Name[cs]=Úložná zařízení -Name[csb]=Zôpisowné media -Name[da]=Opbevaringsmedie -Name[de]=Speichermedien -Name[el]=Συσκευές αποθήκευσης -Name[eo]=Enmemoriga Medio -Name[es]=Dispositivos de almacenamiento -Name[et]=Andmekandjad -Name[eu]=Biltegiratze-euskarria -Name[fa]=رسانۀ ذخیرهگاه -Name[fi]=Tallennusmedia -Name[fr]=Support de stockage -Name[fy]=Opslachapparaten -Name[ga]=Meán Stórais -Name[gl]=Medios de armacenaxe -Name[he]=התקנים -Name[hi]=भंडार मीडिया -Name[hr]=Mediji za pohranjivanje -Name[hu]=Tárolóeszközök -Name[is]=Geymslumiðlar -Name[it]=Dispositivi di archiviazione -Name[ja]=記憶メディア -Name[ka]=მონაცემთა შენახვის მოწყობილობები -Name[kk]=Жинақтаушы құрылғылар -Name[km]=ឧបករណ៍ផ្ទុក -Name[lt]=Saugojimo įrenginiai -Name[lv]=Datu nesējs -Name[mk]=Медиуми за податоци -Name[ms]=Media Storan -Name[nb]=Lagringsenheter -Name[nds]=Spiekermedien -Name[ne]=भण्डारण मिडिया -Name[nl]=Opslagapparaten -Name[nn]=Lagringsmedium -Name[pa]=ਸਟੋਰੇਜ਼ ਮੀਡਿਆ -Name[pl]=Urządzenia przechowywania danych -Name[pt]=Dispositivos de Armazenamento -Name[pt_BR]=Mídia de Armazenamento -Name[ro]=Mediu de stocare -Name[ru]=Устройства хранения данных -Name[rw]=Uburyo bwo Kubika -Name[se]=Vurkenmedia -Name[sk]=Zálohovacie médiá -Name[sl]=Nosilci za shranjevanje -Name[sr]=Складишни медијуми -Name[sr@Latn]=Skladišni medijumi -Name[sv]=Lagringsmedia -Name[ta]=சேகரிப்பு ஊடகம் -Name[tg]=Захирагоҳи маълумот -Name[th]=สื่อเก็บข้อมูล -Name[tr]=Depolama Ortamı -Name[tt]=Saqlawlı Media -Name[uk]=Пристрої зберігання інформації -Name[uz]=Saqlash uskunalari -Name[uz@cyrillic]=Сақлаш ускуналари -Name[vi]=Ổ chứa Dữ liệu -Name[wa]=Sopoirts di wårdaedje -Name[zh_CN]=存储介质 -Name[zh_TW]=儲存媒體 + +Comment=Directly access your storage media + Icon=media-floppy-3_5-unmounted X-TDE-Library=media_panelapplet diff --git a/kicker/applets/media/mediaapplet.h b/kicker/applets/media/mediaapplet.h index 4c57b508d..1703d98f0 100644 --- a/kicker/applets/media/mediaapplet.h +++ b/kicker/applets/media/mediaapplet.h @@ -38,7 +38,7 @@ typedef TQValueList<MediumButton*> MediumButtonList; class MediaApplet : public KPanelApplet { -Q_OBJECT +TQ_OBJECT public: MediaApplet(const TQString& configFile, Type t = Normal, int actions = 0, diff --git a/kicker/applets/media/mediumbutton.cpp b/kicker/applets/media/mediumbutton.cpp index ce61cfbd6..4cc27ffe8 100644 --- a/kicker/applets/media/mediumbutton.cpp +++ b/kicker/applets/media/mediumbutton.cpp @@ -30,7 +30,7 @@ #include <tdemessagebox.h> #include <kmimetype.h> #include <tdelocale.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <krun.h> #include <tdeglobalsettings.h> #include <kcursor.h> @@ -45,13 +45,13 @@ #include <konq_drag.h> MediumButton::MediumButton(TQWidget *parent, const KFileItem &fileItem) - : PanelPopupButton(parent), mActions(TQT_TQWIDGET(this), TQT_TQOBJECT(this)), mFileItem(fileItem), mOpenTimer(0, + : PanelPopupButton(parent), mActions(this, this), mFileItem(fileItem), mOpenTimer(0, "MediumButton::mOpenTimer") { - TDEAction *a = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), + TDEAction *a = KStdAction::paste(this, TQ_SLOT(slotPaste()), &mActions, "pasteto"); a->setShortcut(0); - a = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), &mActions, "copy"); + a = KStdAction::copy(this, TQ_SLOT(slotCopy()), &mActions, "copy"); a->setShortcut(0); setBackgroundOrigin(AncestorOrigin); @@ -64,11 +64,11 @@ MediumButton::MediumButton(TQWidget *parent, const KFileItem &fileItem) refreshType(); - connect(&mOpenTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotDragOpen())); + connect(&mOpenTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotDragOpen())); // Activate this code only if we find a way to have both an // action and a popup menu for the same kicker button - //connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClicked())); + //connect(this, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClicked())); setPopup(new TQPopupMenu()); } @@ -122,8 +122,7 @@ void MediumButton::initPopup() void MediumButton::refreshType() { - KMimeType::Ptr mime = mFileItem.determineMimeType(); - TQToolTip::add(this, mime->comment()); + TQToolTip::add(this, mFileItem.text()); setIcon(mFileItem.iconName()); } diff --git a/kicker/applets/media/mediumbutton.h b/kicker/applets/media/mediumbutton.h index 76e448b27..40ee85ebd 100644 --- a/kicker/applets/media/mediumbutton.h +++ b/kicker/applets/media/mediumbutton.h @@ -32,7 +32,7 @@ class MediumButton : public PanelPopupButton { -Q_OBJECT +TQ_OBJECT public: MediumButton(TQWidget *parent, const KFileItem &fileItem); diff --git a/kicker/applets/media/preferencesdialog.h b/kicker/applets/media/preferencesdialog.h index b29f697ae..2354a73a2 100644 --- a/kicker/applets/media/preferencesdialog.h +++ b/kicker/applets/media/preferencesdialog.h @@ -30,7 +30,7 @@ class PreferencesDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: PreferencesDialog(KFileItemList media, TQWidget *parent=0, const char *name=0); ~PreferencesDialog(); diff --git a/kicker/applets/menu/CMakeLists.txt b/kicker/applets/menu/CMakeLists.txt index 772348e3a..65f334ce7 100644 --- a/kicker/applets/menu/CMakeLists.txt +++ b/kicker/applets/menu/CMakeLists.txt @@ -21,7 +21,11 @@ link_directories( ##### other data ################################ -install( FILES menuapplet.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/applets ) +tde_create_translated_desktop( + SOURCE menuapplet.desktop + DESTINATION ${DATA_INSTALL_DIR}/kicker/applets + PO_DIR kicker-desktops +) ##### menu_panelapplet (module) ################# diff --git a/kicker/applets/menu/menuapplet.cpp b/kicker/applets/menu/menuapplet.cpp index f95e4e4c5..d1aae0268 100644 --- a/kicker/applets/menu/menuapplet.cpp +++ b/kicker/applets/menu/menuapplet.cpp @@ -59,7 +59,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. extern "C" { - KDE_EXPORT KPanelApplet* init( TQWidget* parent_P, const TQString& configFile_P ) + TDE_EXPORT KPanelApplet* init( TQWidget* parent_P, const TQString& configFile_P ) { TDEGlobal::locale()->insertCatalogue("kmenuapplet"); return new KickerMenuApplet::Applet( configFile_P, parent_P ); @@ -89,8 +89,8 @@ Applet::Applet( const TQString& configFile_P, TQWidget* parent_P ) setBackgroundOrigin(AncestorOrigin); dcopclient.registerAs( "menuapplet", false ); // toolbarAppearanceChanged(int) is sent when changing macstyle - connect( kapp, TQT_SIGNAL( toolbarAppearanceChanged( int )), - this, TQT_SLOT( readSettings())); + connect( tdeApp, TQ_SIGNAL( toolbarAppearanceChanged( int )), + this, TQ_SLOT( readSettings())); claimSelection(); readSettings(); updateTopEdgeOffset(); @@ -298,11 +298,11 @@ void Applet::claimSelection() { delete selection_watcher; selection_watcher = NULL; - connect( selection, TQT_SIGNAL( lostOwnership()), TQT_SLOT( lostSelection())); + connect( selection, TQ_SIGNAL( lostOwnership()), TQ_SLOT( lostSelection())); module = new KWinModule; - connect( module, TQT_SIGNAL( windowAdded( WId )), this, TQT_SLOT( windowAdded( WId ))); - connect( module, TQT_SIGNAL( activeWindowChanged( WId )), - this, TQT_SLOT( activeWindowChanged( WId ))); + connect( module, TQ_SIGNAL( windowAdded( WId )), this, TQ_SLOT( windowAdded( WId ))); + connect( module, TQ_SIGNAL( activeWindowChanged( WId )), + this, TQ_SLOT( activeWindowChanged( WId ))); TQValueList< WId > windows = module->windows(); for( TQValueList< WId >::ConstIterator it = windows.begin(); it != windows.end(); @@ -328,7 +328,7 @@ void Applet::lostSelection() if( selection_watcher == NULL ) { selection_watcher = new TDESelectionWatcher( makeSelectionAtom(), DefaultScreen( tqt_xdisplay())); - connect( selection_watcher, TQT_SIGNAL( lostOwner()), this, TQT_SLOT( claimSelection())); + connect( selection_watcher, TQ_SIGNAL( lostOwner()), this, TQ_SLOT( claimSelection())); } delete module; module = NULL; @@ -476,7 +476,7 @@ void MenuEmbed::setMinimumSize( int w, int h ) assert( msg_type_atom != None ); ev.xclient.message_type = msg_type_atom; ev.xclient.format = 32; - ev.xclient.data.l[0] = GET_QT_X_TIME(); + ev.xclient.data.l[0] = get_tqt_x_time(); ev.xclient.data.l[1] = minimumWidth(); ev.xclient.data.l[2] = minimumHeight(); ev.xclient.data.l[3] = 0; diff --git a/kicker/applets/menu/menuapplet.desktop b/kicker/applets/menu/menuapplet.desktop index b8a082bf7..41e6c158a 100644 --- a/kicker/applets/menu/menuapplet.desktop +++ b/kicker/applets/menu/menuapplet.desktop @@ -2,127 +2,8 @@ Hidden=true Type=Plugin Name=Menu -Name[af]=Kieslys -Name[ar]=قائمة -Name[be]=Меню -Name[bg]=Меню -Name[bn]=মেনু -Name[br]=Meuziad -Name[bs]=Meni -Name[ca]=Menú -Name[cs]=Nabídka -Name[cy]=Dewislen -Name[de]=Menü -Name[el]=Μενού -Name[eo]=Menuo -Name[es]=Menú -Name[et]=Menüü -Name[eu]=Menua -Name[fa]=گزینگان -Name[fi]=Valikko -Name[ga]=Roghchlár -Name[he]=תפריט -Name[hi]=मेन्यू -Name[hr]=Izbornik -Name[hu]=Menü -Name[is]=Valmynd -Name[ja]=メニュー -Name[ka]=მენიუ -Name[kk]=Мәзір -Name[km]=ម៉ឺនុយ -Name[lt]=Meniu -Name[lv]=Izvēlne -Name[mk]=Мени -Name[mn]=Цэс -Name[nb]=Meny -Name[nds]=Menü -Name[ne]=मेनु -Name[nn]=Meny -Name[pa]=ਮੇਨੂ -Name[ro]=Meniu -Name[ru]=Меню -Name[rw]=Ibikubiyemo -Name[sl]=Meni -Name[sr]=Мени -Name[sr@Latn]=Meni -Name[sv]=Meny -Name[ta]=பட்டி -Name[te]=పట్టి -Name[tg]=Меню -Name[th]=เมนู -Name[tr]=Menü -Name[tt]=Saylaq -Name[uk]=Меню -Name[uz]=Menyu -Name[uz@cyrillic]=Меню -Name[vi]=Thực đơn -Name[wa]=Dressêye -Name[zh_CN]=菜单 -Name[zh_TW]=選單 + Comment=Applet embedding standalone menubars -Comment[ar]=بريمج يضمّن أشرطة قوائم منفردة بذاتها -Comment[be]=Аплет з убудаваным меню -Comment[bg]=Системен панел за вграждане на самостоятелни менюта -Comment[bn]=আলাদা মেনুবার ধারণ করার উপযোগী অ্যাপলেট -Comment[bs]=Applet koji uvezuje samostalne menije -Comment[ca]=Un applet encastat estàndard per a les barres de menú -Comment[cs]=Applet pohlcující samostatné lišty s nabídkami -Comment[csb]=Aplet zbiérający ùwòlnioné lëstwë menu -Comment[cy]=Rhaglennig sy'n mewn-adeiladu bariau dewislen unigol -Comment[da]=Applet der indlejrer alenestående menulinjer -Comment[de]=Programm zur Einbettung einzelner Menüleisten -Comment[el]=Μικροεφαρμογή που ενσωματώνει αυτόνομες γραμμές μενού -Comment[eo]=Aplikaĵeniganta solfunkcia menuzono -Comment[es]=Una miniaplicación que incluye barras de menú autónomas -Comment[et]=Aplett, mis põimib endasse isseisvaid menüüribasid -Comment[eu]=Menu-barrak txertaturik dituen appleta -Comment[fa]=میله گزینگان خوداتکای نهفتۀ برنامک -Comment[fi]=Sovelma, joka pystyy upottamaan yksittäisiä valikkorivejä -Comment[fr]=Une applet intégrant les barres de menu externes -Comment[fy]=Een applet die lossteande menubalken ynslút -Comment[gl]=Barras de menu estándar con incrustamento de applets -Comment[he]=שורת תפריטים משובצת יישומונים העומדת בפני עצמה -Comment[hi]=ऐपलेट एम्बेडिंग स्टैंडअलोन मेन्यूबार्स -Comment[hr]=Samostalne trake izbornika s ugrađenim apletima -Comment[hu]=Kisalkalmazásokat tartalmazni képes önálló menüsorok -Comment[is]=Smáforrit sem byggir inn sjálfstæðar valmyndastikur -Comment[it]=Applet per inglobare le barre dei menu -Comment[ja]=単独のメニューバーに組み込むアプレット -Comment[ka]=აპლეტი, რომელიც ამატებს ავტონომიურ პანელებს -Comment[kk]=Бөлек мәзір панельдерді құру апплеті -Comment[km]=របារម៉ឺនុយនៅតែឯងដែលបង្កប់ក្នុងអាប់ភ្លេត -Comment[lt]=Įskiepis, rodantis atskiras meniu dalis -Comment[lv]=Sīklietotne, kas iegulda pastāvīgas izvēlnes -Comment[mk]=Аплет кој ги вгнездува самостојните менија -Comment[ms]=Menu bar tersendiri pembenaman aplet -Comment[mt]=Applet li fiha menubars indipendenti -Comment[nb]=Et panelprogram som bygger inn frittstående menylinjer -Comment[nds]=Lüttprogramm för't Inbetten vun enkelte Warktüüchbalkens -Comment[ne]=एप्लेट सम्मिलित गर्ने स्ट्यान्डअलोन मेनुपट्टी -Comment[nl]=Een applet die losstaande menubalken insluit -Comment[nn]=Eit panelprogram som kan innehalda frittståande menylinjer -Comment[pa]=ਇੱਕਲੀ ਮੇਨੂਪੱਟੀ ਐਪਲਿਟ -Comment[pl]=Aplet zbierający uwolnione paski menu -Comment[pt]=Uma 'applet' que incorpora barras de menu autónomas -Comment[pt_BR]=Mini-aplicativo para embutir barras de menu ao painel -Comment[ro]=O miniaplicație ce înglobează bare de meniu -Comment[ru]=Аплет, встраивающий автономные панели меню -Comment[rw]=Apuleti zifitemo umwanya-ibikubiyemo wigenga -Comment[se]=Prográmmaš mii vuojuha oktanas fálloholggaid -Comment[sk]=Applet pre samostatné pruhy menu -Comment[sl]=Vstavek, ki vključuje samostojne menijske vrstice -Comment[sr]=Аплет за уграђивање самосталних менија -Comment[sr@Latn]=Aplet za ugrađivanje samostalnih menija -Comment[sv]=Miniprogram för inbäddning av fristående menyer -Comment[ta]=குறுநிரல் பொதிந்த தனியான மெனுபட்டிகள் -Comment[th]=แอพเพล็ตสำหรับฝังแถบเมนูลงพาเนล -Comment[tr]=Yalnız menü çubuklarını gömen uygulamacık -Comment[tt]=Ayırım torğan saylaq-tirälär berläşterüçe applet -Comment[uk]=Аплет вбудовних окремих смужок меню -Comment[vi]=Tiểu ứng dụng nhúng các thanh thực đơn đứng riêng -Comment[wa]=Aplikete po fé ravaler des bårs di dressêye totes seules -Comment[zh_CN]=嵌入独立菜单栏的小程序 -Comment[zh_TW]=單獨置於面板中的選單列 X-TDE-Library=menu_panelapplet X-TDE-UniqueApplet=true diff --git a/kicker/applets/menu/menuapplet.h b/kicker/applets/menu/menuapplet.h index 0b09334b6..159c7a37d 100644 --- a/kicker/applets/menu/menuapplet.h +++ b/kicker/applets/menu/menuapplet.h @@ -66,7 +66,7 @@ class MenuEmbed; class Applet : public KPanelApplet, public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP k_dcop: @@ -186,7 +186,7 @@ private: class MenuEmbed : public QXEmbed { - Q_OBJECT + TQ_OBJECT public: diff --git a/kicker/applets/minipager/CMakeLists.txt b/kicker/applets/minipager/CMakeLists.txt index a90269c80..7bdbbf841 100644 --- a/kicker/applets/minipager/CMakeLists.txt +++ b/kicker/applets/minipager/CMakeLists.txt @@ -26,7 +26,11 @@ link_directories( ##### other data ################################ -install( FILES minipagerapplet.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/applets ) +tde_create_translated_desktop( + SOURCE minipagerapplet.desktop + DESTINATION ${DATA_INSTALL_DIR}/kicker/applets + PO_DIR kicker-desktops +) install( FILES pagersettings.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) ##### minipager_panelapplet (module) ############ diff --git a/kicker/applets/minipager/minipagerapplet.desktop b/kicker/applets/minipager/minipagerapplet.desktop index 3e3f73d8e..270a240fe 100644 --- a/kicker/applets/minipager/minipagerapplet.desktop +++ b/kicker/applets/minipager/minipagerapplet.desktop @@ -1,122 +1,9 @@ [Desktop Entry] Type=Plugin +Icon=kpager Name=Desktop Preview & Pager -Name[af]=Werkskerm Voorskou & Boodskapper -Name[be]=Прагляд працоўных сталоў і пэйджар -Name[bg]=Изглед на екрана и пейджър -Name[bn]=ডেস্কটপ প্রাকদর্শন এবং পেজার -Name[bs]=Pregled i promjena radnih površina -Name[ca]=Vista prèvia d'escriptori i paginador -Name[cs]=Přepínač a náhled ploch -Name[csb]=Przestôwnik ë przezérnik pùltów -Name[da]=Desktop-forhåndsviser & -pager -Name[de]=Umschalten zwischen Arbeitsflächen -Name[el]=Προεπισκόπηση και αλλαγή επιφάνειας εργασίας -Name[eo]=Tabula antaŭrigardilo kaj paĝilo -Name[es]=Paginador y previsualizador del escritorio -Name[et]=Töölaudade eelvaatlus ja vahetaja -Name[eu]=Mahaigain aurrebista eta orrialdekatzailea -Name[fa]=پیشنمایش و پیجوی رومیزی -Name[fi]=Työpöydän esikatselu ja sivutus -Name[fr]=Gestionnaire et aperçu des bureaux -Name[fy]=Buroblêdfoarbyld en Pager -Name[gl]=Antevisor e Paxinador do Escritório -Name[hr]=Pager i preglednik radne površine -Name[hu]=Asztali előnézet és lapozó -Name[is]=Skjáborðs forskoðari & flettir -Name[it]=Anteprime e gestione dei desktop -Name[ja]=デスクトッププレビューとページャ -Name[ka]=სამუშაო დაფისა და გვერდების ჩვენება -Name[kk]=Үстелдер ақтарғышы -Name[km]=ការមើលផ្ទៃតុជាមុន និងភេកយ័រ -Name[lt]=Darbastalių peržiūrėjimo ir puslapiavimo priemonė -Name[mk]=Преглед и пејџер на раб. површина -Name[nb]=Forhåndsvising og bytte av skrivebord -Name[nds]=Schriefdisch-Ümschalter & Vöransicht -Name[ne]=डेस्कटप पूर्वावलोकन र पेजर -Name[nl]=Bureaubladvoorbeeld en pager -Name[nn]=Førehandsvising og byte av skrivebord -Name[pa]=ਵੇਹੜਾ ਝਲਕ ਅਤੇ ਪੇਜ਼ਰ -Name[pl]=Przełącznik i przeglądarka pulpitów -Name[pt]=Antevisão e Paginador do Ecrã -Name[pt_BR]=Pager & Pré-visualizador de Área de Trabalho -Name[ro]=Paginator și previzualizor pentru desktop -Name[ru]=Переключатель рабочих столов -Name[se]=Čállinbevddiid ovdačájeheaddji ja molssodeaddji -Name[sk]=Náhľad a stránkovač pracovnej plochy -Name[sl]=Ogledovalnik in pozivnik namizja -Name[sr]=Прегледач и пејџер радних површина -Name[sr@Latn]=Pregledač i pejdžer radnih površina -Name[sv]=Förhandsgranskning och hantering av skrivbord -Name[te]=రంగస్థల ముందు వీక్షణం & పెజర్ -Name[th]=แสดงตัวอย่างและเปลี่ยนพื้นที่ทำงาน -Name[tr]=Masaüstü Önizleyici ve Sayfalayıcı -Name[uk]=Перегляд стільниці і пейджер -Name[uz]=Ish stolining peyjeri -Name[uz@cyrillic]=Иш столининг пейжери -Name[vi]=Xem thử Màn hình nền & Chuyển đổi -Name[wa]=Préveyeu et pådjeu do scribanne -Name[zh_CN]=桌面预览器和页面切换器 -Name[zh_TW]=桌面預覽與縮圖 Comment=Preview, manage and switch to multiple virtual desktops -Comment[af]=Voorskou van, bestuur van en wissel tussen veelvuldige virtuelewerkskerms -Comment[ar]=عايين، دبِر و بدل إلى أسطح المكتب الوهمية المتعددة -Comment[be]=Прагляд, кіраванне і пераключэнне між некалькімі віртуальнымі працоўнымі сталамі -Comment[bg]=Преглед, управление и превключване към виртуалните работни плотове -Comment[bs]=Pregledajte, upravljajte i mijenjajte radne površine -Comment[ca]=Vista prèvia, gestió i canvi entre diversos escriptoris virtuals -Comment[cs]=Správa, náhled a přepínání virtuálních pracovních ploch -Comment[csb]=Pòdzérk, sprôwianié ë przestôwianié wirtualnëch pùltów -Comment[da]=Forhåndsvis, håndtér og skift mellem flere virtuelle desktoppe -Comment[de]=Vorschau und Verwaltung der virtuellen Arbeitsflächen. -Comment[el]=Προεπισκόπηση, διαχείριση και εναλλαγή σε πολλαπλές εικονικές επιφάνειες εργασίας -Comment[eo]=Antaŭrigardi, mastrumi kaj komuti al pluraj virtualaj labortabloj -Comment[es]=Previsualizar, gestionar y cambiar a múltiples escritorios virtuales -Comment[et]=Virtuaalsete töölaudade eelvaatlus, haldus ja vahetamine -Comment[eu]=Aurrebista, kudeatu eta aldatu mahaigain birtual anitzez -Comment[fa]=پیشنمایش، مدیریت و سودهی به رومیزیهای مجازی چندگانه -Comment[fi]=Esikatsele, hallitse ja vaihda virtuaalisia työpöytiä -Comment[fr]=Affichage, gestion et changement des bureaux virtuels multiples -Comment[fy]=Foarbyld, beheare en skeakel nei meardere firtuele buroblêden -Comment[gl]=Xestione, cambie e antevexa múltiplos escritórios virtuais -Comment[he]=תצוגה מקדימה, והעברה של שולחנות עבודה וירטואלים -Comment[hr]=Pregled, upravljanje i prebacivanje između višestrukih virtualnih radnih površina -Comment[hu]=A virtuális asztalok előnézete, kezelése, használata -Comment[is]=Forskoðaðu, stjórnaðu og flettu á milli marga sýndarskjáborða -Comment[it]=Gestisce, cambia e mostra le anteprime dei desktop virtuali multipli -Comment[ja]=複数の仮想デスクトップのプレビュー、管理と切り替え -Comment[kk]=Көп қиртуалды үстелдерді қарау, басқару және олаға ауысу -Comment[km]=ការមើលជាមុន, គ្រប់គ្រង និងប្តូរទៅពហុផ្ទៃតុនិម្មិត -Comment[lt]=Peržiūrėkite, tvarkykite ir lengvai vaikščiokite tarp daugelio menamų darbastalių -Comment[mk]=Преглед, управување и префрлање на повеќе виртуелни работни површини -Comment[nb]=Forhåndsvisning, håndtere og bytte til virtuelle skrivebord -Comment[nds]=Vöransicht un Pleeg vun virtuelle Schriefdischen -Comment[ne]=पूर्वावलोकन अनि प्रबन्ध गर्नुहोस् र अवास्तविक डेस्कटपमा स्विच गर्नुहोस् -Comment[nl]=Vooruitblik, beheer en schakel naar meerdere virtuele bureaubladen -Comment[nn]=Førehandsvis, handter og byt til virtuelle skrivebord -Comment[pa]=ਕਈ ਫ਼ਰਜ਼ੀ ਵੇਹੜਿਆਂ ਦੀ ਝਲਕ ਵੇਖਣ, ਉਹਨਾਂ ਦੇ ਪਰਬੰਧ ਅਤੇ ਤਬਦੀਲ ਕਰਨ ਲਈ ਹੈ -Comment[pl]=Podgląd, zarządzanie i przełączanie wirtualnych pulpitów -Comment[pt]=Antever, gerir e mudar para vários ecrãs virtuais -Comment[pt_BR]=Fornece uma pré-visualização, gerencia e alterna entre múltiplos ambientes de trabalho virtuais -Comment[ro]=Previzualizează, gestionează și schimbă desktop-uri virtuale -Comment[ru]=Переключение между виртуальными рабочими столами с возможностью показа их содержимого -Comment[sk]=Náhľad, nastavenie a prepínanie viacerých virtuálnych pracovných plôch -Comment[sl]=Predogled, upravljanje in preklapljanje za več navideznih namizij -Comment[sr]=Прегледајте, управљајте, и пребацујте се између радних површина -Comment[sr@Latn]=Pregledajte, upravljajte, i prebacujte se između radnih površina -Comment[sv]=Förhandsgranska, hantera och byt mellan flera virtuella skrivbord -Comment[te]=ముందు వీక్షణ, ఎక్కువ మిధ్యా రంగస్థలాల నియంత్రణ మరయు మార్పు -Comment[th]=ดูตัวอย่าง, จัดการและเปลี่ยนไปใช้พื้นที่ทำงานเสมือนอื่นๆ -Comment[uk]=Перегляд, керування та перемикання на багато віртуальних стільниць -Comment[uz]=Virtual ish stollarini koʻrib chiqish, boshqarish va ularga oʻtish uchun qulay vosita -Comment[uz@cyrillic]=Виртуал иш столларини кўриб чиқиш, бошқариш ва уларга ўтиш учун қулай восита -Comment[vi]=Xem thử, quản lý và chuyển đổi giữa các màn hình nền ảo -Comment[wa]=Prévey, manaedjî et candjî viè sacwants forveyous scribannes -Comment[zh_CN]=预览、管理及切换多个虚拟桌面 -Comment[zh_TW]=預覽、管理並切換到多個虛擬桌面 - -Icon=kpager X-TDE-Library=minipager_panelapplet X-TDE-UniqueApplet=false diff --git a/kicker/applets/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp index ac0fa1340..0af954fcb 100644 --- a/kicker/applets/minipager/pagerapplet.cpp +++ b/kicker/applets/minipager/pagerapplet.cpp @@ -36,9 +36,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tdeglobal.h> #include <tdelocale.h> #include <kdebug.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdepopupmenu.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kiconloader.h> #include <dcopclient.h> #include <netwm.h> @@ -73,7 +73,7 @@ static const int bgOffset = 300; extern "C" { - KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) + TDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { TDEGlobal::locale()->insertCatalogue("kminipagerapplet"); return new KMiniPager(configFile, KPanelApplet::Normal, 0, parent, "kminipagerapplet"); @@ -114,7 +114,7 @@ KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions, setFont( TDEGlobalSettings::taskbarFont() ); - m_twin = new KWinModule(TQT_TQOBJECT(this)); + m_twin = new KWinModule(this); m_activeWindow = m_twin->activeWindow(); m_curDesk = m_twin->currentDesktop(); @@ -123,7 +123,7 @@ KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions, m_curDesk = 1; } - desktopLayoutOrientation = Qt::Horizontal; + desktopLayoutOrientation = TQt::Horizontal; desktopLayoutX = -1; desktopLayoutY = -1; @@ -132,22 +132,22 @@ KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions, drawButtons(); - connect( m_twin, TQT_SIGNAL( currentDesktopChanged(int)), TQT_SLOT( slotSetDesktop(int) ) ); - connect( m_twin, TQT_SIGNAL( currentDesktopViewportChanged(int, const TQPoint&)), TQT_SLOT(slotSetDesktopViewport(int, const TQPoint&))); - connect( m_twin, TQT_SIGNAL( numberOfDesktopsChanged(int)), TQT_SLOT( slotSetDesktopCount(int) ) ); - connect( m_twin, TQT_SIGNAL( desktopGeometryChanged(int)), TQT_SLOT( slotRefreshViewportCount(int) ) ); - connect( m_twin, TQT_SIGNAL( activeWindowChanged(WId)), TQT_SLOT( slotActiveWindowChanged(WId) ) ); - connect( m_twin, TQT_SIGNAL( windowAdded(WId) ), this, TQT_SLOT( slotWindowAdded(WId) ) ); - connect( m_twin, TQT_SIGNAL( windowRemoved(WId) ), this, TQT_SLOT( slotWindowRemoved(WId) ) ); - connect( m_twin, TQT_SIGNAL( windowChanged(WId,unsigned int) ), this, TQT_SLOT( slotWindowChanged(WId,unsigned int) ) ); - connect( m_twin, TQT_SIGNAL( desktopNamesChanged() ), this, TQT_SLOT( slotDesktopNamesChanged() ) ); - connect( kapp, TQT_SIGNAL(backgroundChanged(int)), TQT_SLOT(slotBackgroundChanged(int)) ); + connect( m_twin, TQ_SIGNAL( currentDesktopChanged(int)), TQ_SLOT( slotSetDesktop(int) ) ); + connect( m_twin, TQ_SIGNAL( currentDesktopViewportChanged(int, const TQPoint&)), TQ_SLOT(slotSetDesktopViewport(int, const TQPoint&))); + connect( m_twin, TQ_SIGNAL( numberOfDesktopsChanged(int)), TQ_SLOT( slotSetDesktopCount(int) ) ); + connect( m_twin, TQ_SIGNAL( desktopGeometryChanged(int)), TQ_SLOT( slotRefreshViewportCount(int) ) ); + connect( m_twin, TQ_SIGNAL( activeWindowChanged(WId)), TQ_SLOT( slotActiveWindowChanged(WId) ) ); + connect( m_twin, TQ_SIGNAL( windowAdded(WId) ), this, TQ_SLOT( slotWindowAdded(WId) ) ); + connect( m_twin, TQ_SIGNAL( windowRemoved(WId) ), this, TQ_SLOT( slotWindowRemoved(WId) ) ); + connect( m_twin, TQ_SIGNAL( windowChanged(WId,unsigned int) ), this, TQ_SLOT( slotWindowChanged(WId,unsigned int) ) ); + connect( m_twin, TQ_SIGNAL( desktopNamesChanged() ), this, TQ_SLOT( slotDesktopNamesChanged() ) ); + connect( tdeApp, TQ_SIGNAL(backgroundChanged(int)), TQ_SLOT(slotBackgroundChanged(int)) ); - if (kapp->authorizeTDEAction("kicker_rmb") && kapp->authorizeControlModule("tde-kcmtaskbar.desktop")) + if (tdeApp->authorizeTDEAction("kicker_rmb") && tdeApp->authorizeControlModule("tde-kcmtaskbar.desktop")) { m_contextMenu = new TQPopupMenu(); - connect(m_contextMenu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(aboutToShowContextMenu())); - connect(m_contextMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int))); + connect(m_contextMenu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(aboutToShowContextMenu())); + connect(m_contextMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(contextMenuActivated(int))); setCustomMenu(m_contextMenu); } @@ -246,7 +246,7 @@ void KMiniPager::slotButtonSelected( int desk ) int KMiniPager::widthForHeight(int h) const { - if (orientation() == Qt::Vertical) + if (orientation() == TQt::Vertical) { return width(); } @@ -302,7 +302,7 @@ int KMiniPager::widthForHeight(int h) const int KMiniPager::heightForWidth(int w) const { - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { return height(); } @@ -366,7 +366,7 @@ void KMiniPager::updateDesktopLayout(int o, int x, int y) { // must own manager selection before setting global desktop layout int screen = DefaultScreen( tqt_xdisplay()); m_desktopLayoutOwner = new TDESelectionOwner( TQString( "_NET_DESKTOP_LAYOUT_S%1" ).arg( screen ).latin1(), - screen, TQT_TQOBJECT(this) ); + screen, this ); if( !m_desktopLayoutOwner->claim( false )) { delete m_desktopLayoutOwner; @@ -374,14 +374,14 @@ void KMiniPager::updateDesktopLayout(int o, int x, int y) return; } } - NET::Orientation orient = o == Qt::Horizontal ? NET::OrientationHorizontal : NET::OrientationVertical; + NET::Orientation orient = o == TQt::Horizontal ? NET::OrientationHorizontal : NET::OrientationVertical; NETRootInfo i( tqt_xdisplay(), 0 ); i.setDesktopLayout( orient, x, y, NET::DesktopLayoutCornerTopLeft ); } void KMiniPager::resizeEvent(TQResizeEvent*) { - bool horiz = orientation() == Qt::Horizontal; + bool horiz = orientation() == TQt::Horizontal; int deskNum = m_desktops.count(); int rowNum = m_settings->numberOfRows(); @@ -408,13 +408,13 @@ void KMiniPager::resizeEvent(TQResizeEvent*) { nDX = rowNum; nDY = deskCols; - updateDesktopLayout(Qt::Horizontal, -1, nDX); + updateDesktopLayout(TQt::Horizontal, -1, nDX); } else { nDX = deskCols; nDY = rowNum; - updateDesktopLayout(Qt::Horizontal, nDY, -1); + updateDesktopLayout(TQt::Horizontal, nDY, -1); } // 1 pixel spacing. @@ -442,7 +442,7 @@ void KMiniPager::wheelEvent( TQWheelEvent* e ) { int newDesk; int desktops = KWin::numberOfDesktops(); - + if(cycleWindow()){ @@ -456,7 +456,7 @@ void KMiniPager::wheelEvent( TQWheelEvent* e ) { newDesk = (desktops + m_curDesk - 2) % desktops + 1; } - + slotButtonSelected(newDesk); } } @@ -484,10 +484,10 @@ void KMiniPager::drawButtons() m_desktops.append( desk ); m_group->insert( desk, count ); - connect(desk, TQT_SIGNAL(buttonSelected(int)), - TQT_SLOT(slotButtonSelected(int)) ); - connect(desk, TQT_SIGNAL(showMenu(const TQPoint&, int )), - TQT_SLOT(slotShowMenu(const TQPoint&, int )) ); + connect(desk, TQ_SIGNAL(buttonSelected(int)), + TQ_SLOT(slotButtonSelected(int)) ); + connect(desk, TQ_SIGNAL(showMenu(const TQPoint&, int )), + TQ_SLOT(slotShowMenu(const TQPoint&, int )) ); desk->show(); ++count; @@ -727,14 +727,15 @@ void KMiniPager::aboutToShowContextMenu() rowMenu->insertItem(i18n("one row or column", "&1"), 1 + rowOffset); rowMenu->insertItem(i18n("two rows or columns", "&2"), 2 + rowOffset); rowMenu->insertItem( i18n("three rows or columns", "&3"), 3 + rowOffset); - connect(rowMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int))); - showMenu->insertItem((orientation()==Qt::Horizontal) ? i18n("&Rows"): + connect(rowMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(contextMenuActivated(int))); + showMenu->insertItem((orientation()==TQt::Horizontal) ? i18n("&Rows"): i18n("&Columns"), rowMenu); showMenu->insertItem(i18n("&Window Thumbnails"), WindowThumbnails); showMenu->insertItem(i18n("&Window Icons"), WindowIcons); showMenu->insertItem(i18n("&Cycle on Wheel"), Cycle); + showMenu->insertItem(i18n("3&D Desk Borders"), Border3D); showMenu->insertTitle(i18n("Text Label")); showMenu->insertItem(i18n("Desktop N&umber"), @@ -753,7 +754,7 @@ void KMiniPager::aboutToShowContextMenu() showMenu->insertItem(i18n("&Desktop Wallpaper"), PagerSettings::EnumBackgroundType::BgLive + bgOffset); } - connect(showMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int))); + connect(showMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(contextMenuActivated(int))); m_contextMenu->insertItem(i18n("&Pager Options"),showMenu); m_contextMenu->insertItem(SmallIcon("configure"), @@ -767,10 +768,8 @@ void KMiniPager::aboutToShowContextMenu() m_contextMenu->setItemChecked(WindowThumbnails, m_settings->preview()); m_contextMenu->setItemChecked(WindowIcons, m_settings->icons()); m_contextMenu->setItemChecked(Cycle, m_settings->cycle()); + m_contextMenu->setItemChecked(Border3D, m_settings->border3D()); m_contextMenu->setItemEnabled(WindowIcons, m_settings->preview()); - m_contextMenu->setItemEnabled(RenameDesktop, - m_settings->labelType() == - PagerSettings::EnumLabelType::LabelName); } void KMiniPager::slotShowMenu(const TQPoint& pos, int desktop) @@ -799,7 +798,7 @@ void KMiniPager::contextMenuActivated(int result) return; case ConfigureDesktops: - kapp->startServiceByDesktopName("desktop"); + tdeApp->startServiceByDesktopName("desktop"); return; case RenameDesktop: @@ -822,6 +821,9 @@ void KMiniPager::contextMenuActivated(int result) case Cycle: m_settings->setCycle(!m_settings->cycle()); break; + case Border3D: + m_settings->setBorder3D(!m_settings->border3D()); + break; case WindowIcons: m_settings->setIcons(!m_settings->icons()); break; @@ -883,7 +885,7 @@ void KMiniPager::slotDesktopNamesChanged() void KMiniPager::showPager() { - DCOPClient *dcop=kapp->dcopClient(); + DCOPClient *dcop=tdeApp->dcopClient(); if (dcop->isApplicationRegistered("kpager")) { @@ -892,7 +894,7 @@ void KMiniPager::showPager() else { // Let's run kpager if it isn't running - connect( dcop, TQT_SIGNAL( applicationRegistered(const TQCString &) ), this, TQT_SLOT(applicationRegistered(const TQCString &)) ); + connect( dcop, TQ_SIGNAL( applicationRegistered(const TQCString &) ), this, TQ_SLOT(applicationRegistered(const TQCString &)) ); dcop->setNotifications(true); TQString strAppPath(locate("exe", "kpager")); if (!strAppPath.isEmpty()) @@ -922,7 +924,7 @@ void KMiniPager::showKPager(bool toggleShow) pt=mapToGlobal( TQPoint(x(), y()) ); } - DCOPClient *dcop=kapp->dcopClient(); + DCOPClient *dcop=tdeApp->dcopClient(); TQByteArray data; TQDataStream arg(data, IO_WriteOnly); @@ -941,8 +943,8 @@ void KMiniPager::applicationRegistered( const TQCString & appName ) { if (appName == "kpager") { - disconnect( kapp->dcopClient(), TQT_SIGNAL( applicationRegistered(const TQCString &) ), - this, TQT_SLOT(applicationRegistered(const TQCString &)) ); + disconnect( tdeApp->dcopClient(), TQ_SIGNAL( applicationRegistered(const TQCString &) ), + this, TQ_SLOT(applicationRegistered(const TQCString &)) ); showKPager(false); } } diff --git a/kicker/applets/minipager/pagerapplet.h b/kicker/applets/minipager/pagerapplet.h index 1f0edc409..6433a6790 100644 --- a/kicker/applets/minipager/pagerapplet.h +++ b/kicker/applets/minipager/pagerapplet.h @@ -46,7 +46,7 @@ class PagerSettings; class KMiniPager : public KPanelApplet { - Q_OBJECT + TQ_OBJECT public: KMiniPager(const TQString& configFile, Type t = Normal, int actions = 0, @@ -64,7 +64,7 @@ public: void setActive( WId active ) { m_activeWindow = active; } WId activeWindow() { return m_activeWindow; } - enum ConfigOptions { LaunchExtPager = 96, WindowThumbnails, Cycle, + enum ConfigOptions { LaunchExtPager = 96, WindowThumbnails, Cycle, Border3D, WindowIcons, ConfigureDesktops, RenameDesktop }; int labelType() const { return m_settings->labelType(); } @@ -73,6 +73,7 @@ public: bool desktopPreview() const { return m_settings->preview(); } bool cycleWindow() const { return m_settings->cycle(); } bool windowIcons() const { return m_settings->icons(); } + bool border3D() const { return m_settings->border3D(); } Orientation orientation() const { return KPanelApplet::orientation(); } diff --git a/kicker/applets/minipager/pagerbutton.cpp b/kicker/applets/minipager/pagerbutton.cpp index 3e51a199e..3274f406b 100644 --- a/kicker/applets/minipager/pagerbutton.cpp +++ b/kicker/applets/minipager/pagerbutton.cpp @@ -29,6 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqpainter.h> #include <tqpopupmenu.h> #include <tqstylesheet.h> +#include <tqinputdialog.h> #include <netwm.h> #include <dcopclient.h> @@ -83,10 +84,10 @@ KMiniPagerButton::KMiniPagerButton(int desk, bool useViewPorts, const TQPoint& v m_desktopName = m_pager->twin()->desktopName(m_desktop); - connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotClicked())); - connect(this, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggled(bool))); - connect(&m_dragSwitchTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotDragSwitch())); - connect(&m_updateCompressor, TQT_SIGNAL(timeout()), this, TQT_SLOT(update())); + connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotClicked())); + connect(this, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotToggled(bool))); + connect(&m_dragSwitchTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotDragSwitch())); + connect(&m_updateCompressor, TQ_SIGNAL(timeout()), this, TQ_SLOT(update())); if (m_pager->desktopPreview()) { @@ -213,7 +214,7 @@ void KMiniPagerButton::loadBgPixmap() if (m_pager->bgType() != PagerSettings::EnumBackgroundType::BgLive) return; // not needed - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); if (!client->isAttached()) { client->attach(); @@ -247,8 +248,8 @@ void KMiniPagerButton::loadBgPixmap() } else if (s_commonSharedPixmap) { // other button is already fetching the pixmap - connect(s_commonSharedPixmap, TQT_SIGNAL(done(bool)), - TQT_SLOT(backgroundLoaded(bool))); + connect(s_commonSharedPixmap, TQ_SIGNAL(done(bool)), + TQ_SLOT(backgroundLoaded(bool))); return; } } @@ -258,8 +259,8 @@ void KMiniPagerButton::loadBgPixmap() if (!s_commonSharedPixmap) { s_commonSharedPixmap = new TDESharedPixmap; - connect(s_commonSharedPixmap, TQT_SIGNAL(done(bool)), - TQT_SLOT(backgroundLoaded(bool))); + connect(s_commonSharedPixmap, TQ_SIGNAL(done(bool)), + TQ_SLOT(backgroundLoaded(bool))); } retval = s_commonSharedPixmap->loadFromShared(TQString("DESKTOP1")); if (retval == false) { @@ -274,8 +275,8 @@ void KMiniPagerButton::loadBgPixmap() if (!m_sharedPixmap) { m_sharedPixmap = new TDESharedPixmap; - connect(m_sharedPixmap, TQT_SIGNAL(done(bool)), - TQT_SLOT(backgroundLoaded(bool))); + connect(m_sharedPixmap, TQ_SIGNAL(done(bool)), + TQ_SLOT(backgroundLoaded(bool))); } retval = m_sharedPixmap->loadFromShared(TQString("DESKTOP%1").arg(m_desktop)); if (retval == false) { @@ -397,47 +398,39 @@ void KMiniPagerButton::drawButton(TQPainter *bp) } } - if (!liveBkgnd) + // frame + if (liveBkgnd || transparent) { - if (transparent) + if (m_pager->border3D()) { - // transparent windows get an 1 pixel frame... - if (on) - { - bp->setPen(colorGroup().midlight()); - } - else if (down) - { - bp->setPen(KickerLib::blendColors(colorGroup().mid(), - colorGroup().midlight())); - } - else - { - bp->setPen(colorGroup().dark()); - } - - bp->drawRect(0, 0, w, h); + qDrawShadeRect(bp, 0, 0, w, h, on ? palette().active() : palette().inactive()); } else { - TQBrush background; - - if (on) - { - background = colorGroup().brush(TQColorGroup::Midlight); - } - else if (down) - { - background = TQBrush(KickerLib::blendColors(colorGroup().mid(), - colorGroup().midlight())); - } - else - { - background = colorGroup().brush(TQColorGroup::Mid); - } + bp->setPen(on ? colorGroup().midlight() + : KickerLib::blendColors(colorGroup().mid(), colorGroup().midlight())); + bp->drawRect(0, 0, w, h); + } + } + else + { + TQBrush background; - bp->fillRect(0, 0, w, h, background); + if (on) + { + background = colorGroup().brush(TQColorGroup::Midlight); + } + else if (down) + { + background = TQBrush(KickerLib::blendColors(colorGroup().mid(), + colorGroup().midlight())); } + else + { + background = colorGroup().brush(TQColorGroup::Mid); + } + + bp->fillRect(0, 0, w, h, background); } // window preview... @@ -492,22 +485,6 @@ void KMiniPagerButton::drawButton(TQPainter *bp) } } - if (liveBkgnd) - { - // draw a little border around the individual buttons - // makes it look a bit more finished. - if (on) - { - bp->setPen(colorGroup().midlight()); - } - else - { - bp->setPen(colorGroup().mid()); - } - - bp->drawRect(0, 0, w, h); - } - if (m_pager->labelType() != PagerSettings::EnumLabelType::LabelNone) { TQString label = (m_pager->labelType() == PagerSettings::EnumLabelType::LabelNumber) ? @@ -528,10 +505,10 @@ void KMiniPagerButton::drawButton(TQPainter *bp) void KMiniPagerButton::mousePressEvent(TQMouseEvent * e) { - if (e->button() == Qt::RightButton) + if (e->button() == TQt::RightButton) { // prevent LMB down -> RMB down -> LMB up sequence - if ((e->state() & Qt::MouseButtonMask ) == Qt::NoButton) + if ((e->state() & TQt::MouseButtonMask ) == TQt::NoButton) { emit showMenu(e->globalPos(), m_desktop); return; @@ -724,17 +701,30 @@ void KMiniPagerButton::slotClicked() void KMiniPagerButton::rename() { - if ( !m_lineEdit ) { - m_lineEdit = new TQLineEdit( this ); - connect( m_lineEdit, TQT_SIGNAL( returnPressed() ), m_lineEdit, TQT_SLOT( hide() ) ); - m_lineEdit->installEventFilter( this ); - } - m_lineEdit->setGeometry( rect() ); - m_lineEdit->setText(m_desktopName); - m_lineEdit->show(); - m_lineEdit->setFocus(); - m_lineEdit->selectAll(); - m_pager->emitRequestFocus(); + if (m_pager->labelType() == PagerSettings::EnumLabelType::LabelName) + { + if ( !m_lineEdit ) { + m_lineEdit = new TQLineEdit(this); + connect(m_lineEdit, TQ_SIGNAL(returnPressed()), m_lineEdit, TQ_SLOT(hide())); + m_lineEdit->installEventFilter(this); + } + m_lineEdit->setGeometry(rect()); + m_lineEdit->setText(m_desktopName); + m_lineEdit->show(); + m_lineEdit->setFocus(); + m_lineEdit->selectAll(); + m_pager->emitRequestFocus(); + } + else + { + m_pager->twin()->setDesktopName( + m_desktop, + TQInputDialog::getText( + i18n("Renaming desktop %1").arg(m_desktopName), + i18n("Enter a new name for desktop %1 (%2):").arg(m_desktop).arg(m_desktopName) + ) + ); + } } void KMiniPagerButton::slotToggled( bool b ) @@ -747,12 +737,12 @@ void KMiniPagerButton::slotToggled( bool b ) bool KMiniPagerButton::eventFilter( TQObject *o, TQEvent * e) { - if (o && TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_lineEdit) && + if (o && o == m_lineEdit && (e->type() == TQEvent::FocusOut || e->type() == TQEvent::Hide)) { m_pager->twin()->setDesktopName( m_desktop, m_lineEdit->text() ); m_desktopName = m_lineEdit->text(); - TQTimer::singleShot( 0, m_lineEdit, TQT_SLOT( deleteLater() ) ); + TQTimer::singleShot( 0, m_lineEdit, TQ_SLOT( deleteLater() ) ); m_lineEdit = 0; return true; } @@ -829,7 +819,7 @@ void KMiniPagerButton::updateKickerTip(KickerTip::Data &data) } data.duration = 4000; - data.icon = DesktopIcon("window_list", TDEIcon::SizeMedium); + data.icon = DesktopIcon("window_duplicate", TDEIcon::SizeMedium); data.message = TQStyleSheet::escape(m_desktopName); data.direction = m_pager->popupDirection(); } diff --git a/kicker/applets/minipager/pagerbutton.h b/kicker/applets/minipager/pagerbutton.h index 042820f20..4d889c39e 100644 --- a/kicker/applets/minipager/pagerbutton.h +++ b/kicker/applets/minipager/pagerbutton.h @@ -37,7 +37,7 @@ class TQLineEdit; class KMiniPagerButton : public TQButton, public KickerTip::Client { - Q_OBJECT + TQ_OBJECT public: KMiniPagerButton(int desk, bool useViewports, const TQPoint& viewport, KMiniPager *parent=0, const char *name=0); diff --git a/kicker/applets/minipager/pagersettings.kcfg b/kicker/applets/minipager/pagersettings.kcfg index 3a821f20a..11b6aa09d 100644 --- a/kicker/applets/minipager/pagersettings.kcfg +++ b/kicker/applets/minipager/pagersettings.kcfg @@ -49,15 +49,20 @@ <label>Show desktop preview?</label> <default>true</default> </entry> - + <entry name="Icons" type="Bool"> <label>Show window icons in previews?</label> <default>true</default> </entry> - + <entry name="Cycle" type="Bool"> <label>Cycle through desktops with wheel?</label> <default>true</default> </entry> + + <entry name="Border3D" type="Bool"> + <label>3D Desk border</label> + <default>false</default> + </entry> </group> </kcfg> diff --git a/kicker/applets/naughty/CMakeLists.txt b/kicker/applets/naughty/CMakeLists.txt index b4fdcc9b0..02e03e6c8 100644 --- a/kicker/applets/naughty/CMakeLists.txt +++ b/kicker/applets/naughty/CMakeLists.txt @@ -31,7 +31,11 @@ link_directories( ##### other data ################################ -install( FILES naughtyapplet.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/applets ) +tde_create_translated_desktop( + SOURCE naughtyapplet.desktop + DESTINATION ${DATA_INSTALL_DIR}/kicker/applets + PO_DIR kicker-desktops +) install( FILES naughty-happy.png naughty-sad.png DESTINATION ${DATA_INSTALL_DIR}/naughtyapplet/pics ) diff --git a/kicker/applets/naughty/NaughtyApplet.cpp b/kicker/applets/naughty/NaughtyApplet.cpp index 1da45a350..71e08bbe1 100644 --- a/kicker/applets/naughty/NaughtyApplet.cpp +++ b/kicker/applets/naughty/NaughtyApplet.cpp @@ -38,7 +38,7 @@ extern "C" { - KDE_EXPORT KPanelApplet* init(TQWidget * parent, const TQString & configFile) + TDE_EXPORT KPanelApplet* init(TQWidget * parent, const TQString & configFile) { TDEGlobal::locale()->insertCatalogue("naughtyapplet"); @@ -67,29 +67,28 @@ NaughtyApplet::NaughtyApplet setBackgroundOrigin( AncestorOrigin ); button_ = new SimpleButton(this); - button_->setFixedSize(20, 20); TQVBoxLayout * layout = new TQVBoxLayout(this); layout->addWidget(button_); - monitor_ = new NaughtyProcessMonitor(2, 20, TQT_TQOBJECT(this)); + monitor_ = new NaughtyProcessMonitor(2, 20, this); connect ( - button_, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotPreferences()) + button_, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotPreferences()) ); connect ( - monitor_, TQT_SIGNAL(runawayProcess(ulong, const TQString &)), - this, TQT_SLOT(slotWarn(ulong, const TQString &)) + monitor_, TQ_SIGNAL(runawayProcess(ulong, const TQString &)), + this, TQ_SLOT(slotWarn(ulong, const TQString &)) ); connect ( - monitor_, TQT_SIGNAL(load(uint)), - this, TQT_SLOT(slotLoad(uint)) + monitor_, TQ_SIGNAL(load(uint)), + this, TQ_SLOT(slotLoad(uint)) ); loadSettings(); @@ -132,25 +131,15 @@ NaughtyApplet::slotWarn(ulong pid, const TQString & name) } } - int -NaughtyApplet::widthForHeight(int) const -{ - return 20; -} - - int -NaughtyApplet::heightForWidth(int) const -{ - return 20; -} void NaughtyApplet::slotLoad(uint l) { - if (l > monitor_->triggerLevel()) - button_->setPixmap(BarIcon("naughty-sad")); - else - button_->setPixmap(BarIcon("naughty-happy")); + button_->setPixmap(TDEGlobal::iconLoader()->loadIcon( + (l > monitor_->triggerLevel() ? "naughty-sad" : "naughty-happy"), + TDEIcon::Panel, + TQMIN(size().width(),size().height())-2 + )); } void diff --git a/kicker/applets/naughty/NaughtyApplet.h b/kicker/applets/naughty/NaughtyApplet.h index eb9850851..0ef796ea4 100644 --- a/kicker/applets/naughty/NaughtyApplet.h +++ b/kicker/applets/naughty/NaughtyApplet.h @@ -31,7 +31,7 @@ class TQPushButton; class NaughtyApplet : public KPanelApplet { - Q_OBJECT + TQ_OBJECT public: @@ -46,8 +46,6 @@ class NaughtyApplet : public KPanelApplet ~NaughtyApplet(); - virtual int widthForHeight(int h) const; - virtual int heightForWidth(int w) const; signals: diff --git a/kicker/applets/naughty/NaughtyConfigDialog.h b/kicker/applets/naughty/NaughtyConfigDialog.h index 4e428f00f..41be8344e 100644 --- a/kicker/applets/naughty/NaughtyConfigDialog.h +++ b/kicker/applets/naughty/NaughtyConfigDialog.h @@ -28,7 +28,7 @@ class KIntNumInput; class NaughtyConfigDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kicker/applets/naughty/NaughtyProcessMonitor.cpp b/kicker/applets/naughty/NaughtyProcessMonitor.cpp index 09c02cbf9..63b634e59 100644 --- a/kicker/applets/naughty/NaughtyProcessMonitor.cpp +++ b/kicker/applets/naughty/NaughtyProcessMonitor.cpp @@ -39,6 +39,10 @@ #include <signal.h> #include <unistd.h> +#ifdef Q_OS_SOLARIS +#include <procfs.h> +#endif + #include <tqfile.h> #include <tqstring.h> #include <tqstringlist.h> @@ -107,7 +111,7 @@ NaughtyProcessMonitor::NaughtyProcessMonitor #ifdef __NetBSD__ d->kd = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, "kvm_open"); #endif - connect(d->timer_, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout())); + connect(d->timer_, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeout())); } NaughtyProcessMonitor::~NaughtyProcessMonitor() @@ -210,7 +214,7 @@ NaughtyProcessMonitor::_process(ulong pid, uint load) bool NaughtyProcessMonitor::canKill(ulong pid) const { -#ifdef __linux__ +#ifdef Q_OS_LINUX TQFile f("/proc/" + TQString::number(pid) + "/status"); if (!f.open(IO_ReadOnly)) @@ -240,6 +244,17 @@ NaughtyProcessMonitor::canKill(ulong pid) const return false ; return geteuid () == d->uidMap_[pid] ; +#elif defined(Q_OS_SOLARIS) + TQFile f("/proc/" + TQString::number(pid) + "/psinfo"); + TQByteArray raw; + psinfo_t *inf; + + if (!f.open(IO_ReadOnly)) + return false; + raw = f.readAll(); + f.close(); + inf = (psinfo_t *)raw.data(); + return geteuid() == inf->pr_euid; #else Q_UNUSED( pid ); return false; @@ -249,8 +264,9 @@ NaughtyProcessMonitor::canKill(ulong pid) const TQString NaughtyProcessMonitor::processName(ulong pid) const { -#if defined(__linux__) || defined(__OpenBSD__) || defined(__NetBSD__) -#ifdef __linux__ +#if defined(Q_OS_LINUX) || defined(__OpenBSD__) || defined(__NetBSD__) || \ + defined(Q_OS_SOLARIS) +#if defined(Q_OS_LINUX) || defined(Q_OS_SOLARIS) TQFile f("/proc/" + TQString::number(pid) + "/cmdline"); if (!f.open(IO_ReadOnly)) @@ -344,7 +360,7 @@ NaughtyProcessMonitor::processName(ulong pid) const uint NaughtyProcessMonitor::cpuLoad() const { -#ifdef __linux__ +#ifdef Q_OS_LINUX TQFile f("/proc/stat"); if (!f.open(IO_ReadOnly)) @@ -400,7 +416,7 @@ NaughtyProcessMonitor::cpuLoad() const TQValueList<ulong> NaughtyProcessMonitor::pidList() const { -#ifdef __linux__ +#if defined(Q_OS_LINUX) || defined(Q_OS_SOLARIS) TQStringList dl(TQDir("/proc").entryList()); TQValueList<ulong> pl; @@ -505,7 +521,7 @@ NaughtyProcessMonitor::pidList() const bool NaughtyProcessMonitor::getLoad(ulong pid, uint & load) const { -#ifdef __linux__ +#ifdef Q_OS_LINUX TQFile f("/proc/" + TQString::number(pid) + "/stat"); if (!f.open(IO_ReadOnly)) @@ -540,7 +556,8 @@ NaughtyProcessMonitor::getLoad(ulong pid, uint & load) const bool NaughtyProcessMonitor::kill(ulong pid) const { -#if defined(__linux__) || defined(__OpenBSD__) || defined(__NetBSD__) +#if defined(Q_OS_LINUX) || defined(__OpenBSD__) || defined(__NetBSD__) ||\ + defined(Q_OS_SOLARIS) return 0 == ::kill(pid, SIGKILL); #else Q_UNUSED( pid ); diff --git a/kicker/applets/naughty/NaughtyProcessMonitor.h b/kicker/applets/naughty/NaughtyProcessMonitor.h index d66479964..3075bb9bd 100644 --- a/kicker/applets/naughty/NaughtyProcessMonitor.h +++ b/kicker/applets/naughty/NaughtyProcessMonitor.h @@ -27,7 +27,7 @@ class NaughtyProcessMonitorPrivate; class NaughtyProcessMonitor : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kicker/applets/naughty/naughty-happy.png b/kicker/applets/naughty/naughty-happy.png Binary files differindex 4c3505dfc..cbd451365 100644 --- a/kicker/applets/naughty/naughty-happy.png +++ b/kicker/applets/naughty/naughty-happy.png diff --git a/kicker/applets/naughty/naughty-sad.png b/kicker/applets/naughty/naughty-sad.png Binary files differindex ae6d727f2..82a8279f5 100644 --- a/kicker/applets/naughty/naughty-sad.png +++ b/kicker/applets/naughty/naughty-sad.png diff --git a/kicker/applets/naughty/naughtyapplet.desktop b/kicker/applets/naughty/naughtyapplet.desktop index 4784382b4..73a304173 100644 --- a/kicker/applets/naughty/naughtyapplet.desktop +++ b/kicker/applets/naughty/naughtyapplet.desktop @@ -1,131 +1,9 @@ [Desktop Entry] Type=Plugin Name=Runaway Process Catcher -Name[af]=Weghardloop Proses Vanger -Name[ar]=لاقط الإجرائات الهاربة -Name[az]=İşıək Gedişat Yaxalayıcı -Name[be]=Захоп завіснуўшых працэсаў -Name[bg]=Неуправляеми процеси -Name[bn]=অনিয়ন্ত্রিত প্রসেস প্রহরী -Name[bs]=Hvatač odbjeglih procesa -Name[ca]=Capturador de processos descontrolats -Name[cs]=Odchytávač chybných procesů -Name[csb]=Jachtôrz zagùbionëch procesów -Name[cy]=Arhosydd Prosesau Di-derfyn -Name[da]=Indfanger af løbsk-kørte processer -Name[de]=Beenden unkontrollierter Prozesse -Name[el]=Runaway Έλεγχος Διεργασιών -Name[eo]=Kaptilo por eskapitaj procezoj -Name[es]=Capturador de procesos desbocados -Name[et]=Hanguvate protsesside püüdja -Name[eu]=Ataza eroen harrapatzailea -Name[fa]=گیرندۀ فرآیند فراری -Name[fi]=Karanneiden prosessien kiinniottaja -Name[fr]=Détecteur de processus fous -Name[fy]=Processenmonitor -Name[ga]=Sriantóir na bPróiseas Éalaitheach -Name[gl]=Detector de Procesos Estragados -Name[he]=תופס תהליכים נמלטים -Name[hi]=रनअवे प्रॉसेस कैचर -Name[hr]=Hvatač odbjeglih procesa -Name[hu]=Folyamatszabályozó -Name[is]=Ferlafangari -Name[it]=Rilevatore di processi impazziti -Name[ja]=手に負えないプロセスのキャッチャー -Name[kk]=Жаңылыс процесстерді байқаушы -Name[km]=ឧបករណ៍ចាប់យកដំណើរការដែលមិនអាចបញ្ជាបាន -Name[lo]=ດັກຈັບໂປຣເສດ -Name[lt]=Pabėgusių procesų gaudyklė -Name[lv]=Nevadāmu Procesu Savācējs -Name[mk]=Фаќач на процеси бегалци -Name[mn]=Удирдлагагүй процессуудыг төгсгөх -Name[ms]=Penangkap Proses Luar Kawalan -Name[mt]=Programm biex Jaqbad Proċessi Maħruba -Name[nb]=Fanger løpske prosesser -Name[nds]=Dörgahn Perzessen infangen -Name[ne]=रन वे प्रोसेस क्याचर -Name[nl]=Processenmonitor -Name[nn]=Løpsk prosess-fangar -Name[nso]=Moswari wa Tiragalo yeo e Tshabago -Name[pa]=ਬੇਕਾਬੂ ਕਾਰਜ ਸ਼ਿਕਾਰੀ -Name[pl]=Łowca zagubionych procesów -Name[pt]=Colector de Processos em Fuga -Name[pt_BR]=Captura de processos -Name[ro]=Monitor de procese -Name[ru]=Сторож сбойных процессов -Name[rw]=Mufata Igikorwa Ntagenzura -Name[se]=Báhtaran proseassaid dustejeaddji -Name[sk]=Zachytenie chybných procesov -Name[sl]=Prestrezovalnik pobeglih procesov -Name[sr]=Хватач одбеглих процеса -Name[sr@Latn]=Hvatač odbeglih procesa -Name[sv]=Fånga bortsprungna processer -Name[ta]=ஓடுபாதை செயல் பிடிப்பான் -Name[tg]=Дастгиркунандаи протсессҳои қарорӣ -Name[th]=ดักการจบโปรเซส -Name[tr]=Sorunlu Süreç Yakalayıcı -Name[tt]=Içqınğan Eşlänü Totqıç -Name[uk]=Захоплювач процесів-дезертирів -Name[ven]=TShitenwa tsha Catcher -Name[vi]=Bắt Tiến trình Chạy trốn -Name[wa]=Troûleu d' sot processus -Name[zh_CN]=落跑进程捕捉器 -Name[zh_TW]=失控程式捕捉器 -Name[zu]=Umbambi wenqubo ebalekayo + Comment=Detect and end broken processes which consume too much CPU time -Comment[af]=Spoor stukkende prosesse op wat te veel CPU tyd opneem en stop hulle -Comment[ar]=إكتشف و أنهي الإجرائات المقطوعة اللتي تستهلك الكثير من وقت تشغيل وحدة المعالجة المركزية -Comment[be]=Вызначае і забівае зламаныя працэсы, якія выкарыстоўваюць працэсар надта моцна -Comment[bg]=Намиране и прекратяване на процеси, които консумират твърде много ресурси -Comment[bs]=Otkrij i završi neispravne procese koji zauzimaju previše CPU vremena -Comment[ca]=Detecta i finalitza processos espatllats que consumeixen massa temps de CPU -Comment[cs]=Zjištění a ukončení poškozených procesů ubírajících výkon -Comment[csb]=Òdnajdiwô ë kùńczi niesprôwné procesë, jaczé brëkùją za wiele procesora -Comment[da]=Detekterer og afslutter fejlagtige processer som bruger for meget processortid -Comment[de]=Erkennen und Beenden fehlerhafter Prozesse, die zu viel Rechenzeit verbrauchen -Comment[el]=Ανίχνευση και τερματισμός διεργασιών που καταναλώνουν μεγάλο χρόνο του επεξεργαστή -Comment[eo]=Detekti kaj mortigi difektitajn procezojn konsumante tro da procezilo-tempon -Comment[es]=Detectar procesos rotos que consumen demasiado tiempo del procesador -Comment[et]=Liialt protsessoriaega kulutavate katkiste rakenduste avastamine ja nende töö lõpetamine -Comment[eu]=Detektatu eta amaitu CPU gehiegi erabiltzen ari diren prozesuak -Comment[fa]=آشکارسازی و پایان فرآیندهای قطعشده، که زمان خیلی زیاد واحد پردازش مرکزی را مصرف میکند. -Comment[fi]=Tunnista ja lopeta rikkinäiset prosessit, jotka kuluttavat liikaa laskentatehoa. -Comment[fr]=Détection et arrêt des programmes consommant trop de ressources du processeur -Comment[fy]=Untdekke en stopje alle brutsen prosessen dy tefolle prosessortiid konsumearje -Comment[gl]=Detecta e mata procesos estragados que consumen tempo de CPU -Comment[he]=זהה וסגור תהליכים שצורכים יותר מדי זמן מעבד -Comment[hr]=Otkrivanje i završavanje nedovršenih procesa koji troše previše procesorskog vremena -Comment[hu]=A túl sok processzoridőt lefoglaló folyamatok meghatározása és bezárása -Comment[is]=Uppgötvaðu og slökktu á rofnum ferlum sem taka of mikinn örgjörvatíma -Comment[it]=Trova e termina i processi impazziti che consuma troppo processore -Comment[ja]=CPU 時間を無駄に消費する壊れたプロセスを見つけて終了させる -Comment[kk]=Проңессорды көп жұмсайтын процессарды табу және жою -Comment[km]=រក និងបញ្ចប់ដំណើរការខូចដែលប្រើពេលវេលា CPU ច្រើនពេក -Comment[lt]=Aptikti ir užbaigti sugadintus procesus, kurie suryja per daug CPU laiko -Comment[mk]=Откривање и прекинување на нефункционални процеси што го трошат времето на процесорот -Comment[nb]=Finn og avslutt løpske prosesser som tar for mye prosessorkraft -Comment[nds]=Schaadhaftig Perzessen, de to veel Rekentiet bruukt, opdecken un beennen -Comment[ne]=प्रसस्त CPU समय खपत गर्ने कमजोर प्रक्रिया पत्ता लगाउनुहोस् र अन्त्य गर्नुहोस् -Comment[nl]=Detecteer en stop gebroken processen die teveel processortijd consumeren -Comment[nn]=Finn og avslutt løpske prosessar som tek for myjke prosessorkraft. -Comment[pl]=Wykrywa i kończy niesprawne procesy, które zużywają za dużo procesora -Comment[pt]=Detectar e terminar os processos com problemas que estejam a consumir demasiado CPU -Comment[pt_BR]=Detecta e finaliza processos quebrados que consomem muito tempo de CPU -Comment[ro]=Detectează și termină procese defecte care consumă prea mult CPU -Comment[ru]=Обнаружение и завершение процессов, требующим слишком много времени процессора -Comment[se]=Gávnna jea heaittit reakčanan proseassaid mat geavahit menddo olu CPU-áiggi -Comment[sk]=Zistenie a ukončenie procesov, ktoré spotrebúvajú priveľa času CPU -Comment[sl]=Zaznavanje in pobijanje procesov, ki porabljajo preveč procesorskega časa -Comment[sr]=Детектује и окончава покварене процесе који одузимају превише процесорског времена -Comment[sr@Latn]=Detektuje i okončava pokvarene procese koji oduzimaju previše procesorskog vremena -Comment[sv]=Detekterar och avslutar felaktiga processer som använder för mycket processortid -Comment[th]=ตรวจจับและจบโปรเซสที่เสียหาย ซึ่งใช้เวลาของหน่วยประมวลผลมากเกินไป -Comment[tr]=Sorunlu ve fazla işlemci gücü harcayan programları bulup yokeder -Comment[uk]=Виявлення і припинення процесів, які споживають забагато часу процесора -Comment[vi]=Phát hiện và ngừng các tiến trình gây lãng phí bộ vi xử lý -Comment[wa]=Trove et arestêye les schetés processus k' eployèt trop di tins CPU -Comment[zh_CN]=检测并结束占用太多 CPU 时间的进程 -Comment[zh_TW]=偵測並終結浪費多數 CPU 時間的破損程序 + Icon=runprocesscatcher X-TDE-Library=naughty_panelapplet X-TDE-UniqueApplet=true diff --git a/kicker/applets/run/CMakeLists.txt b/kicker/applets/run/CMakeLists.txt index 0e1ca3960..8500e799b 100644 --- a/kicker/applets/run/CMakeLists.txt +++ b/kicker/applets/run/CMakeLists.txt @@ -22,7 +22,11 @@ link_directories( ##### other data ################################ -install( FILES runapplet.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/applets ) +tde_create_translated_desktop( + SOURCE runapplet.desktop + DESTINATION ${DATA_INSTALL_DIR}/kicker/applets + PO_DIR kicker-desktops +) ##### run_panelapplet (module) ################## diff --git a/kicker/applets/run/runapplet.cpp b/kicker/applets/run/runapplet.cpp index c5d3e972a..104cd5efe 100644 --- a/kicker/applets/run/runapplet.cpp +++ b/kicker/applets/run/runapplet.cpp @@ -42,7 +42,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. extern "C" { - KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) + TDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { TDEGlobal::locale()->insertCatalogue("krunapplet"); return new RunApplet(configFile, KPanelApplet::Stretch, 0, parent, "krunapplet"); @@ -69,15 +69,15 @@ RunApplet::RunApplet(const TQString& configFile, Type type, int actions, f = _btn->font(); f.setPixelSize(12); _btn->setFont(f); - connect(_btn, TQT_SIGNAL(clicked()), TQT_SLOT(popup_combo())); + connect(_btn, TQ_SIGNAL(clicked()), TQ_SLOT(popup_combo())); // setup history combo _input = new KHistoryCombo(this); _input->setFocus(); _input->clearEdit(); watchForFocus(_input->lineEdit()); - connect(_input, TQT_SIGNAL(activated(const TQString&)), - TQT_SLOT(run_command(const TQString&))); + connect(_input, TQ_SIGNAL(activated(const TQString&)), + TQ_SLOT(run_command(const TQString&))); TDEConfig *c = config(); c->setGroup("General"); @@ -115,7 +115,7 @@ RunApplet::~RunApplet() void RunApplet::resizeEvent(TQResizeEvent*) { - if(orientation() == Qt::Horizontal) + if(orientation() == TQt::Horizontal) { _btn->hide(); _input->reparent(this, TQPoint(0,0), true); @@ -209,7 +209,7 @@ void RunApplet::run_command(const TQString& command) TQString exec; bool focusNeeded = false; - kapp->propagateSessionManager(); + tdeApp->propagateSessionManager(); _filterData->setData( _input->currentText().stripWhiteSpace() ); TQStringList filters; @@ -230,10 +230,10 @@ void RunApplet::run_command(const TQString& command) } else if (cmd == "logout") { - bool shutdown = kapp->requestShutDown(); + bool shutdown = tdeApp->requestShutDown(); if( !shutdown ) { - // This i18n string is in kdesktop/desktop.cc as well. Maybe we should DCOP to kdesktop instead ? + // This i18n string is in kdesktop/desktop.cpp as well. Maybe we should DCOP to kdesktop instead ? KMessageBox::error( 0, i18n("Unable to log out properly.\nThe session manager cannot " "be contacted. You can try to force a shutdown by pressing " "Ctrl+Alt+Backspace. Note, however, that your current " @@ -288,7 +288,7 @@ void RunApplet::run_command(const TQString& command) return; hide: - if (orientation() == Qt::Vertical) + if (orientation() == TQt::Vertical) _hbox->hide(); needsFocus(focusNeeded); } diff --git a/kicker/applets/run/runapplet.desktop b/kicker/applets/run/runapplet.desktop index 903788f7a..6e907cedd 100644 --- a/kicker/applets/run/runapplet.desktop +++ b/kicker/applets/run/runapplet.desktop @@ -1,130 +1,9 @@ [Desktop Entry] Type=Plugin Name=Run Command -Name[af]=Hardloop Opdrag -Name[ar]=تنفيذ الأمر -Name[be]=Выканаць праграму -Name[bg]=Изпълнение на команда -Name[bn]=কমান্ড চালাও -Name[br]=Seveniñ ur Goulev -Name[bs]=Izvrši naredbu -Name[ca]=Executa un comandament -Name[cs]=Spustit příkaz -Name[csb]=Zrëszënié pòlétu -Name[cy]=Rhedeg Gorchymyn -Name[da]=Kør kommando -Name[de]=Befehl ausführen -Name[el]=Εκτέλεση εντολής -Name[eo]=Lanĉu komandon -Name[es]=Ejecutar una orden -Name[et]=Käsu käivitamine -Name[eu]=Exekutatu komandoa -Name[fa]=اجرای فرمان -Name[fi]=Suorita komento -Name[fr]=Lancer une commande -Name[fy]=kommando útfiere -Name[ga]=Rith Ordú -Name[gl]=Executar Comando -Name[he]=הפעלת פקודה -Name[hi]=कमांड चलाएँ -Name[hr]=Pokreni naredbu -Name[hu]=Parancs végrehajtása -Name[is]=Keyra skipun -Name[it]=Esegui comando -Name[ja]=コマンドを実行 -Name[ka]=ბრძანების შესრულება -Name[kk]=Команданы орындау -Name[km]=រត់ពាក្យបញ្ជា -Name[ko]=Penguin Command -Name[lt]=Paleisti komandą -Name[lv]=Darbināt komandu -Name[mk]=Изврши команда -Name[ms]=Arahan Laksana -Name[nb]=Kjør kommando -Name[nds]=Befehl utföhren -Name[ne]=आदेश चलाउनुहोस् -Name[nl]=Commando uitvoeren -Name[nn]=Køyr kommando -Name[pa]=ਕਮਾਂਡ ਚਲਾਓ -Name[pl]=Uruchomienie polecenia -Name[pt]=Executar um Comando -Name[pt_BR]=Executar Comando -Name[ro]=Execută comanda -Name[ru]=Выполнить команду -Name[rw]=Gutangiza Ibwiriza -Name[se]=Vuoje gohččuma -Name[sk]=Vykonať príkaz -Name[sl]=Poženi ukaz -Name[sr]=Покретање наредбе -Name[sr@Latn]=Pokretanje naredbe -Name[sv]=Kör kommando -Name[ta]=இயக்க கட்டளை -Name[tg]=Иҷрои фармон -Name[th]=ใช้งานคำสั่ง -Name[tr]=Komut Çalıştır -Name[tt]=Boyırıq Eşlätü -Name[uk]=Запуск команди -Name[uz]=Buyruqni bajarish -Name[uz@cyrillic]=Буйруқни бажариш -Name[vi]=Gõ lệnh -Name[wa]=Enonder ene comande -Name[zh_CN]=运行命令 -Name[zh_TW]=執行命令 + Comment=Launch single commands without a terminal window -Comment[af]=Lanseer enkel opdragte sonder 'n terminaal venster -Comment[ar]=أطلق أوامر وحيدة بدون الحاجة إلى نافذة المطراف -Comment[be]=Запускае асобныя каманды без тэрмінальнага акна -Comment[bg]=Стартиране на команда без да има нужда от терминален прозорец -Comment[bn]=টার্মিনাল উইণ্ডো ছাড়াই একটি কমান্ড চালান -Comment[bs]=Izvršite pojedinačne naredbe bez prozora terminala -Comment[ca]=Engega ordres sense una finestra de terminal -Comment[cs]=Spouštění jednotlivých příkazů bez terminálového okna -Comment[csb]=Zrëszanié pòjedińczëch pòlétów kònsolë bez òtmëkaniô òkna terminala -Comment[da]=Start enkelte kommandoer uden et terminalvindue -Comment[de]=Ausführen einzelner Kommandos ohne Terminalfenster -Comment[el]=Εκτέλεση εντολών χωρίς ένα παράθυρο τερματικού -Comment[eo]=Lanĉi unuopajn komandojn sen terminala fenestro -Comment[es]=Lanzar órdenes individuales sin ventana de terminal -Comment[et]=Üksikute käskude käivitamine terminali abita -Comment[eu]=Abiarazi komandoak terminal leihorik gabe -Comment[fa]=راهاندازی فرمانهای تک بدون پنجرۀ پایانه -Comment[fi]=Käynnistä yksittäisiä komentoja ilman pääteikkunaa. -Comment[fr]=Lancer des commandes simples sans fenêtre de terminal -Comment[fy]=Fier losse kommando's út sûnder in terminalfinster -Comment[ga]=Rith orduithe aonair gan fhuinneog theirminéil -Comment[gl]=Executa comandos individuais sen usar unha terminal -Comment[he]=הפעל פקודות פשוטות ללא חלון מסוף -Comment[hr]=Pokretanje pojedinih naredbi bez terminalskog prozora -Comment[hu]=Parancs kiadása parancsértelmező ablak nélkül -Comment[is]=Keyrðu einstakar skipanir án skeljaglugga -Comment[it]=Lancia singoli comandi senza una finestra di terminale -Comment[ja]=ターミナルウィンドウを開かずに一つのコマンドを実行 -Comment[kk]=Болек командаларды терминал терезесінен тыс жегу -Comment[km]=បើកពាក្យបញ្ជាតែមួយ ដោយគ្មានបង្អួចស្ថានីយ -Comment[lt]=Vykdykite pavienes komandas ne terminalo lange -Comment[mk]=Стартување на единечни команди без терминалски прозорец -Comment[nb]=Kjør en enkelt kommando uten et skall -Comment[nds]=Enkel Befehlen ahn Terminalfinster starten -Comment[ne]=टर्मिनल सञ्झ्याल बिना एकल आदेश सुरुआत गर्नुहोस् -Comment[nl]=Voer losse commando's uit zonder een terminalvenster -Comment[nn]=Køyr ein enkelt kommando utan eit skal. -Comment[pl]=Uruchamianie pojedynczych poleceń konsoli bez otwierania okna terminala -Comment[pt]=Lançar comandos simples sem uma janela de terminal -Comment[pt_BR]=Abre comandos digitados sem a necessidade de uma janela de terminal -Comment[ro]=Lansează comenzi fără o fereastră de terminal -Comment[ru]=Выполнение отдельной команды без окна терминала -Comment[se]=Vuoje oktonas gohččomiid terminálaláse haga -Comment[sk]=Spustiť príkaz bez okna terminálu -Comment[sl]=Poganjanje posameznih ukazov brez okna terminala -Comment[sr]=Покрените једноструке наредбе без терминалског прозора -Comment[sr@Latn]=Pokrenite jednostruke naredbe bez terminalskog prozora -Comment[sv]=Starta enstaka kommandon utan ett terminalfönster -Comment[th]=เรียกใช้งานคำสั่งเดี่ยวๆ โดยไม่ต้องเข้าหน้าต่างเทอร์มินัล -Comment[uk]=Запуск окремих команд без вікна термінала -Comment[vi]=Chạy một lệnh đơn mà không cần mở một thiết bị đầu cuối -Comment[wa]=Lancî ene comande seule sins terminå -Comment[zh_CN]=调用单条命令而无须使用终端窗口 -Comment[zh_TW]=不使用終端機視窗而送出單行指令 + Icon=application-x-executable X-TDE-Library=run_panelapplet X-TDE-UniqueApplet=true diff --git a/kicker/applets/run/runapplet.h b/kicker/applets/run/runapplet.h index d5d12435f..adb0d4c6f 100644 --- a/kicker/applets/run/runapplet.h +++ b/kicker/applets/run/runapplet.h @@ -35,7 +35,7 @@ class KURIFilterData; class RunApplet : public KPanelApplet { - Q_OBJECT + TQ_OBJECT public: RunApplet(const TQString& configFile, Type t = Stretch, int actions = 0, diff --git a/kicker/applets/swallow/prefwidget.h b/kicker/applets/swallow/prefwidget.h index a23d6414b..03cde1399 100644 --- a/kicker/applets/swallow/prefwidget.h +++ b/kicker/applets/swallow/prefwidget.h @@ -23,7 +23,7 @@ class PreferencesWidget : public PreferencesWidgetBase { - Q_OBJECT + TQ_OBJECT public: PreferencesWidget( SwallowCommandList* swc, TQWidget* parent = 0 ); diff --git a/kicker/applets/swallow/prefwidgetbase.ui b/kicker/applets/swallow/prefwidgetbase.ui index bd2673efa..13f8aa300 100644 --- a/kicker/applets/swallow/prefwidgetbase.ui +++ b/kicker/applets/swallow/prefwidgetbase.ui @@ -119,16 +119,13 @@ </spacer> </grid> </widget> -<includes> - <include location="local" impldecl="in implementation">kdialog.h</include> -</includes> <layoutdefaults spacing="3" margin="6"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>keditlistbox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">keditlistbox.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">kurlrequester.h</include> + <include location="local" impldecl="in implementation">kdialog.h</include> +</includes> </UI> diff --git a/kicker/applets/swallow/swallow.cpp b/kicker/applets/swallow/swallow.cpp index 1ac34cfec..a9eea202e 100644 --- a/kicker/applets/swallow/swallow.cpp +++ b/kicker/applets/swallow/swallow.cpp @@ -29,7 +29,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kshell.h> #include <twin.h> #include <twinmodule.h> @@ -53,7 +53,7 @@ SwallowApplet * SwallowApplet::self = 0L; extern "C" { - KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { + TDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { return new SwallowApplet(configFile, parent, "kswallow applet"); } } @@ -157,11 +157,11 @@ void SwallowApplet::createApps( SwallowCommandList* list ) while ( (it.current()) ) { app = new SwallowApp( it.current(), this ); app->hide(); - connect( app, TQT_SIGNAL( embedded(SwallowApp *)), - TQT_SLOT( embedded(SwallowApp *))); + connect( app, TQ_SIGNAL( embedded(SwallowApp *)), + TQ_SLOT( embedded(SwallowApp *))); appList->append( app ); ++it; - kapp->processEvents(); + tdeApp->processEvents(); } m_layout->activate(); @@ -179,8 +179,8 @@ void SwallowApplet::embedded( SwallowApp *app ) kdDebug() << "--> ratio: " << app->sizeRatio() << endl; kdDebug() << "**** " << app << " is embedded now, with (" << app->width() << ", " << app->height() << ")" << endl; - disconnect( app, TQT_SIGNAL( embedded(SwallowApp *)), - this, TQT_SLOT( embedded(SwallowApp *))); + disconnect( app, TQ_SIGNAL( embedded(SwallowApp *)), + this, TQ_SLOT( embedded(SwallowApp *))); embeddedList->append( app ); @@ -278,8 +278,8 @@ SwallowApp::SwallowApp(const SwallowCommand *swc, TQWidget* parent, QXEmbed::initialize(); winTitle = swc->title; - connect(SwallowApplet::winModule(), TQT_SIGNAL(windowAdded(WId)), - this, TQT_SLOT(windowAdded(WId))); + connect(SwallowApplet::winModule(), TQ_SIGNAL(windowAdded(WId)), + this, TQ_SLOT(windowAdded(WId))); if (!swc->cmdline.isEmpty()) { TDEProcess *process = new TDEProcess; @@ -287,10 +287,10 @@ SwallowApp::SwallowApp(const SwallowCommand *swc, TQWidget* parent, // move window out of sight // *process << "-geometry"; - // *process << TQString("32x32+%1+%2").arg(kapp->desktop()->width()).arg(kapp->desktop()->height()); + // *process << TQString("32x32+%1+%2").arg(tdeApp->desktop()->width()).arg(tdeApp->desktop()->height()); - connect(process, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(processExited(TDEProcess*))); + connect(process, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(processExited(TDEProcess*))); process->start(); } @@ -330,8 +330,8 @@ void SwallowApp::windowAdded(WId win) embed(win); XReparentWindow(tqt_xdisplay(), win, winId(), 0, 0); - disconnect(SwallowApplet::winModule(), TQT_SIGNAL(windowAdded(WId)), - this, TQT_SLOT(windowAdded(WId))); + disconnect(SwallowApplet::winModule(), TQ_SIGNAL(windowAdded(WId)), + this, TQ_SLOT(windowAdded(WId))); emit embedded( this ); } diff --git a/kicker/applets/swallow/swallow.h b/kicker/applets/swallow/swallow.h index b4be4f624..8bacc79f3 100644 --- a/kicker/applets/swallow/swallow.h +++ b/kicker/applets/swallow/swallow.h @@ -44,7 +44,7 @@ typedef TQPtrList<SwallowApp> SwallowAppList; class SwallowApplet : public KPanelApplet { - Q_OBJECT + TQ_OBJECT public: SwallowApplet( const TQString& configFile, TQWidget *parent, @@ -88,7 +88,7 @@ private: class SwallowApp : public QXEmbed { - Q_OBJECT + TQ_OBJECT public: SwallowApp( const SwallowCommand * swc, TQWidget* parent = 0, diff --git a/kicker/applets/swallow/swallowapplet.desktop b/kicker/applets/swallow/swallowapplet.desktop index af0f43c56..370c9693c 100644 --- a/kicker/applets/swallow/swallowapplet.desktop +++ b/kicker/applets/swallow/swallowapplet.desktop @@ -1,142 +1,8 @@ [Desktop Entry] Type=Plugin Name=Swallow Applet -Name[af]=Sluk Miniprogram -Name[ar]=بريمج Swallow -Name[az]=Batıq Proqramcıq -Name[be]=Аплет праглынання -Name[bn]=সোয়্যালো অ্যাপলেট -Name[bs]=Applet - gutač -Name[ca]=Applet contenidor -Name[cs]=Pohlcovací applet -Name[csb]=Aplet do zanurzaniô jinszëch -Name[cy]=Rhaglennig Llyncu -Name[da]=Swallow-panelprogram -Name[de]=Einbettungsprogramm -Name[el]=Ενσωμάτωση μικροεφαρμογής -Name[eo]=Sistemaplikaĵetejo -Name[es]=Miniaplicación contenedora -Name[et]=Põimimise aplett -Name[eu]=Swallow appleta -Name[fa]=برنامک Swallow -Name[fi]=Upotussovelma -Name[fr]=Applet englobante -Name[fy]=Ynslúte applet -Name[gl]=Applet Swallow -Name[he]=יישומון מעגן -Name[hi]=स्वालो ऐपलेट -Name[hr]=Progutaj aplet -Name[hu]=Elnyelő kisalkalmazás -Name[is]=Gleypi smáforrit -Name[it]=Applet che ingloba -Name[ja]=Swallow アプレット -Name[ka]=მშთანთქავი აპლეტი -Name[kk]=Сіңіру апплеті -Name[km]=អាប់ភ្លេត Swallow -Name[lt]=Swallow priemonė -Name[mk]=Аплет „Голтни“ -Name[mn]=Шигтгэгч-програм -Name[ms]=Aplet Lelayang -Name[mt]=Applet "Swallow" -Name[nb]=Svelge-panelprogram -Name[nds]=Lüttprogramm för't Inbetten -Name[ne]=स्वालो एप्लेट -Name[nl]=Inbeddingsapplet -Name[nn]=Svelge-applet -Name[nso]=Applet ya Mometso -Name[pa]=ਸਵਾਲੋਓ ਐਪਲਿਟ -Name[pl]=Programik do zanurzania innych -Name[pt]='Applet' Swallow -Name[pt_BR]=Mini-aplicativo de integração -Name[ro]=Miniaplicație de înglobare -Name[ru]=Аплет поглощения -Name[rw]=Kwemera Apuleti -Name[se]=Njeallan-prográmmaš -Name[sk]=Pohlcovací applet -Name[sl]=Vstavek z lastovko -Name[sr]=Аплет за гутање -Name[sr@Latn]=Aplet za gutanje -Name[sv]=Uppslukande miniprogram -Name[ta]=உள்வாங்கும் சிறுநிரல் -Name[te]=స్వాలొ అప్లేట్ -Name[tg]=Барномаи қурт доданӣ -Name[tr]=Batık Programcık -Name[tt]=Yotu Applete -Name[uk]=Аплет Swallow -Name[ven]=Apulete ya Swallow -Name[vi]=Tiểu ứng dụng Chim nhạn -Name[wa]=Aplikete avaleuse -Name[zh_CN]=Swallow 小程序 -Name[zh_TW]=Swallow 面板小程式 -Name[zu]=I-Applet yokugwinya + Comment=The swallow panel applet -Comment[af]=Die sluk paneel miniprogram -Comment[az]=Batıq panel -Comment[be]=Аплет праглынання для панэлі -Comment[bn]=সোয়্যালো প্যানেল অ্যাপলেট -Comment[bs]=Applet koji "guta" aplikacije u panel -Comment[ca]=L'applet contenidor del plafó -Comment[cs]=Pohlcovací applet pro panel -Comment[csb]=Aplet dlô panelu jaczi ùsôdzô òbéńdã do zanurzaniô jinszëch -Comment[cy]=Rhaglennig llyncu i'r panel -Comment[da]=Swallow-panelprogrammet -Comment[de]=Leiste zum Einbetten von X-Anwendungen -Comment[el]=Μικροεφαρμογή του πίνακα που "καταπίνει" -Comment[eo]=La panelaplikaĵeto enhavanta la dokitajn programojn -Comment[es]=La miniaplicación del panel contenedora -Comment[et]=Paneelil töötav põimimise aplett -Comment[eu]=Swallow paneleko appleta -Comment[fa]=برنامک تابلوی Swallow -Comment[fi]=Paneelin upotussovelma -Comment[fr]=L'applet englobante du tableau de bord -Comment[fy]=Applet foar it ynlúte fan X-toepassingen -Comment[gl]=O applet swallow para o painel -Comment[he]=יישומון מעגן עבור הלוח -Comment[hi]=स्वालो फलक ऐपलेट -Comment[hr]=Gutač apleta za ploču -Comment[hu]=Egy elnyelő panel-kisalkalmazás -Comment[id]=Aplet panel swallow -Comment[is]=Gleypispjalds smáforritið -Comment[it]=Applet per inglobare le applicazioni nel pannello -Comment[ja]=swallow パネルアプレット -Comment[ka]=პანელის მშთანთქავი აპლეტი -Comment[kk]=Сіңіру панель апплеті -Comment[km]=អាប់ភ្លេតបន្ទះ swallow -Comment[lt]=Swallow pulto priemonė -Comment[mk]=Аплетот „Голтни“ од панелот -Comment[mn]=X-програмуудыг холбогч програм -Comment[ms]=Aplet panel lelayang -Comment[mt]=Applet għall-pannell "swallow" -Comment[nb]=Et panelprogram som svelger andre panelprogrammer -Comment[nds]=Paneel för't Inbetten vun X-Programmen -Comment[ne]=स्वालो प्यानल एप्लेट -Comment[nl]=Applet voor het inbedden van X-toepassingen -Comment[nn]=Svelge-panelappleten -Comment[nso]=Applet ya panel ya mometso -Comment[pa]=ਸਵਾਲੋਓ ਪੈਨਲ ਐਪਲਿਟ -Comment[pl]=Programik dla panelu tworzący przestrzeń do zanurzania innych -Comment[pt]=A 'applet' do painel swallow -Comment[pt_BR]=Mini-aplicativo de integração para o painel -Comment[ro]=Miniaplicație de panou pentru înglobare altor programe -Comment[ru]=Аплет панели поглощения -Comment[rw]=Apuleti y'umwanya kumira -Comment[se]=Njeallan-panelprográmmaš -Comment[sk]=Pohlcovací applet pre panel -Comment[sl]=Vstavek lastovke za na pult -Comment[sr]=Аплет панела за гутање -Comment[sr@Latn]=Aplet panela za gutanje -Comment[sv]=Uppslukande miniprogram för panelen -Comment[ta]=உள்வாங்கும் பலக சிறுநிரல் -Comment[tg]=Барномаи қурт додани сафҳа -Comment[th]=แอพเพล็ต swallow -Comment[tr]=Batık panel -Comment[tt]=Yotuçı taqta applete -Comment[uk]=Аплет панелі swallow -Comment[vi]=Tiểu ứng dụng chạy bảng điều khiển chim nhạn -Comment[wa]=L' aplikete avaleuse do scriftôr -Comment[xh]=I window eneenkcukacha ye swallow applet -Comment[zh_CN]=Swallow 面板小程序 -Comment[zh_TW]=swallow 面板小程式 -Comment[zu]=I-applet lewindi lemininingwane lokugwinya + X-TDE-Library=swallow_panelapplet X-TDE-UniqueApplet=true diff --git a/kicker/applets/systemtray/CMakeLists.txt b/kicker/applets/systemtray/CMakeLists.txt index 904c977b7..067f7c129 100644 --- a/kicker/applets/systemtray/CMakeLists.txt +++ b/kicker/applets/systemtray/CMakeLists.txt @@ -27,7 +27,11 @@ link_directories( ##### other data ################################ -install( FILES systemtrayapplet.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/applets ) +tde_create_translated_desktop( + SOURCE systemtrayapplet.desktop + DESTINATION ${DATA_INSTALL_DIR}/kicker/applets + PO_DIR kicker-desktops +) ##### systemtray_panelapplet (module) ########### diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp index 97b71d1b2..175e037e5 100644 --- a/kicker/applets/systemtray/systemtrayapplet.cpp +++ b/kicker/applets/systemtray/systemtrayapplet.cpp @@ -28,6 +28,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqcursor.h> #include <tqpopupmenu.h> +#include <tqspinbox.h> +#include <tqcheckbox.h> #include <tqtimer.h> #include <tqpixmap.h> #include <tqevent.h> @@ -35,6 +37,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqgrid.h> #include <tqpainter.h> #include <tqimage.h> +#include <tqlayout.h> #include <dcopclient.h> #include <tdeapplication.h> @@ -58,12 +61,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <X11/Xlib.h> -#define ICON_MARGIN 1 #define ICON_END_MARGIN KickerSettings::showDeepButtons()?4:0 extern "C" { - KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) + TDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { TDEGlobal::locale()->insertCatalogue("ksystemtrayapplet"); return new SystemTrayApplet(configFile, KPanelApplet::Normal, @@ -74,20 +76,22 @@ extern "C" SystemTrayApplet::SystemTrayApplet(const TQString& configFile, Type type, int actions, TQWidget *parent, const char *name) : KPanelApplet(configFile, type, actions, parent, name), - m_showFrame(KickerSettings::showDeepButtons()?true:false), + m_showFrame(KickerSettings::showDeepButtons()), m_showHidden(false), - m_expandButton(0), - m_leftSpacer(0), - m_rightSpacer(0), - m_clockApplet(0), - m_settingsDialog(0), + m_expandButton(nullptr), + m_leftSpacer(nullptr), + m_rightSpacer(nullptr), + m_clockApplet(nullptr), + m_settingsDialog(nullptr), m_iconSelector(0), - m_autoRetractTimer(0), + m_autoRetractTimer(nullptr), m_autoRetract(false), m_iconSize(24), m_showClockInTray(false), - m_showClockSettingCB(0), - m_layout(0) + m_showClockSettingCB(nullptr), + m_iconMargin(1), + m_iconMarginSB(nullptr), + m_layout(nullptr) { DCOPObject::setObjId("SystemTrayApplet"); loadSettings(); @@ -99,19 +103,19 @@ SystemTrayApplet::SystemTrayApplet(const TQString& configFile, Type type, int ac m_clockApplet = new ClockApplet(configFile, KPanelApplet::Normal, KPanelApplet::Preferences, this, "clockapplet"); updateClockGeometry(); - connect(m_clockApplet, TQT_SIGNAL(clockReconfigured()), this, TQT_SLOT(updateClockGeometry())); - connect(m_clockApplet, TQT_SIGNAL(updateLayout()), this, TQT_SLOT(updateClockGeometry())); + connect(m_clockApplet, TQ_SIGNAL(clockReconfigured()), this, TQ_SLOT(updateClockGeometry())); + connect(m_clockApplet, TQ_SIGNAL(updateLayout()), this, TQ_SLOT(updateClockGeometry())); setBackgroundOrigin(AncestorOrigin); - twin_module = new KWinModule(TQT_TQOBJECT(this)); + twin_module = new KWinModule(this); - // kApplication notifies us of settings changes. added to support + // tdeApp notifies us of settings changes. added to support // disabling of frame effect on mouse hover - kapp->dcopClient()->setNotifications(true); + tdeApp->dcopClient()->setNotifications(true); connectDCOPSignal("kicker", "kicker", "configurationChanged()", "loadSettings()", false); - TQTimer::singleShot(0, this, TQT_SLOT(initialize())); + TQTimer::singleShot(0, this, TQ_SLOT(initialize())); } void SystemTrayApplet::updateClockGeometry() @@ -119,14 +123,14 @@ void SystemTrayApplet::updateClockGeometry() if (m_clockApplet) { m_clockApplet->setPosition(position()); - if (orientation() == Qt::Horizontal) - { - m_clockApplet->setFixedSize(m_clockApplet->widthForHeight(height()),height()); - } - else - { - m_clockApplet->setFixedSize(width(),m_clockApplet->heightForWidth(width())); - } + if (orientation() == TQt::Horizontal) + { + m_clockApplet->setFixedSize(m_clockApplet->widthForHeight(height()),height()); + } + else + { + m_clockApplet->setFixedSize(width(),m_clockApplet->heightForWidth(width())); + } } } @@ -151,10 +155,10 @@ void SystemTrayApplet::initialize() } // the KWinModule notifies us when tray windows are added or removed - connect( twin_module, TQT_SIGNAL( systemTrayWindowAdded(WId) ), - this, TQT_SLOT( systemTrayWindowAdded(WId) ) ); - connect( twin_module, TQT_SIGNAL( systemTrayWindowRemoved(WId) ), - this, TQT_SLOT( updateTrayWindows() ) ); + connect( twin_module, TQ_SIGNAL( systemTrayWindowAdded(WId) ), + this, TQ_SLOT( systemTrayWindowAdded(WId) ) ); + connect( twin_module, TQ_SIGNAL( systemTrayWindowRemoved(WId) ), + this, TQ_SLOT( updateTrayWindows() ) ); TQCString screenstr; screenstr.setNum(tqt_xscreen()); @@ -190,7 +194,7 @@ void SystemTrayApplet::initialize() XSendEvent (display, root, False, StructureNotifyMask, (XEvent *)&xev); } - + setBackground(); } @@ -249,11 +253,11 @@ void SystemTrayApplet::preferences() KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel, KDialogBase::Ok, true); m_settingsDialog->resize(450, 400); - connect(m_settingsDialog, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(applySettings())); - connect(m_settingsDialog, TQT_SIGNAL(okClicked()), this, TQT_SLOT(applySettings())); - connect(m_settingsDialog, TQT_SIGNAL(finished()), this, TQT_SLOT(settingsDialogFinished())); + connect(m_settingsDialog, TQ_SIGNAL(applyClicked()), this, TQ_SLOT(applySettings())); + connect(m_settingsDialog, TQ_SIGNAL(okClicked()), this, TQ_SLOT(applySettings())); + connect(m_settingsDialog, TQ_SIGNAL(finished()), this, TQ_SLOT(settingsDialogFinished())); - TQGrid *settingsGrid = m_settingsDialog->makeGridMainWidget( 2, Qt::Vertical); + TQGrid *settingsGrid = m_settingsDialog->makeGridMainWidget( 3, TQt::Vertical); m_showClockSettingCB = new TQCheckBox(i18n("Show Clock in Tray"), settingsGrid); m_showClockSettingCB->setChecked(m_showClockInTray); @@ -289,6 +293,13 @@ void SystemTrayApplet::preferences() } } + TQHBox *hbox = new TQHBox(settingsGrid); + hbox->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Maximum); + TQLabel *iconMarginL = new TQLabel(i18n("Icon margin: "), hbox); + m_iconMarginSB = new TQSpinBox(0, 20, 1, hbox); + m_iconMarginSB->setSuffix(i18n(" px")); + m_iconMarginSB->setValue(m_iconMargin); + m_settingsDialog->show(); } @@ -307,6 +318,7 @@ void SystemTrayApplet::applySettings() } m_showClockInTray = m_showClockSettingCB->isChecked(); + m_iconMargin = m_iconMarginSB->value(); TDEConfig *conf = config(); @@ -356,6 +368,7 @@ void SystemTrayApplet::applySettings() conf->setGroup("System Tray"); conf->writeEntry("ShowClockInTray", m_showClockInTray); + conf->writeEntry("IconMargin", m_iconMargin); conf->sync(); @@ -432,11 +445,11 @@ void SystemTrayApplet::showExpandButton(bool show) { if (!m_expandButton) { - m_expandButton = new SimpleArrowButton(this, Qt::UpArrow, 0, KickerSettings::showDeepButtons()); + m_expandButton = new SimpleArrowButton(this, TQt::UpArrow, 0, KickerSettings::showDeepButtons()); m_expandButton->installEventFilter(this); refreshExpandButton(); - if (orientation() == Qt::Vertical) + if (orientation() == TQt::Vertical) { m_expandButton->setFixedSize(width() - 4, m_expandButton->sizeHint() @@ -448,12 +461,12 @@ void SystemTrayApplet::showExpandButton(bool show) .width(), height() - 4); } - connect(m_expandButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(toggleExpanded())); + connect(m_expandButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(toggleExpanded())); m_autoRetractTimer = new TQTimer(this, "m_autoRetractTimer"); - connect(m_autoRetractTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(checkAutoRetract())); + connect(m_autoRetractTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(checkAutoRetract())); } else { @@ -483,7 +496,7 @@ void SystemTrayApplet::iconSizeChanged() { (*emb)->setFixedSize(m_iconSize, m_iconSize); ++emb; } - + emb = m_hiddenWins.begin(); while (emb != m_hiddenWins.end()) { (*emb)->setFixedSize(m_iconSize, m_iconSize); @@ -516,6 +529,7 @@ void SystemTrayApplet::loadSettings() conf->setGroup("System Tray"); m_iconSize = conf->readNumEntry("systrayIconWidth", 22); m_showClockInTray = conf->readNumEntry("ShowClockInTray", false); + m_iconMargin = conf->readNumEntry("IconMargin", 1); } void SystemTrayApplet::systemTrayWindowAdded( WId w ) @@ -559,7 +573,7 @@ void SystemTrayApplet::embedWindow( WId w, bool kde_tray ) return; } - connect(emb, TQT_SIGNAL(embeddedWindowDestroyed()), TQT_SLOT(updateTrayWindows())); + connect(emb, TQ_SIGNAL(embeddedWindowDestroyed()), TQ_SLOT(updateTrayWindows())); emb->setFixedSize(m_iconSize, m_iconSize); if (shouldHide(w)) @@ -627,7 +641,7 @@ void SystemTrayApplet::updateVisibleWins() (*emb)->hide(); } } - + TQMap< QXEmbed*, TQString > names; // cache window names and classes TQMap< QXEmbed*, TQString > classes; for( TrayEmbedList::const_iterator it = m_shownWins.begin(); @@ -677,13 +691,13 @@ void SystemTrayApplet::refreshExpandButton() return; } - Qt::ArrowType a; + TQt::ArrowType a; - if (orientation() == Qt::Vertical) - a = m_showHidden ? Qt::DownArrow : Qt::UpArrow; + if (orientation() == TQt::Vertical) + a = m_showHidden ? TQt::DownArrow : TQt::UpArrow; else - a = (m_showHidden ^ kapp->reverseLayout()) ? Qt::RightArrow : Qt::LeftArrow; - + a = (m_showHidden ^ tdeApp->reverseLayout()) ? TQt::RightArrow : TQt::LeftArrow; + m_expandButton->setArrowType(a); } @@ -833,17 +847,17 @@ int SystemTrayApplet::maxIconHeight() const bool SystemTrayApplet::eventFilter(TQObject* watched, TQEvent* e) { - if (TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(m_expandButton)) + if (watched == m_expandButton) { TQPoint p; if (e->type() == TQEvent::ContextMenu) { - p = TQT_TQCONTEXTMENUEVENT(e)->globalPos(); + p = static_cast<TQContextMenuEvent*>(e)->globalPos(); } else if (e->type() == TQEvent::MouseButtonPress) { - TQMouseEvent* me = TQT_TQMOUSEEVENT(e); - if (me->button() == Qt::RightButton) + TQMouseEvent* me = static_cast<TQMouseEvent*>(e); + if (me->button() == TQt::RightButton) { p = me->globalPos(); } @@ -853,9 +867,9 @@ bool SystemTrayApplet::eventFilter(TQObject* watched, TQEvent* e) { TQPopupMenu* contextMenu = new TQPopupMenu(this); contextMenu->insertItem(SmallIcon("configure"), i18n("Configure System Tray..."), - this, TQT_SLOT(configure())); + this, TQ_SLOT(configure())); - contextMenu->exec(TQT_TQCONTEXTMENUEVENT(e)->globalPos()); + contextMenu->exec(static_cast<TQContextMenuEvent*>(e)->globalPos()); delete contextMenu; return true; @@ -867,7 +881,7 @@ bool SystemTrayApplet::eventFilter(TQObject* watched, TQEvent* e) int SystemTrayApplet::widthForHeight(int h) const { - if (orientation() == Qt::Vertical) + if (orientation() == TQt::Vertical) { return width(); } @@ -881,12 +895,12 @@ int SystemTrayApplet::widthForHeight(int h) const me->setFixedHeight(h); } - return sizeHint().width(); + return sizeHint().width(); } int SystemTrayApplet::heightForWidth(int w) const { - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { return height(); } @@ -900,7 +914,7 @@ int SystemTrayApplet::heightForWidth(int w) const me->setFixedWidth(w); } - return sizeHint().height(); + return sizeHint().height(); } void SystemTrayApplet::moveEvent( TQMoveEvent* ) @@ -913,7 +927,7 @@ void SystemTrayApplet::resizeEvent( TQResizeEvent* ) { layoutTray(); // we need to give ourselves a chance to adjust our size before calling this - TQTimer::singleShot(0, this, TQT_SIGNAL(updateLayout())); + TQTimer::singleShot(0, this, TQ_SIGNAL(updateLayout())); } void SystemTrayApplet::layoutTray() @@ -933,11 +947,11 @@ void SystemTrayApplet::layoutTray() int i = 0, line, nbrOfLines, heightWidth; bool showExpandButton = m_expandButton && m_expandButton->isVisibleTo(this); delete m_layout; - m_layout = new TQGridLayout(this, 1, 1, ICON_MARGIN, ICON_MARGIN); + m_layout = new TQGridLayout(this, 1, 1, 0, m_iconMargin); if (m_expandButton) { - if (orientation() == Qt::Vertical) + if (orientation() == TQt::Vertical) { m_expandButton->setFixedSize(width() - 4, m_expandButton->sizeHint().height()); } @@ -951,20 +965,20 @@ void SystemTrayApplet::layoutTray() // the opposite direction of line int col = 0; - // + // // The margin and spacing specified in the layout implies that: - // [-- ICON_MARGIN pixels --] [-- first icon --] [-- ICON_MARGIN pixels --] ... [-- ICON_MARGIN pixels --] [-- last icon --] [-- ICON_MARGIN pixels --] + // [-- m_iconMargin pixels --] [-- first icon --] [-- m_iconMargin pixels --] ... [-- m_iconMargin pixels --] [-- last icon --] [-- m_iconMargin pixels --] // - // So, if we say that iconWidth is the icon width plus the ICON_MARGIN pixels spacing, then the available width for the icons - // is the widget width minus ICON_MARGIN pixels margin. Forgetting these ICON_MARGIN pixels broke the layout algorithm in KDE <= 3.5.9. + // So, if we say that iconWidth is the icon width plus the m_iconMargin pixels spacing, then the available width for the icons + // is the widget width minus m_iconMargin pixels margin. Forgetting these m_iconMargin pixels broke the layout algorithm in KDE <= 3.5.9. // // This fix makes the workarounds in the heightForWidth() and widthForHeight() methods unneeded. // - if (orientation() == Qt::Vertical) + if (orientation() == TQt::Vertical) { - int iconWidth = maxIconWidth() + ICON_MARGIN; // +2 for the margins that implied by the layout - heightWidth = width() - ICON_MARGIN; + int iconWidth = maxIconWidth() + m_iconMargin * 2; // +2 for the margins that implied by the layout + heightWidth = width() - m_iconMargin * 2; // to avoid nbrOfLines=0 we ensure heightWidth >= iconWidth! heightWidth = heightWidth < iconWidth ? iconWidth : heightWidth; nbrOfLines = heightWidth / iconWidth; @@ -972,7 +986,7 @@ void SystemTrayApplet::layoutTray() m_layout->addMultiCellWidget(m_leftSpacer, 0, 0, 0, nbrOfLines - 1, - Qt::AlignHCenter | Qt::AlignVCenter); + TQt::AlignHCenter | TQt::AlignVCenter); col = 1; if (showExpandButton) @@ -980,7 +994,7 @@ void SystemTrayApplet::layoutTray() m_layout->addMultiCellWidget(m_expandButton, 1, 1, 0, nbrOfLines - 1, - Qt::AlignHCenter | Qt::AlignVCenter); + TQt::AlignHCenter | TQt::AlignVCenter); col = 2; } @@ -993,7 +1007,7 @@ void SystemTrayApplet::layoutTray() line = i % nbrOfLines; (*emb)->show(); m_layout->addWidget((*emb), col, line, - Qt::AlignHCenter | Qt::AlignVCenter); + TQt::AlignHCenter | TQt::AlignVCenter); if ((line + 1) == nbrOfLines) { @@ -1011,7 +1025,7 @@ void SystemTrayApplet::layoutTray() line = i % nbrOfLines; (*emb)->show(); m_layout->addWidget((*emb), col, line, - Qt::AlignHCenter | Qt::AlignVCenter); + TQt::AlignHCenter | TQt::AlignVCenter); if ((line + 1) == nbrOfLines) { @@ -1024,7 +1038,7 @@ void SystemTrayApplet::layoutTray() m_layout->addMultiCellWidget(m_rightSpacer, col, col, 0, nbrOfLines - 1, - Qt::AlignHCenter | Qt::AlignVCenter); + TQt::AlignHCenter | TQt::AlignVCenter); if (m_clockApplet) { if (m_showClockInTray) @@ -1035,20 +1049,20 @@ void SystemTrayApplet::layoutTray() m_layout->addMultiCellWidget(m_clockApplet, col+1, col+1, 0, nbrOfLines - 1, - Qt::AlignHCenter | Qt::AlignVCenter); + TQt::AlignHCenter | TQt::AlignVCenter); } } else // horizontal { - int iconHeight = maxIconHeight() + ICON_MARGIN; // +2 for the margins that implied by the layout - heightWidth = height() - ICON_MARGIN; + int iconHeight = maxIconHeight() + m_iconMargin * 2; // +2 for the margins that implied by the layout + heightWidth = height() - m_iconMargin * 2; heightWidth = heightWidth < iconHeight ? iconHeight : heightWidth; // to avoid nbrOfLines=0 nbrOfLines = heightWidth / iconHeight; m_layout->addMultiCellWidget(m_leftSpacer, 0, nbrOfLines - 1, 0, 0, - Qt::AlignHCenter | Qt::AlignVCenter); + TQt::AlignHCenter | TQt::AlignVCenter); col = 1; if (showExpandButton) @@ -1056,7 +1070,7 @@ void SystemTrayApplet::layoutTray() m_layout->addMultiCellWidget(m_expandButton, 0, nbrOfLines - 1, 1, 1, - Qt::AlignHCenter | Qt::AlignVCenter); + TQt::AlignHCenter | TQt::AlignVCenter); col = 2; } @@ -1068,7 +1082,7 @@ void SystemTrayApplet::layoutTray() line = i % nbrOfLines; (*emb)->show(); m_layout->addWidget((*emb), line, col, - Qt::AlignHCenter | Qt::AlignVCenter); + TQt::AlignHCenter | TQt::AlignVCenter); if ((line + 1) == nbrOfLines) { @@ -1086,7 +1100,7 @@ void SystemTrayApplet::layoutTray() line = i % nbrOfLines; (*emb)->show(); m_layout->addWidget((*emb), line, col, - Qt::AlignHCenter | Qt::AlignVCenter); + TQt::AlignHCenter | TQt::AlignVCenter); if ((line + 1) == nbrOfLines) { @@ -1099,7 +1113,7 @@ void SystemTrayApplet::layoutTray() m_layout->addMultiCellWidget(m_rightSpacer, 0, nbrOfLines - 1, col, col, - Qt::AlignHCenter | Qt::AlignVCenter); + TQt::AlignHCenter | TQt::AlignVCenter); if (m_clockApplet) { if (m_showClockInTray) @@ -1110,7 +1124,7 @@ void SystemTrayApplet::layoutTray() m_layout->addMultiCellWidget(m_clockApplet, 0, nbrOfLines - 1, col+1, col+1, - Qt::AlignHCenter | Qt::AlignVCenter); + TQt::AlignHCenter | TQt::AlignVCenter); } } @@ -1129,11 +1143,11 @@ void SystemTrayApplet::paletteChange(const TQPalette & /* oldPalette */) void SystemTrayApplet::setBackground() { TrayEmbedList::const_iterator lastEmb; - + lastEmb = m_shownWins.end(); for (TrayEmbedList::const_iterator emb = m_shownWins.begin(); emb != lastEmb; ++emb) (*emb)->setBackground(); - + lastEmb = m_hiddenWins.end(); for (TrayEmbedList::const_iterator emb = m_hiddenWins.begin(); emb != lastEmb; ++emb) (*emb)->setBackground(); @@ -1188,7 +1202,7 @@ void TrayEmbed::ensureBackgroundSet() // Get the RGB background image bg.fill(parentWidget(), pos()); TQImage bgImage = bg.convertToImage(); - + // Create the ARGB pixmap Pixmap argbpixmap = XCreatePixmap(x11Display(), embeddedWinId(), width(), height(), 32); GC gc; @@ -1207,7 +1221,7 @@ void TrayEmbed::ensureBackgroundSet() XDrawPoint(x11Display(), argbpixmap, gc, x, y); } } - XFlush(x11Display()); + XFlush(x11Display()); XSetWindowBackgroundPixmap(x11Display(), embeddedWinId(), argbpixmap); XFreePixmap(x11Display(), argbpixmap); XFreeGC(x11Display(), gc); diff --git a/kicker/applets/systemtray/systemtrayapplet.desktop b/kicker/applets/systemtray/systemtrayapplet.desktop index 16cf4c165..9aa726857 100644 --- a/kicker/applets/systemtray/systemtrayapplet.desktop +++ b/kicker/applets/systemtray/systemtrayapplet.desktop @@ -1,158 +1,9 @@ [Desktop Entry] Type=Plugin Name=System Tray -Name[af]=Stelsel Laai -Name[ar]=لوحة النظام -Name[az]=Sistem Rəfi -Name[be]=Сістэмны латок -Name[bg]=Системен панел -Name[bn]=সিস্টেম ট্রে -Name[br]=Barlenn ar reizhiad -Name[ca]=Safata del sistema -Name[cs]=Systémová část panelu -Name[csb]=Systemòwi zabiérnik -Name[cy]=Bar Tasgau -Name[da]=Statusfelt -Name[de]=Systembereich der Kontrollleiste -Name[el]=Πλαίσιο συστήματος -Name[eo]=Sistempleto -Name[es]=Bandeja del sistema -Name[et]=Süsteemne dokk -Name[eu]=Sistemaren azpila -Name[fa]=سینی سیستم -Name[fi]=Ilmoitusalue -Name[fr]=Boîte à miniatures -Name[fy]=Systeemfak -Name[ga]=Tráidire an Chórais -Name[gl]=Bandexa do Sistema -Name[he]=מגש מערכת -Name[hi]=तंत्र तश्तरी -Name[hr]=Sistemska traka -Name[hu]=Rendszertálca -Name[id]=Tray Sistem -Name[is]=Smáforritabakki -Name[it]=Vassoio di sistema -Name[ja]=システムトレイ -Name[ka]=სისტემური პანელი -Name[kk]=Жүйелік сөре -Name[km]=ថាសប្រព័ន្ធ -Name[ko]=시스템 트레이 -Name[lo]=ຖາດຂອງລະບົບ -Name[lt]=Sistemos dėklas -Name[lv]=Sistēmas Tekne -Name[mk]=Системска лента -Name[mn]=Удирдах самбарын системийн хэсэг -Name[ms]=Dulang Sistem -Name[mt]=Tray tas-Sistema -Name[nb]=Systemkurv -Name[nds]=Systeemafsnitt vun't Paneel -Name[ne]=प्रणाली ट्रे -Name[nl]=Systeemvak -Name[nn]=Systemtrau -Name[nso]=Tray ya System -Name[oc]=Safata dèu sistemo -Name[pa]=ਸਿਸਟਮ ਟਰੇ -Name[pl]=Tacka systemowa -Name[pt]=Bandeja do Painel -Name[pt_BR]=Ícones do sistema -Name[ro]=Tavă de sistem -Name[ru]=Системный лоток -Name[rw]=Igitwara cya Sisitemu -Name[se]=Vuogádatgárcu -Name[sk]=Systémová lišta -Name[sl]=Sistemska vrstica -Name[sr]=Системска касета -Name[sr@Latn]=Sistemska kaseta -Name[sv]=Systembricka -Name[ta]=சாதன தட்டு -Name[te]=వ్యవస్థ ట్రె -Name[tg]=Сафҳаи идоракунии система -Name[th]=ถาดของระบบ -Name[tr]=Sistem Çekmecesi -Name[tt]=Sistem Tiräse -Name[uk]=Системний лоток -Name[ven]=Thirei ya sistemu -Name[vi]=Khay Hệ thống -Name[wa]=Boesse ås imådjetes sistinme -Name[xh]=Itreyi Yendlela yokusebenza -Name[zh_CN]=系统托盘 -Name[zh_TW]=系統匣 -Name[zu]=Itreyi lesistimu Comment=The system tray panel applet -Comment[af]=Die stelsel laai paneel miniprogram -Comment[ar]=بريمج لوحة النظام -Comment[az]=Bildiriş sahəsi panel appleti -Comment[be]=Аплет сістэмнага латка -Comment[bg]=Системен аплет за регистрация на програми и поддържане на иконите им -Comment[bn]=সিস্টেম ট্রে প্যানেল অ্যাপলেট -Comment[br]=Arloadig banell barlenn ar reizhiad -Comment[bs]=Applet za system tray -Comment[ca]=L'applet per al plafó de la safata del sistema -Comment[cs]=Systémová část panelu určená pro applety -Comment[csb]=Aplet systemòwégò zabiérnika dlô panelu -Comment[cy]=Rhaglennig bar tasgau i'r panel -Comment[da]=Statusfelt-panelprogrammet -Comment[de]=Der Systembereich der Kontrollleiste -Comment[el]=Μικροεφαρμογή του πίνακα για το πλαίσιο συστήματος -Comment[eo]=La sistempleta panelaplikaĵeto -Comment[es]=La bandeja del sistema (miniaplicación del panel) -Comment[et]=Paneelil töötav süsteemse doki aplett -Comment[eu]=Sistemaren azpila (paneleko appleta) -Comment[fa]=برنامک تابلوی سینی سیستم -Comment[fi]=Paneelin ilmoitusalue -Comment[fr]=L'applet de boîte à miniatures du tableau de bord -Comment[fy]=It systeemfak panielapplet -Comment[gl]=A applet do painel coa bandexa do sistema -Comment[he]=יישומון מגש המערכת ללוח -Comment[hi]=तंत्र तश्तरी फलक ऐपलेट -Comment[hr]=Aplet ploče za sistemsku traku -Comment[hu]=A rendszertálca alkalmazás -Comment[id]=Applet panel tray sistem -Comment[is]=Íforrit sem birtir lista yfir forrit sem eru í gangi -Comment[it]=Applet del pannello per il vassoio di sistema -Comment[ja]=システムトレイパネルアプレット -Comment[ka]=სისტემური პანელის აპლეტი -Comment[kk]=Жүйелік сөре панель апплеті -Comment[km]=អាប់ភ្លេតបន្ទះថាសប្រព័ន្ធ -Comment[lo]=ແອບແພັດຖາດຂອງລະບົບພາເນລ -Comment[lt]=Sistemos dėklo pulto priemonė -Comment[lv]=Sistēmas teknes paneļa aplets -Comment[mk]=Панелски аплет од системската лента -Comment[mn]=Удирдах самбарын системийн хэсэг -Comment[ms]=Aplet panel dulang sistem -Comment[mt]=Applet għat-tray tas-sistema -Comment[nb]=Panelprogram for systemkurven -Comment[nds]=Lüttprogramm för den Systeemafsnitt vun't Paneel -Comment[ne]=प्रणाली ट्रे प्यानल एप्लेट -Comment[nl]=De systeemvak paneelapplet -Comment[nn]=Systemtrau-panelapplet -Comment[nso]=Applet ya panel ya tray ya system -Comment[oc]=L'aplet de plafon de la safata dèu sistemo -Comment[pa]=ਸਿਸਟਮ ਟਰੇ ਪੈਨਲ ਐਪਲਿਟ -Comment[pl]=Programik tacki systemowej dla panelu -Comment[pt]=Uma 'applet' com a bandeja do painel -Comment[pt_BR]=Mini-aplicativo de ícones do sistema -Comment[ro]=Miniaplicația tavă de sistem pentru panou -Comment[ru]=Аплет панели системного лотка -Comment[rw]=Apuleti y'umwanya w'igitwara sisitemu -Comment[se]=Vuogádatgárcu-panelprográmmaš -Comment[sk]=Applet Systémová lišta -Comment[sl]=Vstavek za sistemsko vrstico v pultu -Comment[sr]=Аплет системске касете за панел -Comment[sr@Latn]=Aplet sistemske kasete za panel -Comment[sv]=Panelminiprogram för systembricka -Comment[ta]=சாதன தட்டு பலக சிறுநிரல் -Comment[tg]=Барномаи сафҳаи идоракунии системаи сафҳа -Comment[th]=แอพเพล็ตถาดของระบบบนพาเนล -Comment[tr]=Sistem çekmece paneli -Comment[uk]=Аплет системного лотку панелі -Comment[vi]=Tiểu ứng dụng có bảng điều khiển chứa khay hệ thống -Comment[wa]=L' aplikete boesse ås imådjetes sistinme do scriftôr -Comment[xh]=I applet yeqela lenjongo ethile yendlela yetreyi yokusebenza -Comment[zh_CN]=系统托盘小程序 -Comment[zh_TW]=系統匣 (system tray) 面板小程式 -Comment[zu]=I-applet yewindi lemininingwane yetreyi lesistimu + Icon=systemtray X-TDE-Library=systemtray_panelapplet X-TDE-UniqueApplet=true diff --git a/kicker/applets/systemtray/systemtrayapplet.h b/kicker/applets/systemtray/systemtrayapplet.h index e311a1bdd..d06d42b72 100644 --- a/kicker/applets/systemtray/systemtrayapplet.h +++ b/kicker/applets/systemtray/systemtrayapplet.h @@ -27,8 +27,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqvaluevector.h> #include <tqstringlist.h> #include <tqevent.h> -#include <tqlayout.h> -#include <tqcheckbox.h> #include <qxembed.h> #include <dcopobject.h> @@ -40,6 +38,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "simplebutton.h" class TQGridLayout; +class TQSpinBox; +class TQCheckBox; class TQTimer; class KWinModule; class TrayEmbed; @@ -48,7 +48,7 @@ class TDEActionSelector; class SystemTrayApplet : public KPanelApplet, public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP typedef TQValueVector<TrayEmbed*> TrayEmbedList; @@ -120,12 +120,14 @@ private: int m_iconSize; bool m_showClockInTray; TQCheckBox *m_showClockSettingCB; + uint m_iconMargin; + TQSpinBox *m_iconMarginSB; TQGridLayout* m_layout; }; class TrayEmbed : public QXEmbed { - Q_OBJECT + TQ_OBJECT public: TrayEmbed( bool kdeTray, TQWidget* parent = NULL ); ~TrayEmbed(); diff --git a/kicker/applets/taskbar/CMakeLists.txt b/kicker/applets/taskbar/CMakeLists.txt index 28cacb950..9249d1f3b 100644 --- a/kicker/applets/taskbar/CMakeLists.txt +++ b/kicker/applets/taskbar/CMakeLists.txt @@ -25,7 +25,11 @@ link_directories( ##### other data ################################ -install( FILES taskbarapplet.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/applets ) +tde_create_translated_desktop( + SOURCE taskbarapplet.desktop + DESTINATION ${DATA_INSTALL_DIR}/kicker/applets + PO_DIR kicker-desktops +) ##### taskbar_panelapplet (module) ############## diff --git a/kicker/applets/taskbar/taskbarapplet.cpp b/kicker/applets/taskbar/taskbarapplet.cpp index 5673cb563..a34db8b73 100644 --- a/kicker/applets/taskbar/taskbarapplet.cpp +++ b/kicker/applets/taskbar/taskbarapplet.cpp @@ -38,12 +38,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. extern "C" { - KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile ) + TDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile ) { // FIXME: what about two taskbars? perhaps this should be inserted just once TDEGlobal::locale()->insertCatalogue( "ktaskbarapplet" ); int options = 0; - if (kapp->authorizeControlModule("tde-kcmtaskbar.desktop")) + if (tdeApp->authorizeControlModule("tde-kcmtaskbar.desktop")) options = KPanelApplet::Preferences; TaskbarApplet *taskbar = new TaskbarApplet( configFile, KPanelApplet::Stretch, options, parent, "ktaskbarapplet" ); @@ -59,7 +59,7 @@ TaskbarApplet::TaskbarApplet( const TQString& configFile, Type type, int actions TQHBoxLayout* layout = new TQHBoxLayout( this ); container = new TaskBarContainer( false, configFile, this ); container->setBackgroundOrigin( AncestorOrigin ); - connect(container, TQT_SIGNAL(containerCountChanged()), this, TQT_SIGNAL(updateLayout())); + connect(container, TQ_SIGNAL(containerCountChanged()), this, TQ_SIGNAL(updateLayout())); layout->addWidget( container, 1 ); container->popupDirectionChange(popupDirection()); } @@ -72,14 +72,14 @@ TaskbarApplet::~TaskbarApplet() int TaskbarApplet::widthForHeight(int h) const { - if (orientation() == Qt::Vertical) + if (orientation() == TQt::Vertical) { return width(); } // FIXME KDE4: when either TaskBarContainer or Applet smartens up // simplify this - KPanelExtension::Position d = orientation() == Qt::Horizontal ? + KPanelExtension::Position d = orientation() == TQt::Horizontal ? KPanelExtension::Top : KPanelExtension::Left; return container->sizeHint(d, TQSize(200, h)).width(); @@ -87,14 +87,14 @@ int TaskbarApplet::widthForHeight(int h) const int TaskbarApplet::heightForWidth(int w) const { - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { return height(); } // FIXME KDE4: when either TaskBarContainer or Applet smartens up // simplify this - KPanelExtension::Position d = orientation() == Qt::Horizontal ? + KPanelExtension::Position d = orientation() == TQt::Horizontal ? KPanelExtension::Top : KPanelExtension::Left; return container->sizeHint(d, TQSize(w, 200)).height(); diff --git a/kicker/applets/taskbar/taskbarapplet.desktop b/kicker/applets/taskbar/taskbarapplet.desktop index 508908849..b2bd85653 100644 --- a/kicker/applets/taskbar/taskbarapplet.desktop +++ b/kicker/applets/taskbar/taskbarapplet.desktop @@ -1,138 +1,8 @@ [Desktop Entry] Type=Plugin Name=Taskbar -Name[af]=Kasbar -Name[ar]=شريط المهام -Name[az]=Vəzifə Çubuğu -Name[be]=Панэль заданняў -Name[bg]=Панел за задачи -Name[bn]=টাস্কবার -Name[br]=Barrenn dleadoù -Name[ca]=Barra de tasques -Name[cs]=Pruh úloh -Name[csb]=Lëstew dzejaniów -Name[cy]=Bar tasgau -Name[da]=Opgavelinje -Name[de]=Fensterleiste -Name[el]=Γραμμή εργασιών -Name[eo]=Taskostrio -Name[es]=Barra de tareas -Name[et]=Tegumiriba -Name[eu]=Ataza-barra -Name[fa]=میله تکلیف -Name[fi]=Tehtäväpalkki -Name[fr]=Barre des tâches -Name[fy]=Taakbalke -Name[ga]=Tascbharra -Name[gl]=Barra de tarefas -Name[he]=שורת המשימות -Name[hi]=कार्यपट्टी -Name[hr]=Traka zadataka -Name[hu]=Feladatlista -Name[is]=Verkefnaslá -Name[it]=Barra delle applicazioni -Name[ja]=タスクバー -Name[ka]=ამოცანათა პანელი -Name[kk]=Тапсырмалар панелі -Name[km]=របារភារកិច្ច -Name[ko]=작업 표시줄 -Name[lo]=ແຖບຫນ້າຕ່າງງານ -Name[lt]=Užduočių juosta -Name[lv]=Uzdevumjosla -Name[mk]=Лента со програми -Name[mn]=Цонхны самбар -Name[nb]=Oppgavelinje -Name[nds]=Programmbalken -Name[ne]=कार्यपट्टी -Name[nl]=Taakbalk -Name[nn]=Oppgåvelinje -Name[nso]=Bar ya Mosongwana -Name[oc]=Barra de tasques -Name[pa]=ਸੰਦਪੱਟੀ -Name[pl]=Pasek zadań -Name[pt]=Barra de Tarefas -Name[pt_BR]=Barra de tarefas -Name[ro]=Bara de procese -Name[ru]=Панель задач -Name[rw]=Umurongoibikorwa -Name[se]=Bargoholga -Name[sk]=Panel úloh -Name[sl]=Opravilna vrstica -Name[sr]=Трака задатака -Name[sr@Latn]=Traka zadataka -Name[ss]=Ibar yemsebenti -Name[sv]=Aktivitetsfält -Name[ta]=பணிப்பட்டி -Name[tg]=Пайраҳаи вазифа -Name[th]=แถบหน้าต่างงาน -Name[tr]=Görev Çubuğu -Name[tt]=Qoraltirä -Name[uk]=Смужка задач -Name[uz]=Vazifalar paneli -Name[uz@cyrillic]=Вазифалар панели -Name[ven]=Bara ya mushumo -Name[vi]=Thanh tác vụ -Name[wa]=Bår des bouyes -Name[xh]=Ibar yomsebenzi -Name[zh_CN]=任务条 -Name[zh_TW]=工作列 -Name[zu]=Ibha yemisebenzi Comment=The default task bar for window management -Comment[af]=Die standaard taak balk vir venster bestuur -Comment[be]=Стандартная панэль заданняў для кіравання вокнамі -Comment[bg]=Системен панел за лентата със задачите -Comment[bn]=উইণ্ডো ব্যবস্থাপনার জন্য ডিফল্ট টাস্ক বার -Comment[bs]=Osnovni taskbar za upravljanje prozorima -Comment[ca]=La barra de tasques per omissió per a la gestió de finestres -Comment[cs]=Výchozí pruh úloh pro správu oken -Comment[csb]=Domëslnô lëstew dzejaniów do sprôwianiô òknama -Comment[da]=Standard-opgavelinje for vindueshåndtering -Comment[de]=Standardmäßiger Bereich für offene Fenster in der Kontrollleiste -Comment[el]=Η προκαθορισμένη γραμμή εργασιών για τη διαχείριση των παραθύρων -Comment[eo]=La defaŭlta taskostrio por fenestroadministrado. -Comment[es]=La barra de tareas predeterminada para gestionar las ventanas -Comment[et]=Vaikimisi kasutatav tegumiriba akende halduseks -Comment[eu]=Ataza-barra lehenetsia leihoen kudeaketarako -Comment[fa]=میله تکلیف پیشفرض برای مدیریت پنجره -Comment[fi]=Oletustyökalupalkki ikkunoiden hallintaan -Comment[fr]=La barre des tâches gérant les fenêtres -Comment[fy]=De standert taakbalke foar finsterbehear -Comment[gl]=A barra de tarefas por defeito para xestión de fiestras. -Comment[he]=ברירת מחדל של יישומון שורת משימות ללוח -Comment[hr]=Zadana traka zadataka za upravljanje prozorima -Comment[hu]=Az alapértelmezett feladatlista ablakkezeléshez -Comment[is]=Sjálfgefna verkefnasláin fyrir gluggastjórnun -Comment[it]=La barra delle applicazioni per la gestione delle finestre -Comment[ja]=ウィンドウマネージャ用のデフォルトのタスクバー -Comment[ka]=ფანჯრის მართვის ძირითადი პულტი -Comment[kk]=Терезелерді басқару әдетті тапсырмалар панелі -Comment[km]=របារភារកិច្ចលំនាំដើម សម្រាប់គ្រប់គ្រងបង្អួច -Comment[lt]=Numatyta užduočių juostos langų tvarkymo priemonė -Comment[mk]=Стандардната линија со задачи за менаџмент на прозорци -Comment[nb]=Den vanlige oppgavelinja for å behandle vinduer -Comment[nds]=Standard-Programmbalken för de Finsterpleeg -Comment[ne]=सञ्झ्याल व्यवस्थापनका लागि पूर्वनिर्धारित उपकरणपट्टी -Comment[nl]=De standaard taakbalk voor vensterbeheer -Comment[nn]=Den vanlege oppgåvelinja for å handsama vindauge -Comment[pa]=ਮੂਲ ਵੇਹੜੇ ਲਈ ਮੂਲ ਕੰਮ ਪੱਟੀ -Comment[pl]=Domyślny pasek zadań do zarządzania oknami -Comment[pt]=A barra de tarefas por omissão para a gestão de janelas -Comment[pt_BR]=A barra de tarefas padrão para o gerenciamento de janelas. -Comment[ro]=Bara de procese implicită pentru managementul ferestrelor -Comment[ru]=Панель списка задач по умолчанию для управления окнами -Comment[se]=Standárda bargoholga lásegieđaheami várás -Comment[sk]=Prednastavený panel úloh pre správcu okien -Comment[sl]=Privzeta opravilna vrstica za upravljanje z okni -Comment[sr]=Подразумевана трака задатака за управљање прозорима -Comment[sr@Latn]=Podrazumevana traka zadataka za upravljanje prozorima -Comment[sv]=Det förvalda aktivitetsfältet för fönsterhantering -Comment[th]=แอพเพล็ตถาดงานโดยปริยายของพาเนลสำหรับการจัดการหน้าต่าง -Comment[tr]=Pencere yönetimi için öntanımlı görev çubuğu -Comment[uk]=Типова панель задач для керування вікнами -Comment[vi]=Thanh tác vụ mặc định cho trình quản lý cửa sổ -Comment[wa]=Li prémetowe bår di bouyes do manaedjmint d' purnea -Comment[zh_CN]=窗口管理的默认任务栏 -Comment[zh_TW]=預設的視窗管理工作列 + Icon=taskbar X-TDE-Library=taskbar_panelapplet diff --git a/kicker/applets/taskbar/taskbarapplet.h b/kicker/applets/taskbar/taskbarapplet.h index 9685b436b..6204e94f5 100644 --- a/kicker/applets/taskbar/taskbarapplet.h +++ b/kicker/applets/taskbar/taskbarapplet.h @@ -31,7 +31,7 @@ class TQPalette; class TaskbarApplet : public KPanelApplet { - Q_OBJECT + TQ_OBJECT public: TaskbarApplet( const TQString& configFile, Type t = Normal, int actions = 0, diff --git a/kicker/applets/trash/CMakeLists.txt b/kicker/applets/trash/CMakeLists.txt index e5ae62051..96ae16574 100644 --- a/kicker/applets/trash/CMakeLists.txt +++ b/kicker/applets/trash/CMakeLists.txt @@ -28,7 +28,11 @@ link_directories( ##### other data ################################ -install( FILES trashapplet.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/applets ) +tde_create_translated_desktop( + SOURCE trashapplet.desktop + DESTINATION ${DATA_INSTALL_DIR}/kicker/applets + PO_DIR kicker-desktops +) ##### trash_panelapplet (module) ################ diff --git a/kicker/applets/trash/trashapplet.cpp b/kicker/applets/trash/trashapplet.cpp index f431b8aed..b86b5ef9d 100644 --- a/kicker/applets/trash/trashapplet.cpp +++ b/kicker/applets/trash/trashapplet.cpp @@ -31,7 +31,7 @@ extern "C" { - KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile) + TDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile) { TDEGlobal::locale()->insertCatalogue("trashapplet"); return new TrashApplet(configFile, KPanelApplet::Normal, @@ -53,12 +53,12 @@ TrashApplet::TrashApplet(const TQString& configFile, Type type, int actions, TQW mpDirLister = new KDirLister(); - connect( mpDirLister, TQT_SIGNAL( clear() ), - this, TQT_SLOT( slotClear() ) ); - connect( mpDirLister, TQT_SIGNAL( completed() ), - this, TQT_SLOT( slotCompleted() ) ); - connect( mpDirLister, TQT_SIGNAL( deleteItem( KFileItem * ) ), - this, TQT_SLOT( slotDeleteItem( KFileItem * ) ) ); + connect( mpDirLister, TQ_SIGNAL( clear() ), + this, TQ_SLOT( slotClear() ) ); + connect( mpDirLister, TQ_SIGNAL( completed() ), + this, TQ_SLOT( slotCompleted() ) ); + connect( mpDirLister, TQ_SIGNAL( deleteItem( KFileItem * ) ), + this, TQ_SLOT( slotDeleteItem( KFileItem * ) ) ); mpDirLister->openURL("trash:/"); } @@ -67,8 +67,8 @@ TrashApplet::~TrashApplet() { // disconnect the dir lister before quitting so as not to crash // on kicker exit - disconnect( mpDirLister, TQT_SIGNAL( clear() ), - this, TQT_SLOT( slotClear() ) ); + disconnect( mpDirLister, TQ_SIGNAL( clear() ), + this, TQ_SLOT( slotClear() ) ); delete mpDirLister; TDEGlobal::locale()->removeCatalogue("trashapplet"); } @@ -121,12 +121,12 @@ void TrashApplet::resizeEvent( TQResizeEvent * ) int size = 1; size = std::max( size, - orientation() == Qt::Vertical ? + orientation() == TQt::Vertical ? mButton->heightForWidth( width() ) : mButton->widthForHeight( height() ) ); - if(orientation() == Qt::Vertical) + if(orientation() == TQt::Vertical) { mButton->resize( width(), size ); } diff --git a/kicker/applets/trash/trashapplet.desktop b/kicker/applets/trash/trashapplet.desktop index b4d0f0828..9450225aa 100644 --- a/kicker/applets/trash/trashapplet.desktop +++ b/kicker/applets/trash/trashapplet.desktop @@ -1,138 +1,8 @@ [Desktop Entry] Type=Plugin -Comment=Displays the trashcan and allows files to be dropped onto it -Comment[af]=Vertoon die asblik en laat toe dat lêers in dit gegooi mag word -Comment[ar]=يظهر سلّة المهملات و يسمح بإسقاط الملفات فيها -Comment[be]=Паказвае сметніцу і дазваляе кідаць файлы ў яе -Comment[bg]=Показване на кошчето и възможност за преместване на файлове в него -Comment[bn]=আবর্জনার বাক্স দেখায়, যাতে ফাইল ড্রপ করা যায় -Comment[bs]=Prikazuje kantu za smeće i omogućuje da se u nju bacaju datoteke -Comment[ca]=Mostra la paperera i permet amollar-hi fitxers -Comment[cs]=Zobrazuje koš a umožňuje do něj odhazovat soubory -Comment[csb]=Wëskrzëniwô zamkłósc kòsza ë zezwôlô przecygac do niegò lopczi -Comment[da]=Viser affaldsspanden og tillader at filer droppes på den -Comment[de]=Mülleimerfunktion in der Kontrollleiste -Comment[el]=Εμφανίζει τον Κάδο Απορριμμάτων και επιτρέπει την απόθεση αρχείων πάνω του -Comment[en_GB]=Displays the wastebin and allows files to be dropped onto it -Comment[eo]=Montras rubujon kaj ebligas dosiero-alfaligon -Comment[es]=Muestra la papelera y permite tirar archivos en ella -Comment[et]=Näitab prügikasti ning lubab faile sellesse visata -Comment[eu]=Zakarontzia bistaratzen du, fitxategiak jauregitea lagunduz -Comment[fa]=زبالهدان را نمایش داده و به پروندهها اجازه میدهد در آن بیفتند -Comment[fi]=Näyttää roskakorin ja sallii tiedostojen pudottamisen siihen -Comment[fr]=Affiche la corbeille et permet d'y déposer des fichiers -Comment[fy]=Lit it jiskefet sjen en stiet ta dat triemmen fuortsmiten wurde troch se nei it byldkaike ta te slepen -Comment[gl]=Mostra a papeleira e permite deitar ficheiros nela -Comment[he]=מציג את פח האשפה ומאפשר לך לזרוק אליו קבצים -Comment[hr]=Prikazuje kantu za otpad i omogućuje ispuštanje datoteka u nju -Comment[hu]=Megjeleníti a szemétkosarat, lehetővé téve fájlok belehelyezését -Comment[is]=Sýnir ruslakörfuna og leyfir að skrám sé sleppt á hana -Comment[it]=Mostra il cestino e permette di trascinarci sopra i file -Comment[ja]=ごみ箱を表示し、ごみ箱へのファイルのドロップを可能にします -Comment[kk]=Өшірілгендер шелегін керсетіп, оған файлдарды тастауға мүмкіндік береді -Comment[km]=បង្ហាញធុងសំរាម និងអនុញ្ញាតឲ្យទម្លាក់ឯកសារលើវា -Comment[lt]=Rodo šiukšliadėžę ir leidžia į ją tempiant numesti bylas -Comment[mk]=Ја прикажува корпата и овозможува пуштање датотеки врз неа -Comment[nb]=Viser papirkurven og lar deg legge filer i den -Comment[nds]=Wiest de Affalltünn, Dateien köönt dor op droppt warrn. -Comment[ne]=रद्दीटोकरी प्रदर्शन गर्छ र यसमा फाइलहरू राख्न अनुमति दिन्छ -Comment[nl]=Toont de prullenbak en maakt het mogelijk bestanden weg te gooien door ze naar het pictogram te slepen -Comment[nn]=Viser papirkorga og lèt deg leggja filer i henne -Comment[pl]=Pokazuje kosz i pozwala przeciągać do niego pliki -Comment[pt]=Mostra o caixote do lixo e permite largar ficheiros nele -Comment[pt_BR]=Mostra a lixeira e permite que arquivos sejam arrastados até ela -Comment[ro]=Afișează coșul de gunoi și permite aruncare fișierelor în acesta -Comment[ru]=Показать на рабочем столе корзину для ненужных файлов -Comment[sk]=Zobrazí odpadkový kôš a povolí vhodenie súborov do neho -Comment[sl]=Prikaz ikone za Smeti, na katero lahko odvržete datoteke -Comment[sr]=Приказује канту за смеће и омогућава испуштање фајлова на њу -Comment[sr@Latn]=Prikazuje kantu za smeće i omogućava ispuštanje fajlova na nju -Comment[sv]=Visar papperskorgen och tillåter att filer släpps på den -Comment[th]=แสดงถังขยะและอนุญาตให้มีการปล่อยแฟ้มลงไปได้ -Comment[tr]=Çöp kutusunu gösterir ve dosyaların üzerine taşınmasına izin verir -Comment[uk]=Показує смітник і дає змогу вкидати в нього файли -Comment[vi]=Hiển thị thùng rác và cho phép thả các tập tin vào đó -Comment[wa]=Håyneye l' batch et permete di mete des fitchîs å dvins -Comment[zh_CN]=显示回收站，并允许您将文件拖至其上 -Comment[zh_TW]=顯示垃圾筒並且允許將檔案丟到其中 Name=Trash -Name[af]=Gemors -Name[ar]=سلة النفايات -Name[az]=Zibil -Name[be]=Сметніца -Name[bg]=Кошче -Name[bn]=আবর্জনা -Name[br]=Pod-lastez -Name[bs]=Smeće -Name[ca]=Paperera -Name[cs]=Koš -Name[csb]=Kòsz -Name[cy]=Sbwriel -Name[da]=Affald -Name[de]=Mülleimer -Name[el]=Κάδος απορριμμάτων -Name[en_GB]=Wastebin -Name[eo]=Rubujo -Name[es]=Papelera -Name[et]=Prügikast -Name[eu]=Zaborra -Name[fa]=زباله -Name[fi]=Roskakori -Name[fr]=Corbeille -Name[fy]=Jiskefet -Name[ga]=Bruscar -Name[gl]=Lixo -Name[he]=אשפה -Name[hi]=रद्दी -Name[hr]=Otpad -Name[hsb]=Papjernik -Name[hu]=Szemétkosár -Name[is]=Rusl -Name[it]=Cestino -Name[ja]=ごみ箱 -Name[ka]=ურნა -Name[kk]=Өшірілгендер -Name[km]=ធុងសំរាម -Name[lo]=ຖັງຂີ້ເຫຍື່ອ -Name[lt]=Šiukšliadėžė -Name[lv]=Miskaste -Name[mk]=Корпа -Name[mn]=Хогийн сав -Name[ms]=Sampah -Name[mt]=Skart -Name[nb]=Papirkurv -Name[nds]=Affalltünn -Name[ne]=रद्दीटोकरी -Name[nl]=Prullenbak -Name[nn]=Papirkorg -Name[nso]=Seswaraditlakala -Name[pa]=ਰੱਦੀ -Name[pl]=Kosz -Name[pt]=Lixo -Name[pt_BR]=Lixo -Name[ro]=Gunoi -Name[ru]=Корзина -Name[se]=Ruskalihtti -Name[sk]=Kôš -Name[sl]=Smeti -Name[sr]=Смеће -Name[sr@Latn]=Smeće -Name[sv]=Skräp -Name[ta]=குப்பை -Name[te]=చెత్త బుట్ట -Name[tg]=Ахлотдон -Name[th]=ถังขยะ -Name[tr]=Çöp -Name[tt]=Çüplek -Name[uk]=Смітник -Name[uz]=Chiqindilar qutisi -Name[uz@cyrillic]=Чиқиндилар қутиси -Name[ven]=Tshikha -Name[vi]=Thùng rác -Name[wa]=Batch -Name[xh]=Inkukumo -Name[zh_CN]=回收站 -Name[zh_TW]=資源回收桶 -Name[zu]=Izibi + +Comment=Displays the trashcan and allows files to be dropped onto it + Icon=trashcan_empty X-TDE-Library=trash_panelapplet diff --git a/kicker/applets/trash/trashapplet.h b/kicker/applets/trash/trashapplet.h index c77cf3755..124ae4310 100644 --- a/kicker/applets/trash/trashapplet.h +++ b/kicker/applets/trash/trashapplet.h @@ -33,7 +33,7 @@ class TrashApplet : public KPanelApplet { -Q_OBJECT +TQ_OBJECT public: TrashApplet(const TQString& configFile, Type t = Normal, int actions = 0, diff --git a/kicker/applets/trash/trashbutton.cpp b/kicker/applets/trash/trashbutton.cpp index 85c0eef62..96efb7436 100644 --- a/kicker/applets/trash/trashbutton.cpp +++ b/kicker/applets/trash/trashbutton.cpp @@ -32,14 +32,14 @@ #include <konq_popupmenu.h> TrashButton::TrashButton(TQWidget *parent) - : PanelPopupButton(parent), mActions(TQT_TQWIDGET(this), TQT_TQOBJECT(this)), + : PanelPopupButton(parent), mActions(this, this), mFileItem(KFileItem::Unknown, KFileItem::Unknown, "trash:/") { TDEIO::UDSEntry entry; TDEIO::NetAccess::stat("trash:/", entry, 0L); mFileItem.assign(KFileItem(entry, "trash:/")); - TDEAction *a = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), + TDEAction *a = KStdAction::paste(this, TQ_SLOT(slotPaste()), &mActions, "paste"); a->setShortcut(0); @@ -53,7 +53,7 @@ TrashButton::TrashButton(TQWidget *parent) // Activate this code only if we find a way to have both an // action and a popup menu for the same kicker button - //connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClicked())); + //connect(this, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClicked())); setPopup(new TQPopupMenu()); } diff --git a/kicker/applets/trash/trashbutton.h b/kicker/applets/trash/trashbutton.h index bbf596a0c..fa1ce7077 100644 --- a/kicker/applets/trash/trashbutton.h +++ b/kicker/applets/trash/trashbutton.h @@ -32,7 +32,7 @@ class TrashButton : public PanelPopupButton { -Q_OBJECT +TQ_OBJECT public: TrashButton(TQWidget *parent); |
