|
|
|
@ -291,10 +291,10 @@ void KSquirrel::closeEvent(TQCloseEvent *ev)
|
|
|
|
|
{
|
|
|
|
|
tdeconf->setGroup("Main");
|
|
|
|
|
|
|
|
|
|
if((m_demo && !m_intray) || kapp->sessionSaving())
|
|
|
|
|
if((m_demo && !m_intray) || tdeApp->sessionSaving())
|
|
|
|
|
{
|
|
|
|
|
// finalActions() called by slotSaveYourself()
|
|
|
|
|
if(!kapp->sessionSaving())
|
|
|
|
|
if(!tdeApp->sessionSaving())
|
|
|
|
|
finalActions();
|
|
|
|
|
|
|
|
|
|
ev->accept();
|
|
|
|
@ -1394,7 +1394,7 @@ void KSquirrel::continueLoading()
|
|
|
|
|
raiseGLWidget();
|
|
|
|
|
|
|
|
|
|
// don't show navigator when running with file argument
|
|
|
|
|
if(!m_demo && !kapp->isRestored())
|
|
|
|
|
if(!m_demo && !tdeApp->isRestored())
|
|
|
|
|
show();
|
|
|
|
|
|
|
|
|
|
// in demo mode may be invisible
|
|
|
|
@ -1429,10 +1429,10 @@ void KSquirrel::continueLoading()
|
|
|
|
|
pWidgetStack->diroperator()->setFocus();
|
|
|
|
|
|
|
|
|
|
// show tray icon when restored
|
|
|
|
|
if(kapp->isRestored())
|
|
|
|
|
if(tdeApp->isRestored())
|
|
|
|
|
slotGotoTray();
|
|
|
|
|
|
|
|
|
|
connect(kapp, TQ_SIGNAL(saveYourself()), this, TQ_SLOT(slotSaveYourself()));
|
|
|
|
|
connect(tdeApp, TQ_SIGNAL(saveYourself()), this, TQ_SLOT(slotSaveYourself()));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Set caption to main window or to image window
|
|
|
|
@ -1442,7 +1442,7 @@ void KSquirrel::setCaption(const TQString &cap)
|
|
|
|
|
TDEMainWindow::setCaption(cap);
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
gl_view->setCaption(cap.isEmpty() ? "ksquirrel" : kapp->makeStdCaption(cap));
|
|
|
|
|
gl_view->setCaption(cap.isEmpty() ? "ksquirrel" : tdeApp->makeStdCaption(cap));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// User selected "Open file" or "Open file #2" from menu.
|
|
|
|
@ -1494,7 +1494,7 @@ void KSquirrel::slotOpenFileAndSet()
|
|
|
|
|
void KSquirrel::slotAnimatedClicked()
|
|
|
|
|
{
|
|
|
|
|
// invoke default browser
|
|
|
|
|
kapp->invokeBrowser(TQString::fromLatin1("http://ksquirrel.sourceforge.net/"));
|
|
|
|
|
tdeApp->invokeBrowser(TQString::fromLatin1("http://ksquirrel.sourceforge.net/"));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Create SQ_ThumbnailCacheMaster, which can do something with thumbnails
|
|
|
|
|