File kmix-autostart.diff of Package kdemultimedia4
--- kmix/apps/KMixApp.cpp 2010-09-01 23:37:58.000000000 +0200
+++ kmix/apps/KMixApp.cpp 2010-09-13 13:37:46.467783417 +0200
@@ -22,9 +22,11 @@
#include "KMixApp.h"
#include "apps/kmix.h"
#include <kdebug.h>
+#include <kcmdlineargs.h>
bool KMixApp::_keepVisibility = false;
+bool KMixApp::_autoStart = false;
KMixApp::KMixApp()
: KUniqueApplication(), m_kmix( 0 )
@@ -51,6 +53,17 @@
// There are 3 cases for a new instance
//kDebug(67100) << "KMixApp::newInstance() isRestored()=" << isRestored() << "_keepVisibility=" << _keepVisibility;
+
+ KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+
+ if (args->isSet("autostart"))
+ {
+ kapp->disableSessionManagement();
+
+ if ( m_kmix )
+ return 0;
+ }
+
static bool first = true;
if ( !first )
{ // There already exists an instance/window
@@ -117,6 +130,11 @@
_keepVisibility = val_keepVisibility;
}
+void KMixApp::autoStart(bool val_autoStart) {
+ //kDebug(67100) << "KMixApp::autoStart()";
+ _autoStart = val_autoStart;
+}
+
/*
void
KMixApp::quitExtended()
--- kmix/apps/KMixApp.h 2010-09-01 23:37:58.000000000 +0200
+++ kmix/apps/KMixApp.h 2010-09-13 13:37:46.445783373 +0200
@@ -36,6 +36,7 @@
public slots:
//void quitExtended(); // For a hack on visibility()
static void keepVisibility(bool);
+ static void autoStart(bool);
/*
signals:
void stopUpdatesOnVisibility();
@@ -43,6 +44,7 @@
private:
KMixWindow *m_kmix;
static bool _keepVisibility;
+ static bool _autoStart;
};
#endif
--- kmix/apps/kmix.cpp 2010-09-02 09:47:55.000000000 +0200
+++ kmix/apps/kmix.cpp 2010-09-13 13:42:12.729441400 +0200
@@ -29,9 +29,11 @@
#include <qradiobutton.h>
#include <QCursor>
#include <QString>
+#include <QTimer>
// include files for KDE
+#include <kcmdlineargs.h>
#include <kcombobox.h>
#include <kiconloader.h>
#include <kmessagebox.h>
@@ -99,6 +101,10 @@
theKMixDeviceManager->initHotplug();
connect(theKMixDeviceManager, SIGNAL( plugged( const char*, const QString&, QString&)), SLOT (plugged( const char*, const QString&, QString&) ) );
connect(theKMixDeviceManager, SIGNAL( unplugged( const QString&)), SLOT (unplugged( const QString&) ) );
+
+ if (KCmdLineArgs::parsedArgs()->isSet("autostart") && ! Mixer::mixers().first())
+ QTimer::singleShot(0, kapp, SLOT(quit()));
+
if ( m_startVisible && ! invisible)
show(); // Started visible
@@ -285,6 +291,7 @@
config.writeEntry( "Tickmarks", m_showTicks );
config.writeEntry( "Labels", m_showLabels );
config.writeEntry( "startkdeRestore", m_onLogin );
+ config.writeEntry( "AutoStart", m_autoStart );
config.writeEntry( "DefaultCardOnStart", m_defaultCardOnStart );
config.writeEntry( "ConfigVersion", KMIX_CONFIG_VERSION );
config.writeEntry( "AutoUseMultimediaKeys", m_autouseMultimediaKeys );
@@ -386,6 +393,7 @@
m_showLabels = config.readEntry("Labels", true);
m_onLogin = config.readEntry("startkdeRestore", true );
m_startVisible = config.readEntry("Visible", false);
+ m_autoStart = config.readEntry("AutoStart", true);
m_multiDriverMode = config.readEntry("MultiDriver", false);
const QString& orientationString = config.readEntry("Orientation", "Vertical");
m_defaultCardOnStart = config.readEntry( "DefaultCardOnStart", "" );
@@ -990,6 +998,7 @@
m_prefDlg->m_volumeChk->setChecked(m_volumeWidget);
m_prefDlg->m_volumeChk->setEnabled( m_showDockWidget );
m_prefDlg->m_onLogin->setChecked( m_onLogin );
+ m_prefDlg->m_disableAutoStart->setChecked( !m_autoStart );
m_prefDlg->m_showTicks->setChecked( m_showTicks );
m_prefDlg->m_showLabels->setChecked( m_showLabels );
@@ -1031,6 +1040,7 @@
m_showDockWidget = prefDlg->m_dockingChk->isChecked();
m_volumeWidget = prefDlg->m_volumeChk->isChecked();
m_onLogin = prefDlg->m_onLogin->isChecked();
+ m_autoStart = !prefDlg->m_disableAutoStart->isChecked();
if ( prefDlg->_rbVertical->isChecked() ) {
m_toplevelOrientation = Qt::Vertical;
}
--- kmix/apps/kmix.h 2010-09-02 09:47:55.000000000 +0200
+++ kmix/apps/kmix.h 2010-09-13 13:37:46.467783417 +0200
@@ -106,6 +106,7 @@
bool m_showDockWidget;
bool m_volumeWidget;
+ bool m_autoStart;
bool m_showTicks;
bool m_showLabels;
bool m_onLogin;
--- kmix/apps/main.cpp 2010-09-07 00:50:02.000000000 +0200
+++ kmix/apps/main.cpp 2010-09-13 13:37:46.468783419 +0200
@@ -58,6 +58,7 @@
KCmdLineOptions options;
options.add("keepvisibility", ki18n("Inhibits the unhiding of the KMix main window, if KMix is already running."));
+ options.add("autostart", ki18n("Used by kmix_autostart.desktop"));
KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
KUniqueApplication::addCmdLineOptions();
@@ -65,6 +66,8 @@
bool hasArgKeepvisibility = args->isSet("keepvisibility");
//kDebug(67100) << "hasArgKeepvisibility=" << hasArgKeepvisibility;
KMixApp::keepVisibility(hasArgKeepvisibility);
+ bool hasAutoStart = args->isSet("autostart");
+ KMixApp::autoStart(hasAutoStart);
if (!KMixApp::start())
return 0;
--- kmix/gui/kmixprefdlg.cpp 2010-09-01 23:37:58.000000000 +0200
+++ kmix/gui/kmixprefdlg.cpp 2010-09-13 13:37:46.469783421 +0200
@@ -78,6 +78,12 @@
m_onLogin = new QCheckBox( i18n("Restore volumes on login"), m_generalTab );
l->addWidget( m_onLogin );
+ l = new QHBoxLayout();
+ layout->addItem( l );
+ l->addSpacing(10);
+ m_disableAutoStart = new QCheckBox( i18n("Disable automatic startup on login"), m_generalTab );
+ l->addWidget( m_disableAutoStart );
+
// -----------------------------------------------------------
label = new QLabel( i18n("Visual"), m_generalTab );
--- kmix/gui/kmixprefdlg.h 2010-09-01 23:37:58.000000000 +0200
+++ kmix/gui/kmixprefdlg.h 2010-09-13 13:37:46.446783375 +0200
@@ -55,6 +55,7 @@
QCheckBox *m_showTicks;
QCheckBox *m_showLabels;
QCheckBox *m_onLogin;
+ QCheckBox *m_disableAutoStart;
QRadioButton *_rbVertical;
QRadioButton *_rbHorizontal;
};
