diff options
Diffstat (limited to 'kicker')
350 files changed, 2708 insertions, 7023 deletions
diff --git a/kicker/CMakeL10n.txt b/kicker/CMakeL10n.txt index b585ce4af..87f6a8086 100644 --- a/kicker/CMakeL10n.txt +++ b/kicker/CMakeL10n.txt @@ -1,3 +1,9 @@ ##### create translation templates ############## tde_l10n_auto_add_subdirectories( ) + +tde_l10n_create_template( + CATALOG "desktop_files/kicker-desktops/" + SOURCES *.desktop + DESTINATION "${CMAKE_SOURCE_DIR}/translations" +) diff --git a/kicker/DESIGN b/kicker/DESIGN index d589ab833..2bdc65706 100644 --- a/kicker/DESIGN +++ b/kicker/DESIGN @@ -16,7 +16,7 @@ Contents NOTE: This is the design which we are working towards, not the design as it currently is, but there's no point in documenting yesterday. -The class Kicker is a subclass of KUniqueApplication and is where all the +The class Kicker is a subclass of TDEUniqueApplication and is where all the fun begins. It is always available via the static Kicker::kicker() method. Upon creation, Kicker::kicker() ensures that its resources are added to the standard dirs. This includes tile, background and various plugin directories. diff --git a/kicker/HACKING b/kicker/HACKING index c03925cdc..12f48652d 100644 --- a/kicker/HACKING +++ b/kicker/HACKING @@ -3,10 +3,10 @@ The Short Story Four space tabs, braces on their own lines, 80 character lines. Code should look something like this: -QString ExtensionManager::uniqueId() +TQString ExtensionManager::uniqueId() { - QString idBase = "Extension_%1"; - QString newId; + TQString idBase = "Extension_%1"; + TQString newId; int i = 0; bool unique = false; @@ -255,7 +255,7 @@ from tight loops or is in a hot path) or if it is a simple, one-liner setter/getter method. Otherwise methods should be implemented outside of the class definition. -[1] macros include things like Q_OBJECT and K_DCOP. the should ONLY appear in +[1] macros include things like TQ_OBJECT and K_DCOP. the should ONLY appear in files where they are actually necessary and not just randomly thrown in there for fun. ;-) 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); diff --git a/kicker/data/icons/Makefile.am b/kicker/data/icons/Makefile.am index 4bc51ce73..a8a6a18cd 100644 --- a/kicker/data/icons/Makefile.am +++ b/kicker/data/icons/Makefile.am @@ -1,3 +1,3 @@ -KDE_ICON = kdisknav package_favourite panel window_list kmenu kicker +KDE_ICON = kdisknav package_favourite panel kmenu kicker SUBDIRS = actions diff --git a/kicker/data/icons/cr16-app-kicker.png b/kicker/data/icons/cr16-app-kicker.png Binary files differindex 681263792..da537e9d8 100644..100755 --- a/kicker/data/icons/cr16-app-kicker.png +++ b/kicker/data/icons/cr16-app-kicker.png diff --git a/kicker/data/icons/cr16-app-panel.png b/kicker/data/icons/cr16-app-panel.png Binary files differindex 2331a29e0..2fe3f09b4 100644 --- a/kicker/data/icons/cr16-app-panel.png +++ b/kicker/data/icons/cr16-app-panel.png diff --git a/kicker/data/icons/cr16-app-window_list.png b/kicker/data/icons/cr16-app-window_list.png Binary files differdeleted file mode 100644 index 33439e716..000000000 --- a/kicker/data/icons/cr16-app-window_list.png +++ /dev/null diff --git a/kicker/data/icons/cr22-app-kicker.png b/kicker/data/icons/cr22-app-kicker.png Binary files differindex 7a3b5c6a6..e87ef4f81 100644..100755 --- a/kicker/data/icons/cr22-app-kicker.png +++ b/kicker/data/icons/cr22-app-kicker.png diff --git a/kicker/data/icons/cr32-app-kicker.png b/kicker/data/icons/cr32-app-kicker.png Binary files differindex 5a8c1d4f0..97ef1a325 100644..100755 --- a/kicker/data/icons/cr32-app-kicker.png +++ b/kicker/data/icons/cr32-app-kicker.png diff --git a/kicker/data/icons/cr32-app-window_list.png b/kicker/data/icons/cr32-app-window_list.png Binary files differdeleted file mode 100644 index 2de7c18db..000000000 --- a/kicker/data/icons/cr32-app-window_list.png +++ /dev/null diff --git a/kicker/data/icons/cr48-app-kicker.png b/kicker/data/icons/cr48-app-kicker.png Binary files differindex 613dd6708..89b961958 100644..100755 --- a/kicker/data/icons/cr48-app-kicker.png +++ b/kicker/data/icons/cr48-app-kicker.png diff --git a/kicker/data/icons/cr48-app-window_list.png b/kicker/data/icons/cr48-app-window_list.png Binary files differdeleted file mode 100644 index f19da6616..000000000 --- a/kicker/data/icons/cr48-app-window_list.png +++ /dev/null diff --git a/kicker/data/kickoff/kmenu_basic.png b/kicker/data/kickoff/kmenu_basic.png Binary files differindex 4674a03ac..f5608af28 100644..100755 --- a/kicker/data/kickoff/kmenu_basic.png +++ b/kicker/data/kickoff/kmenu_basic.png diff --git a/kicker/data/kmenu_side/kside.png b/kicker/data/kmenu_side/kside.png Binary files differindex dc07a0570..af0f0c32f 100644..100755 --- a/kicker/data/kmenu_side/kside.png +++ b/kicker/data/kmenu_side/kside.png diff --git a/kicker/data/kmenu_side/kside_tile.png b/kicker/data/kmenu_side/kside_tile.png Binary files differindex d206d33d5..7129b8b7b 100644..100755 --- a/kicker/data/kmenu_side/kside_tile.png +++ b/kicker/data/kmenu_side/kside_tile.png diff --git a/kicker/extensions/dockbar/CMakeLists.txt b/kicker/extensions/dockbar/CMakeLists.txt index 9758f527c..fce4461a1 100644 --- a/kicker/extensions/dockbar/CMakeLists.txt +++ b/kicker/extensions/dockbar/CMakeLists.txt @@ -22,7 +22,11 @@ link_directories( ##### other data ################################ -install( FILES dockbarextension.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/extensions ) +tde_create_translated_desktop( + SOURCE dockbarextension.desktop + DESTINATION ${DATA_INSTALL_DIR}/kicker/extensions + PO_DIR kicker-desktops +) ##### dockbar_panelextension (module) ########### diff --git a/kicker/extensions/dockbar/dockbarextension.cpp b/kicker/extensions/dockbar/dockbarextension.cpp index 446991109..ac35bfdbc 100644 --- a/kicker/extensions/dockbar/dockbarextension.cpp +++ b/kicker/extensions/dockbar/dockbarextension.cpp @@ -26,10 +26,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <twinmodule.h> #include <kdebug.h> #include <tdeconfig.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kshell.h> #include <twin.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include <tdeapplication.h> #include <dcopclient.h> @@ -44,7 +44,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. extern "C" { - KDE_EXPORT KPanelExtension* init(TQWidget *parent, const TQString& configFile) + TDE_EXPORT KPanelExtension* init(TQWidget *parent, const TQString& configFile) { TDEGlobal::locale()->insertCatalogue("dockbarextension"); return new DockBarExtension(configFile, KPanelExtension::Normal, @@ -57,8 +57,8 @@ DockBarExtension::DockBarExtension(const TQString& configFile, Type type, : KPanelExtension(configFile, type, actions, parent, name) { dragging_container = 0; - twin_module = new KWinModule(TQT_TQOBJECT(this)); - connect( twin_module, TQT_SIGNAL( windowAdded(WId) ), TQT_SLOT( windowAdded(WId) ) ); + twin_module = new KWinModule(this); + connect( twin_module, TQ_SIGNAL( windowAdded(WId) ), TQ_SLOT( windowAdded(WId) ) ); setMinimumSize(DockContainer::sz(), DockContainer::sz()); setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); loadContainerConfig(); @@ -174,7 +174,7 @@ void DockBarExtension::layoutContainers() it != containers.constEnd(); ++it) { - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) (*it)->move(DockContainer::sz() * i, 0); else (*it)->move(0, DockContainer::sz() * i); @@ -236,10 +236,10 @@ void DockBarExtension::addContainer(DockContainer* c, int pos) containers.insert(it, c); } - connect(c, TQT_SIGNAL(embeddedWindowDestroyed(DockContainer*)), - TQT_SLOT(embeddedWindowDestroyed(DockContainer*))); - connect(c, TQT_SIGNAL(settingsChanged(DockContainer*)), - TQT_SLOT(settingsChanged(DockContainer*))); + connect(c, TQ_SIGNAL(embeddedWindowDestroyed(DockContainer*)), + TQ_SLOT(embeddedWindowDestroyed(DockContainer*))); + connect(c, TQ_SIGNAL(settingsChanged(DockContainer*)), + TQ_SLOT(settingsChanged(DockContainer*))); c->resize(DockContainer::sz(), DockContainer::sz()); c->show(); } @@ -345,17 +345,17 @@ int DockBarExtension::findContainerAtPoint(const TQPoint& p) } void DockBarExtension::mousePressEvent(TQMouseEvent *e ) { - if (e->button() == Qt::LeftButton) { + if (e->button() == TQt::LeftButton) { // Store the position of the mouse clic. mclic_pos = e->pos(); - } else if (e->button() == Qt::RightButton) { + } else if (e->button() == TQt::RightButton) { int pos = findContainerAtPoint(e->pos()); if (pos != -1) containers.at(pos)->popupMenu(e->globalPos()); } } void DockBarExtension::mouseReleaseEvent(TQMouseEvent *e ) { - if (e->button() != Qt::LeftButton) return; + if (e->button() != TQt::LeftButton) return; if (dragging_container) { releaseMouse(); original_container->embed(dragging_container->embeddedWinId()); @@ -366,7 +366,7 @@ void DockBarExtension::mouseReleaseEvent(TQMouseEvent *e ) { } void DockBarExtension::mouseMoveEvent(TQMouseEvent *e) { - if (! (e->state() & Qt::LeftButton) ) return; + if (! (e->state() & TQt::LeftButton) ) return; if (dragging_container == 0) { // Check whether the user has moved far enough. int delay = TQApplication::startDragDistance(); @@ -393,7 +393,7 @@ void DockBarExtension::mouseMoveEvent(TQMouseEvent *e) { int pdrag1,pdrag2,psz; pdrag1 = dragpos.x() - barpos.x() + DockContainer::sz()/2; pdrag2 = dragpos.y() - barpos.y() + DockContainer::sz()/2; - if (orientation() == Qt::Vertical) { + if (orientation() == TQt::Vertical) { int tmp = pdrag1; pdrag1 = pdrag2; pdrag2 = tmp; psz = height(); } else psz = width(); diff --git a/kicker/extensions/dockbar/dockbarextension.desktop b/kicker/extensions/dockbar/dockbarextension.desktop index c6ea0821a..4b501c120 100644 --- a/kicker/extensions/dockbar/dockbarextension.desktop +++ b/kicker/extensions/dockbar/dockbarextension.desktop @@ -1,147 +1,7 @@ [Desktop Entry] Name=Dock Application Bar -Name[af]=Vasmeer Program Balk -Name[az]=Proqram Çubuğunu Yapışdır -Name[be]=Аплет убудоўвання праграмаў -Name[bg]=Допълнителен панел -Name[bn]=ডক অ্যাপলিকেশন বার -Name[bs]=Traka za dokiranje aplikacija -Name[ca]=Barra per ancorar aplicacions -Name[cs]=Lišta pro dokování aplikací -Name[csb]=Lëstew przërzeszaniô programów -Name[cy]=Docio'r Bar Cymhwysiad -Name[da]=Dok programlinje -Name[de]=Programm-Andockleiste -Name[el]=Γραμμή προσαρτημένων εφαρμογών -Name[eo]=Aplikaĵostrio -Name[es]=Barra para anclar aplicaciones -Name[et]=Dokitavate rakenduste riba -Name[eu]=Aplikazioak ainguratzeko barra -Name[fa]=میله کاربرد پیوند -Name[fi]=Upotettava ohjelmapalkki -Name[fr]=Barre de stockage des applications -Name[fy]=Ekstra systeemfak -Name[gl]=Acoplar Barra de Aplicación -Name[he]=מעגן יישומים -Name[hi]=अनुप्रयोग पट्टी डॉक करें -Name[hr]=Usidravanje trake aplikacija -Name[hu]=Alkalmazásdokkoló -Name[id]=Aplikasi Dock bar -Name[is]=Kví fyrir forrit -Name[it]=Barra per le applicazioni Dock -Name[ja]=ドックアプリケーションバー -Name[kk]=Қолданбаларды тіркеу панелі -Name[km]=របារកម្មវិធីចូលផែ -Name[ko]=TDE 응용 프로그램 -Name[lo]=ແຖບພັກແອບພີເຄຊັ້ນ -Name[lt]=Pritvirtintų programų juosta -Name[lv]=Dokot Aplikāciju Joslu -Name[mk]=Лента за вкотвување на апликации -Name[mn]=Програм-шигтгэх самбар -Name[ms]=Bar Aplikasi Dok -Name[mt]=Waħħal il-bar tal-programmi -Name[nb]=Festet programlinje -Name[nds]=Andockbalken -Name[ne]=डक अनुप्रयोगपट्टी -Name[nl]=Extra systeemvak -Name[nn]=Dokka programlinje -Name[nso]=Bar ya Tshomiso ya Dock -Name[pa]=ਡੋਕ ਕਾਰਜ ਪੱਟੀ -Name[pl]=Pasek dokowania programów -Name[pt]=Barra de Aplicações Acopláveis -Name[pt_BR]=Barra de aplicativos integrados -Name[ro]=Bară de docare aplicații -Name[ru]=Панель для встраивания приложений -Name[rw]=Umurongo Porogaramu Bikomatanye -Name[se]=Vuojuhuvvon prográmmaid holga -Name[sk]=Panel na dokovanie aplikácií -Name[sl]=Vrstica za zasidranje programov -Name[sr]=Трака за пристајање програма -Name[sr@Latn]=Traka za pristajanje programa -Name[sv]=Programdocka -Name[ta]=டாக் பயன்பாட்டு பட்டி -Name[tg]=Навори барномаи обзор -Name[th]=แถบพักแอพพลิเคชัน -Name[tr]=Uygulama çubuğunu gizle -Name[tt]=Yazılım Utırtu Taqtası -Name[uk]=Док-панель для програм -Name[vi]=Bến đỗ Thanh Chương trình -Name[wa]=Bår di wårdaedje des programes -Name[xh]=Ibar Yesicelo ye Dock -Name[zh_CN]=停靠应用程序栏 -Name[zh_TW]=嵌入程式工具列 -Name[zu]=Ibha Yomyaleli we-Dock + Comment=Dock application bar extension. -Comment[af]=Vasmeer program balk uitbreidings -Comment[az]=Proqram çubuğu uzantısını gizlət. -Comment[be]=Пашырэнне для ўбудавання праграмаў у панэль. -Comment[bg]=Разширение на системния панел -Comment[bn]=ডক অ্যাপলিকেশন বার এক্সটেনশন -Comment[bs]=Proširenje za dokiranje aplikacija -Comment[ca]=Una extensió de la barra per ancorar aplicacions. -Comment[cs]=Rozšíření lišty pro dokování aplikací. -Comment[csb]=Rozszérzenié do przërzeszaniô programów. -Comment[cy]=Docio estyniad y bar cymhwysiad -Comment[da]=Udvidelse - dok programlinje. -Comment[de]=Eine Andockleiste für Programme -Comment[el]=Επέκταση γραμμής προσαρτημένων εφαρμογών. -Comment[eo]=Aplikaĵostria aldono -Comment[es]=Extensión Barra para anclar aplicaciones. -Comment[et]=Paneeli laiendus dokitavate rakenduste hoidmiseks -Comment[eu]=Aplikazioak ainguratzeko barraren hedapena -Comment[fa]=پسوند میله کاربرد پیوند. -Comment[fi]=Upota ohjelmapalkkilaajennus -Comment[fr]=Stockage des applications dans une barre. -Comment[fy]=In balke wêryn tapassingen hun byldkaike kinne pleatse -Comment[gl]=Extensión de acoplamento de barras de aplicación -Comment[he]=הרחבת מעגן יישומים -Comment[hi]=अनुप्रयोग पट्टी विस्तार डॉक करें -Comment[hr]=Proširenje za usidravanje aplikacija -Comment[hu]=Alkalmazásdokkoló kiterjesztés. -Comment[id]=Panel dock ektensi untuk aplikasi -Comment[is]=Útvíkkun kvíar fyrir ísett forrit. -Comment[it]=Estensione per la barra delle applicazioni Dock. -Comment[ja]=アプリケーション用のドックパネル -Comment[kk]=Қолданбаларды тіркеу үшін панель. -Comment[km]=ផ្នែកបន្ថែមរបារកម្មវិធីចូលផែ ។ -Comment[lo]=ສ່ວນຂະຫຍາຍເພີ້ນຕື່ມພາເນລແຖລພັກແອລພີເຄຊັ້ນ -Comment[lt]=Pritvirtintų programų juostos plėtinys. -Comment[lv]=Doko aplikāciju joslas paplašinājumu. -Comment[mk]=Екстензија за вкотвување на апликации. -Comment[mn]=Програмын шигтгээ самбар өргөтгөл -Comment[ms]=Lanjutan bar aplikasi dok. -Comment[mt]=Estensjoni biex twaħħal il-bar tal-programmi. -Comment[nb]=Festepanel for programmer -Comment[nds]=Andockbalken för Programmen -Comment[ne]=डक अनुप्रयोगपट्टी विस्तार -Comment[nl]=Een balk waarin toepassingen hun pictogram kunnen plaatsen -Comment[nn]=Dokkingspanel for program -Comment[nso]=Koketso ya bar ya tshomiso ya dock. -Comment[pa]=ਡੋਕ ਕਾਰਜ ਪੱਟੀ ਵਧਾਰਾ ਹੈ। -Comment[pl]=Rozszerzenie do dokowania programów. -Comment[pt]=Uma extensão de barra de aplicações acopláveis. -Comment[pt_BR]=Extensão da barra de aplicativos embutidos. -Comment[ro]=Extensie bară de docare aplicații. -Comment[ru]=Расширение панели для встраивания приложений. -Comment[rw]=Iyagura ry'umurongo w'ikomatanya porogaramu -Comment[se]=Prográmmaid vuojuhanpanela -Comment[sk]=Rozšírenie pre dokovací panel aplikácií -Comment[sl]=Razširitev za sidrišče programov. -Comment[sr]=Проширење траке за пристајање програма. -Comment[sr@Latn]=Proširenje trake za pristajanje programa. -Comment[sv]=Bygger ut med en programdocka -Comment[ta]=டாக் பயன்பாடு பட்டி விரிவாக்கம் -Comment[tg]=Кушодкунии панел барои бино кунӣ. -Comment[th]=ส่วนขยายเพิ่มเติมพาเนล แถบพักแอพพลิเคชัน -Comment[tr]=Uygulama çubuğu uzantısını gizle. -Comment[tt]=Yazılım utırtuçı taqta östämäse. -Comment[uk]=Розширення док-панелі для програм. -Comment[vi]=Bến đỗ các thanh chương trình mở rộng -Comment[wa]=Module di bår di wårdaedje des programes -Comment[xh]=Ulwandiso lwe bar yesicelo se Dock. -Comment[zh_CN]=停靠应用程序栏扩展。 -Comment[zh_TW]=嵌入延伸程式工具列 -Comment[zu]=Isandiso sebha Yomyaleli we-Dock Icon=dockbar X-TDE-Library=dockbar_panelextension diff --git a/kicker/extensions/dockbar/dockbarextension.h b/kicker/extensions/dockbar/dockbarextension.h index 0952d259e..1431f29ee 100644 --- a/kicker/extensions/dockbar/dockbarextension.h +++ b/kicker/extensions/dockbar/dockbarextension.h @@ -32,7 +32,7 @@ class KWinModule; class DockBarExtension : public KPanelExtension { - Q_OBJECT + TQ_OBJECT public: DockBarExtension(const TQString& configFile, Type t = Normal, diff --git a/kicker/extensions/dockbar/dockcontainer.h b/kicker/extensions/dockbar/dockcontainer.h index 278b8e450..9ab21efb5 100644 --- a/kicker/extensions/dockbar/dockcontainer.h +++ b/kicker/extensions/dockbar/dockcontainer.h @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class DockContainer : public TQFrame { - Q_OBJECT + TQ_OBJECT public: typedef TQValueVector<DockContainer*> Vector; diff --git a/kicker/extensions/kasbar/CMakeLists.txt b/kicker/extensions/kasbar/CMakeLists.txt index c9fd0e736..6c7659125 100644 --- a/kicker/extensions/kasbar/CMakeLists.txt +++ b/kicker/extensions/kasbar/CMakeLists.txt @@ -24,7 +24,11 @@ link_directories( ##### other data ################################ -install( FILES kasbarextension.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/extensions ) +tde_create_translated_desktop( + SOURCE kasbarextension.desktop + DESTINATION ${DATA_INSTALL_DIR}/kicker/extensions + PO_DIR kicker-desktops +) ##### kasbar (shared) ########################### diff --git a/kicker/extensions/kasbar/ChangeLog b/kicker/extensions/kasbar/ChangeLog index 71abc4321..811d029f3 100644 --- a/kicker/extensions/kasbar/ChangeLog +++ b/kicker/extensions/kasbar/ChangeLog @@ -634,7 +634,7 @@ 2002-05-14 Tuesday 10:31 gioele - * kapp.h -> tdeapplication.h + * tdeApp.h -> tdeapplication.h 2002-04-23 Tuesday 14:02 binner diff --git a/kicker/extensions/kasbar/docs.h b/kicker/extensions/kasbar/docs.h index 105176d08..8a5ded920 100644 --- a/kicker/extensions/kasbar/docs.h +++ b/kicker/extensions/kasbar/docs.h @@ -36,19 +36,19 @@ -class QObject +class TQObject { }; -class TQWidget : public QObject +class TQWidget : public TQObject { }; -class TQDialog : public QWidget +class TQDialog : public TQWidget { }; -class TQFrame : public QWidget +class TQFrame : public TQWidget { }; @@ -64,6 +64,6 @@ class KDialogBase : public QDialog { }; -class KPanelExtension : public QWidget +class KPanelExtension : public TQWidget { }; diff --git a/kicker/extensions/kasbar/kasaboutdlg.cpp b/kicker/extensions/kasbar/kasaboutdlg.cpp index 1d15dc7c8..a37af0883 100644 --- a/kicker/extensions/kasbar/kasaboutdlg.cpp +++ b/kicker/extensions/kasbar/kasaboutdlg.cpp @@ -61,7 +61,7 @@ #include <tdeversion.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeglobal.h> #include <kiconloader.h> #include <ktextbrowser.h> @@ -118,7 +118,7 @@ void KasAboutDialog::addDemoBar() box->setSpacing( spacingHint() ); box->setMargin( marginHint() ); - KasBar *bar = new KasBar( Qt::Horizontal, box ); + KasBar *bar = new KasBar( TQt::Horizontal, box ); bar->setItemSize( KasBar::Large ); bar->setMasked( false ); @@ -129,9 +129,9 @@ void KasAboutDialog::addDemoBar() KasPopup *pop = new KasPopup( ci ); ci->setPopup( pop ); ci->setCustomPopup( true ); - connect( ci, TQT_SIGNAL(leftButtonClicked(TQMouseEvent *)), ci, TQT_SLOT(togglePopup()) ); + connect( ci, TQ_SIGNAL(leftButtonClicked(TQMouseEvent *)), ci, TQ_SLOT(togglePopup()) ); - KasBar *groupbar = bar->createChildBar( ( bar->orientation() == Qt::Horizontal ) ? Qt::Vertical : Qt::Horizontal, pop ); + KasBar *groupbar = bar->createChildBar( ( bar->orientation() == TQt::Horizontal ) ? TQt::Vertical : TQt::Horizontal, pop ); KasItem *i = 0; KasClockItem *clk = new KasClockItem( groupbar ); diff --git a/kicker/extensions/kasbar/kasaboutdlg.h b/kicker/extensions/kasbar/kasaboutdlg.h index 0311202ba..dda84045b 100644 --- a/kicker/extensions/kasbar/kasaboutdlg.h +++ b/kicker/extensions/kasbar/kasaboutdlg.h @@ -51,8 +51,6 @@ /* ** Bug reports and questions can be sent to kde-devel@kde.org */ -// -*- c++ -*- - #ifndef KASABOUTDLG_H #define KASABOUTDLG_H @@ -65,7 +63,7 @@ class KasBar; */ class KasAboutDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KasAboutDialog( TQWidget *parent=0 ); diff --git a/kicker/extensions/kasbar/kasbar.cpp b/kicker/extensions/kasbar/kasbar.cpp index 87fc7c629..323a58150 100644 --- a/kicker/extensions/kasbar/kasbar.cpp +++ b/kicker/extensions/kasbar/kasbar.cpp @@ -80,7 +80,7 @@ KasBar::KasBar( Orientation o, TQWidget *parent, const char *name, WFlags f ) : TQWidget( parent, name, f ), master_(0), orient( o ), - direction_( o == Qt::Horizontal ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom ), + direction_( o == TQt::Horizontal ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom ), itemUnderMouse_( 0 ), boxesPerLine_(10), // Temp value inDrag( false ), @@ -102,14 +102,14 @@ KasBar::KasBar( Orientation o, TQWidget *parent, const char *name, WFlags f ) setMouseTracking( true ); setMaxBoxes( 0 ); - connect( this, TQT_SIGNAL( configChanged() ), TQT_SLOT( repaint() ) ); + connect( this, TQ_SIGNAL( configChanged() ), TQ_SLOT( repaint() ) ); } KasBar::KasBar( Orientation o, KasBar *master, TQWidget *parent, const char *name, WFlags f ) : TQWidget( parent, name, f ), master_(master), orient( o ), - direction_( o == Qt::Horizontal ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom ), + direction_( o == TQt::Horizontal ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom ), itemUnderMouse_( 0 ), boxesPerLine_(10), // Temp value inDrag( false ), @@ -130,7 +130,7 @@ KasBar::KasBar( Orientation o, KasBar *master, TQWidget *parent, const char *nam items.setAutoDelete( true ); setMouseTracking( true ); setMaxBoxes( 0 ); - connect( master_, TQT_SIGNAL( configChanged() ), TQT_SLOT( repaint() ) ); + connect( master_, TQ_SIGNAL( configChanged() ), TQ_SLOT( repaint() ) ); } KasBar::~KasBar() @@ -145,8 +145,8 @@ KasResources *KasBar::resources() if ( isTopLevel() ) { res = new KasResources( this ); - connect( res, TQT_SIGNAL( changed() ), TQT_SIGNAL( configChanged() ) ); - connect( this, TQT_SIGNAL( itemSizeChanged(int) ), res, TQT_SLOT( itemSizeChanged() ) ); + connect( res, TQ_SIGNAL( changed() ), TQ_SIGNAL( configChanged() ) ); + connect( this, TQ_SIGNAL( itemSizeChanged(int) ), res, TQ_SLOT( itemSizeChanged() ) ); return res; } @@ -218,8 +218,8 @@ void KasBar::setTransparent( bool enable ) kdDebug(1345) << "KasBar: Enabling transparency" << endl; rootPix = new KRootPixmap( this ); - connect( rootPix, TQT_SIGNAL( backgroundUpdated(const TQPixmap &) ), - this, TQT_SLOT( setBackground(const TQPixmap &) ) ); + connect( rootPix, TQ_SIGNAL( backgroundUpdated(const TQPixmap &) ), + this, TQ_SLOT( setBackground(const TQPixmap &) ) ); rootPix->setCustomPainting( true ); @@ -318,9 +318,9 @@ void KasBar::setDirection( Direction dir ) return; if ( ( dir == TQBoxLayout::LeftToRight ) || ( dir == TQBoxLayout::RightToLeft ) ) - orient = Qt::Horizontal; + orient = TQt::Horizontal; else - orient = Qt::Vertical; + orient = TQt::Vertical; direction_ = dir; emit directionChanged(); @@ -332,7 +332,7 @@ void KasBar::setOrientation( Orientation o ) if ( orient == o ) return; - if ( o == Qt::Horizontal ) + if ( o == TQt::Horizontal ) setDirection( TQBoxLayout::LeftToRight ); else setDirection( TQBoxLayout::TopToBottom ); @@ -377,7 +377,7 @@ void KasBar::setDetached( bool detach ) TQSize KasBar::sizeHint( Orientation o, TQSize sz ) { - if ( o == Qt::Horizontal ) + if ( o == TQt::Horizontal ) setBoxesPerLine( sz.width() / itemExtent() ); else setBoxesPerLine( sz.height() / itemExtent() ); @@ -396,7 +396,7 @@ TQSize KasBar::sizeHint( Orientation o, TQSize sz ) ++r; TQSize s; - if( o == Qt::Horizontal ) { + if( o == TQt::Horizontal ) { s.setWidth( c*itemExtent() ); s.setHeight( r*itemExtent() ); } @@ -434,7 +434,7 @@ void KasBar::updateLayout() ++r; TQSize sz; - if ( orient == Qt::Horizontal ) + if ( orient == TQt::Horizontal ) sz = TQSize( c * itemExtent(), r * itemExtent() ); else sz = TQSize( r * itemExtent(), c * itemExtent() ); @@ -449,7 +449,7 @@ void KasBar::updateLayout() TQRegion mask; KasItem *i; - if ( orient == Qt::Horizontal ) { + if ( orient == TQt::Horizontal ) { for ( i = items.first(); i; i = items.next() ) { int x = (items.at() % c) * itemExtent(); @@ -720,7 +720,7 @@ void KasBar::addTestItems() i->setIcon( TDEGlobal::iconLoader()->loadIcon( "icons", TDEIcon::NoGroup, TDEIcon::SizeMedium ) ); i->setAnimation( resources()->startupAnimation() ); TQTimer *aniTimer = new TQTimer( i, "aniTimer" ); - connect( aniTimer, TQT_SIGNAL( timeout() ), i, TQT_SLOT( advanceAnimation() ) ); + connect( aniTimer, TQ_SIGNAL( timeout() ), i, TQ_SLOT( advanceAnimation() ) ); aniTimer->start( 100 ); i->setShowAnimation( true ); diff --git a/kicker/extensions/kasbar/kasbar.h b/kicker/extensions/kasbar/kasbar.h index d875dd00f..7780775f5 100644 --- a/kicker/extensions/kasbar/kasbar.h +++ b/kicker/extensions/kasbar/kasbar.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* kasbar.h ** ** Copyright (C) 2001-2004 Richard Moore <rich@kde.org> @@ -53,9 +51,6 @@ /* ** Bug reports and questions can be sent to kde-devel@kde.org */ -// -*- c++ -*- - - #ifndef __KASBAR_H #define __KASBAR_H @@ -77,9 +72,9 @@ typedef TQPtrList<KasItem> KasItemList; /** * The main view for KasBar. */ -class KDE_EXPORT KasBar : public TQWidget +class TDE_EXPORT KasBar : public TQWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( int maxBoxes READ maxBoxes ) TQ_PROPERTY( uint boxesPerLine READ boxesPerLine ) TQ_PROPERTY( Direction direction READ direction ) @@ -89,8 +84,8 @@ class KDE_EXPORT KasBar : public TQWidget friend class KasItem; public: - KasBar( Qt::Orientation o, TQWidget *parent=0, const char *name=0, WFlags f=0 ); - KasBar( Qt::Orientation o, KasBar *master, + KasBar( TQt::Orientation o, TQWidget *parent=0, const char *name=0, WFlags f=0 ); + KasBar( TQt::Orientation o, KasBar *master, TQWidget* parent=0, const char* name=0, WFlags f=0 ); virtual ~KasBar(); @@ -104,7 +99,7 @@ public: KasBar *master() const { return master_; } /** Creates a child bar of the kasbar. The child will inherit the appearance options. */ - virtual KasBar *createChildBar( Qt::Orientation o, TQWidget *parent, const char *name=0 ); + virtual KasBar *createChildBar( TQt::Orientation o, TQWidget *parent, const char *name=0 ); /** Factory method that returns the singleton resources object. */ virtual KasResources *resources(); @@ -141,8 +136,8 @@ public: int maxBoxes() const { return maxBoxes_; } uint boxesPerLine() const { return boxesPerLine_; } - void setOrientation( Qt::Orientation o ); - Qt::Orientation orientation() const { return orient; } + void setOrientation( TQt::Orientation o ); + TQt::Orientation orientation() const { return orient; } void setDirection( Direction dir ); Direction direction() const { return direction_; } @@ -152,7 +147,7 @@ public: bool isDrag() const { return inDrag; } - TQSize sizeHint( Qt::Orientation, TQSize max ); + TQSize sizeHint( TQt::Orientation, TQSize max ); // // Look and feel options @@ -287,7 +282,7 @@ private: TQPixmap offscreen; KasBar *master_; KasItemList items; - Qt::Orientation orient; + TQt::Orientation orient; Direction direction_; KasItem *itemUnderMouse_; uint boxesPerLine_; diff --git a/kicker/extensions/kasbar/kasbarapp.cpp b/kicker/extensions/kasbar/kasbarapp.cpp index ebb2422d3..bddeeacb2 100644 --- a/kicker/extensions/kasbar/kasbarapp.cpp +++ b/kicker/extensions/kasbar/kasbarapp.cpp @@ -88,7 +88,7 @@ int main( int argc, char **argv ) TDEConfig conf( "kasbarrc" ); if ( args->isSet("test") ) { - kasbar = new KasBar( Qt::Vertical, 0, "testkas", (TQ_WFlags)wflags ); + kasbar = new KasBar( TQt::Vertical, 0, "testkas", (TQt::WFlags)wflags ); kasbar->setItemSize( KasBar::Large ); kasbar->append( new KasClockItem(kasbar) ); kasbar->append( new KasItem(kasbar) ); @@ -97,14 +97,14 @@ int main( int argc, char **argv ) kasbar->addTestItems(); } else { - KasTasker *kastasker = new KasTasker( Qt::Vertical, 0, "testkas", (TQ_WFlags)wflags ); + KasTasker *kastasker = new KasTasker( TQt::Vertical, 0, "testkas", (TQt::WFlags)wflags ); kastasker->setConfig( &conf ); kastasker->setStandAlone( true ); kasbar = kastasker; kastasker->readConfig(); kastasker->move( kastasker->detachedPosition() ); - kastasker->connect( kastasker->resources(), TQT_SIGNAL(changed()), TQT_SLOT(readConfig()) ); + kastasker->connect( kastasker->resources(), TQ_SIGNAL(changed()), TQ_SLOT(readConfig()) ); kastasker->refreshAll(); } @@ -116,9 +116,9 @@ int main( int argc, char **argv ) KWin::setOnAllDesktops( kasbar->winId(), true ); kdDebug() << "kasbar: Window id is " << kasbar->winId() << endl; - TDEApplication::kApplication()->dcopClient()->registerAs( "kasbar" ); + tdeApp->dcopClient()->registerAs( "kasbar" ); - app.connect( &app, TQT_SIGNAL( lastWindowClosed() ), TQT_SLOT(quit()) ); + app.connect( &app, TQ_SIGNAL( lastWindowClosed() ), TQ_SLOT(quit()) ); return app.exec(); } diff --git a/kicker/extensions/kasbar/kasbarextension.cpp b/kicker/extensions/kasbar/kasbarextension.cpp index 5d870dae6..ad047a887 100644 --- a/kicker/extensions/kasbar/kasbarextension.cpp +++ b/kicker/extensions/kasbar/kasbarextension.cpp @@ -74,7 +74,7 @@ extern "C" { - KDE_EXPORT KPanelExtension *init( TQWidget *parent, const TQString& configFile ) + TDE_EXPORT KPanelExtension *init( TQWidget *parent, const TQString& configFile ) { TDEGlobal::locale()->insertCatalogue("kasbarextension"); return new KasBarExtension( configFile, @@ -92,13 +92,13 @@ KasBarExtension::KasBarExtension( const TQString& configFile, detached_( false ) { kdDebug(1345) << "KasBarExtension: Created '" << name << "', '" << configFile << "'" << endl; -// TDEApplication::kApplication()->dcopClient()->registerAs( "kasbar" ); +// tdeApp->dcopClient()->registerAs( "kasbar" ); // setBackgroundMode( NoBackground ); kasbar = new KasTasker( orientation(), this, name ); - connect( kasbar, TQT_SIGNAL( layoutChanged() ), this, TQT_SIGNAL( updateLayout() ) ); - connect( kasbar, TQT_SIGNAL( detachedChanged(bool) ), this, TQT_SLOT( setDetached(bool) ) ); + connect( kasbar, TQ_SIGNAL( layoutChanged() ), this, TQ_SIGNAL( updateLayout() ) ); + connect( kasbar, TQ_SIGNAL( detachedChanged(bool) ), this, TQ_SLOT( setDetached(bool) ) ); kasbar->setConfig( config() ); kasbar->readConfig(); @@ -146,7 +146,7 @@ void KasBarExtension::showEvent( TQShowEvent */*se*/ ) TQSize KasBarExtension::detachedSize() { - if ( orientation() == Qt::Vertical ) + if ( orientation() == TQt::Vertical ) return TQSize( kasbar->itemExtent()/2, 0 ); else return TQSize( 0, kasbar->itemExtent()/2 ); @@ -155,13 +155,13 @@ TQSize KasBarExtension::detachedSize() TQSize KasBarExtension::sizeHint(Position p, TQSize maxSize ) const { - Orientation o = Qt::Horizontal; + Orientation o = TQt::Horizontal; if ( p == Left || p == Right ) - o = Qt::Vertical; + o = TQt::Vertical; if ( detached_ ) { - if ( o == Qt::Vertical ) + if ( o == TQt::Vertical ) return TQSize( kasbar->itemExtent()/2, 0 ); else return TQSize( 0, kasbar->itemExtent()/2 ); diff --git a/kicker/extensions/kasbar/kasbarextension.desktop b/kicker/extensions/kasbar/kasbarextension.desktop index d4fc93619..3884be74e 100644 --- a/kicker/extensions/kasbar/kasbarextension.desktop +++ b/kicker/extensions/kasbar/kasbarextension.desktop @@ -1,109 +1,9 @@ [Desktop Entry] Name=KasBar -Name[af]=Kasbar -Name[bg]=Алтернативен панел -Name[cs]=Kasbar -Name[csb]=Lëstew dzejaniów (Kasbar) -Name[de]=Kasbar -Name[eo]=Kasbaro -Name[fy]=Kasbar -Name[he]=שורת משימות חלופית -Name[hi]=कास-बार -Name[is]=Kasbar -Name[it]=Kasbar -Name[lo]=ຄາສບາຣ - K -Name[lv]=KasJosla -Name[mn]=Kasbar -Name[nb]=Kasbar -Name[ne]=कासबार -Name[nl]=Kasbar -Name[nso]=Bar ya Kas -Name[pa]=ਕਸ-ਬਾਰ -Name[pl]=Pasek zadań (Kasbar) -Name[sv]=Kasbar -Name[te]=కాస్ బార్ -Name[tg]=Навори Kas -Name[th]=คาสบาร์ -Name[zu]=I-KasBar Comment=An alternative taskbar panel applet. -Comment[af]='n Alternatiewe taakbalk paneel miniprogram. -Comment[az]=Alternatif bir vəzifə çubuğu programcığı. -Comment[be]=Альтэрнатыўная панэль заданняў. -Comment[bg]=Алтернативен аплет за лентата със задачите -Comment[bn]=টাস্কবার প্যানেল অ্যাপলেট-এর একটি বিকল্প -Comment[br]=Arloadig barrenn poelladoù dazeilat evit ar bannell. -Comment[bs]=Panelski applet - alternativni taskbar -Comment[ca]=Un applet per al plafó alternatiu a la barra de tasques. -Comment[cs]=Applet s alternativním pruhem úloh -Comment[csb]=Alternatiwnô lëstew dzejaniów dlô panelu. -Comment[cy]=Rhaglennig bar tasgau arall i'r panel -Comment[da]=Et alternativt opgavelinjepanelprogram. -Comment[de]=Eine alternative Fensterleiste -Comment[el]=Μία εναλλακτική μικροεφαρμογή γραμμής εργασιών για τον πίνακα. -Comment[eo]=Alternativa taskostria panelaplikaĵeto -Comment[es]=Barra de tareas alternativa (miniaplicación del panel). -Comment[et]=Teistsugune paneelil töötav tegumiriba aplett -Comment[eu]=Ataza-barra alternatiboa (paneleko appleta) -Comment[fa]=یک برنامک تابلوی میله تکلیف متفاوت. -Comment[fi]=Vaihtoehtoinen ohjelmalistasovelma. -Comment[fr]=Une autre applet de barre des tâches -Comment[fy]=In alternative taakbalke panielapplet. -Comment[gl]=Unha applet de barra de tarefas alternativa para o painel -Comment[he]=יישומון שורת משימות חלופי עבור הלוח -Comment[hi]=एक वैकल्पिक कार्यपट्टी फलक ऐपलेट -Comment[hr]=Alternativni aplet trake zadataka -Comment[hu]=Egy feladatlista-alternatíva panel-kisalkalmazásként. -Comment[id]=Aplet panel taskbar alternatif -Comment[is]=Annað verkspjald en það sjálfgefna. -Comment[it]=Applet alternativa per la barra delle applicazioni -Comment[ja]=代替のタスクバーパネルアプレット -Comment[ka]=ალტერნატიული ამოცანათა პანელის აპლეტი -Comment[kk]=Қосымша тапсырмалар панель апплеті. -Comment[km]=អាប់ភ្លេតបន្ទះរបារភារកិច្ចជំនួស ។ -Comment[lo]=ແອລແພັດຖາດຫນ້າຕ່າງງານແບບອື່ນ -Comment[lt]=Alternatyvi užduočių pulto priemonė. -Comment[lv]=Alternatīvs uzdevumjoslas paneļa aplets. -Comment[mk]=Аплет од панелот - алтернативна лента со програми. -Comment[mn]=Хоёрдогч цонхны самбар -Comment[ms]=Aplet panel 'taskbar' alternatif. -Comment[mt]=Applet alternattiva għall-panel tat-taskbar -Comment[nb]=En alternativ oppgavelinje som panelprogram. -Comment[nds]=En anner Lüttprogramm för den Paneel-Programmbalken -Comment[ne]=वैकल्पिक कार्यपट्टी प्यानल एप्लेट -Comment[nl]=Een alternatieve taakbalk paneelapplet. -Comment[nn]=Ei alternativ oppgåvelinje til panelet. -Comment[nso]=Applet yenngwe ya panel ya bar ya mosongwana. -Comment[oc]=Un aplet dèu plafon alternatiu de la barra de tasques. -Comment[pa]=ਇੱਕ ਬਦਲਵੀਂ ਕੰਮ-ਪੱਟੀ ਐਪਲਿਟ -Comment[pl]=Alternatywny pasek zadań dla panelu. -Comment[pt]=Uma barra de tarefas alternativa. -Comment[pt_BR]=Um mini-aplicativo de painel alternativo para a barra de tarefas. -Comment[ro]=O alternativă la miniaplicația bară de procese. -Comment[ru]=Аплет альтернативной панели задач. -Comment[rw]=Apuleti y'umwanya w'umurongoibikorwa usimbura -Comment[se]=Eavttolaš bargoholga panelii -Comment[sk]=Alternatívny panel úloh -Comment[sl]=Vstavek za alternativno opravilno vrstico na pultu -Comment[sr]=Алтернативни аплет траке задатака за панел. -Comment[sr@Latn]=Alternativni aplet trake zadataka za panel. -Comment[sv]=Alternativt miniprogram till aktivitetsfältet -Comment[ta]=மாற்றுவழி பணிபட்டி பலக சிறுநிரல் -Comment[tg]=Барномаи сафҳаи масъалаҳои алтернативӣ -Comment[th]=แอพเพล็ตถาดหน้าต่างงานแบบอื่น -Comment[tr]=Alternatif bir görev çubuğu programcığı. -Comment[tt]=Almaş yöktirä taqtasınıñ applete. -Comment[uk]=Альтернативний аплет смужки задач. -Comment[ven]=Apulete phanele ine nanga shumisa yone ya bara ya mushumo. -Comment[vi]=Một tiểu ứng dụng khác cũng có bảng điểu khiển chứa thanh tác vụ. -Comment[wa]=Ene ôte aplikete di bår des bouyes do scriftôr -Comment[xh]=I applet yeqela lenjongo ethile yebar yomsebenzi olandelelanayo. -Comment[zh_CN]=备选的任务栏面板小程序。 -Comment[zh_TW]=可供選擇的另外一個工作列面板小程式。 -Comment[zu]=Enye i-applet yewindi lemininingwane yebha yemisebenzi Icon=kasbar - X-TDE-Library=kasbar_panelextension X-TDE-UniqueApplet=true X-TDE-PanelExt-Positions=Right,Left,Top,Bottom diff --git a/kicker/extensions/kasbar/kasbarextension.h b/kicker/extensions/kasbar/kasbarextension.h index 7fbb4fbc6..c1786c953 100644 --- a/kicker/extensions/kasbar/kasbarextension.h +++ b/kicker/extensions/kasbar/kasbarextension.h @@ -51,8 +51,6 @@ /* ** Bug reports and questions can be sent to kde-devel@kde.org */ -// -*- c++ -*- - #ifndef KASBAREXTENSION_H #define KASBAREXTENSION_H @@ -66,7 +64,7 @@ class KasTasker; */ class KasBarExtension : public KPanelExtension { - Q_OBJECT + TQ_OBJECT public: KasBarExtension( const TQString& configFile, diff --git a/kicker/extensions/kasbar/kasclockitem.cpp b/kicker/extensions/kasbar/kasclockitem.cpp index 249e7c051..2e5b8d459 100644 --- a/kicker/extensions/kasbar/kasclockitem.cpp +++ b/kicker/extensions/kasbar/kasclockitem.cpp @@ -12,7 +12,7 @@ #include <kpixmap.h> #include <kpixmapeffect.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdepopupmenu.h> #include <taskmanager.h> @@ -39,7 +39,7 @@ KasClockItem::KasClockItem( KasBar *parent ) setCustomPopup( true ); TQTimer *t = new TQTimer( this, "t" ); - connect( t, TQT_SIGNAL( timeout() ), TQT_SLOT( updateTime() ) ); + connect( t, TQ_SIGNAL( timeout() ), TQ_SLOT( updateTime() ) ); t->start( 1000 ); lcd = new LCD( parent ); @@ -53,8 +53,8 @@ KasClockItem::KasClockItem( KasBar *parent ) lcd->setAutoMask( true ); updateTime(); - connect( this, TQT_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQT_SLOT(togglePopup()) ); - connect( this, TQT_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQT_SLOT(showMenuAt(TQMouseEvent *) ) ); + connect( this, TQ_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQ_SLOT(togglePopup()) ); + connect( this, TQ_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQ_SLOT(showMenuAt(TQMouseEvent *) ) ); } KasClockItem::~KasClockItem() diff --git a/kicker/extensions/kasbar/kasclockitem.h b/kicker/extensions/kasbar/kasclockitem.h index a95ebac7b..d81815c7f 100644 --- a/kicker/extensions/kasbar/kasclockitem.h +++ b/kicker/extensions/kasbar/kasclockitem.h @@ -1,6 +1,3 @@ -// -*- c++ -*- - - #ifndef KASCLOCKITEM_H #define KASCLOCKITEM_H @@ -9,9 +6,9 @@ /** * An item that displays a clock. */ -class KDE_EXPORT KasClockItem : public KasItem +class TDE_EXPORT KasClockItem : public KasItem { - Q_OBJECT + TQ_OBJECT public: KasClockItem( KasBar *parent ); diff --git a/kicker/extensions/kasbar/kasgrouper.h b/kicker/extensions/kasbar/kasgrouper.h index c5beab3a6..d134d8921 100644 --- a/kicker/extensions/kasbar/kasgrouper.h +++ b/kicker/extensions/kasbar/kasgrouper.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* kasgrouper.h ** ** Copyright (C) 2001-2004 Richard Moore <rich@kde.org> diff --git a/kicker/extensions/kasbar/kasgroupitem.cpp b/kicker/extensions/kasbar/kasgroupitem.cpp index a14dff2ea..de59f7b88 100644 --- a/kicker/extensions/kasbar/kasgroupitem.cpp +++ b/kicker/extensions/kasbar/kasgroupitem.cpp @@ -83,10 +83,10 @@ KasGroupItem::KasGroupItem( KasTasker *parent ) setGroupItem( true ); setText( i18n("Group") ); - connect( parent, TQT_SIGNAL( layoutChanged() ), this, TQT_SLOT( hidePopup() ) ); - connect( parent, TQT_SIGNAL( layoutChanged() ), this, TQT_SLOT( update() ) ); - connect( this, TQT_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQT_SLOT(togglePopup()) ); - connect( this, TQT_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQT_SLOT(showGroupMenuAt(TQMouseEvent *) ) ); + connect( parent, TQ_SIGNAL( layoutChanged() ), this, TQ_SLOT( hidePopup() ) ); + connect( parent, TQ_SIGNAL( layoutChanged() ), this, TQ_SLOT( update() ) ); + connect( this, TQ_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQ_SLOT(togglePopup()) ); + connect( this, TQ_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQ_SLOT(showGroupMenuAt(TQMouseEvent *) ) ); } KasGroupItem::~KasGroupItem() @@ -109,7 +109,7 @@ void KasGroupItem::addTask( Task::Ptr t ) updateIcon(); } - connect( t, TQT_SIGNAL( changed(bool) ), this, TQT_SLOT( update() ) ); + connect( t, TQ_SIGNAL( changed(bool) ), this, TQ_SLOT( update() ) ); update(); } @@ -255,9 +255,9 @@ void KasGroupItem::updatePopup() KasPopup *KasGroupItem::createPopup() { KasPopup *pop = new KasPopup( this ); - bar = kasbar()->createChildBar( ( kasbar()->orientation() == Qt::Horizontal ) ? Qt::Vertical : Qt::Horizontal, pop ); + bar = kasbar()->createChildBar( ( kasbar()->orientation() == TQt::Horizontal ) ? TQt::Vertical : TQt::Horizontal, pop ); - connect( pop, TQT_SIGNAL(shown()), TQT_SLOT(updatePopup()) ); + connect( pop, TQ_SIGNAL(shown()), TQ_SLOT(updatePopup()) ); return pop; @@ -291,7 +291,7 @@ void KasGroupItem::showGroupMenuAt( TQMouseEvent *ev ) void KasGroupItem::showGroupMenuAt( const TQPoint &p ) { TaskRMBMenu *tm = new TaskRMBMenu(items, true, NULL, kasbar()); - tm->insertItem( i18n("&Ungroup" ), this, TQT_SLOT( ungroup() ) ); + tm->insertItem( i18n("&Ungroup" ), this, TQ_SLOT( ungroup() ) ); tm->insertSeparator(); tm->insertItem( i18n("&Kasbar"), kasbar()->contextMenu() ); diff --git a/kicker/extensions/kasbar/kasgroupitem.h b/kicker/extensions/kasbar/kasgroupitem.h index e30260f57..2acad3004 100644 --- a/kicker/extensions/kasbar/kasgroupitem.h +++ b/kicker/extensions/kasbar/kasgroupitem.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* kasgroupitem.h ** ** Copyright (C) 2001-2004 Richard Moore <rich@kde.org> @@ -53,9 +51,6 @@ /* ** Bug reports and questions can be sent to kde-devel@kde.org */ -// -*- c++ -*- - - #ifndef KASGROUPITEM_H #define KASGROUPITEM_H @@ -73,7 +68,7 @@ class Task; */ class KasGroupItem : public KasItem { - Q_OBJECT + TQ_OBJECT public: enum GroupType { diff --git a/kicker/extensions/kasbar/kasitem.cpp b/kicker/extensions/kasbar/kasitem.cpp index 2523ef18c..a95dac049 100644 --- a/kicker/extensions/kasbar/kasitem.cpp +++ b/kicker/extensions/kasbar/kasitem.cpp @@ -94,8 +94,8 @@ KasItem::KasItem( KasBar *parent ) frame(true), modified(false), attention_(false), prog( -1 ), anim(), aniFrame( 0 ), drawAnim( false ) { - connect( parent, TQT_SIGNAL( dragStarted() ), TQT_SLOT( hidePopup() ) ); - connect( this, TQT_SIGNAL( middleButtonClicked(TQMouseEvent *) ), parent, TQT_SLOT( toggleOrientation() ) ); + connect( parent, TQ_SIGNAL( dragStarted() ), TQ_SLOT( hidePopup() ) ); + connect( this, TQ_SIGNAL( middleButtonClicked(TQMouseEvent *) ), parent, TQ_SLOT( toggleOrientation() ) ); } KasItem::~KasItem() @@ -169,7 +169,7 @@ void KasItem::mouseEnter() if ( (!customPopup) && (popupTimer == 0) ) { popupTimer = new TQTimer( this, "popupTimer" ); - connect( popupTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( showPopup() ) ); + connect( popupTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( showPopup() ) ); popupTimer->start( POPUP_DELAY, true ); } @@ -179,11 +179,11 @@ void KasItem::mouseEnter() void KasItem::mouseReleaseEvent( TQMouseEvent *ev ) { - if ( ev->button() == Qt::LeftButton ) + if ( ev->button() == TQt::LeftButton ) emit leftButtonClicked( ev ); - else if ( ev->button() == Qt::RightButton ) + else if ( ev->button() == TQt::RightButton ) emit rightButtonClicked( ev ); - else if ( ev->button() == Qt::MidButton ) + else if ( ev->button() == TQt::MidButton ) emit middleButtonClicked( ev ); } @@ -205,7 +205,7 @@ void KasItem::checkPopup() hidePopup(); } else { - TQTimer::singleShot( KASITEM_CHECK_POPUP_DELAY, this, TQT_SLOT( checkPopup() ) ); + TQTimer::singleShot( KASITEM_CHECK_POPUP_DELAY, this, TQ_SLOT( checkPopup() ) ); } } @@ -215,7 +215,7 @@ void KasItem::dragEnter() if ( dragTimer == 0 ) { dragTimer = new TQTimer( this, "dragTimer" ); - connect( dragTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( dragOverAction() ) ); + connect( dragTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( dragOverAction() ) ); dragTimer->start( DRAG_SWITCH_DELAY, true ); } @@ -268,7 +268,7 @@ void KasItem::showPopup() pop->show(); update(); - TQTimer::singleShot( KASITEM_CHECK_POPUP_DELAY, this, TQT_SLOT( checkPopup() ) ); + TQTimer::singleShot( KASITEM_CHECK_POPUP_DELAY, this, TQ_SLOT( checkPopup() ) ); } void KasItem::hidePopup() @@ -312,13 +312,13 @@ void KasItem::paintFrame( TQPainter *p ) p->drawRect( 0, 0, extent(), extent()); } else { - pen = TQPen( Qt::white ); + pen = TQPen( TQt::white ); p->setPen( pen ); p->drawRect(0, 0, extent(), extent()); } } else if ( kas->paintInactiveFrames() ) { - p->setPen( attention_ ? resources()->attentionColor() : Qt::black ); + p->setPen( attention_ ? resources()->attentionColor() : TQt::black ); p->drawRect(0, 0, extent(), extent()); } } diff --git a/kicker/extensions/kasbar/kasitem.h b/kicker/extensions/kasbar/kasitem.h index 5c7378825..9731d1633 100644 --- a/kicker/extensions/kasbar/kasitem.h +++ b/kicker/extensions/kasbar/kasitem.h @@ -51,8 +51,6 @@ /* ** Bug reports and questions can be sent to kde-devel@kde.org */ -// -*- c++ -*- - #ifndef KASITEM_H #define KASITEM_H @@ -66,7 +64,7 @@ class KasPopup; #include <tqvaluevector.h> #include <tqapplication.h> -#include <kdemacros.h> +#include <tdemacros.h> #include "kasbar.h" @@ -75,9 +73,9 @@ class KasPopup; * * @author Richard Moore, rich@kde.org */ -class KDE_EXPORT KasItem : public TQObject +class TDE_EXPORT KasItem : public TQObject { - Q_OBJECT + TQ_OBJECT public: friend class KasBar; diff --git a/kicker/extensions/kasbar/kasloaditem.cpp b/kicker/extensions/kasbar/kasloaditem.cpp index 6169d09b1..2643ab932 100644 --- a/kicker/extensions/kasbar/kasloaditem.cpp +++ b/kicker/extensions/kasbar/kasloaditem.cpp @@ -19,7 +19,7 @@ #include <kpixmap.h> #include <kpixmapeffect.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdepopupmenu.h> #include <taskmanager.h> @@ -34,11 +34,11 @@ KasLoadItem::KasLoadItem( KasBar *parent ) : KasItem( parent ) { TQTimer *t = new TQTimer( this, "KasLoadItem::t" ); - connect( t, TQT_SIGNAL( timeout() ), TQT_SLOT( updateDisplay() ) ); + connect( t, TQ_SIGNAL( timeout() ), TQ_SLOT( updateDisplay() ) ); t->start( 1000 ); updateDisplay(); - connect( this, TQT_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQT_SLOT(showMenuAt(TQMouseEvent *) ) ); + connect( this, TQ_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQ_SLOT(showMenuAt(TQMouseEvent *) ) ); } KasLoadItem::~KasLoadItem() diff --git a/kicker/extensions/kasbar/kasloaditem.h b/kicker/extensions/kasbar/kasloaditem.h index ba2fd5ff4..c727d9709 100644 --- a/kicker/extensions/kasbar/kasloaditem.h +++ b/kicker/extensions/kasbar/kasloaditem.h @@ -1,19 +1,16 @@ -// -*- c++ -*- - - #ifndef KASLOADITEM_H #define KASLOADITEM_H #include "kasitem.h" -#include <kdemacros.h> +#include <tdemacros.h> /** * An item that displays the system load. */ -class KDE_EXPORT KasLoadItem : public KasItem +class TDE_EXPORT KasLoadItem : public KasItem { - Q_OBJECT + TQ_OBJECT public: KasLoadItem( KasBar *parent ); diff --git a/kicker/extensions/kasbar/kaspopup.cpp b/kicker/extensions/kasbar/kaspopup.cpp index 0edc0a77a..33966bdb9 100644 --- a/kicker/extensions/kasbar/kaspopup.cpp +++ b/kicker/extensions/kasbar/kaspopup.cpp @@ -95,7 +95,7 @@ TQPoint KasPopup::calcPosition( KasItem *item, int w, int h ) int x = pos.x(); int y = pos.y(); - if ( kasbar->orientation() == Qt::Horizontal ) { + if ( kasbar->orientation() == TQt::Horizontal ) { if ( y < ( tqApp->desktop()->height() / 2 ) ) y = y + kasbar->itemExtent(); else diff --git a/kicker/extensions/kasbar/kaspopup.h b/kicker/extensions/kasbar/kaspopup.h index 38abbbc28..701ca01dd 100644 --- a/kicker/extensions/kasbar/kaspopup.h +++ b/kicker/extensions/kasbar/kaspopup.h @@ -51,8 +51,6 @@ /* ** Bug reports and questions can be sent to kde-devel@kde.org */ -// -*- c++ -*- - #ifndef KASPOPUP_H #define KASPOPUP_H @@ -71,7 +69,7 @@ class KasBar; */ class KasPopup : public TQHBox { - Q_OBJECT + TQ_OBJECT public: KasPopup( KasItem *item, const char *name=0 ); diff --git a/kicker/extensions/kasbar/kasprefsdlg.cpp b/kicker/extensions/kasbar/kasprefsdlg.cpp index 28c6fca72..cce36b250 100644 --- a/kicker/extensions/kasbar/kasprefsdlg.cpp +++ b/kicker/extensions/kasbar/kasprefsdlg.cpp @@ -134,9 +134,9 @@ void KasPrefsDialog::addLookPage() itemSizeLabel->setBuddy( itemSizeCombo ); - connect( itemSizeCombo, TQT_SIGNAL( activated( int ) ), - kasbar, TQT_SLOT( setItemSize( int ) ) ); - connect( itemSizeCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( itemSizeChanged( int ) ) ); + connect( itemSizeCombo, TQ_SIGNAL( activated( int ) ), + kasbar, TQ_SLOT( setItemSize( int ) ) ); + connect( itemSizeCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( itemSizeChanged( int ) ) ); new TQWidget( itemSizeBox ); @@ -144,10 +144,10 @@ void KasPrefsDialog::addLookPage() customSize->setValue( kasbar->itemExtent() ); - connect( customSize, TQT_SIGNAL( valueChanged( int ) ), - kasbar, TQT_SLOT( setItemExtent( int ) ) ); - connect( customSize, TQT_SIGNAL( valueChanged( int ) ), - kasbar, TQT_SLOT( customSizeChanged( int ) ) ); + connect( customSize, TQ_SIGNAL( valueChanged( int ) ), + kasbar, TQ_SLOT( setItemExtent( int ) ) ); + connect( customSize, TQ_SIGNAL( valueChanged( int ) ), + kasbar, TQ_SLOT( customSizeChanged( int ) ) ); int sz = kasbar->itemSize(); itemSizeCombo->setCurrentItem( sz ); @@ -171,7 +171,7 @@ void KasPrefsDialog::addLookPage() conf ? conf->readNumEntry( "MaxBoxes", 0 ) : 11, 10, maxBoxesBox, "maxboxes" ); - connect( maxBoxesSpin, TQT_SIGNAL( valueChanged( int ) ), kasbar, TQT_SLOT( setMaxBoxes( int ) ) ); + connect( maxBoxesSpin, TQ_SIGNAL( valueChanged( int ) ), kasbar, TQ_SLOT( setMaxBoxes( int ) ) ); maxBoxesLabel->setBuddy( maxBoxesSpin ); // @@ -183,7 +183,7 @@ void KasPrefsDialog::addLookPage() detachedCheck->setEnabled( !kasbar->isStandAlone() ); detachedCheck->setChecked( kasbar->isDetached() ); - connect( detachedCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setDetached(bool) ) ); + connect( detachedCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setDetached(bool) ) ); (void) new TQWidget( lookPage, "spacer" ); (void) new TQWidget( lookPage, "spacer" ); @@ -197,40 +197,40 @@ void KasPrefsDialog::addBackgroundPage() transCheck = new TQCheckBox( i18n("Trans&parent"), bgPage ); TQWhatsThis::add( transCheck, i18n( "Enables pseudo-transparent mode." ) ); transCheck->setChecked( kasbar->isTransparent() ); - connect( transCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setTransparent(bool) ) ); + connect( transCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setTransparent(bool) ) ); tintCheck = new TQCheckBox( i18n("Enable t&int"), bgPage ); TQWhatsThis::add( tintCheck, i18n( "Enables tinting the background that shows through in transparent mode." ) ); tintCheck->setChecked( kasbar->hasTint() ); - connect( tintCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setTint(bool) ) ); + connect( tintCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setTint(bool) ) ); TQHBox *tintColBox = new TQHBox( bgPage ); TQWhatsThis::add( tintColBox, i18n( "Specifies the color used for the background tint." ) ); - connect( tintCheck, TQT_SIGNAL( toggled(bool) ), tintColBox, TQT_SLOT( setEnabled(bool) ) ); + connect( tintCheck, TQ_SIGNAL( toggled(bool) ), tintColBox, TQ_SLOT( setEnabled(bool) ) ); tintColBox->setEnabled( kasbar->hasTint() ); TQLabel *tintLabel = new TQLabel( i18n("Tint &color:"), tintColBox ); tintButton = new KColorButton( kasbar->tintColor(), tintColBox ); - connect( tintButton, TQT_SIGNAL( changed( const TQColor & ) ), - kasbar, TQT_SLOT( setTintColor( const TQColor & ) ) ); + connect( tintButton, TQ_SIGNAL( changed( const TQColor & ) ), + kasbar, TQ_SLOT( setTintColor( const TQColor & ) ) ); tintLabel->setBuddy( tintButton ); TQHBox *tintAmtBox = new TQHBox( bgPage ); TQWhatsThis::add( tintAmtBox, i18n( "Specifies the strength of the background tint." ) ); - connect( tintCheck, TQT_SIGNAL( toggled(bool) ), tintAmtBox, TQT_SLOT( setEnabled(bool) ) ); + connect( tintCheck, TQ_SIGNAL( toggled(bool) ), tintAmtBox, TQ_SLOT( setEnabled(bool) ) ); tintAmtBox->setEnabled( kasbar->hasTint() ); TQLabel *tintStrengthLabel = new TQLabel( i18n("Tint &strength: "), tintAmtBox ); int percent = (int) (kasbar->tintAmount() * 100.0); - tintAmount = new TQSlider( 0, 100, 1, percent, Qt::Horizontal, tintAmtBox ); + tintAmount = new TQSlider( 0, 100, 1, percent, TQt::Horizontal, tintAmtBox ); tintAmount->setTracking( true ); - connect( tintAmount, TQT_SIGNAL( valueChanged( int ) ), - kasbar, TQT_SLOT( setTintAmount( int ) ) ); + connect( tintAmount, TQ_SIGNAL( valueChanged( int ) ), + kasbar, TQ_SLOT( setTintAmount( int ) ) ); tintStrengthLabel->setBuddy( tintAmount ); (void) new TQWidget( bgPage, "spacer" ); @@ -249,11 +249,11 @@ void KasPrefsDialog::addThumbsPage() "approximate, and may not reflect the current window contents.\n\n" "Using this option on a slow machine may cause performance problems." ) ); thumbsCheck->setChecked( kasbar->thumbnailsEnabled() ); - connect( thumbsCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setThumbnailsEnabled(bool) ) ); + connect( thumbsCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setThumbnailsEnabled(bool) ) ); embedThumbsCheck = new TQCheckBox( i18n("&Embed thumbnails"), thumbsPage ); embedThumbsCheck->setChecked( kasbar->embedThumbnails() ); - connect( embedThumbsCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setEmbedThumbnails(bool) ) ); + connect( embedThumbsCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setEmbedThumbnails(bool) ) ); TQHBox *thumbSizeBox = new TQHBox( thumbsPage ); TQWhatsThis::add( thumbSizeBox, @@ -261,9 +261,9 @@ void KasPrefsDialog::addThumbsPage() "cause performance problems." ) ); TQLabel *thumbSizeLabel = new TQLabel( i18n("Thumbnail &size: "), thumbSizeBox ); int percent = (int) (kasbar->thumbnailSize() * 100.0); - thumbSizeSlider = new TQSlider( 0, 100, 1, percent, Qt::Horizontal, thumbSizeBox ); - connect( thumbSizeSlider, TQT_SIGNAL( valueChanged( int ) ), - kasbar, TQT_SLOT( setThumbnailSize( int ) ) ); + thumbSizeSlider = new TQSlider( 0, 100, 1, percent, TQt::Horizontal, thumbSizeBox ); + connect( thumbSizeSlider, TQ_SIGNAL( valueChanged( int ) ), + kasbar, TQ_SLOT( setThumbnailSize( int ) ) ); thumbSizeLabel->setBuddy( thumbSizeSlider ); TQHBox *thumbUpdateBox = new TQHBox( thumbsPage ); @@ -275,8 +275,8 @@ void KasPrefsDialog::addThumbsPage() TQLabel *thumbUpdateLabel = new TQLabel( i18n("&Update thumbnail every: "), thumbUpdateBox ); thumbUpdateSpin = new TQSpinBox( 0, 1000, 1, thumbUpdateBox ); thumbUpdateSpin->setValue( kasbar->thumbnailUpdateDelay() ); - connect( thumbUpdateSpin, TQT_SIGNAL( valueChanged( int ) ), - kasbar, TQT_SLOT( setThumbnailUpdateDelay( int ) ) ); + connect( thumbUpdateSpin, TQ_SIGNAL( valueChanged( int ) ), + kasbar, TQ_SLOT( setThumbnailUpdateDelay( int ) ) ); (void) new TQLabel( i18n("seconds"), thumbUpdateBox ); thumbUpdateLabel->setBuddy( thumbUpdateSpin ); @@ -287,27 +287,27 @@ void KasPrefsDialog::addThumbsPage() void KasPrefsDialog::addBehavePage() { - TQVBox *behavePage = addVBoxPage( i18n("Behavior"), TQString::null, Icon( "window_list" ) ); + TQVBox *behavePage = addVBoxPage( i18n("Behavior"), TQString::null, Icon( "window_duplicate" ) ); groupWindowsCheck = new TQCheckBox( i18n("&Group windows"), behavePage ); TQWhatsThis::add( groupWindowsCheck, i18n( "Enables the grouping together of related windows." ) ); groupWindowsCheck->setChecked( kasbar->groupWindows() ); - connect( groupWindowsCheck, TQT_SIGNAL( toggled(bool) ), - kasbar, TQT_SLOT( setGroupWindows(bool) ) ); + connect( groupWindowsCheck, TQ_SIGNAL( toggled(bool) ), + kasbar, TQ_SLOT( setGroupWindows(bool) ) ); showAllWindowsCheck = new TQCheckBox( i18n("Show all &windows"), behavePage ); TQWhatsThis::add( showAllWindowsCheck, i18n( "Enables the display of all windows, not just those on the current desktop." ) ); showAllWindowsCheck->setChecked( kasbar->showAllWindows() ); - connect( showAllWindowsCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setShowAllWindows(bool) ) ); + connect( showAllWindowsCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setShowAllWindows(bool) ) ); groupInactiveCheck = new TQCheckBox( i18n("&Group windows on inactive desktops"), behavePage ); TQWhatsThis::add( groupInactiveCheck, i18n( "Enables the grouping together of windows that are not on the current desktop." ) ); groupInactiveCheck->setChecked( kasbar->groupInactiveDesktops() ); - connect( groupInactiveCheck, TQT_SIGNAL( toggled(bool) ), - kasbar, TQT_SLOT( setGroupInactiveDesktops(bool) ) ); + connect( groupInactiveCheck, TQ_SIGNAL( toggled(bool) ), + kasbar, TQ_SLOT( setGroupInactiveDesktops(bool) ) ); onlyShowMinimizedCheck = new TQCheckBox( i18n("Only show &minimized windows"), behavePage ); TQWhatsThis::add( onlyShowMinimizedCheck, @@ -315,7 +315,7 @@ void KasPrefsDialog::addBehavePage() "This gives Kasbar similar behavior to the icon handling in older environments " \ "like CDE or OpenLook." ) ); onlyShowMinimizedCheck->setChecked( kasbar->onlyShowMinimized() ); - connect( onlyShowMinimizedCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setOnlyShowMinimized(bool) ) ); + connect( onlyShowMinimizedCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setOnlyShowMinimized(bool) ) ); (void) new TQWidget( behavePage, "spacer" ); (void) new TQWidget( behavePage, "spacer" ); @@ -331,14 +331,14 @@ void KasPrefsDialog::addColorsPage() TQLabel *labelPenLabel = new TQLabel( i18n("Label foreground:"), group ); labelPenButton = new KColorButton( res->labelPenColor(), group ); - connect( labelPenButton, TQT_SIGNAL( changed( const TQColor & ) ), - res, TQT_SLOT( setLabelPenColor( const TQColor & ) ) ); + connect( labelPenButton, TQ_SIGNAL( changed( const TQColor & ) ), + res, TQ_SLOT( setLabelPenColor( const TQColor & ) ) ); labelPenLabel->setBuddy( labelPenButton ); TQLabel *labelBackgroundLabel = new TQLabel( i18n("Label background:"), group ); labelBackgroundButton = new KColorButton( res->labelBgColor(), group ); - connect( labelBackgroundButton, TQT_SIGNAL( changed( const TQColor & ) ), - res, TQT_SLOT( setLabelBgColor( const TQColor & ) ) ); + connect( labelBackgroundButton, TQ_SIGNAL( changed( const TQColor & ) ), + res, TQ_SLOT( setLabelBgColor( const TQColor & ) ) ); labelBackgroundLabel->setBuddy( labelBackgroundButton ); // Inactive colors @@ -346,14 +346,14 @@ void KasPrefsDialog::addColorsPage() TQLabel *inactivePenLabel = new TQLabel( i18n("Inactive foreground:"), group ); inactivePenButton = new KColorButton( res->inactivePenColor(), group ); - connect( inactivePenButton, TQT_SIGNAL( changed( const TQColor & ) ), - res, TQT_SLOT( setInactivePenColor( const TQColor & ) ) ); + connect( inactivePenButton, TQ_SIGNAL( changed( const TQColor & ) ), + res, TQ_SLOT( setInactivePenColor( const TQColor & ) ) ); inactivePenLabel->setBuddy( inactivePenButton ); TQLabel *inactiveBgLabel = new TQLabel( i18n("Inactive background:"), group ); inactiveBgButton = new KColorButton( res->inactiveBgColor(), group ); - connect( inactiveBgButton, TQT_SIGNAL( changed( const TQColor & ) ), - res, TQT_SLOT( setInactiveBgColor( const TQColor & ) ) ); + connect( inactiveBgButton, TQ_SIGNAL( changed( const TQColor & ) ), + res, TQ_SLOT( setInactiveBgColor( const TQColor & ) ) ); inactiveBgLabel->setBuddy( inactiveBgButton ); // Active colors @@ -361,28 +361,28 @@ void KasPrefsDialog::addColorsPage() TQLabel *activePenLabel = new TQLabel( i18n("Active foreground:"), group ); activePenButton = new KColorButton( res->activePenColor(), group ); - connect( activePenButton, TQT_SIGNAL( changed( const TQColor & ) ), - res, TQT_SLOT( setActivePenColor( const TQColor & ) ) ); + connect( activePenButton, TQ_SIGNAL( changed( const TQColor & ) ), + res, TQ_SLOT( setActivePenColor( const TQColor & ) ) ); activePenLabel->setBuddy( activePenButton ); TQLabel *activeBgLabel = new TQLabel( i18n("Active background:"), group ); activeBgButton = new KColorButton( res->activeBgColor(), group ); - connect( activeBgButton, TQT_SIGNAL( changed( const TQColor & ) ), - res, TQT_SLOT( setActiveBgColor( const TQColor & ) ) ); + connect( activeBgButton, TQ_SIGNAL( changed( const TQColor & ) ), + res, TQ_SLOT( setActiveBgColor( const TQColor & ) ) ); activeBgLabel->setBuddy( activeBgButton ); group = new TQGrid( 2, colorsPage ); TQLabel *progressLabel = new TQLabel( i18n("&Progress color:"), group ); progressButton = new KColorButton( res->progressColor(), group ); - connect( progressButton, TQT_SIGNAL( changed( const TQColor & ) ), - res, TQT_SLOT( setProgressColor( const TQColor & ) ) ); + connect( progressButton, TQ_SIGNAL( changed( const TQColor & ) ), + res, TQ_SLOT( setProgressColor( const TQColor & ) ) ); progressLabel->setBuddy( progressButton ); TQLabel *attentionLabel = new TQLabel( i18n("&Attention color:"), group ); attentionButton = new KColorButton( res->attentionColor(), group ); - connect( attentionButton, TQT_SIGNAL( changed( const TQColor & ) ), - res, TQT_SLOT( setAttentionColor( const TQColor & ) ) ); + connect( attentionButton, TQ_SIGNAL( changed( const TQColor & ) ), + res, TQ_SLOT( setAttentionColor( const TQColor & ) ) ); attentionLabel->setBuddy( attentionButton ); (void) new TQWidget( colorsPage, "spacer" ); @@ -406,7 +406,7 @@ void KasPrefsDialog::addAdvancedPage() i18n( "Enables the display of tasks that are starting but have not yet " "created a window." ) ); notifierCheck->setChecked( kasbar->notifierEnabled() ); - connect( notifierCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setNotifierEnabled(bool) ) ); + connect( notifierCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setNotifierEnabled(bool) ) ); // Status advanced modifiedCheck = new TQCheckBox( i18n("Enable &modified indicator"), advancedPage ); @@ -414,26 +414,26 @@ void KasPrefsDialog::addAdvancedPage() i18n( "Enables the display of a floppy disk state icon for windows containing " "a modified document." ) ); modifiedCheck->setChecked( kasbar->showModified() ); - connect( modifiedCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setShowModified(bool) ) ); + connect( modifiedCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setShowModified(bool) ) ); progressCheck = new TQCheckBox( i18n("Enable &progress indicator"), advancedPage ); TQWhatsThis::add( progressCheck, i18n( "Enables the display of a progress indicator in the label of windows." ) ); progressCheck->setChecked( kasbar->showProgress() ); - connect( progressCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setShowProgress(bool) ) ); + connect( progressCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setShowProgress(bool) ) ); attentionCheck = new TQCheckBox( i18n("Enable &attention indicator"), advancedPage ); TQWhatsThis::add( attentionCheck, i18n( "Enables the display of an icon that indicates a window that needs attention." ) ); attentionCheck->setChecked( kasbar->showAttention() ); - connect( attentionCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setShowAttention(bool) ) ); + connect( attentionCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setShowAttention(bool) ) ); inactiveFramesCheck = new TQCheckBox( i18n("Enable frames for inactive items"), advancedPage ); TQWhatsThis::add( inactiveFramesCheck, i18n( "Enables frames around inactive items, if you want the bar to disappear into " \ "the background you should probably uncheck this option." ) ); inactiveFramesCheck->setChecked( kasbar->paintInactiveFrames() ); - connect( inactiveFramesCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setPaintInactiveFrames(bool) ) ); + connect( inactiveFramesCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setPaintInactiveFrames(bool) ) ); (void) new TQWidget( advancedPage, "spacer" ); (void) new TQWidget( advancedPage, "spacer" ); diff --git a/kicker/extensions/kasbar/kasprefsdlg.h b/kicker/extensions/kasbar/kasprefsdlg.h index c3e8be131..b35e96bed 100644 --- a/kicker/extensions/kasbar/kasprefsdlg.h +++ b/kicker/extensions/kasbar/kasprefsdlg.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* kasprefsdlg.h ** ** Copyright (C) 2001-2004 Richard Moore <rich@kde.org> @@ -53,8 +51,6 @@ /* ** Bug reports and questions can be sent to kde-devel@kde.org */ -// -*- c++ -*- - #ifndef KASPREFSDLG_H #define KASPREFSDLG_H @@ -76,7 +72,7 @@ class KasResources; */ class KasPrefsDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KasPrefsDialog( KasTasker *kas, TQWidget *parent=0 ); diff --git a/kicker/extensions/kasbar/kasresources.cpp b/kicker/extensions/kasbar/kasresources.cpp index 78b25e8c0..25b28d5f6 100644 --- a/kicker/extensions/kasbar/kasresources.cpp +++ b/kicker/extensions/kasbar/kasresources.cpp @@ -48,7 +48,7 @@ ** SUCH DAMAGE. */ -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kpixmapeffect.h> #include "kasbar.h" @@ -126,10 +126,10 @@ static const char *micro_shade[]={ KasResources::KasResources( KasBar *parent, const char *name ) : TQObject( parent, name ? name : "kasbar_resources" ), kasbar( parent ), - labelPenColor_( Qt::white ), labelBgColor_( Qt::black ), - activePenColor_( Qt::black ), activeBgColor_( Qt::white ), - inactivePenColor_( Qt::black ), inactiveBgColor_( Qt::white ), - progressColor_( Qt::green ), attentionColor_( Qt::red ), + labelPenColor_( TQt::white ), labelBgColor_( TQt::black ), + activePenColor_( TQt::black ), activeBgColor_( TQt::white ), + inactivePenColor_( TQt::black ), inactiveBgColor_( TQt::white ), + progressColor_( TQt::green ), attentionColor_( TQt::red ), startupFrames_() { } diff --git a/kicker/extensions/kasbar/kasresources.h b/kicker/extensions/kasbar/kasresources.h index bada9786b..81f06086c 100644 --- a/kicker/extensions/kasbar/kasresources.h +++ b/kicker/extensions/kasbar/kasresources.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* kasbar.h ** ** Copyright (C) 2001-2004 Richard Moore <rich@kde.org> @@ -75,7 +73,7 @@ class KasBar; */ class KasResources : public TQObject { - Q_OBJECT + TQ_OBJECT public: KasResources( KasBar *parent, const char *name=0 ); diff --git a/kicker/extensions/kasbar/kasstartupitem.cpp b/kicker/extensions/kasbar/kasstartupitem.cpp index 2f008d0c5..84e17dd21 100644 --- a/kicker/extensions/kasbar/kasstartupitem.cpp +++ b/kicker/extensions/kasbar/kasstartupitem.cpp @@ -80,7 +80,7 @@ KasStartupItem::KasStartupItem( KasBar *parent, Startup::Ptr startup ) setAnimation( resources()->startupAnimation() ); aniTimer = new TQTimer( this, "aniTimer" ); - connect( aniTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( aniTimerFired() ) ); + connect( aniTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( aniTimerFired() ) ); aniTimer->start( 100 ); } diff --git a/kicker/extensions/kasbar/kasstartupitem.h b/kicker/extensions/kasbar/kasstartupitem.h index 16adcc68d..24cf4fe60 100644 --- a/kicker/extensions/kasbar/kasstartupitem.h +++ b/kicker/extensions/kasbar/kasstartupitem.h @@ -51,9 +51,6 @@ /* ** Bug reports and questions can be sent to kde-devel@kde.org */ -// -*- c++ -*- - - #ifndef KASSTARTUPITEM_H #define KASSTARTUPITEM_H @@ -70,7 +67,7 @@ class TQTimer; */ class KasStartupItem : public KasItem { - Q_OBJECT + TQ_OBJECT public: KasStartupItem( KasBar *parent, Startup::Ptr startup ); diff --git a/kicker/extensions/kasbar/kastasker.cpp b/kicker/extensions/kasbar/kastasker.cpp index d10805a78..3d28a723d 100644 --- a/kicker/extensions/kasbar/kastasker.cpp +++ b/kicker/extensions/kasbar/kastasker.cpp @@ -102,17 +102,17 @@ KasTasker::KasTasker( Orientation o, TQWidget* parent, const char* name, WFlags loadItem(0) { setAcceptDrops( true ); - connect(TaskManager::the(), TQT_SIGNAL(taskAdded(Task::Ptr)), TQT_SLOT(addTask(Task::Ptr))); - connect(TaskManager::the(), TQT_SIGNAL(taskRemoved(Task::Ptr)), TQT_SLOT(removeTask(Task::Ptr))); - connect(TaskManager::the(), TQT_SIGNAL(startupAdded(Startup::Ptr)), TQT_SLOT(addStartup(Startup::Ptr))); - connect(TaskManager::the(), TQT_SIGNAL(startupRemoved(Startup::Ptr)), TQT_SLOT(removeStartup(Startup::Ptr))); - connect(TaskManager::the(), TQT_SIGNAL(desktopChanged(int)), TQT_SLOT(refreshAllLater())); -// connect( manager, TQT_SIGNAL( windowChanged( Task::Ptr ) ), TQT_SLOT( refreshAllLater() ) ); + connect(TaskManager::the(), TQ_SIGNAL(taskAdded(Task::Ptr)), TQ_SLOT(addTask(Task::Ptr))); + connect(TaskManager::the(), TQ_SIGNAL(taskRemoved(Task::Ptr)), TQ_SLOT(removeTask(Task::Ptr))); + connect(TaskManager::the(), TQ_SIGNAL(startupAdded(Startup::Ptr)), TQ_SLOT(addStartup(Startup::Ptr))); + connect(TaskManager::the(), TQ_SIGNAL(startupRemoved(Startup::Ptr)), TQ_SLOT(removeStartup(Startup::Ptr))); + connect(TaskManager::the(), TQ_SIGNAL(desktopChanged(int)), TQ_SLOT(refreshAllLater())); +// connect( manager, TQ_SIGNAL( windowChanged( Task::Ptr ) ), TQ_SLOT( refreshAllLater() ) ); - connect( this, TQT_SIGNAL( itemSizeChanged( int ) ), TQT_SLOT( refreshAll() ) ); + connect( this, TQ_SIGNAL( itemSizeChanged( int ) ), TQ_SLOT( refreshAll() ) ); - connect( this, TQT_SIGNAL( detachedPositionChanged(const TQPoint &) ), TQT_SLOT( writeLayout() ) ); - connect( this, TQT_SIGNAL( directionChanged() ), TQT_SLOT( writeLayout() ) ); + connect( this, TQ_SIGNAL( detachedPositionChanged(const TQPoint &) ), TQ_SLOT( writeLayout() ) ); + connect( this, TQ_SIGNAL( directionChanged() ), TQ_SLOT( writeLayout() ) ); } KasTasker::KasTasker( Orientation o, KasTasker *master, TQWidget* parent, const char* name, WFlags f ) @@ -152,62 +152,62 @@ TDEPopupMenu *KasTasker::contextMenu() menu = new TDEPopupMenu; showAllWindowsAction = new TDEToggleAction( i18n("Show &All Windows"), TDEShortcut(), - TQT_TQOBJECT(this), "toggle_show_all_windows" ); + this, "toggle_show_all_windows" ); showAllWindowsAction->setChecked( showAllWindows() ); showAllWindowsAction->plug( menu ); - connect( showAllWindowsAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setShowAllWindows(bool)) ); - connect( TQT_TQOBJECT(this), TQT_SIGNAL(showAllWindowsChanged(bool)), showAllWindowsAction, TQT_SLOT(setChecked(bool)) ); + connect( showAllWindowsAction, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setShowAllWindows(bool)) ); + connect( this, TQ_SIGNAL(showAllWindowsChanged(bool)), showAllWindowsAction, TQ_SLOT(setChecked(bool)) ); groupWindowsAction = new TDEToggleAction( i18n("&Group Windows"), TDEShortcut(), - TQT_TQOBJECT(this), "toggle_group_windows" ); + this, "toggle_group_windows" ); groupWindowsAction->setChecked( groupWindows() ); groupWindowsAction->plug( menu ); - connect( groupWindowsAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setGroupWindows(bool)) ); - connect( TQT_TQOBJECT(this), TQT_SIGNAL(groupWindowsChanged(bool)), groupWindowsAction, TQT_SLOT(setChecked(bool)) ); + connect( groupWindowsAction, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setGroupWindows(bool)) ); + connect( this, TQ_SIGNAL(groupWindowsChanged(bool)), groupWindowsAction, TQ_SLOT(setChecked(bool)) ); - showClockAction = new TDEToggleAction( i18n("Show &Clock"), TDEShortcut(), TQT_TQOBJECT(this), "toggle_show_clock" ); + showClockAction = new TDEToggleAction( i18n("Show &Clock"), TDEShortcut(), this, "toggle_show_clock" ); showClockAction->setChecked( showClock() ); showClockAction->plug( menu ); - connect( showClockAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setShowClock(bool)) ); - connect( TQT_TQOBJECT(this), TQT_SIGNAL(showClockChanged(bool)), showClockAction, TQT_SLOT(setChecked(bool)) ); + connect( showClockAction, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setShowClock(bool)) ); + connect( this, TQ_SIGNAL(showClockChanged(bool)), showClockAction, TQ_SLOT(setChecked(bool)) ); - showLoadAction = new TDEToggleAction( i18n("Show &Load Meter"), TDEShortcut(), TQT_TQOBJECT(this), "toggle_show_load" ); + showLoadAction = new TDEToggleAction( i18n("Show &Load Meter"), TDEShortcut(), this, "toggle_show_load" ); showLoadAction->setChecked( showLoad() ); showLoadAction->plug( menu ); - connect( showLoadAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setShowLoad(bool)) ); - connect( TQT_TQOBJECT(this), TQT_SIGNAL(showLoadChanged(bool)), showLoadAction, TQT_SLOT(setChecked(bool)) ); + connect( showLoadAction, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setShowLoad(bool)) ); + connect( this, TQ_SIGNAL(showLoadChanged(bool)), showLoadAction, TQ_SLOT(setChecked(bool)) ); menu->insertSeparator(); if ( !standalone_ ) { - toggleDetachedAction = new TDEToggleAction( i18n("&Floating"), TDEShortcut(), TQT_TQOBJECT(this), "toggle_detached" ); + toggleDetachedAction = new TDEToggleAction( i18n("&Floating"), TDEShortcut(), this, "toggle_detached" ); toggleDetachedAction->setChecked( isDetached() ); toggleDetachedAction->plug( menu ); - connect( toggleDetachedAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setDetached(bool)) ); - connect( TQT_TQOBJECT(this), TQT_SIGNAL(detachedChanged(bool)), toggleDetachedAction, TQT_SLOT(setChecked(bool)) ); + connect( toggleDetachedAction, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setDetached(bool)) ); + connect( this, TQ_SIGNAL(detachedChanged(bool)), toggleDetachedAction, TQ_SLOT(setChecked(bool)) ); } rotateBarAction = new TDEAction( i18n("R&otate Bar"), TQString("rotate"), TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT( toggleOrientation() ), - TQT_TQOBJECT(this), "rotate_bar" ); + this, TQ_SLOT( toggleOrientation() ), + this, "rotate_bar" ); rotateBarAction->plug( menu ); - connect( TQT_TQOBJECT(this), TQT_SIGNAL(detachedChanged(bool)), rotateBarAction, TQT_SLOT(setEnabled(bool)) ); - connect( rotateBarAction, TQT_SIGNAL(activated()), TQT_SLOT(writeConfigLater()) ); + connect( this, TQ_SIGNAL(detachedChanged(bool)), rotateBarAction, TQ_SLOT(setEnabled(bool)) ); + connect( rotateBarAction, TQ_SIGNAL(activated()), TQ_SLOT(writeConfigLater()) ); - menu->insertItem( SmallIcon("reload"), i18n("&Refresh"), TQT_TQOBJECT(this), TQT_SLOT( refreshAll() ) ); + menu->insertItem( SmallIcon("reload"), i18n("&Refresh"), this, TQ_SLOT( refreshAll() ) ); menu->insertSeparator(); - menu->insertItem( SmallIcon("configure"), i18n("&Configure Kasbar..."), TQT_TQOBJECT(this), TQT_SLOT( showPreferences() ) ); + menu->insertItem( SmallIcon("configure"), i18n("&Configure Kasbar..."), this, TQ_SLOT( showPreferences() ) ); // Help menu TDEPopupMenu *help = new TDEPopupMenu; - help->insertItem( SmallIcon("about"), i18n("&About Kasbar"), TQT_TQOBJECT(this), TQT_SLOT( showAbout() ) ); + help->insertItem( SmallIcon("about"), i18n("&About Kasbar"), this, TQ_SLOT( showAbout() ) ); menu->insertItem( SmallIcon("help"), i18n("&Help"), help ); if ( standalone_ ) { menu->insertSeparator(); - menu->insertItem( SmallIcon("system-log-out"), i18n("&Quit"), tqApp, TQT_SLOT( quit() ) ); + menu->insertItem( SmallIcon("system-log-out"), i18n("&Quit"), tqApp, TQ_SLOT( quit() ) ); } } @@ -294,7 +294,7 @@ KasGroupItem *KasTasker::convertToGroup( Task::Ptr t ) removeTask( t ); insert( i, gi ); - connect(TaskManager::the(), TQT_SIGNAL(taskRemoved(Task::Ptr)), gi, TQT_SLOT(removeTask(Task::Ptr))); + connect(TaskManager::the(), TQ_SIGNAL(taskRemoved(Task::Ptr)), gi, TQ_SLOT(removeTask(Task::Ptr))); return gi; } @@ -371,7 +371,7 @@ void KasTasker::refreshAll() void KasTasker::refreshAllLater() { - TQTimer::singleShot( SWITCH_DESKTOPS_REGROUP_DELAY, this, TQT_SLOT( refreshAll() ) ); + TQTimer::singleShot( SWITCH_DESKTOPS_REGROUP_DELAY, this, TQ_SLOT( refreshAll() ) ); } void KasTasker::refreshIconGeometry() @@ -432,12 +432,12 @@ void KasTasker::setShowAllWindows( bool enable ) showAllWindows_ = enable; refreshAll(); if ( !showAllWindows_ ) { - connect(TaskManager::the(), TQT_SIGNAL(desktopChanged(int)), TQT_SLOT(refreshAll())); -// connect( manager, TQT_SIGNAL( windowChanged( Task::Ptr ) ), TQT_SLOT( refreshAll() ) ); + connect(TaskManager::the(), TQ_SIGNAL(desktopChanged(int)), TQ_SLOT(refreshAll())); +// connect( manager, TQ_SIGNAL( windowChanged( Task::Ptr ) ), TQ_SLOT( refreshAll() ) ); } else { - disconnect(TaskManager::the(), TQT_SIGNAL(desktopChanged(int)), this, TQT_SLOT(refreshAll())); -// disconnect( manager, TQT_SIGNAL( windowChanged( Task::Ptr ) ), this, TQT_SLOT( refreshAll() ) ); + disconnect(TaskManager::the(), TQ_SIGNAL(desktopChanged(int)), this, TQ_SLOT(refreshAll())); +// disconnect( manager, TQ_SIGNAL( windowChanged( Task::Ptr ) ), this, TQ_SLOT( refreshAll() ) ); } emit showAllWindowsChanged( enable ); @@ -551,7 +551,7 @@ void KasTasker::readConfig() void KasTasker::writeConfigLater() { - TQTimer::singleShot( 10, this, TQT_SLOT( writeConfig() ) ); + TQTimer::singleShot( 10, this, TQ_SLOT( writeConfig() ) ); } void KasTasker::writeConfig() @@ -635,7 +635,7 @@ void KasTasker::readConfig( TDEConfig *conf ) conf->setGroup("Layout"); setDirection( (Direction) conf->readNumEntry( "Direction", TQBoxLayout::LeftToRight ) ); - setOrientation( (Qt::Orientation) conf->readNumEntry( "Orientation", Qt::Horizontal ) ); + setOrientation( (TQt::Orientation) conf->readNumEntry( "Orientation", TQt::Horizontal ) ); setMaxBoxes( conf->readUnsignedNumEntry( "MaxBoxes", 0 ) ); TQPoint pos(100, 100); diff --git a/kicker/extensions/kasbar/kastasker.h b/kicker/extensions/kasbar/kastasker.h index 93cddd1ce..4cb96999f 100644 --- a/kicker/extensions/kasbar/kastasker.h +++ b/kicker/extensions/kasbar/kastasker.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* kastasker.h ** ** Copyright (C) 2001-2004 Richard Moore <rich@kde.org> @@ -59,7 +57,7 @@ #include "kasbar.h" -#include <kdemacros.h> +#include <tdemacros.h> #include <taskmanager.h> class TDEConfig; @@ -82,23 +80,23 @@ class KasGrouper; * * @author Richard Moore, rich@kde.org */ -class KDE_EXPORT KasTasker : public KasBar +class TDE_EXPORT KasTasker : public KasBar { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( bool isTopLevel READ isTopLevel ) TQ_PROPERTY( bool showClock READ showClock ) TQ_PROPERTY( bool showLoad READ showLoad ) public: /** Create a KasTasker widget. */ - KasTasker( Qt::Orientation o, TQWidget* parent = 0, const char* name = 0, WFlags f = 0 ); + KasTasker( TQt::Orientation o, TQWidget* parent = 0, const char* name = 0, WFlags f = 0 ); /** * Create a KasTasker widget that is slaved to another KasTasker. The * created widget will inherit the settings of the parent, but will * not connect to the signals of the TaskManager. */ - KasTasker( Qt::Orientation o, KasTasker *master, + KasTasker( TQt::Orientation o, KasTasker *master, TQWidget *parent=0, const char *name=0, WFlags f=0 ); /** Cleans up. */ @@ -107,7 +105,7 @@ public: /** Factory method that returns the default menu for items in the bar. */ virtual TDEPopupMenu *contextMenu(); - virtual KasTasker *createChildBar( Qt::Orientation o, TQWidget *parent, const char *name=0 ); + virtual KasTasker *createChildBar( TQt::Orientation o, TQWidget *parent, const char *name=0 ); /** * Returns true if this is the top KasTasker. Note that it is possible for diff --git a/kicker/extensions/kasbar/kastaskitem.cpp b/kicker/extensions/kasbar/kastaskitem.cpp index 0f57524cc..398be4d53 100644 --- a/kicker/extensions/kasbar/kastaskitem.cpp +++ b/kicker/extensions/kasbar/kastaskitem.cpp @@ -73,7 +73,7 @@ #include <tdelocale.h> #include <kpassivepopup.h> #include <tdepopupmenu.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <dcopclient.h> #include <tdeapplication.h> @@ -99,17 +99,17 @@ KasTaskItem::KasTaskItem( KasTasker *parent, Task::Ptr task ) setAttention( task->demandsAttention() ); updateTask(false); - connect( task, TQT_SIGNAL( changed(bool) ), this, TQT_SLOT( updateTask(bool) ) ); - connect( task, TQT_SIGNAL( activated() ), this, TQT_SLOT( startAutoThumbnail() ) ); - connect( task, TQT_SIGNAL( deactivated() ), this, TQT_SLOT( stopAutoThumbnail() ) ); - connect( task, TQT_SIGNAL( iconChanged() ), this, TQT_SLOT( iconChanged() ) ); - connect( task, TQT_SIGNAL( thumbnailChanged() ), this, TQT_SLOT( iconChanged() ) ); + connect( task, TQ_SIGNAL( changed(bool) ), this, TQ_SLOT( updateTask(bool) ) ); + connect( task, TQ_SIGNAL( activated() ), this, TQ_SLOT( startAutoThumbnail() ) ); + connect( task, TQ_SIGNAL( deactivated() ), this, TQ_SLOT( stopAutoThumbnail() ) ); + connect( task, TQ_SIGNAL( iconChanged() ), this, TQ_SLOT( iconChanged() ) ); + connect( task, TQ_SIGNAL( thumbnailChanged() ), this, TQ_SLOT( iconChanged() ) ); - connect( this, TQT_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQT_SLOT(toggleActivateAction()) ); - connect( this, TQT_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQT_SLOT(showWindowMenuAt(TQMouseEvent *) ) ); + connect( this, TQ_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQ_SLOT(toggleActivateAction()) ); + connect( this, TQ_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQ_SLOT(showWindowMenuAt(TQMouseEvent *) ) ); attentionTimer = new TQTimer( this, "attentionTimer" ); - connect( attentionTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( checkAttention() ) ); + connect( attentionTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( checkAttention() ) ); attentionTimer->start( CHECK_ATTENTION_DELAY ); } @@ -295,12 +295,12 @@ void KasTaskItem::startAutoThumbnail() if ( kasbar()->thumbnailUpdateDelay() > 0 ) { thumbTimer = new TQTimer( this, "thumbTimer" ); - connect( thumbTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( refreshThumbnail() ) ); + connect( thumbTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( refreshThumbnail() ) ); thumbTimer->start( kasbar()->thumbnailUpdateDelay() * 1000 ); } - TQTimer::singleShot( 200, this, TQT_SLOT( refreshThumbnail() ) ); + TQTimer::singleShot( 200, this, TQ_SLOT( refreshThumbnail() ) ); } void KasTaskItem::stopAutoThumbnail() @@ -322,7 +322,7 @@ void KasTaskItem::refreshThumbnail() // TODO: Check if the popup obscures the window KasItem *i = kasbar()->itemUnderMouse(); if ( i && i->isShowingPopup() ) { - TQTimer::singleShot( 200, this, TQT_SLOT( refreshThumbnail() ) ); + TQTimer::singleShot( 200, this, TQ_SLOT( refreshThumbnail() ) ); return; } @@ -333,11 +333,11 @@ void KasTaskItem::refreshThumbnail() void KasTaskItem::showWindowMenuAt( TQPoint p ) { TaskRMBMenu *tm = new TaskRMBMenu(task_, true, kasbar()); - tm->insertItem( i18n("To &Tray" ), this, TQT_SLOT( sendToTray() ) ); + tm->insertItem( i18n("To &Tray" ), this, TQ_SLOT( sendToTray() ) ); tm->insertSeparator(); tm->insertItem( i18n("&Kasbar"), kasbar()->contextMenu() ); tm->insertSeparator(); - tm->insertItem( i18n("&Properties" ), this, TQT_SLOT( showPropertiesDialog() ) ); + tm->insertItem( i18n("&Properties" ), this, TQ_SLOT( showPropertiesDialog() ) ); mouseLeave(); kasbar()->updateMouseOver(); @@ -390,7 +390,7 @@ void KasTaskItem::showPropertiesDialog() tabs->addTab( createTaskProps( task_, tabs ), i18n("Task") ); tabs->addTab( createTaskProps( this, tabs ), i18n("Item") ); - tabs->addTab( createTaskProps( TQT_TQOBJECT(kasbar()), tabs, false ), i18n("Bar") ); + tabs->addTab( createTaskProps( kasbar(), tabs, false ), i18n("Bar") ); #if 0 tabs->addTab( createNETProps( tabs ), i18n("NET") ); diff --git a/kicker/extensions/kasbar/kastaskitem.h b/kicker/extensions/kasbar/kastaskitem.h index b2b166ef5..99205ae27 100644 --- a/kicker/extensions/kasbar/kastaskitem.h +++ b/kicker/extensions/kasbar/kastaskitem.h @@ -51,9 +51,6 @@ /* ** Bug reports and questions can be sent to kde-devel@kde.org */ -// -*- c++ -*- - - #ifndef KASTASKITEM_H #define KASTASKITEM_H @@ -70,7 +67,7 @@ class KPixmap; */ class KasTaskItem : public KasItem { - Q_OBJECT + TQ_OBJECT public: KasTaskItem( KasTasker *parent, Task::Ptr task ); diff --git a/kicker/extensions/kasbar/kastaskpopup.cpp b/kicker/extensions/kasbar/kastaskpopup.cpp index 7b5fe4ed5..8905af37a 100644 --- a/kicker/extensions/kasbar/kastaskpopup.cpp +++ b/kicker/extensions/kasbar/kastaskpopup.cpp @@ -91,10 +91,10 @@ KasTaskPopup::KasTaskPopup( KasTaskItem *item, const char *name ) } KPixmapEffect::gradient( titleBg, - Qt::black, colorGroup().mid(), + TQt::black, colorGroup().mid(), KPixmapEffect::DiagonalGradient ); - connect( item->task(), TQT_SIGNAL( thumbnailChanged() ), TQT_SLOT( refresh() ) ); + connect( item->task(), TQ_SIGNAL( thumbnailChanged() ), TQ_SLOT( refresh() ) ); } KasTaskPopup::~KasTaskPopup() @@ -119,7 +119,7 @@ void KasTaskPopup::paintEvent( TQPaintEvent * ) TQString text = item->task()->visibleIconicName(); - p.setPen( Qt::white ); + p.setPen( TQt::white ); if ( fontMetrics().width( text ) > width() - 4 ) p.drawText( 1, 1, width() - 4, TITLE_HEIGHT - 1, AlignLeft | AlignVCenter, text ); @@ -133,7 +133,7 @@ void KasTaskPopup::paintEvent( TQPaintEvent * ) // // Draw border // - p.setPen( Qt::black ); + p.setPen( TQt::black ); p.drawRect( 0, 0, width(), height() ); } diff --git a/kicker/extensions/kasbar/kastaskpopup.h b/kicker/extensions/kasbar/kastaskpopup.h index dcdc33107..c209f8774 100644 --- a/kicker/extensions/kasbar/kastaskpopup.h +++ b/kicker/extensions/kasbar/kastaskpopup.h @@ -51,8 +51,6 @@ /* ** Bug reports and questions can be sent to kde-devel@kde.org */ -// -*- c++ -*- - #ifndef KASTASKPOPUP_H #define KASTASKPOPUP_H @@ -68,7 +66,7 @@ class KasTaskItem; */ class KasTaskPopup : public KasPopup { - Q_OBJECT + TQ_OBJECT public: KasTaskPopup( KasTaskItem *item, const char *name=0 ); diff --git a/kicker/extensions/sidebar/CMakeLists.txt b/kicker/extensions/sidebar/CMakeLists.txt index 0ba54daee..4addc8029 100644 --- a/kicker/extensions/sidebar/CMakeLists.txt +++ b/kicker/extensions/sidebar/CMakeLists.txt @@ -27,7 +27,11 @@ link_directories( ##### other data ################################ -install( FILES sidebarextension.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/extensions ) +tde_create_translated_desktop( + SOURCE sidebarextension.desktop + DESTINATION ${DATA_INSTALL_DIR}/kicker/extensions + PO_DIR kicker-desktops +) ##### sidebar_panelextension (module) ########### diff --git a/kicker/extensions/sidebar/sidebarextension.cpp b/kicker/extensions/sidebar/sidebarextension.cpp index 1a4f6924b..ae30b6174 100644 --- a/kicker/extensions/sidebar/sidebarextension.cpp +++ b/kicker/extensions/sidebar/sidebarextension.cpp @@ -31,7 +31,7 @@ extern "C" { - KDE_EXPORT KPanelExtension *init( TQWidget *parent, const TQString& configFile ) + TDE_EXPORT KPanelExtension *init( TQWidget *parent, const TQString& configFile ) { TDEGlobal::locale()->insertCatalogue("kickersidebarextension"); TDEGlobal::locale()->insertCatalogue("konqueror"); @@ -57,15 +57,15 @@ SidebarExtension::SidebarExtension( const TQString& configFile, "konq_sidebar", m_sbWrapper, "SideBar_View", - TQT_TQOBJECT(this), + this, "Sidebar","universal"); KParts::BrowserExtension *be=KParts::BrowserExtension::childObject(p); if (be) { - connect(be,TQT_SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs &)), - this,TQT_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &))); - connect(be,TQT_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)), - this,TQT_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &))); + connect(be,TQ_SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs &)), + this,TQ_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &))); + connect(be,TQ_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)), + this,TQ_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &))); } @@ -73,8 +73,8 @@ SidebarExtension::SidebarExtension( const TQString& configFile, m_resizeHandle->setFrameShape(TQFrame::Panel); m_resizeHandle->setFrameShadow(TQFrame::Raised); m_resizeHandle->setFixedWidth(6); - m_resizeHandle->setCursor(TQCursor(Qt::SizeHorCursor)); - connect(p->widget(),TQT_SIGNAL(panelHasBeenExpanded(bool)),this,TQT_SLOT(needLayoutUpdate(bool))); + m_resizeHandle->setCursor(TQCursor(TQt::SizeHorCursor)); + connect(p->widget(),TQ_SIGNAL(panelHasBeenExpanded(bool)),this,TQ_SLOT(needLayoutUpdate(bool))); needLayoutUpdate(false); m_resizeHandle->installEventFilter(this); m_resizeHandle->setMouseTracking(true); diff --git a/kicker/extensions/sidebar/sidebarextension.desktop b/kicker/extensions/sidebar/sidebarextension.desktop index 06d6fd27b..275f76818 100644 --- a/kicker/extensions/sidebar/sidebarextension.desktop +++ b/kicker/extensions/sidebar/sidebarextension.desktop @@ -1,140 +1,9 @@ [Desktop Entry] Name=Universal Sidebar -Name[af]=Universele Kantbalk -Name[ar]=الشريط الجانبي العالمي -Name[az]=Ümumi Yan Çubuq -Name[be]=Універсальная бакавая панэль -Name[bg]=Универсален панел -Name[bn]=সার্বজনীন সাইডবার -Name[bs]=Univerzalni sidebar -Name[ca]=Barra universal -Name[cs]=Univerzální postranní lišta -Name[csb]=Ùniwersalnô bòcznô lëstew -Name[cy]=BarOchr Cyffredinol -Name[da]=Universel sidebjælke -Name[de]=Universeller Navigationsbereich -Name[el]=Καθολική πλευρική μπάρα -Name[eo]=Ĝenerala flankzono -Name[es]=Barra lateral universal -Name[et]=Universaalne külgriba -Name[eu]=Alboko barra unibertsala -Name[fa]=میله جانبی عمومی -Name[fi]=Yleissivupalkki -Name[fr]=Barre latérale universelle -Name[fy]=Universele sydbalke -Name[ga]=Barra Taoibh Uilíoch -Name[gl]=Barra Lateral Universal -Name[he]=סרגל־צד אוניברסלי -Name[hi]=सर्वव्यापी बाज़ू-पट्टी -Name[hr]=Univerzalna bočna traka -Name[hu]=Univerzális oldalsáv -Name[is]=Algild hliðarslá -Name[it]=Barra laterale universale -Name[ja]=汎用サイドバー -Name[ka]=უნივერსალური გვერდითი პანელი -Name[kk]=Әмбебап бүйірдегі панель -Name[km]=របារចំហៀងទូទៅ -Name[lt]=Universali šoninė juosta -Name[lv]=Unversālā sānjosla -Name[mk]=Универзална странична лента -Name[mn]=Универсал хажуу самбар -Name[ms]=Bar Sisi Universal -Name[mt]=Sidebar Universali -Name[nb]=Universell sidestolpe -Name[nds]=Siet-Navigatschoonbalken -Name[ne]=विश्वव्यापी छेउपट्टी -Name[nl]=Universele zijbalk -Name[nn]=Universell sidestolpe -Name[pa]=ਯੂਨੀਵਰਸਲ ਬਾਹੀ -Name[pl]=Uniwersalny pasek boczny -Name[pt]=Barra Lateral Universal -Name[pt_BR]=Barra Lateral Universal -Name[ro]=Bară laterală universală -Name[ru]=Универсальная боковая панель -Name[rw]=Umurongokuruhande Mpuzamahanga -Name[se]=Universella holga -Name[sk]=Univerzálny bočný panel -Name[sl]=Univerzalna stranska vrstica -Name[sr]=Универзална бочна трака -Name[sr@Latn]=Univerzalna bočna traka -Name[sv]=Generell sidopanel -Name[ta]=பொது வரலாற்றுப் பக்கப்பட்டி -Name[th]=แถบข้าง -Name[tr]=Genel Yan Çubuk -Name[tt]=Küpçaralı Yantirä -Name[uk]=Універсальна бічна панель -Name[uz]=Universal yon paneli -Name[uz@cyrillic]=Универсал ён панели -Name[vi]=Thanh bên Chung -Name[wa]=Bår di costé universele -Name[zh_CN]=通用侧边栏 -Name[zh_TW]=整體的邊列 Comment=Wrapper around Konqueror's navigation panel -Comment[af]='n Toevou program rondom Konqueror se navigasie paneel -Comment[be]=Панэль для хуткай навігацыі -Comment[bg]=Допълнителен универсален панел, подобен на панела на браузъра -Comment[bn]=কনকরার-এর ন্যাভিগেশন প্যানেল-এর প্রসারণ -Comment[bs]=Omotač za Konquerorov navigacioni panel -Comment[ca]=Embolcall al voltant del plafó de navegació del Konqueror -Comment[csb]=Programa òpakòwującô nawigacëjny panel Konquerora -Comment[cy]=Lapiad o gwmpas panel morlywio Konqueror -Comment[da]=Konvolut om Konquerors navigationspanel -Comment[de]=Erweiterung zum Navigationsbereich von Konqueror -Comment[el]=Ενσωματωτής στο Περιηγητή του Konqueror -Comment[eo]=Ŝelo ĉirkaŭ la Konkeranta stirpanelo -Comment[es]=Envoltura para el panel de navegación de Konqueror -Comment[et]=Konquerori liikumisriba skelett -Comment[eu]=Konquerorren arakatze panelerako bilgarria -Comment[fa]=سطرشکن در اطراف تابلوی ناوش Konqueror -Comment[fi]=Kuori Konquerorin navigaatiopaneelin ympärille -Comment[fr]=Un enveloppement autour du panneau de navigation de Konqueror -Comment[fy]=In kontainer rûn de Konqueror's navigaasjepaniel -Comment[gl]=Reutilización do painel de navegación de Konqueror -Comment[he]=מעטפת מסביב ללוח הניווט של Konqueror -Comment[hi]=कॉन्करर के नेविगेशन फलक के चारों ओर रैपर -Comment[hr]=Omotač oko Konqueror navigacijske ploče -Comment[hu]=Segédelem a Konqueror navigációs paneljéhez -Comment[is]=Lag í kringum stjórnborð Konqueror vefrans -Comment[it]=Wrapper per il pannello di navigazione di Konqueror -Comment[ja]=Konqueror のナビゲーションパネルのラッパー -Comment[ka]=Konqueror -ის პანელის დამმუშავებელი -Comment[kk]=Konqueror's басқару панелінің өңдеушісі -Comment[km]=Wrapper ជុំវិញបន្ទះរុករករបស់ Konqueror -Comment[lt]=Konqueror navigacijos pulto dėklas -Comment[lv]=Iekarotāja navigācijas paneļa vraperis -Comment[mk]=Обвивка околу навигациониот панел на Konqueror -Comment[ms]=Pembalut sekeliling panel navigasi Konqueror -Comment[mt]="Wrapper" madwar il-pannell ta' navigazzjoni ta' Konqueror -Comment[nb]=Overbygning på navigasjonspanelet i Konqueror -Comment[nds]=Konqueror sien Navigatschoonpaneel för den Schriefdisch -Comment[ne]=कन्क्वेररको नेभिगेसन प्यानल वरिपरि आवरण -Comment[nl]=Een container rond Konqueror's navigatiepaneel -Comment[nn]=Overbygning på navigasjonspanelet i Konqueror -Comment[pa]=ਕੋਨਕਿਉਰਰ ਦੇ ਏਧਰ-ਓਧਰ ਪੈਨਲ ਲਈ ਸਮੇਟਣ ਵਾਲੀ -Comment[pl]=Program opakowujący panel nawigacyjny Konquerora -Comment[pt]=Uma interface sobre o painel de navegação do Konqueror -Comment[pt_BR]=Wrapper para o painel de navegação do Konqueror -Comment[ro]=O încapsulare a panoului de navigare Konqueror -Comment[ru]=Обработчик панели навигации Konqueror -Comment[rw]=Mufunika hafi y'umwanya w'ibuganya wa Konqueror -Comment[sk]=Obálka pre navigačný panel Konquerora -Comment[sl]=Objemalnik okoli Konquerorjevega navigacijskega pulta -Comment[sr]=Омотач Konqueror-вог навигационог панела -Comment[sr@Latn]=Omotač Konqueror-vog navigacionog panela -Comment[sv]=Omgivning för Konquerors navigeringspanel -Comment[ta]=கான்கொரர் நவிகேஷன் பலகத்தை சுற்றப்பட்டுள்ளது. -Comment[th]=หุ้มอยู่รอบๆ Navigation panel ของคอนเควอร์เรอร์ -Comment[tr]=Konqueror'un yönlendirme paneli çevresindeki satır atlatıcı -Comment[tt]=Konqueror'nıñ küçü taqtasınıñ sıydırması -Comment[uk]=Обгортка навколо навігаційної панелі Konqueror -Comment[vi]=Bao bọc xung quanh bảng duyệt của Konqueror -Comment[wa]=On bagaedje åtoû do scriftôr di naiviaedje di Konqueror -Comment[zh_CN]=Konqueror 导航面板的转换器 -Comment[zh_TW]=包裝於 konqueror 的導覽面板 Icon=view_sidetree - X-TDE-Library=sidebar_panelextension X-TDE-UniqueApplet=true X-TDE-PanelExt-Resizeable=true diff --git a/kicker/extensions/sidebar/sidebarextension.h b/kicker/extensions/sidebar/sidebarextension.h index 5a117b1ee..bd8210a3c 100644 --- a/kicker/extensions/sidebar/sidebarextension.h +++ b/kicker/extensions/sidebar/sidebarextension.h @@ -26,7 +26,7 @@ class TQVBox; class SidebarExtension : public KPanelExtension { - Q_OBJECT + TQ_OBJECT public: SidebarExtension( const TQString& configFile, diff --git a/kicker/extensions/taskbar/CMakeLists.txt b/kicker/extensions/taskbar/CMakeLists.txt index c97b4416c..d42d83303 100644 --- a/kicker/extensions/taskbar/CMakeLists.txt +++ b/kicker/extensions/taskbar/CMakeLists.txt @@ -25,7 +25,11 @@ link_directories( ##### other data ################################ -install( FILES taskbarextension.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/extensions ) +tde_create_translated_desktop( + SOURCE taskbarextension.desktop + DESTINATION ${DATA_INSTALL_DIR}/kicker/extensions + PO_DIR kicker-desktops +) ##### taskbar_panelextension (module) ########### diff --git a/kicker/extensions/taskbar/taskbarextension.cpp b/kicker/extensions/taskbar/taskbarextension.cpp index 4606b27fb..4e6740f8a 100644 --- a/kicker/extensions/taskbar/taskbarextension.cpp +++ b/kicker/extensions/taskbar/taskbarextension.cpp @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tdeglobal.h> #include <tdelocale.h> #include <krootpixmap.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "global.h" #include "kickerSettings.h" @@ -42,7 +42,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. extern "C" { - KDE_EXPORT KPanelExtension* init( TQWidget *parent, const TQString& configFile ) + TDE_EXPORT KPanelExtension* init( TQWidget *parent, const TQString& configFile ) { TDEGlobal::locale()->insertCatalogue( "taskbarextension" ); return new TaskBarExtension( configFile, KPanelExtension::Stretch, @@ -63,17 +63,17 @@ TaskBarExtension::TaskBarExtension(const TQString& configFile, Type type, positionChange(position()); layout->addWidget(m_container); - connect(m_container, TQT_SIGNAL(containerCountChanged()), - TQT_SIGNAL(updateLayout())); + connect(m_container, TQ_SIGNAL(containerCountChanged()), + TQ_SIGNAL(updateLayout())); - kapp->dcopClient()->setNotifications(true); + tdeApp->dcopClient()->setNotifications(true); connectDCOPSignal("kicker", "kicker", "configurationChanged()", "configure()", false); - connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), - TQT_SLOT(setBackgroundTheme())); + connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), + TQ_SLOT(setBackgroundTheme())); - TQTimer::singleShot(0, this, TQT_SLOT(setBackgroundTheme())); + TQTimer::singleShot(0, this, TQ_SLOT(setBackgroundTheme())); } TaskBarExtension::~TaskBarExtension() @@ -101,7 +101,7 @@ void TaskBarExtension::positionChange( Position p ) m_container->popupDirectionChange(KPanelApplet::Right); break; case Floating: - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { m_container->popupDirectionChange(KPanelApplet::Down); } @@ -150,8 +150,8 @@ void TaskBarExtension::setBackgroundTheme() { m_rootPixmap = new KRootPixmap(this); m_rootPixmap->setCustomPainting(true); - connect(m_rootPixmap, TQT_SIGNAL(backgroundUpdated(const TQPixmap&)), - TQT_SLOT(updateBackground(const TQPixmap&))); + connect(m_rootPixmap, TQ_SIGNAL(backgroundUpdated(const TQPixmap&)), + TQ_SLOT(updateBackground(const TQPixmap&))); } else { @@ -185,7 +185,7 @@ void TaskBarExtension::setBackgroundTheme() { TQImage bgImage = m_bgImage; - if (orientation() == Qt::Vertical) + if (orientation() == TQt::Vertical) { if (KickerSettings::rotateBackground()) { diff --git a/kicker/extensions/taskbar/taskbarextension.desktop b/kicker/extensions/taskbar/taskbarextension.desktop index a92c2c1ca..8c1cb329d 100644 --- a/kicker/extensions/taskbar/taskbarextension.desktop +++ b/kicker/extensions/taskbar/taskbarextension.desktop @@ -1,140 +1,7 @@ [Desktop Entry] Name=External Taskbar -Name[af]=Eksterne Taakbalk -Name[ar]=شريط المهام الخارجي -Name[az]=Xarici Vəzifə Çubuğu -Name[be]=Вонкавая панэль заданняў -Name[bg]=Допълнителна лента -Name[bn]=বহিঃস্থ টাস্কবার -Name[br]=Barrenn dleadoù diavaez -Name[bs]=Eksterni taskbar -Name[ca]=Barra de tasques externa -Name[cs]=Externí pruh úloh -Name[csb]=Bùtnowô lëstew dzejaniów -Name[cy]=Bar tasgau allanol -Name[da]=Ekstern opgavelinje -Name[de]=Externe Fensterleiste -Name[el]=Εξωτερική γραμμή εργασιών -Name[eo]=Ekstera Taskostrio -Name[es]=Barra de tareas externa -Name[et]=Väline tegumiriba -Name[eu]=Kanpoko ataza-barra -Name[fa]=میله تکلیف خارجی -Name[fi]=Ulkoinen ohjelmapalkki -Name[fr]=Barre des tâches externe -Name[fy]=Eksterne taakbalke -Name[ga]=Tascbharra Seachtrach -Name[gl]=Barra de Tarefas Externa -Name[he]=שורת משימות חיצונית -Name[hi]=बाहरी कार्यपट्टी -Name[hr]=Vanjska traka zadataka -Name[hu]=Külső feladatlista -Name[id]=Taskbar eksternal -Name[is]=Utanáliggjandi verkefnaslá -Name[it]=Barra delle applicazioni esterna -Name[ja]=外部タスクバー -Name[ka]=გაფართოვებული ამოცანათა პანელი -Name[kk]=Сыртқы тапсырмалар панелі -Name[km]=របារភារកិច្ចខាងក្រៅ -Name[lo]=ຖາດງານພາຍນອກ -Name[lt]=Išorinė užduočių juosta -Name[lv]=Ārējā Uzdevumjosla -Name[mk]=Надворешна лента со програми -Name[mn]=Гадаад ажлын самбар -Name[ms]=Taskbar Luaran -Name[mt]=Taskbar Estern -Name[nb]=Ekstern oppgavelinje -Name[nds]=Extern Programmbalken -Name[ne]=बाह्य कार्यपट्टी -Name[nl]=Externe taakbalk -Name[nn]=Ekstern oppgåvelinje -Name[nso]=Bar ya Mosongwana wa Kantle -Name[pa]=ਬਾਹਰੀ ਕੰਮ-ਪੱਟੀ -Name[pl]=Zewnętrzny pasek zadań -Name[pt]=Barra de Tarefas Externa -Name[pt_BR]=Barra de Tarefas Externa -Name[ro]=Bară de procese externă -Name[ru]=Внешняя панель задач -Name[rw]=Umurongoibikorwa w'Inyuma -Name[se]=Olgguldas bargoholga -Name[sk]=Externý taskbar -Name[sl]=Zunanja opravilna vrstica -Name[sr]=Спољашња трака задатака -Name[sr@Latn]=Spoljašnja traka zadataka -Name[sv]=Externt aktivitetsfält -Name[ta]=புற பணிப்பட்டி -Name[tg]=Сафҳаи масъалаҳои васеъ -Name[th]=ถาดงานภายนอก -Name[tr]=Harici Görev Çubuğu -Name[tt]=Tışqı Eşlärtirä -Name[uk]=Зовнішня смужка задач -Name[uz]=Vazifalar tashqi paneli -Name[uz@cyrillic]=Вазифалар ташқи панели -Name[ven]=Bara ya mushumo ya nga nnda -Name[vi]=Thanh tác vụ Ngoài -Name[wa]=Bår ås bouyes då dfoû -Name[xh]=Ibar yomsebenzi Wangaphandle -Name[zh_CN]=外部任务栏 -Name[zh_TW]=外部工作列 -Name[zu]=Ibha yemisebenzi yangaphandle + Comment=External taskbar panel extension -Comment[af]=Eksterne taakbalk paneel uitbreiding -Comment[ar]=تمديدة لوحة شريط المهام الخارجي -Comment[be]=Вонкавае пашырэнне панэлі заданняў -Comment[bg]=Допълнителна лента за задачите -Comment[bn]=মূল প্যানেল-এর বাইরে আলাদা টাস্কবার -Comment[bs]=Proširenje panela za eksterni taskbar -Comment[ca]=Extensió del plafó de la barra de tasques externa -Comment[cs]=Rozšíření s externím pruhem úloh -Comment[csb]=Rozszérzenié panelu z bùtnową lëstwą dzejaniów -Comment[cy]=Estyniad panel bar tasgau allanol -Comment[da]=Paneludvidelse - ekstern joblinje -Comment[de]=Eine alternative Fensterleiste -Comment[el]=Επέκταση του πίνακα εξωτερική γραμμή εργασιών -Comment[eo]=Ekstera taskostria panelaldono -Comment[es]=Extensión del panel con barra de tareas externa -Comment[et]=Välise tegumiriba laiendus -Comment[eu]=Panelaren hedapena kanpoko ataza-barrarekin -Comment[fa]=پسوند تابلوی میله تکلیف خارجی -Comment[fi]=Ulkoinen ohjelmapalkin paneelilaajennus -Comment[fr]=Barre des tâches externe -Comment[fy]=Eksterne taakbalke -Comment[gl]=Extensión do painel da barra de tarefas externa -Comment[he]=הרחבת שורת משימות חיצונית -Comment[hr]=Vanjsko proširenje ploče trake zadataka -Comment[hu]=Külső feladatlista-kiterjesztés -Comment[is]=Útvíkkun utanáliggjandi spjalds -Comment[it]=Barra delle applicazioni esterna -Comment[ja]=外部タスクバーパネル拡張 -Comment[ka]=გარე პულტისა და პანელის გაფართოება -Comment[kk]=Қосымша тапсырмалар панелі. -Comment[km]=ផ្នែកបន្ថែមបន្ទះរបារភារកិច្ចខាងក្រៅ ។ -Comment[lt]=Išorinis užduočių juostos praplėtimas -Comment[mk]=Екстензија на панелот - надворешна лента со програми. -Comment[nb]=Oppgavelinje utenfor panelet -Comment[nds]=En Programmbalken buten dat Paneel -Comment[ne]=बाह्य कार्यपट्टी प्यानल विस्तार -Comment[nl]=Externe taakbalk -Comment[nn]=Oppgåvelinje utanfor panelet -Comment[pa]=ਬਾਹਰੀ ਕੰਮਪੱਟੀ ਪੈਨਲ ਵਧਾਰਾ -Comment[pl]=Rozszerzenie panelu z zewnętrznym paskiem zadań -Comment[pt]=Extensão do painel de barra de tarefas externa -Comment[pt_BR]=Extensão do painel para a barra de tarefas externa -Comment[ro]=Extensie pentru bară de procese externă -Comment[ru]=Внешняя панель задач TDE -Comment[se]=Olgguldas bargoholga viiddádus -Comment[sk]=Rozšírenie externého panelu úloh -Comment[sl]=Zunanja razširitev opravilne vrstice -Comment[sr]=Спољашња трака задатака, проширење панела. -Comment[sr@Latn]=Spoljašnja traka zadataka, proširenje panela. -Comment[sv]=Extern utökning till aktivitetsfältet -Comment[th]=ส่วนขยายเพิ่มเติมแอพเพล็ตถาดงานภายนอก -Comment[tr]=Harici görev çubuğu uzantısı. -Comment[uk]=Зовнішнє розширення панелі задач -Comment[vi]=Bảng điều khiển mở rộng có thanh tác vụ bên ngoài -Comment[wa]=On module di scriftôr di bår ås bouyes då dfoû -Comment[zh_CN]=外部任务栏面板扩展 -Comment[zh_TW]=外部工作列面板延伸 Icon=taskbar X-TDE-Library=taskbar_panelextension diff --git a/kicker/extensions/taskbar/taskbarextension.h b/kicker/extensions/taskbar/taskbarextension.h index 2848e80c7..f2bc3ebf0 100644 --- a/kicker/extensions/taskbar/taskbarextension.h +++ b/kicker/extensions/taskbar/taskbarextension.h @@ -34,7 +34,7 @@ class TaskBarContainer; class TaskBarExtension : public KPanelExtension, virtual public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP k_dcop: diff --git a/kicker/kicker/CMakeLists.txt b/kicker/kicker/CMakeLists.txt index 1faa95c8f..3503042f9 100644 --- a/kicker/kicker/CMakeLists.txt +++ b/kicker/kicker/CMakeLists.txt @@ -31,8 +31,15 @@ link_directories( ##### other data ################################ -install( FILES panel.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} ) -install( FILES kcmkicker.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +tde_create_translated_desktop( + SOURCE panel.desktop + DESTINATION ${AUTOSTART_INSTALL_DIR} + PO_DIR kicker-desktops +) +tde_create_translated_desktop( + SOURCE kcmkicker.desktop + PO_DIR kicker-desktops +) install( FILES kickerrc.upd DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update ) install( PROGRAMS @@ -51,7 +58,7 @@ tde_add_executable( kicker-3.4-reverseLayout ##### kicker (tdeinit) ########################## -configure_file( ${CMAKE_SOURCE_DIR}/cmake/modules/template_dummy_cpp.cmake dummy.cpp COPYONLY ) +configure_file( ${TDE_CMAKE_TEMPLATES}/tde_dummy_cpp.cmake dummy.cpp COPYONLY ) tde_add_tdeinit_executable( kicker SOURCES dummy.cpp diff --git a/kicker/kicker/buttons/CMakeLists.txt b/kicker/kicker/buttons/CMakeLists.txt index 9479ed1b4..cc2dc7f63 100644 --- a/kicker/kicker/buttons/CMakeLists.txt +++ b/kicker/kicker/buttons/CMakeLists.txt @@ -29,10 +29,13 @@ link_directories( ##### other data ################################ -install( FILES +tde_create_translated_desktop( + SOURCE bookmarks.desktop browser.desktop desktop.desktop exec.desktop kmenu.desktop windowlist.desktop - DESTINATION ${DATA_INSTALL_DIR}/kicker/builtins ) + DESTINATION ${DATA_INSTALL_DIR}/kicker/builtins + PO_DIR kicker-desktops +) ##### kicker_buttons (static) ################### diff --git a/kicker/kicker/buttons/bookmarks.desktop b/kicker/kicker/buttons/bookmarks.desktop index 452da0285..9d5e5d89b 100644 --- a/kicker/kicker/buttons/bookmarks.desktop +++ b/kicker/kicker/buttons/bookmarks.desktop @@ -1,133 +1,7 @@ [Desktop Entry] Name=Bookmarks Menu -Name[af]=Boekmerke Kieslys -Name[ar]=قائمة علامات مواقع -Name[be]=Меню закладак -Name[bg]=Отметки -Name[bn]=বুকমার্ক মেনু -Name[br]=Meuziad ar sinedoù -Name[bs]=Meni zabilješki -Name[ca]=Menú de punts -Name[cs]=Nabídka záložek -Name[csb]=Załóżczi -Name[da]=Bogmærkemenu -Name[de]=Lesezeichen -Name[el]=Μενού σελιδοδεικτών -Name[eo]=Legosigna Menuo -Name[es]=Marcadores -Name[et]=Järjehoidjate menüü -Name[eu]=Laster-marken menua -Name[fa]=گزینگان چوب الفها -Name[fi]=Kirjanmerkit -Name[fr]=Menu des signets -Name[fy]=Blêdwizers menu -Name[ga]=Roghchlár na Leabharmharcanna -Name[gl]=Marcadores -Name[he]=תפריט סימניות -Name[hr]=Izbornik oznaka -Name[hu]=Könyvjelzők menü -Name[is]=Bókamerkjavalmynd -Name[it]=Menu dei segnalibri -Name[ja]=ブックマークメニュー -Name[ka]=სანიშნეების მენიუ -Name[kk]=Бетбелгілер мәзірі -Name[km]=ម៉ឺនុយចំណាំ -Name[ko]=책갈피 -Name[lt]=Žymelių meniu -Name[mk]=Мени со обележувачи -Name[nb]=Bokmerkemeny -Name[nds]=Leestekens -Name[ne]=पुस्तकचिनो मेनु -Name[nl]=Bladwijzermenu -Name[nn]=Bokmerkemeny -Name[pa]=ਬੁੱਕਮਾਰਕ ਮੇਨੂ -Name[pl]=Zakładki -Name[pt]=Menu de Favoritos -Name[pt_BR]=Menu favoritos -Name[ro]=Meniu semne de carte -Name[ru]=Закладки -Name[rw]=Ibikubiyemo by'Utumenyetso -Name[se]=Girjemearkafállu -Name[sk]=Menu záložiek -Name[sl]=Meni z zaznamki -Name[sr]=Мени маркера -Name[sr@Latn]=Meni markera -Name[sv]=Bokmärkesmeny -Name[te]=పేజి గుర్తుల పట్టి -Name[tg]=Менюи хатчӯбҳо -Name[th]=ที่คั่นหน้า -Name[tr]=Yer imleri Menüsü -Name[tt]=Bitbilge Saylağı -Name[uk]=Меню закладок -Name[uz]=Xatchoʻplar menyusi -Name[uz@cyrillic]=Хатчўплар менюси -Name[vi]=Thực đơn có Sổ lưu liên kết -Name[wa]=Dressêye des rmåkes -Name[zh_CN]=书签菜单 -Name[zh_TW]=書籤選單 + Comment=Your Konqueror bookmarks -Comment[af]=Jou Konqueror boekmerke -Comment[ar]=علامات مواقعك لِــ Konqueror -Comment[be]=Закладкі Konqueror -Comment[bg]=Отметки на браузъра -Comment[bn]=আপনার কনকরার বুকমার্ক-সমূহ -Comment[bs]=Vaše Konqueror zabilješke -Comment[ca]=Els vostres punts Konqueror -Comment[cs]=Vaše záložky Konqueroru -Comment[csb]=Załóżczi Konquerora -Comment[da]=Dine Konqueror bogmærker -Comment[de]=Ein Menü mit Ihren Konqueror-Lesezeichen -Comment[el]=Οι σελιδοδείκτες σας του Konqueror -Comment[eo]=Viaj Konkeranto-legosignoj -Comment[es]=Sus marcadores de Konqueror -Comment[et]=Konquerori järjehoidjad -Comment[eu]=Zure Konquerorren laster-markak -Comment[fa]=چوب الفهای Konqueror شما -Comment[fi]=Konquerorin kirjanmerkit -Comment[fr]=Vos signets Konqueror -Comment[fy]=Jo blêdwizers yn Konqueror -Comment[ga]=Do Chuid Leabharmharcanna Konqueror -Comment[gl]=Os seus marcadores de Konqueror -Comment[he]=הסימניות Konqueror שלך -Comment[hr]=Vaše Konqueror oznake -Comment[hu]=A Konqueror könyvjelzői -Comment[is]=Konqueror bókamerkin þín -Comment[it]=I tuoi segnalibri di Konqueror -Comment[ja]=Konqueror ブックマーク -Comment[ka]=Konqueror-ის თქვენი სანიშნეები -Comment[kk]=Konqueror шолғыштың бетбелгілері -Comment[km]=ចំណាំ Konqueror របស់អ្នក -Comment[lt]=Konqueror žymelės -Comment[mk]=Вашите обележувачи од Konqueror -Comment[nb]=Dine bokmerker i Konqueror -Comment[nds]=Menü mit Dien Konqueror-Leestekens -Comment[ne]=तपाईँको कन्क्वेररका पुस्तकचिनो -Comment[nl]=Uw bladwijzers in Konqueror -Comment[nn]=Konqueror-bokmerka -Comment[pa]=ਤੁਹਾਡੇ ਕੋਨਕਿਉਰੋਰ ਬੁੱਕਮਾਰਕ -Comment[pl]=Zakładki Konquerora -Comment[pt]=Os seus favoritos do Konqueror -Comment[pt_BR]=Seus favoritos do Konqueror -Comment[ro]=Semnele de carte Konqueror -Comment[ru]=Закладки Konqueror -Comment[rw]=Ibimenyetso bya Konqueror yawe -Comment[se]=Konqueror:a girjemearkkat -Comment[sk]=Konqueror záložky -Comment[sl]=Meni z zaznamki iz Konquerorja -Comment[sr]=Ваши маркери у Konqueror-у -Comment[sr@Latn]=Vaši markeri u Konqueror-u -Comment[sv]=Dina bokmärken i Konqueror -Comment[te]=మీ కాంకెరర్ పేజి గుర్తులు -Comment[tg]=Хатчӯбҳои Konqueror -Comment[th]=ที่คั่นหน้าคอนเควอร์เรอร์ของคุณ -Comment[tr]=Konqueror yer imleriniz -Comment[tt]=Konqueror Bitbilgeläre -Comment[uk]=Закладки з Konqueror -Comment[uz]=Konqueror xatchoʻplari -Comment[uz@cyrillic]=Konqueror хатчўплари -Comment[vi]=Các liên kết đã lưu tại Konqueror của bạn -Comment[wa]=Vos rmåkes Konqueror -Comment[zh_CN]=您的 Konqueror 书签 -Comment[zh_TW]=您的 Konqueror 書籤 + Icon=bookmark X-TDE-Library=BookmarksButton diff --git a/kicker/kicker/buttons/bookmarksbutton.h b/kicker/kicker/buttons/bookmarksbutton.h index bb6d450e1..18d03214c 100644 --- a/kicker/kicker/buttons/bookmarksbutton.h +++ b/kicker/kicker/buttons/bookmarksbutton.h @@ -36,7 +36,7 @@ class KBookmarkOwner; */ class BookmarksButton : public PanelPopupButton { - Q_OBJECT + TQ_OBJECT public: BookmarksButton(TQWidget* parent); diff --git a/kicker/kicker/buttons/browser.desktop b/kicker/kicker/buttons/browser.desktop index 93dadea23..6210581f0 100644 --- a/kicker/kicker/buttons/browser.desktop +++ b/kicker/kicker/buttons/browser.desktop @@ -1,125 +1,7 @@ [Desktop Entry] Name=Quick File Browser -Name[af]=Vinnige Lêer Blaaier -Name[ar]=متصفح ملفات سريع -Name[be]=Хуткі прагляд -Name[bg]=Бърз файлов браузър -Name[bn]=চটপট ফাইল ব্রাউজার -Name[bs]=Brzi preglednik datoteka -Name[ca]=Fullejador de fitxers ràpid -Name[cs]=Rychlý prohlížeč souborů -Name[csb]=Chùtczé przezéranié lopków -Name[da]=Hurtig filsøgning -Name[de]=Schnellanzeiger -Name[el]=Γρήγορος περιηγητής αρχείων -Name[eo]=Rapida Dosiero Legilo -Name[es]=Navegador rápido de archivos -Name[et]=Failide kiirbrauser -Name[eu]=Fitxategi arakatzaile bizkorra -Name[fa]=مرورگر پروندۀ سریع -Name[fi]=Nopea tiedostoselain -Name[fr]=Explorateur de fichiers rapide -Name[fy]=Flugge triem blêder -Name[gl]=Navegador Rápido -Name[he]=דפדפן קבצים מהיר -Name[hr]=Brzi pretraživač datoteka -Name[hu]=Gyors fájlböngésző -Name[is]=Flýti skráarvafri -Name[it]=Browser rapido dei file -Name[ja]=クイックファイルブラウザ -Name[ka]=ფაილების სწრაფი ნუსხა -Name[kk]=Жедел файл шолғышы -Name[km]=កម្មវិធីរុករកឯកសាររហ័ស -Name[lt]=Paprasta bylų naršyklė -Name[mk]=Брз прелистувач на датотеки -Name[nb]=Enkel filbehandler -Name[nds]=Fix-Dateiwieser -Name[ne]=द्रुत फाइल ब्राउजर -Name[nn]=Snøgglesar -Name[pa]=ਤੇਜ਼ ਫਾਇਲ ਝਲਕਾਰਾ -Name[pl]=Szybkie przeglądanie plików -Name[pt]=Navegação Rápida de Ficheiros -Name[pt_BR]=Navegador de Arquivos Rápido -Name[ro]=Navigator de fișiere rapid -Name[ru]=Быстрый выбор файла -Name[rw]=Mucukumbuzi y'Idosiye Yihuta -Name[se]=Jođánis fiilagieđahalli -Name[sk]=Rýchly prehliadač súborov -Name[sl]=Preprost brskalnik -Name[sr]=Брзи прегледач фајлова -Name[sr@Latn]=Brzi pregledač fajlova -Name[sv]=Snabbfilbläddrare -Name[tg]=Интихоби файлҳои тез -Name[th]=โปรแกรมเรียกดูไฟล์อย่างรวดเร็ว -Name[tr]=Hızlı Dosya Tarayıcı -Name[tt]=Tiz Birem-Küzätüçe -Name[uk]=Швидкий навігатор файлів -Name[uz]=Tez koʻruvchi -Name[uz@cyrillic]=Тез кўрувчи -Name[vi]=Duyệt nhanh các tập tin -Name[wa]=Betchteu d' fitchî simpe -Name[zh_CN]=快速文件浏览器 -Name[zh_TW]=快速檔案瀏覽器 + Comment=A menu that lists files in a given folder -Comment[af]='n Kieslys wat die lêers in 'n spesifieke gids vertoon -Comment[ar]=قائمة تعرض الملفات في مجلّد معيين -Comment[be]=Меню, якое паказвае файлы ў вызначанай тэчцы -Comment[bg]=Меню, което показва файловете в зададена директория -Comment[bn]=একটি মেনু যা ফোল্ডার-এর ফাইলসমূহ তালিকাবদ্ধ করে -Comment[bs]=Meni u kojem se nalaze datoteke u datom direktoriju -Comment[ca]=Un menú que llista els fitxers d'una carpeta -Comment[cs]=Nabídka vypisující soubory v dané složce -Comment[csb]=Menu pokazëwôjące lopczi w pòdónym katalogù -Comment[da]=En menu der lister filer i en given mappe -Comment[de]=Ein Menü, das die Dateien eines bestimmten Ordners auflistet -Comment[el]=Ένα μενού που εμφανίζει τα αρχεία ενός δοσμένου φακέλου -Comment[eo]=Menuo kiu listigas dosierojn en la nomita dosierujo -Comment[es]=Un menú que le muestra los archivos de una carpeta -Comment[et]=Menüü, mis näitab valitud kataloogi faile -Comment[eu]=Emandako karpetako fitxategiak zerrendatzen dituen menua -Comment[fa]=گزینگانی که پروندهها را در پوشۀ دادهشده فهرست میکند -Comment[fi]=Valikko, joka listaa annetun kansion tiedostot -Comment[fr]=Un menu affichant les fichiers d'un dossier donné -Comment[fy]=In menu dat de triemmen út de oantsjutte map sjen lit -Comment[ga]=Roghchlár a thaispeánann na comhaid i bhfillteán -Comment[gl]=Un menu que lista os ficheiros dos seus cartafoles -Comment[he]=תפריט שנותן רשימה של קבצים הקיימים בתיקייה מסוימת -Comment[hr]=Izbornik s popisom datoteka unutar dane mape -Comment[hu]=Egy adott könyvtár tartalmát kilistázó menü -Comment[is]=Valmynd sem sýnir skrár í uppgefinni möppu -Comment[it]=Un menu che elenca i file di una data cartella -Comment[ja]=指定したフォルダのファイルのリストを表示するメニュー -Comment[kk]=Каталогтағы файлдар тізім мәзірі -Comment[km]=ម៉ឺនុយដែលរាយឯកសារក្នុងថតដែលបានផ្តល់មួយ -Comment[lt]=Bylų sąrašą nurodytame aplanke pateikiantis meniu -Comment[mk]=Мени што ги листа датотеките во дадена папка -Comment[nb]=En meny som viser filene i en bestemt mappe -Comment[nds]=Menü dat de Dateien ut en angeven Orner wiest -Comment[ne]=दिएको फोल्डरमा फाइलहरू सूचीकृत गर्ने मेनु -Comment[nl]=Een menu dat de bestanden uit de opgegeven map toont -Comment[nn]=Ein meny som viser filene i ei mappe -Comment[pa]=ਇੱਕ ਮੇਨੂ, ਜੋ ਕਿ ਦਿੱਤੇ ਫੋਲਡਰ ਵਿੱਚ ਫਾਇਲਾਂ ਵਿਖਾ ਸਕਦਾ ਹੈ -Comment[pl]=Menu pokazujące pliki w podanym katalogu -Comment[pt]=Um menu que mostra os ficheiros numa dada pasta -Comment[pt_BR]=Um menu que lista arquivos em uma determinada pasta -Comment[ro]=Un meniu care listează fișierele dintr-un folder -Comment[ru]=Меню с быстрым выбором файла из указанной папки -Comment[rw]=Ibikubiyemo bitanga urutonde rw'amadosiye mu bubiko butanzwe -Comment[se]=Fállu mii čájeha fiillaid dihto máhpas -Comment[sk]=Menu, ktoré zobrazí súbory v priečinku -Comment[sl]=Meni, ki prikazuje seznam datotek v dani mapi -Comment[sr]=Мени који листа фајлове у датој фасцикли -Comment[sr@Latn]=Meni koji lista fajlove u datoj fascikli -Comment[sv]=En meny som listar filer i en given katalog -Comment[th]=เมนูที่แสดงรายการแฟ้มของโฟลเดอร์ที่กำหนด -Comment[tr]=Belirlenen bir dizinde dosyaları listeleme menüsü -Comment[tt]=Berär törgäkneñ birem tezmäsen kürsätüçe saylaq -Comment[uk]=Меню, яке дає перелік файлів в даній теці -Comment[uz]=Koʻrsatilgan jilddagi fayllarning roʻyxatini koʻrsatuvchi -Comment[uz@cyrillic]=Кўрсатилган жилддаги файлларнинг рўйхатини кўрсатувчи -Comment[vi]=Một thực đơn liệt kê các tập tin có trong thư mục -Comment[wa]=Ene dressêye ki fwait l' lisse des fitchî dins on ridant d' diné -Comment[zh_CN]=列出给定文件夹中文件的菜单 -Comment[zh_TW]=列出所選資料夾中檔案的選單 + Icon=kdisknav X-TDE-Library=BrowserButton diff --git a/kicker/kicker/buttons/browserbutton.cpp b/kicker/kicker/buttons/browserbutton.cpp index 71f2d0504..7ab5de6de 100644 --- a/kicker/kicker/buttons/browserbutton.cpp +++ b/kicker/kicker/buttons/browserbutton.cpp @@ -66,7 +66,7 @@ void BrowserButton::initialize( const TQString& icon, const TQString& path ) setPopup(topMenu); _menuTimer = new TQTimer( this, "_menuTimer" ); - connect( _menuTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotDelayedPopup()) ); + connect( _menuTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotDelayedPopup()) ); TQToolTip::add(this, i18n("Browse: %1").arg(path)); setTitle( path ); diff --git a/kicker/kicker/buttons/browserbutton.h b/kicker/kicker/buttons/browserbutton.h index 507a764ed..627368472 100644 --- a/kicker/kicker/buttons/browserbutton.h +++ b/kicker/kicker/buttons/browserbutton.h @@ -33,7 +33,7 @@ class PanelBrowserMenu; */ class BrowserButton : public PanelPopupButton { - Q_OBJECT + TQ_OBJECT public: BrowserButton( const TQString& icon, const TQString& startDir, TQWidget* parent ); diff --git a/kicker/kicker/buttons/desktop.desktop b/kicker/kicker/buttons/desktop.desktop index 05a4054cc..747b7fd08 100644 --- a/kicker/kicker/buttons/desktop.desktop +++ b/kicker/kicker/buttons/desktop.desktop @@ -1,129 +1,7 @@ [Desktop Entry] Name=Show Desktop -Name[af]=Vertoon Werkskerm -Name[ar]=أعرض سطح المكتب -Name[be]=Паказаць працоўны стол -Name[bg]=Показване на работния плот -Name[bn]=ডেস্কটপ দেখাও -Name[br]=Diskouez ar burev -Name[bs]=Prikaži desktop -Name[ca]=Mostra l'escriptori -Name[cs]=Zobrazit plochu -Name[csb]=Pòkôże pùlt -Name[da]=Vis desktop -Name[de]=Zugriff auf Arbeitsfläche -Name[el]=Εμφάνιση επιφάνειας εργασίας -Name[eo]=Montri Tabulon -Name[es]=Mostrar escritorio -Name[et]=Näita töölauda -Name[eu]=Erakutsi mahaigaina -Name[fa]=نمایش رومیزی -Name[fi]=Näytä työpöytä -Name[fr]=Afficher le bureau -Name[fy]=Buroblêd sjen litte -Name[ga]=Taispeáin an Deasc -Name[gl]=Escritório -Name[he]=הצג שולחן עבודה -Name[hr]=Prikaži radnu površinu -Name[hu]=A munkaasztal megjelenítése -Name[is]=Sýna skjáborð -Name[it]=Mostra il desktop -Name[ja]=デスクトップを表示 -Name[ka]=სამუშაო დაფის ჩვენება -Name[kk]=Үстелге ауысу -Name[km]=បង្ហាញផ្ទៃតុ -Name[ko]=데스크톱 1로 바꾸기 -Name[lt]=Rodyti darbastalį -Name[mk]=Прикажи работна површина -Name[nb]=Vis skrivebord -Name[nds]=Schriefdischwieser -Name[ne]=डेस्कटप देखाउनुहोस् -Name[nl]=Bureaublad tonen -Name[nn]=Vis skrivebord -Name[pa]=ਵੇਹੜਾ ਵੇਖਾਓ -Name[pl]=Pokaż pulpit -Name[pt]=Mostrar o Ecrã -Name[pt_BR]=Mostrar Área de Trabalho -Name[ro]=Arată desktop -Name[ru]=Свернуть все окна -Name[rw]=Kwerekana Ibiro -Name[se]=Čájet čállinbeavddi -Name[sk]=Ukáže pracovnú plochu -Name[sl]=Prikaži namizje -Name[sr]=Прикажи радну површину -Name[sr@Latn]=Prikaži radnu površinu -Name[sv]=Visa skrivbord -Name[te]=రంగస్థలాన్ని చూపు -Name[tg]=Намоиши мизи корӣ -Name[th]=แสดงพื้นที่หน้าจอ -Name[tr]=Masaüstünü Göster -Name[tt]=Östäl Kürsätü -Name[uk]=Показати стільницю -Name[uz]=Ish stoli -Name[uz@cyrillic]=Иш столи -Name[vi]=Hiển thị Màn hình nền -Name[wa]=Mostrer l' sicribanne -Name[zh_CN]=显示桌面 -Name[zh_TW]=顯示桌面 + Comment=A button that gives quick access to the desktop when pressed -Comment[af]='n Knoppie wat vinnige toegang tot die werkskerm gee wanneer dit gedruk word -Comment[ar]=زرّ يسمح بالوصول السريع إلى سطح المكتب عند ضغطه -Comment[be]=Кнопка, якая дае хуткі доступ да працоўнага стала -Comment[bg]=Бутон за бърз достъп до работния плот -Comment[bn]=একটা বাটন যেটি চাপলে ডেস্কটপ ফাঁকা করে দেখানো হবে -Comment[bs]=Dugme koje sklanja sve prozore sa ekrana i prikazuje desktop -Comment[ca]=Un botó que dóna accés ràpid a l'escriptori en prémer-hi -Comment[cs]=Tlačítko s rychlým přístupem k pracovní ploše -Comment[csb]=Knąpa chùtczégò przistãpù do pùltu -Comment[da]=En knap der giver hurtig adgang til desktoppen når den trykkes ned -Comment[de]=Dieser Knopf ermöglicht den schnellen Zugriff auf die Arbeitsfläche -Comment[el]=Ένα κουμπί που όταν πατηθεί δίνει γρήγορη πρόσβαση στην επιφάνεια εργασίας -Comment[eo]=Butono kiu ebligas rapid aliron al labortabulo kiam premita -Comment[es]=Muestra rápidamente el escritorio al pulsarlo -Comment[et]=Nupp, mis võimaldab ühe klõpsuga kiiresti pääseda otse töölauale -Comment[eu]=Zapatzean mahagainera sarbide bizkorra ematen duen botoia -Comment[fa]=دکمهای که وقتی فشار داده شد، امکان دستیابی سریع به رومیزی را میدهد. -Comment[fi]=Painike, jota painamalla pääsee nopeasti työpöydälle -Comment[fr]=Un bouton, qui, en étant cliqué, donne un accès rapide au bureau -Comment[fy]=In knop hokker flugge tagong ta it buroblêd jout -Comment[gl]=Un botón que dá aceso rápido ao escritório cando se preme -Comment[he]=כפתור הנותן גישה מהירה לשולחן העבודה כאשר נלחץ -Comment[hr]=Gumb koji omogućuje brz pristup radnoj površini -Comment[hu]=Ezzel a gombbal gyorsan elérhető a munkaasztal -Comment[is]=Hnappur sem veitir hraðan aðgang að skjáborðinu -Comment[it]=Un pulsante che da accesso rapido al desktop quando viene premuto -Comment[ja]=デスクトップに素早くアクセスするためのボタン -Comment[kk]=Бір басып үстелге қатынау батырмасы -Comment[km]=ប៊ូតុងដែលផ្តល់ការចូលដំណើរការរហ័សទៅផ្ទៃតុ ពេលចុច -Comment[lt]=Mygtukas, kurį nuspaudus suteikiama greita prieiga prie darbastalio -Comment[mk]=Копче што дава брз пристап кон работната површина кога е притиснато -Comment[nb]=En knapp som gir deg rask tilgang til skrivebordet -Comment[nds]=Disse Knoop laat Een direktemang op den Schriefdisch togriepen -Comment[ne]=थिचेको बेलामा डेस्कटपमा द्रुत पहुँच प्रदान गर्ने बटन -Comment[nl]=Een knop die snelle toegang tot het bureaublad geeft -Comment[nn]=Ein knapp som gir deg rask tilgang til skrivebordet -Comment[pa]=ਇੱਕ ਬਟਨ, ਜੋ ਕਿ ਦਬਾਉਣ ਉਪਰੰਤ ਤੁਹਾਨੂ ਵੇਹੜਾ ਉਪਲੱਬਧ ਕਰਵਾਉਦਾ ਹੈ -Comment[pl]=Przycisk szybkiego dostępu do pulpitu -Comment[pt]=Um botão que dá acesso rápido ao ecrã, quando for carregado -Comment[pt_BR]=Um botão que fornece acesso rápido para a área de trabalho, quando pressionado -Comment[ro]=Un buton care permite acces rapid la desktop la apăsare -Comment[ru]=Кнопка перехода на заданный рабочий стол -Comment[rw]=Buto itanga ukugera vuba ku biro igihe ikanzwe -Comment[se]=Boallu mii čiehká buot lásiid mat leat čállinbeavddis go dan coahkkala -Comment[sk]=Tlačidlo pre rýchly prístup na pracovnú plochu -Comment[sl]=Klik tega gumba omogoča hiter dostop do namizja -Comment[sr]=Дугме које по притиску даје брз приступ радној површини -Comment[sr@Latn]=Dugme koje po pritisku daje brz pristup radnoj površini -Comment[sv]=En knapp som ger snabb åtkomst till skrivbordet när den klickas -Comment[th]=ปุ่มที่กดแล้วจะแสดงพื้นที่หน้าจออย่างรวดเร็ว -Comment[tr]=Tıklandığı zaman masaüstüne hızlı erişim sağlar -Comment[tt]=Östäl eçtälegenä tiz ireşergä birüçe töymä -Comment[uk]=Кнопка, яка при натисканні надає швидкий доступ до стільниці -Comment[uz]=Ish stoliga qisqa yoʻl -Comment[uz@cyrillic]=Иш столига қисқа йўл -Comment[vi]=Một nút cho phép bạn truy cập ngay đến màn hình nền mỗi khi ấn vào -Comment[wa]=On boton ki dene raddimint accès å scribanne cwand il est tchôkî -Comment[zh_CN]=按下可快速访问桌面的按钮 -Comment[zh_TW]=按下去能快速顯示桌面的按鈕 + Icon=desktop X-TDE-Library=DesktopButton diff --git a/kicker/kicker/buttons/desktopbutton.cpp b/kicker/kicker/buttons/desktopbutton.cpp index fe70954f9..b548579f6 100644 --- a/kicker/kicker/buttons/desktopbutton.cpp +++ b/kicker/kicker/buttons/desktopbutton.cpp @@ -45,8 +45,8 @@ DesktopButton::DesktopButton( TQWidget* parent ) setTitle(i18n("Desktop Access")); setIcon("desktop"); - connect( this, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(showDesktop(bool)) ); - connect( ShowDesktop::the(), TQT_SIGNAL(desktopShown(bool)), this, TQT_SLOT(toggle(bool)) ); + connect( this, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(showDesktop(bool)) ); + connect( ShowDesktop::the(), TQ_SIGNAL(desktopShown(bool)), this, TQ_SLOT(toggle(bool)) ); setOn( ShowDesktop::the()->desktopShowing() ); } diff --git a/kicker/kicker/buttons/desktopbutton.h b/kicker/kicker/buttons/desktopbutton.h index c896bdf92..3ea98a49e 100644 --- a/kicker/kicker/buttons/desktopbutton.h +++ b/kicker/kicker/buttons/desktopbutton.h @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ class DesktopButton : public PanelButton { - Q_OBJECT + TQ_OBJECT public: DesktopButton( TQWidget* parent ); diff --git a/kicker/kicker/buttons/exec.desktop b/kicker/kicker/buttons/exec.desktop index 85047e00f..e0151c7d4 100644 --- a/kicker/kicker/buttons/exec.desktop +++ b/kicker/kicker/buttons/exec.desktop @@ -1,125 +1,7 @@ [Desktop Entry] Name=Non-TDE Application Launcher -Name[af]=Nie-TDE Program Lanseerder -Name[ar]=مُطلِق التطبيقات اغير TDE -Name[be]=Запускальнік праграмы не-TDE -Name[bg]=Стартиране на програми -Name[bn]=নন-কে.ডি.ই অ্যাপলিকেশন লঞ্চার -Name[bs]=Pokretač ne-TDE programa -Name[ca]=Engegador d'aplicacions no TDE -Name[cs]=Spouštěč aplikací nepatřících do TDE -Name[csb]=Zrëszanié programów z bùtna TDE -Name[da]=Starter ikke-TDE-programmer -Name[de]=Nicht-TDE-Programm -Name[el]=Εκτελεστής μη-TDE εφαρμογών -Name[eo]=neTDE-a Aplikaĵolanĉilo -Name[es]=Aplicaciones No-TDE -Name[et]=TDE-väliste rakenduste käivitaja -Name[eu]=TDEren ez diren aplikazio abiarazlea -Name[fa]=راهانداز کاربرد غیر TDE -Name[fi]=Ei-TDE:n sovellusten käynnistäjä -Name[fr]=Lancement des applications non TDE -Name[fy]=Net-TDE-programma's útfierder -Name[ga]=Tosaitheoir Feidhmchlár Neamh-TDE -Name[gl]=Lanzador de Aplicacións Non-TDE -Name[he]=מפעיל תוכניות שלא שייכות למשפחת TDE -Name[hr]=Pokretač vanjskih TDE aplikacija -Name[hu]=Programindító nem TDE-s alkalmazásokhoz -Name[is]=Ræsir fyrir ekki-TDE forrit -Name[it]=Lancio di applicazioni non-TDE -Name[ja]=TDE 以外のアプリケーションランチャー -Name[ka]=არა TDE-ს პროგრამების -Name[kk]=TDE-ге тиесілі емес қолданбаларды жегу -Name[km]=ឧបករណ៍បើកកម្មវិធីមិនមែន TDE -Name[ko]=프로그램 실행기 -Name[lt]=Ne-TDE programų startavimo priedas -Name[mk]=Стартувач на не-TDE апликации -Name[nb]=Last ikke-TDE-programmer -Name[nds]=Starter för Nich-TDE-Programmen -Name[ne]=TDE बाहेकको अनुप्रयोग सुरुआतकर्ता -Name[nl]=Niet-TDE-programma's starten -Name[nn]=Start av ikkje-TDE-program -Name[pa]=ਨਾ-TDE ਕਾਰਜ ਸ਼ੁਰੂਆਤੀ -Name[pl]=Uruchamianie programów spoza TDE -Name[pt]=Lançador de Aplicações não-TDE -Name[pt_BR]=Lançador de aplicativos que não são do TDE -Name[ro]=Lansator de aplicații Non-TDE -Name[ru]=Запуск приложения не из TDE -Name[rw]=Bitari-TDE Porogaramu Mutangiza -Name[se]=Ii-TDE prográmmaid álggaheaddji -Name[sk]=Spúšťač non-TDE aplikácií -Name[sl]=Zaganjalnik ne-TDE programov -Name[sr]=Покретач не-TDE програма -Name[sr@Latn]=Pokretač ne-TDE programa -Name[sv]=Start av program som inte hör till TDE -Name[th]=ตัวเรียกใช้งานแอพพลิเคชันที่ไม่ใช่ของ TDE -Name[tr]=TDE Dışı Uygulama Başlatıcısı -Name[tt]=TDE-bulmağan Yazılım Cibärgeç -Name[uk]=Запуск не-TDE програм -Name[uz]=No-TDE dasturlarni ishga tushuruvchi -Name[uz@cyrillic]=Но-TDE дастурларни ишга тушурувчи -Name[vi]=Trình khởi động Chương trình không của TDE -Name[wa]=Enondeu di programes nén TDE -Name[zh_CN]=非 TDE 应用程序启动器 -Name[zh_TW]=非-TDE 應用程式啟動器 + Comment=A launcher for programs not in the TDE Menu -Comment[af]='n Lanseerder vir programme wat nie in die TDE-Kieslys voorkom nie -Comment[ar]=مُطلِق البرامج غير التابعة لِلقائمة TDE -Comment[be]=Запускальнік для праграмы, якой няма ў меню TDE -Comment[bg]=Стартиране на програми, които са извън главното меню (К) -Comment[bn]=কে-মেনু-তে নেই এমন প্রোগ্রাম-এর চালু করার জন্য একটি লঞ্চার -Comment[bs]=Pokretač programa koji nisu u TDE meniju -Comment[ca]=Un engegador de programes que no hi són al menú TDE -Comment[cs]=Spouštěč pro programy nenacházející se v hlavní nabídce TDE -Comment[csb]=Zrëszanié programów, jaczich nie dô w TDE menu -Comment[da]=En starter af programmer der ikke er i TDE-Menuen -Comment[de]=Startet Programme, die sich nicht im TDE-Menü befinden -Comment[el]=Ένας εκτελεστής εφαρμογών που δε βρίσκονται στο Μενού TDE -Comment[eo]=Lanĉilo por programoj ne en la TDE Menuo -Comment[es]=Le permite ejecutar aplicaciones que no están en el Menu TDE -Comment[et]=TDE menüüst puuduvate rakenduste käivitaja -Comment[eu]=TDE Menuan ez dauden aplikazio abiarazlea -Comment[fa]=یک راهانداز برای برای برنامههایی که در گزینگان TDE نیست -Comment[fi]=Käynnistäjä ohjelmille, jotka eivät ole TDE-valikossa -Comment[fr]=Lancement des programmes n'étant pas dans le menu TDE -Comment[fy]=In útfierder foar programma's hokker net yn it TDE-menu stean -Comment[gl]=Un lanzador para aplicacións que non estexan no Menu de TDE -Comment[he]=מפעיל עבור יישומים שלא בתפריט המערכת -Comment[hr]=Pokretač programa koji se ne nalaze na TDE izborniku -Comment[hu]=Programindító -Comment[is]=Ræsir fyrir forrit sem eru ekki í TDE valmyndinni -Comment[it]=Per lanciare programmi che non sono nel menu TDE -Comment[ja]=TDE メニューにないプログラムを起動 -Comment[kk]=TDE мәзрінде жоқ бағдарламаларды жегу -Comment[km]=ឧបករណ៍បើកកម្មវិធីដែលមិននៅក្នុងម៉ឺនុយ TDE -Comment[lt]=TDE meniu nesančių programų startavimo meniu -Comment[mk]=Стартување на програми што не се во К-менито -Comment[nb]=Mulighet til å starte programmer som ikke er i TDE-menyen -Comment[nds]=En Starter för Programmen, de nich in't TDE-Menü staht -Comment[ne]=के मेनुमा नभएका कार्यक्रमका लागि सुरुआतकर्ता -Comment[nl]=Een starter voor het uitvoeren van programma's die niet in het TDE-menu staan -Comment[nn]=Start av program som ikkje ligg i TDE-menyen -Comment[pa]= ਕੇ(TDE) ਮੇਨੂ ਵਿੱਚ ਨਾ-ਮੌਜੂਦ ਕਾਰਜ ਲਈ ਸ਼ੁਰੂਆਤੀ ਹੈ -Comment[pl]=Uruchamianie programów, które nie znajdują się w menu TDE -Comment[pt]=Um lançador de programas que não estejam no Menu TDE -Comment[pt_BR]=Um lançador para programas que não estão no Menu TDE -Comment[ro]=Lansator de programe ce nu se află în meniul TDE -Comment[ru]=Запуск приложений, не входящих в меню TDE -Comment[rw]=Mutangiza w'amaporogaramu atari muri TDE Ibikubiyemo -Comment[sk]=Spúštač programov, ktoré nie sú v TDE Menu -Comment[sl]=Zaganjalnik programov, ki se ne nahajajo v meniju TDE-ja -Comment[sr]=Покретач за програме којих нема у TDE-менију -Comment[sr@Latn]=Pokretač za programe kojih nema u TDE-meniju -Comment[sv]=Start av program som inte finns i TDE-menyn -Comment[th]=ตัวเรียกใช้งานโปรแกรมที่ไม่ได้อยู่ใน TDE menu -Comment[tr]=TDE menüsünde bulunmayan programlar için bir başlatıcı -Comment[tt]=TDE-Saylaqta bulmağan yazılımnar cibärgeçe -Comment[uk]=Запуск програм, яких немає в TDE Меню -Comment[uz]=TDE-menyuga qoʻshilmagan dasturlarni ishga tushirish -Comment[uz@cyrillic]=К-менюга қўшилмаган дастурларни ишга тушириш -Comment[vi]=Trình khởi động các chương trình không có trong thực đơn của TDE -Comment[wa]=On enondeu po les programes ki n' sont nén dins l' dressêye TDE -Comment[zh_CN]=启动不在 TDE 菜单中的程序 -Comment[zh_TW]=用於不在 TDE 選單中的程式啟動器 + Icon=application-x-executable X-TDE-Library=ExecButton diff --git a/kicker/kicker/buttons/extensionbutton.h b/kicker/kicker/buttons/extensionbutton.h index 2d2d2d1f2..3c9932655 100644 --- a/kicker/kicker/buttons/extensionbutton.h +++ b/kicker/kicker/buttons/extensionbutton.h @@ -31,7 +31,7 @@ class KPanelMenu; class ExtensionButton : public PanelPopupButton { - Q_OBJECT + TQ_OBJECT public: ExtensionButton( const TQString& desktopFile, TQWidget* parent ); diff --git a/kicker/kicker/buttons/kbutton.h b/kicker/kicker/buttons/kbutton.h index 896bf56c2..fd34e5104 100644 --- a/kicker/kicker/buttons/kbutton.h +++ b/kicker/kicker/buttons/kbutton.h @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ class KButton : public PanelPopupButton { - Q_OBJECT + TQ_OBJECT public: KButton( TQWidget *parent ); diff --git a/kicker/kicker/buttons/kmenu.desktop b/kicker/kicker/buttons/kmenu.desktop index 45a08eeb7..cd218fe3d 100644 --- a/kicker/kicker/buttons/kmenu.desktop +++ b/kicker/kicker/buttons/kmenu.desktop @@ -1,132 +1,7 @@ [Desktop Entry] Name=TDE Menu -Name[af]=TDE-Kieslys -Name[ar]=قائمة TDE -Name[be]=Меню TDE -Name[bg]=Главно меню -Name[bn]=কে মেনু -Name[br]=Meuziad TDE -Name[bs]=TDE meni -Name[ca]=Menú TDE -Name[cs]=Nabídka TDE -Name[cy]=Y Ddewislen TDE -Name[da]=TDE-Menu -Name[de]=TDE-Menü -Name[el]=Μενού TDE -Name[eo]=TDEa Menuo -Name[es]=Menú de TDE -Name[et]=TDE menüü -Name[eu]=TDE menua -Name[fa]=گزینگان TDE -Name[fi]=TDE-valikko -Name[fr]=Menu TDE -Name[fy]=TDE-menu -Name[ga]=Roghchlár TDE -Name[gl]=Menu de TDE -Name[he]=תפריט TDE -Name[hr]=TDE izbornik -Name[hu]=TDE menü -Name[is]=TDE valmynd -Name[it]=Menu TDE -Name[ja]=TDE メニュー -Name[ka]=TDE მენიუ -Name[kk]=TDE мәзірі -Name[km]=ម៉ឺនុយ TDE -Name[ko]=TDE 메뉴 -Name[lt]=TDE meniu -Name[mk]=К-мени -Name[nb]=TDE-meny -Name[nds]=TDE-Menü -Name[ne]=के मेनु -Name[nl]=TDE-menu -Name[nn]=TDE-meny -Name[pa]=TDE ਮੇਨੂ -Name[pl]=Menu TDE -Name[pt]=Menu TDE -Name[pt_BR]=Menu TDE -Name[ro]=Meniu TDE -Name[ru]=Меню TDE -Name[rw]=TDE Ibikubiyemo -Name[se]=TDE-fállu -Name[sk]=Menu TDE -Name[sl]=Meni TDE-ja -Name[sr]=TDE-мени -Name[sr@Latn]=TDE-meni -Name[sv]=TDE-meny -Name[te]=కె పట్టి -Name[tg]=Менюи TDE -Name[th]=เมนู TDE -Name[tr]=TDE Menüsü -Name[tt]=TDE-Saylaq -Name[uk]=TDE Меню -Name[uz]=TDE-menyu -Name[uz@cyrillic]=К-меню -Name[vi]=Thực đơn TDE -Name[wa]=Dressêye TDE -Name[zh_CN]=TDE 菜单 -Name[zh_TW]=TDE 選單 + Comment=Applications and common actions -Comment[af]=Programme en algemene aksies -Comment[ar]=تطبيقات و أعمال شائعة -Comment[be]=Праграмы і асноўныя дзеянні -Comment[bg]=Главното меню с програмите, системните настройки и всичко останало -Comment[bn]=অ্যাপলিকেশন এবং সাধারণ ক্রিয়াসমূহ -Comment[bs]=Programi i standardne akcije -Comment[ca]=Aplicacions i accions comunes -Comment[cs]=Aplikace a časté činnosti -Comment[csb]=Programë ë pòpùlarné dzejania -Comment[da]=Programmer og sædvanlige handlinger -Comment[de]=Enthält Programme und häufig verwendete Aktionen -Comment[el]=Εφαρμογές και τυπικές ενέργειες -Comment[eo]=Aplikaĵoj kaj komunaj agoj -Comment[es]=Aplicaciones y acciones comunes -Comment[et]=Rakendused ja levinumad toimingud -Comment[eu]=Aplikazioak eta ohiko ekintzak -Comment[fa]=کاربردها و کنشهای مشترک -Comment[fi]=Sovellukset ja yleiset toiminnot -Comment[fr]=Applications et actions communes -Comment[fy]=Applikaasjes en folle foarkommende aksjes -Comment[ga]=Feidhmchláir agus gníomhartha coitianta -Comment[gl]=Aplicacións e accións comuns -Comment[he]=יישומים ופעולות מזדמנות -Comment[hr]=Aplikacije i zajedničke aktivnosti -Comment[hu]=Alkalmazások és általános műveletek -Comment[is]=Forrit og algengar aðgerðir -Comment[it]=Applicazioni e azioni comuni -Comment[ja]=アプリケーションと一般的なアクションのメニュー -Comment[ka]=პროგრამები და საზოგადო ქმედებები -Comment[kk]=Қолданбалар мен жалпы амалдар -Comment[km]=កម្មវិធី និងអំពើទូទៅ -Comment[lt]=Programos ir įprasti veiksmai -Comment[mk]=Апликации и општи дејства -Comment[nb]=Programmer og vanlige handlinger -Comment[nds]=Programmen un allgemeen Akschonen -Comment[ne]=अनुप्रयोग र साझा कार्य -Comment[nl]=Programma's en veelvoorkomende acties -Comment[nn]=Program og vanlege handlingar -Comment[pa]=ਕਾਰਜ ਅਤੇ ਆਮ ਕਾਰਵਾਈਆਂ -Comment[pl]=Programy i popularne czynności -Comment[pt]=Aplicações e acções comuns -Comment[pt_BR]=Aplicativos e ações comuns -Comment[ro]=Aplicații și acțiuni uzuale -Comment[ru]=Приложения и действия -Comment[rw]=Porogaramu n'ibikorwa rusange -Comment[se]=Prográmmat ja dábálaš doaimmat -Comment[sk]=Programy a všeobecné akcie -Comment[sl]=TDE-jev meni s programi in pogostimi dejanji -Comment[sr]=Програми и уобичајене акције -Comment[sr@Latn]=Programi i uobičajene akcije -Comment[sv]=Program och vanliga åtgärder -Comment[tg]=Барномаҳо ва амалҳои умумӣ -Comment[th]=แอพพลิเคชั่น และการกระทำทั่วๆไป -Comment[tr]=Uygulamalar ve ortak eylemler -Comment[tt]=Yazılımnar belän töp ğämällär -Comment[uk]=Програми і загальні дії -Comment[uz]=Dasturlar va umumiy amallar -Comment[uz@cyrillic]=Дастурлар ва умумий амаллар -Comment[vi]=Ứng dụng và thao tác thường làm -Comment[wa]=Programes et comones accions -Comment[zh_CN]=应用程序和公共操作 -Comment[zh_TW]=應用程式與一般動作 + Icon=kmenu X-TDE-Library=KMenuButton diff --git a/kicker/kicker/buttons/knewbutton.cpp b/kicker/kicker/buttons/knewbutton.cpp index ee5fa9c1f..1e5c2a7f8 100644 --- a/kicker/kicker/buttons/knewbutton.cpp +++ b/kicker/kicker/buttons/knewbutton.cpp @@ -29,11 +29,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqtooltip.h> #include <tqpainter.h> #include <tqcursor.h> -#include <tqeffects_p.h> +#include <private/tqeffects_p.h> #include <tdelocale.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kiconloader.h> #include <kdebug.h> @@ -100,7 +100,7 @@ void KNewButton::show() KButton::show(); if (KickerSettings::firstRun()) { - TQTimer::singleShot(0,this,TQT_SLOT(slotExecMenu())); + TQTimer::singleShot(0,this,TQ_SLOT(slotExecMenu())); KickerSettings::setFirstRun(false); KickerSettings::writeConfig(); } @@ -112,11 +112,11 @@ bool KNewButton::eventFilter(TQObject *o, TQEvent *e) e->type() == TQEvent::MouseButtonPress || e->type() == TQEvent::MouseButtonDblClick ) { - TQMouseEvent *me = TQT_TQMOUSEEVENT(e); - if (TQT_TQRECT_OBJECT(rect()).contains(mapFromGlobal(me->globalPos()))) + TQMouseEvent *me = static_cast<TQMouseEvent*>(e); + if (rect().contains(mapFromGlobal(me->globalPos()))) { if (m_pressedDuringPopup && m_popup && m_openTimer != -1 - && (me->button() & Qt::LeftButton) ) + && (me->button() & TQt::LeftButton) ) return true; } } diff --git a/kicker/kicker/buttons/knewbutton.h b/kicker/kicker/buttons/knewbutton.h index 1bdbbafbd..d38df07c6 100644 --- a/kicker/kicker/buttons/knewbutton.h +++ b/kicker/kicker/buttons/knewbutton.h @@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ class KNewButton : public KButton { - Q_OBJECT + TQ_OBJECT public: KNewButton( TQWidget *parent ); diff --git a/kicker/kicker/buttons/nontdeappbutton.cpp b/kicker/kicker/buttons/nontdeappbutton.cpp index 4f88f2d37..eb4d1396d 100644 --- a/kicker/kicker/buttons/nontdeappbutton.cpp +++ b/kicker/kicker/buttons/nontdeappbutton.cpp @@ -25,11 +25,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqdragobject.h> #include <tdeconfig.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <tdeapplication.h> #include <tdeglobal.h> #include <krun.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdemessagebox.h> #include <tdelocale.h> #include <kiconeffect.h> @@ -61,7 +61,7 @@ NonKDEAppButton::NonKDEAppButton(const TQString& name, // to the slotExec() slot // we do this here instead of in initialize(...) since initialize(...) may // get called later, e.g after reconfiguring it - connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotExec())); + connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotExec())); } // this constructor is used when restoring a button, usually at startup @@ -77,7 +77,7 @@ NonKDEAppButton::NonKDEAppButton( const TDEConfigGroup& config, TQWidget* parent config.readBoolEntry("RunInTerminal")); // see comment on connect in above constructor - connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotExec())); + connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotExec())); } void NonKDEAppButton::initialize(const TQString& name, @@ -174,11 +174,11 @@ void NonKDEAppButton::dropEvent(TQDropEvent *ev) ++it) { const KURL &url(*it); - if (KDesktopFile::isDesktopFile(url.path())) + if (TDEDesktopFile::isDesktopFile(url.path())) { // this URL is actually a .desktop file, so let's grab // the URL it actually points to ... - KDesktopFile deskFile(url.path()); + TDEDesktopFile deskFile(url.path()); deskFile.setDesktopGroup(); // ... and add it to the exec string @@ -216,7 +216,7 @@ void NonKDEAppButton::runCommand(const TQString& execStr) // since kicker doesn't listen to or use the session manager, we have // to make sure that our environment is set up correctly. this is // accomlplished by doing: - kapp->propagateSessionManager(); + tdeApp->propagateSessionManager(); if (term) { @@ -278,8 +278,8 @@ void NonKDEAppButton::properties() // ... connect the signal it emits when it has data for us to save // to our updateSettings slot (see above) ... - connect(dlg, TQT_SIGNAL(updateSettings(PanelExeDialog*)), this, - TQT_SLOT(updateSettings(PanelExeDialog*))); + connect(dlg, TQ_SIGNAL(updateSettings(PanelExeDialog*)), this, + TQ_SLOT(updateSettings(PanelExeDialog*))); // ... and then show it to the user dlg->show(); diff --git a/kicker/kicker/buttons/nontdeappbutton.h b/kicker/kicker/buttons/nontdeappbutton.h index 94c7cb59d..eac6ce412 100644 --- a/kicker/kicker/buttons/nontdeappbutton.h +++ b/kicker/kicker/buttons/nontdeappbutton.h @@ -37,8 +37,8 @@ class PanelExeDialog; */ class NonKDEAppButton : public PanelButton { - // the Q_OBJECT macro provides the magic glue for signals 'n slots - Q_OBJECT + // the TQ_OBJECT macro provides the magic glue for signals 'n slots + TQ_OBJECT public: // define our two constructors, one used for creating new buttons... diff --git a/kicker/kicker/buttons/servicebutton.cpp b/kicker/kicker/buttons/servicebutton.cpp index 716a750ed..2c392d29e 100644 --- a/kicker/kicker/buttons/servicebutton.cpp +++ b/kicker/kicker/buttons/servicebutton.cpp @@ -24,13 +24,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqdragobject.h> #include <tqtooltip.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <tdelocale.h> #include <kiconeffect.h> #include <kicontheme.h> #include <kpropertiesdialog.h> #include <krun.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurl.h> #include "global.h" @@ -92,7 +92,7 @@ void ServiceButton::loadServiceFromId(const TQString &id) _id = locate("appdata", id.mid(1)); if (!_id.isEmpty()) { - KDesktopFile df(_id, true); + TDEDesktopFile df(_id, true); _service = new KService(&df); } } @@ -121,7 +121,7 @@ void ServiceButton::loadServiceFromId(const TQString &id) void ServiceButton::initialize() { readDesktopFile(); - connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotExec())); + connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotExec())); } void ServiceButton::readDesktopFile() @@ -169,7 +169,7 @@ void ServiceButton::dropEvent( TQDropEvent* ev ) { KURL::List uriList; if( KURLDrag::decode( ev, uriList ) && _service ) { - kapp->propagateSessionManager(); + tdeApp->propagateSessionManager(); KRun::run( *_service, uriList ); } PanelButton::dropEvent(ev); @@ -192,7 +192,7 @@ void ServiceButton::slotExec() { // this allows the button to return to a non-pressed state // before launching - TQTimer::singleShot(0, this, TQT_SLOT(performExec())); + TQTimer::singleShot(0, this, TQ_SLOT(performExec())); } void ServiceButton::performExec() @@ -200,7 +200,7 @@ void ServiceButton::performExec() if (!_service) return; KURL::List uriList; - kapp->propagateSessionManager(); + tdeApp->propagateSessionManager(); KRun::run( *_service, uriList ); } @@ -223,10 +223,10 @@ void ServiceButton::properties() KPropertiesDialog* dialog = new KPropertiesDialog(serviceURL, 0, 0, false, false); dialog->setFileNameReadOnly(true); - connect(dialog, TQT_SIGNAL(saveAs(const KURL &, KURL &)), - this, TQT_SLOT(slotSaveAs(const KURL &, KURL &))); - connect(dialog, TQT_SIGNAL(propertiesClosed()), - this, TQT_SLOT(slotUpdate())); + connect(dialog, TQ_SIGNAL(saveAs(const KURL &, KURL &)), + this, TQ_SLOT(slotSaveAs(const KURL &, KURL &))); + connect(dialog, TQ_SIGNAL(propertiesClosed()), + this, TQ_SLOT(slotUpdate())); dialog->show(); } diff --git a/kicker/kicker/buttons/servicebutton.h b/kicker/kicker/buttons/servicebutton.h index ac551adb5..a2d7939e8 100644 --- a/kicker/kicker/buttons/servicebutton.h +++ b/kicker/kicker/buttons/servicebutton.h @@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class ServiceButton : public PanelButton { - Q_OBJECT + TQ_OBJECT public: ServiceButton( const TQString& desktopFile, TQWidget* parent ); diff --git a/kicker/kicker/buttons/servicemenubutton.h b/kicker/kicker/buttons/servicemenubutton.h index da512105d..bef038859 100644 --- a/kicker/kicker/buttons/servicemenubutton.h +++ b/kicker/kicker/buttons/servicemenubutton.h @@ -33,7 +33,7 @@ class PanelServiceMenu; */ class ServiceMenuButton : public PanelPopupButton { - Q_OBJECT + TQ_OBJECT public: ServiceMenuButton( const TQString& relPath, TQWidget* parent ); diff --git a/kicker/kicker/buttons/urlbutton.cpp b/kicker/kicker/buttons/urlbutton.cpp index 13ff95323..afdf90fa9 100644 --- a/kicker/kicker/buttons/urlbutton.cpp +++ b/kicker/kicker/buttons/urlbutton.cpp @@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqtooltip.h> #include <tqfile.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <tdefileitem.h> #include <konq_operations.h> #include <kicontheme.h> @@ -71,7 +71,7 @@ void URLButton::initialize( const TQString& _url ) if (!url.isLocalFile() || !url.path().endsWith(".desktop")) { TQString file = KickerLib::newDesktopFile(url); - KDesktopFile df(file); + TDEDesktopFile df(file); df.writeEntry("Encoding", "UTF-8"); df.writeEntry("Type","Link"); df.writeEntry("Name", url.prettyURL()); @@ -90,7 +90,7 @@ void URLButton::initialize( const TQString& _url ) } fileItem = new KFileItem( KFileItem::Unknown, KFileItem::Unknown, url ); setIcon( fileItem->iconName() ); - connect( this, TQT_SIGNAL(clicked()), TQT_SLOT(slotExec()) ); + connect( this, TQ_SIGNAL(clicked()), TQ_SLOT(slotExec()) ); setToolTip(); if (url.isLocalFile()) @@ -107,9 +107,9 @@ void URLButton::saveConfig( TDEConfigGroup& config ) const void URLButton::setToolTip() { if (fileItem->isLocalFile() - && KDesktopFile::isDesktopFile(fileItem->url().path())) + && TDEDesktopFile::isDesktopFile(fileItem->url().path())) { - KDesktopFile df(fileItem->url().path()); + TDEDesktopFile df(fileItem->url().path()); if (df.readComment().isEmpty()) { @@ -140,12 +140,12 @@ void URLButton::dragEnterEvent(TQDragEnterEvent *ev) void URLButton::dropEvent(TQDropEvent *ev) { - kapp->propagateSessionManager(); + tdeApp->propagateSessionManager(); KURL::List execList; if(KURLDrag::decode(ev, execList)){ KURL url( fileItem->url() ); if(!execList.isEmpty()) { - if (KDesktopFile::isDesktopFile(url.path())){ + if (TDEDesktopFile::isDesktopFile(url.path())){ TDEApplication::startServiceByDesktopPath(url.path(), execList.toStringList(), 0, 0, 0, "", true); } @@ -165,7 +165,7 @@ void URLButton::startDrag() void URLButton::slotExec() { - kapp->propagateSessionManager(); + tdeApp->propagateSessionManager(); fileItem->run(); } @@ -196,6 +196,6 @@ void URLButton::properties() pDlg = new KPropertiesDialog(fileItem, 0L, 0L, false, false); // will delete itself pDlg->setFileNameReadOnly(true); - connect(pDlg, TQT_SIGNAL(applied()), TQT_SLOT(updateURL())); + connect(pDlg, TQ_SIGNAL(applied()), TQ_SLOT(updateURL())); pDlg->show(); } diff --git a/kicker/kicker/buttons/urlbutton.h b/kicker/kicker/buttons/urlbutton.h index ba4a1b43d..dd55d78b4 100644 --- a/kicker/kicker/buttons/urlbutton.h +++ b/kicker/kicker/buttons/urlbutton.h @@ -34,7 +34,7 @@ class KPropertiesDialog; */ class URLButton : public PanelButton { - Q_OBJECT + TQ_OBJECT public: URLButton( const TQString& url, TQWidget* parent ); diff --git a/kicker/kicker/buttons/windowlist.desktop b/kicker/kicker/buttons/windowlist.desktop index f3d15fd69..1ffb96610 100644 --- a/kicker/kicker/buttons/windowlist.desktop +++ b/kicker/kicker/buttons/windowlist.desktop @@ -1,130 +1,7 @@ [Desktop Entry] Name=Window List Menu -Name[af]=Venster Lys Kieslys -Name[ar]=قائمة عرض النوافذ -Name[be]=Меню спіса вокнаў -Name[bg]=Списък с прозорците -Name[bn]=উইণ্ডো তালিকা মেনু -Name[br]=Meuziad listenn ar prenester -Name[bs]=Meni sa spiskom prozora -Name[ca]=Menú de la llista de finestres -Name[cs]=Nabídka seznamu oken -Name[csb]=Menu z lëstą òknów -Name[cy]=Dewislen Rhestr Ffenestri -Name[da]=Vindueslistemenu -Name[de]=Fensterliste -Name[el]=Μενού λίστας παραθύρων -Name[eo]=Fenestrolista Menuo -Name[es]=Menú de la lista de ventanas -Name[et]=Akende nimekirja menüü -Name[eu]=Leiho zerrendaren menua -Name[fa]=گزینگان فهرست پنجره -Name[fi]=Ikkunaluettelovalikko -Name[fr]=Liste des fenêtres -Name[fy]=Finsterlistmenu -Name[gl]=Lista de Fiestras -Name[he]=תפריט רשימת חלונות -Name[hr]=Izbornik popisa prozora -Name[hu]=Ablaklista menü -Name[is]=Gluggalista valmynd -Name[it]=Menu elenco delle finestre -Name[ja]=ウィンドウリストメニュー -Name[ka]=ფანჯრების სიის მენიუ -Name[kk]=Терезелер тізімінің мәзірі -Name[km]=ម៉ឺនុយបញ្ជីបង្អួច -Name[lt]=Langų sąrašo meniu -Name[mk]=Мени со листа на прозорци -Name[nb]=Vinduslistemeny -Name[nds]=Finsterlist -Name[ne]=सञ्झ्याल सूची मेनु -Name[nl]=Vensterlijstmenu -Name[nn]=Vindaugslistemeny -Name[pa]=ਝਰੋਖਾ ਸੂਚੀ ਮੇਨੂ -Name[pl]=Menu z listą okien -Name[pt]=Menu da Lista de Janelas -Name[pt_BR]=Menu de Lista de Janelas -Name[ro]=Meniu listă de ferestre -Name[ru]=Список окон -Name[rw]=Ibikubiyemo Rutonde by'Idirishya -Name[se]=Láselistofállu -Name[sk]=Menu zoznamu okien -Name[sl]=Meni s seznamom oken -Name[sr]=Мени листе прозора -Name[sr@Latn]=Meni liste prozora -Name[sv]=Fönsterlistmeny -Name[te]=విండొల జాబితా పట్టి -Name[tg]=Менюи рӯйхати равзанаҳо -Name[th]=เมนูแสดงรายการหน้าต่าง -Name[tr]=Pencere Listeleme Menüsü -Name[tt]=Täräzä Tezmäse Saylağı -Name[uk]=Меню списку вікон -Name[uz]=Oynalar roʻyxati -Name[uz@cyrillic]=Ойналар рўйхати -Name[vi]=Thực đơn Liệt kê Cửa sổ -Name[wa]=Dressêye del djivêye des purneas -Name[zh_CN]=窗口列表菜单 -Name[zh_TW]=視窗列表選單 + Comment=A menu that lists all open windows -Comment[af]='n Kieslys wat al die oop vensters vertoon -Comment[ar]=قائمة لعرض كل النوافذ المفتوحة -Comment[be]=Меню, якое паказвае усе адкрытыя вокны -Comment[bg]=Меню-списък, което съдържа всички отворени прозорци -Comment[bn]=একটি মেনু যা সমস্ত খোলা উইণ্ডো তালিকাবদ্ধ করে -Comment[bs]=Meni u kojem su navedeni svi trenutno otvoreni prozori -Comment[ca]=Un menú que llista totes les finestres obertes -Comment[cs]=Nabídka se seznamem otevřených oken -Comment[csb]=Menu pòkazëwôjącé wszëstczé otemkłé òkna -Comment[da]=En menu der lister alle åbne vinduer -Comment[de]=Dieses Menü zeigt alle geöffneten Fenster an -Comment[el]=Ένα μενού που εμφανίζει όλα τα ανοικτά παράθυρα -Comment[eo]=Menuo kiu listigas ĉiujn malfermitajn fenestrojn -Comment[es]=Un menú que muestra todas las ventanas abiertas -Comment[et]=Menüü, mis näitab kõiki avatud aknaid -Comment[eu]=Leiho irekien zerrenda bistaratzen duen menua -Comment[fa]=گزینگانی که همۀ پنجرههای باز را فهرست میکند -Comment[fi]=Valikko, jossa on luettelo kaikista avoimista ikkunoista -Comment[fr]=Un menu affichant l'ensemble des fenêtres ouvertes -Comment[fy]=In menu mei in list fan alle iepensteande finsters -Comment[ga]=Roghchlár le gach fuinneog atá oscailte -Comment[gl]=Un menu que lista todas as fiestras abertas -Comment[he]=תפריט המציג את רשימת כל החלונות הפתוחים -Comment[hr]=Izbornik s popisom svih otvorenih prozora -Comment[hu]=Menü a nyitott ablakok kilistázásához -Comment[is]=Valmynd sem sýnir alla opna glugga -Comment[it]=Un menu che mostra tutte le finestre aperte -Comment[ja]=開いているすべてのウィンドウのリストを表示するメニュー -Comment[ka]=ყველა გახსნილი ფანჯრის სიის მენიუ -Comment[kk]=Барлық ашық терезелердің мәзір тізімі -Comment[km]=ម៉ឺនុយដែលរាយបង្អួចបើកទាំងអស់ -Comment[lt]=Visų atvertų langų sąrašą pateikiantis meniu -Comment[mk]=Мени што ги листа сите отворени прозорци -Comment[nb]=En meny som viser alle åpne vinduer -Comment[nds]=En Menü, dat all apen Finstern oplist -Comment[ne]=सबै खुला सञ्झ्यालहरू सूचीकृत गर्ने मेनु -Comment[nl]=Een menu met een lijst van alle geopende vensters -Comment[nn]=Ein meny som viser alle opne vindauge -Comment[pa]=ਸਭ ਖੁੱਲੇ ਝਰੋਖਿਆਂ ਦੀ ਸੂਚੀ ਲਈ ਇੱਕ ਮੇਨੂ ਹੈ -Comment[pl]=Menu pokazujące wszystkie otwarte okna -Comment[pt]=Um menu que mostra todas as janelas abertas -Comment[pt_BR]=Um menu que lista todas as janelas abertas -Comment[ro]=Un meniu ce listează toate ferestrele deschise -Comment[ru]=Список всех открытых окон -Comment[rw]=Ibikubiyemo bitanga urutonde w'amadirishya yose afunguye -Comment[se]=Fállu mas oidnot buot rabas láset -Comment[sk]=Menu, ktoré zobrazí zoznam okien -Comment[sl]=Meni, ki prikazuje seznam vseh odprtih oken -Comment[sr]=Мени који листа све отворене прозоре -Comment[sr@Latn]=Meni koji lista sve otvorene prozore -Comment[sv]=En meny som listar alla öppna fönster -Comment[th]=เมนูที่แสดงรายการหน้าต่างที่เปิดอยู่ทั้งหมด -Comment[tr]=Bütün Pencereleri listeleyen bir menü -Comment[tt]=Bar açıq täräzä tezmäse belän saylaq -Comment[uk]=Меню, яке дає перелік всіх відкритих вікон -Comment[uz]=Hamma ochiq oynalar roʻyxati -Comment[uz@cyrillic]=Ҳамма очиқ ойналар рўйхати -Comment[vi]=Một thực đơn liệt kê tất cả các cửa sổ đang mở -Comment[wa]=Ene dressêye ki fwait l' djivêye di tos les drovîs purneas -Comment[zh_CN]=列出打开的全部窗口的菜单 -Comment[zh_TW]=一個列出所有開啟視窗的選單 -Icon=window_list + +Icon=window_duplicate X-TDE-Library=WindowListButton diff --git a/kicker/kicker/buttons/windowlistbutton.cpp b/kicker/kicker/buttons/windowlistbutton.cpp index f1c72904e..cbcfd4b75 100644 --- a/kicker/kicker/buttons/windowlistbutton.cpp +++ b/kicker/kicker/buttons/windowlistbutton.cpp @@ -38,7 +38,7 @@ WindowListButton::WindowListButton( TQWidget* parent ) setTitle(i18n("Window List")); TQToolTip::add(this, i18n("Window list")); - setIcon("window_list"); + setIcon("window_duplicate"); } void WindowListButton::initPopup() diff --git a/kicker/kicker/buttons/windowlistbutton.h b/kicker/kicker/buttons/windowlistbutton.h index d8b57c62e..d9b67fb67 100644 --- a/kicker/kicker/buttons/windowlistbutton.h +++ b/kicker/kicker/buttons/windowlistbutton.h @@ -33,7 +33,7 @@ class KWindowListMenu; */ class WindowListButton : public PanelPopupButton { - Q_OBJECT + TQ_OBJECT public: WindowListButton( TQWidget* parent ); diff --git a/kicker/kicker/core/CMakeLists.txt b/kicker/kicker/core/CMakeLists.txt index 3722f75d3..b75dc3d5a 100644 --- a/kicker/kicker/core/CMakeLists.txt +++ b/kicker/kicker/core/CMakeLists.txt @@ -30,7 +30,11 @@ link_directories( ##### other data ################################ install( FILES default-apps DESTINATION ${DATA_INSTALL_DIR}/kicker ) -install( FILES childpanelextension.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/extensions ) +tde_create_translated_desktop( + SOURCE childpanelextension.desktop + DESTINATION ${DATA_INSTALL_DIR}/kicker/extensions + PO_DIR kicker-desktops +) ##### kicker_core (static) ###################### diff --git a/kicker/kicker/core/applethandle.cpp b/kicker/kicker/core/applethandle.cpp index 1806fedbb..6299a6650 100644 --- a/kicker/kicker/core/applethandle.cpp +++ b/kicker/kicker/core/applethandle.cpp @@ -58,14 +58,14 @@ AppletHandle::AppletHandle(AppletContainer* parent) m_dragBar->installEventFilter(this); m_layout->addWidget(m_dragBar); - if (kapp->authorizeTDEAction("kicker_rmb")) + if (tdeApp->authorizeTDEAction("kicker_rmb")) { m_menuButton = new AppletHandleButton( this ); m_menuButton->installEventFilter(this); m_layout->addWidget(m_menuButton); - connect(m_menuButton, TQT_SIGNAL(pressed()), - this, TQT_SLOT(menuButtonPressed())); + connect(m_menuButton, TQ_SIGNAL(pressed()), + this, TQ_SLOT(menuButtonPressed())); TQToolTip::add(m_menuButton, i18n("%1 menu").arg(parent->info().name())); } @@ -89,7 +89,7 @@ int AppletHandle::widthForHeight( int /* h */ ) const void AppletHandle::setPopupDirection(KPanelApplet::Direction d) { - Qt::ArrowType a = Qt::UpArrow; + TQt::ArrowType a = TQt::UpArrow; if (d == m_popupDirection || !m_menuButton) { @@ -102,19 +102,19 @@ void AppletHandle::setPopupDirection(KPanelApplet::Direction d) { case KPanelApplet::Up: m_layout->setDirection(TQBoxLayout::BottomToTop); - a = Qt::UpArrow; + a = TQt::UpArrow; break; case KPanelApplet::Down: m_layout->setDirection(TQBoxLayout::TopToBottom); - a = Qt::DownArrow; + a = TQt::DownArrow; break; case KPanelApplet::Left: m_layout->setDirection(TQBoxLayout::RightToLeft); - a = Qt::LeftArrow; + a = TQt::LeftArrow; break; case KPanelApplet::Right: m_layout->setDirection(TQBoxLayout::LeftToRight); - a = Qt::RightArrow; + a = TQt::RightArrow; break; } @@ -151,8 +151,8 @@ void AppletHandle::setFadeOutHandle(bool fadeOut) if (!m_handleHoverTimer) { m_handleHoverTimer = new TQTimer(this, "m_handleHoverTimer"); - connect(m_handleHoverTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(checkHandleHover())); + connect(m_handleHoverTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(checkHandleHover())); m_applet->installEventFilter(this); } } @@ -200,7 +200,7 @@ bool AppletHandle::eventFilter(TQObject *o, TQEvent *e) // a hack for applets that have out-of-process // elements (e.g the systray) so that the handle // doesn't flicker when moving over those elements - if (TQT_TQRECT_OBJECT(w->rect()).contains(w->mapFromGlobal(TQCursor::pos()))) + if (w->rect().contains(w->mapFromGlobal(TQCursor::pos()))) { nowDrawIt = true; } @@ -220,12 +220,12 @@ bool AppletHandle::eventFilter(TQObject *o, TQEvent *e) return TQWidget::eventFilter( o, e ); } - else if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_dragBar)) + else if (o == m_dragBar) { if (e->type() == TQEvent::MouseButtonPress) { - TQMouseEvent* ev = TQT_TQMOUSEEVENT(e); - if (ev->button() == Qt::LeftButton || ev->button() == Qt::MidButton) + TQMouseEvent* ev = static_cast<TQMouseEvent*>(e); + if (ev->button() == TQt::LeftButton || ev->button() == TQt::MidButton) { emit moveApplet(m_applet->mapFromGlobal(ev->globalPos())); } @@ -234,8 +234,8 @@ bool AppletHandle::eventFilter(TQObject *o, TQEvent *e) if (m_menuButton && e->type() == TQEvent::MouseButtonPress) { - TQMouseEvent* ev = TQT_TQMOUSEEVENT(e); - if (ev->button() == Qt::RightButton) + TQMouseEvent* ev = static_cast<TQMouseEvent*>(e); + if (ev->button() == TQt::RightButton) { if (!m_menuButton->isDown()) { @@ -252,7 +252,7 @@ bool AppletHandle::eventFilter(TQObject *o, TQEvent *e) void AppletHandle::menuButtonPressed() { - if (!kapp->authorizeTDEAction("kicker_rmb")) + if (!tdeApp->authorizeTDEAction("kicker_rmb")) { return; } @@ -312,7 +312,7 @@ TQSize AppletHandleDrag::minimumSizeHint() const { int wh = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this); - if (m_parent->orientation() == Qt::Horizontal) + if (m_parent->orientation() == TQt::Horizontal) { return TQSize(wh, 0); } @@ -322,7 +322,7 @@ TQSize AppletHandleDrag::minimumSizeHint() const TQSizePolicy AppletHandleDrag::sizePolicy() const { - if (m_parent->orientation() == Qt::Horizontal) + if (m_parent->orientation() == TQt::Horizontal) { return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Preferred ); } @@ -360,14 +360,14 @@ void AppletHandleDrag::paintEvent(TQPaintEvent *) TQStyle::SFlags flags = TQStyle::Style_Default; flags |= TQStyle::Style_Enabled; - if (m_parent->orientation() == Qt::Horizontal) + if (m_parent->orientation() == TQt::Horizontal) { flags |= TQStyle::Style_Horizontal; } TQRect r = rect(); - style().tqdrawPrimitive(TQStyle::PE_DockWindowHandle, &p, r, + style().drawPrimitive(TQStyle::PE_DockWindowHandle, &p, r, colorGroup(), flags); } else @@ -387,7 +387,7 @@ TQSize AppletHandleButton::minimumSizeHint() const int height = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this); int width = height; - if (m_parent->orientation() == Qt::Horizontal) + if (m_parent->orientation() == TQt::Horizontal) { return TQSize(width, height); } diff --git a/kicker/kicker/core/applethandle.h b/kicker/kicker/core/applethandle.h index 34e8e3576..578bc1dc3 100644 --- a/kicker/kicker/core/applethandle.h +++ b/kicker/kicker/core/applethandle.h @@ -37,7 +37,7 @@ class AppletHandleButton; class AppletHandle : public TQWidget { - Q_OBJECT + TQ_OBJECT public: AppletHandle(AppletContainer* parent); @@ -87,7 +87,7 @@ class AppletHandle : public TQWidget class AppletHandleDrag : public TQWidget { - Q_OBJECT + TQ_OBJECT public: AppletHandleDrag(AppletHandle* parent); @@ -109,7 +109,7 @@ class AppletHandleDrag : public TQWidget class AppletHandleButton : public SimpleArrowButton { - Q_OBJECT + TQ_OBJECT public: AppletHandleButton(AppletHandle *parent); diff --git a/kicker/kicker/core/childpanelextension.desktop b/kicker/kicker/core/childpanelextension.desktop index 5b17c4550..c734c51c5 100644 --- a/kicker/kicker/core/childpanelextension.desktop +++ b/kicker/kicker/core/childpanelextension.desktop @@ -1,140 +1,7 @@ [Desktop Entry] Name=Panel -Name[af]=Paneel -Name[ar]=اللوح -Name[be]=Панэль -Name[bg]=Системен панел -Name[bn]=প্যানেল -Name[br]=Panell -Name[ca]=Plafó -Name[de]=Kontrollleiste -Name[el]=Πίνακας -Name[eo]=Panelo -Name[et]=Paneel -Name[eu]=Panela -Name[fa]=تابلو -Name[fi]=Paneeli -Name[fo]=Bróst -Name[fr]=Tableau de bord -Name[fy]=Paniel -Name[ga]=Painéal -Name[gl]=Painel -Name[he]=לוח -Name[hi]=फलक -Name[hr]=Ploča -Name[is]=Spjald -Name[it]=Pannello -Name[ja]=パネル -Name[ka]=პანელი -Name[kk]=Панель -Name[km]=បន្ទះ -Name[ko]=패널 -Name[lo]=ถาดพาเนล -Name[lt]=Pultas -Name[lv]=Panelis -Name[mk]=Панел -Name[nds]=Paneel -Name[ne]=प्यानल -Name[nl]=Paneel -Name[oc]=Panèu de contròle -Name[pa]=ਪੈਨਲ -Name[pt]=Painel -Name[pt_BR]=Painel -Name[ro]=Panou -Name[ru]=Панель -Name[rw]=Umwanya -Name[se]=Panela -Name[sl]=Pult -Name[sr]=Панел -Name[ta]=பலகம் -Name[te]=పెనల్ -Name[tg]=Панел -Name[th]=พาเนล -Name[tt]=Tirä -Name[uk]=Панель -Name[uz@cyrillic]=Панел -Name[ven]=Phanele -Name[vi]=Bảng điều khiển -Name[wa]=Scriftôr -Name[xh]=Iqela lenjongo ethile -Name[zh_CN]=面板 -Name[zh_TW]=面板 -Name[zu]=Iwindi lemininingwane + Comment=Child panel extension. -Comment[af]=Kind paneel uitbreiding. -Comment[ar]=إمتداد لوح المهام الإبن. -Comment[az]=Törəmə panel uzantısı. -Comment[be]=Пашырэнне дадатковай панэлі. -Comment[bg]=Разширение на системния панел -Comment[bn]=চাইল্ড প্যানেল এক্সটেনশন -Comment[bs]=Proširenje osnovnog panela. -Comment[ca]=Una extensió del plafó petitet. -Comment[cs]=Rozšíření závislého panelu. -Comment[csb]=Rozszérzenié òtrokòwégò panelu. -Comment[cy]=Estyniad panel plentyn -Comment[da]=Udvidelse med underpanel. -Comment[de]=Abhängige Kontrollleiste -Comment[el]=Επέκταση θυγατρικού πίνακα. -Comment[eo]=Ido-panelaldono. -Comment[es]=Extensión Panel hijo. -Comment[et]=Paneeli laiendus alampaneelide loomiseks -Comment[eu]=Panel semearen hedapena -Comment[fa]=پسوند تابلوی فرزند. -Comment[fi]=Lapsipaaneelilaajennus -Comment[fr]=Extension du tableau de bord -Comment[fy]=Dochterpanielekstinsje -Comment[gl]=Extensión de painel fillo. -Comment[he]=הרחבת לוח צאצא. -Comment[hi]=शिशु फलक विस्तार. -Comment[hr]=Proširenje za dodatnu ploču -Comment[hu]=Gyermek-panel. -Comment[is]=Útvíkkun undirspjalds. -Comment[it]=Estensione del pannello -Comment[ja]=子パネル拡張 -Comment[ka]=შვილეული პანელის გაფართოვება -Comment[kk]=Еншілес панель. -Comment[km]=ផ្នែកបន្ថែមបន្ទះកូន ។ -Comment[lo]=ສ່ວນຂະຫຍາຍພາເນລລູກ -Comment[lt]=Priklausomo pulto išplėtimas. -Comment[lv]=Palīg paneļa paplašinājums. -Comment[mk]=Екстензија - дете панел. -Comment[mn]=Хүү удирдах самбарын өргөтгөл -Comment[ms]=Lanjutan panel anak. -Comment[mt]=Estensjoni sotto-pannell. -Comment[nb]=Barnepanelutvidelse -Comment[nds]=Verwiedern för en ünnerornt Paneel. -Comment[ne]=शाखा प्यानल विस्तार -Comment[nl]=Dochterpaneelextensie. -Comment[nn]=Barnepanelutviding -Comment[nso]=Koketso ya Panel ya Ngwana -Comment[pa]=ਅੱਗੇ ਪੈਨਲ ਵਧਾਰਾ ਹੈ। -Comment[pl]=Rozszerzenie panelu potomnego. -Comment[pt]=Extensão painel filho. -Comment[pt_BR]=Extensão de painel-filho. -Comment[ro]=Extensie panou fiu. -Comment[ru]=Расширение дочерней панели -Comment[rw]=Umugereka w'umwanya mwana. -Comment[se]=Vuollepanela viiddádus -Comment[sk]=Rozšírenie pre potomkov panelu. -Comment[sl]=Razširitev za podrejeni pult. -Comment[sr]=Дечји панел, проширење панела. -Comment[sr@Latn]=Dečji panel, proširenje panela. -Comment[sv]=Underpanelutbyggnad -Comment[ta]=சிறுவர் பலக விரிவாக்கம். -Comment[tg]=Басти сафҳаи контроли кӯдак -Comment[th]=ส่วนขยายพาเนลลูก -Comment[tr]=Çocuk Panel uzantısı. -Comment[tt]=Bala taqta östämäse. -Comment[uk]=Розширення панелі-нащадка. -Comment[uz]=Ikkilamchi panel kengaytmasi -Comment[uz@cyrillic]=Иккиламчи панел кенгайтмаси -Comment[ven]=Thumanyo ya phanele ya nwana -Comment[vi]=Các bảng điều khiển con mở rộng -Comment[wa]=Module do scriftôr -Comment[xh]=Ulwandiso lweqela lenjongo ethile yomntwana. -Comment[zh_CN]=子面板扩展。 -Comment[zh_TW]=子面板延伸。 -Comment[zu]=Isandiso sewindi lemininingwane elingumntwana. Icon=kicker X-TDE-Library=childpanel_panelextension diff --git a/kicker/kicker/core/container_applet.cpp b/kicker/kicker/core/container_applet.cpp index d710a1ade..5ba59dfbc 100644 --- a/kicker/kicker/core/container_applet.cpp +++ b/kicker/kicker/core/container_applet.cpp @@ -39,8 +39,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tdemessagebox.h> #include <kpanelapplet.h> #include <tdepopupmenu.h> -#include <kprocess.h> -#include <kstandarddirs.h> +#include <tdeprocess.h> +#include <tdestandarddirs.h> #include "applethandle.h" #include "appletinfo.h" @@ -79,7 +79,7 @@ AppletContainer::AppletContainer(const AppletInfo& info, _appletframe->setFrameStyle(TQFrame::NoFrame); _appletframe->installEventFilter(this); - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { _layout = new TQBoxLayout(this, TQBoxLayout::LeftToRight, 0, 0); } @@ -92,10 +92,10 @@ AppletContainer::AppletContainer(const AppletInfo& info, _layout->addSpacing(APPLET_MARGIN); _handle = new AppletHandle(this); - _layout->addWidget(TQT_TQWIDGET(_handle), 0); - connect(_handle, TQT_SIGNAL(moveApplet(const TQPoint&)), - this, TQT_SLOT(moveApplet(const TQPoint&))); - connect(_handle, TQT_SIGNAL(showAppletMenu()), this, TQT_SLOT(showAppletMenu())); + _layout->addWidget(_handle, 0); + connect(_handle, TQ_SIGNAL(moveApplet(const TQPoint&)), + this, TQ_SLOT(moveApplet(const TQPoint&))); + connect(_handle, TQ_SIGNAL(showAppletMenu()), this, TQ_SLOT(showAppletMenu())); _layout->addWidget(_appletframe, 1); _layout->activate(); @@ -124,12 +124,12 @@ AppletContainer::AppletContainer(const AppletInfo& info, setImmutable(immutable); - connect(_applet, TQT_SIGNAL(updateLayout()), TQT_SLOT(slotUpdateLayout())); - connect(_applet, TQT_SIGNAL(requestFocus()), TQT_SLOT(activateWindow())); - connect(_applet, TQT_SIGNAL(requestFocus(bool)), TQT_SLOT(focusRequested(bool))); + connect(_applet, TQ_SIGNAL(updateLayout()), TQ_SLOT(slotUpdateLayout())); + connect(_applet, TQ_SIGNAL(requestFocus()), TQ_SLOT(activateWindow())); + connect(_applet, TQ_SIGNAL(requestFocus(bool)), TQ_SLOT(focusRequested(bool))); - connect(Kicker::the(), TQT_SIGNAL(configurationChanged()), - this, TQT_SLOT(slotReconfigure())); + connect(Kicker::the(), TQ_SIGNAL(configurationChanged()), + this, TQ_SLOT(slotReconfigure())); } void AppletContainer::configure() @@ -139,7 +139,7 @@ void AppletContainer::configure() if (isImmutable() || KickerSettings::hideAppletHandles() || - !kapp->authorizeTDEAction("kicker_rmb")) + !tdeApp->authorizeTDEAction("kicker_rmb")) { if (_handle->isVisibleTo(this)) { @@ -191,7 +191,7 @@ void AppletContainer::resetLayout() { _handle->resetLayout(); - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { _layout->setDirection( TQBoxLayout::LeftToRight ); } @@ -216,7 +216,7 @@ void AppletContainer::signalToBeRemoved() void AppletContainer::showAppletMenu() { - if (!kapp->authorizeTDEAction("kicker_rmb")) + if (!tdeApp->authorizeTDEAction("kicker_rmb")) { return; } @@ -225,7 +225,7 @@ void AppletContainer::showAppletMenu() Kicker::the()->setInsertionPoint(_handle->mapToGlobal(_handle->rect().center())); - switch(menu->exec(KickerLib::popupPosition(popupDirection(), menu, TQT_TQWIDGET(_handle)))) + switch(menu->exec(KickerLib::popupPosition(popupDirection(), menu, _handle))) { case PanelAppletOpMenu::Move: moveApplet(_handle->mapToParent(_handle->rect().center())); @@ -298,7 +298,7 @@ void AppletContainer::doSaveConfiguration( TDEConfigGroup& config, bool layoutOnly ) const { // immutability is checked by ContainerBase - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { config.writeEntry( "WidthForHeightHint", widthForHeight(height()) ); } @@ -321,8 +321,8 @@ TQPopupMenu* AppletContainer::createOpMenu() _info.name(), _info.icon(), this); - connect(opMenu, TQT_SIGNAL(escapePressed()), - _handle, TQT_SLOT(toggleMenuButtonOff())); + connect(opMenu, TQ_SIGNAL(escapePressed()), + _handle, TQ_SLOT(toggleMenuButtonOff())); return opMenu; } @@ -461,7 +461,7 @@ void AppletContainer::setImmutable(bool immutable) BaseContainer::setImmutable(immutable); if (isImmutable() || KickerSettings::hideAppletHandles() || - !kapp->authorizeTDEAction("kicker_rmb")) + !tdeApp->authorizeTDEAction("kicker_rmb")) { if (_handle->isVisibleTo(this)) { @@ -471,7 +471,7 @@ void AppletContainer::setImmutable(bool immutable) } else if (!_handle->isVisibleTo(this)) { - TQToolTip::add(TQT_TQWIDGET(_handle), _info.name()); + TQToolTip::add(_handle, _info.name()); _handle->show(); setBackground(); } diff --git a/kicker/kicker/core/container_applet.h b/kicker/kicker/core/container_applet.h index 458f18fe0..d5b80930e 100644 --- a/kicker/kicker/core/container_applet.h +++ b/kicker/kicker/core/container_applet.h @@ -40,7 +40,7 @@ class AppletHandle; class AppletContainer : public BaseContainer { - Q_OBJECT + TQ_OBJECT public: AppletContainer(const AppletInfo& info, TQPopupMenu* opMenu, bool isImmutable = false, TQWidget* parent = 0); diff --git a/kicker/kicker/core/container_base.cpp b/kicker/kicker/core/container_base.cpp index e3131b2ed..64886f436 100644 --- a/kicker/kicker/core/container_base.cpp +++ b/kicker/kicker/core/container_base.cpp @@ -37,7 +37,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. BaseContainer::BaseContainer( TQPopupMenu* appletOpMenu, TQWidget* parent, const char * name ) : TQWidget( parent, name ) , _dir(KPanelApplet::Up) - , _orient(Qt::Horizontal) + , _orient(TQt::Horizontal) , _alignment(KPanelExtension::LeftTop) , _fspace(0) , _moveOffset(TQPoint(0,0)) @@ -47,7 +47,7 @@ BaseContainer::BaseContainer( TQPopupMenu* appletOpMenu, TQWidget* parent, const , _opMnu(0) , _appletOpMnu(appletOpMenu) { - setCursor(tqarrowCursor); + setCursor(TQt::arrowCursor); } BaseContainer::~BaseContainer() diff --git a/kicker/kicker/core/container_base.h b/kicker/kicker/core/container_base.h index 88e06e715..6cf61bec6 100644 --- a/kicker/kicker/core/container_base.h +++ b/kicker/kicker/core/container_base.h @@ -36,7 +36,7 @@ class TQPopupMenu; class BaseContainer : public TQWidget { - Q_OBJECT + TQ_OBJECT public: typedef TQValueList<BaseContainer*> List; diff --git a/kicker/kicker/core/container_button.cpp b/kicker/kicker/core/container_button.cpp index 40f479308..c35f54606 100644 --- a/kicker/kicker/core/container_button.cpp +++ b/kicker/kicker/core/container_button.cpp @@ -161,13 +161,13 @@ void ButtonContainer::embedButton(PanelButton* b) } _layout = vbox; - connect(_button, TQT_SIGNAL(requestSave()), TQT_SIGNAL(requestSave())); - connect(_button, TQT_SIGNAL(hideme(bool)), TQT_SLOT(hideRequested(bool))); - connect(_button, TQT_SIGNAL(removeme()), TQT_SLOT(removeRequested())); - connect(_button, TQT_SIGNAL(dragme(const TQPixmap)), - TQT_SLOT(dragButton(const TQPixmap))); - connect(_button, TQT_SIGNAL(dragme(const KURL::List, const TQPixmap)), - TQT_SLOT(dragButton(const KURL::List, const TQPixmap))); + connect(_button, TQ_SIGNAL(requestSave()), TQ_SIGNAL(requestSave())); + connect(_button, TQ_SIGNAL(hideme(bool)), TQ_SLOT(hideRequested(bool))); + connect(_button, TQ_SIGNAL(removeme()), TQ_SLOT(removeRequested())); + connect(_button, TQ_SIGNAL(dragme(const TQPixmap)), + TQ_SLOT(dragButton(const TQPixmap))); + connect(_button, TQ_SIGNAL(dragme(const KURL::List, const TQPixmap)), + TQ_SLOT(dragButton(const KURL::List, const TQPixmap))); } TQPopupMenu* ButtonContainer::createOpMenu() @@ -225,7 +225,7 @@ void ButtonContainer::dragButton(const TQPixmap icon) bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e) { - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(_button) && e->type() == TQEvent::MouseButtonPress) + if (o == _button && e->type() == TQEvent::MouseButtonPress) { static bool sentinal = false; @@ -235,10 +235,10 @@ bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e) } sentinal = true; - TQMouseEvent* me = TQT_TQMOUSEEVENT(e); + TQMouseEvent* me = static_cast<TQMouseEvent*>(e); switch (me->button()) { - case Qt::MidButton: + case TQt::MidButton: { if (isImmutable()) { @@ -252,18 +252,18 @@ bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e) return true; } - case Qt::RightButton: + case TQt::RightButton: { - if (!kapp->authorizeTDEAction("kicker_rmb") || + if (!tdeApp->authorizeTDEAction("kicker_rmb") || isImmutable()) { break; } TQPopupMenu* menu = opMenu(); - connect( menu, TQT_SIGNAL( aboutToHide() ), this, TQT_SLOT( slotMenuClosed() ) ); - TQPoint pos = KickerLib::popupPosition(popupDirection(), menu, TQT_TQWIDGET(this), - (orientation() == Qt::Horizontal) ? + connect( menu, TQ_SIGNAL( aboutToHide() ), this, TQ_SLOT( slotMenuClosed() ) ); + TQPoint pos = KickerLib::popupPosition(popupDirection(), menu, this, + (orientation() == TQt::Horizontal) ? TQPoint(0, 0) : me->pos()); Kicker::the()->setInsertionPoint(me->globalPos()); diff --git a/kicker/kicker/core/container_button.h b/kicker/kicker/core/container_button.h index bc24272db..d564354b0 100644 --- a/kicker/kicker/core/container_button.h +++ b/kicker/kicker/core/container_button.h @@ -36,7 +36,7 @@ class TDEConfigGroup; class ButtonContainer : public BaseContainer { - Q_OBJECT + TQ_OBJECT public: ButtonContainer(TQPopupMenu* opMenu, TQWidget* parent = 0); @@ -151,7 +151,7 @@ public: WindowListButtonContainer(const TDEConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0); WindowListButtonContainer(TQPopupMenu* opMenu, TQWidget* parent = 0); TQString appletType() const { return "WindowListButton"; } - virtual TQString icon() const { return "window_list"; } + virtual TQString icon() const { return "window_duplicate"; } virtual TQString visibleName() const { return i18n("Windowlist"); } bool isAMenu() const { return true; } }; diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp index 721df418e..a58b006ee 100644 --- a/kicker/kicker/core/container_extension.cpp +++ b/kicker/kicker/core/container_extension.cpp @@ -40,10 +40,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <dcopclient.h> #include <tdeconfig.h> #include <kdebug.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <tdeglobal.h> #include <kicker.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <twin.h> #include <tdelocale.h> #include <tdeglobalsettings.h> @@ -137,20 +137,20 @@ void ExtensionContainer::init() KWin::setState(winId(), NET::Sticky); KWin::setOnAllDesktops(winId(), true); - connect(Kicker::the()->twinModule(), TQT_SIGNAL(strutChanged()), this, TQT_SLOT(strutChanged())); - connect(Kicker::the()->twinModule(), TQT_SIGNAL(currentDesktopChanged(int)), - this, TQT_SLOT( currentDesktopChanged(int))); + connect(Kicker::the()->twinModule(), TQ_SIGNAL(strutChanged()), this, TQ_SLOT(strutChanged())); + connect(Kicker::the()->twinModule(), TQ_SIGNAL(currentDesktopChanged(int)), + this, TQ_SLOT( currentDesktopChanged(int))); setBackgroundOrigin(AncestorOrigin); setFrameStyle(NoFrame); setLineWidth(0); setMargin(0); - connect(UnhideTrigger::the(), TQT_SIGNAL(triggerUnhide(UnhideTrigger::Trigger,int)), - this, TQT_SLOT(unhideTriggered(UnhideTrigger::Trigger,int))); + connect(UnhideTrigger::the(), TQ_SIGNAL(triggerUnhide(UnhideTrigger::Trigger,int)), + this, TQ_SLOT(unhideTriggered(UnhideTrigger::Trigger,int))); - _popupWidgetFilter = new PopupWidgetFilter( TQT_TQOBJECT(this) ); - connect(_popupWidgetFilter, TQT_SIGNAL(popupWidgetHiding()), TQT_SLOT(maybeStartAutoHideTimer())); + _popupWidgetFilter = new PopupWidgetFilter( this ); + connect(_popupWidgetFilter, TQ_SIGNAL(popupWidgetHiding()), TQ_SLOT(maybeStartAutoHideTimer())); // layout _layout = new TQGridLayout(this, 3, 3, 0, 0); @@ -160,15 +160,15 @@ void ExtensionContainer::init() // instantiate the autohide timer _autohideTimer = new TQTimer(this, "_autohideTimer"); - connect(_autohideTimer, TQT_SIGNAL(timeout()), TQT_SLOT(autoHideTimeout())); + connect(_autohideTimer, TQ_SIGNAL(timeout()), TQ_SLOT(autoHideTimeout())); // instantiate the updateLayout event compressor timer _updateLayoutTimer = new TQTimer(this, "_updateLayoutTimer"); - connect(_updateLayoutTimer, TQT_SIGNAL(timeout()), TQT_SLOT(actuallyUpdateLayout())); + connect(_updateLayoutTimer, TQ_SIGNAL(timeout()), TQ_SLOT(actuallyUpdateLayout())); installEventFilter(this); // for mouse event handling - connect(Kicker::the(), TQT_SIGNAL(tdedisplayPaletteChanged()), this, TQT_SLOT(updateHighlightColor())); + connect(Kicker::the(), TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(updateHighlightColor())); updateHighlightColor(); // if we were hidden when kicker quit, let's start out hidden as well! @@ -207,9 +207,9 @@ void ExtensionContainer::init() item->setDefaultValue(m_extension->customSize()); } - connect(m_extension, TQT_SIGNAL(updateLayout()), TQT_SLOT(updateLayout())); - connect(m_extension, TQT_SIGNAL(maintainFocus(bool)), - TQT_SLOT(maintainFocus(bool))); + connect(m_extension, TQ_SIGNAL(updateLayout()), TQ_SLOT(updateLayout())); + connect(m_extension, TQ_SIGNAL(maintainFocus(bool)), + TQ_SLOT(maintainFocus(bool))); _layout->addWidget(m_extension, 1, 1); } @@ -371,7 +371,7 @@ void ExtensionContainer::writeConfig() void ExtensionContainer::showPanelMenu( const TQPoint& globalPos ) { - if (!kapp->authorizeTDEAction("kicker_rmb")) + if (!tdeApp->authorizeTDEAction("kicker_rmb")) { return; } @@ -387,7 +387,7 @@ void ExtensionContainer::showPanelMenu( const TQPoint& globalPos ) if (!_opMnu) { - KDesktopFile f(TDEGlobal::dirs()->findResource("extensions", _info.desktopFile())); + TDEDesktopFile f(TDEGlobal::dirs()->findResource("extensions", _info.desktopFile())); _opMnu = new PanelExtensionOpMenu(f.readName(), m_extension ? m_extension->actions() : 0, this); @@ -484,7 +484,7 @@ void ExtensionContainer::moveMe() if (screen < 0) { - screen = kapp->desktop()->screenNumber(this); + screen = tdeApp->desktop()->screenNumber(this); } if (screen < 0) @@ -733,7 +733,7 @@ void ExtensionContainer::autoHideTimeout() { // kdDebug(1210) << "PanelContainer::autoHideTimeout() " << name() << endl; // Hack: If there is a popup open, don't autohide until it closes. - TQWidget* popup = TQT_TQWIDGET(TQApplication::activePopupWidget()); + TQWidget* popup = TQApplication::activePopupWidget(); if (popup) { @@ -885,7 +885,7 @@ void ExtensionContainer::autoHide(bool hide) _in_autohide = false; - TQTimer::singleShot(100, this, TQT_SLOT(enableMouseOverEffects())); + TQTimer::singleShot(100, this, TQ_SLOT(enableMouseOverEffects())); } void ExtensionContainer::animatedHide(bool left) @@ -925,7 +925,7 @@ void ExtensionContainer::animatedHide(bool left) !TQApplication::desktop()->screenGeometry(s).intersects(geometry())) { blockUserInput(false); - TQTimer::singleShot(100, this, TQT_SLOT(enableMouseOverEffects())); + TQTimer::singleShot(100, this, TQ_SLOT(enableMouseOverEffects())); return; } } @@ -988,7 +988,7 @@ void ExtensionContainer::animatedHide(bool left) config->setGroup(extensionId()); config->writeEntry("UserHidden", userHidden()); - TQTimer::singleShot(100, this, TQT_SLOT(enableMouseOverEffects())); + TQTimer::singleShot(100, this, TQ_SLOT(enableMouseOverEffects())); } bool ExtensionContainer::reserveStrut() const @@ -1208,7 +1208,7 @@ int ExtensionContainer::arrangeHideButtons() _layout->setEnabled(false); } - if (orientation() == Qt::Vertical) + if (orientation() == TQt::Vertical) { int maxWidth = width(); @@ -1227,7 +1227,7 @@ int ExtensionContainer::arrangeHideButtons() _ltHB->setMaximumWidth(maxWidth); _ltHB->setMaximumHeight(14); _layout->remove(_ltHB); - _layout->addWidget(_ltHB, 0, 1, Qt::AlignBottom | Qt::AlignLeft); + _layout->addWidget(_ltHB, 0, 1, TQt::AlignBottom | TQt::AlignLeft); } if (_rbHB) @@ -1252,21 +1252,21 @@ int ExtensionContainer::arrangeHideButtons() maxHeight = maxHeight - (PANEL_RESIZE_HANDLE_WIDTH + PANEL_BOTTOM_SPACING_W_RESIZE_HANDLE); } - int vertAlignment = (position() == KPanelExtension::Top) ? Qt::AlignTop : 0; - int leftAlignment = Qt::AlignRight; + int vertAlignment = (position() == KPanelExtension::Top) ? TQt::AlignTop : 0; + int leftAlignment = TQt::AlignRight; if (_ltHB) { _ltHB->setMaximumHeight(maxHeight); _ltHB->setMaximumWidth(14); _layout->remove(_ltHB); - if (kapp->reverseLayout()) + if (tdeApp->reverseLayout()) { - _layout->addWidget(_ltHB, 1, 2, (TQ_Alignment)vertAlignment); + _layout->addWidget(_ltHB, 1, 2, (TQt::AlignmentFlags)vertAlignment); } else { - _layout->addWidget(_ltHB, 1, 0, (TQ_Alignment)(leftAlignment | vertAlignment)); + _layout->addWidget(_ltHB, 1, 0, (TQt::AlignmentFlags)(leftAlignment | vertAlignment)); } } @@ -1275,13 +1275,13 @@ int ExtensionContainer::arrangeHideButtons() _rbHB->setMaximumHeight(maxHeight); _rbHB->setMaximumWidth(14); _layout->remove(_rbHB); - if (kapp->reverseLayout()) + if (tdeApp->reverseLayout()) { - _layout->addWidget(_rbHB, 1, 0, (TQ_Alignment)(leftAlignment | vertAlignment)); + _layout->addWidget(_rbHB, 1, 0, (TQt::AlignmentFlags)(leftAlignment | vertAlignment)); } else { - _layout->addWidget(_rbHB, 1, 2, (TQ_Alignment)vertAlignment); + _layout->addWidget(_rbHB, 1, 2, (TQt::AlignmentFlags)vertAlignment); } } } @@ -1315,7 +1315,7 @@ int ExtensionContainer::setupBorderSpace() TQRect r = TQApplication::desktop()->screenGeometry(xineramaScreen()); TQRect h = geometry(); - if (orientation() == Qt::Vertical) + if (orientation() == TQt::Vertical) { if (h.top() > 0) { @@ -1417,26 +1417,26 @@ void ExtensionContainer::paintEvent(TQPaintEvent *e) // KPanelExtension::Left/Right don't seem to draw the separators at all! if (position() == KPanelExtension::Left) { rect = TQRect(width()-2,0,PANEL_RESIZE_HANDLE_WIDTH,height()); - style().tqdrawPrimitive( TQStyle::PE_Separator, &p, rect, colorGroup(), TQStyle::Style_Horizontal ); + style().drawPrimitive( TQStyle::PE_Separator, &p, rect, colorGroup(), TQStyle::Style_Horizontal ); } else if (position() == KPanelExtension::Right) { rect = TQRect(0,0,PANEL_RESIZE_HANDLE_WIDTH,height()); - style().tqdrawPrimitive( TQStyle::PE_Separator, &p, rect, colorGroup(), TQStyle::Style_Horizontal ); + style().drawPrimitive( TQStyle::PE_Separator, &p, rect, colorGroup(), TQStyle::Style_Horizontal ); } else if (position() == KPanelExtension::Top) { // Nastiness to both vertically flip the PE_Separator // and make sure it pops out of, not sinks into, the screen TQPixmap inv_pm(width(),PANEL_RESIZE_HANDLE_WIDTH); - TQPainter myp(TQT_TQPAINTDEVICE(&inv_pm)); + TQPainter myp(&inv_pm); rect = TQRect(0,0,width(),PANEL_RESIZE_HANDLE_WIDTH); TQColorGroup darkcg = colorGroup(); darkcg.setColor(TQColorGroup::Light, colorGroup().dark()); - style().tqdrawPrimitive( TQStyle::PE_Separator, &myp, rect, darkcg, TQStyle::Style_Default ); + style().drawPrimitive( TQStyle::PE_Separator, &myp, rect, darkcg, TQStyle::Style_Default ); p.drawPixmap(0,height()-2,inv_pm); } else { rect = TQRect(0,0,width(),PANEL_RESIZE_HANDLE_WIDTH); - style().tqdrawPrimitive( TQStyle::PE_Separator, &p, rect, colorGroup(), TQStyle::Style_Default ); + style().drawPrimitive( TQStyle::PE_Separator, &p, rect, colorGroup(), TQStyle::Style_Default ); } } } @@ -1486,7 +1486,7 @@ void ExtensionContainer::unhideIfHidden(int showForAtLeastHowManyMS) { autoHide(false); TQTimer::singleShot(showForAtLeastHowManyMS, - this, TQT_SLOT(maybeStartAutoHideTimer())); + this, TQ_SLOT(maybeStartAutoHideTimer())); return; } @@ -1582,11 +1582,11 @@ KPanelExtension::Orientation ExtensionContainer::orientation() const { if (position() == KPanelExtension::Top || position() == KPanelExtension::Bottom) { - return Qt::Horizontal; + return TQt::Horizontal; } else { - return Qt::Vertical; + return TQt::Vertical; } } @@ -1627,18 +1627,18 @@ void ExtensionContainer::resetLayout() _ltHB = new HideButton(this); _ltHB->installEventFilter(this); _ltHB->setEnabled(true); - connect(_ltHB, TQT_SIGNAL(clicked()), this, TQT_SLOT(hideLeft())); + connect(_ltHB, TQ_SIGNAL(clicked()), this, TQ_SLOT(hideLeft())); haveToArrangeButtons = true; } - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { - _ltHB->setArrowType(Qt::LeftArrow); + _ltHB->setArrowType(TQt::LeftArrow); _ltHB->setFixedSize(m_settings.hideButtonSize(), height()); } else { - _ltHB->setArrowType(Qt::UpArrow); + _ltHB->setArrowType(TQt::UpArrow); _ltHB->setFixedSize(width(), m_settings.hideButtonSize()); } @@ -1658,18 +1658,18 @@ void ExtensionContainer::resetLayout() _rbHB = new HideButton(this); _rbHB->installEventFilter(this); _rbHB->setEnabled(true); - connect(_rbHB, TQT_SIGNAL(clicked()), this, TQT_SLOT(hideRight())); + connect(_rbHB, TQ_SIGNAL(clicked()), this, TQ_SLOT(hideRight())); haveToArrangeButtons = true; } - if ( orientation() == Qt::Horizontal) + if ( orientation() == TQt::Horizontal) { - _rbHB->setArrowType(Qt::RightArrow); + _rbHB->setArrowType(TQt::RightArrow); _rbHB->setFixedSize(m_settings.hideButtonSize(), height()); } else { - _rbHB->setArrowType(Qt::DownArrow); + _rbHB->setArrowType(TQt::DownArrow); _rbHB->setFixedSize(width(), m_settings.hideButtonSize()); } @@ -1709,7 +1709,7 @@ void ExtensionContainer::resetLayout() updateGeometry(); int endBorderWidth = haveToArrangeButtons ? arrangeHideButtons() : setupBorderSpace(); - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { if (m_extension) { @@ -2145,8 +2145,8 @@ bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e) { case TQEvent::MouseButtonPress: { - TQMouseEvent* me = TQT_TQMOUSEEVENT(e); - if ( me->button() == Qt::LeftButton ) + TQMouseEvent* me = static_cast<TQMouseEvent*>(e); + if ( me->button() == TQt::LeftButton ) { if (inResizeArea(me->pos())) { @@ -2170,7 +2170,7 @@ bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e) _is_lmb_down = true; } } - else if (me->button() == Qt::RightButton) + else if (me->button() == TQt::RightButton) { showPanelMenu(me->globalPos()); return true; // don't crash! @@ -2180,8 +2180,8 @@ bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e) case TQEvent::MouseButtonRelease: { - TQMouseEvent* me = TQT_TQMOUSEEVENT(e); - if ( me->button() == Qt::LeftButton ) + TQMouseEvent* me = static_cast<TQMouseEvent*>(e); + if ( me->button() == TQt::LeftButton ) { _is_lmb_down = false; } @@ -2190,7 +2190,7 @@ bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e) case TQEvent::MouseMove: { - TQMouseEvent* me = TQT_TQMOUSEEVENT(e); + TQMouseEvent* me = static_cast<TQMouseEvent*>(e); if (KickerSettings::useResizeHandle()) { KPanelExtension::Position pos = position(); @@ -2202,7 +2202,7 @@ bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e) } else { - setCursor(tqarrowCursor); + setCursor(TQt::arrowCursor); } } else if (pos == KPanelExtension::Right) @@ -2213,35 +2213,35 @@ bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e) } else { - setCursor(tqarrowCursor); + setCursor(TQt::arrowCursor); } } else if (pos == KPanelExtension::Top) { if (inResizeArea(me->pos())) { - setCursor(tqsizeVerCursor); + setCursor(TQt::sizeVerCursor); } else { - setCursor(tqarrowCursor); + setCursor(TQt::arrowCursor); } } else { if (inResizeArea(me->pos())) { - setCursor(tqsizeVerCursor); + setCursor(TQt::sizeVerCursor); } else { - setCursor(tqarrowCursor); + setCursor(TQt::arrowCursor); } } } if (_is_lmb_down && - ((me->state() & Qt::LeftButton) == Qt::LeftButton) && + ((me->state() & TQt::LeftButton) == TQt::LeftButton) && !Kicker::the()->isImmutable() && !m_settings.config()->isImmutable() && !ExtensionManager::the()->isMenuBar(this)) diff --git a/kicker/kicker/core/container_extension.h b/kicker/kicker/core/container_extension.h index 8948341d1..b1db1efeb 100644 --- a/kicker/kicker/core/container_extension.h +++ b/kicker/kicker/core/container_extension.h @@ -51,7 +51,7 @@ class TQColor; class ExtensionContainer : public TQFrame { - Q_OBJECT + TQ_OBJECT public: enum UserHidden { Unhidden, LeftTop, RightBottom }; @@ -203,7 +203,7 @@ private: class PopupWidgetFilter : public TQObject { - Q_OBJECT + TQ_OBJECT public: PopupWidgetFilter( TQObject *parent ); diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp index 5b1eb5c8c..cb61b16e8 100644 --- a/kicker/kicker/core/containerarea.cpp +++ b/kicker/kicker/core/containerarea.cpp @@ -35,13 +35,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tdeapplication.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurl.h> #include <kdebug.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <kiconloader.h> #include <kmimetype.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <krootpixmap.h> #include <kpixmap.h> #include <tdelocale.h> @@ -103,11 +103,11 @@ ContainerArea::ContainerArea(TDEConfig* _c, setBackground(); - connect(&_autoScrollTimer, TQT_SIGNAL(timeout()), TQT_SLOT(autoScroll())); - connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(setBackground())); - connect(Kicker::the(), TQT_SIGNAL(immutabilityChanged(bool)), - TQT_SLOT(immutabilityChanged(bool))); - connect(this, TQT_SIGNAL(contentsMoving(int, int)), TQT_SLOT(setBackground())); + connect(&_autoScrollTimer, TQ_SIGNAL(timeout()), TQ_SLOT(autoScroll())); + connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(setBackground())); + connect(Kicker::the(), TQ_SIGNAL(immutabilityChanged(bool)), + TQ_SLOT(immutabilityChanged(bool))); + connect(this, TQ_SIGNAL(contentsMoving(int, int)), TQ_SLOT(setBackground())); } ContainerArea::~ContainerArea() @@ -142,7 +142,7 @@ void ContainerArea::initialize(bool useDefaultConfig) } setAcceptDrops(!isImmutable()); - TQTimer::singleShot(0, this, TQT_SLOT(resizeContents())); + TQTimer::singleShot(0, this, TQ_SLOT(resizeContents())); } void ContainerArea::defaultContainerConfig() @@ -153,7 +153,7 @@ void ContainerArea::defaultContainerConfig() containers.append(new KMenuButtonContainer(m_opMenu, m_contents)); int dsize; - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { dsize = width(); } @@ -325,7 +325,7 @@ void ContainerArea::loadContainers(const TQStringList& containers) a = new DesktopButtonContainer(group, m_opMenu, m_contents); else if (appletType == "WindowListButton") a = new WindowListButtonContainer(group, m_opMenu, m_contents); - else if ((appletType == "BookmarksButton") && kapp->authorizeTDEAction("bookmarks")) + else if ((appletType == "BookmarksButton") && tdeApp->authorizeTDEAction("bookmarks")) a = new BookmarksButtonContainer(group, m_opMenu, m_contents); else if (appletType == "ServiceButton") a = new ServiceButtonContainer(group, m_opMenu, m_contents); @@ -377,7 +377,7 @@ void ContainerArea::loadContainers(const TQStringList& containers) // it gets executed too soon. we need to wait until the containers are // actually resized, but we enter the event loop prior to that happening // above. - TQTimer::singleShot(0, this, TQT_SLOT(updateContainersBackground())); + TQTimer::singleShot(0, this, TQ_SLOT(updateContainersBackground())); } void ContainerArea::saveContainerConfig(bool layoutOnly) @@ -438,7 +438,7 @@ const TQWidget* ContainerArea::addButton(const AppletInfo& info) if (buttonType == "BookmarksButton") { - if (kapp->authorizeTDEAction("bookmarks")) + if (tdeApp->authorizeTDEAction("bookmarks")) { return addBookmarksButton(); } @@ -728,20 +728,20 @@ void ContainerArea::addContainer(BaseContainer* a, bool arrange, int index) m_layout->add(a); } - connect(a, TQT_SIGNAL(moveme(BaseContainer*)), - TQT_SLOT(startContainerMove(BaseContainer*))); - connect(a, TQT_SIGNAL(removeme(BaseContainer*)), - TQT_SLOT(removeContainer(BaseContainer*))); - connect(a, TQT_SIGNAL(takeme(BaseContainer*)), - TQT_SLOT(takeContainer(BaseContainer*))); - connect(a, TQT_SIGNAL(requestSave()), - TQT_SLOT(slotSaveContainerConfig())); - connect(a, TQT_SIGNAL(maintainFocus(bool)), - this, TQT_SIGNAL(maintainFocus(bool))); + connect(a, TQ_SIGNAL(moveme(BaseContainer*)), + TQ_SLOT(startContainerMove(BaseContainer*))); + connect(a, TQ_SIGNAL(removeme(BaseContainer*)), + TQ_SLOT(removeContainer(BaseContainer*))); + connect(a, TQ_SIGNAL(takeme(BaseContainer*)), + TQ_SLOT(takeContainer(BaseContainer*))); + connect(a, TQ_SIGNAL(requestSave()), + TQ_SLOT(slotSaveContainerConfig())); + connect(a, TQ_SIGNAL(maintainFocus(bool)), + this, TQ_SIGNAL(maintainFocus(bool))); if (dynamic_cast<AppletContainer*>(a)) { - connect(a, TQT_SIGNAL(updateLayout()), TQT_SLOT(resizeContents())); + connect(a, TQ_SIGNAL(updateLayout()), TQ_SLOT(resizeContents())); } a->configure(orientation(), popupDirection()); @@ -824,16 +824,16 @@ void ContainerArea::takeContainer(BaseContainer* a) return; } - disconnect(a, TQT_SIGNAL(moveme(BaseContainer*)), - this, TQT_SLOT(startContainerMove(BaseContainer*))); - disconnect(a, TQT_SIGNAL(removeme(BaseContainer*)), - this, TQT_SLOT(removeContainer(BaseContainer*))); - disconnect(a, TQT_SIGNAL(takeme(BaseContainer*)), - this, TQT_SLOT(takeContainer(BaseContainer*))); - disconnect(a, TQT_SIGNAL(requestSave()), - this, TQT_SLOT(slotSaveContainerConfig())); - disconnect(a, TQT_SIGNAL(maintainFocus(bool)), - this, TQT_SIGNAL(maintainFocus(bool))); + disconnect(a, TQ_SIGNAL(moveme(BaseContainer*)), + this, TQ_SLOT(startContainerMove(BaseContainer*))); + disconnect(a, TQ_SIGNAL(removeme(BaseContainer*)), + this, TQ_SLOT(removeContainer(BaseContainer*))); + disconnect(a, TQ_SIGNAL(takeme(BaseContainer*)), + this, TQ_SLOT(takeContainer(BaseContainer*))); + disconnect(a, TQ_SIGNAL(requestSave()), + this, TQ_SLOT(slotSaveContainerConfig())); + disconnect(a, TQ_SIGNAL(maintainFocus(bool)), + this, TQ_SIGNAL(maintainFocus(bool))); // Just remove the group from our own config file. Leave separate config // files untouched. @@ -850,7 +850,7 @@ void ContainerArea::resizeContents() int w = width(); int h = height(); - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { int newWidth = m_layout->widthForHeight(h); if (newWidth > w) @@ -923,7 +923,7 @@ void ContainerArea::startContainerMove(BaseContainer *a) KickerTip::enableTipping(false); emit maintainFocus(true); setMouseTracking(true); - grabMouse(tqsizeAllCursor); + grabMouse(TQt::sizeAllCursor); m_layout->setStretchEnabled(false); a->raise(); @@ -940,7 +940,7 @@ void ContainerArea::mouseReleaseEvent(TQMouseEvent *) // so we need to complete the move here _autoScrollTimer.stop(); releaseMouse(); - setCursor(tqarrowCursor); + setCursor(TQt::arrowCursor); setMouseTracking(false); _moveAC->completeMoveOperation(); @@ -962,12 +962,12 @@ void ContainerArea::mouseMoveEvent(TQMouseEvent *ev) return; } - if (ev->state() == Qt::LeftButton && !TQT_TQRECT_OBJECT(rect()).contains(ev->pos())) + if (ev->state() == TQt::LeftButton && !rect().contains(ev->pos())) { // leaveEvent() doesn't work, while grabbing the mouse _autoScrollTimer.stop(); releaseMouse(); - setCursor(tqarrowCursor); + setCursor(TQt::arrowCursor); setMouseTracking(false); _moveAC->completeMoveOperation(); @@ -979,14 +979,14 @@ void ContainerArea::mouseMoveEvent(TQMouseEvent *ev) saveContainerConfig(true); PanelDrag *dd = new PanelDrag(_moveAC, this); - dd->setPixmap(kapp->iconLoader()->loadIcon(_moveAC->icon(), TDEIcon::Small)); + dd->setPixmap(tdeApp->iconLoader()->loadIcon(_moveAC->icon(), TDEIcon::Small)); grabKeyboard(); dd->drag(); releaseKeyboard(); return; } - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { int oldX = _moveAC->x() + _moveAC->moveOffset().x(); int x = ev->pos().x() + contentsX(); @@ -1082,7 +1082,7 @@ void ContainerArea::dragEnterEvent(TQDragEnterEvent *ev) preferedHeight = draggedContainer->heightForWidth(width()); } - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { _dragIndicator->setPreferredSize(TQSize(preferedWidth, height())); } @@ -1103,9 +1103,9 @@ void ContainerArea::dragEnterEvent(TQDragEnterEvent *ev) --it; BaseContainer* a = *it; - if ((orientation() == Qt::Horizontal && + if ((orientation() == TQt::Horizontal && a->x() < (ev->pos().x() + contentsX()) - _dragMoveOffset.x()) || - (orientation() == Qt::Vertical && + (orientation() == TQt::Vertical && a->y() < (ev->pos().y() + contentsY()) - _dragMoveOffset.y())) { _dragMoveAC = a; @@ -1114,7 +1114,7 @@ void ContainerArea::dragEnterEvent(TQDragEnterEvent *ev) } while (it != m_containers.begin()); } - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { moveDragIndicator(ev->pos().x() + contentsX() - _dragMoveOffset.x()); } @@ -1143,7 +1143,7 @@ void ContainerArea::dragMoveEvent(TQDragMoveEvent* ev) startContainerMove(_moveAC); // Align the container to the mouse position. - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { m_layout->moveContainerSwitch(_moveAC, ev->pos().x() + contentsX() - _moveAC->x()); } @@ -1159,7 +1159,7 @@ void ContainerArea::dragMoveEvent(TQDragMoveEvent* ev) return; } - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { moveDragIndicator(ev->pos().x() + contentsX() - _dragMoveOffset.x()); } @@ -1201,7 +1201,7 @@ void ContainerArea::dropEvent(TQDropEvent *ev) } TQObject *parent = ev->source() ? ev->source()->parent() : 0; - while (parent && (TQT_BASE_OBJECT(parent) != TQT_BASE_OBJECT(this))) + while (parent && (parent != this)) { parent = parent->parent(); } @@ -1209,13 +1209,13 @@ void ContainerArea::dropEvent(TQDropEvent *ev) if (parent) { // Move container a - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { int oldX = a->x(); int x = _dragIndicator->x(); m_layout->moveContainerSwitch(a, x - oldX); } - else if (orientation() == Qt::Vertical) + else if (orientation() == TQt::Vertical) { int oldY = a->y(); int y = _dragIndicator->y(); @@ -1322,7 +1322,7 @@ void ContainerArea::dropEvent(TQDropEvent *ev) { // a local desktop file being dragged from an external program. // Make a copy first. - KDesktopFile df(url.path()); + TDEDesktopFile df(url.path()); KURL newUrl; newUrl.setPath(KickerLib::copyDesktopFile(url)); if (df.readType() == "Link") @@ -1387,7 +1387,7 @@ bool ContainerArea::eventFilter(TQObject* o, TQEvent* e) // which contain a ContainerArea can react to layout changes of its // contents. For example: If an applets grows, the top level widget may // want to grow as well. - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_contents)) + if (o == m_contents) { if (e->type() == TQEvent::LayoutHint) { @@ -1408,7 +1408,7 @@ void ContainerArea::resizeEvent(TQResizeEvent *ev) void ContainerArea::viewportResizeEvent(TQResizeEvent* ev) { Panner::viewportResizeEvent(ev); - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { m_contents->resize(kMax(widthForHeight(ev->size().height()), ev->size().width()), @@ -1436,8 +1436,8 @@ void ContainerArea::setBackground() { _rootPixmap = new KRootPixmap(this); _rootPixmap->setCustomPainting(true); - connect(_rootPixmap, TQT_SIGNAL(backgroundUpdated(const TQPixmap&)), - TQT_SLOT(updateBackground(const TQPixmap&))); + connect(_rootPixmap, TQ_SIGNAL(backgroundUpdated(const TQPixmap&)), + TQ_SLOT(updateBackground(const TQPixmap&))); } else { @@ -1446,12 +1446,7 @@ void ContainerArea::setBackground() double tint = double(KickerSettings::tintValue()) / 100; _rootPixmap->setFadeEffect(tint, KickerSettings::tintColor()); - if (KickerSettings::menubarPanelBlurred()) { - _rootPixmap->setBlurEffect(0.0, 4.0); - } - else { - _rootPixmap->setBlurEffect(0.0, 0.0); - } + _rootPixmap->setBlurEffect(0.0, KickerSettings::blurValue()); _rootPixmap->start(); _bgSet = true; return; @@ -1487,7 +1482,7 @@ void ContainerArea::setBackground() { TQImage bgImage = srcImage; - if (orientation() == Qt::Vertical) + if (orientation() == TQt::Vertical) { if (KickerSettings::rotateBackground()) { @@ -1516,7 +1511,7 @@ void ContainerArea::setBackground() KickerLib::colorize(bgImage); } setPaletteBackgroundPixmap(TQPixmap(bgImage)); - TQTimer::singleShot(0, this, TQT_SLOT(updateContainersBackground())); + TQTimer::singleShot(0, this, TQ_SLOT(updateContainersBackground())); } } @@ -1538,7 +1533,7 @@ void ContainerArea::immutabilityChanged(bool immutable) } setAcceptDrops(!isImmutable()); - TQTimer::singleShot(0, this, TQT_SLOT(setBackground())); + TQTimer::singleShot(0, this, TQ_SLOT(setBackground())); } TQRect ContainerArea::availableSpaceFollowing(BaseContainer* a) @@ -1565,7 +1560,7 @@ TQRect ContainerArea::availableSpaceFollowing(BaseContainer* a) } } - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { if (a) { @@ -1599,7 +1594,7 @@ void ContainerArea::moveDragIndicator(int pos) // Move _dragIndicator to position pos, restricted by availableSpace. // Resize _dragIndicator if necessary. - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { if (availableSpace.size().width() < _dragIndicator->preferredSize().width()) @@ -1640,7 +1635,7 @@ void ContainerArea::moveDragIndicator(int pos) void ContainerArea::updateBackground( const TQPixmap& pm ) { TQBrush bgBrush(colorGroup().background(), pm); - TQPalette pal = kapp->palette(); + TQPalette pal = tdeApp->palette(); pal.setBrush(TQColorGroup::Background, bgBrush); setPalette(pal); @@ -1663,7 +1658,7 @@ void ContainerArea::resizeContents(int w, int h) if (!m_updateBackgroundsCalled) { m_updateBackgroundsCalled = true; - TQTimer::singleShot(0, this, TQT_SLOT(updateContainersBackground())); + TQTimer::singleShot(0, this, TQ_SLOT(updateContainersBackground())); } } @@ -1680,9 +1675,9 @@ void ContainerArea::setPosition(KPanelExtension::Position p) } _pos = p; - Qt::Orientation o = (p == KPanelExtension::Top || + TQt::Orientation o = (p == KPanelExtension::Top || p == KPanelExtension::Bottom) ? - Qt::Horizontal : Qt::Vertical; + TQt::Horizontal : TQt::Vertical; bool orientationChanged = (orientation() != o); m_layout->setEnabled(false); @@ -1696,7 +1691,7 @@ void ContainerArea::setPosition(KPanelExtension::Position p) // when that gets called AFTER we've been moved // it's not always safe to do the resize here, as scroll buttons // from the panner may get in our way. =/ - if (o == Qt::Horizontal) + if (o == TQt::Horizontal) { resizeContents(0, height()); } @@ -1742,7 +1737,7 @@ void ContainerArea::autoScroll() { if(!_moveAC) return; - if(orientation() == Qt::Horizontal) { + if(orientation() == TQt::Horizontal) { if(_moveAC->pos().x() <= 80) scrollBy(-10, 0); else if(_moveAC->pos().x() >= width() - _moveAC->width() - 80) @@ -1793,7 +1788,7 @@ void ContainerArea::updateContainersBackground() if( !m_cachedGeometry.contains( *it )) { m_cachedGeometry[ *it ] = TQRect(); - connect( *it, TQT_SIGNAL( destroyed()), TQT_SLOT( destroyCachedGeometry())); + connect( *it, TQ_SIGNAL( destroyed()), TQ_SLOT( destroyCachedGeometry())); } if( m_cachedGeometry[ *it ] != (*it)->geometry()) { @@ -1910,7 +1905,7 @@ void ContainerArea::showAddAppletDialog() if (!m_addAppletDialog) { m_addAppletDialog = new AddAppletDialog(this, this, 0); - connect(m_addAppletDialog, TQT_SIGNAL(finished()), this, TQT_SLOT(addAppletDialogDone())); + connect(m_addAppletDialog, TQ_SIGNAL(finished()), this, TQ_SLOT(addAppletDialogDone())); } else { @@ -1958,7 +1953,7 @@ void DragIndicator::paintEvent(TQPaintEvent*) { TQPainter painter(this); TQRect rect(0, 0, width(), height()); - style().tqdrawPrimitive( TQStyle::PE_FocusRect, &painter, rect, colorGroup(), + style().drawPrimitive( TQStyle::PE_FocusRect, &painter, rect, colorGroup(), TQStyle::Style_Default, colorGroup().base() ); } diff --git a/kicker/kicker/core/containerarea.h b/kicker/kicker/core/containerarea.h index f52003982..2b543e6ac 100644 --- a/kicker/kicker/core/containerarea.h +++ b/kicker/kicker/core/containerarea.h @@ -45,7 +45,7 @@ class AddAppletDialog; class ContainerArea : public Panner { - Q_OBJECT + TQ_OBJECT public: ContainerArea( TDEConfig* config, TQWidget* parent, TQPopupMenu* opMenu, const char* name = 0 ); @@ -174,7 +174,7 @@ private: class DragIndicator : public TQWidget { - Q_OBJECT + TQ_OBJECT public: DragIndicator(TQWidget* parent = 0, const char* name = 0); diff --git a/kicker/kicker/core/containerarealayout.cpp b/kicker/kicker/core/containerarealayout.cpp index c12778fbb..81080fe82 100644 --- a/kicker/kicker/core/containerarealayout.cpp +++ b/kicker/kicker/core/containerarealayout.cpp @@ -122,7 +122,7 @@ void ContainerAreaLayoutItem::setFreeSpaceRatio(double ratio) m_freeSpaceRatio = ratio; } -Qt::Orientation ContainerAreaLayoutItem::orientation() const +TQt::Orientation ContainerAreaLayoutItem::orientation() const { return m_layout->orientation(); } @@ -139,7 +139,7 @@ void ContainerAreaLayoutItem::setGeometryR(const TQRect& r) int ContainerAreaLayoutItem::widthForHeightR(int h) const { - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { return widthForHeight(h); } @@ -151,7 +151,7 @@ int ContainerAreaLayoutItem::widthForHeightR(int h) const int ContainerAreaLayoutItem::widthR() const { - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { return geometry().width(); } @@ -163,7 +163,7 @@ int ContainerAreaLayoutItem::widthR() const int ContainerAreaLayoutItem::heightR() const { - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { return geometry().height(); } @@ -175,7 +175,7 @@ int ContainerAreaLayoutItem::heightR() const int ContainerAreaLayoutItem::leftR() const { - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { if (TQApplication::reverseLayout()) return m_layout->geometry().right() - geometry().right(); @@ -190,7 +190,7 @@ int ContainerAreaLayoutItem::leftR() const int ContainerAreaLayoutItem::rightR() const { - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { if (TQApplication::reverseLayout()) return m_layout->geometry().right() - geometry().left(); @@ -206,46 +206,14 @@ int ContainerAreaLayoutItem::rightR() const ContainerAreaLayout::ContainerAreaLayout(TQWidget* parent) : TQLayout(parent), - m_orientation(Qt::Horizontal), + m_orientation(TQt::Horizontal), m_stretchEnabled(true) { } -#ifdef USE_QT4 -/*! - \reimp -*/ -int ContainerAreaLayout::count() const { - return m_items.count(); -} - -/*! - \reimp -*/ -TQLayoutItem* ContainerAreaLayout::itemAt(int index) const { - return index >= 0 && index < m_items.count() ? (*m_items.at(index))->item : 0; -} - -/*! - \reimp -*/ -TQLayoutItem* ContainerAreaLayout::takeAt(int index) { - if (index < 0 || index >= m_items.count()) - return 0; - ContainerAreaLayoutItem *b = *m_items.at(index); - m_items.remove(m_items.at(index)); - TQLayoutItem *item = b->item; - b->item = 0; - delete b; - - invalidate(); - return item; -} -#endif // USE_QT4 - void ContainerAreaLayout::addItem(TQLayoutItem* item) { - m_items.append(new ContainerAreaLayoutItem(static_cast<TQLayoutItem*>(item), this)); + m_items.append(new ContainerAreaLayoutItem(item, this)); } void ContainerAreaLayout::insertIntoFreeSpace(TQWidget* widget, TQPoint insertionPoint) @@ -283,7 +251,7 @@ void ContainerAreaLayout::insertIntoFreeSpace(TQWidget* widget, TQPoint insertio return; } - int insPos = (orientation() == Qt::Horizontal) ? insertionPoint.x(): insertionPoint.y(); + int insPos = (orientation() == TQt::Horizontal) ? insertionPoint.x(): insertionPoint.y(); Item* current = *currentIt; Item* next = *nextIt; @@ -419,7 +387,7 @@ TQSize ContainerAreaLayout::sizeHint() const { const int size = KickerLib::sizeValue(KPanelExtension::SizeSmall); - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { return TQSize(widthForHeight(size), size); } @@ -433,7 +401,7 @@ TQSize ContainerAreaLayout::minimumSize() const { const int size = KickerLib::sizeValue(KPanelExtension::SizeTiny); - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { return TQSize(widthForHeight(size), size); } @@ -445,13 +413,7 @@ TQSize ContainerAreaLayout::minimumSize() const TQLayoutIterator ContainerAreaLayout::iterator() { - // [FIXME] -#ifdef USE_QT4 - #warning [FIXME] ContainerAreaLayout iterators may not function correctly under Qt4 - return TQLayoutIterator(this); // [FIXME] -#else // USE_QT4 return TQLayoutIterator(new ContainerAreaLayoutIterator(&m_items)); -#endif // USE_QT4 } void ContainerAreaLayout::setGeometry(const TQRect& rect) @@ -559,7 +521,7 @@ int ContainerAreaLayout::distanceToPreviousItem(ItemList::const_iterator it) con void ContainerAreaLayout::moveContainerSwitch(TQWidget* container, int distance) { - const bool horizontal = orientation() == Qt::Horizontal; + const bool horizontal = orientation() == TQt::Horizontal; const bool reverseLayout = TQApplication::reverseLayout(); if (horizontal && reverseLayout) @@ -696,7 +658,7 @@ void ContainerAreaLayout::moveContainerSwitch(TQWidget* container, int distance) int ContainerAreaLayout::moveContainerPush(TQWidget* a, int distance) { - const bool horizontal = orientation() == Qt::Horizontal; + const bool horizontal = orientation() == TQt::Horizontal; const bool reverseLayout = TQApplication::reverseLayout(); // Get the iterator 'it' pointing to the layoutitem representing 'a'. @@ -767,7 +729,7 @@ int ContainerAreaLayout::moveContainerPushRecursive(ItemList::const_iterator it, TQRect ContainerAreaLayout::transform(const TQRect& r) const { - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { if (TQApplication::reverseLayout()) { @@ -788,7 +750,7 @@ TQRect ContainerAreaLayout::transform(const TQRect& r) const int ContainerAreaLayout::widthForHeightR(int h) const { - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { return widthForHeight(h); } @@ -800,7 +762,7 @@ int ContainerAreaLayout::widthForHeightR(int h) const int ContainerAreaLayout::widthR() const { - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { return geometry().width(); } @@ -812,7 +774,7 @@ int ContainerAreaLayout::widthR() const int ContainerAreaLayout::heightR() const { - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { return geometry().height(); } @@ -824,7 +786,7 @@ int ContainerAreaLayout::heightR() const int ContainerAreaLayout::leftR() const { - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) return geometry().left(); else return geometry().top(); @@ -832,7 +794,7 @@ int ContainerAreaLayout::leftR() const int ContainerAreaLayout::rightR() const { - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) return geometry().right(); else return geometry().bottom(); diff --git a/kicker/kicker/core/containerarealayout.h b/kicker/kicker/core/containerarealayout.h index 4edeb8be2..abb28c6f0 100644 --- a/kicker/kicker/core/containerarealayout.h +++ b/kicker/kicker/core/containerarealayout.h @@ -108,12 +108,6 @@ class ContainerAreaLayout : public TQLayout int leftR() const; int rightR() const; -#ifdef USE_QT4 - - QLAYOUT_REQUIRED_METHOD_DECLARATIONS - -#endif // USE_QT4 - private: int moveContainerPushRecursive(ItemList::const_iterator it, int distance); int distanceToPreviousItem(ItemList::const_iterator it) const; diff --git a/kicker/kicker/core/extensionmanager.cpp b/kicker/kicker/core/extensionmanager.cpp index 796b98125..bf22f3b70 100644 --- a/kicker/kicker/core/extensionmanager.cpp +++ b/kicker/kicker/core/extensionmanager.cpp @@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tdelocale.h> #include <tdemenubar.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <twinmodule.h> #include <dcopref.h> @@ -111,7 +111,7 @@ void ExtensionManager::initialize() m_mainPanel = pm->createExtensionContainer( "childpanelextension.desktop", true, - TQString(kapp->aboutData()->appName()) + "rc", + TQString(tdeApp->aboutData()->appName()) + "rc", "Main Panel"); } @@ -129,7 +129,7 @@ void ExtensionManager::initialize() m_mainPanel->readConfig(); m_mainPanel->show(); - kapp->processEvents(); + tdeApp->processEvents(); // read extension list config->setGroup("General"); @@ -173,13 +173,13 @@ void ExtensionManager::initialize() addContainer(e); e->readConfig(); e->show(); - kapp->processEvents(); + tdeApp->processEvents(); } } m_loadingContainers = false; pm->clearUntrustedLists(); - connect(Kicker::the(), TQT_SIGNAL(configurationChanged()), TQT_SLOT(configurationChanged())); + connect(Kicker::the(), TQ_SIGNAL(configurationChanged()), TQ_SLOT(configurationChanged())); DCOPRef r( "ksmserver", "ksmserver" ); r.send( "resumeStartup", TQCString( "kicker" )); } @@ -222,7 +222,7 @@ void ExtensionManager::configureMenubar(bool duringInit) updateMenubar(); m_menubarPanel->show(); - connect(kapp, TQT_SIGNAL(tdedisplayFontChanged()), TQT_SLOT(updateMenubar())); + connect(tdeApp, TQ_SIGNAL(tdedisplayFontChanged()), TQ_SLOT(updateMenubar())); } else if (m_menubarPanel) { @@ -437,8 +437,8 @@ void ExtensionManager::addContainer(ExtensionContainer* e) _containers.append(e); - connect(e, TQT_SIGNAL(removeme(ExtensionContainer*)), - this, TQT_SLOT(removeContainer(ExtensionContainer*))); + connect(e, TQ_SIGNAL(removeme(ExtensionContainer*)), + this, TQ_SLOT(removeContainer(ExtensionContainer*))); if (!m_loadingContainers) { emit desktopIconsAreaChanged(desktopIconsArea(e->xineramaScreen()), @@ -692,7 +692,7 @@ TQRect ExtensionManager::workArea(int XineramaScreen, const ExtensionContainer* } TQRect workArea; - if ((XineramaScreen == XineramaAllScreens) || (kapp->desktop()->numScreens() < 2)) + if ((XineramaScreen == XineramaAllScreens) || (tdeApp->desktop()->numScreens() < 2)) { /* special value for all screens */ workArea = Kicker::the()->twinModule()->workArea(list); diff --git a/kicker/kicker/core/extensionmanager.h b/kicker/kicker/core/extensionmanager.h index b4a53ec31..1e36bca56 100644 --- a/kicker/kicker/core/extensionmanager.h +++ b/kicker/kicker/core/extensionmanager.h @@ -33,7 +33,7 @@ const int XineramaAllScreens = -2; class ExtensionManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: static ExtensionManager* the(); diff --git a/kicker/kicker/core/kicker.cpp b/kicker/kicker/core/kicker.cpp index 70ec00a39..21ff97684 100644 --- a/kicker/kicker/core/kicker.cpp +++ b/kicker/kicker/core/kicker.cpp @@ -32,16 +32,16 @@ #include <tdeconfig.h> #include <tdecmdlineargs.h> #include <kcmultidialog.h> -#include <kcrash.h> +#include <tdecrash.h> #include <kdebug.h> #include <kdirwatch.h> #include <tdeglobal.h> -#include <kglobalaccel.h> +#include <tdeglobalaccel.h> #include <kiconloader.h> #include <kimageio.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <twin.h> #include <twinmodule.h> @@ -59,10 +59,10 @@ #include "kicker.moc" -Kicker* Kicker::the() { return static_cast<Kicker*>(kapp); } +Kicker* Kicker::the() { return static_cast<Kicker*>(tdeApp); } Kicker::Kicker() - : KUniqueApplication(), + : TDEUniqueApplication(), keys(0), m_twinModule(0), m_configDialog(0), @@ -77,7 +77,7 @@ Kicker::Kicker() // this means we've most likely crashed once. so let's see if we // stay up for more than 2 minutes time, and if so reset the // crash handler since the crash isn't a frequent offender - TQTimer::singleShot(120000, this, TQT_SLOT(setCrashHandler())); + TQTimer::singleShot(120000, this, TQ_SLOT(setCrashHandler())); } else { @@ -88,7 +88,7 @@ Kicker::Kicker() } // Make kicker immutable if configuration modules have been marked immutable - if (isKioskImmutable() && kapp->authorizeControlModules(Kicker::configModules(true)).isEmpty()) + if (isKioskImmutable() && tdeApp->authorizeControlModules(Kicker::configModules(true)).isEmpty()) { config()->setReadOnly(true); config()->reparseConfiguration(); @@ -116,7 +116,7 @@ Kicker::Kicker() // initialize our keys // note that this creates the KMenu by calling MenuManager::the() - keys = new TDEGlobalAccel( TQT_TQOBJECT(this) ); + keys = new TDEGlobalAccel( this ); #define KICKER_ALL_BINDINGS #include "kickerbindings.cpp" keys->readSettings(); @@ -125,19 +125,19 @@ Kicker::Kicker() // set up our global settings configure(); - connect(this, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int))); - connect(this, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(paletteChanged())); - connect(this, TQT_SIGNAL(tdedisplayStyleChanged()), TQT_SLOT(slotStyleChanged())); + connect(this, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int))); + connect(this, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(paletteChanged())); + connect(this, TQ_SIGNAL(tdedisplayStyleChanged()), TQ_SLOT(slotStyleChanged())); #if (TQT_VERSION-0 >= 0x030200) // XRANDR support - connect(desktop(), TQT_SIGNAL(resized(int)), TQT_SLOT(slotDesktopResized())); + connect(desktop(), TQ_SIGNAL(resized(int)), TQ_SLOT(slotDesktopResized())); #endif // the panels, aka extensions - TQTimer::singleShot(0, ExtensionManager::the(), TQT_SLOT(initialize())); + TQTimer::singleShot(0, ExtensionManager::the(), TQ_SLOT(initialize())); - connect(ExtensionManager::the(), TQT_SIGNAL(desktopIconsAreaChanged(const TQRect &, int)), - this, TQT_SLOT(slotDesktopIconsAreaChanged(const TQRect &, int))); + connect(ExtensionManager::the(), TQ_SIGNAL(desktopIconsAreaChanged(const TQRect &, int)), + this, TQ_SLOT(slotDesktopIconsAreaChanged(const TQRect &, int))); } Kicker::~Kicker() @@ -258,7 +258,7 @@ void Kicker::quit() void Kicker::restart() { // do this on a timer to give us time to return true - TQTimer::singleShot(0, this, TQT_SLOT(slotRestart())); + TQTimer::singleShot(0, this, TQ_SLOT(slotRestart())); } void Kicker::slotRestart() @@ -301,10 +301,10 @@ TQStringList Kicker::configModules(bool controlCenter) } else { - args << "kde-kicker_config_arrangement.desktop" - << "kde-kicker_config_hiding.desktop" - << "kde-kicker_config_menus.desktop" - << "kde-kicker_config_appearance.desktop"; + args << "tde-kicker_config_arrangement.desktop" + << "tde-kicker_config_hiding.desktop" + << "tde-kicker_config_menus.desktop" + << "tde-kicker_config_appearance.desktop"; } args << "tde-kcmtaskbar.desktop"; return args; @@ -352,7 +352,7 @@ void Kicker::showConfig(const TQString& configPath, const TQString& configFile, moduleNumber++; } - connect(m_configDialog, TQT_SIGNAL(finished()), TQT_SLOT(configDialogFinished())); + connect(m_configDialog, TQ_SIGNAL(finished()), TQ_SLOT(configDialogFinished())); } if (!configPath.isEmpty()) @@ -413,7 +413,7 @@ void Kicker::configDialogFinished() if (m_reloadingConfigDialog) { TQByteArray data; m_reloadingConfigDialog = false; - kapp->dcopClient()->send("kicker", "kicker", "showTaskBarConfig()", data); + tdeApp->dcopClient()->send("kicker", "kicker", "showTaskBarConfig()", data); } } diff --git a/kicker/kicker/core/kicker.h b/kicker/kicker/core/kicker.h index 6a3e02d36..5a76570a5 100644 --- a/kicker/kicker/core/kicker.h +++ b/kicker/kicker/core/kicker.h @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqcolor.h> -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> #include <kicontheme.h> class KCMultiDialog; @@ -36,9 +36,9 @@ class KWinModule; class PanelKMenu; class PanelPopupButton; -class Kicker : public KUniqueApplication +class Kicker : public TDEUniqueApplication { - Q_OBJECT + TQ_OBJECT K_DCOP public: diff --git a/kicker/kicker/core/kickerbindings.cpp b/kicker/kicker/core/kickerbindings.cpp index 46cfa432d..e8999a22d 100644 --- a/kicker/kicker/core/kickerbindings.cpp +++ b/kicker/kicker/core/kickerbindings.cpp @@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef NOSLOTS # define DEF( name, key3, key4, target, fnSlot ) \ - keys->insert( name, i18n(name), TQString(), key3, key4, TQT_TQOBJECT(target), TQT_SLOT(fnSlot) ) + keys->insert( name, i18n(name), TQString(), key3, key4, target, TQ_SLOT(fnSlot) ) #else # define DEF( name, key3, key4, target, fnSlot ) \ keys->insert( name, i18n(name), TQString(), key3, key4 ) @@ -37,12 +37,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifdef LAUNCH_MENU keys->insert("Program:kicker", i18n("Panel")); - DEF(I18N_NOOP("Popup Launch Menu" ), ALT+Qt::Key_F1, WIN+Qt::Key_Menu, + DEF(I18N_NOOP("Popup Launch Menu" ), ALT+TQt::Key_F1, WIN+TQt::Key_Menu, MenuManager::the(), kmenuAccelActivated()); #endif #ifdef SHOW_DESKTOP - DEF(I18N_NOOP( "Toggle Showing Desktop" ), ALT+CTRL+Qt::Key_D, WIN+CTRL+Qt::Key_D, + DEF(I18N_NOOP( "Toggle Showing Desktop" ), ALT+CTRL+TQt::Key_D, WIN+CTRL+TQt::Key_D, this, slotToggleShowDesktop()); #endif diff --git a/kicker/kicker/core/main.cpp b/kicker/kicker/core/main.cpp index 23cefb044..02941c127 100644 --- a/kicker/kicker/core/main.cpp +++ b/kicker/kicker/core/main.cpp @@ -54,7 +54,7 @@ static void sighandler(int) TQApplication::exit(); } -extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) +extern "C" TDE_EXPORT int kdemain( int argc, char ** argv ) { { TQCString multiHead = getenv("TDE_MULTIHEAD"); diff --git a/kicker/kicker/core/menumanager.cpp b/kicker/kicker/core/menumanager.cpp index a7326844e..4e4de2f56 100644 --- a/kicker/kicker/core/menumanager.cpp +++ b/kicker/kicker/core/menumanager.cpp @@ -70,9 +70,9 @@ MenuManager::MenuManager(TQObject *parent) else m_kmenu = new KMenuStub(new KMenu); - kapp->dcopClient()->setNotifications(true); - connect(kapp->dcopClient(), TQT_SIGNAL(applicationRemoved(const TQCString&)), - this, TQT_SLOT(applicationRemoved(const TQCString&))); + tdeApp->dcopClient()->setNotifications(true); + connect(tdeApp->dcopClient(), TQ_SIGNAL(applicationRemoved(const TQCString&)), + this, TQ_SLOT(applicationRemoved(const TQCString&))); } MenuManager::~MenuManager() @@ -164,7 +164,7 @@ void MenuManager::kmenuAccelActivated() // the item under the cursor gets selected. The single shot // avoids this from happening by allowing the item to be selected // when the event loop is enterred, and then resetting it. - TQTimer::singleShot(0, this, TQT_SLOT(slotSetKMenuItemActive())); + TQTimer::singleShot(0, this, TQ_SLOT(slotSetKMenuItemActive())); } else { @@ -210,7 +210,7 @@ TQCString MenuManager::createMenu(TQPixmap icon, TQString text) p->text = text; p->icon = icon; p->idInParentMenu = m_kmenu->insertClientMenu( p ); - p->createdBy = kapp->dcopClient()->senderId(); + p->createdBy = tdeApp->dcopClient()->senderId(); m_kmenu->adjustSize(); return name; } diff --git a/kicker/kicker/core/menumanager.h b/kicker/kicker/core/menumanager.h index 1139b0b61..03e107767 100644 --- a/kicker/kicker/core/menumanager.h +++ b/kicker/kicker/core/menumanager.h @@ -40,7 +40,7 @@ typedef TQValueList<PanelPopupButton*> KButtonList; */ class MenuManager : public TQObject, DCOPObject { - Q_OBJECT + TQ_OBJECT public: static MenuManager* the(); diff --git a/kicker/kicker/core/panelextension.cpp b/kicker/kicker/core/panelextension.cpp index 93bd2356b..b3160aed5 100644 --- a/kicker/kicker/core/panelextension.cpp +++ b/kicker/kicker/core/panelextension.cpp @@ -71,7 +71,7 @@ PanelExtension::PanelExtension(const TQString& configFile, TQWidget *parent, con // container area _containerArea = new ContainerArea( config(), this, opMenu() ); - connect(_containerArea, TQT_SIGNAL(maintainFocus(bool)), this, TQT_SIGNAL(maintainFocus(bool))); + connect(_containerArea, TQ_SIGNAL(maintainFocus(bool)), this, TQ_SIGNAL(maintainFocus(bool))); _layout->addWidget(_containerArea); _containerArea->viewport()->installEventFilter(this); @@ -81,15 +81,15 @@ PanelExtension::PanelExtension(const TQString& configFile, TQWidget *parent, con // beginning. positionChange(position()); - connect(Kicker::the(), TQT_SIGNAL(configurationChanged()), - TQT_SLOT(configurationChanged())); - connect(Kicker::the(), TQT_SIGNAL(immutabilityChanged(bool)), - TQT_SLOT(immutabilityChanged(bool))); + connect(Kicker::the(), TQ_SIGNAL(configurationChanged()), + TQ_SLOT(configurationChanged())); + connect(Kicker::the(), TQ_SIGNAL(immutabilityChanged(bool)), + TQ_SLOT(immutabilityChanged(bool))); // we wait to get back to the event loop to start up the container area so that // the main panel in ExtensionManager will be assigned and we can tell in a // relatively non-hackish way that we are (or aren't) the "main panel" - TQTimer::singleShot(0, this, TQT_SLOT(populateContainerArea())); + TQTimer::singleShot(0, this, TQ_SLOT(populateContainerArea())); } PanelExtension::~PanelExtension() @@ -129,7 +129,7 @@ TQPopupMenu* PanelExtension::opMenu() } _opMnu = new TQPopupMenu(this); - connect(_opMnu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotBuildOpMenu())); + connect(_opMnu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotBuildOpMenu())); return _opMnu; } @@ -162,7 +162,7 @@ bool PanelExtension::eventFilter(TQObject*, TQEvent * e) if ( e->type() == TQEvent::MouseButtonPress ) { TQMouseEvent* me = (TQMouseEvent*) e; - if ( me->button() == Qt::RightButton && kapp->authorize("action/kicker_rmb")) + if ( me->button() == TQt::RightButton && tdeApp->authorize("action/kicker_rmb")) { Kicker::the()->setInsertionPoint(me->globalPos()); opMenu()->exec(me->globalPos()); @@ -339,7 +339,7 @@ void PanelExtension::slotBuildOpMenu() { _opMnu->insertItem(isMenuBar ? i18n("Add &Applet to Menubar...") : i18n("Add &Applet to Panel..."), - _containerArea, TQT_SLOT(showAddAppletDialog())); + _containerArea, TQ_SLOT(showAddAppletDialog())); m_panelAddMenu = new PanelAddButtonMenu(_containerArea, this); _opMnu->insertItem(isMenuBar ? i18n("Add Appli&cation to Menubar") : i18n("Add Appli&cation to Panel"), @@ -362,7 +362,7 @@ void PanelExtension::slotBuildOpMenu() } _opMnu->insertItem(SmallIconSet("system-lock-screen"), i18n("&Lock Panels"), - Kicker::the(), TQT_SLOT(toggleLock())); + Kicker::the(), TQ_SLOT(toggleLock())); } else if (!Kicker::the()->isKioskImmutable()) { @@ -370,23 +370,23 @@ void PanelExtension::slotBuildOpMenu() SmallIconSet("system-lock-screen"), kickerImmutable ? i18n("Un&lock Panels") : i18n("&Lock Panels"), - Kicker::the(), TQT_SLOT(toggleLock())); + Kicker::the(), TQ_SLOT(toggleLock())); } if (!isMenuBar && !Kicker::the()->isKioskImmutable()) { _opMnu->insertItem(SmallIconSet("configure"), i18n("&Configure Panel..."), - this, TQT_SLOT(showConfig())); + this, TQ_SLOT(showConfig())); _opMnu->insertSeparator(); } _opMnu->insertItem(SmallIconSet("fork"), i18n("&Launch Process Manager..."), - this, TQT_SLOT(showProcessManager())); + this, TQ_SLOT(showProcessManager())); _opMnu->insertSeparator(); - if (kapp->authorize("action/help")) + if (tdeApp->authorize("action/help")) { KHelpMenu* help = new KHelpMenu( this, TDEGlobal::instance()->aboutData(), false); _opMnu->insertItem(SmallIconSet("help"), KStdGuiItem::help().text(), help->menu()); diff --git a/kicker/kicker/core/panelextension.h b/kicker/kicker/core/panelextension.h index c7882291f..02460b00b 100644 --- a/kicker/kicker/core/panelextension.h +++ b/kicker/kicker/core/panelextension.h @@ -40,7 +40,7 @@ class TQGridLayout; class PanelExtension : public KPanelExtension, virtual public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP public: @@ -109,7 +109,7 @@ private: class MenubarExtension : public PanelExtension { - Q_OBJECT + TQ_OBJECT public: MenubarExtension(const AppletInfo& info); diff --git a/kicker/kicker/core/pluginmanager.cpp b/kicker/kicker/core/pluginmanager.cpp index a8b79877a..bb7044aec 100644 --- a/kicker/kicker/core/pluginmanager.cpp +++ b/kicker/kicker/core/pluginmanager.cpp @@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <klibloader.h> #include <kpanelapplet.h> #include <kpanelextension.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstaticdeleter.h> #include "appletinfo.h" @@ -123,8 +123,8 @@ PluginManager::~PluginManager() AppletInfo::Dict::const_iterator it = _dict.constBegin(); for (; it != _dict.constEnd(); ++it) { - disconnect(it.key(), TQT_SIGNAL(destroyed( TQObject*)), - this, TQT_SLOT(slotPluginDestroyed(TQObject*))); + disconnect(it.key(), TQ_SIGNAL(destroyed( TQObject*)), + this, TQ_SLOT(slotPluginDestroyed(TQObject*))); delete it.data(); } @@ -159,9 +159,9 @@ KPanelApplet* PluginManager::loadApplet(const AppletInfo& info, if (applet) { - _dict.insert( TQT_TQOBJECT(applet), new AppletInfo( info ) ); - connect( applet, TQT_SIGNAL( destroyed( TQObject* ) ), - TQT_SLOT( slotPluginDestroyed( TQObject* ) ) ); + _dict.insert( applet, new AppletInfo( info ) ); + connect( applet, TQ_SIGNAL( destroyed( TQObject* ) ), + TQ_SLOT( slotPluginDestroyed( TQObject* ) ) ); } return applet; @@ -197,9 +197,9 @@ KPanelExtension* PluginManager::loadExtension( KPanelExtension* extension = init_ptr( parent, info.configFile() ); if( extension ) { - _dict.insert( TQT_TQOBJECT(extension), new AppletInfo( info ) ); - connect( extension, TQT_SIGNAL( destroyed( TQObject* ) ), - TQT_SLOT( slotPluginDestroyed( TQObject* ) ) ); + _dict.insert( extension, new AppletInfo( info ) ); + connect( extension, TQ_SIGNAL( destroyed( TQObject* ) ), + TQ_SLOT( slotPluginDestroyed( TQObject* ) ) ); } return extension; @@ -360,12 +360,12 @@ LibUnloader::LibUnloader( const TQString &libName, TQObject *parent ) { // NOTE: this doesn't work on kicker shutdown because the timer never gets // fired. - TQTimer::singleShot( 0, this, TQT_SLOT( unload() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( unload() ) ); } void LibUnloader::unload( const TQString &libName ) { - (void)new LibUnloader( libName, TQT_TQOBJECT(kapp) ); + (void)new LibUnloader( libName, tdeApp ); } void LibUnloader::unload() diff --git a/kicker/kicker/core/pluginmanager.h b/kicker/kicker/core/pluginmanager.h index f67c13490..ea7730387 100644 --- a/kicker/kicker/core/pluginmanager.h +++ b/kicker/kicker/core/pluginmanager.h @@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqmap.h> #include <tqobject.h> #include <tqstringlist.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <kstaticdeleter.h> #include "appletinfo.h" @@ -38,9 +38,9 @@ class KPanelApplet; class KPanelExtension; class TQPopupMenu; -class KDE_EXPORT PluginManager : public TQObject +class TDE_EXPORT PluginManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: static PluginManager* the(); @@ -90,7 +90,7 @@ private: class LibUnloader : public TQObject { - Q_OBJECT + TQ_OBJECT public: static void unload( const TQString &libName ); diff --git a/kicker/kicker/core/showdesktop.cpp b/kicker/kicker/core/showdesktop.cpp index 4a6639574..0a1e2907c 100644 --- a/kicker/kicker/core/showdesktop.cpp +++ b/kicker/kicker/core/showdesktop.cpp @@ -49,8 +49,8 @@ ShowDesktop::ShowDesktop() m_wmSupport = i.isSupported( NET::WM2ShowingDesktop ); if( m_wmSupport ) { - connect( Kicker::the()->twinModule(), TQT_SIGNAL( showingDesktopChanged( bool )), - TQT_SLOT( showingDesktopChanged( bool ))); + connect( Kicker::the()->twinModule(), TQ_SIGNAL( showingDesktopChanged( bool )), + TQ_SLOT( showingDesktopChanged( bool ))); showingDesktopChanged( m_showingDesktop = Kicker::the()->twinModule()->showingDesktop()); } } @@ -161,21 +161,21 @@ void ShowDesktop::showDesktop( bool b ) } // on desktop changes or when a window is deiconified, we abort the show desktop mode - connect(Kicker::the()->twinModule(), TQT_SIGNAL(currentDesktopChanged(int)), - TQT_SLOT(slotCurrentDesktopChanged(int))); - connect(Kicker::the()->twinModule(), TQT_SIGNAL(windowChanged(WId,unsigned int)), - TQT_SLOT(slotWindowChanged(WId,unsigned int))); - connect(Kicker::the()->twinModule(), TQT_SIGNAL(windowAdded(WId)), - TQT_SLOT(slotWindowAdded(WId))); + connect(Kicker::the()->twinModule(), TQ_SIGNAL(currentDesktopChanged(int)), + TQ_SLOT(slotCurrentDesktopChanged(int))); + connect(Kicker::the()->twinModule(), TQ_SIGNAL(windowChanged(WId,unsigned int)), + TQ_SLOT(slotWindowChanged(WId,unsigned int))); + connect(Kicker::the()->twinModule(), TQ_SIGNAL(windowAdded(WId)), + TQ_SLOT(slotWindowAdded(WId))); } else { - disconnect(Kicker::the()->twinModule(), TQT_SIGNAL(currentDesktopChanged(int)), - this, TQT_SLOT(slotCurrentDesktopChanged(int))); - disconnect(Kicker::the()->twinModule(), TQT_SIGNAL(windowChanged(WId,unsigned int)), - this, TQT_SLOT(slotWindowChanged(WId,unsigned int))); - disconnect(Kicker::the()->twinModule(), TQT_SIGNAL(windowAdded(WId)), - this, TQT_SLOT(slotWindowAdded(WId))); + disconnect(Kicker::the()->twinModule(), TQ_SIGNAL(currentDesktopChanged(int)), + this, TQ_SLOT(slotCurrentDesktopChanged(int))); + disconnect(Kicker::the()->twinModule(), TQ_SIGNAL(windowChanged(WId,unsigned int)), + this, TQ_SLOT(slotWindowChanged(WId,unsigned int))); + disconnect(Kicker::the()->twinModule(), TQ_SIGNAL(windowAdded(WId)), + this, TQ_SLOT(slotWindowAdded(WId))); for (TQValueVector<WId>::ConstIterator it = m_iconifiedList.begin(); it != m_iconifiedList.end(); diff --git a/kicker/kicker/core/showdesktop.h b/kicker/kicker/core/showdesktop.h index 88cc7d7c7..ec7119438 100644 --- a/kicker/kicker/core/showdesktop.h +++ b/kicker/kicker/core/showdesktop.h @@ -33,7 +33,7 @@ class KWinModule; */ class ShowDesktop : public TQObject { - Q_OBJECT + TQ_OBJECT public: static ShowDesktop* the(); diff --git a/kicker/kicker/core/unhidetrigger.cpp b/kicker/kicker/core/unhidetrigger.cpp index 0a5093a61..1acc182f6 100644 --- a/kicker/kicker/core/unhidetrigger.cpp +++ b/kicker/kicker/core/unhidetrigger.cpp @@ -40,7 +40,7 @@ UnhideTrigger::UnhideTrigger() , enabledCount( 0 ) { _timer = new TQTimer( this, "UnhideTrigger" ); - connect( _timer, TQT_SIGNAL(timeout()), TQT_SLOT(pollMouse()) ); + connect( _timer, TQ_SIGNAL(timeout()), TQ_SLOT(pollMouse()) ); } void UnhideTrigger::setEnabled( bool enable ) diff --git a/kicker/kicker/core/unhidetrigger.h b/kicker/kicker/core/unhidetrigger.h index af05a43f5..472009014 100644 --- a/kicker/kicker/core/unhidetrigger.h +++ b/kicker/kicker/core/unhidetrigger.h @@ -32,9 +32,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqobject.h> -class UnhideTrigger : public QObject +class UnhideTrigger : public TQObject { - Q_OBJECT + TQ_OBJECT public: enum Trigger { None = 0, Top, TopRight, Right, BottomRight, Bottom, BottomLeft, Left, TopLeft }; static UnhideTrigger* the(); diff --git a/kicker/kicker/core/userrectsel.cpp b/kicker/kicker/core/userrectsel.cpp index d48c43aad..04a2a4afd 100644 --- a/kicker/kicker/core/userrectsel.cpp +++ b/kicker/kicker/core/userrectsel.cpp @@ -46,7 +46,7 @@ UserRectSel::~UserRectSel() void UserRectSel::mouseReleaseEvent(TQMouseEvent * e) { - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) { tqApp->exit_loop(); } @@ -89,7 +89,7 @@ void UserRectSel::paintCurrent() for (i = 0; i < 4; i++) { _frame[i] = new TQWidget(0, 0, (WFlags)(WStyle_Customize | WStyle_NoBorder | WX11BypassWM)); - _frame[i]->setPaletteBackgroundColor(Qt::black); + _frame[i]->setPaletteBackgroundColor(TQt::black); } for (i = 4; i < 8; i++) { diff --git a/kicker/kicker/core/userrectsel.h b/kicker/kicker/core/userrectsel.h index 564a6d980..dbc4d62be 100644 --- a/kicker/kicker/core/userrectsel.h +++ b/kicker/kicker/core/userrectsel.h @@ -34,7 +34,7 @@ class ShutUpCompiler; class UserRectSel : public TQWidget { - Q_OBJECT + TQ_OBJECT public: class PanelStrut diff --git a/kicker/kicker/core/usersizesel.cpp b/kicker/kicker/core/usersizesel.cpp index 107a2527a..3119d8354 100644 --- a/kicker/kicker/core/usersizesel.cpp +++ b/kicker/kicker/core/usersizesel.cpp @@ -46,7 +46,7 @@ UserSizeSel::UserSizeSel(const TQRect& rect, const KPanelExtension::Position pos } if ((pos == KPanelExtension::Top) || (pos == KPanelExtension::Bottom)) { - setCursor(tqsizeVerCursor); + setCursor(TQt::sizeVerCursor); } setGeometry(-10, -10, 2, 2); @@ -69,7 +69,7 @@ UserSizeSel::~UserSizeSel() void UserSizeSel::mouseReleaseEvent(TQMouseEvent * e) { - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) { tqApp->exit_loop(); } @@ -99,7 +99,7 @@ void UserSizeSel::mouseMoveEvent(TQMouseEvent * e) // int screen = xineramaScreen(); // if (screen < 0) // { -// screen = kapp->desktop()->screenNumber(this); +// screen = tdeApp->desktop()->screenNumber(this); // } // TQRect desktopGeom = TQApplication::desktop()->screenGeometry(screen); if (newSize < PANEL_MINIMUM_HEIGHT) @@ -156,7 +156,7 @@ void UserSizeSel::paintCurrent() for (i = 0; i < 4; i++) { _frame[i] = new TQWidget(0, 0, (WFlags)(WStyle_Customize | WStyle_NoBorder | WX11BypassWM)); - _frame[i]->setPaletteBackgroundColor(Qt::black); + _frame[i]->setPaletteBackgroundColor(TQt::black); } for (i = 4; i < 8; i++) { diff --git a/kicker/kicker/core/usersizesel.h b/kicker/kicker/core/usersizesel.h index 64c8950bd..658baecf2 100644 --- a/kicker/kicker/core/usersizesel.h +++ b/kicker/kicker/core/usersizesel.h @@ -34,7 +34,7 @@ class ShutUpCompiler; class UserSizeSel : public TQWidget { - Q_OBJECT + TQ_OBJECT public: static TQRect select(const TQRect& rect, const KPanelExtension::Position pos, const TQColor& color); diff --git a/kicker/kicker/interfaces/CMakeLists.txt b/kicker/kicker/interfaces/CMakeLists.txt index b388df33e..c584bfc89 100644 --- a/kicker/kicker/interfaces/CMakeLists.txt +++ b/kicker/kicker/interfaces/CMakeLists.txt @@ -29,7 +29,11 @@ install( FILES ##### other data ################################ -install( FILES kickoffsearchplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) +tde_create_translated_desktop( + SOURCE kickoffsearchplugin.desktop + DESTINATION ${SERVICETYPES_INSTALL_DIR} + PO_DIR kicker-desktops +) ##### kickoffsearch_interfaces (shared) ######### diff --git a/kicker/kicker/interfaces/kickoff-search-plugin.h b/kicker/kicker/interfaces/kickoff-search-plugin.h index e605e27c5..441d71200 100644 --- a/kicker/kicker/interfaces/kickoff-search-plugin.h +++ b/kicker/kicker/interfaces/kickoff-search-plugin.h @@ -26,7 +26,7 @@ #include <tqobject.h> #include <kurl.h> #include <kservice.h> -#include <kdemacros.h> +#include <tdemacros.h> typedef enum { ACTIONS = 0, @@ -89,9 +89,9 @@ public: namespace KickoffSearch { - class KDE_EXPORT Plugin : public TQObject + class TDE_EXPORT Plugin : public TQObject { - Q_OBJECT + TQ_OBJECT public: Plugin(TQObject *parent, const char* name=0); diff --git a/kicker/kicker/interfaces/kickoffsearchinterface.cpp b/kicker/kicker/interfaces/kickoffsearchinterface.cpp index 66b1add77..7c77cff0c 100644 --- a/kicker/kicker/interfaces/kickoffsearchinterface.cpp +++ b/kicker/kicker/interfaces/kickoffsearchinterface.cpp @@ -19,7 +19,7 @@ #include "kickoffsearchinterface.h" -KDE_EXPORT KickoffSearch::KickoffSearchInterface::KickoffSearchInterface( TQObject* parent, const char* name ) +TDE_EXPORT KickoffSearch::KickoffSearchInterface::KickoffSearchInterface( TQObject* parent, const char* name ) :TQObject( parent, name ) { } diff --git a/kicker/kicker/interfaces/kickoffsearchinterface.h b/kicker/kicker/interfaces/kickoffsearchinterface.h index 485e9757c..89768d8ce 100644 --- a/kicker/kicker/interfaces/kickoffsearchinterface.h +++ b/kicker/kicker/interfaces/kickoffsearchinterface.h @@ -22,15 +22,15 @@ #include <tqobject.h> -#include <kdemacros.h> +#include <tdemacros.h> class HitMenuItem; namespace KickoffSearch { - class KDE_EXPORT KickoffSearchInterface :public TQObject + class TDE_EXPORT KickoffSearchInterface :public TQObject { - Q_OBJECT + TQ_OBJECT public: KickoffSearchInterface( TQObject* parent, const char* name = 0); diff --git a/kicker/kicker/interfaces/kickoffsearchplugin.desktop b/kicker/kicker/interfaces/kickoffsearchplugin.desktop index a693d35cb..ce0361e5f 100644 --- a/kicker/kicker/interfaces/kickoffsearchplugin.desktop +++ b/kicker/kicker/interfaces/kickoffsearchplugin.desktop @@ -1,4 +1,5 @@ [Desktop Entry] Type=ServiceType X-TDE-ServiceType=KickoffSearch/Plugin + Comment=A search plugin for Kickoff diff --git a/kicker/kicker/kcmkicker.desktop b/kicker/kicker/kcmkicker.desktop index c7d493997..7065ead69 100644 --- a/kicker/kicker/kcmkicker.desktop +++ b/kicker/kicker/kcmkicker.desktop @@ -2,80 +2,9 @@ Icon=kcmkicker Type=Application Exec=tdecmshell %i kicker_config kcmtaskbar -Name=Configure the Panel -Name[af]=Stel die paneel op -Name[ar]=قم بإعداد اللوحة -Name[az]=Paneli Quraşdır -Name[be]=Настаўленне панэлі -Name[bg]=Настройване на панела -Name[bn]=প্যানেল কনফিগার করো -Name[br]=Kefluniañ ar panell -Name[bs]=Podesite Panel -Name[ca]=Configura el plafó -Name[cs]=Nastavit panel -Name[csb]=Kònfigùracëjô panelu -Name[cy]=Ffurfweddu'r Panel -Name[da]=Indstil panelet -Name[de]=Kontrollleiste einrichten -Name[el]=Ρύθμιση του πίνακα -Name[eo]=Agordo de Panelo -Name[es]=Configuración del panel -Name[et]=Paneeli seadistamine -Name[eu]=Konfiguratu panela -Name[fa]=پیکربندی تابلو -Name[fi]=Paneelin asetukset -Name[fr]=Configuration du tableau de bord -Name[fy]=Paniel ynstelle -Name[ga]=Cumraigh an Painéal -Name[gl]=Configurar o Painel -Name[he]=הגדר את הלוח -Name[hi]=फलक कॉन्फ़िगर करें -Name[hr]=Konfiguriranje ploče -Name[hu]=A panel beállítása -Name[is]=Stilla spjaldið -Name[it]=Configura il pannello -Name[ja]=パネルの設定 -Name[ka]=პანელის კონფიგურირება -Name[kk]=Панельді баптау -Name[km]=កំណត់រចនាសម្ព័ន្ធបន្ទះ -Name[ko]=패널 작업 표시줄 설정 -Name[lt]=Konfigūruoti pultą -Name[lv]=Konfigurēt paneli -Name[mk]=Конфигурација на панелот -Name[mn]=Удирдах самбар тохируулах -Name[ms]=Konfigur Panel -Name[mt]=Ikkonfigura l-pannell -Name[nb]=Tilpass panelet -Name[nds]=Dat Paneel instellen -Name[ne]=प्यानल कन्फिगर गर्नुहोस् -Name[nl]=Paneel instellen -Name[nn]=Set opp panelet -Name[pa]=ਪੈਨਲ ਸੰਰਚਨਾ -Name[pl]=Konfiguracja panelu -Name[pt]=Configurar o Painel -Name[pt_BR]=Configurar o Painel -Name[ro]=Configurează panoul -Name[ru]=Настройка панели -Name[rw]=Kuboneza Umwanya -Name[se]=Heivet panela -Name[sk]=Nastaviť panel -Name[sl]=Nastavi pult -Name[sr]=Подешавање панела -Name[sr@Latn]=Podešavanje panela -Name[sv]=Anpassa panelen -Name[ta]=பலகத்தை வடிவமை -Name[tg]=Танзими сафҳа -Name[th]=ปรับแต่งพาเนล -Name[tr]=Paneli Yapılandır -Name[tt]=Taqtanı Caylaw -Name[uk]=Налаштування панелі -Name[uz]=Panelni moslash -Name[uz@cyrillic]=Панелни мослаш -Name[vi]=Cấu hình Bảng điều khiển -Name[wa]=Apontyî li scriftôr -Name[zh_CN]=配置面板 -Name[zh_TW]=設定面板 X-TDE-StartupNotify=true X-DocPath=kicker/configuring.html OnlyShowIn=TDE; Categories=Qt;TDE;Settings; + +Name=Configure the Panel diff --git a/kicker/kicker/kicker-3.4-reverseLayout.cpp b/kicker/kicker/kicker-3.4-reverseLayout.cpp index 9d530f236..d9beb5663 100644 --- a/kicker/kicker/kicker-3.4-reverseLayout.cpp +++ b/kicker/kicker/kicker-3.4-reverseLayout.cpp @@ -8,7 +8,7 @@ #include <tdecmdlineargs.h> #include <tdeglobal.h> #include <tdelocale.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdetempfile.h> struct AppletInfo diff --git a/kicker/kicker/panel.desktop b/kicker/kicker/panel.desktop index 20a582cdd..36f948d24 100644 --- a/kicker/kicker/panel.desktop +++ b/kicker/kicker/panel.desktop @@ -1,86 +1,10 @@ [Desktop Entry] Exec=kicker -Name=Trinity Panel -Name[af]=Trinity Paneel -Name[ar]=لوحة Trinity -Name[az]=Trinity Paneli -Name[be]=Панэль Trinity -Name[bg]=Системен панел -Name[bn]=কে.ডি.ই. প্যানেল -Name[br]=Panell Trinity -Name[bs]=Trinity panel -Name[ca]=Plafó Trinity -Name[cs]=Panel Trinity -Name[cy]=Panel Trinity -Name[de]=Trinity-Kontrollleiste -Name[el]=Πίνακας Trinity -Name[eo]=Panelo -Name[es]=Panel de Trinity -Name[et]=Trinity paneel -Name[eu]=Trinity panela -Name[fa]=تابلوی Trinity -Name[fi]=Trinity-paneeli -Name[fr]=Tableau de bord de Trinity -Name[fy]=Trinity Paniel -Name[ga]=Painéal Trinity -Name[gl]=Painel de Trinity -Name[he]=הלוח של Trinity -Name[hi]=केडीई फलक -Name[hr]=Trinity ploča -Name[hu]=Panel -Name[id]=Panel Trinity -Name[is]=Trinity spjald -Name[it]=Pannello di Trinity -Name[ja]=Trinity パネル -Name[ka]=Trinity-ს პანელი -Name[kk]=Trinity панелі -Name[km]=បន្ទះ Trinity -Name[ku]=Panela Trinity'yê -Name[lo]=ຖາດພາເນລຂອง Trinity -Name[lt]=Trinity pultas -Name[lv]=Trinity Panelis -Name[mk]=Панелот на Trinity -Name[mn]=КДЭ-Удирдлагын самбар -Name[ms]=Panel Trinity -Name[mt]=Pannell Trinity -Name[nb]=Trinity-Panel -Name[nds]=Trinity-Paneel -Name[ne]=Trinity प्यानल -Name[nl]=Trinity Paneel -Name[nn]=Trinity-panel -Name[nso]=Panel ya Trinity -Name[pa]=Trinity ਪੈਨਲ -Name[pl]=Panel -Name[pt]=Painel do Trinity -Name[pt_BR]=Painel do Trinity -Name[ro]=Panou Trinity -Name[ru]=Панель Trinity -Name[rw]=Trinity Umwanya -Name[se]=Trinity-panela -Name[sk]=Trinity panel -Name[sl]=Pult Trinity -Name[sr]=Trinity панел -Name[sr@Latn]=Trinity panel -Name[sv]=Trinity-panel -Name[ta]=Trinity பலகம் -Name[te]=కెడిఈ పెనల్ -Name[tg]=Сафҳаи Trinity -Name[th]=ถาดพาเนล Trinity -Name[tr]=Trinity Paneli -Name[tt]=Trinity Üzäge -Name[uk]=Панель Trinity -Name[uz]=Trinity paneli -Name[uz@cyrillic]=Trinity панели -Name[ven]=Phanele ya Trinity -Name[vi]=Bảng điều khiển Trinity -Name[wa]=Scriftôr Trinity -Name[xh]=Ipanel ye Trinity -Name[zh_CN]=Trinity 面板 -Name[zh_TW]=Trinity 面板 -Name[zu]=Iwindi lemininingwane le-Trinity X-DCOP-ServiceType=wait X-TDE-autostart-after=kdesktop X-DocPath=kicker/index.html Type=Service OnlyShowIn=TDE; X-TDE-autostart-phase=0 + +Name=Trinity Panel diff --git a/kicker/kicker/ui/CMakeLists.txt b/kicker/kicker/ui/CMakeLists.txt index 754288ce9..c773cfe7b 100644 --- a/kicker/kicker/ui/CMakeLists.txt +++ b/kicker/kicker/ui/CMakeLists.txt @@ -20,7 +20,6 @@ include_directories( ${CMAKE_SOURCE_DIR}/kicker/kicker/buttons ${CMAKE_SOURCE_DIR}/tdmlib ${CMAKE_SOURCE_DIR}/libkonq - ${DBUS_TQT_INCLUDE_DIRS} ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) @@ -56,5 +55,5 @@ set( ${target}_SRCS tde_add_library( ${target} STATIC_PIC AUTOMOC SOURCES ${${target}_SRCS} DEPENDENCIES kicker_core-static - LINK dmctl-static kickoffsearch_interfaces-shared ${DBUS_TQT_LIBRARIES} ${HAL_LIBRARIES} + LINK dmctl-static kickoffsearch_interfaces-shared ${TDEHW_LIBRARIES} ) diff --git a/kicker/kicker/ui/addapplet.cpp b/kicker/kicker/ui/addapplet.cpp index 0db6bc352..f3b864ed8 100644 --- a/kicker/kicker/ui/addapplet.cpp +++ b/kicker/kicker/ui/addapplet.cpp @@ -38,7 +38,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kdebug.h> #include <tdeglobalsettings.h> #include <kpushbutton.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstdguiitem.h> #include <paneldrag.h> @@ -61,7 +61,7 @@ AppletWidget::AppletWidget(const AppletInfo& info, bool odd, TQWidget *parent) m_odd(odd), m_selected(false) { - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); setSelected(m_selected); itemTitle->setText("<h3>" + info.name() + "</h3>"); @@ -84,8 +84,8 @@ bool AppletWidget::eventFilter(TQObject*, TQEvent* e) { if (e->type() == TQEvent::MouseButtonPress) { - TQMouseEvent* me = TQT_TQMOUSEEVENT(e); - if (me->button() & Qt::LeftButton) + TQMouseEvent* me = static_cast<TQMouseEvent*>(e); + if (me->button() & TQt::LeftButton) { m_dragStart = me->pos(); } @@ -97,7 +97,7 @@ bool AppletWidget::eventFilter(TQObject*, TQEvent* e) if (e->type() == TQEvent::MouseMove) { - TQMouseEvent* me = TQT_TQMOUSEEVENT(e); + TQMouseEvent* me = static_cast<TQMouseEvent*>(e); if ((me->pos() - m_dragStart).manhattanLength() > TDEGlobalSettings::dndEventDelay()) { @@ -123,21 +123,21 @@ bool AppletWidget::eventFilter(TQObject*, TQEvent* e) void AppletWidget::keyPressEvent(TQKeyEvent *e) { - if (e->key() == Qt::Key_Enter || - e->key() == Qt::Key_Return) + if (e->key() == TQt::Key_Enter || + e->key() == TQt::Key_Return) { emit doubleClicked(this); } - else if (e->key() == Qt::Key_Up) + else if (e->key() == TQt::Key_Up) { TQKeyEvent fakedKeyPress(TQEvent::KeyPress, TQt::Key_BackTab, 0, 0); TQKeyEvent fakedKeyRelease(TQEvent::KeyRelease, Key_BackTab, 0, 0); TQApplication::sendEvent(this, &fakedKeyPress); TQApplication::sendEvent(this, &fakedKeyRelease); } - else if (e->key() == Qt::Key_Down) + else if (e->key() == TQt::Key_Down) { - TQKeyEvent fakedKeyPress(TQEvent::KeyPress, Qt::Key_Tab, 0, 0); + TQKeyEvent fakedKeyPress(TQEvent::KeyPress, TQt::Key_Tab, 0, 0); TQKeyEvent fakedKeyRelease(TQEvent::KeyRelease, Key_Escape, 0, 0); TQApplication::sendEvent(this, &fakedKeyPress); TQApplication::sendEvent(this, &fakedKeyRelease); @@ -150,7 +150,7 @@ void AppletWidget::keyPressEvent(TQKeyEvent *e) void AppletWidget::mousePressEvent(TQMouseEvent *e) { - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) { emit clicked(this); m_dragStart = e->pos(); @@ -162,7 +162,7 @@ void AppletWidget::mousePressEvent(TQMouseEvent *e) void AppletWidget::mouseMoveEvent(TQMouseEvent *e) { - if (e->button() == Qt::LeftButton && + if (e->button() == TQt::LeftButton && !m_dragStart.isNull() && (e->pos() - m_dragStart).manhattanLength() > TDEGlobalSettings::dndEventDelay()) @@ -186,7 +186,7 @@ void AppletWidget::mouseReleaseEvent(TQMouseEvent *e) void AppletWidget::mouseDoubleClickEvent(TQMouseEvent *e) { - if (!e->button() == Qt::LeftButton) + if (!e->button() == TQt::LeftButton) { AppletItem::mouseDoubleClickEvent(e); return; @@ -254,16 +254,16 @@ AddAppletDialog::AddAppletDialog(ContainerArea* cArea, m_mainWidget->appletInstall->setGuiItem(addGuiItem); m_mainWidget->closeButton->setGuiItem(KStdGuiItem::close()); - connect(m_mainWidget->appletSearch, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(delayedSearch())); - connect(m_searchDelay, TQT_SIGNAL(timeout()), this, TQT_SLOT(search())); - connect(m_mainWidget->appletFilter, TQT_SIGNAL(activated(int)), this, TQT_SLOT(filter(int))); - connect(m_mainWidget->appletInstall, TQT_SIGNAL(clicked()), this, TQT_SLOT(addCurrentApplet())); - connect(m_mainWidget->closeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(close())); + connect(m_mainWidget->appletSearch, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(delayedSearch())); + connect(m_searchDelay, TQ_SIGNAL(timeout()), this, TQ_SLOT(search())); + connect(m_mainWidget->appletFilter, TQ_SIGNAL(activated(int)), this, TQ_SLOT(filter(int))); + connect(m_mainWidget->appletInstall, TQ_SIGNAL(clicked()), this, TQ_SLOT(addCurrentApplet())); + connect(m_mainWidget->closeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(close())); m_selectedType = AppletInfo::Undefined; m_appletBox = 0; - TQTimer::singleShot(0, this, TQT_SLOT(populateApplets())); + TQTimer::singleShot(0, this, TQ_SLOT(populateApplets())); } void AddAppletDialog::updateInsertionPoint() @@ -303,9 +303,9 @@ void AddAppletDialog::resizeAppletView() bool AddAppletDialog::eventFilter(TQObject *o, TQEvent *e) { if (e->type() == TQEvent::Resize) - TQTimer::singleShot(0, this, TQT_SLOT(resizeAppletView())); + TQTimer::singleShot(0, this, TQ_SLOT(resizeAppletView())); - return TQT_TQOBJECT(this)->TQObject::eventFilter(o, e); + return this->TQObject::eventFilter(o, e); } void AddAppletDialog::populateApplets() @@ -372,10 +372,10 @@ void AddAppletDialog::populateApplets() setTabOrder(prevTabWidget, itemWidget); prevTabWidget = itemWidget; - connect(itemWidget, TQT_SIGNAL(clicked(AppletWidget*)), - this, TQT_SLOT(selectApplet(AppletWidget*))); - connect(itemWidget, TQT_SIGNAL(doubleClicked(AppletWidget*)), - this, TQT_SLOT(addApplet(AppletWidget*))); + connect(itemWidget, TQ_SIGNAL(clicked(AppletWidget*)), + this, TQ_SLOT(selectApplet(AppletWidget*))); + connect(itemWidget, TQ_SIGNAL(doubleClicked(AppletWidget*)), + this, TQ_SLOT(addApplet(AppletWidget*))); if (m_closing) { @@ -518,7 +518,7 @@ void AddAppletDialog::search() } } - TQTimer::singleShot(0, this, TQT_SLOT(resizeAppletView())); + TQTimer::singleShot(0, this, TQ_SLOT(resizeAppletView())); } void AddAppletDialog::filter(int i) diff --git a/kicker/kicker/ui/addapplet.h b/kicker/kicker/ui/addapplet.h index bc2763f0b..c62b2b2ec 100644 --- a/kicker/kicker/ui/addapplet.h +++ b/kicker/kicker/ui/addapplet.h @@ -41,7 +41,7 @@ class TQTimer; class AddAppletDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: AddAppletDialog(ContainerArea* cArea, TQWidget* parent, const char* name); diff --git a/kicker/kicker/ui/addapplet_mnu.cpp b/kicker/kicker/ui/addapplet_mnu.cpp index 6d5c4482f..f68159b98 100644 --- a/kicker/kicker/ui/addapplet_mnu.cpp +++ b/kicker/kicker/ui/addapplet_mnu.cpp @@ -33,8 +33,8 @@ PanelAddAppletMenu::PanelAddAppletMenu(ContainerArea* cArea, TQWidget *parent, c : TQPopupMenu(parent, name), containerArea(cArea) { setCheckable(true); - connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int))); - connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow())); + connect(this, TQ_SIGNAL(activated(int)), TQ_SLOT(slotExec(int))); + connect(this, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotAboutToShow())); } void PanelAddAppletMenu::slotAboutToShow() diff --git a/kicker/kicker/ui/addapplet_mnu.h b/kicker/kicker/ui/addapplet_mnu.h index 79c539687..dfe15bbeb 100644 --- a/kicker/kicker/ui/addapplet_mnu.h +++ b/kicker/kicker/ui/addapplet_mnu.h @@ -33,7 +33,7 @@ class ContainerArea; class PanelAddAppletMenu : public TQPopupMenu { - Q_OBJECT + TQ_OBJECT public: PanelAddAppletMenu(ContainerArea *cArea, TQWidget *parent=0, const char *name=0); diff --git a/kicker/kicker/ui/addappletvisualfeedback.cpp b/kicker/kicker/ui/addappletvisualfeedback.cpp index 62ff12675..dd6f04135 100644 --- a/kicker/kicker/ui/addappletvisualfeedback.cpp +++ b/kicker/kicker/ui/addappletvisualfeedback.cpp @@ -54,9 +54,9 @@ AddAppletVisualFeedback::AddAppletVisualFeedback(AppletWidget* widget, m_moveTimer(0, "m_moveTimer"), m_dirty(false) { - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); setBackgroundMode(NoBackground); - connect(&m_moveTimer, TQT_SIGNAL(timeout()), TQT_SLOT(swoopCloser())); + connect(&m_moveTimer, TQ_SIGNAL(timeout()), TQ_SLOT(swoopCloser())); TQString m = "<qt><h3>" + i18n("%1 Added").arg(widget->info().name()); @@ -109,10 +109,10 @@ void AddAppletVisualFeedback::makeMask() { TQPainter maskPainter(&m_mask); - m_mask.fill(Qt::black); + m_mask.fill(TQt::black); - maskPainter.setBrush(Qt::white); - maskPainter.setPen(Qt::white); + maskPainter.setBrush(TQt::white); + maskPainter.setPen(TQt::white); maskPainter.drawRoundRect(m_mask.rect(), 1600 / m_mask.rect().width(), 1600 / m_mask.rect().height()); setMask(m_mask); @@ -156,7 +156,7 @@ void AddAppletVisualFeedback::displayInternal() // draw background TQPainter bufferPainter(&m_pixmap); - bufferPainter.setPen(Qt::black); + bufferPainter.setPen(TQt::black); bufferPainter.setBrush(colorGroup().background()); bufferPainter.drawRoundRect(0, 0, width, height, 1600 / width, 1600 / height); @@ -218,7 +218,7 @@ void AddAppletVisualFeedback::swoopCloser() { m_moveTimer.stop(); displayInternal(); - TQTimer::singleShot(2000, this, TQT_SLOT(deleteLater())); + TQTimer::singleShot(2000, this, TQ_SLOT(deleteLater())); } } diff --git a/kicker/kicker/ui/addappletvisualfeedback.h b/kicker/kicker/ui/addappletvisualfeedback.h index dc660bff1..d2e3da5e6 100644 --- a/kicker/kicker/ui/addappletvisualfeedback.h +++ b/kicker/kicker/ui/addappletvisualfeedback.h @@ -40,7 +40,7 @@ class TQTimer; class AddAppletVisualFeedback : TQWidget { - Q_OBJECT + TQ_OBJECT public: AddAppletVisualFeedback(AppletWidget* parent, diff --git a/kicker/kicker/ui/addbutton_mnu.cpp b/kicker/kicker/ui/addbutton_mnu.cpp index a544d0f74..a70a9cfd6 100644 --- a/kicker/kicker/ui/addbutton_mnu.cpp +++ b/kicker/kicker/ui/addbutton_mnu.cpp @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tdesycocaentry.h> #include <kservice.h> #include <kservicegroup.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include "addbutton_mnu.h" diff --git a/kicker/kicker/ui/addbutton_mnu.h b/kicker/kicker/ui/addbutton_mnu.h index 209e7e9a3..1a19b9480 100644 --- a/kicker/kicker/ui/addbutton_mnu.h +++ b/kicker/kicker/ui/addbutton_mnu.h @@ -30,7 +30,7 @@ class ContainerArea; class PanelAddButtonMenu : public PanelServiceMenu { - Q_OBJECT + TQ_OBJECT public: PanelAddButtonMenu(ContainerArea* cArea, const TQString & label, const TQString & relPath, diff --git a/kicker/kicker/ui/addextension_mnu.cpp b/kicker/kicker/ui/addextension_mnu.cpp index b22187443..c0eda09ab 100644 --- a/kicker/kicker/ui/addextension_mnu.cpp +++ b/kicker/kicker/ui/addextension_mnu.cpp @@ -31,8 +31,8 @@ PanelAddExtensionMenu::PanelAddExtensionMenu(TQWidget *parent, const char *name) : TQPopupMenu(parent, name) { setCheckable(true); - connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int))); - connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow())); + connect(this, TQ_SIGNAL(activated(int)), TQ_SLOT(slotExec(int))); + connect(this, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotAboutToShow())); } void PanelAddExtensionMenu::slotAboutToShow() diff --git a/kicker/kicker/ui/addextension_mnu.h b/kicker/kicker/ui/addextension_mnu.h index 76163250f..f3be54c1f 100644 --- a/kicker/kicker/ui/addextension_mnu.h +++ b/kicker/kicker/ui/addextension_mnu.h @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class PanelAddExtensionMenu : public TQPopupMenu { - Q_OBJECT + TQ_OBJECT public: PanelAddExtensionMenu(TQWidget *parent=0, const char *name=0); diff --git a/kicker/kicker/ui/appletop_mnu.cpp b/kicker/kicker/ui/appletop_mnu.cpp index a037909b6..b38ca9fae 100644 --- a/kicker/kicker/ui/appletop_mnu.cpp +++ b/kicker/kicker/ui/appletop_mnu.cpp @@ -99,7 +99,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP insertSeparator(); } - TQPixmap iconPix(kapp->iconLoader()->loadIcon(icon, + TQPixmap iconPix(tdeApp->iconLoader()->loadIcon(icon, TDEIcon::Small, 0, TDEIcon::DefaultState, 0, true)); @@ -169,13 +169,13 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP } if (KickerSettings::legacyKMenu()) -// insertItem(SmallIcon("kickoff"), i18n("Switch to Kickoff Menu Style"), this, TQT_SLOT(toggleLegacy())); - insertItem(SmallIcon("launch"), i18n("Switch to Kickoff Menu Style"), this, TQT_SLOT(toggleLegacy())); +// insertItem(SmallIcon("kickoff"), i18n("Switch to Kickoff Menu Style"), this, TQ_SLOT(toggleLegacy())); + insertItem(SmallIcon("launch"), i18n("Switch to Kickoff Menu Style"), this, TQ_SLOT(toggleLegacy())); else - insertItem(SmallIcon("about_kde"), i18n("Switch to Trinity Classic Menu Style"), this, TQT_SLOT(toggleLegacy())); + insertItem(SmallIcon("about_kde"), i18n("Switch to Trinity Classic Menu Style"), this, TQ_SLOT(toggleLegacy())); } - if ((actions & PanelAppletOpMenu::KMenuEditor) && kapp->authorizeTDEAction("menuedit")) + if ((actions & PanelAppletOpMenu::KMenuEditor) && tdeApp->authorizeTDEAction("menuedit")) { if (needSeparator) { @@ -187,7 +187,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP } if ((actions & PanelAppletOpMenu::BookmarkEditor) && - kapp->authorizeTDEAction("edit_bookmarks")) + tdeApp->authorizeTDEAction("edit_bookmarks")) { if (needSeparator) { @@ -213,7 +213,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP void PanelAppletOpMenu::keyPressEvent(TQKeyEvent* e) { - if (e->key() == Qt::Key_Escape) + if (e->key() == TQt::Key_Escape) { emit escapePressed(); } diff --git a/kicker/kicker/ui/appletop_mnu.h b/kicker/kicker/ui/appletop_mnu.h index 35e10be3c..ae058cea1 100644 --- a/kicker/kicker/ui/appletop_mnu.h +++ b/kicker/kicker/ui/appletop_mnu.h @@ -31,7 +31,7 @@ class AppletInfo; // The button operations menu (usually right click) class PanelAppletOpMenu : public TQPopupMenu { -Q_OBJECT +TQ_OBJECT public: enum OpButton{Move = 9900, Remove = 9901, Help = 9902, About = 9903, Preferences = 9904, ReportBug = 9905 }; diff --git a/kicker/kicker/ui/appletview.ui b/kicker/kicker/ui/appletview.ui index 5d92dab89..e61575a72 100644 --- a/kicker/kicker/ui/appletview.ui +++ b/kicker/kicker/ui/appletview.ui @@ -198,8 +198,6 @@ <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">tqscrollview.h</include> </includes> -<includehints> - <includehint>tqscrollview.h</includehint> -</includehints> </UI> diff --git a/kicker/kicker/ui/appletwidget.h b/kicker/kicker/ui/appletwidget.h index d0bb9e885..e0a0b485c 100644 --- a/kicker/kicker/ui/appletwidget.h +++ b/kicker/kicker/ui/appletwidget.h @@ -36,7 +36,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class AppletWidget: public AppletItem { - Q_OBJECT + TQ_OBJECT public: typedef TQValueList<AppletWidget*> List; diff --git a/kicker/kicker/ui/browser_dlg.cpp b/kicker/kicker/ui/browser_dlg.cpp index 0e98054d8..27eb0def5 100644 --- a/kicker/kicker/ui/browser_dlg.cpp +++ b/kicker/kicker/ui/browser_dlg.cpp @@ -55,7 +55,7 @@ PanelBrowserDialog::PanelBrowserDialog( const TQString& path, const TQString &ic hbox1->setSpacing( KDialog::spacingHint() ); TQLabel *label2 = new TQLabel( i18n ( "Path:" ), hbox1 ); pathInput = new KLineEdit( hbox1 ); - connect( pathInput, TQT_SIGNAL( textChanged ( const TQString & )), this, TQT_SLOT( slotPathChanged( const TQString & ))); + connect( pathInput, TQ_SIGNAL( textChanged ( const TQString & )), this, TQ_SLOT( slotPathChanged( const TQString & ))); pathInput->setText( path ); pathInput->setFocus(); @@ -69,7 +69,7 @@ PanelBrowserDialog::PanelBrowserDialog( const TQString& path, const TQString &ic else iconBtn->setIcon( icon ); - connect( browseBtn, TQT_SIGNAL( clicked() ), this, TQT_SLOT( browse() ) ); + connect( browseBtn, TQ_SIGNAL( clicked() ), this, TQ_SLOT( browse() ) ); } PanelBrowserDialog::~PanelBrowserDialog() diff --git a/kicker/kicker/ui/browser_dlg.h b/kicker/kicker/ui/browser_dlg.h index d1b3b623d..8aad531a2 100644 --- a/kicker/kicker/ui/browser_dlg.h +++ b/kicker/kicker/ui/browser_dlg.h @@ -31,7 +31,7 @@ class KLineEdit; class PanelBrowserDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: PanelBrowserDialog( const TQString &path = TQString::null, const TQString &icon = TQString::null, TQWidget *parent = 0, const char *name = 0 ); diff --git a/kicker/kicker/ui/browser_mnu.cpp b/kicker/kicker/ui/browser_mnu.cpp index 9b629e165..a3dad738d 100644 --- a/kicker/kicker/ui/browser_mnu.cpp +++ b/kicker/kicker/ui/browser_mnu.cpp @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tdeapplication.h> #include <kdebug.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <kdirwatch.h> #include <tdefileitem.h> #include <tdeglobal.h> @@ -37,9 +37,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tdelocale.h> #include <kmimetype.h> #include <konq_operations.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <krun.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <kstringhandler.h> #include <kurldrag.h> @@ -64,12 +64,12 @@ PanelBrowserMenu::PanelBrowserMenu(TQString path, TQWidget *parent, const char * // we are not interested for dirty events on files inside the // directory (see slotClearIfNeeded) - connect( &_dirWatch, TQT_SIGNAL(dirty(const TQString&)), - this, TQT_SLOT(slotClearIfNeeded(const TQString&)) ); - connect( &_dirWatch, TQT_SIGNAL(created(const TQString&)), - this, TQT_SLOT(slotClear()) ); - connect( &_dirWatch, TQT_SIGNAL(deleted(const TQString&)), - this, TQT_SLOT(slotClear()) ); + connect( &_dirWatch, TQ_SIGNAL(dirty(const TQString&)), + this, TQ_SLOT(slotClearIfNeeded(const TQString&)) ); + connect( &_dirWatch, TQ_SIGNAL(created(const TQString&)), + this, TQ_SLOT(slotClear()) ); + connect( &_dirWatch, TQ_SIGNAL(deleted(const TQString&)), + this, TQ_SLOT(slotClear()) ); kdDebug() << "PanelBrowserMenu Constructor " << path << endl; } @@ -139,7 +139,7 @@ void PanelBrowserMenu::initialize() KURL url; url.setPath(path()); - if (!kapp->authorizeURLAction("list", KURL(), url)) + if (!tdeApp->authorizeURLAction("list", KURL(), url)) { insertItem(i18n("Not Authorized to Read Folder")); return; @@ -151,9 +151,9 @@ void PanelBrowserMenu::initialize() insertTitle(path()); TDEConfig *c = TDEGlobal::config(); c->setGroup("menus"); - insertItem(CICON("kfm"), i18n("Open in File Manager"), this, TQT_SLOT(slotOpenFileManager())); - if (kapp->authorize("shell_access") && KickerSettings::showOpenInTerminal()) - insertItem(CICON("terminal"), i18n("Open in Terminal"), this, TQT_SLOT(slotOpenTerminal())); + insertItem(CICON("kfm"), i18n("Open in File Manager"), this, TQ_SLOT(slotOpenFileManager())); + if (tdeApp->authorize("shell_access") && KickerSettings::showOpenInTerminal()) + insertItem(CICON("terminal"), i18n("Open in Terminal"), this, TQ_SLOT(slotOpenTerminal())); insertSeparator(); } @@ -189,7 +189,7 @@ void PanelBrowserMenu::initialize() // parse .directory if it does exist if (TQFile::exists(path + "/.directory")) { - KSimpleConfig c(path + "/.directory", true); + TDESimpleConfig c(path + "/.directory", true); c.setDesktopGroup(); TQString iconPath = c.readEntry("Icon"); @@ -237,9 +237,9 @@ void PanelBrowserMenu::initialize() bool mimecheck = false; // .desktop files - if(KDesktopFile::isDesktopFile(path)) + if(TDEDesktopFile::isDesktopFile(path)) { - KSimpleConfig c(path, true); + TDESimpleConfig c(path, true); c.setDesktopGroup(); title = c.readEntry("Name", title); @@ -334,7 +334,7 @@ void PanelBrowserMenu::initialize() if(!_mimecheckTimer) _mimecheckTimer = new TQTimer(this, "_mimecheckTimer"); - connect(_mimecheckTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotMimeCheck())); + connect(_mimecheckTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotMimeCheck())); _mimecheckTimer->start(0); } } @@ -380,7 +380,7 @@ void PanelBrowserMenu::mouseMoveEvent(TQMouseEvent *e) { TQPopupMenu::mouseMoveEvent(e); - if (!(e->state() & Qt::LeftButton)) return; + if (!(e->state() & TQt::LeftButton)) return; if(_lastpress == TQPoint(-1, -1)) return; // DND delay @@ -398,7 +398,7 @@ void PanelBrowserMenu::mouseMoveEvent(TQMouseEvent *e) url.setPath(path() + "/" + _filemap[id]); KURL::List files(url); KURLDrag *d = new KURLDrag(files, this); - connect(d, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDragObjectDestroyed())); + connect(d, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotDragObjectDestroyed())); d->setPixmap(iconSet(id)->pixmap()); d->drag(); } @@ -422,7 +422,7 @@ void PanelBrowserMenu::dragEnterEvent( TQDragEnterEvent *ev ) void PanelBrowserMenu::dragMoveEvent(TQDragMoveEvent *ev) { - TQMouseEvent mev(TQEvent::MouseMove, ev->pos(), Qt::NoButton, Qt::LeftButton); + TQMouseEvent mev(TQEvent::MouseMove, ev->pos(), TQt::NoButton, TQt::LeftButton); TQPopupMenu::mouseMoveEvent(&mev); } @@ -437,7 +437,7 @@ void PanelBrowserMenu::dropEvent( TQDropEvent *ev ) void PanelBrowserMenu::slotExec(int id) { - kapp->propagateSessionManager(); + tdeApp->propagateSessionManager(); if(!_filemap.contains(id)) return; @@ -449,7 +449,7 @@ void PanelBrowserMenu::slotExec(int id) void PanelBrowserMenu::slotOpenTerminal() { - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup("General"); TQString term = config->readPathEntry("TerminalApplication", "konsole"); @@ -544,5 +544,3 @@ void PanelBrowserMenu::initIconMap() _icons->insert("exec", SmallIcon("application-x-executable")); _icons->insert("chardevice", SmallIcon("chardevice")); } - -// vim: sw=4 et diff --git a/kicker/kicker/ui/browser_mnu.h b/kicker/kicker/ui/browser_mnu.h index 38f9b9690..1359e855e 100644 --- a/kicker/kicker/ui/browser_mnu.h +++ b/kicker/kicker/ui/browser_mnu.h @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class PanelBrowserMenu : public KPanelMenu { - Q_OBJECT + TQ_OBJECT public: PanelBrowserMenu(TQString path, TQWidget *parent = 0, const char *name = 0, int startid = 0); diff --git a/kicker/kicker/ui/clicklineedit.h b/kicker/kicker/ui/clicklineedit.h index 85efcada8..d6dbcc4f1 100644 --- a/kicker/kicker/ui/clicklineedit.h +++ b/kicker/kicker/ui/clicklineedit.h @@ -33,9 +33,9 @@ namespace KPIM { @short LineEdit with customizable "Click here" text @author Daniel Molkentin */ -class KDE_EXPORT ClickLineEdit : public KLineEdit +class TDE_EXPORT ClickLineEdit : public KLineEdit { - Q_OBJECT + TQ_OBJECT public: ClickLineEdit( TQWidget *parent, const TQString &msg = TQString::null, const char* name = 0 ); ~ClickLineEdit(); diff --git a/kicker/kicker/ui/client_mnu.cpp b/kicker/kicker/ui/client_mnu.cpp index 0ad2107d1..72cc6b279 100644 --- a/kicker/kicker/ui/client_mnu.cpp +++ b/kicker/kicker/ui/client_mnu.cpp @@ -46,13 +46,13 @@ void KickerClientMenu::clear() void KickerClientMenu::insertItem( TQPixmap icon, TQString text, int id ) { - int globalid = TQPopupMenu::insertItem( icon, text, this, TQT_SLOT( slotActivated(int) ) ); + int globalid = TQPopupMenu::insertItem( icon, text, this, TQ_SLOT( slotActivated(int) ) ); setItemParameter( globalid, id ); } void KickerClientMenu::insertItem( TQString text, int id ) { - int globalid = TQPopupMenu::insertItem( text, this, TQT_SLOT( slotActivated(int) ) ); + int globalid = TQPopupMenu::insertItem( text, this, TQ_SLOT( slotActivated(int) ) ); setItemParameter( globalid, id ); } @@ -134,6 +134,6 @@ void KickerClientMenu::slotActivated(int id) TQByteArray data; TQDataStream dataStream( data, IO_WriteOnly ); dataStream << id; - kapp->dcopClient()->send( app, obj, "activated(int)", data ); + tdeApp->dcopClient()->send( app, obj, "activated(int)", data ); } } diff --git a/kicker/kicker/ui/client_mnu.h b/kicker/kicker/ui/client_mnu.h index 272f6364f..c1884469d 100644 --- a/kicker/kicker/ui/client_mnu.h +++ b/kicker/kicker/ui/client_mnu.h @@ -40,7 +40,7 @@ class PanelKMenu; */ class KickerClientMenu : public TQPopupMenu, DCOPObject { - Q_OBJECT + TQ_OBJECT public: KickerClientMenu( TQWidget *parent=0, const char *name=0); ~KickerClientMenu(); diff --git a/kicker/kicker/ui/exe_dlg.cpp b/kicker/kicker/ui/exe_dlg.cpp index 07caa2b55..a0c572685 100644 --- a/kicker/kicker/ui/exe_dlg.cpp +++ b/kicker/kicker/ui/exe_dlg.cpp @@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kicondialog.h> #include <tdemessagebox.h> #include <kmimetype.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurlcompletion.h> #include <kurlrequester.h> #include <kurl.h> @@ -68,14 +68,14 @@ PanelExeDialog::PanelExeDialog(const TQString& title, const TQString& descriptio updateIcon(); - connect(ui->m_exec, TQT_SIGNAL(urlSelected(const TQString &)), - this, TQT_SLOT(slotSelect(const TQString &))); - connect(ui->m_exec, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(slotTextChanged(const TQString &))); - connect(ui->m_exec, TQT_SIGNAL(returnPressed()), - this, TQT_SLOT(slotReturnPressed())); - connect(ui->m_icon, TQT_SIGNAL(iconChanged(TQString)), - this, TQT_SLOT(slotIconChanged(TQString))); + connect(ui->m_exec, TQ_SIGNAL(urlSelected(const TQString &)), + this, TQ_SLOT(slotSelect(const TQString &))); + connect(ui->m_exec, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(slotTextChanged(const TQString &))); + connect(ui->m_exec, TQ_SIGNAL(returnPressed()), + this, TQ_SLOT(slotReturnPressed())); + connect(ui->m_icon, TQ_SIGNAL(iconChanged(TQString)), + this, TQ_SLOT(slotIconChanged(TQString))); // leave decent space for the commandline resize(sizeHint().width() > 300 ? sizeHint().width() : 300, diff --git a/kicker/kicker/ui/exe_dlg.h b/kicker/kicker/ui/exe_dlg.h index ef96fe9d0..669e98a61 100644 --- a/kicker/kicker/ui/exe_dlg.h +++ b/kicker/kicker/ui/exe_dlg.h @@ -29,7 +29,7 @@ class NonKDEButtonSettings; class PanelExeDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: PanelExeDialog(const TQString& title, const TQString& description, const TQString &path, const TQString &pixmap=TQString::null, diff --git a/kicker/kicker/ui/flipscrollview.cpp b/kicker/kicker/ui/flipscrollview.cpp index ae96ebcaa..e2e19d406 100644 --- a/kicker/kicker/ui/flipscrollview.cpp +++ b/kicker/kicker/ui/flipscrollview.cpp @@ -101,20 +101,20 @@ FlipScrollView::FlipScrollView( TQWidget * parent, const char * name ) addChild( mRightView ); mTimer = new TQTimer( this, "mTimer" ); - connect( mTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotScrollTimer() ) ); - - connect( mLeftView, TQT_SIGNAL( startService(KService::Ptr) ), - TQT_SIGNAL( startService(KService::Ptr) ) ); - connect( mLeftView, TQT_SIGNAL( startURL(const TQString& ) ), - TQT_SIGNAL( startURL(const TQString& ) ) ); - connect( mLeftView, TQT_SIGNAL( rightButtonPressed(TQListViewItem*,const TQPoint&,int) ), - TQT_SIGNAL( rightButtonPressed(TQListViewItem*,const TQPoint&,int) ) ); - connect( mRightView, TQT_SIGNAL( startService(KService::Ptr) ), - TQT_SIGNAL( startService(KService::Ptr) ) ); - connect( mRightView, TQT_SIGNAL( startURL(const TQString& ) ), - TQT_SIGNAL( startURL(const TQString& ) ) ); - connect( mRightView, TQT_SIGNAL( rightButtonPressed(TQListViewItem*,const TQPoint&,int) ), - TQT_SIGNAL( rightButtonPressed(TQListViewItem*,const TQPoint&,int) ) ); + connect( mTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotScrollTimer() ) ); + + connect( mLeftView, TQ_SIGNAL( startService(KService::Ptr) ), + TQ_SIGNAL( startService(KService::Ptr) ) ); + connect( mLeftView, TQ_SIGNAL( startURL(const TQString& ) ), + TQ_SIGNAL( startURL(const TQString& ) ) ); + connect( mLeftView, TQ_SIGNAL( rightButtonPressed(TQListViewItem*,const TQPoint&,int) ), + TQ_SIGNAL( rightButtonPressed(TQListViewItem*,const TQPoint&,int) ) ); + connect( mRightView, TQ_SIGNAL( startService(KService::Ptr) ), + TQ_SIGNAL( startService(KService::Ptr) ) ); + connect( mRightView, TQ_SIGNAL( startURL(const TQString& ) ), + TQ_SIGNAL( startURL(const TQString& ) ) ); + connect( mRightView, TQ_SIGNAL( rightButtonPressed(TQListViewItem*,const TQPoint&,int) ), + TQ_SIGNAL( rightButtonPressed(TQListViewItem*,const TQPoint&,int) ) ); // wild hack to make sure it has correct width mLeftView->setVScrollBarMode( TQScrollView::AlwaysOn ); @@ -124,7 +124,7 @@ FlipScrollView::FlipScrollView( TQWidget * parent, const char * name ) mBackrow = new BackFrame( this ); mBackrow->resize( 24, 100 ); - connect( mBackrow, TQT_SIGNAL( clicked() ), TQT_SIGNAL( backButtonClicked() ) ); + connect( mBackrow, TQ_SIGNAL( clicked() ), TQ_SIGNAL( backButtonClicked() ) ); } ItemView* FlipScrollView::prepareRightMove() diff --git a/kicker/kicker/ui/flipscrollview.h b/kicker/kicker/ui/flipscrollview.h index d2de2ab5e..7c761b5ac 100644 --- a/kicker/kicker/ui/flipscrollview.h +++ b/kicker/kicker/ui/flipscrollview.h @@ -44,14 +44,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqframe.h> #include <tqtimer.h> #include <tqpainter.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "service_mnu.h" class ItemView; class BackFrame : public TQFrame { - Q_OBJECT + TQ_OBJECT public: BackFrame( TQWidget *parent ); @@ -71,7 +71,7 @@ private: class FlipScrollView : public TQScrollView { - Q_OBJECT + TQ_OBJECT public: enum State{ StoppedLeft, StoppedRight, ScrollingLeft, ScrollingRight }; FlipScrollView( TQWidget * parent = 0, const char * name = 0 ); diff --git a/kicker/kicker/ui/hidebutton.cpp b/kicker/kicker/ui/hidebutton.cpp index 04666659d..f7637a100 100644 --- a/kicker/kicker/ui/hidebutton.cpp +++ b/kicker/kicker/ui/hidebutton.cpp @@ -29,42 +29,42 @@ #include <kiconloader.h> #include <kicontheme.h> #include <kipc.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> HideButton::HideButton(TQWidget *parent, const char *name) : TQButton(parent, name), m_highlight(false), - m_arrow(Qt::LeftArrow) + m_arrow(TQt::LeftArrow) { setBackgroundOrigin(AncestorOrigin); - connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int))); - connect(kapp, TQT_SIGNAL(iconChanged(int)), TQT_SLOT(slotIconChanged(int))); + connect(tdeApp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int))); + connect(tdeApp, TQ_SIGNAL(iconChanged(int)), TQ_SLOT(slotIconChanged(int))); - kapp->addKipcEventMask(KIPC::SettingsChanged); - kapp->addKipcEventMask(KIPC::IconChanged); + tdeApp->addKipcEventMask(KIPC::SettingsChanged); + tdeApp->addKipcEventMask(KIPC::IconChanged); slotSettingsChanged(TDEApplication::SETTINGS_MOUSE); } void HideButton::drawButton(TQPainter *p) { - if (m_arrow == Qt::LeftArrow) + if (m_arrow == TQt::LeftArrow) { p->setPen(colorGroup().mid()); p->drawLine(width()-1, 0, width()-1, height()); } - else if (m_arrow == Qt::RightArrow) + else if (m_arrow == TQt::RightArrow) { p->setPen(colorGroup().mid()); p->drawLine(0, 0, 0, height()); } - else if (m_arrow == Qt::UpArrow) + else if (m_arrow == TQt::UpArrow) { p->setPen(colorGroup().mid()); p->drawLine(0, height()-1, width(), height()-1); } - else if (m_arrow == Qt::DownArrow) + else if (m_arrow == TQt::DownArrow) { p->setPen(colorGroup().mid()); p->drawLine(0, 0, width(), 0); @@ -106,24 +106,24 @@ void HideButton::setPixmap(const TQPixmap &pix) generateIcons(); } -void HideButton::setArrowType(Qt::ArrowType arrow) +void HideButton::setArrowType(TQt::ArrowType arrow) { m_arrow = arrow; switch (arrow) { - case Qt::LeftArrow: + case TQt::LeftArrow: setPixmap(SmallIcon("1leftarrow")); break; - case Qt::RightArrow: + case TQt::RightArrow: setPixmap(SmallIcon("1rightarrow")); break; - case Qt::UpArrow: + case TQt::UpArrow: setPixmap(SmallIcon("1uparrow")); break; - case Qt::DownArrow: + case TQt::DownArrow: default: setPixmap(SmallIcon("1downarrow")); break; @@ -138,7 +138,7 @@ void HideButton::generateIcons() } TQImage image = pixmap()->convertToImage(); - image = image.smoothScale(size() - TQSize(4, 4), TQ_ScaleMin); + image = image.smoothScale(size() - TQSize(4, 4), TQImage::ScaleMin); TDEIconEffect effect; @@ -198,5 +198,3 @@ void HideButton::resizeEvent(TQResizeEvent *) } #include "hidebutton.moc" - -// vim:ts=4:sw=4:et diff --git a/kicker/kicker/ui/hidebutton.h b/kicker/kicker/ui/hidebutton.h index bb68929a1..c8c754857 100644 --- a/kicker/kicker/ui/hidebutton.h +++ b/kicker/kicker/ui/hidebutton.h @@ -25,11 +25,11 @@ class HideButton : public TQButton { - Q_OBJECT + TQ_OBJECT public: HideButton(TQWidget *parent, const char *name = 0); - void setArrowType(Qt::ArrowType arrow); + void setArrowType(TQt::ArrowType arrow); void setPixmap(const TQPixmap &pix); protected: @@ -44,7 +44,7 @@ class HideButton : public TQButton bool m_highlight; TQPixmap m_normalIcon; TQPixmap m_activeIcon; - Qt::ArrowType m_arrow; + TQt::ArrowType m_arrow; protected slots: void slotSettingsChanged( int category ); @@ -52,5 +52,3 @@ class HideButton : public TQButton }; #endif // HIDEBUTTON_H - -// vim:ts=4:sw=4:et diff --git a/kicker/kicker/ui/itemview.cpp b/kicker/kicker/ui/itemview.cpp index ea7894343..873fbaa9f 100644 --- a/kicker/kicker/ui/itemview.cpp +++ b/kicker/kicker/ui/itemview.cpp @@ -57,7 +57,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kiconloader.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kcombobox.h> #include <twin.h> #include <kdebug.h> @@ -158,12 +158,12 @@ void KMenuItem::setup() float min_font_size = 7. * TQMAX(1., TDEGlobalSettings::generalFont().pointSizeFloat() / 10.); const int expected_height = 38; - description_font_size = TQMAX( pointSize( expected_height * .3, TQT_TQPAINTDEVICE(listView()) ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size ) ; - title_font_size = TQMAX( pointSize( expected_height * .25, TQT_TQPAINTDEVICE(listView()) ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size + 1 ); + description_font_size = TQMAX( pointSize( expected_height * .3, listView() ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size ) ; + title_font_size = TQMAX( pointSize( expected_height * .25, listView() ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size + 1 ); //kdDebug() << description_font_size << " " << title_font_size << " " << pointSize( expected_height * .25, listView() ) << endl; TQListViewItem::setup(); - setHeight( (int)TQMAX( expected_height, pixelSize( title_font_size + description_font_size * 2.3, TQT_TQPAINTDEVICE(listView())))); + setHeight( (int)TQMAX( expected_height, pixelSize( title_font_size + description_font_size * 2.3, listView()))); } void KMenuItem::paintCell(TQPainter* p, const TQColorGroup & cg, int column, int width, int align) @@ -278,7 +278,7 @@ void KMenuItem::paintCellInter(TQPainter* p, const TQColorGroup & cg, int column if ( m_description.isEmpty() ) spacing = ( height() - f1h ) / 2; - int right_triangle_size = pixelSize( 7, TQT_TQPAINTDEVICE(listView()) ); + int right_triangle_size = pixelSize( 7, listView() ); int right_margin = listView()->verticalScrollBar()->width(); if ( m_has_children ) @@ -531,7 +531,7 @@ void KMenuItemHeader::paintCell(TQPainter* p, const TQColorGroup & cg, int , int int r = left_margin + margin * 2; const int min_font_size = 7; - int title_font_pixelSize = tqRound( pixelSize( TQMAX( pointSize( 12, TQT_TQPAINTDEVICE(listView()) ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size + 1 ), TQT_TQPAINTDEVICE(listView()) ) ); + int title_font_pixelSize = tqRound( pixelSize( TQMAX( pointSize( 12, listView() ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size + 1 ), listView() ) ); TQFont f1 = p->font(); f1.setPixelSize( title_font_pixelSize ); @@ -635,16 +635,16 @@ ItemView::ItemView(TQWidget* parent, const char* name) setItemMargin(0); setSorting(-1); setTreeStepSize(38); - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); m_lastOne = 0; m_old_contentY = -1; - connect(this, TQT_SIGNAL(mouseButtonClicked( int, TQListViewItem*, const TQPoint &, int )), - TQT_SLOT(slotItemClicked(int, TQListViewItem*, const TQPoint &, int))); + connect(this, TQ_SIGNAL(mouseButtonClicked( int, TQListViewItem*, const TQPoint &, int )), + TQ_SLOT(slotItemClicked(int, TQListViewItem*, const TQPoint &, int))); - connect(this, TQT_SIGNAL(returnPressed(TQListViewItem*)), TQT_SLOT(slotItemClicked(TQListViewItem*))); - connect(this, TQT_SIGNAL(spacePressed(TQListViewItem*)), TQT_SLOT(slotItemClicked(TQListViewItem*))); + connect(this, TQ_SIGNAL(returnPressed(TQListViewItem*)), TQ_SLOT(slotItemClicked(TQListViewItem*))); + connect(this, TQ_SIGNAL(spacePressed(TQListViewItem*)), TQ_SLOT(slotItemClicked(TQListViewItem*))); new ItemViewTip( viewport(), this ); } @@ -837,7 +837,7 @@ KMenuItem* ItemView::insertDocumentItem(const TQString& s, int nId, int nIndex, KMenuItem* ItemView::insertRecentlyItem(const TQString& s, int nId, int nIndex) { - KDesktopFile f(s, true /* read only */); + TDEDesktopFile f(s, true /* read only */); KMenuItem* newItem = findItem(nId); @@ -944,14 +944,14 @@ void ItemView::contentsMouseMoveEvent(TQMouseEvent *e) if (m_mouseMoveSelects) { if(i && i->isEnabled() && !i->isSelected() && // FIXME: This is wrong if you drag over the items. - (e->state() & (Qt::LeftButton|Qt::MidButton|Qt::RightButton)) == 0) + (e->state() & (TQt::LeftButton|TQt::MidButton|TQt::RightButton)) == 0) TDEListView::setSelected(i, true); else if (!i && selectedItem()) TDEListView::setSelected(selectedItem(), false); } if ( link_cursor ) - setCursor( Qt::PointingHandCursor ); + setCursor( TQt::PointingHandCursor ); else unsetCursor(); @@ -999,7 +999,7 @@ void ItemView::contentsWheelEvent(TQWheelEvent *e) if(i && i->isEnabled() && !i->isSelected() && // FIXME: This is wrong if you drag over the items. - (e->state() & (Qt::LeftButton|Qt::MidButton|Qt::RightButton)) == 0) + (e->state() & (TQt::LeftButton|TQt::MidButton|TQt::RightButton)) == 0) TDEListView::setSelected(i, true); else if (!i && selectedItem()) TDEListView::setSelected(selectedItem(), false); @@ -1029,7 +1029,7 @@ TQDragObject * ItemView::dragObject() mask = *pix.mask(); else { mask.resize(pix.size()); - mask.fill(Qt::color1); + mask.fill(TQt::color1); } bitBlt( &mask, pix.width()-add.width(), pix.height()-add.height(), add.mask(), 0, 0, add.width(), add.height(), OrROP ); @@ -1056,7 +1056,7 @@ TQDragObject * ItemView::dragObject() TQString uri = kitem->path(); if (uri.startsWith(locateLocal("data", TQString::fromLatin1("RecentDocuments/")))) { - KDesktopFile df(uri,true); + TDEDesktopFile df(uri,true); uri=df.readURL(); } @@ -1153,9 +1153,9 @@ bool KMenuItemDrag::decode(const TQMimeSource* e, KMenuItemInfo& item) TQString url = *it; kdDebug () << "Url " << url << endl; item.m_path = KURL( url ).path(); - if ( KDesktopFile::isDesktopFile( item.m_path ) ) + if ( TDEDesktopFile::isDesktopFile( item.m_path ) ) { - KDesktopFile df( item.m_path, true ); + TDEDesktopFile df( item.m_path, true ); item.m_description = df.readGenericName(); item.m_icon = df.readIcon(); item.m_title = df.readName(); @@ -1215,13 +1215,13 @@ bool FavoritesItemView::acceptDrag (TQDropEvent* event) const TQString uri = item.m_path; if (uri.startsWith(locateLocal("data", TQString::fromLatin1("RecentDocuments/")))) { - KDesktopFile df(uri,true); + TDEDesktopFile df(uri,true); uri=df.readURL(); } for (it = favs.begin(); it != favs.end(); ++it) { if ((*it)[0]=='/') { - KDesktopFile df((*it),true); + TDEDesktopFile df((*it),true); if (df.readURL().replace("file://",TQString())==uri) break; } @@ -1243,7 +1243,7 @@ bool FavoritesItemView::acceptDrag (TQDropEvent* event) const TQStringList::Iterator it; for (it = favs.begin(); it != favs.end(); ++it) { if ((*it)[0]=='/') { - KDesktopFile df((*it),true); + TDEDesktopFile df((*it),true); if (df.readURL().replace("file://",TQString())==text) break; } @@ -1256,5 +1256,3 @@ bool FavoritesItemView::acceptDrag (TQDropEvent* event) const } #include "itemview.moc" - -// vim:cindent:sw=4: diff --git a/kicker/kicker/ui/itemview.h b/kicker/kicker/ui/itemview.h index 27807c939..bab0142c2 100644 --- a/kicker/kicker/ui/itemview.h +++ b/kicker/kicker/ui/itemview.h @@ -156,7 +156,7 @@ class ItemView : public TDEListView { friend class KMenuItem; - Q_OBJECT + TQ_OBJECT public: ItemView(TQWidget* parent, const char* name = 0); diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp index 4362e91f1..189e7e03e 100644 --- a/kicker/kicker/ui/k_mnu.cpp +++ b/kicker/kicker/ui/k_mnu.cpp @@ -48,10 +48,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <klineedit.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdetoolbarbutton.h> #include <twin.h> #include <popupmenutop.h> +#include <tdeaccel.h> #include "client_mnu.h" #include "container_base.h" @@ -76,7 +77,7 @@ PanelKMenu::PanelKMenu() : PanelServiceMenu(TQString::null, TQString::null, 0, "KMenu") , bookmarkMenu(0) , bookmarkOwner(0) - , displayRepaired(FALSE) + , displayRepaired(false) { static const TQCString dcopObjId("KMenu"); DCOPObject::setObjId(dcopObjId); @@ -86,8 +87,8 @@ PanelKMenu::PanelKMenu() disableAutoClear(); actionCollection = new TDEActionCollection(this); setCaption(i18n("TDE Menu")); - connect(Kicker::the(), TQT_SIGNAL(configurationChanged()), - this, TQT_SLOT(configChanged())); + connect(Kicker::the(), TQ_SIGNAL(configurationChanged()), + this, TQ_SLOT(configChanged())); DCOPClient *dcopClient = TDEApplication::dcopClient(); dcopClient->connectDCOPSignal(0, "appLauncher", "serviceStartedByStorageId(TQString,TQString)", @@ -95,7 +96,7 @@ PanelKMenu::PanelKMenu() "slotServiceStartedByStorageId(TQString,TQString)", false); displayRepairTimer = new TQTimer( this ); - connect( displayRepairTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(repairDisplay()) ); + connect( displayRepairTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(repairDisplay()) ); } PanelKMenu::~PanelKMenu() @@ -121,19 +122,16 @@ void PanelKMenu::hideMenu() { hide(); -#ifdef USE_QT4 - // The hacks below aren't needed any more because Qt4 supports true transparency for the fading logout screen -#else // USE_QT4 // Try to redraw the area under the menu // Qt makes this surprisingly difficult to do in a timely fashion! while (isShown() == true) - kapp->eventLoop()->processEvents(1000); + tdeApp->eventLoop()->processEvents(1000); TQTimer *windowtimer = new TQTimer( this ); - connect( windowtimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(windowClearTimeout()) ); + connect( windowtimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(windowClearTimeout()) ); windowTimerTimedOut = false; - windowtimer->start( 0, TRUE ); // Wait for all window system events to be processed + windowtimer->start( 0, true ); // Wait for all window system events to be processed while (windowTimerTimedOut == false) - kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput, 1000); + tdeApp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput, 1000); // HACK // The TDE Menu takes an unknown amount of time to disappear, and redrawing @@ -142,12 +140,11 @@ void PanelKMenu::hideMenu() // thereby removing a bad shutdown screen artifact while still providing // a somewhat snappy user interface. TQTimer *delaytimer = new TQTimer( this ); - connect( delaytimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(windowClearTimeout()) ); + connect( delaytimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(windowClearTimeout()) ); windowTimerTimedOut = false; - delaytimer->start( 100, TRUE ); // Wait for 100 milliseconds + delaytimer->start( 100, true ); // Wait for 100 milliseconds while (windowTimerTimedOut == false) - kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput, 1000); -#endif // USE_QT4 + tdeApp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput, 1000); } void PanelKMenu::windowClearTimeout() @@ -245,13 +242,15 @@ void PanelKMenu::initialize() return; } + TDEAccel *accel = new TDEAccel(this); + if (loadSidePixmap()) { // in case we've been through here before, let's disconnect - disconnect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), - this, TQT_SLOT(paletteChanged())); - connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), - this, TQT_SLOT(paletteChanged())); + disconnect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), + this, TQ_SLOT(paletteChanged())); + connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), + this, TQ_SLOT(paletteChanged())); } else { @@ -265,14 +264,36 @@ void PanelKMenu::initialize() if (KickerSettings::useSearchBar()) { TQHBox* hbox = new TQHBox( this ); TDEToolBarButton *clearButton = new TDEToolBarButton( "locationbar_erase", 0, hbox ); - searchEdit = new KPIM::ClickLineEdit(hbox, " "+i18n("Press '/' to search...")); - hbox->setFocusPolicy(TQ_StrongFocus); + + TQStringList cuts = TQStringList::split(";", KickerSettings::searchShortcut()); + TQString placeholder; + switch( cuts.count() ) + { + case 0: + placeholder = i18n(" Click here to search..."); + break; + + case 1: + placeholder = i18n(" Press '%1' to search...").arg(cuts[0]); + break; + + case 2: + placeholder = i18n(" Press '%1' or '%2' to search...").arg(cuts[0], cuts[1]); + break; + } + searchEdit = new KPIM::ClickLineEdit( hbox, placeholder ); + + hbox->setFocusPolicy(TQWidget::StrongFocus); hbox->setFocusProxy(searchEdit); hbox->setSpacing( 3 ); - connect(clearButton, TQT_SIGNAL(clicked()), searchEdit, TQT_SLOT(clear())); - connect(this, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(slotClearSearch())); - connect(searchEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT( slotUpdateSearch( const TQString&))); + connect(clearButton, TQ_SIGNAL(clicked()), searchEdit, TQ_SLOT(clear())); + connect(this, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(slotClearSearch())); + connect(searchEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT( slotUpdateSearch( const TQString&))); + accel->insert("search", i18n("Search"), i18n("TDE Menu search"), + TDEShortcut(KickerSettings::searchShortcut()), + this, TQ_SLOT(slotFocusSearch())); + insertItem(hbox, searchLineID, 0); } else { searchEdit = NULL; @@ -296,7 +317,7 @@ void PanelKMenu::initialize() bool need_separator = false; // insert bookmarks - if (KickerSettings::useBookmarks() && kapp->authorizeTDEAction("bookmarks")) + if (KickerSettings::useBookmarks() && tdeApp->authorizeTDEAction("bookmarks")) { // Need to create a new popup each time, it's deleted by subMenus.clear() TDEPopupMenu * bookmarkParent = new TDEPopupMenu( this, "bookmarks" ); @@ -364,21 +385,21 @@ void PanelKMenu::initialize() } // run command - if (kapp->authorize("run_command")) + if (tdeApp->authorize("run_command")) { insertItem(KickerLib::menuIconSet("system-run"), i18n("Run Command..."), this, - TQT_SLOT( slotRunCommand())); + TQ_SLOT( slotRunCommand())); insertSeparator(); } - if (DM().isSwitchable() && kapp->authorize("switch_user")) + if (DM().isSwitchable() && tdeApp->authorize("switch_user")) { sessionsMenu = new TQPopupMenu( this ); insertItem(KickerLib::menuIconSet("switchuser"), i18n("Switch User"), sessionsMenu); - connect( sessionsMenu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotPopulateSessions()) ); - connect( sessionsMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSessionActivated(int)) ); + connect( sessionsMenu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotPopulateSessions()) ); + connect( sessionsMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSessionActivated(int)) ); } /* @@ -388,17 +409,17 @@ void PanelKMenu::initialize() ksmserver.setGroup("General"); if (ksmserver.readEntry( "loginMode" ) == "restoreSavedSession") { - insertItem(KickerLib::menuIconSet("document-save"), i18n("Save Session"), this, TQT_SLOT(slotSaveSession())); + insertItem(KickerLib::menuIconSet("document-save"), i18n("Save Session"), this, TQ_SLOT(slotSaveSession())); } - if (kapp->authorize("lock_screen")) + if (tdeApp->authorize("lock_screen")) { - insertItem(KickerLib::menuIconSet("system-lock-screen"), i18n("Lock Session"), this, TQT_SLOT(slotLock())); + insertItem(KickerLib::menuIconSet("system-lock-screen"), i18n("Lock Session"), this, TQ_SLOT(slotLock())); } - if (kapp->authorize("logout")) + if (tdeApp->authorize("logout")) { - insertItem(KickerLib::menuIconSet("system-log-out"), i18n("Log Out..."), this, TQT_SLOT(slotLogout())); + insertItem(KickerLib::menuIconSet("system-log-out"), i18n("Log Out..."), this, TQ_SLOT(slotLogout())); } #if 0 @@ -409,9 +430,9 @@ void PanelKMenu::initialize() insertTearOffHandle(); #endif - if (displayRepaired == FALSE) { - displayRepairTimer->start(5, FALSE); - displayRepaired = TRUE; + if (displayRepaired == false) { + displayRepairTimer->start(5, false); + displayRepaired = true; } setInitialized(true); @@ -424,7 +445,7 @@ void PanelKMenu::repairDisplay(void) { // Now do a nasty hack to prevent search bar merging into the side image // This forces a layout/repaint of the qpopupmenu repaint(); // This ensures that the side bar image was applied - styleChange(style()); // This forces a call to the private function updateSize(TRUE) inside the qpopupmenu. + styleChange(style()); // This forces a call to the private function updateSize(true) inside the qpopupmenu. update(); // This repaints the entire popup menu to apply the widget size/alignment changes made above } } @@ -456,13 +477,13 @@ void PanelKMenu::slotLock() TQByteArray replyData; // Block here until lock is complete // If this is not done the desktop of the locked session will be shown after VT switch until the lock fully engages! - kapp->dcopClient()->call(appname, "KScreensaverIface", "lock()", TQCString(""), replyType, replyData); + tdeApp->dcopClient()->call(appname, "KScreensaverIface", "lock()", TQCString(""), replyType, replyData); } void PanelKMenu::slotLogout() { hide(); - kapp->requestShutDown(); + tdeApp->requestShutDown(); } void PanelKMenu::slotPopulateSessions() @@ -471,9 +492,9 @@ void PanelKMenu::slotPopulateSessions() DM dm; sessionsMenu->clear(); - if (kapp->authorize("start_new_session") && (p = dm.numReserve()) >= 0) + if (tdeApp->authorize("start_new_session") && (p = dm.numReserve()) >= 0) { - if (kapp->authorize("lock_screen")) { + if (tdeApp->authorize("lock_screen")) { sessionsMenu->insertItem(SmallIconSet("system-lock-screen"), i18n("Lock Current && Start New Session"), 100 ); } sessionsMenu->insertItem(SmallIconSet("switchuser"), i18n("Start New Session"), 101 ); @@ -507,7 +528,7 @@ void PanelKMenu::slotSessionActivated( int ent ) void PanelKMenu::doNewSession( bool lock ) { int result = KMessageBox::warningContinueCancel( - TQT_TQWIDGET(kapp->desktop()->screen(kapp->desktop()->screenNumber(this))), + tdeApp->desktop()->screen(tdeApp->desktop()->screenNumber(this)), i18n("<p>You have chosen to open another desktop session.<br>" "The current session will be hidden " "and a new login screen will be displayed.<br>" @@ -537,7 +558,7 @@ void PanelKMenu::doNewSession( bool lock ) void PanelKMenu::slotSaveSession() { TQByteArray data; - kapp->dcopClient()->send( "ksmserver", "default", + tdeApp->dcopClient()->send( "ksmserver", "default", "saveCurrentSession()", data ); } @@ -548,8 +569,8 @@ void PanelKMenu::slotRunCommand() if ( kicker_screen_number ) appname.sprintf("kdesktop-screen-%d", kicker_screen_number); - kapp->updateRemoteUserTimestamp( appname ); - kapp->dcopClient()->send( appname, "KDesktopIface", + tdeApp->updateRemoteUserTimestamp( appname ); + tdeApp->dcopClient()->send( appname, "KDesktopIface", "popupExecuteCommand()", data ); } @@ -634,7 +655,7 @@ void PanelKMenu::paintEvent(TQPaintEvent * e) TQPainter p(this); p.setClipRegion(e->region()); - style().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p, + style().drawPrimitive( TQStyle::PE_PanelPopup, &p, TQRect( 0, 0, width(), height() ), colorGroup(), TQStyle::Style_Default, TQStyleOption( frameWidth(), 0 ) ); @@ -705,7 +726,14 @@ void PanelKMenu::slotUpdateSearch(const TQString& searchString) void PanelKMenu::slotClearSearch() { if (searchEdit && searchEdit->text().isEmpty() == false) { - TQTimer::singleShot(0, searchEdit, TQT_SLOT(clear())); + TQTimer::singleShot(0, searchEdit, TQ_SLOT(clear())); + } +} + +void PanelKMenu::slotFocusSearch() +{ + if (indexOf(searchLineID) >=0 ) { + setActiveItem(indexOf(searchLineID)); } } @@ -719,12 +747,8 @@ void PanelKMenu::keyPressEvent(TQKeyEvent* e) // we follow konqueror. if (!searchEdit) return KPanelMenu::keyPressEvent(e); - if (e->key() == TQt::Key_Slash && !searchEdit->hasFocus()) { - if (indexOf(searchLineID) >=0 ) { - setActiveItem(indexOf(searchLineID)); - } - } - else if (e->key() == TQt::Key_Escape && searchEdit->text().isEmpty() == false) { + + if (e->key() == TQt::Key_Escape && searchEdit->text().isEmpty() == false) { searchEdit->clear(); } else if (e->key() == TQt::Key_Delete && !searchEdit->hasFocus() && diff --git a/kicker/kicker/ui/k_mnu.h b/kicker/kicker/ui/k_mnu.h index 7c76f55ed..bb2056590 100644 --- a/kicker/kicker/ui/k_mnu.h +++ b/kicker/kicker/ui/k_mnu.h @@ -45,7 +45,7 @@ class Panel; class PanelKMenu : public PanelServiceMenu, public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP k_dcop: @@ -83,6 +83,7 @@ protected slots: void slotEditUserContact(); void slotUpdateSearch(const TQString &searchtext); void slotClearSearch(); + void slotFocusSearch(); void paletteChanged(); virtual void configChanged(); void updateRecent(); diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp index 7ccb447b4..324c46f0e 100644 --- a/kicker/kicker/ui/k_new_mnu.cpp +++ b/kicker/kicker/ui/k_new_mnu.cpp @@ -21,12 +21,21 @@ ******************************************************************/ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <stdlib.h> #include <sys/types.h> #include <unistd.h> #include <dmctl.h> #include <inttypes.h> +#ifdef Q_OS_SOLARIS +#include <sys/statvfs.h> +#define statfs statvfs +#endif /* Q_OS_SOLARIS */ + #include <tqimage.h> #include <tqpainter.h> #include <tqstyle.h> @@ -52,14 +61,14 @@ #include <kdebug.h> #include <tdeglobal.h> #include <tdeglobalsettings.h> -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB #include <tdehardwaredevices.h> #endif #include <kiconloader.h> #include <klineedit.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kcombobox.h> #include <twin.h> #include <kdebug.h> @@ -72,7 +81,7 @@ #include <kurifilter.h> #include <kbookmarkmanager.h> #include <kbookmark.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdeio/jobclasses.h> #include <tdeio/job.h> #include <dcopref.h> @@ -112,16 +121,6 @@ #include "config.h" -#ifdef COMPILE_HALBACKEND -#ifndef NO_QT3_DBUS_SUPPORT -/* We acknowledge the the dbus API is unstable */ -#define DBUS_API_SUBJECT_TO_CHANGE -#include <dbus/connection.h> -#endif // NO_QT3_DBUS_SUPPORT - -#include <hal/libhal.h> -#endif // COMPILE_HALBACKEND - #ifdef __NetBSD__ #define statfs statvfs #endif @@ -207,15 +206,15 @@ KMenu::KMenu() m_iconName(TQString()), m_orientation(UnDetermined), m_search_plugin( 0 ) { setMouseTracking(true); - connect(&m_sloppyTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotSloppyTimeout())); + connect(&m_sloppyTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotSloppyTimeout())); // set the first client id to some arbitrarily large value. client_id = 10000; // Don't automatically clear the main menu. actionCollection = new TDEActionCollection(this); - connect(Kicker::the(), TQT_SIGNAL(configurationChanged()), - this, TQT_SLOT(configChanged())); + connect(Kicker::the(), TQ_SIGNAL(configurationChanged()), + this, TQ_SLOT(configChanged())); KUser * user = new KUser(); @@ -229,7 +228,7 @@ KMenu::KMenu() setupUi(); m_userInfo->setBackgroundMode( PaletteBase ); - TQColor userInfoColor = TQApplication::palette().color( TQPalette::Normal, TQColorGroup::Mid ); + TQColor userInfoColor = TQApplication::palette().color( TQPalette::Active, TQColorGroup::Mid ); if ( tqGray( userInfoColor.rgb() ) > 120 ) userInfoColor = userInfoColor.dark( 200 ); else @@ -237,7 +236,7 @@ KMenu::KMenu() m_userInfo->setPaletteForegroundColor( userInfoColor ); m_tabBar = new KickoffTabBar(this, "m_tabBar"); - connect(m_tabBar, TQT_SIGNAL(tabClicked(TQTab*)), TQT_SLOT(tabClicked(TQTab*))); + connect(m_tabBar, TQ_SIGNAL(tabClicked(TQTab*)), TQ_SLOT(tabClicked(TQTab*))); const int tab_icon_size = 32; @@ -285,8 +284,8 @@ KMenu::KMenu() m_tabs[LeaveTab]->setIconSet(BarIcon("leave", tab_icon_size)); } - connect(m_tabBar, TQT_SIGNAL(selected(int)), m_stacker, TQT_SLOT(raiseWidget(int))); - connect(m_stacker, TQT_SIGNAL(aboutToShow(int)), m_tabBar, TQT_SLOT(setCurrentTab(int))); + connect(m_tabBar, TQ_SIGNAL(selected(int)), m_stacker, TQ_SLOT(raiseWidget(int))); + connect(m_stacker, TQ_SIGNAL(aboutToShow(int)), m_tabBar, TQ_SLOT(setCurrentTab(int))); m_favoriteView = new FavoritesItemView (m_stacker, "m_favoriteView"); m_favoriteView->setAcceptDrops(true); @@ -301,11 +300,11 @@ KMenu::KMenu() m_browserView = new FlipScrollView(m_stacker, "m_browserView"); m_stacker->addWidget(m_browserView, ApplicationsTab); - connect( m_browserView, TQT_SIGNAL( backButtonClicked() ), TQT_SLOT( slotGoBack() ) ); + connect( m_browserView, TQ_SIGNAL( backButtonClicked() ), TQ_SLOT( slotGoBack() ) ); m_exitView = new FlipScrollView(m_stacker, "m_exitView"); m_stacker->addWidget(m_exitView, LeaveTab); - connect( m_exitView, TQT_SIGNAL( backButtonClicked() ), TQT_SLOT( slotGoExitMainMenu() ) ); + connect( m_exitView, TQ_SIGNAL( backButtonClicked() ), TQ_SLOT( slotGoExitMainMenu() ) ); m_searchWidget = new TQVBox (m_stacker, "m_searchWidget"); m_searchWidget->setSpacing(0); @@ -332,7 +331,7 @@ KMenu::KMenu() m_searchResultsWidget->setItemMargin(4); // m_searchResultsWidget->setIconSize(16); m_searchActions = new ItemView (m_searchWidget, "m_searchActions"); - m_searchActions->setFocusPolicy(TQ_NoFocus); + m_searchActions->setFocusPolicy(TQWidget::NoFocus); m_searchActions->setItemMargin(4); m_searchInternet = new TQListViewItem(m_searchActions, i18n("Search Internet")); m_searchInternet->setPixmap(0,icon); @@ -342,40 +341,40 @@ KMenu::KMenu() m_searchActions->setMaximumHeight(5+m_searchInternet->height()); - connect(m_searchActions, TQT_SIGNAL(clicked(TQListViewItem*)), TQT_SLOT(searchActionClicked(TQListViewItem*))); - connect(m_searchActions, TQT_SIGNAL(returnPressed(TQListViewItem*)), TQT_SLOT(searchActionClicked(TQListViewItem*))); - connect(m_searchActions, TQT_SIGNAL(spacePressed(TQListViewItem*)), TQT_SLOT(searchActionClicked(TQListViewItem*))); + connect(m_searchActions, TQ_SIGNAL(clicked(TQListViewItem*)), TQ_SLOT(searchActionClicked(TQListViewItem*))); + connect(m_searchActions, TQ_SIGNAL(returnPressed(TQListViewItem*)), TQ_SLOT(searchActionClicked(TQListViewItem*))); + connect(m_searchActions, TQ_SIGNAL(spacePressed(TQListViewItem*)), TQ_SLOT(searchActionClicked(TQListViewItem*))); - connect(m_searchResultsWidget, TQT_SIGNAL(startService(KService::Ptr)), TQT_SLOT(slotStartService(KService::Ptr))); - connect(m_searchResultsWidget, TQT_SIGNAL(startURL(const TQString&)), TQT_SLOT(slotStartURL(const TQString&))); - connect(m_searchResultsWidget, TQT_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQT_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int ))); + connect(m_searchResultsWidget, TQ_SIGNAL(startService(KService::Ptr)), TQ_SLOT(slotStartService(KService::Ptr))); + connect(m_searchResultsWidget, TQ_SIGNAL(startURL(const TQString&)), TQ_SLOT(slotStartURL(const TQString&))); + connect(m_searchResultsWidget, TQ_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQ_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int ))); - connect(m_recentlyView, TQT_SIGNAL(startService(KService::Ptr)), TQT_SLOT(slotStartService(KService::Ptr))); - connect(m_recentlyView, TQT_SIGNAL(startURL(const TQString&)), TQT_SLOT(slotStartURL(const TQString&))); - connect(m_recentlyView, TQT_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQT_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int ))); + connect(m_recentlyView, TQ_SIGNAL(startService(KService::Ptr)), TQ_SLOT(slotStartService(KService::Ptr))); + connect(m_recentlyView, TQ_SIGNAL(startURL(const TQString&)), TQ_SLOT(slotStartURL(const TQString&))); + connect(m_recentlyView, TQ_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQ_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int ))); - connect(m_favoriteView, TQT_SIGNAL(startService(KService::Ptr)), TQT_SLOT(slotStartService(KService::Ptr))); - connect(m_favoriteView, TQT_SIGNAL(startURL(const TQString&)), TQT_SLOT(slotStartURL(const TQString&))); - connect(m_favoriteView, TQT_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQT_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int ))); - connect(m_favoriteView, TQT_SIGNAL(moved(TQListViewItem*, TQListViewItem*, TQListViewItem*)), TQT_SLOT(slotFavoritesMoved( TQListViewItem*, TQListViewItem*, TQListViewItem* ))); + connect(m_favoriteView, TQ_SIGNAL(startService(KService::Ptr)), TQ_SLOT(slotStartService(KService::Ptr))); + connect(m_favoriteView, TQ_SIGNAL(startURL(const TQString&)), TQ_SLOT(slotStartURL(const TQString&))); + connect(m_favoriteView, TQ_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQ_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int ))); + connect(m_favoriteView, TQ_SIGNAL(moved(TQListViewItem*, TQListViewItem*, TQListViewItem*)), TQ_SLOT(slotFavoritesMoved( TQListViewItem*, TQListViewItem*, TQListViewItem* ))); - connect(m_systemView, TQT_SIGNAL(startURL(const TQString&)), TQT_SLOT(slotStartURL(const TQString&))); - connect(m_systemView, TQT_SIGNAL(startService(KService::Ptr)), TQT_SLOT(slotStartService(KService::Ptr))); - connect(m_systemView, TQT_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQT_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int ))); + connect(m_systemView, TQ_SIGNAL(startURL(const TQString&)), TQ_SLOT(slotStartURL(const TQString&))); + connect(m_systemView, TQ_SIGNAL(startService(KService::Ptr)), TQ_SLOT(slotStartService(KService::Ptr))); + connect(m_systemView, TQ_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQ_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int ))); - connect(m_browserView, TQT_SIGNAL(startURL(const TQString&)), TQT_SLOT(slotGoSubMenu(const TQString&))); - connect(m_browserView, TQT_SIGNAL(startService(KService::Ptr)), TQT_SLOT(slotStartService(KService::Ptr))); - connect(m_browserView, TQT_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQT_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int ))); + connect(m_browserView, TQ_SIGNAL(startURL(const TQString&)), TQ_SLOT(slotGoSubMenu(const TQString&))); + connect(m_browserView, TQ_SIGNAL(startService(KService::Ptr)), TQ_SLOT(slotStartService(KService::Ptr))); + connect(m_browserView, TQ_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQ_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int ))); - connect(m_exitView, TQT_SIGNAL(startURL(const TQString&)), TQT_SLOT(slotStartURL(const TQString&))); - connect(m_exitView, TQT_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQT_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int ))); + connect(m_exitView, TQ_SIGNAL(startURL(const TQString&)), TQ_SLOT(slotStartURL(const TQString&))); + connect(m_exitView, TQ_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQ_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int ))); m_kcommand->setDuplicatesEnabled( false ); m_kcommand->setLineEdit(new KLineEdit(m_kcommand, "m_kcommand-lineedit")); m_kcommand->setCompletionMode( TDEGlobalSettings::CompletionAuto ); - connect(m_kcommand, TQT_SIGNAL(cleared()), TQT_SLOT(clearedHistory())); - connect(m_kcommand->lineEdit(), TQT_SIGNAL(returnPressed()), TQT_SLOT(searchAccept())); - connect(m_kcommand->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(searchChanged(const TQString &))); + connect(m_kcommand, TQ_SIGNAL(cleared()), TQ_SLOT(clearedHistory())); + connect(m_kcommand->lineEdit(), TQ_SIGNAL(returnPressed()), TQ_SLOT(searchAccept())); + connect(m_kcommand->lineEdit(), TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(searchChanged(const TQString &))); // URI Filter meta object... m_filterData = new KURIFilterData(); @@ -384,14 +383,14 @@ KMenu::KMenu() categorised_hit_total = new int [num_categories]; input_timer = new TQTimer (this, "input_timer"); - connect( input_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(doQuery()) ); + connect( input_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(doQuery()) ); init_search_timer = new TQTimer (this, "init_search_timer"); - connect( init_search_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(initSearch()) ); + connect( init_search_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(initSearch()) ); init_search_timer->start(2000, true); - connect( m_favoriteView, TQT_SIGNAL( dropped (TQDropEvent *, TQListViewItem * ) ), - TQT_SLOT( slotFavDropped( TQDropEvent *, TQListViewItem * ) ) ); + connect( m_favoriteView, TQ_SIGNAL( dropped (TQDropEvent *, TQListViewItem * ) ), + TQ_SLOT( slotFavDropped( TQDropEvent *, TQListViewItem * ) ) ); this->installEventFilter(this); m_tabBar->installEventFilter(this); @@ -443,38 +442,6 @@ KMenu::KMenu() search_tab_top_left.load( locate("data", "kicker/pics/search-tab-top-left.png" ) ); search_tab_top_right.load( locate("data", "kicker/pics/search-tab-top-right.png" ) ); search_tab_top_center.load( locate("data", "kicker/pics/search-tab-top-center.png" ) ); - -#ifdef COMPILE_HALBACKEND - m_halCtx = NULL; - m_halCtx = libhal_ctx_new(); - - DBusError error; - dbus_error_init(&error); - m_dbusConn = dbus_connection_open_private(DBUS_SYSTEM_BUS, &error); - if (!m_dbusConn) { - dbus_error_free(&error); - libhal_ctx_free(m_halCtx); - m_halCtx = NULL; - } else { - dbus_bus_register(m_dbusConn, &error); - if (dbus_error_is_set(&error)) { - dbus_error_free(&error); - libhal_ctx_free(m_halCtx); - m_dbusConn = NULL; - m_halCtx = NULL; - } else { - libhal_ctx_set_dbus_connection(m_halCtx, m_dbusConn); - if (!libhal_ctx_init(m_halCtx, &error)) { - if (dbus_error_is_set(&error)) { - dbus_error_free(&error); - } - libhal_ctx_free(m_halCtx); - m_dbusConn = NULL; - m_halCtx = NULL; - } - } - } -#endif } void KMenu::setupUi() @@ -483,10 +450,10 @@ void KMenu::setupUi() m_stacker->setGeometry( TQRect( 90, 260, 320, 220 ) ); m_stacker->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)3, 1, 1, m_stacker->sizePolicy().hasHeightForWidth() ) ); m_stacker->setPaletteBackgroundColor( TQColor( 255, 255, 255 ) ); - // m_stacker->setFocusPolicy( TQ_StrongFocus ); + // m_stacker->setFocusPolicy( TQWidget::StrongFocus ); m_stacker->setLineWidth( 0 ); - m_stacker->setFocusPolicy(TQ_NoFocus); - connect(m_stacker, TQT_SIGNAL(aboutToShow(TQWidget*)), TQT_SLOT(stackWidgetRaised(TQWidget*))); + m_stacker->setFocusPolicy(TQWidget::NoFocus); + connect(m_stacker, TQ_SIGNAL(aboutToShow(TQWidget*)), TQ_SLOT(stackWidgetRaised(TQWidget*))); m_kcommand->setName("m_kcommand"); } @@ -497,15 +464,6 @@ KMenu::~KMenu() clearSubmenus(); delete m_filterData; - -#ifdef COMPILE_HALBACKEND - if (m_halCtx) { - DBusError error; - dbus_error_init(&error); - libhal_ctx_shutdown(m_halCtx, &error); - libhal_ctx_free(m_halCtx); - } -#endif } bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e) @@ -522,16 +480,16 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e) TQPoint p; if (e->type() == TQEvent::MouseMove || e->type() == TQEvent::MouseButtonPress) { - TQMouseEvent* me = TQT_TQMOUSEEVENT(e); + TQMouseEvent* me = static_cast<TQMouseEvent*>(e); p = me->globalPos(); } else if (e->type() == TQEvent::Wheel) { - TQWheelEvent* we = TQT_TQWHEELEVENT(e); + TQWheelEvent* we = static_cast<TQWheelEvent*>(e); p = we->globalPos(); } while (receiver) { - if (TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(m_tabBar) && (e->type()!=TQEvent::MouseMove || KickerSettings::kickoffSwitchTabsOnHover() ) ) { + if (receiver == m_tabBar && (e->type()!=TQEvent::MouseMove || KickerSettings::kickoffSwitchTabsOnHover() ) ) { TQTab* s = m_tabBar->selectTab(m_tabBar->mapFromGlobal(p)); if (s && s->identifier() == ApplicationsTab) raiseWidget = m_browserView; @@ -551,8 +509,8 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e) /* we do not want hover activation for the search line edit as this can be * pretty disturbing */ - if ( (TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(m_searchPixmap) || - ( ( TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(m_searchLabel) || TQT_BASE_OBJECT(receiver)==TQT_BASE_OBJECT(m_kcommand->lineEdit()) ) && + if ( (receiver == m_searchPixmap || + ( ( receiver == m_searchLabel || receiver==m_kcommand->lineEdit() ) && ( e->type() == TQEvent::KeyPress || e->type() == TQEvent::Wheel || e->type() == TQEvent::MouseButtonPress ) ) ) && !m_isShowing) { @@ -564,25 +522,25 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e) if(raiseWidget) break; if(receiver->isWidgetType()) - receiver = TQT_TQOBJECT(TQT_TQWIDGET(receiver)->parentWidget(true)); + receiver = static_cast<TQWidget*>(receiver)->parentWidget(true); else break; } if (e->type() == TQEvent::FocusIn && receiver && raiseWidget) { - m_searchResultsWidget->setFocusPolicy(TQ_StrongFocus); + m_searchResultsWidget->setFocusPolicy(TQWidget::StrongFocus); m_searchActions->setFocusPolicy(raiseWidget == m_searchWidget ? - TQ_StrongFocus : TQ_NoFocus); + TQWidget::StrongFocus : TQWidget::NoFocus); setTabOrder(raiseWidget, m_searchResultsWidget); if (raiseWidget != m_stacker->visibleWidget() - && TQT_TQWIDGET(receiver)->focusPolicy() == TQ_NoFocus + && static_cast<TQWidget*>(receiver)->focusPolicy() == TQWidget::NoFocus && m_stacker->id(raiseWidget) >= 0) { m_stacker->raiseWidget(raiseWidget); return true; } - if (raiseWidget->focusPolicy() != TQ_NoFocus) + if (raiseWidget->focusPolicy() != TQWidget::NoFocus) return false; } @@ -604,7 +562,7 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e) } if(e->type() == TQEvent::Enter && receiver->isWidgetType()) { - TQT_TQWIDGET(receiver)->setMouseTracking(true); + static_cast<TQWidget*>(receiver)->setMouseTracking(true); TQToolTip::hide(); } @@ -631,7 +589,7 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e) if (view) { bool handled = true; - switch (TQT_TQKEYEVENT(e)->key()) { + switch (static_cast<TQKeyEvent*>(e)->key()) { case Key_Up: if (view->selectedItem()) { view->setSelected(view->selectedItem()->itemAbove(),true); @@ -708,7 +666,7 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e) r = true; } - if (e->type() == TQEvent::Enter && TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(m_stacker)) + if (e->type() == TQEvent::Enter && receiver == m_stacker) { TQRect r(m_stacker->mapToGlobal(TQPoint(-8,-32)), m_stacker->size()); r.setSize(r.size()+TQSize(16,128)); @@ -785,8 +743,8 @@ void KMenu::paintSearchTab( bool active ) m_tabBar->deactivateTabs(true); - p.setBrush( Qt::white ); - p.setPen( Qt::NoPen ); + p.setBrush( TQt::white ); + p.setPen( TQt::NoPen ); if ( m_orientation == BottomUp ) { search_tab_center.convertFromImage( search_tab_center.convertToImage().scale(search_tab_center.width(), m_searchFrame->height())); @@ -1267,18 +1225,18 @@ void KMenu::initialize() kdDebug(1210) << "KMenu::initialize()" << endl; // in case we've been through here before, let's disconnect - disconnect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), - this, TQT_SLOT(paletteChanged())); - connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), - this, TQT_SLOT(paletteChanged())); + disconnect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), + this, TQ_SLOT(paletteChanged())); + connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), + this, TQ_SLOT(paletteChanged())); /* If the user configured ksmserver to */ TDEConfig ksmserver("ksmserverrc", false, false); ksmserver.setGroup("General"); - connect( m_branding, TQT_SIGNAL(clicked()), TQT_SLOT(slotOpenHomepage())); - m_tabBar->setTabEnabled(LeaveTab, kapp->authorize("logout")); + connect( m_branding, TQ_SIGNAL(clicked()), TQ_SLOT(slotOpenHomepage())); + m_tabBar->setTabEnabled(LeaveTab, tdeApp->authorize("logout")); // load search field history TQStringList histList = KickerSettings::history(); @@ -1326,7 +1284,7 @@ void KMenu::initialize() for (TQStringList::ConstIterator it = favs.begin(); it != favs.end(); ++it) { if ((*it)[0]=='/') { - KDesktopFile df((*it),true); + TDEDesktopFile df((*it),true); TQString url = df.readURL(); if (!KURL(url).isLocalFile() || TQFile::exists(url.replace("file://",TQString()))) m_favoriteView->insertItem(df.readIcon(),df.readName(),df.readGenericName(), url, nId++, index++); @@ -1351,10 +1309,10 @@ void KMenu::insertStaticExitItems() int index = 1; m_exitView->leftView()->insertSeparator( nId++, i18n("Session"), index++ ); - if (kapp->authorize("logout")) + if (tdeApp->authorize("logout")) m_exitView->leftView()->insertItem( "edit-undo", i18n( "Log out" ), i18n( "End current session" ), "kicker:/logout", nId++, index++ ); - if (kapp->authorize("lock_screen")) + if (tdeApp->authorize("lock_screen")) m_exitView->leftView()->insertItem( "system-lock-screen", i18n( "Lock" ), i18n( "Lock computer screen" ), "kicker:/lock", nId++, index++ ); @@ -1366,7 +1324,7 @@ void KMenu::insertStaticExitItems() i18n("Save current Session for next login"), "kicker:/savesession", nId++, index++ ); } - if (DM().isSwitchable() && kapp->authorize("switch_user")) + if (DM().isSwitchable() && tdeApp->authorize("switch_user")) { KMenuItem *switchuser = m_exitView->leftView()->insertItem( "switchuser", i18n( "Switch User" ), i18n( "Manage parallel sessions" ), "kicker:/switchuser/", nId++, index++ ); @@ -1374,10 +1332,7 @@ void KMenu::insertStaticExitItems() } bool maysd = false; -#if defined(COMPILE_HALBACKEND) - if (ksmserver.readBoolEntry( "offerShutdown", true ) && DM().canShutdown()) - maysd = true; -#elif defined(__TDE_HAVE_TDEHWLIB) +#if defined(WITH_TDEHWLIB) TDERootSystemDevice* rootDevice = TDEGlobal::hardwareDevices()->rootSystemDevice(); if( rootDevice ) { maysd = rootDevice->canPowerOff(); @@ -1431,7 +1386,7 @@ void KMenu::insertStaticItems() m_systemView->insertMenuItem(p, nId++, index++); // run command - if (kapp->authorize("run_command")) + if (tdeApp->authorize("run_command")) { m_systemView->insertItem( "system-run", i18n("Run Command..."), "", "kicker:/runusercommand", nId++, index++ ); @@ -1490,11 +1445,11 @@ void KMenu::insertStaticItems() m_systemView->insertItem( "network", i18n( "Network Folders" ), "remote:/", "remote:/", nId++, index++ ); - m_mediaWatcher = new MediaWatcher( TQT_TQOBJECT(this) ); - connect( m_mediaWatcher, TQT_SIGNAL( mediumChanged() ), TQT_SLOT( updateMedia() ) ); + m_mediaWatcher = new MediaWatcher( this ); + connect( m_mediaWatcher, TQ_SIGNAL( mediumChanged() ), TQ_SLOT( updateMedia() ) ); m_media_id = 0; - connect(&m_mediaFreeTimer, TQT_SIGNAL(timeout()), TQT_SLOT( updateMedia())); + connect(&m_mediaFreeTimer, TQ_SIGNAL(timeout()), TQ_SLOT( updateMedia())); } int KMenu::insertClientMenu(KickerClientMenu *) @@ -1524,18 +1479,18 @@ void KMenu::slotLock() TQCString appname( "kdesktop" ); 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 KMenu::slotOpenHomepage() { accept(); - kapp->invokeBrowser("http://www.trinitydesktop.org"); + tdeApp->invokeBrowser("http://www.trinitydesktop.org"); } void KMenu::slotLogout() { - kapp->requestShutDown(); + tdeApp->requestShutDown(); } void KMenu::slotPopulateSessions() @@ -1544,9 +1499,9 @@ void KMenu::slotPopulateSessions() DM dm; sessionsMenu->clear(); - if (kapp->authorize("start_new_session") && (p = dm.numReserve()) >= 0) + if (tdeApp->authorize("start_new_session") && (p = dm.numReserve()) >= 0) { - if (kapp->authorize("lock_screen")) + if (tdeApp->authorize("lock_screen")) sessionsMenu->insertItem(/*SmallIconSet("lockfork"),*/ i18n("Lock Current && Start New Session"), 100 ); sessionsMenu->insertItem(SmallIconSet("fork"), i18n("Start New Session"), 101 ); if (!p) { @@ -1579,7 +1534,7 @@ void KMenu::slotSessionActivated( int ent ) void KMenu::doNewSession( bool lock ) { int result = KMessageBox::warningContinueCancel( - TQT_TQWIDGET(kapp->desktop()->screen(kapp->desktop()->screenNumber(this))), + tdeApp->desktop()->screen(tdeApp->desktop()->screenNumber(this)), i18n("<p>You have chosen to open another desktop session.<br>" "The current session will be hidden " "and a new login screen will be displayed.<br>" @@ -1628,8 +1583,8 @@ void KMenu::searchAccept() if ( logout ) { - kapp->propagateSessionManager(); - kapp->requestShutDown(); + tdeApp->propagateSessionManager(); + tdeApp->requestShutDown(); } if ( lock ) { @@ -1637,7 +1592,7 @@ void KMenu::searchAccept() 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("")); } } @@ -1701,7 +1656,7 @@ bool KMenu::runCommand() // fall-through to shell case case KURIFilterData::SHELL: { - if (kapp->authorize("shell_access")) + if (tdeApp->authorize("shell_access")) { exec = cmd; @@ -1797,7 +1752,7 @@ void KMenu::setOrientation(MenuOrientation orientation) m_orientation=orientation; - m_resizeHandle->setCursor(m_orientation == BottomUp ? tqsizeBDiagCursor : tqsizeFDiagCursor); + m_resizeHandle->setCursor(m_orientation == BottomUp ? TQt::sizeBDiagCursor : TQt::sizeFDiagCursor); TQPixmap pix; if ( m_orientation == BottomUp ) @@ -2019,7 +1974,7 @@ void KMenu::searchChanged(const TQString & text) if (input_timer->isActive ()) input_timer->stop (); - input_timer->start (WAIT_BEFORE_QUERYING, TRUE); + input_timer->start (WAIT_BEFORE_QUERYING, true); } bool KMenu::dontQueryNow (const TQString& str) @@ -2046,7 +2001,7 @@ void KMenu::createNewProgramList() m_seenPrograms = KickerSettings::firstSeenApps(); m_newInstalledPrograms.clear(); - m_currentDate = TQDate::currentDate().toString(Qt::ISODate); + m_currentDate = TQDate::currentDate().toString(TQt::ISODate); bool initialize = (m_seenPrograms.count() == 0); @@ -2108,7 +2063,7 @@ void KMenu::createNewProgramList(TQString relPath) else { ++it_find; if (*(it_find)!="-") { - TQDate date = TQDate::fromString(*(it_find),Qt::ISODate); + TQDate date = TQDate::fromString(*(it_find),TQt::ISODate); if (date.daysTo(TQDate::currentDate())<3) { if (m_newInstalledPrograms.find(s->storageId())==m_newInstalledPrograms.end()) m_newInstalledPrograms+=s->storageId(); @@ -2328,7 +2283,7 @@ TQString KMenu::insertBreaks(const TQString& text, TQFontMetrics fm, int width, void KMenu::clearSearchResults(bool showHelp) { m_searchResultsWidget->clear(); - m_searchResultsWidget->setFocusPolicy(showHelp ? TQ_NoFocus : TQ_StrongFocus); + m_searchResultsWidget->setFocusPolicy(showHelp ? TQWidget::NoFocus : TQWidget::StrongFocus); setTabOrder(m_kcommand, m_searchResultsWidget); if (showHelp) { @@ -2464,7 +2419,7 @@ void KMenu::doQuery (bool return_pressed) #endif ) exe = TQString(); - else if (kapp->authorize("shell_access")) + else if (tdeApp->authorize("shell_access")) { if( filterData.hasArgsAndOptions() ) exe += filterData.argsAndOptions(); @@ -2664,7 +2619,7 @@ TQString KMenu::iconForHitMenuItem(HitMenuItem *hit_item) return (mimetype_iconstore [hit_item->mimetype]); else { KMimeType::Ptr mimetype_ptr = KMimeType::mimeType (hit_item->mimetype); - TQString mimetype_icon = mimetype_ptr->icon(TQString(), FALSE); + TQString mimetype_icon = mimetype_ptr->icon(TQString(), false); mimetype_iconstore [hit_item->mimetype] = mimetype_icon; return mimetype_icon; } @@ -2705,7 +2660,7 @@ void KMenu::slotStartURL(const TQString& u) TQDataStream stream(params, IO_WriteOnly); stream << 0 << -1 << ""; - kapp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params); + tdeApp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params); } else if ( u == "kicker:/runcommand" ) { @@ -2720,14 +2675,14 @@ void KMenu::slotStartURL(const TQString& u) TQDataStream stream(params, IO_WriteOnly); stream << 2 << -1 << ""; - kapp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params); + tdeApp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params); } else if ( u == "kicker:/restart" ) { TQByteArray params; TQDataStream stream(params, IO_WriteOnly); stream << 1 << -1 << TQString(); - kapp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params); + tdeApp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params); } else if ( u == "kicker:/suspend_freeze" ) { slotSuspend( SuspendType::Freeze ); @@ -2746,7 +2701,7 @@ void KMenu::slotStartURL(const TQString& u) } else if ( u == "kicker:/savesession" ) { TQByteArray data; - kapp->dcopClient()->send( "ksmserver", "default", + tdeApp->dcopClient()->send( "ksmserver", "default", "saveCurrentSession()", data ); } else if ( u == "kicker:/switchuser" ) { @@ -2767,7 +2722,7 @@ void KMenu::slotStartURL(const TQString& u) TQDataStream stream(params, IO_WriteOnly); stream << 1 << -1 << rebootOptions[u.mid(16).toInt()]; - kapp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params); + tdeApp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params); } #warning restart entry not supported #if 0 @@ -2798,19 +2753,19 @@ void KMenu::slotStartURL(const TQString& u) TQDataStream arg(data, IO_WriteOnly); arg << u.mid(9,22); - kapp->dcopClient()->send("knotes","KNotesIface","showNote(TQString)", data); + tdeApp->dcopClient()->send("knotes","KNotesIface","showNote(TQString)", data); } return; } - kapp->propagateSessionManager(); + tdeApp->propagateSessionManager(); (void) new KRun( u, parentWidget()); } } void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos, int /*col*/ ) { - const TQObject* source = TQT_TQOBJECT_CONST(sender()); + const TQObject* source = sender(); if (!item) return; @@ -2834,18 +2789,18 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos m_popupPath.icon = kitem->icon(); if (m_popupPath.path.startsWith(locateLocal("data", TQString::fromLatin1("RecentDocuments/")))) { - KDesktopFile df(m_popupPath.path,true); + TDEDesktopFile df(m_popupPath.path,true); m_popupPath.path=df.readURL(); } } m_popupMenu = new TDEPopupMenu(this); - connect(m_popupMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotContextMenu(int))); + connect(m_popupMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotContextMenu(int))); bool hasEntries = false; m_popupMenu->insertTitle(SmallIcon(kitem->icon()),kitem->title()); - if (TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_favoriteView)) + if (source==m_favoriteView) { hasEntries = true; m_popupMenu->insertItem(SmallIconSet("remove"), @@ -2867,7 +2822,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos { if ((*it)[0]=='/') { - KDesktopFile df((*it),true); + TDEDesktopFile df((*it),true); if (df.readURL().replace("file://",TQString())==m_popupPath.path) break; } @@ -2877,12 +2832,12 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos } } - if (TQT_BASE_OBJECT_CONST(source)!=TQT_BASE_OBJECT(m_exitView)) { + if (source!=m_exitView) { if (m_popupService || (!m_popupPath.path.startsWith("kicker:/") && !m_popupPath.path.startsWith("system:/") && !m_popupPath.path.startsWith("kaddressbook:/"))) { if (hasEntries) m_popupMenu->insertSeparator(); - if (kapp->authorize("editable_desktop_icons") ) + if (tdeApp->authorize("editable_desktop_icons") ) { hasEntries = true; if (m_popupPath.menuPath.endsWith("/")) @@ -2892,7 +2847,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos m_popupMenu->insertItem(SmallIconSet("desktop"), i18n("Add Item to Desktop"), AddItemToDesktop); } - if (kapp->authorizeTDEAction("kicker_rmb") && !Kicker::the()->isImmutable()) + if (tdeApp->authorizeTDEAction("kicker_rmb") && !Kicker::the()->isImmutable()) { hasEntries = true; if (m_popupPath.menuPath.endsWith("/")) @@ -2902,7 +2857,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos m_popupMenu->insertItem(SmallIconSet("kicker"), i18n("Add Item to Main Panel"), AddItemToPanel); } - if (kapp->authorizeTDEAction("menuedit") && !kitem->menuPath().isEmpty()) + if (tdeApp->authorizeTDEAction("menuedit") && !kitem->menuPath().isEmpty()) { hasEntries = true; if (kitem->menuPath().endsWith("/")) @@ -2910,14 +2865,14 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos else m_popupMenu->insertItem(SmallIconSet("kmenuedit"), i18n("Edit Item"), EditItem); } - if (kapp->authorize("run_command") && (m_popupService || (!m_popupPath.menuPath.isEmpty() && !m_popupPath.menuPath.endsWith("/")))) + if (tdeApp->authorize("run_command") && (m_popupService || (!m_popupPath.menuPath.isEmpty() && !m_popupPath.menuPath.endsWith("/")))) { hasEntries = true; m_popupMenu->insertItem(SmallIconSet("system-run"), i18n("Put Into Run Dialog"), PutIntoRunDialog); } } - if (TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_searchResultsWidget) || ((TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_favoriteView) || TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_recentlyView) || TQT_BASE_OBJECT_CONST(source) == TQT_BASE_OBJECT(m_systemView)) && !m_popupService && !m_popupPath.path.startsWith("kicker:/")) ) { + if (source==m_searchResultsWidget || ((source==m_favoriteView || source==m_recentlyView || source == m_systemView) && !m_popupService && !m_popupPath.path.startsWith("kicker:/")) ) { TQString uri; if (m_popupService) uri = locate("apps", m_popupService->desktopEntryPath()); @@ -2954,7 +2909,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos } } - if (TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_recentlyView)) { + if (source==m_recentlyView) { m_popupMenu->insertSeparator(); if (m_popupService) m_popupMenu->insertItem(SmallIconSet("history_clear"), @@ -2999,7 +2954,7 @@ void KMenu::slotContextMenu(int selected) job->setDefaultPermissions( true ); } else { - KDesktopFile* df = new KDesktopFile( newDesktopFile(KURL(m_popupPath.path), TDEGlobalSettings::desktopPath() ) ); + TDEDesktopFile* df = new TDEDesktopFile( newDesktopFile(KURL(m_popupPath.path), TDEGlobalSettings::desktopPath() ) ); df->writeEntry("GenericName", m_popupPath.description); df->writeEntry( "Icon", m_popupPath.icon ); df->writePathEntry( "URL", m_popupPath.path ); @@ -3014,17 +2969,17 @@ void KMenu::slotContextMenu(int selected) case AddItemToPanel: accept(); if (m_popupService) - kapp->dcopClient()->send("kicker", "Panel", "addServiceButton(TQString)", m_popupService->desktopEntryPath()); + tdeApp->dcopClient()->send("kicker", "Panel", "addServiceButton(TQString)", m_popupService->desktopEntryPath()); else #warning FIXME special RecentDocuments/foo.desktop handling - kapp->dcopClient()->send("kicker", "Panel", "addURLButton(TQString)", m_popupPath.path); + tdeApp->dcopClient()->send("kicker", "Panel", "addURLButton(TQString)", m_popupPath.path); accept(); break; case EditItem: case EditMenu: accept(); - proc = new TDEProcess(TQT_TQOBJECT(this)); + proc = new TDEProcess(this); *proc << TDEStandardDirs::findExe(TQString::fromLatin1("kmenuedit")); *proc << "/"+m_popupPath.menuPath.section('/',-200,-2) << m_popupPath.menuPath.section('/', -1); proc->start(); @@ -3033,16 +2988,16 @@ void KMenu::slotContextMenu(int selected) case PutIntoRunDialog: accept(); if (m_popupService) - kapp->dcopClient()->send("kdesktop", "default", "popupExecuteCommand(TQString)", m_popupService->exec()); + tdeApp->dcopClient()->send("kdesktop", "default", "popupExecuteCommand(TQString)", m_popupService->exec()); else #warning FIXME special RecentDocuments/foo.desktop handling - kapp->dcopClient()->send("kdesktop", "default", "popupExecuteCommand(TQString)", m_popupPath.path); + tdeApp->dcopClient()->send("kdesktop", "default", "popupExecuteCommand(TQString)", m_popupPath.path); accept(); break; case AddMenuToDesktop: { accept(); - KDesktopFile *df = new KDesktopFile( newDesktopFile(KURL("programs:/"+m_popupPath.menuPath),TDEGlobalSettings::desktopPath())); + TDEDesktopFile *df = new TDEDesktopFile( newDesktopFile(KURL("programs:/"+m_popupPath.menuPath),TDEGlobalSettings::desktopPath())); df->writeEntry( "Icon", m_popupPath.icon ); df->writePathEntry( "URL", "programs:/"+m_popupPath.menuPath ); df->writeEntry( "Name", m_popupPath.title ); @@ -3055,7 +3010,7 @@ void KMenu::slotContextMenu(int selected) case AddMenuToPanel: accept(); ds << "foo" << m_popupPath.menuPath; - kapp->dcopClient()->send("kicker", "Panel", "addServiceMenuButton(TQString,TQString)", ba); + tdeApp->dcopClient()->send("kicker", "Panel", "addServiceMenuButton(TQString,TQString)", ba); break; case AddToFavorites: @@ -3070,14 +3025,14 @@ void KMenu::slotContextMenu(int selected) TQStringList::Iterator it; for (it = favs.begin(); it != favs.end(); ++it) { if ((*it)[0]=='/') { - KDesktopFile df((*it),true); + TDEDesktopFile df((*it),true); if (df.readURL().replace("file://",TQString())==m_popupPath.path) break; } } if (it==favs.end()) { TQString file = KickerLib::newDesktopFile(m_popupPath.path); - KDesktopFile df(file); + TDEDesktopFile df(file); df.writeEntry("Encoding", "UTF-8"); df.writeEntry("Type","Link"); df.writeEntry("Name", m_popupPath.title); @@ -3112,7 +3067,7 @@ void KMenu::slotContextMenu(int selected) else { for (TQStringList::Iterator it = favs.begin(); it != favs.end(); ++it) { if ((*it)[0]=='/') { - KDesktopFile df((*it),true); + TDEDesktopFile df((*it),true); if (df.readURL().replace("file://",TQString())==m_popupPath.path) { TQFile::remove((*it)); favs.erase(it); @@ -3288,7 +3243,7 @@ void KMenu::notifyServiceStarted(KService::Ptr service) TQDataStream stream(params, IO_WriteOnly); stream << "minicli" << service->storageId(); kdDebug() << "minicli appLauncher dcop signal: " << service->storageId() << endl; - TDEApplication::kApplication()->dcopClient()->emitDCOPSignal("appLauncher", + tdeApp->dcopClient()->emitDCOPSignal("appLauncher", "serviceStartedByStorageId(TQString,TQString)", params); } @@ -3356,7 +3311,7 @@ void KMenu::searchActionClicked(TQListViewItem* item) list << "kurisearchfilter" << "kuriikwsfilter"; if( !KURIFilter::self()->filterURI(data, list) ) { - KDesktopFile file("searchproviders/google.desktop", true, "services"); + TDEDesktopFile file("searchproviders/google.desktop", true, "services"); data.setData(file.readEntry("Query").replace("\\{@}", m_kcommand->currentText())); } @@ -3465,7 +3420,7 @@ void KMenu::slotFavoritesMoved( TQListViewItem* item, TQListViewItem* /*afterFir { if ((*it)[0]=='/') { - KDesktopFile df((*it),true); + TDEDesktopFile df((*it),true); if (df.readURL().replace("file://",TQString())==kitem->path()) { addFav = *it; @@ -3490,7 +3445,7 @@ void KMenu::slotFavoritesMoved( TQListViewItem* item, TQListViewItem* /*afterFir { if ((*it)[0]=='/' && !kafterNow->service()) { - KDesktopFile df((*it),true); + TDEDesktopFile df((*it),true); if (df.readURL().replace("file://",TQString())==kafterNow->path()) { kdDebug() << "insert after " << kafterNow->path() << endl; @@ -3614,7 +3569,7 @@ bool KMenu::ensureServiceRunning(const TQString & service) TQDataStream arg(data, IO_WriteOnly); arg << service << URLs; - if ( !kapp->dcopClient()->call( "tdelauncher", "tdelauncher", "start_service_by_desktop_name(TQString,TQStringList)", + if ( !tdeApp->dcopClient()->call( "tdelauncher", "tdelauncher", "start_service_by_desktop_name(TQString,TQStringList)", data, replyType, replyData) ) { tqWarning( "call to tdelauncher failed."); return false; @@ -3660,7 +3615,7 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after ) { TQString uri = item.m_path; if (uri.startsWith(locateLocal("data", TQString::fromLatin1("RecentDocuments/")))) { - KDesktopFile df(uri,true); + TDEDesktopFile df(uri,true); uri=df.readURL(); } @@ -3669,7 +3624,7 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after ) { if ((*it)[0]=='/') { - KDesktopFile df((*it),true); + TDEDesktopFile df((*it),true); if (df.readURL().replace("file://",TQString())==uri) break; } @@ -3677,7 +3632,7 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after ) if (it==favs.end()) { TQString file = KickerLib::newDesktopFile(uri); - KDesktopFile df(file); + TDEDesktopFile df(file); df.writeEntry("Encoding", "UTF-8"); df.writeEntry("Type","Link"); df.writeEntry("Name", item.m_title); @@ -3711,7 +3666,7 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after ) { if ((*it)[0]=='/') { - KDesktopFile df((*it),true); + TDEDesktopFile df((*it),true); if (df.readURL().replace("file://",TQString())==text) break; } @@ -3722,7 +3677,7 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after ) KURL kurl(text); TQString file = KickerLib::newDesktopFile(text); - KDesktopFile df(file); + TDEDesktopFile df(file); df.writeEntry("Encoding", "UTF-8"); df.writeEntry("Type","Link"); df.writeEntry("Name", item->name()); @@ -3790,27 +3745,7 @@ void KMenu::insertSuspendOption( int &nId, int &index ) bool standby = false; bool suspend_disk = false; bool hybrid_suspend = false; -#if defined(COMPILE_HALBACKEND) - suspend_ram = libhal_device_get_property_bool(m_halCtx, - "/org/freedesktop/Hal/devices/computer", - "power_management.can_suspend", - NULL); - - standby = libhal_device_get_property_bool(m_halCtx, - "/org/freedesktop/Hal/devices/computer", - "power_management.can_standby", - NULL); - - suspend_disk = libhal_device_get_property_bool(m_halCtx, - "/org/freedesktop/Hal/devices/computer", - "power_management.can_hibernate", - NULL); - - hybrid_suspend = libhal_device_get_property_bool(m_halCtx, - "/org/freedesktop/Hal/devices/computer", - "power_management.can_suspend_hybrid", - NULL); -#elif defined(__TDE_HAVE_TDEHWLIB) // COMPILE_HALBACKEND +#if defined(WITH_TDEHWLIB) TDERootSystemDevice* rootDevice = TDEGlobal::hardwareDevices()->rootSystemDevice(); if (rootDevice) { suspend_ram = rootDevice->canSuspend(); @@ -3882,49 +3817,7 @@ void KMenu::slotSuspend(int id) DCOPRef("kdesktop", "KScreensaverIface").call("lock()"); } -#if defined(COMPILE_HALBACKEND) - DBusMessage* msg = NULL; - - if (m_dbusConn) { - // No Freeze support in HAL - if (id == SuspendType::Standby) { - msg = dbus_message_new_method_call( - "org.freedesktop.Hal", - "/org/freedesktop/Hal/devices/computer", - "org.freedesktop.Hal.Device.SystemPowerManagement", - "Standby"); - } else if (id == SuspendType::Suspend) { - msg = dbus_message_new_method_call( - "org.freedesktop.Hal", - "/org/freedesktop/Hal/devices/computer", - "org.freedesktop.Hal.Device.SystemPowerManagement", - "Suspend"); - int wakeup=0; - dbus_message_append_args(msg, DBUS_TYPE_INT32, &wakeup, DBUS_TYPE_INVALID); - } else if (id == SuspendType::Hibernate) { - msg = dbus_message_new_method_call( - "org.freedesktop.Hal", - "/org/freedesktop/Hal/devices/computer", - "org.freedesktop.Hal.Device.SystemPowerManagement", - "Hibernate"); - } else if (id == SuspendType::HybridSuspend) { - msg = dbus_message_new_method_call( - "org.freedesktop.Hal", - "/org/freedesktop/Hal/devices/computer", - "org.freedesktop.Hal.Device.SystemPowerManagement", - "SuspendHybrid"); - int wakeup=0; - dbus_message_append_args(msg, DBUS_TYPE_INT32, &wakeup, DBUS_TYPE_INVALID); - } else { - return; - } - - if(dbus_connection_send(m_dbusConn, msg, NULL)) { - error = false; - } - dbus_message_unref(msg); - } -#elif defined(__TDE_HAVE_TDEHWLIB) // COMPILE_HALBACKEND +#if defined(WITH_TDEHWLIB) TDERootSystemDevice* rootDevice = TDEGlobal::hardwareDevices()->rootSystemDevice(); if (rootDevice) { if (id == SuspendType::Freeze) { @@ -3956,9 +3849,7 @@ void KMenu::runUserCommand() if ( kicker_screen_number ) appname.sprintf("kdesktop-screen-%d", kicker_screen_number); - kapp->updateRemoteUserTimestamp( appname ); - kapp->dcopClient()->send( appname, "KDesktopIface", + tdeApp->updateRemoteUserTimestamp( appname ); + tdeApp->dcopClient()->send( appname, "KDesktopIface", "popupExecuteCommand()", data ); } - -// vim:cindent:sw=4: diff --git a/kicker/kicker/ui/k_new_mnu.h b/kicker/kicker/ui/k_new_mnu.h index acb80342b..b0e18e7cb 100644 --- a/kicker/kicker/ui/k_new_mnu.h +++ b/kicker/kicker/ui/k_new_mnu.h @@ -45,16 +45,6 @@ #include <config.h> -#ifdef COMPILE_HALBACKEND -#ifndef NO_QT3_DBUS_SUPPORT -/* We acknowledge the the dbus API is unstable */ -#define DBUS_API_SUBJECT_TO_CHANGE -#include <dbus/connection.h> -#endif // NO_QT3_DBUS_SUPPORT - -#include <hal/libhal.h> -#endif // COMPILE_HALBACKEND - class KickerClientMenu; class KickoffTabBar; class KBookmarkMenu; @@ -88,7 +78,7 @@ enum OverflowCategoryState { None, Filling, NotNeeded }; class KMenu : public KMenuBase { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY (bool TDEStyleMenuDropShadow READ useTDEStyleMenuDropShadow ) public: @@ -347,11 +337,6 @@ private: void fillOverflowCategory(); TQString insertBreaks(const TQString& text, TQFontMetrics fm, int width, TQString leadInsert = TQString::null); - -#ifdef COMPILE_HALBACKEND - LibHalContext* m_halCtx; - DBusConnection *m_dbusConn; -#endif }; #endif diff --git a/kicker/kicker/ui/kickoff_bar.cpp b/kicker/kicker/ui/kickoff_bar.cpp index e6e66b441..977ec1089 100644 --- a/kicker/kicker/ui/kickoff_bar.cpp +++ b/kicker/kicker/ui/kickoff_bar.cpp @@ -199,7 +199,7 @@ void KickoffTabBar::layoutTabs() int w = TQMAX(st.width() / count(), parentWidget()->width() / count()); TQRect r = tab->rect(); - tab->setRect(TQRect(TQPoint(x, 0), style().tqsizeFromContents(TQStyle::CT_TabBarTab, this, + tab->setRect(TQRect(TQPoint(x, 0), style().sizeFromContents(TQStyle::CT_TabBarTab, this, TQSize(w, h), TQStyleOption(tab)))); x += tab->rect().width() - overlap; } @@ -223,7 +223,7 @@ void KickoffTabBar::dragMoveEvent(TQDragMoveEvent* event) void KickoffTabBar::mousePressEvent( TQMouseEvent * e ) { - if ( e->button() != Qt::LeftButton ) { + if ( e->button() != TQt::LeftButton ) { e->ignore(); return; } @@ -235,4 +235,3 @@ void KickoffTabBar::mousePressEvent( TQMouseEvent * e ) } #include "kickoff_bar.moc" -// vim:cindent:sw=4: diff --git a/kicker/kicker/ui/kickoff_bar.h b/kicker/kicker/ui/kickoff_bar.h index 941f1144f..d5dcb8d3c 100644 --- a/kicker/kicker/ui/kickoff_bar.h +++ b/kicker/kicker/ui/kickoff_bar.h @@ -27,7 +27,7 @@ class KickoffTabBar : public TQTabBar { - Q_OBJECT + TQ_OBJECT public: KickoffTabBar(TQWidget* parent, const char* name); diff --git a/kicker/kicker/ui/media_watcher.cpp b/kicker/kicker/ui/media_watcher.cpp index 9ff74535c..d40178dc8 100644 --- a/kicker/kicker/ui/media_watcher.cpp +++ b/kicker/kicker/ui/media_watcher.cpp @@ -43,7 +43,7 @@ MediaWatcher::MediaWatcher( TQObject *parent ) : void MediaWatcher::updateDevices() { DCOPRef nsd( "kded", "mediamanager" ); - nsd.setDCOPClient( kapp->dcopClient() ); + nsd.setDCOPClient( tdeApp->dcopClient() ); m_devices = nsd.call( "fullList" ); } diff --git a/kicker/kicker/ui/media_watcher.h b/kicker/kicker/ui/media_watcher.h index 604fcaabe..0f6cb6fae 100644 --- a/kicker/kicker/ui/media_watcher.h +++ b/kicker/kicker/ui/media_watcher.h @@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class MediaWatcher : public TQObject, public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP TQStringList m_devices; diff --git a/kicker/kicker/ui/mykickoffsearchinterface.h b/kicker/kicker/ui/mykickoffsearchinterface.h index b728718c4..4271766d8 100644 --- a/kicker/kicker/ui/mykickoffsearchinterface.h +++ b/kicker/kicker/ui/mykickoffsearchinterface.h @@ -28,7 +28,7 @@ using namespace KickoffSearch; class MyKickoffSearchInterface :public KickoffSearchInterface { - Q_OBJECT + TQ_OBJECT public: MyKickoffSearchInterface( KMenu*, TQObject* parent, const char* name = 0 ); diff --git a/kicker/kicker/ui/popupmenutitle.h b/kicker/kicker/ui/popupmenutitle.h index d839a3b84..a6f3dec5e 100644 --- a/kicker/kicker/ui/popupmenutitle.h +++ b/kicker/kicker/ui/popupmenutitle.h @@ -46,7 +46,7 @@ public: { p->save(); TQRect r(x, y, w, h); - kapp->style().tqdrawPrimitive(TQStyle::PE_HeaderSectionMenu, + tdeApp->style().drawPrimitive(TQStyle::PE_HeaderSectionMenu, p, r, cg); if (!m_desktopName.isEmpty()) @@ -73,7 +73,7 @@ public: { TQSize size = TQFontMetrics(m_font).size(AlignHCenter, m_desktopName); size.setHeight(size.height() + - (kapp->style().pixelMetric(TQStyle::PM_DefaultFrameWidth) * 2 + 1)); + (tdeApp->style().pixelMetric(TQStyle::PM_DefaultFrameWidth) * 2 + 1)); return size; } diff --git a/kicker/kicker/ui/popupmenutop.cpp b/kicker/kicker/ui/popupmenutop.cpp index 571d1c7dc..c05545aae 100644 --- a/kicker/kicker/ui/popupmenutop.cpp +++ b/kicker/kicker/ui/popupmenutop.cpp @@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "popupmenutop.h" #include "kickerSettings.h" -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqimage.h> #include <kdebug.h> diff --git a/kicker/kicker/ui/quickbrowser_mnu.cpp b/kicker/kicker/ui/quickbrowser_mnu.cpp index 9efc1ab5c..4ca117f3f 100644 --- a/kicker/kicker/ui/quickbrowser_mnu.cpp +++ b/kicker/kicker/ui/quickbrowser_mnu.cpp @@ -44,17 +44,17 @@ void PanelQuickBrowser::initialize() KURL url; url.setPath(TQDir::homeDirPath()); - if (kapp->authorizeURLAction("list", KURL(), url)) + if (tdeApp->authorizeURLAction("list", KURL(), url)) insertItem(SmallIcon("kfm_home"), i18n("&Home Folder"), new PanelBrowserMenu(url.path(), this)); url.setPath(TQDir::rootDirPath()); - if (kapp->authorizeURLAction("list", KURL(), url)) + if (tdeApp->authorizeURLAction("list", KURL(), url)) insertItem(SmallIcon("folder_red"), i18n("&Root Folder"), new PanelBrowserMenu(url.path(), this)); url.setPath(TQDir::rootDirPath() + "etc"); - if (kapp->authorizeURLAction("list", KURL(), url)) + if (tdeApp->authorizeURLAction("list", KURL(), url)) insertItem(SmallIcon("folder_yellow"), i18n("System &Configuration"), new PanelBrowserMenu(url.path(), this)); } diff --git a/kicker/kicker/ui/quickbrowser_mnu.h b/kicker/kicker/ui/quickbrowser_mnu.h index 01b12d09d..98a3eb4c4 100644 --- a/kicker/kicker/ui/quickbrowser_mnu.h +++ b/kicker/kicker/ui/quickbrowser_mnu.h @@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class PanelQuickBrowser : public KPanelMenu { - Q_OBJECT + TQ_OBJECT public: PanelQuickBrowser(TQWidget *parent=0, const char *name=0); diff --git a/kicker/kicker/ui/recentapps.cpp b/kicker/kicker/ui/recentapps.cpp index ef2f5c6a1..0cb81b53f 100644 --- a/kicker/kicker/ui/recentapps.cpp +++ b/kicker/kicker/ui/recentapps.cpp @@ -112,7 +112,7 @@ void RecentlyLaunchedApps::appLaunched(const TQString& strApp) TQByteArray params; TQDataStream stream(params, IO_WriteOnly); stream << launchDCOPSignalSource() << strApp; - TDEApplication::kApplication()->dcopClient()->emitDCOPSignal("appLauncher", + tdeApp->dcopClient()->emitDCOPSignal("appLauncher", "serviceStartedByStorageId(TQString,TQString)", params); for (TQValueList<RecentlyLaunchedAppInfo>::iterator it = m_appInfos.begin(); diff --git a/kicker/kicker/ui/removeapplet_mnu.cpp b/kicker/kicker/ui/removeapplet_mnu.cpp index a7bc609a6..4ce3c4ea0 100644 --- a/kicker/kicker/ui/removeapplet_mnu.cpp +++ b/kicker/kicker/ui/removeapplet_mnu.cpp @@ -37,8 +37,8 @@ PanelRemoveAppletMenu::PanelRemoveAppletMenu(ContainerArea* cArea, const char *name) : TQPopupMenu(parent, name), m_containerArea(cArea) { - connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int))); - connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow())); + connect(this, TQ_SIGNAL(activated(int)), TQ_SLOT(slotExec(int))); + connect(this, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotAboutToShow())); } void PanelRemoveAppletMenu::slotAboutToShow() @@ -81,7 +81,7 @@ void PanelRemoveAppletMenu::slotAboutToShow() if (m_containers.count() > 1) { insertSeparator(); - insertItem(i18n("All"), this, TQT_SLOT(slotRemoveAll()), 0, id); + insertItem(i18n("All"), this, TQ_SLOT(slotRemoveAll()), 0, id); } } diff --git a/kicker/kicker/ui/removeapplet_mnu.h b/kicker/kicker/ui/removeapplet_mnu.h index 895ded710..17b24b496 100644 --- a/kicker/kicker/ui/removeapplet_mnu.h +++ b/kicker/kicker/ui/removeapplet_mnu.h @@ -34,7 +34,7 @@ class ContainerArea; class PanelRemoveAppletMenu : public TQPopupMenu { - Q_OBJECT + TQ_OBJECT public: PanelRemoveAppletMenu(ContainerArea* cArea, TQWidget* parent = 0, const char* name = 0); diff --git a/kicker/kicker/ui/removebutton_mnu.cpp b/kicker/kicker/ui/removebutton_mnu.cpp index 819eff533..6617975f5 100644 --- a/kicker/kicker/ui/removebutton_mnu.cpp +++ b/kicker/kicker/ui/removebutton_mnu.cpp @@ -40,8 +40,8 @@ PanelRemoveButtonMenu::PanelRemoveButtonMenu( ContainerArea* cArea, TQWidget *parent, const char *name ) : TQPopupMenu( parent, name ), containerArea( cArea ) { - connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int))); - connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow())); + connect(this, TQ_SIGNAL(activated(int)), TQ_SLOT(slotExec(int))); + connect(this, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotAboutToShow())); } void PanelRemoveButtonMenu::addToContainers(const TQString& type) @@ -89,7 +89,7 @@ void PanelRemoveButtonMenu::slotAboutToShow() if (containers.count() > 1) { insertSeparator(); - insertItem(i18n("All"), this, TQT_SLOT(slotRemoveAll()), 0, id); + insertItem(i18n("All"), this, TQ_SLOT(slotRemoveAll()), 0, id); } } diff --git a/kicker/kicker/ui/removebutton_mnu.h b/kicker/kicker/ui/removebutton_mnu.h index 211edd771..d3b5d7237 100644 --- a/kicker/kicker/ui/removebutton_mnu.h +++ b/kicker/kicker/ui/removebutton_mnu.h @@ -34,7 +34,7 @@ class ContainerArea; class PanelRemoveButtonMenu : public TQPopupMenu { - Q_OBJECT + TQ_OBJECT public: PanelRemoveButtonMenu( ContainerArea *cArea, TQWidget *parent=0, const char *name=0 ); diff --git a/kicker/kicker/ui/removecontainer_mnu.cpp b/kicker/kicker/ui/removecontainer_mnu.cpp index 1b30506cc..a447b4d66 100644 --- a/kicker/kicker/ui/removecontainer_mnu.cpp +++ b/kicker/kicker/ui/removecontainer_mnu.cpp @@ -44,7 +44,7 @@ RemoveContainerMenu::RemoveContainerMenu( ContainerArea* cArea, buttonId = insertItem(i18n("Appli&cation"), new PanelRemoveButtonMenu( containerArea, this ) ); adjustSize(); - connect( this, TQT_SIGNAL( aboutToShow() ), TQT_SLOT( slotAboutToShow() ) ); + connect( this, TQ_SIGNAL( aboutToShow() ), TQ_SLOT( slotAboutToShow() ) ); } RemoveContainerMenu::~RemoveContainerMenu() diff --git a/kicker/kicker/ui/removecontainer_mnu.h b/kicker/kicker/ui/removecontainer_mnu.h index bd6d03d89..4f5546449 100644 --- a/kicker/kicker/ui/removecontainer_mnu.h +++ b/kicker/kicker/ui/removecontainer_mnu.h @@ -30,7 +30,7 @@ class ContainerArea; class RemoveContainerMenu : public TQPopupMenu { - Q_OBJECT + TQ_OBJECT public: RemoveContainerMenu(ContainerArea* cArea, TQWidget *parent=0, const char *name=0); diff --git a/kicker/kicker/ui/removeextension_mnu.cpp b/kicker/kicker/ui/removeextension_mnu.cpp index 829dfab5c..ef345921d 100644 --- a/kicker/kicker/ui/removeextension_mnu.cpp +++ b/kicker/kicker/ui/removeextension_mnu.cpp @@ -37,8 +37,8 @@ static const int REMOVEALLID = 1000; PanelRemoveExtensionMenu::PanelRemoveExtensionMenu( TQWidget *parent, const char *name ) : TQPopupMenu( parent, name ) { - connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int))); - connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow())); + connect(this, TQ_SIGNAL(activated(int)), TQ_SLOT(slotExec(int))); + connect(this, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotAboutToShow())); } PanelRemoveExtensionMenu::PanelRemoveExtensionMenu() diff --git a/kicker/kicker/ui/removeextension_mnu.h b/kicker/kicker/ui/removeextension_mnu.h index e77522bc8..847179caa 100644 --- a/kicker/kicker/ui/removeextension_mnu.h +++ b/kicker/kicker/ui/removeextension_mnu.h @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class PanelRemoveExtensionMenu : public TQPopupMenu { - Q_OBJECT + TQ_OBJECT public: PanelRemoveExtensionMenu( TQWidget *parent=0, const char *name=0 ); diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp index b7e069706..59d63e533 100644 --- a/kicker/kicker/ui/service_mnu.cpp +++ b/kicker/kicker/ui/service_mnu.cpp @@ -31,14 +31,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <dcopclient.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <tdeglobalsettings.h> #include <kiconloader.h> #include <tdelocale.h> #include <kmimetype.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <krun.h> #include <kservicegroup.h> #include <tdesycoca.h> @@ -68,10 +68,10 @@ PanelServiceMenu::PanelServiceMenu(const TQString & label, const TQString & relP { excludeNoDisplay_=true; - connect(KSycoca::self(), TQT_SIGNAL(databaseChanged()), - TQT_SLOT(slotClearOnClose())); - connect(this, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(slotClose())); - connect(this, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotSetTooltip(int))); + connect(KSycoca::self(), TQ_SIGNAL(databaseChanged()), + TQ_SLOT(slotClearOnClose())); + connect(this, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(slotClose())); + connect(this, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotSetTooltip(int))); } PanelServiceMenu::~PanelServiceMenu() @@ -378,7 +378,7 @@ void PanelServiceMenu::doInitialize() if (relPath_ == "") { insertItem(KickerLib::menuIconSet("application-x-executable"), i18n("Add Non-TDE Application"), - this, TQT_SLOT(addNonKDEApp())); + this, TQ_SLOT(addNonKDEApp())); } if (list.count() > 0) { @@ -553,7 +553,7 @@ void PanelServiceMenu::slotExec(int id) KSycocaEntry * e = entryMap_[id]; - kapp->propagateSessionManager(); + tdeApp->propagateSessionManager(); KService::Ptr service = static_cast<KService *>(e); TDEApplication::startServiceByDesktopPath(service->desktopEntryPath(), @@ -571,7 +571,7 @@ void PanelServiceMenu::mousePressEvent(TQMouseEvent * ev) void PanelServiceMenu::mouseReleaseEvent(TQMouseEvent * ev) { - if (ev->button() == Qt::RightButton && !Kicker::the()->isKioskImmutable()) + if (ev->button() == TQt::RightButton && !Kicker::the()->isKioskImmutable()) { int id = idAt( ev->pos() ); @@ -590,31 +590,31 @@ void PanelServiceMenu::mouseReleaseEvent(TQMouseEvent * ev) delete popupMenu_; popupMenu_ = new TDEPopupMenu(this); - connect(popupMenu_, TQT_SIGNAL(activated(int)), TQT_SLOT(slotContextMenu(int))); + connect(popupMenu_, TQ_SIGNAL(activated(int)), TQ_SLOT(slotContextMenu(int))); bool hasEntries = false; switch (contextKSycocaEntry_->sycocaType()) { case KST_KService: - if (kapp->authorize("editable_desktop_icons")) + if (tdeApp->authorize("editable_desktop_icons")) { hasEntries = true; popupMenu_->insertItem(SmallIconSet("desktop"), i18n("Add Item to Desktop"), AddItemToDesktop); } - if (kapp->authorizeTDEAction("kicker_rmb") && !Kicker::the()->isImmutable()) + if (tdeApp->authorizeTDEAction("kicker_rmb") && !Kicker::the()->isImmutable()) { hasEntries = true; popupMenu_->insertItem(SmallIconSet("kicker"), i18n("Add Item to Main Panel"), AddItemToPanel); } - if (kapp->authorizeTDEAction("menuedit")) + if (tdeApp->authorizeTDEAction("menuedit")) { hasEntries = true; popupMenu_->insertItem(SmallIconSet("kmenuedit"), i18n("Edit Item"), EditItem); } - if (kapp->authorize("run_command")) + if (tdeApp->authorize("run_command")) { hasEntries = true; popupMenu_->insertItem(SmallIconSet("system-run"), @@ -623,19 +623,19 @@ void PanelServiceMenu::mouseReleaseEvent(TQMouseEvent * ev) break; case KST_KServiceGroup: - if (kapp->authorize("editable_desktop_icons")) + if (tdeApp->authorize("editable_desktop_icons")) { hasEntries = true; popupMenu_->insertItem(SmallIconSet("desktop"), i18n("Add Menu to Desktop"), AddMenuToDesktop); } - if (kapp->authorizeTDEAction("kicker_rmb") && !Kicker::the()->isImmutable()) + if (tdeApp->authorizeTDEAction("kicker_rmb") && !Kicker::the()->isImmutable()) { hasEntries = true; popupMenu_->insertItem(SmallIconSet("kicker"), i18n("Add Menu to Main Panel"), AddMenuToPanel); } - if (kapp->authorizeTDEAction("menuedit")) + if (tdeApp->authorizeTDEAction("menuedit")) { hasEntries = true; popupMenu_->insertItem(SmallIconSet("kmenuedit"), @@ -672,7 +672,7 @@ void PanelServiceMenu::slotContextMenu(int selected) KURL src,dest; TDEIO::CopyJob *job; - KDesktopFile *df; + TDEDesktopFile *df; switch (selected) { case AddItemToDesktop: @@ -691,12 +691,12 @@ void PanelServiceMenu::slotContextMenu(int selected) if ( kicker_screen_number ) appname.sprintf("kicker-screen-%d", kicker_screen_number); service = static_cast<KService *>(contextKSycocaEntry_); - kapp->dcopClient()->send(appname, "Panel", "addServiceButton(TQString)", service->desktopEntryPath()); + tdeApp->dcopClient()->send(appname, "Panel", "addServiceButton(TQString)", service->desktopEntryPath()); break; } case EditItem: - proc = new TDEProcess(TQT_TQOBJECT(this)); + proc = new TDEProcess(this); *proc << TDEStandardDirs::findExe(TQString::fromLatin1("kmenuedit")); *proc << "/"+relPath_ << static_cast<KService *>(contextKSycocaEntry_)->menuId(); proc->start(); @@ -708,8 +708,8 @@ void PanelServiceMenu::slotContextMenu(int selected) if ( kicker_screen_number ) appname.sprintf("kdesktop-screen-%d", kicker_screen_number); service = static_cast<KService *>(contextKSycocaEntry_); - kapp->updateRemoteUserTimestamp( appname ); - kapp->dcopClient()->send(appname, "default", "popupExecuteCommand(TQString)", service->exec()); + tdeApp->updateRemoteUserTimestamp( appname ); + tdeApp->dcopClient()->send(appname, "default", "popupExecuteCommand(TQString)", service->exec()); break; } @@ -718,7 +718,7 @@ void PanelServiceMenu::slotContextMenu(int selected) dest.setPath( TDEGlobalSettings::desktopPath() ); dest.setFileName( g->caption() ); - df = new KDesktopFile( dest.path() ); + df = new TDEDesktopFile( dest.path() ); df->writeEntry( "Icon", g->icon() ); df->writePathEntry( "URL", "programs:/"+g->name() ); df->writeEntry( "Name", g->caption() ); @@ -735,12 +735,12 @@ void PanelServiceMenu::slotContextMenu(int selected) g = static_cast<KServiceGroup *>(contextKSycocaEntry_); ds << "foo" << g->relPath(); - kapp->dcopClient()->send("kicker", "Panel", "addServiceMenuButton(TQString,TQString)", ba); + tdeApp->dcopClient()->send("kicker", "Panel", "addServiceMenuButton(TQString,TQString)", ba); break; } case EditMenu: - proc = new TDEProcess(TQT_TQOBJECT(this)); + proc = new TDEProcess(this); *proc << TDEStandardDirs::findExe(TQString::fromLatin1("kmenuedit")); *proc << "/"+static_cast<KServiceGroup *>(contextKSycocaEntry_)->relPath(); proc->start(); @@ -758,7 +758,7 @@ void PanelServiceMenu::mouseMoveEvent(TQMouseEvent * ev) if (Kicker::the()->isKioskImmutable()) return; - if ( (ev->state() & Qt::LeftButton ) != Qt::LeftButton ) + if ( (ev->state() & TQt::LeftButton ) != TQt::LeftButton ) return; TQPoint p = ev->pos() - startPos_; @@ -814,7 +814,7 @@ void PanelServiceMenu::mouseMoveEvent(TQMouseEvent * ev) // path from KStdDirs. KURLDrag *d = new KURLDrag(KURL::List(url), this); - connect(d, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDragObjectDestroyed())); + connect(d, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotDragObjectDestroyed())); d->setPixmap(icon); d->dragCopy(); @@ -840,7 +840,7 @@ void PanelServiceMenu::dragEnterEvent(TQDragEnterEvent *event) void PanelServiceMenu::dragLeaveEvent(TQDragLeaveEvent *) { // see PanelServiceMenu::dragEnterEvent why this is nescessary - if (!TQT_TQRECT_OBJECT(frameGeometry()).contains(TQCursor::pos())) + if (!frameGeometry().contains(TQCursor::pos())) { KURLDrag::setTarget(0); } @@ -857,7 +857,7 @@ void PanelServiceMenu::slotDragObjectDestroyed() // the execution of any code after the original exec() statement // though the panels themselves continue on otherwise normally // (we just have some sort of nested event loop) - TQTimer::singleShot(0, this, TQT_SLOT(close())); + TQTimer::singleShot(0, this, TQ_SLOT(close())); } } @@ -898,7 +898,7 @@ void PanelServiceMenu::slotClear() // QPopupMenu's aboutToHide() is emitted before the popup is really hidden, // and also before a click in the menu is handled, so do the clearing // only after that has been handled - TQTimer::singleShot(100, this, TQT_SLOT(slotClear())); + TQTimer::singleShot(100, this, TQ_SLOT(slotClear())); return; } diff --git a/kicker/kicker/ui/service_mnu.h b/kicker/kicker/ui/service_mnu.h index 9cbfaa068..be4d47332 100644 --- a/kicker/kicker/ui/service_mnu.h +++ b/kicker/kicker/ui/service_mnu.h @@ -48,9 +48,9 @@ typedef TQValueVector<TQPopupMenu*> PopupMenuList; class PanelServiceMenu; typedef TQMap<PanelServiceMenu*,int> PanelServiceMenuMap; -class KDE_EXPORT PanelServiceMenu : public KPanelMenu +class TDE_EXPORT PanelServiceMenu : public KPanelMenu { - Q_OBJECT + TQ_OBJECT public: PanelServiceMenu(const TQString & label, const TQString & relPath, diff --git a/kicker/libkicker/appletinfo.cpp b/kicker/libkicker/appletinfo.cpp index 4a851df55..0e8b70994 100644 --- a/kicker/libkicker/appletinfo.cpp +++ b/kicker/libkicker/appletinfo.cpp @@ -22,7 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ #include <tqfileinfo.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <tdeapplication.h> #include "appletinfo.h" @@ -53,7 +53,7 @@ AppletInfo::AppletInfo( const TQString& deskFile, const TQString& configFile, co break; } - KDesktopFile df(m_desktopFile, true, resource); + TDEDesktopFile df(m_desktopFile, true, resource); // set the appletssimple attributes setName(df.readName()); @@ -81,7 +81,7 @@ AppletInfo::AppletInfo( const TQString& deskFile, const TQString& configFile, co else { m_configFile.append("_") - .append(kapp->randomString(20).lower()) + .append(tdeApp->randomString(20).lower()) .append("_rc"); } } diff --git a/kicker/libkicker/appletinfo.h b/kicker/libkicker/appletinfo.h index f89bb6aea..343c8eae5 100644 --- a/kicker/libkicker/appletinfo.h +++ b/kicker/libkicker/appletinfo.h @@ -29,9 +29,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqstring.h> #include <tqvaluevector.h> -#include <kdemacros.h> +#include <tdemacros.h> -class KDE_EXPORT AppletInfo +class TDE_EXPORT AppletInfo { public: typedef TQValueVector<AppletInfo> List; diff --git a/kicker/libkicker/global.cpp b/kicker/libkicker/global.cpp index 62f7f055a..b9c7a6960 100644 --- a/kicker/libkicker/global.cpp +++ b/kicker/libkicker/global.cpp @@ -31,9 +31,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kiconeffect.h> #include <kiconloader.h> #include <tdeio/netaccess.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kservice.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include "global.h" #include "kickerSettings.h" @@ -114,19 +114,19 @@ KPanelApplet::Direction arrowToDirection(TQt::ArrowType p) { switch (p) { - case Qt::DownArrow: + case TQt::DownArrow: return KPanelApplet::Down; break; - case Qt::LeftArrow: + case TQt::LeftArrow: return KPanelApplet::Left; break; - case Qt::RightArrow: + case TQt::RightArrow: return KPanelApplet::Right; break; - case Qt::UpArrow: + case TQt::UpArrow: default: return KPanelApplet::Up; break; @@ -161,7 +161,7 @@ int maxButtonDim() int maxDim; //return (2 * KickerSettings::iconMargin()) + TDEIcon::SizeLarge; - KSimpleConfig *kickerconfig = new KSimpleConfig( TQString::fromLatin1( "kickerrc" )); + TDESimpleConfig *kickerconfig = new TDESimpleConfig( TQString::fromLatin1( "kickerrc" )); kickerconfig->setGroup("General"); maxDim = (2 * KickerSettings::iconMargin()) + kickerconfig->readNumEntry("panelIconWidth", TDEIcon::SizeLarge);; delete kickerconfig; @@ -464,20 +464,15 @@ TQIconSet menuIconSet(const TQString& icon) void drawBlendedRect(TQPainter *p, const TQRect &r, const TQColor &color, int alpha) { static TQPixmap pix; - static TQColor last_color = Qt::black; + static TQColor last_color = TQt::black; static int last_alpha = 0; if (pix.isNull() || last_color != color || last_alpha != alpha) { TQImage img(16, 16, 32); -#ifdef USE_QT4 + img.setAlphaBuffer(false); + img.fill(((uint)(alpha & 0xFF) << 24) | (color.rgb() & 0xFFFFFF)); img.setAlphaBuffer(true); - img.fill(((uint)(alpha & 0xFF) << 24) | (color.rgb() & 0xFFFFFF)); -#else // USE_QT4 - img.setAlphaBuffer(false); - img.fill(((uint)(alpha & 0xFF) << 24) | (color.rgb() & 0xFFFFFF)); - img.setAlphaBuffer(true); -#endif // USE_QT4 pix.convertFromImage(img); last_color = color; last_alpha = alpha; diff --git a/kicker/libkicker/global.h b/kicker/libkicker/global.h index 663987174..6520d55c8 100644 --- a/kicker/libkicker/global.h +++ b/kicker/libkicker/global.h @@ -37,38 +37,38 @@ namespace KickerLib /* * Functions to convert between various enums */ -KDE_EXPORT KPanelExtension::Position directionToPosition(KPanelApplet::Direction d); -KDE_EXPORT KPanelExtension::Position directionToPopupPosition(KPanelApplet::Direction d); -KDE_EXPORT KPanelApplet::Direction positionToDirection(KPanelExtension::Position p); -KDE_EXPORT KPanelApplet::Direction arrowToDirection(TQt::ArrowType p); -KDE_EXPORT int sizeValue(KPanelExtension::Size s); +TDE_EXPORT KPanelExtension::Position directionToPosition(KPanelApplet::Direction d); +TDE_EXPORT KPanelExtension::Position directionToPopupPosition(KPanelApplet::Direction d); +TDE_EXPORT KPanelApplet::Direction positionToDirection(KPanelExtension::Position p); +TDE_EXPORT KPanelApplet::Direction arrowToDirection(TQt::ArrowType p); +TDE_EXPORT int sizeValue(KPanelExtension::Size s); /** * Pixel sizes for but sizes and margins */ -KDE_EXPORT int maxButtonDim(); +TDE_EXPORT int maxButtonDim(); /** * Tint the image to reflect the current color scheme * Used, for instance, by KMenu side bar */ -KDE_EXPORT void colorize(TQImage& image); +TDE_EXPORT void colorize(TQImage& image); /** * Blend a color rectangle on a painter */ -KDE_EXPORT void drawBlendedRect(TQPainter *p, const TQRect &r, const TQColor &color = Qt::black, int alpha = 0x40); +TDE_EXPORT void drawBlendedRect(TQPainter *p, const TQRect &r, const TQColor &color = TQt::black, int alpha = 0x40); /** * Blend two colours together to get a colour halfway in between */ -KDE_EXPORT TQColor blendColors(const TQColor& c1, const TQColor& c2); +TDE_EXPORT TQColor blendColors(const TQColor& c1, const TQColor& c2); /** * Create or copy .desktop files for use in kicker safely and easily */ -KDE_EXPORT TQString copyDesktopFile(const KURL&url); -KDE_EXPORT TQString newDesktopFile(const KURL&url); +TDE_EXPORT TQString copyDesktopFile(const KURL&url); +TDE_EXPORT TQString newDesktopFile(const KURL&url); /** @@ -80,7 +80,7 @@ KDE_EXPORT TQString newDesktopFile(const KURL&url); * This function checks whether that is the case and returns either the * original menu or the sub-menu when appropriate. */ -KDE_EXPORT TQPopupMenu *reduceMenu(TQPopupMenu *); +TDE_EXPORT TQPopupMenu *reduceMenu(TQPopupMenu *); /** @@ -88,7 +88,7 @@ KDE_EXPORT TQPopupMenu *reduceMenu(TQPopupMenu *); * direction, the size of the menu, the widget geometry, and a optional * point in the local coordinates of the widget. */ -KDE_EXPORT TQPoint popupPosition(KPanelApplet::Direction d, +TDE_EXPORT TQPoint popupPosition(KPanelApplet::Direction d, const TQWidget* popup, const TQWidget* source, const TQPoint& offset = TQPoint(0, 0)); @@ -97,7 +97,7 @@ KDE_EXPORT TQPoint popupPosition(KPanelApplet::Direction d, * Calculate an acceptable inverse of the given color wich will be used * as the shadow color. */ -KDE_EXPORT TQColor shadowColor(const TQColor& c); +TDE_EXPORT TQColor shadowColor(const TQColor& c); /** * Get an appropriate for a menu in Plasma. As the user may set this size @@ -105,7 +105,7 @@ KDE_EXPORT TQColor shadowColor(const TQColor& c); * @param icon the name of icon requested * @return the icon set for the requested icon */ -KDE_EXPORT TQIconSet menuIconSet(const TQString& icon); +TDE_EXPORT TQIconSet menuIconSet(const TQString& icon); } diff --git a/kicker/libkicker/kickerSettings.kcfg b/kicker/libkicker/kickerSettings.kcfg index 5ab6880aa..9c38534c5 100644 --- a/kicker/libkicker/kickerSettings.kcfg +++ b/kicker/libkicker/kickerSettings.kcfg @@ -44,8 +44,8 @@ </entry> <entry name="MenubarPanelBlurred" type="Bool" > - <label>Enable blurring for menubar panel</label> - <whatsthis>When this option is enabled, the panel containing the menubar will blur pseudo-transparent image</whatsthis> + <label>Enable blurring for menubar panel (deprecated)</label> + <whatsthis>This option is deprecated, use MenubarPanelBlur</whatsthis> <default>false</default> </entry> @@ -79,6 +79,14 @@ <max>100</max> </entry> +<entry name="BlurValue" type="Int" > + <label>Blur strength</label> + <whatsthis>Set blur effect strenght for the panel. Set to 0 to disable blur.</whatsthis> + <default>0</default> + <min>0</min> + <max>10</max> + </entry> + <entry name="TintColor" type="Color" > <label>The tint color used to colorize transparent panels</label> <default code="true">(TQApplication::palette().active().mid())</default> @@ -316,7 +324,7 @@ <entry name="KMenuTileColor" type="Color" > <label>Color to use for Kmenu button background</label> - <default code="true">QColor()</default> + <default code="true">TQColor()</default> </entry> <entry name="DesktopButtonTile" type="Path" > @@ -325,7 +333,7 @@ <entry name="DesktopButtonTileColor" type="Color" > <label>Color to use for Kmenu button background</label> - <default code="true">QColor()</default> + <default code="true">TQColor()</default> </entry> <entry name="URLTile" type="Path" > @@ -334,7 +342,7 @@ <entry name="URLTileColor" type="Color" > <label>Color to use for Application, URL and special button backgrounds</label> - <default code="true">QColor()</default> + <default code="true">TQColor()</default> </entry> <entry name="BrowserTile" type="Path" > @@ -343,7 +351,7 @@ <entry name="BrowserTileColor" type="Color" > <label>Color to use for Browser button background</label> - <default code="true">QColor()</default> + <default code="true">TQColor()</default> </entry> <entry name="WindowListTile" type="Path" > @@ -352,7 +360,7 @@ <entry name="WindowListTileColor" type="Color" > <label>Color to use for Window List button background</label> - <default code="true">QColor()</default> + <default code="true">TQColor()</default> </entry> </group> @@ -416,7 +424,12 @@ <entry name="CustomKMenuIcon" key="CustomIcon" type="Path" > <label>Custom TDE Menu Button Icon</label> - <default code="true">QString("kmenu")</default> + <default code="true">TQString("kmenu")</default> + </entry> + + <entry name="SearchShortcut" type="String" > + <label>Search shortcut</label> + <default>/</default> </entry> </group> diff --git a/kicker/libkicker/kickerSettings.kcfgc b/kicker/libkicker/kickerSettings.kcfgc index 8e0b42d93..1ac8fa567 100644 --- a/kicker/libkicker/kickerSettings.kcfgc +++ b/kicker/libkicker/kickerSettings.kcfgc @@ -2,7 +2,7 @@ File=kickerSettings.kcfg Singleton=true ClassName=KickerSettings Mutators=true -Visibility=KDE_EXPORT +Visibility=TDE_EXPORT IncludeFiles=tqapplication.h GlobalEnums=true MemberVariables=dpointer diff --git a/kicker/libkicker/kickertip.cpp b/kicker/libkicker/kickertip.cpp index 0a6000f37..d0aab24de 100644 --- a/kicker/libkicker/kickertip.cpp +++ b/kicker/libkicker/kickertip.cpp @@ -76,13 +76,13 @@ KickerTip::KickerTip(TQWidget * parent) m_timer(0, "KickerTip::m_timer"), m_frameTimer(0, "KickerTip::m_frameTimer") { - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); setBackgroundMode(NoBackground); resize(0, 0); hide(); - connect(&m_frameTimer, TQT_SIGNAL(timeout()), TQT_SLOT(internalUpdate())); + connect(&m_frameTimer, TQ_SIGNAL(timeout()), TQ_SLOT(internalUpdate())); // // FIXME: The settingsChanged(SettingsCategory) signal is not available under Trinity; where was it originally supposed to come from? -// connect(kapp, TQT_SIGNAL(settingsChanged(SettingsCategory)), TQT_SLOT(slotSettingsChanged())); +// connect(tdeApp, TQ_SIGNAL(settingsChanged(SettingsCategory)), TQ_SLOT(slotSettingsChanged())); } KickerTip::~KickerTip() @@ -176,8 +176,8 @@ void KickerTip::display() // close the message window after given mS if (data.duration > 0) { - disconnect(&m_timer, TQT_SIGNAL(timeout()), 0, 0); - connect(&m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(hide())); + disconnect(&m_timer, TQ_SIGNAL(timeout()), 0, 0); + connect(&m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(hide())); m_timer.start(data.duration, true); } else @@ -283,10 +283,10 @@ void KickerTip::plainMask() { TQPainter maskPainter(&m_mask); - m_mask.fill(Qt::color0); + m_mask.fill(TQt::color0); - maskPainter.setBrush(Qt::color1); - maskPainter.setPen(Qt::NoPen); + maskPainter.setBrush(TQt::color1); + maskPainter.setPen(TQt::NoPen); //maskPainter.drawRoundRect(m_mask.rect(), 1600 / m_mask.rect().width(), 1600 / m_mask.rect().height()); drawRoundRect(maskPainter, m_mask.rect()); setMask(m_mask); @@ -297,10 +297,10 @@ void KickerTip::dissolveMask() { TQPainter maskPainter(&m_mask); - m_mask.fill(Qt::color0); + m_mask.fill(TQt::color0); - maskPainter.setBrush(Qt::color1); - maskPainter.setPen(Qt::NoPen); + maskPainter.setBrush(TQt::color1); + maskPainter.setPen(TQt::NoPen); //maskPainter.drawRoundRect(m_mask.rect(), 1600 / m_mask.rect().width(), 1600 / m_mask.rect().height()); drawRoundRect(maskPainter, m_mask.rect()); @@ -424,16 +424,16 @@ void KickerTip::tipFor(const TQWidget* w) { if (m_tippingFor) { - disconnect(m_tippingFor, TQT_SIGNAL(destroyed(TQObject*)), - this, TQT_SLOT(tipperDestroyed(TQObject*))); + disconnect(m_tippingFor, TQ_SIGNAL(destroyed(TQObject*)), + this, TQ_SLOT(tipperDestroyed(TQObject*))); } m_tippingFor = w; if (m_tippingFor) { - connect(m_tippingFor, TQT_SIGNAL(destroyed(TQObject*)), - this, TQT_SLOT(tipperDestroyed(TQObject*))); + connect(m_tippingFor, TQ_SIGNAL(destroyed(TQObject*)), + this, TQ_SLOT(tipperDestroyed(TQObject*))); } } @@ -452,7 +452,7 @@ void KickerTip::tipperDestroyed(TQObject* o) { // we can't do a dynamic cast because we are in the process of dying // so static it is. - untipFor(TQT_TQWIDGET(o)); + untipFor(static_cast<TQWidget*>(o)); } void KickerTip::internalUpdate() @@ -508,7 +508,7 @@ bool KickerTip::eventFilter(TQObject *object, TQEvent *event) return false; } - TQWidget *widget = TQT_TQWIDGET(object); + TQWidget *widget = static_cast<TQWidget*>(object); switch (event->type()) { @@ -526,8 +526,8 @@ bool KickerTip::eventFilter(TQObject *object, TQEvent *event) tipFor(widget); m_timer.stop(); - disconnect(&m_timer, TQT_SIGNAL(timeout()), 0, 0); - connect(&m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(display())); + disconnect(&m_timer, TQ_SIGNAL(timeout()), 0, 0); + connect(&m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(display())); // delay to avoid false starts // e.g. when the user quickly zooms their mouse over @@ -547,8 +547,8 @@ bool KickerTip::eventFilter(TQObject *object, TQEvent *event) if (isTippingFor(widget) && isVisible()) { - disconnect(&m_timer, TQT_SIGNAL(timeout()), 0, 0); - connect(&m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(hide())); + disconnect(&m_timer, TQ_SIGNAL(timeout()), 0, 0); + connect(&m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(hide())); m_timer.start(KickerSettings::mouseOversHideDelay(), true); } diff --git a/kicker/libkicker/kickertip.h b/kicker/libkicker/kickertip.h index b7332967f..bcc956eee 100644 --- a/kicker/libkicker/kickertip.h +++ b/kicker/libkicker/kickertip.h @@ -38,9 +38,9 @@ class TQPaintEvent; class TQSimpleRichText; class TQTimer; -class KDE_EXPORT KickerTip : public TQWidget +class TDE_EXPORT KickerTip : public TQWidget { - Q_OBJECT + TQ_OBJECT public: enum MaskEffect { Plain, Dissolve }; @@ -58,7 +58,7 @@ public: TQMimeSourceFactory* mimeFactory; }; - class KDE_EXPORT Client + class TDE_EXPORT Client { public: virtual void updateKickerTip(KickerTip::Data&) = 0; diff --git a/kicker/libkicker/kshadowengine.cpp b/kicker/libkicker/kshadowengine.cpp index a933026d5..76f1b9d87 100644 --- a/kicker/libkicker/kshadowengine.cpp +++ b/kicker/libkicker/kshadowengine.cpp @@ -236,7 +236,7 @@ void KTextShadowEngine::drawText(TQPainter &p, const TQRect &tr, int tf, const T // draw text pixPainter.begin(&textPixmap); - pixPainter.setPen(Qt::white); + pixPainter.setPen(TQt::white); pixPainter.setFont(p.font()); // get the font from the root painter pixPainter.drawText(tr, tf, str); pixPainter.end(); diff --git a/kicker/libkicker/kshadowengine.h b/kicker/libkicker/kshadowengine.h index 1ddc093ff..ae423d0bc 100644 --- a/kicker/libkicker/kshadowengine.h +++ b/kicker/libkicker/kshadowengine.h @@ -28,7 +28,7 @@ #include <tqimage.h> #include <tqcolor.h> -#include <kdemacros.h> +#include <tdemacros.h> class KShadowSettings; @@ -40,7 +40,7 @@ class KShadowSettings; * @author laur.ivan@corvil.com * @since 3.2 */ -class KDE_EXPORT KShadowEngine +class TDE_EXPORT KShadowEngine { public: /// Creates a new shadow engine. @@ -112,7 +112,7 @@ private: void *d; }; -class KDE_EXPORT KTextShadowEngine : public KShadowEngine +class TDE_EXPORT KTextShadowEngine : public KShadowEngine { public: KTextShadowEngine(); diff --git a/kicker/libkicker/kshadowsettings.h b/kicker/libkicker/kshadowsettings.h index e222b964d..a328fd8bd 100644 --- a/kicker/libkicker/kshadowsettings.h +++ b/kicker/libkicker/kshadowsettings.h @@ -22,7 +22,7 @@ #ifndef __FX_DATA #define __FX_DATA -#include <kdemacros.h> +#include <tdemacros.h> #define SHADOW_CONFIG_ENTRY TQString("ShadowParameters") #define SHADOW_TEXT_COLOR TQString("ShadowTextColor") @@ -41,7 +41,7 @@ * @author laur.ivan@corvil.com * @since 3.2 */ -class KDE_EXPORT KShadowSettings +class TDE_EXPORT KShadowSettings { public: /** diff --git a/kicker/libkicker/menuinfo.cpp b/kicker/libkicker/menuinfo.cpp index a8e4bf1fa..9e275f90c 100644 --- a/kicker/libkicker/menuinfo.cpp +++ b/kicker/libkicker/menuinfo.cpp @@ -27,25 +27,25 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqwidget.h> #include <tdeapplication.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <klibloader.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kpanelmenu.h> #include <tdeparts/componentfactory.h> MenuInfo::MenuInfo(const TQString& desktopFile) { - KSimpleConfig df(locate("data", TQString::fromLatin1("kicker/menuext/%1").arg(desktopFile))); + TDESimpleConfig df(locate("data", TQString::fromLatin1("kicker/menuext/%1").arg(desktopFile))); df.setGroup("Desktop Entry"); TQStringList list = df.readListEntry("X-TDE-AuthorizeAction"); - if (kapp && !list.isEmpty()) + if (tdeApp && !list.isEmpty()) { for(TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) { - if (!kapp->authorize((*it).stripWhiteSpace())) + if (!tdeApp->authorize((*it).stripWhiteSpace())) return; } } @@ -64,5 +64,5 @@ KPanelMenu* MenuInfo::load(TQWidget *parent, const char *name) return KParts::ComponentFactory::createInstanceFromLibrary<KPanelMenu>( TQFile::encodeName( library_ ), - TQT_TQOBJECT(parent), name ); + parent, name ); } diff --git a/kicker/libkicker/menuinfo.h b/kicker/libkicker/menuinfo.h index 5925d4826..8b5917992 100644 --- a/kicker/libkicker/menuinfo.h +++ b/kicker/libkicker/menuinfo.h @@ -26,12 +26,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqstring.h> -#include <kdemacros.h> +#include <tdemacros.h> class KPanelMenu; class TQWidget; -class KDE_EXPORT MenuInfo +class TDE_EXPORT MenuInfo { public: MenuInfo(const TQString& desktopFile); diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp index aaac124c2..42e5286e2 100644 --- a/kicker/libkicker/panelbutton.cpp +++ b/kicker/libkicker/panelbutton.cpp @@ -43,7 +43,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kicontheme.h> #include <kiconeffect.h> #include <kipc.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <kdebug.h> @@ -74,7 +74,7 @@ PanelButton::PanelButton( TQWidget* parent, const char* name, bool forceStandard m_arrowDirection(KPanelExtension::Bottom), m_popupDirection(KPanelApplet::Up), m_iconAlignment(AlignCenter), - m_orientation(Qt::Horizontal), + m_orientation(TQt::Horizontal), m_size((TDEIcon::StdSizes)-1), m_fontPercent(0.40), m_forceStandardCursor(forceStandardCursor) @@ -89,12 +89,12 @@ PanelButton::PanelButton( TQWidget* parent, const char* name, bool forceStandard updateSettings(TDEApplication::SETTINGS_MOUSE); - kapp->addKipcEventMask(KIPC::SettingsChanged | KIPC::IconChanged); + tdeApp->addKipcEventMask(KIPC::SettingsChanged | KIPC::IconChanged); installEventFilter(KickerTip::the()); - connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(updateSettings(int))); - connect(kapp, TQT_SIGNAL(iconChanged(int)), TQT_SLOT(updateIcon(int))); + connect(tdeApp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(updateSettings(int))); + connect(tdeApp, TQ_SIGNAL(iconChanged(int)), TQ_SLOT(updateIcon(int))); } void PanelButton::configure() @@ -196,7 +196,7 @@ void PanelButton::setPopupDirection(KPanelApplet::Direction d) setArrowDirection(KickerLib::directionToPopupPosition(d)); } -void PanelButton::setIconAlignment(TQ_Alignment align) +void PanelButton::setIconAlignment(TQt::AlignmentFlags align) { m_iconAlignment = align; update(); @@ -225,10 +225,10 @@ void PanelButton::updateSettings(int category) return; } - if (m_forceStandardCursor == FALSE) + if (!m_forceStandardCursor) m_changeCursorOverItem = TDEGlobalSettings::changeCursorOverIcon(); else - m_changeCursorOverItem = FALSE; + m_changeCursorOverItem = false; if (m_changeCursorOverItem) { @@ -245,7 +245,7 @@ void PanelButton::checkForDeletion(const TQString& path) if (path == m_backingFile) { setEnabled(false); - TQTimer::singleShot(1000, this, TQT_SLOT(scheduleForRemoval())); + TQTimer::singleShot(1000, this, TQ_SLOT(scheduleForRemoval())); } } @@ -278,7 +278,7 @@ void PanelButton::scheduleForRemoval() } timelapse *= 2; - TQTimer::singleShot(timelapse, this, TQT_SLOT(scheduleForRemoval())); + TQTimer::singleShot(timelapse, this, TQ_SLOT(scheduleForRemoval())); } } @@ -305,7 +305,7 @@ int PanelButton::widthForHeight(int height) const // we only paint the text when horizontal, so make sure we're horizontal // before adding the text in here - if (orientation() == Qt::Horizontal && !m_buttonText.isEmpty()) + if (orientation() == TQt::Horizontal && !m_buttonText.isEmpty()) { TQFont f(font()); //f.setPixelSize(KMIN(height, KMAX(int(float(height) * m_fontPercent), 16))); @@ -436,7 +436,7 @@ void PanelButton::startDrag() void PanelButton::enterEvent(TQEvent* e) { - if (!m_highlight && m_disableHighlighting == FALSE) + if (!m_highlight && !m_disableHighlighting) { m_highlight = true; repaint(false); @@ -483,7 +483,7 @@ void PanelButton::dropEvent(TQDropEvent* e) void PanelButton::mouseMoveEvent(TQMouseEvent *e) { - if (!m_isLeftMouseButtonDown || (e->state() & Qt::LeftButton) == 0) + if (!m_isLeftMouseButtonDown || (e->state() & TQt::LeftButton) == 0) { return; } @@ -501,7 +501,7 @@ void PanelButton::mouseMoveEvent(TQMouseEvent *e) void PanelButton::mousePressEvent(TQMouseEvent *e) { - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) { m_lastLeftMouseButtonPress = e->pos(); m_isLeftMouseButtonDown = true; @@ -511,7 +511,7 @@ void PanelButton::mousePressEvent(TQMouseEvent *e) void PanelButton::mouseReleaseEvent(TQMouseEvent *e) { - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) { m_isLeftMouseButtonDown = false; @@ -540,7 +540,7 @@ void PanelButton::drawButton(TQPainter *p) if (m_tileColor.isValid()) { p->fillRect(rect(), m_tileColor); - style().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup()); + style().drawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup()); } else if (paletteBackgroundPixmap()) { @@ -560,7 +560,7 @@ void PanelButton::drawButton(TQPainter *p) else if (isDown() || isOn()) { // Draw shapes to indicate the down state. - style().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup(), TQStyle::Style_Sunken); + style().drawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup(), TQStyle::Style_Sunken); } drawButtonLabel(p); @@ -568,9 +568,9 @@ void PanelButton::drawButton(TQPainter *p) if (hasFocus() || m_hasAcceptedDrag) { int x1, y1, x2, y2; - TQT_TQRECT_OBJECT(rect()).coords(&x1, &y1, &x2, &y2); + rect().coords(&x1, &y1, &x2, &y2); TQRect r(x1+2, y1+2, x2-x1-3, y2-y1-3); - style().tqdrawPrimitive(TQStyle::PE_FocusRect, p, r, colorGroup(), + style().drawPrimitive(TQStyle::PE_FocusRect, p, r, colorGroup(), TQStyle::Style_Default, colorGroup().button()); } } @@ -582,7 +582,7 @@ void PanelButton::drawDeepButton(TQPainter *p) if (m_tileColor.isValid()) { p->fillRect(rect(), m_tileColor); - style().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup()); + style().drawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup()); } else if (paletteBackgroundPixmap()) { @@ -596,27 +596,27 @@ void PanelButton::drawDeepButton(TQPainter *p) TQRect btn_rect = TQRect(rect().x(), rect().y()+1, rect().width(), rect().height()-2); if (isDown() || isOn()) { - style().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, colorGroup(), TQStyle::Style_Down); + style().drawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, colorGroup(), TQStyle::Style_Down); } else { - style().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, colorGroup(), TQStyle::Style_Raised); + style().drawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, colorGroup(), TQStyle::Style_Raised); } - drawButtonLabel(p,0,FALSE); + drawButtonLabel(p,0,false); if (hasFocus() || m_hasAcceptedDrag) { int x1, y1, x2, y2; - TQT_TQRECT_OBJECT(rect()).coords(&x1, &y1, &x2, &y2); + rect().coords(&x1, &y1, &x2, &y2); TQRect r(x1+2, y1+2, x2-x1-3, y2-y1-3); - style().tqdrawPrimitive(TQStyle::PE_FocusRect, p, r, colorGroup(), + style().drawPrimitive(TQStyle::PE_FocusRect, p, r, colorGroup(), TQStyle::Style_Default, colorGroup().button()); } } void PanelButton::drawButtonLabel(TQPainter *p) { - drawButtonLabel(p,0,TRUE); + drawButtonLabel(p,0,true); } void PanelButton::drawButtonLabel(TQPainter *p, int voffset, bool drawArrow) @@ -645,7 +645,7 @@ void PanelButton::drawButtonLabel(TQPainter *p, int voffset, bool drawArrow) else if (m_iconAlignment & AlignBottom) y = (height() - icon.height()); - if (!m_buttonText.isEmpty() && orientation() == Qt::Horizontal) + if (!m_buttonText.isEmpty() && orientation() == TQt::Horizontal) { int h = height(); int w = width(); @@ -749,7 +749,7 @@ void PanelButton::drawButtonLabel(TQPainter *p, int voffset, bool drawArrow) r = TQRect(0, (height() - arrowSize)/2, arrowSize, arrowSize); break; case KPanelExtension::Floating: - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { e = TQStyle::PE_ArrowDown; r.moveBy(0, height() - arrowSize); @@ -772,7 +772,7 @@ void PanelButton::drawButtonLabel(TQPainter *p, int voffset, bool drawArrow) { flags |= TQStyle::Style_Down; } - style().tqdrawPrimitive(e, p, r, colorGroup(), flags); + style().drawPrimitive(e, p, r, colorGroup(), flags); } } @@ -795,7 +795,7 @@ int PanelButton::preferredIconSize(int proposed_size) const if (proposed_size < 0) { - proposed_size = (orientation() == Qt::Horizontal) ? height() : width(); + proposed_size = (orientation() == TQt::Horizontal) ? height() : width(); } // determine the upper limit on the size. Normally, this is panelSize, @@ -833,16 +833,16 @@ void PanelButton::backedByFile(const TQString& localFilePath) } // avoid multiple connections - disconnect(KDirWatch::self(), TQT_SIGNAL(deleted(const TQString&)), - this, TQT_SLOT(checkForDeletion(const TQString&))); + disconnect(KDirWatch::self(), TQ_SIGNAL(deleted(const TQString&)), + this, TQ_SLOT(checkForDeletion(const TQString&))); if (!KDirWatch::self()->contains(m_backingFile)) { KDirWatch::self()->addFile(m_backingFile); } - connect(KDirWatch::self(), TQT_SIGNAL(deleted(const TQString&)), - this, TQT_SLOT(checkForDeletion(const TQString&))); + connect(KDirWatch::self(), TQ_SIGNAL(deleted(const TQString&)), + this, TQ_SLOT(checkForDeletion(const TQString&))); } @@ -966,7 +966,7 @@ PanelPopupButton::PanelPopupButton(TQWidget *parent, const char *name, bool forc m_pressedDuringPopup(false), m_initialized(false) { - connect(this, TQT_SIGNAL(pressed()), TQT_SLOT(slotExecMenu())); + connect(this, TQ_SIGNAL(pressed()), TQ_SLOT(slotExecMenu())); } void PanelPopupButton::setPopup(TQWidget *popup) @@ -974,7 +974,7 @@ void PanelPopupButton::setPopup(TQWidget *popup) if (m_popup) { m_popup->removeEventFilter(this); - disconnect(m_popup, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(menuAboutToHide())); + disconnect(m_popup, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(menuAboutToHide())); } m_popup = popup; @@ -983,7 +983,7 @@ void PanelPopupButton::setPopup(TQWidget *popup) if (m_popup) { m_popup->installEventFilter(this); - connect(m_popup, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(menuAboutToHide())); + connect(m_popup, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(menuAboutToHide())); } } @@ -996,8 +996,8 @@ bool PanelPopupButton::eventFilter(TQObject *, TQEvent *e) { if (e->type() == TQEvent::MouseMove) { - TQMouseEvent *me = TQT_TQMOUSEEVENT(e); - if (TQT_TQRECT_OBJECT(rect()).contains(mapFromGlobal(me->globalPos())) && + TQMouseEvent *me = static_cast<TQMouseEvent*>(e); + if (rect().contains(mapFromGlobal(me->globalPos())) && ((me->state() & ControlButton) != 0 || (me->state() & ShiftButton) != 0)) { @@ -1008,8 +1008,8 @@ bool PanelPopupButton::eventFilter(TQObject *, TQEvent *e) else if (e->type() == TQEvent::MouseButtonPress || e->type() == TQEvent::MouseButtonDblClick) { - TQMouseEvent *me = TQT_TQMOUSEEVENT(e); - if (TQT_TQRECT_OBJECT(rect()).contains(mapFromGlobal(me->globalPos()))) + TQMouseEvent *me = static_cast<TQMouseEvent*>(e); + if (rect().contains(mapFromGlobal(me->globalPos()))) { m_pressedDuringPopup = true; return true; @@ -1017,8 +1017,8 @@ bool PanelPopupButton::eventFilter(TQObject *, TQEvent *e) } else if (e->type() == TQEvent::MouseButtonRelease) { - TQMouseEvent *me = TQT_TQMOUSEEVENT(e); - if (TQT_TQRECT_OBJECT(rect()).contains(mapFromGlobal(me->globalPos()))) + TQMouseEvent *me = static_cast<TQMouseEvent*>(e); + if (rect().contains(mapFromGlobal(me->globalPos()))) { if (m_pressedDuringPopup && m_popup) { @@ -1057,8 +1057,8 @@ void PanelPopupButton::slotExecMenu() m_pressedDuringPopup = false; KickerTip::enableTipping(false); - kapp->syncX(); - kapp->processEvents(); + tdeApp->syncX(); + tdeApp->processEvents(); if (!m_initialized) { diff --git a/kicker/libkicker/panelbutton.h b/kicker/libkicker/panelbutton.h index 80b26f377..dda35d398 100644 --- a/kicker/libkicker/panelbutton.h +++ b/kicker/libkicker/panelbutton.h @@ -43,9 +43,9 @@ class KShadowEngine; * placed in Kicker's panels. It inherits TQButton, and * KickerTip::Client. */ -class KDE_EXPORT PanelButton: public TQButton, public KickerTip::Client +class TDE_EXPORT PanelButton: public TQButton, public KickerTip::Client { - Q_OBJECT + TQ_OBJECT public: /** @@ -53,7 +53,7 @@ public: * @param parent the parent widget * @param name the widget's name */ - PanelButton( TQWidget* parent, const char* name, bool forceStandardCursor = FALSE ); + PanelButton( TQWidget* parent, const char* name, bool forceStandardCursor = false ); /** * Configures this button according to the user's preferences for @@ -263,7 +263,7 @@ public slots: protected: - void setIconAlignment(TQ_Alignment align); + void setIconAlignment(TQt::AlignmentFlags align); /** * Subclasses must implement this to define the name of the button which is * used to identify this button for saving and loading. It must be unique @@ -406,7 +406,7 @@ private: TQPixmap m_iconz; // mouse over KPanelExtension::Position m_arrowDirection; KPanelApplet::Direction m_popupDirection; - TQ_Alignment m_iconAlignment; + TQt::AlignmentFlags m_iconAlignment; Orientation m_orientation; int m_size; double m_fontPercent; @@ -420,9 +420,9 @@ private: /** * Base class for panelbuttons which popup a menu */ -class KDE_EXPORT PanelPopupButton : public PanelButton +class TDE_EXPORT PanelPopupButton : public PanelButton { - Q_OBJECT + TQ_OBJECT public: /** @@ -430,7 +430,7 @@ public: * @param parent the parent widget * @param name the widget's name */ - PanelPopupButton(TQWidget *parent=0, const char *name=0, bool forceStandardCursor = FALSE); + PanelPopupButton(TQWidget *parent=0, const char *name=0, bool forceStandardCursor = false); /** * Sets the button's popup menu. diff --git a/kicker/libkicker/paneldrag.h b/kicker/libkicker/paneldrag.h index 6684c32c6..21bb879d3 100644 --- a/kicker/libkicker/paneldrag.h +++ b/kicker/libkicker/paneldrag.h @@ -26,13 +26,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqdragobject.h> -#include <kdemacros.h> +#include <tdemacros.h> #include "appletinfo.h" class BaseContainer; -class KDE_EXPORT PanelDrag : public TQDragObject +class TDE_EXPORT PanelDrag : public TQDragObject { public: PanelDrag(BaseContainer* container, TQWidget *dragSource); @@ -48,7 +48,7 @@ class KDE_EXPORT PanelDrag : public TQDragObject TQByteArray a; }; -class KDE_EXPORT AppletInfoDrag : public TQDragObject +class TDE_EXPORT AppletInfoDrag : public TQDragObject { public: AppletInfoDrag(const AppletInfo& container, TQWidget *dragSource); diff --git a/kicker/libkicker/panner.cpp b/kicker/libkicker/panner.cpp index ec06b30c9..0401cfcdc 100644 --- a/kicker/libkicker/panner.cpp +++ b/kicker/libkicker/panner.cpp @@ -46,7 +46,7 @@ Panner::Panner( TQWidget* parent, const char* name ) setBackgroundOrigin( AncestorOrigin ); _updateScrollButtonsTimer = new TQTimer(this); - connect(_updateScrollButtonsTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(reallyUpdateScrollButtons())); + connect(_updateScrollButtonsTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(reallyUpdateScrollButtons())); _clipper = new TQWidget(this); _clipper->setBackgroundOrigin(AncestorOrigin); @@ -57,7 +57,7 @@ Panner::Panner( TQWidget* parent, const char* name ) // layout _layout = new TQBoxLayout(this, TQBoxLayout::LeftToRight); _layout->addWidget(_clipper, 1); - setOrientation(Qt::Horizontal); + setOrientation(TQt::Horizontal); } Panner::~Panner() @@ -78,8 +78,8 @@ void Panner::createScrollButtons() _luSB->setMinimumSize(12, 12); _luSB->hide(); _layout->addWidget(_luSB); - connect(_luSB, TQT_SIGNAL(pressed()), TQT_SLOT(startScrollLeftUp())); - connect(_luSB, TQT_SIGNAL(released()), TQT_SLOT(stopScroll())); + connect(_luSB, TQ_SIGNAL(pressed()), TQ_SLOT(startScrollLeftUp())); + connect(_luSB, TQ_SIGNAL(released()), TQ_SLOT(stopScroll())); // right/down scroll button _rdSB = new SimpleArrowButton(this); @@ -88,8 +88,8 @@ void Panner::createScrollButtons() _rdSB->setMinimumSize(12, 12); _rdSB->hide(); _layout->addWidget(_rdSB); - connect(_rdSB, TQT_SIGNAL(pressed()), TQT_SLOT(startScrollRightDown())); - connect(_rdSB, TQT_SIGNAL(released()), TQT_SLOT(stopScroll())); + connect(_rdSB, TQ_SIGNAL(pressed()), TQ_SLOT(startScrollRightDown())); + connect(_rdSB, TQ_SIGNAL(released()), TQ_SLOT(stopScroll())); // set up the buttons setupButtons(); @@ -97,12 +97,12 @@ void Panner::createScrollButtons() void Panner::setupButtons() { - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { if (_luSB) { - _luSB->setArrowType(Qt::LeftArrow); - _rdSB->setArrowType(Qt::RightArrow); + _luSB->setArrowType(TQt::LeftArrow); + _rdSB->setArrowType(TQt::RightArrow); _luSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding)); _rdSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding)); TQToolTip::add(_luSB, i18n("Scroll left")); @@ -115,8 +115,8 @@ void Panner::setupButtons() { if (_luSB) { - _luSB->setArrowType(Qt::UpArrow); - _rdSB->setArrowType(Qt::DownArrow); + _luSB->setArrowType(TQt::UpArrow); + _rdSB->setArrowType(TQt::DownArrow); _luSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum)); _rdSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum)); TQToolTip::add(_luSB, i18n("Scroll up")); @@ -149,7 +149,7 @@ void Panner::resizeEvent( TQResizeEvent* ) void Panner::scrollRightDown() { - if(orientation() == Qt::Horizontal) // scroll right + if(orientation() == TQt::Horizontal) // scroll right scrollBy( _step, 0 ); else // scroll down scrollBy( 0, _step ); @@ -159,7 +159,7 @@ void Panner::scrollRightDown() void Panner::scrollLeftUp() { - if(orientation() == Qt::Horizontal) // scroll left + if(orientation() == TQt::Horizontal) // scroll left scrollBy( -_step, 0 ); else // scroll up scrollBy( 0, -_step ); @@ -170,7 +170,7 @@ void Panner::scrollLeftUp() void Panner::startScrollRightDown() { _scrollTimer = new TQTimer(this); - connect(_scrollTimer, TQT_SIGNAL(timeout()), TQT_SLOT(scrollRightDown())); + connect(_scrollTimer, TQ_SIGNAL(timeout()), TQ_SLOT(scrollRightDown())); _scrollTimer->start(50); _step = 8; scrollRightDown(); @@ -179,7 +179,7 @@ void Panner::startScrollRightDown() void Panner::startScrollLeftUp() { _scrollTimer = new TQTimer(this); - connect(_scrollTimer, TQT_SIGNAL(timeout()), TQT_SLOT(scrollLeftUp())); + connect(_scrollTimer, TQ_SIGNAL(timeout()), TQ_SLOT(scrollLeftUp())); _scrollTimer->start(50); _step = 8; scrollLeftUp(); @@ -197,7 +197,7 @@ void Panner::reallyUpdateScrollButtons() _updateScrollButtonsTimer->stop(); - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { delta = contentsWidth() - width(); } @@ -336,7 +336,7 @@ void Panner::ensureVisible( int x, int y, int xmargin, int ymargin ) bool Panner::eventFilter( TQObject *obj, TQEvent *e ) { - if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(_viewport) || TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(_clipper) ) + if ( obj == _viewport || obj == _clipper ) { switch ( e->type() ) { diff --git a/kicker/libkicker/panner.h b/kicker/libkicker/panner.h index 7ae68d096..6d73ba5a8 100644 --- a/kicker/libkicker/panner.h +++ b/kicker/libkicker/panner.h @@ -31,9 +31,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class TQBoxLayout; class TQTimer; -class KDE_EXPORT Panner : public TQWidget +class TDE_EXPORT Panner : public TQWidget { - Q_OBJECT + TQ_OBJECT public: Panner( TQWidget* parent, const char* name = 0 ); @@ -41,8 +41,8 @@ public: TQSize minimumSizeHint() const { return TQWidget::minimumSizeHint(); } - Qt::Orientation orientation() const { return _orient; } - virtual void setOrientation(Qt::Orientation orientation); + TQt::Orientation orientation() const { return _orient; } + virtual void setOrientation(TQt::Orientation orientation); TQWidget *viewport() const { return _viewport; } diff --git a/kicker/libkicker/simplebutton.cpp b/kicker/libkicker/simplebutton.cpp index 67c90b81a..6836e06eb 100644 --- a/kicker/libkicker/simplebutton.cpp +++ b/kicker/libkicker/simplebutton.cpp @@ -30,7 +30,7 @@ #include <kiconeffect.h> #include <kicontheme.h> #include <kipc.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "kickerSettings.h" @@ -42,18 +42,18 @@ SimpleButton::SimpleButton(TQWidget *parent, const char *name, bool forceStandardCursor) : TQButton(parent, name), m_highlight(false), - m_orientation(Qt::Horizontal), + m_orientation(TQt::Horizontal), m_forceStandardCursor(forceStandardCursor) { setBackgroundOrigin( AncestorOrigin ); - connect( kapp, TQT_SIGNAL( settingsChanged( int ) ), - TQT_SLOT( slotSettingsChanged( int ) ) ); - connect( kapp, TQT_SIGNAL( iconChanged( int ) ), - TQT_SLOT( slotIconChanged( int ) ) ); + connect( tdeApp, TQ_SIGNAL( settingsChanged( int ) ), + TQ_SLOT( slotSettingsChanged( int ) ) ); + connect( tdeApp, TQ_SIGNAL( iconChanged( int ) ), + TQ_SLOT( slotIconChanged( int ) ) ); - kapp->addKipcEventMask( KIPC::SettingsChanged ); - kapp->addKipcEventMask( KIPC::IconChanged ); + tdeApp->addKipcEventMask( KIPC::SettingsChanged ); + tdeApp->addKipcEventMask( KIPC::IconChanged ); slotSettingsChanged( TDEApplication::SETTINGS_MOUSE ); } @@ -65,7 +65,7 @@ void SimpleButton::setPixmap(const TQPixmap &pix) update(); } -void SimpleButton::setOrientation(Qt::Orientation orientation) +void SimpleButton::setOrientation(TQt::Orientation orientation) { m_orientation = orientation; update(); @@ -95,11 +95,11 @@ void SimpleButton::drawButton( TQPainter *p ) { TQRect r(0, 0, width(), height()); - if (m_disableHighlighting == TRUE) { + if (m_disableHighlighting) { if (m_highlight || isDown() || isOn()) { int flags = TQStyle::Style_Default | TQStyle::Style_Enabled; if (isDown() || isOn()) flags |= TQStyle::Style_Down; - style().tqdrawPrimitive(TQStyle::PE_ButtonTool, p, r, colorGroup(), flags); + style().drawPrimitive(TQStyle::PE_ButtonTool, p, r, colorGroup(), flags); } } @@ -115,13 +115,13 @@ void SimpleButton::drawButtonLabel( TQPainter *p ) TQPixmap pix = isEnabled() ? ((m_highlight&&(!m_disableHighlighting))? m_activeIcon : m_normalIcon) : m_disabledIcon; - if ((isOn() || isDown()) && (m_disableHighlighting == FALSE)) + if ((isOn() || isDown()) && !m_disableHighlighting) { pix = TQImage(pix.convertToImage()).smoothScale(pix.width() - 2, pix.height() - 2); } - if (m_disableHighlighting == TRUE) { + if (m_disableHighlighting) { pix = TQImage(pix.convertToImage()).smoothScale(pix.width() - 4, pix.height() - 4); } @@ -171,10 +171,10 @@ void SimpleButton::slotSettingsChanged(int category) } bool changeCursor; - if (m_forceStandardCursor == FALSE) + if (!m_forceStandardCursor) changeCursor = TDEGlobalSettings::changeCursorOverIcon(); else - changeCursor = FALSE; + changeCursor = false; if (changeCursor) { @@ -220,7 +220,7 @@ void SimpleButton::resizeEvent( TQResizeEvent * ) } -SimpleArrowButton::SimpleArrowButton(TQWidget *parent, Qt::ArrowType arrow, const char *name, bool forceStandardCursor) +SimpleArrowButton::SimpleArrowButton(TQWidget *parent, TQt::ArrowType arrow, const char *name, bool forceStandardCursor) : SimpleButton(parent, name, forceStandardCursor), m_forceStandardCursor(forceStandardCursor) { @@ -234,7 +234,7 @@ TQSize SimpleArrowButton::sizeHint() const return TQSize( 12, 12 ); } -void SimpleArrowButton::setArrowType(Qt::ArrowType a) +void SimpleArrowButton::setArrowType(TQt::ArrowType a) { if (_arrow != a) { @@ -243,7 +243,7 @@ void SimpleArrowButton::setArrowType(Qt::ArrowType a) } } -Qt::ArrowType SimpleArrowButton::arrowType() const +TQt::ArrowType SimpleArrowButton::arrowType() const { return _arrow; } @@ -255,15 +255,15 @@ void SimpleArrowButton::drawButton( TQPainter *p ) TQStyle::PrimitiveElement pe = TQStyle::PE_ArrowLeft; switch (_arrow) { - case Qt::LeftArrow: pe = TQStyle::PE_ArrowLeft; break; - case Qt::RightArrow: pe = TQStyle::PE_ArrowRight; break; - case Qt::UpArrow: pe = TQStyle::PE_ArrowUp; break; - case Qt::DownArrow: pe = TQStyle::PE_ArrowDown; break; + case TQt::LeftArrow: pe = TQStyle::PE_ArrowLeft; break; + case TQt::RightArrow: pe = TQStyle::PE_ArrowRight; break; + case TQt::UpArrow: pe = TQStyle::PE_ArrowUp; break; + case TQt::DownArrow: pe = TQStyle::PE_ArrowDown; break; } int flags = TQStyle::Style_Default | TQStyle::Style_Enabled; if (isDown() || isOn()) flags |= TQStyle::Style_Down; - style().tqdrawPrimitive(pe, p, r, colorGroup(), flags); + style().drawPrimitive(pe, p, r, colorGroup(), flags); if (m_forceStandardCursor) { SimpleButton::drawButton(p); @@ -285,5 +285,3 @@ void SimpleArrowButton::leaveEvent( TQEvent *e ) } #include "simplebutton.moc" - -// vim:ts=4:sw=4:et diff --git a/kicker/libkicker/simplebutton.h b/kicker/libkicker/simplebutton.h index bbfcbd79d..9a7dce4e8 100644 --- a/kicker/libkicker/simplebutton.h +++ b/kicker/libkicker/simplebutton.h @@ -24,16 +24,16 @@ #include <tqbutton.h> #include <tqpixmap.h> -#include <kdemacros.h> +#include <tdemacros.h> -class KDE_EXPORT SimpleButton : public TQButton +class TDE_EXPORT SimpleButton : public TQButton { - Q_OBJECT + TQ_OBJECT public: - SimpleButton(TQWidget *parent, const char *name = 0, bool forceStandardCursor = FALSE); + SimpleButton(TQWidget *parent, const char *name = 0, bool forceStandardCursor = false); void setPixmap(const TQPixmap &pix); - void setOrientation(Qt::Orientation orientaton); + void setOrientation(TQt::Orientation orientaton); TQSize sizeHint() const; TQSize minimumSizeHint() const; @@ -55,18 +55,18 @@ class KDE_EXPORT SimpleButton : public TQButton TQPixmap m_normalIcon; TQPixmap m_activeIcon; TQPixmap m_disabledIcon; - Qt::Orientation m_orientation; + TQt::Orientation m_orientation; bool m_forceStandardCursor; class SimpleButtonPrivate; SimpleButtonPrivate* d; }; -class KDE_EXPORT SimpleArrowButton: public SimpleButton +class TDE_EXPORT SimpleArrowButton: public SimpleButton { - Q_OBJECT + TQ_OBJECT public: - SimpleArrowButton(TQWidget *parent = 0, Qt::ArrowType arrow = Qt::UpArrow, const char *name = 0, bool forceStandardCursor = FALSE); + SimpleArrowButton(TQWidget *parent = 0, TQt::ArrowType arrow = TQt::UpArrow, const char *name = 0, bool forceStandardCursor = false); virtual ~SimpleArrowButton() {}; TQSize sizeHint() const; @@ -74,18 +74,16 @@ class KDE_EXPORT SimpleArrowButton: public SimpleButton virtual void enterEvent( TQEvent *e ); virtual void leaveEvent( TQEvent *e ); virtual void drawButton(TQPainter *p); - Qt::ArrowType arrowType() const; + TQt::ArrowType arrowType() const; public slots: - void setArrowType(Qt::ArrowType a); + void setArrowType(TQt::ArrowType a); private: - Qt::ArrowType _arrow; + TQt::ArrowType _arrow; bool m_forceStandardCursor; bool _inside; }; #endif // HIDEBUTTON_H - -// vim:ts=4:sw=4:et diff --git a/kicker/menuext/find/CMakeLists.txt b/kicker/menuext/find/CMakeLists.txt index d4cf03be0..4dce14ac9 100644 --- a/kicker/menuext/find/CMakeLists.txt +++ b/kicker/menuext/find/CMakeLists.txt @@ -21,8 +21,17 @@ link_directories( ##### other data ################################ -install( FILES find.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/menuext ) -install( FILES kfind.desktop websearch.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/menuext/find ) +tde_create_translated_desktop( + SOURCE find.desktop + DESTINATION ${DATA_INSTALL_DIR}/kicker/menuext + PO_DIR kicker-desktops +) + +tde_create_translated_desktop( + SOURCE kfind.desktop websearch.desktop + DESTINATION ${DATA_INSTALL_DIR}/kicker/menuext/find + PO_DIR kicker-desktops +) ##### kickermenu_find (module) ################## diff --git a/kicker/menuext/find/find.desktop b/kicker/menuext/find/find.desktop index dafdbc9ed..2e59b59bf 100644 --- a/kicker/menuext/find/find.desktop +++ b/kicker/menuext/find/find.desktop @@ -1,133 +1,7 @@ [Desktop Entry] Name=Find -Name[af]=Soek -Name[ar]=إبحث -Name[az]=Tap -Name[be]=Шукаць -Name[bg]=Търсене -Name[bn]=অনুসন্ধান -Name[br]=Klask -Name[bs]=Traži -Name[ca]=Cerca -Name[cs]=Najít -Name[csb]=Szëkba -Name[cy]=Canfod -Name[de]=Suchen -Name[el]=Αναζήτηση -Name[eo]=Trovi -Name[es]=Buscar -Name[et]=Otsing -Name[eu]=Bilatu -Name[fa]=یافتن -Name[fi]=Etsi -Name[fr]=Recherche -Name[fy]=Sykje -Name[ga]=Aimsigh -Name[gl]=Procurar -Name[he]=מצא -Name[hi]=ढूंढें -Name[hr]=Traži -Name[hu]=Keresés -Name[is]=Leita -Name[it]=Trova -Name[ja]=検索 -Name[ka]=ძიება -Name[kk]=Іздеп табу -Name[km]=រក -Name[lt]=Rasti -Name[lv]=Meklēt -Name[mk]=Најди -Name[mn]=Олох -Name[ms]=Cari -Name[mt]=Fittex -Name[nb]=Finn -Name[nds]=Söken -Name[ne]=फेला पार्नुहोस् -Name[nl]=Zoeken -Name[nn]=Finn -Name[pa]=ਖੋਜ -Name[pl]=Wyszukiwanie -Name[pt]=Procurar -Name[pt_BR]=Procurar -Name[ro]=Caută -Name[ru]=Поиск -Name[rw]=Gushaka -Name[se]=Oza -Name[sk]=Nájsť -Name[sl]=Najdi -Name[sr]=Нађи -Name[sr@Latn]=Nađi -Name[sv]=Sök -Name[ta]=தேடு -Name[te]=వెతుకు -Name[tg]=Кофтан -Name[th]=ค้นหา -Name[tr]=Bul -Name[tt]=Ezläw -Name[uk]=Пошук -Name[uz]=Qidirish -Name[uz@cyrillic]=Қидириш -Name[vi]=Tìm kiếm -Name[wa]=Trover -Name[zh_CN]=查找 -Name[zh_TW]=尋找 + Comment=Menu for starting a file or web search -Comment[af]=Kieslys om 'n lêer of web bladsy te soek -Comment[ar]=قائمة لتشغيل ملف أو للبحث في الشبكة -Comment[be]=Меню для запуску пошуку файлаў ці ў Сеціве -Comment[bg]=Меню за стартиране на файл или търсене в Интернет -Comment[bn]=ফাইল বা ওয়েব অনুসন্ধান করার জন্য মেনু -Comment[bs]=Meni za pokretanje datoteke ili pretrage weba -Comment[ca]=Menú per iniciar una cerca de fitxers o web -Comment[cs]=Nabídka pro spuštění souboru nebo hledání na webu -Comment[csb]=Menu naczãca szëkbë w sécë abò lopków -Comment[da]=Menu for hurtigt at starte en fil- eller netsøgning -Comment[de]=Menü zur Datei- oder Websuche -Comment[el]=Μενού για την εκκίνηση ενός αρχείου ή αναζήτηση στον ιστό -Comment[eo]=Menuo por lanĉi dosier- aŭ TTT-serĉadon -Comment[es]=Menú para comenzar la búsqueda de un archivo o página web -Comment[et]=Menüü faili- või veebiotsingu käivitamiseks -Comment[eu]=Fitxategiak edo interneten bilaketak abiarazteko menua -Comment[fa]=گزینگان برای آغاز جستجوی پرونده یا وب -Comment[fi]=Valikko tiedoston käynnistämiseen tai verkkohakuun -Comment[fr]=Menu permettant d'effectuer une recherche de fichiers ou sur Internet -Comment[fy]=Menu foar it sykjen nei triemmen of op't ynternet -Comment[gl]=Menú para abrir un ficheiro ou buscar na web -Comment[he]=תפריט לחיפוש קובץ, או ביצוע חיפוש ברשת -Comment[hr]=Izbornik za pokretanje pretraživanja datoteka ili Interneta -Comment[hu]=Menü webes vagy fájlkereséshez -Comment[is]=Einföld leið til að ræsa skrár eða hefja vefleit -Comment[it]=Menu per avviare una ricerca web o di file -Comment[ja]=ファイルまたはウェブ検索を開始するためのメニュー -Comment[ka]=ფაილში ან ვებში ძიების დაწყების მენიუ -Comment[kk]=Файңлды жегу не вебте іздеу мәзірі -Comment[km]=ម៉ឺនុយសម្រាប់ចាប់ផ្តើមស្វែងរកឯកសារ ឬ ទំព័របណ្តាញ -Comment[lt]=Bylų ar žiniatinklio paieškos meniu -Comment[mk]=Мени за пребарување на датотека или пребарување на мрежа -Comment[nb]=Meny for å starte en fil eller et nettsøk -Comment[nds]=Menü för dat Söken na Dateien oder binnen dat Nett -Comment[ne]=फाइल सुरुआत गर्ने वा वेब खोज्नका लागि मेनु -Comment[nl]=Menu voor het zoeken naar bestanden of op internet -Comment[nn]=Meny for å starta ei fil eller eit nettsøk -Comment[pa]=ਇੱਕ ਫਾਇਲ ਜਾਂ ਵੈੱਬ ਖੋਜ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਮੇਨੂ -Comment[pl]=Menu rozpoczęcia przeszukiwania sieci lub plików -Comment[pt]=Um menu para iniciar uma pesquisa de ficheiros ou na Web -Comment[pt_BR]=Menu para iniciar um arquivo ou uma busca web -Comment[ro]=Meniu pentru pornirea unei căutări de fișiere sau pe web -Comment[ru]=Быстрый доступ к поиску файлов и страниц в Интернете -Comment[se]=Fállu mas álggahat fiila- dahje fierpmádatohcama -Comment[sk]=Menu pre vyhľadávanie súborov alebo webu -Comment[sl]=Meni za začetek iskanja datotek in iskanja po spletu -Comment[sr]=Мени за започињање претраге фајлова или Веба -Comment[sr@Latn]=Meni za započinjanje pretrage fajlova ili Veba -Comment[sv]=Meny för att snabbt starta en fil- eller webbsökning -Comment[th]=เมนูสำหรับเริ่มการค้นหาแฟ้ม หรือเว็บ -Comment[tr]=Bir dosya ya da web araması başlatmak için menü -Comment[uk]=Меню для пошуку файлів або пошуку в Тенетах -Comment[vi]=Thực đơn giúp tìm tập tin hay tìm trên mạng -Comment[wa]=Menu po-z enonder on cweraedje d' on fitchî ou sol daegntoele -Comment[zh_CN]=启动文件或 Web 搜索的菜单 -Comment[zh_TW]=開始檔案或網頁搜尋的選單 -Icon=kfind +Icon=kfind X-TDE-Library=kickermenu_find diff --git a/kicker/menuext/find/findmenu.cpp b/kicker/menuext/find/findmenu.cpp index a45bdabb5..3084e74b0 100644 --- a/kicker/menuext/find/findmenu.cpp +++ b/kicker/menuext/find/findmenu.cpp @@ -23,8 +23,8 @@ #include <tdeapplication.h> #include <kiconloader.h> -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> #include "findmenu.h" @@ -52,7 +52,7 @@ void FindMenu::initialize() mConfigList.clear(); for ( TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) { - KSimpleConfig config( *it, true ); + TDESimpleConfig config( *it, true ); config.setDesktopGroup(); mConfigList.append( *it ); @@ -67,13 +67,13 @@ void FindMenu::slotExec( int pos ) { TQString app = mConfigList[ pos ]; - kapp->propagateSessionManager(); + tdeApp->propagateSessionManager(); - KSimpleConfig config(app, true); + TDESimpleConfig config(app, true); config.setDesktopGroup(); - if (kapp && config.readEntry("Type") == "Link") + if (tdeApp && config.readEntry("Type") == "Link") { - kapp->invokeBrowser(config.readEntry("URL")); + tdeApp->invokeBrowser(config.readEntry("URL")); } else { diff --git a/kicker/menuext/find/findmenu.h b/kicker/menuext/find/findmenu.h index b8c3e3d96..85dd0e04d 100644 --- a/kicker/menuext/find/findmenu.h +++ b/kicker/menuext/find/findmenu.h @@ -30,7 +30,7 @@ class TQStringList; class FindMenu : public KPanelMenu { - Q_OBJECT + TQ_OBJECT public: FindMenu( TQWidget* parent, const char* name, const TQStringList &/*args*/ ); diff --git a/kicker/menuext/find/kfind.desktop b/kicker/menuext/find/kfind.desktop index 89aec1bac..b5248c6e5 100644 --- a/kicker/menuext/find/kfind.desktop +++ b/kicker/menuext/find/kfind.desktop @@ -5,85 +5,7 @@ X-DocPath=kfind/index.html Path= Type=Application Terminal=false -Name=Find Files -Name[af]=Soek Lêers -Name[ar]=ابحث عن ملفات -Name[be]=Шукаць файлы -Name[bg]=Търсене на файлове -Name[bn]=ফাইল অনুসন্ধান -Name[br]=Klask restroù -Name[bs]=Pronađi datoteke -Name[ca]=Cerca fitxers -Name[cs]=Najít soubory -Name[csb]=Nalezë lopczi -Name[cy]=Canfod Ffeiliau -Name[da]=Find filer -Name[de]=Dateien suchen -Name[el]=Αναζήτηση αρχείων -Name[eo]=Trovi dosierojn -Name[es]=KFind -Name[et]=Failide otsimine -Name[eu]=Bilatu fitxategiak -Name[fa]=یافتن پروندهها -Name[fi]=Etsi tiedostoja -Name[fr]=Recherche de fichiers -Name[fy]=Triemmen sykje -Name[ga]=Aimsigh Comhaid -Name[gl]=Buscar Ficheiros -Name[he]=חפש קבצים -Name[hi]=फ़ाइलें ढूंढें -Name[hr]=Traži datoteke -Name[hu]=Fájlkereső -Name[id]=Cari Berkas -Name[is]=Finna skrár -Name[it]=Trova file -Name[ja]=ファイルを検索 -Name[ka]=ფაილთა ძიება -Name[kk]=Файлдарды табу -Name[km]=រកឯកសារ -Name[ko]=글꼴 파일 -Name[lo]=ຄົ້ນຫາແຟ້ມ -Name[lt]=Rasti bylas -Name[lv]=Meklēt Failus -Name[mk]=Пронајди датотеки -Name[mn]=Файл хайх -Name[ms]=Cari Fail -Name[mt]=Sib Fajls -Name[nb]=Finn filer -Name[nds]=Dateien söken -Name[ne]=फाइल फेला पार्नुहोस् -Name[nl]=Bestanden zoeken -Name[nn]=Finn filer -Name[nso]=Hwetsa Difaele -Name[oc]=Cerca fiquièrs -Name[pa]=ਫਾਇਲ ਖੋਜ -Name[pl]=Znajdź pliki -Name[pt]=Procurar Ficheiros -Name[pt_BR]=Procurar arquivos -Name[ro]=Caută fișiere -Name[ru]=Поиск файлов -Name[rw]=Gushaka Amadosiye -Name[se]=Oza fiillaid -Name[sk]=Hľadať súbory -Name[sl]=Najdi datoteke -Name[sr]=Претрага фајлова -Name[sr@Latn]=Pretraga fajlova -Name[sv]=Hitta filer -Name[ta]=கோப்புகளைக் கண்டுபிடி -Name[te]=దస్త్రాలను వెతుకు -Name[tg]=Ёфтани файлҳо -Name[th]=ค้นหาแฟ้ม -Name[tr]=Dosyalarda Bul -Name[tt]=Birem Ezläw -Name[uk]=Пошук файлів -Name[uz]=Fayllarni qidirish -Name[uz@cyrillic]=Файлларни қидириш -Name[ven]=Todani faela -Name[vi]=Tìm Tập tin -Name[wa]=Trover des fitchîs -Name[xh]=Fumana Iifayile -Name[zh_CN]=查找文件 -Name[zh_TW]=尋找檔案 -Name[zu]=Thola Amafayela X-TDE-StartupNotify=true Categories=Qt;TDE;Find; + +Name=Find Files diff --git a/kicker/menuext/find/websearch.desktop b/kicker/menuext/find/websearch.desktop index 86d101d3e..df36f112e 100644 --- a/kicker/menuext/find/websearch.desktop +++ b/kicker/menuext/find/websearch.desktop @@ -3,77 +3,6 @@ Type=Link URL=http://www.google.com Icon=enhanced_browsing Terminal=false -Name=Web Search -Name[af]=Web Soektog -Name[ar]=بحث في الشبكة -Name[az]=Vebdə Axtrarış -Name[be]=Шукаць у Сеціве -Name[bg]=Търсене в Интернет -Name[bn]=ওয়েব অনুসন্ধান -Name[br]=Klask ar gwiad -Name[bs]=Web pretraga -Name[ca]=Recerca web -Name[cs]=Vyhledávání na webu -Name[csb]=Szëkba w sécë WWW -Name[cy]=Chwiliad Gwê -Name[da]=Internetsøgning -Name[de]=Web-Suche -Name[el]=Αναζήτηση στο διαδίκτυο -Name[eo]=TTT-serĉo -Name[es]=Búsqueda web -Name[et]=Veebiotsing -Name[eu]=Web arakaketa -Name[fa]=جستجوی وب -Name[fi]=Verkkohaku -Name[fr]=Recherche web -Name[fy]=Web-sykje-opdracht -Name[ga]=Cuardach Lín -Name[gl]=Procura na Web -Name[he]=חיפוש ברשת -Name[hi]=वेब खोज -Name[hr]=Web pretraživanje -Name[hu]=Keresés a weben -Name[is]=Vefleit -Name[it]=Ricerca sul web -Name[ja]=ウェブ検索 -Name[ka]=ვებ ძიება -Name[kk]=Вебте табу -Name[km]=ស្វែងរកតាមបណ្ដាញ -Name[lt]=Žiniatinklio paieška -Name[lv]=Meklēt tīklā -Name[mk]=Веб-пребарување -Name[mn]=Вэб хайлт -Name[ms]=Carian Web -Name[mt]=Fittex fuq il-web -Name[nb]=Søk på nettsteder -Name[nds]=In't Nett söken -Name[ne]=वेब खोजी -Name[nl]=Web-zoekopdracht -Name[nn]=Søk på nettstader -Name[pa]=ਵੈੱਬ ਖੋਜ -Name[pl]=Wyszukiwanie w sieci WWW -Name[pt]=Pesquisa na Web -Name[pt_BR]=Busca na Web -Name[ro]=Căutare Web -Name[ru]=Поиск в Интернете -Name[rw]=Ishakisha ry'Urubugamakuru -Name[se]=Web-ohcan -Name[sk]=Hľadanie na WWW -Name[sl]=Spletno iskanje -Name[sr]=Претраживање Веба -Name[sr@Latn]=Pretraživanje Veba -Name[sv]=Webbsökning -Name[ta]=வலை தேடு -Name[te]=వెబ్ అన్వెషణ -Name[tg]=Ҷустуҷӯи Вэб -Name[th]=ค้นหาจากเว็บ -Name[tr]=Web Arama -Name[tt]=Web-Ezläw -Name[uk]=Пошук в Тенетах -Name[uz]=Internetda qidirish -Name[uz@cyrillic]=Интернетда қидириш -Name[vi]=Tìm kiếm trên mạng -Name[wa]=Cweraedje sol daegntoele -Name[zh_CN]=Web 搜索 -Name[zh_TW]=網頁搜尋 Categories=Qt;TDE;Find; + +Name=Web Search diff --git a/kicker/menuext/kate/CMakeLists.txt b/kicker/menuext/kate/CMakeLists.txt index 4afbc89c8..5ab17da8b 100644 --- a/kicker/menuext/kate/CMakeLists.txt +++ b/kicker/menuext/kate/CMakeLists.txt @@ -21,7 +21,11 @@ link_directories( ##### other data ################################ -install( FILES katesessionmenu.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/menuext ) +tde_create_translated_desktop( + SOURCE katesessionmenu.desktop + DESTINATION ${DATA_INSTALL_DIR}/kicker/menuext + PO_DIR kicker-desktops +) ##### kickermenu_kate (module) ################## diff --git a/kicker/menuext/kate/katesessionmenu.cpp b/kicker/menuext/kate/katesessionmenu.cpp index 854f4ce31..198cb4f7a 100644 --- a/kicker/menuext/kate/katesessionmenu.cpp +++ b/kicker/menuext/kate/katesessionmenu.cpp @@ -29,8 +29,8 @@ #include <klibloader.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> #include <tqvalidator.h> @@ -76,15 +76,39 @@ void KateSessionMenu::initialize() insertSeparator(); - TQStringList list = TDEGlobal::dirs()->findAllResources( "data", "kate/sessions/*.katesession", false, true); - for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) + TQString configFile = locateLocal("data", "kate/sessions") + "/sessions.list"; + if (TDEGlobal::dirs()->exists(configFile)) { - KSimpleConfig config( *it, true ); - config.setGroup( "General" ); - m_sessions.append( config.readEntry( "Name" ) ); + // Read new style configuration (from TDE R14.1.0) + TDESimpleConfig *config = new TDESimpleConfig(configFile, true); + config->setGroup("Sessions list"); + int sessionsCount = config->readNumEntry("Sessions count", 0); + for (int i = 0; i < sessionsCount; ++i) + { + TQString urlStr = config->readEntry(TQString("URL_%1").arg(i)); + if (!urlStr.isEmpty() && TDEGlobal::dirs()->exists(urlStr)) + { + // Filter out empty URLs or non existing sessions + TDESimpleConfig *sessionConfig = new TDESimpleConfig(urlStr, true); + sessionConfig->setGroup("General"); + // Session general properties + TQString sessionName = sessionConfig->readEntry("Name", i18n("Unnamed")); + m_sessions.append( sessionName ); + } + } + } + else + { + TQStringList list = TDEGlobal::dirs()->findAllResources( "data", "kate/sessions/*.katesession", false, true); + for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) + { + TDESimpleConfig config( *it, true ); + config.setGroup( "General" ); + m_sessions.append( config.readEntry( "Name" ) ); + } + m_sessions.sort(); } - m_sessions.sort(); for ( TQStringList::ConstIterator it1 = m_sessions.begin(); it1 != m_sessions.end(); ++it1 ) { @@ -93,7 +117,7 @@ void KateSessionMenu::initialize() // means for updating, to let the user manually update if he/she added new sessions. insertSeparator(); - insertItem( SmallIconSet("reload"), i18n("Reload Session List"), this, TQT_SLOT(reinitialize()) ); + insertItem( SmallIconSet("reload"), i18n("Reload Session List"), this, TQ_SLOT(reloadSessionsList()) ); } void KateSessionMenu::slotExec( int id ) @@ -112,7 +136,7 @@ void KateSessionMenu::slotExec( int id ) TQString name = KInputDialog::getText( i18n("Session Name"), i18n("Please enter a name for the new session"), TQString::null, - &ok, 0, 0, new Validator( TQT_TQOBJECT(m_parent) ) ); + &ok, 0, 0, new Validator( m_parent ) ); if ( ! ok ) return; @@ -143,8 +167,11 @@ void KateSessionMenu::slotExec( int id ) else if ( id > 2 ) args << m_sessions[ id-3 ]; - kapp->tdeinitExec("kate", args); + tdeApp->tdeinitExec("kate", args); } - -// kate: space-indent: on; indent-width 2; replace-tabs on; +void KateSessionMenu::reloadSessionsList() +{ + reinitialize(); + exec(); +} diff --git a/kicker/menuext/kate/katesessionmenu.desktop b/kicker/menuext/kate/katesessionmenu.desktop index 623c76e0f..7406b70b1 100644 --- a/kicker/menuext/kate/katesessionmenu.desktop +++ b/kicker/menuext/kate/katesessionmenu.desktop @@ -1,98 +1,7 @@ [Desktop Entry] Name=Kate Session Menu -Name[bg]=Меню сесии на Kate -Name[bn]=কেট সেশন মেনু -Name[ca]=Menú de la sessió Kate -Name[cs]=Nabídka relace Kate -Name[csb]=Menu sesëji Kate -Name[da]=Kate Sessionsmenu -Name[de]=Kate Sitzungsmenü -Name[el]=Μενού συνεδρίας του Kate -Name[eo]=Kate Seanco Menuo -Name[es]=Menú de la sesión de Kate -Name[et]=Kate seansimenüü -Name[fa]=گزینگان نشست Kate -Name[fi]=Katen istuntojenhallinta -Name[fr]=Menu de sessions de Kate -Name[fy]=Kate Sesjemenu -Name[gl]=Menú de Sesións de Kate -Name[he]=תפריט ההפעלה של Kate -Name[hr]=Kate izbornik sesija -Name[hu]=Kate munkafolyamat-menü -Name[is]=Kate setuvalmynd -Name[it]=Menu delle sessioni di Kate -Name[ja]=Kate セッションメニュー -Name[kk]=Kate сеанс мәзірі -Name[km]=ម៉ឺនុយសម័យរបស់ Kate -Name[lt]=Kate sesijų meniu -Name[nb]=Meny for Kate-økter -Name[nds]=Kate-Törnmenü -Name[ne]=केट सत्र मेनु -Name[nl]=Kate sessiemenu -Name[pa]=ਕੇਟ ਸ਼ੈਸ਼ਨ ਮੇਨੂ -Name[pl]=Menu sesji Kate -Name[pt]=Menu de Sessões do Kate -Name[pt_BR]=Menu de Sessões do Kate -Name[ro]=Meniu sesiune Kate -Name[ru]=Сеанс Kate -Name[sk]=Kate menu sedenia -Name[sl]=Meni s sejami za Kate -Name[sr]=Kate-ин мени сесија -Name[sr@Latn]=Kate-in meni sesija -Name[sv]=Kate sessionsmeny -Name[te]=కేట్ సెషన్ పట్టీ -Name[th]=เมนูเซสชั่นของ Kate -Name[tr]=Kate Oturum Menüsü -Name[uk]=Меню сеансів Kate -Name[uz]=Kate seans menyusi -Name[uz@cyrillic]=Kate сеанс менюси -Name[wa]=Dressêye di sessions Kate -Name[zh_CN]=Kate 会话菜单 -Name[zh_TW]=Kate 工作階段選單 + Comment=Allows you to open Kate with a specified session, or create a new one -Comment[bg]=Позволя отварянето на определена сесия на Kate или създаването на нова -Comment[ca]=Us permet obrir Kate amb una sessió específica o bé crear-ne una de nova -Comment[cs]=Umožňuje otevřít Kate s určitou relací nebo si vytvořit novou -Comment[csb]=Pòzwôlô òtemknąc apartną sesëjã Kate abò ùsôdzëc nową -Comment[da]=Tillader dig at åbne Kate med en bestemt session, eller at oprette en ny -Comment[de]=Lässt Sie Kate mit einer vorhandenen oder neuen Sitzung starten -Comment[el]=Σας επιτρέπει να ανοίξετε το Kate μα μια καθορισμένη συνεδρία, ή να δημιουργήσετε μία νέα -Comment[eo]=Ebligas vin malfermi Kate-n kun aparta seanco, aŭ krei novan -Comment[es]=Le permite abrir Kate con una sesión específica, o crear una nueva -Comment[et]=Võimaldab avada Kate määratud seansiga või luua uue seansi -Comment[fa]=به شما اجازه میدهد Kate را توسط نشست مشخصشده باز کنید، یا مورد جدیدی را ایجاد نمایید -Comment[fi]=Voit avata Katesta määritellyn istunnon, tai luoda uuden -Comment[fr]=Vous permet d'ouvrir Kate avec une session spécifiée, ou d'en créer une nouvelle -Comment[fy]=Stiet jo ta om Kate mei in oantsjutte sesje te iepenjen, of in nije oan te meitsjen -Comment[gl]=Permítelle abrir Kate cunha sesión especificada, ou crear unha nova. -Comment[hr]=Dopušta otvaranje Kate uz određenu sesiju ili izradu nove sesije -Comment[hu]=Lehetővé teszi a Kate megnyitását egy megadott munkafolyamattal vagy egy újonnan létrehozottal -Comment[is]=Gerir þér kleyft að opna Kate með ákveðinni setu, eða búa til nýja -Comment[it]=Ti permette di aprire Kate con una particolare sessione, o di crearne una nuova -Comment[ja]=新規または既存のセッションで Kate を起動します -Comment[kk]=Kate-тің керек сеансын ашады, немесе жаңасын бастайды -Comment[km]= អនុញ្ញាតឲ្យអ្នកបើក Kate ជាមួយនឹងសម័យដែលបានបញ្ជាក់ ឬបង្កើតថ្មីមួយ -Comment[lt]=Leidžia atverti Kate su nurodyta sesija arba sukurti naują -Comment[nb]=Brukes til å åpne Kate med en bestemt økt, eller opprette en ny -Comment[nds]=Lett Di Kate mit en angeven oder niegen Törn opmaken -Comment[ne]=निर्दिष्ट गरिएको सत्रसँग केट खोल्न,वा एउटा नयाँ सिर्जना गर्न अनुमति दिन्छ -Comment[nl]=Stelt u in staat om Kate te openen met een opgegeven sessie, of u kunt een nieuwe sessie aanmaken -Comment[pl]=Pozwala otworzyć określoną sesję Kate albo utworzyć nową -Comment[pt]=Permite-lhe abrir o Kate com uma determinada sessão ou criar uma nova -Comment[pt_BR]=Permite que você abra o Kate com uma sessão específica, ou criar uma nova -Comment[ro]=Vă permite să deschideți Kate cu o sesiune specificată, sau să creați una nouă -Comment[ru]=Позволяет открыть заданный сеанс Kate -Comment[sk]=Umožní otvoriť Kate so špecifickým sedením alebo vytvoriť nové sedenie -Comment[sl]=Omogoča vam, da Kate odprete z izbrano sejo, ali pa ustvarite novo sejo -Comment[sr]=Омогућава вам да отворите Kate са задатом сесијом, или да направите нову -Comment[sr@Latn]=Omogućava vam da otvorite Kate sa zadatom sesijom, ili da napravite novu -Comment[sv]=Gör det möjligt att öppna Kate med en angiven session, eller skapa en ny -Comment[te]=కెట్ ను ఇవ్వబడిన సెషన్ తొ తెరువబడును, లేక కొత్తది సృష్టించబడును -Comment[th]=ให้คุณเปิด Kate ด้วยเซสชั่นที่ระบุ หรือสร้างเซสชั่นใหม่ -Comment[tr]=Kate'i belirli bir oturumla açmanızı sağlar -Comment[uk]=Надає можливість відкривати Kate з певним сеансом або створювати новий -Comment[wa]=Vos permete di drovi Kate avou ene sipecifieye session oudonbén nd ahiver ene novele -Comment[zh_CN]=允许您用指定会话打开 Kate，或创建新会话 -Comment[zh_TW]=讓您可以用指定的工作階段來開啟 Kate，或是建立新的工作階段 + Icon=kate X-TDE-Library=kickermenu_kate diff --git a/kicker/menuext/kate/katesessionmenu.h b/kicker/menuext/kate/katesessionmenu.h index 3d5519496..b6a10e885 100644 --- a/kicker/menuext/kate/katesessionmenu.h +++ b/kicker/menuext/kate/katesessionmenu.h @@ -24,7 +24,7 @@ #include <kpanelmenu.h> class KateSessionMenu : public KPanelMenu { - Q_OBJECT + TQ_OBJECT public: KateSessionMenu( TQWidget *parent=0, const char *name=0, const TQStringList& /*args*/=TQStringList() ); ~KateSessionMenu(); @@ -34,6 +34,7 @@ class KateSessionMenu : public KPanelMenu { protected slots: virtual void slotExec( int id ); + void reloadSessionsList(); private: TQStringList m_sessions; @@ -41,5 +42,3 @@ class KateSessionMenu : public KPanelMenu { }; #endif // _KateSessionMenu_h_ - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kicker/menuext/konq-profiles/CMakeLists.txt b/kicker/menuext/konq-profiles/CMakeLists.txt index 2847be4fe..a432bd21a 100644 --- a/kicker/menuext/konq-profiles/CMakeLists.txt +++ b/kicker/menuext/konq-profiles/CMakeLists.txt @@ -21,7 +21,11 @@ link_directories( ##### other data ################################ -install( FILES konquerormenu.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/menuext ) +tde_create_translated_desktop( + SOURCE konquerormenu.desktop + DESTINATION ${DATA_INSTALL_DIR}/kicker/menuext + PO_DIR kicker-desktops +) ##### kickermenu_konqueror (module) ############# diff --git a/kicker/menuext/konq-profiles/konquerormenu.desktop b/kicker/menuext/konq-profiles/konquerormenu.desktop index 6fae241b9..b00f9f6fe 100644 --- a/kicker/menuext/konq-profiles/konquerormenu.desktop +++ b/kicker/menuext/konq-profiles/konquerormenu.desktop @@ -1,136 +1,7 @@ [Desktop Entry] Name=Konqueror Profiles -Name[af]=Konqueror Profiele -Name[ar]=مواصفات في Konqueror -Name[az]=Konqueror Profilləri -Name[be]=Профілі Konqueror -Name[bg]=Профили на браузъра -Name[bn]=কংকরার প্রোফাইল -Name[br]=Profiloù Konqueror -Name[bs]=Konqueror profili -Name[ca]=Perfils de Konqueror -Name[cs]=Profily Konqueroru -Name[csb]=Profile Konquerora -Name[cy]=Proffilau Konqueror -Name[da]=Konqueror-profiler -Name[de]=Konqueror-Profile -Name[el]=Προφίλ του Konqueror -Name[eo]=Konkerantaj Profiloj -Name[es]=Perfiles de Konqueror -Name[et]=Konquerori profiilid -Name[eu]=Konquerorren profilak -Name[fa]=Profileهای Konqueror -Name[fi]=Konquerorin profiilit -Name[fr]=Profils de Konqueror -Name[fy]=Konqueror-profielen -Name[ga]=Próifílí Konqueror -Name[gl]=Perfis de Konqueror -Name[he]=פרופילים של Konqueror -Name[hi]=कॉन्करर प्रोफ़ाइल्स -Name[hr]=Konqueror profili -Name[hu]=Konqueror-profilok -Name[is]=Konqueror sniðmát -Name[it]=Profili di Konqueror -Name[ja]=Konqueror プロファイル -Name[ka]=Konqueror-ის პროფილები -Name[kk]=Konqueror профильдер -Name[km]=ទម្រង់ Konqueror -Name[ko]=Konqueror 제스처 -Name[lt]=Konqueror profiliai -Name[lv]=Iekarotāja profili -Name[mk]=Профили за Konqueror -Name[ms]=Profil Konqueror -Name[mt]=Profili ta' Konqueror -Name[nb]=Profiler for Konqueror -Name[nds]=Konqueror-Profilen -Name[ne]=कन्क्वेरर प्रोफाइल -Name[nl]=Konqueror-profielen -Name[nn]=Profilar for Konqueror -Name[pa]=ਕੋਨਕਿਉਰੋਰ ਪਰੋਫਾਇਲ -Name[pl]=Profile Konquerora -Name[pt]=Perfis do Konqueror -Name[pt_BR]=Perfis do Konqueror -Name[ro]=Profile Konqueror -Name[ru]=Профили Konqueror -Name[rw]=Ibijyana na Konqueror -Name[se]=Konqueror-profiillat -Name[sk]=Profily pre Konqueror -Name[sl]=Profili Konquerorja -Name[sr]=Konqueror-ови профили -Name[sr@Latn]=Konqueror-ovi profili -Name[sv]=Konqueror-profiler -Name[ta]=Konqueror விவரக்குறிப்புகள் -Name[te]=కాంకెరర్ ప్రొఫైల్లు -Name[th]=โปรไฟล์ของคอนเควอร์เรอร์ -Name[tr]=Konqueror Profilleri -Name[tt]=Konqueror Caybireme -Name[uk]=Профілі Konqueror -Name[uz]=Konqueror profillari -Name[uz@cyrillic]=Konqueror профиллари -Name[vi]=Thông số Konqueror -Name[wa]=Profils Konqueror -Name[zh_CN]=Konqueror 配置文件 -Name[zh_TW]=Konqueror 設定組合 + Comment=Menu for accessing the Konqueror profiles -Comment[af]=Kieslys om toegang tot die Konqueror profiele te verkry -Comment[ar]=قائمة للوصول إلى مواصفات في Konqueror -Comment[be]=Меню для доступу да профіляў Konqueror -Comment[bg]=Меню за достъп до профилите на браузъра -Comment[bn]=সহজে বিভিন্ন কংকরার প্রোফাইল খোলার জন্য মেনু -Comment[bs]=Meni za pristup do profila Konquerora -Comment[ca]=Menú per accedir als perfils Konqueror -Comment[cs]=Přístup k profilům Konqueroru -Comment[csb]=Menu przistãpù do profilów Konquerora -Comment[da]=Menu for adgang til Konquerors profiler -Comment[de]=Vereinfachter Zugang zu den Konqueror-Profilen -Comment[el]=Μενού πρόσβασης στα προφίλ του Konqueror -Comment[eo]=Menuo por atingi Konkerantajn profilojn -Comment[es]=Menú para acceder a los perfiles de Konqueror -Comment[et]=Menüü Konquerori profiilide kasutamiseks -Comment[eu]=Konqueror profilak atzitzeko menua -Comment[fa]=گزینگان برای دستیابی به profileهای Konqueror -Comment[fi]=Valikko Konquerorin profiileille -Comment[fr]=Menu d'accès aux profils de Konqueror -Comment[fy]=Menu foar tagong ta de Konqueror-profielen -Comment[gl]=Aceso doado aos perfis de Konqueror -Comment[he]=תפריט גישה לפרופילים של Konqueror -Comment[hr]=Izbornik za pristupanje Konqueror profilima -Comment[hu]=Menü a Konqueror profiljainak eléréséhez -Comment[is]=Einföld leið að sniðmátum Konqueror -Comment[it]=Menu per accedere ai profili di Konqueror -Comment[ja]=Konqueror プロファイルにアクセスするためのメニュー -Comment[ka]=Konqueror-ის პროფილების წვდომის მენიუ -Comment[kk]=Konqueror профильдеріне қатынау мәзірі -Comment[km]=ម៉ឺនុយសម្រាប់ចូលដំណើរការទម្រង់របស់ Konqueror -Comment[lt]=Konqueror profilių pasiekimo meniu -Comment[mk]=Мени за пристапување до профилите на Konqueror -Comment[nb]=Meny for Konquerors profiler -Comment[nds]=Menü för Konqueror sien Profilen -Comment[ne]=कन्क्वेरर प्रोफाइल पहुँचका लागि मेनु -Comment[nl]=Menu voor toegang tot de Konqueror-profielen -Comment[nn]=Meny for Konqueror-profilane -Comment[pa]=ਕੋਨਕਿਉਰੋਰ ਪਰੋਫਾਇਲ ਲਈ ਸੌਖੀ ਪਹੁੰਚ ਲਈ ਮੇਨੂ -Comment[pl]=Menu dostępu do profili Konquerora -Comment[pt]=Um menu para aceder aos perfis do Konqueror -Comment[pt_BR]=Acesso fácil aos perfis do Konqueror -Comment[ro]=Meniu pentru accesul profilelor Konqueror -Comment[ru]=Быстрый доступ к профилям Konqueror -Comment[se]=Fállu mii čájeha Konqueror-profiillaid -Comment[sk]=Menu pre prístup k profilom pre Konqueror -Comment[sl]=Meni za dostop do profilov Konquerorja -Comment[sr]=Мени за приступ Konqueror-овим профилима -Comment[sr@Latn]=Meni za pristup Konqueror-ovim profilima -Comment[sv]=Meny för att komma åt Konquerors profiler -Comment[te]=కాంకెరర్ ప్రొఫైల్లు చూసెందుకు కొరకు పట్టి -Comment[th]=เมนูสำหรับเข้าใช้โปรไฟล์ของคอนเควอร์เรอร์วดเร็ว -Comment[tr]=Konqueror profillerine kolay erişim menüsü -Comment[uk]=Меню для доступу до профілів Konqueror -Comment[uz]=Konqueror profillarining menyusi -Comment[uz@cyrillic]=Konqueror профилларининг менюси -Comment[vi]=Thực đơn truy cập đến các thông số của Konqueror -Comment[wa]=Dressêye poz aveur accès ås profils di Konqueror -Comment[zh_CN]=访问 Konqueror 配置文件的菜单 -Comment[zh_TW]=方便存取 Konqueror 設定組合的選單 -Icon=konqueror +Icon=konqueror X-TDE-Library=kickermenu_konqueror diff --git a/kicker/menuext/konq-profiles/konqy_menu.cpp b/kicker/menuext/konq-profiles/konqy_menu.cpp index 321d9ac59..46d0faa9e 100644 --- a/kicker/menuext/konq-profiles/konqy_menu.cpp +++ b/kicker/menuext/konq-profiles/konqy_menu.cpp @@ -27,9 +27,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tdeglobal.h> #include <tdeapplication.h> #include <krun.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeio/global.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tqregexp.h> #include <tqfileinfo.h> @@ -65,7 +65,7 @@ void KonquerorProfilesMenu::initialize() TQFileInfo info( *pIt ); TQString profileName = TDEIO::decodeFileName( info.baseName() ); TQString niceName=profileName; - KSimpleConfig cfg( *pIt, true ); + TDESimpleConfig cfg( *pIt, true ); if ( cfg.hasGroup( "Profile" ) ) { cfg.setGroup( "Profile" ); @@ -83,7 +83,7 @@ void KonquerorProfilesMenu::slotExec(int id) { TQStringList args; args<<"--profile"<<m_profiles[id-1]; - kapp->tdeinitExec("konqueror", args); + tdeApp->tdeinitExec("konqueror", args); } void KonquerorProfilesMenu::reload() diff --git a/kicker/menuext/konq-profiles/konqy_menu.h b/kicker/menuext/konq-profiles/konqy_menu.h index ba3bb19f7..927f1ec6e 100644 --- a/kicker/menuext/konq-profiles/konqy_menu.h +++ b/kicker/menuext/konq-profiles/konqy_menu.h @@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class KonquerorProfilesMenu : public KPanelMenu { - Q_OBJECT + TQ_OBJECT public: KonquerorProfilesMenu(TQWidget *parent, const char *name, const TQStringList & /*args*/); diff --git a/kicker/menuext/konsole/CMakeLists.txt b/kicker/menuext/konsole/CMakeLists.txt index 9c2f7224f..e5c34ff16 100644 --- a/kicker/menuext/konsole/CMakeLists.txt +++ b/kicker/menuext/konsole/CMakeLists.txt @@ -21,7 +21,11 @@ link_directories( ##### other data ################################ -install( FILES konsolemenu.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/menuext ) +tde_create_translated_desktop( + SOURCE konsolemenu.desktop + DESTINATION ${DATA_INSTALL_DIR}/kicker/menuext + PO_DIR kicker-desktops +) ##### kickermenu_konsole (module) ############### diff --git a/kicker/menuext/konsole/konsole_mnu.cpp b/kicker/menuext/konsole/konsole_mnu.cpp index c9439c8db..709cde6c7 100644 --- a/kicker/menuext/konsole/konsole_mnu.cpp +++ b/kicker/menuext/konsole/konsole_mnu.cpp @@ -37,8 +37,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tdelocale.h> #include <krun.h> #include <kshell.h> -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> #include "konsole_mnu.h" @@ -91,7 +91,7 @@ void KonsoleMenu::initialize() } else { - kapp->iconLoader()->addAppDir("konsole"); + tdeApp->iconLoader()->addAppDir("konsole"); } setInitialized(true); @@ -113,7 +113,7 @@ void KonsoleMenu::initialize() continue; } - KSimpleConfig conf(*it, true /* read only */); + TDESimpleConfig conf(*it, true /* read only */); conf.setDesktopGroup(); TQString text = conf.readEntry("Name"); @@ -150,8 +150,8 @@ void KonsoleMenu::initialize() insertItem(SmallIconSet("keditbookmarks"), i18n("New Session at Bookmark"), m_bookmarksSession); connect(m_bookmarkHandlerSession, - TQT_SIGNAL(openURL(const TQString&, const TQString&)), - TQT_SLOT(newSession(const TQString&, const TQString&))); + TQ_SIGNAL(openURL(const TQString&, const TQString&)), + TQ_SLOT(newSession(const TQString&, const TQString&))); screenList.clear(); @@ -207,7 +207,7 @@ void KonsoleMenu::initialize() TQFileInfo info(*pIt); TQString profileName = TDEIO::decodeFileName(info.baseName()); TQString niceName = profileName; - KSimpleConfig cfg(*pIt, true); + TDESimpleConfig cfg(*pIt, true); if (cfg.hasGroup("Profile")) { cfg.setGroup("Profile"); @@ -229,11 +229,11 @@ void KonsoleMenu::initialize() // we don't have any profiles, disable the menu setItemEnabled(profileID, false); } - connect(m_profileMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(launchProfile(int))); + connect(m_profileMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(launchProfile(int))); insertSeparator(); insertItem(SmallIconSet("reload"), - i18n("Reload Sessions"), this, TQT_SLOT(reinitialize())); + i18n("Reload Sessions"), this, TQ_SLOT(reinitialize())); } void KonsoleMenu::slotExec(int id) @@ -244,7 +244,7 @@ void KonsoleMenu::slotExec(int id) } --id; - kapp->propagateSessionManager(); + tdeApp->propagateSessionManager(); TQStringList args; if (static_cast<unsigned int>(id) < sessionList.count()) { @@ -273,7 +273,7 @@ void KonsoleMenu::launchProfile(int id) // this is a session, not a bookmark, so execute that instead TQStringList args; args << "--profile" << m_profiles[id]; - kapp->tdeinitExec("konsole", args); + tdeApp->tdeinitExec("konsole", args); } KURL KonsoleMenu::baseURL() const diff --git a/kicker/menuext/konsole/konsole_mnu.h b/kicker/menuext/konsole/konsole_mnu.h index 4272fbaf9..68473693f 100644 --- a/kicker/menuext/konsole/konsole_mnu.h +++ b/kicker/menuext/konsole/konsole_mnu.h @@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class KonsoleMenu : public KPanelMenu/*, public KPReloadObject*/ { - Q_OBJECT + TQ_OBJECT public: KonsoleMenu(TQWidget *parent, const char *name, const TQStringList& /* args */); diff --git a/kicker/menuext/konsole/konsolebookmarkhandler.cpp b/kicker/menuext/konsole/konsolebookmarkhandler.cpp index 9ace6483e..1b1254a54 100644 --- a/kicker/menuext/konsole/konsolebookmarkhandler.cpp +++ b/kicker/menuext/konsole/konsolebookmarkhandler.cpp @@ -9,7 +9,7 @@ #include <kmimetype.h> #include <tdepopupmenu.h> #include <ksavefile.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "konsole_mnu.h" #include "konsolebookmarkmenu.h" @@ -38,8 +38,8 @@ KonsoleBookmarkHandler::KonsoleBookmarkHandler( KonsoleMenu *konsole, bool ) manager->setUpdate( true ); manager->setShowNSBookmarks( false ); - connect( manager, TQT_SIGNAL( changed(const TQString &, const TQString &) ), - TQT_SLOT( slotBookmarksChanged(const TQString &, const TQString &) ) ); + connect( manager, TQ_SIGNAL( changed(const TQString &, const TQString &) ), + TQ_SLOT( slotBookmarksChanged(const TQString &, const TQString &) ) ); m_bookmarkMenu = new KonsoleBookmarkMenu( manager, this, m_menu, NULL, false, /*Not toplevel*/ false /*No 'Add Bookmark'*/ ); @@ -62,13 +62,13 @@ void KonsoleBookmarkHandler::importOldBookmarks( const TQString& path, KNSBookmarkImporter importer( path ); connect( &importer, - TQT_SIGNAL( newBookmark( const TQString&, const TQCString&, const TQString& )), - TQT_SLOT( slotNewBookmark( const TQString&, const TQCString&, const TQString& ))); + TQ_SIGNAL( newBookmark( const TQString&, const TQCString&, const TQString& )), + TQ_SLOT( slotNewBookmark( const TQString&, const TQCString&, const TQString& ))); connect( &importer, - TQT_SIGNAL( newFolder( const TQString&, bool, const TQString& )), - TQT_SLOT( slotNewFolder( const TQString&, bool, const TQString& ))); - connect( &importer, TQT_SIGNAL( newSeparator() ), TQT_SLOT( newSeparator() )); - connect( &importer, TQT_SIGNAL( endMenu() ), TQT_SLOT( endMenu() )); + TQ_SIGNAL( newFolder( const TQString&, bool, const TQString& )), + TQ_SLOT( slotNewFolder( const TQString&, bool, const TQString& ))); + connect( &importer, TQ_SIGNAL( newSeparator() ), TQ_SLOT( newSeparator() )); + connect( &importer, TQ_SIGNAL( endMenu() ), TQ_SLOT( endMenu() )); importer.parseNSBookmarks( false ); diff --git a/kicker/menuext/konsole/konsolebookmarkhandler.h b/kicker/menuext/konsole/konsolebookmarkhandler.h index a1d2f54de..f7231fd24 100644 --- a/kicker/menuext/konsole/konsolebookmarkhandler.h +++ b/kicker/menuext/konsole/konsolebookmarkhandler.h @@ -14,7 +14,7 @@ class KonsoleMenu; class KonsoleBookmarkHandler : public TQObject, public KBookmarkOwner { - Q_OBJECT + TQ_OBJECT public: KonsoleBookmarkHandler( KonsoleMenu *konsole, bool toplevel ); diff --git a/kicker/menuext/konsole/konsolebookmarkmenu.cpp b/kicker/menuext/konsole/konsolebookmarkmenu.cpp index 0860cc123..811cc3f29 100644 --- a/kicker/menuext/konsole/konsolebookmarkmenu.cpp +++ b/kicker/menuext/konsole/konsolebookmarkmenu.cpp @@ -7,7 +7,7 @@ #include <kmimetype.h> #include <tdepopupmenu.h> #include <ksavefile.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> //#include <kbookmarkmenu.h> #include "konsole_mnu.h" @@ -31,14 +31,14 @@ KonsoleBookmarkMenu::KonsoleBookmarkMenu( KBookmarkManager* mgr, /* * First, we disconnect KBookmarkMenu::slotAboutToShow() * Then, we connect KonsoleBookmarkMenu::slotAboutToShow(). - * They are named differently because the TQT_SLOT() macro thinks we want + * They are named differently because the TQ_SLOT() macro thinks we want * KonsoleBookmarkMenu::KBookmarkMenu::slotAboutToShow() * Could this be solved if slotAboutToShow() is virtual in KBookmarMenu? */ - disconnect( _parentMenu, TQT_SIGNAL( aboutToShow() ), this, - TQT_SLOT( slotAboutToShow() ) ); - connect( _parentMenu, TQT_SIGNAL( aboutToShow() ), - TQT_SLOT( slotAboutToShow2() ) ); + disconnect( _parentMenu, TQ_SIGNAL( aboutToShow() ), this, + TQ_SLOT( slotAboutToShow() ) ); + connect( _parentMenu, TQ_SIGNAL( aboutToShow() ), + TQ_SLOT( slotAboutToShow2() ) ); } /* @@ -100,8 +100,8 @@ void KonsoleBookmarkMenu::fillBookmarkMenu() m_actionCollection, false, m_bAddBookmark, TQString::null ); m_lstSubMenus.append(subMenu); - connect( actionMenu->popupMenu(), TQT_SIGNAL(aboutToShow()), subMenu, - TQT_SLOT(slotNSLoad())); + connect( actionMenu->popupMenu(), TQ_SIGNAL(aboutToShow()), subMenu, + TQ_SLOT(slotNSLoad())); } } @@ -128,7 +128,7 @@ void KonsoleBookmarkMenu::fillBookmarkMenu() // kdDebug(1203) << "Creating URL bookmark menu item for " << bm.text() << endl; // create a normal URL item, with ID as a name TDEAction * action = new TDEAction( text, bm.icon(), 0, - this, TQT_SLOT( slotBookmarkSelected() ), + this, TQ_SLOT( slotBookmarkSelected() ), m_actionCollection, bm.url().url().utf8() ); action->setStatusText( bm.url().prettyURL() ); @@ -168,7 +168,7 @@ void KonsoleBookmarkMenu::slotBookmarkSelected() if ( !m_pOwner ) return; // this view doesn't handle bookmarks... a = (TDEAction*)sender(); b = a->text(); - m_kOwner->openBookmarkURL( TQString::fromUtf8(TQT_TQOBJECT_CONST(sender())->name()), /* URL */ + m_kOwner->openBookmarkURL( TQString::fromUtf8(sender()->name()), /* URL */ ( (TDEAction *)sender() )->text() /* Title */ ); } @@ -177,7 +177,7 @@ void KonsoleBookmarkMenu::slotNSBookmarkSelected() TDEAction *a; TQString b; - TQString link(TQT_TQOBJECT_CONST(sender())->name()+8); + TQString link(sender()->name()+8); a = (TDEAction*)sender(); b = a->text(); m_kOwner->openBookmarkURL( link, /*URL */ diff --git a/kicker/menuext/konsole/konsolebookmarkmenu.h b/kicker/menuext/konsole/konsolebookmarkmenu.h index 103b6bc19..4bb08a798 100644 --- a/kicker/menuext/konsole/konsolebookmarkmenu.h +++ b/kicker/menuext/konsole/konsolebookmarkmenu.h @@ -23,7 +23,7 @@ class KonsoleBookmarkMenu; class KonsoleBookmarkMenu : public KBookmarkMenu { - Q_OBJECT + TQ_OBJECT public: KonsoleBookmarkMenu( KBookmarkManager* mgr, diff --git a/kicker/menuext/konsole/konsolemenu.desktop b/kicker/menuext/konsole/konsolemenu.desktop index 929d6a469..067f3a419 100644 --- a/kicker/menuext/konsole/konsolemenu.desktop +++ b/kicker/menuext/konsole/konsolemenu.desktop @@ -1,137 +1,8 @@ [Desktop Entry] Name=Terminal Sessions -Name[af]=Terminaal Sessies -Name[ar]=جلسات مطراف سطر الأوامر -Name[az]=Terminal İclasları -Name[be]=Тэрмінальныя сесіі -Name[bg]=Терминални сесии -Name[bn]=টার্মিনাল সেশন -Name[br]=Dalc'hoù an termenell -Name[bs]=Sesije terminala -Name[ca]=Sessions de terminal -Name[cs]=Terminálové relace -Name[csb]=Sesëje terminala -Name[cy]=Sesiynnau Terfynell -Name[da]=Terminalsessioner -Name[de]=Terminalsitzungen -Name[el]=Συνεδρίες τερματικού -Name[eo]=Terminalaj seancoj -Name[es]=Sesiones de terminal -Name[et]=Terminali seansid -Name[eu]=Terminal saioak -Name[fa]=نشستهای پایانه -Name[fi]=Komentoikkunaistunnot -Name[fr]=Sessions de terminal -Name[fy]=Terminal-sesjes -Name[ga]=Seisiúin Teirminéil -Name[gl]=Sesións de Terminal -Name[he]=משימות מסוף -Name[hi]=टर्मिनल सत्र -Name[hr]=Terminalske sesije -Name[hu]=Terminálablakok -Name[is]=Skjáhermisforrit -Name[it]=Sessioni terminale -Name[ja]=ターミナルセッション -Name[ka]=სერმინალის სეანსები -Name[kk]=Терминал сеанстары -Name[km]=សម័យស្ថានីយ -Name[ko]=터미널 프로그램 -Name[lo]=ໂປຣແກຣມເທີມິເນລ -Name[lt]=Terminalo sesijos -Name[lv]=Termināla sesijas -Name[mk]=Терминалски сесии -Name[mn]=Терминал-Суултууд -Name[ms]=Sesi Terminal -Name[mt]=Sessjonijiet tat-terminal -Name[nb]=Terminaløkter -Name[nds]=Terminal-Törns -Name[ne]=टर्मिनल सत्र -Name[nl]=Terminal-sessies -Name[nn]=Terminaløkter -Name[nso]=Ditiragalo tsa Terminal -Name[pa]=ਟਰਮੀਨਲ ਸ਼ੈਸ਼ਨ -Name[pl]=Sesje terminala -Name[pt]=Sessões de Terminal -Name[pt_BR]=Sessões de Terminal -Name[ro]=Sesiuni de terminal -Name[ru]=Терминальные сеансы -Name[rw]=Imikoro Ihera -Name[se]=Terminálbargovuorut -Name[sk]=Sedenia terminálu -Name[sl]=Terminalske seje -Name[sr]=Сесије терминала -Name[sr@Latn]=Sesije terminala -Name[sv]=Terminalsessioner -Name[ta]=கடைசி அமர்வுகள் -Name[te]=టెర్మినల్ సెషన్లు -Name[tg]=Ҷаласаҳои терминал -Name[th]=เซสชันของเทอร์มินัล -Name[tr]=Uçbirim Oturumları -Name[tt]=Terminal Sessiläre -Name[uk]=Сеанси терміналів -Name[uz]=Terminal seanslari -Name[uz@cyrillic]=Терминал сеанслари -Name[ven]=Zwitenwa zwa theminala -Name[vi]=Phiên chạy đầu cuối -Name[wa]=Sessions do terminå -Name[xh]=Intlanganiso Yesiphelo sendlela -Name[zh_CN]=终端会话 -Name[zh_TW]=終端機工作階段 -Name[zu]=Iziqendu Zangaphandle + Comment=Menu for starting a terminal emulator with a session or bookmark -Comment[af]='n Kieslys wat 'n terminaal emuleerder met 'n sessie of boekmerk kan begin -Comment[ar]=قائمة لبدء تشغيل مضاهِ مطراف مع جلسة أو علامة موقع -Comment[be]=Меню для запуску эмулятара тэрміналу з сесіяй ці закладкай -Comment[bg]=Меню за стартиране на сесия в терминален прозорец -Comment[bs]=Meni za pokretanje simulatora terminala sa sesijom ili zabilješkom -Comment[ca]=Menú per engegar un emulador de terminal amb una sessió o punt -Comment[cs]=Nabídka pro spuštění teminálu s relací nebo záložkou -Comment[csb]=Menu zrëszëniô òkna terminala ze spamiãtóną sesëją abò załóżka -Comment[da]=Menu til at starte en terminalemulator med en session eller bogmærke -Comment[de]=Menü zum Starten des Terminal-Emulators mit einer Sitzung oder Lesezeichen -Comment[el]=Μενού για την εκκίνηση ενός εξομοιωτή τερματικού με μια συνεδρία ή σελιδοδείκτη -Comment[eo]=Menuo por lanĉi terminalsimulilon jam ŝarĝita kun seaco aŭ legosigno -Comment[es]=Menú para iniciar un emulador de terminal con una sesión o marcador -Comment[et]=Menüü seansi või järjehoidja käivitamiseks terminali emulaatoris -Comment[eu]=Terminal emuladorea saio edo laster-markaz abiarazteko menua -Comment[fa]=گزینگانی برای آغاز مقلد پایانه، توسط یک نشست یا چوب الف -Comment[fi]=Valikko pääteikkunan käynnistämiseen istunnon tai kirjanmerkin kanssa -Comment[fr]=Menu permettant de démarrer un émulateur de terminal à partir d'une session ou un signet -Comment[fy]=Menu foar it begjinnen fan in terminalemulaasje mei in sesje of blêdwizer -Comment[gl]=Menu para lanzar un emulador de terminal -Comment[he]=תפריט להפעלת מסוף עם הפעלה או סימנייה -Comment[hr]=Izbornik za pokretanje terminalske emulacije putem sesije ili oznake -Comment[hu]=Menü parancsértelmező indításához (könyvjelzővel is) -Comment[is]=Valmynd til að ræsa skjáhermi með setu eða bókamerki -Comment[it]=Menu per l'emulatore di terminale con una data sessione o segnalibro -Comment[ja]=指定したセッションやブックマーク先でターミナルエミュレータを起動します -Comment[kk]=Терминал сеансын не бетбелгіні ашу мәзірі -Comment[km]=ម៉ឺនុយសម្រាប់ចាប់ផ្ដើមកម្មវិធីត្រាប់តាមកម្មវិធីស្ថានីយជាមួយនឹងសម័យ ឬចំណាំ -Comment[lt]=Meniu terminalo emuliatoriaus paleidimui su tam tikra sesija ar - nuo žymeklio -Comment[mk]=Мени за стартување на терминалски емулатор со сесија или обележувач -Comment[nb]=Meny for å starte en terminalemulator med en økt eller et bokmerke -Comment[nds]=Menü för dat Starten vun en Terminal-Emulator mit Leestekens oder Törns -Comment[ne]=सत्र वा पुस्तकचिनोसँग टर्मिनल इमुलेटर सुरुआत गर्नका लागि मेनु -Comment[nl]=Menu voor het starten van een terminalemulatie met een sessie of bladwijzer -Comment[nn]=Meny for å starta ein terminalemulator med ei økt eller eit bokmerke -Comment[pl]=Menu uruchomienia okna terminala z zapamiętaną sesją lub zakładką -Comment[pt]=Um menu para iniciar um emulador de terminal com uma sessão ou favorito -Comment[pt_BR]=Menu para início de um emulador de terminal, com uma sessão ou favorito -Comment[ro]=Meniu pentru pornirea unui emulator de terminal cu o sesiune sau semn de carte -Comment[ru]=Быстрый доступ к сеансам и закладкам терминала -Comment[sk]=Menu pre spustenie emulátora terminálu so sedením alebo záložkou -Comment[sl]=Meni za zaganjanje terminalskega emulatorja s sejo ali zaznamkom -Comment[sr]=Мени за покретање емулатора терминала са сесијом или маркером -Comment[sr@Latn]=Meni za pokretanje emulatora terminala sa sesijom ili markerom -Comment[sv]=Meny för att starta en terminalemulator med en session eller bokmärke -Comment[th]=เมนูสำหรับเริ่มโปรแกรมจำลองเทอร์มินัล พร้อมกับวาระ หรือที่คั่นหน้า -Comment[tr]=Bir uçbirim düzenleyiciyi oturum ya da yer imi ile açmanızı sağlar -Comment[uk]=Меню для запуску терміналу емулятора через сеанс або закладку -Comment[vi]=Thực đơn chạy một trình đầu cuối với một phiên chạy hay một địa chỉ lưu trong sổ -Comment[wa]=Dressêye po-z enonder on terminå avou ene session ou ene rimåke -Comment[zh_CN]=以会话或书签启动终端模拟器的菜单 -Comment[zh_TW]=用來啟動作業階段和書籤的終端機模擬程式的選單 -Icon=konsole +Icon=konsole X-TDE-Library=kickermenu_konsole X-TDE-AuthorizeAction=shell_access diff --git a/kicker/menuext/prefmenu/CMakeLists.txt b/kicker/menuext/prefmenu/CMakeLists.txt index 448e03d74..14941196e 100644 --- a/kicker/menuext/prefmenu/CMakeLists.txt +++ b/kicker/menuext/prefmenu/CMakeLists.txt @@ -23,7 +23,11 @@ link_directories( ##### other data ################################ -install( FILES prefmenu.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/menuext ) +tde_create_translated_desktop( + SOURCE prefmenu.desktop + DESTINATION ${DATA_INSTALL_DIR}/kicker/menuext + PO_DIR kicker-desktops +) ##### kickermenu_prefmenu (module) ############## diff --git a/kicker/menuext/prefmenu/prefmenu.cpp b/kicker/menuext/prefmenu/prefmenu.cpp index 534387394..6df543bc3 100644 --- a/kicker/menuext/prefmenu/prefmenu.cpp +++ b/kicker/menuext/prefmenu/prefmenu.cpp @@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tdelocale.h> #include <kservice.h> #include <kservicegroup.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdesycoca.h> #include <kurl.h> #include <kurldrag.h> @@ -60,11 +60,11 @@ PrefMenu::PrefMenu(const TQString& label, { m_subMenus.setAutoDelete(true); - connect(KSycoca::self(), TQT_SIGNAL(databaseChanged()), - this, TQT_SLOT(clearOnClose())); + connect(KSycoca::self(), TQ_SIGNAL(databaseChanged()), + this, TQ_SLOT(clearOnClose())); - connect(this, TQT_SIGNAL(aboutToHide()), - this, TQT_SLOT(aboutToClose())); + connect(this, TQ_SIGNAL(aboutToHide()), + this, TQ_SLOT(aboutToClose())); } PrefMenu::~PrefMenu() @@ -136,7 +136,7 @@ void PrefMenu::mouseMoveEvent(TQMouseEvent * ev) { KPanelMenu::mouseMoveEvent(ev); - if ((ev->state() & Qt::LeftButton) != Qt::LeftButton) + if ((ev->state() & TQt::LeftButton) != TQt::LeftButton) { return; } @@ -198,7 +198,7 @@ void PrefMenu::mouseMoveEvent(TQMouseEvent * ev) // If the path to the desktop file is relative, try to get the full // path from KStdDirs. KURLDrag *d = new KURLDrag(KURL::List(url), this); - connect(d, TQT_SIGNAL(destroyed()), this, TQT_SLOT(dragObjectDestroyed())); + connect(d, TQ_SIGNAL(destroyed()), this, TQ_SLOT(dragObjectDestroyed())); d->setPixmap(icon); d->dragCopy(); @@ -224,7 +224,7 @@ void PrefMenu::dragEnterEvent(TQDragEnterEvent *event) void PrefMenu::dragLeaveEvent(TQDragLeaveEvent */*event*/) { // see PrefMenu::dragEnterEvent why this is nescessary - if (!TQT_TQRECT_OBJECT(frameGeometry()).contains(TQCursor::pos())) + if (!frameGeometry().contains(TQCursor::pos())) { KURLDrag::setTarget(0); } @@ -246,7 +246,7 @@ void PrefMenu::initialize() { insertItem(KickerLib::menuIconSet("kcontrol"), i18n("Trinity Control Center"), - this, TQT_SLOT(launchControlCenter())); + this, TQ_SLOT(launchControlCenter())); insertSeparator(); } @@ -328,7 +328,7 @@ void PrefMenu::slotExec(int id) return; } - kapp->propagateSessionManager(); + tdeApp->propagateSessionManager(); KSycocaEntry *e = m_entryMap[id]; KService::Ptr service = static_cast<KService *>(e); TDEApplication::startServiceByDesktopPath(service->desktopEntryPath(), @@ -358,7 +358,7 @@ void PrefMenu::slotClear() // QPopupMenu's aboutToHide() is emitted before the popup is really hidden, // and also before a click in the menu is handled, so do the clearing // only after that has been handled - TQTimer::singleShot( 100, this, TQT_SLOT( slotClear())); + TQTimer::singleShot( 100, this, TQ_SLOT( slotClear())); return; } diff --git a/kicker/menuext/prefmenu/prefmenu.desktop b/kicker/menuext/prefmenu/prefmenu.desktop index 88b0438f6..8e3caf723 100644 --- a/kicker/menuext/prefmenu/prefmenu.desktop +++ b/kicker/menuext/prefmenu/prefmenu.desktop @@ -1,143 +1,7 @@ [Desktop Entry] Name=Trinity Control Center -Name[af]=Beheer Sentrum -Name[ar]=مركز التحكم -Name[az]=İdarə Mərkəzi -Name[be]=Цэнтр кіравання -Name[bg]=Контролен център -Name[bn]=নিয়ন্ত্রণ কেন্দ্র -Name[br]=Kreizenn ren -Name[bs]=Kontrolni centar -Name[ca]=Centre de control -Name[cs]=Ovládací centrum -Name[csb]=Centróm kòntrolë -Name[cy]=Canolfan Rheoli -Name[da]=Kontrolcenter -Name[de]=Trinity-Kontrollzentrum -Name[el]=Κέντρο ελέγχου -Name[en_GB]=Control Centre -Name[eo]=Stircentro -Name[es]=Centro de control -Name[et]=Juhtimiskeskus -Name[eu]=Kontrol gunea -Name[fa]=مرکز کنترل -Name[fi]=Ohjauskeskus -Name[fr]=Centre de configuration de Trinity -Name[fy]=Konfiguraasjesintrum -Name[ga]=Lárionad Rialaithe -Name[gl]=Centro de Control -Name[he]=מרכז הבקרה -Name[hi]=नियंत्रण केंद्र -Name[hr]=Upravljačko središte -Name[hu]=Vezérlőpult -Name[id]=Pusat Kontrol -Name[is]=Stjórnborð -Name[it]=Centro di controllo di Trinity -Name[ja]=コントロールセンター -Name[ka]=საკონტროლო ცენტრი -Name[kk]=Басқару орталығы -Name[km]=មជ្ឈមណ្ឌលបញ្ជា -Name[ko]=제어판 모듈 -Name[lo]=ສູນຄວບຄຸມ -Name[lt]=Valdymo centras -Name[lv]=Vadības Centrs -Name[mk]=Контролен центар -Name[mn]=Удирдах төв -Name[ms]=Pusat Kawalan -Name[mt]=Ċentru tal-Kontroll -Name[nb]=Kontrollpanel -Name[nds]=Kuntrullzentrum -Name[ne]=नियन्त्रण केन्द्र -Name[nl]=Configuratiecentrum -Name[nn]=Kontrollsenter -Name[nso]=Bogare bja Taolo -Name[oc]=Centre de control -Name[pa]=ਕੰਟਰੋਲ ਕੇਂਦਰ -Name[pl]=Centrum sterowania -Name[pt]=Centro de Controlo -Name[pt_BR]=Centro de Controle -Name[ro]=Centrul de control -Name[ru]=Центр управления -Name[rw]=Kugenzura Hagati -Name[se]=Stivrenguovddáš -Name[sk]=Ovládacie Centrum -Name[sl]=Nadzorno središče -Name[sr]=Контролни центар -Name[sr@Latn]=Kontrolni centar -Name[ss]=Sikhungo sekulawula -Name[sv]=Inställningscentralen -Name[ta]=கட்டுப்பாட்டு மையம் -Name[te]=అధికార కేంద్రం -Name[tg]=Маркази контрол -Name[th]=ศูนย์ควบคุม -Name[tr]=Kontrol Merkezi -Name[tt]=İdärä Üzäge -Name[uk]=Центр керування -Name[uz]=Boshqaruv markazi -Name[uz@cyrillic]=Бошқарув маркази -Name[ven]=Senthara ya vhulanguli -Name[vi]=Trung tâm Điều khiển -Name[wa]=Cinte di contrôle -Name[xh]=Umbindi Wolawulo -Name[zh_CN]=控制中心 -Name[zh_TW]=控制中心 -Name[zu]=Indawo Yokulawula + Comment=Trinity Control Center modules menu -Comment[af]=Beheer Sentrum Modules kieslys -Comment[ar]=قائمة وحدات مركز التحكّم -Comment[be]=Меню модуляў Цэнтра кіравання -Comment[bg]=Меню на модулите в контролния център -Comment[bn]=বিভিন্ন নিয়ন্ত্রণ কেন্দ্র মডিউল সম্বলিত মেনু -Comment[ca]=Menú dels mòduls del centre de control -Comment[cs]=Nabídka modulů Ovládacího centra -Comment[csb]=Menu mòdułów Centróm kòntrolë -Comment[da]=Menu med moduler i kontrolcentret -Comment[de]=Das Menü für Kontrollzentrum-Module -Comment[el]=Μενού αρθρωμάτων κέντρου ελέγχου -Comment[en_GB]=Control Centre modules menu -Comment[eo]=Menuo de Stircentraj Moduloj -Comment[es]=Menú de los módulos del Centro de control -Comment[et]=Juhtimiskeskuse moodulite menüü -Comment[eu]=Kontrol gunearen moduluen menua -Comment[fa]=گزینگان پیمانههای مرکز کنترل -Comment[fi]=Ohjauskeskuksen moduulivalikko -Comment[fr]=Menu des modules du Centre de configuration de Trinity -Comment[fy]=Menu mei Konfiguraasjemodules -Comment[gl]=Menu dos Módulos do Centro de Control -Comment[he]=תפריט מודולי מרכז בקרה -Comment[hr]=Izbornik modula upravljačkog središta -Comment[hu]=Menü a Vezérlőpult moduljaival -Comment[is]=Valmynd stjórnborðseininga -Comment[it]=Menu dei moduli del centro di controllo di Trinity -Comment[ja]=コントロールセンターモジュールメニュー -Comment[kk]=Басқару орталықтың модульдер мәзірі -Comment[km]=ម៉ឺនុយម៉ូឌុលមជ្ឈមណ្ឌលបញ្ជា -Comment[ko]=제어판 모듈 -Comment[lt]=Valdymo centro modulių meniu -Comment[mk]=Мени со модулите од Контролниот центар -Comment[nb]=Meny for kontrollpanelmoduler -Comment[nds]=Kuntrullzentrum-Modulen -Comment[ne]=नियन्त्रण केन्द्र मोड्युल मेनु -Comment[nl]=Menu met Configuratiemodules -Comment[nn]=Meny for kontrollsentermodular -Comment[pa]=ਕੰਟਰੋਲ ਕੇਂਦਰ ਮੈਡੀਊਲ ਮੇਨੂ -Comment[pl]=Menu modułów Centrum sterowania -Comment[pt]=Menu de módulos do Centro de Controlo -Comment[pt_BR]=Menu dos módulos do Centro de Controle -Comment[ru]=Модули Центра управления -Comment[sk]=Menu pre moduly Ovládacieho centra -Comment[sl]=Meni z moduli Nadzornega središča -Comment[sr]=Мени модула Контролног центра -Comment[sr@Latn]=Meni modula Kontrolnog centra -Comment[sv]=Meny med moduler i Inställningscentralen -Comment[th]=เมนูของโมดูลของศูนย์ควบคุม -Comment[tr]=Kontrol Merkezi modülleri menüsü -Comment[uk]=Меню модулів в Центрі керування -Comment[uz]=Boshqaruv markazining modullari -Comment[uz@cyrillic]=Бошқарув марказининг модуллари -Comment[vi]=Trung tâm điều khiển mô đun thực đơn -Comment[wa]=Dressêye des modules do cinte di contrôle -Comment[zh_CN]=控制中心模块菜单 -Comment[zh_TW]=控制中心模組選單 + Icon=kcontrol X-TDE-Library=kickermenu_prefmenu diff --git a/kicker/menuext/prefmenu/prefmenu.h b/kicker/menuext/prefmenu/prefmenu.h index 10befe6b2..a56391ece 100644 --- a/kicker/menuext/prefmenu/prefmenu.h +++ b/kicker/menuext/prefmenu/prefmenu.h @@ -34,7 +34,7 @@ typedef TQPtrList<TQPopupMenu> PopupMenuList; class PrefMenu : public KPanelMenu { - Q_OBJECT + TQ_OBJECT public: PrefMenu(TQWidget *parent, diff --git a/kicker/menuext/recentdocs/CMakeLists.txt b/kicker/menuext/recentdocs/CMakeLists.txt index 4b3053efe..da82dba98 100644 --- a/kicker/menuext/recentdocs/CMakeLists.txt +++ b/kicker/menuext/recentdocs/CMakeLists.txt @@ -21,7 +21,11 @@ link_directories( ##### other data ################################ -install( FILES recentdocs.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/menuext ) +tde_create_translated_desktop( + SOURCE recentdocs.desktop + DESTINATION ${DATA_INSTALL_DIR}/kicker/menuext + PO_DIR kicker-desktops +) ##### kickermenu_recentdocs (module) ############ diff --git a/kicker/menuext/recentdocs/recentdocs.desktop b/kicker/menuext/recentdocs/recentdocs.desktop index 3fc34e43b..923d775ca 100644 --- a/kicker/menuext/recentdocs/recentdocs.desktop +++ b/kicker/menuext/recentdocs/recentdocs.desktop @@ -1,140 +1,7 @@ [Desktop Entry] Name=Recent Documents -Name[af]=Onlangse Dokumente -Name[ar]=مستندات حديثة -Name[az]=Son Sənədlər -Name[be]=Ранейшыя дакументы -Name[bg]=Документи -Name[bn]=সম্প্রতি ব্যবহৃত নথী -Name[br]=Teulioù nevez -Name[bs]=Najnoviji dokumenti -Name[ca]=Documents recents -Name[cs]=Nedávné dokumenty -Name[csb]=Slédno òtemkłé dokùmentë -Name[cy]=Dogfenni Diweddar -Name[da]=Nylige dokumenter -Name[de]=Zuletzt geöffnete Dokumente -Name[el]=Πρόσφατα έγγραφα -Name[eo]=Lastaj dokumentoj -Name[es]=Documentos recientes -Name[et]=Viimati kasutatud dokumendid -Name[eu]=Azken dokumentuak -Name[fa]=سندهای اخیر -Name[fi]=Viimeaikaiset asiakirjat -Name[fr]=Documents récents -Name[fy]=Nijste dokuminten -Name[ga]=Cáipéisí is déanaí -Name[gl]=Documentos Recentes -Name[he]=מסמכים אחרונים -Name[hi]=हालिया दस्तावेज़ -Name[hr]=Nedavno pristupljeni dokumenti -Name[hu]=A legutóbbi dokumentumok -Name[is]=Nýleg skjöl -Name[it]=Documenti recenti -Name[ja]=最近開いたドキュメント -Name[ka]=ბოლო დოკუმენტები -Name[kk]=Жуырдағы құжаттар -Name[km]=ឯកសារថ្មីៗនេះ -Name[lo]=ເອກະສານຂໍ້ຄວາມ -Name[lt]=Neseni dokumentai -Name[lv]=Nesenie dokumenti -Name[mk]=Скорешни документи -Name[mn]=Сүүлд нээгдсэн баримтууд -Name[ms]=Dokumen Terkini -Name[mt]=Dokumenti riċenti -Name[nb]=Nylig brukte dokumenter -Name[nds]=Tolest bruukte Dokmenten -Name[ne]=हालको कागजात -Name[nl]=Recente documenten -Name[nn]=Nyleg bruka dokument -Name[nso]=Ditokomane tsa Gabjale -Name[pa]=ਤਾਜ਼ਾ ਦਸਤਾਵੇਜ਼ -Name[pl]=Ostatnio otwarte dokumenty -Name[pt]=Documentos Recentes -Name[pt_BR]=Documentos Recentes -Name[ro]=Documente recente -Name[ru]=Последние документы -Name[rw]=Inyandiko za Vuba -Name[se]=Áiddo geavahuvvon dokumeanttat -Name[sk]=Nedávne dokumenty -Name[sl]=Nedavni dokumenti -Name[sr]=Пређашњи документи -Name[sr@Latn]=Pređašnji dokumenti -Name[sv]=Senaste dokument -Name[ta]=தற்போதைய ஆவணங்கள் -Name[tg]=Ҳуҷҷатҳои охирин -Name[th]=เอกสารที่เคยเรียกใช้ -Name[tr]=Son Kullanılan Belgeler -Name[tt]=Soñğı İstäleklär -Name[uk]=Недавні документи -Name[uz]=Yaqinda ochilgan hujjatlar -Name[uz@cyrillic]=Яқинда очилган ҳужжатлар -Name[ven]=Manwalwa a Zwino -Name[vi]=Tài liệu Gần đây -Name[wa]=Documints d' enawaire -Name[xh]=Uxwebhu Olusandukusebenziswa -Name[zh_CN]=最近文档 -Name[zh_TW]=最近的文件 -Name[zu]=Ushicilelo olusanda kuvulwa + Comment=Menu of documents you have used recently -Comment[af]=Kieslys met dokumente wat onlangs deur jou gebruik is -Comment[ar]=قائمة المستنادات التي إستخدمتها حديثاً -Comment[be]=Меню раней выкарыстаных дакументаў -Comment[bg]=Последно използвани документи -Comment[bn]=আপনি সম্প্রতি ব্যবহার করেছেন এমন নথীর তালিকা -Comment[bs]=Meni sa dokumentima koje ste nedavno koristili -Comment[ca]=Menú dels documents usats fa poc -Comment[cs]=Nabídka nedávno použitých dokumentů -Comment[csb]=Menu slédno òtemkłëch dokùmentów -Comment[da]=Menu med dokumenter du har brugt for nyligt -Comment[de]=Menü mit Dokumenten, die Sie zuletzt geöffnet hatten -Comment[el]=Μενού εγγράφων που χρησιμοποιήθηκαν πρόσφατα -Comment[eo]=Menuo de dokumentoj kiujn vi laste uzis -Comment[es]=Menú de los documentos recientemente usados -Comment[et]=Viimati kasutatud dokumentide menüü -Comment[eu]=Erabili dituzun azken dokumentuen menua -Comment[fa]=گزینگان سندهایی که اخیراً استفاده کردهاید -Comment[fi]=Viimeksi käyttämiesi asiakirjojen valikko -Comment[fr]=Menu des documents récemment utilisés -Comment[fy]=Menu mei dokuminten dy jo koartlyn iepene ha -Comment[gl]=Os documentos que usou recentemente -Comment[he]=תפריט המסמכים שהשתמשת בהם לאחרונה -Comment[hr]=Izbornik s nedavno pristupljenim dokumentima -Comment[hu]=A nemrég használt dokumentumok menüje -Comment[is]=Listi yfir skjöl sem þú hefur nýlega notað -Comment[it]=Menu dei documenti usati recentemente -Comment[ja]=最近使ったドキュメントのメニュー -Comment[ka]=ბოლო დროს გამოყენებული დოკუმენტების მენიუ -Comment[kk]=Жуырда қолданған құжаттар мәзірі -Comment[km]=ម៉ឺនុយឯកសារដែលអ្នកបានប្រើថ្មីៗនេះ -Comment[lt]=Nesenai naudotų dokumentų meniu -Comment[mk]=Мени со последните документи што сте ги користеле -Comment[nb]=Meny over dokumenter du nylig har brukt -Comment[nds]=Menü vun Dokmenten, de Du tolest bruukt hest -Comment[ne]=तपाईँले भरखरै प्रयोग गर्नु भएको कागजातका मेनु -Comment[nl]=Menu met documenten die u recentelijk hebt geopend -Comment[nn]=Meny over dokument du nyleg har bruka -Comment[pa]=ਤਾਜ਼ਾ ਦਸਤਾਵੇਜ਼, ਜੋ ਕਿ ਤੁਸੀਂ ਹੁਣੇ ਵਰਤੇ ਹਨ -Comment[pl]=Menu ostatnio używanych dokumentów -Comment[pt]=Menu com os documentos recentes que você usou -Comment[pt_BR]=Menu de documentos que você usou recentemente -Comment[ro]=Meniu cu lista de documente pe care le-ați utilizat recent -Comment[ru]=Последние документы -Comment[se]=Fállu mii čájeha dokumeanttaid mat áiddo leat geavahuvvon -Comment[sk]=Menu nedávno použitých dokumentov -Comment[sl]=Meni z dokumenti, ki ste jih uporabljali pred kratkim -Comment[sr]=Мени докумената које сте скорије користили -Comment[sr@Latn]=Meni dokumenata koje ste skorije koristili -Comment[sv]=Meny med dokument som du nyligen har använt -Comment[th]=เมนูของเอกสารที่คุณเคยเรียกใช้มาแล้ว -Comment[tr]=Son kullanılan belgelerin menüsü -Comment[uk]=Меню документів, які ви недавно використовували -Comment[uz]=Yaqinda ishlatilgan hujjatlarning menyusi -Comment[uz@cyrillic]=Яқинда ишлатилган ҳужжатларнинг менюси -Comment[vi]=Thực đơn chứa các tài liệu bạn mới truy cập gần đây -Comment[wa]=Dressêye des documints ki vs avoz eployîz enawaire -Comment[zh_CN]=您最近使用过的文档的菜单 -Comment[zh_TW]=您最近使用過的文件選單 -Icon=text-x-generic +Icon=text-x-generic X-TDE-Library=kickermenu_recentdocs diff --git a/kicker/menuext/recentdocs/recentdocsmenu.cpp b/kicker/menuext/recentdocs/recentdocsmenu.cpp index 19adfa868..df583f3f3 100644 --- a/kicker/menuext/recentdocs/recentdocsmenu.cpp +++ b/kicker/menuext/recentdocs/recentdocsmenu.cpp @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kiconloader.h> #include <kmimetype.h> #include <tdelocale.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <tdeglobalsettings.h> #include <tdeapplication.h> #include <kurldrag.h> @@ -52,7 +52,7 @@ RecentDocsMenu::~RecentDocsMenu() void RecentDocsMenu::initialize() { if (initialized()) clear(); - insertItem(SmallIconSet("history_clear"), i18n("Clear History"), this, TQT_SLOT(slotClearHistory())); + insertItem(SmallIconSet("history_clear"), i18n("Clear History"), this, TQ_SLOT(slotClearHistory())); insertSeparator(); _fileList = TDERecentDocument::recentDocuments(); @@ -67,7 +67,7 @@ void RecentDocsMenu::initialize() { char alreadyPresentInMenu; TQStringList previousEntries; for (TQStringList::ConstIterator it = _fileList.begin(); it != _fileList.end(); ++it) { - KDesktopFile f(*it, true /* read only */); + TDEDesktopFile f(*it, true /* read only */); // Make sure this entry is not already present in the menu alreadyPresentInMenu = 0; @@ -96,7 +96,7 @@ void RecentDocsMenu::slotClearHistory() { void RecentDocsMenu::slotExec(int id) { if (id >= 0) { - kapp->propagateSessionManager(); + tdeApp->propagateSessionManager(); KURL u; u.setPath(_fileList[id]); KDEDesktopMimeType::run(u, true); @@ -111,10 +111,10 @@ void RecentDocsMenu::mousePressEvent(TQMouseEvent* e) { void RecentDocsMenu::mouseMoveEvent(TQMouseEvent* e) { KPanelMenu::mouseMoveEvent(e); - if (!(e->state() & Qt::LeftButton)) + if (!(e->state() & TQt::LeftButton)) return; - if (!TQT_TQRECT_OBJECT(rect()).contains(_mouseDown)) + if (!rect().contains(_mouseDown)) return; int dragLength = (e->pos() - _mouseDown).manhattanLength(); @@ -128,7 +128,7 @@ void RecentDocsMenu::mouseMoveEvent(TQMouseEvent* e) { if (id < 0) return; - KDesktopFile f(_fileList[id], true /* read only */); + TDEDesktopFile f(_fileList[id], true /* read only */); KURL url ( f.readURL() ); diff --git a/kicker/menuext/recentdocs/recentdocsmenu.h b/kicker/menuext/recentdocs/recentdocsmenu.h index 487a9fe94..2ec65a1a4 100644 --- a/kicker/menuext/recentdocs/recentdocsmenu.h +++ b/kicker/menuext/recentdocs/recentdocsmenu.h @@ -31,7 +31,7 @@ class TQPoint; class RecentDocsMenu : public KPanelMenu { - Q_OBJECT + TQ_OBJECT public: RecentDocsMenu(TQWidget* parent, const char* name, const TQStringList &/*args*/); diff --git a/kicker/menuext/remote/CMakeLists.txt b/kicker/menuext/remote/CMakeLists.txt index 247b5f01d..c1b89711a 100644 --- a/kicker/menuext/remote/CMakeLists.txt +++ b/kicker/menuext/remote/CMakeLists.txt @@ -22,7 +22,11 @@ link_directories( ##### other data ################################ -install( FILES remotemenu.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/menuext ) +tde_create_translated_desktop( + SOURCE remotemenu.desktop + DESTINATION ${DATA_INSTALL_DIR}/kicker/menuext + PO_DIR kicker-desktops +) ##### kickermenu_remotemenu (module) ############ diff --git a/kicker/menuext/remote/remotemenu.cpp b/kicker/menuext/remote/remotemenu.cpp index aeaff8e94..b9556a15a 100644 --- a/kicker/menuext/remote/remotemenu.cpp +++ b/kicker/menuext/remote/remotemenu.cpp @@ -21,10 +21,10 @@ #include <kdebug.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <krun.h> #include <kiconloader.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <kservice.h> #include <tqpixmap.h> @@ -68,9 +68,9 @@ void RemoteMenu::initialize() } id = insertItem(SmallIcon("wizard"), i18n("Add Network Folder")); - connectItem(id, this, TQT_SLOT(startWizard())); + connectItem(id, this, TQ_SLOT(startWizard())); id = insertItem(SmallIcon("kfm"), i18n("Manage Network Folders")); - connectItem(id, this, TQT_SLOT(openRemoteDir())); + connectItem(id, this, TQ_SLOT(openRemoteDir())); insertSeparator(); @@ -97,7 +97,7 @@ void RemoteMenu::initialize() { names_found.append(*name); TQString filename = *dirpath+*name; - KDesktopFile desktop(filename); + TDEDesktopFile desktop(filename); id = insertItem(SmallIcon(desktop.readIcon()), desktop.readName()); m_desktopMap[id] = filename; } diff --git a/kicker/menuext/remote/remotemenu.desktop b/kicker/menuext/remote/remotemenu.desktop index bedfdc312..a23866222 100644 --- a/kicker/menuext/remote/remotemenu.desktop +++ b/kicker/menuext/remote/remotemenu.desktop @@ -1,133 +1,7 @@ [Desktop Entry] Name=Network Folders -Name[af]=Netwerk Gidse -Name[ar]=مجلّدات الشبكة -Name[be]=Сеткавыя тэчкі -Name[bg]=Мрежови директории -Name[bn]=নেটওয়ার্ক ফোল্ডার -Name[br]=Renkelloù rouedad -Name[bs]=Mrežni folderi -Name[ca]=Carpetes de xarxa -Name[cs]=Síťové složky -Name[csb]=Sécowé katalodżi -Name[da]=Netværksmapper -Name[de]=Netzwerkordner -Name[el]=Δικτυακοί φάκελοι -Name[eo]=Retaj Dosierujoj -Name[es]=Carpetas de red -Name[et]=Võrgukataloogid -Name[eu]=Sareko karpetak -Name[fa]=پوشههای شبکه -Name[fi]=Verkkokansiot -Name[fr]=Dossiers réseau -Name[fy]=Netwurkmappen -Name[ga]=Fillteáin Líonra -Name[gl]=Cartafoles en Rede -Name[he]=תיקיות רשת -Name[hi]=नेटवर्क फोल्डर्स -Name[hr]=Mrežne mape -Name[hu]=Hálózati mappák -Name[is]=Netmöppur -Name[it]=Cartelle di rete -Name[ja]=ネットワークフォルダ -Name[ka]=ქსელური საქაღალდეები -Name[kk]=Желідегі қапшықтар -Name[km]=ថតបណ្ដាញ -Name[ko]=네트워크 폴더 마법사 -Name[lt]=Tinklo aplankai -Name[lv]=Tīkla mape -Name[mk]=Мрежни папки -Name[ms]=Folder Rangkaian -Name[nb]=Nettverksmapper -Name[nds]=Nettwarkorner -Name[ne]=सञ्जाल फोल्डर -Name[nl]=Netwerkmappen -Name[nn]=Nettverksmapper -Name[pa]=ਨੈੱਟਵਰਕ ਫੋਲਡਰ -Name[pl]=Foldery sieciowe -Name[pt]=Pastas de Rede -Name[pt_BR]=Pastas de Rede -Name[ro]=Foldere de rețea -Name[ru]=Сетевые папки -Name[rw]=Ububiko bw'Urusobemiyoboro -Name[se]=Fierpmádatmáhpat -Name[sk]=Sieťové priečinky -Name[sl]=Omrežne mape -Name[sr]=Мрежне фасцикле -Name[sr@Latn]=Mrežne fascikle -Name[sv]=Nätverkskataloger -Name[ta]=வலைப்பின்னல் அடைவுகள் -Name[te]=నెట్వర్క్ ఫొల్డర్లు -Name[tg]=Феҳрастҳои шабака -Name[th]=โฟลเดอร์เครือข่าย -Name[tr]=Ağ Dizinleri -Name[tt]=Çeltärle Törgäklär -Name[uk]=Мережні теки -Name[uz]=Tarmoq jildlari -Name[uz@cyrillic]=Тармоқ жилдлари -Name[vi]=Thư mục Mạng -Name[wa]=Ridants rantoele -Name[zh_CN]=网络文件夹 -Name[zh_TW]=網路資料夾 + Comment=Menu of network folders -Comment[af]=Kieslys vir netwerk gidse -Comment[ar]=قائمة مجلّدات الشبكة -Comment[be]=Меню сеткавых тэчак -Comment[bg]=Меню за достъп до мрежови директории -Comment[bn]=নেটওয়ার্ক ফোল্ডার-এর তালিকা -Comment[bs]=Meni sa mrežnim direktorijima -Comment[ca]=Menú de les carpetes de xarxa -Comment[cs]=Nabídka síťových složek -Comment[csb]=Menu sécowëch katalogów -Comment[da]=Menu med netværksmapper -Comment[de]=Menü für den Zugriff auf Netzwerkordner -Comment[el]=Μενού των δικτυακών φακέλων -Comment[eo]=Menuo de retaj dosierujoj -Comment[es]=Menú de las carpetas de red -Comment[et]=Võrgukataloogide menüü -Comment[eu]=Sareko karpeten menua -Comment[fa]=گزینگان پوشههای شبکه -Comment[fi]=Verkkokansiovalikko -Comment[fr]=Menu des dossiers réseau -Comment[fy]=Menu mei netwurkmappen -Comment[gl]=Aceso doado cartafoles en rede -Comment[he]=תפריט של תיקיות רשת -Comment[hr]=Izbornik mrežnih mapa -Comment[hu]=A hálózati mappák menüje -Comment[is]=Einföld leið að netmöppum -Comment[it]=Menu delle cartelle di rete -Comment[ja]=ネットワークフォルダのメニュー -Comment[ka]=ქსელური დასტების მენიუ -Comment[kk]=Желідегі қапшықтар мәзірі -Comment[km]=ម៉ឺនុយរបស់ថតបណ្តាញ -Comment[lt]=Tinklo aplankų meniu -Comment[mk]=Мени на мрежните папки -Comment[nb]=Meny over nettverksmappene -Comment[nds]=Menü vun Nettwarkornern -Comment[ne]=सञ्जाल फोल्डरको मेनु -Comment[nl]=Menu met netwerkmappen -Comment[nn]=Meny over nettverksmapper -Comment[pa]=ਨੈੱਟਵਰਕ ਫੋਲਡਰ ਲਈ ਮੇਨੂ -Comment[pl]=Menu folderów sieciowych -Comment[pt]=Menu de pastas de rede -Comment[pt_BR]=Acesso fácil às pastas de rede -Comment[ro]=Meniu cu folderele de rețea -Comment[ru]=Быстрый доступ к сетевым папкам -Comment[se]=Fállu mii čájeha fierpmádatmáhpaid -Comment[sk]=Menu sieťových priečinkov -Comment[sl]=Meni z omrežnimi mapami -Comment[sr]=Мени мрежних фасцикли -Comment[sr@Latn]=Meni mrežnih fascikli -Comment[sv]=Meny med nätverkskataloger -Comment[th]=เมนูของโฟลเดอร์บนเครือข่าย -Comment[tr]=Ağ dizinlerinin menüsü -Comment[uk]=Меню мережних тек -Comment[uz]=Tarmoq jildlarining menyusi -Comment[uz@cyrillic]=Тармоқ жилдларининг менюси -Comment[vi]=Thực đơn chứa thư mục mạng -Comment[wa]=Dressêye des ridants rantoele -Comment[zh_CN]=网络文件夹菜单 -Comment[zh_TW]=網路資料夾選單 -Icon=network +Icon=network X-TDE-Library=kickermenu_remotemenu diff --git a/kicker/menuext/remote/remotemenu.h b/kicker/menuext/remote/remotemenu.h index 607e1fc64..327cc79b2 100644 --- a/kicker/menuext/remote/remotemenu.h +++ b/kicker/menuext/remote/remotemenu.h @@ -26,7 +26,7 @@ class RemoteMenu : public KPanelMenu, public KDirNotify { - Q_OBJECT + TQ_OBJECT K_DCOP public: diff --git a/kicker/menuext/system/CMakeLists.txt b/kicker/menuext/system/CMakeLists.txt index 9f42aab6a..01c9a8821 100644 --- a/kicker/menuext/system/CMakeLists.txt +++ b/kicker/menuext/system/CMakeLists.txt @@ -22,7 +22,11 @@ link_directories( ##### other data ################################ -install( FILES systemmenu.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/menuext ) +tde_create_translated_desktop( + SOURCE systemmenu.desktop + DESTINATION ${DATA_INSTALL_DIR}/kicker/menuext + PO_DIR kicker-desktops +) ##### kickermenu_systemmenu (module) ############ diff --git a/kicker/menuext/system/systemmenu.cpp b/kicker/menuext/system/systemmenu.cpp index 12ec087d8..e738e7af9 100644 --- a/kicker/menuext/system/systemmenu.cpp +++ b/kicker/menuext/system/systemmenu.cpp @@ -32,8 +32,8 @@ SystemMenu::SystemMenu(TQWidget *parent, const char *name, const TQStringList &/*args*/) : KPanelMenu( parent, name) { - connect( &m_dirLister, TQT_SIGNAL( completed() ), - this, TQT_SLOT( slotCompleted() ) ); + connect( &m_dirLister, TQ_SIGNAL( completed() ), + this, TQ_SLOT( slotCompleted() ) ); m_dirLister.openURL(KURL("system:/")); } diff --git a/kicker/menuext/system/systemmenu.desktop b/kicker/menuext/system/systemmenu.desktop index cfd510679..38226f492 100644 --- a/kicker/menuext/system/systemmenu.desktop +++ b/kicker/menuext/system/systemmenu.desktop @@ -1,127 +1,7 @@ [Desktop Entry] Name=System Menu -Name[af]=Stelsel Kieslys -Name[ar]=قائمة النظام -Name[be]=Сістэмнае меню -Name[bg]=Системно меню -Name[bn]=সিস্টেম মেনু -Name[br]=Meuziad ar reizhiad -Name[bs]=Sistemski meni -Name[ca]=Menú de sistema -Name[cs]=Systémová nabídka -Name[csb]=Systema -Name[cy]=Dewislen y Cysawd -Name[da]=Systemmenu -Name[de]=System-Menü -Name[el]=Μενού συστήματος -Name[eo]=SistemMenuo -Name[es]=Menú del sistema -Name[et]=Süsteemi menüü -Name[eu]=Sistemaren menua -Name[fa]=گزینگان سیستم -Name[fi]=Järjestelmävalikko -Name[fr]=Menu du système -Name[fy]=Systeemmenu -Name[ga]=Roghchlár an Chórais -Name[gl]=Sistema -Name[he]=תפריט מערכת -Name[hr]=Sistemski izbornik -Name[hu]=Rendszermenü -Name[is]=Kerfisvalmynd -Name[it]=Menu di Sistema -Name[ja]=システムメニュー -Name[ka]=სისტემის მენიუ -Name[kk]=Жүйе мәзірі -Name[km]=ប្រព័ន្ធម៉ឺនុយ -Name[lt]=Sistemos meniu -Name[mk]=Системско мени -Name[nb]=Systemmeny -Name[nds]=Systeem-Menü -Name[ne]=प्रणाली मेनु -Name[nl]=Systeemmenu -Name[nn]=Systemmeny -Name[pa]=ਸਿਸਟਮ ਮੇਨੂ -Name[pl]=System -Name[pt]=Menu do Sistema -Name[pt_BR]=Menu Sistema -Name[ro]=Meniu sistem -Name[ru]=Система -Name[se]=Vuogádatfállu -Name[sk]=Systémové menu -Name[sl]=Sistem -Name[sr]=Системски мени -Name[sr@Latn]=Sistemski meni -Name[sv]=Systemmeny -Name[te]=వ్యవస్థ పట్టి -Name[tg]=Менюи система -Name[th]=เมนูระบบ -Name[tr]=Sistem Menüsü -Name[uk]=Системне меню -Name[uz]=Tizim menyusi -Name[uz@cyrillic]=Тизим менюси -Name[vi]=Thực đơn Hệ thống -Name[wa]=Dressêye sistinme -Name[zh_CN]=系统菜单 -Name[zh_TW]=系統選單 + Comment=Menu of important system places -Comment[af]=Kieslys vir belangrike stelsel plekke -Comment[ar]=قائمة أمكنة النظام الهامة -Comment[be]=Меню важных сістэмных месцаў -Comment[bg]=Меню за достъп до системните директории -Comment[bn]=সিস্টেমের গুরুত্বপূর্ণ অবস্থানগুলির তালিকা -Comment[bs]=Meni sa sistemskim lokacijama -Comment[ca]=Menú de llocs importants del sistema -Comment[cs]=Nabídka důležitých systémových míst -Comment[csb]=Menu z wôżnëma placama systemë -Comment[da]=Menu med vigtige steder på systemet -Comment[de]=Einfacher Zugriff auf Systemordner -Comment[el]=Μενού σημαντικών τοποθεσιών του συστήματος -Comment[eo]=Menuo de gravaj sistemlokoj -Comment[es]=Menú de lugares importantes del sistema -Comment[et]=Olulisemate süsteemi osade menüü -Comment[eu]=Sistemaren leku garrantzitsuen menua -Comment[fa]=گزینگان جاهای مهم سیستم -Comment[fi]=Järjestelmän tärkeiden asetuksien valikko -Comment[fr]=Menu dirigeant vers les endroits importants du système -Comment[fy]=Menu mei wichtige systeemgebieden -Comment[gl]=Aceso doado a lugares de importáncia para o sistema -Comment[he]=תפריט של מקומות מערכת חשובים -Comment[hr]=Izbornik važnih lokacija sustava -Comment[hu]=A rendszerkönyvtárak menüje -Comment[is]=Fljótleg leið að mikilvægum kerfishlutum -Comment[it]=Menu con gli oggetti importanti del sistema -Comment[ja]=システムの重要な場所にアクセスするためのメニュー -Comment[ka]=სისტემის მნიშვნელოვან ადგილთა მენიუ -Comment[kk]=Маңызды жүйелік орындарының мәзірі -Comment[km]=ម៉ឺនុយកន្លែងប្រព័ន្ធសំខាន់ -Comment[lt]=Svarbių sistemos vietų meniu -Comment[mk]=Мени со важни системски ресурси -Comment[nb]=Meny over viktige systemsteder -Comment[nds]=Menü vun wichtig Systeemornern -Comment[ne]=महत्वपूर्ण प्रणाली स्थानको मेनु -Comment[nl]=Menu met belangrijke systeemgebieden -Comment[nn]=Meny over viktige systemstader -Comment[pa]=ਸਿਸਟਮ ਥਾਵਾਂ ਲ਼ਈ ਮੇਨੂ -Comment[pl]=Menu z ważnymi miejscami systemu -Comment[pt]=Um menu com os locais importantes do sistema -Comment[pt_BR]=Acesso fácil a locais importantes do sistema -Comment[ro]=Meniu cu locații importante din sistem -Comment[ru]=Быстрый доступ к системным ресурсам -Comment[se]=Fállu mii čájeha dehálaš báikkiid vuogádagas -Comment[sk]=Menu dôležitých systémových miest -Comment[sl]=Meni s pomembnimi sistemskimi lokacijami -Comment[sr]=Мени важних места на систему -Comment[sr@Latn]=Meni važnih mesta na sistemu -Comment[sv]=Meny med viktiga systemplatser -Comment[th]=เมนูสำหรับที่สำคัญๆ ของระบบ -Comment[tr]=Önemli sistem yerlerinin menüsü -Comment[uk]=Меню важливих місць в системі -Comment[uz]=Tizimda muhim boʻlgan joylarning menyusi -Comment[uz@cyrillic]=Тизимда муҳим бўлган жойларнинг менюси -Comment[vi]=Thực đơn chứa các liên kết hệ thống quan trọng -Comment[wa]=Dressêye des impôrtantès plaeces do sistinmes -Comment[zh_CN]=重要系统位置的菜单 -Comment[zh_TW]=重要系統位置選單 -Icon=computer +Icon=computer X-TDE-Library=kickermenu_systemmenu diff --git a/kicker/menuext/system/systemmenu.h b/kicker/menuext/system/systemmenu.h index 1efbc3c57..26263af81 100644 --- a/kicker/menuext/system/systemmenu.h +++ b/kicker/menuext/system/systemmenu.h @@ -27,7 +27,7 @@ class SystemMenu : public KPanelMenu { - Q_OBJECT + TQ_OBJECT public: SystemMenu(TQWidget *parent, const char *name, diff --git a/kicker/menuext/tdeprint/CMakeLists.txt b/kicker/menuext/tdeprint/CMakeLists.txt index a013bcf82..24a14374d 100644 --- a/kicker/menuext/tdeprint/CMakeLists.txt +++ b/kicker/menuext/tdeprint/CMakeLists.txt @@ -21,7 +21,11 @@ link_directories( ##### other data ################################ -install( FILES printmenu.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/menuext ) +tde_create_translated_desktop( + SOURCE printmenu.desktop + DESTINATION ${DATA_INSTALL_DIR}/kicker/menuext + PO_DIR kicker-desktops +) ##### kickermenu_tdeprint (module) ############## diff --git a/kicker/menuext/tdeprint/print_mnu.cpp b/kicker/menuext/tdeprint/print_mnu.cpp index 3a1b31145..c0ca57d7c 100644 --- a/kicker/menuext/tdeprint/print_mnu.cpp +++ b/kicker/menuext/tdeprint/print_mnu.cpp @@ -103,13 +103,13 @@ void PrintMenu::slotExec(int ID) switch (ID) { case ADD_PRINTER_ID: - kapp->tdeinitExec("kaddprinterwizard"); + tdeApp->tdeinitExec("kaddprinterwizard"); break; case TDEPRINT_SETTINGS_ID: - kapp->tdeinitExec("kaddprinterwizard", TQStringList("--tdeconfig")); + tdeApp->tdeinitExec("kaddprinterwizard", TQStringList("--tdeconfig")); break; case CONFIG_SERVER_ID: - kapp->tdeinitExec("kaddprinterwizard", TQStringList("--serverconfig")); + tdeApp->tdeinitExec("kaddprinterwizard", TQStringList("--serverconfig")); break; case PRINT_MANAGER_ID: KRun::runCommand("tdecmshell tde-printers.desktop"); @@ -118,14 +118,14 @@ void PrintMenu::slotExec(int ID) KRun::runCommand("kfmclient openProfile filemanagement print:/", "kfmclient", "konqueror"); break; case KPRINTER_ID: - kapp->tdeinitExec("kprinter"); + tdeApp->tdeinitExec("kprinter"); break; default: { // start kjobviewer TQStringList args; args << "--show" << "-d" << text(ID).remove('&'); - kapp->tdeinitExec("kjobviewer", args); + tdeApp->tdeinitExec("kjobviewer", args); } break; } diff --git a/kicker/menuext/tdeprint/print_mnu.h b/kicker/menuext/tdeprint/print_mnu.h index 47c9e609e..4be9b80a5 100644 --- a/kicker/menuext/tdeprint/print_mnu.h +++ b/kicker/menuext/tdeprint/print_mnu.h @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class PrintMenu : public KPanelMenu, public KPReloadObject { - Q_OBJECT + TQ_OBJECT public: PrintMenu(TQWidget *parent, const char *name, const TQStringList & /*args*/); diff --git a/kicker/menuext/tdeprint/printmenu.desktop b/kicker/menuext/tdeprint/printmenu.desktop index b16189fb7..196178170 100644 --- a/kicker/menuext/tdeprint/printmenu.desktop +++ b/kicker/menuext/tdeprint/printmenu.desktop @@ -1,144 +1,7 @@ [Desktop Entry] Name=Print System -Name[af]=Drukker Stelsel -Name[ar]=نظام الطباعة -Name[az]=Çap Sistemi -Name[be]=Сістэма друку -Name[bg]=Система за печат -Name[bn]=মুদ্রণ ব্যবস্থা -Name[br]=Reizhiad moulañ -Name[bs]=Sistem štampe -Name[ca]=Sistema d'impressió -Name[cs]=Tiskový systém -Name[csb]=Systema drëkù -Name[cy]=Cysawd Argraffu -Name[da]=Udskriftssystem -Name[de]=Drucksystem -Name[el]=Σύστημα εκτύπωσης -Name[eo]=Printosistemo -Name[es]=Sistema de impresión -Name[et]=Trükkimissüsteem -Name[eu]=Inprimaketa sistema -Name[fa]=سیستم چاپ -Name[fi]=Tulostusjärjestelmä -Name[fr]=Système d'impression -Name[fy]=Printsysteem -Name[ga]=Córas Priontála -Name[gl]=Sistema de Impresión -Name[he]=מערכת הדפסה -Name[hi]=छापा तंत्र -Name[hr]=Sustav za ispisivanje -Name[hu]=Nyomtatási rendszer -Name[is]=Prentkerfi -Name[it]=Sistema di stampa -Name[ja]=印刷システム -Name[ka]=ბეჭდვის სისტემა -Name[kk]=Басып шығару -Name[km]=ប្រព័ន្ធបោះពុម្ព -Name[ko]=모던 시스템 -Name[ku]=Pergala Çapkirinê -Name[lo]=ລະບົບການພິມ -Name[lt]=Spausdinimo sistema -Name[lv]=Drukas Sistēma -Name[mk]=Печатарски систем -Name[mn]=Хэвлэх систем -Name[ms]=Cetak Sistem -Name[mt]=Sistema tal-ipprintjar -Name[nb]=Utskriftsystem -Name[nds]=Drucksysteem -Name[ne]=मुद्रण प्रणाली -Name[nl]=Afdruksysteem -Name[nn]=Utskriftssystem -Name[nso]=System ya Kgatiso -Name[pa]=ਪਰਿੰਟ ਸਿਸਟਮ -Name[pl]=System drukowania -Name[pt]=Sistema de Impressão -Name[pt_BR]=Sistema de Impressão -Name[ro]=Sistem de tipărire -Name[ru]=Система печати -Name[rw]=Sisitemu Gucapa -Name[se]=Čálihanvuogádat -Name[sk]=Tlačový systém -Name[sl]=Tiskalniški sistem -Name[sr]=Систем за штампу -Name[sr@Latn]=Sistem za štampu -Name[sv]=Skrivarsystem -Name[ta]=அச்சு அமைப்பு -Name[te]=ప్రచురణ వ్యవస్థ -Name[tg]=Системаи Чоп -Name[th]=ระบบการพิมพ์ -Name[tr]=Yazıcı Sistemi -Name[tt]=Bastıru Sisteme -Name[uk]=Система друку -Name[uz]=Bosib chiqarish tizimi -Name[uz@cyrillic]=Босиб чиқариш тизими -Name[ven]=Maitele au phirintha -Name[vi]=Hệ thống In ấn -Name[wa]=Sistinme d' imprimaedje -Name[xh]=Indlela Yoshicilelo -Name[zh_CN]=打印系统 -Name[zh_TW]=列印系統 -Name[zu]=Isistimu yokushicilela + Comment=Menu for the print system -Comment[af]=Kieslys vir die drukker stelsel -Comment[ar]=قائمة لنظام الطباعة -Comment[be]=Меню для сістэмы друку -Comment[bg]=Меню на системата за печат -Comment[bn]=মুদ্রণ ব্যবস্থার জন্য মেনু -Comment[bs]=Meni za sistem štampe -Comment[ca]=Menú per al sistema d'impressió -Comment[cs]=Nabídka tiskového systému -Comment[csb]=Menu systemë drëkù -Comment[da]=Menu for udskriftssystemet -Comment[de]=Einfacher Zugriff auf das Drucksystem -Comment[el]=Μενού για το σύστημα εκτύπωσης -Comment[eo]=Menuo por printosistemo -Comment[es]=Menú para el sistema de impresión -Comment[et]=Trükkimissüsteemi menüü -Comment[eu]=Inprimaketa sistemarako menua -Comment[fa]=گزینگان برای سیستم چاپ -Comment[fi]=Tulostusjärjestelmävalikko -Comment[fr]=Menu du système d'impression -Comment[fy]=Menu foar it printsysteem -Comment[gl]=Menu para o sistema de impresión -Comment[he]=תפריט למערכת ההדפסה -Comment[hr]=Izbornik sustava ispisivanja -Comment[hu]=Menü a nyomtatási rendszer eléréséhez -Comment[is]=Fljótleg leið að prentkerfinu -Comment[it]=Menu del sistema di stampa -Comment[ja]=印刷システム用メニュー -Comment[ka]=ბეჭდვის სისტემის მენიუ -Comment[kk]=Басып шығару жүйесінің мәзірі -Comment[km]=ម៉ឺនុយសម្រាប់ប្រព័ន្ធបោះពុម្ព -Comment[lt]=Spausdinimo sistemos meniu -Comment[mk]=Мени за системот за печатење -Comment[nb]=Meny for utskriftssystemet -Comment[nds]=Menü för dat Drucksysteem -Comment[ne]=मुद्रण प्रणालीका लागि मेनु -Comment[nl]=Menu voor het afdruksysteem -Comment[nn]=Meny for utskriftssystemet -Comment[pa]=ਪਰਿੰਟ ਸਿਸਟਮ ਲਈ ਮੇਨੂ -Comment[pl]=Menu systemu drukowania -Comment[pt]=Um menu para o sistema de impressão -Comment[pt_BR]=Menu para o sistema de impressão -Comment[ro]=Meniu pentru sistemul de tipărire -Comment[ru]=Быстрый доступ к системе печати -Comment[se]=Čálihanvuogádaga fállu -Comment[sk]=Menu pre tlačový systém -Comment[sl]=Meni za tiskalniški sistem -Comment[sr]=Мени за систем штампања -Comment[sr@Latn]=Meni za sistem štampanja -Comment[sv]=Meny för skrivarsystemet -Comment[te]=ప్రచురణ వ్యవస్థ కొరకు పట్టి -Comment[th]=เมนูสำหรับระบบการพิมพ์ -Comment[tr]=Yazıcı sistemi menüsü -Comment[uk]=Меню для системи друку -Comment[uz]=Bosib chiqarish tizimining menyusi -Comment[uz@cyrillic]=Босиб чиқариш тизимининг менюси -Comment[vi]=Thực đơn cho hệ thống in ấn -Comment[wa]=Dresseŷe pol sistinme d' imprimaedje -Comment[zh_CN]=打印系统菜单 -Comment[zh_TW]=用於列印系統的選單 -Icon=document-print +Icon=document-print X-TDE-Library=kickermenu_tdeprint diff --git a/kicker/menuext/tom/Makefile.am b/kicker/menuext/tom/Makefile.am index 0f9f7c081..16a46a9dc 100644 --- a/kicker/menuext/tom/Makefile.am +++ b/kicker/menuext/tom/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = -I$(srcdir)/../../libkicker -I$(srcdir)/../../ui -I$(srcdir)/../../co kde_module_LTLIBRARIES = kickermenu_tom.la -kickermenu_tom_la_SOURCES = tom.cc +kickermenu_tom_la_SOURCES = tom.cpp kickermenu_tom_la_LDFLAGS = $(all_libraries) -module -avoid-version kickermenu_tom_la_LIBADD = $(LIB_TDEUI) #$(top_builddir)/kicker/ui/libkicker_ui.la @@ -16,4 +16,4 @@ tomdata_DATA = destinations tomdatadir = $(kde_datadir)/kicker/tom messages: - $(XGETTEXT) *.cc -o $(podir)/libkickermenu_tom.pot + $(XGETTEXT) *.cpp -o $(podir)/libkickermenu_tom.pot diff --git a/kicker/menuext/tom/README b/kicker/menuext/tom/README index 926ae0e81..7fe6eb332 100644 --- a/kicker/menuext/tom/README +++ b/kicker/menuext/tom/README @@ -60,6 +60,6 @@ What should be the default task entry format be: c) App Name (Task Name) <-- silly option =) Should "Run A Command..." be replaced by an inline combobox? Pros: It's more obvious and will work even if kdesktop is gone. The widget - is already written (in tom.cc) + is already written (in tom.cpp) Cons: It makes it stand out too much over other entries, takes up more room and isn't as powerful as the full minicli diff --git a/kicker/menuext/tom/tom.cc b/kicker/menuext/tom/tom.cpp index 0fa85a1e3..5f42bd0f0 100644 --- a/kicker/menuext/tom/tom.cc +++ b/kicker/menuext/tom/tom.cpp @@ -47,7 +47,7 @@ using namespace std; #include <tderecentdocument.h> #include <kservice.h> #include <kservicegroup.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstdaction.h> #include <tdesycocaentry.h> @@ -62,7 +62,7 @@ const int destMenuTitleID = 10001; extern "C" { - KDE_EXPORT void* init_kickermenu_tom() + TDE_EXPORT void* init_kickermenu_tom() { TDEGlobal::locale()->insertCatalogue("libkickermenu_tom"); return new TOMFactory; @@ -105,7 +105,7 @@ class runMenuWidget : public TQWidget, public QMenuItem l1->setPixmap(foo); runLayout->addWidget(l1);*/ /*TQLabel* l2 = new TQLabel(i18n("&Run: "), this); - l2->setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative); + l2->setBackgroundMode(TQt::X11ParentRelative, TQt::X11ParentRelative); l2->setBuddy(this); runLayout->addWidget(l2);*/ m_runEdit = new KHistoryCombo(this); @@ -116,21 +116,21 @@ class runMenuWidget : public TQWidget, public QMenuItem TQSettings settings; if (settings.readEntry("/TDEStyle/Settings/MenuTransparencyEngine", "Disabled") != "Disabled") { - setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative); - //l1->setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative); - //l2->setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative); - m_runEdit->setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative); + setBackgroundMode(TQt::X11ParentRelative, TQt::X11ParentRelative); + //l1->setBackgroundMode(TQt::X11ParentRelative, TQt::X11ParentRelative); + //l2->setBackgroundMode(TQt::X11ParentRelative, TQt::X11ParentRelative); + m_runEdit->setBackgroundMode(TQt::X11ParentRelative, TQt::X11ParentRelative); } else { - /*setBackgroundMode(Qt::NoBackground, Qt::NoBackground); - l1->setBackgroundMode(Qt::NoBackground, Qt::NoBackground); - l2->setBackgroundMode(Qt::NoBackground, Qt::NoBackground); - m_runEdit->setBackgroundMode(Qt::NoBackground, Qt::NoBackground);*/ + /*setBackgroundMode(TQt::NoBackground, TQt::NoBackground); + l1->setBackgroundMode(TQt::NoBackground, TQt::NoBackground); + l2->setBackgroundMode(TQt::NoBackground, TQt::NoBackground); + m_runEdit->setBackgroundMode(TQt::NoBackground, TQt::NoBackground);*/ //l1->setAutoMask(true); - //l1->setBackgroundMode(Qt::NoBackground, Qt::NoBackground); - //l2->setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative); - //m_runEdit->setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative); + //l1->setBackgroundMode(TQt::NoBackground, TQt::NoBackground); + //l2->setBackgroundMode(TQt::X11ParentRelative, TQt::X11ParentRelative); + //m_runEdit->setBackgroundMode(TQt::X11ParentRelative, TQt::X11ParentRelative); } setMinimumHeight(TDEIcon::SizeMedium + 2); @@ -143,7 +143,7 @@ class runMenuWidget : public TQWidget, public QMenuItem TQPainter p(this); TQRect r(rect()); // ew, nasty hack. may result in coredumps due to horrid C-style cast??? - kapp->style().drawControl(TQStyle::CE_PopupMenuItem, &p, m_menu, r, palette().active(), TQStyle::Style_Enabled, + tdeApp->style().drawControl(TQStyle::CE_PopupMenuItem, &p, m_menu, r, palette().active(), TQStyle::Style_Enabled, TQStyleOption(static_cast<TQMenuItem*>(this), 0, TDEIcon::SizeMedium )); p.drawPixmap(KDialog::spacingHint(), 1, icon); p.drawText((KDialog::spacingHint() * 2) + TDEIcon::SizeMedium, textRect.height() + ((height() - textRect.height()) / 2), i18n("Run:")); @@ -217,7 +217,7 @@ void TOM::initializeRecentDocs() { m_recentDocsMenu->clear(); m_recentDocsMenu->insertItem(SmallIconSet("history_clear"), i18n("Clear History"), - this, TQT_SLOT(clearRecentDocHistory())); + this, TQ_SLOT(clearRecentDocHistory())); m_recentDocsMenu->insertSeparator(); m_recentDocURLs = TDERecentDocument::recentDocuments(); @@ -237,7 +237,7 @@ void TOM::initializeRecentDocs() * TODO: make the number of visible items configurable? */ - KDesktopFile f(*it, true /* read only */); + TDEDesktopFile f(*it, true /* read only */); m_recentDocsMenu->insertItem(DesktopIcon(f.readIcon(), TDEIcon::SizeMedium), f.readName().replace('&', "&&"), id); ++id; @@ -365,13 +365,13 @@ int TOM::appendTaskGroup(TDEConfig& config, bool inSubMenu) return 0; } - connect(taskGroup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(runTask(int))); + connect(taskGroup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(runTask(int))); // so we have an actual task group menu with tasks, let's add it if (inSubMenu) { - TQObject::connect(taskGroup, TQT_SIGNAL(aboutToShowContextMenu(TDEPopupMenu*, int, TQPopupMenu*)), - this, TQT_SLOT(contextualizeRMBmenu(TDEPopupMenu*, int, TQPopupMenu*))); + TQObject::connect(taskGroup, TQ_SIGNAL(aboutToShowContextMenu(TDEPopupMenu*, int, TQPopupMenu*)), + this, TQ_SLOT(contextualizeRMBmenu(TDEPopupMenu*, int, TQPopupMenu*))); m_submenus.append(taskGroup); @@ -389,7 +389,7 @@ int TOM::appendTaskGroup(TDEConfig& config, bool inSubMenu) rmbMenu->insertItem(title, contextMenuTitleID); rmbMenu->insertItem(i18n("Add This Task to Panel")); rmbMenu->insertItem(i18n("Modify This Task...")); - rmbMenu->insertItem(i18n("Remove This Task..."), this, TQT_SLOT(removeTask())); + rmbMenu->insertItem(i18n("Remove This Task..."), this, TQ_SLOT(removeTask())); rmbMenu->insertItem(i18n("Insert New Task...")); } } @@ -432,7 +432,7 @@ void TOM::initialize() } else { - connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(paletteChanged())); + connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(paletteChanged())); }*/ // TASKS @@ -484,9 +484,9 @@ void TOM::initialize() { removeItem(destMenuTitleID); } - else if (kapp->authorize("run_command")) + else if (tdeApp->authorize("run_command")) { - insertItem(DesktopIcon("system-run", TDEIcon::SizeMedium), i18n("Run Command..."), this, TQT_SLOT(runCommand())); + insertItem(DesktopIcon("system-run", TDEIcon::SizeMedium), i18n("Run Command..."), this, TQ_SLOT(runCommand())); } // RECENTLY USED ITEMS @@ -494,8 +494,8 @@ void TOM::initialize() m_recentDocsMenu = new TDEPopupMenu(this, "recentDocs"); m_recentDocsMenu->setFont(m_largerFont); - connect(m_recentDocsMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(initializeRecentDocs())); - connect(m_recentDocsMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(openRecentDocument(int))); + connect(m_recentDocsMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(initializeRecentDocs())); + connect(m_recentDocsMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(openRecentDocument(int))); insertItem(DesktopIcon("text-x-generic", TDEIcon::SizeMedium), i18n("Recent Documents"), m_recentDocsMenu); m_submenus.append(m_recentDocsMenu); @@ -510,9 +510,9 @@ void TOM::initialize() insertTitle(i18n("Special Items"), contextMenuTitleID); // if we have no destinations, put the run command here - if (numDests == 0 && kapp->authorize("run_command")) + if (numDests == 0 && tdeApp->authorize("run_command")) { - insertItem(DesktopIcon("system-run", TDEIcon::SizeMedium), i18n("Run Command..."), this, TQT_SLOT(runCommand())); + insertItem(DesktopIcon("system-run", TDEIcon::SizeMedium), i18n("Run Command..."), this, TQ_SLOT(runCommand())); } @@ -564,7 +564,7 @@ void TOM::initialize() } insertItem(DesktopIcon("system-log-out", TDEIcon::SizeMedium), - i18n("Logout %1").arg(username), this, TQT_SLOT(logout())); + i18n("Logout %1").arg(username), this, TQ_SLOT(logout())); } void TOM::reload() @@ -755,7 +755,7 @@ void TOM::paintEvent(TQPaintEvent * e) TQPainter p(this); - style().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p, + style().drawPrimitive( TQStyle::PE_PanelPopup, &p, TQRect( 0, 0, width(), height() ), colorGroup(), TQStyle::Style_Default, TQStyleOption( frameWidth(), 0 ) ); @@ -817,8 +817,8 @@ void TOM::runCommand() if ( kicker_screen_number ) appname.sprintf("kdesktop-screen-%d", kicker_screen_number); - kapp->updateRemoteUserTimestamp( appname ); - kapp->dcopClient()->send( appname, "KDesktopIface", + tdeApp->updateRemoteUserTimestamp( appname ); + tdeApp->dcopClient()->send( appname, "KDesktopIface", "popupExecuteCommand()", data ); } @@ -826,7 +826,7 @@ void TOM::runTask(int id) { if (!m_tasks.contains(id)) return; - kapp->propagateSessionManager(); + tdeApp->propagateSessionManager(); TDEApplication::startServiceByDesktopPath(m_tasks[id]->desktopEntryPath(), TQStringList(), 0, 0, 0, "", true); } @@ -840,7 +840,7 @@ void TOM::openRecentDocument(int id) { if (id >= 0) { - kapp->propagateSessionManager(); + tdeApp->propagateSessionManager(); KURL u; u.setPath(m_recentDocURLs[id]); KDEDesktopMimeType::run(u, true); @@ -849,7 +849,7 @@ void TOM::openRecentDocument(int id) void TOM::logout() { - kapp->requestShutDown(); + tdeApp->requestShutDown(); } #include "tom.moc" diff --git a/kicker/menuext/tom/tom.desktop b/kicker/menuext/tom/tom.desktop index 2db819b6d..62e11779c 100644 --- a/kicker/menuext/tom/tom.desktop +++ b/kicker/menuext/tom/tom.desktop @@ -1,75 +1,7 @@ [Desktop Entry] Name=TOM -Name[bg]=Задачно меню -Name[eo]=PTMS -Name[hi]=टीओएम -Name[te]=టామ్ -Name[zh_CN]=任务菜单 + Comment=A task oriented menu system -Comment[af]='n Taak geörienteerde kieslys stelsel -Comment[ar]=نظام قوائم وظيفيّ المنحى -Comment[be]=Сістэма меню, арыентаваная на выкананне шматлікіх задачаў -Comment[bg]=Меню, ориентирано към изпълнение на задачи -Comment[bn]=টাস্ক ওরিয়েন্টেড মেনু সিস্টেম -Comment[bs]=Sistem menija orjentisan na zadatke -Comment[ca]=Una tasca orientada al menú del sistema -Comment[cs]=Úkolově orientovaný systém nabídek -Comment[csb]=Systema menu skòncentrowónô na dzejaniô -Comment[cy]=Cysawd dewislenni a gyfeirir at dasgau -Comment[da]=Et opgaveorienteret menusystem -Comment[de]=Aufgabenorientiertes Menüsystem -Comment[el]=Ένα σύστημα μενού προσανατολισμένο στην εργασία -Comment[eo]=Pertaska menusistemo -Comment[es]=Sistema de menú orientado a tareas -Comment[et]=Ülesandele orienteeritud menüüsüsteem -Comment[eu]=Atazetara zuzendutako menu sistema -Comment[fa]=یک سیستم گزینگان جهتدار تکلیف -Comment[fi]=Tehtäväpohjainen valikkojärjestelmä -Comment[fr]=Un menu système par tâches -Comment[fy]=In taakoriïntearre menusysteem -Comment[ga]=Córas roghchláir dírithe ar thascanna -Comment[gl]=Un menu do sistema orientado a tarefas -Comment[he]=מערכת תפריטים מונחת משימות -Comment[hi]=कार्य अनुकूल मेन्यू तंत्र -Comment[hr]=Sustav izbornika orijentiran zadacima -Comment[hu]=Feladatorientált menürendszer -Comment[is]=Verkefnabyggt valmyndakerfi -Comment[it]=Un sistema di menu organizzato per funzione -Comment[ja]=作業タスクベースのメニューシステム -Comment[ka]=ამოცანაზე ორიენტირებული მენიუს სისტემა -Comment[kk]=Тапсырмаларға арналған мәзір жүйесі -Comment[km]=ប្រព័ន្ធម៉ឺនុយដែលសម្របតាមភារកិច្ច -Comment[lt]=Į užduotis orientuota meniu sistema -Comment[lv]=Uz darbībām orientēta izvēlņu sistēma -Comment[mk]=Систем од менија ориентиран кон задачи -Comment[mn]=Үйлдэлд чиглэсэн цэсийн систем -Comment[ms]=Sistem menu berorientasikan tugas -Comment[mt]=Menu imqassam skond ix-xogħol li trid tagħmel -Comment[nb]=Et oppgaveorientert menysystem -Comment[nds]=Menüsysteem, dat an Opgaven utricht is -Comment[ne]=कार्य उन्मुख मेनु प्रणाली -Comment[nl]=Een taakgeörienteerd menusysteem -Comment[nn]=Eit oppgåveorientert menysystem -Comment[pa]=ਇੱਕ ਕੰਮ ਆਧਾਰਿਤ ਮੇਨੂ ਸਿਸਟਮ -Comment[pl]=System menu zorientowany na zadania -Comment[pt]=Um sistema de menus orientado por tarefas -Comment[pt_BR]=Um sistema de menu orientado a tarefa -Comment[ro]=Un meniu orientat pe probleme de rezolvat -Comment[ru]=Система меню, ориентированная на задачи -Comment[rw]=Ibikubiyemo Sisitemu bijyanye n'Igikorwa -Comment[sk]=Systém menu podľa činnosti -Comment[sl]=Opravilno narejen menijski sistem -Comment[sr]=Систем менија оријентисан према задацима -Comment[sr@Latn]=Sistem menija orijentisan prema zadacima -Comment[sv]=Uppgiftsrelaterat menysystem -Comment[ta]=பணி சார்ந்த பட்டியல் அமைப்பு -Comment[th]=ระบบเมนูที่ใช้แนวทางของงาน -Comment[tr]=Görev yönelimli bir menü sistemi -Comment[tt]=Yökkä yünälgän saylaq sisteme -Comment[uk]=Система меню орієнтована на завдання -Comment[vi]=Hệ thực đơn hướng tác vụ -Comment[wa]=Ene dressêye sistinme fwaite po les bouyes -Comment[zh_CN]=面向任务的菜单系统 -Comment[zh_TW]=一個工作導向的選單系統 + Icon=kmenu X-TDE-Library=kickermenu_tom diff --git a/kicker/menuext/tom/tom.h b/kicker/menuext/tom/tom.h index b67f2bd6c..7e7b9e5ec 100644 --- a/kicker/menuext/tom/tom.h +++ b/kicker/menuext/tom/tom.h @@ -32,7 +32,7 @@ typedef TQMap<int, KService::Ptr> TaskMap; class TOM : public KPanelMenu { - Q_OBJECT + TQ_OBJECT public: TOM(TQWidget *parent = 0, const char *name = 0); @@ -102,7 +102,7 @@ class TOMFactory : public KLibFactory protected: TQObject* createObject(TQObject *parent = 0, const char *name = 0, - const char *classname = TQOBJECT_OBJECT_NAME_STRING, + const char *classname = "TQObject", const TQStringList& args = TQStringList()); }; diff --git a/kicker/proxy/appletproxy.cpp b/kicker/proxy/appletproxy.cpp index ac2f969d8..1084b5667 100644 --- a/kicker/proxy/appletproxy.cpp +++ b/kicker/proxy/appletproxy.cpp @@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tdeglobal.h> #include <klibloader.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdecmdlineargs.h> #include <kdebug.h> #include <tdemessagebox.h> @@ -68,7 +68,7 @@ static TDECmdLineOptions options[] = TDECmdLineLastOption }; -extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) +extern "C" TDE_EXPORT int kdemain( int argc, char ** argv ) { TDEAboutData aboutData( "kicker", I18N_NOOP("Panel applet proxy.") , "v0.1.0" @@ -126,7 +126,7 @@ AppletProxy::AppletProxy(TQObject* parent, const char* name) , _applet(0) { // try to attach to DCOP server - if (!kapp->dcopClient()->attach()) { + if (!tdeApp->dcopClient()->attach()) { kdError() << "Failed to attach to DCOP server." << endl; KMessageBox::error(0, i18n("The applet proxy could not be started due to DCOP communication problems."), @@ -134,7 +134,7 @@ AppletProxy::AppletProxy(TQObject* parent, const char* name) exit(0); } - if (kapp->dcopClient()->registerAs("applet_proxy", true) == 0) { + if (tdeApp->dcopClient()->registerAs("applet_proxy", true) == 0) { kdError() << "Failed to register at DCOP server." << endl; KMessageBox::error(0, i18n("The applet proxy could not be started due to DCOP registration problems."), @@ -147,7 +147,7 @@ AppletProxy::AppletProxy(TQObject* parent, const char* name) AppletProxy::~AppletProxy() { - kapp->dcopClient()->detach(); + tdeApp->dcopClient()->detach(); delete _info; delete _applet; } @@ -197,9 +197,9 @@ void AppletProxy::loadApplet(const TQString& desktopFile, const TQString& config } // connect updateLayout signal - connect(_applet, TQT_SIGNAL(updateLayout()), TQT_SLOT(slotUpdateLayout())); + connect(_applet, TQ_SIGNAL(updateLayout()), TQ_SLOT(slotUpdateLayout())); // connect requestFocus signal - connect(_applet, TQT_SIGNAL(requestFocus()), TQT_SLOT(slotRequestFocus())); + connect(_applet, TQ_SIGNAL(requestFocus()), TQ_SLOT(slotRequestFocus())); } KPanelApplet* AppletProxy::loadApplet(const AppletInfo& info) @@ -255,11 +255,11 @@ void AppletProxy::dock(const TQCString& callbackID) _callbackID = callbackID; // try to attach to DCOP server - DCOPClient* dcop = kapp->dcopClient(); + DCOPClient* dcop = tdeApp->dcopClient(); dcop->setNotifications(true); - connect(dcop, TQT_SIGNAL(applicationRemoved(const TQCString&)), - TQT_SLOT(slotApplicationRemoved(const TQCString&))); + connect(dcop, TQ_SIGNAL(applicationRemoved(const TQCString&)), + TQ_SLOT(slotApplicationRemoved(const TQCString&))); WId win; @@ -463,7 +463,7 @@ void AppletProxy::slotUpdateLayout() else appname.sprintf("kicker-screen-%d", screen_number); - kapp->dcopClient()->send(appname, _callbackID, "updateLayout()", data); + tdeApp->dcopClient()->send(appname, _callbackID, "updateLayout()", data); } void AppletProxy::slotRequestFocus() @@ -480,7 +480,7 @@ void AppletProxy::slotRequestFocus() else appname.sprintf("kicker-screen-%d", screen_number); - kapp->dcopClient()->send(appname, _callbackID, "requestFocus()", data); + tdeApp->dcopClient()->send(appname, _callbackID, "requestFocus()", data); } void AppletProxy::slotApplicationRemoved(const TQCString& appId) @@ -496,7 +496,7 @@ void AppletProxy::slotApplicationRemoved(const TQCString& appId) if(appId == appname) { kdDebug(1210) << "Connection to kicker lost, shutting down" << endl; - kapp->quit(); + tdeApp->quit(); } } @@ -510,7 +510,7 @@ void AppletProxy::showStandalone() _applet->resize( _applet->widthForHeight( 48 ), 48 ); _applet->setMinimumSize( _applet->size() ); _applet->setCaption( _info->name() ); - kapp->setMainWidget( _applet ); + tdeApp->setMainWidget( _applet ); _applet->show(); } diff --git a/kicker/proxy/appletproxy.h b/kicker/proxy/appletproxy.h index 4c504022f..59fb375b7 100644 --- a/kicker/proxy/appletproxy.h +++ b/kicker/proxy/appletproxy.h @@ -36,7 +36,7 @@ class KickerPluginManager; class AppletProxy : public TQObject, DCOPObject { - Q_OBJECT + TQ_OBJECT public: AppletProxy(TQObject* parent, const char* name = 0); diff --git a/kicker/proxy/extensiondebugger.cpp b/kicker/proxy/extensiondebugger.cpp index c210e7b9e..4591f9c34 100644 --- a/kicker/proxy/extensiondebugger.cpp +++ b/kicker/proxy/extensiondebugger.cpp @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tdeglobal.h> #include <klibloader.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdecmdlineargs.h> #include <kdebug.h> #include <kpanelextension.h> @@ -129,7 +129,7 @@ int main( int argc, char ** argv ) ExtensionContainer *container = new ExtensionContainer( extension ); container->show(); - TQObject::connect( &a, TQT_SIGNAL( lastWindowClosed() ), &a, TQT_SLOT( quit() ) ); + TQObject::connect( &a, TQ_SIGNAL( lastWindowClosed() ), &a, TQ_SLOT( quit() ) ); int result = a.exec(); @@ -143,8 +143,8 @@ ExtensionContainer::ExtensionContainer( KPanelExtension *extension, TQWidget *pa ( new TQVBoxLayout( this ) )->setAutoAdd( true ); TQPushButton *configButton = new TQPushButton( i18n( "Configure..." ), this ); - connect( configButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( showPreferences() ) ); + connect( configButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( showPreferences() ) ); m_extension->reparent( this, TQPoint( 0, 0 ) ); } diff --git a/kicker/proxy/extensiondebugger.h b/kicker/proxy/extensiondebugger.h index 0f4719b9f..fd1cba1af 100644 --- a/kicker/proxy/extensiondebugger.h +++ b/kicker/proxy/extensiondebugger.h @@ -29,7 +29,7 @@ class KPanelExtension; class ExtensionContainer : public TQWidget { - Q_OBJECT + TQ_OBJECT public: ExtensionContainer(KPanelExtension *extension, TQWidget* parent = 0, const char* name = 0); diff --git a/kicker/proxy/extensionproxy.cpp b/kicker/proxy/extensionproxy.cpp index 13c40e67b..10ab9ff5d 100644 --- a/kicker/proxy/extensionproxy.cpp +++ b/kicker/proxy/extensionproxy.cpp @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tdeglobal.h> #include <klibloader.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdecmdlineargs.h> #include <kdebug.h> #include <kpanelextension.h> @@ -54,7 +54,7 @@ static TDECmdLineOptions options[] = TDECmdLineLastOption }; -extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) +extern "C" TDE_EXPORT int kdemain( int argc, char ** argv ) { TDEAboutData aboutData( "extensionproxy", I18N_NOOP("Panel Extension Proxy") , "v0.1.0" @@ -108,12 +108,12 @@ ExtensionProxy::ExtensionProxy(TQObject* parent, const char* name) , _extension(0) { // try to attach to DCOP server - if (!kapp->dcopClient()->attach()) { + if (!tdeApp->dcopClient()->attach()) { kdError() << "Failed to attach to DCOP server." << endl; exit(0); } - if (kapp->dcopClient()->registerAs("extension_proxy", true) == 0) { + if (tdeApp->dcopClient()->registerAs("extension_proxy", true) == 0) { kdError() << "Failed to register at DCOP server." << endl; exit(0); } @@ -121,7 +121,7 @@ ExtensionProxy::ExtensionProxy(TQObject* parent, const char* name) ExtensionProxy::~ExtensionProxy() { - kapp->dcopClient()->detach(); + tdeApp->dcopClient()->detach(); } void ExtensionProxy::loadExtension(const TQCString& desktopFile, const TQCString& configFile) @@ -161,7 +161,7 @@ void ExtensionProxy::loadExtension(const TQCString& desktopFile, const TQCString } // connect updateLayout signal - connect(_extension, TQT_SIGNAL(updateLayout()), TQT_SLOT(slotUpdateLayout())); + connect(_extension, TQ_SIGNAL(updateLayout()), TQ_SLOT(slotUpdateLayout())); } KPanelExtension* ExtensionProxy::loadExtension(const AppletInfo& info) @@ -195,11 +195,11 @@ void ExtensionProxy::dock(const TQCString& callbackID) _callbackID = callbackID; // try to attach to DCOP server - DCOPClient* dcop = kapp->dcopClient(); + DCOPClient* dcop = tdeApp->dcopClient(); dcop->setNotifications(true); - connect(dcop, TQT_SIGNAL(applicationRemoved(const TQCString&)), - TQT_SLOT(slotApplicationRemoved(const TQCString&))); + connect(dcop, TQ_SIGNAL(applicationRemoved(const TQCString&)), + TQ_SLOT(slotApplicationRemoved(const TQCString&))); WId win; @@ -380,7 +380,7 @@ void ExtensionProxy::slotUpdateLayout() else appname.sprintf("kicker-screen-%d", screen_number); - kapp->dcopClient()->send(appname, _callbackID, "updateLayout()", data); + tdeApp->dcopClient()->send(appname, _callbackID, "updateLayout()", data); } void ExtensionProxy::slotApplicationRemoved(const TQCString& appId) @@ -396,6 +396,6 @@ void ExtensionProxy::slotApplicationRemoved(const TQCString& appId) if(appId == appname) { kdDebug(1210) << "Connection to kicker lost, shutting down" << endl; - kapp->quit(); + tdeApp->quit(); } } diff --git a/kicker/proxy/extensionproxy.h b/kicker/proxy/extensionproxy.h index 88bc0a325..d32b8f70b 100644 --- a/kicker/proxy/extensionproxy.h +++ b/kicker/proxy/extensionproxy.h @@ -35,7 +35,7 @@ class KPanelExtension; class ExtensionProxy : public TQObject, DCOPObject { - Q_OBJECT + TQ_OBJECT public: ExtensionProxy(TQObject* parent, const char* name = 0); diff --git a/kicker/taskbar/taskbar.cpp b/kicker/taskbar/taskbar.cpp index 29c06da89..3f82f1e50 100644 --- a/kicker/taskbar/taskbar.cpp +++ b/kicker/taskbar/taskbar.cpp @@ -36,10 +36,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tdeapplication.h> #include <kdebug.h> #include <tdeglobal.h> -#include <kglobalaccel.h> +#include <tdeglobalaccel.h> #include <kimageeffect.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "kickerSettings.h" #include "taskbarsettings.h" @@ -49,7 +49,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "taskbar.h" #include "taskbar.moc" -#define READ_MERGED_TASBKAR_SETTING(x) ((m_settingsObject->useGlobalSettings())?m_globalSettingsObject->x():m_settingsObject->x()) +#define READ_MERGED_TASKBAR_SETTING(x) ((m_settingsObject->useGlobalSettings())?m_globalSettingsObject->x():m_settingsObject->x()) TaskBar::TaskBar( TaskBarSettings* settingsObject, TaskBarSettings* globalSettingsObject, TQWidget *parent, const char *name ) : Panner( parent, name ), @@ -81,7 +81,7 @@ TaskBar::TaskBar( TaskBarSettings* settingsObject, TaskBarSettings* globalSettin // init setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); - m_sortByAppPrev = READ_MERGED_TASBKAR_SETTING(sortByApp); + m_sortByAppPrev = READ_MERGED_TASKBAR_SETTING(sortByApp); // setup animation frames for (int i = 1; i < 11; i++) @@ -92,24 +92,24 @@ TaskBar::TaskBar( TaskBarSettings* settingsObject, TaskBarSettings* globalSettin // configure configure(); - connect(&m_relayoutTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(reLayout())); + connect(&m_relayoutTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(reLayout())); - connect(this, TQT_SIGNAL(contentsMoving(int, int)), TQT_SLOT(setBackground())); + connect(this, TQ_SIGNAL(contentsMoving(int, int)), TQ_SLOT(setBackground())); // connect manager - connect(TaskManager::the(), TQT_SIGNAL(taskAdded(Task::Ptr)), - this, TQT_SLOT(add(Task::Ptr))); - connect(TaskManager::the(), TQT_SIGNAL(taskRemoved(Task::Ptr)), - this, TQT_SLOT(remove(Task::Ptr))); - connect(TaskManager::the(), TQT_SIGNAL(startupAdded(Startup::Ptr)), - this, TQT_SLOT(add(Startup::Ptr))); - connect(TaskManager::the(), TQT_SIGNAL(startupRemoved(Startup::Ptr)), - this, TQT_SLOT(remove(Startup::Ptr))); - connect(TaskManager::the(), TQT_SIGNAL(desktopChanged(int)), - this, TQT_SLOT(desktopChanged(int))); - connect(TaskManager::the(), TQT_SIGNAL(windowChanged(Task::Ptr)), - this, TQT_SLOT(windowChanged(Task::Ptr))); + connect(TaskManager::the(), TQ_SIGNAL(taskAdded(Task::Ptr)), + this, TQ_SLOT(add(Task::Ptr))); + connect(TaskManager::the(), TQ_SIGNAL(taskRemoved(Task::Ptr)), + this, TQ_SLOT(remove(Task::Ptr))); + connect(TaskManager::the(), TQ_SIGNAL(startupAdded(Startup::Ptr)), + this, TQ_SLOT(add(Startup::Ptr))); + connect(TaskManager::the(), TQ_SIGNAL(startupRemoved(Startup::Ptr)), + this, TQ_SLOT(remove(Startup::Ptr))); + connect(TaskManager::the(), TQ_SIGNAL(desktopChanged(int)), + this, TQ_SLOT(desktopChanged(int))); + connect(TaskManager::the(), TQ_SIGNAL(windowChanged(Task::Ptr)), + this, TQ_SLOT(windowChanged(Task::Ptr))); isGrouping = shouldGroup(); @@ -131,8 +131,8 @@ TaskBar::TaskBar( TaskBarSettings* settingsObject, TaskBarSettings* globalSettin blocklayout = false; - connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int))); - keys = new TDEGlobalAccel( TQT_TQOBJECT(this) ); + connect(tdeApp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int))); + keys = new TDEGlobalAccel( this ); #include "taskbarbindings.cpp" keys->readSettings(); keys->updateConnections(); @@ -174,31 +174,40 @@ KTextShadowEngine *TaskBar::textShadowEngine() return m_textShadowEngine; } - -TQSize TaskBar::sizeHint() const +int TaskBar::buttonHeight() const { - // get our minimum height based on the minimum button height or the - // height of the font in use, which is largest TQFontMetrics fm(TDEGlobalSettings::taskbarFont()); - int minButtonHeight = fm.height() > READ_MERGED_TASBKAR_SETTING(minimumButtonHeight) ? - fm.height() : READ_MERGED_TASBKAR_SETTING(minimumButtonHeight); + int bh = TQMAX(fm.height(), READ_MERGED_TASKBAR_SETTING(minimumButtonHeight)); + + if(showIcons()) + { + bh = TQMAX(bh, READ_MERGED_TASKBAR_SETTING(iconSize)); + } + + return bh + 2; +} + +int TaskBar::buttonWidth() const +{ + return TQMAX(BUTTON_MIN_WIDTH, READ_MERGED_TASKBAR_SETTING(iconSize)) + 2; +} - return TQSize(BUTTON_MIN_WIDTH, minButtonHeight); + +TQSize TaskBar::sizeHint() const +{ + return TQSize(buttonWidth(), buttonHeight()); } TQSize TaskBar::sizeHint( KPanelExtension::Position p, TQSize maxSize) const { - // get our minimum height based on the minimum button height or the - // height of the font in use, which is largest - TQFontMetrics fm(TDEGlobalSettings::taskbarFont()); - int minButtonHeight = fm.height() > READ_MERGED_TASBKAR_SETTING(minimumButtonHeight) ? - fm.height() : READ_MERGED_TASBKAR_SETTING(minimumButtonHeight); + // get our minimum height based on the minimum button height, the icon size or the + // height of the font in use, whichever is largest if ( p == KPanelExtension::Left || p == KPanelExtension::Right ) { // Vertical layout // Minimum space allows for one icon, the window list button and the up/down scrollers - int minHeight = minButtonHeight*3; + int minHeight = buttonHeight()*3; if (minHeight > maxSize.height()) return maxSize; return TQSize(maxSize.width(), minHeight); @@ -207,7 +216,7 @@ TQSize TaskBar::sizeHint( KPanelExtension::Position p, TQSize maxSize) const { // Horizontal layout // Minimum space allows for one column of icons, the window list button and the left/right scrollers - int min_width=BUTTON_MIN_WIDTH*3; + int min_width=buttonWidth()*3; if (min_width > maxSize.width()) return maxSize; return TQSize(min_width, maxSize.height()); @@ -233,16 +242,18 @@ void TaskBar::configure() bool wasDisplayIconsNText = m_displayIconsNText; bool wasShowOnlyIconified = m_showOnlyIconified; int wasShowTaskStates = m_showTaskStates; + int wasIconSize = m_iconSize; - m_showAllWindows = READ_MERGED_TASBKAR_SETTING(showAllWindows); - m_sortByDesktop = m_showAllWindows && READ_MERGED_TASBKAR_SETTING(sortByDesktop); - m_displayIconsNText = READ_MERGED_TASBKAR_SETTING(displayIconsNText); - m_showOnlyIconified = READ_MERGED_TASBKAR_SETTING(showOnlyIconified); - m_cycleWheel = READ_MERGED_TASBKAR_SETTING(cycleWheel); - m_showTaskStates = READ_MERGED_TASBKAR_SETTING(showTaskStates); + m_showAllWindows = READ_MERGED_TASKBAR_SETTING(showAllWindows); + m_sortByDesktop = m_showAllWindows && READ_MERGED_TASKBAR_SETTING(sortByDesktop); + m_displayIconsNText = READ_MERGED_TASKBAR_SETTING(displayIconsNText); + m_showOnlyIconified = READ_MERGED_TASKBAR_SETTING(showOnlyIconified); + m_cycleWheel = READ_MERGED_TASKBAR_SETTING(cycleWheel); + m_showTaskStates = READ_MERGED_TASKBAR_SETTING(showTaskStates); + m_iconSize = READ_MERGED_TASKBAR_SETTING(iconSize); m_currentScreen = -1; // Show all screens or re-get our screen - m_showOnlyCurrentScreen = (READ_MERGED_TASBKAR_SETTING(showCurrentScreenOnly) && + m_showOnlyCurrentScreen = (READ_MERGED_TASKBAR_SETTING(showCurrentScreenOnly) && TQApplication::desktop()->isVirtualDesktop() && TQApplication::desktop()->numScreens() > 1); @@ -250,12 +261,12 @@ void TaskBar::configure() // are paying attention to the current Xinerama screen // disconnect first in case we've been here before // to avoid multiple connections - disconnect(TaskManager::the(), TQT_SIGNAL(windowChangedGeometry(Task::Ptr)), - this, TQT_SLOT(windowChangedGeometry(Task::Ptr))); + disconnect(TaskManager::the(), TQ_SIGNAL(windowChangedGeometry(Task::Ptr)), + this, TQ_SLOT(windowChangedGeometry(Task::Ptr))); if (m_showOnlyCurrentScreen) { - connect(TaskManager::the(), TQT_SIGNAL(windowChangedGeometry(Task::Ptr)), - this, TQT_SLOT(windowChangedGeometry(Task::Ptr))); + connect(TaskManager::the(), TQ_SIGNAL(windowChangedGeometry(Task::Ptr)), + this, TQ_SLOT(windowChangedGeometry(Task::Ptr))); } TaskManager::the()->trackGeometry(m_showOnlyCurrentScreen); @@ -264,7 +275,8 @@ void TaskBar::configure() wasDisplayIconsNText != m_displayIconsNText || wasCycleWheel != m_cycleWheel || wasShowOnlyIconified != m_showOnlyIconified || - wasShowTaskStates != m_showTaskStates) + wasShowTaskStates != m_showTaskStates || + wasIconSize != m_iconSize) { // relevant settings changed, update our task containers for (TaskContainer::Iterator it = containers.begin(); @@ -275,12 +287,12 @@ void TaskBar::configure() } } - if (m_sortByAppPrev != READ_MERGED_TASBKAR_SETTING(sortByApp)) { - m_sortByAppPrev = READ_MERGED_TASBKAR_SETTING(sortByApp); + if (m_sortByAppPrev != READ_MERGED_TASKBAR_SETTING(sortByApp)) { + m_sortByAppPrev = READ_MERGED_TASKBAR_SETTING(sortByApp); reSort(); } - TaskManager::the()->setXCompositeEnabled(READ_MERGED_TASBKAR_SETTING(showThumbnails)); + TaskManager::the()->setXCompositeEnabled(READ_MERGED_TASKBAR_SETTING(showThumbnails)); reLayoutEventually(); } @@ -374,7 +386,7 @@ void TaskBar::add(Startup::Ptr startup) // create new container TaskContainer *container = new TaskContainer(startup, frames, this, m_settingsObject, m_globalSettingsObject, viewport()); m_hiddenContainers.append(container); - connect(container, TQT_SIGNAL(showMe(TaskContainer*)), this, TQT_SLOT(showTaskContainer(TaskContainer*))); + connect(container, TQ_SIGNAL(showMe(TaskContainer*)), this, TQ_SLOT(showTaskContainer(TaskContainer*))); } void TaskBar::reSort() @@ -409,7 +421,7 @@ void TaskBar::showTaskContainer(TaskContainer* container) } // try to place the container after one of the same app - if (READ_MERGED_TASBKAR_SETTING(sortByApp)) + if (READ_MERGED_TASKBAR_SETTING(sortByApp)) { TaskContainer::Iterator it = containers.begin(); for (; it != containers.end(); ++it) @@ -731,14 +743,12 @@ void TaskBar::reLayout() // number of rows simply depends on our height which is either the // minimum button height or the height of the font in use, whichever is // largest - TQFontMetrics fm(TDEGlobalSettings::taskbarFont()); - int minButtonHeight = fm.height() > READ_MERGED_TASBKAR_SETTING(minimumButtonHeight) ? - fm.height() : READ_MERGED_TASBKAR_SETTING(minimumButtonHeight); + int minButtonHeight = buttonHeight(); // horizontal layout - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { - int bwidth=BUTTON_MIN_WIDTH; + int bwidth=buttonWidth(); int rows = contentsRect().height() / minButtonHeight; if (rows<1) rows=1; @@ -752,20 +762,20 @@ void TaskBar::reLayout() int bpr = static_cast<int>(ceil(static_cast<double>(list.count()) / rows)); // adjust content size - if ( contentsRect().width() < bpr * BUTTON_MIN_WIDTH ) + if ( contentsRect().width() < bpr * bwidth ) { - resizeContents( bpr * BUTTON_MIN_WIDTH, contentsRect().height() ); + resizeContents( bpr * bwidth, contentsRect().height() ); } // maximum number of buttons per row - int mbpr = contentsRect().width() / BUTTON_MIN_WIDTH; + int mbpr = contentsRect().width() / bwidth; // expand button width if space permits and the taskbar is not in 'icons only' mode if (mbpr > bpr) { if (!showIcons() || showText()) bwidth = contentsRect().width() / bpr; - int maxWidth = READ_MERGED_TASBKAR_SETTING(maximumButtonWidth); + int maxWidth = READ_MERGED_TASKBAR_SETTING(maximumButtonWidth); if (maxWidth > 0 && bwidth > maxWidth) { bwidth = maxWidth; @@ -844,7 +854,7 @@ void TaskBar::reLayout() } } - TQTimer::singleShot(100, this, TQT_SLOT(publishIconGeometry())); + TQTimer::singleShot(100, this, TQ_SLOT(publishIconGeometry())); } void TaskBar::setViewportBackground() @@ -987,9 +997,7 @@ int TaskBar::taskCount() const int TaskBar::maximumButtonsWithoutShrinking() const { - TQFontMetrics fm(TDEGlobalSettings::taskbarFont()); - int minButtonHeight = fm.height() > READ_MERGED_TASBKAR_SETTING(minimumButtonHeight) ? - fm.height() : READ_MERGED_TASBKAR_SETTING(minimumButtonHeight); + int minButtonHeight = buttonHeight(); int rows = contentsRect().height() / minButtonHeight; if (rows < 1) @@ -997,9 +1005,9 @@ int TaskBar::maximumButtonsWithoutShrinking() const rows = 1; } - if ( orientation() == Qt::Horizontal ) { + if ( orientation() == TQt::Horizontal ) { // maxWidth of 0 means no max width, drop back to default - int maxWidth = READ_MERGED_TASBKAR_SETTING(maximumButtonWidth); + int maxWidth = READ_MERGED_TASKBAR_SETTING(maximumButtonWidth); if (maxWidth == 0) { maxWidth = BUTTON_MAX_WIDTH; @@ -1017,8 +1025,8 @@ int TaskBar::maximumButtonsWithoutShrinking() const bool TaskBar::shouldGroup() const { - return READ_MERGED_TASBKAR_SETTING(groupTasks) == m_settingsObject->GroupAlways || - ((READ_MERGED_TASBKAR_SETTING(groupTasks) == m_settingsObject->GroupWhenFull && + return READ_MERGED_TASKBAR_SETTING(groupTasks) == m_settingsObject->GroupAlways || + ((READ_MERGED_TASKBAR_SETTING(groupTasks) == m_settingsObject->GroupWhenFull && taskCount() > maximumButtonsWithoutShrinking())); } @@ -1166,7 +1174,7 @@ void TaskBar::activateNextTask(bool forward) void TaskBar::wheelEvent(TQWheelEvent* e) { - if(READ_MERGED_TASBKAR_SETTING(cycleWheel)) { + if(READ_MERGED_TASKBAR_SETTING(cycleWheel)) { if (e->delta() > 0) { @@ -1246,7 +1254,7 @@ TQImage* TaskBar::blendGradient(const TQSize& size) void TaskBar::sortContainersByDesktop(TaskContainer::List& list) { - typedef TQValueVector<QPair<int, QPair<int, TaskContainer*> > > SortVector; + typedef TQValueVector<TQPair<int, TQPair<int, TaskContainer*> > > SortVector; SortVector sorted; sorted.resize(list.count()); int i = 0; diff --git a/kicker/taskbar/taskbar.h b/kicker/taskbar/taskbar.h index 0ab614a61..dc34129e0 100644 --- a/kicker/taskbar/taskbar.h +++ b/kicker/taskbar/taskbar.h @@ -70,7 +70,7 @@ namespace TaskMoveDestination class TaskBar : public Panner { - Q_OBJECT + TQ_OBJECT public: TaskBar( TaskBarSettings* settingsObject, TaskBarSettings* globalSettingsObject, TQWidget *parent = 0, const char *name = 0 ); @@ -137,37 +137,40 @@ protected: void moveEvent( TQMoveEvent* ); bool idMatch( const TQString& id1, const TQString& id2 ); TaskContainer::List filteredContainers(); + int buttonHeight() const; + int buttonWidth() const; private: void sortContainersByDesktop(TaskContainer::List& list); void setViewportBackground(); - bool blocklayout; - bool m_showAllWindows; - bool m_cycleWheel; - int m_currentScreen; // The screen to show, -1 for all screens - bool m_showOnlyCurrentScreen; - bool m_sortByDesktop; + bool blocklayout; + bool m_showAllWindows; + bool m_cycleWheel; + int m_currentScreen; // The screen to show, -1 for all screens + bool m_showOnlyCurrentScreen; + bool m_sortByDesktop; int m_displayIconsNText; - bool m_showOnlyIconified; - int m_showTaskStates; - ArrowType arrowType; - TaskContainer::List containers; - TaskContainer::List m_hiddenContainers; - TaskContainer::List m_deletableContainers; - PixmapList frames; + bool m_showOnlyIconified; + int m_showTaskStates; + int m_iconSize; + ArrowType arrowType; + TaskContainer::List containers; + TaskContainer::List m_hiddenContainers; + TaskContainer::List m_deletableContainers; + PixmapList frames; int maximumButtonsWithoutShrinking() const; bool shouldGroup() const; bool isGrouping; void reGroup(); TDEGlobalAccel* keys; - KTextShadowEngine* m_textShadowEngine; - bool m_ignoreUpdates; - bool m_sortByAppPrev; - TQTimer m_relayoutTimer; - TQImage m_blendGradient; - TaskBarSettings* m_settingsObject; - TaskBarSettings* m_globalSettingsObject; + KTextShadowEngine* m_textShadowEngine; + bool m_ignoreUpdates; + bool m_sortByAppPrev; + TQTimer m_relayoutTimer; + TQImage m_blendGradient; + TaskBarSettings* m_settingsObject; + TaskBarSettings* m_globalSettingsObject; }; #endif diff --git a/kicker/taskbar/taskbar.kcfg b/kicker/taskbar/taskbar.kcfg index 95596ad34..0665470df 100644 --- a/kicker/taskbar/taskbar.kcfg +++ b/kicker/taskbar/taskbar.kcfg @@ -75,9 +75,9 @@ <label>Only Running</label> </choice> </choices> - <default>ShowAll</default> + <default>ShowAll</default> <label>Show tasks with state:</label> - <whatsthis>The taskbar can show and/or hide tasks based on their current process state. Select <em>Any</em> to show all tasks regardless of current state.</whatsthis> + <whatsthis>The taskbar can show and/or hide tasks based on their current process state. Select <em>Any</em> to show all tasks regardless of current state.</whatsthis> </entry> <entry key="SortByDesktop" type="Bool" > <default>true</default> @@ -91,15 +91,16 @@ </entry> <entry key="MaximumButtonWidth" type="Int" > <default>200</default> - <min>0</min> - <label></label> - <whatsthis></whatsthis> + <min>50</min> + <max>500</max> + <label>Maximum Taskbar Button Width</label> + <whatsthis>The maximum width each taskbar button will use. The default value is 200 pixels. The setting affects the Display options Text only and Icons and Text.</whatsthis> </entry> <entry key="MinimumButtonHeight" type="Int" > <default>18</default> - <label></label> + <label>Minimum Taskbar Button Height</label> <min>1</min> - <whatsthis></whatsthis> + <whatsthis>The minimum height to trigger taskbar buttons to stack into rows. The default value is 18 pixels. To prevent the taskbar buttons from stacking into rows, MinimumButtonHeight must be at least one pixel larger than the defined panel height.</whatsthis> </entry> <entry key="ShowCurrentScreenOnly" type="Bool" > <default>false</default> @@ -172,19 +173,20 @@ <label>Draw taskbar entries "flat" and not as a button</label> <whatsthis>Turning this option on will cause the taskbar to draw visible button frames for each entry in the taskbar. By default, this option is off.</whatsthis> </entry> + <entry key="ShowButtonOnHover" type="Bool" > + <default>true</default> + <label>Show a visible button frame on the task the cursor is positioned over</label> + <whatsthis>Turning this option on will cause the taskbar to draw a visible button frame around the item currently under the mouse. By default, this option is on.</whatsthis> + </entry> <entry key="HaloText" type="Bool" > <default>false</default> <label>Draw taskbar text with a halo around it</label> <whatsthis>Turning this option on will cause the taskbar to draw fancier text that has an outline around it. While this is useful for transparent panels or particularly dark panel backgrounds, it is slower.</whatsthis> </entry> - <entry key="ShowButtonOnHover" type="Bool" > - <default>true</default> - <label>Show a visible button frame on the task the cursor is positioned over</label> - </entry> <entry key="ShowThumbnails" type="Bool" > <default>false</default> <label>Show thumbnails instead of icons in the mouse-over effects</label> - <whatsthis>Enabling this option will draw a thumbnail of the window in its mouse-over effect.<p>If a window is minimized or resides on a different desktop while the taskbar is starting, an icon is shown until the window is restored or the appropriate desktop is activated, respectively.</p></whatsthis> + <whatsthis>Enabling this option will draw a thumbnail of the window in its mouse-over effect.<p>If a window is minimized or resides on a different desktop while the taskbar is starting, an icon is shown until the window is restored or the appropriate desktop is activated, respectively. This options needs a TWin compositor in order to work.</p></whatsthis> </entry> <entry key="ThumbnailMaxDimension" type="UInt" > <default>100</default> @@ -198,18 +200,21 @@ </entry> <entry name="ActiveTaskTextColor" type="Color" > <label>Color to use for active task button text</label> - <default code="true">QColor()</default> + <default code="true">TQColor()</default> <whatsthis>This color is used for displaying text on taskbar button for task which is active at the moment.</whatsthis> </entry> <entry name="InactiveTaskTextColor" type="Color" > <label>Color to use for inactive tasks button text</label> - <default code="true">QColor()</default> + <default code="true">TQColor()</default> <whatsthis>This color is used for displaying text on taskbar button for tasks other than active.</whatsthis> </entry> <entry name="TaskBackgroundColor" type="Color" > <label>Color to use for taskbar buttons background</label> - <default code="true">QColor()</default> + <default code="true">TQColor()</default> <whatsthis>This color is used for displaying background of taskbar buttons.</whatsthis> </entry> + <entry name="IconSize" type="UInt" > + <default>16</default> + </entry> </group> </kcfg> diff --git a/kicker/taskbar/taskbarbindings.cpp b/kicker/taskbar/taskbarbindings.cpp index 364faac97..f604e3bc6 100644 --- a/kicker/taskbar/taskbarbindings.cpp +++ b/kicker/taskbar/taskbarbindings.cpp @@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef NOSLOTS # define DEF( name, key3, key4, fnSlot ) \ - keys->insert( name, i18n(name), TQString(), key3, key4, TQT_TQOBJECT(this), TQT_SLOT(fnSlot) ) + keys->insert( name, i18n(name), TQString(), key3, key4, this, TQ_SLOT(fnSlot) ) #else # define DEF( name, key3, key4, fnSlot ) \ keys->insert( name, i18n(name), TQString(), key3, key4 ) diff --git a/kicker/taskbar/taskbarcontainer.cpp b/kicker/taskbar/taskbarcontainer.cpp index a891cf64e..e9cc87979 100644 --- a/kicker/taskbar/taskbarcontainer.cpp +++ b/kicker/taskbar/taskbarcontainer.cpp @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tdeapplication.h> #include <kdebug.h> #include <kiconloader.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <twindowlistmenu.h> #include <X11/X.h> @@ -65,10 +65,10 @@ TaskBarContainer::TaskBarContainer( bool enableFrame, TQString configFileOverrid TQFile configFileObject(locateLocal("config", configFile)); if (!configFileObject.exists()) { - TDEConfig globalConfig(GLOBAL_TASKBAR_CONFIG_FILE_NAME, TRUE, TRUE); + TDEConfig globalConfig(GLOBAL_TASKBAR_CONFIG_FILE_NAME, true, true); TDEConfig localConfig(configFile); globalConfig.copyTo(configFile, &localConfig); - localConfig.writeEntry("UseGlobalSettings", TRUE); + localConfig.writeEntry("UseGlobalSettings", true); localConfig.sync(); } settingsObject = new TaskBarSettings(TDESharedConfig::openConfig(configFile)); @@ -99,7 +99,7 @@ TaskBarContainer::TaskBarContainer( bool enableFrame, TQString configFileOverrid taskBar = new TaskBar(settingsObject, globalSettingsObject, this); layout->addWidget( taskBar ); - connect( taskBar, TQT_SIGNAL( containerCountChanged() ), TQT_SIGNAL( containerCountChanged() ) ); + connect( taskBar, TQ_SIGNAL( containerCountChanged() ), TQ_SIGNAL( containerCountChanged() ) ); setBackground(); @@ -134,10 +134,10 @@ void TaskBarContainer::configure() // window list button windowListButton = new SimpleButton(this); windowListMenu= new KWindowListMenu; - connect(windowListButton, TQT_SIGNAL(pressed()), - TQT_SLOT(showWindowListMenu())); - connect(windowListMenu, TQT_SIGNAL(aboutToHide()), - TQT_SLOT(windowListMenuAboutToHide())); + connect(windowListButton, TQ_SIGNAL(pressed()), + TQ_SLOT(showWindowListMenu())); + connect(windowListMenu, TQ_SIGNAL(aboutToHide()), + TQ_SLOT(windowListMenuAboutToHide())); // geometry TQString icon; @@ -161,7 +161,7 @@ void TaskBarContainer::configure() break; } - windowListButton->setPixmap(kapp->iconLoader()->loadIcon(icon, + windowListButton->setPixmap(tdeApp->iconLoader()->loadIcon(icon, TDEIcon::Panel, 16)); windowListButton->setMinimumSize(windowListButton->sizeHint()); @@ -188,26 +188,26 @@ void TaskBarContainer::preferences() { TQByteArray data; - if (!kapp->dcopClient()->isAttached()) + if (!tdeApp->dcopClient()->isAttached()) { - kapp->dcopClient()->attach(); + tdeApp->dcopClient()->attach(); } if (configFile == GLOBAL_TASKBAR_CONFIG_FILE_NAME) { - kapp->dcopClient()->send("kicker", "kicker", "showTaskBarConfig()", data); + tdeApp->dcopClient()->send("kicker", "kicker", "showTaskBarConfig()", data); } else { TQDataStream args( data, IO_WriteOnly ); args << configFile; - kapp->dcopClient()->send("kicker", "kicker", "showTaskBarConfig(TQString)", data); + tdeApp->dcopClient()->send("kicker", "kicker", "showTaskBarConfig(TQString)", data); } } void TaskBarContainer::orientationChange(Orientation o) { - if (o == Qt::Horizontal) + if (o == TQt::Horizontal) { if (windowListButton) { @@ -266,7 +266,7 @@ void TaskBarContainer::popupDirectionChange(KPanelApplet::Direction d) if (windowListButton) { - windowListButton->setPixmap(kapp->iconLoader()->loadIcon(icon, + windowListButton->setPixmap(tdeApp->iconLoader()->loadIcon(icon, TDEIcon::Panel, 16)); windowListButton->setMinimumSize(windowListButton->sizeHint()); @@ -299,9 +299,9 @@ void TaskBarContainer::showWindowListMenu() break; } - disconnect( windowListButton, TQT_SIGNAL( pressed() ), this, TQT_SLOT( showWindowListMenu() ) ); + disconnect( windowListButton, TQ_SIGNAL( pressed() ), this, TQ_SLOT( showWindowListMenu() ) ); windowListMenu->exec( pos ); - TQTimer::singleShot(100, this, TQT_SLOT(reconnectWindowListButton())); + TQTimer::singleShot(100, this, TQ_SLOT(reconnectWindowListButton())); } void TaskBarContainer::windowListMenuAboutToHide() @@ -313,7 +313,7 @@ void TaskBarContainer::windowListMenuAboutToHide() void TaskBarContainer::reconnectWindowListButton() { - connect( windowListButton, TQT_SIGNAL( pressed() ), TQT_SLOT( showWindowListMenu() ) ); + connect( windowListButton, TQ_SIGNAL( pressed() ), TQ_SLOT( showWindowListMenu() ) ); } TQSize TaskBarContainer::sizeHint( KPanelExtension::Position p, TQSize maxSize) const diff --git a/kicker/taskbar/taskbarcontainer.h b/kicker/taskbar/taskbarcontainer.h index 7fc13241f..006724e30 100644 --- a/kicker/taskbar/taskbarcontainer.h +++ b/kicker/taskbar/taskbarcontainer.h @@ -36,9 +36,9 @@ class KWindowListMenu; class TaskBar; class TaskBarSettings; -class KDE_EXPORT TaskBarContainer : public TQFrame, public DCOPObject +class TDE_EXPORT TaskBarContainer : public TQFrame, public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP public: diff --git a/kicker/taskbar/taskbarsettings.kcfgc b/kicker/taskbar/taskbarsettings.kcfgc index c5219f64e..1e6a7c8cc 100644 --- a/kicker/taskbar/taskbarsettings.kcfgc +++ b/kicker/taskbar/taskbarsettings.kcfgc @@ -2,6 +2,6 @@ File=taskbar.kcfg Singleton=false ClassName=TaskBarSettings Mutators=true -Visibility=KDE_EXPORT +Visibility=TDE_EXPORT SetUserTexts=true GlobalEnums=true diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp index cc533f0b9..8e44f100f 100644 --- a/kicker/taskbar/taskcontainer.cpp +++ b/kicker/taskbar/taskcontainer.cpp @@ -26,6 +26,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <assert.h> +#ifdef Q_OS_SOLARIS +#include <procfs.h> +#endif /* SunOS */ + #include <tqbitmap.h> #include <tqcolor.h> #include <tqcursor.h> @@ -45,7 +49,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kiconloader.h> #include <kimageeffect.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <X11/Xlib.h> #include <netwm.h> #include <fixx11h.h> @@ -62,8 +66,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "taskcontainer.h" #include "taskcontainer.moc" -#define READ_MERGED_TASBKAR_SETTING(x) ((m_settingsObject->useGlobalSettings())?m_globalSettingsObject->x():m_settingsObject->x()) -#define READ_MERGED_TASBKAR_ACTION(x) ((m_settingsObject->useGlobalSettings())?m_globalSettingsObject->action(x):m_settingsObject->action(x)) +#define READ_MERGED_TASKBAR_SETTING(x) ((m_settingsObject->useGlobalSettings())?m_globalSettingsObject->x():m_settingsObject->x()) +#define READ_MERGED_TASKBAR_ACTION(x) ((m_settingsObject->useGlobalSettings())?m_globalSettingsObject->action(x):m_settingsObject->action(x)) static Bool netwm_atoms_created = False; static Atom net_wm_pid = 0; @@ -96,24 +100,32 @@ static void create_atoms(Display *d) { } bool is_process_resumable(pid_t pid) { +#ifdef Q_OS_SOLARIS + TQFile procStatFile(TQString("/proc/%1/lwp/1/lwpsinfo").arg(pid)); + if (procStatFile.open(IO_ReadOnly)) { + TQByteArray statRaw = procStatFile.readAll(); + lwpsinfo_t *inf = (lwpsinfo_t *)statRaw.data(); + + procStatFile.close(); + if( inf->pr_sname == 'T' ) { + return true; + } + } +#else /* default */ TQFile procStatFile(TQString("/proc/%1/stat").arg(pid)); if (procStatFile.open(IO_ReadOnly)) { TQByteArray statRaw = procStatFile.readAll(); procStatFile.close(); TQString statString(statRaw); - TQStringList statFields = TQStringList::split(" ", statString, TRUE); + TQStringList statFields = TQStringList::split(" ", statString, true); TQString tcomm = statFields[1]; TQString state = statFields[2]; if( state == "T" ) { return true; } - else { - return false; - } - } - else { - return false; } +#endif /* read process status */ + return false; } TaskContainer::TaskContainer(Task::Ptr task, TaskBar* bar, TaskBarSettings* settingsObject, TaskBarSettings* globalSettingsObject, TQWidget *parent, const char *name) @@ -174,7 +186,7 @@ TaskContainer::TaskContainer(Startup::Ptr startup, PixmapList& startupFrames, Ta sid = m_startup->bin(); - connect(m_startup, TQT_SIGNAL(changed()), TQT_SLOT(update())); + connect(m_startup, TQ_SIGNAL(changed()), TQ_SLOT(update())); dragSwitchTimer.start(333, true); } @@ -192,16 +204,18 @@ void TaskContainer::init() if (!netwm_atoms_created) create_atoms(TQPaintDevice::x11AppDisplay()); + int iconSize = READ_MERGED_TASKBAR_SETTING(iconSize); + setWFlags(TQt::WNoAutoErase); setBackgroundMode(NoBackground); - animBg = TQPixmap(16, 16); + animBg = TQPixmap(iconSize, iconSize); installEventFilter(KickerTip::the()); - connect(&animationTimer, TQT_SIGNAL(timeout()), TQT_SLOT(animationTimerFired())); - connect(&dragSwitchTimer, TQT_SIGNAL(timeout()), TQT_SLOT(showMe())); - connect(&attentionTimer, TQT_SIGNAL(timeout()), TQT_SLOT(attentionTimerFired())); - connect(&m_paintEventCompressionTimer, TQT_SIGNAL(timeout()), TQT_SLOT(updateNow())); + connect(&animationTimer, TQ_SIGNAL(timeout()), TQ_SLOT(animationTimerFired())); + connect(&dragSwitchTimer, TQ_SIGNAL(timeout()), TQ_SLOT(showMe())); + connect(&attentionTimer, TQ_SIGNAL(timeout()), TQ_SLOT(attentionTimerFired())); + connect(&m_paintEventCompressionTimer, TQ_SIGNAL(timeout()), TQ_SLOT(updateNow())); } TaskContainer::~TaskContainer() @@ -221,8 +235,8 @@ void TaskContainer::showMe() animationTimer.start(100); emit showMe(this); - disconnect(&dragSwitchTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(showMe())); - connect(&dragSwitchTimer, TQT_SIGNAL(timeout()), TQT_SLOT(dragSwitch())); + disconnect(&dragSwitchTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(showMe())); + connect(&dragSwitchTimer, TQ_SIGNAL(timeout()), TQ_SLOT(dragSwitch())); } void TaskContainer::stopTimers() @@ -242,7 +256,7 @@ void TaskContainer::taskChanged(bool geometryOnlyChange) return; } - const TQObject* source = TQT_TQOBJECT_CONST(sender()); + const TQObject* source = sender(); Task::Ptr task = 0; Task::List::const_iterator itEnd = tasks.constEnd(); for (Task::List::const_iterator it = tasks.constBegin(); it != itEnd; ++it) @@ -265,7 +279,7 @@ void TaskContainer::taskChanged(bool geometryOnlyChange) void TaskContainer::iconChanged() { - const TQObject* source = TQT_TQOBJECT_CONST(sender()); + const TQObject* source = sender(); Task::Ptr task = 0; Task::List::const_iterator itEnd = tasks.constEnd(); for (Task::List::const_iterator it = tasks.constBegin(); it != itEnd; ++it) @@ -366,11 +380,11 @@ void TaskContainer::checkAttention(const Task::Ptr t) void TaskContainer::attentionTimerFired() { assert( attentionState != -1 ); - if (attentionState < READ_MERGED_TASBKAR_SETTING(attentionBlinkIterations)*2) + if (attentionState < READ_MERGED_TASKBAR_SETTING(attentionBlinkIterations)*2) { ++attentionState; } - else if (READ_MERGED_TASBKAR_SETTING(attentionBlinkIterations) < 1000) + else if (READ_MERGED_TASKBAR_SETTING(attentionBlinkIterations) < 1000) { attentionTimer.stop(); } @@ -390,9 +404,22 @@ TQSizePolicy TaskContainer::sizePolicy() const void TaskContainer::resizeEvent( TQResizeEvent * ) { - // calculate the icon rect - TQRect br( style().subRect( TQStyle::SR_PushButtonContents, this ) ); - iconRect = TQStyle::visualRect( TQRect(br.x() + 2, (height() - 16) / 2, 16, 16), this ); + recalculateIconRect(); +} + +void TaskContainer::recalculateIconRect() +{ + iconSize = READ_MERGED_TASKBAR_SETTING(iconSize); + + if(taskBar->showText()) + { + TQRect br( style().subRect( TQStyle::SR_PushButtonContents, this ) ); + iconRect = TQStyle::visualRect( TQRect(br.x() + 2, (height() - iconSize) / 2, iconSize, iconSize), this ); + } + else + { + iconRect = TQStyle::visualRect( TQRect((width() - iconSize) / 2, (height() - iconSize) / 2, iconSize, iconSize), this ); + } } void TaskContainer::add(Task::Ptr task) @@ -415,9 +442,9 @@ void TaskContainer::add(Task::Ptr task) KickerTip::Client::updateKickerTip(); update(); - connect(task, TQT_SIGNAL(changed(bool)), TQT_SLOT(taskChanged(bool))); - connect(task, TQT_SIGNAL(iconChanged()), TQT_SLOT(iconChanged())); - connect(task, TQT_SIGNAL(activated()), TQT_SLOT(setLastActivated())); + connect(task, TQ_SIGNAL(changed(bool)), TQ_SLOT(taskChanged(bool))); + connect(task, TQ_SIGNAL(iconChanged()), TQ_SLOT(iconChanged())); + connect(task, TQ_SIGNAL(activated()), TQ_SLOT(setLastActivated())); } void TaskContainer::remove(Task::Ptr task) @@ -581,13 +608,14 @@ void TaskContainer::drawButton(TQPainter *p) TQPixmap *pm((TQPixmap*)p->device()); TQPixmap pixmap; // icon Task::Ptr task = 0; - bool iconified = !READ_MERGED_TASBKAR_SETTING(showOnlyIconified); - bool halo = READ_MERGED_TASBKAR_SETTING(haloText); - bool alwaysDrawButtons = READ_MERGED_TASBKAR_SETTING(drawButtons); + bool iconified = !READ_MERGED_TASKBAR_SETTING(showOnlyIconified); + bool halo = READ_MERGED_TASKBAR_SETTING(haloText); + bool alwaysDrawButtons = READ_MERGED_TASKBAR_SETTING(drawButtons); bool drawButton = alwaysDrawButtons || (m_mouseOver && !halo && isEnabled() && - READ_MERGED_TASBKAR_SETTING(showButtonOnHover)); + READ_MERGED_TASKBAR_SETTING(showButtonOnHover)); TQFont font(TDEGlobalSettings::taskbarFont()); + recalculateIconRect(); // draw sunken if we contain the active task bool active = false; @@ -608,7 +636,7 @@ void TaskContainer::drawButton(TQPainter *p) if (task->demandsAttention()) { - demandsAttention = attentionState == READ_MERGED_TASBKAR_SETTING(attentionBlinkIterations) || + demandsAttention = attentionState == READ_MERGED_TASKBAR_SETTING(attentionBlinkIterations) || attentionState % 2 == 0; } } @@ -616,15 +644,15 @@ void TaskContainer::drawButton(TQPainter *p) font.setBold(active); TQColorGroup colors = palette().active(); - - if (READ_MERGED_TASBKAR_SETTING(useCustomColors)) + + if (READ_MERGED_TASKBAR_SETTING(useCustomColors)) { - colors.setColor( TQColorGroup::Button, READ_MERGED_TASBKAR_SETTING(taskBackgroundColor)); - colors.setColor( TQColorGroup::Background, READ_MERGED_TASBKAR_SETTING(taskBackgroundColor) ); - colors.setColor( TQColorGroup::ButtonText, READ_MERGED_TASBKAR_SETTING(inactiveTaskTextColor) ); - colors.setColor( TQColorGroup::Text, READ_MERGED_TASBKAR_SETTING(inactiveTaskTextColor) ); + colors.setColor( TQColorGroup::Button, READ_MERGED_TASKBAR_SETTING(taskBackgroundColor)); + colors.setColor( TQColorGroup::Background, READ_MERGED_TASKBAR_SETTING(taskBackgroundColor) ); + colors.setColor( TQColorGroup::ButtonText, READ_MERGED_TASKBAR_SETTING(inactiveTaskTextColor) ); + colors.setColor( TQColorGroup::Text, READ_MERGED_TASKBAR_SETTING(inactiveTaskTextColor) ); } - + if (demandsAttention) { if (!drawButton) @@ -638,7 +666,7 @@ void TaskContainer::drawButton(TQPainter *p) for (int i = 0; i < 2; ++i) { line = KickerLib::blendColors(line, colors.background()); - p->setPen(TQPen(line, 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin)); + p->setPen(TQPen(line, 1, TQt::SolidLine, TQt::RoundCap, TQt::RoundJoin)); r.addCoords(-1, -1, 1, 1); p->drawRect(r); } @@ -659,7 +687,7 @@ void TaskContainer::drawButton(TQPainter *p) // get the task icon if (task) { - pixmap = task->pixmap(); + pixmap = task->icon(iconSize, iconSize, true); } bool sunken = isDown() || (alwaysDrawButtons && (active || aboutToActivate)); @@ -671,13 +699,13 @@ void TaskContainer::drawButton(TQPainter *p) // draw button background if (drawButton) { - if (READ_MERGED_TASBKAR_SETTING(drawButtons) && KickerSettings::showDeepButtons()) { - style().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p, + if (READ_MERGED_TASKBAR_SETTING(drawButtons) && KickerSettings::showDeepButtons()) { + style().drawPrimitive(TQStyle::PE_ButtonBevel, p, TQRect(1, 1, width()-3, height()-2), colors, sunken ? TQStyle::Style_On : TQStyle::Style_Raised); } else { - style().tqdrawPrimitive(TQStyle::PE_ButtonTool, p, + style().drawPrimitive(TQStyle::PE_ButtonTool, p, TQRect(1, 1, width()-2, height()-2), colors, sunken ? TQStyle::Style_Down : TQStyle::Style_Raised); } @@ -690,21 +718,21 @@ void TaskContainer::drawButton(TQPainter *p) } TQString text = name(); // find text - int textPos = ( taskBar->showIcons() && (!pixmap.isNull() || m_startup)) ? 2 + 16 + 2 : 0; + int textPos = ( taskBar->showIcons() && (!pixmap.isNull() || m_startup)) ? 2 + iconSize + 2 : 0; // show icons if (taskBar->showIcons()) { if (pixmap.isNull() && m_startup) - pixmap = SmallIcon(m_startup->icon()); + pixmap = tdeApp->iconLoader()->loadIcon(m_startup->icon(), TDEIcon::Panel, iconSize); if ( !pixmap.isNull() ) { - // make sure it is no larger than 16x16 - if ( pixmap.width() > 16 || pixmap.height() > 16 ) + // make sure it is no larger than icon size + if ( pixmap.width() > iconSize || pixmap.height() > iconSize ) { TQImage tmp = pixmap.convertToImage(); - pixmap.convertFromImage( tmp.smoothScale( 16, 16 ) ); + pixmap.convertFromImage( tmp.smoothScale( iconSize, iconSize ) ); } // fade out the icon when minimized @@ -718,28 +746,36 @@ void TaskContainer::drawButton(TQPainter *p) } // modified overlay icon - if (taskBar->showText()) + static TQString modStr = "[" + i18n( "modified" ) + "]"; + int modStrPos = text.find( modStr ); + if (modStrPos >= 0) { - static TQString modStr = "[" + i18n( "modified" ) + "]"; - int modStrPos = text.find( modStr ); - if (modStrPos >= 0) + TQRect r; + TQPixmap modPixmap = SmallIcon("modified"); + if (iconified) { - // +1 because we include a space after the closing brace. - text.remove(modStrPos, modStr.length() + 1); - TQPixmap modPixmap = SmallIcon("modified"); + TDEIconEffect::semiTransparent(modPixmap); + } - // draw modified overlay - if (!modPixmap.isNull()) - { - TQRect r = TQStyle::visualRect(TQRect(br.x() + textPos,(height() - 16) / 2, 16, 16), this); - if (iconified) + if (taskBar->showText()) // has text + { + // +1 because we include a space after the closing brace. + text.remove(modStrPos, modStr.length() + 1); + + // draw modified overlay + if (!modPixmap.isNull()) { - TDEIconEffect::semiTransparent(modPixmap); + r = TQStyle::visualRect(TQRect(br.x() + textPos,(height() - iconSize) / 2, iconSize, iconSize), this); + textPos += iconSize + 2; } - p->drawPixmap(r, modPixmap); - textPos += 16 + 2; - } - } + } + else if (taskBar->showIcons()) // has only icon + { + r = TQRect(0, 0, iconSize / 2, iconSize / 2); + r.moveBottomRight(iconRect.bottomRight()); + } + + p->drawPixmap(r, modPixmap); } } @@ -765,9 +801,9 @@ void TaskContainer::drawButton(TQPainter *p) } else // hack for the dotNET style and others { - if (READ_MERGED_TASBKAR_SETTING(useCustomColors)) + if (READ_MERGED_TASKBAR_SETTING(useCustomColors)) { - textPen = TQPen(READ_MERGED_TASBKAR_SETTING(activeTaskTextColor)); + textPen = TQPen(READ_MERGED_TASKBAR_SETTING(activeTaskTextColor)); } else { @@ -775,7 +811,7 @@ void TaskContainer::drawButton(TQPainter *p) } } - int availableWidth = width() - (br.x() * 2) - textPos - 2 - (READ_MERGED_TASBKAR_SETTING(drawButtons) && KickerSettings::showDeepButtons())?2:0; + int availableWidth = width() - (br.x() * 2) - textPos - 2 - (READ_MERGED_TASKBAR_SETTING(drawButtons) && KickerSettings::showDeepButtons())?2:0; if (m_filteredTasks.count() > 1) { availableWidth -= 8; @@ -852,16 +888,16 @@ void TaskContainer::drawButton(TQPainter *p) } // draw popup arrow - if ((m_filteredTasks.count() > 1) && (!(READ_MERGED_TASBKAR_SETTING(drawButtons) && KickerSettings::showDeepButtons()))) + if ((m_filteredTasks.count() > 1) && (!(READ_MERGED_TASKBAR_SETTING(drawButtons) && KickerSettings::showDeepButtons()))) { TQStyle::PrimitiveElement e = TQStyle::PE_ArrowLeft; switch (arrowType) { - case Qt::LeftArrow: e = TQStyle::PE_ArrowLeft; break; - case Qt::RightArrow: e = TQStyle::PE_ArrowRight; break; - case Qt::UpArrow: e = TQStyle::PE_ArrowUp; break; - case Qt::DownArrow: e = TQStyle::PE_ArrowDown; break; + case TQt::LeftArrow: e = TQStyle::PE_ArrowLeft; break; + case TQt::RightArrow: e = TQStyle::PE_ArrowRight; break; + case TQt::UpArrow: e = TQStyle::PE_ArrowUp; break; + case TQt::DownArrow: e = TQStyle::PE_ArrowDown; break; } int flags = TQStyle::Style_Enabled; @@ -872,7 +908,7 @@ void TaskContainer::drawButton(TQPainter *p) flags |= TQStyle::Style_Down; } - style().tqdrawPrimitive(e, p, ar, colors, flags); + style().drawPrimitive(e, p, ar, colors, flags); } // draw mouse over frame in transparent mode @@ -979,7 +1015,7 @@ void TaskContainer::mousePressEvent( TQMouseEvent* e ) return; } - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) { m_dragStartPos = e->pos(); } @@ -994,15 +1030,15 @@ void TaskContainer::mousePressEvent( TQMouseEvent* e ) // Other actions will be handled in mouseReleaseEvent switch (e->button()) { - case Qt::LeftButton: - buttonAction = READ_MERGED_TASBKAR_ACTION(m_settingsObject->LeftButton); + case TQt::LeftButton: + buttonAction = READ_MERGED_TASKBAR_ACTION(m_settingsObject->LeftButton); break; - case Qt::MidButton: - buttonAction = READ_MERGED_TASBKAR_ACTION(m_settingsObject->MiddleButton); + case TQt::MidButton: + buttonAction = READ_MERGED_TASKBAR_ACTION(m_settingsObject->MiddleButton); break; - case Qt::RightButton: + case TQt::RightButton: default: - buttonAction = READ_MERGED_TASBKAR_ACTION(m_settingsObject->RightButton); + buttonAction = READ_MERGED_TASKBAR_ACTION(m_settingsObject->RightButton); break; } @@ -1018,14 +1054,14 @@ void TaskContainer::mouseReleaseEvent(TQMouseEvent *e) { m_dragStartPos = TQPoint(); - if (!READ_MERGED_TASBKAR_SETTING(drawButtons)) + if (!READ_MERGED_TASKBAR_SETTING(drawButtons)) { setDown(false); } // This is to avoid the flicker caused by redrawing the // button as unpressed just before it's activated. - if (!TQT_TQRECT_OBJECT(rect()).contains(e->pos())) + if (!rect().contains(e->pos())) { TQToolButton::mouseReleaseEvent(e); return; @@ -1035,15 +1071,15 @@ void TaskContainer::mouseReleaseEvent(TQMouseEvent *e) switch (e->button()) { - case Qt::LeftButton: - buttonAction = READ_MERGED_TASBKAR_ACTION(m_settingsObject->LeftButton); + case TQt::LeftButton: + buttonAction = READ_MERGED_TASKBAR_ACTION(m_settingsObject->LeftButton); break; - case Qt::MidButton: - buttonAction = READ_MERGED_TASBKAR_ACTION(m_settingsObject->MiddleButton); + case TQt::MidButton: + buttonAction = READ_MERGED_TASKBAR_ACTION(m_settingsObject->MiddleButton); break; - case Qt::RightButton: + case TQt::RightButton: default: - buttonAction = READ_MERGED_TASBKAR_ACTION(m_settingsObject->RightButton); + buttonAction = READ_MERGED_TASKBAR_ACTION(m_settingsObject->RightButton); break; } @@ -1061,7 +1097,7 @@ void TaskContainer::mouseReleaseEvent(TQMouseEvent *e) } performAction( buttonAction ); - TQTimer::singleShot(0, this, TQT_SLOT(update())); + TQTimer::singleShot(0, this, TQ_SLOT(update())); } void TaskContainer::performAction(int action) @@ -1218,12 +1254,12 @@ void TaskContainer::popupMenu(int action) } else if (action == m_settingsObject->ShowOperationsMenu) { - if (!kapp->authorizeTDEAction("twin_rmb")) + if (!tdeApp->authorizeTDEAction("twin_rmb")) { return; } - m_menu = new TaskRMBMenu(m_filteredTasks, taskBar->showAllWindows(), (READ_MERGED_TASBKAR_SETTING(allowDragAndDropReArrange))?makeTaskMoveMenu():NULL); + m_menu = new TaskRMBMenu(m_filteredTasks, taskBar->showAllWindows(), (READ_MERGED_TASKBAR_SETTING(allowDragAndDropReArrange))?makeTaskMoveMenu():NULL); } else { @@ -1274,22 +1310,22 @@ TQPopupMenu* TaskContainer::makeTaskMoveMenu() id = menu->insertItem(SmallIconSet("go-first"), i18n("Move to Beginning"), - this, TQT_SLOT(slotTaskMoveBeginning())); + this, TQ_SLOT(slotTaskMoveBeginning())); menu->setItemEnabled(id, (capabilities & TaskMoveDestination::Left)); id = menu->insertItem(SmallIconSet("back"), i18n("Move Left"), - this, TQT_SLOT(slotTaskMoveLeft())); + this, TQ_SLOT(slotTaskMoveLeft())); menu->setItemEnabled(id, (capabilities & TaskMoveDestination::Left)); id = menu->insertItem(SmallIconSet("forward"), i18n("Move Right"), - this, TQT_SLOT(slotTaskMoveRight())); + this, TQ_SLOT(slotTaskMoveRight())); menu->setItemEnabled(id, (capabilities & TaskMoveDestination::Right)); id = menu->insertItem(SmallIconSet("go-last"), i18n("Move to End"), - this, TQT_SLOT(slotTaskMoveEnd())); + this, TQ_SLOT(slotTaskMoveEnd())); menu->setItemEnabled(id, (capabilities & TaskMoveDestination::Right)); return menu; @@ -1328,11 +1364,6 @@ void TaskContainer::mouseMoveEvent( TQMouseEvent* e ) bool TaskContainer::startDrag(const TQPoint& pos) { - if (m_filteredTasks.count() != 1) - { - return false; - } - int delay = TDEGlobalSettings::dndEventDelay(); if ((m_dragStartPos - pos).manhattanLength() > delay) @@ -1375,7 +1406,7 @@ bool TaskContainer::eventFilter(TQObject *o, TQEvent *e) if ( TQApplication::widgetAt( p, true ) == this ) { if (me->type() == TQEvent::MouseButtonPress && - me->button() == Qt::LeftButton) + me->button() == TQt::LeftButton) { m_dragStartPos = mapFromGlobal(p); } @@ -1393,10 +1424,10 @@ bool TaskContainer::eventFilter(TQObject *o, TQEvent *e) { if (!m_dragStartPos.isNull()) { - TQMouseEvent* me = TQT_TQMOUSEEVENT(e); + TQMouseEvent* me = static_cast<TQMouseEvent*>(e); TQPoint p(me->globalPos()); - if (me->state() & Qt::LeftButton && + if (me->state() & TQt::LeftButton && TQApplication::widgetAt(p, true) == this) { kdDebug() << "event move" << endl; @@ -1452,7 +1483,7 @@ void TaskContainer::dragEnterEvent( TQDragEnterEvent* e ) return; } - if (e->source() && (e->source()->parent() == this->parent()) && TaskDrag::canDecode(e) && READ_MERGED_TASBKAR_SETTING(allowDragAndDropReArrange) && (!READ_MERGED_TASBKAR_SETTING(sortByApp))) + if (e->source() && (e->source()->parent() == this->parent()) && TaskDrag::canDecode(e) && READ_MERGED_TASKBAR_SETTING(allowDragAndDropReArrange) && (!READ_MERGED_TASKBAR_SETTING(sortByApp))) { e->accept(); } @@ -1480,7 +1511,7 @@ void TaskContainer::dropEvent( TQDropEvent* e ) return; } - if ((e->source()->parent() == this->parent()) && TaskDrag::canDecode(e) && READ_MERGED_TASBKAR_SETTING(allowDragAndDropReArrange) && (!READ_MERGED_TASBKAR_SETTING(sortByApp))) + if ((e->source()->parent() == this->parent()) && TaskDrag::canDecode(e) && READ_MERGED_TASKBAR_SETTING(allowDragAndDropReArrange) && (!READ_MERGED_TASKBAR_SETTING(sortByApp))) { if (taskBar->taskMoveHandler(TaskMoveDestination::Position, TaskDrag::decode(e), TQWidget::mapTo(taskBar, e->pos()))) { e->accept(); @@ -1631,10 +1662,10 @@ void TaskContainer::updateFilteredTaskList() { Task::Ptr t = *it; if ((taskBar->showAllWindows() || t->isOnCurrentDesktop()) && - (!READ_MERGED_TASBKAR_SETTING(showOnlyIconified) || t->isIconified())) + (!READ_MERGED_TASKBAR_SETTING(showOnlyIconified) || t->isIconified())) { pid_t pid = 0; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 Atom type_ret; int format_ret; unsigned long nitems_ret = 0, unused = 0; @@ -1652,15 +1683,15 @@ void TaskContainer::updateFilteredTaskList() if (pid < 0) { m_filteredTasks.append(t); } - else if (READ_MERGED_TASBKAR_SETTING(showTaskStates) != m_settingsObject->ShowAll) { + else if (READ_MERGED_TASKBAR_SETTING(showTaskStates) != m_settingsObject->ShowAll) { if (is_process_resumable(pid)) { - if (READ_MERGED_TASBKAR_SETTING(showTaskStates) == m_settingsObject->ShowAll) { + if (READ_MERGED_TASKBAR_SETTING(showTaskStates) == m_settingsObject->ShowAll) { m_filteredTasks.append(t); } - else if (READ_MERGED_TASBKAR_SETTING(showTaskStates) == m_settingsObject->ShowStopped) { + else if (READ_MERGED_TASKBAR_SETTING(showTaskStates) == m_settingsObject->ShowStopped) { m_filteredTasks.append(t); } - else if (READ_MERGED_TASBKAR_SETTING(showTaskStates) == m_settingsObject->ShowRunning) { + else if (READ_MERGED_TASKBAR_SETTING(showTaskStates) == m_settingsObject->ShowRunning) { t->publishIconGeometry( TQRect()); } else { @@ -1668,13 +1699,13 @@ void TaskContainer::updateFilteredTaskList() } } else { - if (READ_MERGED_TASBKAR_SETTING(showTaskStates) == m_settingsObject->ShowAll) { + if (READ_MERGED_TASKBAR_SETTING(showTaskStates) == m_settingsObject->ShowAll) { m_filteredTasks.append(t); } - else if (READ_MERGED_TASBKAR_SETTING(showTaskStates) == m_settingsObject->ShowStopped) { + else if (READ_MERGED_TASKBAR_SETTING(showTaskStates) == m_settingsObject->ShowStopped) { t->publishIconGeometry( TQRect()); } - else if (READ_MERGED_TASBKAR_SETTING(showTaskStates) == m_settingsObject->ShowRunning) { + else if (READ_MERGED_TASKBAR_SETTING(showTaskStates) == m_settingsObject->ShowRunning) { m_filteredTasks.append(t); } else { @@ -1695,7 +1726,7 @@ void TaskContainer::updateFilteredTaskList() // sort container list by desktop if (taskBar->sortByDesktop() && m_filteredTasks.count() > 1) { - TQValueVector<QPair<int, Task::Ptr> > sorted; + TQValueVector<TQPair<int, Task::Ptr> > sorted; sorted.resize(m_filteredTasks.count()); int i = 0; @@ -1710,7 +1741,7 @@ void TaskContainer::updateFilteredTaskList() qHeapSort(sorted); m_filteredTasks.clear(); - for (TQValueVector<QPair<int, Task::Ptr> >::iterator it = sorted.begin(); + for (TQValueVector<TQPair<int, Task::Ptr> >::iterator it = sorted.begin(); it != sorted.end(); ++it) { @@ -1742,6 +1773,8 @@ void TaskContainer::settingsChanged() void TaskContainer::updateKickerTip(KickerTip::Data& data) { + int iconSize = READ_MERGED_TASKBAR_SETTING(iconSize); + if (m_startup) { data.message = m_startup->text(); @@ -1749,7 +1782,7 @@ void TaskContainer::updateKickerTip(KickerTip::Data& data) data.subtext = i18n("Loading application ..."); data.icon = TDEGlobal::iconLoader()->loadIcon(m_startup->icon(), TDEIcon::Small, - TDEIcon::SizeMedium, + iconSize, TDEIcon::DefaultState, 0, true); return; @@ -1761,21 +1794,18 @@ void TaskContainer::updateKickerTip(KickerTip::Data& data) if (m_filteredTasks.count() > 0) { - if (READ_MERGED_TASBKAR_SETTING(showThumbnails) && + if (READ_MERGED_TASKBAR_SETTING(showThumbnails) && m_filteredTasks.count() == 1) { Task::Ptr t = m_filteredTasks.first(); - pixmap = t->thumbnail(READ_MERGED_TASBKAR_SETTING(thumbnailMaxDimension)); + pixmap = t->thumbnail(READ_MERGED_TASKBAR_SETTING(thumbnailMaxDimension)); } if (pixmap.isNull() && tasks.count()) { // try to load icon via net_wm - pixmap = KWin::icon(tasks.last()->window(), - TDEIcon::SizeMedium, - TDEIcon::SizeMedium, - true); + pixmap = KWin::icon(tasks.last()->window(), iconSize, iconSize, true); } // Collect all desktops the tasks are on. Sort naturally. @@ -1809,7 +1839,7 @@ void TaskContainer::updateKickerTip(KickerTip::Data& data) } } - if (READ_MERGED_TASBKAR_SETTING(showAllWindows) && KWin::numberOfDesktops() > 1) + if (READ_MERGED_TASKBAR_SETTING(showAllWindows) && KWin::numberOfDesktops() > 1) { if (desktopMap.isEmpty()) { diff --git a/kicker/taskbar/taskcontainer.h b/kicker/taskbar/taskcontainer.h index edaf337b4..0ae864185 100644 --- a/kicker/taskbar/taskcontainer.h +++ b/kicker/taskbar/taskcontainer.h @@ -39,7 +39,7 @@ typedef TQValueList<TQPixmap*> PixmapList; class TaskContainer : public TQToolButton, public KickerTip::Client { - Q_OBJECT + TQ_OBJECT public: typedef TQValueList<TaskContainer*> List; @@ -117,6 +117,8 @@ protected: void popupMenu(int); void updateFilteredTaskList(); + void updateIconSize(); + void recalculateIconRect(); protected slots: void animationTimerFired(); @@ -144,6 +146,7 @@ private: PixmapList frames; int attentionState; TQRect iconRect; + int iconSize; TQPixmap animBg; Task::List tasks; Task::List m_filteredTasks; diff --git a/kicker/taskmanager/tasklmbmenu.cpp b/kicker/taskmanager/tasklmbmenu.cpp index 1be54ca8b..79c809e39 100644 --- a/kicker/taskmanager/tasklmbmenu.cpp +++ b/kicker/taskmanager/tasklmbmenu.cpp @@ -99,7 +99,7 @@ TaskLMBMenu::TaskLMBMenu(const Task::List& tasks, TQWidget *parent, const char * setAcceptDrops(true); // Always enabled to activate task during drag&drop. m_dragSwitchTimer = new TQTimer(this, "DragSwitchTimer"); - connect(m_dragSwitchTimer, TQT_SIGNAL(timeout()), TQT_SLOT(dragSwitch())); + connect(m_dragSwitchTimer, TQ_SIGNAL(timeout()), TQ_SLOT(dragSwitch())); } void TaskLMBMenu::fillMenu() @@ -118,7 +118,7 @@ void TaskLMBMenu::fillMenu() t->isIconified(), t->demandsAttention()); int id = insertItem(TQIconSet(t->pixmap()), menuItem); - connectItem(id, t, TQT_SLOT(activateRaiseOrIconify())); + connectItem(id, t, TQ_SLOT(activateRaiseOrIconify())); setItemChecked(id, t->isActive()); if (t->demandsAttention()) @@ -131,7 +131,7 @@ void TaskLMBMenu::fillMenu() if (m_attentionState) { m_attentionTimer = new TQTimer(this, "AttentionTimer"); - connect(m_attentionTimer, TQT_SIGNAL(timeout()), TQT_SLOT(attentionTimeout())); + connect(m_attentionTimer, TQ_SIGNAL(timeout()), TQ_SLOT(attentionTimeout())); m_attentionTimer->start(500, true); } } @@ -229,7 +229,7 @@ void TaskLMBMenu::dragSwitch() void TaskLMBMenu::mousePressEvent( TQMouseEvent* e ) { - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) { m_dragStartPos = e->pos(); } diff --git a/kicker/taskmanager/tasklmbmenu.h b/kicker/taskmanager/tasklmbmenu.h index 7eedc115b..f0ff70afc 100644 --- a/kicker/taskmanager/tasklmbmenu.h +++ b/kicker/taskmanager/tasklmbmenu.h @@ -51,9 +51,9 @@ private: /*****************************************************************************/ -class KDE_EXPORT TaskLMBMenu : public TQPopupMenu +class TDE_EXPORT TaskLMBMenu : public TQPopupMenu { - Q_OBJECT + TQ_OBJECT public: TaskLMBMenu(const Task::List& list, TQWidget *parent = 0, const char *name = 0); diff --git a/kicker/taskmanager/taskmanager.cpp b/kicker/taskmanager/taskmanager.cpp index 33df1ddd6..3e941315f 100644 --- a/kicker/taskmanager/taskmanager.cpp +++ b/kicker/taskmanager/taskmanager.cpp @@ -26,6 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqimage.h> #include <tqtimer.h> +#include <tdeapplication.h> #include <tdeconfig.h> #include <kdebug.h> #include <tdeglobal.h> @@ -36,6 +37,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <twinmodule.h> #include <kxerrorhandler.h> #include <netwm.h> +#include "dcopclient.h" #include "taskmanager.h" #include "taskmanager.moc" @@ -61,16 +63,16 @@ TaskManager::TaskManager() m_trackGeometry(false) { TDEGlobal::locale()->insertCatalogue("libtaskmanager"); - connect(m_winModule, TQT_SIGNAL(windowAdded(WId)), - this, TQT_SLOT(windowAdded(WId))); - connect(m_winModule, TQT_SIGNAL(windowRemoved(WId)), - this, TQT_SLOT(windowRemoved(WId))); - connect(m_winModule, TQT_SIGNAL(activeWindowChanged(WId)), - this, TQT_SLOT(activeWindowChanged(WId))); - connect(m_winModule, TQT_SIGNAL(currentDesktopChanged(int)), - this, TQT_SLOT(currentDesktopChanged(int))); - connect(m_winModule, TQT_SIGNAL(windowChanged(WId,unsigned int)), - this, TQT_SLOT(windowChanged(WId,unsigned int))); + connect(m_winModule, TQ_SIGNAL(windowAdded(WId)), + this, TQ_SLOT(windowAdded(WId))); + connect(m_winModule, TQ_SIGNAL(windowRemoved(WId)), + this, TQ_SLOT(windowRemoved(WId))); + connect(m_winModule, TQ_SIGNAL(activeWindowChanged(WId)), + this, TQ_SLOT(activeWindowChanged(WId))); + connect(m_winModule, TQ_SIGNAL(currentDesktopChanged(int)), + this, TQ_SLOT(currentDesktopChanged(int))); + connect(m_winModule, TQ_SIGNAL(windowChanged(WId,unsigned int)), + this, TQ_SLOT(windowChanged(WId,unsigned int))); // register existing windows const TQValueList<WId> windows = m_winModule->windows(); @@ -99,14 +101,14 @@ void TaskManager::configure_startup() return; _startup_info = new TDEStartupInfo( TDEStartupInfo::CleanOnCantDetect, this ); connect( _startup_info, - TQT_SIGNAL( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )), - TQT_SLOT( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& ))); + TQ_SIGNAL( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )), + TQ_SLOT( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& ))); connect( _startup_info, - TQT_SIGNAL( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& )), - TQT_SLOT( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& ))); + TQ_SIGNAL( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& )), + TQ_SLOT( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& ))); connect( _startup_info, - TQT_SIGNAL( gotRemoveStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )), - TQT_SLOT( killStartup( const TDEStartupInfoId& ))); + TQ_SIGNAL( gotRemoveStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )), + TQ_SLOT( killStartup( const TDEStartupInfoId& ))); c.setGroup( "TaskbarButtonSettings" ); _startup_info->setTimeout( c.readUnsignedNumEntry( "Timeout", 30 )); } @@ -1305,7 +1307,7 @@ void Task::updateThumbnail() // by the thumbnail generation. This makes things much smoother // on slower machines. // - TQWidget *rootWin = TQT_TQWIDGET(tqApp->desktop()); + TQWidget *rootWin = tqApp->desktop(); TQRect geom = _info.geometry(); _grab = TQPixmap::grabWindow(rootWin->winId(), geom.x(), geom.y(), @@ -1313,7 +1315,7 @@ void Task::updateThumbnail() if (!_grab.isNull()) { - TQTimer::singleShot(200, this, TQT_SLOT(generateThumbnail())); + TQTimer::singleShot(200, this, TQ_SLOT(generateThumbnail())); } } @@ -1452,6 +1454,14 @@ void Task::updateWindowPixmap() #endif // THUMBNAILING_POSSIBLE } +void Task::tileTo(int position) +{ + TQByteArray params; + TQDataStream stream(params, IO_WriteOnly); + stream << _win << position; + tdeApp->dcopClient()->send("twin", "KWinInterface", "tileWindowToBorder(unsigned long int, int)", params); +} + Startup::Startup(const TDEStartupInfoId& id, const TDEStartupInfoData& data, TQObject * parent, const char *name) : TQObject(parent, name), _id(id), _data(data) diff --git a/kicker/taskmanager/taskmanager.h b/kicker/taskmanager/taskmanager.h index 2753218c8..3f8e2f5e2 100644 --- a/kicker/taskmanager/taskmanager.h +++ b/kicker/taskmanager/taskmanager.h @@ -68,9 +68,9 @@ typedef TQValueList<WId> WindowList; * @see TaskManager * @see KWinModule */ -class KDE_EXPORT Task: public TQObject, public TDEShared +class TDE_EXPORT Task: public TQObject, public TDEShared { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQString visibleIconicName READ visibleIconicName ) TQ_PROPERTY( TQString iconicName READ iconicName ) TQ_PROPERTY( TQString visibleIconicNameWithState READ visibleIconicNameWithState ) @@ -423,6 +423,12 @@ public slots: */ void updateThumbnail(); + /** + * Tile the task's window to the specified position. The position is one of the + * valid value for ActiveBorder enum + */ + void tileTo(int); + signals: /** * Indicates that this task has changed in some way. @@ -483,7 +489,7 @@ private: /** * Provids a drag object for tasks across desktops. */ -class KDE_EXPORT TaskDrag : public TQStoredDrag +class TDE_EXPORT TaskDrag : public TQStoredDrag { public: /** @@ -511,9 +517,9 @@ public: * * @see TaskManager */ -class KDE_EXPORT Startup: public TQObject, public TDEShared +class TDE_EXPORT Startup: public TQObject, public TDEShared { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQString text READ text ) TQ_PROPERTY( TQString bin READ bin ) TQ_PROPERTY( TQString icon READ icon ) @@ -565,9 +571,9 @@ private: * @see Startup * @see KWinModule */ -class KDE_EXPORT TaskManager : public TQObject +class TDE_EXPORT TaskManager : public TQObject { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( int currentDesktop READ currentDesktop ) TQ_PROPERTY( int numberOfDesktops READ numberOfDesktops ) diff --git a/kicker/taskmanager/taskrmbmenu.cpp b/kicker/taskmanager/taskrmbmenu.cpp index 58682196b..31c48d61c 100644 --- a/kicker/taskmanager/taskrmbmenu.cpp +++ b/kicker/taskmanager/taskrmbmenu.cpp @@ -24,6 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <assert.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <tdelocale.h> @@ -44,6 +45,8 @@ TaskRMBMenu::TaskRMBMenu(const Task::List& theTasks, bool show, TQPopupMenu* mov , showAll( show ) , taskMoveMenu( moveMenu ) { + TDEGlobal::iconLoader()->addAppDir("twin"); + assert(tasks.count() > 0); if (tasks.count() == 1) { @@ -68,9 +71,14 @@ void TaskRMBMenu::fillMenu(Task::Ptr t) int id; setCheckable(true); - insertItem(i18n("Ad&vanced"), makeAdvancedMenu(t)); bool checkActions = KWin::allowedActionsSupported(); + insertItem(i18n("Ad&vanced"), makeAdvancedMenu(t)); + + id = insertItem(i18n("T&ile"), makeTileMenu(t)); + setItemEnabled(id, !checkActions || + (t->info().actionSupported(NET::ActionMove) && t->info().actionSupported(NET::ActionResize))); + if (TaskManager::the()->numberOfDesktops() > 1) { id = insertItem(i18n("To &Desktop"), makeDesktopsMenu(t)); @@ -78,7 +86,7 @@ void TaskRMBMenu::fillMenu(Task::Ptr t) if (showAll) { id = insertItem(i18n("&To Current Desktop"), - t, TQT_SLOT(toCurrentDesktop())); + t, TQ_SLOT(toCurrentDesktop())); setItemEnabled( id, !t->isOnCurrentDesktop() ); } @@ -88,55 +96,55 @@ void TaskRMBMenu::fillMenu(Task::Ptr t) } } - id = insertItem(SmallIconSet("move"), i18n("&Move"), t, TQT_SLOT(move())); + id = insertItem(SmallIconSet("move"), i18n("&Move"), t, TQ_SLOT(move())); setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionMove)); - id = insertItem(i18n("Re&size"), t, TQT_SLOT(resize())); + id = insertItem(i18n("Re&size"), t, TQ_SLOT(resize())); setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionResize)); - id = insertItem(i18n("Mi&nimize"), t, TQT_SLOT(toggleIconified())); + id = insertItem(i18n("Mi&nimize"), t, TQ_SLOT(toggleIconified())); setItemChecked(id, t->isIconified()); setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionMinimize)); - id = insertItem(i18n("Ma&ximize"), t, TQT_SLOT(toggleMaximized())); + id = insertItem(i18n("Ma&ximize"), t, TQ_SLOT(toggleMaximized())); setItemChecked(id, t->isMaximized()); setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionMax)); - id = insertItem(i18n("&Shade"), t, TQT_SLOT(toggleShaded())); + id = insertItem(i18n("&Shade"), t, TQ_SLOT(toggleShaded())); setItemChecked(id, t->isShaded()); setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionShade)); insertSeparator(); if (taskMoveMenu) { - taskMoveMenu->reparent(this, taskMoveMenu->getWFlags(), taskMoveMenu->geometry().topLeft(), FALSE); + taskMoveMenu->reparent(this, taskMoveMenu->getWFlags(), taskMoveMenu->geometry().topLeft(), false); insertItem(i18n("Move Task Button"), taskMoveMenu); insertSeparator(); } - id = insertItem(SmallIcon("window-close"), i18n("&Close"), t, TQT_SLOT(close())); + id = insertItem(SmallIcon("window-close"), i18n("&Close"), t, TQ_SLOT(close())); setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionClose)); } void TaskRMBMenu::fillMenu() { - int id; - setCheckable( true ); + int id; + setCheckable( true ); Task::List::iterator itEnd = tasks.end(); for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it) { - Task::Ptr t = (*it); + Task::Ptr t = (*it); - id = insertItem( TQIconSet( t->pixmap() ), - t->visibleNameWithState(), - new TaskRMBMenu(t, this) ); - setItemChecked( id, t->isActive() ); - connectItem( id, t, TQT_SLOT( activateRaiseOrIconify() ) ); - } + id = insertItem( TQIconSet( t->pixmap() ), + t->visibleNameWithState(), + new TaskRMBMenu(t, this) ); + setItemChecked( id, t->isActive() ); + connectItem( id, t, TQ_SLOT( activateRaiseOrIconify() ) ); + } - insertSeparator(); + insertSeparator(); bool enable = false; @@ -144,7 +152,7 @@ void TaskRMBMenu::fillMenu() { id = insertItem(i18n("All to &Desktop"), makeDesktopsMenu()); - id = insertItem(i18n("All &to Current Desktop"), this, TQT_SLOT(slotAllToCurrentDesktop())); + id = insertItem(i18n("All &to Current Desktop"), this, TQ_SLOT(slotAllToCurrentDesktop())); Task::List::iterator itEnd = tasks.end(); for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it) { @@ -159,48 +167,55 @@ void TaskRMBMenu::fillMenu() enable = false; - id = insertItem( i18n( "Mi&nimize All" ), this, TQT_SLOT( slotMinimizeAll() ) ); + id = insertItem( i18n( "Mi&nimize All" ), this, TQ_SLOT( slotMinimizeAll() ) ); itEnd = tasks.end(); for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it) { - if( !(*it)->isIconified() ) { - enable = true; - break; - } - } - setItemEnabled( id, enable ); + if( !(*it)->isIconified() ) { + enable = true; + break; + } + } + setItemEnabled( id, enable ); - enable = false; + enable = false; - id = insertItem( i18n( "Ma&ximize All" ), this, TQT_SLOT( slotMaximizeAll() ) ); + id = insertItem( i18n( "Ma&ximize All" ), this, TQ_SLOT( slotMaximizeAll() ) ); itEnd = tasks.end(); for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it) { if( !(*it)->isMaximized() ) { - enable = true; - break; - } - } - setItemEnabled( id, enable ); + enable = true; + break; + } + } + setItemEnabled( id, enable ); - enable = false; + enable = false; - id = insertItem( i18n( "&Restore All" ), this, TQT_SLOT( slotRestoreAll() ) ); + id = insertItem( i18n( "&Restore All" ), this, TQ_SLOT( slotRestoreAll() ) ); itEnd = tasks.end(); for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it) { - if( (*it)->isIconified() || (*it)->isMaximized() ) { - enable = true; - break; - } - } - setItemEnabled( id, enable ); + if( (*it)->isIconified() || (*it)->isMaximized() ) { + enable = true; + break; + } + } + setItemEnabled( id, enable ); - insertSeparator(); + insertSeparator(); - enable = false; + enable = false; - insertItem( SmallIcon( "remove" ), i18n( "&Close All" ), this, TQT_SLOT( slotCloseAll() ) ); + if (taskMoveMenu) { + taskMoveMenu->reparent(this, taskMoveMenu->getWFlags(), taskMoveMenu->geometry().topLeft(), false); + insertItem(i18n("Move Task Button"), taskMoveMenu); + + insertSeparator(); + } + + insertItem( SmallIcon( "window-close" ), i18n( "&Close All" ), this, TQ_SLOT( slotCloseAll() ) ); } TQPopupMenu* TaskRMBMenu::makeAdvancedMenu(Task::Ptr t) @@ -212,17 +227,17 @@ TQPopupMenu* TaskRMBMenu::makeAdvancedMenu(Task::Ptr t) id = menu->insertItem(SmallIconSet("go-up"), i18n("Keep &Above Others"), - t, TQT_SLOT(toggleAlwaysOnTop())); + t, TQ_SLOT(toggleAlwaysOnTop())); menu->setItemChecked(id, t->isAlwaysOnTop()); id = menu->insertItem(SmallIconSet("go-down"), i18n("Keep &Below Others"), - t, TQT_SLOT(toggleKeptBelowOthers())); + t, TQ_SLOT(toggleKeptBelowOthers())); menu->setItemChecked(id, t->isKeptBelowOthers()); id = menu->insertItem(SmallIconSet("view-fullscreen"), i18n("&Fullscreen"), - t, TQT_SLOT(toggleFullScreen())); + t, TQ_SLOT(toggleFullScreen())); menu->setItemChecked(id, t->isFullScreen()); if (KWin::allowedActionsSupported()) @@ -238,7 +253,7 @@ TQPopupMenu* TaskRMBMenu::makeDesktopsMenu(Task::Ptr t) TQPopupMenu* m = new TQPopupMenu( this ); m->setCheckable( true ); - int id = m->insertItem( i18n("&All Desktops"), t, TQT_SLOT( toDesktop(int) ) ); + int id = m->insertItem( i18n("&All Desktops"), t, TQ_SLOT( toDesktop(int) ) ); m->setItemParameter( id, 0 ); // 0 means all desktops m->setItemChecked( id, t->isOnAllDesktops() ); @@ -246,7 +261,7 @@ TQPopupMenu* TaskRMBMenu::makeDesktopsMenu(Task::Ptr t) for (int i = 1; i <= TaskManager::the()->numberOfDesktops(); i++) { TQString name = TQString("&%1 %2").arg(i).arg(TaskManager::the()->desktopName(i).replace('&', "&&")); - id = m->insertItem( name, t, TQT_SLOT( toDesktop(int) ) ); + id = m->insertItem( name, t, TQ_SLOT( toDesktop(int) ) ); m->setItemParameter( id, i ); m->setItemChecked( id, !t->isOnAllDesktops() && t->desktop() == i ); } @@ -259,20 +274,47 @@ TQPopupMenu* TaskRMBMenu::makeDesktopsMenu() TQPopupMenu* m = new TQPopupMenu( this ); m->setCheckable( true ); - int id = m->insertItem( i18n("&All Desktops"), this, TQT_SLOT( slotAllToDesktop(int) ) ); + int id = m->insertItem( i18n("&All Desktops"), this, TQ_SLOT( slotAllToDesktop(int) ) ); m->setItemParameter( id, 0 ); // 0 means all desktops m->insertSeparator(); for (int i = 1; i <= TaskManager::the()->numberOfDesktops(); i++) { TQString name = TQString("&%1 %2").arg(i).arg(TaskManager::the()->desktopName(i).replace('&', "&&")); - id = m->insertItem( name, this, TQT_SLOT( slotAllToDesktop(int) ) ); + id = m->insertItem( name, this, TQ_SLOT( slotAllToDesktop(int) ) ); m->setItemParameter( id, i ); } return m; } +TQPopupMenu* TaskRMBMenu::makeTileMenu(Task::Ptr t) +{ + TQPopupMenu *m = new TQPopupMenu( this ); + + // Tile to side (the menu id matched the ActiveBorder index used for tiling) + int id = m->insertItem( UserIconSet("tile_left"), i18n("&Left"), t, TQ_SLOT( tileTo(int) ) ); + m->setItemParameter( id, 6 ); + id = m->insertItem( UserIconSet("tile_right"), i18n("&Right"), t, TQ_SLOT( tileTo(int) ) ); + m->setItemParameter( id, 2 ); + id = m->insertItem( UserIconSet("tile_top"), i18n("&Top"), t, TQ_SLOT( tileTo(int) ) ); + m->setItemParameter( id, 0 ); + id = m->insertItem( UserIconSet("tile_bottom"), i18n("&Bottom"), t, TQ_SLOT( tileTo(int) ) ); + m->setItemParameter( id, 4 ); + + // Tile to corner (the menu id matched the ActiveBorder index used for tiling) + id = m->insertItem( UserIconSet("tile_topleft"), i18n("Top &Left"), t, TQ_SLOT( tileTo(int) ) ); + m->setItemParameter( id, 7 ); + id = m->insertItem( UserIconSet("tile_topright"), i18n("Top &Right"), t, TQ_SLOT( tileTo(int) ) ); + m->setItemParameter( id, 1 ); + id = m->insertItem( UserIconSet("tile_bottomleft"), i18n("Bottom L&eft"), t, TQ_SLOT( tileTo(int) ) ); + m->setItemParameter( id, 5 ); + id = m->insertItem( UserIconSet("tile_bottomright"), i18n("&Bottom R&ight"), t, TQ_SLOT( tileTo(int) ) ); + m->setItemParameter( id, 3 ); + + return m; +} + void TaskRMBMenu::slotMinimizeAll() { Task::List::iterator itEnd = tasks.end(); diff --git a/kicker/taskmanager/taskrmbmenu.h b/kicker/taskmanager/taskrmbmenu.h index 76b209ca7..5dd66b98f 100644 --- a/kicker/taskmanager/taskrmbmenu.h +++ b/kicker/taskmanager/taskrmbmenu.h @@ -27,9 +27,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqpopupmenu.h> -class KDE_EXPORT TaskRMBMenu : public TQPopupMenu +class TDE_EXPORT TaskRMBMenu : public TQPopupMenu { - Q_OBJECT + TQ_OBJECT public: TaskRMBMenu(const Task::List&, bool showAll = true, TQPopupMenu* moveMenu = NULL, TQWidget *parent = 0, const char *name = 0); @@ -38,9 +38,10 @@ public: private: void fillMenu(Task::Ptr); void fillMenu(); - TQPopupMenu* makeAdvancedMenu(Task::Ptr); + TQPopupMenu* makeAdvancedMenu(Task::Ptr); TQPopupMenu* makeDesktopsMenu(Task::Ptr); TQPopupMenu* makeDesktopsMenu(); + TQPopupMenu* makeTileMenu(Task::Ptr); private slots: void slotMinimizeAll(); @@ -48,7 +49,7 @@ private slots: void slotRestoreAll(); void slotShadeAll(); void slotCloseAll(); - void slotAllToDesktop( int desktop ); + void slotAllToDesktop(int desktop); void slotAllToCurrentDesktop(); private: |
