diff options
Diffstat (limited to 'kcontrol/randr')
-rw-r--r-- | kcontrol/randr/CMakeLists.txt | 18 | ||||
-rw-r--r-- | kcontrol/randr/Makefile.am | 26 | ||||
-rw-r--r-- | kcontrol/randr/configdialog.cpp | 4 | ||||
-rw-r--r-- | kcontrol/randr/main.cpp | 10 | ||||
-rw-r--r-- | kcontrol/randr/tderandrapp.cpp (renamed from kcontrol/randr/krandrapp.cpp) | 6 | ||||
-rw-r--r-- | kcontrol/randr/tderandrapp.h (renamed from kcontrol/randr/krandrapp.h) | 0 | ||||
-rw-r--r-- | kcontrol/randr/tderandrbindings.cpp (renamed from kcontrol/randr/krandrbindings.cpp) | 2 | ||||
-rw-r--r-- | kcontrol/randr/tderandrinithack.cpp (renamed from kcontrol/randr/krandrinithack.cpp) | 0 | ||||
-rw-r--r-- | kcontrol/randr/tderandrmodule.cpp (renamed from kcontrol/randr/krandrmodule.cpp) | 6 | ||||
-rw-r--r-- | kcontrol/randr/tderandrmodule.h (renamed from kcontrol/randr/krandrmodule.h) | 2 | ||||
-rw-r--r-- | kcontrol/randr/tderandrpassivepopup.cpp (renamed from kcontrol/randr/krandrpassivepopup.cpp) | 4 | ||||
-rw-r--r-- | kcontrol/randr/tderandrpassivepopup.h (renamed from kcontrol/randr/krandrpassivepopup.h) | 0 | ||||
-rw-r--r-- | kcontrol/randr/tderandrtray-autostart.desktop (renamed from kcontrol/randr/krandrtray-autostart.desktop) | 4 | ||||
-rw-r--r-- | kcontrol/randr/tderandrtray.cpp (renamed from kcontrol/randr/krandrtray.cpp) | 12 | ||||
-rw-r--r-- | kcontrol/randr/tderandrtray.desktop (renamed from kcontrol/randr/krandrtray.desktop) | 2 | ||||
-rw-r--r-- | kcontrol/randr/tderandrtray.h (renamed from kcontrol/randr/krandrtray.h) | 2 |
16 files changed, 49 insertions, 49 deletions
diff --git a/kcontrol/randr/CMakeLists.txt b/kcontrol/randr/CMakeLists.txt index 3e816f2fb..d1f31af8c 100644 --- a/kcontrol/randr/CMakeLists.txt +++ b/kcontrol/randr/CMakeLists.txt @@ -22,26 +22,26 @@ link_directories( ##### other data ################################ -install( FILES krandrtray.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +install( FILES tderandrtray.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) install( FILES randr.desktop DESTINATION ${APPS_INSTALL_DIR}/.hidden ) -install( FILES krandrtray-autostart.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} ) +install( FILES tderandrtray-autostart.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} ) ##### kcm_randr (module) ######################## tde_add_kpart( kcm_randr AUTOMOC - SOURCES krandrmodule.cpp - LINK tdeui-shared krandr-shared + SOURCES tderandrmodule.cpp + LINK tdeui-shared tderandr-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) -##### krandrtray (executable) ################### +##### tderandrtray (executable) ################### -tde_add_executable( krandrtray AUTOMOC +tde_add_executable( tderandrtray AUTOMOC SOURCES - main.cpp krandrtray.cpp krandrapp.cpp - krandrpassivepopup.cpp configdialog.cpp - LINK kutils-shared krandr-shared + main.cpp tderandrtray.cpp tderandrapp.cpp + tderandrpassivepopup.cpp configdialog.cpp + LINK tdeutils-shared tderandr-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kcontrol/randr/Makefile.am b/kcontrol/randr/Makefile.am index fb55f8da7..d1f137140 100644 --- a/kcontrol/randr/Makefile.am +++ b/kcontrol/randr/Makefile.am @@ -5,32 +5,32 @@ kde_module_LTLIBRARIES = kcm_randr.la METASOURCES = AUTO -kcm_randr_la_SOURCES = krandrmodule.cpp +kcm_randr_la_SOURCES = tderandrmodule.cpp kcm_randr_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined kcm_randr_la_LIBADD = $(LIB_TDEUI) $(LIB_XRANDR) -noinst_HEADERS = krandrmodule.h krandrtray.h krandrapp.h \ - krandrpassivepopup.h configdialog.h +noinst_HEADERS = tderandrmodule.h tderandrtray.h tderandrapp.h \ + tderandrpassivepopup.h configdialog.h -xdg_apps_DATA = krandrtray.desktop +xdg_apps_DATA = tderandrtray.desktop -krandr_data_DATA = randr.desktop -krandr_datadir = $(kde_appsdir)/.hidden +tderandr_data_DATA = randr.desktop +tderandr_datadir = $(kde_appsdir)/.hidden # Autostart autostartdir = $(prefix)/share/autostart -autostart_DATA = krandrtray-autostart.desktop +autostart_DATA = tderandrtray-autostart.desktop #install-data-local: uninstall.desktop # $(mkinstalldirs) $(DESTDIR)$(kde_appsdir)/Settings/Desktop # $(INSTALL_DATA) $(srcdir)/uninstall.desktop -# $(DESTDIR)$(kde_appsdir)/Settings/Desktop/krandrmodule.desktop +# $(DESTDIR)$(kde_appsdir)/Settings/Desktop/tderandrmodule.desktop -bin_PROGRAMS = krandrtray +bin_PROGRAMS = tderandrtray -krandrtray_SOURCES = main.cpp krandrtray.cpp krandrapp.cpp krandrpassivepopup.cpp configdialog.cpp -krandrtray_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lkrandr -krandrtray_LDADD = $(LIB_KFILE) $(LIB_KUTILS) $(LIB_XRANDR) +tderandrtray_SOURCES = main.cpp tderandrtray.cpp tderandrapp.cpp tderandrpassivepopup.cpp configdialog.cpp +tderandrtray_LDFLAGS = $(all_libraries) $(KDE_RPATH) -ltderandr +tderandrtray_LDADD = $(LIB_KFILE) $(LIB_KUTILS) $(LIB_XRANDR) messages: rc.cpp - $(XGETTEXT) *.cpp -o $(podir)/krandr.pot + $(XGETTEXT) *.cpp -o $(podir)/tderandr.pot diff --git a/kcontrol/randr/configdialog.cpp b/kcontrol/randr/configdialog.cpp index 708587527..f2344f1c0 100644 --- a/kcontrol/randr/configdialog.cpp +++ b/kcontrol/randr/configdialog.cpp @@ -31,7 +31,7 @@ #include <kpopupmenu.h> #include <twinmodule.h> #include <kregexpeditorinterface.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include "configdialog.h" @@ -42,7 +42,7 @@ ConfigDialog::ConfigDialog(TDEGlobalAccel *accel, Ok, 0L, "config dialog" ) { if ( isApplet ) - setHelp( TQString::null, "krandrtray" ); + setHelp( TQString::null, "tderandrtray" ); TQFrame *w = 0L; // the parent for the widgets diff --git a/kcontrol/randr/main.cpp b/kcontrol/randr/main.cpp index 1e8edc83e..d606940fc 100644 --- a/kcontrol/randr/main.cpp +++ b/kcontrol/randr/main.cpp @@ -24,9 +24,9 @@ #include <kaboutdata.h> #include <kglobal.h> -#include "krandrapp.h" +#include "tderandrapp.h" -static const char krandrtrayVersion[] = "0.5"; +static const char tderandrtrayVersion[] = "0.5"; static const KCmdLineOptions options[] = { { "login", I18N_NOOP("Application is being auto-started at TDE session start"), 0L }, @@ -35,12 +35,12 @@ static const KCmdLineOptions options[] = int main(int argc, char **argv) { - TDEAboutData aboutData("randr", I18N_NOOP("Resize and Rotate"), krandrtrayVersion, I18N_NOOP("Resize and Rotate System Tray App"), TDEAboutData::License_GPL, "(c) 2009,2010 Timothy Pearson", 0L, ""); + TDEAboutData aboutData("randr", I18N_NOOP("Resize and Rotate"), tderandrtrayVersion, I18N_NOOP("Resize and Rotate System Tray App"), TDEAboutData::License_GPL, "(c) 2009,2010 Timothy Pearson", 0L, ""); aboutData.addAuthor("Timothy Pearson",I18N_NOOP("Developer and maintainer"), "[email protected]"); aboutData.addAuthor("Hamish Rodda",I18N_NOOP("Original developer and maintainer"), "[email protected]"); aboutData.addCredit("Lubos Lunak",I18N_NOOP("Many fixes"), "[email protected]"); - aboutData.setProductName("krandr/krandrtray"); - TDEGlobal::locale()->setMainCatalogue("krandr"); + aboutData.setProductName("tderandr/tderandrtray"); + TDEGlobal::locale()->setMainCatalogue("tderandr"); TDECmdLineArgs::init(argc,argv,&aboutData); TDECmdLineArgs::addCmdLineOptions(options); diff --git a/kcontrol/randr/krandrapp.cpp b/kcontrol/randr/tderandrapp.cpp index f5cfbbde1..e2a4b46f2 100644 --- a/kcontrol/randr/krandrapp.cpp +++ b/kcontrol/randr/tderandrapp.cpp @@ -18,10 +18,10 @@ #include <kdebug.h> -#include "krandrapp.h" -#include "krandrapp.moc" +#include "tderandrapp.h" +#include "tderandrapp.moc" -#include "krandrtray.h" +#include "tderandrtray.h" #include <X11/Xlib.h> diff --git a/kcontrol/randr/krandrapp.h b/kcontrol/randr/tderandrapp.h index 766b0056c..766b0056c 100644 --- a/kcontrol/randr/krandrapp.h +++ b/kcontrol/randr/tderandrapp.h diff --git a/kcontrol/randr/krandrbindings.cpp b/kcontrol/randr/tderandrbindings.cpp index d71057748..b7df41602 100644 --- a/kcontrol/randr/krandrbindings.cpp +++ b/kcontrol/randr/tderandrbindings.cpp @@ -26,7 +26,7 @@ #endif #define WIN KKey::QtWIN - keys->insert( "Program:krandrtray", i18n("Display Control") ); + keys->insert( "Program:tderandrtray", i18n("Display Control") ); DEF( I18N_NOOP("Switch Displays"), KShortcut(TQString("XF86Display")), KShortcut(TQString("XF86Display")), slotCycleDisplays() ); diff --git a/kcontrol/randr/krandrinithack.cpp b/kcontrol/randr/tderandrinithack.cpp index e69de29bb..e69de29bb 100644 --- a/kcontrol/randr/krandrinithack.cpp +++ b/kcontrol/randr/tderandrinithack.cpp diff --git a/kcontrol/randr/krandrmodule.cpp b/kcontrol/randr/tderandrmodule.cpp index 3eaf46f8b..9da8a569b 100644 --- a/kcontrol/randr/krandrmodule.cpp +++ b/kcontrol/randr/tderandrmodule.cpp @@ -36,15 +36,15 @@ #include <kglobal.h> #include <klocale.h> -#include "krandrmodule.h" -#include "krandrmodule.moc" +#include "tderandrmodule.h" +#include "tderandrmodule.moc" #include <X11/Xlib.h> #include <X11/extensions/Xrandr.h> // DLL Interface for kcontrol typedef KGenericFactory<KRandRModule, TQWidget > KSSFactory; -K_EXPORT_COMPONENT_FACTORY (kcm_randr, KSSFactory("krandr") ) +K_EXPORT_COMPONENT_FACTORY (kcm_randr, KSSFactory("tderandr") ) extern "C" { diff --git a/kcontrol/randr/krandrmodule.h b/kcontrol/randr/tderandrmodule.h index 53d428fe1..188b4ea1d 100644 --- a/kcontrol/randr/krandrmodule.h +++ b/kcontrol/randr/tderandrmodule.h @@ -19,7 +19,7 @@ #ifndef KRANDRMODULE_H #define KRANDRMODULE_H -#include <libkrandr/libkrandr.h> +#include <libtderandr/libtderandr.h> class TQButtonGroup; class KComboBox; diff --git a/kcontrol/randr/krandrpassivepopup.cpp b/kcontrol/randr/tderandrpassivepopup.cpp index 12d9f8a3f..16e3d75ba 100644 --- a/kcontrol/randr/krandrpassivepopup.cpp +++ b/kcontrol/randr/tderandrpassivepopup.cpp @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "krandrpassivepopup.h" +#include "tderandrpassivepopup.h" #include <kapplication.h> @@ -115,4 +115,4 @@ void KRandrPassivePopup::slotPositionSelf() positionSelf(); } -#include "krandrpassivepopup.moc" +#include "tderandrpassivepopup.moc" diff --git a/kcontrol/randr/krandrpassivepopup.h b/kcontrol/randr/tderandrpassivepopup.h index 3b1d4b4f6..3b1d4b4f6 100644 --- a/kcontrol/randr/krandrpassivepopup.h +++ b/kcontrol/randr/tderandrpassivepopup.h diff --git a/kcontrol/randr/krandrtray-autostart.desktop b/kcontrol/randr/tderandrtray-autostart.desktop index 0273a80cc..1c3f20403 100644 --- a/kcontrol/randr/krandrtray-autostart.desktop +++ b/kcontrol/randr/tderandrtray-autostart.desktop @@ -134,11 +134,11 @@ Comment[vi]=Đổi cỡ và quay màn hình X. Comment[wa]=Candjî l' grandeu eyet tourner les waitroûles X. Comment[zh_CN]=更改 X 屏幕的大小和旋转。 Comment[zh_TW]=調整大小及旋轉 X 螢幕。 -Exec=krandrtray +Exec=tderandrtray Icon=randr X-TDE-autostart-after=panel X-TDE-StartupNotify=false X-TDE-UniqueApplet=true -X-TDE-autostart-condition=krandrtrayrc:General:Autostart:true +X-TDE-autostart-condition=tderandrtrayrc:General:Autostart:true Categories=System;Applet; diff --git a/kcontrol/randr/krandrtray.cpp b/kcontrol/randr/tderandrtray.cpp index f30e3102a..42151d87e 100644 --- a/kcontrol/randr/krandrtray.cpp +++ b/kcontrol/randr/tderandrtray.cpp @@ -39,9 +39,9 @@ #include "configdialog.h" -#include "krandrtray.h" -#include "krandrpassivepopup.h" -#include "krandrtray.moc" +#include "tderandrtray.h" +#include "tderandrpassivepopup.h" +#include "tderandrtray.moc" #define OUTPUT_CONNECTED (1 << 0) #define OUTPUT_UNKNOWN (1 << 1) @@ -63,7 +63,7 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name) //printf("Reading configuration...\n\r"); globalKeys = new TDEGlobalAccel(TQT_TQOBJECT(this)); TDEGlobalAccel* keys = globalKeys; -#include "krandrbindings.cpp" +#include "tderandrbindings.cpp" // the keys need to be read from kdeglobals, not kickerrc globalKeys->readSettings(); globalKeys->setEnabled(true); @@ -95,12 +95,12 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name) } /*! - * \b TQT_SLOT which called if krandrtray is exited by the user. In this case the user + * \b TQT_SLOT which called if tderandrtray is exited by the user. In this case the user * is asked through a yes/no box if "KRandRTray should start automatically on log in" and the * result is written to the KDE configfile. */ void KRandRSystemTray::_quit (){ - r_config = new KSimpleConfig("krandrtrayrc"); + r_config = new KSimpleConfig("tderandrtrayrc"); TQString tmp1 = i18n ("Start KRandRTray automatically when you log in?"); int tmp2 = KMessageBox::questionYesNo ( 0, tmp1, i18n("Question"), i18n("Start Automatically"), i18n("Do Not Start")); diff --git a/kcontrol/randr/krandrtray.desktop b/kcontrol/randr/tderandrtray.desktop index a61f8c28c..5479287b4 100644 --- a/kcontrol/randr/krandrtray.desktop +++ b/kcontrol/randr/tderandrtray.desktop @@ -134,7 +134,7 @@ Comment[vi]=Đổi cỡ và quay màn hình X. Comment[wa]=Candjî l' grandeu eyet tourner les waitroûles X. Comment[zh_CN]=更改 X 屏幕的大小和旋转。 Comment[zh_TW]=調整大小及旋轉 X 螢幕。 -Exec=krandrtray +Exec=tderandrtray Icon=randr Type=Application OnlyShowIn=TDE; diff --git a/kcontrol/randr/krandrtray.h b/kcontrol/randr/tderandrtray.h index 8a910f373..320f0cb1c 100644 --- a/kcontrol/randr/krandrtray.h +++ b/kcontrol/randr/tderandrtray.h @@ -24,7 +24,7 @@ #include <ksystemtray.h> #include <kglobalaccel.h> -#include <libkrandr/libkrandr.h> +#include <libtderandr/libtderandr.h> #include <tdehardwaredevices.h> class KHelpMenu; |