TDE
/
tde-style-baghira
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tde-style-baghira
0
0
Fork 0
Code Issues Releases Wiki Activity

Update to new style API

Browse Source 
Rename KStyle to TDEStyle

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/1/head
Slávek Banko 9 years ago
parent 931f305a78
commit 42573cc6b4
13 changed files with 464 additions and 345 deletions
Show Stats Download Patch File Download Diff File

2
bab/main.cpp
Unescape View File

@ -204,7 +204,7 @@ void bab::configureBaghira()
// any errors that arise // any errors that arise
KLibLoader* loader = KLibLoader::self(); KLibLoader* loader = KLibLoader::self();
KLibrary* library = loader->library( TQFile::encodeName("kstyle_baghira_config") ); KLibrary* library = loader->library( TQFile::encodeName("tdestyle_baghira_config") );
if (!library) if (!library)
{ {
tqWarning("There was an error loading the configuration dialog for this style."); tqWarning("There was an error loading the configuration dialog for this style.");

16
config/Makefile.am
Unescape View File

@ -1,21 +1,21 @@
INCLUDES = $(all_includes) INCLUDES = $(all_includes)
noinst_HEADERS = about.h configdialog.h help.h kstyle_baghira_config.h colordialog.h colorpicker.h noinst_HEADERS = about.h configdialog.h help.h tdestyle_baghira_config.h colordialog.h colorpicker.h
METASOURCES = AUTO METASOURCES = AUTO
# Install this plugin in the KDE modules directory # Install this plugin in the KDE modules directory
kde_module_LTLIBRARIES = kstyle_baghira_config.la kde_module_LTLIBRARIES = tdestyle_baghira_config.la
kstyle_baghira_config_la_SOURCES = kstyle_baghira_config.cpp colordialog.cpp colorpicker.cpp configdialog.ui help.ui about.ui tdestyle_baghira_config_la_SOURCES = tdestyle_baghira_config.cpp colordialog.cpp colorpicker.cpp configdialog.ui help.ui about.ui
# kstyle_baghira_config_la_METASOURCES = AUTO # tdestyle_baghira_config_la_METASOURCES = AUTO
kstyle_baghira_config_la_LIBADD = $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) tdestyle_baghira_config_la_LIBADD = $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
kstyle_baghira_config_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined $(KDE_PLUGIN) tdestyle_baghira_config_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined $(KDE_PLUGIN)
messages: rc.cpp messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kstyle_baghira_config.pot $(XGETTEXT) *.cpp -o $(podir)/tdestyle_baghira_config.pot
pixmaps.h: $(srcdir)/generatePixmaps.sh pixmaps.h: $(srcdir)/generatePixmaps.sh
$(SHELL) $(srcdir)/generatePixmaps.sh $(top_srcdir) $(SHELL) $(srcdir)/generatePixmaps.sh $(top_srcdir)
CLEANFILES = pixmaps.h CLEANFILES = pixmaps.h
kstyle_baghira_config.lo: pixmaps.h tdestyle_baghira_config.lo: pixmaps.h

92
config/kstyle_baghira_config.cpp → config/tdestyle_baghira_config.cpp
Unescape View File

@ -57,7 +57,7 @@
#include <X11/Xutil.h> #include <X11/Xutil.h>
#include <fixx11h.h> #include <fixx11h.h>
#include "kstyle_baghira_config.h" #include "tdestyle_baghira_config.h"
#include "pixmaps.h" #include "pixmaps.h"
#include "colordialog.h" #include "colordialog.h"
#include "colorpicker.h" #include "colorpicker.h"
@ -101,31 +101,31 @@
if ( B < 0 ) B = 0; else if ( B > 255 ) B = 255; if ( B < 0 ) B = 0; else if ( B > 255 ) B = 255;
void kstyle_baghira_config::openHtml1() void tdestyle_baghira_config::openHtml1()
{ {
TQStringList args; TQStringList args;
args << "exec" << "http://baghira.sf.net/"; args << "exec" << "http://baghira.sf.net/";
kapp->tdeinitExec("kfmclient", args); kapp->tdeinitExec("kfmclient", args);
} }
void kstyle_baghira_config::openHtml2() void tdestyle_baghira_config::openHtml2()
{ {
TQStringList args; TQStringList args;
args << "exec" << "http://www.sf.net/projects/baghira/files/"; args << "exec" << "http://www.sf.net/projects/baghira/files/";
kapp->tdeinitExec("kfmclient", args); kapp->tdeinitExec("kfmclient", args);
} }
void kstyle_baghira_config::startBab() void tdestyle_baghira_config::startBab()
{ {
kapp->tdeinitExec("bab"); kapp->tdeinitExec("bab");
} }
void kstyle_baghira_config::startKRuler() void tdestyle_baghira_config::startKRuler()
{ {
kapp->tdeinitExec("kruler"); kapp->tdeinitExec("kruler");
} }
TQImage* kstyle_baghira_config::tintButton(TQImage &src, TQColor c) TQImage* tdestyle_baghira_config::tintButton(TQImage &src, TQColor c)
{ {
TQImage *dest = new TQImage( src.width(), src.height(), 32, 0 ); TQImage *dest = new TQImage( src.width(), src.height(), 32, 0 );
dest->setAlphaBuffer( true ); dest->setAlphaBuffer( true );
@ -154,7 +154,7 @@ TQImage* kstyle_baghira_config::tintButton(TQImage &src, TQColor c)
return ( dest ); return ( dest );
} }
TQImage* kstyle_baghira_config::tintBrush( TQImage &img, TQColor c) TQImage* tdestyle_baghira_config::tintBrush( TQImage &img, TQColor c)
{ {
TQImage *dest = new TQImage( img.width(), img.height(), 32, 0 ); TQImage *dest = new TQImage( img.width(), img.height(), 32, 0 );
unsigned int *data = ( unsigned int * ) img.bits(); unsigned int *data = ( unsigned int * ) img.bits();
@ -184,7 +184,7 @@ TQImage* kstyle_baghira_config::tintBrush( TQImage &img, TQColor c)
return ( dest ); return ( dest );
} }
void kstyle_baghira_config::sliderButtonRedChanged(int value) void tdestyle_baghira_config::sliderButtonRedChanged(int value)
{ {
sliderButtonRedValue = value; sliderButtonRedValue = value;
dialog_->valueButtonRed->setNum(value); dialog_->valueButtonRed->setNum(value);
@ -193,7 +193,7 @@ void kstyle_baghira_config::sliderButtonRedChanged(int value)
configChanged(); configChanged();
} }
void kstyle_baghira_config::sliderButtonGreenChanged(int value) void tdestyle_baghira_config::sliderButtonGreenChanged(int value)
{ {
sliderButtonGreenValue = value; sliderButtonGreenValue = value;
dialog_->valueButtonGreen->setNum(value); dialog_->valueButtonGreen->setNum(value);
@ -202,7 +202,7 @@ void kstyle_baghira_config::sliderButtonGreenChanged(int value)
configChanged(); configChanged();
} }
void kstyle_baghira_config::sliderButtonBlueChanged(int value) void tdestyle_baghira_config::sliderButtonBlueChanged(int value)
{ {
sliderButtonBlueValue = value; sliderButtonBlueValue = value;
dialog_->valueButtonBlue->setNum(value); dialog_->valueButtonBlue->setNum(value);
@ -211,7 +211,7 @@ void kstyle_baghira_config::sliderButtonBlueChanged(int value)
configChanged(); configChanged();
} }
void kstyle_baghira_config::sliderBrushRedChanged(int value) void tdestyle_baghira_config::sliderBrushRedChanged(int value)
{ {
sliderBrushRedValue = value; sliderBrushRedValue = value;
dialog_->pixmapBrushPreview->setPixmap(*tintBrush(baseImage2, TQColor(sliderBrushRedValue, sliderBrushGreenValue, sliderBrushBlueValue))); dialog_->pixmapBrushPreview->setPixmap(*tintBrush(baseImage2, TQColor(sliderBrushRedValue, sliderBrushGreenValue, sliderBrushBlueValue)));
@ -219,7 +219,7 @@ void kstyle_baghira_config::sliderBrushRedChanged(int value)
configChanged(); configChanged();
} }
void kstyle_baghira_config::sliderBrushGreenChanged(int value) void tdestyle_baghira_config::sliderBrushGreenChanged(int value)
{ {
sliderBrushGreenValue = value; sliderBrushGreenValue = value;
dialog_->pixmapBrushPreview->setPixmap(*tintBrush(baseImage2, TQColor(sliderBrushRedValue, sliderBrushGreenValue, sliderBrushBlueValue))); dialog_->pixmapBrushPreview->setPixmap(*tintBrush(baseImage2, TQColor(sliderBrushRedValue, sliderBrushGreenValue, sliderBrushBlueValue)));
@ -227,7 +227,7 @@ void kstyle_baghira_config::sliderBrushGreenChanged(int value)
configChanged(); configChanged();
} }
void kstyle_baghira_config::sliderBrushBlueChanged(int value) void tdestyle_baghira_config::sliderBrushBlueChanged(int value)
{ {
sliderBrushBlueValue = value; sliderBrushBlueValue = value;
dialog_->pixmapBrushPreview->setPixmap(*tintBrush(baseImage2, TQColor(sliderBrushRedValue, sliderBrushGreenValue, sliderBrushBlueValue))); dialog_->pixmapBrushPreview->setPixmap(*tintBrush(baseImage2, TQColor(sliderBrushRedValue, sliderBrushGreenValue, sliderBrushBlueValue)));
@ -235,7 +235,7 @@ void kstyle_baghira_config::sliderBrushBlueChanged(int value)
configChanged(); configChanged();
} }
// void kstyle_baghira_config::sliderBrushSaturationChanged(int value) // void tdestyle_baghira_config::sliderBrushSaturationChanged(int value)
// { // {
// sliderBrushSaturationValue = value; // sliderBrushSaturationValue = value;
// dialog_->pixmapBrushPreview->setPixmap(*tintBrush(baseImage2, TQColor(sliderBrushRedValue, sliderBrushGreenValue, sliderBrushBlueValue), sliderBrushSaturationValue)); // dialog_->pixmapBrushPreview->setPixmap(*tintBrush(baseImage2, TQColor(sliderBrushRedValue, sliderBrushGreenValue, sliderBrushBlueValue), sliderBrushSaturationValue));
@ -255,14 +255,14 @@ int presetColor[NUMBEROFCOLORS][3] = {{84,144,218},{130,170,190},{103,118,134},{
// -------------------------------- // --------------------------------
typedef KGenericFactory<kstyle_baghira_config, TQWidget> kstyle_baghira_configFactory; typedef KGenericFactory<tdestyle_baghira_config, TQWidget> tdestyle_baghira_configFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_kstyle_baghira_config, kstyle_baghira_configFactory("kcmkstyle_baghira_config")) K_EXPORT_COMPONENT_FACTORY( tdecm_tdestyle_baghira_config, tdestyle_baghira_configFactory("tdecmtdestyle_baghira_config"))
//extern TQImage uic_findImage(const TQString& name); //extern TQImage uic_findImage(const TQString& name);
//extern void qInitImages_baghira(); //extern void qInitImages_baghira();
//extern void qCleanupImages_baghira(); //extern void qCleanupImages_baghira();
void kstyle_baghira_config::updateCR() void tdestyle_baghira_config::updateCR()
{ {
if (!about_->isShown()) if (!about_->isShown())
{ {
@ -276,7 +276,7 @@ void kstyle_baghira_config::updateCR()
about_->crLabel->setText(crNotes[crCurrent]); about_->crLabel->setText(crNotes[crCurrent]);
} }
void kstyle_baghira_config::showAbout() void tdestyle_baghira_config::showAbout()
{ {
crCurrent = 0; crCurrent = 0;
about_->crLabel->setText(crNotes[0]); about_->crLabel->setText(crNotes[0]);
@ -284,7 +284,7 @@ void kstyle_baghira_config::showAbout()
about_->exec(); about_->exec();
} }
kstyle_baghira_config::kstyle_baghira_config(TQWidget *parent, const char *name, const TQStringList&) : TQWidget(parent, name )//, myAboutData(0) tdestyle_baghira_config::tdestyle_baghira_config(TQWidget *parent, const char *name, const TQStringList&) : TQWidget(parent, name )//, myAboutData(0)
{ {
loadDone = false; loadDone = false;
if (parent) parent->setCaption("Configure Your Cat"); if (parent) parent->setCaption("Configure Your Cat");
@ -461,25 +461,25 @@ connect(dialog_->toolbuttonHighColor, SIGNAL(changed(const TQColor &)), this, SL
}; };
kstyle_baghira_config::~kstyle_baghira_config() tdestyle_baghira_config::~tdestyle_baghira_config()
{ {
if (timer) delete timer; if (timer) delete timer;
} }
void kstyle_baghira_config::setPresetColor(int i) void tdestyle_baghira_config::setPresetColor(int i)
{ {
dialog_->sliderButtonRed->setValue(presetColor[i][0]); dialog_->sliderButtonRed->setValue(presetColor[i][0]);
dialog_->sliderButtonGreen->setValue(presetColor[i][1]); dialog_->sliderButtonGreen->setValue(presetColor[i][1]);
dialog_->sliderButtonBlue->setValue(presetColor[i][2]); dialog_->sliderButtonBlue->setValue(presetColor[i][2]);
} }
void kstyle_baghira_config::load() void tdestyle_baghira_config::load()
{ {
TQString tmpString = TQDir::homeDirPath() + "/.qt/baghirarc"; TQString tmpString = TQDir::homeDirPath() + "/.qt/baghirarc";
load (tmpString); load (tmpString);
} }
void kstyle_baghira_config::load(TQString &fileName) void tdestyle_baghira_config::load(TQString &fileName)
{ {
TDEConfig *config = new TDEConfig(fileName); TDEConfig *config = new TDEConfig(fileName);
// TQSettings config; // TQSettings config;
@ -583,7 +583,7 @@ void kstyle_baghira_config::load(TQString &fileName)
} }
void kstyle_baghira_config::defaults() void tdestyle_baghira_config::defaults()
{ {
dialog_->defaultStyle->setCurrentItem(0); dialog_->defaultStyle->setCurrentItem(0);
dialog_->buttonStyle->setCurrentItem(1); dialog_->buttonStyle->setCurrentItem(1);
@ -657,14 +657,14 @@ void kstyle_baghira_config::defaults()
emit changed(true); emit changed(true);
} }
void kstyle_baghira_config::save() void tdestyle_baghira_config::save()
{ {
TQString tmpString = TQDir::homeDirPath() + "/.qt/baghirarc"; TQString tmpString = TQDir::homeDirPath() + "/.qt/baghirarc";
save(tmpString); save(tmpString);
// emit changed(true); // emit changed(true);
} }
void kstyle_baghira_config::changeTooluttonHighlightColor(const TQColor & color) void tdestyle_baghira_config::changeTooluttonHighlightColor(const TQColor & color)
{ {
TDEConfig *config = new TDEConfig("kdeglobals"); TDEConfig *config = new TDEConfig("kdeglobals");
config->setGroup( "Toolbar style" ); config->setGroup( "Toolbar style" );
@ -672,7 +672,7 @@ void kstyle_baghira_config::changeTooluttonHighlightColor(const TQColor & color)
delete config; delete config;
} }
void kstyle_baghira_config::handleButtonStyles(int i) void tdestyle_baghira_config::handleButtonStyles(int i)
{ {
if (i != 2 && sender() == dialog_->buttonStyle && dialog_->toolbuttonStyle->currentItem() != 2) if (i != 2 && sender() == dialog_->buttonStyle && dialog_->toolbuttonStyle->currentItem() != 2)
dialog_->toolbuttonStyle->setCurrentItem(i); dialog_->toolbuttonStyle->setCurrentItem(i);
@ -681,7 +681,7 @@ void kstyle_baghira_config::handleButtonStyles(int i)
configChanged(); configChanged();
} }
void kstyle_baghira_config::save(TQString &fileName) void tdestyle_baghira_config::save(TQString &fileName)
{ {
// TQSettings *config = new TQSettings; // TQSettings *config = new TQSettings;
TDEConfig *config = new TDEConfig(fileName); TDEConfig *config = new TDEConfig(fileName);
@ -797,7 +797,7 @@ X-TDE-UniqueApplet=true\n";
} }
void kstyle_baghira_config::configChanged() void tdestyle_baghira_config::configChanged()
{ {
if (loadDone) if (loadDone)
{ {
@ -807,12 +807,12 @@ void kstyle_baghira_config::configChanged()
} }
TQString kstyle_baghira_config::quickHelp() const TQString tdestyle_baghira_config::quickHelp() const
{ {
return i18n("Configure Your Cat"); return i18n("Configure Your Cat");
} }
void kstyle_baghira_config::setDesign(int d) void tdestyle_baghira_config::setDesign(int d)
{ {
bool b = (d == 0); bool b = (d == 0);
dialog_->stippleBackground->setEnabled(b); dialog_->stippleBackground->setEnabled(b);
@ -821,12 +821,12 @@ void kstyle_baghira_config::setDesign(int d)
dialog_->shadowIntensity->setEnabled(b); dialog_->shadowIntensity->setEnabled(b);
} }
void kstyle_baghira_config::enableInButtonColor(int d) void tdestyle_baghira_config::enableInButtonColor(int d)
{ {
dialog_->customInactiveColor->setEnabled(d == 3); dialog_->customInactiveColor->setEnabled(d == 3);
} }
void kstyle_baghira_config::enableMenuColorStuff(int d) void tdestyle_baghira_config::enableMenuColorStuff(int d)
{ {
bool b = (d == 2); bool b = (d == 2);
dialog_->menuTextColor->setEnabled(b); dialog_->menuTextColor->setEnabled(b);
@ -834,45 +834,45 @@ void kstyle_baghira_config::enableMenuColorStuff(int d)
dialog_->menuColor2->setEnabled(b && dialog_->menuBackground->currentItem() > 1); dialog_->menuColor2->setEnabled(b && dialog_->menuBackground->currentItem() > 1);
} }
void kstyle_baghira_config::buttonLoadAction() void tdestyle_baghira_config::buttonLoadAction()
{ {
TQString tmpString = KFileDialog::getOpenFileName(TQDir::homeDirPath(), "*", this, "Select a Baghira config file"); TQString tmpString = KFileDialog::getOpenFileName(TQDir::homeDirPath(), "*", this, "Select a Baghira config file");
if (!tmpString.isEmpty()) if (!tmpString.isEmpty())
load(tmpString); load(tmpString);
} }
void kstyle_baghira_config::buttonSaveAsAction() void tdestyle_baghira_config::buttonSaveAsAction()
{ {
TQString tmpString = KFileDialog::getSaveFileName(TQDir::homeDirPath(), "*", this, "Save current Baghira configuration as"); TQString tmpString = KFileDialog::getSaveFileName(TQDir::homeDirPath(), "*", this, "Save current Baghira configuration as");
save(tmpString); save(tmpString);
} }
void kstyle_baghira_config::editApp() void tdestyle_baghira_config::editApp()
{ {
emit editApp(applist->currentItem()->text(0), applist->currentItem()->text(1)); emit editApp(applist->currentItem()->text(0), applist->currentItem()->text(1));
} }
void kstyle_baghira_config::removeApp() void tdestyle_baghira_config::removeApp()
{ {
TQString string = TQDir::homeDirPath() + "/.baghira/" + applist->currentItem()->text(0); TQString string = TQDir::homeDirPath() + "/.baghira/" + applist->currentItem()->text(0);
TQFile::remove(string); TQFile::remove(string);
applist->takeItem(applist->currentItem()); applist->takeItem(applist->currentItem());
} }
void kstyle_baghira_config::removeApp(TQString name) void tdestyle_baghira_config::removeApp(TQString name)
{ {
TQString string = TQDir::homeDirPath() + "/.baghira/" + name; TQString string = TQDir::homeDirPath() + "/.baghira/" + name;
TQFile::remove(string); TQFile::remove(string);
applist->takeItem(applist->findItem(name, 0, TQt::ExactMatch)); applist->takeItem(applist->findItem(name, 0, TQt::ExactMatch));
} }
void kstyle_baghira_config::addApp(TQString string, TQString linkString) void tdestyle_baghira_config::addApp(TQString string, TQString linkString)
{ {
applist->insertItem(new TDEListViewItem(applist, string, linkString)); applist->insertItem(new TDEListViewItem(applist, string, linkString));
applist->sort(); applist->sort();
} }
void kstyle_baghira_config::selectWindow() void tdestyle_baghira_config::selectWindow()
// taken from kcmkwin // taken from kcmkwin
{ {
// use a dialog, so that all user input is blocked // use a dialog, so that all user input is blocked
@ -888,7 +888,7 @@ void kstyle_baghira_config::selectWindow()
Atom wm_state = XInternAtom( tqt_xdisplay(), "WM_STATE", False ); Atom wm_state = XInternAtom( tqt_xdisplay(), "WM_STATE", False );
// Atom wm_state = XInternAtom( tqt_xdisplay(), "WM_COMMAND", False ); // Atom wm_state = XInternAtom( tqt_xdisplay(), "WM_COMMAND", False );
bool kstyle_baghira_config::eventFilter( TQObject* o, TQEvent* e ) bool tdestyle_baghira_config::eventFilter( TQObject* o, TQEvent* e )
// adapted from kcmkwin... again ;) // adapted from kcmkwin... again ;)
{ {
if( o != grabber ) if( o != grabber )
@ -912,7 +912,7 @@ bool kstyle_baghira_config::eventFilter( TQObject* o, TQEvent* e )
return true; return true;
} }
WId kstyle_baghira_config::findWindow() WId tdestyle_baghira_config::findWindow()
// taken from kcmkwin... as well =) // taken from kcmkwin... as well =)
{ {
Window root; Window root;
@ -946,7 +946,7 @@ WId kstyle_baghira_config::findWindow()
} }
void kstyle_baghira_config::menuToggled(bool active) void tdestyle_baghira_config::menuToggled(bool active)
{ {
if (!active || !loadDone) if (!active || !loadDone)
return; return;
@ -968,8 +968,8 @@ void kstyle_baghira_config::menuToggled(bool active)
extern "C" extern "C"
{ {
TQWidget* allocate_kstyle_config(TQWidget* parent){ TQWidget* allocate_tdestyle_config(TQWidget* parent){
return(new kstyle_baghira_config(parent, "BaghiraConfig")); return(new tdestyle_baghira_config(parent, "BaghiraConfig"));
} }
} }
@ -1240,4 +1240,4 @@ void AppSetter::reset()
box->setChecked ( false ); box->setChecked ( false );
} }
#include "kstyle_baghira_config.moc" #include "tdestyle_baghira_config.moc"

10
config/kstyle_baghira_config.h → config/tdestyle_baghira_config.h
Unescape View File

@ -18,8 +18,8 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#ifndef _KSTYLE_BAGHIRA_CONFIG_H_ #ifndef _TDESTYLE_BAGHIRA_CONFIG_H_
#define _KSTYLE_BAGHIRA_CONFIG_H_ #define _TDESTYLE_BAGHIRA_CONFIG_H_
//#include <tdecmodule.h> //#include <tdecmodule.h>
#include <tqcolor.h> #include <tqcolor.h>
@ -37,13 +37,13 @@ class TQCheckBox;
class TQComboBox; class TQComboBox;
class TQGroupBox; class TQGroupBox;
class kstyle_baghira_config: public TQWidget class tdestyle_baghira_config: public TQWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
kstyle_baghira_config( TQWidget *parent=0, const char *name=0, const TQStringList& = TQStringList() ); tdestyle_baghira_config( TQWidget *parent=0, const char *name=0, const TQStringList& = TQStringList() );
~kstyle_baghira_config(); ~tdestyle_baghira_config();
virtual void load(); virtual void load();
void load(TQString &fileName); void load(TQString &fileName);

1
configure.in.in
Unescape View File

@ -1,5 +1,6 @@
#MIN_CONFIG(3.0.0) #MIN_CONFIG(3.0.0)
KDE_USE_QT(3.3.0) KDE_USE_QT(3.3.0)
KDE_ENABLE_HIDDEN_VISIBILITY
AM_INIT_AUTOMAKE(baghira, cvs) AM_INIT_AUTOMAKE(baghira, cvs)
AC_C_BIGENDIAN AC_C_BIGENDIAN

2
kickermenu/configure.in.in
Unescape View File

@ -1,2 +1,2 @@
AM_CONDITIONAL( HAVE_3_4, test $(tde-config --version | grep "KDE:" | cut -d" " -f2 | cut -d"." -f2) -gt 3 ) AM_CONDITIONAL( HAVE_3_4, test $($KDECONFIG --version | grep "TDE:" | cut -d" " -f2 | cut -d"." -f2) -gt 3 )

2
sidebar/configure.in.in
Unescape View File

@ -1,2 +1,2 @@
AM_CONDITIONAL( HAVE_3_4, test $(tde-config --version | grep "KDE:" | cut -d" " -f2 | cut -d"." -f2) -gt 3 ) AM_CONDITIONAL( HAVE_3_4, test $($KDECONFIG --version | grep "TDE:" | cut -d" " -f2 | cut -d"." -f2) -gt 3 )

2
style/Makefile.am
Unescape View File

@ -7,7 +7,7 @@ kde_style_LTLIBRARIES = baghira.la
baghira_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module baghira_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
baghira_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx -lXtst baghira_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx -lXtst
baghira_la_SOURCES = baghira.cpp optionHandler.cpp polish.cpp utils.cpp baghira_la_SOURCES = baghira.cpp optionHandler.cpp polish.cpp utils.cpp
lnkdir = $(kde_datadir)/kstyle/themes lnkdir = $(kde_datadir)/tdestyle/themes
lnk_DATA = baghira.themerc lnk_DATA = baghira.themerc
EXTRA_DIST = $(lnk_DATA) EXTRA_DIST = $(lnk_DATA)
pixmaps.h: $(srcdir)/generatePixmaps.sh pixmaps.h: $(srcdir)/generatePixmaps.sh

193
style/baghira.cpp
Unescape View File

@ -492,9 +492,14 @@ bool LiquidStyle::isPlain() const {
} }
void LiquidStyle::drawPrimitive( PrimitiveElement pe, TQPainter *p, void LiquidStyle::drawPrimitive( PrimitiveElement pe,
const TQRect &r, const TQColorGroup &cg, TQPainter *p,
SFlags flags, const TQStyleOption &opt ) const const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQColorGroup &cg,
SFlags flags,
const TQStyleOption &opt ) const
{ {
bool down = flags & Style_Down; bool down = flags & Style_Down;
bool on = flags & Style_On; bool on = flags & Style_On;
@ -1357,15 +1362,20 @@ void LiquidStyle::drawPrimitive( PrimitiveElement pe, TQPainter *p,
p->setBrush( oldBrush ); p->setBrush( oldBrush );
} }
else else
TDEStyle::drawPrimitive( pe, p, r, cg, flags, opt ); TDEStyle::drawPrimitive( pe, p, ceData, elementFlags, r, cg, flags, opt );
} }
} // general switch } // general switch
} }
void LiquidStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe, TQPainter* p, void LiquidStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe,
const TQWidget* widget, const TQRect &r, TQPainter* p,
const TQColorGroup &cg, SFlags flags, const TQStyleControlElementData &ceData,
const TQStyleOption &opt ) const ControlElementFlags elementFlags,
const TQRect &r,
const TQColorGroup &cg,
SFlags flags,
const TQStyleOption &opt,
const TQWidget* widget ) const
{ {
switch ( kpe ) switch ( kpe )
{ {
@ -1432,7 +1442,7 @@ void LiquidStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe, TQPainter* p,
int x, y, w, h; int x, y, w, h;
r.rect( &x, &y, &w, &h ); r.rect( &x, &y, &w, &h );
if (qstrcmp( tqApp->argv() [ 0 ], "kmix" ) == 0) x = x+3; if (qstrcmp( tqApp->argv() [ 0 ], "kmix" ) == 0) x = x+3;
if ( ( ( const TQSlider * ) widget ) ->orientation() == TQt::Horizontal ) if ( ceData.orientation == TQt::Horizontal )
{ {
int x2 = x + w - 1; int x2 = x + w - 1;
y = y + ( h - 5 ) / 2; y = y + ( h - 5 ) / 2;
@ -1471,7 +1481,7 @@ void LiquidStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe, TQPainter* p,
p->drawPixmap( r.x(), r.y(), *getPixmap( flags & Style_Enabled ? RadioOffHover : RadioOff)); p->drawPixmap( r.x(), r.y(), *getPixmap( flags & Style_Enabled ? RadioOffHover : RadioOff));
break; break;
} }
if ((( const TQSlider * ) widget ) ->orientation() == TQt::Horizontal) if ( ceData.orientation == TQt::Horizontal )
(widget && widget->height() < 17) ? p->drawPixmap( r.x(), r.y(), *getPixmap( flags & Style_Enabled ? RadioOffHover : RadioOff)) : p->drawPixmap( r.x(), (optionHandler->style() == Milk) ? r.y() : r.y()+2, *getPixmap( flags & Style_Enabled ? HSlider : HSliderInactive)); (widget && widget->height() < 17) ? p->drawPixmap( r.x(), r.y(), *getPixmap( flags & Style_Enabled ? RadioOffHover : RadioOff)) : p->drawPixmap( r.x(), (optionHandler->style() == Milk) ? r.y() : r.y()+2, *getPixmap( flags & Style_Enabled ? HSlider : HSliderInactive));
else else
{ {
@ -1514,14 +1524,19 @@ void LiquidStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe, TQPainter* p,
break; break;
} }
default: default:
TDEStyle::drawTDEStylePrimitive( kpe, p, widget, r, cg, flags, opt ); TDEStyle::drawTDEStylePrimitive( kpe, p, ceData, elementFlags, r, cg, flags, opt, widget );
} }
} }
void LiquidStyle::drawControl( ControlElement element, TQPainter *p, void LiquidStyle::drawControl( ControlElement element,
const TQWidget *widget, const TQRect &r, TQPainter *p,
const TQColorGroup &cg, SFlags flags, const TQStyleControlElementData &ceData,
const TQStyleOption &opt ) const ControlElementFlags elementFlags,
const TQRect &r,
const TQColorGroup &cg,
SFlags flags,
const TQStyleOption &opt,
const TQWidget *widget ) const
{ {
switch ( element ) switch ( element )
{ {
@ -1536,7 +1551,7 @@ void LiquidStyle::drawControl( ControlElement element, TQPainter *p,
{ {
// tqWarning("%s - %s,%s : %s,%s",tqApp->argv()[0],widget->className(),widget->name(),widget->parentWidget()->className(),widget->parentWidget()->name()); // tqWarning("%s - %s,%s : %s,%s",tqApp->argv()[0],widget->className(),widget->name(),widget->parentWidget()->className(),widget->parentWidget()->name());
const TQProgressBar *progress = ( const TQProgressBar * ) widget; const TQProgressBar *progress = ( const TQProgressBar * ) widget;
TQRect contentsR( subRect( SR_ProgressBarContents, widget ) ); TQRect contentsR( subRect( SR_ProgressBarContents, ceData, elementFlags, widget ) );
double val = progress->progress(); double val = progress->progress();
bool reverse = TQApplication::reverseLayout(); bool reverse = TQApplication::reverseLayout();
val = val / progress->totalSteps(); val = val / progress->totalSteps();
@ -1618,8 +1633,8 @@ void LiquidStyle::drawControl( ControlElement element, TQPainter *p,
int shiftX = 0; int shiftX = 0;
int shiftY = 0; int shiftY = 0;
if (flags & (Style_Down | Style_On)) { if (flags & (Style_Down | Style_On)) {
shiftX = pixelMetric(PM_ButtonShiftHorizontal, widget); shiftX = pixelMetric(PM_ButtonShiftHorizontal, ceData, elementFlags, widget);
shiftY = pixelMetric(PM_ButtonShiftVertical, widget); shiftY = pixelMetric(PM_ButtonShiftVertical, ceData, elementFlags, widget);
} }
if (!opt.isDefault()) if (!opt.isDefault())
@ -1635,7 +1650,7 @@ void LiquidStyle::drawControl( ControlElement element, TQPainter *p,
} }
rect.moveBy(shiftX, shiftY); rect.moveBy(shiftX, shiftY);
drawPrimitive(pe, p, rect, cg, flags, opt); drawPrimitive(pe, p, ceData, elementFlags, rect, cg, flags, opt);
} }
else else
{ {
@ -1645,7 +1660,7 @@ void LiquidStyle::drawControl( ControlElement element, TQPainter *p,
! toolbutton->text().isNull() && ! toolbutton->text().isNull() &&
! toolbutton->usesTextLabel()) { ! toolbutton->usesTextLabel()) {
int alignment = AlignCenter | ShowPrefix; int alignment = AlignCenter | ShowPrefix;
if (!styleHint(SH_UnderlineAccelerator, widget, TQStyleOption::Default, 0)) if (!styleHint(SH_UnderlineAccelerator, ceData, elementFlags, TQStyleOption::Default, 0, widget))
alignment |= NoAccel; alignment |= NoAccel;
rect.moveBy(shiftX, shiftY); rect.moveBy(shiftX, shiftY);
@ -1673,7 +1688,7 @@ void LiquidStyle::drawControl( ControlElement element, TQPainter *p,
p->setFont( toolbutton->font() ); p->setFont( toolbutton->font() );
TQRect pr = rect, tr = rect; TQRect pr = rect, tr = rect;
int alignment = ShowPrefix; int alignment = ShowPrefix;
if (!styleHint(SH_UnderlineAccelerator, widget, TQStyleOption::Default, 0)) if (!styleHint(SH_UnderlineAccelerator, ceData, elementFlags, TQStyleOption::Default, 0, widget))
alignment |= NoAccel; alignment |= NoAccel;
if ( toolbutton->textPosition() == TQToolButton::Under ) if ( toolbutton->textPosition() == TQToolButton::Under )
@ -1741,7 +1756,7 @@ void LiquidStyle::drawControl( ControlElement element, TQPainter *p,
{ {
if (optionHandler->DrawProgressLabel()) if (optionHandler->DrawProgressLabel())
{ {
TQRect contentsR( subRect( SR_ProgressBarContents, widget ) ); TQRect contentsR( subRect( SR_ProgressBarContents, ceData, elementFlags, widget ) );
if ( !contentsR.isValid() ) if ( !contentsR.isValid() )
return ; return ;
TQFont font( p->font() ); TQFont font( p->font() );
@ -1881,7 +1896,7 @@ void LiquidStyle::drawControl( ControlElement element, TQPainter *p,
if ( !isPlain() && !btn->autoMask() ) if ( !isPlain() && !btn->autoMask() )
const_cast<LiquidStyle*>( this ) ->btnOffset = btn->backgroundOffset(); const_cast<LiquidStyle*>( this ) ->btnOffset = btn->backgroundOffset();
const_cast<LiquidStyle*>( this ) ->paintWidget = const_cast<TQWidget*>( widget ); const_cast<LiquidStyle*>( this ) ->paintWidget = const_cast<TQWidget*>( widget );
drawPrimitive( PE_ButtonDefault, p, r, cg, flags, TQStyleOption( btn )); drawPrimitive( PE_ButtonDefault, p, ceData, elementFlags, r, cg, flags, TQStyleOption( btn ));
const_cast<LiquidStyle*>( this ) ->paintWidget = 0L; const_cast<LiquidStyle*>( this ) ->paintWidget = 0L;
const_cast<LiquidStyle*>( this ) ->isHTMLButton = false; const_cast<LiquidStyle*>( this ) ->isHTMLButton = false;
break; break;
@ -1918,7 +1933,7 @@ void LiquidStyle::drawControl( ControlElement element, TQPainter *p,
if ( btn->isMenuButton() ) if ( btn->isMenuButton() )
{ {
drawPrimitive( PE_ArrowDown, p, TQRect( w-14, (int)(h/2), 7, 7 ) , cg, flags, opt ); drawPrimitive( PE_ArrowDown, p, ceData, elementFlags, TQRect( w-14, (int)(h/2), 7, 7 ) , cg, flags, opt );
w -= 14; w -= 14;
} }
TQColor tmp; TQColor tmp;
@ -2041,7 +2056,7 @@ void LiquidStyle::drawControl( ControlElement element, TQPainter *p,
cflags |= Style_Enabled; cflags |= Style_Enabled;
if ( act ) if ( act )
cflags |= Style_On; cflags |= Style_On;
drawPrimitive( PE_CheckMark, p, visualRect( TQRect( xp, y + windowsItemFrame, checkcol - 2 * windowsItemFrame, h - 2 * windowsItemFrame ), r ), cg, cflags ); drawPrimitive( PE_CheckMark, p, ceData, elementFlags, visualRect( TQRect( xp, y + windowsItemFrame, checkcol - 2 * windowsItemFrame, h - 2 * windowsItemFrame ), r ), cg, cflags );
} }
} }
TQColor discol; TQColor discol;
@ -2136,14 +2151,14 @@ void LiquidStyle::drawControl( ControlElement element, TQPainter *p,
if ( !dis ) if ( !dis )
discol = cg.highlightedText(); discol = cg.highlightedText();
TQColorGroup g2( discol, cg.highlight(), white, white, dis ? discol : white, discol, white ); TQColorGroup g2( discol, cg.highlight(), white, white, dis ? discol : white, discol, white );
drawPrimitive( arrow, p, vrect, g2, Style_Enabled ); drawPrimitive( arrow, p, ceData, elementFlags, vrect, g2, Style_Enabled );
} }
else else
{ {
if ( !dis ) if ( !dis )
discol = optionHandler->textColor(); discol = optionHandler->textColor();
TQColorGroup g2( discol, cg.background(), white, white, dis ? discol : white, discol, white ); TQColorGroup g2( discol, cg.background(), white, white, dis ? discol : white, discol, white );
drawPrimitive( arrow, p, vrect, g2, mi->isEnabled() ? Style_Enabled : Style_Default ); drawPrimitive( arrow, p, ceData, elementFlags, vrect, g2, mi->isEnabled() ? Style_Enabled : Style_Default );
} }
} }
break; break;
@ -2154,7 +2169,7 @@ void LiquidStyle::drawControl( ControlElement element, TQPainter *p,
break; break;
}*/ }*/
default: default:
TDEStyle::drawControl( element, p, widget, r, cg, flags, opt ); TDEStyle::drawControl( element, p, ceData, elementFlags, r, cg, flags, opt, widget );
} }
} }
@ -2182,7 +2197,17 @@ void LiquidStyle::drawControl( ControlElement element, TQPainter *p,
// // } // // }
// } // }
void LiquidStyle::drawComplexControl( ComplexControl control, TQPainter *p, const TQWidget *widget, const TQRect &r, const TQColorGroup &cg, SFlags flags, SCFlags controls, SCFlags active, const TQStyleOption &opt ) const void LiquidStyle::drawComplexControl( ComplexControl control,
TQPainter *p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQColorGroup &cg,
SFlags flags,
SCFlags controls,
SCFlags active,
const TQStyleOption &opt,
const TQWidget *widget ) const
{ {
switch ( control ) switch ( control )
{ {
@ -2249,8 +2274,8 @@ void LiquidStyle::drawComplexControl( ComplexControl control, TQPainter *p, cons
const_cast<LiquidStyle*>( this ) ->paintWidget = const_cast<TQWidget*>( widget ); const_cast<LiquidStyle*>( this ) ->paintWidget = const_cast<TQWidget*>( widget );
const KAccessToolBarButton *toolbutton2 = 0L; const KAccessToolBarButton *toolbutton2 = 0L;
TQRect button, menuarea; TQRect button, menuarea;
button = querySubControlMetrics( control, widget, SC_ToolButton, opt ); button = querySubControlMetrics( control, ceData, elementFlags, SC_ToolButton, opt, widget );
menuarea = querySubControlMetrics( control, widget, SC_ToolButtonMenu, opt ); menuarea = querySubControlMetrics( control, ceData, elementFlags, SC_ToolButtonMenu, opt, widget );
if (::tqt_cast<TDEToolBarButton*>(toolbutton)) if (::tqt_cast<TDEToolBarButton*>(toolbutton))
{ {
toolbutton2 = (const KAccessToolBarButton*)toolbutton; toolbutton2 = (const KAccessToolBarButton*)toolbutton;
@ -2396,15 +2421,15 @@ void LiquidStyle::drawComplexControl( ComplexControl control, TQPainter *p, cons
if ( controls & SC_ToolButtonMenu ) if ( controls & SC_ToolButtonMenu )
{ {
if ( mflags & ( Style_Down | Style_On | Style_Raised ) ) if ( mflags & ( Style_Down | Style_On | Style_Raised ) )
drawPrimitive( PE_ButtonDropDown, p, menuarea, cg, mflags, opt ); drawPrimitive( PE_ButtonDropDown, p, ceData, elementFlags, menuarea, cg, mflags, opt );
drawPrimitive( PE_ArrowDown, p, menuarea, cg, mflags, opt ); drawPrimitive( PE_ArrowDown, p, ceData, elementFlags, menuarea, cg, mflags, opt );
} }
#if 0 #if 0
if ( toolbutton->hasFocus() && !toolbutton->focusProxy() ) if ( toolbutton->hasFocus() && !toolbutton->focusProxy() )
{ {
TQRect fr = toolbutton->rect(); TQRect fr = toolbutton->rect();
fr.addCoords( 3, 3, -3, -3 ); fr.addCoords( 3, 3, -3, -3 );
drawPrimitive( PE_FocusRect, p, fr, cg ); drawPrimitive( PE_FocusRect, p, ceData, elementFlags, fr, cg );
} }
#endif #endif
const_cast<LiquidStyle*>( this ) ->paintWidget = 0L; const_cast<LiquidStyle*>( this ) ->paintWidget = 0L;
@ -2413,7 +2438,7 @@ void LiquidStyle::drawComplexControl( ComplexControl control, TQPainter *p, cons
case CC_ScrollBar: case CC_ScrollBar:
{ {
const_cast<LiquidStyle*>( this ) ->currentScrollBar = ( TQScrollBar * ) widget; const_cast<LiquidStyle*>( this ) ->currentScrollBar = ( TQScrollBar * ) widget;
TDEStyle::drawComplexControl( control, p, widget, r, cg, flags, controls, active, opt ); TDEStyle::drawComplexControl( control, p, ceData, elementFlags, r, cg, flags, controls, active, opt, widget );
break; break;
} }
case CC_SpinWidget: { case CC_SpinWidget: {
@ -2436,7 +2461,7 @@ void LiquidStyle::drawComplexControl( ComplexControl control, TQPainter *p, cons
TQRect re = sw->upRect(); TQRect re = sw->upRect();
TQColorGroup ucg = sw->isUpEnabled() ? cg : sw->palette().disabled(); TQColorGroup ucg = sw->isUpEnabled() ? cg : sw->palette().disabled();
p->fillRect(re, ucg.base()); p->fillRect(re, ucg.base());
drawPrimitive(pe, p, re, ucg, flags); drawPrimitive(pe, p, ceData, elementFlags, re, ucg, flags);
} }
if ( controls & SC_SpinWidgetDown ) { if ( controls & SC_SpinWidgetDown ) {
@ -2451,7 +2476,7 @@ void LiquidStyle::drawComplexControl( ComplexControl control, TQPainter *p, cons
TQRect re = sw->downRect(); TQRect re = sw->downRect();
TQColorGroup dcg = sw->isDownEnabled() ? cg : sw->palette().disabled(); TQColorGroup dcg = sw->isDownEnabled() ? cg : sw->palette().disabled();
p->fillRect(re, dcg.base()); p->fillRect(re, dcg.base());
drawPrimitive(pe, p, re, dcg, flags); drawPrimitive(pe, p, ceData, elementFlags, re, dcg, flags);
} }
break; } break; }
@ -2459,8 +2484,8 @@ void LiquidStyle::drawComplexControl( ComplexControl control, TQPainter *p, cons
// ------------------------------------------------------------------- // -------------------------------------------------------------------
case CC_Slider: { case CC_Slider: {
const TQSlider* slider = (const TQSlider*)widget; const TQSlider* slider = (const TQSlider*)widget;
TQRect groove = querySubControlMetrics(CC_Slider, widget, SC_SliderGroove, opt); TQRect groove = querySubControlMetrics(CC_Slider, ceData, elementFlags, SC_SliderGroove, opt, widget);
TQRect handle = querySubControlMetrics(CC_Slider, widget, SC_SliderHandle, opt); TQRect handle = querySubControlMetrics(CC_Slider, ceData, elementFlags, SC_SliderHandle, opt, widget);
// Double-buffer slider for no flicker // Double-buffer slider for no flicker
TQPixmap pix(widget->size()); TQPixmap pix(widget->size());
@ -2511,23 +2536,23 @@ void LiquidStyle::drawComplexControl( ComplexControl control, TQPainter *p, cons
// Draw slider groove // Draw slider groove
if ((controls & SC_SliderGroove) && groove.isValid()) { if ((controls & SC_SliderGroove) && groove.isValid()) {
drawTDEStylePrimitive( KPE_SliderGroove, &p2, widget, groove, cg, flags, opt ); drawTDEStylePrimitive( KPE_SliderGroove, &p2, ceData, elementFlags, groove, cg, flags, opt, widget );
// Draw the focus rect around the groove // Draw the focus rect around the groove
/* if (slider->hasFocus()) /* if (slider->hasFocus())
drawPrimitive(PE_FocusRect, &p2, groove, cg);*/ drawPrimitive(PE_FocusRect, &p2, ceData, elementFlags, groove, cg);*/
} }
// Draw the tickmarks // Draw the tickmarks
if (controls & SC_SliderTickmarks) if (controls & SC_SliderTickmarks)
TQCommonStyle::drawComplexControl(control, &p2, widget, TQCommonStyle::drawComplexControl(control, &p2, ceData, elementFlags,
r, cg, flags, SC_SliderTickmarks, active, opt); r, cg, flags, SC_SliderTickmarks, active, opt, widget);
// Draw the slider handle // Draw the slider handle
if ((controls & SC_SliderHandle) && handle.isValid()) { if ((controls & SC_SliderHandle) && handle.isValid()) {
if (active == SC_SliderHandle) if (active == SC_SliderHandle)
flags |= Style_Active; flags |= Style_Active;
drawTDEStylePrimitive( KPE_SliderHandle, &p2, widget, handle, cg, flags, opt ); drawTDEStylePrimitive( KPE_SliderHandle, &p2, ceData, elementFlags, handle, cg, flags, opt, widget );
} }
p2.end(); p2.end();
@ -2538,7 +2563,7 @@ void LiquidStyle::drawComplexControl( ComplexControl control, TQPainter *p, cons
#ifndef QT_NO_LISTVIEW #ifndef QT_NO_LISTVIEW
case CC_ListView: { case CC_ListView: {
if ( controls & SC_ListView ) { if ( controls & SC_ListView ) {
TQCommonStyle::drawComplexControl( control, p, widget, r, cg, flags, controls, active, opt ); TQCommonStyle::drawComplexControl( control, p, ceData, elementFlags, r, cg, flags, controls, active, opt, widget );
} }
if ( controls & ( SC_ListViewBranch | SC_ListViewExpand ) ) { if ( controls & ( SC_ListViewBranch | SC_ListViewExpand ) ) {
if ( opt.isDefault() ) if ( opt.isDefault() )
@ -2761,7 +2786,7 @@ void LiquidStyle::drawComplexControl( ComplexControl control, TQPainter *p, cons
} }
if ( controls & SC_TitleBarLabel ) if ( controls & SC_TitleBarLabel )
{ {
TQRect ir = visualRect( querySubControlMetrics( CC_TitleBar, widget, SC_TitleBarLabel ), widget ); TQRect ir = visualRect( querySubControlMetrics( CC_TitleBar, ceData, elementFlags, SC_TitleBarLabel, TQStyleOption::Default, widget ), widget );
p->setPen( cg.text() ); p->setPen( cg.text() );
p->drawText(ir.x()+2, ir.y(), ir.width()-2, ir.height(), AlignCenter | AlignVCenter | SingleLine, widget->caption() ); p->drawText(ir.x()+2, ir.y(), ir.width()-2, ir.height(), AlignCenter | AlignVCenter | SingleLine, widget->caption() );
} }
@ -2772,7 +2797,7 @@ void LiquidStyle::drawComplexControl( ComplexControl control, TQPainter *p, cons
if ( controls & SC_TitleBarCloseButton ) if ( controls & SC_TitleBarCloseButton )
{ {
ir = visualRect( querySubControlMetrics( CC_TitleBar, widget, SC_TitleBarCloseButton ), widget ); ir = visualRect( querySubControlMetrics( CC_TitleBar, ceData, elementFlags, SC_TitleBarCloseButton, TQStyleOption::Default, widget ), widget );
down = active & SC_TitleBarCloseButton; down = active & SC_TitleBarCloseButton;
if (optionHandler->buttonStyle() == Brushed) if (optionHandler->buttonStyle() == Brushed)
drawRectangularButton( p, cg, down ? optionHandler->titleButtonColor(0).dark(120) : optionHandler->titleButtonColor(0), ir.x(), ir.y(), ir.width(), ir.height(), down, false, false, full); drawRectangularButton( p, cg, down ? optionHandler->titleButtonColor(0).dark(120) : optionHandler->titleButtonColor(0), ir.x(), ir.y(), ir.width(), ir.height(), down, false, false, full);
@ -2781,7 +2806,7 @@ void LiquidStyle::drawComplexControl( ComplexControl control, TQPainter *p, cons
} }
if ( controls & SC_TitleBarSysMenu ) if ( controls & SC_TitleBarSysMenu )
{ {
ir = visualRect( querySubControlMetrics( CC_TitleBar, widget, SC_TitleBarSysMenu ), widget ); ir = visualRect( querySubControlMetrics( CC_TitleBar, ceData, elementFlags, SC_TitleBarSysMenu, TQStyleOption::Default, widget ), widget );
down = active & SC_TitleBarSysMenu; down = active & SC_TitleBarSysMenu;
if (optionHandler->buttonStyle() == Brushed) if (optionHandler->buttonStyle() == Brushed)
drawRectangularButton( p, cg, down ? cg.button().dark(120) : cg.button(), ir.x(), ir.y(), ir.width(), ir.height(), down, false, false, full); drawRectangularButton( p, cg, down ? cg.button().dark(120) : cg.button(), ir.x(), ir.y(), ir.width(), ir.height(), down, false, false, full);
@ -2791,7 +2816,7 @@ void LiquidStyle::drawComplexControl( ComplexControl control, TQPainter *p, cons
if ( controls & SC_TitleBarMaxButton ) if ( controls & SC_TitleBarMaxButton )
{ {
ir = visualRect( querySubControlMetrics( CC_TitleBar, widget, SC_TitleBarMaxButton ), widget ); ir = visualRect( querySubControlMetrics( CC_TitleBar, ceData, elementFlags, SC_TitleBarMaxButton, TQStyleOption::Default, widget ), widget );
down = active & SC_TitleBarMaxButton; down = active & SC_TitleBarMaxButton;
if (optionHandler->buttonStyle() == Brushed) if (optionHandler->buttonStyle() == Brushed)
drawRectangularButton( p, cg, down ? optionHandler->titleButtonColor(2).dark(120) : optionHandler->titleButtonColor(2), ir.x(), ir.y(), ir.width(), ir.height(), down, false, false, full); drawRectangularButton( p, cg, down ? optionHandler->titleButtonColor(2).dark(120) : optionHandler->titleButtonColor(2), ir.x(), ir.y(), ir.width(), ir.height(), down, false, false, full);
@ -2801,7 +2826,7 @@ void LiquidStyle::drawComplexControl( ComplexControl control, TQPainter *p, cons
if ( controls & SC_TitleBarMinButton ) if ( controls & SC_TitleBarMinButton )
{ {
ir = visualRect( querySubControlMetrics( CC_TitleBar, widget, SC_TitleBarMinButton ), widget ); ir = visualRect( querySubControlMetrics( CC_TitleBar, ceData, elementFlags, SC_TitleBarMinButton, TQStyleOption::Default, widget ), widget );
down = active & SC_TitleBarMinButton; down = active & SC_TitleBarMinButton;
if (optionHandler->buttonStyle() == Brushed) if (optionHandler->buttonStyle() == Brushed)
drawRectangularButton( p, cg, down ? optionHandler->titleButtonColor(1).dark(120) : optionHandler->titleButtonColor(1), ir.x(), ir.y(), ir.width(), ir.height(), down, false, false, full); drawRectangularButton( p, cg, down ? optionHandler->titleButtonColor(1).dark(120) : optionHandler->titleButtonColor(1), ir.x(), ir.y(), ir.width(), ir.height(), down, false, false, full);
@ -2810,7 +2835,7 @@ void LiquidStyle::drawComplexControl( ComplexControl control, TQPainter *p, cons
} }
if ( controls & SC_TitleBarNormalButton ) if ( controls & SC_TitleBarNormalButton )
{ {
ir = visualRect( querySubControlMetrics( CC_TitleBar, widget, SC_TitleBarNormalButton ), widget ); ir = visualRect( querySubControlMetrics( CC_TitleBar, ceData, elementFlags, SC_TitleBarNormalButton, TQStyleOption::Default, widget ), widget );
down = active & SC_TitleBarNormalButton; down = active & SC_TitleBarNormalButton;
if (optionHandler->buttonStyle() == Brushed) if (optionHandler->buttonStyle() == Brushed)
drawRectangularButton( p, cg, down ? optionHandler->titleButtonColor(1).dark(120) : optionHandler->titleButtonColor(1), ir.x(), ir.y(), ir.width(), ir.height(), down, false, false, full); drawRectangularButton( p, cg, down ? optionHandler->titleButtonColor(1).dark(120) : optionHandler->titleButtonColor(1), ir.x(), ir.y(), ir.width(), ir.height(), down, false, false, full);
@ -2820,7 +2845,7 @@ void LiquidStyle::drawComplexControl( ComplexControl control, TQPainter *p, cons
if ( controls & SC_TitleBarShadeButton ) if ( controls & SC_TitleBarShadeButton )
{ {
ir = visualRect( querySubControlMetrics( CC_TitleBar, widget, SC_TitleBarShadeButton ), widget ); ir = visualRect( querySubControlMetrics( CC_TitleBar, ceData, elementFlags, SC_TitleBarShadeButton, TQStyleOption::Default, widget ), widget );
down = active & SC_TitleBarShadeButton; down = active & SC_TitleBarShadeButton;
if (optionHandler->buttonStyle() == Brushed) if (optionHandler->buttonStyle() == Brushed)
drawRectangularButton( p, cg, down ? cg.button().dark(120) : cg.button(), ir.x(), ir.y(), ir.width(), ir.height(), down, false, false, full); drawRectangularButton( p, cg, down ? cg.button().dark(120) : cg.button(), ir.x(), ir.y(), ir.width(), ir.height(), down, false, false, full);
@ -2830,7 +2855,7 @@ void LiquidStyle::drawComplexControl( ComplexControl control, TQPainter *p, cons
if ( controls & SC_TitleBarUnshadeButton ) if ( controls & SC_TitleBarUnshadeButton )
{ {
ir = visualRect( querySubControlMetrics( CC_TitleBar, widget, SC_TitleBarUnshadeButton ), widget ); ir = visualRect( querySubControlMetrics( CC_TitleBar, ceData, elementFlags, SC_TitleBarUnshadeButton, TQStyleOption::Default, widget ), widget );
down = active & SC_TitleBarUnshadeButton; down = active & SC_TitleBarUnshadeButton;
if (optionHandler->buttonStyle() == Brushed) if (optionHandler->buttonStyle() == Brushed)
drawRectangularButton( p, cg, down ? cg.button().dark(120) : cg.button(), ir.x(), ir.y(), ir.width(), ir.height(), down, false, false, full); drawRectangularButton( p, cg, down ? cg.button().dark(120) : cg.button(), ir.x(), ir.y(), ir.width(), ir.height(), down, false, false, full);
@ -2842,13 +2867,18 @@ void LiquidStyle::drawComplexControl( ComplexControl control, TQPainter *p, cons
#endif //QT_NO_TITLEBAR #endif //QT_NO_TITLEBAR
default: default:
TDEStyle::drawComplexControl( control, p, widget, TDEStyle::drawComplexControl( control, p, ceData, elementFlags,
r, cg, flags, controls, active, opt ); r, cg, flags, controls, active, opt, widget );
break; break;
} }
} }
int LiquidStyle::styleHint(StyleHint sh, const TQWidget * w, const TQStyleOption & opt, TQStyleHintReturn * shr) const int LiquidStyle::styleHint(StyleHint sh,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQStyleOption & opt,
TQStyleHintReturn * shr,
const TQWidget * w) const
{ {
switch (sh) switch (sh)
{ {
@ -2860,20 +2890,26 @@ int LiquidStyle::styleHint(StyleHint sh, const TQWidget * w, const TQStyleOption
if (optionHandler->CenterTabs() && !TQApplication::reverseLayout()) if (optionHandler->CenterTabs() && !TQApplication::reverseLayout())
return AlignHCenter; return AlignHCenter;
else else
return TDEStyle::styleHint(sh, w, opt, shr); return TDEStyle::styleHint(sh, ceData, elementFlags, opt, shr, w);
default: default:
return TDEStyle::styleHint(sh, w, opt, shr); return TDEStyle::styleHint(sh, ceData, elementFlags, opt, shr, w);
} }
} }
TQRect LiquidStyle::subRect( SubRect r, const TQWidget *widget ) const { TQRect LiquidStyle::subRect( SubRect r,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQWidget *widget ) const {
if (r == SR_ComboBoxFocusRect){ if (r == SR_ComboBoxFocusRect){
return querySubControlMetrics( CC_ComboBox, widget, SC_ComboBoxEditField ); return querySubControlMetrics( CC_ComboBox, ceData, elementFlags, SC_ComboBoxEditField, TQStyleOption::Default, widget );
} }
return ( TDEStyle::subRect( r, widget ) ); return ( TDEStyle::subRect( r, ceData, elementFlags, widget ) );
} }
int LiquidStyle::pixelMetric( PixelMetric m, const TQWidget *widget ) const int LiquidStyle::pixelMetric( PixelMetric m,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQWidget *widget ) const
{ {
switch ( m ) switch ( m )
{ {
@ -2955,14 +2991,16 @@ int LiquidStyle::pixelMetric( PixelMetric m, const TQWidget *widget ) const
case PM_ButtonShiftVertical: case PM_ButtonShiftVertical:
return 0; return 0;
default: default:
return TDEStyle::pixelMetric( m, widget ); return TDEStyle::pixelMetric( m, ceData, elementFlags, widget );
} }
} }
TQSize LiquidStyle::sizeFromContents( ContentsType contents, TQSize LiquidStyle::sizeFromContents( ContentsType contents,
const TQWidget *widget, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQSize &contentSize, const TQSize &contentSize,
const TQStyleOption& opt ) const { const TQStyleOption& opt,
const TQWidget *widget ) const {
switch ( contents ) { switch ( contents ) {
case CT_PushButton: { case CT_PushButton: {
// this is a little funky - we give values not based on pixelMetric // this is a little funky - we give values not based on pixelMetric
@ -2974,7 +3012,7 @@ TQSize LiquidStyle::sizeFromContents( ContentsType contents,
int h = contentSize.height() > 24 ? contentSize.height() : 25; int h = contentSize.height() > 24 ? contentSize.height() : 25;
if ( button->text().isEmpty() ) if ( button->text().isEmpty() )
return ( TQSize( contentSize.width() + 2 * pixelMetric( PM_ButtonMargin, widget ), h ) ); return ( TQSize( contentSize.width() + 2 * pixelMetric( PM_ButtonMargin, ceData, elementFlags, widget ), h ) );
return ( TQSize( w, h ) ); return ( TQSize( w, h ) );
} }
@ -3000,7 +3038,7 @@ TQSize LiquidStyle::sizeFromContents( ContentsType contents,
} }
case CT_ComboBox: { case CT_ComboBox: {
// TQSize sz = TDEStyle::sizeFromContents( contents, widget, contentSize, opt ); // TQSize sz = TDEStyle::sizeFromContents( contents, ceData, elementFlags, contentSize, opt, widget );
// return ( TQSize( sz.width()+3, sz.height() > 25 ? sz.height() : 25 ) ); // return ( TQSize( sz.width()+3, sz.height() > 25 ? sz.height() : 25 ) );
if ( ::tqt_cast<const TQComboBox *>(widget) && ((const TQComboBox *)widget)->editable()) if ( ::tqt_cast<const TQComboBox *>(widget) && ((const TQComboBox *)widget)->editable())
return ( TQSize( contentSize.width()+27, contentSize.height() + 4 > 22 ? contentSize.height() + 4 : 26 ) ); return ( TQSize( contentSize.width()+27, contentSize.height() + 4 > 22 ? contentSize.height() + 4 : 26 ) );
@ -3054,19 +3092,26 @@ TQSize LiquidStyle::sizeFromContents( ContentsType contents,
default: default:
break; break;
} }
return TDEStyle::sizeFromContents( contents, widget, contentSize, opt ); return TDEStyle::sizeFromContents( contents, ceData, elementFlags, contentSize, opt, widget );
} }
TQPixmap LiquidStyle::stylePixmap( StylePixmap stylepixmap, TQPixmap LiquidStyle::stylePixmap( StylePixmap stylepixmap,
const TQWidget* widget, const TQStyleControlElementData &ceData,
const TQStyleOption& opt ) const { ControlElementFlags elementFlags,
return TDEStyle::stylePixmap( stylepixmap, widget, opt ); const TQStyleOption& opt,
const TQWidget* widget ) const {
return TDEStyle::stylePixmap( stylepixmap, ceData, elementFlags, opt, widget );
} }
#include "eventfilter.cpp" #include "eventfilter.cpp"
TQRect LiquidStyle::querySubControlMetrics( ComplexControl control, const TQWidget *widget, SubControl subcontrol, const TQStyleOption &opt ) const TQRect LiquidStyle::querySubControlMetrics( ComplexControl control,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
SubControl subcontrol,
const TQStyleOption &opt,
const TQWidget *widget ) const
{ {
if ( control == CC_ComboBox && subcontrol == SC_ComboBoxEditField ) if ( control == CC_ComboBox && subcontrol == SC_ComboBoxEditField )
return TQRect( 8, 3, widget->width() - 32, widget->height() - 7 ); return TQRect( 8, 3, widget->width() - 32, widget->height() - 7 );
@ -3091,11 +3136,11 @@ TQRect LiquidStyle::querySubControlMetrics( ComplexControl control, const TQWidg
case SC_TitleBarUnshadeButton: case SC_TitleBarUnshadeButton:
return TQRect( widget->width() - 29, 1, 24, 16 ); return TQRect( widget->width() - 29, 1, 24, 16 );
default: default:
return ( TDEStyle::querySubControlMetrics( control, widget, subcontrol, opt ) ); return ( TDEStyle::querySubControlMetrics( control, ceData, elementFlags, subcontrol, opt, widget ) );
} }
} }
else else
return ( TDEStyle::querySubControlMetrics( control, widget, subcontrol, opt ) ); return ( TDEStyle::querySubControlMetrics( control, ceData, elementFlags, subcontrol, opt, widget ) );
} }
TQImage LiquidStyle::fetchImage( const char *name ){ TQImage LiquidStyle::fetchImage( const char *name ){

94
style/baghira.h
Unescape View File

@ -499,26 +499,84 @@ public:
virtual ~LiquidStyle(); virtual ~LiquidStyle();
bool isPlain() const; bool isPlain() const;
virtual void polish( TQWidget *w ); virtual void polish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
// virtual void polishPopupMenu( TQPopupMenu *w ); // virtual void polishPopupMenu( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, TQPopupMenu *w );
virtual void unPolish( TQWidget *w ); virtual void unPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
virtual void polish( TQPalette &p ); virtual void polish( TQPalette &p );
virtual void unPolish( TQApplication *a ); virtual void applicationUnPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
int styleHint(StyleHint sh, const TQWidget * w, const TQStyleOption & opt, TQStyleHintReturn * shr) const; int styleHint(StyleHint,
void drawTDEStylePrimitive( TDEStylePrimitive kpe, TQPainter* p, const TQWidget* widget, const TQRect &r, const TQColorGroup &cg, SFlags flags = Style_Default, const TQStyleOption& = TQStyleOption::Default ) const; const TQStyleControlElementData &ceData,
void drawPrimitive( PrimitiveElement pe, TQPainter* p, const TQRect &r, const TQColorGroup &cg, SFlags flags = Style_Default, const TQStyleOption& = TQStyleOption::Default ) const; ControlElementFlags elementFlags,
void drawControl( ControlElement element, TQPainter *p, const TQWidget *widget, const TQRect &r, const TQColorGroup &cg, SFlags flags = Style_Default, const TQStyleOption& = TQStyleOption::Default ) const; const TQStyleOption & opt,
// void drawControlMask( ControlElement element, TQPainter *p, const TQWidget *widget, const TQRect &r, const TQStyleOption& = TQStyleOption::Default ) const; TQStyleHintReturn * shr,
void drawComplexControl( ComplexControl control, TQPainter *p, const TQWidget *widget, const TQRect &r, const TQColorGroup &cg, SFlags flags = Style_Default, SCFlags controls = SC_All, SCFlags active = SC_None, const TQStyleOption& = TQStyleOption::Default ) const; const TQWidget * = 0) const;
// void drawComplexControlMask( ComplexControl control, TQPainter *p, const TQWidget *widget, const TQRect &r, const TQStyleOption& = TQStyleOption::Default ) const; void drawTDEStylePrimitive( TDEStylePrimitive kpe,
TQPainter* p,
int pixelMetric( PixelMetric m, const TQWidget *widget = 0 ) const; const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
TQSize sizeFromContents( ContentsType contents, const TQWidget *widget, const TQSize &contentSize, const TQStyleOption& opt ) const; const TQRect &r,
TQRect subRect( SubRect r, const TQWidget *widget ) const; const TQColorGroup &cg,
TQRect querySubControlMetrics( ComplexControl control, const TQWidget *widget, SubControl subcontrol, const TQStyleOption &opt = TQStyleOption::Default ) const; SFlags flags = Style_Default,
const TQStyleOption& = TQStyleOption::Default,
const TQWidget* widget = 0 ) const;
void drawPrimitive( PrimitiveElement pe,
TQPainter* p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQColorGroup &cg,
SFlags flags = Style_Default,
const TQStyleOption& = TQStyleOption::Default ) const;
void drawControl( ControlElement element,
TQPainter *p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQColorGroup &cg,
SFlags flags = Style_Default,
const TQStyleOption& = TQStyleOption::Default,
const TQWidget *widget = 0 ) const;
// void drawControlMask( ControlElement element, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQStyleOption& = TQStyleOption::Default, const TQWidget *widget = 0 ) const;
void drawComplexControl( ComplexControl control,
TQPainter *p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQColorGroup &cg,
SFlags flags = Style_Default,
SCFlags controls = SC_All,
SCFlags active = SC_None,
const TQStyleOption& = TQStyleOption::Default,
const TQWidget *widget = 0 ) const;
// void drawComplexControlMask( ComplexControl control, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQStyleOption& = TQStyleOption::Default, const TQWidget *widget =0 ) const;
int pixelMetric( PixelMetric m,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQWidget *widget = 0 ) const;
TQSize sizeFromContents( ContentsType contents,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQSize &contentSize,
const TQStyleOption& opt,
const TQWidget *widget = 0 ) const;
TQRect subRect( SubRect r,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQWidget *widget ) const;
TQRect querySubControlMetrics( ComplexControl control,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
SubControl subcontrol,
const TQStyleOption &opt = TQStyleOption::Default,
const TQWidget *widget = 0 ) const;
// Fix TQt3's wacky image positions // Fix TQt3's wacky image positions
TQPixmap stylePixmap( StylePixmap stylepixmap, const TQWidget *widget = 0, const TQStyleOption& = TQStyleOption::Default ) const; TQPixmap stylePixmap( StylePixmap stylepixmap,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQStyleOption& = TQStyleOption::Default,
const TQWidget *widget = 0 ) const;
bool eventFilter( TQObject *object, TQEvent *event ); bool eventFilter( TQObject *object, TQEvent *event );
private slots: private slots:

2
style/baghira.themerc
Unescape View File

@ -1,6 +1,6 @@
[Misc] [Misc]
Name=Baghira Name=Baghira
Comment=The Big Black Cat Comment=The Big Black Cat
ConfigPage=kstyle_baghira_config ConfigPage=tdestyle_baghira_config
[KDE] [KDE]
WidgetStyle=Baghira WidgetStyle=Baghira

30
style/eventfilter.cpp
Unescape View File

@ -179,14 +179,16 @@ bool LiquidStyle::eventFilter( TQObject *obj, TQEvent *ev )
TQButton * btn = ( TQButton * ) obj; TQButton * btn = ( TQButton * ) obj;
bool isStatusChild = btn->parent() && ( btn->parent() ->inherits( "TQStatusBar" ) || btn->parent() ->inherits( "KonqFrameStatusBar" ) ); bool isStatusChild = btn->parent() && ( btn->parent() ->inherits( "TQStatusBar" ) || btn->parent() ->inherits( "KonqFrameStatusBar" ) );
bool isRadio = obj->inherits( "TQRadioButton" ); bool isRadio = obj->inherits( "TQRadioButton" );
const TQStyleControlElementData &ceData = populateControlElementDataFromWidget(btn, TQStyleOption());
ControlElementFlags elementFlags = getControlElementFlagsForObject(btn, TQStyleOption());
btn->erase(); btn->erase();
TQPainter p; TQPainter p;
p.begin( btn ); p.begin( btn );
TQFontMetrics fm = btn->fontMetrics(); TQFontMetrics fm = btn->fontMetrics();
TQSize lsz = fm.size( ShowPrefix, btn->text() ); TQSize lsz = fm.size( ShowPrefix, btn->text() );
TQSize sz = isRadio ? TQSize sz = isRadio ?
TQSize( pixelMetric( PM_ExclusiveIndicatorWidth ), pixelMetric( PM_ExclusiveIndicatorHeight ) ) : TQSize( pixelMetric( PM_ExclusiveIndicatorWidth, ceData, elementFlags ), pixelMetric( PM_ExclusiveIndicatorHeight, ceData, elementFlags ) ) :
TQSize( pixelMetric( PM_IndicatorWidth ), pixelMetric( PM_IndicatorHeight ) ); TQSize( pixelMetric( PM_IndicatorWidth, ceData, elementFlags ), pixelMetric( PM_IndicatorHeight, ceData, elementFlags ) );
int x = 0; int x = 0;
int y = isStatusChild ? 0 : ( btn->height() - lsz.height() + fm.height() - sz.height() ) / 2; int y = isStatusChild ? 0 : ( btn->height() - lsz.height() + fm.height() - sz.height() ) / 2;
SFlags flags = Style_Default; SFlags flags = Style_Default;
@ -203,9 +205,9 @@ bool LiquidStyle::eventFilter( TQObject *obj, TQEvent *ev )
else if ( btn->state() == TQButton::Off ) else if ( btn->state() == TQButton::Off )
flags |= Style_Off; flags |= Style_Off;
if ( isRadio ) if ( isRadio )
drawControl( CE_RadioButton, &p, btn, TQRect( x, y, sz.width(), sz.height() ), btn->colorGroup(), flags ); drawControl( CE_RadioButton, &p, ceData, elementFlags, TQRect( x, y, sz.width(), sz.height() ), btn->colorGroup(), flags, TQStyleOption::Default, btn );
else else
drawControl( CE_CheckBox, &p, btn, TQRect( x, y, sz.width(), sz.height() ), btn->colorGroup(), flags ); drawControl( CE_CheckBox, &p, ceData, elementFlags, TQRect( x, y, sz.width(), sz.height() ), btn->colorGroup(), flags, TQStyleOption::Default, btn );
x = sz.width() + 6; x = sz.width() + 6;
y = 0; y = 0;
if ( btn->hasFocus() ) if ( btn->hasFocus() )
@ -340,12 +342,14 @@ bool LiquidStyle::eventFilter( TQObject *obj, TQEvent *ev )
{ {
bool isStatusChild = btn->parent() && ( btn->parent() ->inherits( "TQStatusBar" ) || btn->parent() ->inherits( "KonqFrameStatusBar" ) ); bool isStatusChild = btn->parent() && ( btn->parent() ->inherits( "TQStatusBar" ) || btn->parent() ->inherits( "KonqFrameStatusBar" ) );
bool isRadio = obj->inherits( "TQRadioButton" ); bool isRadio = obj->inherits( "TQRadioButton" );
const TQStyleControlElementData &ceData = populateControlElementDataFromWidget(btn, TQStyleOption());
ControlElementFlags elementFlags = getControlElementFlagsForObject(btn, TQStyleOption());
highlightWidget = btn; highlightWidget = btn;
TQFontMetrics fm = btn->fontMetrics(); TQFontMetrics fm = btn->fontMetrics();
TQSize lsz = fm.size( ShowPrefix, btn->text() ); TQSize lsz = fm.size( ShowPrefix, btn->text() );
TQSize sz = isRadio ? TQSize sz = isRadio ?
TQSize( pixelMetric( PM_ExclusiveIndicatorWidth ), pixelMetric( PM_ExclusiveIndicatorHeight ) ) : TQSize( pixelMetric( PM_ExclusiveIndicatorWidth, ceData, elementFlags ), pixelMetric( PM_ExclusiveIndicatorHeight, ceData, elementFlags ) ) :
TQSize( pixelMetric( PM_IndicatorWidth ), pixelMetric( PM_IndicatorHeight ) ); TQSize( pixelMetric( PM_IndicatorWidth, ceData, elementFlags ), pixelMetric( PM_IndicatorHeight, ceData, elementFlags ) );
int x = 0; int x = 0;
int y = isStatusChild ? 0 : ( btn->height() - lsz.height() + fm.height() - sz.height() ) / 2; int y = isStatusChild ? 0 : ( btn->height() - lsz.height() + fm.height() - sz.height() ) / 2;
TQPainter p; TQPainter p;
@ -364,9 +368,9 @@ bool LiquidStyle::eventFilter( TQObject *obj, TQEvent *ev )
else if ( btn->state() == TQButton::Off ) else if ( btn->state() == TQButton::Off )
flags |= Style_Off; flags |= Style_Off;
if ( isRadio ) if ( isRadio )
drawControl( CE_RadioButton, &p, btn, TQRect( x, y, sz.width(), sz.height() ), btn->colorGroup(), flags ); drawControl( CE_RadioButton, &p, ceData, elementFlags, TQRect( x, y, sz.width(), sz.height() ), btn->colorGroup(), flags, TQStyleOption::Default, btn );
else else
drawControl( CE_CheckBox, &p, btn, TQRect( x, y, sz.width(), sz.height() ), btn->colorGroup(), flags ); drawControl( CE_CheckBox, &p, ceData, elementFlags, TQRect( x, y, sz.width(), sz.height() ), btn->colorGroup(), flags, TQStyleOption::Default, btn );
p.end(); p.end();
} }
return false; return false;
@ -485,12 +489,14 @@ bool LiquidStyle::eventFilter( TQObject *obj, TQEvent *ev )
{ {
bool isRadio = obj->inherits( "TQRadioButton" ); bool isRadio = obj->inherits( "TQRadioButton" );
bool isStatusChild = btn->parent() && ( btn->parent() ->inherits( "TQStatusBar" ) || btn->parent() ->inherits( "KonqFrameStatusBar" ) ); bool isStatusChild = btn->parent() && ( btn->parent() ->inherits( "TQStatusBar" ) || btn->parent() ->inherits( "KonqFrameStatusBar" ) );
const TQStyleControlElementData &ceData = populateControlElementDataFromWidget(btn, TQStyleOption());
ControlElementFlags elementFlags = getControlElementFlagsForObject(btn, TQStyleOption());
highlightWidget = NULL; highlightWidget = NULL;
TQFontMetrics fm = btn->fontMetrics(); TQFontMetrics fm = btn->fontMetrics();
TQSize lsz = fm.size( ShowPrefix, btn->text() ); TQSize lsz = fm.size( ShowPrefix, btn->text() );
TQSize sz = isRadio ? TQSize sz = isRadio ?
TQSize( pixelMetric( PM_ExclusiveIndicatorWidth ), pixelMetric( PM_ExclusiveIndicatorHeight ) ) : TQSize( pixelMetric( PM_ExclusiveIndicatorWidth, ceData, elementFlags ), pixelMetric( PM_ExclusiveIndicatorHeight, ceData, elementFlags ) ) :
TQSize( pixelMetric( PM_IndicatorWidth ), pixelMetric( PM_IndicatorHeight ) ); TQSize( pixelMetric( PM_IndicatorWidth, ceData, elementFlags ), pixelMetric( PM_IndicatorHeight, ceData, elementFlags ) );
int x = 0; int x = 0;
int y = isStatusChild ? 0 : ( btn->height() - lsz.height() + fm.height() - sz.height() ) / 2; int y = isStatusChild ? 0 : ( btn->height() - lsz.height() + fm.height() - sz.height() ) / 2;
TQPainter p; TQPainter p;
@ -509,9 +515,9 @@ bool LiquidStyle::eventFilter( TQObject *obj, TQEvent *ev )
else if ( btn->state() == TQButton::Off ) else if ( btn->state() == TQButton::Off )
flags |= Style_Off; flags |= Style_Off;
if ( isRadio ) if ( isRadio )
drawControl( CE_RadioButton, &p, btn, TQRect( x, y, sz.width(), sz.height() ), btn->colorGroup(), flags ); drawControl( CE_RadioButton, &p, ceData, elementFlags, TQRect( x, y, sz.width(), sz.height() ), btn->colorGroup(), flags, TQStyleOption::Default, btn );
else else
drawControl( CE_CheckBox, &p, btn, TQRect( x, y, sz.width(), sz.height() ), btn->colorGroup(), flags ); drawControl( CE_CheckBox, &p, ceData, elementFlags, TQRect( x, y, sz.width(), sz.height() ), btn->colorGroup(), flags, TQStyleOption::Default, btn );
p.end(); p.end();
} }
return false; return false;

23
style/polish.cpp
Unescape View File

@ -204,14 +204,15 @@ void LiquidStyle::polish( TQPalette &pal )
optionHandler->reset(); optionHandler->reset();
} }
void LiquidStyle::unPolish( TQApplication *app ) void LiquidStyle::applicationUnPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
{ {
if (ceData.widgetObjectTypes.contains(TQAPPLICATION_OBJECT_NAME_STRING)) {
TQApplication *app = reinterpret_cast<TQApplication*>(ptr);
popupBack.resize(0,0); popupBack.resize(0,0);
TQPalette pal( app->palette() ); TQPalette pal( app->palette() );
inExitPolish = true; inExitPolish = true;
if ( !isPlain() ) if ( !isPlain() ) {
{
// reset any stipples // reset any stipples
if ( pal.brush( TQPalette::Active, TQColorGroup::Background ).pixmap() ) if ( pal.brush( TQPalette::Active, TQColorGroup::Background ).pixmap() )
pal.setBrush( TQColorGroup::Background, pal.active().background() ); pal.setBrush( TQColorGroup::Background, pal.active().background() );
@ -224,16 +225,19 @@ void LiquidStyle::unPolish( TQApplication *app )
inExitPolish = false; inExitPolish = false;
} }
}
Atom baghira_deco_design = XInternAtom(tqt_xdisplay(), "BAGHIRA_DECO_DESIGN", False); Atom baghira_deco_design = XInternAtom(tqt_xdisplay(), "BAGHIRA_DECO_DESIGN", False);
void LiquidStyle::polish( TQWidget *w ) void LiquidStyle::polish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
{ {
// bool testWidget = w->inherits("Splash"); // bool testWidget = w->inherits("Splash");
// int testInt = 0; // int testInt = 0;
// if (w->sizePolicy().horData() == TQSizePolicy::Minimum || w->sizePolicy().horData() == TQSizePolicy::MinimumExpanding) // if (w->sizePolicy().horData() == TQSizePolicy::Minimum || w->sizePolicy().horData() == TQSizePolicy::MinimumExpanding)
// tqWarning("%s, \"%s\"",w->className(), w->name()); // tqWarning("%s, \"%s\"",w->className(), w->name());
// w->installEventFilter(this); // w->installEventFilter(this);
if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
TQWidget *w = reinterpret_cast<TQWidget*>(ptr);
bool tmpBool = false; bool tmpBool = false;
bool isViewport = qstrcmp( w->name(), "qt_viewport" ) == 0 || bool isViewport = qstrcmp( w->name(), "qt_viewport" ) == 0 ||
@ -744,13 +748,17 @@ void LiquidStyle::polish( TQWidget *w )
if ( w->inherits( "KdetvView")) { if ( w->inherits( "KdetvView")) {
w->setBackgroundMode( TQWidget::NoBackground ); w->setBackgroundMode( TQWidget::NoBackground );
} }
}
//if (testWidget) tqWarning("testwidget stage %d",testInt++); //if (testWidget) tqWarning("testwidget stage %d",testInt++);
kstpolish: TDEStyle::polish( w ); // nothing of all above? do default kde stuff kstpolish: TDEStyle::polish( ceData, elementFlags, ptr ); // nothing of all above? do default kde stuff
} }
void LiquidStyle::unPolish( TQWidget *w ) { void LiquidStyle::unPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr ) {
if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
TQWidget *w = reinterpret_cast<TQWidget*>(ptr);
bool isViewport; bool isViewport;
bool isViewportChild; bool isViewportChild;
@ -874,5 +882,6 @@ void LiquidStyle::unPolish( TQWidget *w ) {
goto kstunpolish; goto kstunpolish;
} }
} }
kstunpolish: TDEStyle::unPolish( w ); }
kstunpolish: TDEStyle::unPolish( ceData, elementFlags, ptr );
} }

Write Preview
Loading…
Cancel
Save