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

TQt4 port kbookreader

Browse Source 
This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kbookreader@1242484 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent 5cce029293
commit 0525bd68b1
15 changed files with 356 additions and 352 deletions
Show Stats Download Patch File Download Diff File

2
src/bookmark.cpp
Unescape View File

@ -19,7 +19,7 @@
***************************************************************************/ ***************************************************************************/
#include "bookmark.h" #include "bookmark.h"
Bookmark::Bookmark(int page, const QString& name, QDateTime dateTime): Bookmark::Bookmark(int page, const TQString& name, TQDateTime dateTime):
m_page(page), m_page(page),
m_name(name), m_name(name),
m_dateTime(dateTime) m_dateTime(dateTime)

18
src/bookmark.h
Unescape View File

@ -20,8 +20,8 @@
#ifndef BOOKMARK_H #ifndef BOOKMARK_H
#define BOOKMARK_H #define BOOKMARK_H
#include <qdatetime.h> #include <tqdatetime.h>
#include <qstring.h> #include <tqstring.h>
#include <vector> #include <vector>
class Bookmark; class Bookmark;
@ -32,26 +32,26 @@ typedef std::vector<Bookmark> Bookmarks;
class Bookmark class Bookmark
{ {
public: public:
Bookmark(int page, const QString& name = QString::null, Bookmark(int page, const TQString& name = TQString(),
QDateTime dateTime = QDateTime::currentDateTime()); TQDateTime dateTime = TQDateTime::tqcurrentDateTime());
~Bookmark(); ~Bookmark();
void setPage(unsigned int page) { m_page = page; } void setPage(unsigned int page) { m_page = page; }
unsigned int page() const { return m_page; } unsigned int page() const { return m_page; }
const QString & name() const { return m_name; } const TQString & name() const { return m_name; }
const QDateTime & dateTime() const { return m_dateTime; } const TQDateTime & dateTime() const { return m_dateTime; }
bool operator < (const Bookmark& rhs) const { return (m_page < rhs.m_page); } bool operator < (const Bookmark& rhs) const { return (m_page < rhs.m_page); }
void setName(const QString& theValue) void setName(const TQString& theValue)
{ {
m_name = theValue; m_name = theValue;
} }
private: private:
unsigned int m_page; unsigned int m_page;
QString m_name; TQString m_name;
QDateTime m_dateTime; TQDateTime m_dateTime;
}; };
#endif #endif

82
src/bookmarksdlg.cpp
Unescape View File

@ -18,83 +18,83 @@
***************************************************************************/ ***************************************************************************/
#include <kdialog.h> #include <kdialog.h>
#include <klocale.h> #include <klocale.h>
#include <qvariant.h> #include <tqvariant.h>
#include <qpushbutton.h> #include <tqpushbutton.h>
#include <qheader.h> #include <tqheader.h>
#include <qtable.h> #include <tqtable.h>
#include <qlayout.h> #include <tqlayout.h>
#include <qtooltip.h> #include <tqtooltip.h>
#include <qwhatsthis.h> #include <tqwhatsthis.h>
#include "bookmarksdlg.h" #include "bookmarksdlg.h"
/* /*
* Constructs a BookmarksDlg as a child of 'parent', with the * Constructs a BookmarksDlg as a child of 'tqparent', with the
* name 'name' and widget flags set to 'f'. * name 'name' and widget flags set to 'f'.
* *
* The dialog will by default be modeless, unless you set 'modal' to * The dialog will by default be modeless, unless you set 'modal' to
* TRUE to construct a modal dialog. * TRUE to construct a modal dialog.
*/ */
BookmarksDlg::BookmarksDlg(const Bookmarks& bms, QWidget* parent, BookmarksDlg::BookmarksDlg(const Bookmarks& bms, TQWidget* tqparent,
const char* name, bool modal, WFlags fl) const char* name, bool modal, WFlags fl)
: QDialog(parent, name, modal, fl), : TQDialog(tqparent, name, modal, fl),
m_bookmarks(bms) m_bookmarks(bms)
{ {
if ( !name ) if ( !name )
setName( "BookmarksDlg" ); setName( "BookmarksDlg" );
setSizeGripEnabled(TRUE); setSizeGripEnabled(TRUE);
BookmarksDlgLayout = new QVBoxLayout( this, 11, 6, "BookmarksDlgLayout"); BookmarksDlgLayout = new TQVBoxLayout( this, 11, 6, "BookmarksDlgLayout");
layout3 = new QHBoxLayout( 0, 0, 6, "layout3"); tqlayout3 = new TQHBoxLayout( 0, 0, 6, "tqlayout3");
bookmarksTable = new QTable(3, 2, this, "bookmarksList" ); bookmarksTable = new TQTable(3, 2, this, "bookmarksList" );
bookmarksTable->horizontalHeader()->setLabel(0, "Title"); bookmarksTable->horizontalHeader()->setLabel(0, "Title");
bookmarksTable->horizontalHeader()->setLabel(1, "Page number"); bookmarksTable->horizontalHeader()->setLabel(1, "Page number");
// bookmarksTable->setLeftMargin(0); // bookmarksTable->setLeftMargin(0);
bookmarksTable->setColumnStretchable(0, true); bookmarksTable->setColumnStretchable(0, true);
bookmarksTable->setSelectionMode(QTable::SingleRow); bookmarksTable->setSelectionMode(TQTable::SingleRow);
layout3->addWidget( bookmarksTable ); tqlayout3->addWidget( bookmarksTable );
layout2 = new QVBoxLayout( 0, 0, 6, "layout2"); tqlayout2 = new TQVBoxLayout( 0, 0, 6, "tqlayout2");
addButton = new QPushButton( this, "addButton" ); addButton = new TQPushButton( this, "addButton" );
layout2->addWidget( addButton ); tqlayout2->addWidget( addButton );
deleteButton = new QPushButton( this, "deleteButton" ); deleteButton = new TQPushButton( this, "deleteButton" );
layout2->addWidget( deleteButton ); tqlayout2->addWidget( deleteButton );
Horizontal_Spacing2_2 = new QSpacerItem( 20, 60, QSizePolicy::Minimum, QSizePolicy::Expanding ); Horizontal_Spacing2_2 = new TQSpacerItem( 20, 60, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
layout2->addItem( Horizontal_Spacing2_2 ); tqlayout2->addItem( Horizontal_Spacing2_2 );
layout3->addLayout( layout2 ); tqlayout3->addLayout( tqlayout2 );
BookmarksDlgLayout->addLayout( layout3 ); BookmarksDlgLayout->addLayout( tqlayout3 );
Layout1 = new QHBoxLayout( 0, 0, 6, "Layout1"); Layout1 = new TQHBoxLayout( 0, 0, 6, "Layout1");
buttonHelp = new QPushButton( this, "buttonHelp" ); buttonHelp = new TQPushButton( this, "buttonHelp" );
buttonHelp->setAutoDefault( TRUE ); buttonHelp->setAutoDefault( TRUE );
Layout1->addWidget( buttonHelp ); Layout1->addWidget( buttonHelp );
Horizontal_Spacing2 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); Horizontal_Spacing2 = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
Layout1->addItem( Horizontal_Spacing2 ); Layout1->addItem( Horizontal_Spacing2 );
buttonOk = new QPushButton( this, "buttonOk" ); buttonOk = new TQPushButton( this, "buttonOk" );
buttonOk->setAutoDefault( TRUE ); buttonOk->setAutoDefault( TRUE );
buttonOk->setDefault( TRUE ); buttonOk->setDefault( TRUE );
Layout1->addWidget( buttonOk ); Layout1->addWidget( buttonOk );
buttonCancel = new QPushButton( this, "buttonCancel" ); buttonCancel = new TQPushButton( this, "buttonCancel" );
buttonCancel->setAutoDefault( TRUE ); buttonCancel->setAutoDefault( TRUE );
Layout1->addWidget( buttonCancel ); Layout1->addWidget( buttonCancel );
BookmarksDlgLayout->addLayout( Layout1 ); BookmarksDlgLayout->addLayout( Layout1 );
languageChange(); languageChange();
resize( QSize(400, 267).expandedTo(minimumSizeHint()) ); resize( TQSize(400, 267).expandedTo(tqminimumSizeHint()) );
clearWState( WState_Polished ); clearWState( WState_Polished );
updateBookmarks(); updateBookmarks();
// signals and slots connections // signals and slots connections
connect(buttonOk, SIGNAL(clicked()), this, SLOT(accept())); connect(buttonOk, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()));
connect(buttonCancel, SIGNAL(clicked()), this, SLOT(reject())); connect(buttonCancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()));
connect(addButton, SIGNAL(clicked()), this, SLOT(addBookmark())); connect(addButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addBookmark()));
connect(deleteButton, SIGNAL(clicked()), this, SLOT(deleteBookmark())); connect(deleteButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteBookmark()));
connect(bookmarksTable, SIGNAL(valueChanged(int, int)), this, SLOT(valueChanged(int, int))); connect(bookmarksTable, TQT_SIGNAL(valueChanged(int, int)), this, TQT_SLOT(valueChanged(int, int)));
} }
/* /*
@ -102,7 +102,7 @@ BookmarksDlg::BookmarksDlg(const Bookmarks& bms, QWidget* parent,
*/ */
BookmarksDlg::~BookmarksDlg() BookmarksDlg::~BookmarksDlg()
{ {
// no need to delete child widgets, Qt does it all for us // no need to delete child widgets, TQt does it all for us
} }
/* /*
@ -115,11 +115,11 @@ void BookmarksDlg::languageChange()
addButton->setText( tr2i18n( "Add" ) ); addButton->setText( tr2i18n( "Add" ) );
deleteButton->setText( tr2i18n( "Delete" ) ); deleteButton->setText( tr2i18n( "Delete" ) );
buttonHelp->setText( tr2i18n( "&Help" ) ); buttonHelp->setText( tr2i18n( "&Help" ) );
buttonHelp->setAccel( QKeySequence( tr2i18n( "F1" ) ) ); buttonHelp->setAccel( TQKeySequence( tr2i18n( "F1" ) ) );
buttonOk->setText( tr2i18n( "&OK" ) ); buttonOk->setText( tr2i18n( "&OK" ) );
buttonOk->setAccel( QKeySequence( QString::null ) ); buttonOk->setAccel( TQKeySequence( TQString() ) );
buttonCancel->setText( tr2i18n( "Ca&ncel" ) ); buttonCancel->setText( tr2i18n( "Ca&ncel" ) );
buttonCancel->setAccel( QKeySequence( tr2i18n( "Alt+N" ) ) ); buttonCancel->setAccel( TQKeySequence( tr2i18n( "Alt+N" ) ) );
} }
void BookmarksDlg::addBookmark() void BookmarksDlg::addBookmark()
@ -147,7 +147,7 @@ void BookmarksDlg::updateBookmarks()
const Bookmark& bm = m_bookmarks[i]; const Bookmark& bm = m_bookmarks[i];
bookmarksTable->setNumRows(i+1); bookmarksTable->setNumRows(i+1);
bookmarksTable->setText(i, 0, bm.name()); bookmarksTable->setText(i, 0, bm.name());
bookmarksTable->setText(i, 1, QString::number(bm.page())); bookmarksTable->setText(i, 1, TQString::number(bm.page()));
} }
} }
@ -167,7 +167,7 @@ void BookmarksDlg::valueChanged(int row, int col)
bm.setPage(page); bm.setPage(page);
else else
//return old value //return old value
bookmarksTable->setText(row, col, QString::number(bm.page())); bookmarksTable->setText(row, col, TQString::number(bm.page()));
} }
} }

45
src/bookmarksdlg.h
Unescape View File

@ -20,43 +20,44 @@
#ifndef BOOKMARKSDLG_H #ifndef BOOKMARKSDLG_H
#define BOOKMARKSDLG_H #define BOOKMARKSDLG_H
#include <qvariant.h> #include <tqvariant.h>
#include <qdialog.h> #include <tqdialog.h>
#include <algorithm> #include <algorithm>
#include "bookmark.h" #include "bookmark.h"
class QVBoxLayout; class TQVBoxLayout;
class QHBoxLayout; class TQHBoxLayout;
class QGridLayout; class TQGridLayout;
class QSpacerItem; class TQSpacerItem;
class QTable; class TQTable;
class QPushButton; class TQPushButton;
class BookmarksDlg : public QDialog class BookmarksDlg : public TQDialog
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
BookmarksDlg(const Bookmarks& bms, QWidget* parent = 0, BookmarksDlg(const Bookmarks& bms, TQWidget* tqparent = 0,
const char* name = 0, bool modal = FALSE, WFlags fl = 0); const char* name = 0, bool modal = FALSE, WFlags fl = 0);
~BookmarksDlg(); ~BookmarksDlg();
const Bookmarks& bookmarks() const { return m_bookmarks; } const Bookmarks& bookmarks() const { return m_bookmarks; }
QTable* bookmarksTable; TQTable* bookmarksTable;
QPushButton* addButton; TQPushButton* addButton;
QPushButton* deleteButton; TQPushButton* deleteButton;
QPushButton* buttonHelp; TQPushButton* buttonHelp;
QPushButton* buttonOk; TQPushButton* buttonOk;
QPushButton* buttonCancel; TQPushButton* buttonCancel;
protected: protected:
QVBoxLayout* BookmarksDlgLayout; TQVBoxLayout* BookmarksDlgLayout;
QHBoxLayout* layout3; TQHBoxLayout* tqlayout3;
QVBoxLayout* layout2; TQVBoxLayout* tqlayout2;
QSpacerItem* Horizontal_Spacing2_2; TQSpacerItem* Horizontal_Spacing2_2;
QHBoxLayout* Layout1; TQHBoxLayout* Layout1;
QSpacerItem* Horizontal_Spacing2; TQSpacerItem* Horizontal_Spacing2;
protected slots: protected slots:
virtual void languageChange(); virtual void languageChange();

116
src/bookreader.cpp
Unescape View File

@ -42,12 +42,12 @@
#include <kurldrag.h> #include <kurldrag.h>
#include <kurlrequesterdlg.h> #include <kurlrequesterdlg.h>
#include <kio/netaccess.h> #include <kio/netaccess.h>
#include <qdragobject.h> #include <tqdragobject.h>
#include <qpainter.h> #include <tqpainter.h>
#include <qpaintdevicemetrics.h> #include <tqpaintdevicemetrics.h>
#include <qpixmap.h> #include <tqpixmap.h>
#include <qtextcodec.h> #include <tqtextcodec.h>
#include <qsignalmapper.h> #include <tqsignalmapper.h>
#include <assert.h> #include <assert.h>
#include "bookreader.h" #include "bookreader.h"
#include "settings.h" #include "settings.h"
@ -55,10 +55,10 @@
#include "bookmarksdlg.h" #include "bookmarksdlg.h"
namespace { namespace {
QStringList listEncodings() TQStringList listEncodings()
{ {
const QStringList encodings(KGlobal::charsets()->availableEncodingNames()); const TQStringList encodings(KGlobal::charsets()->availableEncodingNames());
QStringList availEncodings; TQStringList availEncodings;
for (unsigned int i=0; i < encodings.count(); ++i) for (unsigned int i=0; i < encodings.count(); ++i)
{ {
bool found = false; bool found = false;
@ -79,7 +79,7 @@ BookReader::BookReader()
m_printer(0) m_printer(0)
{ {
QPixmap splash(KGlobal::dirs()->findResource("appdata", TQPixmap splash(KGlobal::dirs()->findResource("appdata",
"themes/default/splash.png")); "themes/default/splash.png"));
m_splash = new KSplashScreen(splash); m_splash = new KSplashScreen(splash);
m_splash->show(); m_splash->show();
@ -99,19 +99,19 @@ BookReader::BookReader()
// automatically save settings if changed: window size, toolbar // automatically save settings if changed: window size, toolbar
// position, icon size, etc. Also to add actions for the statusbar // position, icon size, etc. Also to add actions for the statusbar
// toolbar, and keybindings if necessary. // toolbar, and keybindings if necessary.
KStdAction::keyBindings(guiFactory(), SLOT(configureShortcuts()), actionCollection()); KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection());
createStandardStatusBarAction(); createStandardStatusBarAction();
setStandardToolBarMenuEnabled( true ); setStandardToolBarMenuEnabled( true );
KStdAction::configureToolbars(this, SLOT(configureToolbars() ), actionCollection()); KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configureToolbars() ), actionCollection());
createGUI(QString::null, false); createGUI(TQString(), false);
initialGeometrySet(); initialGeometrySet();
setAutoSaveSettings(); setAutoSaveSettings();
// allow the view to change the statusbar and caption // allow the view to change the statusbar and caption
connect(m_view, SIGNAL(signalChangeStatusbar(const QString&)), connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)),
this, SLOT(changeStatusbar(const QString&))); TQT_TQOBJECT(this), TQT_SLOT(changeStatusbar(const TQString&)));
connect(m_view, SIGNAL(signalChangeCaption(const QString&)), connect(m_view, TQT_SIGNAL(signalChangeCaption(const TQString&)),
this, SLOT(changeCaption(const QString&))); TQT_TQOBJECT(this), TQT_SLOT(changeCaption(const TQString&)));
readSettings(); readSettings();
m_splash->finish(m_view); m_splash->finish(m_view);
@ -125,7 +125,7 @@ BookReader::~BookReader()
void BookReader::load(const KURL& url) void BookReader::load(const KURL& url)
{ {
QString target; TQString target;
// download the contents // download the contents
if(!KIO::NetAccess::download(url, target, this)) if(!KIO::NetAccess::download(url, target, this))
{ {
@ -141,29 +141,29 @@ void BookReader::load(const KURL& url)
void BookReader::setupActions() void BookReader::setupActions()
{ {
// KStdAction::openNew(this, SLOT(fileNew()), actionCollection()); // KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(fileNew()), actionCollection());
KStdAction::open(this, SLOT(fileOpen()), actionCollection()); KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection());
recentFilesAction = KStdAction::openRecent(this, SLOT(slotURLSelected(const KURL &)), recentFilesAction = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotURLSelected(const KURL &)),
actionCollection()); actionCollection());
KStdAction::save(this, SLOT(fileSave()), actionCollection()); KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(fileSave()), actionCollection());
KStdAction::saveAs(this, SLOT(fileSaveAs()), actionCollection()); KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(fileSaveAs()), actionCollection());
KStdAction::print(this, SLOT(filePrint()), actionCollection()); KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(filePrint()), actionCollection());
KStdAction::quit(kapp, SLOT(quit()), actionCollection()); KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection());
KStdAction::firstPage(this, SLOT(gotoFirstPage()), actionCollection()); KStdAction::firstPage(TQT_TQOBJECT(this), TQT_SLOT(gotoFirstPage()), actionCollection());
KStdAction::prior(this, SLOT(prevPage()), actionCollection()); KStdAction::prior(TQT_TQOBJECT(this), TQT_SLOT(prevPage()), actionCollection());
KStdAction::next(this, SLOT(nextPage()), actionCollection()); KStdAction::next(TQT_TQOBJECT(this), TQT_SLOT(nextPage()), actionCollection());
KStdAction::lastPage(this, SLOT(gotoLastPage()), actionCollection()); KStdAction::lastPage(TQT_TQOBJECT(this), TQT_SLOT(gotoLastPage()), actionCollection());
KStdAction::addBookmark(this, SLOT(addBookmark()), actionCollection()); KStdAction::addBookmark(TQT_TQOBJECT(this), TQT_SLOT(addBookmark()), actionCollection());
KStdAction::editBookmarks(this, SLOT(editBookmarks()), actionCollection()); KStdAction::editBookmarks(TQT_TQOBJECT(this), TQT_SLOT(editBookmarks()), actionCollection());
KStdAction::gotoPage(this, SLOT(gotoPage()), actionCollection()); KStdAction::gotoPage(TQT_TQOBJECT(this), TQT_SLOT(gotoPage()), actionCollection());
m_fullScreenAction = KStdAction::fullScreen(this, SLOT(fullScreen()), m_fullScreenAction = KStdAction::fullScreen(TQT_TQOBJECT(this), TQT_SLOT(fullScreen()),
actionCollection(), this); actionCollection(), this);
KStdAction::preferences(this, SLOT(optionsPreferences()), actionCollection()); KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsPreferences()), actionCollection());
KConfig *config = kapp->config(); KConfig *config = kapp->config();
recentFilesAction->loadEntries(config); recentFilesAction->loadEntries(config);
@ -172,7 +172,7 @@ void BookReader::setupActions()
// how to insert a custom menu and menu item // how to insert a custom menu and menu item
/* /*
KAction *custom = new KAction( i18n( "Cus&tom Menuitem" ), 0, KAction *custom = new KAction( i18n( "Cus&tom Menuitem" ), 0,
this, SLOT( optionsPreferences() ), TQT_TQOBJECT(this), TQT_SLOT( optionsPreferences() ),
actionCollection(), "custom_action" );*/ actionCollection(), "custom_action" );*/
} }
@ -195,7 +195,7 @@ void BookReader::readProperties(KConfig */*config*/)
// the app is being restored. read in here whatever you wrote // the app is being restored. read in here whatever you wrote
// in 'saveProperties' // in 'saveProperties'
// QString url = config->readPathEntry("lastURL"); // TQString url = config->readPathEntry("lastURL");
// int currentPage = config->readEntry("currentPage").toInt(); // int currentPage = config->readEntry("currentPage").toInt();
/* Disable forawhile /* Disable forawhile
if (!url.isEmpty()) if (!url.isEmpty())
@ -206,16 +206,16 @@ void BookReader::readProperties(KConfig */*config*/)
*/ */
} }
void BookReader::dragEnterEvent(QDragEnterEvent *event) void BookReader::dragEnterEvent(TQDragEnterEvent *event)
{ {
// accept uri drops only // accept uri drops only
event->accept(KURLDrag::canDecode(event)); event->accept(KURLDrag::canDecode(event));
} }
void BookReader::dropEvent(QDropEvent *event) void BookReader::dropEvent(TQDropEvent *event)
{ {
// this is a very simplistic implementation of a drop event. we // this is a very simplistic implementation of a drop event. we
// will only accept a dropped URL. the Qt dnd code can do *much* // will only accept a dropped URL. the TQt dnd code can do *much*
// much more, so please read the docs there // much more, so please read the docs there
KURL::List urls; KURL::List urls;
@ -237,7 +237,7 @@ void BookReader::fileOpen()
// button is clicked // button is clicked
/* /*
// this brings up the generic open dialog // this brings up the generic open dialog
KURL url = KURLRequesterDlg::getURL(QString::null, this, i18n("Open Location") ); KURL url = KURLRequesterDlg::getURL(TQString(), this, i18n("Open Location") );
*/ */
// standard filedialog // standard filedialog
KEncodingFileDialog::Result res = KEncodingFileDialog::Result res =
@ -276,14 +276,14 @@ void BookReader::filePrint()
if (!m_printer) m_printer = new KPrinter; if (!m_printer) m_printer = new KPrinter;
if (m_printer->setup(this)) if (m_printer->setup(this))
{ {
// setup the printer. with Qt, you always "print" to a // setup the printer. with TQt, you always "print" to a
// QPainter.. whether the output medium is a pixmap, a screen, // TQPainter.. whether the output medium is a pixmap, a screen,
// or paper // or paper
QPainter p; TQPainter p;
p.begin(m_printer); p.begin(m_printer);
// we let our view do the actual printing // we let our view do the actual printing
QPaintDeviceMetrics metrics(m_printer); TQPaintDeviceMetrics metrics(m_printer);
//m_view->print( &p, metrics.height(), metrics.width() ); //m_view->print( &p, metrics.height(), metrics.width() );
// and send the result to the printer // and send the result to the printer
@ -300,11 +300,11 @@ void BookReader::optionsPreferences()
KDialogBase::IconList); KDialogBase::IconList);
SettingsWidget *general = new SettingsWidget(0, "General"); SettingsWidget *general = new SettingsWidget(0, "General");
const QStringList encodings(listEncodings()); const TQStringList encodings(listEncodings());
QString curEncoding(encodings[Settings::defaultEncoding()]); TQString curEncoding(encodings[Settings::defaultEncoding()]);
if (curEncoding.isEmpty()) if (curEncoding.isEmpty())
curEncoding = QString::fromLatin1(KGlobal::locale()->encoding()); curEncoding = TQString::tqfromLatin1(KGlobal::locale()->encoding());
general->kcfg_DefaultEncoding->clear(); general->kcfg_DefaultEncoding->clear();
general->kcfg_DefaultEncoding->insertStringList(encodings); general->kcfg_DefaultEncoding->insertStringList(encodings);
@ -313,17 +313,17 @@ void BookReader::optionsPreferences()
general->kcfg_DefaultEncoding->setCurrentItem(i); general->kcfg_DefaultEncoding->setCurrentItem(i);
dialog->addPage(general, i18n("General"), "settings"); dialog->addPage(general, i18n("General"), "settings");
connect(dialog, SIGNAL(settingsChanged()), this, SLOT(loadSettings())); connect(dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(loadSettings()));
dialog->show(); dialog->show();
} }
void BookReader::changeStatusbar(const QString& text) void BookReader::changeStatusbar(const TQString& text)
{ {
// display the text on the statusbar // display the text on the statusbar
statusBar()->message(text); statusBar()->message(text);
} }
void BookReader::changeCaption(const QString& text) void BookReader::changeCaption(const TQString& text)
{ {
// display the text on the caption // display the text on the caption
setCaption(text); setCaption(text);
@ -388,9 +388,9 @@ void BookReader::fullScreen()
void BookReader::loadLastUrl() void BookReader::loadLastUrl()
{ {
KConfig * config = kapp->config(); KConfig * config = kapp->config();
QSize size = config->readSizeEntry("size"); TQSize size = config->readSizeEntry("size");
lastURL = config->readEntry("lastURL"); lastURL = config->readEntry("lastURL");
connect(m_view, SIGNAL(loadingFinished()), this, SLOT(loadLastURLSetPage())); connect(m_view, TQT_SIGNAL(loadingFinished()), TQT_TQOBJECT(this), TQT_SLOT(loadLastURLSetPage()));
if (!lastURL.isEmpty()) if (!lastURL.isEmpty())
{ {
// kdDebug() << "loadLastUrl: initial size = " << m_view->size() << endl; // kdDebug() << "loadLastUrl: initial size = " << m_view->size() << endl;
@ -405,7 +405,7 @@ void BookReader::loadLastUrl()
void BookReader::loaded(int loaded) void BookReader::loaded(int loaded)
{ {
//m_loaded = loaded; //m_loaded = loaded;
m_splash->message(tr("Loading: %1 - %2%").arg(lastURL.fileName()).arg(loaded)); m_splash->message(tqtr("Loading: %1 - %2%").tqarg(lastURL.fileName()).tqarg(loaded));
} }
void BookReader::gotoFirstPage() void BookReader::gotoFirstPage()
@ -446,7 +446,7 @@ void BookReader::loadLastURLSetPage()
void BookReader::addBookmark() void BookReader::addBookmark()
{ {
bool isOk; bool isOk;
QString name = KInputDialog::getText(tr("Add bookmark"), TQString name = KInputDialog::getText(tr("Add bookmark"),
tr("Bookmark name"), tr("Here"), &isOk); tr("Bookmark name"), tr("Here"), &isOk);
if (isOk) if (isOk)
{ {
@ -465,13 +465,13 @@ void BookReader::updateBookmarks()
m_bookmarkActions.setAutoDelete(true); m_bookmarkActions.setAutoDelete(true);
const Bookmarks & bms = m_view->bookmarks(); const Bookmarks & bms = m_view->bookmarks();
QSignalMapper *bookmarkMapper = new QSignalMapper(this); TQSignalMapper *bookmarkMapper = new TQSignalMapper(TQT_TQOBJECT(this));
connect(bookmarkMapper, SIGNAL(mapped(int)), this, SLOT(gotoBookmark(int))); connect(bookmarkMapper, TQT_SIGNAL(mapped(int)), TQT_TQOBJECT(this), TQT_SLOT(gotoBookmark(int)));
for (Bookmarks::size_type i = 0; i < 9 && i < bms.size(); ++i) for (Bookmarks::size_type i = 0; i < 9 && i < bms.size(); ++i)
{ {
const Bookmark & bm = bms[i]; const Bookmark & bm = bms[i];
KAction * action = new KAction(bm.name(), ALT+Key_1 + i); KAction * action = new KAction(bm.name(), ALT+Key_1 + i);
connect(action, SIGNAL(activated()), bookmarkMapper, SLOT(map())); connect(action, TQT_SIGNAL(activated()), bookmarkMapper, TQT_SLOT(map()));
m_bookmarkActions.append(action); m_bookmarkActions.append(action);
bookmarkMapper->setMapping(action, i); bookmarkMapper->setMapping(action, i);
} }
@ -500,7 +500,7 @@ void BookReader::editBookmarks()
{ {
/// @todo implement me /// @todo implement me
BookmarksDlg dialog(m_view->bookmarks()); BookmarksDlg dialog(m_view->bookmarks());
if (dialog.exec() == QDialog::Accepted) if (dialog.exec() == TQDialog::Accepted)
{ {
m_view->setBookmarks(dialog.bookmarks()); m_view->setBookmarks(dialog.bookmarks());
updateBookmarks(); updateBookmarks();

13
src/bookreader.h
Unescape View File

@ -45,6 +45,7 @@ class KSplashScreen;
class BookReader : public KMainWindow class BookReader : public KMainWindow
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
/** /**
* Default Constructor * Default Constructor
@ -65,10 +66,10 @@ public:
protected: protected:
/** /**
* Overridden virtuals for Qt drag 'n drop (XDND) * Overridden virtuals for TQt drag 'n drop (XDND)
*/ */
virtual void dragEnterEvent(QDragEnterEvent *event); virtual void dragEnterEvent(TQDragEnterEvent *event);
virtual void dropEvent(QDropEvent *event); virtual void dropEvent(TQDropEvent *event);
virtual bool queryExit(); virtual bool queryExit();
protected: protected:
@ -94,8 +95,8 @@ private slots:
void optionsPreferences(); void optionsPreferences();
void slotURLSelected(const KURL &); void slotURLSelected(const KURL &);
void fullScreen(); void fullScreen();
void changeStatusbar(const QString& text); void changeStatusbar(const TQString& text);
void changeCaption(const QString& text); void changeCaption(const TQString& text);
void loadSettings(); void loadSettings();
void loaded(int); void loaded(int);
void gotoFirstPage(); void gotoFirstPage();
@ -117,7 +118,7 @@ private:
//Actions //Actions
KRecentFilesAction * recentFilesAction; KRecentFilesAction * recentFilesAction;
KToggleFullScreenAction * m_fullScreenAction; KToggleFullScreenAction * m_fullScreenAction;
QPtrList<KAction> m_bookmarkActions; TQPtrList<KAction> m_bookmarkActions;
KURL lastURL; KURL lastURL;
KSplashScreen * m_splash; KSplashScreen * m_splash;
KPrinter * m_printer; KPrinter * m_printer;

14
src/bookreader_client.cpp
Unescape View File

@ -21,8 +21,8 @@
#include <kapplication.h> #include <kapplication.h>
#include <dcopclient.h> #include <dcopclient.h>
#include <qdatastream.h> #include <tqdatastream.h>
#include <qstring.h> #include <tqstring.h>
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
@ -33,13 +33,13 @@ int main(int argc, char **argv)
client->attach(); client->attach();
// do a 'send' for now // do a 'send' for now
QByteArray data; TQByteArray data;
QDataStream ds(data, IO_WriteOnly); TQDataStream ds(data, IO_WriteOnly);
if (argc > 1) if (argc > 1)
ds << QString(argv[1]); ds << TQString(argv[1]);
else else
ds << QString("http://www.kde.org"); ds << TQString("http://www.kde.org");
client->send("bookreader", "BookReaderIface", "openURL(QString)", data); client->send("bookreader", "BookReaderIface", "openURL(TQString)", data);
return app.exec(); return app.exec();
} }

2
src/bookreaderiface.h
Unescape View File

@ -30,7 +30,7 @@ class BookReaderIface : virtual public DCOPObject
public: public:
k_dcop: k_dcop:
virtual void openURL(QString url) = 0; virtual void openURL(TQString url) = 0;
}; };
#endif // _BOOKREADERIFACE_H_ #endif // _BOOKREADERIFACE_H_

176
src/bookwidget.cpp
Unescape View File

@ -16,15 +16,15 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#include <qpainter.h> #include <tqpainter.h>
#include <qevent.h> #include <tqevent.h>
#include <qimage.h> #include <tqimage.h>
#include <kdebug.h> #include <kdebug.h>
#include <kprogress.h> #include <kprogress.h>
#include <qfile.h> #include <tqfile.h>
#include <qtextstream.h> #include <tqtextstream.h>
#include <qtextcodec.h> #include <tqtextcodec.h>
#include <qstring.h> #include <tqstring.h>
#include <kglobal.h> #include <kglobal.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include "bookwidget.h" #include "bookwidget.h"
@ -33,12 +33,12 @@
#include "renderer.h" #include "renderer.h"
//#include "ktextprogressdlg.h" //#include "ktextprogressdlg.h"
class QStringList; class TQStringList;
class QRect; class TQRect;
class QPixmap; class TQPixmap;
BookWidget::BookWidget(QWidget *parent, const char *name) BookWidget::BookWidget(TQWidget *tqparent, const char *name)
: QWidget(parent, name), : TQWidget(tqparent, name),
m_modified(true), m_modified(true),
m_currentPage(0), m_currentPage(0),
m_left_margin(0), m_left_margin(0),
@ -61,11 +61,11 @@ BookWidget::BookWidget(QWidget *parent, const char *name)
Theme::self()->loadTheme("default"); Theme::self()->loadTheme("default");
setWFlags(Qt::WNoAutoErase); setWFlags(TQt::WNoAutoErase);
setFocusPolicy(QWidget::StrongFocus); setFocusPolicy(TQ_StrongFocus);
connect(&m_timer, SIGNAL(timeout()), this, SLOT(loadLine())); connect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(loadLine()));
connect(m_renderer.get(), SIGNAL(renderingFinished()), this, SLOT(renderingFinished())); connect(m_renderer.get(), TQT_SIGNAL(renderingFinished()), this, TQT_SLOT(renderingFinished()));
} }
@ -80,10 +80,10 @@ void BookWidget::openURL(const KURL & url)
if (! m_file.open(IO_ReadOnly)) return; if (! m_file.open(IO_ReadOnly)) return;
///@todo Write encoding detection ///@todo Write encoding detection
m_stream.reset(new QTextStream(&m_file)); m_stream.reset(new TQTextStream(&m_file));
m_textLines.reset(new QStringList); m_textLines.reset(new TQStringList);
QString name(encoding()); TQString name(encoding());
QTextCodec *codec = QTextCodec::codecForName(encoding()); // get the codec TQTextCodec *codec = TQTextCodec::codecForName(encoding()); // get the codec
if (codec) if (codec)
m_stream->setCodec(codec); m_stream->setCodec(codec);
//show progress dialog //show progress dialog
@ -92,7 +92,7 @@ void BookWidget::openURL(const KURL & url)
m_progressDlg->setLabel("Loading file " + m_url.path()); m_progressDlg->setLabel("Loading file " + m_url.path());
m_progressDlg->setAllowCancel(true); m_progressDlg->setAllowCancel(true);
m_progressDlg->progressBar()->setTotalSteps(0); m_progressDlg->progressBar()->setTotalSteps(0);
connect(m_progressDlg.get(), SIGNAL(cancelClicked()), SLOT(cancelLoading())); connect(m_progressDlg.get(), TQT_SIGNAL(cancelClicked()), TQT_SLOT(cancelLoading()));
KDialog::centerOnScreen(m_progressDlg.get()); KDialog::centerOnScreen(m_progressDlg.get());
m_progressDlg->show(); m_progressDlg->show();
//start timer for processing gui events //start timer for processing gui events
@ -103,90 +103,90 @@ void BookWidget::openURL(const KURL & url)
emit signalChangeStatusbar(m_url.prettyURL()); emit signalChangeStatusbar(m_url.prettyURL());
} }
QString BookWidget::currentURL() TQString BookWidget::currentURL()
{ {
return m_url.path(); return m_url.path();
} }
void BookWidget::drawContent(QPainter& paint) void BookWidget::drawContent(TQPainter& paint)
{ {
const QRect lrect (rectLeftPage()); const TQRect lrect (rectLeftPage());
const QRect rrect(rectRightPage()); const TQRect rrect(rectRightPage());
const unsigned int curPage = currentPage(); const unsigned int curPage = currentPage();
//draw pages //draw pages
m_renderer->drawPage(paint, lrect, curPage); m_renderer->drawPage(paint, lrect, curPage);
m_renderer->drawPage(paint, rrect, curPage + 1); m_renderer->drawPage(paint, rrect, curPage + 1);
} }
void BookWidget::drawPageNumbers(QPainter & paint) void BookWidget::drawPageNumbers(TQPainter & paint)
{ {
if (m_renderer->isEmpty()) if (m_renderer->isEmpty())
return; return;
const QRect lrect (rectLeftPage()); const TQRect lrect (rectLeftPage());
const QRect rrect(rectRightPage()); const TQRect rrect(rectRightPage());
const QString number = QString::number(currentPage() + 2); const TQString number = TQString::number(currentPage() + 2);
// setup font // setup font
QFont pageFont(font()); TQFont pageFont(font());
int pointSize = 10; int pointSize = 10;
pageFont.setPointSize(pointSize); pageFont.setPointSize(pointSize);
pageFont.setBold(false); pageFont.setBold(false);
pageFont.setItalic(false); pageFont.setItalic(false);
pageFont.setUnderline(false); pageFont.setUnderline(false);
paint.setFont(pageFont); paint.setFont(pageFont);
const QFontMetrics fm(pageFont); const TQFontMetrics fm(pageFont);
const int width = fm.width(number); const int width = fm.width(number);
//paint page numbers //paint page numbers
const int offset = 8; const int offset = 8;
paint.drawText(lrect.left(), QWidget::height() - offset, paint.drawText(lrect.left(), TQWidget::height() - offset,
QString::number(currentPage() + 1)); TQString::number(currentPage() + 1));
paint.drawText(rrect.left() + rrect.width() - width, paint.drawText(rrect.left() + rrect.width() - width,
QWidget::height() - offset, number); TQWidget::height() - offset, number);
} }
void BookWidget::drawBookmark(QPainter & paint, Bookmark const& bm) void BookWidget::drawBookmark(TQPainter & paint, Bookmark const& bm)
{ {
const QRect lrect (rectLeftPage()); const TQRect lrect (rectLeftPage());
const QRect rrect(rectRightPage()); const TQRect rrect(rectRightPage());
const QPixmap & bookmarkImage = Theme::self()->bookmarkPixmap(); const TQPixmap & bookmarkImage = Theme::self()->bookmarkPixmap();
const int width = bookmarkImage.width(); const int width = bookmarkImage.width();
paint.drawPixmap(QWidget::width()/2 - width/2, 0, bookmarkImage); paint.drawPixmap(TQWidget::width()/2 - width/2, 0, bookmarkImage);
if (!bm.name().isEmpty()) if (!bm.name().isEmpty())
{ {
paint.save(); paint.save();
paint.translate(QWidget::width()/2., 20.); paint.translate(TQWidget::width()/2., 20.);
paint.rotate(90.); paint.rotate(90.);
const QString text = bm.name() + " (" + bm.dateTime().toString(Qt::LocalDate) + ")"; const TQString text = bm.name() + " (" + bm.dateTime().toString(Qt::LocalDate) + ")";
paint.drawText(0, 0, text); paint.drawText(0, 0, text);
paint.restore(); paint.restore();
} }
} }
void BookWidget::paintEvent(QPaintEvent* event) void BookWidget::paintEvent(TQPaintEvent* event)
{ {
// use cached page pixmap if the page wasn't modified // use cached page pixmap if the page wasn't modified
if (!modified()) if (!modified())
{ {
QRect rect(event->rect()); TQRect rect(event->rect());
bitBlt(this, rect.x(), rect.y(), &m_cachePixmap, rect.x(), rect.y(), rect.width(), rect.height()); bitBlt(this, rect.x(), rect.y(), &m_cachePixmap, rect.x(), rect.y(), rect.width(), rect.height());
return; return;
} }
// do full painting otherwise // do full painting otherwise
setupPageSize(); setupPageSize();
const QRect lrect (rectLeftPage()); const TQRect lrect (rectLeftPage());
const QRect rrect(rectRightPage()); const TQRect rrect(rectRightPage());
const unsigned int curPage = currentPage(); const unsigned int curPage = currentPage();
QPixmap pm(size()); TQPixmap pm(size());
QPainter paint(&pm); TQPainter paint(&pm);
//draw background image //draw background image
const QPixmap & image = Theme::self()->bgPixmap(QWidget::size()); const TQPixmap & image = Theme::self()->bgPixmap(TQWidget::size());
paint.drawPixmap(0, 0, image); paint.drawPixmap(0, 0, image);
if (m_renderer->busy()) if (m_renderer->busy())
{ {
QFont f(font()); TQFont f(font());
f.setPointSize(20); f.setPointSize(20);
paint.setFont(f); paint.setFont(f);
const QFontMetrics fm(f); const TQFontMetrics fm(f);
QString text = tr("Rendering..."); TQString text = tr("Rendering...");
const int w = fm.width(text); const int w = fm.width(text);
const int h = fm.height(); const int h = fm.height();
const int dx = (lrect.width() - w) / 2; const int dx = (lrect.width() - w) / 2;
@ -215,37 +215,37 @@ void BookWidget::paintEvent(QPaintEvent* event)
void BookWidget::setupPageSize() void BookWidget::setupPageSize()
{ {
QSize size((width() - m_left_margin - m_right_margin - 2 * m_middle_margin) / 2, TQSize size((width() - m_left_margin - m_right_margin - 2 * m_middle_margin) / 2,
(height() - m_top_margin - m_bottom_margin)); (height() - m_top_margin - m_bottom_margin));
m_renderer->setPageSize(size); m_renderer->setPageSize(size);
} }
void BookWidget::mousePressEvent(QMouseEvent * event) void BookWidget::mousePressEvent(TQMouseEvent * event)
{ {
if (event->button() == LeftButton) if (event->button() == Qt::LeftButton)
{ {
if (rectLeftPage().contains(event->pos())) if (rectLeftPage().tqcontains(event->pos()))
{ {
prevPage(); prevPage();
} }
else if (rectRightPage().contains(event->pos())) else if (rectRightPage().tqcontains(event->pos()))
{ {
nextPage(); nextPage();
} }
} }
QWidget::mousePressEvent(event); TQWidget::mousePressEvent(event);
} }
const QRect BookWidget::rectLeftPage() const const TQRect BookWidget::rectLeftPage() const
{ {
return QRect(m_left_margin, m_top_margin, return TQRect(m_left_margin, m_top_margin,
m_renderer->pageSize().width(), m_renderer->pageSize().width(),
m_renderer->pageSize().height()); m_renderer->pageSize().height());
} }
const QRect BookWidget::rectRightPage() const const TQRect BookWidget::rectRightPage() const
{ {
return QRect(m_left_margin + 2 * m_middle_margin + m_renderer->pageSize().width(), return TQRect(m_left_margin + 2 * m_middle_margin + m_renderer->pageSize().width(),
m_top_margin, m_top_margin,
m_renderer->pageSize().width(), m_renderer->pageSize().width(),
m_renderer->pageSize().height()); m_renderer->pageSize().height());
@ -277,7 +277,7 @@ void BookWidget::lastPage()
setCurrentPage(m_renderer->pageCount() - 1); setCurrentPage(m_renderer->pageCount() - 1);
} }
void BookWidget::wheelEvent(QWheelEvent * e) void BookWidget::wheelEvent(TQWheelEvent * e)
{ {
e->accept(); e->accept();
if (e->delta() > 0) if (e->delta() > 0)
@ -285,7 +285,7 @@ void BookWidget::wheelEvent(QWheelEvent * e)
else nextPage(); else nextPage();
} }
void BookWidget::resizeEvent(QResizeEvent * e) void BookWidget::resizeEvent(TQResizeEvent * e)
{ {
m_modified = true; m_modified = true;
setupPageSize(); setupPageSize();
@ -293,18 +293,18 @@ void BookWidget::resizeEvent(QResizeEvent * e)
// //if size become lower recalc current page // //if size become lower recalc current page
// if (currentPage() > m_renderer->pageCount()) // if (currentPage() > m_renderer->pageCount())
// lastPage(); // lastPage();
QWidget::resizeEvent(e); TQWidget::resizeEvent(e);
} }
QSize BookWidget::minimumSizeHint() const TQSize BookWidget::tqminimumSizeHint() const
{ {
return QSize(400, 300); return TQSize(400, 300);
} }
void BookWidget::setFont(const QFont & font) void BookWidget::setFont(const TQFont & font)
{ {
m_modified = true; m_modified = true;
QWidget::setFont(font); TQWidget::setFont(font);
m_renderer->setFont(font); m_renderer->setFont(font);
update(); update();
} }
@ -325,27 +325,27 @@ void BookWidget::setCurrentPage(int number)
update(); update();
} }
void BookWidget::keyPressEvent(QKeyEvent * e) void BookWidget::keyPressEvent(TQKeyEvent * e)
{ {
if (e->key() == Qt::Key_Right || e->key() == Qt::Key_Down if (e->key() == TQt::Key_Right || e->key() == TQt::Key_Down
|| e->key() == Qt::Key_Space) || e->key() == TQt::Key_Space)
{ {
nextPage(); nextPage();
} }
else if (e->key() == Qt::Key_Left || e->key() == Qt::Key_Up) else if (e->key() == TQt::Key_Left || e->key() == TQt::Key_Up)
{ {
prevPage(); prevPage();
} }
else if (e->key() == Qt::Key_Home) else if (e->key() == TQt::Key_Home)
{ {
firstPage(); firstPage();
} }
else if (e->key() == Qt::Key_End) else if (e->key() == TQt::Key_End)
{ {
lastPage(); lastPage();
} }
QWidget::keyPressEvent(e); TQWidget::keyPressEvent(e);
} }
void BookWidget::loadLine() void BookWidget::loadLine()
@ -378,7 +378,7 @@ void BookWidget::cancelLoading()
{ {
m_timer.stop(); m_timer.stop();
if (parentWidget()) if (parentWidget())
parentWidget()->setCaption(""); TQT_TQWIDGET(parentWidget())->setCaption("");
//clean up //clean up
m_progressDlg->hide(); m_progressDlg->hide();
m_stream.reset(0); m_stream.reset(0);
@ -401,17 +401,17 @@ void BookWidget::setEncoding(int a_encoding)
m_encoding = a_encoding; m_encoding = a_encoding;
} }
void BookWidget::setEncodings(const QStringList & a_encodings) void BookWidget::setEncodings(const TQStringList & a_encodings)
{ {
m_encodings = a_encodings; m_encodings = a_encodings;
} }
void BookWidget::setEncoding(const QString & a_encoding) void BookWidget::setEncoding(const TQString & a_encoding)
{ {
m_encoding = (m_encodings.findIndex(a_encoding)); m_encoding = (m_encodings.tqfindIndex(a_encoding));
} }
void BookWidget::addBookmark(const QString& name) void BookWidget::addBookmark(const TQString& name)
{ {
m_bookmarks.push_back(Bookmark(currentPage(), name)); m_bookmarks.push_back(Bookmark(currentPage(), name));
std::sort(m_bookmarks.begin(), m_bookmarks.end()); std::sort(m_bookmarks.begin(), m_bookmarks.end());
@ -423,13 +423,13 @@ void BookWidget::addBookmark(const QString& name)
void BookWidget::saveBookmarks( ) void BookWidget::saveBookmarks( )
{ {
const QString fileName = "bookreader/" + m_url.fileName(); const TQString fileName = "bookreader/" + m_url.fileName();
QFile::remove(KGlobal::dirs()->findResource("appdata", m_url.fileName())); TQFile::remove(KGlobal::dirs()->findResource("appdata", m_url.fileName()));
KConfig config(fileName, false, false, "data"); KConfig config(fileName, false, false, "data");
for (Bookmarks::size_type i = 0; i < m_bookmarks.size(); ++i) for (Bookmarks::size_type i = 0; i < m_bookmarks.size(); ++i)
{ {
const Bookmark & bm = m_bookmarks[i]; const Bookmark & bm = m_bookmarks[i];
config.setGroup(tr("Bookmark %1").arg(i)); config.setGroup(tqtr("Bookmark %1").tqarg(i));
config.writeEntry("page", bm.page()); config.writeEntry("page", bm.page());
config.writeEntry("name", bm.name()); config.writeEntry("name", bm.name());
config.writeEntry("dateTime", bm.dateTime()); config.writeEntry("dateTime", bm.dateTime());
@ -439,16 +439,16 @@ void BookWidget::saveBookmarks( )
void BookWidget::loadBookmarks() void BookWidget::loadBookmarks()
{ {
m_bookmarks.clear(); m_bookmarks.clear();
const QString fileName = "bookreader/" + m_url.fileName(); const TQString fileName = "bookreader/" + m_url.fileName();
KConfig config(fileName, true, false, "data"); KConfig config(fileName, true, false, "data");
QStringList groups = config.groupList(); TQStringList groups = config.groupList();
typedef QStringList::const_iterator IT; typedef TQStringList::const_iterator IT;
for (IT it = groups.constBegin(); it != groups.constEnd(); ++it) for (IT it = groups.constBegin(); it != groups.constEnd(); ++it)
{ {
config.setGroup(*it); config.setGroup(*it);
const QString name = config.readEntry("name"); const TQString name = config.readEntry("name");
const unsigned int page = config.readUnsignedNumEntry("page"); const unsigned int page = config.readUnsignedNumEntry("page");
const QDateTime dateTime = config.readDateTimeEntry("dateTime"); const TQDateTime dateTime = config.readDateTimeEntry("dateTime");
const Bookmark bm(page, name, dateTime); const Bookmark bm(page, name, dateTime);
m_bookmarks.push_back(bm); m_bookmarks.push_back(bm);
} }

71
src/bookwidget.h
Unescape View File

@ -19,37 +19,38 @@
#ifndef BOOKWIDGET_H #ifndef BOOKWIDGET_H
#define BOOKWIDGET_H #define BOOKWIDGET_H
#include <qwidget.h> #include <tqwidget.h>
#include <qevent.h> #include <tqevent.h>
#include <qpixmap.h> #include <tqpixmap.h>
#include <qthread.h> #include <tqthread.h>
#include <qtimer.h> #include <tqtimer.h>
#include <qfile.h> #include <tqfile.h>
#include <kurl.h> #include <kurl.h>
#include <algorithm> #include <algorithm>
#include "renderer.h" #include "renderer.h"
#include "bookmark.h" #include "bookmark.h"
class QStringList; class TQStringList;
class QRect; class TQRect;
class KProgressDialog; class KProgressDialog;
/** /**
*/ */
class BookWidget : public QWidget class BookWidget : public TQWidget
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
BookWidget(QWidget *parent = 0, const char *name = 0); BookWidget(TQWidget *tqparent = 0, const char *name = 0);
~BookWidget(); ~BookWidget();
virtual void openURL(const KURL & url); virtual void openURL(const KURL & url);
virtual QString currentURL(); virtual TQString currentURL();
void paintEvent (QPaintEvent *); void paintEvent (TQPaintEvent *);
void setFont( const QFont & ); void setFont( const TQFont & );
void setParaOffset(int offset); void setParaOffset(int offset);
void setCurrentPage(int number); void setCurrentPage(int number);
int currentPage() const { return m_currentPage; }; int currentPage() const { return m_currentPage; };
@ -58,14 +59,14 @@ public:
void prevPage(); void prevPage();
void firstPage(); void firstPage();
void lastPage(); void lastPage();
QSize minimumSizeHint () const; TQSize tqminimumSizeHint () const;
void setupPageSize(); void setupPageSize();
void setEncoding(int); void setEncoding(int);
void setEncoding(const QString & a_encoding); void setEncoding(const TQString & a_encoding);
void setEncodings(const QStringList & a_encodings); void setEncodings(const TQStringList & a_encodings);
QString encoding() const { return m_encodings[m_encoding]; } TQString encoding() const { return m_encodings[m_encoding]; }
//const TextThread * thread() const {return m_thread;} //const TextThread * thread() const {return m_thread;}
void addBookmark(const QString& name); void addBookmark(const TQString& name);
void saveBookmarks(); void saveBookmarks();
void loadBookmarks(); void loadBookmarks();
void setBookmarks(const Bookmarks& bms); void setBookmarks(const Bookmarks& bms);
@ -74,26 +75,26 @@ signals:
/** /**
* Use this signal to change the content of the statusbar * Use this signal to change the content of the statusbar
*/ */
void signalChangeStatusbar(const QString& text); void signalChangeStatusbar(const TQString& text);
/** /**
* Use this signal to change the content of the caption * Use this signal to change the content of the caption
*/ */
void signalChangeCaption(const QString& text); void signalChangeCaption(const TQString& text);
void loaded(int); void loaded(int);
void loadingFinished(); void loadingFinished();
protected: protected:
const QRect rectLeftPage() const; const TQRect rectLeftPage() const;
const QRect rectRightPage() const; const TQRect rectRightPage() const;
void mousePressEvent(QMouseEvent *); void mousePressEvent(TQMouseEvent *);
void keyPressEvent (QKeyEvent * e); void keyPressEvent (TQKeyEvent * e);
void resizeEvent (QResizeEvent * e); void resizeEvent (TQResizeEvent * e);
void wheelEvent (QWheelEvent * e); void wheelEvent (TQWheelEvent * e);
void clearAll(); void clearAll();
void drawContent(QPainter& paint); void drawContent(TQPainter& paint);
void drawPageNumbers(QPainter& paint); void drawPageNumbers(TQPainter& paint);
void drawBookmark(QPainter& paint, Bookmark const& bm); void drawBookmark(TQPainter& paint, Bookmark const& bm);
bool modified() const { return m_modified; }; bool modified() const { return m_modified; };
private slots: private slots:
@ -104,20 +105,20 @@ private slots:
private: private:
KURL m_url; KURL m_url;
bool m_modified; bool m_modified;
QPixmap m_cachePixmap; TQPixmap m_cachePixmap;
int m_currentPage; int m_currentPage;
int m_left_margin; int m_left_margin;
int m_right_margin; int m_right_margin;
int m_top_margin; int m_top_margin;
int m_bottom_margin; int m_bottom_margin;
int m_middle_margin; int m_middle_margin;
QFile m_file; TQFile m_file;
QTimer m_timer; TQTimer m_timer;
QStringList m_encodings; TQStringList m_encodings;
int m_encoding; int m_encoding;
std::auto_ptr<Renderer> m_renderer; std::auto_ptr<Renderer> m_renderer;
std::auto_ptr<QTextStream> m_stream; std::auto_ptr<TQTextStream> m_stream;
std::auto_ptr<QStringList> m_textLines; std::auto_ptr<TQStringList> m_textLines;
std::auto_ptr<KProgressDialog> m_progressDlg; std::auto_ptr<KProgressDialog> m_progressDlg;
Bookmarks m_bookmarks; Bookmarks m_bookmarks;
}; };

46
src/renderer.cpp
Unescape View File

@ -18,8 +18,8 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#include <kdebug.h> #include <kdebug.h>
#include <qfontmetrics.h> #include <tqfontmetrics.h>
#include <qpainter.h> #include <tqpainter.h>
#include <vector> #include <vector>
#include <cmath> #include <cmath>
#include <iostream> #include <iostream>
@ -29,11 +29,11 @@ Renderer::Renderer():
m_pageCount(0), m_pageCount(0),
m_linesPerPage(0), m_linesPerPage(0),
m_paraOffset(50), m_paraOffset(50),
m_fontMetrics(new QFontMetrics(m_font)), m_fontMetrics(new TQFontMetrics(m_font)),
m_curParagraph(0), m_curParagraph(0),
m_isRendering(false) m_isRendering(false)
{ {
connect(&m_timer, SIGNAL(timeout()), this, SLOT(timeout())); connect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout()));
} }
@ -45,13 +45,13 @@ Renderer::~Renderer()
* If the list is empty do nothing. * If the list is empty do nothing.
* \param a_list List of strings to render * \param a_list List of strings to render
*/ */
void Renderer::load(const QStringList & a_list) void Renderer::load(const TQStringList & a_list)
{ {
if (a_list.isEmpty()) if (a_list.isEmpty())
return; return;
m_text.clear(); m_text.clear();
QString string; TQString string;
TStringIter it(a_list.constBegin()); TStringIter it(a_list.constBegin());
while (it != a_list.constEnd()) while (it != a_list.constEnd())
@ -61,7 +61,7 @@ void Renderer::load(const QStringList & a_list)
//process string until paragraph ends //process string until paragraph ends
while (++it != a_list.constEnd()) while (++it != a_list.constEnd())
{ {
QChar const ch((*it)[0]); TQChar const ch((*it)[0]);
//insert empty lines //insert empty lines
if ((*it).isEmpty()) if ((*it).isEmpty())
break; break;
@ -96,7 +96,7 @@ void Renderer::render()
cancel(); cancel();
clear(); clear();
m_isRendering = true; m_isRendering = true;
m_linesPerPage = m_pageSize.height() / (QFontMetrics(font()).height()); m_linesPerPage = m_pageSize.height() / (TQFontMetrics(font()).height());
m_timer.start(0, false); m_timer.start(0, false);
} }
@ -142,11 +142,11 @@ void Renderer::clear()
void Renderer::parseParagraph(TIndex paraIndex) void Renderer::parseParagraph(TIndex paraIndex)
{ {
//Don't parse empty lines //Don't parse empty lines
const QString a_string(m_text[paraIndex]); const TQString a_string(m_text[paraIndex]);
if (a_string.isEmpty()) if (a_string.isEmpty())
return; return;
QString string(a_string); TQString string(a_string);
const int avgCharWidth = m_fontMetrics->width(" "); const int avgCharWidth = m_fontMetrics->width(" ");
//calc approx string width //calc approx string width
unsigned int avgLen = m_pageSize.width() / avgCharWidth; unsigned int avgLen = m_pageSize.width() / avgCharWidth;
@ -248,7 +248,7 @@ void Renderer::parseParagraph(TIndex paraIndex)
addLine(TextLine(paraIndex, begin, begin + len, TextLine::PARA_END)); addLine(TextLine(paraIndex, begin, begin + len, TextLine::PARA_END));
} }
int Renderer::width(const QString & a_string) const int Renderer::width(const TQString & a_string) const
{ {
int w = m_fontMetrics->width(a_string); int w = m_fontMetrics->width(a_string);
return m_isStartAdded ? w : w + paraOffset(); return m_isStartAdded ? w : w + paraOffset();
@ -262,7 +262,7 @@ void Renderer::addLine(TextLine line)
m_isStartAdded = true; m_isStartAdded = true;
} }
int Renderer::wordAt(const QString & string, int len) int Renderer::wordAt(const TQString & string, int len)
{ {
while (--len >= 0) while (--len >= 0)
if (string[len] == ' ') if (string[len] == ' ')
@ -270,18 +270,18 @@ int Renderer::wordAt(const QString & string, int len)
return 0; return 0;
} }
QString Renderer::getWord(const QString & a_string, int a_idx) TQString Renderer::getWord(const TQString & a_string, int a_idx)
{ {
int idx = a_idx; int idx = a_idx;
while (a_string[++idx] != ' ' && idx < a_string.length()); while (a_string[++idx] != ' ' && idx < a_string.length());
return QString(a_string.mid(a_idx, idx - a_idx)); return TQString(a_string.mid(a_idx, idx - a_idx));
} }
/** /**
* Draws page number \c pageNumber on \c paint * Draws page number \c pageNumber on \c paint
* bounding \c rect rectangle * bounding \c rect rectangle
*/ */
void Renderer::drawPage(QPainter & paint, QRect rect, int pageNumber) void Renderer::drawPage(TQPainter & paint, TQRect rect, int pageNumber)
{ {
int height = m_fontMetrics->height(); int height = m_fontMetrics->height();
int line = 1; int line = 1;
@ -298,12 +298,12 @@ void Renderer::drawPage(QPainter & paint, QRect rect, int pageNumber)
drawLine(paint, rect.left(), rect.top() + line * height, idx); drawLine(paint, rect.left(), rect.top() + line * height, idx);
} }
void Renderer::drawLine(QPainter & paint, int x, int y, const TLines::size_type index) void Renderer::drawLine(TQPainter & paint, int x, int y, const TLines::size_type index)
{ {
const TextLine textLine(m_lines[index]); const TextLine textLine(m_lines[index]);
const int length = textLine.size(); const int length = textLine.size();
const QString & paragraph = m_text[textLine.paragraphIndex()]; const TQString & paragraph = m_text[textLine.paragraphIndex()];
const QString string = paragraph.mid(textLine.begin(), textLine.size()); const TQString string = paragraph.mid(textLine.begin(), textLine.size());
// indent paragraph // indent paragraph
if (textLine.isParaStart()) if (textLine.isParaStart())
@ -332,7 +332,7 @@ void Renderer::drawLine(QPainter & paint, int x, int y, const TLines::size_type
//count spaces //count spaces
std::vector<int> spaces; std::vector<int> spaces;
spaces.reserve(50); spaces.reserve(50);
while (((pos = string.find(' ', off)) != -1) && (pos < length)) while (((pos = string.tqfind(' ', off)) != -1) && (pos < length))
{ {
spaces.push_back(pos); spaces.push_back(pos);
off = pos + 1; off = pos + 1;
@ -349,7 +349,7 @@ void Renderer::drawLine(QPainter & paint, int x, int y, const TLines::size_type
// calc average space width // calc average space width
const double avgLen = ((double)(pageWidth - curWidth) / spacesCount); const double avgLen = ((double)(pageWidth - curWidth) / spacesCount);
int start = 0; int start = 0;
QString tmp; TQString tmp;
for (std::vector<int>::size_type i = 0; i < spacesCount; ++i) for (std::vector<int>::size_type i = 0; i < spacesCount; ++i)
{ {
pos = spaces[i]; pos = spaces[i];
@ -367,11 +367,11 @@ void Renderer::drawLine(QPainter & paint, int x, int y, const TLines::size_type
* Sets current font to \c font and re-renders text. * Sets current font to \c font and re-renders text.
* You don't need to directly call render(). * You don't need to directly call render().
*/ */
void Renderer::setFont(const QFont & font) void Renderer::setFont(const TQFont & font)
{ {
if (font == m_font) return; if (font == m_font) return;
m_font = font; m_font = font;
m_fontMetrics.reset(new QFontMetrics(m_font)); m_fontMetrics.reset(new TQFontMetrics(m_font));
render(); render();
} }
@ -390,7 +390,7 @@ void Renderer::setParaOffset(int offset)
* Sets current page size to \c size. * Sets current page size to \c size.
* \note It don't call render() after changing. * \note It don't call render() after changing.
*/ */
void Renderer::setPageSize(const QSize & size) void Renderer::setPageSize(const TQSize & size)
{ {
m_pageSize = size; m_pageSize = size;
} }

49
src/renderer.h
Unescape View File

@ -20,15 +20,15 @@
#ifndef RENDERER_H #ifndef RENDERER_H
#define RENDERER_H #define RENDERER_H
#include <qstringlist.h> #include <tqstringlist.h>
#include <qfont.h> #include <tqfont.h>
#include <qstring.h> #include <tqstring.h>
#include <qobject.h> #include <tqobject.h>
#include <qsize.h> #include <tqsize.h>
#include <qtimer.h> #include <tqtimer.h>
#include <vector> #include <vector>
#include <memory> #include <memory>
class QStringList; class TQStringList;
class TextLine class TextLine
{ {
@ -63,39 +63,40 @@ private:
* \brief Renders input text into list of word wrapped strings * \brief Renders input text into list of word wrapped strings
* \author Alexandr Nemish <anemish@gmail.com> * \author Alexandr Nemish <anemish@gmail.com>
*/ */
class Renderer : public QObject class Renderer : public TQObject
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
Renderer(); Renderer();
~Renderer(); ~Renderer();
/// \brief Loads and renders list of strings /// \brief Loads and renders list of strings
void load(const QStringList & list); void load(const TQStringList & list);
/// \brief Renders loaded list of strings /// \brief Renders loaded list of strings
void render(); void render();
/// \brief Clears all rendered data /// \brief Clears all rendered data
void clear(); void clear();
/// \brief Draws page /// \brief Draws page
void drawPage(QPainter & paint, QRect rect, int pageNumber); void drawPage(TQPainter & paint, TQRect rect, int pageNumber);
//Getters //Getters
/// \brief Returns whether the text is empty /// \brief Returns whether the text is empty
bool isEmpty() const { return m_text.empty(); }; bool isEmpty() const { return m_text.empty(); };
/// \brief Returns current font /// \brief Returns current font
QFont font() const { return m_font; } TQFont font() const { return m_font; }
/// \brief Returns current paragraph offset in pixels /// \brief Returns current paragraph offset in pixels
int paraOffset() const { return m_paraOffset; } int paraOffset() const { return m_paraOffset; }
/// \brief Returns the number of pages /// \brief Returns the number of pages
int pageCount() const { return m_pageCount; } int pageCount() const { return m_pageCount; }
/// \brief Returns page size in pixels /// \brief Returns page size in pixels
QSize pageSize() const { return m_pageSize; } TQSize pageSize() const { return m_pageSize; }
//Setters //Setters
/// \brief Sets current font /// \brief Sets current font
void setFont(const QFont & font); void setFont(const TQFont & font);
/// \brief Sets current paragraph offset in pixels /// \brief Sets current paragraph offset in pixels
void setParaOffset(int offset); void setParaOffset(int offset);
/// \brief Sets size of a page /// \brief Sets size of a page
void setPageSize(const QSize & size); void setPageSize(const TQSize & size);
bool busy() const { return m_isRendering; } bool busy() const { return m_isRendering; }
signals: signals:
@ -103,8 +104,8 @@ signals:
private slots: private slots:
void timeout(); void timeout();
private: private:
typedef QStringList::const_iterator TStringIter; typedef TQStringList::const_iterator TStringIter;
typedef std::vector<QString> TParagraphs; typedef std::vector<TQString> TParagraphs;
typedef TParagraphs::size_type TIndex; typedef TParagraphs::size_type TIndex;
typedef std::vector<TextLine> TLines; typedef std::vector<TextLine> TLines;
//make it non-copyable //make it non-copyable
@ -113,12 +114,12 @@ private:
/// \brief Renders input paragraph into list of wrapped lines /// \brief Renders input paragraph into list of wrapped lines
void parseParagraph(TIndex idx); void parseParagraph(TIndex idx);
/// \brief Returns width of string in pixels /// \brief Returns width of string in pixels
int width(const QString & a_string) const; int width(const TQString & a_string) const;
void addLine(TextLine line); void addLine(TextLine line);
int wordAt(const QString & str, int len); int wordAt(const TQString & str, int len);
QString getWord(const QString & str, int idx); TQString getWord(const TQString & str, int idx);
/// \brief Draws justified string /// \brief Draws justified string
void drawLine(QPainter& paint, int x, int y, const TLines::size_type idx); void drawLine(TQPainter& paint, int x, int y, const TLines::size_type idx);
void cancel(); void cancel();
TParagraphs m_text; TParagraphs m_text;
@ -126,13 +127,13 @@ private:
int m_pageCount; int m_pageCount;
int m_linesPerPage; int m_linesPerPage;
int m_paraOffset; int m_paraOffset;
QFont m_font; TQFont m_font;
std::auto_ptr<QFontMetrics> m_fontMetrics; std::auto_ptr<TQFontMetrics> m_fontMetrics;
QSize m_pageSize; TQSize m_pageSize;
bool m_isStartAdded; bool m_isStartAdded;
TIndex m_curParagraph; TIndex m_curParagraph;
bool m_isRendering; bool m_isRendering;
QTimer m_timer; TQTimer m_timer;
}; };
#endif #endif

34
src/settingsdlg.ui
Unescape View File

@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>SettingsWidget</class> <class>SettingsWidget</class>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>SettingsDlg</cstring> <cstring>SettingsDlg</cstring>
</property> </property>
@ -25,7 +25,7 @@
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
</property> </property>
<widget class="QFrame"> <widget class="TQFrame">
<property name="name"> <property name="name">
<cstring>frame3</cstring> <cstring>frame3</cstring>
</property> </property>
@ -39,15 +39,15 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout2</cstring> <cstring>tqlayout2</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QLabel"> <widget class="TQLabel">
<property name="name"> <property name="name">
<cstring>textLabel1</cstring> <cstring>textLabel1</cstring>
</property> </property>
@ -65,15 +65,15 @@
</widget> </widget>
</hbox> </hbox>
</widget> </widget>
<widget class="QLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout3</cstring> <cstring>tqlayout3</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QLabel"> <widget class="TQLabel">
<property name="name"> <property name="name">
<cstring>textLabel1_2</cstring> <cstring>textLabel1_2</cstring>
</property> </property>
@ -81,7 +81,7 @@
<string>Paragraph Offset</string> <string>Paragraph Offset</string>
</property> </property>
</widget> </widget>
<widget class="QSpinBox"> <widget class="TQSpinBox">
<property name="name"> <property name="name">
<cstring>kcfg_ParaOffset</cstring> <cstring>kcfg_ParaOffset</cstring>
</property> </property>
@ -91,15 +91,15 @@
</widget> </widget>
</hbox> </hbox>
</widget> </widget>
<widget class="QLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout8</cstring> <cstring>tqlayout8</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QLabel"> <widget class="TQLabel">
<property name="name"> <property name="name">
<cstring>textLabel1_3</cstring> <cstring>textLabel1_3</cstring>
</property> </property>
@ -107,7 +107,7 @@
<string>Default encoding</string> <string>Default encoding</string>
</property> </property>
</widget> </widget>
<widget class="QComboBox"> <widget class="TQComboBox">
<property name="name"> <property name="name">
<cstring>kcfg_DefaultEncoding</cstring> <cstring>kcfg_DefaultEncoding</cstring>
</property> </property>
@ -117,7 +117,7 @@
</widget> </widget>
</hbox> </hbox>
</widget> </widget>
<widget class="QCheckBox"> <widget class="TQCheckBox">
<property name="name"> <property name="name">
<cstring>kcfg_LoadLastUrl</cstring> <cstring>kcfg_LoadLastUrl</cstring>
</property> </property>
@ -138,7 +138,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>30</height> <height>30</height>
@ -157,9 +157,9 @@
<slot>kcfg_ParaOffset_valueChanged(const QString&amp;)</slot> <slot>kcfg_ParaOffset_valueChanged(const QString&amp;)</slot>
</connection> </connection>
</connections> </connections>
<slots> <Q_SLOTS>
<slot>kcfg_ParaOffset_valueChanged(const QString&amp;)</slot> <slot>kcfg_ParaOffset_valueChanged(const QString&amp;)</slot>
</slots> </Q_SLOTS>
<layoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kfontrequester.h</includehint> <includehint>kfontrequester.h</includehint>

22
src/theme.cpp
Unescape View File

@ -17,9 +17,9 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#include <qstring.h> #include <tqstring.h>
#include <qpixmap.h> #include <tqpixmap.h>
#include <qimage.h> #include <tqimage.h>
#include <kglobal.h> #include <kglobal.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include "theme.h" #include "theme.h"
@ -37,19 +37,19 @@ Theme * Theme::self()
return theme; return theme;
} }
void Theme::loadTheme(const QString& name) void Theme::loadTheme(const TQString& name)
{ {
const QString themePath = "themes/" + name; //FIXME: Add 'name' check. Could be a hole. const TQString themePath = "themes/" + name; //FIXME: Add 'name' check. Could be a hole.
QString bgPath = KGlobal::dirs()->findResource("appdata", themePath + "/bg.png"); TQString bgPath = KGlobal::dirs()->findResource("appdata", themePath + "/bg.png");
QString bookmarkPath = KGlobal::dirs()->findResource("appdata", themePath + "/bookmark.png"); TQString bookmarkPath = KGlobal::dirs()->findResource("appdata", themePath + "/bookmark.png");
m_bgPixmap = QPixmap(bgPath); m_bgPixmap = TQPixmap(bgPath);
m_bgResizedPixmap = m_bgPixmap; m_bgResizedPixmap = m_bgPixmap;
m_bookmarkPixmap = QPixmap(bookmarkPath); m_bookmarkPixmap = TQPixmap(bookmarkPath);
} }
const QPixmap & Theme::bgPixmap(QSize size) const const TQPixmap & Theme::bgPixmap(TQSize size) const
{ {
if (size == QSize(0, 0) || size == m_bgPixmap.size()) if (size == TQSize(0, 0) || size == m_bgPixmap.size())
return m_bgPixmap; return m_bgPixmap;
if (size == m_bgResizedPixmap.size()) if (size == m_bgResizedPixmap.size())
return m_bgResizedPixmap; return m_bgResizedPixmap;

18
src/theme.h
Unescape View File

@ -20,8 +20,8 @@
#ifndef BOOKREADER_THEME_H #ifndef BOOKREADER_THEME_H
#define BOOKREADER_THEME_H #define BOOKREADER_THEME_H
#include <qstring.h> #include <tqstring.h>
#include <qpixmap.h> #include <tqpixmap.h>
class Theme class Theme
@ -29,18 +29,18 @@ class Theme
public: public:
static Theme * self(); static Theme * self();
/// \brief Loads theme with given name. Default is "default". :) /// \brief Loads theme with given name. Default is "default". :)
void loadTheme(const QString& name = "default"); void loadTheme(const TQString& name = "default");
const QPixmap & bgPixmap(QSize size = QSize(0,0)) const; const TQPixmap & bgPixmap(TQSize size = TQSize(0,0)) const;
const QPixmap & bookmarkPixmap() const { return m_bookmarkPixmap; } const TQPixmap & bookmarkPixmap() const { return m_bookmarkPixmap; }
//const QFont & font() const {return m_font;} //const TQFont & font() const {return m_font;}
private: private:
static Theme * theme; static Theme * theme;
Theme(); Theme();
Theme(const Theme &); Theme(const Theme &);
Theme & operator = (const Theme&); Theme & operator = (const Theme&);
QPixmap m_bgPixmap; TQPixmap m_bgPixmap;
mutable QPixmap m_bgResizedPixmap; mutable TQPixmap m_bgResizedPixmap;
QPixmap m_bookmarkPixmap; TQPixmap m_bookmarkPixmap;
}; };
#endif #endif

Write Preview
Loading…
Cancel
Save