diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2020-04-25 00:25:06 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2020-04-25 00:25:06 +0900 |
| commit | e05047be2bcacf0a5f0f85373ec8aadfbfa073e3 (patch) | |
| tree | 556e8e7d5794d84f681173d262eb0bc491c63a32 /src | |
| parent | 227b3565dfbf24e47a7304fcb7aeadf0352318ec (diff) | |
| download | tdedocker-e05047be2bcacf0a5f0f85373ec8aadfbfa073e3.tar.gz tdedocker-e05047be2bcacf0a5f0f85373ec8aadfbfa073e3.zip | |
Use TDE dialog instead of TQ dialog for selecting an application custom icon.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/tqtraylabel.cpp | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f52b7ba..6757a28 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -31,7 +31,7 @@ tde_add_executable( tdedocker AUTOMOC tdedocker.cpp main.cpp tqtraylabel.cpp trace.cpp traylabelmgr.cpp util.cpp LINK - tdecore-shared tdeui-shared DCOP-shared + tdecore-shared tdeio-shared tdeui-shared DCOP-shared ${XMU_LIBRARIES} ${XPM_LIBRARIES} DESTINATION ${BIN_INSTALL_DIR} diff --git a/src/tqtraylabel.cpp b/src/tqtraylabel.cpp index 61ace00..0b99f7e 100644 --- a/src/tqtraylabel.cpp +++ b/src/tqtraylabel.cpp @@ -22,7 +22,6 @@ // Include all TQt includes before X #include <tqstring.h> #include <tqevent.h> -#include <tqfiledialog.h> #include <tqfileinfo.h> #include <tqimage.h> #include <tqinputdialog.h> @@ -32,11 +31,12 @@ #include <tqtimer.h> #include <khelpmenu.h> -#include <kstdaction.h> #include <kiconloader.h> +#include <kstdaction.h> #include <kstdguiitem.h> -#include <tqapplication.h> + #include <tdeconfig.h> +#include <tdefiledialog.h> #include <tdeglobal.h> #include <tdelocale.h> #include <tdemessagebox.h> @@ -949,8 +949,8 @@ void TQTrayLabel::setCustomIcon(void) while (true) { // Nag the user to give us a valid icon or press cancel - icon = TQFileDialog::getOpenFileName(); - if (icon.isNull()) return; // user cancelled + icon = KFileDialog::getOpenFileName(); + if (icon.isEmpty()) return; // user cancelled if (!TQPixmap(icon).isNull()) break; TRACE("Attempting to set icon to %s", icon.local8Bit()); KMessageBox::error(this, i18n("%1 is not a valid icon").arg(icon), i18n("TDEDocker")); |