Rename a number of classes to enhance compatibility with KDE4

master
Timothy Pearson 11 years ago
parent 51391e793f
commit cd8241b126

@ -80,7 +80,7 @@ Sat Aug 25 02:58:31 2001 Carsten Pfeiffer <pfeiffer@kde.org>
mouse-wheel can switch between images now, per request of
Bill Benken <bilben1@home.com>
* also fixed the KStdAccel::save() and close() accels not working
* also fixed the TDEStdAccel::save() and close() accels not working
in the image window
Sat Aug 4 03:37:50 2001 Carsten Pfeiffer <pfeiffer@kde.org>
@ -242,7 +242,7 @@ Wed Mar 7 01:39:34 2001 Carsten Pfeiffer <pfeiffer@kde.org>
* src/imagewindow.cpp:
update the accelerators when applying new configuration
(delete the old and create a new KAccel, setKeyDict() doesn't
(delete the old and create a new TDEAccel, setKeyDict() doesn't
work in our case
* use QWidget::x11Display() for later multihead support)

@ -80,9 +80,9 @@ FileWidget::~FileWidget()
void FileWidget::initActions()
{
int index = 0;
KActionCollection *coll = actionCollection();
KActionSeparator *sep = new KActionSeparator( coll, "kuicksep" );
KActionMenu *menu = static_cast<KActionMenu*>( coll->action("popupMenu") );
TDEActionCollection *coll = actionCollection();
TDEActionSeparator *sep = new TDEActionSeparator( coll, "kuicksep" );
TDEActionMenu *menu = static_cast<TDEActionMenu*>( coll->action("popupMenu") );
menu->insert( coll->action("kuick_showInOtherWindow"), index++ );
menu->insert( coll->action("kuick_showInSameWindow"), index++ );

@ -111,7 +111,7 @@ void ImageWindow::init()
contrastMenu = 0L;
m_actions = new KActionCollection( this );
m_actions = new TDEActionCollection( this );
if ( !s_handCursor ) {
TQString file = locate( "appdata", "pics/handcursor.png" );
@ -145,51 +145,51 @@ void ImageWindow::updateActions()
void ImageWindow::setupActions()
{
new KAction( i18n("Show Next Image"), KStdAccel::next(),
new TDEAction( i18n("Show Next Image"), TDEStdAccel::next(),
TQT_TQOBJECT(this), TQT_SLOT( slotRequestNext() ),
m_actions, "next_image" );
new KAction( i18n("Show Previous Image"), KStdAccel::prior(),
new TDEAction( i18n("Show Previous Image"), TDEStdAccel::prior(),
TQT_TQOBJECT(this), TQT_SLOT( slotRequestPrevious() ),
m_actions, "previous_image" );
new KAction( i18n("Delete Image"), SHIFT + Key_Delete,
new TDEAction( i18n("Delete Image"), SHIFT + Key_Delete,
TQT_TQOBJECT(this), TQT_SLOT( imageDelete() ),
m_actions, "delete_image" );
new KAction( i18n("Move Image to Trash"), Key_Delete,
new TDEAction( i18n("Move Image to Trash"), Key_Delete,
TQT_TQOBJECT(this), TQT_SLOT( imageTrash() ),
m_actions, "trash_image" );
new KAction( i18n("Zoom In"), Key_Plus,
new TDEAction( i18n("Zoom In"), Key_Plus,
TQT_TQOBJECT(this), TQT_SLOT( zoomIn() ),
m_actions, "zoom_in" );
new KAction( i18n("Zoom Out"), Key_Minus,
new TDEAction( i18n("Zoom Out"), Key_Minus,
TQT_TQOBJECT(this), TQT_SLOT( zoomOut() ),
m_actions, "zoom_out" );
new KAction( i18n("Restore Original Size"), Key_O,
new TDEAction( i18n("Restore Original Size"), Key_O,
TQT_TQOBJECT(this), TQT_SLOT( showImageOriginalSize() ),
m_actions, "original_size" );
new KAction( i18n("Maximize"), Key_M,
new TDEAction( i18n("Maximize"), Key_M,
TQT_TQOBJECT(this), TQT_SLOT( maximize() ),
m_actions, "maximize" );
new KAction( i18n("Rotate 90 Degrees"), Key_9,
new TDEAction( i18n("Rotate 90 Degrees"), Key_9,
TQT_TQOBJECT(this), TQT_SLOT( rotate90() ),
m_actions, "rotate90" );
new KAction( i18n("Rotate 180 Degrees"), Key_8,
new TDEAction( i18n("Rotate 180 Degrees"), Key_8,
TQT_TQOBJECT(this), TQT_SLOT( rotate180() ),
m_actions, "rotate180" );
new KAction( i18n("Rotate 270 Degrees"), Key_7,
new TDEAction( i18n("Rotate 270 Degrees"), Key_7,
TQT_TQOBJECT(this), TQT_SLOT( rotate270() ),
m_actions, "rotate270" );
new KAction( i18n("FlipQt::Horizontally"), Key_Asterisk,
new TDEAction( i18n("FlipQt::Horizontally"), Key_Asterisk,
TQT_TQOBJECT(this), TQT_SLOT( flipHoriz() ),
m_actions, "flip_horicontally" );
new KAction( i18n("FlipQt::Vertically"), Key_Slash,
new TDEAction( i18n("FlipQt::Vertically"), Key_Slash,
TQT_TQOBJECT(this), TQT_SLOT( flipVert() ),
m_actions, "flip_vertically" );
new KAction( i18n("Print Image..."), KStdAccel::print(),
new TDEAction( i18n("Print Image..."), TDEStdAccel::print(),
TQT_TQOBJECT(this), TQT_SLOT( printImage() ),
m_actions, "print_image" );
KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT( saveImage() ),
@ -198,64 +198,64 @@ void ImageWindow::setupActions()
KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT( close() ),
m_actions, "close_image" );
// --------
new KAction( i18n("More Brightness"), Key_B,
new TDEAction( i18n("More Brightness"), Key_B,
TQT_TQOBJECT(this), TQT_SLOT( moreBrightness() ),
m_actions, "more_brightness" );
new KAction( i18n("Less Brightness"), SHIFT + Key_B,
new TDEAction( i18n("Less Brightness"), SHIFT + Key_B,
TQT_TQOBJECT(this), TQT_SLOT( lessBrightness() ),
m_actions, "less_brightness" );
new KAction( i18n("More Contrast"), Key_C,
new TDEAction( i18n("More Contrast"), Key_C,
TQT_TQOBJECT(this), TQT_SLOT( moreContrast() ),
m_actions, "more_contrast" );
new KAction( i18n("Less Contrast"), SHIFT + Key_C,
new TDEAction( i18n("Less Contrast"), SHIFT + Key_C,
TQT_TQOBJECT(this), TQT_SLOT( lessContrast() ),
m_actions, "less_contrast" );
new KAction( i18n("More Gamma"), Key_G,
new TDEAction( i18n("More Gamma"), Key_G,
TQT_TQOBJECT(this), TQT_SLOT( moreGamma() ),
m_actions, "more_gamma" );
new KAction( i18n("Less Gamma"), SHIFT + Key_G,
new TDEAction( i18n("Less Gamma"), SHIFT + Key_G,
TQT_TQOBJECT(this), TQT_SLOT( lessGamma() ),
m_actions, "less_gamma" );
// --------
new KAction( i18n("Scroll Up"), Key_Up,
new TDEAction( i18n("Scroll Up"), Key_Up,
TQT_TQOBJECT(this), TQT_SLOT( scrollUp() ),
m_actions, "scroll_up" );
new KAction( i18n("Scroll Down"), Key_Down,
new TDEAction( i18n("Scroll Down"), Key_Down,
TQT_TQOBJECT(this), TQT_SLOT( scrollDown() ),
m_actions, "scroll_down" );
new KAction( i18n("Scroll Left"), Key_Left,
new TDEAction( i18n("Scroll Left"), Key_Left,
TQT_TQOBJECT(this), TQT_SLOT( scrollLeft() ),
m_actions, "scroll_left" );
new KAction( i18n("Scroll Right"), Key_Right,
new TDEAction( i18n("Scroll Right"), Key_Right,
TQT_TQOBJECT(this), TQT_SLOT( scrollRight() ),
m_actions, "scroll_right" );
// --------
new KAction( i18n("Pause Slideshow"), Key_P,
new TDEAction( i18n("Pause Slideshow"), Key_P,
TQT_TQOBJECT(this), TQT_SLOT( pauseSlideShow() ),
m_actions, "kuick_slideshow_pause" );
KAction *fullscreenAction = KStdAction::fullScreen(TQT_TQOBJECT(this), TQT_SLOT( toggleFullscreen() ), m_actions, 0 );
TDEAction *fullscreenAction = KStdAction::fullScreen(TQT_TQOBJECT(this), TQT_SLOT( toggleFullscreen() ), m_actions, 0 );
KAction *reloadAction = new KAction( i18n("Reload Image"), KStdAccel::shortcut(KStdAccel::Reload),
TDEAction *reloadAction = new TDEAction( i18n("Reload Image"), TDEStdAccel::shortcut(TDEStdAccel::Reload),
TQT_TQOBJECT(this), TQT_SLOT( reload() ),
m_actions, "reload_image" );
new KAction( i18n("Properties"), ALT + Key_Return,
new TDEAction( i18n("Properties"), ALT + Key_Return,
TQT_TQOBJECT(this), TQT_SLOT( slotProperties() ),
m_actions, "properties" );
m_actions->readShortcutSettings();
// Unfortunately there is no KAction::setShortcutDefault() :-/
// Unfortunately there is no TDEAction::setShortcutDefault() :-/
// so add Key_Return as fullscreen shortcut _after_ readShortcutSettings()
addAlternativeShortcut(fullscreenAction, Key_Return);
addAlternativeShortcut(reloadAction, Key_Enter);
}
void ImageWindow::addAlternativeShortcut(KAction *action, int key)
void ImageWindow::addAlternativeShortcut(TDEAction *action, int key)
{
KShortcut cut( action->shortcut() );
TDEShortcut cut( action->shortcut() );
if (cut == action->shortcutDefault()) {
cut.append(KKey(key));
action->setShortcut(cut);
@ -593,9 +593,9 @@ void ImageWindow::keyPressEvent( TQKeyEvent *e )
if ( key == Key_Shift )
updateCursor( ZoomCursor );
if ( key == Key_Escape || KStdAccel::close().contains( KKey( e ) ) )
if ( key == Key_Escape || TDEStdAccel::close().contains( KKey( e ) ) )
close( true );
else if ( KStdAccel::save().contains( KKey( e ) ) )
else if ( TDEStdAccel::save().contains( KKey( e ) ) )
saveImage();
else {

@ -57,7 +57,7 @@ public:
void updateActions();
KActionCollection * actionCollection() const { return m_actions; }
TDEActionCollection * actionCollection() const { return m_actions; }
/**
* Resizes image to @p w, @p h, but takes into account the workarea, so
@ -100,7 +100,7 @@ protected:
void init();
void centerImage();
void addAlternativeShortcut( KAction *action, int key );
void addAlternativeShortcut( TDEAction *action, int key );
virtual void updateGeometry( int imWidth, int imHeight );
virtual void loaded( KuickImage * );
virtual bool canZoomTo( int newWidth, int newHeight );
@ -168,7 +168,7 @@ private:
int m_numHeads;
TQString m_saveDirectory;
KActionCollection *m_actions;
TDEActionCollection *m_actions;
static TQCursor * s_handCursor;
};

@ -38,7 +38,7 @@
#include "kuickdata.h"
KuickConfigDialog::KuickConfigDialog( KActionCollection *_coll, TQWidget *parent,
KuickConfigDialog::KuickConfigDialog( TDEActionCollection *_coll, TQWidget *parent,
const char *name, bool modal )
: KDialogBase( Tabbed, i18n("Configure"),
Help | Default | Ok | Apply | Cancel, Ok,

@ -36,7 +36,7 @@ class KuickConfigDialog : public KDialogBase
public:
KuickConfigDialog( KActionCollection *coll, TQWidget *parent=0,
KuickConfigDialog( TDEActionCollection *coll, TQWidget *parent=0,
const char *name=0, bool modal=true);
~KuickConfigDialog();
@ -50,7 +50,7 @@ private:
GeneralWidget *generalWidget;
SlideShowWidget *slideshowWidget;
KKeyChooser *imageKeyChooser, *browserKeyChooser;
KActionCollection *coll;
TDEActionCollection *coll;
ImageWindow *imageWindow;

@ -92,7 +92,7 @@ static const int META_ITEM = 1;
TQValueList<ImageWindow*> KuickShow::s_viewers;
KuickShow::KuickShow( const char *name )
: KMainWindow( 0L, name ),
: TDEMainWindow( 0L, name ),
m_slideshowCycle( 1 ),
fileWidget( 0L ),
dialog( 0L ),
@ -227,7 +227,7 @@ void KuickShow::initGUI( const KURL& startDir )
fileWidget = new FileWidget( startURL, this, "MainWidget" );
setFocusProxy( fileWidget );
KActionCollection *coll = fileWidget->actionCollection();
TDEActionCollection *coll = fileWidget->actionCollection();
redirectDeleteAndTrashActions(coll);
@ -246,47 +246,47 @@ void KuickShow::initGUI( const KURL& startDir )
TQT_TQOBJECT(this), TQT_SLOT( slotDropped( const KFileItem *, TQDropEvent *, const KURL::List &)) );
// setup actions
KAction *open = KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( slotOpenURL() ),
TDEAction *open = KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( slotOpenURL() ),
coll, "openURL" );
KAction *print = KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT( slotPrint() ),
TDEAction *print = KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT( slotPrint() ),
coll, "kuick_print" );
print->setText( i18n("Print Image...") );
KAction *configure = new KAction( i18n("Configure %1...").arg( TDEGlobal::instance()->aboutData()->programName() ), "configure",
KShortcut(),
TDEAction *configure = new TDEAction( i18n("Configure %1...").arg( TDEGlobal::instance()->aboutData()->programName() ), "configure",
TDEShortcut(),
TQT_TQOBJECT(this), TQT_SLOT( configuration() ),
coll, "kuick_configure" );
KAction *slide = new KAction( i18n("Start Slideshow" ), "ksslide",
KShortcut( Key_F2 ),
TDEAction *slide = new TDEAction( i18n("Start Slideshow" ), "ksslide",
TDEShortcut( Key_F2 ),
TQT_TQOBJECT(this), TQT_SLOT( startSlideShow() ),
coll, "kuick_slideshow" );
KAction *about = new KAction( i18n( "About KuickShow" ), "about",
KShortcut(),
TDEAction *about = new TDEAction( i18n( "About KuickShow" ), "about",
TDEShortcut(),
TQT_TQOBJECT(this), TQT_SLOT( about() ), coll, "about" );
oneWindowAction = new KToggleAction( i18n("Open Only One Image Window"),
oneWindowAction = new TDEToggleAction( i18n("Open Only One Image Window"),
"window_new",
KShortcut( CTRL+Key_N ), coll,
TDEShortcut( CTRL+Key_N ), coll,
"kuick_one window" );
m_toggleBrowserAction = new KToggleAction( i18n("Show File Browser"), KShortcut( Key_Space ), coll, "toggleBrowser" );
m_toggleBrowserAction = new TDEToggleAction( i18n("Show File Browser"), TDEShortcut( Key_Space ), coll, "toggleBrowser" );
m_toggleBrowserAction->setCheckedState(i18n("Hide File Browser"));
connect( m_toggleBrowserAction, TQT_SIGNAL( toggled( bool ) ),
TQT_SLOT( toggleBrowser() ));
KAction *showInOther = new KAction( i18n("Show Image"), KShortcut(),
TDEAction *showInOther = new TDEAction( i18n("Show Image"), TDEShortcut(),
TQT_TQOBJECT(this), TQT_SLOT( slotShowInOtherWindow() ),
coll, "kuick_showInOtherWindow" );
KAction *showInSame = new KAction( i18n("Show Image in Active Window"),
KShortcut(),
TDEAction *showInSame = new TDEAction( i18n("Show Image in Active Window"),
TDEShortcut(),
TQT_TQOBJECT(this), TQT_SLOT( slotShowInSameWindow() ),
coll, "kuick_showInSameWindow" );
KAction *showFullscreen = new KAction( i18n("Show Image in Fullscreen Mode"),
KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotShowFullscreen() ),
TDEAction *showFullscreen = new TDEAction( i18n("Show Image in Fullscreen Mode"),
TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotShowFullscreen() ),
coll, "kuick_showFullscreen" );
KAction *quit = KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), coll, "quit");
TDEAction *quit = KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), coll, "quit");
// remove TQString() parameter -- ellis
coll->readShortcutSettings( TQString() );
@ -314,8 +314,8 @@ void KuickShow::initGUI( const KURL& startDir )
// remove the Sorting submenu (and the separator below)
// from the main contextmenu
KActionMenu *sortingMenu = static_cast<KActionMenu*>( coll->action("sorting menu"));
KActionMenu *mainActionMenu = static_cast<KActionMenu*>( coll->action("popupMenu"));
TDEActionMenu *sortingMenu = static_cast<TDEActionMenu*>( coll->action("sorting menu"));
TDEActionMenu *mainActionMenu = static_cast<TDEActionMenu*>( coll->action("popupMenu"));
TQPopupMenu *mainPopup = mainActionMenu->popupMenu();
int sortingIndex = mainPopup->indexOf( sortingMenu->itemId( 0 ) );
int separatorId = mainPopup->idAt( sortingIndex + 1 );
@ -325,7 +325,7 @@ void KuickShow::initGUI( const KURL& startDir )
mainActionMenu->remove( sortingMenu );
// add the sorting menu and a separator into the View menu
KActionMenu *viewActionMenu = static_cast<KActionMenu*>( coll->action("view menu"));
TDEActionMenu *viewActionMenu = static_cast<TDEActionMenu*>( coll->action("view menu"));
viewActionMenu->popupMenu()->insertSeparator( 0 );
sortingMenu->plug( viewActionMenu->popupMenu(), 0 ); // on top of the menu
@ -339,7 +339,7 @@ void KuickShow::initGUI( const KURL& startDir )
mBar->insertItem( i18n("&Settings"), settingsMenu );
// toolbar
KToolBar *tBar = toolBar();
TDEToolBar *tBar = toolBar();
tBar->setText( i18n( "Main Toolbar" ) );
coll->action("up")->plug( tBar );
@ -382,7 +382,7 @@ void KuickShow::initGUI( const KURL& startDir )
tBar->show();
// Address box in address tool bar
KToolBar *addressToolBar = toolBar( "address_bar" );
TDEToolBar *addressToolBar = toolBar( "address_bar" );
const int ID_ADDRESSBAR = 1;
cmbPath = new KURLComboBox( KURLComboBox::Directories,
@ -405,9 +405,9 @@ void KuickShow::initGUI( const KURL& startDir )
dirSelected( fileWidget->url() );
setCentralWidget( fileWidget );
setupGUI( KMainWindow::Save );
setupGUI( TDEMainWindow::Save );
coll->action( "reload" )->setShortcut( KStdAccel::reload() );
coll->action( "reload" )->setShortcut( TDEStdAccel::reload() );
coll->action( "short view" )->setShortcut(Key_F6);
coll->action( "detailed view" )->setShortcut(Key_F7);
coll->action( "show hidden" )->setShortcut(Key_F8);
@ -416,9 +416,9 @@ void KuickShow::initGUI( const KURL& startDir )
coll->action( "separate dirs" )->setShortcut(Key_F12);
}
void KuickShow::redirectDeleteAndTrashActions(KActionCollection *coll)
void KuickShow::redirectDeleteAndTrashActions(TDEActionCollection *coll)
{
KAction *action = coll->action("delete");
TDEAction *action = coll->action("delete");
if (action)
{
action->disconnect(fileWidget);
@ -821,7 +821,7 @@ void KuickShow::slotDropped( const KFileItem *, TQDropEvent *, const KURL::List
// try to init the WM border as it is 0,0 when the window is not shown yet.
void KuickShow::show()
{
KMainWindow::show();
TDEMainWindow::show();
(void) Kuick::frameSize( winId() );
}
@ -883,13 +883,13 @@ bool KuickShow::eventFilter( TQObject *o, TQEvent *e )
k = TQT_TQKEYEVENT( e );
if ( k ) {
if ( KStdAccel::quit().contains( KKey( k ) ) ) {
if ( TDEStdAccel::quit().contains( KKey( k ) ) ) {
saveSettings();
deleteAllViewers();
FileCache::shutdown();
::exit(0);
}
else if ( KStdAccel::help().contains( KKey( k ) ) ) {
else if ( TDEStdAccel::help().contains( KKey( k ) ) ) {
appHelpActivated();
return true;
}
@ -969,19 +969,19 @@ bool KuickShow::eventFilter( TQObject *o, TQEvent *e )
return true;
}
return KMainWindow::eventFilter( o, e );
return TDEMainWindow::eventFilter( o, e );
}
// we definitely have a fileWidget here!
KKey kkey( k );
if ( key == Key_Home || KStdAccel::home().contains( kkey ) )
if ( key == Key_Home || TDEStdAccel::home().contains( kkey ) )
{
item = fileWidget->gotoFirstImage();
item_next = fileWidget->getNext( false );
}
else if ( key == Key_End || KStdAccel::end().contains( kkey ) )
else if ( key == Key_End || TDEStdAccel::end().contains( kkey ) )
{
item = fileWidget->gotoLastImage();
item_next = fileWidget->getPrevious( false );
@ -1065,7 +1065,7 @@ bool KuickShow::eventFilter( TQObject *o, TQEvent *e )
if ( ret )
return true;
return KMainWindow::eventFilter( o, e );
return TDEMainWindow::eventFilter( o, e );
}
void KuickShow::configuration()
@ -1432,12 +1432,12 @@ void KuickShow::deleteAllViewers()
m_viewer = 0L;
}
KActionCollection * KuickShow::actionCollection() const
TDEActionCollection * KuickShow::actionCollection() const
{
if ( fileWidget )
return fileWidget->actionCollection();
return KMainWindow::actionCollection();
return TDEMainWindow::actionCollection();
}
#include "kuickshow.moc"

@ -37,9 +37,9 @@ class ImageWindow;
class ImData;
class KuickConfigDialog;
class KAccel;
class TDEAccel;
class TDEConfig;
class KToggleAction;
class TDEToggleAction;
class AboutWidget;
class KURL;
@ -79,7 +79,7 @@ public:
};
class KuickShow : public KMainWindow
class KuickShow : public TDEMainWindow
{
Q_OBJECT
@ -93,7 +93,7 @@ public:
// overridden to make KDCOPActionProxy work -- all our actions are not
// in the mainwindow's collection, but in the filewidget's.
virtual KActionCollection* actionCollection() const;
virtual TDEActionCollection* actionCollection() const;
protected:
@ -151,7 +151,7 @@ private:
void delayedRepeatEvent( ImageWindow *, TQKeyEvent * );
void abortDelayedEvent();
void deleteAllViewers();
void redirectDeleteAndTrashActions(KActionCollection *coll);
void redirectDeleteAndTrashActions(TDEActionCollection *coll);
void delayAction(DelayedRepeatEvent *event);
void replayAdvance(DelayedRepeatEvent *event);
@ -167,12 +167,12 @@ private:
KuickConfigDialog *dialog;
ImlibData *id;
ImageWindow *m_viewer;
KToggleAction *oneWindowAction;
KAccel *m_accel;
TDEToggleAction *oneWindowAction;
TDEAccel *m_accel;
DelayedRepeatEvent *m_delayedRepeatItem;
TQTimer *m_slideTimer;
bool m_slideShowStopped;
KToggleAction *m_toggleBrowserAction;
TDEToggleAction *m_toggleBrowserAction;
TQGuardedPtr<AboutWidget> aboutWidget;
};

Loading…
Cancel
Save