Commit b969c93a authored by Scott Wheeler's avatar Scott Wheeler

Removed the (already hidden) GUI option to disable restoring of playlists

and made it a CLI option for debug enabled builds.

svn path=/trunk/kdemultimedia/juk/; revision=230286
parent 18ae18aa
...@@ -347,7 +347,6 @@ void JuK::setupActions() ...@@ -347,7 +347,6 @@ void JuK::setupActions()
setStandardToolBarMenuEnabled(true); setStandardToolBarMenuEnabled(true);
m_restoreOnLoadAction = new KToggleAction(i18n("&Restore Playlists on Load"), 0, actionCollection(), "restoreOnLoad");
m_toggleSplashAction = new KToggleAction(i18n("Show Splash Screen on Startup"), 0, actionCollection(), "showSplashScreen"); m_toggleSplashAction = new KToggleAction(i18n("Show Splash Screen on Startup"), 0, actionCollection(), "showSplashScreen");
m_toggleSystemTrayAction = new KToggleAction(i18n("&Dock in System Tray"), 0, actionCollection(), "toggleSystemTray"); m_toggleSystemTrayAction = new KToggleAction(i18n("&Dock in System Tray"), 0, actionCollection(), "toggleSystemTray");
m_toggleDockOnCloseAction = new KToggleAction(i18n("&Stay in System Tray on Close"), 0, actionCollection(), "dockOnClose"); m_toggleDockOnCloseAction = new KToggleAction(i18n("&Stay in System Tray on Close"), 0, actionCollection(), "dockOnClose");
...@@ -495,7 +494,6 @@ void JuK::readSettings() ...@@ -495,7 +494,6 @@ void JuK::readSettings()
KConfig *config = KGlobal::config(); KConfig *config = KGlobal::config();
{ // general settings { // general settings
KConfigGroupSaver saver(config, "Settings"); KConfigGroupSaver saver(config, "Settings");
m_restore = config->readBoolEntry("RestoreOnLoad", true);
m_showSplash = config->readBoolEntry("ShowSplashScreen", true); m_showSplash = config->readBoolEntry("ShowSplashScreen", true);
} }
} }
...@@ -545,7 +543,6 @@ void JuK::readConfig() ...@@ -545,7 +543,6 @@ void JuK::readConfig()
m_outputSelectAction->setCurrentItem(config->readNumEntry("MediaSystem", 0)); m_outputSelectAction->setCurrentItem(config->readNumEntry("MediaSystem", 0));
} }
m_restoreOnLoadAction->setChecked(m_restore);
m_toggleSplashAction->setChecked(m_showSplash); m_toggleSplashAction->setChecked(m_showSplash);
} }
...@@ -569,7 +566,6 @@ void JuK::saveConfig() ...@@ -569,7 +566,6 @@ void JuK::saveConfig()
} }
{ // general settings { // general settings
KConfigGroupSaver saver(config, "Settings"); KConfigGroupSaver saver(config, "Settings");
config->writeEntry("RestoreOnLoad", m_restoreOnLoadAction->isChecked());
config->writeEntry("ShowSplashScreen", m_toggleSplashAction->isChecked()); config->writeEntry("ShowSplashScreen", m_toggleSplashAction->isChecked());
config->writeEntry("DockInSystemTray", m_toggleSystemTrayAction->isChecked()); config->writeEntry("DockInSystemTray", m_toggleSystemTrayAction->isChecked());
config->writeEntry("DockOnClose", m_toggleDockOnCloseAction->isChecked()); config->writeEntry("DockOnClose", m_toggleDockOnCloseAction->isChecked());
......
...@@ -53,7 +53,6 @@ ...@@ -53,7 +53,6 @@
</Menu> </Menu>
<Menu name="settings"><text>&amp;Settings</text> <Menu name="settings"><text>&amp;Settings</text>
<!-- <Action name="showGenreListEditor"/> --> <!-- <Action name="showGenreListEditor"/> -->
<!-- <Action name="restoreOnLoad" append="show_merge"/> -->
<Action name="showSplashScreen" append="show_merge"/> <Action name="showSplashScreen" append="show_merge"/>
<Action name="toggleSystemTray" append="show_merge"/> <Action name="toggleSystemTray" append="show_merge"/>
<Action name="dockOnClose" append="show_merge"/> <Action name="dockOnClose" append="show_merge"/>
......
...@@ -49,6 +49,9 @@ public: ...@@ -49,6 +49,9 @@ public:
static KCmdLineOptions options[] = static KCmdLineOptions options[] =
{ {
#ifndef NO_DEBUG
{ "restore", I18N_NOOP("Restore playlists. Use --norestore for debugging."), 0 },
#endif
{ "+[file(s)]", I18N_NOOP("File(s) to open"), 0 }, { "+[file(s)]", I18N_NOOP("File(s) to open"), 0 },
{ 0, 0, 0 } { 0, 0, 0 }
}; };
...@@ -69,6 +72,8 @@ int main(int argc, char *argv[]) ...@@ -69,6 +72,8 @@ int main(int argc, char *argv[])
KCmdLineArgs::init(argc, argv, &aboutData); KCmdLineArgs::init(argc, argv, &aboutData);
KCmdLineArgs::addCmdLineOptions(options); KCmdLineArgs::addCmdLineOptions(options);
Application::addCmdLineOptions();
Application a; Application a;
// Here we do some DCOP locking of sorts to prevent incoming DCOP calls // Here we do some DCOP locking of sorts to prevent incoming DCOP calls
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <klineeditdlg.h> #include <klineeditdlg.h>
#include <kcmdlineargs.h>
#include <kdebug.h> #include <kdebug.h>
#include <qpopupmenu.h> #include <qpopupmenu.h>
...@@ -50,6 +51,14 @@ PlaylistSplitter::PlaylistSplitter(QWidget *parent, bool restore, const char *na ...@@ -50,6 +51,14 @@ PlaylistSplitter::PlaylistSplitter(QWidget *parent, bool restore, const char *na
m_playingItem(0), m_searchWidget(0), m_dynamicList(0), m_restore(restore), m_playingItem(0), m_searchWidget(0), m_dynamicList(0), m_restore(restore),
m_nextPlaylistItem(0) m_nextPlaylistItem(0)
{ {
#ifndef NO_DEBUG
m_restore = KCmdLineArgs::parsedArgs()->isSet("restore");
#else
m_restore = true;
#endif
m_dirWatch = new KDirWatch();
setupLayout(); setupLayout();
readConfig(); readConfig();
...@@ -469,7 +478,6 @@ void PlaylistSplitter::readConfig() ...@@ -469,7 +478,6 @@ void PlaylistSplitter::readConfig()
m_directoryList = config->readListEntry("DirectoryList"); m_directoryList = config->readListEntry("DirectoryList");
QTimer::singleShot(0, this, SLOT(slotScanDirectories())); QTimer::singleShot(0, this, SLOT(slotScanDirectories()));
m_dirWatch = new KDirWatch();
connect(m_dirWatch, SIGNAL(dirty(const QString &)), connect(m_dirWatch, SIGNAL(dirty(const QString &)),
this, SLOT(slotDirChanged(const QString &))); this, SLOT(slotDirChanged(const QString &)));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment