diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/CMakeL10n.txt | 7 | ||||
-rw-r--r-- | src/CMakeLists.txt | 5 | ||||
-rw-r--r-- | src/autostart.cpp | 151 | ||||
-rw-r--r-- | src/autostart.desktop | 7 | ||||
-rw-r--r-- | src/autostart.h | 2 |
5 files changed, 78 insertions, 94 deletions
diff --git a/src/CMakeL10n.txt b/src/CMakeL10n.txt index 30cff95..21807f9 100644 --- a/src/CMakeL10n.txt +++ b/src/CMakeL10n.txt @@ -1,3 +1,8 @@ ##### create translation templates ############## -tde_l10n_create_template( "autostart" ) +tde_l10n_create_template( "messages/autostart" ) + +tde_l10n_create_template( + CATALOG "desktop_files/autostart.desktop/" + SOURCES autostart.desktop +) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ef9d1d7..b2b25d0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -23,7 +23,4 @@ tde_add_kpart( kcm_autostart AUTOMOC ##### other data -install( - FILES autostart.desktop - DESTINATION ${XDG_APPS_INSTALL_DIR} -) +tde_create_translated_desktop( autostart.desktop ) diff --git a/src/autostart.cpp b/src/autostart.cpp index 188b3c9..05b28e5 100644 --- a/src/autostart.cpp +++ b/src/autostart.cpp @@ -41,80 +41,72 @@ class CDesktopItem : public TDEListViewItem { public: - KService * service; - bool bisDesktop; + KService *mService; KURL fileName; int iStartOn; enum { AutoStart, Shutdown, ENV }; -CDesktopItem( TQString service, int startOn, TQListView *parent ): TDEListViewItem( parent ) { - iStartOn = startOn; - fileName = KURL(service); - if (service.endsWith(".desktop")) { - this->service = new KService(service); - bisDesktop = true; - } -} + CDesktopItem( TQString service, int startOn, TQListView *parent ): TDEListViewItem( parent ), + mService(NULL), iStartOn(startOn), fileName(KURL(service)) + { + if (service.endsWith(".desktop")) { + mService = new KService(service); + } + } -~CDesktopItem() { - if(service) { - delete service; - service = NULL; + ~CDesktopItem() { + if (mService) { + delete mService; + mService = NULL; + } } -} -bool isDesktop() { return bisDesktop; } - -int startOn() { return iStartOn; } - -TQString fStartOn() { - switch (iStartOn) { - case AutoStart: - return i18n("Startup"); - break; - case Shutdown: - return i18n("Shutdown"); - break; - case ENV: - return i18n("ENV"); - break; - default: - return ""; - break; - } -} + TQString fStartOn() { + switch (iStartOn) { + case AutoStart: + return i18n("Startup"); + break; + case Shutdown: + return i18n("Shutdown"); + break; + case ENV: + return i18n("ENV"); + break; + default: + return ""; + break; + } + } -void setStartOn(int start) { - iStartOn = start; - setText(2, fStartOn()); - TQString path; - switch (iStartOn) { - case AutoStart: - path = TDEGlobalSettings::autostartPath()+"/"; - break; - case Shutdown: - path = TDEGlobal::dirs()->localtdedir()+"shutdown/"; - break; - case ENV: - path = TDEGlobal::dirs()->localtdedir()+"env/"; - break; - } - TDEIO::file_move(fileName, KURL( path + fileName.fileName() )); - fileName = path + fileName.fileName(); -} + void setStartOn(int start) { + iStartOn = start; + setText(2, fStartOn()); + TQString path; + switch (iStartOn) { + case AutoStart: + path = TDEGlobalSettings::autostartPath()+"/"; + break; + case Shutdown: + path = TDEGlobal::dirs()->localtdedir()+"shutdown/"; + break; + case ENV: + path = TDEGlobal::dirs()->localtdedir()+"env/"; + break; + } + TDEIO::file_move(fileName, KURL( path + fileName.fileName() )); + fileName = path + fileName.fileName(); + } -void updateService() { - if (bisDesktop) { - if (service) { - delete service; - service = NULL; - } - service = new KService( fileName.path() ); - setText( 0, service->name() ); - setText( 1, service->exec() ); - setText( 2, fStartOn() ); - } -} + void updateService() { + if (mService) { + delete mService; + mService = NULL; + } + mService = new KService( fileName.path() ); + setText( 0, mService->name() ); + setText( 1, mService->exec() ); + setText( 2, fStartOn() ); + } }; //class CDesktopItem @@ -156,18 +148,15 @@ CAutostart::CAutostart(TQWidget *parent, const char *name, const TQStringList&) cmbStartOn->setEnabled(false); btnAdd->setText( i18n( "&Add" ) ); - btnAdd->setAccel( TQKeySequence( i18n( "Alt+A" ) ) ); btnRemove->setText( i18n( "&Remove" ) ); - btnRemove->setAccel( TQKeySequence( i18n( "Alt+R" ) ) ); btnProperties->setText( i18n( "&Properties" ) ); - btnProperties->setAccel( TQKeySequence( i18n( "Alt+P" ) ) ); - connect( btnAdd, TQT_SIGNAL(clicked()), TQT_SLOT(addCMD()) ); - connect( btnRemove, TQT_SIGNAL(clicked()), TQT_SLOT(removeCMD()) ); - connect( listCMD, TQT_SIGNAL(doubleClicked(TQListViewItem*)), TQT_SLOT(editCMD() )); - connect( btnProperties, TQT_SIGNAL(clicked()), TQT_SLOT(editCMD()) ); - connect( cmbStartOn, TQT_SIGNAL(activated(int)), TQT_SLOT(setStartOn(int)) ); - connect( listCMD, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(selectionChanged(TQListViewItem*)) ); + connect( btnAdd, TQ_SIGNAL(clicked()), TQ_SLOT(addCMD()) ); + connect( btnRemove, TQ_SIGNAL(clicked()), TQ_SLOT(removeCMD()) ); + connect( listCMD, TQ_SIGNAL(doubleClicked(TQListViewItem*)), TQ_SLOT(editCMD() )); + connect( btnProperties, TQ_SIGNAL(clicked()), TQ_SLOT(editCMD()) ); + connect( cmbStartOn, TQ_SIGNAL(activated(int)), TQ_SLOT(setStartOn(int)) ); + connect( listCMD, TQ_SIGNAL(selectionChanged(TQListViewItem*)), TQ_SLOT(selectionChanged(TQListViewItem*)) ); listCMD->setFocus(); @@ -210,8 +199,8 @@ void CAutostart::load() TQFileInfo *fi; while ( (fi = it.current()) != 0 ) { TQString filename = fi->fileName(); - CDesktopItem * item = new CDesktopItem( fi->absFilePath(), x, listCMD ); - if ( ! item->isDesktop() ) { + CDesktopItem *item = new CDesktopItem( fi->absFilePath(), x, listCMD ); + if ( !item->mService ) { if ( fi->isSymLink() ) { TQString link = fi->readLink(); item->setText( 0, filename ); @@ -225,8 +214,8 @@ void CAutostart::load() } } else { - item->setText( 0, item->service->name() ); - item->setText( 1, item->service->exec() ); + item->setText( 0, item->mService->name() ); + item->setText( 1, item->mService->exec() ); item->setText( 2, item->fStartOn() ); } ++it; @@ -282,8 +271,8 @@ void CAutostart::addCMD() { } CDesktopItem * item = new CDesktopItem( TDEGlobalSettings::autostartPath() + service->name() + ".desktop", CDesktopItem::AutoStart, listCMD ); - item->setText( 0, item->service->name() ); - item->setText( 1, item->service->exec() ); + item->setText( 0, item->mService->name() ); + item->setText( 1, item->mService->exec() ); item->setText( 2, item->fStartOn() ); emit changed(true); } @@ -327,7 +316,7 @@ void CAutostart::setStartOn( int index ) { void CAutostart::selectionChanged(TQListViewItem* entry) { cmbStartOn->setEnabled( (entry != 0) ); - cmbStartOn->setCurrentItem( ((CDesktopItem*)entry)->startOn() ); + cmbStartOn->setCurrentItem( ((CDesktopItem*)entry)->iStartOn ); } void CAutostart::defaults(){} diff --git a/src/autostart.desktop b/src/autostart.desktop index 016c8c5..4b6c70f 100644 --- a/src/autostart.desktop +++ b/src/autostart.desktop @@ -9,15 +9,8 @@ X-TDE-Library=autostart X-TDE-HasReadOnlyMode=false X-TDE-ParentApp=kcontrol -Encoding=UTF-8 Comment=A tool for managing what programs start up with TDE -Comment[ca]=Panell de control per a gestionar els programes que s'inicien amb la sessió de TDE -Comment[es]=Panel de control para gestionar los programas que se inician con la sesión de TDE -Comment[fr]=Paneau de contrôle pour gérer le démarrage des programmes àl'ouverture de session TDE Keywords=autostart manager; Name=Autostart Manager -Name[ca]=Autoengega -Name[es]=Arranque automático -Name[fr]=Démarrage automatique Categories=Qt;TDE;X-TDE-settings-components; X-DocPath=autostart/index.html diff --git a/src/autostart.h b/src/autostart.h index 0f82473..4d205a6 100644 --- a/src/autostart.h +++ b/src/autostart.h @@ -34,7 +34,7 @@ class CAutostart: public TDECModule { - Q_OBJECT + TQ_OBJECT public: CAutostart( TQWidget *parent=0, const char *name=0, const TQStringList& = TQStringList() ); |