summaryrefslogtreecommitdiffstats
path: root/kmoon
diff options
context:
space:
mode:
Diffstat (limited to 'kmoon')
-rw-r--r--kmoon/CMakeL10n.txt6
-rw-r--r--kmoon/CMakeLists.txt4
-rw-r--r--kmoon/kmoonapplet.cpp29
-rw-r--r--kmoon/kmoonapplet.desktop101
-rw-r--r--kmoon/kmoonapplet.h9
-rw-r--r--kmoon/kmoondlg.cpp12
-rw-r--r--kmoon/kmoondlg.h2
-rw-r--r--kmoon/kmoonwidget.cpp32
-rw-r--r--kmoon/kmoonwidget.h5
9 files changed, 37 insertions, 163 deletions
diff --git a/kmoon/CMakeL10n.txt b/kmoon/CMakeL10n.txt
index 5e68785..185a17e 100644
--- a/kmoon/CMakeL10n.txt
+++ b/kmoon/CMakeL10n.txt
@@ -1,3 +1,9 @@
##### create translation templates ##############
tde_l10n_create_template( "kmoon" )
+
+tde_l10n_create_template(
+ CATALOG "desktop_files/kmoonapplet.desktop/"
+ SOURCES kmoonapplet.desktop
+ DESTINATION "${CMAKE_SOURCE_DIR}/translations"
+)
diff --git a/kmoon/CMakeLists.txt b/kmoon/CMakeLists.txt
index 01cb512..9658c74 100644
--- a/kmoon/CMakeLists.txt
+++ b/kmoon/CMakeLists.txt
@@ -41,7 +41,7 @@ tde_install_icons( kmoon )
##### other data ################################
-install( FILES kmoonapplet.desktop
+tde_create_translated_desktop(
+ SOURCE kmoonapplet.desktop
DESTINATION ${DATA_INSTALL_DIR}/kicker/applets
)
-
diff --git a/kmoon/kmoonapplet.cpp b/kmoon/kmoonapplet.cpp
index 1a653f9..5f9158b 100644
--- a/kmoon/kmoonapplet.cpp
+++ b/kmoon/kmoonapplet.cpp
@@ -19,30 +19,12 @@
*
*/
-#include <stdlib.h>
-#include <assert.h>
-#include <unistd.h>
-
-#include <tqbitmap.h>
-#include <tqtooltip.h>
-#include <tqpainter.h>
#include <tqpopupmenu.h>
#include <tqlayout.h>
-#include <dcopclient.h>
-#include <kdebug.h>
-#include <tdeapplication.h>
-#include <twin.h>
-#include <tdestartupinfo.h>
#include <tdemessagebox.h>
-#include <tdeaboutdata.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
-#include <tdecmdlineargs.h>
#include <kiconloader.h>
-#include <kiconeffect.h>
-#include <tdeconfig.h>
-#include <kdialogbase.h>
#include "version.h"
#include "kmoondlg.h"
@@ -53,7 +35,7 @@ const char *description = I18N_NOOP("Moon Phase Indicator for TDE");
extern "C"
{
- KDE_EXPORT KPanelApplet *init(TQWidget *parent, const TQString& configFile)
+ TDE_EXPORT KPanelApplet *init(TQWidget *parent, const TQString& configFile)
{
TDEGlobal::locale()->insertCatalogue("kmoon");
return new MoonPAWidget(configFile, KPanelApplet::Normal,
@@ -80,9 +62,9 @@ MoonPAWidget::MoonPAWidget(const TQString& configFile, Type type, int actions,
popup = new TQPopupMenu();
popup->insertItem(SmallIcon("kmoon"),
i18n("&About"), this,
- TQT_SLOT(showAbout()));
+ TQ_SLOT(showAbout()));
popup->insertItem(SmallIcon("configure"), i18n("&Configure..."), this,
- TQT_SLOT(settings()));
+ TQ_SLOT(settings()));
// missuse timerEvent for initialising
timerEvent(0);
@@ -145,7 +127,6 @@ void MoonPAWidget::timerEvent( TQTimerEvent * )
time(&clock);
struct tm *t = localtime(&clock);
moon->calcStatus(mktime(t));
- moon->repaint();
}
void MoonPAWidget::mousePressEvent( TQMouseEvent *e)
@@ -153,11 +134,11 @@ void MoonPAWidget::mousePressEvent( TQMouseEvent *e)
if (!popup)
return;
- if (e->button() == Qt::RightButton) {
+ if (e->button() == TQt::RightButton) {
popup->popup(mapToGlobal(e->pos()));
popup->exec();
}
- if (e->button() == Qt::LeftButton) {
+ if (e->button() == TQt::LeftButton) {
showAbout();
}
}
diff --git a/kmoon/kmoonapplet.desktop b/kmoon/kmoonapplet.desktop
index 069acaf..a3186b7 100644
--- a/kmoon/kmoonapplet.desktop
+++ b/kmoon/kmoonapplet.desktop
@@ -2,108 +2,7 @@
Type=Plugin
Icon=kmoon
Name=Moon Phase
-Name[be]=Фаза луны
-Name[bg]=Фази на луната
-Name[bn]=চাঁদের কলা
-Name[br]=Prantadoù al loariad
-Name[ca]=Fase de la lluna
-Name[cs]=Měsíční fáze
-Name[cy]=Gweddau'r Lleuad
-Name[da]=Månefase
-Name[de]=Mondphasen-Darstellung
-Name[el]=Δείκτης των φάσεων της Σελήνης
-Name[eo]=Lunfazo
-Name[es]=Fase lunar
-Name[et]=Kuu faasid
-Name[eu]=Ilargiaren fasea
-Name[fa]=هلال ماه
-Name[fi]=Kuunvaihenäyttäjä
-Name[fr]=Phase de la Lune
-Name[ga]=Céim na Gealaí
-Name[gl]=Fase da Lua
-Name[he]=מופע הירח
-Name[hr]=Mjesečeva mjena
-Name[hu]=KMoon
-Name[is]=Tunglskiptabirtir
-Name[it]=Fasi lunari
-Name[ja]=月の満ち欠け
-Name[km]=ដំណើរ​ព្រះចន្ទ
-Name[ko]=달 모양 보기
-Name[lv]=Mēness fāzes
-Name[mk]=Месечеви мени
-Name[nb]=Se månefasene
-Name[nds]=Maandwieser
-Name[ne]=चन्द्रमाको रूप
-Name[nl]=Maanstand
-Name[nn]=Månefase
-Name[pa]=ਚੰਦ ਕਲਾਵਾਂ
-Name[pl]=Fazy księżyca
-Name[pt]=Fase Lunar
-Name[pt_BR]=Fase da Lua
-Name[ro]=Fazele Lunii
-Name[ru]=Фазы Луны
-Name[sk]=Fázy Mesiaca
-Name[sl]=Lunina mena
-Name[sr]=Месечеве мене
-Name[sr@Latn]=Mesečeve mene
-Name[sv]=Månfaser
-Name[tg]=Авзои Моҳ
-Name[tr]=Ay'ın Durumu
-Name[uk]=Фази місяця
-Name[wa]=Fazes del lune
-Name[zh_CN]=月相
-Name[zh_TW]=月亮圓缺
Comment=Displays the current moon phase
-Comment[ar]=يعرض وجه القمر الحالي
-Comment[be]=Паказвае бягучаю фазу луны
-Comment[bg]=Показване на текущата фаза на луната
-Comment[bn]=চাঁদের বর্তমান কলা প্রদর্শন করে
-Comment[br]=Diskouez ar prantad loariad red
-Comment[ca]=Mostra la fase actual de la lluna
-Comment[cs]=Zobrazuje aktuální fázi měsíce
-Comment[cy]=Dangos gwedd gyfredol y lleuad
-Comment[da]=Viser nuværende månefase
-Comment[de]=Zeigt die aktuelle Mondphase an
-Comment[el]=Εμφανίζει την τρέχουσα φάση της Σελήνης
-Comment[eo]=Montru la nunan lunfazon
-Comment[es]=Indica la fase lunar actual
-Comment[et]=Kuu faaside näitaja
-Comment[eu]=Uneko ilargiaren fasea bistaratzen du
-Comment[fa]=هلال ماه جاری را نمایش می‌دهد
-Comment[fi]=Näyttää kuun nykyisen vaiheen
-Comment[fr]=Affiche la phase actuelle de la Lune
-Comment[ga]=Taispeáin céim reatha na gealaí
-Comment[gl]=Mostra a fase da lua
-Comment[he]=מציג את מופע הירח הנוכחי
-Comment[hr]=Prikazivanje trenutnih mjesečevih mjena
-Comment[hu]=Megjeleníti a Hold aktuális állapotát
-Comment[is]=Sýnir núverandi stöðu tunglsins
-Comment[it]=Visualizza la fase lunare corrente
-Comment[ja]=月の満ち欠けの状態を表示
-Comment[km]=បង្ហាញ​ដំណើរ​ព្រះចន្ទ​បច្ចុប្បន្ន
-Comment[lv]=Rāda pašreizējo mēness fāzi
-Comment[mk]=Ја прикажува тековната месечева мена
-Comment[nb]=Vis vilken månefase vi er i
-Comment[nds]=Wiest den aktuellen Maand
-Comment[ne]=हालको चन्द्रमाको रूप प्रदर्शन गर्दछ
-Comment[nl]=Toont de huidige maanstand
-Comment[nn]=Viser månefasen
-Comment[pl]=Pokazuje aktualną fazę księżyca
-Comment[pt]=Mostra a fase lunar actual
-Comment[pt_BR]=Mostra a atual fase da lua
-Comment[ro]=Afişează faza curentă a lunii
-Comment[ru]=Показывает текущую фазу Луны
-Comment[sk]=Zobrazí aktuálnu fázu Mesiaca
-Comment[sl]=Prikazuje trenutno Lunino meno
-Comment[sr]=Приказује тренутну фазу месеца
-Comment[sr@Latn]=Prikazuje trenutnu fazu meseca
-Comment[sv]=Visar den nuvarande månfasen
-Comment[tg]=Намоиши авзои Моҳи равон
-Comment[tr]=Ayın şimdiki durumunu gösterir
-Comment[uk]=Показує поточну фазу місяця
-Comment[wa]=Håynêye li faze del lune do moumint
-Comment[zh_CN]=显示当前的月相
-Comment[zh_TW]=顯示目前月亮的圓缺狀態
X-TDE-Library=kmoon_panelapplet
X-TDE-UniqueApplet=true
X-DocPath=kmoon/index.html
diff --git a/kmoon/kmoonapplet.h b/kmoon/kmoonapplet.h
index 5018b3d..d13a5ca 100644
--- a/kmoon/kmoonapplet.h
+++ b/kmoon/kmoonapplet.h
@@ -21,14 +21,9 @@
#ifndef KMOONAPPLET
#define KMOONAPPLET
-#include <tqwidget.h>
-#include <tqimage.h>
-#include <sys/types.h>
-#include <time.h>
-#include <ksystemtray.h>
#include <kpanelapplet.h>
-// #include "kmoonwidget.h"
+#include "kmoonwidget.h"
class TQPopupMenu;
@@ -36,7 +31,7 @@ class MoonWidget;
class MoonPAWidget : public KPanelApplet
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmoon/kmoondlg.cpp b/kmoon/kmoondlg.cpp
index 5473a30..2190151 100644
--- a/kmoon/kmoondlg.cpp
+++ b/kmoon/kmoondlg.cpp
@@ -54,13 +54,13 @@ KMoonDlg::KMoonDlg(int a, bool n, bool m, TQWidget *parent, const char *name)
"at this angle.");
TQWhatsThis::add(label, text);
- slider = new TQSlider( -90, 90, 2, angle, Qt::Horizontal, hbox1, "slider" );
+ slider = new TQSlider( -90, 90, 2, angle, TQt::Horizontal, hbox1, "slider" );
slider->setTickmarks(TQSlider::Above);
slider->setTickInterval(45);
slider->setEnabled(TQPixmap::defaultDepth() > 8);
label->setEnabled(TQPixmap::defaultDepth() > 8);
TQWhatsThis::add(slider, text);
- connect(slider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(angleChanged(int)));
+ connect(slider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(angleChanged(int)));
TQHBox *hbox2 = new TQHBox(vbox);
hbox2->setSpacing(spacingHint());
@@ -69,13 +69,13 @@ KMoonDlg::KMoonDlg(int a, bool n, bool m, TQWidget *parent, const char *name)
hemitoggle->setText(north ? i18n("Switch to Southern Hemisphere") :
i18n("Switch to Northern Hemisphere"));
- connect(hemitoggle, TQT_SIGNAL(clicked()), TQT_SLOT(toggleHemi()));
+ connect(hemitoggle, TQ_SIGNAL(clicked()), TQ_SLOT(toggleHemi()));
masktoggle = new TQPushButton(hbox2);
masktoggle->setText(mask ? i18n("Switch Masking Off") :
i18n("Switch Masking On"));
- connect(masktoggle, TQT_SIGNAL(clicked()), TQT_SLOT(toggleMask()));
+ connect(masktoggle, TQ_SIGNAL(clicked()), TQ_SLOT(toggleMask()));
topLayout->addWidget(vbox);
moon = new MoonWidget(page, "preview");
@@ -84,7 +84,7 @@ KMoonDlg::KMoonDlg(int a, bool n, bool m, TQWidget *parent, const char *name)
TQWhatsThis::add(moon, i18n("The moon as KMoon would display it\n"
"following your current setting and time."));
topLayout->addWidget(moon);
- connect(this, TQT_SIGNAL(helpClicked()), TQT_SLOT(help()));
+ connect(this, TQ_SIGNAL(helpClicked()), TQ_SLOT(help()));
// disableResize();
}
@@ -94,7 +94,7 @@ void KMoonDlg::angleChanged(int value) {
}
void KMoonDlg::help() {
- kapp->invokeHelp(TQString::fromLatin1("config"));
+ tdeApp->invokeHelp(TQString::fromLatin1("config"));
}
void KMoonDlg::toggleHemi() {
diff --git a/kmoon/kmoondlg.h b/kmoon/kmoondlg.h
index 9cddb77..a010bec 100644
--- a/kmoon/kmoondlg.h
+++ b/kmoon/kmoondlg.h
@@ -28,7 +28,7 @@ class MoonWidget;
class TQPushButton;
class KMoonDlg : public KDialogBase {
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kmoon/kmoonwidget.cpp b/kmoon/kmoonwidget.cpp
index 8ef85a3..8a5d390 100644
--- a/kmoon/kmoonwidget.cpp
+++ b/kmoon/kmoonwidget.cpp
@@ -19,27 +19,14 @@
*
*/
-#include <stdlib.h>
#include <assert.h>
-#include <unistd.h>
#include <tqbitmap.h>
#include <tqtooltip.h>
#include <tqpainter.h>
-#include <tqpopupmenu.h>
-#include <tqcolor.h>
-
-#include <dcopclient.h>
#include <kdebug.h>
-#include <tdeapplication.h>
-#include <twin.h>
-#include <tdestartupinfo.h>
-#include <tdemessagebox.h>
-#include <tdeaboutdata.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
-#include <tdecmdlineargs.h>
-#include <kiconloader.h>
+#include <tdestandarddirs.h>
#include <kiconeffect.h>
#include <tdeconfig.h>
@@ -125,6 +112,8 @@ void MoonWidget::calcStatus( time_t time )
if ( fm.daysTo( now ) == 0 ) {
counter = 14;
tooltip = i18n( "Full Moon" );
+ renderGraphic();
+ repaint();
return;
} else if ( counter <= 15 && counter >= 13 ) {
counter = 14 + fm.daysTo( now );
@@ -168,6 +157,8 @@ void MoonWidget::calcStatus( time_t time )
switch (counter) {
case 0:
tooltip = i18n("New Moon");
+ renderGraphic();
+ repaint();
return;
case 1:
case 2:
@@ -215,7 +206,7 @@ void MoonWidget::calcStatus( time_t time )
default:
kdFatal() << "coolo can't count\n";
}
-
+
renderGraphic();
repaint();
}
@@ -345,7 +336,7 @@ void MoonWidget::renderGraphic()
TQRgb *destline = (TQRgb*)dest.scanLine(y);
TQRgb *sourceline = (TQRgb*)Mask2.scanLine(y);
for (int x = 0; x < mw; x++) {
- destline[x] = (destline[x] & TQRGB_MASK)|(tqRed(sourceline[x]) << 24);
+ destline[x] = (destline[x] & TQT_RGB_MASK)|(tqRed(sourceline[x]) << 24);
}
}
}
@@ -359,10 +350,13 @@ void MoonWidget::renderGraphic()
if (!pixmap.convertFromImage(dest, 0)) {
return;
}
-
- TQToolTip::remove(this);
- TQToolTip::add(this, tooltip);
+ TQString oldText = TQToolTip::textFor(this);
+ if (oldText != tooltip)
+ {
+ TQToolTip::remove(this);
+ TQToolTip::add(this, tooltip);
+ }
}
diff --git a/kmoon/kmoonwidget.h b/kmoon/kmoonwidget.h
index 19f21d0..cddc5c1 100644
--- a/kmoon/kmoonwidget.h
+++ b/kmoon/kmoonwidget.h
@@ -21,16 +21,15 @@
#ifndef KMOON
#define KMOON
-#include <tqwidget.h>
#include <tqimage.h>
-#include <sys/types.h>
#include <time.h>
#include <ksystemtray.h>
+
class TQPopupMenu;
class MoonWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
generated by cgit v1.2.3 (git 2.46.0) at 2025-11-24 14:16:38 +0000