Rename a number of classes to enhance compatibility with KDE4

r14.0.x
Timothy Pearson 11 years ago
parent c908e40b49
commit 9791ea5701

@ -423,7 +423,7 @@
2003-01-18 Joachim Ansorg <junkmail@joachim.ansorgs.de>
* Removed install instructions from CResMgr and the actions XML file
* Fixed missing insertion of KAction objects into our KAccel object
* Fixed missing insertion of TDEAction objects into our TDEAccel object
2003-01-17 Joachim Ansorg <junkmail@joachim.ansorgs.de>
* Removed installation instructions, the webpage and README/INSTALL files are good enough
@ -704,7 +704,7 @@
1999-12-19 Joachim Ansorg <Jockel123@gmx.de>
*Fontmanagementdialog uses now a XFonts list, not the list provided by KDE. This solves the problems on
systems without KFontManager
systems without TDEFontManager
*Added files global.h and global.cpp which should contain global functions
*Fixed some typos in the german translation
@ -850,7 +850,7 @@
*Added some text to the handbook
*Removed the german index.sgml file, because it makes no senss.
We will add this if the english one is ready to translate it into german.
*Cleaned up KListView::addChildItem()
*Cleaned up TDEListView::addChildItem()
*Finished dialog of the link manager, needs implementation of functions to work
1999-10-05 Joachim Ansorg <Jockel123@gmx.de>

@ -56,9 +56,9 @@ using namespace Profile;
BibleTime::BibleTime()
: BibleTimeInterface("BibleTimeInterface"),
#if TDE_VERSION >= 0x030200
KMainWindow(KMainWindow::NoDCOPObject, 0,0, WType_TopLevel),
TDEMainWindow(TDEMainWindow::NoDCOPObject, 0,0, WType_TopLevel),
#else
KMainWindow(0,0, WType_TopLevel),
TDEMainWindow(0,0, WType_TopLevel),
#endif
m_windowActionCollection(0),
m_initialized(false),
@ -277,12 +277,12 @@ void BibleTime::restoreWorkspace() {
/** Sets the caption of the mainwindow */
void BibleTime::setCaption( const TQString& ) {
KMainWindow::setPlainCaption( TDEApplication::kApplication()->makeStdCaption( m_mdi->currentApplicationCaption() ) );
TDEMainWindow::setPlainCaption( TDEApplication::kApplication()->makeStdCaption( m_mdi->currentApplicationCaption() ) );
}
/** Sets the plain caption of the main window */
void BibleTime::setPlainCaption( const TQString& ) {
KMainWindow::setPlainCaption( TDEApplication::kApplication()->makeStdCaption( m_mdi->currentApplicationCaption() ) );
TDEMainWindow::setPlainCaption( TDEApplication::kApplication()->makeStdCaption( m_mdi->currentApplicationCaption() ) );
}
/** Processes the commandline options given to BibleTime. */
@ -323,7 +323,7 @@ void BibleTime::processCommandline() {
void BibleTime::polish() {
m_initialized = true;
KMainWindow::polish();
TDEMainWindow::polish();
applyMainWindowSettings(CBTConfig::getConfig(), TQString::fromLatin1("MainWindow"));
}

@ -36,12 +36,12 @@ namespace InfoDisplay {
}
//KDE classes
class KToggleAction;
class KAccel;
class KPopupMenu;
class KAction;
class KActionMenu;
class KActionCollection;
class TDEToggleAction;
class TDEAccel;
class TDEPopupMenu;
class TDEAction;
class TDEActionMenu;
class TDEActionCollection;
//QT classes
class TQPopupMenu;
@ -125,14 +125,14 @@ class TQSplitter;
/** BibleTime's main class.
* The main class of BibleTime. Here are the main widgets created.
*
* This is the main class of BibleTime! This class creates the GUI, the KAction objects
* This is the main class of BibleTime! This class creates the GUI, the TDEAction objects
* and connects to some slots. Please insert the creation of actions in initActions,
* the creation of widgets into initView and the connect(...) calls into initConnections.
* Reading from a config file on creation time should go into readSettings(), saving into
* saveSettings().
* This is the general way of all BibleTime classes.
*/
class BibleTime : public KMainWindow, virtual public BibleTimeInterface {
class BibleTime : public TDEMainWindow, virtual public BibleTimeInterface {
friend class CMDIArea;
Q_OBJECT
@ -267,7 +267,7 @@ protected slots:
* This slot is connected with the windowAutoCascade_action object
*/
void slotAutoCascade();
void slotUpdateWindowArrangementActions( KAction* );
void slotUpdateWindowArrangementActions( TDEAction* );
void slotCascade();
void slotTileVertical();
@ -352,30 +352,30 @@ private:
TQPopupMenu* m_editMenu;
/** VIEW menu actions */
KToggleAction* m_viewToolbar_action;
KToggleAction* m_viewMainIndex_action;
KToggleAction* m_viewInfoDisplay_action;
TDEToggleAction* m_viewToolbar_action;
TDEToggleAction* m_viewMainIndex_action;
TDEToggleAction* m_viewInfoDisplay_action;
/** WINDOW menu actions */
KAction* m_windowCascade_action;
KAction* m_windowTileHorizontal_action;
KAction* m_windowTileVertical_action;
KActionMenu* m_windowArrangementMode_action;
KToggleAction* m_windowManualMode_action;
KToggleAction* m_windowAutoCascade_action;
KToggleAction* m_windowAutoTileVertical_action;
KToggleAction* m_windowAutoTileHorizontal_action;
KAction* m_windowCloseAll_action;
KActionCollection* m_windowActionCollection;
KActionMenu* m_windowSaveProfile_action;
KAction* m_windowSaveToNewProfile_action;
KActionMenu* m_windowLoadProfile_action;
KActionMenu* m_windowDeleteProfile_action;
KToggleAction* m_windowFullscreen_action;
TQPtrList<KAction> m_windowOpenWindowsList;
TDEAction* m_windowCascade_action;
TDEAction* m_windowTileHorizontal_action;
TDEAction* m_windowTileVertical_action;
TDEActionMenu* m_windowArrangementMode_action;
TDEToggleAction* m_windowManualMode_action;
TDEToggleAction* m_windowAutoCascade_action;
TDEToggleAction* m_windowAutoTileVertical_action;
TDEToggleAction* m_windowAutoTileHorizontal_action;
TDEAction* m_windowCloseAll_action;
TDEActionCollection* m_windowActionCollection;
TDEActionMenu* m_windowSaveProfile_action;
TDEAction* m_windowSaveToNewProfile_action;
TDEActionMenu* m_windowLoadProfile_action;
TDEActionMenu* m_windowDeleteProfile_action;
TDEToggleAction* m_windowFullscreen_action;
TQPtrList<TDEAction> m_windowOpenWindowsList;
KHelpMenu* m_helpMenu;

@ -102,7 +102,7 @@ void BibleTime::initView() {
/** Initializes the action objects of the GUI */
void BibleTime::initActions() {
TDEStartupLogo::setStatusMessage(i18n("Initializing menu- and toolbars") + TQString("..."));
KAction* action = 0;
TDEAction* action = 0;
action = KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT( quit() ), actionCollection());
action->setToolTip( CResMgr::mainMenu::file::quit::tooltip );
@ -112,7 +112,7 @@ void BibleTime::initActions() {
action->plugAccel( accel() );
#endif
action = new KAction(i18n("Search in &open work(s)"),
action = new TDEAction(i18n("Search in &open work(s)"),
CResMgr::mainMenu::mainIndex::search::icon,
CResMgr::mainMenu::mainIndex::search::accel,
TQT_TQOBJECT(this), TQT_SLOT(slotSearchModules()), actionCollection(),
@ -125,7 +125,7 @@ void BibleTime::initActions() {
action->plugAccel( accel() );
#endif
action = new KAction(i18n("Search in standard &Bible"),
action = new TDEAction(i18n("Search in standard &Bible"),
CResMgr::mainMenu::mainIndex::searchdefaultbible::icon,
CResMgr::mainMenu::mainIndex::searchdefaultbible::accel,
TQT_TQOBJECT(this), TQT_SLOT(slotSearchDefaultBible()), actionCollection(),
@ -147,7 +147,7 @@ void BibleTime::initActions() {
#endif
m_viewMainIndex_action = new KToggleAction(i18n("&Show bookshelf"),
m_viewMainIndex_action = new TDEToggleAction(i18n("&Show bookshelf"),
CResMgr::mainMenu::view::showMainIndex::icon,
CResMgr::mainMenu::view::showMainIndex::accel,
TQT_TQOBJECT(this), TQT_SLOT(slotToggleMainIndex()), actionCollection(),
@ -159,7 +159,7 @@ void BibleTime::initActions() {
m_viewMainIndex_action->plugAccel( accel() );
#endif
m_viewInfoDisplay_action = new KToggleAction(i18n("Show &mag"),
m_viewInfoDisplay_action = new TDEToggleAction(i18n("Show &mag"),
CResMgr::mainMenu::view::showInfoDisplay::icon,
CResMgr::mainMenu::view::showInfoDisplay::accel,
TQT_TQOBJECT(this), TQT_SLOT(slotToggleInfoDisplay()), actionCollection(),
@ -179,7 +179,7 @@ void BibleTime::initActions() {
action->plugAccel( accel() );
#endif
action = new KAction(i18n("Bookshelf &Manager"),
action = new TDEAction(i18n("Bookshelf &Manager"),
CResMgr::mainMenu::settings::swordSetupDialog::icon,
CResMgr::mainMenu::settings::swordSetupDialog::accel,
TQT_TQOBJECT(this), TQT_SLOT( slotSwordSetupDialog() ), actionCollection(),
@ -205,13 +205,13 @@ void BibleTime::initActions() {
action->plugAccel( accel() );
#endif
m_windowArrangementMode_action = new KActionMenu(i18n("&Arrangement mode"),
m_windowArrangementMode_action = new TDEActionMenu(i18n("&Arrangement mode"),
CResMgr::mainMenu::window::arrangementMode::icon,
actionCollection(),
CResMgr::mainMenu::window::arrangementMode::actionName);
m_windowArrangementMode_action->setDelayed( false );
m_windowManualMode_action = new KToggleAction(i18n("&Manual mode"),
m_windowManualMode_action = new TDEToggleAction(i18n("&Manual mode"),
CResMgr::mainMenu::window::arrangementMode::manual::icon,
CResMgr::mainMenu::window::arrangementMode::manual::accel,
TQT_TQOBJECT(this), TQT_SLOT(slotManualArrangementMode()), actionCollection(),
@ -228,7 +228,7 @@ void BibleTime::initActions() {
m_windowArrangementMode_action->insert( m_windowManualMode_action );
m_windowAutoTileVertical_action = new KToggleAction(i18n("Auto-tile &vertically"),
m_windowAutoTileVertical_action = new TDEToggleAction(i18n("Auto-tile &vertically"),
CResMgr::mainMenu::window::arrangementMode::autoTileVertical::icon,
CResMgr::mainMenu::window::arrangementMode::autoTileVertical::accel,
TQT_TQOBJECT(this), TQT_SLOT(slotAutoTileVertical()), actionCollection(),
@ -245,7 +245,7 @@ void BibleTime::initActions() {
m_windowArrangementMode_action->insert( m_windowAutoTileVertical_action );
m_windowAutoTileHorizontal_action = new KToggleAction(i18n("Auto-tile &horizontally"),
m_windowAutoTileHorizontal_action = new TDEToggleAction(i18n("Auto-tile &horizontally"),
CResMgr::mainMenu::window::arrangementMode::autoTileHorizontal::icon,
CResMgr::mainMenu::window::arrangementMode::autoTileHorizontal::accel,
TQT_TQOBJECT(this), TQT_SLOT(slotAutoTileHorizontal()), actionCollection(),
@ -262,7 +262,7 @@ void BibleTime::initActions() {
m_windowArrangementMode_action->insert( m_windowAutoTileHorizontal_action );
m_windowAutoCascade_action = new KToggleAction(i18n("Auto-&cascade"),
m_windowAutoCascade_action = new TDEToggleAction(i18n("Auto-&cascade"),
CResMgr::mainMenu::window::arrangementMode::autoCascade::icon,
CResMgr::mainMenu::window::arrangementMode::autoCascade::accel,
TQT_TQOBJECT(this), TQT_SLOT(slotAutoCascade()), actionCollection(),
@ -278,7 +278,7 @@ void BibleTime::initActions() {
m_windowArrangementMode_action->insert( m_windowAutoCascade_action );
m_windowCascade_action = new KAction(i18n("&Cascade"),
m_windowCascade_action = new TDEAction(i18n("&Cascade"),
CResMgr::mainMenu::window::cascade::icon,
CResMgr::mainMenu::window::cascade::accel,
TQT_TQOBJECT(this), TQT_SLOT(slotCascade()), actionCollection(),
@ -292,7 +292,7 @@ void BibleTime::initActions() {
#endif
m_windowTileVertical_action = new KAction(i18n("Tile &vertically"),
m_windowTileVertical_action = new TDEAction(i18n("Tile &vertically"),
CResMgr::mainMenu::window::tileVertical::icon,
CResMgr::mainMenu::window::tileVertical::accel,
TQT_TQOBJECT(this), TQT_SLOT(slotTileVertical()), actionCollection(),
@ -304,7 +304,7 @@ void BibleTime::initActions() {
m_windowTileVertical_action->plugAccel( accel() );
#endif
m_windowTileHorizontal_action = new KAction(i18n("Tile &horizontally"),
m_windowTileHorizontal_action = new TDEAction(i18n("Tile &horizontally"),
CResMgr::mainMenu::window::tileHorizontal::icon,
CResMgr::mainMenu::window::tileHorizontal::accel,
TQT_TQOBJECT(this), TQT_SLOT(slotTileHorizontal()), actionCollection(),
@ -318,7 +318,7 @@ void BibleTime::initActions() {
#endif
m_windowCloseAll_action = new KAction(i18n("Cl&ose all"),
m_windowCloseAll_action = new TDEAction(i18n("Cl&ose all"),
CResMgr::mainMenu::window::closeAll::icon,
CResMgr::mainMenu::window::closeAll::accel,
TQT_TQOBJECT(m_mdi), TQT_SLOT(deleteAll()), actionCollection(),
@ -331,7 +331,7 @@ void BibleTime::initActions() {
#endif
m_windowSaveProfile_action = new KActionMenu(i18n("&Save session"),
m_windowSaveProfile_action = new TDEActionMenu(i18n("&Save session"),
CResMgr::mainMenu::window::saveProfile::icon,
actionCollection(),
CResMgr::mainMenu::window::saveProfile::actionName
@ -344,7 +344,7 @@ void BibleTime::initActions() {
#endif
m_windowSaveToNewProfile_action = new KAction(i18n("Save as &new session"),
m_windowSaveToNewProfile_action = new TDEAction(i18n("Save as &new session"),
CResMgr::mainMenu::window::saveToNewProfile::icon,
CResMgr::mainMenu::window::saveToNewProfile::accel,
TQT_TQOBJECT(this), TQT_SLOT(saveToNewProfile()), actionCollection(),
@ -357,7 +357,7 @@ void BibleTime::initActions() {
#endif
m_windowLoadProfile_action = new KActionMenu(i18n("&Load session"),
m_windowLoadProfile_action = new TDEActionMenu(i18n("&Load session"),
CResMgr::mainMenu::window::loadProfile::icon,
actionCollection(),
CResMgr::mainMenu::window::loadProfile::actionName
@ -369,7 +369,7 @@ void BibleTime::initActions() {
m_windowLoadProfile_action->plugAccel( accel() );
#endif
m_windowDeleteProfile_action = new KActionMenu(i18n("&Delete session"),
m_windowDeleteProfile_action = new TDEActionMenu(i18n("&Delete session"),
CResMgr::mainMenu::window::deleteProfile::icon,
actionCollection(),
CResMgr::mainMenu::window::deleteProfile::actionName
@ -381,7 +381,7 @@ void BibleTime::initActions() {
m_windowDeleteProfile_action->plugAccel( accel() );
#endif
m_windowFullscreen_action = new KToggleAction(i18n("&Fullscreen mode"),
m_windowFullscreen_action = new TDEToggleAction(i18n("&Fullscreen mode"),
CResMgr::mainMenu::window::showFullscreen::icon,
CResMgr::mainMenu::window::showFullscreen::accel,
TQT_TQOBJECT(this), TQT_SLOT(toggleFullscreen()), actionCollection(),
@ -395,9 +395,9 @@ void BibleTime::initActions() {
#endif
//connect the profile popups to the right slots
KPopupMenu* loadPopup = m_windowLoadProfile_action->popupMenu();
KPopupMenu* savePopup = m_windowSaveProfile_action->popupMenu();
KPopupMenu* deletePopup = m_windowDeleteProfile_action->popupMenu();
TDEPopupMenu* loadPopup = m_windowLoadProfile_action->popupMenu();
TDEPopupMenu* savePopup = m_windowSaveProfile_action->popupMenu();
TDEPopupMenu* deletePopup = m_windowDeleteProfile_action->popupMenu();
connect(loadPopup, TQT_SIGNAL(activated(int)), TQT_SLOT(loadProfile(int)));
connect(savePopup, TQT_SIGNAL(activated(int)), TQT_SLOT(saveProfile(int)));
@ -410,7 +410,7 @@ void BibleTime::initActions() {
(actionCollection()->action(KStdAction::stdName(KStdAction::HelpContents)) );
}
action = new KAction(i18n("&Handbook"),
action = new TDEAction(i18n("&Handbook"),
CResMgr::mainMenu::help::handbook::icon,
CResMgr::mainMenu::help::handbook::accel,
TQT_TQOBJECT(this), TQT_SLOT(openOnlineHelp_Handbook()), actionCollection(),
@ -423,7 +423,7 @@ void BibleTime::initActions() {
action->plugAccel( accel() );
#endif
action = new KAction(i18n("&Bible Study Howto"),
action = new TDEAction(i18n("&Bible Study Howto"),
CResMgr::mainMenu::help::bibleStudyHowTo::icon,
CResMgr::mainMenu::help::bibleStudyHowTo::accel,
TQT_TQOBJECT(this), TQT_SLOT(openOnlineHelp_Howto()), actionCollection(),
@ -437,7 +437,7 @@ void BibleTime::initActions() {
#endif
if ( actionCollection()->action( KStdAction::stdName( KStdAction::WhatsThis ) ) ) { //delete "What's this" action if KDE created it already
KAction* action = actionCollection()->action(KStdAction::stdName( KStdAction::WhatsThis ));
TDEAction* action = actionCollection()->action(KStdAction::stdName( KStdAction::WhatsThis ));
actionCollection()->remove
( action );
}
@ -454,7 +454,7 @@ void BibleTime::initActions() {
action->plugAccel( accel() );
#endif
action = new KAction(i18n("&Daily tip"),
action = new TDEAction(i18n("&Daily tip"),
CResMgr::mainMenu::help::dailyTip::icon,
CResMgr::mainMenu::help::dailyTip::accel,
TQT_TQOBJECT(this), TQT_SLOT(slotHelpTipOfDay()), actionCollection(),
@ -586,11 +586,11 @@ void BibleTime::applyProfileSettings( CProfile* p ) {
//first Main Window state
m_windowFullscreen_action->setChecked( p->fullscreen() ); //set the fullscreen button state
toggleFullscreen(); //either showFullscreen or showNormal
if (p->maximized()) KMainWindow::showMaximized(); //if maximized, then also call showMaximized
if (p->maximized()) TDEMainWindow::showMaximized(); //if maximized, then also call showMaximized
//Then Main Window geometry
KMainWindow::resize( p->geometry().size() ); //Don't use KMainWindowInterface::resize
KMainWindow::move( p->geometry().topLeft() );//Don't use KMainWindowInterface::move
TDEMainWindow::resize( p->geometry().size() ); //Don't use TDEMainWindowInterface::resize
TDEMainWindow::move( p->geometry().topLeft() );//Don't use TDEMainWindowInterface::move
}
}
@ -600,7 +600,7 @@ void BibleTime::storeProfileSettings( CProfile* p ) {
if (!p || !m_windowFullscreen_action) return;
p->setFullscreen( m_windowFullscreen_action->isChecked() );
p->setMaximized( this->KMainWindow::isMaximized() );
p->setMaximized( this->TDEMainWindow::isMaximized() );
TQRect geometry;
geometry.setTopLeft(pos());

@ -66,10 +66,10 @@ using namespace Profile;
/* An action which stores a user defined pointer to a widget.
* @author Joachim Ansorg
*/
class KUserDataAction : public KToggleAction {
class KUserDataAction : public TDEToggleAction {
public:
KUserDataAction( TQString caption, const KShortcut& shortcut, const TQObject* receiver, const char* slot, KActionCollection* actionCollection)
: KToggleAction(caption, shortcut, receiver, slot, actionCollection), m_userData(0) { /* no impl */
KUserDataAction( TQString caption, const TDEShortcut& shortcut, const TQObject* receiver, const char* slot, TDEActionCollection* actionCollection)
: TDEToggleAction(caption, shortcut, receiver, slot, actionCollection), m_userData(0) { /* no impl */
};
void setUserData(TQWidget* const data) {
@ -171,15 +171,15 @@ void BibleTime::slotWindowMenuAboutToShow() {
m_windowCloseAll_action->setEnabled( true );
}
TQPtrList<KAction>::iterator end = m_windowOpenWindowsList.end();
for (TQPtrList<KAction>::iterator it = m_windowOpenWindowsList.begin(); it != end; ++it ) {
TQPtrList<TDEAction>::iterator end = m_windowOpenWindowsList.end();
for (TQPtrList<TDEAction>::iterator it = m_windowOpenWindowsList.begin(); it != end; ++it ) {
(*it)->unplugAll();
}
m_windowOpenWindowsList.setAutoDelete(true);
m_windowOpenWindowsList.clear();
if (!m_windowActionCollection) {
m_windowActionCollection = new KActionCollection(this);
m_windowActionCollection = new TDEActionCollection(this);
}
TQWidgetList windows = m_mdi->windowList();
@ -188,7 +188,7 @@ void BibleTime::slotWindowMenuAboutToShow() {
TQWidget* w = windows.at(i);
Q_ASSERT(w);
KUserDataAction* action = new KUserDataAction(w->caption(), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotWindowMenuActivated()), m_windowActionCollection);
KUserDataAction* action = new KUserDataAction(w->caption(), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotWindowMenuActivated()), m_windowActionCollection);
Q_ASSERT(action);
action->setUserData(w);
@ -199,7 +199,7 @@ void BibleTime::slotWindowMenuAboutToShow() {
}
/** This slot is connected with the windowAutoTile_action object */
void BibleTime::slotUpdateWindowArrangementActions( KAction* clickedAction ) {
void BibleTime::slotUpdateWindowArrangementActions( TDEAction* clickedAction ) {
/* If a toggle action was clicked we see if it checked ot unchecked and
* enable/disable the simple cascade and tile options accordingly
*/
@ -396,7 +396,7 @@ void BibleTime::openOnlineHelp_Howto() {
void BibleTime::saveProfile(int ID) {
m_mdi->setUpdatesEnabled(false);
KPopupMenu* popup = m_windowSaveProfile_action->popupMenu();
TDEPopupMenu* popup = m_windowSaveProfile_action->popupMenu();
const TQString profileName = popup->text(ID).remove("&");
CProfile* p = m_profileMgr.profile( profileName );
Q_ASSERT(p);
@ -435,8 +435,8 @@ void BibleTime::saveProfile(CProfile* profile) {
}
void BibleTime::loadProfile(int ID) {
KPopupMenu* popup = m_windowLoadProfile_action->popupMenu();
//HACK: workaround the inserted & char by KPopupMenu
TDEPopupMenu* popup = m_windowLoadProfile_action->popupMenu();
//HACK: workaround the inserted & char by TDEPopupMenu
const TQString profileName = popup->text(ID).remove("&");
CProfile* p = m_profileMgr.profile( profileName );
// tqWarning("requesting popup: %s", popup->text(ID).latin1());
@ -505,8 +505,8 @@ void BibleTime::loadProfile(CProfile* p) {
}
void BibleTime::deleteProfile(int ID) {
KPopupMenu* popup = m_windowDeleteProfile_action->popupMenu();
//HACK: work around the inserted & char by KPopupMenu
TDEPopupMenu* popup = m_windowDeleteProfile_action->popupMenu();
//HACK: work around the inserted & char by TDEPopupMenu
const TQString profileName = popup->text(ID).remove("&");
CProfile* p = m_profileMgr.profile( profileName );
Q_ASSERT(p);
@ -536,13 +536,13 @@ void BibleTime::saveToNewProfile() {
/** Slot to refresh the save profile and load profile menus. */
void BibleTime::refreshProfileMenus() {
KPopupMenu* savePopup = m_windowSaveProfile_action->popupMenu();
TDEPopupMenu* savePopup = m_windowSaveProfile_action->popupMenu();
savePopup->clear();
KPopupMenu* loadPopup = m_windowLoadProfile_action->popupMenu();
TDEPopupMenu* loadPopup = m_windowLoadProfile_action->popupMenu();
loadPopup->clear();
KPopupMenu* deletePopup = m_windowDeleteProfile_action->popupMenu();
TDEPopupMenu* deletePopup = m_windowDeleteProfile_action->popupMenu();
deletePopup->clear();
//refresh the load, save and delete profile menus

@ -555,7 +555,7 @@ const CSwordBackend::FilterOptions CBTConfig::getFilterOptionDefaults() {
return options;
}
void CBTConfig::setupAccelSettings(const CBTConfig::keys type, KActionCollection* const actionCollection) {
void CBTConfig::setupAccelSettings(const CBTConfig::keys type, TDEActionCollection* const actionCollection) {
TQString groupName;
switch (type) {
case allWindows : {
@ -596,7 +596,7 @@ void CBTConfig::setupAccelSettings(const CBTConfig::keys type, KActionCollection
actionCollection->readShortcutSettings(groupName, CBTConfig::getConfig());
}
void CBTConfig::saveAccelSettings(const CBTConfig::keys type, KActionCollection* const actionCollection) {
void CBTConfig::saveAccelSettings(const CBTConfig::keys type, TDEActionCollection* const actionCollection) {
TQString groupName;
switch (type) {
case allWindows : {

@ -22,8 +22,8 @@
#include <tqmap.h>
//Forward declarations
class KAccel;
class KActionCollection;
class TDEAccel;
class TDEActionCollection;
class TDEConfig;
/**
@ -162,8 +162,8 @@ public:
static const CSwordBackend::FilterOptions getFilterOptionDefaults();
static const CSwordBackend::DisplayOptions getDisplayOptionDefaults();
static void setupAccelSettings(const CBTConfig::keys type, KActionCollection* const actionCollection);
static void saveAccelSettings(const CBTConfig::keys type, KActionCollection* const actionCollection);
static void setupAccelSettings(const CBTConfig::keys type, TDEActionCollection* const actionCollection);
static void saveAccelSettings(const CBTConfig::keys type, TDEActionCollection* const actionCollection);
static const TQString getModuleEncryptionKey( const TQString& name );
static void setModuleEncryptionKey( const TQString& name, const TQString& key );

@ -22,7 +22,7 @@
#include <tqstrlist.h>
#include <tqevent.h>
class KPopupMenu;
class TDEPopupMenu;
class CSwordModuleInfo;
class CSwordKey;

@ -71,7 +71,7 @@
using std::string;
using std::list;
COptionsDialog::COptionsDialog(TQWidget *parent, const char *name, KActionCollection* actionCollection )
COptionsDialog::COptionsDialog(TQWidget *parent, const char *name, TDEActionCollection* actionCollection )
: KDialogBase(IconList, i18n("Configure BibleTime"), Ok | Cancel | Apply, Ok, parent, name, true, true, TQString(), TQString(), TQString()) {
m_settings.keys.application.actionCollection = actionCollection;
@ -341,7 +341,7 @@ void COptionsDialog::initLanguages() {
layout->addLayout(hLayout);
//#warning TODO: remember the last selected font and jump there.
m_settings.fonts.fontChooser = new KFontChooser(page, "fonts", false, TQStringList(), true, 5);
m_settings.fonts.fontChooser = new TDEFontChooser(page, "fonts", false, TQStringList(), true, 5);
m_settings.fonts.fontChooser->setSampleText(i18n("The quick brown fox jumps over the lazy dog."));
layout->addWidget(m_settings.fonts.fontChooser);
@ -407,7 +407,7 @@ void COptionsDialog::initAccelerators() {
);
// ----- All display windows ------ //
m_settings.keys.general.actionCollection = new KActionCollection(this, "displayActions", 0);
m_settings.keys.general.actionCollection = new TDEActionCollection(this, "displayActions", 0);
CDisplayWindow::insertKeyboardActions( m_settings.keys.general.actionCollection);
CBTConfig::setupAccelSettings(
CBTConfig::allWindows,
@ -419,7 +419,7 @@ void COptionsDialog::initAccelerators() {
);
// ----- Bible windows ------ //
m_settings.keys.bible.actionCollection = new KActionCollection(this, "bibleActions", 0);
m_settings.keys.bible.actionCollection = new TDEActionCollection(this, "bibleActions", 0);
CBibleReadWindow::insertKeyboardActions( m_settings.keys.bible.actionCollection);
CBTConfig::setupAccelSettings(
CBTConfig::bibleWindow,
@ -427,7 +427,7 @@ void COptionsDialog::initAccelerators() {
);
// ----- Commentary windows ------ //
m_settings.keys.commentary.actionCollection= new KActionCollection(this, "commentaryActions", 0);
m_settings.keys.commentary.actionCollection= new TDEActionCollection(this, "commentaryActions", 0);
CCommentaryReadWindow::insertKeyboardActions( m_settings.keys.commentary.actionCollection);
CBTConfig::setupAccelSettings(
CBTConfig::commentaryWindow,
@ -435,7 +435,7 @@ void COptionsDialog::initAccelerators() {
);
// ----- Lexicon windows ------ //
m_settings.keys.lexicon.actionCollection = new KActionCollection(this, "lexiconActions", 0);
m_settings.keys.lexicon.actionCollection = new TDEActionCollection(this, "lexiconActions", 0);
CLexiconReadWindow::insertKeyboardActions( m_settings.keys.lexicon.actionCollection );
CBTConfig::setupAccelSettings(
CBTConfig::lexiconWindow,
@ -443,7 +443,7 @@ void COptionsDialog::initAccelerators() {
);
// ----- Book windows ------ //
m_settings.keys.book.actionCollection= new KActionCollection(this, "bookActions", 0);
m_settings.keys.book.actionCollection= new TDEActionCollection(this, "bookActions", 0);
CBookReadWindow::insertKeyboardActions( m_settings.keys.book.actionCollection);
CBTConfig::setupAccelSettings(
CBTConfig::bookWindow,

@ -40,11 +40,11 @@ class TQComboBox;
class TQRadioButton;
class TQWidgetStack;
class KListBox;
class TDEListBox;
class KKeyChooser;
class KTabCtl;
class TDEHTMLPart;
class KActionCollection;
class TDEActionCollection;
/**
* The optionsdialog of BibleTime
@ -55,7 +55,7 @@ class COptionsDialog : public KDialogBase, public CPointers {
public:
COptionsDialog(TQWidget *parent, const char *name, KActionCollection* actionCollection);
COptionsDialog(TQWidget *parent, const char *name, TDEActionCollection* actionCollection);
virtual ~COptionsDialog();
enum Parts {
@ -104,7 +104,7 @@ private:
struct WindowType {
TQGuardedPtr<KKeyChooser> keyChooser;
KActionCollection* actionCollection;
TDEActionCollection* actionCollection;
TQString title;
WindowType() {
@ -136,7 +136,7 @@ private:
struct FontSettings {
TQComboBox* swordLocaleCombo;
KFontChooser* fontChooser;
TDEFontChooser* fontChooser;
TQComboBox* usage;
TQCheckBox* useOwnFontBox;
//the pair os to check whether the standard font (bool == false) or whether an own font should be used (true)

@ -66,7 +66,7 @@ namespace BookshelfManager {
* @author Martin Gruner
*/
CSwordSetupModuleListView::CSwordSetupModuleListView(TQWidget *parent, bool is_remote, sword::InstallSource* installSource)
: KListView(parent), m_is_remote( is_remote ) {
: TDEListView(parent), m_is_remote( is_remote ) {
Q_ASSERT(installSource);
new BookshelfManager::ToolTip(this);
m_backend = installSource ? BTInstallMgr::Tool::backend(installSource) : CPointers::backend();

@ -27,7 +27,7 @@ class CSwordBackend;
namespace BookshelfManager {
class CSwordSetupModuleListView : public KListView {
class CSwordSetupModuleListView : public TDEListView {
Q_OBJECT

@ -129,8 +129,8 @@ void CHTMLWriteDisplay::slotFontChanged( const TQFont& font ) {
m_actions.underline->setChecked( font.underline() );
};
void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions) {
m_actions.fontChooser = new KFontAction( i18n("Choose a font"),
void CHTMLWriteDisplay::setupToolbar(TDEToolBar * bar, TDEActionCollection * actions) {
m_actions.fontChooser = new TDEFontAction( i18n("Choose a font"),
CResMgr::displaywindows::writeWindow::underlinedText::accel,
actions,
CResMgr::displaywindows::writeWindow::fontFamily::actionName
@ -141,7 +141,7 @@ void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions
connect(m_actions.fontChooser, TQT_SIGNAL(activated(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(setFamily(const TQString&)));
m_actions.fontSizeChooser = new KFontSizeAction( i18n("Choose a font size"),
m_actions.fontSizeChooser = new TDEFontSizeAction( i18n("Choose a font size"),
CResMgr::displaywindows::writeWindow::fontSize::accel,
actions,
CResMgr::displaywindows::writeWindow::fontSize::actionName
@ -159,9 +159,9 @@ void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions
(new KActionSeparator())->plug(bar); //seperate font options from formatting buttons
(new TDEActionSeparator())->plug(bar); //seperate font options from formatting buttons
m_actions.bold = new KToggleAction( i18n("Bold"),
m_actions.bold = new TDEToggleAction( i18n("Bold"),
CResMgr::displaywindows::writeWindow::boldText::icon,
CResMgr::displaywindows::writeWindow::boldText::accel,
TQT_TQOBJECT(this), TQT_SLOT(toggleBold()),
@ -172,7 +172,7 @@ void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions
m_actions.bold->plug(bar);
m_actions.italic = new KToggleAction( i18n("Italic"),
m_actions.italic = new TDEToggleAction( i18n("Italic"),
CResMgr::displaywindows::writeWindow::italicText::icon,
CResMgr::displaywindows::writeWindow::italicText::accel,
TQT_TQOBJECT(this), TQT_SLOT(toggleItalic()),
@ -183,7 +183,7 @@ void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions
m_actions.italic->plug(bar);
m_actions.underline = new KToggleAction( i18n("Underline"),
m_actions.underline = new TDEToggleAction( i18n("Underline"),
CResMgr::displaywindows::writeWindow::underlinedText::icon,
CResMgr::displaywindows::writeWindow::underlinedText::accel,
TQT_TQOBJECT(this), TQT_SLOT(toggleUnderline()),
@ -195,9 +195,9 @@ void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions
m_actions.underline->plug(bar);
(new KActionSeparator())->plug(bar); //seperate formatting from alignment buttons
(new TDEActionSeparator())->plug(bar); //seperate formatting from alignment buttons
m_actions.alignLeft = new KToggleAction( i18n("Left"),
m_actions.alignLeft = new TDEToggleAction( i18n("Left"),
CResMgr::displaywindows::writeWindow::alignLeft::icon,
CResMgr::displaywindows::writeWindow::alignLeft::accel,
TQT_TQOBJECT(this), TQT_SLOT( alignLeft() ),
@ -208,7 +208,7 @@ void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions
m_actions.alignLeft->plug(bar);
m_actions.alignCenter = new KToggleAction( i18n("Center"),
m_actions.alignCenter = new TDEToggleAction( i18n("Center"),
CResMgr::displaywindows::writeWindow::alignCenter::icon,
CResMgr::displaywindows::writeWindow::alignCenter::accel,
TQT_TQOBJECT(this), TQT_SLOT(alignCenter()),
@ -219,7 +219,7 @@ void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions
m_actions.alignCenter->plug(bar);
m_actions.alignRight = new KToggleAction( i18n("Right"),
m_actions.alignRight = new TDEToggleAction( i18n("Right"),
CResMgr::displaywindows::writeWindow::alignRight::icon,
CResMgr::displaywindows::writeWindow::alignRight::accel,
TQT_TQOBJECT(this), TQT_SLOT(alignRight()),
@ -230,7 +230,7 @@ void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions
m_actions.alignRight->plug(bar);
// m_actions.alignJustify = new KToggleAction( i18n("Justify"),
// m_actions.alignJustify = new TDEToggleAction( i18n("Justify"),
// CResMgr::displaywindows::writeWindow::alignJustify::icon,
// CResMgr::displaywindows::writeWindow::alignJustify::accel,
// this, TQT_SLOT( alignJustify() ),
@ -255,10 +255,10 @@ void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions
/** Reimplementation to show a popup menu if the right mouse butoon was clicked. */
TQPopupMenu* CHTMLWriteDisplay::createPopupMenu( const TQPoint& /*pos*/ ) {
if (!m_actions.selectAll) {
m_actions.selectAll = new KAction(i18n("Select all"), KShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(selectAll()), TQT_TQOBJECT(this));
m_actions.selectAll = new TDEAction(i18n("Select all"), TDEShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(selectAll()), TQT_TQOBJECT(this));
}
KPopupMenu* popup = new KPopupMenu(this);
TDEPopupMenu* popup = new TDEPopupMenu(this);
popup->insertTitle(i18n("HTML editor window"));
m_actions.selectAll->plug(popup);

@ -23,9 +23,9 @@ class CWriteWindow;
class TQPopupMenu;
class KToggleAction;
class KFontAction;
class KFontSizeAction;
class TDEToggleAction;
class TDEFontAction;
class TDEFontSizeAction;
class KColorButton;
@ -48,7 +48,7 @@ public:
/**
* Creates the necessary action objects and puts them on the toolbar.
*/
virtual void setupToolbar(KToolBar * bar, KActionCollection * actionCollection);
virtual void setupToolbar(TDEToolBar * bar, TDEActionCollection * actionCollection);
protected:
friend class CDisplay;
@ -84,19 +84,19 @@ protected slots:
private:
struct {
KToggleAction* bold;
KToggleAction* italic;
KToggleAction* underline;
TDEToggleAction* bold;
TDEToggleAction* italic;
TDEToggleAction* underline;
KToggleAction* alignLeft;
KToggleAction* alignCenter;
KToggleAction* alignRight;
TDEToggleAction* alignLeft;
TDEToggleAction* alignCenter;
TDEToggleAction* alignRight;
KFontAction* fontChooser;
KFontSizeAction* fontSizeChooser;
TDEFontAction* fontChooser;
TDEFontSizeAction* fontSizeChooser;
//popup menu
KAction* selectAll;
TDEAction* selectAll;
}
m_actions;
KColorButton* m_colorButton;

@ -96,7 +96,7 @@ TQPopupMenu* CPlainWriteDisplay::createPopupMenu( ) {
}
/** Creates the necessary action objects and puts them on the toolbar. */
void CPlainWriteDisplay::setupToolbar(KToolBar* /*bar*/, KActionCollection* /*actionCollection*/) {}
void CPlainWriteDisplay::setupToolbar(TDEToolBar* /*bar*/, TDEActionCollection* /*actionCollection*/) {}
/** Reimplementation to insert the text of a dragged reference into the edit view. */
void CPlainWriteDisplay::contentsDragEnterEvent( TQDragEnterEvent* e ) {

@ -20,7 +20,7 @@
#include <tqtextedit.h>
class CHTMLWriteDisplay;
class KAction;
class TDEAction;
/** The write display implementation for plain source code editing.
* @author The BibleTime team
@ -60,7 +60,7 @@ public:
/**
* Creates the necessary action objects and puts them on the toolbar.
*/
virtual void setupToolbar(KToolBar * bar, KActionCollection * actionCollection);
virtual void setupToolbar(TDEToolBar * bar, TDEActionCollection * actionCollection);
protected:
friend class CDisplay;

@ -14,8 +14,8 @@
#include "cdisplay.h"
class KActionCollection;
class KToolBar;
class TDEActionCollection;
class TDEToolBar;
/**The base class for all read/write-display classes.
*@author The BibleTime team
@ -44,7 +44,7 @@ public: // Public methods
/**
* Creates the necessary action objects and puts them on the toolbar.
*/
virtual void setupToolbar( KToolBar* bar, KActionCollection* actionCollection ) = 0;
virtual void setupToolbar( TDEToolBar* bar, TDEActionCollection* actionCollection ) = 0;
};
#endif

@ -77,50 +77,50 @@ void CBibleReadWindow::storeProfileSettings( CProfileWindow* const settings ) {
/** Reimplementation. */
void CBibleReadWindow::insertKeyboardActions( KActionCollection* const a ) {
new KAction(
void CBibleReadWindow::insertKeyboardActions( TDEActionCollection* const a ) {
new TDEAction(
i18n("Next book"), CResMgr::displaywindows::bibleWindow::nextBook::accel,
a, "nextBook"
);
new KAction(
new TDEAction(
i18n("Previous book"), CResMgr::displaywindows::bibleWindow::previousBook::accel,
a, "previousBook"
);
new KAction(
new TDEAction(
i18n("Next chapter"), CResMgr::displaywindows::bibleWindow::nextChapter::accel,
a, "nextChapter"
);
new KAction(
new TDEAction(
i18n("Previous chapter"), CResMgr::displaywindows::bibleWindow::previousChapter::accel,
a, "previousChapter"
);
new KAction(
new TDEAction(
i18n("Next verse"), CResMgr::displaywindows::bibleWindow::nextVerse::accel,
a, "nextVerse"
);
new KAction(
new TDEAction(
i18n("Previous verse"), CResMgr::displaywindows::bibleWindow::previousVerse::accel,
a, "previousVerse"
);
//popup menu items
// new KAction(i18n("Select all"), KStdAccel::selectAll(), a, "selectAll");
// new TDEAction(i18n("Select all"), TDEStdAccel::selectAll(), a, "selectAll");
//copy menu items
// new KAction(i18n("Copy reference only"), KShortcut(0), a, "copyReferenceOnly");
// new KAction(i18n("Text of reference"), KShortcut(0), a, "copyTextOfReference");
// new KAction(i18n("Reference with text"), KShortcut(0), a, "copyReferenceWithText");
new KAction(i18n("Copy chapter"), KShortcut(0), a, "copyChapter");
// new KAction(i18n("Copy selected text"), KStdAccel::copy(), a, "copySelectedText");
// new TDEAction(i18n("Copy reference only"), TDEShortcut(0), a, "copyReferenceOnly");
// new TDEAction(i18n("Text of reference"), TDEShortcut(0), a, "copyTextOfReference");
// new TDEAction(i18n("Reference with text"), TDEShortcut(0), a, "copyReferenceWithText");
new TDEAction(i18n("Copy chapter"), TDEShortcut(0), a, "copyChapter");
// new TDEAction(i18n("Copy selected text"), TDEStdAccel::copy(), a, "copySelectedText");
//save menu
// new KAction(i18n("Reference with text"), KShortcut(0), a, "saveReferenceWithText");
new KAction(i18n("Save chapter as plain text"), KShortcut(0), a, "saveChapterAsPlainText");
new KAction(i18n("Save chapter as HTML"), KShortcut(0), a, "saveChapterAsHTML");
// new KAction(i18n("Reference with text"), KShortcut(0), a, "saveReferenceWithText");
// new TDEAction(i18n("Reference with text"), TDEShortcut(0), a, "saveReferenceWithText");
new TDEAction(i18n("Save chapter as plain text"), TDEShortcut(0), a, "saveChapterAsPlainText");
new TDEAction(i18n("Save chapter as HTML"), TDEShortcut(0), a, "saveChapterAsHTML");
// new TDEAction(i18n("Reference with text"), TDEShortcut(0), a, "saveReferenceWithText");
//print
new KAction(i18n("Print chapter"), KStdAccel::print(), a, "printChapter");
new TDEAction(i18n("Print chapter"), TDEStdAccel::print(), a, "printChapter");
}
void CBibleReadWindow::initActions() {
@ -130,37 +130,37 @@ void CBibleReadWindow::initActions() {
actionCollection()->action("nextEntry")->setEnabled(false);
actionCollection()->action("previousEntry")->setEnabled(false);
new KAction(
new TDEAction(
i18n("Next book"),
CResMgr::displaywindows::bibleWindow::nextBook::accel,
TQT_TQOBJECT(this), TQT_SLOT(nextBook()),
actionCollection(), "nextBook"
);
new KAction(
new TDEAction(
i18n("Previous book"),
CResMgr::displaywindows::bibleWindow::previousBook::accel,
TQT_TQOBJECT(this), TQT_SLOT(previousBook()),
actionCollection(), "previousBook"
);
new KAction(
new TDEAction(
i18n("Next chapter"),
CResMgr::displaywindows::bibleWindow::nextChapter::accel,
TQT_TQOBJECT(this), TQT_SLOT(nextChapter()),
actionCollection(), "nextChapter"
);
new KAction(
new TDEAction(
i18n("Previous chapter"),
CResMgr::displaywindows::bibleWindow::previousChapter::accel,
TQT_TQOBJECT(this), TQT_SLOT(previousChapter()),
actionCollection(), "previousChapter"
);
new KAction(
new TDEAction(
i18n("Next verse"),
CResMgr::displaywindows::bibleWindow::nextVerse::accel,
TQT_TQOBJECT(this), TQT_SLOT(nextVerse()),
actionCollection(), "nextVerse"
);
new KAction(
new TDEAction(
i18n("Previous verse"),
CResMgr::displaywindows::bibleWindow::previousVerse::accel,
TQT_TQOBJECT(this), TQT_SLOT(previousVerse()),
@ -173,7 +173,7 @@ void CBibleReadWindow::initActions() {
m_actions.findText = actionCollection()->action("findText");
Q_ASSERT(m_actions.findText);
m_actions.findStrongs = new KAction(
m_actions.findStrongs = new TDEAction(
i18n("Strong's Search"),
CResMgr::displaywindows::general::findStrongs::icon,
CResMgr::displaywindows::general::findStrongs::accel,
@ -182,26 +182,26 @@ void CBibleReadWindow::initActions() {
CResMgr::displaywindows::general::findStrongs::actionName);
m_actions.copy.referenceOnly = new KAction(i18n("Reference only"), KShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(copyAnchorOnly()), actionCollection(), "copyReferenceOnly");
m_actions.copy.referenceOnly = new TDEAction(i18n("Reference only"), TDEShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(copyAnchorOnly()), actionCollection(), "copyReferenceOnly");
m_actions.copy.referenceTextOnly = new KAction(i18n("Text of reference"), KShortcut(0),displayWidget()->connectionsProxy(), TQT_SLOT(copyAnchorTextOnly()), actionCollection(), "copyTextOfReference");
m_actions.copy.referenceTextOnly = new TDEAction(i18n("Text of reference"), TDEShortcut(0),displayWidget()->connectionsProxy(), TQT_SLOT(copyAnchorTextOnly()), actionCollection(), "copyTextOfReference");
m_actions.copy.referenceAndText = new KAction(i18n("Reference with text"), KShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(copyAnchorWithText()), actionCollection(), "copyReferenceWithText");
m_actions.copy.referenceAndText = new TDEAction(i18n("Reference with text"), TDEShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(copyAnchorWithText()), actionCollection(), "copyReferenceWithText");
m_actions.copy.chapter = new KAction(i18n("Chapter"), KShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(copyDisplayedText()), actionCollection(), "copyChapter");
m_actions.copy.chapter = new TDEAction(i18n("Chapter"), TDEShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(copyDisplayedText()), actionCollection(), "copyChapter");
m_actions.copy.selectedText = actionCollection()->action("copySelectedText");
Q_ASSERT(m_actions.copy.selectedText);
m_actions.save.referenceAndText = new KAction(i18n("Reference with text"), KShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(saveAnchorWithText()), actionCollection(), "saveReferenceWithText");
m_actions.save.referenceAndText = new TDEAction(i18n("Reference with text"), TDEShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(saveAnchorWithText()), actionCollection(), "saveReferenceWithText");
m_actions.save.chapterAsPlain = new KAction(i18n("Chapter as plain text"), KShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(saveChapterPlain()), actionCollection(), "saveChapterAsPlainText");
m_actions.save.chapterAsPlain = new TDEAction(i18n("Chapter as plain text"), TDEShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(saveChapterPlain()), actionCollection(), "saveChapterAsPlainText");
m_actions.save.chapterAsHTML = new KAction(i18n("Chapter as HTML"), KShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(saveChapterHTML()), actionCollection(), "saveChapterAsHTML");
m_actions.save.chapterAsHTML = new TDEAction(i18n("Chapter as HTML"), TDEShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(saveChapterHTML()), actionCollection(), "saveChapterAsHTML");
m_actions.print.reference = new KAction(i18n("Reference with text"), KShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(printAnchorWithText()), actionCollection(), "saveReferenceWithText");
m_actions.print.reference = new TDEAction(i18n("Reference with text"), TDEShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(printAnchorWithText()), actionCollection(), "saveReferenceWithText");
m_actions.print.chapter = new KAction(i18n("Chapter"), KShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(printAll()), actionCollection(), "printChapter");
m_actions.print.chapter = new TDEAction(i18n("Chapter"), TDEShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(printAll()), actionCollection(), "printChapter");
CBTConfig::setupAccelSettings(CBTConfig::bibleWindow, actionCollection());
}
@ -232,26 +232,26 @@ void CBibleReadWindow::setupPopupMenu() {
m_actions.findStrongs->plug(popup());
m_actions.selectAll->plug(popup());
(new KActionSeparator(TQT_TQOBJECT(this)))->plug( popup() );
(new TDEActionSeparator(TQT_TQOBJECT(this)))->plug( popup() );
m_actions.copyMenu = new KActionMenu(i18n("Copy..."), CResMgr::displaywindows::bibleWindow::copyMenu::icon, TQT_TQOBJECT(popup()));
m_actions.copyMenu = new TDEActionMenu(i18n("Copy..."), CResMgr::displaywindows::bibleWindow::copyMenu::icon, TQT_TQOBJECT(popup()));
m_actions.copyMenu->setDelayed( false );
m_actions.copyMenu->insert(m_actions.copy.referenceOnly);
m_actions.copyMenu->insert(m_actions.copy.referenceTextOnly);
m_actions.copyMenu->insert(m_actions.copy.referenceAndText);
m_actions.copyMenu->insert(m_actions.copy.chapter);
m_actions.copyMenu->insert(new KActionSeparator(TQT_TQOBJECT(this)));
m_actions.copyMenu->insert(new TDEActionSeparator(TQT_TQOBJECT(this)));
m_actions.copyMenu->insert(m_actions.copy.selectedText);
m_actions.copyMenu->plug(popup());
m_actions.saveMenu = new KActionMenu(i18n("Save..."),CResMgr::displaywindows::bibleWindow::saveMenu::icon,TQT_TQOBJECT(popup()));
m_actions.saveMenu = new TDEActionMenu(i18n("Save..."),CResMgr::displaywindows::bibleWindow::saveMenu::icon,TQT_TQOBJECT(popup()));
m_actions.saveMenu->setDelayed( false );
m_actions.saveMenu->insert(m_actions.save.referenceAndText);
m_actions.saveMenu->insert(m_actions.save.chapterAsPlain);
m_actions.saveMenu->insert(m_actions.save.chapterAsHTML);
m_actions.saveMenu->plug(popup());
m_actions.printMenu = new KActionMenu(i18n("Print..."),CResMgr::displaywindows::bibleWindow::printMenu::icon, TQT_TQOBJECT(popup()));
m_actions.printMenu = new TDEActionMenu(i18n("Print..."),CResMgr::displaywindows::bibleWindow::printMenu::icon, TQT_TQOBJECT(popup()));
m_actions.printMenu->setDelayed(false);
m_actions.printMenu->insert(m_actions.print.reference);
m_actions.printMenu->insert(m_actions.print.chapter);

@ -48,7 +48,7 @@ public:
/**
* Reimplementation.
*/
static void insertKeyboardActions( KActionCollection* const a );
static void insertKeyboardActions( TDEActionCollection* const a );
protected:
virtual void initActions();
@ -69,32 +69,32 @@ protected:
virtual bool eventFilter( TQObject* o, TQEvent* e);
struct {
KAction* selectAll;
KAction* findText;
KAction* findStrongs;
TDEAction* selectAll;
TDEAction* findText;
TDEAction* findStrongs;
KActionMenu* copyMenu;
TDEActionMenu* copyMenu;
struct {
KAction* referenceOnly;
KAction* referenceTextOnly;
KAction* referenceAndText;
KAction* chapter;
KAction* selectedText;
TDEAction* referenceOnly;
TDEAction* referenceTextOnly;
TDEAction* referenceAndText;
TDEAction* chapter;
TDEAction* selectedText;
}
copy;
KActionMenu* saveMenu;
TDEActionMenu* saveMenu;
struct {
KAction* referenceAndText;
KAction* chapterAsPlain;
KAction* chapterAsHTML;
TDEAction* referenceAndText;
TDEAction* chapterAsPlain;
TDEAction* chapterAsHTML;
}
save;
KActionMenu* printMenu;
TDEActionMenu* printMenu;
struct {
KAction* reference;
KAction* chapter;
TDEAction* reference;
TDEAction* chapter;
}
print;
}

@ -61,7 +61,7 @@ void CBookReadWindow::initActions() {
actionCollection()->action("nextEntry")->setEnabled(false);
actionCollection()->action("previousEntry")->setEnabled(false);
m_treeAction = new KToggleAction(
m_treeAction = new TDEToggleAction(
i18n("Toggle tree view"),
CResMgr::displaywindows::bookWindow::toggleTree::icon,
CResMgr::displaywindows::bookWindow::toggleTree::accel,
@ -71,20 +71,20 @@ void CBookReadWindow::initActions() {
CBTConfig::setupAccelSettings(CBTConfig::bookWindow, actionCollection());
};
void CBookReadWindow::insertKeyboardActions( KActionCollection* const a ) {
new KToggleAction(
void CBookReadWindow::insertKeyboardActions( TDEActionCollection* const a ) {
new TDEToggleAction(
i18n("Toggle tree view"),
CResMgr::displaywindows::bookWindow::toggleTree::icon,
CResMgr::displaywindows::bookWindow::toggleTree::accel,
a, "toggleTree");
// new KAction(i18n("Copy reference only"), KShortcut(0), a, "copyReferenceOnly");
new KAction(i18n("Copy entry with text"), KShortcut(0), a, "copyEntryWithText");
// new KAction(i18n("Copy selected text"), KShortcut(0), a, "copySelectedText");
new KAction(i18n("Save entry as plain text"), KShortcut(0), a, "saveEntryAsPlainText");
new KAction(i18n("Save entry as HTML"), KShortcut(0), a, "saveEntryAsHTML");
// new KAction(i18n("Print reference only"), KShortcut(0), a, "printReferenceOnly");
new KAction(i18n("Print entry with text"), KShortcut(0), a, "printEntryWithText");
// new TDEAction(i18n("Copy reference only"), TDEShortcut(0), a, "copyReferenceOnly");
new TDEAction(i18n("Copy entry with text"), TDEShortcut(0), a, "copyEntryWithText");
// new TDEAction(i18n("Copy selected text"), TDEShortcut(0), a, "copySelectedText");
new TDEAction(i18n("Save entry as plain text"), TDEShortcut(0), a, "saveEntryAsPlainText");
new TDEAction(i18n("Save entry as HTML"), TDEShortcut(0), a, "saveEntryAsHTML");
// new TDEAction(i18n("Print reference only"), TDEShortcut(0), a, "printReferenceOnly");
new TDEAction(i18n("Print entry with text"), TDEShortcut(0), a, "printEntryWithText");
}
@ -104,7 +104,7 @@ void CBookReadWindow::initConnections() {
void CBookReadWindow::initView() {
TQSplitter* splitter = new TQSplitter(this);
setMainToolBar( new KToolBar(this) );
setMainToolBar( new TDEToolBar(this) );
addDockWindow(mainToolBar());
m_treeChooser = new CBookTreeChooser(modules(), key(), splitter);
@ -116,7 +116,7 @@ void CBookReadWindow::initView() {
moduleChooserBar()->setButtonLimit(1);
addDockWindow( moduleChooserBar() );
setButtonsToolBar( new KToolBar(this) );
setButtonsToolBar( new TDEToolBar(this) );
addDockWindow( buttonsToolBar() );
setDisplaySettingsButton( new CDisplaySettingsButton( &displayOptions(), &filterOptions(), modules(), buttonsToolBar()) );
@ -141,7 +141,7 @@ void CBookReadWindow::initToolbars() {
buttonsToolBar()->insertWidget(2,displaySettingsButton()->size().width(),displaySettingsButton());
KAction* action = actionCollection()->action(
TDEAction* action = actionCollection()->action(
CResMgr::displaywindows::general::search::actionName );
if (action) {
action->plug(buttonsToolBar());

@ -18,7 +18,7 @@
#include "backend/cswordtreekey.h"
#include "backend/cswordversekey.h"
class KToggleAction;
class TDEToggleAction;
class CBookTreeChooser;
/**
@ -28,7 +28,7 @@ class CBookReadWindow : public CLexiconReadWindow {
Q_OBJECT
public:
static void insertKeyboardActions( KActionCollection* const a );
static void insertKeyboardActions( TDEActionCollection* const a );
CBookReadWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name=0);
@ -57,7 +57,7 @@ protected:
virtual void modulesChanged();
private:
KToggleAction* m_treeAction;
TDEToggleAction* m_treeAction;
CBookTreeChooser* m_treeChooser;
private slots: // Private slots

@ -26,11 +26,11 @@
// CTransliterationButton::CTransliterationButton(CSwordBackend::FilterOptions* filterOptions, TQWidget *parent, const char *name )
// : KToolBarButton(CResMgr::displaywindows::transliteration::icon, 0,parent,name) {
// : TDEToolBarButton(CResMgr::displaywindows::transliteration::icon, 0,parent,name) {
// m_filterOptions = filterOptions;
// m_filterOptions->transliteration = 0;
//
// m_popup = new KPopupMenu(this);
// m_popup = new TDEPopupMenu(this);
// setPopup(m_popup);
// setPopupDelay(0001);
//
@ -87,13 +87,13 @@
************************************************/
CDisplaySettingsButton::CDisplaySettingsButton(CSwordBackend::DisplayOptions *displaySettings, CSwordBackend::FilterOptions *moduleSettings, const ListCSwordModuleInfo& useModules,TQWidget *parent, const char *name )
: KToolBarButton(CResMgr::displaywindows::displaySettings::icon, 0, parent, name) {
: TDEToolBarButton(CResMgr::displaywindows::displaySettings::icon, 0, parent, name) {
// tqWarning("CDisplaySettingsButton::CDisplaySettingsButton");
m_displaySettings = displaySettings;
m_moduleSettings = moduleSettings;
m_modules = useModules;
m_popup = new KPopupMenu(this);
m_popup = new TDEPopupMenu(this);
setPopup(m_popup);
setPopupDelay(0001); //Fix, O only opens menu on mouse release or move

@ -22,12 +22,12 @@
//KDE includes
#include <ktoolbarbutton.h>
class KPopupMenu;
class TDEPopupMenu;
/** This class manages the transliteration of the selected modules.
* @author The BibleTime team
*/
// class CTransliterationButton : public KToolBarButton {
// class CTransliterationButton : public TDEToolBarButton {
// Q_OBJECT
//
// public:
@ -46,7 +46,7 @@ class KPopupMenu;
// void optionSelected(int);
//
// private:
// KPopupMenu* m_popup;
// TDEPopupMenu* m_popup;
// CSwordBackend::FilterOptions* m_filterOptions;
//
// signals:
@ -56,7 +56,7 @@ class KPopupMenu;
/** This class manages the display options of the selected modules.
* @author The BibleTime team
*/
class CDisplaySettingsButton : public KToolBarButton {
class CDisplaySettingsButton : public TDEToolBarButton {
Q_OBJECT
public:
@ -93,7 +93,7 @@ protected:
TQDict<int> m_dict;
KPopupMenu* m_popup;
TDEPopupMenu* m_popup;
int populateMenu();
bool isOptionAvailable( const CSwordModuleInfo::FilterTypes option);

@ -33,28 +33,28 @@ using namespace Profile;
CCommentaryReadWindow::CCommentaryReadWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name) : CLexiconReadWindow(modules, parent,name) {}
void CCommentaryReadWindow::insertKeyboardActions( KActionCollection* const a ) {
new KAction(
void CCommentaryReadWindow::insertKeyboardActions( TDEActionCollection* const a ) {
new TDEAction(
i18n("Next book"), CResMgr::displaywindows::bibleWindow::nextBook::accel,
a, "nextBook"
);
new KAction(
new TDEAction(
i18n("Previous book"), CResMgr::displaywindows::bibleWindow::previousBook::accel,
a, "previousBook"
);
new KAction(
new TDEAction(
i18n("Next chapter"), CResMgr::displaywindows::bibleWindow::nextChapter::accel,
a, "nextChapter"
);
new KAction(
new TDEAction(
i18n("Previous chapter"), CResMgr::displaywindows::bibleWindow::previousChapter::accel,
a, "previousChapter"
);
new KAction(
new TDEAction(
i18n("Next verse"), CResMgr::displaywindows::bibleWindow::nextVerse::accel,
a, "nextVerse"
);
new KAction(
new TDEAction(
i18n("Previous verse"), CResMgr::displaywindows::bibleWindow::previousVerse::accel,
a, "previousVerse"
);
@ -75,7 +75,7 @@ void CCommentaryReadWindow::storeProfileSettings( CProfileWindow* profileWindow
void CCommentaryReadWindow::initToolbars() {
CLexiconReadWindow::initToolbars();
m_syncButton = new KToggleAction(i18n("Sync with active Bible"),
m_syncButton = new TDEToggleAction(i18n("Sync with active Bible"),
CResMgr::displaywindows::commentaryWindow::syncWindow::icon,
CResMgr::displaywindows::commentaryWindow::syncWindow::accel,
actionCollection(),
@ -107,37 +107,37 @@ void CCommentaryReadWindow::initActions() {
actionCollection()->action("nextEntry")->setEnabled(false);
actionCollection()->action("previousEntry")->setEnabled(false);
new KAction(
new TDEAction(
i18n("Next book"),
CResMgr::displaywindows::bibleWindow::nextBook::accel,
TQT_TQOBJECT(this), TQT_SLOT(nextBook()),
actionCollection(), "nextBook"
);
new KAction(
new TDEAction(
i18n("Previous book"),
CResMgr::displaywindows::bibleWindow::previousBook::accel,
TQT_TQOBJECT(this), TQT_SLOT(previousBook()),
actionCollection(), "previousBook"
);
new KAction(
new TDEAction(
i18n("Next chapter"),
CResMgr::displaywindows::bibleWindow::nextChapter::accel,
TQT_TQOBJECT(this), TQT_SLOT(nextChapter()),
actionCollection(), "nextChapter"
);
new KAction(
new TDEAction(
i18n("Previous chapter"),
CResMgr::displaywindows::bibleWindow::previousChapter::accel,
TQT_TQOBJECT(this), TQT_SLOT(previousChapter()),
actionCollection(), "previousChapter"
);
new KAction(
new TDEAction(
i18n("Next verse"),
CResMgr::displaywindows::bibleWindow::nextVerse::accel,
TQT_TQOBJECT(this), TQT_SLOT(nextVerse()),
actionCollection(), "nextVerse"
);
new KAction(
new TDEAction(
i18n("Previous verse"),
CResMgr::displaywindows::bibleWindow::previousVerse::accel,
TQT_TQOBJECT(this), TQT_SLOT(previousVerse()),

@ -29,7 +29,7 @@ public:
/**
* Reimplementation.
*/
static void insertKeyboardActions( KActionCollection* const a );
static void insertKeyboardActions( TDEActionCollection* const a );
CCommentaryReadWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name=0);
/**
@ -59,7 +59,7 @@ protected:
virtual void initToolbars();
private:
KToggleAction* m_syncButton;
TDEToggleAction* m_syncButton;
CSwordVerseKey* verseKey();
protected:
virtual void setupPopupMenu();

@ -78,9 +78,9 @@ CWriteWindow* CDisplayWindow::createWriteInstance(ListCSwordModuleInfo modules,
CDisplayWindow::CDisplayWindow(ListCSwordModuleInfo modules, CMDIArea *parent, const char *name )
#if TDE_VERSION >= 0x030200
: KMainWindow(KMainWindow::NoDCOPObject, parent, name, WDestructiveClose),
: TDEMainWindow(TDEMainWindow::NoDCOPObject, parent, name, WDestructiveClose),
#else
: KMainWindow(parent, name, WDestructiveClose),
: TDEMainWindow(parent, name, WDestructiveClose),
#endif
m_mdi(parent),
m_filterOptions(),
@ -134,7 +134,7 @@ void CDisplayWindow::setCaption( const TQString& ) {
m_mdi->emitWindowCaptionChanged();
}
void CDisplayWindow::insertKeyboardActions( KActionCollection* const a ) {
void CDisplayWindow::insertKeyboardActions( TDEActionCollection* const a ) {
KStdAction::zoomIn(0, 0, a, "zoomIn"); //no slot
KStdAction::zoomOut(0, 0, a, "zoomOut"); //no slot
KStdAction::close(0, 0, a, "closeWindow"); //no slot
@ -142,14 +142,14 @@ void CDisplayWindow::insertKeyboardActions( KActionCollection* const a ) {
KStdAction::copy(0, 0, a, "copySelectedText");
KStdAction::find(0, 0, a, "findText");
new KToolBarPopupAction(
new TDEToolBarPopupAction(
i18n("Back in history"),
CResMgr::displaywindows::general::backInHistory::icon,
CResMgr::displaywindows::general::backInHistory::accel,
a,
CResMgr::displaywindows::general::backInHistory::actionName
);
new KToolBarPopupAction(
new TDEToolBarPopupAction(
i18n("Forward in history"),
CResMgr::displaywindows::general::forwardInHistory::icon,
CResMgr::displaywindows::general::forwardInHistory::accel,
@ -158,7 +158,7 @@ void CDisplayWindow::insertKeyboardActions( KActionCollection* const a ) {
}
void CDisplayWindow::initActions() {
new KAction(i18n("Search"),
new TDEAction(i18n("Search"),
CResMgr::displaywindows::general::search::icon,
CResMgr::displaywindows::general::search::accel,
TQT_TQOBJECT(this), TQT_SLOT(slotSearchInModules()),
@ -193,13 +193,13 @@ void CDisplayWindow::initActions() {
actionCollection(), "findText"
);
new KToolBarPopupAction(
new TDEToolBarPopupAction(
i18n("Back in history"), CResMgr::displaywindows::general::backInHistory::icon, CResMgr::displaywindows::general::backInHistory::accel,
TQT_TQOBJECT(keyChooser()), TQT_SLOT( backInHistory() ),
actionCollection(), CResMgr::displaywindows::general::backInHistory::actionName
);
new KToolBarPopupAction(
new TDEToolBarPopupAction(
i18n("Forward in history"), CResMgr::displaywindows::general::forwardInHistory::icon, CResMgr::displaywindows::general::forwardInHistory::accel,
TQT_TQOBJECT(keyChooser()), TQT_SLOT( forwardInHistory() ),
actionCollection(), CResMgr::displaywindows::general::forwardInHistory::actionName
@ -370,22 +370,22 @@ const bool CDisplayWindow::init() {
}
/** Returns the main toolbar. */
KToolBar* const CDisplayWindow::mainToolBar() const {
TDEToolBar* const CDisplayWindow::mainToolBar() const {
return m_mainToolBar;
}
/** Returns the main toolbar. */
KToolBar* const CDisplayWindow::buttonsToolBar() const {
TDEToolBar* const CDisplayWindow::buttonsToolBar() const {
return m_buttonsToolBar;
}
/** Sets the main toolbar. */
void CDisplayWindow::setMainToolBar( KToolBar* bar ) {
void CDisplayWindow::setMainToolBar( TDEToolBar* bar ) {
m_mainToolBar = bar;
}
/** Sets the main toolbar. */
void CDisplayWindow::setButtonsToolBar( KToolBar* bar ) {
void CDisplayWindow::setButtonsToolBar( TDEToolBar* bar ) {
m_buttonsToolBar = bar;
}
@ -449,10 +449,10 @@ void CDisplayWindow::updatePopupMenu() {}
///** Returns the installed popup menu. */
KPopupMenu* const CDisplayWindow::popup() {
TDEPopupMenu* const CDisplayWindow::popup() {
// tqWarning("CReadWindow::popup()");
if (!m_popupMenu) {
m_popupMenu = new KPopupMenu(this);
m_popupMenu = new TDEPopupMenu(this);
connect(m_popupMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(updatePopupMenu()));
if (displayWidget()) {
displayWidget()->installPopup(m_popupMenu);

@ -41,15 +41,15 @@ class CDisplay;
class CKeyChooser;
class CModuleChooserBar;
class CDisplaySettingsButton;
class KAccel;
class KToolBar;
class KPopupMenu;
class TDEAccel;
class TDEToolBar;
class TDEPopupMenu;
/** The base class for all display windows of BibleTime.
* @author The BibleTime team
*/
class CDisplayWindow : public KMainWindow, public CPointers {
class CDisplayWindow : public TDEMainWindow, public CPointers {
Q_OBJECT
public:
@ -61,10 +61,10 @@ public:
static CReadWindow* createReadInstance(ListCSwordModuleInfo modules, CMDIArea* parent, const char* name = 0);
static CWriteWindow* createWriteInstance(ListCSwordModuleInfo modules, CMDIArea* parent, const WriteWindowType type = HTMLWindow, const char* name = 0);
/**
* Insert the keyboard accelerators of this window into the given KAccel object.
* Insert the keyboard accelerators of this window into the given TDEAccel object.
*/
// static void insertKeyboardActions( KAccel* const accel );
static void insertKeyboardActions( KActionCollection* const a );
// static void insertKeyboardActions( TDEAccel* const accel );
static void insertKeyboardActions( TDEActionCollection* const a );
CMDIArea* const mdi() const;
/**
@ -134,19 +134,19 @@ public:
/**
* Sets the main toolbar.
*/
void setMainToolBar( KToolBar* bar );
void setMainToolBar( TDEToolBar* bar );
/**
* Sets the buttons toolbar.
*/
void setButtonsToolBar( KToolBar* bar );
void setButtonsToolBar( TDEToolBar* bar );
/**
* Returns the main toolbar.
*/
KToolBar* const mainToolBar() const;
TDEToolBar* const mainToolBar() const;
/**
* Returns the buttons toolbar.
*/
KToolBar* const buttonsToolBar() const;
TDEToolBar* const buttonsToolBar() const;
/**
* Initialize the toolbars
*/
@ -236,7 +236,7 @@ protected:
/**
* Returns the installed popup menu.
*/
KPopupMenu* const popup();
TDEPopupMenu* const popup();
virtual void closeEvent(TQCloseEvent* e);
protected slots:
@ -267,9 +267,9 @@ private:
CSwordKey* m_swordKey;
bool m_isReady;
CModuleChooserBar* m_moduleChooserBar;
KToolBar* m_mainToolBar;
KToolBar* m_buttonsToolBar;
KPopupMenu* m_popupMenu;
TDEToolBar* m_mainToolBar;
TDEToolBar* m_buttonsToolBar;
TDEPopupMenu* m_popupMenu;
CDisplay* m_displayWidget;
};

@ -36,7 +36,7 @@ void CHTMLWriteWindow::initView() {
setDisplayWidget( writeDisplay );
setCentralWidget( displayWidget()->view() );
setMainToolBar( new KToolBar(this) );
setMainToolBar( new TDEToolBar(this) );
mainToolBar()->setFullSize(true);
addDockWindow(mainToolBar());
@ -56,7 +56,7 @@ void CHTMLWriteWindow::initConnections() {
void CHTMLWriteWindow::initToolbars() {
//setup the toolbar
m_actions.syncWindow = new KToggleAction(i18n("Sync with active Bible"),
m_actions.syncWindow = new TDEToggleAction(i18n("Sync with active Bible"),
CResMgr::displaywindows::commentaryWindow::syncWindow::icon,
CResMgr::displaywindows::commentaryWindow::syncWindow::accel,
actionCollection(),
@ -65,7 +65,7 @@ void CHTMLWriteWindow::initToolbars() {
m_actions.syncWindow->setToolTip(CResMgr::displaywindows::commentaryWindow::syncWindow::tooltip);
m_actions.syncWindow->plug(mainToolBar());
m_actions.saveText = new KAction( i18n("Save text"),
m_actions.saveText = new TDEAction( i18n("Save text"),
CResMgr::displaywindows::writeWindow::saveText::icon,
CResMgr::displaywindows::writeWindow::saveText::accel,
TQT_TQOBJECT(this), TQT_SLOT( saveCurrentText() ),
@ -75,7 +75,7 @@ void CHTMLWriteWindow::initToolbars() {
m_actions.saveText->setToolTip( CResMgr::displaywindows::writeWindow::saveText::tooltip );
m_actions.saveText->plug(mainToolBar());
m_actions.deleteEntry = new KAction(i18n("Delete current entry"),
m_actions.deleteEntry = new TDEAction(i18n("Delete current entry"),
CResMgr::displaywindows::writeWindow::deleteEntry::icon,
CResMgr::displaywindows::writeWindow::deleteEntry::accel,
TQT_TQOBJECT(this), TQT_SLOT(deleteEntry()),
@ -85,7 +85,7 @@ void CHTMLWriteWindow::initToolbars() {
m_actions.deleteEntry->setToolTip( CResMgr::displaywindows::writeWindow::deleteEntry::tooltip );
m_actions.deleteEntry->plug(mainToolBar());
m_actions.restoreText = new KAction(i18n("Restore original text"),
m_actions.restoreText = new TDEAction(i18n("Restore original text"),
CResMgr::displaywindows::writeWindow::restoreText::icon,
CResMgr::displaywindows::writeWindow::restoreText::accel,
TQT_TQOBJECT(this), TQT_SLOT(restoreText()), actionCollection(),
@ -95,7 +95,7 @@ void CHTMLWriteWindow::initToolbars() {
m_actions.restoreText->plug(mainToolBar());
KToolBar* bar = new KToolBar(this);
TDEToolBar* bar = new TDEToolBar(this);
bar->setFullSize(true);
addDockWindow(bar);

@ -18,7 +18,7 @@
//TQt includes
#include <tqwidget.h>
class KAction;
class TDEAction;
/** The WYSIWYG implementation of the editor.
* @author The BibleTime team
@ -64,10 +64,10 @@ protected slots:
private:
struct {
KAction* saveText;
KAction* restoreText;
KAction* deleteEntry;
KToggleAction* syncWindow;
TDEAction* saveText;
TDEAction* restoreText;
TDEAction* deleteEntry;
TDEToggleAction* syncWindow;
}
m_actions;
};

@ -42,36 +42,36 @@ CLexiconReadWindow::CLexiconReadWindow(ListCSwordModuleInfo moduleList, CMDIArea
CLexiconReadWindow::~CLexiconReadWindow() {}
void CLexiconReadWindow::insertKeyboardActions( KActionCollection* const a ) {
new KAction(
void CLexiconReadWindow::insertKeyboardActions( TDEActionCollection* const a ) {
new TDEAction(
i18n("Next entry"), CResMgr::displaywindows::lexiconWindow::nextEntry::accel,
a, "nextEntry"
);
new KAction(
new TDEAction(
i18n("Previous entry"), CResMgr::displaywindows::lexiconWindow::previousEntry::accel,
a, "previousEntry"
);
// new KAction(i18n("Copy reference only"), KShortcut(0), a, "copyReferenceOnly");
new KAction(i18n("Copy entry with text"), KShortcut(0), a, "copyEntryWithText");
// new KAction(i18n("Copy selected text"), KShortcut(0), a, "copySelectedText");
new KAction(i18n("Save entry as plain text"), KShortcut(0), a, "saveEntryAsPlainText");
new KAction(i18n("Save entry as HTML"), KShortcut(0), a, "saveEntryAsHTML");
// new KAction(i18n("Print reference only"), KShortcut(0), a, "printReferenceOnly");
new KAction(i18n("Print entry with text"), KShortcut(0), a, "printEntryWithText");
// new TDEAction(i18n("Copy reference only"), TDEShortcut(0), a, "copyReferenceOnly");
new TDEAction(i18n("Copy entry with text"), TDEShortcut(0), a, "copyEntryWithText");
// new TDEAction(i18n("Copy selected text"), TDEShortcut(0), a, "copySelectedText");
new TDEAction(i18n("Save entry as plain text"), TDEShortcut(0), a, "saveEntryAsPlainText");
new TDEAction(i18n("Save entry as HTML"), TDEShortcut(0), a, "saveEntryAsHTML");
// new TDEAction(i18n("Print reference only"), TDEShortcut(0), a, "printReferenceOnly");
new TDEAction(i18n("Print entry with text"), TDEShortcut(0), a, "printEntryWithText");
}
void CLexiconReadWindow::initActions() {
CReadWindow::initActions();
m_actions.backInHistory = dynamic_cast<KToolBarPopupAction*>(
m_actions.backInHistory = dynamic_cast<TDEToolBarPopupAction*>(
actionCollection()->action(
CResMgr::displaywindows::general::backInHistory::actionName
)
);
Q_ASSERT(m_actions.backInHistory);
m_actions.forwardInHistory = dynamic_cast<KToolBarPopupAction*>(
m_actions.forwardInHistory = dynamic_cast<TDEToolBarPopupAction*>(
actionCollection()->action(
CResMgr::displaywindows::general::forwardInHistory::actionName
)
@ -79,12 +79,12 @@ void CLexiconReadWindow::initActions() {
Q_ASSERT(m_actions.forwardInHistory);
new KAction(
new TDEAction(
i18n("Next entry"), CResMgr::displaywindows::lexiconWindow::nextEntry::accel,
TQT_TQOBJECT(this), TQT_SLOT( nextEntry() ),
actionCollection(), "nextEntry"
);
new KAction(
new TDEAction(
i18n("Previous entry"), CResMgr::displaywindows::lexiconWindow::previousEntry::accel,
TQT_TQOBJECT(this), TQT_SLOT( previousEntry() ),
actionCollection(), "previousEntry"
@ -96,8 +96,8 @@ void CLexiconReadWindow::initActions() {
m_actions.findText = actionCollection()->action("findText");
Q_ASSERT(m_actions.findText);
//m_actions.findStrongs = new KAction(i18n("Strong's Search"), KShortcut(0),this, TQT_SLOT(openSearchStrongsDialog()), actionCollection(), "findStrongs");
m_actions.findStrongs = new KAction(
//m_actions.findStrongs = new TDEAction(i18n("Strong's Search"), TDEShortcut(0),this, TQT_SLOT(openSearchStrongsDialog()), actionCollection(), "findStrongs");
m_actions.findStrongs = new TDEAction(
i18n("Strong's Search"),
CResMgr::displaywindows::general::findStrongs::icon,
CResMgr::displaywindows::general::findStrongs::accel,
@ -105,20 +105,20 @@ void CLexiconReadWindow::initActions() {
actionCollection(),
CResMgr::displaywindows::general::findStrongs::actionName);
m_actions.copy.reference = new KAction(i18n("Reference only"), KShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(copyAnchorOnly()), actionCollection(), "copyReferenceOnly");
m_actions.copy.reference = new TDEAction(i18n("Reference only"), TDEShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(copyAnchorOnly()), actionCollection(), "copyReferenceOnly");
m_actions.copy.entry = new KAction(i18n("Entry with text"), KShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(copyAll()), actionCollection(), "copyEntryWithText");
m_actions.copy.entry = new TDEAction(i18n("Entry with text"), TDEShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(copyAll()), actionCollection(), "copyEntryWithText");
m_actions.copy.selectedText = actionCollection()->action("copySelectedText");
Q_ASSERT(m_actions.copy.selectedText);
m_actions.save.entryAsPlain = new KAction(i18n("Entry as plain text"), KShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(saveAsPlain()),actionCollection(), "saveEntryAsPlain");
m_actions.save.entryAsPlain = new TDEAction(i18n("Entry as plain text"), TDEShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(saveAsPlain()),actionCollection(), "saveEntryAsPlain");
m_actions.save.entryAsHTML = new KAction(i18n("Entry as HTML"), KShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(saveAsHTML()), actionCollection(), "saveEntryAsHTML");
m_actions.save.entryAsHTML = new TDEAction(i18n("Entry as HTML"), TDEShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(saveAsHTML()), actionCollection(), "saveEntryAsHTML");
m_actions.print.reference = new KAction(i18n("Reference only"), KShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(printAnchorWithText()), actionCollection(), "printReferenceOnly");
m_actions.print.reference = new TDEAction(i18n("Reference only"), TDEShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(printAnchorWithText()), actionCollection(), "printReferenceOnly");
m_actions.print.entry = new KAction(i18n("Entry with text"), KShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(printAll()), actionCollection(), "printEntryWithText");
m_actions.print.entry = new TDEAction(i18n("Entry with text"), TDEShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(printAll()), actionCollection(), "printEntryWithText");
// init with the user defined settings
CBTConfig::setupAccelSettings(CBTConfig::lexiconWindow, actionCollection());
@ -157,7 +157,7 @@ void CLexiconReadWindow::initConnections() {
void CLexiconReadWindow::initView() {
setDisplayWidget( CDisplay::createReadInstance(this) );
setMainToolBar( new KToolBar(this) );
setMainToolBar( new TDEToolBar(this) );
addDockWindow(mainToolBar());
setKeyChooser( CKeyChooser::createInstance(modules(), key(), mainToolBar()) );
@ -168,7 +168,7 @@ void CLexiconReadWindow::initView() {
setModuleChooserBar( new CModuleChooserBar(modules(), modules().first()->type(), this) );
addDockWindow(moduleChooserBar());
setButtonsToolBar( new KToolBar(this) );
setButtonsToolBar( new TDEToolBar(this) );
addDockWindow(buttonsToolBar());
setIcon(CToolClass::getIconForModule(modules().first()));
@ -182,7 +182,7 @@ void CLexiconReadWindow::initToolbars() {
m_actions.forwardInHistory->plug( mainToolBar(),1 ); //2nd button
//buttons toolbar
KAction* action = actionCollection()->action(
TDEAction* action = actionCollection()->action(
CResMgr::displaywindows::general::search::actionName);
Q_ASSERT( action );
if (action) {
@ -199,31 +199,31 @@ void CLexiconReadWindow::initToolbars() {
void CLexiconReadWindow::setupPopupMenu() {
popup()->insertTitle(CToolClass::getIconForModule(modules().first()), i18n("Lexicon window"));
// m_actions.selectAll = new KAction(i18n("Select all"), KShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(selectAll()), actionCollection());
// m_actions.selectAll = new TDEAction(i18n("Select all"), TDEShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(selectAll()), actionCollection());
m_actions.findText->plug(popup());
m_actions.findStrongs->plug(popup());
m_actions.selectAll->plug(popup());
(new KActionSeparator(TQT_TQOBJECT(this)))->plug( popup() );
(new TDEActionSeparator(TQT_TQOBJECT(this)))->plug( popup() );
m_actions.copyMenu = new KActionMenu(i18n("Copy..."), CResMgr::displaywindows::lexiconWindow::copyMenu::icon, actionCollection());
m_actions.copyMenu = new TDEActionMenu(i18n("Copy..."), CResMgr::displaywindows::lexiconWindow::copyMenu::icon, actionCollection());
m_actions.copyMenu->setDelayed(false);
m_actions.copyMenu->insert(m_actions.copy.reference);
m_actions.copyMenu->insert(m_actions.copy.entry);
m_actions.copyMenu->insert(new KActionSeparator(TQT_TQOBJECT(this)));
m_actions.copyMenu->insert(new TDEActionSeparator(TQT_TQOBJECT(this)));
m_actions.copyMenu->insert(m_actions.copy.selectedText);
m_actions.copyMenu->plug(popup());
m_actions.saveMenu = new KActionMenu(i18n("Save..."), CResMgr::displaywindows::lexiconWindow::saveMenu::icon, actionCollection());
m_actions.saveMenu = new TDEActionMenu(i18n("Save..."), CResMgr::displaywindows::lexiconWindow::saveMenu::icon, actionCollection());
m_actions.saveMenu->setDelayed(false);
m_actions.saveMenu->insert(m_actions.save.entryAsPlain);
m_actions.saveMenu->insert(m_actions.save.entryAsHTML);
m_actions.saveMenu->plug(popup());
m_actions.printMenu = new KActionMenu(i18n("Print..."), CResMgr::displaywindows::lexiconWindow::printMenu::icon, actionCollection());
m_actions.printMenu = new TDEActionMenu(i18n("Print..."), CResMgr::displaywindows::lexiconWindow::printMenu::icon, actionCollection());
m_actions.printMenu->setDelayed(false);
m_actions.printMenu->insert(m_actions.print.reference);
m_actions.printMenu->insert(m_actions.print.entry);

@ -24,7 +24,7 @@
class CSwordKey;
class CSwordLDKey;
//KDE
class KToolBarPopupAction;
class TDEToolBarPopupAction;
/**
*@author The BibleTime team
@ -47,8 +47,8 @@ public:
/**
* Reimplementation.
*/
// static void insertKeyboardActions( KAccel* a );
static void insertKeyboardActions( KActionCollection* const a );
// static void insertKeyboardActions( TDEAccel* a );
static void insertKeyboardActions( TDEActionCollection* const a );
protected:
virtual void initActions();
@ -60,33 +60,33 @@ protected:
struct ActionsStruct {
KToolBarPopupAction* backInHistory;
KToolBarPopupAction* forwardInHistory;
TDEToolBarPopupAction* backInHistory;
TDEToolBarPopupAction* forwardInHistory;
KAction* selectAll;
KAction* findText;
KAction* findStrongs;
TDEAction* selectAll;
TDEAction* findText;
TDEAction* findStrongs;
KActionMenu* copyMenu;
TDEActionMenu* copyMenu;
struct {
KAction* reference;
KAction* entry;
KAction* selectedText;
TDEAction* reference;
TDEAction* entry;
TDEAction* selectedText;
}
copy;
KActionMenu* saveMenu;
TDEActionMenu* saveMenu;
struct {
KAction* reference;
KAction* entryAsPlain;
KAction* entryAsHTML;
TDEAction* reference;
TDEAction* entryAsPlain;
TDEAction* entryAsHTML;
}
save;
KActionMenu* printMenu;
TDEActionMenu* printMenu;
struct {
KAction* reference;
KAction* entry;
TDEAction* reference;
TDEAction* entry;
}
print;
}

@ -15,7 +15,7 @@
#include <tqtimer.h>
CModuleChooserBar::CModuleChooserBar(ListCSwordModuleInfo useModules, CSwordModuleInfo::ModuleType type, TQWidget *parent, const char *name )
: KToolBar(parent,name),
: TDEToolBar(parent,name),
m_moduleType(type),
m_idCounter(0),
m_buttonLimit(-1) //-1 means no limit

@ -29,7 +29,7 @@
/**
* @author The BibleTime team
*/
class CModuleChooserBar : public KToolBar {
class CModuleChooserBar : public TDEToolBar {
Q_OBJECT
public:

@ -28,7 +28,7 @@
#include <kiconloader.h>
CModuleChooserButton::CModuleChooserButton(CSwordModuleInfo* useModule,CSwordModuleInfo::ModuleType type, const int id, CModuleChooserBar *parent, const char *name )
: KToolBarButton(iconName(), id, parent, name),
: TDEToolBarButton(iconName(), id, parent, name),
m_id(id), m_popup(0), m_moduleChooserBar(parent) {
m_moduleType = type;
m_module = useModule;
@ -81,7 +81,7 @@ const TQString CModuleChooserButton::iconName() {
}
CSwordModuleInfo* CModuleChooserButton::module() {
for ( KPopupMenu* popup = m_submenus.first(); popup; popup = m_submenus.next() ) {
for ( TDEPopupMenu* popup = m_submenus.first(); popup; popup = m_submenus.next() ) {
for (unsigned int i = 0; i < popup->count(); i++) {
if ( m_popup->isItemChecked(popup->idAt(i)) ) {
TQString mod = popup->text(popup->idAt(i)).remove('&');
@ -100,7 +100,7 @@ int CModuleChooserButton::getId() const {
/** Is called after a module was selected in the popup */
void CModuleChooserButton::moduleChosen( int ID ) {
for ( KPopupMenu* popup = m_submenus.first(); popup; popup = m_submenus.next() ) {
for ( TDEPopupMenu* popup = m_submenus.first(); popup; popup = m_submenus.next() ) {
for (unsigned int i = 0; i < popup->count(); i++) {
popup->setItemChecked(popup->idAt(i),false);
}
@ -145,7 +145,7 @@ void CModuleChooserButton::populateMenu() {
delete m_popup;
//create a new, empty popup
m_popup = new KPopupMenu(this);
m_popup = new TDEPopupMenu(this);
if (m_module) {
m_titleId = m_popup->insertTitle( i18n("Select a work") );
@ -166,7 +166,7 @@ void CModuleChooserButton::populateMenu() {
setPopup(m_popup, true);
TQStringList languages;
TQDict<KPopupMenu> langdict;
TQDict<TDEPopupMenu> langdict;
//the modules list contains only the modules we can use, i.e. same type and same features
ListCSwordModuleInfo modules;
@ -200,7 +200,7 @@ void CModuleChooserButton::populateMenu() {
if (languages.find( lang ) == languages.end() ) { //this lang was not yet added
languages += lang;
KPopupMenu* menu = new KPopupMenu;
TDEPopupMenu* menu = new TDEPopupMenu;
langdict.insert(lang, menu );
m_submenus.append(menu);
connect(menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(moduleChosen(int)));
@ -254,7 +254,7 @@ void CModuleChooserButton::updateMenuItems() {
CSwordModuleInfo* module = 0;
ListCSwordModuleInfo chosenModules = m_moduleChooserBar->getModuleList();
for ( KPopupMenu* popup = m_submenus.first(); popup; popup = m_submenus.next() ) {
for ( TDEPopupMenu* popup = m_submenus.first(); popup; popup = m_submenus.next() ) {
for (unsigned int i = 0; i < popup->count(); i++) {
moduleName = popup->text(popup->idAt(i)).remove('&');

@ -24,14 +24,14 @@
#include <ktoolbarbutton.h>
#include <kpopupmenu.h>
class KPopupMenu;
class TDEPopupMenu;
class CModuleChooserBar;
/** The CModuleChooserButton displays a list of submenus sorted by language which contain the possible modules
* which can be displayed together with the first one.
* @author The BibleTime team
*/
class CModuleChooserButton : public KToolBarButton, public CPointers {
class CModuleChooserButton : public TDEToolBarButton, public CPointers {
Q_OBJECT
public:
@ -61,8 +61,8 @@ private:
CSwordModuleInfo::ModuleType m_moduleType;
CSwordModuleInfo* m_module;
KPopupMenu* m_popup;
TQPtrList<KPopupMenu> m_submenus;
TDEPopupMenu* m_popup;
TQPtrList<TDEPopupMenu> m_submenus;
CModuleChooserBar* m_moduleChooserBar;

@ -41,7 +41,7 @@ void CPlainWriteWindow::initView() {
setDisplayWidget( CDisplay::createWriteInstance(this) );
setCentralWidget( displayWidget()->view() );
setMainToolBar( new KToolBar(this) );
setMainToolBar( new TDEToolBar(this) );
mainToolBar()->setFullSize(true);
addDockWindow(mainToolBar());
@ -52,7 +52,7 @@ void CPlainWriteWindow::initView() {
}
void CPlainWriteWindow::initToolbars() {
m_actions.syncWindow = new KToggleAction(i18n("Sync with active Bible"),
m_actions.syncWindow = new TDEToggleAction(i18n("Sync with active Bible"),
CResMgr::displaywindows::commentaryWindow::syncWindow::icon,
CResMgr::displaywindows::commentaryWindow::syncWindow::accel,
actionCollection(),
@ -62,7 +62,7 @@ void CPlainWriteWindow::initToolbars() {
m_actions.syncWindow->plug(mainToolBar());
m_actions.saveText = new KAction(i18n("Save text"),
m_actions.saveText = new TDEAction(i18n("Save text"),
CResMgr::displaywindows::writeWindow::saveText::icon,
CResMgr::displaywindows::writeWindow::saveText::accel,
TQT_TQOBJECT(this), TQT_SLOT(saveCurrentText()),
@ -73,7 +73,7 @@ void CPlainWriteWindow::initToolbars() {
m_actions.saveText->plug(mainToolBar());
m_actions.deleteEntry = new KAction(i18n("Delete current entry"),
m_actions.deleteEntry = new TDEAction(i18n("Delete current entry"),
CResMgr::displaywindows::writeWindow::deleteEntry::icon,
CResMgr::displaywindows::writeWindow::deleteEntry::accel,
TQT_TQOBJECT(this), TQT_SLOT(deleteEntry()),
@ -84,7 +84,7 @@ void CPlainWriteWindow::initToolbars() {
m_actions.deleteEntry->plug(mainToolBar());
m_actions.restoreText = new KAction(i18n("Restore original text"),
m_actions.restoreText = new TDEAction(i18n("Restore original text"),
CResMgr::displaywindows::writeWindow::restoreText::icon,
CResMgr::displaywindows::writeWindow::restoreText::accel,
TQT_TQOBJECT(this), TQT_SLOT(restoreText()),
@ -172,5 +172,5 @@ const bool CPlainWriteWindow::syncAllowed() const {
void CPlainWriteWindow::initActions() {
}
void CPlainWriteWindow::insertKeyboardActions( KActionCollection* const ) {
void CPlainWriteWindow::insertKeyboardActions( TDEActionCollection* const ) {
}

@ -19,8 +19,8 @@
#include <tqwidget.h>
class KAction;
class KToggleAction;
class TDEAction;
class TDEToggleAction;
/** The write window class which offers a plain editor for source code editing.
* @author The BibleTime team
@ -63,16 +63,16 @@ protected: // Protected methods
*/
virtual void initActions();
/**
* Insert the keyboard accelerators of this window into the given KAccel object.
* Insert the keyboard accelerators of this window into the given TDEAccel object.
*/
static void insertKeyboardActions( KActionCollection* const a );
static void insertKeyboardActions( TDEActionCollection* const a );
private:
struct {
KAction* saveText;
KAction* deleteEntry;
KAction* restoreText;
KToggleAction* syncWindow;
TDEAction* saveText;
TDEAction* deleteEntry;
TDEAction* restoreText;
TDEToggleAction* syncWindow;
}
m_actions;

@ -165,7 +165,7 @@ void CReadWindow::applyProfileSettings(CProfileWindow * const settings) {
setUpdatesEnabled(true);
}
void CReadWindow::insertKeyboardActions( KActionCollection* const ) {}
void CReadWindow::insertKeyboardActions( TDEActionCollection* const ) {}
/** No descriptions */
void CReadWindow::copyDisplayedText() {

@ -22,7 +22,7 @@
#include <tqwidget.h>
#include <tqpopupmenu.h>
class KPopupMenu;
class TDEPopupMenu;
/** The base class for all read-only display windows.
* @author The BibleTime team
@ -32,8 +32,8 @@ class CReadWindow : public CDisplayWindow {
Q_OBJECT
public:
// static void insertKeyboardActions( KAccel* const a );
static void insertKeyboardActions( KActionCollection* const a );
// static void insertKeyboardActions( TDEAccel* const a );
static void insertKeyboardActions( TDEActionCollection* const a );
CReadWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name=0);
virtual ~CReadWindow();

@ -28,11 +28,11 @@ CWriteWindow::CWriteWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const
CWriteWindow::~CWriteWindow() {}
// void CWriteWindow::insertKeyboardActions( KAccel* const /*a*/ ) {
// void CWriteWindow::insertKeyboardActions( TDEAccel* const /*a*/ ) {
//
// };
void CWriteWindow::insertKeyboardActions( KActionCollection* const ) {
/* new KAction(
void CWriteWindow::insertKeyboardActions( TDEActionCollection* const ) {
/* new TDEAction(
i18n("Next book"), CResMgr::displaywindows::bibleWindow::nextBook::accel,
a, "nextBook"
);*/

@ -27,7 +27,7 @@ class CWriteWindow : public CDisplayWindow {
Q_OBJECT
public:
static void insertKeyboardActions( KActionCollection* const a );
static void insertKeyboardActions( TDEActionCollection* const a );
CWriteWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name=0);
virtual ~CWriteWindow();

@ -26,7 +26,7 @@
////////////
CBookTreeChooser::TreeItem::TreeItem(TQListViewItem* parent, TQListViewItem* after, CSwordTreeKey* key, const TQString keyName)
: KListViewItem(parent, after),
: TDEListViewItem(parent, after),
m_key(key),
m_keyName(keyName) {
//tqDebug("first CBookTreeChooser::TreeItem ctor");
@ -40,7 +40,7 @@ m_keyName(keyName) {
};
CBookTreeChooser::TreeItem::TreeItem(TQListViewItem* parent,CSwordTreeKey* key, const TQString keyName)
: KListViewItem(parent),
: TDEListViewItem(parent),
m_key(key),
m_keyName(keyName) {
//tqDebug("second CBookTreeChooser::TreeItem ctor");
@ -54,7 +54,7 @@ m_keyName(keyName) {
};
CBookTreeChooser::TreeItem::TreeItem(TQListView* view, TQListViewItem* after,CSwordTreeKey* key, const TQString keyName)
: KListViewItem(view,after),
: TDEListViewItem(view,after),
m_key(key),
m_keyName(keyName) {
//tqDebug("third CBookTreeChooser::TreeItem ctor");
@ -80,7 +80,7 @@ void CBookTreeChooser::TreeItem::setup() {
m_key->setOffset( offset );
KListViewItem::setup();
TDEListViewItem::setup();
}
void CBookTreeChooser::TreeItem::createChilds() {
@ -119,7 +119,7 @@ void CBookTreeChooser::TreeItem::setOpen(bool o) {
listView()->viewport()->unsetCursor();
}
KListViewItem::setOpen(o);
TDEListViewItem::setOpen(o);
}
//////////////////////////////////
@ -137,7 +137,7 @@ m_key( dynamic_cast<CSwordTreeKey*>(key) ) {
//now setup the keychooser widgets
TQHBoxLayout* layout = new TQHBoxLayout(this);
m_treeView = new KListView(this);
m_treeView = new TDEListView(this);
layout->addWidget(m_treeView);
m_treeView->addColumn("Tree");
m_treeView->header()->hide();

@ -86,7 +86,7 @@ protected slots: // Protected slots
void itemActivated( TQListViewItem* item );
private:
class TreeItem : public KListViewItem {
class TreeItem : public TDEListViewItem {
public:
TreeItem(TQListViewItem* parent, TQListViewItem* after, CSwordTreeKey* key, const TQString keyName);
TreeItem(TQListViewItem* parent, CSwordTreeKey* key, const TQString keyName);
@ -107,7 +107,7 @@ private:
TQPtrList<CSwordBookModuleInfo> m_modules;
CSwordTreeKey* m_key;
KListView* m_treeView;
TDEListView* m_treeView;
};
#endif

@ -53,12 +53,12 @@ using namespace Printing;
using std::string;
CItemBase::CItemBase(CMainIndex* mainIndex, const Type type)
: KListViewItem(mainIndex),
: TDEListViewItem(mainIndex),
m_type(type),
m_sortingEnabled(true) {}
CItemBase::CItemBase(CItemBase* parentItem, const Type type)
: KListViewItem(parentItem),
: TDEListViewItem(parentItem),
m_type(type),
m_sortingEnabled(true) {}
@ -122,7 +122,7 @@ void CItemBase::sortChildItems( int col, bool asc ) {
return;
}
else {
KListViewItem::sortChildItems( col, asc );
TDEListViewItem::sortChildItems( col, asc );
}
}
@ -132,7 +132,7 @@ void CItemBase::sort() {
return;
}
else {
KListViewItem::sort();
TDEListViewItem::sort();
}
}
@ -473,7 +473,7 @@ void CFolderBase::init() {
/** No descriptions */
void CFolderBase::setOpen( bool open ) {
KListViewItem::setOpen(open);
TDEListViewItem::setOpen(open);
update();
}

@ -28,7 +28,7 @@ class CFolderBase;
class CTreeFolder;
class CMainIndex;
class CItemBase : public KListViewItem/*, public CPointers */ {
class CItemBase : public TDEListViewItem/*, public CPointers */ {
public:
enum Type {
Unknown = 0,

@ -77,7 +77,7 @@ void CMainIndex::ToolTip::maybeTip(const TQPoint& p) {
}
}
CMainIndex::CMainIndex(TQWidget *parent) : KListView(parent),
CMainIndex::CMainIndex(TQWidget *parent) : TDEListView(parent),
m_searchDialog(0), m_toolTip(0), m_itemsMovable(false), m_autoOpenFolder(0), m_autoOpenTimer(this) {
initView();
initConnections();
@ -143,40 +143,40 @@ void CMainIndex::initView() {
setSelectionModeExt(Extended);
//setup the popup menu
m_popup = new KPopupMenu(viewport());
m_popup = new TDEPopupMenu(viewport());
m_popup->insertTitle(i18n("Bookshelf"));
m_actions.newFolder = new KAction(i18n("Create a new folder"), CResMgr::mainIndex::newFolder::icon, 0, TQT_TQOBJECT(this), TQT_SLOT(createNewFolder()), TQT_TQOBJECT(this));
m_actions.changeFolder = new KAction(i18n("Change this folder"),CResMgr::mainIndex::changeFolder::icon, 0, TQT_TQOBJECT(this), TQT_SLOT(changeFolder()), TQT_TQOBJECT(this));
m_actions.newFolder = new TDEAction(i18n("Create a new folder"), CResMgr::mainIndex::newFolder::icon, 0, TQT_TQOBJECT(this), TQT_SLOT(createNewFolder()), TQT_TQOBJECT(this));
m_actions.changeFolder = new TDEAction(i18n("Change this folder"),CResMgr::mainIndex::changeFolder::icon, 0, TQT_TQOBJECT(this), TQT_SLOT(changeFolder()), TQT_TQOBJECT(this));
m_actions.changeBookmark = new KAction(i18n("Change bookmark description"),CResMgr::mainIndex::changeBookmark::icon, 0, TQT_TQOBJECT(this), TQT_SLOT(changeBookmark()), TQT_TQOBJECT(this));
m_actions.importBookmarks = new KAction(i18n("Import bookmarks"),CResMgr::mainIndex::importBookmarks::icon, 0, TQT_TQOBJECT(this), TQT_SLOT(importBookmarks()), TQT_TQOBJECT(this));
m_actions.exportBookmarks = new KAction(i18n("Export bookmarks"),CResMgr::mainIndex::exportBookmarks::icon, 0, TQT_TQOBJECT(this), TQT_SLOT(exportBookmarks()), TQT_TQOBJECT(this));
m_actions.printBookmarks = new KAction(i18n("Print bookmarks"),CResMgr::mainIndex::printBookmarks::icon, 0, TQT_TQOBJECT(this), TQT_SLOT(printBookmarks()), TQT_TQOBJECT(this));
m_actions.changeBookmark = new TDEAction(i18n("Change bookmark description"),CResMgr::mainIndex::changeBookmark::icon, 0, TQT_TQOBJECT(this), TQT_SLOT(changeBookmark()), TQT_TQOBJECT(this));
m_actions.importBookmarks = new TDEAction(i18n("Import bookmarks"),CResMgr::mainIndex::importBookmarks::icon, 0, TQT_TQOBJECT(this), TQT_SLOT(importBookmarks()), TQT_TQOBJECT(this));
m_actions.exportBookmarks = new TDEAction(i18n("Export bookmarks"),CResMgr::mainIndex::exportBookmarks::icon, 0, TQT_TQOBJECT(this), TQT_SLOT(exportBookmarks()), TQT_TQOBJECT(this));
m_actions.printBookmarks = new TDEAction(i18n("Print bookmarks"),CResMgr::mainIndex::printBookmarks::icon, 0, TQT_TQOBJECT(this), TQT_SLOT(printBookmarks()), TQT_TQOBJECT(this));
m_actions.deleteEntries = new KAction(i18n("Remove selected item(s)"),CResMgr::mainIndex::deleteItems::icon, 0, TQT_TQOBJECT(this), TQT_SLOT(deleteEntries()), TQT_TQOBJECT(this));
m_actions.deleteEntries = new TDEAction(i18n("Remove selected item(s)"),CResMgr::mainIndex::deleteItems::icon, 0, TQT_TQOBJECT(this), TQT_SLOT(deleteEntries()), TQT_TQOBJECT(this));
m_actions.editModuleMenu = new KActionMenu(i18n("Edit this work"),CResMgr::mainIndex::editModuleMenu::icon, TQT_TQOBJECT(this));
m_actions.editModuleMenu = new TDEActionMenu(i18n("Edit this work"),CResMgr::mainIndex::editModuleMenu::icon, TQT_TQOBJECT(this));
m_actions.editModuleMenu->setDelayed(false);
m_actions.editModulePlain = new KAction(i18n("Plain text"),CResMgr::mainIndex::editModulePlain::icon, 0, TQT_TQOBJECT(this), TQT_SLOT(editModulePlain()), TQT_TQOBJECT(this));
m_actions.editModuleHTML = new KAction(i18n("HTML"),CResMgr::mainIndex::editModuleHTML::icon, 0, TQT_TQOBJECT(this), TQT_SLOT(editModuleHTML()), TQT_TQOBJECT(this));
m_actions.editModulePlain = new TDEAction(i18n("Plain text"),CResMgr::mainIndex::editModulePlain::icon, 0, TQT_TQOBJECT(this), TQT_SLOT(editModulePlain()), TQT_TQOBJECT(this));
m_actions.editModuleHTML = new TDEAction(i18n("HTML"),CResMgr::mainIndex::editModuleHTML::icon, 0, TQT_TQOBJECT(this), TQT_SLOT(editModuleHTML()), TQT_TQOBJECT(this));
m_actions.searchInModules = new KAction(i18n("Search in selected work(s)"),CResMgr::mainIndex::search::icon, 0, TQT_TQOBJECT(this), TQT_SLOT(searchInModules()), TQT_TQOBJECT(this));
m_actions.unlockModule = new KAction(i18n("Unlock this work"),CResMgr::mainIndex::unlockModule::icon, 0, TQT_TQOBJECT(this), TQT_SLOT(unlockModule()), TQT_TQOBJECT(this));
m_actions.aboutModule = new KAction(i18n("About this work"),CResMgr::mainIndex::aboutModule::icon, 0, TQT_TQOBJECT(this), TQT_SLOT(aboutModule()), TQT_TQOBJECT(this));
m_actions.searchInModules = new TDEAction(i18n("Search in selected work(s)"),CResMgr::mainIndex::search::icon, 0, TQT_TQOBJECT(this), TQT_SLOT(searchInModules()), TQT_TQOBJECT(this));
m_actions.unlockModule = new TDEAction(i18n("Unlock this work"),CResMgr::mainIndex::unlockModule::icon, 0, TQT_TQOBJECT(this), TQT_SLOT(unlockModule()), TQT_TQOBJECT(this));
m_actions.aboutModule = new TDEAction(i18n("About this work"),CResMgr::mainIndex::aboutModule::icon, 0, TQT_TQOBJECT(this), TQT_SLOT(aboutModule()), TQT_TQOBJECT(this));
//fill the popup menu itself
m_actions.newFolder->plug(m_popup);
m_actions.changeFolder->plug(m_popup);
(new KActionSeparator(TQT_TQOBJECT(this)))->plug(m_popup);
(new TDEActionSeparator(TQT_TQOBJECT(this)))->plug(m_popup);
m_actions.changeBookmark->plug(m_popup);
m_actions.importBookmarks->plug(m_popup);
m_actions.exportBookmarks->plug(m_popup);
m_actions.printBookmarks->plug(m_popup);
(new KActionSeparator(TQT_TQOBJECT(this)))->plug(m_popup);
(new TDEActionSeparator(TQT_TQOBJECT(this)))->plug(m_popup);
m_actions.deleteEntries->plug(m_popup);
(new KActionSeparator(TQT_TQOBJECT(this)))->plug(m_popup);
(new TDEActionSeparator(TQT_TQOBJECT(this)))->plug(m_popup);
m_actions.editModuleMenu->plug(m_popup);
//sub item of edit module menu
m_actions.editModuleMenu->insert(m_actions.editModulePlain);
@ -194,8 +194,8 @@ void CMainIndex::initConnections() {
TQT_SLOT(slotExecuted(TQListViewItem*)));
connect(this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)),
TQT_SLOT(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)));
connect(this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)),
TQT_SLOT(contextMenu(KListView*, TQListViewItem*, const TQPoint&)));
connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
TQT_SLOT(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
connect(&m_autoOpenTimer, TQT_SIGNAL(timeout()),
this, TQT_SLOT(autoOpenTimeout()));
}
@ -252,7 +252,7 @@ TQDragObject* CMainIndex::dragObject() {
return CDragDropMgr::dragObject( dndItems, viewport() );
}
/** Reimplementation from KListView. Returns true if the drag is acceptable for the listview. */
/** Reimplementation from TDEListView. Returns true if the drag is acceptable for the listview. */
bool CMainIndex::acceptDrag( TQDropEvent* event ) const {
const TQPoint pos = contentsToViewport(event->pos());
@ -365,8 +365,8 @@ void CMainIndex::emitModulesChosen( ListCSwordModuleInfo modules, TQString key )
emit createReadDisplayWindow(modules, key);
}
/** Returns the correct KAction object for the given type of action. */
KAction* const CMainIndex::action( const CItemBase::MenuAction type ) const {
/** Returns the correct TDEAction object for the given type of action. */
TDEAction* const CMainIndex::action( const CItemBase::MenuAction type ) const {
switch (type) {
case CItemBase::NewFolder:
return m_actions.newFolder;
@ -399,7 +399,7 @@ KAction* const CMainIndex::action( const CItemBase::MenuAction type ) const {
}
/** Shows the context menu at the given position. */
void CMainIndex::contextMenu(KListView* /*list*/, TQListViewItem* i, const TQPoint& p) {
void CMainIndex::contextMenu(TDEListView* /*list*/, TQListViewItem* i, const TQPoint& p) {
//setup menu entries depending on current selection
TQPtrList<TQListViewItem> items = selectedItems();
@ -413,7 +413,7 @@ void CMainIndex::contextMenu(KListView* /*list*/, TQListViewItem* i, const TQPoi
CItemBase::MenuAction actionType;
for (int index = CItemBase::ActionBegin; index <= CItemBase::ActionEnd; ++index) {
actionType = static_cast<CItemBase::MenuAction>(index);
if (KAction* a = action(actionType))
if (TDEAction* a = action(actionType))
a->setEnabled( item->enableAction(actionType) );
}
}
@ -422,7 +422,7 @@ void CMainIndex::contextMenu(KListView* /*list*/, TQListViewItem* i, const TQPoi
CItemBase::MenuAction actionType;
for (int index = CItemBase::ActionBegin; index <= CItemBase::ActionEnd; ++index) {
actionType = static_cast<CItemBase::MenuAction>(index);
if (KAction* a = action(actionType))
if (TDEAction* a = action(actionType))
a->setEnabled(false);
}
@ -435,7 +435,7 @@ void CMainIndex::contextMenu(KListView* /*list*/, TQListViewItem* i, const TQPoi
enableAction = enableAction && i->enableAction(actionType);
}
if (enableAction) {
KAction* a = action(actionType) ;
TDEAction* a = action(actionType) ;
if (i && a)
a->setEnabled(enableAction);
}
@ -603,7 +603,7 @@ void CMainIndex::startDrag() {
}
}
KListView::startDrag();
TDEListView::startDrag();
}
/** Reimplementation to support the items dragEnter and dragLeave functions. */
@ -627,7 +627,7 @@ void CMainIndex::contentsDragMoveEvent( TQDragMoveEvent* event ) {
m_autoOpenFolder = 0;
}
KListView::contentsDragMoveEvent(event);
TDEListView::contentsDragMoveEvent(event);
}
TQRect CMainIndex::drawItemHighlighter(TQPainter* painter, TQListViewItem* item) {
@ -637,7 +637,7 @@ TQRect CMainIndex::drawItemHighlighter(TQPainter* painter, TQListViewItem* item)
return TQRect();
}
return KListView::drawItemHighlighter(painter, item);
return TDEListView::drawItemHighlighter(painter, item);
}
@ -651,7 +651,7 @@ void CMainIndex::autoOpenTimeout() {
/** No descriptions */
void CMainIndex::contentsDragLeaveEvent( TQDragLeaveEvent* e ) {
m_autoOpenTimer.stop();
KListView::contentsDragLeaveEvent(e);
TDEListView::contentsDragLeaveEvent(e);
}
/** Returns true if more than one netry is supported by this action type. Returns false for actions which support only one entry, e.g. about module etc. */
@ -863,7 +863,7 @@ void CMainIndex::saveSettings() {
void CMainIndex::polish()
{
KListView::polish();
TDEListView::polish();
initTree();
readSettings();
}

@ -34,7 +34,7 @@ class CSearchDialog;
/** The class which manages all bookmarks and modules. The modules are put into own, fixed subfolders sorted by language.
* @author The BibleTime team
*/
class CMainIndex : public KListView {
class CMainIndex : public TDEListView {
Q_OBJECT
@ -89,13 +89,13 @@ protected: // Protected methods
*/
virtual TQDragObject* dragObject();
/**
* Reimplementation from KListView. Returns true if the drag is acceptable for the listview.
* Reimplementation from TDEListView. Returns true if the drag is acceptable for the listview.
*/
virtual bool acceptDrag( TQDropEvent* event ) const;
/**
* Returns the correct KAction object for the given type of action.
* Returns the correct TDEAction object for the given type of action.
*/
KAction* const action( const CItemBase::MenuAction type ) const;
TDEAction* const action( const CItemBase::MenuAction type ) const;
/**
* Reimplementation. Takes care of movable items.
*/
@ -128,7 +128,7 @@ protected slots: // Protected slots
/**
* Shows the context menu at the given position.
*/
void contextMenu(KListView*, TQListViewItem*, const TQPoint&);
void contextMenu(TDEListView*, TQListViewItem*, const TQPoint&);
/**
* Adds a new subfolder to the current item.
*/
@ -197,26 +197,26 @@ private:
const bool isMultiAction( const CItemBase::MenuAction type ) const;
struct Actions {
KAction* newFolder;
KAction* changeFolder;
TDEAction* newFolder;
TDEAction* changeFolder;
KAction* changeBookmark;
KAction* importBookmarks;
KAction* exportBookmarks;
KAction* printBookmarks;
TDEAction* changeBookmark;
TDEAction* importBookmarks;
TDEAction* exportBookmarks;
TDEAction* printBookmarks;
KAction* deleteEntries;
TDEAction* deleteEntries;
KActionMenu* editModuleMenu;
KAction* editModulePlain;
KAction* editModuleHTML;
TDEActionMenu* editModuleMenu;
TDEAction* editModulePlain;
TDEAction* editModuleHTML;
KAction* searchInModules;
KAction* unlockModule;
KAction* aboutModule;
TDEAction* searchInModules;
TDEAction* unlockModule;
TDEAction* aboutModule;
}
m_actions;
KPopupMenu* m_popup;
TDEPopupMenu* m_popup;
signals:
/**

@ -40,7 +40,7 @@ ManageIndicesForm::ManageIndicesForm( TQWidget* parent, const char* name, WFlags
m_autoDeleteOrphanedIndicesBox = new TQCheckBox( this, "m_autoDeleteOrphanedIndicesBox" );
ManageIndicesFormLayout->addWidget( m_autoDeleteOrphanedIndicesBox );
m_moduleList = new KListView( this, "m_moduleList" );
m_moduleList = new TDEListView( this, "m_moduleList" );
ManageIndicesFormLayout->addWidget( m_moduleList );
layout1 = new TQHBoxLayout( 0, 0, 6, "layout1");

@ -55,7 +55,7 @@
<string>Alt+Y</string>
</property>
</widget>
<widget class="KListView">
<widget class="TDEListView">
<property name="name">
<cstring>m_moduleList</cstring>
</property>

@ -66,7 +66,7 @@ CSwordModuleInfo* const CModuleChooser::ModuleCheckBoxItem::module() const {
/****************************/
/****************************/
CModuleChooser::CModuleChooser(TQWidget* parent) : KListView(parent) {
CModuleChooser::CModuleChooser(TQWidget* parent) : TDEListView(parent) {
initView();
initTree();
}
@ -74,7 +74,7 @@ CModuleChooser::CModuleChooser(TQWidget* parent) : KListView(parent) {
CModuleChooser::~CModuleChooser() {}
void CModuleChooser::show() {
KListView::show();
TDEListView::show();
//open module items
TQListViewItemIterator it( this );

@ -38,7 +38,7 @@
namespace Search {
namespace Options {
class CModuleChooser : public KListView, public CPointers {
class CModuleChooser : public TDEListView, public CPointers {
Q_OBJECT
public:

@ -35,7 +35,7 @@ namespace Search {
********************************************/
CModuleResultView::CModuleResultView(TQWidget* parent, const char* name) :
KListView(parent, name) {
TDEListView(parent, name) {
initView();
initConnections();
strongsResults = 0;
@ -57,28 +57,28 @@ void CModuleResultView::initView() {
//setup the popup menu
m_popup = new KPopupMenu(this);
m_popup = new TDEPopupMenu(this);
// m_popup->insertTitle(i18n("Bible window"));
m_actions.copyMenu = new KActionMenu(i18n("Copy..."), CResMgr::searchdialog::result::moduleList::copyMenu::icon, TQT_TQOBJECT(m_popup));
m_actions.copyMenu = new TDEActionMenu(i18n("Copy..."), CResMgr::searchdialog::result::moduleList::copyMenu::icon, TQT_TQOBJECT(m_popup));
m_actions.copyMenu->setDelayed(false);
m_actions.copy.result = new KAction(i18n("Reference only"), KShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(copyResult()), TQT_TQOBJECT(this));
m_actions.copy.result = new TDEAction(i18n("Reference only"), TDEShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(copyResult()), TQT_TQOBJECT(this));
m_actions.copyMenu->insert(m_actions.copy.result);
m_actions.copy.resultWithText = new KAction(i18n("Reference with text"), KShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(copyResultWithText()), TQT_TQOBJECT(this));
m_actions.copy.resultWithText = new TDEAction(i18n("Reference with text"), TDEShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(copyResultWithText()), TQT_TQOBJECT(this));
m_actions.copyMenu->insert(m_actions.copy.resultWithText);
m_actions.copyMenu->plug(m_popup);
m_actions.saveMenu = new KActionMenu(i18n("Save..."), CResMgr::searchdialog::result::moduleList::saveMenu::icon, TQT_TQOBJECT(m_popup));
m_actions.saveMenu = new TDEActionMenu(i18n("Save..."), CResMgr::searchdialog::result::moduleList::saveMenu::icon, TQT_TQOBJECT(m_popup));
m_actions.saveMenu->setDelayed( false );
m_actions.save.result = new KAction(i18n("Reference only"), KShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(saveResult()), TQT_TQOBJECT(this));
m_actions.save.result = new TDEAction(i18n("Reference only"), TDEShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(saveResult()), TQT_TQOBJECT(this));
m_actions.saveMenu->insert(m_actions.save.result);
m_actions.save.resultWithText = new KAction(i18n("Reference with text"), KShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(saveResultWithText()), TQT_TQOBJECT(this));
m_actions.save.resultWithText = new TDEAction(i18n("Reference with text"), TDEShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(saveResultWithText()), TQT_TQOBJECT(this));
m_actions.saveMenu->insert(m_actions.save.resultWithText);
m_actions.saveMenu->plug(m_popup);
m_actions.printMenu = new KActionMenu(i18n("Print..."), CResMgr::searchdialog::result::moduleList::printMenu::icon, TQT_TQOBJECT(m_popup));
m_actions.printMenu = new TDEActionMenu(i18n("Print..."), CResMgr::searchdialog::result::moduleList::printMenu::icon, TQT_TQOBJECT(m_popup));
m_actions.printMenu->setDelayed(false);
m_actions.print.result = new KAction(i18n("Reference with text"), KShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(printResult()), TQT_TQOBJECT(this));
m_actions.print.result = new TDEAction(i18n("Reference with text"), TDEShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(printResult()), TQT_TQOBJECT(this));
m_actions.printMenu->insert(m_actions.print.result);
@ -89,8 +89,8 @@ void CModuleResultView::initView() {
void CModuleResultView::initConnections() {
connect(this, TQT_SIGNAL(currentChanged(TQListViewItem*)),
this, TQT_SLOT(executed(TQListViewItem*)));
connect(this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)),
this, TQT_SLOT(showPopup(KListView*, TQListViewItem*, const TQPoint&)));
connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
this, TQT_SLOT(showPopup(TDEListView*, TQListViewItem*, const TQPoint&)));
}
/** Setups the tree using the given list of modules. */
@ -215,7 +215,7 @@ CSwordModuleInfo* const CModuleResultView::activeModule() {
}
/** No descriptions */
void CModuleResultView::showPopup(KListView*, TQListViewItem*, const TQPoint& point) {
void CModuleResultView::showPopup(TDEListView*, TQListViewItem*, const TQPoint& point) {
//make sure that all entries have the correct status
m_popup->exec(point);
}

@ -28,18 +28,18 @@ class TQPushButton;
class TQRadioButton;
class KComboBox;
class KActionMenu;
class KAction;
class TDEActionMenu;
class TDEAction;
class KHistoryCombo;
class KProgress;
class KPopupMenu;
class TDEPopupMenu;
class CReadDisplay;
namespace Search {
namespace Result {
class CModuleResultView : public KListView {
class CModuleResultView : public TDEListView {
Q_OBJECT
public:
@ -83,7 +83,7 @@ protected slots: // Protected slots
/**
* This slot opens the popup menu at the given position
*/
void showPopup(KListView*, TQListViewItem*, const TQPoint&);
void showPopup(TDEListView*, TQListViewItem*, const TQPoint&);
/**
* Appends the whole search result to the printer queue.
*/
@ -104,29 +104,29 @@ signals:
private:
struct {
KActionMenu* saveMenu;
TDEActionMenu* saveMenu;
struct {
KAction* result;
KAction* resultWithText;
TDEAction* result;
TDEAction* resultWithText;
}
save;
KActionMenu* printMenu;
TDEActionMenu* printMenu;
struct {
KAction* result;
TDEAction* result;
}
print;
KActionMenu* copyMenu;
TDEActionMenu* copyMenu;
struct {
KAction* result;
KAction* resultWithText;
TDEAction* result;
TDEAction* resultWithText;
}
copy;
} m_actions;
KPopupMenu* m_popup;
TDEPopupMenu* m_popup;
StrongsResultClass* strongsResults;
};

@ -45,7 +45,7 @@ namespace Search {
namespace Options {
/****************************/
CRangeChooserDialog::RangeItem::RangeItem(TQListView* view, TQListViewItem* afterThis, const TQString caption, const TQString range) : KListViewItem(view, afterThis) {
CRangeChooserDialog::RangeItem::RangeItem(TQListView* view, TQListViewItem* afterThis, const TQString caption, const TQString range) : TDEListViewItem(view, afterThis) {
setCaption(caption);
setRange(range);
}
@ -98,7 +98,7 @@ void CRangeChooserDialog::initView() {
TQGridLayout* grid = new TQGridLayout(plainPage(),6,5,0,3);
m_rangeList = new KListView(plainPage());
m_rangeList = new TDEListView(plainPage());
m_rangeList->addColumn(i18n("Search range"));
m_rangeList->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding));
m_rangeList->setFullWidth(true);
@ -131,14 +131,14 @@ void CRangeChooserDialog::initView() {
grid->addRowSpacing(3, 10);
m_resultList = new KListView(plainPage());
m_resultList = new TDEListView(plainPage());
m_resultList->addColumn(i18n("Parsed search range:"));
m_resultList->setFullWidth(true);
m_resultList->setSorting(-1);
m_resultList->setShowSortIndicator(false);
m_resultList->header()->setClickEnabled(false);
m_resultList->header()->setMovingEnabled(false);
m_resultList->setSelectionModeExt(KListView::NoSelection);
m_resultList->setSelectionModeExt(TDEListView::NoSelection);
grid->addMultiCellWidget(m_resultList, 4,5,3,4);
@ -195,7 +195,7 @@ void CRangeChooserDialog::parseRange() {
sword::VerseKey key;
sword::ListKey verses = key.ParseVerseList((const char*)range.utf8(), "Genesis 1:1", true);
for (int i = 0; i < verses.Count(); ++i) {
new KListViewItem(m_resultList, TQString::fromUtf8(verses.GetElement(i)->getRangeText()));
new TDEListViewItem(m_resultList, TQString::fromUtf8(verses.GetElement(i)->getRangeText()));
// tqWarning("range=%s, text=%s",verses.GetElement(i)->getRangeText(), verses.GetElement(i)->getText() );
}

@ -52,7 +52,7 @@ public:
~CRangeChooserDialog();
protected: // Protected methods
class RangeItem : public KListViewItem {
class RangeItem : public TDEListViewItem {
public:
RangeItem(TQListView*, TQListViewItem* afterThis = 0, const TQString caption = TQString(), const TQString range = TQString());
~RangeItem();
@ -93,8 +93,8 @@ protected slots: // Protected slots
virtual void slotOk();
private:
KListView* m_rangeList;
KListView* m_resultList;
TDEListView* m_rangeList;
TDEListView* m_resultList;
TQLineEdit* m_nameEdit;
TQTextEdit* m_rangeEdit;
TQPushButton* m_newRangeButton;

@ -34,11 +34,11 @@ class TQPushButton;
class TQRadioButton;
class KComboBox;
class KActionMenu;
class KAction;
class TDEActionMenu;
class TDEAction;
class KHistoryCombo;
class KProgress;
class KPopupMenu;
class TDEPopupMenu;
class CReadDisplay;

@ -29,7 +29,7 @@ namespace Search {
namespace Result {
CSearchResultView::CSearchResultView(TQWidget* parent, const char* name) :
KListView(parent, name), m_module(0) {
TDEListView(parent, name), m_module(0) {
initView();
initConnections();
}
@ -43,30 +43,30 @@ void CSearchResultView::initView() {
setSorting(-1);
setDragEnabled(true);
setSelectionModeExt(KListView::Extended);
setSelectionModeExt(TDEListView::Extended);
//setup the popup menu
m_popup = new KPopupMenu(this);
m_popup = new TDEPopupMenu(this);
m_actions.copyMenu = new KActionMenu(i18n("Copy..."), CResMgr::searchdialog::result::foundItems::copyMenu::icon, TQT_TQOBJECT(m_popup));
m_actions.copyMenu = new TDEActionMenu(i18n("Copy..."), CResMgr::searchdialog::result::foundItems::copyMenu::icon, TQT_TQOBJECT(m_popup));
m_actions.copyMenu->setDelayed(false);
m_actions.copy.result = new KAction(i18n("Reference only"), KShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(copyItems()), TQT_TQOBJECT(this));
m_actions.copy.result = new TDEAction(i18n("Reference only"), TDEShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(copyItems()), TQT_TQOBJECT(this));
m_actions.copyMenu->insert(m_actions.copy.result);
m_actions.copy.resultWithText = new KAction(i18n("Reference with text"), KShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(copyItemsWithText()), TQT_TQOBJECT(this));
m_actions.copy.resultWithText = new TDEAction(i18n("Reference with text"), TDEShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(copyItemsWithText()), TQT_TQOBJECT(this));
m_actions.copyMenu->insert(m_actions.copy.resultWithText);
m_actions.copyMenu->plug(m_popup);
m_actions.saveMenu = new KActionMenu(i18n("Save..."),CResMgr::searchdialog::result::foundItems::saveMenu::icon, TQT_TQOBJECT(m_popup));
m_actions.saveMenu = new TDEActionMenu(i18n("Save..."),CResMgr::searchdialog::result::foundItems::saveMenu::icon, TQT_TQOBJECT(m_popup));
m_actions.saveMenu->setDelayed( false );
m_actions.save.result = new KAction(i18n("Reference only"), KShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(saveItems()), TQT_TQOBJECT(this));
m_actions.save.result = new TDEAction(i18n("Reference only"), TDEShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(saveItems()), TQT_TQOBJECT(this));
m_actions.saveMenu->insert(m_actions.save.result);
m_actions.save.resultWithText = new KAction(i18n("Reference with text"), KShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(saveItemsWithText()), TQT_TQOBJECT(this));
m_actions.save.resultWithText = new TDEAction(i18n("Reference with text"), TDEShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(saveItemsWithText()), TQT_TQOBJECT(this));
m_actions.saveMenu->insert(m_actions.save.resultWithText);
m_actions.saveMenu->plug(m_popup);
m_actions.printMenu = new KActionMenu(i18n("Print..."),CResMgr::searchdialog::result::foundItems::printMenu::icon, TQT_TQOBJECT(m_popup));
m_actions.printMenu = new TDEActionMenu(i18n("Print..."),CResMgr::searchdialog::result::foundItems::printMenu::icon, TQT_TQOBJECT(m_popup));
m_actions.printMenu->setDelayed(false);
m_actions.print.result = new KAction(i18n("Reference with text"), KShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(printItems()), TQT_TQOBJECT(this));
m_actions.print.result = new TDEAction(i18n("Reference with text"), TDEShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(printItems()), TQT_TQOBJECT(this));
m_actions.printMenu->insert(m_actions.print.result);
m_actions.printMenu->plug(m_popup);
}
@ -78,8 +78,8 @@ void CSearchResultView::initConnections() {
connect(this, TQT_SIGNAL(currentChanged(TQListViewItem*)),
this, TQT_SLOT(executed(TQListViewItem*)));
connect(this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)),
this, TQT_SLOT(showPopup(KListView*, TQListViewItem*, const TQPoint&)));
connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
this, TQT_SLOT(showPopup(TDEListView*, TQListViewItem*, const TQPoint&)));
}
/** Setups the list with the given module. */
@ -101,9 +101,9 @@ void CSearchResultView::setupTree(CSwordModuleInfo* m) {
setUpdatesEnabled(false);
TQListViewItem* oldItem = 0;
KListViewItem* item = 0;
TDEListViewItem* item = 0;
for (int index = 0; index < count; index++) {
item = new KListViewItem(this, oldItem);
item = new TDEListViewItem(this, oldItem);
item->setText(0, TQString::fromUtf8(result.GetElement(index)->getText()));
oldItem = item;
@ -129,11 +129,11 @@ void CSearchResultView::setupStrongsTree(CSwordModuleInfo* m, TQStringList* vLis
setUpdatesEnabled(false);
KListViewItem* oldItem = 0;
KListViewItem* item = 0;
TDEListViewItem* oldItem = 0;
TDEListViewItem* item = 0;
for ( TQStringList::Iterator it = vList->begin(); it != vList->end(); ++it ) {
item = new KListViewItem(this, oldItem);
item = new TDEListViewItem(this, oldItem);
item->setText(0, (*it));
oldItem = item;
@ -153,7 +153,7 @@ void CSearchResultView::executed(TQListViewItem* item) {
}
/** Reimplementation to show the popup menu. */
void CSearchResultView::showPopup(KListView*, TQListViewItem*, const TQPoint& point) {
void CSearchResultView::showPopup(TDEListView*, TQListViewItem*, const TQPoint& point) {
m_popup->exec(point);
}

@ -25,18 +25,18 @@ class TQPushButton;
class TQRadioButton;
class KComboBox;
class KActionMenu;
class KAction;
class TDEActionMenu;
class TDEAction;
class KHistoryCombo;
class KProgress;
class KPopupMenu;
class TDEPopupMenu;
class CReadDisplay;
namespace Search {
namespace Result {
class CSearchResultView : public KListView {
class CSearchResultView : public TDEListView {
Q_OBJECT
public:
@ -66,7 +66,7 @@ public slots: // Public slots
/**
* Reimplementation to show the popup menu.
*/
virtual void showPopup(KListView*, TQListViewItem* i, const TQPoint& point);
virtual void showPopup(TDEListView*, TQListViewItem* i, const TQPoint& point);
protected slots: // Protected slots
void printItems();
@ -77,29 +77,29 @@ protected slots: // Protected slots
private:
struct {
KActionMenu* saveMenu;
TDEActionMenu* saveMenu;
struct {
KAction* result;
KAction* resultWithText;
TDEAction* result;
TDEAction* resultWithText;
}
save;
KActionMenu* printMenu;
TDEActionMenu* printMenu;
struct {
KAction* result;
TDEAction* result;
}
print;
KActionMenu* copyMenu;
TDEActionMenu* copyMenu;
struct {
KAction* result;
KAction* resultWithText;
TDEAction* result;
TDEAction* resultWithText;
}
copy;
}
m_actions;
KPopupMenu* m_popup;
TDEPopupMenu* m_popup;
CSwordModuleInfo* m_module;
signals: // Signals

@ -15,37 +15,37 @@
namespace util {
CSortListViewItem::CSortListViewItem(TQListViewItem* parent) : KListViewItem(parent)
CSortListViewItem::CSortListViewItem(TQListViewItem* parent) : TDEListViewItem(parent)
{
}
CSortListViewItem::CSortListViewItem( TQListView * parent, TQListViewItem * after )
: KListViewItem ( parent, after )
: TDEListViewItem ( parent, after )
{
}
CSortListViewItem::CSortListViewItem( TQListViewItem * parent, TQListViewItem * after )
: KListViewItem ( parent, after )
: TDEListViewItem ( parent, after )
{
}
CSortListViewItem::CSortListViewItem( TQListView * parent, TQString label1, TQString label2, TQString label3, TQString label4, TQString label5, TQString label6, TQString label7, TQString label8 )
: KListViewItem( parent, label1, label2, label3, label4, label5, label6, label7, label8 )
: TDEListViewItem( parent, label1, label2, label3, label4, label5, label6, label7, label8 )
{
}
CSortListViewItem::CSortListViewItem( TQListViewItem * parent, TQString label1, TQString label2, TQString label3, TQString label4, TQString label5, TQString label6, TQString label7, TQString label8 )
: KListViewItem ( parent, label1, label2, label3, label4, label5, label6, label7, label8 )
: TDEListViewItem ( parent, label1, label2, label3, label4, label5, label6, label7, label8 )
{
}
CSortListViewItem::CSortListViewItem( TQListView * parent, TQListViewItem * after, TQString label1, TQString label2, TQString label3, TQString label4, TQString label5, TQString label6, TQString label7, TQString label8 )
: KListViewItem ( parent, after, label1, label2, label3, label4, label5, label6, label7, label8 )
: TDEListViewItem ( parent, after, label1, label2, label3, label4, label5, label6, label7, label8 )
{
}
CSortListViewItem::CSortListViewItem( TQListViewItem * parent, TQListViewItem * after, TQString label1, TQString label2, TQString label3, TQString label4, TQString label5, TQString label6, TQString label7, TQString label8 )
: KListViewItem ( parent, after, label1, label2, label3, label4, label5, label6, label7, label8 )
: TDEListViewItem ( parent, after, label1, label2, label3, label4, label5, label6, label7, label8 )
{
}
@ -58,12 +58,12 @@ int CSortListViewItem::compare( TQListViewItem* i, int col, bool ascending ) con
int ret = 0;
if ( !columnSorting.contains(col) ) {
return KListViewItem::compare(i, col, ascending);
return TDEListViewItem::compare(i, col, ascending);
}
Type t = columnSorting[col];
if (t == String) {
ret = KListViewItem::compare(i, col, ascending);
ret = TDEListViewItem::compare(i, col, ascending);
}
else if (t == Number) {
ret = (int) (text(col).toLong() - (i->text(col).toLong()));

@ -23,7 +23,7 @@ namespace util {
* A implementation of a TQListViewItem to allow special sort orders for it's columns.
* @author The BibleTime team <info@bibletime.info>
*/
class CSortListViewItem : public KListViewItem {
class CSortListViewItem : public TDEListViewItem {
public:
enum Type {
Number, String/*, BibleKey*/

@ -249,8 +249,8 @@ int main(int argc, char* argv[]) {
// tqWarning("Restoring BibleTime");
//RESTORE( BibleTime );
int n = 1;
while (KMainWindow::canBeRestored(n)){
if (KMainWindow::classNameOfToplevel(n) == TQString("BibleTime")) {
while (TDEMainWindow::canBeRestored(n)){
if (TDEMainWindow::classNameOfToplevel(n) == TQString("BibleTime")) {
bibletime_ptr = new BibleTime;
bibletime_ptr->restore(n);
}

@ -59,14 +59,14 @@ namespace CResMgr {
TQString tooltip;
const TQString icon = "view_sidetree";
const KShortcut accel = TQt::Key_F9;
const TDEShortcut accel = TQt::Key_F9;
const char* actionName = "viewMainIndex_action";
}
namespace showInfoDisplay {
TQString tooltip;
const TQString icon = "view_sidetree";
const KShortcut accel = TQt::Key_F8;
const TDEShortcut accel = TQt::Key_F8;
const char* actionName = "viewInfoDisplay_action";
}
namespace showToolBar { //a standard action
@ -80,14 +80,14 @@ namespace CResMgr {
TQString tooltip;
const TQString icon = "find";
const KShortcut accel = TQt::CTRL + TQt::Key_O;
const TDEShortcut accel = TQt::CTRL + TQt::Key_O;
const char* actionName = "mainindex_search_action";
}
namespace searchdefaultbible {
TQString tooltip;
const TQString icon = "find";
const KShortcut accel = TQt::CTRL + TQt::ALT + TQt::Key_F;
const TDEShortcut accel = TQt::CTRL + TQt::ALT + TQt::Key_F;
const char* actionName = "mainindex_searchdefaultbible_action";
}
}
@ -109,7 +109,7 @@ namespace CResMgr {
TQString tooltip;
const TQString icon = "view_sidetree";
const KShortcut accel = TQt::CTRL + TQt::ALT + TQt::Key_S;
const TDEShortcut accel = TQt::CTRL + TQt::ALT + TQt::Key_S;
const char* actionName = "windowSaveToNewProfile_action";
}
namespace deleteProfile {
@ -122,42 +122,42 @@ namespace CResMgr {
TQString tooltip;
const TQString icon = "window_fullscreen";
const KShortcut accel = TQt::CTRL + TQt::SHIFT + TQt::Key_F;
const TDEShortcut accel = TQt::CTRL + TQt::SHIFT + TQt::Key_F;
const char* actionName = "windowFullscreen_action";
}
namespace arrangementMode {
TQString tooltip;
const TQString icon = "bt_cascade_auto";
const KShortcut accel = KKeySequence();
const TDEShortcut accel = KKeySequence();
const char* actionName = "windowArrangementMode_action";
namespace manual {
TQString tooltip;
const TQString icon = "bt_tile";
const KShortcut accel = TQt::CTRL + TQt::ALT + TQt::Key_M;
const TDEShortcut accel = TQt::CTRL + TQt::ALT + TQt::Key_M;
const char* actionName = "windowArrangementManual_action";
}
namespace autoTileHorizontal {
TQString tooltip;
const TQString icon = "bt_tile_auto";
const KShortcut accel = TQt::CTRL + TQt::ALT + TQt::Key_H;
const TDEShortcut accel = TQt::CTRL + TQt::ALT + TQt::Key_H;
const char* actionName = "windowAutoTileHorizontal_action";
}
namespace autoTileVertical {
TQString tooltip;
const TQString icon = "bt_tile_auto";
const KShortcut accel = TQt::CTRL + TQt::ALT + TQt::Key_G;
const TDEShortcut accel = TQt::CTRL + TQt::ALT + TQt::Key_G;
const char* actionName = "windowAutoTileVertical_action";
}
namespace autoCascade {
TQString tooltip;
const TQString icon = "bt_cascade_auto";
const KShortcut accel = TQt::CTRL + TQt::ALT + TQt::Key_J;
const TDEShortcut accel = TQt::CTRL + TQt::ALT + TQt::Key_J;
const char* actionName = "windowAutoCascade_action";
}
}
@ -165,28 +165,28 @@ namespace CResMgr {
TQString tooltip;
const TQString icon = "bt_tile";
const KShortcut accel = TQt::CTRL + TQt::Key_H;
const TDEShortcut accel = TQt::CTRL + TQt::Key_H;
const char* actionName = "windowTileHorizontal_action";
}
namespace tileVertical {
TQString tooltip;
const TQString icon = "bt_tile";
const KShortcut accel = TQt::CTRL + TQt::Key_G;
const TDEShortcut accel = TQt::CTRL + TQt::Key_G;
const char* actionName = "windowTileVertical_action";
}
namespace cascade {
TQString tooltip;
const TQString icon = "bt_cascade";
const KShortcut accel = TQt::CTRL + TQt::Key_J;
const TDEShortcut accel = TQt::CTRL + TQt::Key_J;
const char* actionName = "windowCascade_action";
}
namespace closeAll {
TQString tooltip;
const TQString icon = "fileclose";
const KShortcut accel = TQt::CTRL + TQt::ALT + TQt::Key_W;
const TDEShortcut accel = TQt::CTRL + TQt::ALT + TQt::Key_W;
const char* actionName = "windowCloseAll_action";
}
}
@ -204,7 +204,7 @@ namespace CResMgr {
TQString tooltip;
const TQString icon = "bt_swordconfig";
const KShortcut accel = TQt::Key_F4;
const TDEShortcut accel = TQt::Key_F4;
const char* actionName = "options_sword_setup";
}
@ -215,14 +215,14 @@ namespace CResMgr {
TQString tooltip;
const TQString icon = "contents";
const KShortcut accel = TQt::Key_F1;
const TDEShortcut accel = TQt::Key_F1;
const char* actionName = "helpHandbook_action";
}
namespace bibleStudyHowTo {
TQString tooltip;
const TQString icon = "contents";
const KShortcut accel = TQt::Key_F2;
const TDEShortcut accel = TQt::Key_F2;
const char* actionName = "helpHowTo_action";
}
namespace bugreport { // available as KStdAction
@ -233,7 +233,7 @@ namespace CResMgr {
TQString tooltip;
const TQString icon = "idea";
const KShortcut accel = TQt::Key_F3;
const TDEShortcut accel = TQt::Key_F3;
const char* actionName = "helpDailyTip_action";
}
namespace aboutBibleTime { // available as KStdAction
@ -380,7 +380,7 @@ namespace CResMgr {
TQString tooltip;
const TQString icon = "find";
const KShortcut accel = TQt::CTRL + TQt::Key_L;
const TDEShortcut accel = TQt::CTRL + TQt::Key_L;
const char* actionName = "window_search_action";
}
@ -388,21 +388,21 @@ namespace CResMgr {
TQString tooltip;
const TQString icon = "previous";
const KShortcut accel = TQt::ALT + TQt::Key_Left;
const TDEShortcut accel = TQt::ALT + TQt::Key_Left;
const char* actionName = "window_history_back_action";
}
namespace forwardInHistory {
TQString tooltip;
const TQString icon = "next";
const KShortcut accel = TQt::ALT + TQt::Key_Right;
const TDEShortcut accel = TQt::ALT + TQt::Key_Right;
const char* actionName = "window_history_forward_action";
}
namespace findStrongs {
TQString tooltip;
const TQString icon = "bt_findstrongs";
const KShortcut accel = KShortcut(0);
const TDEShortcut accel = TDEShortcut(0);
const char* actionName = "window_find_strongs_action";
}
@ -415,12 +415,12 @@ namespace CResMgr {
namespace nextBook {
TQString tooltip;
const KShortcut accel = TQt::CTRL + TQt::Key_Y;
const TDEShortcut accel = TQt::CTRL + TQt::Key_Y;
}
namespace previousBook {
TQString tooltip;
const KShortcut accel = TQt::CTRL + TQt::SHIFT + TQt::Key_Y;
const TDEShortcut accel = TQt::CTRL + TQt::SHIFT + TQt::Key_Y;
}
namespace chapterList {
@ -428,22 +428,22 @@ namespace CResMgr {
}
namespace nextChapter {
TQString tooltip;
const KShortcut accel = TQt::CTRL + TQt::Key_X;
const TDEShortcut accel = TQt::CTRL + TQt::Key_X;
}
namespace previousChapter {
TQString tooltip;
const KShortcut accel = TQt::CTRL + TQt::SHIFT + TQt::Key_X;
const TDEShortcut accel = TQt::CTRL + TQt::SHIFT + TQt::Key_X;
}
namespace verseList {
TQString tooltip;
}
namespace nextVerse {
TQString tooltip;
const KShortcut accel = TQt::CTRL + TQt::Key_V;
const TDEShortcut accel = TQt::CTRL + TQt::Key_V;
}
namespace previousVerse {
TQString tooltip;
const KShortcut accel = TQt::CTRL + TQt::SHIFT + TQt::Key_V;
const TDEShortcut accel = TQt::CTRL + TQt::SHIFT + TQt::Key_V;
}
namespace copyMenu {
@ -460,7 +460,7 @@ namespace CResMgr {
namespace syncWindow {
TQString tooltip;
const TQString icon = "bt_sync";
const KShortcut accel = KKeySequence();
const TDEShortcut accel = KKeySequence();
const char* actionName = "commentary_syncWindow";
}
}
@ -470,11 +470,11 @@ namespace CResMgr {
}
namespace nextEntry {
TQString tooltip;
const KShortcut accel = TQt::CTRL + TQt::Key_V;
const TDEShortcut accel = TQt::CTRL + TQt::Key_V;
}
namespace previousEntry {
TQString tooltip;
const KShortcut accel = TQt::CTRL + TQt::SHIFT + TQt::Key_V;
const TDEShortcut accel = TQt::CTRL + TQt::SHIFT + TQt::Key_V;
}
namespace copyMenu {
@ -490,7 +490,7 @@ namespace CResMgr {
namespace bookWindow {
namespace toggleTree {
const TQString icon = "view_sidetree";
const KShortcut accel = KKeySequence();
const TDEShortcut accel = KKeySequence();
}
}
@ -499,21 +499,21 @@ namespace CResMgr {
TQString tooltip;
const TQString icon = "filesave";
const KShortcut accel = KKeySequence();
const TDEShortcut accel = KKeySequence();
const char* actionName = "writeWindow_saveText";
}
namespace restoreText {
TQString tooltip;
const TQString icon = "undo";
const KShortcut accel = KKeySequence();
const TDEShortcut accel = KKeySequence();
const char* actionName = "writeWindow_restoreText";
}
namespace deleteEntry {
TQString tooltip;
const TQString icon = "editdelete";
const KShortcut accel = KKeySequence();
const TDEShortcut accel = KKeySequence();
const char* actionName = "writeWindow_deleteEntry";
}
@ -522,21 +522,21 @@ namespace CResMgr {
TQString tooltip;
const TQString icon = "text_bold";
const KShortcut accel = KKeySequence();
const TDEShortcut accel = KKeySequence();
const char* actionName = "writeWindow_boldText";
}
namespace italicText {
TQString tooltip;
const TQString icon = "text_italic";
const KShortcut accel = KKeySequence();
const TDEShortcut accel = KKeySequence();
const char* actionName = "writeWindow_italicText";
}
namespace underlinedText {
TQString tooltip;
const TQString icon = "text_under";
const KShortcut accel = KKeySequence();
const TDEShortcut accel = KKeySequence();
const char* actionName = "writeWindow_underlineText";
}
@ -544,41 +544,41 @@ namespace CResMgr {
TQString tooltip;
const TQString icon = "text_left";
const KShortcut accel = KKeySequence();
const TDEShortcut accel = KKeySequence();
const char* actionName = "writeWindow_alignLeft";
}
namespace alignCenter {
TQString tooltip;
const TQString icon = "text_center";
const KShortcut accel = KKeySequence();
const TDEShortcut accel = KKeySequence();
const char* actionName = "writeWindow_alignCenter";
}
namespace alignRight {
TQString tooltip;
const TQString icon = "rightjust";
const KShortcut accel = KKeySequence();
const TDEShortcut accel = KKeySequence();
const char* actionName = "writeWindow_alignRight";
}
namespace alignJustify {
TQString tooltip;
const TQString icon = "text_block";
const KShortcut accel = KKeySequence();
const TDEShortcut accel = KKeySequence();
const char* actionName = "writeWindow_alignJustify";
}
namespace fontFamily {
TQString tooltip;
const KShortcut accel = KKeySequence();
const TDEShortcut accel = KKeySequence();
const char* actionName = "writeWindow_fontFamily";
}
namespace fontSize {
TQString tooltip;
const KShortcut accel = KKeySequence();
const TDEShortcut accel = KKeySequence();
const char* actionName = "writeWindow_fontSize";
}
namespace fontColor {
@ -669,7 +669,7 @@ namespace CResMgr {
TQString tooltip;
const TQString icon = "find";
const KShortcut accel = TQt::CTRL + TQt::ALT + TQt::Key_M;
const TDEShortcut accel = TQt::CTRL + TQt::ALT + TQt::Key_M;
const char* actionName = "GMsearch_action";
}
namespace newFolder {

@ -64,14 +64,14 @@ namespace CResMgr {
extern TQString tooltip;
extern const TQString icon;
extern const KShortcut accel;
extern const TDEShortcut accel;
extern const char* actionName;
}
namespace showInfoDisplay {
extern TQString tooltip;
extern const TQString icon;
extern const KShortcut accel;
extern const TDEShortcut accel;
extern const char* actionName;
}
namespace showToolBar { //a standard action
@ -84,14 +84,14 @@ namespace CResMgr {
extern TQString tooltip;
extern const TQString icon;
extern const KShortcut accel;
extern const TDEShortcut accel;
extern const char* actionName;
}
namespace searchdefaultbible {
extern TQString tooltip;
extern const TQString icon;
extern const KShortcut accel;
extern const TDEShortcut accel;
extern const char* actionName;
}
}
@ -113,7 +113,7 @@ namespace CResMgr {
extern TQString tooltip;
extern const TQString icon;
extern const KShortcut accel;
extern const TDEShortcut accel;
extern const char* actionName;
}
namespace deleteProfile {
@ -126,42 +126,42 @@ namespace CResMgr {
extern TQString tooltip;
extern const TQString icon;
extern const KShortcut accel;
extern const TDEShortcut accel;
extern const char* actionName;
}
namespace arrangementMode {
extern TQString tooltip;
extern const TQString icon;
extern const KShortcut accel;
extern const TDEShortcut accel;
extern const char* actionName;
namespace manual {
extern TQString tooltip;
extern const TQString icon;
extern const KShortcut accel;
extern const TDEShortcut accel;
extern const char* actionName;
}
namespace autoTileVertical {
extern TQString tooltip;
extern const TQString icon;
extern const KShortcut accel;
extern const TDEShortcut accel;
extern const char* actionName;
}
namespace autoTileHorizontal {
extern TQString tooltip;
extern const TQString icon;
extern const KShortcut accel;
extern const TDEShortcut accel;
extern const char* actionName;
}
namespace autoCascade {
extern TQString tooltip;
extern const TQString icon;
extern const KShortcut accel;
extern const TDEShortcut accel;
extern const char* actionName;
}
}
@ -169,28 +169,28 @@ namespace CResMgr {
extern TQString tooltip;
extern const TQString icon;
extern const KShortcut accel;
extern const TDEShortcut accel;
extern const char* actionName;
}
namespace tileHorizontal {
extern TQString tooltip;
extern const TQString icon;
extern const KShortcut accel;
extern const TDEShortcut accel;
extern const char* actionName;
}
namespace cascade {
extern TQString tooltip;
extern const TQString icon;
extern const KShortcut accel;
extern const TDEShortcut accel;
extern const char* actionName;
}
namespace closeAll {
extern TQString tooltip;
extern const TQString icon;
extern const KShortcut accel;
extern const TDEShortcut accel;
extern const char* actionName;
}
}
@ -208,7 +208,7 @@ namespace CResMgr {
extern TQString tooltip;
extern const TQString icon;
extern const KShortcut accel;
extern const TDEShortcut accel;
extern const char* actionName;
}
}
@ -218,14 +218,14 @@ namespace CResMgr {
extern TQString tooltip;
extern const TQString icon;
extern const KShortcut accel;
extern const TDEShortcut accel;
extern const char* actionName;
}
namespace bibleStudyHowTo {
extern TQString tooltip;
extern const TQString icon;
extern const KShortcut accel;
extern const TDEShortcut accel;
extern const char* actionName;
}
namespace bugreport { // available as KStdAction
@ -235,7 +235,7 @@ namespace CResMgr {
extern TQString tooltip;
extern const TQString icon;
extern const KShortcut accel;
extern const TDEShortcut accel;
extern const char* actionName;
}
namespace aboutBibleTime { // available as KStdAction
@ -361,7 +361,7 @@ namespace workspace {}
extern TQString tooltip;
extern const TQString icon;
extern const KShortcut accel;
extern const TDEShortcut accel;
extern const char* actionName;
}
@ -369,14 +369,14 @@ namespace workspace {}
extern TQString tooltip;
extern const TQString icon;
extern const KShortcut accel;
extern const TDEShortcut accel;
extern const char* actionName;
}
namespace forwardInHistory {
extern TQString tooltip;
extern const TQString icon;
extern const KShortcut accel;
extern const TDEShortcut accel;
extern const char* actionName;
}
@ -384,7 +384,7 @@ namespace workspace {}
extern TQString tooltip;
extern const TQString icon;
extern const KShortcut accel;
extern const TDEShortcut accel;
extern const char* actionName;
}
}
@ -397,12 +397,12 @@ namespace workspace {}
namespace nextBook {
extern TQString tooltip;
extern const KShortcut accel;
extern const TDEShortcut accel;
}
namespace previousBook {
extern TQString tooltip;
extern const KShortcut accel;
extern const TDEShortcut accel;
}
namespace chapterList {
@ -412,12 +412,12 @@ namespace workspace {}
namespace nextChapter {
extern TQString tooltip;
extern const KShortcut accel;
extern const TDEShortcut accel;
}
namespace previousChapter {
extern TQString tooltip;
extern const KShortcut accel;
extern const TDEShortcut accel;
}
namespace verseList {
@ -427,12 +427,12 @@ namespace workspace {}
namespace nextVerse {
extern TQString tooltip;
extern const KShortcut accel;
extern const TDEShortcut accel;
}
namespace previousVerse {
extern TQString tooltip;
extern const KShortcut accel;
extern const TDEShortcut accel;
}
namespace copyMenu {
@ -450,7 +450,7 @@ namespace workspace {}
extern const TQString icon;
extern TQString tooltip;
extern const KShortcut accel;
extern const TDEShortcut accel;
extern const char* actionName;
}
@ -464,12 +464,12 @@ namespace workspace {}
namespace nextEntry {
extern TQString tooltip;
extern const KShortcut accel;
extern const TDEShortcut accel;
}
namespace previousEntry {
extern TQString tooltip;
extern const KShortcut accel;
extern const TDEShortcut accel;
}
namespace copyMenu {
@ -485,7 +485,7 @@ namespace workspace {}
namespace bookWindow {
namespace toggleTree {
extern const TQString icon;
extern const KShortcut accel;
extern const TDEShortcut accel;
}
}
@ -495,21 +495,21 @@ namespace workspace {}
extern TQString tooltip;
extern const TQString icon;
extern const KShortcut accel;
extern const TDEShortcut accel;
extern const char* actionName;
}
namespace restoreText {
extern TQString tooltip;
extern const TQString icon;
extern const KShortcut accel;
extern const TDEShortcut accel;
extern const char* actionName;
}
namespace deleteEntry {
extern TQString tooltip;
extern const TQString icon;
extern const KShortcut accel;
extern const TDEShortcut accel;
extern const char* actionName;
}
@ -518,21 +518,21 @@ namespace workspace {}
extern TQString tooltip;
extern const TQString icon;
extern const KShortcut accel;
extern const TDEShortcut accel;
extern const char* actionName;
}
namespace italicText {
extern TQString tooltip;
extern const TQString icon;
extern const KShortcut accel;
extern const TDEShortcut accel;
extern const char* actionName;
}
namespace underlinedText {
extern TQString tooltip;
extern const TQString icon;
extern const KShortcut accel;
extern const TDEShortcut accel;
extern const char* actionName;
}
@ -540,41 +540,41 @@ namespace workspace {}
extern TQString tooltip;
extern const TQString icon;
extern const KShortcut accel;
extern const TDEShortcut accel;
extern const char* actionName;
}
namespace alignCenter {
extern TQString tooltip;
extern const TQString icon;
extern const KShortcut accel;
extern const TDEShortcut accel;
extern const char* actionName;
}
namespace alignRight {
extern TQString tooltip;
extern const TQString icon;
extern const KShortcut accel;
extern const TDEShortcut accel;
extern const char* actionName;
}
namespace alignJustify {
extern TQString tooltip;
extern const TQString icon;
extern const KShortcut accel;
extern const TDEShortcut accel;
extern const char* actionName;
}
namespace fontFamily {
extern TQString tooltip;
extern const KShortcut accel;
extern const TDEShortcut accel;
extern const char* actionName;
}
namespace fontSize {
extern TQString tooltip;
extern const KShortcut accel;
extern const TDEShortcut accel;
extern const char* actionName;
}
namespace fontColor {
@ -676,7 +676,7 @@ namespace workspace {}
extern TQString tooltip;
extern const TQString icon;
extern const KShortcut accel;
extern const TDEShortcut accel;
extern const char* actionName;
}
namespace newFolder {

Loading…
Cancel
Save