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

Rename kdisplay for enhanced compatibility with KDE4

Browse Source
pull/2/head
Timothy Pearson 11 years ago
parent 301ad20ded
commit 3e5506b29b
25 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File

6
kcontrol/colors/colorscm.cpp
Unescape View File

@ -560,7 +560,7 @@ void KColorScheme::slotAdd()
}
else
{
sFile = TDEGlobal::dirs()->saveLocation("data", "kdisplay/color-schemes/") + sFile + ".kcsrc";
sFile = TDEGlobal::dirs()->saveLocation("data", "tdedisplay/color-schemes/") + sFile + ".kcsrc";
KSimpleConfig *config = new KSimpleConfig(sFile);
config->setGroup( "Color Scheme");
config->writeEntry("Name", sName);
@ -580,7 +580,7 @@ void KColorScheme::slotAdd()
void KColorScheme::slotImport()
{
TQString location = locateLocal( "data", "kdisplay/color-schemes/" );
TQString location = locateLocal( "data", "tdedisplay/color-schemes/" );
KURL file ( KFileDialog::getOpenFileName(TQString::null, "*.kcsrc", this) );
if ( file.isEmpty() )
@ -861,7 +861,7 @@ void KColorScheme::readSchemeNames()
// Global + local schemes
TQStringList list = TDEGlobal::dirs()->findAllResources("data",
"kdisplay/color-schemes/*.kcsrc", false, true);
"tdedisplay/color-schemes/*.kcsrc", false, true);
// And add them
for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) {

4
kcontrol/displayconfig/displayconfig.cpp
Unescape View File

@ -749,11 +749,11 @@ KDisplayConfig::KDisplayConfig(TQWidget *parent, const char *name, const TQStrin
TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
if (getuid() != 0) {
systemconfig = new KSimpleConfig( locateLocal("config", "kdisplay/", true) + "kdisplayconfigrc" );
systemconfig = new KSimpleConfig( locateLocal("config", "tdedisplay/", true) + "tdedisplayconfigrc" );
systemconfig->setFileWriteMode(0600);
}
else {
systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdisplay/kdisplayconfigrc" ));
systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdedisplay/tdedisplayconfigrc" ));
systemconfig->setFileWriteMode(0644);
}

2
kcontrol/fonts/fonts.h
Unescape View File

@ -1,6 +1,6 @@
//-----------------------------------------------------------------------------
//
// kdisplay, fonts tab
// tdedisplay, fonts tab
//
// Copyright (c) Mark Donohoe 1997
// Lars Knoll 1999

2
kcontrol/krdb/ad/CMakeLists.txt
Unescape View File

@ -13,7 +13,7 @@ install( FILES
AAAAAAGeneral.ad AAAMotif.ad AAATk.ad AAAXaw.ad AcroRead.ad
Editres.ad Emacs.ad GV.ad ML.ad Nedit.ad Netscape.ad RVPlayer.ad
WPerfect.ad XCalc.ad Xawtv.ad Xdvi.ad XTerm.ad XOsview.ad XV.ad Xpdf.ad
DESTINATION ${DATA_INSTALL_DIR}/kdisplay/app-defaults )
DESTINATION ${DATA_INSTALL_DIR}/tdedisplay/app-defaults )
install( PROGRAMS
krdb

6
kcontrol/krdb/ad/Makefile.am
Unescape View File

@ -1,13 +1,13 @@
AM_CPPFLAGS = $(all_includes)
kdisplay_defaults_data_DATA = AAAAAAGeneral.ad AAAMotif.ad AAATk.ad AAAXaw.ad AcroRead.ad \
tdedisplay_defaults_data_DATA = AAAAAAGeneral.ad AAAMotif.ad AAATk.ad AAAXaw.ad AcroRead.ad \
Editres.ad Emacs.ad GV.ad ML.ad Nedit.ad Netscape.ad RVPlayer.ad \
WPerfect.ad XCalc.ad Xawtv.ad Xdvi.ad XTerm.ad XOsview.ad XV.ad Xpdf.ad
kdisplay_defaults_datadir = $(kde_datadir)/kdisplay/app-defaults
tdedisplay_defaults_datadir = $(kde_datadir)/tdedisplay/app-defaults
EXTRA_DIST = $(kdisplay_defaults_data_DATA)
EXTRA_DIST = $(tdedisplay_defaults_data_DATA)
bin_SCRIPTS = krdb

4
kcontrol/krdb/ad/README
Unescape View File

@ -35,11 +35,11 @@ Their meaning should be obvious to anyone familiar with
KDE's desktop wide resources. Install your application
default file either in
$(TDEDIR)/share/apps/kdisplay/app-defaults
$(TDEDIR)/share/apps/tdedisplay/app-defaults
or
$(HOME)/.trinity/share/apps/kdisplay/app-defaults
$(HOME)/.trinity/share/apps/tdedisplay/app-defaults
so that it is available to krdb for reading. If you want to
override a system file simply copy it to your user

2
kcontrol/krdb/kcs/CMakeLists.txt
Unescape View File

@ -17,4 +17,4 @@ install( FILES
KDEOne.kcsrc KDETwo.kcsrc MediaPeach.kcsrc Windows95.kcsrc EveX.kcsrc
WindowsXP.kcsrc Keramik.kcsrc KeramikEmerald.kcsrc KeramikWhite.kcsrc
BlackOnWhite.kcsrc WhiteOnBlack.kcsrc YellowOnBlue.kcsrc Plastik.kcsrc
DESTINATION ${DATA_INSTALL_DIR}/kdisplay/color-schemes )
DESTINATION ${DATA_INSTALL_DIR}/tdedisplay/color-schemes )

6
kcontrol/krdb/kcs/Makefile.am
Unescape View File

@ -1,5 +1,5 @@
kdisplay_colorschemes_data_DATA = AtlasGreen.kcsrc BeOS.kcsrc BlueSlate.kcsrc \
tdedisplay_colorschemes_data_DATA = AtlasGreen.kcsrc BeOS.kcsrc BlueSlate.kcsrc \
CDE.kcsrc DarkBlue.kcsrc DesertRed.kcsrc DigitalCDE.kcsrc \
PaleGray.kcsrc Pumpkin.kcsrc SolarisCDE.kcsrc Storm.kcsrc \
Windows2000.kcsrc System.kcsrc Next.kcsrc PointReyesGreen.kcsrc \
@ -7,6 +7,6 @@ kdisplay_colorschemes_data_DATA = AtlasGreen.kcsrc BeOS.kcsrc BlueSlate.kcsrc \
WindowsXP.kcsrc Keramik.kcsrc KeramikEmerald.kcsrc KeramikWhite.kcsrc \
BlackOnWhite.kcsrc WhiteOnBlack.kcsrc YellowOnBlue.kcsrc Plastik.kcsrc
kdisplay_colorschemes_datadir = $(kde_datadir)/kdisplay/color-schemes
tdedisplay_colorschemes_datadir = $(kde_datadir)/tdedisplay/color-schemes
EXTRA_DIST = $(kdisplay_colorschemes_data_DATA)
EXTRA_DIST = $(tdedisplay_colorschemes_data_DATA)

2
kcontrol/krdb/krdb.cpp
Unescape View File

@ -444,7 +444,7 @@ void runRdb( uint flags )
// Export colors to non-(KDE/Qt) apps (e.g. Motif, GTK+ apps)
if (exportColors)
{
TDEGlobal::dirs()->addResourceType("appdefaults", TDEStandardDirs::kde_default("data") + "kdisplay/app-defaults/");
TDEGlobal::dirs()->addResourceType("appdefaults", TDEStandardDirs::kde_default("data") + "tdedisplay/app-defaults/");
TQColorGroup cg = newPal.active();
TDEGlobal::locale()->insertCatalogue("krdb");
createGtkrc( true, cg, 1 );

2
kcontrol/kthememanager/ktheme.cpp
Unescape View File

@ -528,7 +528,7 @@ void KTheme::apply()
TQDomNodeList colorList = colorsElem.childNodes();
TDEConfig * colorConf = TDEGlobal::config();
TQString sCurrentScheme = locateLocal("data", "kdisplay/color-schemes/thememgr.kcsrc");
TQString sCurrentScheme = locateLocal("data", "tdedisplay/color-schemes/thememgr.kcsrc");
KSimpleConfig *colorScheme = new KSimpleConfig( sCurrentScheme );
colorScheme->setGroup("Color Scheme" );

2
kcontrol/tdm/tdm-appear.cpp
Unescape View File

@ -309,7 +309,7 @@ void TDMAppearanceWidget::loadColorSchemes(KBackedComboBox *combo)
{
// XXX: Global + local schemes
TQStringList list = TDEGlobal::dirs()->
findAllResources("data", "kdisplay/color-schemes/*.kcsrc", false, true);
findAllResources("data", "tdedisplay/color-schemes/*.kcsrc", false, true);
for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it)
{
KSimpleConfig config(*it, true);

2
kicker/applets/clock/clock.cpp
Unescape View File

@ -919,7 +919,7 @@ ClockApplet::ClockApplet(const TQString& configFile, Type t, int actions,
connect(m_layoutTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(fixupLayout()));
connect(_timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotUpdate()));
connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(globalPaletteChange()));
connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(globalPaletteChange()));
reconfigure(); // initialize clock widget
slotUpdate();

2
kicker/extensions/taskbar/taskbarextension.cpp
Unescape View File

@ -70,7 +70,7 @@ TaskBarExtension::TaskBarExtension(const TQString& configFile, Type type,
connectDCOPSignal("kicker", "kicker", "configurationChanged()",
"configure()", false);
connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()),
connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()),
TQT_SLOT(setBackgroundTheme()));
TQTimer::singleShot(0, this, TQT_SLOT(setBackgroundTheme()));

2
kicker/kicker/core/container_extension.cpp
Unescape View File

@ -168,7 +168,7 @@ void ExtensionContainer::init()
installEventFilter(this); // for mouse event handling
connect(Kicker::the(), TQT_SIGNAL(kdisplayPaletteChanged()), this, TQT_SLOT(updateHighlightColor()));
connect(Kicker::the(), TQT_SIGNAL(tdedisplayPaletteChanged()), this, TQT_SLOT(updateHighlightColor()));
updateHighlightColor();
// if we were hidden when kicker quit, let's start out hidden as well!

2
kicker/kicker/core/containerarea.cpp
Unescape View File

@ -104,7 +104,7 @@ ContainerArea::ContainerArea(TDEConfig* _c,
setBackground();
connect(&_autoScrollTimer, TQT_SIGNAL(timeout()), TQT_SLOT(autoScroll()));
connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(setBackground()));
connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(setBackground()));
connect(Kicker::the(), TQT_SIGNAL(immutabilityChanged(bool)),
TQT_SLOT(immutabilityChanged(bool)));
connect(this, TQT_SIGNAL(contentsMoving(int, int)), TQT_SLOT(setBackground()));

2
kicker/kicker/core/extensionmanager.cpp
Unescape View File

@ -211,7 +211,7 @@ void ExtensionManager::configureMenubar(bool duringInit)
updateMenubar();
m_menubarPanel->show();
connect(kapp, TQT_SIGNAL(kdisplayFontChanged()), TQT_SLOT(updateMenubar()));
connect(kapp, TQT_SIGNAL(tdedisplayFontChanged()), TQT_SLOT(updateMenubar()));
}
else if (m_menubarPanel)
{

4
kicker/kicker/core/kicker.cpp
Unescape View File

@ -125,8 +125,8 @@ Kicker::Kicker()
configure();
connect(this, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int)));
connect(this, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(paletteChanged()));
connect(this, TQT_SIGNAL(kdisplayStyleChanged()), TQT_SLOT(slotStyleChanged()));
connect(this, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(paletteChanged()));
connect(this, TQT_SIGNAL(tdedisplayStyleChanged()), TQT_SLOT(slotStyleChanged()));
#if (TQT_VERSION-0 >= 0x030200) // XRANDR support
connect(desktop(), TQT_SIGNAL(resized(int)), TQT_SLOT(slotDesktopResized()));

4
kicker/kicker/ui/k_mnu.cpp
Unescape View File

@ -247,9 +247,9 @@ void PanelKMenu::initialize()
if (loadSidePixmap())
{
// in case we've been through here before, let's disconnect
disconnect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()),
disconnect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()),
this, TQT_SLOT(paletteChanged()));
connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()),
connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()),
this, TQT_SLOT(paletteChanged()));
}
else

4
kicker/kicker/ui/k_new_mnu.cpp
Unescape View File

@ -1198,9 +1198,9 @@ void KMenu::initialize()
kdDebug(1210) << "KMenu::initialize()" << endl;
// in case we've been through here before, let's disconnect
disconnect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()),
disconnect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()),
this, TQT_SLOT(paletteChanged()));
connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()),
connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()),
this, TQT_SLOT(paletteChanged()));
/*

2
kicker/menuext/tom/tom.cc
Unescape View File

@ -432,7 +432,7 @@ void TOM::initialize()
}
else
{
connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(paletteChanged()));
connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(paletteChanged()));
}*/
// TASKS

2
konqueror/konq_mainwindow.cc
Unescape View File

@ -223,7 +223,7 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con
connect( KSycoca::self(), TQT_SIGNAL( databaseChanged() ),
this, TQT_SLOT( slotDatabaseChanged() ) );
connect( kapp, TQT_SIGNAL( kdisplayFontChanged()), TQT_SLOT(slotReconfigure()));
connect( kapp, TQT_SIGNAL( tdedisplayFontChanged()), TQT_SLOT(slotReconfigure()));
//load the xmlui file specified in the profile or the default konqueror.rc
setXMLFile( xmluiFile );

2
konsole/konsole/konsole.cpp
Unescape View File

@ -344,7 +344,7 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo
if (te) te->setScrollbarLocation(TEWidget::SCRNONE);
}
// connect(kapp, TQT_SIGNAL(kdisplayFontChanged()), this, TQT_SLOT(slotFontChanged()));
// connect(kapp, TQT_SIGNAL(tdedisplayFontChanged()), this, TQT_SLOT(slotFontChanged()));
kapp->dcopClient()->setDefaultObject( "konsole" );

2
kpersonalizer/kstylepage.cpp
Unescape View File

@ -324,7 +324,7 @@ void KStylePage::getColors(colorSet *set, bool colorfile ){
bool deleteConfig = false;
// get the color scheme file and go to the color scheme group
if(colorfile){
TDEGlobal::dirs()->addResourceType("colors", TDEStandardDirs::kde_default("data")+"kdisplay/color-schemes");
TDEGlobal::dirs()->addResourceType("colors", TDEStandardDirs::kde_default("data")+"tdedisplay/color-schemes");
// set the style
if (kde->isSelected()) {
set->bgMode="Flat";

2
tdm/kfrontend/kgapp.cpp
Unescape View File

@ -316,7 +316,7 @@ kg_main( const char *argv0 )
app->setStyle( _GUIStyle );
}
_colorScheme = locate( "data", "kdisplay/color-schemes/" + _colorScheme + ".kcsrc" );
_colorScheme = locate( "data", "tdedisplay/color-schemes/" + _colorScheme + ".kcsrc" );
if (!_colorScheme.isEmpty()) {
KSimpleConfig config( _colorScheme, true );
config.setGroup( "Color Scheme" );

2
twin/kcmtwin/twinoptions/mouse.cpp
Unescape View File

@ -366,7 +366,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, TDEConfig *_co
coMax[b]->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ));
}
connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(paletteChanged()));
connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(paletteChanged()));
layout->addStretch();

Write Preview
Loading…
Cancel
Save