Use TDE dialog instead of TQ dialog for selecting an application custom icon.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/2/head
Michele Calgaro 5 years ago
parent 227b3565df
commit e05047be2b
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -31,7 +31,7 @@ tde_add_executable( tdedocker AUTOMOC
tdedocker.cpp main.cpp tqtraylabel.cpp tdedocker.cpp main.cpp tqtraylabel.cpp
trace.cpp traylabelmgr.cpp util.cpp trace.cpp traylabelmgr.cpp util.cpp
LINK LINK
tdecore-shared tdeui-shared DCOP-shared tdecore-shared tdeio-shared tdeui-shared DCOP-shared
${XMU_LIBRARIES} ${XPM_LIBRARIES} ${XMU_LIBRARIES} ${XPM_LIBRARIES}
DESTINATION DESTINATION
${BIN_INSTALL_DIR} ${BIN_INSTALL_DIR}

@ -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"));

Loading…
Cancel
Save