some header cleanup, change the app's name into tdeasciiquarius.kss with

generic name TDEAsciiquarius

Signed-off-by: gregory guy <gregory-tde@laposte.net>
gregory guy 3 years ago
parent 6dbd4daab6
commit 6962fafca4
No known key found for this signature in database
GPG Key ID: 2CC84A1CC6823AF8

@ -34,4 +34,4 @@ tde_add_executable( tdeasciiquarium.kss AUTOMOC
##### other data
tde_create_translated_desktop( asciiquarium.desktop )
tde_create_translated_desktop( tdeasciiquarium.desktop )

@ -0,0 +1,26 @@
/*
* Asciiquarium - Native KDE Screensaver based on the Asciiquarium program
* (c) Kirk Baucom <kbaucom@schizoid.com>, which you can find at
* http://www.robobunny.com/projects/asciiquarium/
*
* Ported to KDE by Maksim Orlovich <maksim@kde.org> and
* Michael Pyne <michael.pyne@kdemail.net>.
*
* Copyright (c) 2003 Kirk Baucom <kbaucom@schizoid.com>
* Copyright (c) 2005 Maksim Orlovich <maksim@kde.org>
* Copyright (c) 2005 Michael Pyne <michael.pyne@kdemail.net>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/

@ -1,36 +1,3 @@
/*
* Asciiquarium - Native KDE Screensaver based on the Asciiquarium program
* (c) Kirk Baucom <kbaucom@schizoid.com>, which you can find at
* http://www.robobunny.com/projects/asciiquarium/
*
* Ported to KDE by Maksim Orlovich <maksim@kde.org> and
* Michael Pyne <michael.pyne@kdemail.net>.
*
* Copyright (c) 2003 Kirk Baucom <kbaucom@schizoid.com>
* Copyright (c) 2005 Maksim Orlovich <maksim@kde.org>
* Copyright (c) 2005 Michael Pyne <michael.pyne@kdemail.net>
*
* ASCII Art was mostly created by Joan Stark:
* http://www.geocities.com/SoHo/7373/
*
* the rest was crafted by Kirk Baucom, and all of it was edited by
* Maksim Orlovich and Michael Pyne to adopt to C++ formatting.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
//Stub stolen from:
// klines 0.1.1 - Basic screen saver for KDE
// by Dirk Staneker 1997
@ -39,9 +6,9 @@
#include <tdelocale.h>
#include <tdeconfigdialog.h>
#include <ntqdesktopwidget.h>
#include <ntqpainter.h>
#include <ntqbrush.h>
#include <tqdesktopwidget.h>
#include <tqpainter.h>
#include <tqbrush.h>
#include "screen.h"
#include "frame.h"
@ -1228,8 +1195,8 @@ void AASaver::paintEvent(TQPaintEvent* pe)
// libkscreensaver interface
extern "C"
{
KDE_EXPORT const char *kss_applicationName = "asciiquarium.kss";
KDE_EXPORT const char *kss_description = I18N_NOOP( "Asciiquarium" );
KDE_EXPORT const char *kss_applicationName = "tdeasciiquarium.kss";
KDE_EXPORT const char *kss_description = I18N_NOOP( "TDEAsciiquarium" );
KDE_EXPORT const char *kss_version = "0.3.2";
KDE_EXPORT KScreenSaver *kss_create( WId id )
@ -1246,11 +1213,8 @@ extern "C"
dialog = new TDEConfigDialog(0, "settings", AASaverConfig::self());
SettingsWidget *settings = new SettingsWidget(0, "settings_widget");
dialog->addPage(settings, i18n("Asciiquarium Settings"), "tdescreensaver");
dialog->addPage(settings, i18n("TDEAsciiquarium Settings"), "tdescreensaver");
return dialog;
}
}
// vim: set et ts=8 sw=4:

@ -1,30 +1,3 @@
/*
* Asciiquarium - Native KDE Screensaver based on the Asciiquarium program
* (c) Kirk Baucom <kbaucom@schizoid.com>, which you can find at
* http://www.robobunny.com/projects/asciiquarium/
*
* Ported to KDE by Maksim Orlovich <maksim@kde.org> and
* Michael Pyne <michael.pyne@kdemail.net>.
*
* Copyright (c) 2003 Kirk Baucom <kbaucom@schizoid.com>
* Copyright (c) 2005 Maksim Orlovich <maksim@kde.org>
* Copyright (c) 2005 Michael Pyne <michael.pyne@kdemail.net>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef AA_AASAVER_H
#define AA_AASAVER_H
@ -195,5 +168,3 @@ public:
};
#endif /* AA_AASAVER_H */
// vim: set et ts=8 sw=4:

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE kcfg SYSTEM "http://www.kde.org/standards/kcfg/1.0/kcfg.dtd">
<kcfg>
<kcfgfile name="asciiquariumrc"/>
<kcfgfile name="tdeasciiquariumrc"/>
<group name="Settings">
<entry name="fishCount" type="Int">
<label>Amount of fish to have in the sea.</label>

@ -1,39 +1,12 @@
/*
* Asciiquarium - Native KDE Screensaver based on the Asciiquarium program
* (c) Kirk Baucom <kbaucom@schizoid.com>, which you can find at
* http://www.robobunny.com/projects/asciiquarium/
*
* Ported to KDE by Maksim Orlovich <maksim@kde.org> and
* Michael Pyne <michael.pyne@kdemail.net>.
*
* Copyright (c) 2003 Kirk Baucom <kbaucom@schizoid.com>
* Copyright (c) 2005 Maksim Orlovich <maksim@kde.org>
* Copyright (c) 2005 Michael Pyne <michael.pyne@kdemail.net>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include <tdeglobalsettings.h>
#include <kdebug.h>
#include <ntqvaluevector.h>
#include <ntqstringlist.h>
#include <ntqimage.h>
#include <ntqfontmetrics.h>
#include <ntqpainter.h>
#include <ntqbitmap.h>
#include <tqvaluevector.h>
#include <tqstringlist.h>
#include <tqimage.h>
#include <tqfontmetrics.h>
#include <tqpainter.h>
#include <tqbitmap.h>
#include "frame.h"
@ -200,5 +173,3 @@ void Frame::erase(Screen* scr, int x, int y)
scr->clearSpan(x, y, m_erasePixmap);
}
// vim: set et ts=8 sw=4:

@ -1,36 +1,9 @@
/*
* Asciiquarium - Native KDE Screensaver based on the Asciiquarium program
* (c) Kirk Baucom <kbaucom@schizoid.com>, which you can find at
* http://www.robobunny.com/projects/asciiquarium/
*
* Ported to KDE by Maksim Orlovich <maksim@kde.org> and
* Michael Pyne <michael.pyne@kdemail.net>.
*
* Copyright (c) 2003 Kirk Baucom <kbaucom@schizoid.com>
* Copyright (c) 2005 Maksim Orlovich <maksim@kde.org>
* Copyright (c) 2005 Michael Pyne <michael.pyne@kdemail.net>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef AA_FRAME_H
#define AA_FRAME_H
#include <ntqstring.h>
#include <ntqvaluevector.h>
#include <ntqpixmap.h>
#include <tqstring.h>
#include <tqvaluevector.h>
#include <tqpixmap.h>
#include "screen.h"
/**
@ -146,5 +119,3 @@ protected:
};
#endif
// vim: set et ts=8 sw=4:

@ -1,36 +1,9 @@
/*
* Asciiquarium - Native KDE Screensaver based on the Asciiquarium program
* (c) Kirk Baucom <kbaucom@schizoid.com>, which you can find at
* http://www.robobunny.com/projects/asciiquarium/
*
* Ported to KDE by Maksim Orlovich <maksim@kde.org> and
* Michael Pyne <michael.pyne@kdemail.net>.
*
* Copyright (c) 2003 Kirk Baucom <kbaucom@schizoid.com>
* Copyright (c) 2005 Maksim Orlovich <maksim@kde.org>
* Copyright (c) 2005 Michael Pyne <michael.pyne@kdemail.net>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include <ntqcolor.h>
#include <ntqfontmetrics.h>
#include <ntqpainter.h>
#include <ntqpixmap.h>
#include <ntqtimer.h>
#include <ntqwidget.h>
#include <tqcolor.h>
#include <tqfontmetrics.h>
#include <tqpainter.h>
#include <tqpixmap.h>
#include <tqtimer.h>
#include <tqwidget.h>
#include <tdeglobalsettings.h>
@ -247,5 +220,3 @@ void Screen::doAnimate()
}
#include "screen.moc"
// vim: set et ts=8 sw=4:

@ -1,38 +1,11 @@
/*
* Asciiquarium - Native KDE Screensaver based on the Asciiquarium program
* (c) Kirk Baucom <kbaucom@schizoid.com>, which you can find at
* http://www.robobunny.com/projects/asciiquarium/
*
* Ported to KDE by Maksim Orlovich <maksim@kde.org> and
* Michael Pyne <michael.pyne@kdemail.net>.
*
* Copyright (c) 2003 Kirk Baucom <kbaucom@schizoid.com>
* Copyright (c) 2005 Maksim Orlovich <maksim@kde.org>
* Copyright (c) 2005 Michael Pyne <michael.pyne@kdemail.net>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef AA_SCREEN_H
#define AA_SCREEN_H
#include <ntqcolor.h>
#include <ntqfont.h>
#include <ntqobject.h>
#include <ntqvaluevector.h>
#include <ntqpixmap.h>
#include <tqcolor.h>
#include <tqfont.h>
#include <tqobject.h>
#include <tqvaluevector.h>
#include <tqpixmap.h>
class Sprite;
class AASaver;
@ -167,5 +140,3 @@ public:
};
#endif
// vim: set et ts=8 sw=4:

@ -1,30 +1,3 @@
/*
* Asciiquarium - Native KDE Screensaver based on the Asciiquarium program
* (c) Kirk Baucom <kbaucom@schizoid.com>, which you can find at
* http://www.robobunny.com/projects/asciiquarium/
*
* Ported to KDE by Maksim Orlovich <maksim@kde.org> and
* Michael Pyne <michael.pyne@kdemail.net>.
*
* Copyright (c) 2003 Kirk Baucom <kbaucom@schizoid.com>
* Copyright (c) 2005 Maksim Orlovich <maksim@kde.org>
* Copyright (c) 2005 Michael Pyne <michael.pyne@kdemail.net>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include "sprite.h"
Sprite::Sprite(Screen* screen, int x, int y, int z, int frameDelay):
@ -89,6 +62,3 @@ TQRect Sprite::geom() const
{
return TQRect(m_x, m_y, m_frames[0].width(), m_frames[0].height());
}
// vim: set et ts=8 sw=4:

@ -1,34 +1,7 @@
/*
* Asciiquarium - Native KDE Screensaver based on the Asciiquarium program
* (c) Kirk Baucom <kbaucom@schizoid.com>, which you can find at
* http://www.robobunny.com/projects/asciiquarium/
*
* Ported to KDE by Maksim Orlovich <maksim@kde.org> and
* Michael Pyne <michael.pyne@kdemail.net>.
*
* Copyright (c) 2003 Kirk Baucom <kbaucom@schizoid.com>
* Copyright (c) 2005 Maksim Orlovich <maksim@kde.org>
* Copyright (c) 2005 Michael Pyne <michael.pyne@kdemail.net>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef AA_SPRITE_H
#define AA_SPRITE_H
#include <ntqvaluevector.h>
#include <tqvaluevector.h>
#include "frame.h"
/**
@ -203,5 +176,3 @@ public:
};
#endif
// vim: set et ts=8 sw=4:

@ -1,23 +1,23 @@
[Desktop Entry]
Encoding=UTF-8
Exec=asciiquarium.kss
Exec=tdeasciiquarium.kss
Icon=tdescreensaver
Type=Application
Actions=InWindow;Root;Setup
Name=Asciiquarium
Name=TDEAsciiquarium
X-TDE-Category=Miscellaneous
[Desktop Action InWindow]
Exec=asciiquarium.kss -window-id %w
Exec=tdeasciiquarium.kss -window-id %w
Name=Display in specified window
NoDisplay=true
[Desktop Action Root]
Exec=asciiquarium.kss -root
Exec=tdeasciiquarium.kss -root
Name=Display in root window
NoDisplay=true
[Desktop Action Setup]
Exec=asciiquarium.kss -setup
Exec=tdeasciiquarium.kss -setup
Name=Display setup dialog
NoDisplay=true
Loading…
Cancel
Save