|
|
@ -22,7 +22,6 @@
|
|
|
|
// Include all TQt includes before X
|
|
|
|
// Include all TQt includes before X
|
|
|
|
#include <tqstring.h>
|
|
|
|
#include <tqstring.h>
|
|
|
|
#include <tqevent.h>
|
|
|
|
#include <tqevent.h>
|
|
|
|
#include <tqfiledialog.h>
|
|
|
|
|
|
|
|
#include <tqfileinfo.h>
|
|
|
|
#include <tqfileinfo.h>
|
|
|
|
#include <tqimage.h>
|
|
|
|
#include <tqimage.h>
|
|
|
|
#include <tqinputdialog.h>
|
|
|
|
#include <tqinputdialog.h>
|
|
|
@ -32,11 +31,12 @@
|
|
|
|
#include <tqtimer.h>
|
|
|
|
#include <tqtimer.h>
|
|
|
|
|
|
|
|
|
|
|
|
#include <khelpmenu.h>
|
|
|
|
#include <khelpmenu.h>
|
|
|
|
#include <kstdaction.h>
|
|
|
|
|
|
|
|
#include <kiconloader.h>
|
|
|
|
#include <kiconloader.h>
|
|
|
|
|
|
|
|
#include <kstdaction.h>
|
|
|
|
#include <kstdguiitem.h>
|
|
|
|
#include <kstdguiitem.h>
|
|
|
|
#include <tqapplication.h>
|
|
|
|
|
|
|
|
#include <tdeconfig.h>
|
|
|
|
#include <tdeconfig.h>
|
|
|
|
|
|
|
|
#include <tdefiledialog.h>
|
|
|
|
#include <tdeglobal.h>
|
|
|
|
#include <tdeglobal.h>
|
|
|
|
#include <tdelocale.h>
|
|
|
|
#include <tdelocale.h>
|
|
|
|
#include <tdemessagebox.h>
|
|
|
|
#include <tdemessagebox.h>
|
|
|
@ -949,8 +949,8 @@ void TQTrayLabel::setCustomIcon(void)
|
|
|
|
while (true)
|
|
|
|
while (true)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
// Nag the user to give us a valid icon or press cancel
|
|
|
|
// Nag the user to give us a valid icon or press cancel
|
|
|
|
icon = TQFileDialog::getOpenFileName();
|
|
|
|
icon = KFileDialog::getOpenFileName();
|
|
|
|
if (icon.isNull()) return; // user cancelled
|
|
|
|
if (icon.isEmpty()) return; // user cancelled
|
|
|
|
if (!TQPixmap(icon).isNull()) break;
|
|
|
|
if (!TQPixmap(icon).isNull()) break;
|
|
|
|
TRACE("Attempting to set icon to %s", icon.local8Bit());
|
|
|
|
TRACE("Attempting to set icon to %s", icon.local8Bit());
|
|
|
|
KMessageBox::error(this, i18n("%1 is not a valid icon").arg(icon), i18n("TDEDocker"));
|
|
|
|
KMessageBox::error(this, i18n("%1 is not a valid icon").arg(icon), i18n("TDEDocker"));
|
|
|
|