diff options
42 files changed, 198 insertions, 225 deletions
diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 69dd7b2..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "cmake"] - path = cmake - url = https://system@scm.trinitydesktop.org/scm/git/tde-common-cmake diff --git a/CMakeL10n.txt b/CMakeL10n.txt index a525b71..0176702 100644 --- a/CMakeL10n.txt +++ b/CMakeL10n.txt @@ -9,12 +9,15 @@ # ################################################# -cmake_minimum_required( VERSION 2.8 ) + +##### set project version ######################## + +include( TDEVersion ) +cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} ) ##### include our cmake modules ################# -set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" ) include( TDEL10n ) diff --git a/CMakeLists.txt b/CMakeLists.txt index 93d603e..0630e82 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,13 +11,17 @@ # ################################################# -cmake_minimum_required( VERSION 2.8.12 ) + +##### set project version ######################## + +include( TDEVersion ) +cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} ) +tde_set_project_version( ) ##### general package setup ##################### project( kompose ) -set( VERSION R14.1.0 ) ##### include essential cmake modules ########### @@ -33,7 +37,6 @@ include( CheckCXXSourceCompiles ) ##### include our cmake modules ################# -set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" ) include( TDEMacros ) @@ -75,8 +78,12 @@ set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined" ##### source directories ######################## add_subdirectory( src ) -tde_conditional_add_subdirectory( BUILD_DOC doc ) -tde_conditional_add_subdirectory( BUILD_TRANSLATIONS translations ) + + +##### other data ################################ + +tde_conditional_add_project_docs( BUILD_DOC ) +tde_conditional_add_project_translations( BUILD_TRANSLATIONS ) ##### write configure files ##################### diff --git a/cmake b/cmake deleted file mode 160000 -Subproject 0846fa1cb7ca2f8df276849f75196efc0935b84 diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt deleted file mode 100644 index f6eec15..0000000 --- a/doc/CMakeLists.txt +++ /dev/null @@ -1,34 +0,0 @@ -file( GLOB _dirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} * ) -list( REMOVE_ITEM _dirs html man ) - -string( REGEX REPLACE "[ \r\n\t]+" ";" _linguas "$ENV{LINGUAS}" ) - -foreach( _dir IN LISTS _dirs ) - if( IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${_dir} - AND ( "${_dir}" STREQUAL "en" OR - "${_linguas}" MATCHES "^;*$" OR - ";${_linguas};" MATCHES ";${_dir};" )) - file( GLOB _doc_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/${_dir} ${_dir}/*.docbook ) - if( _doc_files ) - list( FIND _doc_files "index.docbook" _find_index ) - if( -1 EQUAL _find_index ) - set( _noindex "NOINDEX" ) - else() - unset( _noindex ) - endif() - tde_create_handbook( - SOURCE_BASEDIR ${_dir} - ${_noindex} - LANG ${_dir} - DESTINATION ${PROJECT_NAME} - ) - endif() - endif() -endforeach() - -if( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/html/CMakeLists.txt ) - add_subdirectory( html ) -endif() -if( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/man/CMakeLists.txt ) - add_subdirectory( man ) -endif() diff --git a/doc/en/index.docbook b/doc/en/index.docbook index 27db150..0446555 100644 --- a/doc/en/index.docbook +++ b/doc/en/index.docbook @@ -540,16 +540,3 @@ dicer-toaster daemon first, or &kompose; won't work !</para> &documentation.index; </book> - -<!-- -Local Variables: -mode: sgml -sgml-minimize-attributes:nil -sgml-general-insert-case:lower -sgml-indent-step:0 -sgml-indent-data:nil -End: - -vim:tabstop=2:shiftwidth=2:expandtab ---> - diff --git a/src/kompose.h b/src/kompose.h index 749c0ec..3c23364 100644 --- a/src/kompose.h +++ b/src/kompose.h @@ -34,7 +34,7 @@ */ class Kompose : public KUniqueApplication { - Q_OBJECT + TQ_OBJECT public: Kompose(); virtual ~Kompose(); diff --git a/src/komposedesktopwidget.cpp b/src/komposedesktopwidget.cpp index 0f3c567..7618701 100644 --- a/src/komposedesktopwidget.cpp +++ b/src/komposedesktopwidget.cpp @@ -74,7 +74,7 @@ KomposeDesktopWidget::KomposeDesktopWidget(int desktop, TQWidget *parent, Kompos createTaskWidgets(); - connect( KomposeTaskManager::instance(), SIGNAL( newTask( KomposeTask* ) ), this, SLOT( createTaskWidget( KomposeTask* ) ) ); + connect( KomposeTaskManager::instance(), TQ_SIGNAL( newTask( KomposeTask* ) ), this, TQ_SLOT( createTaskWidget( KomposeTask* ) ) ); setFocusPolicy(TQWidget::ClickFocus); @@ -83,7 +83,7 @@ KomposeDesktopWidget::KomposeDesktopWidget(int desktop, TQWidget *parent, Kompos KomposeDesktopWidget::~KomposeDesktopWidget() { - disconnect( KomposeTaskManager::instance(), SIGNAL( newTask( KomposeTask* ) ), this, SLOT( createTaskWidget( KomposeTask* ) ) ); + disconnect( KomposeTaskManager::instance(), TQ_SIGNAL( newTask( KomposeTask* ) ), this, TQ_SLOT( createTaskWidget( KomposeTask* ) ) ); } void KomposeDesktopWidget::initFonts() diff --git a/src/komposedesktopwidget.h b/src/komposedesktopwidget.h index e3e646b..26d54d8 100644 --- a/src/komposedesktopwidget.h +++ b/src/komposedesktopwidget.h @@ -30,7 +30,7 @@ class KRootPixmap; */ class KomposeDesktopWidget : public KomposeTaskContainerWidget { - Q_OBJECT + TQ_OBJECT public: KomposeDesktopWidget(int desktop, TQWidget *parent = 0, KomposeLayout *l = 0, const char *name = 0); diff --git a/src/komposefullscreenwidget.cpp b/src/komposefullscreenwidget.cpp index 1d0b7e1..712cc7c 100644 --- a/src/komposefullscreenwidget.cpp +++ b/src/komposefullscreenwidget.cpp @@ -37,12 +37,6 @@ KomposeFullscreenWidget::KomposeFullscreenWidget( int displayType, KomposeLayout : KomposeTaskContainerWidget( -1, 0, l ), type(displayType) { - // if ( TQT_VERSION < 0x030300 ) - - /* use showMaximized instead of setWindowState to make it compile on qt 3.1 or whatever */ - // showMaximized(); - // KWin::setState( winId(), NET::KeepAbove ); - // Set Desktop background as our background setBackgroundMode( TQt::FixedPixmap ); // setBackgroundPixmap(*(KomposeGlobal::instance()->getDesktopBgPixmap())); @@ -126,7 +120,7 @@ void KomposeFullscreenWidget::initView() if ( type == KOMPOSEDISPLAY_VIRTUALDESKS ) { - disconnect( KomposeTaskManager::instance(), SIGNAL( newTask( KomposeTask* ) ), this, SLOT( createTaskWidget( KomposeTask* ) ) ); + disconnect( KomposeTaskManager::instance(), TQ_SIGNAL( newTask( KomposeTask* ) ), this, TQ_SLOT( createTaskWidget( KomposeTask* ) ) ); layout->setType( TLAYOUT_TASKCONTAINERS ); setDesktop( -2 ); createDesktopWidgets(); @@ -136,14 +130,14 @@ void KomposeFullscreenWidget::initView() layout->setType( TLAYOUT_GENERIC ); setDesktop( -1 ); createTaskWidgets(); - connect( KomposeTaskManager::instance(), SIGNAL( newTask( KomposeTask* ) ), this, SLOT( createTaskWidget( KomposeTask* ) ) ); + connect( KomposeTaskManager::instance(), TQ_SIGNAL( newTask( KomposeTask* ) ), this, TQ_SLOT( createTaskWidget( KomposeTask* ) ) ); } else if ( type == KOMPOSEDISPLAY_CURRENTDESK ) { layout->setType( TLAYOUT_GENERIC ); setDesktop( KomposeViewManager::instance()->getDesktopBeforeSnaps() ); createTaskWidgets(); - connect( KomposeTaskManager::instance(), SIGNAL( newTask( KomposeTask* ) ), this, SLOT( createTaskWidget( KomposeTask* ) ) ); + connect( KomposeTaskManager::instance(), TQ_SIGNAL( newTask( KomposeTask* ) ), this, TQ_SLOT( createTaskWidget( KomposeTask* ) ) ); } unsetCursor(); @@ -159,8 +153,8 @@ void KomposeFullscreenWidget::createDesktopWidgets() //int col = i % 2; //kdDebug() << "rc %d %d", row, col); KomposeDesktopWidget *desktop = new KomposeDesktopWidget(i, this ); - connect( desktop, SIGNAL(contentsChanged()), layout, SLOT(arrangeLayout()) ); - connect( desktop, SIGNAL(activated(KomposeDesktopWidget*)), this, SLOT(desktopChanged(KomposeDesktopWidget*)) ); + connect( desktop, TQ_SIGNAL(contentsChanged()), layout, TQ_SLOT(arrangeLayout()) ); + connect( desktop, TQ_SIGNAL(activated(KomposeDesktopWidget*)), this, TQ_SLOT(desktopChanged(KomposeDesktopWidget*)) ); desktop->show(); } } diff --git a/src/komposefullscreenwidget.h b/src/komposefullscreenwidget.h index 15f3fdf..4a480d7 100644 --- a/src/komposefullscreenwidget.h +++ b/src/komposefullscreenwidget.h @@ -26,7 +26,7 @@ class TDEPopupMenu; */ class KomposeFullscreenWidget : public KomposeTaskContainerWidget { -Q_OBJECT +TQ_OBJECT public: KomposeFullscreenWidget( int displayType = KOMPOSEDISPLAY_VIRTUALDESKS ,KomposeLayout *l = 0 ); diff --git a/src/komposegl/komposegldesktopwidget.cpp b/src/komposegl/komposegldesktopwidget.cpp index 6b8d857..42689a4 100644 --- a/src/komposegl/komposegldesktopwidget.cpp +++ b/src/komposegl/komposegldesktopwidget.cpp @@ -32,7 +32,7 @@ KomposeGLDesktopWidget::KomposeGLDesktopWidget(int desktop, TQObject *parent, co createTaskWidgets(); - //connect( KomposeTaskManager::instance(), SIGNAL( newTask( KomposeTask* ) ), this, SLOT( createTaskWidget( KomposeTask* ) ) ); + //connect( KomposeTaskManager::instance(), TQ_SIGNAL( newTask( KomposeTask* ) ), this, TQ_SLOT( createTaskWidget( KomposeTask* ) ) ); } diff --git a/src/komposegl/komposegltaskwidget.cpp b/src/komposegl/komposegltaskwidget.cpp index a2a7217..8265e53 100644 --- a/src/komposegl/komposegltaskwidget.cpp +++ b/src/komposegl/komposegltaskwidget.cpp @@ -45,8 +45,8 @@ KomposeGLTaskWidget::KomposeGLTaskWidget(KomposeTask *t, TQObject *parent, Kompo - connect( t, SIGNAL( closed() ), this, SLOT( slotTaskDestroyed() ) ); - connect( t, SIGNAL( stateChanged() ), this, SLOT( draw() ) ); + connect( t, TQ_SIGNAL( closed() ), this, TQ_SLOT( slotTaskDestroyed() ) ); + connect( t, TQ_SIGNAL( stateChanged() ), this, TQ_SLOT( draw() ) ); } @@ -55,8 +55,8 @@ KomposeGLTaskWidget::~KomposeGLTaskWidget() void KomposeGLTaskWidget::slotTaskDestroyed() { - disconnect( task, SIGNAL( closed() ), this, SLOT( slotTaskDestroyed() ) ); - disconnect( task, SIGNAL( stateChanged() ), this, SLOT( draw() ) ); + disconnect( task, TQ_SIGNAL( closed() ), this, TQ_SLOT( slotTaskDestroyed() ) ); + disconnect( task, TQ_SIGNAL( stateChanged() ), this, TQ_SLOT( draw() ) ); if (KomposeTaskManager::instance()->hasActiveView()) { this->parent()->removeChild( this ); diff --git a/src/komposegl/komposeglwidget.cpp b/src/komposegl/komposeglwidget.cpp index 14c6d5d..5d39917 100644 --- a/src/komposegl/komposeglwidget.cpp +++ b/src/komposegl/komposeglwidget.cpp @@ -65,7 +65,7 @@ void KomposeGLWidget::childEvent ( TQChildEvent * ce ) // Whenever a child is added/removed: rearrange layout // FIXME: sometimes widget's aren't added in time, so we have to add a short delay: - TQTimer::singleShot( 200, layout, SLOT( arrangeLayout() ) ); + TQTimer::singleShot( 200, layout, TQ_SLOT( arrangeLayout() ) ); } /* diff --git a/src/komposeglobal.cpp b/src/komposeglobal.cpp index 7d7dbe3..02a9622 100644 --- a/src/komposeglobal.cpp +++ b/src/komposeglobal.cpp @@ -82,12 +82,12 @@ KomposeGlobal::KomposeGlobal(TQObject *parent, const char *name) currentDesktop = twin_module->currentDesktop(); desktopBgPixmap = new TDESharedPixmap; - connect(desktopBgPixmap, SIGNAL(done(bool)), SLOT(slotDone(bool))); + connect(desktopBgPixmap, TQ_SIGNAL(done(bool)), TQ_SLOT(slotDone(bool))); initSharedPixmaps(); initCompositeExt(); initImlib(); - connect( KomposeSettings::instance(), SIGNAL(settingsChanged()), this, SLOT(slotConfigChanged()) ); + connect( KomposeSettings::instance(), TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(slotConfigChanged()) ); } KomposeGlobal::~KomposeGlobal() @@ -154,37 +154,37 @@ void KomposeGlobal::initActions() actionCollection = new TDEActionCollection( (TQWidget*)0 ); // Actions - actQuit = KStdAction::quit( kapp, SLOT(quit()), actionCollection ); + actQuit = KStdAction::quit( kapp, TQ_SLOT(quit()), actionCollection ); actShowWorldView = new TDEAction(i18n("Komposé (ungrouped)"), "kompose_ungrouped", 0, - KomposeViewManager::instance(), SLOT(createWorldView()), + KomposeViewManager::instance(), TQ_SLOT(createWorldView()), actionCollection, "showWorldView"); actShowVirtualDesktopView = new TDEAction(i18n("Komposé (grouped by virtual desktops)"), "kompose_grouped_by_virtual_desktop", 0, - KomposeViewManager::instance(), SLOT(createVirtualDesktopView()), + KomposeViewManager::instance(), TQ_SLOT(createVirtualDesktopView()), actionCollection, "showVirtualDesktopView"); actShowCurrentDesktopView = new TDEAction(i18n("Komposé (current virtual desktop)"), "kompose_current_virtual_desktop", 0, - KomposeViewManager::instance(), SLOT(createCurrentDesktopView()), + KomposeViewManager::instance(), TQ_SLOT(createCurrentDesktopView()), actionCollection, "showCurrentDesktopView"); - actPreferencesDialog = KStdAction::preferences( KomposeSettings::instance(), SLOT(showPreferencesDlg()), actionCollection ); + actPreferencesDialog = KStdAction::preferences( KomposeSettings::instance(), TQ_SLOT(showPreferencesDlg()), actionCollection ); - actConfigGlobalShortcuts = KStdAction::keyBindings(this, SLOT(showGlobalShortcutsSettingsDialog()), + actConfigGlobalShortcuts = KStdAction::keyBindings(this, TQ_SLOT(showGlobalShortcutsSettingsDialog()), actionCollection, "options_configure_global_keybinding"); actConfigGlobalShortcuts->setText(i18n("Configure &Global Shortcuts...")); actAboutDlg = new TDEAction(i18n("About Komposé"), "kompose", 0, - this, SLOT(showAboutDlg()), + this, TQ_SLOT(showAboutDlg()), actionCollection, "showAboutDlg"); } void KomposeGlobal::initSharedPixmaps() { // Whenever the background pixmap changes we'll have to reload it: - //connect(twin_module, SIGNAL(windowChanged(WId, unsigned int)), SLOT(desktopChanged(WId, unsigned int))); - connect(twin_module, SIGNAL(currentDesktopChanged(int)), SLOT(slotDesktopChanged(int))); - connect(kapp, SIGNAL(backgroundChanged(int)), SLOT(slotBackgroundChanged(int))); + //connect(twin_module, TQ_SIGNAL(windowChanged(WId, unsigned int)), TQ_SLOT(desktopChanged(WId, unsigned int))); + connect(twin_module, TQ_SIGNAL(currentDesktopChanged(int)), TQ_SLOT(slotDesktopChanged(int))); + connect(kapp, TQ_SIGNAL(backgroundChanged(int)), TQ_SLOT(slotBackgroundChanged(int))); enablePixmapExports(); // When Kompose is started by session management the bg shared pixmap may not be available yet @@ -192,7 +192,7 @@ void KomposeGlobal::initSharedPixmaps() { tqWarning("KomposeGlobal::initSharedPixmaps() - Pixmap not available"); //enablePixmapExports(); - TQTimer::singleShot( 1000, this, SLOT( initSharedPixmaps() ) ); + TQTimer::singleShot( 1000, this, TQ_SLOT( initSharedPixmaps() ) ); //initSharedPixmaps(); //return; } @@ -246,13 +246,13 @@ void KomposeGlobal::slotDone(bool success) if (!success) { kdDebug() << "KomposeGlobal::slotDone() - loading of desktop background failed.\n" << endl; - //TQTimer::singleShot( 1000, this, SLOT( initSharedPixmaps() ) ); + //TQTimer::singleShot( 1000, this, TQ_SLOT( initSharedPixmaps() ) ); } } void KomposeGlobal::enablePixmapExports() { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 kdDebug() << "KomposeGlobal::enablePixmapExports()" << endl; DCOPClient *client = kapp->dcopClient(); if (!client->isAttached()) diff --git a/src/komposeglobal.h b/src/komposeglobal.h index 760fce9..69d5857 100644 --- a/src/komposeglobal.h +++ b/src/komposeglobal.h @@ -27,7 +27,7 @@ class KWinModule; #include <config.h> #endif -#if defined(Q_WS_X11) && defined(HAVE_XCOMPOSITE) && defined(HAVE_XDAMAGE) && TQT_VERSION >= 0x030300 +#if defined(TQ_WS_X11) && defined(HAVE_XCOMPOSITE) && defined(HAVE_XDAMAGE) && TQT_VERSION >= 0x030300 # define COMPOSITE #endif @@ -36,7 +36,7 @@ class KWinModule; */ class KomposeGlobal : public TQObject { - Q_OBJECT + TQ_OBJECT protected: KomposeGlobal(TQObject *parent = 0, const char *name = 0); diff --git a/src/komposeimage.h b/src/komposeimage.h index 77c335c..50012b5 100644 --- a/src/komposeimage.h +++ b/src/komposeimage.h @@ -28,7 +28,7 @@ enum ImageEffect { IEFFECT_NONE, IEFFECT_TITLE, IEFFECT_MINIMIZED, IEFFECT_MINIM */ class KomposeImage : public TQObject { - Q_OBJECT + TQ_OBJECT public: KomposeImage( Imlib_Image &im ); diff --git a/src/komposelayout.h b/src/komposelayout.h index 4ab1df0..b9131b6 100644 --- a/src/komposelayout.h +++ b/src/komposelayout.h @@ -43,7 +43,7 @@ TQLayout just didn't fit :( */ class KomposeLayout : public TQObject { - Q_OBJECT + TQ_OBJECT public: KomposeLayout( KomposeWidget *parent, int type = TLAYOUT_GENERIC, int dist = 10, const char *name = 0 ); diff --git a/src/komposepreferences.cpp b/src/komposepreferences.cpp index a66156c..46ee318 100644 --- a/src/komposepreferences.cpp +++ b/src/komposepreferences.cpp @@ -77,7 +77,7 @@ KomposePreferences::KomposePreferences() TQHBox *hLayXineramaGrabDelay = new TQHBox(xineramaGroupBox); TQLabel *xineramaLabel = new TQLabel(i18n("Use screen:"), hLayXineramaGrabDelay); m_viewScreen = new TQSpinBox(0, deskwidget.numScreens()-1, 1, hLayXineramaGrabDelay); - connect( m_viewScreenAll, SIGNAL(toggled(bool)), m_viewScreen, SLOT(setDisabled(bool)) ); + connect( m_viewScreenAll, TQ_SIGNAL(toggled(bool)), m_viewScreen, TQ_SLOT(setDisabled(bool)) ); xineramaLabel->setBuddy(m_viewScreen); TQString xineramaHelp = i18n("Specify the screen where Komposé should appear." ); TQWhatsThis::add( m_viewScreen, xineramaHelp ); @@ -95,7 +95,7 @@ KomposePreferences::KomposePreferences() TQString useCompositeHelp = i18n("Making use of the Composite extension of newer X Servers makes the grabbing of screenshots obsolete.\nThe contents of all windows are drawn in back buffers that will be accessed by Komposé\nNote that the Composite implementation of even modern graphic card drivers is still very slow and may make your system pretty unusable."); TQWhatsThis::add( useComposite, useCompositeHelp ); TQToolTip::add( useComposite, useCompositeHelp ); - connect( useComposite, SIGNAL(toggled(bool)), SLOT(setUseCompositeToggled(bool)) ); + connect( useComposite, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setUseCompositeToggled(bool)) ); #else TQGroupBox *screenshotsGroupBox = new TQGroupBox( 3, Vertical, i18n("Screenshots"), page1 ); #endif @@ -189,20 +189,20 @@ KomposePreferences::KomposePreferences() TQString showWindowTitlesHelp = i18n( "Display the name of every window in Komposé" ); TQWhatsThis::add( showWindowTitles, showWindowTitlesHelp ); TQToolTip::add( showWindowTitles, showWindowTitlesHelp ); - connect( showWindowTitles, SIGNAL(toggled(bool)), windowTitleFontBtn, SLOT(setEnabled(bool)) ); - connect( windowTitleFontBtn, SIGNAL(clicked()), this, SLOT(showWindowTitleFontDialog()) ); + connect( showWindowTitles, TQ_SIGNAL(toggled(bool)), windowTitleFontBtn, TQ_SLOT(setEnabled(bool)) ); + connect( windowTitleFontBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(showWindowTitleFontDialog()) ); TQGrid *gridWindowTitlesColor = new TQGrid(2, windowTitleGroupBox); // windowTitleFontColorLabel = new TQLabel(windowTitleFontColor, i18n("Text color: "), gridWindowTitlesColor); // FIXME: How to link to a buddy that doesn't yet exist? windowTitleFontColorLabel = new TQLabel(i18n("Text color:"), gridWindowTitlesColor); windowTitleFontColor = new KColorButton(TQt::black, gridWindowTitlesColor); - connect( showWindowTitles, SIGNAL(toggled(bool)), windowTitleFontColorLabel, SLOT(setEnabled(bool)) ); - connect( showWindowTitles, SIGNAL(toggled(bool)), windowTitleFontColor, SLOT(setEnabled(bool)) ); + connect( showWindowTitles, TQ_SIGNAL(toggled(bool)), windowTitleFontColorLabel, TQ_SLOT(setEnabled(bool)) ); + connect( showWindowTitles, TQ_SIGNAL(toggled(bool)), windowTitleFontColor, TQ_SLOT(setEnabled(bool)) ); showWindowTitleShadow = new TQCheckBox(i18n("Shadow color:"), gridWindowTitlesColor); windowTitleFontShadowColor = new KColorButton(TQt::lightGray, gridWindowTitlesColor); - connect( showWindowTitles, SIGNAL(toggled(bool)), showWindowTitleShadow, SLOT(setEnabled(bool)) ); - connect( showWindowTitles, SIGNAL(toggled(bool)), windowTitleFontShadowColor, SLOT(setEnabled(bool)) ); - connect( showWindowTitleShadow, SIGNAL(toggled(bool)), windowTitleFontShadowColor, SLOT(setEnabled(bool)) ); + connect( showWindowTitles, TQ_SIGNAL(toggled(bool)), showWindowTitleShadow, TQ_SLOT(setEnabled(bool)) ); + connect( showWindowTitles, TQ_SIGNAL(toggled(bool)), windowTitleFontShadowColor, TQ_SLOT(setEnabled(bool)) ); + connect( showWindowTitleShadow, TQ_SIGNAL(toggled(bool)), windowTitleFontShadowColor, TQ_SLOT(setEnabled(bool)) ); page2Layout->addWidget(windowTitleGroupBox); @@ -245,10 +245,10 @@ KomposePreferences::KomposePreferences() showIcons = new TQCheckBox(i18n("Show icons"), iconGroupBox); iconSize = new TQSlider(0, 3, 1, 0, TQt::Horizontal, iconGroupBox); iconSizeDescription = new TQLabel( iconSize, "", iconGroupBox); - connect( iconSize, SIGNAL( sliderMoved(int) ), this, SLOT( updateIconSliderDesc(int) ) ); - connect( iconSize, SIGNAL( valueChanged(int) ), this, SLOT( updateIconSliderDesc(int) ) ); - connect( showIcons, SIGNAL( toggled(bool) ), iconSize, SLOT( setEnabled(bool) ) ); - connect( showIcons, SIGNAL( toggled(bool) ), iconSizeDescription, SLOT( setEnabled(bool) ) ); + connect( iconSize, TQ_SIGNAL( sliderMoved(int) ), this, TQ_SLOT( updateIconSliderDesc(int) ) ); + connect( iconSize, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( updateIconSliderDesc(int) ) ); + connect( showIcons, TQ_SIGNAL( toggled(bool) ), iconSize, TQ_SLOT( setEnabled(bool) ) ); + connect( showIcons, TQ_SIGNAL( toggled(bool) ), iconSizeDescription, TQ_SLOT( setEnabled(bool) ) ); page2Layout->addWidget(iconGroupBox); page2Layout->insertStretch(-1); @@ -275,7 +275,7 @@ KomposePreferences::KomposePreferences() page3Layout->addWidget(virtDesksLayoutGroupBox); desktopTitleFontBtn = new TQPushButton(i18n("Select Desktop Names Font..."), virtDesksLayoutGroupBox); - connect( desktopTitleFontBtn, SIGNAL(clicked()), this, SLOT(showDesktopTitleFontDialog()) ); + connect( desktopTitleFontBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(showDesktopTitleFontDialog()) ); page3Layout->insertStretch(-1); diff --git a/src/komposepreferences.h b/src/komposepreferences.h index 352272d..6f9e692 100644 --- a/src/komposepreferences.h +++ b/src/komposepreferences.h @@ -32,7 +32,7 @@ class TQComboBox; */ class KomposePreferences : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KomposePreferences(); diff --git a/src/komposesettings.cpp b/src/komposesettings.cpp index 8aebaac..5a844dd 100644 --- a/src/komposesettings.cpp +++ b/src/komposesettings.cpp @@ -52,19 +52,19 @@ KomposeSettings::KomposeSettings(TQObject *parent, const char *name) globalAccel->insert( "showDefaultView", i18n("Show Komposé (default view)"), i18n("Displays the view you have configured as default"), KKey::QtWIN+Key_Tab, KKey::QtWIN+CTRL+SHIFT+Key_Tab, - KomposeViewManager::instance(), SLOT(createDefaultView()) ); + KomposeViewManager::instance(), TQ_SLOT(createDefaultView()) ); globalAccel->insert( "showWorldView", i18n("Show Komposé (ungrouped)"), i18n("Displays all windows unsorted"), CTRL+SHIFT+Key_J, KKey::QtWIN+CTRL+SHIFT+Key_J, - KomposeViewManager::instance(), SLOT(createWorldView()) ); + KomposeViewManager::instance(), TQ_SLOT(createWorldView()) ); globalAccel->insert( "showVirtualDesktopView", i18n("Show Komposé (grouped by virtual desktops)"), i18n("Displays all windows sorted by virtual desktops"), CTRL+SHIFT+Key_I, KKey::QtWIN+CTRL+SHIFT+Key_I, - KomposeViewManager::instance(), SLOT(createVirtualDesktopView()) ); + KomposeViewManager::instance(), TQ_SLOT(createVirtualDesktopView()) ); globalAccel->insert( "showCurrentDesktopView", i18n("Show Komposé (current virtual desktop)"), i18n("Displays all windows on the current desktop"), CTRL+SHIFT+Key_K, KKey::QtWIN+CTRL+SHIFT+Key_K, - KomposeViewManager::instance(), SLOT(createCurrentDesktopView()) ); + KomposeViewManager::instance(), TQ_SLOT(createCurrentDesktopView()) ); // read Settings from cfg file readConfig(); diff --git a/src/komposesettings.h b/src/komposesettings.h index 3169b71..796afca 100644 --- a/src/komposesettings.h +++ b/src/komposesettings.h @@ -29,7 +29,7 @@ class TQFontMetrics; */ class KomposeSettings : public TQObject { - Q_OBJECT + TQ_OBJECT protected: KomposeSettings(TQObject *parent = 0, const char *name = 0); diff --git a/src/komposesystray.cpp b/src/komposesystray.cpp index 2747bd6..5e8277f 100644 --- a/src/komposesystray.cpp +++ b/src/komposesystray.cpp @@ -43,7 +43,7 @@ KomposeSysTray::KomposeSysTray(TQWidget *parent, const char *name) KomposeGlobal::instance()->getActAboutDlg()->plug(menu); slotConfigChanged(); - connect( KomposeSettings::instance(), SIGNAL(settingsChanged()), this, SLOT(slotConfigChanged()) ); + connect( KomposeSettings::instance(), TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(slotConfigChanged()) ); } diff --git a/src/komposesystray.h b/src/komposesystray.h index e5d34e3..905e095 100644 --- a/src/komposesystray.h +++ b/src/komposesystray.h @@ -25,7 +25,7 @@ class TDEPopupMenu; */ class KomposeSysTray : public KSystemTray { - Q_OBJECT + TQ_OBJECT public: KomposeSysTray(TQWidget *parent = 0, const char *name = 0); ~KomposeSysTray(); diff --git a/src/komposetask.cpp b/src/komposetask.cpp index f95f820..554a3f8 100644 --- a/src/komposetask.cpp +++ b/src/komposetask.cpp @@ -37,7 +37,7 @@ #include <netwm.h> #include <time.h> -// Last include as it's Xlibs includes conflict with qt includes +// Last include as it's Xlibs includes conflict with TQt includes #include "komposetaskvisualizer.h" #include <X11/Xlib.h> @@ -317,7 +317,7 @@ void KomposeTask::slotX11DamageNotify() blockDamageEvents = true; emit x11DamageNotify(); - TQTimer::singleShot( 1000, this, SLOT( unBlockDamageEvents() ) ); + TQTimer::singleShot( 1000, this, TQ_SLOT( unBlockDamageEvents() ) ); } int KomposeTask::getHeightForWidth ( int w ) const diff --git a/src/komposetask.h b/src/komposetask.h index c2b29a5..0dbe91a 100644 --- a/src/komposetask.h +++ b/src/komposetask.h @@ -32,7 +32,7 @@ class KomposeTaskVisualizer; */ class KomposeTask : public TQObject { - Q_OBJECT + TQ_OBJECT public: KomposeTask(WId win, KWinModule *twinmod, TQObject *parent = 0, const char *name = 0); diff --git a/src/komposetaskcontainerwidget.cpp b/src/komposetaskcontainerwidget.cpp index ccf3767..ade9b5d 100644 --- a/src/komposetaskcontainerwidget.cpp +++ b/src/komposetaskcontainerwidget.cpp @@ -27,8 +27,8 @@ KomposeTaskContainerWidget::KomposeTaskContainerWidget( int desk, TQWidget *pare : KomposeWidget(parent, l, name), desktop( desk ) { - connect(KomposeTaskManager::instance(), SIGNAL(taskDesktopChanged(KomposeTask*, int, int )), - SLOT(reparentTaskWidget(KomposeTask*, int, int )) ); + connect(KomposeTaskManager::instance(), TQ_SIGNAL(taskDesktopChanged(KomposeTask*, int, int )), + TQ_SLOT(reparentTaskWidget(KomposeTask*, int, int )) ); } @@ -66,7 +66,7 @@ void KomposeTaskContainerWidget::reparentTaskWidget( KomposeTask* task, int from if ( desktop == toDesktop -1 || (toDesktop == -1 && fromDesktop-1!=desktop) ) { createTaskWidget( task, true ); - //TQTimer::singleShot( 200, layout, SLOT( arrangeLayout() ) ); + //TQTimer::singleShot( 200, layout, TQ_SLOT( arrangeLayout() ) ); // layout->arrangeLayout(); } } @@ -199,7 +199,7 @@ void KomposeTaskContainerWidget::createTaskWidget( KomposeTask* task, bool manua KomposeTaskWidget *taskwidget = new KomposeTaskWidget( task, this ); if (manualShow) taskwidget->show(); - connect( taskwidget, SIGNAL(requestRemoval(KomposeWidget*)), SLOT(requestRemoval(KomposeWidget*)) ); + connect( taskwidget, TQ_SIGNAL(requestRemoval(KomposeWidget*)), TQ_SLOT(requestRemoval(KomposeWidget*)) ); } } diff --git a/src/komposetaskcontainerwidget.h b/src/komposetaskcontainerwidget.h index cb82fea..17cecd5 100644 --- a/src/komposetaskcontainerwidget.h +++ b/src/komposetaskcontainerwidget.h @@ -25,7 +25,7 @@ */ class KomposeTaskContainerWidget : public KomposeWidget { - Q_OBJECT + TQ_OBJECT public: KomposeTaskContainerWidget( int desk = 0, TQWidget *parent = 0, KomposeLayout *l = 0, const char *name = 0); diff --git a/src/komposetaskmanager.cpp b/src/komposetaskmanager.cpp index fa8b1bb..4830e1d 100644 --- a/src/komposetaskmanager.cpp +++ b/src/komposetaskmanager.cpp @@ -75,20 +75,20 @@ KomposeTaskManager::KomposeTaskManager() callCompositeRedirect(); // Listeners for KWinmodule signals - connect( twin_module, SIGNAL(windowAdded(WId)), this, SLOT(slotWindowAdded(WId)) ); - connect( twin_module, SIGNAL(windowRemoved(WId)), this, SLOT(slotWindowRemoved(WId)) ); - connect( twin_module, SIGNAL(numberOfDesktopsChanged(int)), this, SLOT(slotDesktopCountChanged(int)) ); - connect( twin_module, SIGNAL(currentDesktopChanged(int)), this, SLOT(slotCurrentDesktopChanged(int)) ); + connect( twin_module, TQ_SIGNAL(windowAdded(WId)), this, TQ_SLOT(slotWindowAdded(WId)) ); + connect( twin_module, TQ_SIGNAL(windowRemoved(WId)), this, TQ_SLOT(slotWindowRemoved(WId)) ); + connect( twin_module, TQ_SIGNAL(numberOfDesktopsChanged(int)), this, TQ_SLOT(slotDesktopCountChanged(int)) ); + connect( twin_module, TQ_SIGNAL(currentDesktopChanged(int)), this, TQ_SLOT(slotCurrentDesktopChanged(int)) ); - connect( KomposeSettings::instance(), SIGNAL(settingsChanged()), this, SLOT(slotStartWindowListeners()) ); - connect( KomposeSettings::instance(), SIGNAL(settingsChanged()), this, SLOT(callCompositeRedirect()) ); + connect( KomposeSettings::instance(), TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(slotStartWindowListeners()) ); + connect( KomposeSettings::instance(), TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(callCompositeRedirect()) ); // register existing windows const TQValueList<WId> windows = twin_module->windows(); for (TQValueList<WId>::ConstIterator it = windows.begin(); it != windows.end(); ++it ) slotWindowAdded(*it); - connect( twin_module, SIGNAL(activeWindowChanged(WId)), this, SLOT(slotTaskActivated(WId)) ); + connect( twin_module, TQ_SIGNAL(activeWindowChanged(WId)), this, TQ_SLOT(slotTaskActivated(WId)) ); slotStartWindowListeners(); } @@ -137,10 +137,10 @@ KomposeTask* KomposeTaskManager::findTask(WId w, bool wmFrameIds ) void KomposeTaskManager::slotStartWindowListeners() { - disconnect( twin_module, SIGNAL(windowChanged( WId, unsigned int )), this, - SLOT(slotWindowChanged( WId, unsigned int )) ); - connect( twin_module, SIGNAL(windowChanged( WId, unsigned int )), this, - SLOT(slotWindowChanged( WId, unsigned int )) ); + disconnect( twin_module, TQ_SIGNAL(windowChanged( WId, unsigned int )), this, + TQ_SLOT(slotWindowChanged( WId, unsigned int )) ); + connect( twin_module, TQ_SIGNAL(windowChanged( WId, unsigned int )), this, + TQ_SLOT(slotWindowChanged( WId, unsigned int )) ); } diff --git a/src/komposetaskmanager.h b/src/komposetaskmanager.h index fd5e578..71db447 100644 --- a/src/komposetaskmanager.h +++ b/src/komposetaskmanager.h @@ -36,7 +36,7 @@ typedef TQPtrList<KomposeTask> TaskList; */ class KomposeTaskManager : public TQObject { - Q_OBJECT + TQ_OBJECT protected: KomposeTaskManager(); diff --git a/src/komposetaskprefswidget.h b/src/komposetaskprefswidget.h index f916145..97db114 100644 --- a/src/komposetaskprefswidget.h +++ b/src/komposetaskprefswidget.h @@ -21,7 +21,7 @@ class KomposeTaskWidget; */ class KomposeTaskPrefsWidget : public TQDockArea { - Q_OBJECT + TQ_OBJECT public: KomposeTaskPrefsWidget(KomposeTaskWidget *parent = 0, const char *name = 0); diff --git a/src/komposetaskvisualizer.cpp b/src/komposetaskvisualizer.cpp index 9e21eaf..7a73619 100644 --- a/src/komposetaskvisualizer.cpp +++ b/src/komposetaskvisualizer.cpp @@ -56,11 +56,11 @@ KomposeTaskVisualizer::KomposeTaskVisualizer(KomposeTask *parent, const char *na if ( !KomposeSettings::instance()->getCacheScaledPixmaps() ) { // clear cached pixmaps on viewclose - connect( KomposeViewManager::instance(), SIGNAL(viewClosed()), this, SLOT(clearCached()) ); + connect( KomposeViewManager::instance(), TQ_SIGNAL(viewClosed()), this, TQ_SLOT(clearCached()) ); } initXComposite(); - connect( KomposeSettings::instance(), SIGNAL(settingsChanged()), this, SLOT(initXComposite()) ); + connect( KomposeSettings::instance(), TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(initXComposite()) ); } KomposeTaskVisualizer::~KomposeTaskVisualizer() @@ -197,7 +197,7 @@ void KomposeTaskVisualizer::slotTaskActivated() { // Retry 1 sec later screenshotSuspended = true; - TQTimer::singleShot( 500, this, SLOT( slotTaskActivated() ) ); + TQTimer::singleShot( 500, this, TQ_SLOT( slotTaskActivated() ) ); } screenshotSuspended = false; @@ -208,7 +208,7 @@ void KomposeTaskVisualizer::slotTaskActivated() { kdDebug() << "KomposeTaskVisualizer::slotTaskActivated() (WId " << task->window() << ") - Screenshot already exists, but passive mode on - Grabbing new one." << endl; // Use a timer to make task switching feel more responsive - TQTimer::singleShot( 300, this, SLOT( captureScreenshot_GrabWindow() ) ); + TQTimer::singleShot( 300, this, TQ_SLOT( captureScreenshot_GrabWindow() ) ); //captureScreenshot_GrabWindow(); } } @@ -266,7 +266,7 @@ void KomposeTaskVisualizer::slotUpdateScreenshot() // Restore if formerly iconified if ( iconifyLater ) - TQTimer::singleShot( 1000, task, SLOT( iconify() ) ); + TQTimer::singleShot( 1000, task, TQ_SLOT( iconify() ) ); scaledScreenshotDirty = true; } @@ -312,9 +312,9 @@ void KomposeTaskVisualizer::initXComposite() { dpy = TQPaintDevice::x11AppDisplay(); - connect( task, SIGNAL(x11ConfigureNotify()), this, SLOT(updateXCompositeNamedPixmap())); + connect( task, TQ_SIGNAL(x11ConfigureNotify()), this, TQ_SLOT(updateXCompositeNamedPixmap())); XSelectInput( dpy, task->wmFrame(), StructureNotifyMask ); - connect( task, SIGNAL( x11DamageNotify() ), SLOT( setScaledScreenshotDirty() ) ); + connect( task, TQ_SIGNAL( x11DamageNotify() ), TQ_SLOT( setScaledScreenshotDirty() ) ); XWindowAttributes attr; XGetWindowAttributes( dpy, task->wmFrame(), &attr ); @@ -335,8 +335,8 @@ void KomposeTaskVisualizer::initXComposite() } else { - disconnect( task, SIGNAL(x11ConfigureNotify()), this, SLOT(updateXCompositeNamedPixmap())); - disconnect( task, SIGNAL( x11DamageNotify() ), this, SLOT( setScaledScreenshotDirty() ) ); + disconnect( task, TQ_SIGNAL(x11ConfigureNotify()), this, TQ_SLOT(updateXCompositeNamedPixmap())); + disconnect( task, TQ_SIGNAL( x11DamageNotify() ), this, TQ_SLOT( setScaledScreenshotDirty() ) ); if ( compositeInit ) { XDamageDestroy( dpy, damage); @@ -368,7 +368,7 @@ void KomposeTaskVisualizer::captureScreenshot_GrabWindow() // We've just grabbed a screenshot and don't want this to happen again in the next 3?! seconds screenshotBlocked = true; - TQTimer::singleShot( 3000, this, SLOT( enablePasvScreenshots() ) ); + TQTimer::singleShot( 3000, this, TQ_SLOT( enablePasvScreenshots() ) ); kdDebug() << "KomposeTaskVisualizer::captureScreenshot_GrabWindow() (WId " << task->window() << ") - Grabbed screenshot." << endl; diff --git a/src/komposetaskvisualizer.h b/src/komposetaskvisualizer.h index 9323515..2370948 100644 --- a/src/komposetaskvisualizer.h +++ b/src/komposetaskvisualizer.h @@ -37,7 +37,7 @@ class TQSize; */ class KomposeTaskVisualizer : public TQObject { - Q_OBJECT + TQ_OBJECT public: KomposeTaskVisualizer(KomposeTask *parent, const char *name = 0); ~KomposeTaskVisualizer(); diff --git a/src/komposetaskwidget.cpp b/src/komposetaskwidget.cpp index d8f92f4..1dd2557 100644 --- a/src/komposetaskwidget.cpp +++ b/src/komposetaskwidget.cpp @@ -70,15 +70,15 @@ KomposeTaskWidget::KomposeTaskWidget(KomposeTask *t, TQWidget *parent, KomposeLa prefWidget->hide(); setActionIcons(); - //connect( t, SIGNAL( destroyed() ), this, SLOT( slotTaskDestroyed() ) ); - connect( t, SIGNAL( closed() ), this, SLOT( slotTaskDestroyed() ) ); - connect( t, SIGNAL( stateChanged() ), this, SLOT( drawWidgetAndRepaint() ) ); - connect( t, SIGNAL( stateChanged() ), this, SLOT( reInitMenu() ) ); + //connect( t, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotTaskDestroyed() ) ); + connect( t, TQ_SIGNAL( closed() ), this, TQ_SLOT( slotTaskDestroyed() ) ); + connect( t, TQ_SIGNAL( stateChanged() ), this, TQ_SLOT( drawWidgetAndRepaint() ) ); + connect( t, TQ_SIGNAL( stateChanged() ), this, TQ_SLOT( reInitMenu() ) ); #ifdef COMPOSITE if ( KomposeGlobal::instance()->hasXcomposite() && KomposeSettings::instance()->getUseComposite() ) { - connect( t, SIGNAL( x11DamageNotify() ), this, SLOT( drawWidgetAndRepaint() ) ); + connect( t, TQ_SIGNAL( x11DamageNotify() ), this, TQ_SLOT( drawWidgetAndRepaint() ) ); } #endif //setFocusPolicy(TQWidget::ClickFocus); @@ -111,8 +111,8 @@ void KomposeTaskWidget::initFonts() void KomposeTaskWidget::slotTaskDestroyed() { - disconnect( task, SIGNAL( closed() ), this, SLOT( slotTaskDestroyed() ) ); - disconnect( task, SIGNAL( stateChanged() ), this, SLOT( drawWidgetAndRepaint() ) ); + disconnect( task, TQ_SIGNAL( closed() ), this, TQ_SLOT( slotTaskDestroyed() ) ); + disconnect( task, TQ_SIGNAL( stateChanged() ), this, TQ_SLOT( drawWidgetAndRepaint() ) ); //if (KomposeViewManager::instance()->hasActiveView()) emit requestRemoval(this); @@ -355,10 +355,10 @@ void KomposeTaskWidget::initActions() taskActionCollection = new TDEActionCollection( this ); actCloseTask = new TDEAction( i18n("Close"), "window-close", Key_Delete , task, - SLOT( close() ), taskActionCollection, "closeTask" ); + TQ_SLOT( close() ), taskActionCollection, "closeTask" ); actCloseTask->setToolTip(i18n("Close")); actMinimizeRestoreTask = new TDEAction( i18n("Minimize/Restore"), "", TDEShortcut() , this, - SLOT( slotMinimizeRestoreToggled() ), taskActionCollection, "minimizeRestoreTask" ); + TQ_SLOT( slotMinimizeRestoreToggled() ), taskActionCollection, "minimizeRestoreTask" ); } void KomposeTaskWidget::initMenu() @@ -371,7 +371,7 @@ void KomposeTaskWidget::initMenu() TQPopupMenu* m = new TQPopupMenu( this ); m->setCheckable( true ); - int id = m->insertItem( i18n("&All Desktops"), task, SLOT( toDesktop(int) ) ); + int id = m->insertItem( i18n("&All Desktops"), task, TQ_SLOT( toDesktop(int) ) ); m->setItemParameter( id, 0 ); // 0 means all desktops m->setItemChecked( id, task->isOnAllDesktops() ); @@ -380,7 +380,7 @@ void KomposeTaskWidget::initMenu() for( int i = 1; i <= KomposeTaskManager::instance()->getNumDesktops(); i++ ) { TQString name = TQString( "&%1 %2" ).arg( i ).arg( KomposeTaskManager::instance()->getDesktopName( i ).replace( '&', "&&" ) ); - id = m->insertItem( name, task, SLOT( toDesktop(int) ) ); + id = m->insertItem( name, task, TQ_SLOT( toDesktop(int) ) ); m->setItemParameter( id, i ); m->setItemChecked( id, !task->isOnAllDesktops() && task->onDesktop() == i ); } diff --git a/src/komposetaskwidget.h b/src/komposetaskwidget.h index d7a685b..542fbfe 100644 --- a/src/komposetaskwidget.h +++ b/src/komposetaskwidget.h @@ -38,7 +38,7 @@ class TDEActionCollection; */ class KomposeTaskWidget : public KomposeWidget { - Q_OBJECT + TQ_OBJECT public: KomposeTaskWidget(KomposeTask *t, TQWidget *parent = 0, KomposeLayout *l = 0, const char *name = 0); diff --git a/src/komposeviewmanager.cpp b/src/komposeviewmanager.cpp index 9b4da6e..0be6f5a 100644 --- a/src/komposeviewmanager.cpp +++ b/src/komposeviewmanager.cpp @@ -57,7 +57,7 @@ KomposeViewManager::KomposeViewManager(): slotStartCursorUpdateTimer(); // dirty hack. see uglyTQtHackInitFunction() - TQTimer::singleShot( 500, this, SLOT( uglyTQtHackInitFunction() ) ); + TQTimer::singleShot( 500, this, TQ_SLOT( uglyTQtHackInitFunction() ) ); } @@ -72,7 +72,7 @@ KomposeViewManager::~KomposeViewManager() */ void KomposeViewManager::uglyTQtHackInitFunction() { - connect( KomposeSettings::instance(), SIGNAL( settingsChanged() ), SLOT( slotStartCursorUpdateTimer() ) ); + connect( KomposeSettings::instance(), TQ_SIGNAL( settingsChanged() ), TQ_SLOT( slotStartCursorUpdateTimer() ) ); } /** @@ -81,7 +81,7 @@ void KomposeViewManager::uglyTQtHackInitFunction() */ void KomposeViewManager::slotStartCursorUpdateTimer() { - disconnect( cursorUpdateTimer, SIGNAL( timeout() ), this, SLOT( checkCursorPos() ) ); + disconnect( cursorUpdateTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( checkCursorPos() ) ); if ( KomposeSettings::instance()->getActivateOnBottomLeftCorner() || KomposeSettings::instance()->getActivateOnBottomRightCorner() || @@ -100,7 +100,7 @@ void KomposeViewManager::slotStartCursorUpdateTimer() bottomLeftCorner = deskRect.bottomLeft(); bottomRightCorner = deskRect.bottomRight(); - connect( cursorUpdateTimer, SIGNAL( timeout() ), SLOT( checkCursorPos() ) ); + connect( cursorUpdateTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( checkCursorPos() ) ); cursorUpdateTimer->start( 200, false ); // TODO: Find out why even an interval of 1ms doesn't hit performance! } } @@ -131,7 +131,7 @@ void KomposeViewManager::checkCursorPos() ) { //cursorUpdateTimer->stop(); - TQTimer::singleShot( KomposeSettings::instance()->getAutoLockDelay(), this, SLOT( reCheckCursorPos() ) ); + TQTimer::singleShot( KomposeSettings::instance()->getAutoLockDelay(), this, TQ_SLOT( reCheckCursorPos() ) ); } } @@ -230,7 +230,7 @@ void KomposeViewManager::closeCurrentView() KWin::setCurrentDesktop( deskBeforeSnaps ); // A short delay until we allow screenshots again (would cause overlapping else - TQTimer::singleShot( 400, this, SLOT( toggleBlockScreenshots() ) ); + TQTimer::singleShot( 400, this, TQ_SLOT( toggleBlockScreenshots() ) ); // Restart Timer for corner checks slotStartCursorUpdateTimer(); diff --git a/src/komposeviewmanager.h b/src/komposeviewmanager.h index a840f49..d5adc12 100644 --- a/src/komposeviewmanager.h +++ b/src/komposeviewmanager.h @@ -26,7 +26,7 @@ class TQTimer; */ class KomposeViewManager : public TQObject, virtual public KomposeDcopIface { - Q_OBJECT + TQ_OBJECT protected: KomposeViewManager(); ~KomposeViewManager(); diff --git a/src/komposewidget.h b/src/komposewidget.h index 69391e3..39443e2 100644 --- a/src/komposewidget.h +++ b/src/komposewidget.h @@ -30,7 +30,7 @@ This base class for all Kompose Widgets glues the Layout and the widget together */ class KomposeWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KomposeWidget( TQWidget *parent = 0, KomposeLayout *l = 0, const char *name = 0); diff --git a/translations/CMakeLists.txt b/translations/CMakeLists.txt deleted file mode 100644 index 94897a3..0000000 --- a/translations/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -tde_auto_add_subdirectories()
\ No newline at end of file diff --git a/translations/desktop_files/ru.po b/translations/desktop_files/ru.po new file mode 100644 index 0000000..1d01d2c --- /dev/null +++ b/translations/desktop_files/ru.po @@ -0,0 +1,34 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Andrei Stepanov <adem4ik@gmail.com>, 2024. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-04-05 15:11+0200\n" +"PO-Revision-Date: 2024-04-21 17:50+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/applications/kompose-desktop-files/ru/>\n" +"Language: ru\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" + +#. Name +#: kompose.desktop:2 +msgid "Komposé" +msgstr "Komposé" + +#. GenericName +#: kompose.desktop:4 +msgid "Window Switcher" +msgstr "Переключатель окон" + +#. Comment +#: kompose.desktop:6 +msgid "An Apple Exposé like Taskmanager" +msgstr "Apple Exposé в виде диспетчера задач" diff --git a/translations/messages/CMakeLists.txt b/translations/messages/CMakeLists.txt deleted file mode 100644 index 75c89f8..0000000 --- a/translations/messages/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -file( GLOB_RECURSE po_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.po ) -string( REGEX REPLACE "[ \r\n\t]+" ";" _linguas "$ENV{LINGUAS}" ) - -foreach( _po ${po_files} ) - get_filename_component( _lang ${_po} NAME_WE ) - if( "${_linguas}" MATCHES "^;*$" OR ";${_linguas};" MATCHES ";${_lang};" ) - if( "${_po}" MATCHES "^([^/]*)/.*" ) - string( REGEX REPLACE "^([^/]*)/.*" "\\1" _component "${_po}" ) - else( ) - set( _component "${PROJECT_NAME}" ) - endif( ) - tde_create_translation( FILES ${_po} LANG ${_lang} OUTPUT_NAME ${_component} ) - endif( ) -endforeach( ) diff --git a/translations/messages/it.po b/translations/messages/it.po index 1f4b7bb..499d346 100644 --- a/translations/messages/it.po +++ b/translations/messages/it.po @@ -2,20 +2,22 @@ # This file is distributed under the same license as the PACKAGE package. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER. # Giorgio Moscardi <enjoy.the.silence@iol.it>, 2004. -# +# Michele Calgaro <michele.calgaro@yahoo.it>, 2022. msgid "" msgstr "" "Project-Id-Version: kompose\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-04-26 18:34+0000\n" -"PO-Revision-Date: 2004-10-12 16:51+0200\n" -"Last-Translator: Giorgio Moscardi <enjoy.the.silence@iol.it>\n" -"Language-Team: Italiano <tde-i18n-it@kde.org>\n" +"PO-Revision-Date: 2022-05-01 08:21+0000\n" +"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n" +"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/applications/kompose/it/>\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.9\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.11.2\n" #. Instead of a literal translation, add your name to the end of the list (separated by a comma). msgid "" @@ -75,7 +77,7 @@ msgid "" "the systray icon)." msgstr "" "Determina quale visuale sarà utilizzata come predefinita (ossia quando fai " -"clic sull'icona nel vassoio di sistema)" +"clic sull'icona nel vassoio di sistema)." #: komposepreferences.cpp:56 msgid "Ungrouped" @@ -113,20 +115,19 @@ msgstr "" #: komposepreferences.cpp:72 msgid "Xinerama" -msgstr "" +msgstr "Xinerama" #: komposepreferences.cpp:75 msgid "Use the whole desktop for Komposé" -msgstr "" +msgstr "Usa l'intero desktop per Komposé" #: komposepreferences.cpp:78 -#, fuzzy msgid "Use screen:" -msgstr "Foto dello schermo passive" +msgstr "Usa lo schermo:" #: komposepreferences.cpp:82 msgid "Specify the screen where Komposé should appear." -msgstr "" +msgstr "Specifica la schermata in cui dovrebbe apparire Komposé." #: komposepreferences.cpp:92 komposepreferences.cpp:100 msgid "Screenshots" @@ -228,19 +229,19 @@ msgstr "In basso a destra" #: komposepreferences.cpp:138 msgid "Top edge" -msgstr "" +msgstr "Bordo superiore" #: komposepreferences.cpp:140 msgid "Bottom edge" -msgstr "" +msgstr "Bordo inferiore" #: komposepreferences.cpp:142 msgid "Left edge" -msgstr "" +msgstr "Bordo sinistro" #: komposepreferences.cpp:144 msgid "Right edge" -msgstr "" +msgstr "Bordo destro" #: komposepreferences.cpp:148 msgid "Delay until activation (ms):" @@ -270,23 +271,27 @@ msgstr "" #: komposepreferences.cpp:172 msgid "Blur desktop background" -msgstr "" +msgstr "Sfoca lo sfondo del desktop" #: komposepreferences.cpp:173 msgid "" "Apply a Gaussian blur to the desktop background.\n" "Might make your machine considerably slower." msgstr "" +"Applica una sfocatura gaussiana allo sfondo del desktop.\n" +"Potrebbe rendere la tua macchina notevolmente più lenta." #: komposepreferences.cpp:178 msgid "Show Desktop number on Systray icon" -msgstr "" +msgstr "Mostra il numero del desktop sull'icona Systray" #: komposepreferences.cpp:179 msgid "" "Displays the number of the currently active Desktop on the Komposé systray " "icon." msgstr "" +"Visualizza il numero del desktop attualmente attivo sull'icona Komposé " +"systray." #: komposepreferences.cpp:184 msgid "Window Titles" @@ -306,57 +311,55 @@ msgstr "Mostra il nome di ogni finestra in Komposé" #: komposepreferences.cpp:197 msgid "Text color:" -msgstr "Colore del testo: " +msgstr "Colore del testo:" #: komposepreferences.cpp:201 msgid "Shadow color:" -msgstr "Colore dell'ombra: " +msgstr "Colore dell'ombra:" #: komposepreferences.cpp:210 -#, fuzzy -#| msgid "Window Titles" msgid "Window Border" -msgstr "Titoli delle finestre" +msgstr "Bordo della finestra" #: komposepreferences.cpp:212 msgid "Active border color:" -msgstr "" +msgstr "Colore bordo attivo:" #: komposepreferences.cpp:214 msgid "Active border style:" -msgstr "" +msgstr "Stile bordo attivo:" #: komposepreferences.cpp:219 komposepreferences.cpp:233 msgid "None" -msgstr "" +msgstr "Nessuno" #: komposepreferences.cpp:220 komposepreferences.cpp:234 msgid "Solid" -msgstr "" +msgstr "Solido" #: komposepreferences.cpp:221 komposepreferences.cpp:235 msgid "Dashed" -msgstr "" +msgstr "Tratteggiato" #: komposepreferences.cpp:222 komposepreferences.cpp:236 msgid "Dotted" -msgstr "" +msgstr "Punteggiato" #: komposepreferences.cpp:223 komposepreferences.cpp:237 msgid "Dash-Dot" -msgstr "" +msgstr "Trattino-Punto" #: komposepreferences.cpp:224 komposepreferences.cpp:238 msgid "Dash-Dot-Dot" -msgstr "" +msgstr "Trattino-Punto-Punto" #: komposepreferences.cpp:226 msgid "Inctive border color:" -msgstr "" +msgstr "Colore bordo attivo:" #: komposepreferences.cpp:228 msgid "Inactive border style:" -msgstr "" +msgstr "Stile bordo inattivo:" #: komposepreferences.cpp:244 msgid "Task Icons" @@ -372,11 +375,11 @@ msgstr "Raggruppato per desktop virtuale" #: komposepreferences.cpp:270 msgid "Desktop frame color:" -msgstr "Colore della cornice dei desktop: " +msgstr "Colore della cornice dei desktop:" #: komposepreferences.cpp:272 msgid "Desktop frame highlight color:" -msgstr "Colore di evidenziazione della cornice dei desktop: " +msgstr "Colore di evidenziazione della cornice dei desktop:" #: komposepreferences.cpp:277 msgid "Select Desktop Names Font..." @@ -451,10 +454,8 @@ msgid "To &Desktop" msgstr "Al &desktop" #: main.cpp:32 -#, fuzzy -#| msgid "A fullscreen task manager for KDE" msgid "A fullscreen task manager for TDE" -msgstr "Un gestore dei processi a tutto schermo per KDE" +msgstr "Un task manager a schermo intero per TDE" #: main.cpp:38 msgid "Do not show the systray icon" @@ -465,7 +466,6 @@ msgid "Display the default view and exit (non daemon mode)" msgstr "Mostra la visuale predefinita ed esci (modalità non demone)" #: main.cpp:64 -#, fuzzy msgid "Komposé" msgstr "Komposé" |