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

Rename KStyle to TDEStyle to avoid conflicts with KDE4.

Browse Source
pull/2/head
Darrell Anderson 11 years ago
parent df510360d3
commit 3fce7943f4
15 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File

2
kcontrol/krdb/krdb.cpp
Unescape View File

@ -119,7 +119,7 @@ static void applyQtColors( TDEConfig& kglobals, TQSettings& settings, TQPalette&
settings.writeEntry("/qt/Palette/inactive", inactcg);
settings.writeEntry("/qt/Palette/disabled", discg);
// export twin's colors to qtrc for kstyle to use
// export twin's colors to qtrc for tdestyle to use
kglobals.setGroup("WM");
// active colors

4
kcontrol/style/kcmstyle.cpp
Unescape View File

@ -128,7 +128,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
m_bToolbarsDirty = false;
TDEGlobal::dirs()->addResourceType("themes",
TDEStandardDirs::kde_default("data") + "kstyle/themes");
TDEStandardDirs::kde_default("data") + "tdestyle/themes");
TDEAboutData *about =
new TDEAboutData( I18N_NOOP("kcmstyle"),
@ -451,7 +451,7 @@ void KCMStyle::styleSpecificConfig()
return;
}
void* allocPtr = library->symbol("allocate_kstyle_config");
void* allocPtr = library->symbol("allocate_tdestyle_config");
if (!allocPtr)
{

4
kcontrol/style/keramik/CMakeLists.txt
Unescape View File

@ -20,9 +20,9 @@ link_directories(
)
##### kstyle_keramik_config (module) ############
##### tdestyle_keramik_config (module) ############
tde_add_kpart( kstyle_keramik_config AUTOMOC
tde_add_kpart( tdestyle_keramik_config AUTOMOC
SOURCES keramikconf.cpp
LINK tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR}

10
kcontrol/style/keramik/Makefile.am
Unescape View File

@ -1,12 +1,12 @@
INCLUDES = $(all_includes)
noinst_HEADERS = keramikconf.h
kde_module_LTLIBRARIES = kstyle_keramik_config.la
kstyle_keramik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
kstyle_keramik_config_la_LIBADD = $(LIB_TDEUI)
kstyle_keramik_config_la_SOURCES = keramikconf.cpp
kde_module_LTLIBRARIES = tdestyle_keramik_config.la
tdestyle_keramik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
tdestyle_keramik_config_la_LIBADD = $(LIB_TDEUI)
tdestyle_keramik_config_la_SOURCES = keramikconf.cpp
METASOURCES = AUTO
messages:
$(XGETTEXT) *.cpp *.h -o $(podir)/kstyle_keramik_config.pot
$(XGETTEXT) *.cpp *.h -o $(podir)/tdestyle_keramik_config.pot

6
kcontrol/style/keramik/keramikconf.cpp
Unescape View File

@ -32,7 +32,7 @@ DEALINGS IN THE SOFTWARE.
extern "C"
{
KDE_EXPORT TQWidget* allocate_kstyle_config(TQWidget* parent)
KDE_EXPORT TQWidget* allocate_tdestyle_config(TQWidget* parent)
{
return new KeramikStyleConfig(parent);
}
@ -42,7 +42,7 @@ KeramikStyleConfig::KeramikStyleConfig(TQWidget* parent): TQWidget(parent)
{
//Should have no margins here, the dialog provides them
TQVBoxLayout* layout = new TQVBoxLayout(this, 0, 0);
TDEGlobal::locale()->insertCatalogue("kstyle_keramik_config");
TDEGlobal::locale()->insertCatalogue("tdestyle_keramik_config");
//highlightLineEdits = new TQCheckBox(i18n("Highlight active lineedits"), this);
highlightScrollBar = new TQCheckBox(i18n("Highlight scroll bar handles"), this);
@ -70,7 +70,7 @@ KeramikStyleConfig::KeramikStyleConfig(TQWidget* parent): TQWidget(parent)
KeramikStyleConfig::~KeramikStyleConfig()
{
TDEGlobal::locale()->removeCatalogue("kstyle_keramik_config");
TDEGlobal::locale()->removeCatalogue("tdestyle_keramik_config");
}

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

@ -330,7 +330,7 @@ void TDMAppearanceWidget::loadGuiStyles(KBackedComboBox *combo)
{
// XXX: Global + local schemes
TQStringList list = TDEGlobal::dirs()->
findAllResources("data", "kstyle/themes/*.themerc", false, true);
findAllResources("data", "tdestyle/themes/*.themerc", false, true);
for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it)
{
KSimpleConfig config(*it, true);

4
kpersonalizer/CMakeLists.txt
Unescape View File

@ -35,11 +35,11 @@ install( FILES uninstall.desktop DESTINATION ${APPS_INSTALL_DIR}/System RENAME k
tde_add_executable( kpersonalizer AUTOMOC
SOURCES
stylepreview.ui krefinepage.cpp kstylepage.cpp
stylepreview.ui krefinepage.cpp tdestylepage.cpp
keyecandypage.cpp kospage.cpp kcountrypage.cpp
kpersonalizer.cpp main.cpp kfindlanguage.cpp
kcountrypagedlg.ui kospagedlg.ui keyecandypagedlg.ui
kstylepagedlg.ui krefinepagedlg.ui ksysinfo.cpp
tdestylepagedlg.ui krefinepagedlg.ui ksysinfo.cpp
LINK tdeio-shared
DESTINATION ${BIN_INSTALL_DIR}
)

6
kpersonalizer/Makefile.am
Unescape View File

@ -1,13 +1,13 @@
bin_PROGRAMS = kpersonalizer
kpersonalizer_SOURCES = stylepreview.ui krefinepage.cpp \
kstylepage.cpp keyecandypage.cpp kospage.cpp kcountrypage.cpp kpersonalizer.cpp \
tdestylepage.cpp keyecandypage.cpp kospage.cpp kcountrypage.cpp kpersonalizer.cpp \
main.cpp kfindlanguage.cpp \
kcountrypagedlg.ui kospagedlg.ui keyecandypagedlg.ui kstylepagedlg.ui \
kcountrypagedlg.ui kospagedlg.ui keyecandypagedlg.ui tdestylepagedlg.ui \
krefinepagedlg.ui ksysinfo.cpp
kpersonalizer_LDADD = $(LIB_KIO)
EXTRA_DIST = main.cpp kpersonalizer.cpp kpersonalizer.h kpersonalizer.desktop kcountrypage.cpp kcountrypage.h kospage.cpp kospage.h keyecandypage.cpp keyecandypage.h kstylepage.cpp kstylepage.h krefinepage.cpp krefinepage.h cr16-app-kpersonalizer.png cr32-app-kpersonalizer.png README kcountrypagedlg.ui kospage.ui keyecandypagedlg.ui kstylepagedlg.ui krefinepagedlg.ui kfindlanguage.cpp kfindlanguage.h
EXTRA_DIST = main.cpp kpersonalizer.cpp kpersonalizer.h kpersonalizer.desktop kcountrypage.cpp kcountrypage.h kospage.cpp kospage.h keyecandypage.cpp keyecandypage.h tdestylepage.cpp tdestylepage.h krefinepage.cpp krefinepage.h cr16-app-kpersonalizer.png cr32-app-kpersonalizer.png README kcountrypagedlg.ui kospage.ui keyecandypagedlg.ui tdestylepagedlg.ui krefinepagedlg.ui kfindlanguage.cpp kfindlanguage.h
xdg_apps_DATA = kpersonalizer.desktop

2
kpersonalizer/TODO
Unescape View File

@ -17,7 +17,7 @@ o kospage:
- Desktop Icons are arranged after dcop-call, but we just want to align them
o krefinepage:
- quit kpersonalizer, if user starts kcontrol
o kstylepage:
o tdestylepage:
- don't hardcode the styles
- style preview
o keyecandypage:

2
kpersonalizer/kpersonalizer.cpp
Unescape View File

@ -43,7 +43,7 @@
#include "kcountrypage.h"
#include "kospage.h"
#include "keyecandypage.h"
#include "kstylepage.h"
#include "tdestylepage.h"
#include "krefinepage.h"
#include "kpersonalizer.h"

6
kpersonalizer/kstylepage.cpp → kpersonalizer/tdestylepage.cpp
Unescape View File

@ -1,5 +1,5 @@
/***************************************************************************
kstylepage.cpp - description
tdestylepage.cpp - description
-------------------
begin : Tue May 22 2001
copyright : (C) 2001 by Ralf Nolden
@ -41,7 +41,7 @@
#include <kiconloader.h>
#include "stylepreview.h"
#include "kstylepage.h"
#include "tdestylepage.h"
TDEStylePage::TDEStylePage(TQWidget *parent, const char *name ) : TDEStylePageDlg(parent,name) {
@ -581,4 +581,4 @@ TQPalette TDEStylePage::createPalette() {
return TQPalette( colgrp, disabledgrp, colgrp);
}
#include "kstylepage.moc"
#include "tdestylepage.moc"

8
kpersonalizer/kstylepage.h → kpersonalizer/tdestylepage.h
Unescape View File

@ -1,5 +1,5 @@
/***************************************************************************
kstylepage.h - description
tdestylepage.h - description
-------------------
begin : Tue May 22 2001
copyright : (C) 2001 by Ralf Nolden
@ -15,11 +15,11 @@
* *
***************************************************************************/
#ifndef KSTYLEPAGE_H
#define KSTYLEPAGE_H
#ifndef TDESTYLEPAGE_H
#define TDESTYLEPAGE_H
#include <tqcolor.h>
#include "kstylepagedlg.h"
#include "tdestylepagedlg.h"
/**Abstract class for the style page
*@author Ralf Nolden

0
kpersonalizer/kstylepagedlg.ui → kpersonalizer/tdestylepagedlg.ui
Unescape View File

7
r14-xdg-update
Unescape View File

@ -634,7 +634,12 @@ if [ ! -f $HOME/.tderc ] && [ -f $HOME/.kderc ]; then
mv $HOME/.kderc $HOME/.tderc 2>/dev/null
fi
fi
# Copy the following two rc files rather than move because the older versions are for HAL systems.
if [ -a $PROFILE_DIR/share/apps/kstyle ]; then
Message_Prefix
echo " kstyle->tdestyle"
mv $PROFILE_DIR/share/apps/kstyle $PROFILE_DIR/share/apps/tdestyle 2>/dev/null
fi
# Copy the following two rc files rather than move because the older versions are needed for HAL systems.
if [ ! -f $PROFILE_DIR/share/config/tdenetworkmanagerrc ] && [ -f $PROFILE_DIR/share/config/knetworkmanagerrc ]; then
Message_Prefix
echo " knetworkmanager->tdenetworkmanager"

2
twin/options.cpp
Unescape View File

@ -216,7 +216,7 @@ unsigned long Options::updateSettings()
// Read button tooltip animation effect from kdeglobals
// Since we want to allow users to enable window decoration tooltips
// and not kstyle tooltips and vise-versa, we don't read the
// and not tdestyle tooltips and vise-versa, we don't read the
// "EffectNoTooltip" setting from kdeglobals.
TDEConfig globalConfig("kdeglobals");
globalConfig.setGroup("KDE");

Write Preview
Loading…
Cancel
Save