aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/actioneditor
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules/actioneditor')
-rw-r--r--src/modules/actioneditor/ActionEditor.cpp563
-rw-r--r--src/modules/actioneditor/ActionEditor.h68
-rw-r--r--src/modules/actioneditor/libkviactioneditor.cpp22
3 files changed, 337 insertions, 316 deletions
diff --git a/src/modules/actioneditor/ActionEditor.cpp b/src/modules/actioneditor/ActionEditor.cpp
index 5cb2e833d..925061a31 100644
--- a/src/modules/actioneditor/ActionEditor.cpp
+++ b/src/modules/actioneditor/ActionEditor.cpp
@@ -56,7 +56,6 @@
#include <QTabWidget>
#include <QLabel>
-
extern ActionEditorWindow * g_pActionEditorWindow;
static QString g_szLastEditedAction;
@@ -66,8 +65,8 @@ static QString g_szLastEditedAction;
#define LVI_SPACING 8
#define LVI_MINIMUM_CELL_WIDTH (LVI_MINIMUM_TEXT_WIDTH + LVI_BORDER + LVI_ICON_SIZE + LVI_SPACING + LVI_BORDER)
-ActionEditorTreeWidgetItem::ActionEditorTreeWidgetItem(QTreeWidget * v,ActionData * a)
-: QTreeWidgetItem(v)
+ActionEditorTreeWidgetItem::ActionEditorTreeWidgetItem(QTreeWidget * v, ActionData * a)
+ : QTreeWidgetItem(v)
{
m_pActionData = a;
m_pTreeWidget = v;
@@ -75,9 +74,10 @@ ActionEditorTreeWidgetItem::ActionEditorTreeWidgetItem(QTreeWidget * v,ActionDat
QString t = "<b>" + m_pActionData->m_szName + "</b>";
t += "<br><font color=\"#808080\" size=\"-1\">" + m_pActionData->m_szVisibleName + "</font>";
m_szKey = m_pActionData->m_szName.toUpper();
- setText(0,t);
+ setText(0, t);
QPixmap * p = g_pIconManager->getBigIcon(m_pActionData->m_szBigIcon);
- if(p)setIcon(0,*p);
+ if(p)
+ setIcon(0, *p);
}
ActionEditorTreeWidgetItem::~ActionEditorTreeWidgetItem()
@@ -85,197 +85,205 @@ ActionEditorTreeWidgetItem::~ActionEditorTreeWidgetItem()
delete m_pActionData;
}
-
-QString ActionEditorTreeWidgetItem::key(int,bool) const
+QString ActionEditorTreeWidgetItem::key(int, bool) const
{
return m_szKey;
}
-SingleActionEditor::SingleActionEditor(QWidget * par,ActionEditor * ed)
-: QWidget(par)
+SingleActionEditor::SingleActionEditor(QWidget * par, ActionEditor * ed)
+ : QWidget(par)
{
m_pActionEditor = ed;
m_pActionData = 0;
QGridLayout * g = new QGridLayout(this);
- QLabel * l = new QLabel(__tr2qs_ctx("Name:","editor"),this);
- g->addWidget(l,0,0);
+ QLabel * l = new QLabel(__tr2qs_ctx("Name:", "editor"), this);
+ g->addWidget(l, 0, 0);
m_pNameEdit = new QLineEdit(this);
- g->addWidget(m_pNameEdit,0,1);
- m_pNameEdit->setToolTip(__tr2qs_ctx("Internal unique name for the action","editor"));
+ g->addWidget(m_pNameEdit, 0, 1);
+ m_pNameEdit->setToolTip(__tr2qs_ctx("Internal unique name for the action", "editor"));
- l = new QLabel(__tr2qs_ctx("Label:","editor"),this);
- g->addWidget(l,1,0);
+ l = new QLabel(__tr2qs_ctx("Label:", "editor"), this);
+ g->addWidget(l, 1, 0);
m_pVisibleNameEdit = new QLineEdit(this);
- g->addWidget(m_pVisibleNameEdit,1,1);
- m_pVisibleNameEdit->setToolTip(__tr2qs_ctx("Visible name for this action.<br>This string will be displayed to the user so it is a good idea to use $tr() here","editor"));
-
+ g->addWidget(m_pVisibleNameEdit, 1, 1);
+ m_pVisibleNameEdit->setToolTip(__tr2qs_ctx("Visible name for this action.<br>This string will be displayed to the user so it is a good idea to use $tr() here", "editor"));
QTabWidget * tw = new QTabWidget(this);
- g->addWidget(tw,2,0,1,2);
+ g->addWidget(tw, 2, 0, 1, 2);
// code tab
QWidget * tab = new QWidget(tw);
QGridLayout * gl = new QGridLayout(tab);
m_pScriptEditor = KviScriptEditor::createInstance(tab);
- gl->addWidget(m_pScriptEditor,0,0);
- m_pScriptEditor->setToolTip(__tr2qs_ctx("Action code","editor"));
+ gl->addWidget(m_pScriptEditor, 0, 0);
+ m_pScriptEditor->setToolTip(__tr2qs_ctx("Action code", "editor"));
- tw->addTab(tab,__tr2qs_ctx("Code","editor"));
+ tw->addTab(tab, __tr2qs_ctx("Code", "editor"));
// properties tab
tab = new QWidget(tw);
gl = new QGridLayout(tab);
- l = new QLabel(__tr2qs_ctx("Category:","editor"),tab);
- gl->addWidget(l,0,0);
+ l = new QLabel(__tr2qs_ctx("Category:", "editor"), tab);
+ gl->addWidget(l, 0, 0);
m_pCategoryCombo = new QComboBox(tab);
- gl->addWidget(m_pCategoryCombo,0,1,1,3);
- m_pCategoryCombo->setToolTip(__tr2qs_ctx("Choose the category that best fits for this action","editor"));
+ gl->addWidget(m_pCategoryCombo, 0, 1, 1, 3);
+ m_pCategoryCombo->setToolTip(__tr2qs_ctx("Choose the category that best fits for this action", "editor"));
- l = new QLabel(__tr2qs_ctx("Description:","editor"),tab);
- gl->addWidget(l,1,0);
+ l = new QLabel(__tr2qs_ctx("Description:", "editor"), tab);
+ gl->addWidget(l, 1, 0);
m_pDescriptionEdit = new QLineEdit(tab);
- gl->addWidget(m_pDescriptionEdit,1,1,1,3);
- m_pDescriptionEdit->setToolTip(__tr2qs_ctx("Visible short description for this action.<br>This string will be displayed to the user so it is a good idea to use $tr() here","editor"));
+ gl->addWidget(m_pDescriptionEdit, 1, 1, 1, 3);
+ m_pDescriptionEdit->setToolTip(__tr2qs_ctx("Visible short description for this action.<br>This string will be displayed to the user so it is a good idea to use $tr() here", "editor"));
- l = new QLabel(__tr2qs_ctx("Small icon:","editor"),tab);
- gl->addWidget(l,2,0);
+ l = new QLabel(__tr2qs_ctx("Small icon:", "editor"), tab);
+ gl->addWidget(l, 2, 0);
m_pSmallIconEdit = new QLineEdit(tab);
- gl->addWidget(m_pSmallIconEdit,2,1);
+ gl->addWidget(m_pSmallIconEdit, 2, 1);
m_pSmallIconButton = new QToolButton(tab);
- m_pSmallIconButton->setMinimumSize(QSize(20,20));
- connect(m_pSmallIconButton,SIGNAL(clicked()),this,SLOT(chooseSmallIcon()));
- gl->addWidget(m_pSmallIconButton,2,2);
- QString s= __tr2qs_ctx("The small icon associated to this action.<br>" \
- "It will appear at least in the popup menus when this action is inserted.<br>" \
- "It has to be 16x16 pixels.","editor");
+ m_pSmallIconButton->setMinimumSize(QSize(20, 20));
+ connect(m_pSmallIconButton, SIGNAL(clicked()), this, SLOT(chooseSmallIcon()));
+ gl->addWidget(m_pSmallIconButton, 2, 2);
+ QString s = __tr2qs_ctx("The small icon associated to this action.<br>"
+ "It will appear at least in the popup menus when this action is inserted.<br>"
+ "It has to be 16x16 pixels.",
+ "editor");
m_pSmallIconEdit->setToolTip(s);
m_pSmallIconButton->setToolTip(s);
- l = new QLabel(__tr2qs_ctx("Big icon:","editor"),tab);
- gl->addWidget(l,3,0);
+ l = new QLabel(__tr2qs_ctx("Big icon:", "editor"), tab);
+ gl->addWidget(l, 3, 0);
m_pBigIconEdit = new QLineEdit(tab);
- gl->addWidget(m_pBigIconEdit,3,1);
+ gl->addWidget(m_pBigIconEdit, 3, 1);
m_pBigIconButton = new QToolButton(tab);
- m_pBigIconButton->setMinimumSize(QSize(48,48));
- m_pBigIconButton->setIconSize(QSize(32,32));
- connect(m_pBigIconButton,SIGNAL(clicked()),this,SLOT(chooseBigIcon()));
- gl->addWidget(m_pBigIconButton,3,2,2,2);
- s = __tr2qs_ctx("The big icon associated to this action.<br>" \
- "It will appear at least in the toolbar buttons when this action is inserted.<br>" \
- "It has to be 32x32 pixels.","editor");
+ m_pBigIconButton->setMinimumSize(QSize(48, 48));
+ m_pBigIconButton->setIconSize(QSize(32, 32));
+ connect(m_pBigIconButton, SIGNAL(clicked()), this, SLOT(chooseBigIcon()));
+ gl->addWidget(m_pBigIconButton, 3, 2, 2, 2);
+ s = __tr2qs_ctx("The big icon associated to this action.<br>"
+ "It will appear at least in the toolbar buttons when this action is inserted.<br>"
+ "It has to be 32x32 pixels.",
+ "editor");
m_pBigIconEdit->setToolTip(s);
m_pBigIconButton->setToolTip(s);
- l = new QLabel(__tr2qs_ctx("Key sequence:","editor"),tab);
- gl->addWidget(l,4,0,2,1);
+ l = new QLabel(__tr2qs_ctx("Key sequence:", "editor"), tab);
+ gl->addWidget(l, 4, 0, 2, 1);
m_pKeySequenceEdit = new QLineEdit(tab);
- gl->addWidget(m_pKeySequenceEdit,4,1,2,1);
- m_pKeySequenceEdit->setToolTip(__tr2qs_ctx("Optional keyboard sequence that will activate this action.<br>" \
- "The sequence has to be expressed as a string of up to four key codes separated by commas " \
- "eventually combined with the modifiers \"Ctrl\",\"Shift\",\"Alt\" and \"Meta\".<br>" \
- "Examples of such sequences are \"Ctrl+X\", \"Ctrl+Alt+Z\", \"Ctrl+X,Ctrl+C\" ...","editor"));
+ gl->addWidget(m_pKeySequenceEdit, 4, 1, 2, 1);
+ m_pKeySequenceEdit->setToolTip(__tr2qs_ctx("Optional keyboard sequence that will activate this action.<br>"
+ "The sequence has to be expressed as a string of up to four key codes separated by commas "
+ "eventually combined with the modifiers \"Ctrl\",\"Shift\",\"Alt\" and \"Meta\".<br>"
+ "Examples of such sequences are \"Ctrl+X\", \"Ctrl+Alt+Z\", \"Ctrl+X,Ctrl+C\" ...",
+ "editor"));
l = new QLabel(tab);
- gl->addWidget(l,6,0,1,4);
+ gl->addWidget(l, 6, 0, 1, 4);
- gl->setColumnStretch(1,1);
- gl->setRowStretch(6,1);
+ gl->setColumnStretch(1, 1);
+ gl->setRowStretch(6, 1);
- tw->addTab(tab,__tr2qs_ctx("Properties","editor"));
+ tw->addTab(tab, __tr2qs_ctx("Properties", "editor"));
// flags tab
tab = new QWidget(tw);
gl = new QGridLayout(tab);
-
- m_pNeedsContextCheck = new QCheckBox(__tr2qs_ctx("Needs IRC context","editor"),tab);
- connect(m_pNeedsContextCheck,SIGNAL(toggled(bool)),this,SLOT(needsContextCheckToggled(bool)));
- m_pNeedsContextCheck->setToolTip(__tr2qs_ctx("Check this option if this action should be enabled only when " \
- "the active window belongs to an IRC context","editor"));
- gl->addWidget(m_pNeedsContextCheck,0,0,1,4);
-
+ m_pNeedsContextCheck = new QCheckBox(__tr2qs_ctx("Needs IRC context", "editor"), tab);
+ connect(m_pNeedsContextCheck, SIGNAL(toggled(bool)), this, SLOT(needsContextCheckToggled(bool)));
+ m_pNeedsContextCheck->setToolTip(__tr2qs_ctx("Check this option if this action should be enabled only when "
+ "the active window belongs to an IRC context",
+ "editor"));
+ gl->addWidget(m_pNeedsContextCheck, 0, 0, 1, 4);
l = new QLabel(tab);
l->setMinimumWidth(40);
- gl->addWidget(l,1,0);
-
- m_pNeedsConnectionCheck = new QCheckBox(__tr2qs_ctx("Needs IRC connection","editor"),tab);
- connect(m_pNeedsConnectionCheck,SIGNAL(toggled(bool)),this,SLOT(needsConnectionCheckToggled(bool)));
- m_pNeedsConnectionCheck->setToolTip(__tr2qs_ctx("Check this option if this action should be enabled only when " \
- "the active window has an active IRC connection","editor"));
- gl->addWidget(m_pNeedsConnectionCheck,1,1,1,3);
+ gl->addWidget(l, 1, 0);
+ m_pNeedsConnectionCheck = new QCheckBox(__tr2qs_ctx("Needs IRC connection", "editor"), tab);
+ connect(m_pNeedsConnectionCheck, SIGNAL(toggled(bool)), this, SLOT(needsConnectionCheckToggled(bool)));
+ m_pNeedsConnectionCheck->setToolTip(__tr2qs_ctx("Check this option if this action should be enabled only when "
+ "the active window has an active IRC connection",
+ "editor"));
+ gl->addWidget(m_pNeedsConnectionCheck, 1, 1, 1, 3);
l = new QLabel(tab);
l->setMinimumWidth(40);
- gl->addWidget(l,2,1);
+ gl->addWidget(l, 2, 1);
- m_pEnableAtLoginCheck = new QCheckBox(__tr2qs_ctx("Enable at login","editor"),tab);
- m_pEnableAtLoginCheck->setToolTip(__tr2qs_ctx("Check this option if this action should be enabled also during " \
- "the login operations (so when the logical IRC connection hasn't been established yet)","editor"));
- gl->addWidget(m_pEnableAtLoginCheck,2,2,1,2);
+ m_pEnableAtLoginCheck = new QCheckBox(__tr2qs_ctx("Enable at login", "editor"), tab);
+ m_pEnableAtLoginCheck->setToolTip(__tr2qs_ctx("Check this option if this action should be enabled also during "
+ "the login operations (so when the logical IRC connection hasn't been established yet)",
+ "editor"));
+ gl->addWidget(m_pEnableAtLoginCheck, 2, 2, 1, 2);
- m_pSpecificWindowsCheck = new QCheckBox(__tr2qs_ctx("Enable only in specified windows","editor"),tab);
- connect(m_pSpecificWindowsCheck,SIGNAL(toggled(bool)),this,SLOT(specificWindowsCheckToggled(bool)));
- m_pSpecificWindowsCheck->setToolTip(__tr2qs_ctx("Check this option if this action should be enabled only when " \
- "the active window is of a specified type","editor"));
- gl->addWidget(m_pSpecificWindowsCheck,3,0,1,4);
+ m_pSpecificWindowsCheck = new QCheckBox(__tr2qs_ctx("Enable only in specified windows", "editor"), tab);
+ connect(m_pSpecificWindowsCheck, SIGNAL(toggled(bool)), this, SLOT(specificWindowsCheckToggled(bool)));
+ m_pSpecificWindowsCheck->setToolTip(__tr2qs_ctx("Check this option if this action should be enabled only when "
+ "the active window is of a specified type",
+ "editor"));
+ gl->addWidget(m_pSpecificWindowsCheck, 3, 0, 1, 4);
+ m_pWindowConsoleCheck = new QCheckBox(__tr2qs_ctx("Enable in console windows", "editor"), tab);
+ m_pWindowConsoleCheck->setToolTip(__tr2qs_ctx("Check this option if this action should be enabled only when "
+ "the active window is a console",
+ "editor"));
+ connect(m_pWindowConsoleCheck, SIGNAL(toggled(bool)), this, SLOT(channelQueryOrConsoleWindowCheckToggled(bool)));
+ gl->addWidget(m_pWindowConsoleCheck, 4, 1, 1, 3);
- m_pWindowConsoleCheck = new QCheckBox(__tr2qs_ctx("Enable in console windows","editor"),tab);
- m_pWindowConsoleCheck->setToolTip(__tr2qs_ctx("Check this option if this action should be enabled only when " \
- "the active window is a console","editor"));
- connect(m_pWindowConsoleCheck,SIGNAL(toggled(bool)),this,SLOT(channelQueryOrConsoleWindowCheckToggled(bool)));
- gl->addWidget(m_pWindowConsoleCheck,4,1,1,3);
+ m_pConsoleOnlyIfUsersSelectedCheck = new QCheckBox(__tr2qs_ctx("Only if there are selected users", "editor"), tab);
+ m_pConsoleOnlyIfUsersSelectedCheck->setToolTip(__tr2qs_ctx("This will enable the action only if there are "
+ "selected users in the active window",
+ "editor"));
+ gl->addWidget(m_pConsoleOnlyIfUsersSelectedCheck, 5, 2, 1, 2);
- m_pConsoleOnlyIfUsersSelectedCheck = new QCheckBox(__tr2qs_ctx("Only if there are selected users","editor"),tab);
- m_pConsoleOnlyIfUsersSelectedCheck->setToolTip(__tr2qs_ctx("This will enable the action only if there are " \
- "selected users in the active window","editor"));
- gl->addWidget(m_pConsoleOnlyIfUsersSelectedCheck,5,2,1,2);
+ m_pWindowChannelCheck = new QCheckBox(__tr2qs_ctx("Enable in channel windows", "editor"), tab);
+ m_pWindowChannelCheck->setToolTip(__tr2qs_ctx("Check this option if this action should be enabled only when "
+ "the active window is a channel",
+ "editor"));
+ connect(m_pWindowChannelCheck, SIGNAL(toggled(bool)), this, SLOT(channelQueryOrConsoleWindowCheckToggled(bool)));
+ gl->addWidget(m_pWindowChannelCheck, 6, 1, 1, 3);
- m_pWindowChannelCheck = new QCheckBox(__tr2qs_ctx("Enable in channel windows","editor"),tab);
- m_pWindowChannelCheck->setToolTip(__tr2qs_ctx("Check this option if this action should be enabled only when " \
- "the active window is a channel","editor"));
- connect(m_pWindowChannelCheck,SIGNAL(toggled(bool)),this,SLOT(channelQueryOrConsoleWindowCheckToggled(bool)));
- gl->addWidget(m_pWindowChannelCheck,6,1,1,3);
+ m_pChannelOnlyIfUsersSelectedCheck = new QCheckBox(__tr2qs_ctx("Only if there are selected users", "editor"), tab);
+ m_pChannelOnlyIfUsersSelectedCheck->setToolTip(__tr2qs_ctx("This will enable the action only if there are "
+ "selected users in the active window",
+ "editor"));
+ gl->addWidget(m_pChannelOnlyIfUsersSelectedCheck, 7, 2, 1, 2);
- m_pChannelOnlyIfUsersSelectedCheck = new QCheckBox(__tr2qs_ctx("Only if there are selected users","editor"),tab);
- m_pChannelOnlyIfUsersSelectedCheck->setToolTip(__tr2qs_ctx("This will enable the action only if there are " \
- "selected users in the active window","editor"));
- gl->addWidget(m_pChannelOnlyIfUsersSelectedCheck,7,2,1,2);
+ m_pWindowQueryCheck = new QCheckBox(__tr2qs_ctx("Enable in query windows", "editor"), tab);
+ m_pWindowQueryCheck->setToolTip(__tr2qs_ctx("Check this option if this action should be enabled only when "
+ "the active window is a query",
+ "editor"));
+ connect(m_pWindowQueryCheck, SIGNAL(toggled(bool)), this, SLOT(channelQueryOrConsoleWindowCheckToggled(bool)));
+ gl->addWidget(m_pWindowQueryCheck, 8, 1, 1, 3);
- m_pWindowQueryCheck = new QCheckBox(__tr2qs_ctx("Enable in query windows","editor"),tab);
- m_pWindowQueryCheck->setToolTip(__tr2qs_ctx("Check this option if this action should be enabled only when " \
- "the active window is a query","editor"));
- connect(m_pWindowQueryCheck,SIGNAL(toggled(bool)),this,SLOT(channelQueryOrConsoleWindowCheckToggled(bool)));
- gl->addWidget(m_pWindowQueryCheck,8,1,1,3);
+ m_pQueryOnlyIfUsersSelectedCheck = new QCheckBox(__tr2qs_ctx("Only if there are selected users", "editor"), tab);
+ m_pQueryOnlyIfUsersSelectedCheck->setToolTip(__tr2qs_ctx("This will enable the action only if there are "
+ "selected users in the active window",
+ "editor"));
+ gl->addWidget(m_pQueryOnlyIfUsersSelectedCheck, 9, 2, 1, 2);
- m_pQueryOnlyIfUsersSelectedCheck = new QCheckBox(__tr2qs_ctx("Only if there are selected users","editor"),tab);
- m_pQueryOnlyIfUsersSelectedCheck->setToolTip(__tr2qs_ctx("This will enable the action only if there are " \
- "selected users in the active window","editor"));
- gl->addWidget(m_pQueryOnlyIfUsersSelectedCheck,9,2,1,2);
-
- m_pWindowDccChatCheck = new QCheckBox(__tr2qs_ctx("Enable in DCC chat windows","editor"),tab);
- m_pWindowDccChatCheck->setToolTip(__tr2qs_ctx("Check this option if this action should be enabled only when " \
- "the active window is a DCC chat","editor"));
- gl->addWidget(m_pWindowDccChatCheck,10,1,1,2);
+ m_pWindowDccChatCheck = new QCheckBox(__tr2qs_ctx("Enable in DCC chat windows", "editor"), tab);
+ m_pWindowDccChatCheck->setToolTip(__tr2qs_ctx("Check this option if this action should be enabled only when "
+ "the active window is a DCC chat",
+ "editor"));
+ gl->addWidget(m_pWindowDccChatCheck, 10, 1, 1, 2);
l = new QLabel(tab);
- gl->addWidget(l,11,0,1,4);
- gl->setColumnStretch(3,1);
- gl->setRowStretch(11,1);
+ gl->addWidget(l, 11, 0, 1, 4);
+ gl->setColumnStretch(3, 1);
+ gl->setRowStretch(11, 1);
- tw->addTab(tab,__tr2qs_ctx("Flags","editor"));
+ tw->addTab(tab, __tr2qs_ctx("Flags", "editor"));
tw->setCurrentIndex(0);
- g->setRowStretch(2,1);
- g->setColumnStretch(1,1);
+ g->setRowStretch(2, 1);
+ g->setColumnStretch(1, 1);
- KviPointerHashTableIterator<QString,KviActionCategory> it(*(KviActionManager::instance()->categories()));
+ KviPointerHashTableIterator<QString, KviActionCategory> it(*(KviActionManager::instance()->categories()));
while(KviActionCategory * ac = it.current())
{
m_pCategoryCombo->addItem(ac->visibleName() + " (" + ac->name() + ")");
@@ -330,7 +338,7 @@ void SingleActionEditor::specificWindowsCheckToggled(bool)
m_pWindowDccChatCheck->setEnabled(b);
}
-void SingleActionEditor::displaySmallIcon(const QString &szIconId)
+void SingleActionEditor::displaySmallIcon(const QString & szIconId)
{
QPixmap * pix = g_pIconManager->getImage(szIconId);
@@ -338,14 +346,15 @@ void SingleActionEditor::displaySmallIcon(const QString &szIconId)
{
m_pSmallIconEdit->setText(szIconId);
m_pSmallIconButton->setIcon(QIcon(*pix));
- } else {
+ }
+ else
+ {
m_pSmallIconEdit->setText(QString());
m_pSmallIconButton->setIcon(QIcon());
}
-
}
-void SingleActionEditor::displayBigIcon(const QString &szIconId)
+void SingleActionEditor::displayBigIcon(const QString & szIconId)
{
QPixmap * pix = g_pIconManager->getImage(szIconId);
@@ -353,7 +362,9 @@ void SingleActionEditor::displayBigIcon(const QString &szIconId)
{
m_pBigIconEdit->setText(szIconId);
m_pBigIconButton->setIcon(QIcon(*pix));
- } else {
+ }
+ else
+ {
m_pBigIconEdit->setText(QString());
m_pBigIconButton->setIcon(QIcon());
}
@@ -361,7 +372,8 @@ void SingleActionEditor::displayBigIcon(const QString &szIconId)
void SingleActionEditor::chooseSmallIcon()
{
- if(!m_pActionData)return;
+ if(!m_pActionData)
+ return;
KviImageDialog * d = new KviImageDialog(this);
int ret = d->exec();
QString s = d->selectedImage();
@@ -374,8 +386,9 @@ void SingleActionEditor::chooseSmallIcon()
void SingleActionEditor::chooseBigIcon()
{
- if(!m_pActionData)return;
- KviImageDialog * d = new KviImageDialog(this,QString(),KID_TYPE_ALL,KID_TYPE_FULL_PATH);
+ if(!m_pActionData)
+ return;
+ KviImageDialog * d = new KviImageDialog(this, QString(), KID_TYPE_ALL, KID_TYPE_FULL_PATH);
int ret = d->exec();
QString s = d->selectedImage();
delete d;
@@ -394,7 +407,7 @@ void SingleActionEditor::setActionData(ActionData * d)
unsigned int uOldFlags = d->m_uFlags;
d->m_uFlags = KviAction::validateFlags(d->m_uFlags);
if(d->m_uFlags != uOldFlags)
- qDebug("invalid action flags in SingleActionEditor::setActionData(): %d fixed to %d",uOldFlags,d->m_uFlags);
+ qDebug("invalid action flags in SingleActionEditor::setActionData(): %d fixed to %d", uOldFlags, d->m_uFlags);
m_pNameEdit->setText(d->m_szName);
m_pNameEdit->setEnabled(true);
@@ -402,7 +415,7 @@ void SingleActionEditor::setActionData(ActionData * d)
m_pVisibleNameEdit->setEnabled(true);
m_pCategoryCombo->setEnabled(true);
int i;
- for(i=0;i<m_pCategoryCombo->count();i++)
+ for(i = 0; i < m_pCategoryCombo->count(); i++)
{
QString t = m_pCategoryCombo->itemText(i);
int idx = t.lastIndexOf('(');
@@ -462,7 +475,9 @@ void SingleActionEditor::setActionData(ActionData * d)
m_pQueryOnlyIfUsersSelectedCheck->setEnabled(b);
m_pQueryOnlyIfUsersSelectedCheck->setChecked(b && (d->m_uFlags & KviAction::WindowOnlyIfUsersSelected));
m_pWindowDccChatCheck->setChecked(d->m_uFlags & KviAction::WindowDccChat);
- } else {
+ }
+ else
+ {
m_pNameEdit->setText("");
m_pNameEdit->setEnabled(false);
m_pVisibleNameEdit->setText("");
@@ -509,7 +524,8 @@ void SingleActionEditor::setActionData(ActionData * d)
void SingleActionEditor::commit()
{
- if(!m_pActionData)return;
+ if(!m_pActionData)
+ return;
QString tmp = m_pNameEdit->text();
if(tmp != m_pActionData->m_szName)
@@ -534,10 +550,13 @@ void SingleActionEditor::commit()
m_pActionData->m_szKeySequence = m_pKeySequenceEdit->text();
QString szCat = m_pCategoryCombo->currentText();
int idx = szCat.lastIndexOf(')');
- if(idx != -1)m_pActionData->m_szCategory = szCat.left(idx);
- else m_pActionData->m_szCategory = szCat;
+ if(idx != -1)
+ m_pActionData->m_szCategory = szCat.left(idx);
+ else
+ m_pActionData->m_szCategory = szCat;
idx = m_pActionData->m_szCategory.lastIndexOf('(');
- if(idx != -1)m_pActionData->m_szCategory.remove(0,idx+1);
+ if(idx != -1)
+ m_pActionData->m_szCategory.remove(0, idx + 1);
m_pActionData->m_uFlags = 0;
if(m_pNeedsContextCheck->isChecked())
{
@@ -545,21 +564,23 @@ void SingleActionEditor::commit()
if(m_pNeedsConnectionCheck->isChecked())
{
m_pActionData->m_uFlags |= KviAction::NeedsConnection;
- if(m_pEnableAtLoginCheck->isChecked())m_pActionData->m_uFlags |= KviAction::EnableAtLogin;
+ if(m_pEnableAtLoginCheck->isChecked())
+ m_pActionData->m_uFlags |= KviAction::EnableAtLogin;
}
-
}
if(m_pSpecificWindowsCheck->isChecked())
{
- if(m_pWindowConsoleCheck->isChecked())m_pActionData->m_uFlags |= KviAction::WindowConsole;
- if(m_pWindowChannelCheck->isChecked())m_pActionData->m_uFlags |= KviAction::WindowChannel;
- if(m_pWindowQueryCheck->isChecked())m_pActionData->m_uFlags |= KviAction::WindowQuery;
- if(m_pWindowDccChatCheck->isChecked())m_pActionData->m_uFlags |= KviAction::WindowDccChat;
+ if(m_pWindowConsoleCheck->isChecked())
+ m_pActionData->m_uFlags |= KviAction::WindowConsole;
+ if(m_pWindowChannelCheck->isChecked())
+ m_pActionData->m_uFlags |= KviAction::WindowChannel;
+ if(m_pWindowQueryCheck->isChecked())
+ m_pActionData->m_uFlags |= KviAction::WindowQuery;
+ if(m_pWindowDccChatCheck->isChecked())
+ m_pActionData->m_uFlags |= KviAction::WindowDccChat;
if(m_pActionData->m_uFlags & KviAction::InternalWindowMask)
{
- if(m_pConsoleOnlyIfUsersSelectedCheck->isChecked() ||
- m_pChannelOnlyIfUsersSelectedCheck->isChecked() ||
- m_pQueryOnlyIfUsersSelectedCheck->isChecked())
+ if(m_pConsoleOnlyIfUsersSelectedCheck->isChecked() || m_pChannelOnlyIfUsersSelectedCheck->isChecked() || m_pQueryOnlyIfUsersSelectedCheck->isChecked())
{
m_pActionData->m_uFlags |= KviAction::WindowOnlyIfUsersSelected;
}
@@ -569,22 +590,21 @@ void SingleActionEditor::commit()
unsigned int uOldFlags = m_pActionData->m_uFlags;
m_pActionData->m_uFlags = KviAction::validateFlags(m_pActionData->m_uFlags);
if(m_pActionData->m_uFlags != uOldFlags)
- qDebug("invalid action flags in SingleActionEditor::commit(): %d fixed to %d",uOldFlags,m_pActionData->m_uFlags);
+ qDebug("invalid action flags in SingleActionEditor::commit(): %d fixed to %d", uOldFlags, m_pActionData->m_uFlags);
}
-
ActionEditorTreeView::ActionEditorTreeView(QWidget * pParent)
-: QTreeWidget(pParent)
+ : QTreeWidget(pParent)
{
- setColumnCount (1);
- setHeaderLabel(__tr2qs_ctx("Action","editor"));
+ setColumnCount(1);
+ setHeaderLabel(__tr2qs_ctx("Action", "editor"));
setSelectionMode(QAbstractItemView::ExtendedSelection);
setSortingEnabled(true);
int iWidth = viewport()->width();
- if(iWidth < LVI_MINIMUM_CELL_WIDTH)iWidth = LVI_MINIMUM_CELL_WIDTH;
+ if(iWidth < LVI_MINIMUM_CELL_WIDTH)
+ iWidth = LVI_MINIMUM_CELL_WIDTH;
setRootIsDecorated(false);
- setColumnWidth(0,iWidth);
-
+ setColumnWidth(0, iWidth);
}
ActionEditorTreeView::~ActionEditorTreeView()
@@ -595,63 +615,61 @@ void ActionEditorTreeView::resizeEvent(QResizeEvent * e)
{
QTreeWidget::resizeEvent(e);
int iWidth = viewport()->width();
- if(iWidth < LVI_MINIMUM_CELL_WIDTH)iWidth = LVI_MINIMUM_CELL_WIDTH;
- setColumnWidth(0,iWidth);
+ if(iWidth < LVI_MINIMUM_CELL_WIDTH)
+ iWidth = LVI_MINIMUM_CELL_WIDTH;
+ setColumnWidth(0, iWidth);
}
-
ActionEditor::ActionEditor(QWidget * par)
-: QWidget(par)
+ : QWidget(par)
{
QGridLayout * l = new QGridLayout(this);
- m_pSplitter = new QSplitter(Qt::Horizontal,this);
+ m_pSplitter = new QSplitter(Qt::Horizontal, this);
m_pSplitter->setChildrenCollapsible(false);
- l->addWidget(m_pSplitter,0,0);
-
+ l->addWidget(m_pSplitter, 0, 0);
KviTalVBox * box = new KviTalVBox(m_pSplitter);
m_pTreeWidget = new ActionEditorTreeView(box);
- KviTalIconAndRichTextItemDelegate *itemDelegate=new KviTalIconAndRichTextItemDelegate(m_pTreeWidget);
+ KviTalIconAndRichTextItemDelegate * itemDelegate = new KviTalIconAndRichTextItemDelegate(m_pTreeWidget);
m_pTreeWidget->setItemDelegate(itemDelegate);
//m_pTreeWidget->setShowSortIndicator(true);
m_pTreeWidget->setFocusPolicy(Qt::StrongFocus);
- connect(m_pTreeWidget,SIGNAL(currentItemChanged(QTreeWidgetItem *,QTreeWidgetItem *)),this,SLOT(currentItemChanged(QTreeWidgetItem *,QTreeWidgetItem *)));
+ connect(m_pTreeWidget, SIGNAL(currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)), this, SLOT(currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)));
- m_pNewActionButton = new QPushButton(__tr2qs_ctx("New Action","editor"),box);
- connect(m_pNewActionButton,SIGNAL(clicked()),this,SLOT(newAction()));
+ m_pNewActionButton = new QPushButton(__tr2qs_ctx("New Action", "editor"), box);
+ connect(m_pNewActionButton, SIGNAL(clicked()), this, SLOT(newAction()));
- m_pDeleteActionsButton = new QPushButton(__tr2qs_ctx("Delete Actions","editor"),box);
- connect(m_pDeleteActionsButton,SIGNAL(clicked()),this,SLOT(deleteActions()));
+ m_pDeleteActionsButton = new QPushButton(__tr2qs_ctx("Delete Actions", "editor"), box);
+ connect(m_pDeleteActionsButton, SIGNAL(clicked()), this, SLOT(deleteActions()));
- m_pExportActionsButton = new QPushButton(__tr2qs_ctx("Export Actions...","editor"),box);
- connect(m_pExportActionsButton,SIGNAL(clicked()),this,SLOT(exportActions()));
+ m_pExportActionsButton = new QPushButton(__tr2qs_ctx("Export Actions...", "editor"), box);
+ connect(m_pExportActionsButton, SIGNAL(clicked()), this, SLOT(exportActions()));
box->setSpacing(1);
- m_pSingleActionEditor = new SingleActionEditor(m_pSplitter,this);
+ m_pSingleActionEditor = new SingleActionEditor(m_pSplitter, this);
ActionEditorTreeWidgetItem * last = 0;
ActionEditorTreeWidgetItem * first = 0;
- KviPointerHashTableIterator<QString,KviAction> it(*(KviActionManager::instance()->actions()));
+ KviPointerHashTableIterator<QString, KviAction> it(*(KviActionManager::instance()->actions()));
while(KviAction * a = it.current())
{
if(a->isKviUserActionNeverOverrideThis())
{
ActionData * ad = new ActionData(
- a->name(),
- ((KviKvsUserAction *)a)->scriptCode(),
- ((KviKvsUserAction *)a)->visibleNameCode(),
- ((KviKvsUserAction *)a)->descriptionCode(),
- a->category() ? a->category()->name() : KviActionManager::categoryGeneric()->name(),
- a->bigIconId(),
- a->smallIconId(),
- a->flags(),
- a->keySequence(),
- 0
- );
- ActionEditorTreeWidgetItem * lvi = new ActionEditorTreeWidgetItem(m_pTreeWidget,ad);
+ a->name(),
+ ((KviKvsUserAction *)a)->scriptCode(),
+ ((KviKvsUserAction *)a)->visibleNameCode(),
+ ((KviKvsUserAction *)a)->descriptionCode(),
+ a->category() ? a->category()->name() : KviActionManager::categoryGeneric()->name(),
+ a->bigIconId(),
+ a->smallIconId(),
+ a->flags(),
+ a->keySequence(),
+ 0);
+ ActionEditorTreeWidgetItem * lvi = new ActionEditorTreeWidgetItem(m_pTreeWidget, ad);
ad->m_pItem = lvi;
if(ad->m_szName == g_szLastEditedAction)
last = lvi;
@@ -661,16 +679,18 @@ ActionEditor::ActionEditor(QWidget * par)
++it;
}
- if(!last)last = first; // try to sleect the first one then
+ if(!last)
+ last = first; // try to sleect the first one then
if(last)
{
m_pTreeWidget->setCurrentItem(last);
- currentItemChanged(last,last);
- } else {
- currentItemChanged(0,0);
+ currentItemChanged(last, last);
+ }
+ else
+ {
+ currentItemChanged(0, 0);
}
-
}
ActionEditor::~ActionEditor()
@@ -680,48 +700,48 @@ ActionEditor::~ActionEditor()
void ActionEditor::exportActions()
{
QString szName = QDir::homePath();
- if(!szName.endsWith(QString(KVI_PATH_SEPARATOR)))szName += KVI_PATH_SEPARATOR;
+ if(!szName.endsWith(QString(KVI_PATH_SEPARATOR)))
+ szName += KVI_PATH_SEPARATOR;
szName += "myactions.kvs";
QString szFile;
if(!KviFileDialog::askForSaveFileName(
- szFile,
- __tr2qs_ctx("Choose a Filename - KVIrc","editor"),
- szName,
- KVI_FILTER_SCRIPT,
- true,
- true,
- true,
- this
- ))return;
+ szFile,
+ __tr2qs_ctx("Choose a Filename - KVIrc", "editor"),
+ szName,
+ KVI_FILTER_SCRIPT,
+ true,
+ true,
+ true,
+ this))
+ return;
QString szCode;
- for (int i=0;i<m_pTreeWidget->topLevelItemCount();i++)
+ for(int i = 0; i < m_pTreeWidget->topLevelItemCount(); i++)
{
if(m_pTreeWidget->topLevelItem(i)->isSelected())
{
ActionData * a = ((ActionEditorTreeWidgetItem *)m_pTreeWidget->topLevelItem(i))->actionData();
KviKvsUserAction::exportToKvs(
- szCode,
- a->m_szName,
- a->m_szScriptCode,
- a->m_szVisibleName,
- a->m_szDescription,
- a->m_szCategory,
- a->m_szBigIcon,
- a->m_szSmallIcon,
- a->m_uFlags,
- a->m_szKeySequence
- );
+ szCode,
+ a->m_szName,
+ a->m_szScriptCode,
+ a->m_szVisibleName,
+ a->m_szDescription,
+ a->m_szCategory,
+ a->m_szBigIcon,
+ a->m_szSmallIcon,
+ a->m_uFlags,
+ a->m_szKeySequence);
}
}
- if(!KviFileUtils::writeFile(szFile,szCode))
+ if(!KviFileUtils::writeFile(szFile, szCode))
{
- QMessageBox::warning(this,__tr2qs_ctx("Writing to File Failed - KVIrc","editor"),__tr2qs_ctx("Unable to write to the actions file.","editor"),__tr2qs_ctx("OK","editor"));
+ QMessageBox::warning(this, __tr2qs_ctx("Writing to File Failed - KVIrc", "editor"), __tr2qs_ctx("Unable to write to the actions file.", "editor"), __tr2qs_ctx("OK", "editor"));
}
}
@@ -730,18 +750,19 @@ void ActionEditor::deleteActions()
KviPointerList<ActionEditorTreeWidgetItem> l;
l.setAutoDelete(false);
- for (int i=0;i<m_pTreeWidget->topLevelItemCount();i++)
+ for(int i = 0; i < m_pTreeWidget->topLevelItemCount(); i++)
{
if(m_pTreeWidget->topLevelItem(i)->isSelected())
- l.append((ActionEditorTreeWidgetItem * )m_pTreeWidget->topLevelItem(i));
+ l.append((ActionEditorTreeWidgetItem *)m_pTreeWidget->topLevelItem(i));
}
- if(l.isEmpty())return;
+ if(l.isEmpty())
+ return;
//if(QMessageBox::question(this,__tr2qs_ctx("Confirm Actions Deletion - KVIrc","editor"),__tr2qs_ctx("Do you really want to delete the selected actions?","editor"),__tr2qs_ctx("Yes","editor"),__tr2qs_ctx("No","editor")) != 0)
// return;
- for(ActionEditorTreeWidgetItem * i = l.first();i;i = l.next())
+ for(ActionEditorTreeWidgetItem * i = l.first(); i; i = l.next())
{
if(m_pSingleActionEditor->actionData() == i->actionData())
m_pSingleActionEditor->setActionData(0);
@@ -749,16 +770,16 @@ void ActionEditor::deleteActions()
}
}
-
-QString ActionEditor::nameForAutomaticAction(const QString &szTemplate)
+QString ActionEditor::nameForAutomaticAction(const QString & szTemplate)
{
QString szRet;
QString szT = szTemplate;
- szT.replace(" ","");
- szT.replace(".","_");
+ szT.replace(" ", "");
+ szT.replace(".", "_");
int i = 1;
- do {
+ do
+ {
szRet = QString("%1%2").arg(szT).arg(i);
i++;
} while(actionExists(szRet));
@@ -768,9 +789,9 @@ QString ActionEditor::nameForAutomaticAction(const QString &szTemplate)
void ActionEditor::newAction()
{
- QString szName = nameForAutomaticAction(__tr2qs_ctx("My Action","editor"));
- QString szVis = __tr2qs_ctx("My Action","editor");
- QString szDes = __tr2qs_ctx("Put here a short description of your action","editor");
+ QString szName = nameForAutomaticAction(__tr2qs_ctx("My Action", "editor"));
+ QString szVis = __tr2qs_ctx("My Action", "editor");
+ QString szDes = __tr2qs_ctx("Put here a short description of your action", "editor");
szVis.prepend("$tr(\"");
szVis.append("\")");
@@ -778,32 +799,33 @@ void ActionEditor::newAction()
szDes.append("\")");
ActionData * ad = new ActionData(szName,
- QString(),
- szVis,
- szDes,
- KviActionManager::categoryGeneric()->name(),
- KVI_BIGICON_USERACTION,
- QString(),
- 0,
- QString(),
- 0);
+ QString(),
+ szVis,
+ szDes,
+ KviActionManager::categoryGeneric()->name(),
+ KVI_BIGICON_USERACTION,
+ QString(),
+ 0,
+ QString(),
+ 0);
- ActionEditorTreeWidgetItem * lvi = new ActionEditorTreeWidgetItem(m_pTreeWidget,ad);
+ ActionEditorTreeWidgetItem * lvi = new ActionEditorTreeWidgetItem(m_pTreeWidget, ad);
ad->m_pItem = lvi;
m_pTreeWidget->setCurrentItem(lvi);
- currentItemChanged(lvi,lvi);
+ currentItemChanged(lvi, lvi);
}
-bool ActionEditor::actionExists(const QString &szName)
+bool ActionEditor::actionExists(const QString & szName)
{
- for (int i=0;i<m_pTreeWidget->topLevelItemCount();i++)
+ for(int i = 0; i < m_pTreeWidget->topLevelItemCount(); i++)
{
- if(((ActionEditorTreeWidgetItem *)m_pTreeWidget->topLevelItem(i))->actionData()->m_szName == szName)return true;
+ if(((ActionEditorTreeWidgetItem *)m_pTreeWidget->topLevelItem(i))->actionData()->m_szName == szName)
+ return true;
}
return false;
}
-void ActionEditor::currentItemChanged(QTreeWidgetItem * i,QTreeWidgetItem *)
+void ActionEditor::currentItemChanged(QTreeWidgetItem * i, QTreeWidgetItem *)
{
if(m_pSingleActionEditor->actionData())
m_pSingleActionEditor->commit();
@@ -835,20 +857,20 @@ void ActionEditor::commit()
KviActionManager::instance()->killAllKvsUserActions();
- for (int i=0;i<m_pTreeWidget->topLevelItemCount();i++)
+ for(int i = 0; i < m_pTreeWidget->topLevelItemCount(); i++)
{
ActionEditorTreeWidgetItem * it = (ActionEditorTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
KviKvsUserAction * a = KviKvsUserAction::createInstance( // msvc workaround
- KviActionManager::instance(),
- it->actionData()->m_szName,
- it->actionData()->m_szScriptCode,
- it->actionData()->m_szVisibleName,
- it->actionData()->m_szDescription,
- it->actionData()->m_szCategory,
- it->actionData()->m_szBigIcon,
- it->actionData()->m_szSmallIcon,
- it->actionData()->m_uFlags,
- it->actionData()->m_szKeySequence);
+ KviActionManager::instance(),
+ it->actionData()->m_szName,
+ it->actionData()->m_szScriptCode,
+ it->actionData()->m_szVisibleName,
+ it->actionData()->m_szDescription,
+ it->actionData()->m_szCategory,
+ it->actionData()->m_szBigIcon,
+ it->actionData()->m_szSmallIcon,
+ it->actionData()->m_uFlags,
+ it->actionData()->m_szKeySequence);
KviActionManager::instance()->registerAction(a);
}
@@ -856,35 +878,34 @@ void ActionEditor::commit()
KviCustomToolBarManager::instance()->updateVisibleToolBars();
}
-
ActionEditorWindow::ActionEditorWindow()
-: KviWindow(KviWindow::ScriptEditor,"actioneditor",0)
+ : KviWindow(KviWindow::ScriptEditor, "actioneditor", 0)
{
g_pActionEditorWindow = this;
- setFixedCaption(__tr2qs_ctx("Action Editor","editor"));
+ setFixedCaption(__tr2qs_ctx("Action Editor", "editor"));
QGridLayout * g = new QGridLayout();
m_pEditor = new ActionEditor(this);
- g->addWidget(m_pEditor,0,0,1,4);
+ g->addWidget(m_pEditor, 0, 0, 1, 4);
- QPushButton * btn = new QPushButton(__tr2qs_ctx("OK","editor"),this);
- connect(btn,SIGNAL(clicked()),this,SLOT(okClicked()));
+ QPushButton * btn = new QPushButton(__tr2qs_ctx("OK", "editor"), this);
+ connect(btn, SIGNAL(clicked()), this, SLOT(okClicked()));
btn->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Accept)));
- g->addWidget(btn,1,1);
+ g->addWidget(btn, 1, 1);
- btn = new QPushButton(__tr2qs_ctx("Apply","editor"),this);
- connect(btn,SIGNAL(clicked()),this,SLOT(applyClicked()));
+ btn = new QPushButton(__tr2qs_ctx("Apply", "editor"), this);
+ connect(btn, SIGNAL(clicked()), this, SLOT(applyClicked()));
btn->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Accept)));
- g->addWidget(btn,1,2);
+ g->addWidget(btn, 1, 2);
- btn = new QPushButton(__tr2qs_ctx("Cancel","editor"),this);
- connect(btn,SIGNAL(clicked()),this,SLOT(cancelClicked()));
+ btn = new QPushButton(__tr2qs_ctx("Cancel", "editor"), this);
+ connect(btn, SIGNAL(clicked()), this, SLOT(cancelClicked()));
btn->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Discard)));
- g->addWidget(btn,1,3);
+ g->addWidget(btn, 1, 3);
- g->setRowStretch(0,1);
- g->setColumnStretch(0,1);
+ g->setRowStretch(0, 1);
+ g->setColumnStretch(0, 1);
setLayout(g);
}
@@ -914,23 +935,23 @@ QPixmap * ActionEditorWindow::myIconPtr()
return g_pIconManager->getSmallIcon(KviIconManager::ActionEditor);
}
-void ActionEditorWindow::getConfigGroupName(QString &szName)
+void ActionEditorWindow::getConfigGroupName(QString & szName)
{
szName = "actioneditor";
}
-void ActionEditorWindow::saveProperties(KviConfigurationFile *cfg)
+void ActionEditorWindow::saveProperties(KviConfigurationFile * cfg)
{
KviWindow::saveProperties(cfg);
- cfg->writeEntry("Splitter",m_pEditor->m_pSplitter->sizes());
+ cfg->writeEntry("Splitter", m_pEditor->m_pSplitter->sizes());
}
-void ActionEditorWindow::loadProperties(KviConfigurationFile *cfg)
+void ActionEditorWindow::loadProperties(KviConfigurationFile * cfg)
{
int w = width();
KviWindow::loadProperties(cfg);
QList<int> def;
def.append((w * 25) / 100);
def.append((w * 75) / 100);
- m_pEditor->m_pSplitter->setSizes(cfg->readIntListEntry("Splitter",def));
+ m_pEditor->m_pSplitter->setSizes(cfg->readIntListEntry("Splitter", def));
}
diff --git a/src/modules/actioneditor/ActionEditor.h b/src/modules/actioneditor/ActionEditor.h
index 32639399c..86470be3f 100644
--- a/src/modules/actioneditor/ActionEditor.h
+++ b/src/modules/actioneditor/ActionEditor.h
@@ -32,7 +32,6 @@
#include <QToolButton>
#include <QCheckBox>
-
class QLineEdit;
class QComboBox;
class QSimpleRichText;
@@ -42,7 +41,6 @@ class ActionEditorTreeWidgetItem;
class KviScriptEditor;
class ActionEditor;
-
class ActionData
{
public:
@@ -57,29 +55,28 @@ public:
unsigned int m_uFlags;
ActionEditorTreeWidgetItem * m_pItem; // ummigarba tanto...
public:
- ActionData(const QString &szName,
- const QString &szScriptCode,
- const QString &szVisibleName,
- const QString &szDescription,
- const QString &szCategory,
- const QString &szBigIcon,
- const QString &szSmallIcon,
- unsigned int uFlags,
- const QString &szKeySequence,
- ActionEditorTreeWidgetItem * pItem)
- : m_szName(szName), m_szScriptCode(szScriptCode), m_szVisibleName(szVisibleName),
- m_szDescription(szDescription), m_szCategory(szCategory), m_szBigIcon(szBigIcon),
- m_szSmallIcon(szSmallIcon), m_szKeySequence(szKeySequence), m_uFlags(uFlags),
- m_pItem(pItem)
- {};
+ ActionData(const QString & szName,
+ const QString & szScriptCode,
+ const QString & szVisibleName,
+ const QString & szDescription,
+ const QString & szCategory,
+ const QString & szBigIcon,
+ const QString & szSmallIcon,
+ unsigned int uFlags,
+ const QString & szKeySequence,
+ ActionEditorTreeWidgetItem * pItem)
+ : m_szName(szName), m_szScriptCode(szScriptCode), m_szVisibleName(szVisibleName),
+ m_szDescription(szDescription), m_szCategory(szCategory), m_szBigIcon(szBigIcon),
+ m_szSmallIcon(szSmallIcon), m_szKeySequence(szKeySequence), m_uFlags(uFlags),
+ m_pItem(pItem){};
};
-
class ActionEditorTreeWidgetItem : public QTreeWidgetItem
{
public:
- ActionEditorTreeWidgetItem(QTreeWidget * v,ActionData * a);
+ ActionEditorTreeWidgetItem(QTreeWidget * v, ActionData * a);
~ActionEditorTreeWidgetItem();
+
protected:
ActionData * m_pActionData;
//QSimpleRichText * m_pText;
@@ -87,33 +84,34 @@ protected:
QPixmap * m_pIcon;
QTreeWidget * m_pTreeWidget;
QString m_szKey;
+
public:
- ActionData * actionData(){ return m_pActionData; };
+ ActionData * actionData() { return m_pActionData; };
//void setupForActionData();
public:
//virtual void paintCell(QPainter * p,const QColorGroup & cg,int column,int width,int align);
//virtual void setup();
- virtual QString key(int,bool) const;
+ virtual QString key(int, bool) const;
};
-
class ActionEditorTreeView : public QTreeWidget
{
Q_OBJECT
public:
ActionEditorTreeView(QWidget * pParent);
~ActionEditorTreeView();
+
protected:
virtual void resizeEvent(QResizeEvent * e);
};
-
class SingleActionEditor : public QWidget
{
Q_OBJECT
public:
- SingleActionEditor(QWidget * par,ActionEditor * ed);
+ SingleActionEditor(QWidget * par, ActionEditor * ed);
~SingleActionEditor();
+
protected:
ActionEditor * m_pActionEditor;
ActionData * m_pActionData;
@@ -138,22 +136,22 @@ protected:
QCheckBox * m_pConsoleOnlyIfUsersSelectedCheck;
QCheckBox * m_pChannelOnlyIfUsersSelectedCheck;
QCheckBox * m_pQueryOnlyIfUsersSelectedCheck;
+
public:
- ActionData * actionData(){ return m_pActionData; };
+ ActionData * actionData() { return m_pActionData; };
void setActionData(ActionData * d);
void commit();
protected slots:
void chooseSmallIcon();
void chooseBigIcon();
- void displaySmallIcon(const QString &szIconId);
- void displayBigIcon(const QString &szIconId);
+ void displaySmallIcon(const QString & szIconId);
+ void displayBigIcon(const QString & szIconId);
void needsContextCheckToggled(bool);
void needsConnectionCheckToggled(bool);
void specificWindowsCheckToggled(bool);
void channelQueryOrConsoleWindowCheckToggled(bool);
};
-
class ActionEditor : public QWidget
{
friend class ActionEditorWindow;
@@ -161,6 +159,7 @@ class ActionEditor : public QWidget
public:
ActionEditor(QWidget * par);
~ActionEditor();
+
protected:
ActionEditorTreeView * m_pTreeWidget;
SingleActionEditor * m_pSingleActionEditor;
@@ -168,31 +167,34 @@ protected:
QPushButton * m_pNewActionButton;
QPushButton * m_pDeleteActionsButton;
QPushButton * m_pExportActionsButton;
+
public:
void commit();
- bool actionExists(const QString &szName);
+ bool actionExists(const QString & szName);
+
protected:
int selectedCount();
- QString nameForAutomaticAction(const QString &szTemplate);
+ QString nameForAutomaticAction(const QString & szTemplate);
protected slots:
- void currentItemChanged(QTreeWidgetItem * it,QTreeWidgetItem *prev);
+ void currentItemChanged(QTreeWidgetItem * it, QTreeWidgetItem * prev);
void newAction();
void deleteActions();
void exportActions();
};
-
class ActionEditorWindow : public KviWindow
{
Q_OBJECT
public:
ActionEditorWindow();
~ActionEditorWindow();
+
protected:
ActionEditor * m_pEditor;
+
protected:
virtual QPixmap * myIconPtr();
- virtual void getConfigGroupName(QString &szName);
+ virtual void getConfigGroupName(QString & szName);
virtual void saveProperties(KviConfigurationFile *);
virtual void loadProperties(KviConfigurationFile *);
protected slots:
diff --git a/src/modules/actioneditor/libkviactioneditor.cpp b/src/modules/actioneditor/libkviactioneditor.cpp
index 7714b2cd6..a83450a03 100644
--- a/src/modules/actioneditor/libkviactioneditor.cpp
+++ b/src/modules/actioneditor/libkviactioneditor.cpp
@@ -30,7 +30,6 @@
ActionEditorWindow * g_pActionEditorWindow = 0;
-
/*
@doc: actioneditor.open
@type:
@@ -59,7 +58,7 @@ static bool actioneditor_kvs_cmd_open(KviKvsModuleCommandCall *)
static bool actioneditor_module_init(KviModule * m)
{
- KVSM_REGISTER_SIMPLE_COMMAND(m,"open",actioneditor_kvs_cmd_open);
+ KVSM_REGISTER_SIMPLE_COMMAND(m, "open", actioneditor_kvs_cmd_open);
g_pActionEditorWindow = 0;
return true;
}
@@ -78,13 +77,12 @@ static bool actioneditor_module_cleanup(KviModule *)
}
KVIRC_MODULE(
- "ActionEditor", // module name
- "4.0.0", // module version
- "Copyright (C) 2004 Szymon Stefanek (pragma at kvirc dot net)", // author & (C)
- "Editor for the script actions",
- actioneditor_module_init,
- actioneditor_module_can_unload,
- 0,
- actioneditor_module_cleanup,
- "editor"
-)
+ "ActionEditor", // module name
+ "4.0.0", // module version
+ "Copyright (C) 2004 Szymon Stefanek (pragma at kvirc dot net)", // author & (C)
+ "Editor for the script actions",
+ actioneditor_module_init,
+ actioneditor_module_can_unload,
+ 0,
+ actioneditor_module_cleanup,
+ "editor")