diff options
| -rw-r--r-- | kdesktop/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | kdesktop/Makefile.am | 8 | ||||
| -rw-r--r-- | kdesktop/kdiconview.cc | 2 | ||||
| -rw-r--r-- | kdesktop/kxdglauncher.cpp | 188 | ||||
| -rw-r--r-- | kdesktop/kxdglauncher.h | 25 |
5 files changed, 3 insertions, 229 deletions
diff --git a/kdesktop/CMakeLists.txt b/kdesktop/CMakeLists.txt index c8fdabf36..d3f70ce98 100644 --- a/kdesktop/CMakeLists.txt +++ b/kdesktop/CMakeLists.txt @@ -69,15 +69,6 @@ tde_add_executable( kcheckrunning ) -##### kxdglauncher (executable) ################# - -tde_add_executable( kxdglauncher - SOURCES kxdglauncher.cpp - LINK tdeutils-shared - DESTINATION ${BIN_INSTALL_DIR} -) - - ##### kdesktop (tdeinit) ######################## set( target kdesktop ) diff --git a/kdesktop/Makefile.am b/kdesktop/Makefile.am index 539db39f1..bef2d3884 100644 --- a/kdesktop/Makefile.am +++ b/kdesktop/Makefile.am @@ -8,7 +8,7 @@ SUBDIRS = . lock pics patterns programs init kwebdesktop ####### Files -bin_PROGRAMS = kcheckrunning kxdglauncher +bin_PROGRAMS = kcheckrunning lib_LTLIBRARIES = tdeinit_LTLIBRARIES = kdesktop.la noinst_LTLIBRARIES = libkdesktopsettings.la @@ -31,16 +31,12 @@ include_HEADERS = KDesktopIface.h KScreensaverIface.h KBackgroundIface.h noinst_HEADERS = desktop.h bgmanager.h krootwm.h \ xautolock.h lockeng.h init.h minicli.h \ pixmapserver.h startupid.h xautolock_c.h \ - kdesktopapp.h kxdglauncher.h + kdesktopapp.h kcheckrunning_SOURCES = kcheckrunning.cpp kcheckrunning_LDFLAGS = $(all_libraries) kcheckrunning_LDADD = $(LIB_X11) $(LIB_QT) -kxdglauncher_SOURCES = kxdglauncher.cpp -kxdglauncher_LDFLAGS = $(all_libraries) -kxdglauncher_LDADD = $(LIB_TDEUTILS) - METASOURCES = AUTO ####### Build rules diff --git a/kdesktop/kdiconview.cc b/kdesktop/kdiconview.cc index 39dcc4c28..c7f56c188 100644 --- a/kdesktop/kdiconview.cc +++ b/kdesktop/kdiconview.cc @@ -851,7 +851,7 @@ bool KDIconView::deleteGlobalDesktopFiles() // Ignore these special files // Name URL Type OnlyShowIn - // My Documents kxdglauncher --xdgname DOCUMENTS Application TDE; + // My Documents xdg-user-dirs DOCUMENTS Application TDE; // My Computer media:/ Link TDE; // My Network Places remote:/ Link TDE; // Printers [exec] kjobviewer --all --show %i %m Application TDE; diff --git a/kdesktop/kxdglauncher.cpp b/kdesktop/kxdglauncher.cpp deleted file mode 100644 index 9d689d95f..000000000 --- a/kdesktop/kxdglauncher.cpp +++ /dev/null @@ -1,188 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2010 Timothy Pearson <[email protected]> - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include <tqfile.h> -#include <tqdir.h> -#include <tqtimer.h> -#include <tqstring.h> -#include <tqtextcodec.h> - -#include <krun.h> -#include <tdefile.h> -#include <tdelocale.h> -#include <tdeapplication.h> -#include <tdecmdlineargs.h> -#include <tdeglobalsettings.h> -#include <kinputdialog.h> -#include <tdemessagebox.h> -#include <tdeconfig.h> -#include <kurlrequester.h> -#include <kurlrequesterdlg.h> - -#include <stdlib.h> - -#include "kxdglauncher.h" - -// helper function for reading xdg user dirs: it is required for obvious reasons -void readXdgUserDirs(TQString *desktop, TQString *documents) -{ - TQFile f( TQDir::homeDirPath() + "/.config/user-dirs.dirs" ); - - if (!f.open(IO_ReadOnly)) - return; - - // set the codec for the current locale - TQTextStream s(&f); - s.setCodec( TQTextCodec::codecForLocale() ); - - TQString line = s.readLine(); - while (!line.isNull()) - { - if (line.startsWith("XDG_DESKTOP_DIR=")) { - *desktop = TQString(line.remove("XDG_DESKTOP_DIR=").remove("\"")).replace("$HOME", TQDir::homeDirPath()); - } - else if (line.startsWith("XDG_DOCUMENTS_DIR=")) { - *documents = TQString(line.remove("XDG_DOCUMENTS_DIR=").remove("\"")).replace("$HOME", TQDir::homeDirPath()); - } - - line = s.readLine(); - } -} - -TQString getDocumentPath() -{ - TQString s_desktopPath; - TQString s_documentPath; - - readXdgUserDirs(&s_desktopPath, &s_documentPath); - - if (s_documentPath.isEmpty() == true) { -#ifdef Q_WS_WIN - s_documentPath = getWin32ShellFoldersPath("Personal"); -#else - s_documentPath = TQDir::homeDirPath() + "/Documents/"; -#endif - } - s_documentPath = TQDir::cleanDirPath( s_documentPath ); - if ( !s_documentPath.endsWith("/")) - s_documentPath.append('/'); - - return s_documentPath; -} - -static TDECmdLineOptions options[] = -{ - { "xdgname <argument>", I18N_NOOP("XDG variable name to open"), 0 }, - { "getpath", I18N_NOOP("Do not launch Konqueror; instead print path to directory if it exists)"), 0 }, - TDECmdLineLastOption -}; - -int main( int argc, char **argv) -{ - TDECmdLineArgs::init( argc, argv, "kxdglauncher", I18N_NOOP("TDE XDG File Browser Launcher and Prompter"), I18N_NOOP("Prompts if directory does not exist, otherwise launches"), "1.0" ); - TDECmdLineArgs::addCmdLineOptions( options ); - TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); - - TDEApplication app; - app.disableSessionManagement(); - - if (args->isSet( "xdgname" ) == true) { - TQString desiredFolder = args->getOption("xdgname"); - if (desiredFolder == "DOCUMENTS") { - TQDir myqdir; - if (myqdir.exists(getDocumentPath(), TRUE) == true) { - if (args->isSet( "getpath" ) == true) { - printf("%s\n", (const char *)getDocumentPath().local8Bit()); - return 0; - } - else { - KRun * run = new KRun( KURL(getDocumentPath()), 0, false, false ); - TQObject::connect( run, TQT_SIGNAL( finished() ), &app, TQT_SLOT( quit() )); - TQObject::connect( run, TQT_SIGNAL( error() ), &app, TQT_SLOT( quit() )); - app.exec(); - return 0; - } - } - else { - KURLRequesterDlg newDirectoryRequester(getDocumentPath(), i18n("Please confirm your Documents directory location<br>Upon confimation a new directory will be created"), 0, NULL, true); - newDirectoryRequester.setCaption(i18n("Create Documents directory")); - newDirectoryRequester.urlRequester()->setMode(KFile::Directory); - if (newDirectoryRequester.exec() != TQDialog::Accepted) { - return 1; - } - else { - TQString newDirectory = newDirectoryRequester.urlRequester()->url(); - if (newDirectory == TQString::null) { - return 1; - } - else { - if (newDirectory.length() < 4096) { - bool directoryOk = false; - if (myqdir.exists(newDirectory, TRUE) == false) { - if (myqdir.mkdir(newDirectory, TRUE) == true) { - directoryOk = TRUE; - } - } - else { - directoryOk = TRUE; - } - if (directoryOk == true) { - TQString xdgModifiedDirectory = newDirectory; - xdgModifiedDirectory = xdgModifiedDirectory.replace(TQDir::homeDirPath(), "$HOME"); - while (xdgModifiedDirectory.endsWith("/")) { - xdgModifiedDirectory.truncate(xdgModifiedDirectory.length()-1); - } - TDEConfig config(TQDir::homeDirPath() + "/.config/user-dirs.dirs", false, false); - config.writeEntry("XDG_DOCUMENTS_DIR", TQString("\"") + xdgModifiedDirectory + TQString("\""), true); - config.sync(); - if (args->isSet( "getpath" ) == true) { - printf("%s\n", (const char *)getDocumentPath().local8Bit()); - return 0; - } - else { - KRun * run = new KRun( getDocumentPath(), 0, false, false ); - TQObject::connect( run, TQT_SIGNAL( finished() ), &app, TQT_SLOT( quit() )); - TQObject::connect( run, TQT_SIGNAL( error() ), &app, TQT_SLOT( quit() )); - app.exec(); - } - return 0; - } - else { - KMessageBox::error(0, i18n("Unable to create directory ") + TQString("\"") + newDirectory + TQString("\"\n") + i18n("Please check folder permissions and try again"), i18n("Unable to create directory")); - return 1; - } - } - else { - KMessageBox::error(0, i18n("Unable to create the directory ") + newDirectory + TQString("\n") + i18n("Directory path cannot be longer than 4096 characters"), i18n("Unable to create directory")); - return 1; - } - } - } - } - } - else { - printf("[kxdglauncher] XDG variable not recognized\n"); - return 1; - } - } - else { - printf("[kxdglauncher] Please specify the desired XDG variable name with --xdgname\n"); - return 1; - } -} diff --git a/kdesktop/kxdglauncher.h b/kdesktop/kxdglauncher.h deleted file mode 100644 index 8f487e88e..000000000 --- a/kdesktop/kxdglauncher.h +++ /dev/null @@ -1,25 +0,0 @@ -/* This file is part of the KDE project - Copyright (c) 2003 Oswald Buddenhagen <[email protected]> - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef _MAIN_H -#define _MAIN_H - -#include <tdeapplication.h> - -#endif |