Rename KStyle to TDEStyle to avoid conflicts with KDE4.

pull/1/head
Darrell Anderson 11 years ago
parent d4eaf37eb2
commit 538c0cd4b6

@ -24,7 +24,7 @@ The following options may be supplied to cmake:
-DQTC_STYLE_SUPPORT=true -DQTC_STYLE_SUPPORT=true
Support QtCurve style files. These are stored as Support QtCurve style files. These are stored as
<kde prefix>/share/apps/kstyle/themes/qtc_<stylename>.themerc <kde prefix>/share/apps/tdestyle/themes/qtc_<stylename>.themerc
-DQTC_ENABLE_PARENTLESS_DIALOG_FIX_SUPPORT=true -DQTC_ENABLE_PARENTLESS_DIALOG_FIX_SUPPORT=true
Enable support for the 'fixParentlessDialogs' config option. NOTE: This is Enable support for the 'fixParentlessDialogs' config option. NOTE: This is
@ -51,9 +51,9 @@ format:
....rest of qtcurve settings... ....rest of qtcurve settings...
To use this theme, either copy qtc_<name>.themerc to To use this theme, either copy qtc_<name>.themerc to
$TDEHOME/share/apps/kstyle/themes/ (usually ~/.trinity/share/apps/kstyle/themes/) $TDEHOME/share/apps/tdestyle/themes/ (usually ~/.trinity/share/apps/tdestyle/themes/)
or copy to <kde install prefix>/share/apps/kstyle/themes/ (usually or copy to <kde install prefix>/share/apps/tdestyle/themes/ (usually
/usr/share/apps/kstyle/themes/) /usr/share/apps/tdestyle/themes/)
When KDE's style panel is restarted, your new theme should appear in the list. When KDE's style panel is restarted, your new theme should appear in the list.

@ -104,7 +104,7 @@ typedef gchar ** Strings;
/* qtc_<theme name>.themerc support */ /* qtc_<theme name>.themerc support */
#define KDE_PREFIX(V) ((4==(V)) ? KDE4PREFIX : KDE3PREFIX) #define KDE_PREFIX(V) ((4==(V)) ? KDE4PREFIX : KDE3PREFIX)
#define THEME_DIR "/share/apps/kstyle/themes/" #define THEME_DIR "/share/apps/tdestyle/themes/"
#define THEME_DIR4 "/share/kde4/apps/kstyle/themes/" #define THEME_DIR4 "/share/kde4/apps/kstyle/themes/"
#define THEME_PREFIX "qtc_" #define THEME_PREFIX "qtc_"
#define THEME_SUFFIX ".themerc" #define THEME_SUFFIX ".themerc"

@ -24,9 +24,9 @@ link_directories(
) )
##### kstyle_qtcurve_config ##################### ##### tdestyle_qtcurve_config #####################
set( target kstyle_qtcurve_config ) set( target tdestyle_qtcurve_config )
set( ${target}_SRCS set( ${target}_SRCS
qtcurveconfig.cpp exportthemedialog.cpp qtcurveconfigbase.ui qtcurveconfig.cpp exportthemedialog.cpp qtcurveconfigbase.ui

@ -62,7 +62,7 @@
extern "C" extern "C"
{ {
TQWidget * allocate_kstyle_config(TQWidget *parent) TQWidget * allocate_tdestyle_config(TQWidget *parent)
{ {
TDEGlobal::locale()->insertCatalogue("qtcurve"); TDEGlobal::locale()->insertCatalogue("qtcurve");
return new QtCurveConfig(parent); return new QtCurveConfig(parent);

@ -29,7 +29,7 @@ link_directories(
##### other data ################################ ##### other data ################################
install( FILES qtcurve.themerc DESTINATION ${DATA_INSTALL_DIR}/kstyle/themes ) install( FILES qtcurve.themerc DESTINATION ${DATA_INSTALL_DIR}/tdestyle/themes )
##### plastik ################################### ##### plastik ###################################

@ -1349,7 +1349,7 @@ TQRect TQtCTDEStyle::querySubControlMetrics( ComplexControl control,
return ret; return ret;
} }
static const char * const kstyle_close_xpm[] = { static const char * const tdestyle_close_xpm[] = {
"12 12 2 1", "12 12 2 1",
"# c #000000", "# c #000000",
". c None", ". c None",
@ -1366,7 +1366,7 @@ static const char * const kstyle_close_xpm[] = {
"............", "............",
"............"}; "............"};
static const char * const kstyle_maximize_xpm[]={ static const char * const tdestyle_maximize_xpm[]={
"12 12 2 1", "12 12 2 1",
"# c #000000", "# c #000000",
". c None", ". c None",
@ -1384,7 +1384,7 @@ static const char * const kstyle_maximize_xpm[]={
"............"}; "............"};
static const char * const kstyle_minimize_xpm[] = { static const char * const tdestyle_minimize_xpm[] = {
"12 12 2 1", "12 12 2 1",
"# c #000000", "# c #000000",
". c None", ". c None",
@ -1401,7 +1401,7 @@ static const char * const kstyle_minimize_xpm[] = {
"............", "............",
"............"}; "............"};
static const char * const kstyle_normalizeup_xpm[] = { static const char * const tdestyle_normalizeup_xpm[] = {
"12 12 2 1", "12 12 2 1",
"# c #000000", "# c #000000",
". c None", ". c None",
@ -1419,7 +1419,7 @@ static const char * const kstyle_normalizeup_xpm[] = {
"............"}; "............"};
static const char * const kstyle_shade_xpm[] = { static const char * const tdestyle_shade_xpm[] = {
"12 12 2 1", "12 12 2 1",
"# c #000000", "# c #000000",
". c None", ". c None",
@ -1436,7 +1436,7 @@ static const char * const kstyle_shade_xpm[] = {
"............", "............",
"............"}; "............"};
static const char * const kstyle_unshade_xpm[] = { static const char * const tdestyle_unshade_xpm[] = {
"12 12 2 1", "12 12 2 1",
"# c #000000", "# c #000000",
". c None", ". c None",
@ -1599,17 +1599,17 @@ TQPixmap TQtCTDEStyle::stylePixmap( StylePixmap stylepixmap,
{ {
switch (stylepixmap) { switch (stylepixmap) {
case SP_TitleBarShadeButton: case SP_TitleBarShadeButton:
return TQPixmap(const_cast<const char**>(kstyle_shade_xpm)); return TQPixmap(const_cast<const char**>(tdestyle_shade_xpm));
case SP_TitleBarUnshadeButton: case SP_TitleBarUnshadeButton:
return TQPixmap(const_cast<const char**>(kstyle_unshade_xpm)); return TQPixmap(const_cast<const char**>(tdestyle_unshade_xpm));
case SP_TitleBarNormalButton: case SP_TitleBarNormalButton:
return TQPixmap(const_cast<const char**>(kstyle_normalizeup_xpm)); return TQPixmap(const_cast<const char**>(tdestyle_normalizeup_xpm));
case SP_TitleBarMinButton: case SP_TitleBarMinButton:
return TQPixmap(const_cast<const char**>(kstyle_minimize_xpm)); return TQPixmap(const_cast<const char**>(tdestyle_minimize_xpm));
case SP_TitleBarMaxButton: case SP_TitleBarMaxButton:
return TQPixmap(const_cast<const char**>(kstyle_maximize_xpm)); return TQPixmap(const_cast<const char**>(tdestyle_maximize_xpm));
case SP_TitleBarCloseButton: case SP_TitleBarCloseButton:
return TQPixmap(const_cast<const char**>(kstyle_close_xpm)); return TQPixmap(const_cast<const char**>(tdestyle_close_xpm));
case SP_DockWindowCloseButton: case SP_DockWindowCloseButton:
return TQPixmap(const_cast<const char**>(dock_window_close_xpm )); return TQPixmap(const_cast<const char**>(dock_window_close_xpm ));
case SP_MessageBoxInformation: case SP_MessageBoxInformation:

@ -24,8 +24,8 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#ifndef __TQTC_KSTYLE_H #ifndef __TQTC_TDESTYLE_H
#define __TQTC_KSTYLE_H #define __TQTC_TDESTYLE_H
// W A R N I N G // W A R N I N G
// ------------- // -------------

@ -1,6 +1,6 @@
[Misc] [Misc]
Name=QtCurve Name=QtCurve
Comment=Highly configurable style Comment=Highly configurable style
ConfigPage=kstyle_qtcurve_config ConfigPage=tdestyle_qtcurve_config
[KDE] [KDE]
WidgetStyle=QtCurve WidgetStyle=QtCurve

Loading…
Cancel
Save