|
|
@ -67,7 +67,7 @@ MMainWindow::MMainWindow()
|
|
|
|
_delayType(DelayType_Now)
|
|
|
|
_delayType(DelayType_Now)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
_instance = this;
|
|
|
|
_instance = this;
|
|
|
|
connect(kapp, TQ_SIGNAL(aboutToQuit()), TQ_SLOT(slotAboutToQuit()));
|
|
|
|
connect(tdeApp, TQ_SIGNAL(aboutToQuit()), TQ_SLOT(slotAboutToQuit()));
|
|
|
|
|
|
|
|
|
|
|
|
// init date/time
|
|
|
|
// init date/time
|
|
|
|
dt_end = TQDateTime();
|
|
|
|
dt_end = TQDateTime();
|
|
|
@ -83,11 +83,11 @@ MMainWindow::MMainWindow()
|
|
|
|
initMainMenu();
|
|
|
|
initMainMenu();
|
|
|
|
|
|
|
|
|
|
|
|
// init DCOP
|
|
|
|
// init DCOP
|
|
|
|
DCOPClient *client = kapp->dcopClient();
|
|
|
|
DCOPClient *client = tdeApp->dcopClient();
|
|
|
|
client->registerAs(kapp->name(), false);
|
|
|
|
client->registerAs(tdeApp->name(), false);
|
|
|
|
client->setDefaultObject(objId()); // KShutdownIface
|
|
|
|
client->setDefaultObject(objId()); // KShutdownIface
|
|
|
|
|
|
|
|
|
|
|
|
TDEConfig *config = kapp->config();
|
|
|
|
TDEConfig *config = tdeApp->config();
|
|
|
|
config->setGroup("Extras");
|
|
|
|
config->setGroup("Extras");
|
|
|
|
TQString extrasCommand = config->readEntry("Command", TQString::null);
|
|
|
|
TQString extrasCommand = config->readEntry("Command", TQString::null);
|
|
|
|
TQString extrasDescription = config->readEntry("Description", TQString::null);
|
|
|
|
TQString extrasDescription = config->readEntry("Description", TQString::null);
|
|
|
@ -123,7 +123,7 @@ MMainWindow::MMainWindow()
|
|
|
|
|
|
|
|
|
|
|
|
MMainWindow::~MMainWindow()
|
|
|
|
MMainWindow::~MMainWindow()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
TDEConfig *config = kapp->config();
|
|
|
|
TDEConfig *config = tdeApp->config();
|
|
|
|
config->setGroup("Extras");
|
|
|
|
config->setGroup("Extras");
|
|
|
|
config->writeEntry("Command", ks_extras->fileToExecute());
|
|
|
|
config->writeEntry("Command", ks_extras->fileToExecute());
|
|
|
|
config->writeEntry("Description", ks_extras->getActionDescription());
|
|
|
|
config->writeEntry("Description", ks_extras->getActionDescription());
|
|
|
@ -891,7 +891,7 @@ void MMainWindow::slotUpdateTimeInfo()
|
|
|
|
bool MMainWindow::queryClose()
|
|
|
|
bool MMainWindow::queryClose()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
// exit
|
|
|
|
// exit
|
|
|
|
if (ks_actions->totalExit() || kapp->sessionSaving())
|
|
|
|
if (ks_actions->totalExit() || tdeApp->sessionSaving())
|
|
|
|
return true;
|
|
|
|
return true;
|
|
|
|
|
|
|
|
|
|
|
|
// MSystemTray::Always
|
|
|
|
// MSystemTray::Always
|
|
|
|