Browse Source

Initial TDE conversion

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/1/head
Slávek Banko 6 years ago
parent
commit
88b7febc23
  1. 20
      README
  2. 2
      bab/Makefile.am
  3. 2
      bab/bab.desktop
  4. 4
      bab/bab.h
  5. 56
      bab/main.cpp
  6. 2
      bab/styleconfdialog.cpp
  7. 4
      bab/styleconfdialog.h
  8. 2
      colorscheme/Makefile.am
  9. 2
      config/Makefile.am
  10. 8
      config/colordialog.cpp
  11. 64
      config/kstyle_baghira_config.cpp
  12. 12
      config/kstyle_baghira_config.h
  13. 2
      deco/Doxyfile
  14. 20
      deco/Makefile.am
  15. 2
      deco/baghira.desktop
  16. 14
      deco/baghiraclient.cc
  17. 2
      deco/baghiraclient.h
  18. 14
      deco/config/Makefile.am
  19. 18
      deco/config/baghiraconfig.cc
  20. 18
      deco/config/baghiraconfig.cc.new
  21. 8
      deco/config/baghiraconfig.h
  22. 8
      deco/config/baghiraconfig.h.new
  23. 2
      deco/config/configdialog.ui
  24. 2
      deco/config/configdialog.ui.new
  25. 2
      kickermenu-3.3/Makefile.am
  26. 4
      kickermenu-3.3/b_menuapplet.desktop
  27. 20
      kickermenu-3.3/menuapplet.cpp
  28. 8
      kickermenu-3.3/menuapplet.h
  29. 2
      kickermenu/Makefile.am
  30. 2
      kickermenu/configure.in.in
  31. 32
      kickermenu/menuapplet.cpp
  32. 10
      kickermenu/menuapplet.h
  33. 2
      sessionapplet/Makefile.am
  34. 22
      sessionapplet/dmctl.cpp
  35. 10
      sessionapplet/dmctl.h
  36. 28
      sessionapplet/usermanager.cpp
  37. 4
      sessionapplet/usermanager.desktop
  38. 4
      sessionapplet/usermanager.h
  39. 2
      sidebar/Makefile.am
  40. 8
      sidebar/baghirasidebar.cpp
  41. 2
      sidebar/baghirasidebar.desktop
  42. 6
      sidebar/baghirasidebar.h
  43. 2
      sidebar/baghirasidebar_add.desktop
  44. 2
      sidebar/configure.in.in
  45. 50
      sidebar/dndlistbox.cpp
  46. 12
      sidebar/dndlistbox.h
  47. 2
      sidebar/linkconfig.ui
  48. 8
      sidebar/linkview.cpp
  49. 2
      sidebar/listboxlink.cpp
  50. 2
      sidebar/listboxlink.h
  51. 2
      starter/Makefile.am
  52. 2
      starter/config.ui
  53. 2
      starter/linkconfig.ui
  54. 108
      starter/menu.cpp
  55. 14
      starter/menu.h
  56. 42
      starter/starter.cpp
  57. 4
      starter/starter.desktop
  58. 10
      starter/starter.h
  59. 4
      style/Makefile.am
  60. 74
      style/baghira.cpp
  61. 6
      style/baghira.h
  62. 12
      style/eventfilter.cpp
  63. 2
      style/optionHandler.cpp
  64. 36
      style/polish.cpp
  65. 2
      style/utils.cpp

20
README

@ -9,7 +9,7 @@ Installation
tar -xjf baghira.tar.bz2
cd baghira/baghira
either try ./install.sh or
./configure --prefix=`kde-config --prefix` --disable-debug [--enable-final]
./configure --prefix=`tde-config --prefix` --disable-debug [--enable-final]
(!!!BEGINNERS: the direction of the accents is _important_ (top-left to bottom-right), the rectangular brackets mean "this is optional" - don't type them!!!)
make
and finally as root:
@ -123,12 +123,12 @@ as i don't have such nice access on the startmenu as the button has, its not pos
* (bab) update: rewrote the way design switching stuff according to kde 3.4, removed all imperfect workaround stuff -> works much better, but needs kde 3.4 to work properly
* (kickermenu) update: using XClassHint to display the appname (better than relying on the netwm info)
* (kickermenu) update: using app menu instead of desktop menu for modal dialogs
* (kickermenu) note: kicker from kde 3.4 has a special menupanel that autoloads the kicker menuapplet to display the menu. you can remove this menu and readd the baghiramenu, but you'll have to do that after every kde start. -> open [kdeprefix - e.g. usr]/share/apps/kicker/applets/menuapplet.desktop, change "X-KDE-Library=menu_panelapplet" to "X-KDE-Library=b_menu_panelapplet" or (as root) run the following script (simply using sed to update the file):
* (kickermenu) note: kicker from kde 3.4 has a special menupanel that autoloads the kicker menuapplet to display the menu. you can remove this menu and readd the baghiramenu, but you'll have to do that after every kde start. -> open [kdeprefix - e.g. usr]/share/apps/kicker/applets/menuapplet.desktop, change "X-TDE-Library=menu_panelapplet" to "X-TDE-Library=b_menu_panelapplet" or (as root) run the following script (simply using sed to update the file):
--------------------start---------------
#!/bin/sh
sed s/"X-KDE-Library=menu_panelapplet"/"X-KDE-Library=b_menu_panelapplet"/g $(kde-config --prefix)/share/apps/kicker/applets/menuapplet.desktop > _baghirabuffer_
rm -f $(kde-config --prefix)/share/apps/kicker/applets/menuapplet.desktop
mv _baghirabuffer_ $(kde-config --prefix)/share/apps/kicker/applets/menuapplet.desktop
sed s/"X-TDE-Library=menu_panelapplet"/"X-TDE-Library=b_menu_panelapplet"/g $(tde-config --prefix)/share/apps/kicker/applets/menuapplet.desktop > _baghirabuffer_
rm -f $(tde-config --prefix)/share/apps/kicker/applets/menuapplet.desktop
mv _baghirabuffer_ $(tde-config --prefix)/share/apps/kicker/applets/menuapplet.desktop
---------------------end----------------
0.6a
@ -165,7 +165,7 @@ so the only solution i found was to disable the palette update for the toolbutto
0.5e
----
style:
- fixed the "kde toolbar widget" thing (location bar/juk slider etc.)
- fixed the "tde toolbar widget" thing (location bar/juk slider etc.)
- worked around brushed metal kicker translucency support
- changed the appereance of the kicker executor (like konqueror combobox)
- worked around konqueror statusbar offset
@ -201,7 +201,7 @@ bab:
- added some colored throbbers and an xcf so you can create your own colors
- sorting headers appear colored
- put the menuapplet into its own library, so it won't conflict with the kde one and is installed by default
- corrected kwin (stippled) frame to align the style
- corrected twin (stippled) frame to align the style
- corercted brushed toolbars (disalignment)
0.5c
@ -217,7 +217,7 @@ anyway, i don't know since which version this holds, therefore maybe you want to
Mainly kde3.3 alignments
- fixed juk toolbar stuff (and any other)
- fixed new kwin buttons
- fixed new twin buttons
- toplevelmenubars are not set to stipples anymore, honoring the fact, that the kicker menuapplet recolors them itself to kicker background
- arrows will are dark grey rather than black - makes them appear more smooth
@ -249,7 +249,7 @@ Bab:
Goodies:
The stuff in this folder is not autoinstalled.
Look into it and use whatever you want, however you want (except claiming cr and suing me for nonliterally copying ;)
- added new stuff: bootsplash, konqui tile, kdm picture, lilo-bootscreen
- added new stuff: bootsplash, konqui tile, tdm picture, lilo-bootscreen
*** read the readme! ***
0.5a
@ -411,7 +411,7 @@ haha...! i even had some letters left ;)
- bugfixed the setting stuff (misdisplayd groupboxes, ability to unset shadows under popups...)
- Tab vs. Chooser is now optional
o the default setting is somewhat clever, i.e. if the toplevel widget is a dialog, tabs appear as choosers, as oldstyle tabs elsewise
-> result: apps like konqueror, kdevelop, quanta, konsole... will show tabs, dialogs will show choosers
-> result: apps like konqueror, tdevelop, quanta, konsole... will show tabs, dialogs will show choosers
o you can define the tab behaviour for aqua and brushed metal individually in the bab menu
- fixed menu animation stuff
- fixed bookmark menu behaviour (so could have told me...)

2
bab/Makefile.am

@ -19,4 +19,4 @@ bin_PROGRAMS = bab
# the application source, library search path, and link libraries
bab_SOURCES = main.cpp styleconfdialog.cpp bab_iface.skel
bab_LDFLAGS = $(KDE_RPATH) $(all_libraries)
bab_LDADD = $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI)
bab_LDADD = $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI)

2
bab/bab.desktop

@ -5,6 +5,6 @@ Name[xx]=xxbabxx
Exec=bab %i %m -caption "%c"
Icon=baghira
Type=Application
DocPath=
X-DocPath=
Comment=Access to the big black cat
Terminal=0

4
bab/bab.h

@ -29,7 +29,7 @@
#include <tqwidget.h>
#include <tqpixmap.h>
#include <tqsettings.h>
#include <kmainwindow.h>
#include <tdemainwindow.h>
#include <ksystemtray.h>
class bab;
@ -75,7 +75,7 @@ class TQCheckBox;
* @author Thomas Lübking <baghira-style@gmx.net>
* @version 0.1
*/
class bab : public KMainWindow
class bab : public TDEMainWindow
{
Q_OBJECT
public:

56
bab/main.cpp

@ -31,17 +31,17 @@
#include <tqvbox.h>
#include <tqpainter.h>
#include <dcopclient.h>
#include <kapplication.h>
// #include <kconfig.h>
#include <tdeapplication.h>
// #include <tdeconfig.h>
#include <kiconloader.h>
#include <kaboutdata.h>
#include <kcmdlineargs.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
#include <kipc.h>
#include <klibloader.h>
#include <klocale.h>
#include <tdelocale.h>
#include <kprocess.h>
#if KDE_IS_VERSION(3,4,0)
#include <kwin.h>
#include <twin.h>
#endif
#include <stdio.h>
#include <X11/Xlib.h>
@ -54,20 +54,20 @@ static const char description[] =
static const char version[] = "cvs";
static KCmdLineOptions options[] =
static TDECmdLineOptions options[] =
{
// { "+[URL]", I18N_NOOP( "Document to open." ), 0 },
KCmdLineLastOption
TDECmdLineLastOption
};
int main(int argc, char **argv)
{
KAboutData about("bab", I18N_NOOP("BAB - Baghira Aqua/Brushed Switcher"), version, description,
KAboutData::License_GPL, "(C) 2004/2005 Thomas Lübking", 0, 0, "baghira-style@gmx.net");
TDEAboutData about("bab", I18N_NOOP("BAB - Baghira Aqua/Brushed Switcher"), version, description,
TDEAboutData::License_GPL, "(C) 2004/2005 Thomas Lübking", 0, 0, "baghira-style@gmx.net");
about.addAuthor( "Thomas Lübking", 0, "baghira-style@gmx.net" );
KCmdLineArgs::init(argc, argv, &about);
KCmdLineArgs::addCmdLineOptions( options );
KApplication app;
TDECmdLineArgs::init(argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions( options );
TDEApplication app;
DCOPClient* client = app.dcopClient();
client->registerAs( "bab", false);
client->setDefaultObject( "babInterface" );
@ -94,7 +94,7 @@ int main(int argc, char **argv)
}
bab::bab() : KMainWindow(0,"bab",TQt::WStyle_StaysOnTop | TQt::WX11BypassWM ){
bab::bab() : TDEMainWindow(0,"bab",TQt::WStyle_StaysOnTop | TQt::WX11BypassWM ){
bSwitcher = new BabSwitcher(this,"switcher");
TQToolTip::add(bSwitcher, i18n("leftclick toggles state<br>rightclick toggles setupmenu"));
bSwitcher->show();
@ -195,7 +195,7 @@ bab::~ bab()
if (bSwitcher) delete bSwitcher;
}
/*Taken from kcontrol, kcmshell style*/
/*Taken from kcontrol, tdecmshell style*/
void bab::configureBaghira()
{
@ -235,7 +235,7 @@ void bab::configureBaghira()
TQObject *decoObject = 0;
if (tw)
{
KLibrary* library2 = loader->library( TQFile::encodeName("kwin_baghira_config") );
KLibrary* library2 = loader->library( TQFile::encodeName("twin_baghira_config") );
if (!library2)
{
tqWarning("There was an error loading the configuration dialog for the deco.");
@ -247,7 +247,7 @@ void bab::configureBaghira()
tqWarning("There was an error loading the configuration dialog for this style.");
return;
}
typedef TQObject*(* factoryRoutine2)( KConfig* conf, TQWidget* parent );
typedef TQObject*(* factoryRoutine2)( TDEConfig* conf, TQWidget* parent );
factoryRoutine2 factory2 = (factoryRoutine2)(allocPtr2);
decoObject = factory2( 0, tw );
decoConfig = (TQWidget*)tw->child("ConfigDialog");
@ -266,7 +266,7 @@ void bab::configureBaghira()
connect(dial, SIGNAL(defaults()), styleConfig, SLOT(defaults()));
connect(dial, SIGNAL(save()), styleConfig, SLOT(save()));
connect(dial, SIGNAL(defaults()), decoObject, SLOT(defaults()));
connect(dial, SIGNAL(save(KConfig*)), decoObject, SLOT(save(KConfig*)));
connect(dial, SIGNAL(save(TDEConfig*)), decoObject, SLOT(save(TDEConfig*)));
if (dial->exec() == TQDialog::Accepted)
{
@ -277,7 +277,7 @@ void bab::configureBaghira()
KIPC::sendMessageAll(KIPC::ToolbarStyleChanged);
}
if (dial->isDecoDirty())
kapp->dcopClient()->send("kwin", "KWinInterface", "reconfigure()", TQByteArray());
kapp->dcopClient()->send("twin", "KWinInterface", "reconfigure()", TQByteArray());
}
tw->removeChild( decoObject );
dial->insertChild( decoObject );
@ -322,7 +322,7 @@ void bab::showEvent(TQShowEvent *e){
void bab::saveSettings(){
TQSettings *config = new TQSettings();
// KConfig *config = new KConfig("baghirarc");
// TDEConfig *config = new TDEConfig("baghirarc");
config->beginGroup("/baghira/BAB");
config->writeEntry("defaultState", DefStyle->currentItem());
config->writeEntry("roundCorners", cornerCheck->isChecked());
@ -334,12 +334,12 @@ TQPoint *BabSwitcher::globalPos = new TQPoint(0,0);
BabSwitcher::BabSwitcher(bab *parent, const char *name)
: KSystemTray(parent,name), DCOPObject("babInterface") {
KIconLoader* iLoader = KGlobal::iconLoader();
JaguarIcon = iLoader->loadIcon("bab_jaguar", KIcon::Small, 22);
PantherIcon = iLoader->loadIcon("bab_panther", KIcon::Small, 22);
iTunesIcon = iLoader->loadIcon("bab_itunes", KIcon::Small, 22);
TigerIcon = iLoader->loadIcon("bab_tiger", KIcon::Small, 22);
MilkIcon = iLoader->loadIcon("bab_milk", KIcon::Small, 22);
TDEIconLoader* iLoader = TDEGlobal::iconLoader();
JaguarIcon = iLoader->loadIcon("bab_jaguar", TDEIcon::Small, 22);
PantherIcon = iLoader->loadIcon("bab_panther", TDEIcon::Small, 22);
iTunesIcon = iLoader->loadIcon("bab_itunes", TDEIcon::Small, 22);
TigerIcon = iLoader->loadIcon("bab_tiger", TDEIcon::Small, 22);
MilkIcon = iLoader->loadIcon("bab_milk", TDEIcon::Small, 22);
installEventFilter(this);
}
@ -462,7 +462,7 @@ TQString BabSwitcher::deco()
void BabSwitcher::start(TQString name, TQString settings)
{
KProcess proc;
TDEProcess proc;
TQString section; int i = 0; bool done = false;
if (name.contains(' '))
{
@ -491,7 +491,7 @@ void BabSwitcher::start(TQString name, TQString settings)
symlink (tmpString.latin1(), tmpString2.latin1());
proc << name;
}
proc.start(KProcess::DontCare);
proc.start(TDEProcess::DontCare);
proc.detach();
}

2
bab/styleconfdialog.cpp

@ -19,7 +19,7 @@
*/
#include "styleconfdialog.h"
#include <klocale.h>
#include <tdelocale.h>
StyleConfigDialog::StyleConfigDialog(TQWidget* parent, TQString styleName):
KDialogBase(parent, "StyleConfigDialog",

4
bab/styleconfdialog.h

@ -23,7 +23,7 @@
#include <kdialogbase.h>
class KConfig;
class TDEConfig;
class StyleConfigDialog: public KDialogBase
{
Q_OBJECT
@ -43,7 +43,7 @@ private slots:
signals:
void defaults();
void save();
void save(KConfig*);
void save(TDEConfig*);
private:
bool m_styleDirty;

2
colorscheme/Makefile.am

@ -1,3 +1,3 @@
lnkdir = $(kde_datadir)/kdisplay/color-schemes
lnkdir = $(kde_datadir)/tdedisplay/color-schemes
lnk_DATA = AquaBlue.kcsrc AquaGraphite.kcsrc
EXTRA_DIST = $(lnk_DATA)

2
config/Makefile.am

@ -7,7 +7,7 @@ kde_module_LTLIBRARIES = kstyle_baghira_config.la
kstyle_baghira_config_la_SOURCES = kstyle_baghira_config.cpp colordialog.cpp colorpicker.cpp configdialog.ui help.ui about.ui
# kstyle_baghira_config_la_METASOURCES = AUTO
kstyle_baghira_config_la_LIBADD = $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO)
kstyle_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)

8
config/colordialog.cpp

@ -7,8 +7,8 @@
#include <tqpixmap.h>
#include <tqpushbutton.h>
#include <tqstyle.h>
#include <kglobal.h>
#include <kglobalsettings.h>
#include <tdeglobal.h>
#include <tdeglobalsettings.h>
#include <kcolordialog.h>
#include <kiconloader.h>
#include "colorpicker.h"
@ -45,7 +45,7 @@ ColorDialog::ColorDialog(TQWidget* parent, const char* name) : TQDialog( parent,
TQVBoxLayout *topRight = new TQVBoxLayout(top);
TQLabel *info = new TQLabel("<qt>Select custom colors or grab directly from screen.<br>Click image left to switch between items.</qt>",this);
topRight->addWidget(info);
TQIconSet icon = KGlobal::iconLoader()->loadIconSet("colorpicker", KIcon::Small);
TQIconSet icon = TDEGlobal::iconLoader()->loadIconSet("colorpicker", TDEIcon::Small);
buttonCP = new TQPushButton(icon, TQString::null, this);
topRight->addWidget(buttonCP);
TQLabel *lb = new TQLabel("From other app:",this);
@ -74,7 +74,7 @@ ColorDialog::ColorDialog(TQWidget* parent, const char* name) : TQDialog( parent,
picker[High]->setColor(colorGroup().highlight());
picker[HighText]->setColor(colorGroup().highlightedText());
picker[ButText]->setColor(colorGroup().buttonText ());
picker[Alternate]->setColor(KGlobalSettings::alternateBackgroundColor());
picker[Alternate]->setColor(TDEGlobalSettings::alternateBackgroundColor());
for (int i = 0; i < NUMCOLORS; i++)
picker[i]->blockSignals(false);
// demo->repaint(false);

64
config/kstyle_baghira_config.cpp

@ -27,7 +27,7 @@
#include <tqfile.h>
#include <tqfileinfo.h>
#include <tqgroupbox.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <tqpainter.h>
//#include <tqpalette.h>
// #include <tqsettings.h>
@ -37,20 +37,20 @@
#include <tqlabel.h>
#include <tqlineedit.h>
#include <tqpixmap.h>
#include <klistview.h>
#include <tdelistview.h>
#include <tqtabwidget.h>
#include <tqtimer.h>
#include <dcopclient.h>
#include <kapplication.h>
#include <tdeapplication.h>
#include <kcolorbutton.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kimageeffect.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kglobal.h>
#include <kglobalsettings.h>
#include <tdelocale.h>
#include <tdemessagebox.h>
#include <tdeglobal.h>
#include <tdeglobalsettings.h>
#include <kprocess.h>
#include <kparts/genericfactory.h>
#include <tdeparts/genericfactory.h>
#include <X11/Xlib.h>
#include <X11/Xatom.h>
@ -66,8 +66,8 @@
//#define VERSION "0.7"
#ifndef KDE_VERSION_STRING
#define KDE_VERSION_STRING "error"
#ifndef TDE_VERSION_STRING
#define TDE_VERSION_STRING "error"
#endif
#ifndef TQT_BUILD_KEY
#define TQT_BUILD_KEY "error error error error"
@ -105,24 +105,24 @@ void kstyle_baghira_config::openHtml1()
{
TQStringList args;
args << "exec" << "http://baghira.sf.net/";
kapp->kdeinitExec("kfmclient", args);
kapp->tdeinitExec("kfmclient", args);
}
void kstyle_baghira_config::openHtml2()
{
TQStringList args;
args << "exec" << "http://www.sf.net/projects/baghira/files/";
kapp->kdeinitExec("kfmclient", args);
kapp->tdeinitExec("kfmclient", args);
}
void kstyle_baghira_config::startBab()
{
kapp->kdeinitExec("bab");
kapp->tdeinitExec("bab");
}
void kstyle_baghira_config::startKRuler()
{
kapp->kdeinitExec("kruler");
kapp->tdeinitExec("kruler");
}
TQImage* kstyle_baghira_config::tintButton(TQImage &src, TQColor c)
@ -296,7 +296,7 @@ kstyle_baghira_config::kstyle_baghira_config(TQWidget *parent, const char *name,
TQWidget *rulesWidget = new TQWidget(dialog_->tabWidget);
TQHBoxLayout *rwlh = new TQHBoxLayout(rulesWidget);
applist = new KListView(rulesWidget);
applist = new TDEListView(rulesWidget);
applist->setFullWidth(true);
#if KDE_IS_VERSION(3,3,91)
applist->setShadeSortColumn(false);
@ -314,9 +314,9 @@ kstyle_baghira_config::kstyle_baghira_config(TQWidget *parent, const char *name,
{
TQFileInfo FI = TQFileInfo(d, d[i]);
if (FI.isSymLink())
applist->insertItem(new KListViewItem(applist, d[i], FI.readLink().section('/',-1,-1)));
applist->insertItem(new TDEListViewItem(applist, d[i], FI.readLink().section('/',-1,-1)));
else
applist->insertItem(new KListViewItem(applist, d[i]));
applist->insertItem(new TDEListViewItem(applist, d[i]));
}
}
rwlh->addWidget(applist);
@ -351,7 +351,7 @@ kstyle_baghira_config::kstyle_baghira_config(TQWidget *parent, const char *name,
help_ = new Help(dialog_);
about_ = new About(dialog_);
about_->versionLabel->setText(VERSION);
about_->kdeLabel->setText(KDE_VERSION_STRING);
about_->kdeLabel->setText(TDE_VERSION_STRING);
crCurrent = 0;
crNotes[0] = "<qt>© 2003-2005 by Thomas Lübking<br>http://baghira.SourceForge.net</qt>";
crNotes[1] = "<qt>© \"Design\" 2001-2005 by Apple inc.<br>http://www.apple.com";
@ -481,7 +481,7 @@ void kstyle_baghira_config::load()
void kstyle_baghira_config::load(TQString &fileName)
{
KConfig *config = new KConfig(fileName);
TDEConfig *config = new TDEConfig(fileName);
// TQSettings config;
config->setGroup("BAB");
// general Design
@ -576,7 +576,7 @@ void kstyle_baghira_config::load(TQString &fileName)
config->setGroup("Sidebar");
delete config;
config = new KConfig("kdeglobals");
config = new TDEConfig("kdeglobals");
config->setGroup( "Toolbar style" );
dialog_->toolbuttonHighColor->setColor(config->readColorEntry("HighlightColor", new TQColor(103,141,178)) );
delete config;
@ -666,7 +666,7 @@ void kstyle_baghira_config::save()
void kstyle_baghira_config::changeTooluttonHighlightColor(const TQColor & color)
{
KConfig *config = new KConfig("kdeglobals");
TDEConfig *config = new TDEConfig("kdeglobals");
config->setGroup( "Toolbar style" );
config->writeEntry("HighlightColor", color);
delete config;
@ -684,7 +684,7 @@ void kstyle_baghira_config::handleButtonStyles(int i)
void kstyle_baghira_config::save(TQString &fileName)
{
// TQSettings *config = new TQSettings;
KConfig *config = new KConfig(fileName);
TDEConfig *config = new TDEConfig(fileName);
config->setGroup("BAB");
//General Design
config->writeEntry("defaultState", dialog_->defaultStyle->currentItem());
@ -739,15 +739,15 @@ Hidden=true\n\
Type=Plugin\n\
Encoding=UTF-8\n\
Name=BaghiraMenu\n\
X-KDE-Library=b_menu_panelapplet\n\
X-KDE-UniqueApplet=true\n";
X-TDE-Library=b_menu_panelapplet\n\
X-TDE-UniqueApplet=true\n";
file.writeBlock( msg, tqstrlen(msg) );
file.close();
}
else
file.remove();
if (dialog_->replaceMenubar->isOn() != menuReplaced)
KApplication::dcopClient()->send("kicker", "default", "restart()", "");
TDEApplication::dcopClient()->send("kicker", "default", "restart()", "");
//Srollbars
config->writeEntry("Special_AnimateSlider", dialog_->animateSlider->isOn());
config->writeEntry("Special_ShadowSlider", dialog_->shadowSlider->isOn());
@ -868,7 +868,7 @@ void kstyle_baghira_config::removeApp(TQString name)
void kstyle_baghira_config::addApp(TQString string, TQString linkString)
{
applist->insertItem(new KListViewItem(applist, string, linkString));
applist->insertItem(new TDEListViewItem(applist, string, linkString));
applist->sort();
}
@ -950,13 +950,13 @@ void kstyle_baghira_config::menuToggled(bool active)
{
if (!active || !loadDone)
return;
KConfigGroup menuConfig(KGlobal::config(), "KDE");
TDEConfigGroup menuConfig(TDEGlobal::config(), "KDE");
if (!menuConfig.readBoolEntry("macStyle", false))
if (KMessageBox::questionYesNo(0, i18n("<qt>You just selected to replace kickers menu applet for the Mac like Menubar on top of the screen, but the Mac like style isn't selected anyway<br>Do you want to activate it now?</qt>"), 0L, KStdGuiItem::yes(), KStdGuiItem::no()) == KMessageBox::Yes)
{
KProcess proc;
proc << "kcmshell" << "desktopbehavior";
proc.start(KProcess::DontCare);
TDEProcess proc;
proc << "tdecmshell" << "desktopbehavior";
proc.start(TDEProcess::DontCare);
proc.detach();
}
configChanged();
@ -1179,7 +1179,7 @@ void AppSetter::resetColorPicker()
colorDialog->picker[High]->setColor(colorGroup().highlight());
colorDialog->picker[HighText]->setColor(colorGroup().highlightedText());
colorDialog->picker[ButText]->setColor(colorGroup().buttonText ());
colorDialog->picker[Alternate]->setColor(KGlobalSettings::alternateBackgroundColor());
colorDialog->picker[Alternate]->setColor(TDEGlobalSettings::alternateBackgroundColor());
for (int i = 0; i < 8; i++)
colorDialog->picker[i]->blockSignals(false);
((TQWidget*)colorDialog->demo)->repaint(false);

12
config/kstyle_baghira_config.h

@ -21,15 +21,15 @@
#ifndef _KSTYLE_BAGHIRA_CONFIG_H_
#define _KSTYLE_BAGHIRA_CONFIG_H_
//#include <kcmodule.h>
//#include <tdecmodule.h>
#include <tqcolor.h>
#include <tqimage.h>
#include <kaboutdata.h>
#include <tdeaboutdata.h>
#include "configdialog.h"
#include "help.h"
#include "about.h"
class KListView;
class TDEListView;
class TQPushButton;
class AppSetter;
class TQTimer;
@ -50,7 +50,7 @@ public:
void save(TQString &fileName);
// virtual int buttons();
virtual TQString quickHelp() const;
virtual const KAboutData *aboutData()const
virtual const TDEAboutData *aboutData()const
{ return myAboutData; };
public slots:
@ -78,11 +78,11 @@ protected:
private:
TQString crNotes[3];
AppSetter *appsetter;
KListView *applist;
TDEListView *applist;
TQImage* tintButton(TQImage &src, TQColor c);
TQImage* tintBrush( TQImage &img, TQColor c/*, int saturation*/ );
WId findWindow();
KAboutData *myAboutData;
TDEAboutData *myAboutData;
Config *dialog_;
Help* help_;
About* about_;

2
deco/Doxyfile

@ -3,7 +3,7 @@
#---------------------------------------------------------------------------
# Project related configuration options
#---------------------------------------------------------------------------
PROJECT_NAME = baghira_deco.kdevelop
PROJECT_NAME = baghira_deco.tdevelop
PROJECT_NUMBER = $VERSION$
OUTPUT_DIRECTORY =
OUTPUT_LANGUAGE = English

20
deco/Makefile.am

@ -4,22 +4,22 @@ SUBDIRS = config
KDE_CXXFLAGS = -DQT_PLUGIN
INCLUDES = $(all_includes) -I$(kde_includes)/kwin
INCLUDES = $(all_includes) -I$(kde_includes)/twin
kwindir = $(kde_datadir)/kwin/
kwin_DATA = baghira.desktop
twindir = $(kde_datadir)/twin/
twin_DATA = baghira.desktop
EXTRA_DIST = $(kwin_DATA) images
EXTRA_DIST = $(twin_DATA) images
noinst_HEADERS = baghiraclient.h pixmaps.h masks.h
kde_module_LTLIBRARIES = kwin3_baghira.la
kwin3_baghira_la_SOURCES = baghiraclient.cc
kwin3_baghira_la_LIBADD = $(kde_libraries)/libkdecorations.la
kwin3_baghira_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(KDE_PLUGIN) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx -module
kwin3_baghira_la_METASOURCES = AUTO
kde_module_LTLIBRARIES = twin3_baghira.la
twin3_baghira_la_SOURCES = baghiraclient.cc
twin3_baghira_la_LIBADD = $(kde_libraries)/libtdecorations.la
twin3_baghira_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx -module
twin3_baghira_la_METASOURCES = AUTO
DISTCLEANFILES = $(kwin3_baghira_la_METASOURCES)
DISTCLEANFILES = $(twin3_baghira_la_METASOURCES)
pixmaps.h: $(srcdir)/generatePixmaps.sh
$(SHELL) $(srcdir)/generatePixmaps.sh $(top_srcdir)

2
deco/baghira.desktop

@ -2,4 +2,4 @@
[Desktop Entry]
Encoding=UTF-8
Name=Baghira
X-KDE-Library=kwin3_baghira
X-TDE-Library=twin3_baghira

14
deco/baghiraclient.cc

@ -7,14 +7,14 @@
// Please see the header file for copyright and license information.
//////////////////////////////////////////////////////////////////////////////
// #include <kconfig.h>
#include <kglobal.h>
#include <kglobalsettings.h>
// #include <tdeconfig.h>
#include <tdeglobal.h>
#include <tdeglobalsettings.h>
#include <kimageeffect.h>
#include <klocale.h>
#include <tdelocale.h>
#include <kpixmapeffect.h>
#include <kwin.h>
#include <kwinmodule.h>
#include <twin.h>
#include <twinmodule.h>
#include <tqapplication.h>
#include <tqbitmap.h>
#include <tqcursor.h>
@ -370,7 +370,7 @@ unsigned long BaghiraFactory::readConfig() {
TQSettings config;
config.beginGroup("/baghira/Style");
// KConfig config( "baghirarc" );
// TDEConfig config( "baghirarc" );
// config.setGroup( "Style" );
bgStipple_ = config.readBoolEntry( "Design_StippleBackground", false);
contrast_ = config.readNumEntry( "Design_StippleContrast", 30 );

2
deco/baghiraclient.h

@ -32,7 +32,7 @@
#include <kdecoration.h>
#include <kdecorationfactory.h>
#include <kpixmap.h>
#include <kdeversion.h>
#include <tdeversion.h>
/*
#define BUTTONSIZE 15;
#define MENUBUTTONWIDTH 20;

14
deco/config/Makefile.am

@ -6,16 +6,16 @@ INCLUDES = $(all_includes) -I$(srcdir)/../../config
noinst_HEADERS = baghiraconfig.h aquariusbutton.h colorpicker.h pixmaps.h
kde_module_LTLIBRARIES = kwin_baghira_config.la
kwin_baghira_config_la_SOURCES = baghiraconfig.cc aquariusbutton.cc colorpicker.cc configdialog.ui
kwin_baghira_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
kwin_baghira_config_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
kwin_baghira_config_la_METASOURCES = AUTO
kde_module_LTLIBRARIES = twin_baghira_config.la
twin_baghira_config_la_SOURCES = baghiraconfig.cc aquariusbutton.cc colorpicker.cc configdialog.ui
twin_baghira_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
twin_baghira_config_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
twin_baghira_config_la_METASOURCES = AUTO
DISTCLEANFILES = $(kwin_baghira_config_la_METASOURCES)
DISTCLEANFILES = $(twin_baghira_config_la_METASOURCES)
messages:
$(XGETTEXT) *.cpp -o $(podir)/kwin_baghira_config.pot
$(XGETTEXT) *.cpp -o $(podir)/twin_baghira_config.pot
pixmaps.h: $(srcdir)/generatePixmaps.sh
$(SHELL) $(srcdir)/generatePixmaps.sh $(top_srcdir)

18
deco/config/baghiraconfig.cc

@ -7,9 +7,9 @@
// Please see the header file for copyright and license information.
//////////////////////////////////////////////////////////////////////////////
#include <kconfig.h>
#include <klocale.h>
#include <kglobal.h>
#include <tdeconfig.h>
#include <tdelocale.h>
#include <tdeglobal.h>
#include <kcolorbutton.h>
#include <tqbutton.h>
#include <tqbuttongroup.h>
@ -38,13 +38,13 @@
// -------------
// Constructor
BaghiraConfig::BaghiraConfig(KConfig*, TQWidget* parent)
BaghiraConfig::BaghiraConfig(TDEConfig*, TQWidget* parent)
: TQObject(parent), /*config_(0),*/ dialog_(0)
{
// config_ = new KConfig("baghirarc");
// config_ = new TDEConfig("baghirarc");
// config_ = new TQSettings;
// config_->beginGroup("/baghira/Deco");
KGlobal::locale()->insertCatalogue("kwin_baghira_config");
TDEGlobal::locale()->insertCatalogue("twin_baghira_config");
dialog_ = new ConfigDialog(parent);
buttonDialog_ = new ButtonColors(parent, "Button Colors");
@ -162,7 +162,7 @@ BaghiraConfig::~BaghiraConfig()
// ------
// Load configuration data
void BaghiraConfig::load(KConfig*)
void BaghiraConfig::load(TDEConfig*)
{
TQSettings *config_ = new TQSettings;
config_->beginGroup("/baghira/Deco");
@ -279,7 +279,7 @@ void BaghiraConfig::load(KConfig*)
// ------
// Save configuration data
void BaghiraConfig::save(KConfig*)
void BaghiraConfig::save(TDEConfig*)
{
TQSettings *config_ = new TQSettings;
config_->beginGroup("/baghira/Deco");
@ -721,7 +721,7 @@ void ButtonColors::init(){
extern "C"
{
TQObject* allocate_config(KConfig* config, TQWidget* parent) {
TQObject* allocate_config(TDEConfig* config, TQWidget* parent) {
return(new BaghiraConfig(config, parent));
}
}

18
deco/config/baghiraconfig.cc.new

@ -7,9 +7,9 @@
// Please see the header file for copyright and license information.
//////////////////////////////////////////////////////////////////////////////
#include <kconfig.h>
#include <klocale.h>
#include <kglobal.h>
#include <tdeconfig.h>
#include <tdelocale.h>
#include <tdeglobal.h>
#include <kcolorbutton.h>
#include <tqbutton.h>
#include <tqbuttongroup.h>
@ -39,13 +39,13 @@
// -------------
// Constructor
BaghiraConfig::BaghiraConfig(KConfig*, TQWidget* parent)
BaghiraConfig::BaghiraConfig(TDEConfig*, TQWidget* parent)
: TQObject(parent), /*config_(0),*/ dialog_(0)
{
// config_ = new KConfig("baghirarc");
// config_ = new TDEConfig("baghirarc");
// config_ = new TQSettings;
// config_->beginGroup("/baghira/Deco");
KGlobal::locale()->insertCatalogue("kwin_baghira_config");
TDEGlobal::locale()->insertCatalogue("twin_baghira_config");
dialog_ = new ConfigDialog(parent);
buttonDialog_ = new ButtonColors(parent, "Button Colors");
@ -163,7 +163,7 @@ BaghiraConfig::~BaghiraConfig()
// ------
// Load configuration data
void BaghiraConfig::load(KConfig*)
void BaghiraConfig::load(TDEConfig*)
{
TQSettings *config_ = new TQSettings;
config_->beginGroup("/baghira/Deco");
@ -280,7 +280,7 @@ void BaghiraConfig::load(KConfig*)
// ------
// Save configuration data
void BaghiraConfig::save(KConfig*)
void BaghiraConfig::save(TDEConfig*)
{
TQSettings *config_ = new TQSettings;
config_->beginGroup("/baghira/Deco");
@ -722,7 +722,7 @@ void ButtonColors::init(){
extern "C"
{
TQObject* allocate_config(KConfig* config, TQWidget* parent) {
TQObject* allocate_config(TDEConfig* config, TQWidget* parent) {
return(new BaghiraConfig(config, parent));
}
}

8
deco/config/baghiraconfig.h

@ -32,7 +32,7 @@
#include "colorpicker.h"
#include "aquariusbutton.h"
class KConfig;
class TDEConfig;
class TQSettings;
class ConfigDialog;
class TQLabel;
@ -124,15 +124,15 @@ class BaghiraConfig : public TQObject
{
Q_OBJECT
public:
BaghiraConfig(KConfig* config, TQWidget* parent);
BaghiraConfig(TDEConfig* config, TQWidget* parent);
~BaghiraConfig();
signals:
void changed();
public slots:
void load(KConfig* conf);
void save(KConfig* conf);
void load(TDEConfig* conf);
void save(TDEConfig* conf);
void defaults();
private:

8
deco/config/baghiraconfig.h.new

@ -33,7 +33,7 @@
#include "colorpicker.h"
#include "aquariusbutton.h"
class KConfig;
class TDEConfig;
class TQSettings;
class ConfigDialog;
class TQLabel;
@ -126,15 +126,15 @@ class BaghiraConfig : public TQObject
{
Q_OBJECT
public:
BaghiraConfig(KConfig* config, TQWidget* parent);
BaghiraConfig(TDEConfig* config, TQWidget* parent);
~BaghiraConfig();
signals:
void changed();
public slots:
void load(KConfig* conf);
void save(KConfig* conf);
void load(TDEConfig* conf);
void save(TDEConfig* conf);
void defaults();
private:

2
deco/config/configdialog.ui

@ -123,7 +123,7 @@
<string>Draw Comic Frame</string>
</property>
<property name="toolTip" stdset="0">
<string>Draws a black frame around the window (not the Titlebar).&lt;br&gt;Anyway i suggest to get the kwin dropshadow patch.</string>
<string>Draws a black frame around the window (not the Titlebar).&lt;br&gt;Anyway i suggest to get the twin dropshadow patch.</string>
</property>
</widget>
<widget class="TQCheckBox" row="7" column="0">

2
deco/config/configdialog.ui.new

@ -211,7 +211,7 @@ from multipart titles</string>
<string>Draw Comic Frame</string>
</property>
<property name="toolTip" stdset="0">
<string>Draws a black frame around the window (not the Titlebar).&lt;br&gt;Anyway i suggest to get the kwin dropshadow patch.</string>
<string>Draws a black frame around the window (not the Titlebar).&lt;br&gt;Anyway i suggest to get the twin dropshadow patch.</string>
</property>
</widget>
<widget class="TQCheckBox" row="8" column="0">

2
kickermenu-3.3/Makefile.am

@ -14,7 +14,7 @@ lnk_DATA = b_menuapplet.desktop
EXTRA_DIST = $(lnk_DATA)
b_menu_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
b_menu_panelapplet_la_LIBADD = $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI)
b_menu_panelapplet_la_LIBADD = $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI)
messages:
$(XGETTEXT) *.cpp *.h -o $(podir)/kmenuapplet.pot

4
kickermenu-3.3/b_menuapplet.desktop

@ -5,5 +5,5 @@ Comment=Applet embedding standalone menubars (Patched baghira version)
Icon=menu
X-KDE-Library=b_menu_panelapplet
X-KDE-UniqueApplet=true
X-TDE-Library=b_menu_panelapplet
X-TDE-UniqueApplet=true

20
kickermenu-3.3/menuapplet.cpp

@ -30,15 +30,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <assert.h>
#include <tqcursor.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <tqtooltip.h>
#include <kglobal.h>
#include <klocale.h>
#include <tdeglobal.h>
#include <tdelocale.h>
#include <tqlayout.h>
#include <kdebug.h>
#include <netwm.h>
#include <kapplication.h>
#include <kwin.h>
#include <tdeapplication.h>
#include <twin.h>
#include <X11/Xlib.h>
@ -63,7 +63,7 @@ extern "C"
{
KPanelApplet* init( TQWidget* parent_P, const TQString& configFile_P )
{
KGlobal::locale()->insertCatalogue("kmenuapplet");
TDEGlobal::locale()->insertCatalogue("kmenuapplet");
return new KickerMenuApplet::Applet( configFile_P, parent_P );
}
}
@ -120,7 +120,7 @@ Applet::~Applet()
delete selection;
delete selection_watcher;
delete module;
KGlobal::locale()->removeCatalogue("kmenuapplet");
TDEGlobal::locale()->removeCatalogue("kmenuapplet");
}
void Applet::initPopup()
@ -428,7 +428,7 @@ void Applet::paletteChange(const TQPalette & /* oldPalette */)
void Applet::claimSelection()
{
assert( selection == NULL );
selection = new KSelectionOwner( makeSelectionAtom(), DefaultScreen( tqt_xdisplay()));
selection = new TDESelectionOwner( makeSelectionAtom(), DefaultScreen( tqt_xdisplay()));
// force taking the selection, but don't kill previous owner
if( selection->claim( true, false ))
{
@ -464,7 +464,7 @@ void Applet::lostSelection()
active_menu = NULL;
if( selection_watcher == NULL )
{
selection_watcher = new KSelectionWatcher( makeSelectionAtom(), DefaultScreen( tqt_xdisplay()));
selection_watcher = new TDESelectionWatcher( makeSelectionAtom(), DefaultScreen( tqt_xdisplay()));
connect( selection_watcher, SIGNAL( lostOwner()), this, SLOT( claimSelection()));
}
delete module;
@ -476,7 +476,7 @@ void Applet::lostSelection()
void Applet::readSettings()
{
KConfig cfg( "kdesktoprc", true );
TDEConfig cfg( "kdesktoprc", true );
cfg.setGroup( "Menubar" );
desktop_menu = cfg.readBoolEntry( "ShowMenubar", false );
cfg.setGroup( "KDE" );

8
kickermenu-3.3/menuapplet.h

@ -29,8 +29,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqintdict.h>
#include <tqvaluelist.h>
#include <tqmenubar.h>
#include <kwindowlistmenu.h>
#include <kwinmodule.h>
#include <twindowlistmenu.h>
#include <twinmodule.h>
#include <kmanagerselection.h>
#include <dcopclient.h>
#include <dcopobject.h>
@ -80,8 +80,8 @@ class Applet : public KPanelApplet, public DCOPObject
TQValueList< MenuEmbed* > menus;
MenuEmbed* active_menu;
KArrowButton grow_indicator_left, grow_indicator_right;
KSelectionOwner* selection;
KSelectionWatcher* selection_watcher;
TDESelectionOwner* selection;
TDESelectionWatcher* selection_watcher;
bool desktop_menu;
DCOPClient dcopclient;
// to show current active window (not necessary equal to the menubar)

2
kickermenu/Makefile.am

@ -9,7 +9,7 @@ noinst_HEADERS = menuapplet.h
b_menu_panelapplet_la_METASOURCES = AUTO
b_menu_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
b_menu_panelapplet_la_LIBADD = $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI)
b_menu_panelapplet_la_LIBADD = $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI)
messages:
$(XGETTEXT) *.cpp *.h -o $(podir)/kmenuapplet.pot

2
kickermenu/configure.in.in

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

32
kickermenu/menuapplet.cpp

@ -31,14 +31,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqtooltip.h>
#include <tqtimer.h>
#include <tqvariant.h> // avoid X11 #define's
#include <kapplication.h>
#include <kconfig.h>
#include <tdeapplication.h>
#include <tdeconfig.h>
#include <kdebug.h>
#include <kglobal.h>
#include <kglobalsettings.h>
#include <klocale.h>
#include <kwin.h>
#include <kwinmodule.h>
#include <tdeglobal.h>
#include <tdeglobalsettings.h>
#include <tdelocale.h>
#include <twin.h>
#include <twinmodule.h>
#include <netwm.h>
@ -67,7 +67,7 @@ extern "C"
{
KDE_EXPORT KPanelApplet* init( TQWidget* parent_P, const TQString& configFile_P )
{
KGlobal::locale()->insertCatalogue("kmenuapplet");
TDEGlobal::locale()->insertCatalogue("kmenuapplet");
return new KickerMenuApplet::Applet( configFile_P, parent_P );
}
}
@ -87,7 +87,7 @@ const long SUPPORTED_WINDOW_TYPES = NET::NormalMask | NET::DesktopMask | NET::Do
Applet::Applet( const TQString& configFile_P, TQWidget* parent_P ) : KPanelApplet( configFile_P, Normal, 0, parent_P, "menuapplet" ), DCOPObject( "menuapplet" ), module( NULL ), active_menu( NULL ), selection( NULL ), selection_watcher( NULL ), desktop_menu( false ), topEdgeOffset( 0 )
{
KConfig config(TQDir::homeDirPath() + "/.qt/baghirarc");
TDEConfig config(TQDir::homeDirPath() + "/.qt/baghirarc");
config.setGroup("Menubar");
_maxWidth = config.readNumEntry("Width", TQDesktopWidget().availableGeometry().width());
_menuMover = new TQLabel("<<|>>", this );
@ -103,7 +103,7 @@ Applet::Applet( const TQString& configFile_P, TQWidget* parent_P ) : KPanelApple
windowList = new KWindowListMenu(windowIndicator);
connect(windowList, SIGNAL(aboutToShow()), this, SLOT(initPopup()));
windowIndicator->insertItem( "KDE", windowList, 0);
TQFont tmpFont = KGlobalSettings::menuFont();
TQFont tmpFont = TDEGlobalSettings::menuFont();
windowIndicator->setFont(tmpFont);
// windowIndicator->adjustSize();
// int tmpHeight = windowIndicator->height();
@ -117,7 +117,7 @@ Applet::Applet( const TQString& configFile_P, TQWidget* parent_P ) : KPanelApple
//==============
// toolbarAppearanceChanged(int) is sent when changing macstyle
connect( kapp, SIGNAL( toolbarAppearanceChanged( int )), this, SLOT( readSettings()));
connect( kapp, SIGNAL( kdisplayFontChanged()), this, SLOT( fontChanged()));
connect( kapp, SIGNAL( tdedisplayFontChanged()), this, SLOT( fontChanged()));
claimSelection();
readSettings();
updateTopEdgeOffset();
@ -129,14 +129,14 @@ Applet::~Applet()
delete selection;
delete selection_watcher;
delete module;
KGlobal::locale()->removeCatalogue("kmenuapplet");
TDEGlobal::locale()->removeCatalogue("kmenuapplet");
}
void Applet::fontChanged()
{
if (!windowIndicator)
return;
TQFont tmpFont = KGlobalSettings::menuFont();
TQFont tmpFont = TDEGlobalSettings::menuFont();
// windowIndicator->setFont(tmpFont);
// windowIndicator->adjustSize();
// int tmpHeight = windowIndicator->height();
@ -504,7 +504,7 @@ void Applet::paletteChange(const TQPalette & /* oldPalette */)
void Applet::claimSelection()
{
assert( selection == NULL );
selection = new KSelectionOwner( makeSelectionAtom(), DefaultScreen( tqt_xdisplay()));
selection = new TDESelectionOwner( makeSelectionAtom(), DefaultScreen( tqt_xdisplay()));
// force taking the selection, but don't kill previous owner
if( selection->claim( true, false ))
{
@ -536,7 +536,7 @@ void Applet::lostSelection()
active_menu = NULL;
if( selection_watcher == NULL )
{
selection_watcher = new KSelectionWatcher( makeSelectionAtom(), DefaultScreen( tqt_xdisplay()));
selection_watcher = new TDESelectionWatcher( makeSelectionAtom(), DefaultScreen( tqt_xdisplay()));
connect( selection_watcher, SIGNAL( lostOwner()), this, SLOT( claimSelection()));
}
delete module;
@ -548,7 +548,7 @@ void Applet::lostSelection()
void Applet::readSettings()
{
KConfig cfg( "kdesktoprc", true );
TDEConfig cfg( "kdesktoprc", true );
cfg.setGroup( "Menubar" );
desktop_menu = cfg.readBoolEntry( "ShowMenubar", false );
cfg.setGroup( "KDE" );

10
kickermenu/menuapplet.h

@ -28,9 +28,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kpanelapplet.h>
#include <tqintdict.h>
#include <tqvaluelist.h>
#include <kmenubar.h>
#include <kwindowlistmenu.h>
#include <kwinmodule.h>
#include <tdemenubar.h>
#include <twindowlistmenu.h>
#include <twinmodule.h>
#include <kmanagerselection.h>
#include <dcopclient.h>
#include <dcopobject.h>
@ -85,8 +85,8 @@ private:
KWinModule* module;
TQValueList< MenuEmbed* > menus;
MenuEmbed* active_menu;
KSelectionOwner* selection;
KSelectionWatcher* selection_watcher;
TDESelectionOwner* selection;
TDESelectionWatcher* selection_watcher;
bool desktop_menu;
DCOPClient dcopclient;
int topEdgeOffset;

2
sessionapplet/Makefile.am

@ -5,7 +5,7 @@ lib_LTLIBRARIES = usermanager_panelapplet.la
usermanager_panelapplet_la_SOURCES = usermanager.cpp dmctl.cpp
usermanager_panelapplet_la_LDFLAGS = -module -avoid-version $(all_libraries)
usermanager_panelapplet_la_LIBADD = $(LIB_KDEUI)
usermanager_panelapplet_la_LIBADD = $(LIB_TDEUI)
usermanager_DATA = usermanager.desktop
usermanagerdir = $(kde_datadir)/kicker/applets

22
sessionapplet/dmctl.cpp

@ -21,7 +21,7 @@
#ifdef Q_WS_X11
#include <klocale.h>
#include <tdelocale.h>
#include <dcopclient.h>
#include <sys/types.h>
@ -91,16 +91,16 @@ DM::exec( const char *cmd )
}
/**
* Execute a KDM remote control command.
* Execute a TDM remote control command.
* @param cmd the command to execute. FIXME: undocumented yet.
* @param ret the result buffer.
* @return result:
* @li If true, the command was successfully executed.
* @p ret might contain addional results.
* @li If false and @p ret is empty, a communication error occurred
* (most probably KDM is not running).
* (most probably TDM is not running).
* @li If false and @p ret is non-empty, it contains the error message
* from KDM.
* from TDM.
*/
bool
DM::exec( const char *cmd, TQCString &buf )
@ -157,24 +157,24 @@ DM::canShutdown()
}
void
DM::shutdown( KApplication::ShutdownType shutdownType,
KApplication::ShutdownMode shutdownMode,
DM::shutdown( TDEApplication::ShutdownType shutdownType,
TDEApplication::ShutdownMode shutdownMode,
const TQString &bootOption )
{
if (!bootOption.isEmpty() && DMType != NewKDM)
return;
if (shutdownType != KApplication::ShutdownTypeNone) {
if (shutdownType != TDEApplication::ShutdownTypeNone) {
TQCString cmd( "shutdown\t" );
cmd.append( shutdownType == KApplication::ShutdownTypeReboot ?
cmd.append( shutdownType == TDEApplication::ShutdownTypeReboot ?
"reboot\t" : "halt\t" );
if (!bootOption.isNull())
cmd.append( "=" ).append( bootOption.local8Bit() ).append( "\t" );
cmd.append( shutdownMode == KApplication::ShutdownModeInteractive ?