TDE
/
bibletime
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/bibletime
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KStartup for enhanced compatibility with KDE4

Browse Source
r14.0.x
Timothy Pearson 11 years ago
parent 171ad6a564
commit c908e40b49
5 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File

4
ChangeLog
Unescape View File

@ -890,7 +890,7 @@
Solves a problem with the height of the editor. Solves a problem with the height of the editor.
*Updated the startuplogo. It's now much more nice as the previous version. *Updated the startuplogo. It's now much more nice as the previous version.
*Integrated the startuplogo in the aboutdialog. It's now displayed in the upper left corner of the box. *Integrated the startuplogo in the aboutdialog. It's now displayed in the upper left corner of the box.
*The class KStartupLogo looks now for the size of the startuplogo and resize the widget in the right way if the size have changed. *The class TDEStartupLogo looks now for the size of the startuplogo and resize the widget in the right way if the size have changed.
*CDocBrowserColor: Made some hardcoded texts to i18n("") *CDocBrowserColor: Made some hardcoded texts to i18n("")
1999-09-19 Joachim Ansorg <Jockel123@gmx.de> 1999-09-19 Joachim Ansorg <Jockel123@gmx.de>
@ -931,7 +931,7 @@
1999-09-12 Joachim Ansorg <Jockel123@gmx.de> 1999-09-12 Joachim Ansorg <Jockel123@gmx.de>
*Added some tips to the tipdatabase *Added some tips to the tipdatabase
*Added class KStartupLogo to display a picture on startup *Added class TDEStartupLogo to display a picture on startup
1999-09-10 Joachim Ansorg <Jockel123@gmx.de> 1999-09-10 Joachim Ansorg <Jockel123@gmx.de>
*Rewrite of the Searchanalysis, it's now up to 63 times faster *Rewrite of the Searchanalysis, it's now up to 63 times faster

14
bibletime/bibletime_init.cpp
Unescape View File

@ -72,7 +72,7 @@ using namespace Profile;
/**Initializes the view of this widget*/ /**Initializes the view of this widget*/
void BibleTime::initView() { void BibleTime::initView() {
KStartupLogo::setStatusMessage(i18n("Creating BibleTime's GUI") + TQString("...")); TDEStartupLogo::setStatusMessage(i18n("Creating BibleTime's GUI") + TQString("..."));
m_mainSplitter = new TQSplitter(this, "mainsplitter"); m_mainSplitter = new TQSplitter(this, "mainsplitter");
m_mainSplitter->setChildrenCollapsible(false); m_mainSplitter->setChildrenCollapsible(false);
@ -101,7 +101,7 @@ void BibleTime::initView() {
/** Initializes the action objects of the GUI */ /** Initializes the action objects of the GUI */
void BibleTime::initActions() { void BibleTime::initActions() {
KStartupLogo::setStatusMessage(i18n("Initializing menu- and toolbars") + TQString("...")); TDEStartupLogo::setStatusMessage(i18n("Initializing menu- and toolbars") + TQString("..."));
KAction* action = 0; KAction* action = 0;
action = KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT( quit() ), actionCollection()); action = KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT( quit() ), actionCollection());
@ -518,7 +518,7 @@ void BibleTime::initConnections() {
/** Initializes the backend */ /** Initializes the backend */
void BibleTime::initBackends() { void BibleTime::initBackends() {
KStartupLogo::setStatusMessage(i18n("Initializing Sword") + TQString("...")); TDEStartupLogo::setStatusMessage(i18n("Initializing Sword") + TQString("..."));
StringMgr::setSystemStringMgr( new BTStringMgr() ); StringMgr::setSystemStringMgr( new BTStringMgr() );
SWLog::getSystemLog()->setLogLevel(1); SWLog::getSystemLog()->setLogLevel(1);
@ -540,7 +540,7 @@ void BibleTime::initBackends() {
switch (errorCode) { switch (errorCode) {
case CSwordBackend::NoSwordConfig: //mods.d or mods.conf missing case CSwordBackend::NoSwordConfig: //mods.d or mods.conf missing
{ {
KStartupLogo::hideSplash(); TDEStartupLogo::hideSplash();
BookshelfManager::CSwordSetupDialog dlg; BookshelfManager::CSwordSetupDialog dlg;
dlg.showPart( BookshelfManager::CSwordSetupDialog::Sword ); dlg.showPart( BookshelfManager::CSwordSetupDialog::Sword );
dlg.exec(); dlg.exec();
@ -549,7 +549,7 @@ void BibleTime::initBackends() {
case CSwordBackend::NoModules: //no modules installed, but config exists case CSwordBackend::NoModules: //no modules installed, but config exists
{ {
KStartupLogo::hideSplash(); TDEStartupLogo::hideSplash();
BookshelfManager::CSwordSetupDialog dlg; BookshelfManager::CSwordSetupDialog dlg;
dlg.showPart( BookshelfManager::CSwordSetupDialog::Install ); dlg.showPart( BookshelfManager::CSwordSetupDialog::Install );
dlg.exec(); dlg.exec();
@ -558,7 +558,7 @@ void BibleTime::initBackends() {
default: //unknown error default: //unknown error
{ {
KStartupLogo::hideSplash(); TDEStartupLogo::hideSplash();
BookshelfManager::CSwordSetupDialog dlg; BookshelfManager::CSwordSetupDialog dlg;
dlg.showPart( BookshelfManager::CSwordSetupDialog::Sword ); dlg.showPart( BookshelfManager::CSwordSetupDialog::Sword );
dlg.exec(); dlg.exec();
@ -567,7 +567,7 @@ void BibleTime::initBackends() {
} }
} }
KStartupLogo::setStatusMessage(i18n("Checking indices") + TQString("...")); TDEStartupLogo::setStatusMessage(i18n("Checking indices") + TQString("..."));
//This function will //This function will
// - delete all orphaned indexes (no module present) if autoDeleteOrphanedIndices is true // - delete all orphaned indexes (no module present) if autoDeleteOrphanedIndices is true
// - delete all indices of modules where hasIndex() returns false // - delete all indices of modules where hasIndex() returns false

26
bibletime/frontend/kstartuplogo.cpp
Unescape View File

@ -24,38 +24,38 @@
//#include <kimageio.h> //#include <kimageio.h>
//static objects //static objects
KStartupLogo* KStartupLogo::startupLogo = 0; TDEStartupLogo* TDEStartupLogo::startupLogo = 0;
void KStartupLogo::createSplash() { void TDEStartupLogo::createSplash() {
deleteSplash(); deleteSplash();
startupLogo = new KStartupLogo(); startupLogo = new TDEStartupLogo();
} }
void KStartupLogo::showSplash() { void TDEStartupLogo::showSplash() {
if (KStartupLogo::startupLogo) { if (TDEStartupLogo::startupLogo) {
KStartupLogo::startupLogo->show(); TDEStartupLogo::startupLogo->show();
} }
} }
void KStartupLogo::hideSplash() { void TDEStartupLogo::hideSplash() {
if (startupLogo) { if (startupLogo) {
startupLogo->hide(); startupLogo->hide();
} }
} }
void KStartupLogo::deleteSplash() { void TDEStartupLogo::deleteSplash() {
delete startupLogo; delete startupLogo;
startupLogo = 0; startupLogo = 0;
} }
void KStartupLogo::setStatusMessage(const TQString& message) { void TDEStartupLogo::setStatusMessage(const TQString& message) {
if (startupLogo) { if (startupLogo) {
startupLogo->setText(message); startupLogo->setText(message);
} }
} }
KStartupLogo::KStartupLogo() TDEStartupLogo::TDEStartupLogo()
: TQWidget(0, "startuplogo", /*WStyle_Customize | WStyle_NoBorder*/ WStyle_NoBorder|WStyle_StaysOnTop|WX11BypassWM ) { : TQWidget(0, "startuplogo", /*WStyle_Customize | WStyle_NoBorder*/ WStyle_NoBorder|WStyle_StaysOnTop|WX11BypassWM ) {
TQPixmap pm; TQPixmap pm;
@ -92,14 +92,14 @@ KStartupLogo::KStartupLogo()
); );
} }
void KStartupLogo::setText(const TQString text) { void TDEStartupLogo::setText(const TQString text) {
//Please not make the text bold & let the first character be blank //Please not make the text bold & let the first character be blank
textLabel->setText( TQString::fromLatin1(" %1").arg(text) ); textLabel->setText( TQString::fromLatin1(" %1").arg(text) );
TDEApplication::kApplication()->processEvents(); TDEApplication::kApplication()->processEvents();
} }
/** Makes the splashscreen the toplevel window. */ /** Makes the splashscreen the toplevel window. */
void KStartupLogo::raiseSplash() { void TDEStartupLogo::raiseSplash() {
if (startupLogo) { if (startupLogo) {
startupLogo->raise(); startupLogo->raise();
startupLogo->setActiveWindow(); startupLogo->setActiveWindow();
@ -108,7 +108,7 @@ void KStartupLogo::raiseSplash() {
} }
/** Lowers the splash screen one window down, so it's possible to make it not to hide tip windows or other startup stuff. */ /** Lowers the splash screen one window down, so it's possible to make it not to hide tip windows or other startup stuff. */
void KStartupLogo::lowerSplash() { void TDEStartupLogo::lowerSplash() {
if (startupLogo) { if (startupLogo) {
startupLogo->lower(); startupLogo->lower();
} }

6
bibletime/frontend/kstartuplogo.h
Unescape View File

@ -22,7 +22,7 @@ class TQLabel;
* *
* @author The team of BibleTime * @author The team of BibleTime
*/ */
class KStartupLogo : public TQWidget { class TDEStartupLogo : public TQWidget {
public: public:
/** /**
* Create the splash screen and show it on the screen. * Create the splash screen and show it on the screen.
@ -56,11 +56,11 @@ public:
static void lowerSplash(); static void lowerSplash();
private: private:
KStartupLogo(); TDEStartupLogo();
void setText(const TQString text); void setText(const TQString text);
TQLabel* textLabel; TQLabel* textLabel;
static KStartupLogo* startupLogo; static TDEStartupLogo* startupLogo;
}; };
#endif #endif

14
bibletime/main.cpp
Unescape View File

@ -262,9 +262,9 @@ int main(int argc, char* argv[]) {
const bool showIt = CBTConfig::get(CBTConfig::logo); const bool showIt = CBTConfig::get(CBTConfig::logo);
if(showIt) { if(showIt) {
KStartupLogo::createSplash(); TDEStartupLogo::createSplash();
KStartupLogo::showSplash(); TDEStartupLogo::showSplash();
KStartupLogo::setStatusMessage( i18n("Starting BibleTime") + TQString("...") ); TDEStartupLogo::setStatusMessage( i18n("Starting BibleTime") + TQString("...") );
} }
setSignalHandler(signalHandler); setSignalHandler(signalHandler);
@ -282,7 +282,7 @@ int main(int argc, char* argv[]) {
// a new BibleTime version was installed (maybe a completely new installation) // a new BibleTime version was installed (maybe a completely new installation)
if (CBTConfig::get(CBTConfig::bibletimeVersion) != VERSION) { if (CBTConfig::get(CBTConfig::bibletimeVersion) != VERSION) {
KStartupLogo::hideSplash(); TDEStartupLogo::hideSplash();
CBTConfig::set(CBTConfig::bibletimeVersion, VERSION); CBTConfig::set(CBTConfig::bibletimeVersion, VERSION);
bibletime_ptr->slotSettingsOptions(); bibletime_ptr->slotSettingsOptions();
@ -290,7 +290,7 @@ int main(int argc, char* argv[]) {
//The tip of the day //The tip of the day
if (CBTConfig::get(CBTConfig::tips)) { if (CBTConfig::get(CBTConfig::tips)) {
KStartupLogo::hideSplash(); TDEStartupLogo::hideSplash();
bibletime_ptr->slotHelpTipOfDay(); bibletime_ptr->slotHelpTipOfDay();
} }
@ -300,8 +300,8 @@ int main(int argc, char* argv[]) {
bibletime_ptr->processCommandline(); //must be done after the bibletime window is visible bibletime_ptr->processCommandline(); //must be done after the bibletime window is visible
if (showIt) { if (showIt) {
KStartupLogo::hideSplash(); TDEStartupLogo::hideSplash();
KStartupLogo::deleteSplash(); TDEStartupLogo::deleteSplash();
} }
} }

Write Preview
Loading…
Cancel
Save