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

Rename a number of classes to enhance compatibility with KDE4

Browse Source
pull/1/head
Timothy Pearson 11 years ago
parent 921ecd4264
commit 89fd8e2597
49 changed files with 283 additions and 283 deletions
Show Stats Download Patch File Download Diff File

84
ksquirrel/ksquirrel.cpp
Unescape View File

@ -125,7 +125,7 @@ static const int menuParam = 100000;
KSquirrel * KSquirrel::m_instance = 0;
KSquirrel::KSquirrel(TQWidget *parent, const char *name)
: KMainWindow (parent, name), DCOPObject(name)
: TDEMainWindow (parent, name), DCOPObject(name)
{
// singleton setup
m_instance = this;
@ -344,7 +344,7 @@ void KSquirrel::slotRaiseThumbView()
}
// Create location toolbar
void KSquirrel::createLocationToolbar(KToolBar *pTLocation)
void KSquirrel::createLocationToolbar(TDEToolBar *pTLocation)
{
// create new KHistoryCombo
pCurrentURL = new KHistoryCombo(true, pTLocation, "history combobox");
@ -523,10 +523,10 @@ void KSquirrel::createWidgets(int createFirst)
// menubar & toolbar
menubar = new KMenuBar(mainPage);
tools = new KToolBar(mainPage);
tools = new TDEToolBar(mainPage);
// location toolbar
pTLocation = new KToolBar(mainPage, TQString::fromLatin1("Location toolbar"));
pTLocation = new TDEToolBar(mainPage, TQString::fromLatin1("Location toolbar"));
pTLocation->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum);
// main splitter
@ -681,10 +681,10 @@ void KSquirrel::slotFireDisk()
// Create menu
void KSquirrel::createMenu(KMenuBar *menubar)
{
pop_file = new KPopupMenu(menubar);
pop_view = new KPopupMenu(menubar);
pop_action = new KPopupMenu(menubar);
pop_nav = new KPopupMenu(menubar);
pop_file = new TDEPopupMenu(menubar);
pop_view = new TDEPopupMenu(menubar);
pop_action = new TDEPopupMenu(menubar);
pop_nav = new TDEPopupMenu(menubar);
// create bookmarks and filters
initBookmarks();
@ -753,7 +753,7 @@ void KSquirrel::createMenu(KMenuBar *menubar)
}
// Create toolbar
void KSquirrel::createToolbar(KToolBar *tools)
void KSquirrel::createToolbar(TDEToolBar *tools)
{
pWidgetStack->action("back")->plug(tools);
pWidgetStack->action("forward")->plug(tools);
@ -784,44 +784,44 @@ void KSquirrel::createToolbar(KToolBar *tools)
configAnime();
}
// Create all KActions
// Create all TDEActions
void KSquirrel::createActions()
{
pAThumbs = new KActionMenu(i18n("Thumbnail size"), "thumbnail");
pAThumbs = new TDEActionMenu(i18n("Thumbnail size"), "thumbnail");
pAExit = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotClose()), actionCollection(), "SQ close");
pAConfigure = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotOptions()), actionCollection(), "SQ Configure");
pAGLView = new KAction(i18n("Image window"), "raise", CTRL+TQt::Key_I, TQT_TQOBJECT(this), TQT_SLOT(raiseGLWidget()), actionCollection(), "SQ gl view widget");
pAGLView = new TDEAction(i18n("Image window"), "raise", CTRL+TQt::Key_I, TQT_TQOBJECT(this), TQT_SLOT(raiseGLWidget()), actionCollection(), "SQ gl view widget");
pARescan = KStdAction::redisplay(TQT_TQOBJECT(this), TQT_SLOT(slotRescan()), actionCollection(), "SQ rescan libraries");
pARescan->setText(i18n("Reload codecs from disk"));
pAExtTools = new KAction(i18n("Configure external tools..."), "launch", 0, TQT_TQOBJECT(this), TQT_SLOT(slotExtTools()), actionCollection(), "SQ external tools");
pAFilters = new KAction(i18n("Configure filters..."), "filefind", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFilters()), actionCollection(), "SQ filters");
pAGotoTray = new KAction(i18n("Go to tray"), "background", CTRL+TQt::Key_T, TQT_TQOBJECT(this), TQT_SLOT(slotGotoTray()), actionCollection(), "SQ goto tray");
pAOpenAndSet = new KAction(i18n("Open file and change directory"), "fileopen", CTRL+ALT+TQt::Key_O, TQT_TQOBJECT(this), TQT_SLOT(slotOpenFileAndSet()), actionCollection(), "SQ open and set");
pAOpen = new KAction(i18n("Open file"), "fileopen", CTRL+TQt::Key_O, TQT_TQOBJECT(this), TQT_SLOT(slotOpenFile()), actionCollection(), "SQ open file");
pATCMaster = new KAction(i18n("Thumbnail cache manager..."), "cache", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTCMaster()), actionCollection(), "SQ TC Master");
pAExtTools = new TDEAction(i18n("Configure external tools..."), "launch", 0, TQT_TQOBJECT(this), TQT_SLOT(slotExtTools()), actionCollection(), "SQ external tools");
pAFilters = new TDEAction(i18n("Configure filters..."), "filefind", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFilters()), actionCollection(), "SQ filters");
pAGotoTray = new TDEAction(i18n("Go to tray"), "background", CTRL+TQt::Key_T, TQT_TQOBJECT(this), TQT_SLOT(slotGotoTray()), actionCollection(), "SQ goto tray");
pAOpenAndSet = new TDEAction(i18n("Open file and change directory"), "fileopen", CTRL+ALT+TQt::Key_O, TQT_TQOBJECT(this), TQT_SLOT(slotOpenFileAndSet()), actionCollection(), "SQ open and set");
pAOpen = new TDEAction(i18n("Open file"), "fileopen", CTRL+TQt::Key_O, TQT_TQOBJECT(this), TQT_SLOT(slotOpenFile()), actionCollection(), "SQ open file");
pATCMaster = new TDEAction(i18n("Thumbnail cache manager..."), "cache", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTCMaster()), actionCollection(), "SQ TC Master");
pASelectAll = KStdAction::selectAll(0, 0, actionCollection(), "SQ Select All");
pADeselectAll = KStdAction::deselect(0, 0, actionCollection(), "SQ Deselect All");
pARaiseListView = new KRadioAction(i18n("List"), "view_multicolumn", 0, TQT_TQOBJECT(this), TQT_SLOT(slotRaiseListView()), actionCollection(), "SQ raise list view");
pARaiseIconView = new KRadioAction(i18n("Icons"), "view_icon", 0, TQT_TQOBJECT(this), TQT_SLOT(slotRaiseIconView()), actionCollection(), "SQ raise icon view");
pARaiseDetailView = new KRadioAction(i18n("Details"), "view_detailed", 0, TQT_TQOBJECT(this), TQT_SLOT(slotRaiseDetailView()), actionCollection(), "SQ raise detailed view");
pARaiseThumbView = new KRadioAction(i18n("Thumbnails"), "view_icon", 0, TQT_TQOBJECT(this), TQT_SLOT(slotRaiseThumbView()), actionCollection(), "SQ raise thumbs view");
pARaiseListView = new TDERadioAction(i18n("List"), "view_multicolumn", 0, TQT_TQOBJECT(this), TQT_SLOT(slotRaiseListView()), actionCollection(), "SQ raise list view");
pARaiseIconView = new TDERadioAction(i18n("Icons"), "view_icon", 0, TQT_TQOBJECT(this), TQT_SLOT(slotRaiseIconView()), actionCollection(), "SQ raise icon view");
pARaiseDetailView = new TDERadioAction(i18n("Details"), "view_detailed", 0, TQT_TQOBJECT(this), TQT_SLOT(slotRaiseDetailView()), actionCollection(), "SQ raise detailed view");
pARaiseThumbView = new TDERadioAction(i18n("Thumbnails"), "view_icon", 0, TQT_TQOBJECT(this), TQT_SLOT(slotRaiseThumbView()), actionCollection(), "SQ raise thumbs view");
pAURL = new KToggleAction(i18n("Show URL box"), "history", CTRL+TQt::Key_U, 0, 0, actionCollection(), "SQ toggle url box");
pAURL = new TDEToggleAction(i18n("Show URL box"), "history", CTRL+TQt::Key_U, 0, 0, actionCollection(), "SQ toggle url box");
pASlideShow = new KAction(i18n("Slideshow"), "folder_video", CTRL+TQt::Key_S, TQT_TQOBJECT(this), TQT_SLOT(slotSlideShowStart()), actionCollection(), "SQ Slideshow");
pASlideShowDialog = new KAction(i18n("Slideshow advanced"), 0, CTRL+ALT+TQt::Key_S, TQT_TQOBJECT(this), TQT_SLOT(slotSlideShowDialog()), actionCollection(), "SQ SlideShow Dialog");
pARename = new KAction(i18n("Rename"), "file_move", TQt::Key_F2, TQT_TQOBJECT(this), TQT_SLOT(slotRename()), actionCollection(), "SQ Rename");
pAPluginsInfo = new KAction(i18n("Codec information..."), "info", 0, TQT_TQOBJECT(this), TQT_SLOT(slotPluginsInfo()), actionCollection(), "SQ Plugins Info");
pAPluginsDel = new KAction(i18n("Codec manager..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotPluginsDel()), actionCollection(), "SQ Plugins Deleter");
pAGLInfo = new KAction(i18n("OpenGL information..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotGLInfo()), actionCollection(), "SQ OpenGL Info");
pASlideShow = new TDEAction(i18n("Slideshow"), "folder_video", CTRL+TQt::Key_S, TQT_TQOBJECT(this), TQT_SLOT(slotSlideShowStart()), actionCollection(), "SQ Slideshow");
pASlideShowDialog = new TDEAction(i18n("Slideshow advanced"), 0, CTRL+ALT+TQt::Key_S, TQT_TQOBJECT(this), TQT_SLOT(slotSlideShowDialog()), actionCollection(), "SQ SlideShow Dialog");
pARename = new TDEAction(i18n("Rename"), "file_move", TQt::Key_F2, TQT_TQOBJECT(this), TQT_SLOT(slotRename()), actionCollection(), "SQ Rename");
pAPluginsInfo = new TDEAction(i18n("Codec information..."), "info", 0, TQT_TQOBJECT(this), TQT_SLOT(slotPluginsInfo()), actionCollection(), "SQ Plugins Info");
pAPluginsDel = new TDEAction(i18n("Codec manager..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotPluginsDel()), actionCollection(), "SQ Plugins Deleter");
pAGLInfo = new TDEAction(i18n("OpenGL information..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotGLInfo()), actionCollection(), "SQ OpenGL Info");
pAThumb1 = new KRadioAction(i18n("Medium thumbnails"), locate("data", "images/thumbs/thumbs_medium.png"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotThumbsMedium()), actionCollection(), "SQ thumbs1");
pAThumb2 = new KRadioAction(i18n("Large thumbnails"), locate("data", "images/thumbs/thumbs_large.png"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotThumbsLarge()), actionCollection(), "SQ thumbs2");
pAThumb3 = new KRadioAction(i18n("Huge thumbnails"), locate("data", "images/thumbs/thumbs_huge.png"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotThumbsHuge()), actionCollection(), "SQ thumbs3");
pAThumb1 = new TDERadioAction(i18n("Medium thumbnails"), locate("data", "images/thumbs/thumbs_medium.png"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotThumbsMedium()), actionCollection(), "SQ thumbs1");
pAThumb2 = new TDERadioAction(i18n("Large thumbnails"), locate("data", "images/thumbs/thumbs_large.png"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotThumbsLarge()), actionCollection(), "SQ thumbs2");
pAThumb3 = new TDERadioAction(i18n("Huge thumbnails"), locate("data", "images/thumbs/thumbs_huge.png"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotThumbsHuge()), actionCollection(), "SQ thumbs3");
pASelectGroup = new KAction(i18n("Select group"), "viewmag+", CTRL+TQt::Key_Plus, 0, 0, actionCollection(), "SQ Select Group");
pADeselectGroup = new KAction(i18n("Deselect group"), "viewmag-", CTRL+TQt::Key_Minus, 0, 0, actionCollection(), "SQ Deselect Group");
pASelectGroup = new TDEAction(i18n("Select group"), "viewmag+", CTRL+TQt::Key_Plus, 0, 0, actionCollection(), "SQ Select Group");
pADeselectGroup = new TDEAction(i18n("Deselect group"), "viewmag-", CTRL+TQt::Key_Minus, 0, 0, actionCollection(), "SQ Deselect Group");
const TQString thumbs_size__ = TQString::fromLatin1("thumbs_size__");
pAThumb1->setExclusiveGroup(thumbs_size__);
@ -839,9 +839,9 @@ void KSquirrel::createActions()
pAThumbs->insert(pAThumb1);
pAThumbs->insert(pAThumb2);
pAThumbs->insert(pAThumb3);
pAThumbs->insert(new KActionSeparator(actionCollection()));
pAThumbs->insert(new TDEActionSeparator(actionCollection()));
pAThumbsE = new KToggleAction(i18n("Extended thumbnails"), "", CTRL+TQt::Key_E, 0, 0, actionCollection(), "SQ Extended thumbs");
pAThumbsE = new TDEToggleAction(i18n("Extended thumbnails"), "", CTRL+TQt::Key_E, 0, 0, actionCollection(), "SQ Extended thumbs");
tdeconf->setGroup("Thumbnails");
pAThumbsE->setChecked(tdeconf->readBoolEntry("extended", false));
connect(pAThumbsE, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotExtendedToggled(bool)));
@ -952,7 +952,7 @@ void KSquirrel::initBookmarks()
SQ_BookmarkOwner *bookmarkOwner = new SQ_BookmarkOwner(this);
// setup menu
bookmarks = new KActionMenu(i18n("&Bookmarks"), "bookmark", actionCollection(), "bookmarks");
bookmarks = new TDEActionMenu(i18n("&Bookmarks"), "bookmark", actionCollection(), "bookmarks");
bookmarkMenu = new KBookmarkMenu(bmanager, bookmarkOwner, bookmarks->popupMenu(), actionCollection(), true);
connect(bookmarkOwner, TQT_SIGNAL(openURL(const KURL&)), pWidgetStack, TQT_SLOT(setURLForCurrent(const KURL&)));
@ -1107,7 +1107,7 @@ void KSquirrel::saveValues()
if(!SQ_GLWidget::window()->fullscreen())
gl_view->saveGeometry();
tdeconf->writeEntry("ignore", dynamic_cast<KToggleAction *>(SQ_GLWidget::window()->actionCollection()->action("if less"))->isChecked());
tdeconf->writeEntry("ignore", dynamic_cast<TDEToggleAction *>(SQ_GLWidget::window()->actionCollection()->action("if less"))->isChecked());
tdeconf->writeEntry("zoom type", SQ_GLWidget::window()->zoomType());
tdeconf->setGroup("Interface");
@ -1271,9 +1271,9 @@ void KSquirrel::preCreate()
SQ_SplashScreen::advance();
actionFilterMenu = new KPopupMenu;
actionFilterMenu = new TDEPopupMenu;
actionViews = new KPopupMenu;
actionViews = new TDEPopupMenu;
pARaiseListView->plug(actionViews);
pARaiseIconView->plug(actionViews);
@ -1439,7 +1439,7 @@ void KSquirrel::continueLoading()
void KSquirrel::setCaption(const TQString &cap)
{
#if 0
KMainWindow::setCaption(cap);
TDEMainWindow::setCaption(cap);
#endif
gl_view->setCaption(cap.isEmpty() ? "ksquirrel" : kapp->makeStdCaption(cap));
@ -1748,7 +1748,7 @@ void KSquirrel::control(const TQString &command)
{
int id = it.data();
KAction *a = SQ_GLWidget::window()->actionCollection()->action(TQString::fromLatin1("action_%1").arg(id));
TDEAction *a = SQ_GLWidget::window()->actionCollection()->action(TQString::fromLatin1("action_%1").arg(id));
if(a) a->activate();
}

52
ksquirrel/ksquirrel.h
Unescape View File

@ -43,14 +43,14 @@ class TQSplitter;
namespace TDEIO { class Job; }
class KMenuBar;
class KToolBar;
class TDEToolBar;
class KStatusBar;
class KSystemTray;
class KAction;
class KRadioAction;
class KActionMenu;
class TDEAction;
class TDERadioAction;
class TDEActionMenu;
class KHistoryCombo;
class KToggleAction;
class TDEToggleAction;
class KBookmarkMenu;
class SQ_SplashScreen;
@ -75,7 +75,7 @@ class SQ_SlideShowListing;
* Main widget, which can accept DCOP messages
*/
class KSquirrel : public KMainWindow, public DCOPObject
class KSquirrel : public TDEMainWindow, public DCOPObject
{
Q_OBJECT
@ -139,13 +139,13 @@ class KSquirrel : public KMainWindow, public DCOPObject
/*
* Return popup menu with filters for filemanager.
*/
KPopupMenu* menuFilters();
TDEPopupMenu* menuFilters();
/*
* Return popup menu with view types -
* Icon view, Detail view ...
*/
KPopupMenu* menuViews();
TDEPopupMenu* menuViews();
/*
* Get pointer to a widget, located in status bar.
@ -207,7 +207,7 @@ class KSquirrel : public KMainWindow, public DCOPObject
* Create location toolbar and store a pointer to
* it in passed argument.
*/
void createLocationToolbar(KToolBar *);
void createLocationToolbar(TDEToolBar *);
/*
* Create statusbar.
@ -217,7 +217,7 @@ class KSquirrel : public KMainWindow, public DCOPObject
/*
* Create main toolbar.
*/
void createToolbar(KToolBar *);
void createToolbar(TDEToolBar *);
/*
* Create main menu.
@ -225,7 +225,7 @@ class KSquirrel : public KMainWindow, public DCOPObject
void createMenu(KMenuBar *);
/*
* Create all KActions
* Create all TDEActions
*/
void createActions();
@ -544,38 +544,38 @@ class KSquirrel : public KMainWindow, public DCOPObject
bool m_demo;
KToggleAction *pAThumbsE;
TDEToggleAction *pAThumbsE;
// main toolbar
KToolBar *tools;
TDEToolBar *tools;
//main menu
KMenuBar *menubar;
// different views (Icon view, List view ...)
KRadioAction *pARaiseListView, *pARaiseIconView, *pARaiseDetailView, *pARaiseThumbView;
TDERadioAction *pARaiseListView, *pARaiseIconView, *pARaiseDetailView, *pARaiseThumbView;
// popup menu with thumbnail sizes
KActionMenu *pAThumbs;
TDEActionMenu *pAThumbs;
// thumbnail sizes (small, normal, ...)
KRadioAction *pAThumb0, *pAThumb1, *pAThumb2, *pAThumb3;
TDERadioAction *pAThumb0, *pAThumb1, *pAThumb2, *pAThumb3;
// show/hide url box
KToggleAction *pAURL;
TDEToggleAction *pAURL;
// popup menus: "File", "View" ...
KPopupMenu *pop_file, *pop_view, *pop_action, *pop_nav;
TDEPopupMenu *pop_file, *pop_view, *pop_action, *pop_nav;
// filters and views
KPopupMenu *actionFilterMenu, *actionViews;
TDEPopupMenu *actionFilterMenu, *actionViews;
// menus with bookmarks
KActionMenu *bookmarks;
TDEActionMenu *bookmarks;
KBookmarkMenu *bookmarkMenu;
// "Open file", "open file #2"
KAction *pAOpen, *pAOpenAndSet,
TDEAction *pAOpen, *pAOpenAndSet,
*pARename,
@ -646,14 +646,14 @@ class KSquirrel : public KMainWindow, public DCOPObject
TQStringList *sqFiltersName, *sqFiltersExt;
// "Configure KSquirrel"
KAction *pAConfigure,
TDEAction *pAConfigure,
// "Select group", "Deselect group", "Select all", "Deselect"
// actions for filemanager
*pASelectGroup, *pADeselectGroup, *pASelectAll, *pADeselectAll;
// "Slideshow"
KAction *pASlideShow;
TDEAction *pASlideShow;
/*
* Slideshow-specififc members.
@ -691,7 +691,7 @@ class KSquirrel : public KMainWindow, public DCOPObject
bool slideShowStop;
// url box
KToolBar *pTLocation;
TDEToolBar *pTLocation;
// our config file
SQ_Config *tdeconf;
@ -775,13 +775,13 @@ TQStringList* KSquirrel::filtersExtensions() const
}
inline
KPopupMenu* KSquirrel::menuFilters()
TDEPopupMenu* KSquirrel::menuFilters()
{
return actionFilterMenu;
}
inline
KPopupMenu* KSquirrel::menuViews()
TDEPopupMenu* KSquirrel::menuViews()
{
return actionViews;
}

34
ksquirrel/ksquirrelpart/ksquirrelpart.cpp
Unescape View File

@ -78,51 +78,51 @@ KSquirrelPart::KSquirrelPart(TQWidget *parentWidget, const char *,
connect(gl, TQT_SIGNAL(message(const TQString &)), this, TQT_SIGNAL(setStatusBarText(const TQString&)));
setWidget(gl);
KAction *a;
TDEAction *a;
a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_Plus));
new KAction(i18n("Zoom +"), "viewmag+", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart zoom in");
new TDEAction(i18n("Zoom +"), "viewmag+", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart zoom in");
a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_Minus));
new KAction(i18n("Zoom -"), "viewmag-", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart zoom out");
new TDEAction(i18n("Zoom -"), "viewmag-", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart zoom out");
a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_P));
new KAction(i18n("Properties"), "image", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart properties");
new TDEAction(i18n("Properties"), "image", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart properties");
a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_R));
new KAction(i18n("Normalize"), "rebuild", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart normalize");
new TDEAction(i18n("Normalize"), "rebuild", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart normalize");
// colorize & filters
a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_D));
new KAction(i18n("Color balance..."), "colorize", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart colorbalance");
new TDEAction(i18n("Color balance..."), "colorize", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart colorbalance");
a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_U));
new KAction(i18n("Apply filter..."), "effect", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart filter");
new TDEAction(i18n("Apply filter..."), "effect", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart filter");
// rotate
a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_Left+CTRL));
new KAction(i18n("Rotate left"), "rotate_ccw", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart rotateleft");
new TDEAction(i18n("Rotate left"), "rotate_ccw", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart rotateleft");
a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_Right+CTRL));
new KAction(i18n("Rotate right"), "rotate_cw", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart rotateright");
new TDEAction(i18n("Rotate right"), "rotate_cw", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart rotateright");
// copy/move
a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_F5));
new KAction(i18n("Copy to..."), "editcopy", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart copyto");
new TDEAction(i18n("Copy to..."), "editcopy", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart copyto");
a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_F7));
new KAction(i18n("Move to..."), "editcut", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart moveto");
new TDEAction(i18n("Move to..."), "editcut", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart moveto");
a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_F6));
new KAction(i18n("Copy to last folder"), "", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart copy");
new TDEAction(i18n("Copy to last folder"), "", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart copy");
a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_F8));
new KAction(i18n("Move to last folder"), "", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart move");
new TDEAction(i18n("Move to last folder"), "", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart move");
a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_S));
new KAction(i18n("Save As..."), "filesaveas", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart saveas");
new TDEAction(i18n("Save As..."), "filesaveas", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart saveas");
sa = new KSelectAction(i18n("Zoom"), 0, actionCollection(), "ksquirrelpart zoom");
sa = new TDESelectAction(i18n("Zoom"), 0, actionCollection(), "ksquirrelpart zoom");
sa->setEditable(true);
TQStringList zooms;
@ -152,11 +152,11 @@ KSquirrelPart::KSquirrelPart(TQWidget *parentWidget, const char *,
TQString group = "selection_group";
ar = new KToggleAction(i18n("Rectangle"), "rectangle", KShortcut(TQt::Key_R+CTRL), 0, 0, actionCollection(), "ksquirrelpart rectangle");
ar = new TDEToggleAction(i18n("Rectangle"), "rectangle", TDEShortcut(TQt::Key_R+CTRL), 0, 0, actionCollection(), "ksquirrelpart rectangle");
ar->setExclusiveGroup(group);
connect(ar, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSelectionRect(bool)));
ae = new KToggleAction(i18n("Ellipse"), "circle", KShortcut(TQt::Key_E+CTRL), 0, 0, actionCollection(), "ksquirrelpart ellipse");
ae = new TDEToggleAction(i18n("Ellipse"), "circle", TDEShortcut(TQt::Key_E+CTRL), 0, 0, actionCollection(), "ksquirrelpart ellipse");
ae->setExclusiveGroup(group);
connect(ae, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSelectionEllipse(bool)));

8
ksquirrel/ksquirrelpart/ksquirrelpart.h
Unescape View File

@ -21,8 +21,8 @@
#include <tdeparts/part.h>
class TDEAboutData;
class KToggleAction;
class KSelectAction;
class TDEToggleAction;
class TDESelectAction;
class SQ_GLWidget;
@ -75,8 +75,8 @@ class KSquirrelPart : public KParts::ReadOnlyPart
private:
SQ_GLWidget *gl;
KToggleAction *ar, *ae;
KSelectAction *sa;
TDEToggleAction *ar, *ae;
TDESelectAction *sa;
KSquirrelPartBrowserExtension *ext;
};

4
ksquirrel/ksquirrelpart/sq_glwidget.cpp
Unescape View File

@ -121,7 +121,7 @@ SQ_GLWidget::SQ_GLWidget(TQWidget *parent, const char *name) : TQGLWidget(parent
images = 0;
parts_broken = 0;
ac = new KActionCollection(this, TQT_TQOBJECT(this), "GLWidget actionCollection");
ac = new TDEActionCollection(this, TQT_TQOBJECT(this), "GLWidget actionCollection");
changed = blocked = decoded = reset_mode = false;
movetype = -1;
buffer = new RGBA [512 * 512];
@ -169,7 +169,7 @@ SQ_GLWidget::SQ_GLWidget(TQWidget *parent, const char *name) : TQGLWidget(parent
setAcceptDrops(true);
// popup menu with image pages
images = new KPopupMenu;
images = new TDEPopupMenu;
images->setCheckable(true);
// create actions

24
ksquirrel/ksquirrelpart/sq_glwidget.h
Unescape View File

@ -48,11 +48,11 @@ struct RGBA;
#define MATRIX_Y tab->matrix[7]
#define MATRIX_Z tab->matrix[11]
class KAction;
class KActionCollection;
class KToggleAction;
class KPopupMenu;
class KRadioAction;
class TDEAction;
class TDEActionCollection;
class TDEToggleAction;
class TDEPopupMenu;
class TDERadioAction;
class KTempFile;
namespace TDEIO { class Job; }
@ -168,7 +168,7 @@ class SQ_GLWidget : public TQGLWidget
*/
GLfloat getZoomPercents() const;
KActionCollection* actionCollection() const;
TDEActionCollection* actionCollection() const;
/*
* Are we in fullscreen state ?
@ -332,7 +332,7 @@ class SQ_GLWidget : public TQGLWidget
void decodeFailedOn0(const int err_code);
/*
* Create KActions.
* Create TDEActions.
*/
void createActions();
@ -519,8 +519,8 @@ class SQ_GLWidget : public TQGLWidget
void slotCopyResult(TDEIO::Job *);
private:
KAction *pASelectionClear;
KToggleAction *pAFull, *pAIfLess, *pAZoomW,
TDEAction *pASelectionClear;
TDEToggleAction *pAFull, *pAIfLess, *pAZoomW,
*pAZoomH, *pAZoomWH, *pAZoom100,
*pAZoomLast,
*pASelectionEllipse, *pASelectionRect;
@ -528,14 +528,14 @@ class SQ_GLWidget : public TQGLWidget
SQ_ToolButton *pAToolQuick, *pAToolFull, *pAToolProp, *pAToolPrint;
SQ_ToolButtonPopup *pAToolZoom, *pAToolImages;
KActionCollection *ac, *acMain;
TDEActionCollection *ac, *acMain;
TQPopupMenu *menu, *menuFile, *menuImage;
int id_saveas, id_settings,
id_f5, id_f6, id_f7, id_f8, id_del,
id_prop;
// popup menu with zoom types (fit width, fit height, zoom 100%...)
KPopupMenu *zoomMenu, *selectionMenu,
TDEPopupMenu *zoomMenu, *selectionMenu,
// popup menu with image pages
*images;
@ -594,7 +594,7 @@ bool SQ_GLWidget::isnice()
}
inline
KActionCollection* SQ_GLWidget::actionCollection() const
TDEActionCollection* SQ_GLWidget::actionCollection() const
{
return ac;
}

6
ksquirrel/ksquirrelpart/sq_glwidget_helpers.cpp
Unescape View File

@ -36,8 +36,8 @@
#include "sq_glwidget_helpers.h"
SQ_ToolButtonPopup::SQ_ToolButtonPopup(const TQPixmap &pix, const TQString &textLabel, KToolBar *parent)
: KToolBarButton(pix, -1, parent, 0, textLabel)
SQ_ToolButtonPopup::SQ_ToolButtonPopup(const TQPixmap &pix, const TQString &textLabel, TDEToolBar *parent)
: TDEToolBarButton(pix, -1, parent, 0, textLabel)
{
setFixedWidth(SQ_ToolButton::fixedWidth());
}
@ -46,7 +46,7 @@ SQ_ToolButtonPopup::~SQ_ToolButtonPopup()
{}
SQ_ToolButton::SQ_ToolButton(const TQIconSet &iconSet, const TQString &textLabel,
TQObject *receiver, const char *slot, KToolBar *parent, const char *name)
TQObject *receiver, const char *slot, TDEToolBar *parent, const char *name)
: TQToolButton(iconSet, textLabel, TQString(), receiver, slot, parent, name)
{
setFixedWidth(SQ_ToolButton::fixedWidth());

8
ksquirrel/ksquirrelpart/sq_glwidget_helpers.h
Unescape View File

@ -22,14 +22,14 @@
class TQWMatrix;
class KToolBar;
class TDEToolBar;
struct RGBA;
class SQ_ToolButtonPopup : public KToolBarButton
class SQ_ToolButtonPopup : public TDEToolBarButton
{
public:
SQ_ToolButtonPopup(const TQPixmap &pix, const TQString &textLabel, KToolBar *parent);
SQ_ToolButtonPopup(const TQPixmap &pix, const TQString &textLabel, TDEToolBar *parent);
~SQ_ToolButtonPopup();
};
@ -37,7 +37,7 @@ class SQ_ToolButton : public TQToolButton
{
public:
SQ_ToolButton(const TQIconSet &iconSet, const TQString &textLabel, TQObject *receiver,
const char *slot, KToolBar *parent, const char *name = 0);
const char *slot, TDEToolBar *parent, const char *name = 0);
~SQ_ToolButton();
static int fixedWidth();

36
ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp
Unescape View File

@ -78,18 +78,18 @@
// Create actions
void SQ_GLWidget::createActions()
{
pASelectionRect = new KToggleAction(i18n("Rectangle"), TQPixmap(locate("data", "images/actions/glselection_rect.png")), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSelectionRect()), ac, "SQ Selection Rect");
pASelectionEllipse = new KToggleAction(i18n("Ellipse"), TQPixmap(locate("data", "images/actions/glselection_ellipse.png")), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSelectionEllipse()), ac, "SQ Selection Ellipse");
pASelectionClear = new KAction(i18n("Clear"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotSelectionClear()), ac, "SQ Selection Clear");
pASelectionRect = new TDEToggleAction(i18n("Rectangle"), TQPixmap(locate("data", "images/actions/glselection_rect.png")), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSelectionRect()), ac, "SQ Selection Rect");
pASelectionEllipse = new TDEToggleAction(i18n("Ellipse"), TQPixmap(locate("data", "images/actions/glselection_ellipse.png")), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSelectionEllipse()), ac, "SQ Selection Ellipse");
pASelectionClear = new TDEAction(i18n("Clear"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotSelectionClear()), ac, "SQ Selection Clear");
pAZoomW = new KToggleAction(i18n("Fit width"), TQPixmap(locate("data", "images/actions/zoomW.png")), 0, TQT_TQOBJECT(this), TQT_SLOT(slotZoomW()), ac, "SQ ZoomW");
pAZoomH = new KToggleAction(i18n("Fit height"), TQPixmap(locate("data", "images/actions/zoomH.png")), 0, TQT_TQOBJECT(this), TQT_SLOT(slotZoomH()), ac, "SQ ZoomH");
pAZoomWH = new KToggleAction(i18n("Fit image"), TQPixmap(locate("data", "images/actions/zoomWH.png")), 0, TQT_TQOBJECT(this), TQT_SLOT(slotZoomWH()), ac, "SQ ZoomWH");
pAZoom100 = new KToggleAction(i18n("Zoom 100%"), TQPixmap(locate("data", "images/actions/zoom100.png")), 0, TQT_TQOBJECT(this), TQT_SLOT(slotZoom100()), ac, "SQ Zoom100");
pAZoomLast = new KToggleAction(i18n("Leave previous zoom"), TQPixmap(locate("data", "images/actions/zoomlast.png")), 0, TQT_TQOBJECT(this), TQT_SLOT(slotZoomLast()), ac, "SQ ZoomLast");
pAIfLess = new KToggleAction(i18n("Ignore, if image is smaller than window"), TQPixmap(locate("data", "images/actions/ifless.png")), 0, 0, 0, ac, "if less");
pAZoomW = new TDEToggleAction(i18n("Fit width"), TQPixmap(locate("data", "images/actions/zoomW.png")), 0, TQT_TQOBJECT(this), TQT_SLOT(slotZoomW()), ac, "SQ ZoomW");
pAZoomH = new TDEToggleAction(i18n("Fit height"), TQPixmap(locate("data", "images/actions/zoomH.png")), 0, TQT_TQOBJECT(this), TQT_SLOT(slotZoomH()), ac, "SQ ZoomH");
pAZoomWH = new TDEToggleAction(i18n("Fit image"), TQPixmap(locate("data", "images/actions/zoomWH.png")), 0, TQT_TQOBJECT(this), TQT_SLOT(slotZoomWH()), ac, "SQ ZoomWH");
pAZoom100 = new TDEToggleAction(i18n("Zoom 100%"), TQPixmap(locate("data", "images/actions/zoom100.png")), 0, TQT_TQOBJECT(this), TQT_SLOT(slotZoom100()), ac, "SQ Zoom100");
pAZoomLast = new TDEToggleAction(i18n("Leave previous zoom"), TQPixmap(locate("data", "images/actions/zoomlast.png")), 0, TQT_TQOBJECT(this), TQT_SLOT(slotZoomLast()), ac, "SQ ZoomLast");
pAIfLess = new TDEToggleAction(i18n("Ignore, if image is smaller than window"), TQPixmap(locate("data", "images/actions/ifless.png")), 0, 0, 0, ac, "if less");
pAFull = new KToggleAction(TQString(), 0, 0, 0, ac, "SQ GL Full");
pAFull = new TDEToggleAction(TQString(), 0, 0, 0, ac, "SQ GL Full");
TQString squirrel_zoom_actions = TQString::fromLatin1("squirrel_zoom_actions");
pAZoomW->setExclusiveGroup(squirrel_zoom_actions);
@ -115,10 +115,10 @@ void SQ_GLWidget::createActions()
void SQ_GLWidget::createToolbar()
{
zoomMenu = new KPopupMenu;
zoomMenu = new TDEPopupMenu;
#ifndef KSQUIRREL_PART
selectionMenu = new KPopupMenu;
selectionMenu = new TDEPopupMenu;
SQ_ToolButton *pATool;
@ -156,12 +156,12 @@ void SQ_GLWidget::createToolbar()
/*
* We will create TQToolButtons and put them in toolbar.
* Of course, we can just KAction::plug(), BUT plugged KActions
* Of course, we can just TDEAction::plug(), BUT plugged TDEActions
* will produce buttons, which cann't be clicked twise! I think
* plugged KActions will treat our attempt as double-click, not two single-clicks.
* plugged TDEActions will treat our attempt as double-click, not two single-clicks.
* On the other hand, we can click TQToolButton as frequently as we want.
*
* Plugged KActions also don't know about autorepeat :(
* Plugged TDEActions also don't know about autorepeat :(
*/
new SQ_ToolButton(TQPixmap(locate("data", "images/actions/file_first.png")), i18n("Go to first image"), TQT_TQOBJECT(this), TQT_SLOT(slotFirst()), toolbar);
pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/file_prev.png")), i18n("Previous image"), TQT_TQOBJECT(this), TQT_SLOT(slotPrev()), toolbar);
@ -867,7 +867,7 @@ void SQ_GLWidget::initAccelsAndMenu()
menu->insertItem(i18n("Image"), menuImage);
#define SQ_ADD_KACTION(b) \
(new KAction(TQString(), b, TQT_TQOBJECT(this), TQT_SLOT(slotAccelActivated()), ac, TQString::fromLatin1("action_%1").arg(b)))
(new TDEAction(TQString(), b, TQT_TQOBJECT(this), TQT_SLOT(slotAccelActivated()), ac, TQString::fromLatin1("action_%1").arg(b)))
id_saveas = menuFile->insertItem(SQ_IconLoader::instance()->loadIcon("filesaveas", KIcon::Desktop, KIcon::SizeSmall), i18n("Save As...") + "\tS", SQ_ADD_KACTION(TQt::Key_S), TQT_SLOT(activate()));
@ -992,9 +992,9 @@ void SQ_GLWidget::initAccelsAndMenu()
void SQ_GLWidget::slotAccelActivated()
{
KAction *accel = static_cast<KAction *>(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME *>(sender())));
TDEAction *accel = static_cast<TDEAction *>(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME *>(sender())));
KShortcut ks = accel->shortcut();
TDEShortcut ks = accel->shortcut();
if(!ks.compare(TQt::Key_Left)) matrix_move(movefactor, 0);
else if(!ks.compare(TQt::Key_Right)) matrix_move(-movefactor, 0);

8
ksquirrel/ksquirrelpart/sq_imageproperties.ui
Unescape View File

@ -934,18 +934,18 @@
<include location="local" impldecl="in implementation">sq_imageproperties.ui.h</include>
</includes>
<forwards>
<forward>class KPopupMenu;</forward>
<forward>class KAction;</forward>
<forward>class TDEPopupMenu;</forward>
<forward>class TDEAction;</forward>
<forward>namespace TDEIO { class Job; }</forward>
</forwards>
<variables>
<variable access="private">KURL url;</variable>
<variable access="private">QWidget *kew;</variable>
<variable access="private">TQPixmap ok, error;</variable>
<variable access="private">KPopupMenu *menu;</variable>
<variable access="private">TDEPopupMenu *menu;</variable>
<variable access="private">TQListViewItem *data;</variable>
<variable access="private">int z, exifMode;</variable>
<variable access="private">KAction *copy, *copyentry, *copyall;</variable>
<variable access="private">TDEAction *copy, *copyentry, *copyall;</variable>
<variable access="private">TQString file;</variable>
</variables>
<Q_SLOTS>

6
ksquirrel/ksquirrelpart/sq_imageproperties.ui.h
Unescape View File

@ -24,10 +24,10 @@
void SQ_ImageProperties::init()
{
menu = new KPopupMenu;
menu = new TDEPopupMenu;
copy = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotCopyString()), 0);
copyentry = new KAction(i18n("Copy entry"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCopyEntry()), 0);
copyall = new KAction(i18n("Copy all entries"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCopyAll()), 0);
copyentry = new TDEAction(i18n("Copy entry"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCopyEntry()), 0);
copyall = new TDEAction(i18n("Copy all entries"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCopyAll()), 0);
copyentry->setIcon(copy->icon());
copyall->setIcon(copy->icon());

6
ksquirrel/ksquirrelpart/sq_popupmenu.cpp
Unescape View File

@ -22,7 +22,7 @@
#include "sq_popupmenu.h"
SQ_PopupMenu::SQ_PopupMenu(TQWidget *parent, const char *name)
: KPopupMenu(parent, name), title(0)
: TDEPopupMenu(parent, name), title(0)
{}
SQ_PopupMenu::~SQ_PopupMenu()
@ -30,10 +30,10 @@ SQ_PopupMenu::~SQ_PopupMenu()
void SQ_PopupMenu::insertTitle(const TQString &t)
{
title = KPopupMenu::insertTitle(t);
title = TDEPopupMenu::insertTitle(t);
}
void SQ_PopupMenu::changeTitle(const TQString &t)
{
KPopupMenu::changeTitle(title, t);
TDEPopupMenu::changeTitle(title, t);
}

2
ksquirrel/ksquirrelpart/sq_popupmenu.h
Unescape View File

@ -24,7 +24,7 @@
*@author Baryshev Dmitry
*/
class SQ_PopupMenu : public KPopupMenu
class SQ_PopupMenu : public TDEPopupMenu
{
public:
SQ_PopupMenu(TQWidget *parent = 0, const char *name = 0);

6
ksquirrel/sidebar/sq_categoriesview.cpp
Unescape View File

@ -108,7 +108,7 @@ SQ_CategoriesView::SQ_CategoriesView(TQWidget *parent, const char *name) : KFile
connect(TQT_TQOBJECT(this), TQT_SIGNAL(spacePressed(TQListViewItem*)), TQT_TQOBJECT(this), TQT_SIGNAL(executed(TQListViewItem*)));
connect(TQT_TQOBJECT(this), TQT_SIGNAL(returnPressed(TQListViewItem*)), TQT_TQOBJECT(this), TQT_SIGNAL(executed(TQListViewItem*)));
connect(TQT_TQOBJECT(this), TQT_SIGNAL(executed(TQListViewItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotItemExecuted(TQListViewItem*)));
connect(TQT_TQOBJECT(this), TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), TQT_TQOBJECT(this), TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*, const TQPoint&)));
connect(TQT_TQOBJECT(this), TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), TQT_TQOBJECT(this), TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
}
SQ_CategoriesView::~SQ_CategoriesView()
@ -116,7 +116,7 @@ SQ_CategoriesView::~SQ_CategoriesView()
delete m_dir;
}
void SQ_CategoriesView::slotContextMenu(KListView *, TQListViewItem *item, const TQPoint &p)
void SQ_CategoriesView::slotContextMenu(TDEListView *, TQListViewItem *item, const TQPoint &p)
{
if(item)
{
@ -158,7 +158,7 @@ SQ_CategoriesBox::SQ_CategoriesBox(TQWidget *parent, const char *name) : TQVBox(
lastdir = i18n("New Category");
view = new SQ_CategoriesView(this);
toolbar = new KToolBar(this);
toolbar = new TDEToolBar(this);
connect(view, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)));

6
ksquirrel/sidebar/sq_categoriesview.h
Unescape View File

@ -23,7 +23,7 @@
#include <tdefiletreeview.h>
#include <tdefiletreebranch.h>
class KToolBar;
class TDEToolBar;
class SQ_CategoryBrowserMenu;
class SQ_TreeViewMenu;
@ -62,7 +62,7 @@ class SQ_CategoriesView : public KFileTreeView
private slots:
void slotItemExecuted(TQListViewItem *item);
void slotContextMenu(KListView *, TQListViewItem *i, const TQPoint &p);
void slotContextMenu(TDEListView *, TQListViewItem *i, const TQPoint &p);
private:
KFileTreeBranch *root;
@ -115,7 +115,7 @@ class SQ_CategoriesBox : public TQVBox
private:
SQ_CategoriesView *view;
KToolBar *toolbar;
TDEToolBar *toolbar;
TQString lastdir, copypath;
SQ_CategoryBrowserMenu *menu;

4
ksquirrel/sidebar/sq_directorybasket.cpp
Unescape View File

@ -251,7 +251,7 @@ SQ_DirectoryBasket::SQ_DirectoryBasket(TQWidget *parent, const char *name) : KFi
connect(TQT_TQOBJECT(this), TQT_SIGNAL(spacePressed(TQListViewItem*)), TQT_TQOBJECT(this), TQT_SIGNAL(executed(TQListViewItem*)));
connect(TQT_TQOBJECT(this), TQT_SIGNAL(returnPressed(TQListViewItem*)), TQT_TQOBJECT(this), TQT_SIGNAL(executed(TQListViewItem*)));
connect(TQT_TQOBJECT(this), TQT_SIGNAL(executed(TQListViewItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotItemExecuted(TQListViewItem*)));
connect(TQT_TQOBJECT(this), TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), TQT_TQOBJECT(this), TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*, const TQPoint&)));
connect(TQT_TQOBJECT(this), TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), TQT_TQOBJECT(this), TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
connect(TQT_TQOBJECT(this), TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)));
connect(TQT_TQOBJECT(this), TQT_SIGNAL(itemRenamed(TQListViewItem *, int, const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotItemRenamedMy(TQListViewItem *, int, const TQString &)));
connect(TQT_TQOBJECT(this), TQT_SIGNAL(itemAdded(TQListViewItem *)), TQT_TQOBJECT(this), TQT_SLOT(slotSort()));
@ -388,7 +388,7 @@ void SQ_DirectoryBasket::slotItemExecuted(TQListViewItem *item)
}
}
void SQ_DirectoryBasket::slotContextMenu(KListView *, TQListViewItem *item, const TQPoint &p)
void SQ_DirectoryBasket::slotContextMenu(TDEListView *, TQListViewItem *item, const TQPoint &p)
{
if(item)
{

2
ksquirrel/sidebar/sq_directorybasket.h
Unescape View File

@ -174,7 +174,7 @@ class SQ_DirectoryBasket : public KFileTreeView
private slots:
void slotDropped(TQDropEvent *, TQListViewItem *, TQListViewItem *);
void slotItemExecuted(TQListViewItem *item);
void slotContextMenu(KListView *, TQListViewItem *item, const TQPoint &p);
void slotContextMenu(TDEListView *, TQListViewItem *item, const TQPoint &p);
void slotNewDirectory();
void slotSortReal();
void slotSort();

4
ksquirrel/sidebar/sq_imagebasket.cpp
Unescape View File

@ -237,7 +237,7 @@ void SQ_ImageBasket::slotViewChanged(KFileView *v)
if(iv)
{
KAction *a;
TDEAction *a;
a = iv->actionCollection()->action("zoomIn");
if(a) a->setShortcut(0);
@ -267,7 +267,7 @@ void SQ_ImageBasket::activatedMenu(const KFileItem *, const TQPoint &pos)
setupMenu(KDirOperator::AllActions ^ KDirOperator::NavActions ^ KDirOperator::ViewActions);
updateSelectionDependentActions();
KActionMenu *pADirOperatorMenu = dynamic_cast<KActionMenu *>(actionCollection()->action("popupMenu"));
TDEActionMenu *pADirOperatorMenu = dynamic_cast<TDEActionMenu *>(actionCollection()->action("popupMenu"));
pADirOperatorMenu->popupMenu()->insertItem(i18n("Synchronize"), this, TQT_SLOT(slotSync()), 0, -1, 0);
pADirOperatorMenu->popupMenu()->insertSeparator(1);

10
ksquirrel/sidebar/sq_mountview.cpp
Unescape View File

@ -34,11 +34,11 @@
SQ_MountView * SQ_MountView::m_inst = 0;
SQ_MountView::SQ_MountView(TQWidget *parent, const char *name) : KListView(parent, name), m_columns(-1)
SQ_MountView::SQ_MountView(TQWidget *parent, const char *name) : TDEListView(parent, name), m_columns(-1)
{
m_inst = this;
popup = new KPopupMenu;
popup = new TDEPopupMenu;
id_mount = popup->insertItem(SQ_IconLoader::instance()->loadIcon("hdd_mount", KIcon::Desktop, KIcon::SizeSmall),
i18n("Mount"), this, TQT_SLOT(slotMount()));
id_unmount = popup->insertItem(SQ_IconLoader::instance()->loadIcon("hdd_unmount", KIcon::Desktop, KIcon::SizeSmall),
@ -48,8 +48,8 @@ SQ_MountView::SQ_MountView(TQWidget *parent, const char *name) : KListView(paren
popup->insertSeparator();
popup->insertItem(i18n("Cancel"));
connect(this, TQT_SIGNAL(contextMenu(KListView *, TQListViewItem *, const TQPoint &)),
this, TQT_SLOT(slotContextMenu(KListView *, TQListViewItem *, const TQPoint &)));
connect(this, TQT_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint &)),
this, TQT_SLOT(slotContextMenu(TDEListView *, TQListViewItem *, const TQPoint &)));
setAcceptDrops(false);
connect(this, TQT_SIGNAL(returnPressed(TQListViewItem*)), this, TQT_SLOT(slotExecuted(TQListViewItem *)));
@ -195,7 +195,7 @@ void SQ_MountView::setupColumns()
setColumns(p);
}
void SQ_MountView::slotContextMenu(KListView *, TQListViewItem *i, const TQPoint &p)
void SQ_MountView::slotContextMenu(TDEListView *, TQListViewItem *i, const TQPoint &p)
{
SQ_MountViewItem *mvi = static_cast<SQ_MountViewItem *>(i);

8
ksquirrel/sidebar/sq_mountview.h
Unescape View File

@ -22,7 +22,7 @@
#include <klistview.h>
class KPopupMenu;
class TDEPopupMenu;
class SQ_MountViewItem;
@ -30,7 +30,7 @@ class SQ_MountViewItem;
* SQ_MountView is an detailed view representing mount points.
*/
class SQ_MountView : public KListView
class SQ_MountView : public TDEListView
{
Q_OBJECT
@ -53,7 +53,7 @@ class SQ_MountView : public KListView
private slots:
void slotContextMenu(KListView *, TQListViewItem *i, const TQPoint &p);
void slotContextMenu(TDEListView *, TQListViewItem *i, const TQPoint &p);
/*
* Item executed. We should emit path() signal.
*/
@ -75,7 +75,7 @@ class SQ_MountView : public KListView
int m_columns;
SQ_MountViewItem *mountItem, *citem;
TQStringList mounted;
KPopupMenu *popup;
TDEPopupMenu *popup;
int id_mount, id_unmount;
static SQ_MountView *m_inst;

4
ksquirrel/sidebar/sq_mountviewitem.cpp
Unescape View File

@ -24,8 +24,8 @@
#include "sq_mountviewitem.h"
#include "sq_iconloader.h"
SQ_MountViewItem::SQ_MountViewItem(KListView *parent, const TQString &mpoint)
: KListViewItem(parent, mpoint), m_mounted(false)
SQ_MountViewItem::SQ_MountViewItem(TDEListView *parent, const TQString &mpoint)
: TDEListViewItem(parent, mpoint), m_mounted(false)
{}
SQ_MountViewItem::~SQ_MountViewItem()

4
ksquirrel/sidebar/sq_mountviewitem.h
Unescape View File

@ -20,10 +20,10 @@
#include <klistview.h>
class SQ_MountViewItem : public KListViewItem
class SQ_MountViewItem : public TDEListViewItem
{
public:
SQ_MountViewItem(KListView *parent, const TQString &mpoint);
SQ_MountViewItem(TDEListView *parent, const TQString &mpoint);
~SQ_MountViewItem();
bool mounted() const;

2
ksquirrel/sidebar/sq_previewwidget.cpp
Unescape View File

@ -59,7 +59,7 @@ SQ_PreviewWidget::SQ_PreviewWidget(TQWidget *parent, const char *name)
connect(down, TQT_SIGNAL(result(const KURL &)), TQT_TQOBJECT(this), TQT_SLOT(slotDownloadResult(const KURL &)));
connect(down, TQT_SIGNAL(percents(int)), TQT_TQOBJECT(this), TQT_SLOT(slotDownloadPercents(int)));
popup = new KPopupMenu;
popup = new TDEPopupMenu;
popup->insertItem(i18n("Background color..."), TQT_TQOBJECT(this), TQT_SLOT(slotBackground()));
popup->insertItem(i18n("Text color..."), TQT_TQOBJECT(this), TQT_SLOT(slotText()));
popup->insertSeparator();

4
ksquirrel/sidebar/sq_previewwidget.h
Unescape View File

@ -26,7 +26,7 @@
#include <kurl.h>
class KPopupMenu;
class TDEPopupMenu;
class SQ_Downloader;
@ -92,7 +92,7 @@ class SQ_PreviewWidget : public TQWidget
TQPixmap pixmap;
bool m_ignore, m_forceignore, m_cancel;
TQColor color, colorText;
KPopupMenu *popup;
TDEPopupMenu *popup;
KURL pending, m_url;
int m_delay;
TQWMatrix matrix;

6
ksquirrel/sidebar/sq_treeview.cpp
Unescape View File

@ -143,8 +143,8 @@ SQ_TreeView::SQ_TreeView(TQWidget *parent, const char *name) : KFileTreeView(par
connect(this, TQT_SIGNAL(dropped(TQDropEvent *, TQListViewItem *, TQListViewItem *)),
this, TQT_SLOT(slotDropped(TQDropEvent *, TQListViewItem *, TQListViewItem *)));
connect(this, TQT_SIGNAL(contextMenu(KListView *, TQListViewItem *, const TQPoint &)),
this, TQT_SLOT(slotContextMenu(KListView *, TQListViewItem *, const TQPoint &)));
connect(this, TQT_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint &)),
this, TQT_SLOT(slotContextMenu(TDEListView *, TQListViewItem *, const TQPoint &)));
menu = new SQ_TreeViewMenu(this);
@ -624,7 +624,7 @@ void SQ_TreeView::slotDropped(TQDropEvent *e, TQListViewItem *parent, TQListView
SQ_NavigatorDropMenu::instance()->exec(TQCursor::pos(), true);
}
void SQ_TreeView::slotContextMenu(KListView *, TQListViewItem *item, const TQPoint &point)
void SQ_TreeView::slotContextMenu(TDEListView *, TQListViewItem *item, const TQPoint &point)
{
if(item)
{

2
ksquirrel/sidebar/sq_treeview.h
Unescape View File

@ -142,7 +142,7 @@ class SQ_TreeView : public KFileTreeView
void slotAnimation();
void slotDropped(TQDropEvent *, TQListViewItem *, TQListViewItem *);
void slotContextMenu(KListView *, TQListViewItem *, const TQPoint &);
void slotContextMenu(TDEListView *, TQListViewItem *, const TQPoint &);
signals:
void newURL(const KURL &url);

2
ksquirrel/sidebar/sq_treeviewitem.cpp
Unescape View File

@ -41,7 +41,7 @@ void SQ_TreeViewItem::paintFocus(TQPainter *, const TQColorGroup &, const TQRect
void SQ_TreeViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment)
{
KListView *klv = static_cast<KListView *>(listView());
TDEListView *klv = static_cast<TDEListView *>(listView());
// mark item
if(column)

2
ksquirrel/sidebar/sq_treeviewmenu.cpp
Unescape View File

@ -13,7 +13,7 @@
#include "ksquirrel.h"
#include "sq_iconloader.h"
SQ_TreeViewMenu::SQ_TreeViewMenu(TQWidget *parent, const char *name) : KPopupMenu(parent, name)
SQ_TreeViewMenu::SQ_TreeViewMenu(TQWidget *parent, const char *name) : TDEPopupMenu(parent, name)
{
id_new = insertItem(SQ_IconLoader::instance()->loadIcon("folder_new", KIcon::Desktop, KIcon::SizeSmall), i18n("New folder..."), this, TQT_SLOT(slotDirectoryNew()));
insertSeparator();

2
ksquirrel/sidebar/sq_treeviewmenu.h
Unescape View File

@ -8,7 +8,7 @@ class TQPoint;
namespace TDEIO { class Job; }
class SQ_TreeViewMenu : public KPopupMenu
class SQ_TreeViewMenu : public TDEPopupMenu
{
Q_OBJECT

48
ksquirrel/sq_diroperator.cpp
Unescape View File

@ -115,7 +115,7 @@ SQ_DirOperator::SQ_DirOperator(const KURL &url, ViewT type_, TQWidget *parent, c
if(SQ_Config::instance()->readBoolEntry("sorting_reverse", false)) sorting |= TQDir::Reversed;
if(SQ_Config::instance()->readBoolEntry("sorting_ignore", false)) sorting |= TQDir::IgnoreCase;
actionHidden = dynamic_cast<KToggleAction *>(actionCollection()->action("show hidden"));
actionHidden = dynamic_cast<TDEToggleAction *>(actionCollection()->action("show hidden"));
if(SQ_Config::instance()->readBoolEntry("show hidden", false) && actionHidden)
{
@ -349,43 +349,43 @@ void SQ_DirOperator::slotDropped(const KFileItem *i, TQDropEvent*, const KURL::L
// Insert new actions in context menu.
void SQ_DirOperator::setupActionsMy()
{
new KAction(i18n("Edit file type"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditMime()), actionCollection(), "dirop_edit_mime");
new TDEAction(i18n("Edit file type"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditMime()), actionCollection(), "dirop_edit_mime");
if(SQ_HLOptions::instance()->have_imagebasket)
new KAction(i18n("Add to Basket"), "folder_image", CTRL+TQt::Key_B, TQT_TQOBJECT(this), TQT_SLOT(slotAddToBasket()), actionCollection(), "dirop_tobasket");
new TDEAction(i18n("Add to Basket"), "folder_image", CTRL+TQt::Key_B, TQT_TQOBJECT(this), TQT_SLOT(slotAddToBasket()), actionCollection(), "dirop_tobasket");
if(SQ_HLOptions::instance()->have_directorybasket)
new KAction(i18n("Add to Folder Basket"), "folder_image", CTRL+TQt::Key_D, TQT_TQOBJECT(this), TQT_SLOT(slotAddToDirectoryBasket()), actionCollection(), "dirop_todirbasket");
new TDEAction(i18n("Add to Folder Basket"), "folder_image", CTRL+TQt::Key_D, TQT_TQOBJECT(this), TQT_SLOT(slotAddToDirectoryBasket()), actionCollection(), "dirop_todirbasket");
KActionMenu *file = new KActionMenu(i18n("File actions"), actionCollection(), "dirop_file_menu");
KAction *prop = actionCollection()->action("properties");
TDEActionMenu *file = new TDEActionMenu(i18n("File actions"), actionCollection(), "dirop_file_menu");
TDEAction *prop = actionCollection()->action("properties");
KAction *reload = actionCollection()->action("mkdir");
if(reload && reload->shortcut().isNull()) reload->setShortcut(KShortcut(CTRL+TQt::Key_N));
TDEAction *reload = actionCollection()->action("mkdir");
if(reload && reload->shortcut().isNull()) reload->setShortcut(TDEShortcut(CTRL+TQt::Key_N));
reload = actionCollection()->action("reload");
connect(prop, TQT_SIGNAL(enabled(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotEnableFileActions(bool)));
KAction *sep = actionCollection()->action("separator");
TDEAction *sep = actionCollection()->action("separator");
file->insert(new KAction(i18n("Copy"), "editcopy", KStdAccel::copy(), SQ_WidgetStack::instance(), TQT_SLOT(slotFileCopy()), actionCollection(), "dirop_copy"));
file->insert(new KAction(i18n("Cut"), "editcut", KStdAccel::cut(), SQ_WidgetStack::instance(), TQT_SLOT(slotFileCut()), actionCollection(), "dirop_cut"));
file->insert(new KAction(i18n("Paste"), "editpaste", KStdAccel::paste(), SQ_WidgetStack::instance(), TQT_SLOT(slotFilePaste()), actionCollection(), "dirop_paste"));
file->insert(new TDEAction(i18n("Copy"), "editcopy", TDEStdAccel::copy(), SQ_WidgetStack::instance(), TQT_SLOT(slotFileCopy()), actionCollection(), "dirop_copy"));
file->insert(new TDEAction(i18n("Cut"), "editcut", TDEStdAccel::cut(), SQ_WidgetStack::instance(), TQT_SLOT(slotFileCut()), actionCollection(), "dirop_cut"));
file->insert(new TDEAction(i18n("Paste"), "editpaste", TDEStdAccel::paste(), SQ_WidgetStack::instance(), TQT_SLOT(slotFilePaste()), actionCollection(), "dirop_paste"));
file->insert(sep);
file->insert(new KAction(i18n("Copy to..."), 0, TQt::Key_F5, SQ_WidgetStack::instance(), TQT_SLOT(slotFileCopyTo()), actionCollection(), "dirop_copyto"));
file->insert(new KAction(i18n("Move to..."), 0, TQt::Key_F6, SQ_WidgetStack::instance(), TQT_SLOT(slotFileMoveTo()),actionCollection(), "dirop_cutto"));
file->insert(new KAction(i18n("Link to..."), 0, TQt::Key_F7, SQ_WidgetStack::instance(), TQT_SLOT(slotFileLinkTo()), actionCollection(), "dirop_linkto"));
file->insert(new TDEAction(i18n("Copy to..."), 0, TQt::Key_F5, SQ_WidgetStack::instance(), TQT_SLOT(slotFileCopyTo()), actionCollection(), "dirop_copyto"));
file->insert(new TDEAction(i18n("Move to..."), 0, TQt::Key_F6, SQ_WidgetStack::instance(), TQT_SLOT(slotFileMoveTo()),actionCollection(), "dirop_cutto"));
file->insert(new TDEAction(i18n("Link to..."), 0, TQt::Key_F7, SQ_WidgetStack::instance(), TQT_SLOT(slotFileLinkTo()), actionCollection(), "dirop_linkto"));
file->insert(sep);
file->insert(new KAction(i18n("Run"), "launch", CTRL+Key_J, SQ_WidgetStack::instance(), TQT_SLOT(slotRunSeparately()), actionCollection(), "dirop_runsepar"));
file->insert(new KAction(i18n("Repeat (nothing to repeat)"), "down", TQt::Key_F10, TQT_TQOBJECT(KSquirrel::app()), TQT_SLOT(slotRepeat()), actionCollection(), "dirop_repeat"));
file->insert(new KAction(i18n("Convert..."), 0, CTRL+TQt::Key_K, SQ_Converter::instance(), TQT_SLOT(slotStartEdit()), actionCollection(), "dirop_convert"));
file->insert(new TDEAction(i18n("Run"), "launch", CTRL+Key_J, SQ_WidgetStack::instance(), TQT_SLOT(slotRunSeparately()), actionCollection(), "dirop_runsepar"));
file->insert(new TDEAction(i18n("Repeat (nothing to repeat)"), "down", TQt::Key_F10, TQT_TQOBJECT(KSquirrel::app()), TQT_SLOT(slotRepeat()), actionCollection(), "dirop_repeat"));
file->insert(new TDEAction(i18n("Convert..."), 0, CTRL+TQt::Key_K, SQ_Converter::instance(), TQT_SLOT(slotStartEdit()), actionCollection(), "dirop_convert"));
file->insert(sep);
file->insert(new KAction(i18n("Recreate selected thumbnails"), "reload", CTRL+TQt::Key_R, SQ_WidgetStack::instance(),
file->insert(new TDEAction(i18n("Recreate selected thumbnails"), "reload", CTRL+TQt::Key_R, SQ_WidgetStack::instance(),
TQT_SLOT(slotRecreateThumbnail()), actionCollection(), "dirop_recreate_thumbnails"));
file->insert(sep);
file->insert(new KAction(i18n("Copy file path"), 0, TQt::Key_F8, TQT_TQOBJECT(this), TQT_SLOT(slotCopyPath()), actionCollection(), "dirop_copypath"));
file->insert(new KAction(i18n("Copy file url"), 0, TQt::Key_F9, TQT_TQOBJECT(this), TQT_SLOT(slotCopyURL()), actionCollection(), "dirop_copyurl"));
file->insert(new TDEAction(i18n("Copy file path"), 0, TQt::Key_F8, TQT_TQOBJECT(this), TQT_SLOT(slotCopyPath()), actionCollection(), "dirop_copypath"));
file->insert(new TDEAction(i18n("Copy file url"), 0, TQt::Key_F9, TQT_TQOBJECT(this), TQT_SLOT(slotCopyURL()), actionCollection(), "dirop_copyurl"));
if(reload) reload->setShortcut(CTRL+TQt::Key_F5);
}
@ -820,7 +820,7 @@ void SQ_DirOperator::executePrivate(KFileItem *fi)
void SQ_DirOperator::disableSpecificActions(KFileIconView *v)
{
KAction *a;
TDEAction *a;
a = v->actionCollection()->action("zoomIn");
if(a) a->setEnabled(false);
@ -959,7 +959,7 @@ void SQ_DirOperator::activatedMenu(const KFileItem *, const TQPoint &pos)
setupMenu(KDirOperator::AllActions ^ KDirOperator::ViewActions);
updateSelectionDependentActions();
KActionMenu *pADirOperatorMenu = dynamic_cast<KActionMenu *>(actionCollection()->action("popupMenu"));
TDEActionMenu *pADirOperatorMenu = dynamic_cast<TDEActionMenu *>(actionCollection()->action("popupMenu"));
pADirOperatorMenu->insert(actionCollection()->action("dirop_edit_mime"));
pADirOperatorMenu->insert(actionCollection()->action("separator"));
@ -973,7 +973,7 @@ void SQ_DirOperator::activatedMenu(const KFileItem *, const TQPoint &pos)
if(SQ_HLOptions::instance()->have_directorybasket)
pADirOperatorMenu->insert(actionCollection()->action("dirop_todirbasket"));
pADirOperatorMenu->popupMenu()->insertItem(i18n("File actions"), dynamic_cast<KActionMenu *>(actionCollection()->action("dirop_file_menu"))->popupMenu(), -1, 0);
pADirOperatorMenu->popupMenu()->insertItem(i18n("File actions"), dynamic_cast<TDEActionMenu *>(actionCollection()->action("dirop_file_menu"))->popupMenu(), -1, 0);
pADirOperatorMenu->popupMenu()->insertItem(i18n("&External tools"), SQ_ExternalTool::instance()->constPopupMenu(), -1, 1);
pADirOperatorMenu->popupMenu()->insertSeparator(2);

4
ksquirrel/sq_diroperator.h
Unescape View File

@ -245,8 +245,8 @@ class SQ_DirOperator : public KDirOperator
/*
* Some additional menus.
*/
KActionMenu *pADirOperatorMenu, *pAFileActions, *pAImageActions;
KToggleAction *actionHidden;
TDEActionMenu *pADirOperatorMenu, *pAFileActions, *pAImageActions;
TDEToggleAction *actionHidden;
ViewT type;
TQTimer *timer_preview;

2
ksquirrel/sq_glview.cpp
Unescape View File

@ -209,7 +209,7 @@ void SQ_GLView::resetStatusBar()
names["SBFrame"]->setText(TQString::fromLatin1("0/0"));
}
SQ_ToolBar::SQ_ToolBar(TQWidget *parent) : KToolBar(parent)
SQ_ToolBar::SQ_ToolBar(TQWidget *parent) : TDEToolBar(parent)
{
setFixedHeight(SQ_ToolButton::fixedWidth() + 5);
boxLayout()->setSpacing(0);

2
ksquirrel/sq_glview.h
Unescape View File

@ -33,7 +33,7 @@ class KTabBar;
class TQLabel;
class SQ_ToolBar : public KToolBar
class SQ_ToolBar : public TDEToolBar
{
public:
SQ_ToolBar(TQWidget *parent);

4
ksquirrel/sq_glwidget.cpp
Unescape View File

@ -121,7 +121,7 @@ SQ_GLWidget::SQ_GLWidget(TQWidget *parent, const char *name) : TQGLWidget(parent
images = 0;
parts_broken = 0;
ac = new KActionCollection(this, TQT_TQOBJECT(this), "GLWidget actionCollection");
ac = new TDEActionCollection(this, TQT_TQOBJECT(this), "GLWidget actionCollection");
changed = blocked = decoded = reset_mode = false;
movetype = -1;
buffer = new RGBA [512 * 512];
@ -169,7 +169,7 @@ SQ_GLWidget::SQ_GLWidget(TQWidget *parent, const char *name) : TQGLWidget(parent
setAcceptDrops(true);
// popup menu with image pages
images = new KPopupMenu;
images = new TDEPopupMenu;
images->setCheckable(true);
// create actions

24
ksquirrel/sq_glwidget.h
Unescape View File

@ -48,11 +48,11 @@ struct RGBA;
#define MATRIX_Y tab->matrix[7]
#define MATRIX_Z tab->matrix[11]
class KAction;
class KActionCollection;
class KToggleAction;
class KPopupMenu;
class KRadioAction;
class TDEAction;
class TDEActionCollection;
class TDEToggleAction;
class TDEPopupMenu;
class TDERadioAction;
class KTempFile;
namespace TDEIO { class Job; }
@ -168,7 +168,7 @@ class SQ_GLWidget : public TQGLWidget
*/
GLfloat getZoomPercents() const;
KActionCollection* actionCollection() const;
TDEActionCollection* actionCollection() const;
/*
* Are we in fullscreen state ?
@ -332,7 +332,7 @@ class SQ_GLWidget : public TQGLWidget
void decodeFailedOn0(const int err_code);
/*
* Create KActions.
* Create TDEActions.
*/
void createActions();
@ -519,8 +519,8 @@ class SQ_GLWidget : public TQGLWidget
void slotCopyResult(TDEIO::Job *);
private:
KAction *pASelectionClear;
KToggleAction *pAFull, *pAIfLess, *pAZoomW,
TDEAction *pASelectionClear;
TDEToggleAction *pAFull, *pAIfLess, *pAZoomW,
*pAZoomH, *pAZoomWH, *pAZoom100,
*pAZoomLast,
*pASelectionEllipse, *pASelectionRect;
@ -528,14 +528,14 @@ class SQ_GLWidget : public TQGLWidget
SQ_ToolButton *pAToolQuick, *pAToolFull, *pAToolProp, *pAToolPrint;
SQ_ToolButtonPopup *pAToolZoom, *pAToolImages;
KActionCollection *ac, *acMain;
TDEActionCollection *ac, *acMain;
TQPopupMenu *menu, *menuFile, *menuImage;
int id_saveas, id_settings,
id_f5, id_f6, id_f7, id_f8, id_del,
id_prop;
// popup menu with zoom types (fit width, fit height, zoom 100%...)
KPopupMenu *zoomMenu, *selectionMenu,
TDEPopupMenu *zoomMenu, *selectionMenu,
// popup menu with image pages
*images;
@ -594,7 +594,7 @@ bool SQ_GLWidget::isnice()
}
inline
KActionCollection* SQ_GLWidget::actionCollection() const
TDEActionCollection* SQ_GLWidget::actionCollection() const
{
return ac;
}

6
ksquirrel/sq_glwidget_helpers.cpp
Unescape View File

@ -36,8 +36,8 @@
#include "sq_glwidget_helpers.h"
SQ_ToolButtonPopup::SQ_ToolButtonPopup(const TQPixmap &pix, const TQString &textLabel, KToolBar *parent)
: KToolBarButton(pix, -1, parent, 0, textLabel)
SQ_ToolButtonPopup::SQ_ToolButtonPopup(const TQPixmap &pix, const TQString &textLabel, TDEToolBar *parent)
: TDEToolBarButton(pix, -1, parent, 0, textLabel)
{
setFixedWidth(SQ_ToolButton::fixedWidth());
}
@ -46,7 +46,7 @@ SQ_ToolButtonPopup::~SQ_ToolButtonPopup()
{}
SQ_ToolButton::SQ_ToolButton(const TQIconSet &iconSet, const TQString &textLabel,
TQObject *receiver, const char *slot, KToolBar *parent, const char *name)
TQObject *receiver, const char *slot, TDEToolBar *parent, const char *name)
: TQToolButton(iconSet, textLabel, TQString(), receiver, slot, parent, name)
{
setFixedWidth(SQ_ToolButton::fixedWidth());

8
ksquirrel/sq_glwidget_helpers.h
Unescape View File

@ -22,14 +22,14 @@
class TQWMatrix;
class KToolBar;
class TDEToolBar;
struct RGBA;
class SQ_ToolButtonPopup : public KToolBarButton
class SQ_ToolButtonPopup : public TDEToolBarButton
{
public:
SQ_ToolButtonPopup(const TQPixmap &pix, const TQString &textLabel, KToolBar *parent);
SQ_ToolButtonPopup(const TQPixmap &pix, const TQString &textLabel, TDEToolBar *parent);
~SQ_ToolButtonPopup();
};
@ -37,7 +37,7 @@ class SQ_ToolButton : public TQToolButton
{
public:
SQ_ToolButton(const TQIconSet &iconSet, const TQString &textLabel, TQObject *receiver,
const char *slot, KToolBar *parent, const char *name = 0);
const char *slot, TDEToolBar *parent, const char *name = 0);
~SQ_ToolButton();
static int fixedWidth();

36
ksquirrel/sq_glwidget_stuff.cpp
Unescape View File

@ -78,18 +78,18 @@
// Create actions
void SQ_GLWidget::createActions()
{
pASelectionRect = new KToggleAction(i18n("Rectangle"), TQPixmap(locate("data", "images/actions/glselection_rect.png")), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSelectionRect()), ac, "SQ Selection Rect");
pASelectionEllipse = new KToggleAction(i18n("Ellipse"), TQPixmap(locate("data", "images/actions/glselection_ellipse.png")), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSelectionEllipse()), ac, "SQ Selection Ellipse");
pASelectionClear = new KAction(i18n("Clear"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotSelectionClear()), ac, "SQ Selection Clear");
pASelectionRect = new TDEToggleAction(i18n("Rectangle"), TQPixmap(locate("data", "images/actions/glselection_rect.png")), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSelectionRect()), ac, "SQ Selection Rect");
pASelectionEllipse = new TDEToggleAction(i18n("Ellipse"), TQPixmap(locate("data", "images/actions/glselection_ellipse.png")), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSelectionEllipse()), ac, "SQ Selection Ellipse");
pASelectionClear = new TDEAction(i18n("Clear"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotSelectionClear()), ac, "SQ Selection Clear");
pAZoomW = new KToggleAction(i18n("Fit width"), TQPixmap(locate("data", "images/actions/zoomW.png")), 0, TQT_TQOBJECT(this), TQT_SLOT(slotZoomW()), ac, "SQ ZoomW");
pAZoomH = new KToggleAction(i18n("Fit height"), TQPixmap(locate("data", "images/actions/zoomH.png")), 0, TQT_TQOBJECT(this), TQT_SLOT(slotZoomH()), ac, "SQ ZoomH");
pAZoomWH = new KToggleAction(i18n("Fit image"), TQPixmap(locate("data", "images/actions/zoomWH.png")), 0, TQT_TQOBJECT(this), TQT_SLOT(slotZoomWH()), ac, "SQ ZoomWH");
pAZoom100 = new KToggleAction(i18n("Zoom 100%"), TQPixmap(locate("data", "images/actions/zoom100.png")), 0, TQT_TQOBJECT(this), TQT_SLOT(slotZoom100()), ac, "SQ Zoom100");
pAZoomLast = new KToggleAction(i18n("Leave previous zoom"), TQPixmap(locate("data", "images/actions/zoomlast.png")), 0, TQT_TQOBJECT(this), TQT_SLOT(slotZoomLast()), ac, "SQ ZoomLast");
pAIfLess = new KToggleAction(i18n("Ignore, if image is smaller than window"), TQPixmap(locate("data", "images/actions/ifless.png")), 0, 0, 0, ac, "if less");
pAZoomW = new TDEToggleAction(i18n("Fit width"), TQPixmap(locate("data", "images/actions/zoomW.png")), 0, TQT_TQOBJECT(this), TQT_SLOT(slotZoomW()), ac, "SQ ZoomW");
pAZoomH = new TDEToggleAction(i18n("Fit height"), TQPixmap(locate("data", "images/actions/zoomH.png")), 0, TQT_TQOBJECT(this), TQT_SLOT(slotZoomH()), ac, "SQ ZoomH");
pAZoomWH = new TDEToggleAction(i18n("Fit image"), TQPixmap(locate("data", "images/actions/zoomWH.png")), 0, TQT_TQOBJECT(this), TQT_SLOT(slotZoomWH()), ac, "SQ ZoomWH");
pAZoom100 = new TDEToggleAction(i18n("Zoom 100%"), TQPixmap(locate("data", "images/actions/zoom100.png")), 0, TQT_TQOBJECT(this), TQT_SLOT(slotZoom100()), ac, "SQ Zoom100");
pAZoomLast = new TDEToggleAction(i18n("Leave previous zoom"), TQPixmap(locate("data", "images/actions/zoomlast.png")), 0, TQT_TQOBJECT(this), TQT_SLOT(slotZoomLast()), ac, "SQ ZoomLast");
pAIfLess = new TDEToggleAction(i18n("Ignore, if image is smaller than window"), TQPixmap(locate("data", "images/actions/ifless.png")), 0, 0, 0, ac, "if less");
pAFull = new KToggleAction(TQString(), 0, 0, 0, ac, "SQ GL Full");
pAFull = new TDEToggleAction(TQString(), 0, 0, 0, ac, "SQ GL Full");
TQString squirrel_zoom_actions = TQString::fromLatin1("squirrel_zoom_actions");
pAZoomW->setExclusiveGroup(squirrel_zoom_actions);
@ -115,10 +115,10 @@ void SQ_GLWidget::createActions()
void SQ_GLWidget::createToolbar()
{
zoomMenu = new KPopupMenu;
zoomMenu = new TDEPopupMenu;
#ifndef KSQUIRREL_PART
selectionMenu = new KPopupMenu;
selectionMenu = new TDEPopupMenu;
SQ_ToolButton *pATool;
@ -156,12 +156,12 @@ void SQ_GLWidget::createToolbar()
/*
* We will create TQToolButtons and put them in toolbar.
* Of course, we can just KAction::plug(), BUT plugged KActions
* Of course, we can just TDEAction::plug(), BUT plugged TDEActions
* will produce buttons, which cann't be clicked twise! I think
* plugged KActions will treat our attempt as double-click, not two single-clicks.
* plugged TDEActions will treat our attempt as double-click, not two single-clicks.
* On the other hand, we can click TQToolButton as frequently as we want.
*
* Plugged KActions also don't know about autorepeat :(
* Plugged TDEActions also don't know about autorepeat :(
*/
new SQ_ToolButton(TQPixmap(locate("data", "images/actions/file_first.png")), i18n("Go to first image"), TQT_TQOBJECT(this), TQT_SLOT(slotFirst()), toolbar);
pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/file_prev.png")), i18n("Previous image"), TQT_TQOBJECT(this), TQT_SLOT(slotPrev()), toolbar);
@ -867,7 +867,7 @@ void SQ_GLWidget::initAccelsAndMenu()
menu->insertItem(i18n("Image"), menuImage);
#define SQ_ADD_KACTION(b) \
(new KAction(TQString(), b, TQT_TQOBJECT(this), TQT_SLOT(slotAccelActivated()), ac, TQString::fromLatin1("action_%1").arg(b)))
(new TDEAction(TQString(), b, TQT_TQOBJECT(this), TQT_SLOT(slotAccelActivated()), ac, TQString::fromLatin1("action_%1").arg(b)))
id_saveas = menuFile->insertItem(SQ_IconLoader::instance()->loadIcon("filesaveas", KIcon::Desktop, KIcon::SizeSmall), i18n("Save As...") + "\tS", SQ_ADD_KACTION(TQt::Key_S), TQT_SLOT(activate()));
@ -992,9 +992,9 @@ void SQ_GLWidget::initAccelsAndMenu()
void SQ_GLWidget::slotAccelActivated()
{
KAction *accel = static_cast<KAction *>(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME *>(sender())));
TDEAction *accel = static_cast<TDEAction *>(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME *>(sender())));
KShortcut ks = accel->shortcut();
TDEShortcut ks = accel->shortcut();
if(!ks.compare(TQt::Key_Left)) matrix_move(movefactor, 0);
else if(!ks.compare(TQt::Key_Right)) matrix_move(-movefactor, 0);

2
ksquirrel/sq_iconlistbox.cpp
Unescape View File

@ -22,7 +22,7 @@
#include "sq_iconlistbox.h"
#include "sq_iconlistitem.h"
SQ_IconListBox::SQ_IconListBox(TQWidget *parent, const char *name, WFlags f) : KListBox(parent, name, f),
SQ_IconListBox::SQ_IconListBox(TQWidget *parent, const char *name, WFlags f) : TDEListBox(parent, name, f),
mHeightValid(false), mWidthValid(false)
{
setHScrollBarMode(TQScrollView::AlwaysOff);

2
ksquirrel/sq_iconlistbox.h
Unescape View File

@ -26,7 +26,7 @@
* SQ_IconListBox and SQ_IconListItem are used in SQ_Options.
*/
class SQ_IconListBox : public KListBox
class SQ_IconListBox : public TDEListBox
{
public:
SQ_IconListBox(TQWidget * = 0, const char * = 0, WFlags = 0);

8
ksquirrel/sq_imageproperties.ui
Unescape View File

@ -934,18 +934,18 @@
<include location="local" impldecl="in implementation">sq_imageproperties.ui.h</include>
</includes>
<forwards>
<forward>class KPopupMenu;</forward>
<forward>class KAction;</forward>
<forward>class TDEPopupMenu;</forward>
<forward>class TDEAction;</forward>
<forward>namespace TDEIO { class Job; }</forward>
</forwards>
<variables>
<variable access="private">KURL url;</variable>
<variable access="private">TQWidget *kew;</variable>
<variable access="private">TQPixmap ok, error;</variable>
<variable access="private">KPopupMenu *menu;</variable>
<variable access="private">TDEPopupMenu *menu;</variable>
<variable access="private">TQListViewItem *data;</variable>
<variable access="private">int z, exifMode;</variable>
<variable access="private">KAction *copy, *copyentry, *copyall;</variable>
<variable access="private">TDEAction *copy, *copyentry, *copyall;</variable>
<variable access="private">TQString file;</variable>
</variables>
<Q_SLOTS>

6
ksquirrel/sq_imageproperties.ui.h
Unescape View File

@ -24,10 +24,10 @@
void SQ_ImageProperties::init()
{
menu = new KPopupMenu;
menu = new TDEPopupMenu;
copy = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotCopyString()), 0);
copyentry = new KAction(i18n("Copy entry"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCopyEntry()), 0);
copyall = new KAction(i18n("Copy all entries"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCopyAll()), 0);
copyentry = new TDEAction(i18n("Copy entry"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCopyEntry()), 0);
copyall = new TDEAction(i18n("Copy all entries"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCopyAll()), 0);
copyentry->setIcon(copy->icon());
copyall->setIcon(copy->icon());

20
ksquirrel/sq_kipimanager.cpp
Unescape View File

@ -36,24 +36,24 @@
#include "sq_kipiinterface.h"
SQ_ActionMenu::SQ_ActionMenu(const TQString &text, TQObject *parent, const char *name)
: KActionMenu(text, parent, name)
: TDEActionMenu(text, parent, name)
{}
SQ_ActionMenu::SQ_ActionMenu(const TQString &text, const TQString &icon, TQObject *parent, const char *name)
: KActionMenu(text, icon, parent, name)
: TDEActionMenu(text, icon, parent, name)
{}
SQ_ActionMenu::~SQ_ActionMenu()
{
TQValueVector<KAction *>::iterator itEnd = plugged.end();
TQValueVector<TDEAction *>::iterator itEnd = plugged.end();
for(TQValueVector<KAction *>::iterator it = plugged.begin();it != itEnd;++it)
for(TQValueVector<TDEAction *>::iterator it = plugged.begin();it != itEnd;++it)
remove(*it);
}
void SQ_ActionMenu::insert(KAction *ka, int index)
void SQ_ActionMenu::insert(TDEAction *ka, int index)
{
KActionMenu::insert(ka, index);
TDEActionMenu::insert(ka, index);
plugged.append(ka);
}
@ -65,12 +65,12 @@ SQ_KIPIManager::SQ_KIPIManager(TQWidget *_parent, const char *name) : TQObject(_
kdDebug() << "+SQ_KIPIManager" << endl;
// Create a dummy "no plugin" action
noPlugin = new KAction(i18n("No Plugins"), 0, 0, 0, (KActionCollection *)0/*actionCollection()*/, "no_plugin");
noPlugin = new TDEAction(i18n("No Plugins"), 0, 0, 0, (TDEActionCollection *)0/*actionCollection()*/, "no_plugin");
noPlugin->setShortcutConfigurable(false);
noPlugin->setEnabled(false);
loaded = false;
p = new KPopupMenu;
p = new TDEPopupMenu;
connect(p, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotAboutToShow()));
@ -149,8 +149,8 @@ void SQ_KIPIManager::slotReplug()
plugin->setup(parent);
KActionPtrList actions = plugin->actions();
KActionPtrList::ConstIterator actionIt = actions.begin(), end = actions.end();
TDEActionPtrList actions = plugin->actions();
TDEActionPtrList::ConstIterator actionIt = actions.begin(), end = actions.end();
KIPI::Category category;
for ( ;actionIt != end;++actionIt)

22
ksquirrel/sq_kipimanager.h
Unescape View File

@ -40,33 +40,33 @@ namespace KIPI { class PluginLoader; }
class TQWidget;
class KPopupMenu;
class TDEPopupMenu;
/*
* This subclass of KActionMenu should know which KActions
* This subclass of TDEActionMenu should know which TDEActions
* are currently plugged in it.
*/
class SQ_ActionMenu : public KActionMenu
class SQ_ActionMenu : public TDEActionMenu
{
public:
SQ_ActionMenu(const TQString &text, TQObject *parent = 0, const char *name = 0);
SQ_ActionMenu(const TQString &text, const TQString &icon, TQObject *parent = 0, const char *name = 0);
/*
* remove() all KActions currently plugged.
* remove() all TDEActions currently plugged.
*/
~SQ_ActionMenu();
/*
* Reimplement insert() to let us remember "ka"
*/
void insert(KAction *ka, int index = -1);
void insert(TDEAction *ka, int index = -1);
int count() const;
private:
// Currently plugged KActions
TQValueVector<KAction *> plugged;
// Currently plugged TDEActions
TQValueVector<TDEAction *> plugged;
};
inline
@ -88,7 +88,7 @@ class SQ_KIPIManager : public TQObject
SQ_KIPIManager(TQWidget *_parent, const char *name = 0);
~SQ_KIPIManager();
KPopupMenu* popup() const;
TDEPopupMenu* popup() const;
void loadPlugins();
@ -104,14 +104,14 @@ class SQ_KIPIManager : public TQObject
KIPI::PluginLoader *mPluginLoader;
CategoryMap cmenus;
KAction *noPlugin;
TDEAction *noPlugin;
TQWidget *parent;
KPopupMenu *p;
TDEPopupMenu *p;
bool loaded;
};
inline
KPopupMenu* SQ_KIPIManager::popup() const
TDEPopupMenu* SQ_KIPIManager::popup() const
{
return p;
}

10
ksquirrel/sq_navigatordropmenu.cpp
Unescape View File

@ -34,21 +34,21 @@ SQ_NavigatorDropMenu::SQ_NavigatorDropMenu(TQObject *parent) : TQObject(parent)
{
m_instance = this;
KActionCollection *ac = new KActionCollection(0, this, "Actions for drop menu");
TDEActionCollection *ac = new TDEActionCollection(0, this, "Actions for drop menu");
dropmenu = new SQ_PopupMenu(0);
// "copy" action
KAction *pACopy = new KAction(i18n("Copy here"), "editpaste", 0, this, TQT_SLOT(slotCopy()), ac, "sq_copy");
TDEAction *pACopy = new TDEAction(i18n("Copy here"), "editpaste", 0, this, TQT_SLOT(slotCopy()), ac, "sq_copy");
// "move" action
KAction *pAMove = new KAction(i18n("Move here"), 0, 0, this, TQT_SLOT(slotMove()), ac, "sq_move");
TDEAction *pAMove = new TDEAction(i18n("Move here"), 0, 0, this, TQT_SLOT(slotMove()), ac, "sq_move");
// "link" action
KAction *pALink = new KAction(i18n("Link here"), "www", 0, this, TQT_SLOT(slotLink()), ac, "sq_link");
TDEAction *pALink = new TDEAction(i18n("Link here"), "www", 0, this, TQT_SLOT(slotLink()), ac, "sq_link");
// "cancel" action, this action will do nothing - just close popup menu
KAction *pACancel = new KAction(i18n("Cancel"), 0, 0, 0, 0, ac, "sq_cancel");
TDEAction *pACancel = new TDEAction(i18n("Cancel"), 0, 0, 0, 0, ac, "sq_cancel");
// plug all actions to popup menu
dropmenu->insertTitle(TQString());

6
ksquirrel/sq_popupmenu.cpp
Unescape View File

@ -22,7 +22,7 @@
#include "sq_popupmenu.h"
SQ_PopupMenu::SQ_PopupMenu(TQWidget *parent, const char *name)
: KPopupMenu(parent, name), title(0)
: TDEPopupMenu(parent, name), title(0)
{}
SQ_PopupMenu::~SQ_PopupMenu()
@ -30,10 +30,10 @@ SQ_PopupMenu::~SQ_PopupMenu()
void SQ_PopupMenu::insertTitle(const TQString &t)
{
title = KPopupMenu::insertTitle(t);
title = TDEPopupMenu::insertTitle(t);
}
void SQ_PopupMenu::changeTitle(const TQString &t)
{
KPopupMenu::changeTitle(title, t);
TDEPopupMenu::changeTitle(title, t);
}

2
ksquirrel/sq_popupmenu.h
Unescape View File

@ -24,7 +24,7 @@
*@author Baryshev Dmitry
*/
class SQ_PopupMenu : public KPopupMenu
class SQ_PopupMenu : public TDEPopupMenu
{
public:
SQ_PopupMenu(TQWidget *parent = 0, const char *name = 0);

2
ksquirrel/sq_widgetstack.cpp
Unescape View File

@ -751,7 +751,7 @@ void SQ_WidgetStack::slotSelectAll()
}
}
KAction* SQ_WidgetStack::action(const TQString &name)
TDEAction* SQ_WidgetStack::action(const TQString &name)
{
return dirop->actionCollection()->action(name);
}

6
ksquirrel/sq_widgetstack.h
Unescape View File

@ -30,8 +30,8 @@ namespace TDEIO { class Job; }
class TQTimer;
class KAction;
class KToggleAction;
class TDEAction;
class TDEToggleAction;
class KFileView;
/*
@ -107,7 +107,7 @@ class SQ_WidgetStack : public TQObject
/*
* Quick access to SQ_DirOperator::actionCollection::action()
*/
KAction *action(const TQString &name);
TDEAction *action(const TQString &name);
/*
* Select first supported image in current directory.

Write Preview
Loading…
Cancel
Save