From 44d408df253588b03c35debeeecd5c24daa77e2e Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Wed, 4 Aug 2021 13:51:48 +0300 Subject: [PATCH] kcontrol: remove shutdown scripts support leftovers Signed-off-by: Ivailo Monev --- kcontrol/autostart/autostart.cpp | 61 ++++++------------------------------ kcontrol/autostart/autostart.h | 12 ++----- kcontrol/autostart/autostartitem.cpp | 30 ------------------ kcontrol/autostart/autostartitem.h | 13 -------- 4 files changed, 13 insertions(+), 103 deletions(-) diff --git a/kcontrol/autostart/autostart.cpp b/kcontrol/autostart/autostart.cpp index a2d6d5b3..02b4640a 100644 --- a/kcontrol/autostart/autostart.cpp +++ b/kcontrol/autostart/autostart.cpp @@ -57,8 +57,7 @@ K_PLUGIN_FACTORY(AutostartFactory, registerPlugin();) QStringList lstHeader; lstHeader << i18n( "Name" ) << i18n( "Command" ) - << i18n( "Status" ) - << i18nc("@title:column The name of the column that decides if the program is run on kde startup, on kde shutdown, etc", "Run On" ); + << i18n( "Status" ); widget->listCMD->setHeaderLabels(lstHeader); widget->listCMD->setFocus(); @@ -113,22 +112,20 @@ void Autostart::slotItemClicked( QTreeWidgetItem *item, int col) } } -void Autostart::addItem( DesktopStartItem* item, const QString& name, const QString& run, const QString& command, bool disabled ) +void Autostart::addItem( DesktopStartItem* item, const QString& name, const QString& command, bool disabled ) { Q_ASSERT( item ); item->setText( COL_NAME, name ); - item->setText( COL_RUN, run ); item->setText( COL_COMMAND, command ); item->setCheckState( COL_STATUS, disabled ? Qt::Unchecked : Qt::Checked ); item->setText( COL_STATUS, disabled ? i18nc( "The program won't be run", "Disabled" ) : i18nc( "The program will be run", "Enabled" )); } -void Autostart::addItem(ScriptStartItem* item, const QString& name, const QString& command, ScriptStartItem::ENV type ) +void Autostart::addItem(ScriptStartItem* item, const QString& name, const QString& command ) { Q_ASSERT( item ); item->setText( COL_NAME, name ); item->setText( COL_COMMAND, command ); - item->changeStartup( type ); } @@ -139,16 +136,9 @@ void Autostart::load() // autostart on the otherhand may contain all of the above. // share/autostart is special as it overrides entries found in $KDEDIR/share/autostart m_paths << KGlobalSettings::autostartPath() // All new entries should go here - << componentData().dirs()->localkdedir() + "shutdown/" - << componentData().dirs()->localkdedir() + "env/" << componentData().dirs()->localkdedir() + "share/autostart/" // For Importing purposes << componentData().dirs()->localxdgconfdir() + "autostart/" ; //xdg-config autostart dir - // share/autostart shouldn't be an option as this should be reserved for global autostart entries - m_pathName << i18n("Startup") - << i18n("Shutdown") - << i18n("Pre-KDE startup") - ; widget->listCMD->clear(); m_programItem = new QTreeWidgetItem( widget->listCMD ); @@ -204,37 +194,21 @@ void Autostart::load() (!onlyShowList.isEmpty() && !onlyShowList.contains("KDE")); int indexPath = m_paths.indexOf((item->fileName().directory()+'/' ) ); - if ( indexPath > 2 ) + if ( indexPath > 0 ) indexPath = 0; //.kde/share/autostart and .config/autostart load destkop at startup - addItem(item, config.readName(), m_pathName.value(indexPath), grp.readEntry("Exec"), disabled ); + addItem(item, config.readName(), grp.readEntry("Exec"), disabled ); } else { ScriptStartItem *item = new ScriptStartItem( fi.absoluteFilePath(), m_scriptItem,this ); int typeOfStartup = m_paths.indexOf((item->fileName().directory()+'/') ); - ScriptStartItem::ENV type = ScriptStartItem::START; - switch( typeOfStartup ) - { - case 0: - type =ScriptStartItem::START; - break; - case 1: - type = ScriptStartItem::SHUTDOWN; - break; - case 2: - type = ScriptStartItem::PRE_START; - break; - default: - kDebug()<<" type is not defined :"<listCMD->resizeColumnToContents(COL_NAME); //widget->listCMD->resizeColumnToContents(COL_COMMAND); widget->listCMD->resizeColumnToContents(COL_STATUS); - widget->listCMD->resizeColumnToContents(COL_RUN); } void Autostart::slotAddProgram() @@ -297,7 +270,7 @@ void Autostart::slotAddProgram() return; } DesktopStartItem * item = new DesktopStartItem( desktopPath, m_programItem,this ); - addItem( item, service->name(), m_pathName[0], service->exec() , false); + addItem( item, service->name(), service->exec() , false); } void Autostart::slotAddScript() @@ -311,7 +284,7 @@ void Autostart::slotAddScript() KIO::copy(addDialog->importUrl(), m_paths[0]); ScriptStartItem * item = new ScriptStartItem( m_paths[0] + addDialog->importUrl().fileName(), m_scriptItem,this ); - addItem( item, addDialog->importUrl().fileName(), addDialog->importUrl().fileName(),ScriptStartItem::START ); + addItem( item, addDialog->importUrl().fileName(), addDialog->importUrl().fileName() ); } delete addDialog; } @@ -352,7 +325,7 @@ void Autostart::slotEditCMD(QTreeWidgetItem* ent) DesktopStartItem *desktopEntry = dynamic_cast( entry ); if (desktopEntry) { KService service(desktopEntry->fileName().path()); - addItem( desktopEntry, service.name(), m_pathName.value(m_paths.indexOf((desktopEntry->fileName().directory()+'/') )), service.exec(),false ); + addItem( desktopEntry, service.name(), service.exec(),false ); } } } @@ -405,20 +378,6 @@ void Autostart::slotAdvanced() delete dlg; } -void Autostart::slotChangeStartup( ScriptStartItem* item, int index ) -{ - Q_ASSERT(item); - - if ( item ) - { - item->setPath(m_paths.value(index)); - widget->listCMD->setCurrentItem( item ); - if ( ( index == 2 ) && !item->fileName().path().endsWith( ".sh" )) - KMessageBox::information( this, i18n( "Only files with “.sh” extensions are allowed for setting up the environment." ) ); - - } -} - void Autostart::slotSelectionChanged() { const bool hasItems = ( dynamic_cast( widget->listCMD->currentItem() )!=0 ) ; diff --git a/kcontrol/autostart/autostart.h b/kcontrol/autostart/autostart.h index f429b71e..13701f56 100644 --- a/kcontrol/autostart/autostart.h +++ b/kcontrol/autostart/autostart.h @@ -39,19 +39,14 @@ class Autostart: public KCModule public: Autostart( QWidget* parent, const QVariantList& ); ~Autostart(); - enum COL_TYPE { COL_NAME = 0, COL_COMMAND=1, COL_STATUS=2,COL_RUN=3 }; + enum COL_TYPE { COL_NAME = 0, COL_COMMAND=1, COL_STATUS=2 }; void load(); void save(); void defaults(); - QStringList listPathName() const { return m_pathName;} - -public slots: - void slotChangeStartup( ScriptStartItem* item, int index ); - protected: - void addItem(DesktopStartItem *item, const QString& name, const QString& run, const QString& command, bool disabled ); - void addItem(ScriptStartItem *item, const QString& name, const QString& command, ScriptStartItem::ENV type ); + void addItem(DesktopStartItem *item, const QString& name, const QString& command, bool disabled ); + void addItem(ScriptStartItem *item, const QString& name, const QString& command ); private slots: void slotAddProgram(); @@ -67,7 +62,6 @@ private slots: private: QTreeWidgetItem *m_programItem, *m_scriptItem; QStringList m_paths; - QStringList m_pathName; Ui_AutostartConfig *widget; }; diff --git a/kcontrol/autostart/autostartitem.cpp b/kcontrol/autostart/autostartitem.cpp index 3673bb54..2f41a9b0 100644 --- a/kcontrol/autostart/autostartitem.cpp +++ b/kcontrol/autostart/autostartitem.cpp @@ -71,41 +71,11 @@ DesktopStartItem::~DesktopStartItem() ScriptStartItem::ScriptStartItem( const QString &service, QTreeWidgetItem *parent, Autostart* autostart ) : AutoStartItem( service, parent,autostart ) { - m_comboBoxStartup = new QComboBox; - m_comboBoxStartup->addItems( autostart->listPathName() ); - - setText( 2, i18nc( "The program will be run", "Enabled" ) ); - QObject::connect( m_comboBoxStartup,SIGNAL(activated(int)),this,SLOT(slotStartupChanged(int)) ); - QObject::connect( this,SIGNAL(askChangeStartup(ScriptStartItem*,int)),autostart,SLOT(slotChangeStartup(ScriptStartItem*,int)) ); - treeWidget()->setItemWidget ( this, Autostart::COL_RUN, m_comboBoxStartup ); } ScriptStartItem::~ScriptStartItem() { } -void ScriptStartItem::slotStartupChanged(int index) -{ - emit askChangeStartup(this, index); -} - -void ScriptStartItem::changeStartup(ScriptStartItem::ENV type ) -{ - switch( type ) - { - case ScriptStartItem::START: - m_comboBoxStartup->setCurrentIndex( 0 ); - break; - case ScriptStartItem::SHUTDOWN: - m_comboBoxStartup->setCurrentIndex( 1 ); - break; - case ScriptStartItem::PRE_START: - m_comboBoxStartup->setCurrentIndex( 2 ); - break; - default: - kWarning() << " startup type is not defined :" << type; - break; - } -} #include "moc_autostartitem.cpp" diff --git a/kcontrol/autostart/autostartitem.h b/kcontrol/autostart/autostartitem.h index d8aaf1e6..def95cef 100644 --- a/kcontrol/autostart/autostartitem.h +++ b/kcontrol/autostart/autostartitem.h @@ -55,21 +55,8 @@ class ScriptStartItem : public AutoStartItem Q_OBJECT public: - enum ENV { START=0, SHUTDOWN=1, PRE_START=2}; //rename ScriptStartItem( const QString &service, QTreeWidgetItem *parent, Autostart* ); ~ScriptStartItem(); - - void changeStartup( ScriptStartItem::ENV type ); - -signals: - void askChangeStartup(ScriptStartItem* item, int index); - -private slots: - - void slotStartupChanged(int index); - -private: - QComboBox *m_comboBoxStartup; }; #endif -- 2.11.0