[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kile/usermenu] src: Make the internal naming scheme of the user menu more consistent by removing th
From: Michel Ludwig <michel.ludwig () kdemail ! net>
Date: 2012-03-03 23:42:54
Message-ID: 20120303234254.ED8B8A60A9 () git ! kde ! org
[Download RAW message or body]
Git commit 0ab52a2d2367a8bf11fc5c34a1f81bc31e8baa02 by Michel Ludwig.
Committed on 04/03/2012 at 00:41.
Pushed by mludwig into branch 'usermenu'.
Make the internal naming scheme of the user menu more consistent by removing the \
string 'LaTeX' in all of its variations
For instance, 'LatexUserMenu' simply becomes 'UserMenu' now.
M +6 -6 src/CMakeLists.txt
M +1 -1 src/data/CMakeLists.txt
R +- -- src/data/icons/actions/hi22-action-usermenu-clear.png [from: \
src/data/icons/actions/hi22-action-latexmenu-clear.png - 100% similarity] R +- -- \
src/data/icons/actions/hi22-action-usermenu-delete.png [from: \
src/data/icons/actions/hi22-action-latexmenu-delete.png - 100% similarity] R +- \
-- src/data/icons/actions/hi22-action-usermenu-down.png [from: \
src/data/icons/actions/hi22-action-latexmenu-down.png - 100% similarity] R +- -- \
src/data/icons/actions/hi22-action-usermenu-insert-above.png [from: \
src/data/icons/actions/hi22-action-latexmenu-insert-above.png - 100% similarity] R \
+- -- src/data/icons/actions/hi22-action-usermenu-insert-below.png [from: \
src/data/icons/actions/hi22-action-latexmenu-insert-below.png - 100% similarity] R \
+- -- src/data/icons/actions/hi22-action-usermenu-install.png [from: \
src/data/icons/actions/hi22-action-latexmenu-install.png - 100% similarity] R +- \
-- src/data/icons/actions/hi22-action-usermenu-into-submenu.png [from: \
src/data/icons/actions/hi22-action-latexmenu-into-submenu.png - 100% similarity] R \
+- -- src/data/icons/actions/hi22-action-usermenu-separator-above.png [from: \
src/data/icons/actions/hi22-action-latexmenu-separator-above.png - 100% similarity] R \
+- -- src/data/icons/actions/hi22-action-usermenu-separator-below.png [from: \
src/data/icons/actions/hi22-action-latexmenu-separator-below.png - 100% similarity] R \
+- -- src/data/icons/actions/hi22-action-usermenu-submenu-above.png [from: \
src/data/icons/actions/hi22-action-latexmenu-submenu-above.png - 100% similarity] R \
+- -- src/data/icons/actions/hi22-action-usermenu-submenu-below.png [from: \
src/data/icons/actions/hi22-action-latexmenu-submenu-below.png - 100% similarity] R \
+- -- src/data/icons/actions/hi22-action-usermenu-up.png [from: \
src/data/icons/actions/hi22-action-latexmenu-up.png - 100% similarity] R +1 -1 \
src/data/usermenu/CMakeLists.txt [from: src/data/latexmenu/CMakeLists.txt - 091% \
similarity] R +2 -2 src/data/usermenu/example.xml [from: \
src/data/latexmenu/example.xml - 098% similarity] M +2 -2 \
src/dialogs/configurationdialog.cpp R +223 -223 \
src/dialogs/usermenu/usermenudialog.cpp [from: \
src/dialogs/latexmenu/latexmenudialog.cpp - 056% similarity] R +23 -23 \
src/dialogs/usermenu/usermenudialog.h [from: src/dialogs/latexmenu/latexmenudialog.h \
- 069% similarity] R +7 -7 src/dialogs/usermenu/usermenudialog_base.ui [from: \
src/dialogs/latexmenu/latexmenudialog_base.ui - 098% similarity] R +21 -21 \
src/dialogs/usermenu/usermenuitem.cpp [from: src/dialogs/latexmenu/latexmenuitem.cpp \
- 057% similarity] R +13 -13 src/dialogs/usermenu/usermenuitem.h [from: \
src/dialogs/latexmenu/latexmenuitem.h - 079% similarity] R +146 -146 \
src/dialogs/usermenu/usermenutree.cpp [from: src/dialogs/latexmenu/latexmenutree.cpp \
- 068% similarity] R +17 -17 src/dialogs/usermenu/usermenutree.h [from: \
src/dialogs/latexmenu/latexmenutree.h - 076% similarity] M +36 -36 src/kile.cpp
M +3 -3 src/kile.h
M +2 -2 src/kile.kcfg
M +3 -3 src/kileinfo.h
M +2 -2 src/kileui.rc
M +4 -4 src/kileviewmanager.cpp
R +105 -105 src/usermenu/usermenu.cpp [from: src/latexmenu/latexmenu.cpp - 077% \
similarity] R +16 -16 src/usermenu/usermenu.h [from: src/latexmenu/latexmenu.h - \
080% similarity] R +10 -10 src/usermenu/usermenudata.cpp [from: \
src/latexmenu/latexmenudata.cpp - 075% similarity] R +6 -7 \
src/usermenu/usermenudata.h [from: src/latexmenu/latexmenudata.h - 092% similarity] M \
+10 -10 src/widgets/usermenuconfigwidget.cpp M +3 -3 \
src/widgets/usermenuconfigwidget.h M +2 -2 src/widgets/usermenuconfigwidget.ui
http://commits.kde.org/kile/0ab52a2d2367a8bf11fc5c34a1f81bc31e8baa02
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d87c8ac..7570500 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -123,11 +123,11 @@ SET(kile_SRCS
utilities.cpp
abbreviationmanager.cpp
editorcommands.cpp
- dialogs/latexmenu/latexmenudialog.cpp
- dialogs/latexmenu/latexmenuitem.cpp
- dialogs/latexmenu/latexmenutree.cpp
- latexmenu/latexmenudata.cpp
- latexmenu/latexmenu.cpp
+ dialogs/usermenu/usermenudialog.cpp
+ dialogs/usermenu/usermenuitem.cpp
+ dialogs/usermenu/usermenutree.cpp
+ usermenu/usermenudata.cpp
+ usermenu/usermenu.cpp
parser/parsermanager.cpp
parser/parserthread.cpp
parser/parser.cpp
@@ -167,7 +167,7 @@ SET( kile_UI
dialogs/pdf-wizard/pdfdialog_base.ui
dialogs/includegraphicsdialog_base.ui
dialogs/latexcommanddialog_base.ui
- dialogs/latexmenu/latexmenudialog_base.ui
+ dialogs/usermenu/usermenudialog_base.ui
widgets/livepreviewconfigwidget.ui
widgets/appearanceconfigwidget.ui
)
diff --git a/src/data/CMakeLists.txt b/src/data/CMakeLists.txt
index 18d9946..fdd0532 100644
--- a/src/data/CMakeLists.txt
+++ b/src/data/CMakeLists.txt
@@ -2,7 +2,7 @@ ADD_SUBDIRECTORY( complete )
ADD_SUBDIRECTORY( encodings )
ADD_SUBDIRECTORY( help )
ADD_SUBDIRECTORY( icons )
-ADD_SUBDIRECTORY( latexmenu )
+ADD_SUBDIRECTORY( usermenu )
ADD_SUBDIRECTORY( pics )
ADD_SUBDIRECTORY( symbols-ng )
ADD_SUBDIRECTORY( templates )
diff --git a/src/data/icons/actions/hi22-action-latexmenu-clear.png \
b/src/data/icons/actions/hi22-action-usermenu-clear.png similarity index 100%
rename from src/data/icons/actions/hi22-action-latexmenu-clear.png
rename to src/data/icons/actions/hi22-action-usermenu-clear.png
diff --git a/src/data/icons/actions/hi22-action-latexmenu-delete.png \
b/src/data/icons/actions/hi22-action-usermenu-delete.png similarity index 100%
rename from src/data/icons/actions/hi22-action-latexmenu-delete.png
rename to src/data/icons/actions/hi22-action-usermenu-delete.png
diff --git a/src/data/icons/actions/hi22-action-latexmenu-down.png \
b/src/data/icons/actions/hi22-action-usermenu-down.png similarity index 100%
rename from src/data/icons/actions/hi22-action-latexmenu-down.png
rename to src/data/icons/actions/hi22-action-usermenu-down.png
diff --git a/src/data/icons/actions/hi22-action-latexmenu-insert-above.png \
b/src/data/icons/actions/hi22-action-usermenu-insert-above.png similarity index 100%
rename from src/data/icons/actions/hi22-action-latexmenu-insert-above.png
rename to src/data/icons/actions/hi22-action-usermenu-insert-above.png
diff --git a/src/data/icons/actions/hi22-action-latexmenu-insert-below.png \
b/src/data/icons/actions/hi22-action-usermenu-insert-below.png similarity index 100%
rename from src/data/icons/actions/hi22-action-latexmenu-insert-below.png
rename to src/data/icons/actions/hi22-action-usermenu-insert-below.png
diff --git a/src/data/icons/actions/hi22-action-latexmenu-install.png \
b/src/data/icons/actions/hi22-action-usermenu-install.png similarity index 100%
rename from src/data/icons/actions/hi22-action-latexmenu-install.png
rename to src/data/icons/actions/hi22-action-usermenu-install.png
diff --git a/src/data/icons/actions/hi22-action-latexmenu-into-submenu.png \
b/src/data/icons/actions/hi22-action-usermenu-into-submenu.png similarity index 100%
rename from src/data/icons/actions/hi22-action-latexmenu-into-submenu.png
rename to src/data/icons/actions/hi22-action-usermenu-into-submenu.png
diff --git a/src/data/icons/actions/hi22-action-latexmenu-separator-above.png \
b/src/data/icons/actions/hi22-action-usermenu-separator-above.png similarity index \
100% rename from src/data/icons/actions/hi22-action-latexmenu-separator-above.png
rename to src/data/icons/actions/hi22-action-usermenu-separator-above.png
diff --git a/src/data/icons/actions/hi22-action-latexmenu-separator-below.png \
b/src/data/icons/actions/hi22-action-usermenu-separator-below.png similarity index \
100% rename from src/data/icons/actions/hi22-action-latexmenu-separator-below.png
rename to src/data/icons/actions/hi22-action-usermenu-separator-below.png
diff --git a/src/data/icons/actions/hi22-action-latexmenu-submenu-above.png \
b/src/data/icons/actions/hi22-action-usermenu-submenu-above.png similarity index 100%
rename from src/data/icons/actions/hi22-action-latexmenu-submenu-above.png
rename to src/data/icons/actions/hi22-action-usermenu-submenu-above.png
diff --git a/src/data/icons/actions/hi22-action-latexmenu-submenu-below.png \
b/src/data/icons/actions/hi22-action-usermenu-submenu-below.png similarity index 100%
rename from src/data/icons/actions/hi22-action-latexmenu-submenu-below.png
rename to src/data/icons/actions/hi22-action-usermenu-submenu-below.png
diff --git a/src/data/icons/actions/hi22-action-latexmenu-up.png \
b/src/data/icons/actions/hi22-action-usermenu-up.png similarity index 100%
rename from src/data/icons/actions/hi22-action-latexmenu-up.png
rename to src/data/icons/actions/hi22-action-usermenu-up.png
diff --git a/src/data/latexmenu/CMakeLists.txt b/src/data/usermenu/CMakeLists.txt
similarity index 91%
rename from src/data/latexmenu/CMakeLists.txt
rename to src/data/usermenu/CMakeLists.txt
index 6a991a4..81f4478 100644
--- a/src/data/latexmenu/CMakeLists.txt
+++ b/src/data/usermenu/CMakeLists.txt
@@ -1,4 +1,4 @@
########### install files ###############
FILE(GLOB kile_lum *.xml)
-INSTALL( FILES ${kile_lum} DESTINATION ${DATA_INSTALL_DIR}/kile/latexmenu )
+INSTALL( FILES ${kile_lum} DESTINATION ${DATA_INSTALL_DIR}/kile/usermenu )
diff --git a/src/data/latexmenu/example.xml b/src/data/usermenu/example.xml
similarity index 98%
rename from src/data/latexmenu/example.xml
rename to src/data/usermenu/example.xml
index fae63c5..dab5553 100644
--- a/src/data/latexmenu/example.xml
+++ b/src/data/usermenu/example.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Latexmenu>
+<UserMenu>
<submenu>
<title>Text</title>
<menu type="text">
@@ -67,4 +67,4 @@
<replaceSelection>true</replaceSelection>
<insertOutput>true</insertOutput>
</menu>
-</Latexmenu>
+</UserMenu>
diff --git a/src/dialogs/configurationdialog.cpp \
b/src/dialogs/configurationdialog.cpp index 773a98b..cf7d1be 100644
--- a/src/dialogs/configurationdialog.cpp
+++ b/src/dialogs/configurationdialog.cpp
@@ -194,9 +194,9 @@ namespace KileDialog
void Config::setupUsermenu(KPageWidgetItem *parent)
{
- usermenuPage = new KileWidgetUsermenuConfig(m_ki->latexUserMenu(),this);
+ usermenuPage = new KileWidgetUsermenuConfig(m_ki->userMenu(),this);
usermenuPage->setObjectName("Usermenu");
- addConfigPage(parent, usermenuPage, i18n("Usermenu"), "latexmenu-install", \
i18n("Usermenu")); + addConfigPage(parent, usermenuPage, i18n("User Menu"), \
"usermenu-install", i18n("User Menu"));
}
diff --git a/src/dialogs/latexmenu/latexmenudialog.cpp \
b/src/dialogs/usermenu/usermenudialog.cpp similarity index 56%
rename from src/dialogs/latexmenu/latexmenudialog.cpp
rename to src/dialogs/usermenu/usermenudialog.cpp
index 4cb5365..ca9fafb 100644
--- a/src/dialogs/latexmenu/latexmenudialog.cpp
+++ b/src/dialogs/usermenu/usermenudialog.cpp
@@ -21,10 +21,10 @@
#include <KXMLGUIClient>
#include <KXMLGUIFactory>
-#include "dialogs/latexmenu/latexmenudialog.h"
-#include "dialogs/latexmenu/latexmenutree.h"
-#include "dialogs/latexmenu/latexmenuitem.h"
-#include "latexmenu/latexmenu.h"
+#include "dialogs/usermenu/usermenudialog.h"
+#include "dialogs/usermenu/usermenutree.h"
+#include "dialogs/usermenu/usermenuitem.h"
+#include "usermenu/usermenu.h"
#include "kiledebug.h"
@@ -32,14 +32,14 @@ namespace KileMenu {
#define CHOOSABLE_MENUTYPES 3
-LatexmenuDialog::LatexmenuDialog(KConfig *config, KileInfo *ki, QObject \
*latexusermenu, const QString &xmlfile, QWidget *parent) \
+UserMenuDialog::UserMenuDialog(KConfig *config, KileInfo *ki, QObject *usermenu, \
const QString &xmlfile, QWidget *parent) : KileDialog::Wizard(config, parent), \
m_ki(ki) {
QWidget *page = new QWidget(this);
setMainWidget(page);
- m_LatexmenuDialog.setupUi(page);
+ m_UserMenuDialog.setupUi(page);
- m_menutree = m_LatexmenuDialog.m_twLatexMenu;
+ m_menutree = m_UserMenuDialog.m_twUserMenu;
m_menutree->setHeaderLabels( QStringList() << i18n("Menu Entry") << \
i18n("Shortcut") );
// Indexes must be identical to MenuType. Only the first three of them are \
choosable (see CHOOSABLE_MENUTYPES) @@ -51,62 +51,62 @@ \
LatexmenuDialog::LatexmenuDialog(KConfig *config, KileInfo *ki, QObject *latexus \
KILE_DEBUG() << "collection count: " << client->actionCollection()->count() ; \
allCollections += client->actionCollection(); }
- m_LatexmenuDialog.m_keyChooser->setCheckActionCollections(allCollections);
+ m_UserMenuDialog.m_keyChooser->setCheckActionCollections(allCollections);
KILE_DEBUG() << "total collections: " << allCollections.count();
- m_LatexmenuDialog.m_pbInsertBelow->setIcon(KIcon("latexmenu-insert-below.png"));
- m_LatexmenuDialog.m_pbInsertSubmenu->setIcon(KIcon("latexmenu-submenu-below.png"));
- m_LatexmenuDialog.m_pbInsertSeparator->setIcon(KIcon("latexmenu-separator-below.png"));
- m_LatexmenuDialog.m_pbDelete->setIcon(KIcon("latexmenu-delete.png"));
- m_LatexmenuDialog.m_pbUp->setIcon(KIcon("latexmenu-up.png"));
- m_LatexmenuDialog.m_pbDown->setIcon(KIcon("latexmenu-down.png"));
- m_LatexmenuDialog.m_pbIconDelete->setIcon(KIcon("edit-clear-locationbar-rtl.png"));
-
- connect(m_LatexmenuDialog.m_pbInsertBelow, SIGNAL(clicked()), this, \
SLOT(slotInsertMenuItem()));
- connect(m_LatexmenuDialog.m_pbInsertSubmenu, SIGNAL(clicked()), this, \
SLOT(slotInsertSubmenu()));
- connect(m_LatexmenuDialog.m_pbInsertSeparator, SIGNAL(clicked()), this, \
SLOT(slotInsertSeparator()));
- connect(m_LatexmenuDialog.m_pbUp, SIGNAL(clicked()), this, SLOT(slotUp()));
- connect(m_LatexmenuDialog.m_pbDown, SIGNAL(clicked()), this, SLOT(slotDown()));
- connect(m_LatexmenuDialog.m_pbDelete, SIGNAL(clicked()), this, SLOT(slotDelete()));
+ m_UserMenuDialog.m_pbInsertBelow->setIcon(KIcon("usermenu-insert-below.png"));
+ m_UserMenuDialog.m_pbInsertSubmenu->setIcon(KIcon("usermenu-submenu-below.png"));
+ m_UserMenuDialog.m_pbInsertSeparator->setIcon(KIcon("usermenu-separator-below.png"));
+ m_UserMenuDialog.m_pbDelete->setIcon(KIcon("usermenu-delete.png"));
+ m_UserMenuDialog.m_pbUp->setIcon(KIcon("usermenu-up.png"));
+ m_UserMenuDialog.m_pbDown->setIcon(KIcon("usermenu-down.png"));
+ m_UserMenuDialog.m_pbIconDelete->setIcon(KIcon("edit-clear-locationbar-rtl.png"));
+
+ connect(m_UserMenuDialog.m_pbInsertBelow, SIGNAL(clicked()), this, \
SLOT(slotInsertMenuItem())); + connect(m_UserMenuDialog.m_pbInsertSubmenu, \
SIGNAL(clicked()), this, SLOT(slotInsertSubmenu())); \
+ connect(m_UserMenuDialog.m_pbInsertSeparator, SIGNAL(clicked()), this, \
SLOT(slotInsertSeparator())); + connect(m_UserMenuDialog.m_pbUp, SIGNAL(clicked()), \
this, SLOT(slotUp())); + connect(m_UserMenuDialog.m_pbDown, SIGNAL(clicked()), this, \
SLOT(slotDown())); + connect(m_UserMenuDialog.m_pbDelete, SIGNAL(clicked()), this, \
SLOT(slotDelete()));
connect(m_menutree, SIGNAL(currentItemChanged(QTreeWidgetItem *,QTreeWidgetItem \
*)),
this, SLOT(slotCurrentItemChanged(QTreeWidgetItem *,QTreeWidgetItem *)));
- connect(m_LatexmenuDialog.m_pbMenuentryType, SIGNAL(clicked()), this, \
SLOT(slotMenuentryTypeClicked()));
- connect(m_LatexmenuDialog.m_leMenuEntry, SIGNAL(textEdited (const QString &)), \
this, SLOT(slotMenuentryTextChanged(const QString &)));
- connect(m_LatexmenuDialog.m_urlRequester, SIGNAL(textChanged (const QString &)), \
this, SLOT(slotUrlTextChanged(const QString &)));
- connect(m_LatexmenuDialog.m_urlRequester, SIGNAL(urlSelected(const KUrl&)), this, \
SLOT(slotUrlSelected(const KUrl&)));
- connect(m_LatexmenuDialog.m_leParameter, SIGNAL(textEdited (const QString &)), \
this, SLOT(slotParameterTextChanged(const QString &)));
- connect(m_LatexmenuDialog.m_teText, SIGNAL(textChanged()), this, \
SLOT(slotPlainTextChanged()));
- connect(m_LatexmenuDialog.m_pbIcon, SIGNAL(clicked()), this, \
SLOT(slotIconClicked()));
- connect(m_LatexmenuDialog.m_pbIconDelete, SIGNAL(clicked()), this, \
SLOT(slotIconDeleteClicked()));
- connect(m_LatexmenuDialog.m_keyChooser,SIGNAL(keySequenceChanged(const QKeySequence \
&)), this,SLOT(slotKeySequenceChanged(const QKeySequence &))); \
+ connect(m_UserMenuDialog.m_pbMenuentryType, SIGNAL(clicked()), this, \
SLOT(slotMenuentryTypeClicked())); + connect(m_UserMenuDialog.m_leMenuEntry, \
SIGNAL(textEdited (const QString &)), this, SLOT(slotMenuentryTextChanged(const \
QString &))); + connect(m_UserMenuDialog.m_urlRequester, SIGNAL(textChanged (const \
QString &)), this, SLOT(slotUrlTextChanged(const QString &))); \
+ connect(m_UserMenuDialog.m_urlRequester, SIGNAL(urlSelected(const KUrl&)), this, \
SLOT(slotUrlSelected(const KUrl&))); + connect(m_UserMenuDialog.m_leParameter, \
SIGNAL(textEdited (const QString &)), this, SLOT(slotParameterTextChanged(const \
QString &))); + connect(m_UserMenuDialog.m_teText, SIGNAL(textChanged()), this, \
SLOT(slotPlainTextChanged())); + connect(m_UserMenuDialog.m_pbIcon, \
SIGNAL(clicked()), this, SLOT(slotIconClicked())); \
+ connect(m_UserMenuDialog.m_pbIconDelete, SIGNAL(clicked()), this, \
SLOT(slotIconDeleteClicked())); \
+ connect(m_UserMenuDialog.m_keyChooser,SIGNAL(keySequenceChanged(const QKeySequence \
&)), this,SLOT(slotKeySequenceChanged(const QKeySequence &)));
- connect(m_LatexmenuDialog.m_cbNeedsSelection, SIGNAL(stateChanged(int)), this, \
SLOT(slotSelectionStateChanged(int)));
- connect(m_LatexmenuDialog.m_cbContextMenu, SIGNAL(stateChanged(int)), this, \
SLOT(slotCheckboxStateChanged(int)));
- connect(m_LatexmenuDialog.m_cbReplaceSelection, SIGNAL(stateChanged(int)), this, \
SLOT(slotCheckboxStateChanged(int)));
- connect(m_LatexmenuDialog.m_cbSelectInsertion, SIGNAL(stateChanged(int)), this, \
SLOT(slotCheckboxStateChanged(int)));
- connect(m_LatexmenuDialog.m_cbInsertOutput, SIGNAL(stateChanged(int)), this, \
SLOT(slotCheckboxStateChanged(int))); + connect(m_UserMenuDialog.m_cbNeedsSelection, \
SIGNAL(stateChanged(int)), this, SLOT(slotSelectionStateChanged(int))); \
+ connect(m_UserMenuDialog.m_cbContextMenu, SIGNAL(stateChanged(int)), this, \
SLOT(slotCheckboxStateChanged(int))); \
+ connect(m_UserMenuDialog.m_cbReplaceSelection, SIGNAL(stateChanged(int)), this, \
SLOT(slotCheckboxStateChanged(int))); + connect(m_UserMenuDialog.m_cbSelectInsertion, \
SIGNAL(stateChanged(int)), this, SLOT(slotCheckboxStateChanged(int))); \
+ connect(m_UserMenuDialog.m_cbInsertOutput, SIGNAL(stateChanged(int)), this, \
SLOT(slotCheckboxStateChanged(int)));
- connect(m_LatexmenuDialog.m_pbInstall, SIGNAL(clicked()), this, \
SLOT(slotInstallClicked()));
- connect(m_LatexmenuDialog.m_pbNew, SIGNAL(clicked()), this, \
SLOT(slotNewClicked())); + connect(m_UserMenuDialog.m_pbInstall, SIGNAL(clicked()), \
this, SLOT(slotInstallClicked())); + connect(m_UserMenuDialog.m_pbNew, \
SIGNAL(clicked()), this, SLOT(slotNewClicked()));
- connect(m_LatexmenuDialog.m_pbLoad, SIGNAL(clicked()), this, \
SLOT(slotLoadClicked()));
- connect(m_LatexmenuDialog.m_pbSave, SIGNAL(clicked()), this, \
SLOT(slotSaveClicked()));
- connect(m_LatexmenuDialog.m_pbSaveAs, SIGNAL(clicked()), this, \
SLOT(slotSaveAsClicked())); + connect(m_UserMenuDialog.m_pbLoad, SIGNAL(clicked()), \
this, SLOT(slotLoadClicked())); + connect(m_UserMenuDialog.m_pbSave, \
SIGNAL(clicked()), this, SLOT(slotSaveClicked())); \
+ connect(m_UserMenuDialog.m_pbSaveAs, SIGNAL(clicked()), this, \
SLOT(slotSaveAsClicked()));
- // connect dialog with latexmenu to install xml file
- connect(this, SIGNAL(installXmlFile(const QString &)), latexusermenu, \
SLOT(slotInstallXmlFile(const QString &))); + // connect dialog with usermenu to \
install xml file + connect(this, SIGNAL(installXmlFile(const QString &)), usermenu, \
SLOT(slotInstallXmlFile(const QString &)));
// set context menu handler for the menutree
m_menutree->setContextMenuPolicy(Qt::CustomContextMenu);
connect(m_menutree, SIGNAL(customContextMenuRequested(const QPoint &)), this, \
SLOT(slotCustomContextMenuRequested(const QPoint &)));
// adjust some widths
- int w = m_LatexmenuDialog.m_pbInsertBelow->sizeHint().width();
- m_LatexmenuDialog.m_pbUp->setMinimumWidth(w);
- m_LatexmenuDialog.m_pbDown->setMinimumWidth(w);
- m_LatexmenuDialog.m_lbIconChosen->setMinimumWidth( \
m_LatexmenuDialog.m_pbIcon->sizeHint().width() ); + int w = \
m_UserMenuDialog.m_pbInsertBelow->sizeHint().width(); \
+ m_UserMenuDialog.m_pbUp->setMinimumWidth(w); \
+ m_UserMenuDialog.m_pbDown->setMinimumWidth(w); \
+ m_UserMenuDialog.m_lbIconChosen->setMinimumWidth( \
m_UserMenuDialog.m_pbIcon->sizeHint().width() );
setFocusProxy(m_menutree);
setModal(false);
@@ -123,17 +123,17 @@ LatexmenuDialog::LatexmenuDialog(KConfig *config, KileInfo *ki, \
QObject *latexus }
}
-void LatexmenuDialog::startDialog()
+void UserMenuDialog::startDialog()
{
initDialog();
m_modified = false;
setXmlFile(QString::null,false);
updateDialogButtons();
- m_LatexmenuDialog.m_pbNew->setEnabled(false);
+ m_UserMenuDialog.m_pbNew->setEnabled(false);
}
-void LatexmenuDialog::initDialog()
+void UserMenuDialog::initDialog()
{
updateTreeButtons();
@@ -147,23 +147,23 @@ void LatexmenuDialog::initDialog()
// init first entry
m_currentIcon = QString::null;
- showMenuentryData( dynamic_cast<LatexmenuItem *>(current) );
+ showMenuentryData( dynamic_cast<UserMenuItem *>(current) );
}
-void LatexmenuDialog::setXmlFile(const QString &filename, bool installed)
+void UserMenuDialog::setXmlFile(const QString &filename, bool installed)
{
m_currentXmlInstalled = installed;
m_currentXmlFile = filename;
- m_LatexmenuDialog.m_lbXmlFile->setText( i18n("File:") + " " + \
QFileInfo(m_currentXmlFile).fileName() ); + m_UserMenuDialog.m_lbXmlFile->setText( \
i18n("File:") + " " + QFileInfo(m_currentXmlFile).fileName() ); if ( \
m_currentXmlInstalled ) {
- m_LatexmenuDialog.m_lbXmlInstalled->show();
+ m_UserMenuDialog.m_lbXmlInstalled->show();
} else {
- m_LatexmenuDialog.m_lbXmlInstalled->hide();
+ m_UserMenuDialog.m_lbXmlInstalled->hide();
}
}
-void LatexmenuDialog::setModified()
+void UserMenuDialog::setModified()
{
if ( !m_modified ) {
m_modified = true;
@@ -172,7 +172,7 @@ void LatexmenuDialog::setModified()
updateDialogButtons();
}
-void LatexmenuDialog::updateDialogButtons()
+void UserMenuDialog::updateDialogButtons()
{
bool installedFile = (!m_currentXmlFile.isEmpty());
bool menutreeState = !m_menutree->isEmpty();
@@ -181,15 +181,15 @@ void LatexmenuDialog::updateDialogButtons()
bool saveState = m_modified && installedFile;
bool saveAsState = m_modified || (!m_modified && installedFile && \
m_currentXmlInstalled);
- m_LatexmenuDialog.m_pbInstall->setEnabled(installState && menutreeState);
- m_LatexmenuDialog.m_pbSave->setEnabled(saveState && menutreeState);
- m_LatexmenuDialog.m_pbSaveAs->setEnabled(saveAsState && menutreeState);
- m_LatexmenuDialog.m_pbNew->setEnabled(true);
+ m_UserMenuDialog.m_pbInstall->setEnabled(installState && menutreeState);
+ m_UserMenuDialog.m_pbSave->setEnabled(saveState && menutreeState);
+ m_UserMenuDialog.m_pbSaveAs->setEnabled(saveAsState && menutreeState);
+ m_UserMenuDialog.m_pbNew->setEnabled(true);
}
///////////////////////////// ok button //////////////////////////////
-bool LatexmenuDialog::okClicked()
+bool UserMenuDialog::okClicked()
{
if ( m_currentXmlFile.isEmpty() ) {
return !saveAsClicked().isEmpty();
@@ -208,7 +208,7 @@ bool LatexmenuDialog::okClicked()
///////////////////////////// dialog button slots //////////////////////////////
-void LatexmenuDialog::slotButtonClicked(int button)
+void UserMenuDialog::slotButtonClicked(int button)
{
if ( button == Ok ) {
if ( !okClicked() ) {
@@ -240,7 +240,7 @@ void LatexmenuDialog::slotButtonClicked(int button)
"</ul>"
"<p>If some important information for an action is missing, menu items are \
colored red. More information is available using the <i>What's this</i> feature of \
most widgets.</p>");
- KMessageBox::information(this,message,i18n("Latexmenu Dialog"));
+ KMessageBox::information(this,message,i18n("UserMenu Dialog"));
}
else {
Wizard::slotButtonClicked(button);
@@ -249,7 +249,7 @@ void LatexmenuDialog::slotButtonClicked(int button)
///////////////////////////// Button slots (Install/New) \
//////////////////////////////
-void LatexmenuDialog::slotInstallClicked()
+void UserMenuDialog::slotInstallClicked()
{
KILE_DEBUG() << "install " << m_currentXmlFile << "...";
@@ -260,7 +260,7 @@ void LatexmenuDialog::slotInstallClicked()
}
}
-void LatexmenuDialog::slotNewClicked()
+void UserMenuDialog::slotNewClicked()
{
KILE_DEBUG() << "start new menutree ... ";
@@ -278,7 +278,7 @@ void LatexmenuDialog::slotNewClicked()
///////////////////////////// Button slots (Load) //////////////////////////////
-void LatexmenuDialog::slotLoadClicked()
+void UserMenuDialog::slotLoadClicked()
{
KILE_DEBUG() << "load xml file ";
@@ -288,7 +288,7 @@ void LatexmenuDialog::slotLoadClicked()
}
}
- QString directory = LatexUserMenu::selectLatexmenuDir();
+ QString directory = UserMenu::selectUserMenuDir();
QString filter = i18n("*.xml|Latex Menu Files");
QString filename = KFileDialog::getOpenFileName(directory, filter, this, \
i18n("Select Menu File")); @@ -304,7 +304,7 @@ void \
LatexmenuDialog::slotLoadClicked() }
}
-void LatexmenuDialog::loadXmlFile(const QString &filename, bool installed)
+void UserMenuDialog::loadXmlFile(const QString &filename, bool installed)
{
KILE_DEBUG() << "load xml started ...";
m_menutree->readXml(filename);
@@ -317,7 +317,7 @@ void LatexmenuDialog::loadXmlFile(const QString &filename, bool \
installed)
///////////////////////////// Button slots (Save) //////////////////////////////
-void LatexmenuDialog::slotSaveClicked()
+void UserMenuDialog::slotSaveClicked()
{
if ( saveClicked() ) {
m_modified = false;
@@ -331,7 +331,7 @@ void LatexmenuDialog::slotSaveClicked()
}
}
-bool LatexmenuDialog::saveClicked()
+bool UserMenuDialog::saveClicked()
{
if ( m_currentXmlFile.isEmpty() ) {
return false;
@@ -342,7 +342,7 @@ bool LatexmenuDialog::saveClicked()
QTreeWidgetItem *current = m_menutree->currentItem();
if ( current ) {
kdDebug() << "read current item ...";
- readMenuentryData( dynamic_cast<LatexmenuItem *>(current) );
+ readMenuentryData( dynamic_cast<UserMenuItem *>(current) );
}
if ( saveCheck() == false ) {
@@ -350,7 +350,7 @@ bool LatexmenuDialog::saveClicked()
}
// force to save file in local directory
- QStringList dirs = KGlobal::dirs()->findDirs("appdata", "latexmenu/");
+ QStringList dirs = KGlobal::dirs()->findDirs("appdata", "usermenu/");
if ( dirs.size() > 1 ) {
if ( m_currentXmlFile.startsWith(dirs[1]) ) {
m_currentXmlFile.replace(dirs[1],dirs[0]);
@@ -363,7 +363,7 @@ bool LatexmenuDialog::saveClicked()
return true;
}
-void LatexmenuDialog::slotSaveAsClicked()
+void UserMenuDialog::slotSaveAsClicked()
{
QString filename = saveAsClicked();
if ( !filename.isEmpty() ) {
@@ -374,7 +374,7 @@ void LatexmenuDialog::slotSaveAsClicked()
}
}
-QString LatexmenuDialog::saveAsClicked()
+QString UserMenuDialog::saveAsClicked()
{
KILE_DEBUG() << "menutree should be saved as ...";
@@ -382,14 +382,14 @@ QString LatexmenuDialog::saveAsClicked()
QTreeWidgetItem *current = m_menutree->currentItem();
if ( current ) {
KILE_DEBUG() << "read current item ...";
- readMenuentryData( dynamic_cast<LatexmenuItem *>(current) );
+ readMenuentryData( dynamic_cast<UserMenuItem *>(current) );
}
if ( saveCheck() == false ) {
return QString::null;
}
- QString directory = KStandardDirs::locateLocal("appdata", "latexmenu/");
+ QString directory = KStandardDirs::locateLocal("appdata", "usermenu/");
QString filter = i18n("*.xml|Latex Menu Files");
QString filename = KFileDialog::getSaveFileName(directory, filter, this, i18n("Save \
Menu File")); @@ -408,7 +408,7 @@ QString LatexmenuDialog::saveAsClicked()
return filename;
}
-bool LatexmenuDialog::saveCheck()
+bool UserMenuDialog::saveCheck()
{
if ( m_menutree->errorCheck() == false ) {
if ( KMessageBox::questionYesNo(this, i18n("The menu tree contains some errors and \
installing this file may lead to unpredictable results.\nDo you really want to save \
this file?")) == KMessageBox::No ) { @@ -421,13 +421,13 @@ bool \
LatexmenuDialog::saveCheck()
///////////////////////////// Button slots (left widget) \
//////////////////////////////
-void LatexmenuDialog::slotCustomContextMenuRequested(const QPoint &pos)
+void UserMenuDialog::slotCustomContextMenuRequested(const QPoint &pos)
{
m_menutree->contextMenuRequested(pos);
updateAfterDelete();
}
-void LatexmenuDialog::slotInsertMenuItem()
+void UserMenuDialog::slotInsertMenuItem()
{
if ( m_menutree->insertMenuItem(m_menutree->currentItem()) ) {
updateTreeButtons();
@@ -435,7 +435,7 @@ void LatexmenuDialog::slotInsertMenuItem()
}
}
-void LatexmenuDialog::slotInsertSubmenu()
+void UserMenuDialog::slotInsertSubmenu()
{
QTreeWidgetItem *current = m_menutree->currentItem();
if ( current ) {
@@ -446,7 +446,7 @@ void LatexmenuDialog::slotInsertSubmenu()
}
}
-void LatexmenuDialog::slotInsertSeparator()
+void UserMenuDialog::slotInsertSeparator()
{
QTreeWidgetItem *current = m_menutree->currentItem();
if ( current ) {
@@ -457,7 +457,7 @@ void LatexmenuDialog::slotInsertSeparator()
}
}
-void LatexmenuDialog::slotDelete()
+void UserMenuDialog::slotDelete()
{
QTreeWidgetItem *current = m_menutree->currentItem();
if ( current ) {
@@ -466,7 +466,7 @@ void LatexmenuDialog::slotDelete()
}
}
-void LatexmenuDialog::slotUp()
+void UserMenuDialog::slotUp()
{
QTreeWidgetItem *current = m_menutree->currentItem();
if ( current ) {
@@ -476,7 +476,7 @@ void LatexmenuDialog::slotUp()
}
}
-void LatexmenuDialog::slotDown()
+void UserMenuDialog::slotDown()
{
QTreeWidgetItem *current = m_menutree->currentItem();
if ( current ) {
@@ -486,32 +486,32 @@ void LatexmenuDialog::slotDown()
}
}
-void LatexmenuDialog::updateTreeButtons()
+void UserMenuDialog::updateTreeButtons()
{
- LatexmenuItem *current = dynamic_cast<LatexmenuItem *>(m_menutree->currentItem());
+ UserMenuItem *current = dynamic_cast<UserMenuItem *>(m_menutree->currentItem());
if ( current ) {
- bool state = ( current->menutype() == LatexmenuData::Separator ) ? false : true;
- m_LatexmenuDialog.m_pbInsertSeparator->setEnabled(state);
- m_LatexmenuDialog.m_pbDelete->setEnabled(true);
+ bool state = ( current->menutype() == UserMenuData::Separator ) ? false : true;
+ m_UserMenuDialog.m_pbInsertSeparator->setEnabled(state);
+ m_UserMenuDialog.m_pbDelete->setEnabled(true);
bool upstate = ( m_menutree->indexOfTopLevelItem(current) == 0 ) ? false : true;
- m_LatexmenuDialog.m_pbUp->setEnabled(upstate);
+ m_UserMenuDialog.m_pbUp->setEnabled(upstate);
bool downstate = ( m_menutree->itemBelow(current) ) ? true : false;
if ( !downstate && current->parent() ) {
downstate = true;
}
- m_LatexmenuDialog.m_pbDown->setEnabled(downstate);
+ m_UserMenuDialog.m_pbDown->setEnabled(downstate);
}
else {
- m_LatexmenuDialog.m_pbInsertSeparator->setEnabled(false);
- m_LatexmenuDialog.m_pbDelete->setEnabled(false);
- m_LatexmenuDialog.m_pbUp->setEnabled(false);
- m_LatexmenuDialog.m_pbDown->setEnabled(false);
+ m_UserMenuDialog.m_pbInsertSeparator->setEnabled(false);
+ m_UserMenuDialog.m_pbDelete->setEnabled(false);
+ m_UserMenuDialog.m_pbUp->setEnabled(false);
+ m_UserMenuDialog.m_pbDown->setEnabled(false);
}
}
-void LatexmenuDialog::updateAfterDelete()
+void UserMenuDialog::updateAfterDelete()
{
if ( m_menutree->isEmpty() ) {
initDialog();
@@ -524,38 +524,38 @@ void LatexmenuDialog::updateAfterDelete()
////////////////////////////// TreeWidget slots (left widget) \
//////////////////////////////
-void LatexmenuDialog::slotCurrentItemChanged(QTreeWidgetItem \
*current,QTreeWidgetItem *previous) +void \
UserMenuDialog::slotCurrentItemChanged(QTreeWidgetItem *current,QTreeWidgetItem \
*previous) {
QString from = ( previous ) ? previous->text(0) : "---";
QString to = ( current ) ? current->text(0) : "---";
KILE_DEBUG() << "currentItemChanged: from=" << from << " to=" << to;
bool modifiedState = m_modified;
- bool installState = m_LatexmenuDialog.m_pbInstall->isEnabled();
- bool saveState = m_LatexmenuDialog.m_pbSave->isEnabled();
- bool saveAsState = m_LatexmenuDialog.m_pbSaveAs->isEnabled();
+ bool installState = m_UserMenuDialog.m_pbInstall->isEnabled();
+ bool saveState = m_UserMenuDialog.m_pbSave->isEnabled();
+ bool saveAsState = m_UserMenuDialog.m_pbSaveAs->isEnabled();
// read old data
- readMenuentryData( dynamic_cast<LatexmenuItem *>(previous) );
+ readMenuentryData( dynamic_cast<UserMenuItem *>(previous) );
// set new data
- showMenuentryData( dynamic_cast<LatexmenuItem *>(current) );
+ showMenuentryData( dynamic_cast<UserMenuItem *>(current) );
// update buttons for treewidget
updateTreeButtons();
// restore saved states
m_modified = modifiedState;
- m_LatexmenuDialog.m_pbInstall->setEnabled(installState);
- m_LatexmenuDialog.m_pbSave->setEnabled(saveState);
- m_LatexmenuDialog.m_pbSaveAs->setEnabled(saveAsState);
+ m_UserMenuDialog.m_pbInstall->setEnabled(installState);
+ m_UserMenuDialog.m_pbSave->setEnabled(saveState);
+ m_UserMenuDialog.m_pbSaveAs->setEnabled(saveAsState);
}
////////////////////////////// MenuentryType slots (right widget) \
//////////////////////////////
-void LatexmenuDialog::slotMenuentryTypeClicked()
+void UserMenuDialog::slotMenuentryTypeClicked()
{
- LatexmenuItem *current = dynamic_cast<LatexmenuItem *>(m_menutree->currentItem());
+ UserMenuItem *current = dynamic_cast<UserMenuItem *>(m_menutree->currentItem());
if ( !current ) {
return;
}
@@ -582,19 +582,19 @@ void LatexmenuDialog::slotMenuentryTypeClicked()
}
// set new values
- current->setMenutype( LatexmenuData::MenuType(newtype) );
- m_LatexmenuDialog.m_lbMenuentryType->setText(list[0]);
- if ( newtype == LatexmenuData::Text ) {
+ current->setMenutype( UserMenuData::MenuType(newtype) );
+ m_UserMenuDialog.m_lbMenuentryType->setText(list[0]);
+ if ( newtype == UserMenuData::Text ) {
setMenuentryFileChooser(current,false);
setMenuentryFileParameter(current,false);
setMenuentryTextEdit(current,true);
}
- else if ( newtype == LatexmenuData::FileContent ) {
+ else if ( newtype == UserMenuData::FileContent ) {
setMenuentryFileChooser(current,true);
setMenuentryFileParameter(current,false);
setMenuentryTextEdit(current,false);
}
- else /* if ( newtype == LatexmenuData::Program ) */ {
+ else /* if ( newtype == UserMenuData::Program ) */ {
setMenuentryFileChooser(current,true);
setMenuentryFileParameter(current,true);
setMenuentryTextEdit(current,false);
@@ -605,9 +605,9 @@ void LatexmenuDialog::slotMenuentryTypeClicked()
////////////////////////////// Menuentry slot (right widget) \
//////////////////////////////
-void LatexmenuDialog::slotMenuentryTextChanged(const QString &text)
+void UserMenuDialog::slotMenuentryTextChanged(const QString &text)
{
- LatexmenuItem *current = dynamic_cast<LatexmenuItem *>( m_menutree->currentItem() \
); + UserMenuItem *current = dynamic_cast<UserMenuItem *>( m_menutree->currentItem() \
); if ( current ) {
current->setText(0,text);
}
@@ -616,40 +616,40 @@ void LatexmenuDialog::slotMenuentryTextChanged(const QString \
&text)
////////////////////////////// KUrlRequester slots (right widget) \
//////////////////////////////
-void LatexmenuDialog::slotUrlTextChanged(const QString &)
+void UserMenuDialog::slotUrlTextChanged(const QString &)
{
- LatexmenuItem *current = dynamic_cast<LatexmenuItem *>(m_menutree->currentItem());
+ UserMenuItem *current = dynamic_cast<UserMenuItem *>(m_menutree->currentItem());
if ( !current ) {
return;
}
- QString file = m_LatexmenuDialog.m_urlRequester->text().trimmed();
+ QString file = m_UserMenuDialog.m_urlRequester->text().trimmed();
QString color = "black";
int type = current->menutype();
- if ( type == LatexmenuData::FileContent ) {
+ if ( type == UserMenuData::FileContent ) {
if ( !QFile::exists(file) || file.isEmpty() ) {
color = "red";
}
}
- else if ( type == LatexmenuData::Program ) {
+ else if ( type == UserMenuData::Program ) {
if ( !m_menutree->isItemExecutable(file) ) {
color= "red";
}
}
- m_LatexmenuDialog.m_urlRequester->setStyleSheet( "QLineEdit { color: " + color + "; \
}" ); + m_UserMenuDialog.m_urlRequester->setStyleSheet( "QLineEdit { color: " + color \
+ "; }" ); setModified();
}
-void LatexmenuDialog::slotUrlSelected(const KUrl &)
+void UserMenuDialog::slotUrlSelected(const KUrl &)
{
setModified();
}
////////////////////////////// Parameter slot (right widget) \
//////////////////////////////
-void LatexmenuDialog::slotParameterTextChanged(const QString &)
+void UserMenuDialog::slotParameterTextChanged(const QString &)
{
setModified();
}
@@ -657,14 +657,14 @@ void LatexmenuDialog::slotParameterTextChanged(const QString &)
////////////////////////////// Text slot (right widget) \
//////////////////////////////
-void LatexmenuDialog::slotPlainTextChanged()
+void UserMenuDialog::slotPlainTextChanged()
{
setModified();
}
////////////////////////////// Icon slots (right widget) \
//////////////////////////////
-void LatexmenuDialog::slotIconClicked()
+void UserMenuDialog::slotIconClicked()
{
QString iconname = KIconDialog::getIcon(KIconLoader::Small, KIconLoader::Any,true);
if ( iconname!=m_currentIcon && !iconname.isEmpty() ) {
@@ -676,16 +676,16 @@ void LatexmenuDialog::slotIconClicked()
}
}
-void LatexmenuDialog::slotIconDeleteClicked()
+void UserMenuDialog::slotIconDeleteClicked()
{
m_currentIcon = QString::null;
setMenuentryIcon(m_currentIcon);
setModified();
}
-void LatexmenuDialog::setMenuentryIcon(const QString &icon)
+void UserMenuDialog::setMenuentryIcon(const QString &icon)
{
- LatexmenuItem *current = dynamic_cast<LatexmenuItem *>( m_menutree->currentItem() \
); + UserMenuItem *current = dynamic_cast<UserMenuItem *>( m_menutree->currentItem() \
); if ( current ) {
if ( icon.isEmpty() ) {
current->setIcon(0,KIcon());
@@ -702,69 +702,69 @@ void LatexmenuDialog::setMenuentryIcon(const QString &icon)
////////////////////////////// Shortcut slots (right widget) \
//////////////////////////////
-void LatexmenuDialog::slotKeySequenceChanged(const QKeySequence &seq)
+void UserMenuDialog::slotKeySequenceChanged(const QKeySequence &seq)
{
QString shortcut = seq.toString(QKeySequence::NativeText);
KILE_DEBUG() << "key sequence changed: " << shortcut;
- LatexmenuItem *current = dynamic_cast<LatexmenuItem *>( m_menutree->currentItem() \
); + UserMenuItem *current = dynamic_cast<UserMenuItem *>( m_menutree->currentItem() \
); if ( current ) {
current->setText(1,shortcut);
current->setShortcut(shortcut);
- m_LatexmenuDialog.m_keyChooser->applyStealShortcut();
+ m_UserMenuDialog.m_keyChooser->applyStealShortcut();
setModified();
}
}
////////////////////////////// Selection checkbox slots (right widget) \
//////////////////////////////
-void LatexmenuDialog::slotSelectionStateChanged(int state)
+void UserMenuDialog::slotSelectionStateChanged(int state)
{
- m_LatexmenuDialog.m_cbReplaceSelection->setEnabled(state);
- m_LatexmenuDialog.m_cbContextMenu->setEnabled(state);
+ m_UserMenuDialog.m_cbReplaceSelection->setEnabled(state);
+ m_UserMenuDialog.m_cbContextMenu->setEnabled(state);
if ( !state ) {
- m_LatexmenuDialog.m_cbReplaceSelection->setChecked(state);
- m_LatexmenuDialog.m_cbContextMenu->setChecked(state);
+ m_UserMenuDialog.m_cbReplaceSelection->setChecked(state);
+ m_UserMenuDialog.m_cbContextMenu->setChecked(state);
}
setModified();
}
-void LatexmenuDialog::slotCheckboxStateChanged(int)
+void UserMenuDialog::slotCheckboxStateChanged(int)
{
setModified();
}
////////////////////////////// read menu item data //////////////////////////////
-void LatexmenuDialog::readMenuentryData(LatexmenuItem *item)
+void UserMenuDialog::readMenuentryData(UserMenuItem *item)
{
KILE_DEBUG() << "read current menu item ...";
if ( !item ) {
return;
}
- LatexmenuData::MenuType type = LatexmenuData::MenuType( \
m_listMenutypes.indexOf(m_LatexmenuDialog.m_lbMenuentryType->text()) ); \
+ UserMenuData::MenuType type = UserMenuData::MenuType( \
m_listMenutypes.indexOf(m_UserMenuDialog.m_lbMenuentryType->text()) ); \
item->setMenutype(type);
- if ( type == LatexmenuData::Separator ) {
+ if ( type == UserMenuData::Separator ) {
return;
}
- item->setMenutitle( m_LatexmenuDialog.m_leMenuEntry->text().trimmed() );
- item->setFilename( m_LatexmenuDialog.m_urlRequester->text().trimmed() );
- item->setParameter( m_LatexmenuDialog.m_leParameter->text().trimmed() );
- item->setPlaintext( m_LatexmenuDialog.m_teText->toPlainText() );
+ item->setMenutitle( m_UserMenuDialog.m_leMenuEntry->text().trimmed() );
+ item->setFilename( m_UserMenuDialog.m_urlRequester->text().trimmed() );
+ item->setParameter( m_UserMenuDialog.m_leParameter->text().trimmed() );
+ item->setPlaintext( m_UserMenuDialog.m_teText->toPlainText() );
item->setMenuicon( m_currentIcon );
- item->setShortcut(m_LatexmenuDialog.m_keyChooser->keySequence().toString(QKeySequence::NativeText) \
); + item->setShortcut(m_UserMenuDialog.m_keyChooser->keySequence().toString(QKeySequence::NativeText) \
);
- item->setNeedsSelection( m_LatexmenuDialog.m_cbNeedsSelection->checkState() );
- item->setUseContextMenu( m_LatexmenuDialog.m_cbContextMenu->checkState() );
- item->setReplaceSelection( m_LatexmenuDialog.m_cbReplaceSelection->checkState() );
- item->setSelectInsertion( m_LatexmenuDialog.m_cbSelectInsertion->checkState() );
- item->setInsertOutput( m_LatexmenuDialog.m_cbInsertOutput->checkState() );
+ item->setNeedsSelection( m_UserMenuDialog.m_cbNeedsSelection->checkState() );
+ item->setUseContextMenu( m_UserMenuDialog.m_cbContextMenu->checkState() );
+ item->setReplaceSelection( m_UserMenuDialog.m_cbReplaceSelection->checkState() );
+ item->setSelectInsertion( m_UserMenuDialog.m_cbSelectInsertion->checkState() );
+ item->setInsertOutput( m_UserMenuDialog.m_cbInsertOutput->checkState() );
- bool executable = ( type==LatexmenuData::Program && \
m_menutree->isItemExecutable(item->filename()) ); + bool executable = ( \
type==UserMenuData::Program && m_menutree->isItemExecutable(item->filename()) ); \
item->setModelData(executable);
item->setText(0, item->updateMenutitle());
@@ -772,7 +772,7 @@ void LatexmenuDialog::readMenuentryData(LatexmenuItem *item)
////////////////////////////// show menu item data //////////////////////////////
-void LatexmenuDialog::showMenuentryData(LatexmenuItem *item)
+void UserMenuDialog::showMenuentryData(UserMenuItem *item)
{
KILE_DEBUG() << "show new menu item ...";
if ( !item ) {
@@ -780,21 +780,21 @@ void LatexmenuDialog::showMenuentryData(LatexmenuItem *item)
return;
}
- LatexmenuData::MenuType type = item->menutype();
+ UserMenuData::MenuType type = item->menutype();
blockSignals(true);
switch ( type ) {
- case LatexmenuData::Text: setTextEntry(item); break;
- case LatexmenuData::FileContent: setFileContentEntry(item); break;
- case LatexmenuData::Program: setProgramEntry(item); break;
- case LatexmenuData::Separator: setSeparatorEntry(item); break;
- case LatexmenuData::Submenu: setSubmenuEntry(item); break;
+ case UserMenuData::Text: setTextEntry(item); break;
+ case UserMenuData::FileContent: setFileContentEntry(item); break;
+ case UserMenuData::Program: setProgramEntry(item); break;
+ case UserMenuData::Separator: setSeparatorEntry(item); break;
+ case UserMenuData::Submenu: setSubmenuEntry(item); break;
default: disableMenuEntryData(); // should not happen
}
blockSignals(false);
}
-void LatexmenuDialog::setTextEntry(LatexmenuItem *item)
+void UserMenuDialog::setTextEntry(UserMenuItem *item)
{
setMenuentryText(item,true);
setMenuentryType(item,true,true);
@@ -807,7 +807,7 @@ void LatexmenuDialog::setTextEntry(LatexmenuItem *item)
setMenuentryCheckboxes(item,false);
}
-void LatexmenuDialog::setFileContentEntry(LatexmenuItem *item)
+void UserMenuDialog::setFileContentEntry(UserMenuItem *item)
{
setMenuentryText(item,true);
setMenuentryType(item,true,true);
@@ -820,7 +820,7 @@ void LatexmenuDialog::setFileContentEntry(LatexmenuItem *item)
setMenuentryCheckboxes(item,false);
}
-void LatexmenuDialog::setProgramEntry(LatexmenuItem *item)
+void UserMenuDialog::setProgramEntry(UserMenuItem *item)
{
setMenuentryText(item,true);
setMenuentryType(item,true,true);
@@ -833,13 +833,13 @@ void LatexmenuDialog::setProgramEntry(LatexmenuItem *item)
setMenuentryCheckboxes(item,true);
}
-void LatexmenuDialog::setSeparatorEntry(LatexmenuItem *item)
+void UserMenuDialog::setSeparatorEntry(UserMenuItem *item)
{
disableMenuEntryData();
setMenuentryType(item,true,false);
}
-void LatexmenuDialog::setSubmenuEntry(LatexmenuItem *item)
+void UserMenuDialog::setSubmenuEntry(UserMenuItem *item)
{
setMenuentryText(item,true);
setMenuentryType(item,true,false);
@@ -854,52 +854,52 @@ void LatexmenuDialog::setSubmenuEntry(LatexmenuItem *item)
////////////////////////////// update data widgets//////////////////////////////
-void LatexmenuDialog::setMenuentryType(LatexmenuItem *item, bool state1, bool \
state2) +void UserMenuDialog::setMenuentryType(UserMenuItem *item, bool state1, bool \
state2) {
QString s = ( item && state1 ) ? m_listMenutypes[item->menutype()] : QString::null;
- m_LatexmenuDialog.m_lbMenuentryType->setText(s);
- m_LatexmenuDialog.m_lbMenuentryType->setEnabled(state1);
- m_LatexmenuDialog.m_pbMenuentryType->setEnabled(state2);
+ m_UserMenuDialog.m_lbMenuentryType->setText(s);
+ m_UserMenuDialog.m_lbMenuentryType->setEnabled(state1);
+ m_UserMenuDialog.m_pbMenuentryType->setEnabled(state2);
}
-void LatexmenuDialog::setMenuentryText(LatexmenuItem *item, bool state)
+void UserMenuDialog::setMenuentryText(UserMenuItem *item, bool state)
{
QString s = ( item && state ) ? item->menutitle() : QString::null;
- m_LatexmenuDialog.m_leMenuEntry->setText(s);
+ m_UserMenuDialog.m_leMenuEntry->setText(s);
- m_LatexmenuDialog.m_lbMenuEntry->setEnabled(state);
- m_LatexmenuDialog.m_leMenuEntry->setEnabled(state);
+ m_UserMenuDialog.m_lbMenuEntry->setEnabled(state);
+ m_UserMenuDialog.m_leMenuEntry->setEnabled(state);
}
-void LatexmenuDialog::setMenuentryFileChooser(LatexmenuItem *item, bool state)
+void UserMenuDialog::setMenuentryFileChooser(UserMenuItem *item, bool state)
{
QString s = ( item && state ) ? item->filename() : QString::null;
- m_LatexmenuDialog.m_urlRequester->setText(s);
+ m_UserMenuDialog.m_urlRequester->setText(s);
- m_LatexmenuDialog.m_lbFile->setEnabled(state);
- m_LatexmenuDialog.m_urlRequester->setEnabled(state);
+ m_UserMenuDialog.m_lbFile->setEnabled(state);
+ m_UserMenuDialog.m_urlRequester->setEnabled(state);
}
-void LatexmenuDialog::setMenuentryFileParameter(LatexmenuItem *item, bool state)
+void UserMenuDialog::setMenuentryFileParameter(UserMenuItem *item, bool state)
{
QString s = ( item && state ) ? item->parameter() : QString::null;
- m_LatexmenuDialog.m_leParameter->setText(s);
+ m_UserMenuDialog.m_leParameter->setText(s);
- m_LatexmenuDialog.m_lbParameter->setEnabled(state);
- m_LatexmenuDialog.m_leParameter->setEnabled(state);
+ m_UserMenuDialog.m_lbParameter->setEnabled(state);
+ m_UserMenuDialog.m_leParameter->setEnabled(state);
}
-void LatexmenuDialog::setMenuentryTextEdit(LatexmenuItem *item, bool state)
+void UserMenuDialog::setMenuentryTextEdit(UserMenuItem *item, bool state)
{
QString s = ( item && state ) ? item->plaintext() : QString::null;
- m_LatexmenuDialog.m_teText->setPlainText(s);
+ m_UserMenuDialog.m_teText->setPlainText(s);
- m_LatexmenuDialog.m_lbText->setEnabled(state);
- m_LatexmenuDialog.m_teText->setEnabled(state);
+ m_UserMenuDialog.m_lbText->setEnabled(state);
+ m_UserMenuDialog.m_teText->setEnabled(state);
}
-void LatexmenuDialog::setMenuentryIcon(LatexmenuItem *item, bool state, const \
QString &icon) +void UserMenuDialog::setMenuentryIcon(UserMenuItem *item, bool state, \
const QString &icon) {
if ( item && state ) {
m_currentIcon = ( icon.isEmpty() ) ? item->menuicon() : icon;
@@ -910,50 +910,50 @@ void LatexmenuDialog::setMenuentryIcon(LatexmenuItem *item, \
bool state, const QS
// update widgets
if ( m_currentIcon.isEmpty() ) {
- m_LatexmenuDialog.m_lbIconChosen->setText(m_currentIcon);
- m_LatexmenuDialog.m_lbIconChosen->hide();
- m_LatexmenuDialog.m_pbIcon->show();
+ m_UserMenuDialog.m_lbIconChosen->setText(m_currentIcon);
+ m_UserMenuDialog.m_lbIconChosen->hide();
+ m_UserMenuDialog.m_pbIcon->show();
}
else {
QString iconpath = \
KIconLoader::global()->iconPath(m_currentIcon,KIconLoader::Small);
- m_LatexmenuDialog.m_lbIconChosen->setText("<img src=\"" + iconpath +"\" />");
- m_LatexmenuDialog.m_lbIconChosen->show();
- m_LatexmenuDialog.m_pbIcon->hide();
+ m_UserMenuDialog.m_lbIconChosen->setText("<img src=\"" + iconpath +"\" />");
+ m_UserMenuDialog.m_lbIconChosen->show();
+ m_UserMenuDialog.m_pbIcon->hide();
}
- m_LatexmenuDialog.m_lbIcon->setEnabled(state);
- m_LatexmenuDialog.m_pbIcon->setEnabled(state);
- m_LatexmenuDialog.m_lbIconChosen->setEnabled(state);
+ m_UserMenuDialog.m_lbIcon->setEnabled(state);
+ m_UserMenuDialog.m_pbIcon->setEnabled(state);
+ m_UserMenuDialog.m_lbIconChosen->setEnabled(state);
bool deleteIconState = ( state && !m_currentIcon.isEmpty() );
- m_LatexmenuDialog.m_pbIconDelete->setEnabled(deleteIconState);
+ m_UserMenuDialog.m_pbIconDelete->setEnabled(deleteIconState);
}
-void LatexmenuDialog::setMenuentryShortcut(LatexmenuItem *item, bool state)
+void UserMenuDialog::setMenuentryShortcut(UserMenuItem *item, bool state)
{
if ( item && state ) {
QString shortcut = item->shortcut();
if ( shortcut.isEmpty() ) {
- m_LatexmenuDialog.m_keyChooser->clearKeySequence();
+ m_UserMenuDialog.m_keyChooser->clearKeySequence();
}
else {
- m_LatexmenuDialog.m_keyChooser->setKeySequence( QKeySequence(shortcut) );
+ m_UserMenuDialog.m_keyChooser->setKeySequence( QKeySequence(shortcut) );
}
item->setText(1,shortcut);
}
else {
- m_LatexmenuDialog.m_keyChooser->clearKeySequence();
+ m_UserMenuDialog.m_keyChooser->clearKeySequence();
}
- m_LatexmenuDialog.m_lbShortcut->setEnabled(state);
- m_LatexmenuDialog.m_keyChooser->setEnabled(state);
+ m_UserMenuDialog.m_lbShortcut->setEnabled(state);
+ m_UserMenuDialog.m_keyChooser->setEnabled(state);
}
-void LatexmenuDialog::setParameterGroupbox(bool state)
+void UserMenuDialog::setParameterGroupbox(bool state)
{
- m_LatexmenuDialog.m_gbParameter->setEnabled(state);
+ m_UserMenuDialog.m_gbParameter->setEnabled(state);
}
-void LatexmenuDialog::setMenuentryCheckboxes(LatexmenuItem *item, bool \
useInsertOutput) +void UserMenuDialog::setMenuentryCheckboxes(UserMenuItem *item, \
bool useInsertOutput) {
bool selectionState, insertionState, outputState, replaceState, contextState;
if ( item) {
@@ -972,32 +972,32 @@ void LatexmenuDialog::setMenuentryCheckboxes(LatexmenuItem \
*item, bool useInsert }
// m_cbNeedsSelection and m_cbSelectInsertion are always enabled
- m_LatexmenuDialog.m_cbNeedsSelection->setChecked(selectionState);
- m_LatexmenuDialog.m_cbContextMenu->setChecked(contextState);
- m_LatexmenuDialog.m_cbReplaceSelection->setChecked(replaceState);
- m_LatexmenuDialog.m_cbSelectInsertion->setChecked(insertionState);
- m_LatexmenuDialog.m_cbInsertOutput->setChecked(outputState);
+ m_UserMenuDialog.m_cbNeedsSelection->setChecked(selectionState);
+ m_UserMenuDialog.m_cbContextMenu->setChecked(contextState);
+ m_UserMenuDialog.m_cbReplaceSelection->setChecked(replaceState);
+ m_UserMenuDialog.m_cbSelectInsertion->setChecked(insertionState);
+ m_UserMenuDialog.m_cbInsertOutput->setChecked(outputState);
- m_LatexmenuDialog.m_cbInsertOutput->setEnabled(useInsertOutput);
+ m_UserMenuDialog.m_cbInsertOutput->setEnabled(useInsertOutput);
}
-void LatexmenuDialog::clearMenuEntryData()
+void UserMenuDialog::clearMenuEntryData()
{
- m_LatexmenuDialog.m_leMenuEntry->setText(QString::null);
- m_LatexmenuDialog.m_lbMenuentryType->setText(QString::null);
- m_LatexmenuDialog.m_urlRequester->setText(QString::null);
- m_LatexmenuDialog.m_teText->setPlainText(QString::null);
- m_LatexmenuDialog.m_pbIcon->setIcon(KIcon(i18n("Choose")));
- m_LatexmenuDialog.m_keyChooser->clearKeySequence();
+ m_UserMenuDialog.m_leMenuEntry->setText(QString::null);
+ m_UserMenuDialog.m_lbMenuentryType->setText(QString::null);
+ m_UserMenuDialog.m_urlRequester->setText(QString::null);
+ m_UserMenuDialog.m_teText->setPlainText(QString::null);
+ m_UserMenuDialog.m_pbIcon->setIcon(KIcon(i18n("Choose")));
+ m_UserMenuDialog.m_keyChooser->clearKeySequence();
- m_LatexmenuDialog.m_cbNeedsSelection->setChecked(false);
- m_LatexmenuDialog.m_cbReplaceSelection->setChecked(false);
- m_LatexmenuDialog.m_cbContextMenu->setChecked(false);
- m_LatexmenuDialog.m_cbSelectInsertion->setChecked(false);
- m_LatexmenuDialog.m_cbInsertOutput->setChecked(false);
+ m_UserMenuDialog.m_cbNeedsSelection->setChecked(false);
+ m_UserMenuDialog.m_cbReplaceSelection->setChecked(false);
+ m_UserMenuDialog.m_cbContextMenu->setChecked(false);
+ m_UserMenuDialog.m_cbSelectInsertion->setChecked(false);
+ m_UserMenuDialog.m_cbInsertOutput->setChecked(false);
}
-void LatexmenuDialog::disableMenuEntryData()
+void UserMenuDialog::disableMenuEntryData()
{
setMenuentryText(0L,false);
setMenuentryType(0L,false,false);
@@ -1013,4 +1013,4 @@ void LatexmenuDialog::disableMenuEntryData()
}
-#include "latexmenudialog.moc"
+#include "usermenudialog.moc"
diff --git a/src/dialogs/latexmenu/latexmenudialog.h \
b/src/dialogs/usermenu/usermenudialog.h similarity index 69%
rename from src/dialogs/latexmenu/latexmenudialog.h
rename to src/dialogs/usermenu/usermenudialog.h
index 550df7c..4f4b744 100644
--- a/src/dialogs/latexmenu/latexmenudialog.h
+++ b/src/dialogs/usermenu/usermenudialog.h
@@ -20,22 +20,22 @@
#include "kilewizard.h"
#include "kileinfo.h"
-#include "dialogs/latexmenu/latexmenuitem.h"
+#include "dialogs/usermenu/usermenuitem.h"
-#include "ui_latexmenudialog_base.h"
+#include "ui_usermenudialog_base.h"
namespace KileMenu {
-class LatexUserMenu;
+class UserMenu;
-class LatexmenuDialog : public KileDialog::Wizard
+class UserMenuDialog : public KileDialog::Wizard
{
Q_OBJECT
public:
- LatexmenuDialog(KConfig *config, KileInfo *ki, QObject *latexusermenu, const \
QString & xmlfile, QWidget *parent);
- ~LatexmenuDialog() {}
+ UserMenuDialog(KConfig *config, KileInfo *ki, QObject *usermenu, const QString & \
xmlfile, QWidget *parent); + ~UserMenuDialog() {}
protected Q_SLOTS:
virtual void slotButtonClicked(int button);
@@ -74,8 +74,8 @@ class LatexmenuDialog : public KileDialog::Wizard
void installXmlFile(const QString &);
private:
- Ui::LatexmenuDialog m_LatexmenuDialog;
- LatexmenuTree *m_menutree;
+ Ui::UserMenuDialog m_UserMenuDialog;
+ UserMenuTree *m_menutree;
KileInfo *m_ki;
@@ -95,27 +95,27 @@ class LatexmenuDialog : public KileDialog::Wizard
bool saveClicked();
QString saveAsClicked();
- void readMenuentryData(LatexmenuItem *tem);
- void showMenuentryData(LatexmenuItem *item);
+ void readMenuentryData(UserMenuItem *tem);
+ void showMenuentryData(UserMenuItem *item);
void clearMenuEntryData();
void disableMenuEntryData();
- void setTextEntry(LatexmenuItem *item);
- void setFileContentEntry(LatexmenuItem *item);
- void setProgramEntry(LatexmenuItem *item);
- void setSeparatorEntry(LatexmenuItem *item);
- void setSubmenuEntry(LatexmenuItem *item);
+ void setTextEntry(UserMenuItem *item);
+ void setFileContentEntry(UserMenuItem *item);
+ void setProgramEntry(UserMenuItem *item);
+ void setSeparatorEntry(UserMenuItem *item);
+ void setSubmenuEntry(UserMenuItem *item);
- void setMenuentryText(LatexmenuItem *item, bool state);
- void setMenuentryType(LatexmenuItem *item, bool state1, bool state2);
- void setMenuentryFileChooser(LatexmenuItem *item, bool state);
- void setMenuentryFileParameter(LatexmenuItem *item, bool state);
- void setMenuentryTextEdit(LatexmenuItem *item, bool state);
- void setMenuentryIcon(LatexmenuItem *item, bool state, const QString \
&icon=QString::null);
- void setMenuentryShortcut(LatexmenuItem *item, bool state);
+ void setMenuentryText(UserMenuItem *item, bool state);
+ void setMenuentryType(UserMenuItem *item, bool state1, bool state2);
+ void setMenuentryFileChooser(UserMenuItem *item, bool state);
+ void setMenuentryFileParameter(UserMenuItem *item, bool state);
+ void setMenuentryTextEdit(UserMenuItem *item, bool state);
+ void setMenuentryIcon(UserMenuItem *item, bool state, const QString \
&icon=QString::null); + void setMenuentryShortcut(UserMenuItem *item, bool state);
void setParameterGroupbox(bool state);
- void setMenuentryCheckboxes(LatexmenuItem *item, bool useInsertOutput);
+ void setMenuentryCheckboxes(UserMenuItem *item, bool useInsertOutput);
void setMenuentryIcon(const QString &icon);
void updateTreeButtons();
diff --git a/src/dialogs/latexmenu/latexmenudialog_base.ui \
b/src/dialogs/usermenu/usermenudialog_base.ui similarity index 98%
rename from src/dialogs/latexmenu/latexmenudialog_base.ui
rename to src/dialogs/usermenu/usermenudialog_base.ui
index fb2d829..8e67ad3 100644
--- a/src/dialogs/latexmenu/latexmenudialog_base.ui
+++ b/src/dialogs/usermenu/usermenudialog_base.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>LatexmenuDialog</class>
- <widget class="QWidget" name="LatexmenuDialog">
+ <class>UserMenuDialog</class>
+ <widget class="QWidget" name="UserMenuDialog">
<property name="geometry">
<rect>
<x>0</x>
@@ -34,7 +34,7 @@
<property name="childrenCollapsible">
<bool>false</bool>
</property>
- <widget class="QGroupBox" name="m_gbLatexMenu">
+ <widget class="QGroupBox" name="m_gbUserMenu">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
@@ -46,7 +46,7 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
- <widget class="KileMenu::LatexmenuTree" name="m_twLatexMenu">
+ <widget class="KileMenu::UserMenuTree" name="m_twUserMenu">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
@@ -802,13 +802,13 @@
<header>kurlrequester.h</header>
</customwidget>
<customwidget>
- <class>KileMenu::LatexmenuTree</class>
+ <class>KileMenu::UserMenuTree</class>
<extends>QTreeWidget</extends>
- <header>dialogs/latexmenu/latexmenutree.h</header>
+ <header>dialogs/usermenu/usermenutree.h</header>
</customwidget>
</customwidgets>
<tabstops>
- <tabstop>m_twLatexMenu</tabstop>
+ <tabstop>m_twUserMenu</tabstop>
<tabstop>m_pbInsertBelow</tabstop>
<tabstop>m_pbInsertSubmenu</tabstop>
<tabstop>m_pbUp</tabstop>
diff --git a/src/dialogs/latexmenu/latexmenuitem.cpp \
b/src/dialogs/usermenu/usermenuitem.cpp similarity index 57%
rename from src/dialogs/latexmenu/latexmenuitem.cpp
rename to src/dialogs/usermenu/usermenuitem.cpp
index 86bb826..aeebdc7 100644
--- a/src/dialogs/latexmenu/latexmenuitem.cpp
+++ b/src/dialogs/usermenu/usermenuitem.cpp
@@ -15,30 +15,30 @@
#include <QFile>
#include <QFileInfo>
-#include "dialogs/latexmenu/latexmenuitem.h"
+#include "dialogs/usermenu/usermenuitem.h"
namespace KileMenu {
-LatexmenuItem::LatexmenuItem(LatexmenuData::MenuType type, const QString &menutitle)
+UserMenuItem::UserMenuItem(UserMenuData::MenuType type, const QString &menutitle)
: QTreeWidgetItem()
{
initItem(type,menutitle);
}
-LatexmenuItem::LatexmenuItem( QTreeWidget *parent, QTreeWidgetItem *preceding, \
LatexmenuData::MenuType type, const QString &menutitle) +UserMenuItem::UserMenuItem( \
QTreeWidget *parent, QTreeWidgetItem *preceding, UserMenuData::MenuType type, const \
QString &menutitle) : QTreeWidgetItem(parent,preceding)
{
initItem(type,menutitle);
}
-LatexmenuItem::LatexmenuItem( QTreeWidgetItem *parent, QTreeWidgetItem *preceding, \
LatexmenuData::MenuType type, const QString &menutitle) +UserMenuItem::UserMenuItem( \
QTreeWidgetItem *parent, QTreeWidgetItem *preceding, UserMenuData::MenuType type, \
const QString &menutitle) : QTreeWidgetItem(parent,preceding)
{
initItem(type,menutitle);
}
-void LatexmenuItem::initItem(LatexmenuData::MenuType type, const QString &menutitle)
+void UserMenuItem::initItem(UserMenuData::MenuType type, const QString &menutitle)
{
clear();
setText(0,menutitle);
@@ -46,35 +46,35 @@ void LatexmenuItem::initItem(LatexmenuData::MenuType type, const \
QString &menuti m_data.menutitle = menutitle;
m_data.menutype = type;
- setData(0, Qt::UserRole+1, LatexmenuData::xmlMenuTypeName(type));
+ setData(0, Qt::UserRole+1, UserMenuData::xmlMenuTypeName(type));
setData(0, Qt::UserRole+2, MODEL_ERROR_NONE);
}
// check for possible errors and save for use with model data
-void LatexmenuItem::setModelData(bool executable)
+void UserMenuItem::setModelData(bool executable)
{
int modelerror = MODEL_ERROR_NONE;
- if ( m_data.menutitle.isEmpty() && m_data.menutype!=LatexmenuData::Separator ) {
- modelerror |= LatexmenuItem::MODEL_ERROR_EMPTY;
+ if ( m_data.menutitle.isEmpty() && m_data.menutype!=UserMenuData::Separator ) {
+ modelerror |= UserMenuItem::MODEL_ERROR_EMPTY;
}
- if ( m_data.menutype==LatexmenuData::Submenu && childCount()==0 ) {
- modelerror |= LatexmenuItem::MODEL_ERROR_SUBMENU;
+ if ( m_data.menutype==UserMenuData::Submenu && childCount()==0 ) {
+ modelerror |= UserMenuItem::MODEL_ERROR_SUBMENU;
}
- else if ( m_data.menutype==LatexmenuData::Text && m_data.text.isEmpty() ) {
- modelerror |= LatexmenuItem::MODEL_ERROR_TEXT;
+ else if ( m_data.menutype==UserMenuData::Text && m_data.text.isEmpty() ) {
+ modelerror |= UserMenuItem::MODEL_ERROR_TEXT;
}
- else if ( m_data.menutype == LatexmenuData::FileContent ) {
+ else if ( m_data.menutype == UserMenuData::FileContent ) {
if ( m_data.filename.isEmpty() ) {
- modelerror |= LatexmenuItem::MODEL_ERROR_FILE_EMPTY;
+ modelerror |= UserMenuItem::MODEL_ERROR_FILE_EMPTY;
}
else if ( !QFile::exists(m_data.filename) ) {
- modelerror |= LatexmenuItem::MODEL_ERROR_FILE_EXIST;
+ modelerror |= UserMenuItem::MODEL_ERROR_FILE_EXIST;
}
}
- else if ( m_data.menutype == LatexmenuData::Program && !executable ) {
- modelerror |= LatexmenuItem::MODEL_ERROR_FILE_EXECUTABLE;
+ else if ( m_data.menutype == UserMenuData::Program && !executable ) {
+ modelerror |= UserMenuItem::MODEL_ERROR_FILE_EXECUTABLE;
}
setData(0,Qt::UserRole+2,modelerror);
@@ -83,20 +83,20 @@ void LatexmenuItem::setModelData(bool executable)
// two possible errors in the menutree are made visible for the user
// - if no menutitle is given, it is changed to '???'
// - if a (useless) submenu with no children is given, the menutitle 'title' is \
changed to 'title >'
-QString LatexmenuItem::updateMenutitle()
+QString UserMenuItem::updateMenutitle()
{
QString menutitle = m_data.menutitle;
if ( menutitle.isEmpty() ) {
menutitle = EMPTY_MENUENTRY;
}
- else if ( m_data.menutype==LatexmenuData::Submenu && childCount()==0 ) {
+ else if ( m_data.menutype==UserMenuData::Submenu && childCount()==0 ) {
menutitle += EMPTY_SUBMENU;
}
return menutitle;
}
-void LatexmenuItem::clear()
+void UserMenuItem::clear()
{
m_data.clear();
}
diff --git a/src/dialogs/latexmenu/latexmenuitem.h \
b/src/dialogs/usermenu/usermenuitem.h similarity index 79%
rename from src/dialogs/latexmenu/latexmenuitem.h
rename to src/dialogs/usermenu/usermenuitem.h
index 38470ae..b9eeff8 100644
--- a/src/dialogs/latexmenu/latexmenuitem.h
+++ b/src/dialogs/usermenu/usermenuitem.h
@@ -21,7 +21,7 @@
#include <KLocale>
#include <KShortcut>
-#include "latexmenu/latexmenudata.h"
+#include "usermenu/usermenudata.h"
#define EMPTY_MENUENTRY i18n("???")
#define EMPTY_SUBMENU i18n(" >")
@@ -29,19 +29,19 @@
namespace KileMenu {
-////////////////////////////// LatexmenuItem //////////////////////////////
+////////////////////////////// UserMenuItem //////////////////////////////
-class LatexmenuItem : public QTreeWidgetItem {
+class UserMenuItem : public QTreeWidgetItem {
public:
- LatexmenuItem(LatexmenuData::MenuType type, const QString &menutitle = \
QString::null);
- LatexmenuItem(QTreeWidget *parent, QTreeWidgetItem *preceding,
- LatexmenuData::MenuType type, const QString &menutitle = \
QString::null);
- LatexmenuItem(QTreeWidgetItem *parent, QTreeWidgetItem *preceding,
- LatexmenuData::MenuType type, const QString &menutitle = \
QString::null); + UserMenuItem(UserMenuData::MenuType type, const QString &menutitle \
= QString::null); + UserMenuItem(QTreeWidget *parent, QTreeWidgetItem *preceding,
+ UserMenuData::MenuType type, const QString &menutitle = \
QString::null); + UserMenuItem(QTreeWidgetItem *parent, QTreeWidgetItem *preceding,
+ UserMenuData::MenuType type, const QString &menutitle = \
QString::null);
- virtual ~LatexmenuItem() {}
+ virtual ~UserMenuItem() {}
enum ModelUserError { MODEL_ERROR_NONE=0x00,
MODEL_ERROR_EMPTY=0x01,
@@ -55,8 +55,8 @@ class LatexmenuItem : public QTreeWidgetItem {
void setModelData(bool executable=false);
QString updateMenutitle();
- void setMenutype(LatexmenuData::MenuType type) { m_data.menutype = type; }
- LatexmenuData::MenuType menutype() { return m_data.menutype; }
+ void setMenutype(UserMenuData::MenuType type) { m_data.menutype = type; }
+ UserMenuData::MenuType menutype() { return m_data.menutype; }
void setMenutitle(const QString &s) { m_data.menutitle = s; }
const QString &menutitle() { return m_data.menutitle; }
@@ -93,10 +93,10 @@ class LatexmenuItem : public QTreeWidgetItem {
bool insertOutput() { return m_data.insertOutput; }
private:
- LatexmenuData m_data;
+ UserMenuData m_data;
void clear();
- void initItem(LatexmenuData::MenuType type, const QString &menutitle);
+ void initItem(UserMenuData::MenuType type, const QString &menutitle);
};
diff --git a/src/dialogs/latexmenu/latexmenutree.cpp \
b/src/dialogs/usermenu/usermenutree.cpp similarity index 68%
rename from src/dialogs/latexmenu/latexmenutree.cpp
rename to src/dialogs/usermenu/usermenutree.cpp
index c5d964c..6eb50f5 100644
--- a/src/dialogs/latexmenu/latexmenutree.cpp
+++ b/src/dialogs/usermenu/usermenutree.cpp
@@ -30,8 +30,8 @@
#include <KMessageBox>
-#include "dialogs/latexmenu/latexmenuitem.h"
-#include "dialogs/latexmenu/latexmenutree.h"
+#include "dialogs/usermenu/usermenuitem.h"
+#include "dialogs/usermenu/usermenutree.h"
#include "kiledebug.h"
@@ -49,7 +49,7 @@ void MenuentryDelegate::paint(QPainter *painter, const \
QStyleOptionViewItem &opt int error = index.data(Qt::UserRole+2).toInt();
// any errors?
- if (index.column()==0 && error!=LatexmenuItem::MODEL_ERROR_NONE ) {
+ if (index.column()==0 && error!=UserMenuItem::MODEL_ERROR_NONE ) {
QStyleOptionViewItem optionCustom = option;
optionCustom.palette.setColor(QPalette::Text, Qt::red);
QStyledItemDelegate::paint( painter, optionCustom, index );
@@ -72,9 +72,9 @@ void MenuentryDelegate::paint(QPainter *painter, const \
QStyleOptionViewItem &opt }
}
-///////////////////////////// LatexmenuTree //////////////////////////////
+///////////////////////////// UserMenuTree //////////////////////////////
-LatexmenuTree::LatexmenuTree(QWidget *parent)
+UserMenuTree::UserMenuTree(QWidget *parent)
: QTreeWidget(parent)
{
setColumnCount(2);
@@ -96,7 +96,7 @@ LatexmenuTree::LatexmenuTree(QWidget *parent)
initEnvPathlist();
}
-bool LatexmenuTree::isEmpty()
+bool UserMenuTree::isEmpty()
{
return ( topLevelItemCount() == 0 );
}
@@ -104,7 +104,7 @@ bool LatexmenuTree::isEmpty()
///////////////////////////// PATH environment variable \
//////////////////////////////
// save PATH to search for executable files
-void LatexmenuTree::initEnvPathlist()
+void UserMenuTree::initEnvPathlist()
{
QString envpath;
#if QT_VERSION >= 0x040600
@@ -131,7 +131,7 @@ void LatexmenuTree::initEnvPathlist()
m_envPathlist.append(".");
}
-bool LatexmenuTree::isItemExecutable(const QString &filename)
+bool UserMenuTree::isItemExecutable(const QString &filename)
{
// absolute paths can be checked immediately
QFileInfo fi(filename);
@@ -159,19 +159,19 @@ bool LatexmenuTree::isItemExecutable(const QString &filename)
///////////////////////////// context menu event //////////////////////////////
// build a context menu
-void LatexmenuTree::contextMenuRequested(const QPoint &pos)
+void UserMenuTree::contextMenuRequested(const QPoint &pos)
{
KILE_DEBUG() << "context menu requested ..." ;
- m_popupItem = dynamic_cast<LatexmenuItem*>(itemAt(pos));
+ m_popupItem = dynamic_cast<UserMenuItem*>(itemAt(pos));
if ( !m_popupItem ) {
KILE_DEBUG() << "... no item found";
return;
}
KILE_DEBUG() << "... popup item found: " << m_popupItem->text(0);
- bool submenu = ( m_popupItem->menutype() == LatexmenuData::Submenu );
- bool separator = ( m_popupItem->menutype() == LatexmenuData::Separator );
+ bool submenu = ( m_popupItem->menutype() == UserMenuData::Submenu );
+ bool separator = ( m_popupItem->menutype() == UserMenuData::Separator );
KMenu popup;
QAction *action = NULL;
@@ -179,31 +179,31 @@ void LatexmenuTree::contextMenuRequested(const QPoint &pos)
connect(&signalMapper, SIGNAL(mapped(int)), this, SLOT(slotPopupActivated(int)));
// insert standard menu items
- action = popup.addAction(KIcon("latexmenu-insert-above.png"),i18n("Insert above"), \
&signalMapper, SLOT(map())); + action = \
popup.addAction(KIcon("usermenu-insert-above.png"),i18n("Insert above"), \
&signalMapper, SLOT(map())); signalMapper.setMapping(action, POPUP_INSERT_ABOVE);
- action = popup.addAction(KIcon("latexmenu-insert-below.png"),i18n("Insert below"), \
&signalMapper, SLOT(map())); + action = \
popup.addAction(KIcon("usermenu-insert-below.png"),i18n("Insert below"), \
&signalMapper, SLOT(map())); signalMapper.setMapping(action, POPUP_INSERT_BELOW);
popup.addSeparator();
// insert separators
if ( !separator ) {
- action = popup.addAction(KIcon("latexmenu-separator-above.png"),i18n("Insert a \
separator above"), &signalMapper, SLOT(map())); + action = \
popup.addAction(KIcon("usermenu-separator-above.png"),i18n("Insert a separator \
above"), &signalMapper, SLOT(map())); signalMapper.setMapping(action, \
POPUP_SEPARATOR_ABOVE);
- action = popup.addAction(KIcon("latexmenu-separator-below.png"),i18n("Insert a \
separator below"), &signalMapper, SLOT(map())); + action = \
popup.addAction(KIcon("usermenu-separator-below.png"),i18n("Insert a separator \
below"), &signalMapper, SLOT(map())); signalMapper.setMapping(action, \
POPUP_SEPARATOR_BELOW); popup.addSeparator();
}
// insert submenus
- action = popup.addAction(KIcon("latexmenu-submenu-above.png"),i18n("Insert a \
submenu above"), &signalMapper, SLOT(map())); + action = \
popup.addAction(KIcon("usermenu-submenu-above.png"),i18n("Insert a submenu above"), \
&signalMapper, SLOT(map())); signalMapper.setMapping(action, POPUP_SUBMENU_ABOVE);
- action = popup.addAction(KIcon("latexmenu-submenu-below.png"),i18n("Insert a \
submenu below"), &signalMapper, SLOT(map())); + action = \
popup.addAction(KIcon("usermenu-submenu-below.png"),i18n("Insert a submenu below"), \
&signalMapper, SLOT(map())); signalMapper.setMapping(action, POPUP_SUBMENU_BELOW);
popup.addSeparator();
// insert into submenus
if ( submenu ) {
- action = popup.addAction(KIcon("latexmenu-into-submenu.png"),i18n("Insert into \
this submenu"), &signalMapper, SLOT(map())); + action = \
popup.addAction(KIcon("usermenu-into-submenu.png"),i18n("Insert into this submenu"), \
&signalMapper, SLOT(map())); signalMapper.setMapping(action, POPUP_INTO_SUBMENU);
action = popup.addAction(i18n("Insert a separator into this submenu"), \
&signalMapper, SLOT(map())); signalMapper.setMapping(action, \
POPUP_SEPARATOR_INTO_SUBMENU); @@ -213,10 +213,10 @@ void \
LatexmenuTree::contextMenuRequested(const QPoint &pos) }
// delete actions
- action = popup.addAction(KIcon("latexmenu-delete.png"),i18n("Delete this item"), \
&signalMapper, SLOT(map())); + action = \
popup.addAction(KIcon("usermenu-delete.png"),i18n("Delete this item"), &signalMapper, \
SLOT(map())); signalMapper.setMapping(action,POPUP_DELETE_ITEM);
popup.addSeparator();
- action = popup.addAction(KIcon("latexmenu-clear.png"),i18n("Delete the complete \
tree"), &signalMapper, SLOT(map())); + action = \
popup.addAction(KIcon("usermenu-clear.png"),i18n("Delete the complete tree"), \
&signalMapper, SLOT(map())); signalMapper.setMapping(action, POPUP_DELETE_TREE);
// expand/collapse tree
@@ -239,7 +239,7 @@ void LatexmenuTree::contextMenuRequested(const QPoint &pos)
// if there are any errors with this item, some info is available
int error = m_popupItem->data(0,Qt::UserRole+2).toInt();
- if ( error != LatexmenuItem::MODEL_ERROR_NONE ) {
+ if ( error != UserMenuItem::MODEL_ERROR_NONE ) {
popup.addSeparator();
action = popup.addAction(KIcon("help-about.png"),i18n("Info"), &signalMapper, \
SLOT(map())); signalMapper.setMapping(action, POPUP_ITEM_INFO);
@@ -253,7 +253,7 @@ void LatexmenuTree::contextMenuRequested(const QPoint &pos)
}
// a context menu action was selected
-void LatexmenuTree::slotPopupActivated(int id)
+void UserMenuTree::slotPopupActivated(int id)
{
KILE_DEBUG() << "popup activated with id: " << id;
switch (id ) {
@@ -263,9 +263,9 @@ void LatexmenuTree::slotPopupActivated(int id)
case POPUP_SEPARATOR_BELOW: insertSeparator(m_popupItem, true); \
break; case POPUP_SUBMENU_ABOVE: insertSubmenu (m_popupItem, false); \
break; case POPUP_SUBMENU_BELOW: insertSubmenu (m_popupItem, true); \
break;
- case POPUP_INTO_SUBMENU: insertIntoSubmenu(m_popupItem, \
LatexmenuData::Text); break;
- case POPUP_SEPARATOR_INTO_SUBMENU: insertIntoSubmenu(m_popupItem, \
LatexmenuData::Separator); break;
- case POPUP_SUBMENU_INTO_SUBMENU: insertIntoSubmenu(m_popupItem, \
LatexmenuData::Submenu); break; + case POPUP_INTO_SUBMENU: \
insertIntoSubmenu(m_popupItem, UserMenuData::Text); break; + case \
POPUP_SEPARATOR_INTO_SUBMENU: insertIntoSubmenu(m_popupItem, \
UserMenuData::Separator); break; + case POPUP_SUBMENU_INTO_SUBMENU: \
insertIntoSubmenu(m_popupItem, UserMenuData::Submenu); break; case \
POPUP_DELETE_ITEM: itemDelete(m_popupItem); \
break; case POPUP_DELETE_TREE: deleteMenuTree(); \
break; case POPUP_COLLAPSE_ITEM: m_popupItem->setExpanded(false); \
break; @@ -279,11 +279,11 @@ void LatexmenuTree::slotPopupActivated(int id)
///////////////////////////// read XML //////////////////////////////
// read a xml file and check for errors
-bool LatexmenuTree::readXml(const QString &filename)
+bool UserMenuTree::readXml(const QString &filename)
{
KILE_DEBUG() << "read xml file " << filename;
- QDomDocument doc("Latexmenu");
+ QDomDocument doc("UserMenu");
QFile file(filename);
if ( !file.open(QFile::ReadOnly | QFile::Text) ) {
KMessageBox::error(this, i18n("File '%1' does not exist.", filename));
@@ -307,7 +307,7 @@ bool LatexmenuTree::readXml(const QString &filename)
while ( !e.isNull()) {
QString tag = e.tagName();
- LatexmenuItem *item = 0L;
+ UserMenuItem *item = 0L;
if ( tag == "submenu" ) {
item = readXmlSubmenu(e);
}
@@ -338,21 +338,21 @@ bool LatexmenuTree::readXml(const QString &filename)
}
// a separator tag was found
-LatexmenuItem *LatexmenuTree::readXmlSeparator()
+UserMenuItem *UserMenuTree::readXmlSeparator()
{
- return new LatexmenuItem(LatexmenuData::Separator,QString::null);
+ return new UserMenuItem(UserMenuData::Separator,QString::null);
}
// read tags for a submenu
-LatexmenuItem *LatexmenuTree::readXmlSubmenu(const QDomElement &element)
+UserMenuItem *UserMenuTree::readXmlSubmenu(const QDomElement &element)
{
- LatexmenuItem *submenuitem = new \
LatexmenuItem(LatexmenuData::Submenu,QString::null) ; + UserMenuItem *submenuitem = \
new UserMenuItem(UserMenuData::Submenu,QString::null) ;
QString title = QString::null;
if ( element.hasChildNodes() ) {
QDomElement e = element.firstChildElement();
while ( !e.isNull()) {
- LatexmenuItem *item = 0L;
+ UserMenuItem *item = 0L;
QString tag = e.tagName();
if ( tag == "title" ) {
@@ -382,12 +382,12 @@ LatexmenuItem *LatexmenuTree::readXmlSubmenu(const QDomElement \
&element) }
// read tags for a standard menu item
-LatexmenuItem *LatexmenuTree::readXmlMenuentry(const QDomElement &element)
+UserMenuItem *UserMenuTree::readXmlMenuentry(const QDomElement &element)
{
QString menutypename = element.attribute("type");
- LatexmenuData::MenuType menutype = LatexmenuData::xmlMenuType(menutypename);
+ UserMenuData::MenuType menutype = UserMenuData::xmlMenuType(menutypename);
- LatexmenuItem *menuentryitem = new LatexmenuItem(menutype,QString::null) ;
+ UserMenuItem *menuentryitem = new UserMenuItem(menutype,QString::null) ;
// default values
QString title = QString::null;
@@ -409,19 +409,19 @@ LatexmenuItem *LatexmenuTree::readXmlMenuentry(const \
QDomElement &element) QString tag = e.tagName();
QString text = e.text();
- int index = LatexmenuData::xmlMenuTag(tag);
+ int index = UserMenuData::xmlMenuTag(tag);
switch (index) {
- case LatexmenuData::XML_TITLE: title = text; \
break;
- case LatexmenuData::XML_PLAINTEXT: plaintext = text; \
break;
- case LatexmenuData::XML_FILENAME: filename = text; \
break;
- case LatexmenuData::XML_PARAMETER: parameter = text; \
break;
- case LatexmenuData::XML_ICON: icon = text; \
break;
- case LatexmenuData::XML_SHORTCUT: shortcut = text; \
break;
- case LatexmenuData::XML_NEEDSSELECTION: needsSelection = str2bool(text); \
break;
- case LatexmenuData::XML_USECONTEXTMENU: useContextMenu = str2bool(text); \
break;
- case LatexmenuData::XML_REPLACESELECTION: replaceSelection = str2bool(text); \
break;
- case LatexmenuData::XML_SELECTINSERTION: selectInsertion = str2bool(text); \
break;
- case LatexmenuData::XML_INSERTOUTPUT: insertOutput = str2bool(text); \
break; + case UserMenuData::XML_TITLE: title = text; \
break; + case UserMenuData::XML_PLAINTEXT: plaintext = text; \
break; + case UserMenuData::XML_FILENAME: filename = text; \
break; + case UserMenuData::XML_PARAMETER: parameter = text; \
break; + case UserMenuData::XML_ICON: icon = text; \
break; + case UserMenuData::XML_SHORTCUT: shortcut = text; \
break; + case UserMenuData::XML_NEEDSSELECTION: needsSelection = \
str2bool(text); break; + case UserMenuData::XML_USECONTEXTMENU: useContextMenu \
= str2bool(text); break; + case UserMenuData::XML_REPLACESELECTION: \
replaceSelection = str2bool(text); break; + case \
UserMenuData::XML_SELECTINSERTION: selectInsertion = str2bool(text); break; \
+ case UserMenuData::XML_INSERTOUTPUT: insertOutput = str2bool(text); \
break; }
e = e.nextSiblingElement();
@@ -462,13 +462,13 @@ LatexmenuItem *LatexmenuTree::readXmlMenuentry(const \
QDomElement &element)
///////////////////////////// write XML //////////////////////////////
-bool LatexmenuTree::writeXml(const QString &filename)
+bool UserMenuTree::writeXml(const QString &filename)
{
KILE_DEBUG() << "write xml file " << filename;
QFile file(filename);
if ( !file.open(QFile::WriteOnly | QFile::Text) ) {
- KMessageBox::error(this, i18n("File '%1' could not be opened to save the latexmenu \
file.", filename)); + KMessageBox::error(this, i18n("File '%1' could not be opened \
to save the usermenu file.", filename)); return false;
}
@@ -477,10 +477,10 @@ bool LatexmenuTree::writeXml(const QString &filename)
xmlWriter.setAutoFormattingIndent(2) ;
xmlWriter.writeStartDocument();
- xmlWriter.writeStartElement("Latexmenu");
+ xmlWriter.writeStartElement("UserMenu");
for (int i = 0; i < topLevelItemCount(); ++i) {
- writeXmlItem(&xmlWriter, dynamic_cast<LatexmenuItem *>(topLevelItem(i)) );
+ writeXmlItem(&xmlWriter, dynamic_cast<UserMenuItem *>(topLevelItem(i)) );
}
xmlWriter.writeEndDocument();
@@ -488,46 +488,46 @@ bool LatexmenuTree::writeXml(const QString &filename)
return true;
}
-void LatexmenuTree::writeXmlItem(QXmlStreamWriter *xml, LatexmenuItem *item)
+void UserMenuTree::writeXmlItem(QXmlStreamWriter *xml, UserMenuItem *item)
{
switch (item->menutype()) {
- case LatexmenuData::Separator: writeXmlSeparator(xml); break;
- case LatexmenuData::Submenu: writeXmlSubmenu(xml,item); break;
+ case UserMenuData::Separator: writeXmlSeparator(xml); break;
+ case UserMenuData::Submenu: writeXmlSubmenu(xml,item); break;
default: writeXmlMenuentry(xml,item); break;
}
}
// write xml tags for a standard menu item
-void LatexmenuTree::writeXmlMenuentry(QXmlStreamWriter *xml, LatexmenuItem *item)
+void UserMenuTree::writeXmlMenuentry(QXmlStreamWriter *xml, UserMenuItem *item)
{
int menutype = item->menutype();
- QString menutypename = LatexmenuData::xmlMenuTypeName(menutype);
+ QString menutypename = UserMenuData::xmlMenuTypeName(menutype);
xml->writeStartElement("menu");
xml->writeAttribute("type", menutypename);
QString menutitle = ( item->text(0) == EMPTY_MENUENTRY ) ? QString::null : \
item->text(0);
- xml->writeTextElement(LatexmenuData::xmlMenuTagName(LatexmenuData::XML_TITLE),menutitle);
+ xml->writeTextElement(UserMenuData::xmlMenuTagName(UserMenuData::XML_TITLE),menutitle);
- if ( menutype == LatexmenuData::Text ) {
+ if ( menutype == UserMenuData::Text ) {
QString plaintext = item->plaintext();
if ( !plaintext.isEmpty() ) {
// replace newline code
plaintext.replace('\n',"\\n");
- xml->writeTextElement(LatexmenuData::xmlMenuTagName(LatexmenuData::XML_PLAINTEXT), \
plaintext); + xml->writeTextElement(UserMenuData::xmlMenuTagName(UserMenuData::XML_PLAINTEXT), \
plaintext); }
}
- else /* if ( menutype!=LatexmenuData::FileContent || \
menutype==LatexmenuData:Program) */ { + else /* if ( \
menutype!=UserMenuData::FileContent || menutype==UserMenuData:Program) */ { // both \
types use a filename QString filename = item->filename();
if ( !filename.isEmpty() ) {
- xml->writeTextElement(LatexmenuData::xmlMenuTagName(LatexmenuData::XML_FILENAME), \
filename); + xml->writeTextElement(UserMenuData::xmlMenuTagName(UserMenuData::XML_FILENAME), \
filename);
- // but LatexmenuItem::Program may have an additional parameter
- if ( menutype == LatexmenuData::Program) {
+ // but UserMenuItem::Program may have an additional parameter
+ if ( menutype == UserMenuData::Program) {
QString parameter = item->parameter();
if ( !parameter.isEmpty() ) {
- xml->writeTextElement(LatexmenuData::xmlMenuTagName(LatexmenuData::XML_PARAMETER), \
parameter); + xml->writeTextElement(UserMenuData::xmlMenuTagName(UserMenuData::XML_PARAMETER), \
parameter); }
}
}
@@ -535,35 +535,35 @@ void LatexmenuTree::writeXmlMenuentry(QXmlStreamWriter *xml, \
LatexmenuItem *item
QString icon = item->menuicon();
if ( !icon.isEmpty() ) {
- xml->writeTextElement(LatexmenuData::xmlMenuTagName(LatexmenuData::XML_ICON),icon);
+ xml->writeTextElement(UserMenuData::xmlMenuTagName(UserMenuData::XML_ICON),icon);
}
QKeySequence seq = QKeySequence::fromString( item->shortcut(), \
QKeySequence::NativeText ); if ( !seq.isEmpty() ) {
- xml->writeTextElement(LatexmenuData::xmlMenuTagName(LatexmenuData::XML_SHORTCUT), \
seq.toString(QKeySequence::PortableText)); \
+ xml->writeTextElement(UserMenuData::xmlMenuTagName(UserMenuData::XML_SHORTCUT), \
seq.toString(QKeySequence::PortableText)); }
if ( item->needsSelection() ) {
- xml->writeTextElement(LatexmenuData::xmlMenuTagName(LatexmenuData::XML_NEEDSSELECTION), \
"true"); + xml->writeTextElement(UserMenuData::xmlMenuTagName(UserMenuData::XML_NEEDSSELECTION), \
"true"); }
if ( item->useContextMenu() ) {
- xml->writeTextElement(LatexmenuData::xmlMenuTagName(LatexmenuData::XML_USECONTEXTMENU), \
"true"); + xml->writeTextElement(UserMenuData::xmlMenuTagName(UserMenuData::XML_USECONTEXTMENU), \
"true"); }
if ( item->replaceSelection() ) {
- xml->writeTextElement(LatexmenuData::xmlMenuTagName(LatexmenuData::XML_REPLACESELECTION), \
"true"); + xml->writeTextElement(UserMenuData::xmlMenuTagName(UserMenuData::XML_REPLACESELECTION), \
"true"); }
if ( item->selectInsertion() ) {
- xml->writeTextElement(LatexmenuData::xmlMenuTagName(LatexmenuData::XML_SELECTINSERTION), \
"true"); + xml->writeTextElement(UserMenuData::xmlMenuTagName(UserMenuData::XML_SELECTINSERTION), \
"true"); }
if ( item->insertOutput() ) {
- xml->writeTextElement(LatexmenuData::xmlMenuTagName(LatexmenuData::XML_INSERTOUTPUT), \
"true"); + xml->writeTextElement(UserMenuData::xmlMenuTagName(UserMenuData::XML_INSERTOUTPUT), \
"true"); }
xml->writeEndElement();
}
// write xml tags for a submenu
-void LatexmenuTree::writeXmlSubmenu(QXmlStreamWriter *xml, LatexmenuItem *item)
+void UserMenuTree::writeXmlSubmenu(QXmlStreamWriter *xml, UserMenuItem *item)
{
xml->writeStartElement("submenu");
@@ -574,17 +574,17 @@ void LatexmenuTree::writeXmlSubmenu(QXmlStreamWriter *xml, \
LatexmenuItem *item) else if ( menutitle.right(LENGTH_SUBSTITUTE) == EMPTY_SUBMENU ) \
{ menutitle = menutitle.left(menutitle.length()-LENGTH_SUBSTITUTE);
}
- xml->writeTextElement(LatexmenuData::xmlMenuTagName(LatexmenuData::XML_TITLE),menutitle);
+ xml->writeTextElement(UserMenuData::xmlMenuTagName(UserMenuData::XML_TITLE),menutitle);
for ( int i=0; i<item->childCount(); ++i ) {
- writeXmlItem(xml, dynamic_cast<LatexmenuItem *>(item->child(i)) );
+ writeXmlItem(xml, dynamic_cast<UserMenuItem *>(item->child(i)) );
}
xml->writeEndElement();
}
// write xml tag for a separator
-void LatexmenuTree::writeXmlSeparator(QXmlStreamWriter *xml)
+void UserMenuTree::writeXmlSeparator(QXmlStreamWriter *xml)
{
xml->writeStartElement("separator");
xml->writeEndElement();
@@ -596,27 +596,27 @@ void LatexmenuTree::writeXmlSeparator(QXmlStreamWriter *xml)
// - empty menutitles
// - useless submenus without children
// - empty filenames, not existing or not executable files
-void LatexmenuTree::setErrorCodes()
+void UserMenuTree::setErrorCodes()
{
KILE_DEBUG() << "check menutree for errors and set error codes ...";
for (int i = 0; i < topLevelItemCount(); ++i) {
- LatexmenuItem *item = dynamic_cast<LatexmenuItem *>(topLevelItem(i));
- LatexmenuData::MenuType type = item->menutype();
+ UserMenuItem *item = dynamic_cast<UserMenuItem *>(topLevelItem(i));
+ UserMenuData::MenuType type = item->menutype();
- bool executable = ( type==LatexmenuData::Program && \
isItemExecutable(item->filename()) ); + bool executable = ( \
type==UserMenuData::Program && isItemExecutable(item->filename()) ); \
item->setModelData(executable);
- if ( type != LatexmenuData::Separator ) {
+ if ( type != UserMenuData::Separator ) {
checkMenuTitle(item);
}
- if ( type == LatexmenuData::Submenu ) {
+ if ( type == UserMenuData::Submenu ) {
checkSubmenu(item);
}
}
}
-void LatexmenuTree::checkMenuTitle(LatexmenuItem *item)
+void UserMenuTree::checkMenuTitle(UserMenuItem *item)
{
if ( item->menutitle().isEmpty() ) {
item->setText(0,EMPTY_MENUENTRY);
@@ -624,7 +624,7 @@ void LatexmenuTree::checkMenuTitle(LatexmenuItem *item)
}
}
-void LatexmenuTree::checkSubmenu(LatexmenuItem *item)
+void UserMenuTree::checkSubmenu(UserMenuItem *item)
{
QString menutitle = item->menutitle();
int children = item->childCount();
@@ -638,14 +638,14 @@ void LatexmenuTree::checkSubmenu(LatexmenuItem *item)
item->setText(0,menutitle);
for ( int i=0; i<children; ++i ) {
- LatexmenuItem *child = dynamic_cast<LatexmenuItem *>(item->child(i));
+ UserMenuItem *child = dynamic_cast<UserMenuItem *>(item->child(i));
child->setModelData();
- LatexmenuData::MenuType type = child->menutype();
+ UserMenuData::MenuType type = child->menutype();
- if ( type != LatexmenuData::Separator ) {
+ if ( type != UserMenuData::Separator ) {
checkMenuTitle(child);
}
- if ( type == LatexmenuData::Submenu ) {
+ if ( type == UserMenuData::Submenu ) {
checkSubmenu(child);
}
}
@@ -654,21 +654,21 @@ void LatexmenuTree::checkSubmenu(LatexmenuItem *item)
///////////////////////////// check menutree //////////////////////////////
// check for errors (true=no errors)
-bool LatexmenuTree::errorCheck()
+bool UserMenuTree::errorCheck()
{
KILE_DEBUG() << "check menutree for errors ...";
for (int i = 0; i < topLevelItemCount(); ++i) {
- LatexmenuItem *item = dynamic_cast<LatexmenuItem *>(topLevelItem(i));
- LatexmenuData::MenuType type = item->menutype();
+ UserMenuItem *item = dynamic_cast<UserMenuItem *>(topLevelItem(i));
+ UserMenuData::MenuType type = item->menutype();
- if ( type != LatexmenuData::Separator ) {
- if ( item->data(0,Qt::UserRole+2).toInt() != LatexmenuItem::MODEL_ERROR_NONE ) {
+ if ( type != UserMenuData::Separator ) {
+ if ( item->data(0,Qt::UserRole+2).toInt() != UserMenuItem::MODEL_ERROR_NONE ) {
return false;
}
}
- if ( type == LatexmenuData::Submenu ) {
+ if ( type == UserMenuData::Submenu ) {
if ( checkSubmenuError(item) == false ) {
return false;
}
@@ -678,20 +678,20 @@ bool LatexmenuTree::errorCheck()
return true;
}
-bool LatexmenuTree::checkSubmenuError(LatexmenuItem *item)
+bool UserMenuTree::checkSubmenuError(UserMenuItem *item)
{
int children = item->childCount();
for ( int i=0; i<children; ++i ) {
- LatexmenuItem *child = dynamic_cast<LatexmenuItem *>(item->child(i));
- LatexmenuData::MenuType type = child->menutype();
+ UserMenuItem *child = dynamic_cast<UserMenuItem *>(item->child(i));
+ UserMenuData::MenuType type = child->menutype();
- if ( type != LatexmenuData::Separator ) {
- if ( child->data(0,Qt::UserRole+2).toInt() != LatexmenuItem::MODEL_ERROR_NONE ) {
+ if ( type != UserMenuData::Separator ) {
+ if ( child->data(0,Qt::UserRole+2).toInt() != UserMenuItem::MODEL_ERROR_NONE ) {
return false;
}
}
- if ( type == LatexmenuData::Submenu ) {
+ if ( type == UserMenuData::Submenu ) {
if ( checkSubmenuError(child) == false ) {
return false;
}
@@ -704,7 +704,7 @@ bool LatexmenuTree::checkSubmenuError(LatexmenuItem *item)
///////////////////////////// tree ops //////////////////////////////
// insert a standard menu item
-bool LatexmenuTree::insertMenuItem(QTreeWidgetItem *current, bool below)
+bool UserMenuTree::insertMenuItem(QTreeWidgetItem *current, bool below)
{
QString menulabel = getMenuTitle(i18n("Please enter a label for this menu item:"));
if ( menulabel.isEmpty() ) {
@@ -712,16 +712,16 @@ bool LatexmenuTree::insertMenuItem(QTreeWidgetItem *current, \
bool below) }
if ( below ) {
- insertMenuItemBelow(current,LatexmenuData::Text,menulabel);
+ insertMenuItemBelow(current,UserMenuData::Text,menulabel);
}
else {
- insertMenuItemAbove(current,LatexmenuData::Text,menulabel);
+ insertMenuItemAbove(current,UserMenuData::Text,menulabel);
}
return true;
}
// insert a submenu item
-bool LatexmenuTree::insertSubmenu(QTreeWidgetItem *current, bool below)
+bool UserMenuTree::insertSubmenu(QTreeWidgetItem *current, bool below)
{
QString menulabel = getMenuTitle(i18n("Please enter a label for this submenu:"));
if ( menulabel.isEmpty() ) {
@@ -729,71 +729,71 @@ bool LatexmenuTree::insertSubmenu(QTreeWidgetItem *current, \
bool below) }
if ( below ) {
- insertMenuItemBelow(current,LatexmenuData::Submenu,menulabel);
+ insertMenuItemBelow(current,UserMenuData::Submenu,menulabel);
}
else {
- insertMenuItemAbove(current,LatexmenuData::Submenu,menulabel);
+ insertMenuItemAbove(current,UserMenuData::Submenu,menulabel);
}
return true;
}
// insert a separator item
-bool LatexmenuTree::insertSeparator(QTreeWidgetItem *current, bool below)
+bool UserMenuTree::insertSeparator(QTreeWidgetItem *current, bool below)
{
if ( below ) {
- insertMenuItemBelow(current,LatexmenuData::Separator,QString::null);
+ insertMenuItemBelow(current,UserMenuData::Separator,QString::null);
}
else {
- insertMenuItemAbove(current,LatexmenuData::Separator,QString::null);
+ insertMenuItemAbove(current,UserMenuData::Separator,QString::null);
}
return true;
}
-void LatexmenuTree::insertMenuItemAbove(QTreeWidgetItem *current, \
LatexmenuData::MenuType type, const QString &menulabel) +void \
UserMenuTree::insertMenuItemAbove(QTreeWidgetItem *current, UserMenuData::MenuType \
type, const QString &menulabel) {
QTreeWidgetItem *parent = ( current ) ? current->parent() : 0L;
int index = itemIndex(parent,current);
- LatexmenuItem *item = new LatexmenuItem(type,menulabel);
+ UserMenuItem *item = new UserMenuItem(type,menulabel);
insertItem(parent,index,item);
item->setText(0,menulabel);
setCurrentItem(item);
}
-void LatexmenuTree::insertMenuItemBelow(QTreeWidgetItem *current, \
LatexmenuData::MenuType type, const QString &menulabel) +void \
UserMenuTree::insertMenuItemBelow(QTreeWidgetItem *current, UserMenuData::MenuType \
type, const QString &menulabel) {
- LatexmenuItem *item;
+ UserMenuItem *item;
QTreeWidgetItem *parent = ( current ) ? current->parent() : 0L;
if ( parent == 0L ) {
- item = new LatexmenuItem(this,current,type,menulabel);
+ item = new UserMenuItem(this,current,type,menulabel);
}
else {
- item = new LatexmenuItem(parent,current,type,menulabel);
+ item = new UserMenuItem(parent,current,type,menulabel);
}
item->setText(0,menulabel);
setCurrentItem(item);
}
-void LatexmenuTree::insertIntoSubmenu(QTreeWidgetItem *current, \
LatexmenuData::MenuType type) +void UserMenuTree::insertIntoSubmenu(QTreeWidgetItem \
*current, UserMenuData::MenuType type) {
QString menulabel = QString::null;
- if ( type==LatexmenuData::Text || type==LatexmenuData::Submenu ) {
+ if ( type==UserMenuData::Text || type==UserMenuData::Submenu ) {
menulabel = getMenuTitle(i18n("Please enter a label for this entry:"));
if ( menulabel.isEmpty() ) {
return;
}
}
- LatexmenuItem *item = new LatexmenuItem(type,menulabel);
+ UserMenuItem *item = new UserMenuItem(type,menulabel);
insertItem(current,0,item);
setCurrentItem(item);
}
// delete an item
-void LatexmenuTree::itemDelete(QTreeWidgetItem *current)
+void UserMenuTree::itemDelete(QTreeWidgetItem *current)
{
int children,index;
QTreeWidgetItem *item, *selectitem;
@@ -837,10 +837,10 @@ void LatexmenuTree::itemDelete(QTreeWidgetItem *current)
}
// move an item one position up
-void LatexmenuTree::itemUp()
+void UserMenuTree::itemUp()
{
QTreeWidgetItem *current = currentItem();
- LatexmenuItem *aboveitem = dynamic_cast<LatexmenuItem *>(itemAbove(current));
+ UserMenuItem *aboveitem = dynamic_cast<UserMenuItem *>(itemAbove(current));
if ( aboveitem == 0L ) {
return;
}
@@ -851,7 +851,7 @@ void LatexmenuTree::itemUp()
QTreeWidgetItem *aboveparent = aboveitem->parent();
int aboveindex = itemIndex(aboveparent,aboveitem);
- LatexmenuItem *parent = dynamic_cast<LatexmenuItem *>(current->parent());
+ UserMenuItem *parent = dynamic_cast<UserMenuItem *>(current->parent());
int index = itemIndex(parent,current);
takeItem(parent,current);
@@ -859,7 +859,7 @@ void LatexmenuTree::itemUp()
aboveindex++;
}
- if ( parent==aboveparent && aboveitem->menutype()==LatexmenuData::Submenu ) {
+ if ( parent==aboveparent && aboveitem->menutype()==UserMenuData::Submenu ) {
insertItem(aboveitem,0,current);
}
else {
@@ -867,7 +867,7 @@ void LatexmenuTree::itemUp()
}
// update model data of old and new parent, if it has changed
- LatexmenuItem *newparent = dynamic_cast<LatexmenuItem *>(current->parent());
+ UserMenuItem *newparent = dynamic_cast<UserMenuItem *>(current->parent());
if ( parent != newparent ) {
if ( parent ) {
parent->setModelData();
@@ -885,22 +885,22 @@ void LatexmenuTree::itemUp()
}
// move an item one position down
-void LatexmenuTree::itemDown()
+void UserMenuTree::itemDown()
{
QTreeWidgetItem *current = currentItem();
bool expanded = current->isExpanded();
blockSignals(true);
// get all necessary parameter
- LatexmenuItem *parent = dynamic_cast<LatexmenuItem *>(current->parent());
+ UserMenuItem *parent = dynamic_cast<UserMenuItem *>(current->parent());
int index = itemIndex(parent,current);
int children = numChildren(parent);
// successor exists?
if ( index < children-1 ) {
- LatexmenuItem *successor = dynamic_cast<LatexmenuItem *>( \
itemAtIndex(parent,index+1) ); + UserMenuItem *successor = dynamic_cast<UserMenuItem \
*>( itemAtIndex(parent,index+1) ); takeItem(parent,current);
- if ( successor->menutype() == LatexmenuData::Submenu ) {
+ if ( successor->menutype() == UserMenuData::Submenu ) {
successor->insertChild(0,current);
}
else {
@@ -915,7 +915,7 @@ void LatexmenuTree::itemDown()
}
// update model data of old and new parent, if it has changed
- LatexmenuItem *newparent = dynamic_cast<LatexmenuItem *>(current->parent());
+ UserMenuItem *newparent = dynamic_cast<UserMenuItem *>(current->parent());
if ( parent != newparent ) {
if ( parent ) {
parent->setModelData();
@@ -935,7 +935,7 @@ void LatexmenuTree::itemDown()
////////////////////////////// delete tree //////////////////////////////
// delete the whole menutree
-void LatexmenuTree::deleteMenuTree()
+void UserMenuTree::deleteMenuTree()
{
if ( KMessageBox::questionYesNo(this, i18n("Do you really want to clear the \
complete menutree?") ) == KMessageBox::Yes ) { blockSignals(true);
@@ -947,32 +947,32 @@ void LatexmenuTree::deleteMenuTree()
////////////////////////////// info //////////////////////////////
// prepare info for en item with errors
-void LatexmenuTree::itemInfo(LatexmenuItem *item)
+void UserMenuTree::itemInfo(UserMenuItem *item)
{
int error = item->data(0,Qt::UserRole+2).toInt();
QStringList list;
- if ( error & LatexmenuItem::MODEL_ERROR_EMPTY ) {
+ if ( error & UserMenuItem::MODEL_ERROR_EMPTY ) {
list << i18n("This menuitem has no title.");
}
- if ( error & LatexmenuItem::MODEL_ERROR_SUBMENU ) {
+ if ( error & UserMenuItem::MODEL_ERROR_SUBMENU ) {
list << i18n("This submenu item is useless without children.");
}
- if ( error & LatexmenuItem::MODEL_ERROR_TEXT ) {
+ if ( error & UserMenuItem::MODEL_ERROR_TEXT ) {
list << i18n("This item offers no text to insert.");
}
- if ( error & LatexmenuItem::MODEL_ERROR_FILE_EMPTY ) {
+ if ( error & UserMenuItem::MODEL_ERROR_FILE_EMPTY ) {
list << i18n("No file is given for this task.");
}
- if ( error & LatexmenuItem::MODEL_ERROR_FILE_EXIST ) {
+ if ( error & UserMenuItem::MODEL_ERROR_FILE_EXIST ) {
list << i18n("The file for this item does not exist.");
}
- if ( error & LatexmenuItem::MODEL_ERROR_FILE_EXECUTABLE ) {
+ if ( error & UserMenuItem::MODEL_ERROR_FILE_EXECUTABLE ) {
list << i18n("The file for this item is not executable.");
}
@@ -993,22 +993,22 @@ void LatexmenuTree::itemInfo(LatexmenuItem *item)
////////////////////////////// auxiliary //////////////////////////////
-int LatexmenuTree::itemIndex(QTreeWidgetItem *parent, QTreeWidgetItem *item)
+int UserMenuTree::itemIndex(QTreeWidgetItem *parent, QTreeWidgetItem *item)
{
return ( parent ) ? parent->indexOfChild(item) : indexOfTopLevelItem(item);
}
-QTreeWidgetItem *LatexmenuTree::itemAtIndex(QTreeWidgetItem *parent, int index)
+QTreeWidgetItem *UserMenuTree::itemAtIndex(QTreeWidgetItem *parent, int index)
{
return ( parent ) ? parent->child(index) : topLevelItem(index);
}
-int LatexmenuTree::numChildren(QTreeWidgetItem *parent)
+int UserMenuTree::numChildren(QTreeWidgetItem *parent)
{
return ( parent ) ? parent->childCount() : topLevelItemCount();
}
-void LatexmenuTree::insertItem(QTreeWidgetItem *parent, int index, QTreeWidgetItem \
*item) +void UserMenuTree::insertItem(QTreeWidgetItem *parent, int index, \
QTreeWidgetItem *item) {
if ( parent ) {
parent->insertChild(index,item);
@@ -1018,7 +1018,7 @@ void LatexmenuTree::insertItem(QTreeWidgetItem *parent, int \
index, QTreeWidgetIt }
}
-void LatexmenuTree::takeItem(QTreeWidgetItem *parent, QTreeWidgetItem *item)
+void UserMenuTree::takeItem(QTreeWidgetItem *parent, QTreeWidgetItem *item)
{
if ( parent ) {
int index = parent->indexOfChild(item);
@@ -1030,13 +1030,13 @@ void LatexmenuTree::takeItem(QTreeWidgetItem *parent, \
QTreeWidgetItem *item) }
}
-bool LatexmenuTree::str2bool(const QString &value)
+bool UserMenuTree::str2bool(const QString &value)
{
return ( value == "true" );
}
-QString LatexmenuTree::getMenuTitle(const QString &title)
+QString UserMenuTree::getMenuTitle(const QString &title)
{
bool ok;
QString value = KInputDialog::getText(i18n("Name"), title, QString::null, &ok, \
this); @@ -1047,4 +1047,4 @@ QString LatexmenuTree::getMenuTitle(const QString \
&title)
}
-#include "latexmenutree.moc"
+#include "usermenutree.moc"
diff --git a/src/dialogs/latexmenu/latexmenutree.h \
b/src/dialogs/usermenu/usermenutree.h similarity index 76%
rename from src/dialogs/latexmenu/latexmenutree.h
rename to src/dialogs/usermenu/usermenutree.h
index b63614d..712d6e7 100644
--- a/src/dialogs/latexmenu/latexmenutree.h
+++ b/src/dialogs/usermenu/usermenutree.h
@@ -31,13 +31,13 @@ class MenuentryDelegate : public QStyledItemDelegate {
};
-class LatexmenuTree : public QTreeWidget
+class UserMenuTree : public QTreeWidget
{
Q_OBJECT
public:
- LatexmenuTree(QWidget *parent);
- ~LatexmenuTree() {}
+ UserMenuTree(QWidget *parent);
+ ~UserMenuTree() {}
bool insertMenuItem(QTreeWidgetItem *current, bool below=true);
bool insertSubmenu(QTreeWidgetItem *current, bool below=true);
@@ -69,17 +69,17 @@ class LatexmenuTree : public QTreeWidget
POPUP_ITEM_INFO=0x0F
};
- LatexmenuItem *m_popupItem;
+ UserMenuItem *m_popupItem;
void setErrorCodes();
- bool checkSubmenuError(LatexmenuItem *item);
+ bool checkSubmenuError(UserMenuItem *item);
QStringList m_envPathlist;
void initEnvPathlist();
- void insertMenuItemAbove(QTreeWidgetItem *current, LatexmenuData::MenuType type, \
const QString &menulabel);
- void insertMenuItemBelow(QTreeWidgetItem *current, LatexmenuData::MenuType type, \
const QString &menulabel);
- void insertIntoSubmenu(QTreeWidgetItem *current, LatexmenuData::MenuType type);
+ void insertMenuItemAbove(QTreeWidgetItem *current, UserMenuData::MenuType type, \
const QString &menulabel); + void insertMenuItemBelow(QTreeWidgetItem *current, \
UserMenuData::MenuType type, const QString &menulabel); + void \
insertIntoSubmenu(QTreeWidgetItem *current, UserMenuData::MenuType type);
void deleteMenuTree();
@@ -90,21 +90,21 @@ class LatexmenuTree : public QTreeWidget
void insertItem(QTreeWidgetItem *parent, int index, QTreeWidgetItem *item);
void takeItem(QTreeWidgetItem *parent, QTreeWidgetItem *item);
- LatexmenuItem *readXmlSeparator();
- LatexmenuItem *readXmlSubmenu(const QDomElement &element);
- LatexmenuItem *readXmlMenuentry(const QDomElement &element);
+ UserMenuItem *readXmlSeparator();
+ UserMenuItem *readXmlSubmenu(const QDomElement &element);
+ UserMenuItem *readXmlMenuentry(const QDomElement &element);
- void writeXmlItem(QXmlStreamWriter *xml, LatexmenuItem *item);
- void writeXmlMenuentry(QXmlStreamWriter *xml, LatexmenuItem *item);
- void writeXmlSubmenu(QXmlStreamWriter *xml, LatexmenuItem *item);
+ void writeXmlItem(QXmlStreamWriter *xml, UserMenuItem *item);
+ void writeXmlMenuentry(QXmlStreamWriter *xml, UserMenuItem *item);
+ void writeXmlSubmenu(QXmlStreamWriter *xml, UserMenuItem *item);
void writeXmlSeparator(QXmlStreamWriter *xml);
- void checkMenuTitle(LatexmenuItem *item);
- void checkSubmenu(LatexmenuItem *item);
+ void checkMenuTitle(UserMenuItem *item);
+ void checkSubmenu(UserMenuItem *item);
bool str2bool(const QString &value);
QString getMenuTitle(const QString &title);
- void itemInfo(LatexmenuItem *item);
+ void itemInfo(UserMenuItem *item);
};
diff --git a/src/kile.cpp b/src/kile.cpp
index aa4b83c..480246b 100644
--- a/src/kile.cpp
+++ b/src/kile.cpp
@@ -100,9 +100,9 @@
#include "livepreview.h"
#include "parser/parsermanager.h"
-#include "dialogs/latexmenu/latexmenudialog.h"
-#include "latexmenu/latexmenudata.h"
-#include "latexmenu/latexmenu.h"
+#include "dialogs/usermenu/usermenudialog.h"
+#include "usermenu/usermenudata.h"
+#include "usermenu/usermenu.h"
#define LOG_TAB 0
#define OUTPUT_TAB 1
@@ -156,7 +156,7 @@ Kile::Kile(bool allowRestore, QWidget *parent, const char *name)
m_errorHandler = new KileErrorHandler(this, this);
m_quickPreview = new KileTool::QuickPreview(this);
m_extensions = new KileDocument::Extensions();
- m_latexUserMenu = NULL;
+ m_userMenu = NULL;
connect(m_partManager, SIGNAL(activePartChanged(KParts::Part*)), this, \
SLOT(activePartGUI(KParts::Part*)));
@@ -341,9 +341,9 @@ Kile::Kile(bool allowRestore, QWidget *parent, const char *name)
KTipDialog::showTip(this, "kile/tips");
// lazy creation: last possible place to insert this user defined menu
- m_latexUserMenu = new KileMenu::LatexUserMenu(this, this);
- connect(m_latexUserMenu, SIGNAL(sendText(const QString &)), this, \
SLOT(insertText(const QString &)));
- connect(m_latexUserMenu, SIGNAL(updateStatus()), this, \
SLOT(slotUpdateLatexmenuStatus())); + m_userMenu = new KileMenu::UserMenu(this, \
this); + connect(m_userMenu, SIGNAL(sendText(const QString &)), this, \
SLOT(insertText(const QString &))); + connect(m_userMenu, SIGNAL(updateStatus()), \
this, SLOT(slotUpdateUserMenuStatus()));
restoreFilesAndProjects(allowRestore);
slotStateChanged("Editor");
@@ -363,7 +363,7 @@ Kile::Kile(bool allowRestore, QWidget *parent, const char *name)
setUpdatesEnabled(false);
setAutoSaveSettings(QLatin1String("KileMainWindow"),true);
guiFactory()->refreshActionProperties();
- m_latexUserMenu->refreshActionProperties();
+ m_userMenu->refreshActionProperties();
setUpdatesEnabled(true);
}
@@ -374,7 +374,7 @@ Kile::~Kile()
if(m_livePreviewManager && viewManager()->viewerPart()) {
guiFactory()->removeClient(viewManager()->viewerPart());
}
- delete m_latexUserMenu;
+ delete m_userMenu;
delete m_livePreviewManager;
delete m_toolFactory;
delete m_manager;
@@ -1754,11 +1754,11 @@ void Kile::updateUserDefinedMenus()
m_buildMenuOther = \
dynamic_cast<QMenu*>(m_mainWindow->guiFactory()->container("menu_other", \
m_mainWindow)); m_buildMenuQuickPreview = \
dynamic_cast<QMenu*>(m_mainWindow->guiFactory()->container("quickpreview", \
m_mainWindow));
- if ( m_latexUserMenu ) {
- m_latexUserMenu->updateGui();
+ if ( m_userMenu ) {
+ m_userMenu->updateGui();
}
else {
- QMenu *usermenu = \
dynamic_cast<QMenu*>(m_mainWindow->guiFactory()->container("menu_userlatex", \
m_mainWindow)); + QMenu *usermenu = \
dynamic_cast<QMenu*>(m_mainWindow->guiFactory()->container("menu_usermenu", \
m_mainWindow)); if ( usermenu ) {
usermenu->menuAction()->setVisible(false);
}
@@ -1828,8 +1828,8 @@ void Kile::enableKileGUI(bool enable)
}
// update latex usermenu actions
- if ( m_latexUserMenu ) {
- QList<KAction *> useractions = m_latexUserMenu->menuActions();
+ if ( m_userMenu ) {
+ QList<KAction *> useractions = m_userMenu->menuActions();
foreach ( KAction *action, useractions ) {
action->setEnabled(enable);
}
@@ -1864,7 +1864,7 @@ void Kile::enableKileGUI(bool enable)
}
}
- updateLatexmenuStatus(enable);
+ updateUserMenuStatus(enable);
}
// adds action names to their lists
@@ -2041,7 +2041,7 @@ void Kile::updateMenu()
bool Kile::updateMenuActivationStatus(QMenu *menu)
{
- if ( menu->objectName() == "latexusermenu-submenu" ) {
+ if ( menu->objectName() == "usermenu-submenu" ) {
menu->setEnabled(true);
return true;
}
@@ -2348,34 +2348,34 @@ void Kile::quickPdf()
delete dlg;
}
-void Kile::quickLatexmenuDialog()
+void Kile::quickUserMenuDialog()
{
- m_latexUserMenu->removeShortcuts();
- KileMenu::LatexmenuDialog *dlg = new KileMenu::LatexmenuDialog(m_config.data(), \
this, m_latexUserMenu, m_latexUserMenu->xmlFile(), m_mainWindow); \
+ m_userMenu->removeShortcuts(); + KileMenu::UserMenuDialog *dlg = new \
KileMenu::UserMenuDialog(m_config.data(), this, m_userMenu, m_userMenu->xmlFile(), \
m_mainWindow); dlg->exec();
delete dlg;
// tell all the documents and views to update their action shortcuts (bug 247646)
docManager()->reloadXMLOnAllDocumentsAndViews();
- // a new latexmenu could have been installed, even if the return value is \
QDialog::Rejected
- m_latexUserMenu->refreshActionProperties();
+ // a new usermenu could have been installed, even if the return value is \
QDialog::Rejected + m_userMenu->refreshActionProperties();
}
-void Kile::slotUpdateLatexmenuStatus()
+void Kile::slotUpdateUserMenuStatus()
{
- KILE_DEBUG() << "slot update latexmenu status";
- updateLatexmenuStatus(true);
+ KILE_DEBUG() << "slot update usermenu status";
+ updateUserMenuStatus(true);
}
-void Kile::updateLatexmenuStatus(bool state)
+void Kile::updateUserMenuStatus(bool state)
{
- KILE_DEBUG() << "update latexmenu status";
+ KILE_DEBUG() << "update usermenu status";
- if ( m_latexUserMenu ) {
- QMenu *menu = m_latexUserMenu->getMenuItem();
- if ( menu ) {
+ if(m_userMenu) {
+ QMenu *menu = m_userMenu->getMenuItem();
+ if(menu) {
updateLatexenuActivationStatus(menu,state);
}
}
@@ -2404,7 +2404,7 @@ void Kile::readGUISettings()
void Kile::transformOldUserTags()
{
KILE_DEBUG() << "Convert old user tags";
- QString xmldir = KStandardDirs::locateLocal("appdata", "latexmenu/", true);
+ QString xmldir = KStandardDirs::locateLocal("appdata", "usermenu/", true);
KConfigGroup userGroup = m_config->group("User");
int len = userGroup.readEntry("nUserTags", 0);
@@ -2426,7 +2426,7 @@ void Kile::transformOldUserTags()
xml.setAutoFormattingIndent(2) ;
xml.writeStartDocument();
- xml.writeStartElement("Latexmenu");
+ xml.writeStartElement("UserMenu");
for (int i = 0; i < len; ++i) {
QString tagname = userGroup.readEntry("userTagName" + QString::number(i), \
i18n("no name")); @@ -2435,9 +2435,9 @@ void Kile::transformOldUserTags()
xml.writeStartElement("menu");
xml.writeAttribute("type", "text");
- xml.writeTextElement(KileMenu::LatexmenuData::xmlMenuTagName(KileMenu::LatexmenuData::XML_TITLE), \
tagname);
- xml.writeTextElement(KileMenu::LatexmenuData::xmlMenuTagName(KileMenu::LatexmenuData::XML_PLAINTEXT), \
tag);
- xml.writeTextElement(KileMenu::LatexmenuData::xmlMenuTagName(KileMenu::LatexmenuData::XML_SHORTCUT), \
QString("Ctrl+Shift+%1").arg(i+1)); \
+ xml.writeTextElement(KileMenu::UserMenuData::xmlMenuTagName(KileMenu::UserMenuData::XML_TITLE), \
tagname); + xml.writeTextElement(KileMenu::UserMenuData::xmlMenuTagName(KileMenu::UserMenuData::XML_PLAINTEXT), \
tag); + xml.writeTextElement(KileMenu::UserMenuData::xmlMenuTagName(KileMenu::UserMenuData::XML_SHORTCUT), \
QString("Ctrl+Shift+%1").arg(i+1)); xml.writeEndElement();
}
@@ -2769,8 +2769,8 @@ void Kile::configureKeys()
// tell all the documents and views to update their action shortcuts (bug 247646)
docManager()->reloadXMLOnAllDocumentsAndViews();
- // tell m_latexUserMenu that key bindings may have been changed
- m_latexUserMenu->updateKeyBindings();
+ // tell m_userMenu that key bindings may have been changed
+ m_userMenu->updateKeyBindings();
}
void Kile::configureToolbars()
diff --git a/src/kile.h b/src/kile.h
index 8ef7f9c..ddd73b7 100644
--- a/src/kile.h
+++ b/src/kile.h
@@ -214,7 +214,7 @@ private:
void updateMenu();
bool updateMenuActivationStatus(QMenu *menu);
void updateLatexenuActivationStatus(QMenu *menu, bool state);
- void updateLatexmenuStatus(bool state);
+ void updateUserMenuStatus(bool state);
void setViewerToolBars();
@@ -309,8 +309,8 @@ private Q_SLOTS:
void quickPdf();
void quickTabulardialog(bool tabularenv);
- void quickLatexmenuDialog();
- void slotUpdateLatexmenuStatus();
+ void quickUserMenuDialog();
+ void slotUpdateUserMenuStatus();
void includeGraphics();
diff --git a/src/kile.kcfg b/src/kile.kcfg
index 6455898..2101425 100644
--- a/src/kile.kcfg
+++ b/src/kile.kcfg
@@ -600,9 +600,9 @@
<default>false</default>
</entry>
</group>
- <group name="LatexUserMenu">
+ <group name="UserMenu">
<entry name="menuFile" type="String">
- <label>XML file for the latexusermenu.</label>
+ <label>XML file for the usermenu.</label>
<default></default>
</entry>
<entry name="menuPosition" type="Int">
diff --git a/src/kileinfo.h b/src/kileinfo.h
index 7d179bf..b182b4d 100644
--- a/src/kileinfo.h
+++ b/src/kileinfo.h
@@ -56,7 +56,7 @@ namespace KileCodeCompletion { class Manager; }
namespace KileAbbreviation { class Manager; }
namespace KileParser { class Manager; }
-namespace KileMenu { class LatexUserMenu; }
+namespace KileMenu { class UserMenu; }
class EditorCommands;
@@ -145,7 +145,7 @@ public:
KileAbbreviation::Manager* abbreviationManager() const { return \
m_abbreviationManager; } KileParser::Manager* parserManager() const { return \
m_parserManager; } KileErrorHandler* errorHandler() const { return m_errorHandler; }
- KileMenu::LatexUserMenu *latexUserMenu() const { return m_latexUserMenu; }
+ KileMenu::UserMenu *userMenu() const { return m_userMenu; }
//FIXME:refactor
KileWidget::FileBrowserWidget* fileSelector() const { return m_fileBrowserWidget; }
@@ -189,7 +189,7 @@ protected:
KileDocument::LatexCommands *m_latexCommands;
KileDocument::Extensions *m_extensions;
KileTool::QuickPreview *m_quickPreview;
- KileMenu::LatexUserMenu *m_latexUserMenu;
+ KileMenu::UserMenu *m_userMenu;
KileTool::LivePreviewManager *m_livePreviewManager;
bool m_singlemode;
diff --git a/src/kileui.rc b/src/kileui.rc
index 140b897..950581f 100644
--- a/src/kileui.rc
+++ b/src/kileui.rc
@@ -464,8 +464,8 @@
<Action name="tag_input"/>
</Menu>
-<Menu name="menu_userlatex">
- <text>Usermenu</text>
+<Menu name="menu_usermenu">
+ <text>User Menu</text>
</Menu>
<Menu name="wizard"><text>&Wizard</text>
diff --git a/src/kileviewmanager.cpp b/src/kileviewmanager.cpp
index fea3053..d12cb58 100644
--- a/src/kileviewmanager.cpp
+++ b/src/kileviewmanager.cpp
@@ -48,7 +48,7 @@
#include "kiledocmanager.h"
#include "kileextensions.h"
#include "kiletool_enums.h"
-#include "latexmenu/latexmenu.h"
+#include "usermenu/usermenu.h"
#include "livepreview.h"
#include "widgets/projectview.h"
#include "widgets/structurewidget.h"
@@ -312,11 +312,11 @@ void Manager::installContextMenu(KTextEditor::View *view)
popupMenu->addAction(m_quickPreviewAction);
// insert actions from user defined latex menu
- KileMenu::LatexUserMenu *latexusermenu = m_ki->latexUserMenu();
- if ( latexusermenu ) {
+ KileMenu::UserMenu *usermenu = m_ki->userMenu();
+ if ( usermenu ) {
KILE_DEBUG() << "Insert actions from user defined latex menu";
popupMenu->addSeparator();
- foreach ( KAction *action, latexusermenu->contextMenuActions() ) {
+ foreach ( KAction *action, usermenu->contextMenuActions() ) {
if ( action ) {
popupMenu->addAction(action);
}
diff --git a/src/latexmenu/latexmenu.cpp b/src/usermenu/usermenu.cpp
similarity index 77%
rename from src/latexmenu/latexmenu.cpp
rename to src/usermenu/usermenu.cpp
index 3168036..e9cb0e5 100644
--- a/src/latexmenu/latexmenu.cpp
+++ b/src/usermenu/usermenu.cpp
@@ -26,7 +26,7 @@
#include "kileactions.h"
#include "editorextension.h"
#include "kileviewmanager.h"
-#include "latexmenu/latexmenu.h"
+#include "usermenu/usermenu.h"
#include "kileconfig.h"
#include "kiledebug.h"
@@ -34,13 +34,13 @@
namespace KileMenu {
-// The LatexUserMenu uses six values/data structures:
+// The UserMenu uses six values/data structures:
//
-// - m_latexmenu: the menu with its entries/actions itself (QMenu *)
-// (actions for menu items are named 'latexuseraction-n', where n is a
+// - m_usermenu: the menu with its entries/actions itself (QMenu *)
+// (actions for menu items are named 'useraction-n', where n is a
// number starting at 0. It is also used as index for the m_menudata list.)
//
-// - m_menudata: a list, containing all info for menu item (QList<LatexmenuData>)
+// - m_menudata: a list, containing all info for menu item (QList<UserMenuData>)
//
// - m_actioncollection: KActionCollection of KileMainWindow (KActionCollection *)
//
@@ -48,9 +48,9 @@ namespace KileMenu {
//
// - m_actionlistContextMenu: a list with all actions of the context menu for \
selected text (QList<KAction *>) //
-// - a menu is defined with a xml file, which is placed in \
KGlobal::dirs()->findResource("appdata","latexmenu/") +// - a menu is defined with a \
xml file, which is placed in KGlobal::dirs()->findResource("appdata","usermenu/")
-LatexUserMenu::LatexUserMenu(KileInfo *ki, QObject *receiver)
+UserMenu::UserMenu(KileInfo *ki, QObject *receiver)
: m_ki(ki), m_receiver(receiver), m_proc(NULL)
{
KXmlGuiWindow *mainwindow = m_ki->mainWindow();
@@ -67,22 +67,22 @@ LatexUserMenu::LatexUserMenu(KileInfo *ki, QObject *receiver)
m_latexAction2 = createAction("wizard_usermenu2");
latex_menu->addAction(m_latexAction2);
- m_latexMenuEntry = new QMenu("Usermenu");
- m_latexMenuEntry->setObjectName("latexusermenu-submenu");
+ m_latexMenuEntry = new QMenu("User Menu");
+ m_latexMenuEntry->setObjectName("usermenu-submenu");
latex_menu->addMenu(m_latexMenuEntry);
// prepare menu position
m_menuPosition = KileConfig::menuPosition();
- m_latexmenu = ( m_menuPosition == DaniMenuPosition )
- ? dynamic_cast<QMenu*>(mainwindow->guiFactory()->container("menu_userlatex", \
mainwindow)) + m_usermenu = ( m_menuPosition == DaniMenuPosition )
+ ? dynamic_cast<QMenu*>(mainwindow->guiFactory()->container("menu_usermenu", \
mainwindow)) : m_latexMenuEntry;
// look for an existing menufile:
- // if filename matches 'basename.ext' then the file is placed in \
'KILE-LOCAL-DIR/latexmenu' directory + // if filename matches 'basename.ext' then the \
file is placed in 'KILE-LOCAL-DIR/usermenu' directory m_currentXmlFile = \
KileConfig::menuFile(); if ( !m_currentXmlFile.isEmpty() ) {
if ( !m_currentXmlFile.contains("/") ) {
- m_currentXmlFile = KGlobal::dirs()->findResource("appdata","latexmenu/") + \
m_currentXmlFile; + m_currentXmlFile = \
KGlobal::dirs()->findResource("appdata","usermenu/") + m_currentXmlFile; }
if ( QFile(m_currentXmlFile).exists() ) {
@@ -97,31 +97,31 @@ LatexUserMenu::LatexUserMenu(KileInfo *ki, QObject *receiver)
updateUsermenuPosition();
}
-LatexUserMenu::~LatexUserMenu()
+UserMenu::~UserMenu()
{
if (m_proc) {
delete m_proc;
}
}
-bool LatexUserMenu::isEmpty()
+bool UserMenu::isEmpty()
{
- return ( m_latexmenu->actions().size() == 0 );
+ return ( m_usermenu->actions().size() == 0 );
}
/////////////////////// install usermenu//////////////////////////////
-KAction *LatexUserMenu::createAction(const QString &name)
+KAction *UserMenu::createAction(const QString &name)
{
- KAction *action = m_actioncollection->addAction(name, m_receiver, \
SLOT(quickLatexmenuDialog()));
- action->setText(i18n("Edit Usermenu"));
+ KAction *action = m_actioncollection->addAction(name, m_receiver, \
SLOT(quickUserMenuDialog())); + action->setText(i18n("Edit User Menu"));
action->setIcon(KIcon("wizard_usermenu"));
return action;
}
-void LatexUserMenu::updateUsermenuPosition()
+void UserMenu::updateUsermenuPosition()
{
KXmlGuiWindow *mainwindow = m_ki->mainWindow();
- QMenu *dani_menu = \
dynamic_cast<QMenu*>(mainwindow->guiFactory()->container("menu_userlatex", \
mainwindow)); + QMenu *dani_menu = \
dynamic_cast<QMenu*>(mainwindow->guiFactory()->container("menu_usermenu", \
mainwindow));
// and set the new one
bool show = !isEmpty() && m_ki->viewManager()->currentTextView();
@@ -135,7 +135,7 @@ void LatexUserMenu::updateUsermenuPosition()
}
}
-void LatexUserMenu::slotChangeMenuPosition(int newPosition)
+void UserMenu::slotChangeMenuPosition(int newPosition)
{
// clear old usermenu, whereever it is
clear();
@@ -143,15 +143,15 @@ void LatexUserMenu::slotChangeMenuPosition(int newPosition)
// set new usermenu position
KXmlGuiWindow *mainwindow = m_ki->mainWindow();
m_menuPosition = newPosition;
- m_latexmenu = ( m_menuPosition == DaniMenuPosition )
- ? dynamic_cast<QMenu*>(mainwindow->guiFactory()->container("menu_userlatex", \
mainwindow)) + m_usermenu = ( m_menuPosition == DaniMenuPosition )
+ ? dynamic_cast<QMenu*>(mainwindow->guiFactory()->container("menu_usermenu", \
mainwindow)) : m_latexMenuEntry;
slotInstallXmlFile(m_currentXmlFile);
updateUsermenuPosition();
}
-void LatexUserMenu::setVisibleDaniMenu(bool state, bool show)
+void UserMenu::setVisibleDaniMenu(bool state, bool show)
{
m_wizardAction1->setVisible(state);
m_wizardAction2->setVisible(state);
@@ -163,12 +163,12 @@ void LatexUserMenu::setVisibleDaniMenu(bool state, bool show)
///////////////////////////// clear all data //////////////////////////////
-// clear all lists and data for an existing latexmenu
-void LatexUserMenu::clear()
+// clear all lists and data for an existing usermenu
+void UserMenu::clear()
{
- // clear latexmenu and menudata
- if ( m_latexmenu ) {
- m_latexmenu->clear();
+ // clear usermenu and menudata
+ if ( m_usermenu ) {
+ m_usermenu->clear();
}
m_menudata.clear();
@@ -185,17 +185,17 @@ void LatexUserMenu::clear()
///////////////////////////// update GUI //////////////////////////////
// GUI was updated and all menu items disappeared
-void LatexUserMenu::updateGui()
+void UserMenu::updateGui()
{
- KILE_DEBUG() << "update latexmenu ...";
+ KILE_DEBUG() << "update usermenu ...";
if ( m_menuPosition == DaniMenuPosition ) {
KXmlGuiWindow *mainwindow = m_ki->mainWindow();
- m_latexmenu = dynamic_cast<QMenu*>(mainwindow->guiFactory()->container("menu_userlatex", \
mainwindow)); + m_usermenu = \
dynamic_cast<QMenu*>(mainwindow->guiFactory()->container("menu_usermenu", \
mainwindow)); }
// like slotInstallXmlFile(), but without updating KileConfig::menuFile
- // first clear old latexmenu, menudata, actions and actionlists
+ // first clear old usermenu, menudata, actions and actionlists
clear();
// then install
@@ -213,21 +213,21 @@ void LatexUserMenu::updateGui()
///////////////////////////// update key bindings //////////////////////////////
// shortcut dialog was called, so key bindings may have been changed
-void LatexUserMenu::updateKeyBindings()
+void UserMenu::updateKeyBindings()
{
if ( m_currentXmlFile.isEmpty() && !QFile(m_currentXmlFile).exists() ) {
return;
}
// new key bindings are found in kileui.rc (ActionProperties)
- // remove them, as they will be written into latexmenu xml file
+ // remove them, as they will be written into usermenu xml file
removeActionProperties();
- // update xml file of current latexmenu
+ // update xml file of current usermenu
updateXmlFile(m_currentXmlFile);
}
-void LatexUserMenu::removeActionProperties()
+void UserMenu::removeActionProperties()
{
QString xmlfile = "kileui.rc";
QString xml(KXMLGUIFactory::readConfigFile(xmlfile));
@@ -246,10 +246,10 @@ void LatexUserMenu::removeActionProperties()
return;
}
- // search for all actions of the user defined Latexmenu
+ // search for all actions of the user defined UserMenu
KILE_DEBUG() << "QDomElement actionPropertiesElement found ";
bool changed = false;
- QRegExp re("latexuseraction-(\\d+)$");
+ QRegExp re("useraction-(\\d+)$");
QDomElement e = actionPropElement.firstChildElement();
while(!e.isNull()) {
QString tag = e.tagName();
@@ -287,11 +287,11 @@ void LatexUserMenu::removeActionProperties()
// Calling m_mainWindow->guiFactory()->refreshActionProperties() in kile.cpp removes \
all // user defined action shortcuts and icons. Here they will be refreshed again.
-void LatexUserMenu::refreshActionProperties()
+void UserMenu::refreshActionProperties()
{
KILE_DEBUG() << "refresh action properties";
- QRegExp re("latexuseraction-(\\d+)$");
+ QRegExp re("useraction-(\\d+)$");
foreach ( KAction *action, m_actionlist ) {
if ( re.indexIn(action->objectName()) == 0 ) {
int actionIndex = re.cap(1).toInt();
@@ -305,10 +305,10 @@ void LatexUserMenu::refreshActionProperties()
}
}
-// Before calling latexmenu dialog, all user defined action shortcuts must be \
removed,
-// or the dialog will give a lot of warnings. All shortcuts (even if changed) in the \
latexmenu +// Before calling usermenu dialog, all user defined action shortcuts must \
be removed, +// or the dialog will give a lot of warnings. All shortcuts (even if \
changed) in the usermenu // will be refreshed again, when the dialog is finished
-void LatexUserMenu::removeShortcuts()
+void UserMenu::removeShortcuts()
{
foreach ( KAction *action, m_actionlist ) {
action->setShortcut( KShortcut() );
@@ -318,11 +318,11 @@ void LatexUserMenu::removeShortcuts()
///////////////////////////// install/remove xml //////////////////////////////
// call from the menu: no xml file given
-void LatexUserMenu::installXmlMenufile()
+void UserMenu::installXmlMenufile()
{
KILE_DEBUG() << "install xml file with KFileDialog::getOpenFileName";
- QString directory = selectLatexmenuDir();
+ QString directory = selectUserMenuDir();
QString filter = i18n("*.xml|Latex Menu Files");
QString filename = KFileDialog::getOpenFileName(directory, filter, \
m_ki->mainWindow(), i18n("Select Menu File")); @@ -338,14 +338,14 @@ void \
LatexUserMenu::installXmlMenufile() }
}
-// SIGNAL from latexmenu dialog: install new latexmenu (xml file given)
+// SIGNAL from usermenu dialog: install new usermenu (xml file given)
//
-// use 'basename.ext' if the file is placed in 'KILE-LOCAL-DIR/latexmenu' directory \
and full filepath else
-void LatexUserMenu::slotInstallXmlFile(const QString &filename)
+// use 'basename.ext' if the file is placed in 'KILE-LOCAL-DIR/usermenu' directory \
and full filepath else +void UserMenu::slotInstallXmlFile(const QString &filename)
{
KILE_DEBUG() << "install xml file" << filename;
- // clear old latexmenu, menudata, actions and actionlists
+ // clear old usermenu, menudata, actions and actionlists
clear();
if ( installXml(filename) ) {
@@ -354,7 +354,7 @@ void LatexUserMenu::slotInstallXmlFile(const QString &filename)
// save xml file in config (with or without path)
QString xmlfile = filename;
- QString dir = KGlobal::dirs()->findResource("appdata","latexmenu/");
+ QString dir = KGlobal::dirs()->findResource("appdata","usermenu/");
if ( filename.startsWith(dir) ) {
QString basename = filename.right( filename.length()-dir.length() );
if ( !basename.isEmpty() && !basename.contains("/") ) {
@@ -373,7 +373,7 @@ void LatexUserMenu::slotInstallXmlFile(const QString &filename)
}
}
-void LatexUserMenu::slotRemoveXmlFile()
+void UserMenu::slotRemoveXmlFile()
{
KILE_DEBUG() << "remove xml file";
@@ -392,20 +392,20 @@ void LatexUserMenu::slotRemoveXmlFile()
emit (updateStatus());
}
-///////////////////////////// install latexusermenu from XML \
////////////////////////////// +///////////////////////////// install usermenu from \
XML //////////////////////////////
-// pre: latexmenu is already cleared
-bool LatexUserMenu::installXml(const QString &filename)
+// pre: usermenu is already cleared
+bool UserMenu::installXml(const QString &filename)
{
KILE_DEBUG() << "install: start";
- if ( !m_latexmenu ) {
- KILE_DEBUG() << "Hmmmm: found no latexmenu";
+ if ( !m_usermenu ) {
+ KILE_DEBUG() << "Hmmmm: found no usermenu";
return false;
}
// read content of xml file
- QDomDocument doc("Latexmenu");
+ QDomDocument doc("UserMenu");
QFile file(filename);
if ( !file.open(QFile::ReadOnly | QFile::Text) ) {
// TODO KMessageBox
@@ -431,10 +431,10 @@ bool LatexUserMenu::installXml(const QString &filename)
if ( tag=="submenu" || tag=="separator") {
if ( tag == "submenu" ) {
- installXmlSubmenu(e,m_latexmenu,actionnumber);
+ installXmlSubmenu(e,m_usermenu,actionnumber);
}
else /* tag=="separator" */ {
- m_latexmenu->addSeparator();
+ m_usermenu->addSeparator();
}
// try to get some structure into to the context menu
@@ -444,7 +444,7 @@ bool LatexUserMenu::installXml(const QString &filename)
}
}
else /* if ( tag == "menu" ) */ {
- installXmlMenuentry(e,m_latexmenu,actionnumber);
+ installXmlMenuentry(e,m_usermenu,actionnumber);
}
e = e.nextSiblingElement();
@@ -455,7 +455,7 @@ bool LatexUserMenu::installXml(const QString &filename)
}
// install a submenu item
-void LatexUserMenu::installXmlSubmenu(const QDomElement &element, QMenu *parentmenu, \
int &actionnumber) +void UserMenu::installXmlSubmenu(const QDomElement &element, \
QMenu *parentmenu, int &actionnumber) {
QMenu *submenu = parentmenu->addMenu(QString::null);
@@ -485,11 +485,11 @@ void LatexUserMenu::installXmlSubmenu(const QDomElement \
&element, QMenu *parentm }
// install a standard menu item
-void LatexUserMenu::installXmlMenuentry(const QDomElement &element, QMenu \
*parentmenu, int &actionnumber) +void UserMenu::installXmlMenuentry(const QDomElement \
&element, QMenu *parentmenu, int &actionnumber) {
- LatexmenuData menudata;
+ UserMenuData menudata;
- menudata.menutype = LatexmenuData::xmlMenuType( element.attribute("type") );
+ menudata.menutype = UserMenuData::xmlMenuType( element.attribute("type") );
// read values
if ( element.hasChildNodes() ) {
@@ -498,19 +498,19 @@ void LatexUserMenu::installXmlMenuentry(const QDomElement \
&element, QMenu *paren QString tag = e.tagName();
QString text = e.text();
- int index = LatexmenuData::xmlMenuTag(tag);
+ int index = UserMenuData::xmlMenuTag(tag);
switch (index) {
- case LatexmenuData::XML_TITLE: menudata.menutitle = text; \
break;
- case LatexmenuData::XML_PLAINTEXT: menudata.text = \
text.replace("\\n","\n"); break;
- case LatexmenuData::XML_FILENAME: menudata.filename = text; \
break;
- case LatexmenuData::XML_PARAMETER: menudata.parameter = text; \
break;
- case LatexmenuData::XML_ICON: menudata.icon = text; \
break;
- case LatexmenuData::XML_SHORTCUT: menudata.shortcut = text; \
break;
- case LatexmenuData::XML_NEEDSSELECTION: menudata.needsSelection = \
str2bool(text); break;
- case LatexmenuData::XML_USECONTEXTMENU: menudata.useContextMenu = \
str2bool(text); break;
- case LatexmenuData::XML_REPLACESELECTION: menudata.replaceSelection = \
str2bool(text); break;
- case LatexmenuData::XML_SELECTINSERTION: menudata.selectInsertion = \
str2bool(text); break;
- case LatexmenuData::XML_INSERTOUTPUT: menudata.insertOutput = \
str2bool(text); break; + case UserMenuData::XML_TITLE: \
menudata.menutitle = text; break; + case \
UserMenuData::XML_PLAINTEXT: menudata.text = text.replace("\\n","\n"); \
break; + case UserMenuData::XML_FILENAME: menudata.filename = text; \
break; + case UserMenuData::XML_PARAMETER: menudata.parameter = text; \
break; + case UserMenuData::XML_ICON: menudata.icon = text; \
break; + case UserMenuData::XML_SHORTCUT: menudata.shortcut = text; \
break; + case UserMenuData::XML_NEEDSSELECTION: menudata.needsSelection = \
str2bool(text); break; + case UserMenuData::XML_USECONTEXTMENU: \
menudata.useContextMenu = str2bool(text); break; + case \
UserMenuData::XML_REPLACESELECTION: menudata.replaceSelection = str2bool(text); \
break; + case UserMenuData::XML_SELECTINSERTION: menudata.selectInsertion = \
str2bool(text); break; + case UserMenuData::XML_INSERTOUTPUT: \
menudata.insertOutput = str2bool(text); break; }
e = e.nextSiblingElement();
@@ -520,7 +520,7 @@ void LatexUserMenu::installXmlMenuentry(const QDomElement \
&element, QMenu *paren // add menu item, if its title is not empty
if ( !menudata.menutitle.isEmpty() ) {
- KAction *action = \
m_actioncollection->addAction(QString("latexuseraction-%1").arg(actionnumber), this, \
SLOT(slotLatexmenuAction()) ); + KAction *action = \
m_actioncollection->addAction(QString("useraction-%1").arg(actionnumber), this, \
SLOT(slotUserMenuAction()) ); if ( action ) {
action->setText(menudata.menutitle);
@@ -547,14 +547,14 @@ void LatexUserMenu::installXmlMenuentry(const QDomElement \
&element, QMenu *paren
///////////////////////////// update XML file //////////////////////////////
-// key bindings dialog was called, so the latexmenu xml file must be updated, if one \
of these actions was changed +// key bindings dialog was called, so the usermenu xml \
file must be updated, if one of these actions was changed // pre: xml file exists
-void LatexUserMenu::updateXmlFile(const QString &filename)
+void UserMenu::updateXmlFile(const QString &filename)
{
KILE_DEBUG() << "update xml file: " << filename;
// read content of xml file
- QDomDocument doc("Latexmenu");
+ QDomDocument doc("UserMenu");
QFile file(filename);
file.open(QFile::ReadOnly | QFile::Text);
doc.setContent(&file);
@@ -590,7 +590,7 @@ void LatexUserMenu::updateXmlFile(const QString &filename)
}
// install a submenu item
-bool LatexUserMenu::updateXmlSubmenu(QDomDocument &doc, QDomElement &element, int \
&actionnumber) +bool UserMenu::updateXmlSubmenu(QDomDocument &doc, QDomElement \
&element, int &actionnumber) {
bool changed = false;
@@ -612,7 +612,7 @@ bool LatexUserMenu::updateXmlSubmenu(QDomDocument &doc, \
QDomElement &element, in }
// install a standard menu item
-bool LatexUserMenu::updateXmlMenuentry(QDomDocument &doc, QDomElement &element, int \
&actionnumber) +bool UserMenu::updateXmlMenuentry(QDomDocument &doc, QDomElement \
&element, int &actionnumber) {
bool changed = false;
@@ -623,7 +623,7 @@ bool LatexUserMenu::updateXmlMenuentry(QDomDocument &doc, \
QDomElement &element, while ( !e.isNull()) {
QString tag = e.tagName();
- if ( LatexmenuData::xmlMenuTag(tag) == LatexmenuData::XML_SHORTCUT) {
+ if ( UserMenuData::xmlMenuTag(tag) == UserMenuData::XML_SHORTCUT) {
oldElement = e;
//oldText = e.text(); value not needed, is also in m_menudata[]
}
@@ -637,7 +637,7 @@ bool LatexUserMenu::updateXmlMenuentry(QDomDocument &doc, \
QDomElement &element, // an existing shortcut always needs a new QDomElement
if ( !currentShortcut.isEmpty() ) {
// create element with new shortcut
- QDomElement newElement = doc.createElement( \
LatexmenuData::xmlMenuTagName(LatexmenuData::XML_SHORTCUT) ); + QDomElement \
newElement = doc.createElement( \
UserMenuData::xmlMenuTagName(UserMenuData::XML_SHORTCUT) ); QDomText newText = \
doc.createTextNode(currentShortcut); newElement.appendChild(newText);
@@ -668,9 +668,9 @@ bool LatexUserMenu::updateXmlMenuentry(QDomDocument &doc, \
QDomElement &element, // - if no files are present, but in global directory, start \
with global // - if not a single file was found: back to local directory
-QString LatexUserMenu::selectLatexmenuDir()
+QString UserMenu::selectUserMenuDir()
{
- QStringList dirs = KGlobal::dirs()->findDirs("appdata", "latexmenu/");
+ QStringList dirs = KGlobal::dirs()->findDirs("appdata", "usermenu/");
if ( dirs.size() < 2 ) {
return dirs.at(0);
}
@@ -688,15 +688,15 @@ QString LatexUserMenu::selectLatexmenuDir()
return ( globalList.size() > 0 ) ? dirs.at(1) : localDirName;
}
-////////////////////////////// execLatexmenuAction //////////////////////////////
+////////////////////////////// execUserMenuAction //////////////////////////////
-// an action was called from the latexmenu:
+// an action was called from the usermenu:
// - identify action
// - find textview
// - execute action
-void LatexUserMenu::slotLatexmenuAction()
+void UserMenu::slotUserMenuAction()
{
- KILE_DEBUG() << "want to start an action from latexmenu ...";
+ KILE_DEBUG() << "want to start an action from usermenu ...";
KAction *action = dynamic_cast<KAction *>(sender());
if ( !action ) {
@@ -706,7 +706,7 @@ void LatexUserMenu::slotLatexmenuAction()
QString actionName = action->objectName();
KILE_DEBUG() << "action name: " << actionName << "classname=" << \
action->metaObject()->className();
- QRegExp re("latexuseraction-(\\d+)$");
+ QRegExp re("useraction-(\\d+)$");
if ( re.indexIn(actionName) != 0) {
KILE_DEBUG() << "STOP: found wrong action name: " << actionName;
return;
@@ -730,15 +730,15 @@ void LatexUserMenu::slotLatexmenuAction()
return;
}
- LatexmenuData::MenuType type = m_menudata[actionIndex].menutype;
+ UserMenuData::MenuType type = m_menudata[actionIndex].menutype;
- if ( type == LatexmenuData::Text ) {
+ if ( type == UserMenuData::Text ) {
execActionText(view,m_menudata[actionIndex]);
}
- else if ( type == LatexmenuData::FileContent ) {
+ else if ( type == UserMenuData::FileContent ) {
execActionFileContent(view,m_menudata[actionIndex]);
}
- else if ( type == LatexmenuData::Program ) {
+ else if ( type == UserMenuData::Program ) {
execActionProgramOutput(view,m_menudata[actionIndex]);
}
else {
@@ -749,7 +749,7 @@ void LatexUserMenu::slotLatexmenuAction()
////////////////////////////// execActionText //////////////////////////////
// execute an action: insert text
-void LatexUserMenu::execActionText(KTextEditor::View *view, const LatexmenuData \
&menudata) +void UserMenu::execActionText(KTextEditor::View *view, const UserMenuData \
&menudata) {
KILE_DEBUG() << "want to insert text ... ";
insertText(view, menudata.text, menudata.replaceSelection, \
menudata.selectInsertion); @@ -758,7 +758,7 @@ void \
LatexUserMenu::execActionText(KTextEditor::View *view, const LatexmenuData \
////////////////////////////// execActionFileContent //////////////////////////////
// execute an action: insert file contents
-void LatexUserMenu::execActionFileContent(KTextEditor::View *view, const \
LatexmenuData &menudata) +void UserMenu::execActionFileContent(KTextEditor::View \
*view, const UserMenuData &menudata) {
KILE_DEBUG() << "want to insert contents of a file: " << menudata.filename;
@@ -782,7 +782,7 @@ void LatexUserMenu::execActionFileContent(KTextEditor::View \
*view, const Latexme // TODO metachar %F
// execute an action: run a program
-void LatexUserMenu::execActionProgramOutput(KTextEditor::View *view, const \
LatexmenuData &menudata) +void UserMenu::execActionProgramOutput(KTextEditor::View \
*view, const UserMenuData &menudata) {
KILE_DEBUG() << "want to start a program ... ";
@@ -833,12 +833,12 @@ void LatexUserMenu::execActionProgramOutput(KTextEditor::View \
*view, const Latex m_proc->start();
}
-void LatexUserMenu::slotProcessOutput()
+void UserMenu::slotProcessOutput()
{
m_procOutput += m_proc->readAll();
}
-void LatexUserMenu::slotProcessExited(int /* exitCode */, QProcess::ExitStatus \
exitStatus) +void UserMenu::slotProcessExited(int /* exitCode */, \
QProcess::ExitStatus exitStatus) {
KILE_DEBUG() << "... finish proc ";
KILE_DEBUG() << "output: " << m_procOutput;
@@ -851,7 +851,7 @@ void LatexUserMenu::slotProcessExited(int /* exitCode */, \
QProcess::ExitStatus e ////////////////////////////// auxiliary \
//////////////////////////////
// action is finished, now insert some text
-void LatexUserMenu::insertText(KTextEditor::View *view, const QString &text, bool \
replaceSelection, bool selectInsertion) +void UserMenu::insertText(KTextEditor::View \
*view, const QString &text, bool replaceSelection, bool selectInsertion) {
KILE_DEBUG() << "insert text from action: " << text;
// metachars: %R - references (like \ref{%R}, \pageref{%R} ...)
@@ -926,7 +926,7 @@ void LatexUserMenu::insertText(KTextEditor::View *view, const \
QString &text, boo
////////////////////////////// auxiliary //////////////////////////////
-bool LatexUserMenu::str2bool(const QString &value)
+bool UserMenu::str2bool(const QString &value)
{
return ( value == "true" );
}
@@ -934,4 +934,4 @@ bool LatexUserMenu::str2bool(const QString &value)
}
-#include "latexmenu.moc"
+#include "usermenu.moc"
diff --git a/src/latexmenu/latexmenu.h b/src/usermenu/usermenu.h
similarity index 80%
rename from src/latexmenu/latexmenu.h
rename to src/usermenu/usermenu.h
index 249d151..e53b6f9 100644
--- a/src/latexmenu/latexmenu.h
+++ b/src/usermenu/usermenu.h
@@ -11,8 +11,8 @@
* *
***************************************************************************/
-#ifndef LATEXMENU_H
-#define LATEXMENU_H
+#ifndef USERMENU_H
+#define USERMENU_H
#include <QList>
#include <QDomDocument>
@@ -24,20 +24,20 @@
#include "kileinfo.h"
-#include "latexmenu/latexmenudata.h"
+#include "usermenu/usermenudata.h"
namespace KileMenu {
-class LatexUserMenu : public QObject
+class UserMenu : public QObject
{
Q_OBJECT
public:
- enum MenuPosition { DaniMenuPosition=0x00, LatexMenuPosition=0x01 };
+ enum MenuPosition { DaniMenuPosition=0x00, UserMenuPosition=0x01 };
- LatexUserMenu(KileInfo *ki, QObject *receiver);
- ~LatexUserMenu();
+ UserMenu(KileInfo *ki, QObject *receiver);
+ ~UserMenu();
void installXmlMenufile();
void removeXmlMenufile();
@@ -51,12 +51,12 @@ class LatexUserMenu : public QObject
void updateGui();
void updateKeyBindings();
- QMenu *getMenuItem() const { return m_latexmenu; }
+ QMenu *getMenuItem() const { return m_usermenu; }
QList<KAction *> contextMenuActions() const { return m_actionlistContextMenu; }
QList<KAction *> menuActions() const { return m_actionlist; }
- static QString selectLatexmenuDir();
+ static QString selectUserMenuDir();
public Q_SLOTS:
void slotInstallXmlFile(const QString &filename);
@@ -64,7 +64,7 @@ class LatexUserMenu : public QObject
void slotChangeMenuPosition(int newPosition);
private Q_SLOTS:
- void slotLatexmenuAction();
+ void slotUserMenuAction();
void slotProcessOutput();
void slotProcessExited(int /* exitCode */, QProcess::ExitStatus exitStatus);
@@ -86,15 +86,15 @@ class LatexUserMenu : public QObject
int m_actionsContextMenu;
QList<KAction *> m_actionlistContextMenu;
QList<KAction *> m_actionlist;
- QList<LatexmenuData> m_menudata;
+ QList<UserMenuData> m_menudata;
- QMenu *m_latexmenu;
+ QMenu *m_usermenu;
KActionCollection *m_actioncollection;
KProcess *m_proc;
QString m_procOutput;
KTextEditor::View *m_procView;
- const LatexmenuData *m_procMenudata;
+ const UserMenuData *m_procMenudata;
void updateUsermenuPosition();
void setVisibleDaniMenu(bool state, bool show);
@@ -109,9 +109,9 @@ class LatexUserMenu : public QObject
bool updateXmlSubmenu(QDomDocument &doc, QDomElement &element, int &actionnumber);
bool updateXmlMenuentry(QDomDocument &doc, QDomElement &element, int \
&actionnumber);
- void execActionText(KTextEditor::View *view, const LatexmenuData &menudata);
- void execActionFileContent(KTextEditor::View *view, const LatexmenuData \
&menudata);
- void execActionProgramOutput(KTextEditor::View *view, const LatexmenuData \
&menudata); + void execActionText(KTextEditor::View *view, const UserMenuData \
&menudata); + void execActionFileContent(KTextEditor::View *view, const UserMenuData \
&menudata); + void execActionProgramOutput(KTextEditor::View *view, const \
UserMenuData &menudata);
void insertText(KTextEditor::View *view, const QString &text, bool \
replaceSelection, bool selectInsertion); bool str2bool(const QString &value);
diff --git a/src/latexmenu/latexmenudata.cpp b/src/usermenu/usermenudata.cpp
similarity index 75%
rename from src/latexmenu/latexmenudata.cpp
rename to src/usermenu/usermenudata.cpp
index efcd0df..7532927 100644
--- a/src/latexmenu/latexmenudata.cpp
+++ b/src/usermenu/usermenudata.cpp
@@ -12,19 +12,19 @@
***************************************************************************/
-#include "latexmenu/latexmenudata.h"
+#include "usermenu/usermenudata.h"
#include "kiledebug.h"
namespace KileMenu {
-LatexmenuData::LatexmenuData()
+UserMenuData::UserMenuData()
{
clear();
}
-void LatexmenuData::clear()
+void UserMenuData::clear()
{
menutype = Text;
menutitle = QString::null;
@@ -42,33 +42,33 @@ void LatexmenuData::clear()
}
// static list for xml menu attributes
-QStringList LatexmenuData::xmlMenuAttrList = QStringList() << "text" << "file" << \
"program" << "separator" << "submenu"; +QStringList UserMenuData::xmlMenuAttrList = \
QStringList() << "text" << "file" << "program" << "separator" << "submenu";
// static list for xml menu tags
-QStringList LatexmenuData::xmlMenuTagList = QStringList() << "text" << "filename" << \
"parameter" +QStringList UserMenuData::xmlMenuTagList = QStringList() << "text" << \
"filename" << "parameter"
<< "icon" << "shortcut"
<< "needsSelection" << \
"useContextMenu" << "replaceSelection"
<< "selectInsertion" << \
"insertOutput" << "title";
// static methods for xml menu attributes
-LatexmenuData::MenuType LatexmenuData::xmlMenuType(const QString &name)
+UserMenuData::MenuType UserMenuData::xmlMenuType(const QString &name)
{
int index = xmlMenuAttrList.indexOf(name);
- return ( index >= 0 ) ? (LatexmenuData::MenuType)index : LatexmenuData::Text;
+ return ( index >= 0 ) ? (UserMenuData::MenuType)index : UserMenuData::Text;
}
-QString LatexmenuData::xmlMenuTypeName(int index)
+QString UserMenuData::xmlMenuTypeName(int index)
{
return xmlMenuAttrList[index];
}
// static methods for xml menu tags
-int LatexmenuData::xmlMenuTag(const QString &tag)
+int UserMenuData::xmlMenuTag(const QString &tag)
{
return xmlMenuTagList.indexOf(tag);
}
-QString LatexmenuData::xmlMenuTagName(int index)
+QString UserMenuData::xmlMenuTagName(int index)
{
return xmlMenuTagList[index];
}
diff --git a/src/latexmenu/latexmenudata.h b/src/usermenu/usermenudata.h
similarity index 92%
rename from src/latexmenu/latexmenudata.h
rename to src/usermenu/usermenudata.h
index 7d1cecd..647f1f5 100644
--- a/src/latexmenu/latexmenudata.h
+++ b/src/usermenu/usermenudata.h
@@ -11,14 +11,14 @@
* *
***************************************************************************/
-#ifndef LATEXMENUDATA_H
-#define LATEXMENUDATA_H
+#ifndef USERMENUDATA_H
+#define USERMENUDATA_H
#include <QStringList>
namespace KileMenu {
-class LatexmenuData {
+class UserMenuData {
public:
@@ -37,8 +37,8 @@ class LatexmenuData {
XML_TITLE = 0x0a
};
- LatexmenuData();
- virtual ~LatexmenuData() {}
+ UserMenuData();
+ virtual ~UserMenuData() {}
void clear();
@@ -60,13 +60,12 @@ class LatexmenuData {
static QStringList xmlMenuAttrList;
static QStringList xmlMenuTagList;
- static LatexmenuData::MenuType xmlMenuType(const QString &name);
+ static UserMenuData::MenuType xmlMenuType(const QString &name);
static QString xmlMenuTypeName(int index);
static int xmlMenuTag(const QString &tag);
static QString xmlMenuTagName(int index);
-
};
diff --git a/src/widgets/usermenuconfigwidget.cpp \
b/src/widgets/usermenuconfigwidget.cpp index 73230fe..1b8e88f 100644
--- a/src/widgets/usermenuconfigwidget.cpp
+++ b/src/widgets/usermenuconfigwidget.cpp
@@ -19,24 +19,24 @@
#include "kileconfig.h"
#include "kiledebug.h"
-KileWidgetUsermenuConfig::KileWidgetUsermenuConfig(KileMenu::LatexUserMenu \
*latexmenu, QWidget *parent)
- : QWidget(parent), m_latexmenu(latexmenu)
+KileWidgetUsermenuConfig::KileWidgetUsermenuConfig(KileMenu::UserMenu *usermenu, \
QWidget *parent) + : QWidget(parent), m_usermenu(usermenu)
{
setupUi(this);
- setXmlFile( m_latexmenu->xmlFile() );
+ setXmlFile( m_usermenu->xmlFile() );
m_menuPosition = KileConfig::menuPosition();
- if ( m_menuPosition == KileMenu::LatexUserMenu::DaniMenuPosition ) {
+ if ( m_menuPosition == KileMenu::UserMenu::DaniMenuPosition ) {
m_rbMenuPositionDani->setChecked(true);
}
else {
m_rbMenuPositionLatex->setChecked(true);
}
- // connect dialog with latexmenu to install xml file
- connect(this, SIGNAL(installXmlFile(const QString &)), m_latexmenu, \
SLOT(slotInstallXmlFile(const QString &)));
- connect(this, SIGNAL(removeXmlFile()), m_latexmenu, SLOT(slotRemoveXmlFile()));
- connect(this, SIGNAL(changeMenuPosition(int)), m_latexmenu, \
SLOT(slotChangeMenuPosition(int))); + // connect dialog with usermenu to install xml \
file + connect(this, SIGNAL(installXmlFile(const QString &)), m_usermenu, \
SLOT(slotInstallXmlFile(const QString &))); + connect(this, SIGNAL(removeXmlFile()), \
m_usermenu, SLOT(slotRemoveXmlFile())); + connect(this, \
SIGNAL(changeMenuPosition(int)), m_usermenu, SLOT(slotChangeMenuPosition(int)));
connect(m_pbInstall, SIGNAL(clicked()), this, SLOT(slotInstallClicked()));
connect(m_pbRemove, SIGNAL(clicked()), this, SLOT(slotRemoveClicked()));
@@ -49,7 +49,7 @@ KileWidgetUsermenuConfig::~KileWidgetUsermenuConfig()
void KileWidgetUsermenuConfig::writeConfig()
{
- int position = ( m_rbMenuPositionDani->isChecked() ) ? \
KileMenu::LatexUserMenu::DaniMenuPosition : \
KileMenu::LatexUserMenu::LatexMenuPosition; + int position = ( \
m_rbMenuPositionDani->isChecked() ) ? KileMenu::UserMenu::DaniMenuPosition : \
KileMenu::UserMenu::UserMenuPosition; if ( m_menuPosition != position ) {
KILE_DEBUG() << "menu position changed";
KileConfig::setMenuPosition(position);
@@ -61,7 +61,7 @@ void KileWidgetUsermenuConfig::slotInstallClicked()
{
KILE_DEBUG() << "install clicked";
- QString directory = KileMenu::LatexUserMenu::selectLatexmenuDir();
+ QString directory = KileMenu::UserMenu::selectUserMenuDir();
QString filter = i18n("*.xml|Latex Menu Files");
QString xmlfile = KFileDialog::getOpenFileName(directory, filter, this, \
i18n("Select Menu File"));
diff --git a/src/widgets/usermenuconfigwidget.h b/src/widgets/usermenuconfigwidget.h
index c72e85d..221ca19 100644
--- a/src/widgets/usermenuconfigwidget.h
+++ b/src/widgets/usermenuconfigwidget.h
@@ -16,7 +16,7 @@
#include <QWidget>
-#include "latexmenu/latexmenu.h"
+#include "usermenu/usermenu.h"
#include "ui_usermenuconfigwidget.h"
class KileWidgetUsermenuConfig : public QWidget, public Ui::KileWidgetUsermenuConfig
@@ -24,7 +24,7 @@ class KileWidgetUsermenuConfig : public QWidget, public \
Ui::KileWidgetUsermenuCo Q_OBJECT
public:
- KileWidgetUsermenuConfig(KileMenu::LatexUserMenu *latexmenu, QWidget *parent = 0);
+ KileWidgetUsermenuConfig(KileMenu::UserMenu *usermenu, QWidget *parent = 0);
~KileWidgetUsermenuConfig();
void writeConfig();
@@ -39,7 +39,7 @@ class KileWidgetUsermenuConfig : public QWidget, public \
Ui::KileWidgetUsermenuCo void changeMenuPosition(int);
private:
- KileMenu::LatexUserMenu *m_latexmenu;
+ KileMenu::UserMenu *m_usermenu;
bool m_menuPosition;
void setXmlFile(const QString &file);
diff --git a/src/widgets/usermenuconfigwidget.ui \
b/src/widgets/usermenuconfigwidget.ui index 0f955c8..684649c 100644
--- a/src/widgets/usermenuconfigwidget.ui
+++ b/src/widgets/usermenuconfigwidget.ui
@@ -177,7 +177,7 @@
</sizepolicy>
</property>
<property name="text">
- <string>Show the Usermenu in the main menubar</string>
+ <string>Show the user menu in the menu bar</string>
</property>
<property name="checked">
<bool>true</bool>
@@ -193,7 +193,7 @@
</sizepolicy>
</property>
<property name="text">
- <string>Show the Usermenu in the LaTeX menu</string>
+ <string>Show the user menu in the LaTeX menu</string>
</property>
</widget>
</item>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic