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

Removed kxdglauncher which is now no longer required.

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/127/head
Michele Calgaro 5 years ago committed by TDE Gitea
parent b52ef67d4a
commit f8a93efe76
5 changed files with 3 additions and 229 deletions
Show Stats Download Patch File Download Diff File

9
kdesktop/CMakeLists.txt
Unescape Escape View File

@ -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) ######################## ##### kdesktop (tdeinit) ########################
set( target kdesktop ) set( target kdesktop )

8
kdesktop/Makefile.am
Unescape Escape View File

@ -8,7 +8,7 @@ SUBDIRS = . lock pics patterns programs init kwebdesktop
####### Files ####### Files
bin_PROGRAMS = kcheckrunning kxdglauncher bin_PROGRAMS = kcheckrunning
lib_LTLIBRARIES = lib_LTLIBRARIES =
tdeinit_LTLIBRARIES = kdesktop.la tdeinit_LTLIBRARIES = kdesktop.la
noinst_LTLIBRARIES = libkdesktopsettings.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 \ noinst_HEADERS = desktop.h bgmanager.h krootwm.h \
xautolock.h lockeng.h init.h minicli.h \ xautolock.h lockeng.h init.h minicli.h \
pixmapserver.h startupid.h xautolock_c.h \ pixmapserver.h startupid.h xautolock_c.h \
kdesktopapp.h kxdglauncher.h kdesktopapp.h
kcheckrunning_SOURCES = kcheckrunning.cpp kcheckrunning_SOURCES = kcheckrunning.cpp
kcheckrunning_LDFLAGS = $(all_libraries) kcheckrunning_LDFLAGS = $(all_libraries)
kcheckrunning_LDADD = $(LIB_X11) $(LIB_TQT) kcheckrunning_LDADD = $(LIB_X11) $(LIB_TQT)
kxdglauncher_SOURCES = kxdglauncher.cpp
kxdglauncher_LDFLAGS = $(all_libraries)
kxdglauncher_LDADD = $(LIB_TDEUTILS)
METASOURCES = AUTO METASOURCES = AUTO
####### Build rules ####### Build rules

2
kdesktop/kdiconview.cc
Unescape Escape View File

@ -851,7 +851,7 @@ bool KDIconView::deleteGlobalDesktopFiles()
// Ignore these special files // Ignore these special files
// Name URL Type OnlyShowIn // 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 Computer media:/ Link TDE;
// My Network Places remote:/ Link TDE; // My Network Places remote:/ Link TDE;
// Printers [exec] kjobviewer --all --show %i %m Application TDE; // Printers [exec] kjobviewer --all --show %i %m Application TDE;

188
kdesktop/kxdglauncher.cpp
Unescape Escape View File

@ -1,188 +0,0 @@
/* This file is part of the KDE project
Copyright (C) 2010 Timothy Pearson <kb9vqf@pearsoncomputing.net>
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;
}
}

25
kdesktop/kxdglauncher.h
Unescape Escape View File

@ -1,25 +0,0 @@
/* This file is part of the KDE project
Copyright (c) 2003 Oswald Buddenhagen <ossi@kde.org>
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
Write Preview
Loading…
Cancel
Save