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

Initial TDE conversion

Browse Source 
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/4/head
Slávek Banko 9 years ago
parent 12348780ec
commit 4163094519
19 changed files with 107 additions and 107 deletions
Show Stats Download Patch File Download Diff File

4
doc/Makefile.am
Unescape View File

@ -1,4 +1,4 @@
####### kdevelop will overwrite this part!!! (begin)##########
####### tdevelop will overwrite this part!!! (begin)##########
####### kdevelop will overwrite this part!!! (end)############
####### tdevelop will overwrite this part!!! (end)############

4
doc/en/Makefile.am
Unescape View File

@ -1,4 +1,4 @@
####### kdevelop will overwrite this part!!! (begin)##########
####### tdevelop will overwrite this part!!! (begin)##########
####### kdevelop will overwrite this part!!! (end)############
####### tdevelop will overwrite this part!!! (end)############

4
po/Makefile.am
Unescape View File

@ -1,6 +1,6 @@
####### kdevelop will overwrite this part!!! (begin)##########
####### tdevelop will overwrite this part!!! (begin)##########
####### kdevelop will overwrite this part!!! (end)############
####### tdevelop will overwrite this part!!! (end)############
POFILES = AUTO

8
src/Makefile.am
Unescape View File

@ -1,16 +1,16 @@
####### kdevelop will overwrite this part!!! (begin)##########
####### tdevelop will overwrite this part!!! (begin)##########
bin_PROGRAMS = kooldock
## INCLUDES were found outside kdevelop specific part
## INCLUDES were found outside tdevelop specific part
kooldock_SOURCES = appProp.ui apppropprg.cpp clip.cpp dinfo.cpp item.cpp \
kooldock.cpp main.cpp setupdialog.ui setupdialogprg.cpp xosd.cpp
kooldock_LDADD = $(LIB_KIO) -lDCOP -lkdefx $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET)
kooldock_LDADD = $(LIB_TDEIO) -lDCOP -ltdefx $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) $(LIBSOCKET)
EXTRA_DIST = main.cpp kooldock.cpp kooldock.h item.cpp item.h
####### kdevelop will overwrite this part!!! (end)############
####### tdevelop will overwrite this part!!! (end)############
# These paths are KDE specific. Use them:
# kde_appsdir Where your application's menu entry (.desktop) should go to.
# kde_icondir Where your icon should go to - better use KDE_ICON.

2
src/appProp.ui
Unescape View File

@ -197,7 +197,7 @@
<string>Alt+B</string>
</property>
</widget>
<widget class="KIconButton" row="0" column="2" rowspan="2" colspan="1">
<widget class="TDEIconButton" row="0" column="2" rowspan="2" colspan="1">
<property name="name">
<cstring>iconbutton</cstring>
</property>

6
src/apppropprg.cpp
Unescape View File

@ -10,10 +10,10 @@
//
//
#include <kicondialog.h>
#include <kfiledialog.h>
#include <kmessagebox.h>
#include <tdefiledialog.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <klocale.h>
#include <tdelocale.h>
#include "apppropprg.h"
#include "appProp.h"

2
src/clip.cpp
Unescape View File

@ -5,7 +5,7 @@
#include <ntqpainter.h>
#include <netwm.h>
#include <netwm_def.h>
#include <kwin.h>
#include <twin.h>
#include <kdebug.h>

2
src/clip.h
Unescape View File

@ -8,7 +8,7 @@
#include <ntqwidget.h>
#include <netwm.h>
#include <kwin.h>
#include <twin.h>
class clip : public TQWidget
{

2
src/dinfo.h
Unescape View File

@ -20,7 +20,7 @@
#ifndef DINFO_H
#define DINFO_H
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
/**
@author bisiek <bisiek9@gmail.com>
*/

10
src/item.cpp
Unescape View File

@ -15,7 +15,7 @@
* *
***************************************************************************/
#include <kglobal.h>
#include <tdeglobal.h>
#include <kicontheme.h>
#include <ntqfile.h>
@ -25,7 +25,7 @@
#include "item.h"
Item::Item(const TQString& iconName, const TQString& cmd, const TQString& name, int minSize, int maxSize) {
iLoader = KGlobal::iconLoader();
iLoader = TDEGlobal::iconLoader();
command = cmd;
this->name = name;
mCount=0;
@ -36,7 +36,7 @@ Item::Item(const TQString& iconName, const TQString& cmd, const TQString& name,
this->maxSize = maxSize;
this->iconName = iconName;
TQImage icon(iLoader->loadIcon(iconName, KIcon::NoGroup, 64).convertToImage());
TQImage icon(iLoader->loadIcon(iconName, TDEIcon::NoGroup, 64).convertToImage());
if (minSize <= maxSize)
{
int count = maxSize - minSize + 1;
@ -90,7 +90,7 @@ Item::Item(const TQString& fileName, int minSize, int maxSize)
in.close();
iLoader = KGlobal::iconLoader();
iLoader = TDEGlobal::iconLoader();
this->minSize = minSize;
this->maxSize = maxSize;
this->filename = fileName;
@ -98,7 +98,7 @@ Item::Item(const TQString& fileName, int minSize, int maxSize)
mIndex=0;
mMIndex=0;
mClass="";
TQImage icon(iLoader->loadIcon(iconName, KIcon::NoGroup, 64).convertToImage());
TQImage icon(iLoader->loadIcon(iconName, TDEIcon::NoGroup, 64).convertToImage());
if (minSize <= maxSize)
{
int count = maxSize - minSize + 1;

4
src/item.h
Unescape View File

@ -19,7 +19,7 @@
#define ITEM_H
#include <kiconloader.h>
#include <kwin.h>
#include <twin.h>
#include <ntqstring.h>
#include <ntqpixmap.h>
@ -66,7 +66,7 @@ class Item
bool wIcon;
private:
KIconLoader *iLoader;
TDEIconLoader *iLoader;
int minSize;
int maxSize;

70
src/kooldock.cpp
Unescape View File

@ -35,17 +35,17 @@
#include <ntqfont.h>
#include <ntqdatetime.h>
#include <kwin.h>
#include <twin.h>
#include <kprocess.h>
#include <netwm_def.h>
#include <kmessagebox.h>
#include <klocale.h>
#include <kcmdlineargs.h>
#include <tdemessagebox.h>
#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include <krun.h>
#include <kurifilter.h>
#include <kpixmapio.h>
#include <kstandarddirs.h>
#include <kaboutapplication.h>
#include <tdeaboutapplication.h>
#include <ntqlistbox.h>
#include <keditlistbox.h>
@ -56,7 +56,7 @@
#include "kooldock.h"
#include <kconfig.h>
#include <tdeconfig.h>
#include <kdebug.h>
#include "setupdialogprg.h"
@ -90,12 +90,12 @@ KoolDock::KoolDock(TQWidget *parent, const char *name) : TQWidget(parent, name,
reloadIcons=TRUE;
//Menu definitions
deskpopup=new KPopupMenu();
appMenu=new KPopupMenu();
godesk=new KPopupMenu;
tasklist=new KPopupMenu;
popup=new KPopupMenu;
advMenu=new KPopupMenu;
deskpopup=new TDEPopupMenu();
appMenu=new TDEPopupMenu();
godesk=new TDEPopupMenu;
tasklist=new TDEPopupMenu;
popup=new TDEPopupMenu;
advMenu=new TDEPopupMenu;
connect(popup, SIGNAL(aboutToShow()), SLOT(aboutToShow()));
connect(popup, SIGNAL(aboutToHide()), SLOT(aboutToHide()));
@ -736,7 +736,7 @@ void KoolDock::mPress(int mx, int my, ButtonState srcButton)
{
// run the application with KDE feedback (loading icon)
// we need to run the .desktop file, since the command
// may be a url or another KIO stuff like 'system:/'
// may be a url or another TDEIO stuff like 'system:/'
if (items.at(i)->getFilename()!="")
{
run(items.at(i)->getFilename());
@ -841,20 +841,20 @@ void KoolDock::mPress(int mx, int my, ButtonState srcButton)
// Right button.
i = iClicked;
advMenu->clear();
advMenu->insertItem(SmallIconSet("up"), i18n("Keep &Above Others"), this, SLOT(toggleAlwaysOnTop()),0,1);
advMenu->insertItem(SmallIconSet("down"), i18n("Keep &Below Others"), this, SLOT(toggleKeptBelowOthers()),0,2);
advMenu->insertItem(SmallIconSet("window_fullscreen"), i18n("&Fullscreen"), this, SLOT(toggleFullScreen()),0,3);
advMenu->insertItem(SmallIconSet("go-up"), i18n("Keep &Above Others"), this, SLOT(toggleAlwaysOnTop()),0,1);
advMenu->insertItem(SmallIconSet("go-down"), i18n("Keep &Below Others"), this, SLOT(toggleKeptBelowOthers()),0,2);
advMenu->insertItem(SmallIconSet("view-fullscreen"), i18n("&Fullscreen"), this, SLOT(toggleFullScreen()),0,3);
// Main KoolDock popup menu
popup->clear();
popup->insertTitle(i18n("Main Menu"));
popup->insertItem(SmallIcon("configure"), i18n("Edit Quick Launch &Menu"), this, SLOT(edit()));
popup->insertItem(SmallIcon("pencil"), i18n("Edit &Preferences"), this, SLOT(editPref()));
popup->insertItem(SmallIcon("redo"), i18n("&Reload configuration"), this, SLOT(restart()));
popup->insertItem(SmallIcon("edit-redo"), i18n("&Reload configuration"), this, SLOT(restart()));
popup->insertSeparator();
popup->insertItem(SmallIcon("about_kde"), i18n("&About"), this, SLOT(about()));
popup->insertSeparator();
popup->insertItem(SmallIcon("exit"), i18n("E&xit"), this, SLOT(endProg()));
popup->insertItem(SmallIcon("system-log-out"), i18n("E&xit"), this, SLOT(endProg()));
// End Main KoolDock Menu
if(fShowNav==1)
@ -903,7 +903,7 @@ void KoolDock::mPress(int mx, int my, ButtonState srcButton)
appMenu->insertTitle(i18n("Item menu"));
iFilename = items.at(i)->getFilename();
appMenu->insertItem(SmallIcon("configure"), i18n("&Edit item"), this, SLOT(editItem()));
appMenu->insertItem(SmallIcon("fileclose"), i18n("&Delete item"), this, SLOT(removeItem()));
appMenu->insertItem(SmallIcon("window-close"), i18n("&Delete item"), this, SLOT(removeItem()));
appMenu->insertSeparator();
appMenu->insertItem(SmallIcon("forward"), "&KoolDock", popup);
appMenu->exec(TQCursor::pos());
@ -967,7 +967,7 @@ void KoolDock::mPress(int mx, int my, ButtonState srcButton)
winfo = item->info;
if ((fMinimizedOnly==0 || winfo.isMinimized()) && (fCurrent==0 || winfo.isOnDesktop(KWin::currentDesktop())))
{
KPopupMenu *tmpMenu = new KPopupMenu;
TDEPopupMenu *tmpMenu = new TDEPopupMenu;
createMenu(tmpMenu, &winfo);
connect(tmpMenu, SIGNAL(aboutToShow()), SLOT(menuShow()));
popups.append (tmpMenu);
@ -980,7 +980,7 @@ void KoolDock::mPress(int mx, int my, ButtonState srcButton)
appMenu->insertItem(i18n("Mi&nimize all"), this, SLOT(minAllApps()));
appMenu->insertItem(i18n("Ma&ximize all"), this, SLOT(maxAllApps()));
appMenu->insertItem(i18n("&Restore all"), this, SLOT(restAllApps()));
appMenu->insertItem(SmallIcon("fileclose"), i18n("&Close all"), this, SLOT(closeAllApps()));
appMenu->insertItem(SmallIcon("window-close"), i18n("&Close all"), this, SLOT(closeAllApps()));
}
else
{
@ -1416,7 +1416,7 @@ void KoolDock::run(const TQString& command)
_filterData->setData( command.stripWhiteSpace() );
TQStringList filters;
filters << "kurisearchfilter" << "kshorturifilter";
filters << "kurisearchfilter" << "tdeshorturifilter";
KURIFilter::self()->filterURI( *(_filterData), filters );
TQString cmd = (_filterData->uri().isLocalFile() ? _filterData->uri().path():_filterData->uri().url());
@ -1437,7 +1437,7 @@ void KoolDock::run(const TQString& command)
{
if (useList)
{
KApplication::startServiceByDesktopPath (command, lstDrop, &TQString(0) ,&TQCString(0) ,0 , "" ,true);
TDEApplication::startServiceByDesktopPath (command, lstDrop, &TQString(0) ,&TQCString(0) ,0 , "" ,true);
}
else
{
@ -2051,7 +2051,7 @@ bool KoolDock::addwTask(WId id)
void KoolDock::loadConf()
{
KConfig *config = KGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup("kooldock");
fShowTaskbar = config->readNumEntry("ShowTaskbar", 0);
@ -2205,7 +2205,7 @@ void KoolDock::loadIgnore()
void KoolDock::saveConf()
{
KConfig *config = KGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup("kooldock");
config->writeEntry("ShowTaskbar", fShowTaskbar);
@ -2464,7 +2464,7 @@ void KoolDock::loadMenu()
void KoolDock::about()
{
KAboutApplication about(this, 0, false);
TDEAboutApplication about(this, 0, false);
about.exec();
}
@ -2914,21 +2914,21 @@ void KoolDock::addFile(const TQString& filename,
out_s << "Type=Application" << endl;
if(notify == true)
{
out_s << "X-KDE-StartupNotify=true" << endl;
out_s << "X-TDE-StartupNotify=true" << endl;
}
else
{
out_s << "X-KDE-StartupNotify=false" << endl;
out_s << "X-TDE-StartupNotify=false" << endl;
}
if(cuser==true)
{
out_s << "X-KDE-SubstituteUID=true" << endl;
out_s << "X-KDE-Username=" << puser << endl;
out_s << "X-TDE-SubstituteUID=true" << endl;
out_s << "X-TDE-Username=" << puser << endl;
}
else
{
out_s << "X-KDE-SubstituteUID=false" << endl;
out_s << "X-KDE-Username=" << endl;
out_s << "X-TDE-SubstituteUID=false" << endl;
out_s << "X-TDE-Username=" << endl;
}
if(terminal==true)
{
@ -3165,7 +3165,7 @@ void KoolDock::getTopBG()
void KoolDock::setDesktopIconsArea(int left, int top, int width, int height)
{
if (fClipIcons==0) return;
DCOPClient* client = KApplication::dcopClient();
DCOPClient* client = TDEApplication::dcopClient();
if (!client->isAttached()) {
client->attach();
client->registerAs("KoolDock");
@ -3667,7 +3667,7 @@ void KoolDock::aboutToHide()
menuCount--;
}
void KoolDock::createMenu(KPopupMenu* tmpMenu, KWin::WindowInfo * info)
void KoolDock::createMenu(TDEPopupMenu* tmpMenu, KWin::WindowInfo * info)
{
TQString appTitle;
int menustate;
@ -3701,7 +3701,7 @@ void KoolDock::createMenu(KPopupMenu* tmpMenu, KWin::WindowInfo * info)
tmpMenu->insertItem(SmallIcon("forward"), i18n("&Move to Desktop"), deskpopup);
tmpMenu->insertSeparator();
tmpMenu->insertItem(SmallIcon("fileclose"), i18n("&Close"), this, SLOT(closeApp()));
tmpMenu->insertItem(SmallIcon("window-close"), i18n("&Close"), this, SLOT(closeApp()));
}
void KoolDock::updTaskList()

24
src/kooldock.h
Unescape View File

@ -23,9 +23,9 @@
#endif
#include <kapp.h>
#include <kpopupmenu.h>
#include <kwinmodule.h>
#include <kaboutdialog.h>
#include <tdepopupmenu.h>
#include <twinmodule.h>
#include <tdeaboutdialog.h>
#include <krootpixmap.h>
#include <kpixmap.h>
#include <kurifilter.h>
@ -204,7 +204,7 @@ class KoolDock : public TQWidget
KPixmap bottomBgf;
TQPixmap topBg;
KAboutDialog *aboutDlg;
TDEAboutDialog *aboutDlg;
TQTimer *mkbigTimer; //zoom animation timers
TQTimer *mksmallTimer;
TQTimer *mTimer; //mouse move emulator (can't use normal event instead)
@ -217,15 +217,15 @@ class KoolDock : public TQWidget
TQString cClass;
WId CurrentFocus;
int onChangeAnimStep;
KPopupMenu *deskpopup;
KPopupMenu *appMenu;
KPopupMenu *godesk;
KPopupMenu *tasklist;
KPopupMenu *popup;
KPopupMenu *advMenu;
TDEPopupMenu *deskpopup;
TDEPopupMenu *appMenu;
TDEPopupMenu *godesk;
TDEPopupMenu *tasklist;
TDEPopupMenu *popup;
TDEPopupMenu *advMenu;
int menuCount, currMenu;
bool allApps;
TQPtrList<KPopupMenu> popups;
TQPtrList<TDEPopupMenu> popups;
bool iGroup;
int dIndex, nDesks;
TQPtrList<dInfo> desks;
@ -267,7 +267,7 @@ class KoolDock : public TQWidget
void addWindows();
int itemFromPoint(int x);
int xFromIndex(int i);
void createMenu(KPopupMenu* tmpMenu, KWin::WindowInfo* info);
void createMenu(TDEPopupMenu* tmpMenu, KWin::WindowInfo* info);
void updTaskList();
void addToTaskList(WId id);
void rmFromTaskList(WId id);

26
src/main.cpp
Unescape View File

@ -15,16 +15,16 @@
* *
***************************************************************************/
#include <kcmdlineargs.h>
#include <kaboutdata.h>
#include <klocale.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
#include <tdelocale.h>
#include <kcrash.h>
#include <kdebug.h>
#include <kuniqueapplication.h>
#include <stdio.h>
#include <stdlib.h>
#include <kmessagebox.h>
#include <tdemessagebox.h>
#include "kooldock.h"
@ -46,7 +46,7 @@ extern "C"
static const char *description = I18N_NOOP("<center><b>KoolDock</b></center>A Kool Dock for KDE<br><br>KoolDock is based upon the original work of Dang Viet Dung, Ksmoothdock 2.1<br><br>");
static KCmdLineOptions options[] =
static TDECmdLineOptions options[] =
{
{ "o", 0, 0 },
{ "options", I18N_NOOP("Show configuration window on start"), 0 },
@ -59,8 +59,8 @@ int main(int argc, char *argv[])
{
argv0=TQString("%1").arg(argv[0]);
KAboutData aboutData( "kooldock", I18N_NOOP("KoolDock"),
KOOLDOCK_VERSION, description, KAboutData::License_GPL,
TDEAboutData aboutData( "kooldock", I18N_NOOP("KoolDock"),
KOOLDOCK_VERSION, description, TDEAboutData::License_GPL,
"(c) 2003, 2006 - KoolDock team", 0, "http://ktown.kde.cl/kooldock", "kooldock-devel@lists.kde.cl");
aboutData.addAuthor("Matias Fernandez",0, "radix@kde.cl");
aboutData.addAuthor("Francisco Guidi",0, "francisco@guidi.com", "http://francisco.guidi.com");
@ -68,11 +68,11 @@ int main(int argc, char *argv[])
aboutData.addCredit("Mauricio Bahamonde", I18N_NOOP("Project Webmaster"), "elkrammer@kde.cl", "http://ktown.kde.cl/~elkrammer/");
aboutData.addCredit("Sebastian Sariego Benitez", I18N_NOOP("Icon and artwork"), "segfault@powers.cl", "http://segfault.kde.cl");
aboutData.setTranslator(I18N_NOOP("_: NAME OF TRANSLATORS\nYour names"), I18N_NOOP("_: EMAIL OF TRANSLATORS\nYour emails"));
KCmdLineArgs::init( argc, argv, &aboutData );
KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
TDECmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
#ifdef _ENABLE_DEBUG
KApplication::addCmdLineOptions();
TDEApplication::addCmdLineOptions();
#endif
#ifndef _ENABLE_DEBUG
KUniqueApplication::addCmdLineOptions();
@ -95,16 +95,16 @@ int main(int argc, char *argv[])
KUniqueApplication a;
#endif
#ifdef _ENABLE_DEBUG
KApplication a;
TDEApplication a;
#endif
KoolDock *kooldock = new KoolDock();
a.setMainWidget(kooldock);
#ifndef _ENABLE_DEBUG
if(KCrash::crashHandler()!=0)
if(TDECrash::crashHandler()!=0)
{
kdDebug(0) << "Installing crash handler" << endl;
KCrash::setEmergencySaveFunction(crashHandler); // Try to restart on crash
TDECrash::setEmergencySaveFunction(crashHandler); // Try to restart on crash
}
#endif

6
src/setupdialog.ui
Unescape View File

@ -389,7 +389,7 @@
<string>Text font:</string>
</property>
</widget>
<widget class="KFontCombo" row="2" column="1">
<widget class="TDEFontCombo" row="2" column="1">
<property name="name">
<cstring>xosdFont</cstring>
</property>
@ -742,7 +742,7 @@
<string>Click here to manually add an application to the Launcher</string>
</property>
</widget>
<widget class="KIconView" row="1" column="0" rowspan="1" colspan="4">
<widget class="TDEIconView" row="1" column="0" rowspan="1" colspan="4">
<property name="name">
<cstring>applist</cstring>
</property>
@ -1976,7 +1976,7 @@ box below. To stop grabbing just click "Grabbing...", "Ok" or "Cancel".</string>
</slots>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kfontcombo.h</includehint>
<includehint>tdefontcombo.h</includehint>
<includehint>klineedit.h</includehint>
<includehint>kcolorcombo.h</includehint>
<includehint>kcolorcombo.h</includehint>

26
src/setupdialogprg.cpp
Unescape View File

@ -9,12 +9,12 @@
// Copyright: See COPYING file that comes with this distribution
//
//
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <kimageio.h>
#include <kicondialog.h>
#include <klocale.h>
#include <tdelocale.h>
#include <ksimpleconfig.h>
#include <kmessagebox.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <kpushbutton.h>
#include <keditlistbox.h>
@ -53,7 +53,7 @@ SetupDialogPrg::SetupDialogPrg(TQWidget *parent, const char *name)
progPath = locateLocal("data", "kooldock");
menuPath = progPath + TQString("/menu/");
KConfig *config = KGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup("kooldock");
appdlg=new appPropPrg();
@ -65,7 +65,7 @@ SetupDialogPrg::SetupDialogPrg(TQWidget *parent, const char *name)
connect(appdlg, SIGNAL(apply()), SLOT(appRestart()));
//Lets load the theme List
KStandardDirs sys;
TDEStandardDirs sys;
TQStringList bgPath = sys.findDirs("data", "kooldock/backgrounds");
for(unsigned int i=0; i<bgPath.count();i++)
{
@ -164,7 +164,7 @@ void SetupDialogPrg::configApply()
fpercentPos=percentPos->value();
kdDebug(0) << "Saving preferences..." << endl;
KConfig *config = KGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup("kooldock");
config->writeEntry("ShowTaskbar", fShowTaskbar);
config->writeEntry("MinimizedOnly", fMinimizedOnly);
@ -234,7 +234,7 @@ void SetupDialogPrg::configApply()
if (chkImg->isChecked())
{
//Lets find exactly where the selected theme is
KStandardDirs sys;
TDEStandardDirs sys;
TQString theme_dir="kooldock/backgrounds/"+theme->currentText();
TQStringList bgPath = sys.findDirs("data", theme_dir);
@ -373,7 +373,7 @@ void SetupDialogPrg::chkHidden()
void SetupDialogPrg::applist_dropped(TQDropEvent*e,const TQValueList<TQIconDragItem>&)
{
KIconLoader icon_obj;
TDEIconLoader icon_obj;
TQStringList lst;
TQString name;
int pos;
@ -535,7 +535,7 @@ void SetupDialogPrg::appFill()
KSimpleConfig *desktopfile;
TQDir homeDir = TQDir::home();
KIconLoader icon_obj;
TDEIconLoader icon_obj;
TQPixmap pixm;
if(homeDir.exists(progPath))
@ -550,8 +550,8 @@ void SetupDialogPrg::appFill()
{
desktopfile = new KSimpleConfig( menuPath + (*it), TRUE);
desktopfile->setGroup("Desktop Entry");
TQPixmap pixm=icon_obj.loadIcon(desktopfile->readEntry("Icon") ,KIcon::Desktop,0,KIcon::DefaultState,0L,false);
new KIconViewItem(applist, desktopfile->readEntry("Name"), pixm);
TQPixmap pixm=icon_obj.loadIcon(desktopfile->readEntry("Icon") ,TDEIcon::Desktop,0,TDEIcon::DefaultState,0L,false);
new TDEIconViewItem(applist, desktopfile->readEntry("Name"), pixm);
delete(desktopfile);
}
}
@ -590,8 +590,8 @@ void SetupDialogPrg::applist_contextMenuRequested(TQIconViewItem *e,const TQPoin
{
if(e!=NULL)
{
KPopupMenu *popup=new KPopupMenu();
KPopupMenu *setpos=new KPopupMenu();
TDEPopupMenu *popup=new TDEPopupMenu();
TDEPopupMenu *setpos=new TDEPopupMenu();
fileName=e->text();
oldPos=e->index();

8
src/setupdialogprg.h
Unescape View File

@ -28,13 +28,13 @@
#include <ntqradiobutton.h>
// KDE includes
#include <kfontcombo.h>
#include <tdefontcombo.h>
#include <kcolorcombo.h>
#include <ktextedit.h>
#include <kdebug.h>
#include <kconfig.h>
#include <kfontdialog.h>
#include <kwinmodule.h>
#include <tdeconfig.h>
#include <tdefontdialog.h>
#include <twinmodule.h>
#include <netwm.h>
#include <klineedit.h>

4
src/xosd.cpp
Unescape View File

@ -7,10 +7,10 @@
#include <ntqfontmetrics.h>
#include <ntqwidget.h>
#include <klocale.h>
#include <tdelocale.h>
#include <netwm.h>
#include <netwm_def.h>
#include <kwin.h>
#include <twin.h>
#include <kdebug.h>
#include <stdlib.h>

2
src/xosd.h
Unescape View File

@ -12,7 +12,7 @@
#include <ntqbitmap.h>
#include <netwm.h>
#include <kwin.h>
#include <twin.h>
class xosd : public TQWidget
{

Write Preview
Loading…
Cancel
Save