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

Rename a number of classes to enhance compatibility with KDE4

Browse Source
r14.0.x
Timothy Pearson 11 years ago
parent 50ccc22eb9
commit 5920e96087
30 changed files with 269 additions and 269 deletions
Show Stats Download Patch File Download Diff File

28
src/app/bookmarkviewcontroller.cpp
Unescape View File

@ -53,7 +53,7 @@ namespace Gwenview {
// URLDropListView
URLDropListView::URLDropListView(TQWidget* parent)
: KListView(parent) {
: TDEListView(parent) {
setAcceptDrops(true);
}
@ -69,10 +69,10 @@ void URLDropListView::contentsDragMoveEvent(TQDragMoveEvent* event) {
struct BookmarkItem : public KListViewItem {
struct BookmarkItem : public TDEListViewItem {
template <class ItemParent>
BookmarkItem(ItemParent* parent, const KBookmark& bookmark)
: KListViewItem(parent)
: TDEListViewItem(parent)
, mBookmark(bookmark)
{
refresh();
@ -89,7 +89,7 @@ struct BookmarkItem : public KListViewItem {
class BookmarkToolTip : public TQToolTip {
public:
BookmarkToolTip(KListView* lv)
BookmarkToolTip(TDEListView* lv)
: TQToolTip(lv->viewport())
, mListView(lv) {}
@ -102,17 +102,17 @@ public:
tip(rect, item->mBookmark.url().prettyURL());
};
KListView* mListView;
TDEListView* mListView;
};
struct BookmarkViewController::Private {
TQVBox* mBox;
KListView* mListView;
TDEListView* mListView;
KBookmarkManager* mManager;
KURL mCurrentURL;
std::auto_ptr<BookmarkToolTip> mToolTip;
KActionCollection* mActionCollection;
TDEActionCollection* mActionCollection;
KURL mDroppedURL;
template <class ItemParent>
@ -184,7 +184,7 @@ BookmarkViewController::BookmarkViewController(TQWidget* parent)
// Init listview
d->mListView=new URLDropListView(d->mBox);
d->mToolTip.reset(new BookmarkToolTip(d->mListView) );
d->mActionCollection=new KActionCollection(d->mListView);
d->mActionCollection=new TDEActionCollection(d->mListView);
d->mListView->header()->hide();
d->mListView->setRootIsDecorated(true);
@ -203,13 +203,13 @@ BookmarkViewController::BookmarkViewController(TQWidget* parent)
this, TQT_SLOT(slotURLDropped(TQDropEvent*, const KURL::List&)) );
// Init toolbar
KToolBar* toolbar=new KToolBar(d->mBox, "", true);
KAction* action;
toolbar->setIconText(KToolBar::IconTextRight);
action=new KAction(i18n("Add a bookmark (keep it short)", "Add"), "bookmark_add", 0,
TDEToolBar* toolbar=new TDEToolBar(d->mBox, "", true);
TDEAction* action;
toolbar->setIconText(TDEToolBar::IconTextRight);
action=new TDEAction(i18n("Add a bookmark (keep it short)", "Add"), "bookmark_add", 0,
this, TQT_SLOT(bookmarkCurrentURL()), d->mActionCollection);
action->plug(toolbar);
action=new KAction(i18n("Remove a bookmark (keep it short)", "Remove"), "editdelete", 0,
action=new TDEAction(i18n("Remove a bookmark (keep it short)", "Remove"), "editdelete", 0,
this, TQT_SLOT(deleteCurrentBookmark()), d->mActionCollection);
action->plug(toolbar);
}
@ -252,7 +252,7 @@ void BookmarkViewController::fill() {
void BookmarkViewController::slotURLDropped(TQDropEvent* event, const KURL::List& urls) {
// Get a pointer to the drop item
TQPoint point(0,event->pos().y());
KListView* lst=d->mListView;
TDEListView* lst=d->mListView;
BookmarkItem* item=static_cast<BookmarkItem*>( lst->itemAt(lst->contentsToViewport(point)) );
TQPopupMenu menu(lst);

2
src/app/bookmarkviewcontroller.h
Unescape View File

@ -41,7 +41,7 @@ namespace Gwenview {
/**
* A listview on which the user can drop urls
*/
class URLDropListView : public KListView {
class URLDropListView : public TDEListView {
Q_OBJECT
public:

6
src/app/dirviewcontroller.cpp
Unescape View File

@ -63,8 +63,8 @@ DirViewController::DirViewController(TQWidget* parent)
connect(d->mTreeView, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
this, TQT_SLOT(slotTreeViewSelectionChanged(TQListViewItem*)) );
connect(d->mTreeView, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)),
this, TQT_SLOT(slotTreeViewContextMenu(KListView*, TQListViewItem*, const TQPoint&)) );
connect(d->mTreeView, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
this, TQT_SLOT(slotTreeViewContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) );
}
@ -90,7 +90,7 @@ void DirViewController::slotTreeViewSelectionChanged(TQListViewItem* item) {
}
void DirViewController::slotTreeViewContextMenu(KListView*, TQListViewItem*, const TQPoint& pos) {
void DirViewController::slotTreeViewContextMenu(TDEListView*, TQListViewItem*, const TQPoint& pos) {
TQPopupMenu menu(d->mTreeView);
menu.insertItem(SmallIcon("folder_new"),i18n("New Folder..."),this,TQT_SLOT(makeDir()));
menu.insertSeparator();

4
src/app/dirviewcontroller.h
Unescape View File

@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
class TQListViewItem;
class TQPoint;
class TQWidget;
class KListView;
class TDEListView;
class KURL;
namespace TDEIO {
@ -58,7 +58,7 @@ private:
private slots:
void slotTreeViewSelectionChanged(TQListViewItem*);
void slotTreeViewContextMenu(KListView*, TQListViewItem*, const TQPoint&);
void slotTreeViewContextMenu(TDEListView*, TQListViewItem*, const TQPoint&);
void makeDir();
void slotDirMade();

10
src/app/history.cpp
Unescape View File

@ -35,17 +35,17 @@ namespace Gwenview {
const unsigned int MAX_HISTORY_SIZE=12;
History::History(KActionCollection* actionCollection) {
History::History(TDEActionCollection* actionCollection) {
mPosition=mHistoryList.end();
mMovingInHistory=false;
// Actions
TQPair<KGuiItem, KGuiItem> backForward = KStdGuiItem::backAndForward();
mGoBack=new KToolBarPopupAction(backForward.first,
KStdAccel::shortcut(KStdAccel::Back),
mGoBack=new TDEToolBarPopupAction(backForward.first,
TDEStdAccel::shortcut(TDEStdAccel::Back),
this, TQT_SLOT(goBack()), actionCollection, "go_back");
mGoForward=new KToolBarPopupAction(backForward.second,
KStdAccel::shortcut(KStdAccel::Forward),
mGoForward=new TDEToolBarPopupAction(backForward.second,
TDEStdAccel::shortcut(TDEStdAccel::Forward),
this, TQT_SLOT(goForward()), actionCollection, "go_forward");
// Connections

10
src/app/history.h
Unescape View File

@ -29,8 +29,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
// KDE
#include <kurl.h>
class KToolBarPopupAction;
class KActionCollection;
class TDEToolBarPopupAction;
class TDEActionCollection;
typedef TQValueList<KURL> HistoryList;
@ -40,7 +40,7 @@ Q_OBJECT
public:
History(KActionCollection*);
History(TDEActionCollection*);
~History();
signals:
@ -50,8 +50,8 @@ public slots:
void addURLToHistory(const KURL&);
private:
KToolBarPopupAction* mGoBack;
KToolBarPopupAction* mGoForward;
TDEToolBarPopupAction* mGoBack;
TDEToolBarPopupAction* mGoForward;
HistoryList mHistoryList;
HistoryList::Iterator mPosition;
bool mMovingInHistory;

86
src/app/mainwindow.cpp
Unescape View File

@ -163,7 +163,7 @@ static bool urlIsDirectory(TQWidget* parent, const KURL& url) {
MainWindow::MainWindow()
: KMainWindow()
: TDEMainWindow()
#ifdef GV_HAVE_KIPI
, mPluginLoader(0)
#endif
@ -183,7 +183,7 @@ MainWindow::MainWindow()
createConnections();
mWindowListActions.setAutoDelete(true);
updateWindowActions();
KMainWindow::applyMainWindowSettings(TDEGlobal::config(), "MainWindow");
TDEMainWindow::applyMainWindowSettings(TDEGlobal::config(), "MainWindow");
}
@ -312,7 +312,7 @@ void MainWindow::updateFullScreenLabel() {
}
void MainWindow::goUpTo(int id) {
KPopupMenu* menu=mGoUp->popupMenu();
TDEPopupMenu* menu=mGoUp->popupMenu();
KURL url(menu->text(id));
KURL childURL;
int index=menu->indexOf(id);
@ -538,8 +538,8 @@ void MainWindow::slotImageLoaded() {
void MainWindow::hideToolBars() {
TQPtrListIterator<KToolBar> it=toolBarIterator();
KToolBar* bar;
TQPtrListIterator<TDEToolBar> it=toolBarIterator();
TDEToolBar* bar;
for(;it.current()!=0L; ++it) {
bar=it.current();
@ -553,9 +553,9 @@ void MainWindow::hideToolBars() {
void MainWindow::showToolBars() {
TQPtrListIterator<KToolBar> it=toolBarIterator();
TQPtrListIterator<TDEToolBar> it=toolBarIterator();
KToolBar* bar;
TDEToolBar* bar;
for(;it.current()!=0L; ++it) {
bar=it.current();
@ -698,7 +698,7 @@ void MainWindow::showToolBarDialog() {
void MainWindow::applyMainWindowSettings() {
createGUI();
KMainWindow::applyMainWindowSettings(TDEGlobal::config(), "MainWindow");
TDEMainWindow::applyMainWindowSettings(TDEGlobal::config(), "MainWindow");
}
@ -757,7 +757,7 @@ void MainWindow::slotToggleCentralStack() {
// Make sure the window list actions are disabled if we are in view mode,
// otherwise weird things happens when we go back to browse mode
TQPtrListIterator<KAction> it(mWindowListActions);
TQPtrListIterator<TDEAction> it(mWindowListActions);
for (;it.current(); ++it) {
it.current()->setEnabled(mSwitchToBrowseMode->isChecked());
}
@ -964,10 +964,10 @@ void MainWindow::createWidgets() {
*/
void MainWindow::createActions() {
// Stack
mSwitchToBrowseMode=new KRadioAction(i18n("Browse"), "folder_image", CTRL + Key_Return, TQT_TQOBJECT(this), TQT_SLOT(slotToggleCentralStack()), actionCollection(), "switch_to_browse_mode");
mSwitchToBrowseMode=new TDERadioAction(i18n("Browse"), "folder_image", CTRL + Key_Return, TQT_TQOBJECT(this), TQT_SLOT(slotToggleCentralStack()), actionCollection(), "switch_to_browse_mode");
mSwitchToBrowseMode->setExclusiveGroup("centralStackMode");
mSwitchToBrowseMode->setChecked(true);
mSwitchToViewMode=new KRadioAction(i18n("View Image"), "image", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleCentralStack()), actionCollection(), "switch_to_view_mode");
mSwitchToViewMode=new TDERadioAction(i18n("View Image"), "image", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleCentralStack()), actionCollection(), "switch_to_view_mode");
mSwitchToViewMode->setExclusiveGroup("centralStackMode");
// File
@ -975,41 +975,41 @@ void MainWindow::createActions() {
mSaveFile=KStdAction::save(mDocument,TQT_SLOT(save()),actionCollection() );
mSaveFileAs=KStdAction::saveAs(mDocument,TQT_SLOT(saveAs()),actionCollection() );
mFilePrint = KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(printFile()), actionCollection());
mRenameFile=new KAction(i18n("&Rename..."),Key_F2,TQT_TQOBJECT(this),TQT_SLOT(renameFile()),actionCollection(),"file_rename");
mCopyFiles=new KAction(i18n("&Copy To..."),Key_F7,TQT_TQOBJECT(this),TQT_SLOT(copyFiles()),actionCollection(),"file_copy");
mMoveFiles=new KAction(i18n("&Move To..."),Key_F8,TQT_TQOBJECT(this),TQT_SLOT(moveFiles()),actionCollection(),"file_move");
mLinkFiles=new KAction(i18n("&Link To..."),Key_F9,TQT_TQOBJECT(this),TQT_SLOT(linkFiles()),actionCollection(),"file_link");
mDeleteFiles=new KAction(i18n("&Delete"),"editdelete",Key_Delete,TQT_TQOBJECT(this),TQT_SLOT(deleteFiles()),actionCollection(),"file_delete");
mShowFileProperties=new KAction(i18n("Properties"),0,TQT_TQOBJECT(this),TQT_SLOT(showFileProperties()),actionCollection(),"file_properties");
mRenameFile=new TDEAction(i18n("&Rename..."),Key_F2,TQT_TQOBJECT(this),TQT_SLOT(renameFile()),actionCollection(),"file_rename");
mCopyFiles=new TDEAction(i18n("&Copy To..."),Key_F7,TQT_TQOBJECT(this),TQT_SLOT(copyFiles()),actionCollection(),"file_copy");
mMoveFiles=new TDEAction(i18n("&Move To..."),Key_F8,TQT_TQOBJECT(this),TQT_SLOT(moveFiles()),actionCollection(),"file_move");
mLinkFiles=new TDEAction(i18n("&Link To..."),Key_F9,TQT_TQOBJECT(this),TQT_SLOT(linkFiles()),actionCollection(),"file_link");
mDeleteFiles=new TDEAction(i18n("&Delete"),"editdelete",Key_Delete,TQT_TQOBJECT(this),TQT_SLOT(deleteFiles()),actionCollection(),"file_delete");
mShowFileProperties=new TDEAction(i18n("Properties"),0,TQT_TQOBJECT(this),TQT_SLOT(showFileProperties()),actionCollection(),"file_properties");
KStdAction::quit( TQT_TQOBJECT(kapp), TQT_SLOT (closeAllWindows()), actionCollection() );
// Edit
mRotateLeft=new KAction(i18n("Rotate &Left"),"rotate_left",CTRL + Key_L, TQT_TQOBJECT(this), TQT_SLOT(rotateLeft()),actionCollection(),"rotate_left");
mRotateRight=new KAction(i18n("Rotate &Right"),"rotate_right",CTRL + Key_R, TQT_TQOBJECT(this), TQT_SLOT(rotateRight()),actionCollection(),"rotate_right");
mMirror=new KAction(i18n("&Mirror"),"mirror",0, TQT_TQOBJECT(this), TQT_SLOT(mirror()),actionCollection(),"mirror");
mFlip=new KAction(i18n("&Flip"),"flip",0, TQT_TQOBJECT(this), TQT_SLOT(flip()),actionCollection(),"flip");
mRotateLeft=new TDEAction(i18n("Rotate &Left"),"rotate_left",CTRL + Key_L, TQT_TQOBJECT(this), TQT_SLOT(rotateLeft()),actionCollection(),"rotate_left");
mRotateRight=new TDEAction(i18n("Rotate &Right"),"rotate_right",CTRL + Key_R, TQT_TQOBJECT(this), TQT_SLOT(rotateRight()),actionCollection(),"rotate_right");
mMirror=new TDEAction(i18n("&Mirror"),"mirror",0, TQT_TQOBJECT(this), TQT_SLOT(mirror()),actionCollection(),"mirror");
mFlip=new TDEAction(i18n("&Flip"),"flip",0, TQT_TQOBJECT(this), TQT_SLOT(flip()),actionCollection(),"flip");
// View
mReload=new KAction(i18n("Reload"), "reload", Key_F5, mDocument, TQT_SLOT(reload()), actionCollection(), "reload");
mReload=new TDEAction(i18n("Reload"), "reload", Key_F5, mDocument, TQT_SLOT(reload()), actionCollection(), "reload");
mReload->setEnabled(false);
mToggleFullScreen= KStdAction::fullScreen(TQT_TQOBJECT(this),TQT_SLOT(toggleFullScreen()),actionCollection(),0);
mToggleSlideShow=new KAction(i18n("Slide Show"),"slideshow_play",0,TQT_TQOBJECT(this),TQT_SLOT(toggleSlideShow()),actionCollection(),"slideshow");
mFullScreenLabelAction=new KToolBarLabelAction("", 0, 0, 0, actionCollection(), "fullscreen_label");
mToggleSlideShow=new TDEAction(i18n("Slide Show"),"slideshow_play",0,TQT_TQOBJECT(this),TQT_SLOT(toggleSlideShow()),actionCollection(),"slideshow");
mFullScreenLabelAction=new TDEToolBarLabelAction("", 0, 0, 0, actionCollection(), "fullscreen_label");
// Go
mGoUp=new KToolBarPopupAction(i18n("Up"), "up", ALT + Key_Up, TQT_TQOBJECT(this), TQT_SLOT(goUp()), actionCollection(), "go_up");
new KAction( i18n( "Home" ), "gohome", KStdAccel::shortcut(KStdAccel::Home), TQT_TQOBJECT(this), TQT_SLOT(goHome()), actionCollection(), "go_home");
mGoUp=new TDEToolBarPopupAction(i18n("Up"), "up", ALT + Key_Up, TQT_TQOBJECT(this), TQT_SLOT(goUp()), actionCollection(), "go_up");
new TDEAction( i18n( "Home" ), "gohome", TDEStdAccel::shortcut(TDEStdAccel::Home), TQT_TQOBJECT(this), TQT_SLOT(goHome()), actionCollection(), "go_home");
// Window
mResetDockWidgets = new KAction(i18n("Reset"), 0, TQT_TQOBJECT(this), TQT_SLOT(resetDockWidgets()), actionCollection(), "reset_dock_widgets");
mResetDockWidgets = new TDEAction(i18n("Reset"), 0, TQT_TQOBJECT(this), TQT_SLOT(resetDockWidgets()), actionCollection(), "reset_dock_widgets");
// Settings
mShowConfigDialog=
KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showConfigDialog()), actionCollection() );
mShowKeyDialog=
KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(showKeyDialog()), actionCollection() );
(void)new KAction(i18n("Configure External Tools..."), "configure", 0,
(void)new TDEAction(i18n("Configure External Tools..."), "configure", 0,
TQT_TQOBJECT(this), TQT_SLOT(showExternalToolDialog()), actionCollection(), "configure_tools");
(void)KStdAction::configureToolbars(
TQT_TQOBJECT(this), TQT_SLOT(showToolBarDialog()), actionCollection() );
@ -1025,7 +1025,7 @@ void MainWindow::createActions() {
void MainWindow::createObjectInteractions() {
// Actions in image view
{
KActionPtrList actions;
TDEActionPtrList actions;
actions
<< mToggleFullScreen
<< mToggleSlideShow
@ -1039,7 +1039,7 @@ void MainWindow::createObjectInteractions() {
}
{
KActionPtrList actions;
TDEActionPtrList actions;
actions
<< mFileViewController->selectPrevious()
<< mFileViewController->selectNext()
@ -1049,7 +1049,7 @@ void MainWindow::createObjectInteractions() {
}
{
KActionPtrList actions;
TDEActionPtrList actions;
actions
<< actionCollection()->action("view_zoom_in")
<< actionCollection()->action("view_zoom_to")
@ -1080,7 +1080,7 @@ void MainWindow::createObjectInteractions() {
BookmarkOwner* bookmarkOwner=new BookmarkOwner(this);
KActionMenu* bookmark=new KActionMenu(i18n( "&Bookmarks" ), "bookmark", actionCollection(), "bookmarks" );
TDEActionMenu* bookmark=new TDEActionMenu(i18n( "&Bookmarks" ), "bookmark", actionCollection(), "bookmarks" );
new KBookmarkMenu(manager, bookmarkOwner, bookmark->popupMenu(), 0, true);
connect(bookmarkOwner,TQT_SIGNAL(openURL(const KURL&)),
@ -1099,7 +1099,7 @@ void MainWindow::createHideShowAction(KDockWidget* dock) {
caption=i18n("Show %1").arg(dock->caption());
}
KAction* action=new KAction(caption, 0, TQT_TQOBJECT(dock), TQT_SLOT(changeHideShowState()), (TQObject*)0 );
TDEAction* action=new TDEAction(caption, 0, TQT_TQOBJECT(dock), TQT_SLOT(changeHideShowState()), (TQObject*)0 );
if (dock->icon()) {
action->setIconSet( TQIconSet(*dock->icon()) );
}
@ -1232,17 +1232,17 @@ void MainWindow::createLocationToolBar() {
comboAction->setAutoSized(true);
// Clear button
(void)new KAction( i18n("Clear Location Bar"),
(void)new TDEAction( i18n("Clear Location Bar"),
TQApplication::reverseLayout()?"clear_left" : "locationbar_erase",
0, TQT_TQOBJECT(this), TQT_SLOT(clearLocationLabel()), actionCollection(), "clear_location");
// URL Label
KToolBarLabelAction* locationAction = new KToolBarLabelAction(i18n("L&ocation:"),
TDEToolBarLabelAction* locationAction = new TDEToolBarLabelAction(i18n("L&ocation:"),
Key_F6, TQT_TQOBJECT(this), TQT_SLOT( activateLocationLabel()), actionCollection(), "location_label");
locationAction->setBuddy(mURLEdit);
// Go button
(void)new KAction(i18n("Go"), "key_enter", 0, TQT_TQOBJECT(this), TQT_SLOT(slotGo()), actionCollection(), "location_go");
(void)new TDEAction(i18n("Go"), "key_enter", 0, TQT_TQOBJECT(this), TQT_SLOT(slotGo()), actionCollection(), "location_go");
}
@ -1277,7 +1277,7 @@ void MainWindow::loadPlugins() {
// with local classes, so this is declared outside of slotReplug()
struct MenuInfo {
TQString mName;
TQPtrList<KAction> mActions;
TQPtrList<TDEAction> mActions;
MenuInfo() {}
MenuInfo(const TQString& name) : mName(name) {}
};
@ -1304,8 +1304,8 @@ void MainWindow::slotReplug() {
if (!plugin) continue;
plugin->setup(this);
KActionPtrList actions = plugin->actions();
KActionPtrList::ConstIterator actionIt=actions.begin(), end=actions.end();
TDEActionPtrList actions = plugin->actions();
TDEActionPtrList::ConstIterator actionIt=actions.begin(), end=actions.end();
for (; actionIt!=end; ++actionIt) {
KIPI::Category category = plugin->category(*actionIt);
@ -1320,10 +1320,10 @@ void MainWindow::slotReplug() {
}
// Create a dummy "no plugin" action list
KAction* noPlugin=new KAction(i18n("No Plugin"), 0, 0, 0, actionCollection(), "no_plugin");
TDEAction* noPlugin=new TDEAction(i18n("No Plugin"), 0, 0, 0, actionCollection(), "no_plugin");
noPlugin->setShortcutConfigurable(false);
noPlugin->setEnabled(false);
TQPtrList<KAction> noPluginList;
TQPtrList<TDEAction> noPluginList;
noPluginList.append(noPlugin);
// Fill the menu
@ -1341,10 +1341,10 @@ void MainWindow::slotReplug() {
#else
void MainWindow::loadPlugins() {
// Create a dummy "no KIPI" action list
KAction* noPlugin=new KAction(i18n("No KIPI support"), 0, 0, 0, actionCollection(), "no_plugin");
TDEAction* noPlugin=new TDEAction(i18n("No KIPI support"), 0, 0, 0, actionCollection(), "no_plugin");
noPlugin->setShortcutConfigurable(false);
noPlugin->setEnabled(false);
TQPtrList<KAction> noPluginList;
TQPtrList<TDEAction> noPluginList;
noPluginList.append(noPlugin);
TQStringList lst;

62
src/app/mainwindow.h
Unescape View File

@ -39,16 +39,16 @@ class TQLabel;
class TQTimer;
class TQWidgetStack;
class KAction;
class TDEAction;
class KDockArea;
class KDockWidget;
class KFileItem;
class KHistoryCombo;
class KListView;
class KRadioAction;
class KToggleAction;
class KToolBarLabelAction;
class KToolBarPopupAction;
class TDEListView;
class TDERadioAction;
class TDEToggleAction;
class TDEToolBarLabelAction;
class TDEToolBarPopupAction;
class KURLCompletion;
namespace Gwenview {
@ -62,7 +62,7 @@ class ImageViewController;
class SlideShow;
class MainWindow : public KMainWindow {
class MainWindow : public TDEMainWindow {
Q_OBJECT
public:
@ -100,33 +100,33 @@ private:
History* mHistory;
SlideShow* mSlideShow;
KRadioAction* mSwitchToBrowseMode;
KRadioAction* mSwitchToViewMode;
KToggleAction* mToggleFullScreen;
KToolBarLabelAction* mFullScreenLabelAction;
KAction* mRenameFile;
KAction* mCopyFiles;
KAction* mMoveFiles;
KAction* mLinkFiles;
KAction* mDeleteFiles;
KAction* mShowConfigDialog;
KAction* mShowKeyDialog;
KAction* mReload;
KToolBarPopupAction* mGoUp;
KAction* mShowFileProperties;
KAction* mToggleSlideShow;
KAction* mRotateLeft;
KAction* mRotateRight;
KAction* mMirror;
KAction* mFlip;
KAction* mSaveFile;
KAction* mSaveFileAs;
KAction* mFilePrint;
KAction* mResetDockWidgets;
TDERadioAction* mSwitchToBrowseMode;
TDERadioAction* mSwitchToViewMode;
TDEToggleAction* mToggleFullScreen;
TDEToolBarLabelAction* mFullScreenLabelAction;
TDEAction* mRenameFile;
TDEAction* mCopyFiles;
TDEAction* mMoveFiles;
TDEAction* mLinkFiles;
TDEAction* mDeleteFiles;
TDEAction* mShowConfigDialog;
TDEAction* mShowKeyDialog;
TDEAction* mReload;
TDEToolBarPopupAction* mGoUp;
TDEAction* mShowFileProperties;
TDEAction* mToggleSlideShow;
TDEAction* mRotateLeft;
TDEAction* mRotateRight;
TDEAction* mMirror;
TDEAction* mFlip;
TDEAction* mSaveFile;
TDEAction* mSaveFileAs;
TDEAction* mFilePrint;
TDEAction* mResetDockWidgets;
KHistoryCombo* mURLEdit;
KURLCompletion* mURLEditCompletion;
TQPtrList<KAction> mWindowListActions;
TQPtrList<TDEAction> mWindowListActions;
#ifdef GV_HAVE_KIPI
KIPI::PluginLoader* mPluginLoader;

2
src/gvcore/deletedialogbase.ui
Unescape View File

@ -62,7 +62,7 @@
</widget>
</hbox>
</widget>
<widget class="KListBox">
<widget class="TDEListBox">
<property name="name">
<cstring>ddFileList</cstring>
</property>

2
src/gvcore/externaltoolaction.cpp
Unescape View File

@ -33,7 +33,7 @@ namespace Gwenview {
ExternalToolAction::ExternalToolAction(
TQObject* parent, const KService* service,
const KURL::List& urls)
: KAction(parent)
: TDEAction(parent)
, mService(service)
, mURLs(urls)
{

4
src/gvcore/externaltoolaction.h
Unescape View File

@ -29,10 +29,10 @@ class KService;
namespace Gwenview {
/**
* A specialized version of KAction, which is aware of the tool to run as well
* A specialized version of TDEAction, which is aware of the tool to run as well
* as the urls to call it with.
*/
class ExternalToolAction : public KAction {
class ExternalToolAction : public TDEAction {
Q_OBJECT
public:

12
src/gvcore/externaltooldialog.cpp
Unescape View File

@ -49,10 +49,10 @@ namespace Gwenview {
enum { ID_ALL_IMAGES=0, ID_ALL_FILES, ID_CUSTOM };
class ToolListViewItem : public KListViewItem {
class ToolListViewItem : public TDEListViewItem {
public:
ToolListViewItem(KListView* parent, const TQString& label)
: KListViewItem(parent, label), mDesktopFile(0L) {}
ToolListViewItem(TDEListView* parent, const TQString& label)
: TDEListViewItem(parent, label), mDesktopFile(0L) {}
void setDesktopFile(KDesktopFile* df) {
mDesktopFile=df;
@ -285,7 +285,7 @@ ExternalToolDialog::ExternalToolDialog(TQWidget* parent)
connect( d->mContent->mMoreTools, TQT_SIGNAL(leftClickedURL(const TQString&)),
this, TQT_SLOT(openURL(const TQString&)) );
KListView* view=d->mContent->mToolListView;
TDEListView* view=d->mContent->mToolListView;
if (view->firstChild()) {
view->setSelected(view->firstChild(), true);
}
@ -321,7 +321,7 @@ void ExternalToolDialog::slotSelectionChanged(TQListViewItem* item) {
void ExternalToolDialog::addTool() {
KListView* view=d->mContent->mToolListView;
TDEListView* view=d->mContent->mToolListView;
TQString name=i18n("<Unnamed tool>");
ToolListViewItem* item=new ToolListViewItem(view, name);
view->setSelected(item, true);
@ -329,7 +329,7 @@ void ExternalToolDialog::addTool() {
void ExternalToolDialog::deleteTool() {
KListView* view=d->mContent->mToolListView;
TDEListView* view=d->mContent->mToolListView;
ToolListViewItem* item=static_cast<ToolListViewItem*>(view->selectedItem());
if (!item) return;

4
src/gvcore/externaltooldialogbase.ui
Unescape View File

@ -72,7 +72,7 @@
<string>&amp;Add</string>
</property>
</widget>
<widget class="KListView" row="0" column="0" rowspan="1" colspan="2">
<widget class="TDEListView" row="0" column="0" rowspan="1" colspan="2">
<column>
<property name="text">
<string>Name</string>
@ -311,7 +311,7 @@ You can use keywords in the Command field:
</size>
</property>
</spacer>
<widget class="KListView" row="2" column="1" rowspan="2" colspan="1">
<widget class="TDEListView" row="2" column="1" rowspan="2" colspan="1">
<column>
<property name="text">
<string>Mime Type</string>

2
src/gvcore/externaltoolmanager.h
Unescape View File

@ -31,7 +31,7 @@ Copyright 2000-2004 Aur
// Local
#include "libgwenview_export.h"
class KActionMenu;
class TDEActionMenu;
class KURL;
namespace Gwenview {

22
src/gvcore/filedetailview.cpp
Unescape View File

@ -74,7 +74,7 @@ static TQPixmap createShownItemPixmap(int size, const TQColor& color) {
FileDetailView::FileDetailView(TQWidget *parent, const char *name)
: KListView(parent, name), FileViewBase()
: TDEListView(parent, name), FileViewBase()
{
mSortingCol = COL_NAME;
mBlockSortingSignal = false;
@ -140,14 +140,14 @@ void FileDetailView::setSelected( const KFileItem *info, bool enable )
{
if (!info) return;
FileDetailViewItem *item = viewItem(info);
if (item) KListView::setSelected(item, enable);
if (item) TDEListView::setSelected(item, enable);
}
void FileDetailView::setCurrentItem( const KFileItem *item )
{
if (!item) return;
FileDetailViewItem *listItem = viewItem(item);
if (listItem) KListView::setCurrentItem(listItem);
if (listItem) TDEListView::setCurrentItem(listItem);
}
KFileItem * FileDetailView::currentFileItem() const
@ -160,17 +160,17 @@ KFileItem * FileDetailView::currentFileItem() const
void FileDetailView::clearSelection()
{
KListView::clearSelection();
TDEListView::clearSelection();
}
void FileDetailView::selectAll()
{
KListView::selectAll( true );
TDEListView::selectAll( true );
}
void FileDetailView::invertSelection()
{
KListView::invertSelection();
TDEListView::invertSelection();
}
void FileDetailView::slotActivateMenu (TQListViewItem *item,const TQPoint& pos )
@ -187,7 +187,7 @@ void FileDetailView::clearView()
{
mResolver->m_lstPendingMimeIconItems.clear();
mShownFileItem=0L;
KListView::clear();
TDEListView::clear();
}
void FileDetailView::insertItem( KFileItem *i )
@ -349,8 +349,8 @@ void FileDetailView::slotSortingChanged( int col )
if (thumbItem) setSortingKey(thumbItem,item);
}
KListView::setSorting( mSortingCol, !reversed );
KListView::sort();
TDEListView::setSorting( mSortingCol, !reversed );
TDEListView::sort();
if (!mBlockSortingSignal) sig->changeSorting( static_cast<TQDir::SortSpec>( sortSpec ) );
}
@ -390,7 +390,7 @@ void FileDetailView::ensureItemVisible( const KFileItem *i )
FileDetailViewItem *item = viewItem(i);
if ( item ) KListView::ensureItemVisible( item );
if ( item ) TDEListView::ensureItemVisible( item );
}
// we're in multiselection mode
@ -434,7 +434,7 @@ KFileItem * FileDetailView::prevItem( const KFileItem *fileItem ) const
void FileDetailView::keyPressEvent( TQKeyEvent *e )
{
KListView::keyPressEvent( e );
TDEListView::keyPressEvent( e );
if ( e->key() == Key_Return || e->key() == Key_Enter ) {
if ( e->state() & ControlButton )

8
src/gvcore/filedetailview.h
Unescape View File

@ -41,7 +41,7 @@ namespace Gwenview {
class FileDetailViewItem;
class FileDetailView : public KListView, public FileViewBase
class FileDetailView : public TDEListView, public FileViewBase
{
Q_OBJECT
@ -111,9 +111,9 @@ private:
bool mBlockSortingSignal;
KMimeTypeResolver<FileDetailViewItem,FileDetailView>* mResolver;
virtual void insertItem(TQListViewItem* i) { KListView::insertItem(i); }
virtual void setSorting(int i, bool b) { KListView::setSorting(i, b); }
virtual void setSelected(TQListViewItem* i, bool b) { KListView::setSelected(i, b); }
virtual void insertItem(TQListViewItem* i) { TDEListView::insertItem(i); }
virtual void setSorting(int i, bool b) { TDEListView::setSorting(i, b); }
virtual void setSelected(TQListViewItem* i, bool b) { TDEListView::setSelected(i, b); }
FileDetailViewItem* viewItem( const KFileItem* item ) const {
if (item) return (FileDetailViewItem*)item->extraData(this);

2
src/gvcore/filedetailviewitem.cpp
Unescape View File

@ -48,7 +48,7 @@ void FileDetailViewItem::init()
const TQPixmap* FileDetailViewItem::pixmap(int column) const {
const TQPixmap* normalPix = KListViewItem::pixmap(column);
const TQPixmap* normalPix = TDEListViewItem::pixmap(column);
if (column!=0) {
return normalPix;
}

8
src/gvcore/filedetailviewitem.h
Unescape View File

@ -36,25 +36,25 @@ namespace Gwenview {
#define COL_OWNER 4
#define COL_GROUP 5
class FileDetailViewItem : public KListViewItem
class FileDetailViewItem : public TDEListViewItem
{
public:
FileDetailViewItem( TQListView* parent, const TQString &text,
const TQPixmap &icon, KFileItem* fi )
: KListViewItem( parent, text ), inf( fi ) {
: TDEListViewItem( parent, text ), inf( fi ) {
setPixmap( 0, icon );
setText( 0, text );
}
FileDetailViewItem( TQListView* parent, KFileItem* fi )
: KListViewItem( parent ), inf( fi ) {
: TDEListViewItem( parent ), inf( fi ) {
init();
}
FileDetailViewItem( TQListView* parent, const TQString &text,
const TQPixmap &icon, KFileItem* fi,
TQListViewItem* after)
: KListViewItem( parent, after ), inf( fi ) {
: TDEListViewItem( parent, after ), inf( fi ) {
setPixmap( 0, icon );
setText( 0, text );
}

46
src/gvcore/fileviewcontroller.cpp
Unescape View File

@ -179,10 +179,10 @@ public:
}
FileViewController* that;
FilterBar* mFilterBar;
KToolBar* mToolBar;
TDEToolBar* mToolBar;
TQWidgetStack* mStack;
KSelectAction* mSortAction;
KToggleAction* mRevertSortAction;
TDESelectAction* mSortAction;
TDEToggleAction* mRevertSortAction;
TipTracker* mSliderTracker;
TQHBox* mFilterHBox;
@ -252,7 +252,7 @@ public:
// FileViewController
//
//-----------------------------------------------------------------------
FileViewController::FileViewController(TQWidget* parent,KActionCollection* actionCollection)
FileViewController::FileViewController(TQWidget* parent,TDEActionCollection* actionCollection)
: TQWidget(parent)
, mMode(FILE_LIST)
, mPrefetch( NULL )
@ -263,7 +263,7 @@ FileViewController::FileViewController(TQWidget* parent,KActionCollection* actio
d=new Private;
d->that=this;
setMinimumWidth(1);
d->mToolBar=new KToolBar(this, "", true);
d->mToolBar=new TDEToolBar(this, "", true);
d->initFilterBar();
d->initFilterCombo();
d->mStack=new TQWidgetStack(this);
@ -274,38 +274,38 @@ FileViewController::FileViewController(TQWidget* parent,KActionCollection* actio
layout->addWidget(d->mStack);
// Actions
mSelectFirst=new KAction(i18n("&First"),
mSelectFirst=new TDEAction(i18n("&First"),
TQApplication::reverseLayout() ? "2rightarrow":"2leftarrow", Key_Home,
TQT_TQOBJECT(this),TQT_SLOT(slotSelectFirst()), actionCollection, "first");
mSelectLast=new KAction(i18n("&Last"),
mSelectLast=new TDEAction(i18n("&Last"),
TQApplication::reverseLayout() ? "2leftarrow":"2rightarrow", Key_End,
TQT_TQOBJECT(this),TQT_SLOT(slotSelectLast()), actionCollection, "last");
mSelectPrevious=new KAction(i18n("&Previous"),
mSelectPrevious=new TDEAction(i18n("&Previous"),
TQApplication::reverseLayout() ? "1rightarrow":"1leftarrow", Key_BackSpace,
TQT_TQOBJECT(this),TQT_SLOT(slotSelectPrevious()), actionCollection, "previous");
mSelectNext=new KAction(i18n("&Next"),
mSelectNext=new TDEAction(i18n("&Next"),
TQApplication::reverseLayout() ? "1leftarrow":"1rightarrow", Key_Space,
TQT_TQOBJECT(this),TQT_SLOT(slotSelectNext()), actionCollection, "next");
mSelectPreviousDir=new KAction(i18n("&Previous Folder"),
mSelectPreviousDir=new TDEAction(i18n("&Previous Folder"),
TQApplication::reverseLayout() ? "player_fwd":"player_rew", ALT + Key_BackSpace,
TQT_TQOBJECT(this),TQT_SLOT(slotSelectPreviousDir()), actionCollection, "previous_folder");
mSelectNextDir=new KAction(i18n("&Next Folder"),
mSelectNextDir=new TDEAction(i18n("&Next Folder"),
TQApplication::reverseLayout() ? "player_rew":"player_fwd", ALT + Key_Space,
TQT_TQOBJECT(this),TQT_SLOT(slotSelectNextDir()), actionCollection, "next_folder");
mSelectFirstSubDir=new KAction(i18n("&First Sub Folder"), "down", ALT + Key_Down,
mSelectFirstSubDir=new TDEAction(i18n("&First Sub Folder"), "down", ALT + Key_Down,
TQT_TQOBJECT(this),TQT_SLOT(slotSelectFirstSubDir()), actionCollection, "first_sub_folder");
mListMode=new KRadioAction(i18n("Details"),"view_detailed",0,TQT_TQOBJECT(this),TQT_SLOT(updateViewMode()),actionCollection,"list_mode");
mListMode=new TDERadioAction(i18n("Details"),"view_detailed",0,TQT_TQOBJECT(this),TQT_SLOT(updateViewMode()),actionCollection,"list_mode");
mListMode->setExclusiveGroup("thumbnails");
mSideThumbnailMode=new KRadioAction(i18n("Thumbnails with Info on Side"),"view_multicolumn",0,TQT_TQOBJECT(this),TQT_SLOT(updateViewMode()),actionCollection,"side_thumbnail_mode");
mSideThumbnailMode=new TDERadioAction(i18n("Thumbnails with Info on Side"),"view_multicolumn",0,TQT_TQOBJECT(this),TQT_SLOT(updateViewMode()),actionCollection,"side_thumbnail_mode");
mSideThumbnailMode->setExclusiveGroup("thumbnails");
mBottomThumbnailMode=new KRadioAction(i18n("Thumbnails with Info on Bottom"),"view_icon",0,TQT_TQOBJECT(this),TQT_SLOT(updateViewMode()),actionCollection,"bottom_thumbnail_mode");
mBottomThumbnailMode=new TDERadioAction(i18n("Thumbnails with Info on Bottom"),"view_icon",0,TQT_TQOBJECT(this),TQT_SLOT(updateViewMode()),actionCollection,"bottom_thumbnail_mode");
mBottomThumbnailMode->setExclusiveGroup("thumbnails");
// Size slider
@ -318,19 +318,19 @@ FileViewController::FileViewController(TQWidget* parent,KActionCollection* actio
connect(mSizeSlider, TQT_SIGNAL(valueChanged(int)), TQT_TQOBJECT(this), TQT_SLOT(updateThumbnailSize(int)) );
connect(mListMode, TQT_SIGNAL(toggled(bool)), mSizeSlider, TQT_SLOT(setDisabled(bool)) );
KAction* sliderAction=new KWidgetAction(mSizeSlider, i18n("Thumbnail Size"), 0, 0, 0, actionCollection, "size_slider");
TDEAction* sliderAction=new KWidgetAction(mSizeSlider, i18n("Thumbnail Size"), 0, 0, 0, actionCollection, "size_slider");
d->mSliderTracker=new TipTracker("", mSizeSlider);
// /Size slider
mShowDotFiles=new KToggleAction(i18n("Show &Hidden Files"),CTRL + Key_H,TQT_TQOBJECT(this),TQT_SLOT(toggleShowDotFiles()),actionCollection,"show_dot_files");
mShowDotFiles=new TDEToggleAction(i18n("Show &Hidden Files"),CTRL + Key_H,TQT_TQOBJECT(this),TQT_SLOT(toggleShowDotFiles()),actionCollection,"show_dot_files");
d->mSortAction=new KSelectAction(i18n("Sort"), 0, TQT_TQOBJECT(this), TQT_SLOT(setSorting()), actionCollection, "view_sort");
d->mSortAction=new TDESelectAction(i18n("Sort"), 0, TQT_TQOBJECT(this), TQT_SLOT(setSorting()), actionCollection, "view_sort");
TQStringList sortItems;
sortItems << i18n("By Name") << i18n("By Date") << i18n("By Size");
d->mSortAction->setItems(sortItems);
d->mSortAction->setCurrentItem(0);
d->mRevertSortAction=new KToggleAction(i18n("Descending"),0, TQT_TQOBJECT(this), TQT_SLOT(setSorting()), actionCollection, "descending");
d->mRevertSortAction=new TDEToggleAction(i18n("Descending"),0, TQT_TQOBJECT(this), TQT_SLOT(setSorting()), actionCollection, "descending");
TQPopupMenu* sortMenu=d->mSortAction->popupMenu();
Q_ASSERT(sortMenu);
sortMenu->insertSeparator();
@ -379,8 +379,8 @@ FileViewController::FileViewController(TQWidget* parent,KActionCollection* actio
TQT_TQOBJECT(this),TQT_SLOT(slotViewClicked()) );
connect(mFileDetailView,TQT_SIGNAL(clicked(TQListViewItem*)),
TQT_TQOBJECT(this),TQT_SLOT(slotViewClicked()) );
connect(mFileDetailView,TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)),
TQT_TQOBJECT(this),TQT_SLOT(openContextMenu(KListView*, TQListViewItem*, const TQPoint&)) );
connect(mFileDetailView,TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
TQT_TQOBJECT(this),TQT_SLOT(openContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) );
connect(mFileDetailView,TQT_SIGNAL(dropped(TQDropEvent*,KFileItem*)),
TQT_TQOBJECT(this),TQT_SLOT(openDropURLMenu(TQDropEvent*, KFileItem*)) );
connect(mFileDetailView, TQT_SIGNAL(sortingChanged(TQDir::SortSpec)),
@ -415,7 +415,7 @@ FileViewController::FileViewController(TQWidget* parent,KActionCollection* actio
this, TQT_SIGNAL(selectionChanged()) );
// Thumbnail details dialog
KAction* thumbnailDetailsDialogAction=new KAction(i18n("Edit Thumbnail Details..."), "configure", 0, TQT_TQOBJECT(mFileThumbnailView), TQT_SLOT(showThumbnailDetailsDialog()), actionCollection, "thumbnail_details_dialog");
TDEAction* thumbnailDetailsDialogAction=new TDEAction(i18n("Edit Thumbnail Details..."), "configure", 0, TQT_TQOBJECT(mFileThumbnailView), TQT_SLOT(showThumbnailDetailsDialog()), actionCollection, "thumbnail_details_dialog");
connect(mBottomThumbnailMode, TQT_SIGNAL(toggled(bool)),
thumbnailDetailsDialogAction, TQT_SLOT(setEnabled(bool)) );
@ -810,7 +810,7 @@ void FileViewController::setSorting() {
// Context menu
//
//-----------------------------------------------------------------------
void FileViewController::openContextMenu(KListView*,TQListViewItem* item,const TQPoint& pos) {
void FileViewController::openContextMenu(TDEListView*,TQListViewItem* item,const TQPoint& pos) {
emit requestContextMenu(pos, item!=0);
}

60
src/gvcore/fileviewcontroller.h
Unescape View File

@ -37,13 +37,13 @@ class TQIconViewItem;
class TQListViewItem;
class TQPopupMenu;
class KAccel;
class KAction;
class KActionCollection;
class TDEAccel;
class TDEAction;
class TDEActionCollection;
class TDEConfig;
class KListView;
class KRadioAction;
class KToggleAction;
class TDEListView;
class TDERadioAction;
class TDEToggleAction;
namespace Gwenview {
class FileViewBase;
@ -62,7 +62,7 @@ public:
enum Mode { FILE_LIST, THUMBNAIL};
enum FilterMode { ALL, IMAGES_ONLY, VIDEOS_ONLY };
FileViewController(TQWidget* parent,KActionCollection*);
FileViewController(TQWidget* parent,TDEActionCollection*);
~FileViewController();
// Properties
@ -79,17 +79,17 @@ public:
FileViewBase* currentFileView() const;
FileThumbnailView* fileThumbnailView() const { return mFileThumbnailView; }
KAction* selectFirst() const { return mSelectFirst; }
KAction* selectLast() const { return mSelectLast; }
KAction* selectPrevious() const { return mSelectPrevious; }
KAction* selectNext() const { return mSelectNext; }
KAction* selectPreviousDir() const { return mSelectPreviousDir; }
KAction* selectNextDir() const { return mSelectNextDir; }
KAction* selectFirstSubDir() const { return mSelectFirstSubDir; }
KRadioAction* listMode() const { return mListMode; }
KRadioAction* sideThumbnailMode() const { return mSideThumbnailMode; }
KRadioAction* bottomThumbnailMode() const { return mBottomThumbnailMode; }
KToggleAction* showDotFiles() const { return mShowDotFiles; }
TDEAction* selectFirst() const { return mSelectFirst; }
TDEAction* selectLast() const { return mSelectLast; }
TDEAction* selectPrevious() const { return mSelectPrevious; }
TDEAction* selectNext() const { return mSelectNext; }
TDEAction* selectPreviousDir() const { return mSelectPreviousDir; }
TDEAction* selectNextDir() const { return mSelectNextDir; }
TDEAction* selectFirstSubDir() const { return mSelectFirstSubDir; }
TDERadioAction* listMode() const { return mListMode; }
TDERadioAction* sideThumbnailMode() const { return mSideThumbnailMode; }
TDERadioAction* bottomThumbnailMode() const { return mBottomThumbnailMode; }
TDEToggleAction* showDotFiles() const { return mShowDotFiles; }
KURL::List selectedURLs() const;
KURL::List selectedImageURLs() const;
@ -163,7 +163,7 @@ private slots:
// These two methods forward the context menu requests from either view to
// openContextMenu(const TQPoint&);
void openContextMenu(KListView*, TQListViewItem*, const TQPoint&);
void openContextMenu(TDEListView*, TQListViewItem*, const TQPoint&);
void openContextMenu(TQIconViewItem*,const TQPoint&);
// Get called by the thumbnail mode actions
@ -204,21 +204,21 @@ private:
ImageLoader* mPrefetch;
// Our actions
KAction* mSelectFirst;
KAction* mSelectLast;
KAction* mSelectPrevious;
KAction* mSelectNext;
KAction* mSelectPreviousDir;
KAction* mSelectNextDir;
KAction* mSelectFirstSubDir;
TDEAction* mSelectFirst;
TDEAction* mSelectLast;
TDEAction* mSelectPrevious;
TDEAction* mSelectNext;
TDEAction* mSelectPreviousDir;
TDEAction* mSelectNextDir;
TDEAction* mSelectFirstSubDir;
KRadioAction* mListMode;
KRadioAction* mSideThumbnailMode;
KRadioAction* mBottomThumbnailMode;
TDERadioAction* mListMode;
TDERadioAction* mSideThumbnailMode;
TDERadioAction* mBottomThumbnailMode;
TQSlider* mSizeSlider;
KToggleAction* mShowDotFiles;
TDEToggleAction* mShowDotFiles;
// Temp data used by the dir lister
bool mThumbnailsNeedUpdate;

6
src/gvcore/fullscreenbar.cpp
Unescape View File

@ -76,7 +76,7 @@ struct FullScreenBar::Private {
FullScreenBar::FullScreenBar(TQWidget* parent)
: KToolBar(parent, "FullScreenBar") {
: TDEToolBar(parent, "FullScreenBar") {
d=new Private;
d->mState=OUT;
d->mFirstShow=true;
@ -103,7 +103,7 @@ FullScreenBar::~FullScreenBar() {
void FullScreenBar::resizeEvent(TQResizeEvent* event) {
KToolBar::resizeEvent(event);
TDEToolBar::resizeEvent(event);
// Create a mask
TQPainter painter;
@ -118,7 +118,7 @@ void FullScreenBar::resizeEvent(TQResizeEvent* event) {
void FullScreenBar::showEvent(TQShowEvent* event) {
KToolBar::showEvent(event);
TDEToolBar::showEvent(event);
// Make sure the bar position corresponds to the OUT state
if (!d->mFirstShow) return;
d->mFirstShow=false;

2
src/gvcore/fullscreenbar.h
Unescape View File

@ -30,7 +30,7 @@ class TQShowEvent;
class TQString;
namespace Gwenview {
class FullScreenBar : public KToolBar {
class FullScreenBar : public TDEToolBar {
Q_OBJECT
public:

66
src/gvcore/imageview.cpp
Unescape View File

@ -160,24 +160,24 @@ struct ImageView::Private {
// Our actions
TQComboBox* mZoomCombo;
// We do not use KSelectAction because it's not possible to set the combo text
// We do not use TDESelectAction because it's not possible to set the combo text
KWidgetAction* mZoomComboAction;
KToggleAction* mZoomToFit;
KToggleAction* mZoomToWidth;
KToggleAction* mZoomToHeight;
TQValueVector<KToggleAction*> mZoomComboActions;
KAction* mZoomIn;
KAction* mZoomOut;
KAction* mResetZoom;
KToggleAction* mLockZoom;
KAction* mAdjustBCG;
KAction* mIncreaseGamma;
KAction* mDecreaseGamma;
KAction* mIncreaseBrightness;
KAction* mDecreaseBrightness;
KAction* mIncreaseContrast;
KAction* mDecreaseContrast;
KActionCollection* mActionCollection;
TDEToggleAction* mZoomToFit;
TDEToggleAction* mZoomToWidth;
TDEToggleAction* mZoomToHeight;
TQValueVector<TDEToggleAction*> mZoomComboActions;
TDEAction* mZoomIn;
TDEAction* mZoomOut;
TDEAction* mResetZoom;
TDEToggleAction* mLockZoom;
TDEAction* mAdjustBCG;
TDEAction* mIncreaseGamma;
TDEAction* mDecreaseGamma;
TDEAction* mIncreaseBrightness;
TDEAction* mDecreaseBrightness;
TDEAction* mIncreaseContrast;
TDEAction* mDecreaseContrast;
TDEActionCollection* mActionCollection;
BCGDialog* mBCGDialog;
// Fullscreen stuff
@ -246,7 +246,7 @@ struct ImageView::Private {
void initZoomCombo() {
mZoomCombo->clear();
for (TQValueVector<KToggleAction*>::iterator it=mZoomComboActions.begin();
for (TQValueVector<TDEToggleAction*>::iterator it=mZoomComboActions.begin();
it!=mZoomComboActions.end();
++it)
{
@ -291,7 +291,7 @@ public:
ImageView::ImageView(TQWidget* parent,Document* document, KActionCollection* actionCollection)
ImageView::ImageView(TQWidget* parent,Document* document, TDEActionCollection* actionCollection)
: TQScrollView(parent,0L,WResizeNoErase|WRepaintNoErase|WPaintClever)
{
d=new Private;
@ -325,13 +325,13 @@ ImageView::ImageView(TQWidget* parent,Document* document, KActionCollection* act
d->mTools[d->mToolID]->updateCursor();
// Create actions
d->mZoomToFit=new KToggleAction(i18n("Fit to &Window"),"viewmagfit",0,d->mActionCollection,"view_zoom_to_fit");
d->mZoomToFit=new TDEToggleAction(i18n("Fit to &Window"),"viewmagfit",0,d->mActionCollection,"view_zoom_to_fit");
connect(d->mZoomToFit,TQT_SIGNAL(toggled(bool)),
TQT_TQOBJECT(this), TQT_SLOT(setZoomToFit(bool)) );
d->mZoomToWidth=new KToggleAction(i18n("Fit to &Width"),0,0,d->mActionCollection,"view_zoom_to_width");
d->mZoomToWidth=new TDEToggleAction(i18n("Fit to &Width"),0,0,d->mActionCollection,"view_zoom_to_width");
connect(d->mZoomToWidth,TQT_SIGNAL(toggled(bool)),
TQT_TQOBJECT(this), TQT_SLOT(setZoomToWidth(bool)) );
d->mZoomToHeight=new KToggleAction(i18n("Fit to &Height"),0,0,d->mActionCollection,"view_zoom_to_height");
d->mZoomToHeight=new TDEToggleAction(i18n("Fit to &Height"),0,0,d->mActionCollection,"view_zoom_to_height");
connect(d->mZoomToHeight,TQT_SIGNAL(toggled(bool)),
TQT_TQOBJECT(this), TQT_SLOT(setZoomToHeight(bool)) );
@ -342,7 +342,7 @@ ImageView::ImageView(TQWidget* parent,Document* document, KActionCollection* act
d->mResetZoom=KStdAction::actualSize(TQT_TQOBJECT(this),TQT_SLOT(slotResetZoom()),d->mActionCollection);
d->mResetZoom->setIcon("viewmag1");
d->mLockZoom=new KToggleAction(i18n("&Lock Zoom"),"lock",0,d->mActionCollection,"view_zoom_lock");
d->mLockZoom=new TDEToggleAction(i18n("&Lock Zoom"),"lock",0,d->mActionCollection,"view_zoom_lock");
d->mLockZoom->setChecked(ImageViewConfig::lockZoom());
connect(d->mLockZoom,TQT_SIGNAL(toggled(bool)),
TQT_TQOBJECT(this), TQT_SLOT(setLockZoom(bool)) );
@ -363,19 +363,19 @@ ImageView::ImageView(TQWidget* parent,Document* document, KActionCollection* act
}
d->initZoomCombo();
d->mAdjustBCG=new KAction(i18n("Adjust Brightness/Contrast/Gamma"), "colorize", 0,
d->mAdjustBCG=new TDEAction(i18n("Adjust Brightness/Contrast/Gamma"), "colorize", 0,
TQT_TQOBJECT(this), TQT_SLOT(showBCGDialog()), d->mActionCollection, "adjust_bcg");
d->mIncreaseGamma=new KAction(i18n("Increase Gamma"),0,CTRL+Key_G,
d->mIncreaseGamma=new TDEAction(i18n("Increase Gamma"),0,CTRL+Key_G,
TQT_TQOBJECT(this), TQT_SLOT(increaseGamma()),d->mActionCollection,"increase_gamma");
d->mDecreaseGamma=new KAction(i18n("Decrease Gamma"),0,SHIFT+CTRL+Key_G,
d->mDecreaseGamma=new TDEAction(i18n("Decrease Gamma"),0,SHIFT+CTRL+Key_G,
TQT_TQOBJECT(this), TQT_SLOT(decreaseGamma()),d->mActionCollection,"decrease_gamma");
d->mIncreaseBrightness=new KAction(i18n("Increase Brightness" ),0,CTRL+Key_B,
d->mIncreaseBrightness=new TDEAction(i18n("Increase Brightness" ),0,CTRL+Key_B,
TQT_TQOBJECT(this), TQT_SLOT(increaseBrightness()),d->mActionCollection,"increase_brightness");
d->mDecreaseBrightness=new KAction(i18n("Decrease Brightness" ),0,SHIFT+CTRL+Key_B,
d->mDecreaseBrightness=new TDEAction(i18n("Decrease Brightness" ),0,SHIFT+CTRL+Key_B,
TQT_TQOBJECT(this), TQT_SLOT(decreaseBrightness()),d->mActionCollection,"decrease_brightness");
d->mIncreaseContrast=new KAction(i18n("Increase Contrast" ),0,CTRL+Key_C,
d->mIncreaseContrast=new TDEAction(i18n("Increase Contrast" ),0,CTRL+Key_C,
TQT_TQOBJECT(this), TQT_SLOT(increaseContrast()),d->mActionCollection,"increase_contrast");
d->mDecreaseContrast=new KAction(i18n("Decrease Contrast" ),0,SHIFT+CTRL+Key_C,
d->mDecreaseContrast=new TDEAction(i18n("Decrease Contrast" ),0,SHIFT+CTRL+Key_C,
TQT_TQOBJECT(this), TQT_SLOT(decreaseContrast()),d->mActionCollection,"decrease_contrast");
// Connect to some interesting signals
@ -477,12 +477,12 @@ TQPoint ImageView::offset() const {
bool ImageView::canZoom(bool in) const {
KAction* zoomAction=in ? d->mZoomIn : d->mZoomOut;
TDEAction* zoomAction=in ? d->mZoomIn : d->mZoomOut;
return zoomAction->isEnabled();
}
KToggleAction* ImageView::zoomToFit() const {
TDEToggleAction* ImageView::zoomToFit() const {
return d->mZoomToFit;
}
@ -522,7 +522,7 @@ void ImageView::updateZoom(ZoomMode zoomMode, double value, int centerX, int cen
ZoomMode oldZoomMode = d->mZoomMode;
double oldZoom=d->mZoom;
d->mZoomMode=zoomMode;
KAction* checkedZoomAction=0;
TDEAction* checkedZoomAction=0;
viewport()->setUpdatesEnabled(false);

12
src/gvcore/imageview.h
Unescape View File

@ -39,10 +39,10 @@ class TQMouseEvent;
class TQPainter;
class TQTimer;
class TQWheelEvent;
class KAction;
class KActionCollection;
class KToggleAction;
typedef TQValueList<KAction *> KActionPtrList;
class TDEAction;
class TDEActionCollection;
class TDEToggleAction;
typedef TQValueList<TDEAction *> TDEActionPtrList;
namespace Gwenview {
class Document;
@ -67,7 +67,7 @@ public:
enum ZoomMode { ZOOM_FIT, ZOOM_FIT_WIDTH, ZOOM_FIT_HEIGHT, ZOOM_FREE };
typedef TQMap<ToolID,ToolBase*> Tools;
ImageView(TQWidget* parent,Document*,KActionCollection*);
ImageView(TQWidget* parent,Document*,TDEActionCollection*);
~ImageView();
// Properties
@ -148,7 +148,7 @@ private:
// Used by the zoom tool
TQPoint offset() const;
bool canZoom(bool in) const;
KToggleAction* zoomToFit() const;
TDEToggleAction* zoomToFit() const;
private slots:
void slotLoaded();

36
src/gvcore/imageviewcontroller.cpp
Unescape View File

@ -88,15 +88,15 @@ struct ImageViewController::Private {
ImageViewController* mImageViewController;
Document* mDocument;
KActionCollection* mActionCollection;
TDEActionCollection* mActionCollection;
TQWidget* mContainer;
KToolBar* mToolBar;
TDEToolBar* mToolBar;
KXMLGUIFactory* mFactory;
XMLGUIBuilder* mBuilder;
TQWidgetStack* mStack;
ImageView* mImageView;
KActionPtrList mImageViewActions;
TDEActionPtrList mImageViewActions;
// Hide cursor stuff
TQTimer* mAutoHideTimer;
@ -107,7 +107,7 @@ struct ImageViewController::Private {
// Fullscreen stuff
bool mFullScreen;
FullScreenBar* mFullScreenBar;
KActionPtrList mFullScreenCommonActions;
TDEActionPtrList mFullScreenCommonActions;
void setXMLGUIClient(KXMLGUIClient* client) {
@ -121,11 +121,11 @@ struct ImageViewController::Private {
}
// Unplug image view actions, if plugged
KActionPtrList::Iterator
TDEActionPtrList::Iterator
it=mImageViewActions.begin(),
end=mImageViewActions.end();
for (; it!=end; ++it) {
KAction* action=*it;
TDEAction* action=*it;
if (action->isPlugged(mToolBar)) {
action->unplug(mToolBar);
}
@ -183,7 +183,7 @@ struct ImageViewController::Private {
void showImageView(void) {
LOG("");
if (mStack->visibleWidget()==mImageView) {
KAction* action=mImageViewActions.first();
TDEAction* action=mImageViewActions.first();
if (action && !action->isPlugged(mToolBar)) {
// In the ctor, we set the imageview as the visible widget but
// we did not fill the toolbar because mImageViewActions was
@ -203,11 +203,11 @@ struct ImageViewController::Private {
}
void plugImageViewActions() {
KActionPtrList::Iterator
TDEActionPtrList::Iterator
it=mImageViewActions.begin(),
end=mImageViewActions.end();
for (; it!=end; ++it) {
KAction* action=*it;
TDEAction* action=*it;
action->plug(mToolBar);
}
}
@ -246,7 +246,7 @@ struct ImageViewController::Private {
Q_ASSERT(!mFullScreenBar);
mFullScreenBar=new FullScreenBar(mContainer);
KActionPtrList::ConstIterator
TDEActionPtrList::ConstIterator
it=mFullScreenCommonActions.begin(),
end=mFullScreenCommonActions.end();
@ -264,7 +264,7 @@ struct ImageViewController::Private {
//------------------------------------------------------------------------
ImageViewController::ImageViewController(TQWidget* parent, Document* document, KActionCollection* actionCollection)
ImageViewController::ImageViewController(TQWidget* parent, Document* document, TDEActionCollection* actionCollection)
: TQObject(parent) {
d=new Private;
d->mImageViewController=this;
@ -276,7 +276,7 @@ ImageViewController::ImageViewController(TQWidget* parent, Document* document, K
d->mContainer=new TQWidget(parent);
d->mContainer->setMinimumWidth(1); // Make sure we can resize the toolbar smaller than its minimum size
TQVBoxLayout* layout=new TQVBoxLayout(d->mContainer);
d->mToolBar=new KToolBar(d->mContainer, "", true);
d->mToolBar=new TDEToolBar(d->mContainer, "", true);
layout->add(d->mToolBar);
d->mStack=new TQWidgetStack(d->mContainer);
@ -362,8 +362,8 @@ void ImageViewController::setFullScreen(bool fullScreen) {
}
void ImageViewController::setNormalCommonActions(const KActionPtrList& actions) {
KActionPtrList::ConstIterator
void ImageViewController::setNormalCommonActions(const TDEActionPtrList& actions) {
TDEActionPtrList::ConstIterator
it=actions.begin(),
end=actions.end();
@ -374,12 +374,12 @@ void ImageViewController::setNormalCommonActions(const KActionPtrList& actions)
}
void ImageViewController::setFullScreenCommonActions(const KActionPtrList& actions) {
void ImageViewController::setFullScreenCommonActions(const TDEActionPtrList& actions) {
d->mFullScreenCommonActions=actions;
}
void ImageViewController::setImageViewActions(const KActionPtrList& actions) {
void ImageViewController::setImageViewActions(const TDEActionPtrList& actions) {
d->mImageViewActions=actions;
}
@ -453,8 +453,8 @@ bool ImageViewController::eventFilter(TQObject* object, TQEvent* event) {
/**
* Little helper to plug an action if it exists
*/
inline void plugAction(TQPopupMenu* menu, KActionCollection* actionCollection, const char* actionName) {
KAction* action=actionCollection->action(actionName);
inline void plugAction(TQPopupMenu* menu, TDEActionCollection* actionCollection, const char* actionName) {
TDEAction* action=actionCollection->action(actionName);
if (action) action->plug(menu);
}

10
src/gvcore/imageviewcontroller.h
Unescape View File

@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
class TQPoint;
class TQWidget;
class KToolBar;
class TDEToolBar;
namespace Gwenview {
@ -46,16 +46,16 @@ class LIBGWENVIEW_EXPORT ImageViewController : public TQObject {
Q_OBJECT
public:
ImageViewController(TQWidget* parent, Document*, KActionCollection*);
ImageViewController(TQWidget* parent, Document*, TDEActionCollection*);
~ImageViewController();
TQWidget* widget() const;
void setImageViewActions(const KActionPtrList&);
void setImageViewActions(const TDEActionPtrList&);
void setFullScreen(bool);
void setNormalCommonActions(const KActionPtrList&);
void setFullScreenCommonActions(const KActionPtrList&);
void setNormalCommonActions(const TDEActionPtrList&);
void setFullScreenCommonActions(const TDEActionPtrList&);
void setFocus();
protected:

6
src/gvdirpart/gvdirpart.cpp
Unescape View File

@ -87,8 +87,8 @@ GVDirPart::GVDirPart(TQWidget* parentWidget, const char* /*widgetName*/, TQObjec
setWidget(mSplitter);
KStdAction::saveAs( mDocument, TQT_SLOT(saveAs()), actionCollection(), "saveAs" );
new KAction(i18n("Rotate &Left"), "rotate_ccw", CTRL + Key_L, this, TQT_SLOT(rotateLeft()), actionCollection(), "rotate_left");
new KAction(i18n("Rotate &Right"), "rotate_cw", CTRL + Key_R, this, TQT_SLOT(rotateRight()), actionCollection(), "rotate_right");
new TDEAction(i18n("Rotate &Left"), "rotate_ccw", CTRL + Key_L, this, TQT_SLOT(rotateLeft()), actionCollection(), "rotate_left");
new TDEAction(i18n("Rotate &Right"), "rotate_cw", CTRL + Key_R, this, TQT_SLOT(rotateRight()), actionCollection(), "rotate_right");
connect(mFileViewController, TQT_SIGNAL(requestContextMenu(const TQPoint&, bool)),
mBrowserExtension, TQT_SLOT(openFileViewContextMenu(const TQPoint&, bool)) );
@ -117,7 +117,7 @@ GVDirPart::GVDirPart(TQWidget* parentWidget, const char* /*widgetName*/, TQObjec
connect(mImageView, TQT_SIGNAL(selectNext()),
mFileViewController, TQT_SLOT(slotSelectNext()) );
mToggleSlideShow = new KToggleAction(i18n("Slide Show..."), "slideshow", 0, this, TQT_SLOT(toggleSlideShow()), actionCollection(), "slideshow");
mToggleSlideShow = new TDEToggleAction(i18n("Slide Show..."), "slideshow", 0, this, TQT_SLOT(toggleSlideShow()), actionCollection(), "slideshow");
mToggleSlideShow->setCheckedState( i18n("Stop Slide Show" ));
setXMLFile( "gvdirpart/gvdirpart.rc" );

6
src/gvdirpart/gvdirpart.h
Unescape View File

@ -26,8 +26,8 @@ Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA.
class TQPoint;
class TQSplitter;
class TDEAboutData;
class KAction;
class KToggleAction;
class TDEAction;
class TDEToggleAction;
namespace Gwenview {
@ -168,7 +168,7 @@ protected:
/**
* Action turns on slide show
*/
KToggleAction* mToggleSlideShow;
TDEToggleAction* mToggleSlideShow;
SlideShow* mSlideShow;
};

8
src/gvimagepart/gvimagepart.cpp
Unescape View File

@ -107,17 +107,17 @@ GVImagePart::GVImagePart(TQWidget* parentWidget, const char* /*widgetName*/, TQO
TQStringList mimeTypes=MimeTypeUtils::rasterImageMimeTypes();
mDirLister->setMimeFilter(mimeTypes);
mPreviousImage=new KAction(i18n("&Previous Image"),
mPreviousImage=new TDEAction(i18n("&Previous Image"),
TQApplication::reverseLayout() ? "1rightarrow":"1leftarrow", Key_BackSpace,
this,TQT_SLOT(slotSelectPrevious()), actionCollection(), "previous");
mNextImage=new KAction(i18n("&Next Image"),
mNextImage=new TDEAction(i18n("&Next Image"),
TQApplication::reverseLayout() ? "1leftarrow":"1rightarrow", Key_Space,
this,TQT_SLOT(slotSelectNext()), actionCollection(), "next");
updateNextPrevious();
KStdAction::saveAs( this, TQT_SLOT(saveAs()), actionCollection(), "saveAs" );
new KAction(i18n("Rotate &Left"), "rotate_ccw", CTRL + Key_L, this, TQT_SLOT(rotateLeft()), actionCollection(), "rotate_left");
new KAction(i18n("Rotate &Right"), "rotate_cw", CTRL + Key_R, this, TQT_SLOT(rotateRight()), actionCollection(), "rotate_right");
new TDEAction(i18n("Rotate &Left"), "rotate_ccw", CTRL + Key_L, this, TQT_SLOT(rotateLeft()), actionCollection(), "rotate_left");
new TDEAction(i18n("Rotate &Right"), "rotate_cw", CTRL + Key_R, this, TQT_SLOT(rotateRight()), actionCollection(), "rotate_right");
setXMLFile( "gvimagepart/gvimagepart.rc" );
}

6
src/gvimagepart/gvimagepart.h
Unescape View File

@ -28,7 +28,7 @@ class TQFile;
class TQPoint;
class TDEAboutData;
class KAction;
class TDEAction;
class KDirLister;
class KFileItem;
@ -152,8 +152,8 @@ private:
// for the next/previous actions
KDirLister* mDirLister;
KAction* mNextImage;
KAction* mPreviousImage;
TDEAction* mNextImage;
TDEAction* mPreviousImage;
// alphabetically sorted filenames of images in the picture's directory
TQStringList mImagesInDirectory;

Write Preview
Loading…
Cancel
Save