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

Rename a number of classes to enhance compatibility with KDE4

Browse Source
master
Timothy Pearson 11 years ago
parent 51391e793f
commit cd8241b126
8 changed files with 90 additions and 90 deletions
Show Stats Download Patch File Download Diff File

4
kuickshow/ChangeLog
Unescape View File

@ -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 mouse-wheel can switch between images now, per request of
Bill Benken <bilben1@home.com> 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 in the image window
Sat Aug 4 03:37:50 2001 Carsten Pfeiffer <pfeiffer@kde.org> 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: * src/imagewindow.cpp:
update the accelerators when applying new configuration 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 work in our case
* use QWidget::x11Display() for later multihead support) * use QWidget::x11Display() for later multihead support)

6
kuickshow/src/filewidget.cpp
Unescape View File

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

68
kuickshow/src/imagewindow.cpp
Unescape View File

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

6
kuickshow/src/imagewindow.h
Unescape View File

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

2
kuickshow/src/kuickconfigdlg.cpp
Unescape View File

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

4
kuickshow/src/kuickconfigdlg.h
Unescape View File

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

74
kuickshow/src/kuickshow.cpp
Unescape View File

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

16
kuickshow/src/kuickshow.h
Unescape View File

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

Write Preview
Loading…
Cancel
Save