diff --git a/README b/README index 49db3b1..c9655c2 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ -README for Kalternatives +README for TDEAlternatives ------------------------ -Kalternatives is a KDE program that a allows you to easily configure and +TDEAlternatives is a TDE program that a allows you to easily configure and change your Mandrake/Debian alternatives system. What is the Mandrake/Debian Alternatives System? @@ -24,7 +24,7 @@ would like to change /usr/bin/vi to point to the nvi executable you could: 1. Change the link on /etc/alternatives/vi by hand. 2. Use the Mandrake/Debian command update-alternatives --config vi -3. Use Kalternatives. +3. Use TDEAlternatives. How is the program used? @@ -51,14 +51,10 @@ Who do I have to whine if the program fails for me? To Juanjo Álvarez -What is the KDE-Mandrake/Debian project? +What is the TDE-Mandrake/Debian project? ------------------------------- -The KDE-Debian project is composed of some individuals, actively supported by +The TDE-Debian project is composed of some individuals, actively supported by some companies, trying to provide Debian and Debian based distributions with a -collection of first-class, updated KDE desktop including some KDE applications -specifically designed for Debian. If you want to support the info by money or -by work (coding, translations, testing) you can have more info on the -kde-Debian mailing list: - -https://mail.kde.org/mailman/listinfo/kde-Mandrake/Debian +collection of first-class, updated TDE desktop including some TDE applications +specifically designed for Debian. diff --git a/config.h.cmake b/config.h.cmake index 3ac4cb3..7791faa 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -1,7 +1,7 @@ #define VERSION "@VERSION@" // Defined if you have fvisibility and fvisibility-inlines-hidden support. -#cmakedefine __KDE_HAVE_GCC_VISIBILITY 1 +#cmakedefine __TDE_HAVE_GCC_VISIBILITY 1 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ @@ -9,4 +9,4 @@ /* Distributions */ #cmakedefine WITH_DISTRIBUTION_DPKG @WITH_DISTRIBUTION_DPKG@ -#cmakedefine WITH_DISTRIBUTION_RPM @WITH_DISTRIBUTION_RPM@ \ No newline at end of file +#cmakedefine WITH_DISTRIBUTION_RPM @WITH_DISTRIBUTION_RPM@ diff --git a/doc/en/index.docbook b/doc/en/index.docbook index 08ef868..79daea4 100644 --- a/doc/en/index.docbook +++ b/doc/en/index.docbook @@ -1,14 +1,10 @@ kalternatives 0.10"> - - + tdealternatives 0.10"> + + - - - ]> -The &kalternatives; Handbook +The &tdealternatives; Handbook @@ -83,18 +79,18 @@ Do NOT change these in the translation. --> -&kalternatives; is an application specially designed to do nothing you would +&tdealternatives; is an application specially designed to do nothing you would ever want. -KDE -kalternatives +TDE +tdealternatives nothing nothing else @@ -108,7 +104,7 @@ document, and if there is no ID, the name of the generated HTML files will vary from time to time making it hard to manage for maintainers and for the CVS system. Any chapter labelled (OPTIONAL) may be left out at the author's discretion. Other chapters should not be left out in order to maintain a -consistent documentation style across all KDE apps. --> +consistent documentation style across all TDE apps. --> Introduction @@ -119,13 +115,13 @@ problems. Basically a long version of the abstract. Don't include a revision history. (see installation appendix comment) --> -&kalternatives; is a program that lets you do absolutely nothing. Please report -any problems or feature requests to the &kde; mailing lists. +&tdealternatives; is a program that lets you do absolutely nothing. Please report +any problems or feature requests to the &tde; mailing lists. - -Using &kalternatives; + +Using &tdealternatives; patent issues. --> -Here's a screenshot of &kalternatives; +Here's a screenshot of &tdealternatives; @@ -153,8 +149,8 @@ patent issues. --> - -More &kalternatives; features + +More &tdealternatives; features It slices! It dices! and it comes with a free toaster! @@ -169,7 +165,7 @@ The Squiggle Tool Squiggle is used to draw squiggly lines all over -the &kalternatives; main window. It's not a bug, it's a feature! +the &tdealternatives; main window. It's not a bug, it's a feature! @@ -184,8 +180,8 @@ Also include any keys that have a special function but have no equivalent in the menus or toolbars. This may not be necessary for small apps or apps with no tool or menu bars. --> - -The main &kalternatives; window + +The main &tdealternatives; window The File Menu @@ -219,7 +215,7 @@ or menu bars. --> File Quit -Quits &kalternatives; +Quits &tdealternatives; @@ -230,7 +226,7 @@ or menu bars. --> The <guimenu>Help</guimenu> Menu - + @@ -242,14 +238,14 @@ or menu bars. --> -Developer's Guide to &kalternatives; +Developer's Guide to &tdealternatives; -Programming &kalternatives; plugins is a joy to behold. Just read through the next +Programming &tdealternatives; plugins is a joy to behold. Just read through the next 66 pages of API's to learn how! @@ -404,7 +400,7 @@ application work. --> -My Mouse doesn't work. How do I quit &kalternatives;? +My Mouse doesn't work. How do I quit &tdealternatives;? You silly goose! Check out the Commands @@ -427,13 +423,13 @@ installed. Credits and License -&kalternatives; +&tdealternatives; Program copyright 2004 Juanjo juanjux@yahoo.es @@ -441,7 +437,7 @@ Program copyright 2004 Juanjo juanjux@yahoo.es Contributors: -Konqui the KDE Dragon konqui@kde.org +Konqui the TDE Dragon konqui@kde.org Tux the Linux Penguin tux@linux.org @@ -472,11 +468,11 @@ Documentation copyright 2004 Juanjo juanjux@yahoo.es Installation - -How to obtain &kalternatives; + +How to obtain &tdealternatives; &install.intro.documentation; @@ -498,23 +494,7 @@ information here. --> -In order to successfully use &kalternatives;, you need &kde; 1.1. Foobar.lib is -required in order to support the advanced &kalternatives; features. &kalternatives; uses -about 5 megs of memory to run, but this may vary depending on your -platform and configuration. - - - -All required libraries as well as &kalternatives; itself can be found -on The &kalternatives; home page. - - - - -You can find a list of changes at http://apps.kde.org/kalternatives. - +In order to successfully use &tdealternatives;, you need &tde;. @@ -532,7 +512,7 @@ url="http://apps.kde.org/kalternatives">http://apps.kde.org/kalternativesConfiguration Don't forget to tell your system to start the dtd -dicer-toaster daemon first, or &kalternatives; won't work ! +dicer-toaster daemon first, or &tdealternatives; won't work ! diff --git a/src/CMakeL10n.txt b/src/CMakeL10n.txt index 9734259..63647ca 100644 --- a/src/CMakeL10n.txt +++ b/src/CMakeL10n.txt @@ -13,5 +13,3 @@ tde_l10n_create_template( CATALOG "desktop_files/tdealternatives-desktops" SOURCES alternatives.desktop ) - -# kate: replace-tabs true; tab-width 2; \ No newline at end of file diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8866b04..1b0b76c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -57,6 +57,3 @@ install( FILES tdealternativesui.rc DESTINATION ${DATA_INSTALL_DIR}/tdealternatives/ ) - - -# kate: replace-tabs true; tab-width 2; \ No newline at end of file diff --git a/src/alternatives.desktop b/src/alternatives.desktop index 818e58e..cb5e6b5 100644 --- a/src/alternatives.desktop +++ b/src/alternatives.desktop @@ -13,4 +13,4 @@ X-TDE-ParentApp=kcontrol Name=Alternatives Comment=TDEAlternatives - DPKG/RPM alternatives manager for TDE Categories=Qt;TDE;X-TDE-settings-system; -Keywords=applications,alternative,alternatives,dpkg,rpm,debian,devuan,ubuntu,redhat,fedora,mageia \ No newline at end of file +Keywords=applications;alternative;alternatives;dpkg;rpm;debian;devuan;ubuntu;redhat;fedora;mageia \ No newline at end of file diff --git a/src/altitemelement.h b/src/altitemelement.h index df04e6b..956cd61 100644 --- a/src/altitemelement.h +++ b/src/altitemelement.h @@ -24,7 +24,7 @@ #include #include #include -#include +#include class Alternative; class AltController; diff --git a/src/altparser.cpp b/src/altparser.cpp index f311316..29718bf 100644 --- a/src/altparser.cpp +++ b/src/altparser.cpp @@ -84,7 +84,6 @@ bool Alternative::isBroken() const bool Alternative::select() { -// This method was 19 lines in Python in the original kalternatives :-D if(isSelected()) return true; if(isBroken()) { diff --git a/src/altparser.h b/src/altparser.h index 21640b3..53ac888 100644 --- a/src/altparser.h +++ b/src/altparser.h @@ -21,20 +21,13 @@ #ifndef _ALTPARSER_H_ #define _ALTPARSER_H_ - -//FIXME: Cosas pa mirar: -//Comprobar entradas NULL y demás (sobre todo antes de los delete) -// -//Quitar el stdio.h +#include #include #include #include #include -#ifdef HAVE_CONFIG_H -#include -#endif class Item; @@ -133,8 +126,6 @@ public: Item* getItem (const TQString &name) const; //FIXME: Put in a #ifdef void debugPrintAlts() const; - TQString getAltDir() { return m_altdir ;} -//protected: - //virtual int compareItems(Item i1, Item i2); + TQString getAltDir() { return m_altdir ;} }; -#endif // _KALTERNATIVES_H_ +#endif // _ALTPARSER_H_ diff --git a/src/main.cpp b/src/main.cpp index 03e1093..dd9408b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -21,18 +21,17 @@ * 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include "main.h" -#include "kalternatives.h" -#include +#include "tdealternatives.h" +#include #include #include #include #include -KUniqueApplication *app = 0; // Global +TDEUniqueApplication *app = 0; // Global static const char description[] = - I18N_NOOP("A KDE Manager for the Debian/Mandrake alternatives system"); + I18N_NOOP("A TDE Manager for the Debian/Mandrake alternatives system"); static const char version[] = "0.10"; @@ -44,19 +43,19 @@ static TDECmdLineOptions options[] = int main(int argc, char **argv) { - TDEAboutData about("kalternatives", I18N_NOOP("kalternatives"), version, description, + TDEAboutData about("tdealternatives", I18N_NOOP("tdealternatives"), version, description, TDEAboutData::License_GPL, "(C) 2004 Juanjo Alvarez Martinez and Mario Bensi", 0, 0, "juanjux@yahoo.es, nef@ipsquad.net"); about.addAuthor( "Juanjo Alvarez Martinez and Mario Bensi", 0, "juanjux@yahoo.es, nef@ipsquad.net" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions( options ); - KUniqueApplication rapp; + TDEUniqueApplication rapp; app = &rapp; - Kalternatives *mainWin = 0; + TDEAlternatives *mainWin = 0; if (app->isRestored()) { - //RESTORE(kalternatives); + //RESTORE(tdealternatives); } else { @@ -65,7 +64,7 @@ int main(int argc, char **argv) /// @todo do something with the command line args here - mainWin = new Kalternatives(); + mainWin = new TDEAlternatives(); app->setMainWidget( mainWin ); mainWin->show(); diff --git a/src/main.h b/src/main.h deleted file mode 100644 index 24ff6c8..0000000 --- a/src/main.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef _MAIN_H_ -#define _MAIN_H_ - -#include - -extern KUniqueApplication *app; - -#endif //_MAIN_H_ diff --git a/src/mainwindow.ui b/src/mainwindow.ui index a9d2e1e..cd32ee4 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -2,7 +2,7 @@ MainWindow - Kalternatives + TDEAlternatives @@ -27,7 +27,7 @@ - Alternatives Manager + TDE Alternatives Manager diff --git a/src/tdealternatives.h b/src/tdealternatives.h index b130d11..5d4908c 100644 --- a/src/tdealternatives.h +++ b/src/tdealternatives.h @@ -21,12 +21,10 @@ * 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#ifndef _tdealternatives_H_ -#define _tdealternatives_H_ +#ifndef _TDEALTERNATIVES_H_ +#define _TDEALTERNATIVES_H_ -//#ifdef HAVE_CONFIG_H -//#include -//#endif +#include #include #include @@ -41,25 +39,25 @@ class AltFilesManager; class TDEAlternatives : public TDECModule { - TQ_OBJECT + TQ_OBJECT - bool m_bisRoot; - AltFilesManager *m_mgr; + bool m_bisRoot; + AltFilesManager *m_mgr; TDEListView* m_optionsList; TDEListView* m_altList; KComboBox* m_statusCombo; TQLabel* m_altTilte; TQCheckBox* m_hideAlt; TDEAboutData *myAboutData; - + void clearList(TDEListView* list); - + public: - TDEAlternatives(TQWidget *parent=0, const char *name=0, const TQStringList& = TQStringList() ); - virtual ~TDEAlternatives(); + TDEAlternatives(TQWidget *parent=0, const char *name=0, const TQStringList& = TQStringList() ); + virtual ~TDEAlternatives(); TDEListView *optionsList() const {return m_optionsList;} bool isBisRoot() const {return m_bisRoot;} - + virtual void load(); virtual void save(); virtual TQString quickHelp() const; @@ -71,11 +69,11 @@ public slots: private slots: void slotSelectAlternativesClicked(TQListViewItem *); void slotHideAlternativesClicked(); - void die(); + void die(); void slotOptionClicked(TQListViewItem *option); void slotAddClicked(); void slotDeleteClicked(); void slotPropertiesClicked(); }; -#endif // _tdealternatives_H_ +#endif // _TDEALTERNATIVES_H_ diff --git a/src/tdealternativesui.rc b/src/tdealternativesui.rc index 347fe72..30bbe7a 100644 --- a/src/tdealternativesui.rc +++ b/src/tdealternativesui.rc @@ -1,5 +1,5 @@ - + C&ustom diff --git a/src/treeitemelement.h b/src/treeitemelement.h index bc7affa..42cbc1d 100644 --- a/src/treeitemelement.h +++ b/src/treeitemelement.h @@ -32,24 +32,24 @@ class Item; class TreeItemElement : public TQListViewItem { - Item *m_item; - TQString m_name; + Item *m_item; + TQString m_name; bool m_changed; bool m_nbrAltChanged; AltController *m_altControl; - + public: - TreeItemElement(TDEListView *parent, Item *itemarg, AltController *altControl); - ~TreeItemElement(); + TreeItemElement(TDEListView *parent, Item *itemarg, AltController *altControl); + ~TreeItemElement(); - TQString getName() const { return m_name; } - Item *getItem() const { return m_item; } + TQString getName() const { return m_name; } + Item *getItem() const { return m_item; } void setChanged(bool c) { m_changed = c; } bool isChanged() const { return m_changed; } void setNbrAltChanged(bool c) { m_nbrAltChanged = c; } bool isNbrAltChanged() const { return m_nbrAltChanged; } AltController *getAltController() {return m_altControl;} - + virtual void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int align ); }; diff --git a/translations/desktop_files/tdealternatives-desktops.pot b/translations/desktop_files/tdealternatives-desktops.pot index f577b89..45d5bc2 100644 --- a/translations/desktop_files/tdealternatives-desktops.pot +++ b/translations/desktop_files/tdealternatives-desktops.pot @@ -28,7 +28,5 @@ msgstr "" #. Keywords #: alternatives.desktop:16 -msgid "" -"applications,alternative,alternatives,dpkg,rpm,debian,devuan,ubuntu,redhat," -"fedora,mageia" +msgid "applications;alternative;alternatives;dpkg;rpm;debian;devuan;ubuntu;redhat;fedora;mageia" msgstr "" diff --git a/translations/messages/tdealternatives.pot b/translations/messages/tdealternatives.pot index deafd2d..314796d 100644 --- a/translations/messages/tdealternatives.pot +++ b/translations/messages/tdealternatives.pot @@ -57,11 +57,11 @@ msgid "no description" msgstr "" #: main.cpp:35 -msgid "A KDE Manager for the Debian/Mandrake alternatives system" +msgid "A TDE Manager for the Debian/Mandrake alternatives system" msgstr "" #: main.cpp:47 -msgid "kalternatives" +msgid "tdealternatives" msgstr "" #: tdealternatives.cpp:85