diff options
Diffstat (limited to 'kicker/applets/clock')
| -rw-r--r-- | kicker/applets/clock/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | kicker/applets/clock/clock.cpp | 130 | ||||
| -rw-r--r-- | kicker/applets/clock/clock.h | 14 | ||||
| -rw-r--r-- | kicker/applets/clock/clockapplet.desktop | 142 | ||||
| -rw-r--r-- | kicker/applets/clock/datepicker.cpp | 2 | ||||
| -rw-r--r-- | kicker/applets/clock/digital.ui | 4 | ||||
| -rw-r--r-- | kicker/applets/clock/init.cpp | 6 | ||||
| -rw-r--r-- | kicker/applets/clock/settings.ui | 4 | ||||
| -rw-r--r-- | kicker/applets/clock/zone.cpp | 4 |
9 files changed, 87 insertions, 225 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; |