summaryrefslogtreecommitdiffstats
path: root/kicker/applets/launcher
diff options
context:
space:
mode:
Diffstat (limited to 'kicker/applets/launcher')
-rw-r--r--kicker/applets/launcher/CMakeLists.txt4
-rw-r--r--kicker/applets/launcher/ChangeLog8
-rw-r--r--kicker/applets/launcher/Makefile.am10
-rw-r--r--kicker/applets/launcher/ToDo2
-rw-r--r--kicker/applets/launcher/configdlg.h2
-rw-r--r--kicker/applets/launcher/popularity.cpp2
-rw-r--r--kicker/applets/launcher/prefs.kcfgc2
-rw-r--r--kicker/applets/launcher/quictdelauncher.cpp (renamed from kicker/applets/launcher/quicklauncher.cpp)20
-rw-r--r--kicker/applets/launcher/quictdelauncher.desktop (renamed from kicker/applets/launcher/quicklauncher.desktop)0
-rw-r--r--kicker/applets/launcher/quictdelauncher.h (renamed from kicker/applets/launcher/quicklauncher.h)4
10 files changed, 27 insertions, 27 deletions
diff --git a/kicker/applets/launcher/CMakeLists.txt b/kicker/applets/launcher/CMakeLists.txt
index bf5111658..c022762c0 100644
--- a/kicker/applets/launcher/CMakeLists.txt
+++ b/kicker/applets/launcher/CMakeLists.txt
@@ -26,7 +26,7 @@ link_directories(
##### other data ################################
-install( FILES quicklauncher.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/applets )
+install( FILES quictdelauncher.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/applets )
install( FILES launcherapplet.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
@@ -37,7 +37,7 @@ install( FILES launcherapplet.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
tde_add_kpart( launcher_panelapplet AUTOMOC
SOURCES
- quicklauncher.skel quicklauncher.cpp quickbutton.cpp
+ quictdelauncher.skel quictdelauncher.cpp quickbutton.cpp
quickaddappsmenu.cpp flowgridmanager.cpp popularity.cpp
configdlgbase.ui prefs.kcfgc configdlg.cpp
LINK
diff --git a/kicker/applets/launcher/ChangeLog b/kicker/applets/launcher/ChangeLog
index b86dbd7aa..1144a8c35 100644
--- a/kicker/applets/launcher/ChangeLog
+++ b/kicker/applets/launcher/ChangeLog
@@ -4,9 +4,9 @@
* Empty panel now has size>0, so user can still drop icons on it.
* Fixed gcc 3.4 incompatibilities in EasyVector
* Fixed Drag and Drop Bugs :
- * Crash when non-url dropped on quicklauncher
- * Crash panel button dropped on quicklauncher
- * Able to drop objects when quicklauncher is locked
+ * Crash when non-url dropped on quictdelauncher
+ * Crash panel button dropped on quictdelauncher
+ * Able to drop objects when quictdelauncher is locked
* Add application context menu now inserts new app at current location
2004-06-14 Dan Bullok <dan.kde@bullok.com>
@@ -28,7 +28,7 @@
* Spouts tons of debugging info to kdDebug (for now).
2004-06-12 Dan Bullok <dan.kde@bullok.com>
- * Fixed bug #75351: Tooltips change to filenames after rearranging applications in quicklauncher.
+ * Fixed bug #75351: Tooltips change to filenames after rearranging applications in quictdelauncher.
* Moved the URL->(menuID,service,kurl) functionality from the QuickButton constructor to its own class: QuickURL. Very similar code is used elsewhere in kicker, and should eventually be merged.
* Renamed some methods in QuickButton (getId -> menuId, getURL -> url) This matches the predominant KDE naming style.
* Groundwork laid for variable-sized buttons.
diff --git a/kicker/applets/launcher/Makefile.am b/kicker/applets/launcher/Makefile.am
index a0384df4f..1e586e0dd 100644
--- a/kicker/applets/launcher/Makefile.am
+++ b/kicker/applets/launcher/Makefile.am
@@ -3,13 +3,13 @@ INCLUDES = -I$(top_srcdir)/kicker/libkicker -I$(top_srcdir)/kicker/kicker/ui $(a
kde_module_LTLIBRARIES = launcher_panelapplet.la
-launcher_panelapplet_la_SOURCES = quicklauncher.skel quicklauncher.cpp quickbutton.cpp quickaddappsmenu.cpp flowgridmanager.cpp popularity.cpp configdlgbase.ui prefs.kcfgc configdlg.cpp
+launcher_panelapplet_la_SOURCES = quictdelauncher.skel quictdelauncher.cpp quickbutton.cpp quickaddappsmenu.cpp flowgridmanager.cpp popularity.cpp configdlgbase.ui prefs.kcfgc configdlg.cpp
METASOURCES = AUTO
-noinst_HEADERS = quicklauncher.h quickbutton.h quickaddappsmenu.h easyvector.h quickbuttongroup.h flowgridmanager.h popularity.h configdlg.h
+noinst_HEADERS = quictdelauncher.h quickbutton.h quickaddappsmenu.h easyvector.h quickbuttongroup.h flowgridmanager.h popularity.h configdlg.h
lnkdir = $(kde_datadir)/kicker/applets
-lnk_DATA = quicklauncher.desktop
+lnk_DATA = quictdelauncher.desktop
EXTRA_DIST = $(lnk_DATA)
@@ -21,7 +21,7 @@ launcher_panelapplet_la_LIBADD = ../../kicker/core/libkicker_core.la ../../kick
kde_kcfg_DATA = launcherapplet.kcfg
messages: rc.cpp
- $(XGETTEXT) *.cpp *.h -o $(podir)/quicklauncher.pot
+ $(XGETTEXT) *.cpp *.h -o $(podir)/quictdelauncher.pot
srcdoc:
- kdoc -a -p -H -d $$HOME/web/src/quicklauncher quicklauncher *.h -lqt -ltdecore -ltdeui
+ kdoc -a -p -H -d $$HOME/web/src/quictdelauncher quictdelauncher *.h -lqt -ltdecore -ltdeui
diff --git a/kicker/applets/launcher/ToDo b/kicker/applets/launcher/ToDo
index c7c852a36..1f3932b08 100644
--- a/kicker/applets/launcher/ToDo
+++ b/kicker/applets/launcher/ToDo
@@ -3,6 +3,6 @@ TODO:
x * Remove debugging code (makes everything slow).
* Tooltip or other popup to alert user that buttons are locked (with a "don't show this again" checkbox).
* Docs.
- * Use old quicklauncher config file if found. #77959
+ * Use old quictdelauncher config file if found. #77959
X * "Add application" context menu should add the new application at the index of the button that summoned the context menu.
X * Make sure to always have a little space to drop things on, even when there are no buttons.
diff --git a/kicker/applets/launcher/configdlg.h b/kicker/applets/launcher/configdlg.h
index e5fdbe34b..b96caf459 100644
--- a/kicker/applets/launcher/configdlg.h
+++ b/kicker/applets/launcher/configdlg.h
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef CONFIG_DLG_H
#define CONFIG_DLG_H
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
class ConfigDlgBase;
class Prefs;
diff --git a/kicker/applets/launcher/popularity.cpp b/kicker/applets/launcher/popularity.cpp
index a22a98c99..f38062e5b 100644
--- a/kicker/applets/launcher/popularity.cpp
+++ b/kicker/applets/launcher/popularity.cpp
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <assert.h>
#include <algorithm>
#include <iterator>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kdebug.h>
#include <list>
#include <set>
diff --git a/kicker/applets/launcher/prefs.kcfgc b/kicker/applets/launcher/prefs.kcfgc
index 243e97868..8a605b327 100644
--- a/kicker/applets/launcher/prefs.kcfgc
+++ b/kicker/applets/launcher/prefs.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
File=launcherapplet.kcfg
ClassName=Prefs
Singleton=false
diff --git a/kicker/applets/launcher/quicklauncher.cpp b/kicker/applets/launcher/quictdelauncher.cpp
index e5658f1cb..87ac35387 100644
--- a/kicker/applets/launcher/quicklauncher.cpp
+++ b/kicker/applets/launcher/quictdelauncher.cpp
@@ -38,7 +38,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <klocale.h>
#include <kmessagebox.h>
#include <knuminput.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kstandarddirs.h>
#include <kurldrag.h>
#include <kdebug.h>
@@ -52,7 +52,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "configdlg.h"
#include "popularity.h"
-#include "quicklauncher.h"
+#include "quictdelauncher.h"
#include "quickbutton.h"
#include "quickaddappsmenu.h"
#include "quickbuttongroup.h"
@@ -71,10 +71,10 @@ extern "C"
{
KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
{
- TDEGlobal::locale()->insertCatalogue("quicklauncher");
+ TDEGlobal::locale()->insertCatalogue("quictdelauncher");
return new QuickLauncher(configFile, KPanelApplet::Normal,
KPanelApplet::Preferences,
- parent, "quicklauncher");
+ parent, "quictdelauncher");
}
}
@@ -107,7 +107,7 @@ QuickLauncher::QuickLauncher(const TQString& configFile, Type type, int actions,
m_oldButtons = 0;
m_dragButtons = 0;
- m_configAction = new KAction(i18n("Configure Quicklauncher..."), "configure", KShortcut(),
+ m_configAction = new KAction(i18n("Configure Quictdelauncher..."), "configure", KShortcut(),
TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), TQT_TQOBJECT(this));
m_saveTimer = new TQTimer(this, "m_saveTimer");
@@ -135,7 +135,7 @@ QuickLauncher::QuickLauncher(const TQString& configFile, Type type, int actions,
"QuickLauncherApplet",
"serviceStartedByStorageId(TQString,TQString)",
false);
- kdDebug() << "Quicklauncher registered DCOP signal" << endl;
+ kdDebug() << "Quictdelauncher registered DCOP signal" << endl;
}
@@ -143,7 +143,7 @@ QuickLauncher::QuickLauncher(const TQString& configFile, Type type, int actions,
QuickLauncher::~QuickLauncher()
{
- TDEGlobal::locale()->removeCatalogue("quicklauncher");
+ TDEGlobal::locale()->removeCatalogue("quictdelauncher");
setCustomMenu(0);
delete m_popup;
delete m_appletPopup;
@@ -496,7 +496,7 @@ void QuickLauncher::addAppBeforeManually(TQString url, TQString sender)
void QuickLauncher::about()
{
- TDEAboutData about("quicklauncher", I18N_NOOP("Quick Launcher"), "2.0",
+ TDEAboutData about("quictdelauncher", I18N_NOOP("Quick Launcher"), "2.0",
I18N_NOOP("A simple application launcher"),
TDEAboutData::License_GPL_V2,
"(C) 2000 Bill Nagel\n(C) 2004 Dan Bullok\n(C) 2005 Fred Schaettgen");
@@ -949,7 +949,7 @@ void QuickLauncher::serviceStartedByStorageId(TQString /*starter*/, TQString sto
QuickURL url = QuickURL(locate("apps", service->desktopEntryPath()));
TQString desktopMenuId(url.menuId());
kdDebug() << "storageId=" << storageId << " desktopURL=" << desktopMenuId << endl;
- // A service was started somwhere else. If the quicklauncher contains
+ // A service was started somwhere else. If the quictdelauncher contains
// this service too, we flash the icon
QuickButton *startedButton = 0;
std::set<TQString> buttonIdSet;
@@ -1127,4 +1127,4 @@ void QuickLauncher::positionChange(Position)
}
-#include "quicklauncher.moc"
+#include "quictdelauncher.moc"
diff --git a/kicker/applets/launcher/quicklauncher.desktop b/kicker/applets/launcher/quictdelauncher.desktop
index 771dc687e..771dc687e 100644
--- a/kicker/applets/launcher/quicklauncher.desktop
+++ b/kicker/applets/launcher/quictdelauncher.desktop
diff --git a/kicker/applets/launcher/quicklauncher.h b/kicker/applets/launcher/quictdelauncher.h
index 2dadf6344..c6fe1d2bb 100644
--- a/kicker/applets/launcher/quicklauncher.h
+++ b/kicker/applets/launcher/quictdelauncher.h
@@ -21,8 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#ifndef __quicklauncher_h__
-#define __quicklauncher_h__
+#ifndef __quictdelauncher_h__
+#define __quictdelauncher_h__
#include <dcopobject.h>
#include <tqimage.h>