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 12 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.
*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.
*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("")
1999-09-19 Joachim Ansorg <Jockel123@gmx.de>
@ -931,7 +931,7 @@
1999-09-12 Joachim Ansorg <Jockel123@gmx.de>
*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>
*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*/
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->setChildrenCollapsible(false);
@ -101,7 +101,7 @@ void BibleTime::initView() {
/** Initializes the action objects of the GUI */
void BibleTime::initActions() {
KStartupLogo::setStatusMessage(i18n("Initializing menu- and toolbars") + TQString("..."));
TDEStartupLogo::setStatusMessage(i18n("Initializing menu- and toolbars") + TQString("..."));
KAction* action = 0;
action = KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT( quit() ), actionCollection());
@ -518,7 +518,7 @@ void BibleTime::initConnections() {
/** Initializes the backend */
void BibleTime::initBackends() {
KStartupLogo::setStatusMessage(i18n("Initializing Sword") + TQString("..."));
TDEStartupLogo::setStatusMessage(i18n("Initializing Sword") + TQString("..."));
StringMgr::setSystemStringMgr( new BTStringMgr() );
SWLog::getSystemLog()->setLogLevel(1);
@ -540,7 +540,7 @@ void BibleTime::initBackends() {
switch (errorCode) {
case CSwordBackend::NoSwordConfig: //mods.d or mods.conf missing
{
KStartupLogo::hideSplash();
TDEStartupLogo::hideSplash();
BookshelfManager::CSwordSetupDialog dlg;
dlg.showPart( BookshelfManager::CSwordSetupDialog::Sword );
dlg.exec();
@ -549,7 +549,7 @@ void BibleTime::initBackends() {
case CSwordBackend::NoModules: //no modules installed, but config exists
{
KStartupLogo::hideSplash();
TDEStartupLogo::hideSplash();
BookshelfManager::CSwordSetupDialog dlg;
dlg.showPart( BookshelfManager::CSwordSetupDialog::Install );
dlg.exec();
@ -558,7 +558,7 @@ void BibleTime::initBackends() {
default: //unknown error
{
KStartupLogo::hideSplash();
TDEStartupLogo::hideSplash();
BookshelfManager::CSwordSetupDialog dlg;
dlg.showPart( BookshelfManager::CSwordSetupDialog::Sword );
dlg.exec();
@ -567,7 +567,7 @@ void BibleTime::initBackends() {
}
}
KStartupLogo::setStatusMessage(i18n("Checking indices") + TQString("..."));
TDEStartupLogo::setStatusMessage(i18n("Checking indices") + TQString("..."));
//This function will
// - delete all orphaned indexes (no module present) if autoDeleteOrphanedIndices is true
// - delete all indices of modules where hasIndex() returns false

26
bibletime/frontend/kstartuplogo.cpp
Unescape View File

@ -24,38 +24,38 @@
//#include <kimageio.h>
//static objects
KStartupLogo* KStartupLogo::startupLogo = 0;
TDEStartupLogo* TDEStartupLogo::startupLogo = 0;
void KStartupLogo::createSplash() {
void TDEStartupLogo::createSplash() {
deleteSplash();
startupLogo = new KStartupLogo();
startupLogo = new TDEStartupLogo();
}
void KStartupLogo::showSplash() {
if (KStartupLogo::startupLogo) {
KStartupLogo::startupLogo->show();
void TDEStartupLogo::showSplash() {
if (TDEStartupLogo::startupLogo) {
TDEStartupLogo::startupLogo->show();
}
}
void KStartupLogo::hideSplash() {
void TDEStartupLogo::hideSplash() {
if (startupLogo) {
startupLogo->hide();
}
}
void KStartupLogo::deleteSplash() {
void TDEStartupLogo::deleteSplash() {
delete startupLogo;
startupLogo = 0;
}
void KStartupLogo::setStatusMessage(const TQString& message) {
void TDEStartupLogo::setStatusMessage(const TQString& message) {
if (startupLogo) {
startupLogo->setText(message);
}
}
KStartupLogo::KStartupLogo()
TDEStartupLogo::TDEStartupLogo()
: TQWidget(0, "startuplogo", /*WStyle_Customize | WStyle_NoBorder*/ WStyle_NoBorder|WStyle_StaysOnTop|WX11BypassWM ) {
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
textLabel->setText( TQString::fromLatin1(" %1").arg(text) );
TDEApplication::kApplication()->processEvents();
}
/** Makes the splashscreen the toplevel window. */
void KStartupLogo::raiseSplash() {
void TDEStartupLogo::raiseSplash() {
if (startupLogo) {
startupLogo->raise();
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. */
void KStartupLogo::lowerSplash() {
void TDEStartupLogo::lowerSplash() {
if (startupLogo) {
startupLogo->lower();
}

6
bibletime/frontend/kstartuplogo.h
Unescape View File

@ -22,7 +22,7 @@ class TQLabel;
*
* @author The team of BibleTime
*/
class KStartupLogo : public TQWidget {
class TDEStartupLogo : public TQWidget {
public:
/**
* Create the splash screen and show it on the screen.
@ -56,11 +56,11 @@ public:
static void lowerSplash();
private:
KStartupLogo();
TDEStartupLogo();
void setText(const TQString text);
TQLabel* textLabel;
static KStartupLogo* startupLogo;
static TDEStartupLogo* startupLogo;
};
#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);
if(showIt) {
KStartupLogo::createSplash();
KStartupLogo::showSplash();
KStartupLogo::setStatusMessage( i18n("Starting BibleTime") + TQString("...") );
TDEStartupLogo::createSplash();
TDEStartupLogo::showSplash();
TDEStartupLogo::setStatusMessage( i18n("Starting BibleTime") + TQString("...") );
}
setSignalHandler(signalHandler);
@ -282,7 +282,7 @@ int main(int argc, char* argv[]) {
// a new BibleTime version was installed (maybe a completely new installation)
if (CBTConfig::get(CBTConfig::bibletimeVersion) != VERSION) {
KStartupLogo::hideSplash();
TDEStartupLogo::hideSplash();
CBTConfig::set(CBTConfig::bibletimeVersion, VERSION);
bibletime_ptr->slotSettingsOptions();
@ -290,7 +290,7 @@ int main(int argc, char* argv[]) {
//The tip of the day
if (CBTConfig::get(CBTConfig::tips)) {
KStartupLogo::hideSplash();
TDEStartupLogo::hideSplash();
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
if (showIt) {
KStartupLogo::hideSplash();
KStartupLogo::deleteSplash();
TDEStartupLogo::hideSplash();
TDEStartupLogo::deleteSplash();
}
}

Write Preview
Loading…
Cancel
Save